diff --git a/src/Mvc/.editorconfig b/src/Mvc/.editorconfig
new file mode 100644
index 0000000000..abd3d48553
--- /dev/null
+++ b/src/Mvc/.editorconfig
@@ -0,0 +1,56 @@
+# EditorConfig is awesome:http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Don't use tabs for indentation.
+[*]
+indent_style = space
+# (Please don't specify an indent_size here; that has too many unintended consequences.)
+
+# Code files
+[*.{cs,csx,vb,vbx}]
+indent_size = 4
+
+# Xml project files
+[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
+indent_size = 2
+
+# Xml config files
+[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
+indent_size = 2
+
+# JSON files
+[*.json]
+indent_size = 2
+
+# Dotnet code style settings:
+[*.cs]
+# Sort using and Import directives with System.* appearing first
+dotnet_sort_system_directives_first = true
+
+# Don't use this. qualifier
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+
+# use int x = .. over Int32
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+
+# use int.MaxValue over Int32.MaxValue
+dotnet_style_predefined_type_for_member_access = true:suggestion
+
+# Require var all the time.
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+csharp_style_var_elsewhere = true:suggestion
+
+# Disallow throw expressions.
+csharp_style_throw_expression = false:suggestion
+
+# Newline settings
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
diff --git a/src/Mvc/.gitignore b/src/Mvc/.gitignore
new file mode 100644
index 0000000000..e38f0aa101
--- /dev/null
+++ b/src/Mvc/.gitignore
@@ -0,0 +1,43 @@
+[Oo]bj/
+[Bb]in/
+TestResults/
+.nuget/
+.build/
+.testPublish/
+*.sln.ide/
+_ReSharper.*/
+packages/
+artifacts/
+PublishProfiles/
+.vs/
+bower_components/
+node_modules/
+debugSettings.json
+project.lock.json
+*.user
+*.suo
+*.cache
+*.docstates
+_ReSharper.*
+nuget.exe
+*net45.csproj
+*net451.csproj
+*k10.csproj
+*.psess
+*.vsp
+*.pidb
+*.userprefs
+*DS_Store
+*.ncrunchsolution
+*.*sdf
+*.ipch
+.settings
+*.sln.ide
+node_modules
+*launchSettings.json
+*.orig
+.vscode/
+global.json
+BenchmarkDotNet.Artifacts/
+.idea/
+msbuild.binlog
diff --git a/src/Mvc/Directory.Build.props b/src/Mvc/Directory.Build.props
new file mode 100644
index 0000000000..fad2bb0610
--- /dev/null
+++ b/src/Mvc/Directory.Build.props
@@ -0,0 +1,21 @@
+<Project>
+  <Import
+    Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
+    Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
+
+  <Import Project="version.props" />
+  <Import Project="build\dependencies.props" />
+  <Import Project="build\sources.props" />
+
+  <PropertyGroup>
+    <Product>Microsoft ASP.NET Core MVC</Product>
+    <RepositoryUrl>https://github.com/aspnet/Mvc</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/Mvc/Directory.Build.targets b/src/Mvc/Directory.Build.targets
new file mode 100644
index 0000000000..eb03b2565f
--- /dev/null
+++ b/src/Mvc/Directory.Build.targets
@@ -0,0 +1,6 @@
+<Project>
+  <PropertyGroup>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
+    <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
+  </PropertyGroup>
+</Project>
diff --git a/src/Mvc/Mvc.NoFun.sln b/src/Mvc/Mvc.NoFun.sln
new file mode 100644
index 0000000000..33f4a84d2f
--- /dev/null
+++ b/src/Mvc/Mvc.NoFun.sln
@@ -0,0 +1,595 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2036
+MinimumVisualStudioVersion = 15.0.26730.03
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{DAAE4C74-D06F-4874-A166-33305D2643CE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{32285FA4-6B46-4D6B-A840-2B13E4C8B58E}"
+	ProjectSection(SolutionItems) = preProject
+		src\Directory.Build.props = src\Directory.Build.props
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}"
+	ProjectSection(SolutionItems) = preProject
+		test\Directory.Build.props = test\Directory.Build.props
+		test\MvcTests.ruleset = test\MvcTests.ruleset
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{079EFA1F-0B0A-4853-B27B-5780D111CD85}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor", "src\Microsoft.AspNetCore.Mvc.Razor\Microsoft.AspNetCore.Mvc.Razor.csproj", "{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core", "src\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj", "{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.Test", "test\Microsoft.AspNetCore.Mvc.Razor.Test\Microsoft.AspNetCore.Mvc.Razor.Test.csproj", "{3F6E355E-4869-41D9-943B-D54771221A7F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core.Test", "test\Microsoft.AspNetCore.Mvc.Core.Test\Microsoft.AspNetCore.Mvc.Core.Test.csproj", "{A8AA326E-8EE8-4F11-B750-23028E0949D7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Test", "test\Microsoft.AspNetCore.Mvc.Test\Microsoft.AspNetCore.Mvc.Test.csproj", "{5F945B82-FE5F-425C-956C-8BC2F2020254}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.WebApiCompatShim", "src\Microsoft.AspNetCore.Mvc.WebApiCompatShim\Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj", "{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.WebApiCompatShimTest", "test\Microsoft.AspNetCore.Mvc.WebApiCompatShimTest\Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj", "{5DE8E4D9-AACD-4B5F-819F-F091383FB996}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TagHelpers", "src\Microsoft.AspNetCore.Mvc.TagHelpers\Microsoft.AspNetCore.Mvc.TagHelpers.csproj", "{B2347320-308E-4D2B-AEC8-005DFA68B0C9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TagHelpers.Test", "test\Microsoft.AspNetCore.Mvc.TagHelpers.Test\Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj", "{860119ED-3DB1-424D-8D0A-30132A8A7D96}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TestCommon", "test\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj", "{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.IntegrationTests", "test\Microsoft.AspNetCore.Mvc.IntegrationTests\Microsoft.AspNetCore.Mvc.IntegrationTests.csproj", "{864FA09D-1E48-403A-A6C8-4F079D2A30F0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Abstractions", "src\Microsoft.AspNetCore.Mvc.Abstractions\Microsoft.AspNetCore.Mvc.Abstractions.csproj", "{1154203C-7579-4525-906E-BC55268421C1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ApiExplorer", "src\Microsoft.AspNetCore.Mvc.ApiExplorer\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj", "{A2B72833-5D70-4C42-AE85-E0319926FB8A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ApiExplorer.Test", "test\Microsoft.AspNetCore.Mvc.ApiExplorer.Test\Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj", "{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Abstractions.Test", "test\Microsoft.AspNetCore.Mvc.Abstractions.Test\Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj", "{DA000953-7532-4DF5-8DB9-8143DF98D999}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ViewFeatures", "src\Microsoft.AspNetCore.Mvc.ViewFeatures\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj", "{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Json", "src\Microsoft.AspNetCore.Mvc.Formatters.Json\Microsoft.AspNetCore.Mvc.Formatters.Json.csproj", "{3FC8D9D6-9352-43A3-8E81-422F270085B7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Xml", "src\Microsoft.AspNetCore.Mvc.Formatters.Xml\Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj", "{42C81540-CD47-4C68-A7A3-2A93B9C3B210}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Json.Test", "test\Microsoft.AspNetCore.Mvc.Formatters.Json.Test\Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj", "{493780DA-E696-40FF-BD12-4A5C5736F292}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Xml.Test", "test\Microsoft.AspNetCore.Mvc.Formatters.Xml.Test\Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj", "{22019146-BDFA-442E-8C8E-345FB9644578}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Cors", "src\Microsoft.AspNetCore.Mvc.Cors\Microsoft.AspNetCore.Mvc.Cors.csproj", "{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.DataAnnotations", "src\Microsoft.AspNetCore.Mvc.DataAnnotations\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj", "{2DD786CA-7AF7-437A-B499-801A589B9A1C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Cors.Test", "test\Microsoft.AspNetCore.Mvc.Cors.Test\Microsoft.AspNetCore.Mvc.Cors.Test.csproj", "{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.DataAnnotations.Test", "test\Microsoft.AspNetCore.Mvc.DataAnnotations.Test\Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj", "{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ViewFeatures.Test", "test\Microsoft.AspNetCore.Mvc.ViewFeatures.Test\Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj", "{60873DFA-97B9-419E-BAA3-940FC9B07085}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Localization", "src\Microsoft.AspNetCore.Mvc.Localization\Microsoft.AspNetCore.Mvc.Localization.csproj", "{50893B10-5735-4F35-9995-F81DA3F0189E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Localization.Test", "test\Microsoft.AspNetCore.Mvc.Localization.Test\Microsoft.AspNetCore.Mvc.Localization.Test.csproj", "{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TestDiagnosticListener", "test\Microsoft.AspNetCore.Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj", "{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvcSandbox", "samples\MvcSandbox\MvcSandbox.csproj", "{14ED4476-9F24-4776-8417-EA6927F6C9C9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages", "src\Microsoft.AspNetCore.Mvc.RazorPages\Microsoft.AspNetCore.Mvc.RazorPages.csproj", "{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages.Test", "test\Microsoft.AspNetCore.Mvc.RazorPages.Test\Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj", "{0AB46520-F441-4E01-B444-08F4D23F8B1B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Performance", "benchmarks\Microsoft.AspNetCore.Mvc.Performance\Microsoft.AspNetCore.Mvc.Performance.csproj", "{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4E1795C3-60C5-4AD2-A15F-93F6CE8FAD36}"
+	ProjectSection(SolutionItems) = preProject
+		.appveyor.yml = .appveyor.yml
+		.editorconfig = .editorconfig
+		.gitattributes = .gitattributes
+		.gitignore = .gitignore
+		.travis.yml = .travis.yml
+		build.cmd = build.cmd
+		build.ps1 = build.ps1
+		build.sh = build.sh
+		CONTRIBUTING.md = CONTRIBUTING.md
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
+		LICENSE.txt = LICENSE.txt
+		NuGet.config = NuGet.config
+		NuGetPackageVerifier.json = NuGetPackageVerifier.json
+		README.md = README.md
+		Settings.StyleCop = Settings.StyleCop
+		version.xml = version.xml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{44546170-35BF-448F-88F5-4331AE67AEAE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test", "test\Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test\Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test.csproj", "{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers", "src\Microsoft.AspNetCore.Mvc.Analyzers\Microsoft.AspNetCore.Mvc.Analyzers.csproj", "{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers.Experimental", "src\Microsoft.AspNetCore.Mvc.Analyzers.Experimental\Microsoft.AspNetCore.Mvc.Analyzers.Experimental.csproj", "{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers.Test", "test\Microsoft.AspNetCore.Mvc.Analyzers.Test\Microsoft.AspNetCore.Mvc.Analyzers.Test.csproj", "{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Release|Any CPU.Build.0 = Release|Any CPU
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Release|x86.ActiveCfg = Release|Any CPU
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Release|x86.ActiveCfg = Release|Any CPU
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Release|x86.ActiveCfg = Release|Any CPU
+		{3F6E355E-4869-41D9-943B-D54771221A7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F6E355E-4869-41D9-943B-D54771221A7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F6E355E-4869-41D9-943B-D54771221A7F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3F6E355E-4869-41D9-943B-D54771221A7F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3F6E355E-4869-41D9-943B-D54771221A7F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3F6E355E-4869-41D9-943B-D54771221A7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F6E355E-4869-41D9-943B-D54771221A7F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F6E355E-4869-41D9-943B-D54771221A7F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3F6E355E-4869-41D9-943B-D54771221A7F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3F6E355E-4869-41D9-943B-D54771221A7F}.Release|x86.ActiveCfg = Release|Any CPU
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Release|x86.ActiveCfg = Release|Any CPU
+		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|x86.ActiveCfg = Release|Any CPU
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Release|x86.ActiveCfg = Release|Any CPU
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Release|x86.ActiveCfg = Release|Any CPU
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Release|x86.ActiveCfg = Release|Any CPU
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|Any CPU.Build.0 = Release|Any CPU
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|x86.ActiveCfg = Release|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|x86.Build.0 = Debug|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|x86.ActiveCfg = Release|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|x86.Build.0 = Release|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|x86.Build.0 = Debug|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|x86.ActiveCfg = Release|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|x86.Build.0 = Release|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Debug|x86.Build.0 = Debug|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Release|x86.ActiveCfg = Release|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Release|x86.Build.0 = Release|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|x86.Build.0 = Debug|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|x86.ActiveCfg = Release|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|x86.Build.0 = Release|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|x86.Build.0 = Debug|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|x86.ActiveCfg = Release|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|x86.Build.0 = Release|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|x86.Build.0 = Debug|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|x86.ActiveCfg = Release|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|x86.Build.0 = Release|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|x86.Build.0 = Debug|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|x86.ActiveCfg = Release|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|x86.Build.0 = Release|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|x86.Build.0 = Debug|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|x86.ActiveCfg = Release|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|x86.Build.0 = Release|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|x86.Build.0 = Debug|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|x86.ActiveCfg = Release|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|x86.Build.0 = Release|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|x86.Build.0 = Debug|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Any CPU.Build.0 = Release|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Release|x86.ActiveCfg = Release|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Release|x86.Build.0 = Release|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Debug|x86.Build.0 = Debug|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Release|Any CPU.Build.0 = Release|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Release|x86.ActiveCfg = Release|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Release|x86.Build.0 = Release|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|x86.Build.0 = Debug|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|x86.ActiveCfg = Release|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|x86.Build.0 = Release|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|x86.Build.0 = Debug|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|x86.ActiveCfg = Release|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|x86.Build.0 = Release|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|x86.Build.0 = Debug|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|x86.ActiveCfg = Release|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|x86.Build.0 = Release|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|x86.Build.0 = Debug|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|x86.ActiveCfg = Release|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|x86.Build.0 = Release|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|x86.Build.0 = Debug|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|x86.ActiveCfg = Release|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|x86.Build.0 = Release|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|x86.Build.0 = Debug|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Release|x86.ActiveCfg = Release|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Release|x86.Build.0 = Release|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|x86.Build.0 = Debug|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|x86.ActiveCfg = Release|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|x86.Build.0 = Release|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|x86.Build.0 = Debug|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|x86.ActiveCfg = Release|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|x86.Build.0 = Release|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Debug|x86.Build.0 = Debug|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Release|x86.ActiveCfg = Release|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Release|x86.Build.0 = Release|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|x86.Build.0 = Debug|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|x86.ActiveCfg = Release|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|x86.Build.0 = Release|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|x86.Build.0 = Debug|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|x86.ActiveCfg = Release|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|x86.Build.0 = Release|Any CPU
+		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Debug|x86.Build.0 = Debug|Any CPU
+		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Release|x86.ActiveCfg = Release|Any CPU
+		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}.Release|x86.Build.0 = Release|Any CPU
+		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Debug|x86.Build.0 = Debug|Any CPU
+		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Release|x86.ActiveCfg = Release|Any CPU
+		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD}.Release|x86.Build.0 = Release|Any CPU
+		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Debug|x86.Build.0 = Debug|Any CPU
+		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Release|x86.ActiveCfg = Release|Any CPU
+		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3}.Release|x86.Build.0 = Release|Any CPU
+		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Debug|x86.Build.0 = Debug|Any CPU
+		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Release|x86.ActiveCfg = Release|Any CPU
+		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754}.Release|x86.Build.0 = Release|Any CPU
+		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Debug|x86.Build.0 = Debug|Any CPU
+		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Release|x86.ActiveCfg = Release|Any CPU
+		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{3F6E355E-4869-41D9-943B-D54771221A7F} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{5F945B82-FE5F-425C-956C-8BC2F2020254} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{1154203C-7579-4525-906E-BC55268421C1} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{DA000953-7532-4DF5-8DB9-8143DF98D999} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{493780DA-E696-40FF-BD12-4A5C5736F292} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{22019146-BDFA-442E-8C8E-345FB9644578} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{60873DFA-97B9-419E-BAA3-940FC9B07085} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{50893B10-5735-4F35-9995-F81DA3F0189E} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9} = {DAAE4C74-D06F-4874-A166-33305D2643CE}
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{28D4DA20-6E13-47F9-80AE-D6AA7699CC35} = {44546170-35BF-448F-88F5-4331AE67AEAE}
+		{2E6CDE10-8F96-4B75-B0D9-808F6A01B8BD} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{30862895-C1FA-49F5-B69A-B0F9F2ECD0F3} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{F8FD2D6A-DCD1-4A7B-B599-B728A12A1754} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{829D9A67-2D07-4CE6-86C0-59F2549B0CFA} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D003597F-372F-4068-A2F0-353BE3C3B39A}
+	EndGlobalSection
+EndGlobal
diff --git a/src/Mvc/Mvc.sln b/src/Mvc/Mvc.sln
new file mode 100644
index 0000000000..da45132198
--- /dev/null
+++ b/src/Mvc/Mvc.sln
@@ -0,0 +1,968 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2036
+MinimumVisualStudioVersion = 15.0.26730.03
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{DAAE4C74-D06F-4874-A166-33305D2643CE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{32285FA4-6B46-4D6B-A840-2B13E4C8B58E}"
+	ProjectSection(SolutionItems) = preProject
+		src\Directory.Build.props = src\Directory.Build.props
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}"
+	ProjectSection(SolutionItems) = preProject
+		test\Directory.Build.props = test\Directory.Build.props
+		test\MvcTests.ruleset = test\MvcTests.ruleset
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{079EFA1F-0B0A-4853-B27B-5780D111CD85}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor", "src\Microsoft.AspNetCore.Mvc.Razor\Microsoft.AspNetCore.Mvc.Razor.csproj", "{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core", "src\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj", "{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.Test", "test\Microsoft.AspNetCore.Mvc.Razor.Test\Microsoft.AspNetCore.Mvc.Razor.Test.csproj", "{3F6E355E-4869-41D9-943B-D54771221A7F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core.Test", "test\Microsoft.AspNetCore.Mvc.Core.Test\Microsoft.AspNetCore.Mvc.Core.Test.csproj", "{A8AA326E-8EE8-4F11-B750-23028E0949D7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{16703B76-C9F7-4C75-AE6C-53D92E308E3C}"
+	ProjectSection(SolutionItems) = preProject
+		test\WebSites\Directory.Build.props = test\WebSites\Directory.Build.props
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.FunctionalTests", "test\Microsoft.AspNetCore.Mvc.FunctionalTests\Microsoft.AspNetCore.Mvc.FunctionalTests.csproj", "{323D0C04-B518-4A8F-8A8E-3546AD153D34}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicWebSite", "test\WebSites\BasicWebSite\BasicWebSite.csproj", "{34DF1487-12C6-476C-BE0A-F31DF1939AE5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RoutingWebSite", "test\WebSites\RoutingWebSite\RoutingWebSite.csproj", "{42CDBF4A-E238-4C0F-A416-44588363EB4C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Test", "test\Microsoft.AspNetCore.Mvc.Test\Microsoft.AspNetCore.Mvc.Test.csproj", "{5F945B82-FE5F-425C-956C-8BC2F2020254}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorWebSite", "test\WebSites\RazorWebSite\RazorWebSite.csproj", "{B07CAF59-11ED-40E3-A5DB-E1178F84FA78}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FormatterWebSite", "test\WebSites\FormatterWebSite\FormatterWebSite.csproj", "{62735776-46FF-4170-9392-02E128A69B89}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiExplorerWebSite", "test\WebSites\ApiExplorerWebSite\ApiExplorerWebSite.csproj", "{61061528-071E-424E-965A-07BCC2F02672}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VersioningWebSite", "test\WebSites\VersioningWebSite\VersioningWebSite.csproj", "{C6304029-78C8-4604-99BE-2078DCA1DD36}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TagHelpersWebSite", "test\WebSites\TagHelpersWebSite\TagHelpersWebSite.csproj", "{6DB9B8D0-80F7-4E70-BBB0-0B4C04D79A47}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilesWebSite", "test\WebSites\FilesWebSite\FilesWebSite.csproj", "{0EF9860B-10D7-452F-B0F4-A405B88BEBB3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorPageExecutionInstrumentationWebSite", "test\WebSites\RazorPageExecutionInstrumentationWebSite\RazorPageExecutionInstrumentationWebSite.csproj", "{2B2B9876-903C-4065-8D62-2EE832BBA106}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationModelWebSite", "test\WebSites\ApplicationModelWebSite\ApplicationModelWebSite.csproj", "{CAE52CB7-0FAC-4B5B-8251-B0FF837DB657}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.WebApiCompatShim", "src\Microsoft.AspNetCore.Mvc.WebApiCompatShim\Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj", "{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApiCompatShimWebSite", "test\WebSites\WebApiCompatShimWebSite\WebApiCompatShimWebSite.csproj", "{B2B7BC91-688E-4C1E-A71F-CE948D958DDF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.WebApiCompatShimTest", "test\Microsoft.AspNetCore.Mvc.WebApiCompatShimTest\Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj", "{5DE8E4D9-AACD-4B5F-819F-F091383FB996}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TagHelpers", "src\Microsoft.AspNetCore.Mvc.TagHelpers\Microsoft.AspNetCore.Mvc.TagHelpers.csproj", "{B2347320-308E-4D2B-AEC8-005DFA68B0C9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TagHelpers.Test", "test\Microsoft.AspNetCore.Mvc.TagHelpers.Test\Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj", "{860119ED-3DB1-424D-8D0A-30132A8A7D96}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HtmlGenerationWebSite", "test\WebSites\HtmlGenerationWebSite\HtmlGenerationWebSite.csproj", "{920F8A0E-6F7D-4BBE-84FF-840B89099BE6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ErrorPageMiddlewareWebSite", "test\WebSites\ErrorPageMiddlewareWebSite\ErrorPageMiddlewareWebSite.csproj", "{AD545A5B-2BA5-4314-88AC-FC2ACF2CC718}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlFormattersWebSite", "test\WebSites\XmlFormattersWebSite\XmlFormattersWebSite.csproj", "{C3123A70-41C4-4122-AD1C-D35DF8958DD7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControllersFromServicesWebSite", "test\WebSites\ControllersFromServicesWebSite\ControllersFromServicesWebSite.csproj", "{983741B2-4424-4ED1-9B03-7675A67230C8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControllersFromServicesClassLibrary", "test\WebSites\ControllersFromServicesClassLibrary\ControllersFromServicesClassLibrary.csproj", "{551DC89E-2A13-4CF2-83D7-1ADD802443D5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TestCommon", "test\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj", "{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CorsWebSite", "test\WebSites\CorsWebSite\CorsWebSite.csproj", "{94BA134D-04B3-48AA-BA55-5A4DB8640F2D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.IntegrationTests", "test\Microsoft.AspNetCore.Mvc.IntegrationTests\Microsoft.AspNetCore.Mvc.IntegrationTests.csproj", "{864FA09D-1E48-403A-A6C8-4F079D2A30F0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Abstractions", "src\Microsoft.AspNetCore.Mvc.Abstractions\Microsoft.AspNetCore.Mvc.Abstractions.csproj", "{1154203C-7579-4525-906E-BC55268421C1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ApiExplorer", "src\Microsoft.AspNetCore.Mvc.ApiExplorer\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj", "{A2B72833-5D70-4C42-AE85-E0319926FB8A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ApiExplorer.Test", "test\Microsoft.AspNetCore.Mvc.ApiExplorer.Test\Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj", "{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Abstractions.Test", "test\Microsoft.AspNetCore.Mvc.Abstractions.Test\Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj", "{DA000953-7532-4DF5-8DB9-8143DF98D999}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ViewFeatures", "src\Microsoft.AspNetCore.Mvc.ViewFeatures\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj", "{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Json", "src\Microsoft.AspNetCore.Mvc.Formatters.Json\Microsoft.AspNetCore.Mvc.Formatters.Json.csproj", "{3FC8D9D6-9352-43A3-8E81-422F270085B7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Xml", "src\Microsoft.AspNetCore.Mvc.Formatters.Xml\Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj", "{42C81540-CD47-4C68-A7A3-2A93B9C3B210}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Json.Test", "test\Microsoft.AspNetCore.Mvc.Formatters.Json.Test\Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj", "{493780DA-E696-40FF-BD12-4A5C5736F292}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Formatters.Xml.Test", "test\Microsoft.AspNetCore.Mvc.Formatters.Xml.Test\Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj", "{22019146-BDFA-442E-8C8E-345FB9644578}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Cors", "src\Microsoft.AspNetCore.Mvc.Cors\Microsoft.AspNetCore.Mvc.Cors.csproj", "{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.DataAnnotations", "src\Microsoft.AspNetCore.Mvc.DataAnnotations\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj", "{2DD786CA-7AF7-437A-B499-801A589B9A1C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Cors.Test", "test\Microsoft.AspNetCore.Mvc.Cors.Test\Microsoft.AspNetCore.Mvc.Cors.Test.csproj", "{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.DataAnnotations.Test", "test\Microsoft.AspNetCore.Mvc.DataAnnotations.Test\Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj", "{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ViewFeatures.Test", "test\Microsoft.AspNetCore.Mvc.ViewFeatures.Test\Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj", "{60873DFA-97B9-419E-BAA3-940FC9B07085}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Localization", "src\Microsoft.AspNetCore.Mvc.Localization\Microsoft.AspNetCore.Mvc.Localization.csproj", "{50893B10-5735-4F35-9995-F81DA3F0189E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Localization.Test", "test\Microsoft.AspNetCore.Mvc.Localization.Test\Microsoft.AspNetCore.Mvc.Localization.Test.csproj", "{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TestDiagnosticListener", "test\Microsoft.AspNetCore.Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj", "{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvcSandbox", "samples\MvcSandbox\MvcSandbox.csproj", "{14ED4476-9F24-4776-8417-EA6927F6C9C9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleWebSite", "test\WebSites\SimpleWebSite\SimpleWebSite.csproj", "{396B40D7-AC70-49A7-B33C-ED42129FEBE3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecurityWebSite", "test\WebSites\SecurityWebSite\SecurityWebSite.csproj", "{D28CAC79-7004-4B69-993B-EDEB4653BFA8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages", "src\Microsoft.AspNetCore.Mvc.RazorPages\Microsoft.AspNetCore.Mvc.RazorPages.csproj", "{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages.Test", "test\Microsoft.AspNetCore.Mvc.RazorPages.Test\Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj", "{0AB46520-F441-4E01-B444-08F4D23F8B1B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorPagesWebSite", "test\WebSites\RazorPagesWebSite\RazorPagesWebSite.csproj", "{4BA6EC9A-B6D9-41F2-BFDA-D82B22D80352}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Performance", "benchmarks\Microsoft.AspNetCore.Mvc.Performance\Microsoft.AspNetCore.Mvc.Performance.csproj", "{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{7500B228-1769-4CFB-A571-3DFAC6678A06}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{631720EE-11CC-41C9-9819-441417ECBEAA}"
+	ProjectSection(SolutionItems) = preProject
+		.appveyor.yml = .appveyor.yml
+		.editorconfig = .editorconfig
+		.gitattributes = .gitattributes
+		.gitignore = .gitignore
+		.travis.yml = .travis.yml
+		build.cmd = build.cmd
+		build.ps1 = build.ps1
+		build.sh = build.sh
+		CONTRIBUTING.md = CONTRIBUTING.md
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
+		LICENSE.txt = LICENSE.txt
+		NuGet.config = NuGet.config
+		NuGetPackageVerifier.json = NuGetPackageVerifier.json
+		README.md = README.md
+		Settings.StyleCop = Settings.StyleCop
+		version.xml = version.xml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{FDC66952-A3EA-4074-899E-C29816BF7C1F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorBuildWebSite", "test\WebSites\RazorBuildWebSite\RazorBuildWebSite.csproj", "{BF8A3392-C3D2-4813-855A-E906564600E1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorBuildWebSite.PrecompiledViews", "test\WebSites\RazorBuildWebSite.PrecompiledViews\RazorBuildWebSite.PrecompiledViews.csproj", "{856D7E25-E033-477D-9ABD-0B50CF428C80}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorBuildWebSite.Views", "test\WebSites\RazorBuildWebSite.Views\RazorBuildWebSite.Views.csproj", "{8916DDCA-EC2A-4193-B9F3-78CAA1A96D5A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers", "src\Microsoft.AspNetCore.Mvc.Analyzers\Microsoft.AspNetCore.Mvc.Analyzers.csproj", "{87A3E227-C45E-4141-A59F-402908E651FD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers.Test", "test\Microsoft.AspNetCore.Mvc.Analyzers.Test\Microsoft.AspNetCore.Mvc.Analyzers.Test.csproj", "{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers.Experimental", "src\Microsoft.AspNetCore.Mvc.Analyzers.Experimental\Microsoft.AspNetCore.Mvc.Analyzers.Experimental.csproj", "{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test", "test\Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test\Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test.csproj", "{E83D3745-9BCF-40E8-8D34-AFBA604C2439}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorPagesClassLibrary", "test\WebSites\RazorPagesClassLibrary\RazorPagesClassLibrary.csproj", "{17122147-ADFD-41C8-87D9-CCC582CCA8F9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Release|Any CPU.Build.0 = Release|Any CPU
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85}.Release|x86.ActiveCfg = Release|Any CPU
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E}.Release|x86.ActiveCfg = Release|Any CPU
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF}.Release|x86.ActiveCfg = Release|Any CPU
+		{3F6E355E-4869-41D9-943B-D54771221A7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F6E355E-4869-41D9-943B-D54771221A7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F6E355E-4869-41D9-943B-D54771221A7F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3F6E355E-4869-41D9-943B-D54771221A7F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3F6E355E-4869-41D9-943B-D54771221A7F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3F6E355E-4869-41D9-943B-D54771221A7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F6E355E-4869-41D9-943B-D54771221A7F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F6E355E-4869-41D9-943B-D54771221A7F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3F6E355E-4869-41D9-943B-D54771221A7F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3F6E355E-4869-41D9-943B-D54771221A7F}.Release|x86.ActiveCfg = Release|Any CPU
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7}.Release|x86.ActiveCfg = Release|Any CPU
+		{323D0C04-B518-4A8F-8A8E-3546AD153D34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{323D0C04-B518-4A8F-8A8E-3546AD153D34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{323D0C04-B518-4A8F-8A8E-3546AD153D34}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{323D0C04-B518-4A8F-8A8E-3546AD153D34}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{323D0C04-B518-4A8F-8A8E-3546AD153D34}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{323D0C04-B518-4A8F-8A8E-3546AD153D34}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{323D0C04-B518-4A8F-8A8E-3546AD153D34}.Release|Any CPU.Build.0 = Release|Any CPU
+		{323D0C04-B518-4A8F-8A8E-3546AD153D34}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{323D0C04-B518-4A8F-8A8E-3546AD153D34}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{323D0C04-B518-4A8F-8A8E-3546AD153D34}.Release|x86.ActiveCfg = Release|Any CPU
+		{34DF1487-12C6-476C-BE0A-F31DF1939AE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{34DF1487-12C6-476C-BE0A-F31DF1939AE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{34DF1487-12C6-476C-BE0A-F31DF1939AE5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{34DF1487-12C6-476C-BE0A-F31DF1939AE5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{34DF1487-12C6-476C-BE0A-F31DF1939AE5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{34DF1487-12C6-476C-BE0A-F31DF1939AE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{34DF1487-12C6-476C-BE0A-F31DF1939AE5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{34DF1487-12C6-476C-BE0A-F31DF1939AE5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{34DF1487-12C6-476C-BE0A-F31DF1939AE5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{34DF1487-12C6-476C-BE0A-F31DF1939AE5}.Release|x86.ActiveCfg = Release|Any CPU
+		{42CDBF4A-E238-4C0F-A416-44588363EB4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42CDBF4A-E238-4C0F-A416-44588363EB4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42CDBF4A-E238-4C0F-A416-44588363EB4C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{42CDBF4A-E238-4C0F-A416-44588363EB4C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{42CDBF4A-E238-4C0F-A416-44588363EB4C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{42CDBF4A-E238-4C0F-A416-44588363EB4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42CDBF4A-E238-4C0F-A416-44588363EB4C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42CDBF4A-E238-4C0F-A416-44588363EB4C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{42CDBF4A-E238-4C0F-A416-44588363EB4C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{42CDBF4A-E238-4C0F-A416-44588363EB4C}.Release|x86.ActiveCfg = Release|Any CPU
+		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|x86.ActiveCfg = Release|Any CPU
+		{B07CAF59-11ED-40E3-A5DB-E1178F84FA78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B07CAF59-11ED-40E3-A5DB-E1178F84FA78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B07CAF59-11ED-40E3-A5DB-E1178F84FA78}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B07CAF59-11ED-40E3-A5DB-E1178F84FA78}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B07CAF59-11ED-40E3-A5DB-E1178F84FA78}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B07CAF59-11ED-40E3-A5DB-E1178F84FA78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B07CAF59-11ED-40E3-A5DB-E1178F84FA78}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B07CAF59-11ED-40E3-A5DB-E1178F84FA78}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B07CAF59-11ED-40E3-A5DB-E1178F84FA78}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B07CAF59-11ED-40E3-A5DB-E1178F84FA78}.Release|x86.ActiveCfg = Release|Any CPU
+		{62735776-46FF-4170-9392-02E128A69B89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62735776-46FF-4170-9392-02E128A69B89}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62735776-46FF-4170-9392-02E128A69B89}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{62735776-46FF-4170-9392-02E128A69B89}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{62735776-46FF-4170-9392-02E128A69B89}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{62735776-46FF-4170-9392-02E128A69B89}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62735776-46FF-4170-9392-02E128A69B89}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62735776-46FF-4170-9392-02E128A69B89}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{62735776-46FF-4170-9392-02E128A69B89}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{62735776-46FF-4170-9392-02E128A69B89}.Release|x86.ActiveCfg = Release|Any CPU
+		{61061528-071E-424E-965A-07BCC2F02672}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61061528-071E-424E-965A-07BCC2F02672}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61061528-071E-424E-965A-07BCC2F02672}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{61061528-071E-424E-965A-07BCC2F02672}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{61061528-071E-424E-965A-07BCC2F02672}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{61061528-071E-424E-965A-07BCC2F02672}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61061528-071E-424E-965A-07BCC2F02672}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61061528-071E-424E-965A-07BCC2F02672}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{61061528-071E-424E-965A-07BCC2F02672}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{61061528-071E-424E-965A-07BCC2F02672}.Release|x86.ActiveCfg = Release|Any CPU
+		{C6304029-78C8-4604-99BE-2078DCA1DD36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6304029-78C8-4604-99BE-2078DCA1DD36}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6304029-78C8-4604-99BE-2078DCA1DD36}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C6304029-78C8-4604-99BE-2078DCA1DD36}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C6304029-78C8-4604-99BE-2078DCA1DD36}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C6304029-78C8-4604-99BE-2078DCA1DD36}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C6304029-78C8-4604-99BE-2078DCA1DD36}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C6304029-78C8-4604-99BE-2078DCA1DD36}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C6304029-78C8-4604-99BE-2078DCA1DD36}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{C6304029-78C8-4604-99BE-2078DCA1DD36}.Release|x86.ActiveCfg = Release|Any CPU
+		{6DB9B8D0-80F7-4E70-BBB0-0B4C04D79A47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6DB9B8D0-80F7-4E70-BBB0-0B4C04D79A47}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6DB9B8D0-80F7-4E70-BBB0-0B4C04D79A47}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6DB9B8D0-80F7-4E70-BBB0-0B4C04D79A47}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6DB9B8D0-80F7-4E70-BBB0-0B4C04D79A47}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6DB9B8D0-80F7-4E70-BBB0-0B4C04D79A47}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6DB9B8D0-80F7-4E70-BBB0-0B4C04D79A47}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6DB9B8D0-80F7-4E70-BBB0-0B4C04D79A47}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6DB9B8D0-80F7-4E70-BBB0-0B4C04D79A47}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6DB9B8D0-80F7-4E70-BBB0-0B4C04D79A47}.Release|x86.ActiveCfg = Release|Any CPU
+		{0EF9860B-10D7-452F-B0F4-A405B88BEBB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0EF9860B-10D7-452F-B0F4-A405B88BEBB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0EF9860B-10D7-452F-B0F4-A405B88BEBB3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0EF9860B-10D7-452F-B0F4-A405B88BEBB3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0EF9860B-10D7-452F-B0F4-A405B88BEBB3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0EF9860B-10D7-452F-B0F4-A405B88BEBB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0EF9860B-10D7-452F-B0F4-A405B88BEBB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0EF9860B-10D7-452F-B0F4-A405B88BEBB3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0EF9860B-10D7-452F-B0F4-A405B88BEBB3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0EF9860B-10D7-452F-B0F4-A405B88BEBB3}.Release|x86.ActiveCfg = Release|Any CPU
+		{2B2B9876-903C-4065-8D62-2EE832BBA106}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B2B9876-903C-4065-8D62-2EE832BBA106}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B2B9876-903C-4065-8D62-2EE832BBA106}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2B2B9876-903C-4065-8D62-2EE832BBA106}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2B2B9876-903C-4065-8D62-2EE832BBA106}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2B2B9876-903C-4065-8D62-2EE832BBA106}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B2B9876-903C-4065-8D62-2EE832BBA106}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B2B9876-903C-4065-8D62-2EE832BBA106}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2B2B9876-903C-4065-8D62-2EE832BBA106}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2B2B9876-903C-4065-8D62-2EE832BBA106}.Release|x86.ActiveCfg = Release|Any CPU
+		{CAE52CB7-0FAC-4B5B-8251-B0FF837DB657}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CAE52CB7-0FAC-4B5B-8251-B0FF837DB657}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CAE52CB7-0FAC-4B5B-8251-B0FF837DB657}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CAE52CB7-0FAC-4B5B-8251-B0FF837DB657}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CAE52CB7-0FAC-4B5B-8251-B0FF837DB657}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CAE52CB7-0FAC-4B5B-8251-B0FF837DB657}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CAE52CB7-0FAC-4B5B-8251-B0FF837DB657}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CAE52CB7-0FAC-4B5B-8251-B0FF837DB657}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{CAE52CB7-0FAC-4B5B-8251-B0FF837DB657}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{CAE52CB7-0FAC-4B5B-8251-B0FF837DB657}.Release|x86.ActiveCfg = Release|Any CPU
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E}.Release|x86.ActiveCfg = Release|Any CPU
+		{B2B7BC91-688E-4C1E-A71F-CE948D958DDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2B7BC91-688E-4C1E-A71F-CE948D958DDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2B7BC91-688E-4C1E-A71F-CE948D958DDF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B2B7BC91-688E-4C1E-A71F-CE948D958DDF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B2B7BC91-688E-4C1E-A71F-CE948D958DDF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B2B7BC91-688E-4C1E-A71F-CE948D958DDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2B7BC91-688E-4C1E-A71F-CE948D958DDF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2B7BC91-688E-4C1E-A71F-CE948D958DDF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B2B7BC91-688E-4C1E-A71F-CE948D958DDF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B2B7BC91-688E-4C1E-A71F-CE948D958DDF}.Release|x86.ActiveCfg = Release|Any CPU
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996}.Release|x86.ActiveCfg = Release|Any CPU
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9}.Release|x86.ActiveCfg = Release|Any CPU
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|Any CPU.Build.0 = Release|Any CPU
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|x86.ActiveCfg = Release|Any CPU
+		{920F8A0E-6F7D-4BBE-84FF-840B89099BE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{920F8A0E-6F7D-4BBE-84FF-840B89099BE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{920F8A0E-6F7D-4BBE-84FF-840B89099BE6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{920F8A0E-6F7D-4BBE-84FF-840B89099BE6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{920F8A0E-6F7D-4BBE-84FF-840B89099BE6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{920F8A0E-6F7D-4BBE-84FF-840B89099BE6}.Debug|x86.Build.0 = Debug|Any CPU
+		{920F8A0E-6F7D-4BBE-84FF-840B89099BE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{920F8A0E-6F7D-4BBE-84FF-840B89099BE6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{920F8A0E-6F7D-4BBE-84FF-840B89099BE6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{920F8A0E-6F7D-4BBE-84FF-840B89099BE6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{920F8A0E-6F7D-4BBE-84FF-840B89099BE6}.Release|x86.ActiveCfg = Release|Any CPU
+		{920F8A0E-6F7D-4BBE-84FF-840B89099BE6}.Release|x86.Build.0 = Release|Any CPU
+		{AD545A5B-2BA5-4314-88AC-FC2ACF2CC718}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD545A5B-2BA5-4314-88AC-FC2ACF2CC718}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD545A5B-2BA5-4314-88AC-FC2ACF2CC718}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AD545A5B-2BA5-4314-88AC-FC2ACF2CC718}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AD545A5B-2BA5-4314-88AC-FC2ACF2CC718}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AD545A5B-2BA5-4314-88AC-FC2ACF2CC718}.Debug|x86.Build.0 = Debug|Any CPU
+		{AD545A5B-2BA5-4314-88AC-FC2ACF2CC718}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD545A5B-2BA5-4314-88AC-FC2ACF2CC718}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD545A5B-2BA5-4314-88AC-FC2ACF2CC718}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{AD545A5B-2BA5-4314-88AC-FC2ACF2CC718}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{AD545A5B-2BA5-4314-88AC-FC2ACF2CC718}.Release|x86.ActiveCfg = Release|Any CPU
+		{AD545A5B-2BA5-4314-88AC-FC2ACF2CC718}.Release|x86.Build.0 = Release|Any CPU
+		{C3123A70-41C4-4122-AD1C-D35DF8958DD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3123A70-41C4-4122-AD1C-D35DF8958DD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3123A70-41C4-4122-AD1C-D35DF8958DD7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C3123A70-41C4-4122-AD1C-D35DF8958DD7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C3123A70-41C4-4122-AD1C-D35DF8958DD7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C3123A70-41C4-4122-AD1C-D35DF8958DD7}.Debug|x86.Build.0 = Debug|Any CPU
+		{C3123A70-41C4-4122-AD1C-D35DF8958DD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C3123A70-41C4-4122-AD1C-D35DF8958DD7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C3123A70-41C4-4122-AD1C-D35DF8958DD7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C3123A70-41C4-4122-AD1C-D35DF8958DD7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{C3123A70-41C4-4122-AD1C-D35DF8958DD7}.Release|x86.ActiveCfg = Release|Any CPU
+		{C3123A70-41C4-4122-AD1C-D35DF8958DD7}.Release|x86.Build.0 = Release|Any CPU
+		{983741B2-4424-4ED1-9B03-7675A67230C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{983741B2-4424-4ED1-9B03-7675A67230C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{983741B2-4424-4ED1-9B03-7675A67230C8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{983741B2-4424-4ED1-9B03-7675A67230C8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{983741B2-4424-4ED1-9B03-7675A67230C8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{983741B2-4424-4ED1-9B03-7675A67230C8}.Debug|x86.Build.0 = Debug|Any CPU
+		{983741B2-4424-4ED1-9B03-7675A67230C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{983741B2-4424-4ED1-9B03-7675A67230C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{983741B2-4424-4ED1-9B03-7675A67230C8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{983741B2-4424-4ED1-9B03-7675A67230C8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{983741B2-4424-4ED1-9B03-7675A67230C8}.Release|x86.ActiveCfg = Release|Any CPU
+		{983741B2-4424-4ED1-9B03-7675A67230C8}.Release|x86.Build.0 = Release|Any CPU
+		{551DC89E-2A13-4CF2-83D7-1ADD802443D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{551DC89E-2A13-4CF2-83D7-1ADD802443D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{551DC89E-2A13-4CF2-83D7-1ADD802443D5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{551DC89E-2A13-4CF2-83D7-1ADD802443D5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{551DC89E-2A13-4CF2-83D7-1ADD802443D5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{551DC89E-2A13-4CF2-83D7-1ADD802443D5}.Debug|x86.Build.0 = Debug|Any CPU
+		{551DC89E-2A13-4CF2-83D7-1ADD802443D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{551DC89E-2A13-4CF2-83D7-1ADD802443D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{551DC89E-2A13-4CF2-83D7-1ADD802443D5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{551DC89E-2A13-4CF2-83D7-1ADD802443D5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{551DC89E-2A13-4CF2-83D7-1ADD802443D5}.Release|x86.ActiveCfg = Release|Any CPU
+		{551DC89E-2A13-4CF2-83D7-1ADD802443D5}.Release|x86.Build.0 = Release|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Debug|x86.Build.0 = Debug|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|x86.ActiveCfg = Release|Any CPU
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}.Release|x86.Build.0 = Release|Any CPU
+		{94BA134D-04B3-48AA-BA55-5A4DB8640F2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94BA134D-04B3-48AA-BA55-5A4DB8640F2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94BA134D-04B3-48AA-BA55-5A4DB8640F2D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{94BA134D-04B3-48AA-BA55-5A4DB8640F2D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{94BA134D-04B3-48AA-BA55-5A4DB8640F2D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{94BA134D-04B3-48AA-BA55-5A4DB8640F2D}.Debug|x86.Build.0 = Debug|Any CPU
+		{94BA134D-04B3-48AA-BA55-5A4DB8640F2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94BA134D-04B3-48AA-BA55-5A4DB8640F2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94BA134D-04B3-48AA-BA55-5A4DB8640F2D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{94BA134D-04B3-48AA-BA55-5A4DB8640F2D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{94BA134D-04B3-48AA-BA55-5A4DB8640F2D}.Release|x86.ActiveCfg = Release|Any CPU
+		{94BA134D-04B3-48AA-BA55-5A4DB8640F2D}.Release|x86.Build.0 = Release|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Debug|x86.Build.0 = Debug|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|x86.ActiveCfg = Release|Any CPU
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0}.Release|x86.Build.0 = Release|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Debug|x86.Build.0 = Debug|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Release|x86.ActiveCfg = Release|Any CPU
+		{1154203C-7579-4525-906E-BC55268421C1}.Release|x86.Build.0 = Release|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Debug|x86.Build.0 = Debug|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|x86.ActiveCfg = Release|Any CPU
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A}.Release|x86.Build.0 = Release|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Debug|x86.Build.0 = Debug|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|x86.ActiveCfg = Release|Any CPU
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|x86.Build.0 = Release|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Debug|x86.Build.0 = Debug|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|x86.ActiveCfg = Release|Any CPU
+		{DA000953-7532-4DF5-8DB9-8143DF98D999}.Release|x86.Build.0 = Release|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|x86.Build.0 = Debug|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|x86.ActiveCfg = Release|Any CPU
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|x86.Build.0 = Release|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|x86.Build.0 = Debug|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|x86.ActiveCfg = Release|Any CPU
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|x86.Build.0 = Release|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|x86.Build.0 = Debug|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|x86.ActiveCfg = Release|Any CPU
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|x86.Build.0 = Release|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|x86.Build.0 = Debug|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Any CPU.Build.0 = Release|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Release|x86.ActiveCfg = Release|Any CPU
+		{493780DA-E696-40FF-BD12-4A5C5736F292}.Release|x86.Build.0 = Release|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Debug|x86.Build.0 = Debug|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Release|Any CPU.Build.0 = Release|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Release|x86.ActiveCfg = Release|Any CPU
+		{22019146-BDFA-442E-8C8E-345FB9644578}.Release|x86.Build.0 = Release|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|x86.Build.0 = Debug|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|x86.ActiveCfg = Release|Any CPU
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|x86.Build.0 = Release|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|x86.Build.0 = Debug|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|x86.ActiveCfg = Release|Any CPU
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|x86.Build.0 = Release|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|x86.Build.0 = Debug|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|x86.ActiveCfg = Release|Any CPU
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|x86.Build.0 = Release|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|x86.Build.0 = Debug|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|x86.ActiveCfg = Release|Any CPU
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|x86.Build.0 = Release|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|x86.Build.0 = Debug|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|x86.ActiveCfg = Release|Any CPU
+		{60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|x86.Build.0 = Release|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Debug|x86.Build.0 = Debug|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Release|x86.ActiveCfg = Release|Any CPU
+		{50893B10-5735-4F35-9995-F81DA3F0189E}.Release|x86.Build.0 = Release|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Debug|x86.Build.0 = Debug|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|x86.ActiveCfg = Release|Any CPU
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7}.Release|x86.Build.0 = Release|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Debug|x86.Build.0 = Debug|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|x86.ActiveCfg = Release|Any CPU
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4}.Release|x86.Build.0 = Release|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Debug|x86.Build.0 = Debug|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Release|x86.ActiveCfg = Release|Any CPU
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9}.Release|x86.Build.0 = Release|Any CPU
+		{396B40D7-AC70-49A7-B33C-ED42129FEBE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{396B40D7-AC70-49A7-B33C-ED42129FEBE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{396B40D7-AC70-49A7-B33C-ED42129FEBE3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{396B40D7-AC70-49A7-B33C-ED42129FEBE3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{396B40D7-AC70-49A7-B33C-ED42129FEBE3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{396B40D7-AC70-49A7-B33C-ED42129FEBE3}.Debug|x86.Build.0 = Debug|Any CPU
+		{396B40D7-AC70-49A7-B33C-ED42129FEBE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{396B40D7-AC70-49A7-B33C-ED42129FEBE3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{396B40D7-AC70-49A7-B33C-ED42129FEBE3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{396B40D7-AC70-49A7-B33C-ED42129FEBE3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{396B40D7-AC70-49A7-B33C-ED42129FEBE3}.Release|x86.ActiveCfg = Release|Any CPU
+		{396B40D7-AC70-49A7-B33C-ED42129FEBE3}.Release|x86.Build.0 = Release|Any CPU
+		{D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Debug|x86.Build.0 = Debug|Any CPU
+		{D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Release|x86.ActiveCfg = Release|Any CPU
+		{D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Release|x86.Build.0 = Release|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Debug|x86.Build.0 = Debug|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|x86.ActiveCfg = Release|Any CPU
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53}.Release|x86.Build.0 = Release|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Debug|x86.Build.0 = Debug|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|x86.ActiveCfg = Release|Any CPU
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B}.Release|x86.Build.0 = Release|Any CPU
+		{4BA6EC9A-B6D9-41F2-BFDA-D82B22D80352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4BA6EC9A-B6D9-41F2-BFDA-D82B22D80352}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4BA6EC9A-B6D9-41F2-BFDA-D82B22D80352}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4BA6EC9A-B6D9-41F2-BFDA-D82B22D80352}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4BA6EC9A-B6D9-41F2-BFDA-D82B22D80352}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4BA6EC9A-B6D9-41F2-BFDA-D82B22D80352}.Debug|x86.Build.0 = Debug|Any CPU
+		{4BA6EC9A-B6D9-41F2-BFDA-D82B22D80352}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4BA6EC9A-B6D9-41F2-BFDA-D82B22D80352}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4BA6EC9A-B6D9-41F2-BFDA-D82B22D80352}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4BA6EC9A-B6D9-41F2-BFDA-D82B22D80352}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4BA6EC9A-B6D9-41F2-BFDA-D82B22D80352}.Release|x86.ActiveCfg = Release|Any CPU
+		{4BA6EC9A-B6D9-41F2-BFDA-D82B22D80352}.Release|x86.Build.0 = Release|Any CPU
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Debug|x86.Build.0 = Debug|Any CPU
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Release|x86.ActiveCfg = Release|Any CPU
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}.Release|x86.Build.0 = Release|Any CPU
+		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Debug|x86.Build.0 = Debug|Any CPU
+		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Release|x86.ActiveCfg = Release|Any CPU
+		{7500B228-1769-4CFB-A571-3DFAC6678A06}.Release|x86.Build.0 = Release|Any CPU
+		{BF8A3392-C3D2-4813-855A-E906564600E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF8A3392-C3D2-4813-855A-E906564600E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF8A3392-C3D2-4813-855A-E906564600E1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BF8A3392-C3D2-4813-855A-E906564600E1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BF8A3392-C3D2-4813-855A-E906564600E1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BF8A3392-C3D2-4813-855A-E906564600E1}.Debug|x86.Build.0 = Debug|Any CPU
+		{BF8A3392-C3D2-4813-855A-E906564600E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BF8A3392-C3D2-4813-855A-E906564600E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF8A3392-C3D2-4813-855A-E906564600E1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BF8A3392-C3D2-4813-855A-E906564600E1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BF8A3392-C3D2-4813-855A-E906564600E1}.Release|x86.ActiveCfg = Release|Any CPU
+		{BF8A3392-C3D2-4813-855A-E906564600E1}.Release|x86.Build.0 = Release|Any CPU
+		{856D7E25-E033-477D-9ABD-0B50CF428C80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{856D7E25-E033-477D-9ABD-0B50CF428C80}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{856D7E25-E033-477D-9ABD-0B50CF428C80}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{856D7E25-E033-477D-9ABD-0B50CF428C80}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{856D7E25-E033-477D-9ABD-0B50CF428C80}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{856D7E25-E033-477D-9ABD-0B50CF428C80}.Debug|x86.Build.0 = Debug|Any CPU
+		{856D7E25-E033-477D-9ABD-0B50CF428C80}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{856D7E25-E033-477D-9ABD-0B50CF428C80}.Release|Any CPU.Build.0 = Release|Any CPU
+		{856D7E25-E033-477D-9ABD-0B50CF428C80}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{856D7E25-E033-477D-9ABD-0B50CF428C80}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{856D7E25-E033-477D-9ABD-0B50CF428C80}.Release|x86.ActiveCfg = Release|Any CPU
+		{856D7E25-E033-477D-9ABD-0B50CF428C80}.Release|x86.Build.0 = Release|Any CPU
+		{8916DDCA-EC2A-4193-B9F3-78CAA1A96D5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8916DDCA-EC2A-4193-B9F3-78CAA1A96D5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8916DDCA-EC2A-4193-B9F3-78CAA1A96D5A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8916DDCA-EC2A-4193-B9F3-78CAA1A96D5A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8916DDCA-EC2A-4193-B9F3-78CAA1A96D5A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8916DDCA-EC2A-4193-B9F3-78CAA1A96D5A}.Debug|x86.Build.0 = Debug|Any CPU
+		{8916DDCA-EC2A-4193-B9F3-78CAA1A96D5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8916DDCA-EC2A-4193-B9F3-78CAA1A96D5A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8916DDCA-EC2A-4193-B9F3-78CAA1A96D5A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{8916DDCA-EC2A-4193-B9F3-78CAA1A96D5A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{8916DDCA-EC2A-4193-B9F3-78CAA1A96D5A}.Release|x86.ActiveCfg = Release|Any CPU
+		{8916DDCA-EC2A-4193-B9F3-78CAA1A96D5A}.Release|x86.Build.0 = Release|Any CPU
+		{87A3E227-C45E-4141-A59F-402908E651FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87A3E227-C45E-4141-A59F-402908E651FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87A3E227-C45E-4141-A59F-402908E651FD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{87A3E227-C45E-4141-A59F-402908E651FD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{87A3E227-C45E-4141-A59F-402908E651FD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{87A3E227-C45E-4141-A59F-402908E651FD}.Debug|x86.Build.0 = Debug|Any CPU
+		{87A3E227-C45E-4141-A59F-402908E651FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87A3E227-C45E-4141-A59F-402908E651FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{87A3E227-C45E-4141-A59F-402908E651FD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{87A3E227-C45E-4141-A59F-402908E651FD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{87A3E227-C45E-4141-A59F-402908E651FD}.Release|x86.ActiveCfg = Release|Any CPU
+		{87A3E227-C45E-4141-A59F-402908E651FD}.Release|x86.Build.0 = Release|Any CPU
+		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Debug|x86.Build.0 = Debug|Any CPU
+		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Release|x86.ActiveCfg = Release|Any CPU
+		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831}.Release|x86.Build.0 = Release|Any CPU
+		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Debug|x86.Build.0 = Debug|Any CPU
+		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Release|x86.ActiveCfg = Release|Any CPU
+		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61}.Release|x86.Build.0 = Release|Any CPU
+		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Debug|x86.Build.0 = Debug|Any CPU
+		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Release|x86.ActiveCfg = Release|Any CPU
+		{E83D3745-9BCF-40E8-8D34-AFBA604C2439}.Release|x86.Build.0 = Release|Any CPU
+		{17122147-ADFD-41C8-87D9-CCC582CCA8F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17122147-ADFD-41C8-87D9-CCC582CCA8F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17122147-ADFD-41C8-87D9-CCC582CCA8F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{17122147-ADFD-41C8-87D9-CCC582CCA8F9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{17122147-ADFD-41C8-87D9-CCC582CCA8F9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{17122147-ADFD-41C8-87D9-CCC582CCA8F9}.Debug|x86.Build.0 = Debug|Any CPU
+		{17122147-ADFD-41C8-87D9-CCC582CCA8F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17122147-ADFD-41C8-87D9-CCC582CCA8F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17122147-ADFD-41C8-87D9-CCC582CCA8F9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{17122147-ADFD-41C8-87D9-CCC582CCA8F9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{17122147-ADFD-41C8-87D9-CCC582CCA8F9}.Release|x86.ActiveCfg = Release|Any CPU
+		{17122147-ADFD-41C8-87D9-CCC582CCA8F9}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{079EFA1F-0B0A-4853-B27B-5780D111CD85} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{314E9AD6-2FFC-4A92-A8AD-510658C64F1E} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{C48DA9D7-ACB5-4408-AA79-27ECB60A67EF} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{3F6E355E-4869-41D9-943B-D54771221A7F} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{A8AA326E-8EE8-4F11-B750-23028E0949D7} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{16703B76-C9F7-4C75-AE6C-53D92E308E3C} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{323D0C04-B518-4A8F-8A8E-3546AD153D34} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{34DF1487-12C6-476C-BE0A-F31DF1939AE5} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{42CDBF4A-E238-4C0F-A416-44588363EB4C} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{5F945B82-FE5F-425C-956C-8BC2F2020254} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{B07CAF59-11ED-40E3-A5DB-E1178F84FA78} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{62735776-46FF-4170-9392-02E128A69B89} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{61061528-071E-424E-965A-07BCC2F02672} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{C6304029-78C8-4604-99BE-2078DCA1DD36} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{6DB9B8D0-80F7-4E70-BBB0-0B4C04D79A47} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{0EF9860B-10D7-452F-B0F4-A405B88BEBB3} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{2B2B9876-903C-4065-8D62-2EE832BBA106} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{CAE52CB7-0FAC-4B5B-8251-B0FF837DB657} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{23D30B8C-04B1-4577-A604-ED27EA1E4A0E} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{B2B7BC91-688E-4C1E-A71F-CE948D958DDF} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{5DE8E4D9-AACD-4B5F-819F-F091383FB996} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{B2347320-308E-4D2B-AEC8-005DFA68B0C9} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{860119ED-3DB1-424D-8D0A-30132A8A7D96} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{920F8A0E-6F7D-4BBE-84FF-840B89099BE6} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{AD545A5B-2BA5-4314-88AC-FC2ACF2CC718} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{C3123A70-41C4-4122-AD1C-D35DF8958DD7} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{983741B2-4424-4ED1-9B03-7675A67230C8} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{551DC89E-2A13-4CF2-83D7-1ADD802443D5} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{94BA134D-04B3-48AA-BA55-5A4DB8640F2D} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{864FA09D-1E48-403A-A6C8-4F079D2A30F0} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{1154203C-7579-4525-906E-BC55268421C1} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{A2B72833-5D70-4C42-AE85-E0319926FB8A} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{DA000953-7532-4DF5-8DB9-8143DF98D999} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{3F8B8FC1-9FE4-4788-8991-367113E8D7AD} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{3FC8D9D6-9352-43A3-8E81-422F270085B7} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{42C81540-CD47-4C68-A7A3-2A93B9C3B210} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{493780DA-E696-40FF-BD12-4A5C5736F292} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{22019146-BDFA-442E-8C8E-345FB9644578} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{9A07EEA2-942E-4969-9D41-799B6E2D1FF5} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{2DD786CA-7AF7-437A-B499-801A589B9A1C} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{60873DFA-97B9-419E-BAA3-940FC9B07085} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{50893B10-5735-4F35-9995-F81DA3F0189E} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{8FC726B5-E766-44E0-8B38-1313B6D8D9A7} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{9879B5D5-2325-4A81-B4DF-F279FE8FEEB4} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{14ED4476-9F24-4776-8417-EA6927F6C9C9} = {DAAE4C74-D06F-4874-A166-33305D2643CE}
+		{396B40D7-AC70-49A7-B33C-ED42129FEBE3} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{D28CAC79-7004-4B69-993B-EDEB4653BFA8} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{CF322BE1-E1FE-4CFD-8FCA-16A14B905D53} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{0AB46520-F441-4E01-B444-08F4D23F8B1B} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{4BA6EC9A-B6D9-41F2-BFDA-D82B22D80352} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE} = {FDC66952-A3EA-4074-899E-C29816BF7C1F}
+		{7500B228-1769-4CFB-A571-3DFAC6678A06} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{BF8A3392-C3D2-4813-855A-E906564600E1} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{856D7E25-E033-477D-9ABD-0B50CF428C80} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{8916DDCA-EC2A-4193-B9F3-78CAA1A96D5A} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+		{87A3E227-C45E-4141-A59F-402908E651FD} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{CBF23034-2249-4FE5-BD48-5F3CEAC0DF61} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+		{E83D3745-9BCF-40E8-8D34-AFBA604C2439} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+		{17122147-ADFD-41C8-87D9-CCC582CCA8F9} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {63D344F6-F86D-40E6-85B9-0AABBE338C4A}
+	EndGlobalSection
+EndGlobal
diff --git a/src/Mvc/NuGetPackageVerifier.json b/src/Mvc/NuGetPackageVerifier.json
new file mode 100644
index 0000000000..b153ab1515
--- /dev/null
+++ b/src/Mvc/NuGetPackageVerifier.json
@@ -0,0 +1,7 @@
+{
+    "Default": {
+        "rules": [
+            "DefaultCompositeRule"
+        ]
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/README.md b/src/Mvc/README.md
new file mode 100644
index 0000000000..e5aa14d771
--- /dev/null
+++ b/src/Mvc/README.md
@@ -0,0 +1,28 @@
+ASP.NET Core MVC
+===
+
+**Note: For ASP.NET MVC 5.x, Web API 2.x, and Web Pages 3.x (not ASP.NET Core), see https://github.com/aspnet/AspNetWebStack**
+
+AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/969jbosi0qwc1awg/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/mvc/branch/dev)
+
+Travis:   [![Travis](https://travis-ci.org/aspnet/Mvc.svg?branch=dev)](https://travis-ci.org/aspnet/Mvc)
+
+ASP.NET Core MVC gives you a powerful, patterns-based way to build dynamic websites that enables a clean separation of concerns and gives you full control over markup for enjoyable, agile development. ASP.NET Core MVC includes many features that enable fast, TDD-friendly development for creating sophisticated applications that use the latest web standards.
+
+ASP.NET Core MVC includes support for building web pages and HTTP services in a single aligned framework that can be hosted in IIS or self-hosted in your own process.
+
+See the [ASP.NET Core MVC documentation](https://docs.microsoft.com/aspnet/core/).
+
+Related community projects:
+* [AspNet.Mvc.TypedRouting](https://github.com/ivaylokenov/AspNet.Mvc.TypedRouting): A collection of extension methods providing strongly typed routing and link generation for ASP.NET Core MVC projects.
+* [ASP.NET MVC Boilerplate](https://visualstudiogallery.msdn.microsoft.com/6cf50a48-fc1e-4eaf-9e82-0b2a6705ca7d): Rich templates for ASP.NET Core MVC.
+* [MyTested.AspNetCore.Mvc](https://github.com/ivaylokenov/MyTested.AspNetCore.Mvc): Powerful fluent testing framework for ASP.NET Core MVC.
+* [MvcDeviceDetector](https://github.com/laskoviymishka/MvcDeviceDetector): Device detection mechanism to create mobile web applications.
+* [XmlResult](https://github.com/Wallsmedia/XmlResult): XML formatter extensions to allow defining the XML serializer type.
+* [AspNetCoreImageTagHelper](https://github.com/ignatandrei/AspNetCoreImageTagHelper): Tag helper for rendering images as inline base64 data.
+
+This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo.
+
+## Building from source
+
+To run a complete build on command line only, execute `build.cmd` or `build.sh` without arguments. See [developer documentation](https://github.com/aspnet/Home/wiki) for more details.
diff --git a/src/Mvc/Settings.StyleCop b/src/Mvc/Settings.StyleCop
new file mode 100644
index 0000000000..7b8130298c
--- /dev/null
+++ b/src/Mvc/Settings.StyleCop
@@ -0,0 +1,455 @@
+<StyleCopSettings Version="105">
+  <GlobalSettings>
+    <StringProperty Name="MergeSettingsFiles">NoMerge</StringProperty>
+  </GlobalSettings>
+  <Parsers>
+    <Parser ParserId="StyleCop.CSharp.CsParser">
+      <ParserSettings>
+        <BooleanProperty Name="AnalyzeDesignerFiles">False</BooleanProperty>
+      </ParserSettings>
+    </Parser>
+  </Parsers>
+  <Analyzers>
+    <Analyzer AnalyzerId="StyleCop.CSharp.NamingRules">
+      <Rules>
+        <Rule Name="ConstFieldNamesMustBeginWithUpperCaseLetter">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FieldNamesMustNotBeginWithUnderscore">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FieldNamesMustNotUseHungarianNotation">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="StaticReadonlyFieldsMustBeginWithUpperCaseLetter">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings>
+        <CollectionProperty Name="Hungarian">
+          <Value>as</Value>
+          <Value>db</Value>
+          <Value>dc</Value>
+          <Value>do</Value>
+          <Value>ef</Value>
+          <Value>id</Value>
+          <Value>if</Value>
+          <Value>in</Value>
+          <Value>is</Value>
+          <Value>my</Value>
+          <Value>no</Value>
+          <Value>on</Value>
+          <Value>sl</Value>
+          <Value>to</Value>
+          <Value>ui</Value>
+          <Value>vs</Value>
+        </CollectionProperty>
+      </AnalyzerSettings>
+    </Analyzer>
+    <Analyzer AnalyzerId="StyleCop.CSharp.DocumentationRules">
+      <Rules>
+        <Rule Name="FileMustHaveHeader">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustContainFileName">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderFileNameDocumentationMustMatchFileName">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustHaveValidCompanyText">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ConstructorSummaryDocumentationMustBeginWithStandardText">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="DestructorSummaryDocumentationMustBeginWithStandardText">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="DocumentationHeadersMustNotContainBlankLines">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ElementsMustBeDocumented">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="PartialElementsMustBeDocumented">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="EnumerationItemsMustBeDocumented">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="DocumentationMustContainValidXml">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ElementDocumentationMustHaveSummary">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="PartialElementDocumentationMustHaveSummary">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ElementDocumentationMustHaveSummaryText">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="PartialElementDocumentationMustHaveSummaryText">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ElementDocumentationMustNotHaveDefaultSummary">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ElementParametersMustBeDocumented">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ElementParameterDocumentationMustMatchElementParameters">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ElementParameterDocumentationMustDeclareParameterName">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ElementParameterDocumentationMustHaveText">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ElementReturnValueMustBeDocumented">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ElementReturnValueDocumentationMustHaveText">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="VoidReturnValueMustNotBeDocumented">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="GenericTypeParametersMustBeDocumented">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="GenericTypeParametersMustBeDocumentedPartialClass">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="GenericTypeParameterDocumentationMustMatchTypeParameters">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="GenericTypeParameterDocumentationMustDeclareParameterName">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="GenericTypeParameterDocumentationMustHaveText">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="PropertySummaryDocumentationMustMatchAccessors">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="PropertySummaryDocumentationMustOmitSetAccessorWithRestrictedAccess">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ElementDocumentationMustNotBeCopiedAndPasted">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="SingleLineCommentsMustNotUseDocumentationStyleSlashes">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="DocumentationTextMustNotBeEmpty">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="DocumentationTextMustContainWhitespace">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="DocumentationMustMeetCharacterPercentage">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="IncludedDocumentationXPathDoesNotExist">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="IncludeNodeDoesNotContainValidFileAndPath">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="InheritDocMustBeUsedWithInheritingClass">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustShowCopyright">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustHaveCopyrightText">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderFileNameDocumentationMustMatchTypeName">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings>
+        <BooleanProperty Name="IgnorePrivates">True</BooleanProperty>
+        <BooleanProperty Name="IgnoreInternals">True</BooleanProperty>
+      </AnalyzerSettings>
+    </Analyzer>
+    <Analyzer AnalyzerId="StyleCop.CSharp.ReadabilityRules">
+      <Rules>
+        <Rule Name="OpeningParenthesisMustBeOnDeclarationLine">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ParameterMustNotSpanMultipleLines">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="UseStringEmptyForEmptyStrings">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="PrefixCallsCorrectly">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="PrefixLocalCallsWithThis">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ParameterMustFollowComma">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="SplitParametersMustStartOnLineAfterDeclaration">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ParametersMustBeOnSameLineOrSeparateLines">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="UseBuiltInTypeAlias">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings />
+    </Analyzer>
+    <Analyzer AnalyzerId="Microsoft.Web.StyleCop.Rules">
+      <AnalyzerSettings>
+        <StringProperty Name="FileHeaderText"> Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.</StringProperty>
+      </AnalyzerSettings>
+    </Analyzer>
+    <Analyzer AnalyzerId="StyleCop.CSharp.LayoutRules">
+      <Rules>
+        <Rule Name="AllAccessorsMustBeMultiLineOrSingleLine">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="SingleLineCommentsMustNotBeFollowedByBlankLine">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ClosingCurlyBracketMustBeFollowedByBlankLine">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="SingleLineCommentMustBePrecededByBlankLine">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ElementsMustBeSeparatedByBlankLine">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings />
+    </Analyzer>
+    <Analyzer AnalyzerId="StyleCop.CSharp.MaintainabilityRules">
+      <Rules>
+        <Rule Name="ConditionalExpressionsMustDeclarePrecedence">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FieldsMustBePrivate">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="DebugAssertMustProvideMessageText">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="StatementMustNotUseUnnecessaryParenthesis">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings />
+    </Analyzer>
+    <Analyzer AnalyzerId="StyleCop.CSharp.OrderingRules">
+      <Rules>
+        <Rule Name="UsingDirectivesMustBePlacedWithinNamespace">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ElementsMustAppearInTheCorrectOrder">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ElementsMustBeOrderedByAccess">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ConstantsMustAppearBeforeFields">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="InstanceReadonlyElementsMustAppearBeforeInstanceNonReadonlyElements">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="StaticElementsMustAppearBeforeInstanceElements">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="StaticReadonlyElementsMustAppearBeforeStaticNonReadonlyElements">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings />
+    </Analyzer>
+    <Analyzer AnalyzerId="StyleCop.CSharp.SpacingRules">
+      <Rules>
+        <Rule Name="SingleLineCommentsMustBeginWithSingleSpace">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+
+        <!-- Creates a lot of noise with anonymous objects -->
+        <Rule Name="OpeningCurlyBracketsMustBeSpacedCorrectly">
+           <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ClosingCurlyBracketsMustBeSpacedCorrectly">
+           <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings />
+    </Analyzer>
+    <Analyzer AnalyzerId="StyleCop.KRules.FileHeaderRule">
+      <Rules />
+      <AnalyzerSettings>
+        <StringProperty Name="FileHeaderText"> Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.</StringProperty>
+      </AnalyzerSettings>
+    </Analyzer>
+    <Analyzer AnalyzerId="StyleCop.KRules.LineLengthRule">
+      <Rules />
+      <AnalyzerSettings>
+        <IntegerProperty Name="LineLength">120</IntegerProperty>
+      </AnalyzerSettings>
+    </Analyzer>
+  </Analyzers>
+</StyleCopSettings>
\ No newline at end of file
diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ActionSelectorBenchmark.cs b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ActionSelectorBenchmark.cs
new file mode 100644
index 0000000000..ec9c2c5a4b
--- /dev/null
+++ b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ActionSelectorBenchmark.cs
@@ -0,0 +1,264 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.Performance
+{
+    public class ActionSelectorBenchmark
+    {
+        private const int Seed = 1000;
+
+        // About 35 or so plausible sounding conventional routing actions.
+        //
+        // We include some duplicates here, because that's what happens when you have one method that handles
+        // GET and one that handles POST.
+        private static readonly ActionDescriptor[] _actions = new ActionDescriptor[]
+        {
+            CreateActionDescriptor(new { area = "Admin", controller = "Account", action = "AddUser" }),
+            CreateActionDescriptor(new { area = "Admin", controller = "Account", action = "AddUser" }),
+            CreateActionDescriptor(new { area = "Admin", controller = "Account", action = "DeleteUser" }),
+            CreateActionDescriptor(new { area = "Admin", controller = "Account", action = "DeleteUser" }),
+            CreateActionDescriptor(new { area = "Admin", controller = "Account", action = "Details" }),
+            CreateActionDescriptor(new { area = "Admin", controller = "Account", action = "List" }),
+
+            CreateActionDescriptor(new { area = "Admin", controller = "Diagnostics", action = "Stats" }),
+            CreateActionDescriptor(new { area = "Admin", controller = "Diagnostics", action = "Performance" }),
+
+            CreateActionDescriptor(new { area = "Admin", controller = "Products", action = "CreateProduct" }),
+            CreateActionDescriptor(new { area = "Admin", controller = "Products", action = "CreateProduct" }),
+            CreateActionDescriptor(new { area = "Admin", controller = "Products", action = "DeleteProduct" }),
+            CreateActionDescriptor(new { area = "Admin", controller = "Products", action = "DeleteProduct" }),
+            CreateActionDescriptor(new { area = "Admin", controller = "Products", action = "EditProduct" }),
+            CreateActionDescriptor(new { area = "Admin", controller = "Products", action = "EditProduct" }),
+            CreateActionDescriptor(new { area = "Admin", controller = "Products", action = "Index" }),
+            CreateActionDescriptor(new { area = "Admin", controller = "Products", action = "Inventory" }),
+
+            CreateActionDescriptor(new { area = "Store", controller = "Search", action = "FindProduct" }),
+            CreateActionDescriptor(new { area = "Store", controller = "Search", action = "ShowCategory" }),
+            CreateActionDescriptor(new { area = "Store", controller = "Search", action = "HotItems" }),
+
+            CreateActionDescriptor(new { area = "Store", controller = "Product", action = "Index" }),
+            CreateActionDescriptor(new { area = "Store", controller = "Product", action = "Details" }),
+            CreateActionDescriptor(new { area = "Store", controller = "Product", action = "Buy" }),
+
+            CreateActionDescriptor(new { area = "Store", controller = "Checkout", action = "ViewCart" }),
+            CreateActionDescriptor(new { area = "Store", controller = "Checkout", action = "Billing" }),
+            CreateActionDescriptor(new { area = "Store", controller = "Checkout", action = "Confim" }),
+            CreateActionDescriptor(new { area = "Store", controller = "Checkout", action = "Confim" }),
+
+            CreateActionDescriptor(new { area = "", controller = "Blog", action = "Index" }),
+            CreateActionDescriptor(new { area = "", controller = "Blog", action = "Search" }),
+            CreateActionDescriptor(new { area = "", controller = "Blog", action = "ViewPost" }),
+            CreateActionDescriptor(new { area = "", controller = "Blog", action = "PostComment" }),
+
+            CreateActionDescriptor(new { area = "", controller = "Home", action = "Index" }),
+            CreateActionDescriptor(new { area = "", controller = "Home", action = "Search" }),
+            CreateActionDescriptor(new { area = "", controller = "Home", action = "About" }),
+            CreateActionDescriptor(new { area = "", controller = "Home", action = "Contact" }),
+            CreateActionDescriptor(new { area = "", controller = "Home", action = "Support" }),
+        };
+
+        private static readonly KeyValuePair<RouteValueDictionary, IReadOnlyList<ActionDescriptor>>[] _dataSet = GetDataSet(_actions);
+
+        private static readonly IActionSelector _actionSelector = CreateActionSelector(_actions);
+
+        [Benchmark(Description = "conventional action selection implementation")]
+        public void SelectCandidates_MatchRouteData()
+        {
+            var routeContext = new RouteContext(new DefaultHttpContext());
+
+            for (var i = 0; i < _dataSet.Length; i++)
+            {
+                var routeValues = _dataSet[i].Key;
+                var expected = _dataSet[i].Value;
+
+                var state = routeContext.RouteData.PushState(MockRouter.Instance, routeValues, null);
+
+                var actual = _actionSelector.SelectCandidates(routeContext);
+                Verify(expected, actual);
+
+                state.Restore();
+            }
+        }
+
+        [Benchmark(Baseline = true, Description = "conventional action selection baseline")]
+        public void SelectCandidates_Baseline()
+        {
+            var routeContext = new RouteContext(new DefaultHttpContext());
+
+            for (var i = 0; i < _dataSet.Length; i++)
+            {
+                var routeValues = _dataSet[i].Key;
+                var expected = _dataSet[i].Value;
+
+                var state = routeContext.RouteData.PushState(MockRouter.Instance, routeValues, null);
+
+                var actual = NaiveSelectCandiates(_actions, routeContext.RouteData.Values);
+                Verify(expected, actual);
+
+                state.Restore();
+            }
+        }
+
+        // A naive implementation we can use to generate match data for inputs, and for a baseline.
+        private static IReadOnlyList<ActionDescriptor> NaiveSelectCandiates(ActionDescriptor[] actions, RouteValueDictionary routeValues)
+        {
+            var results = new List<ActionDescriptor>();
+            for (var i = 0; i < actions.Length; i++)
+            {
+                var action = actions[i];
+
+                var isMatch = true;
+                foreach (var kvp in action.RouteValues)
+                {
+                    var routeValue = Convert.ToString(routeValues[kvp.Key]) ?? string.Empty;
+
+                    if (string.IsNullOrEmpty(kvp.Value) && string.IsNullOrEmpty(routeValue))
+                    {
+                        // Match
+                    }
+                    else if (string.Equals(kvp.Value, routeValue, StringComparison.OrdinalIgnoreCase))
+                    {
+                        // Match;
+                    }
+                    else
+                    {
+                        isMatch = false;
+                        break;
+                    }
+                }
+
+                if (isMatch)
+                {
+                    results.Add(action);
+                }
+            }
+
+            return results;
+        }
+
+        private static ActionDescriptor CreateActionDescriptor(object obj)
+        {
+            // Our real ActionDescriptors don't use RVD, they use a regular old dictionary.
+            // Just using RVD here to understand the anonymous object for brevity.
+            var routeValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            foreach (var kvp in new RouteValueDictionary(obj))
+            {
+                routeValues.Add(kvp.Key, Convert.ToString(kvp.Value) ?? string.Empty);
+            }
+
+            return new ActionDescriptor()
+            {
+                RouteValues = routeValues,
+            };
+        }
+
+        private static KeyValuePair<RouteValueDictionary, IReadOnlyList<ActionDescriptor>>[] GetDataSet(ActionDescriptor[] actions)
+        {
+            var random = new Random(Seed);
+
+            var data = new List<KeyValuePair<RouteValueDictionary, IReadOnlyList<ActionDescriptor>>>();
+
+            for (var i = 0; i < actions.Length; i += 2)
+            {
+                var action = actions[i];
+                var routeValues = new RouteValueDictionary(action.RouteValues);
+                var matches = NaiveSelectCandiates(actions, routeValues);
+                if (matches.Count == 0)
+                {
+                    throw new InvalidOperationException("This should have at least one match.");
+                }
+
+
+                data.Add(new KeyValuePair<RouteValueDictionary, IReadOnlyList<ActionDescriptor>>(routeValues, matches));
+            }
+
+            for (var i = 1; i < actions.Length; i += 3)
+            {
+                var action = actions[i];
+                var routeValues = new RouteValueDictionary(action.RouteValues);
+
+                // Make one of the route values not match.
+                routeValues[routeValues.First().Key] = ((string)routeValues.First().Value) + "fkdkfdkkf";
+
+                var matches = NaiveSelectCandiates(actions, routeValues);
+                if (matches.Count != 0)
+                {
+                    throw new InvalidOperationException("This should have 0 matches.");
+                }
+
+                data.Add(new KeyValuePair<RouteValueDictionary, IReadOnlyList<ActionDescriptor>>(routeValues, matches));
+            }
+
+            return data.ToArray();
+        }
+
+        private static void Verify(IReadOnlyList<ActionDescriptor> expected, IReadOnlyList<ActionDescriptor> actual)
+        {
+            if (expected.Count == 0 && actual == null)
+            {
+                return;
+            }
+
+            if (expected.Count != actual.Count)
+            {
+                throw new InvalidOperationException("The count is different.");
+            }
+
+            for (var i = 0; i < actual.Count; i++)
+            {
+                if (!object.ReferenceEquals(expected[i], actual[i]))
+                {
+                    throw new InvalidOperationException("The actions don't match.");
+                }
+            }
+        }
+
+        private static IActionSelector CreateActionSelector(ActionDescriptor[] actions)
+        {
+            var actionCollection = new MockActionDescriptorCollectionProvider(actions);
+
+            return new ActionSelector(
+                actionCollection,
+                new ActionConstraintCache(actionCollection, Enumerable.Empty<IActionConstraintProvider>()),
+                NullLoggerFactory.Instance);
+        }
+
+        private class MockActionDescriptorCollectionProvider : IActionDescriptorCollectionProvider
+        {
+            public MockActionDescriptorCollectionProvider(ActionDescriptor[] actions)
+            {
+                ActionDescriptors = new ActionDescriptorCollection(actions, 0);
+            }
+
+            public ActionDescriptorCollection ActionDescriptors { get; }
+        }
+
+        private class MockRouter : IRouter
+        {
+            public static readonly IRouter Instance = new MockRouter();
+
+            public VirtualPathData GetVirtualPath(VirtualPathContext context)
+            {
+                throw new NotImplementedException();
+            }
+
+            public Task RouteAsync(RouteContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/AssemblyInfo.cs b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/AssemblyInfo.cs
new file mode 100644
index 0000000000..32248e0d1b
--- /dev/null
+++ b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/AssemblyInfo.cs
@@ -0,0 +1 @@
+[assembly: BenchmarkDotNet.Attributes.AspNetCoreBenchmark]
diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj
new file mode 100644
index 0000000000..da89cbef0a
--- /dev/null
+++ b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <ServerGarbageCollection>true</ServerGarbageCollection>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="$(MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/readme.md b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/readme.md
new file mode 100644
index 0000000000..8adc74351b
--- /dev/null
+++ b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/readme.md
@@ -0,0 +1,11 @@
+Compile the solution in Release mode (so binaries are available in release)
+
+To run a specific benchmark add it as parameter
+```
+dotnet run -c Release <benchmark_name>
+```
+To run all use `All` as parameter
+```
+dotnet run -c Release All
+```
+Using no parameter will list all available benchmarks
\ No newline at end of file
diff --git a/src/Mvc/build/Key.snk b/src/Mvc/build/Key.snk
new file mode 100644
index 0000000000..e10e4889c1
Binary files /dev/null and b/src/Mvc/build/Key.snk differ
diff --git a/src/Mvc/build/buildpipeline/linux.groovy b/src/Mvc/build/buildpipeline/linux.groovy
new file mode 100644
index 0000000000..903f218bb8
--- /dev/null
+++ b/src/Mvc/build/buildpipeline/linux.groovy
@@ -0,0 +1,10 @@
+@Library('dotnet-ci') _
+
+simpleNode('Ubuntu16.04', 'latest-or-auto-docker') {
+    stage ('Checking out source') {
+        checkout scm
+    }
+    stage ('Build') {
+        sh './build.sh --ci'
+    }
+}
diff --git a/src/Mvc/build/buildpipeline/osx.groovy b/src/Mvc/build/buildpipeline/osx.groovy
new file mode 100644
index 0000000000..aaac63686b
--- /dev/null
+++ b/src/Mvc/build/buildpipeline/osx.groovy
@@ -0,0 +1,10 @@
+@Library('dotnet-ci') _
+
+simpleNode('OSX10.12','latest') {
+    stage ('Checking out source') {
+        checkout scm
+    }
+    stage ('Build') {
+        sh './build.sh --ci'
+    }
+}
diff --git a/src/Mvc/build/buildpipeline/pipeline.groovy b/src/Mvc/build/buildpipeline/pipeline.groovy
new file mode 100644
index 0000000000..e915cadae1
--- /dev/null
+++ b/src/Mvc/build/buildpipeline/pipeline.groovy
@@ -0,0 +1,18 @@
+import org.dotnet.ci.pipelines.Pipeline
+
+def windowsPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows.groovy')
+def linuxPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/linux.groovy')
+def osxPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/osx.groovy')
+String configuration = 'Release'
+def parameters = [
+    'Configuration': configuration
+]
+
+windowsPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", parameters)
+windowsPipeline.triggerPipelineOnGithubPush(parameters)
+
+linuxPipeline.triggerPipelineOnEveryGithubPR("Ubuntu 16.04 ${configuration} Build", parameters)
+linuxPipeline.triggerPipelineOnGithubPush(parameters)
+
+osxPipeline.triggerPipelineOnEveryGithubPR("OSX 10.12 ${configuration} Build", parameters)
+osxPipeline.triggerPipelineOnGithubPush(parameters)
diff --git a/src/Mvc/build/buildpipeline/windows.groovy b/src/Mvc/build/buildpipeline/windows.groovy
new file mode 100644
index 0000000000..8d26f313d4
--- /dev/null
+++ b/src/Mvc/build/buildpipeline/windows.groovy
@@ -0,0 +1,12 @@
+@Library('dotnet-ci') _
+
+// 'node' indicates to Jenkins that the enclosed block runs on a node that matches
+// the label 'windows-with-vs'
+simpleNode('Windows_NT','latest') {
+    stage ('Checking out source') {
+        checkout scm
+    }
+    stage ('Build') {
+        bat '.\\run.cmd -CI default-build'
+    }
+}
diff --git a/src/Mvc/build/dependencies.props b/src/Mvc/build/dependencies.props
new file mode 100644
index 0000000000..3e21512352
--- /dev/null
+++ b/src/Mvc/build/dependencies.props
@@ -0,0 +1,103 @@
+<Project>
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+
+  <!-- These package versions may be overridden or updated by automation. -->
+  <PropertyGroup Label="Package Versions: Auto">
+    <AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>
+    <BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
+    <InternalAspNetCoreSdkPackageVersion>2.1.3-rtm-15802</InternalAspNetCoreSdkPackageVersion>
+    <MicrosoftAspNetWebApiClientPackageVersion>5.2.6</MicrosoftAspNetWebApiClientPackageVersion>
+    <MicrosoftCodeAnalysisCSharpPackageVersion>2.8.0</MicrosoftCodeAnalysisCSharpPackageVersion>
+    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>2.8.0</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
+    <MicrosoftDiaSymReaderNativePackageVersion>1.7.0</MicrosoftDiaSymReaderNativePackageVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>2.1.0</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
+    <MicrosoftNETCoreApp21PackageVersion>2.1.2</MicrosoftNETCoreApp21PackageVersion>
+    <MicrosoftNETSdkRazorPackageVersion>2.1.1</MicrosoftNETSdkRazorPackageVersion>
+    <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
+    <MoqPackageVersion>4.7.49</MoqPackageVersion>
+    <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
+    <NewtonsoftJsonBsonPackageVersion>1.0.1</NewtonsoftJsonBsonPackageVersion>
+    <SystemComponentModelAnnotationsPackageVersion>4.5.0</SystemComponentModelAnnotationsPackageVersion>
+    <SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.0</SystemDiagnosticsDiagnosticSourcePackageVersion>
+    <SystemThreadingTasksExtensionsPackageVersion>4.5.1</SystemThreadingTasksExtensionsPackageVersion>
+    <XunitAnalyzersPackageVersion>0.8.0</XunitAnalyzersPackageVersion>
+    <XunitPackageVersion>2.3.1</XunitPackageVersion>
+    <XunitRunnerVisualStudioPackageVersion>2.4.0-beta.1.build3945</XunitRunnerVisualStudioPackageVersion>
+  </PropertyGroup>
+
+  <!-- This may import a generated file which may override the variables above. -->
+  <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
+
+  <!-- These are package versions that should not be overridden or updated by automation. -->
+  <PropertyGroup Label="Package Versions: Pinned">
+    <MicrosoftAspNetCoreAntiforgeryPackageVersion>2.1.1</MicrosoftAspNetCoreAntiforgeryPackageVersion>
+    <MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.1.1</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
+    <MicrosoftAspNetCoreAuthenticationCorePackageVersion>2.1.1</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
+    <MicrosoftAspNetCoreAuthenticationPackageVersion>2.1.1</MicrosoftAspNetCoreAuthenticationPackageVersion>
+    <MicrosoftAspNetCoreAuthorizationPolicyPackageVersion>2.1.1</MicrosoftAspNetCoreAuthorizationPolicyPackageVersion>
+    <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>2.1.1</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
+    <MicrosoftAspNetCoreChunkingCookieManagerSourcesPackageVersion>2.1.1</MicrosoftAspNetCoreChunkingCookieManagerSourcesPackageVersion>
+    <MicrosoftAspNetCoreCookiePolicyPackageVersion>2.1.1</MicrosoftAspNetCoreCookiePolicyPackageVersion>
+    <MicrosoftAspNetCoreCorsPackageVersion>2.1.1</MicrosoftAspNetCoreCorsPackageVersion>
+    <MicrosoftAspNetCoreDiagnosticsAbstractionsPackageVersion>2.1.1</MicrosoftAspNetCoreDiagnosticsAbstractionsPackageVersion>
+    <MicrosoftAspNetCoreDiagnosticsPackageVersion>2.1.1</MicrosoftAspNetCoreDiagnosticsPackageVersion>
+    <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>2.1.1</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
+    <MicrosoftAspNetCoreHostingPackageVersion>2.1.1</MicrosoftAspNetCoreHostingPackageVersion>
+    <MicrosoftAspNetCoreHtmlAbstractionsPackageVersion>2.1.1</MicrosoftAspNetCoreHtmlAbstractionsPackageVersion>
+    <MicrosoftAspNetCoreHttpExtensionsPackageVersion>2.1.1</MicrosoftAspNetCoreHttpExtensionsPackageVersion>
+    <MicrosoftAspNetCoreHttpPackageVersion>2.1.1</MicrosoftAspNetCoreHttpPackageVersion>
+    <MicrosoftAspNetCoreJsonPatchPackageVersion>2.1.1</MicrosoftAspNetCoreJsonPatchPackageVersion>
+    <MicrosoftAspNetCoreLocalizationPackageVersion>2.1.1</MicrosoftAspNetCoreLocalizationPackageVersion>
+    <MicrosoftAspNetCoreLocalizationRoutingPackageVersion>2.1.1</MicrosoftAspNetCoreLocalizationRoutingPackageVersion>
+    <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>2.1.1</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
+    <MicrosoftAspNetCoreRangeHelperSourcesPackageVersion>2.1.1</MicrosoftAspNetCoreRangeHelperSourcesPackageVersion>
+    <MicrosoftAspNetCoreRazorDesignPackageVersion>2.1.1</MicrosoftAspNetCoreRazorDesignPackageVersion>
+    <MicrosoftAspNetCoreRazorLanguagePackageVersion>2.1.1</MicrosoftAspNetCoreRazorLanguagePackageVersion>
+    <MicrosoftAspNetCoreRazorRuntimePackageVersion>2.1.1</MicrosoftAspNetCoreRazorRuntimePackageVersion>
+    <MicrosoftAspNetCoreRazorTagHelpersTestingSourcesPackageVersion>2.1.1</MicrosoftAspNetCoreRazorTagHelpersTestingSourcesPackageVersion>
+    <MicrosoftAspNetCoreResponseCachingAbstractionsPackageVersion>2.1.1</MicrosoftAspNetCoreResponseCachingAbstractionsPackageVersion>
+    <MicrosoftAspNetCoreResponseCachingPackageVersion>2.1.1</MicrosoftAspNetCoreResponseCachingPackageVersion>
+    <MicrosoftAspNetCoreRoutingAbstractionsPackageVersion>2.1.1</MicrosoftAspNetCoreRoutingAbstractionsPackageVersion>
+    <MicrosoftAspNetCoreRoutingPackageVersion>2.1.1</MicrosoftAspNetCoreRoutingPackageVersion>
+    <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.1.1</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
+    <MicrosoftAspNetCoreServerKestrelPackageVersion>2.1.2</MicrosoftAspNetCoreServerKestrelPackageVersion>
+    <MicrosoftAspNetCoreSessionPackageVersion>2.1.1</MicrosoftAspNetCoreSessionPackageVersion>
+    <MicrosoftAspNetCoreStaticFilesPackageVersion>2.1.1</MicrosoftAspNetCoreStaticFilesPackageVersion>
+    <MicrosoftAspNetCoreTestHostPackageVersion>2.1.1</MicrosoftAspNetCoreTestHostPackageVersion>
+    <MicrosoftAspNetCoreTestingPackageVersion>2.1.0</MicrosoftAspNetCoreTestingPackageVersion>
+    <MicrosoftAspNetCoreWebUtilitiesPackageVersion>2.1.1</MicrosoftAspNetCoreWebUtilitiesPackageVersion>
+    <MicrosoftCodeAnalysisRazorPackageVersion>2.1.1</MicrosoftCodeAnalysisRazorPackageVersion>
+    <MicrosoftExtensionsCachingMemoryPackageVersion>2.1.1</MicrosoftExtensionsCachingMemoryPackageVersion>
+    <MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion>2.1.1</MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion>
+    <MicrosoftExtensionsConfigurationJsonPackageVersion>2.1.1</MicrosoftExtensionsConfigurationJsonPackageVersion>
+    <MicrosoftExtensionsConfigurationPackageVersion>2.1.1</MicrosoftExtensionsConfigurationPackageVersion>
+    <MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>2.1.1</MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionPackageVersion>2.1.1</MicrosoftExtensionsDependencyInjectionPackageVersion>
+    <MicrosoftExtensionsDiagnosticAdapterPackageVersion>2.1.0</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
+    <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>2.1.1</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
+    <MicrosoftExtensionsFileProvidersCompositePackageVersion>2.1.1</MicrosoftExtensionsFileProvidersCompositePackageVersion>
+    <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>2.1.1</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
+    <MicrosoftExtensionsFileSystemGlobbingPackageVersion>2.1.1</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
+    <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>2.1.1</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
+    <MicrosoftExtensionsLocalizationPackageVersion>2.1.1</MicrosoftExtensionsLocalizationPackageVersion>
+    <MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.1.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
+    <MicrosoftExtensionsLoggingConsolePackageVersion>2.1.1</MicrosoftExtensionsLoggingConsolePackageVersion>
+    <MicrosoftExtensionsLoggingDebugPackageVersion>2.1.1</MicrosoftExtensionsLoggingDebugPackageVersion>
+    <MicrosoftExtensionsLoggingPackageVersion>2.1.1</MicrosoftExtensionsLoggingPackageVersion>
+    <MicrosoftExtensionsLoggingTestingPackageVersion>2.1.1</MicrosoftExtensionsLoggingTestingPackageVersion>
+    <MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion>2.1.1</MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion>
+    <MicrosoftExtensionsOptionsPackageVersion>2.1.1</MicrosoftExtensionsOptionsPackageVersion>
+    <MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>2.1.1</MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>
+    <MicrosoftExtensionsPrimitivesPackageVersion>2.1.1</MicrosoftExtensionsPrimitivesPackageVersion>
+    <MicrosoftExtensionsPropertyActivatorSourcesPackageVersion>2.1.1</MicrosoftExtensionsPropertyActivatorSourcesPackageVersion>
+    <MicrosoftExtensionsPropertyHelperSourcesPackageVersion>2.1.1</MicrosoftExtensionsPropertyHelperSourcesPackageVersion>
+    <MicrosoftExtensionsSecurityHelperSourcesPackageVersion>2.1.1</MicrosoftExtensionsSecurityHelperSourcesPackageVersion>
+    <MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>2.1.1</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>
+    <MicrosoftExtensionsValueStopwatchSourcesPackageVersion>2.1.1</MicrosoftExtensionsValueStopwatchSourcesPackageVersion>
+    <MicrosoftExtensionsWebEncodersPackageVersion>2.1.1</MicrosoftExtensionsWebEncodersPackageVersion>
+    <MicrosoftNetHttpHeadersPackageVersion>2.1.1</MicrosoftNetHttpHeadersPackageVersion>
+  </PropertyGroup>
+</Project>
diff --git a/src/Mvc/build/repo.props b/src/Mvc/build/repo.props
new file mode 100644
index 0000000000..53e1be33f0
--- /dev/null
+++ b/src/Mvc/build/repo.props
@@ -0,0 +1,23 @@
+<Project>
+  <Import Project="dependencies.props" />
+
+  <PropertyGroup>
+    <EnableBenchmarkValidation>true</EnableBenchmarkValidation>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ExcludeFromTest Include="$(RepositoryRoot)test\Microsoft.AspNetCore.Mvc.TestCommon\*.csproj" />
+    <ExcludeFromTest Include="$(RepositoryRoot)test\Microsoft.AspNetCore.Mvc.TestDiagnosticListener\*.csproj" />
+    <ExcludeSolutions Include="$(RepositoryRoot)Mvc.*Fun.sln" />
+  </ItemGroup>
+  <PropertyGroup>
+    <!-- These properties are use by the automation that updates dependencies.props -->
+    <LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
+    <LineupPackageVersion>2.1.0-rc1-*</LineupPackageVersion>
+    <LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</LineupPackageRestoreSource>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/build/sources.props b/src/Mvc/build/sources.props
new file mode 100644
index 0000000000..9215df9751
--- /dev/null
+++ b/src/Mvc/build/sources.props
@@ -0,0 +1,17 @@
+<Project>
+  <Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
+
+  <PropertyGroup Label="RestoreSources">
+    <RestoreSources>$(DotNetRestoreSources)</RestoreSources>
+    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
+      $(RestoreSources);
+      https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
+      https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
+      https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
+    </RestoreSources>
+    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
+      $(RestoreSources);
+      https://api.nuget.org/v3/index.json;
+    </RestoreSources>
+  </PropertyGroup>
+</Project>
diff --git a/src/Mvc/samples/MvcSandbox/.bowerrc b/src/Mvc/samples/MvcSandbox/.bowerrc
new file mode 100644
index 0000000000..6406626abf
--- /dev/null
+++ b/src/Mvc/samples/MvcSandbox/.bowerrc
@@ -0,0 +1,3 @@
+{
+  "directory": "wwwroot/lib"
+}
diff --git a/src/Mvc/samples/MvcSandbox/.gitignore b/src/Mvc/samples/MvcSandbox/.gitignore
new file mode 100644
index 0000000000..ea32980d43
--- /dev/null
+++ b/src/Mvc/samples/MvcSandbox/.gitignore
@@ -0,0 +1,2 @@
+# Ignore everything
+*
diff --git a/src/Mvc/samples/MvcSandbox/Controllers/HomeController.cs b/src/Mvc/samples/MvcSandbox/Controllers/HomeController.cs
new file mode 100644
index 0000000000..2aa4ff6829
--- /dev/null
+++ b/src/Mvc/samples/MvcSandbox/Controllers/HomeController.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace MvcSandbox.Controllers
+{
+    public class HomeController : Controller
+    {
+        [ModelBinder]
+        public string Id { get; set; }
+
+        public IActionResult Index()
+        {
+            return View();
+        }
+    }
+}
diff --git a/src/Mvc/samples/MvcSandbox/Models/Index.cs b/src/Mvc/samples/MvcSandbox/Models/Index.cs
new file mode 100644
index 0000000000..5f282702bb
--- /dev/null
+++ b/src/Mvc/samples/MvcSandbox/Models/Index.cs
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/Mvc/samples/MvcSandbox/Models/TestModel.cs b/src/Mvc/samples/MvcSandbox/Models/TestModel.cs
new file mode 100644
index 0000000000..29e881e9a4
--- /dev/null
+++ b/src/Mvc/samples/MvcSandbox/Models/TestModel.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace MvcSandbox
+{
+    public class TestModel : PageModel
+    {
+        public string Name { get; private set; } = "World";
+
+        public IActionResult OnPost(string name)
+        {
+            Name = name;
+            return Page();
+        }
+    }
+}
diff --git a/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj b/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj
new file mode 100644
index 0000000000..116e4a2f66
--- /dev/null
+++ b/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <RazorCompileOnBuild>true</RazorCompileOnBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(MicrosoftAspNetCoreDiagnosticsPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="$(MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="$(MicrosoftAspNetCoreRazorDesignPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/samples/MvcSandbox/Pages/PagesHome.cshtml b/src/Mvc/samples/MvcSandbox/Pages/PagesHome.cshtml
new file mode 100644
index 0000000000..3c565a3b59
--- /dev/null
+++ b/src/Mvc/samples/MvcSandbox/Pages/PagesHome.cshtml
@@ -0,0 +1,31 @@
+@page
+@model TestModel
+@{
+
+    ViewData["Title"] = "Hello from pages";
+}
+
+@functions {
+
+    [TempData]
+    public string Message { get; set; }
+}
+
+<div class="row">
+    <div class="col-md-3">
+        <h2>RazorPages says Hello @Model.Name!</h2>
+        <ul>
+            <li>This file should give you a quick view of a Mvc Razor Page in action.</li>
+        </ul>
+        <p>Message from TempData: @Message</p>
+        @{ 
+            Message = $"You visited this page at {DateTime.Now}.";
+        }
+    </div>
+
+    <form method="post">
+        <label>Say hello to <input type="text" name="name" /></label>
+        <input type="submit" value="Say" />
+    </form>
+          
+</div>
diff --git a/src/Mvc/samples/MvcSandbox/Pages/_ViewImports.cshtml b/src/Mvc/samples/MvcSandbox/Pages/_ViewImports.cshtml
new file mode 100644
index 0000000000..f4b9eaae4f
--- /dev/null
+++ b/src/Mvc/samples/MvcSandbox/Pages/_ViewImports.cshtml
@@ -0,0 +1,2 @@
+@namespace MvcSandbox.Pages
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Mvc/samples/MvcSandbox/Pages/_ViewStart.cshtml b/src/Mvc/samples/MvcSandbox/Pages/_ViewStart.cshtml
new file mode 100644
index 0000000000..26214bbe6c
--- /dev/null
+++ b/src/Mvc/samples/MvcSandbox/Pages/_ViewStart.cshtml
@@ -0,0 +1 @@
+@{ Layout = "_Layout";}
\ No newline at end of file
diff --git a/src/Mvc/samples/MvcSandbox/Startup.cs b/src/Mvc/samples/MvcSandbox/Startup.cs
new file mode 100644
index 0000000000..b963a03a6f
--- /dev/null
+++ b/src/Mvc/samples/MvcSandbox/Startup.cs
@@ -0,0 +1,55 @@
+// 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.
+
+using System.IO;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace MvcSandbox
+{
+    public class Startup
+    {
+        // This method gets called by the runtime. Use this method to add services to the container.
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddMvc().SetCompatibilityVersion(Microsoft.AspNetCore.Mvc.CompatibilityVersion.Version_2_1);
+        }
+
+        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseDeveloperExceptionPage();
+            app.UseStaticFiles();
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(
+                    name: "default",
+                    template: "{controller=Home}/{action=Index}/{id?}");
+            });
+        }
+
+        public static void Main(string[] args)
+        {
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
+            host.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            new WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .ConfigureLogging(factory =>
+                {
+                    factory
+                        .AddConsole()
+                        .AddDebug();
+                })
+                .UseIISIntegration()
+                .UseKestrel()
+                .UseStartup<Startup>();
+    }
+}
+
diff --git a/src/Mvc/samples/MvcSandbox/Views/Home/Index.cshtml b/src/Mvc/samples/MvcSandbox/Views/Home/Index.cshtml
new file mode 100644
index 0000000000..93a5e737b0
--- /dev/null
+++ b/src/Mvc/samples/MvcSandbox/Views/Home/Index.cshtml
@@ -0,0 +1,12 @@
+@{
+    ViewData["Title"] = "Home Page";
+}
+
+<div class="row">
+    <div class="col-md-3">
+        <h2>Sandbox</h2>
+        <ul>
+            <li>This sandbox should give you a quick view of a basic MVC application.</li>
+        </ul>
+    </div>
+</div>
diff --git a/src/Mvc/samples/MvcSandbox/Views/Shared/_Layout.cshtml b/src/Mvc/samples/MvcSandbox/Views/Shared/_Layout.cshtml
new file mode 100644
index 0000000000..2308354c26
--- /dev/null
+++ b/src/Mvc/samples/MvcSandbox/Views/Shared/_Layout.cshtml
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - MvcSandbox</title>
+    <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.5/css/bootstrap.min.css" />
+</head>
+<body>
+    <div class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a asp-controller="Home" asp-action="Index" class="navbar-brand">MvcSandbox</a>
+            </div>
+            <div class="navbar-collapse collapse">
+                <ul class="nav navbar-nav">
+                    <li><a asp-controller="Home" asp-action="Index">Home</a></li>
+                    <li><a asp-page="/PagesHome">PagesHome</a></li>
+                </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container body-content">
+        @RenderBody()
+        <hr />
+        <footer>
+            <p>&copy; 2015 - MvcSandbox</p>
+        </footer>
+    </div>
+
+    <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.1.4.min.js"></script>
+    <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.5/bootstrap.min.js"></script>
+
+    @RenderSection("scripts", required: false)
+</body>
+</html>
diff --git a/src/Mvc/samples/MvcSandbox/Views/_ViewImports.cshtml b/src/Mvc/samples/MvcSandbox/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..96ba4523d1
--- /dev/null
+++ b/src/Mvc/samples/MvcSandbox/Views/_ViewImports.cshtml
@@ -0,0 +1,2 @@
+@using MvcSandbox
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Mvc/samples/MvcSandbox/Views/_ViewStart.cshtml b/src/Mvc/samples/MvcSandbox/Views/_ViewStart.cshtml
new file mode 100644
index 0000000000..a5f10045db
--- /dev/null
+++ b/src/Mvc/samples/MvcSandbox/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}
diff --git a/src/Mvc/src/Directory.Build.props b/src/Mvc/src/Directory.Build.props
new file mode 100644
index 0000000000..4b89a431e7
--- /dev/null
+++ b/src/Mvc/src/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project>
+  <Import Project="..\Directory.Build.props" />
+
+  <ItemGroup>
+    <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptor.cs
new file mode 100644
index 0000000000..a1ced7244b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptor.cs
@@ -0,0 +1,64 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace Microsoft.AspNetCore.Mvc.Abstractions
+{
+    public class ActionDescriptor
+    {
+        public ActionDescriptor()
+        {
+            Id = Guid.NewGuid().ToString();
+            Properties = new Dictionary<object, object>();
+            RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        }
+
+        /// <summary>
+        /// Gets an id which uniquely identifies the action.
+        /// </summary>
+        public string Id { get; }
+
+        /// <summary>
+        /// Gets or sets the collection of route values that must be provided by routing
+        /// for the action to be selected.
+        /// </summary>
+        public IDictionary<string, string> RouteValues { get; set; }
+
+        public AttributeRouteInfo AttributeRouteInfo { get; set; }
+
+        /// <summary>
+        /// The set of constraints for this action. Must all be satisfied for the action to be selected.
+        /// </summary>
+        public IList<IActionConstraintMetadata> ActionConstraints { get; set; }
+
+        /// <summary>
+        /// The set of parameters associated with this action.
+        /// </summary>
+        public IList<ParameterDescriptor> Parameters { get; set; }
+
+        /// <summary>
+        /// The set of properties which are model bound.
+        /// </summary>
+        public IList<ParameterDescriptor> BoundProperties { get; set; }
+
+        /// <summary>
+        /// The set of filters associated with this action.
+        /// </summary>
+        public IList<FilterDescriptor> FilterDescriptors { get; set; }
+
+        /// <summary>
+        /// A friendly name for this action.
+        /// </summary>
+        public virtual string DisplayName { get; set; }
+
+        /// <summary>
+        /// Stores arbitrary metadata properties associated with the <see cref="ActionDescriptor"/>.
+        /// </summary>
+        public IDictionary<object, object> Properties { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptorExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptorExtensions.cs
new file mode 100644
index 0000000000..3cd94db1f1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptorExtensions.cs
@@ -0,0 +1,60 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Abstractions
+{
+    /// <summary>
+    /// Extension methods for <see cref="ActionDescriptor"/>.
+    /// </summary>
+    public static class ActionDescriptorExtensions
+    {
+        /// <summary>
+        /// Gets the value of a property from the <see cref="ActionDescriptor.Properties"/> collection
+        /// using the provided value of <typeparamref name="T"/> as the key.
+        /// </summary>
+        /// <typeparam name="T">The type of the property.</typeparam>
+        /// <param name="actionDescriptor">The action descriptor.</param>
+        /// <returns>The property or the default value of <typeparamref name="T"/>.</returns>
+        public static T GetProperty<T>(this ActionDescriptor actionDescriptor)
+        {
+            if (actionDescriptor == null)
+            {
+                throw new ArgumentNullException(nameof(actionDescriptor));
+            }
+
+            object value;
+            if (actionDescriptor.Properties.TryGetValue(typeof(T), out value))
+            {
+                return (T)value;
+            }
+            else
+            {
+                return default(T);
+            }
+        }
+
+        /// <summary>
+        /// Sets the value of an property in the <see cref="ActionDescriptor.Properties"/> collection using
+        /// the provided value of <typeparamref name="T"/> as the key.
+        /// </summary>
+        /// <typeparam name="T">The type of the property.</typeparam>
+        /// <param name="actionDescriptor">The action descriptor.</param>
+        /// <param name="value">The value of the property.</param>
+        public static void SetProperty<T>(this ActionDescriptor actionDescriptor, T value)
+        {
+            if (actionDescriptor == null)
+            {
+                throw new ArgumentNullException(nameof(actionDescriptor));
+            }
+
+            if (value == null)
+            {
+                throw new ArgumentNullException(nameof(value));
+            }
+
+            actionDescriptor.Properties[typeof(T)] = value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptorProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptorProviderContext.cs
new file mode 100644
index 0000000000..63ab7dbf0d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptorProviderContext.cs
@@ -0,0 +1,12 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.Abstractions
+{
+    public class ActionDescriptorProviderContext
+    {
+        public IList<ActionDescriptor> Results { get; } = new List<ActionDescriptor>();
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionInvokerProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionInvokerProviderContext.cs
new file mode 100644
index 0000000000..45fd315732
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionInvokerProviderContext.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Abstractions
+{
+    public class ActionInvokerProviderContext
+    {
+        public ActionInvokerProviderContext(ActionContext actionContext)
+        {
+            if (actionContext == null)
+            {
+                throw new ArgumentNullException(nameof(actionContext));
+            }
+
+            ActionContext = actionContext;
+        }
+
+        public ActionContext ActionContext { get; }
+
+        public IActionInvoker Result { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionDescriptorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionDescriptorProvider.cs
new file mode 100644
index 0000000000..4b52e9aebc
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionDescriptorProvider.cs
@@ -0,0 +1,33 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Abstractions
+{
+    public interface IActionDescriptorProvider
+    {
+        /// <summary>
+        /// Gets the order value for determining the order of execution of providers. Providers execute in
+        /// ascending numeric value of the <see cref="Order"/> property.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Providers are executed in an ordering determined by an ascending sort of the <see cref="Order"/> property.
+        /// A provider with a lower numeric value of <see cref="Order"/> will have its
+        /// <see cref="OnProvidersExecuting"/> called before that of a provider with a higher numeric value of
+        /// <see cref="Order"/>. The <see cref="OnProvidersExecuted"/> method is called in the reverse ordering after
+        /// all calls to <see cref="OnProvidersExecuting"/>. A provider with a lower numeric value of
+        /// <see cref="Order"/> will have its <see cref="OnProvidersExecuted"/> method called after that of a provider
+        /// with a higher numeric value of <see cref="Order"/>.
+        /// </para>
+        /// <para>
+        /// If two providers have the same numeric value of <see cref="Order"/>, then their relative execution order
+        /// is undefined.
+        /// </para>
+        /// </remarks>
+        int Order { get; }
+
+        void OnProvidersExecuting(ActionDescriptorProviderContext context);
+
+        void OnProvidersExecuted(ActionDescriptorProviderContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionInvoker.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionInvoker.cs
new file mode 100644
index 0000000000..ed3650cc23
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionInvoker.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Abstractions
+{
+    /// <summary>
+    /// Defines an interface for invoking an MVC action.
+    /// </summary>
+    /// <remarks>
+    /// An <see cref="IActionInvoker"/> is created for each request the MVC handles by querying the set of
+    /// <see cref="IActionInvokerProvider"/> instances. See <see cref="IActionInvokerProvider"/> for more information. 
+    /// </remarks>
+    public interface IActionInvoker
+    {
+        /// <summary>
+        /// Invokes an MVC action.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> which will complete when action processing has completed.</returns>
+        Task InvokeAsync();
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionInvokerProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionInvokerProvider.cs
new file mode 100644
index 0000000000..c324d7b330
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionInvokerProvider.cs
@@ -0,0 +1,63 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Abstractions
+{
+    /// <summary>
+    /// Defines an interface for components that can create an <see cref="IActionInvoker"/> for the
+    /// current request.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// <see cref="IActionInvokerProvider"/> instances form a pipeline that results in the creation of an
+    /// <see cref="IActionInvoker"/>. The <see cref="IActionInvokerProvider"/> instances are ordered by
+    /// an ascending sort of the <see cref="Order"/>.  
+    /// </para>
+    /// <para>
+    /// To create an <see cref="IActionInvoker"/>, each provider has its <see cref="OnProvidersExecuting"/> method
+    /// called in sequence and given the same instance of <see cref="ActionInvokerProviderContext"/>. Then each
+    /// provider has its <see cref="OnProvidersExecuted"/> method called in the reverse order. The result is
+    /// the value of <see cref="ActionInvokerProviderContext.Result"/>.  
+    /// </para>
+    /// <para>
+    /// As providers are called in a predefined sequence, each provider has a chance to observe and decorate the
+    /// result of the providers that have already run. 
+    /// </para>
+    /// </remarks>
+    public interface IActionInvokerProvider
+    {
+        /// <summary>
+        /// Gets the order value for determining the order of execution of providers. Providers execute in
+        /// ascending numeric value of the <see cref="Order"/> property.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Providers are executed in an ordering determined by an ascending sort of the <see cref="Order"/> property.
+        /// A provider with a lower numeric value of <see cref="Order"/> will have its
+        /// <see cref="OnProvidersExecuting"/> called before that of a provider with a higher numeric value of
+        /// <see cref="Order"/>. The <see cref="OnProvidersExecuted"/> method is called in the reverse ordering after
+        /// all calls to <see cref="OnProvidersExecuting"/>. A provider with a lower numeric value of
+        /// <see cref="Order"/> will have its <see cref="OnProvidersExecuted"/> method called after that of a provider
+        /// with a higher numeric value of <see cref="Order"/>.
+        /// </para>
+        /// <para>
+        /// If two providers have the same numeric value of <see cref="Order"/>, then their relative execution order
+        /// is undefined.
+        /// </para>
+        /// </remarks>
+        int Order { get; }
+
+        /// <summary>
+        /// Called to execute the provider. 
+        /// </summary>
+        /// <param name="context">The <see cref="ActionInvokerProviderContext"/>.</param>
+        void OnProvidersExecuting(ActionInvokerProviderContext context);
+
+        /// <summary>
+        /// Called to execute the provider, after the <see cref="OnProvidersExecuting"/> methods of all providers,
+        /// have been called.
+        /// </summary>
+        /// <param name="context">The <see cref="ActionInvokerProviderContext"/>.</param>
+        void OnProvidersExecuted(ActionInvokerProviderContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ParameterDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ParameterDescriptor.cs
new file mode 100644
index 0000000000..890c3e8526
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ParameterDescriptor.cs
@@ -0,0 +1,17 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.Abstractions
+{
+    public class ParameterDescriptor
+    {
+        public string Name { get; set; }
+
+        public Type ParameterType { get; set; }
+
+        public BindingInfo BindingInfo { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintContext.cs
new file mode 100644
index 0000000000..68ee228d0e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintContext.cs
@@ -0,0 +1,30 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Routing;
+
+namespace Microsoft.AspNetCore.Mvc.ActionConstraints
+{
+    /// <summary>
+    /// Context for <see cref="IActionConstraint"/> execution.
+    /// </summary>
+    public class ActionConstraintContext
+    {
+        /// <summary>
+        /// The list of <see cref="ActionSelectorCandidate"/>. This includes all actions that are valid for the current
+        /// request, as well as their constraints.
+        /// </summary>
+        public IReadOnlyList<ActionSelectorCandidate> Candidates { get; set; }
+
+        /// <summary>
+        /// The current <see cref="ActionSelectorCandidate"/>.
+        /// </summary>
+        public ActionSelectorCandidate CurrentCandidate { get; set; }
+
+        /// <summary>
+        /// The <see cref="RouteContext"/>.
+        /// </summary>
+        public RouteContext RouteContext { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintItem.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintItem.cs
new file mode 100644
index 0000000000..7022a8f283
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintItem.cs
@@ -0,0 +1,43 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ActionConstraints
+{
+    /// <summary>
+    /// Represents an <see cref="IActionConstraintMetadata"/> with or without a corresponding
+    /// <see cref="IActionConstraint"/>.
+    /// </summary>
+    public class ActionConstraintItem
+    {
+        /// <summary>
+        /// Creates a new <see cref="ActionConstraintItem"/>.
+        /// </summary>
+        /// <param name="metadata">The <see cref="IActionConstraintMetadata"/> instance.</param>
+        public ActionConstraintItem(IActionConstraintMetadata metadata)
+        {
+            if (metadata == null)
+            {
+                throw new ArgumentNullException(nameof(metadata));
+            }
+
+            Metadata = metadata;
+        }
+
+        /// <summary>
+        /// The <see cref="IActionConstraint"/> associated with <see cref="Metadata"/>.
+        /// </summary>
+        public IActionConstraint Constraint { get; set; }
+
+        /// <summary>
+        /// The <see cref="IActionConstraintMetadata"/> instance.
+        /// </summary>
+        public IActionConstraintMetadata Metadata { get; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether or not <see cref="Constraint"/> can be reused across requests.
+        /// </summary>
+        public bool IsReusable { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintProviderContext.cs
new file mode 100644
index 0000000000..d740257203
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintProviderContext.cs
@@ -0,0 +1,62 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.ActionConstraints
+{
+    /// <summary>
+    /// Context for an action constraint provider.
+    /// </summary>
+    public class ActionConstraintProviderContext
+    {
+        /// <summary>
+        /// Creates a new <see cref="ActionConstraintProviderContext"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="Http.HttpContext"/> associated with the request.</param>
+        /// <param name="action">The <see cref="ActionDescriptor"/> for which constraints are being created.</param>
+        /// <param name="items">The list of <see cref="ActionConstraintItem"/> objects.</param>
+        public ActionConstraintProviderContext(
+            HttpContext context,
+            ActionDescriptor action,
+            IList<ActionConstraintItem> items)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+
+            HttpContext = context;
+            Action = action;
+            Results = items;
+        }
+
+        /// <summary>
+        /// The <see cref="Http.HttpContext"/> associated with the request.
+        /// </summary>
+        public HttpContext HttpContext { get; }
+
+        /// <summary>
+        /// The <see cref="ActionDescriptor"/> for which constraints are being created.
+        /// </summary>
+        public ActionDescriptor Action { get; }
+
+        /// <summary>
+        /// The list of <see cref="ActionConstraintItem"/> objects.
+        /// </summary>
+        public IList<ActionConstraintItem> Results { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionSelectorCandidate.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionSelectorCandidate.cs
new file mode 100644
index 0000000000..c2251cd371
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionSelectorCandidate.cs
@@ -0,0 +1,43 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.ActionConstraints
+{
+    /// <summary>
+    /// A candidate action for action selection.
+    /// </summary>
+    public struct ActionSelectorCandidate
+    {
+        /// <summary>
+        /// Creates a new <see cref="ActionSelectorCandidate"/>.
+        /// </summary>
+        /// <param name="action">The <see cref="ActionDescriptor"/> representing a candidate for selection.</param>
+        /// <param name="constraints">
+        /// The list of <see cref="IActionConstraint"/> instances associated with <paramref name="action"/>.
+        /// </param>
+        public ActionSelectorCandidate(ActionDescriptor action, IReadOnlyList<IActionConstraint> constraints)
+        {
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            Action = action;
+            Constraints = constraints;
+        }
+
+        /// <summary>
+        /// The <see cref="ActionDescriptor"/> representing a candidate for selection.
+        /// </summary>
+        public ActionDescriptor Action { get; }
+
+        /// <summary>
+        /// The list of <see cref="IActionConstraint"/> instances associated with <see name="Action"/>.
+        /// </summary>
+        public IReadOnlyList<IActionConstraint> Constraints { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraint.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraint.cs
new file mode 100644
index 0000000000..bd59ab6c50
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraint.cs
@@ -0,0 +1,55 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ActionConstraints
+{
+    /// <summary>
+    /// Supports conditional logic to determine whether or not an associated action is valid to be selected
+    /// for the given request.
+    /// </summary>
+    /// <remarks>
+    /// Action constraints have the secondary effect of making an action with a constraint applied a better
+    /// match than one without.
+    ///
+    /// Consider two actions, 'A' and 'B' with the same action and controller name. Action 'A' only allows the
+    /// HTTP POST method (via a constraint) and action 'B' has no constraints.
+    ///
+    /// If an incoming request is a POST, then 'A' is considered the best match because it both matches and
+    /// has a constraint. If an incoming request uses any other verb, 'A' will not be valid for selection
+    /// due to it's constraint, so 'B' is the best match.
+    ///
+    ///
+    /// Action constraints are also grouped according to their order value. Any constraints with the same
+    /// group value are considered to be part of the same application policy, and will be executed in the
+    /// same stage.
+    ///
+    /// Stages run in ascending order based on the value of <see cref="Order"/>. Given a set of actions which
+    /// are candidates for selection, the next stage to run is the lowest value of <see cref="Order"/> for any
+    /// constraint of any candidate which is greater than the order of the last stage.
+    ///
+    /// Once the stage order is identified, each action has all of its constraints in that stage executed.
+    /// If any constraint does not match, then that action is not a candidate for selection. If any actions
+    /// with constraints in the current state are still candidates, then those are the 'best' actions and this
+    /// process will repeat with the next stage on the set of 'best' actions. If after processing the
+    /// subsequent stages of the 'best' actions no candidates remain, this process will repeat on the set of
+    /// 'other' candidate actions from this stage (those without a constraint).
+    /// </remarks>
+    public interface IActionConstraint : IActionConstraintMetadata
+    {
+        /// <summary>
+        /// The constraint order.
+        /// </summary>
+        /// <remarks>
+        /// Constraints are grouped into stages by the value of <see cref="Order"/>. See remarks on
+        /// <see cref="IActionConstraint"/>.
+        /// </remarks>
+        int Order { get; }
+
+        /// <summary>
+        /// Determines whether an action is a valid candidate for selection.
+        /// </summary>
+        /// <param name="context">The <see cref="ActionConstraintContext"/>.</param>
+        /// <returns>True if the action is valid for selection, otherwise false.</returns>
+        bool Accept(ActionConstraintContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintFactory.cs
new file mode 100644
index 0000000000..9c0f597228
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintFactory.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ActionConstraints
+{
+    /// <summary>
+    /// A factory for <see cref="IActionConstraint"/>.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="IActionConstraintFactory"/> will be invoked during action selection
+    /// to create constraint instances for an action.
+    ///
+    /// Place an attribute implementing this interface on a controller or action to insert an action
+    /// constraint created by a factory.
+    /// </remarks>
+    public interface IActionConstraintFactory : IActionConstraintMetadata
+    {
+        /// <summary>
+        /// Gets a value that indicates if the result of <see cref="CreateInstance(IServiceProvider)"/>
+        /// can be reused across requests.
+        /// </summary>
+        bool IsReusable { get; }
+
+        /// <summary>
+        /// Creates a new <see cref="IActionConstraint"/>.
+        /// </summary>
+        /// <param name="services">The per-request services.</param>
+        /// <returns>An <see cref="IActionConstraint"/>.</returns>
+        IActionConstraint CreateInstance(IServiceProvider services);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintMetadata.cs
new file mode 100644
index 0000000000..cbfd0970c0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintMetadata.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ActionConstraints
+{
+    /// <summary>
+    /// A marker interface that identifies a type as metadata for an <see cref="IActionConstraint"/>.
+    /// </summary>
+    public interface IActionConstraintMetadata
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintProvider.cs
new file mode 100644
index 0000000000..8c090462ca
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintProvider.cs
@@ -0,0 +1,33 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ActionConstraints
+{
+    public interface IActionConstraintProvider
+    {
+        /// <summary>
+        /// Gets the order value for determining the order of execution of providers. Providers execute in
+        /// ascending numeric value of the <see cref="Order"/> property.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Providers are executed in an ordering determined by an ascending sort of the <see cref="Order"/> property.
+        /// A provider with a lower numeric value of <see cref="Order"/> will have its
+        /// <see cref="OnProvidersExecuting"/> called before that of a provider with a higher numeric value of
+        /// <see cref="Order"/>. The <see cref="OnProvidersExecuted"/> method is called in the reverse ordering after
+        /// all calls to <see cref="OnProvidersExecuting"/>. A provider with a lower numeric value of
+        /// <see cref="Order"/> will have its <see cref="OnProvidersExecuted"/> method called after that of a provider
+        /// with a higher numeric value of <see cref="Order"/>.
+        /// </para>
+        /// <para>
+        /// If two providers have the same numeric value of <see cref="Order"/>, then their relative execution order
+        /// is undefined.
+        /// </para>
+        /// </remarks>
+        int Order { get; }
+
+        void OnProvidersExecuting(ActionConstraintProviderContext context);
+
+        void OnProvidersExecuted(ActionConstraintProviderContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionContext.cs
new file mode 100644
index 0000000000..f7735c1637
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionContext.cs
@@ -0,0 +1,139 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Routing;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Context object for execution of action which has been selected as part of an HTTP request.
+    /// </summary>
+    public class ActionContext
+    {
+        /// <summary>
+        /// Creates an empty <see cref="ActionContext"/>.
+        /// </summary>
+        /// <remarks>
+        /// The default constructor is provided for unit test purposes only.
+        /// </remarks>
+        public ActionContext()
+        {
+            ModelState = new ModelStateDictionary();
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="ActionContext"/>.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/> to copy.</param>
+        public ActionContext(ActionContext actionContext)
+            : this(
+                actionContext.HttpContext,
+                actionContext.RouteData,
+                actionContext.ActionDescriptor,
+                actionContext.ModelState)
+        {
+            if (actionContext == null)
+            {
+                throw new ArgumentNullException(nameof(actionContext));
+            }
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="ActionContext"/>.
+        /// </summary>
+        /// <param name="httpContext">The <see cref="Http.HttpContext"/> for the current request.</param>
+        /// <param name="routeData">The <see cref="AspNetCore.Routing.RouteData"/> for the current request.</param>
+        /// <param name="actionDescriptor">The <see cref="Abstractions.ActionDescriptor"/> for the selected action.</param>
+        public ActionContext(
+            HttpContext httpContext,
+            RouteData routeData,
+            ActionDescriptor actionDescriptor)
+            : this(httpContext, routeData, actionDescriptor, new ModelStateDictionary())
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="ActionContext"/>.
+        /// </summary>
+        /// <param name="httpContext">The <see cref="Http.HttpContext"/> for the current request.</param>
+        /// <param name="routeData">The <see cref="AspNetCore.Routing.RouteData"/> for the current request.</param>
+        /// <param name="actionDescriptor">The <see cref="Abstractions.ActionDescriptor"/> for the selected action.</param>
+        /// <param name="modelState">The <see cref="ModelStateDictionary"/>.</param>
+        public ActionContext(
+            HttpContext httpContext,
+            RouteData routeData,
+            ActionDescriptor actionDescriptor,
+            ModelStateDictionary modelState)
+        {
+            if (httpContext == null)
+            {
+                throw new ArgumentNullException(nameof(httpContext));
+            }
+
+            if (routeData == null)
+            {
+                throw new ArgumentNullException(nameof(routeData));
+            }
+
+            if (actionDescriptor == null)
+            {
+                throw new ArgumentNullException(nameof(actionDescriptor));
+            }
+
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            HttpContext = httpContext;
+            RouteData = routeData;
+            ActionDescriptor = actionDescriptor;
+            ModelState = modelState;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Abstractions.ActionDescriptor"/> for the selected action.
+        /// </summary>
+        /// <remarks>
+        /// The property setter is provided for unit test purposes only.
+        /// </remarks>
+        public ActionDescriptor ActionDescriptor
+        {
+            get; set;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Http.HttpContext"/> for the current request.
+        /// </summary>
+        /// <remarks>
+        /// The property setter is provided for unit test purposes only.
+        /// </remarks>
+        public HttpContext HttpContext
+        {
+            get; set;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="ModelStateDictionary"/>.
+        /// </summary>
+        public ModelStateDictionary ModelState
+        {
+            get;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="AspNetCore.Routing.RouteData"/> for the current request.
+        /// </summary>
+        /// <remarks>
+        /// The property setter is provided for unit test purposes only.
+        /// </remarks>
+        public RouteData RouteData
+        {
+            get; set;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiDescription.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiDescription.cs
new file mode 100644
index 0000000000..827712f1bc
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiDescription.cs
@@ -0,0 +1,63 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.ApiExplorer
+{
+    /// <summary>
+    /// Represents an API exposed by this application.
+    /// </summary>
+    [DebuggerDisplay("{ActionDescriptor.DisplayName,nq}")]
+    public class ApiDescription
+    {
+        /// <summary>
+        /// Gets or sets <see cref="ActionDescriptor"/> for this api.
+        /// </summary>
+        public ActionDescriptor ActionDescriptor { get; set; }
+
+        /// <summary>
+        /// Gets or sets group name for this api.
+        /// </summary>
+        public string GroupName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the supported HTTP method for this api, or null if all HTTP methods are supported.
+        /// </summary>
+        public string HttpMethod { get; set; }
+
+        /// <summary>
+        /// Gets a list of <see cref="ApiParameterDescription"/> for this api.
+        /// </summary>
+        public IList<ApiParameterDescription> ParameterDescriptions { get; } = new List<ApiParameterDescription>();
+
+        /// <summary>
+        /// Gets arbitrary metadata properties associated with the <see cref="ApiDescription"/>.
+        /// </summary>
+        public IDictionary<object, object> Properties { get; } = new Dictionary<object, object>();
+
+        /// <summary>
+        /// Gets or sets relative url path template (relative to application root) for this api.
+        /// </summary>
+        public string RelativePath { get; set; }
+
+        /// <summary>
+        /// Gets the list of possible formats for a request.
+        /// </summary>
+        /// <remarks>
+        /// Will be empty if the action does not accept a parameter decorated with the <c>[FromBody]</c> attribute.
+        /// </remarks>
+        public IList<ApiRequestFormat> SupportedRequestFormats { get; } = new List<ApiRequestFormat>();
+
+        /// <summary>
+        /// Gets the list of possible formats for a response.
+        /// </summary>
+        /// <remarks>
+        /// Will be empty if the action returns no response, or if the response type is unclear. Use
+        /// <c>ProducesAttribute</c> on an action method to specify a response type.
+        /// </remarks>
+        public IList<ApiResponseType> SupportedResponseTypes { get; } = new List<ApiResponseType>();
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiDescriptionProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiDescriptionProviderContext.cs
new file mode 100644
index 0000000000..aa9d199089
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiDescriptionProviderContext.cs
@@ -0,0 +1,41 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.ApiExplorer
+{
+    /// <summary>
+    /// A context object for <see cref="ApiDescription"/> providers.
+    /// </summary>
+    public class ApiDescriptionProviderContext
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="ApiDescriptionProviderContext"/>.
+        /// </summary>
+        /// <param name="actions">The list of actions.</param>
+        public ApiDescriptionProviderContext(IReadOnlyList<ActionDescriptor> actions)
+        {
+            if (actions == null)
+            {
+                throw new ArgumentNullException(nameof(actions));
+            }
+
+            Actions = actions;
+
+            Results = new List<ApiDescription>();
+        }
+
+        /// <summary>
+        /// The list of actions.
+        /// </summary>
+        public IReadOnlyList<ActionDescriptor> Actions { get; }
+
+        /// <summary>
+        /// The list of resulting <see cref="ApiDescription"/>.
+        /// </summary>
+        public IList<ApiDescription> Results { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiParameterDescription.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiParameterDescription.cs
new file mode 100644
index 0000000000..1f07d2b7ab
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiParameterDescription.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.ApiExplorer
+{
+    /// <summary>
+    /// A metadata description of an input to an API.
+    /// </summary>
+    public class ApiParameterDescription
+    {
+        /// <summary>
+        /// Gets or sets the <see cref="ModelMetadata"/>.
+        /// </summary>
+        public ModelMetadata ModelMetadata { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ApiParameterRouteInfo"/>.
+        /// </summary>
+        public ApiParameterRouteInfo RouteInfo { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="BindingSource"/>.
+        /// </summary>
+        public BindingSource Source { get; set; }
+
+        /// <summary>
+        /// Gets or sets the parameter type.
+        /// </summary>
+        public Type Type { get; set; }
+
+        /// <summary>
+        /// Gets or sets the parameter descriptor.
+        /// </summary>
+        public ParameterDescriptor ParameterDescriptor { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiParameterRouteInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiParameterRouteInfo.cs
new file mode 100644
index 0000000000..6e5cbfc494
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiParameterRouteInfo.cs
@@ -0,0 +1,41 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Routing;
+
+namespace Microsoft.AspNetCore.Mvc.ApiExplorer
+{
+    /// <summary>
+    /// A metadata description of routing information for an <see cref="ApiParameterDescription"/>.
+    /// </summary>
+    public class ApiParameterRouteInfo
+    {
+        /// <summary>
+        /// Gets or sets the set of <see cref="IRouteConstraint"/> objects for the parameter.
+        /// </summary>
+        /// <remarks>
+        /// Route constraints are only applied when a value is bound from a URL's path. See
+        /// <see cref="ApiParameterDescription.Source"/> for the data source considered.
+        /// </remarks>
+        public IEnumerable<IRouteConstraint> Constraints { get; set; }
+
+        /// <summary>
+        /// Gets or sets the default value for the parameter.
+        /// </summary>
+        public object DefaultValue { get; set; }
+
+        /// <summary>
+        /// Gets a value indicating whether not a parameter is considered optional by routing.
+        /// </summary>
+        /// <remarks>
+        /// An optional parameter is considered optional by the routing system. This does not imply
+        /// that the parameter is considered optional by the action.
+        ///
+        /// If the parameter uses <see cref="ModelBinding.BindingSource.ModelBinding"/> for the value of
+        /// <see cref="ApiParameterDescription.Source"/> then the value may also come from the
+        /// URL query string or form data.
+        /// </remarks>
+        public bool IsOptional { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiRequestFormat.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiRequestFormat.cs
new file mode 100644
index 0000000000..8d93cc65b3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiRequestFormat.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Formatters;
+
+namespace Microsoft.AspNetCore.Mvc.ApiExplorer
+{
+    /// <summary>
+    /// A possible format for the body of a request.
+    /// </summary>
+    public class ApiRequestFormat
+    {
+        /// <summary>
+        /// The formatter used to read this request.
+        /// </summary>
+        public IInputFormatter Formatter { get; set; }
+
+        /// <summary>
+        /// The media type of the request.
+        /// </summary>
+        public string MediaType { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiResponseFormat.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiResponseFormat.cs
new file mode 100644
index 0000000000..bf04db9da7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiResponseFormat.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Formatters;
+
+namespace Microsoft.AspNetCore.Mvc.ApiExplorer
+{
+    /// <summary>
+    /// Possible format for an <see cref="ApiResponseType"/>.
+    /// </summary>
+    public class ApiResponseFormat
+    {
+        /// <summary>
+        /// Gets or sets the formatter used to output this response.
+        /// </summary>
+        public IOutputFormatter Formatter { get; set; }
+
+        /// <summary>
+        /// Gets or sets the media type of the response.
+        /// </summary>
+        public string MediaType { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiResponseType.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiResponseType.cs
new file mode 100644
index 0000000000..6ed9644931
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiResponseType.cs
@@ -0,0 +1,53 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.ApiExplorer
+{
+    /// <summary>
+    /// Possible type of the response body which is formatted by <see cref="ApiResponseFormats"/>.
+    /// </summary>
+    public class ApiResponseType
+    {
+        /// <summary>
+        /// Gets or sets the response formats supported by this type.
+        /// </summary>
+        public IList<ApiResponseFormat> ApiResponseFormats { get; set; } = new List<ApiResponseFormat>();
+
+        /// <summary>
+        /// Gets or sets <see cref="ModelBinding.ModelMetadata"/> for the <see cref="Type"/> or null.
+        /// </summary>
+        /// <remarks>
+        /// Will be null if <see cref="Type"/> is null or void.
+        /// </remarks>
+        public ModelMetadata ModelMetadata { get; set; }
+
+        /// <summary>
+        /// Gets or sets the CLR data type of the response or null.
+        /// </summary>
+        /// <remarks>
+        /// Will be null if the action returns no response, or if the response type is unclear. Use
+        /// <c>Microsoft.AspNetCore.Mvc.ProducesAttribute</c> or <c>Microsoft.AspNetCore.Mvc.ProducesResponseTypeAttribute</c> on an action method
+        /// to specify a response type.
+        /// </remarks>
+        public Type Type { get; set; }
+
+        /// <summary>
+        /// Gets or sets the HTTP response status code.
+        /// </summary>
+        public int StatusCode { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the response type represents a default response.
+        /// </summary>
+        /// <remarks>
+        /// If an <see cref="ApiDescription"/> has a default response, then the <see cref="StatusCode"/> property should be ignored. This response
+        /// will be used when a more specific response format does not apply. The common use of a default response is to specify the format
+        /// for communicating error conditions.
+        /// </remarks>
+        public bool IsDefaultResponse { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/IApiDescriptionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/IApiDescriptionProvider.cs
new file mode 100644
index 0000000000..3f3ab9c595
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/IApiDescriptionProvider.cs
@@ -0,0 +1,41 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ApiExplorer
+{
+    public interface IApiDescriptionProvider
+    {
+        /// <summary>
+        /// Gets the order value for determining the order of execution of providers. Providers execute in
+        /// ascending numeric value of the <see cref="Order"/> property.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Providers are executed in an ordering determined by an ascending sort of the <see cref="Order"/> property.
+        /// A provider with a lower numeric value of <see cref="Order"/> will have its
+        /// <see cref="OnProvidersExecuting"/> called before that of a provider with a higher numeric value of
+        /// <see cref="Order"/>. The <see cref="OnProvidersExecuted"/> method is called in the reverse ordering after
+        /// all calls to <see cref="OnProvidersExecuting"/>. A provider with a lower numeric value of
+        /// <see cref="Order"/> will have its <see cref="OnProvidersExecuted"/> method called after that of a provider
+        /// with a higher numeric value of <see cref="Order"/>.
+        /// </para>
+        /// <para>
+        /// If two providers have the same numeric value of <see cref="Order"/>, then their relative execution order
+        /// is undefined.
+        /// </para>
+        /// </remarks>
+        int Order { get; }
+
+        /// <summary>
+        /// Creates or modifies <see cref="ApiDescription"/>s.
+        /// </summary>
+        /// <param name="context">The <see cref="ApiDescriptionProviderContext"/>.</param>
+        void OnProvidersExecuting(ApiDescriptionProviderContext context);
+
+        /// <summary>
+        /// Called after <see cref="IApiDescriptionProvider"/> implementations with higher <see cref="Order"/> values have been called.
+        /// </summary>
+        /// <param name="context">The <see cref="ApiDescriptionProviderContext"/>.</param>
+        void OnProvidersExecuted(ApiDescriptionProviderContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Authorization/IAllowAnonymousFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Authorization/IAllowAnonymousFilter.cs
new file mode 100644
index 0000000000..a015f05967
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Authorization/IAllowAnonymousFilter.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.Authorization
+{
+    /// <summary>
+    /// A filter that allows anonymous requests, disabling some <see cref="IAuthorizationFilter"/>s.
+    /// </summary>
+    public interface IAllowAnonymousFilter : IFilterMetadata
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutedContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutedContext.cs
new file mode 100644
index 0000000000..68e0343f04
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutedContext.cs
@@ -0,0 +1,96 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.ExceptionServices;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A context for action filters, specifically <see cref="IActionFilter.OnActionExecuted"/> calls.
+    /// </summary>
+    public class ActionExecutedContext : FilterContext
+    {
+        private Exception _exception;
+        private ExceptionDispatchInfo _exceptionDispatchInfo;
+
+        /// <summary>
+        /// Instantiates a new <see cref="ActionExecutingContext"/> instance.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/>.</param>
+        /// <param name="filters">All applicable <see cref="IFilterMetadata"/> implementations.</param>
+        /// <param name="controller">The controller instance containing the action.</param>
+        public ActionExecutedContext(
+            ActionContext actionContext,
+            IList<IFilterMetadata> filters,
+            object controller)
+            : base(actionContext, filters)
+        {
+            Controller = controller;
+        }
+
+        /// <summary>
+        /// Gets or sets an indication that an action filter short-circuited the action and the action filter pipeline.
+        /// </summary>
+        public virtual bool Canceled { get; set; }
+
+        /// <summary>
+        /// Gets the controller instance containing the action.
+        /// </summary>
+        public virtual object Controller { get; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="System.Exception"/> caught while executing the action or action filters, if
+        /// any.
+        /// </summary>
+        public virtual Exception Exception
+        {
+            get
+            {
+                if (_exception == null && _exceptionDispatchInfo != null)
+                {
+                    return _exceptionDispatchInfo.SourceException;
+                }
+                else
+                {
+                    return _exception;
+                }
+            }
+
+            set
+            {
+                _exceptionDispatchInfo = null;
+                _exception = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="System.Runtime.ExceptionServices.ExceptionDispatchInfo"/> for the
+        /// <see cref="Exception"/>, if an <see cref="System.Exception"/> was caught and this information captured.
+        /// </summary>
+        public virtual ExceptionDispatchInfo ExceptionDispatchInfo
+        {
+            get
+            {
+                return _exceptionDispatchInfo;
+            }
+
+            set
+            {
+                _exception = null;
+                _exceptionDispatchInfo = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets an indication that the <see cref="Exception"/> has been handled.
+        /// </summary>
+        public virtual bool ExceptionHandled { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IActionResult"/>.
+        /// </summary>
+        public virtual IActionResult Result { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutingContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutingContext.cs
new file mode 100644
index 0000000000..65ade1e1c5
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutingContext.cs
@@ -0,0 +1,56 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A context for action filters, specifically <see cref="IActionFilter.OnActionExecuted"/> and
+    /// <see cref="IAsyncActionFilter.OnActionExecutionAsync"/> calls.
+    /// </summary>
+    public class ActionExecutingContext : FilterContext
+    {
+        /// <summary>
+        /// Instantiates a new <see cref="ActionExecutingContext"/> instance.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/>.</param>
+        /// <param name="filters">All applicable <see cref="IFilterMetadata"/> implementations.</param>
+        /// <param name="actionArguments">
+        /// The arguments to pass when invoking the action. Keys are parameter names.
+        /// </param>
+        /// <param name="controller">The controller instance containing the action.</param>
+        public ActionExecutingContext(
+            ActionContext actionContext,
+            IList<IFilterMetadata> filters,
+            IDictionary<string, object> actionArguments,
+            object controller)
+            : base(actionContext, filters)
+        {
+            if (actionArguments == null)
+            {
+                throw new ArgumentNullException(nameof(actionArguments));
+            }
+
+            ActionArguments = actionArguments;
+            Controller = controller;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IActionResult"/> to execute. Setting <see cref="Result"/> to a non-<c>null</c>
+        /// value inside an action filter will short-circuit the action and any remaining action filters.
+        /// </summary>
+        public virtual IActionResult Result { get; set; }
+
+        /// <summary>
+        /// Gets the arguments to pass when invoking the action. Keys are parameter names.
+        /// </summary>
+        public virtual IDictionary<string, object> ActionArguments { get; }
+
+        /// <summary>
+        /// Gets the controller instance containing the action.
+        /// </summary>
+        public virtual object Controller { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutionDelegate.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutionDelegate.cs
new file mode 100644
index 0000000000..0ee53b4493
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutionDelegate.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A delegate that asynchronously returns an <see cref="ActionExecutedContext"/> indicating the action or the next
+    /// action filter has executed.
+    /// </summary>
+    /// <returns>
+    /// A <see cref="Task"/> that on completion returns an <see cref="ActionExecutedContext"/>.
+    /// </returns>
+    public delegate Task<ActionExecutedContext> ActionExecutionDelegate();
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/AuthorizationFilterContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/AuthorizationFilterContext.cs
new file mode 100644
index 0000000000..a344d55432
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/AuthorizationFilterContext.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A context for authorization filters i.e. <see cref="IAuthorizationFilter"/> and
+    /// <see cref="IAsyncAuthorizationFilter"/> implementations.
+    /// </summary>
+    public class AuthorizationFilterContext : FilterContext
+    {
+        /// <summary>
+        /// Instantiates a new <see cref="AuthorizationFilterContext"/> instance.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/>.</param>
+        /// <param name="filters">All applicable <see cref="IFilterMetadata"/> implementations.</param>
+        public AuthorizationFilterContext(
+            ActionContext actionContext,
+            IList<IFilterMetadata> filters)
+            : base(actionContext, filters)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the result of the request. Setting <see cref="Result"/> to a non-<c>null</c> value inside
+        /// an authorization filter will short-circuit the remainder of the filter pipeline.
+        /// </summary>
+        public virtual IActionResult Result { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ExceptionContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ExceptionContext.cs
new file mode 100644
index 0000000000..c0920f057b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ExceptionContext.cs
@@ -0,0 +1,81 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.ExceptionServices;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A context for exception filters i.e. <see cref="IExceptionFilter"/> and
+    /// <see cref="IAsyncExceptionFilter"/> implementations.
+    /// </summary>
+    public class ExceptionContext : FilterContext
+    {
+        private Exception _exception;
+        private ExceptionDispatchInfo _exceptionDispatchInfo;
+
+        /// <summary>
+        /// Instantiates a new <see cref="ExceptionContext"/> instance.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/>.</param>
+        /// <param name="filters">All applicable <see cref="IFilterMetadata"/> implementations.</param>
+        public ExceptionContext(ActionContext actionContext, IList<IFilterMetadata> filters)
+            : base(actionContext, filters)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="System.Exception"/> caught while executing the action.
+        /// </summary>
+        public virtual Exception Exception
+        {
+            get
+            {
+                if (_exception == null && _exceptionDispatchInfo != null)
+                {
+                    return _exceptionDispatchInfo.SourceException;
+                }
+                else
+                {
+                    return _exception;
+                }
+            }
+
+            set
+            {
+                _exceptionDispatchInfo = null;
+                _exception = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="System.Runtime.ExceptionServices.ExceptionDispatchInfo"/> for the
+        /// <see cref="Exception"/>, if this information was captured.
+        /// </summary>
+        public virtual ExceptionDispatchInfo ExceptionDispatchInfo
+        {
+            get
+            {
+                return _exceptionDispatchInfo;
+            }
+
+            set
+            {
+                _exception = null;
+                _exceptionDispatchInfo = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets an indication that the <see cref="Exception"/> has been handled.
+        /// </summary>
+        public virtual bool ExceptionHandled { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IActionResult"/>.
+        /// </summary>
+        public virtual IActionResult Result { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterContext.cs
new file mode 100644
index 0000000000..961e283399
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterContext.cs
@@ -0,0 +1,99 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// An abstract context for filters.
+    /// </summary>
+    public abstract class FilterContext : ActionContext
+    {
+        /// <summary>
+        /// Instantiates a new <see cref="FilterContext"/> instance.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/>.</param>
+        /// <param name="filters">All applicable <see cref="IFilterMetadata"/> implementations.</param>
+        public FilterContext(
+            ActionContext actionContext,
+            IList<IFilterMetadata> filters)
+            : base(actionContext)
+        {
+            if (filters == null)
+            {
+                throw new ArgumentNullException(nameof(filters));
+            }
+
+            Filters = filters;
+        }
+
+        /// <summary>
+        /// Gets all applicable <see cref="IFilterMetadata"/> implementations.
+        /// </summary>
+        public virtual IList<IFilterMetadata> Filters { get; }
+
+        /// <summary>
+        /// Returns a value indicating whether the provided <see cref="IFilterMetadata"/> is the most effective
+        /// policy (most specific) applied to the action associated with the <see cref="FilterContext"/>.
+        /// </summary>
+        /// <typeparam name="TMetadata">The type of the filter policy.</typeparam>
+        /// <param name="policy">The filter policy instance.</param>
+        /// <returns>
+        /// <c>true</c> if the provided <see cref="IFilterMetadata"/> is the most effective policy, otherwise <c>false</c>.
+        /// </returns>
+        /// <remarks>
+        /// <para>
+        /// The <see cref="IsEffectivePolicy{TMetadata}(TMetadata)"/> method is used to implement a common convention
+        /// for filters that define an overriding behavior. When multiple filters may apply to the same 
+        /// cross-cutting concern, define a common interface for the filters (<typeparamref name="TMetadata"/>) and 
+        /// implement the filters such that all of the implementations call this method to determine if they should
+        /// take action.
+        /// </para>
+        /// <para>
+        /// For instance, a global filter might be overridden by placing a filter attribute on an action method.
+        /// The policy applied directly to the action method could be considered more specific.
+        /// </para>
+        /// <para>
+        /// This mechanism for overriding relies on the rules of order and scope that the filter system
+        /// provides to control ordering of filters. It is up to the implementor of filters to implement this 
+        /// protocol cooperatively. The filter system has no innate notion of overrides, this is a recommended
+        /// convention.
+        /// </para>
+        /// </remarks>
+        public bool IsEffectivePolicy<TMetadata>(TMetadata policy) where TMetadata : IFilterMetadata
+        {
+            if (policy == null)
+            {
+                throw new ArgumentNullException(nameof(policy));
+            }
+
+            var effective = FindEffectivePolicy<TMetadata>();
+            return ReferenceEquals(policy, effective);
+        }
+
+        /// <summary>
+        /// Returns the most effective (most specific) policy of type <typeparamref name="TMetadata"/> applied to 
+        /// the action associated with the <see cref="FilterContext"/>.
+        /// </summary>
+        /// <typeparam name="TMetadata">The type of the filter policy.</typeparam>
+        /// <returns>The implementation of <typeparamref name="TMetadata"/> applied to the action associated with
+        /// the <see cref="FilterContext"/>
+        /// </returns>
+        public TMetadata FindEffectivePolicy<TMetadata>() where TMetadata : IFilterMetadata
+        {
+            // The most specific policy is the one closest to the action (nearest the end of the list).
+            for (var i = Filters.Count - 1; i >= 0; i--)
+            {
+                var filter = Filters[i];
+                if (filter is TMetadata match)
+                {
+                    return match;
+                }
+            }
+
+            return default(TMetadata);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterDescriptor.cs
new file mode 100644
index 0000000000..a84ea30133
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterDescriptor.cs
@@ -0,0 +1,70 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// Descriptor for an <see cref="IFilterMetadata"/>.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="FilterDescriptor"/> describes an <see cref="IFilterMetadata"/> with an order and scope.
+    ///
+    /// Order and scope control the execution order of filters. Filters with a higher value of Order execute
+    /// later in the pipeline.
+    ///
+    /// When filters have the same Order, the Scope value is used to determine the order of execution. Filters
+    /// with a higher value of Scope execute later in the pipeline. See <c>Microsoft.AspNetCore.Mvc.FilterScope</c>
+    /// for commonly used scopes.
+    ///
+    /// For <see cref="IExceptionFilter"/> implementations, the filter runs only after an exception has occurred,
+    /// and so the observed order of execution will be opposite that of other filters.
+    /// </remarks>
+    [DebuggerDisplay("Filter = {Filter.ToString(),nq}, Order = {Order}")]
+    public class FilterDescriptor
+    {
+        /// <summary>
+        /// Creates a new <see cref="FilterDescriptor"/>.
+        /// </summary>
+        /// <param name="filter">The <see cref="IFilterMetadata"/>.</param>
+        /// <param name="filterScope">The filter scope.</param>
+        /// <remarks>
+        /// If the <paramref name="filter"/> implements <see cref="IOrderedFilter"/>, then the value of
+        /// <see cref="Order"/> will be taken from <see cref="IOrderedFilter.Order"/>. Otherwise the value
+        /// of <see cref="Order"/> will default to <c>0</c>.
+        /// </remarks>
+        public FilterDescriptor(IFilterMetadata filter, int filterScope)
+        {
+            if (filter == null)
+            {
+                throw new ArgumentNullException(nameof(filter));
+            }
+
+            Filter = filter;
+            Scope = filterScope;
+
+
+            if (Filter is IOrderedFilter orderedFilter)
+            {
+                Order = orderedFilter.Order;
+            }
+        }
+
+        /// <summary>
+        /// The <see cref="IFilterMetadata"/> instance.
+        /// </summary>
+        public IFilterMetadata Filter { get; }
+
+        /// <summary>
+        /// The filter order.
+        /// </summary>
+        public int Order { get; set; }
+
+        /// <summary>
+        /// The filter scope.
+        /// </summary>
+        public int Scope { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterItem.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterItem.cs
new file mode 100644
index 0000000000..516acd7d24
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterItem.cs
@@ -0,0 +1,63 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// Used to associate executable filters with <see cref="IFilterMetadata"/> instances
+    /// as part of <see cref="FilterProviderContext"/>. An <see cref="IFilterProvider"/> should
+    /// inspect <see cref="FilterProviderContext.Results"/> and set <see cref="Filter"/> and
+    /// <see cref="IsReusable"/> as appropriate.
+    /// </summary>
+    [DebuggerDisplay("FilterItem: {Filter}")]
+    public class FilterItem
+    {
+        /// <summary>
+        /// Creates a new <see cref="FilterItem"/>.
+        /// </summary>
+        /// <param name="descriptor">The <see cref="FilterDescriptor"/>.</param>
+        public FilterItem(FilterDescriptor descriptor)
+        {
+            if (descriptor == null)
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+
+            Descriptor = descriptor;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="FilterItem"/>.
+        /// </summary>
+        /// <param name="descriptor">The <see cref="FilterDescriptor"/>.</param>
+        /// <param name="filter"></param>
+        public FilterItem(FilterDescriptor descriptor, IFilterMetadata filter)
+            : this(descriptor)
+        {
+            if (filter == null)
+            {
+                throw new ArgumentNullException(nameof(filter));
+            }
+
+            Filter = filter;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="FilterDescriptor"/> containing the filter metadata.
+        /// </summary>
+        public FilterDescriptor Descriptor { get; }
+
+        /// <summary>
+        /// Gets or sets the executable <see cref="IFilterMetadata"/> associated with <see cref="Descriptor"/>.
+        /// </summary>
+        public IFilterMetadata Filter { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether or not <see cref="Filter"/> can be reused across requests.
+        /// </summary>
+        public bool IsReusable { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterProviderContext.cs
new file mode 100644
index 0000000000..057654eaa4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterProviderContext.cs
@@ -0,0 +1,49 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A context for filter providers i.e. <see cref="IFilterProvider"/> implementations.
+    /// </summary>
+    public class FilterProviderContext
+    {
+        /// <summary>
+        /// Instantiates a new <see cref="FilterProviderContext"/> instance.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/>.</param>
+        /// <param name="items">
+        /// The <see cref="FilterItem"/>s, initially created from <see cref="FilterDescriptor"/>s or a cache entry.
+        /// </param>
+        public FilterProviderContext(ActionContext actionContext, IList<FilterItem> items)
+        {
+            if (actionContext == null)
+            {
+                throw new ArgumentNullException(nameof(actionContext));
+            }
+
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+
+            ActionContext = actionContext;
+            Results = items;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ActionContext"/>.
+        /// </summary>
+        public ActionContext ActionContext { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="FilterItem"/>s, initially created from <see cref="FilterDescriptor"/>s or a
+        /// cache entry. <see cref="IFilterProvider"/>s should set <see cref="FilterItem.Filter"/> on existing items or
+        /// add new <see cref="FilterItem"/>s to make executable filters available.
+        /// </summary>
+        public IList<FilterItem> Results { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IActionFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IActionFilter.cs
new file mode 100644
index 0000000000..cb37ded4c7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IActionFilter.cs
@@ -0,0 +1,23 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A filter that surrounds execution of the action.
+    /// </summary>
+    public interface IActionFilter : IFilterMetadata
+    {
+        /// <summary>
+        /// Called before the action executes, after model binding is complete.
+        /// </summary>
+        /// <param name="context">The <see cref="ActionExecutingContext"/>.</param>
+        void OnActionExecuting(ActionExecutingContext context);
+
+        /// <summary>
+        /// Called after the action executes, before the action result.
+        /// </summary>
+        /// <param name="context">The <see cref="ActionExecutedContext"/>.</param>
+        void OnActionExecuted(ActionExecutedContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAlwaysRunResultFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAlwaysRunResultFilter.cs
new file mode 100644
index 0000000000..e119fd8d93
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAlwaysRunResultFilter.cs
@@ -0,0 +1,24 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A filter that surrounds execution of all action results.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// The <see cref="IAlwaysRunResultFilter"/> interface declares an <see cref="IResultFilter"/> implementation
+    /// that should run for all action results. <seealso cref="IAsyncAlwaysRunResultFilter"/>.
+    /// </para>
+    /// <para>
+    /// <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> instances are not executed in cases where
+    /// an authorization filter or resource filter short-circuits the request to prevent execution of the action.
+    /// <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> implementations
+    /// are also not executed in cases where an exception filter handles an exception by producing an action result.
+    /// </para>
+    /// </remarks>
+    public interface IAlwaysRunResultFilter : IResultFilter
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncActionFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncActionFilter.cs
new file mode 100644
index 0000000000..3342e2b1ff
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncActionFilter.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A filter that asynchronously surrounds execution of the action, after model binding is complete.
+    /// </summary>
+    public interface IAsyncActionFilter : IFilterMetadata
+    {
+        /// <summary>
+        /// Called asynchronously before the action, after model binding is complete.
+        /// </summary>
+        /// <param name="context">The <see cref="ActionExecutingContext"/>.</param>
+        /// <param name="next">
+        /// The <see cref="ActionExecutionDelegate"/>. Invoked to execute the next action filter or the action itself.
+        /// </param>
+        /// <returns>A <see cref="Task"/> that on completion indicates the filter has executed.</returns>
+        Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncAlwaysRunResultFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncAlwaysRunResultFilter.cs
new file mode 100644
index 0000000000..f3c0c94dd8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncAlwaysRunResultFilter.cs
@@ -0,0 +1,24 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A filter that asynchronously surrounds execution of all action results.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// The <see cref="IAsyncAlwaysRunResultFilter"/> interface declares an <see cref="IAsyncResultFilter"/> implementation
+    /// that should run for all action results. <seealso cref="IAsyncAlwaysRunResultFilter"/>.
+    /// </para>
+    /// <para>
+    /// <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> instances are not executed in cases where
+    /// an authorization filter or resource filter short-circuits the request to prevent execution of the action.
+    /// <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> implementations
+    /// are also not executed in cases where an exception filter handles an exception by producing an action result.
+    /// </para>
+    /// </remarks>
+    public interface IAsyncAlwaysRunResultFilter : IAsyncResultFilter
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncAuthorizationFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncAuthorizationFilter.cs
new file mode 100644
index 0000000000..dd1a797e13
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncAuthorizationFilter.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A filter that asynchronously confirms request authorization.
+    /// </summary>
+    public interface IAsyncAuthorizationFilter : IFilterMetadata
+    {
+        /// <summary>
+        /// Called early in the filter pipeline to confirm request is authorized.
+        /// </summary>
+        /// <param name="context">The <see cref="AuthorizationFilterContext"/>.</param>
+        /// <returns>
+        /// A <see cref="Task"/> that on completion indicates the filter has executed.
+        /// </returns>
+        Task OnAuthorizationAsync(AuthorizationFilterContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncExceptionFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncExceptionFilter.cs
new file mode 100644
index 0000000000..ce3343b463
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncExceptionFilter.cs
@@ -0,0 +1,20 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A filter that runs asynchronously after an action has thrown an <see cref="System.Exception"/>.
+    /// </summary>
+    public interface IAsyncExceptionFilter : IFilterMetadata
+    {
+        /// <summary>
+        /// Called after an action has thrown an <see cref="System.Exception"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ExceptionContext"/>.</param>
+        /// <returns>A <see cref="Task"/> that on completion indicates the filter has executed.</returns>
+        Task OnExceptionAsync(ExceptionContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncResourceFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncResourceFilter.cs
new file mode 100644
index 0000000000..6b4eb7ba9e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncResourceFilter.cs
@@ -0,0 +1,29 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A filter that asynchronously surrounds execution of model binding, the action (and filters) and the action
+    /// result (and filters).
+    /// </summary>
+    public interface IAsyncResourceFilter : IFilterMetadata
+    {
+        /// <summary>
+        /// Called asynchronously before the rest of the pipeline.
+        /// </summary>
+        /// <param name="context">The <see cref="ResourceExecutingContext"/>.</param>
+        /// <param name="next">
+        /// The <see cref="ResourceExecutionDelegate"/>. Invoked to execute the next resource filter or the remainder
+        /// of the pipeline.
+        /// </param>
+        /// <returns>
+        /// A <see cref="Task"/> which will complete when the remainder of the pipeline completes.
+        /// </returns>
+        Task OnResourceExecutionAsync(
+            ResourceExecutingContext context,
+            ResourceExecutionDelegate next);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncResultFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncResultFilter.cs
new file mode 100644
index 0000000000..d6583cbc60
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncResultFilter.cs
@@ -0,0 +1,39 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A filter that asynchronously surrounds execution of action results successfully returned from an action.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> implementations are executed around the action
+    /// result only when the action method (or action filters) complete successfully.
+    /// </para>
+    /// <para>
+    /// <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> instances are not executed in cases where
+    /// an authorization filter or resource filter short-circuits the request to prevent execution of the action.
+    /// <see cref="IResultFilter"/>. <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> implementations
+    /// are also not executed in cases where an exception filter handles an exception by producing an action result.
+    /// </para>
+    /// <para>
+    /// To create a result filter that surrounds the execution of all action results, implement
+    /// either the <see cref="IAlwaysRunResultFilter"/> or the <see cref="IAsyncAlwaysRunResultFilter"/> interface.
+    /// </para>
+    /// </remarks>
+    public interface IAsyncResultFilter : IFilterMetadata
+    {
+        /// <summary>
+        /// Called asynchronously before the action result.
+        /// </summary>
+        /// <param name="context">The <see cref="ResultExecutingContext"/>.</param>
+        /// <param name="next">
+        /// The <see cref="ResultExecutionDelegate"/>. Invoked to execute the next result filter or the result itself.
+        /// </param>
+        /// <returns>A <see cref="Task"/> that on completion indicates the filter has executed.</returns>
+        Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAuthorizationFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAuthorizationFilter.cs
new file mode 100644
index 0000000000..3dbc4159a0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAuthorizationFilter.cs
@@ -0,0 +1,17 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A filter that confirms request authorization.
+    /// </summary>
+    public interface IAuthorizationFilter : IFilterMetadata
+    {
+        /// <summary>
+        /// Called early in the filter pipeline to confirm request is authorized.
+        /// </summary>
+        /// <param name="context">The <see cref="AuthorizationFilterContext"/>.</param>
+        void OnAuthorization(AuthorizationFilterContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IExceptionFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IExceptionFilter.cs
new file mode 100644
index 0000000000..5908c2aac9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IExceptionFilter.cs
@@ -0,0 +1,17 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A filter that runs after an action has thrown an <see cref="System.Exception"/>.
+    /// </summary>
+    public interface IExceptionFilter : IFilterMetadata
+    {
+        /// <summary>
+        /// Called after an action has thrown an <see cref="System.Exception"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ExceptionContext"/>.</param>
+        void OnException(ExceptionContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterContainer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterContainer.cs
new file mode 100644
index 0000000000..26199e6dcf
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterContainer.cs
@@ -0,0 +1,16 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A filter that requires a reference back to the <see cref="IFilterFactory"/> that created it.
+    /// </summary>
+    public interface IFilterContainer
+    {
+        /// <summary>
+        /// The <see cref="IFilterFactory"/> that created this filter instance.
+        /// </summary>
+        IFilterMetadata FilterDefinition { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterFactory.cs
new file mode 100644
index 0000000000..e0e844a790
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterFactory.cs
@@ -0,0 +1,26 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// An interface for filter metadata which can create an instance of an executable filter.
+    /// </summary>
+    public interface IFilterFactory : IFilterMetadata
+    {
+        /// <summary>
+        /// Gets a value that indicates if the result of <see cref="CreateInstance(IServiceProvider)"/>
+        /// can be reused across requests.
+        /// </summary>
+        bool IsReusable { get; }
+
+        /// <summary>
+        /// Creates an instance of the executable filter.
+        /// </summary>
+        /// <param name="serviceProvider">The request <see cref="IServiceProvider"/>.</param>
+        /// <returns>An instance of the executable filter.</returns>
+        IFilterMetadata CreateInstance(IServiceProvider serviceProvider);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterMetadata.cs
new file mode 100644
index 0000000000..458bfdc35c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterMetadata.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// Marker interface for filters handled in the MVC request pipeline.
+    /// </summary>
+    public interface IFilterMetadata
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterProvider.cs
new file mode 100644
index 0000000000..46f121b4e8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterProvider.cs
@@ -0,0 +1,45 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A <see cref="FilterItem"/> provider. Implementations should update <see cref="FilterProviderContext.Results"/>
+    /// to make executable filters available.
+    /// </summary>
+    public interface IFilterProvider
+    {
+        /// <summary>
+        /// Gets the order value for determining the order of execution of providers. Providers execute in
+        /// ascending numeric value of the <see cref="Order"/> property.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Providers are executed in an ordering determined by an ascending sort of the <see cref="Order"/> property.
+        /// A provider with a lower numeric value of <see cref="Order"/> will have its
+        /// <see cref="OnProvidersExecuting"/> called before that of a provider with a higher numeric value of
+        /// <see cref="Order"/>. The <see cref="OnProvidersExecuted"/> method is called in the reverse ordering after
+        /// all calls to <see cref="OnProvidersExecuting"/>. A provider with a lower numeric value of
+        /// <see cref="Order"/> will have its <see cref="OnProvidersExecuted"/> method called after that of a provider
+        /// with a higher numeric value of <see cref="Order"/>.
+        /// </para>
+        /// <para>
+        /// If two providers have the same numeric value of <see cref="Order"/>, then their relative execution order
+        /// is undefined.
+        /// </para>
+        /// </remarks>
+        int Order { get; }
+
+        /// <summary>
+        /// Called in increasing <see cref="Order"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="FilterProviderContext"/>.</param>
+        void OnProvidersExecuting(FilterProviderContext context);
+
+        /// <summary>
+        /// Called in decreasing <see cref="Order"/>, after all <see cref="IFilterProvider"/>s have executed once.
+        /// </summary>
+        /// <param name="context">The <see cref="FilterProviderContext"/>.</param>
+        void OnProvidersExecuted(FilterProviderContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IOrderedFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IOrderedFilter.cs
new file mode 100644
index 0000000000..36876091ce
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IOrderedFilter.cs
@@ -0,0 +1,41 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A filter that specifies the relative order it should run.
+    /// </summary>
+    public interface IOrderedFilter : IFilterMetadata
+    {
+        /// <summary>
+        /// Gets the order value for determining the order of execution of filters. Filters execute in
+        /// ascending numeric value of the <see cref="Order"/> property.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Filters are executed in an ordering determined by an ascending sort of the <see cref="Order"/> property.
+        /// </para>
+        /// <para>
+        /// Asynchronous filters, such as <see cref="IAsyncActionFilter"/>, surround the execution of subsequent
+        /// filters of the same filter kind. An asynchronous filter with a lower numeric <see cref="Order"/>
+        /// value will have its filter method, such as <see cref="IAsyncActionFilter.OnActionExecutionAsync"/>,
+        /// executed before that of a filter with a higher value of <see cref="Order"/>.
+        /// </para>
+        /// <para>
+        /// Synchronous filters, such as <see cref="IActionFilter"/>, have a before-method, such as
+        /// <see cref="IActionFilter.OnActionExecuting"/>, and an after-method, such as
+        /// <see cref="IActionFilter.OnActionExecuted"/>. A synchronous filter with a lower numeric <see cref="Order"/>
+        /// value will have its before-method executed before that of a filter with a higher value of
+        /// <see cref="Order"/>. During the after-stage of the filter, a synchronous filter with a lower
+        /// numeric <see cref="Order"/> value will have its after-method executed after that of a filter with a higher
+        /// value of <see cref="Order"/>.
+        /// </para>
+        /// <para>
+        /// If two filters have the same numeric value of <see cref="Order"/>, then their relative execution order
+        /// is determined by the filter scope.
+        /// </para>
+        /// </remarks>
+        int Order { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IResourceFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IResourceFilter.cs
new file mode 100644
index 0000000000..410a03c939
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IResourceFilter.cs
@@ -0,0 +1,24 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A filter that surrounds execution of model binding, the action (and filters) and the action result
+    /// (and filters).
+    /// </summary>
+    public interface IResourceFilter : IFilterMetadata
+    {
+        /// <summary>
+        /// Executes the resource filter. Called before execution of the remainder of the pipeline.
+        /// </summary>
+        /// <param name="context">The <see cref="ResourceExecutingContext"/>.</param>
+        void OnResourceExecuting(ResourceExecutingContext context);
+
+        /// <summary>
+        /// Executes the resource filter. Called after execution of the remainder of the pipeline.
+        /// </summary>
+        /// <param name="context">The <see cref="ResourceExecutedContext"/>.</param>
+        void OnResourceExecuted(ResourceExecutedContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IResultFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IResultFilter.cs
new file mode 100644
index 0000000000..bb0ba46bbb
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IResultFilter.cs
@@ -0,0 +1,39 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A filter that surrounds execution of action results successfully returned from an action.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> implementations are executed around the action
+    /// result only when the action method (or action filters) complete successfully.
+    /// </para>
+    /// <para>
+    /// <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> instances are not executed in cases where
+    /// an authorization filter or resource filter short-circuits the request to prevent execution of the action.
+    /// <see cref="IResultFilter"/>. <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> implementations
+    /// are also not executed in cases where an exception filter handles an exception by producing an action result.
+    /// </para>
+    /// <para>
+    /// To create a result filter that surrounds the execution of all action results, implement
+    /// either the <see cref="IAlwaysRunResultFilter"/> or the <see cref="IAsyncAlwaysRunResultFilter"/> interface.
+    /// </para>
+    /// </remarks>
+    public interface IResultFilter : IFilterMetadata
+    {
+        /// <summary>
+        /// Called before the action result executes.
+        /// </summary>
+        /// <param name="context">The <see cref="ResultExecutingContext"/>.</param>
+        void OnResultExecuting(ResultExecutingContext context);
+
+        /// <summary>
+        /// Called after the action result executes.
+        /// </summary>
+        /// <param name="context">The <see cref="ResultExecutedContext"/>.</param>
+        void OnResultExecuted(ResultExecutedContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutedContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutedContext.cs
new file mode 100644
index 0000000000..6a54d2c410
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutedContext.cs
@@ -0,0 +1,120 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.ExceptionServices;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A context for resource filters, specifically <see cref="IResourceFilter.OnResourceExecuted"/> calls.
+    /// </summary>
+    public class ResourceExecutedContext : FilterContext
+    {
+        private Exception _exception;
+        private ExceptionDispatchInfo _exceptionDispatchInfo;
+
+        /// <summary>
+        /// Creates a new <see cref="ResourceExecutedContext"/>.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/>.</param>
+        /// <param name="filters">The list of <see cref="IFilterMetadata"/> instances.</param>
+        public ResourceExecutedContext(ActionContext actionContext, IList<IFilterMetadata> filters)
+            : base(actionContext, filters)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets a value which indicates whether or not execution was canceled by a resource filter.
+        /// If true, then a resource filter short-circuited execution by setting
+        /// <see cref="ResourceExecutingContext.Result"/>.
+        /// </summary>
+        public virtual bool Canceled { get; set; }
+
+        /// <summary>
+        /// Gets or set the current <see cref="Exception"/>.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Setting <see cref="Exception"/> or <see cref="ExceptionDispatchInfo"/> to <c>null</c> will treat
+        /// the exception as handled, and it will not be rethrown by the runtime.
+        /// </para>
+        /// <para>
+        /// Setting <see cref="ExceptionHandled"/> to <c>true</c> will also mark the exception as handled.
+        /// </para>
+        /// </remarks>
+        public virtual Exception Exception
+        {
+            get
+            {
+                if (_exception == null && _exceptionDispatchInfo != null)
+                {
+                    return _exceptionDispatchInfo.SourceException;
+                }
+                else
+                {
+                    return _exception;
+                }
+            }
+
+            set
+            {
+                _exceptionDispatchInfo = null;
+                _exception = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or set the current <see cref="Exception"/>.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Setting <see cref="Exception"/> or <see cref="ExceptionDispatchInfo"/> to <c>null</c> will treat
+        /// the exception as handled, and it will not be rethrown by the runtime.
+        /// </para>
+        /// <para>
+        /// Setting <see cref="ExceptionHandled"/> to <c>true</c> will also mark the exception as handled.
+        /// </para>
+        /// </remarks>
+        public virtual ExceptionDispatchInfo ExceptionDispatchInfo
+        {
+            get
+            {
+                return _exceptionDispatchInfo;
+            }
+
+            set
+            {
+                _exception = null;
+                _exceptionDispatchInfo = value;
+            }
+        }
+
+        /// <summary>
+        /// <para>
+        /// Gets or sets a value indicating whether or not the current <see cref="Exception"/> has been handled.
+        /// </para>
+        /// <para>
+        /// If <c>false</c> the <see cref="Exception"/> will be rethrown by the runtime after resource filters
+        /// have executed.
+        /// </para>
+        /// </summary>
+        public virtual bool ExceptionHandled { get; set; }
+
+        /// <summary>
+        /// Gets or sets the result.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// The <see cref="Result"/> may be provided by execution of the action itself or by another
+        /// filter.
+        /// </para>
+        /// <para>
+        /// The <see cref="Result"/> has already been written to the response before being made available
+        /// to resource filters.
+        /// </para>
+        /// </remarks>
+        public virtual IActionResult Result { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutingContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutingContext.cs
new file mode 100644
index 0000000000..46378b3760
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutingContext.cs
@@ -0,0 +1,50 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A context for resource filters, specifically <see cref="IResourceFilter.OnResourceExecuting"/> and
+    /// <see cref="IAsyncResourceFilter.OnResourceExecutionAsync"/> calls.
+    /// </summary>
+    public class ResourceExecutingContext : FilterContext
+    {
+        /// <summary>
+        /// Creates a new <see cref="ResourceExecutingContext"/>.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/>.</param>
+        /// <param name="filters">The list of <see cref="IFilterMetadata"/> instances.</param>
+        /// <param name="valueProviderFactories">The list of <see cref="IValueProviderFactory"/> instances.</param>
+        public ResourceExecutingContext(
+            ActionContext actionContext,
+            IList<IFilterMetadata> filters,
+            IList<IValueProviderFactory> valueProviderFactories)
+            : base(actionContext, filters)
+        {
+            if (valueProviderFactories == null)
+            {
+                throw new ArgumentNullException(nameof(valueProviderFactories));
+            }
+
+            ValueProviderFactories = valueProviderFactories;
+        }
+
+        /// <summary>
+        /// Gets or sets the result of the action to be executed.
+        /// </summary>
+        /// <remarks>
+        /// Setting <see cref="Result"/> to a non-<c>null</c> value inside a resource filter will
+        /// short-circuit execution of additional resource filters and the action itself.
+        /// </remarks>
+        public virtual IActionResult Result { get; set; }
+
+        /// <summary>
+        /// Gets the list of <see cref="IValueProviderFactory"/> instances used by model binding.
+        /// </summary>
+        public IList<IValueProviderFactory> ValueProviderFactories { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutionDelegate.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutionDelegate.cs
new file mode 100644
index 0000000000..ef3531d208
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutionDelegate.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A delegate that asynchronously returns a <see cref="ResourceExecutedContext"/> indicating model binding, the
+    /// action, the action's result, result filters, and exception filters have executed.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> that on completion returns a <see cref="ResourceExecutedContext"/>.</returns>
+    public delegate Task<ResourceExecutedContext> ResourceExecutionDelegate();
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutedContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutedContext.cs
new file mode 100644
index 0000000000..ae4947d8bf
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutedContext.cs
@@ -0,0 +1,107 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.ExceptionServices;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A context for result filters, specifically <see cref="IResultFilter.OnResultExecuted"/> calls.
+    /// </summary>
+    public class ResultExecutedContext : FilterContext
+    {
+        private Exception _exception;
+        private ExceptionDispatchInfo _exceptionDispatchInfo;
+
+        /// <summary>
+        /// Instantiates a new <see cref="ResultExecutedContext"/> instance.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/>.</param>
+        /// <param name="filters">All applicable <see cref="IFilterMetadata"/> implementations.</param>
+        /// <param name="result">
+        /// The <see cref="IActionResult"/> copied from <see cref="ResultExecutingContext.Result"/>.
+        /// </param>
+        /// <param name="controller">The controller instance containing the action.</param>
+        public ResultExecutedContext(
+            ActionContext actionContext,
+            IList<IFilterMetadata> filters,
+            IActionResult result,
+            object controller)
+            : base(actionContext, filters)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            Result = result;
+            Controller = controller;
+        }
+
+        /// <summary>
+        /// Gets or sets an indication that a result filter set <see cref="ResultExecutingContext.Cancel"/> to
+        /// <c>true</c> and short-circuited the filter pipeline.
+        /// </summary>
+        public virtual bool Canceled { get; set; }
+
+        /// <summary>
+        /// Gets the controller instance containing the action.
+        /// </summary>
+        public virtual object Controller { get; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="System.Exception"/> caught while executing the result or result filters, if
+        /// any.
+        /// </summary>
+        public virtual Exception Exception
+        {
+            get
+            {
+                if (_exception == null && _exceptionDispatchInfo != null)
+                {
+                    return _exceptionDispatchInfo.SourceException;
+                }
+                else
+                {
+                    return _exception;
+                }
+            }
+
+            set
+            {
+                _exceptionDispatchInfo = null;
+                _exception = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="System.Runtime.ExceptionServices.ExceptionDispatchInfo"/> for the
+        /// <see cref="Exception"/>, if an <see cref="System.Exception"/> was caught and this information captured.
+        /// </summary>
+        public virtual ExceptionDispatchInfo ExceptionDispatchInfo
+        {
+            get
+            {
+                return _exceptionDispatchInfo;
+            }
+
+            set
+            {
+                _exception = null;
+                _exceptionDispatchInfo = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets an indication that the <see cref="Exception"/> has been handled.
+        /// </summary>
+        public virtual bool ExceptionHandled { get; set; }
+
+        /// <summary>
+        /// Gets the <see cref="IActionResult"/> copied from <see cref="ResultExecutingContext.Result"/>.
+        /// </summary>
+        public virtual IActionResult Result { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutingContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutingContext.cs
new file mode 100644
index 0000000000..cd4e8775ac
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutingContext.cs
@@ -0,0 +1,48 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A context for result filters, specifically <see cref="IResultFilter.OnResultExecuting"/> and
+    /// <see cref="IAsyncResultFilter.OnResultExecutionAsync"/> calls.
+    /// </summary>
+    public class ResultExecutingContext : FilterContext
+    {
+        /// <summary>
+        /// Instantiates a new <see cref="ResultExecutingContext"/> instance.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/>.</param>
+        /// <param name="filters">All applicable <see cref="IFilterMetadata"/> implementations.</param>
+        /// <param name="result">The <see cref="IActionResult"/> of the action and action filters.</param>
+        /// <param name="controller">The controller instance containing the action.</param>
+        public ResultExecutingContext(
+            ActionContext actionContext,
+            IList<IFilterMetadata> filters,
+            IActionResult result,
+            object controller)
+            : base(actionContext, filters)
+        {
+            Result = result;
+            Controller = controller;
+        }
+
+        /// <summary>
+        /// Gets the controller instance containing the action.
+        /// </summary>
+        public virtual object Controller { get; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IActionResult"/> to execute. Setting <see cref="Result"/> to a non-<c>null</c>
+        /// value inside a result filter will short-circuit the result and any remaining result filters.
+        /// </summary>
+        public virtual IActionResult Result { get; set; }
+
+        /// <summary>
+        /// Gets or sets an indication the result filter pipeline should be short-circuited.
+        /// </summary>
+        public virtual bool Cancel { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutionDelegate.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutionDelegate.cs
new file mode 100644
index 0000000000..d0ecea6914
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutionDelegate.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A delegate that asynchronously returns an <see cref="ResultExecutedContext"/> indicating the action result or
+    /// the next result filter has executed.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> that on completion returns an <see cref="ResultExecutedContext"/>.</returns>
+    public delegate Task<ResultExecutedContext> ResultExecutionDelegate();
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/FormatterCollection.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/FormatterCollection.cs
new file mode 100644
index 0000000000..401febb5cf
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/FormatterCollection.cs
@@ -0,0 +1,58 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// Represents a collection of formatters.
+    /// </summary>
+    /// <typeparam name="TFormatter">The type of formatters in the collection.</typeparam>
+    public class FormatterCollection<TFormatter> : Collection<TFormatter>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FormatterCollection{TFormatter}"/> class that is empty.
+        /// </summary>
+        public FormatterCollection()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FormatterCollection{TFormatter}"/> class
+        /// as a wrapper for the specified list.
+        /// </summary>
+        /// <param name="list">The list that is wrapped by the new collection.</param>
+        public FormatterCollection(IList<TFormatter> list)
+            : base(list)
+        {
+        }
+
+        /// <summary>
+        /// Removes all formatters of the specified type.
+        /// </summary>
+        /// <typeparam name="T">The type to remove.</typeparam>
+        public void RemoveType<T>() where T : TFormatter
+        {
+            RemoveType(typeof(T));
+        }
+
+        /// <summary>
+        /// Removes all formatters of the specified type.
+        /// </summary>
+        /// <param name="formatterType">The type to remove.</param>
+        public void RemoveType(Type formatterType)
+        {
+            for (var i = Count - 1; i >= 0; i--)
+            {
+                var formatter = this[i];
+                if (formatter.GetType() == formatterType)
+                {
+                    RemoveAt(i);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IInputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IInputFormatter.cs
new file mode 100644
index 0000000000..c56633d16a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IInputFormatter.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// Reads an object from the request body.
+    /// </summary>
+    public interface IInputFormatter
+    {
+        /// <summary>
+        /// Determines whether this <see cref="IInputFormatter"/> can deserialize an object of the
+        /// <paramref name="context"/>'s <see cref="InputFormatterContext.ModelType"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="InputFormatterContext"/>.</param>
+        /// <returns>
+        /// <c>true</c> if this <see cref="IInputFormatter"/> can deserialize an object of the
+        /// <paramref name="context"/>'s <see cref="InputFormatterContext.ModelType"/>. <c>false</c> otherwise.
+        /// </returns>
+        bool CanRead(InputFormatterContext context);
+
+        /// <summary>
+        /// Reads an object from the request body.
+        /// </summary>
+        /// <param name="context">The <see cref="InputFormatterContext"/>.</param>
+        /// <returns>A <see cref="Task"/> that on completion deserializes the request body.</returns>
+        Task<InputFormatterResult> ReadAsync(InputFormatterContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IInputFormatterExceptionPolicy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IInputFormatterExceptionPolicy.cs
new file mode 100644
index 0000000000..c2032c0e05
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IInputFormatterExceptionPolicy.cs
@@ -0,0 +1,19 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// A policy which <see cref="IInputFormatter"/>s can implement to indicate if they want the body model binder
+    /// to handle all exceptions. By default, all default <see cref="IInputFormatter"/>s implement this interface and
+    /// have a default value of <see cref="InputFormatterExceptionPolicy.MalformedInputExceptions"/>.
+    /// </summary>
+    public interface IInputFormatterExceptionPolicy
+    {
+        /// <summary>
+        /// Gets the flag to indicate if the body model binder should handle all exceptions. If an exception is handled,
+        /// the body model binder converts the exception into model state errors, else the exception is allowed to propagate.
+        /// </summary>
+        InputFormatterExceptionPolicy ExceptionPolicy { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IOutputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IOutputFormatter.cs
new file mode 100644
index 0000000000..a266cf2df7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IOutputFormatter.cs
@@ -0,0 +1,28 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// Writes an object to the output stream.
+    /// </summary>
+    public interface IOutputFormatter
+    {
+        /// <summary>
+        /// Determines whether this <see cref="IOutputFormatter"/> can serialize
+        /// an object of the specified type.
+        /// </summary>
+        /// <param name="context">The formatter context associated with the call.</param>
+        /// <returns>Returns <c>true</c> if the formatter can write the response; <c>false</c> otherwise.</returns>
+        bool CanWriteResult(OutputFormatterCanWriteContext context);
+
+        /// <summary>
+        /// Writes the object represented by <paramref name="context"/>'s Object property.
+        /// </summary>
+        /// <param name="context">The formatter context associated with the call.</param>
+        /// <returns>A Task that serializes the value to the <paramref name="context"/>'s response message.</returns>
+        Task WriteAsync(OutputFormatterWriteContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterContext.cs
new file mode 100644
index 0000000000..001a24dd99
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterContext.cs
@@ -0,0 +1,143 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Text;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// A context object used by an input formatter for deserializing the request body into an object.
+    /// </summary>
+    public class InputFormatterContext
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="InputFormatterContext"/>.
+        /// </summary>
+        /// <param name="httpContext">
+        /// The <see cref="Http.HttpContext"/> for the current operation.
+        /// </param>
+        /// <param name="modelName">The name of the model.</param>
+        /// <param name="modelState">
+        /// The <see cref="ModelStateDictionary"/> for recording errors.
+        /// </param>
+        /// <param name="metadata">
+        /// The <see cref="ModelMetadata"/> of the model to deserialize.
+        /// </param>
+        /// <param name="readerFactory">
+        /// A delegate which can create a <see cref="TextReader"/> for the request body.
+        /// </param>
+        public InputFormatterContext(
+            HttpContext httpContext,
+            string modelName,
+            ModelStateDictionary modelState,
+            ModelMetadata metadata,
+            Func<Stream, Encoding, TextReader> readerFactory)
+            : this(httpContext, modelName, modelState, metadata, readerFactory, treatEmptyInputAsDefaultValue: false)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="InputFormatterContext"/>.
+        /// </summary>
+        /// <param name="httpContext">
+        /// The <see cref="Http.HttpContext"/> for the current operation.
+        /// </param>
+        /// <param name="modelName">The name of the model.</param>
+        /// <param name="modelState">
+        /// The <see cref="ModelStateDictionary"/> for recording errors.
+        /// </param>
+        /// <param name="metadata">
+        /// The <see cref="ModelMetadata"/> of the model to deserialize.
+        /// </param>
+        /// <param name="readerFactory">
+        /// A delegate which can create a <see cref="TextReader"/> for the request body.
+        /// </param>
+        /// <param name="treatEmptyInputAsDefaultValue">
+        /// A value for the <see cref="TreatEmptyInputAsDefaultValue"/> property.
+        /// </param>
+        public InputFormatterContext(
+            HttpContext httpContext,
+            string modelName,
+            ModelStateDictionary modelState,
+            ModelMetadata metadata,
+            Func<Stream, Encoding, TextReader> readerFactory,
+            bool treatEmptyInputAsDefaultValue)
+        {
+            if (httpContext == null)
+            {
+                throw new ArgumentNullException(nameof(httpContext));
+            }
+
+            if (modelName == null)
+            {
+                throw new ArgumentNullException(nameof(modelName));
+            }
+
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            if (metadata == null)
+            {
+                throw new ArgumentNullException(nameof(metadata));
+            }
+
+            if (readerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(readerFactory));
+            }
+
+            HttpContext = httpContext;
+            ModelName = modelName;
+            ModelState = modelState;
+            Metadata = metadata;
+            ReaderFactory = readerFactory;
+            TreatEmptyInputAsDefaultValue = treatEmptyInputAsDefaultValue;
+            ModelType = metadata.ModelType;
+        }
+
+        /// <summary>
+        /// Gets a flag to indicate whether the input formatter should allow no value to be provided.
+        /// If <see langword="false"/>, the input formatter should handle empty input by returning
+        /// <see cref="InputFormatterResult.NoValueAsync()"/>. If <see langword="true"/>, the input
+        /// formatter should handle empty input by returning the default value for the type
+        /// <see cref="ModelType"/>.
+        /// </summary>
+        public bool TreatEmptyInputAsDefaultValue { get; }
+
+        /// <summary>
+        /// Gets the <see cref="Http.HttpContext"/> associated with the current operation.
+        /// </summary>
+        public HttpContext HttpContext { get; }
+
+        /// <summary>
+        /// Gets the name of the model. Used as the key or key prefix for errors added to <see cref="ModelState"/>.
+        /// </summary>
+        public string ModelName { get; }
+
+        /// <summary>
+        /// Gets the <see cref="ModelStateDictionary"/> associated with the current operation.
+        /// </summary>
+        public ModelStateDictionary ModelState { get; }
+
+        /// <summary>
+        /// Gets the requested <see cref="ModelMetadata"/> of the request body deserialization.
+        /// </summary>
+        public ModelMetadata Metadata { get; }
+
+        /// <summary>
+        /// Gets the requested <see cref="Type"/> of the request body deserialization.
+        /// </summary>
+        public Type ModelType { get; }
+
+        /// <summary>
+        /// Gets a delegate which can create a <see cref="TextReader"/> for the request body.
+        /// </summary>
+        public Func<Stream, Encoding, TextReader> ReaderFactory { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterException.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterException.cs
new file mode 100644
index 0000000000..135d71d701
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterException.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// Exception thrown by <see cref="IInputFormatter"/> when the input is not in an expected format.
+    /// </summary>
+    public class InputFormatterException : Exception
+    {
+        public InputFormatterException()
+        {
+        }
+
+        public InputFormatterException(string message)
+            : base(message)
+        {
+        }
+
+        public InputFormatterException(string message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterExceptionPolicy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterExceptionPolicy.cs
new file mode 100644
index 0000000000..be64d4d3ac
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterExceptionPolicy.cs
@@ -0,0 +1,52 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// Defines the set of policies that determine how the model binding system interprets exceptions
+    /// thrown by an <see cref="IInputFormatter"/>. Applications should set 
+    /// <c>MvcOptions.InputFormatterExceptionPolicy</c> to configure this setting.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// An <see cref="IInputFormatter"/> could throw an exception for several reasons, including:
+    /// <list type="bullet">
+    /// <item><description>malformed input</description></item>
+    /// <item><description>client disconnect or other I/O problem</description></item>
+    /// <item><description>
+    /// application configuration problems such as <see cref="TypeLoadException"/>
+    /// </description></item>
+    /// </list>
+    /// </para>
+    /// <para>
+    /// The policy associated with <see cref="InputFormatterExceptionPolicy.AllExceptions"/> treats
+    /// all such categories of problems as model state errors, and usually will be reported to the client as
+    /// an HTTP 400. This was the only policy supported by model binding in ASP.NET Core MVC 1.0, 1.1, and 2.0
+    /// and is still the default for historical reasons. 
+    /// </para>
+    /// <para>
+    /// The policy associated with <see cref="InputFormatterExceptionPolicy.MalformedInputExceptions"/>
+    /// treats only <see cref="InputFormatterException"/> and its subclasses as model state errors. This means that
+    /// exceptions that are not related to the content of the HTTP request (such as a disconnect) will be rethrown,
+    /// which by default would cause an HTTP 500 response, unless there is exception-handling middleware enabled.
+    /// </para>
+    /// </remarks>
+    public enum InputFormatterExceptionPolicy
+    {
+        /// <summary>
+        /// This value indicates that all exceptions thrown by an <see cref="IInputFormatter"/> will be treated
+        /// as model state errors.
+        /// </summary>
+        AllExceptions = 0,
+
+        /// <summary>
+        /// This value indicates that only <see cref="InputFormatterException"/> and subclasses will be treated
+        /// as model state errors. All other exceptions types will be rethrown and can be handled by a higher
+        /// level exception handler, such as exception-handling middleware.
+        /// </summary>
+        MalformedInputExceptions = 1,
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterResult.cs
new file mode 100644
index 0000000000..2304cd5671
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterResult.cs
@@ -0,0 +1,127 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// Result of a <see cref="IInputFormatter.ReadAsync"/> operation.
+    /// </summary>
+    public class InputFormatterResult
+    {
+        private static readonly InputFormatterResult _failure = new InputFormatterResult(hasError: true);
+        private static readonly InputFormatterResult _noValue = new InputFormatterResult(hasError: false);
+        private static readonly Task<InputFormatterResult> _failureAsync = Task.FromResult(_failure);
+        private static readonly Task<InputFormatterResult> _noValueAsync = Task.FromResult(_noValue);
+
+        private InputFormatterResult(bool hasError)
+        {
+            HasError = hasError;
+        }
+
+        private InputFormatterResult(object model)
+        {
+            Model = model;
+            IsModelSet = true;
+        }
+
+        /// <summary>
+        /// Gets an indication whether the <see cref="IInputFormatter.ReadAsync"/> operation had an error.
+        /// </summary>
+        public bool HasError { get; }
+
+        /// <summary>
+        /// Gets an indication whether a value for the <see cref="Model"/> property was supplied.
+        /// </summary>
+        public bool IsModelSet { get; }
+
+        /// <summary>
+        /// Gets the deserialized <see cref="object"/>.
+        /// </summary>
+        /// <value>
+        /// <c>null</c> if <see cref="HasError"/> is <c>true</c>.
+        /// </value>
+        public object Model { get; }
+
+        /// <summary>
+        /// Returns an <see cref="InputFormatterResult"/> indicating the <see cref="IInputFormatter.ReadAsync"/>
+        /// operation failed.
+        /// </summary>
+        /// <returns>
+        /// An <see cref="InputFormatterResult"/> indicating the <see cref="IInputFormatter.ReadAsync"/>
+        /// operation failed i.e. with <see cref="HasError"/> <c>true</c>.
+        /// </returns>
+        public static InputFormatterResult Failure()
+        {
+            return _failure;
+        }
+
+        /// <summary>
+        /// Returns a <see cref="Task"/> that on completion provides an <see cref="InputFormatterResult"/> indicating
+        /// the <see cref="IInputFormatter.ReadAsync"/> operation failed.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="Task"/> that on completion provides an <see cref="InputFormatterResult"/> indicating the
+        /// <see cref="IInputFormatter.ReadAsync"/> operation failed i.e. with <see cref="HasError"/> <c>true</c>.
+        /// </returns>
+        public static Task<InputFormatterResult> FailureAsync()
+        {
+            return _failureAsync;
+        }
+
+        /// <summary>
+        /// Returns an <see cref="InputFormatterResult"/> indicating the <see cref="IInputFormatter.ReadAsync"/>
+        /// operation was successful.
+        /// </summary>
+        /// <param name="model">The deserialized <see cref="object"/>.</param>
+        /// <returns>
+        /// An <see cref="InputFormatterResult"/> indicating the <see cref="IInputFormatter.ReadAsync"/>
+        /// operation succeeded i.e. with <see cref="HasError"/> <c>false</c>.
+        /// </returns>
+        public static InputFormatterResult Success(object model)
+        {
+            return new InputFormatterResult(model);
+        }
+
+        /// <summary>
+        /// Returns a <see cref="Task"/> that on completion provides an <see cref="InputFormatterResult"/> indicating
+        /// the <see cref="IInputFormatter.ReadAsync"/> operation was successful.
+        /// </summary>
+        /// <param name="model">The deserialized <see cref="object"/>.</param>
+        /// <returns>
+        /// A <see cref="Task"/> that on completion provides an <see cref="InputFormatterResult"/> indicating the
+        /// <see cref="IInputFormatter.ReadAsync"/> operation succeeded i.e. with <see cref="HasError"/> <c>false</c>.
+        /// </returns>
+        public static Task<InputFormatterResult> SuccessAsync(object model)
+        {
+            return Task.FromResult(Success(model));
+        }
+
+        /// <summary>
+        /// Returns an <see cref="InputFormatterResult"/> indicating the <see cref="IInputFormatter.ReadAsync"/>
+        /// operation produced no value.
+        /// </summary>
+        /// <returns>
+        /// An <see cref="InputFormatterResult"/> indicating the <see cref="IInputFormatter.ReadAsync"/>
+        /// operation produced no value.
+        /// </returns>
+        public static InputFormatterResult NoValue()
+        {
+            return _noValue;
+        }
+
+        /// <summary>
+        /// Returns a <see cref="Task"/> that on completion provides an <see cref="InputFormatterResult"/> indicating
+        /// the <see cref="IInputFormatter.ReadAsync"/> operation produced no value.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="Task"/> that on completion provides an <see cref="InputFormatterResult"/> indicating the
+        /// <see cref="IInputFormatter.ReadAsync"/> operation produced no value.
+        /// </returns>
+        public static Task<InputFormatterResult> NoValueAsync()
+        {
+            return _noValueAsync;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/OutputFormatterCanWriteContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/OutputFormatterCanWriteContext.cs
new file mode 100644
index 0000000000..e42c092624
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/OutputFormatterCanWriteContext.cs
@@ -0,0 +1,77 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// A context object for <see cref="IOutputFormatter.CanWriteResult(OutputFormatterCanWriteContext)"/>.
+    /// </summary>
+    public abstract class OutputFormatterCanWriteContext
+    {
+        /// <summary>
+        /// <para>
+        /// This constructor is obsolete and will be removed in a future version.
+        /// Please use <see cref="OutputFormatterCanWriteContext(Http.HttpContext)"/> instead.
+        /// </para>
+        /// <para>
+        /// Creates a new <see cref="OutputFormatterCanWriteContext"/>.
+        /// </para>
+        /// </summary>
+        [Obsolete("This constructor is obsolete and will be removed in a future version. Please use the constructor taking a HttpContext instead.")]
+        protected OutputFormatterCanWriteContext()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="OutputFormatterCanWriteContext"/>.
+        /// </summary>
+        /// <param name="httpContext">The <see cref="HttpContext"/> for the current request.</param>
+        protected OutputFormatterCanWriteContext(HttpContext httpContext)
+        {
+            if (httpContext == null)
+            {
+                throw new ArgumentNullException(nameof(httpContext));
+            }
+
+            HttpContext = httpContext;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="HttpContext"/> context associated with the current operation.
+        /// </summary>
+        public virtual HttpContext HttpContext { get; protected set; }
+
+        /// <summary>
+        /// Gets or sets the content type to write to the response.
+        /// </summary>
+        /// <remarks>
+        /// An <see cref="IOutputFormatter"/> can set this value when its
+        /// <see cref="IOutputFormatter.CanWriteResult(OutputFormatterCanWriteContext)"/> method is called,
+        /// and expect to see the same value provided in
+        /// <see cref="IOutputFormatter.WriteAsync(OutputFormatterWriteContext)"/>
+        /// </remarks>
+        public virtual StringSegment ContentType { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value to indicate whether the content type was specified by server-side code.
+        /// This allows <see cref="IOutputFormatter.CanWriteResult(OutputFormatterCanWriteContext)"/> to
+        /// implement stricter filtering on content types that, for example, are being considered purely
+        /// because of an incoming Accept header.
+        /// </summary>
+        public virtual bool ContentTypeIsServerDefined { get; set; }
+
+        /// <summary>
+        /// Gets or sets the object to write to the response.
+        /// </summary>
+        public virtual object Object { get; protected set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Type"/> of the object to write to the response.
+        /// </summary>
+        public virtual Type ObjectType { get; protected set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/OutputFormatterWriteContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/OutputFormatterWriteContext.cs
new file mode 100644
index 0000000000..fadcfc03e5
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/OutputFormatterWriteContext.cs
@@ -0,0 +1,57 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Text;
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// A context object for <see cref="IOutputFormatter.WriteAsync(OutputFormatterWriteContext)"/>.
+    /// </summary>
+    public class OutputFormatterWriteContext : OutputFormatterCanWriteContext
+    {
+        /// <summary>
+        /// Creates a new <see cref="OutputFormatterWriteContext"/>.
+        /// </summary>
+        /// <param name="httpContext">The <see cref="Http.HttpContext"/> for the current request.</param>
+        /// <param name="writerFactory">The delegate used to create a <see cref="TextWriter"/> for writing the response.</param>
+        /// <param name="objectType">The <see cref="Type"/> of the object to write to the response.</param>
+        /// <param name="object">The object to write to the response.</param>
+        public OutputFormatterWriteContext(HttpContext httpContext, Func<Stream, Encoding, TextWriter> writerFactory, Type objectType, object @object)
+            : base(httpContext)
+        {
+            if (writerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(writerFactory));
+            }
+
+            WriterFactory = writerFactory;
+            ObjectType = objectType;
+            Object = @object;
+        }
+
+        /// <summary>
+        /// <para>
+        /// Gets or sets a delegate used to create a <see cref="TextWriter"/> for writing text to the response.
+        /// </para>
+        /// <para>
+        /// Write to <see cref="HttpResponse.Body"/> directly to write binary data to the response.
+        /// </para>
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// The <see cref="TextWriter"/> created by this delegate will encode text and write to the
+        /// <see cref="HttpResponse.Body"/> stream. Call this delegate to create a <see cref="TextWriter"/>
+        /// for writing text output to the response stream.
+        /// </para>
+        /// <para>
+        /// To implement a formatter that writes binary data to the response stream, do not use the
+        /// <see cref="WriterFactory"/> delegate, and use <see cref="HttpResponse.Body"/> instead.
+        /// </para>
+        /// </remarks>
+        public virtual Func<Stream, Encoding, TextWriter> WriterFactory { get; protected set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/IActionResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/IActionResult.cs
new file mode 100644
index 0000000000..8cfbee8a9c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/IActionResult.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Defines a contract that represents the result of an action method.
+    /// </summary>
+    public interface IActionResult
+    {
+        /// <summary>
+        /// Executes the result operation of the action method asynchronously. This method is called by MVC to process
+        /// the result of an action method.
+        /// </summary>
+        /// <param name="context">The context in which the result is executed. The context information includes
+        /// information about the action that was executed and request information.</param>
+        /// <returns>A task that represents the asynchronous execute operation.</returns>
+        Task ExecuteResultAsync(ActionContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/IUrlHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/IUrlHelper.cs
new file mode 100644
index 0000000000..fc329aadc4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/IUrlHelper.cs
@@ -0,0 +1,83 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Defines the contract for the helper to build URLs for ASP.NET MVC within an application.
+    /// </summary>
+    public interface IUrlHelper
+    {
+        /// <summary>
+        /// Gets the <see cref="ActionContext"/> for the current request.
+        /// </summary>
+        ActionContext ActionContext { get; }
+
+        /// <summary>
+        /// Generates a URL with an absolute path for an action method, which contains the action
+        /// name, controller name, route values, protocol to use, host name, and fragment specified by
+        /// <see cref="UrlActionContext"/>. Generates an absolute URL if <see cref="UrlActionContext.Protocol"/> and
+        /// <see cref="UrlActionContext.Host"/> are non-<c>null</c>.
+        /// </summary>
+        /// <param name="actionContext">The context object for the generated URLs for an action method.</param>
+        /// <returns>The generated URL.</returns>
+        string Action(UrlActionContext actionContext);
+
+        /// <summary>
+        /// Converts a virtual (relative) path to an application absolute path.
+        /// </summary>
+        /// <remarks>
+        /// If the specified content path does not start with the tilde (~) character,
+        /// this method returns <paramref name="contentPath"/> unchanged.
+        /// </remarks>
+        /// <param name="contentPath">The virtual path of the content.</param>
+        /// <returns>The application absolute path.</returns>
+        string Content(string contentPath);
+
+        /// <summary>
+        /// Returns a value that indicates whether the URL is local. A URL is considered local if it does not have a
+        /// host / authority part and it has an absolute path. URLs using virtual paths ('~/') are also local.
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        /// <returns><c>true</c> if the URL is local; otherwise, <c>false</c>.</returns>
+        /// <example>
+        /// <para>
+        /// For example, the following URLs are considered local:
+        /// <code>
+        /// /Views/Default/Index.html
+        /// ~/Index.html
+        /// </code>
+        /// </para>
+        /// <para>
+        /// The following URLs are non-local:
+        /// <code>
+        /// ../Index.html
+        /// http://www.contoso.com/
+        /// http://localhost/Index.html
+        /// </code>
+        /// </para>
+        /// </example>
+        bool IsLocalUrl(string url);
+
+        /// <summary>
+        /// Generates a URL with an absolute path, which contains the route name, route values, protocol to use, host
+        /// name, and fragment specified by <see cref="UrlRouteContext"/>. Generates an absolute URL if
+        /// <see cref="UrlActionContext.Protocol"/> and <see cref="UrlActionContext.Host"/> are non-<c>null</c>.
+        /// </summary>
+        /// <param name="routeContext">The context object for the generated URLs for a route.</param>
+        /// <returns>The generated URL.</returns>
+        string RouteUrl(UrlRouteContext routeContext);
+
+        /// <summary>
+        /// Generates an absolute URL for the specified <paramref name="routeName"/> and route
+        /// <paramref name="values"/>, which contains the protocol (such as "http" or "https") and host name from the
+        /// current request.
+        /// </summary>
+        /// <param name="routeName">The name of the route that is used to generate URL.</param>
+        /// <param name="values">An object that contains route values.</param>
+        /// <returns>The generated absolute URL.</returns>
+        string Link(string routeName, object values);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj
new file mode 100644
index 0000000000..4ebbaeec61
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ASP.NET Core MVC abstractions and interfaces for action invocation and dispatching, authorization, action filters, formatters, model binding, routing, validation, and more.
+Commonly used types:
+Microsoft.AspNetCore.Mvc.IActionResult</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="$(MicrosoftAspNetCoreRoutingAbstractionsPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsPropertyHelperSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Net.Http.Headers" Version="$(MicrosoftNetHttpHeadersPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingInfo.cs
new file mode 100644
index 0000000000..baef377507
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingInfo.cs
@@ -0,0 +1,249 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Binding info which represents metadata associated to an action parameter.
+    /// </summary>
+    public class BindingInfo
+    {
+        /// <summary>
+        /// Creates a new <see cref="BindingInfo"/>.
+        /// </summary>
+        public BindingInfo()
+        {
+        }
+
+        /// <summary>
+        /// Creates a copy of a <see cref="BindingInfo"/>.
+        /// </summary>
+        /// <param name="other">The <see cref="BindingInfo"/> to copy.</param>
+        public BindingInfo(BindingInfo other)
+        {
+            if (other == null)
+            {
+                throw new ArgumentNullException(nameof(other));
+            }
+
+            BindingSource = other.BindingSource;
+            BinderModelName = other.BinderModelName;
+            BinderType = other.BinderType;
+            PropertyFilterProvider = other.PropertyFilterProvider;
+            RequestPredicate = other.RequestPredicate;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ModelBinding.BindingSource"/>.
+        /// </summary>
+        public BindingSource BindingSource { get; set; }
+
+        /// <summary>
+        /// Gets or sets the binder model name.
+        /// </summary>
+        public string BinderModelName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Type"/> of the model binder used to bind the model.
+        /// </summary>
+        public Type BinderType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ModelBinding.IPropertyFilterProvider"/>.
+        /// </summary>
+        public IPropertyFilterProvider PropertyFilterProvider { get; set; }
+
+        /// <summary>
+        /// Gets or sets a predicate which determines whether or not the model should be bound based on state
+        /// from the current request.
+        /// </summary>
+        public Func<ActionContext, bool> RequestPredicate { get; set; }
+
+        /// <summary>
+        /// Constructs a new instance of <see cref="BindingInfo"/> from the given <paramref name="attributes"/>.
+        /// <para>
+        /// This overload does not account for <see cref="BindingInfo"/> specified via <see cref="ModelMetadata"/>. Consider using
+        /// <see cref="GetBindingInfo(IEnumerable{object}, ModelMetadata)"/> overload, or <see cref="TryApplyBindingInfo(ModelMetadata)"/>
+        /// on the result of this method to get a more accurate <see cref="BindingInfo"/> instance.
+        /// </para>
+        /// </summary>
+        /// <param name="attributes">A collection of attributes which are used to construct <see cref="BindingInfo"/>
+        /// </param>
+        /// <returns>A new instance of <see cref="BindingInfo"/>.</returns>
+        public static BindingInfo GetBindingInfo(IEnumerable<object> attributes)
+        {
+            var bindingInfo = new BindingInfo();
+            var isBindingInfoPresent = false;
+
+            // BinderModelName
+            foreach (var binderModelNameAttribute in attributes.OfType<IModelNameProvider>())
+            {
+                isBindingInfoPresent = true;
+                if (binderModelNameAttribute?.Name != null)
+                {
+                    bindingInfo.BinderModelName = binderModelNameAttribute.Name;
+                    break;
+                }
+            }
+
+            // BinderType
+            foreach (var binderTypeAttribute in attributes.OfType<IBinderTypeProviderMetadata>())
+            {
+                isBindingInfoPresent = true;
+                if (binderTypeAttribute.BinderType != null)
+                {
+                    bindingInfo.BinderType = binderTypeAttribute.BinderType;
+                    break;
+                }
+            }
+
+            // BindingSource
+            foreach (var bindingSourceAttribute in attributes.OfType<IBindingSourceMetadata>())
+            {
+                isBindingInfoPresent = true;
+                if (bindingSourceAttribute.BindingSource != null)
+                {
+                    bindingInfo.BindingSource = bindingSourceAttribute.BindingSource;
+                    break;
+                }
+            }
+
+            // PropertyFilterProvider
+            var propertyFilterProviders = attributes.OfType<IPropertyFilterProvider>().ToArray();
+            if (propertyFilterProviders.Length == 1)
+            {
+                isBindingInfoPresent = true;
+                bindingInfo.PropertyFilterProvider = propertyFilterProviders[0];
+            }
+            else if (propertyFilterProviders.Length > 1)
+            {
+                isBindingInfoPresent = true;
+                bindingInfo.PropertyFilterProvider = new CompositePropertyFilterProvider(propertyFilterProviders);
+            }
+
+            // RequestPredicate
+            foreach (var requestPredicateProvider in attributes.OfType<IRequestPredicateProvider>())
+            {
+                isBindingInfoPresent = true;
+                if (requestPredicateProvider.RequestPredicate != null)
+                {
+                    bindingInfo.RequestPredicate = requestPredicateProvider.RequestPredicate;
+                    break;
+                }
+            }
+
+            return isBindingInfoPresent ? bindingInfo : null;
+        }
+
+        /// <summary>
+        /// Constructs a new instance of <see cref="BindingInfo"/> from the given <paramref name="attributes"/> and <paramref name="modelMetadata"/>.
+        /// </summary>
+        /// <param name="attributes">A collection of attributes which are used to construct <see cref="BindingInfo"/>.</param>
+        /// <param name="modelMetadata">The <see cref="ModelMetadata"/>.</param>
+        /// <returns>A new instance of <see cref="BindingInfo"/> if any binding metadata was discovered; otherwise or <see langword="null"/>.</returns>
+        public static BindingInfo GetBindingInfo(IEnumerable<object> attributes, ModelMetadata modelMetadata)
+        {
+            if (attributes == null)
+            {
+                throw new ArgumentNullException(nameof(attributes));
+            }
+
+            if (modelMetadata == null)
+            {
+                throw new ArgumentNullException(nameof(modelMetadata));
+            }
+
+            var bindingInfo = GetBindingInfo(attributes);
+            var isBindingInfoPresent = bindingInfo != null;
+
+            if (bindingInfo == null)
+            {
+                bindingInfo = new BindingInfo();
+            }
+
+            isBindingInfoPresent |= bindingInfo.TryApplyBindingInfo(modelMetadata);
+
+            return isBindingInfoPresent ? bindingInfo : null;
+        }
+
+        /// <summary>
+        /// Applies binding metadata from the specified <paramref name="modelMetadata"/>.
+        /// <para>
+        /// Uses values from <paramref name="modelMetadata"/> if no value is already available.
+        /// </para>
+        /// </summary>
+        /// <param name="modelMetadata">The <see cref="ModelMetadata"/>.</param>
+        /// <returns><see langword="true"/> if any binding metadata from <paramref name="modelMetadata"/> was applied;
+        /// <see langword="false"/> otherwise.</returns>
+        public bool TryApplyBindingInfo(ModelMetadata modelMetadata)
+        {
+            if (modelMetadata == null)
+            {
+                throw new ArgumentNullException(nameof(modelMetadata));
+            }
+
+            var isBindingInfoPresent = false;
+            if (BinderModelName == null && modelMetadata.BinderModelName != null)
+            {
+                isBindingInfoPresent = true;
+                BinderModelName = modelMetadata.BinderModelName;
+            }
+
+            if (BinderType == null && modelMetadata.BinderType != null)
+            {
+                isBindingInfoPresent = true;
+                BinderType = modelMetadata.BinderType;
+            }
+
+            if (BindingSource == null && modelMetadata.BindingSource != null)
+            {
+                isBindingInfoPresent = true;
+                BindingSource = modelMetadata.BindingSource;
+            }
+
+            if (PropertyFilterProvider == null && modelMetadata.PropertyFilterProvider != null)
+            {
+                isBindingInfoPresent = true;
+                PropertyFilterProvider = modelMetadata.PropertyFilterProvider;
+            }
+
+            return isBindingInfoPresent;
+        }
+
+        private class CompositePropertyFilterProvider : IPropertyFilterProvider
+        {
+            private readonly IEnumerable<IPropertyFilterProvider> _providers;
+
+            public CompositePropertyFilterProvider(IEnumerable<IPropertyFilterProvider> providers)
+            {
+                _providers = providers;
+            }
+
+            public Func<ModelMetadata, bool> PropertyFilter => CreatePropertyFilter();
+
+            private Func<ModelMetadata, bool> CreatePropertyFilter()
+            {
+                var propertyFilters = _providers
+                    .Select(p => p.PropertyFilter)
+                    .Where(p => p != null);
+
+                return (m) =>
+                {
+                    foreach (var propertyFilter in propertyFilters)
+                    {
+                        if (!propertyFilter(m))
+                        {
+                            return false;
+                        }
+                    }
+
+                    return true;
+                };
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingSource.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingSource.cs
new file mode 100644
index 0000000000..995ba57c4d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingSource.cs
@@ -0,0 +1,237 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// A metadata object representing a source of data for model binding.
+    /// </summary>
+    [DebuggerDisplay("Source: {DisplayName}")]
+    public class BindingSource : IEquatable<BindingSource>
+    {
+        /// <summary>
+        /// A <see cref="BindingSource"/> for the request body.
+        /// </summary>
+        public static readonly BindingSource Body = new BindingSource(
+            "Body",
+            Resources.BindingSource_Body,
+            isGreedy: true,
+            isFromRequest: true);
+
+        /// <summary>
+        /// A <see cref="BindingSource"/> for a custom model binder (unknown data source).
+        /// </summary>
+        public static readonly BindingSource Custom = new BindingSource(
+            "Custom",
+            Resources.BindingSource_Custom,
+            isGreedy: true,
+            isFromRequest: true);
+
+        /// <summary>
+        /// A <see cref="BindingSource"/> for the request form-data.
+        /// </summary>
+        public static readonly BindingSource Form = new BindingSource(
+            "Form",
+            Resources.BindingSource_Form,
+            isGreedy: false,
+            isFromRequest: true);
+
+        /// <summary>
+        /// A <see cref="BindingSource"/> for the request headers.
+        /// </summary>
+        public static readonly BindingSource Header = new BindingSource(
+            "Header",
+            Resources.BindingSource_Header,
+            isGreedy: true,
+            isFromRequest: true);
+
+        /// <summary>
+        /// A <see cref="BindingSource"/> for model binding. Includes form-data, query-string
+        /// and route data from the request.
+        /// </summary>
+        public static readonly BindingSource ModelBinding = new BindingSource(
+            "ModelBinding",
+            Resources.BindingSource_ModelBinding,
+            isGreedy: false,
+            isFromRequest: true);
+
+        /// <summary>
+        /// A <see cref="BindingSource"/> for the request url path.
+        /// </summary>
+        public static readonly BindingSource Path = new BindingSource(
+            "Path",
+            Resources.BindingSource_Path,
+            isGreedy: false,
+            isFromRequest: true);
+
+        /// <summary>
+        /// A <see cref="BindingSource"/> for the request query-string.
+        /// </summary>
+        public static readonly BindingSource Query = new BindingSource(
+            "Query",
+            Resources.BindingSource_Query,
+            isGreedy: false,
+            isFromRequest: true);
+
+        /// <summary>
+        /// A <see cref="BindingSource"/> for request services.
+        /// </summary>
+        public static readonly BindingSource Services = new BindingSource(
+            "Services",
+            Resources.BindingSource_Services,
+            isGreedy: true,
+            isFromRequest: false);
+
+        /// <summary>
+        /// A <see cref="BindingSource"/> for special parameter types that are not user input.
+        /// </summary>
+        public static readonly BindingSource Special = new BindingSource(
+            "Special",
+            Resources.BindingSource_Special,
+            isGreedy: true,
+            isFromRequest: false);
+
+        /// <summary>
+        /// A <see cref="BindingSource"/> for <see cref="IFormFile"/>, <see cref="IFormCollection"/>, and <see cref="IFormFileCollection"/>.
+        /// </summary>
+        public static readonly BindingSource FormFile = new BindingSource(
+            "FormFile",
+            Resources.BindingSource_FormFile,
+            isGreedy: true,
+            isFromRequest: true);
+
+        /// <summary>
+        /// Creates a new <see cref="BindingSource"/>.
+        /// </summary>
+        /// <param name="id">The id, a unique identifier.</param>
+        /// <param name="displayName">The display name.</param>
+        /// <param name="isGreedy">A value indicating whether or not the source is greedy.</param>
+        /// <param name="isFromRequest">
+        /// A value indicating whether or not the data comes from the HTTP request.
+        /// </param>
+        public BindingSource(string id, string displayName, bool isGreedy, bool isFromRequest)
+        {
+            if (id == null)
+            {
+                throw new ArgumentNullException(nameof(id));
+            }
+
+            Id = id;
+            DisplayName = displayName;
+            IsGreedy = isGreedy;
+            IsFromRequest = isFromRequest;
+        }
+
+        /// <summary>
+        /// Gets the display name for the source.
+        /// </summary>
+        public string DisplayName { get; }
+
+        /// <summary>
+        /// Gets the unique identifier for the source. Sources are compared based on their Id.
+        /// </summary>
+        public string Id { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether or not a source is greedy. A greedy source will bind a model in
+        /// a single operation, and will not decompose the model into sub-properties.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// For sources based on a <see cref="IValueProvider"/>, setting <see cref="IsGreedy"/> to <c>false</c>
+        /// will most closely describe the behavior. This value is used inside the default model binders to 
+        /// determine whether or not to attempt to bind properties of a model.
+        /// </para>
+        /// <para>
+        /// Set <see cref="IsGreedy"/> to <c>true</c> for most custom <see cref="IModelBinder"/> implementations.
+        /// </para>
+        /// <para>
+        /// If a source represents an <see cref="IModelBinder"/> which will recursively traverse a model's properties
+        /// and bind them individually using <see cref="IValueProvider"/>, then set <see cref="IsGreedy"/> to
+        /// <c>true</c>.
+        /// </para>
+        /// </remarks>
+        public bool IsGreedy { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether or not the binding source uses input from the current HTTP request.
+        /// </summary>
+        /// <remarks>
+        /// Some sources (like <see cref="BindingSource.Services"/>) are based on application state and not user
+        /// input. These are excluded by default from ApiExplorer diagnostics.
+        /// </remarks>
+        public bool IsFromRequest { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether or not the <see cref="BindingSource"/> can accept
+        /// data from <paramref name="bindingSource"/>.
+        /// </summary>
+        /// <param name="bindingSource">The <see cref="BindingSource"/> to consider as input.</param>
+        /// <returns><c>True</c> if the source is compatible, otherwise <c>false</c>.</returns>
+        /// <remarks>
+        /// When using this method, it is expected that the left-hand-side is metadata specified
+        /// on a property or parameter for model binding, and the right hand side is a source of
+        /// data used by a model binder or value provider.
+        /// 
+        /// This distinction is important as the left-hand-side may be a composite, but the right
+        /// may not.
+        /// </remarks>
+        public virtual bool CanAcceptDataFrom(BindingSource bindingSource)
+        {
+            if (bindingSource == null)
+            {
+                throw new ArgumentNullException(nameof(bindingSource));
+            }
+
+            if (bindingSource is CompositeBindingSource)
+            {
+                var message = Resources.FormatBindingSource_CannotBeComposite(
+                    bindingSource.DisplayName,
+                    nameof(CanAcceptDataFrom));
+                throw new ArgumentException(message, nameof(bindingSource));
+            }
+
+            return this == bindingSource;
+        }
+
+        /// <inheritdoc />
+        public bool Equals(BindingSource other)
+        {
+            return string.Equals(other?.Id, Id, StringComparison.Ordinal);
+        }
+
+        /// <inheritdoc />
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as BindingSource);
+        }
+
+        /// <inheritdoc />
+        public override int GetHashCode()
+        {
+            return Id.GetHashCode();
+        }
+
+        /// <inheritdoc />
+        public static bool operator ==(BindingSource s1, BindingSource s2)
+        {
+            if (object.ReferenceEquals(s1, null))
+            {
+                return object.ReferenceEquals(s2, null);
+            }
+
+            return s1.Equals(s2);
+        }
+
+        /// <inheritdoc />
+        public static bool operator !=(BindingSource s1, BindingSource s2)
+        {
+            return !(s1 == s2);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/CompositeBindingSource.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/CompositeBindingSource.cs
new file mode 100644
index 0000000000..886deb9951
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/CompositeBindingSource.cs
@@ -0,0 +1,116 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// A <see cref="BindingSources"/> which can represent multiple value-provider data sources.
+    /// </summary>
+    public class CompositeBindingSource : BindingSource
+    {
+        /// <summary>
+        /// Creates a new <see cref="CompositeBindingSource"/>.
+        /// </summary>
+        /// <param name="bindingSources">
+        /// The set of <see cref="BindingSource"/> entries.
+        /// Must be value-provider sources and user input.
+        /// </param>
+        /// <param name="displayName">The display name for the composite source.</param>
+        /// <returns>A <see cref="CompositeBindingSource"/>.</returns>
+        public static CompositeBindingSource Create(
+            IEnumerable<BindingSource> bindingSources,
+            string displayName)
+        {
+            if (bindingSources == null)
+            {
+                throw new ArgumentNullException(nameof(bindingSources));
+            }
+
+            foreach (var bindingSource in bindingSources)
+            {
+                if (bindingSource.IsGreedy)
+                {
+                    var message = Resources.FormatBindingSource_CannotBeGreedy(
+                        bindingSource.DisplayName,
+                        nameof(CompositeBindingSource));
+                    throw new ArgumentException(message, nameof(bindingSources));
+                }
+
+                if (!bindingSource.IsFromRequest)
+                {
+                    var message = Resources.FormatBindingSource_MustBeFromRequest(
+                        bindingSource.DisplayName,
+                        nameof(CompositeBindingSource));
+                    throw new ArgumentException(message, nameof(bindingSources));
+                }
+
+                if (bindingSource is CompositeBindingSource)
+                {
+                    var message = Resources.FormatBindingSource_CannotBeComposite(
+                        bindingSource.DisplayName,
+                        nameof(CompositeBindingSource));
+                    throw new ArgumentException(message, nameof(bindingSources));
+                }
+            }
+
+            var id = string.Join("&", bindingSources.Select(s => s.Id).OrderBy(s => s, StringComparer.Ordinal));
+            return new CompositeBindingSource(id, displayName, bindingSources);
+        }
+
+        private CompositeBindingSource(
+            string id,
+            string displayName,
+            IEnumerable<BindingSource> bindingSources)
+            : base(id, displayName, isGreedy: false, isFromRequest: true)
+        {
+            if (id == null)
+            {
+                throw new ArgumentNullException(nameof(id));
+            }
+
+            if (bindingSources == null)
+            {
+                throw new ArgumentNullException(nameof(bindingSources));
+            }
+
+            BindingSources = bindingSources;
+        }
+
+        /// <summary>
+        /// Gets the set of <see cref="BindingSource"/> entries.
+        /// </summary>
+        public IEnumerable<BindingSource> BindingSources { get; }
+
+        /// <inheritdoc />
+        public override bool CanAcceptDataFrom(BindingSource bindingSource)
+        {
+            if (bindingSource == null)
+            {
+                throw new ArgumentNullException(nameof(bindingSource));
+            }
+
+            if (bindingSource is CompositeBindingSource)
+            {
+                var message = Resources.FormatBindingSource_CannotBeComposite(
+                    bindingSource.DisplayName,
+                    nameof(CanAcceptDataFrom));
+                throw new ArgumentException(message, nameof(bindingSource));
+            }
+
+            foreach (var source in BindingSources)
+            {
+                if (source.CanAcceptDataFrom(bindingSource))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/EnumGroupAndName.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/EnumGroupAndName.cs
new file mode 100644
index 0000000000..0ad0117e5d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/EnumGroupAndName.cs
@@ -0,0 +1,70 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// An abstraction used when grouping enum values for <see cref="ModelMetadata.EnumGroupedDisplayNamesAndValues"/>.
+    /// </summary>
+    public struct EnumGroupAndName
+    {
+        private readonly Func<string> _name;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EnumGroupAndName"/> structure. This constructor should 
+        /// not be used in any site where localization is important.
+        /// </summary>
+        /// <param name="group">The group name.</param>
+        /// <param name="name">The name.</param>
+        public EnumGroupAndName(string group, string name)
+        {
+            if (group == null)
+            {
+                throw new ArgumentNullException(nameof(group));
+            }
+
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            Group = group;
+            _name = () => name;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EnumGroupAndName"/> structure.
+        /// </summary>
+        /// <param name="group">The group name.</param>
+        /// <param name="name">A <see cref="Func{String}"/> which will return the name.</param>
+        public EnumGroupAndName(
+            string group,
+            Func<string> name)
+        {
+            if (group == null)
+            {
+                throw new ArgumentNullException(nameof(group));
+            }
+
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            Group = group;
+            _name = name;
+        }
+
+        /// <summary>
+        /// Gets the Group name.
+        /// </summary>
+        public string Group { get; }
+
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        public string Name => _name();
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IBinderTypeProviderMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IBinderTypeProviderMetadata.cs
new file mode 100644
index 0000000000..75740bba00
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IBinderTypeProviderMetadata.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Provides a <see cref="Type"/> which implements <see cref="IModelBinder"/>.
+    /// </summary>
+    public interface IBinderTypeProviderMetadata : IBindingSourceMetadata
+    {
+        /// <summary>
+        /// A <see cref="Type"/> which implements either <see cref="IModelBinder"/>.
+        /// </summary>
+        Type BinderType { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IBindingSourceMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IBindingSourceMetadata.cs
new file mode 100644
index 0000000000..4a1ed31275
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IBindingSourceMetadata.cs
@@ -0,0 +1,20 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Metadata which specifies the data source for model binding.
+    /// </summary>
+    public interface IBindingSourceMetadata
+    {
+        /// <summary>
+        /// Gets the <see cref="BindingSource"/>. 
+        /// </summary>
+        /// <remarks>
+        /// The <see cref="BindingSource"/> is metadata which can be used to determine which data
+        /// sources are valid for model binding of a property or parameter.
+        /// </remarks>
+        BindingSource BindingSource { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelBinder.cs
new file mode 100644
index 0000000000..67cfb95218
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelBinder.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Defines an interface for model binders.
+    /// </summary>
+    public interface IModelBinder
+    {
+        /// <summary>
+        /// Attempts to bind a model.
+        /// </summary>
+        /// <param name="bindingContext">The <see cref="ModelBindingContext"/>.</param>
+        /// <returns>
+        /// <para>
+        /// A <see cref="Task"/> which will complete when the model binding process completes.
+        /// </para>
+        /// <para>
+        /// If model binding was successful, the <see cref="ModelBindingContext.Result"/> should have
+        /// <see cref="ModelBindingResult.IsModelSet"/> set to <c>true</c>.
+        /// </para>
+        /// <para>
+        /// A model binder that completes successfully should set <see cref="ModelBindingContext.Result"/> to
+        /// a value returned from <see cref="ModelBindingResult.Success"/>. 
+        /// </para>
+        /// </returns>
+        Task BindModelAsync(ModelBindingContext bindingContext);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelBinderProvider.cs
new file mode 100644
index 0000000000..397fa7e637
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelBinderProvider.cs
@@ -0,0 +1,19 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Creates <see cref="IModelBinder"/> instances. Register <see cref="IModelBinderProvider"/>
+    /// instances in <c>MvcOptions</c>.
+    /// </summary>
+    public interface IModelBinderProvider
+    {
+        /// <summary>
+        /// Creates a <see cref="IModelBinder"/> based on <see cref="ModelBinderProviderContext"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ModelBinderProviderContext"/>.</param>
+        /// <returns>An <see cref="IModelBinder"/>.</returns>
+        IModelBinder GetBinder(ModelBinderProviderContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelMetadataProvider.cs
new file mode 100644
index 0000000000..32d41f717c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelMetadataProvider.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public interface IModelMetadataProvider
+    {
+        ModelMetadata GetMetadataForType(Type modelType);
+
+        IEnumerable<ModelMetadata> GetMetadataForProperties(Type modelType);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelNameProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelNameProvider.cs
new file mode 100644
index 0000000000..321b7af174
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelNameProvider.cs
@@ -0,0 +1,16 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Represents an entity which can provide model name as metadata.
+    /// </summary>
+    public interface IModelNameProvider
+    {
+        /// <summary>
+        /// Model name.
+        /// </summary>
+        string Name { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IPropertyFilterProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IPropertyFilterProvider.cs
new file mode 100644
index 0000000000..76ddd463cc
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IPropertyFilterProvider.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Provides a predicate which can determines which model properties should be bound by model binding.
+    /// </summary>
+    public interface IPropertyFilterProvider
+    {
+        /// <summary>
+        /// Gets a predicate which can determines which model properties should be bound by model binding.
+        /// </summary>
+        Func<ModelMetadata, bool> PropertyFilter { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IRequestPredicateProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IRequestPredicateProvider.cs
new file mode 100644
index 0000000000..ab72771f22
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IRequestPredicateProvider.cs
@@ -0,0 +1,20 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// An interface that allows a top-level model to be bound or not bound based on state associated
+    /// with the current request.
+    /// </summary>
+    public interface IRequestPredicateProvider
+    {
+        /// <summary>
+        /// Gets a function which determines whether or not the model object should be bound based
+        /// on the current request.
+        /// </summary>
+        Func<ActionContext, bool> RequestPredicate { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IValueProvider.cs
new file mode 100644
index 0000000000..4e57509298
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IValueProvider.cs
@@ -0,0 +1,25 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Defines the methods that are required for a value provider.
+    /// </summary>
+    public interface IValueProvider
+    {
+        /// <summary>
+        /// Determines whether the collection contains the specified prefix.
+        /// </summary>
+        /// <param name="prefix">The prefix to search for.</param>
+        /// <returns>true if the collection contains the specified prefix; otherwise, false.</returns>
+        bool ContainsPrefix(string prefix);
+
+        /// <summary>
+        /// Retrieves a value object using the specified key.
+        /// </summary>
+        /// <param name="key">The key of the value object to retrieve.</param>
+        /// <returns>The value object for the specified key. If the exact key is not found, null.</returns>
+        ValueProviderResult GetValue(string key);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IValueProviderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IValueProviderFactory.cs
new file mode 100644
index 0000000000..39b2948fe7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IValueProviderFactory.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// A factory for creating <see cref="IValueProvider"/> instances.
+    /// </summary>
+    public interface IValueProviderFactory
+    {
+        /// <summary>
+        /// Creates a <see cref="IValueProvider"/> with values from the current request
+        /// and adds it to <see cref="ValueProviderFactoryContext.ValueProviders"/> list.
+        /// </summary>
+        /// <param name="context">The <see cref="ValueProviderFactoryContext"/>.</param>
+        /// <returns>A <see cref="Task"/> that when completed will add an <see cref="IValueProvider"/> instance
+        /// to <see cref="ValueProviderFactoryContext.ValueProviders"/> list if applicable.</returns>
+        Task CreateValueProviderAsync(ValueProviderFactoryContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelBindingMessageProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelBindingMessageProvider.cs
new file mode 100644
index 0000000000..5ab37cfd8b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelBindingMessageProvider.cs
@@ -0,0 +1,95 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    /// <summary>
+    /// Provider for error messages the model binding system detects.
+    /// </summary>
+    public abstract class ModelBindingMessageProvider
+    {
+        /// <summary>
+        /// Error message the model binding system adds when a property with an associated
+        /// <c>BindRequiredAttribute</c> is not bound.
+        /// </summary>
+        /// <value>Default <see cref="string"/> is "A value for the '{0}' property was not provided.".</value>
+        public virtual Func<string, string> MissingBindRequiredValueAccessor { get; }
+
+        /// <summary>
+        /// Error message the model binding system adds when either the key or the value of a
+        /// <see cref="System.Collections.Generic.KeyValuePair{TKey, TValue}"/> is bound but not both.
+        /// </summary>
+        /// <value>Default <see cref="string"/> is "A value is required.".</value>
+        public virtual Func<string> MissingKeyOrValueAccessor { get; }
+
+        /// <summary>
+        /// Error message the model binding system adds when no value is provided for the request body,
+        /// but a value is required.
+        /// </summary>
+        /// <value>Default <see cref="string"/> is "A non-empty request body is required.".</value>
+        public virtual Func<string> MissingRequestBodyRequiredValueAccessor { get; }
+
+        /// <summary>
+        /// Error message the model binding system adds when a <c>null</c> value is bound to a
+        /// non-<see cref="Nullable"/> property.
+        /// </summary>
+        /// <value>Default <see cref="string"/> is "The value '{0}' is invalid.".</value>
+        public virtual Func<string, string> ValueMustNotBeNullAccessor { get; }
+
+        /// <summary>
+        /// Error message the model binding system adds when <see cref="ModelError.Exception"/> is of type
+        /// <see cref="FormatException"/> or <see cref="OverflowException"/>, value is known, and error is associated
+        /// with a property.
+        /// </summary>
+        /// <value>Default <see cref="string"/> is "The value '{0}' is not valid for {1}.".</value>
+        public virtual Func<string, string, string> AttemptedValueIsInvalidAccessor { get; }
+
+        /// <summary>
+        /// Error message the model binding system adds when <see cref="ModelError.Exception"/> is of type
+        /// <see cref="FormatException"/> or <see cref="OverflowException"/>, value is known, and error is associated
+        /// with a collection element or action parameter.
+        /// </summary>
+        /// <value>Default <see cref="string"/> is "The value '{0}' is not valid.".</value>
+        public virtual Func<string, string> NonPropertyAttemptedValueIsInvalidAccessor { get; }
+
+        /// <summary>
+        /// Error message the model binding system adds when <see cref="ModelError.Exception"/> is of type
+        /// <see cref="FormatException"/> or <see cref="OverflowException"/>, value is unknown, and error is associated
+        /// with a property.
+        /// </summary>
+        /// <value>Default <see cref="string"/> is "The supplied value is invalid for {0}.".</value>
+        public virtual Func<string, string> UnknownValueIsInvalidAccessor { get; }
+
+        /// <summary>
+        /// Error message the model binding system adds when <see cref="ModelError.Exception"/> is of type
+        /// <see cref="FormatException"/> or <see cref="OverflowException"/>, value is unknown, and error is associated
+        /// with a collection element or action parameter.
+        /// </summary>
+        /// <value>Default <see cref="string"/> is "The supplied value is invalid.".</value>
+        public virtual Func<string> NonPropertyUnknownValueIsInvalidAccessor { get; }
+
+        /// <summary>
+        /// Fallback error message HTML and tag helpers display when a property is invalid but the
+        /// <see cref="ModelError"/>s have <c>null</c> <see cref="ModelError.ErrorMessage"/>s.
+        /// </summary>
+        /// <value>Default <see cref="string"/> is "The value '{0}' is invalid.".</value>
+        public virtual Func<string, string> ValueIsInvalidAccessor { get; }
+
+        /// <summary>
+        /// Error message HTML and tag helpers add for client-side validation of numeric formats. Visible in the
+        /// browser if the field for a <c>float</c> (for example) property does not have a correctly-formatted value.
+        /// </summary>
+        /// <value>Default <see cref="string"/> is "The field {0} must be a number.".</value>
+        public virtual Func<string, string> ValueMustBeANumberAccessor { get; }
+
+        /// <summary>
+        /// Error message HTML and tag helpers add for client-side validation of numeric formats. Visible in the
+        /// browser if the field for a <c>float</c> (for example) collection element or action parameter does not have a
+        /// correctly-formatted value.
+        /// </summary>
+        /// <value>Default <see cref="string"/> is "The field must be a number.".</value>
+        public virtual Func<string> NonPropertyValueMustBeANumberAccessor { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelMetadataIdentity.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelMetadataIdentity.cs
new file mode 100644
index 0000000000..913576e6a8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelMetadataIdentity.cs
@@ -0,0 +1,177 @@
+// 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.
+
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    /// <summary>
+    /// A key type which identifies a <see cref="ModelMetadata"/>.
+    /// </summary>
+    public struct ModelMetadataIdentity : IEquatable<ModelMetadataIdentity>
+    {
+        /// <summary>
+        /// Creates a <see cref="ModelMetadataIdentity"/> for the provided model <see cref="Type"/>.
+        /// </summary>
+        /// <param name="modelType">The model <see cref="Type"/>.</param>
+        /// <returns>A <see cref="ModelMetadataIdentity"/>.</returns>
+        public static ModelMetadataIdentity ForType(Type modelType)
+        {
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            return new ModelMetadataIdentity()
+            {
+                ModelType = modelType,
+            };
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ModelMetadataIdentity"/> for the provided property.
+        /// </summary>
+        /// <param name="modelType">The model type.</param>
+        /// <param name="name">The name of the property.</param>
+        /// <param name="containerType">The container type of the model property.</param>
+        /// <returns>A <see cref="ModelMetadataIdentity"/>.</returns>
+        public static ModelMetadataIdentity ForProperty(
+            Type modelType,
+            string name,
+            Type containerType)
+        {
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            if (containerType == null)
+            {
+                throw new ArgumentNullException(nameof(containerType));
+            }
+
+            if (string.IsNullOrEmpty(name))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(name));
+            }
+
+            return new ModelMetadataIdentity()
+            {
+                ModelType = modelType,
+                Name = name,
+                ContainerType = containerType,
+            };
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ModelMetadataIdentity"/> for the provided parameter.
+        /// </summary>
+        /// <param name="parameter">The <see cref="ParameterInfo" />.</param>
+        /// <returns>A <see cref="ModelMetadataIdentity"/>.</returns>
+        public static ModelMetadataIdentity ForParameter(ParameterInfo parameter)
+            => ForParameter(parameter, parameter?.ParameterType);
+
+        /// <summary>
+        /// Creates a <see cref="ModelMetadataIdentity"/> for the provided parameter with the specified
+        /// model type.
+        /// </summary>
+        /// <param name="parameter">The <see cref="ParameterInfo" />.</param>
+        /// <param name="modelType">The model type.</param>
+        /// <returns>A <see cref="ModelMetadataIdentity"/>.</returns>
+        private static ModelMetadataIdentity ForParameter(ParameterInfo parameter, Type modelType)
+        {
+            if (parameter == null)
+            {
+                throw new ArgumentNullException(nameof(parameter));
+            }
+
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            return new ModelMetadataIdentity()
+            {
+                Name = parameter.Name,
+                ModelType = modelType,
+                ParameterInfo = parameter,
+            };
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Type"/> defining the model property represented by the current
+        /// instance, or <c>null</c> if the current instance does not represent a property.
+        /// </summary>
+        public Type ContainerType { get; private set; }
+
+        /// <summary>
+        /// Gets the <see cref="Type"/> represented by the current instance.
+        /// </summary>
+        public Type ModelType { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating the kind of metadata represented by the current instance.
+        /// </summary>
+        public ModelMetadataKind MetadataKind
+        {
+            get
+            {
+                if (ParameterInfo != null)
+                {
+                    return ModelMetadataKind.Parameter;
+                }
+                else if (ContainerType != null && Name != null)
+                {
+                    return ModelMetadataKind.Property;
+                }
+                else
+                {
+                    return ModelMetadataKind.Type;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the name of the current instance if it represents a parameter or property, or <c>null</c> if
+        /// the current instance represents a type.
+        /// </summary>
+        public string Name { get; private set; }
+
+        /// <summary>
+        /// Gets a descriptor for the parameter, or <c>null</c> if this instance
+        /// does not represent a parameter.
+        /// </summary>
+        public ParameterInfo ParameterInfo { get; private set; }
+
+        /// <inheritdoc />
+        public bool Equals(ModelMetadataIdentity other)
+        {
+            return
+                ContainerType == other.ContainerType &&
+                ModelType == other.ModelType &&
+                Name == other.Name &&
+                ParameterInfo == other.ParameterInfo;
+        }
+
+        /// <inheritdoc />
+        public override bool Equals(object obj)
+        {
+            var other = obj as ModelMetadataIdentity?;
+            return other.HasValue && Equals(other.Value);
+        }
+
+        /// <inheritdoc />
+        public override int GetHashCode()
+        {
+            var hash = new HashCodeCombiner();
+            hash.Add(ContainerType);
+            hash.Add(ModelType);
+            hash.Add(Name, StringComparer.Ordinal);
+            hash.Add(ParameterInfo);
+            return hash;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelMetadataKind.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelMetadataKind.cs
new file mode 100644
index 0000000000..4756f85226
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelMetadataKind.cs
@@ -0,0 +1,26 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    /// <summary>
+    /// Enumeration for the kinds of <see cref="ModelMetadata"/>
+    /// </summary>
+    public enum ModelMetadataKind
+    {
+        /// <summary>
+        /// Used for <see cref="ModelMetadata"/> for a <see cref="System.Type"/>.
+        /// </summary>
+        Type,
+
+        /// <summary>
+        /// Used for <see cref="ModelMetadata"/> for a property.
+        /// </summary>
+        Property,
+
+        /// <summary>
+        /// Used for <see cref="ModelMetadata"/> for a parameter.
+        /// </summary>
+        Parameter,
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBinderProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBinderProviderContext.cs
new file mode 100644
index 0000000000..6228923e70
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBinderProviderContext.cs
@@ -0,0 +1,53 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// A context object for <see cref="IModelBinderProvider.GetBinder"/>.
+    /// </summary>
+    public abstract class ModelBinderProviderContext
+    {
+        /// <summary>
+        /// Creates an <see cref="IModelBinder"/> for the given <paramref name="metadata"/>.
+        /// </summary>
+        /// <param name="metadata">The <see cref="ModelMetadata"/> for the model.</param>
+        /// <returns>An <see cref="IModelBinder"/>.</returns>
+        public abstract IModelBinder CreateBinder(ModelMetadata metadata);
+
+        /// <summary>
+        /// Creates an <see cref="IModelBinder"/> for the given <paramref name="metadata"/>
+        /// and <paramref name="bindingInfo"/>.
+        /// </summary>
+        /// <param name="metadata">The <see cref="ModelMetadata"/> for the model.</param>
+        /// <param name="bindingInfo">The <see cref="BindingInfo"/> that should be used
+        /// for creating the binder.</param>
+        /// <returns>An <see cref="IModelBinder"/>.</returns>
+        public virtual IModelBinder CreateBinder(ModelMetadata metadata, BindingInfo bindingInfo)
+        {
+            throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// Gets the <see cref="BindingInfo"/>.
+        /// </summary>
+        public abstract BindingInfo BindingInfo { get; }
+
+        /// <summary>
+        /// Gets the <see cref="ModelMetadata"/>.
+        /// </summary>
+        public abstract ModelMetadata Metadata { get; }
+
+        /// <summary>
+        /// Gets the <see cref="IModelMetadataProvider"/>.
+        /// </summary>
+        public abstract IModelMetadataProvider MetadataProvider { get; }
+
+        /// <summary>
+        /// Gets the <see cref="IServiceProvider"/>.
+        /// </summary>
+        public virtual IServiceProvider Services { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBindingContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBindingContext.cs
new file mode 100644
index 0000000000..50c0149cc2
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBindingContext.cs
@@ -0,0 +1,181 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// A context that contains operating information for model binding and validation.
+    /// </summary>
+    public abstract class ModelBindingContext
+    {
+        /// <summary>
+        /// Represents the <see cref="Mvc.ActionContext"/> associated with this context.
+        /// </summary>
+        /// <remarks>
+        /// The property setter is provided for unit testing purposes only.
+        /// </remarks>
+        public abstract ActionContext ActionContext { get; set; }
+
+        /// <summary>
+        /// Gets or sets a model name which is explicitly set using an <see cref="IModelNameProvider"/>.
+        /// </summary>
+        public abstract string BinderModelName { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value which represents the <see cref="ModelBinding.BindingSource"/> associated with the
+        /// <see cref="Model"/>.
+        /// </summary>
+        public abstract BindingSource BindingSource { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the current field being bound.
+        /// </summary>
+        public abstract string FieldName { get; set; }
+
+        /// <summary>
+        /// Gets the <see cref="Http.HttpContext"/> associated with this context.
+        /// </summary>
+        public virtual HttpContext HttpContext => ActionContext?.HttpContext;
+
+        /// <summary>
+        /// Gets or sets an indication that the current binder is handling the top-level object.
+        /// </summary>
+        /// <remarks>Passed into the model binding system.</remarks>
+        public abstract bool IsTopLevelObject { get; set; }
+
+        /// <summary>
+        /// Gets or sets the model value for the current operation.
+        /// </summary>
+        /// <remarks>
+        /// The <see cref="Model"/> will typically be set for a binding operation that works
+        /// against a pre-existing model object to update certain properties.
+        /// </remarks>
+        public abstract object Model { get; set; }
+
+        /// <summary>
+        /// Gets or sets the metadata for the model associated with this context.
+        /// </summary>
+        public abstract ModelMetadata ModelMetadata { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the model. This property is used as a key for looking up values in
+        /// <see cref="IValueProvider"/> during model binding.
+        /// </summary>
+        public abstract string ModelName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ModelStateDictionary"/> used to capture <see cref="ModelStateEntry"/> values
+        /// for properties in the object graph of the model when binding.
+        /// </summary>
+        /// <remarks>
+        /// The property setter is provided for unit testing purposes only.
+        /// </remarks>
+        public abstract ModelStateDictionary ModelState { get; set; }
+
+        /// <summary>
+        /// Gets the type of the model.
+        /// </summary>
+        /// <remarks>
+        /// The <see cref="ModelMetadata"/> property must be set to access this property.
+        /// </remarks>
+        public virtual Type ModelType => ModelMetadata.ModelType;
+
+        /// <summary>
+        /// Gets or sets a predicate which will be evaluated for each property to determine if the property
+        /// is eligible for model binding.
+        /// </summary>
+        public abstract Func<ModelMetadata, bool> PropertyFilter { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ValidationStateDictionary"/>. Used for tracking validation state to
+        /// customize validation behavior for a model object.
+        /// </summary>
+        /// <remarks>
+        /// The property setter is provided for unit testing purposes only.
+        /// </remarks>
+        public abstract ValidationStateDictionary ValidationState { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IValueProvider"/> associated with this context.
+        /// </summary>
+        public abstract IValueProvider ValueProvider { get; set; }
+
+        /// <summary>
+        /// <para>
+        /// Gets or sets a <see cref="ModelBindingResult"/> which represents the result of the model binding process.
+        /// </para>
+        /// <para>
+        /// Before an <see cref="IModelBinder"/> is called, <see cref="Result"/> will be set to a value indicating
+        /// failure. The binder should set <see cref="Result"/> to a value created with
+        /// <see cref="ModelBindingResult.Success"/> if model binding succeeded.
+        /// </para>
+        /// </summary>
+        public abstract ModelBindingResult Result { get; set; }
+
+        /// <summary>
+        /// Pushes a layer of state onto this context. Model binders will call this as part of recursion when binding
+        /// properties or collection items.
+        /// </summary>
+        /// <param name="modelMetadata">
+        /// <see cref="ModelBinding.ModelMetadata"/> to assign to the <see cref="ModelMetadata"/> property.
+        /// </param>
+        /// <param name="fieldName">Name to assign to the <see cref="FieldName"/> property.</param>
+        /// <param name="modelName">Name to assign to the <see cref="ModelName"/> property.</param>
+        /// <param name="model">Instance to assign to the <see cref="Model"/> property.</param>
+        /// <returns>
+        /// A <see cref="NestedScope"/> scope object which should be used in a <c>using</c> statement where
+        /// <see cref="EnterNestedScope(ModelMetadata, string, string, object)"/> is called.
+        /// </returns>
+        public abstract NestedScope EnterNestedScope(
+            ModelMetadata modelMetadata,
+            string fieldName,
+            string modelName,
+            object model);
+
+        /// <summary>
+        /// Pushes a layer of state onto this context. Model binders will call this as part of recursion when binding
+        /// properties or collection items.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="NestedScope"/> scope object which should be used in a <c>using</c> statement where
+        /// <see cref="EnterNestedScope()"/> is called.
+        /// </returns>
+        public abstract NestedScope EnterNestedScope();
+
+        /// <summary>
+        /// Removes a layer of state pushed by calling <see cref="M:EnterNestedScope"/>.
+        /// </summary>
+        protected abstract void ExitNestedScope();
+
+        /// <summary>
+        /// Return value of <see cref="M:EnterNestedScope"/>. Should be disposed
+        /// by caller when child binding context state should be popped off of
+        /// the <see cref="ModelBindingContext"/>.
+        /// </summary>
+        public struct NestedScope : IDisposable
+        {
+            private readonly ModelBindingContext _context;
+
+            /// <summary>
+            /// Initializes the <see cref="NestedScope"/> for a <see cref="ModelBindingContext"/>.
+            /// </summary>
+            /// <param name="context"></param>
+            public NestedScope(ModelBindingContext context)
+            {
+                _context = context;
+            }
+
+            /// <summary>
+            /// Exits the <see cref="NestedScope"/> created by calling <see cref="M:EnterNestedScope"/>.
+            /// </summary>
+            public void Dispose()
+            {
+                _context.ExitNestedScope();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBindingResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBindingResult.cs
new file mode 100644
index 0000000000..de57b8bf88
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBindingResult.cs
@@ -0,0 +1,122 @@
+// 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.
+
+using System;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Contains the result of model binding.
+    /// </summary>
+    public struct ModelBindingResult : IEquatable<ModelBindingResult>
+    {
+        /// <summary>
+        /// Creates a <see cref="ModelBindingResult"/> representing a failed model binding operation.
+        /// </summary>
+        /// <returns>A <see cref="ModelBindingResult"/> representing a failed model binding operation.</returns>
+        public static ModelBindingResult Failed()
+        {
+            return new ModelBindingResult(model: null, isModelSet: false);
+        }
+        
+        /// <summary>
+        /// Creates a <see cref="ModelBindingResult"/> representing a successful model binding operation.
+        /// </summary>
+        /// <param name="model">The model value. May be <c>null.</c></param>
+        /// <returns>A <see cref="ModelBindingResult"/> representing a successful model bind.</returns>
+        public static ModelBindingResult Success(object model)
+        {
+            return new ModelBindingResult( model, isModelSet: true);
+        }
+
+        private ModelBindingResult(object model, bool isModelSet)
+        {
+            Model = model;
+            IsModelSet = isModelSet;
+        }
+
+        /// <summary>
+        /// Gets the model associated with this context.
+        /// </summary>
+        public object Model { get; }
+
+        /// <summary>
+        /// <para>
+        /// Gets a value indicating whether or not the <see cref="Model"/> value has been set.
+        /// </para>
+        /// <para>
+        /// This property can be used to distinguish between a model binder which does not find a value and
+        /// the case where a model binder sets the <c>null</c> value.
+        /// </para>
+        /// </summary>
+        public bool IsModelSet { get; }
+
+        /// <inheritdoc />
+        public override bool Equals(object obj)
+        {
+            var other = obj as ModelBindingResult?;
+            if (other == null)
+            {
+                return false;
+            }
+            else
+            {
+                return Equals(other.Value);
+            }
+        }
+
+        /// <inheritdoc />
+        public override int GetHashCode()
+        {
+            var hashCodeCombiner = HashCodeCombiner.Start();
+            hashCodeCombiner.Add(IsModelSet);
+            hashCodeCombiner.Add(Model);
+
+            return hashCodeCombiner.CombinedHash;
+        }
+
+        /// <inheritdoc />
+        public bool Equals(ModelBindingResult other)
+        {
+            return
+                IsModelSet == other.IsModelSet &&
+                object.Equals(Model, other.Model);
+        }
+
+        /// <inheritdoc />
+        public override string ToString()
+        {
+            if (IsModelSet)
+            {
+                return $"Success '{Model}'";
+            }
+            else
+            {
+                return "Failed";
+            }
+        }
+
+        /// <summary>
+        /// Compares <see cref="ModelBindingResult"/> objects for equality.
+        /// </summary>
+        /// <param name="x">A <see cref="ModelBindingResult"/>.</param>
+        /// <param name="y">A <see cref="ModelBindingResult"/>.</param>
+        /// <returns><c>true</c> if the objects are equal, otherwise <c>false</c>.</returns>
+        public static bool operator ==(ModelBindingResult x, ModelBindingResult y)
+        {
+            return x.Equals(y);
+        }
+
+        /// <summary>
+        /// Compares <see cref="ModelBindingResult"/> objects for inequality.
+        /// </summary>
+        /// <param name="x">A <see cref="ModelBindingResult"/>.</param>
+        /// <param name="y">A <see cref="ModelBindingResult"/>.</param>
+        /// <returns><c>true</c> if the objects are not equal, otherwise <c>false</c>.</returns>
+        public static bool operator !=(ModelBindingResult x, ModelBindingResult y)
+        {
+            return !x.Equals(y);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelError.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelError.cs
new file mode 100644
index 0000000000..b2125e206d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelError.cs
@@ -0,0 +1,39 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class ModelError
+    {
+        public ModelError(Exception exception)
+            : this(exception, errorMessage: null)
+        {
+            if (exception == null)
+            {
+                throw new ArgumentNullException(nameof(exception));
+            }
+        }
+
+        public ModelError(Exception exception, string errorMessage)
+            : this(errorMessage)
+        {
+            if (exception == null)
+            {
+                throw new ArgumentNullException(nameof(exception));
+            }
+
+            Exception = exception;
+        }
+
+        public ModelError(string errorMessage)
+        {
+            ErrorMessage = errorMessage ?? string.Empty;
+        }
+
+        public Exception Exception { get; }
+
+        public string ErrorMessage { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelErrorCollection.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelErrorCollection.cs
new file mode 100644
index 0000000000..b8d2e95fb0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelErrorCollection.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using System;
+using System.Collections.ObjectModel;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class ModelErrorCollection : Collection<ModelError>
+    {
+        public void Add(Exception exception)
+        {
+            if (exception == null)
+            {
+                throw new ArgumentNullException(nameof(exception));
+            }
+
+            Add(new ModelError(exception));
+        }
+
+        public void Add(string errorMessage)
+        {
+            if (errorMessage == null)
+            {
+                throw new ArgumentNullException(nameof(errorMessage));
+            }
+
+            Add(new ModelError(errorMessage));
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelMetadata.cs
new file mode 100644
index 0000000000..f78815a7d1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelMetadata.cs
@@ -0,0 +1,510 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// A metadata representation of a model type, property or parameter.
+    /// </summary>
+    [DebuggerDisplay("{DebuggerToString(),nq}")]
+    public abstract class ModelMetadata : IEquatable<ModelMetadata>, IModelMetadataProvider
+    {
+        /// <summary>
+        /// The default value of <see cref="ModelMetadata.Order"/>.
+        /// </summary>
+        public static readonly int DefaultOrder = 10000;
+
+        private int? _hashCode;
+
+        /// <summary>
+        /// Creates a new <see cref="ModelMetadata"/>.
+        /// </summary>
+        /// <param name="identity">The <see cref="ModelMetadataIdentity"/>.</param>
+        protected ModelMetadata(ModelMetadataIdentity identity)
+        {
+            Identity = identity;
+
+            InitializeTypeInformation();
+        }
+
+        /// <summary>
+        /// Gets the type containing the property if this metadata is for a property; <see langword="null"/> otherwise.
+        /// </summary>
+        public Type ContainerType => Identity.ContainerType;
+
+        /// <summary>
+        /// Gets the metadata for <see cref="ContainerType"/> if this metadata is for a property;
+        /// <see langword="null"/> otherwise.
+        /// </summary>
+        public virtual ModelMetadata ContainerMetadata
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating the kind of metadata element represented by the current instance.
+        /// </summary>
+        public ModelMetadataKind MetadataKind => Identity.MetadataKind;
+
+        /// <summary>
+        /// Gets the model type represented by the current instance.
+        /// </summary>
+        public Type ModelType => Identity.ModelType;
+
+        /// <summary>
+        /// Gets the name of the parameter or property if this metadata is for a parameter or property;
+        /// <see langword="null"/> otherwise i.e. if this is the metadata for a type.
+        /// </summary>
+        public string Name => Identity.Name;
+
+        /// <summary>
+        /// Gets the name of the parameter if this metadata is for a parameter; <see langword="null"/> otherwise.
+        /// </summary>
+        public string ParameterName => MetadataKind == ModelMetadataKind.Parameter ? Identity.Name : null;
+
+        /// <summary>
+        /// Gets the name of the property if this metadata is for a property; <see langword="null"/> otherwise.
+        /// </summary>
+        public string PropertyName => MetadataKind == ModelMetadataKind.Property ? Identity.Name : null;
+
+        /// <summary>
+        /// Gets the key for the current instance.
+        /// </summary>
+        protected ModelMetadataIdentity Identity { get; }
+
+        /// <summary>
+        /// Gets a collection of additional information about the model.
+        /// </summary>
+        public abstract IReadOnlyDictionary<object, object> AdditionalValues { get; }
+
+        /// <summary>
+        /// Gets the collection of <see cref="ModelMetadata"/> instances for the model's properties.
+        /// </summary>
+        public abstract ModelPropertyCollection Properties { get; }
+
+        /// <summary>
+        /// Gets the name of a model if specified explicitly using <see cref="IModelNameProvider"/>.
+        /// </summary>
+        public abstract string BinderModelName { get; }
+
+        /// <summary>
+        /// Gets the <see cref="Type"/> of an <see cref="IModelBinder"/> of a model if specified explicitly using
+        /// <see cref="IBinderTypeProviderMetadata"/>.
+        /// </summary>
+        public abstract Type BinderType { get; }
+
+        /// <summary>
+        /// Gets a binder metadata for this model.
+        /// </summary>
+        public abstract BindingSource BindingSource { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether or not to convert an empty string value or one containing only whitespace
+        /// characters to <c>null</c> when representing a model as text.
+        /// </summary>
+        public abstract bool ConvertEmptyStringToNull { get; }
+
+        /// <summary>
+        /// Gets the name of the model's datatype.  Overrides <see cref="ModelType"/> in some
+        /// display scenarios.
+        /// </summary>
+        /// <value><c>null</c> unless set manually or through additional metadata e.g. attributes.</value>
+        public abstract string DataTypeName { get; }
+
+        /// <summary>
+        /// Gets the description of the model.
+        /// </summary>
+        public abstract string Description { get; }
+
+        /// <summary>
+        /// Gets the format string (see https://msdn.microsoft.com/en-us/library/txafckwd.aspx) used to display the
+        /// model.
+        /// </summary>
+        public abstract string DisplayFormatString { get; }
+
+        /// <summary>
+        /// Gets the display name of the model.
+        /// </summary>
+        public abstract string DisplayName { get; }
+
+        /// <summary>
+        /// Gets the format string (see https://msdn.microsoft.com/en-us/library/txafckwd.aspx) used to edit the model.
+        /// </summary>
+        public abstract string EditFormatString { get; }
+
+        /// <summary>
+        /// Gets the <see cref="ModelMetadata"/> for elements of <see cref="ModelType"/> if that <see cref="Type"/>
+        /// implements <see cref="IEnumerable"/>.
+        /// </summary>
+        /// <value>
+        /// <see cref="ModelMetadata"/> for <c>T</c> if <see cref="ModelType"/> implements
+        /// <see cref="IEnumerable{T}"/>. <see cref="ModelMetadata"/> for <c>object</c> if <see cref="ModelType"/>
+        /// implements <see cref="IEnumerable"/> but not <see cref="IEnumerable{T}"/>. <c>null</c> otherwise i.e. when
+        /// <see cref="IsEnumerableType"/> is <c>false</c>.
+        /// </value>
+        public abstract ModelMetadata ElementMetadata { get; }
+
+        /// <summary>
+        /// Gets the ordered and grouped display names and values of all <see cref="Enum"/> values in
+        /// <see cref="UnderlyingOrModelType"/>.
+        /// </summary>
+        /// <value>
+        /// An <see cref="IEnumerable{T}"/> of <see cref="KeyValuePair{EnumGroupAndName, String}"/> of mappings between
+        /// <see cref="Enum"/> field groups, names and values. <c>null</c> if <see cref="IsEnum"/> is <c>false</c>.
+        /// </value>
+        public abstract IEnumerable<KeyValuePair<EnumGroupAndName, string>> EnumGroupedDisplayNamesAndValues { get; }
+
+        /// <summary>
+        /// Gets the names and values of all <see cref="Enum"/> values in <see cref="UnderlyingOrModelType"/>.
+        /// </summary>
+        /// <value>
+        /// An <see cref="IReadOnlyDictionary{String, String}"/> of mappings between <see cref="Enum"/> field names
+        /// and values. <c>null</c> if <see cref="IsEnum"/> is <c>false</c>.
+        /// </value>
+        public abstract IReadOnlyDictionary<string, string> EnumNamesAndValues { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether <see cref="EditFormatString"/> has a non-<c>null</c>, non-empty
+        /// value different from the default for the datatype.
+        /// </summary>
+        public abstract bool HasNonDefaultEditFormat { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the value should be HTML-encoded.
+        /// </summary>
+        /// <value>If <c>true</c>, value should be HTML-encoded. Default is <c>true</c>.</value>
+        public abstract bool HtmlEncode { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the "HiddenInput" display template should return
+        /// <c>string.Empty</c> (not the expression value) and whether the "HiddenInput" editor template should not
+        /// also return the expression value (together with the hidden &lt;input&gt; element).
+        /// </summary>
+        /// <remarks>
+        /// If <c>true</c>, also causes the default <see cref="object"/> display and editor templates to return HTML
+        /// lacking the usual per-property &lt;div&gt; wrapper around the associated property. Thus the default
+        /// <see cref="object"/> display template effectively skips the property and the default <see cref="object"/>
+        /// editor template returns only the hidden &lt;input&gt; element for the property.
+        /// </remarks>
+        public abstract bool HideSurroundingHtml { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether or not the model value can be bound by model binding. This is only
+        /// applicable when the current instance represents a property.
+        /// </summary>
+        /// <remarks>
+        /// If <c>true</c> then the model value is considered supported by model binding and can be set
+        /// based on provided input in the request.
+        /// </remarks>
+        public abstract bool IsBindingAllowed { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether or not the model value is required by model binding. This is only
+        /// applicable when the current instance represents a property.
+        /// </summary>
+        /// <remarks>
+        /// If <c>true</c> then the model value is considered required by model binding and must have a value
+        /// supplied in the request to be considered valid.
+        /// </remarks>
+        public abstract bool IsBindingRequired { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether <see cref="UnderlyingOrModelType"/> is for an <see cref="Enum"/>.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if <c>type.IsEnum</c> (<c>type.GetTypeInfo().IsEnum</c> for DNX Core 5.0) is <c>true</c> for
+        /// <see cref="UnderlyingOrModelType"/>; <c>false</c> otherwise.
+        /// </value>
+        public abstract bool IsEnum { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether <see cref="UnderlyingOrModelType"/> is for an <see cref="Enum"/> with an
+        /// associated <see cref="FlagsAttribute"/>.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if <see cref="IsEnum"/> is <c>true</c> and <see cref="UnderlyingOrModelType"/> has an
+        /// associated <see cref="FlagsAttribute"/>; <c>false</c> otherwise.
+        /// </value>
+        public abstract bool IsFlagsEnum { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether or not the model value is read-only. This is only applicable when
+        /// the current instance represents a property.
+        /// </summary>
+        public abstract bool IsReadOnly { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether or not the model value is required. This is only applicable when
+        /// the current instance represents a property.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// If <c>true</c> then the model value is considered required by validators.
+        /// </para>
+        /// <para>
+        /// By default an implicit <c>System.ComponentModel.DataAnnotations.RequiredAttribute</c> will be added
+        /// if not present when <c>true.</c>.
+        /// </para>
+        /// </remarks>
+        public abstract bool IsRequired { get; }
+
+        /// <summary>
+        /// Gets the <see cref="Metadata.ModelBindingMessageProvider"/> instance.
+        /// </summary>
+        public abstract ModelBindingMessageProvider ModelBindingMessageProvider { get; }
+
+        /// <summary>
+        /// Gets a value indicating where the current metadata should be ordered relative to other properties
+        /// in its containing type.
+        /// </summary>
+        /// <remarks>
+        /// <para>For example this property is used to order items in <see cref="Properties"/>.</para>
+        /// <para>The default order is <c>10000</c>.</para>
+        /// </remarks>
+        /// <value>The order value of the current metadata.</value>
+        public abstract int Order { get; }
+
+        /// <summary>
+        /// Gets the text to display as a placeholder value for an editor.
+        /// </summary>
+        public abstract string Placeholder { get; }
+
+        /// <summary>
+        /// Gets the text to display when the model is <c>null</c>.
+        /// </summary>
+        public abstract string NullDisplayText { get; }
+
+        /// <summary>
+        /// Gets the <see cref="IPropertyFilterProvider"/>, which can determine which properties
+        /// should be model bound.
+        /// </summary>
+        public abstract IPropertyFilterProvider PropertyFilterProvider { get; }
+
+        /// <summary>
+        /// Gets a value that indicates whether the property should be displayed in read-only views.
+        /// </summary>
+        public abstract bool ShowForDisplay { get; }
+
+        /// <summary>
+        /// Gets a value that indicates whether the property should be displayed in editable views.
+        /// </summary>
+        public abstract bool ShowForEdit { get; }
+
+        /// <summary>
+        /// Gets  a value which is the name of the property used to display the model.
+        /// </summary>
+        public abstract string SimpleDisplayProperty { get; }
+
+        /// <summary>
+        /// Gets a string used by the templating system to discover display-templates and editor-templates.
+        /// </summary>
+        public abstract string TemplateHint { get; }
+
+        /// <summary>
+        /// Gets an <see cref="IPropertyValidationFilter"/> implementation that indicates whether this model should be
+        /// validated. If <c>null</c>, properties with this <see cref="ModelMetadata"/> are validated.
+        /// </summary>
+        /// <value>Defaults to <c>null</c>.</value>
+        public virtual IPropertyValidationFilter PropertyValidationFilter => null;
+
+        /// <summary>
+        /// Gets a value that indicates whether properties or elements of the model should be validated.
+        /// </summary>
+        public abstract bool ValidateChildren { get; }
+
+        /// <summary>
+        /// Gets a collection of metadata items for validators.
+        /// </summary>
+        public abstract IReadOnlyList<object> ValidatorMetadata { get; }
+
+        /// <summary>
+        /// Gets the <see cref="Type"/> for elements of <see cref="ModelType"/> if that <see cref="Type"/>
+        /// implements <see cref="IEnumerable"/>.
+        /// </summary>
+        public Type ElementType { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether <see cref="ModelType"/> is a complex type.
+        /// </summary>
+        /// <remarks>
+        /// A complex type is defined as a <see cref="Type"/> which has a
+        /// <see cref="TypeConverter"/> that can convert from <see cref="string"/>.
+        /// </remarks>
+        public bool IsComplexType { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether or not <see cref="ModelType"/> is a <see cref="Nullable{T}"/>.
+        /// </summary>
+        public bool IsNullableValueType { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether or not <see cref="ModelType"/> is a collection type.
+        /// </summary>
+        /// <remarks>
+        /// A collection type is defined as a <see cref="Type"/> which is assignable to <see cref="ICollection{T}"/>.
+        /// </remarks>
+        public bool IsCollectionType { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether or not <see cref="ModelType"/> is an enumerable type.
+        /// </summary>
+        /// <remarks>
+        /// An enumerable type is defined as a <see cref="Type"/> which is assignable to
+        /// <see cref="IEnumerable"/>, and is not a <see cref="string"/>.
+        /// </remarks>
+        public bool IsEnumerableType { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether or not <see cref="ModelType"/> allows <c>null</c> values.
+        /// </summary>
+        public bool IsReferenceOrNullableType { get; private set; }
+
+        /// <summary>
+        /// Gets the underlying type argument if <see cref="ModelType"/> inherits from <see cref="Nullable{T}"/>.
+        /// Otherwise gets <see cref="ModelType"/>.
+        /// </summary>
+        /// <remarks>
+        /// Identical to <see cref="ModelType"/> unless <see cref="IsNullableValueType"/> is <c>true</c>.
+        /// </remarks>
+        public Type UnderlyingOrModelType { get; private set; }
+
+        /// <summary>
+        /// Gets a property getter delegate to get the property value from a model object.
+        /// </summary>
+        public abstract Func<object, object> PropertyGetter { get; }
+
+        /// <summary>
+        /// Gets a property setter delegate to set the property value on a model object.
+        /// </summary>
+        public abstract Action<object, object> PropertySetter { get; }
+
+        /// <summary>
+        /// Gets a display name for the model.
+        /// </summary>
+        /// <remarks>
+        /// <see cref="GetDisplayName()"/> will return the first of the following expressions which has a
+        /// non-<see langword="null"/> value: <see cref="DisplayName"/>, <see cref="Name"/>, or <c>ModelType.Name</c>.
+        /// </remarks>
+        /// <returns>The display name.</returns>
+        public string GetDisplayName()
+        {
+            return DisplayName ?? Name ?? ModelType.Name;
+        }
+
+        /// <inheritdoc />
+        public bool Equals(ModelMetadata other)
+        {
+            if (object.ReferenceEquals(this, other))
+            {
+                return true;
+            }
+
+            if (other == null)
+            {
+                return false;
+            }
+            else
+            {
+                return Identity.Equals(other.Identity);
+            }
+        }
+
+        /// <inheritdoc />
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as ModelMetadata);
+        }
+
+        /// <inheritdoc />
+        public override int GetHashCode()
+        {
+            // Normally caching the hashcode would be dangerous, but Identity is deeply immutable so this is safe.
+            if (_hashCode == null)
+            {
+                _hashCode = Identity.GetHashCode();
+            }
+
+            return _hashCode.Value;
+        }
+
+        private void InitializeTypeInformation()
+        {
+            Debug.Assert(ModelType != null);
+
+            IsComplexType = !TypeDescriptor.GetConverter(ModelType).CanConvertFrom(typeof(string));
+            IsNullableValueType = Nullable.GetUnderlyingType(ModelType) != null;
+            IsReferenceOrNullableType = !ModelType.GetTypeInfo().IsValueType || IsNullableValueType;
+            UnderlyingOrModelType = Nullable.GetUnderlyingType(ModelType) ?? ModelType;
+
+            var collectionType = ClosedGenericMatcher.ExtractGenericInterface(ModelType, typeof(ICollection<>));
+            IsCollectionType = collectionType != null;
+
+            if (ModelType == typeof(string) || !typeof(IEnumerable).IsAssignableFrom(ModelType))
+            {
+                // Do nothing, not Enumerable.
+            }
+            else if (ModelType.IsArray)
+            {
+                IsEnumerableType = true;
+                ElementType = ModelType.GetElementType();
+            }
+            else
+            {
+                IsEnumerableType = true;
+
+                var enumerableType = ClosedGenericMatcher.ExtractGenericInterface(ModelType, typeof(IEnumerable<>));
+                ElementType = enumerableType?.GenericTypeArguments[0];
+
+                if (ElementType == null)
+                {
+                    // ModelType implements IEnumerable but not IEnumerable<T>.
+                    ElementType = typeof(object);
+                }
+
+                Debug.Assert(
+                    ElementType != null,
+                    $"Unable to find element type for '{ModelType.FullName}' though IsEnumerableType is true.");
+            }
+        }
+
+        private string DebuggerToString()
+        {
+            switch (MetadataKind)
+            {
+                case ModelMetadataKind.Parameter:
+                    return $"ModelMetadata (Parameter: '{ParameterName}' Type: '{ModelType.Name}')";
+                case ModelMetadataKind.Property:
+                    return $"ModelMetadata (Property: '{ContainerType.Name}.{PropertyName}' Type: '{ModelType.Name}')";
+                case ModelMetadataKind.Type:
+                    return $"ModelMetadata (Type: '{ModelType.Name}')";
+                default:
+                    return $"Unsupported MetadataKind '{MetadataKind}'.";
+            }
+        }
+
+        /// <inheritdoc />
+        public virtual ModelMetadata GetMetadataForType(Type modelType)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <inheritdoc />
+        public virtual IEnumerable<ModelMetadata> GetMetadataForProperties(Type modelType)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelMetadataProvider.cs
new file mode 100644
index 0000000000..1b4f01cd6d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelMetadataProvider.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// A provider that can supply instances of <see cref="ModelMetadata"/>.
+    /// </summary>
+    public abstract class ModelMetadataProvider : IModelMetadataProvider
+    {
+        /// <summary>
+        /// Supplies metadata describing the properties of a <see cref="Type"/>.
+        /// </summary>
+        /// <param name="modelType">The <see cref="Type"/>.</param>
+        /// <returns>A set of <see cref="ModelMetadata"/> instances describing properties of the <see cref="Type"/>.</returns>
+        public abstract IEnumerable<ModelMetadata> GetMetadataForProperties(Type modelType);
+
+        /// <summary>
+        /// Supplies metadata describing a <see cref="Type"/>.
+        /// </summary>
+        /// <param name="modelType">The <see cref="Type"/>.</param>
+        /// <returns>A <see cref="ModelMetadata"/> instance describing the <see cref="Type"/>.</returns>
+        public abstract ModelMetadata GetMetadataForType(Type modelType);
+
+        /// <summary>
+        /// Supplies metadata describing a parameter.
+        /// </summary>
+        /// <param name="parameter">The <see cref="ParameterInfo"/>.</param>
+        /// <returns>A <see cref="ModelMetadata"/> instance describing the <paramref name="parameter"/>.</returns>
+        public abstract ModelMetadata GetMetadataForParameter(ParameterInfo parameter);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelPropertyCollection.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelPropertyCollection.cs
new file mode 100644
index 0000000000..733da709ba
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelPropertyCollection.cs
@@ -0,0 +1,57 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// A read-only collection of <see cref="ModelMetadata"/> objects which represent model properties.
+    /// </summary>
+    public class ModelPropertyCollection : ReadOnlyCollection<ModelMetadata>
+    {
+        /// <summary>
+        /// Creates a new <see cref="ModelPropertyCollection"/>.
+        /// </summary>
+        /// <param name="properties">The properties.</param>
+        public ModelPropertyCollection(IEnumerable<ModelMetadata> properties)
+            : base(properties.ToList())
+        {
+        }
+
+        /// <summary>
+        /// Gets a <see cref="ModelMetadata"/> instance for the property corresponding to <paramref name="propertyName"/>.
+        /// </summary>
+        /// <param name="propertyName">
+        /// The property name. Property names are compared using <see cref="StringComparison.Ordinal"/>.
+        /// </param>
+        /// <returns>
+        /// The <see cref="ModelMetadata"/> instance for the property specified by <paramref name="propertyName"/>, or
+        /// <c>null</c> if no match can be found.
+        /// </returns>
+        public ModelMetadata this[string propertyName]
+        {
+            get
+            {
+                if (propertyName == null)
+                {
+                    throw new ArgumentNullException(nameof(propertyName));
+                }
+
+                for (var i = 0; i < Items.Count; i++)
+                {
+                    var property = Items[i];
+                    if (string.Equals(property.PropertyName, propertyName, StringComparison.Ordinal))
+                    {
+                        return property;
+                    }
+                }
+
+                return null;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelStateDictionary.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelStateDictionary.cs
new file mode 100644
index 0000000000..970e5b6975
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelStateDictionary.cs
@@ -0,0 +1,1249 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Represents the state of an attempt to bind values from an HTTP Request to an action method, which includes
+    /// validation information.
+    /// </summary>
+    public class ModelStateDictionary : IReadOnlyDictionary<string, ModelStateEntry>
+    {
+        // Make sure to update the doc headers if this value is changed.
+        /// <summary>
+        /// The default value for <see cref="MaxAllowedErrors"/> of <c>200</c>.
+        /// </summary>
+        public static readonly int DefaultMaxAllowedErrors = 200;
+
+        private const char DelimiterDot = '.';
+        private const char DelimiterOpen = '[';
+
+        private readonly ModelStateNode _root;
+        private int _maxAllowedErrors;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ModelStateDictionary"/> class.
+        /// </summary>
+        public ModelStateDictionary()
+            : this(DefaultMaxAllowedErrors)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ModelStateDictionary"/> class.
+        /// </summary>
+        public ModelStateDictionary(int maxAllowedErrors)
+        {
+            MaxAllowedErrors = maxAllowedErrors;
+            var emptySegment = new StringSegment(buffer: string.Empty);
+            _root = new ModelStateNode(subKey: emptySegment)
+            {
+                Key = string.Empty
+            };
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ModelStateDictionary"/> class by using values that are copied
+        /// from the specified <paramref name="dictionary"/>.
+        /// </summary>
+        /// <param name="dictionary">The <see cref="ModelStateDictionary"/> to copy values from.</param>
+        public ModelStateDictionary(ModelStateDictionary dictionary)
+            : this(dictionary?.MaxAllowedErrors ?? DefaultMaxAllowedErrors)
+        {
+            if (dictionary == null)
+            {
+                throw new ArgumentNullException(nameof(dictionary));
+            }
+
+            Merge(dictionary);
+        }
+
+        /// <summary>
+        /// Root entry for the <see cref="ModelStateDictionary"/>.
+        /// </summary>
+        public ModelStateEntry Root => _root;
+
+        /// <summary>
+        /// Gets or sets the maximum allowed model state errors in this instance of <see cref="ModelStateDictionary"/>.
+        /// Defaults to <c>200</c>.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// <see cref="ModelStateDictionary"/> tracks the number of model errors added by calls to
+        /// <see cref="AddModelError(string, Exception, ModelMetadata)"/> or
+        /// <see cref="TryAddModelError(string, Exception, ModelMetadata)"/>.
+        /// Once the value of <code>MaxAllowedErrors - 1</code> is reached, if another attempt is made to add an error,
+        /// the error message will be ignored and a <see cref="TooManyModelErrorsException"/> will be added.
+        /// </para>
+        /// <para>
+        /// Errors added via modifying <see cref="ModelStateEntry"/> directly do not count towards this limit.
+        /// </para>
+        /// </remarks>
+        public int MaxAllowedErrors
+        {
+            get
+            {
+                return _maxAllowedErrors;
+            }
+            set
+            {
+                if (value < 0)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(value));
+                }
+
+                _maxAllowedErrors = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether or not the maximum number of errors have been
+        /// recorded.
+        /// </summary>
+        /// <remarks>
+        /// Returns <c>true</c> if a <see cref="TooManyModelErrorsException"/> has been recorded;
+        /// otherwise <c>false</c>.
+        /// </remarks>
+        public bool HasReachedMaxErrors => ErrorCount >= MaxAllowedErrors;
+
+        /// <summary>
+        /// Gets the number of errors added to this instance of <see cref="ModelStateDictionary"/> via
+        /// <see cref="M:AddModelError"/> or <see cref="M:TryAddModelError"/>.
+        /// </summary>
+        public int ErrorCount { get; private set; }
+
+        /// <inheritdoc />
+        public int Count { get; private set; }
+
+        /// <summary>
+        /// Gets the key sequence.
+        /// </summary>
+        public KeyEnumerable Keys => new KeyEnumerable(this);
+
+        /// <inheritdoc />
+        IEnumerable<string> IReadOnlyDictionary<string, ModelStateEntry>.Keys => Keys;
+
+        /// <summary>
+        /// Gets the value sequence.
+        /// </summary>
+        public ValueEnumerable Values => new ValueEnumerable(this);
+
+        /// <inheritdoc />
+        IEnumerable<ModelStateEntry> IReadOnlyDictionary<string, ModelStateEntry>.Values => Values;
+
+        /// <summary>
+        /// Gets a value that indicates whether any model state values in this model state dictionary is invalid or not validated.
+        /// </summary>
+        public bool IsValid
+        {
+            get
+            {
+                return ValidationState == ModelValidationState.Valid || ValidationState == ModelValidationState.Skipped;
+            }
+        }
+
+        /// <inheritdoc />
+        public ModelValidationState ValidationState => GetValidity(_root) ?? ModelValidationState.Valid;
+
+        /// <inheritdoc />
+        public ModelStateEntry this[string key]
+        {
+            get
+            {
+                if (key == null)
+                {
+                    throw new ArgumentNullException(nameof(key));
+                }
+
+                TryGetValue(key, out var entry);
+                return entry;
+            }
+        }
+
+        // Flag that indicates if TooManyModelErrorException has already been added to this dictionary.
+        private bool HasRecordedMaxModelError { get; set; }
+
+        /// <summary>
+        /// Adds the specified <paramref name="exception"/> to the <see cref="ModelStateEntry.Errors"/> instance
+        /// that is associated with the specified <paramref name="key"/>. If the maximum number of allowed
+        /// errors has already been recorded, ensures that a <see cref="TooManyModelErrorsException"/> exception is
+        /// recorded instead.
+        /// </summary>
+        /// <remarks>
+        /// This method allows adding the <paramref name="exception"/> to the current <see cref="ModelStateDictionary"/>
+        /// when <see cref="ModelMetadata"/> is not available or the exact <paramref name="exception"/>
+        /// must be maintained for later use (even if it is for example a <see cref="FormatException"/>).
+        /// Where <see cref="ModelMetadata"/> is available, use <see cref="AddModelError(string, Exception, ModelMetadata)"/> instead.
+        /// </remarks>
+        /// <param name="key">The key of the <see cref="ModelStateEntry"/> to add errors to.</param>
+        /// <param name="exception">The <see cref="Exception"/> to add.</param>
+        /// <returns>
+        /// <c>True</c> if the given error was added, <c>false</c> if the error was ignored.
+        /// See <see cref="MaxAllowedErrors"/>.
+        /// </returns>
+        public bool TryAddModelException(string key, Exception exception)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            if (exception == null)
+            {
+                throw new ArgumentNullException(nameof(exception));
+            }
+
+            if (ErrorCount >= MaxAllowedErrors - 1)
+            {
+                EnsureMaxErrorsReachedRecorded();
+                return false;
+            }
+
+            ErrorCount++;
+            AddModelErrorCore(key, exception);
+            return true;
+        }
+
+        /// <summary>
+        /// Adds the specified <paramref name="exception"/> to the <see cref="ModelStateEntry.Errors"/> instance
+        /// that is associated with the specified <paramref name="key"/>. If the maximum number of allowed
+        /// errors has already been recorded, ensures that a <see cref="TooManyModelErrorsException"/> exception is
+        /// recorded instead.
+        /// </summary>
+        /// <param name="key">The key of the <see cref="ModelStateEntry"/> to add errors to.</param>
+        /// <param name="exception">The <see cref="Exception"/> to add. Some exception types will be replaced with
+        /// a descriptive error message.</param>
+        /// <param name="metadata">The <see cref="ModelMetadata"/> associated with the model.</param>
+        public void AddModelError(string key, Exception exception, ModelMetadata metadata)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            if (exception == null)
+            {
+                throw new ArgumentNullException(nameof(exception));
+            }
+
+            if (metadata == null)
+            {
+                throw new ArgumentNullException(nameof(metadata));
+            }
+
+            TryAddModelError(key, exception, metadata);
+        }
+
+        /// <summary>
+        /// Attempts to add the specified <paramref name="exception"/> to the <see cref="ModelStateEntry.Errors"/>
+        /// instance that is associated with the specified <paramref name="key"/>. If the maximum number of allowed
+        /// errors has already been recorded, ensures that a <see cref="TooManyModelErrorsException"/> exception is
+        /// recorded instead.
+        /// </summary>
+        /// <param name="key">The key of the <see cref="ModelStateEntry"/> to add errors to.</param>
+        /// <param name="exception">The <see cref="Exception"/> to add. Some exception types will be replaced with
+        /// a descriptive error message.</param>
+        /// <param name="metadata">The <see cref="ModelMetadata"/> associated with the model.</param>
+        /// <returns>
+        /// <c>True</c> if the given error was added, <c>false</c> if the error was ignored.
+        /// See <see cref="MaxAllowedErrors"/>.
+        /// </returns>
+        public bool TryAddModelError(string key, Exception exception, ModelMetadata metadata)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            if (exception == null)
+            {
+                throw new ArgumentNullException(nameof(exception));
+            }
+
+            if (metadata == null)
+            {
+                throw new ArgumentNullException(nameof(metadata));
+            }
+
+            if (ErrorCount >= MaxAllowedErrors - 1)
+            {
+                EnsureMaxErrorsReachedRecorded();
+                return false;
+            }
+
+            if (exception is FormatException || exception is OverflowException)
+            {
+                // Convert FormatExceptions and OverflowExceptions to Invalid value messages.
+                TryGetValue(key, out var entry);
+
+                // Not using metadata.GetDisplayName() or a single resource to avoid strange messages like
+                // "The value '' is not valid." (when no value was provided, not even an empty string) and
+                // "The supplied value is invalid for Int32." (when error is for an element or parameter).
+                var messageProvider = metadata.ModelBindingMessageProvider;
+                var name = metadata.DisplayName ?? metadata.PropertyName;
+                string errorMessage;
+                if (entry == null && name == null)
+                {
+                    errorMessage = messageProvider.NonPropertyUnknownValueIsInvalidAccessor();
+                }
+                else if (entry == null)
+                {
+                    errorMessage = messageProvider.UnknownValueIsInvalidAccessor(name);
+                }
+                else if (name == null)
+                {
+                    errorMessage = messageProvider.NonPropertyAttemptedValueIsInvalidAccessor(entry.AttemptedValue);
+                }
+                else
+                {
+                    errorMessage = messageProvider.AttemptedValueIsInvalidAccessor(entry.AttemptedValue, name);
+                }
+
+                return TryAddModelError(key, errorMessage);
+            }
+            else if (exception is InputFormatterException && !string.IsNullOrEmpty(exception.Message))
+            {
+                // InputFormatterException is a signal that the message is safe to expose to clients
+                return TryAddModelError(key, exception.Message);
+            }
+
+            ErrorCount++;
+            AddModelErrorCore(key, exception);
+            return true;
+        }
+
+        /// <summary>
+        /// Adds the specified <paramref name="errorMessage"/> to the <see cref="ModelStateEntry.Errors"/> instance
+        /// that is associated with the specified <paramref name="key"/>. If the maximum number of allowed
+        /// errors has already been recorded, ensures that a <see cref="TooManyModelErrorsException"/> exception is
+        /// recorded instead.
+        /// </summary>
+        /// <param name="key">The key of the <see cref="ModelStateEntry"/> to add errors to.</param>
+        /// <param name="errorMessage">The error message to add.</param>
+        public void AddModelError(string key, string errorMessage)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            if (errorMessage == null)
+            {
+                throw new ArgumentNullException(nameof(errorMessage));
+            }
+
+            TryAddModelError(key, errorMessage);
+        }
+
+        /// <summary>
+        /// Attempts to add the specified <paramref name="errorMessage"/> to the <see cref="ModelStateEntry.Errors"/>
+        /// instance that is associated with the specified <paramref name="key"/>. If the maximum number of allowed
+        /// errors has already been recorded, ensures that a <see cref="TooManyModelErrorsException"/> exception is
+        /// recorded instead.
+        /// </summary>
+        /// <param name="key">The key of the <see cref="ModelStateEntry"/> to add errors to.</param>
+        /// <param name="errorMessage">The error message to add.</param>
+        /// <returns>
+        /// <c>True</c> if the given error was added, <c>false</c> if the error was ignored.
+        /// See <see cref="MaxAllowedErrors"/>.
+        /// </returns>
+        public bool TryAddModelError(string key, string errorMessage)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            if (errorMessage == null)
+            {
+                throw new ArgumentNullException(nameof(errorMessage));
+            }
+
+            if (ErrorCount >= MaxAllowedErrors - 1)
+            {
+                EnsureMaxErrorsReachedRecorded();
+                return false;
+            }
+
+            ErrorCount++;
+            var modelState = GetOrAddNode(key);
+            Count += !modelState.IsContainerNode ? 0 : 1;
+            modelState.ValidationState = ModelValidationState.Invalid;
+            modelState.MarkNonContainerNode();
+            modelState.Errors.Add(errorMessage);
+
+            return true;
+        }
+
+        /// <summary>
+        /// Returns the aggregate <see cref="ModelValidationState"/> for items starting with the
+        /// specified <paramref name="key"/>.
+        /// </summary>
+        /// <param name="key">The key to look up model state errors for.</param>
+        /// <returns>Returns <see cref="ModelValidationState.Unvalidated"/> if no entries are found for the specified
+        /// key, <see cref="ModelValidationState.Invalid"/> if at least one instance is found with one or more model
+        /// state errors; <see cref="ModelValidationState.Valid"/> otherwise.</returns>
+        public ModelValidationState GetFieldValidationState(string key)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            var item = GetNode(key);
+            return GetValidity(item) ?? ModelValidationState.Unvalidated;
+        }
+
+        /// <summary>
+        /// Returns <see cref="ModelValidationState"/> for the <paramref name="key"/>.
+        /// </summary>
+        /// <param name="key">The key to look up model state errors for.</param>
+        /// <returns>Returns <see cref="ModelValidationState.Unvalidated"/> if no entry is found for the specified
+        /// key, <see cref="ModelValidationState.Invalid"/> if an instance is found with one or more model
+        /// state errors; <see cref="ModelValidationState.Valid"/> otherwise.</returns>
+        public ModelValidationState GetValidationState(string key)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            if (TryGetValue(key, out var validationState))
+            {
+                return validationState.ValidationState;
+            }
+
+            return ModelValidationState.Unvalidated;
+        }
+
+        /// <summary>
+        /// Marks the <see cref="ModelStateEntry.ValidationState"/> for the entry with the specified
+        /// <paramref name="key"/> as <see cref="ModelValidationState.Valid"/>.
+        /// </summary>
+        /// <param name="key">The key of the <see cref="ModelStateEntry"/> to mark as valid.</param>
+        public void MarkFieldValid(string key)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            var modelState = GetOrAddNode(key);
+            if (modelState.ValidationState == ModelValidationState.Invalid)
+            {
+                throw new InvalidOperationException(Resources.Validation_InvalidFieldCannotBeReset);
+            }
+
+            Count += !modelState.IsContainerNode ? 0 : 1;
+            modelState.MarkNonContainerNode();
+            modelState.ValidationState = ModelValidationState.Valid;
+        }
+
+        /// <summary>
+        /// Marks the <see cref="ModelStateEntry.ValidationState"/> for the entry with the specified <paramref name="key"/>
+        /// as <see cref="ModelValidationState.Skipped"/>.
+        /// </summary>
+        /// <param name="key">The key of the <see cref="ModelStateEntry"/> to mark as skipped.</param>
+        public void MarkFieldSkipped(string key)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            var modelState = GetOrAddNode(key);
+            if (modelState.ValidationState == ModelValidationState.Invalid)
+            {
+                throw new InvalidOperationException(Resources.Validation_InvalidFieldCannotBeReset_ToSkipped);
+            }
+
+            Count += !modelState.IsContainerNode ? 0 : 1;
+            modelState.MarkNonContainerNode();
+            modelState.ValidationState = ModelValidationState.Skipped;
+        }
+
+        /// <summary>
+        /// Copies the values from the specified <paramref name="dictionary"/> into this instance, overwriting
+        /// existing values if keys are the same.
+        /// </summary>
+        /// <param name="dictionary">The <see cref="ModelStateDictionary"/> to copy values from.</param>
+        public void Merge(ModelStateDictionary dictionary)
+        {
+            if (dictionary == null)
+            {
+                return;
+            }
+
+            foreach (var source in dictionary)
+            {
+                var target = GetOrAddNode(source.Key);
+                Count += !target.IsContainerNode ? 0 : 1;
+                ErrorCount += source.Value.Errors.Count - target.Errors.Count;
+                target.Copy(source.Value);
+                target.MarkNonContainerNode();
+            }
+        }
+
+        /// <summary>
+        /// Sets the of <see cref="ModelStateEntry.RawValue"/> and <see cref="ModelStateEntry.AttemptedValue"/> for
+        /// the <see cref="ModelStateEntry"/> with the specified <paramref name="key"/>.
+        /// </summary>
+        /// <param name="key">The key for the <see cref="ModelStateEntry"/> entry.</param>
+        /// <param name="rawValue">The raw value for the <see cref="ModelStateEntry"/> entry.</param>
+        /// <param name="attemptedValue">
+        /// The values of <paramref name="rawValue"/> in a comma-separated <see cref="string"/>.
+        /// </param>
+        public void SetModelValue(string key, object rawValue, string attemptedValue)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            var modelState = GetOrAddNode(key);
+            Count += !modelState.IsContainerNode ? 0 : 1;
+            modelState.RawValue = rawValue;
+            modelState.AttemptedValue = attemptedValue;
+            modelState.MarkNonContainerNode();
+        }
+
+        /// <summary>
+        /// Sets the value for the <see cref="ModelStateEntry"/> with the specified <paramref name="key"/>.
+        /// </summary>
+        /// <param name="key">The key for the <see cref="ModelStateEntry"/> entry</param>
+        /// <param name="valueProviderResult">
+        /// A <see cref="ValueProviderResult"/> with data for the <see cref="ModelStateEntry"/> entry.
+        /// </param>
+        public void SetModelValue(string key, ValueProviderResult valueProviderResult)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            // Avoid creating a new array for rawValue if there's only one value.
+            object rawValue;
+            if (valueProviderResult == ValueProviderResult.None)
+            {
+                rawValue = null;
+            }
+            else if (valueProviderResult.Length == 1)
+            {
+                rawValue = valueProviderResult.Values[0];
+            }
+            else
+            {
+                rawValue = valueProviderResult.Values.ToArray();
+            }
+
+            SetModelValue(key, rawValue, valueProviderResult.ToString());
+        }
+
+        /// <summary>
+        /// Clears <see cref="ModelStateDictionary"/> entries that match the key that is passed as parameter.
+        /// </summary>
+        /// <param name="key">The key of <see cref="ModelStateDictionary"/> to clear.</param>
+        public void ClearValidationState(string key)
+        {
+            // If key is null or empty, clear all entries in the dictionary
+            // else just clear the ones that have key as prefix
+            var entries = FindKeysWithPrefix(key ?? string.Empty);
+            foreach (var entry in entries)
+            {
+                entry.Value.Errors.Clear();
+                entry.Value.ValidationState = ModelValidationState.Unvalidated;
+            }
+        }
+
+        private ModelStateNode GetNode(string key)
+        {
+            Debug.Assert(key != null);
+
+            var current = _root;
+            if (key.Length > 0)
+            {
+                var match = default(MatchResult);
+                do
+                {
+                    var subKey = FindNext(key, ref match);
+                    current = current.GetNode(subKey);
+
+                    // Path not found, exit early
+                    if (current == null)
+                    {
+                        break;
+                    }
+
+                } while (match.Type != Delimiter.None);
+            }
+
+            return current;
+        }
+
+        private ModelStateNode GetOrAddNode(string key)
+        {
+            Debug.Assert(key != null);
+            // For a key of the format, foo.bar[0].baz[qux] we'll create the following nodes:
+            // foo
+            //  -> bar
+            //   -> [0]
+            //    -> baz
+            //     -> [qux]
+
+            var current = _root;
+            if (key.Length > 0)
+            {
+                var match = default(MatchResult);
+                do
+                {
+                    var subKey = FindNext(key, ref match);
+                    current = current.GetOrAddNode(subKey);
+
+                } while (match.Type != Delimiter.None);
+
+                if (current.Key == null)
+                {
+                    // New Node - Set key
+                    current.Key = key;
+                }
+            }
+
+            return current;
+        }
+
+        // Shared function factored out for clarity, force inlining to put back in
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static StringSegment FindNext(string key, ref MatchResult currentMatch)
+        {
+            var index = currentMatch.Index;
+            var matchType = Delimiter.None;
+
+            for (; index < key.Length; index++)
+            {
+                var ch = key[index];
+                if (ch == DelimiterDot)
+                {
+                    matchType = Delimiter.Dot;
+                    break;
+                }
+                else if (ch == DelimiterOpen)
+                {
+                    matchType = Delimiter.OpenBracket;
+                    break;
+                }
+            }
+
+            var keyStart = currentMatch.Type == Delimiter.OpenBracket
+                ? currentMatch.Index - 1
+                : currentMatch.Index;
+
+            currentMatch.Type = matchType;
+            currentMatch.Index = index + 1;
+
+            return new StringSegment(key, keyStart, index - keyStart);
+        }
+
+        private static ModelValidationState? GetValidity(ModelStateNode node)
+        {
+            if (node == null)
+            {
+                return null;
+            }
+
+            ModelValidationState? validationState = null;
+            if (!node.IsContainerNode)
+            {
+                validationState = ModelValidationState.Valid;
+                if (node.ValidationState == ModelValidationState.Unvalidated)
+                {
+                    // If any entries of a field is unvalidated, we'll treat the tree as unvalidated.
+                    return ModelValidationState.Unvalidated;
+                }
+
+                if (node.ValidationState == ModelValidationState.Invalid)
+                {
+                    validationState = node.ValidationState;
+                }
+            }
+
+            if (node.ChildNodes != null)
+            {
+                for (var i = 0; i < node.ChildNodes.Count; i++)
+                {
+                    var entryState = GetValidity(node.ChildNodes[i]);
+
+                    if (entryState == ModelValidationState.Unvalidated)
+                    {
+                        return entryState;
+                    }
+
+                    if (validationState == null || entryState == ModelValidationState.Invalid)
+                    {
+                        validationState = entryState;
+                    }
+                }
+            }
+
+            return validationState;
+        }
+
+        private void EnsureMaxErrorsReachedRecorded()
+        {
+            if (!HasRecordedMaxModelError)
+            {
+                var exception = new TooManyModelErrorsException(Resources.ModelStateDictionary_MaxModelStateErrors);
+                AddModelErrorCore(string.Empty, exception);
+                HasRecordedMaxModelError = true;
+                ErrorCount++;
+            }
+        }
+
+        private void AddModelErrorCore(string key, Exception exception)
+        {
+            var modelState = GetOrAddNode(key);
+            Count += !modelState.IsContainerNode ? 0 : 1;
+            modelState.ValidationState = ModelValidationState.Invalid;
+            modelState.MarkNonContainerNode();
+            modelState.Errors.Add(exception);
+        }
+
+        /// <summary>
+        /// Removes all keys and values from this instance of <see cref="ModelStateDictionary"/>.
+        /// </summary>
+        public void Clear()
+        {
+            Count = 0;
+            HasRecordedMaxModelError = false;
+            ErrorCount = 0;
+            _root.Reset();
+            _root.ChildNodes?.Clear();
+        }
+
+        /// <inheritdoc />
+        public bool ContainsKey(string key)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            return !GetNode(key)?.IsContainerNode ?? false;
+        }
+
+        /// <summary>
+        /// Removes the <see cref="ModelStateEntry"/> with the specified <paramref name="key"/>.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <returns><c>true</c> if the element is successfully removed; otherwise <c>false</c>. This method also
+        /// returns <c>false</c> if key was not found.</returns>
+        public bool Remove(string key)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            var node = GetNode(key);
+            if (node?.IsContainerNode == false)
+            {
+                Count--;
+                ErrorCount -= node.Errors.Count;
+                node.Reset();
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <inheritdoc />
+        public bool TryGetValue(string key, out ModelStateEntry value)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            var result = GetNode(key);
+            if (result?.IsContainerNode == false)
+            {
+                value = result;
+                return true;
+            }
+
+            value = null;
+            return false;
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through this instance of <see cref="ModelStateDictionary"/>.
+        /// </summary>
+        /// <returns>An <see cref="Enumerator"/>.</returns>
+        public Enumerator GetEnumerator() => new Enumerator(this, prefix: string.Empty);
+
+        /// <inheritdoc />
+        IEnumerator<KeyValuePair<string, ModelStateEntry>>
+            IEnumerable<KeyValuePair<string, ModelStateEntry>>.GetEnumerator() => GetEnumerator();
+
+        /// <inheritdoc />
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+        public static bool StartsWithPrefix(string prefix, string key)
+        {
+            if (prefix == null)
+            {
+                throw new ArgumentNullException(nameof(prefix));
+            }
+
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            if (prefix.Length == 0)
+            {
+                // Everything is prefixed by the empty string.
+                return true;
+            }
+
+            if (prefix.Length > key.Length)
+            {
+                return false; // Not long enough.
+            }
+
+            if (!key.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+
+            if (key.Length == prefix.Length)
+            {
+                // Exact match
+                return true;
+            }
+
+            var charAfterPrefix = key[prefix.Length];
+            if (charAfterPrefix == '.' || charAfterPrefix == '[')
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        public PrefixEnumerable FindKeysWithPrefix(string prefix)
+        {
+            if (prefix == null)
+            {
+                throw new ArgumentNullException(nameof(prefix));
+            }
+
+            return new PrefixEnumerable(this, prefix);
+        }
+
+        private struct MatchResult
+        {
+            public Delimiter Type;
+            public int Index;
+        }
+
+        private enum Delimiter
+        {
+            None = 0,
+            Dot,
+            OpenBracket
+        }
+
+        [DebuggerDisplay("SubKey={SubKey}, Key={Key}, ValidationState={ValidationState}")]
+        private class ModelStateNode : ModelStateEntry
+        {
+            private bool _isContainerNode = true;
+
+            public ModelStateNode(StringSegment subKey)
+            {
+                SubKey = subKey;
+            }
+
+            public List<ModelStateNode> ChildNodes { get; set; }
+
+            public override IReadOnlyList<ModelStateEntry> Children => ChildNodes;
+
+            public string Key { get; set; }
+
+            public StringSegment SubKey { get; }
+
+            public override bool IsContainerNode => _isContainerNode;
+
+            public void MarkNonContainerNode()
+            {
+                _isContainerNode = false;
+            }
+
+            public void Copy(ModelStateEntry entry)
+            {
+                RawValue = entry.RawValue;
+                AttemptedValue = entry.AttemptedValue;
+                Errors.Clear();
+                for (var i = 0; i < entry.Errors.Count; i++)
+                {
+                    Errors.Add(entry.Errors[i]);
+                }
+
+                ValidationState = entry.ValidationState;
+            }
+
+            public void Reset()
+            {
+                _isContainerNode = true;
+                RawValue = null;
+                AttemptedValue = null;
+                ValidationState = ModelValidationState.Unvalidated;
+                Errors.Clear();
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public ModelStateNode GetNode(StringSegment subKey)
+            {
+                ModelStateNode modelStateNode = null;
+                if (subKey.Length == 0)
+                {
+                    modelStateNode = this;
+                }
+                else if (ChildNodes != null)
+                {
+                    var index = BinarySearch(subKey);
+                    if (index >= 0)
+                    {
+                        modelStateNode = ChildNodes[index];
+                    }
+                }
+
+                return modelStateNode;
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public ModelStateNode GetOrAddNode(StringSegment subKey)
+            {
+                ModelStateNode modelStateNode;
+                if (subKey.Length == 0)
+                {
+                    modelStateNode = this;
+                }
+                else if (ChildNodes == null)
+                {
+                    ChildNodes = new List<ModelStateNode>(1);
+                    modelStateNode = new ModelStateNode(subKey);
+                    ChildNodes.Add(modelStateNode);
+                }
+                else
+                {
+                    var index = BinarySearch(subKey);
+                    if (index >= 0)
+                    {
+                        modelStateNode = ChildNodes[index];
+                    }
+                    else
+                    {
+                        modelStateNode = new ModelStateNode(subKey);
+                        ChildNodes.Insert(~index, modelStateNode);
+                    }
+                }
+
+                return modelStateNode;
+            }
+
+            public override ModelStateEntry GetModelStateForProperty(string propertyName)
+                => GetNode(new StringSegment(propertyName));
+
+            private int BinarySearch(StringSegment searchKey)
+            {
+                Debug.Assert(ChildNodes != null);
+
+                var low = 0;
+                var high = ChildNodes.Count - 1;
+                while (low <= high)
+                {
+                    var mid = low + ((high - low) / 2);
+                    var midKey = ChildNodes[mid].SubKey;
+                    var result = midKey.Length - searchKey.Length;
+                    if (result == 0)
+                    {
+                        result = string.Compare(
+                            midKey.Buffer,
+                            midKey.Offset,
+                            searchKey.Buffer,
+                            searchKey.Offset,
+                            searchKey.Length,
+                            StringComparison.OrdinalIgnoreCase);
+                    }
+
+                    if (result == 0)
+                    {
+                        return mid;
+                    }
+                    if (result < 0)
+                    {
+                        low = mid + 1;
+                    }
+                    else
+                    {
+                        high = mid - 1;
+                    }
+                }
+
+                return ~low;
+            }
+        }
+
+        public struct PrefixEnumerable : IEnumerable<KeyValuePair<string, ModelStateEntry>>
+        {
+            private readonly ModelStateDictionary _dictionary;
+            private readonly string _prefix;
+
+            public PrefixEnumerable(ModelStateDictionary dictionary, string prefix)
+            {
+                if (dictionary == null)
+                {
+                    throw new ArgumentNullException(nameof(dictionary));
+                }
+
+                if (prefix == null)
+                {
+                    throw new ArgumentNullException(nameof(prefix));
+                }
+
+                _dictionary = dictionary;
+                _prefix = prefix;
+            }
+
+            public Enumerator GetEnumerator() => new Enumerator(_dictionary, _prefix);
+
+            IEnumerator<KeyValuePair<string, ModelStateEntry>>
+                IEnumerable<KeyValuePair<string, ModelStateEntry>>.GetEnumerator() => GetEnumerator();
+
+            IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+        }
+
+        public struct Enumerator : IEnumerator<KeyValuePair<string, ModelStateEntry>>
+        {
+            private readonly ModelStateNode _rootNode;
+            private ModelStateNode _modelStateNode;
+            private List<ModelStateNode> _nodes;
+            private int _index;
+            private bool _visitedRoot;
+
+            public Enumerator(ModelStateDictionary dictionary, string prefix)
+            {
+                if (dictionary == null)
+                {
+                    throw new ArgumentNullException(nameof(dictionary));
+                }
+
+                if (prefix == null)
+                {
+                    throw new ArgumentNullException(nameof(prefix));
+                }
+
+                _index = -1;
+                _rootNode = dictionary.GetNode(prefix);
+                _modelStateNode = null;
+                _nodes = null;
+                _visitedRoot = false;
+            }
+
+            public KeyValuePair<string, ModelStateEntry> Current =>
+                new KeyValuePair<string, ModelStateEntry>(_modelStateNode.Key, _modelStateNode);
+
+            object IEnumerator.Current => Current;
+
+            public void Dispose()
+            {
+            }
+
+            public bool MoveNext()
+            {
+                if (_rootNode == null)
+                {
+                    return false;
+                }
+
+                if (!_visitedRoot)
+                {
+                    // Visit the root node
+                    _visitedRoot = true;
+                    if (_rootNode.ChildNodes?.Count > 0)
+                    {
+                        _nodes = new List<ModelStateNode> { _rootNode };
+                    }
+
+                    if (!_rootNode.IsContainerNode)
+                    {
+                        _modelStateNode = _rootNode;
+                        return true;
+                    }
+                }
+
+                if (_nodes == null)
+                {
+                    return false;
+                }
+
+                while (_nodes.Count > 0)
+                {
+                    var node = _nodes[0];
+                    if (_index == node.ChildNodes.Count - 1)
+                    {
+                        // We've exhausted the current sublist.
+                        _nodes.RemoveAt(0);
+                        _index = -1;
+                        continue;
+                    }
+                    else
+                    {
+                        _index++;
+                    }
+
+                    var currentChild = node.ChildNodes[_index];
+                    if (currentChild.ChildNodes?.Count > 0)
+                    {
+                        _nodes.Add(currentChild);
+                    }
+
+                    if (!currentChild.IsContainerNode)
+                    {
+                        _modelStateNode = currentChild;
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+
+            public void Reset()
+            {
+                _index = -1;
+                _nodes.Clear();
+                _visitedRoot = false;
+                _modelStateNode = null;
+            }
+        }
+
+        public struct KeyEnumerable : IEnumerable<string>
+        {
+            private readonly ModelStateDictionary _dictionary;
+
+            public KeyEnumerable(ModelStateDictionary dictionary)
+            {
+                _dictionary = dictionary;
+            }
+
+            public KeyEnumerator GetEnumerator() => new KeyEnumerator(_dictionary, prefix: string.Empty);
+
+            IEnumerator<string> IEnumerable<string>.GetEnumerator() => GetEnumerator();
+
+            IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+        }
+
+        public struct KeyEnumerator : IEnumerator<string>
+        {
+            private Enumerator _prefixEnumerator;
+
+            public KeyEnumerator(ModelStateDictionary dictionary, string prefix)
+            {
+                _prefixEnumerator = new Enumerator(dictionary, prefix);
+                Current = null;
+            }
+
+            public string Current { get; private set; }
+
+            object IEnumerator.Current => Current;
+
+            public void Dispose() => _prefixEnumerator.Dispose();
+
+            public bool MoveNext()
+            {
+                var result = _prefixEnumerator.MoveNext();
+                if (result)
+                {
+                    var current = _prefixEnumerator.Current;
+                    Current = current.Key;
+                }
+                else
+                {
+                    Current = null;
+                }
+
+                return result;
+            }
+
+            public void Reset()
+            {
+                _prefixEnumerator.Reset();
+                Current = null;
+            }
+        }
+
+        public struct ValueEnumerable : IEnumerable<ModelStateEntry>
+        {
+            private readonly ModelStateDictionary _dictionary;
+
+            public ValueEnumerable(ModelStateDictionary dictionary)
+            {
+                _dictionary = dictionary;
+            }
+
+            public ValueEnumerator GetEnumerator() => new ValueEnumerator(_dictionary, prefix: string.Empty);
+
+            IEnumerator<ModelStateEntry> IEnumerable<ModelStateEntry>.GetEnumerator() => GetEnumerator();
+
+            IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+        }
+
+        public struct ValueEnumerator : IEnumerator<ModelStateEntry>
+        {
+            private Enumerator _prefixEnumerator;
+
+            public ValueEnumerator(ModelStateDictionary dictionary, string prefix)
+            {
+                _prefixEnumerator = new Enumerator(dictionary, prefix);
+                Current = null;
+            }
+
+            public ModelStateEntry Current { get; private set; }
+
+            object IEnumerator.Current => Current;
+
+            public void Dispose() => _prefixEnumerator.Dispose();
+
+            public bool MoveNext()
+            {
+                var result = _prefixEnumerator.MoveNext();
+                if (result)
+                {
+                    var current = _prefixEnumerator.Current;
+                    Current = current.Value;
+                }
+                else
+                {
+                    Current = null;
+                }
+
+                return result;
+            }
+
+            public void Reset()
+            {
+                _prefixEnumerator.Reset();
+                Current = null;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelStateEntry.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelStateEntry.cs
new file mode 100644
index 0000000000..b73eab4f77
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelStateEntry.cs
@@ -0,0 +1,75 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// An entry in a <see cref="ModelStateDictionary"/>.
+    /// </summary>
+    public abstract class ModelStateEntry
+    {
+        private ModelErrorCollection _errors;
+
+        /// <summary>
+        /// Gets the raw value from the request associated with this entry.
+        /// </summary>
+        public object RawValue { get; set; }
+
+        /// <summary>
+        /// Gets the set of values contained in <see cref="RawValue"/>, joined into a comma-separated string.
+        /// </summary>
+        public string AttemptedValue { get; set; }
+
+        /// <summary>
+        /// Gets the <see cref="ModelErrorCollection"/> for this entry.
+        /// </summary>
+        public ModelErrorCollection Errors
+        {
+            get
+            {
+                if (_errors == null)
+                {
+                    _errors = new ModelErrorCollection();
+                }
+                return _errors;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ModelValidationState"/> for this entry.
+        /// </summary>
+        public ModelValidationState ValidationState { get; set; }
+
+        /// <summary>
+        /// Gets a value that determines if the current instance of <see cref="ModelStateEntry"/> is a container node.
+        /// Container nodes represent prefix nodes that aren't explicitly added to the
+        /// <see cref="ModelStateDictionary"/>.
+        /// </summary>
+        public abstract bool IsContainerNode { get; }
+
+        /// <summary>
+        /// Gets the <see cref="ModelStateEntry"/> for a sub-property with the specified
+        /// <paramref name="propertyName"/>.
+        /// </summary>
+        /// <param name="propertyName">The property name to lookup.</param>
+        /// <returns>
+        /// The <see cref="ModelStateEntry"/> if a sub-property was found; otherwise <see langword="null"/>.
+        /// </returns>
+        /// <remarks>
+        /// This method returns any existing entry, even those with <see cref="IsContainerNode"/> with value
+        /// <see langword="true"/>.
+        /// </remarks>
+        public abstract ModelStateEntry GetModelStateForProperty(string propertyName);
+
+        /// <summary>
+        /// Gets the <see cref="ModelStateEntry"/> values for sub-properties.
+        /// </summary>
+        /// <remarks>
+        /// This property returns all existing entries, even those with <see cref="IsContainerNode"/> with value
+        /// <see langword="true"/>.
+        /// </remarks>
+        public abstract IReadOnlyList<ModelStateEntry> Children { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelValidationState.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelValidationState.cs
new file mode 100644
index 0000000000..05cc0ee317
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelValidationState.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public enum ModelValidationState
+    {
+        Unvalidated,
+        Invalid,
+        Valid,
+        Skipped
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/TooManyModelErrorsException.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/TooManyModelErrorsException.cs
new file mode 100644
index 0000000000..58f3cdbe42
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/TooManyModelErrorsException.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// The <see cref="Exception"/> that is thrown when too many model errors are encountered.
+    /// </summary>
+    public class TooManyModelErrorsException : Exception
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="TooManyModelErrorsException"/> with the specified
+        /// exception <paramref name="message"/>.
+        /// </summary>
+        /// <param name="message">The message that describes the error.</param>
+        public TooManyModelErrorsException(string message)
+            : base(message)
+        {
+            if (message == null)
+            {
+                throw new ArgumentNullException(nameof(message));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientModelValidationContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientModelValidationContext.cs
new file mode 100644
index 0000000000..7d04881119
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientModelValidationContext.cs
@@ -0,0 +1,35 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    /// <summary>
+    /// The context for client-side model validation.
+    /// </summary>
+    public class ClientModelValidationContext : ModelValidationContextBase
+    {
+        /// <summary>
+        /// Create a new instance of <see cref="ClientModelValidationContext"/>.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/> for validation.</param>
+        /// <param name="metadata">The <see cref="ModelMetadata"/> for validation.</param>
+        /// <param name="metadataProvider">The <see cref="IModelMetadataProvider"/> to be used in validation.</param>
+        /// <param name="attributes">The attributes dictionary for the HTML tag being rendered.</param>
+        public ClientModelValidationContext(
+            ActionContext actionContext,
+            ModelMetadata metadata,
+            IModelMetadataProvider metadataProvider,
+            IDictionary<string, string> attributes)
+            : base(actionContext, metadata, metadataProvider)
+        {
+            Attributes = attributes;
+        }
+
+        /// <summary>
+        /// Gets the attributes dictionary for the HTML tag being rendered.
+        /// </summary>
+        public IDictionary<string, string> Attributes { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientValidatorItem.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientValidatorItem.cs
new file mode 100644
index 0000000000..e346509701
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientValidatorItem.cs
@@ -0,0 +1,45 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    /// <summary>
+    /// Used to associate validators with <see cref="ValidatorMetadata"/> instances
+    /// as part of <see cref="ClientValidatorProviderContext"/>. An <see cref="IClientModelValidator"/> should
+    /// inspect <see cref="ClientValidatorProviderContext.Results"/> and set <see cref="Validator"/> and
+    /// <see cref="IsReusable"/> as appropriate.
+    /// </summary>
+    public class ClientValidatorItem
+    {
+        /// <summary>
+        /// Creates a new <see cref="ClientValidatorItem"/>.
+        /// </summary>
+        public ClientValidatorItem()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="ClientValidatorItem"/>.
+        /// </summary>
+        /// <param name="validatorMetadata">The <see cref="ValidatorMetadata"/>.</param>
+        public ClientValidatorItem(object validatorMetadata)
+        {
+            ValidatorMetadata = validatorMetadata;
+        }
+
+        /// <summary>
+        /// Gets the metadata associated with the <see cref="Validator"/>.
+        /// </summary>
+        public object ValidatorMetadata { get; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IClientModelValidator"/>.
+        /// </summary>
+        public IClientModelValidator Validator { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether or not <see cref="Validator"/> can be reused across requests.
+        /// </summary>
+        public bool IsReusable { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientValidatorProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientValidatorProviderContext.cs
new file mode 100644
index 0000000000..84b02119b3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientValidatorProviderContext.cs
@@ -0,0 +1,46 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    /// <summary>
+    /// A context for <see cref="IClientModelValidatorProvider"/>.
+    /// </summary>
+    public class ClientValidatorProviderContext
+    {
+        /// <summary>
+        /// Creates a new <see cref="ClientValidatorProviderContext"/>.
+        /// </summary>
+        /// <param name="modelMetadata">The <see cref="ModelBinding.ModelMetadata"/> for the model being validated.
+        /// </param>
+        /// <param name="items">The list of <see cref="ClientValidatorItem"/>s.</param>
+        public ClientValidatorProviderContext(ModelMetadata modelMetadata, IList<ClientValidatorItem> items)
+        {
+            ModelMetadata = modelMetadata;
+            Results = items;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        public ModelMetadata ModelMetadata { get; }
+
+        /// <summary>
+        /// Gets the validator metadata.
+        /// </summary>
+        /// <remarks>
+        /// This property provides convenience access to <see cref="ModelMetadata.ValidatorMetadata"/>.
+        /// </remarks>
+        public IReadOnlyList<object> ValidatorMetadata => ModelMetadata.ValidatorMetadata;
+
+        /// <summary>
+        /// Gets the list of <see cref="ClientValidatorItem"/> instances. <see cref="IClientModelValidatorProvider"/>
+        /// instances should add the appropriate <see cref="ClientValidatorItem.Validator"/> properties when
+        /// <see cref="IClientModelValidatorProvider.CreateValidators(ClientValidatorProviderContext)"/>
+        /// is called.
+        /// </summary>
+        public IList<ClientValidatorItem> Results { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IClientModelValidator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IClientModelValidator.cs
new file mode 100644
index 0000000000..6a46cec649
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IClientModelValidator.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    public interface IClientModelValidator
+    {
+        void AddValidation(ClientModelValidationContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IClientModelValidatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IClientModelValidatorProvider.cs
new file mode 100644
index 0000000000..adf01cf8f8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IClientModelValidatorProvider.cs
@@ -0,0 +1,18 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    /// <summary>
+    /// Provides a collection of <see cref="IClientModelValidator"/>s.
+    /// </summary>
+    public interface IClientModelValidatorProvider
+    {
+        /// <summary>
+        /// Creates set of <see cref="IClientModelValidator"/>s by updating
+        /// <see cref="ClientValidatorItem.Validator"/> in <see cref="ClientValidatorProviderContext.Results"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ClientModelValidationContext"/> associated with this call.</param>
+        void CreateValidators(ClientValidatorProviderContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IModelValidator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IModelValidator.cs
new file mode 100644
index 0000000000..f2f0ae34ef
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IModelValidator.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    /// <summary>
+    /// Validates a model value.
+    /// </summary>
+    public interface IModelValidator
+    {
+        /// <summary>
+        /// Validates the model value.
+        /// </summary>
+        /// <param name="context">The <see cref="ModelValidationContext"/>.</param>
+        /// <returns>
+        /// A list of <see cref="ModelValidationResult"/> indicating the results of validating the model value.
+        /// </returns>
+        IEnumerable<ModelValidationResult> Validate(ModelValidationContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IModelValidatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IModelValidatorProvider.cs
new file mode 100644
index 0000000000..9ed1704ca9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IModelValidatorProvider.cs
@@ -0,0 +1,22 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    /// <summary>
+    /// Provides validators for a model value.
+    /// </summary>
+    public interface IModelValidatorProvider
+    {
+        /// <summary>
+        /// Creates the validators for <see cref="ModelValidatorProviderContext.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ModelValidatorProviderContext"/>.</param>
+        /// <remarks>
+        /// Implementations should add the <see cref="IModelValidator"/> instances to the appropriate
+        /// <see cref="ValidatorItem"/> instance which should be added to
+        /// <see cref="ModelValidatorProviderContext.Results"/>.
+        /// </remarks>
+        void CreateValidators(ModelValidatorProviderContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IPropertyValidationFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IPropertyValidationFilter.cs
new file mode 100644
index 0000000000..622b41f70c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IPropertyValidationFilter.cs
@@ -0,0 +1,22 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    /// <summary>
+    /// Contract for attributes that determine whether associated properties should be validated. When the attribute is
+    /// applied to a property, the validation system calls <see cref="ShouldValidateEntry"/> to determine whether to
+    /// validate that property. When applied to a type, the validation system calls <see cref="ShouldValidateEntry"/>
+    /// for each property that type defines to determine whether to validate it.
+    /// </summary>
+    public interface IPropertyValidationFilter
+    {
+        /// <summary>
+        /// Gets an indication whether the <paramref name="entry"/> should be validated.
+        /// </summary>
+        /// <param name="entry"><see cref="ValidationEntry"/> to check.</param>
+        /// <param name="parentEntry"><see cref="ValidationEntry"/> containing <paramref name="entry"/>.</param>
+        /// <returns><c>true</c> if <paramref name="entry"/> should be validated; <c>false</c> otherwise.</returns>
+        bool ShouldValidateEntry(ValidationEntry entry, ValidationEntry parentEntry);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IValidationStrategy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IValidationStrategy.cs
new file mode 100644
index 0000000000..4419957230
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IValidationStrategy.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    /// <summary>
+    /// Defines a strategy for enumerating the child entries of a model object which should be validated.
+    /// </summary>
+    public interface IValidationStrategy
+    {
+        /// <summary>
+        /// Gets an <see cref="IEnumerator{ValidationEntry}"/> containing a <see cref="ValidationEntry"/> for
+        /// each child entry of the model object to be validated.
+        /// </summary>
+        /// <param name="metadata">The <see cref="ModelMetadata"/> associated with <paramref name="model"/>.</param>
+        /// <param name="key">The model prefix associated with <paramref name="model"/>.</param>
+        /// <param name="model">The model object.</param>
+        /// <returns>An <see cref="IEnumerator{ValidationEntry}"/>.</returns>
+        IEnumerator<ValidationEntry> GetChildren(ModelMetadata metadata, string key, object model);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationContext.cs
new file mode 100644
index 0000000000..78f48f32fb
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationContext.cs
@@ -0,0 +1,41 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    /// <summary>
+    /// A context object for <see cref="IModelValidator"/>.
+    /// </summary>
+    public class ModelValidationContext : ModelValidationContextBase
+    {
+        /// <summary>
+        /// Create a new instance of <see cref="ModelValidationContext"/>.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/> for validation.</param>
+        /// <param name="modelMetadata">The <see cref="ModelMetadata"/> for validation.</param>
+        /// <param name="metadataProvider">The <see cref="IModelMetadataProvider"/> to be used in validation.</param>
+        /// <param name="container">The model container.</param>
+        /// <param name="model">The model to be validated.</param>
+        public ModelValidationContext(
+            ActionContext actionContext,
+            ModelMetadata modelMetadata,
+            IModelMetadataProvider metadataProvider,
+            object container,
+            object model)
+            : base(actionContext, modelMetadata, metadataProvider)
+        {
+            Container = container;
+            Model = model;
+        }
+
+        /// <summary>
+        /// Gets the model object.
+        /// </summary>
+        public object Model { get; }
+
+        /// <summary>
+        /// Gets the model container object.
+        /// </summary>
+        public object Container { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationContextBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationContextBase.cs
new file mode 100644
index 0000000000..ea341ef62e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationContextBase.cs
@@ -0,0 +1,59 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    /// <summary>
+    /// A common base class for <see cref="ModelValidationContext"/> and <see cref="ClientModelValidationContext"/>.
+    /// </summary>
+    public class ModelValidationContextBase
+    {
+        /// <summary>
+        /// Instantiates a new <see cref="ModelValidationContextBase"/>.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/> for this context.</param>
+        /// <param name="modelMetadata">The <see cref="ModelMetadata"/> for this model.</param>
+        /// <param name="metadataProvider">The <see cref="IModelMetadataProvider"/> to be used by this context.</param>
+        public ModelValidationContextBase(
+            ActionContext actionContext,
+            ModelMetadata modelMetadata,
+            IModelMetadataProvider metadataProvider)
+        {
+            if (actionContext == null)
+            {
+                throw new ArgumentNullException(nameof(actionContext));
+            }
+
+            if (modelMetadata == null)
+            {
+                throw new ArgumentNullException(nameof(modelMetadata));
+            }
+
+            if (metadataProvider == null)
+            {
+                throw new ArgumentNullException(nameof(metadataProvider));
+            }
+
+            ActionContext = actionContext;
+            ModelMetadata = modelMetadata;
+            MetadataProvider = metadataProvider;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Mvc.ActionContext"/>.
+        /// </summary>
+        public ActionContext ActionContext { get; }
+
+        /// <summary>
+        /// Gets the <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        public ModelMetadata ModelMetadata { get; }
+
+        /// <summary>
+        /// Gets the <see cref="IModelMetadataProvider"/>.
+        /// </summary>
+        public IModelMetadataProvider MetadataProvider { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationResult.cs
new file mode 100644
index 0000000000..0d00621ed0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationResult.cs
@@ -0,0 +1,18 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    public class ModelValidationResult
+    {
+        public ModelValidationResult(string memberName, string message)
+        {
+            MemberName = memberName ?? string.Empty;
+            Message = message ?? string.Empty;
+        }
+
+        public string MemberName { get; }
+
+        public string Message { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidatorProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidatorProviderContext.cs
new file mode 100644
index 0000000000..8076c82da4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidatorProviderContext.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    /// <summary>
+    /// A context for <see cref="IModelValidatorProvider"/>.
+    /// </summary>
+    public class ModelValidatorProviderContext
+    {
+        /// <summary>
+        /// Creates a new <see cref="ModelValidatorProviderContext"/>.
+        /// </summary>
+        /// <param name="modelMetadata">The <see cref="ModelBinding.ModelMetadata"/>.</param>
+        /// <param name="items">The list of <see cref="ValidatorItem"/>s.</param>
+        public ModelValidatorProviderContext(ModelMetadata modelMetadata, IList<ValidatorItem> items)
+        {
+            ModelMetadata = modelMetadata;
+            Results = items;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        public ModelMetadata ModelMetadata { get; set; }
+
+        /// <summary>
+        /// Gets the validator metadata.
+        /// </summary>
+        /// <remarks>
+        /// This property provides convenience access to <see cref="ModelMetadata.ValidatorMetadata"/>.
+        /// </remarks>
+        public IReadOnlyList<object> ValidatorMetadata => ModelMetadata.ValidatorMetadata;
+
+        /// <summary>
+        /// Gets the list of <see cref="ValidatorItem"/> instances. <see cref="IModelValidatorProvider"/> instances
+        /// should add the appropriate <see cref="ValidatorItem.Validator"/> properties when
+        /// <see cref="IModelValidatorProvider.CreateValidators(ModelValidatorProviderContext)"/>
+        /// is called.
+        /// </summary>
+        public IList<ValidatorItem> Results { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationEntry.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationEntry.cs
new file mode 100644
index 0000000000..a873273ca7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationEntry.cs
@@ -0,0 +1,96 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    /// <summary>
+    /// Contains data needed for validating a child entry of a model object. See <see cref="IValidationStrategy"/>.
+    /// </summary>
+    public struct ValidationEntry
+    {
+        private object _model;
+        private Func<object> _modelAccessor;
+
+        /// <summary>
+        /// Creates a new <see cref="ValidationEntry"/>.
+        /// </summary>
+        /// <param name="metadata">The <see cref="ModelMetadata"/> associated with <paramref name="model"/>.</param>
+        /// <param name="key">The model prefix associated with <paramref name="model"/>.</param>
+        /// <param name="model">The model object.</param>
+        public ValidationEntry(ModelMetadata metadata, string key, object model)
+        {
+            if (metadata == null)
+            {
+                throw new ArgumentNullException(nameof(metadata));
+            }
+
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            Metadata = metadata;
+            Key = key;
+            _model = model;
+            _modelAccessor = null;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="ValidationEntry"/>.
+        /// </summary>
+        /// <param name="metadata">The <see cref="ModelMetadata"/> associated with the <see cref="Model"/>.</param>
+        /// <param name="key">The model prefix associated with the <see cref="Model"/>.</param>
+        /// <param name="modelAccessor">A delegate that will return the <see cref="Model"/>.</param>
+        public ValidationEntry(ModelMetadata metadata, string key, Func<object> modelAccessor)
+        {
+            if (metadata == null)
+            {
+                throw new ArgumentNullException(nameof(metadata));
+            }
+
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            if (modelAccessor == null)
+            {
+                throw new ArgumentNullException(nameof(modelAccessor));
+            }
+
+            Metadata = metadata;
+            Key = key;
+            _model = null;
+            _modelAccessor = modelAccessor;
+        }
+
+        /// <summary>
+        /// The model prefix associated with <see cref="Model"/>.
+        /// </summary>
+        public string Key { get; }
+
+        /// <summary>
+        /// The <see cref="ModelMetadata"/> associated with <see cref="Model"/>.
+        /// </summary>
+        public ModelMetadata Metadata { get; }
+
+        /// <summary>
+        /// The model object.
+        /// </summary>
+        public object Model
+        {
+            get
+            {
+                if (_modelAccessor != null)
+                {
+                    _model = _modelAccessor();
+                    _modelAccessor = null;
+                }
+
+                return _model;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationStateDictionary.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationStateDictionary.cs
new file mode 100644
index 0000000000..11179b014d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationStateDictionary.cs
@@ -0,0 +1,154 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    /// <summary>
+    /// Used for tracking validation state to customize validation behavior for a model object.
+    /// </summary>
+    public class ValidationStateDictionary :
+        IDictionary<object, ValidationStateEntry>,
+        IReadOnlyDictionary<object, ValidationStateEntry>
+    {
+        private readonly Dictionary<object, ValidationStateEntry> _inner;
+
+        /// <summary>
+        /// Creates a new <see cref="ValidationStateDictionary"/>.
+        /// </summary>
+        public ValidationStateDictionary()
+        {
+            _inner = new Dictionary<object, ValidationStateEntry>(ReferenceEqualityComparer.Instance);
+        }
+
+        /// <inheritdoc />
+        public ValidationStateEntry this[object key]
+        {
+            get
+            {
+                TryGetValue(key, out var entry);
+                return entry;
+            }
+
+            set
+            {
+                _inner[key] = value;
+            }
+        }
+
+        /// <inheritdoc />
+        public int Count => _inner.Count;
+
+        /// <inheritdoc />
+        public bool IsReadOnly => ((IDictionary<object, ValidationStateEntry>)_inner).IsReadOnly;
+
+        /// <inheritdoc />
+        public ICollection<object> Keys => ((IDictionary<object, ValidationStateEntry>)_inner).Keys;
+
+        /// <inheritdoc />
+        public ICollection<ValidationStateEntry> Values => ((IDictionary<object, ValidationStateEntry>)_inner).Values;
+
+        /// <inheritdoc />
+        IEnumerable<object> IReadOnlyDictionary<object, ValidationStateEntry>.Keys =>
+            ((IReadOnlyDictionary<object, ValidationStateEntry>)_inner).Keys;
+
+        /// <inheritdoc />
+        IEnumerable<ValidationStateEntry> IReadOnlyDictionary<object, ValidationStateEntry>.Values =>
+            ((IReadOnlyDictionary<object, ValidationStateEntry>)_inner).Values;
+
+        /// <inheritdoc />
+        public void Add(KeyValuePair<object, ValidationStateEntry> item)
+        {
+            ((IDictionary<object, ValidationStateEntry>)_inner).Add(item);
+        }
+
+        /// <inheritdoc />
+        public void Add(object key, ValidationStateEntry value)
+        {
+            _inner.Add(key, value);
+        }
+
+        /// <inheritdoc />
+        public void Clear()
+        {
+            _inner.Clear();
+        }
+
+        /// <inheritdoc />
+        public bool Contains(KeyValuePair<object, ValidationStateEntry> item)
+        {
+            return ((IDictionary<object, ValidationStateEntry>)_inner).Contains(item);
+        }
+
+        /// <inheritdoc />
+        public bool ContainsKey(object key)
+        {
+            return _inner.ContainsKey(key);
+        }
+
+        /// <inheritdoc />
+        public void CopyTo(KeyValuePair<object, ValidationStateEntry>[] array, int arrayIndex)
+        {
+            ((IDictionary<object, ValidationStateEntry>)_inner).CopyTo(array, arrayIndex);
+        }
+
+        /// <inheritdoc />
+        public IEnumerator<KeyValuePair<object, ValidationStateEntry>> GetEnumerator()
+        {
+            return ((IDictionary<object, ValidationStateEntry>)_inner).GetEnumerator();
+        }
+
+        /// <inheritdoc />
+        public bool Remove(KeyValuePair<object, ValidationStateEntry> item)
+        {
+            return _inner.Remove(item);
+        }
+
+        /// <inheritdoc />
+        public bool Remove(object key)
+        {
+            return _inner.Remove(key);
+        }
+
+        /// <inheritdoc />
+        public bool TryGetValue(object key, out ValidationStateEntry value)
+        {
+            return _inner.TryGetValue(key, out value);
+        }
+
+        /// <inheritdoc />
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return ((IDictionary<object, ValidationStateEntry>)_inner).GetEnumerator();
+        }
+
+        private class ReferenceEqualityComparer : IEqualityComparer<object>
+        {
+            private static readonly bool IsMono = Type.GetType("Mono.Runtime") != null;
+
+            public static readonly ReferenceEqualityComparer Instance = new ReferenceEqualityComparer();
+
+            public new bool Equals(object x, object y)
+            {
+                return Object.ReferenceEquals(x, y);
+            }
+
+            public int GetHashCode(object obj)
+            {
+                // RuntimeHelpers.GetHashCode sometimes crashes the runtime on Mono 4.0.4
+                // See: https://github.com/aspnet/External/issues/45
+                // The workaround here is to just not hash anything, and fall back to an equality check.
+                if (IsMono)
+                {
+                    return 0;
+                }
+
+                return RuntimeHelpers.GetHashCode(obj);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationStateEntry.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationStateEntry.cs
new file mode 100644
index 0000000000..970cbb8dfa
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationStateEntry.cs
@@ -0,0 +1,33 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    /// <summary>
+    /// An entry in a <see cref="ValidationStateDictionary"/>. Records state information to override the default
+    /// behavior of validation for an object.
+    /// </summary>
+    public class ValidationStateEntry
+    {
+        /// <summary>
+        /// Gets or sets the model prefix associated with the entry.
+        /// </summary>
+        public string Key { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ModelMetadata"/> associated with the entry.
+        /// </summary>
+        public ModelMetadata Metadata { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the associated model object should be validated.
+        /// </summary>
+        public bool SuppressValidation { get; set; }
+
+        /// <summary>
+        /// Gets or sets an <see cref="IValidationStrategy"/> for enumerating child entries of the associated
+        /// model object.
+        /// </summary>
+        public IValidationStrategy Strategy { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidatorItem.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidatorItem.cs
new file mode 100644
index 0000000000..8592eeca71
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidatorItem.cs
@@ -0,0 +1,45 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    /// <summary>
+    /// Used to associate validators with <see cref="ValidatorMetadata"/> instances
+    /// as part of <see cref="ModelValidatorProviderContext"/>. An <see cref="IModelValidator"/> should
+    /// inspect <see cref="ModelValidatorProviderContext.Results"/> and set <see cref="Validator"/> and
+    /// <see cref="IsReusable"/> as appropriate.
+    /// </summary>
+    public class ValidatorItem
+    {
+        /// <summary>
+        /// Creates a new <see cref="ValidatorItem"/>.
+        /// </summary>
+        public ValidatorItem()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="ValidatorItem"/>.
+        /// </summary>
+        /// <param name="validatorMetadata">The <see cref="ValidatorMetadata"/>.</param>
+        public ValidatorItem(object validatorMetadata)
+        {
+            ValidatorMetadata = validatorMetadata;
+        }
+
+        /// <summary>
+        /// Gets the metadata associated with the <see cref="Validator"/>.
+        /// </summary>
+        public object ValidatorMetadata { get; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IModelValidator"/>.
+        /// </summary>
+        public IModelValidator Validator { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether or not <see cref="Validator"/> can be reused across requests.
+        /// </summary>
+        public bool IsReusable { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ValueProviderFactoryContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ValueProviderFactoryContext.cs
new file mode 100644
index 0000000000..cf48d9072d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ValueProviderFactoryContext.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// A context for <see cref="IValueProviderFactory"/>.
+    /// </summary>
+    public class ValueProviderFactoryContext
+    {
+        /// <summary>
+        /// Creates a new <see cref="ValueProviderFactoryContext"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ActionContext"/>.</param>
+        public ValueProviderFactoryContext(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            ActionContext = context;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="ActionContext"/> associated with this context.
+        /// </summary>
+        public ActionContext ActionContext { get; }
+
+        /// <summary>
+        /// Gets the list of <see cref="IValueProvider"/> instances.
+        /// <see cref="IValueProviderFactory"/> instances should add the appropriate
+        /// <see cref="IValueProvider"/> instances to this list.
+        /// </summary>
+        public IList<IValueProvider> ValueProviders { get; } = new List<IValueProvider>();
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ValueProviderResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ValueProviderResult.cs
new file mode 100644
index 0000000000..c9bf19ad4c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ValueProviderResult.cs
@@ -0,0 +1,187 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Result of an <see cref="IValueProvider.GetValue(string)"/> operation.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// <see cref="ValueProviderResult"/> can represent a single submitted value or multiple submitted values.
+    /// </para>
+    /// <para>
+    /// Use <see cref="FirstValue"/> to consume only a single value, regardless of whether a single value or
+    /// multiple values were submitted.
+    /// </para>
+    /// <para>
+    /// Treat <see cref="ValueProviderResult"/> as an <see cref="IEnumerable{String}"/> to consume all values,
+    /// regardless of whether a single value or multiple values were submitted.
+    /// </para>
+    /// </remarks>
+    public struct ValueProviderResult : IEquatable<ValueProviderResult>, IEnumerable<string>
+    {
+        private static readonly CultureInfo _invariantCulture = CultureInfo.InvariantCulture;
+
+        /// <summary>
+        /// A <see cref="ValueProviderResult"/> that represents a lack of data.
+        /// </summary>
+        public static ValueProviderResult None = new ValueProviderResult(new string[0]);
+
+        /// <summary>
+        /// Creates a new <see cref="ValueProviderResult"/> using <see cref="CultureInfo.InvariantCulture"/>.
+        /// </summary>
+        /// <param name="values">The submitted values.</param>
+        public ValueProviderResult(StringValues values)
+            : this(values, _invariantCulture)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="ValueProviderResult"/>.
+        /// </summary>
+        /// <param name="values">The submitted values.</param>
+        /// <param name="culture">The <see cref="CultureInfo"/> associated with this value.</param>
+        public ValueProviderResult(StringValues values, CultureInfo culture)
+        {
+            Values = values;
+            Culture = culture ?? _invariantCulture;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="CultureInfo"/> associated with the values.
+        /// </summary>
+        public CultureInfo Culture { get; }
+
+        /// <summary>
+        /// Gets or sets the values.
+        /// </summary>
+        public StringValues Values { get; }
+
+        /// <summary>
+        /// Gets the first value based on the order values were provided in the request. Use <see cref="FirstValue"/>
+        /// to get a single value for processing regardless of whether a single or multiple values were provided
+        /// in the request.
+        /// </summary>
+        public string FirstValue
+        {
+            get
+            {
+                if (Values.Count == 0)
+                {
+                    return null;
+                }
+                return Values[0];
+            }
+        }
+
+        /// <summary>
+        /// Gets the number of submitted values.
+        /// </summary>
+        public int Length => Values.Count;
+
+        /// <inheritdoc />
+        public override bool Equals(object obj)
+        {
+            var other = obj as ValueProviderResult?;
+            return other.HasValue && Equals(other.Value);
+        }
+
+        /// <inheritdoc />
+        public bool Equals(ValueProviderResult other)
+        {
+            if (Length != other.Length)
+            {
+                return false;
+            }
+            else
+            {
+                var x = Values;
+                var y = other.Values;
+                for (var i = 0; i < x.Count; i++)
+                {
+                    if (!string.Equals(x[i], y[i], StringComparison.Ordinal))
+                    {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        }
+
+        /// <inheritdoc />
+        public override int GetHashCode()
+        {
+            return ToString().GetHashCode();
+        }
+
+        /// <inheritdoc />
+        public override string ToString()
+        {
+            return Values.ToString();
+        }
+
+        /// <summary>
+        /// Gets an <see cref="IEnumerator{String}"/> for this <see cref="ValueProviderResult"/>.
+        /// </summary>
+        /// <returns>An <see cref="IEnumerator{String}"/>.</returns>
+        public IEnumerator<string> GetEnumerator()
+        {
+            return ((IEnumerable<string>)Values).GetEnumerator();
+        }
+
+        /// <inheritdoc />
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        /// <summary>
+        /// Converts the provided <see cref="ValueProviderResult"/> into a comma-separated string containing all
+        /// submitted values.
+        /// </summary>
+        /// <param name="result">The <see cref="ValueProviderResult"/>.</param>
+        public static explicit operator string(ValueProviderResult result)
+        {
+            return result.Values;
+        }
+
+        /// <summary>
+        /// Converts the provided <see cref="ValueProviderResult"/> into a an array of <see cref="string"/> containing
+        /// all submitted values.
+        /// </summary>
+        /// <param name="result">The <see cref="ValueProviderResult"/>.</param>
+        public static explicit operator string[](ValueProviderResult result)
+        {
+            return result.Values;
+        }
+
+        /// <summary>
+        /// Compares two <see cref="ValueProviderResult"/> objects for equality.
+        /// </summary>
+        /// <param name="x">A <see cref="ValueProviderResult"/>.</param>
+        /// <param name="y">A <see cref="ValueProviderResult"/>.</param>
+        /// <returns><c>true</c> if the values are equal, otherwise <c>false</c>.</returns>
+        public static bool operator ==(ValueProviderResult x, ValueProviderResult y)
+        {
+            return x.Equals(y);
+        }
+
+        /// <summary>
+        /// Compares two <see cref="ValueProviderResult"/> objects for inequality.
+        /// </summary>
+        /// <param name="x">A <see cref="ValueProviderResult"/>.</param>
+        /// <param name="y">A <see cref="ValueProviderResult"/>.</param>
+        /// <returns><c>false</c> if the values are equal, otherwise <c>true</c>.</returns>
+        public static bool operator !=(ValueProviderResult x, ValueProviderResult y)
+        {
+            return !x.Equals(y);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..3af3e8d9b2
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/AssemblyInfo.cs
@@ -0,0 +1,7 @@
+// 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.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Abstractions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..f19e063180
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/Resources.Designer.cs
@@ -0,0 +1,296 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.Abstractions
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class Resources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.Abstractions.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// Value cannot be null or empty.
+        /// </summary>
+        internal static string ArgumentCannotBeNullOrEmpty
+        {
+            get => GetString("ArgumentCannotBeNullOrEmpty");
+        }
+
+        /// <summary>
+        /// Value cannot be null or empty.
+        /// </summary>
+        internal static string FormatArgumentCannotBeNullOrEmpty()
+            => GetString("ArgumentCannotBeNullOrEmpty");
+
+        /// <summary>
+        /// The ModelMetadata property must be set before accessing this property.
+        /// </summary>
+        internal static string ModelBindingContext_ModelMetadataMustBeSet
+        {
+            get => GetString("ModelBindingContext_ModelMetadataMustBeSet");
+        }
+
+        /// <summary>
+        /// The ModelMetadata property must be set before accessing this property.
+        /// </summary>
+        internal static string FormatModelBindingContext_ModelMetadataMustBeSet()
+            => GetString("ModelBindingContext_ModelMetadataMustBeSet");
+
+        /// <summary>
+        /// A field previously marked invalid should not be marked valid.
+        /// </summary>
+        internal static string Validation_InvalidFieldCannotBeReset
+        {
+            get => GetString("Validation_InvalidFieldCannotBeReset");
+        }
+
+        /// <summary>
+        /// A field previously marked invalid should not be marked valid.
+        /// </summary>
+        internal static string FormatValidation_InvalidFieldCannotBeReset()
+            => GetString("Validation_InvalidFieldCannotBeReset");
+
+        /// <summary>
+        /// A field previously marked invalid should not be marked skipped.
+        /// </summary>
+        internal static string Validation_InvalidFieldCannotBeReset_ToSkipped
+        {
+            get => GetString("Validation_InvalidFieldCannotBeReset_ToSkipped");
+        }
+
+        /// <summary>
+        /// A field previously marked invalid should not be marked skipped.
+        /// </summary>
+        internal static string FormatValidation_InvalidFieldCannotBeReset_ToSkipped()
+            => GetString("Validation_InvalidFieldCannotBeReset_ToSkipped");
+
+        /// <summary>
+        /// The maximum number of allowed model errors has been reached.
+        /// </summary>
+        internal static string ModelStateDictionary_MaxModelStateErrors
+        {
+            get => GetString("ModelStateDictionary_MaxModelStateErrors");
+        }
+
+        /// <summary>
+        /// The maximum number of allowed model errors has been reached.
+        /// </summary>
+        internal static string FormatModelStateDictionary_MaxModelStateErrors()
+            => GetString("ModelStateDictionary_MaxModelStateErrors");
+
+        /// <summary>
+        /// Body
+        /// </summary>
+        internal static string BindingSource_Body
+        {
+            get => GetString("BindingSource_Body");
+        }
+
+        /// <summary>
+        /// Body
+        /// </summary>
+        internal static string FormatBindingSource_Body()
+            => GetString("BindingSource_Body");
+
+        /// <summary>
+        /// Custom
+        /// </summary>
+        internal static string BindingSource_Custom
+        {
+            get => GetString("BindingSource_Custom");
+        }
+
+        /// <summary>
+        /// Custom
+        /// </summary>
+        internal static string FormatBindingSource_Custom()
+            => GetString("BindingSource_Custom");
+
+        /// <summary>
+        /// Form
+        /// </summary>
+        internal static string BindingSource_Form
+        {
+            get => GetString("BindingSource_Form");
+        }
+
+        /// <summary>
+        /// Form
+        /// </summary>
+        internal static string FormatBindingSource_Form()
+            => GetString("BindingSource_Form");
+
+        /// <summary>
+        /// Header
+        /// </summary>
+        internal static string BindingSource_Header
+        {
+            get => GetString("BindingSource_Header");
+        }
+
+        /// <summary>
+        /// Header
+        /// </summary>
+        internal static string FormatBindingSource_Header()
+            => GetString("BindingSource_Header");
+
+        /// <summary>
+        /// Services
+        /// </summary>
+        internal static string BindingSource_Services
+        {
+            get => GetString("BindingSource_Services");
+        }
+
+        /// <summary>
+        /// Services
+        /// </summary>
+        internal static string FormatBindingSource_Services()
+            => GetString("BindingSource_Services");
+
+        /// <summary>
+        /// ModelBinding
+        /// </summary>
+        internal static string BindingSource_ModelBinding
+        {
+            get => GetString("BindingSource_ModelBinding");
+        }
+
+        /// <summary>
+        /// ModelBinding
+        /// </summary>
+        internal static string FormatBindingSource_ModelBinding()
+            => GetString("BindingSource_ModelBinding");
+
+        /// <summary>
+        /// Path
+        /// </summary>
+        internal static string BindingSource_Path
+        {
+            get => GetString("BindingSource_Path");
+        }
+
+        /// <summary>
+        /// Path
+        /// </summary>
+        internal static string FormatBindingSource_Path()
+            => GetString("BindingSource_Path");
+
+        /// <summary>
+        /// Query
+        /// </summary>
+        internal static string BindingSource_Query
+        {
+            get => GetString("BindingSource_Query");
+        }
+
+        /// <summary>
+        /// Query
+        /// </summary>
+        internal static string FormatBindingSource_Query()
+            => GetString("BindingSource_Query");
+
+        /// <summary>
+        /// The provided binding source '{0}' is a composite. '{1}' requires that the source must represent a single type of input.
+        /// </summary>
+        internal static string BindingSource_CannotBeComposite
+        {
+            get => GetString("BindingSource_CannotBeComposite");
+        }
+
+        /// <summary>
+        /// The provided binding source '{0}' is a composite. '{1}' requires that the source must represent a single type of input.
+        /// </summary>
+        internal static string FormatBindingSource_CannotBeComposite(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("BindingSource_CannotBeComposite"), p0, p1);
+
+        /// <summary>
+        /// The provided binding source '{0}' is not a request-based binding source. '{1}' requires that the source must represent data from an HTTP request.
+        /// </summary>
+        internal static string BindingSource_MustBeFromRequest
+        {
+            get => GetString("BindingSource_MustBeFromRequest");
+        }
+
+        /// <summary>
+        /// The provided binding source '{0}' is not a request-based binding source. '{1}' requires that the source must represent data from an HTTP request.
+        /// </summary>
+        internal static string FormatBindingSource_MustBeFromRequest(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("BindingSource_MustBeFromRequest"), p0, p1);
+
+        /// <summary>
+        /// The provided binding source '{0}' is a greedy data source. '{1}' does not support greedy data sources.
+        /// </summary>
+        internal static string BindingSource_CannotBeGreedy
+        {
+            get => GetString("BindingSource_CannotBeGreedy");
+        }
+
+        /// <summary>
+        /// The provided binding source '{0}' is a greedy data source. '{1}' does not support greedy data sources.
+        /// </summary>
+        internal static string FormatBindingSource_CannotBeGreedy(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("BindingSource_CannotBeGreedy"), p0, p1);
+
+        /// <summary>
+        /// The provided binding source '{0}' is not a greedy data source. '{1}' only supports greedy data sources.
+        /// </summary>
+        internal static string BindingSource_MustBeGreedy
+        {
+            get => GetString("BindingSource_MustBeGreedy");
+        }
+
+        /// <summary>
+        /// The provided binding source '{0}' is not a greedy data source. '{1}' only supports greedy data sources.
+        /// </summary>
+        internal static string FormatBindingSource_MustBeGreedy(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("BindingSource_MustBeGreedy"), p0, p1);
+
+        /// <summary>
+        /// Special
+        /// </summary>
+        internal static string BindingSource_Special
+        {
+            get => GetString("BindingSource_Special");
+        }
+
+        /// <summary>
+        /// Special
+        /// </summary>
+        internal static string FormatBindingSource_Special()
+            => GetString("BindingSource_Special");
+
+        /// <summary>
+        /// FormFile
+        /// </summary>
+        internal static string BindingSource_FormFile
+        {
+            get => GetString("BindingSource_FormFile");
+        }
+
+        /// <summary>
+        /// FormFile
+        /// </summary>
+        internal static string FormatBindingSource_FormFile()
+            => GetString("BindingSource_FormFile");
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Resources.resx
new file mode 100644
index 0000000000..224ec4161d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Resources.resx
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ArgumentCannotBeNullOrEmpty" xml:space="preserve">
+    <value>Value cannot be null or empty.</value>
+  </data>
+  <data name="ModelBindingContext_ModelMetadataMustBeSet" xml:space="preserve">
+    <value>The ModelMetadata property must be set before accessing this property.</value>
+  </data>
+  <data name="Validation_InvalidFieldCannotBeReset" xml:space="preserve">
+    <value>A field previously marked invalid should not be marked valid.</value>
+  </data>
+  <data name="Validation_InvalidFieldCannotBeReset_ToSkipped" xml:space="preserve">
+    <value>A field previously marked invalid should not be marked skipped.</value>
+  </data>
+  <data name="ModelStateDictionary_MaxModelStateErrors" xml:space="preserve">
+    <value>The maximum number of allowed model errors has been reached.</value>
+  </data>
+  <data name="BindingSource_Body" xml:space="preserve">
+    <value>Body</value>
+  </data>
+  <data name="BindingSource_Custom" xml:space="preserve">
+    <value>Custom</value>
+  </data>
+  <data name="BindingSource_Form" xml:space="preserve">
+    <value>Form</value>
+  </data>
+  <data name="BindingSource_Header" xml:space="preserve">
+    <value>Header</value>
+  </data>
+  <data name="BindingSource_Services" xml:space="preserve">
+    <value>Services</value>
+  </data>
+  <data name="BindingSource_ModelBinding" xml:space="preserve">
+    <value>ModelBinding</value>
+  </data>
+  <data name="BindingSource_Path" xml:space="preserve">
+    <value>Path</value>
+  </data>
+  <data name="BindingSource_Query" xml:space="preserve">
+    <value>Query</value>
+  </data>
+  <data name="BindingSource_CannotBeComposite" xml:space="preserve">
+    <value>The provided binding source '{0}' is a composite. '{1}' requires that the source must represent a single type of input.</value>
+  </data>
+  <data name="BindingSource_MustBeFromRequest" xml:space="preserve">
+    <value>The provided binding source '{0}' is not a request-based binding source. '{1}' requires that the source must represent data from an HTTP request.</value>
+  </data>
+  <data name="BindingSource_CannotBeGreedy" xml:space="preserve">
+    <value>The provided binding source '{0}' is a greedy data source. '{1}' does not support greedy data sources.</value>
+  </data>
+  <data name="BindingSource_MustBeGreedy" xml:space="preserve">
+    <value>The provided binding source '{0}' is not a greedy data source. '{1}' only supports greedy data sources.</value>
+  </data>
+  <data name="BindingSource_Special" xml:space="preserve">
+    <value>Special</value>
+  </data>
+  <data name="BindingSource_FormFile" xml:space="preserve">
+    <value>FormFile</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/AttributeRouteInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/AttributeRouteInfo.cs
new file mode 100644
index 0000000000..5531b44ced
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/AttributeRouteInfo.cs
@@ -0,0 +1,40 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Routing
+{
+    /// <summary>
+    /// Represents the routing information for an action that is attribute routed.
+    /// </summary>
+    public class AttributeRouteInfo
+    {
+        /// <summary>
+        /// The route template. May be null if the action has no attribute routes.
+        /// </summary>
+        public string Template { get; set; }
+
+        /// <summary>
+        /// Gets the order of the route associated with a given action. This property determines
+        /// the order in which routes get executed. Routes with a lower order value are tried first. In case a route
+        /// doesn't specify a value, it gets a default order of 0.
+        /// </summary>
+        public int Order { get; set; }
+
+        /// <summary>
+        /// Gets the name of the route associated with a given action. This property can be used
+        /// to generate a link by referring to the route by name instead of attempting to match a
+        /// route by provided route data.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value that determines if the route entry associated with this model participates in link generation.
+        /// </summary>
+        public bool SuppressLinkGeneration { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value that determines if the route entry associated with this model participates in path matching (inbound routing).
+        /// </summary>
+        public bool SuppressPathMatching { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/UrlActionContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/UrlActionContext.cs
new file mode 100644
index 0000000000..8260b6b680
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/UrlActionContext.cs
@@ -0,0 +1,67 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Routing
+{
+    /// <summary>
+    /// Context object to be used for the URLs that <see cref="IUrlHelper.Action(UrlActionContext)"/> generates.
+    /// </summary>
+    public class UrlActionContext
+    {
+        /// <summary>
+        /// The name of the action method that <see cref="IUrlHelper.Action(UrlActionContext)"/> uses to generate URLs.
+        /// </summary>
+        public string Action
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// The name of the controller that <see cref="IUrlHelper.Action(UrlActionContext)"/> uses to generate URLs.
+        /// </summary>
+        public string Controller
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// The object that contains the route values that <see cref="IUrlHelper.Action(UrlActionContext)"/>
+        /// uses to generate URLs.
+        /// </summary>
+        public object Values
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// The protocol for the URLs that <see cref="IUrlHelper.Action(UrlActionContext)"/> generates,
+        /// such as "http" or "https"
+        /// </summary>
+        public string Protocol
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// The host name for the URLs that <see cref="IUrlHelper.Action(UrlActionContext)"/> generates.
+        /// </summary>
+        public string Host
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// The fragment for the URLs that <see cref="IUrlHelper.Action(UrlActionContext)"/> generates.
+        /// </summary>
+        public string Fragment
+        {
+            get;
+            set;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/UrlRouteContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/UrlRouteContext.cs
new file mode 100644
index 0000000000..706414f958
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/UrlRouteContext.cs
@@ -0,0 +1,58 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Routing
+{
+    /// <summary>
+    /// Context object to be used for the URLs that <see cref="IUrlHelper.RouteUrl(UrlRouteContext)"/> generates.
+    /// </summary>
+    public class UrlRouteContext
+    {
+        /// <summary>
+        /// The name of the route that <see cref="IUrlHelper.RouteUrl(UrlRouteContext)"/> uses to generate URLs.
+        /// </summary>
+        public string RouteName
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// The object that contains the route values that <see cref="IUrlHelper.RouteUrl(UrlRouteContext)"/>
+        /// uses to generate URLs.
+        /// </summary>
+        public object Values
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// The protocol for the URLs that <see cref="IUrlHelper.RouteUrl(UrlRouteContext)"/> generates,
+        /// such as "http" or "https"
+        /// </summary>
+        public string Protocol
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// The host name for the URLs that <see cref="IUrlHelper.RouteUrl(UrlRouteContext)"/> generates.
+        /// </summary>
+        public string Host
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// The fragment for the URLs that <see cref="IUrlHelper.RouteUrl(UrlRouteContext)"/> generates.
+        /// </summary>
+        public string Fragment
+        {
+            get;
+            set;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/baseline.netcore.json
new file mode 100644
index 0000000000..a3ee847f2f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/baseline.netcore.json
@@ -0,0 +1,9358 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ActionContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionDescriptor",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ActionDescriptor",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HttpContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Http.HttpContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HttpContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelState",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Routing.RouteData",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RouteData",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Routing.RouteData"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "httpContext",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            },
+            {
+              "Name": "routeData",
+              "Type": "Microsoft.AspNetCore.Routing.RouteData"
+            },
+            {
+              "Name": "actionDescriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "httpContext",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            },
+            {
+              "Name": "routeData",
+              "Type": "Microsoft.AspNetCore.Routing.RouteData"
+            },
+            {
+              "Name": "actionDescriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor"
+            },
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.IActionResult",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionContext",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Action",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Routing.UrlActionContext"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Content",
+          "Parameters": [
+            {
+              "Name": "contentPath",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsLocalUrl",
+          "Parameters": [
+            {
+              "Name": "url",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RouteUrl",
+          "Parameters": [
+            {
+              "Name": "routeContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Routing.UrlRouteContext"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Link",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Routing.AttributeRouteInfo",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Template",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Template",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SuppressLinkGeneration",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SuppressLinkGeneration",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SuppressPathMatching",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SuppressPathMatching",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Routing.UrlActionContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Action",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Action",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Controller",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Controller",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Values",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Values",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Protocol",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Protocol",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Host",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Host",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Fragment",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Fragment",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Routing.UrlRouteContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_RouteName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RouteName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Values",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Values",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Protocol",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Protocol",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Host",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Host",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Fragment",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Fragment",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_BindingSource",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BindingSource",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BinderModelName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BinderModelName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BinderType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BinderType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyFilterProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IPropertyFilterProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PropertyFilterProvider",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IPropertyFilterProvider"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RequestPredicate",
+          "Parameters": [],
+          "ReturnType": "System.Func<Microsoft.AspNetCore.Mvc.ActionContext, System.Boolean>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RequestPredicate",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Func<Microsoft.AspNetCore.Mvc.ActionContext, System.Boolean>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetBindingInfo",
+          "Parameters": [
+            {
+              "Name": "attributes",
+              "Type": "System.Collections.Generic.IEnumerable<System.Object>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetBindingInfo",
+          "Parameters": [
+            {
+              "Name": "attributes",
+              "Type": "System.Collections.Generic.IEnumerable<System.Object>"
+            },
+            {
+              "Name": "modelMetadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryApplyBindingInfo",
+          "Parameters": [
+            {
+              "Name": "modelMetadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Id",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsGreedy",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsFromRequest",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CanAcceptDataFrom",
+          "Parameters": [
+            {
+              "Name": "bindingSource",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "op_Equality",
+          "Parameters": [
+            {
+              "Name": "s1",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            },
+            {
+              "Name": "s2",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "op_Inequality",
+          "Parameters": [
+            {
+              "Name": "s1",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            },
+            {
+              "Name": "s2",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "id",
+              "Type": "System.String"
+            },
+            {
+              "Name": "displayName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "isGreedy",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "isFromRequest",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Body",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Custom",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Form",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Header",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "ModelBinding",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Path",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Query",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Services",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Special",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "FormFile",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.CompositeBindingSource",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "bindingSources",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource>"
+            },
+            {
+              "Name": "displayName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.CompositeBindingSource",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BindingSources",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CanAcceptDataFrom",
+          "Parameters": [
+            {
+              "Name": "bindingSource",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.EnumGroupAndName",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Group",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "group",
+              "Type": "System.String"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "group",
+              "Type": "System.String"
+            },
+            {
+              "Name": "name",
+              "Type": "System.Func<System.String>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.IBinderTypeProviderMetadata",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_BinderType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceMetadata",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_BindingSource",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetBinder",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetMetadataForType",
+          "Parameters": [
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetMetadataForProperties",
+          "Parameters": [
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelNameProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.IPropertyFilterProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyFilter",
+          "Parameters": [],
+          "ReturnType": "System.Func<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata, System.Boolean>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.IRequestPredicateProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_RequestPredicate",
+          "Parameters": [],
+          "ReturnType": "System.Func<Microsoft.AspNetCore.Mvc.ActionContext, System.Boolean>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ContainsPrefix",
+          "Parameters": [
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetValue",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateValueProviderAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderFactoryContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderProviderContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateBinder",
+          "Parameters": [
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateBinder",
+          "Parameters": [
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "bindingInfo",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BindingInfo",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Metadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MetadataProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Services",
+          "Parameters": [],
+          "ReturnType": "System.IServiceProvider",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionContext",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ActionContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BinderModelName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BinderModelName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BindingSource",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BindingSource",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FieldName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FieldName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HttpContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Http.HttpContext",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsTopLevelObject",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsTopLevelObject",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Model",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Model",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ModelMetadata",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ModelName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelState",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ModelState",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyFilter",
+          "Parameters": [],
+          "ReturnType": "System.Func<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata, System.Boolean>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PropertyFilter",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Func<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata, System.Boolean>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidationState",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateDictionary",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ValidationState",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValueProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ValueProvider",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Result",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Result",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EnterNestedScope",
+          "Parameters": [
+            {
+              "Name": "modelMetadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "fieldName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "modelName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext+NestedScope",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EnterNestedScope",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext+NestedScope",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExitNestedScope",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Failed",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Success",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Model",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsModelSet",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ToString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "op_Equality",
+          "Parameters": [
+            {
+              "Name": "x",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult"
+            },
+            {
+              "Name": "y",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "op_Inequality",
+          "Parameters": [
+            {
+              "Name": "x",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult"
+            },
+            {
+              "Name": "y",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelError",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Exception",
+          "Parameters": [],
+          "ReturnType": "System.Exception",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ErrorMessage",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "exception",
+              "Type": "System.Exception"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "exception",
+              "Type": "System.Exception"
+            },
+            {
+              "Name": "errorMessage",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "errorMessage",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelErrorCollection",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Collections.ObjectModel.Collection<Microsoft.AspNetCore.Mvc.ModelBinding.ModelError>",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "exception",
+              "Type": "System.Exception"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "errorMessage",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata>",
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ContainerType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ContainerMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MetadataKind",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataKind",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParameterName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Identity",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AdditionalValues",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyDictionary<System.Object, System.Object>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelPropertyCollection",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BinderModelName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BinderType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BindingSource",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ConvertEmptyStringToNull",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DataTypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Description",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayFormatString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_EditFormatString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ElementMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_EnumGroupedDisplayNamesAndValues",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<Microsoft.AspNetCore.Mvc.ModelBinding.EnumGroupAndName, System.String>>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_EnumNamesAndValues",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyDictionary<System.String, System.String>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasNonDefaultEditFormat",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HtmlEncode",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HideSurroundingHtml",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsBindingAllowed",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsBindingRequired",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsEnum",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsFlagsEnum",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReadOnly",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsRequired",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelBindingMessageProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelBindingMessageProvider",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Placeholder",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NullDisplayText",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyFilterProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IPropertyFilterProvider",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ShowForDisplay",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ShowForEdit",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SimpleDisplayProperty",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TemplateHint",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyValidationFilter",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IPropertyValidationFilter",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidateChildren",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidatorMetadata",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ElementType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsComplexType",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsNullableValueType",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsCollectionType",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsEnumerableType",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReferenceOrNullableType",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_UnderlyingOrModelType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyGetter",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.Object, System.Object>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertySetter",
+          "Parameters": [],
+          "ReturnType": "System.Action<System.Object, System.Object>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetDisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetMetadataForType",
+          "Parameters": [
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetMetadataForProperties",
+          "Parameters": [
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "identity",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity"
+            }
+          ],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "DefaultOrder",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadataProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetMetadataForProperties",
+          "Parameters": [
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata>",
+          "Virtual": true,
+          "Abstract": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetMetadataForType",
+          "Parameters": [
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Virtual": true,
+          "Abstract": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetMetadataForParameter",
+          "Parameters": [
+            {
+              "Name": "parameter",
+              "Type": "System.Reflection.ParameterInfo"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelPropertyCollection",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Collections.ObjectModel.ReadOnlyCollection<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata>",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "propertyName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "properties",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IReadOnlyDictionary<System.String, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Count",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IReadOnlyCollection<System.Collections.Generic.KeyValuePair<System.String, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Root",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MaxAllowedErrors",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MaxAllowedErrors",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasReachedMaxErrors",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ErrorCount",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Keys",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary+KeyEnumerable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Values",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary+ValueEnumerable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsValid",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidationState",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelValidationState",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IReadOnlyDictionary<System.String, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryAddModelException",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "exception",
+              "Type": "System.Exception"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddModelError",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "exception",
+              "Type": "System.Exception"
+            },
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryAddModelError",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "exception",
+              "Type": "System.Exception"
+            },
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddModelError",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "errorMessage",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryAddModelError",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "errorMessage",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetFieldValidationState",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelValidationState",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetValidationState",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelValidationState",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MarkFieldValid",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MarkFieldSkipped",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Merge",
+          "Parameters": [
+            {
+              "Name": "dictionary",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetModelValue",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "rawValue",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "attemptedValue",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetModelValue",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "valueProviderResult",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ClearValidationState",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Clear",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ContainsKey",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IReadOnlyDictionary<System.String, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Remove",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryGetValue",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry",
+              "Direction": "Out"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IReadOnlyDictionary<System.String, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetEnumerator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary+Enumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "StartsWithPrefix",
+          "Parameters": [
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FindKeysWithPrefix",
+          "Parameters": [
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary+PrefixEnumerable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "maxAllowedErrors",
+              "Type": "System.Int32"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "dictionary",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "DefaultMaxAllowedErrors",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_RawValue",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RawValue",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AttemptedValue",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AttemptedValue",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Errors",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelErrorCollection",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidationState",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelValidationState",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ValidationState",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelValidationState"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsContainerNode",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetModelStateForProperty",
+          "Parameters": [
+            {
+              "Name": "propertyName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Children",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelValidationState",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Unvalidated",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Invalid",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Valid",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Skipped",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "3"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.TooManyModelErrorsException",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Exception",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "message",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderFactoryContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValueProviders",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult>",
+        "System.Collections.Generic.IEnumerable<System.String>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Culture",
+          "Parameters": [],
+          "ReturnType": "System.Globalization.CultureInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Values",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.Primitives.StringValues",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FirstValue",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Length",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ToString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetEnumerator",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerator<System.String>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IEnumerable<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "op_Explicit",
+          "Parameters": [
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "op_Explicit",
+          "Parameters": [
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult"
+            }
+          ],
+          "ReturnType": "System.String[]",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "op_Equality",
+          "Parameters": [
+            {
+              "Name": "x",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult"
+            },
+            {
+              "Name": "y",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "op_Inequality",
+          "Parameters": [
+            {
+              "Name": "x",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult"
+            },
+            {
+              "Name": "y",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "values",
+              "Type": "Microsoft.Extensions.Primitives.StringValues"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "values",
+              "Type": "Microsoft.Extensions.Primitives.StringValues"
+            },
+            {
+              "Name": "culture",
+              "Type": "System.Globalization.CultureInfo"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "None",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientModelValidationContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContextBase",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Attributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "metadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "attributes",
+              "Type": "System.Collections.Generic.IDictionary<System.String, System.String>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientValidatorItem",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ValidatorMetadata",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Validator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Validator",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidator"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReusable",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsReusable",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "validatorMetadata",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientValidatorProviderContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ModelMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidatorMetadata",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Results",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientValidatorItem>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "modelMetadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "items",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientValidatorItem>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidator",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddValidation",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientModelValidationContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidatorProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateValidators",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientValidatorProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidator",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Validate",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContext"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationResult>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidatorProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateValidators",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidatorProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IPropertyValidationFilter",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ShouldValidateEntry",
+          "Parameters": [
+            {
+              "Name": "entry",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationEntry"
+            },
+            {
+              "Name": "parentEntry",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationEntry"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IValidationStrategy",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetChildren",
+          "Parameters": [
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerator<Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationEntry>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContextBase",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Model",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Container",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "modelMetadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "metadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "container",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContextBase",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MetadataProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "modelMetadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "metadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_MemberName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Message",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "memberName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidatorProviderContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ModelMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ModelMetadata",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidatorMetadata",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Results",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidatorItem>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "modelMetadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "items",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidatorItem>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationEntry",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Key",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Metadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Model",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "modelAccessor",
+              "Type": "System.Func<System.Object>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateDictionary",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IDictionary<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>",
+        "System.Collections.Generic.IReadOnlyDictionary<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Count",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReadOnly",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "System.Collections.Generic.KeyValuePair<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Clear",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Contains",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "System.Collections.Generic.KeyValuePair<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CopyTo",
+          "Parameters": [
+            {
+              "Name": "array",
+              "Type": "System.Collections.Generic.KeyValuePair<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>[]"
+            },
+            {
+              "Name": "arrayIndex",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Remove",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "System.Collections.Generic.KeyValuePair<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetEnumerator",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Item",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Keys",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<System.Object>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Values",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ContainsKey",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Remove",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryGetValue",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry",
+              "Direction": "Out"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.Object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Key",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Key",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Metadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Metadata",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SuppressValidation",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SuppressValidation",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Strategy",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IValidationStrategy",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Strategy",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IValidationStrategy"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidatorItem",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ValidatorMetadata",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Validator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Validator",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidator"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReusable",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsReusable",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "validatorMetadata",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelBindingMessageProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_MissingBindRequiredValueAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String, System.String>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MissingKeyOrValueAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MissingRequestBodyRequiredValueAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValueMustNotBeNullAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String, System.String>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AttemptedValueIsInvalidAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String, System.String, System.String>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NonPropertyAttemptedValueIsInvalidAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String, System.String>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_UnknownValueIsInvalidAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String, System.String>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NonPropertyUnknownValueIsInvalidAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValueIsInvalidAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String, System.String>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValueMustBeANumberAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String, System.String>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NonPropertyValueMustBeANumberAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ForType",
+          "Parameters": [
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ForProperty",
+          "Parameters": [
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "containerType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ForParameter",
+          "Parameters": [
+            {
+              "Name": "parameter",
+              "Type": "System.Reflection.ParameterInfo"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ContainerType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MetadataKind",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataKind",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParameterInfo",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.ParameterInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataKind",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Type",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Property",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Parameter",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.FormatterCollection<T0>",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Collections.ObjectModel.Collection<T0>",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "RemoveType<T0>",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "RemoveType",
+          "Parameters": [
+            {
+              "Name": "formatterType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "list",
+              "Type": "System.Collections.Generic.IList<T0>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TFormatter",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.IInputFormatter",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CanRead",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReadAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.IInputFormatterExceptionPolicy",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ExceptionPolicy",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterExceptionPolicy",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_TreatEmptyInputAsDefaultValue",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HttpContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Http.HttpContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelState",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Metadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ReaderFactory",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.IO.Stream, System.Text.Encoding, System.IO.TextReader>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "httpContext",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            },
+            {
+              "Name": "modelName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            },
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "readerFactory",
+              "Type": "System.Func<System.IO.Stream, System.Text.Encoding, System.IO.TextReader>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "httpContext",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            },
+            {
+              "Name": "modelName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            },
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "readerFactory",
+              "Type": "System.Func<System.IO.Stream, System.Text.Encoding, System.IO.TextReader>"
+            },
+            {
+              "Name": "treatEmptyInputAsDefaultValue",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterException",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Exception",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "message",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "innerException",
+              "Type": "System.Exception"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterExceptionPolicy",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "AllExceptions",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "MalformedInputExceptions",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_HasError",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsModelSet",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Model",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Failure",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FailureAsync",
+          "Parameters": [],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult>",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Success",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SuccessAsync",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult>",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "NoValue",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "NoValueAsync",
+          "Parameters": [],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult>",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CanWriteResult",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterCanWriteContext"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterCanWriteContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_HttpContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Http.HttpContext",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HttpContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ContentType",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.Primitives.StringSegment",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ContentType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.Extensions.Primitives.StringSegment"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ContentTypeIsServerDefined",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ContentTypeIsServerDefined",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Object",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Object",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ObjectType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ObjectType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "httpContext",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            }
+          ],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterCanWriteContext",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_WriterFactory",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.IO.Stream, System.Text.Encoding, System.IO.TextWriter>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_WriterFactory",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Func<System.IO.Stream, System.Text.Encoding, System.IO.TextWriter>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "httpContext",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            },
+            {
+              "Name": "writerFactory",
+              "Type": "System.Func<System.IO.Stream, System.Text.Encoding, System.IO.TextWriter>"
+            },
+            {
+              "Name": "objectType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "object",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Filters.FilterContext",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Canceled",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Canceled",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Controller",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Exception",
+          "Parameters": [],
+          "ReturnType": "System.Exception",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Exception",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Exception"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ExceptionDispatchInfo",
+          "Parameters": [],
+          "ReturnType": "System.Runtime.ExceptionServices.ExceptionDispatchInfo",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ExceptionDispatchInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Runtime.ExceptionServices.ExceptionDispatchInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ExceptionHandled",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ExceptionHandled",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Result",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Result",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IActionResult"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "filters",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>"
+            },
+            {
+              "Name": "controller",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Filters.FilterContext",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Result",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Result",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IActionResult"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ActionArguments",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Controller",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "filters",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>"
+            },
+            {
+              "Name": "actionArguments",
+              "Type": "System.Collections.Generic.IDictionary<System.String, System.Object>"
+            },
+            {
+              "Name": "controller",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.ActionExecutionDelegate",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "System.MulticastDelegate",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Invoke",
+          "Parameters": [],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginInvoke",
+          "Parameters": [
+            {
+              "Name": "callback",
+              "Type": "System.AsyncCallback"
+            },
+            {
+              "Name": "object",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.IAsyncResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndInvoke",
+          "Parameters": [
+            {
+              "Name": "result",
+              "Type": "System.IAsyncResult"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "object",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "method",
+              "Type": "System.IntPtr"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Filters.FilterContext",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Result",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Result",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IActionResult"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "filters",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.ExceptionContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Filters.FilterContext",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Exception",
+          "Parameters": [],
+          "ReturnType": "System.Exception",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Exception",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Exception"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ExceptionDispatchInfo",
+          "Parameters": [],
+          "ReturnType": "System.Runtime.ExceptionServices.ExceptionDispatchInfo",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ExceptionDispatchInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Runtime.ExceptionServices.ExceptionDispatchInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ExceptionHandled",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ExceptionHandled",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Result",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Result",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IActionResult"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "filters",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.FilterContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionContext",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Filters",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsEffectivePolicy<T0>",
+          "Parameters": [
+            {
+              "Name": "policy",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TMetadata",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+              ]
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "FindEffectivePolicy<T0>",
+          "Parameters": [],
+          "ReturnType": "T0",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TMetadata",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+              ]
+            }
+          ]
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "filters",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.FilterDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Filter",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Scope",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "filter",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+            },
+            {
+              "Name": "filterScope",
+              "Type": "System.Int32"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.FilterItem",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Descriptor",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.FilterDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Filter",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Filter",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReusable",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsReusable",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.FilterDescriptor"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.FilterDescriptor"
+            },
+            {
+              "Name": "filter",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.FilterProviderContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ActionContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Results",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.FilterItem>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Results",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.FilterItem>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "items",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.FilterItem>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.IActionFilter",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "OnActionExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnActionExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.IAlwaysRunResultFilter",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IResultFilter"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.IAsyncActionFilter",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "OnActionExecutionAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext"
+            },
+            {
+              "Name": "next",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ActionExecutionDelegate"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.IAsyncAlwaysRunResultFilter",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IAsyncResultFilter"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.IAsyncAuthorizationFilter",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "OnAuthorizationAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.IAsyncExceptionFilter",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "OnExceptionAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ExceptionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.IAsyncResourceFilter",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "OnResourceExecutionAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResourceExecutingContext"
+            },
+            {
+              "Name": "next",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResourceExecutionDelegate"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.IAsyncResultFilter",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "OnResultExecutionAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResultExecutingContext"
+            },
+            {
+              "Name": "next",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResultExecutionDelegate"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.IAuthorizationFilter",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "OnAuthorization",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.IExceptionFilter",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "OnException",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ExceptionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.IFilterContainer",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_FilterDefinition",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FilterDefinition",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_IsReusable",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateInstance",
+          "Parameters": [
+            {
+              "Name": "serviceProvider",
+              "Type": "System.IServiceProvider"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.IFilterProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.FilterProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.FilterProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.IResourceFilter",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "OnResourceExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResourceExecutingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnResourceExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResourceExecutedContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.IResultFilter",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "OnResultExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResultExecutingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnResultExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResultExecutedContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.ResourceExecutedContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Filters.FilterContext",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Canceled",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Canceled",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Exception",
+          "Parameters": [],
+          "ReturnType": "System.Exception",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Exception",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Exception"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ExceptionDispatchInfo",
+          "Parameters": [],
+          "ReturnType": "System.Runtime.ExceptionServices.ExceptionDispatchInfo",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ExceptionDispatchInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Runtime.ExceptionServices.ExceptionDispatchInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ExceptionHandled",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ExceptionHandled",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Result",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Result",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IActionResult"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "filters",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.ResourceExecutingContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Filters.FilterContext",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Result",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Result",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IActionResult"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValueProviderFactories",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "filters",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>"
+            },
+            {
+              "Name": "valueProviderFactories",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.ResourceExecutionDelegate",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "System.MulticastDelegate",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Invoke",
+          "Parameters": [],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Filters.ResourceExecutedContext>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginInvoke",
+          "Parameters": [
+            {
+              "Name": "callback",
+              "Type": "System.AsyncCallback"
+            },
+            {
+              "Name": "object",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.IAsyncResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndInvoke",
+          "Parameters": [
+            {
+              "Name": "result",
+              "Type": "System.IAsyncResult"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Filters.ResourceExecutedContext>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "object",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "method",
+              "Type": "System.IntPtr"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.ResultExecutedContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Filters.FilterContext",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Canceled",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Canceled",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Controller",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Exception",
+          "Parameters": [],
+          "ReturnType": "System.Exception",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Exception",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Exception"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ExceptionDispatchInfo",
+          "Parameters": [],
+          "ReturnType": "System.Runtime.ExceptionServices.ExceptionDispatchInfo",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ExceptionDispatchInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Runtime.ExceptionServices.ExceptionDispatchInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ExceptionHandled",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ExceptionHandled",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Result",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "filters",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.IActionResult"
+            },
+            {
+              "Name": "controller",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.ResultExecutingContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Filters.FilterContext",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Controller",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Result",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Result",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IActionResult"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Cancel",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Cancel",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "filters",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.IActionResult"
+            },
+            {
+              "Name": "controller",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.ResultExecutionDelegate",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "System.MulticastDelegate",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Invoke",
+          "Parameters": [],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Filters.ResultExecutedContext>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginInvoke",
+          "Parameters": [
+            {
+              "Name": "callback",
+              "Type": "System.AsyncCallback"
+            },
+            {
+              "Name": "object",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.IAsyncResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndInvoke",
+          "Parameters": [
+            {
+              "Name": "result",
+              "Type": "System.IAsyncResult"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Filters.ResultExecutedContext>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "object",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "method",
+              "Type": "System.IntPtr"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Authorization.IAllowAnonymousFilter",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionDescriptor",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ActionDescriptor",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_GroupName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_GroupName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HttpMethod",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HttpMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParameterDescriptions",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterDescription>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.Object, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RelativePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RelativePath",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SupportedRequestFormats",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiRequestFormat>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SupportedResponseTypes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseType>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Actions",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Results",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actions",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterDescription",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ModelMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ModelMetadata",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteInfo",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterRouteInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RouteInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterRouteInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Source",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Source",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Type",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Type",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParameterDescriptor",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ParameterDescriptor",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterRouteInfo",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Constraints",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Routing.IRouteConstraint>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Constraints",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Routing.IRouteConstraint>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DefaultValue",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DefaultValue",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsOptional",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsOptional",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiRequestFormat",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Formatter",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.IInputFormatter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Formatter",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.IInputFormatter"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MediaType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MediaType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseFormat",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Formatter",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Formatter",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MediaType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MediaType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseType",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ApiResponseFormats",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseFormat>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ApiResponseFormats",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseFormat>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ModelMetadata",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Type",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Type",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_StatusCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_StatusCode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsDefaultResponse",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsDefaultResponse",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Candidates",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.ActionConstraints.ActionSelectorCandidate>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Candidates",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.ActionConstraints.ActionSelectorCandidate>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_CurrentCandidate",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionConstraints.ActionSelectorCandidate",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_CurrentCandidate",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionConstraints.ActionSelectorCandidate"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Routing.RouteContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RouteContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Routing.RouteContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintItem",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Constraint",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraint",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Constraint",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraint"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Metadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraintMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReusable",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsReusable",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraintMetadata"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintProviderContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_HttpContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Http.HttpContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Action",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Results",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintItem>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            },
+            {
+              "Name": "action",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor"
+            },
+            {
+              "Name": "items",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintItem>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ActionConstraints.ActionSelectorCandidate",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Action",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Constraints",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraint>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "action",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor"
+            },
+            {
+              "Name": "constraints",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraint>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraint",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraintMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintContext"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraintFactory",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraintMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_IsReusable",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateInstance",
+          "Parameters": [
+            {
+              "Name": "services",
+              "Type": "System.IServiceProvider"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraint",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraintMetadata",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraintProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Id",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteValues",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RouteValues",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IDictionary<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AttributeRouteInfo",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Routing.AttributeRouteInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AttributeRouteInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Routing.AttributeRouteInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ActionConstraints",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraintMetadata>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ActionConstraints",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraintMetadata>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Parameters",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Parameters",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BoundProperties",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BoundProperties",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FilterDescriptors",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.FilterDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FilterDescriptors",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.FilterDescriptor>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.Object, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Properties",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IDictionary<System.Object, System.Object>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptorExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetProperty<T0>",
+          "Parameters": [
+            {
+              "Name": "actionDescriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor"
+            }
+          ],
+          "ReturnType": "T0",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetProperty<T0>",
+          "Parameters": [
+            {
+              "Name": "actionDescriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor"
+            },
+            {
+              "Name": "value",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptorProviderContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Results",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Abstractions.ActionInvokerProviderContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Result",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Abstractions.IActionInvoker",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Result",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.IActionInvoker"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Abstractions.IActionDescriptorProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptorProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptorProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Abstractions.IActionInvoker",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "InvokeAsync",
+          "Parameters": [],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Abstractions.IActionInvokerProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.ActionInvokerProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.ActionInvokerProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParameterType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ParameterType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BindingInfo",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BindingInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext+NestedScope",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IDisposable"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary+PrefixEnumerable",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetEnumerator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary+Enumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "dictionary",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary+Enumerator",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<System.String, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MoveNext",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Reset",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Current",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.KeyValuePair<System.String, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<System.String, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "dictionary",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary+KeyEnumerable",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IEnumerable<System.String>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetEnumerator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary+KeyEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "dictionary",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary+KeyEnumerator",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IEnumerator<System.String>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MoveNext",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Reset",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Current",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IEnumerator<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "dictionary",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary+ValueEnumerable",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetEnumerator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary+ValueEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "dictionary",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary+ValueEnumerator",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IEnumerator<Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MoveNext",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Reset",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Current",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IEnumerator<Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "dictionary",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ActionsMustNotBeAsyncVoidAnalyzer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ActionsMustNotBeAsyncVoidAnalyzer.cs
new file mode 100644
index 0000000000..90b2032abb
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ActionsMustNotBeAsyncVoidAnalyzer.cs
@@ -0,0 +1,56 @@
+// 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.
+
+using System;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    [DiagnosticAnalyzer(LanguageNames.CSharp)]
+    public class ActionsMustNotBeAsyncVoidAnalyzer : ControllerAnalyzerBase
+    {
+        public static readonly string ReturnTypeKey = "ReturnType";
+
+        public ActionsMustNotBeAsyncVoidAnalyzer()
+            : base(DiagnosticDescriptors.MVC7003_ActionsMustNotBeAsyncVoid)
+        {
+        }
+
+        protected override void InitializeWorker(ControllerAnalyzerContext analyzerContext)
+        {
+            analyzerContext.Context.RegisterSyntaxNodeAction(context =>
+            {
+                var methodSyntax = (MethodDeclarationSyntax)context.Node;
+                var method = context.SemanticModel.GetDeclaredSymbol(methodSyntax, context.CancellationToken);
+
+                if (!analyzerContext.IsControllerAction(method))
+                {
+                    return;
+                }
+
+                if (!method.IsAsync || !method.ReturnsVoid)
+                {
+                    return;
+                }
+
+                var returnType = analyzerContext.SystemThreadingTask.ToMinimalDisplayString(
+                    context.SemanticModel,
+                    methodSyntax.ReturnType.SpanStart);
+
+                var properties = ImmutableDictionary.Create<string, string>(StringComparer.Ordinal)
+                    .Add(ReturnTypeKey, returnType);
+
+                var location = methodSyntax.ReturnType.GetLocation();
+                context.ReportDiagnostic(Diagnostic.Create(
+                    SupportedDiagnostic,
+                    location,
+                    properties: properties));
+
+            }, SyntaxKind.MethodDeclaration);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ActionsMustNotBeAsyncVoidFixProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ActionsMustNotBeAsyncVoidFixProvider.cs
new file mode 100644
index 0000000000..f36c18d0e6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ActionsMustNotBeAsyncVoidFixProvider.cs
@@ -0,0 +1,58 @@
+// 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.
+
+using System.Collections.Immutable;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Editing;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    [ExportCodeFixProvider(LanguageNames.CSharp)]
+    [Shared]
+    public class ActionsMustNotBeAsyncVoidFixProvider : CodeFixProvider
+    {
+        public sealed override ImmutableArray<string> FixableDiagnosticIds =>
+            ImmutableArray.Create(DiagnosticDescriptors.MVC7003_ActionsMustNotBeAsyncVoid.Id);
+
+        public sealed override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;
+
+        public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+        {
+            if (context.Diagnostics.Length == 0)
+            {
+                return;
+            }
+
+            if (!context.Diagnostics[0].Properties.TryGetValue(ActionsMustNotBeAsyncVoidAnalyzer.ReturnTypeKey, out var returnTypeName))
+            {
+                return;
+            }
+
+            var rootNode = await context.Document.GetSyntaxRootAsync(context.CancellationToken).ConfigureAwait(false);
+
+            const string title = "Fix async void usage.";
+            context.RegisterCodeFix(
+                CodeAction.Create(
+                    title,
+                    createChangedDocument: CreateChangedDocumentAsync,
+                    equivalenceKey: title),
+                context.Diagnostics);
+
+            async Task<Document> CreateChangedDocumentAsync(CancellationToken cancellationToken)
+            {
+                var returnTypeSyntax = rootNode.FindNode(context.Span);
+
+                var editor = await DocumentEditor.CreateAsync(context.Document, cancellationToken).ConfigureAwait(false);
+                editor.ReplaceNode(returnTypeSyntax, SyntaxFactory.IdentifierName(returnTypeName));
+
+                return editor.GetChangedDocument();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsAreAttributeRoutedAnalyzer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsAreAttributeRoutedAnalyzer.cs
new file mode 100644
index 0000000000..59a8eec020
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsAreAttributeRoutedAnalyzer.cs
@@ -0,0 +1,52 @@
+// 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.
+
+using System;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    [DiagnosticAnalyzer(LanguageNames.CSharp)]
+    public class ApiActionsAreAttributeRoutedAnalyzer : ApiControllerAnalyzerBase
+    {
+        internal const string MethodNameKey = "MethodName";
+
+        public ApiActionsAreAttributeRoutedAnalyzer()
+            : base(DiagnosticDescriptors.MVC7000_ApiActionsMustBeAttributeRouted)
+        {
+        }
+
+        protected override void InitializeWorker(ApiControllerAnalyzerContext analyzerContext)
+        {
+            analyzerContext.Context.RegisterSymbolAction(context =>
+            {
+                var method = (IMethodSymbol)context.Symbol;
+
+                if (!analyzerContext.IsApiAction(method))
+                {
+                    return;
+                }
+
+                foreach (var attribute in method.GetAttributes())
+                {
+                    if (attribute.AttributeClass.IsAssignableFrom(analyzerContext.RouteAttribute))
+                    {
+                        return;
+                    }
+                }
+
+                var properties = ImmutableDictionary.Create<string, string>(StringComparer.Ordinal)
+                    .Add(MethodNameKey, method.Name);
+
+                var location = method.Locations.Length > 0 ? method.Locations[0] : Location.None;
+                context.ReportDiagnostic(Diagnostic.Create(
+                    SupportedDiagnostic,
+                    location,
+                    properties: properties));
+
+            }, SymbolKind.Method);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsAreAttributeRoutedFixProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsAreAttributeRoutedFixProvider.cs
new file mode 100644
index 0000000000..e97e593a9f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsAreAttributeRoutedFixProvider.cs
@@ -0,0 +1,187 @@
+// 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.
+
+using System;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Diagnostics;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editing;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    [ExportCodeFixProvider(LanguageNames.CSharp)]
+    [Shared]
+    public class ApiActionsAreAttributeRoutedFixProvider : CodeFixProvider
+    {
+        private static readonly RouteAttributeInfo[] RouteAttributes = new[]
+        {
+            new RouteAttributeInfo("HttpGet", TypeNames.HttpGetAttribute, new[] { "Get", "Find" }),
+            new RouteAttributeInfo("HttpPost", TypeNames.HttpPostAttribute, new[] { "Post", "Create", "Update" }),
+            new RouteAttributeInfo("HttpDelete", TypeNames.HttpDeleteAttribute, new[] { "Delete", "Remove" }),
+            new RouteAttributeInfo("HttpPut", TypeNames.HttpPutAttribute, new[] { "Put", "Create", "Update" }),
+        };
+
+        public sealed override ImmutableArray<string> FixableDiagnosticIds =>
+            ImmutableArray.Create(DiagnosticDescriptors.MVC7000_ApiActionsMustBeAttributeRouted.Id);
+
+        public sealed override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;
+
+        public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+        {
+            if (context.Diagnostics.Length == 0)
+            {
+                return;
+            }
+
+            var rootNode = await context.Document.GetSyntaxRootAsync(context.CancellationToken).ConfigureAwait(false);
+
+            Debug.Assert(context.Diagnostics.Length == 1);
+            var diagnostic = context.Diagnostics[0];
+            var methodName = diagnostic.Properties[ApiActionsAreAttributeRoutedAnalyzer.MethodNameKey];
+
+            var matchedByKeyword = false;
+            foreach (var routeInfo in RouteAttributes)
+            {
+                foreach (var keyword in routeInfo.KeyWords)
+                {
+                    // Determine if the method starts with a conventional key and only show relevant routes.
+                    // For e.g. FindPetByCategory would result in HttpGet attribute.
+                    if (methodName.StartsWith(keyword, StringComparison.Ordinal))
+                    {
+                        matchedByKeyword = true;
+
+                        var title = $"Add {routeInfo.Name} attribute";
+                        context.RegisterCodeFix(
+                            CodeAction.Create(
+                                title,
+                                createChangedDocument: cancellationToken => CreateChangedDocumentAsync(routeInfo.Type, cancellationToken),
+                                equivalenceKey: title),
+                            context.Diagnostics);
+                    }
+                }
+            }
+
+            if (!matchedByKeyword)
+            {
+                foreach (var routeInfo in RouteAttributes)
+                {
+                    var title = $"Add {routeInfo.Name} attribute";
+                    context.RegisterCodeFix(
+                        CodeAction.Create(
+                            title,
+                            createChangedDocument: cancellationToken => CreateChangedDocumentAsync(routeInfo.Type, cancellationToken),
+                            equivalenceKey: title),
+                        context.Diagnostics);
+                }
+            }
+
+            async Task<Document> CreateChangedDocumentAsync(string attributeName, CancellationToken cancellationToken)
+            {
+                var methodNode = (MethodDeclarationSyntax)rootNode.FindNode(context.Span);
+
+                var editor = await DocumentEditor.CreateAsync(context.Document, cancellationToken).ConfigureAwait(false);
+                var compilation = editor.SemanticModel.Compilation;
+                var attributeMetadata = compilation.GetTypeByMetadataName(attributeName);
+                var fromRouteAttribute = compilation.GetTypeByMetadataName(TypeNames.FromRouteAttribute);
+
+                attributeName = attributeMetadata.ToMinimalDisplayString(editor.SemanticModel, methodNode.SpanStart);
+
+                // Remove the Attribute suffix from type names e.g. "HttpGetAttribute" -> "HttpGet"
+                if (attributeName.EndsWith("Attribute", StringComparison.Ordinal))
+                {
+                    attributeName = attributeName.Substring(0, attributeName.Length - "Attribute".Length);
+                }
+
+                var method = editor.SemanticModel.GetDeclaredSymbol(methodNode);
+
+                var attribute = SyntaxFactory.Attribute(
+                    SyntaxFactory.ParseName(attributeName));
+
+                var route = GetRoute(fromRouteAttribute, method);
+                if (!string.IsNullOrEmpty(route))
+                {
+                    attribute = attribute.AddArgumentListArguments(
+                        SyntaxFactory.AttributeArgument(
+                            SyntaxFactory.LiteralExpression(
+                                SyntaxKind.StringLiteralExpression,
+                                SyntaxFactory.Literal(route))));
+                }
+
+                editor.AddAttribute(methodNode, attribute);
+                return editor.GetChangedDocument();
+            }
+        }
+
+        private static string GetRoute(ITypeSymbol fromRouteAttribute, IMethodSymbol method)
+        {
+            StringBuilder routeNameBuilder = null;
+
+            foreach (var parameter in method.Parameters)
+            {
+                if (IsIdParameter(parameter.Name) || parameter.HasAttribute(fromRouteAttribute))
+                {
+                    if (routeNameBuilder == null)
+                    {
+                        routeNameBuilder = new StringBuilder(parameter.Name.Length + 2);
+                    }
+                    else
+                    {
+                        routeNameBuilder.Append("/");
+                    }
+
+                    routeNameBuilder
+                        .Append("{")
+                        .Append(parameter.Name)
+                        .Append("}");
+                }
+            }
+
+            return routeNameBuilder?.ToString();
+        }
+
+        private static bool IsIdParameter(string name)
+        {
+            // Check if the parameter is named "id" (e.g. int id) or ends in Id (e.g. personId)
+            if (name == null || name.Length < 2)
+            {
+                return false;
+            }
+
+            if (string.Equals("id", name, StringComparison.Ordinal))
+            {
+                return true;
+            }
+
+            if (name.Length > 3 && name.EndsWith("Id", StringComparison.Ordinal) && char.IsLower(name[name.Length - 3]))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        private struct RouteAttributeInfo
+        {
+            public RouteAttributeInfo(string name, string type, string[] keywords)
+            {
+                Name = name;
+                Type = type;
+                KeyWords = keywords;
+            }
+
+            public string Name { get; }
+
+            public string Type { get; }
+
+            public string[] KeyWords { get; }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer.cs
new file mode 100644
index 0000000000..67eb82bd2b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer.cs
@@ -0,0 +1,94 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    [DiagnosticAnalyzer(LanguageNames.CSharp)]
+    public class ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer : ApiControllerAnalyzerBase
+    {
+        public ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer()
+            : base(DiagnosticDescriptors.MVC7001_ApiActionsHaveBadModelStateFilter)
+        {
+        }
+
+        protected override void InitializeWorker(ApiControllerAnalyzerContext analyzerContext)
+        {
+            analyzerContext.Context.RegisterSyntaxNodeAction(context =>
+            {
+                var methodSyntax = (MethodDeclarationSyntax)context.Node;
+                if (methodSyntax.Body == null)
+                {
+                    // Ignore expression bodied methods.
+                    return;
+                }
+
+                var method = context.SemanticModel.GetDeclaredSymbol(methodSyntax, context.CancellationToken);
+                if (!analyzerContext.IsApiAction(method))
+                {
+                    return;
+                }
+
+                if (method.ReturnsVoid || method.ReturnType == analyzerContext.SystemThreadingTaskOfT)
+                {
+                    // Void or Task returning methods. We don't have to check anything here since we're specifically
+                    // looking for return BadRequest(..);
+                    return;
+                }
+
+                // Only look for top level statements that look like "if (!ModelState.IsValid)"
+                foreach (var memberAccessSyntax in methodSyntax.Body.DescendantNodes().OfType<MemberAccessExpressionSyntax>())
+                {
+                    var ancestorIfStatement = memberAccessSyntax.FirstAncestorOrSelf<IfStatementSyntax>();
+                    if (ancestorIfStatement == null)
+                    {
+                        // Node's not in an if statement.
+                        continue;
+                    }
+
+                    var symbolInfo = context.SemanticModel.GetSymbolInfo(memberAccessSyntax, context.CancellationToken);
+
+                    if (!(symbolInfo.Symbol is IPropertySymbol property) ||
+                        (property.ContainingType != analyzerContext.ModelStateDictionary) ||
+                        !string.Equals(property.Name, "IsValid", StringComparison.Ordinal) ||
+                        !IsFalseExpression(memberAccessSyntax))
+                    {
+                        continue;
+                    }
+
+                    var containingBlock = (SyntaxNode)ancestorIfStatement;
+                    if (containingBlock.Parent.Kind() == SyntaxKind.ElseClause)
+                    {
+                        containingBlock = containingBlock.Parent;
+                    }
+                    context.ReportDiagnostic(Diagnostic.Create(SupportedDiagnostic, containingBlock.GetLocation()));
+                    return;
+                }
+            }, SyntaxKind.MethodDeclaration);
+        }
+
+        private static bool IsFalseExpression(MemberAccessExpressionSyntax memberAccessSyntax)
+        {
+            switch (memberAccessSyntax.Parent.Kind())
+            {
+                case SyntaxKind.LogicalNotExpression:
+                    // !ModelState.IsValid
+                    return true;
+                case SyntaxKind.EqualsExpression:
+                    var binaryExpression = (BinaryExpressionSyntax)memberAccessSyntax.Parent;
+                    // ModelState.IsValid == false
+                    // false == ModelState.IsValid
+                    return binaryExpression.Left.Kind() == SyntaxKind.FalseLiteralExpression ||
+                        binaryExpression.Right.Kind() == SyntaxKind.FalseLiteralExpression;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProvider.cs
new file mode 100644
index 0000000000..3637c47217
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProvider.cs
@@ -0,0 +1,46 @@
+// 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.
+
+using System.Collections.Immutable;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.Editing;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    [ExportCodeFixProvider(LanguageNames.CSharp)]
+    [Shared]
+    public class ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProvider : CodeFixProvider
+    {
+        public sealed override ImmutableArray<string> FixableDiagnosticIds =>
+            ImmutableArray.Create(DiagnosticDescriptors.MVC7001_ApiActionsHaveBadModelStateFilter.Id);
+
+        public sealed override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;
+
+        public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+        {
+            const string title = "Remove ModelState.IsValid check";
+            var rootNode = await context.Document.GetSyntaxRootAsync(context.CancellationToken).ConfigureAwait(false);
+
+            context.RegisterCodeFix(
+                CodeAction.Create(
+                    title,
+                    createChangedDocument: CreateChangedDocumentAsync,
+                    equivalenceKey: title),
+                context.Diagnostics);
+
+            async Task<Document> CreateChangedDocumentAsync(CancellationToken cancellationToken)
+            {
+                var editor = await DocumentEditor.CreateAsync(context.Document, cancellationToken).ConfigureAwait(false);
+                var node = rootNode.FindNode(context.Span);
+                editor.RemoveNode(node);
+
+                return editor.GetChangedDocument();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsShouldUseActionResultOfTAnalyzer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsShouldUseActionResultOfTAnalyzer.cs
new file mode 100644
index 0000000000..ef00b99527
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsShouldUseActionResultOfTAnalyzer.cs
@@ -0,0 +1,102 @@
+// 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.
+
+using System;
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    [DiagnosticAnalyzer(LanguageNames.CSharp)]
+    public class ApiActionsShouldUseActionResultOfTAnalyzer : ApiControllerAnalyzerBase
+    {
+        public static readonly string ReturnTypeKey = "ReturnType";
+
+        public ApiActionsShouldUseActionResultOfTAnalyzer()
+            : base(DiagnosticDescriptors.MVC7002_ApiActionsShouldReturnActionResultOf)
+        {
+        }
+
+        protected override void InitializeWorker(ApiControllerAnalyzerContext analyzerContext)
+        {
+            analyzerContext.Context.RegisterSyntaxNodeAction(context =>
+            {
+                var methodSyntax = (MethodDeclarationSyntax)context.Node;
+                if (methodSyntax.Body == null)
+                {
+                    // Ignore expression bodied methods.
+                }
+
+                var method = context.SemanticModel.GetDeclaredSymbol(methodSyntax, context.CancellationToken);
+                if (!analyzerContext.IsApiAction(method))
+                {
+                    return;
+                }
+
+                if (method.ReturnsVoid || method.ReturnType.Kind != SymbolKind.NamedType)
+                {
+                    return;
+                }
+
+                var declaredReturnType = method.ReturnType;
+                var namedReturnType = (INamedTypeSymbol)method.ReturnType;
+                var isTaskOActionResult = false;
+                if (namedReturnType.ConstructedFrom?.IsAssignableFrom(analyzerContext.SystemThreadingTaskOfT) ?? false)
+                {
+                    // Unwrap Task<T>.
+                    isTaskOActionResult = true;
+                    declaredReturnType = namedReturnType.TypeArguments[0];
+                }
+
+                if (!declaredReturnType.IsAssignableFrom(analyzerContext.IActionResult))
+                {
+                    // Method signature does not look like IActionResult MyAction or SomeAwaitable<IActionResult>.
+                    // Nothing to do here.
+                    return;
+                }
+
+                // Method returns an IActionResult. Determine if the method block returns an ObjectResult
+                foreach (var returnStatement in methodSyntax.DescendantNodes().OfType<ReturnStatementSyntax>())
+                {
+                    var returnType = context.SemanticModel.GetTypeInfo(returnStatement.Expression, context.CancellationToken);
+                    if (returnType.Type == null || returnType.Type.Kind == SymbolKind.ErrorType)
+                    {
+                        continue;
+                    }
+
+                    ImmutableDictionary<string, string> properties = null;
+                    if (returnType.Type.IsAssignableFrom(analyzerContext.ObjectResult))
+                    {
+                        // Check if the method signature looks like "return Ok(userModelInstance)". If so, we can infer the type of userModelInstance
+                        if (returnStatement.Expression is InvocationExpressionSyntax invocation &&
+                            invocation.ArgumentList.Arguments.Count == 1)
+                        {
+                            var typeInfo = context.SemanticModel.GetTypeInfo(invocation.ArgumentList.Arguments[0].Expression);
+                            var desiredReturnType = analyzerContext.ActionResultOfT.Construct(typeInfo.Type);
+                            if (isTaskOActionResult)
+                            {
+                                desiredReturnType = analyzerContext.SystemThreadingTaskOfT.Construct(desiredReturnType);
+                            }
+
+                            var desiredReturnTypeString = desiredReturnType.ToMinimalDisplayString(
+                                context.SemanticModel,
+                                methodSyntax.ReturnType.SpanStart);
+
+                            properties = ImmutableDictionary.Create<string, string>(StringComparer.Ordinal)
+                                .Add(ReturnTypeKey, desiredReturnTypeString);
+                        }
+
+                        context.ReportDiagnostic(Diagnostic.Create(
+                            SupportedDiagnostic,
+                            methodSyntax.ReturnType.GetLocation(),
+                            properties: properties));
+                    }
+                }
+            }, SyntaxKind.MethodDeclaration);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsShouldUseActionResultOfTCodeFixProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsShouldUseActionResultOfTCodeFixProvider.cs
new file mode 100644
index 0000000000..792b47227b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiActionsShouldUseActionResultOfTCodeFixProvider.cs
@@ -0,0 +1,55 @@
+// 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.
+
+using System.Collections.Immutable;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Editing;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    [ExportCodeFixProvider(LanguageNames.CSharp)]
+    [Shared]
+    public class ApiActionsShouldUseActionResultOfTCodeFixProvider : CodeFixProvider
+    {
+        public sealed override ImmutableArray<string> FixableDiagnosticIds =>
+            ImmutableArray.Create(DiagnosticDescriptors.MVC7002_ApiActionsShouldReturnActionResultOf.Id);
+
+        public sealed override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;
+
+        public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+        {
+            var rootNode = await context.Document.GetSyntaxRootAsync(context.CancellationToken).ConfigureAwait(false);
+
+            foreach (var diagnostic in context.Diagnostics)
+            {
+                if (diagnostic.Properties.TryGetValue("ReturnType", out var returnTypeName))
+                {
+
+                    var title = $"Make return type {returnTypeName}";
+                    context.RegisterCodeFix(
+                        CodeAction.Create(
+                            title,
+                            createChangedDocument: cancellationToken => CreateChangedDocumentAsync(returnTypeName, cancellationToken),
+                            equivalenceKey: title),
+                        context.Diagnostics);
+                }
+            }
+
+            async Task<Document> CreateChangedDocumentAsync(string returnTypeName, CancellationToken cancellationToken)
+            {
+                var returnType = rootNode.FindNode(context.Span);
+
+                var editor = await DocumentEditor.CreateAsync(context.Document, cancellationToken).ConfigureAwait(false);
+                editor.ReplaceNode(returnType, SyntaxFactory.IdentifierName(returnTypeName));
+
+                return editor.GetChangedDocument();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiControllerAnalyzerBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiControllerAnalyzerBase.cs
new file mode 100644
index 0000000000..b70d1409de
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiControllerAnalyzerBase.cs
@@ -0,0 +1,39 @@
+// 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.
+
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    public abstract class ApiControllerAnalyzerBase : DiagnosticAnalyzer
+    {
+        public ApiControllerAnalyzerBase(DiagnosticDescriptor diagnostic)
+        {
+            SupportedDiagnostics = ImmutableArray.Create(diagnostic);
+        }
+
+        protected DiagnosticDescriptor SupportedDiagnostic => SupportedDiagnostics[0];
+
+        public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics { get; }
+
+        public sealed override void Initialize(AnalysisContext context)
+        {
+            context.RegisterCompilationStartAction(compilationContext =>
+            {
+                var analyzerContext = new ApiControllerAnalyzerContext(compilationContext);
+
+                // Only do work if ApiControllerAttribute is defined.
+                if (analyzerContext.ApiControllerAttribute == null)
+                {
+                    return;
+                }
+
+                InitializeWorker(analyzerContext);
+            });
+        }
+
+        protected abstract void InitializeWorker(ApiControllerAnalyzerContext analyzerContext);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiControllerAnalyzerContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiControllerAnalyzerContext.cs
new file mode 100644
index 0000000000..1ab36e3dac
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ApiControllerAnalyzerContext.cs
@@ -0,0 +1,64 @@
+// 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.
+
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    public class ApiControllerAnalyzerContext
+    {
+#pragma warning disable RS1012 // Start action has no registered actions.
+        public ApiControllerAnalyzerContext(CompilationStartAnalysisContext context)
+#pragma warning restore RS1012 // Start action has no registered actions.
+        {
+            Context = context;
+            ApiControllerAttribute = context.Compilation.GetTypeByMetadataName(TypeNames.ApiControllerAttribute);
+        }
+
+        public CompilationStartAnalysisContext Context { get; }
+
+        public INamedTypeSymbol ApiControllerAttribute { get; }
+
+        private INamedTypeSymbol _routeAttribute;
+        public INamedTypeSymbol RouteAttribute => GetType(TypeNames.IRouteTemplateProvider, ref _routeAttribute);
+
+        private INamedTypeSymbol _actionResultOfT;
+        public INamedTypeSymbol ActionResultOfT => GetType(TypeNames.ActionResultOfT, ref _actionResultOfT);
+
+        private INamedTypeSymbol _systemThreadingTask;
+        public INamedTypeSymbol SystemThreadingTask => GetType(TypeNames.Task, ref _systemThreadingTask);
+
+        private INamedTypeSymbol _systemThreadingTaskOfT;
+        public INamedTypeSymbol SystemThreadingTaskOfT => GetType(TypeNames.TaskOfT, ref _systemThreadingTaskOfT);
+
+        private INamedTypeSymbol _objectResult;
+        public INamedTypeSymbol ObjectResult => GetType(TypeNames.ObjectResult, ref _objectResult);
+
+        private INamedTypeSymbol _iActionResult;
+        public INamedTypeSymbol IActionResult => GetType(TypeNames.IActionResult, ref _iActionResult);
+
+        public INamedTypeSymbol _modelState;
+        public INamedTypeSymbol ModelStateDictionary => GetType(TypeNames.ModelStateDictionary, ref _modelState);
+
+        public INamedTypeSymbol _nonActionAttribute;
+        public INamedTypeSymbol NonActionAttribute => GetType(TypeNames.NonActionAttribute, ref _nonActionAttribute);
+
+
+        private INamedTypeSymbol GetType(string name, ref INamedTypeSymbol cache) =>
+            cache = cache ?? Context.Compilation.GetTypeByMetadataName(name);
+
+        public bool IsApiAction(IMethodSymbol method)
+        {
+            return
+                method.ContainingType.HasAttribute(ApiControllerAttribute, inherit: true) &&
+                method.DeclaredAccessibility == Accessibility.Public &&
+                method.MethodKind == MethodKind.Ordinary &&
+                !method.IsGenericMethod &&
+                !method.IsAbstract &&
+                !method.IsStatic &&
+                !method.HasAttribute(NonActionAttribute);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/CodeAnalysisExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/CodeAnalysisExtensions.cs
new file mode 100644
index 0000000000..a8ae5b8a0f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/CodeAnalysisExtensions.cs
@@ -0,0 +1,78 @@
+// 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.
+
+using System.Diagnostics;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    internal static class CodeAnalysisExtensions
+    {
+        public static bool HasAttribute(this ITypeSymbol typeSymbol, ITypeSymbol attribute, bool inherit)
+        {
+            while (typeSymbol != null)
+            {
+                if (typeSymbol.HasAttribute(attribute))
+                {
+                    return true;
+                }
+
+                typeSymbol = typeSymbol.BaseType;
+            }
+
+            return false;
+        }
+
+        public static bool HasAttribute(this ISymbol symbol, ITypeSymbol attribute)
+        {
+            Debug.Assert(symbol != null);
+            Debug.Assert(attribute != null);
+
+            foreach (var declaredAttribute in symbol.GetAttributes())
+            {
+                if (declaredAttribute.AttributeClass == attribute)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public static bool IsAssignableFrom(this ITypeSymbol source, INamedTypeSymbol target)
+        {
+            Debug.Assert(source != null);
+            Debug.Assert(target != null);
+
+            if (source == target)
+            {
+                return true;
+            }
+
+            if (target.TypeKind == TypeKind.Interface)
+            {
+                foreach (var @interface in source.AllInterfaces)
+                {
+                    if (@interface == target)
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+
+            do
+            {
+                if (source == target)
+                {
+                    return true;
+                }
+
+                source = source.BaseType;
+            } while (source != null);
+
+            return false;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ControllerAnalyzerBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ControllerAnalyzerBase.cs
new file mode 100644
index 0000000000..71c497fa29
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ControllerAnalyzerBase.cs
@@ -0,0 +1,39 @@
+// 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.
+
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    public abstract class ControllerAnalyzerBase : DiagnosticAnalyzer
+    {
+        public ControllerAnalyzerBase(DiagnosticDescriptor diagnostic)
+        {
+            SupportedDiagnostics = ImmutableArray.Create(diagnostic);
+        }
+
+        protected DiagnosticDescriptor SupportedDiagnostic => SupportedDiagnostics[0];
+
+        public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics { get; }
+
+        public sealed override void Initialize(AnalysisContext context)
+        {
+            context.RegisterCompilationStartAction(compilationContext =>
+            {
+                var analyzerContext = new ControllerAnalyzerContext(compilationContext);
+
+                // Only do work if ControllerAttribute is defined.
+                if (analyzerContext.ControllerAttribute == null)
+                {
+                    return;
+                }
+
+                InitializeWorker(analyzerContext);
+            });
+        }
+
+        protected abstract void InitializeWorker(ControllerAnalyzerContext analyzerContext);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ControllerAnalyzerContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ControllerAnalyzerContext.cs
new file mode 100644
index 0000000000..8a9d403a8a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/ControllerAnalyzerContext.cs
@@ -0,0 +1,47 @@
+// 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.
+
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    public class ControllerAnalyzerContext
+    {
+#pragma warning disable RS1012 // Start action has no registered actions.
+        public ControllerAnalyzerContext(CompilationStartAnalysisContext context)
+#pragma warning restore RS1012 // Start action has no registered actions.
+        {
+            Context = context;
+            ControllerAttribute = Context.Compilation.GetTypeByMetadataName(TypeNames.ControllerAttribute);
+        }
+
+        public CompilationStartAnalysisContext Context { get; }
+
+        public INamedTypeSymbol ControllerAttribute { get;  }
+
+        private INamedTypeSymbol _systemThreadingTask;
+        public INamedTypeSymbol SystemThreadingTask => GetType(TypeNames.Task, ref _systemThreadingTask);
+
+        private INamedTypeSymbol _systemThreadingTaskOfT;
+        public INamedTypeSymbol SystemThreadingTaskOfT => GetType(TypeNames.TaskOfT, ref _systemThreadingTaskOfT);
+
+        public INamedTypeSymbol _nonActionAttribute;
+        public INamedTypeSymbol NonActionAttribute => GetType(TypeNames.NonActionAttribute, ref _nonActionAttribute);
+
+        private INamedTypeSymbol GetType(string name, ref INamedTypeSymbol cache) =>
+            cache = cache ?? Context.Compilation.GetTypeByMetadataName(name);
+
+        public bool IsControllerAction(IMethodSymbol method)
+        {
+            return
+                method.ContainingType.HasAttribute(ControllerAttribute, inherit: true) &&
+                method.DeclaredAccessibility == Accessibility.Public &&
+                method.MethodKind == MethodKind.Ordinary &&
+                !method.IsGenericMethod &&
+                !method.IsAbstract &&
+                !method.IsStatic &&
+                !method.HasAttribute(NonActionAttribute);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/DiagnosticDescriptors.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/DiagnosticDescriptors.cs
new file mode 100644
index 0000000000..7c8100234c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/DiagnosticDescriptors.cs
@@ -0,0 +1,46 @@
+// 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.
+
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    public static class DiagnosticDescriptors
+    {
+        public static readonly DiagnosticDescriptor MVC7000_ApiActionsMustBeAttributeRouted =
+            new DiagnosticDescriptor(
+                "MVC7000",
+                "Actions on types annotated with ApiControllerAttribute must be attribute routed.",
+                "Actions on types annotated with ApiControllerAttribute must be attribute routed.",
+                "Usage",
+                DiagnosticSeverity.Warning,
+                isEnabledByDefault: true);
+
+        public static readonly DiagnosticDescriptor MVC7001_ApiActionsHaveBadModelStateFilter =
+            new DiagnosticDescriptor(
+                "MVC7001",
+                "Actions on types annotated with ApiControllerAttribute do not require explicit ModelState validity check.",
+                "Actions on types annotated with ApiControllerAttribute do not require explicit ModelState validity check.",
+                "Usage",
+                DiagnosticSeverity.Warning,
+                isEnabledByDefault: true);
+
+        public static readonly DiagnosticDescriptor MVC7002_ApiActionsShouldReturnActionResultOf =
+            new DiagnosticDescriptor(
+                "MVC7002",
+                "Actions on types annotated with ApiControllerAttribute should return ActionResult<T>.",
+                "Actions on types annotated with ApiControllerAttribute should return ActionResult<T>.",
+                "Usage",
+                DiagnosticSeverity.Warning,
+                isEnabledByDefault: true);
+
+        public static readonly DiagnosticDescriptor MVC7003_ActionsMustNotBeAsyncVoid =
+            new DiagnosticDescriptor(
+                "MVC7003",
+                "Controller actions must not have async void signature.",
+                "Controller actions must not have async void signature.",
+                "Usage",
+                DiagnosticSeverity.Warning,
+                isEnabledByDefault: true);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.csproj
new file mode 100644
index 0000000000..62ac6da6a1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>CSharp Analyzers for ASP.NET Core MVC.</Description>
+    <PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
+
+    <VerifyVersion>false</VerifyVersion>
+    <VersionPrefix>$(ExperimentalVersionPrefix)</VersionPrefix>
+    <VersionSuffix>$(ExperimentalVersionSuffix)</VersionSuffix>
+    <PackageVersion>$(ExperimentalPackageVersion)</PackageVersion>
+
+    <TargetFramework>netstandard1.3</TargetFramework>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <EnableApiCheck>false</EnableApiCheck>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="$(OutputPath)$(AssemblyName).dll" Pack="true" PackagePath="analyzers\dotnet\cs\" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/TypeNames.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/TypeNames.cs
new file mode 100644
index 0000000000..810c63a7bd
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/TypeNames.cs
@@ -0,0 +1,38 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    internal static class TypeNames
+    {
+        public const string ControllerAttribute = "Microsoft.AspNetCore.Mvc.ControllerAttribute";
+
+        public const string ApiControllerAttribute = "Microsoft.AspNetCore.Mvc.ApiControllerAttribute";
+
+        public const string NonActionAttribute = "Microsoft.AspNetCore.Mvc.NonActionAttribute";
+
+        public const string IRouteTemplateProvider = "Microsoft.AspNetCore.Mvc.Routing.IRouteTemplateProvider";
+
+        public const string ActionResultOfT = "Microsoft.AspNetCore.Mvc.ActionResult`1";
+
+        public const string Task = "System.Threading.Tasks.Task";
+
+        public const string TaskOfT = "System.Threading.Tasks.Task`1";
+
+        public const string ObjectResult = "Microsoft.AspNetCore.Mvc.ObjectResult";
+
+        public const string IActionResult = "Microsoft.AspNetCore.Mvc.IActionResult";
+
+        public const string ModelStateDictionary = "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary";
+
+        public const string HttpGetAttribute = "Microsoft.AspNetCore.Mvc.HttpGetAttribute";
+
+        public const string HttpPostAttribute = "Microsoft.AspNetCore.Mvc.HttpPostAttribute";
+
+        public const string HttpPutAttribute = "Microsoft.AspNetCore.Mvc.HttpPutAttribute";
+
+        public const string HttpDeleteAttribute = "Microsoft.AspNetCore.Mvc.HttpDeleteAttribute";
+
+        public const string FromRouteAttribute = "Microsoft.AspNetCore.Mvc.FromRouteAttribute";
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/AvoidHtmlPartialAnalyzer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/AvoidHtmlPartialAnalyzer.cs
new file mode 100644
index 0000000000..3563fa525b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/AvoidHtmlPartialAnalyzer.cs
@@ -0,0 +1,54 @@
+// 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.
+
+using System;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    [DiagnosticAnalyzer(LanguageNames.CSharp)]
+    public class AvoidHtmlPartialAnalyzer : ViewFeatureAnalyzerBase
+    {
+        public AvoidHtmlPartialAnalyzer()
+            : base(DiagnosticDescriptors.MVC1000_HtmlHelperPartialShouldBeAvoided)
+        {
+        }
+
+        protected override void InitializeWorker(ViewFeaturesAnalyzerContext analyzerContext)
+        {
+            analyzerContext.Context.RegisterSyntaxNodeAction(context =>
+            {
+                var invocationExpression = (InvocationExpressionSyntax)context.Node;
+                var symbol = context.SemanticModel.GetSymbolInfo(invocationExpression, context.CancellationToken).Symbol;
+                if (symbol == null || symbol.Kind != SymbolKind.Method)
+                {
+                    return;
+                }
+
+                var method = (IMethodSymbol)symbol;
+                if (!analyzerContext.IsHtmlHelperExtensionMethod(method))
+                {
+                    return;
+                }
+
+                if (string.Equals(SymbolNames.PartialMethod, method.Name, StringComparison.Ordinal))
+                {
+                    context.ReportDiagnostic(Diagnostic.Create(
+                        SupportedDiagnostic,
+                        invocationExpression.GetLocation(),
+                        new[] { SymbolNames.PartialMethod }));
+                }
+                else if (string.Equals(SymbolNames.RenderPartialMethod, method.Name, StringComparison.Ordinal))
+                {
+                    context.ReportDiagnostic(Diagnostic.Create(
+                        SupportedDiagnostic,
+                        invocationExpression.GetLocation(),
+                        new[] { SymbolNames.RenderPartialMethod }));
+                }
+            }, SyntaxKind.InvocationExpression);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/DiagnosticDescriptors.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/DiagnosticDescriptors.cs
new file mode 100644
index 0000000000..89465662b4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/DiagnosticDescriptors.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    public static class DiagnosticDescriptors
+    {
+        public static readonly DiagnosticDescriptor MVC1000_HtmlHelperPartialShouldBeAvoided =
+            new DiagnosticDescriptor(
+                "MVC1000",
+                "Use of IHtmlHelper.{0} should be avoided.",
+                "Use of IHtmlHelper.{0} may result in application deadlocks. Consider using <partial> Tag Helper or IHtmlHelper.{0}Async.",
+                "Usage",
+                DiagnosticSeverity.Warning,
+                isEnabledByDefault: true);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj
new file mode 100644
index 0000000000..310c88685a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj
@@ -0,0 +1,42 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>CSharp Analyzers for ASP.NET Core MVC.</Description>
+    <PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
+
+    <TargetFramework>netstandard1.3</TargetFramework>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <EnableApiCheck>false</EnableApiCheck>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
+    <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" PrivateAssets="All" />
+  </ItemGroup>
+
+  <Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="Build">
+
+    <PropertyGroup>
+      <!-- Make sure we create a symbols.nupkg. -->
+      <IncludeSymbols>true</IncludeSymbols>
+
+      <NuspecProperties>
+        id=$(PackageId);
+        version=$(PackageVersion);
+        authors=$(Authors);
+        description=$(Description);
+        tags=$(PackageTags.Replace(';', ' '));
+        licenseUrl=$(PackageLicenseUrl);
+        projectUrl=$(PackageProjectUrl);
+        iconUrl=$(PackageIconUrl);
+        repositoryUrl=$(RepositoryUrl);
+        repositoryCommit=$(RepositoryCommit);
+        copyright=$(Copyright);
+
+        OutputBinary=$(OutputPath)$(AssemblyName).dll;
+        OutputSymbol=$(OutputPath)$(AssemblyName).pdb;
+      </NuspecProperties>
+    </PropertyGroup>
+  </Target>
+
+</Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.nuspec b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.nuspec
new file mode 100644
index 0000000000..5f9d436f73
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.nuspec
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    <id>$id$</id>
+    <version>$version$</version>
+    <authors>$authors$</authors>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <licenseUrl>$licenseUrl$</licenseUrl>
+    <projectUrl>$projectUrl$</projectUrl>
+    <iconUrl>$iconUrl$</iconUrl>
+    <description>$description$</description>
+    <copyright>$copyright$</copyright>
+    <tags>$tags$</tags>
+    <repository type="git" url="$repositoryUrl$" commit="$repositoryCommit$" />
+    <dependencies>
+      <group targetFramework=".NETStandard1.3" />
+    </dependencies>
+  </metadata>
+
+  <files>
+    <file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
+    <file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
+  </files>
+</package>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/SymbolNames.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/SymbolNames.cs
new file mode 100644
index 0000000000..9c49dd24e6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/SymbolNames.cs
@@ -0,0 +1,16 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    internal static class SymbolNames
+    {
+        public const string IHtmlHelperType = "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper";
+
+        public const string HtmlHelperPartialExtensionsType = "Microsoft.AspNetCore.Mvc.Rendering.HtmlHelperPartialExtensions";
+
+        public const string PartialMethod = "Partial";
+
+        public const string RenderPartialMethod = "RenderPartial";
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/ViewFeatureAnalyzerBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/ViewFeatureAnalyzerBase.cs
new file mode 100644
index 0000000000..bade87c8a4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/ViewFeatureAnalyzerBase.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    public abstract class ViewFeatureAnalyzerBase : DiagnosticAnalyzer
+    {
+        public ViewFeatureAnalyzerBase(DiagnosticDescriptor diagnosticDescriptor)
+        {
+            SupportedDiagnostic = diagnosticDescriptor;
+            SupportedDiagnostics = ImmutableArray.Create(new[] { SupportedDiagnostic });
+        }
+
+        protected DiagnosticDescriptor SupportedDiagnostic { get; }
+
+        public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics { get; }
+
+        public sealed override void Initialize(AnalysisContext context)
+        {
+            context.RegisterCompilationStartAction(compilationContext =>
+            {
+                var analyzerContext = new ViewFeaturesAnalyzerContext(compilationContext);
+
+                // Only do work if we can locate IHtmlHelper.
+                if (analyzerContext.HtmlHelperType == null)
+                {
+                    return;
+                }
+
+                InitializeWorker(analyzerContext);
+            });
+        }
+
+        protected abstract void InitializeWorker(ViewFeaturesAnalyzerContext analyzerContext);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/ViewFeaturesAnalyzerContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/ViewFeaturesAnalyzerContext.cs
new file mode 100644
index 0000000000..096132d67f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/ViewFeaturesAnalyzerContext.cs
@@ -0,0 +1,48 @@
+// 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.
+
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    public class ViewFeaturesAnalyzerContext
+    {
+#pragma warning disable RS1012 // Start action has no registered actions.
+        public ViewFeaturesAnalyzerContext(CompilationStartAnalysisContext context)
+#pragma warning restore RS1012 // Start action has no registered actions.
+        {
+            Context = context;
+            HtmlHelperType = GetType(SymbolNames.IHtmlHelperType);
+            HtmlHelperPartialExtensionsType = GetType(SymbolNames.HtmlHelperPartialExtensionsType);
+        }
+
+        public CompilationStartAnalysisContext Context { get; }
+
+        public INamedTypeSymbol HtmlHelperType { get; }
+
+        public INamedTypeSymbol HtmlHelperPartialExtensionsType { get; }
+
+        private INamedTypeSymbol GetType(string name) => Context.Compilation.GetTypeByMetadataName(name);
+
+        public bool IsHtmlHelperExtensionMethod(IMethodSymbol method)
+        {
+            if (!method.IsExtensionMethod)
+            {
+                return false;
+            }
+
+            if (method.ReceiverType != HtmlHelperType)
+            {
+                return false;
+            }
+
+            if (method.ContainingType != HtmlHelperPartialExtensionsType)
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionExtensions.cs
new file mode 100644
index 0000000000..d8c99a8b58
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionExtensions.cs
@@ -0,0 +1,60 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ApiExplorer
+{
+    /// <summary>
+    /// Extension methods for <see cref="ApiDescription"/>.
+    /// </summary>
+    public static class ApiDescriptionExtensions
+    {
+        /// <summary>
+        /// Gets the value of a property from the <see cref="ApiDescription.Properties"/> collection
+        /// using the provided value of <typeparamref name="T"/> as the key.
+        /// </summary>
+        /// <typeparam name="T">The type of the property.</typeparam>
+        /// <param name="apiDescription">The <see cref="ApiDescription"/>.</param>
+        /// <returns>The property or the default value of <typeparamref name="T"/>.</returns>
+        public static T GetProperty<T>(this ApiDescription apiDescription)
+        {
+            if (apiDescription == null)
+            {
+                throw new ArgumentNullException(nameof(apiDescription));
+            }
+
+            object value;
+            if (apiDescription.Properties.TryGetValue(typeof(T), out value))
+            {
+                return (T)value;
+            }
+            else
+            {
+                return default(T);
+            }
+        }
+
+        /// <summary>
+        /// Sets the value of an property in the <see cref="ApiDescription.Properties"/> collection using
+        /// the provided value of <typeparamref name="T"/> as the key.
+        /// </summary>
+        /// <typeparam name="T">The type of the property.</typeparam>
+        /// <param name="apiDescription">The <see cref="ApiDescription"/>.</param>
+        /// <param name="value">The value of the property.</param>
+        public static void SetProperty<T>(this ApiDescription apiDescription, T value)
+        {
+            if (apiDescription == null)
+            {
+                throw new ArgumentNullException(nameof(apiDescription));
+            }
+
+            if (value == null)
+            {
+                throw new ArgumentNullException(nameof(value));
+            }
+
+            apiDescription.Properties[typeof(T)] = value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroup.cs
new file mode 100644
index 0000000000..3a8e35e578
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroup.cs
@@ -0,0 +1,34 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ApiExplorer
+{
+    /// <summary>
+    /// Represents a group of related apis.
+    /// </summary>
+    public class ApiDescriptionGroup
+    {
+        /// <summary>
+        /// Creates a new <see cref="ApiDescriptionGroup"/>.
+        /// </summary>
+        /// <param name="groupName">The group name.</param>
+        /// <param name="items">A collection of <see cref="ApiDescription"/> items for this group.</param>
+        public ApiDescriptionGroup(string groupName, IReadOnlyList<ApiDescription> items)
+        {
+            GroupName = groupName;
+            Items = items;
+        }
+
+        /// <summary>
+        /// The group name.
+        /// </summary>
+        public string GroupName { get; }
+
+        /// <summary>
+        /// A collection of <see cref="ApiDescription"/> items for this group.
+        /// </summary>
+        public IReadOnlyList<ApiDescription> Items { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroupCollection.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroupCollection.cs
new file mode 100644
index 0000000000..b071f1c2c9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroupCollection.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ApiExplorer
+{
+    /// <summary>
+    /// A cached collection of <see cref="ApiDescriptionGroup" />.
+    /// </summary>
+    public class ApiDescriptionGroupCollection
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiDescriptionGroupCollection"/>.
+        /// </summary>
+        /// <param name="items">The list of <see cref="ApiDescriptionGroup"/>.</param>
+        /// <param name="version">The unique version of discovered groups.</param>
+        public ApiDescriptionGroupCollection(IReadOnlyList<ApiDescriptionGroup> items, int version)
+        {
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+
+            Items = items;
+            Version = version;
+        }
+
+        /// <summary>
+        /// Returns the list of <see cref="IReadOnlyList{ApiDescriptionGroup}"/>.
+        /// </summary>
+        public IReadOnlyList<ApiDescriptionGroup> Items { get; }
+
+        /// <summary>
+        /// Returns the unique version of the current items.
+        /// </summary>
+        public int Version { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroupCollectionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroupCollectionProvider.cs
new file mode 100644
index 0000000000..1d7976d5bd
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroupCollectionProvider.cs
@@ -0,0 +1,72 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+
+namespace Microsoft.AspNetCore.Mvc.ApiExplorer
+{
+    /// <inheritdoc />
+    public class ApiDescriptionGroupCollectionProvider : IApiDescriptionGroupCollectionProvider
+    {
+        private readonly IActionDescriptorCollectionProvider _actionDescriptorCollectionProvider;
+        private readonly IApiDescriptionProvider[] _apiDescriptionProviders;
+
+        private ApiDescriptionGroupCollection _apiDescriptionGroups;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="ApiDescriptionGroupCollectionProvider"/>.
+        /// </summary>
+        /// <param name="actionDescriptorCollectionProvider">
+        /// The <see cref="IActionDescriptorCollectionProvider"/>.
+        /// </param>
+        /// <param name="apiDescriptionProviders">
+        /// The <see cref="IEnumerable{IApiDescriptionProvider}"/>.
+        /// </param>
+        public ApiDescriptionGroupCollectionProvider(
+            IActionDescriptorCollectionProvider actionDescriptorCollectionProvider,
+            IEnumerable<IApiDescriptionProvider> apiDescriptionProviders)
+        {
+            _actionDescriptorCollectionProvider = actionDescriptorCollectionProvider;
+            _apiDescriptionProviders = apiDescriptionProviders.OrderBy(item => item.Order).ToArray();
+        }
+
+        /// <inheritdoc />
+        public ApiDescriptionGroupCollection ApiDescriptionGroups
+        {
+            get
+            {
+                var actionDescriptors = _actionDescriptorCollectionProvider.ActionDescriptors;
+                if (_apiDescriptionGroups == null || _apiDescriptionGroups.Version != actionDescriptors.Version)
+                {
+                    _apiDescriptionGroups = GetCollection(actionDescriptors);
+                }
+
+                return _apiDescriptionGroups;
+            }
+        }
+
+        private ApiDescriptionGroupCollection GetCollection(ActionDescriptorCollection actionDescriptors)
+        {
+            var context = new ApiDescriptionProviderContext(actionDescriptors.Items);
+
+            foreach (var provider in _apiDescriptionProviders)
+            {
+                provider.OnProvidersExecuting(context);
+            }
+
+            for (var i = _apiDescriptionProviders.Length - 1; i >= 0; i--)
+            {
+                _apiDescriptionProviders[i].OnProvidersExecuted(context);
+            }
+
+            var groups = context.Results
+                .GroupBy(d => d.GroupName)
+                .Select(g => new ApiDescriptionGroup(g.Key, g.ToArray()))
+                .ToArray();
+
+            return new ApiDescriptionGroupCollection(groups, actionDescriptors.Version);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs
new file mode 100644
index 0000000000..2ed34e730a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs
@@ -0,0 +1,812 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Routing.Template;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.ApiExplorer
+{
+    /// <summary>
+    /// Implements a provider of <see cref="ApiDescription"/> for actions represented
+    /// by <see cref="ControllerActionDescriptor"/>.
+    /// </summary>
+    public class DefaultApiDescriptionProvider : IApiDescriptionProvider
+    {
+        private readonly MvcOptions _mvcOptions;
+        private readonly IActionResultTypeMapper _mapper;
+        private readonly IInlineConstraintResolver _constraintResolver;
+        private readonly IModelMetadataProvider _modelMetadataProvider;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="DefaultApiDescriptionProvider"/>.
+        /// </summary>
+        /// <param name="optionsAccessor">The accessor for <see cref="MvcOptions"/>.</param>
+        /// <param name="constraintResolver">The <see cref="IInlineConstraintResolver"/> used for resolving inline
+        /// constraints.</param>
+        /// <param name="modelMetadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
+        [Obsolete("This constructor is obsolete and will be removed in a future release.")]
+        public DefaultApiDescriptionProvider(
+            IOptions<MvcOptions> optionsAccessor,
+            IInlineConstraintResolver constraintResolver,
+            IModelMetadataProvider modelMetadataProvider)
+        {
+            _mvcOptions = optionsAccessor.Value;
+            _constraintResolver = constraintResolver;
+            _modelMetadataProvider = modelMetadataProvider;
+        }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="DefaultApiDescriptionProvider"/>.
+        /// </summary>
+        /// <param name="optionsAccessor">The accessor for <see cref="MvcOptions"/>.</param>
+        /// <param name="constraintResolver">The <see cref="IInlineConstraintResolver"/> used for resolving inline
+        /// constraints.</param>
+        /// <param name="modelMetadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
+        /// <param name="mapper"> The <see cref="IActionResultTypeMapper"/>.</param>
+        public DefaultApiDescriptionProvider(
+            IOptions<MvcOptions> optionsAccessor,
+            IInlineConstraintResolver constraintResolver,
+            IModelMetadataProvider modelMetadataProvider,
+            IActionResultTypeMapper mapper)
+        {
+            _mvcOptions = optionsAccessor.Value;
+            _constraintResolver = constraintResolver;
+            _modelMetadataProvider = modelMetadataProvider;
+            _mapper = mapper;
+        }
+
+        /// <inheritdoc />
+        public int Order => -1000;
+
+        /// <inheritdoc />
+        public void OnProvidersExecuting(ApiDescriptionProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            foreach (var action in context.Actions.OfType<ControllerActionDescriptor>())
+            {
+                if (action.AttributeRouteInfo != null && action.AttributeRouteInfo.SuppressPathMatching)
+                {
+                    continue;
+                }
+
+                var extensionData = action.GetProperty<ApiDescriptionActionData>();
+                if (extensionData != null)
+                {
+                    var httpMethods = GetHttpMethods(action);
+                    foreach (var httpMethod in httpMethods)
+                    {
+                        context.Results.Add(CreateApiDescription(action, httpMethod, extensionData.GroupName));
+                    }
+                }
+            }
+        }
+
+        public void OnProvidersExecuted(ApiDescriptionProviderContext context)
+        {
+        }
+
+        private ApiDescription CreateApiDescription(
+            ControllerActionDescriptor action,
+            string httpMethod,
+            string groupName)
+        {
+            var parsedTemplate = ParseTemplate(action);
+
+            var apiDescription = new ApiDescription()
+            {
+                ActionDescriptor = action,
+                GroupName = groupName,
+                HttpMethod = httpMethod,
+                RelativePath = GetRelativePath(parsedTemplate),
+            };
+
+            var templateParameters = parsedTemplate?.Parameters?.ToList() ?? new List<TemplatePart>();
+
+            var parameterContext = new ApiParameterContext(_modelMetadataProvider, action, templateParameters);
+
+            foreach (var parameter in GetParameters(parameterContext))
+            {
+                apiDescription.ParameterDescriptions.Add(parameter);
+            }
+
+            var requestMetadataAttributes = GetRequestMetadataAttributes(action);
+            var responseMetadataAttributes = GetResponseMetadataAttributes(action);
+
+            // We only provide response info if we can figure out a type that is a user-data type.
+            // Void /Task object/IActionResult will result in no data.
+            var declaredReturnType = GetDeclaredReturnType(action);
+
+            var runtimeReturnType = GetRuntimeReturnType(declaredReturnType);
+
+            var apiResponseTypes = GetApiResponseTypes(responseMetadataAttributes, runtimeReturnType);
+            foreach (var apiResponseType in apiResponseTypes)
+            {
+                apiDescription.SupportedResponseTypes.Add(apiResponseType);
+            }
+
+            // It would be possible here to configure an action with multiple body parameters, in which case you
+            // could end up with duplicate data.
+            if (apiDescription.ParameterDescriptions.Count > 0)
+            {
+                var contentTypes = GetDeclaredContentTypes(requestMetadataAttributes);
+                foreach (var parameter in apiDescription.ParameterDescriptions)
+                {
+                    if (parameter.Source == BindingSource.Body)
+                    {
+                        // For request body bound parameters, determine the content types supported
+                        // by input formatters.
+                        var requestFormats = GetSupportedFormats(contentTypes, parameter.Type);
+                        foreach (var format in requestFormats)
+                        {
+                            apiDescription.SupportedRequestFormats.Add(format);
+                        }
+                    }
+                    else if (parameter.Source == BindingSource.FormFile)
+                    {
+                        // Add all declared media types since FormFiles do not get processed by formatters.
+                        foreach (var contentType in contentTypes)
+                        {
+                            apiDescription.SupportedRequestFormats.Add(new ApiRequestFormat
+                            {
+                                MediaType = contentType,
+                            });
+                        }
+                    }
+                }
+            }
+
+            return apiDescription;
+        }
+
+        private IList<ApiParameterDescription> GetParameters(ApiParameterContext context)
+        {
+            // First, get parameters from the model-binding/parameter-binding side of the world.
+            if (context.ActionDescriptor.Parameters != null)
+            {
+                foreach (var actionParameter in context.ActionDescriptor.Parameters)
+                {
+                    var visitor = new PseudoModelBindingVisitor(context, actionParameter);
+
+                    ModelMetadata metadata = null;
+                    if (_mvcOptions.AllowValidatingTopLevelNodes &&
+                        actionParameter is ControllerParameterDescriptor controllerParameterDescriptor &&
+                        _modelMetadataProvider is ModelMetadataProvider provider)
+                    {
+                        // The default model metadata provider derives from ModelMetadataProvider
+                        // and can therefore supply information about attributes applied to parameters.
+                        metadata = provider.GetMetadataForParameter(controllerParameterDescriptor.ParameterInfo);
+                    }
+                    else
+                    {
+                        // For backward compatibility, if there's a custom model metadata provider that
+                        // only implements the older IModelMetadataProvider interface, access the more
+                        // limited metadata information it supplies. In this scenario, validation attributes
+                        // are not supported on parameters.
+                        metadata = _modelMetadataProvider.GetMetadataForType(actionParameter.ParameterType);
+                    }
+
+                    var bindingContext = ApiParameterDescriptionContext.GetContext(
+                        metadata,
+                        actionParameter.BindingInfo,
+                        propertyName: actionParameter.Name);
+                    visitor.WalkParameter(bindingContext);
+                }
+            }
+
+            if (context.ActionDescriptor.BoundProperties != null)
+            {
+                foreach (var actionParameter in context.ActionDescriptor.BoundProperties)
+                {
+                    var visitor = new PseudoModelBindingVisitor(context, actionParameter);
+                    var modelMetadata = context.MetadataProvider.GetMetadataForProperty(
+                        containerType: context.ActionDescriptor.ControllerTypeInfo.AsType(),
+                        propertyName: actionParameter.Name);
+
+                    var bindingContext = ApiParameterDescriptionContext.GetContext(
+                        modelMetadata,
+                        actionParameter.BindingInfo,
+                        propertyName: actionParameter.Name);
+
+                    visitor.WalkParameter(bindingContext);
+                }
+            }
+
+            for (var i = context.Results.Count - 1; i >= 0; i--)
+            {
+                // Remove any 'hidden' parameters. These are things that can't come from user input,
+                // so they aren't worth showing.
+                if (!context.Results[i].Source.IsFromRequest)
+                {
+                    context.Results.RemoveAt(i);
+                }
+            }
+
+            // Next, we want to join up any route parameters with those discovered from the action's parameters.
+            var routeParameters = new Dictionary<string, ApiParameterRouteInfo>(StringComparer.OrdinalIgnoreCase);
+            foreach (var routeParameter in context.RouteParameters)
+            {
+                routeParameters.Add(routeParameter.Name, CreateRouteInfo(routeParameter));
+            }
+
+            foreach (var parameter in context.Results)
+            {
+                if (parameter.Source == BindingSource.Path ||
+                    parameter.Source == BindingSource.ModelBinding ||
+                    parameter.Source == BindingSource.Custom)
+                {
+                    if (routeParameters.TryGetValue(parameter.Name, out var routeInfo))
+                    {
+                        parameter.RouteInfo = routeInfo;
+                        routeParameters.Remove(parameter.Name);
+
+                        if (parameter.Source == BindingSource.ModelBinding &&
+                            !parameter.RouteInfo.IsOptional)
+                        {
+                            // If we didn't see any information about the parameter, but we have
+                            // a route parameter that matches, let's switch it to path.
+                            parameter.Source = BindingSource.Path;
+                        }
+                    }
+                }
+            }
+
+            // Lastly, create a parameter representation for each route parameter that did not find
+            // a partner.
+            foreach (var routeParameter in routeParameters)
+            {
+                context.Results.Add(new ApiParameterDescription()
+                {
+                    Name = routeParameter.Key,
+                    RouteInfo = routeParameter.Value,
+                    Source = BindingSource.Path,
+                });
+            }
+
+            return context.Results;
+        }
+
+        private ApiParameterRouteInfo CreateRouteInfo(TemplatePart routeParameter)
+        {
+            var constraints = new List<IRouteConstraint>();
+            if (routeParameter.InlineConstraints != null)
+            {
+                foreach (var constraint in routeParameter.InlineConstraints)
+                {
+                    constraints.Add(_constraintResolver.ResolveConstraint(constraint.Constraint));
+                }
+            }
+
+            return new ApiParameterRouteInfo()
+            {
+                Constraints = constraints,
+                DefaultValue = routeParameter.DefaultValue,
+                IsOptional = routeParameter.IsOptional || routeParameter.DefaultValue != null,
+            };
+        }
+
+        private IEnumerable<string> GetHttpMethods(ControllerActionDescriptor action)
+        {
+            if (action.ActionConstraints != null && action.ActionConstraints.Count > 0)
+            {
+                return action.ActionConstraints.OfType<HttpMethodActionConstraint>().SelectMany(c => c.HttpMethods);
+            }
+            else
+            {
+                return new string[] { null };
+            }
+        }
+
+        private RouteTemplate ParseTemplate(ControllerActionDescriptor action)
+        {
+            if (action.AttributeRouteInfo?.Template != null)
+            {
+                return TemplateParser.Parse(action.AttributeRouteInfo.Template);
+            }
+
+            return null;
+        }
+
+        private string GetRelativePath(RouteTemplate parsedTemplate)
+        {
+            if (parsedTemplate == null)
+            {
+                return null;
+            }
+
+            var segments = new List<string>();
+
+            foreach (var segment in parsedTemplate.Segments)
+            {
+                var currentSegment = string.Empty;
+                foreach (var part in segment.Parts)
+                {
+                    if (part.IsLiteral)
+                    {
+                        currentSegment += part.Text;
+                    }
+                    else if (part.IsParameter)
+                    {
+                        currentSegment += "{" + part.Name + "}";
+                    }
+                }
+
+                segments.Add(currentSegment);
+            }
+
+            return string.Join("/", segments);
+        }
+
+        private IReadOnlyList<ApiRequestFormat> GetSupportedFormats(MediaTypeCollection contentTypes, Type type)
+        {
+            if (contentTypes.Count == 0)
+            {
+                contentTypes = new MediaTypeCollection
+                {
+                    (string)null,
+                };
+            }
+
+            var results = new List<ApiRequestFormat>();
+            foreach (var contentType in contentTypes)
+            {
+                foreach (var formatter in _mvcOptions.InputFormatters)
+                {
+                    if (formatter is IApiRequestFormatMetadataProvider requestFormatMetadataProvider)
+                    {
+                        var supportedTypes = requestFormatMetadataProvider.GetSupportedContentTypes(contentType, type);
+
+                        if (supportedTypes != null)
+                        {
+                            foreach (var supportedType in supportedTypes)
+                            {
+                                results.Add(new ApiRequestFormat()
+                                {
+                                    Formatter = formatter,
+                                    MediaType = supportedType,
+                                });
+                            }
+                        }
+                    }
+                }
+            }
+
+            return results;
+        }
+
+        private static MediaTypeCollection GetDeclaredContentTypes(IApiRequestMetadataProvider[] requestMetadataAttributes)
+        {
+            // Walk through all 'filter' attributes in order, and allow each one to see or override
+            // the results of the previous ones. This is similar to the execution path for content-negotiation.
+            var contentTypes = new MediaTypeCollection();
+            if (requestMetadataAttributes != null)
+            {
+                foreach (var metadataAttribute in requestMetadataAttributes)
+                {
+                    metadataAttribute.SetContentTypes(contentTypes);
+                }
+            }
+
+            return contentTypes;
+        }
+
+        private IReadOnlyList<ApiResponseType> GetApiResponseTypes(
+            IApiResponseMetadataProvider[] responseMetadataAttributes,
+            Type type)
+        {
+            var results = new List<ApiResponseType>();
+
+            // Build list of all possible return types (and status codes) for an action.
+            var objectTypes = new Dictionary<int, Type>();
+
+            // Get the content type that the action explicitly set to support.
+            // Walk through all 'filter' attributes in order, and allow each one to see or override
+            // the results of the previous ones. This is similar to the execution path for content-negotiation.
+            var contentTypes = new MediaTypeCollection();
+            if (responseMetadataAttributes != null)
+            {
+                foreach (var metadataAttribute in responseMetadataAttributes)
+                {
+                    metadataAttribute.SetContentTypes(contentTypes);
+                    if (metadataAttribute.Type == typeof(void) &&
+                        type != null &&
+                        (metadataAttribute.StatusCode == StatusCodes.Status200OK || metadataAttribute.StatusCode == StatusCodes.Status201Created))
+                    {
+                        // ProducesResponseTypeAttribute's constructor defaults to setting "Type" to void when no value is specified.
+                        // In this event, use the action's return type for 200 or 201 status codes. This lets you decorate an action with a
+                        // [ProducesResponseType(201)] instead of [ProducesResponseType(201, typeof(Person)] when typeof(Person) can be inferred
+                        // from the return type.
+                        objectTypes[metadataAttribute.StatusCode] = type;
+                    }
+                    else if (metadataAttribute.Type != null)
+                    {
+                        objectTypes[metadataAttribute.StatusCode] = metadataAttribute.Type;
+                    }
+                }
+            }
+
+            // Set the default status only when no status has already been set explicitly
+            if (objectTypes.Count == 0
+                && type != null)
+            {
+                objectTypes[StatusCodes.Status200OK] = type;
+            }
+
+            if (contentTypes.Count == 0)
+            {
+                contentTypes.Add((string)null);
+            }
+
+            var responseTypeMetadataProviders = _mvcOptions.OutputFormatters.OfType<IApiResponseTypeMetadataProvider>();
+
+            foreach (var objectType in objectTypes)
+            {
+                if (objectType.Value == typeof(void))
+                {
+                    results.Add(new ApiResponseType()
+                    {
+                        StatusCode = objectType.Key,
+                        Type = objectType.Value
+                    });
+
+                    continue;
+                }
+
+                var apiResponseType = new ApiResponseType()
+                {
+                    Type = objectType.Value,
+                    StatusCode = objectType.Key,
+                    ModelMetadata = _modelMetadataProvider.GetMetadataForType(objectType.Value)
+                };
+
+                foreach (var contentType in contentTypes)
+                {
+                    foreach (var responseTypeMetadataProvider in responseTypeMetadataProviders)
+                    {
+                        var formatterSupportedContentTypes = responseTypeMetadataProvider.GetSupportedContentTypes(
+                            contentType,
+                            objectType.Value);
+
+                        if (formatterSupportedContentTypes == null)
+                        {
+                            continue;
+                        }
+
+                        foreach (var formatterSupportedContentType in formatterSupportedContentTypes)
+                        {
+                            apiResponseType.ApiResponseFormats.Add(new ApiResponseFormat()
+                            {
+                                Formatter = (IOutputFormatter)responseTypeMetadataProvider,
+                                MediaType = formatterSupportedContentType,
+                            });
+                        }
+                    }
+                }
+
+                results.Add(apiResponseType);
+            }
+
+            return results;
+        }
+
+        private Type GetDeclaredReturnType(ControllerActionDescriptor action)
+        {
+            var declaredReturnType = action.MethodInfo.ReturnType;
+            if (declaredReturnType == typeof(void) ||
+                declaredReturnType == typeof(Task))
+            {
+                return typeof(void);
+            }
+            
+            // Unwrap the type if it's a Task<T>. The Task (non-generic) case was already handled.
+            Type unwrappedType = declaredReturnType;
+            if (declaredReturnType.IsGenericType && 
+                declaredReturnType.GetGenericTypeDefinition() == typeof(Task<>))
+            {
+                unwrappedType = declaredReturnType.GetGenericArguments()[0];
+            }
+
+            // If the method is declared to return IActionResult or a derived class, that information
+            // isn't valuable to the formatter.
+            if (typeof(IActionResult).IsAssignableFrom(unwrappedType))
+            {
+                return null;
+            }
+
+            // If we get here, the type should be a user-defined data type or an envelope type
+            // like ActionResult<T>. The mapper service will unwrap envelopes.
+            unwrappedType = _mapper.GetResultDataType(unwrappedType);
+            return unwrappedType;
+        }
+
+        private Type GetRuntimeReturnType(Type declaredReturnType)
+        {
+            // If we get here, then a filter didn't give us an answer, so we need to figure out if we
+            // want to use the declared return type.
+            //
+            // We've already excluded Task, void, and IActionResult at this point.
+            //
+            // If the action might return any object, then assume we don't know anything about it.
+            if (declaredReturnType == typeof(object))
+            {
+                return null;
+            }
+
+            return declaredReturnType;
+        }
+
+        private IApiRequestMetadataProvider[] GetRequestMetadataAttributes(ControllerActionDescriptor action)
+        {
+            if (action.FilterDescriptors == null)
+            {
+                return null;
+            }
+
+            // This technique for enumerating filters will intentionally ignore any filter that is an IFilterFactory
+            // while searching for a filter that implements IApiRequestMetadataProvider.
+            //
+            // The workaround for that is to implement the metadata interface on the IFilterFactory.
+            return action.FilterDescriptors
+                .Select(fd => fd.Filter)
+                .OfType<IApiRequestMetadataProvider>()
+                .ToArray();
+        }
+
+        private IApiResponseMetadataProvider[] GetResponseMetadataAttributes(ControllerActionDescriptor action)
+        {
+            if (action.FilterDescriptors == null)
+            {
+                return null;
+            }
+
+            // This technique for enumerating filters will intentionally ignore any filter that is an IFilterFactory
+            // while searching for a filter that implements IApiResponseMetadataProvider.
+            //
+            // The workaround for that is to implement the metadata interface on the IFilterFactory.
+            return action.FilterDescriptors
+                .Select(fd => fd.Filter)
+                .OfType<IApiResponseMetadataProvider>()
+                .ToArray();
+        }
+
+        private class ApiParameterContext
+        {
+            public ApiParameterContext(
+                IModelMetadataProvider metadataProvider,
+                ControllerActionDescriptor actionDescriptor,
+                IReadOnlyList<TemplatePart> routeParameters)
+            {
+                MetadataProvider = metadataProvider;
+                ActionDescriptor = actionDescriptor;
+                RouteParameters = routeParameters;
+
+                Results = new List<ApiParameterDescription>();
+            }
+
+            public ControllerActionDescriptor ActionDescriptor { get; }
+
+            public IModelMetadataProvider MetadataProvider { get; }
+
+            public IList<ApiParameterDescription> Results { get; }
+
+            public IReadOnlyList<TemplatePart> RouteParameters { get; }
+        }
+
+        private class ApiParameterDescriptionContext
+        {
+            public ModelMetadata ModelMetadata { get; set; }
+
+            public string BinderModelName { get; set; }
+
+            public BindingSource BindingSource { get; set; }
+
+            public string PropertyName { get; set; }
+
+            public static ApiParameterDescriptionContext GetContext(
+                ModelMetadata metadata,
+                BindingInfo bindingInfo,
+                string propertyName)
+            {
+                // BindingMetadata can be null if the metadata represents properties.
+                return new ApiParameterDescriptionContext
+                {
+                    ModelMetadata = metadata,
+                    BinderModelName = bindingInfo?.BinderModelName,
+                    BindingSource = bindingInfo?.BindingSource,
+                    PropertyName = propertyName ?? metadata.Name,
+                };
+            }
+        }
+
+        private class PseudoModelBindingVisitor
+        {
+            public PseudoModelBindingVisitor(ApiParameterContext context, ParameterDescriptor parameter)
+            {
+                Context = context;
+                Parameter = parameter;
+
+                Visited = new HashSet<PropertyKey>(new PropertyKeyEqualityComparer());
+            }
+
+            public ApiParameterContext Context { get; }
+
+            public ParameterDescriptor Parameter { get; }
+
+            // Avoid infinite recursion by tracking properties.
+            private HashSet<PropertyKey> Visited { get; }
+
+            public void WalkParameter(ApiParameterDescriptionContext context)
+            {
+                // Attempt to find a binding source for the parameter
+                //
+                // The default is ModelBinding (aka all default value providers)
+                var source = BindingSource.ModelBinding;
+                Visit(context, source, containerName: string.Empty);
+            }
+
+            private void Visit(
+                ApiParameterDescriptionContext bindingContext,
+                BindingSource ambientSource,
+                string containerName)
+            {
+                var source = bindingContext.BindingSource;
+                if (source != null && source.IsGreedy)
+                {
+                    // We have a definite answer for this model. This is a greedy source like
+                    // [FromBody] so there's no need to consider properties.
+                    Context.Results.Add(CreateResult(bindingContext, source, containerName));
+                    return;
+                }
+
+                var modelMetadata = bindingContext.ModelMetadata;
+
+                // For any property which is a leaf node, we don't want to keep traversing:
+                //
+                //  1)  Collections - while it's possible to have binder attributes on the inside of a collection,
+                //      it hardly seems useful, and would result in some very weird binding.
+                //
+                //  2)  Simple Types - These are generally part of the .net framework - primitives, or types which have a
+                //      type converter from string.
+                //
+                //  3)  Types with no properties. Obviously nothing to explore there.
+                //
+                if (modelMetadata.IsEnumerableType ||
+                    !modelMetadata.IsComplexType ||
+                    modelMetadata.Properties.Count == 0)
+                {
+                    Context.Results.Add(CreateResult(bindingContext, source ?? ambientSource, containerName));
+                    return;
+                }
+
+                // This will come from composite model binding - so investigate what's going on with each property.
+                //
+                // Ex:
+                //
+                //      public IActionResult PlaceOrder(OrderDTO order) {...}
+                //
+                //      public class OrderDTO
+                //      {
+                //          public int AccountId { get; set; }
+                //
+                //          [FromBody]
+                //          public Order { get; set; }
+                //      }
+                //
+                // This should result in two parameters:
+                //
+                //  AccountId - source: Any
+                //  Order - source: Body
+                //
+
+                // We don't want to append the **parameter** name when building a model name.
+                var newContainerName = containerName;
+                if (modelMetadata.ContainerType != null)
+                {
+                    newContainerName = GetName(containerName, bindingContext);
+                }
+
+                for (var i = 0; i < modelMetadata.Properties.Count; i++)
+                {
+                    var propertyMetadata = modelMetadata.Properties[i];
+                    var key = new PropertyKey(propertyMetadata, source);
+                    var bindingInfo = BindingInfo.GetBindingInfo(Enumerable.Empty<object>(), propertyMetadata);
+
+                    var propertyContext = ApiParameterDescriptionContext.GetContext(
+                        propertyMetadata,
+                        bindingInfo: bindingInfo,
+                        propertyName: null);
+
+                    if (Visited.Add(key))
+                    {
+                        Visit(propertyContext, source ?? ambientSource, newContainerName);
+                    }
+                    else
+                    {
+                        // This is cycle, so just add a result rather than traversing.
+                        Context.Results.Add(CreateResult(propertyContext, source ?? ambientSource, newContainerName));
+                    }
+                }
+            }
+
+            private ApiParameterDescription CreateResult(
+                ApiParameterDescriptionContext bindingContext,
+                BindingSource source,
+                string containerName)
+            {
+                return new ApiParameterDescription()
+                {
+                    ModelMetadata = bindingContext.ModelMetadata,
+                    Name = GetName(containerName, bindingContext),
+                    Source = source,
+                    Type = bindingContext.ModelMetadata.ModelType,
+                    ParameterDescriptor = Parameter,
+                };
+            }
+
+            private static string GetName(string containerName, ApiParameterDescriptionContext metadata)
+            {
+                if (!string.IsNullOrEmpty(metadata.BinderModelName))
+                {
+                    // Name was explicitly provided
+                    return metadata.BinderModelName;
+                }
+                else
+                {
+                    return ModelNames.CreatePropertyModelName(containerName, metadata.PropertyName);
+                }
+            }
+
+            private struct PropertyKey
+            {
+                public readonly Type ContainerType;
+
+                public readonly string PropertyName;
+
+                public readonly BindingSource Source;
+
+                public PropertyKey(ModelMetadata metadata, BindingSource source)
+                {
+                    ContainerType = metadata.ContainerType;
+                    PropertyName = metadata.PropertyName;
+                    Source = source;
+                }
+            }
+
+            private class PropertyKeyEqualityComparer : IEqualityComparer<PropertyKey>
+            {
+                public bool Equals(PropertyKey x, PropertyKey y)
+                {
+                    return
+                        x.ContainerType == y.ContainerType &&
+                        x.PropertyName == y.PropertyName &&
+                        x.Source == y.Source;
+                }
+
+                public int GetHashCode(PropertyKey obj)
+                {
+                    var hashCodeCombiner = HashCodeCombiner.Start();
+                    hashCodeCombiner.Add(obj.ContainerType);
+                    hashCodeCombiner.Add(obj.PropertyName);
+                    hashCodeCombiner.Add(obj.Source);
+                    return hashCodeCombiner.CombinedHash;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DependencyInjection/MvcApiExplorerMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DependencyInjection/MvcApiExplorerMvcCoreBuilderExtensions.cs
new file mode 100644
index 0000000000..0d3b74c378
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DependencyInjection/MvcApiExplorerMvcCoreBuilderExtensions.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public static class MvcApiExplorerMvcCoreBuilderExtensions
+    {
+        public static IMvcCoreBuilder AddApiExplorer(this IMvcCoreBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            AddApiExplorerServices(builder.Services);
+            return builder;
+        }
+
+        // Internal for testing.
+        internal static void AddApiExplorerServices(IServiceCollection services)
+        {
+            services.TryAddSingleton<IApiDescriptionGroupCollectionProvider, ApiDescriptionGroupCollectionProvider>();
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IApiDescriptionProvider, DefaultApiDescriptionProvider>());
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/IApiDescriptionGroupCollectionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/IApiDescriptionGroupCollectionProvider.cs
new file mode 100644
index 0000000000..5227a62cbe
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/IApiDescriptionGroupCollectionProvider.cs
@@ -0,0 +1,16 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ApiExplorer
+{
+    /// <summary>
+    /// Provides access to a collection of <see cref="ApiDescriptionGroup"/>.
+    /// </summary>
+    public interface IApiDescriptionGroupCollectionProvider
+    {
+        /// <summary>
+        /// Gets a collection of <see cref="ApiDescriptionGroup"/>.
+        /// </summary>
+        ApiDescriptionGroupCollection ApiDescriptionGroups { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj
new file mode 100644
index 0000000000..9ea5be90f4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ASP.NET Core MVC API explorer functionality for discovering metadata such as the list of controllers and actions, and their URLs and allowed HTTP methods.</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj" />
+
+    <PackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsPropertyHelperSourcesPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..40008c2f22
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Properties/AssemblyInfo.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using System.Runtime.CompilerServices;
+
+[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider))]
+[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription))]
+[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext))]
+[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterDescription))]
+[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterRouteInfo))]
+[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiRequestFormat))]
+[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseFormat))]
+[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseType))]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ApiExplorer.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/baseline.netcore.json
new file mode 100644
index 0000000000..798fc429d3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/baseline.netcore.json
@@ -0,0 +1,993 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc.ApiExplorer, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetProperty<T0>",
+          "Parameters": [
+            {
+              "Name": "apiDescription",
+              "Type": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription"
+            }
+          ],
+          "ReturnType": "T0",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetProperty<T0>",
+          "Parameters": [
+            {
+              "Name": "apiDescription",
+              "Type": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription"
+            },
+            {
+              "Name": "value",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroup",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_GroupName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Items",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "groupName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "items",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroupCollection",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Items",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroup>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Version",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "items",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroup>"
+            },
+            {
+              "Name": "version",
+              "Type": "System.Int32"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroupCollectionProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionGroupCollectionProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ApiDescriptionGroups",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroupCollection",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionGroupCollectionProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionDescriptorCollectionProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider"
+            },
+            {
+              "Name": "apiDescriptionProviders",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.DefaultApiDescriptionProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "optionsAccessor",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcOptions>"
+            },
+            {
+              "Name": "constraintResolver",
+              "Type": "Microsoft.AspNetCore.Routing.IInlineConstraintResolver"
+            },
+            {
+              "Name": "modelMetadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "optionsAccessor",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcOptions>"
+            },
+            {
+              "Name": "constraintResolver",
+              "Type": "Microsoft.AspNetCore.Routing.IInlineConstraintResolver"
+            },
+            {
+              "Name": "modelMetadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "mapper",
+              "Type": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionGroupCollectionProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ApiDescriptionGroups",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroupCollection",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.MvcApiExplorerMvcCoreBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddApiExplorer",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionDescriptor",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ActionDescriptor",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_GroupName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_GroupName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HttpMethod",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HttpMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParameterDescriptions",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterDescription>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.Object, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RelativePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RelativePath",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SupportedRequestFormats",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiRequestFormat>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SupportedResponseTypes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseType>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Actions",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Results",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actions",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterDescription",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ModelMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ModelMetadata",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteInfo",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterRouteInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RouteInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterRouteInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Source",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Source",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Type",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Type",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParameterDescriptor",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ParameterDescriptor",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterRouteInfo",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Constraints",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Routing.IRouteConstraint>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Constraints",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Routing.IRouteConstraint>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DefaultValue",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DefaultValue",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsOptional",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsOptional",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiRequestFormat",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Formatter",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.IInputFormatter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Formatter",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.IInputFormatter"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MediaType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MediaType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseFormat",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Formatter",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Formatter",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MediaType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MediaType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseType",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ApiResponseFormats",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseFormat>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ApiResponseFormats",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseFormat>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ModelMetadata",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Type",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Type",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_StatusCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_StatusCode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsDefaultResponse",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsDefaultResponse",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptVerbsAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptVerbsAttribute.cs
new file mode 100644
index 0000000000..3c889c2320
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptVerbsAttribute.cs
@@ -0,0 +1,72 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Specifies what HTTP methods an action supports.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
+    public sealed class AcceptVerbsAttribute : Attribute, IActionHttpMethodProvider, IRouteTemplateProvider
+    {
+        private int? _order;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AcceptVerbsAttribute" /> class.
+        /// </summary>
+        /// <param name="method">The HTTP method the action supports.</param>
+        public AcceptVerbsAttribute(string method)
+            : this(new [] { method })
+        {
+            if (method == null)
+            {
+                throw new ArgumentNullException(nameof(method));
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AcceptVerbsAttribute" /> class.
+        /// </summary>
+        /// <param name="methods">The HTTP methods the action supports.</param>
+        public AcceptVerbsAttribute(params string[] methods)
+        {
+            HttpMethods = methods.Select(method => method.ToUpperInvariant());
+        }
+
+        /// <summary>
+        /// Gets the HTTP methods the action supports.
+        /// </summary>
+        public IEnumerable<string> HttpMethods { get; }
+
+        /// <summary>
+        /// The route template. May be null.
+        /// </summary>
+        public string Route { get; set; }
+
+        /// <inheritdoc />
+        string IRouteTemplateProvider.Template => Route;
+
+        /// <summary>
+        /// Gets the route order. The order determines the order of route execution. Routes with a lower
+        /// order value are tried first. When a route doesn't specify a value, it gets the value of the
+        /// <see cref="RouteAttribute.Order"/> or a default value of 0 if the <see cref="RouteAttribute"/>
+        /// doesn't define a value on the controller.
+        /// </summary>
+        public int Order
+        {
+            get { return _order ?? 0; }
+            set { _order = value; }
+        }
+
+        /// <inheritdoc />
+        int? IRouteTemplateProvider.Order => _order;
+
+        /// <inheritdoc />
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptedAtActionResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptedAtActionResult.cs
new file mode 100644
index 0000000000..dd0480c39e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptedAtActionResult.cs
@@ -0,0 +1,94 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="ActionResult"/> that returns a Accepted (202) response with a Location header.
+    /// </summary>
+    public class AcceptedAtActionResult : ObjectResult
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AcceptedAtActionResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="actionName">The name of the action to use for generating the URL.</param>
+        /// <param name="controllerName">The name of the controller to use for generating the URL.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="value">The value to format in the entity body.</param>
+        public AcceptedAtActionResult(
+            string actionName,
+            string controllerName,
+            object routeValues,
+            object value)
+            : base(value)
+        {
+            ActionName = actionName;
+            ControllerName = controllerName;
+            RouteValues = routeValues == null ? null : new RouteValueDictionary(routeValues);
+            StatusCode = StatusCodes.Status202Accepted;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IUrlHelper" /> used to generate URLs.
+        /// </summary>
+        public IUrlHelper UrlHelper { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the action to use for generating the URL.
+        /// </summary>
+        public string ActionName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the controller to use for generating the URL.
+        /// </summary>
+        public string ControllerName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the route data to use for generating the URL.
+        /// </summary>
+        public RouteValueDictionary RouteValues { get; set; }
+
+        /// <inheritdoc />
+        public override void OnFormatting(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            base.OnFormatting(context);
+
+            var request = context.HttpContext.Request;
+
+            var urlHelper = UrlHelper;
+            if (urlHelper == null)
+            {
+                var services = context.HttpContext.RequestServices;
+                urlHelper = services.GetRequiredService<IUrlHelperFactory>().GetUrlHelper(context);
+            }
+
+            var url = urlHelper.Action(
+                ActionName,
+                ControllerName,
+                RouteValues,
+                request.Scheme,
+                request.Host.ToUriComponent());
+
+            if (string.IsNullOrEmpty(url))
+            {
+                throw new InvalidOperationException(Resources.NoRoutesMatched);
+            }
+
+            context.HttpContext.Response.Headers[HeaderNames.Location] = url;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptedAtRouteResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptedAtRouteResult.cs
new file mode 100644
index 0000000000..bfde81d3ae
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptedAtRouteResult.cs
@@ -0,0 +1,90 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="ActionResult"/> that returns a Accepted (202) response with a Location header.
+    /// </summary>
+    public class AcceptedAtRouteResult : ObjectResult
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AcceptedAtRouteResult"/> class with the values
+        /// provided.
+        /// </summary>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="value">The value to format in the entity body.</param>
+        public AcceptedAtRouteResult(object routeValues, object value)
+            : this(routeName: null, routeValues: routeValues, value: value)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AcceptedAtRouteResult"/> class with the values
+        /// provided.
+        /// </summary>
+        /// <param name="routeName">The name of the route to use for generating the URL.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="value">The value to format in the entity body.</param>
+        public AcceptedAtRouteResult(
+            string routeName,
+            object routeValues,
+            object value)
+            : base(value)
+        {
+            RouteName = routeName;
+            RouteValues = routeValues == null ? null : new RouteValueDictionary(routeValues);
+            StatusCode = StatusCodes.Status202Accepted;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IUrlHelper" /> used to generate URLs.
+        /// </summary>
+        public IUrlHelper UrlHelper { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the route to use for generating the URL.
+        /// </summary>
+        public string RouteName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the route data to use for generating the URL.
+        /// </summary>
+        public RouteValueDictionary RouteValues { get; set; }
+
+        /// <inheritdoc />
+        public override void OnFormatting(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            base.OnFormatting(context);
+
+            var urlHelper = UrlHelper;
+            if (urlHelper == null)
+            {
+                var services = context.HttpContext.RequestServices;
+                urlHelper = services.GetRequiredService<IUrlHelperFactory>().GetUrlHelper(context);
+            }
+
+            var url = urlHelper.Link(RouteName, RouteValues);
+
+            if (string.IsNullOrEmpty(url))
+            {
+                throw new InvalidOperationException(Resources.NoRoutesMatched);
+            }
+
+            context.HttpContext.Response.Headers[HeaderNames.Location] = url;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptedResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptedResult.cs
new file mode 100644
index 0000000000..30b33a4fc5
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptedResult.cs
@@ -0,0 +1,86 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="ActionResult"/> that returns an Accepted (202) response with a Location header.
+    /// </summary>
+    public class AcceptedResult : ObjectResult
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AcceptedResult"/> class with the values
+        /// provided.
+        /// </summary>      
+        public AcceptedResult()
+            : base(value: null)
+        {
+            StatusCode = StatusCodes.Status202Accepted;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AcceptedResult"/> class with the values
+        /// provided.
+        /// </summary>
+        /// <param name="location">The location at which the status of requested content can be monitored.</param>
+        /// <param name="value">The value to format in the entity body.</param>
+        public AcceptedResult(string location, object value)
+            : base(value)
+        {
+            Location = location;
+            StatusCode = StatusCodes.Status202Accepted;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AcceptedResult"/> class with the values
+        /// provided.
+        /// </summary>
+        /// <param name="locationUri">The location at which the status of requested content can be monitored
+        /// It is an optional parameter and may be null</param>
+        /// <param name="value">The value to format in the entity body.</param>
+        public AcceptedResult(Uri locationUri, object value)
+            : base(value)
+        {
+            if (locationUri == null)
+            {
+                throw new ArgumentNullException(nameof(locationUri));
+            }
+
+            if (locationUri.IsAbsoluteUri)
+            {
+                Location = locationUri.AbsoluteUri;
+            }
+            else
+            {
+                Location = locationUri.GetComponents(UriComponents.SerializationInfoString, UriFormat.UriEscaped);
+            }
+
+            StatusCode = StatusCodes.Status202Accepted;
+        }
+
+        /// <summary>
+        /// Gets or sets the location at which the status of the requested content can be monitored.
+        /// </summary>
+        public string Location { get; set; }
+
+        /// <inheritdoc />
+        public override void OnFormatting(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            base.OnFormatting(context);
+
+            if (!string.IsNullOrEmpty(Location))
+            {
+                context.HttpContext.Response.Headers[HeaderNames.Location] = Location;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/ActionMethodSelectorAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/ActionMethodSelectorAttribute.cs
new file mode 100644
index 0000000000..6cf3d35952
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/ActionMethodSelectorAttribute.cs
@@ -0,0 +1,37 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Routing;
+
+namespace Microsoft.AspNetCore.Mvc.ActionConstraints
+{
+    /// <summary>
+    /// Base class for attributes which can implement conditional logic to enable or disable an action
+    /// for a given request. See <see cref="IActionConstraint"/>.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public abstract class ActionMethodSelectorAttribute : Attribute, IActionConstraint
+    {
+        /// <inheritdoc />
+        public int Order { get; set; }
+
+        /// <inheritdoc />
+        public bool Accept(ActionConstraintContext context)
+        {
+            return IsValidForRequest(context.RouteContext, context.CurrentCandidate.Action);
+        }
+
+        /// <summary>
+        /// Determines whether the action selection is valid for the specified route context.
+        /// </summary>
+        /// <param name="routeContext">The route context.</param>
+        /// <param name="action">Information about the action.</param>
+        /// <returns>
+        /// <see langword="true"/> if the action  selection is valid for the specified context;
+        /// otherwise, <see langword="false"/>.
+        /// </returns>
+        public abstract bool IsValidForRequest(RouteContext routeContext, ActionDescriptor action);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionContextAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionContextAttribute.cs
new file mode 100644
index 0000000000..2923ae399b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionContextAttribute.cs
@@ -0,0 +1,17 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Specifies that a controller property should be set with the current
+    /// <see cref="ActionContext"/> when creating the controller. The property must have a public
+    /// set method.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
+    public class ActionContextAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionNameAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionNameAttribute.cs
new file mode 100644
index 0000000000..78a374b517
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionNameAttribute.cs
@@ -0,0 +1,28 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Specifies the name of an action.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public sealed class ActionNameAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new <see cref="ActionNameAttribute"/> instance.
+        /// </summary>
+        /// <param name="name">The name of the action.</param>
+        public ActionNameAttribute(string name)
+        {
+            Name = name;
+        }
+
+        /// <summary>
+        /// Gets the name of the action.
+        /// </summary>
+        public string Name { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionResult.cs
new file mode 100644
index 0000000000..413d47aab6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionResult.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A default implementation of <see cref="IActionResult"/>.
+    /// </summary>
+    public abstract class ActionResult : IActionResult
+    {
+        /// <summary>
+        /// Executes the result operation of the action method asynchronously. This method is called by MVC to process
+        /// the result of an action method.
+        /// The default implementation of this method calls the <see cref="ExecuteResult(ActionContext)"/> method and
+        /// returns a completed task.
+        /// </summary>
+        /// <param name="context">The context in which the result is executed. The context information includes
+        /// information about the action that was executed and request information.</param>
+        /// <returns>A task that represents the asynchronous execute operation.</returns>
+        public virtual Task ExecuteResultAsync(ActionContext context)
+        {
+            ExecuteResult(context);
+            return Task.CompletedTask;
+        }
+
+        /// <summary>
+        /// Executes the result operation of the action method synchronously. This method is called by MVC to process
+        /// the result of an action method.
+        /// </summary>
+        /// <param name="context">The context in which the result is executed. The context information includes
+        /// information about the action that was executed and request information.</param>
+        public virtual void ExecuteResult(ActionContext context)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionResultOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionResultOfT.cs
new file mode 100644
index 0000000000..f443d78805
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionResultOfT.cs
@@ -0,0 +1,61 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A type that wraps either an <typeparamref name="TValue"/> instance or an <see cref="ActionResult"/>.
+    /// </summary>
+    /// <typeparam name="TValue">The type of the result.</typeparam>
+    public sealed class ActionResult<TValue> : IConvertToActionResult
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="ActionResult{TValue}"/> using the specified <paramref name="value"/>.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public ActionResult(TValue value)
+        {
+            Value = value;
+        }
+
+        /// <summary>
+        /// Intializes a new instance of <see cref="ActionResult{TValue}"/> using the specified <see cref="ActionResult"/>.
+        /// </summary>
+        /// <param name="result">The <see cref="ActionResult"/>.</param>
+        public ActionResult(ActionResult result)
+        {
+            Result = result ?? throw new ArgumentNullException(nameof(result));
+        }
+
+        /// <summary>
+        /// Gets the <see cref="ActionResult"/>.
+        /// </summary>
+        public ActionResult Result { get; }
+
+        /// <summary>
+        /// Gets the value.
+        /// </summary>
+        public TValue Value { get; }
+
+        public static implicit operator ActionResult<TValue>(TValue value)
+        {
+            return new ActionResult<TValue>(value);
+        }
+
+        public static implicit operator ActionResult<TValue>(ActionResult result)
+        {
+            return new ActionResult<TValue>(result);
+        }
+
+        IActionResult IConvertToActionResult.Convert()
+        {
+            return Result ?? new ObjectResult(Value)
+            {
+                DeclaredType = typeof(TValue),
+            };
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiBehaviorOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiBehaviorOptions.cs
new file mode 100644
index 0000000000..e955f25768
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiBehaviorOptions.cs
@@ -0,0 +1,56 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Options used to configure behavior for types annotated with <see cref="ApiControllerAttribute"/>.
+    /// </summary>
+    public class ApiBehaviorOptions
+    {
+        private Func<ActionContext, IActionResult> _invalidModelStateResponseFactory;
+
+        /// <summary>
+        /// Delegate invoked on actions annotated with <see cref="ApiControllerAttribute"/> to convert invalid
+        /// <see cref="ModelStateDictionary"/> into an <see cref="IActionResult"/>
+        /// <para>
+        /// By default, the delegate produces a <see cref="BadRequestObjectResult"/> that wraps a serialized form
+        /// of <see cref="ModelStateDictionary"/>.
+        /// </para>
+        /// </summary>
+        public Func<ActionContext, IActionResult> InvalidModelStateResponseFactory
+        {
+            get => _invalidModelStateResponseFactory;
+            set => _invalidModelStateResponseFactory = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        /// <summary>
+        /// Gets or sets a value that determines if the filter that returns an <see cref="BadRequestObjectResult"/> when
+        /// <see cref="ActionContext.ModelState"/> is invalid is suppressed. <seealso cref="InvalidModelStateResponseFactory"/>.
+        /// </summary>
+        public bool SuppressModelStateInvalidFilter { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value that determines if model binding sources are inferred for action parameters on controllers annotated
+        /// with <see cref="ApiControllerAttribute"/> is suppressed.
+        /// <para>
+        /// When enabled, the following sources are inferred:
+        /// Parameters that appear as route values, are assumed to be bound from the path (<see cref="BindingSource.Path"/>).
+        /// Parameters of type <see cref="IFormFile"/> and <see cref="IFormFileCollection"/> are assumed to be bound from form.
+        /// Parameters that are complex (<see cref="ModelMetadata.IsComplexType"/>) are assumed to be bound from the body (<see cref="BindingSource.Body"/>).
+        /// All other parameters are assumed to be bound from the query.
+        /// </para>
+        /// </summary>
+        public bool SuppressInferBindingSourcesForParameters { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value that determines if an <c>multipart/form-data</c> consumes action constraint is added to parameters
+        /// that are bound from form data.
+        /// </summary>
+        public bool SuppressConsumesConstraintForFormFileParameters { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiControllerAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiControllerAttribute.cs
new file mode 100644
index 0000000000..0f1f1627bf
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiControllerAttribute.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Internal;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Indicates that a type and all derived types are used to serve HTTP API responses. The presence of
+    /// this attribute can be used to target conventions, filters and other behaviors based on the purpose
+    /// of the controller.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+    public class ApiControllerAttribute : ControllerAttribute, IApiBehaviorMetadata
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDescriptionGroupNameProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDescriptionGroupNameProvider.cs
new file mode 100644
index 0000000000..f9839c80e7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDescriptionGroupNameProvider.cs
@@ -0,0 +1,16 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ApiExplorer
+{
+    /// <summary>
+    /// Represents group name metadata for an <c>ApiDescription</c>.
+    /// </summary>
+    public interface IApiDescriptionGroupNameProvider
+    {
+        /// <summary>
+        /// The group name for the <c>ApiDescription</c> of the associated action or controller.
+        /// </summary>
+        string GroupName { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDescriptionVisibilityProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDescriptionVisibilityProvider.cs
new file mode 100644
index 0000000000..439c132c61
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDescriptionVisibilityProvider.cs
@@ -0,0 +1,17 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ApiExplorer
+{
+    /// <summary>
+    /// Represents visibility metadata for an <c>ApiDescription</c>.
+    /// </summary>
+    public interface IApiDescriptionVisibilityProvider
+    {
+        /// <summary>
+        /// If <c>false</c> then no <c>ApiDescription</c> objects will be created for the associated controller
+        /// or action.
+        /// </summary>
+        bool IgnoreApi { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiRequestFormatMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiRequestFormatMetadataProvider.cs
new file mode 100644
index 0000000000..bf83aad0a8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiRequestFormatMetadataProvider.cs
@@ -0,0 +1,34 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ApiExplorer
+{
+    /// <summary>
+    /// Provides metadata information about the request format to an <c>IApiDescriptionProvider</c>.
+    /// </summary>
+    /// <remarks>
+    /// An <see cref="Formatters.IInputFormatter"/> should implement this interface to expose metadata information
+    /// to an <c>IApiDescriptionProvider</c>.
+    /// </remarks>
+    public interface IApiRequestFormatMetadataProvider
+    {
+        /// <summary>
+        /// Gets a filtered list of content types which are supported by the <see cref="Formatters.IInputFormatter"/>
+        /// for the <paramref name="objectType"/> and <paramref name="contentType"/>.
+        /// </summary>
+        /// <param name="contentType">
+        /// The content type for which the supported content types are desired, or <c>null</c> if any content
+        /// type can be used.
+        /// </param>
+        /// <param name="objectType">
+        /// The <see cref="Type"/> for which the supported content types are desired.
+        /// </param>
+        /// <returns>Content types which are supported by the <see cref="Formatters.IInputFormatter"/>.</returns>
+        IReadOnlyList<string> GetSupportedContentTypes(
+            string contentType,
+            Type objectType);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiRequestMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiRequestMetadataProvider.cs
new file mode 100644
index 0000000000..e24ca509f4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiRequestMetadataProvider.cs
@@ -0,0 +1,20 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Formatters;
+
+namespace Microsoft.AspNetCore.Mvc.ApiExplorer
+{
+    /// <summary>
+    /// Provides a set of possible content types than can be consumed by the action.
+    /// </summary>
+    public interface IApiRequestMetadataProvider : IFilterMetadata
+    {
+        /// <summary>
+        /// Configures a collection of allowed content types which can be consumed by the action.
+        /// </summary>
+        /// <param name="contentTypes">The <see cref="MediaTypeCollection"/></param>
+        void SetContentTypes(MediaTypeCollection contentTypes);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiResponseMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiResponseMetadataProvider.cs
new file mode 100644
index 0000000000..24b4aece4e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiResponseMetadataProvider.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Formatters;
+
+namespace Microsoft.AspNetCore.Mvc.ApiExplorer
+{
+    /// <summary>
+    /// Provides a return type, status code and a set of possible content types returned by a
+    /// successful execution of the action.
+    /// </summary>
+    public interface IApiResponseMetadataProvider : IFilterMetadata
+    {
+        /// <summary>
+        /// Gets the optimistic return type of the action.
+        /// </summary>
+        Type Type { get; }
+
+        /// <summary>
+        /// Gets the HTTP status code of the response.
+        /// </summary>
+        int StatusCode { get; }
+
+        /// <summary>
+        /// Configures a collection of allowed content types which can be produced by the action.
+        /// </summary>
+        void SetContentTypes(MediaTypeCollection contentTypes);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiResponseTypeMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiResponseTypeMetadataProvider.cs
new file mode 100644
index 0000000000..8b15eb0989
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiResponseTypeMetadataProvider.cs
@@ -0,0 +1,34 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ApiExplorer
+{
+    /// <summary>
+    /// Provides metadata information about the response format to an <c>IApiDescriptionProvider</c>.
+    /// </summary>
+    /// <remarks>
+    /// An <see cref="Formatters.IOutputFormatter"/> should implement this interface to expose metadata information
+    /// to an <c>IApiDescriptionProvider</c>.
+    /// </remarks>
+    public interface IApiResponseTypeMetadataProvider
+    {
+        /// <summary>
+        /// Gets a filtered list of content types which are supported by the <see cref="Formatters.IOutputFormatter"/>
+        /// for the <paramref name="objectType"/> and <paramref name="contentType"/>.
+        /// </summary>
+        /// <param name="contentType">
+        /// The content type for which the supported content types are desired, or <c>null</c> if any content
+        /// type can be used.
+        /// </param>
+        /// <param name="objectType">
+        /// The <see cref="Type"/> for which the supported content types are desired.
+        /// </param>
+        /// <returns>Content types which are supported by the <see cref="Formatters.IOutputFormatter"/>.</returns>
+        IReadOnlyList<string> GetSupportedContentTypes(
+            string contentType,
+            Type objectType);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorerSettingsAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorerSettingsAttribute.cs
new file mode 100644
index 0000000000..2821ad8d51
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorerSettingsAttribute.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Controls the visibility and group name for an <c>ApiDescription</c>
+    /// of the associated controller class or action method.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public class ApiExplorerSettingsAttribute :
+        Attribute,
+        IApiDescriptionGroupNameProvider,
+        IApiDescriptionVisibilityProvider
+    {
+        /// <inheritdoc />
+        public string GroupName { get; set; }
+
+        /// <inheritdoc />
+        public bool IgnoreApi { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ActionModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ActionModel.cs
new file mode 100644
index 0000000000..6114bc227f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ActionModel.cs
@@ -0,0 +1,143 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    [DebuggerDisplay("{DisplayName}")]
+    public class ActionModel : ICommonModel, IFilterModel, IApiExplorerModel
+    {
+        public ActionModel(
+            MethodInfo actionMethod,
+            IReadOnlyList<object> attributes)
+        {
+            if (actionMethod == null)
+            {
+                throw new ArgumentNullException(nameof(actionMethod));
+            }
+
+            if (attributes == null)
+            {
+                throw new ArgumentNullException(nameof(attributes));
+            }
+
+            ActionMethod = actionMethod;
+
+            ApiExplorer = new ApiExplorerModel();
+            Attributes = new List<object>(attributes);
+            Filters = new List<IFilterMetadata>();
+            Parameters = new List<ParameterModel>();
+            RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            Properties = new Dictionary<object, object>();
+            Selectors = new List<SelectorModel>();
+        }
+
+        public ActionModel(ActionModel other)
+        {
+            if (other == null)
+            {
+                throw new ArgumentNullException(nameof(other));
+            }
+
+            ActionMethod = other.ActionMethod;
+            ActionName = other.ActionName;
+
+            // Not making a deep copy of the controller, this action still belongs to the same controller.
+            Controller = other.Controller;
+
+            // These are just metadata, safe to create new collections
+            Attributes = new List<object>(other.Attributes);
+            Filters = new List<IFilterMetadata>(other.Filters);
+            Properties = new Dictionary<object, object>(other.Properties);
+            RouteValues = new Dictionary<string, string>(other.RouteValues, StringComparer.OrdinalIgnoreCase);
+
+            // Make a deep copy of other 'model' types.
+            ApiExplorer = new ApiExplorerModel(other.ApiExplorer);
+            Parameters = new List<ParameterModel>(other.Parameters.Select(p => new ParameterModel(p) { Action = this }));
+            Selectors = new List<SelectorModel>(other.Selectors.Select(s => new SelectorModel(s)));
+        }
+
+        public MethodInfo ActionMethod { get; }
+
+        public string ActionName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ApiExplorerModel"/> for this action.
+        /// </summary>
+        /// <remarks>
+        /// <see cref="ActionModel.ApiExplorer"/> allows configuration of settings for ApiExplorer
+        /// which apply to the action.
+        ///
+        /// Settings applied by <see cref="ActionModel.ApiExplorer"/> override settings from
+        /// <see cref="ApplicationModel.ApiExplorer"/> and <see cref="ControllerModel.ApiExplorer"/>.
+        /// </remarks>
+        public ApiExplorerModel ApiExplorer { get; set; }
+
+        public IReadOnlyList<object> Attributes { get; }
+
+        public ControllerModel Controller { get; set; }
+
+        public IList<IFilterMetadata> Filters { get; }
+
+        public IList<ParameterModel> Parameters { get; }
+
+        /// <summary>
+        /// Gets a collection of route values that must be present in the 
+        /// <see cref="RouteData.Values"/> for the corresponding action to be selected.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// The value of <see cref="ActionName"/> is considered an implicit route value corresponding
+        /// to the key <c>action</c> and the value of <see cref="ControllerModel.ControllerName"/> is
+        /// considered an implicit route value corresponding to the key <c>controller</c>. These entries
+        /// will be implicitly added to <see cref="ActionDescriptor.RouteValues"/> when the action
+        /// descriptor is created, but will not be visible in <see cref="RouteValues"/>.
+        /// </para>
+        /// <para>
+        /// Entries in <see cref="RouteValues"/> can override entries in
+        /// <see cref="ControllerModel.RouteValues"/>.
+        /// </para>
+        /// </remarks>
+        public IDictionary<string, string> RouteValues { get; }
+
+        /// <summary>
+        /// Gets a set of properties associated with the action.
+        /// These properties will be copied to <see cref="Abstractions.ActionDescriptor.Properties"/>.
+        /// </summary>
+        /// <remarks>
+        /// Entries will take precedence over entries with the same key in
+        /// <see cref="ApplicationModel.Properties"/> and <see cref="ControllerModel.Properties"/>.
+        /// </remarks>
+        public IDictionary<object, object> Properties { get; }
+
+        MemberInfo ICommonModel.MemberInfo => ActionMethod;
+
+        string ICommonModel.Name => ActionName;
+
+        public IList<SelectorModel> Selectors { get; }
+
+        public string DisplayName
+        {
+            get
+            {
+                if (Controller == null)
+                {
+                    return ActionMethod.Name;
+                }
+
+                var controllerType = TypeNameHelper.GetTypeDisplayName(Controller.ControllerType);
+                var controllerAssembly = Controller?.ControllerType.Assembly.GetName().Name;
+                return $"{controllerType}.{ActionMethod.Name} ({controllerAssembly})";
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiExplorerModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiExplorerModel.cs
new file mode 100644
index 0000000000..99a6326679
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiExplorerModel.cs
@@ -0,0 +1,50 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// A model for ApiExplorer properties associated with a controller or action.
+    /// </summary>
+    public class ApiExplorerModel
+    {
+        /// <summary>
+        /// Creates a new <see cref="ApiExplorerModel"/>.
+        /// </summary>
+        public ApiExplorerModel()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="ApiExplorerModel"/> with properties copied from <paramref name="other"/>.
+        /// </summary>
+        /// <param name="other">The <see cref="ApiExplorerModel"/> to copy.</param>
+        public ApiExplorerModel(ApiExplorerModel other)
+        {
+            if (other == null)
+            {
+                throw new ArgumentNullException(nameof(other));
+            }
+
+            GroupName = other.GroupName;
+            IsVisible = other.IsVisible;
+        }
+
+        /// <summary>
+        /// If <c>true</c>, <c>APIExplorer.ApiDescription</c> objects will be created for the associated
+        /// controller or action.
+        /// </summary>
+        /// <remarks>
+        /// Set this value to configure whether or not the associated controller or action will appear in ApiExplorer.
+        /// </remarks>
+        public bool? IsVisible { get; set; }
+
+        /// <summary>
+        /// The value for <c>APIExplorer.ApiDescription.GroupName</c> of
+        /// <c>APIExplorer.ApiDescription</c> objects created for the associated controller or action.
+        /// </summary>
+        public string GroupName { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModel.cs
new file mode 100644
index 0000000000..59a1b5fe50
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModel.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    [DebuggerDisplay("ApplicationModel: Controllers: {Controllers.Count}, Filters: {Filters.Count}")]
+    public class ApplicationModel : IPropertyModel, IFilterModel, IApiExplorerModel
+    {
+        public ApplicationModel()
+        {
+            ApiExplorer = new ApiExplorerModel();
+            Controllers = new List<ControllerModel>();
+            Filters = new List<IFilterMetadata>();
+            Properties = new Dictionary<object, object>();
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ApiExplorerModel"/> for the application.
+        /// </summary>
+        /// <remarks>
+        /// <see cref="ApplicationModel.ApiExplorer"/> allows configuration of default settings
+        /// for ApiExplorer that apply to all actions unless overridden by 
+        /// <see cref="ControllerModel.ApiExplorer"/> or <see cref="ActionModel.ApiExplorer"/>.
+        /// 
+        /// If using <see cref="ApplicationModel.ApiExplorer"/> to set <see cref="ApiExplorerModel.IsVisible"/> to
+        /// <c>true</c>, this setting will only be honored for actions which use attribute routing.
+        /// </remarks>
+        public ApiExplorerModel ApiExplorer { get; set; }
+
+        public IList<ControllerModel> Controllers { get; }
+
+        public IList<IFilterMetadata> Filters { get; }
+
+        /// <summary>
+        /// Gets a set of properties associated with all actions.
+        /// These properties will be copied to <see cref="Abstractions.ActionDescriptor.Properties"/>.
+        /// </summary>
+        public IDictionary<object, object> Properties { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModelProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModelProviderContext.cs
new file mode 100644
index 0000000000..7bc2abd1b0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModelProviderContext.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// A context object for <see cref="IApplicationModelProvider"/>.
+    /// </summary>
+    public class ApplicationModelProviderContext
+    {
+        public ApplicationModelProviderContext(IEnumerable<TypeInfo> controllerTypes)
+        {
+            if (controllerTypes == null)
+            {
+                throw new ArgumentNullException(nameof(controllerTypes));
+            }
+
+            ControllerTypes = controllerTypes;
+        }
+
+        public IEnumerable<TypeInfo> ControllerTypes { get; }
+
+        /// <summary>
+        /// Gets the <see cref="ApplicationModel"/>.
+        /// </summary>
+        public ApplicationModel Result { get; } = new ApplicationModel();
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/AttributeRouteModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/AttributeRouteModel.cs
new file mode 100644
index 0000000000..07e6a20c48
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/AttributeRouteModel.cs
@@ -0,0 +1,423 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    public class AttributeRouteModel
+    {
+        private static readonly AttributeRouteModel _default = new AttributeRouteModel();
+
+        public AttributeRouteModel()
+        {
+        }
+
+        public AttributeRouteModel(IRouteTemplateProvider templateProvider)
+        {
+            if (templateProvider == null)
+            {
+                throw new ArgumentNullException(nameof(templateProvider));
+            }
+
+            Attribute = templateProvider;
+            Template = templateProvider.Template;
+            Order = templateProvider.Order;
+            Name = templateProvider.Name;
+        }
+
+        public AttributeRouteModel(AttributeRouteModel other)
+        {
+            if (other == null)
+            {
+                throw new ArgumentNullException(nameof(other));
+            }
+
+            Attribute = other.Attribute;
+            Name = other.Name;
+            Order = other.Order;
+            Template = other.Template;
+            SuppressLinkGeneration = other.SuppressLinkGeneration;
+            SuppressPathMatching = other.SuppressPathMatching;
+        }
+
+        public IRouteTemplateProvider Attribute { get;}
+
+        public string Template { get; set; }
+
+        public int? Order { get; set; }
+
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value that determines if this model participates in link generation.
+        /// </summary>
+        public bool SuppressLinkGeneration { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value that determines if this model participates in path matching (inbound routing).
+        /// </summary>
+        public bool SuppressPathMatching { get; set; }
+
+        public bool IsAbsoluteTemplate => Template != null && IsOverridePattern(Template);
+
+        /// <summary>
+        /// Combines two <see cref="AttributeRouteModel"/> instances and returns
+        /// a new <see cref="AttributeRouteModel"/> instance with the result.
+        /// </summary>
+        /// <param name="left">The left <see cref="AttributeRouteModel"/>.</param>
+        /// <param name="right">The right <see cref="AttributeRouteModel"/>.</param>
+        /// <returns>A new instance of <see cref="AttributeRouteModel"/> that represents the
+        /// combination of the two <see cref="AttributeRouteModel"/> instances or <c>null</c> if both
+        /// parameters are <c>null</c>.</returns>
+        public static AttributeRouteModel CombineAttributeRouteModel(
+            AttributeRouteModel left,
+            AttributeRouteModel right)
+        {
+            right = right ?? _default;
+
+            // If the right template is an override template (starts with / or ~/)
+            // we ignore the values from left.
+            if (left == null || IsOverridePattern(right.Template))
+            {
+                left = _default;
+            }
+
+            var combinedTemplate = CombineTemplates(left.Template, right.Template);
+
+            // The action is not attribute routed.
+            if (combinedTemplate == null)
+            {
+                return null;
+            }
+
+            return new AttributeRouteModel()
+            {
+                Template = combinedTemplate,
+                Order = right.Order ?? left.Order,
+                Name = ChooseName(left, right),
+                SuppressLinkGeneration = left.SuppressLinkGeneration || right.SuppressLinkGeneration,
+                SuppressPathMatching = left.SuppressPathMatching || right.SuppressPathMatching,
+            };
+        }
+
+        /// <summary>
+        /// Combines the prefix and route template for an attribute route.
+        /// </summary>
+        /// <param name="prefix">The prefix.</param>
+        /// <param name="template">The route template.</param>
+        /// <returns>The combined pattern.</returns>
+        public static string CombineTemplates(string prefix, string template)
+        {
+            var result = CombineCore(prefix, template);
+            return CleanTemplate(result);
+        }
+
+        /// <summary>
+        /// Determines if a template pattern can be used to override a prefix.
+        /// </summary>
+        /// <param name="template">The template.</param>
+        /// <returns><c>true</c> if this is an overriding template, <c>false</c> otherwise.</returns>
+        /// <remarks>
+        /// Route templates starting with "~/" or "/" can be used to override the prefix.
+        /// </remarks>
+        public static bool IsOverridePattern(string template)
+        {
+            return template != null &&
+                (template.StartsWith("~/", StringComparison.Ordinal) ||
+                template.StartsWith("/", StringComparison.Ordinal));
+        }
+
+        private static string ChooseName(
+            AttributeRouteModel left,
+            AttributeRouteModel right)
+        {
+            if (right.Name == null && string.IsNullOrEmpty(right.Template))
+            {
+                return left.Name;
+            }
+            else
+            {
+                return right.Name;
+            }
+        }
+
+        private static string CombineCore(string left, string right)
+        {
+            if (left == null && right == null)
+            {
+                return null;
+            }
+            else if (right == null)
+            {
+                return left;
+            }
+            else if (IsEmptyLeftSegment(left) || IsOverridePattern(right))
+            {
+                return right;
+            }
+
+            if (left.EndsWith("/", StringComparison.Ordinal))
+            {
+                return left + right;
+            }
+
+            // Both templates contain some text.
+            return left + "/" + right;
+        }
+
+        private static bool IsEmptyLeftSegment(string template)
+        {
+            return template == null ||
+                template.Equals(string.Empty, StringComparison.Ordinal) ||
+                template.Equals("~/", StringComparison.Ordinal) ||
+                template.Equals("/", StringComparison.Ordinal);
+        }
+
+        private static string CleanTemplate(string result)
+        {
+            if (result == null)
+            {
+                return null;
+            }
+
+            // This is an invalid combined template, so we don't want to
+            // accidentally clean it and produce a valid template. For that
+            // reason we ignore the clean up process for it.
+            if (result.Equals("//", StringComparison.Ordinal))
+            {
+                return result;
+            }
+
+            var startIndex = 0;
+            if (result.StartsWith("/", StringComparison.Ordinal))
+            {
+                startIndex = 1;
+            }
+            else if (result.StartsWith("~/", StringComparison.Ordinal))
+            {
+                startIndex = 2;
+            }
+
+            // We are in the case where the string is "/" or "~/"
+            if (startIndex == result.Length)
+            {
+                return string.Empty;
+            }
+
+            var subStringLength = result.Length - startIndex;
+            if (result.EndsWith("/", StringComparison.Ordinal))
+            {
+                subStringLength--;
+            }
+
+            return result.Substring(startIndex, subStringLength);
+        }
+
+        public static string ReplaceTokens(string template, IDictionary<string, string> values)
+        {
+            var builder = new StringBuilder();
+            var state = TemplateParserState.Plaintext;
+
+            int? tokenStart = null;
+
+            // We'll run the loop one extra time with 'null' to detect the end of the string.
+            for (var i = 0; i <= template.Length; i++)
+            {
+                var c = i < template.Length ? (char?)template[i] : null;
+                switch (state)
+                {
+                    case TemplateParserState.Plaintext:
+                        if (c == '[')
+                        {
+                            state = TemplateParserState.SeenLeft;
+                            break;
+                        }
+                        else if (c == ']')
+                        {
+                            state = TemplateParserState.SeenRight;
+                            break;
+                        }
+                        else if (c == null)
+                        {
+                            // We're at the end of the string, nothing left to do.
+                            break;
+                        }
+                        else
+                        {
+                            builder.Append(c);
+                            break;
+                        }
+                    case TemplateParserState.SeenLeft:
+                        if (c == '[')
+                        {
+                            // This is an escaped left-bracket
+                            builder.Append(c);
+                            state = TemplateParserState.Plaintext;
+                            break;
+                        }
+                        else if (c == ']')
+                        {
+                            // This is zero-width parameter - not allowed.
+                            var message = Resources.FormatAttributeRoute_TokenReplacement_InvalidSyntax(
+                                template,
+                                Resources.AttributeRoute_TokenReplacement_EmptyTokenNotAllowed);
+                            throw new InvalidOperationException(message);
+                        }
+                        else if (c == null)
+                        {
+                            // This is a left-bracket at the end of the string.
+                            var message = Resources.FormatAttributeRoute_TokenReplacement_InvalidSyntax(
+                                template,
+                                Resources.AttributeRoute_TokenReplacement_UnclosedToken);
+                            throw new InvalidOperationException(message);
+                        }
+                        else
+                        {
+                            tokenStart = i;
+                            state = TemplateParserState.InsideToken;
+                            break;
+                        }
+                    case TemplateParserState.SeenRight:
+                        if (c == ']')
+                        {
+                            // This is an escaped right-bracket
+                            builder.Append(c);
+                            state = TemplateParserState.Plaintext;
+                            break;
+                        }
+                        else if (c == null)
+                        {
+                            // This is an imbalanced right-bracket at the end of the string.
+                            var message = Resources.FormatAttributeRoute_TokenReplacement_InvalidSyntax(
+                                template,
+                                Resources.AttributeRoute_TokenReplacement_ImbalancedSquareBrackets);
+                            throw new InvalidOperationException(message);
+                        }
+                        else
+                        {
+                            // This is an imbalanced right-bracket.
+                            var message = Resources.FormatAttributeRoute_TokenReplacement_InvalidSyntax(
+                                template,
+                                Resources.AttributeRoute_TokenReplacement_ImbalancedSquareBrackets);
+                            throw new InvalidOperationException(message);
+                        }
+                    case TemplateParserState.InsideToken:
+                        if (c == '[')
+                        {
+                            state = TemplateParserState.InsideToken | TemplateParserState.SeenLeft;
+                            break;
+                        }
+                        else if (c == ']')
+                        {
+                            state = TemplateParserState.InsideToken | TemplateParserState.SeenRight;
+                            break;
+                        }
+                        else if (c == null)
+                        {
+                            // This is an unclosed replacement token
+                            var message = Resources.FormatAttributeRoute_TokenReplacement_InvalidSyntax(
+                                template,
+                                Resources.AttributeRoute_TokenReplacement_UnclosedToken);
+                            throw new InvalidOperationException(message);
+                        }
+                        else
+                        {
+                            // This is a just part of the parameter
+                            break;
+                        }
+                    case TemplateParserState.InsideToken | TemplateParserState.SeenLeft:
+                        if (c == '[')
+                        {
+                            // This is an escaped left-bracket
+                            state = TemplateParserState.InsideToken;
+                            break;
+                        }
+                        else
+                        {
+                            // Unescaped left-bracket is not allowed inside a token.
+                            var message = Resources.FormatAttributeRoute_TokenReplacement_InvalidSyntax(
+                                template,
+                                Resources.AttributeRoute_TokenReplacement_UnescapedBraceInToken);
+                            throw new InvalidOperationException(message);
+                        }
+                    case TemplateParserState.InsideToken | TemplateParserState.SeenRight:
+                        if (c == ']')
+                        {
+                            // This is an escaped right-bracket
+                            state = TemplateParserState.InsideToken;
+                            break;
+                        }
+                        else
+                        {
+                            // This is the end of a replacement token.
+                            var token = template
+                                .Substring(tokenStart.Value, i - tokenStart.Value - 1)
+                                .Replace("[[", "[")
+                                .Replace("]]", "]");
+
+                            if (!values.TryGetValue(token, out var value))
+                            {
+                                // Value not found
+                                var message = Resources.FormatAttributeRoute_TokenReplacement_ReplacementValueNotFound(
+                                    template,
+                                    token,
+                                    string.Join(", ", values.Keys.OrderBy(k => k, StringComparer.OrdinalIgnoreCase)));
+                                throw new InvalidOperationException(message);
+                            }
+
+                            builder.Append(value);
+
+                            if (c == '[')
+                            {
+                                state = TemplateParserState.SeenLeft;
+                            }
+                            else if (c == ']')
+                            {
+                                state = TemplateParserState.SeenRight;
+                            }
+                            else if (c == null)
+                            {
+                                state = TemplateParserState.Plaintext;
+                            }
+                            else
+                            {
+                                builder.Append(c);
+                                state = TemplateParserState.Plaintext;
+                            }
+
+                            tokenStart = null;
+                            break;
+                        }
+                }
+            }
+
+            return builder.ToString();
+        }
+
+        [Flags]
+        private enum TemplateParserState : uint
+        {
+            // default state - allow non-special characters to pass through to the
+            // buffer.
+            Plaintext = 0,
+
+            // We're inside a replacement token, may be combined with other states to detect
+            // a possible escaped bracket inside the token.
+            InsideToken = 1,
+
+            // We've seen a left brace, need to see the next character to find out if it's escaped
+            // or not.
+            SeenLeft = 2,
+
+            // We've seen a right brace, need to see the next character to find out if it's escaped
+            // or not.
+            SeenRight = 4,
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ControllerModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ControllerModel.cs
new file mode 100644
index 0000000000..cd26b0e26d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ControllerModel.cs
@@ -0,0 +1,133 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    [DebuggerDisplay("{DisplayName}")]
+    public class ControllerModel : ICommonModel, IFilterModel, IApiExplorerModel
+    {
+        public ControllerModel(
+            TypeInfo controllerType,
+            IReadOnlyList<object> attributes)
+        {
+            if (controllerType == null)
+            {
+                throw new ArgumentNullException(nameof(controllerType));
+            }
+
+            if (attributes == null)
+            {
+                throw new ArgumentNullException(nameof(attributes));
+            }
+
+            ControllerType = controllerType;
+
+            Actions = new List<ActionModel>();
+            ApiExplorer = new ApiExplorerModel();
+            Attributes = new List<object>(attributes);
+            ControllerProperties = new List<PropertyModel>();
+            Filters = new List<IFilterMetadata>();
+            Properties = new Dictionary<object, object>();
+            RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            Selectors = new List<SelectorModel>();
+        }
+
+        public ControllerModel(ControllerModel other)
+        {
+            if (other == null)
+            {
+                throw new ArgumentNullException(nameof(other));
+            }
+
+            ControllerName = other.ControllerName;
+            ControllerType = other.ControllerType;
+
+            // Still part of the same application
+            Application = other.Application;
+
+            // These are just metadata, safe to create new collections
+            Attributes = new List<object>(other.Attributes);
+            Filters = new List<IFilterMetadata>(other.Filters);
+            RouteValues = new Dictionary<string, string>(other.RouteValues, StringComparer.OrdinalIgnoreCase);
+            Properties = new Dictionary<object, object>(other.Properties);
+
+            // Make a deep copy of other 'model' types.
+            Actions = new List<ActionModel>(other.Actions.Select(a => new ActionModel(a) { Controller = this }));
+            ApiExplorer = new ApiExplorerModel(other.ApiExplorer);
+            ControllerProperties =
+                new List<PropertyModel>(other.ControllerProperties.Select(p => new PropertyModel(p) { Controller = this }));
+            Selectors = new List<SelectorModel>(other.Selectors.Select(s => new SelectorModel(s)));
+        }
+
+        public IList<ActionModel> Actions { get; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ApiExplorerModel"/> for this controller.
+        /// </summary>
+        /// <remarks>
+        /// <see cref="ControllerModel.ApiExplorer"/> allows configuration of settings for ApiExplorer
+        /// which apply to all actions in the controller unless overridden by <see cref="ActionModel.ApiExplorer"/>.
+        ///
+        /// Settings applied by <see cref="ControllerModel.ApiExplorer"/> override settings from
+        /// <see cref="ApplicationModel.ApiExplorer"/>.
+        /// </remarks>
+        public ApiExplorerModel ApiExplorer { get; set; }
+
+        public ApplicationModel Application { get; set; }
+
+        public IReadOnlyList<object> Attributes { get; }
+
+        MemberInfo ICommonModel.MemberInfo => ControllerType;
+
+        string ICommonModel.Name => ControllerName;
+
+        public string ControllerName { get; set; }
+
+        public TypeInfo ControllerType { get; }
+
+        public IList<PropertyModel> ControllerProperties { get; }
+
+        public IList<IFilterMetadata> Filters { get; }
+
+        /// <summary>
+        /// Gets a collection of route values that must be present in the 
+        /// <see cref="RouteData.Values"/> for the corresponding action to be selected.
+        /// </summary>
+        /// <remarks>
+        /// Entries in <see cref="RouteValues"/> can be overridden by entries in
+        /// <see cref="ActionModel.RouteValues"/>.
+        /// </remarks>
+        public IDictionary<string, string> RouteValues { get; }
+
+        /// <summary>
+        /// Gets a set of properties associated with the controller.
+        /// These properties will be copied to <see cref="Abstractions.ActionDescriptor.Properties"/>.
+        /// </summary>
+        /// <remarks>
+        /// Entries will take precedence over entries with the same key
+        /// in <see cref="ApplicationModel.Properties"/>.
+        /// </remarks>
+        public IDictionary<object, object> Properties { get; }
+
+        public IList<SelectorModel> Selectors { get; }
+
+        public string DisplayName
+        {
+            get
+            {
+                var controllerType = TypeNameHelper.GetTypeDisplayName(ControllerType);
+                var controllerAssembly = ControllerType.Assembly.GetName().Name;
+                return $"{controllerType} ({controllerAssembly})";
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IActionModelConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IActionModelConvention.cs
new file mode 100644
index 0000000000..6d235666f9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IActionModelConvention.cs
@@ -0,0 +1,25 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// Allows customization of the <see cref="ActionModel"/>.
+    /// </summary>
+    /// <remarks>
+    /// To use this interface, create an <see cref="System.Attribute"/> class which implements the interface and
+    /// place it on an action method.
+    ///
+    /// <see cref="IActionModelConvention"/> customizations run after
+    /// <see cref="IControllerModelConvention"/> customizations and before
+    /// <see cref="IParameterModelConvention"/> customizations.
+    /// </remarks>
+    public interface IActionModelConvention
+    {
+        /// <summary>
+        /// Called to apply the convention to the <see cref="ActionModel"/>.
+        /// </summary>
+        /// <param name="action">The <see cref="ActionModel"/>.</param>
+        void Apply(ActionModel action);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApiExplorerModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApiExplorerModel.cs
new file mode 100644
index 0000000000..c5e36ac038
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApiExplorerModel.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    public interface IApiExplorerModel
+    {
+        ApiExplorerModel ApiExplorer { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApplicationModelConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApplicationModelConvention.cs
new file mode 100644
index 0000000000..7388b7f5e4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApplicationModelConvention.cs
@@ -0,0 +1,24 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// Allows customization of the <see cref="ApplicationModel"/>.
+    /// </summary>
+    /// <remarks>
+    /// Implementations of this interface can be registered in <see cref="MvcOptions.Conventions"/>
+    /// to customize metadata about the application.
+    ///
+    /// <see cref="IApplicationModelConvention"/> run before other types of customizations to the
+    /// reflected model.
+    /// </remarks>
+    public interface IApplicationModelConvention
+    {
+        /// <summary>
+        /// Called to apply the convention to the <see cref="ApplicationModel"/>.
+        /// </summary>
+        /// <param name="application">The <see cref="ApplicationModel"/>.</param>
+        void Apply(ApplicationModel application);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApplicationModelProvider.cs
new file mode 100644
index 0000000000..8d8814ad43
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApplicationModelProvider.cs
@@ -0,0 +1,44 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// Builds or modifies an <see cref="ApplicationModel"/> for action discovery.
+    /// </summary>
+    public interface IApplicationModelProvider
+    {
+        /// <summary>
+        /// Gets the order value for determining the order of execution of providers. Providers execute in
+        /// ascending numeric value of the <see cref="Order"/> property.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Providers are executed in an ordering determined by an ascending sort of the <see cref="Order"/> property.
+        /// A provider with a lower numeric value of <see cref="Order"/> will have its
+        /// <see cref="OnProvidersExecuting"/> called before that of a provider with a higher numeric value of
+        /// <see cref="Order"/>. The <see cref="OnProvidersExecuted"/> method is called in the reverse ordering after
+        /// all calls to <see cref="OnProvidersExecuting"/>. A provider with a lower numeric value of
+        /// <see cref="Order"/> will have its <see cref="OnProvidersExecuted"/> method called after that of a provider
+        /// with a higher numeric value of <see cref="Order"/>.
+        /// </para>
+        /// <para>
+        /// If two providers have the same numeric value of <see cref="Order"/>, then their relative execution order
+        /// is undefined.
+        /// </para>
+        /// </remarks>
+        int Order { get; }
+
+        /// <summary>
+        /// Executed for the first pass of <see cref="ApplicationModel"/> building. See <see cref="Order"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ApplicationModelProviderContext"/>.</param>
+        void OnProvidersExecuting(ApplicationModelProviderContext context);
+
+        /// <summary>
+        /// Executed for the second pass of <see cref="ApplicationModel"/> building. See <see cref="Order"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ApplicationModelProviderContext"/>.</param>
+        void OnProvidersExecuted(ApplicationModelProviderContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IBindingModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IBindingModel.cs
new file mode 100644
index 0000000000..e57ff5589c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IBindingModel.cs
@@ -0,0 +1,12 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    public interface IBindingModel
+    {
+        BindingInfo BindingInfo { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ICommonModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ICommonModel.cs
new file mode 100644
index 0000000000..0fc83aca3e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ICommonModel.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    public interface ICommonModel : IPropertyModel
+    {
+        IReadOnlyList<object> Attributes { get; }
+        MemberInfo MemberInfo { get; }
+        string Name { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IControllerModelConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IControllerModelConvention.cs
new file mode 100644
index 0000000000..37d08ec440
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IControllerModelConvention.cs
@@ -0,0 +1,25 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// Allows customization of the <see cref="ControllerModel"/>.
+    /// </summary>
+    /// <remarks>
+    /// To use this interface, create an <see cref="System.Attribute"/> class which implements the interface and
+    /// place it on a controller class.
+    ///
+    /// <see cref="IControllerModelConvention"/> customizations run after
+    /// <see cref="IApplicationModelConvention"/> customizations and before
+    /// <see cref="IActionModelConvention"/> customizations.
+    /// </remarks>
+    public interface IControllerModelConvention
+    {
+        /// <summary>
+        /// Called to apply the convention to the <see cref="ControllerModel"/>.
+        /// </summary>
+        /// <param name="controller">The <see cref="ControllerModel"/>.</param>
+        void Apply(ControllerModel controller);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IFilterModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IFilterModel.cs
new file mode 100644
index 0000000000..98f89df0a0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IFilterModel.cs
@@ -0,0 +1,13 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    public interface IFilterModel
+    {
+        IList<IFilterMetadata> Filters { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IParameterModelBaseConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IParameterModelBaseConvention.cs
new file mode 100644
index 0000000000..2457b89f95
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IParameterModelBaseConvention.cs
@@ -0,0 +1,21 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// Allows customization of the properties and parameters on controllers and Razor Pages.
+    /// </summary>
+    /// <remarks>
+    /// To use this interface, create an <see cref="System.Attribute"/> class which implements the interface and
+    /// place it on an action method parameter.
+    /// </remarks>
+    public interface IParameterModelBaseConvention
+    {
+        /// <summary>
+        /// Called to apply the convention to the <see cref="ParameterModelBase"/>.
+        /// </summary>
+        /// <param name="parameter">The <see cref="ParameterModelBase"/>.</param>
+        void Apply(ParameterModelBase parameter);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IParameterModelConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IParameterModelConvention.cs
new file mode 100644
index 0000000000..eddbbe383c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IParameterModelConvention.cs
@@ -0,0 +1,20 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// Allows customization of the <see cref="ParameterModel"/>.
+    /// </summary>
+    /// <remarks>
+    /// To use this interface, create an <see cref="System.Attribute"/> class which implements the interface and
+    /// place it on an action method parameter.
+    ///
+    /// <see cref="IParameterModelConvention"/> customizations run after
+    /// <see cref="IActionModelConvention"/> customizations.
+    /// </remarks>
+    public interface IParameterModelConvention
+    {
+        void Apply(ParameterModel parameter);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IPropertyModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IPropertyModel.cs
new file mode 100644
index 0000000000..5fbdb4567a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IPropertyModel.cs
@@ -0,0 +1,12 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    public interface IPropertyModel
+    {
+        IDictionary<object, object> Properties { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ParameterModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ParameterModel.cs
new file mode 100644
index 0000000000..f473ab94f4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ParameterModel.cs
@@ -0,0 +1,60 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Reflection;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    [DebuggerDisplay("ParameterModel: Name={ParameterName}")]
+    public class ParameterModel : ParameterModelBase, ICommonModel
+    {
+        public ParameterModel(
+            ParameterInfo parameterInfo,
+            IReadOnlyList<object> attributes)
+            : base(parameterInfo?.ParameterType, attributes)
+        {
+            ParameterInfo = parameterInfo ?? throw new ArgumentNullException(nameof(parameterInfo));
+        }
+
+        public ParameterModel(ParameterModel other)
+            : base(other)
+        {
+            if (other == null)
+            {
+                throw new ArgumentNullException(nameof(other));
+            }
+
+            Action = other.Action;
+            ParameterInfo = other.ParameterInfo;
+        }
+
+        public ActionModel Action { get; set; }
+
+        public new IDictionary<object, object> Properties => base.Properties;
+
+        public new IReadOnlyList<object> Attributes => base.Attributes;
+
+        MemberInfo ICommonModel.MemberInfo => ParameterInfo.Member;
+
+        public ParameterInfo ParameterInfo { get; }
+
+        public string ParameterName
+        {
+            get => Name;
+            set => Name = value;
+        }
+
+        public string DisplayName
+        {
+            get
+            {
+                var parameterTypeName = TypeNameHelper.GetTypeDisplayName(ParameterInfo.ParameterType, fullName: false);
+                return $"{parameterTypeName} {ParameterName}";
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ParameterModelBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ParameterModelBase.cs
new file mode 100644
index 0000000000..7937d8b3c7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ParameterModelBase.cs
@@ -0,0 +1,52 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// A model type for reading and manipulation properties and parameters.
+    /// <para>
+    /// Derived instances of this type represent properties and parameters for controllers, and Razor Pages.
+    /// </para>
+    /// </summary>
+    public abstract class ParameterModelBase : IBindingModel
+    {
+        protected ParameterModelBase(
+            Type parameterType,
+            IReadOnlyList<object> attributes)
+        {
+            ParameterType = parameterType ?? throw new ArgumentNullException(nameof(parameterType));
+            Attributes = new List<object>(attributes ?? throw new ArgumentNullException(nameof(attributes)));
+
+            Properties = new Dictionary<object, object>();
+        }
+
+        protected ParameterModelBase(ParameterModelBase other)
+        {
+            if (other == null)
+            {
+                throw new ArgumentNullException(nameof(other));
+            }
+
+            ParameterType = other.ParameterType;
+            Attributes = new List<object>(other.Attributes);
+            BindingInfo = other.BindingInfo == null ? null : new BindingInfo(other.BindingInfo);
+            Name = other.Name;
+            Properties = new Dictionary<object, object>(other.Properties);
+        }
+
+        public IReadOnlyList<object> Attributes { get; }
+
+        public IDictionary<object, object> Properties { get; }
+
+        public Type ParameterType { get; }
+
+        public string Name { get; protected set;  }
+
+        public BindingInfo BindingInfo { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/PropertyModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/PropertyModel.cs
new file mode 100644
index 0000000000..8f26d0648a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/PropertyModel.cs
@@ -0,0 +1,67 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// A type which is used to represent a property in a <see cref="ControllerModel"/>.
+    /// </summary>
+    [DebuggerDisplay("PropertyModel: Name={PropertyName}")]
+    public class PropertyModel : ParameterModelBase, ICommonModel, IBindingModel
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="PropertyModel"/>.
+        /// </summary>
+        /// <param name="propertyInfo">The <see cref="PropertyInfo"/> for the underlying property.</param>
+        /// <param name="attributes">Any attributes which are annotated on the property.</param>
+        public PropertyModel(
+            PropertyInfo propertyInfo,
+            IReadOnlyList<object> attributes)
+            : base(propertyInfo?.PropertyType, attributes)
+        {
+            PropertyInfo = propertyInfo ?? throw new ArgumentNullException(nameof(propertyInfo));
+        }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="PropertyModel"/> from a given <see cref="PropertyModel"/>.
+        /// </summary>
+        /// <param name="other">The <see cref="PropertyModel"/> which needs to be copied.</param>
+        public PropertyModel(PropertyModel other)
+            : base(other)
+        {
+            if (other == null)
+            {
+                throw new ArgumentNullException(nameof(other));
+            }
+
+            Controller = other.Controller;
+            BindingInfo = BindingInfo == null ? null : new BindingInfo(other.BindingInfo);
+            PropertyInfo = other.PropertyInfo;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ControllerModel"/> this <see cref="PropertyModel"/> is associated with.
+        /// </summary>
+        public ControllerModel Controller { get; set; }
+
+        MemberInfo ICommonModel.MemberInfo => PropertyInfo;
+
+        public new IDictionary<object, object> Properties => base.Properties;
+
+        public new IReadOnlyList<object> Attributes => base.Attributes;
+
+        public PropertyInfo PropertyInfo { get; }
+
+        public string PropertyName
+        {
+            get => Name;
+            set => Name = value;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/SelectorModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/SelectorModel.cs
new file mode 100644
index 0000000000..e838e17c04
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/SelectorModel.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    public class SelectorModel
+    {
+        public SelectorModel()
+        {
+            ActionConstraints = new List<IActionConstraintMetadata>();
+        }
+
+        public SelectorModel(SelectorModel other)
+        {
+            if (other == null)
+            {
+                throw new ArgumentNullException(nameof(other));
+            }
+
+            ActionConstraints = new List<IActionConstraintMetadata>(other.ActionConstraints);
+
+            if (other.AttributeRouteModel != null)
+            {
+                AttributeRouteModel = new AttributeRouteModel(other.AttributeRouteModel);
+            }
+        }
+
+        public AttributeRouteModel AttributeRouteModel { get; set; }
+
+        public IList<IActionConstraintMetadata> ActionConstraints { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationAssembliesProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationAssembliesProvider.cs
new file mode 100644
index 0000000000..08149805ff
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationAssembliesProvider.cs
@@ -0,0 +1,295 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.Extensions.DependencyModel;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    internal class ApplicationAssembliesProvider
+    {
+        internal static HashSet<string> ReferenceAssemblies { get; } = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        {
+            // The deps file for the Microsoft.AspNetCore.All shared runtime is authored in a way where it does not say
+            // it depends on Microsoft.AspNetCore.Mvc even though it does. Explicitly list it so that referencing this runtime causes
+            // assembly discovery to work correctly.
+            "Microsoft.AspNetCore.All",
+            "Microsoft.AspNetCore.Mvc",
+            "Microsoft.AspNetCore.Mvc.Abstractions",
+            "Microsoft.AspNetCore.Mvc.ApiExplorer",
+            "Microsoft.AspNetCore.Mvc.Core",
+            "Microsoft.AspNetCore.Mvc.Cors",
+            "Microsoft.AspNetCore.Mvc.DataAnnotations",
+            "Microsoft.AspNetCore.Mvc.Formatters.Json",
+            "Microsoft.AspNetCore.Mvc.Formatters.Xml",
+            "Microsoft.AspNetCore.Mvc.Localization",
+            "Microsoft.AspNetCore.Mvc.Razor",
+            "Microsoft.AspNetCore.Mvc.Razor.Extensions",
+            "Microsoft.AspNetCore.Mvc.RazorPages",
+            "Microsoft.AspNetCore.Mvc.TagHelpers",
+            "Microsoft.AspNetCore.Mvc.ViewFeatures",
+        };
+
+        /// <summary>
+        /// Returns an ordered list of application assemblies.
+        /// <para>
+        /// The order is as follows:
+        /// * Entry assembly
+        /// * Assemblies specified in the application's deps file ordered by name.
+        /// <para>
+        /// Each assembly is immediately followed by assemblies specified by annotated <see cref="RelatedAssemblyAttribute"/> ordered by name.
+        /// </para>
+        /// </para>
+        /// </summary>
+        public IEnumerable<Assembly> ResolveAssemblies(Assembly entryAssembly)
+        {
+            var dependencyContext = LoadDependencyContext(entryAssembly);
+
+            IEnumerable<AssemblyItem> assemblyItems;
+
+            if (dependencyContext == null || dependencyContext.CompileLibraries.Count == 0)
+            {
+                // If an application was built with PreserveCompilationContext = false, CompileLibraries will be empty and we
+                // can no longer reliably infer the dependency closure. In this case, treat it the same as a missing
+                // deps file.
+                assemblyItems = new[] { GetAssemblyItem(entryAssembly) };
+            }
+            else
+            {
+                assemblyItems = ResolveFromDependencyContext(dependencyContext);
+            }
+
+            assemblyItems = assemblyItems
+                .OrderBy(item => item.Assembly == entryAssembly ? 0 : 1)
+                .ThenBy(item => item.Assembly.FullName, StringComparer.Ordinal);
+
+            foreach (var item in assemblyItems)
+            {
+                yield return item.Assembly;
+
+                foreach (var associatedAssembly in item.RelatedAssemblies.Distinct().OrderBy(assembly => assembly.FullName, StringComparer.Ordinal))
+                {
+                    yield return associatedAssembly;
+                }
+            }
+        }
+
+        protected virtual DependencyContext LoadDependencyContext(Assembly assembly) => DependencyContext.Load(assembly);
+
+        private List<AssemblyItem> ResolveFromDependencyContext(DependencyContext dependencyContext)
+        {
+            var assemblyItems = new List<AssemblyItem>();
+            var relatedAssemblies = new Dictionary<Assembly, AssemblyItem>();
+
+            var candidateAssemblies = GetCandidateLibraries(dependencyContext)
+                .SelectMany(library => GetLibraryAssemblies(dependencyContext, library));
+
+            foreach (var assembly in candidateAssemblies)
+            {
+                var assemblyItem = GetAssemblyItem(assembly);
+                assemblyItems.Add(assemblyItem);
+
+                foreach (var relatedAssembly in assemblyItem.RelatedAssemblies)
+                {
+                    if (relatedAssemblies.TryGetValue(relatedAssembly, out var otherEntry))
+                    {
+                        var message = string.Join(
+                            Environment.NewLine,
+                            Resources.FormatApplicationAssembliesProvider_DuplicateRelatedAssembly(relatedAssembly.FullName),
+                            otherEntry.Assembly.FullName,
+                            assembly.FullName);
+
+                        throw new InvalidOperationException(message);
+                    }
+
+                    relatedAssemblies.Add(relatedAssembly, assemblyItem);
+                }
+            }
+
+            // Remove any top level assemblies that appear as an associated assembly.
+            assemblyItems.RemoveAll(item => relatedAssemblies.ContainsKey(item.Assembly));
+
+            return assemblyItems;
+        }
+
+        protected virtual IEnumerable<Assembly> GetLibraryAssemblies(DependencyContext dependencyContext, RuntimeLibrary runtimeLibrary)
+        {
+            foreach (var assemblyName in runtimeLibrary.GetDefaultAssemblyNames(dependencyContext))
+            {
+                var assembly = Assembly.Load(assemblyName);
+                yield return assembly;
+            }
+        }
+
+        protected virtual IReadOnlyList<Assembly> GetRelatedAssemblies(Assembly assembly)
+        {
+            // Do not require related assemblies to be available in the default code path.
+            return RelatedAssemblyAttribute.GetRelatedAssemblies(assembly, throwOnError: false);
+        }
+
+        private AssemblyItem GetAssemblyItem(Assembly assembly)
+        {
+            var relatedAssemblies = GetRelatedAssemblies(assembly);
+
+            // Ensure we don't have any cycles. A cycle could be formed if a related assembly points to the primary assembly.
+            foreach (var relatedAssembly in relatedAssemblies)
+            {
+                if (relatedAssembly.IsDefined(typeof(RelatedAssemblyAttribute)))
+                {
+                    throw new InvalidOperationException(
+                        Resources.FormatApplicationAssembliesProvider_RelatedAssemblyCannotDefineAdditional(relatedAssembly.FullName, assembly.FullName));
+                }
+            }
+
+            return new AssemblyItem(assembly, relatedAssemblies);
+        }
+
+        // Returns a list of libraries that references the assemblies in <see cref="ReferenceAssemblies"/>.
+        // By default it returns all assemblies that reference any of the primary MVC assemblies
+        // while ignoring MVC assemblies.
+        // Internal for unit testing
+        internal static IEnumerable<RuntimeLibrary> GetCandidateLibraries(DependencyContext dependencyContext)
+        {
+            // When using Microsoft.AspNetCore.App \ Microsoft.AspNetCore.All shared runtimes, entries in the RuntimeLibraries
+            // get "erased" and it is no longer accurate to query to determine a library's dependency closure.
+            // We'll use CompileLibraries to calculate the dependency graph and runtime library to resolve assemblies to inspect.
+            var candidatesResolver = new CandidateResolver(dependencyContext.CompileLibraries, ReferenceAssemblies);
+            foreach (var library in dependencyContext.RuntimeLibraries)
+            {
+                if (candidatesResolver.IsCandidate(library))
+                {
+                    yield return library;
+                }
+            }
+        }
+
+        private class CandidateResolver
+        {
+            private readonly IDictionary<string, Dependency> _compileLibraries;
+
+            public CandidateResolver(IReadOnlyList<Library> compileLibraries, ISet<string> referenceAssemblies)
+            {
+                var compileLibrariesWithNoDuplicates = new Dictionary<string, Dependency>(StringComparer.OrdinalIgnoreCase);
+                foreach (var library in compileLibraries)
+                {
+                    if (compileLibrariesWithNoDuplicates.ContainsKey(library.Name))
+                    {
+                        throw new InvalidOperationException(Resources.FormatCandidateResolver_DifferentCasedReference(library.Name));
+                    }
+
+                    compileLibrariesWithNoDuplicates.Add(library.Name, CreateDependency(library, referenceAssemblies));
+                }
+
+                _compileLibraries = compileLibrariesWithNoDuplicates;
+            }
+
+            public bool IsCandidate(Library library)
+            {
+                var classification = ComputeClassification(library.Name);
+                return classification == DependencyClassification.ReferencesMvc;
+            }
+
+            private Dependency CreateDependency(Library library, ISet<string> referenceAssemblies)
+            {
+                var classification = DependencyClassification.Unknown;
+                if (referenceAssemblies.Contains(library.Name))
+                {
+                    classification = DependencyClassification.MvcReference;
+                }
+
+                return new Dependency(library, classification);
+            }
+
+            private DependencyClassification ComputeClassification(string dependency)
+            {
+                if (!_compileLibraries.ContainsKey(dependency))
+                {
+                    // Library does not have runtime dependency. Since we can't infer
+                    // anything about it's references, we'll assume it does not have a reference to Mvc.
+                    return DependencyClassification.DoesNotReferenceMvc;
+                }
+
+                var candidateEntry = _compileLibraries[dependency];
+                if (candidateEntry.Classification != DependencyClassification.Unknown)
+                {
+                    return candidateEntry.Classification;
+                }
+                else
+                {
+                    var classification = DependencyClassification.DoesNotReferenceMvc;
+                    foreach (var candidateDependency in candidateEntry.Library.Dependencies)
+                    {
+                        var dependencyClassification = ComputeClassification(candidateDependency.Name);
+                        if (dependencyClassification == DependencyClassification.ReferencesMvc ||
+                            dependencyClassification == DependencyClassification.MvcReference)
+                        {
+                            classification = DependencyClassification.ReferencesMvc;
+                            break;
+                        }
+                    }
+
+                    candidateEntry.Classification = classification;
+
+                    return classification;
+                }
+            }
+
+            private class Dependency
+            {
+                public Dependency(Library library, DependencyClassification classification)
+                {
+                    Library = library;
+                    Classification = classification;
+                }
+
+                public Library Library { get; }
+
+                public DependencyClassification Classification { get; set; }
+
+                public override string ToString()
+                {
+                    return $"Library: {Library.Name}, Classification: {Classification}";
+                }
+            }
+
+            private enum DependencyClassification
+            {
+                Unknown = 0,
+
+                /// <summary>
+                /// References (directly or transitively) one of the Mvc packages listed in
+                /// <see cref="ReferenceAssemblies"/>.
+                /// </summary>
+                ReferencesMvc = 1,
+
+                /// <summary>
+                /// Does not reference (directly or transitively) one of the Mvc packages listed by
+                /// <see cref="ReferenceAssemblies"/>.
+                /// </summary>
+                DoesNotReferenceMvc = 2,
+
+                /// <summary>
+                /// One of the references listed in <see cref="ReferenceAssemblies"/>.
+                /// </summary>
+                MvcReference = 3,
+            }
+        }
+
+        private readonly struct AssemblyItem
+        {
+            public AssemblyItem(Assembly assembly, IReadOnlyList<Assembly> associatedAssemblies)
+            {
+                Assembly = assembly;
+                RelatedAssemblies = associatedAssemblies;
+            }
+
+            public Assembly Assembly { get; }
+
+            public IReadOnlyList<Assembly> RelatedAssemblies { get; }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPart.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPart.cs
new file mode 100644
index 0000000000..807af25a9d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPart.cs
@@ -0,0 +1,16 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    /// <summary>
+    /// A part of an MVC application.
+    /// </summary>
+    public abstract class ApplicationPart
+    {
+        /// <summary>
+        /// Gets the <see cref="ApplicationPart"/> name.
+        /// </summary>
+        public abstract string Name { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPartFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPartFactory.cs
new file mode 100644
index 0000000000..71dc6a0b41
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPartFactory.cs
@@ -0,0 +1,62 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Core;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    /// <summary>
+    /// Specifies a contract for synthesizing one or more <see cref="ApplicationPart"/> instances
+    /// from an <see cref="Assembly"/>.
+    /// <para>
+    /// By default, Mvc registers each application assembly that it discovers as an <see cref="AssemblyPart"/>.
+    /// Assemblies can optionally specify an <see cref="ApplicationPartFactory"/> to configure parts for the assembly
+    /// by using <see cref="ProvideApplicationPartFactoryAttribute"/>.
+    /// </para>
+    /// </summary>
+    public abstract class ApplicationPartFactory
+    {
+        /// <summary>
+        /// Gets one or more <see cref="ApplicationPart"/> instances for the specified <paramref name="assembly"/>.
+        /// </summary>
+        /// <param name="assembly">The <see cref="Assembly"/>.</param>
+        public abstract IEnumerable<ApplicationPart> GetApplicationParts(Assembly assembly);
+
+        /// <summary>
+        /// Gets the <see cref="ApplicationPartFactory"/> for the specified assembly.
+        /// <para>
+        /// An assembly may specify an <see cref="ApplicationPartFactory"/> using <see cref="ProvideApplicationPartFactoryAttribute"/>.
+        /// Otherwise, <see cref="DefaultApplicationPartFactory"/> is used.
+        /// </para>
+        /// </summary>
+        /// <param name="assembly">The <see cref="Assembly"/>.</param>
+        /// <returns>An instance of <see cref="ApplicationPartFactory"/>.</returns>
+        public static ApplicationPartFactory GetApplicationPartFactory(Assembly assembly)
+        {
+            if (assembly == null)
+            {
+                throw new ArgumentNullException(nameof(assembly));
+            }
+
+            var provideAttribute = assembly.GetCustomAttribute<ProvideApplicationPartFactoryAttribute>();
+            if (provideAttribute == null)
+            {
+                return DefaultApplicationPartFactory.Instance;
+            }
+
+            var type = provideAttribute.GetFactoryType();
+            if (!typeof(ApplicationPartFactory).IsAssignableFrom(type))
+            {
+                throw new InvalidOperationException(Resources.FormatApplicationPartFactory_InvalidFactoryType(
+                    type,
+                    nameof(ProvideApplicationPartFactoryAttribute),
+                    typeof(ApplicationPartFactory)));
+            }
+
+            return (ApplicationPartFactory)Activator.CreateInstance(type);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPartManager.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPartManager.cs
new file mode 100644
index 0000000000..1636c61df7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPartManager.cs
@@ -0,0 +1,69 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    /// <summary>
+    /// Manages the parts and features of an MVC application.
+    /// </summary>
+    public class ApplicationPartManager
+    {
+        /// <summary>
+        /// Gets the list of <see cref="IApplicationFeatureProvider"/>s.
+        /// </summary>
+        public IList<IApplicationFeatureProvider> FeatureProviders { get; } =
+            new List<IApplicationFeatureProvider>();
+
+        /// <summary>
+        /// Gets the list of <see cref="ApplicationPart"/> instances.
+        /// <para>
+        /// Instances in this collection are stored in precedence order. An <see cref="ApplicationPart"/> that appears
+        /// earlier in the list has a higher precendence.
+        /// An <see cref="IApplicationFeatureProvider"/> may choose to use this an interface as a way to resolve conflicts when
+        /// multiple <see cref="ApplicationPart"/> instances resolve equivalent feature values.
+        /// </para>
+        /// </summary>
+        public IList<ApplicationPart> ApplicationParts { get; } = new List<ApplicationPart>();
+
+        /// <summary>
+        /// Populates the given <paramref name="feature"/> using the list of
+        /// <see cref="IApplicationFeatureProvider{TFeature}"/>s configured on the
+        /// <see cref="ApplicationPartManager"/>.
+        /// </summary>
+        /// <typeparam name="TFeature">The type of the feature.</typeparam>
+        /// <param name="feature">The feature instance to populate.</param>
+        public void PopulateFeature<TFeature>(TFeature feature)
+        {
+            if (feature == null)
+            {
+                throw new ArgumentNullException(nameof(feature));
+            }
+
+            foreach (var provider in FeatureProviders.OfType<IApplicationFeatureProvider<TFeature>>())
+            {
+                provider.PopulateFeature(ApplicationParts, feature);
+            }
+        }
+
+        internal void PopulateDefaultParts(string entryAssemblyName)
+        {
+            var entryAssembly = Assembly.Load(new AssemblyName(entryAssemblyName));
+            var assembliesProvider = new ApplicationAssembliesProvider();
+            var applicationAssemblies = assembliesProvider.ResolveAssemblies(entryAssembly);
+
+            foreach (var assembly in applicationAssemblies)
+            {
+                var partFactory = ApplicationPartFactory.GetApplicationPartFactory(assembly);
+                foreach (var part in partFactory.GetApplicationParts(assembly))
+                {
+                    ApplicationParts.Add(part);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/AssemblyPart.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/AssemblyPart.cs
new file mode 100644
index 0000000000..e3df2d6a14
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/AssemblyPart.cs
@@ -0,0 +1,65 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.Extensions.DependencyModel;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    /// <summary>
+    /// An <see cref="ApplicationPart"/> backed by an <see cref="System.Reflection.Assembly"/>.
+    /// </summary>
+    public class AssemblyPart :
+        ApplicationPart,
+        IApplicationPartTypeProvider,
+        ICompilationReferencesProvider
+    {
+        /// <summary>
+        /// Initializes a new <see cref="AssemblyPart"/> instance.
+        /// </summary>
+        /// <param name="assembly">The backing <see cref="System.Reflection.Assembly"/>.</param>
+        public AssemblyPart(Assembly assembly)
+        {
+            Assembly = assembly ?? throw new ArgumentNullException(nameof(assembly));
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Assembly"/> of the <see cref="ApplicationPart"/>.
+        /// </summary>
+        public Assembly Assembly { get; }
+
+        /// <summary>
+        /// Gets the name of the <see cref="ApplicationPart"/>.
+        /// </summary>
+        public override string Name => Assembly.GetName().Name;
+
+        /// <inheritdoc />
+        public IEnumerable<TypeInfo> Types => Assembly.DefinedTypes;
+
+        /// <inheritdoc />
+        public IEnumerable<string> GetReferencePaths()
+        {
+            if (Assembly.IsDynamic)
+            {
+                // Skip loading process for dynamic assemblies. This prevents DependencyContextLoader from reading the
+                // .deps.json file from either manifest resources or the assembly location, which will fail.
+                return Enumerable.Empty<string>();
+            }
+
+            var dependencyContext = DependencyContext.Load(Assembly);
+            if (dependencyContext != null)
+            {
+                return dependencyContext.CompileLibraries.SelectMany(library => library.ResolveReferencePaths());
+            }
+
+            // If an application has been compiled without preserveCompilationContext, return the path to the assembly
+            // as a reference. For runtime compilation, this will allow the compilation to succeed as long as it least
+            // one application part has been compiled with preserveCompilationContext and contains a super set of types
+            // required for the compilation to succeed.
+            return new[] { Assembly.Location };
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/DefaultApplicationPartFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/DefaultApplicationPartFactory.cs
new file mode 100644
index 0000000000..60a08f7974
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/DefaultApplicationPartFactory.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    /// <summary>
+    /// Default <see cref="ApplicationPartFactory"/>.
+    /// </summary>
+    public class DefaultApplicationPartFactory : ApplicationPartFactory
+    {
+        /// <summary>
+        /// Gets an instance of <see cref="DefaultApplicationPartFactory"/>.
+        /// </summary>
+        public static DefaultApplicationPartFactory Instance { get; } = new DefaultApplicationPartFactory();
+
+        /// <summary>
+        /// Gets the sequence of <see cref="ApplicationPart"/> instances that are created by this instance of <see cref="DefaultApplicationPartFactory"/>.
+        /// <para>
+        /// Applications may use this method to get the same behavior as this factory produces during MVC's default part discovery.
+        /// </para>
+        /// </summary>
+        /// <param name="assembly">The <see cref="Assembly"/>.</param>
+        /// <returns>The sequence of <see cref="ApplicationPart"/> instances.</returns>
+        public static IEnumerable<ApplicationPart> GetDefaultApplicationParts(Assembly assembly)
+        {
+            if (assembly == null)
+            {
+                throw new ArgumentNullException(nameof(assembly));
+            }
+
+            yield return new AssemblyPart(assembly);
+        }
+
+        /// <inheritdoc />
+        public override IEnumerable<ApplicationPart> GetApplicationParts(Assembly assembly)
+        {
+            return GetDefaultApplicationParts(assembly);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationFeatureProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationFeatureProvider.cs
new file mode 100644
index 0000000000..2ee9ece9f0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationFeatureProvider.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    /// <summary>
+    /// Marker interface for <see cref="IApplicationFeatureProvider"/>
+    /// implementations.
+    /// </summary>
+    public interface IApplicationFeatureProvider
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationFeatureProviderOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationFeatureProviderOfT.cs
new file mode 100644
index 0000000000..cf7f870bca
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationFeatureProviderOfT.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    /// <summary>
+    /// A provider for a given <typeparamref name="TFeature"/> feature.
+    /// </summary>
+    /// <typeparam name="TFeature">The type of the feature.</typeparam>
+    public interface IApplicationFeatureProvider<TFeature> : IApplicationFeatureProvider
+    {
+        /// <summary>
+        /// Updates the <paramref name="feature"/> instance.
+        /// </summary>
+        /// <param name="parts">The list of <see cref="ApplicationPart"/> instances in the application.
+        /// </param>
+        /// <param name="feature">The feature instance to populate.</param>
+        /// <remarks>
+        /// <see cref="ApplicationPart"/> instances in <paramref name="parts"/> appear in the same ordered sequence they
+        /// are stored in <see cref="ApplicationPartManager.ApplicationParts"/>. This ordering may be used by the feature
+        /// provider to make precedence decisions.
+        /// </remarks>
+        void PopulateFeature(IEnumerable<ApplicationPart> parts, TFeature feature);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationPartTypeProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationPartTypeProvider.cs
new file mode 100644
index 0000000000..616c9a9aea
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationPartTypeProvider.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    /// <summary>
+    /// Exposes a set of types from an <see cref="ApplicationPart"/>.
+    /// </summary>
+    public interface IApplicationPartTypeProvider
+    {
+        /// <summary>
+        /// Gets the list of available types in the <see cref="ApplicationPart"/>.
+        /// </summary>
+        IEnumerable<TypeInfo> Types { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ICompilationReferencesProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ICompilationReferencesProvider.cs
new file mode 100644
index 0000000000..bb2691bedd
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ICompilationReferencesProvider.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    /// <summary>
+    /// Exposes one or more reference paths from an <see cref="ApplicationPart"/>.
+    /// </summary>
+    public interface ICompilationReferencesProvider
+    {
+        /// <summary>
+        /// Gets reference paths used to perform runtime compilation.
+        /// </summary>
+        IEnumerable<string> GetReferencePaths();
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/NullApplicationPartFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/NullApplicationPartFactory.cs
new file mode 100644
index 0000000000..6fe7ff39ff
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/NullApplicationPartFactory.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    /// <summary>
+    /// An <see cref="ApplicationPartFactory"/> that produces no parts.
+    /// <para>
+    /// This factory may be used to to preempt Mvc's default part discovery allowing for custom configuration at a later stage.
+    /// </para>
+    /// </summary>
+    public class NullApplicationPartFactory : ApplicationPartFactory
+    {
+        /// <inheritdoc />
+        public override IEnumerable<ApplicationPart> GetApplicationParts(Assembly assembly)
+        {
+            return Enumerable.Empty<ApplicationPart>();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ProvideApplicationPartFactoryAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ProvideApplicationPartFactoryAttribute.cs
new file mode 100644
index 0000000000..1ad9e57879
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ProvideApplicationPartFactoryAttribute.cs
@@ -0,0 +1,51 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Core;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    /// <summary>
+    /// Provides a <see cref="ApplicationPartFactory"/> type.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false)]
+    public sealed class ProvideApplicationPartFactoryAttribute : Attribute
+    {
+        private readonly Type _applicationPartFactoryType;
+        private readonly string _applicationPartFactoryTypeName;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="ProvideApplicationPartFactoryAttribute"/> with the specified type.
+        /// </summary>
+        /// <param name="factoryType">The factory type.</param>
+        public ProvideApplicationPartFactoryAttribute(Type factoryType)
+        {
+            _applicationPartFactoryType = factoryType ?? throw new ArgumentNullException(nameof(factoryType));
+        }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="ProvideApplicationPartFactoryAttribute"/> with the specified type name.
+        /// </summary>
+        /// <param name="factoryTypeName">The assembly qualified type name.</param>
+        public ProvideApplicationPartFactoryAttribute(string factoryTypeName)
+        {
+            if (string.IsNullOrEmpty(factoryTypeName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(factoryTypeName));
+            }
+
+            _applicationPartFactoryTypeName = factoryTypeName;
+        }
+
+        /// <summary>
+        /// Gets the factory type.
+        /// </summary>
+        /// <returns></returns>
+        public Type GetFactoryType()
+        {
+            return _applicationPartFactoryType ??
+                Type.GetType(_applicationPartFactoryTypeName, throwOnError: true);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/RelatedAssemblyAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/RelatedAssemblyAttribute.cs
new file mode 100644
index 0000000000..b9f6cdb2d7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/RelatedAssemblyAttribute.cs
@@ -0,0 +1,126 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Core;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    /// <summary>
+    /// Specifies a assembly to load as part of MVC's assembly discovery mechanism.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+    public sealed class RelatedAssemblyAttribute : Attribute
+    {
+        private static readonly Func<string, Assembly> AssemblyLoadFileDelegate = Assembly.LoadFile;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="RelatedAssemblyAttribute"/>.
+        /// </summary>
+        /// <param name="assemblyFileName">The file name, without extension, of the related assembly.</param>
+        public RelatedAssemblyAttribute(string assemblyFileName)
+        {
+            if (string.IsNullOrEmpty(assemblyFileName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(assemblyFileName));
+            }
+
+            AssemblyFileName = assemblyFileName;
+        }
+
+        /// <summary>
+        /// Gets the assembly file name without extension.
+        /// </summary>
+        public string AssemblyFileName { get; }
+
+        /// <summary>
+        /// Gets <see cref="Assembly"/> instances specified by <see cref="RelatedAssemblyAttribute"/>.
+        /// </summary>
+        /// <param name="assembly">The assembly containing <see cref="RelatedAssemblyAttribute"/> instances.</param>
+        /// <param name="throwOnError">Determines if the method throws if a related assembly could not be located.</param>
+        /// <returns>Related <see cref="Assembly"/> instances.</returns>
+        public static IReadOnlyList<Assembly> GetRelatedAssemblies(Assembly assembly, bool throwOnError)
+        {
+            if (assembly == null)
+            {
+                throw new ArgumentNullException(nameof(assembly));
+            }
+
+            return GetRelatedAssemblies(assembly, throwOnError, File.Exists, AssemblyLoadFileDelegate);
+        }
+
+        internal static IReadOnlyList<Assembly> GetRelatedAssemblies(
+            Assembly assembly,
+            bool throwOnError,
+            Func<string, bool> fileExists,
+            Func<string, Assembly> loadFile)
+        {
+            if (assembly == null)
+            {
+                throw new ArgumentNullException(nameof(assembly));
+            }
+
+            // MVC will specifically look for related parts in the same physical directory as the assembly.
+            // No-op if the assembly does not have a location.
+            if (assembly.IsDynamic || string.IsNullOrEmpty(assembly.CodeBase))
+            {
+                return Array.Empty<Assembly>();
+            }
+
+            var attributes = assembly.GetCustomAttributes<RelatedAssemblyAttribute>().ToArray();
+            if (attributes.Length == 0)
+            {
+                return Array.Empty<Assembly>();
+            }
+
+            var assemblyName = assembly.GetName().Name;
+            var assemblyLocation = GetAssemblyLocation(assembly);
+            var assemblyDirectory = Path.GetDirectoryName(assemblyLocation);
+
+            var relatedAssemblies = new List<Assembly>();
+            for (var i = 0; i < attributes.Length; i++)
+            {
+                var attribute = attributes[i];
+                if (string.Equals(assemblyName, attribute.AssemblyFileName, StringComparison.OrdinalIgnoreCase))
+                {
+                    throw new InvalidOperationException(
+                        Resources.FormatRelatedAssemblyAttribute_AssemblyCannotReferenceSelf(nameof(RelatedAssemblyAttribute), assemblyName));
+                }
+
+                var relatedAssemblyLocation = Path.Combine(assemblyDirectory, attribute.AssemblyFileName + ".dll");
+                if (!fileExists(relatedAssemblyLocation))
+                {
+                    if (throwOnError)
+                    {
+                        throw new FileNotFoundException(
+                            Resources.FormatRelatedAssemblyAttribute_CouldNotBeFound(attribute.AssemblyFileName, assemblyName, assemblyDirectory),
+                            relatedAssemblyLocation);
+                    }
+                    else
+                    {
+                        continue;
+                    }
+                }
+
+                var relatedAssembly = loadFile(relatedAssemblyLocation);
+                relatedAssemblies.Add(relatedAssembly);
+            }
+
+            return relatedAssemblies;
+        }
+
+        internal static string GetAssemblyLocation(Assembly assembly)
+        {
+            if (Uri.TryCreate(assembly.CodeBase, UriKind.Absolute, out var result) && result.IsFile)
+            {
+                return result.LocalPath;
+            }
+
+            return assembly.Location;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AreaAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AreaAttribute.cs
new file mode 100644
index 0000000000..3e16b89297
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AreaAttribute.cs
@@ -0,0 +1,29 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Specifies the area containing a controller or action.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public class AreaAttribute : RouteValueAttribute
+    {
+        /// <summary>
+        /// Initializes a new <see cref="AreaAttribute"/> instance.
+        /// </summary>
+        /// <param name="areaName">The area containing the controller or action.</param>
+        public AreaAttribute(string areaName)
+            : base("area", areaName)
+        {
+            if (string.IsNullOrEmpty(areaName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(areaName));
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Authorization/AllowAnonymousFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Authorization/AllowAnonymousFilter.cs
new file mode 100644
index 0000000000..34b785cbec
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Authorization/AllowAnonymousFilter.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Authorization
+{
+    /// <summary>
+    /// An implementation of <see cref="IAllowAnonymousFilter"/>
+    /// </summary>
+    public class AllowAnonymousFilter : IAllowAnonymousFilter
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Authorization/AuthorizeFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Authorization/AuthorizeFilter.cs
new file mode 100644
index 0000000000..abf76ea191
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Authorization/AuthorizeFilter.cs
@@ -0,0 +1,222 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization.Policy;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Authorization
+{
+    /// <summary>
+    /// An implementation of <see cref="IAsyncAuthorizationFilter"/> which applies a specific
+    /// <see cref="AuthorizationPolicy"/>. MVC recognizes the <see cref="AuthorizeAttribute"/> and adds an instance of
+    /// this filter to the associated action or controller.
+    /// </summary>
+    public class AuthorizeFilter : IAsyncAuthorizationFilter, IFilterFactory
+    {
+        private MvcOptions _mvcOptions;
+        private AuthorizationPolicy _effectivePolicy;
+
+        /// <summary>
+        /// Initializes a new <see cref="AuthorizeFilter"/> instance.
+        /// </summary>
+        public AuthorizeFilter()
+            : this(authorizeData: new[] { new AuthorizeAttribute() })
+        {
+        }
+
+        /// <summary>
+        /// Initialize a new <see cref="AuthorizeFilter"/> instance.
+        /// </summary>
+        /// <param name="policy">Authorization policy to be used.</param>
+        public AuthorizeFilter(AuthorizationPolicy policy)
+        {
+            if (policy == null)
+            {
+                throw new ArgumentNullException(nameof(policy));
+            }
+
+            Policy = policy;
+        }
+
+        /// <summary>
+        /// Initialize a new <see cref="AuthorizeFilter"/> instance.
+        /// </summary>
+        /// <param name="policyProvider">The <see cref="IAuthorizationPolicyProvider"/> to use to resolve policy names.</param>
+        /// <param name="authorizeData">The <see cref="IAuthorizeData"/> to combine into an <see cref="IAuthorizeData"/>.</param>
+        public AuthorizeFilter(IAuthorizationPolicyProvider policyProvider, IEnumerable<IAuthorizeData> authorizeData)
+            : this(authorizeData)
+        {
+            if (policyProvider == null)
+            {
+                throw new ArgumentNullException(nameof(policyProvider));
+            }
+
+            PolicyProvider = policyProvider;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="AuthorizeFilter"/>.
+        /// </summary>
+        /// <param name="authorizeData">The <see cref="IAuthorizeData"/> to combine into an <see cref="IAuthorizeData"/>.</param>
+        public AuthorizeFilter(IEnumerable<IAuthorizeData> authorizeData)
+        {
+            if (authorizeData == null)
+            {
+                throw new ArgumentNullException(nameof(authorizeData));
+            }
+
+            AuthorizeData = authorizeData;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="AuthorizeFilter"/>.
+        /// </summary>
+        /// <param name="policy">The name of the policy to require for authorization.</param>
+        public AuthorizeFilter(string policy)
+            : this(new[] { new AuthorizeAttribute(policy) })
+        {
+        }
+
+        /// <summary>
+        /// The <see cref="IAuthorizationPolicyProvider"/> to use to resolve policy names.
+        /// </summary>
+        public IAuthorizationPolicyProvider PolicyProvider { get; }
+
+        /// <summary>
+        /// The <see cref="IAuthorizeData"/> to combine into an <see cref="IAuthorizeData"/>.
+        /// </summary>
+        public IEnumerable<IAuthorizeData> AuthorizeData { get; }
+
+        /// <summary>
+        /// Gets the authorization policy to be used.
+        /// </summary>
+        /// <remarks>
+        /// If<c>null</c>, the policy will be constructed using
+        /// <see cref="AuthorizationPolicy.CombineAsync(IAuthorizationPolicyProvider, IEnumerable{IAuthorizeData})"/>.
+        /// </remarks>
+        public AuthorizationPolicy Policy { get; }
+
+        bool IFilterFactory.IsReusable => true;
+
+        private async Task<AuthorizationPolicy> GetEffectivePolicyAsync(AuthorizationFilterContext context)
+        {
+            if (_effectivePolicy != null)
+            {
+                return _effectivePolicy;
+            }
+
+            var effectivePolicy = Policy;
+
+            if (_mvcOptions == null) 
+            {
+                _mvcOptions = context.HttpContext.RequestServices.GetRequiredService<IOptions<MvcOptions>>().Value;
+            }
+
+            if (_mvcOptions.AllowCombiningAuthorizeFilters)
+            {
+                if (!context.IsEffectivePolicy<AuthorizeFilter>(this))
+                {
+                    return null;
+                }
+
+                // Combine all authorize filters into single effective policy that's only run on the closest filter
+                AuthorizationPolicyBuilder builder = null;
+                for (var i = 0; i < context.Filters.Count; i++)
+                {
+                    if (ReferenceEquals(this, context.Filters[i]))
+                    {
+                        continue;
+                    }
+                    
+                    if (context.Filters[i] is AuthorizeFilter authorizeFilter)
+                    {
+                        builder = builder ?? new AuthorizationPolicyBuilder(effectivePolicy);
+                        builder.Combine(authorizeFilter.Policy);
+                    }
+                }
+
+                effectivePolicy = builder?.Build() ?? effectivePolicy;
+            }
+
+            if (effectivePolicy == null)
+            {
+                if (PolicyProvider == null)
+                {
+                    throw new InvalidOperationException(
+                        Resources.FormatAuthorizeFilter_AuthorizationPolicyCannotBeCreated(
+                            nameof(AuthorizationPolicy),
+                            nameof(IAuthorizationPolicyProvider)));
+                }
+
+                effectivePolicy = await AuthorizationPolicy.CombineAsync(PolicyProvider, AuthorizeData);
+            }
+
+            // We can cache the effective policy when there is no custom policy provider 
+            if (PolicyProvider == null)
+            {
+                _effectivePolicy = effectivePolicy;
+            }
+
+            return effectivePolicy;
+        }
+
+        /// <inheritdoc />
+        public virtual async Task OnAuthorizationAsync(AuthorizationFilterContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var effectivePolicy = await GetEffectivePolicyAsync(context);
+            if (effectivePolicy == null)
+            {
+                return;
+            }
+
+            var policyEvaluator = context.HttpContext.RequestServices.GetRequiredService<IPolicyEvaluator>();
+
+            var authenticateResult = await policyEvaluator.AuthenticateAsync(effectivePolicy, context.HttpContext);
+
+            // Allow Anonymous skips all authorization
+            if (context.Filters.Any(item => item is IAllowAnonymousFilter))
+            {
+                return;
+            }
+
+            var authorizeResult = await policyEvaluator.AuthorizeAsync(effectivePolicy, authenticateResult, context.HttpContext, context);
+
+            if (authorizeResult.Challenged)
+            {
+                context.Result = new ChallengeResult(effectivePolicy.AuthenticationSchemes.ToArray());
+            }
+            else if (authorizeResult.Forbidden)
+            {
+                context.Result = new ForbidResult(effectivePolicy.AuthenticationSchemes.ToArray());
+            }
+        }
+
+        IFilterMetadata IFilterFactory.CreateInstance(IServiceProvider serviceProvider)
+        {
+            if (Policy != null || PolicyProvider != null)
+            {
+                // The filter is fully constructed. Use the current instance to authorize.
+                return this;
+            }
+
+            Debug.Assert(AuthorizeData != null);
+            var policyProvider = serviceProvider.GetRequiredService<IAuthorizationPolicyProvider>();
+            return AuthorizationApplicationModelProvider.GetFilter(policyProvider, AuthorizeData);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BadRequestObjectResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BadRequestObjectResult.cs
new file mode 100644
index 0000000000..f31552a3a6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BadRequestObjectResult.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="ObjectResult"/> that when executed will produce a Bad Request (400) response.
+    /// </summary>
+    public class BadRequestObjectResult : ObjectResult
+    {
+        /// <summary>
+        /// Creates a new <see cref="BadRequestObjectResult"/> instance.
+        /// </summary>
+        /// <param name="error">Contains the errors to be returned to the client.</param>
+        public BadRequestObjectResult(object error)
+            : base(error)
+        {
+            StatusCode = StatusCodes.Status400BadRequest;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="BadRequestObjectResult"/> instance.
+        /// </summary>
+        /// <param name="modelState"><see cref="ModelStateDictionary"/> containing the validation errors.</param>
+        public BadRequestObjectResult(ModelStateDictionary modelState)
+            : base(new SerializableError(modelState))
+        {
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            StatusCode = StatusCodes.Status400BadRequest;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BadRequestResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BadRequestResult.cs
new file mode 100644
index 0000000000..69025ee49d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BadRequestResult.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A <see cref="StatusCodeResult"/> that when
+    /// executed will produce a Bad Request (400) response.
+    /// </summary>
+    public class BadRequestResult : StatusCodeResult
+    {
+        /// <summary>
+        /// Creates a new <see cref="BadRequestResult"/> instance.
+        /// </summary>
+        public BadRequestResult()
+            : base(StatusCodes.Status400BadRequest)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BindAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BindAttribute.cs
new file mode 100644
index 0000000000..fe4f9e7996
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BindAttribute.cs
@@ -0,0 +1,85 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// This attribute can be used on action parameters and types, to indicate model level metadata.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)]
+    public class BindAttribute : Attribute, IModelNameProvider, IPropertyFilterProvider
+    {
+        private static readonly Func<ModelMetadata, bool> _default = (m) => true;
+
+        private Func<ModelMetadata, bool> _propertyFilter;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="BindAttribute"/>.
+        /// </summary>
+        /// <param name="include">Names of parameters to include in binding.</param>
+        public BindAttribute(params string[] include)
+        {
+            var items = new List<string>();
+            foreach (var item in include)
+            {
+                items.AddRange(SplitString(item));
+            }
+
+            Include = items.ToArray();
+        }
+
+        /// <summary>
+        /// Gets the names of properties to include in model binding.
+        /// </summary>
+        public string[] Include { get; }
+
+        /// <summary>
+        /// Allows a user to specify a particular prefix to match during model binding.
+        /// </summary>
+        // This property is exposed for back compat reasons.
+        public string Prefix { get; set; }
+
+        /// <summary>
+        /// Represents the model name used during model binding.
+        /// </summary>
+        string IModelNameProvider.Name => Prefix;
+
+        /// <inheritdoc />
+        public Func<ModelMetadata, bool> PropertyFilter
+        {
+            get
+            {
+                if (Include != null && Include.Length > 0)
+                {
+                    if (_propertyFilter == null)
+                    {
+                        _propertyFilter = (m) => Include.Contains(m.PropertyName, StringComparer.Ordinal);
+                    }
+
+                    return _propertyFilter;
+                }
+                else
+                {
+                    return _default;
+                }
+            }
+        }
+
+        private static IEnumerable<string> SplitString(string original)
+        {
+            if (string.IsNullOrEmpty(original))
+            {
+                return Array.Empty<string>();
+            }
+
+            var split = original.Split(',').Select(piece => piece.Trim()).Where(piece => !string.IsNullOrEmpty(piece));
+
+            return split;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BindPropertiesAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BindPropertiesAttribute.cs
new file mode 100644
index 0000000000..28a1558290
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BindPropertiesAttribute.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An attribute that enables binding for all properties the decorated controller or Razor Page model defines.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+    public class BindPropertiesAttribute : Attribute
+    {
+        /// <summary>
+        /// When <c>true</c>, allows properties to be bound on GET requests. When <c>false</c>, properties
+        /// do not get model bound or validated on GET requests.
+        /// <para>
+        /// Defaults to <c>false</c>.
+        /// </para>
+        /// </summary>
+        public bool SupportsGet { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BindPropertyAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BindPropertyAttribute.cs
new file mode 100644
index 0000000000..2058d7d907
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BindPropertyAttribute.cs
@@ -0,0 +1,48 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
+    public class BindPropertyAttribute : Attribute, IModelNameProvider, IBinderTypeProviderMetadata, IRequestPredicateProvider
+    {
+        private static readonly Func<ActionContext, bool> _supportsAllRequests = (c) => true;
+
+        private static readonly Func<ActionContext, bool> _supportsNonGetRequests = IsNonGetRequest;
+
+        private BindingSource _bindingSource;
+
+        public bool SupportsGet { get; set; }
+
+        public Type BinderType { get; set; }
+
+        /// <inheritdoc />
+        public virtual BindingSource BindingSource
+        {
+            get
+            {
+                if (_bindingSource == null && BinderType != null)
+                {
+                    return BindingSource.Custom;
+                }
+
+                return _bindingSource;
+            }
+            protected set => _bindingSource = value;
+        }
+
+        /// <inheritdoc />
+        public string Name { get; set; }
+
+        Func<ActionContext, bool> IRequestPredicateProvider.RequestPredicate
+            => SupportsGet ? _supportsAllRequests : _supportsNonGetRequests;
+
+        private static bool IsNonGetRequest(ActionContext context)
+        {
+            return !string.Equals(context.HttpContext.Request.Method, "GET", StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcApplicationBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcApplicationBuilderExtensions.cs
new file mode 100644
index 0000000000..2dcbcd8fe4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcApplicationBuilderExtensions.cs
@@ -0,0 +1,103 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Builder
+{
+    /// <summary>
+    /// Extension methods for <see cref="IApplicationBuilder"/> to add MVC to the request execution pipeline.
+    /// </summary>
+    public static class MvcApplicationBuilderExtensions
+    {
+        /// <summary>
+        /// Adds MVC to the <see cref="IApplicationBuilder"/> request execution pipeline.
+        /// </summary>
+        /// <param name="app">The <see cref="IApplicationBuilder"/>.</param>
+        /// <returns>A reference to this instance after the operation has completed.</returns>
+        /// <remarks>This method only supports attribute routing. To add conventional routes use
+        /// <see cref="UseMvc(IApplicationBuilder, Action{IRouteBuilder})"/>.</remarks>
+        public static IApplicationBuilder UseMvc(this IApplicationBuilder app)
+        {
+            if (app == null)
+            {
+                throw new ArgumentNullException(nameof(app));
+            }
+
+            return app.UseMvc(routes =>
+            {
+            });
+        }
+
+        /// <summary>
+        /// Adds MVC to the <see cref="IApplicationBuilder"/> request execution pipeline
+        /// with a default route named 'default' and the following template:
+        /// '{controller=Home}/{action=Index}/{id?}'.
+        /// </summary>
+        /// <param name="app">The <see cref="IApplicationBuilder"/>.</param>
+        /// <returns>A reference to this instance after the operation has completed.</returns>
+        public static IApplicationBuilder UseMvcWithDefaultRoute(this IApplicationBuilder app)
+        {
+            if (app == null)
+            {
+                throw new ArgumentNullException(nameof(app));
+            }
+
+            return app.UseMvc(routes =>
+            {
+                routes.MapRoute(
+                    name: "default",
+                    template: "{controller=Home}/{action=Index}/{id?}");
+            });
+        }
+
+        /// <summary>
+        /// Adds MVC to the <see cref="IApplicationBuilder"/> request execution pipeline.
+        /// </summary>
+        /// <param name="app">The <see cref="IApplicationBuilder"/>.</param>
+        /// <param name="configureRoutes">A callback to configure MVC routes.</param>
+        /// <returns>A reference to this instance after the operation has completed.</returns>
+        public static IApplicationBuilder UseMvc(
+            this IApplicationBuilder app,
+            Action<IRouteBuilder> configureRoutes)
+        {
+            if (app == null)
+            {
+                throw new ArgumentNullException(nameof(app));
+            }
+
+            if (configureRoutes == null)
+            {
+                throw new ArgumentNullException(nameof(configureRoutes));
+            }
+
+            // Verify if AddMvc was done before calling UseMvc
+            // We use the MvcMarkerService to make sure if all the services were added.
+            if (app.ApplicationServices.GetService(typeof(MvcMarkerService)) == null)
+            {
+                throw new InvalidOperationException(Resources.FormatUnableToFindServices(
+                    nameof(IServiceCollection),
+                    "AddMvc",
+                    "ConfigureServices(...)"));
+            }
+
+            var middlewarePipelineBuilder = app.ApplicationServices.GetRequiredService<MiddlewareFilterBuilder>();
+            middlewarePipelineBuilder.ApplicationBuilder = app.New();
+
+            var routes = new RouteBuilder(app)
+            {
+                DefaultHandler = app.ApplicationServices.GetRequiredService<MvcRouteHandler>(),
+            };
+
+            configureRoutes(routes);
+
+            routes.Routes.Insert(0, AttributeRouting.CreateAttributeMegaRoute(app.ApplicationServices));
+
+            return app.UseRouter(routes.Build());
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcAreaRouteBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcAreaRouteBuilderExtensions.cs
new file mode 100644
index 0000000000..f5db1df3b1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcAreaRouteBuilderExtensions.cs
@@ -0,0 +1,141 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Routing.Constraints;
+
+namespace Microsoft.AspNetCore.Builder
+{
+    /// <summary>
+    /// Extension methods for <see cref="IRouteBuilder"/>.
+    /// </summary>
+    public static class MvcAreaRouteBuilderExtensions
+    {
+        /// <summary>
+        /// Adds a route to the <see cref="IRouteBuilder"/> with the given MVC area with the specified
+        /// <paramref name="name"/>, <paramref name="areaName"/> and <paramref name="template"/>.
+        /// </summary>
+        /// <param name="routeBuilder">The <see cref="IRouteBuilder"/> to add the route to.</param>
+        /// <param name="name">The name of the route.</param>
+        /// <param name="areaName">The MVC area name.</param>
+        /// <param name="template">The URL pattern of the route.</param>
+        /// <returns>A reference to this instance after the operation has completed.</returns>
+        public static IRouteBuilder MapAreaRoute(
+            this IRouteBuilder routeBuilder,
+            string name,
+            string areaName,
+            string template)
+        {
+            MapAreaRoute(routeBuilder, name, areaName, template, defaults: null, constraints: null, dataTokens: null);
+            return routeBuilder;
+        }
+
+        /// <summary>
+        /// Adds a route to the <see cref="IRouteBuilder"/> with the given MVC area with the specified
+        /// <paramref name="name"/>, <paramref name="areaName"/>, <paramref name="template"/>, and
+        /// <paramref name="defaults"/>.
+        /// </summary>
+        /// <param name="routeBuilder">The <see cref="IRouteBuilder"/> to add the route to.</param>
+        /// <param name="name">The name of the route.</param>
+        /// <param name="areaName">The MVC area name.</param>
+        /// <param name="template">The URL pattern of the route.</param>
+        /// <param name="defaults">
+        /// An object that contains default values for route parameters. The object's properties represent the
+        /// names and values of the default values.
+        /// </param>
+        /// <returns>A reference to this instance after the operation has completed.</returns>
+        public static IRouteBuilder MapAreaRoute(
+            this IRouteBuilder routeBuilder,
+            string name,
+            string areaName,
+            string template,
+            object defaults)
+        {
+            MapAreaRoute(routeBuilder, name, areaName, template, defaults, constraints: null, dataTokens: null);
+            return routeBuilder;
+        }
+
+        /// <summary>
+        /// Adds a route to the <see cref="IRouteBuilder"/> with the given MVC area with the specified
+        /// <paramref name="name"/>, <paramref name="areaName"/>, <paramref name="template"/>, 
+        /// <paramref name="defaults"/>, and <paramref name="constraints"/>.
+        /// </summary>
+        /// <param name="routeBuilder">The <see cref="IRouteBuilder"/> to add the route to.</param>
+        /// <param name="name">The name of the route.</param>
+        /// <param name="areaName">The MVC area name.</param>
+        /// <param name="template">The URL pattern of the route.</param>
+        /// <param name="defaults">
+        /// An object that contains default values for route parameters. The object's properties represent the
+        /// names and values of the default values.
+        /// </param>
+        /// <param name="constraints">
+        /// An object that contains constraints for the route. The object's properties represent the names and
+        /// values of the constraints.
+        /// </param>
+        /// <returns>A reference to this instance after the operation has completed.</returns>
+        public static IRouteBuilder MapAreaRoute(
+            this IRouteBuilder routeBuilder,
+            string name,
+            string areaName,
+            string template,
+            object defaults,
+            object constraints)
+        {
+            MapAreaRoute(routeBuilder, name, areaName, template, defaults, constraints, dataTokens: null);
+            return routeBuilder;
+        }
+
+        /// <summary>
+        /// Adds a route to the <see cref="IRouteBuilder"/> with the given MVC area with the specified
+        /// <paramref name="name"/>, <paramref name="areaName"/>, <paramref name="template"/>, 
+        /// <paramref name="defaults"/>, <paramref name="constraints"/>, and <paramref name="dataTokens"/>.
+        /// </summary>
+        /// <param name="routeBuilder">The <see cref="IRouteBuilder"/> to add the route to.</param>
+        /// <param name="name">The name of the route.</param>
+        /// <param name="areaName">The MVC area name.</param>
+        /// <param name="template">The URL pattern of the route.</param>
+        /// <param name="defaults">
+        /// An object that contains default values for route parameters. The object's properties represent the
+        /// names and values of the default values.
+        /// </param>
+        /// <param name="constraints">
+        /// An object that contains constraints for the route. The object's properties represent the names and
+        /// values of the constraints.
+        /// </param>
+        /// <param name="dataTokens">
+        /// An object that contains data tokens for the route. The object's properties represent the names and
+        /// values of the data tokens.
+        /// </param>
+        /// <returns>A reference to this instance after the operation has completed.</returns>
+        public static IRouteBuilder MapAreaRoute(
+            this IRouteBuilder routeBuilder,
+            string name,
+            string areaName,
+            string template,
+            object defaults,
+            object constraints,
+            object dataTokens)
+        {
+            if (routeBuilder == null)
+            {
+                throw new ArgumentNullException(nameof(routeBuilder));
+            }
+
+            if (string.IsNullOrEmpty(areaName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(areaName));
+            }
+
+            var defaultsDictionary = new RouteValueDictionary(defaults);
+            defaultsDictionary["area"] = defaultsDictionary["area"] ?? areaName;
+
+            var constraintsDictionary = new RouteValueDictionary(constraints);
+            constraintsDictionary["area"] = constraintsDictionary["area"] ?? new StringRouteConstraint(areaName);
+
+            routeBuilder.MapRoute(name, template, defaultsDictionary, constraintsDictionary, dataTokens);
+            return routeBuilder;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CacheProfile.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CacheProfile.cs
new file mode 100644
index 0000000000..15998b31ea
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CacheProfile.cs
@@ -0,0 +1,48 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Defines a set of settings which can be used for response caching.
+    /// </summary>
+    public class CacheProfile
+    {
+        /// <summary>
+        /// Gets or sets the duration in seconds for which the response is cached.
+        /// If this property is set to a non null value,
+        /// the "max-age" in "Cache-control" header is set in the
+        /// <see cref="Microsoft.AspNetCore.Http.HttpContext.Response" />.
+        /// </summary>
+        public int? Duration { get; set; }
+
+        /// <summary>
+        /// Gets or sets the location where the data from a particular URL must be cached.
+        /// If this property is set to a non null value,
+        /// the "Cache-control" header is set in the <see cref="Microsoft.AspNetCore.Http.HttpContext.Response" />.
+        /// </summary>
+        public ResponseCacheLocation? Location { get; set; }
+
+        /// <summary>
+        /// Gets or sets the value which determines whether the data should be stored or not.
+        /// When set to <see langword="true"/>, it sets "Cache-control" header in
+        /// <see cref="Microsoft.AspNetCore.Http.HttpContext.Response" /> to "no-store".
+        /// Ignores the "Location" parameter for values other than "None".
+        /// Ignores the "Duration" parameter.
+        /// </summary>
+        public bool? NoStore { get; set; }
+
+        /// <summary>
+        /// Gets or sets the value for the Vary header in <see cref="Microsoft.AspNetCore.Http.HttpContext.Response" />.
+        /// </summary>
+        public string VaryByHeader { get; set; }
+
+        /// <summary>
+        /// Gets or sets the query keys to vary by.
+        /// </summary>
+        /// <remarks>
+        /// <see cref="VaryByQueryKeys"/> requires the response cache middleware.
+        /// </remarks>
+        public string[] VaryByQueryKeys { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ChallengeResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ChallengeResult.cs
new file mode 100644
index 0000000000..7f7f0249ca
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ChallengeResult.cs
@@ -0,0 +1,119 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="ActionResult"/> that on execution invokes <see cref="M:AuthenticationManager.ChallengeAsync"/>.
+    /// </summary>
+    public class ChallengeResult : ActionResult
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="ChallengeResult"/>.
+        /// </summary>
+        public ChallengeResult()
+            : this(Array.Empty<string>())
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ChallengeResult"/> with the
+        /// specified authentication scheme.
+        /// </summary>
+        /// <param name="authenticationScheme">The authentication scheme to challenge.</param>
+        public ChallengeResult(string authenticationScheme)
+            : this(new[] { authenticationScheme })
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ChallengeResult"/> with the
+        /// specified authentication schemes.
+        /// </summary>
+        /// <param name="authenticationSchemes">The authentication schemes to challenge.</param>
+        public ChallengeResult(IList<string> authenticationSchemes)
+            : this(authenticationSchemes, properties: null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ChallengeResult"/> with the
+        /// specified <paramref name="properties"/>.
+        /// </summary>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the authentication
+        /// challenge.</param>
+        public ChallengeResult(AuthenticationProperties properties)
+            : this(Array.Empty<string>(), properties)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ChallengeResult"/> with the
+        /// specified authentication scheme and <paramref name="properties"/>.
+        /// </summary>
+        /// <param name="authenticationScheme">The authentication schemes to challenge.</param>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the authentication
+        /// challenge.</param>
+        public ChallengeResult(string authenticationScheme, AuthenticationProperties properties)
+            : this(new[] { authenticationScheme }, properties)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ChallengeResult"/> with the
+        /// specified authentication schemes and <paramref name="properties"/>.
+        /// </summary>
+        /// <param name="authenticationSchemes">The authentication scheme to challenge.</param>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the authentication
+        /// challenge.</param>
+        public ChallengeResult(IList<string> authenticationSchemes, AuthenticationProperties properties)
+        {
+            AuthenticationSchemes = authenticationSchemes;
+            Properties = properties;
+        }
+
+        /// <summary>
+        /// Gets or sets the authentication schemes that are challenged.
+        /// </summary>
+        public IList<string> AuthenticationSchemes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="AuthenticationProperties"/> used to perform the authentication challenge.
+        /// </summary>
+        public AuthenticationProperties Properties { get; set; }
+
+        /// <inheritdoc />
+        public override async Task ExecuteResultAsync(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var loggerFactory = context.HttpContext.RequestServices.GetRequiredService<ILoggerFactory>();
+            var logger = loggerFactory.CreateLogger<ChallengeResult>();
+
+            logger.ChallengeResultExecuting(AuthenticationSchemes);
+
+            if (AuthenticationSchemes != null && AuthenticationSchemes.Count > 0)
+            {
+                foreach (var scheme in AuthenticationSchemes)
+                {
+                    await context.HttpContext.ChallengeAsync(scheme, Properties);
+                }
+            }
+            else
+            {
+                await context.HttpContext.ChallengeAsync(Properties);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CompatibilityVersion.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CompatibilityVersion.cs
new file mode 100644
index 0000000000..91372a0d19
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CompatibilityVersion.cs
@@ -0,0 +1,68 @@
+// 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.
+
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Specifies the version compatibility of runtime behaviors configured by <see cref="MvcOptions"/>. 
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// The best way to set a compatibility version is by using 
+    /// <see cref="MvcCoreMvcBuilderExtensions.SetCompatibilityVersion"/> or
+    /// <see cref="MvcCoreMvcCoreBuilderExtensions.SetCompatibilityVersion"/> in your application's
+    /// <c>ConfigureServices</c> method.
+    /// <example>
+    /// Setting the compatibility version using <see cref="IMvcBuilder"/>:
+    /// <code>
+    /// public class Startup
+    /// {
+    ///     ...
+    ///     
+    ///     public void ConfigureServices(IServiceCollection services)
+    ///     {
+    ///         services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+    ///     }
+    ///     
+    ///     ...
+    /// }
+    /// </code>
+    /// </example>
+    /// </para>
+    /// <para>
+    /// Setting compatiblity version to a specific version will change the default values of various
+    /// settings to match a particular minor release of ASP.NET Core MVC. 
+    /// </para>
+    /// </remarks>
+    public enum CompatibilityVersion
+    {
+        /// <summary>
+        /// Sets the default value of settings on <see cref="MvcOptions"/> to match the behavior of 
+        /// ASP.NET Core MVC 2.0.
+        /// </summary>
+        Version_2_0,
+
+        /// <summary>
+        /// Sets the default value of settings on <see cref="MvcOptions"/> to match the behavior of 
+        /// ASP.NET Core MVC 2.1.
+        /// </summary>
+        /// <remarks>
+        /// ASP.NET Core MVC 2.1 introduces compatibility switches for the following:
+        /// <list type="bullet">
+        ///     <item><description><see cref="MvcOptions.InputFormatterExceptionPolicy"/></description></item>
+        ///     <item><description><see cref="MvcOptions.SuppressBindingUndefinedValueToEnumType"/></description></item>
+        ///     <item><description><c>MvcJsonOptions.AllowInputFormatterExceptionMessages</c></description></item>
+        ///     <item><description><c>RazorPagesOptions.AllowAreas</c></description></item>
+        /// </list>
+        /// </remarks>
+        Version_2_1,
+
+        /// <summary>
+        /// Sets the default value of settings on <see cref="MvcOptions"/> to match the latest release. Use this
+        /// value with care, upgrading minor versions will cause breaking changes when using <see cref="Latest"/>.
+        /// </summary>
+        Latest = int.MaxValue,
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ConflictObjectResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ConflictObjectResult.cs
new file mode 100644
index 0000000000..29e72e816b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ConflictObjectResult.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="ObjectResult"/> that when executed will produce a Conflict (409) response.
+    /// </summary>
+    public class ConflictObjectResult : ObjectResult
+    {
+        /// <summary>
+        /// Creates a new <see cref="ConflictObjectResult"/> instance.
+        /// </summary>
+        /// <param name="error">Contains the errors to be returned to the client.</param>
+        public ConflictObjectResult(object error)
+            : base(error)
+        {
+            StatusCode = StatusCodes.Status409Conflict;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="ConflictObjectResult"/> instance.
+        /// </summary>
+        /// <param name="modelState"><see cref="ModelStateDictionary"/> containing the validation errors.</param>
+        public ConflictObjectResult(ModelStateDictionary modelState)
+            : base(new SerializableError(modelState))
+        {
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            StatusCode = StatusCodes.Status409Conflict;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ConflictResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ConflictResult.cs
new file mode 100644
index 0000000000..92eb10385a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ConflictResult.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A <see cref="StatusCodeResult"/> that when executed will produce a Conflict (409) response.
+    /// </summary>
+    public class ConflictResult : StatusCodeResult
+    {
+        /// <summary>
+        /// Creates a new <see cref="ConflictResult"/> instance.
+        /// </summary>
+        public ConflictResult()
+            : base(StatusCodes.Status409Conflict)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ConsumesAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ConsumesAttribute.cs
new file mode 100644
index 0000000000..c3c240e63e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ConsumesAttribute.cs
@@ -0,0 +1,231 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A filter that specifies the supported request content types. <see cref="ContentTypes"/> is used to select an
+    /// action when there would otherwise be multiple matches.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public class ConsumesAttribute :
+        Attribute,
+        IResourceFilter,
+        IConsumesActionConstraint,
+        IApiRequestMetadataProvider
+    {
+        public static readonly int ConsumesActionConstraintOrder = 200;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="ConsumesAttribute"/>.
+        /// </summary>
+        public ConsumesAttribute(string contentType, params string[] otherContentTypes)
+        {
+            if (contentType == null)
+            {
+                throw new ArgumentNullException(nameof(contentType));
+            }
+
+            // We want to ensure that the given provided content types are valid values, so
+            // we validate them using the semantics of MediaTypeHeaderValue.
+            MediaTypeHeaderValue.Parse(contentType);
+
+            for (var i = 0; i < otherContentTypes.Length; i++)
+            {
+                MediaTypeHeaderValue.Parse(otherContentTypes[i]);
+            }
+
+            ContentTypes = GetContentTypes(contentType, otherContentTypes);
+        }
+
+        // The value used is a non default value so that it avoids getting mixed with other action constraints
+        // with default order.
+        /// <inheritdoc />
+        int IActionConstraint.Order => ConsumesActionConstraintOrder;
+
+        /// <summary>
+        /// Gets or sets the supported request content types. Used to select an action when there would otherwise be
+        /// multiple matches.
+        /// </summary>
+        public MediaTypeCollection ContentTypes { get; set; }
+
+        /// <inheritdoc />
+        public void OnResourceExecuting(ResourceExecutingContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            // Only execute if the current filter is the one which is closest to the action.
+            // Ignore all other filters. This is to ensure we have a overriding behavior.
+            if (IsApplicable(context.ActionDescriptor))
+            {
+                var requestContentType = context.HttpContext.Request.ContentType;
+
+                // Confirm the request's content type is more specific than a media type this action supports e.g. OK
+                // if client sent "text/plain" data and this action supports "text/*".
+                if (requestContentType != null && !IsSubsetOfAnyContentType(requestContentType))
+                {
+                    context.Result = new UnsupportedMediaTypeResult();
+                }
+            }
+        }
+
+        private bool IsSubsetOfAnyContentType(string requestMediaType)
+        {
+            var parsedRequestMediaType = new MediaType(requestMediaType);
+            for (var i = 0; i < ContentTypes.Count; i++)
+            {
+                var contentTypeMediaType = new MediaType(ContentTypes[i]);
+                if (parsedRequestMediaType.IsSubsetOf(contentTypeMediaType))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /// <inheritdoc />
+        public void OnResourceExecuted(ResourceExecutedContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+        }
+
+        /// <inheritdoc />
+        public bool Accept(ActionConstraintContext context)
+        {
+            // If this constraint is not closest to the action, it will be skipped.
+            if (!IsApplicable(context.CurrentCandidate.Action))
+            {
+                // Since the constraint is to be skipped, returning true here
+                // will let the current candidate ignore this constraint and will
+                // be selected based on other constraints for this action.
+                return true;
+            }
+
+            var requestContentType = context.RouteContext.HttpContext.Request.ContentType;
+
+            // If the request content type is null we need to act like pass through.
+            // In case there is a single candidate with a constraint it should be selected.
+            // If there are multiple actions with consumes action constraints this should result in ambiguous exception
+            // unless there is another action without a consumes constraint.
+            if (requestContentType == null)
+            {
+                var isActionWithoutConsumeConstraintPresent = context.Candidates.Any(
+                    candidate => candidate.Constraints == null ||
+                    !candidate.Constraints.Any(constraint => constraint is IConsumesActionConstraint));
+
+                return !isActionWithoutConsumeConstraintPresent;
+            }
+
+            // Confirm the request's content type is more specific than (a media type this action supports e.g. OK
+            // if client sent "text/plain" data and this action supports "text/*".
+            if (IsSubsetOfAnyContentType(requestContentType))
+            {
+                return true;
+            }
+
+            var firstCandidate = context.Candidates[0];
+            if (firstCandidate.Action != context.CurrentCandidate.Action)
+            {
+                // If the current candidate is not same as the first candidate,
+                // we need not probe other candidates to see if they apply.
+                // Only the first candidate is allowed to probe other candidates and based on the result select itself.
+                return false;
+            }
+
+            // Run the matching logic for all IConsumesActionConstraints we can find, and see what matches.
+            // 1). If we have a unique best match, then only that constraint should return true.
+            // 2). If we have multiple matches, then all constraints that match will return true
+            // , resulting in ambiguity(maybe).
+            // 3). If we have no matches, then we choose the first constraint to return true.It will later return a 415
+            foreach (var candidate in context.Candidates)
+            {
+                if (candidate.Action == firstCandidate.Action)
+                {
+                    continue;
+                }
+
+                var tempContext = new ActionConstraintContext()
+                {
+                    Candidates = context.Candidates,
+                    RouteContext = context.RouteContext,
+                    CurrentCandidate = candidate
+                };
+
+                if (candidate.Constraints == null || candidate.Constraints.Count == 0 ||
+                    candidate.Constraints.Any(constraint => constraint is IConsumesActionConstraint &&
+                                                            constraint.Accept(tempContext)))
+                {
+                    // There is someone later in the chain which can handle the request.
+                    // end the process here.
+                    return false;
+                }
+            }
+
+            // There is no one later in the chain that can handle this content type return a false positive so that
+            // later we can detect and return a 415.
+            return true;
+        }
+
+        private bool IsApplicable(ActionDescriptor actionDescriptor)
+        {
+            // If there are multiple IConsumeActionConstraints which are defined at the class and
+            // at the action level, the one closest to the action overrides the others. To ensure this
+            // we take advantage of the fact that ConsumesAttribute is both an IActionFilter and an
+            // IConsumeActionConstraint. Since filterdescriptor collection is ordered (the last filter is the one
+            // closest to the action), we apply this constraint only if there is no IConsumeActionConstraint after this.
+            return actionDescriptor.FilterDescriptors.Last(
+                filter => filter.Filter is IConsumesActionConstraint).Filter == this;
+
+        }
+
+        private MediaTypeCollection GetContentTypes(string firstArg, string[] args)
+        {
+            var completeArgs = new List<string>();
+            completeArgs.Add(firstArg);
+            completeArgs.AddRange(args);
+            var contentTypes = new MediaTypeCollection();
+            foreach (var arg in completeArgs)
+            {
+                var mediaType = new MediaType(arg);
+                if (mediaType.MatchesAllSubTypes ||
+                    mediaType.MatchesAllTypes)
+                {
+                    throw new InvalidOperationException(
+                        Resources.FormatMatchAllContentTypeIsNotAllowed(arg));
+                }
+
+                contentTypes.Add(arg);
+            }
+
+            return contentTypes;
+        }
+
+        /// <inheritdoc />
+        public void SetContentTypes(MediaTypeCollection contentTypes)
+        {
+            contentTypes.Clear();
+            foreach (var contentType in ContentTypes)
+            {
+                contentTypes.Add(contentType);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ContentResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ContentResult.cs
new file mode 100644
index 0000000000..65ad59bf47
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ContentResult.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class ContentResult : ActionResult
+    {
+        /// <summary>
+        /// Gets or set the content representing the body of the response.
+        /// </summary>
+        public string Content { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Content-Type header for the response.
+        /// </summary>
+        public string ContentType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the HTTP status code.
+        /// </summary>
+        public int? StatusCode { get; set; }
+
+        public override Task ExecuteResultAsync(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var executor = context.HttpContext.RequestServices.GetRequiredService<IActionResultExecutor<ContentResult>>();
+            return executor.ExecuteAsync(context, this);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerAttribute.cs
new file mode 100644
index 0000000000..2e225dac6d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerAttribute.cs
@@ -0,0 +1,17 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Indicates that the type and any derived types that this attribute is applied to
+    /// are considered a controller by the default controller discovery mechanism, unless
+    /// <see cref="NonControllerAttribute"/> is applied to any type in the hierarchy.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+    public class ControllerAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs
new file mode 100644
index 0000000000..5626f1ccd2
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs
@@ -0,0 +1,2705 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Linq.Expressions;
+using System.Security.Claims;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A base class for an MVC controller without view support.
+    /// </summary>
+    [Controller]
+    public abstract class ControllerBase
+    {
+        private ControllerContext _controllerContext;
+        private IModelMetadataProvider _metadataProvider;
+        private IModelBinderFactory _modelBinderFactory;
+        private IObjectModelValidator _objectValidator;
+        private IUrlHelper _url;
+
+        /// <summary>
+        /// Gets the <see cref="Http.HttpContext"/> for the executing action.
+        /// </summary>
+        public HttpContext HttpContext => ControllerContext.HttpContext;
+
+        /// <summary>
+        /// Gets the <see cref="HttpRequest"/> for the executing action.
+        /// </summary>
+        public HttpRequest Request => HttpContext?.Request;
+
+        /// <summary>
+        /// Gets the <see cref="HttpResponse"/> for the executing action.
+        /// </summary>
+        public HttpResponse Response => HttpContext?.Response;
+
+        /// <summary>
+        /// Gets the <see cref="AspNetCore.Routing.RouteData"/> for the executing action.
+        /// </summary>
+        public RouteData RouteData => ControllerContext.RouteData;
+
+        /// <summary>
+        /// Gets the <see cref="ModelStateDictionary"/> that contains the state of the model and of model-binding validation.
+        /// </summary>
+        public ModelStateDictionary ModelState => ControllerContext.ModelState;
+
+        /// <summary>
+        /// Gets or sets the <see cref="Mvc.ControllerContext"/>.
+        /// </summary>
+        /// <remarks>
+        /// <see cref="Controllers.IControllerActivator"/> activates this property while activating controllers.
+        /// If user code directly instantiates a controller, the getter returns an empty
+        /// <see cref="Mvc.ControllerContext"/>.
+        /// </remarks>
+        [ControllerContext]
+        public ControllerContext ControllerContext
+        {
+            get
+            {
+                if (_controllerContext == null)
+                {
+                    _controllerContext = new ControllerContext();
+                }
+
+                return _controllerContext;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _controllerContext = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IModelMetadataProvider"/>.
+        /// </summary>
+        public IModelMetadataProvider MetadataProvider
+        {
+            get
+            {
+                if (_metadataProvider == null)
+                {
+                    _metadataProvider = HttpContext?.RequestServices?.GetRequiredService<IModelMetadataProvider>();
+                }
+
+                return _metadataProvider;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _metadataProvider = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IModelBinderFactory"/>.
+        /// </summary>
+        public IModelBinderFactory ModelBinderFactory
+        {
+            get
+            {
+                if (_modelBinderFactory == null)
+                {
+                    _modelBinderFactory = HttpContext?.RequestServices?.GetRequiredService<IModelBinderFactory>();
+                }
+
+                return _modelBinderFactory;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _modelBinderFactory = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IUrlHelper"/>.
+        /// </summary>
+        public IUrlHelper Url
+        {
+            get
+            {
+                if (_url == null)
+                {
+                    var factory = HttpContext?.RequestServices?.GetRequiredService<IUrlHelperFactory>();
+                    _url = factory?.GetUrlHelper(ControllerContext);
+                }
+
+                return _url;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _url = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IObjectModelValidator"/>.
+        /// </summary>
+        public IObjectModelValidator ObjectValidator
+        {
+            get
+            {
+                if (_objectValidator == null)
+                {
+                    _objectValidator = HttpContext?.RequestServices?.GetRequiredService<IObjectModelValidator>();
+                }
+
+                return _objectValidator;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _objectValidator = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="ClaimsPrincipal"/> for user associated with the executing action.
+        /// </summary>
+        public ClaimsPrincipal User => HttpContext?.User;
+
+        /// <summary>
+        /// Creates a <see cref="StatusCodeResult"/> object by specifying a <paramref name="statusCode"/>.
+        /// </summary>
+        /// <param name="statusCode">The status code to set on the response.</param>
+        /// <returns>The created <see cref="StatusCodeResult"/> object for the response.</returns>
+        [NonAction]
+        public virtual StatusCodeResult StatusCode(int statusCode)
+            => new StatusCodeResult(statusCode);
+
+        /// <summary>
+        /// Creates a <see cref="ObjectResult"/> object by specifying a <paramref name="statusCode"/> and <paramref name="value"/>
+        /// </summary>
+        /// <param name="statusCode">The status code to set on the response.</param>
+        /// <param name="value">The value to set on the <see cref="ObjectResult"/>.</param>
+        /// <returns>The created <see cref="ObjectResult"/> object for the response.</returns>
+        [NonAction]
+        public virtual ObjectResult StatusCode(int statusCode, object value)
+        {
+            var result = new ObjectResult(value);
+            result.StatusCode = statusCode;
+
+            return result;
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ContentResult"/> object with <see cref="StatusCodes.Status200OK"/> by specifying a
+        /// <paramref name="content"/> string.
+        /// </summary>
+        /// <param name="content">The content to write to the response.</param>
+        /// <returns>The created <see cref="ContentResult"/> object for the response.</returns>
+        [NonAction]
+        public virtual ContentResult Content(string content)
+            => Content(content, (MediaTypeHeaderValue)null);
+
+        /// <summary>
+        /// Creates a <see cref="ContentResult"/> object with <see cref="StatusCodes.Status200OK"/> by specifying a 
+        /// <paramref name="content"/> string and a content type.
+        /// </summary>
+        /// <param name="content">The content to write to the response.</param>
+        /// <param name="contentType">The content type (MIME type).</param>
+        /// <returns>The created <see cref="ContentResult"/> object for the response.</returns>
+        [NonAction]
+        public virtual ContentResult Content(string content, string contentType)
+            => Content(content, MediaTypeHeaderValue.Parse(contentType));
+
+        /// <summary>
+        /// Creates a <see cref="ContentResult"/> object with <see cref="StatusCodes.Status200OK"/> by specifying a 
+        /// <paramref name="content"/> string, a <paramref name="contentType"/>, and <paramref name="contentEncoding"/>.
+        /// </summary>
+        /// <param name="content">The content to write to the response.</param>
+        /// <param name="contentType">The content type (MIME type).</param>
+        /// <param name="contentEncoding">The content encoding.</param>
+        /// <returns>The created <see cref="ContentResult"/> object for the response.</returns>
+        /// <remarks>
+        /// If encoding is provided by both the 'charset' and the <paramref name="contentEncoding"/> parameters, then
+        /// the <paramref name="contentEncoding"/> parameter is chosen as the final encoding.
+        /// </remarks>
+        [NonAction]
+        public virtual ContentResult Content(string content, string contentType, Encoding contentEncoding)
+        {
+            var mediaTypeHeaderValue = MediaTypeHeaderValue.Parse(contentType);
+            mediaTypeHeaderValue.Encoding = contentEncoding ?? mediaTypeHeaderValue.Encoding;
+            return Content(content, mediaTypeHeaderValue);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ContentResult"/> object with <see cref="StatusCodes.Status200OK"/> by specifying a 
+        /// <paramref name="content"/> string and a <paramref name="contentType"/>.
+        /// </summary>
+        /// <param name="content">The content to write to the response.</param>
+        /// <param name="contentType">The content type (MIME type).</param>
+        /// <returns>The created <see cref="ContentResult"/> object for the response.</returns>
+        [NonAction]
+        public virtual ContentResult Content(string content, MediaTypeHeaderValue contentType)
+        {
+            var result = new ContentResult
+            {
+                Content = content,
+                ContentType = contentType?.ToString()
+            };
+
+            return result;
+        }
+
+        /// <summary>
+        /// Creates a <see cref="NoContentResult"/> object that produces an empty
+        /// <see cref="StatusCodes.Status204NoContent"/> response.   
+        /// </summary>
+        /// <returns>The created <see cref="NoContentResult"/> object for the response.</returns>
+        [NonAction]
+        public virtual NoContentResult NoContent()
+            => new NoContentResult();
+
+        /// <summary>
+        /// Creates a <see cref="OkResult"/> object that produces an empty <see cref="StatusCodes.Status200OK"/> response.
+        /// </summary>
+        /// <returns>The created <see cref="OkResult"/> for the response.</returns>
+        [NonAction]
+        public virtual OkResult Ok()
+            => new OkResult();
+
+        /// <summary>
+        /// Creates an <see cref="OkObjectResult"/> object that produces an <see cref="StatusCodes.Status200OK"/> response.
+        /// </summary>
+        /// <param name="value">The content value to format in the entity body.</param>
+        /// <returns>The created <see cref="OkObjectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual OkObjectResult Ok(object value)
+            => new OkObjectResult(value);
+
+        /// <summary>
+        /// Creates a <see cref="RedirectResult"/> object that redirects (<see cref="StatusCodes.Status302Found"/>)
+        /// to the specified <paramref name="url"/>.
+        /// </summary>
+        /// <param name="url">The URL to redirect to.</param>
+        /// <returns>The created <see cref="RedirectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectResult Redirect(string url)
+        {
+            if (string.IsNullOrEmpty(url))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(url));
+            }
+
+            return new RedirectResult(url);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="RedirectResult"/> object with <see cref="RedirectResult.Permanent"/> set to true
+        /// (<see cref="StatusCodes.Status301MovedPermanently"/>) using the specified <paramref name="url"/>.
+        /// </summary>
+        /// <param name="url">The URL to redirect to.</param>
+        /// <returns>The created <see cref="RedirectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectResult RedirectPermanent(string url)
+        {
+            if (string.IsNullOrEmpty(url))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(url));
+            }
+
+            return new RedirectResult(url, permanent: true);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="RedirectResult"/> object with <see cref="RedirectResult.Permanent"/> set to false
+        /// and <see cref="RedirectResult.PreserveMethod"/> set to true (<see cref="StatusCodes.Status307TemporaryRedirect"/>) 
+        /// using the specified <paramref name="url"/>.
+        /// </summary>
+        /// <param name="url">The URL to redirect to.</param>
+        /// <returns>The created <see cref="RedirectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectResult RedirectPreserveMethod(string url)
+        {
+            if (string.IsNullOrEmpty(url))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(url));
+            }
+
+            return new RedirectResult(url: url, permanent: false, preserveMethod: true);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="RedirectResult"/> object with <see cref="RedirectResult.Permanent"/> set to true
+        /// and <see cref="RedirectResult.PreserveMethod"/> set to true (<see cref="StatusCodes.Status308PermanentRedirect"/>) 
+        /// using the specified <paramref name="url"/>.
+        /// </summary>
+        /// <param name="url">The URL to redirect to.</param>
+        /// <returns>The created <see cref="RedirectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectResult RedirectPermanentPreserveMethod(string url)
+        {
+            if (string.IsNullOrEmpty(url))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(url));
+            }
+
+            return new RedirectResult(url: url, permanent: true, preserveMethod: true);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="LocalRedirectResult"/> object that redirects 
+        /// (<see cref="StatusCodes.Status302Found"/>) to the specified local <paramref name="localUrl"/>.
+        /// </summary>
+        /// <param name="localUrl">The local URL to redirect to.</param>
+        /// <returns>The created <see cref="LocalRedirectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual LocalRedirectResult LocalRedirect(string localUrl)
+        {
+            if (string.IsNullOrEmpty(localUrl))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(localUrl));
+            }
+
+            return new LocalRedirectResult(localUrl);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="LocalRedirectResult"/> object with <see cref="LocalRedirectResult.Permanent"/> set to
+        /// true (<see cref="StatusCodes.Status301MovedPermanently"/>) using the specified <paramref name="localUrl"/>.
+        /// </summary>
+        /// <param name="localUrl">The local URL to redirect to.</param>
+        /// <returns>The created <see cref="LocalRedirectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual LocalRedirectResult LocalRedirectPermanent(string localUrl)
+        {
+            if (string.IsNullOrEmpty(localUrl))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(localUrl));
+            }
+
+            return new LocalRedirectResult(localUrl, permanent: true);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="LocalRedirectResult"/> object with <see cref="LocalRedirectResult.Permanent"/> set to
+        /// false and <see cref="LocalRedirectResult.PreserveMethod"/> set to true 
+        /// (<see cref="StatusCodes.Status307TemporaryRedirect"/>) using the specified <paramref name="localUrl"/>.
+        /// </summary>
+        /// <param name="localUrl">The local URL to redirect to.</param>
+        /// <returns>The created <see cref="LocalRedirectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual LocalRedirectResult LocalRedirectPreserveMethod(string localUrl)
+        {
+            if (string.IsNullOrEmpty(localUrl))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(localUrl));
+            }
+
+            return new LocalRedirectResult(localUrl: localUrl, permanent: false, preserveMethod: true);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="LocalRedirectResult"/> object with <see cref="LocalRedirectResult.Permanent"/> set to
+        /// true and <see cref="LocalRedirectResult.PreserveMethod"/> set to true 
+        /// (<see cref="StatusCodes.Status308PermanentRedirect"/>) using the specified <paramref name="localUrl"/>.
+        /// </summary>
+        /// <param name="localUrl">The local URL to redirect to.</param>
+        /// <returns>The created <see cref="LocalRedirectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual LocalRedirectResult LocalRedirectPermanentPreserveMethod(string localUrl)
+        {
+            if (string.IsNullOrEmpty(localUrl))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(localUrl));
+            }
+
+            return new LocalRedirectResult(localUrl: localUrl, permanent: true, preserveMethod: true);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to an action with the same name as current one.
+        /// The 'controller' and 'action' names are retrieved from the ambient values of the current request.
+        /// </summary>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        /// <example>
+        /// A POST request to an action named "Product" updates a product and redirects to an action, also named
+        /// "Product", showing details of the updated product.
+        /// <code>
+        /// [HttpGet]
+        /// public IActionResult Product(int id)
+        /// {
+        ///     var product = RetrieveProduct(id);
+        ///     return View(product);
+        /// }
+        ///
+        /// [HttpPost]
+        /// public IActionResult Product(int id, Product product)
+        /// {
+        ///     UpdateProduct(product);
+        ///     return RedirectToAction();
+        /// }
+        /// </code>
+        /// </example>
+        [NonAction]
+        public virtual RedirectToActionResult RedirectToAction()
+            => RedirectToAction(actionName: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified action using the <paramref name="actionName"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToActionResult RedirectToAction(string actionName)
+            => RedirectToAction(actionName, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified action using the 
+        /// <paramref name="actionName"/> and <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToActionResult RedirectToAction(string actionName, object routeValues)
+            => RedirectToAction(actionName, controllerName: null, routeValues: routeValues);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified action using the 
+        /// <paramref name="actionName"/> and the <paramref name="controllerName"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToActionResult RedirectToAction(string actionName, string controllerName)
+            => RedirectToAction(actionName, controllerName, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified action using the specified
+        /// <paramref name="actionName"/>, <paramref name="controllerName"/>, and <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToActionResult RedirectToAction(
+            string actionName,
+            string controllerName,
+            object routeValues)
+            => RedirectToAction(actionName, controllerName, routeValues, fragment: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified action using the specified
+        /// <paramref name="actionName"/>, <paramref name="controllerName"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToActionResult RedirectToAction(
+            string actionName,
+            string controllerName,
+            string fragment)
+            => RedirectToAction(actionName, controllerName, routeValues: null, fragment: fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified action using the specified <paramref name="actionName"/>,
+        /// <paramref name="controllerName"/>, <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToActionResult RedirectToAction(
+            string actionName,
+            string controllerName,
+            object routeValues,
+            string fragment)
+        {
+            return new RedirectToActionResult(actionName, controllerName, routeValues, fragment)
+            {
+                UrlHelper = Url,
+            };
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status307TemporaryRedirect"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to false and <see cref="RedirectToActionResult.PreserveMethod"/> 
+        /// set to true, using the specified <paramref name="actionName"/>, <paramref name="controllerName"/>, 
+        /// <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>       
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToActionResult RedirectToActionPreserveMethod(
+            string actionName = null,
+            string controllerName = null,
+            object routeValues = null,
+            string fragment = null)
+        {
+            return new RedirectToActionResult(
+                actionName: actionName,
+                controllerName: controllerName,
+                routeValues: routeValues,
+                permanent: false,
+                preserveMethod: true,
+                fragment: fragment)
+            {
+                UrlHelper = Url,
+            };
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to true using the specified <paramref name="actionName"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToActionResult RedirectToActionPermanent(string actionName)
+            => RedirectToActionPermanent(actionName, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to true using the specified <paramref name="actionName"/> 
+        /// and <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToActionResult RedirectToActionPermanent(string actionName, object routeValues)
+            => RedirectToActionPermanent(actionName, controllerName: null, routeValues: routeValues);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to true using the specified <paramref name="actionName"/> 
+        /// and <paramref name="controllerName"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToActionResult RedirectToActionPermanent(string actionName, string controllerName)
+            => RedirectToActionPermanent(actionName, controllerName, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to true using the specified <paramref name="actionName"/>,
+        /// <paramref name="controllerName"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToActionResult RedirectToActionPermanent(
+            string actionName,
+            string controllerName,
+            string fragment)
+            => RedirectToActionPermanent(actionName, controllerName, routeValues: null, fragment: fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to true using the specified <paramref name="actionName"/>,
+        /// <paramref name="controllerName"/>, and <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToActionResult RedirectToActionPermanent(
+            string actionName,
+            string controllerName,
+            object routeValues)
+            => RedirectToActionPermanent(actionName, controllerName, routeValues, fragment: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to true using the specified <paramref name="actionName"/>,
+        /// <paramref name="controllerName"/>, <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToActionResult RedirectToActionPermanent(
+            string actionName,
+            string controllerName,
+            object routeValues,
+            string fragment)
+        {
+            return new RedirectToActionResult(
+                actionName,
+                controllerName,
+                routeValues,
+                permanent: true,
+                fragment: fragment)
+            {
+                UrlHelper = Url,
+            };
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status308PermanentRedirect"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to true and <see cref="RedirectToActionResult.PreserveMethod"/>
+        /// set to true, using the specified <paramref name="actionName"/>, <paramref name="controllerName"/>, 
+        /// <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>        
+        [NonAction]
+        public virtual RedirectToActionResult RedirectToActionPermanentPreserveMethod(
+            string actionName = null,
+            string controllerName = null,
+            object routeValues = null,
+            string fragment = null)
+        {
+            return new RedirectToActionResult(
+                actionName: actionName,
+                controllerName: controllerName,
+                routeValues: routeValues,
+                permanent: true,
+                preserveMethod: true,
+                fragment: fragment)
+            {
+                UrlHelper = Url,
+            };
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified route using the specified <paramref name="routeName"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToRouteResult RedirectToRoute(string routeName)
+            => RedirectToRoute(routeName, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified route using the specified <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToRouteResult RedirectToRoute(object routeValues)
+            => RedirectToRoute(routeName: null, routeValues: routeValues);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified route using the specified
+        /// <paramref name="routeName"/> and <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToRouteResult RedirectToRoute(string routeName, object routeValues)
+            => RedirectToRoute(routeName, routeValues, fragment: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified route using the specified
+        /// <paramref name="routeName"/> and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToRouteResult RedirectToRoute(string routeName, string fragment)
+            => RedirectToRoute(routeName, routeValues: null, fragment: fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified route using the specified
+        /// <paramref name="routeName"/>, <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToRouteResult RedirectToRoute(
+            string routeName,
+            object routeValues,
+            string fragment)
+        {
+            return new RedirectToRouteResult(routeName, routeValues, fragment)
+            {
+                UrlHelper = Url,
+            };
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status307TemporaryRedirect"/>) to the specified route with 
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to false and <see cref="RedirectToRouteResult.PreserveMethod"/>
+        /// set to true, using the specified <paramref name="routeName"/>, <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>       
+        [NonAction]
+        public virtual RedirectToRouteResult RedirectToRoutePreserveMethod(
+            string routeName = null,
+            object routeValues = null,
+            string fragment = null)
+        {
+            return new RedirectToRouteResult(
+                routeName: routeName,
+                routeValues: routeValues,
+                permanent: false,
+                preserveMethod: true,
+                fragment: fragment)
+            {
+                UrlHelper = Url,
+            };
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified route with 
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to true using the specified <paramref name="routeName"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToRouteResult RedirectToRoutePermanent(string routeName)
+            => RedirectToRoutePermanent(routeName, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified route with 
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to true using the specified <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToRouteResult RedirectToRoutePermanent(object routeValues)
+            => RedirectToRoutePermanent(routeName: null, routeValues: routeValues);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified route with
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to true using the specified <paramref name="routeName"/>
+        /// and <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToRouteResult RedirectToRoutePermanent(string routeName, object routeValues)
+            => RedirectToRoutePermanent(routeName, routeValues, fragment: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified route with 
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to true using the specified <paramref name="routeName"/>
+        /// and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToRouteResult RedirectToRoutePermanent(string routeName, string fragment)
+            => RedirectToRoutePermanent(routeName, routeValues: null, fragment: fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified route with
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to true using the specified <paramref name="routeName"/>,
+        /// <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        [NonAction]
+        public virtual RedirectToRouteResult RedirectToRoutePermanent(
+            string routeName,
+            object routeValues,
+            string fragment)
+        {
+            return new RedirectToRouteResult(routeName, routeValues, permanent: true, fragment: fragment)
+            {
+                UrlHelper = Url,
+            };
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status308PermanentRedirect"/>) to the specified route with
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to true and <see cref="RedirectToRouteResult.PreserveMethod"/>
+        /// set to true, using the specified <paramref name="routeName"/>, <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>       
+        [NonAction]
+        public virtual RedirectToRouteResult RedirectToRoutePermanentPreserveMethod(
+            string routeName = null,
+            object routeValues = null,
+            string fragment = null)
+        {
+            return new RedirectToRouteResult(
+                routeName: routeName,
+                routeValues: routeValues,
+                permanent: true,
+                preserveMethod: true,
+                fragment: fragment)
+            {
+                UrlHelper = Url,
+            };
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified <paramref name="pageName"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/>.</returns>
+        [NonAction]
+        public virtual RedirectToPageResult RedirectToPage(string pageName)
+            => RedirectToPage(pageName, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/>.</returns>
+        [NonAction]
+        public virtual RedirectToPageResult RedirectToPage(string pageName, object routeValues)
+            => RedirectToPage(pageName, pageHandler: null, routeValues: routeValues, fragment: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="pageHandler"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/>.</returns>
+        [NonAction]
+        public virtual RedirectToPageResult RedirectToPage(string pageName, string pageHandler)
+            => RedirectToPage(pageName, pageHandler, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified <paramref name="pageName"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/>.</returns>
+        [NonAction]
+        public virtual RedirectToPageResult RedirectToPage(string pageName, string pageHandler, object routeValues)
+            => RedirectToPage(pageName, pageHandler, routeValues, fragment: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/>.</returns>
+        [NonAction]
+        public virtual RedirectToPageResult RedirectToPage(string pageName, string pageHandler, string fragment)
+            => RedirectToPage(pageName, pageHandler, routeValues: null, fragment: fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="routeValues"/> and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/>.</returns>
+        [NonAction]
+        public virtual RedirectToPageResult RedirectToPage(string pageName, string pageHandler, object routeValues, string fragment)
+            => new RedirectToPageResult(pageName, pageHandler, routeValues, fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified <paramref name="pageName"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/> with <see cref="RedirectToPageResult.Permanent"/> set.</returns>
+        [NonAction]
+        public virtual RedirectToPageResult RedirectToPagePermanent(string pageName)
+            => RedirectToPagePermanent(pageName, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/> with <see cref="RedirectToPageResult.Permanent"/> set.</returns>
+        [NonAction]
+        public virtual RedirectToPageResult RedirectToPagePermanent(string pageName, object routeValues)
+            => RedirectToPagePermanent(pageName, pageHandler: null, routeValues: routeValues, fragment: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="pageHandler"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/> with <see cref="RedirectToPageResult.Permanent"/> set.</returns>
+        [NonAction]
+        public virtual RedirectToPageResult RedirectToPagePermanent(string pageName, string pageHandler)
+            => RedirectToPagePermanent(pageName, pageHandler, routeValues: null, fragment: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/> with <see cref="RedirectToPageResult.Permanent"/> set.</returns>
+        [NonAction]
+        public virtual RedirectToPageResult RedirectToPagePermanent(string pageName, string pageHandler, string fragment)
+            => RedirectToPagePermanent(pageName, pageHandler, routeValues: null, fragment: fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="routeValues"/> and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/> with <see cref="RedirectToPageResult.Permanent"/> set.</returns>
+        [NonAction]
+        public virtual RedirectToPageResult RedirectToPagePermanent(
+            string pageName,
+            string pageHandler,
+            object routeValues,
+            string fragment)
+            => new RedirectToPageResult(pageName, pageHandler, routeValues, permanent: true, fragment: fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status307TemporaryRedirect"/>) to the specified page with 
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to false and <see cref="RedirectToRouteResult.PreserveMethod"/>
+        /// set to true, using the specified <paramref name="pageName"/>, <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns> 
+        [NonAction]
+        public virtual RedirectToPageResult RedirectToPagePreserveMethod(
+            string pageName,
+            string pageHandler = null,
+            object routeValues = null,
+            string fragment = null)
+        {
+            if (pageName == null)
+            {
+                throw new ArgumentNullException(nameof(pageName));
+            }
+
+            return new RedirectToPageResult(
+                pageName: pageName,
+                pageHandler: pageHandler,
+                routeValues: routeValues,
+                permanent: false,
+                preserveMethod: true,
+                fragment: fragment);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status308PermanentRedirect"/>) to the specified route with
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to true and <see cref="RedirectToRouteResult.PreserveMethod"/>
+        /// set to true, using the specified <paramref name="pageName"/>, <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>  
+        [NonAction]
+        public virtual RedirectToPageResult RedirectToPagePermanentPreserveMethod(
+            string pageName,
+            string pageHandler = null,
+            object routeValues = null,
+            string fragment = null)
+        {
+            if (pageName == null)
+            {
+                throw new ArgumentNullException(nameof(pageName));
+            }
+
+            return new RedirectToPageResult(
+                pageName: pageName,
+                pageHandler: pageHandler,
+                routeValues: routeValues,
+                permanent: true,
+                preserveMethod: true,
+                fragment: fragment);
+        }
+
+        /// <summary>
+        /// Returns a file with the specified <paramref name="fileContents" /> as content (<see cref="StatusCodes.Status200OK"/>),
+        /// and the specified <paramref name="contentType" /> as the Content-Type.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="fileContents">The file contents.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <returns>The created <see cref="FileContentResult"/> for the response.</returns>
+        [NonAction]
+        public virtual FileContentResult File(byte[] fileContents, string contentType)
+            => File(fileContents, contentType, fileDownloadName: null);
+
+        /// <summary>
+        /// Returns a file with the specified <paramref name="fileContents" /> as content (<see cref="StatusCodes.Status200OK"/>),
+        /// and the specified <paramref name="contentType" /> as the Content-Type.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="fileContents">The file contents.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="enableRangeProcessing">Set to <c>true</c> to enable range requests processing.</param>
+        /// <returns>The created <see cref="FileContentResult"/> for the response.</returns>
+        [NonAction]
+        public virtual FileContentResult File(byte[] fileContents, string contentType, bool enableRangeProcessing)
+            => File(fileContents, contentType, fileDownloadName: null, enableRangeProcessing: enableRangeProcessing);
+
+        /// <summary>
+        /// Returns a file with the specified <paramref name="fileContents" /> as content (<see cref="StatusCodes.Status200OK"/>), the
+        /// specified <paramref name="contentType" /> as the Content-Type and the specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="fileContents">The file contents.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <returns>The created <see cref="FileContentResult"/> for the response.</returns>
+        [NonAction]
+        public virtual FileContentResult File(byte[] fileContents, string contentType, string fileDownloadName)
+            => new FileContentResult(fileContents, contentType) { FileDownloadName = fileDownloadName };
+
+        /// <summary>
+        /// Returns a file with the specified <paramref name="fileContents" /> as content (<see cref="StatusCodes.Status200OK"/>), the
+        /// specified <paramref name="contentType" /> as the Content-Type and the specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="fileContents">The file contents.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <param name="enableRangeProcessing">Set to <c>true</c> to enable range requests processing.</param>
+        /// <returns>The created <see cref="FileContentResult"/> for the response.</returns>
+        [NonAction]
+        public virtual FileContentResult File(byte[] fileContents, string contentType, string fileDownloadName, bool enableRangeProcessing)
+            => new FileContentResult(fileContents, contentType)
+            {
+                FileDownloadName = fileDownloadName,
+                EnableRangeProcessing = enableRangeProcessing,
+            };
+
+        /// <summary>
+        /// Returns a file with the specified <paramref name="fileContents" /> as content (<see cref="StatusCodes.Status200OK"/>), 
+        /// and the specified <paramref name="contentType" /> as the Content-Type.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="fileContents">The file contents.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="lastModified">The <see cref="DateTimeOffset"/> of when the file was last modified.</param>
+        /// <param name="entityTag">The <see cref="EntityTagHeaderValue"/> associated with the file.</param>
+        /// <returns>The created <see cref="FileContentResult"/> for the response.</returns>
+        [NonAction]
+        public virtual FileContentResult File(byte[] fileContents, string contentType, DateTimeOffset? lastModified, EntityTagHeaderValue entityTag)
+        {
+            return new FileContentResult(fileContents, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+            };
+        }
+
+        /// <summary>
+        /// Returns a file with the specified <paramref name="fileContents" /> as content (<see cref="StatusCodes.Status200OK"/>), 
+        /// and the specified <paramref name="contentType" /> as the Content-Type.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="fileContents">The file contents.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="lastModified">The <see cref="DateTimeOffset"/> of when the file was last modified.</param>
+        /// <param name="entityTag">The <see cref="EntityTagHeaderValue"/> associated with the file.</param>
+        /// <param name="enableRangeProcessing">Set to <c>true</c> to enable range requests processing.</param>
+        /// <returns>The created <see cref="FileContentResult"/> for the response.</returns>
+        [NonAction]
+        public virtual FileContentResult File(byte[] fileContents, string contentType, DateTimeOffset? lastModified, EntityTagHeaderValue entityTag, bool enableRangeProcessing)
+        {
+            return new FileContentResult(fileContents, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                EnableRangeProcessing = enableRangeProcessing,
+            };
+        }
+
+        /// <summary>
+        /// Returns a file with the specified <paramref name="fileContents" /> as content (<see cref="StatusCodes.Status200OK"/>), the 
+        /// specified <paramref name="contentType" /> as the Content-Type, and the specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="fileContents">The file contents.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <param name="lastModified">The <see cref="DateTimeOffset"/> of when the file was last modified.</param>
+        /// <param name="entityTag">The <see cref="EntityTagHeaderValue"/> associated with the file.</param>
+        /// <returns>The created <see cref="FileContentResult"/> for the response.</returns>
+        [NonAction]
+        public virtual FileContentResult File(byte[] fileContents, string contentType, string fileDownloadName, DateTimeOffset? lastModified, EntityTagHeaderValue entityTag)
+        {
+            return new FileContentResult(fileContents, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                FileDownloadName = fileDownloadName,
+            };
+        }
+
+        /// <summary>
+        /// Returns a file with the specified <paramref name="fileContents" /> as content (<see cref="StatusCodes.Status200OK"/>), the 
+        /// specified <paramref name="contentType" /> as the Content-Type, and the specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="fileContents">The file contents.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <param name="lastModified">The <see cref="DateTimeOffset"/> of when the file was last modified.</param>
+        /// <param name="entityTag">The <see cref="EntityTagHeaderValue"/> associated with the file.</param>
+        /// <param name="enableRangeProcessing">Set to <c>true</c> to enable range requests processing.</param>
+        /// <returns>The created <see cref="FileContentResult"/> for the response.</returns>
+        [NonAction]
+        public virtual FileContentResult File(byte[] fileContents, string contentType, string fileDownloadName, DateTimeOffset? lastModified, EntityTagHeaderValue entityTag, bool enableRangeProcessing)
+        {
+            return new FileContentResult(fileContents, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                FileDownloadName = fileDownloadName,
+                EnableRangeProcessing = enableRangeProcessing,
+            };
+        }
+
+        /// <summary>
+        /// Returns a file in the specified <paramref name="fileStream" /> (<see cref="StatusCodes.Status200OK"/>), with the 
+        /// specified <paramref name="contentType" /> as the Content-Type.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="fileStream">The <see cref="Stream"/> with the contents of the file.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <returns>The created <see cref="FileStreamResult"/> for the response.</returns>
+        [NonAction]
+        public virtual FileStreamResult File(Stream fileStream, string contentType)
+            => File(fileStream, contentType, fileDownloadName: null);
+
+        /// <summary>
+        /// Returns a file in the specified <paramref name="fileStream" /> (<see cref="StatusCodes.Status200OK"/>), with the 
+        /// specified <paramref name="contentType" /> as the Content-Type.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="fileStream">The <see cref="Stream"/> with the contents of the file.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="enableRangeProcessing">Set to <c>true</c> to enable range requests processing.</param>
+        /// <returns>The created <see cref="FileStreamResult"/> for the response.</returns>
+        [NonAction]
+        public virtual FileStreamResult File(Stream fileStream, string contentType, bool enableRangeProcessing)
+            => File(fileStream, contentType, fileDownloadName: null, enableRangeProcessing: enableRangeProcessing);
+
+        /// <summary>
+        /// Returns a file in the specified <paramref name="fileStream" /> (<see cref="StatusCodes.Status200OK"/>) with the
+        /// specified <paramref name="contentType" /> as the Content-Type and the
+        /// specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="fileStream">The <see cref="Stream"/> with the contents of the file.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <returns>The created <see cref="FileStreamResult"/> for the response.</returns>
+        [NonAction]
+        public virtual FileStreamResult File(Stream fileStream, string contentType, string fileDownloadName)
+            => new FileStreamResult(fileStream, contentType) { FileDownloadName = fileDownloadName };
+
+        /// <summary>
+        /// Returns a file in the specified <paramref name="fileStream" /> (<see cref="StatusCodes.Status200OK"/>) with the
+        /// specified <paramref name="contentType" /> as the Content-Type and the
+        /// specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="fileStream">The <see cref="Stream"/> with the contents of the file.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <param name="enableRangeProcessing">Set to <c>true</c> to enable range requests processing.</param>
+        /// <returns>The created <see cref="FileStreamResult"/> for the response.</returns>
+        [NonAction]
+        public virtual FileStreamResult File(Stream fileStream, string contentType, string fileDownloadName, bool enableRangeProcessing)
+            => new FileStreamResult(fileStream, contentType)
+            {
+                FileDownloadName = fileDownloadName,
+                EnableRangeProcessing = enableRangeProcessing,
+            };
+
+        /// <summary>
+        /// Returns a file in the specified <paramref name="fileStream" /> (<see cref="StatusCodes.Status200OK"/>), 
+        /// and the specified <paramref name="contentType" /> as the Content-Type.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="fileStream">The <see cref="Stream"/> with the contents of the file.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="lastModified">The <see cref="DateTimeOffset"/> of when the file was last modified.</param>
+        /// <param name="entityTag">The <see cref="EntityTagHeaderValue"/> associated with the file.</param>
+        /// <returns>The created <see cref="FileStreamResult"/> for the response.</returns>
+        [NonAction]
+        public virtual FileStreamResult File(Stream fileStream, string contentType, DateTimeOffset? lastModified, EntityTagHeaderValue entityTag)
+        {
+            return new FileStreamResult(fileStream, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+            };
+        }
+
+        /// <summary>
+        /// Returns a file in the specified <paramref name="fileStream" /> (<see cref="StatusCodes.Status200OK"/>), 
+        /// and the specified <paramref name="contentType" /> as the Content-Type.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="fileStream">The <see cref="Stream"/> with the contents of the file.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="lastModified">The <see cref="DateTimeOffset"/> of when the file was last modified.</param>
+        /// <param name="entityTag">The <see cref="EntityTagHeaderValue"/> associated with the file.</param>
+        /// <param name="enableRangeProcessing">Set to <c>true</c> to enable range requests processing.</param>
+        /// <returns>The created <see cref="FileStreamResult"/> for the response.</returns>
+        [NonAction]
+        public virtual FileStreamResult File(Stream fileStream, string contentType, DateTimeOffset? lastModified, EntityTagHeaderValue entityTag, bool enableRangeProcessing)
+        {
+            return new FileStreamResult(fileStream, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                EnableRangeProcessing = enableRangeProcessing,
+            };
+        }
+
+        /// <summary>
+        /// Returns a file in the specified <paramref name="fileStream" /> (<see cref="StatusCodes.Status200OK"/>), the 
+        /// specified <paramref name="contentType" /> as the Content-Type, and the specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="fileStream">The <see cref="Stream"/> with the contents of the file.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <param name="lastModified">The <see cref="DateTimeOffset"/> of when the file was last modified.</param>
+        /// <param name="entityTag">The <see cref="EntityTagHeaderValue"/> associated with the file.</param>
+        /// <returns>The created <see cref="FileStreamResult"/> for the response.</returns>
+        [NonAction]
+        public virtual FileStreamResult File(Stream fileStream, string contentType, string fileDownloadName, DateTimeOffset? lastModified, EntityTagHeaderValue entityTag)
+        {
+            return new FileStreamResult(fileStream, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                FileDownloadName = fileDownloadName,
+            };
+        }
+
+        /// <summary>
+        /// Returns a file in the specified <paramref name="fileStream" /> (<see cref="StatusCodes.Status200OK"/>), the 
+        /// specified <paramref name="contentType" /> as the Content-Type, and the specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="fileStream">The <see cref="Stream"/> with the contents of the file.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <param name="lastModified">The <see cref="DateTimeOffset"/> of when the file was last modified.</param>
+        /// <param name="entityTag">The <see cref="EntityTagHeaderValue"/> associated with the file.</param>
+        /// <param name="enableRangeProcessing">Set to <c>true</c> to enable range requests processing.</param>
+        /// <returns>The created <see cref="FileStreamResult"/> for the response.</returns>
+        [NonAction]
+        public virtual FileStreamResult File(Stream fileStream, string contentType, string fileDownloadName, DateTimeOffset? lastModified, EntityTagHeaderValue entityTag, bool enableRangeProcessing)
+        {
+            return new FileStreamResult(fileStream, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                FileDownloadName = fileDownloadName,
+                EnableRangeProcessing = enableRangeProcessing,
+            };
+        }
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="virtualPath" /> (<see cref="StatusCodes.Status200OK"/>) with the
+        /// specified <paramref name="contentType" /> as the Content-Type.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="virtualPath">The virtual path of the file to be returned.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <returns>The created <see cref="VirtualFileResult"/> for the response.</returns>
+        [NonAction]
+        public virtual VirtualFileResult File(string virtualPath, string contentType)
+            => File(virtualPath, contentType, fileDownloadName: null);
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="virtualPath" /> (<see cref="StatusCodes.Status200OK"/>) with the
+        /// specified <paramref name="contentType" /> as the Content-Type.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="virtualPath">The virtual path of the file to be returned.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="enableRangeProcessing">Set to <c>true</c> to enable range requests processing.</param>
+        /// <returns>The created <see cref="VirtualFileResult"/> for the response.</returns>
+        [NonAction]
+        public virtual VirtualFileResult File(string virtualPath, string contentType, bool enableRangeProcessing)
+            => File(virtualPath, contentType, fileDownloadName: null, enableRangeProcessing: enableRangeProcessing);
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="virtualPath" /> (<see cref="StatusCodes.Status200OK"/>) with the
+        /// specified <paramref name="contentType" /> as the Content-Type and the
+        /// specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="virtualPath">The virtual path of the file to be returned.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <returns>The created <see cref="VirtualFileResult"/> for the response.</returns>
+        [NonAction]
+        public virtual VirtualFileResult File(string virtualPath, string contentType, string fileDownloadName)
+            => new VirtualFileResult(virtualPath, contentType) { FileDownloadName = fileDownloadName };
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="virtualPath" /> (<see cref="StatusCodes.Status200OK"/>) with the
+        /// specified <paramref name="contentType" /> as the Content-Type and the
+        /// specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="virtualPath">The virtual path of the file to be returned.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <param name="enableRangeProcessing">Set to <c>true</c> to enable range requests processing.</param>
+        /// <returns>The created <see cref="VirtualFileResult"/> for the response.</returns>
+        [NonAction]
+        public virtual VirtualFileResult File(string virtualPath, string contentType, string fileDownloadName, bool enableRangeProcessing)
+            => new VirtualFileResult(virtualPath, contentType)
+            {
+                FileDownloadName = fileDownloadName,
+                EnableRangeProcessing = enableRangeProcessing,
+            };
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="virtualPath" /> (<see cref="StatusCodes.Status200OK"/>), and the 
+        /// specified <paramref name="contentType" /> as the Content-Type.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="virtualPath">The virtual path of the file to be returned.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="lastModified">The <see cref="DateTimeOffset"/> of when the file was last modified.</param>
+        /// <param name="entityTag">The <see cref="EntityTagHeaderValue"/> associated with the file.</param>
+        /// <returns>The created <see cref="VirtualFileResult"/> for the response.</returns>
+        [NonAction]
+        public virtual VirtualFileResult File(string virtualPath, string contentType, DateTimeOffset? lastModified, EntityTagHeaderValue entityTag)
+        {
+            return new VirtualFileResult(virtualPath, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+            };
+        }
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="virtualPath" /> (<see cref="StatusCodes.Status200OK"/>), and the 
+        /// specified <paramref name="contentType" /> as the Content-Type.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="virtualPath">The virtual path of the file to be returned.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="lastModified">The <see cref="DateTimeOffset"/> of when the file was last modified.</param>
+        /// <param name="entityTag">The <see cref="EntityTagHeaderValue"/> associated with the file.</param>
+        /// <param name="enableRangeProcessing">Set to <c>true</c> to enable range requests processing.</param>
+        /// <returns>The created <see cref="VirtualFileResult"/> for the response.</returns>
+        [NonAction]
+        public virtual VirtualFileResult File(string virtualPath, string contentType, DateTimeOffset? lastModified, EntityTagHeaderValue entityTag, bool enableRangeProcessing)
+        {
+            return new VirtualFileResult(virtualPath, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                EnableRangeProcessing = enableRangeProcessing,
+            };
+        }
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="virtualPath" /> (<see cref="StatusCodes.Status200OK"/>), the 
+        /// specified <paramref name="contentType" /> as the Content-Type, and the specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="virtualPath">The virtual path of the file to be returned.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <param name="lastModified">The <see cref="DateTimeOffset"/> of when the file was last modified.</param>
+        /// <param name="entityTag">The <see cref="EntityTagHeaderValue"/> associated with the file.</param>
+        /// <returns>The created <see cref="VirtualFileResult"/> for the response.</returns>
+        [NonAction]
+        public virtual VirtualFileResult File(string virtualPath, string contentType, string fileDownloadName, DateTimeOffset? lastModified, EntityTagHeaderValue entityTag)
+        {
+            return new VirtualFileResult(virtualPath, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                FileDownloadName = fileDownloadName,
+            };
+        }
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="virtualPath" /> (<see cref="StatusCodes.Status200OK"/>), the 
+        /// specified <paramref name="contentType" /> as the Content-Type, and the specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="virtualPath">The virtual path of the file to be returned.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <param name="lastModified">The <see cref="DateTimeOffset"/> of when the file was last modified.</param>
+        /// <param name="entityTag">The <see cref="EntityTagHeaderValue"/> associated with the file.</param>
+        /// <param name="enableRangeProcessing">Set to <c>true</c> to enable range requests processing.</param>
+        /// <returns>The created <see cref="VirtualFileResult"/> for the response.</returns>
+        [NonAction]
+        public virtual VirtualFileResult File(string virtualPath, string contentType, string fileDownloadName, DateTimeOffset? lastModified, EntityTagHeaderValue entityTag, bool enableRangeProcessing)
+        {
+            return new VirtualFileResult(virtualPath, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                FileDownloadName = fileDownloadName,
+                EnableRangeProcessing = enableRangeProcessing,
+            };
+        }
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="physicalPath" /> (<see cref="StatusCodes.Status200OK"/>) with the
+        /// specified <paramref name="contentType" /> as the Content-Type.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="physicalPath">The path to the file. The path must be an absolute path.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <returns>The created <see cref="PhysicalFileResult"/> for the response.</returns>
+        [NonAction]
+        public virtual PhysicalFileResult PhysicalFile(string physicalPath, string contentType)
+            => PhysicalFile(physicalPath, contentType, fileDownloadName: null);
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="physicalPath" /> (<see cref="StatusCodes.Status200OK"/>) with the
+        /// specified <paramref name="contentType" /> as the Content-Type.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="physicalPath">The path to the file. The path must be an absolute path.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="enableRangeProcessing">Set to <c>true</c> to enable range requests processing.</param>
+        /// <returns>The created <see cref="PhysicalFileResult"/> for the response.</returns>
+        [NonAction]
+        public virtual PhysicalFileResult PhysicalFile(string physicalPath, string contentType, bool enableRangeProcessing)
+            => PhysicalFile(physicalPath, contentType, fileDownloadName: null, enableRangeProcessing: enableRangeProcessing);
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="physicalPath" /> (<see cref="StatusCodes.Status200OK"/>) with the
+        /// specified <paramref name="contentType" /> as the Content-Type and the
+        /// specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="physicalPath">The path to the file. The path must be an absolute path.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <returns>The created <see cref="PhysicalFileResult"/> for the response.</returns>
+        [NonAction]
+        public virtual PhysicalFileResult PhysicalFile(
+            string physicalPath,
+            string contentType,
+            string fileDownloadName)
+            => new PhysicalFileResult(physicalPath, contentType) { FileDownloadName = fileDownloadName };
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="physicalPath" /> (<see cref="StatusCodes.Status200OK"/>) with the
+        /// specified <paramref name="contentType" /> as the Content-Type and the
+        /// specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="physicalPath">The path to the file. The path must be an absolute path.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <param name="enableRangeProcessing">Set to <c>true</c> to enable range requests processing.</param>
+        /// <returns>The created <see cref="PhysicalFileResult"/> for the response.</returns>
+        [NonAction]
+        public virtual PhysicalFileResult PhysicalFile(
+            string physicalPath,
+            string contentType,
+            string fileDownloadName,
+            bool enableRangeProcessing)
+            => new PhysicalFileResult(physicalPath, contentType)
+            {
+                FileDownloadName = fileDownloadName,
+                EnableRangeProcessing = enableRangeProcessing,
+            };
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="physicalPath" /> (<see cref="StatusCodes.Status200OK"/>), and 
+        /// the specified <paramref name="contentType" /> as the Content-Type.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="physicalPath">The path to the file. The path must be an absolute path.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="lastModified">The <see cref="DateTimeOffset"/> of when the file was last modified.</param>
+        /// <param name="entityTag">The <see cref="EntityTagHeaderValue"/> associated with the file.</param>
+        /// <returns>The created <see cref="PhysicalFileResult"/> for the response.</returns>
+        [NonAction]
+        public virtual PhysicalFileResult PhysicalFile(string physicalPath, string contentType, DateTimeOffset? lastModified, EntityTagHeaderValue entityTag)
+        {
+            return new PhysicalFileResult(physicalPath, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+            };
+        }
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="physicalPath" /> (<see cref="StatusCodes.Status200OK"/>), and 
+        /// the specified <paramref name="contentType" /> as the Content-Type.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="physicalPath">The path to the file. The path must be an absolute path.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="lastModified">The <see cref="DateTimeOffset"/> of when the file was last modified.</param>
+        /// <param name="entityTag">The <see cref="EntityTagHeaderValue"/> associated with the file.</param>
+        /// <param name="enableRangeProcessing">Set to <c>true</c> to enable range requests processing.</param>
+        /// <returns>The created <see cref="PhysicalFileResult"/> for the response.</returns>
+        [NonAction]
+        public virtual PhysicalFileResult PhysicalFile(string physicalPath, string contentType, DateTimeOffset? lastModified, EntityTagHeaderValue entityTag, bool enableRangeProcessing)
+        {
+            return new PhysicalFileResult(physicalPath, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                EnableRangeProcessing = enableRangeProcessing,
+            };
+        }
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="physicalPath" /> (<see cref="StatusCodes.Status200OK"/>), the 
+        /// specified <paramref name="contentType" /> as the Content-Type, and the specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="physicalPath">The path to the file. The path must be an absolute path.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <param name="lastModified">The <see cref="DateTimeOffset"/> of when the file was last modified.</param>
+        /// <param name="entityTag">The <see cref="EntityTagHeaderValue"/> associated with the file.</param>
+        /// <returns>The created <see cref="PhysicalFileResult"/> for the response.</returns>
+        [NonAction]
+        public virtual PhysicalFileResult PhysicalFile(string physicalPath, string contentType, string fileDownloadName, DateTimeOffset? lastModified, EntityTagHeaderValue entityTag)
+        {
+            return new PhysicalFileResult(physicalPath, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                FileDownloadName = fileDownloadName,
+            };
+        }
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="physicalPath" /> (<see cref="StatusCodes.Status200OK"/>), the 
+        /// specified <paramref name="contentType" /> as the Content-Type, and the specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// This supports range requests (<see cref="StatusCodes.Status206PartialContent"/> or
+        /// <see cref="StatusCodes.Status416RangeNotSatisfiable"/> if the range is not satisfiable).
+        /// </summary>
+        /// <param name="physicalPath">The path to the file. The path must be an absolute path.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <param name="lastModified">The <see cref="DateTimeOffset"/> of when the file was last modified.</param>
+        /// <param name="entityTag">The <see cref="EntityTagHeaderValue"/> associated with the file.</param>
+        /// <param name="enableRangeProcessing">Set to <c>true</c> to enable range requests processing.</param>
+        /// <returns>The created <see cref="PhysicalFileResult"/> for the response.</returns>
+        [NonAction]
+        public virtual PhysicalFileResult PhysicalFile(string physicalPath, string contentType, string fileDownloadName, DateTimeOffset? lastModified, EntityTagHeaderValue entityTag, bool enableRangeProcessing)
+        {
+            return new PhysicalFileResult(physicalPath, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                FileDownloadName = fileDownloadName,
+                EnableRangeProcessing = enableRangeProcessing,
+            };
+        }
+
+        /// <summary>
+        /// Creates an <see cref="UnauthorizedResult"/> that produces an <see cref="StatusCodes.Status401Unauthorized"/> response.
+        /// </summary>
+        /// <returns>The created <see cref="UnauthorizedResult"/> for the response.</returns>
+        [NonAction]
+        public virtual UnauthorizedResult Unauthorized()
+            => new UnauthorizedResult();
+
+        /// <summary>
+        /// Creates an <see cref="NotFoundResult"/> that produces a <see cref="StatusCodes.Status404NotFound"/> response.
+        /// </summary>
+        /// <returns>The created <see cref="NotFoundResult"/> for the response.</returns>
+        [NonAction]
+        public virtual NotFoundResult NotFound()
+            => new NotFoundResult();
+
+        /// <summary>
+        /// Creates an <see cref="NotFoundObjectResult"/> that produces a <see cref="StatusCodes.Status404NotFound"/> response.
+        /// </summary>
+        /// <returns>The created <see cref="NotFoundObjectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual NotFoundObjectResult NotFound(object value)
+            => new NotFoundObjectResult(value);
+
+        /// <summary>
+        /// Creates an <see cref="BadRequestResult"/> that produces a <see cref="StatusCodes.Status400BadRequest"/> response.
+        /// </summary>
+        /// <returns>The created <see cref="BadRequestResult"/> for the response.</returns>
+        [NonAction]
+        public virtual BadRequestResult BadRequest()
+            => new BadRequestResult();
+
+        /// <summary>
+        /// Creates an <see cref="BadRequestObjectResult"/> that produces a <see cref="StatusCodes.Status400BadRequest"/> response.
+        /// </summary>
+        /// <param name="error">An error object to be returned to the client.</param>
+        /// <returns>The created <see cref="BadRequestObjectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual BadRequestObjectResult BadRequest(object error)
+            => new BadRequestObjectResult(error);
+
+        /// <summary>
+        /// Creates an <see cref="BadRequestObjectResult"/> that produces a <see cref="StatusCodes.Status400BadRequest"/> response.
+        /// </summary>
+        /// <param name="modelState">The <see cref="ModelStateDictionary" /> containing errors to be returned to the client.</param>
+        /// <returns>The created <see cref="BadRequestObjectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual BadRequestObjectResult BadRequest(ModelStateDictionary modelState)
+        {
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            return new BadRequestObjectResult(modelState);
+        }
+
+        /// <summary>
+        /// Creates an <see cref="UnprocessableEntityResult"/> that produces a <see cref="StatusCodes.Status422UnprocessableEntity"/> response.
+        /// </summary>
+        /// <returns>The created <see cref="UnprocessableEntityResult"/> for the response.</returns>
+        [NonAction]
+        public virtual UnprocessableEntityResult UnprocessableEntity()
+        {
+            return new UnprocessableEntityResult();
+        }
+
+        /// <summary>
+        /// Creates an <see cref="UnprocessableEntityObjectResult"/> that produces a <see cref="StatusCodes.Status422UnprocessableEntity"/> response.
+        /// </summary>
+        /// <param name="error">An error object to be returned to the client.</param>
+        /// <returns>The created <see cref="UnprocessableEntityObjectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual UnprocessableEntityObjectResult UnprocessableEntity(object error)
+        {
+            return new UnprocessableEntityObjectResult(error);
+        }
+
+        /// <summary>
+        /// Creates an <see cref="UnprocessableEntityObjectResult"/> that produces a <see cref="StatusCodes.Status422UnprocessableEntity"/> response.
+        /// </summary>
+        /// <param name="modelState">The <see cref="ModelStateDictionary" /> containing errors to be returned to the client.</param>
+        /// <returns>The created <see cref="UnprocessableEntityObjectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual UnprocessableEntityObjectResult UnprocessableEntity(ModelStateDictionary modelState)
+        {
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            return new UnprocessableEntityObjectResult(modelState);
+        }
+
+        /// <summary>
+        /// Creates an <see cref="ConflictResult"/> that produces a <see cref="StatusCodes.Status409Conflict"/> response.
+        /// </summary>
+        /// <returns>The created <see cref="ConflictResult"/> for the response.</returns>
+        [NonAction]
+        public virtual ConflictResult Conflict()
+            => new ConflictResult();
+
+        /// <summary>
+        /// Creates an <see cref="ConflictObjectResult"/> that produces a <see cref="StatusCodes.Status409Conflict"/> response.
+        /// </summary>
+        /// <param name="error">Contains errors to be returned to the client.</param>
+        /// <returns>The created <see cref="ConflictObjectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual ConflictObjectResult Conflict(object error)
+            => new ConflictObjectResult(error);
+
+        /// <summary>
+        /// Creates an <see cref="ConflictObjectResult"/> that produces a <see cref="StatusCodes.Status409Conflict"/> response.
+        /// </summary>
+        /// <param name="modelState">The <see cref="ModelStateDictionary" /> containing errors to be returned to the client.</param>
+        /// <returns>The created <see cref="ConflictObjectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual ConflictObjectResult Conflict(ModelStateDictionary modelState)
+            => new ConflictObjectResult(modelState);
+
+        /// <summary>
+        /// Creates an <see cref="BadRequestObjectResult"/> that produces a <see cref="StatusCodes.Status400BadRequest"/> response.
+        /// </summary>
+        /// <returns>The created <see cref="BadRequestObjectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual ActionResult ValidationProblem(ValidationProblemDetails descriptor)
+        {
+            if (descriptor == null)
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+
+            return new BadRequestObjectResult(descriptor);
+        }
+
+        /// <summary>
+        /// Creates an <see cref="BadRequestObjectResult"/> that produces a <see cref="StatusCodes.Status400BadRequest"/> response.
+        /// </summary>
+        /// <returns>The created <see cref="BadRequestObjectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual ActionResult ValidationProblem(ModelStateDictionary modelStateDictionary)
+        {
+            if (modelStateDictionary == null)
+            {
+                throw new ArgumentNullException(nameof(modelStateDictionary));
+            }
+
+            var validationProblem = new ValidationProblemDetails(modelStateDictionary);
+            return new BadRequestObjectResult(validationProblem);
+        }
+
+        /// <summary>
+        /// Creates an <see cref="BadRequestObjectResult"/> that produces a <see cref="StatusCodes.Status400BadRequest"/> response
+        /// with validation errors from <see cref="ModelState"/>.
+        /// </summary>
+        /// <returns>The created <see cref="BadRequestObjectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual ActionResult ValidationProblem()
+        {
+            var validationProblem = new ValidationProblemDetails(ModelState);
+            return new BadRequestObjectResult(validationProblem);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="CreatedResult"/> object that produces a <see cref="StatusCodes.Status201Created"/> response.
+        /// </summary>
+        /// <param name="uri">The URI at which the content has been created.</param>
+        /// <param name="value">The content value to format in the entity body.</param>
+        /// <returns>The created <see cref="CreatedResult"/> for the response.</returns>
+        [NonAction]
+        public virtual CreatedResult Created(string uri, object value)
+        {
+            if (uri == null)
+            {
+                throw new ArgumentNullException(nameof(uri));
+            }
+
+            return new CreatedResult(uri, value);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="CreatedResult"/> object that produces a <see cref="StatusCodes.Status201Created"/> response.
+        /// </summary>
+        /// <param name="uri">The URI at which the content has been created.</param>
+        /// <param name="value">The content value to format in the entity body.</param>
+        /// <returns>The created <see cref="CreatedResult"/> for the response.</returns>
+        [NonAction]
+        public virtual CreatedResult Created(Uri uri, object value)
+        {
+            if (uri == null)
+            {
+                throw new ArgumentNullException(nameof(uri));
+            }
+
+            return new CreatedResult(uri, value);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="CreatedAtActionResult"/> object that produces a <see cref="StatusCodes.Status201Created"/> response.
+        /// </summary>
+        /// <param name="actionName">The name of the action to use for generating the URL.</param>
+        /// <param name="value">The content value to format in the entity body.</param>
+        /// <returns>The created <see cref="CreatedAtActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual CreatedAtActionResult CreatedAtAction(string actionName, object value)
+            => CreatedAtAction(actionName, routeValues: null, value: value);
+
+        /// <summary>
+        /// Creates a <see cref="CreatedAtActionResult"/> object that produces a <see cref="StatusCodes.Status201Created"/> response.
+        /// </summary>
+        /// <param name="actionName">The name of the action to use for generating the URL.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="value">The content value to format in the entity body.</param>
+        /// <returns>The created <see cref="CreatedAtActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual CreatedAtActionResult CreatedAtAction(string actionName, object routeValues, object value)
+            => CreatedAtAction(actionName, controllerName: null, routeValues: routeValues, value: value);
+
+        /// <summary>
+        /// Creates a <see cref="CreatedAtActionResult"/> object that produces a <see cref="StatusCodes.Status201Created"/> response.
+        /// </summary>
+        /// <param name="actionName">The name of the action to use for generating the URL.</param>
+        /// <param name="controllerName">The name of the controller to use for generating the URL.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="value">The content value to format in the entity body.</param>
+        /// <returns>The created <see cref="CreatedAtActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual CreatedAtActionResult CreatedAtAction(
+            string actionName,
+            string controllerName,
+            object routeValues,
+            object value)
+            => new CreatedAtActionResult(actionName, controllerName, routeValues, value);
+
+        /// <summary>
+        /// Creates a <see cref="CreatedAtRouteResult"/> object that produces a <see cref="StatusCodes.Status201Created"/> response.
+        /// </summary>
+        /// <param name="routeName">The name of the route to use for generating the URL.</param>
+        /// <param name="value">The content value to format in the entity body.</param>
+        /// <returns>The created <see cref="CreatedAtRouteResult"/> for the response.</returns>
+        [NonAction]
+        public virtual CreatedAtRouteResult CreatedAtRoute(string routeName, object value)
+            => CreatedAtRoute(routeName, routeValues: null, value: value);
+
+        /// <summary>
+        /// Creates a <see cref="CreatedAtRouteResult"/> object that produces a <see cref="StatusCodes.Status201Created"/> response.
+        /// </summary>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="value">The content value to format in the entity body.</param>
+        /// <returns>The created <see cref="CreatedAtRouteResult"/> for the response.</returns>
+        [NonAction]
+        public virtual CreatedAtRouteResult CreatedAtRoute(object routeValues, object value)
+            => CreatedAtRoute(routeName: null, routeValues: routeValues, value: value);
+
+        /// <summary>
+        /// Creates a <see cref="CreatedAtRouteResult"/> object that produces a <see cref="StatusCodes.Status201Created"/> response.
+        /// </summary>
+        /// <param name="routeName">The name of the route to use for generating the URL.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="value">The content value to format in the entity body.</param>
+        /// <returns>The created <see cref="CreatedAtRouteResult"/> for the response.</returns>
+        [NonAction]
+        public virtual CreatedAtRouteResult CreatedAtRoute(string routeName, object routeValues, object value)
+            => new CreatedAtRouteResult(routeName, routeValues, value);
+
+        /// <summary>
+        /// Creates a <see cref="AcceptedResult"/> object that produces an <see cref="StatusCodes.Status202Accepted"/> response.
+        /// </summary>
+        /// <returns>The created <see cref="AcceptedResult"/> for the response.</returns>
+        [NonAction]
+        public virtual AcceptedResult Accepted()
+            => new AcceptedResult();
+
+        /// <summary>
+        /// Creates a <see cref="AcceptedResult"/> object that produces an <see cref="StatusCodes.Status202Accepted"/> response.
+        /// </summary>
+        /// <param name="value">The optional content value to format in the entity body; may be null.</param>
+        /// <returns>The created <see cref="AcceptedResult"/> for the response.</returns>
+        [NonAction]
+        public virtual AcceptedResult Accepted(object value)
+            => new AcceptedResult(location: null, value: value);
+
+        /// <summary>
+        /// Creates a <see cref="AcceptedResult"/> object that produces an <see cref="StatusCodes.Status202Accepted"/> response.
+        /// </summary>
+        /// <param name="uri">The optional URI with the location at which the status of requested content can be monitored.
+        /// May be null.</param>
+        /// <returns>The created <see cref="AcceptedResult"/> for the response.</returns>
+        [NonAction]
+        public virtual AcceptedResult Accepted(Uri uri)
+        {
+            if (uri == null)
+            {
+                throw new ArgumentNullException(nameof(uri));
+            }
+
+            return new AcceptedResult(locationUri: uri, value: null);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="AcceptedResult"/> object that produces an <see cref="StatusCodes.Status202Accepted"/> response.
+        /// </summary>
+        /// <param name="uri">The optional URI with the location at which the status of requested content can be monitored.
+        /// May be null.</param>
+        /// <returns>The created <see cref="AcceptedResult"/> for the response.</returns>
+        [NonAction]
+        public virtual AcceptedResult Accepted(string uri)
+            => new AcceptedResult(location: uri, value: null);
+
+        /// <summary>
+        /// Creates a <see cref="AcceptedResult"/> object that produces an <see cref="StatusCodes.Status202Accepted"/> response.
+        /// </summary>
+        /// <param name="uri">The URI with the location at which the status of requested content can be monitored.</param>
+        /// <param name="value">The optional content value to format in the entity body; may be null.</param>
+        /// <returns>The created <see cref="AcceptedResult"/> for the response.</returns>
+        [NonAction]
+        public virtual AcceptedResult Accepted(string uri, object value)
+            => new AcceptedResult(uri, value);
+
+        /// <summary>
+        /// Creates a <see cref="AcceptedResult"/> object that produces an <see cref="StatusCodes.Status202Accepted"/> response.
+        /// </summary>
+        /// <param name="uri">The URI with the location at which the status of requested content can be monitored.</param>
+        /// <param name="value">The optional content value to format in the entity body; may be null.</param>
+        /// <returns>The created <see cref="AcceptedResult"/> for the response.</returns>
+        [NonAction]
+        public virtual AcceptedResult Accepted(Uri uri, object value)
+        {
+            if (uri == null)
+            {
+                throw new ArgumentNullException(nameof(uri));
+            }
+
+            return new AcceptedResult(locationUri: uri, value: value);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="AcceptedAtActionResult"/> object that produces an <see cref="StatusCodes.Status202Accepted"/> response.
+        /// </summary>
+        /// <param name="actionName">The name of the action to use for generating the URL.</param>
+        /// <returns>The created <see cref="AcceptedAtActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual AcceptedAtActionResult AcceptedAtAction(string actionName)
+            => AcceptedAtAction(actionName, routeValues: null, value: null);
+
+        /// <summary>
+        /// Creates a <see cref="AcceptedAtActionResult"/> object that produces an <see cref="StatusCodes.Status202Accepted"/> response.
+        /// </summary>
+        /// <param name="actionName">The name of the action to use for generating the URL.</param>
+        /// <param name="controllerName">The name of the controller to use for generating the URL.</param>
+        /// <returns>The created <see cref="AcceptedAtActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual AcceptedAtActionResult AcceptedAtAction(string actionName, string controllerName)
+            => AcceptedAtAction(actionName, controllerName, routeValues: null, value: null);
+
+        /// <summary>
+        /// Creates a <see cref="AcceptedAtActionResult"/> object that produces an <see cref="StatusCodes.Status202Accepted"/> response.
+        /// </summary>
+        /// <param name="actionName">The name of the action to use for generating the URL.</param>
+        /// <param name="value">The optional content value to format in the entity body; may be null.</param>
+        /// <returns>The created <see cref="AcceptedAtActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual AcceptedAtActionResult AcceptedAtAction(string actionName, object value)
+            => AcceptedAtAction(actionName, routeValues: null, value: value);
+
+        /// <summary>
+        /// Creates a <see cref="AcceptedAtActionResult"/> object that produces an <see cref="StatusCodes.Status202Accepted"/> response.
+        /// </summary>
+        /// <param name="actionName">The name of the action to use for generating the URL.</param>
+        /// <param name="controllerName">The name of the controller to use for generating the URL.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <returns>The created <see cref="AcceptedAtActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual AcceptedAtActionResult AcceptedAtAction(string actionName, string controllerName, object routeValues)
+            => AcceptedAtAction(actionName, controllerName, routeValues, value: null);
+
+        /// <summary>
+        /// Creates a <see cref="AcceptedAtActionResult"/> object that produces an <see cref="StatusCodes.Status202Accepted"/> response.
+        /// </summary>
+        /// <param name="actionName">The name of the action to use for generating the URL.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="value">The optional content value to format in the entity body; may be null.</param>
+        /// <returns>The created <see cref="AcceptedAtActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual AcceptedAtActionResult AcceptedAtAction(string actionName, object routeValues, object value)
+            => AcceptedAtAction(actionName, controllerName: null, routeValues: routeValues, value: value);
+
+        /// <summary>
+        /// Creates a <see cref="AcceptedAtActionResult"/> object that produces an <see cref="StatusCodes.Status202Accepted"/> response.
+        /// </summary>
+        /// <param name="actionName">The name of the action to use for generating the URL.</param>
+        /// <param name="controllerName">The name of the controller to use for generating the URL.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="value">The optional content value to format in the entity body; may be null.</param>
+        /// <returns>The created <see cref="AcceptedAtActionResult"/> for the response.</returns>
+        [NonAction]
+        public virtual AcceptedAtActionResult AcceptedAtAction(
+            string actionName,
+            string controllerName,
+            object routeValues,
+            object value)
+            => new AcceptedAtActionResult(actionName, controllerName, routeValues, value);
+
+        /// <summary>
+        /// Creates a <see cref="AcceptedAtRouteResult"/> object that produces an <see cref="StatusCodes.Status202Accepted"/> response.
+        /// </summary>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <returns>The created <see cref="AcceptedAtRouteResult"/> for the response.</returns>
+        [NonAction]
+        public virtual AcceptedAtRouteResult AcceptedAtRoute(object routeValues)
+            => AcceptedAtRoute(routeName: null, routeValues: routeValues, value: null);
+
+        /// <summary>
+        /// Creates a <see cref="AcceptedAtRouteResult"/> object that produces an <see cref="StatusCodes.Status202Accepted"/> response.
+        /// </summary>
+        /// <param name="routeName">The name of the route to use for generating the URL.</param>
+        /// <returns>The created <see cref="AcceptedAtRouteResult"/> for the response.</returns>
+        [NonAction]
+        public virtual AcceptedAtRouteResult AcceptedAtRoute(string routeName)
+            => AcceptedAtRoute(routeName, routeValues: null, value: null);
+
+        /// <summary>
+        /// Creates a <see cref="AcceptedAtRouteResult"/> object that produces an <see cref="StatusCodes.Status202Accepted"/> response.
+        /// </summary>
+        /// <param name="routeName">The name of the route to use for generating the URL.</param>
+        ///<param name="routeValues">The route data to use for generating the URL.</param>
+        /// <returns>The created <see cref="AcceptedAtRouteResult"/> for the response.</returns>
+        [NonAction]
+        public virtual AcceptedAtRouteResult AcceptedAtRoute(string routeName, object routeValues)
+            => AcceptedAtRoute(routeName, routeValues, value: null);
+
+        /// <summary>
+        /// Creates a <see cref="AcceptedAtRouteResult"/> object that produces an <see cref="StatusCodes.Status202Accepted"/> response.
+        /// </summary>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="value">The optional content value to format in the entity body; may be null.</param>
+        /// <returns>The created <see cref="AcceptedAtRouteResult"/> for the response.</returns>
+        [NonAction]
+        public virtual AcceptedAtRouteResult AcceptedAtRoute(object routeValues, object value)
+            => AcceptedAtRoute(routeName: null, routeValues: routeValues, value: value);
+
+        /// <summary>
+        /// Creates a <see cref="AcceptedAtRouteResult"/> object that produces an <see cref="StatusCodes.Status202Accepted"/> response.
+        /// </summary>
+        /// <param name="routeName">The name of the route to use for generating the URL.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="value">The optional content value to format in the entity body; may be null.</param>
+        /// <returns>The created <see cref="AcceptedAtRouteResult"/> for the response.</returns>
+        [NonAction]
+        public virtual AcceptedAtRouteResult AcceptedAtRoute(string routeName, object routeValues, object value)
+            => new AcceptedAtRouteResult(routeName, routeValues, value);
+
+        /// <summary>
+        /// Creates a <see cref="ChallengeResult"/>.
+        /// </summary>
+        /// <returns>The created <see cref="ChallengeResult"/> for the response.</returns>
+        /// <remarks>
+        /// The behavior of this method depends on the <see cref="IAuthenticationService"/> in use.
+        /// <see cref="StatusCodes.Status401Unauthorized"/> and <see cref="StatusCodes.Status403Forbidden"/>
+        /// are among likely status results.
+        /// </remarks>
+        [NonAction]
+        public virtual ChallengeResult Challenge()
+            => new ChallengeResult();
+
+        /// <summary>
+        /// Creates a <see cref="ChallengeResult"/> with the specified authentication schemes.
+        /// </summary>
+        /// <param name="authenticationSchemes">The authentication schemes to challenge.</param>
+        /// <returns>The created <see cref="ChallengeResult"/> for the response.</returns>
+        /// <remarks>
+        /// The behavior of this method depends on the <see cref="IAuthenticationService"/> in use.
+        /// <see cref="StatusCodes.Status401Unauthorized"/> and <see cref="StatusCodes.Status403Forbidden"/>
+        /// are among likely status results.
+        /// </remarks>
+        [NonAction]
+        public virtual ChallengeResult Challenge(params string[] authenticationSchemes)
+            => new ChallengeResult(authenticationSchemes);
+
+        /// <summary>
+        /// Creates a <see cref="ChallengeResult"/> with the specified <paramref name="properties" />.
+        /// </summary>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the authentication
+        /// challenge.</param>
+        /// <returns>The created <see cref="ChallengeResult"/> for the response.</returns>
+        /// <remarks>
+        /// The behavior of this method depends on the <see cref="IAuthenticationService"/> in use.
+        /// <see cref="StatusCodes.Status401Unauthorized"/> and <see cref="StatusCodes.Status403Forbidden"/>
+        /// are among likely status results.
+        /// </remarks>
+        [NonAction]
+        public virtual ChallengeResult Challenge(AuthenticationProperties properties)
+            => new ChallengeResult(properties);
+
+        /// <summary>
+        /// Creates a <see cref="ChallengeResult"/> with the specified authentication schemes and
+        /// <paramref name="properties" />.
+        /// </summary>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the authentication
+        /// challenge.</param>
+        /// <param name="authenticationSchemes">The authentication schemes to challenge.</param>
+        /// <returns>The created <see cref="ChallengeResult"/> for the response.</returns>
+        /// <remarks>
+        /// The behavior of this method depends on the <see cref="IAuthenticationService"/> in use.
+        /// <see cref="StatusCodes.Status401Unauthorized"/> and <see cref="StatusCodes.Status403Forbidden"/>
+        /// are among likely status results.
+        /// </remarks>
+        [NonAction]
+        public virtual ChallengeResult Challenge(
+            AuthenticationProperties properties,
+            params string[] authenticationSchemes)
+            => new ChallengeResult(authenticationSchemes, properties);
+
+        /// <summary>
+        /// Creates a <see cref="ForbidResult"/> (<see cref="StatusCodes.Status403Forbidden"/> by default).
+        /// </summary>
+        /// <returns>The created <see cref="ForbidResult"/> for the response.</returns>
+        /// <remarks>
+        /// Some authentication schemes, such as cookies, will convert <see cref="StatusCodes.Status403Forbidden"/> to
+        /// a redirect to show a login page.
+        /// </remarks>
+        [NonAction]
+        public virtual ForbidResult Forbid()
+            => new ForbidResult();
+
+        /// <summary>
+        /// Creates a <see cref="ForbidResult"/> (<see cref="StatusCodes.Status403Forbidden"/> by default) with the
+        /// specified authentication schemes.
+        /// </summary>
+        /// <param name="authenticationSchemes">The authentication schemes to challenge.</param>
+        /// <returns>The created <see cref="ForbidResult"/> for the response.</returns>
+        /// <remarks>
+        /// Some authentication schemes, such as cookies, will convert <see cref="StatusCodes.Status403Forbidden"/> to
+        /// a redirect to show a login page.
+        /// </remarks>
+        [NonAction]
+        public virtual ForbidResult Forbid(params string[] authenticationSchemes)
+            => new ForbidResult(authenticationSchemes);
+
+        /// <summary>
+        /// Creates a <see cref="ForbidResult"/> (<see cref="StatusCodes.Status403Forbidden"/> by default) with the
+        /// specified <paramref name="properties" />.
+        /// </summary>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the authentication
+        /// challenge.</param>
+        /// <returns>The created <see cref="ForbidResult"/> for the response.</returns>
+        /// <remarks>
+        /// Some authentication schemes, such as cookies, will convert <see cref="StatusCodes.Status403Forbidden"/> to 
+        /// a redirect to show a login page.
+        /// </remarks>
+        [NonAction]
+        public virtual ForbidResult Forbid(AuthenticationProperties properties)
+            => new ForbidResult(properties);
+
+        /// <summary>
+        /// Creates a <see cref="ForbidResult"/> (<see cref="StatusCodes.Status403Forbidden"/> by default) with the 
+        /// specified authentication schemes and <paramref name="properties" />.
+        /// </summary>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the authentication
+        /// challenge.</param>
+        /// <param name="authenticationSchemes">The authentication schemes to challenge.</param>
+        /// <returns>The created <see cref="ForbidResult"/> for the response.</returns>
+        /// <remarks>
+        /// Some authentication schemes, such as cookies, will convert <see cref="StatusCodes.Status403Forbidden"/> to
+        /// a redirect to show a login page.
+        /// </remarks>
+        [NonAction]
+        public virtual ForbidResult Forbid(AuthenticationProperties properties, params string[] authenticationSchemes)
+            => new ForbidResult(authenticationSchemes, properties);
+
+        /// <summary>
+        /// Creates a <see cref="SignInResult"/> with the specified authentication scheme.
+        /// </summary>
+        /// <param name="principal">The <see cref="ClaimsPrincipal"/> containing the user claims.</param>
+        /// <param name="authenticationScheme">The authentication scheme to use for the sign-in operation.</param>
+        /// <returns>The created <see cref="SignInResult"/> for the response.</returns>
+        [NonAction]
+        public virtual SignInResult SignIn(ClaimsPrincipal principal, string authenticationScheme)
+            => new SignInResult(authenticationScheme, principal);
+
+        /// <summary>
+        /// Creates a <see cref="SignInResult"/> with the specified authentication scheme and
+        /// <paramref name="properties" />.
+        /// </summary>
+        /// <param name="principal">The <see cref="ClaimsPrincipal"/> containing the user claims.</param>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the sign-in operation.</param>
+        /// <param name="authenticationScheme">The authentication scheme to use for the sign-in operation.</param>
+        /// <returns>The created <see cref="SignInResult"/> for the response.</returns>
+        [NonAction]
+        public virtual SignInResult SignIn(
+            ClaimsPrincipal principal,
+            AuthenticationProperties properties,
+            string authenticationScheme)
+            => new SignInResult(authenticationScheme, principal, properties);
+
+        /// <summary>
+        /// Creates a <see cref="SignOutResult"/> with the specified authentication schemes.
+        /// </summary>
+        /// <param name="authenticationSchemes">The authentication schemes to use for the sign-out operation.</param>
+        /// <returns>The created <see cref="SignOutResult"/> for the response.</returns>
+        [NonAction]
+        public virtual SignOutResult SignOut(params string[] authenticationSchemes)
+            => new SignOutResult(authenticationSchemes);
+
+        /// <summary>
+        /// Creates a <see cref="SignOutResult"/> with the specified authentication schemes and
+        /// <paramref name="properties" />.
+        /// </summary>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the sign-out operation.</param>
+        /// <param name="authenticationSchemes">The authentication scheme to use for the sign-out operation.</param>
+        /// <returns>The created <see cref="SignOutResult"/> for the response.</returns>
+        [NonAction]
+        public virtual SignOutResult SignOut(AuthenticationProperties properties, params string[] authenticationSchemes)
+            => new SignOutResult(authenticationSchemes, properties);
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using values from the controller's current
+        /// <see cref="IValueProvider"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        [NonAction]
+        public virtual Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model)
+            where TModel : class
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            return TryUpdateModelAsync(model, prefix: string.Empty);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using values from the controller's current
+        /// <see cref="IValueProvider"/> and a <paramref name="prefix"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="prefix">The prefix to use when looking up values in the current <see cref="IValueProvider"/>.
+        /// </param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        [NonAction]
+        public virtual async Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model,
+            string prefix)
+            where TModel : class
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (prefix == null)
+            {
+                throw new ArgumentNullException(nameof(prefix));
+            }
+
+            var valueProvider = await CompositeValueProvider.CreateAsync(ControllerContext);
+            return await TryUpdateModelAsync(model, prefix, valueProvider);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using the <paramref name="valueProvider"/> and a
+        /// <paramref name="prefix"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>.
+        /// </param>
+        /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        [NonAction]
+        public virtual Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model,
+            string prefix,
+            IValueProvider valueProvider)
+            where TModel : class
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (prefix == null)
+            {
+                throw new ArgumentNullException(nameof(prefix));
+            }
+
+            if (valueProvider == null)
+            {
+                throw new ArgumentNullException(nameof(valueProvider));
+            }
+
+            return ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                prefix,
+                ControllerContext,
+                MetadataProvider,
+                ModelBinderFactory,
+                valueProvider,
+                ObjectValidator);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using values from the controller's current
+        /// <see cref="IValueProvider"/> and a <paramref name="prefix"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="prefix">The prefix to use when looking up values in the current <see cref="IValueProvider"/>.
+        /// </param>
+        /// <param name="includeExpressions"> <see cref="Expression"/>(s) which represent top-level properties
+        /// which need to be included for the current model.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        [NonAction]
+        public async Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model,
+            string prefix,
+            params Expression<Func<TModel, object>>[] includeExpressions)
+           where TModel : class
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (includeExpressions == null)
+            {
+                throw new ArgumentNullException(nameof(includeExpressions));
+            }
+
+            var valueProvider = await CompositeValueProvider.CreateAsync(ControllerContext);
+            return await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                prefix,
+                ControllerContext,
+                MetadataProvider,
+                ModelBinderFactory,
+                valueProvider,
+                ObjectValidator,
+                includeExpressions);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using values from the controller's current
+        /// <see cref="IValueProvider"/> and a <paramref name="prefix"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="prefix">The prefix to use when looking up values in the current <see cref="IValueProvider"/>.
+        /// </param>
+        /// <param name="propertyFilter">A predicate which can be used to filter properties at runtime.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        [NonAction]
+        public async Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model,
+            string prefix,
+            Func<ModelMetadata, bool> propertyFilter)
+            where TModel : class
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (propertyFilter == null)
+            {
+                throw new ArgumentNullException(nameof(propertyFilter));
+            }
+
+            var valueProvider = await CompositeValueProvider.CreateAsync(ControllerContext);
+            return await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                prefix,
+                ControllerContext,
+                MetadataProvider,
+                ModelBinderFactory,
+                valueProvider,
+                ObjectValidator,
+                propertyFilter);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using the <paramref name="valueProvider"/> and a
+        /// <paramref name="prefix"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>.
+        /// </param>
+        /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
+        /// <param name="includeExpressions"> <see cref="Expression"/>(s) which represent top-level properties
+        /// which need to be included for the current model.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        [NonAction]
+        public Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model,
+            string prefix,
+            IValueProvider valueProvider,
+            params Expression<Func<TModel, object>>[] includeExpressions)
+           where TModel : class
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (valueProvider == null)
+            {
+                throw new ArgumentNullException(nameof(valueProvider));
+            }
+
+            if (includeExpressions == null)
+            {
+                throw new ArgumentNullException(nameof(includeExpressions));
+            }
+
+            return ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                prefix,
+                ControllerContext,
+                MetadataProvider,
+                ModelBinderFactory,
+                valueProvider,
+                ObjectValidator,
+                includeExpressions);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using the <paramref name="valueProvider"/> and a
+        /// <paramref name="prefix"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>.
+        /// </param>
+        /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
+        /// <param name="propertyFilter">A predicate which can be used to filter properties at runtime.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        [NonAction]
+        public Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model,
+            string prefix,
+            IValueProvider valueProvider,
+            Func<ModelMetadata, bool> propertyFilter)
+            where TModel : class
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (valueProvider == null)
+            {
+                throw new ArgumentNullException(nameof(valueProvider));
+            }
+
+            if (propertyFilter == null)
+            {
+                throw new ArgumentNullException(nameof(propertyFilter));
+            }
+
+            return ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                prefix,
+                ControllerContext,
+                MetadataProvider,
+                ModelBinderFactory,
+                valueProvider,
+                ObjectValidator,
+                propertyFilter);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using values from the controller's current
+        /// <see cref="IValueProvider"/> and a <paramref name="prefix"/>.
+        /// </summary>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="modelType">The type of model instance to update.</param>
+        /// <param name="prefix">The prefix to use when looking up values in the current <see cref="IValueProvider"/>.
+        /// </param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        [NonAction]
+        public virtual async Task<bool> TryUpdateModelAsync(
+            object model,
+            Type modelType,
+            string prefix)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            var valueProvider = await CompositeValueProvider.CreateAsync(ControllerContext);
+            return await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                modelType,
+                prefix,
+                ControllerContext,
+                MetadataProvider,
+                ModelBinderFactory,
+                valueProvider,
+                ObjectValidator);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using the <paramref name="valueProvider"/> and a
+        /// <paramref name="prefix"/>.
+        /// </summary>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="modelType">The type of model instance to update.</param>
+        /// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>.
+        /// </param>
+        /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
+        /// <param name="propertyFilter">A predicate which can be used to filter properties at runtime.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        [NonAction]
+        public Task<bool> TryUpdateModelAsync(
+            object model,
+            Type modelType,
+            string prefix,
+            IValueProvider valueProvider,
+            Func<ModelMetadata, bool> propertyFilter)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            if (valueProvider == null)
+            {
+                throw new ArgumentNullException(nameof(valueProvider));
+            }
+
+            if (propertyFilter == null)
+            {
+                throw new ArgumentNullException(nameof(propertyFilter));
+            }
+
+            return ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                modelType,
+                prefix,
+                ControllerContext,
+                MetadataProvider,
+                ModelBinderFactory,
+                valueProvider,
+                ObjectValidator,
+                propertyFilter);
+        }
+
+        /// <summary>
+        /// Validates the specified <paramref name="model"/> instance.
+        /// </summary>
+        /// <param name="model">The model to validate.</param>
+        /// <returns><c>true</c> if the <see cref="ModelState"/> is valid; <c>false</c> otherwise.</returns>
+        [NonAction]
+        public virtual bool TryValidateModel(
+            object model)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            return TryValidateModel(model, prefix: null);
+        }
+
+        /// <summary>
+        /// Validates the specified <paramref name="model"/> instance.
+        /// </summary>
+        /// <param name="model">The model to validate.</param>
+        /// <param name="prefix">The key to use when looking up information in <see cref="ModelState"/>.
+        /// </param>
+        /// <returns><c>true</c> if the <see cref="ModelState"/> is valid;<c>false</c> otherwise.</returns>
+        [NonAction]
+        public virtual bool TryValidateModel(
+            object model,
+            string prefix)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            ObjectValidator.Validate(
+                ControllerContext,
+                validationState: null,
+                prefix: prefix ?? string.Empty,
+                model: model);
+            return ModelState.IsValid;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerContext.cs
new file mode 100644
index 0000000000..abb20bd102
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerContext.cs
@@ -0,0 +1,78 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// The context associated with the current request for a controller.
+    /// </summary>
+    public class ControllerContext : ActionContext
+    {
+        private IList<IValueProviderFactory> _valueProviderFactories;
+
+        /// <summary>
+        /// Creates a new <see cref="ControllerContext"/>.
+        /// </summary>
+        /// <remarks>
+        /// The default constructor is provided for unit test purposes only.
+        /// </remarks>
+        public ControllerContext()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="ControllerContext"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ActionContext"/> associated with the current request.</param>
+        public ControllerContext(ActionContext context)
+            : base(context)
+        {
+            if (!(context.ActionDescriptor is ControllerActionDescriptor))
+            {
+                throw new ArgumentException(Resources.FormatActionDescriptorMustBeBasedOnControllerAction(
+                    typeof(ControllerActionDescriptor)),
+                    nameof(context));
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ControllerActionDescriptor"/> associated with the current request.
+        /// </summary>
+        public new ControllerActionDescriptor ActionDescriptor
+        {
+            get { return (ControllerActionDescriptor)base.ActionDescriptor; }
+            set { base.ActionDescriptor = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the list of <see cref="IValueProviderFactory"/> instances for the current request.
+        /// </summary>
+        public virtual IList<IValueProviderFactory> ValueProviderFactories
+        {
+            get
+            {
+                if (_valueProviderFactories == null)
+                {
+                    _valueProviderFactories = new List<IValueProviderFactory>();
+                }
+
+                return _valueProviderFactories;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _valueProviderFactories = value;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerContextAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerContextAttribute.cs
new file mode 100644
index 0000000000..d2210420ba
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerContextAttribute.cs
@@ -0,0 +1,17 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Specifies that a controller property should be set with the current
+    /// <see cref="ControllerContext"/> when creating the controller. The property must have a public
+    /// set method.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
+    public class ControllerContextAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerActionDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerActionDescriptor.cs
new file mode 100644
index 0000000000..3cee82963a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerActionDescriptor.cs
@@ -0,0 +1,52 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.Controllers
+{
+    [DebuggerDisplay("{DisplayName}")]
+    public class ControllerActionDescriptor : ActionDescriptor
+    {
+        public string ControllerName { get; set; }
+
+        public virtual string ActionName { get; set; }
+
+        public MethodInfo MethodInfo { get; set; }
+
+        public TypeInfo ControllerTypeInfo { get; set; }
+
+        public override string DisplayName
+        {
+            get
+            {
+                if (base.DisplayName == null && ControllerTypeInfo != null && MethodInfo != null)
+                {
+                    base.DisplayName = string.Format(
+                        CultureInfo.InvariantCulture,
+                        "{0}.{1} ({2})",
+                        TypeNameHelper.GetTypeDisplayName(ControllerTypeInfo),
+                        MethodInfo.Name,
+                        ControllerTypeInfo.Assembly.GetName().Name);
+                }
+
+                return base.DisplayName;
+            }
+
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                base.DisplayName = value;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerActivatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerActivatorProvider.cs
new file mode 100644
index 0000000000..47375242c9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerActivatorProvider.cs
@@ -0,0 +1,90 @@
+// 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.
+
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.Controllers
+{
+    /// <summary>
+    /// Provides methods to create an MVC controller.
+    /// </summary>
+    public class ControllerActivatorProvider : IControllerActivatorProvider
+    {
+        private static readonly Action<ControllerContext, object> _dispose = Dispose;
+        private readonly Func<ControllerContext, object> _controllerActivatorCreate;
+        private readonly Action<ControllerContext, object> _controllerActivatorRelease;
+
+        public ControllerActivatorProvider(IControllerActivator controllerActivator)
+        {
+            if (controllerActivator == null)
+            {
+                throw new ArgumentNullException(nameof(controllerActivator));
+            }
+
+            // Compat: Delegate to controllerActivator if it's not the default implementation.
+            if (controllerActivator.GetType() != typeof(DefaultControllerActivator))
+            {
+                _controllerActivatorCreate = controllerActivator.Create;
+                _controllerActivatorRelease = controllerActivator.Release;
+            }
+        }
+
+        public Func<ControllerContext, object> CreateActivator(ControllerActionDescriptor descriptor)
+        {
+            if (descriptor == null)
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+
+            var controllerType = descriptor.ControllerTypeInfo?.AsType();
+            if (controllerType == null)
+            {
+                throw new ArgumentException(Resources.FormatPropertyOfTypeCannotBeNull(
+                    nameof(descriptor.ControllerTypeInfo),
+                    nameof(descriptor)),
+                    nameof(descriptor));
+            }
+
+            if (_controllerActivatorCreate != null)
+            {
+                return _controllerActivatorCreate;
+            }
+
+            var typeActivator = ActivatorUtilities.CreateFactory(controllerType, Type.EmptyTypes);
+            return controllerContext => typeActivator(controllerContext.HttpContext.RequestServices, arguments: null);
+        }
+
+        public Action<ControllerContext, object> CreateReleaser(ControllerActionDescriptor descriptor)
+        {
+            if (descriptor == null)
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+
+            if (_controllerActivatorRelease != null)
+            {
+                return _controllerActivatorRelease;
+            }
+
+            if (typeof(IDisposable).GetTypeInfo().IsAssignableFrom(descriptor.ControllerTypeInfo))
+            {
+                return _dispose;
+            }
+
+            return null;
+        }
+
+        private static void Dispose(ControllerContext context, object controller)
+        {
+            if (controller == null)
+            {
+                throw new ArgumentNullException(nameof(controller));
+            }
+
+            ((IDisposable)controller).Dispose();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerBoundPropertyDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerBoundPropertyDescriptor.cs
new file mode 100644
index 0000000000..f150169fd3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerBoundPropertyDescriptor.cs
@@ -0,0 +1,20 @@
+// 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.
+
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.Controllers
+{
+    /// <summary>
+    /// A descriptor for model bound properties of a controller.
+    /// </summary>
+    public class ControllerBoundPropertyDescriptor : ParameterDescriptor, IPropertyInfoParameterDescriptor
+    {
+        /// <summary>
+        /// Gets or sets the <see cref="System.Reflection.PropertyInfo"/> for this property.
+        /// </summary>
+        public PropertyInfo PropertyInfo { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFactoryProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFactoryProvider.cs
new file mode 100644
index 0000000000..e11ad85096
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFactoryProvider.cs
@@ -0,0 +1,120 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.Controllers
+{
+    public class ControllerFactoryProvider : IControllerFactoryProvider
+    {
+        private readonly IControllerActivatorProvider _activatorProvider;
+        private readonly Func<ControllerContext, object> _factoryCreateController;
+        private readonly Action<ControllerContext, object> _factoryReleaseController;
+        private readonly IControllerPropertyActivator[] _propertyActivators;
+
+        public ControllerFactoryProvider(
+            IControllerActivatorProvider activatorProvider,
+            IControllerFactory controllerFactory,
+            IEnumerable<IControllerPropertyActivator> propertyActivators)
+        {
+            if (activatorProvider == null)
+            {
+                throw new ArgumentNullException(nameof(activatorProvider));
+            }
+
+            if (controllerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(controllerFactory));
+            }
+
+            _activatorProvider = activatorProvider;
+
+            // Compat: Delegate to the IControllerFactory if it's not the default implementation.
+            if (controllerFactory.GetType() != typeof(DefaultControllerFactory))
+            {
+                _factoryCreateController = controllerFactory.CreateController;
+                _factoryReleaseController = controllerFactory.ReleaseController;
+            }
+
+            _propertyActivators = propertyActivators.ToArray();
+        }
+
+        public Func<ControllerContext, object> CreateControllerFactory(ControllerActionDescriptor descriptor)
+        {
+            if (descriptor == null)
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+
+            var controllerType = descriptor.ControllerTypeInfo?.AsType();
+            if (controllerType == null)
+            {
+                throw new ArgumentException(Resources.FormatPropertyOfTypeCannotBeNull(
+                    nameof(descriptor.ControllerTypeInfo),
+                    nameof(descriptor)),
+                    nameof(descriptor));
+            }
+
+            if (_factoryCreateController != null)
+            {
+                return _factoryCreateController;
+            }
+
+            var controllerActivator = _activatorProvider.CreateActivator(descriptor);
+            var propertyActivators = GetPropertiesToActivate(descriptor);
+            object CreateController(ControllerContext controllerContext)
+            {
+                var controller = controllerActivator(controllerContext);
+                for (var i = 0; i < propertyActivators.Length; i++)
+                {
+                    var propertyActivator = propertyActivators[i];
+                    propertyActivator(controllerContext, controller);
+                }
+
+                return controller;
+            }
+
+            return CreateController;
+        }
+
+        public Action<ControllerContext, object> CreateControllerReleaser(ControllerActionDescriptor descriptor)
+        {
+            if (descriptor == null)
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+
+            var controllerType = descriptor.ControllerTypeInfo?.AsType();
+            if (controllerType == null)
+            {
+                throw new ArgumentException(Resources.FormatPropertyOfTypeCannotBeNull(
+                    nameof(descriptor.ControllerTypeInfo),
+                    nameof(descriptor)),
+                    nameof(descriptor));
+            }
+
+            if (_factoryReleaseController != null)
+            {
+                return _factoryReleaseController;
+            }
+
+            return _activatorProvider.CreateReleaser(descriptor);
+        }
+
+        private Action<ControllerContext, object>[] GetPropertiesToActivate(ControllerActionDescriptor actionDescriptor)
+        {
+            var propertyActivators = new Action<ControllerContext, object>[_propertyActivators.Length];
+            for (var i = 0; i < _propertyActivators.Length; i++)
+            {
+                var activatorProvider = _propertyActivators[i];
+                propertyActivators[i] = activatorProvider.GetActivatorDelegate(actionDescriptor);
+            }
+
+            return propertyActivators;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFeature.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFeature.cs
new file mode 100644
index 0000000000..e3c8eaafc5
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFeature.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.Controllers
+{
+    /// <summary>
+    /// The list of controllers types in an MVC application. The <see cref="ControllerFeature"/> can be populated
+    /// using the <see cref="ApplicationPartManager"/> that is available during startup at <see cref="IMvcBuilder.PartManager"/>
+    /// and <see cref="IMvcCoreBuilder.PartManager"/> or at a later stage by requiring the <see cref="ApplicationPartManager"/>
+    /// as a dependency in a component.
+    /// </summary>
+    public class ControllerFeature
+    {
+        /// <summary>
+        /// Gets the list of controller types in an MVC application.
+        /// </summary>
+        public IList<TypeInfo> Controllers { get; } = new List<TypeInfo>();
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFeatureProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFeatureProvider.cs
new file mode 100644
index 0000000000..6b5a3616d2
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFeatureProvider.cs
@@ -0,0 +1,79 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+
+namespace Microsoft.AspNetCore.Mvc.Controllers
+{
+    /// <summary>
+    /// Discovers controllers from a list of <see cref="ApplicationPart"/> instances.
+    /// </summary>
+    public class ControllerFeatureProvider : IApplicationFeatureProvider<ControllerFeature>
+    {
+        private const string ControllerTypeNameSuffix = "Controller";
+
+        /// <inheritdoc />
+        public void PopulateFeature(
+            IEnumerable<ApplicationPart> parts,
+            ControllerFeature feature)
+        {
+            foreach (var part in parts.OfType<IApplicationPartTypeProvider>())
+            {
+                foreach (var type in part.Types)
+                {
+                    if (IsController(type) && !feature.Controllers.Contains(type))
+                    {
+                        feature.Controllers.Add(type);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Determines if a given <paramref name="typeInfo"/> is a controller.
+        /// </summary>
+        /// <param name="typeInfo">The <see cref="TypeInfo"/> candidate.</param>
+        /// <returns><code>true</code> if the type is a controller; otherwise <code>false</code>.</returns>
+        protected virtual bool IsController(TypeInfo typeInfo)
+        {
+            if (!typeInfo.IsClass)
+            {
+                return false;
+            }
+
+            if (typeInfo.IsAbstract)
+            {
+                return false;
+            }
+
+            // We only consider public top-level classes as controllers. IsPublic returns false for nested
+            // classes, regardless of visibility modifiers
+            if (!typeInfo.IsPublic)
+            {
+                return false;
+            }
+
+            if (typeInfo.ContainsGenericParameters)
+            {
+                return false;
+            }
+
+            if (typeInfo.IsDefined(typeof(NonControllerAttribute)))
+            {
+                return false;
+            }
+
+            if (!typeInfo.Name.EndsWith(ControllerTypeNameSuffix, StringComparison.OrdinalIgnoreCase) &&
+                !typeInfo.IsDefined(typeof(ControllerAttribute)))
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerParameterDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerParameterDescriptor.cs
new file mode 100644
index 0000000000..e52cf741fb
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerParameterDescriptor.cs
@@ -0,0 +1,20 @@
+// 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.
+
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.Controllers
+{
+    /// <summary>
+    /// A descriptor for method parameters of an action method.
+    /// </summary>
+    public class ControllerParameterDescriptor : ParameterDescriptor, IParameterInfoParameterDescriptor
+    {
+        /// <summary>
+        /// Gets or sets the <see cref="System.Reflection.ParameterInfo"/>.
+        /// </summary>
+        public ParameterInfo ParameterInfo { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerActivator.cs
new file mode 100644
index 0000000000..8d53e715e3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerActivator.cs
@@ -0,0 +1,79 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.Controllers
+{
+    /// <summary>
+    /// <see cref="IControllerActivator"/> that uses type activation to create controllers.
+    /// </summary>
+    public class DefaultControllerActivator : IControllerActivator
+    {
+        private readonly ITypeActivatorCache _typeActivatorCache;
+
+        /// <summary>
+        /// Creates a new <see cref="DefaultControllerActivator"/>.
+        /// </summary>
+        /// <param name="typeActivatorCache">The <see cref="ITypeActivatorCache"/>.</param>
+        public DefaultControllerActivator(ITypeActivatorCache typeActivatorCache)
+        {
+            if (typeActivatorCache == null)
+            {
+                throw new ArgumentNullException(nameof(typeActivatorCache));
+            }
+
+            _typeActivatorCache = typeActivatorCache;
+        }
+
+        /// <inheritdoc />
+        public virtual object Create(ControllerContext controllerContext)
+        {
+            if (controllerContext == null)
+            {
+                throw new ArgumentNullException(nameof(controllerContext));
+            }
+
+            if (controllerContext.ActionDescriptor == null)
+            {
+                throw new ArgumentException(Resources.FormatPropertyOfTypeCannotBeNull(
+                    nameof(ControllerContext.ActionDescriptor),
+                    nameof(ControllerContext)));
+            }
+
+            var controllerTypeInfo = controllerContext.ActionDescriptor.ControllerTypeInfo;
+
+            if (controllerTypeInfo == null)
+            {
+                throw new ArgumentException(Resources.FormatPropertyOfTypeCannotBeNull(
+                    nameof(controllerContext.ActionDescriptor.ControllerTypeInfo),
+                    nameof(ControllerContext.ActionDescriptor)));
+            }
+
+            var serviceProvider = controllerContext.HttpContext.RequestServices;
+            return _typeActivatorCache.CreateInstance<object>(serviceProvider, controllerTypeInfo.AsType());
+        }
+
+        /// <inheritdoc />
+        public virtual void Release(ControllerContext context, object controller)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (controller == null)
+            {
+                throw new ArgumentNullException(nameof(controller));
+            }
+
+            var disposable = controller as IDisposable;
+            if (disposable != null)
+            {
+                disposable.Dispose();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerFactory.cs
new file mode 100644
index 0000000000..3a2627d1ec
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerFactory.cs
@@ -0,0 +1,93 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.Controllers
+{
+    /// <summary>
+    /// Default implementation for <see cref="IControllerFactory"/>.
+    /// </summary>
+    public class DefaultControllerFactory : IControllerFactory
+    {
+        private readonly IControllerActivator _controllerActivator;
+        private readonly IControllerPropertyActivator[] _propertyActivators;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="DefaultControllerFactory"/>.
+        /// </summary>
+        /// <param name="controllerActivator">
+        /// <see cref="IControllerActivator"/> used to create controller instances.
+        /// </param>
+        /// <param name="propertyActivators">
+        /// A set of <see cref="IControllerPropertyActivator"/> instances used to initialize controller
+        /// properties.
+        /// </param>
+        public DefaultControllerFactory(
+            IControllerActivator controllerActivator,
+            IEnumerable<IControllerPropertyActivator> propertyActivators)
+        {
+            if (controllerActivator == null)
+            {
+                throw new ArgumentNullException(nameof(controllerActivator));
+            }
+
+            if (propertyActivators == null)
+            {
+                throw new ArgumentNullException(nameof(propertyActivators));
+            }
+
+            _controllerActivator = controllerActivator;
+            _propertyActivators = propertyActivators.ToArray();
+        }
+
+        /// <summary>
+        /// The <see cref="IControllerActivator"/> used to create a controller.
+        /// </summary>
+        protected IControllerActivator ControllerActivator => _controllerActivator;
+
+        /// <inheritdoc />
+        public virtual object CreateController(ControllerContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (context.ActionDescriptor == null)
+            {
+                throw new ArgumentException(Resources.FormatPropertyOfTypeCannotBeNull(
+                    nameof(ControllerContext.ActionDescriptor),
+                    nameof(ControllerContext)));
+            }
+
+            var controller = _controllerActivator.Create(context);
+            foreach (var propertyActivator in _propertyActivators)
+            {
+                propertyActivator.Activate(context, controller);
+            }
+
+            return controller;
+        }
+
+        /// <inheritdoc />
+        public virtual void ReleaseController(ControllerContext context, object controller)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (controller == null)
+            {
+                throw new ArgumentNullException(nameof(controller));
+            }
+
+            _controllerActivator.Release(context, controller);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerActivator.cs
new file mode 100644
index 0000000000..87a4926be6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerActivator.cs
@@ -0,0 +1,24 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Controllers
+{
+    /// <summary>
+    /// Provides methods to create a controller.
+    /// </summary>
+    public interface IControllerActivator
+    {
+        /// <summary>
+        /// Creates a controller.
+        /// </summary>
+        /// <param name="context">The <see cref="ControllerContext"/> for the executing action.</param>
+        object Create(ControllerContext context);
+
+        /// <summary>
+        /// Releases a controller.
+        /// </summary>
+        /// <param name="context">The <see cref="ControllerContext"/> for the executing action.</param>
+        /// <param name="controller">The controller to release.</param>
+        void Release(ControllerContext context, object controller);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerActivatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerActivatorProvider.cs
new file mode 100644
index 0000000000..0ff5d2b134
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerActivatorProvider.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Controllers
+{
+    /// <summary>
+    /// Provides methods to create a MVC controller.
+    /// </summary>
+    public interface IControllerActivatorProvider
+    {
+        /// <summary>
+        /// Creates a <see cref="Func{T, TResult}"/> that creates a controller.
+        /// </summary>
+        /// <param name="descriptor">The <see cref="ControllerActionDescriptor"/>.</param>
+        /// <returns>The delegate used to activate the controller.</returns>
+        Func<ControllerContext, object> CreateActivator(ControllerActionDescriptor descriptor);
+
+        /// <summary>
+        /// Creates an <see cref="Action"/> that releases a controller.
+        /// </summary>
+        /// <param name="descriptor">The <see cref="ControllerActionDescriptor"/>.</param>
+        /// <returns>The delegate used to dispose the activated controller.</returns>
+        Action<ControllerContext, object> CreateReleaser(ControllerActionDescriptor descriptor);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerFactory.cs
new file mode 100644
index 0000000000..ae66e446a7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerFactory.cs
@@ -0,0 +1,25 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Controllers
+{
+    /// <summary>
+    /// Provides methods for creation and disposal of controllers.
+    /// </summary>
+    public interface IControllerFactory
+    {
+        /// <summary>
+        /// Creates a new controller for the specified <paramref name="context"/>.
+        /// </summary>
+        /// <param name="context"><see cref="ControllerContext"/> for the action to execute.</param>
+        /// <returns>The controller.</returns>
+        object CreateController(ControllerContext context);
+
+        /// <summary>
+        /// Releases a controller instance.
+        /// </summary>
+        /// <param name="context"><see cref="ControllerContext"/> for the executing action.</param>
+        /// <param name="controller">The controller.</param>
+        void ReleaseController(ControllerContext context, object controller);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerFactoryProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerFactoryProvider.cs
new file mode 100644
index 0000000000..4483047d56
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerFactoryProvider.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Controllers
+{
+    /// <summary>
+    /// Provides methods to create and release a controller.
+    /// </summary>
+    public interface IControllerFactoryProvider
+    {
+        /// <summary>
+        /// Creates a factory for producing controllers for the specified <paramref name="descriptor"/>.
+        /// </summary>
+        /// <param name="descriptor">The <see cref="ControllerActionDescriptor"/>.</param>
+        /// <returns>The controller factory.</returns>
+        Func<ControllerContext, object> CreateControllerFactory(ControllerActionDescriptor descriptor);
+
+        /// <summary>
+        /// Releases a controller.
+        /// </summary>
+        /// <param name="descriptor">The <see cref="ControllerActionDescriptor"/>.</param>
+        /// <returns>The delegate used to release the created controller.</returns>
+        Action<ControllerContext, object> CreateControllerReleaser(ControllerActionDescriptor descriptor);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ServiceBasedControllerActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ServiceBasedControllerActivator.cs
new file mode 100644
index 0000000000..663a31daa0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ServiceBasedControllerActivator.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using System;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.Controllers
+{
+    /// <summary>
+    /// A <see cref="IControllerActivator"/> that retrieves controllers as services from the request's
+    /// <see cref="IServiceProvider"/>.
+    /// </summary>
+    public class ServiceBasedControllerActivator : IControllerActivator
+    {
+        /// <inheritdoc />
+        public object Create(ControllerContext actionContext)
+        {
+            if (actionContext == null)
+            {
+                throw new ArgumentNullException(nameof(actionContext));
+            }
+
+            var controllerType = actionContext.ActionDescriptor.ControllerTypeInfo.AsType();
+
+            return actionContext.HttpContext.RequestServices.GetRequiredService(controllerType);
+        }
+
+        /// <inheritdoc />
+        public virtual void Release(ControllerContext context, object controller)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CreatedAtActionResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CreatedAtActionResult.cs
new file mode 100644
index 0000000000..6ed312a374
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CreatedAtActionResult.cs
@@ -0,0 +1,94 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="ActionResult"/> that returns a Created (201) response with a Location header.
+    /// </summary>
+    public class CreatedAtActionResult : ObjectResult
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CreatedAtActionResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="actionName">The name of the action to use for generating the URL.</param>
+        /// <param name="controllerName">The name of the controller to use for generating the URL.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="value">The value to format in the entity body.</param>
+        public CreatedAtActionResult(
+            string actionName,
+            string controllerName,
+            object routeValues,
+            object value)
+            : base(value)
+        {
+            ActionName = actionName;
+            ControllerName = controllerName;
+            RouteValues = routeValues == null ? null : new RouteValueDictionary(routeValues);
+            StatusCode = StatusCodes.Status201Created;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IUrlHelper" /> used to generate URLs.
+        /// </summary>
+        public IUrlHelper UrlHelper { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the action to use for generating the URL.
+        /// </summary>
+        public string ActionName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the controller to use for generating the URL.
+        /// </summary>
+        public string ControllerName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the route data to use for generating the URL.
+        /// </summary>
+        public RouteValueDictionary RouteValues { get; set; }
+
+        /// <inheritdoc />
+        public override void OnFormatting(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            base.OnFormatting(context);
+
+            var request = context.HttpContext.Request;
+
+            var urlHelper = UrlHelper;
+            if (urlHelper == null)
+            {
+                var services = context.HttpContext.RequestServices;
+                urlHelper = services.GetRequiredService<IUrlHelperFactory>().GetUrlHelper(context);
+            }
+
+            var url = urlHelper.Action(
+                ActionName,
+                ControllerName,
+                RouteValues,
+                request.Scheme,
+                request.Host.ToUriComponent());
+
+            if (string.IsNullOrEmpty(url))
+            {
+                throw new InvalidOperationException(Resources.NoRoutesMatched);
+            }
+
+            context.HttpContext.Response.Headers[HeaderNames.Location] = url;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CreatedAtRouteResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CreatedAtRouteResult.cs
new file mode 100644
index 0000000000..6e26789563
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CreatedAtRouteResult.cs
@@ -0,0 +1,90 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="ActionResult"/> that returns a Created (201) response with a Location header.
+    /// </summary>
+    public class CreatedAtRouteResult : ObjectResult
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CreatedAtRouteResult"/> class with the values
+        /// provided.
+        /// </summary>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="value">The value to format in the entity body.</param>
+        public CreatedAtRouteResult(object routeValues, object value)
+            : this(routeName: null, routeValues: routeValues, value: value)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CreatedAtRouteResult"/> class with the values
+        /// provided.
+        /// </summary>
+        /// <param name="routeName">The name of the route to use for generating the URL.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="value">The value to format in the entity body.</param>
+        public CreatedAtRouteResult(
+            string routeName,
+            object routeValues,
+            object value)
+            : base(value)
+        {
+            RouteName = routeName;
+            RouteValues = routeValues == null ? null : new RouteValueDictionary(routeValues);
+            StatusCode = StatusCodes.Status201Created;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IUrlHelper" /> used to generate URLs.
+        /// </summary>
+        public IUrlHelper UrlHelper { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the route to use for generating the URL.
+        /// </summary>
+        public string RouteName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the route data to use for generating the URL.
+        /// </summary>
+        public RouteValueDictionary RouteValues { get; set; }
+
+        /// <inheritdoc />
+        public override void OnFormatting(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            base.OnFormatting(context);
+
+            var urlHelper = UrlHelper;
+            if (urlHelper == null)
+            {
+                var services = context.HttpContext.RequestServices;
+                urlHelper = services.GetRequiredService<IUrlHelperFactory>().GetUrlHelper(context);
+            }
+
+            var url = urlHelper.Link(RouteName, RouteValues);
+
+            if (string.IsNullOrEmpty(url))
+            {
+                throw new InvalidOperationException(Resources.NoRoutesMatched);
+            }
+
+            context.HttpContext.Response.Headers[HeaderNames.Location] = url;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CreatedResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CreatedResult.cs
new file mode 100644
index 0000000000..5e1d23a628
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CreatedResult.cs
@@ -0,0 +1,91 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="ActionResult"/> that returns a Created (201) response with a Location header.
+    /// </summary>
+    public class CreatedResult : ObjectResult
+    {
+        private string _location;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CreatedResult"/> class with the values
+        /// provided.
+        /// </summary>
+        /// <param name="location">The location at which the content has been created.</param>
+        /// <param name="value">The value to format in the entity body.</param>
+        public CreatedResult(string location, object value)
+            : base(value)
+        {
+            if (location == null)
+            {
+                throw new ArgumentNullException(nameof(location));
+            }
+
+            Location = location;
+            StatusCode = StatusCodes.Status201Created;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CreatedResult"/> class with the values
+        /// provided.
+        /// </summary>
+        /// <param name="location">The location at which the content has been created.</param>
+        /// <param name="value">The value to format in the entity body.</param>
+        public CreatedResult(Uri location, object value)
+            : base(value)
+        {
+            if (location == null)
+            {
+                throw new ArgumentNullException(nameof(location));
+            }
+
+            if (location.IsAbsoluteUri)
+            {
+                Location = location.AbsoluteUri;
+            }
+            else
+            {
+                Location = location.GetComponents(UriComponents.SerializationInfoString, UriFormat.UriEscaped);
+            }
+
+            StatusCode = StatusCodes.Status201Created;
+        }
+
+        /// <summary>
+        /// Gets or sets the location at which the content has been created.
+        /// </summary>
+        public string Location
+        {
+            get => _location;
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _location = value;
+            }
+        }
+
+        /// <inheritdoc />
+        public override void OnFormatting(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            base.OnFormatting(context);
+
+            context.HttpContext.Response.Headers[HeaderNames.Location] = Location;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/ApplicationModelConventionExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/ApplicationModelConventionExtensions.cs
new file mode 100644
index 0000000000..15f25d474c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/ApplicationModelConventionExtensions.cs
@@ -0,0 +1,286 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    /// <summary>
+    /// Contains the extension methods for <see cref="AspNetCore.Mvc.MvcOptions.Conventions"/>.
+    /// </summary>
+    public static class ApplicationModelConventionExtensions
+    {
+        /// <summary>
+        /// Removes all application model conventions of the specified type.
+        /// </summary>
+        /// <param name="list">The list of <see cref="IApplicationModelConvention"/>s.</param>
+        /// <typeparam name="TApplicationModelConvention">The type to remove.</typeparam>
+        public static void RemoveType<TApplicationModelConvention>(this IList<IApplicationModelConvention> list)
+            where TApplicationModelConvention : IApplicationModelConvention
+        {
+            if (list == null)
+            {
+                throw new ArgumentNullException(nameof(list));
+            }
+
+            RemoveType(list, typeof(TApplicationModelConvention));
+        }
+
+        /// <summary>
+        /// Removes all application model conventions of the specified type.
+        /// </summary>
+        /// <param name="list">The list of <see cref="IApplicationModelConvention"/>s.</param>
+        /// <param name="type">The type to remove.</param>
+        public static void RemoveType(this IList<IApplicationModelConvention> list, Type type)
+        {
+            if (list == null)
+            {
+                throw new ArgumentNullException(nameof(list));
+            }
+
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            for (var i = list.Count - 1; i >= 0; i--)
+            {
+                var applicationModelConvention = list[i];
+                if (applicationModelConvention.GetType() == type)
+                {
+                    list.RemoveAt(i);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Adds a <see cref="IControllerModelConvention"/> to all the controllers in the application.
+        /// </summary>
+        /// <param name="conventions">The list of <see cref="IApplicationModelConvention"/>
+        /// in <see cref="AspNetCore.Mvc.MvcOptions"/>.</param>
+        /// <param name="controllerModelConvention">The <see cref="IControllerModelConvention"/> which needs to be
+        /// added.</param>
+        public static void Add(
+            this IList<IApplicationModelConvention> conventions,
+            IControllerModelConvention controllerModelConvention)
+        {
+            if (conventions == null)
+            {
+                throw new ArgumentNullException(nameof(conventions));
+            }
+
+            if (controllerModelConvention == null)
+            {
+                throw new ArgumentNullException(nameof(controllerModelConvention));
+            }
+
+            conventions.Add(new ControllerApplicationModelConvention(controllerModelConvention));
+        }
+
+        /// <summary>
+        /// Adds a <see cref="IActionModelConvention"/> to all the actions in the application.
+        /// </summary>
+        /// <param name="conventions">The list of <see cref="IApplicationModelConvention"/>
+        /// in <see cref="AspNetCore.Mvc.MvcOptions"/>.</param>
+        /// <param name="actionModelConvention">The <see cref="IActionModelConvention"/> which needs to be
+        /// added.</param>
+        public static void Add(
+            this IList<IApplicationModelConvention> conventions,
+            IActionModelConvention actionModelConvention)
+        {
+            if (conventions == null)
+            {
+                throw new ArgumentNullException(nameof(conventions));
+            }
+
+            if (actionModelConvention == null)
+            {
+                throw new ArgumentNullException(nameof(actionModelConvention));
+            }
+
+            conventions.Add(new ActionApplicationModelConvention(actionModelConvention));
+        }
+
+        /// <summary>
+        /// Adds a <see cref="IParameterModelConvention"/> to all the parameters in the application.
+        /// </summary>
+        /// <param name="conventions">The list of <see cref="IApplicationModelConvention"/>
+        /// in <see cref="AspNetCore.Mvc.MvcOptions"/>.</param>
+        /// <param name="parameterModelConvention">The <see cref="IParameterModelConvention"/> which needs to be
+        /// added.</param>
+        public static void Add(
+            this IList<IApplicationModelConvention> conventions,
+            IParameterModelConvention parameterModelConvention)
+        {
+            if (conventions == null)
+            {
+                throw new ArgumentNullException(nameof(conventions));
+            }
+
+            if (parameterModelConvention == null)
+            {
+                throw new ArgumentNullException(nameof(parameterModelConvention));
+            }
+
+            conventions.Add(new ParameterApplicationModelConvention(parameterModelConvention));
+        }
+
+        /// <summary>
+        /// Adds a <see cref="IParameterModelBaseConvention"/> to all properties and parameters in the application.
+        /// </summary>
+        /// <param name="conventions">The list of <see cref="IApplicationModelConvention"/>
+        /// in <see cref="AspNetCore.Mvc.MvcOptions"/>.</param>
+        /// <param name="parameterModelConvention">The <see cref="IParameterModelBaseConvention"/> which needs to be
+        /// added.</param>
+        public static void Add(
+            this IList<IApplicationModelConvention> conventions,
+            IParameterModelBaseConvention parameterModelConvention)
+        {
+            if (conventions == null)
+            {
+                throw new ArgumentNullException(nameof(conventions));
+            }
+
+            if (parameterModelConvention == null)
+            {
+                throw new ArgumentNullException(nameof(parameterModelConvention));
+            }
+
+            conventions.Add(new ParameterBaseApplicationModelConvention(parameterModelConvention));
+        }
+
+        private class ParameterApplicationModelConvention : IApplicationModelConvention
+        {
+            private readonly IParameterModelConvention _parameterModelConvention;
+
+            public ParameterApplicationModelConvention(IParameterModelConvention parameterModelConvention)
+            {
+                _parameterModelConvention = parameterModelConvention;
+            }
+
+            /// <inheritdoc />
+            public void Apply(ApplicationModel application)
+            {
+                if (application == null)
+                {
+                    throw new ArgumentNullException(nameof(application));
+                }
+
+                // Create copies of collections of controllers, actions and parameters as users could modify
+                // these collections from within the convention itself.
+                var controllers = application.Controllers.ToArray();
+                foreach (var controller in controllers)
+                {
+                    var actions = controller.Actions.ToArray();
+                    foreach (var action in actions)
+                    {
+                        var parameters = action.Parameters.ToArray();
+                        foreach (var parameter in parameters)
+                        {
+                            _parameterModelConvention.Apply(parameter);
+                        }
+                    }
+                }
+            }
+        }
+
+        private class ParameterBaseApplicationModelConvention :
+            IApplicationModelConvention, IParameterModelBaseConvention
+        {
+            private readonly IParameterModelBaseConvention _parameterBaseModelConvention;
+
+            public ParameterBaseApplicationModelConvention(IParameterModelBaseConvention parameterModelBaseConvention)
+            {
+                _parameterBaseModelConvention = parameterModelBaseConvention;
+            }
+
+            /// <inheritdoc />
+            public void Apply(ApplicationModel application)
+            {
+                if (application == null)
+                {
+                    throw new ArgumentNullException(nameof(application));
+                }
+            }
+
+            void IParameterModelBaseConvention.Apply(ParameterModelBase parameterModel)
+            {
+                if (parameterModel == null)
+                {
+                    throw new ArgumentNullException(nameof(parameterModel));
+                }
+
+                _parameterBaseModelConvention.Apply(parameterModel);
+            }
+        }
+
+        private class ActionApplicationModelConvention : IApplicationModelConvention
+        {
+            private readonly IActionModelConvention _actionModelConvention;
+
+            public ActionApplicationModelConvention(IActionModelConvention actionModelConvention)
+            {
+                if (actionModelConvention == null)
+                {
+                    throw new ArgumentNullException(nameof(actionModelConvention));
+                }
+
+                _actionModelConvention = actionModelConvention;
+            }
+
+            /// <inheritdoc />
+            public void Apply(ApplicationModel application)
+            {
+                if (application == null)
+                {
+                    throw new ArgumentNullException(nameof(application));
+                }
+
+                // Create copies of collections of controllers, actions and parameters as users could modify
+                // these collections from within the convention itself.
+                var controllers = application.Controllers.ToArray();
+                foreach (var controller in controllers)
+                {
+                    var actions = controller.Actions.ToArray();
+                    foreach (var action in actions)
+                    {
+                        _actionModelConvention.Apply(action);
+                    }
+                }
+            }
+        }
+
+        private class ControllerApplicationModelConvention : IApplicationModelConvention
+        {
+            private readonly IControllerModelConvention _controllerModelConvention;
+
+            public ControllerApplicationModelConvention(IControllerModelConvention controllerConvention)
+            {
+                if (controllerConvention == null)
+                {
+                    throw new ArgumentNullException(nameof(controllerConvention));
+                }
+
+                _controllerModelConvention = controllerConvention;
+            }
+
+            /// <inheritdoc />
+            public void Apply(ApplicationModel application)
+            {
+                if (application == null)
+                {
+                    throw new ArgumentNullException(nameof(application));
+                }
+
+                var controllers = application.Controllers.ToArray();
+                foreach (var controller in controllers)
+                {
+                    _controllerModelConvention.Apply(controller);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/IMvcBuilder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/IMvcBuilder.cs
new file mode 100644
index 0000000000..c1419690a4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/IMvcBuilder.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    /// <summary>
+    /// An interface for configuring MVC services.
+    /// </summary>
+    public interface IMvcBuilder
+    {
+        /// <summary>
+        /// Gets the <see cref="IServiceCollection"/> where MVC services are configured.
+        /// </summary>
+        IServiceCollection Services { get; }
+
+        /// <summary>
+        /// Gets the <see cref="ApplicationPartManager"/> where <see cref="ApplicationPart"/>s
+        /// are configured.
+        /// </summary>
+        ApplicationPartManager PartManager { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/IMvcCoreBuilder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/IMvcCoreBuilder.cs
new file mode 100644
index 0000000000..9263ebb514
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/IMvcCoreBuilder.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    /// <summary>
+    /// An interface for configuring essential MVC services.
+    /// </summary>
+    public interface IMvcCoreBuilder
+    {
+        /// <summary>
+        /// Gets the <see cref="IServiceCollection"/> where essential MVC services are configured.
+        /// </summary>
+        IServiceCollection Services { get; }
+
+        /// <summary>
+        /// Gets the <see cref="ApplicationPartManager"/> where <see cref="ApplicationPart"/>s
+        /// are configured.
+        /// </summary>
+        ApplicationPartManager PartManager { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcBuilderExtensions.cs
new file mode 100644
index 0000000000..6e1f9f9a1b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcBuilderExtensions.cs
@@ -0,0 +1,155 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    /// <summary>
+    /// Extensions for configuring MVC using an <see cref="IMvcBuilder"/>.
+    /// </summary>
+    public static class MvcCoreMvcBuilderExtensions
+    {
+        /// <summary>
+        /// Registers an action to configure <see cref="MvcOptions"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="setupAction">An <see cref="Action{MvcOptions}"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder AddMvcOptions(
+            this IMvcBuilder builder,
+            Action<MvcOptions> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (setupAction == null)
+            {
+                throw new ArgumentNullException(nameof(setupAction));
+            }
+
+            builder.Services.Configure(setupAction);
+            return builder;
+        }
+
+        public static IMvcBuilder AddFormatterMappings(
+            this IMvcBuilder builder,
+            Action<FormatterMappings> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (setupAction == null)
+            {
+                throw new ArgumentNullException(nameof(setupAction));
+            }
+
+            builder.Services.Configure<MvcOptions>((options) => setupAction(options.FormatterMappings));
+            return builder;
+        }
+
+        /// <summary>
+        /// Adds an <see cref="ApplicationPart"/> to the list of <see cref="ApplicationPartManager.ApplicationParts"/> on the
+        /// <see cref="IMvcBuilder.PartManager"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="assembly">The <see cref="Assembly"/> of the <see cref="ApplicationPart"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder AddApplicationPart(this IMvcBuilder builder, Assembly assembly)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (assembly == null)
+            {
+                throw new ArgumentNullException(nameof(assembly));
+            }
+
+            builder.ConfigureApplicationPartManager(manager => manager.ApplicationParts.Add(new AssemblyPart(assembly)));
+
+            return builder;
+        }
+
+        /// <summary>
+        /// Configures the <see cref="ApplicationPartManager"/> of the <see cref="IMvcBuilder.PartManager"/> using
+        /// the given <see cref="Action{ApplicationPartManager}"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="setupAction">The <see cref="Action{ApplicationPartManager}"/></param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder ConfigureApplicationPartManager(
+            this IMvcBuilder builder,
+            Action<ApplicationPartManager> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (setupAction == null)
+            {
+                throw new ArgumentNullException(nameof(setupAction));
+            }
+
+            setupAction(builder.PartManager);
+
+            return builder;
+        }
+
+        /// <summary>
+        /// Registers discovered controllers as services in the <see cref="IServiceCollection"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder AddControllersAsServices(this IMvcBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            var feature = new ControllerFeature();
+            builder.PartManager.PopulateFeature(feature);
+
+            foreach (var controller in feature.Controllers.Select(c => c.AsType()))
+            {
+                builder.Services.TryAddTransient(controller, controller);
+            }
+
+            builder.Services.Replace(ServiceDescriptor.Transient<IControllerActivator, ServiceBasedControllerActivator>());
+
+            return builder;
+        }
+
+        /// <summary>
+        /// Sets the <see cref="CompatibilityVersion"/> for ASP.NET Core MVC for the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="version">The <see cref="CompatibilityVersion"/> value to configure.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder SetCompatibilityVersion(this IMvcBuilder builder, CompatibilityVersion version)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Services.Configure<MvcCompatibilityOptions>(o => o.CompatibilityVersion = version);
+            return builder;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcCoreBuilderExtensions.cs
new file mode 100644
index 0000000000..76ebe6c261
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcCoreBuilderExtensions.cs
@@ -0,0 +1,189 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public static class MvcCoreMvcCoreBuilderExtensions
+    {
+        /// <summary>
+        /// Registers an action to configure <see cref="MvcOptions"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <param name="setupAction">An <see cref="Action{MvcOptions}"/>.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        public static IMvcCoreBuilder AddMvcOptions(
+            this IMvcCoreBuilder builder,
+            Action<MvcOptions> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (setupAction == null)
+            {
+                throw new ArgumentNullException(nameof(setupAction));
+            }
+
+            builder.Services.Configure(setupAction);
+            return builder;
+        }
+
+        public static IMvcCoreBuilder AddFormatterMappings(this IMvcCoreBuilder builder)
+        {
+            AddFormatterMappingsServices(builder.Services);
+            return builder;
+        }
+
+        public static IMvcCoreBuilder AddFormatterMappings(
+            this IMvcCoreBuilder builder,
+            Action<FormatterMappings> setupAction)
+        {
+            AddFormatterMappingsServices(builder.Services);
+
+            if (setupAction != null)
+            {
+                builder.Services.Configure<MvcOptions>((options) => setupAction(options.FormatterMappings));
+            }
+
+            return builder;
+        }
+
+        // Internal for testing.
+        internal static void AddFormatterMappingsServices(IServiceCollection services)
+        {
+            services.TryAddSingleton<FormatFilter, FormatFilter>();
+        }
+
+        public static IMvcCoreBuilder AddAuthorization(this IMvcCoreBuilder builder)
+        {
+            AddAuthorizationServices(builder.Services);
+            return builder;
+        }
+
+        public static IMvcCoreBuilder AddAuthorization(
+            this IMvcCoreBuilder builder,
+            Action<AuthorizationOptions> setupAction)
+        {
+            AddAuthorizationServices(builder.Services);
+
+            if (setupAction != null)
+            {
+                builder.Services.Configure(setupAction);
+            }
+
+            return builder;
+        }
+
+        // Internal for testing.
+        internal static void AddAuthorizationServices(IServiceCollection services)
+        {
+            services.AddAuthenticationCore();
+            services.AddAuthorization();
+            services.AddAuthorizationPolicyEvaluator();
+
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IApplicationModelProvider, AuthorizationApplicationModelProvider>());
+        }
+
+        /// <summary>
+        /// Registers discovered controllers as services in the <see cref="IServiceCollection"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        public static IMvcCoreBuilder AddControllersAsServices(this IMvcCoreBuilder builder)
+        {
+            var feature = new ControllerFeature();
+            builder.PartManager.PopulateFeature(feature);
+
+            foreach (var controller in feature.Controllers.Select(c => c.AsType()))
+            {
+                builder.Services.TryAddTransient(controller, controller);
+            }
+
+            builder.Services.Replace(ServiceDescriptor.Transient<IControllerActivator, ServiceBasedControllerActivator>());
+
+            return builder;
+        }
+
+        /// <summary>
+        /// Adds an <see cref="ApplicationPart"/> to the list of <see cref="ApplicationPartManager.ApplicationParts"/> on the
+        /// <see cref="IMvcCoreBuilder.PartManager"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <param name="assembly">The <see cref="Assembly"/> of the <see cref="ApplicationPart"/>.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        public static IMvcCoreBuilder AddApplicationPart(this IMvcCoreBuilder builder, Assembly assembly)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (assembly == null)
+            {
+                throw new ArgumentNullException(nameof(assembly));
+            }
+
+            builder.ConfigureApplicationPartManager(manager => manager.ApplicationParts.Add(new AssemblyPart(assembly)));
+
+            return builder;
+        }
+
+        /// <summary>
+        /// Configures the <see cref="ApplicationPartManager"/> of the <see cref="IMvcCoreBuilder.PartManager"/> using
+        /// the given <see cref="Action{ApplicationPartManager}"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <param name="setupAction">The <see cref="Action{ApplicationPartManager}"/></param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        public static IMvcCoreBuilder ConfigureApplicationPartManager(
+            this IMvcCoreBuilder builder,
+            Action<ApplicationPartManager> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (setupAction == null)
+            {
+                throw new ArgumentNullException(nameof(setupAction));
+            }
+
+            setupAction(builder.PartManager);
+
+            return builder;
+        }
+
+        /// <summary>
+        /// Sets the <see cref="CompatibilityVersion"/> for ASP.NET Core MVC for the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <param name="version">The <see cref="CompatibilityVersion"/> value to configure.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        public static IMvcCoreBuilder SetCompatibilityVersion(this IMvcCoreBuilder builder, CompatibilityVersion version)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Services.Configure<MvcCompatibilityOptions>(o => o.CompatibilityVersion = version);
+            return builder;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs
new file mode 100644
index 0000000000..c0bfe2039e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs
@@ -0,0 +1,276 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.Linq;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    /// <summary>
+    /// Extension methods for setting up essential MVC services in an <see cref="IServiceCollection" />.
+    /// </summary>
+    public static class MvcCoreServiceCollectionExtensions
+    {
+        /// <summary>
+        /// Adds the minimum essential MVC services to the specified <see cref="IServiceCollection" />. Additional services
+        /// including MVC's support for authorization, formatters, and validation must be added separately using the 
+        /// <see cref="IMvcCoreBuilder"/> returned from this method.
+        /// </summary>
+        /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
+        /// <returns>An <see cref="IMvcCoreBuilder"/> that can be used to further configure the MVC services.</returns>
+        /// <remarks>
+        /// The <see cref="MvcCoreServiceCollectionExtensions.AddMvcCore(IServiceCollection)"/> approach for configuring
+        /// MVC is provided for experienced MVC developers who wish to have full control over the set of default services 
+        /// registered. <see cref="MvcCoreServiceCollectionExtensions.AddMvcCore(IServiceCollection)"/> will register
+        /// the minimum set of services necessary to route requests and invoke controllers. It is not expected that any 
+        /// application will satisfy its requirements with just a call to
+        /// <see cref="MvcCoreServiceCollectionExtensions.AddMvcCore(IServiceCollection)"/>. Additional configuration using the 
+        /// <see cref="IMvcCoreBuilder"/> will be required.
+        /// </remarks>
+        public static IMvcCoreBuilder AddMvcCore(this IServiceCollection services)
+        {
+            if (services == null)
+            {
+                throw new ArgumentNullException(nameof(services));
+            }
+
+            var partManager = GetApplicationPartManager(services);
+            services.TryAddSingleton(partManager);
+
+            ConfigureDefaultFeatureProviders(partManager);
+            ConfigureDefaultServices(services);
+            AddMvcCoreServices(services);
+
+            var builder = new MvcCoreBuilder(services, partManager);
+
+            return builder;
+        }
+
+        private static void ConfigureDefaultFeatureProviders(ApplicationPartManager manager)
+        {
+            if (!manager.FeatureProviders.OfType<ControllerFeatureProvider>().Any())
+            {
+                manager.FeatureProviders.Add(new ControllerFeatureProvider());
+            }
+        }
+
+        private static ApplicationPartManager GetApplicationPartManager(IServiceCollection services)
+        {
+            var manager = GetServiceFromCollection<ApplicationPartManager>(services);
+            if (manager == null)
+            {
+                manager = new ApplicationPartManager();
+
+                var environment = GetServiceFromCollection<IHostingEnvironment>(services);
+                var entryAssemblyName = environment?.ApplicationName;
+                if (string.IsNullOrEmpty(entryAssemblyName))
+                {
+                    return manager;
+                }
+
+                manager.PopulateDefaultParts(entryAssemblyName);
+            }
+
+            return manager;
+        }
+
+        private static T GetServiceFromCollection<T>(IServiceCollection services)
+        {
+            return (T)services
+                .LastOrDefault(d => d.ServiceType == typeof(T))
+                ?.ImplementationInstance;
+        }
+
+        /// <summary>
+        /// Adds the minimum essential MVC services to the specified <see cref="IServiceCollection" />. Additional services
+        /// including MVC's support for authorization, formatters, and validation must be added separately using the 
+        /// <see cref="IMvcCoreBuilder"/> returned from this method.
+        /// </summary>
+        /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
+        /// <param name="setupAction">An <see cref="Action{MvcOptions}"/> to configure the provided <see cref="MvcOptions"/>.</param>
+        /// <returns>An <see cref="IMvcCoreBuilder"/> that can be used to further configure the MVC services.</returns>
+        /// <remarks>
+        /// The <see cref="MvcCoreServiceCollectionExtensions.AddMvcCore(IServiceCollection)"/> approach for configuring
+        /// MVC is provided for experienced MVC developers who wish to have full control over the set of default services 
+        /// registered. <see cref="MvcCoreServiceCollectionExtensions.AddMvcCore(IServiceCollection)"/> will register
+        /// the minimum set of services necessary to route requests and invoke controllers. It is not expected that any 
+        /// application will satisfy its requirements with just a call to
+        /// <see cref="MvcCoreServiceCollectionExtensions.AddMvcCore(IServiceCollection)"/>. Additional configuration using the 
+        /// <see cref="IMvcCoreBuilder"/> will be required.
+        /// </remarks>
+        public static IMvcCoreBuilder AddMvcCore(
+            this IServiceCollection services,
+            Action<MvcOptions> setupAction)
+        {
+            if (services == null)
+            {
+                throw new ArgumentNullException(nameof(services));
+            }
+
+            if (setupAction == null)
+            {
+                throw new ArgumentNullException(nameof(setupAction));
+            }
+
+            var builder = services.AddMvcCore();
+            services.Configure(setupAction);
+
+            return builder;
+        }
+
+        // To enable unit testing
+        internal static void AddMvcCoreServices(IServiceCollection services)
+        {
+            //
+            // Options
+            //
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IConfigureOptions<MvcOptions>, MvcCoreMvcOptionsSetup>());
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IPostConfigureOptions<MvcOptions>, MvcOptionsConfigureCompatibilityOptions>());
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IConfigureOptions<ApiBehaviorOptions>, ApiBehaviorOptionsSetup>());
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IConfigureOptions<RouteOptions>, MvcCoreRouteOptionsSetup>());
+
+            //
+            // Action Discovery
+            //
+            // These are consumed only when creating action descriptors, then they can be deallocated
+
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IApplicationModelProvider, DefaultApplicationModelProvider>());
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IApplicationModelProvider, ApiBehaviorApplicationModelProvider>());
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IActionDescriptorProvider, ControllerActionDescriptorProvider>());
+
+            services.TryAddSingleton<IActionDescriptorCollectionProvider, ActionDescriptorCollectionProvider>();
+
+            //
+            // Action Selection
+            //
+            services.TryAddSingleton<IActionSelector, ActionSelector>();
+            services.TryAddSingleton<ActionConstraintCache>();
+
+            // Will be cached by the DefaultActionSelector
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IActionConstraintProvider, DefaultActionConstraintProvider>());
+
+            //
+            // Controller Factory
+            //
+            // This has a cache, so it needs to be a singleton
+            services.TryAddSingleton<IControllerFactory, DefaultControllerFactory>();
+
+            // Will be cached by the DefaultControllerFactory
+            services.TryAddTransient<IControllerActivator, DefaultControllerActivator>();
+
+            services.TryAddSingleton<IControllerFactoryProvider, ControllerFactoryProvider>();
+            services.TryAddSingleton<IControllerActivatorProvider, ControllerActivatorProvider>();
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IControllerPropertyActivator, DefaultControllerPropertyActivator>());
+
+            //
+            // Action Invoker
+            //
+            // The IActionInvokerFactory is cachable
+            services.TryAddSingleton<IActionInvokerFactory, ActionInvokerFactory>();
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IActionInvokerProvider, ControllerActionInvokerProvider>());
+
+            // These are stateless
+            services.TryAddSingleton<ControllerActionInvokerCache>();
+            services.TryAddEnumerable(
+                ServiceDescriptor.Singleton<IFilterProvider, DefaultFilterProvider>());
+            services.TryAddSingleton<IActionResultTypeMapper, ActionResultTypeMapper>();
+
+            //
+            // Request body limit filters
+            //
+            services.TryAddTransient<RequestSizeLimitFilter>();
+            services.TryAddTransient<DisableRequestSizeLimitFilter>();
+            services.TryAddTransient<RequestFormLimitsFilter>();
+
+            //
+            // ModelBinding, Validation
+            //
+            // The DefaultModelMetadataProvider does significant caching and should be a singleton.
+            services.TryAddSingleton<IModelMetadataProvider, DefaultModelMetadataProvider>();
+            services.TryAdd(ServiceDescriptor.Transient<ICompositeMetadataDetailsProvider>(s =>
+            {
+                var options = s.GetRequiredService<IOptions<MvcOptions>>().Value;
+                return new DefaultCompositeMetadataDetailsProvider(options.ModelMetadataDetailsProviders);
+            }));
+            services.TryAddSingleton<IModelBinderFactory, ModelBinderFactory>();
+            services.TryAddSingleton<IObjectModelValidator>(s =>
+            {
+                var options = s.GetRequiredService<IOptions<MvcOptions>>().Value;
+                var metadataProvider = s.GetRequiredService<IModelMetadataProvider>();
+                return new DefaultObjectValidator(metadataProvider, options.ModelValidatorProviders);
+            });
+            services.TryAddSingleton<ClientValidatorCache>();
+            services.TryAddSingleton<ParameterBinder>();
+
+            //
+            // Random Infrastructure
+            //
+            services.TryAddSingleton<MvcMarkerService, MvcMarkerService>();
+            services.TryAddSingleton<ITypeActivatorCache, TypeActivatorCache>();
+            services.TryAddSingleton<IUrlHelperFactory, UrlHelperFactory>();
+            services.TryAddSingleton<IHttpRequestStreamReaderFactory, MemoryPoolHttpRequestStreamReaderFactory>();
+            services.TryAddSingleton<IHttpResponseStreamWriterFactory, MemoryPoolHttpResponseStreamWriterFactory>();
+            services.TryAddSingleton(ArrayPool<byte>.Shared);
+            services.TryAddSingleton(ArrayPool<char>.Shared);
+            services.TryAddSingleton<OutputFormatterSelector, DefaultOutputFormatterSelector>();
+            services.TryAddSingleton<IActionResultExecutor<ObjectResult>, ObjectResultExecutor>();
+            services.TryAddSingleton<IActionResultExecutor<PhysicalFileResult>, PhysicalFileResultExecutor>();
+            services.TryAddSingleton<IActionResultExecutor<VirtualFileResult>, VirtualFileResultExecutor>();
+            services.TryAddSingleton<IActionResultExecutor<FileStreamResult>, FileStreamResultExecutor>();
+            services.TryAddSingleton<IActionResultExecutor<FileContentResult>, FileContentResultExecutor>();
+            services.TryAddSingleton<IActionResultExecutor<RedirectResult>, RedirectResultExecutor>();
+            services.TryAddSingleton<IActionResultExecutor<LocalRedirectResult>, LocalRedirectResultExecutor>();
+            services.TryAddSingleton<IActionResultExecutor<RedirectToActionResult>, RedirectToActionResultExecutor>();
+            services.TryAddSingleton<IActionResultExecutor<RedirectToRouteResult>, RedirectToRouteResultExecutor>();
+            services.TryAddSingleton<IActionResultExecutor<RedirectToPageResult>, RedirectToPageResultExecutor>();
+            services.TryAddSingleton<IActionResultExecutor<ContentResult>, ContentResultExecutor>();
+
+            //
+            // Route Handlers
+            //
+            services.TryAddSingleton<MvcRouteHandler>(); // Only one per app
+            services.TryAddTransient<MvcAttributeRouteHandler>(); // Many per app
+
+            //
+            // Middleware pipeline filter related
+            //
+            services.TryAddSingleton<MiddlewareFilterConfigurationProvider>();
+            // This maintains a cache of middleware pipelines, so it needs to be a singleton
+            services.TryAddSingleton<MiddlewareFilterBuilder>();
+        }
+
+        private static void ConfigureDefaultServices(IServiceCollection services)
+        {
+            services.AddRouting();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DisableRequestSizeLimitAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DisableRequestSizeLimitAttribute.cs
new file mode 100644
index 0000000000..b92092667e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DisableRequestSizeLimitAttribute.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Disables the request body size limit.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public class DisableRequestSizeLimitAttribute : Attribute, IFilterFactory, IOrderedFilter
+    {
+        /// <summary>
+        /// Gets the order value for determining the order of execution of filters. Filters execute in
+        /// ascending numeric value of the <see cref="Order"/> property.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Filters are executed in an ordering determined by an ascending sort of the <see cref="Order"/> property.
+        /// </para>
+        /// <para>
+        /// The default Order for this attribute is 900 because it must run before ValidateAntiForgeryTokenAttribute and
+        /// after any filter which does authentication or login in order to allow them to behave as expected (ie Unauthenticated or Redirect instead of 400).
+        /// </para>
+        /// <para>
+        /// Look at <see cref="IOrderedFilter.Order"/> for more detailed info.
+        /// </para>
+        /// </remarks>
+        public int Order { get; set; } = 900;
+
+        /// <inheritdoc />
+        public bool IsReusable => true;
+
+        /// <inheritdoc />
+        public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
+        {
+            var filter = serviceProvider.GetRequiredService<DisableRequestSizeLimitFilter>();
+            return filter;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/EmptyResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/EmptyResult.cs
new file mode 100644
index 0000000000..dbe278e7a4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/EmptyResult.cs
@@ -0,0 +1,17 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Represents an <see cref="ActionResult"/> that when executed will
+    /// do nothing.
+    /// </summary>
+    public class EmptyResult : ActionResult
+    {
+        /// <inheritdoc />
+        public override void ExecuteResult(ActionContext context)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FileContentResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FileContentResult.cs
new file mode 100644
index 0000000000..99385c9bd3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FileContentResult.cs
@@ -0,0 +1,84 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Represents an <see cref="ActionResult"/> that when executed will
+    /// write a binary file to the response.
+    /// </summary>
+    public class FileContentResult : FileResult
+    {
+        private byte[] _fileContents;
+
+        /// <summary>
+        /// Creates a new <see cref="FileContentResult"/> instance with
+        /// the provided <paramref name="fileContents"/> and the
+        /// provided <paramref name="contentType"/>.
+        /// </summary>
+        /// <param name="fileContents">The bytes that represent the file contents.</param>
+        /// <param name="contentType">The Content-Type header of the response.</param>
+        public FileContentResult(byte[] fileContents, string contentType)
+            : this(fileContents, MediaTypeHeaderValue.Parse(contentType))
+        {
+            if (fileContents == null)
+            {
+                throw new ArgumentNullException(nameof(fileContents));
+            }
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="FileContentResult"/> instance with
+        /// the provided <paramref name="fileContents"/> and the
+        /// provided <paramref name="contentType"/>.
+        /// </summary>
+        /// <param name="fileContents">The bytes that represent the file contents.</param>
+        /// <param name="contentType">The Content-Type header of the response.</param>
+        public FileContentResult(byte[] fileContents, MediaTypeHeaderValue contentType)
+            : base(contentType?.ToString())
+        {
+            if (fileContents == null)
+            {
+                throw new ArgumentNullException(nameof(fileContents));
+            }
+
+            FileContents = fileContents;
+        }
+
+        /// <summary>
+        /// Gets or sets the file contents.
+        /// </summary>
+        public byte[] FileContents
+        {
+            get => _fileContents;
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _fileContents = value;
+            }
+        }
+
+        /// <inheritdoc />
+        public override Task ExecuteResultAsync(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var executor = context.HttpContext.RequestServices.GetRequiredService<IActionResultExecutor<FileContentResult>>();
+            return executor.ExecuteAsync(context, this);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FileResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FileResult.cs
new file mode 100644
index 0000000000..6b3b7743f2
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FileResult.cs
@@ -0,0 +1,61 @@
+// 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.
+
+using System;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Represents an <see cref="ActionResult"/> that when executed will
+    /// write a file as the response.
+    /// </summary>
+    public abstract class FileResult : ActionResult
+    {
+        private string _fileDownloadName;
+
+        /// <summary>
+        /// Creates a new <see cref="FileResult"/> instance with
+        /// the provided <paramref name="contentType"/>.
+        /// </summary>
+        /// <param name="contentType">The Content-Type header of the response.</param>
+        protected FileResult(string contentType)
+        {
+            if (contentType == null)
+            {
+                throw new ArgumentNullException(nameof(contentType));
+            }
+
+            ContentType = contentType;
+        }
+
+        /// <summary>
+        /// Gets the Content-Type header for the response.
+        /// </summary>
+        public string ContentType { get; }
+
+        /// <summary>
+        /// Gets the file name that will be used in the Content-Disposition header of the response.
+        /// </summary>
+        public string FileDownloadName
+        {
+            get { return _fileDownloadName ?? string.Empty; }
+            set { _fileDownloadName = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the last modified information associated with the <see cref="FileResult"/>.
+        /// </summary>
+        public DateTimeOffset? LastModified { get; set; }
+
+        /// <summary>
+        /// Gets or sets the etag associated with the <see cref="FileResult"/>.
+        /// </summary>
+        public EntityTagHeaderValue EntityTag { get; set; }
+
+        /// <summary>
+        /// Gets or sets the value that enables range processing for the <see cref="FileResult"/>.
+        /// </summary>
+        public bool EnableRangeProcessing { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FileStreamResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FileStreamResult.cs
new file mode 100644
index 0000000000..486069a5ea
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FileStreamResult.cs
@@ -0,0 +1,81 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Represents an <see cref="ActionResult"/> that when executed will
+    /// write a file from a stream to the response.
+    /// </summary>
+    public class FileStreamResult : FileResult
+    {
+        private Stream _fileStream;
+
+        /// <summary>
+        /// Creates a new <see cref="FileStreamResult"/> instance with
+        /// the provided <paramref name="fileStream"/> and the
+        /// provided <paramref name="contentType"/>.
+        /// </summary>
+        /// <param name="fileStream">The stream with the file.</param>
+        /// <param name="contentType">The Content-Type header of the response.</param>
+        public FileStreamResult(Stream fileStream, string contentType)
+            : this(fileStream, MediaTypeHeaderValue.Parse(contentType))
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="FileStreamResult"/> instance with
+        /// the provided <paramref name="fileStream"/> and the
+        /// provided <paramref name="contentType"/>.
+        /// </summary>
+        /// <param name="fileStream">The stream with the file.</param>
+        /// <param name="contentType">The Content-Type header of the response.</param>
+        public FileStreamResult(Stream fileStream, MediaTypeHeaderValue contentType)
+            : base(contentType?.ToString())
+        {
+            if (fileStream == null)
+            {
+                throw new ArgumentNullException(nameof(fileStream));
+            }
+
+            FileStream = fileStream;
+        }
+
+        /// <summary>
+        /// Gets or sets the stream with the file that will be sent back as the response.
+        /// </summary>
+        public Stream FileStream
+        {
+            get => _fileStream;
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _fileStream = value;
+            }
+        }
+
+        /// <inheritdoc />
+        public override Task ExecuteResultAsync(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var executor = context.HttpContext.RequestServices.GetRequiredService<IActionResultExecutor<FileStreamResult>>();
+            return executor.ExecuteAsync(context, this);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ActionFilterAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ActionFilterAttribute.cs
new file mode 100644
index 0000000000..efb06d56ce
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ActionFilterAttribute.cs
@@ -0,0 +1,87 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// An abstract filter that asynchronously surrounds execution of the action and the action result. Subclasses
+    /// should override <see cref="OnActionExecuting"/>, <see cref="OnActionExecuted"/> or
+    /// <see cref="OnActionExecutionAsync"/> but not <see cref="OnActionExecutionAsync"/> and either of the other two.
+    /// Similarly subclasses should override <see cref="OnResultExecuting"/>, <see cref="OnResultExecuted"/> or
+    /// <see cref="OnResultExecutionAsync"/> but not <see cref="OnResultExecutionAsync"/> and either of the other two.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
+    public abstract class ActionFilterAttribute :
+        Attribute, IActionFilter, IAsyncActionFilter, IResultFilter, IAsyncResultFilter, IOrderedFilter
+    {
+        /// <inheritdoc />
+        public int Order { get; set; }
+
+        /// <inheritdoc />
+        public virtual void OnActionExecuting(ActionExecutingContext context)
+        {
+        }
+
+        /// <inheritdoc />
+        public virtual void OnActionExecuted(ActionExecutedContext context)
+        {
+        }
+
+        /// <inheritdoc />
+        public virtual async Task OnActionExecutionAsync(
+            ActionExecutingContext context,
+            ActionExecutionDelegate next)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (next == null)
+            {
+                throw new ArgumentNullException(nameof(next));
+            }
+
+            OnActionExecuting(context);
+            if (context.Result == null)
+            {
+                OnActionExecuted(await next());
+            }
+        }
+
+        /// <inheritdoc />
+        public virtual void OnResultExecuting(ResultExecutingContext context)
+        {
+        }
+
+        /// <inheritdoc />
+        public virtual void OnResultExecuted(ResultExecutedContext context)
+        {
+        }
+
+        /// <inheritdoc />
+        public virtual async Task OnResultExecutionAsync(
+            ResultExecutingContext context,
+            ResultExecutionDelegate next)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (next == null)
+            {
+                throw new ArgumentNullException(nameof(next));
+            }
+
+            OnResultExecuting(context);
+            if (!context.Cancel)
+            {
+                OnResultExecuted(await next());
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ExceptionFilterAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ExceptionFilterAttribute.cs
new file mode 100644
index 0000000000..e6efec0d2e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ExceptionFilterAttribute.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// An abstract filter that runs asynchronously after an action has thrown an <see cref="Exception"/>. Subclasses
+    /// must override <see cref="OnException"/> or <see cref="OnExceptionAsync"/> but not both.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
+    public abstract class ExceptionFilterAttribute : Attribute, IAsyncExceptionFilter, IExceptionFilter, IOrderedFilter
+    {
+        /// <inheritdoc />
+        public int Order { get; set; }
+
+        /// <inheritdoc />
+        public virtual Task OnExceptionAsync(ExceptionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            OnException(context);
+            return Task.CompletedTask;
+        }
+
+        /// <inheritdoc />
+        public virtual void OnException(ExceptionContext context)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCollection.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCollection.cs
new file mode 100644
index 0000000000..b5ea9a26c1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCollection.cs
@@ -0,0 +1,176 @@
+// 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.
+
+using System;
+using System.Collections.ObjectModel;
+using Microsoft.AspNetCore.Mvc.Core;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    public class FilterCollection : Collection<IFilterMetadata>
+    {
+        /// <summary>
+        /// Adds a type representing an <see cref="IFilterMetadata"/>.
+        /// </summary>
+        /// <typeparam name="TFilterType">Type representing an <see cref="IFilterMetadata"/>.</typeparam>
+        /// <returns>An <see cref="IFilterMetadata"/> representing the added type.</returns>
+        /// <remarks>
+        /// Filter instances will be created using
+        /// <see cref="Microsoft.Extensions.DependencyInjection.ActivatorUtilities"/>.
+        /// Use <see cref="AddService(Type)"/> to register a service as a filter.
+        /// </remarks>
+        public IFilterMetadata Add<TFilterType>() where TFilterType : IFilterMetadata
+        {
+            return Add(typeof(TFilterType));
+        }
+
+        /// <summary>
+        /// Adds a type representing an <see cref="IFilterMetadata"/>.
+        /// </summary>
+        /// <param name="filterType">Type representing an <see cref="IFilterMetadata"/>.</param>
+        /// <returns>An <see cref="IFilterMetadata"/> representing the added type.</returns>
+        /// <remarks>
+        /// Filter instances will be created using
+        /// <see cref="Microsoft.Extensions.DependencyInjection.ActivatorUtilities"/>.
+        /// Use <see cref="AddService(Type)"/> to register a service as a filter.
+        /// </remarks>
+        public IFilterMetadata Add(Type filterType)
+        {
+            if (filterType == null)
+            {
+                throw new ArgumentNullException(nameof(filterType));
+            }
+
+            return Add(filterType, order: 0);
+        }
+
+        /// <summary>
+        /// Adds a type representing an <see cref="IFilterMetadata"/>.
+        /// </summary>
+        /// <typeparam name="TFilterType">Type representing an <see cref="IFilterMetadata"/>.</typeparam>
+        /// <param name="order">The order of the added filter.</param>
+        /// <returns>An <see cref="IFilterMetadata"/> representing the added type.</returns>
+        /// <remarks>
+        /// Filter instances will be created using
+        /// <see cref="Microsoft.Extensions.DependencyInjection.ActivatorUtilities"/>.
+        /// Use <see cref="AddService(Type)"/> to register a service as a filter.
+        /// </remarks>
+        public IFilterMetadata Add<TFilterType>(int order) where TFilterType : IFilterMetadata
+        {
+            return Add(typeof(TFilterType), order);
+        }
+
+        /// <summary>
+        /// Adds a type representing an <see cref="IFilterMetadata"/>.
+        /// </summary>
+        /// <param name="filterType">Type representing an <see cref="IFilterMetadata"/>.</param>
+        /// <param name="order">The order of the added filter.</param>
+        /// <returns>An <see cref="IFilterMetadata"/> representing the added type.</returns>
+        /// <remarks>
+        /// Filter instances will be created using
+        /// <see cref="Microsoft.Extensions.DependencyInjection.ActivatorUtilities"/>.
+        /// Use <see cref="AddService(Type)"/> to register a service as a filter.
+        /// </remarks>
+        public IFilterMetadata Add(Type filterType, int order)
+        {
+            if (filterType == null)
+            {
+                throw new ArgumentNullException(nameof(filterType));
+            }
+
+            if (!typeof(IFilterMetadata).IsAssignableFrom(filterType))
+            {
+                var message = Resources.FormatTypeMustDeriveFromType(
+                    filterType.FullName,
+                    typeof(IFilterMetadata).FullName);
+                throw new ArgumentException(message, nameof(filterType));
+            }
+
+            var filter = new TypeFilterAttribute(filterType) { Order = order };
+            Add(filter);
+            return filter;
+        }
+        
+        /// <summary>
+        /// Adds a type representing an <see cref="IFilterMetadata"/>.
+        /// </summary>
+        /// <typeparam name="TFilterType">Type representing an <see cref="IFilterMetadata"/>.</typeparam>
+        /// <returns>An <see cref="IFilterMetadata"/> representing the added service type.</returns>
+        /// <remarks>
+        /// Filter instances will be created through dependency injection. Use
+        /// <see cref="Add(Type)"/> to register a service that will be created via
+        /// type activation.
+        /// </remarks>
+        public IFilterMetadata AddService<TFilterType>() where TFilterType : IFilterMetadata
+        {
+            return AddService(typeof(TFilterType));
+        }
+
+        /// <summary>
+        /// Adds a type representing an <see cref="IFilterMetadata"/>.
+        /// </summary>
+        /// <param name="filterType">Type representing an <see cref="IFilterMetadata"/>.</param>
+        /// <returns>An <see cref="IFilterMetadata"/> representing the added service type.</returns>
+        /// <remarks>
+        /// Filter instances will be created through dependency injection. Use
+        /// <see cref="Add(Type)"/> to register a service that will be created via
+        /// type activation.
+        /// </remarks>
+        public IFilterMetadata AddService(Type filterType)
+        {
+            if (filterType == null)
+            {
+                throw new ArgumentNullException(nameof(filterType));
+            }
+
+            return AddService(filterType, order: 0);
+        }
+
+        /// <summary>
+        /// Adds a type representing an <see cref="IFilterMetadata"/>.
+        /// </summary>
+        /// <typeparam name="TFilterType">Type representing an <see cref="IFilterMetadata"/>.</typeparam>
+        /// <param name="order">The order of the added filter.</param>
+        /// <returns>An <see cref="IFilterMetadata"/> representing the added service type.</returns>
+        /// <remarks>
+        /// Filter instances will be created through dependency injection. Use
+        /// <see cref="Add(Type)"/> to register a service that will be created via
+        /// type activation.
+        /// </remarks>
+        public IFilterMetadata AddService<TFilterType>(int order) where TFilterType : IFilterMetadata
+        {
+            return AddService(typeof(TFilterType), order);
+        }
+
+        /// <summary>
+        /// Adds a type representing an <see cref="IFilterMetadata"/>.
+        /// </summary>
+        /// <param name="filterType">Type representing an <see cref="IFilterMetadata"/>.</param>
+        /// <param name="order">The order of the added filter.</param>
+        /// <returns>An <see cref="IFilterMetadata"/> representing the added service type.</returns>
+        /// <remarks>
+        /// Filter instances will be created through dependency injection. Use
+        /// <see cref="Add(Type)"/> to register a service that will be created via
+        /// type activation.
+        /// </remarks>
+        public IFilterMetadata AddService(Type filterType, int order)
+        {
+            if (filterType == null)
+            {
+                throw new ArgumentNullException(nameof(filterType));
+            }
+
+            if (!typeof(IFilterMetadata).IsAssignableFrom(filterType))
+            {
+                var message = Resources.FormatTypeMustDeriveFromType(
+                    filterType.FullName,
+                    typeof(IFilterMetadata).FullName);
+                throw new ArgumentException(message, nameof(filterType));
+            }
+
+            var filter = new ServiceFilterAttribute(filterType) { Order = order };
+            Add(filter);
+            return filter;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterScope.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterScope.cs
new file mode 100644
index 0000000000..e687d3975c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterScope.cs
@@ -0,0 +1,23 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// <para>
+    /// Contains constant values for known filter scopes.
+    /// </para>
+    /// <para>
+    /// Scope defines the ordering of filters that have the same order. Scope is by-default
+    /// defined by how a filter is registered.
+    /// </para>
+    /// </summary>
+    public static class FilterScope
+    {
+        public static readonly int First = 0;
+        public static readonly int Global = 10;
+        public static readonly int Controller = 20;
+        public static readonly int Action = 30;
+        public static readonly int Last = 100;
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterAttribute.cs
new file mode 100644
index 0000000000..019f1551f3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterAttribute.cs
@@ -0,0 +1,54 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Executes a middleware pipeline provided the by the <see cref="MiddlewareFilterAttribute.ConfigurationType"/>.
+    /// The middleware pipeline will be treated as an async resource filter.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
+    public class MiddlewareFilterAttribute : Attribute, IFilterFactory, IOrderedFilter
+    {
+        /// <summary>
+        /// Instantiates a new instance of <see cref="MiddlewareFilterAttribute"/>.
+        /// </summary>
+        /// <param name="configurationType">A type which configures a middleware pipeline.</param>
+        public MiddlewareFilterAttribute(Type configurationType)
+        {
+            if (configurationType == null)
+            {
+                throw new ArgumentNullException(nameof(configurationType));
+            }
+
+            ConfigurationType = configurationType;
+        }
+
+        public Type ConfigurationType { get; }
+
+        /// <inheritdoc />
+        public int Order { get; set; }
+
+        /// <inheritdoc />
+        public bool IsReusable => true;
+
+        /// <inheritdoc />
+        public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
+        {
+            if (serviceProvider == null)
+            {
+                throw new ArgumentNullException(nameof(serviceProvider));
+            }
+
+            var middlewarePipelineService = serviceProvider.GetRequiredService<MiddlewareFilterBuilder>();
+            var pipeline = middlewarePipelineService.GetPipeline(ConfigurationType);
+
+            return new MiddlewareFilter(pipeline);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ResultFilterAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ResultFilterAttribute.cs
new file mode 100644
index 0000000000..b7ff680661
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ResultFilterAttribute.cs
@@ -0,0 +1,52 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// An abstract filter that asynchronously surrounds execution of the action result. Subclasses
+    /// must override <see cref="OnResultExecuting"/>, <see cref="OnResultExecuted"/> or
+    /// <see cref="OnResultExecutionAsync"/> but not <see cref="OnResultExecutionAsync"/> and either of the other two.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
+    public abstract class ResultFilterAttribute : Attribute, IResultFilter, IAsyncResultFilter, IOrderedFilter
+    {
+        /// <inheritdoc />
+        public int Order { get; set; }
+
+        /// <inheritdoc />
+        public virtual void OnResultExecuting(ResultExecutingContext context)
+        {
+        }
+
+        /// <inheritdoc />
+        public virtual void OnResultExecuted(ResultExecutedContext context)
+        {
+        }
+
+        /// <inheritdoc />
+        public virtual async Task OnResultExecutionAsync(
+            ResultExecutingContext context,
+            ResultExecutionDelegate next)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (next == null)
+            {
+                throw new ArgumentNullException(nameof(next));
+            }
+
+            OnResultExecuting(context);
+            if (!context.Cancel)
+            {
+                OnResultExecuted(await next());
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ForbidResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ForbidResult.cs
new file mode 100644
index 0000000000..b967d74c08
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ForbidResult.cs
@@ -0,0 +1,119 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="ActionResult"/> that on execution invokes <see cref="M:AuthenticationManager.ForbidAsync"/>.
+    /// </summary>
+    public class ForbidResult : ActionResult
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="ForbidResult"/>.
+        /// </summary>
+        public ForbidResult()
+            : this(Array.Empty<string>())
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ForbidResult"/> with the
+        /// specified authentication scheme.
+        /// </summary>
+        /// <param name="authenticationScheme">The authentication scheme to challenge.</param>
+        public ForbidResult(string authenticationScheme)
+            : this(new[] { authenticationScheme })
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ForbidResult"/> with the
+        /// specified authentication schemes.
+        /// </summary>
+        /// <param name="authenticationSchemes">The authentication schemes to challenge.</param>
+        public ForbidResult(IList<string> authenticationSchemes)
+            : this(authenticationSchemes, properties: null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ForbidResult"/> with the
+        /// specified <paramref name="properties"/>.
+        /// </summary>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the authentication
+        /// challenge.</param>
+        public ForbidResult(AuthenticationProperties properties)
+            : this(Array.Empty<string>(), properties)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ForbidResult"/> with the
+        /// specified authentication scheme and <paramref name="properties"/>.
+        /// </summary>
+        /// <param name="authenticationScheme">The authentication schemes to challenge.</param>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the authentication
+        /// challenge.</param>
+        public ForbidResult(string authenticationScheme, AuthenticationProperties properties)
+            : this(new[] { authenticationScheme }, properties)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ForbidResult"/> with the
+        /// specified authentication schemes and <paramref name="properties"/>.
+        /// </summary>
+        /// <param name="authenticationSchemes">The authentication scheme to challenge.</param>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the authentication
+        /// challenge.</param>
+        public ForbidResult(IList<string> authenticationSchemes, AuthenticationProperties properties)
+        {
+            AuthenticationSchemes = authenticationSchemes;
+            Properties = properties;
+        }
+
+        /// <summary>
+        /// Gets or sets the authentication schemes that are challenged.
+        /// </summary>
+        public IList<string> AuthenticationSchemes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="AuthenticationProperties"/> used to perform the authentication challenge.
+        /// </summary>
+        public AuthenticationProperties Properties { get; set; }
+
+        /// <inheritdoc />
+        public override async Task ExecuteResultAsync(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var loggerFactory = context.HttpContext.RequestServices.GetRequiredService<ILoggerFactory>();
+            var logger = loggerFactory.CreateLogger<ForbidResult>();
+
+            logger.ForbidResultExecuting(AuthenticationSchemes);
+
+            if (AuthenticationSchemes != null && AuthenticationSchemes.Count > 0)
+            {
+                for (var i = 0; i < AuthenticationSchemes.Count; i++)
+                {
+                    await context.HttpContext.ForbidAsync(AuthenticationSchemes[i], Properties);
+                }
+            }
+            else
+            {
+                await context.HttpContext.ForbidAsync(Properties);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FormatFilterAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FormatFilterAttribute.cs
new file mode 100644
index 0000000000..dab307f89d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FormatFilterAttribute.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A filter that will use the format value in the route data or query string to set the content type on an
+    /// <see cref="ObjectResult" /> returned from an action.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public class FormatFilterAttribute : Attribute, IFilterFactory
+    {
+        /// <inheritdoc />
+        public bool IsReusable => true;
+
+        /// <summary>
+        /// Creates an instance of <see cref="FormatFilter"/>.
+        /// </summary>
+        /// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
+        /// <returns>An instance of <see cref="FormatFilter"/>.</returns>
+        public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
+        {
+            if (serviceProvider == null)
+            {
+                throw new ArgumentNullException(nameof(serviceProvider));
+            }
+
+            return serviceProvider.GetRequiredService<FormatFilter>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatFilter.cs
new file mode 100644
index 0000000000..dd7b568fce
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatFilter.cs
@@ -0,0 +1,194 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Formatters.Internal;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// A filter that will use the format value in the route data or query string to set the content type on an
+    /// <see cref="ObjectResult"/> returned from an action.
+    /// </summary>
+    public class FormatFilter : IFormatFilter, IResourceFilter, IResultFilter
+    {
+        private readonly MvcOptions _options;
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// Initializes an instance of <see cref="FormatFilter"/>.
+        /// </summary>
+        /// <param name="options">The <see cref="IOptions{MvcOptions}"/></param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version.")]
+        public FormatFilter(IOptions<MvcOptions> options)
+            : this(options, NullLoggerFactory.Instance)
+        {
+        }
+
+        /// <summary>
+        /// Initializes an instance of <see cref="FormatFilter"/>.
+        /// </summary>
+        /// <param name="options">The <see cref="IOptions{MvcOptions}"/></param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public FormatFilter(IOptions<MvcOptions> options, ILoggerFactory loggerFactory)
+        {
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            _options = options.Value;
+            _logger = loggerFactory.CreateLogger(GetType());
+        }
+
+        /// <inheritdoc />
+        public virtual string GetFormat(ActionContext context)
+        {
+            if (context.RouteData.Values.TryGetValue("format", out var obj))
+            {
+                // null and string.Empty are equivalent for route values.
+                var routeValue = obj?.ToString();
+                return string.IsNullOrEmpty(routeValue) ? null : routeValue;
+            }
+
+            var query = context.HttpContext.Request.Query["format"];
+            if (query.Count > 0)
+            {
+                return query.ToString();
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// As a <see cref="IResourceFilter"/>, this filter looks at the request and rejects it before going ahead if
+        /// 1. The format in the request does not match any format in the map.
+        /// 2. If there is a conflicting producesFilter.
+        /// </summary>
+        /// <param name="context">The <see cref="ResourceExecutingContext"/>.</param>
+        public void OnResourceExecuting(ResourceExecutingContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var format = GetFormat(context);
+            if (format == null)
+            {
+                // no format specified by user, so the filter is muted
+                return;
+            }
+
+            var contentType = _options.FormatterMappings.GetMediaTypeMappingForFormat(format);
+            if (contentType == null)
+            {
+                _logger.UnsupportedFormatFilterContentType(format);
+
+                // no contentType exists for the format, return 404
+                context.Result = new NotFoundResult();
+                return;
+            }
+
+            // Determine media types this action supports.
+            var responseTypeFilters = context.Filters.OfType<IApiResponseMetadataProvider>();
+            var supportedMediaTypes = new MediaTypeCollection();
+            foreach (var filter in responseTypeFilters)
+            {
+                filter.SetContentTypes(supportedMediaTypes);
+            }
+
+            // Check if support is adequate for requested media type.
+            if (supportedMediaTypes.Count == 0)
+            {
+                _logger.ActionDoesNotExplicitlySpecifyContentTypes();
+                return;
+            }
+
+            // We need to check if the action can generate the content type the user asked for. That is, treat the
+            // request's format and IApiResponseMetadataProvider-provided content types similarly to an Accept
+            // header and an output formatter's SupportedMediaTypes: Confirm action supports a more specific media
+            // type than requested e.g. OK if "text/*" requested and action supports "text/plain".
+            if (!IsSuperSetOfAnySupportedMediaType(contentType, supportedMediaTypes))
+            {
+                _logger.ActionDoesNotSupportFormatFilterContentType(contentType, supportedMediaTypes);
+                context.Result = new NotFoundResult();
+            }
+        }
+
+        private bool IsSuperSetOfAnySupportedMediaType(string contentType, MediaTypeCollection supportedMediaTypes)
+        {
+            var parsedContentType = new MediaType(contentType);
+            for (var i = 0; i < supportedMediaTypes.Count; i++)
+            {
+                var supportedMediaType = new MediaType(supportedMediaTypes[i]);
+                if (supportedMediaType.IsSubsetOf(parsedContentType))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        /// <inheritdoc />
+        public void OnResourceExecuted(ResourceExecutedContext context)
+        {
+        }
+
+        /// <summary>
+        /// Sets a Content Type on an  <see cref="ObjectResult" />  using a format value from the request.
+        /// </summary>
+        /// <param name="context">The <see cref="ResultExecutingContext"/>.</param>
+        public void OnResultExecuting(ResultExecutingContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var format = GetFormat(context);
+            if (format == null)
+            {
+                // no format specified by user, so the filter is muted
+                return;
+            }
+
+            var objectResult = context.Result as ObjectResult;
+            if (objectResult == null)
+            {
+                return;
+            }
+
+            // If the action sets a single content type, then it takes precedence over the user
+            // supplied content type based on format mapping.
+            if ((objectResult.ContentTypes != null && objectResult.ContentTypes.Count == 1) ||
+                !string.IsNullOrEmpty(context.HttpContext.Response.ContentType))
+            {
+                _logger.CannotApplyFormatFilterContentType(format);
+                return;
+            }
+
+            var contentType = _options.FormatterMappings.GetMediaTypeMappingForFormat(format);
+            objectResult.ContentTypes.Clear();
+            objectResult.ContentTypes.Add(contentType);
+        }
+
+        /// <inheritdoc />
+        public void OnResultExecuted(ResultExecutedContext context)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatterMappings.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatterMappings.cs
new file mode 100644
index 0000000000..81613febfc
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatterMappings.cs
@@ -0,0 +1,131 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// Used to specify mapping between the URL Format and corresponding media type.
+    /// </summary>
+    public class FormatterMappings
+    {
+        private readonly Dictionary<string, string> _map =
+            new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+
+        /// <summary>
+        /// Sets mapping for the format to specified media type.
+        /// If the format already exists, the media type will be overwritten with the new value.
+        /// </summary>
+        /// <param name="format">The format value.</param>
+        /// <param name="contentType">The media type for the format value.</param>
+        public void SetMediaTypeMappingForFormat(string format, string contentType)
+        {
+            if (format == null)
+            {
+                throw new ArgumentNullException(nameof(format));
+            }
+
+            if (contentType == null)
+            {
+                throw new ArgumentNullException(nameof(contentType));
+            }
+
+            SetMediaTypeMappingForFormat(format, MediaTypeHeaderValue.Parse(contentType));
+        }
+
+        /// <summary>
+        /// Sets mapping for the format to specified media type.
+        /// If the format already exists, the media type will be overwritten with the new value.
+        /// </summary>
+        /// <param name="format">The format value.</param>
+        /// <param name="contentType">The media type for the format value.</param>
+        public void SetMediaTypeMappingForFormat(string format, MediaTypeHeaderValue contentType)
+        {
+            if (format == null)
+            {
+                throw new ArgumentNullException(nameof(format));
+            }
+
+            if (contentType == null)
+            {
+                throw new ArgumentNullException(nameof(contentType));
+            }
+
+            ValidateContentType(contentType);
+            format = RemovePeriodIfPresent(format);
+            _map[format] = contentType.ToString();
+        }
+
+        /// <summary>
+        /// Gets the media type for the specified format.
+        /// </summary>
+        /// <param name="format">The format value.</param>
+        /// <returns>The media type for input format.</returns>
+        public string GetMediaTypeMappingForFormat(string format)
+        {
+            if (string.IsNullOrEmpty(format))
+            {
+                var message = Resources.FormatFormatFormatterMappings_GetMediaTypeMappingForFormat_InvalidFormat(
+                    nameof(format));
+
+                throw new ArgumentException(message, nameof(format));
+            }
+
+            format = RemovePeriodIfPresent(format);
+
+            _map.TryGetValue(format, out var value);
+
+            return value;
+        }
+
+        /// <summary>
+        /// Clears the media type mapping for the format.
+        /// </summary>
+        /// <param name="format">The format value.</param>
+        /// <returns><c>true</c> if the format is successfully found and cleared; otherwise, <c>false</c>.</returns>
+        public bool ClearMediaTypeMappingForFormat(string format)
+        {
+            if (format == null)
+            {
+                throw new ArgumentNullException(nameof(format));
+            }
+
+            format = RemovePeriodIfPresent(format);
+            return _map.Remove(format);
+        }
+
+        private void ValidateContentType(MediaTypeHeaderValue contentType)
+        {
+            if (contentType.Type == "*" || contentType.SubType == "*")
+            {
+                throw new ArgumentException(
+                    string.Format(Resources.FormatterMappings_NotValidMediaType, contentType),
+                    nameof(contentType));
+            }
+        }
+
+        private string RemovePeriodIfPresent(string format)
+        {
+            if (string.IsNullOrEmpty(format))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(format));
+            }
+
+            if (format.StartsWith(".", StringComparison.Ordinal))
+            {
+                if (format == ".")
+                {
+                    throw new ArgumentException(string.Format(Resources.Format_NotValid, format), nameof(format));
+                }
+
+                format = format.Substring(1);
+            }
+
+            return format;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs
new file mode 100644
index 0000000000..244ffa829e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs
@@ -0,0 +1,48 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// Sets the status code to 204 if the content is null.
+    /// </summary>
+    public class HttpNoContentOutputFormatter : IOutputFormatter
+    {
+        /// <summary>
+        /// Indicates whether to select this formatter if the returned value from the action
+        /// is null.
+        /// </summary>
+        public bool TreatNullValueAsNoContent { get; set; } = true;
+
+        /// <inheritdoc />
+        public bool CanWriteResult(OutputFormatterCanWriteContext context)
+        {
+            // ignore the contentType and just look at the content.
+            // This formatter will be selected if the content is null.
+            // We check for Task as a user can directly create an ObjectContentResult with the unwrapped type.
+            if (context.ObjectType == typeof(void) || context.ObjectType == typeof(Task))
+            {
+                return true;
+            }
+
+            return TreatNullValueAsNoContent && context.Object == null;
+        }
+
+        /// <inheritdoc />
+        public Task WriteAsync(OutputFormatterWriteContext context)
+        {
+            var response = context.HttpContext.Response;
+            response.ContentLength = 0;
+
+            if (response.StatusCode == StatusCodes.Status200OK)
+            {
+                response.StatusCode = StatusCodes.Status204NoContent;
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/InputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/InputFormatter.cs
new file mode 100644
index 0000000000..2392b5a47c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/InputFormatter.cs
@@ -0,0 +1,173 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.Core;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// Reads an object from the request body.
+    /// </summary>
+    public abstract class InputFormatter : IInputFormatter, IApiRequestFormatMetadataProvider
+    {
+        /// <summary>
+        /// Gets the mutable collection of media type elements supported by
+        /// this <see cref="InputFormatter"/>.
+        /// </summary>
+        public MediaTypeCollection SupportedMediaTypes { get; } = new MediaTypeCollection();
+
+        /// <summary>
+        /// Gets the default value for a given type. Used to return a default value when the body contains no content.
+        /// </summary>
+        /// <param name="modelType">The type of the value.</param>
+        /// <returns>The default value for the <paramref name="modelType"/> type.</returns>
+        protected virtual object GetDefaultValueForType(Type modelType)
+        {
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            if (modelType.GetTypeInfo().IsValueType)
+            {
+                return Activator.CreateInstance(modelType);
+            }
+
+            return null;
+        }
+
+        /// <inheritdoc />
+        public virtual bool CanRead(InputFormatterContext context)
+        {
+            if (SupportedMediaTypes.Count == 0)
+            {
+                var message = Resources.FormatFormatter_NoMediaTypes(
+                    GetType().FullName,
+                    nameof(SupportedMediaTypes));
+
+                throw new InvalidOperationException(message);
+            }
+
+            if (!CanReadType(context.ModelType))
+            {
+                return false;
+            }
+
+            var contentType = context.HttpContext.Request.ContentType;
+            if (string.IsNullOrEmpty(contentType))
+            {
+                return false;
+            }
+
+            // Confirm the request's content type is more specific than a media type this formatter supports e.g. OK if
+            // client sent "text/plain" data and this formatter supports "text/*".
+            return IsSubsetOfAnySupportedContentType(contentType);
+        }
+
+        private bool IsSubsetOfAnySupportedContentType(string contentType)
+        {
+            var parsedContentType = new MediaType(contentType);
+            for (var i = 0; i < SupportedMediaTypes.Count; i++)
+            {
+                var supportedMediaType = new MediaType(SupportedMediaTypes[i]);
+                if (parsedContentType.IsSubsetOf(supportedMediaType))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Determines whether this <see cref="InputFormatter"/> can deserialize an object of the given
+        /// <paramref name="type"/>.
+        /// </summary>
+        /// <param name="type">The <see cref="Type"/> of object that will be read.</param>
+        /// <returns><c>true</c> if the <paramref name="type"/> can be read, otherwise <c>false</c>.</returns>
+        protected virtual bool CanReadType(Type type)
+        {
+            return true;
+        }
+
+        /// <inheritdoc />
+        public virtual Task<InputFormatterResult> ReadAsync(InputFormatterContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var request = context.HttpContext.Request;
+            if (request.ContentLength == 0)
+            {
+                if (context.TreatEmptyInputAsDefaultValue)
+                {
+                    return InputFormatterResult.SuccessAsync(GetDefaultValueForType(context.ModelType));
+                }
+
+                return InputFormatterResult.NoValueAsync();
+            }
+
+            return ReadRequestBodyAsync(context);
+        }
+
+        /// <summary>
+        /// Reads an object from the request body.
+        /// </summary>
+        /// <param name="context">The <see cref="InputFormatterContext"/>.</param>
+        /// <returns>A <see cref="Task"/> that on completion deserializes the request body.</returns>
+        public abstract Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterContext context);
+
+        /// <inheritdoc />
+        public virtual IReadOnlyList<string> GetSupportedContentTypes(string contentType, Type objectType)
+        {
+            if (SupportedMediaTypes.Count == 0)
+            {
+                var message = Resources.FormatFormatter_NoMediaTypes(
+                    GetType().FullName,
+                    nameof(SupportedMediaTypes));
+
+                throw new InvalidOperationException(message);
+            }
+
+            if (!CanReadType(objectType))
+            {
+                return null;
+            }
+
+            if (contentType == null)
+            {
+                // If contentType is null, then any type we support is valid.
+                return SupportedMediaTypes;
+            }
+            else
+            {
+                var parsedContentType = new MediaType(contentType);
+                List<string> mediaTypes = null;
+
+                // Confirm this formatter supports a more specific media type than requested e.g. OK if "text/*"
+                // requested and formatter supports "text/plain". Treat contentType like it came from an Content-Type header.
+                foreach (var mediaType in SupportedMediaTypes)
+                {
+                    var parsedMediaType = new MediaType(mediaType);
+                    if (parsedMediaType.IsSubsetOf(parsedContentType))
+                    {
+                        if (mediaTypes == null)
+                        {
+                            mediaTypes = new List<string>();
+                        }
+
+                        mediaTypes.Add(mediaType);
+                    }
+                }
+
+                return mediaTypes;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaType.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaType.cs
new file mode 100644
index 0000000000..e72fccac65
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaType.cs
@@ -0,0 +1,707 @@
+// 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.
+
+using System;
+using System.Globalization;
+using System.Text;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Formatters.Internal;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// A media type value.
+    /// </summary>
+    public struct MediaType
+    {
+        private static readonly StringSegment QualityParameter = new StringSegment("q");
+
+        private readonly MediaTypeParameterParser _parameterParser;
+
+        /// <summary>
+        /// Initializes a <see cref="MediaType"/> instance.
+        /// </summary>
+        /// <param name="mediaType">The <see cref="string"/> with the media type.</param>
+        public MediaType(string mediaType)
+            : this(mediaType, 0, mediaType.Length)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a <see cref="MediaType"/> instance.
+        /// </summary>
+        /// <param name="mediaType">The <see cref="StringSegment"/> with the media type.</param>
+        public MediaType(StringSegment mediaType)
+            : this(mediaType.Buffer, mediaType.Offset, mediaType.Length)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a <see cref="MediaTypeParameterParser"/> instance.
+        /// </summary>
+        /// <param name="mediaType">The <see cref="string"/> with the media type.</param>
+        /// <param name="offset">The offset in the <paramref name="mediaType"/> where the parsing starts.</param>
+        /// <param name="length">The length of the media type to parse if provided.</param>
+        public MediaType(string mediaType, int offset, int? length)
+        {
+            if (mediaType == null)
+            {
+                throw new ArgumentNullException(nameof(mediaType));
+            }
+
+            if (offset < 0 || offset >= mediaType.Length)
+            {
+                throw new ArgumentOutOfRangeException(nameof(offset));
+            }
+
+            if (length != null)
+            {
+                if(length < 0 || length > mediaType.Length)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(length));
+                }
+
+                if (offset > mediaType.Length - length)
+                {
+                    throw new ArgumentException(Resources.FormatArgument_InvalidOffsetLength(nameof(offset), nameof(length)));
+                }
+            }
+            
+            _parameterParser = default(MediaTypeParameterParser);
+
+            var typeLength = GetTypeLength(mediaType, offset, out var type);
+            if (typeLength == 0)
+            {
+                Type = new StringSegment();
+                SubType = new StringSegment();
+                SubTypeWithoutSuffix = new StringSegment();
+                SubTypeSuffix = new StringSegment();
+                return;
+            }
+            else
+            {
+                Type = type;
+            }
+
+            var subTypeLength = GetSubtypeLength(mediaType, offset + typeLength, out var subType);
+            if (subTypeLength == 0)
+            {
+                SubType = new StringSegment();
+                SubTypeWithoutSuffix = new StringSegment();
+                SubTypeSuffix = new StringSegment();
+                return;
+            }
+            else
+            {
+                SubType = subType;
+
+                if (TryGetSuffixLength(subType, out var subtypeSuffixLength))
+                {
+                    SubTypeWithoutSuffix = subType.Subsegment(0, subType.Length - subtypeSuffixLength - 1);
+                    SubTypeSuffix = subType.Subsegment(subType.Length - subtypeSuffixLength, subtypeSuffixLength);
+                }
+                else
+                {
+                    SubTypeWithoutSuffix = SubType;
+                    SubTypeSuffix = new StringSegment();
+                }
+            }
+
+            _parameterParser = new MediaTypeParameterParser(mediaType, offset + typeLength + subTypeLength, length);
+        }
+
+        // All GetXXXLength methods work in the same way. They expect to be on the right position for
+        // the token they are parsing, for example, the beginning of the media type or the delimiter
+        // from a previous token, like '/', ';' or '='.
+        // Each method consumes the delimiter token if any, the leading whitespace, then the given token
+        // itself, and finally the trailing whitespace.
+        private static int GetTypeLength(string input, int offset, out StringSegment type)
+        {
+            if (offset < 0 || offset >= input.Length)
+            {
+                type = default(StringSegment);
+                return 0;
+            }
+
+            var current = offset + HttpTokenParsingRules.GetWhitespaceLength(input, offset);
+
+            // Parse the type, i.e. <type> in media type string "<type>/<subtype>; param1=value1; param2=value2"
+            var typeLength = HttpTokenParsingRules.GetTokenLength(input, current);
+            if (typeLength == 0)
+            {
+                type = default(StringSegment);
+                return 0;
+            }
+
+            type = new StringSegment(input, current, typeLength);
+
+            current += typeLength;
+            current += HttpTokenParsingRules.GetWhitespaceLength(input, current);
+
+            return current - offset;
+        }
+
+        private static int GetSubtypeLength(string input, int offset, out StringSegment subType)
+        {
+            var current = offset;
+
+            // Parse the separator between type and subtype
+            if (current < 0 || current >= input.Length || input[current] != '/')
+            {
+                subType = default(StringSegment);
+                return 0;
+            }
+
+            current++; // skip delimiter.
+            current +=  HttpTokenParsingRules.GetWhitespaceLength(input, current);
+
+            var subtypeLength = HttpTokenParsingRules.GetTokenLength(input, current);
+            if (subtypeLength == 0)
+            {
+                subType = default(StringSegment);
+                return 0;
+            }
+
+            subType = new StringSegment(input, current, subtypeLength);
+
+            current +=  subtypeLength;
+            current +=  HttpTokenParsingRules.GetWhitespaceLength(input, current);
+
+            return current - offset;
+        }
+
+        private static bool TryGetSuffixLength(StringSegment subType, out int suffixLength)
+        {
+            // Find the last instance of '+', if there is one
+            var startPos = subType.Offset + subType.Length - 1;
+            for (var currentPos = startPos; currentPos >= subType.Offset; currentPos--)
+            {
+                if (subType.Buffer[currentPos] == '+')
+                {
+                    suffixLength = startPos - currentPos;
+                    return true;
+                }
+            }
+
+            suffixLength = 0;
+            return false;
+        }
+
+        /// <summary>
+        /// Gets the type of the <see cref="MediaType"/>.
+        /// </summary>
+        /// <example>
+        /// For the media type <c>"application/json"</c>, this property gives the value <c>"application"</c>.
+        /// </example>
+        public StringSegment Type { get; }
+
+        /// <summary>
+        /// Gets whether this <see cref="MediaType"/> matches all types.
+        /// </summary>
+        public bool MatchesAllTypes => Type.Equals("*", StringComparison.OrdinalIgnoreCase);
+
+        /// <summary>
+        /// Gets the subtype of the <see cref="MediaType"/>.
+        /// </summary>
+        /// <example>
+        /// For the media type <c>"application/vnd.example+json"</c>, this property gives the value
+        /// <c>"vnd.example+json"</c>.
+        /// </example>
+        public StringSegment SubType { get; }
+
+        /// <summary>
+        /// Gets the subtype of the <see cref="MediaType"/>, excluding any structured syntax suffix.
+        /// </summary>
+        /// <example>
+        /// For the media type <c>"application/vnd.example+json"</c>, this property gives the value
+        /// <c>"vnd.example"</c>.
+        /// </example>
+        public StringSegment SubTypeWithoutSuffix { get; }
+
+        /// <summary>
+        /// Gets the structured syntax suffix of the <see cref="MediaType"/> if it has one.
+        /// </summary>
+        /// <example>
+        /// For the media type <c>"application/vnd.example+json"</c>, this property gives the value
+        /// <c>"json"</c>.
+        /// </example>
+        public StringSegment SubTypeSuffix { get; }
+
+        /// <summary>
+        /// Gets whether this <see cref="MediaType"/> matches all subtypes.
+        /// </summary>
+        /// <example>
+        /// For the media type <c>"application/*"</c>, this property is <c>true</c>.
+        /// </example>
+        /// <example>
+        /// For the media type <c>"application/json"</c>, this property is <c>false</c>.
+        /// </example>
+        public bool MatchesAllSubTypes => SubType.Equals("*", StringComparison.OrdinalIgnoreCase);
+
+        /// <summary>
+        /// Gets whether this <see cref="MediaType"/> matches all subtypes, ignoring any structured syntax suffix.
+        /// </summary>
+        /// <example>
+        /// For the media type <c>"application/*+json"</c>, this property is <c>true</c>.
+        /// </example>
+        /// <example>
+        /// For the media type <c>"application/vnd.example+json"</c>, this property is <c>false</c>.
+        /// </example>
+        public bool MatchesAllSubTypesWithoutSuffix => SubTypeWithoutSuffix.Equals("*", StringComparison.OrdinalIgnoreCase);
+
+        /// <summary>
+        /// Gets the <see cref="System.Text.Encoding"/> of the <see cref="MediaType"/> if it has one.
+        /// </summary>
+        public Encoding Encoding => GetEncodingFromCharset(GetParameter("charset"));
+
+        /// <summary>
+        /// Gets the charset parameter of the <see cref="MediaType"/> if it has one.
+        /// </summary>
+        public StringSegment Charset => GetParameter("charset");
+
+        /// <summary>
+        /// Determines whether the current <see cref="MediaType"/> contains a wildcard.
+        /// </summary>
+        /// <returns>
+        /// <c>true</c> if this <see cref="MediaType"/> contains a wildcard; otherwise <c>false</c>.
+        /// </returns>
+        public bool HasWildcard
+        {
+            get
+            {
+                return MatchesAllTypes ||
+                    MatchesAllSubTypesWithoutSuffix ||
+                    GetParameter("*").Equals("*", StringComparison.OrdinalIgnoreCase);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the current <see cref="MediaType"/> is a subset of the <paramref name="set"/>
+        /// <see cref="MediaType"/>.
+        /// </summary>
+        /// <param name="set">The set <see cref="MediaType"/>.</param>
+        /// <returns>
+        /// <c>true</c> if this <see cref="MediaType"/> is a subset of <paramref name="set"/>; otherwise <c>false</c>.
+        /// </returns>
+        public bool IsSubsetOf(MediaType set)
+        {
+            return MatchesType(set) &&
+                MatchesSubtype(set) &&
+                ContainsAllParameters(set._parameterParser);
+        }
+
+        /// <summary>
+        /// Gets the parameter <paramref name="parameterName"/> of the media type.
+        /// </summary>
+        /// <param name="parameterName">The name of the parameter to retrieve.</param>
+        /// <returns>
+        /// The <see cref="StringSegment"/>for the given <paramref name="parameterName"/> if found; otherwise
+        /// <c>null</c>.
+        /// </returns>
+        public StringSegment GetParameter(string parameterName)
+        {
+            return GetParameter(new StringSegment(parameterName));
+        }
+
+        /// <summary>
+        /// Gets the parameter <paramref name="parameterName"/> of the media type.
+        /// </summary>
+        /// <param name="parameterName">The name of the parameter to retrieve.</param>
+        /// <returns>
+        /// The <see cref="StringSegment"/>for the given <paramref name="parameterName"/> if found; otherwise
+        /// <c>null</c>.
+        /// </returns>
+        public StringSegment GetParameter(StringSegment parameterName)
+        {
+            var parametersParser = _parameterParser;
+
+            while (parametersParser.ParseNextParameter(out var parameter))
+            {
+                if (parameter.HasName(parameterName))
+                {
+                    return parameter.Value;
+                }
+            }
+
+            return new StringSegment();
+        }
+
+        /// <summary>
+        /// Replaces the encoding of the given <paramref name="mediaType"/> with the provided
+        /// <paramref name="encoding"/>.
+        /// </summary>
+        /// <param name="mediaType">The media type whose encoding will be replaced.</param>
+        /// <param name="encoding">The encoding that will replace the encoding in the <paramref name="mediaType"/>.
+        /// </param>
+        /// <returns>A media type with the replaced encoding.</returns>
+        public static string ReplaceEncoding(string mediaType, Encoding encoding)
+        {
+            return ReplaceEncoding(new StringSegment(mediaType), encoding);
+        }
+
+        /// <summary>
+        /// Replaces the encoding of the given <paramref name="mediaType"/> with the provided
+        /// <paramref name="encoding"/>.
+        /// </summary>
+        /// <param name="mediaType">The media type whose encoding will be replaced.</param>
+        /// <param name="encoding">The encoding that will replace the encoding in the <paramref name="mediaType"/>.
+        /// </param>
+        /// <returns>A media type with the replaced encoding.</returns>
+        public static string ReplaceEncoding(StringSegment mediaType, Encoding encoding)
+        {
+            var parsedMediaType = new MediaType(mediaType);
+            var charset = parsedMediaType.GetParameter("charset");
+
+            if (charset.HasValue && charset.Equals(encoding.WebName, StringComparison.OrdinalIgnoreCase))
+            {
+                return mediaType.Value;
+            }
+
+            if (!charset.HasValue)
+            {
+                return CreateMediaTypeWithEncoding(mediaType, encoding);
+            }
+
+            var charsetOffset = charset.Offset - mediaType.Offset;
+            var restOffset = charsetOffset + charset.Length;
+            var restLength = mediaType.Length - restOffset;
+            var finalLength = charsetOffset + encoding.WebName.Length + restLength;
+
+            var builder = new StringBuilder(mediaType.Buffer, mediaType.Offset, charsetOffset, finalLength);
+            builder.Append(encoding.WebName);
+            builder.Append(mediaType.Buffer, restOffset, restLength);
+
+            return builder.ToString();
+        }
+
+        public static Encoding GetEncoding(string mediaType)
+        {
+            return GetEncoding(new StringSegment(mediaType));
+        }
+
+        public static Encoding GetEncoding(StringSegment mediaType)
+        {
+            var parsedMediaType = new MediaType(mediaType);
+            return parsedMediaType.Encoding;
+        }
+
+        /// <summary>
+        /// Creates an <see cref="MediaTypeSegmentWithQuality"/> containing the media type in <paramref name="mediaType"/>
+        /// and its associated quality.
+        /// </summary>
+        /// <param name="mediaType">The media type to parse.</param>
+        /// <param name="start">The position at which the parsing starts.</param>
+        /// <returns>The parsed media type with its associated quality.</returns>
+        public static MediaTypeSegmentWithQuality CreateMediaTypeSegmentWithQuality(string mediaType, int start)
+        {
+            var parsedMediaType = new MediaType(mediaType, start, length: null);
+
+            // Short-circuit use of the MediaTypeParameterParser if constructor detected an invalid type or subtype.
+            // Parser would set ParsingFailed==true in this case. But, we handle invalid parameters as a separate case.
+            if (parsedMediaType.Type.Equals(default(StringSegment)) ||
+                parsedMediaType.SubType.Equals(default(StringSegment)))
+            {
+                return default(MediaTypeSegmentWithQuality);
+            }
+
+            var parser = parsedMediaType._parameterParser;
+
+            var quality = 1.0d;
+            while (parser.ParseNextParameter(out var parameter))
+            {
+                if (parameter.HasName(QualityParameter))
+                {
+                    // If media type contains two `q` values i.e. it's invalid in an uncommon way, pick last value.
+                    quality = double.Parse(
+                        parameter.Value.Value, NumberStyles.AllowDecimalPoint,
+                        NumberFormatInfo.InvariantInfo);
+                }
+            }
+
+            // We check if the parsed media type has a value at this stage when we have iterated
+            // over all the parameters and we know if the parsing was successful.
+            if (parser.ParsingFailed)
+            {
+                return default(MediaTypeSegmentWithQuality);
+            }
+
+            return new MediaTypeSegmentWithQuality(
+                new StringSegment(mediaType, start, parser.CurrentOffset - start),
+                quality);
+        }
+
+        private static Encoding GetEncodingFromCharset(StringSegment charset)
+        {
+            if (charset.Equals("utf-8", StringComparison.OrdinalIgnoreCase))
+            {
+                // This is an optimization for utf-8 that prevents the Substring caused by
+                // charset.Value
+                return Encoding.UTF8;
+            }
+
+            try
+            {
+                // charset.Value might be an invalid encoding name as in charset=invalid.
+                // For that reason, we catch the exception thrown by Encoding.GetEncoding
+                // and return null instead.
+                return charset.HasValue ? Encoding.GetEncoding(charset.Value) : null;
+            }
+            catch (Exception)
+            {
+                return null;
+            }
+        }
+
+        private static string CreateMediaTypeWithEncoding(StringSegment mediaType, Encoding encoding)
+        {
+            return $"{mediaType.Value}; charset={encoding.WebName}";
+        }
+
+        private bool MatchesType(MediaType set)
+        {
+            return set.MatchesAllTypes ||
+                set.Type.Equals(Type, StringComparison.OrdinalIgnoreCase);
+        }
+
+        private bool MatchesSubtype(MediaType set)
+        {
+            if (set.MatchesAllSubTypes)
+            {
+                return true;
+            }
+
+            if (set.SubTypeSuffix.HasValue)
+            {
+                if (SubTypeSuffix.HasValue)
+                {
+                    // Both the set and the media type being checked have suffixes, so both parts must match.
+                    return MatchesSubtypeWithoutSuffix(set) && MatchesSubtypeSuffix(set);
+                }
+                else
+                {
+                    // The set has a suffix, but the media type being checked doesn't. We never consider this to match.
+                    return false;
+                }
+            }
+            else
+            {
+                // The set has no suffix, so we're just looking for an exact match (which means that if 'this'
+                // has a suffix, it won't match).
+                return set.SubType.Equals(SubType, StringComparison.OrdinalIgnoreCase);
+            }
+        }
+
+        private bool MatchesSubtypeWithoutSuffix(MediaType set)
+        {
+            return set.MatchesAllSubTypesWithoutSuffix ||
+                set.SubTypeWithoutSuffix.Equals(SubTypeWithoutSuffix, StringComparison.OrdinalIgnoreCase);
+        }
+
+        private bool MatchesSubtypeSuffix(MediaType set)
+        {
+            // We don't have support for wildcards on suffixes alone (e.g., "application/entity+*")
+            // because there's no clear use case for it.
+            return set.SubTypeSuffix.Equals(SubTypeSuffix, StringComparison.OrdinalIgnoreCase);
+        }
+
+        private bool ContainsAllParameters(MediaTypeParameterParser setParameters)
+        {
+            var parameterFound = true;
+            while (setParameters.ParseNextParameter(out var setParameter) && parameterFound)
+            {
+                if (setParameter.HasName("q"))
+                {
+                    // "q" and later parameters are not involved in media type matching. Quoting the RFC: The first
+                    // "q" parameter (if any) separates the media-range parameter(s) from the accept-params.
+                    break;
+                }
+
+                if (setParameter.HasName("*"))
+                {
+                    // A parameter named "*" has no effect on media type matching, as it is only used as an indication
+                    // that the entire media type string should be treated as a wildcard.
+                    continue;
+                }
+
+                // Copy the parser as we need to iterate multiple times over it.
+                // We can do this because it's a struct
+                var subSetParameters = _parameterParser;
+                parameterFound = false;
+                while (subSetParameters.ParseNextParameter(out var subSetParameter) && !parameterFound)
+                {
+                    parameterFound = subSetParameter.Equals(setParameter);
+                }
+            }
+
+            return parameterFound;
+        }
+
+        private struct MediaTypeParameterParser
+        {
+            private readonly string _mediaTypeBuffer;
+            private readonly int? _length;
+
+            public MediaTypeParameterParser(string mediaTypeBuffer, int offset, int? length)
+            {
+                _mediaTypeBuffer = mediaTypeBuffer;
+                _length = length;
+                CurrentOffset = offset;
+                ParsingFailed = false;
+            }
+
+            public int CurrentOffset { get; private set; }
+
+            public bool ParsingFailed { get; private set; }
+
+            public bool ParseNextParameter(out MediaTypeParameter result)
+            {
+                if (_mediaTypeBuffer == null)
+                {
+                    ParsingFailed = true;
+                    result = default(MediaTypeParameter);
+                    return false;
+                }
+
+                var parameterLength = GetParameterLength(_mediaTypeBuffer, CurrentOffset, out result);
+                CurrentOffset +=  parameterLength;
+
+                if (parameterLength == 0)
+                {
+                    ParsingFailed = _length != null && CurrentOffset < _length;
+                    return false;
+                }
+
+                return true;
+            }
+
+            private static int GetParameterLength(string input, int startIndex, out MediaTypeParameter parsedValue)
+            {
+                if (OffsetIsOutOfRange(startIndex, input.Length) || input[startIndex] != ';')
+                {
+                    parsedValue = default(MediaTypeParameter);
+                    return 0;
+                }
+
+                var nameLength = GetNameLength(input, startIndex, out var name);
+
+                var current = startIndex + nameLength;
+
+                if (nameLength == 0 || OffsetIsOutOfRange(current, input.Length) || input[current] != '=')
+                {
+                    if (current == input.Length && name.Equals("*", StringComparison.OrdinalIgnoreCase))
+                    {
+                        // As a special case, we allow a trailing ";*" to indicate a wildcard
+                        // string allowing any other parameters. It's the same as ";*=*".
+                        var asterisk = new StringSegment("*");
+                        parsedValue = new MediaTypeParameter(asterisk, asterisk);
+                        return current - startIndex;
+                    }
+                    else
+                    {
+                        parsedValue = default(MediaTypeParameter);
+                        return 0;
+                    }
+                }
+
+                var valueLength = GetValueLength(input, current, out var value);
+
+                parsedValue = new MediaTypeParameter(name, value);
+                current +=  valueLength;
+
+                return current - startIndex;
+            }
+
+            private static int GetNameLength(string input, int startIndex, out StringSegment name)
+            {
+                var current = startIndex;
+
+                current++; // skip ';'
+                current +=  HttpTokenParsingRules.GetWhitespaceLength(input, current);
+
+                var nameLength = HttpTokenParsingRules.GetTokenLength(input, current);
+                if (nameLength == 0)
+                {
+                    name = default(StringSegment);
+                    return 0;
+                }
+
+                name = new StringSegment(input, current, nameLength);
+
+                current +=  nameLength;
+                current +=  HttpTokenParsingRules.GetWhitespaceLength(input, current);
+
+                return current - startIndex;
+            }
+
+            private static int GetValueLength(string input, int startIndex, out StringSegment value)
+            {
+                var current = startIndex;
+
+                current++; // skip '='.
+                current +=  HttpTokenParsingRules.GetWhitespaceLength(input, current);
+
+                var valueLength = HttpTokenParsingRules.GetTokenLength(input, current);
+
+                if (valueLength == 0)
+                {
+                    // A value can either be a token or a quoted string. Check if it is a quoted string.
+                    var result = HttpTokenParsingRules.GetQuotedStringLength(input, current, out valueLength);
+                    if (result != HttpParseResult.Parsed)
+                    {
+                        // We have an invalid value. Reset the name and return.
+                        value = default(StringSegment);
+                        return 0;
+                    }
+
+                    // Quotation marks are not part of a quoted parameter value.
+                    value = new StringSegment(input, current + 1, valueLength - 2);
+                }
+                else
+                {
+                    value = new StringSegment(input, current, valueLength);
+                }
+
+                current +=  valueLength;
+                current +=  HttpTokenParsingRules.GetWhitespaceLength(input, current);
+
+                return current - startIndex;
+            }
+
+            private static bool OffsetIsOutOfRange(int offset, int length)
+            {
+                return offset < 0 || offset >= length;
+            }
+        }
+
+        private struct MediaTypeParameter : IEquatable<MediaTypeParameter>
+        {
+            public MediaTypeParameter(StringSegment name, StringSegment value)
+            {
+                Name = name;
+                Value = value;
+            }
+
+            public StringSegment Name { get; }
+
+            public StringSegment Value { get; }
+
+            public bool HasName(string name)
+            {
+                return HasName(new StringSegment(name));
+            }
+
+            public bool HasName(StringSegment name)
+            {
+                return Name.Equals(name, StringComparison.OrdinalIgnoreCase);
+            }
+
+            public bool Equals(MediaTypeParameter other)
+            {
+                return HasName(other.Name) && Value.Equals(other.Value, StringComparison.OrdinalIgnoreCase);
+            }
+
+            public override string ToString() => $"{Name}={Value}";
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaTypeCollection.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaTypeCollection.cs
new file mode 100644
index 0000000000..b5b52f3ebb
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaTypeCollection.cs
@@ -0,0 +1,66 @@
+// 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.
+
+using System;
+using System.Collections.ObjectModel;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// A collection of media types.
+    /// </summary>
+    public class MediaTypeCollection : Collection<string>
+    {
+        /// <summary>
+        /// Adds an object to the end of the <see cref="MediaTypeCollection"/>. 
+        /// </summary>
+        /// <param name="item">The media type to be added to the end of the <see cref="MediaTypeCollection"/>.</param>
+        public void Add(MediaTypeHeaderValue item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException(nameof(item));
+            }
+
+            Add(item.ToString());
+        }
+
+        /// <summary>
+        /// Inserts an element into the <see cref="MediaTypeCollection"/> at the specified index.
+        /// </summary>
+        /// <param name="index">The zero-based index at which <paramref name="item"/> should be inserted.</param>
+        /// <param name="item">The media type to insert.</param>
+        public void Insert(int index, MediaTypeHeaderValue item)
+        {
+            if (index < 0 || index > Count)
+            {
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
+
+            if (item == null)
+            {
+                throw new ArgumentNullException(nameof(item));
+            }
+
+            Insert(index, item.ToString());
+        }
+
+        /// <summary>
+        /// Removes the first occurrence of a specific media type from the <see cref="MediaTypeCollection"/>.
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns><code>true</code> if <paramref name="item"/> is successfully removed; otherwise, <code>false</code>.
+        /// This method also returns <code>false</code> if <paramref name="item"/> was not found in the original 
+        /// <see cref="MediaTypeCollection"/>.</returns>
+        public bool Remove(MediaTypeHeaderValue item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException(nameof(item));
+            }
+
+            return Remove(item.ToString());
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/OutputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/OutputFormatter.cs
new file mode 100644
index 0000000000..fd0c37b972
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/OutputFormatter.cs
@@ -0,0 +1,196 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// Writes an object to the output stream.
+    /// </summary>
+    public abstract class OutputFormatter : IOutputFormatter, IApiResponseTypeMetadataProvider
+    {
+        /// <summary>
+        /// Gets the mutable collection of media type elements supported by
+        /// this <see cref="OutputFormatter"/>.
+        /// </summary>
+        public MediaTypeCollection SupportedMediaTypes { get; } = new MediaTypeCollection();
+
+        /// <summary>
+        /// Returns a value indicating whether or not the given type can be written by this serializer.
+        /// </summary>
+        /// <param name="type">The object type.</param>
+        /// <returns><c>true</c> if the type can be written, otherwise <c>false</c>.</returns>
+        protected virtual bool CanWriteType(Type type)
+        {
+            return true;
+        }
+
+        /// <inheritdoc />
+        public virtual IReadOnlyList<string> GetSupportedContentTypes(
+            string contentType,
+            Type objectType)
+        {
+            if (SupportedMediaTypes.Count == 0)
+            {
+                var message = Resources.FormatFormatter_NoMediaTypes(
+                    GetType().FullName,
+                    nameof(SupportedMediaTypes));
+
+                throw new InvalidOperationException(message);
+            }
+
+            if (!CanWriteType(objectType))
+            {
+                return null;
+            }
+            
+            List<string> mediaTypes = null;
+
+            var parsedContentType = contentType != null ? new MediaType(contentType) : default(MediaType);
+
+            foreach (var mediaType in SupportedMediaTypes)
+            {
+                var parsedMediaType = new MediaType(mediaType);
+                if (parsedMediaType.HasWildcard)
+                {
+                    // For supported media types that are wildcard patterns, confirm that the requested
+                    // media type satisfies the wildcard pattern (e.g., if "text/entity+json;v=2" requested
+                    // and formatter supports "text/*+json").
+                    // Treat contentType like it came from a [Produces] attribute.
+                    if (contentType != null && parsedContentType.IsSubsetOf(parsedMediaType))
+                    {
+                        if (mediaTypes == null)
+                        {
+                            mediaTypes = new List<string>();
+                        }
+
+                        mediaTypes.Add(contentType);
+                    }
+                }
+                else
+                {
+                    // Confirm this formatter supports a more specific media type than requested e.g. OK if "text/*"
+                    // requested and formatter supports "text/plain". Treat contentType like it came from an Accept header.
+                    if (contentType == null || parsedMediaType.IsSubsetOf(parsedContentType))
+                    {
+                        if (mediaTypes == null)
+                        {
+                            mediaTypes = new List<string>();
+                        }
+
+                        mediaTypes.Add(mediaType);
+                    }
+                }
+            }
+
+            return mediaTypes;
+        }
+
+        /// <inheritdoc />
+        public virtual bool CanWriteResult(OutputFormatterCanWriteContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (SupportedMediaTypes.Count == 0)
+            {
+                var message = Resources.FormatFormatter_NoMediaTypes(
+                    GetType().FullName,
+                    nameof(SupportedMediaTypes));
+
+                throw new InvalidOperationException(message);
+            }
+
+            if (!CanWriteType(context.ObjectType))
+            {
+                return false;
+            }
+
+            if (!context.ContentType.HasValue)
+            {
+                // If the desired content type is set to null, then the current formatter can write anything
+                // it wants.
+                context.ContentType = new StringSegment(SupportedMediaTypes[0]);
+                return true;
+            }
+            else
+            {
+                var parsedContentType = new MediaType(context.ContentType);
+                for (var i = 0; i < SupportedMediaTypes.Count; i++)
+                {
+                    var supportedMediaType = new MediaType(SupportedMediaTypes[i]);
+                    if (supportedMediaType.HasWildcard)
+                    {
+                        // For supported media types that are wildcard patterns, confirm that the requested
+                        // media type satisfies the wildcard pattern (e.g., if "text/entity+json;v=2" requested
+                        // and formatter supports "text/*+json").
+                        // We only do this when comparing against server-defined content types (e.g., those
+                        // from [Produces] or Response.ContentType), otherwise we'd potentially be reflecting
+                        // back arbitrary Accept header values.
+                        if (context.ContentTypeIsServerDefined
+                            && parsedContentType.IsSubsetOf(supportedMediaType))
+                        {
+                            return true;
+                        }
+                    }
+                    else
+                    {
+                        // For supported media types that are not wildcard patterns, confirm that this formatter
+                        // supports a more specific media type than requested e.g. OK if "text/*" requested and
+                        // formatter supports "text/plain".
+                        // contentType is typically what we got in an Accept header.
+                        if (supportedMediaType.IsSubsetOf(parsedContentType))
+                        {
+                            context.ContentType = new StringSegment(SupportedMediaTypes[i]);
+                            return true;
+                        }
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        /// <inheritdoc />
+        public virtual Task WriteAsync(OutputFormatterWriteContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            WriteResponseHeaders(context);
+            return WriteResponseBodyAsync(context);
+        }
+
+        /// <summary>
+        /// Sets the headers on <see cref="Microsoft.AspNetCore.Http.HttpResponse"/> object.
+        /// </summary>
+        /// <param name="context">The formatter context associated with the call.</param>
+        public virtual void WriteResponseHeaders(OutputFormatterWriteContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var response = context.HttpContext.Response;
+            response.ContentType = context.ContentType.Value;
+        }
+
+        /// <summary>
+        /// Writes the response body.
+        /// </summary>
+        /// <param name="context">The formatter context associated with the call.</param>
+        /// <returns>A task which can write the response body.</returns>
+        public abstract Task WriteResponseBodyAsync(OutputFormatterWriteContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/StreamOutputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/StreamOutputFormatter.cs
new file mode 100644
index 0000000000..a1a748a0f7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/StreamOutputFormatter.cs
@@ -0,0 +1,53 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// Always copies the stream to the response, regardless of requested content type.
+    /// </summary>
+    public class StreamOutputFormatter : IOutputFormatter
+    {
+        /// <inheritdoc />
+        public bool CanWriteResult(OutputFormatterCanWriteContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            // Ignore the passed in content type, if the object is a Stream.
+            if (context.Object is Stream)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <inheritdoc />
+        public async Task WriteAsync(OutputFormatterWriteContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            using (var valueAsStream = ((Stream)context.Object))
+            {
+                var response = context.HttpContext.Response;
+
+                if (context.ContentType != null)
+                {
+                    response.ContentType = context.ContentType.ToString();
+                }
+
+                await valueAsStream.CopyToAsync(response.Body);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/StringOutputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/StringOutputFormatter.cs
new file mode 100644
index 0000000000..52c387d137
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/StringOutputFormatter.cs
@@ -0,0 +1,61 @@
+// 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.
+
+using System;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// A <see cref="TextOutputFormatter"/> for simple text content.
+    /// </summary>
+    public class StringOutputFormatter : TextOutputFormatter
+    {
+        public StringOutputFormatter()
+        {
+            SupportedEncodings.Add(Encoding.UTF8);
+            SupportedEncodings.Add(Encoding.Unicode);
+            SupportedMediaTypes.Add("text/plain");
+        }
+
+        public override bool CanWriteResult(OutputFormatterCanWriteContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (context.ObjectType == typeof(string) || context.Object is string)
+            {
+                // Call into base to check if the current request's content type is a supported media type.
+                return base.CanWriteResult(context);
+            }
+
+            return false;
+        }
+
+        public override Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding encoding)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (encoding == null)
+            {
+                throw new ArgumentNullException(nameof(encoding));
+            }
+
+            var valueAsString = (string)context.Object;
+            if (string.IsNullOrEmpty(valueAsString))
+            {
+                return Task.CompletedTask;
+            }
+
+            var response = context.HttpContext.Response;
+            return response.WriteAsync(valueAsString, encoding);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/TextInputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/TextInputFormatter.cs
new file mode 100644
index 0000000000..cf104bacbc
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/TextInputFormatter.cs
@@ -0,0 +1,131 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// Reads an object from a request body with a text format.
+    /// </summary>
+    public abstract class TextInputFormatter : InputFormatter
+    {
+        /// <summary>
+        /// Returns UTF8 Encoding without BOM and throws on invalid bytes.
+        /// </summary>
+        protected static readonly Encoding UTF8EncodingWithoutBOM
+            = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false, throwOnInvalidBytes: true);
+
+        /// <summary>
+        /// Returns UTF16 Encoding which uses littleEndian byte order with BOM and throws on invalid bytes.
+        /// </summary>
+        protected static readonly Encoding UTF16EncodingLittleEndian
+            = new UnicodeEncoding(bigEndian: false, byteOrderMark: true, throwOnInvalidBytes: true);
+
+        /// <summary>
+        /// Gets the mutable collection of character encodings supported by
+        /// this <see cref="TextInputFormatter"/>. The encodings are
+        /// used when reading the data.
+        /// </summary>
+        public IList<Encoding> SupportedEncodings { get; } = new List<Encoding>();
+
+        /// <inheritdoc />
+        public override Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var selectedEncoding = SelectCharacterEncoding(context);
+            if (selectedEncoding == null)
+            {
+                var message = Resources.FormatUnsupportedContentType(
+                    context.HttpContext.Request.ContentType);
+
+                var exception = new UnsupportedContentTypeException(message);
+                context.ModelState.AddModelError(context.ModelName, exception, context.Metadata);
+
+                return InputFormatterResult.FailureAsync();
+            }
+
+            return ReadRequestBodyAsync(context, selectedEncoding);
+        }
+
+        /// <summary>
+        /// Reads an object from the request body.
+        /// </summary>
+        /// <param name="context">The <see cref="InputFormatterContext"/>.</param>
+        /// <param name="encoding">The <see cref="Encoding"/> used to read the request body.</param>
+        /// <returns>A <see cref="Task"/> that on completion deserializes the request body.</returns>
+        public abstract Task<InputFormatterResult> ReadRequestBodyAsync(
+            InputFormatterContext context,
+            Encoding encoding);
+
+        /// <summary>
+        /// Returns an <see cref="Encoding"/> based on <paramref name="context"/>'s
+        /// character set.
+        /// </summary>
+        /// <param name="context">The <see cref="InputFormatterContext"/>.</param>
+        /// <returns>
+        /// An <see cref="Encoding"/> based on <paramref name="context"/>'s
+        /// character set. <c>null</c> if no supported encoding was found.
+        /// </returns>
+        protected Encoding SelectCharacterEncoding(InputFormatterContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (SupportedEncodings.Count == 0)
+            {
+                var message = Resources.FormatTextInputFormatter_SupportedEncodingsMustNotBeEmpty(
+                    nameof(SupportedEncodings));
+                throw new InvalidOperationException(message);
+            }
+
+            var requestContentType = context.HttpContext.Request.ContentType;
+            var requestMediaType = requestContentType == null ? default(MediaType) : new MediaType(requestContentType);
+            if (requestMediaType.Charset.HasValue)
+            {
+                // Create Encoding based on requestMediaType.Charset to support charset aliases and custom Encoding
+                // providers. Charset -> Encoding -> encoding.WebName chain canonicalizes the charset name.
+                var requestEncoding = requestMediaType.Encoding;
+                if (requestEncoding != null)
+                {
+                    for (int i = 0; i < SupportedEncodings.Count; i++)
+                    {
+                        if (string.Equals(
+                            requestEncoding.WebName,
+                            SupportedEncodings[i].WebName,
+                            StringComparison.OrdinalIgnoreCase))
+                        {
+                            return SupportedEncodings[i];
+                        }
+                    }
+                }
+
+                // The client specified an encoding in the content type header of the request
+                // but we don't understand it. In this situation we don't try to pick any other encoding
+                // from the list of supported encodings and read the body with that encoding.
+                // Instead, we return null and that will translate later on into a 415 Unsupported Media Type
+                // response.
+                return null;
+            }
+
+            // We want to do our best effort to read the body of the request even in the
+            // cases where the client doesn't send a content type header or sends a content
+            // type header without encoding. For that reason we pick the first encoding of the
+            // list of supported encodings and try to use that to read the body. This encoding
+            // is UTF-8 by default in our formatters, which generally is a safe choice for the
+            // encoding.
+            return SupportedEncodings[0];
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/TextOutputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/TextOutputFormatter.cs
new file mode 100644
index 0000000000..c30901da00
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/TextOutputFormatter.cs
@@ -0,0 +1,268 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.Extensions.Primitives;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// Writes an object in a given text format to the output stream.
+    /// </summary>
+    public abstract class TextOutputFormatter : OutputFormatter
+    {
+        private IDictionary<string, string> _outputMediaTypeCache;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TextOutputFormatter"/> class.
+        /// </summary>
+        protected TextOutputFormatter()
+        {
+            SupportedEncodings = new List<Encoding>();
+        }
+
+        /// <summary>
+        /// Gets the mutable collection of character encodings supported by
+        /// this <see cref="TextOutputFormatter"/>. The encodings are
+        /// used when writing the data.
+        /// </summary>
+        public IList<Encoding> SupportedEncodings { get; }
+
+        private IDictionary<string, string> OutputMediaTypeCache
+        {
+            get
+            {
+                if (_outputMediaTypeCache == null)
+                {
+                    var cache = new Dictionary<string, string>();
+                    foreach (var mediaType in SupportedMediaTypes)
+                    {
+                        cache.Add(mediaType, MediaType.ReplaceEncoding(mediaType, Encoding.UTF8));
+                    }
+
+                    // Safe race condition, worst case scenario we initialize the field multiple times with dictionaries containing
+                    // the same values.
+                    _outputMediaTypeCache = cache;
+                }
+
+                return _outputMediaTypeCache;
+            }
+        }
+
+        /// <summary>
+        /// Determines the best <see cref="Encoding"/> amongst the supported encodings
+        /// for reading or writing an HTTP entity body based on the provided content type.
+        /// </summary>
+        /// <param name="context">The formatter context associated with the call.
+        /// </param>
+        /// <returns>The <see cref="Encoding"/> to use when reading the request or writing the response.</returns>
+        public virtual Encoding SelectCharacterEncoding(OutputFormatterWriteContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (SupportedEncodings.Count == 0)
+            {
+                var message = Resources.FormatTextOutputFormatter_SupportedEncodingsMustNotBeEmpty(
+                    nameof(SupportedEncodings));
+                throw new InvalidOperationException(message);
+            }
+
+            var acceptCharsetHeaderValues = GetAcceptCharsetHeaderValues(context);
+            var encoding = MatchAcceptCharacterEncoding(acceptCharsetHeaderValues);
+            if (encoding != null)
+            {
+                return encoding;
+            }
+
+            if (context.ContentType.HasValue)
+            {
+                var parsedContentType = new MediaType(context.ContentType);
+                var contentTypeCharset = parsedContentType.Charset;
+                if (contentTypeCharset.HasValue)
+                {
+                    for (var i = 0; i < SupportedEncodings.Count; i++)
+                    {
+                        var supportedEncoding = SupportedEncodings[i];
+                        if (contentTypeCharset.Equals(supportedEncoding.WebName, StringComparison.OrdinalIgnoreCase))
+                        {
+                            // This is supported.
+                            return SupportedEncodings[i];
+                        }
+                    }
+                }
+            }
+
+            return SupportedEncodings[0];
+        }
+
+        /// <inheritdoc />
+        public override Task WriteAsync(OutputFormatterWriteContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var selectedMediaType = context.ContentType;
+            if (!selectedMediaType.HasValue)
+            {
+                // If content type is not set then set it based on supported media types.
+                if (SupportedEncodings.Count > 0)
+                {
+                    selectedMediaType = new StringSegment(SupportedMediaTypes[0]);
+                }
+                else
+                {
+                    throw new InvalidOperationException(Resources.FormatOutputFormatterNoMediaType(GetType().FullName));
+                }
+            }
+
+            var selectedEncoding = SelectCharacterEncoding(context);
+            if (selectedEncoding != null)
+            {
+                // Override the content type value even if one already existed.
+                var mediaTypeWithCharset = GetMediaTypeWithCharset(selectedMediaType.Value, selectedEncoding);
+                selectedMediaType = new StringSegment(mediaTypeWithCharset);
+            }
+            else
+            {
+                var response = context.HttpContext.Response;
+                response.StatusCode = StatusCodes.Status406NotAcceptable;
+                return Task.CompletedTask;
+            }
+
+            context.ContentType = selectedMediaType;
+
+            WriteResponseHeaders(context);
+            return WriteResponseBodyAsync(context, selectedEncoding);
+        }
+
+        /// <inheritdoc />
+        public sealed override Task WriteResponseBodyAsync(OutputFormatterWriteContext context)
+        {
+            var message = Resources.FormatTextOutputFormatter_WriteResponseBodyAsyncNotSupported(
+                $"{nameof(WriteResponseBodyAsync)}({nameof(OutputFormatterWriteContext)})",
+                nameof(TextOutputFormatter),
+                $"{nameof(WriteResponseBodyAsync)}({nameof(OutputFormatterWriteContext)},{nameof(Encoding)})");
+
+            throw new InvalidOperationException(message);
+        }
+
+        /// <summary>
+        /// Writes the response body.
+        /// </summary>
+        /// <param name="context">The formatter context associated with the call.</param>
+        /// <param name="selectedEncoding">The <see cref="Encoding"/> that should be used to write the response.</param>
+        /// <returns>A task which can write the response body.</returns>
+        public abstract Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding);
+
+        internal static IList<StringWithQualityHeaderValue> GetAcceptCharsetHeaderValues(OutputFormatterWriteContext context)
+        {
+            var request = context.HttpContext.Request;
+            if (StringWithQualityHeaderValue.TryParseList(request.Headers[HeaderNames.AcceptCharset], out IList<StringWithQualityHeaderValue> result))
+            {
+                return result;
+            }
+
+            return Array.Empty<StringWithQualityHeaderValue>();
+        }
+
+        private string GetMediaTypeWithCharset(string mediaType, Encoding encoding)
+        {
+            if (string.Equals(encoding.WebName, Encoding.UTF8.WebName, StringComparison.OrdinalIgnoreCase) &&
+                OutputMediaTypeCache.ContainsKey(mediaType))
+            {
+                return OutputMediaTypeCache[mediaType];
+            }
+
+            return MediaType.ReplaceEncoding(mediaType, encoding);
+        }
+
+        private Encoding MatchAcceptCharacterEncoding(IList<StringWithQualityHeaderValue> acceptCharsetHeaders)
+        {
+            if (acceptCharsetHeaders != null && acceptCharsetHeaders.Count > 0)
+            {
+                var acceptValues = Sort(acceptCharsetHeaders);
+                for (var i = 0; i < acceptValues.Count; i++)
+                {
+                    var charset = acceptValues[i].Value;
+                    if (!StringSegment.IsNullOrEmpty(charset))
+                    {
+                        for (var j = 0; j < SupportedEncodings.Count; j++)
+                        {
+                            var encoding = SupportedEncodings[j];
+                            if (charset.Equals(encoding.WebName, StringComparison.OrdinalIgnoreCase) ||
+                                charset.Equals("*", StringComparison.Ordinal))
+                            {
+                                return encoding;
+                            }
+                        }
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        // There's no allocation-free way to sort an IList and we may have to filter anyway,
+        // so we're going to have to live with the copy + insertion sort.
+        private IList<StringWithQualityHeaderValue> Sort(IList<StringWithQualityHeaderValue> values)
+        {
+            var sortNeeded = false;
+
+            for (var i = 0; i < values.Count; i++)
+            {
+                var value = values[i];
+                if (value.Quality == HeaderQuality.NoMatch)
+                {
+                    // Exclude this one
+                }
+                else if (value.Quality != null)
+                {
+                    sortNeeded = true;
+                }
+            }
+
+            if (!sortNeeded)
+            {
+                return values;
+            }
+
+            var sorted = new List<StringWithQualityHeaderValue>();
+            for (var i = 0; i < values.Count; i++)
+            {
+                var value = values[i];
+                if (value.Quality == HeaderQuality.NoMatch)
+                {
+                    // Exclude this one
+                }
+                else
+                {
+                    // Doing an insertion sort.
+                    var position = sorted.BinarySearch(value, StringWithQualityHeaderValueComparer.QualityComparer);
+                    if (position >= 0)
+                    {
+                        sorted.Insert(position + 1, value);
+                    }
+                    else
+                    {
+                        sorted.Insert(~position, value);
+                    }
+                }
+            }
+
+            // We want a descending sort, but BinarySearch does ascending
+            sorted.Reverse();
+            return sorted;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromBodyAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromBodyAttribute.cs
new file mode 100644
index 0000000000..157d1cdd3d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromBodyAttribute.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Specifies that a parameter or property should be bound using the request body.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
+    public class FromBodyAttribute : Attribute, IBindingSourceMetadata
+    {
+        /// <inheritdoc />
+        public BindingSource BindingSource => BindingSource.Body;
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromFormAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromFormAttribute.cs
new file mode 100644
index 0000000000..a42774f17f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromFormAttribute.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Specifies that a parameter or property should be bound using form-data in the request body.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
+    public class FromFormAttribute : Attribute, IBindingSourceMetadata, IModelNameProvider
+    {
+        /// <inheritdoc />
+        public BindingSource BindingSource => BindingSource.Form;
+
+        /// <inheritdoc />
+        public string Name { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromHeaderAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromHeaderAttribute.cs
new file mode 100644
index 0000000000..46809454f1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromHeaderAttribute.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Specifies that a parameter or property should be bound using the request headers.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
+    public class FromHeaderAttribute : Attribute, IBindingSourceMetadata, IModelNameProvider
+    {
+        /// <inheritdoc />
+        public BindingSource BindingSource => BindingSource.Header;
+
+        /// <inheritdoc />
+        public string Name { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromQueryAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromQueryAttribute.cs
new file mode 100644
index 0000000000..df82f67bc3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromQueryAttribute.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Specifies that a parameter or property should be bound using the request query string.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
+    public class FromQueryAttribute : Attribute, IBindingSourceMetadata, IModelNameProvider
+    {
+        /// <inheritdoc />
+        public BindingSource BindingSource => BindingSource.Query;
+
+        /// <inheritdoc />
+        public string Name { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromRouteAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromRouteAttribute.cs
new file mode 100644
index 0000000000..94952e502f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromRouteAttribute.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Specifies that a parameter or property should be bound using route-data from the current request.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
+    public class FromRouteAttribute : Attribute, IBindingSourceMetadata, IModelNameProvider
+    {
+        /// <inheritdoc />
+        public BindingSource BindingSource => BindingSource.Path;
+
+        /// <inheritdoc />
+        public string Name { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromServicesAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromServicesAttribute.cs
new file mode 100644
index 0000000000..271ae181f2
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromServicesAttribute.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Specifies that an action parameter should be bound using the request services.
+    /// </summary>
+    /// <example>
+    /// In this example an implementation of IProductModelRequestService is registered as a service.
+    /// Then in the GetProduct action, the parameter is bound to an instance of IProductModelRequestService
+    /// which is resolved from the request services.
+    ///
+    /// <code>
+    /// [HttpGet]
+    /// public ProductModel GetProduct([FromServices] IProductModelRequestService productModelReqest)
+    /// {
+    ///     return productModelReqest.Value;
+    /// }
+    /// </code>
+    /// </example>
+    [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)]
+    public class FromServicesAttribute : Attribute, IBindingSourceMetadata
+    {
+        /// <inheritdoc />
+        public BindingSource BindingSource => BindingSource.Services;
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpDeleteAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpDeleteAttribute.cs
new file mode 100644
index 0000000000..b0bd31e3cc
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpDeleteAttribute.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Identifies an action that only supports the HTTP DELETE method.
+    /// </summary>
+    public class HttpDeleteAttribute : HttpMethodAttribute
+    {
+        private static readonly IEnumerable<string> _supportedMethods = new [] { "DELETE" };
+
+        /// <summary>
+        /// Creates a new <see cref="HttpDeleteAttribute"/>.
+        /// </summary>
+        public HttpDeleteAttribute()
+            : base(_supportedMethods)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="HttpDeleteAttribute"/> with the given route template.
+        /// </summary>
+        /// <param name="template">The route template. May not be null.</param>
+        public HttpDeleteAttribute(string template)
+            : base(_supportedMethods, template)
+        {
+            if (template == null)
+            {
+                throw new ArgumentNullException(nameof(template));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpGetAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpGetAttribute.cs
new file mode 100644
index 0000000000..1b8a9501ef
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpGetAttribute.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Identifies an action that only supports the HTTP GET method.
+    /// </summary>
+    public class HttpGetAttribute : HttpMethodAttribute
+    {
+        private static readonly IEnumerable<string> _supportedMethods = new [] { "GET" };
+
+        /// <summary>
+        /// Creates a new <see cref="HttpGetAttribute"/>.
+        /// </summary>
+        public HttpGetAttribute()
+            : base(_supportedMethods)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="HttpGetAttribute"/> with the given route template.
+        /// </summary>
+        /// <param name="template">The route template. May not be null.</param>
+        public HttpGetAttribute(string template)
+            : base(_supportedMethods, template)
+        {
+            if (template == null)
+            {
+                throw new ArgumentNullException(nameof(template));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpHeadAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpHeadAttribute.cs
new file mode 100644
index 0000000000..43e6c903e6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpHeadAttribute.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Identifies an action that only supports the HTTP HEAD method.
+    /// </summary>
+    public class HttpHeadAttribute : HttpMethodAttribute
+    {
+        private static readonly IEnumerable<string> _supportedMethods = new [] { "HEAD" };
+
+        /// <summary>
+        /// Creates a new <see cref="HttpHeadAttribute"/>.
+        /// </summary>
+        public HttpHeadAttribute()
+            : base(_supportedMethods)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="HttpHeadAttribute"/> with the given route template.
+        /// </summary>
+        /// <param name="template">The route template. May not be null.</param>
+        public HttpHeadAttribute(string template)
+            : base(_supportedMethods, template)
+        {
+            if (template == null)
+            {
+                throw new ArgumentNullException(nameof(template));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpOptionsAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpOptionsAttribute.cs
new file mode 100644
index 0000000000..da08f04497
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpOptionsAttribute.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Identifies an action that only supports the HTTP OPTIONS method.
+    /// </summary>
+    public class HttpOptionsAttribute : HttpMethodAttribute
+    {
+        private static readonly IEnumerable<string> _supportedMethods = new [] { "OPTIONS" };
+
+        /// <summary>
+        /// Creates a new <see cref="HttpOptionsAttribute"/>.
+        /// </summary>
+        public HttpOptionsAttribute()
+            : base(_supportedMethods)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="HttpOptionsAttribute"/> with the given route template.
+        /// </summary>
+        /// <param name="template">The route template. May not be null.</param>
+        public HttpOptionsAttribute(string template)
+            : base(_supportedMethods, template)
+        {
+            if (template == null)
+            {
+                throw new ArgumentNullException(nameof(template));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpPatchAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpPatchAttribute.cs
new file mode 100644
index 0000000000..4d7e01d829
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpPatchAttribute.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Identifies an action that only supports the HTTP PATCH method.
+    /// </summary>
+    public class HttpPatchAttribute : HttpMethodAttribute
+    {
+        private static readonly IEnumerable<string> _supportedMethods = new [] { "PATCH" };
+
+        /// <summary>
+        /// Creates a new <see cref="HttpPatchAttribute"/>.
+        /// </summary>
+        public HttpPatchAttribute()
+            : base(_supportedMethods)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="HttpPatchAttribute"/> with the given route template.
+        /// </summary>
+        /// <param name="template">The route template. May not be null.</param>
+        public HttpPatchAttribute(string template)
+            : base(_supportedMethods, template)
+        {
+            if (template == null)
+            {
+                throw new ArgumentNullException(nameof(template));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpPostAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpPostAttribute.cs
new file mode 100644
index 0000000000..cf9e12d5cc
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpPostAttribute.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Identifies an action that only supports the HTTP POST method.
+    /// </summary>
+    public class HttpPostAttribute : HttpMethodAttribute
+    {
+        private static readonly IEnumerable<string> _supportedMethods = new [] { "POST" };
+
+        /// <summary>
+        /// Creates a new <see cref="HttpPostAttribute"/>.
+        /// </summary>
+        public HttpPostAttribute()
+            : base(_supportedMethods)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="HttpPostAttribute"/> with the given route template.
+        /// </summary>
+        /// <param name="template">The route template. May not be null.</param>
+        public HttpPostAttribute(string template)
+            : base(_supportedMethods, template)
+        {
+            if (template == null)
+            {
+                throw new ArgumentNullException(nameof(template));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpPutAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpPutAttribute.cs
new file mode 100644
index 0000000000..09e28237d8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpPutAttribute.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Identifies an action that only supports the HTTP PUT method.
+    /// </summary>
+    public class HttpPutAttribute : HttpMethodAttribute
+    {
+        private static readonly IEnumerable<string> _supportedMethods = new [] { "PUT" };
+
+        /// <summary>
+        /// Creates a new <see cref="HttpPutAttribute"/>.
+        /// </summary>
+        public HttpPutAttribute()
+            : base(_supportedMethods)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="HttpPutAttribute"/> with the given route template.
+        /// </summary>
+        /// <param name="template">The route template. May not be null.</param>
+        public HttpPutAttribute(string template)
+            : base(_supportedMethods, template)
+        {
+            if (template == null)
+            {
+                throw new ArgumentNullException(nameof(template));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IDesignTimeMvcBuilderConfiguration.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IDesignTimeMvcBuilderConfiguration.cs
new file mode 100644
index 0000000000..312642b052
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IDesignTimeMvcBuilderConfiguration.cs
@@ -0,0 +1,20 @@
+// 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.
+
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Configures the <see cref="IMvcBuilder"/>. Implement this interface to enable design-time configuration
+    /// (for instance during pre-compilation of views) of <see cref="IMvcBuilder"/>.
+    /// </summary>
+    public interface IDesignTimeMvcBuilderConfiguration
+    {
+        /// <summary>
+        /// Configures the <see cref="IMvcBuilder"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        void ConfigureMvc(IMvcBuilder builder);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IRequestFormLimitsPolicy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IRequestFormLimitsPolicy.cs
new file mode 100644
index 0000000000..c55608d59d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IRequestFormLimitsPolicy.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A marker interface for filters which define a policy for limits on a request's body read as a form.
+    /// </summary>
+    public interface IRequestFormLimitsPolicy : IFilterMetadata
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IRequestSizePolicy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IRequestSizePolicy.cs
new file mode 100644
index 0000000000..6005da9b9b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IRequestSizePolicy.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A marker interface for filters which define a policy for maximum size for the request body.
+    /// </summary>
+    public interface IRequestSizePolicy : IFilterMetadata
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionContextAccessor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionContextAccessor.cs
new file mode 100644
index 0000000000..c12acdc36c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionContextAccessor.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using System.Threading;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    public class ActionContextAccessor : IActionContextAccessor
+    {
+        private static readonly AsyncLocal<ActionContext> _storage = new AsyncLocal<ActionContext>();
+
+        public ActionContext ActionContext
+        {
+            get { return _storage.Value; }
+            set { _storage.Value = value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionDescriptorCollection.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionDescriptorCollection.cs
new file mode 100644
index 0000000000..dc00290a5d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionDescriptorCollection.cs
@@ -0,0 +1,41 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    /// <summary>
+    /// A cached collection of <see cref="ActionDescriptor" />.
+    /// </summary>
+    public class ActionDescriptorCollection
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ActionDescriptorCollection"/>.
+        /// </summary>
+        /// <param name="items">The result of action discovery</param>
+        /// <param name="version">The unique version of discovered actions.</param>
+        public ActionDescriptorCollection(IReadOnlyList<ActionDescriptor> items, int version)
+        {
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+
+            Items = items;
+            Version = version;
+        }
+
+        /// <summary>
+        /// Returns the cached <see cref="IReadOnlyList{ActionDescriptor}"/>.
+        /// </summary>
+        public IReadOnlyList<ActionDescriptor> Items { get; }
+
+        /// <summary>
+        /// Returns the unique version of the currently cached items.
+        /// </summary>
+        public int Version { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/CompatibilitySwitch.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/CompatibilitySwitch.cs
new file mode 100644
index 0000000000..0c070ecbe4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/CompatibilitySwitch.cs
@@ -0,0 +1,129 @@
+// 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.
+
+using System;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    // Guide to making breaking behavior changes in MVC:
+    //
+    // Hello, if you're reading this, you're probably trying to make a change in behavior in MVC in a minor
+    // version. Every change in behavior is a breaking change to someone, even if a feature was buggy or
+    // broken in some scenarios.
+    //
+    // To help make things easier for current users, we don't automatically opt users into breaking changes when
+    // they upgrade applications to a new minor version of ASP.NET Core. It's a separate choice to opt in to new
+    // behaviors in a minor release.
+    //
+    // To make things better for future users, we also want to provide an easy way for applications to get
+    // access to the new behaviors. We make changes when they are improvements, and if we're changing something
+    // we've already shipped, it must add value for all of our users (eventually). To this end, new applications
+    // created using the template are always opted in to the 'current' version.
+    //
+    // This means that all changes in behavior should be opt-in.
+    //
+    // -----
+    //
+    // Moving on from general philosophy, here's how to implement a behavior change and corresponding
+    // compatibility switch.
+    //
+    // Add a new property on options that uses a CompatibilitySwitch<T> as a backing field. Make sure the
+    // new switch is exposed by implementing IEnumerable<ICompatibilitySwitch> on the options class. Pass the
+    // property name to the CompatibilitySwitch constructor using nameof.
+    //
+    // Choose a boolean value or a new enum type as the 'value' of the property.
+    //
+    // If the new property has a boolean value, it should be named something like `SuppressFoo`
+    // (if the new value deactivates some behavior) or like `AllowFoo` (if the new value enables some behavior).
+    // Choose a name so that the old behavior equates to 'false'.
+    //
+    // If it's an enum, make sure you initialize the compatibility switch using the
+    // CompatibilitySwitch(string, value) constructor to make it obvious the correct value is passed in. It's
+    // a good idea to equate the original behavior with the default enum value as well.
+    //
+    // Then create (or modify) a subclass of ConfigureCompatibilityOptions appropriate for your options type.
+    // Override the DefaultValues property and provide appropriate values based on the value of the Version
+    // property. If you just added this class, register it as an IPostConfigureOptions<TOptions> in DI.
+    //
+    /// <summary>
+    /// Infrastructure supporting the implementation of <see cref="CompatibilityVersion"/>. This is an
+    /// implementation of <see cref="ICompatibilitySwitch"/> suitable for use with the <see cref="IOptions{T}"/>
+    /// pattern. This is framework infrastructure and should not be used by application code.
+    /// </summary>
+    /// <typeparam name="TValue">The type of value associated with the compatibility switch.</typeparam>
+    public class CompatibilitySwitch<TValue> : ICompatibilitySwitch where TValue : struct
+    {
+        private TValue _value;
+
+        /// <summary>
+        /// Creates a new compatibility switch with the provided name.
+        /// </summary>
+        /// <param name="name">
+        /// The compatibility switch name. The name must match a property name on an options type.
+        /// </param>
+        public CompatibilitySwitch(string name)
+            : this(name, default)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new compatibility switch with the provided name and initial value.
+        /// </summary>
+        /// <param name="name">
+        /// The compatibility switch name. The name must match a property name on an options type.
+        /// </param>
+        /// <param name="initialValue">
+        /// The initial value to assign to the switch.
+        /// </param>
+        public CompatibilitySwitch(string name, TValue initialValue)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            Name = name;
+            _value = initialValue;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the <see cref="Value"/> property has been set.
+        /// </summary>
+        /// <remarks>
+        /// This is used by the compatibility infrastructure to determine whether the application developer
+        /// has set explicitly set the value associated with this switch.
+        /// </remarks>
+        public bool IsValueSet { get; private set; }
+
+        /// <summary>
+        /// Gets the name of the compatibility switch.
+        /// </summary>
+        public string Name { get; }
+
+        /// <summary>
+        /// Gets or set the value associated with the compatibility switch.
+        /// </summary>
+        /// <remarks>
+        /// Setting the switch value using <see cref="Value"/> will set <see cref="IsValueSet"/> to <c>true</c>.
+        /// As a consequence, the compatibility infrastructure will consider this switch explicitly configured by
+        /// the application developer, and will not apply a default value based on the compatibility version.
+        /// </remarks>
+        public TValue Value
+        {
+            get => _value;
+            set
+            {
+                IsValueSet = true;
+                _value = value;
+            }
+        }
+
+        // Called by the compatibility infrastructure to set a default value when IsValueSet is false.
+        object ICompatibilitySwitch.Value
+        {
+            get => Value;
+            set => Value = (TValue)value;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ConfigureCompatibilityOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ConfigureCompatibilityOptions.cs
new file mode 100644
index 0000000000..c46a3529d0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ConfigureCompatibilityOptions.cs
@@ -0,0 +1,105 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    /// <summary>
+    /// A base class for infrastructure that implements ASP.NET Core MVC's support for 
+    /// <see cref="CompatibilityVersion"/>. This is framework infrastructure and should not be used
+    /// by application code.
+    /// </summary>
+    /// <typeparam name="TOptions"></typeparam>
+    public abstract class ConfigureCompatibilityOptions<TOptions> : IPostConfigureOptions<TOptions>
+        where TOptions : class, IEnumerable<ICompatibilitySwitch>
+    {
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// Creates a new <see cref="ConfigureCompatibilityOptions{TOptions}"/>.
+        /// </summary>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        /// <param name="compatibilityOptions">The <see cref="IOptions{MvcCompatibilityOptions}"/>.</param>
+        protected ConfigureCompatibilityOptions(
+            ILoggerFactory loggerFactory,
+            IOptions<MvcCompatibilityOptions> compatibilityOptions)
+        {
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            Version = compatibilityOptions.Value.CompatibilityVersion;
+            _logger = loggerFactory.CreateLogger<TOptions>();
+        }
+
+        /// <summary>
+        /// Gets the default values of compatibility switches associated with the applications configured
+        /// <see cref="CompatibilityVersion"/>.
+        /// </summary>
+        protected abstract IReadOnlyDictionary<string, object> DefaultValues { get; }
+
+        /// <summary>
+        /// Gets the <see cref="CompatibilityVersion"/> configured for the application.
+        /// </summary>
+        protected CompatibilityVersion Version { get; }
+
+        /// <inheritdoc />
+        public virtual void PostConfigure(string name, TOptions options)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            // Evaluate DefaultValues onces so subclasses don't have to cache.
+            var defaultValues = DefaultValues;
+
+            foreach (var @switch in options)
+            {
+                ConfigureSwitch(@switch, defaultValues);
+            }
+        }
+
+        private void ConfigureSwitch(ICompatibilitySwitch @switch, IReadOnlyDictionary<string, object> defaultValues)
+        {
+            if (@switch.IsValueSet)
+            {
+                _logger.LogDebug(
+                    "Compatibility switch {SwitchName} in type {OptionsType} is using explicitly configured value {Value}",
+                    @switch.Name,
+                    typeof(TOptions).Name,
+                    @switch.Value);
+                return;
+            }
+
+            if (!defaultValues.TryGetValue(@switch.Name, out var value))
+            {
+                _logger.LogDebug(
+                    "Compatibility switch {SwitchName} in type {OptionsType} is using default value {Value}",
+                    @switch.Name,
+                    typeof(TOptions).Name,
+                    @switch.Value,
+                    Version);
+                return;
+            }
+
+            @switch.Value = value;
+            _logger.LogDebug(
+                "Compatibility switch {SwitchName} in type {OptionsType} is using compatibility value {Value} for version {Version}",
+                @switch.Name,
+                typeof(TOptions).Name,
+                @switch.Value,
+                Version);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ContentResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ContentResultExecutor.cs
new file mode 100644
index 0000000000..7a1f333b3a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ContentResultExecutor.cs
@@ -0,0 +1,74 @@
+// 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.
+
+using System;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    public class ContentResultExecutor : IActionResultExecutor<ContentResult>
+    {
+        private const string DefaultContentType = "text/plain; charset=utf-8";
+        private readonly ILogger<ContentResultExecutor> _logger;
+        private readonly IHttpResponseStreamWriterFactory _httpResponseStreamWriterFactory;
+
+        public ContentResultExecutor(ILogger<ContentResultExecutor> logger, IHttpResponseStreamWriterFactory httpResponseStreamWriterFactory)
+        {
+            _logger = logger;
+            _httpResponseStreamWriterFactory = httpResponseStreamWriterFactory;
+        }
+
+        /// <inheritdoc />
+        public virtual async Task ExecuteAsync(ActionContext context, ContentResult result)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            var response = context.HttpContext.Response;
+
+            string resolvedContentType;
+            Encoding resolvedContentTypeEncoding;
+            ResponseContentTypeHelper.ResolveContentTypeAndEncoding(
+                result.ContentType,
+                response.ContentType,
+                DefaultContentType,
+                out resolvedContentType,
+                out resolvedContentTypeEncoding);
+
+            response.ContentType = resolvedContentType;
+
+            if (result.StatusCode != null)
+            {
+                response.StatusCode = result.StatusCode.Value;
+            }
+
+            _logger.ContentResultExecuting(resolvedContentType);
+
+            if (result.Content != null)
+            {
+                response.ContentLength = resolvedContentTypeEncoding.GetByteCount(result.Content);
+
+                using (var textWriter = _httpResponseStreamWriterFactory.CreateWriter(response.Body, resolvedContentTypeEncoding))
+                {
+                    await textWriter.WriteAsync(result.Content);
+
+                    // Flushing the HttpResponseStreamWriter does not flush the underlying stream. This just flushes
+                    // the buffered text in the writer.
+                    // We do this rather than letting dispose handle it because dispose would call Write and we want
+                    // to call WriteAsync.
+                    await textWriter.FlushAsync();
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DefaultOutputFormatterSelector.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DefaultOutputFormatterSelector.cs
new file mode 100644
index 0000000000..61a62ec63f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DefaultOutputFormatterSelector.cs
@@ -0,0 +1,337 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Formatters.Internal;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    public class DefaultOutputFormatterSelector : OutputFormatterSelector
+    {
+        private static readonly Comparison<MediaTypeSegmentWithQuality> _sortFunction = (left, right) =>
+        {
+            return left.Quality > right.Quality ? -1 : (left.Quality == right.Quality ? 0 : 1);
+        };
+
+        private readonly ILogger _logger;
+        private readonly IList<IOutputFormatter> _formatters;
+        private readonly bool _respectBrowserAcceptHeader;
+        private readonly bool _returnHttpNotAcceptable;
+
+        public DefaultOutputFormatterSelector(IOptions<MvcOptions> options, ILoggerFactory loggerFactory)
+        {
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            _logger = loggerFactory.CreateLogger<DefaultOutputFormatterSelector>();
+
+            _formatters = new ReadOnlyCollection<IOutputFormatter>(options.Value.OutputFormatters);
+            _respectBrowserAcceptHeader = options.Value.RespectBrowserAcceptHeader;
+            _returnHttpNotAcceptable = options.Value.ReturnHttpNotAcceptable;
+        }
+
+        public override IOutputFormatter SelectFormatter(OutputFormatterCanWriteContext context, IList<IOutputFormatter> formatters, MediaTypeCollection contentTypes)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (formatters == null)
+            {
+                throw new ArgumentNullException(nameof(formatters));
+            }
+
+            if (contentTypes == null)
+            {
+                throw new ArgumentNullException(nameof(contentTypes));
+            }
+
+            ValidateContentTypes(contentTypes);
+
+            if (formatters.Count == 0)
+            {
+                formatters = _formatters;
+                if (formatters.Count == 0)
+                {
+                    throw new InvalidOperationException(Resources.FormatOutputFormattersAreRequired(
+                        typeof(MvcOptions).FullName,
+                        nameof(MvcOptions.OutputFormatters),
+                        typeof(IOutputFormatter).FullName));
+                }
+            }
+
+            _logger.RegisteredOutputFormatters(formatters);
+
+            var request = context.HttpContext.Request;
+            var acceptableMediaTypes = GetAcceptableMediaTypes(request);
+            var selectFormatterWithoutRegardingAcceptHeader = false;
+
+            IOutputFormatter selectedFormatter = null;
+            if (acceptableMediaTypes.Count == 0)
+            {
+                // There is either no Accept header value, or it contained */* and we
+                // are not currently respecting the 'browser accept header'.
+                _logger.NoAcceptForNegotiation();
+
+                selectFormatterWithoutRegardingAcceptHeader = true;
+            }
+            else
+            {
+                if (contentTypes.Count == 0)
+                {
+                    _logger.SelectingOutputFormatterUsingAcceptHeader(acceptableMediaTypes);
+
+                    // Use whatever formatter can meet the client's request
+                    selectedFormatter = SelectFormatterUsingSortedAcceptHeaders(
+                        context,
+                        formatters,
+                        acceptableMediaTypes);
+                }
+                else
+                {
+                    _logger.SelectingOutputFormatterUsingAcceptHeaderAndExplicitContentTypes(acceptableMediaTypes, contentTypes);
+
+                    // Verify that a content type from the context is compatible with the client's request
+                    selectedFormatter = SelectFormatterUsingSortedAcceptHeadersAndContentTypes(
+                        context,
+                        formatters,
+                        acceptableMediaTypes,
+                        contentTypes);
+                }
+
+                if (selectedFormatter == null)
+                {
+                    _logger.NoFormatterFromNegotiation(acceptableMediaTypes);
+
+                    if (!_returnHttpNotAcceptable)
+                    {
+                        selectFormatterWithoutRegardingAcceptHeader = true;
+                    }
+                }
+            }
+
+            if (selectFormatterWithoutRegardingAcceptHeader)
+            {
+                if (contentTypes.Count == 0)
+                {
+                    _logger.SelectingOutputFormatterWithoutUsingContentTypes();
+
+                    selectedFormatter = SelectFormatterNotUsingContentType(
+                        context,
+                        formatters);
+                }
+                else
+                {
+                    _logger.SelectingOutputFormatterUsingContentTypes(contentTypes);
+
+                    selectedFormatter = SelectFormatterUsingAnyAcceptableContentType(
+                        context,
+                        formatters,
+                        contentTypes);
+                }
+            }
+
+            if (selectedFormatter == null)
+            {
+                // No formatter supports this.
+                _logger.NoFormatter(context);
+                return null;
+            }
+
+            _logger.FormatterSelected(selectedFormatter, context);
+            return selectedFormatter;
+        }
+
+        private List<MediaTypeSegmentWithQuality> GetAcceptableMediaTypes(HttpRequest request)
+        {
+            var result = new List<MediaTypeSegmentWithQuality>();
+            AcceptHeaderParser.ParseAcceptHeader(request.Headers[HeaderNames.Accept], result);
+            for (var i = 0; i < result.Count; i++)
+            {
+                var mediaType = new MediaType(result[i].MediaType);
+                if (!_respectBrowserAcceptHeader && mediaType.MatchesAllSubTypes && mediaType.MatchesAllTypes)
+                {
+                    result.Clear();
+                    return result;
+                }
+            }
+
+            result.Sort(_sortFunction);
+
+            return result;
+        }
+
+        private IOutputFormatter SelectFormatterNotUsingContentType(
+            OutputFormatterCanWriteContext formatterContext,
+            IList<IOutputFormatter> formatters)
+        {
+            if (formatterContext == null)
+            {
+                throw new ArgumentNullException(nameof(formatterContext));
+            }
+
+            if (formatters == null)
+            {
+                throw new ArgumentNullException(nameof(formatters));
+            }
+
+            _logger.SelectFirstCanWriteFormatter();
+
+            foreach (var formatter in formatters)
+            {
+                formatterContext.ContentType = new StringSegment();
+                formatterContext.ContentTypeIsServerDefined = false;
+
+                if (formatter.CanWriteResult(formatterContext))
+                {
+                    return formatter;
+                }
+            }
+
+            return null;
+        }
+
+        private IOutputFormatter SelectFormatterUsingSortedAcceptHeaders(
+            OutputFormatterCanWriteContext formatterContext,
+            IList<IOutputFormatter> formatters,
+            IList<MediaTypeSegmentWithQuality> sortedAcceptHeaders)
+        {
+            if (formatterContext == null)
+            {
+                throw new ArgumentNullException(nameof(formatterContext));
+            }
+
+            if (formatters == null)
+            {
+                throw new ArgumentNullException(nameof(formatters));
+            }
+
+            if (sortedAcceptHeaders == null)
+            {
+                throw new ArgumentNullException(nameof(sortedAcceptHeaders));
+            }
+
+            for (var i = 0; i < sortedAcceptHeaders.Count; i++)
+            {
+                var mediaType = sortedAcceptHeaders[i];
+
+                formatterContext.ContentType = mediaType.MediaType;
+                formatterContext.ContentTypeIsServerDefined = false;
+
+                for (var j = 0; j < formatters.Count; j++)
+                {
+                    var formatter = formatters[j];
+                    if (formatter.CanWriteResult(formatterContext))
+                    {
+                        return formatter;
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private IOutputFormatter SelectFormatterUsingAnyAcceptableContentType(
+            OutputFormatterCanWriteContext formatterContext,
+            IList<IOutputFormatter> formatters,
+            MediaTypeCollection acceptableContentTypes)
+        {
+            if (formatterContext == null)
+            {
+                throw new ArgumentNullException(nameof(formatterContext));
+            }
+
+            if (formatters == null)
+            {
+                throw new ArgumentNullException(nameof(formatters));
+            }
+
+            if (acceptableContentTypes == null)
+            {
+                throw new ArgumentNullException(nameof(acceptableContentTypes));
+            }
+
+            foreach (var formatter in formatters)
+            {
+                foreach (var contentType in acceptableContentTypes)
+                {
+                    formatterContext.ContentType = new StringSegment(contentType);
+                    formatterContext.ContentTypeIsServerDefined = true;
+
+                    if (formatter.CanWriteResult(formatterContext))
+                    {
+                        return formatter;
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private IOutputFormatter SelectFormatterUsingSortedAcceptHeadersAndContentTypes(
+            OutputFormatterCanWriteContext formatterContext,
+            IList<IOutputFormatter> formatters,
+            IList<MediaTypeSegmentWithQuality> sortedAcceptableContentTypes,
+            MediaTypeCollection possibleOutputContentTypes)
+        {
+            for (var i = 0; i < sortedAcceptableContentTypes.Count; i++)
+            {
+                var acceptableContentType = new MediaType(sortedAcceptableContentTypes[i].MediaType);
+                for (var j = 0; j < possibleOutputContentTypes.Count; j++)
+                {
+                    var candidateContentType = new MediaType(possibleOutputContentTypes[j]);
+                    if (candidateContentType.IsSubsetOf(acceptableContentType))
+                    {
+                        for (var k = 0; k < formatters.Count; k++)
+                        {
+                            var formatter = formatters[k];
+                            formatterContext.ContentType = new StringSegment(possibleOutputContentTypes[j]);
+                            formatterContext.ContentTypeIsServerDefined = true;
+                            if (formatter.CanWriteResult(formatterContext))
+                            {
+                                return formatter;
+                            }
+                        }
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private void ValidateContentTypes(MediaTypeCollection contentTypes)
+        {
+            for (var i = 0; i < contentTypes.Count; i++)
+            {
+                var contentType = contentTypes[i];
+
+                var parsedContentType = new MediaType(contentType);
+                if (parsedContentType.HasWildcard)
+                {
+                    var message = Resources.FormatObjectResult_MatchAllContentType(
+                        contentType,
+                        nameof(ObjectResult.ContentTypes));
+                    throw new InvalidOperationException(message);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileContentResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileContentResultExecutor.cs
new file mode 100644
index 0000000000..6d194c52f8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileContentResultExecutor.cs
@@ -0,0 +1,77 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    public class FileContentResultExecutor : FileResultExecutorBase, IActionResultExecutor<FileContentResult>
+    {
+        public FileContentResultExecutor(ILoggerFactory loggerFactory)
+            : base(CreateLogger<FileContentResultExecutor>(loggerFactory))
+        {
+        }
+
+        /// <inheritdoc />
+        public virtual Task ExecuteAsync(ActionContext context, FileContentResult result)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            Logger.ExecutingFileResult(result);
+
+            var (range, rangeLength, serveBody) = SetHeadersAndLog(
+                context,
+                result,
+                result.FileContents.Length,
+                result.EnableRangeProcessing,
+                result.LastModified,
+                result.EntityTag);
+
+            if (!serveBody)
+            {
+                return Task.CompletedTask;
+            }
+
+            return WriteFileAsync(context, result, range, rangeLength);
+        }
+
+        protected virtual Task WriteFileAsync(ActionContext context, FileContentResult result, RangeItemHeaderValue range, long rangeLength)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            if (range != null && rangeLength == 0)
+            {
+                return Task.CompletedTask;
+            }
+
+            if (range != null)
+            {
+                Logger.WritingRangeToBody();
+            }
+
+            var fileContentStream = new MemoryStream(result.FileContents);
+            return WriteFileAsync(context.HttpContext, fileContentStream, range, rangeLength);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileResultExecutorBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileResultExecutorBase.cs
new file mode 100644
index 0000000000..8c2ecb98a2
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileResultExecutorBase.cs
@@ -0,0 +1,393 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Extensions;
+using Microsoft.AspNetCore.Http.Headers;
+using Microsoft.AspNetCore.Internal;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    public class FileResultExecutorBase
+    {
+        private const string AcceptRangeHeaderValue = "bytes";
+
+        protected const int BufferSize = 64 * 1024;
+
+        public FileResultExecutorBase(ILogger logger)
+        {
+            Logger = logger;
+        }
+
+        internal enum PreconditionState
+        {
+            Unspecified,
+            NotModified,
+            ShouldProcess,
+            PreconditionFailed
+        }
+
+        protected ILogger Logger { get; }
+
+        protected virtual (RangeItemHeaderValue range, long rangeLength, bool serveBody) SetHeadersAndLog(
+            ActionContext context,
+            FileResult result,
+            long? fileLength,
+            bool enableRangeProcessing,
+            DateTimeOffset? lastModified = null,
+            EntityTagHeaderValue etag = null)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            SetContentType(context, result);
+            SetContentDispositionHeader(context, result);
+
+            var request = context.HttpContext.Request;
+            var httpRequestHeaders = request.GetTypedHeaders();
+
+            // Since the 'Last-Modified' and other similar http date headers are rounded down to whole seconds,
+            // round down current file's last modified to whole seconds for correct comparison.
+            if (lastModified.HasValue)
+            {
+                lastModified = RoundDownToWholeSeconds(lastModified.Value);
+            }
+
+            var preconditionState = GetPreconditionState(httpRequestHeaders, lastModified, etag);
+
+            var response = context.HttpContext.Response;
+            SetLastModifiedAndEtagHeaders(response, lastModified, etag);
+
+            // Short circuit if the preconditional headers process to 304 (NotModified) or 412 (PreconditionFailed)
+            if (preconditionState == PreconditionState.NotModified)
+            {
+                response.StatusCode = StatusCodes.Status304NotModified;
+                return (range: null, rangeLength: 0, serveBody: false);
+            }
+            else if (preconditionState == PreconditionState.PreconditionFailed)
+            {
+                response.StatusCode = StatusCodes.Status412PreconditionFailed;
+                return (range: null, rangeLength: 0, serveBody: false);
+            }
+
+            if (fileLength.HasValue)
+            {
+                // Assuming the request is not a range request, and the response body is not empty, the Content-Length header is set to 
+                // the length of the entire file. 
+                // If the request is a valid range request, this header is overwritten with the length of the range as part of the 
+                // range processing (see method SetContentLength).
+
+                response.ContentLength = fileLength.Value;
+
+                // Handle range request
+                if (enableRangeProcessing)
+                {
+                    SetAcceptRangeHeader(response);
+
+                    // If the request method is HEAD or GET, PreconditionState is Unspecified or ShouldProcess, and IfRange header is valid,
+                    // range should be processed and Range headers should be set
+                    if ((HttpMethods.IsHead(request.Method) || HttpMethods.IsGet(request.Method))
+                        && (preconditionState == PreconditionState.Unspecified || preconditionState == PreconditionState.ShouldProcess)
+                        && (IfRangeValid(httpRequestHeaders, lastModified, etag)))
+                    {
+                        return SetRangeHeaders(context, httpRequestHeaders, fileLength.Value);
+                    }
+                }
+                else
+                {
+                    Logger.NotEnabledForRangeProcessing();
+                }
+            }
+
+            return (range: null, rangeLength: 0, serveBody: !HttpMethods.IsHead(request.Method));
+        }
+
+        private static void SetContentType(ActionContext context, FileResult result)
+        {
+            var response = context.HttpContext.Response;
+            response.ContentType = result.ContentType;
+        }
+
+        private static void SetContentDispositionHeader(ActionContext context, FileResult result)
+        {
+            if (!string.IsNullOrEmpty(result.FileDownloadName))
+            {
+                // From RFC 2183, Sec. 2.3:
+                // The sender may want to suggest a filename to be used if the entity is
+                // detached and stored in a separate file. If the receiving MUA writes
+                // the entity to a file, the suggested filename should be used as a
+                // basis for the actual filename, where possible.
+                var contentDisposition = new ContentDispositionHeaderValue("attachment");
+                contentDisposition.SetHttpFileName(result.FileDownloadName);
+                context.HttpContext.Response.Headers[HeaderNames.ContentDisposition] = contentDisposition.ToString();
+            }
+        }
+
+        private static void SetLastModifiedAndEtagHeaders(HttpResponse response, DateTimeOffset? lastModified, EntityTagHeaderValue etag)
+        {
+            var httpResponseHeaders = response.GetTypedHeaders();
+            if (lastModified.HasValue)
+            {
+                httpResponseHeaders.LastModified = lastModified;
+            }
+            if (etag != null)
+            {
+                httpResponseHeaders.ETag = etag;
+            }
+        }
+
+        private static void SetAcceptRangeHeader(HttpResponse response)
+        {
+            response.Headers[HeaderNames.AcceptRanges] = AcceptRangeHeaderValue;
+        }
+
+        internal bool IfRangeValid(
+            RequestHeaders httpRequestHeaders,
+            DateTimeOffset? lastModified = null,
+            EntityTagHeaderValue etag = null)
+        {
+            // 14.27 If-Range
+            var ifRange = httpRequestHeaders.IfRange;
+            if (ifRange != null)
+            {
+                // If the validator given in the If-Range header field matches the
+                // current validator for the selected representation of the target
+                // resource, then the server SHOULD process the Range header field as
+                // requested.  If the validator does not match, the server MUST ignore
+                // the Range header field.
+                if (ifRange.LastModified.HasValue)
+                {
+                    if (lastModified.HasValue && lastModified > ifRange.LastModified)
+                    {
+                        Logger.IfRangeLastModifiedPreconditionFailed(lastModified, ifRange.LastModified);
+                        return false;
+                    }
+                }
+                else if (etag != null && ifRange.EntityTag != null && !ifRange.EntityTag.Compare(etag, useStrongComparison: true))
+                {
+                    Logger.IfRangeETagPreconditionFailed(etag, ifRange.EntityTag);
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        // Internal for testing
+        internal PreconditionState GetPreconditionState(
+            RequestHeaders httpRequestHeaders,
+            DateTimeOffset? lastModified = null,
+            EntityTagHeaderValue etag = null)
+        {
+            var ifMatchState = PreconditionState.Unspecified;
+            var ifNoneMatchState = PreconditionState.Unspecified;
+            var ifModifiedSinceState = PreconditionState.Unspecified;
+            var ifUnmodifiedSinceState = PreconditionState.Unspecified;
+
+            // 14.24 If-Match
+            var ifMatch = httpRequestHeaders.IfMatch;
+            if (etag != null)
+            {
+                ifMatchState = GetEtagMatchState(
+                    useStrongComparison: true,
+                    etagHeader: ifMatch,
+                    etag: etag,
+                    matchFoundState: PreconditionState.ShouldProcess,
+                    matchNotFoundState: PreconditionState.PreconditionFailed);
+
+                if (ifMatchState == PreconditionState.PreconditionFailed)
+                {
+                    Logger.IfMatchPreconditionFailed(etag);
+                }
+            }
+
+            // 14.26 If-None-Match
+            var ifNoneMatch = httpRequestHeaders.IfNoneMatch;
+            if (etag != null)
+            {
+                ifNoneMatchState = GetEtagMatchState(
+                    useStrongComparison: false,
+                    etagHeader: ifNoneMatch,
+                    etag: etag,
+                    matchFoundState: PreconditionState.NotModified,
+                    matchNotFoundState: PreconditionState.ShouldProcess);
+            }
+
+            var now = RoundDownToWholeSeconds(DateTimeOffset.UtcNow);
+
+            // 14.25 If-Modified-Since
+            var ifModifiedSince = httpRequestHeaders.IfModifiedSince;
+            if (lastModified.HasValue && ifModifiedSince.HasValue && ifModifiedSince <= now)
+            {
+                var modified = ifModifiedSince < lastModified;
+                ifModifiedSinceState = modified ? PreconditionState.ShouldProcess : PreconditionState.NotModified;
+            }
+
+            // 14.28 If-Unmodified-Since
+            var ifUnmodifiedSince = httpRequestHeaders.IfUnmodifiedSince;
+            if (lastModified.HasValue && ifUnmodifiedSince.HasValue && ifUnmodifiedSince <= now)
+            {
+                var unmodified = ifUnmodifiedSince >= lastModified;
+                ifUnmodifiedSinceState = unmodified ? PreconditionState.ShouldProcess : PreconditionState.PreconditionFailed;
+
+                if (ifUnmodifiedSinceState == PreconditionState.PreconditionFailed)
+                {
+                    Logger.IfUnmodifiedSincePreconditionFailed(lastModified, ifUnmodifiedSince);
+                }
+            }
+
+            var state = GetMaxPreconditionState(ifMatchState, ifNoneMatchState, ifModifiedSinceState, ifUnmodifiedSinceState);
+            return state;
+        }
+
+        private static PreconditionState GetEtagMatchState(
+            bool useStrongComparison,
+            IList<EntityTagHeaderValue> etagHeader,
+            EntityTagHeaderValue etag,
+            PreconditionState matchFoundState,
+            PreconditionState matchNotFoundState)
+        {
+            if (etagHeader != null && etagHeader.Any())
+            {
+                var state = matchNotFoundState;
+                foreach (var entityTag in etagHeader)
+                {
+                    if (entityTag.Equals(EntityTagHeaderValue.Any) || entityTag.Compare(etag, useStrongComparison))
+                    {
+                        state = matchFoundState;
+                        break;
+                    }
+                }
+
+                return state;
+            }
+
+            return PreconditionState.Unspecified;
+        }
+
+        private static PreconditionState GetMaxPreconditionState(params PreconditionState[] states)
+        {
+            var max = PreconditionState.Unspecified;
+            for (var i = 0; i < states.Length; i++)
+            {
+                if (states[i] > max)
+                {
+                    max = states[i];
+                }
+            }
+
+            return max;
+        }
+
+        private (RangeItemHeaderValue range, long rangeLength, bool serveBody) SetRangeHeaders(
+            ActionContext context,
+            RequestHeaders httpRequestHeaders,
+            long fileLength)
+        {
+            var response = context.HttpContext.Response;
+            var httpResponseHeaders = response.GetTypedHeaders();
+            var serveBody = !HttpMethods.IsHead(context.HttpContext.Request.Method);
+
+            // Range may be null for empty range header, invalid ranges, parsing errors, multiple ranges 
+            // and when the file length is zero.
+            var (isRangeRequest, range) = RangeHelper.ParseRange(
+                context.HttpContext,
+                httpRequestHeaders,
+                fileLength,
+                Logger);
+
+            if (!isRangeRequest)
+            {
+                return (range: null, rangeLength: 0, serveBody);
+            }
+
+            // Requested range is not satisfiable
+            if (range == null)
+            {
+                // 14.16 Content-Range - A server sending a response with status code 416 (Requested range not satisfiable)
+                // SHOULD include a Content-Range field with a byte-range-resp-spec of "*". The instance-length specifies
+                // the current length of the selected resource.  e.g. */length
+                response.StatusCode = StatusCodes.Status416RangeNotSatisfiable;
+                httpResponseHeaders.ContentRange = new ContentRangeHeaderValue(fileLength);
+
+                return (range: null, rangeLength: 0, serveBody: false);
+            }
+
+            response.StatusCode = StatusCodes.Status206PartialContent;
+            httpResponseHeaders.ContentRange = new ContentRangeHeaderValue(
+                range.From.Value,
+                range.To.Value,
+                fileLength);
+
+            // Overwrite the Content-Length header for valid range requests with the range length.
+            var rangeLength = SetContentLength(response, range);
+
+            return (range, rangeLength, serveBody);
+        }
+
+        private static long SetContentLength(HttpResponse response, RangeItemHeaderValue range)
+        {
+            var start = range.From.Value;
+            var end = range.To.Value;
+            var length = end - start + 1;
+            response.ContentLength = length;
+            return length;
+        }
+
+        protected static ILogger CreateLogger<T>(ILoggerFactory factory)
+        {
+            if (factory == null)
+            {
+                throw new ArgumentNullException(nameof(factory));
+            }
+
+            return factory.CreateLogger<T>();
+        }
+
+        protected static async Task WriteFileAsync(HttpContext context, Stream fileStream, RangeItemHeaderValue range, long rangeLength)
+        {
+            var outputStream = context.Response.Body;
+            using (fileStream)
+            {
+                try
+                {
+                    if (range == null)
+                    {
+                        await StreamCopyOperation.CopyToAsync(fileStream, outputStream, count: null, bufferSize: BufferSize, cancel: context.RequestAborted);
+                    }
+                    else
+                    {
+                        fileStream.Seek(range.From.Value, SeekOrigin.Begin);
+                        await StreamCopyOperation.CopyToAsync(fileStream, outputStream, rangeLength, BufferSize, context.RequestAborted);
+                    }
+                }
+                catch (OperationCanceledException)
+                {
+                    // Don't throw this exception, it's most likely caused by the client disconnecting.
+                    // However, if it was cancelled for any other reason we need to prevent empty responses.
+                    context.Abort();
+                }
+            }
+        }
+
+        private static DateTimeOffset RoundDownToWholeSeconds(DateTimeOffset dateTimeOffset)
+        {
+            var ticksToRemove = dateTimeOffset.Ticks % TimeSpan.TicksPerSecond;
+            return dateTimeOffset.Subtract(TimeSpan.FromTicks(ticksToRemove));
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileStreamResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileStreamResultExecutor.cs
new file mode 100644
index 0000000000..6cb300eff1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileStreamResultExecutor.cs
@@ -0,0 +1,88 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    public class FileStreamResultExecutor : FileResultExecutorBase, IActionResultExecutor<FileStreamResult>
+    {
+        public FileStreamResultExecutor(ILoggerFactory loggerFactory)
+            : base(CreateLogger<FileStreamResultExecutor>(loggerFactory))
+        {
+        }
+
+        /// <inheritdoc />
+        public virtual async Task ExecuteAsync(ActionContext context, FileStreamResult result)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            using (result.FileStream)
+            {
+                Logger.ExecutingFileResult(result);
+
+                long? fileLength = null;
+                if (result.FileStream.CanSeek)
+                {
+                    fileLength = result.FileStream.Length;
+                }
+
+                var (range, rangeLength, serveBody) = SetHeadersAndLog(
+                    context,
+                    result,
+                    fileLength,
+                    result.EnableRangeProcessing,
+                    result.LastModified,
+                    result.EntityTag);
+
+                if (!serveBody)
+                {
+                    return;
+                }
+
+                await WriteFileAsync(context, result, range, rangeLength);
+            }
+        }
+
+        protected virtual Task WriteFileAsync(
+            ActionContext context,
+            FileStreamResult result,
+            RangeItemHeaderValue range,
+            long rangeLength)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            if (range != null && rangeLength == 0)
+            {
+                return Task.CompletedTask;
+            }
+
+            if (range != null)
+            {
+                Logger.WritingRangeToBody();
+            }
+
+            return WriteFileAsync(context.HttpContext, result.FileStream, range, rangeLength);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionContextAccessor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionContextAccessor.cs
new file mode 100644
index 0000000000..f113257439
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionContextAccessor.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    public interface IActionContextAccessor
+    {
+        ActionContext ActionContext { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionDescriptorChangeProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionDescriptorChangeProvider.cs
new file mode 100644
index 0000000000..d736512f1c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionDescriptorChangeProvider.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    /// <summary>
+    /// Provides a way to signal invalidation of the cached collection of <see cref="Abstractions.ActionDescriptor" /> from an
+    /// <see cref="IActionDescriptorCollectionProvider"/>.
+    /// </summary>
+    public interface IActionDescriptorChangeProvider
+    {
+        /// <summary>
+        /// Gets a <see cref="IChangeToken"/> used to signal invalidation of cached <see cref="Abstractions.ActionDescriptor"/>
+        /// instances.
+        /// </summary>
+        /// <returns>The <see cref="IChangeToken"/>.</returns>
+        IChangeToken GetChangeToken();
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionDescriptorCollectionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionDescriptorCollectionProvider.cs
new file mode 100644
index 0000000000..3e64a66677
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionDescriptorCollectionProvider.cs
@@ -0,0 +1,24 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    /// <summary>
+    /// Provides the currently cached collection of <see cref="Abstractions.ActionDescriptor"/>.
+    /// </summary>
+    /// <remarks>
+    /// The default implementation internally caches the collection and uses
+    /// <see cref="IActionDescriptorChangeProvider"/> to invalidate this cache, incrementing
+    /// <see cref="ActionDescriptorCollection.Version"/> the collection is reconstructed.
+    ///
+    /// Default consumers of this service, are aware of the version and will recache
+    /// data as appropriate, but rely on the version being unique.
+    /// </remarks>
+    public interface IActionDescriptorCollectionProvider
+    {
+        /// <summary>
+        /// Returns the current cached <see cref="ActionDescriptorCollection"/>
+        /// </summary>
+        ActionDescriptorCollection ActionDescriptors { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionInvokerFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionInvokerFactory.cs
new file mode 100644
index 0000000000..9ba0572416
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionInvokerFactory.cs
@@ -0,0 +1,28 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    /// <summary>
+    /// Defines an interface for creating an <see cref="IActionInvoker"/> for the current request. 
+    /// </summary>
+    /// <remarks>
+    /// The default <see cref="IActionInvokerFactory"/> implementation creates an <see cref="IActionInvoker"/> by
+    /// calling into each <see cref="IActionInvokerProvider"/>. See <see cref="IActionInvokerProvider"/> for more
+    /// details.
+    /// </remarks>
+    public interface IActionInvokerFactory
+    {
+        /// <summary>
+        /// Creates an <see cref="IActionInvoker"/> for the current request associated with
+        /// <paramref name="actionContext"/>. 
+        /// </summary>
+        /// <param name="actionContext">
+        /// The <see cref="ActionContext"/> associated with the current request.
+        /// </param>
+        /// <returns>An <see cref="IActionInvoker"/> or <c>null</c>.</returns>
+        IActionInvoker CreateInvoker(ActionContext actionContext);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionResultExecutor.cs
new file mode 100644
index 0000000000..3a4e398c5e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionResultExecutor.cs
@@ -0,0 +1,29 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    /// <summary>
+    /// Defines an interface for a service which can execute a particular kind of <see cref="IActionResult"/> by
+    /// manipulating the <see cref="HttpResponse"/>.
+    /// </summary>
+    /// <typeparam name="TResult">The type of <see cref="IActionResult"/>.</typeparam>
+    /// <remarks>
+    /// Implementions of <see cref="IActionResultExecutor{TResult}"/> are typically called by the
+    /// <see cref="IActionResult.ExecuteResultAsync(ActionContext)"/> method of the corresponding action result type.
+    /// Implementations should be registered as singleton services.
+    /// </remarks>
+    public interface IActionResultExecutor<in TResult> where TResult : IActionResult
+    {
+        /// <summary>
+        /// Asynchronously excecutes the action result, by modifying the <see cref="HttpResponse"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ActionContext"/> associated with the current request."/></param>
+        /// <param name="result">The action result to execute.</param>
+        /// <returns>A <see cref="Task"/> which represents the asynchronous operation.</returns>
+        Task ExecuteAsync(ActionContext context, TResult result);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionResultTypeMapper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionResultTypeMapper.cs
new file mode 100644
index 0000000000..1f45bfbb5a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionResultTypeMapper.cs
@@ -0,0 +1,48 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    /// <summary>
+    /// Provides a mapping from the return value of an action to an <see cref="IActionResult"/>
+    /// for request processing.
+    /// </summary>
+    /// <remarks>
+    /// The default implementation of this service handles the conversion of 
+    /// <see cref="ActionResult{TValue}"/> to an <see cref="IActionResult"/> during request
+    /// processing as well as the mapping of <see cref="ActionResult{TValue}"/> to <c>TValue</c>
+    /// during API Explorer processing.
+    /// </remarks>
+    public interface IActionResultTypeMapper
+    {
+        /// <summary>
+        /// Gets the result data type that corresponds to <paramref name="returnType"/>. This
+        /// method will not be called for actions that return <c>void</c> or an <see cref="IActionResult"/>
+        /// type.
+        /// </summary>
+        /// <param name="returnType">The declared return type of an action.</param>
+        /// <returns>A <see cref="Type"/> that represents the response data.</returns>
+        /// <remarks>
+        /// Prior to calling this method, the infrastructure will unwrap <see cref="Task{TResult}"/> or
+        /// other task-like types.
+        /// </remarks>
+        Type GetResultDataType(Type returnType);
+
+        /// <summary>
+        /// Converts the result of an action to an <see cref="IActionResult"/> for response processing.
+        /// This method will be not be called when a method returns <c>void</c> or an
+        /// <see cref="IActionResult"/> value.
+        /// </summary>
+        /// <param name="value">The action return value. May be <c>null</c>.</param>
+        /// <param name="returnType">The declared return type.</param>
+        /// <returns>An <see cref="IActionResult"/> for response processing.</returns>
+        /// <remarks>
+        /// Prior to calling this method, the infrastructure will unwrap <see cref="Task{TResult}"/> or
+        /// other task-like types.
+        /// </remarks>
+        IActionResult Convert(object value, Type returnType);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionSelector.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionSelector.cs
new file mode 100644
index 0000000000..30c9902e7d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionSelector.cs
@@ -0,0 +1,56 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Routing;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    /// <summary>
+    /// Defines an interface for selecting an MVC action to invoke for the current request.
+    /// </summary>
+    public interface IActionSelector
+    {
+        /// <summary>
+        /// Selects a set of <see cref="ActionDescriptor"/> candidates for the current request associated with
+        /// <paramref name="context"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="RouteContext"/> associated with the current request.</param>
+        /// <returns>A set of <see cref="ActionDescriptor"/> candidates or <c>null</c>.</returns>
+        /// <remarks>
+        /// <para>
+        /// Used by conventional routing to select the set of actions that match the route values for the
+        /// current request. Action constraints associated with the candidates are not invoked by this method
+        /// </para>
+        /// <para>
+        /// Attribute routing does not call this method.
+        /// </para>
+        /// </remarks>
+        IReadOnlyList<ActionDescriptor> SelectCandidates(RouteContext context);
+
+        /// <summary>
+        /// Selects the best <see cref="ActionDescriptor"/> candidate from <paramref name="candidates"/> for the 
+        /// current request associated with <paramref name="context"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="RouteContext"/> associated with the current request.</param>
+        /// <param name="candidates">The set of <see cref="ActionDescriptor"/> candidates.</param>
+        /// <returns>The best <see cref="ActionDescriptor"/> candidate for the current request or <c>null</c>.</returns>
+        /// <exception cref="Internal.AmbiguousActionException">
+        /// Thrown when action selection results in an ambiguity.
+        /// </exception>
+        /// <remarks>
+        /// <para>
+        /// Invokes action constraints associated with the candidates.
+        /// </para>
+        /// <para>
+        /// Used by conventional routing after calling <see cref="SelectCandidates"/> to apply action constraints and
+        /// disambiguate between multiple candidates.
+        /// </para>
+        /// <para>
+        /// Used by attribute routing to apply action constraints and disambiguate between multiple candidates.
+        /// </para>
+        /// </remarks>
+        ActionDescriptor SelectBestCandidate(RouteContext context, IReadOnlyList<ActionDescriptor> candidates);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ICompatibilitySwitch.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ICompatibilitySwitch.cs
new file mode 100644
index 0000000000..6f723db0e2
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ICompatibilitySwitch.cs
@@ -0,0 +1,36 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    /// <summary>
+    /// Defines a compatibility switch. This is framework infrastructure and should not be used
+    /// by application code.
+    /// </summary>
+    public interface ICompatibilitySwitch
+    {
+        /// <summary>
+        /// Gets a value indicating whether the <see cref="Value"/> property has been set.
+        /// </summary>
+        /// <remarks>
+        /// This is used by the compatibility infrastructure to determine whether the application developer
+        /// has set explicitly set the value associated with this switch.
+        /// </remarks>
+        bool IsValueSet { get; }
+
+        /// <summary>
+        /// Gets the name of the compatibility switch.
+        /// </summary>
+        string Name { get; }
+
+        /// <summary>
+        /// Gets or set the value associated with the compatibility switch.
+        /// </summary>
+        /// <remarks>
+        /// Setting the switch value using <see cref="Value"/> will not set <see cref="IsValueSet"/> to <c>true</c>.
+        /// This should be used by the compatibility infrastructure when <see cref="IsValueSet"/> is <c>false</c>
+        /// to apply a compatibility value based on <see cref="CompatibilityVersion"/>.
+        /// </remarks>
+        object Value { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IConvertToActionResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IConvertToActionResult.cs
new file mode 100644
index 0000000000..8b3d8345f2
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IConvertToActionResult.cs
@@ -0,0 +1,17 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    /// <summary>
+    /// Defines the contract to convert a type to an <see cref="IActionResult"/> during action invocation.
+    /// </summary>
+    public interface IConvertToActionResult
+    {
+        /// <summary>
+        /// Converts the current instance to an instance of <see cref="IActionResult"/>.
+        /// </summary>
+        /// <returns>The converted <see cref="IActionResult"/>.</returns>
+        IActionResult Convert();
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IHttpRequestStreamReaderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IHttpRequestStreamReaderFactory.cs
new file mode 100644
index 0000000000..b29db5163c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IHttpRequestStreamReaderFactory.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using System.IO;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    /// <summary>
+    /// Creates <see cref="TextReader"/> instances for reading from <see cref="Http.HttpRequest.Body"/>.
+    /// </summary>
+    public interface IHttpRequestStreamReaderFactory
+    {
+        /// <summary>
+        /// Creates a new <see cref="TextReader"/>.
+        /// </summary>
+        /// <param name="stream">The <see cref="Stream"/>, usually <see cref="Http.HttpRequest.Body"/>.</param>
+        /// <param name="encoding">The <see cref="Encoding"/>, usually <see cref="Encoding.UTF8"/>.</param>
+        /// <returns>A <see cref="TextReader"/>.</returns>
+        TextReader CreateReader(Stream stream, Encoding encoding);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IHttpResponseStreamWriterFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IHttpResponseStreamWriterFactory.cs
new file mode 100644
index 0000000000..99e2b58528
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IHttpResponseStreamWriterFactory.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using System.IO;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    /// <summary>
+    /// Creates <see cref="TextWriter"/> instances for writing to <see cref="Http.HttpResponse.Body"/>.
+    /// </summary>
+    public interface IHttpResponseStreamWriterFactory
+    {
+        /// <summary>
+        /// Creates a new <see cref="TextWriter"/>.
+        /// </summary>
+        /// <param name="stream">The <see cref="Stream"/>, usually <see cref="Http.HttpResponse.Body"/>.</param>
+        /// <param name="encoding">The <see cref="Encoding"/>, usually <see cref="Encoding.UTF8"/>.</param>
+        /// <returns>A <see cref="TextWriter"/>.</returns>
+        TextWriter CreateWriter(Stream stream, Encoding encoding);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/LocalRedirectResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/LocalRedirectResultExecutor.cs
new file mode 100644
index 0000000000..9ae7a3bda5
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/LocalRedirectResultExecutor.cs
@@ -0,0 +1,74 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.Extensions.Logging;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    public class LocalRedirectResultExecutor : IActionResultExecutor<LocalRedirectResult>
+    {
+        private readonly ILogger _logger;
+        private readonly IUrlHelperFactory _urlHelperFactory;
+
+        public LocalRedirectResultExecutor(ILoggerFactory loggerFactory, IUrlHelperFactory urlHelperFactory)
+        {
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            if (urlHelperFactory == null)
+            {
+                throw new ArgumentNullException(nameof(urlHelperFactory));
+            }
+
+            _logger = loggerFactory.CreateLogger<LocalRedirectResultExecutor>();
+            _urlHelperFactory = urlHelperFactory;
+        }
+
+        /// <inheritdoc />
+        public virtual Task ExecuteAsync(ActionContext context, LocalRedirectResult result)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            var urlHelper = result.UrlHelper ?? _urlHelperFactory.GetUrlHelper(context);
+
+            // IsLocalUrl is called to handle  Urls starting with '~/'.
+            if (!urlHelper.IsLocalUrl(result.Url))
+            {
+                throw new InvalidOperationException(Resources.UrlNotLocal);
+            }
+
+            var destinationUrl = urlHelper.Content(result.Url);
+            _logger.LocalRedirectResultExecuting(destinationUrl);
+
+            if (result.PreserveMethod)
+            {
+                context.HttpContext.Response.StatusCode = result.Permanent ?
+                    StatusCodes.Status308PermanentRedirect : StatusCodes.Status307TemporaryRedirect;
+                context.HttpContext.Response.Headers[HeaderNames.Location] = destinationUrl;
+            }
+            else
+            {
+                context.HttpContext.Response.Redirect(destinationUrl, result.Permanent);
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ModelStateInvalidFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ModelStateInvalidFilter.cs
new file mode 100644
index 0000000000..43aa96daec
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ModelStateInvalidFilter.cs
@@ -0,0 +1,60 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    /// <summary>
+    /// A <see cref="IActionFilter"/> that responds to invalid <see cref="ActionContext.ModelState"/>. This filter is
+    /// added to all types and actions annotated with <see cref="ApiControllerAttribute"/>.
+    /// See <see cref="ApiBehaviorOptions"/> for ways to configure this filter.
+    /// </summary>
+    public class ModelStateInvalidFilter : IActionFilter, IOrderedFilter
+    {
+        private readonly ApiBehaviorOptions _apiBehaviorOptions;
+        private readonly ILogger _logger;
+
+        public ModelStateInvalidFilter(ApiBehaviorOptions apiBehaviorOptions, ILogger logger)
+        {
+            _apiBehaviorOptions = apiBehaviorOptions ?? throw new ArgumentNullException(nameof(apiBehaviorOptions));
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        /// <summary>
+        /// Gets the order value for determining the order of execution of filters. Filters execute in
+        /// ascending numeric value of the <see cref="Order"/> property.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Filters are executed in a sequence determined by an ascending sort of the <see cref="Order"/> property.
+        /// </para>
+        /// <para>
+        /// The default Order for this attribute is -2000 so that it runs early in the pipeline.
+        /// </para>
+        /// <para>
+        /// Look at <see cref="IOrderedFilter.Order"/> for more detailed info.
+        /// </para>
+        /// </remarks>
+        public int Order => -2000;
+
+        /// <inheritdoc />
+        public bool IsReusable => true;
+
+        public void OnActionExecuted(ActionExecutedContext context)
+        {
+        }
+
+        public void OnActionExecuting(ActionExecutingContext context)
+        {
+            if (context.Result == null && !context.ModelState.IsValid)
+            {
+                _logger.ModelStateInvalidFilterExecuting();
+                context.Result = _apiBehaviorOptions.InvalidModelStateResponseFactory(context);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcCompatibilityOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcCompatibilityOptions.cs
new file mode 100644
index 0000000000..fb78662ed8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcCompatibilityOptions.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    /// <summary>
+    /// An options type for configuring the application <see cref="Mvc.CompatibilityVersion"/>.
+    /// </summary>
+    /// <remarks>
+    /// The primary way to configure the application's <see cref="Mvc.CompatibilityVersion"/> is by
+    /// calling <see cref="MvcCoreMvcBuilderExtensions.SetCompatibilityVersion(IMvcBuilder, CompatibilityVersion)"/>
+    /// or <see cref="MvcCoreMvcCoreBuilderExtensions.SetCompatibilityVersion(IMvcCoreBuilder, CompatibilityVersion)"/>.
+    /// </remarks>
+    public class MvcCompatibilityOptions
+    {
+        /// <summary>
+        /// Gets or sets the application's configured <see cref="Mvc.CompatibilityVersion"/>.
+        /// </summary>
+        public CompatibilityVersion CompatibilityVersion { get; set; } = CompatibilityVersion.Version_2_0;
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcOptionsConfigureCompatibilityOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcOptionsConfigureCompatibilityOptions.cs
new file mode 100644
index 0000000000..71957b40cf
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcOptionsConfigureCompatibilityOptions.cs
@@ -0,0 +1,39 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    internal class MvcOptionsConfigureCompatibilityOptions : ConfigureCompatibilityOptions<MvcOptions>
+    {
+        public MvcOptionsConfigureCompatibilityOptions(
+            ILoggerFactory loggerFactory,
+            IOptions<MvcCompatibilityOptions> compatibilityOptions)
+            : base(loggerFactory, compatibilityOptions)
+        {
+        }
+
+        protected override IReadOnlyDictionary<string, object> DefaultValues
+        {
+            get
+            {
+                var values = new Dictionary<string, object>();
+
+                if (Version >= CompatibilityVersion.Version_2_1)
+                {
+                    values[nameof(MvcOptions.AllowCombiningAuthorizeFilters)] = true;
+                    values[nameof(MvcOptions.AllowBindingHeaderValuesToNonStringModelTypes)] = true;
+                    values[nameof(MvcOptions.AllowValidatingTopLevelNodes)] = true;
+                    values[nameof(MvcOptions.InputFormatterExceptionPolicy)] = InputFormatterExceptionPolicy.MalformedInputExceptions;
+                    values[nameof(MvcOptions.SuppressBindingUndefinedValueToEnumType)] = true;
+                }
+
+                return values;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ObjectResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ObjectResultExecutor.cs
new file mode 100644
index 0000000000..5d5fd81b23
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ObjectResultExecutor.cs
@@ -0,0 +1,134 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    /// <summary>
+    /// Executes an <see cref="ObjectResult"/> to write to the response.
+    /// </summary>
+    public class ObjectResultExecutor : IActionResultExecutor<ObjectResult>
+    {
+        /// <summary>
+        /// Creates a new <see cref="ObjectResultExecutor"/>.
+        /// </summary>
+        /// <param name="formatterSelector">The <see cref="OutputFormatterSelector"/>.</param>
+        /// <param name="writerFactory">The <see cref="IHttpResponseStreamWriterFactory"/>.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public ObjectResultExecutor(
+            OutputFormatterSelector formatterSelector,
+            IHttpResponseStreamWriterFactory writerFactory,
+            ILoggerFactory loggerFactory)
+        {
+            if (formatterSelector == null)
+            {
+                throw new ArgumentNullException(nameof(formatterSelector));
+            }
+
+            if (writerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(writerFactory));
+            }
+
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            FormatterSelector = formatterSelector;
+            WriterFactory = writerFactory.CreateWriter;
+            Logger = loggerFactory.CreateLogger<ObjectResultExecutor>();
+        }
+
+        /// <summary>
+        /// Gets the <see cref="ILogger"/>.
+        /// </summary>
+        protected ILogger Logger { get; }
+
+        /// <summary>
+        /// Gets the <see cref="OutputFormatterSelector"/>.
+        /// </summary>
+        protected OutputFormatterSelector FormatterSelector { get; }
+
+        /// <summary>
+        /// Gets the writer factory delegate.
+        /// </summary>
+        protected Func<Stream, Encoding, TextWriter> WriterFactory { get; }
+
+        /// <summary>
+        /// Executes the <see cref="ObjectResult"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ActionContext"/> for the current request.</param>
+        /// <param name="result">The <see cref="ObjectResult"/>.</param>
+        /// <returns>
+        /// A <see cref="Task"/> which will complete once the <see cref="ObjectResult"/> is written to the response.
+        /// </returns>
+        public virtual Task ExecuteAsync(ActionContext context, ObjectResult result)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            // If the user sets the content type both on the ObjectResult (example: by Produces) and Response object,
+            // then the one set on ObjectResult takes precedence over the Response object
+            if (result.ContentTypes == null || result.ContentTypes.Count == 0)
+            {
+                var responseContentType = context.HttpContext.Response.ContentType;
+                if (!string.IsNullOrEmpty(responseContentType))
+                {
+                    if (result.ContentTypes == null)
+                    {
+                        result.ContentTypes = new MediaTypeCollection();
+                    }
+
+                    result.ContentTypes.Add(responseContentType);
+                }
+            }
+
+            var objectType = result.DeclaredType;
+            if (objectType == null || objectType == typeof(object))
+            {
+                objectType = result.Value?.GetType();
+            }
+
+            var formatterContext = new OutputFormatterWriteContext(
+                context.HttpContext,
+                WriterFactory,
+                objectType,
+                result.Value);
+
+            var selectedFormatter = FormatterSelector.SelectFormatter(
+                formatterContext, 
+                (IList<IOutputFormatter>)result.Formatters ?? Array.Empty<IOutputFormatter>(), 
+                result.ContentTypes);
+            if (selectedFormatter == null)
+            {
+                // No formatter supports this.
+                Logger.NoFormatter(formatterContext);
+
+                context.HttpContext.Response.StatusCode = StatusCodes.Status406NotAcceptable;
+                return Task.CompletedTask;
+            }
+
+            Logger.ObjectResultExecuting(result.Value);
+
+            result.OnFormatting(context);
+            return selectedFormatter.WriteAsync(formatterContext);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/OutputFormatterSelector.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/OutputFormatterSelector.cs
new file mode 100644
index 0000000000..fd721d3451
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/OutputFormatterSelector.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Formatters;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    /// <summary>
+    /// Selects an <see cref="IOutputFormatter"/> to write a response to the current request.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// The default implementation of <see cref="OutputFormatterSelector"/> provided by ASP.NET Core MVC
+    /// is <see cref="DefaultOutputFormatterSelector"/>. The <see cref="DefaultOutputFormatterSelector"/> implements
+    /// MVC's default content negotiation algorithm. This API is designed in a way that can satisfy the contract
+    /// of <see cref="ObjectResult"/>.
+    /// </para>
+    /// <para>
+    /// The default implementation is controlled by settings on <see cref="MvcOptions"/>, most notably:
+    /// <see cref="MvcOptions.OutputFormatters"/>, <see cref="MvcOptions.RespectBrowserAcceptHeader"/>, and 
+    /// <see cref="MvcOptions.ReturnHttpNotAcceptable"/>.
+    /// </para>
+    /// </remarks>
+    public abstract class OutputFormatterSelector
+    {
+        /// <summary>
+        /// Selects an <see cref="IOutputFormatter"/> to write the response based on the provided values and the current request.
+        /// </summary>
+        /// <param name="context">The <see cref="OutputFormatterCanWriteContext"/> associated with the current request.</param>
+        /// <param name="formatters">A list of formatters to use; this acts as an override to <see cref="MvcOptions.OutputFormatters"/>.</param>
+        /// <param name="mediaTypes">A list of media types to use; this acts as an override to the <c>Accept</c> header. </param>
+        /// <returns>The selected <see cref="IOutputFormatter"/>, or <c>null</c> if one could not be selected.</returns>
+        public abstract IOutputFormatter SelectFormatter(OutputFormatterCanWriteContext context, IList<IOutputFormatter> formatters, MediaTypeCollection mediaTypes);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/PhysicalFileResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/PhysicalFileResultExecutor.cs
new file mode 100644
index 0000000000..fa4757212d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/PhysicalFileResultExecutor.cs
@@ -0,0 +1,148 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    public class PhysicalFileResultExecutor : FileResultExecutorBase, IActionResultExecutor<PhysicalFileResult>
+    {
+        public PhysicalFileResultExecutor(ILoggerFactory loggerFactory)
+            : base(CreateLogger<PhysicalFileResultExecutor>(loggerFactory))
+        {
+        }
+
+        /// <inheritdoc />
+        public virtual Task ExecuteAsync(ActionContext context, PhysicalFileResult result)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            var fileInfo = GetFileInfo(result.FileName);
+            if (!fileInfo.Exists)
+            {
+                throw new FileNotFoundException(
+                    Resources.FormatFileResult_InvalidPath(result.FileName), result.FileName);
+            }
+
+            Logger.ExecutingFileResult(result, result.FileName);
+
+            var lastModified = result.LastModified ?? fileInfo.LastModified;
+            var (range, rangeLength, serveBody) = SetHeadersAndLog(
+                context,
+                result,
+                fileInfo.Length,
+                result.EnableRangeProcessing,
+                lastModified,
+                result.EntityTag);
+
+            if (serveBody)
+            {
+                return WriteFileAsync(context, result, range, rangeLength);
+            }
+
+            return Task.CompletedTask;
+        }
+
+        protected virtual Task WriteFileAsync(ActionContext context, PhysicalFileResult result, RangeItemHeaderValue range, long rangeLength)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            if (range != null && rangeLength == 0)
+            {
+                return Task.CompletedTask;
+            }
+
+            var response = context.HttpContext.Response;
+            if (!Path.IsPathRooted(result.FileName))
+            {
+                throw new NotSupportedException(Resources.FormatFileResult_PathNotRooted(result.FileName));
+            }
+
+            if (range != null)
+            {
+                Logger.WritingRangeToBody();
+            }
+
+            var sendFile = response.HttpContext.Features.Get<IHttpSendFileFeature>();
+            if (sendFile != null)
+            {
+                if (range != null)
+                {
+                    return sendFile.SendFileAsync(
+                        result.FileName,
+                        offset: range.From ?? 0L,
+                        count: rangeLength,
+                        cancellation: default(CancellationToken));
+                }
+
+                return sendFile.SendFileAsync(
+                    result.FileName,
+                    offset: 0,
+                    count: null,
+                    cancellation: default(CancellationToken));
+            }
+
+            return WriteFileAsync(context.HttpContext, GetFileStream(result.FileName), range, rangeLength);
+        }
+
+        protected virtual Stream GetFileStream(string path)
+        {
+            if (path == null)
+            {
+                throw new ArgumentNullException(nameof(path));
+            }
+
+            return new FileStream(
+                    path,
+                    FileMode.Open,
+                    FileAccess.Read,
+                    FileShare.ReadWrite,
+                    BufferSize,
+                    FileOptions.Asynchronous | FileOptions.SequentialScan);
+        }
+
+        protected virtual FileMetadata GetFileInfo(string path)
+        {
+            var fileInfo = new FileInfo(path);
+            return new FileMetadata
+            {
+                Exists = fileInfo.Exists,
+                Length = fileInfo.Length,
+                LastModified = fileInfo.LastWriteTimeUtc,
+            };
+        }
+
+        protected class FileMetadata
+        {
+            public bool Exists { get; set; }
+
+            public long Length { get; set; }
+
+            public DateTimeOffset LastModified { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectResultExecutor.cs
new file mode 100644
index 0000000000..e8f80b17da
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectResultExecutor.cs
@@ -0,0 +1,73 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.Extensions.Logging;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    public class RedirectResultExecutor : IActionResultExecutor<RedirectResult>
+    {
+        private readonly ILogger _logger;
+        private readonly IUrlHelperFactory _urlHelperFactory;
+
+        public RedirectResultExecutor(ILoggerFactory loggerFactory, IUrlHelperFactory urlHelperFactory)
+        {
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            if (urlHelperFactory == null)
+            {
+                throw new ArgumentNullException(nameof(urlHelperFactory));
+            }
+
+            _logger = loggerFactory.CreateLogger<RedirectResultExecutor>();
+            _urlHelperFactory = urlHelperFactory;
+        }
+
+        /// <inheritdoc />
+        public virtual Task ExecuteAsync(ActionContext context, RedirectResult result)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            var urlHelper = result.UrlHelper ?? _urlHelperFactory.GetUrlHelper(context);
+
+            // IsLocalUrl is called to handle URLs starting with '~/'.
+            var destinationUrl = result.Url;
+            if (urlHelper.IsLocalUrl(destinationUrl))
+            {
+                destinationUrl = urlHelper.Content(result.Url);
+            }
+
+            _logger.RedirectResultExecuting(destinationUrl);
+
+            if (result.PreserveMethod)
+            {
+                context.HttpContext.Response.StatusCode = result.Permanent ?
+                    StatusCodes.Status308PermanentRedirect : StatusCodes.Status307TemporaryRedirect;
+                context.HttpContext.Response.Headers[HeaderNames.Location] = destinationUrl;
+            }
+            else
+            {
+                context.HttpContext.Response.Redirect(destinationUrl, result.Permanent);
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToActionResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToActionResultExecutor.cs
new file mode 100644
index 0000000000..b1b131274b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToActionResultExecutor.cs
@@ -0,0 +1,79 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.Extensions.Logging;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    public class RedirectToActionResultExecutor : IActionResultExecutor<RedirectToActionResult>
+    {
+        private readonly ILogger _logger;
+        private readonly IUrlHelperFactory _urlHelperFactory;
+
+        public RedirectToActionResultExecutor(ILoggerFactory loggerFactory, IUrlHelperFactory urlHelperFactory)
+        {
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            if (urlHelperFactory == null)
+            {
+                throw new ArgumentNullException(nameof(urlHelperFactory));
+            }
+
+            _logger = loggerFactory.CreateLogger<RedirectToActionResult>();
+            _urlHelperFactory = urlHelperFactory;
+        }
+
+        /// <inheritdoc />
+        public virtual Task ExecuteAsync(ActionContext context, RedirectToActionResult result)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            var urlHelper = result.UrlHelper ?? _urlHelperFactory.GetUrlHelper(context);
+
+            var destinationUrl = urlHelper.Action(
+                result.ActionName,
+                result.ControllerName,
+                result.RouteValues,
+                protocol: null,
+                host: null,
+                fragment: result.Fragment);
+            if (string.IsNullOrEmpty(destinationUrl))
+            {
+                throw new InvalidOperationException(Resources.NoRoutesMatched);
+            }
+
+            _logger.RedirectToActionResultExecuting(destinationUrl);
+
+            if (result.PreserveMethod)
+            {
+                context.HttpContext.Response.StatusCode = result.Permanent ?
+                    StatusCodes.Status308PermanentRedirect : StatusCodes.Status307TemporaryRedirect;
+                context.HttpContext.Response.Headers[HeaderNames.Location] = destinationUrl;
+            }
+            else
+            {
+                context.HttpContext.Response.Redirect(destinationUrl, result.Permanent);
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToPageResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToPageResultExecutor.cs
new file mode 100644
index 0000000000..ee1c060e87
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToPageResultExecutor.cs
@@ -0,0 +1,79 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.Extensions.Logging;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    public class RedirectToPageResultExecutor : IActionResultExecutor<RedirectToPageResult>
+    {
+        private readonly ILogger _logger;
+        private readonly IUrlHelperFactory _urlHelperFactory;
+
+        public RedirectToPageResultExecutor(ILoggerFactory loggerFactory, IUrlHelperFactory urlHelperFactory)
+        {
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            if (urlHelperFactory == null)
+            {
+                throw new ArgumentNullException(nameof(urlHelperFactory));
+            }
+
+            _logger = loggerFactory.CreateLogger<RedirectToRouteResult>();
+            _urlHelperFactory = urlHelperFactory;
+        }
+
+        /// <inheritdoc />
+        public virtual Task ExecuteAsync(ActionContext context, RedirectToPageResult result)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            var urlHelper = result.UrlHelper ?? _urlHelperFactory.GetUrlHelper(context);
+            var destinationUrl = urlHelper.Page(
+                result.PageName,
+                result.PageHandler,
+                result.RouteValues,
+                result.Protocol,
+                result.Host,
+                fragment: result.Fragment);
+
+            if (string.IsNullOrEmpty(destinationUrl))
+            {
+                throw new InvalidOperationException(Resources.FormatNoRoutesMatchedForPage(result.PageName));
+            }
+
+            _logger.RedirectToPageResultExecuting(result.PageName);
+
+            if (result.PreserveMethod)
+            {
+                context.HttpContext.Response.StatusCode = result.Permanent ?
+                    StatusCodes.Status308PermanentRedirect : StatusCodes.Status307TemporaryRedirect;
+                context.HttpContext.Response.Headers[HeaderNames.Location] = destinationUrl;
+            }
+            else
+            {
+                context.HttpContext.Response.Redirect(destinationUrl, result.Permanent);
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToRouteResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToRouteResultExecutor.cs
new file mode 100644
index 0000000000..04e15feacf
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToRouteResultExecutor.cs
@@ -0,0 +1,68 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.Extensions.Logging;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    public class RedirectToRouteResultExecutor : IActionResultExecutor<RedirectToRouteResult>
+    {
+        private readonly ILogger _logger;
+        private readonly IUrlHelperFactory _urlHelperFactory;
+
+        public RedirectToRouteResultExecutor(ILoggerFactory loggerFactory, IUrlHelperFactory urlHelperFactory)
+        {
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            if (urlHelperFactory == null)
+            {
+                throw new ArgumentNullException(nameof(urlHelperFactory));
+            }
+
+            _logger = loggerFactory.CreateLogger<RedirectToRouteResult>();
+            _urlHelperFactory = urlHelperFactory;
+        }
+
+        /// <inheritdoc />
+        public virtual Task ExecuteAsync(ActionContext context, RedirectToRouteResult result)
+        {
+            var urlHelper = result.UrlHelper ?? _urlHelperFactory.GetUrlHelper(context);
+
+            var destinationUrl = urlHelper.RouteUrl(
+                result.RouteName,
+                result.RouteValues,
+                protocol: null,
+                host: null,
+                fragment: result.Fragment);
+            if (string.IsNullOrEmpty(destinationUrl))
+            {
+                throw new InvalidOperationException(Resources.NoRoutesMatched);
+            }
+
+            _logger.RedirectToRouteResultExecuting(destinationUrl, result.RouteName);
+
+            if (result.PreserveMethod)
+            {
+                context.HttpContext.Response.StatusCode = result.Permanent ?
+                    StatusCodes.Status308PermanentRedirect : StatusCodes.Status307TemporaryRedirect;
+                context.HttpContext.Response.Headers[HeaderNames.Location] = destinationUrl;
+            }
+            else
+            {
+                context.HttpContext.Response.Redirect(destinationUrl, result.Permanent);
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/VirtualFileResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/VirtualFileResultExecutor.cs
new file mode 100644
index 0000000000..d9702a572f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/VirtualFileResultExecutor.cs
@@ -0,0 +1,153 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Logging;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    public class VirtualFileResultExecutor : FileResultExecutorBase, IActionResultExecutor<VirtualFileResult>
+    {
+        private readonly IHostingEnvironment _hostingEnvironment;
+
+        public VirtualFileResultExecutor(ILoggerFactory loggerFactory, IHostingEnvironment hostingEnvironment)
+            : base(CreateLogger<VirtualFileResultExecutor>(loggerFactory))
+        {
+            if (hostingEnvironment == null)
+            {
+                throw new ArgumentNullException(nameof(hostingEnvironment));
+            }
+
+            _hostingEnvironment = hostingEnvironment;
+        }
+
+        /// <inheritdoc />
+        public virtual Task ExecuteAsync(ActionContext context, VirtualFileResult result)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            var fileInfo = GetFileInformation(result);
+            if (!fileInfo.Exists)
+            {
+                throw new FileNotFoundException(
+                    Resources.FormatFileResult_InvalidPath(result.FileName), result.FileName);
+            }
+
+            Logger.ExecutingFileResult(result, result.FileName);
+
+            var lastModified = result.LastModified ?? fileInfo.LastModified;
+            var (range, rangeLength, serveBody) = SetHeadersAndLog(
+                context,
+                result,
+                fileInfo.Length,
+                result.EnableRangeProcessing,
+                lastModified,
+                result.EntityTag);
+
+            if (serveBody)
+            {
+                return WriteFileAsync(context, result, fileInfo, range, rangeLength);
+            }
+
+            return Task.CompletedTask;
+        }
+
+        protected virtual Task WriteFileAsync(ActionContext context, VirtualFileResult result, IFileInfo fileInfo, RangeItemHeaderValue range, long rangeLength)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            if (range != null && rangeLength == 0)
+            {
+                return Task.CompletedTask;
+            }
+
+            var response = context.HttpContext.Response;
+            var physicalPath = fileInfo.PhysicalPath;
+
+            if (range != null)
+            {
+                Logger.WritingRangeToBody();
+            }
+
+            var sendFile = response.HttpContext.Features.Get<IHttpSendFileFeature>();
+            if (sendFile != null && !string.IsNullOrEmpty(physicalPath))
+            {
+                if (range != null)
+                {
+                    return sendFile.SendFileAsync(
+                        physicalPath,
+                        offset: range.From ?? 0L,
+                        count: rangeLength,
+                        cancellation: default(CancellationToken));
+                }
+
+                return sendFile.SendFileAsync(
+                    physicalPath,
+                    offset: 0,
+                    count: null,
+                    cancellation: default(CancellationToken));
+            }
+
+            return WriteFileAsync(context.HttpContext, GetFileStream(fileInfo), range, rangeLength);
+        }
+
+        private IFileInfo GetFileInformation(VirtualFileResult result)
+        {
+            var fileProvider = GetFileProvider(result);
+            if (fileProvider is NullFileProvider)
+            {
+                throw new InvalidOperationException(Resources.VirtualFileResultExecutor_NoFileProviderConfigured);
+            }
+
+            var normalizedPath = result.FileName;
+            if (normalizedPath.StartsWith("~", StringComparison.Ordinal))
+            {
+                normalizedPath = normalizedPath.Substring(1);
+            }
+
+            var fileInfo = fileProvider.GetFileInfo(normalizedPath);
+            return fileInfo;
+        }
+
+        private IFileProvider GetFileProvider(VirtualFileResult result)
+        {
+            if (result.FileProvider != null)
+            {
+                return result.FileProvider;
+            }
+
+            result.FileProvider = _hostingEnvironment.WebRootFileProvider;
+            return result.FileProvider;
+        }
+
+        protected virtual Stream GetFileStream(IFileInfo fileInfo)
+        {
+            return fileInfo.CreateReadStream();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AcceptHeaderParser.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AcceptHeaderParser.cs
new file mode 100644
index 0000000000..289e151226
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AcceptHeaderParser.cs
@@ -0,0 +1,174 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Internal
+{
+    public static class AcceptHeaderParser
+    {
+        public static IList<MediaTypeSegmentWithQuality> ParseAcceptHeader(IList<string> acceptHeaders)
+        {
+            var parsedValues = new List<MediaTypeSegmentWithQuality>();
+            ParseAcceptHeader(acceptHeaders, parsedValues);
+
+            return parsedValues;
+        }
+
+        public static void ParseAcceptHeader(IList<string> acceptHeaders, IList<MediaTypeSegmentWithQuality> parsedValues)
+        {
+            if (acceptHeaders == null)
+            {
+                throw new ArgumentNullException(nameof(acceptHeaders));
+            }
+
+            if (parsedValues == null)
+            {
+                throw new ArgumentNullException(nameof(parsedValues));
+            }
+            for (var i = 0; i < acceptHeaders.Count; i++)
+            {
+                var charIndex = 0;
+                var value = acceptHeaders[i];
+
+                while (!string.IsNullOrEmpty(value) && charIndex < value.Length)
+                {
+                    var startCharIndex = charIndex;
+
+                    if (TryParseValue(value, ref charIndex, out var output))
+                    {
+                        // The entry may not contain an actual value, like Accept: application/json, , */*
+                        if (output.MediaType.HasValue)
+                        {
+                            parsedValues.Add(output);
+                        }
+                    }
+
+                    if (charIndex <= startCharIndex)
+                    {
+                        Debug.Fail("ParseAcceptHeader should advance charIndex, this is a bug.");
+                        break;
+                    }
+                }
+            }
+        }
+
+        private static bool TryParseValue(string value, ref int index, out MediaTypeSegmentWithQuality parsedValue)
+        {
+            parsedValue = default(MediaTypeSegmentWithQuality);
+
+            // The accept header may be added multiple times to the request/response message. E.g.
+            // Accept: text/xml; q=1
+            // Accept:
+            // Accept: text/plain; q=0.2
+            // In this case, do not fail parsing in case one of the values is the empty string.
+            if (string.IsNullOrEmpty(value) || (index == value.Length))
+            {
+                return true;
+            }
+
+            var currentIndex = GetNextNonEmptyOrWhitespaceIndex(value, index, out var separatorFound);
+
+            if (currentIndex == value.Length)
+            {
+                index = currentIndex;
+                return true;
+            }
+
+            // We deliberately want to ignore media types that we are not capable of parsing.
+            // This is due to the fact that some browsers will send invalid media types like 
+            // ; q=0.9 or */;q=0.2, etc.
+            // In this scenario, our recovery action consists of advancing the pointer to the
+            // next separator and moving on.
+            // In case we don't find the next separator, we simply advance the cursor to the
+            // end of the string to signal that we are done parsing.
+            var result = default(MediaTypeSegmentWithQuality);
+            var length = 0;
+            try
+            {
+                length = GetMediaTypeWithQualityLength(value, currentIndex, out result);
+            }
+            catch
+            {
+                length = 0;
+            }
+
+            if (length == 0)
+            {
+                // The parsing failed.
+                currentIndex = value.IndexOf(',', currentIndex);
+                if (currentIndex == -1)
+                {
+                    index = value.Length;
+                    return false;
+                }
+                index = currentIndex;
+                return false;
+            }
+
+            currentIndex = currentIndex + length;
+            currentIndex = GetNextNonEmptyOrWhitespaceIndex(value, currentIndex, out separatorFound);
+
+            // If we've not reached the end of the string, then we must have a separator.
+            // E. g application/json, text/plain <- We must be at ',' otherwise, we've failed parsing.
+            if (!separatorFound && (currentIndex < value.Length))
+            {
+                index = currentIndex;
+                return false;
+            }
+
+            index = currentIndex;
+            parsedValue = result;
+            return true;
+        }
+
+        private static int GetNextNonEmptyOrWhitespaceIndex(
+            string input,
+            int startIndex,
+            out bool separatorFound)
+        {
+            Debug.Assert(input != null);
+            Debug.Assert(startIndex <= input.Length); // it's OK if index == value.Length.
+
+            separatorFound = false;
+            var current = startIndex + HttpTokenParsingRules.GetWhitespaceLength(input, startIndex);
+
+            if ((current == input.Length) || (input[current] != ','))
+            {
+                return current;
+            }
+
+            // If we have a separator, skip the separator and all following whitespaces, and
+            // continue until the current character is neither a separator nor a whitespace.
+            separatorFound = true;
+            current++; // skip delimiter.
+            current = current + HttpTokenParsingRules.GetWhitespaceLength(input, current);
+
+            while ((current < input.Length) && (input[current] == ','))
+            {
+                current++; // skip delimiter.
+                current = current + HttpTokenParsingRules.GetWhitespaceLength(input, current);
+            }
+
+            return current;
+        }
+
+        private static int GetMediaTypeWithQualityLength(
+            string input,
+            int start,
+            out MediaTypeSegmentWithQuality result)
+        {
+            result = MediaType.CreateMediaTypeSegmentWithQuality(input, start);
+            if (result.MediaType.HasValue)
+            {
+                return result.MediaType.Length;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionAttributeRouteModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionAttributeRouteModel.cs
new file mode 100644
index 0000000000..45fe4b2578
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionAttributeRouteModel.cs
@@ -0,0 +1,60 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public static class ActionAttributeRouteModel
+    {
+        public static IEnumerable<(AttributeRouteModel route, SelectorModel actionSelector, SelectorModel controllerSelector)> GetAttributeRoutes(ActionModel actionModel)
+        {
+            var controllerAttributeRoutes = actionModel.Controller.Selectors
+                .Where(sm => sm.AttributeRouteModel != null)
+                .Select(sm => sm.AttributeRouteModel)
+                .ToList();
+
+            foreach (var actionSelectorModel in actionModel.Selectors)
+            {
+                var actionRouteModel = actionSelectorModel.AttributeRouteModel;
+
+                // We check the action to see if the template allows combination behavior
+                // (It doesn't start with / or ~/) so that in the case where we have multiple
+                // [Route] attributes on the controller we don't end up creating multiple
+                if (actionRouteModel != null && actionRouteModel.IsAbsoluteTemplate)
+                {
+                    var route = AttributeRouteModel.CombineAttributeRouteModel(
+                        left: null,
+                        right: actionRouteModel);
+
+                    yield return (route, actionSelectorModel, null);
+                }
+                else if (controllerAttributeRoutes.Count > 0)
+                {
+                    for (var i = 0; i < actionModel.Controller.Selectors.Count; i++)
+                    {
+                        // We're using the attribute routes from the controller
+                        var controllerSelector = actionModel.Controller.Selectors[i];
+
+                        var route = AttributeRouteModel.CombineAttributeRouteModel(
+                            controllerSelector.AttributeRouteModel,
+                            actionRouteModel);
+
+                        yield return (route, actionSelectorModel, controllerSelector);
+                    }
+                }
+
+                else
+                {
+                    var route = AttributeRouteModel.CombineAttributeRouteModel(
+                        left: null,
+                        right: actionRouteModel);
+
+                    yield return (route, actionSelectorModel, null);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionConstraintCache.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionConstraintCache.cs
new file mode 100644
index 0000000000..3ba049a494
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionConstraintCache.cs
@@ -0,0 +1,200 @@
+// 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.
+
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ActionConstraintCache
+    {
+        private readonly IActionDescriptorCollectionProvider _collectionProvider;
+        private readonly IActionConstraintProvider[] _actionConstraintProviders;
+
+        private volatile InnerCache _currentCache;
+
+        public ActionConstraintCache(
+            IActionDescriptorCollectionProvider collectionProvider,
+            IEnumerable<IActionConstraintProvider> actionConstraintProviders)
+        {
+            _collectionProvider = collectionProvider;
+            _actionConstraintProviders = actionConstraintProviders.OrderBy(item => item.Order).ToArray();
+        }
+
+        private InnerCache CurrentCache
+        {
+            get
+            {
+                var current = _currentCache;
+                var actionDescriptors = _collectionProvider.ActionDescriptors;
+
+                if (current == null || current.Version != actionDescriptors.Version)
+                {
+                    current = new InnerCache(actionDescriptors.Version);
+                    _currentCache = current;
+                }
+
+                return current;
+            }
+        }
+
+        public IReadOnlyList<IActionConstraint> GetActionConstraints(HttpContext httpContext, ActionDescriptor action)
+        {
+            var cache = CurrentCache;
+
+            if (cache.Entries.TryGetValue(action, out var entry))
+            {
+                return GetActionConstraintsFromEntry(entry, httpContext, action);
+            }
+
+            if (action.ActionConstraints == null || action.ActionConstraints.Count == 0)
+            {
+                return null;
+            }
+
+            var items = new List<ActionConstraintItem>(action.ActionConstraints.Count);
+            for (var i = 0; i < action.ActionConstraints.Count; i++)
+            {
+                items.Add(new ActionConstraintItem(action.ActionConstraints[i]));
+            }
+
+            ExecuteProviders(httpContext, action, items);
+
+            var actionConstraints = ExtractActionConstraints(items);
+
+            var allActionConstraintsCached = true;
+            for (var i = 0; i < items.Count; i++)
+            {
+                var item = items[i];
+                if (!item.IsReusable)
+                {
+                    item.Constraint = null;
+                    allActionConstraintsCached = false;
+                }
+            }
+
+            if (allActionConstraintsCached)
+            {
+                entry = new CacheEntry(actionConstraints);
+            }
+            else
+            {
+                entry = new CacheEntry(items);
+            }
+
+            cache.Entries.TryAdd(action, entry);
+            return actionConstraints;
+        }
+
+        private IReadOnlyList<IActionConstraint> GetActionConstraintsFromEntry(CacheEntry entry, HttpContext httpContext, ActionDescriptor action)
+        {
+            Debug.Assert(entry.ActionConstraints != null || entry.Items != null);
+
+            if (entry.ActionConstraints != null)
+            {
+                return entry.ActionConstraints;
+            }
+
+            var items = new List<ActionConstraintItem>(entry.Items.Count);
+            for (var i = 0; i < entry.Items.Count; i++)
+            {
+                var item = entry.Items[i];
+                if (item.IsReusable)
+                {
+                    items.Add(item);
+                }
+                else
+                {
+                    items.Add(new ActionConstraintItem(item.Metadata));
+                }
+            }
+
+            ExecuteProviders(httpContext, action, items);
+
+            return ExtractActionConstraints(items);
+        }
+
+        private void ExecuteProviders(HttpContext httpContext, ActionDescriptor action, List<ActionConstraintItem> items)
+        {
+            var context = new ActionConstraintProviderContext(httpContext, action, items);
+
+            for (var i = 0; i < _actionConstraintProviders.Length; i++)
+            {
+                _actionConstraintProviders[i].OnProvidersExecuting(context);
+            }
+
+            for (var i = _actionConstraintProviders.Length - 1; i >= 0; i--)
+            {
+                _actionConstraintProviders[i].OnProvidersExecuted(context);
+            }
+        }
+
+        private IReadOnlyList<IActionConstraint> ExtractActionConstraints(List<ActionConstraintItem> items)
+        {
+            var count = 0;
+            for (var i = 0; i < items.Count; i++)
+            {
+                if (items[i].Constraint != null)
+                {
+                    count++;
+                }
+            }
+
+            if (count == 0)
+            {
+                return null;
+            }
+            
+            var actionConstraints = new IActionConstraint[count];
+            var actionConstraintIndex = 0;
+            for (int i = 0; i < items.Count; i++)
+            {
+                var actionConstraint = items[i].Constraint;
+                if (actionConstraint != null)
+                {
+                    actionConstraints[actionConstraintIndex++] = actionConstraint;
+                }
+            }
+
+            return actionConstraints;
+        }
+
+        private class InnerCache
+        {
+            public InnerCache(int version)
+            {
+                Version = version;
+            }
+
+            public ConcurrentDictionary<ActionDescriptor, CacheEntry> Entries { get; } =
+                new ConcurrentDictionary<ActionDescriptor, CacheEntry>();
+
+            public int Version { get; }
+        }
+
+        private struct CacheEntry
+        {
+            public CacheEntry(IReadOnlyList<IActionConstraint> actionConstraints)
+            {
+                ActionConstraints = actionConstraints;
+                Items = null;
+            }
+
+            public CacheEntry(List<ActionConstraintItem> items)
+            {
+                Items = items;
+                ActionConstraints = null;
+            }
+
+            public IReadOnlyList<IActionConstraint> ActionConstraints { get; }
+
+            public List<ActionConstraintItem> Items { get; }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionDescriptorCollectionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionDescriptorCollectionProvider.cs
new file mode 100644
index 0000000000..49cb219178
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionDescriptorCollectionProvider.cs
@@ -0,0 +1,95 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// Default implementation of <see cref="IActionDescriptorCollectionProvider"/>.
+    /// </summary>
+    public class ActionDescriptorCollectionProvider : IActionDescriptorCollectionProvider
+    {
+        private readonly IActionDescriptorProvider[] _actionDescriptorProviders;
+        private readonly IActionDescriptorChangeProvider[] _actionDescriptorChangeProviders;
+        private ActionDescriptorCollection _collection;
+        private int _version = -1;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ActionDescriptorCollectionProvider" /> class.
+        /// </summary>
+        /// <param name="actionDescriptorProviders">The sequence of <see cref="IActionDescriptorProvider"/>.</param>
+        /// <param name="actionDescriptorChangeProviders">The sequence of <see cref="IActionDescriptorChangeProvider"/>.</param>
+        public ActionDescriptorCollectionProvider(
+            IEnumerable<IActionDescriptorProvider> actionDescriptorProviders,
+            IEnumerable<IActionDescriptorChangeProvider> actionDescriptorChangeProviders)
+        {
+            _actionDescriptorProviders = actionDescriptorProviders
+                .OrderBy(p => p.Order)
+                .ToArray();
+
+            _actionDescriptorChangeProviders = actionDescriptorChangeProviders.ToArray();
+
+            ChangeToken.OnChange(
+                GetCompositeChangeToken,
+                UpdateCollection);
+        }
+
+        private IChangeToken GetCompositeChangeToken()
+        {
+            if (_actionDescriptorChangeProviders.Length == 1)
+            {
+                return _actionDescriptorChangeProviders[0].GetChangeToken();
+            }
+
+            var changeTokens = new IChangeToken[_actionDescriptorChangeProviders.Length];
+            for (var i = 0; i < _actionDescriptorChangeProviders.Length; i++)
+            {
+                changeTokens[i] = _actionDescriptorChangeProviders[i].GetChangeToken();
+            }
+
+            return new CompositeChangeToken(changeTokens);
+        }
+
+        /// <summary>
+        /// Returns a cached collection of <see cref="ActionDescriptor" />.
+        /// </summary>
+        public ActionDescriptorCollection ActionDescriptors
+        {
+            get
+            {
+                if (_collection == null)
+                {
+                    UpdateCollection();
+                }
+
+                return _collection;
+            }
+        }
+
+        private void UpdateCollection()
+        {
+            var context = new ActionDescriptorProviderContext();
+
+            for (var i = 0; i < _actionDescriptorProviders.Length; i++)
+            {
+                _actionDescriptorProviders[i].OnProvidersExecuting(context);
+            }
+
+            for (var i = _actionDescriptorProviders.Length - 1; i >= 0; i--)
+            {
+                _actionDescriptorProviders[i].OnProvidersExecuted(context);
+            }
+
+            _collection = new ActionDescriptorCollection(
+                new ReadOnlyCollection<ActionDescriptor>(context.Results),
+                Interlocked.Increment(ref _version));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionInvokerFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionInvokerFactory.cs
new file mode 100644
index 0000000000..b654ea26a8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionInvokerFactory.cs
@@ -0,0 +1,37 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ActionInvokerFactory : IActionInvokerFactory
+    {
+        private readonly IActionInvokerProvider[] _actionInvokerProviders;
+
+        public ActionInvokerFactory(IEnumerable<IActionInvokerProvider> actionInvokerProviders)
+        {
+            _actionInvokerProviders = actionInvokerProviders.OrderBy(item => item.Order).ToArray();
+        }
+
+        public IActionInvoker CreateInvoker(ActionContext actionContext)
+        {
+            var context = new ActionInvokerProviderContext(actionContext);
+
+            foreach (var provider in _actionInvokerProviders)
+            {
+                provider.OnProvidersExecuting(context);
+            }
+
+            for (var i = _actionInvokerProviders.Length - 1; i >= 0; i--)
+            {
+                _actionInvokerProviders[i].OnProvidersExecuted(context);
+            }
+
+            return context.Result;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionMethodExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionMethodExecutor.cs
new file mode 100644
index 0000000000..28541b3e55
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionMethodExecutor.cs
@@ -0,0 +1,231 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    internal abstract class ActionMethodExecutor
+    {
+        private static readonly ActionMethodExecutor[] Executors = new ActionMethodExecutor[]
+        {
+            // Executors for sync methods
+            new VoidResultExecutor(),
+            new SyncActionResultExecutor(),
+            new SyncObjectResultExecutor(),
+
+            // Executors for async methods
+            new AwaitableResultExecutor(),
+            new TaskResultExecutor(),
+            new TaskOfIActionResultExecutor(),
+            new TaskOfActionResultExecutor(),
+            new AwaitableObjectResultExecutor(),
+        };
+
+        public abstract ValueTask<IActionResult> Execute(
+            IActionResultTypeMapper mapper,
+            ObjectMethodExecutor executor,
+            object controller,
+            object[] arguments);
+
+        protected abstract bool CanExecute(ObjectMethodExecutor executor);
+
+        public static ActionMethodExecutor GetExecutor(ObjectMethodExecutor executor)
+        {
+            for (var i = 0; i < Executors.Length; i++)
+            {
+                if (Executors[i].CanExecute(executor))
+                {
+                    return Executors[i];
+                }
+            }
+
+            Debug.Fail("Should not get here");
+            throw new Exception();
+        }
+
+        // void LogMessage(..)
+        private class VoidResultExecutor : ActionMethodExecutor
+        {
+            public override ValueTask<IActionResult> Execute(
+                IActionResultTypeMapper mapper,
+                ObjectMethodExecutor executor,
+                object controller,
+                object[] arguments)
+            {
+                executor.Execute(controller, arguments);
+                return new ValueTask<IActionResult>(new EmptyResult());
+            }
+
+            protected override bool CanExecute(ObjectMethodExecutor executor)
+                => !executor.IsMethodAsync && executor.MethodReturnType == typeof(void);
+        }
+
+        // IActionResult Post(..)
+        // CreatedAtResult Put(..)
+        private class SyncActionResultExecutor : ActionMethodExecutor
+        {
+            public override ValueTask<IActionResult> Execute(
+                IActionResultTypeMapper mapper,
+                ObjectMethodExecutor executor,
+                object controller,
+                object[] arguments)
+            {
+                var actionResult = (IActionResult)executor.Execute(controller, arguments);
+                EnsureActionResultNotNull(executor, actionResult);
+
+                return new ValueTask<IActionResult>(actionResult);
+            }
+
+            protected override bool CanExecute(ObjectMethodExecutor executor)
+                => !executor.IsMethodAsync && typeof(IActionResult).IsAssignableFrom(executor.MethodReturnType);
+        }
+
+        // Person GetPerson(..)
+        // object Index(..)
+        private class SyncObjectResultExecutor : ActionMethodExecutor
+        {
+            public override ValueTask<IActionResult> Execute(
+                IActionResultTypeMapper mapper,
+                ObjectMethodExecutor executor,
+                object controller,
+                object[] arguments)
+            {
+                // Sync method returning arbitrary object
+                var returnValue = executor.Execute(controller, arguments);
+                var actionResult = ConvertToActionResult(mapper, returnValue, executor.MethodReturnType);
+                return new ValueTask<IActionResult>(actionResult);
+            }
+
+            // Catch-all for sync methods
+            protected override bool CanExecute(ObjectMethodExecutor executor) => !executor.IsMethodAsync;
+        }
+
+        // Task SaveState(..)
+        private class TaskResultExecutor : ActionMethodExecutor
+        {
+            public override async ValueTask<IActionResult> Execute(
+                IActionResultTypeMapper mapper,
+                ObjectMethodExecutor executor,
+                object controller,
+                object[] arguments)
+            {
+                await (Task)executor.Execute(controller, arguments);
+                return new EmptyResult();
+            }
+
+            protected override bool CanExecute(ObjectMethodExecutor executor) => executor.MethodReturnType == typeof(Task);
+        }
+
+        // CustomAsync PerformActionAsync(..)
+        // Custom task-like type with no return value.
+        private class AwaitableResultExecutor : ActionMethodExecutor
+        {
+            public override async ValueTask<IActionResult> Execute(
+                IActionResultTypeMapper mapper,
+                ObjectMethodExecutor executor,
+                object controller,
+                object[] arguments)
+            {
+                await executor.ExecuteAsync(controller, arguments);
+                return new EmptyResult();
+            }
+
+            protected override bool CanExecute(ObjectMethodExecutor executor)
+            {
+                // Async method returning void
+                return executor.IsMethodAsync && executor.AsyncResultType == typeof(void);
+            }
+        }
+
+        // Task<IActionResult> Post(..)
+        private class TaskOfIActionResultExecutor : ActionMethodExecutor
+        {
+            public override async ValueTask<IActionResult> Execute(
+                IActionResultTypeMapper mapper,
+                ObjectMethodExecutor executor,
+                object controller,
+                object[] arguments)
+            {
+                // Async method returning Task<IActionResult>
+                // Avoid extra allocations by calling Execute rather than ExecuteAsync and casting to Task<IActionResult>.
+                var returnValue = executor.Execute(controller, arguments);
+                var actionResult = await (Task<IActionResult>)returnValue;
+                EnsureActionResultNotNull(executor, actionResult);
+
+                return actionResult;
+            }
+
+            protected override bool CanExecute(ObjectMethodExecutor executor)
+                => typeof(Task<IActionResult>).IsAssignableFrom(executor.MethodReturnType);
+        }
+
+        // Task<PhysicalfileResult> DownloadFile(..)
+        // ValueTask<ViewResult> GetViewsAsync(..)
+        private class TaskOfActionResultExecutor : ActionMethodExecutor
+        {
+            public override async ValueTask<IActionResult> Execute(
+                IActionResultTypeMapper mapper,
+                ObjectMethodExecutor executor,
+                object controller,
+                object[] arguments)
+            {
+                // Async method returning awaitable-of-IActionResult (e.g., Task<ViewResult>)
+                // We have to use ExecuteAsync because we don't know the awaitable's type at compile time.
+                var actionResult = (IActionResult)await executor.ExecuteAsync(controller, arguments);
+                EnsureActionResultNotNull(executor, actionResult);
+                return actionResult;
+            }
+
+            protected override bool CanExecute(ObjectMethodExecutor executor)
+            {
+                // Async method returning awaitable-of - IActionResult(e.g., Task<ViewResult>)
+                return executor.IsMethodAsync && typeof(IActionResult).IsAssignableFrom(executor.AsyncResultType);
+            }
+        }
+
+        // Task<object> GetPerson(..)
+        // Task<Customer> GetCustomerAsync(..)
+        private class AwaitableObjectResultExecutor : ActionMethodExecutor
+        {
+            public override async ValueTask<IActionResult> Execute(
+                IActionResultTypeMapper mapper,
+                ObjectMethodExecutor executor,
+                object controller,
+                object[] arguments)
+            {
+                // Async method returning awaitable-of-nonvoid
+                var returnValue = await executor.ExecuteAsync(controller, arguments);
+                var actionResult = ConvertToActionResult(mapper, returnValue, executor.AsyncResultType);
+                return actionResult;
+            }
+
+            protected override bool CanExecute(ObjectMethodExecutor executor) => true;
+        }
+
+        private static void EnsureActionResultNotNull(ObjectMethodExecutor executor, IActionResult actionResult)
+        {
+            if (actionResult == null)
+            {
+                var type = executor.AsyncResultType ?? executor.MethodReturnType;
+                throw new InvalidOperationException(Resources.FormatActionResult_ActionReturnValueCannotBeNull(type));
+            }
+        }
+
+        private IActionResult ConvertToActionResult(IActionResultTypeMapper mapper, object returnValue, Type declaredType)
+        {
+            var result = (returnValue as IActionResult) ?? mapper.Convert(returnValue, declaredType);
+            if (result == null)
+            {
+                throw new InvalidOperationException(Resources.FormatActionResult_ActionReturnValueCannotBeNull(declaredType));
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionResultTypeMapper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionResultTypeMapper.cs
new file mode 100644
index 0000000000..82f1d02998
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionResultTypeMapper.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ActionResultTypeMapper : IActionResultTypeMapper
+    {
+        public Type GetResultDataType(Type returnType)
+        {
+            if (returnType == null)
+            {
+                throw new ArgumentNullException(nameof(returnType));
+            }
+
+            if (returnType.IsGenericType && 
+                returnType.GetGenericTypeDefinition() == typeof(ActionResult<>))
+            {
+                return returnType.GetGenericArguments()[0];
+            }
+
+            return returnType;
+        }
+
+        public IActionResult Convert(object value, Type returnType)
+        {
+            if (returnType == null)
+            {
+                throw new ArgumentNullException(nameof(returnType));
+            }
+
+            if (value is IConvertToActionResult converter)
+            {
+                return converter.Convert();
+            }
+
+            return new ObjectResult(value)
+            {
+                DeclaredType = returnType,
+            };
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionSelector.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionSelector.cs
new file mode 100644
index 0000000000..b3d14d1be8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionSelector.cs
@@ -0,0 +1,458 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// A default <see cref="IActionSelector"/> implementation.
+    /// </summary>
+    public class ActionSelector : IActionSelector
+    {
+        private static readonly IReadOnlyList<ActionDescriptor> EmptyActions = Array.Empty<ActionDescriptor>();
+
+        private readonly IActionDescriptorCollectionProvider _actionDescriptorCollectionProvider;
+        private readonly ActionConstraintCache _actionConstraintCache;
+        private readonly ILogger _logger;
+
+        private Cache _cache;
+
+        /// <summary>
+        /// Creates a new <see cref="ActionSelector"/>.
+        /// </summary>
+        /// <param name="actionDescriptorCollectionProvider">
+        /// The <see cref="IActionDescriptorCollectionProvider"/>.
+        /// </param>
+        /// <param name="actionConstraintCache">The <see cref="ActionConstraintCache"/> that
+        /// providers a set of <see cref="IActionConstraint"/> instances.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public ActionSelector(
+            IActionDescriptorCollectionProvider actionDescriptorCollectionProvider,
+            ActionConstraintCache actionConstraintCache,
+            ILoggerFactory loggerFactory)
+        {
+            _actionDescriptorCollectionProvider = actionDescriptorCollectionProvider;
+            _logger = loggerFactory.CreateLogger<ActionSelector>();
+            _actionConstraintCache = actionConstraintCache;
+        }
+
+        private Cache Current
+        {
+            get
+            {
+                var actions = _actionDescriptorCollectionProvider.ActionDescriptors;
+                var cache = Volatile.Read(ref _cache);
+
+                if (cache != null && cache.Version == actions.Version)
+                {
+                    return cache;
+                }
+
+                cache = new Cache(actions);
+                Volatile.Write(ref _cache, cache);
+                return cache;
+            }
+        }
+
+        public IReadOnlyList<ActionDescriptor> SelectCandidates(RouteContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var cache = Current;
+
+            // The Cache works based on a string[] of the route values in a pre-calculated order. This code extracts
+            // those values in the correct order.
+            var keys = cache.RouteKeys;
+            var values = new string[keys.Length];
+            for (var i = 0; i < keys.Length; i++)
+            {
+                context.RouteData.Values.TryGetValue(keys[i], out object value);
+
+                if (value != null)
+                {
+                    values[i] = value as string ?? Convert.ToString(value);
+                }
+            }
+
+            if (cache.OrdinalEntries.TryGetValue(values, out var matchingRouteValues) ||
+                cache.OrdinalIgnoreCaseEntries.TryGetValue(values, out matchingRouteValues))
+            {
+                Debug.Assert(matchingRouteValues != null);
+                return matchingRouteValues;
+            }
+
+            _logger.NoActionsMatched(context.RouteData.Values);
+            return EmptyActions;
+        }
+
+        public ActionDescriptor SelectBestCandidate(RouteContext context, IReadOnlyList<ActionDescriptor> candidates)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (candidates == null)
+            {
+                throw new ArgumentNullException(nameof(candidates));
+            }
+
+            var matches = EvaluateActionConstraints(context, candidates);
+
+            var finalMatches = SelectBestActions(matches);
+            if (finalMatches == null || finalMatches.Count == 0)
+            {
+                return null;
+            }
+            else if (finalMatches.Count == 1)
+            {
+                var selectedAction = finalMatches[0];
+
+                return selectedAction;
+            }
+            else
+            {
+                var actionNames = string.Join(
+                    Environment.NewLine,
+                    finalMatches.Select(a => a.DisplayName));
+
+                _logger.AmbiguousActions(actionNames);
+
+                var message = Resources.FormatDefaultActionSelector_AmbiguousActions(
+                    Environment.NewLine,
+                    actionNames);
+
+                throw new AmbiguousActionException(message);
+            }
+        }
+
+        /// <summary>
+        /// Returns the set of best matching actions.
+        /// </summary>
+        /// <param name="actions">The set of actions that satisfy all constraints.</param>
+        /// <returns>A list of the best matching actions.</returns>
+        protected virtual IReadOnlyList<ActionDescriptor> SelectBestActions(IReadOnlyList<ActionDescriptor> actions)
+        {
+            return actions;
+        }
+
+        private IReadOnlyList<ActionDescriptor> EvaluateActionConstraints(
+            RouteContext context,
+            IReadOnlyList<ActionDescriptor> actions)
+        {
+            var candidates = new List<ActionSelectorCandidate>();
+
+            // Perf: Avoid allocations
+            for (var i = 0; i < actions.Count; i++)
+            {
+                var action = actions[i];
+                var constraints = _actionConstraintCache.GetActionConstraints(context.HttpContext, action);
+                candidates.Add(new ActionSelectorCandidate(action, constraints));
+            }
+
+            var matches = EvaluateActionConstraintsCore(context, candidates, startingOrder: null);
+
+            List<ActionDescriptor> results = null;
+            if (matches != null)
+            {
+                results = new List<ActionDescriptor>(matches.Count);
+                // Perf: Avoid allocations
+                for (var i = 0; i < matches.Count; i++)
+                {
+                    var candidate = matches[i];
+                    results.Add(candidate.Action);
+                }
+            }
+
+            return results;
+        }
+
+        private IReadOnlyList<ActionSelectorCandidate> EvaluateActionConstraintsCore(
+            RouteContext context,
+            IReadOnlyList<ActionSelectorCandidate> candidates,
+            int? startingOrder)
+        {
+            // Find the next group of constraints to process. This will be the lowest value of
+            // order that is higher than startingOrder.
+            int? order = null;
+
+            // Perf: Avoid allocations
+            for (var i = 0; i < candidates.Count; i++)
+            {
+                var candidate = candidates[i];
+                if (candidate.Constraints != null)
+                {
+                    for (var j = 0; j < candidate.Constraints.Count; j++)
+                    {
+                        var constraint = candidate.Constraints[j];
+                        if ((startingOrder == null || constraint.Order > startingOrder) &&
+                            (order == null || constraint.Order < order))
+                        {
+                            order = constraint.Order;
+                        }
+                    }
+                }
+            }
+
+            // If we don't find a next then there's nothing left to do.
+            if (order == null)
+            {
+                return candidates;
+            }
+
+            // Since we have a constraint to process, bisect the set of actions into those with and without a
+            // constraint for the current order.
+            var actionsWithConstraint = new List<ActionSelectorCandidate>();
+            var actionsWithoutConstraint = new List<ActionSelectorCandidate>();
+
+            var constraintContext = new ActionConstraintContext();
+            constraintContext.Candidates = candidates;
+            constraintContext.RouteContext = context;
+
+            // Perf: Avoid allocations
+            for (var i = 0; i < candidates.Count; i++)
+            {
+                var candidate = candidates[i];
+                var isMatch = true;
+                var foundMatchingConstraint = false;
+
+                if (candidate.Constraints != null)
+                {
+                    constraintContext.CurrentCandidate = candidate;
+                    for (var j = 0; j < candidate.Constraints.Count; j++)
+                    {
+                        var constraint = candidate.Constraints[j];
+                        if (constraint.Order == order)
+                        {
+                            foundMatchingConstraint = true;
+
+                            if (!constraint.Accept(constraintContext))
+                            {
+                                isMatch = false;
+                                _logger.ConstraintMismatch(
+                                    candidate.Action.DisplayName,
+                                    candidate.Action.Id,
+                                    constraint);
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                if (isMatch && foundMatchingConstraint)
+                {
+                    actionsWithConstraint.Add(candidate);
+                }
+                else if (isMatch)
+                {
+                    actionsWithoutConstraint.Add(candidate);
+                }
+            }
+
+            // If we have matches with constraints, those are better so try to keep processing those
+            if (actionsWithConstraint.Count > 0)
+            {
+                var matches = EvaluateActionConstraintsCore(context, actionsWithConstraint, order);
+                if (matches?.Count > 0)
+                {
+                    return matches;
+                }
+            }
+
+            // If the set of matches with constraints can't work, then process the set without constraints.
+            if (actionsWithoutConstraint.Count == 0)
+            {
+                return null;
+            }
+            else
+            {
+                return EvaluateActionConstraintsCore(context, actionsWithoutConstraint, order);
+            }
+        }
+
+        // The action selector cache stores a mapping of route-values -> action descriptors for each known set of
+        // of route-values. We actually build two of these mappings, one for case-sensitive (fast path) and one for
+        // case-insensitive (slow path).
+        //
+        // This is necessary because MVC routing/action-selection is always case-insensitive. So we're going to build
+        // a case-sensitive dictionary that will behave like the a case-insensitive dictionary when you hit one of the
+        // canonical entries. When you don't hit a case-sensitive match it will try the case-insensitive dictionary
+        // so you still get correct behaviors.
+        //
+        // The difference here is because while MVC is case-insensitive, doing a case-sensitive comparison is much 
+        // faster. We also expect that most of the URLs we process are canonically-cased because they were generated
+        // by Url.Action or another routing api.
+        //
+        // This means that for a set of actions like:
+        //      { controller = "Home", action = "Index" } -> HomeController::Index1()
+        //      { controller = "Home", action = "index" } -> HomeController::Index2()
+        //
+        // Both of these actions match "Index" case-insensitively, but there exist two known canonical casings,
+        // so we will create an entry for "Index" and an entry for "index". Both of these entries match **both**
+        // actions.
+        private class Cache
+        {
+            public Cache(ActionDescriptorCollection actions)
+            {
+                // We need to store the version so the cache can be invalidated if the actions change.
+                Version = actions.Version;
+
+                // We need to build two maps for all of the route values.
+                OrdinalEntries = new Dictionary<string[], List<ActionDescriptor>>(StringArrayComparer.Ordinal);
+                OrdinalIgnoreCaseEntries = new Dictionary<string[], List<ActionDescriptor>>(StringArrayComparer.OrdinalIgnoreCase);
+
+                // We need to first identify of the keys that action selection will look at (in route data). 
+                // We want to only consider conventionally routed actions here.
+                var routeKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+                for (var i = 0; i < actions.Items.Count; i++)
+                {
+                    var action = actions.Items[i];
+                    if (action.AttributeRouteInfo == null)
+                    {
+                        // This is a conventionally routed action - so make sure we include its keys in the set of
+                        // known route value keys.
+                        foreach (var kvp in action.RouteValues)
+                        {
+                            routeKeys.Add(kvp.Key);
+                        }
+                    }
+                }
+
+                // We need to hold on to an ordered set of keys for the route values. We'll use these later to
+                // extract the set of route values from an incoming request to compare against our maps of known
+                // route values.
+                RouteKeys = routeKeys.ToArray();
+
+                for (var i = 0; i < actions.Items.Count; i++)
+                {
+                    var action = actions.Items[i];
+                    if (action.AttributeRouteInfo != null)
+                    {
+                        // This only handles conventional routing. Ignore attribute routed actions.
+                        continue;
+                    }
+
+                    // This is a conventionally routed action - so we need to extract the route values associated
+                    // with this action (in order) so we can store them in our dictionaries.
+                    var routeValues = new string[RouteKeys.Length];
+                    for (var j = 0; j < RouteKeys.Length; j++)
+                    {
+                        action.RouteValues.TryGetValue(RouteKeys[j], out routeValues[j]);
+                    }
+
+                    if (!OrdinalIgnoreCaseEntries.TryGetValue(routeValues, out var entries))
+                    {
+                        entries = new List<ActionDescriptor>();
+                        OrdinalIgnoreCaseEntries.Add(routeValues, entries);
+                    }
+
+                    entries.Add(action);
+
+                    // We also want to add the same (as in reference equality) list of actions to the ordinal entries.
+                    // We'll keep updating `entries` to include all of the actions in the same equivalence class -
+                    // meaning, all conventionally routed actions for which the route values are equalignoring case.
+                    //
+                    // `entries` will appear in `OrdinalIgnoreCaseEntries` exactly once and in `OrdinalEntries` once
+                    // for each variation of casing that we've seen.
+                    if (!OrdinalEntries.ContainsKey(routeValues))
+                    {
+                        OrdinalEntries.Add(routeValues, entries);
+                    }
+                }
+            }
+
+            public int Version { get; }
+
+            public string[] RouteKeys { get; }
+
+            public Dictionary<string[], List<ActionDescriptor>> OrdinalEntries { get; }
+
+            public Dictionary<string[], List<ActionDescriptor>> OrdinalIgnoreCaseEntries { get; }
+        }
+
+        private class StringArrayComparer : IEqualityComparer<string[]>
+        {
+            public static readonly StringArrayComparer Ordinal = new StringArrayComparer(StringComparer.Ordinal);
+
+            public static readonly StringArrayComparer OrdinalIgnoreCase = new StringArrayComparer(StringComparer.OrdinalIgnoreCase);
+
+            private readonly StringComparer _valueComparer;
+
+            private StringArrayComparer(StringComparer valueComparer)
+            {
+                _valueComparer = valueComparer;
+            }
+
+            public bool Equals(string[] x, string[] y)
+            {
+                if (object.ReferenceEquals(x, y))
+                {
+                    return true;
+                }
+
+                if (x == null ^ y == null)
+                {
+                    return false;
+                }
+
+                if (x.Length != y.Length)
+                {
+                    return false;
+                }
+
+                for (var i = 0; i < x.Length; i++)
+                {
+                    if (string.IsNullOrEmpty(x[i]) && string.IsNullOrEmpty(y[i]))
+                    {
+                        continue;
+                    }
+
+                    if (!_valueComparer.Equals(x[i], y[i]))
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+
+            public int GetHashCode(string[] obj)
+            {
+                if (obj == null)
+                {
+                    return 0;
+                }
+
+                var hash = new HashCodeCombiner();
+                for (var i = 0; i < obj.Length; i++)
+                {
+                    var o = obj[i];
+
+                    // Route values define null and "" to be equivalent.
+                    if (string.IsNullOrEmpty(o))
+                    {
+                        o = null;
+                    }
+                    hash.Add(o, _valueComparer);
+                }
+
+                return hash.CombinedHash;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AmbiguousActionException.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AmbiguousActionException.cs
new file mode 100644
index 0000000000..6b1a34d893
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AmbiguousActionException.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// An exception which indicates multiple matches in action selection.
+    /// </summary>
+    [Serializable]
+    public class AmbiguousActionException : InvalidOperationException
+    {
+        public AmbiguousActionException(string message)
+            : base(message)
+        {
+        }
+
+        protected AmbiguousActionException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ApiBehaviorApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ApiBehaviorApplicationModelProvider.cs
new file mode 100644
index 0000000000..1661eefc03
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ApiBehaviorApplicationModelProvider.cs
@@ -0,0 +1,262 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Routing.Template;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ApiBehaviorApplicationModelProvider : IApplicationModelProvider
+    {
+        private readonly ApiBehaviorOptions _apiBehaviorOptions;
+        private readonly IModelMetadataProvider _modelMetadataProvider;
+        private readonly ModelStateInvalidFilter _modelStateInvalidFilter;
+        private readonly ILogger _logger;
+
+        public ApiBehaviorApplicationModelProvider(
+            IOptions<ApiBehaviorOptions> apiBehaviorOptions,
+            IModelMetadataProvider modelMetadataProvider,
+            ILoggerFactory loggerFactory)
+        {
+            _apiBehaviorOptions = apiBehaviorOptions.Value;
+            _modelMetadataProvider = modelMetadataProvider;
+            _logger = loggerFactory.CreateLogger<ApiBehaviorApplicationModelProvider>();
+
+            if (!_apiBehaviorOptions.SuppressModelStateInvalidFilter && _apiBehaviorOptions.InvalidModelStateResponseFactory == null)
+            {
+                throw new ArgumentException(Resources.FormatPropertyOfTypeCannotBeNull(
+                    typeof(ApiBehaviorOptions),
+                    nameof(ApiBehaviorOptions.InvalidModelStateResponseFactory)));
+            }
+
+            _modelStateInvalidFilter = new ModelStateInvalidFilter(
+                apiBehaviorOptions.Value,
+                loggerFactory.CreateLogger<ModelStateInvalidFilter>());
+        }
+
+        /// <remarks>
+        /// Order is set to execute after the <see cref="DefaultApplicationModelProvider"/> and allow any other user
+        /// <see cref="IApplicationModelProvider"/> that configure routing to execute.
+        /// </remarks>
+        public int Order => -1000 + 100;
+
+        public void OnProvidersExecuted(ApplicationModelProviderContext context)
+        {
+        }
+
+        public void OnProvidersExecuting(ApplicationModelProviderContext context)
+        {
+            foreach (var controllerModel in context.Result.Controllers)
+            {
+                var isApiController = controllerModel.Attributes.OfType<IApiBehaviorMetadata>().Any();
+                if (isApiController &&
+                    controllerModel.ApiExplorer.IsVisible == null)
+                {
+                    // Enable ApiExplorer for the controller if it wasn't already explicitly configured.
+                    controllerModel.ApiExplorer.IsVisible = true;
+                }
+
+                if (isApiController)
+                {
+                    InferBoundPropertyModelPrefixes(controllerModel);
+                }
+
+                var controllerHasSelectorModel = controllerModel.Selectors.Any(s => s.AttributeRouteModel != null);
+
+                foreach (var actionModel in controllerModel.Actions)
+                {
+                    if (!isApiController && !actionModel.Attributes.OfType<IApiBehaviorMetadata>().Any())
+                    {
+                        continue;
+                    }
+
+                    EnsureActionIsAttributeRouted(controllerHasSelectorModel, actionModel);
+
+                    AddInvalidModelStateFilter(actionModel);
+
+                    InferParameterBindingSources(actionModel);
+
+                    InferParameterModelPrefixes(actionModel);
+
+                    AddMultipartFormDataConsumesAttribute(actionModel);
+                }
+            }
+        }
+
+        // Internal for unit testing
+        internal void AddMultipartFormDataConsumesAttribute(ActionModel actionModel)
+        {
+            if (_apiBehaviorOptions.SuppressConsumesConstraintForFormFileParameters)
+            {
+                return;
+            }
+
+            // Add a ConsumesAttribute if the request does not explicitly specify one.
+            if (actionModel.Filters.OfType<IConsumesActionConstraint>().Any())
+            {
+                return;
+            }
+
+            foreach (var parameter in actionModel.Parameters)
+            {
+                var bindingSource = parameter.BindingInfo?.BindingSource;
+                if (bindingSource == BindingSource.FormFile)
+                {
+                    // If an action accepts files, it must accept multipart/form-data.
+                    actionModel.Filters.Add(new ConsumesAttribute("multipart/form-data"));
+                }
+            }
+        }
+
+        private static void EnsureActionIsAttributeRouted(bool controllerHasSelectorModel, ActionModel actionModel)
+        {
+            if (!controllerHasSelectorModel && !actionModel.Selectors.Any(s => s.AttributeRouteModel != null))
+            {
+                // Require attribute routing with controllers annotated with ApiControllerAttribute
+                var message = Resources.FormatApiController_AttributeRouteRequired(
+                     actionModel.DisplayName,
+                    nameof(ApiControllerAttribute));
+                throw new InvalidOperationException(message);
+            }
+        }
+
+        private void AddInvalidModelStateFilter(ActionModel actionModel)
+        {
+            if (_apiBehaviorOptions.SuppressModelStateInvalidFilter)
+            {
+                return;
+            }
+
+            Debug.Assert(_apiBehaviorOptions.InvalidModelStateResponseFactory != null);
+            actionModel.Filters.Add(_modelStateInvalidFilter);
+        }
+
+        // Internal for unit testing
+        internal void InferParameterBindingSources(ActionModel actionModel)
+        {
+            if (_modelMetadataProvider == null || _apiBehaviorOptions.SuppressInferBindingSourcesForParameters)
+            {
+                return;
+            }
+            var inferredBindingSources = new BindingSource[actionModel.Parameters.Count];
+
+            for (var i = 0; i < actionModel.Parameters.Count; i++)
+            {
+                var parameter = actionModel.Parameters[i];
+                var bindingSource = parameter.BindingInfo?.BindingSource;
+                if (bindingSource == null)
+                {
+                    bindingSource = InferBindingSourceForParameter(parameter);
+
+                    parameter.BindingInfo = parameter.BindingInfo ?? new BindingInfo();
+                    parameter.BindingInfo.BindingSource = bindingSource;
+                }
+            }
+
+            var fromBodyParameters = actionModel.Parameters.Where(p => p.BindingInfo.BindingSource == BindingSource.Body).ToList();
+            if (fromBodyParameters.Count > 1)
+            {
+                var parameters = string.Join(Environment.NewLine, fromBodyParameters.Select(p => p.DisplayName));
+                var message = Resources.FormatApiController_MultipleBodyParametersFound(
+                    actionModel.DisplayName,
+                    nameof(FromQueryAttribute),
+                    nameof(FromRouteAttribute),
+                    nameof(FromBodyAttribute));
+
+                message += Environment.NewLine + parameters;
+                throw new InvalidOperationException(message);
+            }
+        }
+
+        // For any complex types that are bound from value providers, set the prefix
+        // to the empty prefix by default. This makes binding much more predictable
+        // and describable via ApiExplorer
+
+        // internal for testing
+        internal void InferBoundPropertyModelPrefixes(ControllerModel controllerModel)
+        {
+            foreach (var property in controllerModel.ControllerProperties)
+            {
+                if (property.BindingInfo != null &&
+                    property.BindingInfo.BinderModelName == null &&
+                    property.BindingInfo.BindingSource != null &&
+                    !property.BindingInfo.BindingSource.IsGreedy)
+                {
+                    var metadata = _modelMetadataProvider.GetMetadataForProperty(
+                        controllerModel.ControllerType,
+                        property.PropertyInfo.Name);
+                    if (metadata.IsComplexType && !metadata.IsCollectionType)
+                    {
+                        property.BindingInfo.BinderModelName = string.Empty;
+                    }
+                }
+            }
+        }
+
+        // internal for testing
+        internal void InferParameterModelPrefixes(ActionModel actionModel)
+        {
+            foreach (var parameter in actionModel.Parameters)
+            {
+                var bindingInfo = parameter.BindingInfo;
+                if (bindingInfo?.BindingSource != null &&
+                    bindingInfo.BinderModelName == null &&
+                    !bindingInfo.BindingSource.IsGreedy &&
+                    IsComplexTypeParameter(parameter))
+                {
+                    parameter.BindingInfo.BinderModelName = string.Empty;
+                }
+            }
+        }
+
+        // Internal for unit testing.
+        internal BindingSource InferBindingSourceForParameter(ParameterModel parameter)
+        {
+            if (ParameterExistsInAnyRoute(parameter.Action, parameter.ParameterName))
+            {
+                return BindingSource.Path;
+            }
+
+            var bindingSource = IsComplexTypeParameter(parameter) ?
+                BindingSource.Body :
+                BindingSource.Query;
+
+            return bindingSource;
+        }
+
+        private bool ParameterExistsInAnyRoute(ActionModel actionModel, string parameterName)
+        {
+            foreach (var (route, _, _) in ActionAttributeRouteModel.GetAttributeRoutes(actionModel))
+            {
+                if (route == null)
+                {
+                    continue;
+                }
+
+                var parsedTemplate = TemplateParser.Parse(route.Template);
+                if (parsedTemplate.GetParameter(parameterName) != null)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private bool IsComplexTypeParameter(ParameterModel parameter)
+        {
+            // No need for information from attributes on the parameter. Just use its type.
+            var metadata = _modelMetadataProvider
+                .GetMetadataForType(parameter.ParameterInfo.ParameterType);
+            return metadata.IsComplexType && !metadata.IsCollectionType;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ApiBehaviorOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ApiBehaviorOptionsSetup.cs
new file mode 100644
index 0000000000..48f50f7980
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ApiBehaviorOptionsSetup.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using System;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ApiBehaviorOptionsSetup : IConfigureOptions<ApiBehaviorOptions>
+    {
+
+        public ApiBehaviorOptionsSetup()
+        {
+        }
+
+        public void Configure(ApiBehaviorOptions options)
+        {
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            options.InvalidModelStateResponseFactory = GetInvalidModelStateResponse;
+
+            IActionResult GetInvalidModelStateResponse(ActionContext context)
+            {
+                var result = new BadRequestObjectResult(context.ModelState);
+
+                result.ContentTypes.Add("application/json");
+                result.ContentTypes.Add("application/xml");
+
+                return result;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ApiDescriptionActionData.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ApiDescriptionActionData.cs
new file mode 100644
index 0000000000..1a24b3d8bd
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ApiDescriptionActionData.cs
@@ -0,0 +1,18 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// Represents data used to build an <c>ApiDescription</c>, stored as part of the
+    /// <see cref="Abstractions.ActionDescriptor.Properties"/>.
+    /// </summary>
+    public class ApiDescriptionActionData
+    {
+        /// <summary>
+        /// The <c>ApiDescription.GroupName</c> of <c>ApiDescription</c> objects for the associated
+        /// action.
+        /// </summary>
+        public string GroupName { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ApplicationModelConventions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ApplicationModelConventions.cs
new file mode 100644
index 0000000000..108890f5ce
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ApplicationModelConventions.cs
@@ -0,0 +1,118 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// Applies conventions to a <see cref="ApplicationModel"/>.
+    /// </summary>
+    public static class ApplicationModelConventions
+    {
+        /// <summary>
+        /// Applies conventions to a <see cref="ApplicationModel"/>.
+        /// </summary>
+        /// <param name="applicationModel">The <see cref="ApplicationModel"/>.</param>
+        /// <param name="conventions">The set of conventions.</param>
+        public static void ApplyConventions(
+            ApplicationModel applicationModel,
+            IEnumerable<IApplicationModelConvention> conventions)
+        {
+            if (applicationModel == null)
+            {
+                throw new ArgumentNullException(nameof(applicationModel));
+            }
+
+            if (conventions == null)
+            {
+                throw new ArgumentNullException(nameof(conventions));
+            }
+
+            // Conventions are applied from the outside-in to allow for scenarios where an action overrides
+            // a controller, etc.
+            foreach (var convention in conventions)
+            {
+                convention.Apply(applicationModel);
+            }
+
+            var controllers = applicationModel.Controllers.ToArray();
+            // First apply the conventions from attributes in decreasing order of scope.
+            foreach (var controller in controllers)
+            {
+                // ToArray is needed here to prevent issues with modifying the attributes collection
+                // while iterating it.
+                var controllerConventions =
+                    controller.Attributes
+                        .OfType<IControllerModelConvention>()
+                        .ToArray();
+
+                foreach (var controllerConvention in controllerConventions)
+                {
+                    controllerConvention.Apply(controller);
+                }
+
+                var actions = controller.Actions.ToArray();
+                foreach (var action in actions)
+                {
+                    // ToArray is needed here to prevent issues with modifying the attributes collection
+                    // while iterating it.
+                    var actionConventions =
+                        action.Attributes
+                            .OfType<IActionModelConvention>()
+                            .ToArray();
+
+                    foreach (var actionConvention in actionConventions)
+                    {
+                        actionConvention.Apply(action);
+                    }
+
+                    var parameters = action.Parameters.ToArray();
+                    foreach (var parameter in parameters)
+                    {
+                        // ToArray is needed here to prevent issues with modifying the attributes collection
+                        // while iterating it.
+                        var parameterConventions =
+                            parameter.Attributes
+                                .OfType<IParameterModelConvention>()
+                                .ToArray();
+
+                        foreach (var parameterConvention in parameterConventions)
+                        {
+                            parameterConvention.Apply(parameter);
+                        }
+
+                        var parameterBaseConventions = GetConventions<IParameterModelBaseConvention>(conventions, parameter.Attributes);
+                        foreach (var parameterConvention in parameterBaseConventions)
+                        {
+                            parameterConvention.Apply(parameter);
+                        }
+                    }
+                }
+
+                var properties = controller.ControllerProperties.ToArray();
+                foreach (var property in properties)
+                {
+                    var parameterBaseConventions = GetConventions<IParameterModelBaseConvention>(conventions, property.Attributes);
+
+                    foreach (var parameterConvention in parameterBaseConventions)
+                    {
+                        parameterConvention.Apply(property);
+                    }
+                }
+            }
+        }
+
+        private static IEnumerable<TConvention> GetConventions<TConvention>(
+            IEnumerable<IApplicationModelConvention> conventions,
+            IReadOnlyList<object> attributes)
+        {
+            return Enumerable.Concat(
+                conventions.OfType<TConvention>(),
+                attributes.OfType<TConvention>());
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AttributeRoute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AttributeRoute.cs
new file mode 100644
index 0000000000..bf1f4d575d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AttributeRoute.cs
@@ -0,0 +1,317 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Routing.Template;
+using Microsoft.AspNetCore.Routing.Tree;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class AttributeRoute : IRouter
+    {
+        private readonly IActionDescriptorCollectionProvider _actionDescriptorCollectionProvider;
+        private readonly IServiceProvider _services;
+        private readonly Func<ActionDescriptor[], IRouter> _handlerFactory;
+
+        private TreeRouter _router;
+
+        public AttributeRoute(
+            IActionDescriptorCollectionProvider actionDescriptorCollectionProvider,
+            IServiceProvider services,
+            Func<ActionDescriptor[], IRouter> handlerFactory)
+        {
+            if (actionDescriptorCollectionProvider == null)
+            {
+                throw new ArgumentNullException(nameof(actionDescriptorCollectionProvider));
+            }
+
+            if (services == null)
+            {
+                throw new ArgumentNullException(nameof(services));
+            }
+
+            if (handlerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(handlerFactory));
+            }
+
+            _actionDescriptorCollectionProvider = actionDescriptorCollectionProvider;
+            _services = services;
+            _handlerFactory = handlerFactory;
+        }
+
+        /// <inheritdoc />
+        public VirtualPathData GetVirtualPath(VirtualPathContext context)
+        {
+            var router = GetTreeRouter();
+            return router.GetVirtualPath(context);
+        }
+
+        /// <inheritdoc />
+        public Task RouteAsync(RouteContext context)
+        {
+            var router = GetTreeRouter();
+            return router.RouteAsync(context);
+        }
+
+        private TreeRouter GetTreeRouter()
+        {
+            var actions = _actionDescriptorCollectionProvider.ActionDescriptors;
+
+            // This is a safe-race. We'll never set router back to null after initializing
+            // it on startup.
+            if (_router == null || _router.Version != actions.Version)
+            {
+                var builder = _services.GetRequiredService<TreeRouteBuilder>();
+                AddEntries(builder, actions);
+                _router = builder.Build(actions.Version);
+            }
+
+            return _router;
+        }
+
+        // internal for testing
+        internal void AddEntries(TreeRouteBuilder builder, ActionDescriptorCollection actions)
+        {
+            var routeInfos = GetRouteInfos(actions.Items);
+
+            // We're creating one TreeRouteLinkGenerationEntry per action. This allows us to match the intended
+            // action by expected route values, and then use the TemplateBinder to generate the link.
+            foreach (var routeInfo in routeInfos)
+            {
+                if (routeInfo.SuppressLinkGeneration)
+                {
+                    continue;
+                }
+
+                var defaults = new RouteValueDictionary();
+                foreach (var kvp in routeInfo.ActionDescriptor.RouteValues)
+                {
+                    defaults.Add(kvp.Key, kvp.Value);
+                }
+
+                try
+                {
+                    // We use the `NullRouter` as the route handler because we don't need to do anything for link
+                    // generations. The TreeRouter does it all for us.
+                    builder.MapOutbound(
+                        NullRouter.Instance,
+                        routeInfo.RouteTemplate,
+                        defaults,
+                        routeInfo.RouteName,
+                        routeInfo.Order);
+                }
+                catch (RouteCreationException routeCreationException)
+                {
+                    throw new RouteCreationException(
+                        "An error occurred while adding a route to the route builder. " +
+                        $"Route name '{routeInfo.RouteName}' and template '{routeInfo.RouteTemplate.TemplateText}'.",
+                        routeCreationException);
+                }
+            }
+
+            // We're creating one AttributeRouteMatchingEntry per group, so we need to identify the distinct set of
+            // groups. It's guaranteed that all members of the group have the same template and precedence,
+            // so we only need to hang on to a single instance of the RouteInfo for each group.
+            var groups = GetInboundRouteGroups(routeInfos);
+            foreach (var group in groups)
+            {
+                var handler = _handlerFactory(group.ToArray());
+
+                // Note that because we only support 'inline' defaults, each routeInfo group also has the same
+                // set of defaults.
+                //
+                // We then inject the route group as a default for the matcher so it gets passed back to MVC
+                // for use in action selection.
+                builder.MapInbound(
+                    handler,
+                    group.Key.RouteTemplate,
+                    group.Key.RouteName,
+                    group.Key.Order);
+            }
+        }
+
+        private static IEnumerable<IGrouping<RouteInfo, ActionDescriptor>> GetInboundRouteGroups(List<RouteInfo> routeInfos)
+        {
+            return routeInfos
+                .Where(routeInfo => !routeInfo.SuppressPathMatching)
+                .GroupBy(r => r, r => r.ActionDescriptor, RouteInfoEqualityComparer.Instance);
+        }
+
+        private static List<RouteInfo> GetRouteInfos(IReadOnlyList<ActionDescriptor> actions)
+        {
+            var routeInfos = new List<RouteInfo>();
+            var errors = new List<RouteInfo>();
+
+            // This keeps a cache of 'Template' objects. It's a fairly common case that multiple actions
+            // will use the same route template string; thus, the `Template` object can be shared.
+            //
+            // For a relatively simple route template, the `Template` object will hold about 500 bytes
+            // of memory, so sharing is worthwhile.
+            var templateCache = new Dictionary<string, RouteTemplate>(StringComparer.OrdinalIgnoreCase);
+
+            var attributeRoutedActions = actions.Where(a => a.AttributeRouteInfo?.Template != null);
+            foreach (var action in attributeRoutedActions)
+            {
+                var routeInfo = GetRouteInfo(templateCache, action);
+                if (routeInfo.ErrorMessage == null)
+                {
+                    routeInfos.Add(routeInfo);
+                }
+                else
+                {
+                    errors.Add(routeInfo);
+                }
+            }
+
+            if (errors.Count > 0)
+            {
+                var allErrors = string.Join(
+                    Environment.NewLine + Environment.NewLine,
+                    errors.Select(
+                        e => Resources.FormatAttributeRoute_IndividualErrorMessage(
+                            e.ActionDescriptor.DisplayName,
+                            Environment.NewLine,
+                            e.ErrorMessage)));
+
+                var message = Resources.FormatAttributeRoute_AggregateErrorMessage(Environment.NewLine, allErrors);
+                throw new RouteCreationException(message);
+            }
+
+            return routeInfos;
+        }
+
+        private static RouteInfo GetRouteInfo(
+            Dictionary<string, RouteTemplate> templateCache,
+            ActionDescriptor action)
+        {
+            var routeInfo = new RouteInfo()
+            {
+                ActionDescriptor = action,
+            };
+
+            try
+            {
+                if (!templateCache.TryGetValue(action.AttributeRouteInfo.Template, out var parsedTemplate))
+                {
+                    // Parsing with throw if the template is invalid.
+                    parsedTemplate = TemplateParser.Parse(action.AttributeRouteInfo.Template);
+                    templateCache.Add(action.AttributeRouteInfo.Template, parsedTemplate);
+                }
+
+                routeInfo.RouteTemplate = parsedTemplate;
+                routeInfo.SuppressPathMatching = action.AttributeRouteInfo.SuppressPathMatching;
+                routeInfo.SuppressLinkGeneration = action.AttributeRouteInfo.SuppressLinkGeneration;
+            }
+            catch (Exception ex)
+            {
+                routeInfo.ErrorMessage = ex.Message;
+                return routeInfo;
+            }
+
+            foreach (var kvp in action.RouteValues)
+            {
+                foreach (var parameter in routeInfo.RouteTemplate.Parameters)
+                {
+                    if (string.Equals(kvp.Key, parameter.Name, StringComparison.OrdinalIgnoreCase))
+                    {
+                        routeInfo.ErrorMessage = Resources.FormatAttributeRoute_CannotContainParameter(
+                            routeInfo.RouteTemplate.TemplateText,
+                            kvp.Key,
+                            kvp.Value);
+
+                        return routeInfo;
+                    }
+                }
+            }
+
+            routeInfo.Order = action.AttributeRouteInfo.Order;
+            routeInfo.RouteName = action.AttributeRouteInfo.Name;
+
+            return routeInfo;
+        }
+
+        private class RouteInfo
+        {
+            public ActionDescriptor ActionDescriptor { get; set; }
+
+            public string ErrorMessage { get; set; }
+
+            public int Order { get; set; }
+
+            public string RouteName { get; set; }
+
+            public RouteTemplate RouteTemplate { get; set; }
+
+            public bool SuppressPathMatching { get; set; }
+
+            public bool SuppressLinkGeneration { get; set; }
+        }
+
+        private class RouteInfoEqualityComparer : IEqualityComparer<RouteInfo>
+        {
+            public static readonly RouteInfoEqualityComparer Instance = new RouteInfoEqualityComparer();
+
+            public bool Equals(RouteInfo x, RouteInfo y)
+            {
+                if (x == null && y == null)
+                {
+                    return true;
+                }
+                else if (x == null ^ y == null)
+                {
+                    return false;
+                }
+                else if (x.Order != y.Order)
+                {
+                    return false;
+                }
+                else
+                {
+                    return string.Equals(
+                        x.RouteTemplate.TemplateText,
+                        y.RouteTemplate.TemplateText,
+                        StringComparison.OrdinalIgnoreCase);
+                }
+            }
+
+            public int GetHashCode(RouteInfo obj)
+            {
+                if (obj == null)
+                {
+                    return 0;
+                }
+
+                var hash = new HashCodeCombiner();
+                hash.Add(obj.Order);
+                hash.Add(obj.RouteTemplate.TemplateText, StringComparer.OrdinalIgnoreCase);
+                return hash;
+            }
+        }
+
+        // Used only to hook up link generation, and it doesn't need to do anything.
+        private class NullRouter : IRouter
+        {
+            public static readonly NullRouter Instance = new NullRouter();
+
+            public VirtualPathData GetVirtualPath(VirtualPathContext context)
+            {
+                return null;
+            }
+
+            public Task RouteAsync(RouteContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AttributeRouting.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AttributeRouting.cs
new file mode 100644
index 0000000000..e5bf2d5ec4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AttributeRouting.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public static class AttributeRouting
+    {
+        /// <summary>
+        /// Creates an attribute route using the provided services and provided target router.
+        /// </summary>
+        /// <param name="services">The application services.</param>
+        /// <returns>An attribute route.</returns>
+        public static IRouter CreateAttributeMegaRoute(IServiceProvider services)
+        {
+            if (services == null)
+            {
+                throw new ArgumentNullException(nameof(services));
+            }
+
+            return new AttributeRoute(
+                services.GetRequiredService<IActionDescriptorCollectionProvider>(),
+                services,
+                actions => 
+                {
+                    var handler = services.GetRequiredService<MvcAttributeRouteHandler>();
+                    handler.Actions = actions;
+                    return handler;
+                });
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AuthorizationApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AuthorizationApplicationModelProvider.cs
new file mode 100644
index 0000000000..3166c9deb0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/AuthorizationApplicationModelProvider.cs
@@ -0,0 +1,79 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Authorization;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class AuthorizationApplicationModelProvider : IApplicationModelProvider
+    {
+        private readonly IAuthorizationPolicyProvider _policyProvider;
+
+        public AuthorizationApplicationModelProvider(IAuthorizationPolicyProvider policyProvider)
+        {
+            _policyProvider = policyProvider;
+        }
+
+        public int Order => -1000 + 10;
+
+        public void OnProvidersExecuted(ApplicationModelProviderContext context)
+        {
+            // Intentionally empty.
+        }
+
+        public void OnProvidersExecuting(ApplicationModelProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            foreach (var controllerModel in context.Result.Controllers)
+            {
+                var controllerModelAuthData = controllerModel.Attributes.OfType<IAuthorizeData>().ToArray();
+                if (controllerModelAuthData.Length > 0)
+                {
+                    controllerModel.Filters.Add(GetFilter(_policyProvider, controllerModelAuthData));
+                }
+                foreach (var attribute in controllerModel.Attributes.OfType<IAllowAnonymous>())
+                {
+                    controllerModel.Filters.Add(new AllowAnonymousFilter());
+                }
+
+                foreach (var actionModel in controllerModel.Actions)
+                {
+                    var actionModelAuthData = actionModel.Attributes.OfType<IAuthorizeData>().ToArray();
+                    if (actionModelAuthData.Length > 0)
+                    {
+                        actionModel.Filters.Add(GetFilter(_policyProvider, actionModelAuthData));
+                    }
+
+                    foreach (var attribute in actionModel.Attributes.OfType<IAllowAnonymous>())
+                    {
+                        actionModel.Filters.Add(new AllowAnonymousFilter());
+                    }
+                }
+            }
+        }
+
+        public static AuthorizeFilter GetFilter(IAuthorizationPolicyProvider policyProvider, IEnumerable<IAuthorizeData> authData)
+        {
+            // The default policy provider will make the same policy for given input, so make it only once.
+            // This will always execute synchronously.
+            if (policyProvider.GetType() == typeof(DefaultAuthorizationPolicyProvider))
+            {
+                var policy = AuthorizationPolicy.CombineAsync(policyProvider, authData).GetAwaiter().GetResult();
+                return new AuthorizeFilter(policy);
+            }
+            else
+            {
+                return new AuthorizeFilter(policyProvider, authData);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ClientValidatorCache.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ClientValidatorCache.cs
new file mode 100644
index 0000000000..37adde40c2
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ClientValidatorCache.cs
@@ -0,0 +1,143 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ClientValidatorCache
+    {
+        private readonly ConcurrentDictionary<ModelMetadata, CacheEntry> _cacheEntries = new ConcurrentDictionary<ModelMetadata, CacheEntry>();
+
+        public IReadOnlyList<IClientModelValidator> GetValidators(ModelMetadata metadata, IClientModelValidatorProvider validatorProvider)
+        {
+            if (_cacheEntries.TryGetValue(metadata, out var entry))
+            {
+                return GetValidatorsFromEntry(entry, metadata, validatorProvider);
+            }
+
+            var items = new List<ClientValidatorItem>(metadata.ValidatorMetadata.Count);
+            for (var i = 0; i < metadata.ValidatorMetadata.Count; i++)
+            {
+                items.Add(new ClientValidatorItem(metadata.ValidatorMetadata[i]));
+            }
+
+            ExecuteProvider(validatorProvider, metadata, items);
+
+            var validators = ExtractValidators(items);
+
+            var allValidatorsCached = true;
+            for (var i = 0; i < items.Count; i++)
+            {
+                var item = items[i];
+                if (!item.IsReusable)
+                {
+                    item.Validator = null;
+                    allValidatorsCached = false;
+                }
+            }
+
+            if (allValidatorsCached)
+            {
+                entry = new CacheEntry(validators);
+            }
+            else
+            {
+                entry = new CacheEntry(items);
+            }
+
+            _cacheEntries.TryAdd(metadata, entry);
+
+            return validators;
+        }
+
+        private IReadOnlyList<IClientModelValidator> GetValidatorsFromEntry(CacheEntry entry, ModelMetadata metadata, IClientModelValidatorProvider validationProvider)
+        {
+            Debug.Assert(entry.Validators != null || entry.Items != null);
+
+            if (entry.Validators != null)
+            {
+                return entry.Validators;
+            }
+
+            var items = new List<ClientValidatorItem>(entry.Items.Count);
+            for (var i = 0; i < entry.Items.Count; i++)
+            {
+                var item = entry.Items[i];
+                if (item.IsReusable)
+                {
+                    items.Add(item);
+                }
+                else
+                {
+                    items.Add(new ClientValidatorItem(item.ValidatorMetadata));
+                }
+            }
+
+            ExecuteProvider(validationProvider, metadata, items);
+
+            return ExtractValidators(items);
+        }
+
+        private void ExecuteProvider(IClientModelValidatorProvider validatorProvider, ModelMetadata metadata, List<ClientValidatorItem> items)
+        {
+            var context = new ClientValidatorProviderContext(metadata, items);
+
+            validatorProvider.CreateValidators(context);
+        }
+
+        private IReadOnlyList<IClientModelValidator> ExtractValidators(List<ClientValidatorItem> items)
+        {
+            var count = 0;
+            for (var i = 0; i < items.Count; i++)
+            {
+                if (items[i].Validator != null)
+                {
+                    count++;
+                }
+            }
+
+            if (count == 0)
+            {
+                return Array.Empty<IClientModelValidator>();
+            }
+
+            var validators = new IClientModelValidator[count];
+            var clientValidatorIndex = 0;
+            for (int i = 0; i < items.Count; i++)
+            {
+                var validator = items[i].Validator;
+                if (validator != null)
+                {
+                    validators[clientValidatorIndex++] = validator;
+                }
+            }
+
+            return validators;
+        }
+
+        private struct CacheEntry
+        {
+            public CacheEntry(IReadOnlyList<IClientModelValidator> validators)
+            {
+                Validators = validators;
+                Items = null;
+            }
+
+            public CacheEntry(List<ClientValidatorItem> items)
+            {
+                Items = items;
+                Validators = null;
+            }
+
+            public IReadOnlyList<IClientModelValidator> Validators { get; }
+
+            public List<ClientValidatorItem> Items { get; }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionDescriptorBuilder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionDescriptorBuilder.cs
new file mode 100644
index 0000000000..18ae818293
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionDescriptorBuilder.cs
@@ -0,0 +1,623 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// Creates instances of <see cref="ControllerActionDescriptor"/> from <see cref="ApplicationModel"/>.
+    /// </summary>
+    public static class ControllerActionDescriptorBuilder
+    {
+        // This is the default order for attribute routes whose order calculated from
+        // the controller model is null.
+        private const int DefaultAttributeRouteOrder = 0;
+
+        /// <summary>
+        /// Creates instances of <see cref="ControllerActionDescriptor"/> from <see cref="ApplicationModel"/>.
+        /// </summary>
+        /// <param name="application">The <see cref="ApplicationModel"/>.</param>
+        /// <returns>The list of <see cref="ControllerActionDescriptor"/>.</returns>
+        public static IList<ControllerActionDescriptor> Build(ApplicationModel application)
+        {
+            var actions = new List<ControllerActionDescriptor>();
+
+            var methodInfoMap = new MethodToActionMap();
+
+            var routeTemplateErrors = new List<string>();
+            var attributeRoutingConfigurationErrors = new Dictionary<MethodInfo, string>();
+
+            foreach (var controller in application.Controllers)
+            {
+                // Only add properties which are explicitly marked to bind.
+                // The attribute check is required for ModelBinder attribute.
+                var controllerPropertyDescriptors = controller.ControllerProperties
+                    .Where(p => p.BindingInfo != null)
+                    .Select(CreateParameterDescriptor)
+                    .ToList();
+                foreach (var action in controller.Actions)
+                {
+                    // Controllers with multiple [Route] attributes (or user defined implementation of
+                    // IRouteTemplateProvider) will generate one action descriptor per IRouteTemplateProvider
+                    // instance.
+                    // Actions with multiple [Http*] attributes or other (IRouteTemplateProvider implementations
+                    // have already been identified as different actions during action discovery.
+                    var actionDescriptors = CreateActionDescriptors(application, controller, action);
+
+                    foreach (var actionDescriptor in actionDescriptors)
+                    {
+                        actionDescriptor.ControllerName = controller.ControllerName;
+                        actionDescriptor.ControllerTypeInfo = controller.ControllerType;
+
+                        AddApiExplorerInfo(actionDescriptor, application, controller, action);
+                        AddRouteValues(actionDescriptor, controller, action);
+                        AddProperties(actionDescriptor, action, controller, application);
+
+                        actionDescriptor.BoundProperties = controllerPropertyDescriptors;
+
+                        if (IsAttributeRoutedAction(actionDescriptor))
+                        {
+                            // Replaces tokens like [controller]/[action] in the route template with the actual values
+                            // for this action.
+                            ReplaceAttributeRouteTokens(actionDescriptor, routeTemplateErrors);
+                        }
+                    }
+
+                    methodInfoMap.AddToMethodInfo(action, actionDescriptors);
+                    actions.AddRange(actionDescriptors);
+                }
+            }
+
+            var actionsByRouteName = new Dictionary<string, IList<ActionDescriptor>>(
+                StringComparer.OrdinalIgnoreCase);
+
+            // Keeps track of all the methods that we've validated to avoid visiting each action group
+            // more than once.
+            var validatedMethods = new HashSet<MethodInfo>();
+
+            foreach (var actionDescriptor in actions)
+            {
+                if (!validatedMethods.Contains(actionDescriptor.MethodInfo))
+                {
+                    ValidateActionGroupConfiguration(
+                        methodInfoMap,
+                        actionDescriptor,
+                        attributeRoutingConfigurationErrors);
+
+                    validatedMethods.Add(actionDescriptor.MethodInfo);
+                }
+
+                var attributeRouteInfo = actionDescriptor.AttributeRouteInfo;
+                if (attributeRouteInfo?.Name != null)
+                {
+                    // Build a map of attribute route name to action descriptors to ensure that all
+                    // attribute routes with a given name have the same template.
+                    AddActionToNamedGroup(actionsByRouteName, attributeRouteInfo.Name, actionDescriptor);
+                }
+            }
+
+            if (attributeRoutingConfigurationErrors.Any())
+            {
+                var message = CreateAttributeRoutingAggregateErrorMessage(
+                    attributeRoutingConfigurationErrors.Values);
+
+                throw new InvalidOperationException(message);
+            }
+
+            var namedRoutedErrors = ValidateNamedAttributeRoutedActions(actionsByRouteName);
+            if (namedRoutedErrors.Any())
+            {
+                var message = CreateAttributeRoutingAggregateErrorMessage(namedRoutedErrors);
+                throw new InvalidOperationException(message);
+            }
+
+            if (routeTemplateErrors.Any())
+            {
+                var message = CreateAttributeRoutingAggregateErrorMessage(routeTemplateErrors);
+                throw new InvalidOperationException(message);
+            }
+
+            return actions;
+        }
+
+        private static IList<ControllerActionDescriptor> CreateActionDescriptors(
+            ApplicationModel application,
+            ControllerModel controller,
+            ActionModel action)
+        {
+            var defaultControllerConstraints = Enumerable.Empty<IActionConstraintMetadata>();
+            if (controller.Selectors.Count > 0)
+            {
+                defaultControllerConstraints = controller.Selectors[0].ActionConstraints
+                    .Where(constraint => !(constraint is IRouteTemplateProvider));
+            }
+
+            var actionDescriptors = new List<ControllerActionDescriptor>();
+            foreach (var result in ActionAttributeRouteModel.GetAttributeRoutes(action))
+            {
+                var actionSelector = result.actionSelector;
+                var controllerSelector = result.controllerSelector;
+
+                var actionDescriptor = CreateActionDescriptor(action, result.route);
+                actionDescriptors.Add(actionDescriptor);
+                AddActionFilters(actionDescriptor, action.Filters, controller.Filters, application.Filters);
+
+                var controllerConstraints = defaultControllerConstraints;
+
+                if (controllerSelector?.AttributeRouteModel?.Attribute is IActionConstraintMetadata actionConstraint)
+                {
+                    // Use the attribute route as a constraint if the controller selector participated in creating this route.
+                    controllerConstraints = controllerConstraints.Concat(new[] { actionConstraint });
+                }
+
+                AddActionConstraints(actionDescriptor, actionSelector, controllerConstraints);
+            }
+
+            return actionDescriptors;
+        }
+
+        private static ControllerActionDescriptor CreateActionDescriptor(ActionModel action, AttributeRouteModel routeModel)
+        {
+            var parameterDescriptors = new List<ParameterDescriptor>();
+            foreach (var parameter in action.Parameters)
+            {
+                var parameterDescriptor = CreateParameterDescriptor(parameter);
+                parameterDescriptors.Add(parameterDescriptor);
+            }
+
+            var actionDescriptor = new ControllerActionDescriptor
+            {
+                ActionName = action.ActionName,
+                MethodInfo = action.ActionMethod,
+                Parameters = parameterDescriptors,
+                AttributeRouteInfo = CreateAttributeRouteInfo(routeModel),
+            };
+
+            return actionDescriptor;
+        }
+
+        private static ParameterDescriptor CreateParameterDescriptor(ParameterModel parameterModel)
+        {
+            var parameterDescriptor = new ControllerParameterDescriptor()
+            {
+                Name = parameterModel.ParameterName,
+                ParameterType = parameterModel.ParameterInfo.ParameterType,
+                BindingInfo = parameterModel.BindingInfo,
+                ParameterInfo = parameterModel.ParameterInfo,
+            };
+
+            return parameterDescriptor;
+        }
+
+        private static ParameterDescriptor CreateParameterDescriptor(PropertyModel propertyModel)
+        {
+            var parameterDescriptor = new ControllerBoundPropertyDescriptor()
+            {
+                BindingInfo = propertyModel.BindingInfo,
+                Name = propertyModel.PropertyName,
+                ParameterType = propertyModel.PropertyInfo.PropertyType,
+                PropertyInfo = propertyModel.PropertyInfo,
+            };
+
+            return parameterDescriptor;
+        }
+
+        private static void AddApiExplorerInfo(
+            ControllerActionDescriptor actionDescriptor,
+            ApplicationModel application,
+            ControllerModel controller,
+            ActionModel action)
+        {
+            var isVisible =
+                action.ApiExplorer?.IsVisible ??
+                controller.ApiExplorer?.IsVisible ??
+                application.ApiExplorer?.IsVisible ??
+                false;
+
+            var isVisibleSetOnActionOrController =
+                action.ApiExplorer?.IsVisible ??
+                controller.ApiExplorer?.IsVisible ??
+                false;
+
+            // ApiExplorer isn't supported on conventional-routed actions, but we still allow you to configure
+            // it at the application level when you have a mix of controller types. We'll just skip over enabling
+            // ApiExplorer for conventional-routed controllers when this happens.
+            var isVisibleSetOnApplication = application.ApiExplorer?.IsVisible ?? false;
+
+            if (isVisibleSetOnActionOrController && !IsAttributeRoutedAction(actionDescriptor))
+            {
+                // ApiExplorer is only supported on attribute routed actions.
+                throw new InvalidOperationException(Resources.FormatApiExplorer_UnsupportedAction(
+                    actionDescriptor.DisplayName));
+            }
+            else if (isVisibleSetOnApplication && !IsAttributeRoutedAction(actionDescriptor))
+            {
+                // This is the case where we're going to be lenient, just ignore it.
+            }
+            else if (isVisible)
+            {
+                Debug.Assert(IsAttributeRoutedAction(actionDescriptor));
+
+                var apiExplorerActionData = new ApiDescriptionActionData()
+                {
+                    GroupName = action.ApiExplorer?.GroupName ?? controller.ApiExplorer?.GroupName,
+                };
+
+                actionDescriptor.SetProperty(apiExplorerActionData);
+            }
+        }
+
+        private static void AddProperties(
+            ControllerActionDescriptor actionDescriptor,
+            ActionModel action,
+            ControllerModel controller,
+            ApplicationModel application)
+        {
+            foreach (var item in application.Properties)
+            {
+                actionDescriptor.Properties[item.Key] = item.Value;
+            }
+
+            foreach (var item in controller.Properties)
+            {
+                actionDescriptor.Properties[item.Key] = item.Value;
+            }
+
+            foreach (var item in action.Properties)
+            {
+                actionDescriptor.Properties[item.Key] = item.Value;
+            }
+        }
+
+        private static void AddActionFilters(
+            ControllerActionDescriptor actionDescriptor,
+            IEnumerable<IFilterMetadata> actionFilters,
+            IEnumerable<IFilterMetadata> controllerFilters,
+            IEnumerable<IFilterMetadata> globalFilters)
+        {
+            actionDescriptor.FilterDescriptors =
+                actionFilters.Select(f => new FilterDescriptor(f, FilterScope.Action))
+                .Concat(controllerFilters.Select(f => new FilterDescriptor(f, FilterScope.Controller)))
+                .Concat(globalFilters.Select(f => new FilterDescriptor(f, FilterScope.Global)))
+                .OrderBy(d => d, FilterDescriptorOrderComparer.Comparer)
+                .ToList();
+        }
+
+        private static AttributeRouteInfo CreateAttributeRouteInfo(AttributeRouteModel routeModel)
+        {
+            if (routeModel == null)
+            {
+                return null;
+            }
+
+            return new AttributeRouteInfo
+            {
+                Template = routeModel.Template,
+                Order = routeModel.Order ?? DefaultAttributeRouteOrder,
+                Name = routeModel.Name,
+                SuppressLinkGeneration = routeModel.SuppressLinkGeneration,
+                SuppressPathMatching = routeModel.SuppressPathMatching,
+            };
+        }
+
+        private static void AddActionConstraints(
+            ControllerActionDescriptor actionDescriptor,
+            SelectorModel selectorModel,
+            IEnumerable<IActionConstraintMetadata> controllerConstraints)
+        {
+            var constraints = new List<IActionConstraintMetadata>();
+
+            if (selectorModel.ActionConstraints != null)
+            {
+                constraints.AddRange(selectorModel.ActionConstraints);
+            }
+
+            if (controllerConstraints != null)
+            {
+                constraints.AddRange(controllerConstraints);
+            }
+
+            if (constraints.Count > 0)
+            {
+                actionDescriptor.ActionConstraints = constraints;
+            }
+        }
+
+        public static void AddRouteValues(
+            ControllerActionDescriptor actionDescriptor,
+            ControllerModel controller,
+            ActionModel action)
+        {
+            // Apply all the constraints defined on the action, then controller (for example, [Area])
+            // to the actions. Also keep track of all the constraints that require preventing actions
+            // without the constraint to match. For example, actions without an [Area] attribute on their
+            // controller should not match when a value has been given for area when matching a url or
+            // generating a link.
+            foreach (var kvp in action.RouteValues)
+            {
+                // Skip duplicates
+                if (!actionDescriptor.RouteValues.ContainsKey(kvp.Key))
+                {
+                    actionDescriptor.RouteValues.Add(kvp.Key, kvp.Value);
+                }
+            }
+
+            foreach (var kvp in controller.RouteValues)
+            {
+                // Skip duplicates - this also means that a value on the action will take precedence
+                if (!actionDescriptor.RouteValues.ContainsKey(kvp.Key))
+                {
+                    actionDescriptor.RouteValues.Add(kvp.Key, kvp.Value);
+                }
+            }
+
+            // Lastly add the 'default' values
+            if (!actionDescriptor.RouteValues.ContainsKey("action"))
+            {
+                actionDescriptor.RouteValues.Add("action", action.ActionName ?? string.Empty);
+            }
+
+            if (!actionDescriptor.RouteValues.ContainsKey("controller"))
+            {
+                actionDescriptor.RouteValues.Add("controller", controller.ControllerName);
+            }
+        }
+
+        private static void ReplaceAttributeRouteTokens(
+            ControllerActionDescriptor actionDescriptor,
+            IList<string> routeTemplateErrors)
+        {
+            try
+            {
+                actionDescriptor.AttributeRouteInfo.Template = AttributeRouteModel.ReplaceTokens(
+                    actionDescriptor.AttributeRouteInfo.Template,
+                    actionDescriptor.RouteValues);
+
+                if (actionDescriptor.AttributeRouteInfo.Name != null)
+                {
+                    actionDescriptor.AttributeRouteInfo.Name = AttributeRouteModel.ReplaceTokens(
+                        actionDescriptor.AttributeRouteInfo.Name,
+                        actionDescriptor.RouteValues);
+                }
+            }
+            catch (InvalidOperationException ex)
+            {
+                // Routing will throw an InvalidOperationException here if we can't parse/replace tokens
+                // in the template.
+                var message = Resources.FormatAttributeRoute_IndividualErrorMessage(
+                    actionDescriptor.DisplayName,
+                    Environment.NewLine,
+                    ex.Message);
+
+                routeTemplateErrors.Add(message);
+            }
+        }
+
+        private static void AddActionToNamedGroup(
+            IDictionary<string, IList<ActionDescriptor>> actionsByRouteName,
+            string routeName,
+            ControllerActionDescriptor actionDescriptor)
+        {
+            if (actionsByRouteName.TryGetValue(routeName, out var namedActionGroup))
+            {
+                namedActionGroup.Add(actionDescriptor);
+            }
+            else
+            {
+                namedActionGroup = new List<ActionDescriptor>();
+                namedActionGroup.Add(actionDescriptor);
+                actionsByRouteName.Add(routeName, namedActionGroup);
+            }
+        }
+
+        private static bool IsAttributeRoutedAction(ControllerActionDescriptor actionDescriptor)
+        {
+            return actionDescriptor.AttributeRouteInfo?.Template != null;
+        }
+
+        private static IList<string> AddErrorNumbers(
+            IEnumerable<string> namedRoutedErrors)
+        {
+            return namedRoutedErrors
+                .Select((error, i) =>
+                    Resources.FormatAttributeRoute_AggregateErrorMessage_ErrorNumber(
+                        i + 1,
+                        Environment.NewLine,
+                        error))
+                .ToList();
+        }
+
+        private static IList<string> ValidateNamedAttributeRoutedActions(
+            IDictionary<string,
+            IList<ActionDescriptor>> actionsGroupedByRouteName)
+        {
+            var namedRouteErrors = new List<string>();
+
+            foreach (var kvp in actionsGroupedByRouteName)
+            {
+                // We are looking for attribute routed actions that have the same name but
+                // different route templates. We pick the first template of the group and
+                // we compare it against the rest of the templates that have that same name
+                // associated.
+                // The moment we find one that is different we report the whole group to the
+                // user in the error message so that he can see the different actions and the
+                // different templates for a given named attribute route.
+                var firstActionDescriptor = kvp.Value[0];
+                var firstTemplate = firstActionDescriptor.AttributeRouteInfo.Template;
+
+                for (var i = 1; i < kvp.Value.Count; i++)
+                {
+                    var otherActionDescriptor = kvp.Value[i];
+                    var otherActionTemplate = otherActionDescriptor.AttributeRouteInfo.Template;
+
+                    if (!firstTemplate.Equals(otherActionTemplate, StringComparison.OrdinalIgnoreCase))
+                    {
+                        var descriptions = kvp.Value.Select(ad =>
+                            Resources.FormatAttributeRoute_DuplicateNames_Item(
+                                ad.DisplayName,
+                                ad.AttributeRouteInfo.Template));
+
+                        var errorDescription = string.Join(Environment.NewLine, descriptions);
+                        var message = Resources.FormatAttributeRoute_DuplicateNames(
+                            kvp.Key,
+                            Environment.NewLine,
+                            errorDescription);
+
+                        namedRouteErrors.Add(message);
+                        break;
+                    }
+                }
+            }
+
+            return namedRouteErrors;
+        }
+
+        private static void ValidateActionGroupConfiguration(
+            IDictionary<MethodInfo, IDictionary<ActionModel, IList<ControllerActionDescriptor>>> methodMap,
+            ControllerActionDescriptor actionDescriptor,
+            IDictionary<MethodInfo, string> routingConfigurationErrors)
+        {
+            var hasAttributeRoutedActions = false;
+            var hasConventionallyRoutedActions = false;
+
+            var actionsForMethod = methodMap[actionDescriptor.MethodInfo];
+            foreach (var reflectedAction in actionsForMethod)
+            {
+                foreach (var action in reflectedAction.Value)
+                {
+                    if (IsAttributeRoutedAction(action))
+                    {
+                        hasAttributeRoutedActions = true;
+                    }
+                    else
+                    {
+                        hasConventionallyRoutedActions = true;
+                    }
+                }
+            }
+
+            // Validate that no method result in attribute and non attribute actions at the same time.
+            // By design, mixing attribute and conventionally actions in the same method is not allowed.
+            //
+            // This for example:
+            //
+            // [HttpGet]
+            // [HttpPost("Foo")]
+            // public void Foo() { }
+            if (hasAttributeRoutedActions && hasConventionallyRoutedActions)
+            {
+                var message = CreateMixedRoutedActionDescriptorsErrorMessage(
+                    actionDescriptor,
+                    actionsForMethod);
+
+                routingConfigurationErrors.Add(actionDescriptor.MethodInfo, message);
+            }
+        }
+
+        private static string CreateMixedRoutedActionDescriptorsErrorMessage(
+            ControllerActionDescriptor actionDescriptor,
+            IDictionary<ActionModel, IList<ControllerActionDescriptor>> actionsForMethod)
+        {
+            // Text to show as the attribute route template for conventionally routed actions.
+            var nullTemplate = Resources.AttributeRoute_NullTemplateRepresentation;
+
+            var actionDescriptions = new List<string>();
+            foreach (var action in actionsForMethod.SelectMany(kvp => kvp.Value))
+            {
+                var routeTemplate = action.AttributeRouteInfo?.Template ?? nullTemplate;
+
+                var verbs = action.ActionConstraints?.OfType<HttpMethodActionConstraint>()
+                    .FirstOrDefault()?.HttpMethods;
+
+                var formattedVerbs = string.Empty;
+                if (verbs != null)
+                {
+                    formattedVerbs = string.Join(", ", verbs.OrderBy(v => v, StringComparer.OrdinalIgnoreCase));
+                }
+
+                var description =
+                    Resources.FormatAttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod_Item(
+                        action.DisplayName,
+                        routeTemplate,
+                        formattedVerbs);
+
+                actionDescriptions.Add(description);
+            }
+
+            // Sample error message:
+            //
+            // A method 'MyApplication.CustomerController.Index' must not define attributed actions and
+            // non attributed actions at the same time:
+            // Action: 'MyApplication.CustomerController.Index' - Route Template: 'Products' - HTTP Verbs: 'PUT'
+            // Action: 'MyApplication.CustomerController.Index' - Route Template: '(none)' - HTTP Verbs: 'POST'
+            //
+            // Use 'AcceptVerbsAttribute' to create a single route that allows multiple HTTP verbs and defines a route,
+            // or set a route template in all attributes that constrain HTTP verbs.
+            return
+                Resources.FormatAttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod(
+                    actionDescriptor.DisplayName,
+                    Environment.NewLine,
+                    string.Join(Environment.NewLine, actionDescriptions));
+        }
+
+        private static string CreateAttributeRoutingAggregateErrorMessage(
+            IEnumerable<string> individualErrors)
+        {
+            var errorMessages = AddErrorNumbers(individualErrors);
+
+            var message = Resources.FormatAttributeRoute_AggregateErrorMessage(
+                Environment.NewLine,
+                string.Join(Environment.NewLine + Environment.NewLine, errorMessages));
+            return message;
+        }
+
+        // We need to build a map of methods to reflected actions and reflected actions to
+        // action descriptors so that we can validate later that no method produced attribute
+        // and non attributed actions at the same time, and that no method that produced attribute
+        // routed actions has no attributes that implement IActionHttpMethodProvider and do not
+        // implement IRouteTemplateProvider. For example:
+        //
+        // public class ProductsController
+        // {
+        //    [HttpGet("Products")]
+        //    [HttpPost]
+        //    public ActionResult Items(){ ... }
+        //
+        //    [HttpGet("Products")]
+        //    [CustomHttpMethods("POST, PUT")]
+        //    public ActionResult List(){ ... }
+        // }
+        private class MethodToActionMap :
+            Dictionary<MethodInfo, IDictionary<ActionModel, IList<ControllerActionDescriptor>>>
+        {
+            public void AddToMethodInfo(
+                ActionModel action,
+                IList<ControllerActionDescriptor> actionDescriptors)
+            {
+                if (TryGetValue(action.ActionMethod, out var actionsForMethod))
+                {
+                    actionsForMethod.Add(action, actionDescriptors);
+                }
+                else
+                {
+                    var reflectedActionMap =
+                        new Dictionary<ActionModel, IList<ControllerActionDescriptor>>();
+                    reflectedActionMap.Add(action, actionDescriptors);
+                    Add(action.ActionMethod, reflectedActionMap);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionDescriptorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionDescriptorProvider.cs
new file mode 100644
index 0000000000..c5fc31e178
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionDescriptorProvider.cs
@@ -0,0 +1,131 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ControllerActionDescriptorProvider : IActionDescriptorProvider
+    {
+        private readonly ApplicationPartManager _partManager;
+        private readonly IApplicationModelProvider[] _applicationModelProviders;
+        private readonly IEnumerable<IApplicationModelConvention> _conventions;
+
+        public ControllerActionDescriptorProvider(
+            ApplicationPartManager partManager,
+            IEnumerable<IApplicationModelProvider> applicationModelProviders,
+            IOptions<MvcOptions> optionsAccessor)
+        {
+            if (partManager == null)
+            {
+                throw new ArgumentNullException(nameof(partManager));
+            }
+
+            if (applicationModelProviders == null)
+            {
+                throw new ArgumentNullException(nameof(applicationModelProviders));
+            }
+
+            if (optionsAccessor == null)
+            {
+                throw new ArgumentNullException(nameof(optionsAccessor));
+            }
+
+            _partManager = partManager;
+            _applicationModelProviders = applicationModelProviders.OrderBy(p => p.Order).ToArray();
+            _conventions = optionsAccessor.Value.Conventions;
+        }
+
+        public int Order => -1000;
+
+        /// <inheritdoc />
+        public void OnProvidersExecuting(ActionDescriptorProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            foreach (var descriptor in GetDescriptors())
+            {
+                context.Results.Add(descriptor);
+            }
+        }
+
+        /// <inheritdoc />
+        public void OnProvidersExecuted(ActionDescriptorProviderContext context)
+        {
+            // After all of the providers have run, we need to provide a 'null' for each all of route values that 
+            // participate in action selection.
+            //
+            // This is important for scenarios like Razor Pages, that use the 'page' route value. An action that
+            // uses 'page' shouldn't match when 'action' is set, and an action that uses 'action' shouldn't match when
+            // 'page is specified.
+            //
+            // Or for another example, consider areas. A controller that's not in an area needs a 'null' value for
+            // area so it can't match when the route produces an 'area' value.
+            var keys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            for (var i = 0; i < context.Results.Count; i++)
+            {
+                var action = context.Results[i];
+                foreach (var key in action.RouteValues.Keys)
+                {
+                    keys.Add(key);
+                }
+            }
+
+            for (var i = 0; i < context.Results.Count; i++)
+            {
+                var action = context.Results[i];
+                foreach (var key in keys)
+                {
+                    if (!action.RouteValues.ContainsKey(key))
+                    {
+                        action.RouteValues.Add(key, null);
+                    }
+                }
+            }
+        }
+
+        protected internal IEnumerable<ControllerActionDescriptor> GetDescriptors()
+        {
+            var applicationModel = BuildModel();
+            ApplicationModelConventions.ApplyConventions(applicationModel, _conventions);
+            return ControllerActionDescriptorBuilder.Build(applicationModel);
+        }
+
+        protected internal ApplicationModel BuildModel()
+        {
+            var controllerTypes = GetControllerTypes();
+            var context = new ApplicationModelProviderContext(controllerTypes);
+
+            for (var i = 0; i < _applicationModelProviders.Length; i++)
+            {
+                _applicationModelProviders[i].OnProvidersExecuting(context);
+            }
+
+            for (var i = _applicationModelProviders.Length - 1; i >= 0; i--)
+            {
+                _applicationModelProviders[i].OnProvidersExecuted(context);
+            }
+
+            return context.Result;
+        }
+
+        private IEnumerable<TypeInfo> GetControllerTypes()
+        {
+            var feature = new ControllerFeature();
+            _partManager.PopulateFeature(feature);
+
+            return feature.Controllers;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionFilter.cs
new file mode 100644
index 0000000000..93e4c4774a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionFilter.cs
@@ -0,0 +1,69 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// A filter implementation which delegates to the controller for action filter interfaces.
+    /// </summary>
+    public class ControllerActionFilter : IAsyncActionFilter, IOrderedFilter
+    {
+        // Controller-filter methods run farthest from the action by default.
+        /// <inheritdoc />
+        public int Order { get; set; } = int.MinValue;
+
+        /// <inheritdoc />
+        public Task OnActionExecutionAsync(
+            ActionExecutingContext context,
+            ActionExecutionDelegate next)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (next == null)
+            {
+                throw new ArgumentNullException(nameof(next));
+            }
+
+            var controller = context.Controller;
+            if (controller == null)
+            {
+                throw new InvalidOperationException(Resources.FormatPropertyOfTypeCannotBeNull(
+                    nameof(context.Controller),
+                    nameof(ActionExecutingContext)));
+            }
+
+            if (controller is IAsyncActionFilter asyncActionFilter)
+            {
+                return asyncActionFilter.OnActionExecutionAsync(context, next);
+            }
+            else if (controller is IActionFilter actionFilter)
+            {
+                return ExecuteActionFilter(context, next, actionFilter);
+            }
+            else
+            {
+                return next();
+            }
+        }
+
+        private static async Task ExecuteActionFilter(
+            ActionExecutingContext context, 
+            ActionExecutionDelegate next,
+            IActionFilter actionFilter)
+        {
+            actionFilter.OnActionExecuting(context);
+            if (context.Result == null)
+            {
+                actionFilter.OnActionExecuted(await next());
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs
new file mode 100644
index 0000000000..f020c86bf3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs
@@ -0,0 +1,472 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Runtime.ExceptionServices;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ControllerActionInvoker : ResourceInvoker, IActionInvoker
+    {
+        private readonly ControllerActionInvokerCacheEntry _cacheEntry;
+        private readonly ControllerContext _controllerContext;
+
+        private Dictionary<string, object> _arguments;
+
+        private ActionExecutingContext _actionExecutingContext;
+        private ActionExecutedContext _actionExecutedContext;
+
+        internal ControllerActionInvoker(
+            ILogger logger,
+            DiagnosticSource diagnosticSource,
+            IActionResultTypeMapper mapper,
+            ControllerContext controllerContext,
+            ControllerActionInvokerCacheEntry cacheEntry,
+            IFilterMetadata[] filters)
+            : base(diagnosticSource, logger, mapper, controllerContext, filters, controllerContext.ValueProviderFactories)
+        {
+            if (cacheEntry == null)
+            {
+                throw new ArgumentNullException(nameof(cacheEntry));
+            }
+
+            _cacheEntry = cacheEntry;
+            _controllerContext = controllerContext;
+        }
+
+        // Internal for testing
+        internal ControllerContext ControllerContext => _controllerContext;
+
+        protected override void ReleaseResources()
+        {
+            if (_instance != null && _cacheEntry.ControllerReleaser != null)
+            {
+                _cacheEntry.ControllerReleaser(_controllerContext, _instance);
+            }
+        }
+
+        private Task Next(ref State next, ref Scope scope, ref object state, ref bool isCompleted)
+        {
+            switch (next)
+            {
+                case State.ActionBegin:
+                    {
+                        var controllerContext = _controllerContext;
+
+                        _cursor.Reset();
+
+                        _instance = _cacheEntry.ControllerFactory(controllerContext);
+
+                        _arguments = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+
+                        var task = BindArgumentsAsync();
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.ActionNext;
+                            return task;
+                        }
+
+                        goto case State.ActionNext;
+                    }
+
+                case State.ActionNext:
+                    {
+                        var current = _cursor.GetNextFilter<IActionFilter, IAsyncActionFilter>();
+                        if (current.FilterAsync != null)
+                        {
+                            if (_actionExecutingContext == null)
+                            {
+                                _actionExecutingContext = new ActionExecutingContext(_controllerContext, _filters, _arguments, _instance);
+                            }
+
+                            state = current.FilterAsync;
+                            goto case State.ActionAsyncBegin;
+                        }
+                        else if (current.Filter != null)
+                        {
+                            if (_actionExecutingContext == null)
+                            {
+                                _actionExecutingContext = new ActionExecutingContext(_controllerContext, _filters, _arguments, _instance);
+                            }
+
+                            state = current.Filter;
+                            goto case State.ActionSyncBegin;
+                        }
+                        else
+                        {
+                            goto case State.ActionInside;
+                        }
+                    }
+
+                case State.ActionAsyncBegin:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_actionExecutingContext != null);
+
+                        var filter = (IAsyncActionFilter)state;
+                        var actionExecutingContext = _actionExecutingContext;
+
+                        _diagnosticSource.BeforeOnActionExecution(actionExecutingContext, filter);
+                        _logger.BeforeExecutingMethodOnFilter(
+                            MvcCoreLoggerExtensions.ActionFilter,
+                            nameof(IAsyncActionFilter.OnActionExecutionAsync),
+                            filter);
+
+                        var task = filter.OnActionExecutionAsync(actionExecutingContext, InvokeNextActionFilterAwaitedAsync);
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.ActionAsyncEnd;
+                            return task;
+                        }
+
+                        goto case State.ActionAsyncEnd;
+                    }
+
+                case State.ActionAsyncEnd:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_actionExecutingContext != null);
+
+                        var filter = (IAsyncActionFilter)state;
+
+                        if (_actionExecutedContext == null)
+                        {
+                            // If we get here then the filter didn't call 'next' indicating a short circuit.
+                            _logger.ActionFilterShortCircuited(filter);
+
+                            _actionExecutedContext = new ActionExecutedContext(
+                                _controllerContext,
+                                _filters,
+                                _instance)
+                            {
+                                Canceled = true,
+                                Result = _actionExecutingContext.Result,
+                            };
+                        }
+
+                        _diagnosticSource.AfterOnActionExecution(_actionExecutedContext, filter);
+                        _logger.AfterExecutingMethodOnFilter(
+                            MvcCoreLoggerExtensions.ActionFilter,
+                            nameof(IAsyncActionFilter.OnActionExecutionAsync),
+                            filter);
+
+                        goto case State.ActionEnd;
+                    }
+
+                case State.ActionSyncBegin:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_actionExecutingContext != null);
+
+                        var filter = (IActionFilter)state;
+                        var actionExecutingContext = _actionExecutingContext;
+
+                        _diagnosticSource.BeforeOnActionExecuting(actionExecutingContext, filter);
+                        _logger.BeforeExecutingMethodOnFilter(
+                            MvcCoreLoggerExtensions.ActionFilter,
+                            nameof(IActionFilter.OnActionExecuting),
+                            filter);
+
+                        filter.OnActionExecuting(actionExecutingContext);
+
+                        _diagnosticSource.AfterOnActionExecuting(actionExecutingContext, filter);
+                        _logger.AfterExecutingMethodOnFilter(
+                            MvcCoreLoggerExtensions.ActionFilter,
+                            nameof(IActionFilter.OnActionExecuting),
+                            filter);
+
+                        if (actionExecutingContext.Result != null)
+                        {
+                            // Short-circuited by setting a result.
+                            _logger.ActionFilterShortCircuited(filter);
+
+                            _actionExecutedContext = new ActionExecutedContext(
+                                _actionExecutingContext,
+                                _filters,
+                                _instance)
+                            {
+                                Canceled = true,
+                                Result = _actionExecutingContext.Result,
+                            };
+
+                            goto case State.ActionEnd;
+                        }
+
+                        var task = InvokeNextActionFilterAsync();
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.ActionSyncEnd;
+                            return task;
+                        }
+
+                        goto case State.ActionSyncEnd;
+                    }
+
+                case State.ActionSyncEnd:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_actionExecutingContext != null);
+                        Debug.Assert(_actionExecutedContext != null);
+
+                        var filter = (IActionFilter)state;
+                        var actionExecutedContext = _actionExecutedContext;
+
+                        _diagnosticSource.BeforeOnActionExecuted(actionExecutedContext, filter);
+                        _logger.BeforeExecutingMethodOnFilter(
+                            MvcCoreLoggerExtensions.ActionFilter,
+                            nameof(IActionFilter.OnActionExecuted),
+                            filter);
+
+                        filter.OnActionExecuted(actionExecutedContext);
+
+                        _diagnosticSource.AfterOnActionExecuted(actionExecutedContext, filter);
+                        _logger.AfterExecutingMethodOnFilter(
+                            MvcCoreLoggerExtensions.ActionFilter,
+                            nameof(IActionFilter.OnActionExecuted),
+                            filter);
+
+                        goto case State.ActionEnd;
+                    }
+
+                case State.ActionInside:
+                    {
+                        var task = InvokeActionMethodAsync();
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.ActionEnd;
+                            return task;
+                        }
+
+                        goto case State.ActionEnd;
+                    }
+
+                case State.ActionEnd:
+                    {
+                        if (scope == Scope.Action)
+                        {
+                            if (_actionExecutedContext == null)
+                            {
+                                _actionExecutedContext = new ActionExecutedContext(_controllerContext, _filters, _instance)
+                                {
+                                    Result = _result,
+                                };
+                            }
+
+                            isCompleted = true;
+                            return Task.CompletedTask;
+                        }
+
+                        var actionExecutedContext = _actionExecutedContext;
+                        Rethrow(actionExecutedContext);
+
+                        if (actionExecutedContext != null)
+                        {
+                            _result = actionExecutedContext.Result;
+                        }
+
+                        isCompleted = true;
+                        return Task.CompletedTask;
+                    }
+
+                default:
+                    throw new InvalidOperationException();
+            }
+        }
+
+        private async Task InvokeNextActionFilterAsync()
+        {
+            try
+            {
+                var next = State.ActionNext;
+                var state = (object)null;
+                var scope = Scope.Action;
+                var isCompleted = false;
+                while (!isCompleted)
+                {
+                    await Next(ref next, ref scope, ref state, ref isCompleted);
+                }
+            }
+            catch (Exception exception)
+            {
+                _actionExecutedContext = new ActionExecutedContext(_controllerContext, _filters, _instance)
+                {
+                    ExceptionDispatchInfo = ExceptionDispatchInfo.Capture(exception),
+                };
+            }
+
+            Debug.Assert(_actionExecutedContext != null);
+        }
+
+        private async Task<ActionExecutedContext> InvokeNextActionFilterAwaitedAsync()
+        {
+            Debug.Assert(_actionExecutingContext != null);
+            if (_actionExecutingContext.Result != null)
+            {
+                // If we get here, it means that an async filter set a result AND called next(). This is forbidden.
+                var message = Resources.FormatAsyncActionFilter_InvalidShortCircuit(
+                    typeof(IAsyncActionFilter).Name,
+                    nameof(ActionExecutingContext.Result),
+                    typeof(ActionExecutingContext).Name,
+                    typeof(ActionExecutionDelegate).Name);
+
+                throw new InvalidOperationException(message);
+            }
+
+            await InvokeNextActionFilterAsync();
+
+            Debug.Assert(_actionExecutedContext != null);
+            return _actionExecutedContext;
+        }
+
+        private async Task InvokeActionMethodAsync()
+        {
+            var controllerContext = _controllerContext;
+            var objectMethodExecutor = _cacheEntry.ObjectMethodExecutor;
+            var controller = _instance;
+            var arguments = _arguments;
+            var actionMethodExecutor = _cacheEntry.ActionMethodExecutor;
+            var orderedArguments = PrepareArguments(arguments, objectMethodExecutor);
+
+            var diagnosticSource = _diagnosticSource;
+            var logger = _logger;
+
+            IActionResult result = null;
+            try
+            {
+                diagnosticSource.BeforeActionMethod(
+                    controllerContext,
+                    arguments,
+                    controller);
+                logger.ActionMethodExecuting(controllerContext, orderedArguments);
+                var stopwatch = ValueStopwatch.StartNew();
+                var actionResultValueTask = actionMethodExecutor.Execute(_mapper, objectMethodExecutor, controller, orderedArguments);
+                if (actionResultValueTask.IsCompletedSuccessfully)
+                {
+                    result = actionResultValueTask.Result;
+                }
+                else
+                {
+                    result = await actionResultValueTask;
+                }
+
+                _result = result;
+                logger.ActionMethodExecuted(controllerContext, result, stopwatch.GetElapsedTime());
+            }
+            finally
+            {
+                diagnosticSource.AfterActionMethod(
+                    controllerContext,
+                    arguments,
+                    controllerContext,
+                    result);
+            }
+        }
+
+        /// <remarks><see cref="ResourceInvoker.InvokeFilterPipelineAsync"/> for details on what the
+        /// variables in this method represent.</remarks>
+        protected override async Task InvokeInnerFilterAsync()
+        {
+            var next = State.ActionBegin;
+            var scope = Scope.Invoker;
+            var state = (object)null;
+            var isCompleted = false;
+
+            while (!isCompleted)
+            {
+                await Next(ref next, ref scope, ref state, ref isCompleted);
+            }
+        }
+
+        private static void Rethrow(ActionExecutedContext context)
+        {
+            if (context == null)
+            {
+                return;
+            }
+
+            if (context.ExceptionHandled)
+            {
+                return;
+            }
+
+            if (context.ExceptionDispatchInfo != null)
+            {
+                context.ExceptionDispatchInfo.Throw();
+            }
+
+            if (context.Exception != null)
+            {
+                throw context.Exception;
+            }
+        }
+
+        private Task BindArgumentsAsync()
+        {
+            // Perf: Avoid allocating async state machines where possible. We only need the state
+            // machine if you need to bind properties or arguments.
+            var actionDescriptor = _controllerContext.ActionDescriptor;
+            if (actionDescriptor.BoundProperties.Count == 0 &&
+                actionDescriptor.Parameters.Count == 0)
+            {
+                return Task.CompletedTask;
+            }
+
+            Debug.Assert(_cacheEntry.ControllerBinderDelegate != null);
+            return _cacheEntry.ControllerBinderDelegate(_controllerContext, _instance, _arguments);
+        }
+
+        private static object[] PrepareArguments(
+            IDictionary<string, object> actionParameters,
+            ObjectMethodExecutor actionMethodExecutor)
+        {
+            var declaredParameterInfos = actionMethodExecutor.MethodParameters;
+            var count = declaredParameterInfos.Length;
+            if (count == 0)
+            {
+                return null;
+            }
+
+            var arguments = new object[count];
+            for (var index = 0; index < count; index++)
+            {
+                var parameterInfo = declaredParameterInfos[index];
+
+                if (!actionParameters.TryGetValue(parameterInfo.Name, out var value))
+                {
+                    value = actionMethodExecutor.GetDefaultValueForParameter(index);
+                }
+
+                arguments[index] = value;
+            }
+
+            return arguments;
+        }
+
+        private enum Scope
+        {
+            Invoker,
+            Action,
+        }
+
+        private enum State
+        {
+            ActionBegin,
+            ActionNext,
+            ActionAsyncBegin,
+            ActionAsyncEnd,
+            ActionSyncBegin,
+            ActionSyncEnd,
+            ActionInside,
+            ActionEnd,
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvokerCache.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvokerCache.cs
new file mode 100644
index 0000000000..0c6bd2adc1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvokerCache.cs
@@ -0,0 +1,124 @@
+// 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.
+
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ControllerActionInvokerCache
+    {
+        private readonly IActionDescriptorCollectionProvider _collectionProvider;
+        private readonly ParameterBinder _parameterBinder;
+        private readonly IModelBinderFactory _modelBinderFactory;
+        private readonly IModelMetadataProvider _modelMetadataProvider;
+        private readonly IFilterProvider[] _filterProviders;
+        private readonly IControllerFactoryProvider _controllerFactoryProvider;
+        private readonly MvcOptions _mvcOptions;
+        private volatile InnerCache _currentCache;
+
+        public ControllerActionInvokerCache(
+            IActionDescriptorCollectionProvider collectionProvider,
+            ParameterBinder parameterBinder,
+            IModelBinderFactory modelBinderFactory,
+            IModelMetadataProvider modelMetadataProvider,
+            IEnumerable<IFilterProvider> filterProviders,
+            IControllerFactoryProvider factoryProvider,
+            IOptions<MvcOptions> mvcOptions)
+        {
+            _collectionProvider = collectionProvider;
+            _parameterBinder = parameterBinder;
+            _modelBinderFactory = modelBinderFactory;
+            _modelMetadataProvider = modelMetadataProvider;
+            _filterProviders = filterProviders.OrderBy(item => item.Order).ToArray();
+            _controllerFactoryProvider = factoryProvider;
+            _mvcOptions = mvcOptions.Value;
+        }
+
+        private InnerCache CurrentCache
+        {
+            get
+            {
+                var current = _currentCache;
+                var actionDescriptors = _collectionProvider.ActionDescriptors;
+
+                if (current == null || current.Version != actionDescriptors.Version)
+                {
+                    current = new InnerCache(actionDescriptors.Version);
+                    _currentCache = current;
+                }
+
+                return current;
+            }
+        }
+
+        public (ControllerActionInvokerCacheEntry cacheEntry, IFilterMetadata[] filters) GetCachedResult(ControllerContext controllerContext)
+        {
+            var cache = CurrentCache;
+            var actionDescriptor = controllerContext.ActionDescriptor;
+
+            IFilterMetadata[] filters;
+            if (!cache.Entries.TryGetValue(actionDescriptor, out var cacheEntry))
+            {
+                var filterFactoryResult = FilterFactory.GetAllFilters(_filterProviders, controllerContext);
+                filters = filterFactoryResult.Filters;
+
+                var parameterDefaultValues = ParameterDefaultValues
+                    .GetParameterDefaultValues(actionDescriptor.MethodInfo);
+
+                var objectMethodExecutor = ObjectMethodExecutor.Create(
+                    actionDescriptor.MethodInfo,
+                    actionDescriptor.ControllerTypeInfo,
+                    parameterDefaultValues);
+
+                var controllerFactory = _controllerFactoryProvider.CreateControllerFactory(actionDescriptor);
+                var controllerReleaser = _controllerFactoryProvider.CreateControllerReleaser(actionDescriptor);
+                var propertyBinderFactory = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                    _parameterBinder,
+                    _modelBinderFactory,
+                    _modelMetadataProvider,
+                    actionDescriptor,
+                    _mvcOptions);
+
+                var actionMethodExecutor = ActionMethodExecutor.GetExecutor(objectMethodExecutor);
+
+                cacheEntry = new ControllerActionInvokerCacheEntry(
+                    filterFactoryResult.CacheableFilters,
+                    controllerFactory,
+                    controllerReleaser,
+                    propertyBinderFactory,
+                    objectMethodExecutor,
+                    actionMethodExecutor);
+                cacheEntry = cache.Entries.GetOrAdd(actionDescriptor, cacheEntry);
+            }
+            else
+            {
+                // Filter instances from statically defined filter descriptors + from filter providers
+                filters = FilterFactory.CreateUncachedFilters(_filterProviders, controllerContext, cacheEntry.CachedFilters);
+            }
+
+            return (cacheEntry, filters);
+        }
+
+        private class InnerCache
+        {
+            public InnerCache(int version)
+            {
+                Version = version;
+            }
+
+            public ConcurrentDictionary<ActionDescriptor, ControllerActionInvokerCacheEntry> Entries { get; } =
+                new ConcurrentDictionary<ActionDescriptor, ControllerActionInvokerCacheEntry>();
+
+            public int Version { get; }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvokerCacheEntry.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvokerCacheEntry.cs
new file mode 100644
index 0000000000..6b06f0e02b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvokerCacheEntry.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ControllerActionInvokerCacheEntry
+    {
+        internal ControllerActionInvokerCacheEntry(
+            FilterItem[] cachedFilters,
+            Func<ControllerContext, object> controllerFactory,
+            Action<ControllerContext, object> controllerReleaser,
+            ControllerBinderDelegate controllerBinderDelegate,
+            ObjectMethodExecutor objectMethodExecutor,
+            ActionMethodExecutor actionMethodExecutor)
+        {
+            ControllerFactory = controllerFactory;
+            ControllerReleaser = controllerReleaser;
+            ControllerBinderDelegate = controllerBinderDelegate;
+            CachedFilters = cachedFilters;
+            ObjectMethodExecutor = objectMethodExecutor;
+            ActionMethodExecutor = actionMethodExecutor;
+        }
+
+        public FilterItem[] CachedFilters { get; }
+
+        public Func<ControllerContext, object> ControllerFactory { get; }
+
+        public Action<ControllerContext, object> ControllerReleaser { get; }
+
+        public ControllerBinderDelegate ControllerBinderDelegate { get; }
+
+        internal ObjectMethodExecutor ObjectMethodExecutor { get; }
+
+        internal ActionMethodExecutor ActionMethodExecutor { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvokerProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvokerProvider.cs
new file mode 100644
index 0000000000..b9b135ff52
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvokerProvider.cs
@@ -0,0 +1,77 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ControllerActionInvokerProvider : IActionInvokerProvider
+    {
+        private readonly ControllerActionInvokerCache _controllerActionInvokerCache;
+        private readonly IReadOnlyList<IValueProviderFactory> _valueProviderFactories;
+        private readonly int _maxModelValidationErrors;
+        private readonly ILogger _logger;
+        private readonly DiagnosticSource _diagnosticSource;
+        private readonly IActionResultTypeMapper _mapper;
+
+        public ControllerActionInvokerProvider(
+            ControllerActionInvokerCache controllerActionInvokerCache,
+            IOptions<MvcOptions> optionsAccessor,
+            ILoggerFactory loggerFactory,
+            DiagnosticSource diagnosticSource,
+            IActionResultTypeMapper mapper)
+        {
+            _controllerActionInvokerCache = controllerActionInvokerCache;
+            _valueProviderFactories = optionsAccessor.Value.ValueProviderFactories.ToArray();
+            _maxModelValidationErrors = optionsAccessor.Value.MaxModelValidationErrors;
+            _logger = loggerFactory.CreateLogger<ControllerActionInvoker>();
+            _diagnosticSource = diagnosticSource;
+            _mapper = mapper;
+        }
+
+        public int Order => -1000;
+
+        /// <inheritdoc />
+        public void OnProvidersExecuting(ActionInvokerProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (context.ActionContext.ActionDescriptor is ControllerActionDescriptor)
+            {
+                var controllerContext = new ControllerContext(context.ActionContext);
+                // PERF: These are rarely going to be changed, so let's go copy-on-write.
+                controllerContext.ValueProviderFactories = new CopyOnWriteList<IValueProviderFactory>(_valueProviderFactories);
+                controllerContext.ModelState.MaxAllowedErrors = _maxModelValidationErrors;
+
+                var cacheResult = _controllerActionInvokerCache.GetCachedResult(controllerContext);
+
+                var invoker = new ControllerActionInvoker(
+                    _logger,
+                    _diagnosticSource,
+                    _mapper,
+                    controllerContext,
+                    cacheResult.cacheEntry,
+                    cacheResult.filters);
+
+                context.Result = invoker;
+            }
+        }
+
+        /// <inheritdoc />
+        public void OnProvidersExecuted(ActionInvokerProviderContext context)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerBinderDelegate.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerBinderDelegate.cs
new file mode 100644
index 0000000000..6a986160f0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerBinderDelegate.cs
@@ -0,0 +1,13 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public delegate Task ControllerBinderDelegate(
+        ControllerContext controllerContext,
+        object controller,
+        Dictionary<string, object> arguments);
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerBinderDelegateProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerBinderDelegateProvider.cs
new file mode 100644
index 0000000000..e29525ea11
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerBinderDelegateProvider.cs
@@ -0,0 +1,210 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    // Note: changes made to binding behavior in type should also be made to PageBinderFactory.
+    public static class ControllerBinderDelegateProvider
+    {
+        public static ControllerBinderDelegate CreateBinderDelegate(
+            ParameterBinder parameterBinder,
+            IModelBinderFactory modelBinderFactory,
+            IModelMetadataProvider modelMetadataProvider,
+            ControllerActionDescriptor actionDescriptor,
+            MvcOptions mvcOptions)
+        {
+            if (parameterBinder == null)
+            {
+                throw new ArgumentNullException(nameof(parameterBinder));
+            }
+
+            if (modelBinderFactory == null)
+            {
+                throw new ArgumentNullException(nameof(modelBinderFactory));
+            }
+
+            if (modelMetadataProvider == null)
+            {
+                throw new ArgumentNullException(nameof(modelMetadataProvider));
+            }
+
+            if (actionDescriptor == null)
+            {
+                throw new ArgumentNullException(nameof(actionDescriptor));
+            }
+
+            if (mvcOptions == null)
+            {
+                throw new ArgumentNullException(nameof(mvcOptions));
+            }
+
+            var parameterBindingInfo = GetParameterBindingInfo(
+                modelBinderFactory,
+                modelMetadataProvider,
+                actionDescriptor,
+                mvcOptions);
+            var propertyBindingInfo = GetPropertyBindingInfo(modelBinderFactory, modelMetadataProvider, actionDescriptor);
+
+            if (parameterBindingInfo == null && propertyBindingInfo == null)
+            {
+                return null;
+            }
+
+            return Bind;
+
+            async Task Bind(ControllerContext controllerContext, object controller, Dictionary<string, object> arguments)
+            {
+                var valueProvider = await CompositeValueProvider.CreateAsync(controllerContext);
+                var parameters = actionDescriptor.Parameters;
+
+                for (var i = 0; i < parameters.Count; i++)
+                {
+                    var parameter = parameters[i];
+                    var bindingInfo = parameterBindingInfo[i];
+                    var modelMetadata = bindingInfo.ModelMetadata;
+
+                    if (!modelMetadata.IsBindingAllowed)
+                    {
+                        continue;
+                    }
+
+                    var result = await parameterBinder.BindModelAsync(
+                        controllerContext,
+                        bindingInfo.ModelBinder,
+                        valueProvider,
+                        parameter,
+                        modelMetadata,
+                        value: null);
+
+                    if (result.IsModelSet)
+                    {
+                        arguments[parameter.Name] = result.Model;
+                    }
+                }
+
+                var properties = actionDescriptor.BoundProperties;
+                for (var i = 0; i < properties.Count; i++)
+                {
+                    var property = properties[i];
+                    var bindingInfo = propertyBindingInfo[i];
+                    var modelMetadata = bindingInfo.ModelMetadata;
+
+                    if (!modelMetadata.IsBindingAllowed)
+                    {
+                        continue;
+                    }
+
+                    var result = await parameterBinder.BindModelAsync(
+                       controllerContext,
+                       bindingInfo.ModelBinder,
+                       valueProvider,
+                       property,
+                       modelMetadata,
+                       value: null);
+
+                    if (result.IsModelSet)
+                    {
+                        PropertyValueSetter.SetValue(bindingInfo.ModelMetadata, controller, result.Model);
+                    }
+                }
+            }
+        }
+
+        private static BinderItem[] GetParameterBindingInfo(
+            IModelBinderFactory modelBinderFactory,
+            IModelMetadataProvider modelMetadataProvider,
+            ControllerActionDescriptor actionDescriptor,
+            MvcOptions mvcOptions)
+        {
+            var parameters = actionDescriptor.Parameters;
+            if (parameters.Count == 0)
+            {
+                return null;
+            }
+
+            var parameterBindingInfo = new BinderItem[parameters.Count];
+            for (var i = 0; i < parameters.Count; i++)
+            {
+                var parameter = parameters[i];
+
+                ModelMetadata metadata;
+                if (mvcOptions.AllowValidatingTopLevelNodes &&
+                    modelMetadataProvider is ModelMetadataProvider modelMetadataProviderBase &&
+                    parameter is ControllerParameterDescriptor controllerParameterDescriptor)
+                {
+                    // The default model metadata provider derives from ModelMetadataProvider
+                    // and can therefore supply information about attributes applied to parameters.
+                    metadata = modelMetadataProviderBase.GetMetadataForParameter(controllerParameterDescriptor.ParameterInfo);
+                }
+                else
+                {
+                    // For backward compatibility, if there's a custom model metadata provider that
+                    // only implements the older IModelMetadataProvider interface, access the more
+                    // limited metadata information it supplies. In this scenario, validation attributes
+                    // are not supported on parameters.
+                    metadata = modelMetadataProvider.GetMetadataForType(parameter.ParameterType);
+                }
+
+                var binder = modelBinderFactory.CreateBinder(new ModelBinderFactoryContext
+                {
+                    BindingInfo = parameter.BindingInfo,
+                    Metadata = metadata,
+                    CacheToken = parameter,
+                });
+
+                parameterBindingInfo[i] = new BinderItem(binder, metadata);
+            }
+
+            return parameterBindingInfo;
+        }
+
+        private static BinderItem[] GetPropertyBindingInfo(
+            IModelBinderFactory modelBinderFactory,
+            IModelMetadataProvider modelMetadataProvider,
+            ControllerActionDescriptor actionDescriptor)
+        {
+            var properties = actionDescriptor.BoundProperties;
+            if (properties.Count == 0)
+            {
+                return null;
+            }
+
+            var propertyBindingInfo = new BinderItem[properties.Count];
+            var controllerType = actionDescriptor.ControllerTypeInfo.AsType();
+            for (var i = 0; i < properties.Count; i++)
+            {
+                var property = properties[i];
+                var metadata = modelMetadataProvider.GetMetadataForProperty(controllerType, property.Name);
+                var binder = modelBinderFactory.CreateBinder(new ModelBinderFactoryContext
+                {
+                    BindingInfo = property.BindingInfo,
+                    Metadata = metadata,
+                    CacheToken = property,
+                });
+
+                propertyBindingInfo[i] = new BinderItem(binder, metadata);
+            }
+
+            return propertyBindingInfo;
+        }
+
+        private struct BinderItem
+        {
+            public BinderItem(IModelBinder modelBinder, ModelMetadata modelMetadata)
+            {
+                ModelBinder = modelBinder;
+                ModelMetadata = modelMetadata;
+            }
+
+            public IModelBinder ModelBinder { get; }
+
+            public ModelMetadata ModelMetadata { get; }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerResultFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerResultFilter.cs
new file mode 100644
index 0000000000..3e30debccc
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerResultFilter.cs
@@ -0,0 +1,69 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// A filter implementation which delegates to the controller for result filter interfaces.
+    /// </summary>
+    public class ControllerResultFilter : IAsyncResultFilter, IOrderedFilter
+    {
+        // Controller-filter methods run farthest from the result by default.
+        /// <inheritdoc />
+        public int Order { get; set; } = int.MinValue;
+
+        /// <inheritdoc />
+        public Task OnResultExecutionAsync(
+            ResultExecutingContext context,
+            ResultExecutionDelegate next)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (next == null)
+            {
+                throw new ArgumentNullException(nameof(next));
+            }
+
+            var controller = context.Controller;
+            if (controller == null)
+            {
+                throw new InvalidOperationException(Resources.FormatPropertyOfTypeCannotBeNull(
+                    nameof(context.Controller),
+                    nameof(ResultExecutingContext)));
+            }
+
+            if (controller is IAsyncResultFilter asyncResultFilter)
+            {
+                return asyncResultFilter.OnResultExecutionAsync(context, next);
+            }
+            else if (controller is IResultFilter resultFilter)
+            {
+                return ExecuteResultFilter(context, next, resultFilter);
+            }
+            else
+            {
+                return next();
+            }
+        }
+
+        private static async Task ExecuteResultFilter(
+            ResultExecutingContext context,
+            ResultExecutionDelegate next,
+            IResultFilter resultFilter)
+        {
+            resultFilter.OnResultExecuting(context);
+            if (!context.Cancel)
+            {
+                resultFilter.OnResultExecuted(await next());
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/CopyOnWriteList.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/CopyOnWriteList.cs
new file mode 100644
index 0000000000..a051b69cff
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/CopyOnWriteList.cs
@@ -0,0 +1,116 @@
+// 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.
+
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class CopyOnWriteList<T> : IList<T>
+    {
+        private readonly IReadOnlyList<T> _source;
+        private List<T> _copy;
+
+        public CopyOnWriteList(IReadOnlyList<T> source)
+        {
+            _source = source;
+        }
+
+        protected IReadOnlyList<T> Readable => _copy ?? _source;
+
+        protected List<T> Writable
+        {
+            get
+            {
+                if (_copy == null)
+                {
+                    _copy = new List<T>(_source);
+                }
+
+                return _copy;
+            }
+        }
+
+        public T this[int index]
+        {
+            get => Readable[index];
+            set => Writable[index] = value;
+        }
+
+        public int Count => Readable.Count;
+
+        public bool IsReadOnly => false;
+
+        public void Add(T item)
+        {
+            Writable.Add(item);
+        }
+
+        public void Clear()
+        {
+            Writable.Clear();
+        }
+
+        public bool Contains(T item)
+        {
+            foreach (var obj in Readable)
+            {
+                if (object.Equals(obj, item))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public void CopyTo(T[] array, int arrayIndex)
+        {
+            foreach (var item in Readable)
+            {
+                array[arrayIndex++] = item;
+            }
+        }
+
+        public IEnumerator<T> GetEnumerator()
+        {
+            return Readable.GetEnumerator();
+        }
+
+        public int IndexOf(T item)
+        {
+            var i = 0;
+            foreach (var obj in Readable)
+            {
+                if (object.Equals(obj, item))
+                {
+                    return i;
+                }
+
+                i++;
+            }
+
+            return -1;
+        }
+
+        public void Insert(int index, T item)
+        {
+            Writable.Insert(index, item);
+        }
+
+        public bool Remove(T item)
+        {
+            return Writable.Remove(item);
+        }
+
+        public void RemoveAt(int index)
+        {
+            Writable.RemoveAt(index);
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultActionConstraintProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultActionConstraintProvider.cs
new file mode 100644
index 0000000000..571f3ebebf
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultActionConstraintProvider.cs
@@ -0,0 +1,64 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// A default implementation of <see cref="IActionConstraintProvider"/>.
+    /// </summary>
+    /// <remarks>
+    /// This provider is able to provide an <see cref="IActionConstraint"/> instance when the
+    /// <see cref="IActionConstraintMetadata"/> implements <see cref="IActionConstraint"/> or
+    /// <see cref="IActionConstraintFactory"/>/
+    /// </remarks>
+    public class DefaultActionConstraintProvider : IActionConstraintProvider
+    {
+        /// <inheritdoc />
+        public int Order => -1000;
+
+        /// <inheritdoc />
+        public void OnProvidersExecuting(ActionConstraintProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            for (var i = 0; i < context.Results.Count; i++)
+            {
+                ProvideConstraint(context.Results[i], context.HttpContext.RequestServices);
+            }
+        }
+
+        /// <inheritdoc />
+        public void OnProvidersExecuted(ActionConstraintProviderContext context)
+        {
+        }
+
+        private void ProvideConstraint(ActionConstraintItem item, IServiceProvider services)
+        {
+            // Don't overwrite anything that was done by a previous provider.
+            if (item.Constraint != null)
+            {
+                return;
+            }
+
+            if (item.Metadata is IActionConstraint constraint)
+            {
+                item.Constraint = constraint;
+                item.IsReusable = true;
+                return;
+            }
+
+            if (item.Metadata is IActionConstraintFactory factory)
+            {
+                item.Constraint = factory.CreateInstance(services);
+                item.IsReusable = factory.IsReusable;
+                return;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultApplicationModelProvider.cs
new file mode 100644
index 0000000000..fc380933c2
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultApplicationModelProvider.cs
@@ -0,0 +1,692 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class DefaultApplicationModelProvider : IApplicationModelProvider
+    {
+        private readonly MvcOptions _mvcOptions;
+        private readonly IModelMetadataProvider _modelMetadataProvider;
+        private readonly Func<ActionContext, bool> _supportsAllRequests;
+        private readonly Func<ActionContext, bool> _supportsNonGetRequests;
+
+        public DefaultApplicationModelProvider(
+            IOptions<MvcOptions> mvcOptionsAccessor,
+            IModelMetadataProvider modelMetadataProvider)
+        {
+            _mvcOptions = mvcOptionsAccessor.Value;
+            _modelMetadataProvider = modelMetadataProvider;
+
+            _supportsAllRequests = _ => true;
+            _supportsNonGetRequests = context => !string.Equals(context.HttpContext.Request.Method, "GET", StringComparison.OrdinalIgnoreCase);
+        }
+
+        /// <inheritdoc />
+        public int Order => -1000;
+
+        /// <inheritdoc />
+        public virtual void OnProvidersExecuting(ApplicationModelProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            foreach (var filter in _mvcOptions.Filters)
+            {
+                context.Result.Filters.Add(filter);
+            }
+
+            foreach (var controllerType in context.ControllerTypes)
+            {
+                var controllerModel = CreateControllerModel(controllerType);
+                if (controllerModel == null)
+                {
+                    continue;
+                }
+
+                context.Result.Controllers.Add(controllerModel);
+                controllerModel.Application = context.Result;
+
+                foreach (var propertyHelper in PropertyHelper.GetProperties(controllerType.AsType()))
+                {
+                    var propertyInfo = propertyHelper.Property;
+                    var propertyModel = CreatePropertyModel(propertyInfo);
+                    if (propertyModel != null)
+                    {
+                        propertyModel.Controller = controllerModel;
+                        controllerModel.ControllerProperties.Add(propertyModel);
+                    }
+                }
+
+                foreach (var methodInfo in controllerType.AsType().GetMethods())
+                {
+                    var actionModel = CreateActionModel(controllerType, methodInfo);
+                    if (actionModel == null)
+                    {
+                        continue;
+                    }
+
+                    actionModel.Controller = controllerModel;
+                    controllerModel.Actions.Add(actionModel);
+
+                    foreach (var parameterInfo in actionModel.ActionMethod.GetParameters())
+                    {
+                        var parameterModel = CreateParameterModel(parameterInfo);
+                        if (parameterModel != null)
+                        {
+                            parameterModel.Action = actionModel;
+                            actionModel.Parameters.Add(parameterModel);
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <inheritdoc />
+        public virtual void OnProvidersExecuted(ApplicationModelProviderContext context)
+        {
+            // Intentionally empty.
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ControllerModel"/> for the given <see cref="TypeInfo"/>.
+        /// </summary>
+        /// <param name="typeInfo">The <see cref="TypeInfo"/>.</param>
+        /// <returns>A <see cref="ControllerModel"/> for the given <see cref="TypeInfo"/>.</returns>
+        protected virtual ControllerModel CreateControllerModel(TypeInfo typeInfo)
+        {
+            if (typeInfo == null)
+            {
+                throw new ArgumentNullException(nameof(typeInfo));
+            }
+
+            // For attribute routes on a controller, we want to support 'overriding' routes on a derived
+            // class. So we need to walk up the hierarchy looking for the first class to define routes.
+            //
+            // Then we want to 'filter' the set of attributes, so that only the effective routes apply.
+            var currentTypeInfo = typeInfo;
+            var objectTypeInfo = typeof(object).GetTypeInfo();
+
+            IRouteTemplateProvider[] routeAttributes;
+
+            do
+            {
+                routeAttributes = currentTypeInfo
+                    .GetCustomAttributes(inherit: false)
+                    .OfType<IRouteTemplateProvider>()
+                    .ToArray();
+
+                if (routeAttributes.Length > 0)
+                {
+                    // Found 1 or more route attributes.
+                    break;
+                }
+
+                currentTypeInfo = currentTypeInfo.BaseType.GetTypeInfo();
+            }
+            while (currentTypeInfo != objectTypeInfo);
+
+            // CoreCLR returns IEnumerable<Attribute> from GetCustomAttributes - the OfType<object>
+            // is needed to so that the result of ToArray() is object
+            var attributes = typeInfo.GetCustomAttributes(inherit: true);
+
+            // This is fairly complicated so that we maintain referential equality between items in
+            // ControllerModel.Attributes and ControllerModel.Attributes[*].Attribute.
+            var filteredAttributes = new List<object>();
+            foreach (var attribute in attributes)
+            {
+                if (attribute is IRouteTemplateProvider)
+                {
+                    // This attribute is a route-attribute, leave it out.
+                }
+                else
+                {
+                    filteredAttributes.Add(attribute);
+                }
+            }
+
+            filteredAttributes.AddRange(routeAttributes);
+
+            attributes = filteredAttributes.ToArray();
+
+            var controllerModel = new ControllerModel(typeInfo, attributes);
+
+            AddRange(controllerModel.Selectors, CreateSelectors(attributes));
+
+            controllerModel.ControllerName =
+                typeInfo.Name.EndsWith("Controller", StringComparison.OrdinalIgnoreCase) ?
+                    typeInfo.Name.Substring(0, typeInfo.Name.Length - "Controller".Length) :
+                    typeInfo.Name;
+
+            AddRange(controllerModel.Filters, attributes.OfType<IFilterMetadata>());
+
+            foreach (var routeValueProvider in attributes.OfType<IRouteValueProvider>())
+            {
+                controllerModel.RouteValues.Add(routeValueProvider.RouteKey, routeValueProvider.RouteValue);
+            }
+
+            var apiVisibility = attributes.OfType<IApiDescriptionVisibilityProvider>().FirstOrDefault();
+            if (apiVisibility != null)
+            {
+                controllerModel.ApiExplorer.IsVisible = !apiVisibility.IgnoreApi;
+            }
+
+            var apiGroupName = attributes.OfType<IApiDescriptionGroupNameProvider>().FirstOrDefault();
+            if (apiGroupName != null)
+            {
+                controllerModel.ApiExplorer.GroupName = apiGroupName.GroupName;
+            }
+
+            // Controllers can implement action filter and result filter interfaces. We add
+            // a special delegating filter implementation to the pipeline to handle it.
+            //
+            // This is needed because filters are instantiated before the controller.
+            if (typeof(IAsyncActionFilter).GetTypeInfo().IsAssignableFrom(typeInfo) ||
+                typeof(IActionFilter).GetTypeInfo().IsAssignableFrom(typeInfo))
+            {
+                controllerModel.Filters.Add(new ControllerActionFilter());
+            }
+            if (typeof(IAsyncResultFilter).GetTypeInfo().IsAssignableFrom(typeInfo) ||
+                typeof(IResultFilter).GetTypeInfo().IsAssignableFrom(typeInfo))
+            {
+                controllerModel.Filters.Add(new ControllerResultFilter());
+            }
+
+            return controllerModel;
+        }
+
+        /// <summary>
+        /// Creates a <see cref="PropertyModel"/> for the given <see cref="PropertyInfo"/>.
+        /// </summary>
+        /// <param name="propertyInfo">The <see cref="PropertyInfo"/>.</param>
+        /// <returns>A <see cref="PropertyModel"/> for the given <see cref="PropertyInfo"/>.</returns>
+        protected virtual PropertyModel CreatePropertyModel(PropertyInfo propertyInfo)
+        {
+            if (propertyInfo == null)
+            {
+                throw new ArgumentNullException(nameof(propertyInfo));
+            }
+
+            var attributes = propertyInfo.GetCustomAttributes(inherit: true);
+
+            // BindingInfo for properties can be either specified by decorating the property with binding specific attributes.
+            // ModelMetadata also adds information from the property's type and any configured IBindingMetadataProvider.
+            var modelMetadata = _modelMetadataProvider.GetMetadataForProperty(propertyInfo.DeclaringType, propertyInfo.Name);
+            var bindingInfo = BindingInfo.GetBindingInfo(attributes, modelMetadata);
+
+            if (bindingInfo == null)
+            {
+                // Look for BindPropertiesAttribute on the handler type if no BindingInfo was inferred for the property.
+                // This allows a user to enable model binding on properties by decorating the controller type with BindPropertiesAttribute.
+                var declaringType = propertyInfo.DeclaringType;
+                var bindPropertiesAttribute = declaringType.GetCustomAttribute<BindPropertiesAttribute>(inherit: true);
+                if (bindPropertiesAttribute != null)
+                {
+                    var requestPredicate = bindPropertiesAttribute.SupportsGet ? _supportsAllRequests : _supportsNonGetRequests;
+                    bindingInfo = new BindingInfo
+                    {
+                        RequestPredicate = requestPredicate,
+                    };
+                }
+            }
+
+            var propertyModel = new PropertyModel(propertyInfo, attributes)
+            {
+                PropertyName = propertyInfo.Name,
+                BindingInfo = bindingInfo,
+            };
+
+            return propertyModel;
+        }
+
+        /// <summary>
+        /// Creates the <see cref="ActionModel"/> instance for the given action <see cref="MethodInfo"/>.
+        /// </summary>
+        /// <param name="typeInfo">The controller <see cref="TypeInfo"/>.</param>
+        /// <param name="methodInfo">The action <see cref="MethodInfo"/>.</param>
+        /// <returns>
+        /// An <see cref="ActionModel"/> instance for the given action <see cref="MethodInfo"/> or
+        /// <c>null</c> if the <paramref name="methodInfo"/> does not represent an action.
+        /// </returns>
+        protected virtual ActionModel CreateActionModel(
+            TypeInfo typeInfo,
+            MethodInfo methodInfo)
+        {
+            if (typeInfo == null)
+            {
+                throw new ArgumentNullException(nameof(typeInfo));
+            }
+
+            if (methodInfo == null)
+            {
+                throw new ArgumentNullException(nameof(methodInfo));
+            }
+
+            if (!IsAction(typeInfo, methodInfo))
+            {
+                return null;
+            }
+
+            // CoreCLR returns IEnumerable<Attribute> from GetCustomAttributes - the OfType<object>
+            // is needed to so that the result of ToArray() is object
+            var attributes = methodInfo.GetCustomAttributes(inherit: true);
+
+            var actionModel = new ActionModel(methodInfo, attributes);
+
+            AddRange(actionModel.Filters, attributes.OfType<IFilterMetadata>());
+
+            var actionName = attributes.OfType<ActionNameAttribute>().FirstOrDefault();
+            if (actionName?.Name != null)
+            {
+                actionModel.ActionName = actionName.Name;
+            }
+            else
+            {
+                actionModel.ActionName = methodInfo.Name;
+            }
+
+            var apiVisibility = attributes.OfType<IApiDescriptionVisibilityProvider>().FirstOrDefault();
+            if (apiVisibility != null)
+            {
+                actionModel.ApiExplorer.IsVisible = !apiVisibility.IgnoreApi;
+            }
+
+            var apiGroupName = attributes.OfType<IApiDescriptionGroupNameProvider>().FirstOrDefault();
+            if (apiGroupName != null)
+            {
+                actionModel.ApiExplorer.GroupName = apiGroupName.GroupName;
+            }
+
+            foreach (var routeValueProvider in attributes.OfType<IRouteValueProvider>())
+            {
+                actionModel.RouteValues.Add(routeValueProvider.RouteKey, routeValueProvider.RouteValue);
+            }
+
+            // Now we need to determine the action selection info (cross-section of routes and constraints)
+            //
+            // For attribute routes on a action, we want to support 'overriding' routes on a
+            // virtual method, but allow 'overriding'. So we need to walk up the hierarchy looking
+            // for the first definition to define routes.
+            //
+            // Then we want to 'filter' the set of attributes, so that only the effective routes apply.
+            var currentMethodInfo = methodInfo;
+
+            IRouteTemplateProvider[] routeAttributes;
+
+            while (true)
+            {
+                routeAttributes = currentMethodInfo
+                    .GetCustomAttributes(inherit: false)
+                    .OfType<IRouteTemplateProvider>()
+                    .ToArray();
+
+                if (routeAttributes.Length > 0)
+                {
+                    // Found 1 or more route attributes.
+                    break;
+                }
+
+                // GetBaseDefinition returns 'this' when it gets to the bottom of the chain.
+                var nextMethodInfo = currentMethodInfo.GetBaseDefinition();
+                if (currentMethodInfo == nextMethodInfo)
+                {
+                    break;
+                }
+
+                currentMethodInfo = nextMethodInfo;
+            }
+
+            // This is fairly complicated so that we maintain referential equality between items in
+            // ActionModel.Attributes and ActionModel.Attributes[*].Attribute.
+            var applicableAttributes = new List<object>();
+            foreach (var attribute in attributes)
+            {
+                if (attribute is IRouteTemplateProvider)
+                {
+                    // This attribute is a route-attribute, leave it out.
+                }
+                else
+                {
+                    applicableAttributes.Add(attribute);
+                }
+            }
+
+            applicableAttributes.AddRange(routeAttributes);
+            AddRange(actionModel.Selectors, CreateSelectors(applicableAttributes));
+
+            return actionModel;
+        }
+
+        /// <summary>
+        /// Returns <c>true</c> if the <paramref name="methodInfo"/> is an action. Otherwise <c>false</c>.
+        /// </summary>
+        /// <param name="typeInfo">The <see cref="TypeInfo"/>.</param>
+        /// <param name="methodInfo">The <see cref="MethodInfo"/>.</param>
+        /// <returns><c>true</c> if the <paramref name="methodInfo"/> is an action. Otherwise <c>false</c>.</returns>
+        /// <remarks>
+        /// Override this method to provide custom logic to determine which methods are considered actions.
+        /// </remarks>
+        protected virtual bool IsAction(TypeInfo typeInfo, MethodInfo methodInfo)
+        {
+            if (typeInfo == null)
+            {
+                throw new ArgumentNullException(nameof(typeInfo));
+            }
+
+            if (methodInfo == null)
+            {
+                throw new ArgumentNullException(nameof(methodInfo));
+            }
+
+            // The SpecialName bit is set to flag members that are treated in a special way by some compilers
+            // (such as property accessors and operator overloading methods).
+            if (methodInfo.IsSpecialName)
+            {
+                return false;
+            }
+
+            if (methodInfo.IsDefined(typeof(NonActionAttribute)))
+            {
+                return false;
+            }
+
+            // Overridden methods from Object class, e.g. Equals(Object), GetHashCode(), etc., are not valid.
+            if (methodInfo.GetBaseDefinition().DeclaringType == typeof(object))
+            {
+                return false;
+            }
+
+            // Dispose method implemented from IDisposable is not valid
+            if (IsIDisposableMethod(methodInfo))
+            {
+                return false;
+            }
+
+            if (methodInfo.IsStatic)
+            {
+                return false;
+            }
+
+            if (methodInfo.IsAbstract)
+            {
+                return false;
+            }
+
+            if (methodInfo.IsConstructor)
+            {
+                return false;
+            }
+
+            if (methodInfo.IsGenericMethod)
+            {
+                return false;
+            }
+
+            return methodInfo.IsPublic;
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ParameterModel"/> for the given <see cref="ParameterInfo"/>.
+        /// </summary>
+        /// <param name="parameterInfo">The <see cref="ParameterInfo"/>.</param>
+        /// <returns>A <see cref="ParameterModel"/> for the given <see cref="ParameterInfo"/>.</returns>
+        protected virtual ParameterModel CreateParameterModel(ParameterInfo parameterInfo)
+        {
+            if (parameterInfo == null)
+            {
+                throw new ArgumentNullException(nameof(parameterInfo));
+            }
+
+            var attributes = parameterInfo.GetCustomAttributes(inherit: true);
+
+            BindingInfo bindingInfo;
+            if (_mvcOptions.AllowValidatingTopLevelNodes && _modelMetadataProvider is ModelMetadataProvider modelMetadataProviderBase)
+            {
+                var modelMetadata = modelMetadataProviderBase.GetMetadataForParameter(parameterInfo);
+                bindingInfo = BindingInfo.GetBindingInfo(attributes, modelMetadata);
+            }
+            else
+            {
+                // GetMetadataForParameter should only be used if the user has opted in to the 2.1 behavior.
+                bindingInfo = BindingInfo.GetBindingInfo(attributes);
+            }
+
+            var parameterModel = new ParameterModel(parameterInfo, attributes)
+            {
+                ParameterName = parameterInfo.Name,
+                BindingInfo = bindingInfo,
+            };
+
+            return parameterModel;
+        }
+
+        private IList<SelectorModel> CreateSelectors(IList<object> attributes)
+        {
+            // Route attributes create multiple selector models, we want to split the set of
+            // attributes based on these so each selector only has the attributes that affect it.
+            //
+            // The set of route attributes are split into those that 'define' a route versus those that are
+            // 'silent'.
+            //
+            // We need to define a selector for each attribute that 'defines' a route, and a single selector
+            // for all of the ones that don't (if any exist).
+            //
+            // If the attribute that 'defines' a route is NOT an IActionHttpMethodProvider, then we'll include with
+            // it, any IActionHttpMethodProvider that are 'silent' IRouteTemplateProviders. In this case the 'extra'
+            // action for silent route providers isn't needed.
+            //
+            // Ex:
+            // [HttpGet]
+            // [AcceptVerbs("POST", "PUT")]
+            // [HttpPost("Api/Things")]
+            // public void DoThing()
+            //
+            // This will generate 2 selectors:
+            // 1. [HttpPost("Api/Things")]
+            // 2. [HttpGet], [AcceptVerbs("POST", "PUT")]
+            //
+            // Another example of this situation is:
+            //
+            // [Route("api/Products")]
+            // [AcceptVerbs("GET", "HEAD")]
+            // [HttpPost("api/Products/new")]
+            //
+            // This will generate 2 selectors:
+            // 1. [AcceptVerbs("GET", "HEAD")]
+            // 2. [HttpPost]
+            //
+            // Note that having a route attribute that doesn't define a route template _might_ be an error. We
+            // don't have enough context to really know at this point so we just pass it on.
+            var routeProviders = new List<IRouteTemplateProvider>();
+
+            var createSelectorForSilentRouteProviders = false;
+            foreach (var attribute in attributes)
+            {
+                if (attribute is IRouteTemplateProvider routeTemplateProvider)
+                {
+                    if (IsSilentRouteAttribute(routeTemplateProvider))
+                    {
+                        createSelectorForSilentRouteProviders = true;
+                    }
+                    else
+                    {
+                        routeProviders.Add(routeTemplateProvider);
+                    }
+                }
+            }
+
+            foreach (var routeProvider in routeProviders)
+            {
+                // If we see an attribute like
+                // [Route(...)]
+                //
+                // Then we want to group any attributes like [HttpGet] with it.
+                //
+                // Basically...
+                //
+                // [HttpGet]
+                // [HttpPost("Products")]
+                // public void Foo() { }
+                //
+                // Is two selectors. And...
+                //
+                // [HttpGet]
+                // [Route("Products")]
+                // public void Foo() { }
+                //
+                // Is one selector.
+                if (!(routeProvider is IActionHttpMethodProvider))
+                {
+                    createSelectorForSilentRouteProviders = false;
+                }
+            }
+
+            var selectorModels = new List<SelectorModel>();
+            if (routeProviders.Count == 0 && !createSelectorForSilentRouteProviders)
+            {
+                // Simple case, all attributes apply
+                selectorModels.Add(CreateSelectorModel(route: null, attributes: attributes));
+            }
+            else
+            {
+                // Each of these routeProviders are the ones that actually have routing information on them
+                // something like [HttpGet] won't show up here, but [HttpGet("Products")] will.
+                foreach (var routeProvider in routeProviders)
+                {
+                    var filteredAttributes = new List<object>();
+                    foreach (var attribute in attributes)
+                    {
+                        if (ReferenceEquals(attribute, routeProvider))
+                        {
+                            filteredAttributes.Add(attribute);
+                        }
+                        else if (InRouteProviders(routeProviders, attribute))
+                        {
+                            // Exclude other route template providers
+                            // Example:
+                            // [HttpGet("template")]
+                            // [Route("template/{id}")]
+                        }
+                        else if (
+                            routeProvider is IActionHttpMethodProvider &&
+                            attribute is IActionHttpMethodProvider)
+                        {
+                            // Example:
+                            // [HttpGet("template")]
+                            // [AcceptVerbs("GET", "POST")]
+                            //
+                            // Exclude other http method providers if this route is an
+                            // http method provider.
+                        }
+                        else
+                        {
+                            filteredAttributes.Add(attribute);
+                        }
+                    }
+
+                    selectorModels.Add(CreateSelectorModel(routeProvider, filteredAttributes));
+                }
+
+                if (createSelectorForSilentRouteProviders)
+                {
+                    var filteredAttributes = new List<object>();
+                    foreach (var attribute in attributes)
+                    {
+                        if (!InRouteProviders(routeProviders, attribute))
+                        {
+                            filteredAttributes.Add(attribute);
+                        }
+                    }
+
+                    selectorModels.Add(CreateSelectorModel(route: null, attributes: filteredAttributes));
+                }
+            }
+
+            return selectorModels;
+        }
+
+        private static bool InRouteProviders(List<IRouteTemplateProvider> routeProviders, object attribute)
+        {
+            foreach (var rp in routeProviders)
+            {
+                if (ReferenceEquals(rp, attribute))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private static SelectorModel CreateSelectorModel(IRouteTemplateProvider route, IList<object> attributes)
+        {
+            var selectorModel = new SelectorModel();
+            if (route != null)
+            {
+                selectorModel.AttributeRouteModel = new AttributeRouteModel(route);
+            }
+
+            AddRange(selectorModel.ActionConstraints, attributes.OfType<IActionConstraintMetadata>());
+
+            // Simple case, all HTTP method attributes apply
+            var httpMethods = attributes
+                .OfType<IActionHttpMethodProvider>()
+                .SelectMany(a => a.HttpMethods)
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .ToArray();
+
+            if (httpMethods.Length > 0)
+            {
+                selectorModel.ActionConstraints.Add(new HttpMethodActionConstraint(httpMethods));
+            }
+
+            return selectorModel;
+        }
+
+        private bool IsIDisposableMethod(MethodInfo methodInfo)
+        {
+            // Ideally we do not want Dispose method to be exposed as an action. However there are some scenarios where a user
+            // might want to expose a method with name "Dispose" (even though they might not be really disposing resources)
+            // Example: A controller deriving from MVC's Controller type might wish to have a method with name Dispose,
+            // in which case they can use the "new" keyword to hide the base controller's declaration.
+
+            // Find where the method was originally declared
+            var baseMethodInfo = methodInfo.GetBaseDefinition();
+            var declaringTypeInfo = baseMethodInfo.DeclaringType.GetTypeInfo();
+
+            return
+                (typeof(IDisposable).GetTypeInfo().IsAssignableFrom(declaringTypeInfo) &&
+                 declaringTypeInfo.GetRuntimeInterfaceMap(typeof(IDisposable)).TargetMethods[0] == baseMethodInfo);
+        }
+
+        private bool IsSilentRouteAttribute(IRouteTemplateProvider routeTemplateProvider)
+        {
+            return
+                routeTemplateProvider.Template == null &&
+                routeTemplateProvider.Order == null &&
+                routeTemplateProvider.Name == null;
+        }
+
+        private static void AddRange<T>(IList<T> list, IEnumerable<T> items)
+        {
+            foreach (var item in items)
+            {
+                list.Add(item);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultBindingMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultBindingMetadataProvider.cs
new file mode 100644
index 0000000000..8e0546b992
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultBindingMetadataProvider.cs
@@ -0,0 +1,131 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// A default implementation of <see cref="IBindingMetadataProvider"/>.
+    /// </summary>
+    public class DefaultBindingMetadataProvider : IBindingMetadataProvider
+    {
+        public void CreateBindingMetadata(BindingMetadataProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            // BinderModelName
+            foreach (var binderModelNameAttribute in context.Attributes.OfType<IModelNameProvider>())
+            {
+                if (binderModelNameAttribute?.Name != null)
+                {
+                    context.BindingMetadata.BinderModelName = binderModelNameAttribute.Name;
+                    break;
+                }
+            }
+
+            // BinderType
+            foreach (var binderTypeAttribute in context.Attributes.OfType<IBinderTypeProviderMetadata>())
+            {
+                if (binderTypeAttribute.BinderType != null)
+                {
+                    context.BindingMetadata.BinderType = binderTypeAttribute.BinderType;
+                    break;
+                }
+            }
+
+            // BindingSource
+            foreach (var bindingSourceAttribute in context.Attributes.OfType<IBindingSourceMetadata>())
+            {
+                if (bindingSourceAttribute.BindingSource != null)
+                {
+                    context.BindingMetadata.BindingSource = bindingSourceAttribute.BindingSource;
+                    break;
+                }
+            }
+
+            // PropertyFilterProvider
+            var propertyFilterProviders = context.Attributes.OfType<IPropertyFilterProvider>().ToArray();
+            if (propertyFilterProviders.Length == 0)
+            {
+                context.BindingMetadata.PropertyFilterProvider = null;
+            }
+            else if (propertyFilterProviders.Length == 1)
+            {
+                context.BindingMetadata.PropertyFilterProvider = propertyFilterProviders[0];
+            }
+            else
+            {
+                var composite = new CompositePropertyFilterProvider(propertyFilterProviders);
+                context.BindingMetadata.PropertyFilterProvider = composite;
+            }
+
+            var bindingBehavior = FindBindingBehavior(context);
+            if (bindingBehavior != null)
+            {
+                context.BindingMetadata.IsBindingAllowed = bindingBehavior.Behavior != BindingBehavior.Never;
+                context.BindingMetadata.IsBindingRequired = bindingBehavior.Behavior == BindingBehavior.Required;
+            }
+        }
+
+        private static BindingBehaviorAttribute FindBindingBehavior(BindingMetadataProviderContext context)
+        {
+            switch (context.Key.MetadataKind)
+            {
+                case ModelMetadataKind.Property:
+                    // BindingBehavior can fall back to attributes on the Container Type, but we should ignore
+                    // attributes on the Property Type.
+                    var matchingAttributes = context.PropertyAttributes.OfType<BindingBehaviorAttribute>();
+                    return matchingAttributes.FirstOrDefault()
+                        ?? context.Key.ContainerType.GetTypeInfo()
+                            .GetCustomAttributes(typeof(BindingBehaviorAttribute), inherit: true)
+                            .OfType<BindingBehaviorAttribute>()
+                            .FirstOrDefault();
+                case ModelMetadataKind.Parameter:
+                    return context.ParameterAttributes.OfType<BindingBehaviorAttribute>().FirstOrDefault();
+                default:
+                    return null;
+            }
+        }
+
+        private class CompositePropertyFilterProvider : IPropertyFilterProvider
+        {
+            private readonly IEnumerable<IPropertyFilterProvider> _providers;
+
+            public CompositePropertyFilterProvider(IEnumerable<IPropertyFilterProvider> providers)
+            {
+                _providers = providers;
+            }
+
+            public Func<ModelMetadata, bool> PropertyFilter => CreatePropertyFilter();
+
+            private Func<ModelMetadata, bool> CreatePropertyFilter()
+            {
+                var propertyFilters = _providers
+                    .Select(p => p.PropertyFilter)
+                    .Where(p => p != null);
+
+                return (m) =>
+                {
+                    foreach (var propertyFilter in propertyFilters)
+                    {
+                        if (!propertyFilter(m))
+                        {
+                            return false;
+                        }
+                    }
+
+                    return true;
+                };
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultCollectionValidationStrategy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultCollectionValidationStrategy.cs
new file mode 100644
index 0000000000..322f55d55b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultCollectionValidationStrategy.cs
@@ -0,0 +1,141 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using System.Linq.Expressions;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// The default implementation of <see cref="IValidationStrategy"/> for a collection.
+    /// </summary>
+    /// <remarks>
+    /// This implementation handles cases like:
+    /// <example>
+    ///     Model: IList&lt;Student&gt; 
+    ///     Query String: ?students[0].Age=8&amp;students[1].Age=9
+    /// 
+    ///     In this case the elements of the collection are identified in the input data set by an incrementing
+    ///     integer index.
+    /// </example>
+    /// 
+    /// or:
+    /// 
+    /// <example>
+    ///     Model: IDictionary&lt;string, int&gt; 
+    ///     Query String: ?students[0].Key=Joey&amp;students[0].Value=8
+    /// 
+    ///     In this case the dictionary is treated as a collection of key-value pairs, and the elements of the
+    ///     collection are identified in the input data set by an incrementing integer index.
+    /// </example>
+    /// 
+    /// Using this key format, the enumerator enumerates model objects of type matching
+    /// <see cref="ModelMetadata.ElementMetadata"/>. The indices of the elements in the collection are used to
+    /// compute the model prefix keys.
+    /// </remarks>
+    public class DefaultCollectionValidationStrategy : IValidationStrategy
+    {
+        private static readonly MethodInfo _getEnumerator = typeof(DefaultCollectionValidationStrategy)
+            .GetMethod(nameof(GetEnumerator), BindingFlags.Static | BindingFlags.NonPublic);
+
+        /// <summary>
+        /// Gets an instance of <see cref="DefaultCollectionValidationStrategy"/>.
+        /// </summary>
+        public static readonly DefaultCollectionValidationStrategy Instance = new DefaultCollectionValidationStrategy();
+        private readonly ConcurrentDictionary<Type, Func<object, IEnumerator>> _genericGetEnumeratorCache = new ConcurrentDictionary<Type, Func<object, IEnumerator>>();
+
+        private DefaultCollectionValidationStrategy()
+        {
+        }
+
+        /// <inheritdoc />
+        public IEnumerator<ValidationEntry> GetChildren(
+            ModelMetadata metadata,
+            string key,
+            object model)
+        {
+            var enumerator = GetEnumeratorForElementType(metadata, model);
+            return new Enumerator(metadata.ElementMetadata, key, enumerator);
+        }
+
+        public IEnumerator GetEnumeratorForElementType(ModelMetadata metadata, object model)
+        {
+            Func<object, IEnumerator> getEnumerator = _genericGetEnumeratorCache.GetOrAdd(
+                key: metadata.ElementType,
+                valueFactory: (type) => {
+                    var getEnumeratorMethod = _getEnumerator.MakeGenericMethod(type);
+                    var parameter = Expression.Parameter(typeof(object), "model");
+                    var expression =
+                        Expression.Lambda<Func<object, IEnumerator>>(
+                            Expression.Call(null, getEnumeratorMethod, parameter),
+                            parameter);
+                    return expression.Compile();
+                });
+
+            return getEnumerator(model);
+        }
+
+        // Called via reflection.
+        private static IEnumerator GetEnumerator<T>(object model)
+        {
+            return (model as IEnumerable<T>)?.GetEnumerator() ?? ((IEnumerable)model).GetEnumerator();
+        }
+
+        private class Enumerator : IEnumerator<ValidationEntry>
+        {
+            private readonly string _key;
+            private readonly ModelMetadata _metadata;
+            private readonly IEnumerator _enumerator;
+
+            private ValidationEntry _entry;
+            private int _index;
+
+            public Enumerator(
+                ModelMetadata metadata,
+                string key,
+                IEnumerator enumerator)
+            {
+                _metadata = metadata;
+                _key = key;
+                _enumerator = enumerator;
+
+                _index = -1;
+            }
+
+            public ValidationEntry Current => _entry;
+
+            object IEnumerator.Current => Current;
+
+            public bool MoveNext()
+            {
+                _index++;
+                if (!_enumerator.MoveNext())
+                {
+                    return false;
+                }
+
+                var key = ModelNames.CreateIndexModelName(_key, _index);
+                var model = _enumerator.Current;
+
+                _entry = new ValidationEntry(_metadata, key, model);
+
+                return true;
+            }
+
+            public void Dispose()
+            {
+            }
+
+            public void Reset()
+            {
+                _enumerator.Reset();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultComplexObjectValidationStrategy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultComplexObjectValidationStrategy.cs
new file mode 100644
index 0000000000..a2a1e0323a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultComplexObjectValidationStrategy.cs
@@ -0,0 +1,122 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// The default implementation of <see cref="IValidationStrategy"/> for a complex object.
+    /// </summary>
+    public class DefaultComplexObjectValidationStrategy : IValidationStrategy
+    {
+        private static readonly bool IsMono = Type.GetType("Mono.Runtime") != null;
+
+        /// <summary>
+        /// Gets an instance of <see cref="DefaultComplexObjectValidationStrategy"/>.
+        /// </summary>
+        public static readonly IValidationStrategy Instance = new DefaultComplexObjectValidationStrategy();
+
+        private DefaultComplexObjectValidationStrategy()
+        {
+        }
+
+        /// <inheritdoc />
+        public IEnumerator<ValidationEntry> GetChildren(
+            ModelMetadata metadata,
+            string key,
+            object model)
+        {
+            return new Enumerator(metadata.Properties, key, model);
+        }
+
+        private class Enumerator : IEnumerator<ValidationEntry>
+        {
+            private readonly string _key;
+            private readonly object _model;
+            private readonly ModelPropertyCollection _properties;
+
+            private ValidationEntry _entry;
+            private int _index;
+
+            public Enumerator(
+                ModelPropertyCollection properties,
+                string key,
+                object model)
+            {
+                _properties = properties;
+                _key = key;
+                _model = model;
+
+                _index = -1;
+            }
+
+            public ValidationEntry Current => _entry;
+
+            object IEnumerator.Current => Current;
+
+            public bool MoveNext()
+            {
+                _index++;
+                if (_index >= _properties.Count)
+                {
+                    return false;
+                }
+
+                var property = _properties[_index];
+                var propertyName = property.BinderModelName ?? property.PropertyName;
+                var key = ModelNames.CreatePropertyModelName(_key, propertyName);
+
+                if (_model == null)
+                {
+                    // Performance: Never create a delegate when container is null.
+                    _entry = new ValidationEntry(property, key, model: null);
+                }
+                else if (IsMono)
+                {
+                    _entry = new ValidationEntry(property, key, () => GetModelOnMono(_model, property.PropertyName));
+                }
+                else
+                {
+                    _entry = new ValidationEntry(property, key, () => GetModel(_model, property));
+                }
+
+                return true;
+            }
+
+            public void Dispose()
+            {
+            }
+
+            public void Reset()
+            {
+                throw new NotImplementedException();
+            }
+
+            private static object GetModel(object container, ModelMetadata property)
+            {
+                return property.PropertyGetter(container);
+            }
+
+            // Our property accessors don't work on Mono 4.0.4 - see https://github.com/aspnet/External/issues/44
+            // This is a workaround for what the PropertyGetter does in the background.
+            private static object GetModelOnMono(object container, string propertyName)
+            {
+                var propertyInfo = container.GetType().GetRuntimeProperty(propertyName);
+                try
+                {
+                    return propertyInfo.GetValue(container);
+                }
+                catch (TargetInvocationException ex)
+                {
+                    throw ex.InnerException;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultCompositeMetadataDetailsProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultCompositeMetadataDetailsProvider.cs
new file mode 100644
index 0000000000..37dfed3868
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultCompositeMetadataDetailsProvider.cs
@@ -0,0 +1,69 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// A default implementation of <see cref="ICompositeMetadataDetailsProvider"/>.
+    /// </summary>
+    public class DefaultCompositeMetadataDetailsProvider : ICompositeMetadataDetailsProvider
+    {
+        private readonly IEnumerable<IMetadataDetailsProvider> _providers;
+
+        /// <summary>
+        /// Creates a new <see cref="DefaultCompositeMetadataDetailsProvider"/>.
+        /// </summary>
+        /// <param name="providers">The set of <see cref="IMetadataDetailsProvider"/> instances.</param>
+        public DefaultCompositeMetadataDetailsProvider(IEnumerable<IMetadataDetailsProvider> providers)
+        {
+            _providers = providers;
+        }
+
+        /// <inheritdoc />
+        public virtual void CreateBindingMetadata(BindingMetadataProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            foreach (var provider in _providers.OfType<IBindingMetadataProvider>())
+            {
+                provider.CreateBindingMetadata(context);
+            }
+        }
+
+        /// <inheritdoc />
+        public virtual void CreateDisplayMetadata(DisplayMetadataProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            foreach (var provider in _providers.OfType<IDisplayMetadataProvider>())
+            {
+                provider.CreateDisplayMetadata(context);
+            }
+        }
+
+        /// <inheritdoc />
+        public virtual void CreateValidationMetadata(ValidationMetadataProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            foreach (var provider in _providers.OfType<IValidationMetadataProvider>())
+            {
+                provider.CreateValidationMetadata(context);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultControllerPropertyActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultControllerPropertyActivator.cs
new file mode 100644
index 0000000000..857a4b23cb
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultControllerPropertyActivator.cs
@@ -0,0 +1,87 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class DefaultControllerPropertyActivator : IControllerPropertyActivator
+    {
+        private static readonly Func<Type, PropertyActivator<ControllerContext>[]> _getPropertiesToActivate =
+            GetPropertiesToActivate;
+        private object _initializeLock = new object();
+        private bool _initialized;
+        private ConcurrentDictionary<Type, PropertyActivator<ControllerContext>[]> _activateActions;
+
+        public void Activate(ControllerContext context, object controller)
+        {
+            LazyInitializer.EnsureInitialized(
+                ref _activateActions,
+                ref _initialized,
+                ref _initializeLock);
+
+            var controllerType = controller.GetType();
+            var propertiesToActivate = _activateActions.GetOrAdd(
+                controllerType,
+                _getPropertiesToActivate);
+
+            for (var i = 0; i < propertiesToActivate.Length; i++)
+            {
+                var activateInfo = propertiesToActivate[i];
+                activateInfo.Activate(controller, context);
+            }
+        }
+
+        public Action<ControllerContext, object> GetActivatorDelegate(ControllerActionDescriptor actionDescriptor)
+        {
+            if (actionDescriptor == null)
+            {
+                throw new ArgumentNullException(nameof(actionDescriptor));
+            }
+
+            var controllerType = actionDescriptor.ControllerTypeInfo?.AsType();
+            if (controllerType == null)
+            {
+                throw new ArgumentException(Resources.FormatPropertyOfTypeCannotBeNull(
+                    nameof(actionDescriptor.ControllerTypeInfo),
+                    nameof(actionDescriptor)),
+                    nameof(actionDescriptor));
+            }
+
+            var propertiesToActivate = GetPropertiesToActivate(controllerType);
+            void Activate(ControllerContext controllerContext, object controller)
+            {
+                for (var i = 0; i < propertiesToActivate.Length; i++)
+                {
+                    var activateInfo = propertiesToActivate[i];
+                    activateInfo.Activate(controller, controllerContext);
+                }
+            }
+
+            return Activate;
+        }
+
+        private static PropertyActivator<ControllerContext>[] GetPropertiesToActivate(Type type)
+        {
+            IEnumerable<PropertyActivator<ControllerContext>> activators;
+            activators = PropertyActivator<ControllerContext>.GetPropertiesToActivate(
+                type,
+                typeof(ActionContextAttribute),
+                p => new PropertyActivator<ControllerContext>(p, c => c));
+
+            activators = activators.Concat(PropertyActivator<ControllerContext>.GetPropertiesToActivate(
+                type,
+                typeof(ControllerContextAttribute),
+                p => new PropertyActivator<ControllerContext>(p, c => c)));
+
+            return activators.ToArray();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultFilterProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultFilterProvider.cs
new file mode 100644
index 0000000000..3e7f685494
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultFilterProvider.cs
@@ -0,0 +1,83 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class DefaultFilterProvider : IFilterProvider
+    {
+        public int Order => -1000;
+
+        /// <inheritdoc />
+        public void OnProvidersExecuting(FilterProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (context.ActionContext.ActionDescriptor.FilterDescriptors != null)
+            {
+                // Perf: Avoid allocations
+                for (var i = 0; i < context.Results.Count; i++)
+                {
+                    ProvideFilter(context, context.Results[i]);
+                }
+            }
+        }
+
+        /// <inheritdoc />
+        public void OnProvidersExecuted(FilterProviderContext context)
+        {
+        }
+
+        public virtual void ProvideFilter(FilterProviderContext context, FilterItem filterItem)
+        {
+            if (filterItem.Filter != null)
+            {
+                return;
+            }
+
+            var filter = filterItem.Descriptor.Filter;
+
+            var filterFactory = filter as IFilterFactory;
+            if (filterFactory == null)
+            {
+                filterItem.Filter = filter;
+                filterItem.IsReusable = true;
+            }
+            else
+            {
+                var services = context.ActionContext.HttpContext.RequestServices;
+                filterItem.Filter = filterFactory.CreateInstance(services);
+                filterItem.IsReusable = filterFactory.IsReusable;
+
+                if (filterItem.Filter == null)
+                {
+                    throw new InvalidOperationException(Resources.FormatTypeMethodMustReturnNotNullValue(
+                        "CreateInstance",
+                        typeof(IFilterFactory).Name));
+                }
+
+                ApplyFilterToContainer(filterItem.Filter, filterFactory);
+            }
+        }
+
+        private void ApplyFilterToContainer(object actualFilter, IFilterMetadata filterMetadata)
+        {
+            Debug.Assert(actualFilter != null, "actualFilter should not be null");
+            Debug.Assert(filterMetadata != null, "filterMetadata should not be null");
+
+            var container = actualFilter as IFilterContainer;
+
+            if (container != null)
+            {
+                container.FilterDefinition = filterMetadata;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultModelBindingContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultModelBindingContext.cs
new file mode 100644
index 0000000000..0ff9292a02
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultModelBindingContext.cs
@@ -0,0 +1,344 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// A context that contains operating information for model binding and validation.
+    /// </summary>
+    public class DefaultModelBindingContext : ModelBindingContext
+    {
+        private static readonly IValueProvider EmptyValueProvider = new CompositeValueProvider();
+
+        private IValueProvider _originalValueProvider;
+        private ActionContext _actionContext;
+        private ModelStateDictionary _modelState;
+        private ValidationStateDictionary _validationState;
+
+        private State _state;
+        private readonly Stack<State> _stack = new Stack<State>();
+
+        /// <inheritdoc />
+        public override ActionContext ActionContext
+        {
+            get { return _actionContext; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+                _actionContext = value;
+            }
+        }
+
+        /// <inheritdoc />
+        public override string FieldName
+        {
+            get { return _state.FieldName; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+                _state.FieldName = value;
+            }
+        }
+
+        /// <inheritdoc />
+        public override object Model
+        {
+            get { return _state.Model; }
+            set { _state.Model = value; }
+        }
+
+        /// <inheritdoc />
+        public override ModelMetadata ModelMetadata
+        {
+            get { return _state.ModelMetadata; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+                _state.ModelMetadata = value;
+            }
+        }
+
+        /// <inheritdoc />
+        public override string ModelName
+        {
+            get { return _state.ModelName; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+                _state.ModelName = value;
+            }
+        }
+
+        /// <inheritdoc />
+        public override ModelStateDictionary ModelState
+        {
+            get { return _modelState; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+                _modelState = value;
+            }
+        }
+
+        /// <inheritdoc />
+        public override string BinderModelName
+        {
+            get { return _state.BinderModelName; }
+            set { _state.BinderModelName = value; }
+        }
+
+        /// <inheritdoc />
+        public override BindingSource BindingSource
+        {
+            get { return _state.BindingSource; }
+            set { _state.BindingSource = value; }
+        }
+
+        /// <inheritdoc />
+        public override bool IsTopLevelObject
+        {
+            get { return _state.IsTopLevelObject; }
+            set { _state.IsTopLevelObject = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the original value provider to be used when value providers are not filtered.
+        /// </summary>
+        public IValueProvider OriginalValueProvider
+        {
+            get { return _originalValueProvider; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+                _originalValueProvider = value;
+            }
+        }
+
+        /// <inheritdoc />
+        public override IValueProvider ValueProvider
+        {
+            get { return _state.ValueProvider; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+                _state.ValueProvider = value;
+            }
+        }
+
+        /// <inheritdoc />
+        public override Func<ModelMetadata, bool> PropertyFilter
+        {
+            get { return _state.PropertyFilter; }
+            set { _state.PropertyFilter = value; }
+        }
+
+        /// <inheritdoc />
+        public override ValidationStateDictionary ValidationState
+        {
+            get { return _validationState; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+                _validationState = value;
+            }
+        }
+
+        /// <inheritdoc />
+        public override ModelBindingResult Result
+        {
+            get
+            {
+                return _state.Result;
+            }
+            set
+            {
+                _state.Result = value;
+            }
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="DefaultModelBindingContext"/> for top-level model binding operation.
+        /// </summary>
+        /// <param name="actionContext">
+        /// The <see cref="ActionContext"/> associated with the binding operation.
+        /// </param>
+        /// <param name="valueProvider">The <see cref="IValueProvider"/> to use for binding.</param>
+        /// <param name="metadata"><see cref="ModelMetadata"/> associated with the model.</param>
+        /// <param name="bindingInfo"><see cref="BindingInfo"/> associated with the model.</param>
+        /// <param name="modelName">The name of the property or parameter being bound.</param>
+        /// <returns>A new instance of <see cref="DefaultModelBindingContext"/>.</returns>
+        public static ModelBindingContext CreateBindingContext(
+            ActionContext actionContext,
+            IValueProvider valueProvider,
+            ModelMetadata metadata,
+            BindingInfo bindingInfo,
+            string modelName)
+        {
+            if (actionContext == null)
+            {
+                throw new ArgumentNullException(nameof(actionContext));
+            }
+
+            if (valueProvider == null)
+            {
+                throw new ArgumentNullException(nameof(valueProvider));
+            }
+
+            if (metadata == null)
+            {
+                throw new ArgumentNullException(nameof(metadata));
+            }
+
+            if (modelName == null)
+            {
+                throw new ArgumentNullException(nameof(modelName));
+            }
+
+            var binderModelName = bindingInfo?.BinderModelName ?? metadata.BinderModelName;
+            var propertyFilterProvider = bindingInfo?.PropertyFilterProvider ?? metadata.PropertyFilterProvider;
+
+            var bindingSource = bindingInfo?.BindingSource ?? metadata.BindingSource;
+
+            return new DefaultModelBindingContext()
+            {
+                ActionContext = actionContext,
+                BinderModelName = binderModelName,
+                BindingSource = bindingSource,
+                PropertyFilter = propertyFilterProvider?.PropertyFilter,
+
+                // Because this is the top-level context, FieldName and ModelName should be the same.
+                FieldName = binderModelName ?? modelName,
+                ModelName = binderModelName ?? modelName,
+
+                IsTopLevelObject = true,
+                ModelMetadata = metadata,
+                ModelState = actionContext.ModelState,
+
+                OriginalValueProvider = valueProvider,
+                ValueProvider = FilterValueProvider(valueProvider, bindingSource),
+
+                ValidationState = new ValidationStateDictionary(),
+            };
+        }
+
+        /// <inheritdoc />
+        public override NestedScope EnterNestedScope(
+            ModelMetadata modelMetadata,
+            string fieldName,
+            string modelName,
+            object model)
+        {
+            if (modelMetadata == null)
+            {
+                throw new ArgumentNullException(nameof(modelMetadata));
+            }
+
+            if (fieldName == null)
+            {
+                throw new ArgumentNullException(nameof(fieldName));
+            }
+
+            if (modelName == null)
+            {
+                throw new ArgumentNullException(nameof(modelName));
+            }
+
+            var scope = EnterNestedScope();
+
+            // Only filter if the new BindingSource affects the value providers. Otherwise we want
+            // to preserve the current state.
+            if (modelMetadata.BindingSource != null && !modelMetadata.BindingSource.IsGreedy)
+            {
+                ValueProvider = FilterValueProvider(OriginalValueProvider, modelMetadata.BindingSource);
+            }
+
+            Model = model;
+            ModelMetadata = modelMetadata;
+            ModelName = modelName;
+            FieldName = fieldName;
+            BinderModelName = modelMetadata.BinderModelName;
+            BindingSource = modelMetadata.BindingSource;
+            PropertyFilter = modelMetadata.PropertyFilterProvider?.PropertyFilter;
+
+            IsTopLevelObject = false;
+
+            return scope;
+        }
+
+        /// <inheritdoc />
+        public override NestedScope EnterNestedScope()
+        {
+            _stack.Push(_state);
+
+            Result = default;
+
+            return new NestedScope(this);
+        }
+
+        /// <inheritdoc />
+        protected override void ExitNestedScope()
+        {
+            _state = _stack.Pop();
+        }
+
+        private static IValueProvider FilterValueProvider(IValueProvider valueProvider, BindingSource bindingSource)
+        {
+            if (bindingSource == null || bindingSource.IsGreedy)
+            {
+                return valueProvider;
+            }
+
+            if (!(valueProvider is IBindingSourceValueProvider bindingSourceValueProvider))
+            {
+                return valueProvider;
+            }
+
+            return bindingSourceValueProvider.Filter(bindingSource) ?? EmptyValueProvider;
+        }
+
+        private struct State
+        {
+            public string FieldName;
+            public object Model;
+            public ModelMetadata ModelMetadata;
+            public string ModelName;
+
+            public IValueProvider ValueProvider;
+            public Func<ModelMetadata, bool> PropertyFilter;
+
+            public string BinderModelName;
+            public BindingSource BindingSource;
+            public bool IsTopLevelObject;
+
+            public ModelBindingResult Result;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultModelValidatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultModelValidatorProvider.cs
new file mode 100644
index 0000000000..11d5739c02
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultModelValidatorProvider.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// A default <see cref="IModelValidatorProvider"/>.
+    /// </summary>
+    /// <remarks>
+    /// The <see cref="DefaultModelValidatorProvider"/> provides validators from <see cref="IModelValidator"/>
+    /// instances in <see cref="ModelBinding.ModelMetadata.ValidatorMetadata"/>.
+    /// </remarks>
+    public class DefaultModelValidatorProvider : IModelValidatorProvider
+    {
+        /// <inheritdoc />
+        public void CreateValidators(ModelValidatorProviderContext context)
+        {
+            //Perf: Avoid allocations here
+            for (var i = 0; i < context.Results.Count; i++)
+            {
+                var validatorItem = context.Results[i];
+
+                // Don't overwrite anything that was done by a previous provider.
+                if (validatorItem.Validator != null)
+                {
+                    continue;
+                }
+
+                var validator = validatorItem.ValidatorMetadata as IModelValidator;
+                if (validator != null)
+                {
+                    validatorItem.Validator = validator;
+                    validatorItem.IsReusable = true;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultObjectValidator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultObjectValidator.cs
new file mode 100644
index 0000000000..0afcdb0f5e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultObjectValidator.cs
@@ -0,0 +1,42 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// The default implementation of <see cref="IObjectModelValidator"/>.
+    /// </summary>
+    public class DefaultObjectValidator : ObjectModelValidator
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="DefaultObjectValidator"/>.
+        /// </summary>
+        /// <param name="modelMetadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
+        /// <param name="validatorProviders">The list of <see cref="IModelValidatorProvider"/>.</param>
+        public DefaultObjectValidator(
+            IModelMetadataProvider modelMetadataProvider,
+            IList<IModelValidatorProvider> validatorProviders)
+            : base(modelMetadataProvider, validatorProviders)
+        {
+        }
+
+        public override ValidationVisitor GetValidationVisitor(
+            ActionContext actionContext,
+            IModelValidatorProvider validatorProvider,
+            ValidatorCache validatorCache,
+            IModelMetadataProvider metadataProvider,
+            ValidationStateDictionary validationState)
+        {
+            return new ValidationVisitor(
+                actionContext,
+                validatorProvider,
+                validatorCache,
+                metadataProvider,
+                validationState);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultValidationMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultValidationMetadataProvider.cs
new file mode 100644
index 0000000000..03faa4be62
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultValidationMetadataProvider.cs
@@ -0,0 +1,59 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// A default implementation of <see cref="IValidationMetadataProvider"/>.
+    /// </summary>
+    public class DefaultValidationMetadataProvider : IValidationMetadataProvider
+    {
+        /// <inheritdoc />
+        public void CreateValidationMetadata(ValidationMetadataProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            foreach (var attribute in context.Attributes)
+            {
+                if (attribute is IModelValidator || attribute is IClientModelValidator)
+                {
+                    // If another provider has already added this attribute, do not repeat it.
+                    // This will prevent attributes like RemoteAttribute (which implement ValidationAttribute and
+                    // IClientModelValidator) to be added to the ValidationMetadata twice.
+                    // This is to ensure we do not end up with duplication validation rules on the client side.
+                    if (!context.ValidationMetadata.ValidatorMetadata.Contains(attribute))
+                    {
+                        context.ValidationMetadata.ValidatorMetadata.Add(attribute);
+                    }
+                }
+            }
+
+            // IPropertyValidationFilter attributes on a type affect properties in that type, not properties that have
+            // that type. Thus, we ignore context.TypeAttributes for properties and not check at all for types.
+            if (context.Key.MetadataKind == ModelMetadataKind.Property)
+            {
+                var validationFilter = context.PropertyAttributes.OfType<IPropertyValidationFilter>().FirstOrDefault();
+                if (validationFilter == null)
+                {
+                    // No IPropertyValidationFilter attributes on the property.
+                    // Check if container has such an attribute.
+                    validationFilter = context.Key.ContainerType.GetTypeInfo()
+                        .GetCustomAttributes(inherit: true)
+                        .OfType<IPropertyValidationFilter>()
+                        .FirstOrDefault();
+                }
+
+                context.ValidationMetadata.PropertyValidationFilter = validationFilter;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DisableRequestSizeLimitFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DisableRequestSizeLimitFilter.cs
new file mode 100644
index 0000000000..51595bbaa6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/DisableRequestSizeLimitFilter.cs
@@ -0,0 +1,65 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// A filter that sets <see cref="IHttpMaxRequestBodySizeFeature.MaxRequestBodySize"/>
+    /// to <c>null</c>.
+    /// </summary>
+    public class DisableRequestSizeLimitFilter : IAuthorizationFilter, IRequestSizePolicy
+    {
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="DisableRequestSizeLimitFilter"/>.
+        /// </summary>
+        public DisableRequestSizeLimitFilter(ILoggerFactory loggerFactory)
+        {
+            _logger = loggerFactory.CreateLogger<DisableRequestSizeLimitFilter>();
+        }
+
+        /// <summary>
+        /// Sets the <see cref="IHttpMaxRequestBodySizeFeature.MaxRequestBodySize"/>
+        /// to <c>null</c>.
+        /// </summary>
+        /// <param name="context">The <see cref="AuthorizationFilterContext"/>.</param>
+        /// <remarks>If <see cref="IHttpMaxRequestBodySizeFeature"/> is not enabled or is read-only, 
+        /// the <see cref="DisableRequestSizeLimitAttribute"/> is not applied.</remarks> 
+        public void OnAuthorization(AuthorizationFilterContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var effectivePolicy = context.FindEffectivePolicy<IRequestSizePolicy>();
+            if (effectivePolicy != null && effectivePolicy != this)
+            {
+                _logger.NotMostEffectiveFilter(GetType(), effectivePolicy.GetType(), typeof(IRequestSizePolicy));
+                return;
+            }
+
+            var maxRequestBodySizeFeature = context.HttpContext.Features.Get<IHttpMaxRequestBodySizeFeature>();
+
+            if (maxRequestBodySizeFeature == null)
+            {
+                _logger.FeatureNotFound();
+            }
+            else if (maxRequestBodySizeFeature.IsReadOnly)
+            {
+                _logger.FeatureIsReadOnly();
+            }
+            else
+            {
+                maxRequestBodySizeFeature.MaxRequestBodySize = null;
+                _logger.RequestBodySizeLimitDisabled();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ElementalValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ElementalValueProvider.cs
new file mode 100644
index 0000000000..83bfeed66a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ElementalValueProvider.cs
@@ -0,0 +1,42 @@
+// 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.
+
+using System;
+using System.Globalization;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ElementalValueProvider : IValueProvider
+    {
+        public ElementalValueProvider(string key, string value, CultureInfo culture)
+        {
+            Key = key;
+            Value = value;
+            Culture = culture;
+        }
+
+        public CultureInfo Culture { get; }
+
+        public string Key { get; }
+
+        public string Value { get; }
+
+        public bool ContainsPrefix(string prefix)
+        {
+            return ModelStateDictionary.StartsWithPrefix(prefix, Key);
+        }
+
+        public ValueProviderResult GetValue(string key)
+        {
+            if (string.Equals(key, Key, StringComparison.OrdinalIgnoreCase))
+            {
+                return new ValueProviderResult(Value, Culture);
+            }
+            else
+            {
+                return ValueProviderResult.None;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ExplicitIndexCollectionValidationStrategy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ExplicitIndexCollectionValidationStrategy.cs
new file mode 100644
index 0000000000..eb955d6964
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ExplicitIndexCollectionValidationStrategy.cs
@@ -0,0 +1,119 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// An implementation of <see cref="IValidationStrategy"/> for a collection bound using 'explicit indexing'
+    /// style keys.
+    /// </summary>
+    /// <remarks>
+    /// This implementation handles cases like:
+    /// <example>
+    ///     Model: IList&lt;Student&gt; 
+    ///     Query String: ?students.index=Joey,Katherine&amp;students[Joey].Age=8&amp;students[Katherine].Age=9
+    /// 
+    ///     In this case, 'Joey' and 'Katherine' need to be used in the model prefix keys, but cannot be inferred
+    ///     form inspecting the collection. These prefixes are captured during model binding, and mapped to 
+    ///     the corresponding ordinal index of a model object in the collection. The enumerator returned from this
+    ///     class will yield two 'Student' objects with corresponding keys 'students[Joey]' and 'students[Katherine]'.
+    /// </example>
+    /// 
+    /// Using this key format, the enumerator enumerates model objects of type matching
+    /// <see cref="ModelMetadata.ElementMetadata"/>. The keys captured during model binding are mapped to the elements
+    /// in the collection to compute the model prefix keys.
+    /// </remarks>
+    public class ExplicitIndexCollectionValidationStrategy : IValidationStrategy
+    {
+        /// <summary>
+        /// Creates a new <see cref="ExplicitIndexCollectionValidationStrategy"/>.
+        /// </summary>
+        /// <param name="elementKeys">The keys of collection elements that were used during model binding.</param>
+        public ExplicitIndexCollectionValidationStrategy(IEnumerable<string> elementKeys)
+        {
+            if (elementKeys == null)
+            {
+                throw new ArgumentNullException(nameof(elementKeys));
+            }
+
+            ElementKeys = elementKeys;
+        }
+
+        /// <summary>
+        /// Gets the keys of collection elements that were used during model binding.
+        /// </summary>
+        public IEnumerable<string> ElementKeys { get; }
+
+        /// <inheritdoc />
+        public IEnumerator<ValidationEntry> GetChildren(
+            ModelMetadata metadata,
+            string key,
+            object model)
+        {
+            var enumerator = DefaultCollectionValidationStrategy.Instance.GetEnumeratorForElementType(metadata, model);
+            return new Enumerator(metadata.ElementMetadata, key, ElementKeys, enumerator);
+        }
+
+        private class Enumerator : IEnumerator<ValidationEntry>
+        {
+            private readonly string _key;
+            private readonly ModelMetadata _metadata;
+            private readonly IEnumerator _enumerator;
+            private readonly IEnumerator<string> _keyEnumerator;
+
+            private ValidationEntry _entry;
+
+            public Enumerator(
+                ModelMetadata metadata,
+                string key,
+                IEnumerable<string> elementKeys,
+                IEnumerator enumerator)
+            {
+                _metadata = metadata;
+                _key = key;
+
+                _keyEnumerator = elementKeys.GetEnumerator();
+                _enumerator = enumerator;
+            }
+
+            public ValidationEntry Current => _entry;
+
+            object IEnumerator.Current => Current;
+
+            public bool MoveNext()
+            {
+                if (!_keyEnumerator.MoveNext())
+                {
+                    return false;
+                }
+
+                if (!_enumerator.MoveNext())
+                {
+                    return false;
+                }
+
+                var model = _enumerator.Current;
+                var key = ModelNames.CreateIndexModelName(_key, _keyEnumerator.Current);
+
+                _entry = new ValidationEntry(_metadata, key, model);
+
+                return true;
+            }
+
+            public void Dispose()
+            {
+            }
+
+            public void Reset()
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterCursor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterCursor.cs
new file mode 100644
index 0000000000..b297712bd0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterCursor.cs
@@ -0,0 +1,64 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// A one-way cursor for filters.
+    /// </summary>
+    /// <remarks>
+    /// This will iterate the filter collection once per-stage, and skip any filters that don't have
+    /// the one of interfaces that applies to the current stage.
+    ///
+    /// Filters are always executed in the following order, but short circuiting plays a role.
+    ///
+    /// Indentation reflects nesting.
+    ///
+    /// 1. Exception Filters
+    ///     2. Authorization Filters
+    ///     3. Action Filters
+    ///        Action
+    ///
+    /// 4. Result Filters
+    ///    Result
+    ///
+    /// </remarks>
+    public struct FilterCursor
+    {
+        private readonly IFilterMetadata[] _filters;
+        private int _index;
+
+        public FilterCursor(IFilterMetadata[] filters)
+        {
+            _filters = filters;
+            _index = 0;
+        }
+
+        public void Reset()
+        {
+            _index = 0;
+        }
+
+        public FilterCursorItem<TFilter, TFilterAsync> GetNextFilter<TFilter, TFilterAsync>()
+            where TFilter : class
+            where TFilterAsync : class
+        {
+            while (_index < _filters.Length)
+            {
+                var filter = _filters[_index] as TFilter;
+                var filterAsync = _filters[_index] as TFilterAsync;
+
+                _index += 1;
+
+                if (filter != null || filterAsync != null)
+                {
+                    return new FilterCursorItem<TFilter, TFilterAsync>(filter, filterAsync);
+                }
+            }
+
+            return default(FilterCursorItem<TFilter, TFilterAsync>);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterCursorItem.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterCursorItem.cs
new file mode 100644
index 0000000000..ccb42dc3f7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterCursorItem.cs
@@ -0,0 +1,18 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public struct FilterCursorItem<TFilter, TFilterAsync>
+    {
+        public FilterCursorItem(TFilter filter, TFilterAsync filterAsync)
+        {
+            Filter = filter;
+            FilterAsync = filterAsync;
+        }
+
+        public TFilter Filter { get; }
+
+        public TFilterAsync FilterAsync { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterDescriptorOrderComparer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterDescriptorOrderComparer.cs
new file mode 100644
index 0000000000..daadc073d4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterDescriptorOrderComparer.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class FilterDescriptorOrderComparer : IComparer<FilterDescriptor>
+    {
+        public static FilterDescriptorOrderComparer Comparer { get; } = new FilterDescriptorOrderComparer();
+
+        public int Compare(FilterDescriptor x, FilterDescriptor y)
+        {
+            if (x == null)
+            {
+                throw new ArgumentNullException(nameof(x));
+            }
+
+            if (y == null)
+            {
+                throw new ArgumentNullException(nameof(y));
+            }
+
+            if (x.Order == y.Order)
+            {
+                return x.Scope.CompareTo(y.Scope);
+            }
+            else
+            {
+                return x.Order.CompareTo(y.Order);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterFactory.cs
new file mode 100644
index 0000000000..4f53acfef5
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterFactory.cs
@@ -0,0 +1,147 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public static class FilterFactory
+    {
+        public static FilterFactoryResult GetAllFilters(
+            IFilterProvider[] filterProviders,
+            ActionContext actionContext)
+        {
+            if (filterProviders == null)
+            {
+                throw new ArgumentNullException(nameof(filterProviders));
+            }
+
+            if (actionContext == null)
+            {
+                throw new ArgumentNullException(nameof(actionContext));
+            }
+
+            var actionDescriptor = actionContext.ActionDescriptor;
+
+            var staticFilterItems = new FilterItem[actionDescriptor.FilterDescriptors.Count];
+
+            var orderedFilters = actionDescriptor.FilterDescriptors
+                .OrderBy(
+                    filter => filter,
+                    FilterDescriptorOrderComparer.Comparer)
+                .ToList();
+
+            for (var i = 0; i < orderedFilters.Count; i++)
+            {
+                staticFilterItems[i] = new FilterItem(orderedFilters[i]);
+            }
+
+            var allFilterItems = new List<FilterItem>(staticFilterItems);
+
+            // Execute the filter factory to determine which static filters can be cached.
+            var filters = CreateUncachedFiltersCore(filterProviders, actionContext, allFilterItems);
+
+            // Cache the filter items based on the following criteria
+            // 1. Are created statically (ex: via filter attributes, added to global filter list etc.)
+            // 2. Are re-usable
+            for (var i = 0; i < staticFilterItems.Length; i++)
+            {
+                var item = staticFilterItems[i];
+                if (!item.IsReusable)
+                {
+                    item.Filter = null;
+                }
+            }
+
+            return new FilterFactoryResult(staticFilterItems, filters);
+        }
+
+        public static IFilterMetadata[] CreateUncachedFilters(
+            IFilterProvider[] filterProviders,
+            ActionContext actionContext,
+            FilterItem[] cachedFilterItems)
+        {
+            if (filterProviders == null)
+            {
+                throw new ArgumentNullException(nameof(filterProviders));
+            }
+
+            if (actionContext == null)
+            {
+                throw new ArgumentNullException(nameof(actionContext));
+            }
+
+            if (cachedFilterItems == null)
+            {
+                throw new ArgumentNullException(nameof(cachedFilterItems));
+            }
+
+            // Deep copy the cached filter items as filter providers could modify them
+            var filterItems = new List<FilterItem>(cachedFilterItems.Length);
+            for (var i = 0; i < cachedFilterItems.Length; i++)
+            {
+                var filterItem = cachedFilterItems[i];
+                filterItems.Add(
+                    new FilterItem(filterItem.Descriptor)
+                    {
+                        Filter = filterItem.Filter,
+                        IsReusable = filterItem.IsReusable
+                    });
+            }
+
+            return CreateUncachedFiltersCore(filterProviders, actionContext, filterItems);
+        }
+
+        private static IFilterMetadata[] CreateUncachedFiltersCore(
+            IFilterProvider[] filterProviders,
+            ActionContext actionContext,
+            List<FilterItem> filterItems)
+        {
+            // Execute providers
+            var context = new FilterProviderContext(actionContext, filterItems);
+
+            for (var i = 0; i < filterProviders.Length; i++)
+            {
+                filterProviders[i].OnProvidersExecuting(context);
+            }
+
+            for (var i = filterProviders.Length - 1; i >= 0; i--)
+            {
+                filterProviders[i].OnProvidersExecuted(context);
+            }
+
+            // Extract filter instances from statically defined filters and filter providers
+            var count = 0;
+            for (var i = 0; i < filterItems.Count; i++)
+            {
+                if (filterItems[i].Filter != null)
+                {
+                    count++;
+                }
+            }
+
+            if (count == 0)
+            {
+                return Array.Empty<IFilterMetadata>();
+            }
+            else
+            {
+                var filters = new IFilterMetadata[count];
+                var filterIndex = 0;
+                for (int i = 0; i < filterItems.Count; i++)
+                {
+                    var filter = filterItems[i].Filter;
+                    if (filter != null)
+                    {
+                        filters[filterIndex++] = filter;
+                    }
+                }
+
+                return filters;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterFactoryResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterFactoryResult.cs
new file mode 100644
index 0000000000..e532a08427
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterFactoryResult.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public struct FilterFactoryResult
+    {
+        public FilterFactoryResult(
+            FilterItem[] cacheableFilters,
+            IFilterMetadata[] filters)
+        {
+            CacheableFilters = cacheableFilters;
+            Filters = filters;
+        }
+
+        public FilterItem[] CacheableFilters { get; }
+
+        public IFilterMetadata[] Filters { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/HttpMethodActionConstraint.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/HttpMethodActionConstraint.cs
new file mode 100644
index 0000000000..e310493486
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/HttpMethodActionConstraint.cs
@@ -0,0 +1,72 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class HttpMethodActionConstraint : IActionConstraint
+    {
+        public static readonly int HttpMethodConstraintOrder = 100;
+
+        private readonly IReadOnlyList<string> _httpMethods;
+
+        // Empty collection means any method will be accepted.
+        public HttpMethodActionConstraint(IEnumerable<string> httpMethods)
+        {
+            if (httpMethods == null)
+            {
+                throw new ArgumentNullException(nameof(httpMethods));
+            }
+
+            var methods = new List<string>();
+
+            foreach (var method in httpMethods)
+            {
+                if (string.IsNullOrEmpty(method))
+                {
+                    throw new ArgumentException("httpMethod cannot be null or empty");
+                }
+
+                methods.Add(method);
+            }
+
+            _httpMethods = new ReadOnlyCollection<string>(methods);
+        }
+
+        public IEnumerable<string> HttpMethods => _httpMethods;
+
+        public int Order => HttpMethodConstraintOrder;
+
+        public virtual bool Accept(ActionConstraintContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (_httpMethods.Count == 0)
+            {
+                return true;
+            }
+
+            var request = context.RouteContext.HttpContext.Request;
+            var method = request.Method;
+
+            for (var i = 0; i < _httpMethods.Count; i++)
+            {
+                var supportedMethod = _httpMethods[i];
+                if (string.Equals(supportedMethod, method, StringComparison.OrdinalIgnoreCase))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/HttpParseResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/HttpParseResult.cs
new file mode 100644
index 0000000000..84e76f08d4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/HttpParseResult.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Internal
+{
+    public enum HttpParseResult
+    {
+        Parsed,
+        NotParsed,
+        InvalidFormat,
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/HttpTokenParsingRules.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/HttpTokenParsingRules.cs
new file mode 100644
index 0000000000..a93f26d916
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/HttpTokenParsingRules.cs
@@ -0,0 +1,274 @@
+// 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.
+
+using System.Diagnostics.Contracts;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Internal
+{
+    public static class HttpTokenParsingRules
+    {
+        private static readonly bool[] TokenChars;
+        private const int MaxNestedCount = 5;
+
+        internal const char CR = '\r';
+        internal const char LF = '\n';
+        internal const char SP = ' ';
+        internal const char Tab = '\t';
+        internal const int MaxInt64Digits = 19;
+        internal const int MaxInt32Digits = 10;
+
+        // iso-8859-1, Western European (ISO)
+        internal static readonly Encoding DefaultHttpEncoding = Encoding.GetEncoding(28591);
+
+        static HttpTokenParsingRules()
+        {
+            // token = 1*<any CHAR except CTLs or separators>
+            // CTL = <any US-ASCII control character (octets 0 - 31) and DEL (127)>
+
+            TokenChars = new bool[128]; // everything is false
+
+            for (int i = 33; i < 127; i++) // skip Space (32) & DEL (127)
+            {
+                TokenChars[i] = true;
+            }
+
+            // remove separators: these are not valid token characters
+            TokenChars[(byte)'('] = false;
+            TokenChars[(byte)')'] = false;
+            TokenChars[(byte)'<'] = false;
+            TokenChars[(byte)'>'] = false;
+            TokenChars[(byte)'@'] = false;
+            TokenChars[(byte)','] = false;
+            TokenChars[(byte)';'] = false;
+            TokenChars[(byte)':'] = false;
+            TokenChars[(byte)'\\'] = false;
+            TokenChars[(byte)'"'] = false;
+            TokenChars[(byte)'/'] = false;
+            TokenChars[(byte)'['] = false;
+            TokenChars[(byte)']'] = false;
+            TokenChars[(byte)'?'] = false;
+            TokenChars[(byte)'='] = false;
+            TokenChars[(byte)'{'] = false;
+            TokenChars[(byte)'}'] = false;
+        }
+
+        internal static bool IsTokenChar(char character)
+        {
+            // Must be between 'space' (32) and 'DEL' (127)
+            if (character > 127)
+            {
+                return false;
+            }
+
+            return TokenChars[character];
+        }
+
+        internal static int GetTokenLength(string input, int startIndex)
+        {
+            Contract.Requires(input != null);
+            Contract.Ensures((Contract.Result<int>() >= 0) && (Contract.Result<int>() <= (input.Length - startIndex)));
+
+            if (startIndex >= input.Length)
+            {
+                return 0;
+            }
+
+            var current = startIndex;
+
+            while (current < input.Length)
+            {
+                if (!IsTokenChar(input[current]))
+                {
+                    return current - startIndex;
+                }
+                current++;
+            }
+            return input.Length - startIndex;
+        }
+
+        internal static int GetWhitespaceLength(string input, int startIndex)
+        {
+            Contract.Requires(input != null);
+            Contract.Ensures((Contract.Result<int>() >= 0) && (Contract.Result<int>() <= (input.Length - startIndex)));
+
+            if (startIndex >= input.Length)
+            {
+                return 0;
+            }
+
+            var current = startIndex;
+
+            while (current < input.Length)
+            {
+                var c = input[current];
+
+                if ((c == SP) || (c == Tab))
+                {
+                    current++;
+                    continue;
+                }
+
+                if (c == CR)
+                {
+                    // If we have a #13 char, it must be followed by #10 and then at least one SP or HT.
+                    if ((current + 2 < input.Length) && (input[current + 1] == LF))
+                    {
+                        char spaceOrTab = input[current + 2];
+                        if ((spaceOrTab == SP) || (spaceOrTab == Tab))
+                        {
+                            current += 3;
+                            continue;
+                        }
+                    }
+                }
+
+                return current - startIndex;
+            }
+
+            // All characters between startIndex and the end of the string are LWS characters.
+            return input.Length - startIndex;
+        }
+
+        internal static HttpParseResult GetQuotedStringLength(string input, int startIndex, out int length)
+        {
+            var nestedCount = 0;
+            return GetExpressionLength(input, startIndex, '"', '"', false, ref nestedCount, out length);
+        }
+
+        // quoted-pair = "\" CHAR
+        // CHAR = <any US-ASCII character (octets 0 - 127)>
+        internal static HttpParseResult GetQuotedPairLength(string input, int startIndex, out int length)
+        {
+            Contract.Requires(input != null);
+            Contract.Requires((startIndex >= 0) && (startIndex < input.Length));
+            Contract.Ensures((Contract.ValueAtReturn(out length) >= 0) &&
+                (Contract.ValueAtReturn(out length) <= (input.Length - startIndex)));
+
+            length = 0;
+
+            if (input[startIndex] != '\\')
+            {
+                return HttpParseResult.NotParsed;
+            }
+
+            // Quoted-char has 2 characters. Check whether there are 2 chars left ('\' + char)
+            // If so, check whether the character is in the range 0-127. If not, it's an invalid value.
+            if ((startIndex + 2 > input.Length) || (input[startIndex + 1] > 127))
+            {
+                return HttpParseResult.InvalidFormat;
+            }
+
+            // We don't care what the char next to '\' is.
+            length = 2;
+            return HttpParseResult.Parsed;
+        }
+
+        // TEXT = <any OCTET except CTLs, but including LWS>
+        // LWS = [CRLF] 1*( SP | HT )
+        // CTL = <any US-ASCII control character (octets 0 - 31) and DEL (127)>
+        //
+        // Since we don't really care about the content of a quoted string or comment, we're more tolerant and
+        // allow these characters. We only want to find the delimiters ('"' for quoted string and '(', ')' for comment).
+        //
+        // 'nestedCount': Comments can be nested. We allow a depth of up to 5 nested comments, i.e. something like
+        // "(((((comment)))))". If we wouldn't define a limit an attacker could send a comment with hundreds of nested
+        // comments, resulting in a stack overflow exception. In addition having more than 1 nested comment (if any)
+        // is unusual.
+        private static HttpParseResult GetExpressionLength(
+            string input,
+            int startIndex,
+            char openChar,
+            char closeChar,
+            bool supportsNesting,
+            ref int nestedCount,
+            out int length)
+        {
+            Contract.Requires(input != null);
+            Contract.Requires((startIndex >= 0) && (startIndex < input.Length));
+            Contract.Ensures((Contract.Result<HttpParseResult>() != HttpParseResult.Parsed) ||
+                (Contract.ValueAtReturn<int>(out length) > 0));
+
+            length = 0;
+
+            if (input[startIndex] != openChar)
+            {
+                return HttpParseResult.NotParsed;
+            }
+
+            var current = startIndex + 1; // Start parsing with the character next to the first open-char
+            while (current < input.Length)
+            {
+                // Only check whether we have a quoted char, if we have at least 3 characters left to read (i.e.
+                // quoted char + closing char). Otherwise the closing char may be considered part of the quoted char.
+                if ((current + 2 < input.Length) &&
+                    (GetQuotedPairLength(input, current, out var quotedPairLength) == HttpParseResult.Parsed))
+                {
+                    // We ignore invalid quoted-pairs. Invalid quoted-pairs may mean that it looked like a quoted pair,
+                    // but we actually have a quoted-string: e.g. "\ü" ('\' followed by a char >127 - quoted-pair only
+                    // allows ASCII chars after '\'; qdtext allows both '\' and >127 chars).
+                    current = current + quotedPairLength;
+                    continue;
+                }
+
+                // If we support nested expressions and we find an open-char, then parse the nested expressions.
+                if (supportsNesting && (input[current] == openChar))
+                {
+                    nestedCount++;
+                    try
+                    {
+                        // Check if we exceeded the number of nested calls.
+                        if (nestedCount > MaxNestedCount)
+                        {
+                            return HttpParseResult.InvalidFormat;
+                        }
+
+                        var nestedResult = GetExpressionLength(
+                            input,
+                            current,
+                            openChar,
+                            closeChar,
+                            supportsNesting,
+                            ref nestedCount,
+                            out var nestedLength);
+
+                        switch (nestedResult)
+                        {
+                            case HttpParseResult.Parsed:
+                                current += nestedLength; // add the length of the nested expression and continue.
+                                break;
+
+                            case HttpParseResult.NotParsed:
+                                Contract.Assert(false, "'NotParsed' is unexpected: We started nested expression " +
+                                    "parsing, because we found the open-char. So either it's a valid nested " +
+                                    "expression or it has invalid format.");
+                                break;
+
+                            case HttpParseResult.InvalidFormat:
+                                // If the nested expression is invalid, we can't continue, so we fail with invalid format.
+                                return HttpParseResult.InvalidFormat;
+
+                            default:
+                                Contract.Assert(false, "Unknown enum result: " + nestedResult);
+                                break;
+                        }
+                    }
+                    finally
+                    {
+                        nestedCount--;
+                    }
+                }
+
+                if (input[current] == closeChar)
+                {
+                    length = current - startIndex + 1;
+                    return HttpParseResult.Parsed;
+                }
+                current++;
+            }
+
+            // We didn't see the final quote, therefore we have an invalid expression string.
+            return HttpParseResult.InvalidFormat;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IApiBehaviorMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IApiBehaviorMetadata.cs
new file mode 100644
index 0000000000..b73c1ba56e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IApiBehaviorMetadata.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// An <see cref="IFilterMetadata"/> interface for <see cref="ApiControllerAttribute"/>. See 
+    /// <see cref="ApiControllerAttribute"/> for details.
+    /// </summary>
+    public interface IApiBehaviorMetadata : IFilterMetadata
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IConsumesActionConstraint.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IConsumesActionConstraint.cs
new file mode 100644
index 0000000000..b004cbdcf3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IConsumesActionConstraint.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// An <see cref="IActionConstraint"/> constraint that identifies a type which can be used to select an action
+    /// based on incoming request.
+    /// </summary>
+    public interface IConsumesActionConstraint : IActionConstraint
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IControllerPropertyActivatorFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IControllerPropertyActivatorFactory.cs
new file mode 100644
index 0000000000..441dee9898
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IControllerPropertyActivatorFactory.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Controllers;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public interface IControllerPropertyActivator
+    {
+        void Activate(ControllerContext context, object controller);
+
+        Action<ControllerContext, object> GetActivatorDelegate(ControllerActionDescriptor actionDescriptor);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IFormatFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IFormatFilter.cs
new file mode 100644
index 0000000000..911ca2d247
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IFormatFilter.cs
@@ -0,0 +1,20 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Internal
+{
+    /// <summary>
+    /// A filter that produces the desired content type for the request.
+    /// </summary>
+    public interface IFormatFilter : IFilterMetadata
+    {
+        /// <summary>
+        /// Gets the format value for the request associated with the provided <see cref="ActionContext"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ActionContext"/> associated with the current request.</param>
+        /// <returns>A format value, or <c>null</c> if a format cannot be determined for the request.</returns>
+        string GetFormat(ActionContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IMiddlewareFilterFeature.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IMiddlewareFilterFeature.cs
new file mode 100644
index 0000000000..43af488b8a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IMiddlewareFilterFeature.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// A feature in <see cref="Microsoft.AspNetCore.Http.HttpContext.Features"/> which is used to capture the
+    /// currently executing context of a resource filter. This feature is used in the final middleware
+    /// of a middleware filter's pipeline to keep the request flow through the rest of the MVC layers.
+    /// </summary>
+    public interface IMiddlewareFilterFeature
+    {
+        ResourceExecutingContext ResourceExecutingContext { get; }
+
+        ResourceExecutionDelegate ResourceExecutionDelegate { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IParameterInfoParameterDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IParameterInfoParameterDescriptor.cs
new file mode 100644
index 0000000000..6f260b5750
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IParameterInfoParameterDescriptor.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// A <see cref="ParameterDescriptor"/> for action parameters.
+    /// </summary>
+    public interface IParameterInfoParameterDescriptor
+    {
+        /// <summary>
+        /// Gets the <see cref="System.Reflection.ParameterInfo"/>.
+        /// </summary>
+        ParameterInfo ParameterInfo { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IPropertyInfoParameterDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IPropertyInfoParameterDescriptor.cs
new file mode 100644
index 0000000000..ccbe5de73c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IPropertyInfoParameterDescriptor.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// A <see cref="ParameterDescriptor"/> for bound properties.
+    /// </summary>
+    public interface IPropertyInfoParameterDescriptor
+    {
+        /// <summary>
+        /// Gets the <see cref="System.Reflection.PropertyInfo"/>.
+        /// </summary>
+        PropertyInfo PropertyInfo { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IResponseCacheFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IResponseCacheFilter.cs
new file mode 100644
index 0000000000..5b53c254dd
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/IResponseCacheFilter.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// A filter which sets the appropriate headers related to Response caching.
+    /// </summary>
+    public interface IResponseCacheFilter : IFilterMetadata
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ITypeActivatorCache.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ITypeActivatorCache.cs
new file mode 100644
index 0000000000..a097b29910
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ITypeActivatorCache.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// Caches <see cref="Microsoft.Extensions.DependencyInjection.ObjectFactory"/> instances produced by 
+    /// <see cref="Microsoft.Extensions.DependencyInjection.ActivatorUtilities.CreateFactory(Type, Type[])"/>.
+    /// </summary>
+    public interface ITypeActivatorCache
+    {
+        /// <summary>
+        /// Creates an instance of <typeparamref name="TInstance"/>.
+        /// </summary>
+        /// <param name="serviceProvider">The <see cref="IServiceProvider"/> used to resolve dependencies for
+        /// <paramref name="optionType"/>.</param>
+        /// <param name="optionType">The <see cref="Type"/> of the <typeparamref name="TInstance"/> to create.</param>
+        TInstance CreateInstance<TInstance>(IServiceProvider serviceProvider, Type optionType);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MediaTypeSegmentWithQuality.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MediaTypeSegmentWithQuality.cs
new file mode 100644
index 0000000000..c9a8f4502e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MediaTypeSegmentWithQuality.cs
@@ -0,0 +1,41 @@
+// 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.
+
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Internal
+{
+    /// <summary>
+    /// A media type with its associated quality.
+    /// </summary>
+    public struct MediaTypeSegmentWithQuality
+    {
+        /// <summary>
+        /// Initializes an instance of <see cref="MediaTypeSegmentWithQuality"/>.
+        /// </summary>
+        /// <param name="mediaType">The <see cref="StringSegment"/> containing the media type.</param>
+        /// <param name="quality">The quality parameter of the media type or 1 in the case it does not exist.</param>
+        public MediaTypeSegmentWithQuality(StringSegment mediaType, double quality)
+        {
+            MediaType = mediaType;
+            Quality = quality;
+        }
+
+        /// <summary>
+        /// Gets the media type of this <see cref="MediaTypeSegmentWithQuality"/>.
+        /// </summary>
+        public StringSegment MediaType { get; }
+
+        /// <summary>
+        /// Gets the quality of this <see cref="MediaTypeSegmentWithQuality"/>.
+        /// </summary>
+        public double Quality { get; }
+
+        /// <inheritdoc />
+        public override string ToString()
+        {
+            // For logging purposes
+            return MediaType.ToString();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MemoryPoolHttpRequestStreamReaderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MemoryPoolHttpRequestStreamReaderFactory.cs
new file mode 100644
index 0000000000..88f6f8428c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MemoryPoolHttpRequestStreamReaderFactory.cs
@@ -0,0 +1,69 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.IO;
+using System.Text;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.WebUtilities;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// An <see cref="IHttpRequestStreamReaderFactory"/> that uses pooled buffers.
+    /// </summary>
+    public class MemoryPoolHttpRequestStreamReaderFactory : IHttpRequestStreamReaderFactory
+    {
+        /// <summary>
+        /// The default size of created char buffers.
+        /// </summary>
+        public static readonly int DefaultBufferSize = 1024; // 1KB - results in a 4KB byte array for UTF8.
+
+        private readonly ArrayPool<byte> _bytePool;
+        private readonly ArrayPool<char> _charPool;
+
+        /// <summary>
+        /// Creates a new <see cref="MemoryPoolHttpRequestStreamReaderFactory"/>.
+        /// </summary>
+        /// <param name="bytePool">
+        /// The <see cref="ArrayPool{Byte}"/> for creating <see cref="T:byte[]"/> buffers.
+        /// </param>
+        /// <param name="charPool">
+        /// The <see cref="ArrayPool{Char}"/> for creating <see cref="T:char[]"/> buffers.
+        /// </param>
+        public MemoryPoolHttpRequestStreamReaderFactory(
+            ArrayPool<byte> bytePool,
+            ArrayPool<char> charPool)
+        {
+            if (bytePool == null)
+            {
+                throw new ArgumentNullException(nameof(bytePool));
+            }
+
+            if (charPool == null)
+            {
+                throw new ArgumentNullException(nameof(charPool));
+            }
+
+            _bytePool = bytePool;
+            _charPool = charPool;
+        }
+
+        /// <inheritdoc />
+        public TextReader CreateReader(Stream stream, Encoding encoding)
+        {
+            if (stream == null)
+            {
+                throw new ArgumentNullException(nameof(stream));
+            }
+
+            if (encoding == null)
+            {
+                throw new ArgumentNullException(nameof(encoding));
+            }
+
+            return new HttpRequestStreamReader(stream, encoding, DefaultBufferSize, _bytePool, _charPool);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MemoryPoolHttpResponseStreamWriterFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MemoryPoolHttpResponseStreamWriterFactory.cs
new file mode 100644
index 0000000000..91dd31e0c7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MemoryPoolHttpResponseStreamWriterFactory.cs
@@ -0,0 +1,77 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.IO;
+using System.Text;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.WebUtilities;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// An <see cref="IHttpResponseStreamWriterFactory"/> that uses pooled buffers.
+    /// </summary>
+    public class MemoryPoolHttpResponseStreamWriterFactory : IHttpResponseStreamWriterFactory
+    {
+        /// <summary>
+        /// The default size of buffers <see cref="HttpResponseStreamWriter"/>s will allocate.
+        /// </summary>
+        /// <value>
+        /// 16K causes each <see cref="HttpResponseStreamWriter"/> to allocate one 16K
+        /// <see langword="char"/> array and one 32K (for UTF8) <see langword="byte"/> array.
+        /// </value>
+        /// <remarks>
+        /// <see cref="MemoryPoolHttpResponseStreamWriterFactory"/> maintains <see cref="ArrayPool{T}"/>s
+        /// for these arrays.
+        /// </remarks>
+        public static readonly int DefaultBufferSize = 16 * 1024;
+
+        private readonly ArrayPool<byte> _bytePool;
+        private readonly ArrayPool<char> _charPool;
+
+        /// <summary>
+        /// Creates a new <see cref="MemoryPoolHttpResponseStreamWriterFactory"/>.
+        /// </summary>
+        /// <param name="bytePool">
+        /// The <see cref="ArrayPool{Byte}"/> for creating <see cref="byte"/> buffers.
+        /// </param>
+        /// <param name="charPool">
+        /// The <see cref="ArrayPool{Char}"/> for creating <see cref="char"/> buffers.
+        /// </param>
+        public MemoryPoolHttpResponseStreamWriterFactory(
+            ArrayPool<byte> bytePool,
+            ArrayPool<char> charPool)
+        {
+            if (bytePool == null)
+            {
+                throw new ArgumentNullException(nameof(bytePool));
+            }
+
+            if (charPool == null)
+            {
+                throw new ArgumentNullException(nameof(charPool));
+            }
+
+            _bytePool = bytePool;
+            _charPool = charPool;
+        }
+
+        /// <inheritdoc />
+        public TextWriter CreateWriter(Stream stream, Encoding encoding)
+        {
+            if (stream == null)
+            {
+                throw new ArgumentNullException(nameof(stream));
+            }
+
+            if (encoding == null)
+            {
+                throw new ArgumentNullException(nameof(encoding));
+            }
+
+            return new HttpResponseStreamWriter(stream, encoding, DefaultBufferSize, _bytePool, _charPool);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MiddlewareFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MiddlewareFilter.cs
new file mode 100644
index 0000000000..11ac93d5ab
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MiddlewareFilter.cs
@@ -0,0 +1,46 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// A filter which executes a user configured middleware pipeline.
+    /// </summary>
+    internal class MiddlewareFilter : IAsyncResourceFilter
+    {
+        private readonly RequestDelegate _middlewarePipeline;
+
+        public MiddlewareFilter(RequestDelegate middlewarePipeline)
+        {
+            if (middlewarePipeline == null)
+            {
+                throw new ArgumentNullException(nameof(middlewarePipeline));
+            }
+
+            _middlewarePipeline = middlewarePipeline;
+        }
+
+        public Task OnResourceExecutionAsync(ResourceExecutingContext context, ResourceExecutionDelegate next)
+        {
+            var httpContext = context.HttpContext;
+
+            // Capture the current context into the feature. This will later be used in the end middleware to continue
+            // the execution flow to later MVC layers.
+            // Example:
+            // this filter -> user-middleware1 -> user-middleware2 -> the-end-middleware -> resource filters or model binding
+            var feature = new MiddlewareFilterFeature()
+            {
+                ResourceExecutionDelegate = next,
+                ResourceExecutingContext = context
+            };
+            httpContext.Features.Set<IMiddlewareFilterFeature>(feature);
+
+            return _middlewarePipeline(httpContext);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MiddlewareFilterBuilder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MiddlewareFilterBuilder.cs
new file mode 100644
index 0000000000..cbceab72b0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MiddlewareFilterBuilder.cs
@@ -0,0 +1,95 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Core;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// Builds a middleware pipeline after receiving the pipeline from a pipeline provider
+    /// </summary>
+    public class MiddlewareFilterBuilder
+    {
+        // 'GetOrAdd' call on the dictionary is not thread safe and we might end up creating the pipeline more
+        // once. To prevent this Lazy<> is used. In the worst case multiple Lazy<> objects are created for multiple
+        // threads but only one of the objects succeeds in creating a pipeline.
+        private readonly ConcurrentDictionary<Type, Lazy<RequestDelegate>> _pipelinesCache
+            = new ConcurrentDictionary<Type, Lazy<RequestDelegate>>();
+        private readonly MiddlewareFilterConfigurationProvider _configurationProvider;
+
+        public IApplicationBuilder ApplicationBuilder { get; set; }
+
+        public MiddlewareFilterBuilder(MiddlewareFilterConfigurationProvider configurationProvider)
+        {
+            _configurationProvider = configurationProvider;
+        }
+
+        public RequestDelegate GetPipeline(Type configurationType)
+        {
+            // Build the pipeline only once. This is similar to how middlewares registered in Startup are constructed.
+
+            var requestDelegate = _pipelinesCache.GetOrAdd(
+                configurationType,
+                key => new Lazy<RequestDelegate>(() => BuildPipeline(key)));
+
+            return requestDelegate.Value;
+        }
+
+        private RequestDelegate BuildPipeline(Type middlewarePipelineProviderType)
+        {
+            if (ApplicationBuilder == null)
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatMiddlewareFilterBuilder_NullApplicationBuilder(nameof(ApplicationBuilder)));
+            }
+
+            var nestedAppBuilder = ApplicationBuilder.New();
+
+            // Get the 'Configure' method from the user provided type.
+            var configureDelegate = _configurationProvider.CreateConfigureDelegate(middlewarePipelineProviderType);
+            configureDelegate(nestedAppBuilder);
+
+            // The middleware resource filter, after receiving the request executes the user configured middleware
+            // pipeline. Since we want execution of the request to continue to later MVC layers (resource filters
+            // or model binding), add a middleware at the end of the user provided pipeline which make sure to continue
+            // this flow.
+            // Example:
+            // middleware filter -> user-middleware1 -> user-middleware2 -> end-middleware -> resource filters or model binding
+            nestedAppBuilder.Run(async (httpContext) =>
+            {
+                var feature = httpContext.Features.Get<IMiddlewareFilterFeature>();
+                if (feature == null)
+                {
+                    throw new InvalidOperationException(
+                        Resources.FormatMiddlewareFilterBuilder_NoMiddlewareFeature(nameof(IMiddlewareFilterFeature)));
+                }
+
+                var resourceExecutionDelegate = feature.ResourceExecutionDelegate;
+
+                var resourceExecutedContext = await resourceExecutionDelegate();
+                if (resourceExecutedContext.ExceptionHandled)
+                {
+                    return;
+                }
+
+                // Ideally we want the experience of a middleware pipeline to behave the same as if it was registered
+                // in Startup. In this scenario, an Exception thrown in a middelware later in the pipeline gets
+                // propagated back to earlier middleware. So, check if a later resource filter threw an Exception and
+                // propagate that back to the middleware pipeline.
+                resourceExecutedContext.ExceptionDispatchInfo?.Throw();
+                if (resourceExecutedContext.Exception != null)
+                {
+                    // This line is rarely reachable because ResourceInvoker captures thrown Exceptions using
+                    // ExceptionDispatchInfo. That said, filters could set only resourceExecutedContext.Exception.
+                    throw resourceExecutedContext.Exception;
+                }
+            });
+
+            return nestedAppBuilder.Build();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MiddlewareFilterConfigurationProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MiddlewareFilterConfigurationProvider.cs
new file mode 100644
index 0000000000..ca05f4d6df
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MiddlewareFilterConfigurationProvider.cs
@@ -0,0 +1,128 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// Calls into user provided 'Configure' methods for configuring a middleware pipeline. The semantics of finding
+    /// the 'Configure' methods is similar to the application Startup class.
+    /// </summary>
+    public class MiddlewareFilterConfigurationProvider
+    {
+        public Action<IApplicationBuilder> CreateConfigureDelegate(Type configurationType)
+        {
+            if (configurationType == null)
+            {
+                throw new ArgumentNullException(nameof(configurationType));
+            }
+
+            if (!HasParameterlessConstructor(configurationType.GetTypeInfo()))
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatMiddlewareFilterConfigurationProvider_CreateConfigureDelegate_CannotCreateType(configurationType, nameof(configurationType)));
+            }
+
+            var instance = Activator.CreateInstance(configurationType);
+            var configureDelegateBuilder = GetConfigureDelegateBuilder(configurationType);
+            return configureDelegateBuilder.Build(instance);
+        }
+
+        private static ConfigureBuilder GetConfigureDelegateBuilder(Type startupType)
+        {
+            var configureMethod = FindMethod(startupType, typeof(void));
+            return new ConfigureBuilder(configureMethod);
+        }
+
+        private static MethodInfo FindMethod(Type startupType, Type returnType = null)
+        {
+            var methodName = "Configure";
+
+            var methods = startupType.GetMethods(BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static);
+            var selectedMethods = methods.Where(method => method.Name.Equals(methodName)).ToList();
+            if (selectedMethods.Count > 1)
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatMiddewareFilter_ConfigureMethodOverload(methodName));
+            }
+
+            var methodInfo = selectedMethods.FirstOrDefault();
+            if (methodInfo == null)
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatMiddewareFilter_NoConfigureMethod(
+                        methodName,
+                        startupType.FullName));
+            }
+
+            if (returnType != null && methodInfo.ReturnType != returnType)
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatMiddlewareFilter_InvalidConfigureReturnType(
+                        methodInfo.Name,
+                        startupType.FullName,
+                        returnType.Name));
+            }
+            return methodInfo;
+        }
+
+        private static bool HasParameterlessConstructor(TypeInfo modelTypeInfo)
+        {
+            return !modelTypeInfo.IsAbstract && modelTypeInfo.GetConstructor(Type.EmptyTypes) != null;
+        }
+
+        private class ConfigureBuilder
+        {
+            public ConfigureBuilder(MethodInfo configure)
+            {
+                MethodInfo = configure;
+            }
+
+            public MethodInfo MethodInfo { get; }
+
+            public Action<IApplicationBuilder> Build(object instance)
+            {
+                return (applicationBuilder) => Invoke(instance, applicationBuilder);
+            }
+
+            private void Invoke(object instance, IApplicationBuilder builder)
+            {
+                var serviceProvider = builder.ApplicationServices;
+                var parameterInfos = MethodInfo.GetParameters();
+                var parameters = new object[parameterInfos.Length];
+                for (var index = 0; index < parameterInfos.Length; index++)
+                {
+                    var parameterInfo = parameterInfos[index];
+                    if (parameterInfo.ParameterType == typeof(IApplicationBuilder))
+                    {
+                        parameters[index] = builder;
+                    }
+                    else
+                    {
+                        try
+                        {
+                            parameters[index] = serviceProvider.GetRequiredService(parameterInfo.ParameterType);
+                        }
+                        catch (Exception ex)
+                        {
+                            throw new InvalidOperationException(
+                                Resources.FormatMiddlewareFilter_ServiceResolutionFail(
+                                    parameterInfo.ParameterType.FullName,
+                                    parameterInfo.Name,
+                                    MethodInfo.Name,
+                                    MethodInfo.DeclaringType.FullName),
+                                ex);
+                        }
+                    }
+                }
+                MethodInfo.Invoke(instance, parameters);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MiddlewareFilterFeature.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MiddlewareFilterFeature.cs
new file mode 100644
index 0000000000..d33378d6f7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MiddlewareFilterFeature.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class MiddlewareFilterFeature : IMiddlewareFilterFeature
+    {
+        public ResourceExecutingContext ResourceExecutingContext { get; set; }
+
+        public ResourceExecutionDelegate ResourceExecutionDelegate { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcAttributeRouteHandler.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcAttributeRouteHandler.cs
new file mode 100644
index 0000000000..93f7277522
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcAttributeRouteHandler.cs
@@ -0,0 +1,116 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class MvcAttributeRouteHandler : IRouter
+    {
+        private readonly IActionContextAccessor _actionContextAccessor;
+        private readonly IActionInvokerFactory _actionInvokerFactory;
+        private readonly IActionSelector _actionSelector;
+        private readonly ILogger _logger;
+        private DiagnosticSource _diagnosticSource;
+
+        public MvcAttributeRouteHandler(
+            IActionInvokerFactory actionInvokerFactory,
+            IActionSelector actionSelector,
+            DiagnosticSource diagnosticSource,
+            ILoggerFactory loggerFactory)
+            : this(actionInvokerFactory, actionSelector, diagnosticSource, loggerFactory, actionContextAccessor: null)
+        {
+        }
+
+        public MvcAttributeRouteHandler(
+            IActionInvokerFactory actionInvokerFactory,
+            IActionSelector actionSelector,
+            DiagnosticSource diagnosticSource,
+            ILoggerFactory loggerFactory,
+            IActionContextAccessor actionContextAccessor)
+        {
+            // The IActionContextAccessor is optional. We want to avoid the overhead of using CallContext
+            // if possible.
+            _actionContextAccessor = actionContextAccessor;
+
+            _actionInvokerFactory = actionInvokerFactory;
+            _actionSelector = actionSelector;
+            _diagnosticSource = diagnosticSource;
+            _logger = loggerFactory.CreateLogger<MvcAttributeRouteHandler>();
+        }
+
+        public ActionDescriptor[] Actions { get; set; }
+
+        public VirtualPathData GetVirtualPath(VirtualPathContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            // We return null here because we're not responsible for generating the url, the route is.
+            return null;
+        }
+
+        public Task RouteAsync(RouteContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (Actions == null)
+            {
+                var message = Resources.FormatPropertyOfTypeCannotBeNull(
+                    nameof(Actions), 
+                    nameof(MvcAttributeRouteHandler));
+                throw new InvalidOperationException(message);
+            }
+
+            var actionDescriptor = _actionSelector.SelectBestCandidate(context, Actions);
+            if (actionDescriptor == null)
+            {
+                _logger.NoActionsMatched(context.RouteData.Values);
+                return Task.CompletedTask;
+            }
+
+            foreach (var kvp in actionDescriptor.RouteValues)
+            {
+                if (!string.IsNullOrEmpty(kvp.Value))
+                {
+                    context.RouteData.Values[kvp.Key] = kvp.Value;
+                }
+            }
+
+            context.Handler = (c) =>
+            {
+                var routeData = c.GetRouteData();
+
+                var actionContext = new ActionContext(context.HttpContext, routeData, actionDescriptor);
+                if (_actionContextAccessor != null)
+                {
+                    _actionContextAccessor.ActionContext = actionContext;
+                }
+
+                var invoker = _actionInvokerFactory.CreateInvoker(actionContext);
+                if (invoker == null)
+                {
+                    throw new InvalidOperationException(
+                        Resources.FormatActionInvokerFactory_CouldNotCreateInvoker(
+                            actionDescriptor.DisplayName));
+                }
+
+                return invoker.InvokeAsync();
+            };
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcBuilder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcBuilder.cs
new file mode 100644
index 0000000000..d2a0db532e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcBuilder.cs
@@ -0,0 +1,42 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// Allows fine grained configuration of MVC services.
+    /// </summary>
+    public class MvcBuilder : IMvcBuilder
+    {
+        /// <summary>
+        /// Initializes a new <see cref="MvcBuilder"/> instance.
+        /// </summary>
+        /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
+        /// <param name="manager">The <see cref="ApplicationPartManager"/> of the application.</param>
+        public MvcBuilder(IServiceCollection services, ApplicationPartManager manager)
+        {
+            if (services == null)
+            {
+                throw new ArgumentNullException(nameof(services));
+            }
+
+            if (manager == null)
+            {
+                throw new ArgumentNullException(nameof(manager));
+            }
+
+            Services = services;
+            PartManager = manager;
+        }
+
+        /// <inheritdoc />
+        public IServiceCollection Services { get; }
+
+        /// <inheritdoc />
+        public ApplicationPartManager PartManager { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreBuilder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreBuilder.cs
new file mode 100644
index 0000000000..89a9897afd
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreBuilder.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// Allows fine grained configuration of essential MVC services.
+    /// </summary>
+    public class MvcCoreBuilder : IMvcCoreBuilder
+    {
+        /// <summary>
+        /// Initializes a new <see cref="MvcCoreBuilder"/> instance.
+        /// </summary>
+        /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
+        /// <param name="manager">The <see cref="ApplicationPartManager"/> of the application.</param>
+        public MvcCoreBuilder(
+            IServiceCollection services,
+            ApplicationPartManager manager)
+        {
+            if (services == null)
+            {
+                throw new ArgumentNullException(nameof(services));
+            }
+
+            if (manager == null)
+            {
+                throw new ArgumentNullException(nameof(manager));
+            }
+
+            Services = services;
+            PartManager = manager;
+        }
+
+        /// <inheritdoc />
+        public ApplicationPartManager PartManager { get; }
+
+        /// <inheritdoc />
+        public IServiceCollection Services { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreDiagnosticSourceExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreDiagnosticSourceExtensions.cs
new file mode 100644
index 0000000000..d5bee24ba7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreDiagnosticSourceExtensions.cs
@@ -0,0 +1,712 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    // We're doing a lot of asserts here because these methods are really tedious to test and
+    // highly dependent on the details of the invoker's state machine. Basically if we wrote the
+    // obvious unit tests that would generate a lot of boilerplate and wouldn't cover the hard parts.
+    public static class MvcCoreDiagnosticSourceExtensions
+    {
+        public static void BeforeAction(
+            this DiagnosticSource diagnosticSource,
+            ActionDescriptor actionDescriptor,
+            HttpContext httpContext,
+            RouteData routeData)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(actionDescriptor != null);
+            Debug.Assert(httpContext != null);
+            Debug.Assert(routeData != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeAction"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeAction",
+                    new { actionDescriptor, httpContext = httpContext, routeData = routeData });
+            }
+        }
+
+        public static void AfterAction(
+            this DiagnosticSource diagnosticSource,
+            ActionDescriptor actionDescriptor,
+            HttpContext httpContext,
+            RouteData routeData)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(actionDescriptor != null);
+            Debug.Assert(httpContext != null);
+            Debug.Assert(routeData != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterAction"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterAction",
+                    new { actionDescriptor, httpContext = httpContext, routeData = routeData });
+            }
+        }
+
+        public static void BeforeOnAuthorizationAsync(
+            this DiagnosticSource diagnosticSource,
+            AuthorizationFilterContext authorizationContext,
+            IAsyncAuthorizationFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(authorizationContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeOnAuthorization"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeOnAuthorization",
+                    new
+                    {
+                        actionDescriptor = authorizationContext.ActionDescriptor,
+                        authorizationContext = authorizationContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void AfterOnAuthorizationAsync(
+            this DiagnosticSource diagnosticSource,
+            AuthorizationFilterContext authorizationContext,
+            IAsyncAuthorizationFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(authorizationContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterOnAuthorization"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterOnAuthorization",
+                    new
+                    {
+                        actionDescriptor = authorizationContext.ActionDescriptor,
+                        authorizationContext = authorizationContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void BeforeOnAuthorization(
+            this DiagnosticSource diagnosticSource,
+            AuthorizationFilterContext authorizationContext,
+            IAuthorizationFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(authorizationContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeOnAuthorization"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeOnAuthorization",
+                    new
+                    {
+                        actionDescriptor = authorizationContext.ActionDescriptor,
+                        authorizationContext = authorizationContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void AfterOnAuthorization(
+            this DiagnosticSource diagnosticSource,
+            AuthorizationFilterContext authorizationContext,
+            IAuthorizationFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(authorizationContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterOnAuthorization"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterOnAuthorization",
+                    new
+                    {
+                        actionDescriptor = authorizationContext.ActionDescriptor,
+                        authorizationContext = authorizationContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void BeforeOnResourceExecution(
+            this DiagnosticSource diagnosticSource,
+            ResourceExecutingContext resourceExecutingContext,
+            IAsyncResourceFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(resourceExecutingContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeOnResourceExecution"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeOnResourceExecution",
+                    new
+                    {
+                        actionDescriptor = resourceExecutingContext.ActionDescriptor,
+                        resourceExecutingContext = resourceExecutingContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void AfterOnResourceExecution(
+            this DiagnosticSource diagnosticSource,
+            ResourceExecutedContext resourceExecutedContext,
+            IAsyncResourceFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(resourceExecutedContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterOnResourceExecution"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterOnResourceExecution",
+                    new
+                    {
+                        actionDescriptor = resourceExecutedContext.ActionDescriptor,
+                        resourceExecutedContext = resourceExecutedContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void BeforeOnResourceExecuting(
+            this DiagnosticSource diagnosticSource,
+            ResourceExecutingContext resourceExecutingContext,
+            IResourceFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(resourceExecutingContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeOnResourceExecuting"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeOnResourceExecuting",
+                    new
+                    {
+                        actionDescriptor = resourceExecutingContext.ActionDescriptor,
+                        resourceExecutingContext = resourceExecutingContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void AfterOnResourceExecuting(
+            this DiagnosticSource diagnosticSource,
+            ResourceExecutingContext resourceExecutingContext,
+            IResourceFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(resourceExecutingContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterOnResourceExecuting"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterOnResourceExecuting",
+                    new
+                    {
+                        actionDescriptor = resourceExecutingContext.ActionDescriptor,
+                        resourceExecutingContext = resourceExecutingContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void BeforeOnResourceExecuted(
+            this DiagnosticSource diagnosticSource,
+            ResourceExecutedContext resourceExecutedContext,
+            IResourceFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(resourceExecutedContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeOnResourceExecuted"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeOnResourceExecuted",
+                    new
+                    {
+                        actionDescriptor = resourceExecutedContext.ActionDescriptor,
+                        resourceExecutedContext = resourceExecutedContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void AfterOnResourceExecuted(
+            this DiagnosticSource diagnosticSource,
+            ResourceExecutedContext resourceExecutedContext,
+            IResourceFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(resourceExecutedContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterOnResourceExecuted"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterOnResourceExecuted",
+                    new
+                    {
+                        actionDescriptor = resourceExecutedContext.ActionDescriptor,
+                        resourceExecutedContext = resourceExecutedContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void BeforeOnExceptionAsync(
+            this DiagnosticSource diagnosticSource,
+            ExceptionContext exceptionContext,
+            IAsyncExceptionFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(exceptionContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeOnException"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeOnException",
+                    new
+                    {
+                        actionDescriptor = exceptionContext.ActionDescriptor,
+                        exceptionContext = exceptionContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void AfterOnExceptionAsync(
+            this DiagnosticSource diagnosticSource,
+            ExceptionContext exceptionContext,
+            IAsyncExceptionFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(exceptionContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterOnException"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterOnException",
+                    new
+                    {
+                        actionDescriptor = exceptionContext.ActionDescriptor,
+                        exceptionContext = exceptionContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void BeforeOnException(
+            this DiagnosticSource diagnosticSource,
+            ExceptionContext exceptionContext,
+            IExceptionFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(exceptionContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeOnException"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeOnException",
+                    new
+                    {
+                        actionDescriptor = exceptionContext.ActionDescriptor,
+                        exceptionContext = exceptionContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void AfterOnException(
+            this DiagnosticSource diagnosticSource,
+            ExceptionContext exceptionContext,
+            IExceptionFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(exceptionContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterOnException"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterOnException",
+                    new
+                    {
+                        actionDescriptor = exceptionContext.ActionDescriptor,
+                        exceptionContext = exceptionContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void BeforeOnActionExecution(
+            this DiagnosticSource diagnosticSource,
+            ActionExecutingContext actionExecutingContext,
+            IAsyncActionFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(actionExecutingContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeOnActionExecution"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeOnActionExecution",
+                    new
+                    {
+                        actionDescriptor = actionExecutingContext.ActionDescriptor,
+                        actionExecutingContext = actionExecutingContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void AfterOnActionExecution(
+            this DiagnosticSource diagnosticSource,
+            ActionExecutedContext actionExecutedContext,
+            IAsyncActionFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(actionExecutedContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterOnActionExecution"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterOnActionExecution",
+                    new
+                    {
+                        actionDescriptor = actionExecutedContext.ActionDescriptor,
+                        actionExecutedContext = actionExecutedContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void BeforeOnActionExecuting(
+            this DiagnosticSource diagnosticSource,
+            ActionExecutingContext actionExecutingContext,
+            IActionFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(actionExecutingContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeOnActionExecuting"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeOnActionExecuting",
+                    new
+                    {
+                        actionDescriptor = actionExecutingContext.ActionDescriptor,
+                        actionExecutingContext = actionExecutingContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void AfterOnActionExecuting(
+            this DiagnosticSource diagnosticSource,
+            ActionExecutingContext actionExecutingContext,
+            IActionFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(actionExecutingContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterOnActionExecuting"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterOnActionExecuting",
+                    new
+                    {
+                        actionDescriptor = actionExecutingContext.ActionDescriptor,
+                        actionExecutingContext = actionExecutingContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void BeforeOnActionExecuted(
+            this DiagnosticSource diagnosticSource,
+            ActionExecutedContext actionExecutedContext,
+            IActionFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(actionExecutedContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeOnActionExecuted"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeOnActionExecuted",
+                    new
+                    {
+                        actionDescriptor = actionExecutedContext.ActionDescriptor,
+                        actionExecutedContext = actionExecutedContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void AfterOnActionExecuted(
+            this DiagnosticSource diagnosticSource,
+            ActionExecutedContext actionExecutedContext,
+            IActionFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(actionExecutedContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterOnActionExecuted"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterOnActionExecuted",
+                    new
+                    {
+                        actionDescriptor = actionExecutedContext.ActionDescriptor,
+                        actionExecutedContext = actionExecutedContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void BeforeActionMethod(
+            this DiagnosticSource diagnosticSource,
+            ActionContext actionContext,
+            IDictionary<string, object> actionArguments,
+            object controller)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(actionContext != null);
+            Debug.Assert(actionArguments != null);
+            Debug.Assert(controller != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeActionMethod"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeActionMethod",
+                    new
+                    {
+                        actionContext = actionContext,
+                        arguments = actionArguments,
+                        controller = controller
+                    });
+            }
+        }
+
+        public static void AfterActionMethod(
+            this DiagnosticSource diagnosticSource,
+            ActionContext actionContext,
+            IDictionary<string, object> actionArguments,
+            object controller,
+            IActionResult result)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(actionContext != null);
+            Debug.Assert(actionArguments != null);
+            Debug.Assert(controller != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterActionMethod"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterActionMethod",
+                    new
+                    {
+                        actionContext = actionContext,
+                        arguments = actionArguments,
+                        controller = controller,
+                        result = result
+                    });
+            }
+        }
+
+        public static void BeforeOnResultExecution(
+            this DiagnosticSource diagnosticSource,
+            ResultExecutingContext resultExecutingContext,
+            IAsyncResultFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(resultExecutingContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeOnResultExecution"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeOnResultExecution",
+                    new
+                    {
+                        actionDescriptor = resultExecutingContext.ActionDescriptor,
+                        resultExecutingContext = resultExecutingContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void AfterOnResultExecution(
+            this DiagnosticSource diagnosticSource,
+            ResultExecutedContext resultExecutedContext,
+            IAsyncResultFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(resultExecutedContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterOnResultExecution"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterOnResultExecution",
+                    new
+                    {
+                        actionDescriptor = resultExecutedContext.ActionDescriptor,
+                        resultExecutedContext = resultExecutedContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void BeforeOnResultExecuting(
+            this DiagnosticSource diagnosticSource,
+            ResultExecutingContext resultExecutingContext,
+            IResultFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(resultExecutingContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeOnResultExecuting"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeOnResultExecuting",
+                    new
+                    {
+                        actionDescriptor = resultExecutingContext.ActionDescriptor,
+                        resultExecutingContext = resultExecutingContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void AfterOnResultExecuting(
+            this DiagnosticSource diagnosticSource,
+            ResultExecutingContext resultExecutingContext,
+            IResultFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(resultExecutingContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterOnResultExecuting"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterOnResultExecuting",
+                    new
+                    {
+                        actionDescriptor = resultExecutingContext.ActionDescriptor,
+                        resultExecutingContext = resultExecutingContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void BeforeOnResultExecuted(
+            this DiagnosticSource diagnosticSource,
+            ResultExecutedContext resultExecutedContext,
+            IResultFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(resultExecutedContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeOnResultExecuted"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeOnResultExecuted",
+                    new
+                    {
+                        actionDescriptor = resultExecutedContext.ActionDescriptor,
+                        resultExecutedContext = resultExecutedContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void AfterOnResultExecuted(
+            this DiagnosticSource diagnosticSource,
+            ResultExecutedContext resultExecutedContext,
+            IResultFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(resultExecutedContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterOnResultExecuted"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterOnResultExecuted",
+                    new
+                    {
+                        actionDescriptor = resultExecutedContext.ActionDescriptor,
+                        resultExecutedContext = resultExecutedContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void BeforeActionResult(
+            this DiagnosticSource diagnosticSource,
+            ActionContext actionContext,
+            IActionResult result)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(actionContext != null);
+            Debug.Assert(result != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeActionResult"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeActionResult",
+                    new { actionContext = actionContext, result = result });
+            }
+        }
+
+        public static void AfterActionResult(
+            this DiagnosticSource diagnosticSource,
+            ActionContext actionContext,
+            IActionResult result)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(actionContext != null);
+            Debug.Assert(result != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterActionResult"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterActionResult",
+                    new { actionContext = actionContext, result = result });
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreLoggerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreLoggerExtensions.cs
new file mode 100644
index 0000000000..c840f785b1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreLoggerExtensions.cs
@@ -0,0 +1,1587 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using System.Security.Claims;
+using System.Text;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Formatters.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    internal static class MvcCoreLoggerExtensions
+    {
+        public const string ActionFilter = "Action Filter";
+        private static readonly string[] _noFilters = new[] { "None" };
+
+        private static readonly double TimestampToTicks = TimeSpan.TicksPerSecond / (double)Stopwatch.Frequency;
+
+        private static readonly Action<ILogger, string, string, Exception> _actionExecuting;
+        private static readonly Action<ILogger, string, double, Exception> _actionExecuted;
+
+        private static readonly Action<ILogger, string[], Exception> _challengeResultExecuting;
+
+        private static readonly Action<ILogger, string, Exception> _contentResultExecuting;
+
+        private static readonly Action<ILogger, string, ModelValidationState, Exception> _actionMethodExecuting;
+        private static readonly Action<ILogger, string, string[], ModelValidationState, Exception> _actionMethodExecutingWithArguments;
+        private static readonly Action<ILogger, string, string, double, Exception> _actionMethodExecuted;
+
+        private static readonly Action<ILogger, string, string[], Exception> _logFilterExecutionPlan;
+        private static readonly Action<ILogger, string, string, Type, Exception> _beforeExecutingMethodOnFilter;
+        private static readonly Action<ILogger, string, string, Type, Exception> _afterExecutingMethodOnFilter;
+        private static readonly Action<ILogger, Type, Exception> _beforeExecutingActionResult;
+        private static readonly Action<ILogger, Type, Exception> _afterExecutingActionResult;
+
+        private static readonly Action<ILogger, string, Exception> _ambiguousActions;
+        private static readonly Action<ILogger, string, string, IActionConstraint, Exception> _constraintMismatch;
+
+        private static readonly Action<ILogger, FileResult, string, string, Exception> _executingFileResult;
+        private static readonly Action<ILogger, FileResult, string, Exception> _executingFileResultWithNoFileName;
+        private static readonly Action<ILogger, Exception> _notEnabledForRangeProcessing;
+        private static readonly Action<ILogger, Exception> _writingRangeToBody;
+        private static readonly Action<ILogger, object, Exception> _authorizationFailure;
+        private static readonly Action<ILogger, object, Exception> _resourceFilterShortCircuit;
+        private static readonly Action<ILogger, object, Exception> _resultFilterShortCircuit;
+        private static readonly Action<ILogger, object, Exception> _actionFilterShortCircuit;
+        private static readonly Action<ILogger, object, Exception> _exceptionFilterShortCircuit;
+
+        private static readonly Action<ILogger, string[], Exception> _forbidResultExecuting;
+        private static readonly Action<ILogger, string, ClaimsPrincipal, Exception> _signInResultExecuting;
+        private static readonly Action<ILogger, string[], Exception> _signOutResultExecuting;
+
+        private static readonly Action<ILogger, int, Exception> _httpStatusCodeResultExecuting;
+
+        private static readonly Action<ILogger, string, Exception> _localRedirectResultExecuting;
+
+        private static readonly Action<ILogger, string, Exception> _objectResultExecuting;
+        private static readonly Action<ILogger, string, Exception> _noFormatter;
+        private static readonly Action<ILogger, IOutputFormatter, string, Exception> _formatterSelected;
+        private static readonly Action<ILogger, string, Exception> _skippedContentNegotiation;
+        private static readonly Action<ILogger, Exception> _noAcceptForNegotiation;
+        private static readonly Action<ILogger, IEnumerable<MediaTypeSegmentWithQuality>, Exception> _noFormatterFromNegotiation;
+
+        private static readonly Action<ILogger, IInputFormatter, string, Exception> _inputFormatterSelected;
+        private static readonly Action<ILogger, IInputFormatter, string, Exception> _inputFormatterRejected;
+        private static readonly Action<ILogger, string, Exception> _noInputFormatterSelected;
+        private static readonly Action<ILogger, string, string, Exception> _removeFromBodyAttribute;
+
+        private static readonly Action<ILogger, string, Exception> _redirectResultExecuting;
+
+        private static readonly Action<ILogger, string, Exception> _redirectToActionResultExecuting;
+
+        private static readonly Action<ILogger, string, string, Exception> _redirectToRouteResultExecuting;
+
+        private static readonly Action<ILogger, string[], Exception> _noActionsMatched;
+
+        private static readonly Action<ILogger, string, Exception> _redirectToPageResultExecuting;
+
+        private static readonly Action<ILogger, Exception> _featureNotFound;
+        private static readonly Action<ILogger, Exception> _featureIsReadOnly;
+        private static readonly Action<ILogger, string, Exception> _maxRequestBodySizeSet;
+        private static readonly Action<ILogger, Exception> _requestBodySizeLimitDisabled;
+
+        private static readonly Action<ILogger, Exception> _cannotApplyRequestFormLimits;
+        private static readonly Action<ILogger, Exception> _appliedRequestFormLimits;
+
+        private static readonly Action<ILogger, Exception> _modelStateInvalidFilterExecuting;
+
+        private static readonly Action<ILogger, MethodInfo, string, string, Exception> _inferredParameterSource;
+        private static readonly Action<ILogger, IModelBinderProvider[], Exception> _registeredModelBinderProviders;
+        private static readonly Action<ILogger, string, Type, string, Type, Exception> _foundNoValueForPropertyInRequest;
+        private static readonly Action<ILogger, string, string, Type, Exception> _foundNoValueForParameterInRequest;
+        private static readonly Action<ILogger, string, Type, Exception> _foundNoValueInRequest;
+        private static readonly Action<ILogger, string, Type, Exception> _noPublicSettableProperties;
+        private static readonly Action<ILogger, Type, Exception> _cannotBindToComplexType;
+        private static readonly Action<ILogger, string, Type, Exception> _cannotBindToFilesCollectionDueToUnsupportedContentType;
+        private static readonly Action<ILogger, Type, Exception> _cannotCreateHeaderModelBinder;
+        private static readonly Action<ILogger, Type, Exception> _cannotCreateHeaderModelBinderCompatVersion_2_0;
+        private static readonly Action<ILogger, Exception> _noFilesFoundInRequest;
+        private static readonly Action<ILogger, string, string, Exception> _noNonIndexBasedFormatFoundForCollection;
+        private static readonly Action<ILogger, string, string, string, string, string, string, Exception> _attemptingToBindCollectionUsingIndices;
+        private static readonly Action<ILogger, string, string, string, string, string, string, Exception> _attemptingToBindCollectionOfKeyValuePair;
+        private static readonly Action<ILogger, string, string, string, Exception> _noKeyValueFormatForDictionaryModelBinder;
+        private static readonly Action<ILogger, string, Type, string, Exception> _attemptingToBindParameterModel;
+        private static readonly Action<ILogger, string, Type, Exception> _doneAttemptingToBindParameterModel;
+        private static readonly Action<ILogger, Type, string, Type, string, Exception> _attemptingToBindPropertyModel;
+        private static readonly Action<ILogger, Type, string, Type, Exception> _doneAttemptingToBindPropertyModel;
+        private static readonly Action<ILogger, Type, string, Exception> _attemptingToBindModel;
+        private static readonly Action<ILogger, Type, string, Exception> _doneAttemptingToBindModel;
+        private static readonly Action<ILogger, string, Type, Exception> _attemptingToBindParameter;
+        private static readonly Action<ILogger, string, Type, Exception> _doneAttemptingToBindParameter;
+        private static readonly Action<ILogger, Type, string, Type, Exception> _attemptingToBindProperty;
+        private static readonly Action<ILogger, Type, string, Type, Exception> _doneAttemptingToBindProperty;
+        private static readonly Action<ILogger, Type, string, Type, Exception> _attemptingToValidateProperty;
+        private static readonly Action<ILogger, Type, string, Type, Exception> _doneAttemptingToValidateProperty;
+        private static readonly Action<ILogger, string, Type, Exception> _attemptingToValidateParameter;
+        private static readonly Action<ILogger, string, Type, Exception> _doneAttemptingToValidateParameter;
+        private static readonly Action<ILogger, string, Exception> _unsupportedFormatFilterContentType;
+        private static readonly Action<ILogger, string, MediaTypeCollection, Exception> _actionDoesNotSupportFormatFilterContentType;
+        private static readonly Action<ILogger, string, Exception> _cannotApplyFormatFilterContentType;
+        private static readonly Action<ILogger, Exception> _actionDoesNotExplicitlySpecifyContentTypes;
+        private static readonly Action<ILogger, IEnumerable<MediaTypeSegmentWithQuality>, Exception> _selectingOutputFormatterUsingAcceptHeader;
+        private static readonly Action<ILogger, EntityTagHeaderValue, Exception> _ifMatchPreconditionFailed;
+        private static readonly Action<ILogger, DateTimeOffset?, DateTimeOffset?, Exception> _ifUnmodifiedSincePreconditionFailed;
+        private static readonly Action<ILogger, DateTimeOffset?, DateTimeOffset?, Exception> _ifRangeLastModifiedPreconditionFailed;
+        private static readonly Action<ILogger, EntityTagHeaderValue, EntityTagHeaderValue, Exception> _ifRangeETagPreconditionFailed;
+        private static readonly Action<ILogger, IEnumerable<MediaTypeSegmentWithQuality>, MediaTypeCollection, Exception> _selectingOutputFormatterUsingAcceptHeaderAndExplicitContentTypes;
+        private static readonly Action<ILogger, Exception> _selectingOutputFormatterWithoutUsingContentTypes;
+        private static readonly Action<ILogger, MediaTypeCollection, Exception> _selectingOutputFormatterUsingContentTypes;
+        private static readonly Action<ILogger, Exception> _selectingFirstCanWriteFormatter;
+        private static readonly Action<ILogger, Type, Type, Type, Exception> _notMostEffectiveFilter;
+        private static readonly Action<ILogger, IEnumerable<IOutputFormatter>, Exception> _registeredOutputFormatters;
+
+        static MvcCoreLoggerExtensions()
+        {
+            _actionExecuting = LoggerMessage.Define<string, string>(
+                LogLevel.Information,
+                1,
+                "Route matched with {RouteData}. Executing action {ActionName}");
+
+            _actionExecuted = LoggerMessage.Define<string, double>(
+                LogLevel.Information,
+                2,
+                "Executed action {ActionName} in {ElapsedMilliseconds}ms");
+
+            _challengeResultExecuting = LoggerMessage.Define<string[]>(
+                LogLevel.Information,
+                1,
+                "Executing ChallengeResult with authentication schemes ({Schemes}).");
+
+            _contentResultExecuting = LoggerMessage.Define<string>(
+                LogLevel.Information,
+                1,
+                "Executing ContentResult with HTTP Response ContentType of {ContentType}");
+
+            _actionMethodExecuting = LoggerMessage.Define<string, ModelValidationState>(
+                LogLevel.Information,
+                1,
+                "Executing action method {ActionName} - Validation state: {ValidationState}");
+
+            _actionMethodExecutingWithArguments = LoggerMessage.Define<string, string[], ModelValidationState>(
+                LogLevel.Information,
+                1,
+                "Executing action method {ActionName} with arguments ({Arguments}) - Validation state: {ValidationState}");
+
+            _actionMethodExecuted = LoggerMessage.Define<string, string, double>(
+                LogLevel.Information,
+                2,
+                "Executed action method {ActionName}, returned result {ActionResult} in {ElapsedMilliseconds}ms.");
+
+            _logFilterExecutionPlan = LoggerMessage.Define<string, string[]>(
+                LogLevel.Debug,
+                1,
+                "Execution plan of {FilterType} filters (in the following order): {Filters}");
+
+            _beforeExecutingMethodOnFilter = LoggerMessage.Define<string, string, Type>(
+                LogLevel.Trace,
+                2,
+                "{FilterType}: Before executing {Method} on filter {Filter}.");
+
+            _afterExecutingMethodOnFilter = LoggerMessage.Define<string, string, Type>(
+                LogLevel.Trace,
+                3,
+                "{FilterType}: After executing {Method} on filter {Filter}.");
+
+            _beforeExecutingActionResult = LoggerMessage.Define<Type>(
+                LogLevel.Trace,
+                4,
+                "Before executing action result {ActionResult}.");
+
+            _afterExecutingActionResult = LoggerMessage.Define<Type>(
+                LogLevel.Trace,
+                5,
+                "After executing action result {ActionResult}.");
+
+            _ambiguousActions = LoggerMessage.Define<string>(
+                LogLevel.Error,
+                1,
+                "Request matched multiple actions resulting in ambiguity. Matching actions: {AmbiguousActions}");
+
+            _constraintMismatch = LoggerMessage.Define<string, string, IActionConstraint>(
+                LogLevel.Debug,
+                2,
+                "Action '{ActionName}' with id '{ActionId}' did not match the constraint '{ActionConstraint}'");
+
+            _executingFileResult = LoggerMessage.Define<FileResult, string, string>(
+                LogLevel.Information,
+                1,
+                "Executing {FileResultType}, sending file '{FileDownloadPath}' with download name '{FileDownloadName}' ...");
+
+            _executingFileResultWithNoFileName = LoggerMessage.Define<FileResult, string>(
+                LogLevel.Information,
+                2,
+                "Executing {FileResultType}, sending file with download name '{FileDownloadName}' ...");
+
+            _authorizationFailure = LoggerMessage.Define<object>(
+                LogLevel.Information,
+                3,
+                "Authorization failed for the request at filter '{AuthorizationFilter}'.");
+
+            _resourceFilterShortCircuit = LoggerMessage.Define<object>(
+                LogLevel.Debug,
+                4,
+                "Request was short circuited at resource filter '{ResourceFilter}'.");
+
+            _resultFilterShortCircuit = LoggerMessage.Define<object>(
+                LogLevel.Debug,
+                5,
+                "Request was short circuited at result filter '{ResultFilter}'.");
+
+            _actionFilterShortCircuit = LoggerMessage.Define<object>(
+                LogLevel.Debug,
+                3,
+                "Request was short circuited at action filter '{ActionFilter}'.");
+
+            _exceptionFilterShortCircuit = LoggerMessage.Define<object>(
+                LogLevel.Debug,
+                4,
+                "Request was short circuited at exception filter '{ExceptionFilter}'.");
+
+            _forbidResultExecuting = LoggerMessage.Define<string[]>(
+                LogLevel.Information,
+                eventId: 1,
+                formatString: $"Executing {nameof(ForbidResult)} with authentication schemes ({{Schemes}}).");
+
+            _signInResultExecuting = LoggerMessage.Define<string, ClaimsPrincipal>(
+                LogLevel.Information,
+                eventId: 1,
+                formatString: $"Executing {nameof(SignInResult)} with authentication scheme ({{Scheme}}) and the following principal: {{Principal}}.");
+
+            _signOutResultExecuting = LoggerMessage.Define<string[]>(
+                LogLevel.Information,
+                eventId: 1,
+                formatString: $"Executing {nameof(SignOutResult)} with authentication schemes ({{Schemes}}).");
+
+            _httpStatusCodeResultExecuting = LoggerMessage.Define<int>(
+                LogLevel.Information,
+                1,
+                "Executing HttpStatusCodeResult, setting HTTP status code {StatusCode}");
+
+            _localRedirectResultExecuting = LoggerMessage.Define<string>(
+                LogLevel.Information,
+                1,
+                "Executing LocalRedirectResult, redirecting to {Destination}.");
+
+            _noFormatter = LoggerMessage.Define<string>(
+                LogLevel.Warning,
+                1,
+                "No output formatter was found for content type '{ContentType}' to write the response.");
+
+            _objectResultExecuting = LoggerMessage.Define<string>(
+                LogLevel.Information,
+                1,
+                "Executing ObjectResult, writing value of type '{Type}'.");
+
+            _formatterSelected = LoggerMessage.Define<IOutputFormatter, string>(
+                LogLevel.Debug,
+                2,
+                "Selected output formatter '{OutputFormatter}' and content type '{ContentType}' to write the response.");
+
+            _skippedContentNegotiation = LoggerMessage.Define<string>(
+                LogLevel.Debug,
+                3,
+                "Skipped content negotiation as content type '{ContentType}' is explicitly set for the response.");
+
+            _noAcceptForNegotiation = LoggerMessage.Define(
+                LogLevel.Debug,
+                4,
+                "No information found on request to perform content negotiation.");
+
+            _noFormatterFromNegotiation = LoggerMessage.Define<IEnumerable<MediaTypeSegmentWithQuality>>(
+                LogLevel.Debug,
+                5,
+                "Could not find an output formatter based on content negotiation. Accepted types were ({AcceptTypes})");
+
+            _inputFormatterSelected = LoggerMessage.Define<IInputFormatter, string>(
+                LogLevel.Debug,
+                1,
+                "Selected input formatter '{InputFormatter}' for content type '{ContentType}'.");
+
+            _inputFormatterRejected = LoggerMessage.Define<IInputFormatter, string>(
+                LogLevel.Debug,
+                2,
+                "Rejected input formatter '{InputFormatter}' for content type '{ContentType}'.");
+
+            _noInputFormatterSelected = LoggerMessage.Define<string>(
+                LogLevel.Debug,
+                3,
+                "No input formatter was found to support the content type '{ContentType}' for use with the [FromBody] attribute.");
+
+            _removeFromBodyAttribute = LoggerMessage.Define<string, string>(
+                LogLevel.Debug,
+                4,
+                "To use model binding, remove the [FromBody] attribute from the property or parameter named '{ModelName}' with model type '{ModelType}'.");
+
+            _redirectResultExecuting = LoggerMessage.Define<string>(
+                LogLevel.Information,
+                1,
+                "Executing RedirectResult, redirecting to {Destination}.");
+
+            _redirectToActionResultExecuting = LoggerMessage.Define<string>(
+                LogLevel.Information,
+                1,
+                "Executing RedirectResult, redirecting to {Destination}.");
+
+            _redirectToRouteResultExecuting = LoggerMessage.Define<string, string>(
+                LogLevel.Information,
+                1,
+                "Executing RedirectToRouteResult, redirecting to {Destination} from route {RouteName}.");
+
+            _redirectToPageResultExecuting = LoggerMessage.Define<string>(
+                LogLevel.Information,
+                1,
+                "Executing RedirectToPageResult, redirecting to {Page}.");
+
+            _noActionsMatched = LoggerMessage.Define<string[]>(
+                LogLevel.Debug,
+                3,
+                "No actions matched the current request. Route values: {RouteValues}");
+
+            _featureNotFound = LoggerMessage.Define(
+                LogLevel.Warning,
+                1,
+                "A request body size limit could not be applied. This server does not support the IHttpRequestBodySizeFeature.");
+
+            _featureIsReadOnly = LoggerMessage.Define(
+                LogLevel.Warning,
+                2,
+                "A request body size limit could not be applied. The IHttpRequestBodySizeFeature for the server is read-only.");
+
+            _maxRequestBodySizeSet = LoggerMessage.Define<string>(
+                LogLevel.Debug,
+                3,
+                "The maximum request body size has been set to {RequestSize}.");
+
+            _requestBodySizeLimitDisabled = LoggerMessage.Define(
+                LogLevel.Debug,
+                3,
+                "The request body size limit has been disabled.");
+
+            _cannotApplyRequestFormLimits = LoggerMessage.Define(
+                LogLevel.Warning,
+                1,
+                "Unable to apply configured form options since the request form has already been read.");
+
+            _appliedRequestFormLimits = LoggerMessage.Define(
+                LogLevel.Debug,
+                2,
+                "Applied the configured form options on the current request.");
+
+            _modelStateInvalidFilterExecuting = LoggerMessage.Define(
+                LogLevel.Debug,
+                1,
+                "The request has model state errors, returning an error response.");
+
+            _inferredParameterSource = LoggerMessage.Define<MethodInfo, string, string>(
+                LogLevel.Debug,
+                1,
+                "Inferred binding source for '{ParameterName}` on `{ActionName}` as {BindingSource}.");
+
+            _unsupportedFormatFilterContentType = LoggerMessage.Define<string>(
+                LogLevel.Debug,
+                1,
+                "Could not find a media type for the format '{FormatFilterContentType}'.");
+
+            _actionDoesNotSupportFormatFilterContentType = LoggerMessage.Define<string, MediaTypeCollection>(
+                LogLevel.Debug,
+                2,
+                "Current action does not support the content type '{FormatFilterContentType}'. The supported content types are '{SupportedMediaTypes}'.");
+
+            _cannotApplyFormatFilterContentType = LoggerMessage.Define<string>(
+                LogLevel.Debug,
+                3,
+                "Cannot apply content type '{FormatFilterContentType}' to the response as current action had explicitly set a preferred content type.");
+
+            _notMostEffectiveFilter = LoggerMessage.Define<Type, Type, Type>(
+                LogLevel.Debug,
+                4,
+                "Execution of filter {OverriddenFilter} is preempted by filter {OverridingFilter} which is the most effective filter implementing policy {FilterPolicy}.");
+
+            _actionDoesNotExplicitlySpecifyContentTypes = LoggerMessage.Define(
+                LogLevel.Debug,
+                5,
+                "Current action does not explicitly specify any content types for the response.");
+
+            _selectingOutputFormatterUsingAcceptHeader = LoggerMessage.Define<IEnumerable<MediaTypeSegmentWithQuality>>(
+                LogLevel.Debug,
+                6,
+                "Attempting to select an output formatter based on Accept header '{AcceptHeader}'.");
+
+            _selectingOutputFormatterUsingAcceptHeaderAndExplicitContentTypes = LoggerMessage.Define<IEnumerable<MediaTypeSegmentWithQuality>, MediaTypeCollection>(
+                LogLevel.Debug,
+                7,
+                "Attempting to select an output formatter based on Accept header '{AcceptHeader}' and explicitly specified content types '{ExplicitContentTypes}'. The content types in the accept header must be a subset of the explicitly set content types.");
+
+            _selectingOutputFormatterWithoutUsingContentTypes = LoggerMessage.Define(
+                LogLevel.Debug,
+                8,
+                "Attempting to select an output formatter without using a content type as no explicit content types were specified for the response.");
+
+            _selectingOutputFormatterUsingContentTypes = LoggerMessage.Define<MediaTypeCollection>(
+                LogLevel.Debug,
+                9,
+                "Attempting to select the first output formatter in the output formatters list which supports a content type from the explicitly specified content types '{ExplicitContentTypes}'.");
+
+            _selectingFirstCanWriteFormatter = LoggerMessage.Define(
+                LogLevel.Debug,
+                10,
+                "Attempting to select the first formatter in the output formatters list which can write the result.");
+
+            _registeredOutputFormatters = LoggerMessage.Define<IEnumerable<IOutputFormatter>>(
+                LogLevel.Debug,
+                11,
+                "List of registered output formatters, in the following order: {OutputFormatters}");
+
+            _writingRangeToBody = LoggerMessage.Define(
+                LogLevel.Debug,
+                17,
+                "Writing the requested range of bytes to the body...");
+
+            _registeredModelBinderProviders = LoggerMessage.Define<IModelBinderProvider[]>(
+                LogLevel.Debug,
+                12,
+                "Registered model binder providers, in the following order: {ModelBinderProviders}");
+
+            _attemptingToBindPropertyModel = LoggerMessage.Define<Type, string, Type, string>(
+               LogLevel.Debug,
+               13,
+               "Attempting to bind property '{PropertyContainerType}.{PropertyName}' of type '{ModelType}' using the name '{ModelName}' in request data ...");
+
+            _doneAttemptingToBindPropertyModel = LoggerMessage.Define<Type, string, Type>(
+               LogLevel.Debug,
+               14,
+               "Done attempting to bind property '{PropertyContainerType}.{PropertyName}' of type '{ModelType}'.");
+
+            _foundNoValueForPropertyInRequest = LoggerMessage.Define<string, Type, string, Type>(
+               LogLevel.Debug,
+               15,
+               "Could not find a value in the request with name '{ModelName}' for binding property '{PropertyContainerType}.{ModelFieldName}' of type '{ModelType}'.");
+
+            _foundNoValueForParameterInRequest = LoggerMessage.Define<string, string, Type>(
+               LogLevel.Debug,
+               16,
+               "Could not find a value in the request with name '{ModelName}' for binding parameter '{ModelFieldName}' of type '{ModelType}'.");
+
+            _noPublicSettableProperties = LoggerMessage.Define<string, Type>(
+               LogLevel.Debug,
+               17,
+               "Could not bind to model with name '{ModelName}' and type '{ModelType}' as the type has no public settable properties.");
+
+            _cannotBindToComplexType = LoggerMessage.Define<Type>(
+               LogLevel.Debug,
+               18,
+               "Could not bind to model of type '{ModelType}' as there were no values in the request for any of the properties.");
+
+            _cannotBindToFilesCollectionDueToUnsupportedContentType = LoggerMessage.Define<string, Type>(
+               LogLevel.Debug,
+               19,
+               "Could not bind to model with name '{ModelName}' and type '{ModelType}' as the request did not have a content type of either 'application/x-www-form-urlencoded' or 'multipart/form-data'.");
+
+            _cannotCreateHeaderModelBinder = LoggerMessage.Define<Type>(
+               LogLevel.Debug,
+               20,
+               "Could not create a binder for type '{ModelType}' as this binder only supports simple types (like string, int, bool, enum) or a collection of simple types.");
+
+            _noFilesFoundInRequest = LoggerMessage.Define(
+                LogLevel.Debug,
+                21,
+                "No files found in the request to bind the model to.");
+
+            _attemptingToBindParameter = LoggerMessage.Define<string, Type>(
+                LogLevel.Debug,
+                22,
+                "Attempting to bind parameter '{ParameterName}' of type '{ModelType}' ...");
+
+            _doneAttemptingToBindParameter = LoggerMessage.Define<string, Type>(
+                LogLevel.Debug,
+                23,
+                "Done attempting to bind parameter '{ParameterName}' of type '{ModelType}'.");
+
+            _attemptingToBindModel = LoggerMessage.Define<Type, string>(
+                LogLevel.Debug,
+                24,
+                "Attempting to bind model of type '{ModelType}' using the name '{ModelName}' in request data ...");
+
+            _doneAttemptingToBindModel = LoggerMessage.Define<Type, string>(
+                LogLevel.Debug,
+                25,
+                "Done attempting to bind model of type '{ModelType}' using the name '{ModelName}'.");
+
+            _attemptingToValidateParameter = LoggerMessage.Define<string, Type>(
+                LogLevel.Debug,
+                26,
+                "Attempting to validate the bound parameter '{ParameterName}' of type '{ModelType}' ...");
+
+            _doneAttemptingToValidateParameter = LoggerMessage.Define<string, Type>(
+                LogLevel.Debug,
+                27,
+                "Done attempting to validate the bound parameter '{ParameterName}' of type '{ModelType}'.");
+
+            _noNonIndexBasedFormatFoundForCollection = LoggerMessage.Define<string, string>(
+                LogLevel.Debug,
+                28,
+                "Could not bind to collection using a format like {ModelName}=value1&{ModelName}=value2");
+
+            _attemptingToBindCollectionUsingIndices = LoggerMessage.Define<string, string, string, string, string, string>(
+                LogLevel.Debug,
+                29,
+                "Attempting to bind model using indices. Example formats include: " +
+                "[0]=value1&[1]=value2, " +
+                "{ModelName}[0]=value1&{ModelName}[1]=value2, " +
+                "{ModelName}.index=zero&{ModelName}.index=one&{ModelName}[zero]=value1&{ModelName}[one]=value2");
+
+            _attemptingToBindCollectionOfKeyValuePair = LoggerMessage.Define<string, string, string, string, string, string>(
+                LogLevel.Debug,
+                30,
+                "Attempting to bind collection of KeyValuePair. Example formats include: " +
+                "[0].Key=key1&[0].Value=value1&[1].Key=key2&[1].Value=value2, " +
+                "{ModelName}[0].Key=key1&{ModelName}[0].Value=value1&{ModelName}[1].Key=key2&{ModelName}[1].Value=value2, " +
+                "{ModelName}[key1]=value1&{ModelName}[key2]=value2");
+
+            _noKeyValueFormatForDictionaryModelBinder = LoggerMessage.Define<string, string, string>(
+                LogLevel.Debug,
+                33,
+                "Attempting to bind model with name '{ModelName}' using the format {ModelName}[key1]=value1&{ModelName}[key2]=value2");
+
+            _ifMatchPreconditionFailed = LoggerMessage.Define<EntityTagHeaderValue>(
+                LogLevel.Debug,
+                34,
+                "Current request's If-Match header check failed as the file's current etag '{CurrentETag}' does not match with any of the supplied etags.");
+
+            _ifUnmodifiedSincePreconditionFailed = LoggerMessage.Define<DateTimeOffset?, DateTimeOffset?>(
+                LogLevel.Debug,
+                35,
+                "Current request's If-Unmodified-Since header check failed as the file was modified (at '{lastModified}') after the If-Unmodified-Since date '{IfUnmodifiedSinceDate}'.");
+
+            _ifRangeLastModifiedPreconditionFailed = LoggerMessage.Define<DateTimeOffset?, DateTimeOffset?>(
+                LogLevel.Debug,
+                36,
+                "Could not serve range as the file was modified (at {LastModified}) after the if-Range's last modified date '{IfRangeLastModified}'.");
+
+            _ifRangeETagPreconditionFailed = LoggerMessage.Define<EntityTagHeaderValue, EntityTagHeaderValue>(
+                LogLevel.Debug,
+                37,
+                "Could not serve range as the file's current etag '{CurrentETag}' does not match the If-Range etag '{IfRangeETag}'.");
+
+            _notEnabledForRangeProcessing = LoggerMessage.Define(
+                LogLevel.Debug,
+                38,
+                $"The file result has not been enabled for processing range requests. To enable it, set the property '{nameof(FileResult.EnableRangeProcessing)}' on the result to 'true'.");
+
+            _attemptingToBindProperty = LoggerMessage.Define<Type, string, Type>(
+                LogLevel.Debug,
+                39,
+                "Attempting to bind property '{PropertyContainerType}.{PropertyName}' of type '{ModelType}' ...");
+
+            _doneAttemptingToBindProperty = LoggerMessage.Define<Type, string, Type>(
+                LogLevel.Debug,
+                40,
+                "Done attempting to bind property '{PropertyContainerType}.{PropertyName}' of type '{ModelType}'.");
+
+            _attemptingToValidateProperty = LoggerMessage.Define<Type, string, Type>(
+                LogLevel.Debug,
+                41,
+                "Attempting to validate the bound property '{PropertyContainerType}.{PropertyName}' of type '{ModelType}' ...");
+
+            _doneAttemptingToValidateProperty = LoggerMessage.Define<Type, string, Type>(
+                LogLevel.Debug,
+                42,
+                "Done attempting to validate the bound property '{PropertyContainerType}.{PropertyName}' of type '{ModelType}'.");
+
+            _cannotCreateHeaderModelBinderCompatVersion_2_0 = LoggerMessage.Define<Type>(
+               LogLevel.Debug,
+               43,
+               "Could not create a binder for type '{ModelType}' as this binder only supports 'System.String' type or a collection of 'System.String'.");
+
+            _attemptingToBindParameterModel = LoggerMessage.Define<string, Type, string>(
+                LogLevel.Debug,
+                44,
+                "Attempting to bind parameter '{ParameterName}' of type '{ModelType}' using the name '{ModelName}' in request data ...");
+
+            _doneAttemptingToBindParameterModel = LoggerMessage.Define<string, Type>(
+               LogLevel.Debug,
+               45,
+               "Done attempting to bind parameter '{ParameterName}' of type '{ModelType}'.");
+
+            _foundNoValueInRequest = LoggerMessage.Define<string, Type>(
+               LogLevel.Debug,
+               46,
+               "Could not find a value in the request with name '{ModelName}' of type '{ModelType}'.");
+        }
+
+        public static void RegisteredOutputFormatters(this ILogger logger, IEnumerable<IOutputFormatter> outputFormatters)
+        {
+            _registeredOutputFormatters(logger, outputFormatters, null);
+        }
+
+        public static void SelectingOutputFormatterUsingAcceptHeaderAndExplicitContentTypes(
+            this ILogger logger,
+            IEnumerable<MediaTypeSegmentWithQuality> acceptHeader,
+            MediaTypeCollection mediaTypeCollection)
+        {
+            _selectingOutputFormatterUsingAcceptHeaderAndExplicitContentTypes(logger, acceptHeader, mediaTypeCollection, null);
+        }
+
+        public static void SelectingOutputFormatterUsingAcceptHeader(this ILogger logger, IEnumerable<MediaTypeSegmentWithQuality> acceptHeader)
+        {
+            _selectingOutputFormatterUsingAcceptHeader(logger, acceptHeader, null);
+        }
+
+        public static void SelectingOutputFormatterUsingContentTypes(this ILogger logger, MediaTypeCollection mediaTypeCollection)
+        {
+            _selectingOutputFormatterUsingContentTypes(logger, mediaTypeCollection, null);
+        }
+
+        public static void SelectingOutputFormatterWithoutUsingContentTypes(this ILogger logger)
+        {
+            _selectingOutputFormatterWithoutUsingContentTypes(logger, null);
+        }
+
+        public static void SelectFirstCanWriteFormatter(this ILogger logger)
+        {
+            _selectingFirstCanWriteFormatter(logger, null);
+        }
+
+        public static IDisposable ActionScope(this ILogger logger, ActionDescriptor action)
+        {
+            return logger.BeginScope(new ActionLogScope(action));
+        }
+
+        public static void ExecutingAction(this ILogger logger, ActionDescriptor action)
+        {
+            if (logger.IsEnabled(LogLevel.Information))
+            {
+                var routeKeys = action.RouteValues.Keys.ToArray();
+                var routeValues = action.RouteValues.Values.ToArray();
+                var stringBuilder = new StringBuilder();
+                stringBuilder.Append("{");
+                for (var i = 0; i < routeValues.Length; i++)
+                {
+                    if (i == routeValues.Length - 1)
+                    {
+                        stringBuilder.Append($"{routeKeys[i]} = \"{routeValues[i]}\"}}");
+                    }
+                    else
+                    {
+                        stringBuilder.Append($"{routeKeys[i]} = \"{routeValues[i]}\", ");
+                    }
+                }
+
+                _actionExecuting(logger, stringBuilder.ToString(), action.DisplayName, null);
+            }
+        }
+
+        public static void AuthorizationFiltersExecutionPlan(this ILogger logger, IEnumerable<IFilterMetadata> filters)
+        {
+            if (!logger.IsEnabled(LogLevel.Debug))
+            {
+                return;
+            }
+
+            var authorizationFilters = filters.Where(f => f is IAuthorizationFilter || f is IAsyncAuthorizationFilter);
+            LogFilterExecutionPlan(logger, "authorization", authorizationFilters);
+        }
+
+        public static void ResourceFiltersExecutionPlan(this ILogger logger, IEnumerable<IFilterMetadata> filters)
+        {
+            if (!logger.IsEnabled(LogLevel.Debug))
+            {
+                return;
+            }
+
+            var resourceFilters = filters.Where(f => f is IResourceFilter || f is IAsyncResourceFilter);
+            LogFilterExecutionPlan(logger, "resource", resourceFilters);
+        }
+
+        public static void ActionFiltersExecutionPlan(this ILogger logger, IEnumerable<IFilterMetadata> filters)
+        {
+            if (!logger.IsEnabled(LogLevel.Debug))
+            {
+                return;
+            }
+
+            var actionFilters = filters.Where(f => f is IActionFilter || f is IAsyncActionFilter);
+            LogFilterExecutionPlan(logger, "action", actionFilters);
+        }
+
+        public static void ExceptionFiltersExecutionPlan(this ILogger logger, IEnumerable<IFilterMetadata> filters)
+        {
+            if (!logger.IsEnabled(LogLevel.Debug))
+            {
+                return;
+            }
+
+            var exceptionFilters = filters.Where(f => f is IExceptionFilter || f is IAsyncExceptionFilter);
+            LogFilterExecutionPlan(logger, "exception", exceptionFilters);
+        }
+
+        public static void ResultFiltersExecutionPlan(this ILogger logger, IEnumerable<IFilterMetadata> filters)
+        {
+            if (!logger.IsEnabled(LogLevel.Debug))
+            {
+                return;
+            }
+
+            var resultFilters = filters.Where(f => f is IResultFilter || f is IAsyncResultFilter);
+            LogFilterExecutionPlan(logger, "result", resultFilters);
+        }
+
+        public static void BeforeExecutingMethodOnFilter(
+            this ILogger logger,
+            string filterType,
+            string methodName,
+            IFilterMetadata filter)
+        {
+            _beforeExecutingMethodOnFilter(logger, filterType, methodName, filter.GetType(), null);
+        }
+
+        public static void AfterExecutingMethodOnFilter(
+            this ILogger logger,
+            string filterType,
+            string methodName,
+            IFilterMetadata filter)
+        {
+            _afterExecutingMethodOnFilter(logger, filterType, methodName, filter.GetType(), null);
+        }
+
+        public static void ExecutedAction(this ILogger logger, ActionDescriptor action, TimeSpan timeSpan)
+        {
+            // Don't log if logging wasn't enabled at start of request as time will be wildly wrong.
+            if (logger.IsEnabled(LogLevel.Information))
+            {
+                _actionExecuted(logger, action.DisplayName, timeSpan.TotalMilliseconds, null);
+            }
+        }
+
+        public static void NoActionsMatched(this ILogger logger, IDictionary<string, object> routeValueDictionary)
+        {
+            if (logger.IsEnabled(LogLevel.Debug))
+            {
+                string[] routeValues = null;
+                if (routeValueDictionary != null)
+                {
+                    routeValues = routeValueDictionary
+                        .Select(pair => pair.Key + "=" + Convert.ToString(pair.Value))
+                        .ToArray();
+                }
+                _noActionsMatched(logger, routeValues, null);
+            }
+        }
+
+        public static void ChallengeResultExecuting(this ILogger logger, IList<string> schemes)
+        {
+            if (logger.IsEnabled(LogLevel.Information))
+            {
+                _challengeResultExecuting(logger, schemes.ToArray(), null);
+            }
+        }
+
+        public static void ContentResultExecuting(this ILogger logger, string contentType)
+        {
+            _contentResultExecuting(logger, contentType, null);
+        }
+
+        public static void BeforeExecutingActionResult(this ILogger logger, IActionResult actionResult)
+        {
+            _beforeExecutingActionResult(logger, actionResult.GetType(), null);
+        }
+
+        public static void AfterExecutingActionResult(this ILogger logger, IActionResult actionResult)
+        {
+            _afterExecutingActionResult(logger, actionResult.GetType(), null);
+        }
+
+        public static void ActionMethodExecuting(this ILogger logger, ControllerContext context, object[] arguments)
+        {
+            if (logger.IsEnabled(LogLevel.Information))
+            {
+                var actionName = context.ActionDescriptor.DisplayName;
+
+                var validationState = context.ModelState.ValidationState;
+
+                string[] convertedArguments;
+                if (arguments == null)
+                {
+                    _actionMethodExecuting(logger, actionName, validationState, null);
+                }
+                else
+                {
+                    convertedArguments = new string[arguments.Length];
+                    for (var i = 0; i < arguments.Length; i++)
+                    {
+                        convertedArguments[i] = Convert.ToString(arguments[i]);
+                    }
+
+                    _actionMethodExecutingWithArguments(logger, actionName, convertedArguments, validationState, null);
+                }
+            }
+        }
+
+        public static void ActionMethodExecuted(this ILogger logger, ControllerContext context, IActionResult result, TimeSpan timeSpan)
+        {
+            if (logger.IsEnabled(LogLevel.Information))
+            {
+                var actionName = context.ActionDescriptor.DisplayName;
+                _actionMethodExecuted(logger, actionName, Convert.ToString(result), timeSpan.TotalMilliseconds, null);
+            }
+        }
+
+        public static void AmbiguousActions(this ILogger logger, string actionNames)
+        {
+            _ambiguousActions(logger, actionNames, null);
+        }
+
+        public static void ConstraintMismatch(
+            this ILogger logger,
+            string actionName,
+            string actionId,
+            IActionConstraint actionConstraint)
+        {
+            _constraintMismatch(logger, actionName, actionId, actionConstraint, null);
+        }
+
+        public static void ExecutingFileResult(this ILogger logger, FileResult fileResult)
+        {
+            _executingFileResultWithNoFileName(logger, fileResult, fileResult.FileDownloadName, null);
+        }
+
+        public static void ExecutingFileResult(this ILogger logger, FileResult fileResult, string fileName)
+        {
+            _executingFileResult(logger, fileResult, fileName, fileResult.FileDownloadName, null);
+        }
+
+        public static void NotEnabledForRangeProcessing(this ILogger logger)
+        {
+            _notEnabledForRangeProcessing(logger, null);
+        }
+
+        public static void WritingRangeToBody(this ILogger logger)
+        {
+            _writingRangeToBody(logger, null);
+        }
+
+        public static void AuthorizationFailure(
+            this ILogger logger,
+            IFilterMetadata filter)
+        {
+            _authorizationFailure(logger, filter, null);
+        }
+
+        public static void ResourceFilterShortCircuited(
+            this ILogger logger,
+            IFilterMetadata filter)
+        {
+            _resourceFilterShortCircuit(logger, filter, null);
+        }
+
+        public static void ResultFilterShortCircuited(
+            this ILogger logger,
+            IFilterMetadata filter)
+        {
+            _resultFilterShortCircuit(logger, filter, null);
+        }
+
+        public static void ExceptionFilterShortCircuited(
+            this ILogger logger,
+            IFilterMetadata filter)
+        {
+            _exceptionFilterShortCircuit(logger, filter, null);
+        }
+
+        public static void ActionFilterShortCircuited(
+            this ILogger logger,
+            IFilterMetadata filter)
+        {
+            _actionFilterShortCircuit(logger, filter, null);
+        }
+
+        public static void ForbidResultExecuting(this ILogger logger, IList<string> authenticationSchemes)
+        {
+            if (logger.IsEnabled(LogLevel.Information))
+            {
+                _forbidResultExecuting(logger, authenticationSchemes.ToArray(), null);
+            }
+        }
+
+        public static void SignInResultExecuting(this ILogger logger, string authenticationScheme, ClaimsPrincipal principal)
+        {
+            _signInResultExecuting(logger, authenticationScheme, principal, null);
+        }
+
+        public static void SignOutResultExecuting(this ILogger logger, IList<string> authenticationSchemes)
+        {
+            if (logger.IsEnabled(LogLevel.Information))
+            {
+                _signOutResultExecuting(logger, authenticationSchemes.ToArray(), null);
+            }
+        }
+
+        public static void HttpStatusCodeResultExecuting(this ILogger logger, int statusCode)
+        {
+            _httpStatusCodeResultExecuting(logger, statusCode, null);
+        }
+
+        public static void LocalRedirectResultExecuting(this ILogger logger, string destination)
+        {
+            _localRedirectResultExecuting(logger, destination, null);
+        }
+
+        public static void ObjectResultExecuting(this ILogger logger, object value)
+        {
+            if (logger.IsEnabled(LogLevel.Information))
+            {
+                var type = value == null ? "null" : value.GetType().FullName;
+                _objectResultExecuting(logger, type, null);
+            }
+        }
+
+        public static void NoFormatter(
+            this ILogger logger,
+            OutputFormatterCanWriteContext formatterContext)
+        {
+            if (logger.IsEnabled(LogLevel.Warning))
+            {
+                _noFormatter(logger, Convert.ToString(formatterContext.ContentType), null);
+            }
+        }
+
+        public static void FormatterSelected(
+            this ILogger logger,
+            IOutputFormatter outputFormatter,
+            OutputFormatterCanWriteContext context)
+        {
+            if (logger.IsEnabled(LogLevel.Debug))
+            {
+                var contentType = Convert.ToString(context.ContentType);
+                _formatterSelected(logger, outputFormatter, contentType, null);
+            }
+        }
+
+        public static void SkippedContentNegotiation(this ILogger logger, string contentType)
+        {
+            _skippedContentNegotiation(logger, contentType, null);
+        }
+
+        public static void NoAcceptForNegotiation(this ILogger logger)
+        {
+            _noAcceptForNegotiation(logger, null);
+        }
+
+        public static void NoFormatterFromNegotiation(this ILogger logger, IList<MediaTypeSegmentWithQuality> acceptTypes)
+        {
+            _noFormatterFromNegotiation(logger, acceptTypes, null);
+        }
+
+        public static void InputFormatterSelected(
+           this ILogger logger,
+           IInputFormatter inputFormatter,
+           InputFormatterContext formatterContext)
+        {
+            if (logger.IsEnabled(LogLevel.Debug))
+            {
+                var contentType = formatterContext.HttpContext.Request.ContentType;
+                _inputFormatterSelected(logger, inputFormatter, contentType, null);
+            }
+        }
+
+        public static void InputFormatterRejected(
+            this ILogger logger,
+            IInputFormatter inputFormatter,
+            InputFormatterContext formatterContext)
+        {
+            if (logger.IsEnabled(LogLevel.Debug))
+            {
+                var contentType = formatterContext.HttpContext.Request.ContentType;
+                _inputFormatterRejected(logger, inputFormatter, contentType, null);
+            }
+        }
+
+        public static void NoInputFormatterSelected(
+            this ILogger logger,
+            InputFormatterContext formatterContext)
+        {
+            if (logger.IsEnabled(LogLevel.Debug))
+            {
+                var contentType = formatterContext.HttpContext.Request.ContentType;
+                _noInputFormatterSelected(logger, contentType, null);
+                if (formatterContext.HttpContext.Request.HasFormContentType)
+                {
+                    var modelType = formatterContext.ModelType.FullName;
+                    var modelName = formatterContext.ModelName;
+                    _removeFromBodyAttribute(logger, modelName, modelType, null);
+                }
+            }
+        }
+
+        public static void RedirectResultExecuting(this ILogger logger, string destination)
+        {
+            _redirectResultExecuting(logger, destination, null);
+        }
+
+        public static void RedirectToActionResultExecuting(this ILogger logger, string destination)
+        {
+            _redirectToActionResultExecuting(logger, destination, null);
+        }
+
+        public static void RedirectToRouteResultExecuting(this ILogger logger, string destination, string routeName)
+        {
+            _redirectToRouteResultExecuting(logger, destination, routeName, null);
+        }
+
+        public static void RedirectToPageResultExecuting(this ILogger logger, string page)
+            => _redirectToPageResultExecuting(logger, page, null);
+
+        public static void FeatureNotFound(this ILogger logger)
+        {
+            _featureNotFound(logger, null);
+        }
+
+        public static void FeatureIsReadOnly(this ILogger logger)
+        {
+            _featureIsReadOnly(logger, null);
+        }
+
+        public static void MaxRequestBodySizeSet(this ILogger logger, string requestSize)
+        {
+            _maxRequestBodySizeSet(logger, requestSize, null);
+        }
+
+        public static void RequestBodySizeLimitDisabled(this ILogger logger)
+        {
+            _requestBodySizeLimitDisabled(logger, null);
+        }
+
+        public static void CannotApplyRequestFormLimits(this ILogger logger)
+        {
+            _cannotApplyRequestFormLimits(logger, null);
+        }
+
+        public static void AppliedRequestFormLimits(this ILogger logger)
+        {
+            _appliedRequestFormLimits(logger, null);
+        }
+
+        public static void NotMostEffectiveFilter(this ILogger logger, Type overridenFilter, Type overridingFilter, Type policyType)
+        {
+            _notMostEffectiveFilter(logger, overridenFilter, overridingFilter, policyType, null);
+        }
+
+        public static void UnsupportedFormatFilterContentType(this ILogger logger, string format)
+        {
+            _unsupportedFormatFilterContentType(logger, format, null);
+        }
+
+        public static void ActionDoesNotSupportFormatFilterContentType(
+            this ILogger logger,
+            string format,
+            MediaTypeCollection supportedMediaTypes)
+        {
+            _actionDoesNotSupportFormatFilterContentType(logger, format, supportedMediaTypes, null);
+        }
+
+        public static void CannotApplyFormatFilterContentType(this ILogger logger, string format)
+        {
+            _cannotApplyFormatFilterContentType(logger, format, null);
+        }
+
+        public static void ActionDoesNotExplicitlySpecifyContentTypes(this ILogger logger)
+        {
+            _actionDoesNotExplicitlySpecifyContentTypes(logger, null);
+        }
+
+        public static void ModelStateInvalidFilterExecuting(this ILogger logger) => _modelStateInvalidFilterExecuting(logger, null);
+
+        public static void InferredParameterBindingSource(
+            this ILogger logger,
+            ParameterModel parameterModel,
+            BindingSource bindingSource)
+        {
+            if (logger.IsEnabled(LogLevel.Debug))
+            {
+                _inferredParameterSource(logger, parameterModel.Action.ActionMethod, parameterModel.ParameterName, bindingSource.DisplayName, null);
+            }
+        }
+
+        public static void IfMatchPreconditionFailed(this ILogger logger, EntityTagHeaderValue etag)
+        {
+            _ifMatchPreconditionFailed(logger, etag, null);
+        }
+
+        public static void IfUnmodifiedSincePreconditionFailed(
+            this ILogger logger,
+            DateTimeOffset? lastModified,
+            DateTimeOffset? ifUnmodifiedSinceDate)
+        {
+            _ifUnmodifiedSincePreconditionFailed(logger, lastModified, ifUnmodifiedSinceDate, null);
+        }
+
+        public static void IfRangeLastModifiedPreconditionFailed(
+            this ILogger logger,
+            DateTimeOffset? lastModified,
+            DateTimeOffset? ifRangeLastModifiedDate)
+        {
+            _ifRangeLastModifiedPreconditionFailed(logger, lastModified, ifRangeLastModifiedDate, null);
+        }
+
+        public static void IfRangeETagPreconditionFailed(
+            this ILogger logger,
+            EntityTagHeaderValue currentETag,
+            EntityTagHeaderValue ifRangeTag)
+        {
+            _ifRangeETagPreconditionFailed(logger, currentETag, ifRangeTag, null);
+        }
+
+        public static void RegisteredModelBinderProviders(this ILogger logger, IModelBinderProvider[] providers)
+        {
+            _registeredModelBinderProviders(logger, providers, null);
+        }
+
+        public static void FoundNoValueInRequest(this ILogger logger, ModelBindingContext bindingContext)
+        {
+            if (!logger.IsEnabled(LogLevel.Debug))
+            {
+                return;
+            }
+
+            var modelMetadata = bindingContext.ModelMetadata;
+            switch (modelMetadata.MetadataKind)
+            {
+                case ModelMetadataKind.Parameter:
+                    _foundNoValueForParameterInRequest(
+                        logger,
+                        bindingContext.ModelName,
+                        modelMetadata.ParameterName,
+                        bindingContext.ModelType,
+                        null);
+                    break;
+                case ModelMetadataKind.Property:
+                    _foundNoValueForPropertyInRequest(
+                        logger,
+                        bindingContext.ModelName,
+                        modelMetadata.ContainerType,
+                        modelMetadata.PropertyName,
+                        bindingContext.ModelType,
+                        null);
+                    break;
+                case ModelMetadataKind.Type:
+                    _foundNoValueInRequest(
+                        logger,
+                        bindingContext.ModelName,
+                        bindingContext.ModelType,
+                        null);
+                    break;
+            }
+        }
+
+        public static void NoPublicSettableProperties(this ILogger logger, ModelBindingContext bindingContext)
+        {
+            _noPublicSettableProperties(logger, bindingContext.ModelName, bindingContext.ModelType, null);
+        }
+
+        public static void CannotBindToComplexType(this ILogger logger, ModelBindingContext bindingContext)
+        {
+            _cannotBindToComplexType(logger, bindingContext.ModelType, null);
+        }
+
+        public static void CannotBindToFilesCollectionDueToUnsupportedContentType(this ILogger logger, ModelBindingContext bindingContext)
+        {
+            _cannotBindToFilesCollectionDueToUnsupportedContentType(logger, bindingContext.ModelName, bindingContext.ModelType, null);
+        }
+
+        public static void CannotCreateHeaderModelBinderCompatVersion_2_0(this ILogger logger, Type modelType)
+        {
+            _cannotCreateHeaderModelBinderCompatVersion_2_0(logger, modelType, null);
+        }
+
+        public static void CannotCreateHeaderModelBinder(this ILogger logger, Type modelType)
+        {
+            _cannotCreateHeaderModelBinder(logger, modelType, null);
+        }
+
+        public static void NoFilesFoundInRequest(this ILogger logger)
+        {
+            _noFilesFoundInRequest(logger, null);
+        }
+
+        public static void AttemptingToBindModel(this ILogger logger, ModelBindingContext bindingContext)
+        {
+            if (!logger.IsEnabled(LogLevel.Debug))
+            {
+                return;
+            }
+
+            var modelMetadata = bindingContext.ModelMetadata;
+            switch (modelMetadata.MetadataKind)
+            {
+                case ModelMetadataKind.Parameter:
+                    _attemptingToBindParameterModel(
+                        logger,
+                        modelMetadata.ParameterName,
+                        modelMetadata.ModelType,
+                        bindingContext.ModelName,
+                        null);
+                    break;
+                case ModelMetadataKind.Property:
+                    _attemptingToBindPropertyModel(
+                        logger,
+                        modelMetadata.ContainerType,
+                        modelMetadata.PropertyName,
+                        modelMetadata.ModelType,
+                        bindingContext.ModelName,
+                        null);
+                    break;
+                case ModelMetadataKind.Type:
+                    _attemptingToBindModel(logger, bindingContext.ModelType, bindingContext.ModelName, null);
+                    break;
+            }
+        }
+
+        public static void DoneAttemptingToBindModel(this ILogger logger, ModelBindingContext bindingContext)
+        {
+            if (!logger.IsEnabled(LogLevel.Debug))
+            {
+                return;
+            }
+
+            var modelMetadata = bindingContext.ModelMetadata;
+            switch (modelMetadata.MetadataKind)
+            {
+                case ModelMetadataKind.Parameter:
+                    _doneAttemptingToBindParameterModel(
+                        logger,
+                        modelMetadata.ParameterName,
+                        modelMetadata.ModelType,
+                        null);
+                    break;
+                case ModelMetadataKind.Property:
+                    _doneAttemptingToBindPropertyModel(
+                        logger,
+                        modelMetadata.ContainerType,
+                        modelMetadata.PropertyName,
+                        modelMetadata.ModelType,
+                        null);
+                    break;
+                case ModelMetadataKind.Type:
+                    _doneAttemptingToBindModel(logger, bindingContext.ModelType, bindingContext.ModelName, null);
+                    break;
+            }
+        }
+
+        public static void AttemptingToBindParameterOrProperty(
+            this ILogger logger,
+            ParameterDescriptor parameter,
+            ModelBindingContext bindingContext)
+        {
+            if (!logger.IsEnabled(LogLevel.Debug))
+            {
+                return;
+            }
+
+            var modelMetadata = bindingContext.ModelMetadata;
+            switch (modelMetadata.MetadataKind)
+            {
+                case ModelMetadataKind.Parameter:
+                    _attemptingToBindParameter(logger, modelMetadata.ParameterName, modelMetadata.ModelType, null);
+                    break;
+                case ModelMetadataKind.Property:
+                    _attemptingToBindProperty(
+                        logger,
+                        modelMetadata.ContainerType,
+                        modelMetadata.PropertyName,
+                        modelMetadata.ModelType,
+                        null);
+                    break;
+                case ModelMetadataKind.Type:
+                    if (parameter is ControllerParameterDescriptor parameterDescriptor)
+                    {
+                        _attemptingToBindParameter(
+                            logger,
+                            parameterDescriptor.ParameterInfo.Name,
+                            modelMetadata.ModelType,
+                            null);
+                    }
+                    else
+                    {
+                        // Likely binding a page handler parameter. Due to various special cases, parameter.Name may
+                        // be empty. No way to determine actual name.
+                        _attemptingToBindParameter(logger, parameter.Name, modelMetadata.ModelType, null);
+                    }
+                    break;
+            }
+        }
+
+        public static void DoneAttemptingToBindParameterOrProperty(
+            this ILogger logger,
+            ParameterDescriptor parameter,
+            ModelBindingContext bindingContext)
+        {
+            if (!logger.IsEnabled(LogLevel.Debug))
+            {
+                return;
+            }
+
+            var modelMetadata = bindingContext.ModelMetadata;
+            switch (modelMetadata.MetadataKind)
+            {
+                case ModelMetadataKind.Parameter:
+                    _doneAttemptingToBindParameter(logger, modelMetadata.ParameterName, modelMetadata.ModelType, null);
+                    break;
+                case ModelMetadataKind.Property:
+                    _doneAttemptingToBindProperty(
+                        logger,
+                        modelMetadata.ContainerType,
+                        modelMetadata.PropertyName,
+                        modelMetadata.ModelType,
+                        null);
+                    break;
+                case ModelMetadataKind.Type:
+                    if (parameter is ControllerParameterDescriptor parameterDescriptor)
+                    {
+                        _doneAttemptingToBindParameter(
+                            logger,
+                            parameterDescriptor.ParameterInfo.Name,
+                            modelMetadata.ModelType,
+                            null);
+                    }
+                    else
+                    {
+                        // Likely binding a page handler parameter. Due to various special cases, parameter.Name may
+                        // be empty. No way to determine actual name.
+                        _doneAttemptingToBindParameter(logger, parameter.Name, modelMetadata.ModelType, null);
+                    }
+                    break;
+            }
+        }
+
+        public static void AttemptingToValidateParameterOrProperty(
+            this ILogger logger,
+            ParameterDescriptor parameter,
+            ModelBindingContext bindingContext)
+        {
+            if (!logger.IsEnabled(LogLevel.Debug))
+            {
+                return;
+            }
+
+            var modelMetadata = bindingContext.ModelMetadata;
+            switch (modelMetadata.MetadataKind)
+            {
+                case ModelMetadataKind.Parameter:
+                    _attemptingToValidateParameter(logger, modelMetadata.ParameterName, modelMetadata.ModelType, null);
+                    break;
+                case ModelMetadataKind.Property:
+                    _attemptingToValidateProperty(
+                        logger,
+                        modelMetadata.ContainerType,
+                        modelMetadata.PropertyName,
+                        modelMetadata.ModelType,
+                        null);
+                    break;
+                case ModelMetadataKind.Type:
+                    if (parameter is ControllerParameterDescriptor parameterDescriptor)
+                    {
+                        _attemptingToValidateParameter(
+                            logger,
+                            parameterDescriptor.ParameterInfo.Name,
+                            modelMetadata.ModelType,
+                            null);
+                    }
+                    else
+                    {
+                        // Likely binding a page handler parameter. Due to various special cases, parameter.Name may
+                        // be empty. No way to determine actual name. This case is less likely than for binding logging
+                        // (above). Should occur only with a legacy IModelMetadataProvider implementation.
+                        _attemptingToValidateParameter(logger, parameter.Name, modelMetadata.ModelType, null);
+                    }
+                    break;
+            }
+        }
+
+        public static void DoneAttemptingToValidateParameterOrProperty(
+            this ILogger logger,
+            ParameterDescriptor parameter,
+            ModelBindingContext bindingContext)
+        {
+            if (!logger.IsEnabled(LogLevel.Debug))
+            {
+                return;
+            }
+
+            var modelMetadata = bindingContext.ModelMetadata;
+            switch (modelMetadata.MetadataKind)
+            {
+                case ModelMetadataKind.Parameter:
+                    _doneAttemptingToValidateParameter(
+                        logger,
+                        modelMetadata.ParameterName,
+                        modelMetadata.ModelType,
+                        null);
+                    break;
+                case ModelMetadataKind.Property:
+                    _doneAttemptingToValidateProperty(
+                        logger,
+                        modelMetadata.ContainerType,
+                        modelMetadata.PropertyName,
+                        modelMetadata.ModelType,
+                        null);
+                    break;
+                case ModelMetadataKind.Type:
+                    if (parameter is ControllerParameterDescriptor parameterDescriptor)
+                    {
+                        _doneAttemptingToValidateParameter(
+                            logger,
+                            parameterDescriptor.ParameterInfo.Name,
+                            modelMetadata.ModelType,
+                            null);
+                    }
+                    else
+                    {
+                        // Likely binding a page handler parameter. Due to various special cases, parameter.Name may
+                        // be empty. No way to determine actual name. This case is less likely than for binding logging
+                        // (above). Should occur only with a legacy IModelMetadataProvider implementation.
+                        _doneAttemptingToValidateParameter(logger, parameter.Name, modelMetadata.ModelType, null);
+                    }
+                    break;
+            }
+        }
+
+        public static void NoNonIndexBasedFormatFoundForCollection(this ILogger logger, ModelBindingContext bindingContext)
+        {
+            var modelName = bindingContext.ModelName;
+            _noNonIndexBasedFormatFoundForCollection(logger, modelName, modelName, null);
+        }
+
+        public static void AttemptingToBindCollectionUsingIndices(this ILogger logger, ModelBindingContext bindingContext)
+        {
+            if (!logger.IsEnabled(LogLevel.Debug))
+            {
+                return;
+            }
+
+            var modelName = bindingContext.ModelName;
+
+            var enumerableType = ClosedGenericMatcher.ExtractGenericInterface(bindingContext.ModelType, typeof(IEnumerable<>));
+            if (enumerableType != null)
+            {
+                var elementType = enumerableType.GenericTypeArguments[0];
+                if (elementType.IsGenericType && elementType.GetGenericTypeDefinition().GetTypeInfo() == typeof(KeyValuePair<,>).GetTypeInfo())
+                {
+                    _attemptingToBindCollectionOfKeyValuePair(logger, modelName, modelName, modelName, modelName, modelName, modelName, null);
+                    return;
+                }
+            }
+
+            _attemptingToBindCollectionUsingIndices(logger, modelName, modelName, modelName, modelName, modelName, modelName, null);
+        }
+
+        public static void NoKeyValueFormatForDictionaryModelBinder(this ILogger logger, ModelBindingContext bindingContext)
+        {
+            _noKeyValueFormatForDictionaryModelBinder(
+                logger,
+                bindingContext.ModelName,
+                bindingContext.ModelName,
+                bindingContext.ModelName,
+                null);
+        }
+
+        private static void LogFilterExecutionPlan(
+            ILogger logger,
+            string filterType,
+            IEnumerable<IFilterMetadata> filters)
+        {
+            var filterList = _noFilters;
+            if (filters.Any())
+            {
+                filterList = GetFilterList(filters);
+            }
+
+            _logFilterExecutionPlan(logger, filterType, filterList, null);
+        }
+
+        private static string[] GetFilterList(IEnumerable<IFilterMetadata> filters)
+        {
+            var filterList = new List<string>();
+            foreach (var filter in filters)
+            {
+                if (filter is IOrderedFilter orderedFilter)
+                {
+                    filterList.Add($"{filter.GetType()} (Order: {orderedFilter.Order})");
+                }
+                else
+                {
+                    filterList.Add(filter.GetType().ToString());
+                }
+            }
+            return filterList.ToArray();
+        }
+
+        private class ActionLogScope : IReadOnlyList<KeyValuePair<string, object>>
+        {
+            private readonly ActionDescriptor _action;
+
+            public ActionLogScope(ActionDescriptor action)
+            {
+                if (action == null)
+                {
+                    throw new ArgumentNullException(nameof(action));
+                }
+
+                _action = action;
+            }
+
+            public KeyValuePair<string, object> this[int index]
+            {
+                get
+                {
+                    if (index == 0)
+                    {
+                        return new KeyValuePair<string, object>("ActionId", _action.Id);
+                    }
+                    else if (index == 1)
+                    {
+                        return new KeyValuePair<string, object>("ActionName", _action.DisplayName);
+                    }
+                    throw new IndexOutOfRangeException(nameof(index));
+                }
+            }
+
+            public int Count => 2;
+
+            public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
+            {
+                for (var i = 0; i < Count; ++i)
+                {
+                    yield return this[i];
+                }
+            }
+
+            public override string ToString()
+            {
+                // We don't include the _action.Id here because it's just an opaque guid, and if
+                // you have text logging, you can already use the requestId for correlation.
+                return _action.DisplayName;
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                return GetEnumerator();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreMvcOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreMvcOptionsSetup.cs
new file mode 100644
index 0000000000..f03e2ca661
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreMvcOptionsSetup.cs
@@ -0,0 +1,110 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// Sets up default options for <see cref="MvcOptions"/>.
+    /// </summary>
+    public class MvcCoreMvcOptionsSetup : IConfigureOptions<MvcOptions>
+    {
+        private readonly IHttpRequestStreamReaderFactory _readerFactory;
+        private readonly ILoggerFactory _loggerFactory;
+
+        // Used in tests
+        public MvcCoreMvcOptionsSetup(IHttpRequestStreamReaderFactory readerFactory)
+            : this(readerFactory, NullLoggerFactory.Instance)
+        {
+        }
+
+        public MvcCoreMvcOptionsSetup(IHttpRequestStreamReaderFactory readerFactory, ILoggerFactory loggerFactory)
+        {
+            if (readerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(readerFactory));
+            }
+
+            _readerFactory = readerFactory;
+            _loggerFactory = loggerFactory;
+        }
+
+        public void Configure(MvcOptions options)
+        {
+            // Set up ModelBinding
+            options.ModelBinderProviders.Add(new BinderTypeModelBinderProvider());
+            options.ModelBinderProviders.Add(new ServicesModelBinderProvider());
+            options.ModelBinderProviders.Add(new BodyModelBinderProvider(options.InputFormatters, _readerFactory, _loggerFactory, options));
+            options.ModelBinderProviders.Add(new HeaderModelBinderProvider());
+            options.ModelBinderProviders.Add(new FloatingPointTypeModelBinderProvider());
+            options.ModelBinderProviders.Add(new EnumTypeModelBinderProvider(options));
+            options.ModelBinderProviders.Add(new SimpleTypeModelBinderProvider());
+            options.ModelBinderProviders.Add(new CancellationTokenModelBinderProvider());
+            options.ModelBinderProviders.Add(new ByteArrayModelBinderProvider());
+            options.ModelBinderProviders.Add(new FormFileModelBinderProvider());
+            options.ModelBinderProviders.Add(new FormCollectionModelBinderProvider());
+            options.ModelBinderProviders.Add(new KeyValuePairModelBinderProvider());
+            options.ModelBinderProviders.Add(new DictionaryModelBinderProvider());
+            options.ModelBinderProviders.Add(new ArrayModelBinderProvider());
+            options.ModelBinderProviders.Add(new CollectionModelBinderProvider());
+            options.ModelBinderProviders.Add(new ComplexTypeModelBinderProvider());
+
+            // Set up filters
+            options.Filters.Add(new UnsupportedContentTypeFilter());
+
+            // Set up default output formatters.
+            options.OutputFormatters.Add(new HttpNoContentOutputFormatter());
+            options.OutputFormatters.Add(new StringOutputFormatter());
+            options.OutputFormatters.Add(new StreamOutputFormatter());
+
+            // Set up ValueProviders
+            options.ValueProviderFactories.Add(new FormValueProviderFactory());
+            options.ValueProviderFactories.Add(new RouteValueProviderFactory());
+            options.ValueProviderFactories.Add(new QueryStringValueProviderFactory());
+            options.ValueProviderFactories.Add(new JQueryFormValueProviderFactory());
+
+            // Set up metadata providers
+            ConfigureAdditionalModelMetadataDetailsProvider(options.ModelMetadataDetailsProviders);
+
+            // Set up validators
+            options.ModelValidatorProviders.Add(new DefaultModelValidatorProvider());
+        }
+
+        internal static void ConfigureAdditionalModelMetadataDetailsProvider(IList<IMetadataDetailsProvider> modelMetadataDetailsProviders)
+        {
+            // Don't bind the Type class by default as it's expensive. A user can override this behavior
+            // by altering the collection of providers.
+            modelMetadataDetailsProviders.Add(new ExcludeBindingMetadataProvider(typeof(Type)));
+
+            modelMetadataDetailsProviders.Add(new DefaultBindingMetadataProvider());
+            modelMetadataDetailsProviders.Add(new DefaultValidationMetadataProvider());
+
+            modelMetadataDetailsProviders.Add(new BindingSourceMetadataProvider(typeof(CancellationToken), BindingSource.Special));
+            modelMetadataDetailsProviders.Add(new BindingSourceMetadataProvider(typeof(IFormFile), BindingSource.FormFile));
+            modelMetadataDetailsProviders.Add(new BindingSourceMetadataProvider(typeof(IFormCollection), BindingSource.FormFile));
+            modelMetadataDetailsProviders.Add(new BindingSourceMetadataProvider(typeof(IFormFileCollection), BindingSource.FormFile));
+
+            // Add types to be excluded from Validation
+            modelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider(typeof(Type)));
+            modelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider(typeof(Uri)));
+            modelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider(typeof(CancellationToken)));
+            modelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider(typeof(IFormFile)));
+            modelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider(typeof(IFormCollection)));
+            modelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider(typeof(IFormFileCollection)));
+            modelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider(typeof(Stream)));
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreRouteOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreRouteOptionsSetup.cs
new file mode 100644
index 0000000000..6ed400f506
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreRouteOptionsSetup.cs
@@ -0,0 +1,30 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// Sets up MVC default options for <see cref="RouteOptions"/>.
+    /// </summary>
+    public class MvcCoreRouteOptionsSetup : IConfigureOptions<RouteOptions>
+    {
+        /// <summary>
+        /// Configures the <see cref="RouteOptions"/>.
+        /// </summary>
+        /// <param name="options">The <see cref="RouteOptions"/>.</param>
+        public void Configure(RouteOptions options)
+        {
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            options.ConstraintMap.Add("exists", typeof(KnownRouteValueConstraint));
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcMarkerService.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcMarkerService.cs
new file mode 100644
index 0000000000..c2eb80ada2
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcMarkerService.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// A marker class used to determine if all the MVC services were added
+    /// to the <see cref="IServiceCollection"/> before MVC is configured.
+    /// </summary>
+    public class MvcMarkerService
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcRouteHandler.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcRouteHandler.cs
new file mode 100644
index 0000000000..21903703fa
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcRouteHandler.cs
@@ -0,0 +1,104 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class MvcRouteHandler : IRouter
+    {
+        private readonly IActionContextAccessor _actionContextAccessor;
+        private readonly IActionInvokerFactory _actionInvokerFactory;
+        private readonly IActionSelector _actionSelector;
+        private readonly ILogger _logger;
+        private readonly DiagnosticSource _diagnosticSource;
+
+        public MvcRouteHandler(
+            IActionInvokerFactory actionInvokerFactory,
+            IActionSelector actionSelector,
+            DiagnosticSource diagnosticSource,
+            ILoggerFactory loggerFactory)
+            : this(actionInvokerFactory, actionSelector, diagnosticSource, loggerFactory, actionContextAccessor: null)
+        {
+        }
+
+        public MvcRouteHandler(
+            IActionInvokerFactory actionInvokerFactory,
+            IActionSelector actionSelector,
+            DiagnosticSource diagnosticSource,
+            ILoggerFactory loggerFactory,
+            IActionContextAccessor actionContextAccessor)
+        {
+            // The IActionContextAccessor is optional. We want to avoid the overhead of using CallContext
+            // if possible.
+            _actionContextAccessor = actionContextAccessor;
+
+            _actionInvokerFactory = actionInvokerFactory;
+            _actionSelector = actionSelector;
+            _diagnosticSource = diagnosticSource;
+            _logger = loggerFactory.CreateLogger<MvcRouteHandler>();
+        }
+
+        public VirtualPathData GetVirtualPath(VirtualPathContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            // We return null here because we're not responsible for generating the url, the route is.
+            return null;
+        }
+
+        public Task RouteAsync(RouteContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var candidates = _actionSelector.SelectCandidates(context);
+            if (candidates == null || candidates.Count == 0)
+            {
+                _logger.NoActionsMatched(context.RouteData.Values);
+                return Task.CompletedTask;
+            }
+
+            var actionDescriptor = _actionSelector.SelectBestCandidate(context, candidates);
+            if (actionDescriptor == null)
+            {
+                _logger.NoActionsMatched(context.RouteData.Values);
+                return Task.CompletedTask;
+            }
+
+            context.Handler = (c) =>
+            {
+                var routeData = c.GetRouteData();
+
+                var actionContext = new ActionContext(context.HttpContext, routeData, actionDescriptor);
+                if (_actionContextAccessor != null)
+                {
+                    _actionContextAccessor.ActionContext = actionContext;
+                }
+
+                var invoker = _actionInvokerFactory.CreateInvoker(actionContext);
+                if (invoker == null)
+                {
+                    throw new InvalidOperationException(
+                        Resources.FormatActionInvokerFactory_CouldNotCreateInvoker(
+                            actionDescriptor.DisplayName));
+                }
+
+                return invoker.InvokeAsync();
+            };
+
+            return Task.CompletedTask;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/NoOpBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/NoOpBinder.cs
new file mode 100644
index 0000000000..0fd7146fc3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/NoOpBinder.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class NoOpBinder : IModelBinder
+    {
+        public static readonly IModelBinder Instance = new NoOpBinder();
+
+        public Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/NonDisposableStream.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/NonDisposableStream.cs
new file mode 100644
index 0000000000..9cc9a46ea4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/NonDisposableStream.cs
@@ -0,0 +1,186 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// Stream that delegates to an inner stream.
+    /// This Stream is present so that the inner stream is not closed
+    /// even when Close() or Dispose() is called.
+    /// </summary>
+    public class NonDisposableStream : Stream
+    {
+        private readonly Stream _innerStream;
+
+        /// <summary>
+        /// Initializes a new <see cref="NonDisposableStream"/>.
+        /// </summary>
+        /// <param name="innerStream">The stream which should not be closed or flushed.</param>
+        public NonDisposableStream(Stream innerStream)
+        {
+            if (innerStream == null)
+            {
+                throw new ArgumentNullException(nameof(innerStream));
+            }
+
+            _innerStream = innerStream;
+        }
+
+        /// <summary>
+        /// The inner stream this object delegates to.
+        /// </summary>
+        protected Stream InnerStream => _innerStream;
+
+        /// <inheritdoc />
+        public override bool CanRead => _innerStream.CanRead;
+
+        /// <inheritdoc />
+        public override bool CanSeek => _innerStream.CanSeek;
+
+        /// <inheritdoc />
+        public override bool CanWrite => _innerStream.CanWrite;
+
+        /// <inheritdoc />
+        public override long Length => _innerStream.Length;
+        /// <inheritdoc />
+        public override long Position
+        {
+            get { return _innerStream.Position; }
+            set { _innerStream.Position = value; }
+        }
+
+        /// <inheritdoc />
+        public override int ReadTimeout
+        {
+            get { return _innerStream.ReadTimeout; }
+            set { _innerStream.ReadTimeout = value; }
+        }
+
+        /// <inheritdoc />
+        public override bool CanTimeout => _innerStream.CanTimeout;
+
+        /// <inheritdoc />
+        public override int WriteTimeout
+        {
+            get { return _innerStream.WriteTimeout; }
+            set { _innerStream.WriteTimeout = value; }
+        }
+
+        /// <inheritdoc />
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            return _innerStream.Seek(offset, origin);
+        }
+
+        /// <inheritdoc />
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            return _innerStream.Read(buffer, offset, count);
+        }
+
+        /// <inheritdoc />
+        public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+        {
+            return _innerStream.ReadAsync(buffer, offset, count, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override IAsyncResult BeginRead(
+            byte[] buffer,
+            int offset,
+            int count,
+            AsyncCallback callback,
+            object state)
+        {
+            return _innerStream.BeginRead(buffer, offset, count, callback, state);
+        }
+
+        /// <inheritdoc />
+        public override int EndRead(IAsyncResult asyncResult)
+        {
+            return _innerStream.EndRead(asyncResult);
+        }
+
+        /// <inheritdoc />
+        public override IAsyncResult BeginWrite(
+            byte[] buffer,
+            int offset,
+            int count,
+            AsyncCallback callback,
+            object state)
+        {
+            return _innerStream.BeginWrite(buffer, offset, count, callback, state);
+        }
+
+        /// <inheritdoc />
+        public override void EndWrite(IAsyncResult asyncResult)
+        {
+            _innerStream.EndWrite(asyncResult);
+        }
+
+        /// <inheritdoc />
+        public override void Close()
+        {
+        }
+
+        /// <inheritdoc />
+        public override int ReadByte()
+        {
+            return _innerStream.ReadByte();
+        }
+
+        /// <inheritdoc />
+        public override void Flush()
+        {
+            // Do nothing, we want to explicitly avoid flush because it turns on Chunked encoding.
+        }
+
+        /// <inheritdoc />
+        public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken)
+        {
+            return _innerStream.CopyToAsync(destination, bufferSize, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override Task FlushAsync(CancellationToken cancellationToken)
+        {
+            return _innerStream.FlushAsync(cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void SetLength(long value)
+        {
+            _innerStream.SetLength(value);
+        }
+
+        /// <inheritdoc />
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            _innerStream.Write(buffer, offset, count);
+        }
+
+        /// <inheritdoc />
+        public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+        {
+            return _innerStream.WriteAsync(buffer, offset, count, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public override void WriteByte(byte value)
+        {
+            _innerStream.WriteByte(value);
+        }
+
+        /// <inheritdoc />
+        protected override void Dispose(bool disposing)
+        {
+            // No-op. In CoreCLR this is equivalent to Close.
+            // Given that we don't own the underlying stream, we never want to do anything interesting here.
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/NormalizedRouteValue.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/NormalizedRouteValue.cs
new file mode 100644
index 0000000000..2da629c22e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/NormalizedRouteValue.cs
@@ -0,0 +1,57 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public static class NormalizedRouteValue
+    {
+        /// <summary>
+        /// Gets the case-normalized route value for the specified route <paramref name="key"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ActionContext"/>.</param>
+        /// <param name="key">The route key to lookup.</param>
+        /// <returns>The value corresponding to the key.</returns>
+        /// <remarks>
+        /// The casing of a route value in <see cref="ActionContext.RouteData"/> is determined by the client.
+        /// This making constructing paths for view locations in a case sensitive file system unreliable. Using the
+        /// <see cref="Abstractions.ActionDescriptor.RouteValues"/> to get route values
+        /// produces consistently cased results.
+        /// </remarks>
+        public static string GetNormalizedRouteValue(ActionContext context, string key)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            if (!context.RouteData.Values.TryGetValue(key, out var routeValue))
+            {
+                return null;
+            }
+
+            var actionDescriptor = context.ActionDescriptor;
+            string normalizedValue = null;
+
+            if (actionDescriptor.RouteValues.TryGetValue(key, out var value) &&
+                !string.IsNullOrEmpty(value))
+            {
+                normalizedValue = value;
+            }
+
+            var stringRouteValue = routeValue?.ToString();
+            if (string.Equals(normalizedValue, stringRouteValue, StringComparison.OrdinalIgnoreCase))
+            {
+                return normalizedValue;
+            }
+
+            return stringRouteValue;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ParameterDefaultValues.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ParameterDefaultValues.cs
new file mode 100644
index 0000000000..0d4a641e5f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ParameterDefaultValues.cs
@@ -0,0 +1,46 @@
+// 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.
+
+using System;
+using System.ComponentModel;
+using System.Reflection;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public static class ParameterDefaultValues
+    {
+        public static object[] GetParameterDefaultValues(MethodInfo methodInfo)
+        {
+            if (methodInfo == null)
+            {
+                throw new ArgumentNullException(nameof(methodInfo));
+            }
+
+            var parameters = methodInfo.GetParameters();
+            var values = new object[parameters.Length];
+
+            for (var i = 0; i < parameters.Length; i++)
+            {
+                values[i] = GetParameterDefaultValue(parameters[i]);
+            }
+
+            return values;
+        }
+
+        private static object GetParameterDefaultValue(ParameterInfo parameterInfo)
+        {
+            if (!ParameterDefaultValue.TryGetDefaultValue(parameterInfo, out var defaultValue))
+            {
+                var defaultValueAttribute = parameterInfo.GetCustomAttribute<DefaultValueAttribute>(inherit: false);
+                defaultValue = defaultValueAttribute?.Value;
+
+                if (defaultValue == null && parameterInfo.ParameterType.IsValueType)
+                {
+                    defaultValue = Activator.CreateInstance(parameterInfo.ParameterType);
+                }
+            }
+            return defaultValue;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/PlaceholderBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/PlaceholderBinder.cs
new file mode 100644
index 0000000000..0e6bdc07a1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/PlaceholderBinder.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    // Used as a placeholder to break cycles while building a tree of model binders in ModelBinderFactory.
+    //
+    // When a cycle is detected by a call to Create(...), we create an instance of this class and return it
+    // to break the cycle. Later when the 'real' binder is created we set Inner to point to that.
+    public class PlaceholderBinder : IModelBinder
+    {
+        public IModelBinder Inner { get; set; }
+
+        public Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            return Inner.BindModelAsync(bindingContext);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/PrefixContainer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/PrefixContainer.cs
new file mode 100644
index 0000000000..ade8cc8102
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/PrefixContainer.cs
@@ -0,0 +1,281 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// This is a container for prefix values. It normalizes all the values into dotted-form and then stores
+    /// them in a sorted array. All queries for prefixes are also normalized to dotted-form, and searches
+    /// for ContainsPrefix are done with a binary search.
+    /// </summary>
+    public class PrefixContainer
+    {
+        private static readonly char[] Delimiters = new char[] { '[', '.' };
+
+        private readonly ICollection<string> _originalValues;
+        private readonly string[] _sortedValues;
+
+        public PrefixContainer(ICollection<string> values)
+        {
+            if (values == null)
+            {
+                throw new ArgumentNullException(nameof(values));
+            }
+
+            _originalValues = values;
+
+            if (_originalValues.Count == 0)
+            {
+                _sortedValues = Array.Empty<string>();
+            }
+            else
+            {
+                _sortedValues = new string[_originalValues.Count];
+                _originalValues.CopyTo(_sortedValues, 0);
+                Array.Sort(_sortedValues, StringComparer.OrdinalIgnoreCase);
+            }
+        }
+
+        public bool ContainsPrefix(string prefix)
+        {
+            if (prefix == null)
+            {
+                throw new ArgumentNullException(nameof(prefix));
+            }
+
+            if (_sortedValues.Length == 0)
+            {
+                return false;
+            }
+
+            if (prefix.Length == 0)
+            {
+                return true; // Empty prefix matches all elements.
+            }
+
+            return BinarySearch(prefix) > -1;
+        }
+
+        // Given "foo.bar", "foo.hello", "something.other", foo[abc].baz and asking for prefix "foo" will return:
+        // - "bar"/"foo.bar"
+        // - "hello"/"foo.hello"
+        // - "abc"/"foo[abc]"
+        public IDictionary<string, string> GetKeysFromPrefix(string prefix)
+        {
+            var result = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+
+            foreach (var entry in _originalValues)
+            {
+                if (entry != null)
+                {
+                    if (entry.Length == prefix.Length)
+                    {
+                        // No key in this entry
+                        continue;
+                    }
+
+                    if (prefix.Length == 0)
+                    {
+                        GetKeyFromEmptyPrefix(entry, result);
+                    }
+                    else if (entry.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
+                    {
+                        GetKeyFromNonEmptyPrefix(prefix, entry, result);
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        private static void GetKeyFromEmptyPrefix(string entry, IDictionary<string, string> results)
+        {
+            string key;
+            string fullName;
+            var delimiterPosition = entry.IndexOfAny(Delimiters, 0);
+
+            if (delimiterPosition == 0 && entry[0] == '[')
+            {
+                // Handle an entry such as "[key]".
+                var bracketPosition = entry.IndexOf(']', 1);
+                if (bracketPosition == -1)
+                {
+                    // Malformed for dictionary.
+                    return;
+                }
+
+                key = entry.Substring(1, bracketPosition - 1);
+                fullName = entry.Substring(0, bracketPosition + 1);
+            }
+            else
+            {
+                // Handle an entry such as "key", "key.property" and "key[index]".
+                key = delimiterPosition == -1 ? entry : entry.Substring(0, delimiterPosition);
+                fullName = key;
+            }
+
+            if (!results.ContainsKey(key))
+            {
+                results.Add(key, fullName);
+            }
+        }
+
+        private static void GetKeyFromNonEmptyPrefix(string prefix, string entry, IDictionary<string, string> results)
+        {
+            string key;
+            string fullName;
+            var keyPosition = prefix.Length + 1;
+
+            switch (entry[prefix.Length])
+            {
+                case '.':
+                    // Handle an entry such as "prefix.key", "prefix.key.property" and "prefix.key[index]".
+                    var delimiterPosition = entry.IndexOfAny(Delimiters, keyPosition);
+                    if (delimiterPosition == -1)
+                    {
+                        // Neither '.' nor '[' found later in the name. Use rest of the string.
+                        key = entry.Substring(keyPosition);
+                        fullName = entry;
+                    }
+                    else
+                    {
+                        key = entry.Substring(keyPosition, delimiterPosition - keyPosition);
+                        fullName = entry.Substring(0, delimiterPosition);
+                    }
+                    break;
+
+                case '[':
+                    // Handle an entry such as "prefix[key]".
+                    var bracketPosition = entry.IndexOf(']', keyPosition);
+                    if (bracketPosition == -1)
+                    {
+                        // Malformed for dictionary
+                        return;
+                    }
+
+                    key = entry.Substring(keyPosition, bracketPosition - keyPosition);
+                    fullName = entry.Substring(0, bracketPosition + 1);
+                    break;
+
+                default:
+                    // Ignore an entry such as "prefixA".
+                    return;
+            }
+
+            if (!results.ContainsKey(key))
+            {
+                results.Add(key, fullName);
+            }
+        }
+
+        // This is tightly coupled to the definition at ModelStateDictionary.StartsWithPrefix
+        private int BinarySearch(string prefix)
+        {
+            var start = 0;
+            var end = _sortedValues.Length - 1;
+
+            while (start <= end)
+            {
+                var pivot = start + ((end - start) / 2);
+                var candidate = _sortedValues[pivot];
+                var compare = string.Compare(
+                    prefix,
+                    0,
+                    candidate,
+                    0,
+                    prefix.Length,
+                    StringComparison.OrdinalIgnoreCase);
+                if (compare == 0)
+                {
+                    Debug.Assert(candidate.StartsWith(prefix, StringComparison.OrdinalIgnoreCase));
+
+                    // Okay, now we have a candidate that starts with the prefix. If the candidate is longer than
+                    // the prefix, we need to look at the next character and see if it's a delimiter.
+                    if (candidate.Length == prefix.Length)
+                    {
+                        // Exact match
+                        return pivot;
+                    }
+
+                    var c = candidate[prefix.Length];
+                    if (c == '.' || c == '[')
+                    {
+                        // Match, followed by delimiter
+                        return pivot;
+                    }
+
+                    // Okay, so the candidate has some extra text. We need to keep searching.
+                    //
+                    // Can often assume the candidate string is greater than the prefix e.g. that works for
+                    //  prefix: product
+                    //  candidate: productId
+                    // most of the time because "product", "product.id", etc. will sort earlier than "productId". But,
+                    // the assumption isn't correct if "product[0]" is also in _sortedValues because that value will
+                    // sort later than "productId".
+                    //
+                    // Fall back to brute force and cover all the cases.
+                    return LinearSearch(prefix, start, end);
+                }
+
+                if (compare > 0)
+                {
+                    start = pivot + 1;
+                }
+                else
+                {
+                    end = pivot - 1;
+                }
+            }
+
+            return ~start;
+        }
+
+        private int LinearSearch(string prefix, int start, int end)
+        {
+            for (; start <= end; start++)
+            {
+                var candidate = _sortedValues[start];
+                var compare = string.Compare(
+                    prefix,
+                    0,
+                    candidate,
+                    0,
+                    prefix.Length,
+                    StringComparison.OrdinalIgnoreCase);
+                if (compare == 0)
+                {
+                    Debug.Assert(candidate.StartsWith(prefix, StringComparison.OrdinalIgnoreCase));
+
+                    // Okay, now we have a candidate that starts with the prefix. If the candidate is longer than
+                    // the prefix, we need to look at the next character and see if it's a delimiter.
+                    if (candidate.Length == prefix.Length)
+                    {
+                        // Exact match
+                        return start;
+                    }
+
+                    var c = candidate[prefix.Length];
+                    if (c == '.' || c == '[')
+                    {
+                        // Match, followed by delimiter
+                        return start;
+                    }
+
+                    // Keep checking until we've passed all StartsWith() matches.
+                }
+
+                if (compare < 0)
+                {
+                    // Prefix is less than the candidate. No potential matches left.
+                    break;
+                }
+            }
+
+            return ~start;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/PropertyValueSetter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/PropertyValueSetter.cs
new file mode 100644
index 0000000000..a6983106da
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/PropertyValueSetter.cs
@@ -0,0 +1,72 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public static class PropertyValueSetter
+    {
+        private static readonly MethodInfo CallPropertyAddRangeOpenGenericMethod =
+            typeof(PropertyValueSetter).GetMethod(nameof(CallPropertyAddRange), BindingFlags.NonPublic | BindingFlags.Static);
+
+        public static void SetValue(
+            ModelMetadata metadata,
+            object instance,
+            object value)
+        {
+            if (!metadata.IsReadOnly)
+            {
+                // Handle settable property. Do not set the property to null if the type is a non-nullable type.
+                if (value != null || metadata.IsReferenceOrNullableType)
+                {
+                    metadata.PropertySetter(instance, value);
+                }
+
+                return;
+            }
+
+            if (metadata.ModelType.IsArray)
+            {
+                // Do not attempt to copy values into an array because an array's length is immutable. This choice
+                // is also consistent with ComplexTypeModelBinder's handling of a read-only array property.
+                return;
+            }
+
+            if (!metadata.IsCollectionType)
+            {
+                // Not a collection model.
+                return;
+            }
+
+            var target = metadata.PropertyGetter(instance);
+            if (value == null || target == null)
+            {
+                // Nothing to do when source or target is null.
+                return;
+            }
+
+            // Handle a read-only collection property.
+            var propertyAddRange = CallPropertyAddRangeOpenGenericMethod.MakeGenericMethod(
+                metadata.ElementMetadata.ModelType);
+            propertyAddRange.Invoke(obj: null, parameters: new[] { target, value });
+        }
+
+        // Called via reflection.
+        private static void CallPropertyAddRange<TElement>(object target, object source)
+        {
+            var targetCollection = (ICollection<TElement>)target;
+            var sourceCollection = source as IEnumerable<TElement>;
+            if (sourceCollection != null && !targetCollection.IsReadOnly)
+            {
+                targetCollection.Clear();
+                foreach (var item in sourceCollection)
+                {
+                    targetCollection.Add(item);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ReferenceEqualityComparer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ReferenceEqualityComparer.cs
new file mode 100644
index 0000000000..e2288a01c8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ReferenceEqualityComparer.cs
@@ -0,0 +1,34 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    internal class ReferenceEqualityComparer : IEqualityComparer<object>
+    {
+        private static readonly bool IsMono = Type.GetType("Mono.Runtime") != null;
+
+        public static ReferenceEqualityComparer Instance { get; } = new ReferenceEqualityComparer();
+
+        public new bool Equals(object x, object y)
+        {
+            return ReferenceEquals(x, y);
+        }
+
+        public int GetHashCode(object obj)
+        {
+            // RuntimeHelpers.GetHashCode sometimes crashes the runtime on Mono 4.0.4
+            // See: https://github.com/aspnet/External/issues/45
+            // The workaround here is to just not hash anything, and fall back to an equality check.
+            if (IsMono)
+            {
+                return 0;
+            }
+
+            return RuntimeHelpers.GetHashCode(obj);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/RequestFormLimitsFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/RequestFormLimitsFilter.cs
new file mode 100644
index 0000000000..c60e7e2ea2
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/RequestFormLimitsFilter.cs
@@ -0,0 +1,54 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// A filter that configures <see cref="FormOptions"/> for the current request.
+    /// </summary>
+    public class RequestFormLimitsFilter : IAuthorizationFilter, IRequestFormLimitsPolicy
+    {
+        private readonly ILogger _logger;
+
+        public RequestFormLimitsFilter(ILoggerFactory loggerFactory)
+        {
+            _logger = loggerFactory.CreateLogger<RequestFormLimitsFilter>();
+        }
+
+        public FormOptions FormOptions { get; set; }
+
+        public void OnAuthorization(AuthorizationFilterContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var effectivePolicy = context.FindEffectivePolicy<IRequestFormLimitsPolicy>();
+            if (effectivePolicy != null && effectivePolicy != this)
+            {
+                _logger.NotMostEffectiveFilter(GetType(), effectivePolicy.GetType(), typeof(IRequestFormLimitsPolicy));
+                return;
+            }
+
+            var features = context.HttpContext.Features;
+            var formFeature = features.Get<IFormFeature>();
+
+            if (formFeature == null || formFeature.Form == null)
+            {
+                // Request form has not been read yet, so set the limits
+                features.Set<IFormFeature>(new FormFeature(context.HttpContext.Request, FormOptions));
+                _logger.AppliedRequestFormLimits();
+            }
+            else
+            {
+                _logger.CannotApplyRequestFormLimits();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/RequestSizeLimitFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/RequestSizeLimitFilter.cs
new file mode 100644
index 0000000000..c5653f99a5
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/RequestSizeLimitFilter.cs
@@ -0,0 +1,66 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// A filter that sets the <see cref="IHttpMaxRequestBodySizeFeature.MaxRequestBodySize"/> 
+    /// to the specified <see cref="Bytes"/>.
+    /// </summary>
+    public class RequestSizeLimitFilter : IAuthorizationFilter, IRequestSizePolicy
+    {
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="RequestSizeLimitFilter"/>.
+        /// </summary>
+        public RequestSizeLimitFilter(ILoggerFactory loggerFactory)
+        {
+            _logger = loggerFactory.CreateLogger<RequestSizeLimitFilter>();
+        }
+
+        public long Bytes { get; set; }
+
+        /// <summary>
+        /// Sets the <see cref="IHttpMaxRequestBodySizeFeature.MaxRequestBodySize"/> to <see cref="Bytes"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="AuthorizationFilterContext"/>.</param>
+        /// <remarks>If <see cref="IHttpMaxRequestBodySizeFeature"/> is not enabled or is read-only, 
+        /// the <see cref="RequestSizeLimitAttribute"/> is not applied.</remarks>
+        public void OnAuthorization(AuthorizationFilterContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var effectivePolicy = context.FindEffectivePolicy<IRequestSizePolicy>();
+            if (effectivePolicy != null && effectivePolicy != this)
+            {
+                _logger.NotMostEffectiveFilter(GetType(), effectivePolicy.GetType(), typeof(IRequestSizePolicy));
+                return;
+            }
+
+            var maxRequestBodySizeFeature = context.HttpContext.Features.Get<IHttpMaxRequestBodySizeFeature>();
+
+            if (maxRequestBodySizeFeature == null)
+            {
+                _logger.FeatureNotFound();
+            }
+            else if (maxRequestBodySizeFeature.IsReadOnly)
+            {
+                _logger.FeatureIsReadOnly();
+            }
+            else
+            {
+                maxRequestBodySizeFeature.MaxRequestBodySize = Bytes;
+                _logger.MaxRequestBodySizeSet(Bytes.ToString());
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResourceInvoker.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResourceInvoker.cs
new file mode 100644
index 0000000000..2b73da1c0f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResourceInvoker.cs
@@ -0,0 +1,1260 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Runtime.ExceptionServices;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public abstract class ResourceInvoker
+    {
+        protected readonly DiagnosticSource _diagnosticSource;
+        protected readonly ILogger _logger;
+        protected readonly IActionResultTypeMapper _mapper;
+        protected readonly ActionContext _actionContext;
+        protected readonly IFilterMetadata[] _filters;
+        protected readonly IList<IValueProviderFactory> _valueProviderFactories;
+
+        private AuthorizationFilterContext _authorizationContext;
+        private ResourceExecutingContext _resourceExecutingContext;
+        private ResourceExecutedContext _resourceExecutedContext;
+        private ExceptionContext _exceptionContext;
+        private ResultExecutingContext _resultExecutingContext;
+        private ResultExecutedContext _resultExecutedContext;
+
+        // Do not make this readonly, it's mutable. We don't want to make a copy.
+        // https://blogs.msdn.microsoft.com/ericlippert/2008/05/14/mutating-readonly-structs/
+        protected FilterCursor _cursor;
+        protected IActionResult _result;
+        protected object _instance;
+
+        public ResourceInvoker(
+            DiagnosticSource diagnosticSource,
+            ILogger logger,
+            IActionResultTypeMapper mapper,
+            ActionContext actionContext,
+            IFilterMetadata[] filters,
+            IList<IValueProviderFactory> valueProviderFactories)
+        {
+            _diagnosticSource = diagnosticSource ?? throw new ArgumentNullException(nameof(diagnosticSource));
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            _mapper = mapper ?? throw new ArgumentNullException(nameof(mapper));
+            _actionContext = actionContext ?? throw new ArgumentNullException(nameof(actionContext));
+
+            _filters = filters ?? throw new ArgumentNullException(nameof(filters));
+            _valueProviderFactories = valueProviderFactories ?? throw new ArgumentNullException(nameof(valueProviderFactories));
+            _cursor = new FilterCursor(filters);
+        }
+
+        public virtual async Task InvokeAsync()
+        {
+            try
+            {
+                _diagnosticSource.BeforeAction(
+                    _actionContext.ActionDescriptor,
+                    _actionContext.HttpContext,
+                    _actionContext.RouteData);
+
+                using (_logger.ActionScope(_actionContext.ActionDescriptor))
+                {
+                    _logger.ExecutingAction(_actionContext.ActionDescriptor);
+
+                    _logger.AuthorizationFiltersExecutionPlan(_filters);
+                    _logger.ResourceFiltersExecutionPlan(_filters);
+                    _logger.ActionFiltersExecutionPlan(_filters);
+                    _logger.ExceptionFiltersExecutionPlan(_filters);
+                    _logger.ResultFiltersExecutionPlan(_filters);
+
+                    var stopwatch = ValueStopwatch.StartNew();
+
+                    try
+                    {
+                        await InvokeFilterPipelineAsync();
+                    }
+                    finally
+                    {
+                        ReleaseResources();
+                        _logger.ExecutedAction(_actionContext.ActionDescriptor, stopwatch.GetElapsedTime());
+                    }
+                }
+            }
+            finally
+            {
+                _diagnosticSource.AfterAction(
+                    _actionContext.ActionDescriptor,
+                    _actionContext.HttpContext,
+                    _actionContext.RouteData);
+            }
+        }
+
+        /// <summary>
+        /// In derived types, releases resources such as controller, model, or page instances created as
+        /// part of invoking the inner pipeline.
+        /// </summary>
+        protected abstract void ReleaseResources();
+
+        private async Task InvokeFilterPipelineAsync()
+        {
+            var next = State.InvokeBegin;
+
+            // The `scope` tells the `Next` method who the caller is, and what kind of state to initialize to
+            // communicate a result. The outermost scope is `Scope.Invoker` and doesn't require any type
+            // of context or result other than throwing.
+            var scope = Scope.Invoker;
+
+            // The `state` is used for internal state handling during transitions between states. In practice this
+            // means storing a filter instance in `state` and then retrieving it in the next state.
+            var state = (object)null;
+
+            // `isCompleted` will be set to true when we've reached a terminal state.
+            var isCompleted = false;
+
+            while (!isCompleted)
+            {
+                await Next(ref next, ref scope, ref state, ref isCompleted);
+            }
+        }
+
+        protected abstract Task InvokeInnerFilterAsync();
+
+        protected virtual async Task InvokeResultAsync(IActionResult result)
+        {
+            var actionContext = _actionContext;
+
+            _diagnosticSource.BeforeActionResult(actionContext, result);
+            _logger.BeforeExecutingActionResult(result);
+
+            try
+            {
+                await result.ExecuteResultAsync(actionContext);
+            }
+            finally
+            {
+                _diagnosticSource.AfterActionResult(actionContext, result);
+                _logger.AfterExecutingActionResult(result);
+            }
+        }
+
+        private Task Next(ref State next, ref Scope scope, ref object state, ref bool isCompleted)
+        {
+            switch (next)
+            {
+                case State.InvokeBegin:
+                    {
+                        goto case State.AuthorizationBegin;
+                    }
+
+                case State.AuthorizationBegin:
+                    {
+                        _cursor.Reset();
+                        goto case State.AuthorizationNext;
+                    }
+
+                case State.AuthorizationNext:
+                    {
+                        var current = _cursor.GetNextFilter<IAuthorizationFilter, IAsyncAuthorizationFilter>();
+                        if (current.FilterAsync != null)
+                        {
+                            if (_authorizationContext == null)
+                            {
+                                _authorizationContext = new AuthorizationFilterContext(_actionContext, _filters);
+                            }
+
+                            state = current.FilterAsync;
+                            goto case State.AuthorizationAsyncBegin;
+                        }
+                        else if (current.Filter != null)
+                        {
+                            if (_authorizationContext == null)
+                            {
+                                _authorizationContext = new AuthorizationFilterContext(_actionContext, _filters);
+                            }
+
+                            state = current.Filter;
+                            goto case State.AuthorizationSync;
+                        }
+                        else
+                        {
+                            goto case State.AuthorizationEnd;
+                        }
+                    }
+
+                case State.AuthorizationAsyncBegin:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_authorizationContext != null);
+
+                        var filter = (IAsyncAuthorizationFilter)state;
+                        var authorizationContext = _authorizationContext;
+
+                        _diagnosticSource.BeforeOnAuthorizationAsync(authorizationContext, filter);
+                        _logger.BeforeExecutingMethodOnFilter(
+                            FilterTypeConstants.AuthorizationFilter,
+                            nameof(IAsyncAuthorizationFilter.OnAuthorizationAsync),
+                            filter);
+
+                        var task = filter.OnAuthorizationAsync(authorizationContext);
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.AuthorizationAsyncEnd;
+                            return task;
+                        }
+
+                        goto case State.AuthorizationAsyncEnd;
+                    }
+
+                case State.AuthorizationAsyncEnd:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_authorizationContext != null);
+
+                        var filter = (IAsyncAuthorizationFilter)state;
+                        var authorizationContext = _authorizationContext;
+
+                        _diagnosticSource.AfterOnAuthorizationAsync(authorizationContext, filter);
+                        _logger.AfterExecutingMethodOnFilter(
+                            FilterTypeConstants.AuthorizationFilter,
+                            nameof(IAsyncAuthorizationFilter.OnAuthorizationAsync),
+                            filter);
+
+                        if (authorizationContext.Result != null)
+                        {
+                            goto case State.AuthorizationShortCircuit;
+                        }
+
+                        goto case State.AuthorizationNext;
+                    }
+
+                case State.AuthorizationSync:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_authorizationContext != null);
+
+                        var filter = (IAuthorizationFilter)state;
+                        var authorizationContext = _authorizationContext;
+
+                        _diagnosticSource.BeforeOnAuthorization(authorizationContext, filter);
+                        _logger.BeforeExecutingMethodOnFilter(
+                            FilterTypeConstants.AuthorizationFilter,
+                            nameof(IAuthorizationFilter.OnAuthorization),
+                            filter);
+
+                        filter.OnAuthorization(authorizationContext);
+
+                        _diagnosticSource.AfterOnAuthorization(authorizationContext, filter);
+                        _logger.AfterExecutingMethodOnFilter(
+                            FilterTypeConstants.AuthorizationFilter,
+                            nameof(IAuthorizationFilter.OnAuthorization),
+                            filter);
+
+                        if (authorizationContext.Result != null)
+                        {
+                            goto case State.AuthorizationShortCircuit;
+                        }
+
+                        goto case State.AuthorizationNext;
+                    }
+
+                case State.AuthorizationShortCircuit:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_authorizationContext != null);
+                        Debug.Assert(_authorizationContext.Result != null);
+
+                        _logger.AuthorizationFailure((IFilterMetadata)state);
+
+                        // This is a short-circuit - execute relevant result filters + result and complete this invocation.
+                        isCompleted = true;
+                        _result = _authorizationContext.Result;
+                        return InvokeAlwaysRunResultFilters();
+                    }
+
+                case State.AuthorizationEnd:
+                    {
+                        goto case State.ResourceBegin;
+                    }
+
+                case State.ResourceBegin:
+                    {
+                        _cursor.Reset();
+                        goto case State.ResourceNext;
+                    }
+
+                case State.ResourceNext:
+                    {
+                        var current = _cursor.GetNextFilter<IResourceFilter, IAsyncResourceFilter>();
+                        if (current.FilterAsync != null)
+                        {
+                            if (_resourceExecutingContext == null)
+                            {
+                                _resourceExecutingContext = new ResourceExecutingContext(
+                                    _actionContext,
+                                    _filters,
+                                    _valueProviderFactories);
+                            }
+
+                            state = current.FilterAsync;
+                            goto case State.ResourceAsyncBegin;
+                        }
+                        else if (current.Filter != null)
+                        {
+                            if (_resourceExecutingContext == null)
+                            {
+                                _resourceExecutingContext = new ResourceExecutingContext(
+                                    _actionContext,
+                                    _filters,
+                                    _valueProviderFactories);
+                            }
+
+                            state = current.Filter;
+                            goto case State.ResourceSyncBegin;
+                        }
+                        else
+                        {
+                            // All resource filters are currently on the stack - now execute the 'inside'.
+                            goto case State.ResourceInside;
+                        }
+                    }
+
+                case State.ResourceAsyncBegin:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_resourceExecutingContext != null);
+
+                        var filter = (IAsyncResourceFilter)state;
+                        var resourceExecutingContext = _resourceExecutingContext;
+
+                        _diagnosticSource.BeforeOnResourceExecution(resourceExecutingContext, filter);
+                        _logger.BeforeExecutingMethodOnFilter(
+                            FilterTypeConstants.ResourceFilter,
+                            nameof(IAsyncResourceFilter.OnResourceExecutionAsync),
+                            filter);
+
+                        var task = filter.OnResourceExecutionAsync(resourceExecutingContext, InvokeNextResourceFilterAwaitedAsync);
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.ResourceAsyncEnd;
+                            return task;
+                        }
+
+                        goto case State.ResourceAsyncEnd;
+                    }
+
+                case State.ResourceAsyncEnd:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_resourceExecutingContext != null);
+
+                        var filter = (IAsyncResourceFilter)state;
+                        if (_resourceExecutedContext == null)
+                        {
+                            // If we get here then the filter didn't call 'next' indicating a short circuit.
+                            _resourceExecutedContext = new ResourceExecutedContext(_resourceExecutingContext, _filters)
+                            {
+                                Canceled = true,
+                                Result = _resourceExecutingContext.Result,
+                            };
+
+                            _diagnosticSource.AfterOnResourceExecution(_resourceExecutedContext, filter);
+                            _logger.AfterExecutingMethodOnFilter(
+                                FilterTypeConstants.ResourceFilter,
+                                nameof(IAsyncResourceFilter.OnResourceExecutionAsync),
+                                filter);
+
+                            // A filter could complete a Task without setting a result
+                            if (_resourceExecutingContext.Result != null)
+                            {
+                                goto case State.ResourceShortCircuit;
+                            }
+                        }
+
+                        goto case State.ResourceEnd;
+                    }
+
+                case State.ResourceSyncBegin:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_resourceExecutingContext != null);
+
+                        var filter = (IResourceFilter)state;
+                        var resourceExecutingContext = _resourceExecutingContext;
+
+                        _diagnosticSource.BeforeOnResourceExecuting(resourceExecutingContext, filter);
+                        _logger.BeforeExecutingMethodOnFilter(
+                            FilterTypeConstants.ResourceFilter,
+                            nameof(IResourceFilter.OnResourceExecuting),
+                            filter);
+
+                        filter.OnResourceExecuting(resourceExecutingContext);
+
+                        _diagnosticSource.AfterOnResourceExecuting(resourceExecutingContext, filter);
+                        _logger.AfterExecutingMethodOnFilter(
+                            FilterTypeConstants.ResourceFilter,
+                            nameof(IResourceFilter.OnResourceExecuting),
+                            filter);
+
+                        if (resourceExecutingContext.Result != null)
+                        {
+                            _resourceExecutedContext = new ResourceExecutedContext(resourceExecutingContext, _filters)
+                            {
+                                Canceled = true,
+                                Result = _resourceExecutingContext.Result,
+                            };
+
+                            goto case State.ResourceShortCircuit;
+                        }
+
+                        var task = InvokeNextResourceFilter();
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.ResourceSyncEnd;
+                            return task;
+                        }
+
+                        goto case State.ResourceSyncEnd;
+                    }
+
+                case State.ResourceSyncEnd:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_resourceExecutingContext != null);
+                        Debug.Assert(_resourceExecutedContext != null);
+
+                        var filter = (IResourceFilter)state;
+                        var resourceExecutedContext = _resourceExecutedContext;
+
+                        _diagnosticSource.BeforeOnResourceExecuted(resourceExecutedContext, filter);
+                        _logger.BeforeExecutingMethodOnFilter(
+                            FilterTypeConstants.ResourceFilter,
+                            nameof(IResourceFilter.OnResourceExecuted),
+                            filter);
+
+                        filter.OnResourceExecuted(resourceExecutedContext);
+
+                        _diagnosticSource.AfterOnResourceExecuted(resourceExecutedContext, filter);
+                        _logger.AfterExecutingMethodOnFilter(
+                            FilterTypeConstants.ResourceFilter,
+                            nameof(IResourceFilter.OnResourceExecuted),
+                            filter);
+
+                        goto case State.ResourceEnd;
+                    }
+
+                case State.ResourceShortCircuit:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_resourceExecutingContext != null);
+                        Debug.Assert(_resourceExecutedContext != null);
+
+                        _logger.ResourceFilterShortCircuited((IFilterMetadata)state);
+
+                        _result = _resourceExecutingContext.Result;
+                        var task = InvokeAlwaysRunResultFilters();
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.ResourceEnd;
+                            return task;
+                        }
+
+                        goto case State.ResourceEnd;
+                    }
+
+                case State.ResourceInside:
+                    {
+                        goto case State.ExceptionBegin;
+                    }
+
+                case State.ExceptionBegin:
+                    {
+                        _cursor.Reset();
+                        goto case State.ExceptionNext;
+                    }
+
+                case State.ExceptionNext:
+                    {
+                        var current = _cursor.GetNextFilter<IExceptionFilter, IAsyncExceptionFilter>();
+                        if (current.FilterAsync != null)
+                        {
+                            state = current.FilterAsync;
+                            goto case State.ExceptionAsyncBegin;
+                        }
+                        else if (current.Filter != null)
+                        {
+                            state = current.Filter;
+                            goto case State.ExceptionSyncBegin;
+                        }
+                        else if (scope == Scope.Exception)
+                        {
+                            // All exception filters are on the stack already - so execute the 'inside'.
+                            goto case State.ExceptionInside;
+                        }
+                        else
+                        {
+                            // There are no exception filters - so jump right to the action.
+                            Debug.Assert(scope == Scope.Invoker || scope == Scope.Resource);
+                            goto case State.ActionBegin;
+                        }
+                    }
+
+                case State.ExceptionAsyncBegin:
+                    {
+                        var task = InvokeNextExceptionFilterAsync();
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.ExceptionAsyncResume;
+                            return task;
+                        }
+
+                        goto case State.ExceptionAsyncResume;
+                    }
+
+                case State.ExceptionAsyncResume:
+                    {
+                        Debug.Assert(state != null);
+
+                        var filter = (IAsyncExceptionFilter)state;
+                        var exceptionContext = _exceptionContext;
+
+                        // When we get here we're 'unwinding' the stack of exception filters. If we have an unhandled exception,
+                        // we'll call the filter. Otherwise there's nothing to do.
+                        if (exceptionContext?.Exception != null && !exceptionContext.ExceptionHandled)
+                        {
+                            _diagnosticSource.BeforeOnExceptionAsync(exceptionContext, filter);
+                            _logger.BeforeExecutingMethodOnFilter(
+                                FilterTypeConstants.ExceptionFilter,
+                                nameof(IAsyncExceptionFilter.OnExceptionAsync),
+                                filter);
+
+                            var task = filter.OnExceptionAsync(exceptionContext);
+                            if (task.Status != TaskStatus.RanToCompletion)
+                            {
+                                next = State.ExceptionAsyncEnd;
+                                return task;
+                            }
+
+                            goto case State.ExceptionAsyncEnd;
+                        }
+
+                        goto case State.ExceptionEnd;
+                    }
+
+                case State.ExceptionAsyncEnd:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_exceptionContext != null);
+
+                        var filter = (IAsyncExceptionFilter)state;
+                        var exceptionContext = _exceptionContext;
+
+                        _diagnosticSource.AfterOnExceptionAsync(exceptionContext, filter);
+                        _logger.AfterExecutingMethodOnFilter(
+                            FilterTypeConstants.ExceptionFilter,
+                            nameof(IAsyncExceptionFilter.OnExceptionAsync),
+                            filter);
+
+                        if (exceptionContext.Exception == null || exceptionContext.ExceptionHandled)
+                        {
+                            // We don't need to do anything to trigger a short circuit. If there's another
+                            // exception filter on the stack it will check the same set of conditions
+                            // and then just skip itself.
+                            _logger.ExceptionFilterShortCircuited(filter);
+                        }
+
+                        goto case State.ExceptionEnd;
+                    }
+
+                case State.ExceptionSyncBegin:
+                    {
+                        var task = InvokeNextExceptionFilterAsync();
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.ExceptionSyncEnd;
+                            return task;
+                        }
+
+                        goto case State.ExceptionSyncEnd;
+                    }
+
+                case State.ExceptionSyncEnd:
+                    {
+                        Debug.Assert(state != null);
+
+                        var filter = (IExceptionFilter)state;
+                        var exceptionContext = _exceptionContext;
+
+                        // When we get here we're 'unwinding' the stack of exception filters. If we have an unhandled exception,
+                        // we'll call the filter. Otherwise there's nothing to do.
+                        if (exceptionContext?.Exception != null && !exceptionContext.ExceptionHandled)
+                        {
+                            _diagnosticSource.BeforeOnException(exceptionContext, filter);
+                            _logger.BeforeExecutingMethodOnFilter(
+                                FilterTypeConstants.ExceptionFilter,
+                                nameof(IExceptionFilter.OnException),
+                                filter);
+
+                            filter.OnException(exceptionContext);
+
+                            _diagnosticSource.AfterOnException(exceptionContext, filter);
+                            _logger.AfterExecutingMethodOnFilter(
+                                FilterTypeConstants.ExceptionFilter,
+                                nameof(IExceptionFilter.OnException),
+                                filter);
+
+                            if (exceptionContext.Exception == null || exceptionContext.ExceptionHandled)
+                            {
+                                // We don't need to do anything to trigger a short circuit. If there's another
+                                // exception filter on the stack it will check the same set of conditions
+                                // and then just skip itself.
+                                _logger.ExceptionFilterShortCircuited(filter);
+                            }
+                        }
+
+                        goto case State.ExceptionEnd;
+                    }
+
+                case State.ExceptionInside:
+                    {
+                        goto case State.ActionBegin;
+                    }
+
+                case State.ExceptionHandled:
+                    {
+                        // We arrive in this state when an exception happened, but was handled by exception filters
+                        // either by setting ExceptionHandled, or nulling out the Exception or setting a result
+                        // on the ExceptionContext.
+                        //
+                        // We need to execute the result (if any) and then exit gracefully which unwinding Resource 
+                        // filters.
+
+                        Debug.Assert(state != null);
+                        Debug.Assert(_exceptionContext != null);
+
+                        if (_exceptionContext.Result == null)
+                        {
+                            _exceptionContext.Result = new EmptyResult();
+                        }
+
+                        _result = _exceptionContext.Result;
+
+                        var task = InvokeAlwaysRunResultFilters();
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.ResourceInsideEnd;
+                            return task;
+                        }
+
+                        goto case State.ResourceInsideEnd;
+                    }
+
+                case State.ExceptionEnd:
+                    {
+                        var exceptionContext = _exceptionContext;
+
+                        if (scope == Scope.Exception)
+                        {
+                            isCompleted = true;
+                            return Task.CompletedTask;
+                        }
+
+                        if (exceptionContext != null)
+                        {
+                            if (exceptionContext.Result != null ||
+                                exceptionContext.Exception == null ||
+                                exceptionContext.ExceptionHandled)
+                            {
+                                goto case State.ExceptionHandled;
+                            }
+
+                            Rethrow(exceptionContext);
+                            Debug.Fail("unreachable");
+                        }
+
+                        var task = InvokeResultFilters();
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.ResourceInsideEnd;
+                            return task;
+                        }
+                        goto case State.ResourceInsideEnd;
+                    }
+
+                case State.ActionBegin:
+                    {
+                        var task = InvokeInnerFilterAsync();
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.ActionEnd;
+                            return task;
+                        }
+
+                        goto case State.ActionEnd;
+                    }
+
+                case State.ActionEnd:
+                    {
+                        if (scope == Scope.Exception)
+                        {
+                            // If we're inside an exception filter, let's allow those filters to 'unwind' before
+                            // the result.
+                            isCompleted = true;
+                            return Task.CompletedTask;
+                        }
+
+                        Debug.Assert(scope == Scope.Invoker || scope == Scope.Resource);
+                        var task = InvokeResultFilters();
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.ResourceInsideEnd;
+                            return task;
+                        }
+                        goto case State.ResourceInsideEnd;
+                    }
+
+                case State.ResourceInsideEnd:
+                    {
+                        if (scope == Scope.Resource)
+                        {
+                            _resourceExecutedContext = new ResourceExecutedContext(_actionContext, _filters)
+                            {
+                                Result = _result,
+                            };
+
+                            goto case State.ResourceEnd;
+                        }
+
+                        goto case State.InvokeEnd;
+                    }
+
+                case State.ResourceEnd:
+                    {
+                        if (scope == Scope.Resource)
+                        {
+                            isCompleted = true;
+                            return Task.CompletedTask;
+                        }
+
+                        Debug.Assert(scope == Scope.Invoker);
+                        Rethrow(_resourceExecutedContext);
+
+                        goto case State.InvokeEnd;
+                    }
+
+                case State.InvokeEnd:
+                    {
+                        isCompleted = true;
+                        return Task.CompletedTask;
+                    }
+
+                default:
+                    throw new InvalidOperationException();
+            }
+        }
+
+        private async Task<ResourceExecutedContext> InvokeNextResourceFilterAwaitedAsync()
+        {
+            Debug.Assert(_resourceExecutingContext != null);
+
+            if (_resourceExecutingContext.Result != null)
+            {
+                // If we get here, it means that an async filter set a result AND called next(). This is forbidden.
+                var message = Resources.FormatAsyncResourceFilter_InvalidShortCircuit(
+                    typeof(IAsyncResourceFilter).Name,
+                    nameof(ResourceExecutingContext.Result),
+                    typeof(ResourceExecutingContext).Name,
+                    typeof(ResourceExecutionDelegate).Name);
+                throw new InvalidOperationException(message);
+            }
+
+            await InvokeNextResourceFilter();
+
+            Debug.Assert(_resourceExecutedContext != null);
+            return _resourceExecutedContext;
+        }
+
+        private async Task InvokeNextResourceFilter()
+        {
+            try
+            {
+                var scope = Scope.Resource;
+                var next = State.ResourceNext;
+                var state = (object)null;
+                var isCompleted = false;
+                while (!isCompleted)
+                {
+                    await Next(ref next, ref scope, ref state, ref isCompleted);
+                }
+            }
+            catch (Exception exception)
+            {
+                _resourceExecutedContext = new ResourceExecutedContext(_resourceExecutingContext, _filters)
+                {
+                    ExceptionDispatchInfo = ExceptionDispatchInfo.Capture(exception),
+                };
+            }
+
+            Debug.Assert(_resourceExecutedContext != null);
+        }
+
+        private async Task InvokeNextExceptionFilterAsync()
+        {
+            try
+            {
+                var next = State.ExceptionNext;
+                var state = (object)null;
+                var scope = Scope.Exception;
+                var isCompleted = false;
+                while (!isCompleted)
+                {
+                    await Next(ref next, ref scope, ref state, ref isCompleted);
+                }
+            }
+            catch (Exception exception)
+            {
+                _exceptionContext = new ExceptionContext(_actionContext, _filters)
+                {
+                    ExceptionDispatchInfo = ExceptionDispatchInfo.Capture(exception),
+                };
+            }
+        }
+
+        private async Task InvokeAlwaysRunResultFilters()
+        {
+            var next = State.ResultBegin;
+            var scope = Scope.Invoker;
+            var state = (object)null;
+            var isCompleted = false;
+
+            while (!isCompleted)
+            {
+                await ResultNext<IAlwaysRunResultFilter, IAsyncAlwaysRunResultFilter>(ref next, ref scope, ref state, ref isCompleted);
+            }
+        }
+
+        private async Task InvokeResultFilters()
+        {
+            var next = State.ResultBegin;
+            var scope = Scope.Invoker;
+            var state = (object)null;
+            var isCompleted = false;
+
+            while (!isCompleted)
+            {
+                await ResultNext<IResultFilter, IAsyncResultFilter>(ref next, ref scope, ref state, ref isCompleted);
+            }
+        }
+
+        private Task ResultNext<TFilter, TFilterAsync>(ref State next, ref Scope scope, ref object state, ref bool isCompleted)
+            where TFilter : class, IResultFilter
+            where TFilterAsync : class, IAsyncResultFilter
+        {
+            var resultFilterKind = typeof(TFilter) == typeof(IAlwaysRunResultFilter) ?
+                FilterTypeConstants.AlwaysRunResultFilter :
+                FilterTypeConstants.ResultFilter;
+
+            switch (next)
+            {
+                case State.ResultBegin:
+                    {
+                        _cursor.Reset();
+                        goto case State.ResultNext;
+                    }
+
+                case State.ResultNext:
+                    {
+                        var current = _cursor.GetNextFilter<TFilter, TFilterAsync>();
+                        if (current.FilterAsync != null)
+                        {
+                            if (_resultExecutingContext == null)
+                            {
+                                _resultExecutingContext = new ResultExecutingContext(_actionContext, _filters, _result, _instance);
+                            }
+
+                            state = current.FilterAsync;
+                            goto case State.ResultAsyncBegin;
+                        }
+                        else if (current.Filter != null)
+                        {
+                            if (_resultExecutingContext == null)
+                            {
+                                _resultExecutingContext = new ResultExecutingContext(_actionContext, _filters, _result, _instance);
+                            }
+
+                            state = current.Filter;
+                            goto case State.ResultSyncBegin;
+                        }
+                        else
+                        {
+                            goto case State.ResultInside;
+                        }
+                    }
+
+                case State.ResultAsyncBegin:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_resultExecutingContext != null);
+
+                        var filter = (TFilterAsync)state;
+                        var resultExecutingContext = _resultExecutingContext;
+
+                        _diagnosticSource.BeforeOnResultExecution(resultExecutingContext, filter);
+                        _logger.BeforeExecutingMethodOnFilter(
+                            resultFilterKind,
+                            nameof(IAsyncResultFilter.OnResultExecutionAsync),
+                            filter);
+
+                        var task = filter.OnResultExecutionAsync(resultExecutingContext, InvokeNextResultFilterAwaitedAsync<TFilter, TFilterAsync>);
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.ResultAsyncEnd;
+                            return task;
+                        }
+
+                        goto case State.ResultAsyncEnd;
+                    }
+
+                case State.ResultAsyncEnd:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_resultExecutingContext != null);
+
+                        var filter = (TFilterAsync)state;
+                        var resultExecutingContext = _resultExecutingContext;
+                        var resultExecutedContext = _resultExecutedContext;
+
+                        if (resultExecutedContext == null || resultExecutingContext.Cancel)
+                        {
+                            // Short-circuited by not calling next || Short-circuited by setting Cancel == true
+                            _logger.ResultFilterShortCircuited(filter);
+
+                            _resultExecutedContext = new ResultExecutedContext(
+                                _actionContext,
+                                _filters,
+                                resultExecutingContext.Result,
+                                _instance)
+                            {
+                                Canceled = true,
+                            };
+                        }
+
+                        _diagnosticSource.AfterOnResultExecution(_resultExecutedContext, filter);
+                        _logger.AfterExecutingMethodOnFilter(
+                            resultFilterKind,
+                            nameof(IAsyncResultFilter.OnResultExecutionAsync),
+                            filter);
+
+                        goto case State.ResultEnd;
+                    }
+
+                case State.ResultSyncBegin:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_resultExecutingContext != null);
+
+                        var filter = (TFilter)state;
+                        var resultExecutingContext = _resultExecutingContext;
+
+                        _diagnosticSource.BeforeOnResultExecuting(resultExecutingContext, filter);
+                        _logger.BeforeExecutingMethodOnFilter(
+                            resultFilterKind,
+                            nameof(IResultFilter.OnResultExecuting),
+                            filter);
+
+                        filter.OnResultExecuting(resultExecutingContext);
+
+                        _diagnosticSource.AfterOnResultExecuting(resultExecutingContext, filter);
+                        _logger.AfterExecutingMethodOnFilter(
+                            resultFilterKind,
+                            nameof(IResultFilter.OnResultExecuting),
+                            filter);
+
+                        if (_resultExecutingContext.Cancel)
+                        {
+                            // Short-circuited by setting Cancel == true
+                            _logger.ResultFilterShortCircuited(filter);
+
+                            _resultExecutedContext = new ResultExecutedContext(
+                                resultExecutingContext,
+                                _filters,
+                                resultExecutingContext.Result,
+                                _instance)
+                            {
+                                Canceled = true,
+                            };
+
+                            goto case State.ResultEnd;
+                        }
+
+                        var task = InvokeNextResultFilterAsync<TFilter, TFilterAsync>();
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.ResultSyncEnd;
+                            return task;
+                        }
+
+                        goto case State.ResultSyncEnd;
+                    }
+
+                case State.ResultSyncEnd:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_resultExecutingContext != null);
+                        Debug.Assert(_resultExecutedContext != null);
+
+                        var filter = (TFilter)state;
+                        var resultExecutedContext = _resultExecutedContext;
+
+                        _diagnosticSource.BeforeOnResultExecuted(resultExecutedContext, filter);
+                        _logger.BeforeExecutingMethodOnFilter(
+                            resultFilterKind,
+                            nameof(IResultFilter.OnResultExecuted),
+                            filter);
+
+                        filter.OnResultExecuted(resultExecutedContext);
+
+                        _diagnosticSource.AfterOnResultExecuted(resultExecutedContext, filter);
+                        _logger.AfterExecutingMethodOnFilter(
+                            resultFilterKind,
+                            nameof(IResultFilter.OnResultExecuted),
+                            filter);
+
+                        goto case State.ResultEnd;
+                    }
+
+                case State.ResultInside:
+                    {
+                        // If we executed result filters then we need to grab the result from there.
+                        if (_resultExecutingContext != null)
+                        {
+                            _result = _resultExecutingContext.Result;
+                        }
+
+                        if (_result == null)
+                        {
+                            // The empty result is always flowed back as the 'executed' result if we don't have one.
+                            _result = new EmptyResult();
+                        }
+
+                        var task = InvokeResultAsync(_result);
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.ResultEnd;
+                            return task;
+                        }
+
+                        goto case State.ResultEnd;
+                    }
+
+                case State.ResultEnd:
+                    {
+                        var result = _result;
+                        isCompleted = true;
+
+                        if (scope == Scope.Result)
+                        {
+                            if (_resultExecutedContext == null)
+                            {
+                                _resultExecutedContext = new ResultExecutedContext(_actionContext, _filters, result, _instance);
+                            }
+
+                            return Task.CompletedTask;
+                        }
+
+                        Rethrow(_resultExecutedContext);
+                        return Task.CompletedTask;
+                    }
+
+                default:
+                    throw new InvalidOperationException(); // Unreachable.
+            }
+        }
+
+        private async Task InvokeNextResultFilterAsync<TFilter, TFilterAsync>()
+            where TFilter : class, IResultFilter
+            where TFilterAsync : class, IAsyncResultFilter
+        {
+            try
+            {
+                var next = State.ResultNext;
+                var state = (object)null;
+                var scope = Scope.Result;
+                var isCompleted = false;
+                while (!isCompleted)
+                {
+                    await ResultNext<TFilter, TFilterAsync>(ref next, ref scope, ref state, ref isCompleted);
+                }
+            }
+            catch (Exception exception)
+            {
+                _resultExecutedContext = new ResultExecutedContext(_actionContext, _filters, _result, _instance)
+                {
+                    ExceptionDispatchInfo = ExceptionDispatchInfo.Capture(exception),
+                };
+            }
+
+            Debug.Assert(_resultExecutedContext != null);
+        }
+
+        private async Task<ResultExecutedContext> InvokeNextResultFilterAwaitedAsync<TFilter, TFilterAsync>()
+            where TFilter : class, IResultFilter
+            where TFilterAsync : class, IAsyncResultFilter
+        {
+            Debug.Assert(_resultExecutingContext != null);
+            if (_resultExecutingContext.Cancel)
+            {
+                // If we get here, it means that an async filter set cancel == true AND called next().
+                // This is forbidden.
+                var message = Resources.FormatAsyncResultFilter_InvalidShortCircuit(
+                    typeof(IAsyncResultFilter).Name,
+                    nameof(ResultExecutingContext.Cancel),
+                    typeof(ResultExecutingContext).Name,
+                    typeof(ResultExecutionDelegate).Name);
+
+                throw new InvalidOperationException(message);
+            }
+
+            await InvokeNextResultFilterAsync<TFilter, TFilterAsync>();
+
+            Debug.Assert(_resultExecutedContext != null);
+            return _resultExecutedContext;
+        }
+
+        private static void Rethrow(ResourceExecutedContext context)
+        {
+            if (context == null)
+            {
+                return;
+            }
+
+            if (context.ExceptionHandled)
+            {
+                return;
+            }
+
+            if (context.ExceptionDispatchInfo != null)
+            {
+                context.ExceptionDispatchInfo.Throw();
+            }
+
+            if (context.Exception != null)
+            {
+                throw context.Exception;
+            }
+        }
+
+        private static void Rethrow(ExceptionContext context)
+        {
+            if (context == null)
+            {
+                return;
+            }
+
+            if (context.ExceptionHandled)
+            {
+                return;
+            }
+
+            if (context.ExceptionDispatchInfo != null)
+            {
+                context.ExceptionDispatchInfo.Throw();
+            }
+
+            if (context.Exception != null)
+            {
+                throw context.Exception;
+            }
+        }
+
+        private static void Rethrow(ResultExecutedContext context)
+        {
+            if (context == null)
+            {
+                return;
+            }
+
+            if (context.ExceptionHandled)
+            {
+                return;
+            }
+
+            if (context.ExceptionDispatchInfo != null)
+            {
+                context.ExceptionDispatchInfo.Throw();
+            }
+
+            if (context.Exception != null)
+            {
+                throw context.Exception;
+            }
+        }
+
+        private enum Scope
+        {
+            Invoker,
+            Resource,
+            Exception,
+            Result,
+        }
+
+        private enum State
+        {
+            InvokeBegin,
+            AuthorizationBegin,
+            AuthorizationNext,
+            AuthorizationAsyncBegin,
+            AuthorizationAsyncEnd,
+            AuthorizationSync,
+            AuthorizationShortCircuit,
+            AuthorizationEnd,
+            ResourceBegin,
+            ResourceNext,
+            ResourceAsyncBegin,
+            ResourceAsyncEnd,
+            ResourceSyncBegin,
+            ResourceSyncEnd,
+            ResourceShortCircuit,
+            ResourceInside,
+            ResourceInsideEnd,
+            ResourceEnd,
+            ExceptionBegin,
+            ExceptionNext,
+            ExceptionAsyncBegin,
+            ExceptionAsyncResume,
+            ExceptionAsyncEnd,
+            ExceptionSyncBegin,
+            ExceptionSyncEnd,
+            ExceptionInside,
+            ExceptionHandled,
+            ExceptionEnd,
+            ActionBegin,
+            ActionEnd,
+            ResultBegin,
+            ResultNext,
+            ResultAsyncBegin,
+            ResultAsyncEnd,
+            ResultSyncBegin,
+            ResultSyncEnd,
+            ResultInside,
+            ResultEnd,
+            InvokeEnd,
+        }
+
+        private static class FilterTypeConstants
+        {
+            public const string AuthorizationFilter = "Authorization Filter";
+            public const string ResourceFilter = "Resource Filter";
+            public const string ActionFilter = "Action Filter";
+            public const string ExceptionFilter = "Exception Filter";
+            public const string ResultFilter = "Result Filter";
+            public const string AlwaysRunResultFilter = "Always Run Result Filter";
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResponseCacheFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResponseCacheFilter.cs
new file mode 100644
index 0000000000..55d63fc975
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResponseCacheFilter.cs
@@ -0,0 +1,108 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// An <see cref="IActionFilter"/> which sets the appropriate headers related to response caching.
+    /// </summary>
+    public class ResponseCacheFilter : IActionFilter, IResponseCacheFilter
+    {
+        private readonly ResponseCacheFilterExecutor _executor;
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="ResponseCacheFilter"/>
+        /// </summary>
+        /// <param name="cacheProfile">The profile which contains the settings for
+        /// <see cref="ResponseCacheFilter"/>.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public ResponseCacheFilter(CacheProfile cacheProfile, ILoggerFactory loggerFactory)
+        {
+            _executor = new ResponseCacheFilterExecutor(cacheProfile);
+            _logger = loggerFactory.CreateLogger(GetType());
+        }
+
+        /// <summary>
+        /// Gets or sets the duration in seconds for which the response is cached.
+        /// This is a required parameter.
+        /// This sets "max-age" in "Cache-control" header.
+        /// </summary>
+        public int Duration
+        {
+            get => _executor.Duration;
+            set => _executor.Duration = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the location where the data from a particular URL must be cached.
+        /// </summary>
+        public ResponseCacheLocation Location
+        {
+            get => _executor.Location;
+            set => _executor.Location = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the value which determines whether the data should be stored or not.
+        /// When set to <see langword="true"/>, it sets "Cache-control" header to "no-store".
+        /// Ignores the "Location" parameter for values other than "None".
+        /// Ignores the "duration" parameter.
+        /// </summary>
+        public bool NoStore
+        {
+            get => _executor.NoStore;
+            set => _executor.NoStore = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the value for the Vary response header.
+        /// </summary>
+        public string VaryByHeader
+        {
+            get => _executor.VaryByHeader;
+            set => _executor.VaryByHeader = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the query keys to vary by.
+        /// </summary>
+        /// <remarks>
+        /// <see cref="VaryByQueryKeys"/> requires the response cache middleware.
+        /// </remarks>
+        public string[] VaryByQueryKeys
+        {
+            get => _executor.VaryByQueryKeys;
+            set => _executor.VaryByQueryKeys = value;
+        }
+
+        /// <inheritdoc />
+        public void OnActionExecuting(ActionExecutingContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            // If there are more filters which can override the values written by this filter,
+            // then skip execution of this filter.
+            var effectivePolicy = context.FindEffectivePolicy<IResponseCacheFilter>();
+            if (effectivePolicy != null && effectivePolicy != this)
+            {
+                _logger.NotMostEffectiveFilter(GetType(), effectivePolicy.GetType(), typeof(IResponseCacheFilter));
+                return;
+            }
+
+            _executor.Execute(context);
+        }
+
+        /// <inheritdoc />
+        public void OnActionExecuted(ActionExecutedContext context)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResponseCacheFilterExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResponseCacheFilterExecutor.cs
new file mode 100644
index 0000000000..02100b838e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResponseCacheFilterExecutor.cs
@@ -0,0 +1,134 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.ResponseCaching;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ResponseCacheFilterExecutor
+    {
+        private readonly CacheProfile _cacheProfile;
+        private int? _cacheDuration;
+        private ResponseCacheLocation? _cacheLocation;
+        private bool? _cacheNoStore;
+        private string _cacheVaryByHeader;
+        private string[] _cacheVaryByQueryKeys;
+
+        public ResponseCacheFilterExecutor(CacheProfile cacheProfile)
+        {
+            _cacheProfile = cacheProfile ?? throw new ArgumentNullException(nameof(cacheProfile));
+        }
+
+        public int Duration
+        {
+            get => _cacheDuration ?? _cacheProfile.Duration ?? 0;
+            set => _cacheDuration = value;
+        }
+
+        public ResponseCacheLocation Location
+        {
+            get => _cacheLocation ?? _cacheProfile.Location ?? ResponseCacheLocation.Any;
+            set => _cacheLocation = value;
+        }
+
+        public bool NoStore
+        {
+            get => _cacheNoStore ?? _cacheProfile.NoStore ?? false;
+            set => _cacheNoStore = value;
+        }
+
+        public string VaryByHeader
+        {
+            get => _cacheVaryByHeader ?? _cacheProfile.VaryByHeader;
+            set => _cacheVaryByHeader = value;
+        }
+
+        public string[] VaryByQueryKeys
+        {
+            get => _cacheVaryByQueryKeys ?? _cacheProfile.VaryByQueryKeys;
+            set => _cacheVaryByQueryKeys = value;
+        }
+
+        public void Execute(FilterContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (!NoStore)
+            {
+                // Duration MUST be set (either in the cache profile or in this filter) unless NoStore is true.
+                if (_cacheProfile.Duration == null && _cacheDuration == null)
+                {
+                    throw new InvalidOperationException(
+                        Resources.FormatResponseCache_SpecifyDuration(nameof(NoStore), nameof(Duration)));
+                }
+            }
+
+            var headers = context.HttpContext.Response.Headers;
+
+            // Clear all headers
+            headers.Remove(HeaderNames.Vary);
+            headers.Remove(HeaderNames.CacheControl);
+            headers.Remove(HeaderNames.Pragma);
+
+            if (!string.IsNullOrEmpty(VaryByHeader))
+            {
+                headers[HeaderNames.Vary] = VaryByHeader;
+            }
+
+            if (VaryByQueryKeys != null)
+            {
+                var responseCachingFeature = context.HttpContext.Features.Get<IResponseCachingFeature>();
+                if (responseCachingFeature == null)
+                {
+                    throw new InvalidOperationException(
+                        Resources.FormatVaryByQueryKeys_Requires_ResponseCachingMiddleware(nameof(VaryByQueryKeys)));
+                }
+                responseCachingFeature.VaryByQueryKeys = VaryByQueryKeys;
+            }
+
+            if (NoStore)
+            {
+                headers[HeaderNames.CacheControl] = "no-store";
+
+                // Cache-control: no-store, no-cache is valid.
+                if (Location == ResponseCacheLocation.None)
+                {
+                    headers.AppendCommaSeparatedValues(HeaderNames.CacheControl, "no-cache");
+                    headers[HeaderNames.Pragma] = "no-cache";
+                }
+            }
+            else
+            {
+                string cacheControlValue;
+                switch (Location)
+                {
+                    case ResponseCacheLocation.Any:
+                        cacheControlValue = "public,";
+                        break;
+                    case ResponseCacheLocation.Client:
+                        cacheControlValue = "private,";
+                        break;
+                    case ResponseCacheLocation.None:
+                        cacheControlValue = "no-cache,";
+                        headers[HeaderNames.Pragma] = "no-cache";
+                        break;
+                    default:
+                        cacheControlValue = null;
+                        break;
+                }
+
+                cacheControlValue = $"{cacheControlValue}max-age={Duration}";
+                headers[HeaderNames.CacheControl] = cacheControlValue;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResponseContentTypeHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResponseContentTypeHelper.cs
new file mode 100644
index 0000000000..936ef92973
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResponseContentTypeHelper.cs
@@ -0,0 +1,76 @@
+// 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.
+
+using System.Diagnostics;
+using System.Text;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Formatters;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public static class ResponseContentTypeHelper
+    {
+        /// <summary>
+        /// Gets the content type and encoding that need to be used for the response.
+        /// The priority for selecting the content type is:
+        /// 1. ContentType property set on the action result
+        /// 2. <see cref="HttpResponse.ContentType"/> property set on <see cref="HttpResponse"/>
+        /// 3. Default content type set on the action result
+        /// </summary>
+        /// <remarks>
+        /// The user supplied content type is not modified and is used as is. For example, if user
+        /// sets the content type to be "text/plain" without any encoding, then the default content type's
+        /// encoding is used to write the response and the ContentType header is set to be "text/plain" without any
+        /// "charset" information.
+        /// </remarks>
+        /// <param name="actionResultContentType">ContentType set on the action result</param>
+        /// <param name="httpResponseContentType"><see cref="HttpResponse.ContentType"/> property set
+        /// on <see cref="HttpResponse"/></param>
+        /// <param name="defaultContentType">The default content type of the action result.</param>
+        /// <param name="resolvedContentType">The content type to be used for the response content type header</param>
+        /// <param name="resolvedContentTypeEncoding">Encoding to be used for writing the response</param>
+        public static void ResolveContentTypeAndEncoding(
+            string actionResultContentType,
+            string httpResponseContentType,
+            string defaultContentType,
+            out string resolvedContentType,
+            out Encoding resolvedContentTypeEncoding)
+        {
+            Debug.Assert(defaultContentType != null);
+
+            var defaultContentTypeEncoding = MediaType.GetEncoding(defaultContentType);
+            Debug.Assert(defaultContentTypeEncoding != null);
+
+            // 1. User sets the ContentType property on the action result
+            if (actionResultContentType != null)
+            {
+                resolvedContentType = actionResultContentType;
+                var actionResultEncoding = MediaType.GetEncoding(actionResultContentType);
+                resolvedContentTypeEncoding = actionResultEncoding ?? defaultContentTypeEncoding;
+                return;
+            }
+
+            // 2. User sets the ContentType property on the http response directly
+            if (!string.IsNullOrEmpty(httpResponseContentType))
+            {
+                var mediaTypeEncoding = MediaType.GetEncoding(httpResponseContentType);
+                if (mediaTypeEncoding != null)
+                {
+                    resolvedContentType = httpResponseContentType;
+                    resolvedContentTypeEncoding = mediaTypeEncoding;
+                }
+                else
+                {
+                    resolvedContentType = httpResponseContentType;
+                    resolvedContentTypeEncoding = defaultContentTypeEncoding;
+                }
+
+                return;
+            }
+
+            // 3. Fall-back to the default content type
+            resolvedContentType = defaultContentType;
+            resolvedContentTypeEncoding = defaultContentTypeEncoding;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ShortFormDictionaryValidationStrategy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ShortFormDictionaryValidationStrategy.cs
new file mode 100644
index 0000000000..31d1db97bf
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ShortFormDictionaryValidationStrategy.cs
@@ -0,0 +1,121 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// An implementation of <see cref="IValidationStrategy"/> for a dictionary bound with 'short form' style keys.
+    /// </summary>
+    /// <typeparam name="TKey">The <see cref="Type"/> of the keys of the model dictionary.</typeparam>
+    /// <typeparam name="TValue">The <see cref="Type"/> of the values of the model dictionary.</typeparam>
+    /// <remarks>
+    /// This implementation handles cases like:
+    /// <example>
+    ///     Model: IDictionary&lt;string, Student&gt;
+    ///     Query String: ?students[Joey].Age=8&amp;students[Katherine].Age=9
+    ///
+    ///     In this case, 'Joey' and 'Katherine' are the keys of the dictionary, used to bind two 'Student'
+    ///     objects. The enumerator returned from this class will yield two 'Student' objects with corresponding
+    ///     keys 'students[Joey]' and 'students[Katherine]'
+    /// </example>
+    ///
+    /// Using this key format, the enumerator enumerates model objects of type <typeparamref name="TValue"/>. The
+    /// keys of the dictionary are not validated as they must be simple types.
+    /// </remarks>
+    public class ShortFormDictionaryValidationStrategy<TKey, TValue> : IValidationStrategy
+    {
+        private readonly ModelMetadata _valueMetadata;
+
+        /// <summary>
+        /// Creates a new <see cref="ShortFormDictionaryValidationStrategy{TKey, TValue}"/>.
+        /// </summary>
+        /// <param name="keyMappings">
+        /// The mapping from <see cref="ModelStateDictionary"/> key to dictionary key.
+        /// </param>
+        /// <param name="valueMetadata">
+        /// The <see cref="ModelMetadata"/> associated with <typeparamref name="TValue"/>.
+        /// </param>
+        public ShortFormDictionaryValidationStrategy(
+            IEnumerable<KeyValuePair<string, TKey>> keyMappings,
+            ModelMetadata valueMetadata)
+        {
+            KeyMappings = keyMappings;
+            _valueMetadata = valueMetadata;
+        }
+
+        /// <summary>
+        /// Gets the mapping from <see cref="ModelStateDictionary"/> key to dictionary key.
+        /// </summary>
+        public IEnumerable<KeyValuePair<string, TKey>> KeyMappings { get; }
+
+        /// <inheritdoc />
+        public IEnumerator<ValidationEntry> GetChildren(
+            ModelMetadata metadata,
+            string key,
+            object model)
+        {
+            // key is not needed because KeyMappings maps from full ModelState keys to dictionary keys.
+            return new Enumerator(_valueMetadata, KeyMappings, (IDictionary<TKey, TValue>)model);
+        }
+
+        private class Enumerator : IEnumerator<ValidationEntry>
+        {
+            private readonly ModelMetadata _metadata;
+            private readonly IDictionary<TKey, TValue> _model;
+            private readonly IEnumerator<KeyValuePair<string, TKey>> _keyMappingEnumerator;
+
+            private ValidationEntry _entry;
+
+            public Enumerator(
+                ModelMetadata metadata,
+                IEnumerable<KeyValuePair<string, TKey>> keyMappings,
+                IDictionary<TKey, TValue> model)
+            {
+                _metadata = metadata;
+                _model = model;
+                _keyMappingEnumerator = keyMappings.GetEnumerator();
+            }
+
+            public ValidationEntry Current => _entry;
+
+            object IEnumerator.Current => Current;
+
+            public bool MoveNext()
+            {
+                TValue value;
+                while (true)
+                {
+                    if (!_keyMappingEnumerator.MoveNext())
+                    {
+                        return false;
+                    }
+
+                    if (_model.TryGetValue(_keyMappingEnumerator.Current.Value, out value))
+                    {
+                        // Skip over entries that we can't find in the dictionary, they will show up as unvalidated.
+                        break;
+                    }
+                }
+
+                _entry = new ValidationEntry(_metadata, _keyMappingEnumerator.Current.Key, value);
+
+                return true;
+            }
+
+            public void Dispose()
+            {
+            }
+
+            public void Reset()
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/TypeActivatorCache.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/TypeActivatorCache.cs
new file mode 100644
index 0000000000..36c0d947d3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/TypeActivatorCache.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    /// <summary>
+    /// Caches <see cref="ObjectFactory"/> instances produced by 
+    /// <see cref="Microsoft.Extensions.DependencyInjection.ActivatorUtilities.CreateFactory(Type, Type[])"/>.
+    /// </summary>
+    public class TypeActivatorCache : ITypeActivatorCache
+    {
+        private readonly Func<Type, ObjectFactory> _createFactory =
+            (type) => ActivatorUtilities.CreateFactory(type, Type.EmptyTypes);
+        private readonly ConcurrentDictionary<Type, ObjectFactory> _typeActivatorCache =
+               new ConcurrentDictionary<Type, ObjectFactory>();
+
+        /// <inheritdoc/>
+        public TInstance CreateInstance<TInstance>(
+            IServiceProvider serviceProvider,
+            Type implementationType)
+        {
+            if (serviceProvider == null)
+            {
+                throw new ArgumentNullException(nameof(serviceProvider));
+            }
+
+            if (implementationType == null)
+            {
+                throw new ArgumentNullException(nameof(implementationType));
+            }
+
+            var createFactory = _typeActivatorCache.GetOrAdd(implementationType, _createFactory);
+            return (TInstance)createFactory(serviceProvider, arguments: null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ValidatorCache.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ValidatorCache.cs
new file mode 100644
index 0000000000..61fcfe0c15
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ValidatorCache.cs
@@ -0,0 +1,144 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ValidatorCache
+    {
+        private readonly ConcurrentDictionary<ModelMetadata, CacheEntry> _cacheEntries = new ConcurrentDictionary<ModelMetadata, CacheEntry>();
+
+        public IReadOnlyList<IModelValidator> GetValidators(ModelMetadata metadata, IModelValidatorProvider validatorProvider)
+        {
+            CacheEntry entry;
+            if (_cacheEntries.TryGetValue(metadata, out entry))
+            {
+                return GetValidatorsFromEntry(entry, metadata, validatorProvider);
+            }
+
+            var items = new List<ValidatorItem>(metadata.ValidatorMetadata.Count);
+            for (var i = 0; i < metadata.ValidatorMetadata.Count; i++)
+            {
+                items.Add(new ValidatorItem(metadata.ValidatorMetadata[i]));
+            }
+
+            ExecuteProvider(validatorProvider, metadata, items);
+
+            var validators = ExtractValidators(items);
+
+            var allValidatorsCached = true;
+            for (var i = 0; i < items.Count; i++)
+            {
+                var item = items[i];
+                if (!item.IsReusable)
+                {
+                    item.Validator = null;
+                    allValidatorsCached = false;
+                }
+            }
+
+            if (allValidatorsCached)
+            {
+                entry = new CacheEntry(validators);
+            }
+            else
+            {
+                entry = new CacheEntry(items);
+            }
+
+            _cacheEntries.TryAdd(metadata, entry);
+
+            return validators;
+        }
+
+        private IReadOnlyList<IModelValidator> GetValidatorsFromEntry(CacheEntry entry, ModelMetadata metadata, IModelValidatorProvider validationProvider)
+        {
+            Debug.Assert(entry.Validators != null || entry.Items != null);
+
+            if (entry.Validators != null)
+            {
+                return entry.Validators;
+            }
+
+            var items = new List<ValidatorItem>(entry.Items.Count);
+            for (var i = 0; i < entry.Items.Count; i++)
+            {
+                var item = entry.Items[i];
+                if (item.IsReusable)
+                {
+                    items.Add(item);
+                }
+                else
+                {
+                    items.Add(new ValidatorItem(item.ValidatorMetadata));
+                }
+            }
+
+            ExecuteProvider(validationProvider, metadata, items);
+
+            return ExtractValidators(items);
+        }
+
+        private void ExecuteProvider(IModelValidatorProvider validatorProvider, ModelMetadata metadata, List<ValidatorItem> items)
+        {
+            var context = new ModelValidatorProviderContext(metadata, items);
+            validatorProvider.CreateValidators(context);
+        }
+
+        private IReadOnlyList<IModelValidator> ExtractValidators(List<ValidatorItem> items)
+        {
+            var count = 0;
+            for (var i = 0; i < items.Count; i++)
+            {
+                if (items[i].Validator != null)
+                {
+                    count++;
+                }
+            }
+
+            if (count == 0)
+            {
+                return Array.Empty<IModelValidator>();
+            }
+
+            var validators = new IModelValidator[count];
+
+            var validatorIndex = 0;
+            for (int i = 0; i < items.Count; i++)
+            {
+                var validator = items[i].Validator;
+                if (validator != null)
+                {
+                    validators[validatorIndex++] = validator;
+                }
+            }
+
+            return validators;
+        }
+
+        private struct CacheEntry
+        {
+            public CacheEntry(IReadOnlyList<IModelValidator> validators)
+            {
+                Validators = validators;
+                Items = null;
+            }
+
+            public CacheEntry(List<ValidatorItem> items)
+            {
+                Items = items;
+                Validators = null;
+            }
+
+            public IReadOnlyList<IModelValidator> Validators { get; }
+
+            public List<ValidatorItem> Items { get; }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ViewEnginePath.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ViewEnginePath.cs
new file mode 100644
index 0000000000..29d4f85597
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Internal/ViewEnginePath.cs
@@ -0,0 +1,119 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public static class ViewEnginePath
+    {
+        public static readonly char[] PathSeparators = new[] { '/', '\\' };
+        private const string CurrentDirectoryToken = ".";
+        private const string ParentDirectoryToken = "..";
+
+        public static string CombinePath(string first, string second)
+        {
+            Debug.Assert(!string.IsNullOrEmpty(first));
+
+            if (second.StartsWith("/", StringComparison.Ordinal))
+            {
+                // "second" is already an app-rooted path. Return it as-is.
+                return second;
+            }
+
+            string result;
+           
+            // Get directory name (including final slash) but do not use Path.GetDirectoryName() to preserve path
+            // normalization.
+            var index = first.LastIndexOf('/');
+            Debug.Assert(index >= 0);
+
+            if (index == first.Length - 1)
+            {
+                // If the first ends in a trailing slash e.g. "/Home/", assume it's a directory.
+                result = first + second;
+            }
+            else
+            {
+                result = first.Substring(0, index + 1) + second;
+            }
+
+            return ResolvePath(result);
+        }
+
+        public static string ResolvePath(string path)
+        {
+            Debug.Assert(!string.IsNullOrEmpty(path));
+            var pathSegment = new StringSegment(path);
+            if (path[0] == PathSeparators[0] || path[0] == PathSeparators[1])
+            {
+                // Leading slashes (e.g. "/Views/Index.cshtml") always generate an empty first token. Ignore these
+                // for purposes of resolution.
+                pathSegment = pathSegment.Subsegment(1);
+            }
+
+            var tokenizer = new StringTokenizer(pathSegment, PathSeparators);
+            var requiresResolution = false;
+            foreach (var segment in tokenizer)
+            {
+                // Determine if we need to do any path resolution.
+                // We need to resolve paths with multiple path separators (e.g "//" or "\\") or, directory traversals e.g. ("../" or "./").
+                if (segment.Length == 0 ||
+                    segment.Equals(ParentDirectoryToken, StringComparison.Ordinal) ||
+                    segment.Equals(CurrentDirectoryToken, StringComparison.Ordinal))
+                {
+                    requiresResolution = true;
+                    break;
+                }
+            }
+
+            if (!requiresResolution)
+            {
+                return path;
+            }
+
+            var pathSegments = new List<StringSegment>();
+            foreach (var segment in tokenizer)
+            {
+                if (segment.Length == 0)
+                {
+                    // Ignore multiple directory separators
+                    continue;
+                }
+                if (segment.Equals(ParentDirectoryToken, StringComparison.Ordinal))
+                {
+                    if (pathSegments.Count == 0)
+                    {
+                        // Don't resolve the path if we ever escape the file system root. We can't reason about it in a
+                        // consistent way.
+                        return path;
+                    }
+                    pathSegments.RemoveAt(pathSegments.Count - 1);
+                }
+                else if (segment.Equals(CurrentDirectoryToken, StringComparison.Ordinal))
+                {
+                    // We already have the current directory
+                    continue;
+                }
+                else
+                {
+                    pathSegments.Add(segment);
+                }
+            }
+
+            var builder = new StringBuilder();
+            for (var i = 0; i < pathSegments.Count; i++)
+            {
+                var segment = pathSegments[i];
+                builder.Append('/');
+                builder.Append(segment.Buffer, segment.Offset, segment.Length);
+            }
+
+            return builder.ToString();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/LocalRedirectResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/LocalRedirectResult.cs
new file mode 100644
index 0000000000..ca20eb5020
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/LocalRedirectResult.cs
@@ -0,0 +1,146 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="ActionResult"/> that returns a Found (302), Moved Permanently (301), Temporary Redirect (307),
+    /// or Permanent Redirect (308) response with a Location header to the supplied local URL.
+    /// </summary>
+    public class LocalRedirectResult : ActionResult
+    {
+        private string _localUrl;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LocalRedirectResult"/> class with the values
+        /// provided.
+        /// </summary>
+        /// <param name="localUrl">The local URL to redirect to.</param>
+        public LocalRedirectResult(string localUrl)
+             : this(localUrl, permanent: false)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LocalRedirectResult"/> class with the values
+        /// provided.
+        /// </summary>
+        /// <param name="localUrl">The local URL to redirect to.</param>
+        /// <param name="permanent">Specifies whether the redirect should be permanent (301) or temporary (302).</param>
+        public LocalRedirectResult(string localUrl, bool permanent)
+            : this(localUrl, permanent, preserveMethod: false)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LocalRedirectResult"/> class with the values
+        /// provided.
+        /// </summary>
+        /// <param name="localUrl">The local URL to redirect to.</param>
+        /// <param name="permanent">Specifies whether the redirect should be permanent (301) or temporary (302).</param>
+        /// <param name="preserveMethod">If set to true, make the temporary redirect (307) or permanent redirect (308) preserve the initial request's method.</param>
+        public LocalRedirectResult(string localUrl, bool permanent, bool preserveMethod)
+        {
+            if (string.IsNullOrEmpty(localUrl))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(localUrl));
+            }
+
+            Permanent = permanent;
+            PreserveMethod = preserveMethod;
+            Url = localUrl;
+        }
+
+        /// <summary>
+        /// Gets or sets the value that specifies that the redirect should be permanent if true or temporary if false.
+        /// </summary>
+        public bool Permanent { get; set; }
+
+        /// <summary>
+        /// Gets or sets an indication that the redirect preserves the initial request method.
+        /// </summary>
+        public bool PreserveMethod { get; set; }
+
+        /// <summary>
+        /// Gets or sets the local URL to redirect to.
+        /// </summary>
+        public string Url
+        {
+            get => _localUrl;
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                {
+                    throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(value));
+                }
+
+                _localUrl = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IUrlHelper"/> for this result.
+        /// </summary>
+        public IUrlHelper UrlHelper { get; set; }
+
+        /// <inheritdoc />
+        public override Task ExecuteResultAsync(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var executor = context.HttpContext.RequestServices.GetRequiredService<IActionResultExecutor<LocalRedirectResult>>();
+            return executor.ExecuteAsync(context, this);
+        }
+
+#pragma warning disable CS0809
+        [Obsolete("This implementation will be removed in a future release, use ExecuteResultAsync.")]
+        public override void ExecuteResult(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var services = context.HttpContext.RequestServices;
+            var urlHelperFactory = services.GetRequiredService<IUrlHelperFactory>();
+            var logger = services.GetRequiredService<ILogger<LocalRedirectResult>>();
+
+            var urlHelper = UrlHelper ?? urlHelperFactory.GetUrlHelper(context);
+
+            // IsLocalUrl is called to handle  Urls starting with '~/'.
+            if (!urlHelper.IsLocalUrl(Url))
+            {
+                throw new InvalidOperationException(Resources.UrlNotLocal);
+            }
+
+            var destinationUrl = urlHelper.Content(Url);
+            logger.LocalRedirectResultExecuting(destinationUrl);
+
+            if (PreserveMethod)
+            {
+                context.HttpContext.Response.StatusCode = Permanent ?
+                    StatusCodes.Status308PermanentRedirect : StatusCodes.Status307TemporaryRedirect;
+                context.HttpContext.Response.Headers[HeaderNames.Location] = destinationUrl;
+            }
+            else
+            {
+                context.HttpContext.Response.Redirect(destinationUrl, Permanent);
+            }
+        }
+#pragma warning restore CS0809
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj
new file mode 100644
index 0000000000..8014ae9cc2
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj
@@ -0,0 +1,47 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ASP.NET Core MVC core components. Contains common action result types, attribute routing, application model conventions, API explorer, application parts, filters, formatters, model binding, and more.
+Commonly used types:
+Microsoft.AspNetCore.Mvc.AreaAttribute
+Microsoft.AspNetCore.Mvc.BindAttribute
+Microsoft.AspNetCore.Mvc.ControllerBase
+Microsoft.AspNetCore.Mvc.FromBodyAttribute
+Microsoft.AspNetCore.Mvc.FromFormAttribute
+Microsoft.AspNetCore.Mvc.RequireHttpsAttribute
+Microsoft.AspNetCore.Mvc.RouteAttribute</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Abstractions\Microsoft.AspNetCore.Mvc.Abstractions.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="$(MicrosoftAspNetCoreAuthenticationCorePackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Authorization.Policy" Version="$(MicrosoftAspNetCoreAuthorizationPolicyPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(MicrosoftAspNetCoreHostingAbstractionsPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(MicrosoftAspNetCoreHttpPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="$(MicrosoftAspNetCoreHttpExtensionsPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.RangeHelper.Sources" PrivateAssets="All" Version="$(MicrosoftAspNetCoreRangeHelperSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" Version="$(MicrosoftAspNetCoreResponseCachingAbstractionsPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Routing" Version="$(MicrosoftAspNetCoreRoutingPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.ObjectMethodExecutor.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.ParameterDefaultValue.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.PropertyActivator.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsPropertyActivatorSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsPropertyHelperSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.SecurityHelper.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsSecurityHelperSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.TypeNameHelper.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsTypeNameHelperSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.ValueStopwatch.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsValueStopwatchSourcesPackageVersion)" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinderAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinderAttribute.cs
new file mode 100644
index 0000000000..c80e2d0fe5
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinderAttribute.cs
@@ -0,0 +1,75 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An attribute that can specify a model name or type of <see cref="IModelBinder"/> to use for binding.
+    /// </summary>
+    [AttributeUsage(
+
+        // Support method parameters in actions.
+        AttributeTargets.Parameter |
+
+        // Support properties on model DTOs.
+        AttributeTargets.Property |
+
+        // Support model types.
+        AttributeTargets.Class |
+        AttributeTargets.Enum |
+        AttributeTargets.Struct,
+
+        AllowMultiple = false,
+        Inherited = true)]
+    public class ModelBinderAttribute : Attribute, IModelNameProvider, IBinderTypeProviderMetadata
+    {
+        private BindingSource _bindingSource;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ModelBinderAttribute"/>.
+        /// </summary>
+        public ModelBinderAttribute()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ModelBinderAttribute"/>.
+        /// </summary>
+        /// <param name="binderType">A <see cref="Type"/> which implements <see cref="IModelBinder"/>.</param>
+        public ModelBinderAttribute(Type binderType)
+        {
+            if (binderType == null)
+            {
+                throw new ArgumentNullException(nameof(binderType));
+            }
+            BinderType = binderType;
+        }
+
+        /// <inheritdoc />
+        public Type BinderType { get; set; }
+
+        /// <inheritdoc />
+        public virtual BindingSource BindingSource
+        {
+            get
+            {
+                if (_bindingSource == null && BinderType != null)
+                {
+                    return BindingSource.Custom;
+                }
+
+                return _bindingSource;
+            }
+            protected set
+            {
+                _bindingSource = value;
+            }
+        }
+
+        /// <inheritdoc />
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindNeverAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindNeverAttribute.cs
new file mode 100644
index 0000000000..12a5077d41
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindNeverAttribute.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Indicates that a property should be excluded from model binding. When applied to a property, the model binding
+    /// system excludes that property. When applied to a type, the model binding system excludes all properties that
+    /// type defines.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Property | AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)]
+    public sealed class BindNeverAttribute : BindingBehaviorAttribute
+    {
+        /// <summary>
+        /// Initializes a new <see cref="BindNeverAttribute"/> instance.
+        /// </summary>
+        public BindNeverAttribute()
+            : base(BindingBehavior.Never)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindRequiredAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindRequiredAttribute.cs
new file mode 100644
index 0000000000..247dde0e26
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindRequiredAttribute.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Indicates that a property is required for model binding. When applied to a property, the model binding system
+    /// requires a value for that property. When applied to a type, the model binding system requires values for all
+    /// properties that type defines.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Property | AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)]
+    public sealed class BindRequiredAttribute : BindingBehaviorAttribute
+    {
+        /// <summary>
+        /// Initializes a new <see cref="BindRequiredAttribute"/> instance.
+        /// </summary>
+        public BindRequiredAttribute()
+            : base(BindingBehavior.Required)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ArrayModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ArrayModelBinder.cs
new file mode 100644
index 0000000000..96c6a31288
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ArrayModelBinder.cs
@@ -0,0 +1,81 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// <see cref="IModelBinder"/> implementation for binding array values.
+    /// </summary>
+    /// <typeparam name="TElement">Type of elements in the array.</typeparam>
+    public class ArrayModelBinder<TElement> : CollectionModelBinder<TElement>
+    {
+        /// <summary>
+        /// <para>This constructor is obsolete and will be removed in a future version. The recommended alternative
+        /// is the overload that also takes an <see cref="ILoggerFactory"/>.</para>
+        /// <para>Creates a new <see cref="ArrayModelBinder{TElement}"/>.</para>
+        /// </summary>
+        /// <param name="elementBinder">
+        /// The <see cref="IModelBinder"/> for binding <typeparamref name="TElement"/>.
+        /// </param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version. The recommended alternative"
+            + " is the overload that also takes an " + nameof(ILoggerFactory) + ".")]
+        public ArrayModelBinder(IModelBinder elementBinder)
+            : this(elementBinder, NullLoggerFactory.Instance)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="ArrayModelBinder{TElement}"/>.
+        /// </summary>
+        /// <param name="elementBinder">
+        /// The <see cref="IModelBinder"/> for binding <typeparamref name="TElement"/>.
+        /// </param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public ArrayModelBinder(IModelBinder elementBinder, ILoggerFactory loggerFactory)
+            : base(elementBinder, loggerFactory)
+        {
+        }
+
+        /// <inheritdoc />
+        public override bool CanCreateInstance(Type targetType)
+        {
+            return targetType == typeof(TElement[]);
+        }
+
+        /// <inheritdoc />
+        protected override object CreateEmptyCollection(Type targetType)
+        {
+            Debug.Assert(targetType == typeof(TElement[]), "GenericModelBinder only creates this binder for arrays.");
+
+            return Array.Empty<TElement>();
+        }
+
+        /// <inheritdoc />
+        protected override object ConvertToCollectionType(Type targetType, IEnumerable<TElement> collection)
+        {
+            Debug.Assert(targetType == typeof(TElement[]), "GenericModelBinder only creates this binder for arrays.");
+
+            // If non-null, collection is a List<TElement>, never already a TElement[].
+            return collection?.ToArray();
+        }
+
+        /// <inheritdoc />
+        protected override void CopyToModel(object target, IEnumerable<TElement> sourceCollection)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            // Do not attempt to copy values into an array because an array's length is immutable. This choice is also
+            // consistent with our handling of a read-only array property.
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ArrayModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ArrayModelBinderProvider.cs
new file mode 100644
index 0000000000..190390b9c7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ArrayModelBinderProvider.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinderProvider"/> for arrays.
+    /// </summary>
+    public class ArrayModelBinderProvider : IModelBinderProvider
+    {
+        /// <inheritdoc />
+        public IModelBinder GetBinder(ModelBinderProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (context.Metadata.ModelType.IsArray)
+            {
+                var elementType = context.Metadata.ElementMetadata.ModelType;
+                var elementBinder = context.CreateBinder(context.Metadata.ElementMetadata);
+
+                var binderType = typeof(ArrayModelBinder<>).MakeGenericType(elementType);
+                var loggerFactory = context.Services.GetRequiredService<ILoggerFactory>();
+                return (IModelBinder)Activator.CreateInstance(binderType, elementBinder, loggerFactory);
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BinderTypeModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BinderTypeModelBinder.cs
new file mode 100644
index 0000000000..6f715ccdd0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BinderTypeModelBinder.cs
@@ -0,0 +1,57 @@
+// 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.
+
+using System;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinder"/> for models which specify an <see cref="IModelBinder"/> using
+    /// <see cref="BindingInfo.BinderType"/>.
+    /// </summary>
+    public class BinderTypeModelBinder : IModelBinder
+    {
+        private readonly ObjectFactory _factory;
+
+        /// <summary>
+        /// Creates a new <see cref="BinderTypeModelBinder"/>.
+        /// </summary>
+        /// <param name="binderType">The <see cref="Type"/> of the <see cref="IModelBinder"/>.</param>
+        public BinderTypeModelBinder(Type binderType)
+        {
+            if (binderType == null)
+            {
+                throw new ArgumentNullException(nameof(binderType));
+            }
+
+            if (!typeof(IModelBinder).GetTypeInfo().IsAssignableFrom(binderType.GetTypeInfo()))
+            {
+                throw new ArgumentException(
+                    Resources.FormatBinderType_MustBeIModelBinder(
+                        binderType.FullName,
+                        typeof(IModelBinder).FullName),
+                    nameof(binderType));
+            }
+
+            _factory = ActivatorUtilities.CreateFactory(binderType, Type.EmptyTypes);
+        }
+
+        /// <inheritdoc />
+        public async Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            if (bindingContext == null)
+            {
+                throw new ArgumentNullException(nameof(bindingContext));
+            }
+
+            var requestServices = bindingContext.HttpContext.RequestServices;
+            var binder = (IModelBinder)_factory(requestServices, arguments: null);
+
+            await binder.BindModelAsync(bindingContext);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BinderTypeModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BinderTypeModelBinderProvider.cs
new file mode 100644
index 0000000000..aa56c0edcb
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BinderTypeModelBinderProvider.cs
@@ -0,0 +1,30 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinderProvider"/> for models which specify an <see cref="IModelBinder"/>
+    /// using <see cref="BindingInfo.BinderType"/>.
+    /// </summary>
+    public class BinderTypeModelBinderProvider : IModelBinderProvider
+    {
+        /// <inheritdoc />
+        public IModelBinder GetBinder(ModelBinderProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (context.BindingInfo.BinderType != null)
+            {
+                return new BinderTypeModelBinder(context.BindingInfo.BinderType);
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BodyModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BodyModelBinder.cs
new file mode 100644
index 0000000000..8e0744cfda
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BodyModelBinder.cs
@@ -0,0 +1,207 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinder"/> which binds models from the request body using an <see cref="IInputFormatter"/>
+    /// when a model has the binding source <see cref="BindingSource.Body"/>.
+    /// </summary>
+    public class BodyModelBinder : IModelBinder
+    {
+        private readonly IList<IInputFormatter> _formatters;
+        private readonly Func<Stream, Encoding, TextReader> _readerFactory;
+        private readonly ILogger _logger;
+        private readonly MvcOptions _options;
+
+        /// <summary>
+        /// Creates a new <see cref="BodyModelBinder"/>.
+        /// </summary>
+        /// <param name="formatters">The list of <see cref="IInputFormatter"/>.</param>
+        /// <param name="readerFactory">
+        /// The <see cref="IHttpRequestStreamReaderFactory"/>, used to create <see cref="System.IO.TextReader"/>
+        /// instances for reading the request body.
+        /// </param>
+        public BodyModelBinder(IList<IInputFormatter> formatters, IHttpRequestStreamReaderFactory readerFactory)
+            : this(formatters, readerFactory, loggerFactory: null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="BodyModelBinder"/>.
+        /// </summary>
+        /// <param name="formatters">The list of <see cref="IInputFormatter"/>.</param>
+        /// <param name="readerFactory">
+        /// The <see cref="IHttpRequestStreamReaderFactory"/>, used to create <see cref="System.IO.TextReader"/>
+        /// instances for reading the request body.
+        /// </param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public BodyModelBinder(
+            IList<IInputFormatter> formatters,
+            IHttpRequestStreamReaderFactory readerFactory,
+            ILoggerFactory loggerFactory)
+            : this(formatters, readerFactory, loggerFactory, options: null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="BodyModelBinder"/>.
+        /// </summary>
+        /// <param name="formatters">The list of <see cref="IInputFormatter"/>.</param>
+        /// <param name="readerFactory">
+        /// The <see cref="IHttpRequestStreamReaderFactory"/>, used to create <see cref="System.IO.TextReader"/>
+        /// instances for reading the request body.
+        /// </param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        /// <param name="options">The <see cref="MvcOptions"/>.</param>
+        public BodyModelBinder(
+            IList<IInputFormatter> formatters,
+            IHttpRequestStreamReaderFactory readerFactory,
+            ILoggerFactory loggerFactory,
+            MvcOptions options)
+        {
+            if (formatters == null)
+            {
+                throw new ArgumentNullException(nameof(formatters));
+            }
+
+            if (readerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(readerFactory));
+            }
+
+            _formatters = formatters;
+            _readerFactory = readerFactory.CreateReader;
+
+            if (loggerFactory != null)
+            {
+                _logger = loggerFactory.CreateLogger<BodyModelBinder>();
+            }
+
+            _options = options;
+        }
+
+        /// <inheritdoc />
+        public async Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            if (bindingContext == null)
+            {
+                throw new ArgumentNullException(nameof(bindingContext));
+            }
+
+            _logger?.AttemptingToBindModel(bindingContext);
+
+            // Special logic for body, treat the model name as string.Empty for the top level
+            // object, but allow an override via BinderModelName. The purpose of this is to try
+            // and be similar to the behavior for POCOs bound via traditional model binding.
+            string modelBindingKey;
+            if (bindingContext.IsTopLevelObject)
+            {
+                modelBindingKey = bindingContext.BinderModelName ?? string.Empty;
+            }
+            else
+            {
+                modelBindingKey = bindingContext.ModelName;
+            }
+
+            var httpContext = bindingContext.HttpContext;
+
+            var allowEmptyInputInModelBinding = _options?.AllowEmptyInputInBodyModelBinding == true;
+
+            var formatterContext = new InputFormatterContext(
+                httpContext,
+                modelBindingKey,
+                bindingContext.ModelState,
+                bindingContext.ModelMetadata,
+                _readerFactory,
+                allowEmptyInputInModelBinding);
+
+            var formatter = (IInputFormatter)null;
+            for (var i = 0; i < _formatters.Count; i++)
+            {
+                if (_formatters[i].CanRead(formatterContext))
+                {
+                    formatter = _formatters[i];
+                    _logger?.InputFormatterSelected(formatter, formatterContext);
+                    break;
+                }
+                else
+                {
+                    _logger?.InputFormatterRejected(_formatters[i], formatterContext);
+                }
+            }
+
+            if (formatter == null)
+            {
+                _logger?.NoInputFormatterSelected(formatterContext);
+
+                var message = Resources.FormatUnsupportedContentType(httpContext.Request.ContentType);
+                var exception = new UnsupportedContentTypeException(message);
+                bindingContext.ModelState.AddModelError(modelBindingKey, exception, bindingContext.ModelMetadata);
+                _logger?.DoneAttemptingToBindModel(bindingContext);
+                return;
+            }
+
+            try
+            {
+                var result = await formatter.ReadAsync(formatterContext);
+
+                if (result.HasError)
+                {
+                    // Formatter encountered an error. Do not use the model it returned.
+                    _logger?.DoneAttemptingToBindModel(bindingContext);
+                    return;
+                }
+
+                if (result.IsModelSet)
+                {
+                    var model = result.Model;
+                    bindingContext.Result = ModelBindingResult.Success(model);
+                }
+                else
+                {
+                    // If the input formatter gives a "no value" result, that's always a model state error,
+                    // because BodyModelBinder implicitly regards input as being required for model binding.
+                    // If instead the input formatter wants to treat the input as optional, it must do so by
+                    // returning InputFormatterResult.Success(defaultForModelType), because input formatters
+                    // are responsible for choosing a default value for the model type.
+                    var message = bindingContext
+                        .ModelMetadata
+                        .ModelBindingMessageProvider
+                        .MissingRequestBodyRequiredValueAccessor();
+                    bindingContext.ModelState.AddModelError(modelBindingKey, message);
+                }
+            }
+            catch (Exception exception) when (exception is InputFormatterException || ShouldHandleException(formatter))
+            {
+                bindingContext.ModelState.AddModelError(modelBindingKey, exception, bindingContext.ModelMetadata);
+            }
+
+            _logger?.DoneAttemptingToBindModel(bindingContext);
+        }
+
+        private bool ShouldHandleException(IInputFormatter formatter)
+        {
+            var policy = _options.InputFormatterExceptionPolicy;
+
+            // Any explicit policy on the formatters takes precedence over the global policy on MvcOptions
+            if (formatter is IInputFormatterExceptionPolicy exceptionPolicy)
+            {
+                policy = exceptionPolicy.ExceptionPolicy;
+            }
+
+            return policy == InputFormatterExceptionPolicy.AllExceptions;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BodyModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BodyModelBinderProvider.cs
new file mode 100644
index 0000000000..c2110c793e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BodyModelBinderProvider.cs
@@ -0,0 +1,98 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinderProvider"/> for deserializing the request body using a formatter.
+    /// </summary>
+    public class BodyModelBinderProvider : IModelBinderProvider
+    {
+        private readonly IList<IInputFormatter> _formatters;
+        private readonly IHttpRequestStreamReaderFactory _readerFactory;
+        private readonly ILoggerFactory _loggerFactory;
+        private readonly MvcOptions _options;
+
+        /// <summary>
+        /// Creates a new <see cref="BodyModelBinderProvider"/>.
+        /// </summary>
+        /// <param name="formatters">The list of <see cref="IInputFormatter"/>.</param>
+        /// <param name="readerFactory">The <see cref="IHttpRequestStreamReaderFactory"/>.</param>
+        public BodyModelBinderProvider(IList<IInputFormatter> formatters, IHttpRequestStreamReaderFactory readerFactory)
+            : this(formatters, readerFactory, loggerFactory: null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="BodyModelBinderProvider"/>.
+        /// </summary>
+        /// <param name="formatters">The list of <see cref="IInputFormatter"/>.</param>
+        /// <param name="readerFactory">The <see cref="IHttpRequestStreamReaderFactory"/>.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public BodyModelBinderProvider(IList<IInputFormatter> formatters, IHttpRequestStreamReaderFactory readerFactory, ILoggerFactory loggerFactory)
+            : this(formatters, readerFactory, loggerFactory, options: null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="BodyModelBinderProvider"/>.
+        /// </summary>
+        /// <param name="formatters">The list of <see cref="IInputFormatter"/>.</param>
+        /// <param name="readerFactory">The <see cref="IHttpRequestStreamReaderFactory"/>.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        /// <param name="options">The <see cref="MvcOptions"/>.</param>
+        public BodyModelBinderProvider(
+            IList<IInputFormatter> formatters,
+            IHttpRequestStreamReaderFactory readerFactory,
+            ILoggerFactory loggerFactory,
+            MvcOptions options)
+        {
+            if (formatters == null)
+            {
+                throw new ArgumentNullException(nameof(formatters));
+            }
+
+            if (readerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(readerFactory));
+            }
+
+            _formatters = formatters;
+            _readerFactory = readerFactory;
+            _loggerFactory = loggerFactory;
+            _options = options;
+        }
+
+        /// <inheritdoc />
+        public IModelBinder GetBinder(ModelBinderProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (context.BindingInfo.BindingSource != null &&
+                context.BindingInfo.BindingSource.CanAcceptDataFrom(BindingSource.Body))
+            {
+                if (_formatters.Count == 0)
+                {
+                    throw new InvalidOperationException(Resources.FormatInputFormattersAreRequired(
+                        typeof(MvcOptions).FullName,
+                        nameof(MvcOptions.InputFormatters),
+                        typeof(IInputFormatter).FullName));
+                }
+
+                return new BodyModelBinder(_formatters, _readerFactory, _loggerFactory, _options);
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ByteArrayModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ByteArrayModelBinder.cs
new file mode 100644
index 0000000000..99461f9ec9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ByteArrayModelBinder.cs
@@ -0,0 +1,92 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// ModelBinder to bind byte Arrays.
+    /// </summary>
+    public class ByteArrayModelBinder : IModelBinder
+    {
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// <para>This constructor is obsolete and will be removed in a future version. The recommended alternative
+        /// is the overload that takes an <see cref="ILoggerFactory"/>.</para>
+        /// <para>Initializes a new instance of <see cref="ByteArrayModelBinder"/>.</para>
+        /// </summary>
+        [Obsolete("This constructor is obsolete and will be removed in a future version. The recommended alternative"
+            + " is the overload that takes an " + nameof(ILoggerFactory) + ".")]
+        public ByteArrayModelBinder()
+            : this(NullLoggerFactory.Instance)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ByteArrayModelBinder"/>.
+        /// </summary>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public ByteArrayModelBinder(ILoggerFactory loggerFactory)
+        {
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            _logger = loggerFactory.CreateLogger<ByteArrayModelBinder>();
+        }
+
+        /// <inheritdoc />
+        public Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            if (bindingContext == null)
+            {
+                throw new ArgumentNullException(nameof(bindingContext));
+            }
+
+            _logger.AttemptingToBindModel(bindingContext);
+
+            // Check for missing data case 1: There was no <input ... /> element containing this data.
+            var valueProviderResult = bindingContext.ValueProvider.GetValue(bindingContext.ModelName);
+            if (valueProviderResult == ValueProviderResult.None)
+            {
+                _logger.FoundNoValueInRequest(bindingContext);
+                _logger.DoneAttemptingToBindModel(bindingContext);
+                return Task.CompletedTask;
+            }
+
+            bindingContext.ModelState.SetModelValue(bindingContext.ModelName, valueProviderResult);
+
+            // Check for missing data case 2: There was an <input ... /> element but it was left blank.
+            var value = valueProviderResult.FirstValue;
+            if (string.IsNullOrEmpty(value))
+            {
+                _logger.FoundNoValueInRequest(bindingContext);
+                _logger.DoneAttemptingToBindModel(bindingContext);
+                return Task.CompletedTask;
+            }
+
+            try
+            {
+                var model = Convert.FromBase64String(value);
+                bindingContext.Result = ModelBindingResult.Success(model);
+            }
+            catch (Exception exception)
+            {
+                bindingContext.ModelState.TryAddModelError(
+                    bindingContext.ModelName,
+                    exception,
+                    bindingContext.ModelMetadata);
+            }
+
+            _logger.DoneAttemptingToBindModel(bindingContext);
+            return Task.CompletedTask;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ByteArrayModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ByteArrayModelBinderProvider.cs
new file mode 100644
index 0000000000..402f796640
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ByteArrayModelBinderProvider.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinderProvider"/> for binding base64 encoded byte arrays.
+    /// </summary>
+    public class ByteArrayModelBinderProvider : IModelBinderProvider
+    {
+        /// <inheritdoc />
+        public IModelBinder GetBinder(ModelBinderProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (context.Metadata.ModelType == typeof(byte[]))
+            {
+                var loggerFactory = context.Services.GetRequiredService<ILoggerFactory>();
+                return new ByteArrayModelBinder(loggerFactory);
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CancellationTokenModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CancellationTokenModelBinder.cs
new file mode 100644
index 0000000000..b8b9493ffe
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CancellationTokenModelBinder.cs
@@ -0,0 +1,35 @@
+// 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.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// <see cref="IModelBinder"/> implementation to bind models of type <see cref="CancellationToken"/>.
+    /// </summary>
+    public class CancellationTokenModelBinder : IModelBinder
+    {
+        /// <inheritdoc />
+        public Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            if (bindingContext == null)
+            {
+                throw new ArgumentNullException(nameof(bindingContext));
+            }
+
+            // We need to force boxing now, so we can insert the same reference to the boxed CancellationToken
+            // in both the ValidationState and ModelBindingResult.
+            //
+            // DO NOT simplify this code by removing the cast.
+            var model = (object)bindingContext.HttpContext.RequestAborted;
+            bindingContext.ValidationState.Add(model, new ValidationStateEntry() { SuppressValidation = true });
+            bindingContext.Result = ModelBindingResult.Success(model);
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CancellationTokenModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CancellationTokenModelBinderProvider.cs
new file mode 100644
index 0000000000..b3ee6f7361
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CancellationTokenModelBinderProvider.cs
@@ -0,0 +1,30 @@
+// 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.
+
+using System;
+using System.Threading;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinderProvider"/> for <see cref="CancellationToken"/>.
+    /// </summary>
+    public class CancellationTokenModelBinderProvider : IModelBinderProvider
+    {
+        /// <inheritdoc />
+        public IModelBinder GetBinder(ModelBinderProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (context.Metadata.ModelType == typeof(CancellationToken))
+            {
+                return new CancellationTokenModelBinder();
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinder.cs
new file mode 100644
index 0000000000..16834ebadc
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinder.cs
@@ -0,0 +1,417 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// <see cref="IModelBinder"/> implementation for binding collection values.
+    /// </summary>
+    /// <typeparam name="TElement">Type of elements in the collection.</typeparam>
+    public class CollectionModelBinder<TElement> : ICollectionModelBinder
+    {
+        private static readonly IValueProvider EmptyValueProvider = new CompositeValueProvider();
+        private Func<object> _modelCreator;
+
+        /// <summary>
+        /// <para>This constructor is obsolete and will be removed in a future version. The recommended alternative
+        /// is the overload that also takes an <see cref="ILoggerFactory"/>.</para>
+        /// <para>Creates a new <see cref="CollectionModelBinder{TElement}"/>.</para>
+        /// </summary>
+        /// <param name="elementBinder">The <see cref="IModelBinder"/> for binding elements.</param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version. The recommended alternative"
+            + " is the overload that also takes an " + nameof(ILoggerFactory) + ".")]
+        public CollectionModelBinder(IModelBinder elementBinder)
+            : this(elementBinder, NullLoggerFactory.Instance)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="CollectionModelBinder{TElement}"/>.
+        /// </summary>
+        /// <param name="elementBinder">The <see cref="IModelBinder"/> for binding elements.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public CollectionModelBinder(IModelBinder elementBinder, ILoggerFactory loggerFactory)
+        {
+            if (elementBinder == null)
+            {
+                throw new ArgumentNullException(nameof(elementBinder));
+            }
+
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            ElementBinder = elementBinder;
+            Logger = loggerFactory.CreateLogger(GetType());
+        }
+
+        /// <summary>
+        /// Gets the <see cref="IModelBinder"/> instances for binding collection elements.
+        /// </summary>
+        protected IModelBinder ElementBinder { get; }
+
+        /// <summary>
+        /// The <see cref="ILogger"/> used for logging in this binder.
+        /// </summary>
+        protected ILogger Logger { get; }
+
+        /// <inheritdoc />
+        public virtual async Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            if (bindingContext == null)
+            {
+                throw new ArgumentNullException(nameof(bindingContext));
+            }
+
+            Logger.AttemptingToBindModel(bindingContext);
+
+            var model = bindingContext.Model;
+            if (!bindingContext.ValueProvider.ContainsPrefix(bindingContext.ModelName))
+            {
+                Logger.FoundNoValueInRequest(bindingContext);
+
+                // If we failed to find data for a top-level model, then generate a
+                // default 'empty' model (or use existing Model) and return it.
+                if (bindingContext.IsTopLevelObject)
+                {
+                    if (model == null)
+                    {
+                        model = CreateEmptyCollection(bindingContext.ModelType);
+                    }
+
+                    bindingContext.Result = ModelBindingResult.Success(model);
+                }
+
+                Logger.DoneAttemptingToBindModel(bindingContext);
+                return;
+            }
+
+            var valueProviderResult = bindingContext.ValueProvider.GetValue(bindingContext.ModelName);
+
+            CollectionResult result;
+            if (valueProviderResult == ValueProviderResult.None)
+            {
+                Logger.NoNonIndexBasedFormatFoundForCollection(bindingContext);
+                result = await BindComplexCollection(bindingContext);
+            }
+            else
+            {
+                result = await BindSimpleCollection(bindingContext, valueProviderResult);
+            }
+
+            var boundCollection = result.Model;
+            if (model == null)
+            {
+                model = ConvertToCollectionType(bindingContext.ModelType, boundCollection);
+            }
+            else
+            {
+                // Special case for TryUpdateModelAsync(collection, ...) scenarios. Model is null in all other cases.
+                CopyToModel(model, boundCollection);
+            }
+
+            Debug.Assert(model != null);
+            if (result.ValidationStrategy != null)
+            {
+                bindingContext.ValidationState.Add(model, new ValidationStateEntry()
+                {
+                    Strategy = result.ValidationStrategy,
+                });
+            }
+
+            if (valueProviderResult != ValueProviderResult.None)
+            {
+                // If we did simple binding, then modelstate should be updated to reflect what we bound for ModelName.
+                // If we did complex binding, there will already be an entry for each index.
+                bindingContext.ModelState.SetModelValue(
+                    bindingContext.ModelName,
+                    valueProviderResult);
+            }
+
+            bindingContext.Result = ModelBindingResult.Success(model);
+            Logger.DoneAttemptingToBindModel(bindingContext);
+        }
+
+        /// <inheritdoc />
+        public virtual bool CanCreateInstance(Type targetType)
+        {
+            if (targetType.IsAssignableFrom(typeof(List<TElement>)))
+            {
+                // Simple case such as ICollection<TElement>, IEnumerable<TElement> and IList<TElement>.
+                return true;
+            }
+
+            return targetType.GetTypeInfo().IsClass &&
+                !targetType.GetTypeInfo().IsAbstract &&
+                typeof(ICollection<TElement>).IsAssignableFrom(targetType);
+        }
+
+        /// <summary>
+        /// Create an <see cref="object"/> assignable to <paramref name="targetType"/>.
+        /// </summary>
+        /// <param name="targetType"><see cref="Type"/> of the model.</param>
+        /// <returns>An <see cref="object"/> assignable to <paramref name="targetType"/>.</returns>
+        /// <remarks>Called when creating a default 'empty' model for a top level bind.</remarks>
+        protected virtual object CreateEmptyCollection(Type targetType)
+        {
+            if (targetType.IsAssignableFrom(typeof(List<TElement>)))
+            {
+                // Simple case such as ICollection<TElement>, IEnumerable<TElement> and IList<TElement>.
+                return new List<TElement>();
+            }
+
+            return CreateInstance(targetType);
+        }
+
+        /// <summary>
+        /// Create an instance of <paramref name="targetType"/>.
+        /// </summary>
+        /// <param name="targetType"><see cref="Type"/> of the model.</param>
+        /// <returns>An instance of <paramref name="targetType"/>.</returns>
+        protected object CreateInstance(Type targetType)
+        {
+            if (_modelCreator == null)
+            {
+                _modelCreator = Expression
+                    .Lambda<Func<object>>(Expression.New(targetType))
+                    .Compile();
+            }
+
+            return _modelCreator();
+
+        }
+
+        // Used when the ValueProvider contains the collection to be bound as a single element, e.g. the raw value
+        // is [ "1", "2" ] and needs to be converted to an int[].
+        // Internal for testing.
+        internal async Task<CollectionResult> BindSimpleCollection(
+            ModelBindingContext bindingContext,
+            ValueProviderResult values)
+        {
+            var boundCollection = new List<TElement>();
+
+            var elementMetadata = bindingContext.ModelMetadata.ElementMetadata;
+
+            foreach (var value in values)
+            {
+                bindingContext.ValueProvider = new CompositeValueProvider
+                {
+                    // our temporary provider goes at the front of the list
+                    new ElementalValueProvider(bindingContext.ModelName, value, values.Culture),
+                    bindingContext.ValueProvider
+                };
+
+                // Enter new scope to change ModelMetadata and isolate element binding operations.
+                using (bindingContext.EnterNestedScope(
+                    elementMetadata,
+                    fieldName: bindingContext.FieldName,
+                    modelName: bindingContext.ModelName,
+                    model: null))
+                {
+                    await ElementBinder.BindModelAsync(bindingContext);
+
+                    if (bindingContext.Result.IsModelSet)
+                    {
+                        var boundValue = bindingContext.Result.Model;
+                        boundCollection.Add(ModelBindingHelper.CastOrDefault<TElement>(boundValue));
+                    }
+                }
+            }
+
+            return new CollectionResult
+            {
+                Model = boundCollection
+            };
+        }
+
+        // Used when the ValueProvider contains the collection to be bound as multiple elements, e.g. foo[0], foo[1].
+        private Task<CollectionResult> BindComplexCollection(ModelBindingContext bindingContext)
+        {
+            Logger.AttemptingToBindCollectionUsingIndices(bindingContext);
+
+            var indexPropertyName = ModelNames.CreatePropertyModelName(bindingContext.ModelName, "index");
+
+            // Remove any value provider that may not use indexPropertyName as-is. Don't match e.g. Model[index].
+            var valueProvider = bindingContext.ValueProvider;
+            if (valueProvider is IKeyRewriterValueProvider keyRewriterValueProvider)
+            {
+                valueProvider = keyRewriterValueProvider.Filter() ?? EmptyValueProvider;
+            }
+
+            var valueProviderResultIndex = valueProvider.GetValue(indexPropertyName);
+            var indexNames = GetIndexNamesFromValueProviderResult(valueProviderResultIndex);
+
+            return BindComplexCollectionFromIndexes(bindingContext, indexNames);
+        }
+
+        // Internal for testing.
+        internal async Task<CollectionResult> BindComplexCollectionFromIndexes(
+            ModelBindingContext bindingContext,
+            IEnumerable<string> indexNames)
+        {
+            bool indexNamesIsFinite;
+            if (indexNames != null)
+            {
+                indexNamesIsFinite = true;
+            }
+            else
+            {
+                indexNamesIsFinite = false;
+                indexNames = Enumerable.Range(0, int.MaxValue)
+                                       .Select(i => i.ToString(CultureInfo.InvariantCulture));
+            }
+
+            var elementMetadata = bindingContext.ModelMetadata.ElementMetadata;
+
+            var boundCollection = new List<TElement>();
+
+            foreach (var indexName in indexNames)
+            {
+                var fullChildName = ModelNames.CreateIndexModelName(bindingContext.ModelName, indexName);
+
+                ModelBindingResult? result;
+                using (bindingContext.EnterNestedScope(
+                    elementMetadata,
+                    fieldName: indexName,
+                    modelName: fullChildName,
+                    model: null))
+                {
+                    await ElementBinder.BindModelAsync(bindingContext);
+                    result = bindingContext.Result;
+                }
+
+                var didBind = false;
+                object boundValue = null;
+                if (result != null && result.Value.IsModelSet)
+                {
+                    didBind = true;
+                    boundValue = result.Value.Model;
+                }
+
+                // infinite size collection stops on first bind failure
+                if (!didBind && !indexNamesIsFinite)
+                {
+                    break;
+                }
+
+                boundCollection.Add(ModelBindingHelper.CastOrDefault<TElement>(boundValue));
+            }
+
+            return new CollectionResult
+            {
+                Model = boundCollection,
+
+                // If we're working with a fixed set of indexes then this is the format like:
+                //
+                //  ?parameter.index=zero&parameter.index=one&parameter.index=two&parameter[zero]=0&parameter[one]=1&parameter[two]=2...
+                //
+                // We need to provide this data to the validation system so it can 'replay' the keys.
+                // But we can't just set ValidationState here, because it needs the 'real' model.
+                ValidationStrategy = indexNamesIsFinite ?
+                    new ExplicitIndexCollectionValidationStrategy(indexNames) :
+                    null,
+            };
+        }
+
+        // Internal for testing.
+        internal class CollectionResult
+        {
+            public IEnumerable<TElement> Model { get; set; }
+
+            public IValidationStrategy ValidationStrategy { get; set; }
+        }
+
+        /// <summary>
+        /// Gets an <see cref="object"/> assignable to <paramref name="targetType"/> that contains members from
+        /// <paramref name="collection"/>.
+        /// </summary>
+        /// <param name="targetType"><see cref="Type"/> of the model.</param>
+        /// <param name="collection">
+        /// Collection of values retrieved from value providers. <see langword="null"/> if nothing was bound.
+        /// </param>
+        /// <returns>
+        /// An <see cref="object"/> assignable to <paramref name="targetType"/>. <see langword="null"/> if nothing
+        /// was bound.
+        /// </returns>
+        /// <remarks>
+        /// Extensibility point that allows the bound collection to be manipulated or transformed before being
+        /// returned from the binder.
+        /// </remarks>
+        protected virtual object ConvertToCollectionType(Type targetType, IEnumerable<TElement> collection)
+        {
+            if (collection == null)
+            {
+                return null;
+            }
+
+            if (targetType.IsAssignableFrom(typeof(List<TElement>)))
+            {
+                // Depends on fact BindSimpleCollection() and BindComplexCollection() always return a List<TElement>
+                // instance or null.
+                return collection;
+            }
+
+            var newCollection = CreateInstance(targetType);
+            CopyToModel(newCollection, collection);
+
+            return newCollection;
+        }
+
+        /// <summary>
+        /// Adds values from <paramref name="sourceCollection"/> to given <paramref name="target"/>.
+        /// </summary>
+        /// <param name="target"><see cref="object"/> into which values are copied.</param>
+        /// <param name="sourceCollection">
+        /// Collection of values retrieved from value providers. <see langword="null"/> if nothing was bound.
+        /// </param>
+        protected virtual void CopyToModel(object target, IEnumerable<TElement> sourceCollection)
+        {
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            var targetCollection = target as ICollection<TElement>;
+            Debug.Assert(targetCollection != null, "This binder is instantiated only for ICollection<T> model types.");
+
+            if (sourceCollection != null && targetCollection != null && !targetCollection.IsReadOnly)
+            {
+                targetCollection.Clear();
+                foreach (var element in sourceCollection)
+                {
+                    targetCollection.Add(element);
+                }
+            }
+        }
+
+        private static IEnumerable<string> GetIndexNamesFromValueProviderResult(ValueProviderResult valueProviderResult)
+        {
+            IEnumerable<string> indexNames = null;
+            if (valueProviderResult != null)
+            {
+                var indexes = (string[])valueProviderResult;
+                if (indexes != null && indexes.Length > 0)
+                {
+                    indexNames = indexes;
+                }
+            }
+
+            return indexNames;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinderProvider.cs
new file mode 100644
index 0000000000..0617122b5f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinderProvider.cs
@@ -0,0 +1,67 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinderProvider"/> for <see cref="ICollection{T}"/>.
+    /// </summary>
+    public class CollectionModelBinderProvider : IModelBinderProvider
+    {
+        /// <inheritdoc />
+        public IModelBinder GetBinder(ModelBinderProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var modelType = context.Metadata.ModelType;
+
+            // Arrays are handled by another binder.
+            if (modelType.IsArray)
+            {
+                return null;
+            }
+
+            var loggerFactory = context.Services.GetRequiredService<ILoggerFactory>();
+            
+            // If the model type is ICollection<> then we can call its Add method, so we can always support it.
+            var collectionType = ClosedGenericMatcher.ExtractGenericInterface(modelType, typeof(ICollection<>));
+            if (collectionType != null)
+            {
+                var elementType = collectionType.GenericTypeArguments[0];
+                var elementBinder = context.CreateBinder(context.MetadataProvider.GetMetadataForType(elementType));
+
+                var binderType = typeof(CollectionModelBinder<>).MakeGenericType(collectionType.GenericTypeArguments);
+                return (IModelBinder)Activator.CreateInstance(binderType, elementBinder, loggerFactory);
+            }
+
+            // If the model type is IEnumerable<> then we need to know if we can assign a List<> to it, since
+            // that's what we would create. (The cases handled here are IEnumerable<>, IReadOnlyColection<> and
+            // IReadOnlyList<>).
+            var enumerableType = ClosedGenericMatcher.ExtractGenericInterface(modelType, typeof(IEnumerable<>));
+            if (enumerableType != null)
+            {
+                var listType = typeof(List<>).MakeGenericType(enumerableType.GenericTypeArguments);
+                if (modelType.GetTypeInfo().IsAssignableFrom(listType.GetTypeInfo()))
+                {
+                    var elementType = enumerableType.GenericTypeArguments[0];
+                    var elementBinder = context.CreateBinder(context.MetadataProvider.GetMetadataForType(elementType));
+
+                    var binderType = typeof(CollectionModelBinder<>).MakeGenericType(enumerableType.GenericTypeArguments);
+                    return (IModelBinder)Activator.CreateInstance(binderType, elementBinder, loggerFactory);
+                }
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ComplexTypeModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ComplexTypeModelBinder.cs
new file mode 100644
index 0000000000..dd02365c96
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ComplexTypeModelBinder.cs
@@ -0,0 +1,469 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// <see cref="IModelBinder"/> implementation for binding complex types.
+    /// </summary>
+    public class ComplexTypeModelBinder : IModelBinder
+    {
+        private readonly IDictionary<ModelMetadata, IModelBinder> _propertyBinders;
+        private readonly ILogger _logger;
+        private Func<object> _modelCreator;
+
+        /// <summary>
+        /// <para>This constructor is obsolete and will be removed in a future version. The recommended alternative
+        /// is the overload that also takes an <see cref="ILoggerFactory"/>.</para>
+        /// <para>Creates a new <see cref="ComplexTypeModelBinder"/>.</para>
+        /// </summary>
+        /// <param name="propertyBinders">
+        /// The <see cref="IDictionary{TKey, TValue}"/> of binders to use for binding properties.
+        /// </param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version. The recommended alternative"
+            + " is the overload that also takes an " + nameof(ILoggerFactory) + ".")]
+        public ComplexTypeModelBinder(IDictionary<ModelMetadata, IModelBinder> propertyBinders)
+            : this(propertyBinders, NullLoggerFactory.Instance)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="ComplexTypeModelBinder"/>.
+        /// </summary>
+        /// <param name="propertyBinders">
+        /// The <see cref="IDictionary{TKey, TValue}"/> of binders to use for binding properties.
+        /// </param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public ComplexTypeModelBinder(
+            IDictionary<ModelMetadata, IModelBinder> propertyBinders,
+            ILoggerFactory loggerFactory)
+        {
+            if (propertyBinders == null)
+            {
+                throw new ArgumentNullException(nameof(propertyBinders));
+            }
+
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            _propertyBinders = propertyBinders;
+            _logger = loggerFactory.CreateLogger<ComplexTypeModelBinder>();
+        }
+
+        /// <inheritdoc />
+        public Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            if (bindingContext == null)
+            {
+                throw new ArgumentNullException(nameof(bindingContext));
+            }
+
+            _logger.AttemptingToBindModel(bindingContext);
+
+            if (!CanCreateModel(bindingContext))
+            {
+                return Task.CompletedTask;
+            }
+
+            // Perf: separated to avoid allocating a state machine when we don't
+            // need to go async.
+            return BindModelCoreAsync(bindingContext);
+        }
+
+        private async Task BindModelCoreAsync(ModelBindingContext bindingContext)
+        {
+            // Create model first (if necessary) to avoid reporting errors about properties when activation fails.
+            if (bindingContext.Model == null)
+            {
+                bindingContext.Model = CreateModel(bindingContext);
+            }
+
+            for (var i = 0; i < bindingContext.ModelMetadata.Properties.Count; i++)
+            {
+                var property = bindingContext.ModelMetadata.Properties[i];
+                if (!CanBindProperty(bindingContext, property))
+                {
+                    continue;
+                }
+
+                // Pass complex (including collection) values down so that binding system does not unnecessarily
+                // recreate instances or overwrite inner properties that are not bound. No need for this with simple
+                // values because they will be overwritten if binding succeeds. Arrays are never reused because they
+                // cannot be resized.
+                object propertyModel = null;
+                if (property.PropertyGetter != null &&
+                    property.IsComplexType &&
+                    !property.ModelType.IsArray)
+                {
+                    propertyModel = property.PropertyGetter(bindingContext.Model);
+                }
+
+                var fieldName = property.BinderModelName ?? property.PropertyName;
+                var modelName = ModelNames.CreatePropertyModelName(bindingContext.ModelName, fieldName);
+
+                ModelBindingResult result;
+                using (bindingContext.EnterNestedScope(
+                    modelMetadata: property,
+                    fieldName: fieldName,
+                    modelName: modelName,
+                    model: propertyModel))
+                {
+                    await BindProperty(bindingContext);
+                    result = bindingContext.Result;
+                }
+
+                if (result.IsModelSet)
+                {
+                    SetProperty(bindingContext, modelName, property, result);
+                }
+                else if (property.IsBindingRequired)
+                {
+                    var message = property.ModelBindingMessageProvider.MissingBindRequiredValueAccessor(fieldName);
+                    bindingContext.ModelState.TryAddModelError(modelName, message);
+                }
+            }
+
+            bindingContext.Result = ModelBindingResult.Success(bindingContext.Model);
+            _logger.DoneAttemptingToBindModel(bindingContext);
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether or not the model property identified by <paramref name="propertyMetadata"/>
+        /// can be bound.
+        /// </summary>
+        /// <param name="bindingContext">The <see cref="ModelBindingContext"/> for the container model.</param>
+        /// <param name="propertyMetadata">The <see cref="ModelMetadata"/> for the model property.</param>
+        /// <returns><c>true</c> if the model property can be bound, otherwise <c>false</c>.</returns>
+        protected virtual bool CanBindProperty(ModelBindingContext bindingContext, ModelMetadata propertyMetadata)
+        {
+            var metadataProviderFilter = bindingContext.ModelMetadata.PropertyFilterProvider?.PropertyFilter;
+            if (metadataProviderFilter?.Invoke(propertyMetadata) == false)
+            {
+                return false;
+            }
+
+            if (bindingContext.PropertyFilter?.Invoke(propertyMetadata) == false)
+            {
+                return false;
+            }
+
+            if (!propertyMetadata.IsBindingAllowed)
+            {
+                return false;
+            }
+
+            if (!CanUpdatePropertyInternal(propertyMetadata))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Attempts to bind a property of the model.
+        /// </summary>
+        /// <param name="bindingContext">The <see cref="ModelBindingContext"/> for the model property.</param>
+        /// <returns>
+        /// A <see cref="Task"/> that when completed will set <see cref="ModelBindingContext.Result"/> to the
+        /// result of model binding.
+        /// </returns>
+        protected virtual Task BindProperty(ModelBindingContext bindingContext)
+        {
+            var binder = _propertyBinders[bindingContext.ModelMetadata];
+            return binder.BindModelAsync(bindingContext);
+        }
+
+        internal bool CanCreateModel(ModelBindingContext bindingContext)
+        {
+            var isTopLevelObject = bindingContext.IsTopLevelObject;
+
+            // If we get here the model is a complex object which was not directly bound by any previous model binder,
+            // so we want to decide if we want to continue binding. This is important to get right to avoid infinite
+            // recursion.
+            //
+            // First, we want to make sure this object is allowed to come from a value provider source as this binder
+            // will only include value provider data. For instance if the model is marked with [FromBody], then we
+            // can just skip it. A greedy source cannot be a value provider.
+            //
+            // If the model isn't marked with ANY binding source, then we assume it's OK also.
+            //
+            // We skip this check if it is a top level object because we want to always evaluate
+            // the creation of top level object (this is also required for ModelBinderAttribute to work.)
+            var bindingSource = bindingContext.BindingSource;
+            if (!isTopLevelObject && bindingSource != null && bindingSource.IsGreedy)
+            {
+                return false;
+            }
+
+            // Create the object if:
+            // 1. It is a top level model.
+            if (isTopLevelObject)
+            {
+                return true;
+            }
+
+            // 2. Any of the model properties can be bound using a value provider.
+            if (CanValueBindAnyModelProperties(bindingContext))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        private bool CanValueBindAnyModelProperties(ModelBindingContext bindingContext)
+        {
+            // If there are no properties on the model, there is nothing to bind. We are here means this is not a top
+            // level object. So we return false.
+            if (bindingContext.ModelMetadata.Properties.Count == 0)
+            {
+                _logger.NoPublicSettableProperties(bindingContext);
+                return false;
+            }
+
+            // We want to check to see if any of the properties of the model can be bound using the value providers,
+            // because that's all that MutableObjectModelBinder can handle.
+            //
+            // However, because a property might specify a custom binding source ([FromForm]), it's not correct
+            // for us to just try bindingContext.ValueProvider.ContainsPrefixAsync(bindingContext.ModelName),
+            // because that may include other value providers - that would lead us to mistakenly create the model
+            // when the data is coming from a source we should use (ex: value found in query string, but the
+            // model has [FromForm]).
+            //
+            // To do this we need to enumerate the properties, and see which of them provide a binding source
+            // through metadata, then we decide what to do.
+            //
+            //      If a property has a binding source, and it's a greedy source, then it's not
+            //      allowed to come from a value provider, so we skip it.
+            //
+            //      If a property has a binding source, and it's a non-greedy source, then we'll filter the
+            //      the value providers to just that source, and see if we can find a matching prefix
+            //      (see CanBindValue).
+            //
+            //      If a property does not have a binding source, then it's fair game for any value provider.
+            //
+            // If any property meets the above conditions and has a value from valueproviders, then we'll
+            // create the model and try to bind it. OR if ALL properties of the model have a greedy source,
+            // then we go ahead and create it.
+            //
+            var hasBindableProperty = false;
+            var isAnyPropertyEnabledForValueProviderBasedBinding = false;
+            for (var i = 0; i < bindingContext.ModelMetadata.Properties.Count; i++)
+            {
+                var propertyMetadata = bindingContext.ModelMetadata.Properties[i];
+                if (!CanBindProperty(bindingContext, propertyMetadata))
+                {
+                    continue;
+                }
+
+                hasBindableProperty = true;
+
+                // This check will skip properties which are marked explicitly using a non value binder.
+                var bindingSource = propertyMetadata.BindingSource;
+                if (bindingSource == null || !bindingSource.IsGreedy)
+                {
+                    isAnyPropertyEnabledForValueProviderBasedBinding = true;
+
+                    var fieldName = propertyMetadata.BinderModelName ?? propertyMetadata.PropertyName;
+                    var modelName = ModelNames.CreatePropertyModelName(
+                        bindingContext.ModelName,
+                        fieldName);
+
+                    using (bindingContext.EnterNestedScope(
+                        modelMetadata: propertyMetadata,
+                        fieldName: fieldName,
+                        modelName: modelName,
+                        model: null))
+                    {
+                        // If any property can be bound from a value provider then continue.
+                        if (bindingContext.ValueProvider.ContainsPrefix(bindingContext.ModelName))
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
+
+            if (hasBindableProperty && !isAnyPropertyEnabledForValueProviderBasedBinding)
+            {
+                // All the properties are marked with a non value provider based marker like [FromHeader] or
+                // [FromBody].
+                return true;
+            }
+
+            _logger.CannotBindToComplexType(bindingContext);
+
+            return false;
+        }
+
+        // Internal for tests
+        internal static bool CanUpdatePropertyInternal(ModelMetadata propertyMetadata)
+        {
+            return !propertyMetadata.IsReadOnly || CanUpdateReadOnlyProperty(propertyMetadata.ModelType);
+        }
+
+        private static bool CanUpdateReadOnlyProperty(Type propertyType)
+        {
+            // Value types have copy-by-value semantics, which prevents us from updating
+            // properties that are marked readonly.
+            if (propertyType.GetTypeInfo().IsValueType)
+            {
+                return false;
+            }
+
+            // Arrays are strange beasts since their contents are mutable but their sizes aren't.
+            // Therefore we shouldn't even try to update these. Further reading:
+            // http://blogs.msdn.com/ericlippert/archive/2008/09/22/arrays-considered-somewhat-harmful.aspx
+            if (propertyType.IsArray)
+            {
+                return false;
+            }
+
+            // Special-case known immutable reference types
+            if (propertyType == typeof(string))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Creates suitable <see cref="object"/> for given <paramref name="bindingContext"/>.
+        /// </summary>
+        /// <param name="bindingContext">The <see cref="ModelBindingContext"/>.</param>
+        /// <returns>An <see cref="object"/> compatible with <see cref="ModelBindingContext.ModelType"/>.</returns>
+        protected virtual object CreateModel(ModelBindingContext bindingContext)
+        {
+            if (bindingContext == null)
+            {
+                throw new ArgumentNullException(nameof(bindingContext));
+            }
+
+            // If model creator throws an exception, we want to propagate it back up the call stack, since the
+            // application developer should know that this was an invalid type to try to bind to.
+            if (_modelCreator == null)
+            {
+                // The following check causes the ComplexTypeModelBinder to NOT participate in binding structs as
+                // reflection does not provide information about the implicit parameterless constructor for a struct.
+                // This binder would eventually fail to construct an instance of the struct as the Linq's NewExpression
+                // compile fails to construct it.
+                var modelTypeInfo = bindingContext.ModelType.GetTypeInfo();
+                if (modelTypeInfo.IsAbstract || modelTypeInfo.GetConstructor(Type.EmptyTypes) == null)
+                {
+                    var metadata = bindingContext.ModelMetadata;
+                    switch (metadata.MetadataKind)
+                    {
+                        case ModelMetadataKind.Parameter:
+                            throw new InvalidOperationException(
+                                Resources.FormatComplexTypeModelBinder_NoParameterlessConstructor_ForParameter(
+                                    modelTypeInfo.FullName,
+                                    metadata.ParameterName));
+                        case ModelMetadataKind.Property:
+                            throw new InvalidOperationException(
+                                Resources.FormatComplexTypeModelBinder_NoParameterlessConstructor_ForProperty(
+                                    modelTypeInfo.FullName,
+                                    metadata.PropertyName,
+                                    bindingContext.ModelMetadata.ContainerType.FullName));
+                        case ModelMetadataKind.Type:
+                            throw new InvalidOperationException(
+                                Resources.FormatComplexTypeModelBinder_NoParameterlessConstructor_ForType(
+                                    modelTypeInfo.FullName));
+                    }
+                }
+
+                _modelCreator = Expression
+                    .Lambda<Func<object>>(Expression.New(bindingContext.ModelType))
+                    .Compile();
+            }
+
+            return _modelCreator();
+        }
+
+        /// <summary>
+        /// Updates a property in the current <see cref="ModelBindingContext.Model"/>.
+        /// </summary>
+        /// <param name="bindingContext">The <see cref="ModelBindingContext"/>.</param>
+        /// <param name="modelName">The model name.</param>
+        /// <param name="propertyMetadata">The <see cref="ModelMetadata"/> for the property to set.</param>
+        /// <param name="result">The <see cref="ModelBindingResult"/> for the property's new value.</param>
+        protected virtual void SetProperty(
+            ModelBindingContext bindingContext,
+            string modelName,
+            ModelMetadata propertyMetadata,
+            ModelBindingResult result)
+        {
+            if (bindingContext == null)
+            {
+                throw new ArgumentNullException(nameof(bindingContext));
+            }
+
+            if (modelName == null)
+            {
+                throw new ArgumentNullException(nameof(modelName));
+            }
+
+            if (propertyMetadata == null)
+            {
+                throw new ArgumentNullException(nameof(propertyMetadata));
+            }
+
+            if (!result.IsModelSet)
+            {
+                // If we don't have a value, don't set it on the model and trounce a pre-initialized value.
+                return;
+            }
+
+            if (propertyMetadata.IsReadOnly)
+            {
+                // The property should have already been set when we called BindPropertyAsync, so there's
+                // nothing to do here.
+                return;
+            }
+
+            var value = result.Model;
+            try
+            {
+                propertyMetadata.PropertySetter(bindingContext.Model, value);
+            }
+            catch (Exception exception)
+            {
+                AddModelError(exception, modelName, bindingContext);
+            }
+        }
+
+        private static void AddModelError(
+            Exception exception,
+            string modelName,
+            ModelBindingContext bindingContext)
+        {
+            var targetInvocationException = exception as TargetInvocationException;
+            if (targetInvocationException?.InnerException != null)
+            {
+                exception = targetInvocationException.InnerException;
+            }
+
+            // Do not add an error message if a binding error has already occurred for this property.
+            var modelState = bindingContext.ModelState;
+            var validationState = modelState.GetFieldValidationState(modelName);
+            if (validationState == ModelValidationState.Unvalidated)
+            {
+                modelState.AddModelError(modelName, exception, bindingContext.ModelMetadata);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ComplexTypeModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ComplexTypeModelBinderProvider.cs
new file mode 100644
index 0000000000..f0d6b5989c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ComplexTypeModelBinderProvider.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinderProvider"/> for complex types.
+    /// </summary>
+    public class ComplexTypeModelBinderProvider : IModelBinderProvider
+    {
+        /// <inheritdoc />
+        public IModelBinder GetBinder(ModelBinderProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (context.Metadata.IsComplexType && !context.Metadata.IsCollectionType)
+            {
+                var propertyBinders = new Dictionary<ModelMetadata, IModelBinder>();
+                for (var i = 0; i < context.Metadata.Properties.Count; i++)
+                {
+                    var property = context.Metadata.Properties[i];
+                    propertyBinders.Add(property, context.CreateBinder(property));
+                }
+
+                var loggerFactory = context.Services.GetRequiredService<ILoggerFactory>();
+                return new ComplexTypeModelBinder(propertyBinders, loggerFactory);
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DecimalModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DecimalModelBinder.cs
new file mode 100644
index 0000000000..7692baa009
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DecimalModelBinder.cs
@@ -0,0 +1,133 @@
+// 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.
+
+using System;
+using System.Globalization;
+using System.Runtime.ExceptionServices;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinder"/> for <see cref="decimal"/> and <see cref="Nullable{T}"/> where <c>T</c> is
+    /// <see cref="decimal"/>.
+    /// </summary>
+    public class DecimalModelBinder : IModelBinder
+    {
+        private readonly NumberStyles _supportedStyles;
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// <para>This constructor is obsolete and will be removed in a future version. The recommended alternative
+        /// is the overload that also takes an <see cref="ILoggerFactory"/>.</para>
+        /// <para>Initializes a new instance of <see cref="DecimalModelBinder"/>.</para>
+        /// </summary>
+        /// <param name="supportedStyles">The <see cref="NumberStyles"/>.</param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version. The recommended alternative"
+            + " is the overload that also takes an " + nameof(ILoggerFactory) + ".")]
+        public DecimalModelBinder(NumberStyles supportedStyles)
+            : this(supportedStyles, NullLoggerFactory.Instance)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="DecimalModelBinder"/>.
+        /// </summary>
+        /// <param name="supportedStyles">The <see cref="NumberStyles"/>.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public DecimalModelBinder(NumberStyles supportedStyles, ILoggerFactory loggerFactory)
+        {
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            _supportedStyles = supportedStyles;
+            _logger = loggerFactory.CreateLogger<DecimalModelBinder>();
+        }
+
+        /// <inheritdoc />
+        public Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            if (bindingContext == null)
+            {
+                throw new ArgumentNullException(nameof(bindingContext));
+            }
+
+            _logger.AttemptingToBindModel(bindingContext);
+
+            var modelName = bindingContext.ModelName;
+            var valueProviderResult = bindingContext.ValueProvider.GetValue(modelName);
+            if (valueProviderResult == ValueProviderResult.None)
+            {
+                _logger.FoundNoValueInRequest(bindingContext);
+
+                // no entry
+                _logger.DoneAttemptingToBindModel(bindingContext);
+                return Task.CompletedTask;
+            }
+
+            var modelState = bindingContext.ModelState;
+            modelState.SetModelValue(modelName, valueProviderResult);
+
+            var metadata = bindingContext.ModelMetadata;
+            var type = metadata.UnderlyingOrModelType;
+            try
+            {
+                var value = valueProviderResult.FirstValue;
+                var culture = valueProviderResult.Culture;
+
+                object model;
+                if (string.IsNullOrWhiteSpace(value))
+                {
+                    // Parse() method trims the value (with common NumberStyles) then throws if the result is empty.
+                    model = null;
+                }
+                else if (type == typeof(decimal))
+                {
+                    model = decimal.Parse(value, _supportedStyles, culture);
+                }
+                else
+                {
+                    // unreachable
+                    throw new NotSupportedException();
+                }
+
+                // When converting value, a null model may indicate a failed conversion for an otherwise required
+                // model (can't set a ValueType to null). This detects if a null model value is acceptable given the
+                // current bindingContext. If not, an error is logged.
+                if (model == null && !metadata.IsReferenceOrNullableType)
+                {
+                    modelState.TryAddModelError(
+                        modelName,
+                        metadata.ModelBindingMessageProvider.ValueMustNotBeNullAccessor(
+                            valueProviderResult.ToString()));
+                }
+                else
+                {
+                    bindingContext.Result = ModelBindingResult.Success(model);
+                }
+            }
+            catch (Exception exception)
+            {
+                var isFormatException = exception is FormatException;
+                if (!isFormatException && exception.InnerException != null)
+                {
+                    // Unlike TypeConverters, floating point types do not seem to wrap FormatExceptions. Preserve
+                    // this code in case a cursory review of the CoreFx code missed something.
+                    exception = ExceptionDispatchInfo.Capture(exception.InnerException).SourceException;
+                }
+
+                modelState.TryAddModelError(modelName, exception, metadata);
+
+                // Conversion failed.
+            }
+
+            _logger.DoneAttemptingToBindModel(bindingContext);
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinder.cs
new file mode 100644
index 0000000000..fbb0c53db1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinder.cs
@@ -0,0 +1,194 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// <see cref="IModelBinder"/> implementation for binding dictionary values.
+    /// </summary>
+    /// <typeparam name="TKey">Type of keys in the dictionary.</typeparam>
+    /// <typeparam name="TValue">Type of values in the dictionary.</typeparam>
+    public class DictionaryModelBinder<TKey, TValue> : CollectionModelBinder<KeyValuePair<TKey, TValue>>
+    {
+        private readonly IModelBinder _valueBinder;
+
+        /// <summary>
+        /// <para>This constructor is obsolete and will be removed in a future version. The recommended alternative
+        /// is the overload that also takes an <see cref="ILoggerFactory"/>.</para>
+        /// <para>Creates a new <see cref="DictionaryModelBinder{TKey, TValue}"/>.</para>
+        /// </summary>
+        /// <param name="keyBinder">The <see cref="IModelBinder"/> for <typeparamref name="TKey"/>.</param>
+        /// <param name="valueBinder">The <see cref="IModelBinder"/> for <typeparamref name="TValue"/>.</param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version. The recommended alternative"
+            + " is the overload that also takes an " + nameof(ILoggerFactory) + ".")]
+        public DictionaryModelBinder(IModelBinder keyBinder, IModelBinder valueBinder)
+            : this(keyBinder, valueBinder, NullLoggerFactory.Instance)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="DictionaryModelBinder{TKey, TValue}"/>.
+        /// </summary>
+        /// <param name="keyBinder">The <see cref="IModelBinder"/> for <typeparamref name="TKey"/>.</param>
+        /// <param name="valueBinder">The <see cref="IModelBinder"/> for <typeparamref name="TValue"/>.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public DictionaryModelBinder(IModelBinder keyBinder, IModelBinder valueBinder, ILoggerFactory loggerFactory)
+            : base(new KeyValuePairModelBinder<TKey, TValue>(keyBinder, valueBinder, loggerFactory), loggerFactory)
+        {
+            if (valueBinder == null)
+            {
+                throw new ArgumentNullException(nameof(valueBinder));
+            }
+
+            _valueBinder = valueBinder;
+        }
+
+        /// <inheritdoc />
+        public override async Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            if (bindingContext == null)
+            {
+                throw new ArgumentNullException(nameof(bindingContext));
+            }
+
+            await base.BindModelAsync(bindingContext);
+            if (!bindingContext.Result.IsModelSet)
+            {
+                // No match for the prefix at all.
+                return;
+            }
+
+            var result = bindingContext.Result;
+
+            Debug.Assert(result.Model != null);
+            var model = (IDictionary<TKey, TValue>)result.Model;
+            if (model.Count != 0)
+            {
+                // ICollection<KeyValuePair<TKey, TValue>> approach was successful.
+                return;
+            }
+
+            Logger.NoKeyValueFormatForDictionaryModelBinder(bindingContext);
+
+            if (!(bindingContext.ValueProvider is IEnumerableValueProvider enumerableValueProvider))
+            {
+                // No IEnumerableValueProvider available for the fallback approach. For example the user may have
+                // replaced the ValueProvider with something other than a CompositeValueProvider.
+                return;
+            }
+
+            // Attempt to bind dictionary from a set of prefix[key]=value entries. Get the short and long keys first.
+            var prefix = bindingContext.ModelName;
+            var keys = enumerableValueProvider.GetKeysFromPrefix(prefix);
+            if (keys.Count == 0)
+            {
+                // No entries with the expected keys.
+                return;
+            }
+
+            // Update the existing successful but empty ModelBindingResult.
+            var elementMetadata = bindingContext.ModelMetadata.ElementMetadata;
+            var valueMetadata = elementMetadata.Properties[nameof(KeyValuePair<TKey, TValue>.Value)];
+
+            var keyMappings = new Dictionary<string, TKey>(StringComparer.Ordinal);
+            foreach (var kvp in keys)
+            {
+                // Use InvariantCulture to convert the key since ExpressionHelper.GetExpressionText() would use
+                // that culture when rendering a form.
+                var convertedKey = ModelBindingHelper.ConvertTo<TKey>(kvp.Key, culture: null);
+
+                using (bindingContext.EnterNestedScope(
+                    modelMetadata: valueMetadata,
+                    fieldName: bindingContext.FieldName,
+                    modelName: kvp.Value,
+                    model: null))
+                {
+                    await _valueBinder.BindModelAsync(bindingContext);
+
+                    var valueResult = bindingContext.Result;
+                    if (!valueResult.IsModelSet)
+                    {
+                        // Factories for IKeyRewriterValueProvider implementations are not all-or-nothing i.e.
+                        // "[key][propertyName]" may be rewritten as ".key.propertyName" or "[key].propertyName". Try
+                        // again in case this scope is binding a complex type and rewriting
+                        // landed on ".key.propertyName" or in case this scope is binding another collection and an
+                        // IKeyRewriterValueProvider implementation was first (hiding the original "[key][next key]").
+                        if (kvp.Value.EndsWith("]"))
+                        {
+                            bindingContext.ModelName = ModelNames.CreatePropertyModelName(prefix, kvp.Key);
+                        }
+                        else
+                        {
+                            bindingContext.ModelName = ModelNames.CreateIndexModelName(prefix, kvp.Key);
+                        }
+
+                        await _valueBinder.BindModelAsync(bindingContext);
+                        valueResult = bindingContext.Result;
+                    }
+
+                    // Always add an entry to the dictionary but validate only if binding was successful.
+                    model[convertedKey] = ModelBindingHelper.CastOrDefault<TValue>(valueResult.Model);
+                    keyMappings.Add(bindingContext.ModelName, convertedKey);
+                }
+            }
+
+            bindingContext.ValidationState.Add(model, new ValidationStateEntry()
+            {
+                Strategy = new ShortFormDictionaryValidationStrategy<TKey, TValue>(keyMappings, valueMetadata),
+            });
+        }
+
+        /// <inheritdoc />
+        protected override object ConvertToCollectionType(
+            Type targetType,
+            IEnumerable<KeyValuePair<TKey, TValue>> collection)
+        {
+            if (collection == null)
+            {
+                return null;
+            }
+
+            if (targetType.IsAssignableFrom(typeof(Dictionary<TKey, TValue>)))
+            {
+                // Collection is a List<KeyValuePair<TKey, TValue>>, never already a Dictionary<TKey, TValue>.
+                return collection.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+            }
+
+            return base.ConvertToCollectionType(targetType, collection);
+        }
+
+        /// <inheritdoc />
+        protected override object CreateEmptyCollection(Type targetType)
+        {
+            if (targetType.IsAssignableFrom(typeof(Dictionary<TKey, TValue>)))
+            {
+                // Simple case such as IDictionary<TKey, TValue>.
+                return new Dictionary<TKey, TValue>();
+            }
+
+            return base.CreateEmptyCollection(targetType);
+        }
+
+        public override bool CanCreateInstance(Type targetType)
+        {
+            if (targetType.IsAssignableFrom(typeof(Dictionary<TKey, TValue>)))
+            {
+                // Simple case such as IDictionary<TKey, TValue>.
+                return true;
+            }
+
+            return base.CanCreateInstance(targetType);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinderProvider.cs
new file mode 100644
index 0000000000..0d7db7c064
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinderProvider.cs
@@ -0,0 +1,43 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinderProvider"/> for binding <see cref="IDictionary{TKey, TValue}"/>.
+    /// </summary>
+    public class DictionaryModelBinderProvider : IModelBinderProvider
+    {
+        /// <inheritdoc />
+        public IModelBinder GetBinder(ModelBinderProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var modelType = context.Metadata.ModelType;
+            var dictionaryType = ClosedGenericMatcher.ExtractGenericInterface(modelType, typeof(IDictionary<,>));
+            if (dictionaryType != null)
+            {
+                var keyType = dictionaryType.GenericTypeArguments[0];
+                var keyBinder = context.CreateBinder(context.MetadataProvider.GetMetadataForType(keyType));
+
+                var valueType = dictionaryType.GenericTypeArguments[1];
+                var valueBinder = context.CreateBinder(context.MetadataProvider.GetMetadataForType(valueType));
+
+                var binderType = typeof(DictionaryModelBinder<,>).MakeGenericType(dictionaryType.GenericTypeArguments);
+                var loggerFactory = context.Services.GetRequiredService<ILoggerFactory>();
+                return (IModelBinder)Activator.CreateInstance(binderType, keyBinder, valueBinder, loggerFactory);
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DoubleModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DoubleModelBinder.cs
new file mode 100644
index 0000000000..77d32d5a0d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DoubleModelBinder.cs
@@ -0,0 +1,133 @@
+// 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.
+
+using System;
+using System.Globalization;
+using System.Runtime.ExceptionServices;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinder"/> for <see cref="decimal"/> and <see cref="Nullable{T}"/> where <c>T</c> is
+    /// <see cref="decimal"/>.
+    /// </summary>
+    public class DoubleModelBinder : IModelBinder
+    {
+        private readonly NumberStyles _supportedStyles;
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// <para>This constructor is obsolete and will be removed in a future version. The recommended alternative
+        /// is the overload that also takes an <see cref="ILoggerFactory"/>.</para>
+        /// <para>Initializes a new instance of <see cref="DoubleModelBinder"/>.</para>
+        /// </summary>
+        /// <param name="supportedStyles">The <see cref="NumberStyles"/>.</param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version. The recommended alternative"
+            + " is the overload that also takes an " + nameof(ILoggerFactory) + ".")]
+        public DoubleModelBinder(NumberStyles supportedStyles)
+            : this(supportedStyles, NullLoggerFactory.Instance)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="DoubleModelBinder"/>.
+        /// </summary>
+        /// <param name="supportedStyles">The <see cref="NumberStyles"/>.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public DoubleModelBinder(NumberStyles supportedStyles, ILoggerFactory loggerFactory)
+        {
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            _supportedStyles = supportedStyles;
+            _logger = loggerFactory.CreateLogger<DoubleModelBinder>();
+        }
+
+        /// <inheritdoc />
+        public Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            if (bindingContext == null)
+            {
+                throw new ArgumentNullException(nameof(bindingContext));
+            }
+
+            _logger.AttemptingToBindModel(bindingContext);
+
+            var modelName = bindingContext.ModelName;
+            var valueProviderResult = bindingContext.ValueProvider.GetValue(modelName);
+            if (valueProviderResult == ValueProviderResult.None)
+            {
+                _logger.FoundNoValueInRequest(bindingContext);
+
+                // no entry
+                _logger.DoneAttemptingToBindModel(bindingContext);
+                return Task.CompletedTask;
+            }
+
+            var modelState = bindingContext.ModelState;
+            modelState.SetModelValue(modelName, valueProviderResult);
+
+            var metadata = bindingContext.ModelMetadata;
+            var type = metadata.UnderlyingOrModelType;
+            try
+            {
+                var value = valueProviderResult.FirstValue;
+                var culture = valueProviderResult.Culture;
+
+                object model;
+                if (string.IsNullOrWhiteSpace(value))
+                {
+                    // Parse() method trims the value (with common NumberStyles) then throws if the result is empty.
+                    model = null;
+                }
+                else if (type == typeof(double))
+                {
+                    model = double.Parse(value, _supportedStyles, culture);
+                }
+                else
+                {
+                    // unreachable
+                    throw new NotSupportedException();
+                }
+
+                // When converting value, a null model may indicate a failed conversion for an otherwise required
+                // model (can't set a ValueType to null). This detects if a null model value is acceptable given the
+                // current bindingContext. If not, an error is logged.
+                if (model == null && !metadata.IsReferenceOrNullableType)
+                {
+                    modelState.TryAddModelError(
+                        modelName,
+                        metadata.ModelBindingMessageProvider.ValueMustNotBeNullAccessor(
+                            valueProviderResult.ToString()));
+                }
+                else
+                {
+                    bindingContext.Result = ModelBindingResult.Success(model);
+                }
+            }
+            catch (Exception exception)
+            {
+                var isFormatException = exception is FormatException;
+                if (!isFormatException && exception.InnerException != null)
+                {
+                    // Unlike TypeConverters, floating point types do not seem to wrap FormatExceptions. Preserve
+                    // this code in case a cursory review of the CoreFx code missed something.
+                    exception = ExceptionDispatchInfo.Capture(exception.InnerException).SourceException;
+                }
+
+                modelState.TryAddModelError(modelName, exception, metadata);
+
+                // Conversion failed.
+            }
+
+            _logger.DoneAttemptingToBindModel(bindingContext);
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/EnumTypeModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/EnumTypeModelBinder.cs
new file mode 100644
index 0000000000..601d02ba44
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/EnumTypeModelBinder.cs
@@ -0,0 +1,101 @@
+// 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.
+
+using System;
+using System.Globalization;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// <see cref="IModelBinder"/> implementation to bind models for types deriving from <see cref="Enum"/>.
+    /// </summary>
+    public class EnumTypeModelBinder : SimpleTypeModelBinder
+    {
+        private readonly bool _suppressBindingUndefinedValueToEnumType;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="EnumTypeModelBinder"/>.
+        /// </summary>
+        /// <param name="suppressBindingUndefinedValueToEnumType">
+        /// Flag to determine if binding to undefined should be suppressed or not.
+        /// </param>
+        /// <param name="modelType">The model type.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>,</param>
+        public EnumTypeModelBinder(
+            bool suppressBindingUndefinedValueToEnumType,
+            Type modelType,
+            ILoggerFactory loggerFactory)
+            : base(modelType, loggerFactory)
+        {
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            _suppressBindingUndefinedValueToEnumType = suppressBindingUndefinedValueToEnumType;
+        }
+
+        protected override void CheckModel(
+            ModelBindingContext bindingContext,
+            ValueProviderResult valueProviderResult,
+            object model)
+        {
+            if (model == null || !_suppressBindingUndefinedValueToEnumType)
+            {
+                base.CheckModel(bindingContext, valueProviderResult, model);
+            }
+            else
+            {
+                if (IsDefinedInEnum(model, bindingContext))
+                {
+                    bindingContext.Result = ModelBindingResult.Success(model);
+                }
+                else
+                {
+                    bindingContext.ModelState.TryAddModelError(
+                        bindingContext.ModelName,
+                        bindingContext.ModelMetadata.ModelBindingMessageProvider.ValueIsInvalidAccessor(
+                            valueProviderResult.ToString()));
+                }
+            }
+        }
+
+        private bool IsDefinedInEnum(object model, ModelBindingContext bindingContext)
+        {
+            var modelType = bindingContext.ModelMetadata.UnderlyingOrModelType;
+
+            // Check if the converted value is indeed defined on the enum as EnumTypeConverter 
+            // converts value to the backing type (ex: integer) and does not check if the value is defined on the enum.
+            if (bindingContext.ModelMetadata.IsFlagsEnum)
+            {
+                // Enum.IsDefined does not work with combined flag enum values.
+                // From EnumDataTypeAttribute.cs in CoreFX.
+                // Examples:
+                // 
+                // [Flags]
+                // enum FlagsEnum { Value1 = 1, Value2 = 2, Value4 = 4 }
+                //
+                // Valid Scenarios:
+                // 1. valueproviderresult="Value2,Value4", model=Value2 | Value4, underlying=6, converted=Value2, Value4
+                // 2. valueproviderresult="2,4", model=Value2 | Value4, underlying=6, converted=Value2, Value4
+                //
+                // Invalid Scenarios:
+                // 1. valueproviderresult="2,10", model=12, underlying=12, converted=12
+                // 
+                var underlying = Convert.ChangeType(
+                    model,
+                    Enum.GetUnderlyingType(modelType),
+                    CultureInfo.InvariantCulture).ToString();
+                var converted = model.ToString();
+                return !string.Equals(underlying, converted, StringComparison.OrdinalIgnoreCase);
+            }
+            return Enum.IsDefined(modelType, model);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/EnumTypeModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/EnumTypeModelBinderProvider.cs
new file mode 100644
index 0000000000..cd75fbb2fe
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/EnumTypeModelBinderProvider.cs
@@ -0,0 +1,46 @@
+// 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.
+
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// A <see cref="IModelBinderProvider"/> for types deriving from <see cref="Enum"/>.
+    /// </summary>
+    public class EnumTypeModelBinderProvider : IModelBinderProvider
+    {
+        private readonly MvcOptions _options;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="EnumTypeModelBinderProvider"/>.
+        /// </summary>
+        /// <param name="options">The <see cref="MvcOptions"/>.</param>
+        public EnumTypeModelBinderProvider(MvcOptions options)
+        {
+            _options = options;
+        }
+
+        /// <inheritdoc />
+        public IModelBinder GetBinder(ModelBinderProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (context.Metadata.IsEnum)
+            {
+                var loggerFactory = context.Services.GetRequiredService<ILoggerFactory>();
+                return new EnumTypeModelBinder(
+                    _options.SuppressBindingUndefinedValueToEnumType,
+                    context.Metadata.UnderlyingOrModelType,
+                    loggerFactory);
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FloatModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FloatModelBinder.cs
new file mode 100644
index 0000000000..515266d2df
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FloatModelBinder.cs
@@ -0,0 +1,133 @@
+// 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.
+
+using System;
+using System.Globalization;
+using System.Runtime.ExceptionServices;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinder"/> for <see cref="decimal"/> and <see cref="Nullable{T}"/> where <c>T</c> is
+    /// <see cref="decimal"/>.
+    /// </summary>
+    public class FloatModelBinder : IModelBinder
+    {
+        private readonly NumberStyles _supportedStyles;
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// <para>This constructor is obsolete and will be removed in a future version. The recommended alternative
+        /// is the overload that also takes an <see cref="ILoggerFactory"/>.</para>
+        /// <para>Initializes a new instance of <see cref="FloatModelBinder"/>.</para>
+        /// </summary>
+        /// <param name="supportedStyles">The <see cref="NumberStyles"/>.</param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version. The recommended alternative"
+            + " is the overload that also takes an " + nameof(ILoggerFactory) + ".")]
+        public FloatModelBinder(NumberStyles supportedStyles)
+            : this(supportedStyles, NullLoggerFactory.Instance)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="FloatModelBinder"/>.
+        /// </summary>
+        /// <param name="supportedStyles">The <see cref="NumberStyles"/>.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public FloatModelBinder(NumberStyles supportedStyles, ILoggerFactory loggerFactory)
+        {
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            _supportedStyles = supportedStyles;
+            _logger = loggerFactory.CreateLogger<FloatModelBinder>();
+        }
+
+        /// <inheritdoc />
+        public Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            if (bindingContext == null)
+            {
+                throw new ArgumentNullException(nameof(bindingContext));
+            }
+
+            _logger.AttemptingToBindModel(bindingContext);
+
+            var modelName = bindingContext.ModelName;
+            var valueProviderResult = bindingContext.ValueProvider.GetValue(modelName);
+            if (valueProviderResult == ValueProviderResult.None)
+            {
+                _logger.FoundNoValueInRequest(bindingContext);
+
+                // no entry
+                _logger.DoneAttemptingToBindModel(bindingContext);
+                return Task.CompletedTask;
+            }
+
+            var modelState = bindingContext.ModelState;
+            modelState.SetModelValue(modelName, valueProviderResult);
+
+            var metadata = bindingContext.ModelMetadata;
+            var type = metadata.UnderlyingOrModelType;
+            try
+            {
+                var value = valueProviderResult.FirstValue;
+                var culture = valueProviderResult.Culture;
+
+                object model;
+                if (string.IsNullOrWhiteSpace(value))
+                {
+                    // Parse() method trims the value (with common NumberStyles) then throws if the result is empty.
+                    model = null;
+                }
+                else if (type == typeof(float))
+                {
+                    model = float.Parse(value, _supportedStyles, culture);
+                }
+                else
+                {
+                    // unreachable
+                    throw new NotSupportedException();
+                }
+
+                // When converting value, a null model may indicate a failed conversion for an otherwise required
+                // model (can't set a ValueType to null). This detects if a null model value is acceptable given the
+                // current bindingContext. If not, an error is logged.
+                if (model == null && !metadata.IsReferenceOrNullableType)
+                {
+                    modelState.TryAddModelError(
+                        modelName,
+                        metadata.ModelBindingMessageProvider.ValueMustNotBeNullAccessor(
+                            valueProviderResult.ToString()));
+                }
+                else
+                {
+                    bindingContext.Result = ModelBindingResult.Success(model);
+                }
+            }
+            catch (Exception exception)
+            {
+                var isFormatException = exception is FormatException;
+                if (!isFormatException && exception.InnerException != null)
+                {
+                    // Unlike TypeConverters, floating point types do not seem to wrap FormatExceptions. Preserve
+                    // this code in case a cursory review of the CoreFx code missed something.
+                    exception = ExceptionDispatchInfo.Capture(exception.InnerException).SourceException;
+                }
+
+                modelState.TryAddModelError(modelName, exception, metadata);
+
+                // Conversion failed.
+            }
+
+            _logger.DoneAttemptingToBindModel(bindingContext);
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FloatingPointTypeModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FloatingPointTypeModelBinderProvider.cs
new file mode 100644
index 0000000000..b881f66235
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FloatingPointTypeModelBinderProvider.cs
@@ -0,0 +1,49 @@
+// 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.
+
+using System;
+using System.Globalization;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinderProvider"/> for binding <see cref="decimal"/>, <see cref="double"/>,
+    /// <see cref="float"/>, and their <see cref="Nullable{T}"/> wrappers.
+    /// </summary>
+    public class FloatingPointTypeModelBinderProvider : IModelBinderProvider
+    {
+        // SimpleTypeModelBinder uses DecimalConverter and similar. Those TypeConverters default to NumberStyles.Float.
+        // Internal for testing.
+        internal static readonly NumberStyles SupportedStyles = NumberStyles.Float | NumberStyles.AllowThousands;
+
+        /// <inheritdoc />
+        public IModelBinder GetBinder(ModelBinderProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var modelType = context.Metadata.UnderlyingOrModelType;
+            var loggerFactory = context.Services.GetRequiredService<ILoggerFactory>();
+            if (modelType == typeof(decimal))
+            {
+                return new DecimalModelBinder(SupportedStyles, loggerFactory);
+            }
+
+            if (modelType == typeof(double))
+            {
+                return new DoubleModelBinder(SupportedStyles, loggerFactory);
+            }
+
+            if (modelType == typeof(float))
+            {
+                return new FloatModelBinder(SupportedStyles, loggerFactory);
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormCollectionModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormCollectionModelBinder.cs
new file mode 100644
index 0000000000..41d96ed272
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormCollectionModelBinder.cs
@@ -0,0 +1,118 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// <see cref="IModelBinder"/> implementation to bind form values to <see cref="IFormCollection"/>.
+    /// </summary>
+    public class FormCollectionModelBinder : IModelBinder
+    {
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// <para>This constructor is obsolete and will be removed in a future version. The recommended alternative
+        /// is the overload that takes an <see cref="ILoggerFactory"/>.</para>
+        /// <para>Initializes a new instance of <see cref="FormCollectionModelBinder"/>.</para>
+        /// </summary>
+        [Obsolete("This constructor is obsolete and will be removed in a future version. The recommended alternative"
+            + " is the overload that takes an " + nameof(ILoggerFactory) + ".")]
+        public FormCollectionModelBinder()
+            : this(NullLoggerFactory.Instance)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="FormCollectionModelBinder"/>.
+        /// </summary>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public FormCollectionModelBinder(ILoggerFactory loggerFactory)
+        {
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            _logger = loggerFactory.CreateLogger<FormCollectionModelBinder>();
+        }
+
+        /// <inheritdoc />
+        public async Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            if (bindingContext == null)
+            {
+                throw new ArgumentNullException(nameof(bindingContext));
+            }
+
+            _logger.AttemptingToBindModel(bindingContext);
+
+            object model;
+            var request = bindingContext.HttpContext.Request;
+            if (request.HasFormContentType)
+            {
+                var form = await request.ReadFormAsync();
+                model = form;
+            }
+            else
+            {
+                _logger.CannotBindToFilesCollectionDueToUnsupportedContentType(bindingContext);
+                model = new EmptyFormCollection();
+            }
+
+            bindingContext.Result = ModelBindingResult.Success(model);
+            _logger.DoneAttemptingToBindModel(bindingContext);
+        }
+
+        private class EmptyFormCollection : IFormCollection
+        {
+            public StringValues this[string key] => StringValues.Empty;
+
+            public int Count => 0;
+
+            public IFormFileCollection Files => new EmptyFormFileCollection();
+
+            public ICollection<string> Keys => new List<string>();
+
+            public bool ContainsKey(string key)
+            {
+                return false;
+            }
+
+            public IEnumerator<KeyValuePair<string, StringValues>> GetEnumerator()
+            {
+                return Enumerable.Empty<KeyValuePair<string, StringValues>>().GetEnumerator();
+            }
+
+            public bool TryGetValue(string key, out StringValues value)
+            {
+                value = default(StringValues);
+                return false;
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                return GetEnumerator();
+            }
+        }
+
+        private class EmptyFormFileCollection : List<IFormFile>, IFormFileCollection
+        {
+            public IFormFile this[string name] => null;
+
+            public IFormFile GetFile(string name) => null;
+
+            IReadOnlyList<IFormFile> IFormFileCollection.GetFiles(string name) => null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormCollectionModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormCollectionModelBinderProvider.cs
new file mode 100644
index 0000000000..edc91adfaf
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormCollectionModelBinderProvider.cs
@@ -0,0 +1,46 @@
+// 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.
+
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinderProvider"/> for <see cref="IFormCollection"/>.
+    /// </summary>
+    public class FormCollectionModelBinderProvider : IModelBinderProvider
+    {
+        /// <inheritdoc />
+        public IModelBinder GetBinder(ModelBinderProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var modelType = context.Metadata.ModelType;
+
+            if (typeof(FormCollection).GetTypeInfo().IsAssignableFrom(modelType))
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatFormCollectionModelBinder_CannotBindToFormCollection(
+                        typeof(FormCollectionModelBinder).FullName,
+                        modelType.FullName,
+                        typeof(IFormCollection).FullName));
+            }
+
+            if (modelType == typeof(IFormCollection))
+            {
+                var loggerFactory = context.Services.GetRequiredService<ILoggerFactory>();
+                return new FormCollectionModelBinder(loggerFactory);
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinder.cs
new file mode 100644
index 0000000000..5a7f1157ac
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinder.cs
@@ -0,0 +1,218 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// <see cref="IModelBinder"/> implementation to bind posted files to <see cref="IFormFile"/>.
+    /// </summary>
+    public class FormFileModelBinder : IModelBinder
+    {
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// <para>This constructor is obsolete and will be removed in a future version. The recommended alternative
+        /// is the overload that takes an <see cref="ILoggerFactory"/>.</para>
+        /// <para>Initializes a new instance of <see cref="FormFileModelBinder"/>.</para>
+        /// </summary>
+        [Obsolete("This constructor is obsolete and will be removed in a future version. The recommended alternative"
+            + " is the overload that takes an " + nameof(ILoggerFactory) + ".")]
+        public FormFileModelBinder()
+            : this(NullLoggerFactory.Instance)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="FormFileModelBinder"/>.
+        /// </summary>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public FormFileModelBinder(ILoggerFactory loggerFactory)
+        {
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            _logger = loggerFactory.CreateLogger<FormFileModelBinder>();
+        }
+        
+        /// <inheritdoc />
+        public async Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            if (bindingContext == null)
+            {
+                throw new ArgumentNullException(nameof(bindingContext));
+            }
+
+            _logger.AttemptingToBindModel(bindingContext);
+
+            var createFileCollection = bindingContext.ModelType == typeof(IFormFileCollection);
+            if (!createFileCollection && !ModelBindingHelper.CanGetCompatibleCollection<IFormFile>(bindingContext))
+            {
+                // Silently fail if unable to create an instance or use the current instance.
+                return;
+            }
+
+            ICollection<IFormFile> postedFiles;
+            if (createFileCollection)
+            {
+                postedFiles = new List<IFormFile>();
+            }
+            else
+            {
+                postedFiles = ModelBindingHelper.GetCompatibleCollection<IFormFile>(bindingContext);
+            }
+
+            // If we're at the top level, then use the FieldName (parameter or property name).
+            // This handles the fact that there will be nothing in the ValueProviders for this parameter
+            // and so we'll do the right thing even though we 'fell-back' to the empty prefix.
+            var modelName = bindingContext.IsTopLevelObject
+                ? bindingContext.BinderModelName ?? bindingContext.FieldName
+                : bindingContext.ModelName;
+
+            await GetFormFilesAsync(modelName, bindingContext, postedFiles);
+
+            object value;
+            if (bindingContext.ModelType == typeof(IFormFile))
+            {
+                if (postedFiles.Count == 0)
+                {
+                    // Silently fail if the named file does not exist in the request.
+                    _logger.DoneAttemptingToBindModel(bindingContext);
+                    return;
+                }
+
+                value = postedFiles.First();
+            }
+            else
+            {
+                if (postedFiles.Count == 0 && !bindingContext.IsTopLevelObject)
+                {
+                    // Silently fail if no files match. Will bind to an empty collection (treat empty as a success
+                    // case and not reach here) if binding to a top-level object.
+                    _logger.DoneAttemptingToBindModel(bindingContext);
+                    return;
+                }
+
+                // Perform any final type mangling needed.
+                var modelType = bindingContext.ModelType;
+                if (modelType == typeof(IFormFile[]))
+                {
+                    Debug.Assert(postedFiles is List<IFormFile>);
+                    value = ((List<IFormFile>)postedFiles).ToArray();
+                }
+                else if (modelType == typeof(IFormFileCollection))
+                {
+                    Debug.Assert(postedFiles is List<IFormFile>);
+                    value = new FileCollection((List<IFormFile>)postedFiles);
+                }
+                else
+                {
+                    value = postedFiles;
+                }
+            }
+
+            // We need to add a ValidationState entry because the modelName might be non-standard. Otherwise
+            // the entry we create in model state might not be marked as valid.
+            bindingContext.ValidationState.Add(value, new ValidationStateEntry()
+            {
+                Key = modelName,
+            });
+
+            bindingContext.ModelState.SetModelValue(
+                modelName,
+                rawValue: null,
+                attemptedValue: null);
+
+            bindingContext.Result = ModelBindingResult.Success(value);
+            _logger.DoneAttemptingToBindModel(bindingContext);
+        }
+
+        private async Task GetFormFilesAsync(
+            string modelName,
+            ModelBindingContext bindingContext,
+            ICollection<IFormFile> postedFiles)
+        {
+            var request = bindingContext.HttpContext.Request;
+            if (request.HasFormContentType)
+            {
+                var form = await request.ReadFormAsync();
+
+                foreach (var file in form.Files)
+                {
+                    // If there is an <input type="file" ... /> in the form and is left blank.
+                    if (file.Length == 0 && string.IsNullOrEmpty(file.FileName))
+                    {
+                        continue;
+                    }
+
+                    if (file.Name.Equals(modelName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        postedFiles.Add(file);
+                    }
+                }
+
+                if (postedFiles.Count == 0)
+                {
+                    _logger.NoFilesFoundInRequest();
+                }
+            }
+            else
+            {
+                _logger.CannotBindToFilesCollectionDueToUnsupportedContentType(bindingContext);
+            }
+        }
+
+        private class FileCollection : ReadOnlyCollection<IFormFile>, IFormFileCollection
+        {
+            public FileCollection(List<IFormFile> list)
+                : base(list)
+            {
+            }
+
+            public IFormFile this[string name] => GetFile(name);
+
+            public IFormFile GetFile(string name)
+            {
+                for (var i = 0; i < Items.Count; i++)
+                {
+                    var file = Items[i];
+                    if (string.Equals(name, file.Name, StringComparison.OrdinalIgnoreCase))
+                    {
+                        return file;
+                    }
+                }
+
+                return null;
+            }
+
+            public IReadOnlyList<IFormFile> GetFiles(string name)
+            {
+                var files = new List<IFormFile>();
+                for (var i = 0; i < Items.Count; i++)
+                {
+                    var file = Items[i];
+                    if (string.Equals(name, file.Name, StringComparison.OrdinalIgnoreCase))
+                    {
+                        files.Add(file);
+                    }
+                }
+
+                return files;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinderProvider.cs
new file mode 100644
index 0000000000..2edd550fed
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinderProvider.cs
@@ -0,0 +1,39 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinderProvider"/> for <see cref="IFormFile"/>, collections
+    /// of <see cref="IFormFile"/>, and <see cref="IFormFileCollection"/>.
+    /// </summary>
+    public class FormFileModelBinderProvider : IModelBinderProvider
+    {
+        /// <inheritdoc />
+        public IModelBinder GetBinder(ModelBinderProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            // Note: This condition needs to be kept in sync with ApiBehaviorApplicationModelProvider.
+            var modelType = context.Metadata.ModelType;
+            if (modelType == typeof(IFormFile) ||
+                modelType == typeof(IFormFileCollection) ||
+                typeof(IEnumerable<IFormFile>).IsAssignableFrom(modelType))
+            {
+                var loggerFactory = context.Services.GetRequiredService<ILoggerFactory>();
+                return new FormFileModelBinder(loggerFactory);
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinder.cs
new file mode 100644
index 0000000000..48c3ae2304
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinder.cs
@@ -0,0 +1,242 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinder"/> which binds models from the request headers when a model
+    /// has the binding source <see cref="BindingSource.Header"/>.
+    /// </summary>
+    public class HeaderModelBinder : IModelBinder
+    {
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// <para>This constructor is obsolete and will be removed in a future version. The recommended alternative
+        /// is the overload that takes an <see cref="ILoggerFactory"/> and an <see cref="IModelBinder"/>.</para>
+        /// <para>Initializes a new instance of <see cref="HeaderModelBinder"/>.</para>
+        /// </summary>
+        [Obsolete("This constructor is obsolete and will be removed in a future version. The recommended alternative"
+            + " is the overload that takes an " + nameof(ILoggerFactory) + " and an " + nameof(IModelBinder) + ".")]
+        public HeaderModelBinder()
+            : this(NullLoggerFactory.Instance)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="HeaderModelBinder"/>.
+        /// </summary>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public HeaderModelBinder(ILoggerFactory loggerFactory)
+        {
+            _logger = loggerFactory.CreateLogger<HeaderModelBinder>();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="HeaderModelBinder"/>.
+        /// </summary>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        /// <param name="innerModelBinder">The <see cref="IModelBinder"/> which does the actual
+        /// binding of values.</param>
+        public HeaderModelBinder(ILoggerFactory loggerFactory, IModelBinder innerModelBinder)
+        {
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            if (innerModelBinder == null)
+            {
+                throw new ArgumentNullException(nameof(innerModelBinder));
+            }
+
+            _logger = loggerFactory.CreateLogger<HeaderModelBinder>();
+            InnerModelBinder = innerModelBinder;
+        }
+
+        // to enable unit testing
+        internal IModelBinder InnerModelBinder { get; }
+
+        /// <inheritdoc />
+        public async Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            if (bindingContext == null)
+            {
+                throw new ArgumentNullException(nameof(bindingContext));
+            }
+
+            _logger.AttemptingToBindModel(bindingContext);
+
+            // Property name can be null if the model metadata represents a type (rather than a property or parameter).
+            var headerName = bindingContext.FieldName;
+
+            // Do not set ModelBindingResult to Failed on not finding the value in the header as we want the inner 
+            // modelbinder to do that. This would give a chance to the inner binder to add more useful information.
+            // For example, SimpleTypeModelBinder adds a model error when binding to let's say an integer and the
+            // model is null.
+            var request = bindingContext.HttpContext.Request;
+            if (!request.Headers.ContainsKey(headerName))
+            {
+                _logger.FoundNoValueInRequest(bindingContext);
+            }
+
+            if (InnerModelBinder == null)
+            {
+                BindWithoutInnerBinder(bindingContext);
+                return;
+            }
+
+            var headerValueProvider = GetHeaderValueProvider(headerName, bindingContext);
+
+            // Capture the top level object here as entering nested scope would make it 'false'.
+            var isTopLevelObject = bindingContext.IsTopLevelObject;
+
+            // Create a new binding scope in order to supply the HeaderValueProvider so that the binders like
+            // SimpleTypeModelBinder can find values from header.
+            ModelBindingResult result;
+            using (bindingContext.EnterNestedScope(
+                    bindingContext.ModelMetadata,
+                    fieldName: bindingContext.FieldName,
+                    modelName: bindingContext.ModelName,
+                    model: bindingContext.Model))
+            {
+                bindingContext.IsTopLevelObject = isTopLevelObject;
+                bindingContext.ValueProvider = headerValueProvider;
+
+                await InnerModelBinder.BindModelAsync(bindingContext);
+                result = bindingContext.Result;
+            }
+
+            bindingContext.Result = result;
+
+            _logger.DoneAttemptingToBindModel(bindingContext);
+        }
+
+        private HeaderValueProvider GetHeaderValueProvider(string headerName, ModelBindingContext bindingContext)
+        {
+            var request = bindingContext.HttpContext.Request;
+
+            // Prevent breaking existing users in scenarios where they are binding to a 'string' property
+            // and expect the whole comma separated string, if any, as a single string and not as a string array.
+            var values = Array.Empty<string>();
+            if (request.Headers.ContainsKey(headerName))
+            {
+                if (bindingContext.ModelMetadata.IsEnumerableType)
+                {
+                    values = request.Headers.GetCommaSeparatedValues(headerName);
+                }
+                else
+                {
+                    values = new[] { (string)request.Headers[headerName] };
+                }
+            }
+
+            return new HeaderValueProvider(values);
+        }
+
+        private void BindWithoutInnerBinder(ModelBindingContext bindingContext)
+        {
+            var headerName = bindingContext.FieldName;
+            var request = bindingContext.HttpContext.Request;
+
+            object model;
+            if (bindingContext.ModelType == typeof(string))
+            {
+                var value = request.Headers[headerName];
+                model = (string)value;
+            }
+            else if (ModelBindingHelper.CanGetCompatibleCollection<string>(bindingContext))
+            {
+                var values = request.Headers.GetCommaSeparatedValues(headerName);
+                model = GetCompatibleCollection(bindingContext, values);
+            }
+            else
+            {
+                // An unsupported datatype or a new collection is needed (perhaps because target type is an array) but
+                // can't assign it to the property.
+                model = null;
+            }
+
+            if (model == null)
+            {
+                // Silently fail if unable to create an instance or use the current instance. Also reach here in the
+                // typeof(string) case if the header does not exist in the request and in the
+                // typeof(IEnumerable<string>) case if the header does not exist and this is not a top-level object.
+                bindingContext.Result = ModelBindingResult.Failed();
+            }
+            else
+            {
+                bindingContext.ModelState.SetModelValue(
+                    bindingContext.ModelName,
+                    request.Headers.GetCommaSeparatedValues(headerName),
+                    request.Headers[headerName]);
+
+                bindingContext.Result = ModelBindingResult.Success(model);
+            }
+
+            _logger.DoneAttemptingToBindModel(bindingContext);
+        }
+
+        private static object GetCompatibleCollection(ModelBindingContext bindingContext, string[] values)
+        {
+            // Almost-always success if IsTopLevelObject.
+            if (!bindingContext.IsTopLevelObject && values.Length == 0)
+            {
+                return null;
+            }
+
+            if (bindingContext.ModelType.IsAssignableFrom(typeof(string[])))
+            {
+                // Array we already have is compatible.
+                return values;
+            }
+
+            var collection = ModelBindingHelper.GetCompatibleCollection<string>(bindingContext, values.Length);
+            for (var i = 0; i < values.Length; i++)
+            {
+                collection.Add(values[i]);
+            }
+
+            return collection;
+        }
+
+        private class HeaderValueProvider : IValueProvider
+        {
+            private readonly string[] _values;
+
+            public HeaderValueProvider(string[] values)
+            {
+                Debug.Assert(values != null);
+
+                _values = values;
+            }
+
+            public bool ContainsPrefix(string prefix)
+            {
+                return _values.Length != 0;
+            }
+
+            public ValueProviderResult GetValue(string key)
+            {
+                if (_values.Length == 0)
+                {
+                    return ValueProviderResult.None;
+                }
+                else
+                {
+                    return new ValueProviderResult(_values, CultureInfo.InvariantCulture);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinderProvider.cs
new file mode 100644
index 0000000000..c0f46ff93c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinderProvider.cs
@@ -0,0 +1,86 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinderProvider"/> for binding header values.
+    /// </summary>
+    public class HeaderModelBinderProvider : IModelBinderProvider
+    {
+        /// <inheritdoc />
+        public IModelBinder GetBinder(ModelBinderProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var bindingInfo = context.BindingInfo;
+            if (bindingInfo.BindingSource == null ||
+                !bindingInfo.BindingSource.CanAcceptDataFrom(BindingSource.Header))
+            {
+                return null;
+            }
+
+            var modelMetadata = context.Metadata;
+            var loggerFactory = context.Services.GetRequiredService<ILoggerFactory>();
+            var logger = loggerFactory.CreateLogger<HeaderModelBinderProvider>();
+
+            var options = context.Services.GetRequiredService<IOptions<MvcOptions>>().Value;
+            if (!options.AllowBindingHeaderValuesToNonStringModelTypes)
+            {
+                if (modelMetadata.ModelType == typeof(string) ||
+                    modelMetadata.ElementType == typeof(string))
+                {
+                    return new HeaderModelBinder(loggerFactory);
+                }
+                else
+                {
+                    logger.CannotCreateHeaderModelBinderCompatVersion_2_0(modelMetadata.ModelType);
+                }
+
+                return null;
+            }
+
+
+            if (!IsSimpleType(modelMetadata))
+            {
+                logger.CannotCreateHeaderModelBinder(modelMetadata.ModelType);
+                return null;
+            }
+
+            // Since we are delegating the binding of the current model type to other binders, modify the
+            // binding source of the current model type to a non-FromHeader binding source in order to avoid an
+            // infinite recursion into this binder provider.
+            var nestedBindingInfo = new BindingInfo(bindingInfo)
+            {
+                BindingSource = BindingSource.ModelBinding
+            };
+
+            var innerModelBinder = context.CreateBinder(
+                modelMetadata.GetMetadataForType(modelMetadata.ModelType),
+                nestedBindingInfo);
+
+            if (innerModelBinder == null)
+            {
+                return null;
+            }
+
+            return new HeaderModelBinder(loggerFactory, innerModelBinder);
+        }
+
+        // Support binding only to simple types or collection of simple types.
+        private bool IsSimpleType(ModelMetadata modelMetadata)
+        {
+            var metadata = modelMetadata.ElementMetadata ?? modelMetadata;
+            return !metadata.IsComplexType;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/KeyValuePairModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/KeyValuePairModelBinder.cs
new file mode 100644
index 0000000000..ee90c3f01e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/KeyValuePairModelBinder.cs
@@ -0,0 +1,142 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinder"/> for <see cref="KeyValuePair{TKey, TValue}"/>.
+    /// </summary>
+    /// <typeparam name="TKey">The key type.</typeparam>
+    /// <typeparam name="TValue">The value type.</typeparam>
+    public class KeyValuePairModelBinder<TKey, TValue> : IModelBinder
+    {
+        private readonly IModelBinder _keyBinder;
+        private readonly IModelBinder _valueBinder;
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// <para>This constructor is obsolete and will be removed in a future version. The recommended alternative
+        /// is the overload that also takes an <see cref="ILoggerFactory"/>.</para>
+        /// <para>Creates a new <see cref="KeyValuePair{TKey, TValue}"/>.</para>
+        /// </summary>
+        /// <param name="keyBinder">The <see cref="IModelBinder"/> for <typeparamref name="TKey"/>.</param>
+        /// <param name="valueBinder">The <see cref="IModelBinder"/> for <typeparamref name="TValue"/>.</param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version. The recommended alternative"
+            + " is the overload that also takes an " + nameof(ILoggerFactory) + ".")]
+        public KeyValuePairModelBinder(IModelBinder keyBinder, IModelBinder valueBinder)
+            : this(keyBinder, valueBinder, NullLoggerFactory.Instance)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="KeyValuePair{TKey, TValue}"/>.
+        /// </summary>
+        /// <param name="keyBinder">The <see cref="IModelBinder"/> for <typeparamref name="TKey"/>.</param>
+        /// <param name="valueBinder">The <see cref="IModelBinder"/> for <typeparamref name="TValue"/>.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public KeyValuePairModelBinder(IModelBinder keyBinder, IModelBinder valueBinder, ILoggerFactory loggerFactory)
+        {
+            if (keyBinder == null)
+            {
+                throw new ArgumentNullException(nameof(keyBinder));
+            }
+
+            if (valueBinder == null)
+            {
+                throw new ArgumentNullException(nameof(valueBinder));
+            }
+
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            _keyBinder = keyBinder;
+            _valueBinder = valueBinder;
+            _logger = loggerFactory.CreateLogger<KeyValuePairModelBinder<TKey, TValue>>();
+        }
+
+        /// <inheritdoc />
+        public async Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            if (bindingContext == null)
+            {
+                throw new ArgumentNullException(nameof(bindingContext));
+            }
+
+            _logger.AttemptingToBindModel(bindingContext);
+
+            var keyModelName = ModelNames.CreatePropertyModelName(bindingContext.ModelName, "Key");
+            var keyResult = await TryBindStrongModel<TKey>(bindingContext, _keyBinder, "Key", keyModelName);
+
+            var valueModelName = ModelNames.CreatePropertyModelName(bindingContext.ModelName, "Value");
+            var valueResult = await TryBindStrongModel<TValue>(bindingContext, _valueBinder, "Value", valueModelName);
+
+            if (keyResult.IsModelSet && valueResult.IsModelSet)
+            {
+                var model = new KeyValuePair<TKey, TValue>(
+                    ModelBindingHelper.CastOrDefault<TKey>(keyResult.Model),
+                    ModelBindingHelper.CastOrDefault<TValue>(valueResult.Model));
+
+                bindingContext.Result = ModelBindingResult.Success(model);
+                _logger.DoneAttemptingToBindModel(bindingContext);
+                return;
+            }
+
+            if (!keyResult.IsModelSet && valueResult.IsModelSet)
+            {
+                bindingContext.ModelState.TryAddModelError(
+                    keyModelName,
+                    bindingContext.ModelMetadata.ModelBindingMessageProvider.MissingKeyOrValueAccessor());
+                _logger.DoneAttemptingToBindModel(bindingContext);
+                return;
+            }
+
+            if (keyResult.IsModelSet && !valueResult.IsModelSet)
+            {
+                bindingContext.ModelState.TryAddModelError(
+                    valueModelName,
+                    bindingContext.ModelMetadata.ModelBindingMessageProvider.MissingKeyOrValueAccessor());
+                _logger.DoneAttemptingToBindModel(bindingContext);
+                return;
+            }
+
+            // If we failed to find data for a top-level model, then generate a
+            // default 'empty' model and return it.
+            if (bindingContext.IsTopLevelObject)
+            {
+                var model = new KeyValuePair<TKey, TValue>();
+                bindingContext.Result = ModelBindingResult.Success(model);
+            }
+            _logger.DoneAttemptingToBindModel(bindingContext);
+        }
+
+        internal async Task<ModelBindingResult> TryBindStrongModel<TModel>(
+            ModelBindingContext bindingContext,
+            IModelBinder binder,
+            string propertyName,
+            string propertyModelName)
+        {
+            var propertyModelMetadata = bindingContext.ModelMetadata.Properties[propertyName];
+
+            using (bindingContext.EnterNestedScope(
+                modelMetadata: propertyModelMetadata,
+                fieldName: propertyName,
+                modelName: propertyModelName,
+                model: null))
+            {
+                await binder.BindModelAsync(bindingContext);
+
+                return bindingContext.Result;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/KeyValuePairModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/KeyValuePairModelBinderProvider.cs
new file mode 100644
index 0000000000..e17f5d0ab9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/KeyValuePairModelBinderProvider.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinderProvider"/> for <see cref="KeyValuePair{TKey, TValue}"/>.
+    /// </summary>
+    public class KeyValuePairModelBinderProvider : IModelBinderProvider
+    {
+        /// <inheritdoc />
+        public IModelBinder GetBinder(ModelBinderProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var modelTypeInfo = context.Metadata.ModelType.GetTypeInfo();
+            if (modelTypeInfo.IsGenericType &&
+                modelTypeInfo.GetGenericTypeDefinition().GetTypeInfo() == typeof(KeyValuePair<,>).GetTypeInfo())
+            {
+                var typeArguments = modelTypeInfo.GenericTypeArguments;
+
+                var keyMetadata = context.MetadataProvider.GetMetadataForType(typeArguments[0]);
+                var keyBinder = context.CreateBinder(keyMetadata);
+
+                var valueMetadata = context.MetadataProvider.GetMetadataForType(typeArguments[1]);
+                var valueBinder = context.CreateBinder(valueMetadata);
+
+                var binderType = typeof(KeyValuePairModelBinder<,>).MakeGenericType(typeArguments);
+                var loggerFactory = context.Services.GetRequiredService<ILoggerFactory>();
+                return (IModelBinder)Activator.CreateInstance(binderType, keyBinder, valueBinder, loggerFactory);
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ServicesModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ServicesModelBinder.cs
new file mode 100644
index 0000000000..97fcefd1fb
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ServicesModelBinder.cs
@@ -0,0 +1,34 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinder"/> which binds models from the request services when a model 
+    /// has the binding source <see cref="BindingSource.Services"/>/
+    /// </summary>
+    public class ServicesModelBinder : IModelBinder
+    {
+        /// <inheritdoc />
+        public Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            if (bindingContext == null)
+            {
+                throw new ArgumentNullException(nameof(bindingContext));
+            }
+
+            var requestServices = bindingContext.HttpContext.RequestServices;
+            var model = requestServices.GetRequiredService(bindingContext.ModelType);
+
+            bindingContext.ValidationState.Add(model, new ValidationStateEntry() { SuppressValidation = true });
+
+            bindingContext.Result = ModelBindingResult.Success(model);
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ServicesModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ServicesModelBinderProvider.cs
new file mode 100644
index 0000000000..2dea775a0a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ServicesModelBinderProvider.cs
@@ -0,0 +1,30 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinderProvider"/> for binding from the <see cref="IServiceProvider"/>.
+    /// </summary>
+    public class ServicesModelBinderProvider : IModelBinderProvider
+    {
+        /// <inheritdoc />
+        public IModelBinder GetBinder(ModelBinderProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (context.BindingInfo.BindingSource != null &&
+                context.BindingInfo.BindingSource.CanAcceptDataFrom(BindingSource.Services))
+            {
+                return new ServicesModelBinder();
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/SimpleTypeModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/SimpleTypeModelBinder.cs
new file mode 100644
index 0000000000..017049e769
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/SimpleTypeModelBinder.cs
@@ -0,0 +1,154 @@
+// 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.
+
+using System;
+using System.ComponentModel;
+using System.Runtime.ExceptionServices;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinder"/> for simple types.
+    /// </summary>
+    public class SimpleTypeModelBinder : IModelBinder
+    {
+        private readonly TypeConverter _typeConverter;
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// <para>This constructor is obsolete and will be removed in a future version. The recommended alternative
+        /// is the overload that also takes an <see cref="ILoggerFactory"/>.</para>
+        /// <para>Initializes a new instance of <see cref="SimpleTypeModelBinder"/>.</para>
+        /// </summary>
+        /// <param name="type">The type to create binder for.</param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version. The recommended alternative"
+            + " is the overload that also takes an " + nameof(ILoggerFactory) + ".")]
+        public SimpleTypeModelBinder(Type type)
+            : this(type, NullLoggerFactory.Instance)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="SimpleTypeModelBinder"/>.
+        /// </summary>
+        /// <param name="type">The type to create binder for.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public SimpleTypeModelBinder(Type type, ILoggerFactory loggerFactory)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            _typeConverter = TypeDescriptor.GetConverter(type);
+            _logger = loggerFactory.CreateLogger<SimpleTypeModelBinder>();
+        }
+
+        /// <inheritdoc />
+        public Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            if (bindingContext == null)
+            {
+                throw new ArgumentNullException(nameof(bindingContext));
+            }
+
+            var valueProviderResult = bindingContext.ValueProvider.GetValue(bindingContext.ModelName);
+            if (valueProviderResult == ValueProviderResult.None)
+            {
+                _logger.FoundNoValueInRequest(bindingContext);
+
+                // no entry
+                _logger.DoneAttemptingToBindModel(bindingContext);
+                return Task.CompletedTask;
+            }
+
+            _logger.AttemptingToBindModel(bindingContext);
+
+            bindingContext.ModelState.SetModelValue(bindingContext.ModelName, valueProviderResult);
+
+            try
+            {
+                var value = valueProviderResult.FirstValue;
+
+                object model;
+                if (bindingContext.ModelType == typeof(string))
+                {
+                    // Already have a string. No further conversion required but handle ConvertEmptyStringToNull.
+                    if (bindingContext.ModelMetadata.ConvertEmptyStringToNull && string.IsNullOrWhiteSpace(value))
+                    {
+                        model = null;
+                    }
+                    else
+                    {
+                        model = value;
+                    }
+                }
+                else if (string.IsNullOrWhiteSpace(value))
+                {
+                    // Other than the StringConverter, converters Trim() the value then throw if the result is empty.
+                    model = null;
+                }
+                else
+                {
+                    model = _typeConverter.ConvertFrom(
+                        context: null,
+                        culture: valueProviderResult.Culture,
+                        value: value);
+                }
+
+                CheckModel(bindingContext, valueProviderResult, model);
+
+                _logger.DoneAttemptingToBindModel(bindingContext);
+                return Task.CompletedTask;
+            }
+            catch (Exception exception)
+            {
+                var isFormatException = exception is FormatException;
+                if (!isFormatException && exception.InnerException != null)
+                {
+                    // TypeConverter throws System.Exception wrapping the FormatException,
+                    // so we capture the inner exception.
+                    exception = ExceptionDispatchInfo.Capture(exception.InnerException).SourceException;
+                }
+
+                bindingContext.ModelState.TryAddModelError(
+                    bindingContext.ModelName,
+                    exception,
+                    bindingContext.ModelMetadata);
+
+                // Were able to find a converter for the type but conversion failed.
+                return Task.CompletedTask;
+            }
+        }
+
+        protected virtual void CheckModel(
+            ModelBindingContext bindingContext,
+            ValueProviderResult valueProviderResult,
+            object model)
+        {
+            // When converting newModel a null value may indicate a failed conversion for an otherwise required
+            // model (can't set a ValueType to null). This detects if a null model value is acceptable given the
+            // current bindingContext. If not, an error is logged.
+            if (model == null && !bindingContext.ModelMetadata.IsReferenceOrNullableType)
+            {
+                bindingContext.ModelState.TryAddModelError(
+                    bindingContext.ModelName,
+                    bindingContext.ModelMetadata.ModelBindingMessageProvider.ValueMustNotBeNullAccessor(
+                        valueProviderResult.ToString()));
+            }
+            else
+            {
+                bindingContext.Result = ModelBindingResult.Success(model);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/SimpleTypeModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/SimpleTypeModelBinderProvider.cs
new file mode 100644
index 0000000000..f7d69e016c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/SimpleTypeModelBinderProvider.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    /// <summary>
+    /// An <see cref="IModelBinderProvider"/> for binding simple data types.
+    /// </summary>
+    public class SimpleTypeModelBinderProvider : IModelBinderProvider
+    {
+        /// <inheritdoc />
+        public IModelBinder GetBinder(ModelBinderProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (!context.Metadata.IsComplexType)
+            {
+                var loggerFactory = context.Services.GetRequiredService<ILoggerFactory>();
+                return new SimpleTypeModelBinder(context.Metadata.ModelType, loggerFactory);
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingBehavior.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingBehavior.cs
new file mode 100644
index 0000000000..1a9bde1fb8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingBehavior.cs
@@ -0,0 +1,26 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Enumerates behavior options of the model binding system.
+    /// </summary>
+    public enum BindingBehavior
+    {
+        /// <summary>
+        /// The property should be model bound if a value is available from the value provider.
+        /// </summary>
+        Optional = 0,
+
+        /// <summary>
+        /// The property should be excluded from model binding.
+        /// </summary>
+        Never,
+
+        /// <summary>
+        /// The property is required for model binding.
+        /// </summary>
+        Required
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingBehaviorAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingBehaviorAttribute.cs
new file mode 100644
index 0000000000..b27c8451d4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingBehaviorAttribute.cs
@@ -0,0 +1,28 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Specifies the <see cref="BindingBehavior"/> that should be applied.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Property | AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)]
+    public class BindingBehaviorAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new <see cref="BindingBehaviorAttribute"/> instance.
+        /// </summary>
+        /// <param name="behavior">The <see cref="BindingBehavior"/> to apply.</param>
+        public BindingBehaviorAttribute(BindingBehavior behavior)
+        {
+            Behavior = behavior;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="BindingBehavior"/> to apply.
+        /// </summary>
+        public BindingBehavior Behavior { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingSourceValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingSourceValueProvider.cs
new file mode 100644
index 0000000000..2cb4198ae5
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingSourceValueProvider.cs
@@ -0,0 +1,89 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Core;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// A value provider which provides data from a specific <see cref="BindingSource"/>.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// A <see cref="BindingSourceValueProvider"/> is an <see cref="IValueProvider"/> base-implementation which
+    /// can provide data for all parameters and model properties which specify the corresponding
+    /// <see cref="ModelBinding.BindingSource"/>.
+    /// </para>
+    /// <para>
+    /// <see cref="BindingSourceValueProvider"/> implements <see cref="IBindingSourceValueProvider"/> and will
+    /// include or exclude itself from the set of value providers based on the model's associated
+    /// <see cref="ModelBinding.BindingSource"/>. Value providers are by-default included; if a model does not
+    /// specify a <see cref="ModelBinding.BindingSource"/> then all value providers are valid.
+    /// </para>
+    /// </remarks>
+    public abstract class BindingSourceValueProvider : IBindingSourceValueProvider
+    {
+        /// <summary>
+        /// Creates a new <see cref="BindingSourceValueProvider"/>.
+        /// </summary>
+        /// <param name="bindingSource">
+        /// The <see cref="ModelBinding.BindingSource"/>. Must be a single-source (non-composite) with
+        /// <see cref="ModelBinding.BindingSource.IsGreedy"/> equal to <c>false</c>.
+        /// </param>
+        public BindingSourceValueProvider(BindingSource bindingSource)
+        {
+            if (bindingSource == null)
+            {
+                throw new ArgumentNullException(nameof(bindingSource));
+            }
+
+            if (bindingSource.IsGreedy)
+            {
+                var message = Resources.FormatBindingSource_CannotBeGreedy(
+                    bindingSource.DisplayName,
+                    nameof(BindingSourceValueProvider));
+                throw new ArgumentException(message, nameof(bindingSource));
+            }
+
+            if (bindingSource is CompositeBindingSource)
+            {
+                var message = Resources.FormatBindingSource_CannotBeComposite(
+                    bindingSource.DisplayName,
+                    nameof(BindingSourceValueProvider));
+                throw new ArgumentException(message, nameof(bindingSource));
+            }
+
+            BindingSource = bindingSource;
+        }
+
+        /// <summary>
+        /// Gets the corresponding <see cref="ModelBinding.BindingSource"/>.
+        /// </summary>
+        protected BindingSource BindingSource { get; }
+
+        /// <inheritdoc />
+        public abstract bool ContainsPrefix(string prefix);
+
+        /// <inheritdoc />
+        public abstract ValueProviderResult GetValue(string key);
+
+        /// <inheritdoc />
+        public virtual IValueProvider Filter(BindingSource bindingSource)
+        {
+            if (bindingSource == null)
+            {
+                throw new ArgumentNullException(nameof(bindingSource));
+            }
+
+            if (bindingSource.CanAcceptDataFrom(BindingSource))
+            {
+                return this;
+            }
+            else
+            {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/CompositeValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/CompositeValueProvider.cs
new file mode 100644
index 0000000000..eaf15df1be
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/CompositeValueProvider.cs
@@ -0,0 +1,254 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Represents a <see cref="IValueProvider"/> whose values come from a collection of <see cref="IValueProvider"/>s.
+    /// </summary>
+    public class CompositeValueProvider :
+        Collection<IValueProvider>,
+        IEnumerableValueProvider,
+        IBindingSourceValueProvider,
+        IKeyRewriterValueProvider
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="CompositeValueProvider"/>.
+        /// </summary>
+        public CompositeValueProvider()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="CompositeValueProvider"/>.
+        /// </summary>
+        /// <param name="valueProviders">The sequence of <see cref="IValueProvider"/> to add to this instance of
+        /// <see cref="CompositeValueProvider"/>.</param>
+        public CompositeValueProvider(IList<IValueProvider> valueProviders)
+            : base(valueProviders)
+        {
+        }
+
+        /// <summary>
+        /// Asynchronously creates a <see cref="CompositeValueProvider"/> using the provided
+        /// <paramref name="controllerContext"/>.
+        /// </summary>
+        /// <param name="controllerContext">The <see cref="ControllerContext"/> associated with the current request.</param>
+        /// <returns>
+        /// A <see cref="Task{TResult}"/> which, when completed, asynchronously returns a
+        /// <see cref="CompositeValueProvider"/>.
+        /// </returns>
+        public static async Task<CompositeValueProvider> CreateAsync(ControllerContext controllerContext)
+        {
+            if (controllerContext == null)
+            {
+                throw new ArgumentNullException(nameof(controllerContext));
+            }
+
+            var factories = controllerContext.ValueProviderFactories;
+
+            return await CreateAsync(controllerContext, factories);
+        }
+
+        /// <summary>
+        /// Asynchronously creates a <see cref="CompositeValueProvider"/> using the provided
+        /// <paramref name="actionContext"/>.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/> associated with the current request.</param>
+        /// <param name="factories">The <see cref="IValueProviderFactory"/> to be applied to the context.</param>
+        /// <returns>
+        /// A <see cref="Task{TResult}"/> which, when completed, asynchronously returns a
+        /// <see cref="CompositeValueProvider"/>.
+        /// </returns>
+        public static async Task<CompositeValueProvider> CreateAsync(
+            ActionContext actionContext,
+            IList<IValueProviderFactory> factories)
+        {
+            var valueProviderFactoryContext = new ValueProviderFactoryContext(actionContext);
+
+            for (var i = 0; i < factories.Count; i++)
+            {
+                var factory = factories[i];
+                await factory.CreateValueProviderAsync(valueProviderFactoryContext);
+            }
+
+            return new CompositeValueProvider(valueProviderFactoryContext.ValueProviders);
+        }
+
+        /// <inheritdoc />
+        public virtual bool ContainsPrefix(string prefix)
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                if (this[i].ContainsPrefix(prefix))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /// <inheritdoc />
+        public virtual ValueProviderResult GetValue(string key)
+        {
+            // Performance-sensitive
+            // Caching the count is faster for IList<T>
+            var itemCount = Items.Count;
+            for (var i = 0; i < itemCount; i++)
+            {
+                var valueProvider = Items[i];
+                var result = valueProvider.GetValue(key);
+                if (result != ValueProviderResult.None)
+                {
+                    return result;
+                }
+            }
+
+            return ValueProviderResult.None;
+        }
+
+        /// <inheritdoc />
+        public virtual IDictionary<string, string> GetKeysFromPrefix(string prefix)
+        {
+            foreach (var valueProvider in this)
+            {
+                if (valueProvider is IEnumerableValueProvider enumeratedProvider)
+                {
+                    var result = enumeratedProvider.GetKeysFromPrefix(prefix);
+                    if (result != null && result.Count > 0)
+                    {
+                        return result;
+                    }
+                }
+            }
+            return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        }
+
+        /// <inheritdoc />
+        protected override void InsertItem(int index, IValueProvider item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException(nameof(item));
+            }
+
+            base.InsertItem(index, item);
+        }
+
+        /// <inheritdoc />
+        protected override void SetItem(int index, IValueProvider item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException(nameof(item));
+            }
+
+            base.SetItem(index, item);
+        }
+
+        /// <inheritdoc />
+        public IValueProvider Filter(BindingSource bindingSource)
+        {
+            if (bindingSource == null)
+            {
+                throw new ArgumentNullException(nameof(bindingSource));
+            }
+
+            var shouldFilter = false;
+            for (var i = 0; i < Count; i++)
+            {
+                var valueProvider = Items[i];
+                if (valueProvider is IBindingSourceValueProvider)
+                {
+                    shouldFilter = true;
+                    break;
+                }
+            }
+
+            if (!shouldFilter)
+            {
+                // No inner IBindingSourceValueProvider implementations. Result will be empty.
+                return null;
+            }
+
+            var filteredValueProviders = new List<IValueProvider>();
+            for (var i = 0; i < Count; i++)
+            {
+                var valueProvider = Items[i];
+                if (valueProvider is IBindingSourceValueProvider bindingSourceValueProvider)
+                {
+                    var result = bindingSourceValueProvider.Filter(bindingSource);
+                    if (result != null)
+                    {
+                        filteredValueProviders.Add(result);
+                    }
+                }
+            }
+
+            if (filteredValueProviders.Count == 0)
+            {
+                // Do not create an empty CompositeValueProvider.
+                return null;
+            }
+
+            return new CompositeValueProvider(filteredValueProviders);
+        }
+
+        /// <inheritdoc />
+        /// <remarks>
+        /// Value providers are included by default. If a contained <see cref="IValueProvider"/> does not implement
+        /// <see cref="IKeyRewriterValueProvider"/>, <see cref="Filter()"/> will not remove it.
+        /// </remarks>
+        public IValueProvider Filter()
+        {
+            var shouldFilter = false;
+            for (var i = 0; i < Count; i++)
+            {
+                var valueProvider = Items[i];
+                if (valueProvider is IKeyRewriterValueProvider)
+                {
+                    shouldFilter = true;
+                    break;
+                }
+            }
+
+            if (!shouldFilter)
+            {
+                // No inner IKeyRewriterValueProvider implementations. Nothing to exclude.
+                return this;
+            }
+
+            var filteredValueProviders = new List<IValueProvider>();
+            for (var i = 0; i < Count; i++)
+            {
+                var valueProvider = Items[i];
+                if (valueProvider is IKeyRewriterValueProvider keyRewriterValueProvider)
+                {
+                    var result = keyRewriterValueProvider.Filter();
+                    if (result != null)
+                    {
+                        filteredValueProviders.Add(result);
+                    }
+                }
+                else
+                {
+                    // Assume value providers that aren't rewriter-aware do not rewrite their keys.
+                    filteredValueProviders.Add(valueProvider);
+                }
+            }
+
+            if (filteredValueProviders.Count == 0)
+            {
+                // Do not create an empty CompositeValueProvider.
+                return null;
+            }
+
+            return new CompositeValueProvider(filteredValueProviders);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DefaultPropertyFilterProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DefaultPropertyFilterProvider.cs
new file mode 100644
index 0000000000..3d1bc81a71
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DefaultPropertyFilterProvider.cs
@@ -0,0 +1,55 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Default implementation for <see cref="IPropertyFilterProvider"/>.
+    /// Provides a expression based way to provide include properties.
+    /// </summary>
+    /// <typeparam name="TModel">The target model Type.</typeparam>
+    public class DefaultPropertyFilterProvider<TModel> : IPropertyFilterProvider
+        where TModel : class
+    {
+        private static readonly Func<ModelMetadata, bool> _default = (m) => true;
+
+        /// <summary>
+        /// The prefix which is used while generating the property filter.
+        /// </summary>
+        public virtual string Prefix => string.Empty;
+
+        /// <summary>
+        /// Expressions which can be used to generate property filter which can filter model 
+        /// properties.
+        /// </summary>
+        public virtual IEnumerable<Expression<Func<TModel, object>>> PropertyIncludeExpressions => null;
+
+        /// <inheritdoc />
+        public virtual Func<ModelMetadata, bool> PropertyFilter
+        {
+            get
+            {
+                if (PropertyIncludeExpressions == null)
+                {
+                    return _default;
+                }
+
+                // We do not cache by default.
+                return GetPropertyFilterFromExpression(PropertyIncludeExpressions);
+            }
+        }
+
+        private Func<ModelMetadata, bool> GetPropertyFilterFromExpression(
+            IEnumerable<Expression<Func<TModel, object>>> includeExpressions)
+        {
+            var expression = ModelBindingHelper.GetPropertyFilterExpression(includeExpressions.ToArray());
+            return expression.Compile();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/EmptyModelMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/EmptyModelMetadataProvider.cs
new file mode 100644
index 0000000000..122d760af8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/EmptyModelMetadataProvider.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class EmptyModelMetadataProvider : DefaultModelMetadataProvider
+    {
+        public EmptyModelMetadataProvider()
+            : base(
+                  new DefaultCompositeMetadataDetailsProvider(new List<IMetadataDetailsProvider>()),
+                  new OptionsAccessor())
+        {
+        }
+
+        private class OptionsAccessor : IOptions<MvcOptions>
+        {
+            public MvcOptions Value { get; } = new MvcOptions();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormValueProvider.cs
new file mode 100644
index 0000000000..0e347e99d7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormValueProvider.cs
@@ -0,0 +1,98 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// An <see cref="IValueProvider"/> adapter for data stored in an <see cref="IFormCollection"/>.
+    /// </summary>
+    public class FormValueProvider : BindingSourceValueProvider, IEnumerableValueProvider
+    {
+        private readonly CultureInfo _culture;
+        private readonly IFormCollection _values;
+        private PrefixContainer _prefixContainer;
+
+        /// <summary>
+        /// Creates a value provider for <see cref="IFormCollection"/>.
+        /// </summary>
+        /// <param name="bindingSource">The <see cref="BindingSource"/> for the data.</param>
+        /// <param name="values">The key value pairs to wrap.</param>
+        /// <param name="culture">The culture to return with ValueProviderResult instances.</param>
+        public FormValueProvider(
+            BindingSource bindingSource,
+            IFormCollection values,
+            CultureInfo culture)
+            : base(bindingSource)
+        {
+            if (bindingSource == null)
+            {
+                throw new ArgumentNullException(nameof(bindingSource));
+            }
+
+            if (values == null)
+            {
+                throw new ArgumentNullException(nameof(values));
+            }
+
+            _values = values;
+            _culture = culture;
+        }
+
+        public CultureInfo Culture => _culture;
+
+        protected PrefixContainer PrefixContainer
+        {
+            get
+            {
+                if (_prefixContainer == null)
+                {
+                    _prefixContainer = new PrefixContainer(_values.Keys);
+                }
+
+                return _prefixContainer;
+            }
+        }
+
+        /// <inheritdoc />
+        public override bool ContainsPrefix(string prefix)
+        {
+            return PrefixContainer.ContainsPrefix(prefix);
+        }
+
+        /// <inheritdoc />
+        public virtual IDictionary<string, string> GetKeysFromPrefix(string prefix)
+        {
+            if (prefix == null)
+            {
+                throw new ArgumentNullException(nameof(prefix));
+            }
+
+            return PrefixContainer.GetKeysFromPrefix(prefix);
+        }
+
+        /// <inheritdoc />
+        public override ValueProviderResult GetValue(string key)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            var values = _values[key];
+            if (values.Count == 0)
+            {
+                return ValueProviderResult.None;
+            }
+            else
+            {
+                return new ValueProviderResult(values, _culture);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormValueProviderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormValueProviderFactory.cs
new file mode 100644
index 0000000000..f9febdef06
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormValueProviderFactory.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System;
+using System.Globalization;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// A <see cref="IValueProviderFactory"/> for <see cref="FormValueProvider"/>.
+    /// </summary>
+    public class FormValueProviderFactory : IValueProviderFactory
+    {
+        /// <inheritdoc />
+        public Task CreateValueProviderAsync(ValueProviderFactoryContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var request = context.ActionContext.HttpContext.Request;
+            if (request.HasFormContentType)
+            {
+                // Allocating a Task only when the body is form data.
+                return AddValueProviderAsync(context);
+            }
+
+            return Task.CompletedTask;
+        }
+
+        private static async Task AddValueProviderAsync(ValueProviderFactoryContext context)
+        {
+            var request = context.ActionContext.HttpContext.Request;
+            var valueProvider = new FormValueProvider(
+                BindingSource.Form,
+                await request.ReadFormAsync(),
+                CultureInfo.CurrentCulture);
+
+            context.ValueProviders.Add(valueProvider);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IBindingSourceValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IBindingSourceValueProvider.cs
new file mode 100644
index 0000000000..dcd948fd29
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IBindingSourceValueProvider.cs
@@ -0,0 +1,25 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// A value provider which can filter its contents based on <see cref="BindingSource"/>.
+    /// </summary>
+    /// <remarks>
+    /// Value providers are by-default included. If a model does not specify a <see cref="BindingSource"/>
+    /// then all value providers are valid.
+    /// </remarks>
+    public interface IBindingSourceValueProvider : IValueProvider
+    {
+        /// <summary>
+        /// Filters the value provider based on <paramref name="bindingSource"/>.
+        /// </summary>
+        /// <param name="bindingSource">The <see cref="BindingSource"/> associated with a model.</param>
+        /// <returns>
+        /// The filtered value provider, or <c>null</c> if the value provider does not match
+        /// <paramref name="bindingSource"/>.
+        /// </returns>
+        IValueProvider Filter(BindingSource bindingSource);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ICollectionModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ICollectionModelBinder.cs
new file mode 100644
index 0000000000..b3c5781e3e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ICollectionModelBinder.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Interface for model binding collections.
+    /// </summary>
+    public interface ICollectionModelBinder : IModelBinder
+    {
+        /// <summary>
+        /// Gets an indication whether or not this <see cref="ICollectionModelBinder"/> implementation can create
+        /// an <see cref="object"/> assignable to <paramref name="targetType"/>.
+        /// </summary>
+        /// <param name="targetType"><see cref="Type"/> of the model.</param>
+        /// <returns>
+        /// <c>true</c> if this <see cref="ICollectionModelBinder"/> implementation can create an <see cref="object"/>
+        /// assignable to <paramref name="targetType"/>; <c>false</c> otherwise.
+        /// </returns>
+        /// <remarks>
+        /// A <c>true</c> return value is necessary for successful model binding if model is initially <c>null</c>.
+        /// </remarks>
+        bool CanCreateInstance(Type targetType);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IEnumerableValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IEnumerableValueProvider.cs
new file mode 100644
index 0000000000..2e1a1cb82c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IEnumerableValueProvider.cs
@@ -0,0 +1,12 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public interface IEnumerableValueProvider : IValueProvider
+    {
+        IDictionary<string, string> GetKeysFromPrefix(string prefix);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IKeyRewriterValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IKeyRewriterValueProvider.cs
new file mode 100644
index 0000000000..f2bb03cdb7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IKeyRewriterValueProvider.cs
@@ -0,0 +1,23 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// A value provider which can filter its contents to remove keys rewritten compared to the request data.
+    /// </summary>
+    public interface IKeyRewriterValueProvider : IValueProvider
+    {
+        /// <summary>
+        /// Filters the value provider to remove keys rewritten compared to the request data.
+        /// </summary>
+        /// <example>
+        /// If the request contains values with keys <c>Model.Property</c> and <c>Collection[index]</c>, the returned
+        /// <see cref="IValueProvider"/> will not match <c>Model[Property]</c> or <c>Collection.index</c>.
+        /// </example>
+        /// <returns>
+        /// The filtered value provider or <see langref="null"/> if the value provider only contains rewritten keys.
+        /// </returns>
+        IValueProvider Filter();
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IModelBinderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IModelBinderFactory.cs
new file mode 100644
index 0000000000..310183424a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IModelBinderFactory.cs
@@ -0,0 +1,18 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// A factory abstraction for creating <see cref="IModelBinder"/> instances.
+    /// </summary>
+    public interface IModelBinderFactory
+    {
+        /// <summary>
+        /// Creates a new <see cref="IModelBinder"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ModelBinderFactoryContext"/>.</param>
+        /// <returns>An <see cref="IModelBinder"/> instance.</returns>
+        IModelBinder CreateBinder(ModelBinderFactoryContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Internal/ModelBindingHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Internal/ModelBindingHelper.cs
new file mode 100644
index 0000000000..90d8dd79f1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Internal/ModelBindingHelper.cs
@@ -0,0 +1,803 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Runtime.ExceptionServices;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Internal
+{
+    public static class ModelBindingHelper
+    {
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using the specified
+        /// <paramref name="modelBinderFactory"/> and the specified <paramref name="valueProvider"/> and executes
+        /// validation using the specified <paramref name="objectModelValidator"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update and validate.</param>
+        /// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>.
+        /// </param>
+        /// <param name="actionContext">The <see cref="ActionContext"/> for the current executing request.</param>
+        /// <param name="metadataProvider">The provider used for reading metadata for the model type.</param>
+        /// <param name="modelBinderFactory">The <see cref="IModelBinderFactory"/> used for binding.</param>
+        /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
+        /// <param name="objectModelValidator">The <see cref="IObjectModelValidator"/> used for validating the
+        /// bound values.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful</returns>
+        public static Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model,
+            string prefix,
+            ActionContext actionContext,
+            IModelMetadataProvider metadataProvider,
+            IModelBinderFactory modelBinderFactory,
+            IValueProvider valueProvider,
+            IObjectModelValidator objectModelValidator)
+            where TModel : class
+        {
+            return TryUpdateModelAsync(
+                model,
+                prefix,
+                actionContext,
+                metadataProvider,
+                modelBinderFactory,
+                valueProvider,
+                objectModelValidator,
+                // Includes everything by default.
+                propertyFilter: (m) => true);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using the specified <paramref name="modelBinderFactory"/>
+        /// and the specified <paramref name="valueProvider"/> and executes validation using the specified
+        /// <paramref name="objectModelValidator"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update and validate.</param>
+        /// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>.
+        /// </param>
+        /// <param name="actionContext">The <see cref="ActionContext"/> for the current executing request.</param>
+        /// <param name="metadataProvider">The provider used for reading metadata for the model type.</param>
+        /// <param name="modelBinderFactory">The <see cref="IModelBinderFactory"/> used for binding.</param>
+        /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
+        /// <param name="objectModelValidator">The <see cref="IObjectModelValidator"/> used for validating the
+        /// bound values.</param>
+        /// <param name="includeExpressions">Expression(s) which represent top level properties
+        /// which need to be included for the current model.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful</returns>
+        public static Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model,
+            string prefix,
+            ActionContext actionContext,
+            IModelMetadataProvider metadataProvider,
+            IModelBinderFactory modelBinderFactory,
+            IValueProvider valueProvider,
+            IObjectModelValidator objectModelValidator,
+            params Expression<Func<TModel, object>>[] includeExpressions)
+           where TModel : class
+        {
+            if (includeExpressions == null)
+            {
+                throw new ArgumentNullException(nameof(includeExpressions));
+            }
+
+            var expression = GetPropertyFilterExpression(includeExpressions);
+            var propertyFilter = expression.Compile();
+
+            return TryUpdateModelAsync(
+               model,
+               prefix,
+               actionContext,
+               metadataProvider,
+               modelBinderFactory,
+               valueProvider,
+               objectModelValidator,
+               propertyFilter);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using the specified <paramref name="modelBinderFactory"/>
+        /// and the specified <paramref name="valueProvider"/> and executes validation using the specified
+        /// <paramref name="objectModelValidator"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update and validate.</param>
+        /// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>.
+        /// </param>
+        /// <param name="actionContext">The <see cref="ActionContext"/> for the current executing request.</param>
+        /// <param name="metadataProvider">The provider used for reading metadata for the model type.</param>
+        /// <param name="modelBinderFactory">The <see cref="IModelBinderFactory"/> used for binding.</param>
+        /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
+        /// <param name="objectModelValidator">The <see cref="IObjectModelValidator"/> used for validating the
+        /// bound values.</param>
+        /// <param name="propertyFilter">
+        /// A predicate which can be used to filter properties(for inclusion/exclusion) at runtime.
+        /// </param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful</returns>
+        public static Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model,
+            string prefix,
+            ActionContext actionContext,
+            IModelMetadataProvider metadataProvider,
+            IModelBinderFactory modelBinderFactory,
+            IValueProvider valueProvider,
+            IObjectModelValidator objectModelValidator,
+            Func<ModelMetadata, bool> propertyFilter)
+            where TModel : class
+        {
+            return TryUpdateModelAsync(
+               model,
+               typeof(TModel),
+               prefix,
+               actionContext,
+               metadataProvider,
+               modelBinderFactory,
+               valueProvider,
+               objectModelValidator,
+               propertyFilter);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using the specified <paramref name="modelBinderFactory"/>
+        /// and the specified <paramref name="valueProvider"/> and executes validation using the specified
+        /// <paramref name="objectModelValidator"/>.
+        /// </summary>
+        /// <param name="model">The model instance to update and validate.</param>
+        /// <param name="modelType">The type of model instance to update and validate.</param>
+        /// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>.
+        /// </param>
+        /// <param name="actionContext">The <see cref="ActionContext"/> for the current executing request.</param>
+        /// <param name="metadataProvider">The provider used for reading metadata for the model type.</param>
+        /// <param name="modelBinderFactory">The <see cref="IModelBinderFactory"/> used for binding.</param>
+        /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
+        /// <param name="objectModelValidator">The <see cref="IObjectModelValidator"/> used for validating the
+        /// bound values.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful</returns>
+        public static Task<bool> TryUpdateModelAsync(
+            object model,
+            Type modelType,
+            string prefix,
+            ActionContext actionContext,
+            IModelMetadataProvider metadataProvider,
+            IModelBinderFactory modelBinderFactory,
+            IValueProvider valueProvider,
+            IObjectModelValidator objectModelValidator)
+        {
+            return TryUpdateModelAsync(
+                model,
+                modelType,
+                prefix,
+                actionContext,
+                metadataProvider,
+                modelBinderFactory,
+                valueProvider,
+                objectModelValidator,
+                // Includes everything by default.
+                propertyFilter: (m) => true);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using the specified <paramref name="modelBinderFactory"/>
+        /// and the specified <paramref name="valueProvider"/> and executes validation using the specified
+        /// <paramref name="objectModelValidator"/>.
+        /// </summary>
+        /// <param name="model">The model instance to update and validate.</param>
+        /// <param name="modelType">The type of model instance to update and validate.</param>
+        /// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>.
+        /// </param>
+        /// <param name="actionContext">The <see cref="ActionContext"/> for the current executing request.</param>
+        /// <param name="metadataProvider">The provider used for reading metadata for the model type.</param>
+        /// <param name="modelBinderFactory">The <see cref="IModelBinderFactory"/> used for binding.</param>
+        /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
+        /// <param name="objectModelValidator">The <see cref="IObjectModelValidator"/> used for validating the
+        /// bound values.</param>
+        /// <param name="propertyFilter">A predicate which can be used to
+        /// filter properties(for inclusion/exclusion) at runtime.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful</returns>
+        public static async Task<bool> TryUpdateModelAsync(
+            object model,
+            Type modelType,
+            string prefix,
+            ActionContext actionContext,
+            IModelMetadataProvider metadataProvider,
+            IModelBinderFactory modelBinderFactory,
+            IValueProvider valueProvider,
+            IObjectModelValidator objectModelValidator,
+            Func<ModelMetadata, bool> propertyFilter)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            if (prefix == null)
+            {
+                throw new ArgumentNullException(nameof(prefix));
+            }
+
+            if (actionContext == null)
+            {
+                throw new ArgumentNullException(nameof(actionContext));
+            }
+
+            if (metadataProvider == null)
+            {
+                throw new ArgumentNullException(nameof(metadataProvider));
+            }
+
+            if (modelBinderFactory == null)
+            {
+                throw new ArgumentNullException(nameof(modelBinderFactory));
+            }
+
+            if (valueProvider == null)
+            {
+                throw new ArgumentNullException(nameof(valueProvider));
+            }
+
+            if (objectModelValidator == null)
+            {
+                throw new ArgumentNullException(nameof(objectModelValidator));
+            }
+
+            if (propertyFilter == null)
+            {
+                throw new ArgumentNullException(nameof(propertyFilter));
+            }
+
+            if (!modelType.IsAssignableFrom(model.GetType()))
+            {
+                var message = Resources.FormatModelType_WrongType(
+                    model.GetType().FullName,
+                    modelType.FullName);
+                throw new ArgumentException(message, nameof(modelType));
+            }
+
+            var modelMetadata = metadataProvider.GetMetadataForType(modelType);
+            var modelState = actionContext.ModelState;
+
+            var modelBindingContext = DefaultModelBindingContext.CreateBindingContext(
+                actionContext,
+                valueProvider,
+                modelMetadata,
+                bindingInfo: null,
+                modelName: prefix);
+
+            modelBindingContext.Model = model;
+            modelBindingContext.PropertyFilter = propertyFilter;
+
+            var factoryContext = new ModelBinderFactoryContext()
+            {
+                Metadata = modelMetadata,
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = modelMetadata.BinderModelName,
+                    BinderType = modelMetadata.BinderType,
+                    BindingSource = modelMetadata.BindingSource,
+                    PropertyFilterProvider = modelMetadata.PropertyFilterProvider,
+                },
+
+                // We're using the model metadata as the cache token here so that TryUpdateModelAsync calls
+                // for the same model type can share a binder. This won't overlap with normal model binding
+                // operations because they use the ParameterDescriptor for the token.
+                CacheToken = modelMetadata,
+            };
+            var binder = modelBinderFactory.CreateBinder(factoryContext);
+
+            await binder.BindModelAsync(modelBindingContext);
+            var modelBindingResult = modelBindingContext.Result;
+            if (modelBindingResult.IsModelSet)
+            {
+                objectModelValidator.Validate(
+                    actionContext,
+                    modelBindingContext.ValidationState,
+                    modelBindingContext.ModelName,
+                    modelBindingResult.Model);
+
+                return modelState.IsValid;
+            }
+
+            return false;
+        }
+
+        // Internal for tests
+        internal static string GetPropertyName(Expression expression)
+        {
+            if (expression.NodeType == ExpressionType.Convert ||
+                expression.NodeType == ExpressionType.ConvertChecked)
+            {
+                // For Boxed Value Types
+                expression = ((UnaryExpression)expression).Operand;
+            }
+
+            if (expression.NodeType != ExpressionType.MemberAccess)
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatInvalid_IncludePropertyExpression(expression.NodeType));
+            }
+
+            var memberExpression = (MemberExpression)expression;
+            if (memberExpression.Member is PropertyInfo memberInfo)
+            {
+                if (memberExpression.Expression.NodeType != ExpressionType.Parameter)
+                {
+                    // Chained expressions and non parameter based expressions are not supported.
+                    throw new InvalidOperationException(
+                        Resources.FormatInvalid_IncludePropertyExpression(expression.NodeType));
+                }
+
+                return memberInfo.Name;
+            }
+            else
+            {
+                // Fields are also not supported.
+                throw new InvalidOperationException(
+                    Resources.FormatInvalid_IncludePropertyExpression(expression.NodeType));
+            }
+        }
+
+        /// <summary>
+        /// Creates an expression for a predicate to limit the set of properties used in model binding.
+        /// </summary>
+        /// <typeparam name="TModel">The model type.</typeparam>
+        /// <param name="expressions">Expressions identifying the properties to allow for binding.</param>
+        /// <returns>An expression which can be used with <see cref="IPropertyFilterProvider"/>.</returns>
+        public static Expression<Func<ModelMetadata, bool>> GetPropertyFilterExpression<TModel>(
+            Expression<Func<TModel, object>>[] expressions)
+        {
+            if (expressions.Length == 0)
+            {
+                // If nothing is included explicitly, treat everything as included.
+                return (m) => true;
+            }
+
+            var firstExpression = GetPredicateExpression(expressions[0]);
+            var orWrapperExpression = firstExpression.Body;
+            foreach (var expression in expressions.Skip(1))
+            {
+                var predicate = GetPredicateExpression(expression);
+                orWrapperExpression = Expression.OrElse(
+                    orWrapperExpression,
+                    Expression.Invoke(predicate, firstExpression.Parameters));
+            }
+
+            return Expression.Lambda<Func<ModelMetadata, bool>>(orWrapperExpression, firstExpression.Parameters);
+        }
+
+        private static Expression<Func<ModelMetadata, bool>> GetPredicateExpression<TModel>(
+            Expression<Func<TModel, object>> expression)
+        {
+            var propertyName = GetPropertyName(expression.Body);
+
+            return (metadata) => string.Equals(metadata.PropertyName, propertyName, StringComparison.Ordinal);
+        }
+
+        /// <summary>
+        /// Clears <see cref="ModelStateDictionary"/> entries for <see cref="ModelMetadata"/>.
+        /// </summary>
+        /// <param name="modelType">The <see cref="Type"/> of the model.</param>
+        /// <param name="modelState">The <see cref="ModelStateDictionary"/> associated with the model.</param>
+        /// <param name="metadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
+        /// <param name="modelKey">The entry to clear. </param>
+        public static void ClearValidationStateForModel(
+            Type modelType,
+            ModelStateDictionary modelState,
+            IModelMetadataProvider metadataProvider,
+            string modelKey)
+        {
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            if (metadataProvider == null)
+            {
+                throw new ArgumentNullException(nameof(metadataProvider));
+            }
+
+            ClearValidationStateForModel(metadataProvider.GetMetadataForType(modelType), modelState, modelKey);
+        }
+
+        /// <summary>
+        /// Clears <see cref="ModelStateDictionary"/> entries for <see cref="ModelMetadata"/>.
+        /// </summary>
+        /// <param name="modelMetadata">The <see cref="ModelMetadata"/>.</param>
+        /// <param name="modelState">The <see cref="ModelStateDictionary"/> associated with the model.</param>
+        /// <param name="modelKey">The entry to clear. </param>
+        public static void ClearValidationStateForModel(
+            ModelMetadata modelMetadata,
+            ModelStateDictionary modelState,
+            string modelKey)
+        {
+            if (modelMetadata == null)
+            {
+                throw new ArgumentNullException(nameof(modelMetadata));
+            }
+
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            if (string.IsNullOrEmpty(modelKey))
+            {
+                // If model key is empty, we have to do a best guess to try and clear the appropriate
+                // keys. Clearing the empty prefix would clear the state of ALL entries, which might wipe out
+                // data from other models.
+                if (modelMetadata.IsEnumerableType)
+                {
+                    // We expect that any key beginning with '[' is an index. We can't just infer the indexes
+                    // used, so we clear all keys that look like <empty prefix -> index>.
+                    //
+                    // In the unlikely case that multiple top-level collections where bound to the empty prefix,
+                    // you're just out of luck.
+                    foreach (var kvp in modelState)
+                    {
+                        if (kvp.Key.Length > 0 && kvp.Key[0] == '[')
+                        {
+                            // Starts with an indexer
+                            kvp.Value.Errors.Clear();
+                            kvp.Value.ValidationState = ModelValidationState.Unvalidated;
+                        }
+                    }
+                }
+                else if (modelMetadata.IsComplexType)
+                {
+                    for (var i = 0; i < modelMetadata.Properties.Count; i++)
+                    {
+                        var property = modelMetadata.Properties[i];
+                        modelState.ClearValidationState(property.BinderModelName ?? property.PropertyName);
+                    }
+                }
+                else
+                {
+                    // Simple types bind to a single entry. So clear the entry with the empty-key, in the
+                    // unlikely event that it has errors.
+                    var entry = modelState[string.Empty];
+                    if (entry != null)
+                    {
+                        entry.Errors.Clear();
+                        entry.ValidationState = ModelValidationState.Unvalidated;
+                    }
+                }
+            }
+            else
+            {
+                // If model key is non-empty, we just want to clear all keys with that prefix. We expect
+                // model binding to have only used this key (and suffixes) for all entries related to
+                // this model.
+                modelState.ClearValidationState(modelKey);
+            }
+        }
+
+        internal static TModel CastOrDefault<TModel>(object model)
+        {
+            return (model is TModel) ? (TModel)model : default(TModel);
+        }
+
+        /// <summary>
+        /// Gets an indication whether <see cref="M:GetCompatibleCollection{T}"/> is likely to return a usable
+        /// non-<c>null</c> value.
+        /// </summary>
+        /// <typeparam name="T">The element type of the <see cref="ICollection{T}"/> required.</typeparam>
+        /// <param name="bindingContext">The <see cref="ModelBindingContext"/>.</param>
+        /// <returns>
+        /// <c>true</c> if <see cref="M:GetCompatibleCollection{T}"/> is likely to return a usable non-<c>null</c>
+        /// value; <c>false</c> otherwise.
+        /// </returns>
+        /// <remarks>"Usable" in this context means the property can be set or its value reused.</remarks>
+        public static bool CanGetCompatibleCollection<T>(ModelBindingContext bindingContext)
+        {
+            var model = bindingContext.Model;
+            var modelType = bindingContext.ModelType;
+
+            if (typeof(T).IsAssignableFrom(modelType))
+            {
+                // Scalar case. Existing model is not relevant and property must always be set. Will use a List<T>
+                // intermediate and set property to first element, if any.
+                return true;
+            }
+
+            if (modelType == typeof(T[]))
+            {
+                // Can't change the length of an existing array or replace it. Will use a List<T> intermediate and set
+                // property to an array created from that.
+                return true;
+            }
+
+            if (!typeof(IEnumerable<T>).IsAssignableFrom(modelType))
+            {
+                // Not a supported collection.
+                return false;
+            }
+
+            if (model is ICollection<T> collection && !collection.IsReadOnly)
+            {
+                // Can use the existing collection.
+                return true;
+            }
+
+            // Most likely the model is null.
+            // Also covers the corner case where the model implements IEnumerable<T> but not ICollection<T> e.g.
+            //   public IEnumerable<T> Property { get; set; } = new T[0];
+            if (modelType.IsAssignableFrom(typeof(List<T>)))
+            {
+                return true;
+            }
+
+            // Will we be able to activate an instance and use that?
+            return modelType.GetTypeInfo().IsClass &&
+                !modelType.GetTypeInfo().IsAbstract &&
+                typeof(ICollection<T>).IsAssignableFrom(modelType);
+        }
+
+        /// <summary>
+        /// Creates an <see cref="ICollection{T}"/> instance compatible with <paramref name="bindingContext"/>'s
+        /// <see cref="ModelBindingContext.ModelType"/>.
+        /// </summary>
+        /// <typeparam name="T">The element type of the <see cref="ICollection{T}"/> required.</typeparam>
+        /// <param name="bindingContext">The <see cref="ModelBindingContext"/>.</param>
+        /// <returns>
+        /// An <see cref="ICollection{T}"/> instance compatible with <paramref name="bindingContext"/>'s
+        /// <see cref="ModelBindingContext.ModelType"/>.
+        /// </returns>
+        /// <remarks>
+        /// Should not be called if <see cref="CanGetCompatibleCollection{T}"/> returned <c>false</c>.
+        /// </remarks>
+        public static ICollection<T> GetCompatibleCollection<T>(ModelBindingContext bindingContext)
+        {
+            return GetCompatibleCollection<T>(bindingContext, capacity: null);
+        }
+
+        /// <summary>
+        /// Creates an <see cref="ICollection{T}"/> instance compatible with <paramref name="bindingContext"/>'s
+        /// <see cref="ModelBindingContext.ModelType"/>.
+        /// </summary>
+        /// <typeparam name="T">The element type of the <see cref="ICollection{T}"/> required.</typeparam>
+        /// <param name="bindingContext">The <see cref="ModelBindingContext"/>.</param>
+        /// <param name="capacity">
+        /// Capacity for use when creating a <see cref="List{T}"/> instance. Not used when creating another type.
+        /// </param>
+        /// <returns>
+        /// An <see cref="ICollection{T}"/> instance compatible with <paramref name="bindingContext"/>'s
+        /// <see cref="ModelBindingContext.ModelType"/>.
+        /// </returns>
+        /// <remarks>
+        /// Should not be called if <see cref="CanGetCompatibleCollection{T}"/> returned <c>false</c>.
+        /// </remarks>
+        public static ICollection<T> GetCompatibleCollection<T>(ModelBindingContext bindingContext, int capacity)
+        {
+            return GetCompatibleCollection<T>(bindingContext, (int?)capacity);
+        }
+
+        private static ICollection<T> GetCompatibleCollection<T>(ModelBindingContext bindingContext, int? capacity)
+        {
+            var model = bindingContext.Model;
+            var modelType = bindingContext.ModelType;
+
+            // There's a limited set of collection types we can create here.
+            //
+            // For the simple cases: Choose List<T> if the destination type supports it (at least as an intermediary).
+            //
+            // For more complex cases: If the destination type is a class that implements ICollection<T>, then activate
+            // an instance and return that.
+            //
+            // Otherwise just give up.
+            if (typeof(T).IsAssignableFrom(modelType))
+            {
+                return CreateList<T>(capacity);
+            }
+
+            if (modelType == typeof(T[]))
+            {
+                return CreateList<T>(capacity);
+            }
+
+            // Does collection exist and can it be reused?
+            if (model is ICollection<T> collection && !collection.IsReadOnly)
+            {
+                collection.Clear();
+
+                return collection;
+            }
+
+            if (modelType.IsAssignableFrom(typeof(List<T>)))
+            {
+                return CreateList<T>(capacity);
+            }
+
+            return (ICollection<T>)Activator.CreateInstance(modelType);
+        }
+
+        private static List<T> CreateList<T>(int? capacity)
+        {
+            return capacity.HasValue ? new List<T>(capacity.Value) : new List<T>();
+        }
+
+        /// <summary>
+        /// Converts the provided <paramref name="value"/> to a value of <see cref="Type"/> <typeparamref name="T"/>.
+        /// </summary>
+        /// <typeparam name="T">The <see cref="Type"/> for conversion.</typeparam>
+        /// <param name="value">The value to convert."/></param>
+        /// <param name="culture">The <see cref="CultureInfo"/> for conversion.</param>
+        /// <returns>
+        /// The converted value or the default value of <typeparamref name="T"/> if the value could not be converted.
+        /// </returns>
+        public static T ConvertTo<T>(object value, CultureInfo culture)
+        {
+            var converted = ConvertTo(value, typeof(T), culture);
+            return converted == null ? default(T) : (T)converted;
+        }
+
+        /// <summary>
+        /// Converts the provided <paramref name="value"/> to a value of <see cref="Type"/> <paramref name="type"/>.
+        /// </summary>
+        /// <param name="value">The value to convert."/></param>
+        /// <param name="type">The <see cref="Type"/> for conversion.</param>
+        /// <param name="culture">The <see cref="CultureInfo"/> for conversion.</param>
+        /// <returns>
+        /// The converted value or <c>null</c> if the value could not be converted.
+        /// </returns>
+        public static object ConvertTo(object value, Type type, CultureInfo culture)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            if (value == null)
+            {
+                // For value types, treat null values as though they were the default value for the type.
+                return type.GetTypeInfo().IsValueType ? Activator.CreateInstance(type) : null;
+            }
+
+            if (type.IsAssignableFrom(value.GetType()))
+            {
+                return value;
+            }
+
+            var cultureToUse = culture ?? CultureInfo.InvariantCulture;
+            return UnwrapPossibleArrayType(value, type, cultureToUse);
+        }
+
+        private static object UnwrapPossibleArrayType(object value, Type destinationType, CultureInfo culture)
+        {
+            // array conversion results in four cases, as below
+            var valueAsArray = value as Array;
+            if (destinationType.IsArray)
+            {
+                var destinationElementType = destinationType.GetElementType();
+                if (valueAsArray != null)
+                {
+                    // case 1: both destination + source type are arrays, so convert each element
+                    var converted = (IList)Array.CreateInstance(destinationElementType, valueAsArray.Length);
+                    for (var i = 0; i < valueAsArray.Length; i++)
+                    {
+                        converted[i] = ConvertSimpleType(valueAsArray.GetValue(i), destinationElementType, culture);
+                    }
+                    return converted;
+                }
+                else
+                {
+                    // case 2: destination type is array but source is single element, so wrap element in
+                    // array + convert
+                    var element = ConvertSimpleType(value, destinationElementType, culture);
+                    var converted = (IList)Array.CreateInstance(destinationElementType, 1);
+                    converted[0] = element;
+                    return converted;
+                }
+            }
+            else if (valueAsArray != null)
+            {
+                // case 3: destination type is single element but source is array, so extract first element + convert
+                if (valueAsArray.Length > 0)
+                {
+                    value = valueAsArray.GetValue(0);
+                    return ConvertSimpleType(value, destinationType, culture);
+                }
+                else
+                {
+                    // case 3(a): source is empty array, so can't perform conversion
+                    return null;
+                }
+            }
+
+            // case 4: both destination + source type are single elements, so convert
+            return ConvertSimpleType(value, destinationType, culture);
+        }
+
+        private static object ConvertSimpleType(object value, Type destinationType, CultureInfo culture)
+        {
+            if (value == null || destinationType.IsAssignableFrom(value.GetType()))
+            {
+                return value;
+            }
+
+            // In case of a Nullable object, we try again with its underlying type.
+            destinationType = UnwrapNullableType(destinationType);
+
+            // if this is a user-input value but the user didn't type anything, return no value
+            if (value is string valueAsString && string.IsNullOrWhiteSpace(valueAsString))
+            {
+                return null;
+            }
+
+            var converter = TypeDescriptor.GetConverter(destinationType);
+            var canConvertFrom = converter.CanConvertFrom(value.GetType());
+            if (!canConvertFrom)
+            {
+                converter = TypeDescriptor.GetConverter(value.GetType());
+            }
+            if (!(canConvertFrom || converter.CanConvertTo(destinationType)))
+            {
+                // EnumConverter cannot convert integer, so we verify manually
+                if (destinationType.GetTypeInfo().IsEnum &&
+                    (value is int ||
+                    value is uint ||
+                    value is long ||
+                    value is ulong ||
+                    value is short ||
+                    value is ushort ||
+                    value is byte ||
+                    value is sbyte))
+                {
+                    return Enum.ToObject(destinationType, value);
+                }
+
+                throw new InvalidOperationException(
+                    Resources.FormatValueProviderResult_NoConverterExists(value.GetType(), destinationType));
+            }
+
+            try
+            {
+                return canConvertFrom
+                    ? converter.ConvertFrom(null, culture, value)
+                    : converter.ConvertTo(null, culture, value, destinationType);
+            }
+            catch (FormatException)
+            {
+                throw;
+            }
+            catch (Exception ex)
+            {
+                if (ex.InnerException == null)
+                {
+                    throw;
+                }
+                else
+                {
+                    // TypeConverter throws System.Exception wrapping the FormatException,
+                    // so we throw the inner exception.
+                    ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+
+                    // This code is never reached because the previous line will always throw.
+                    throw;
+                }
+            }
+        }
+
+        private static Type UnwrapNullableType(Type destinationType)
+        {
+            return Nullable.GetUnderlyingType(destinationType) ?? destinationType;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Internal/ValidationStack.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Internal/ValidationStack.cs
new file mode 100644
index 0000000000..ba24828544
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Internal/ValidationStack.cs
@@ -0,0 +1,73 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Internal
+{
+    public class ValidationStack
+    {
+        public int Count => HashSet?.Count ?? List.Count;
+
+        // We tested the performance of a list at size 15 and found it still better than hashset, but to avoid a costly
+        // O(n) search at larger n we set the cutoff to 20. If someone finds the point where they intersect feel free to change this number.
+        internal const int CutOff = 20;
+
+        internal List<object> List { get; } = new List<object>();
+
+        internal HashSet<object> HashSet { get; set; }
+
+        public bool Push(object model)
+        {
+            if (HashSet != null)
+            {
+                return HashSet.Add(model);
+            }
+
+            if (ListContains(model))
+            {
+                return false;
+            }
+
+            List.Add(model);
+
+            if (HashSet == null && List.Count > CutOff)
+            {
+                HashSet = new HashSet<object>(List, ReferenceEqualityComparer.Instance);
+            }
+
+            return true;
+        }
+
+        public void Pop(object model)
+        {
+            if (HashSet != null)
+            {
+                HashSet.Remove(model);
+            }
+            else
+            {
+                if (model != null)
+                {
+                    Debug.Assert(ReferenceEquals(List[List.Count - 1], model));
+                    List.RemoveAt(List.Count - 1);
+                }
+            }
+        }
+
+        private bool ListContains(object model)
+        {
+            for (var i = 0; i < List.Count; i++)
+            {
+                if (ReferenceEquals(model, List[i]))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryFormValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryFormValueProvider.cs
new file mode 100644
index 0000000000..db1706d964
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryFormValueProvider.cs
@@ -0,0 +1,29 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Globalization;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// An <see cref="IValueProvider"/> for jQuery formatted form data.
+    /// </summary>
+    public class JQueryFormValueProvider : JQueryValueProvider
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JQueryFormValueProvider"/> class.
+        /// </summary>
+        /// <param name="bindingSource">The <see cref="BindingSource"/> of the data.</param>
+        /// <param name="values">The values.</param>
+        /// <param name="culture">The culture to return with ValueProviderResult instances.</param>
+        public JQueryFormValueProvider(
+            BindingSource bindingSource,
+            IDictionary<string, StringValues> values,
+            CultureInfo culture)
+            : base(bindingSource, values, culture)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryFormValueProviderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryFormValueProviderFactory.cs
new file mode 100644
index 0000000000..fdd8eb2d93
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryFormValueProviderFactory.cs
@@ -0,0 +1,47 @@
+// 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.
+
+using System;
+using System.Globalization;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// An <see cref="IValueProviderFactory"/> for <see cref="JQueryFormValueProvider"/>.
+    /// </summary>
+    public class JQueryFormValueProviderFactory : IValueProviderFactory
+    {
+        /// <inheritdoc />
+        public Task CreateValueProviderAsync(ValueProviderFactoryContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var request = context.ActionContext.HttpContext.Request;
+            if (request.HasFormContentType)
+            {
+                // Allocating a Task only when the body is form data.
+                return AddValueProviderAsync(context);
+            }
+
+            return Task.CompletedTask;
+        }
+
+        private static async Task AddValueProviderAsync(ValueProviderFactoryContext context)
+        {
+            var request = context.ActionContext.HttpContext.Request;
+
+            var formCollection = await request.ReadFormAsync();
+
+            var valueProvider = new JQueryFormValueProvider(
+                BindingSource.Form,
+                JQueryKeyValuePairNormalizer.GetValues(formCollection, formCollection.Count),
+                CultureInfo.CurrentCulture);
+
+            context.ValueProviders.Add(valueProvider);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryKeyValuePairNormalizer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryKeyValuePairNormalizer.cs
new file mode 100644
index 0000000000..b0c1c28c0f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryKeyValuePairNormalizer.cs
@@ -0,0 +1,105 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    // Normalizes keys, in a keyvaluepair collection, from jQuery format to a format that MVC understands.
+    internal static class JQueryKeyValuePairNormalizer
+    {
+        public static IDictionary<string, StringValues> GetValues(
+            IEnumerable<KeyValuePair<string, StringValues>> originalValues,
+            int valueCount)
+        {
+            var builder = new StringBuilder();
+            var dictionary = new Dictionary<string, StringValues>(
+                valueCount,
+                StringComparer.OrdinalIgnoreCase);
+            foreach (var originalValue in originalValues)
+            {
+                var normalizedKey = NormalizeJQueryToMvc(builder, originalValue.Key);
+                builder.Clear();
+
+                dictionary[normalizedKey] = originalValue.Value;
+            }
+
+            return dictionary;
+        }
+
+        // This is a helper method for Model Binding over a JQuery syntax.
+        // Normalize from JQuery to MVC keys. The model binding infrastructure uses MVC keys.
+        // x[] --> x
+        // [] --> ""
+        // x[12] --> x[12]
+        // x[field]  --> x.field, where field is not a number
+        private static string NormalizeJQueryToMvc(StringBuilder builder, string key)
+        {
+            if (string.IsNullOrEmpty(key))
+            {
+                return string.Empty;
+            }
+
+            var indexOpen = key.IndexOf('[');
+            if (indexOpen == -1)
+            {
+
+                // Fast path, no normalization needed.
+                // This skips string conversion and allocating the string builder.
+                return key;
+            }
+
+            var position = 0;
+            while (position < key.Length)
+            {
+                if (indexOpen == -1)
+                {
+                    // No more brackets.
+                    builder.Append(key, position, key.Length - position);
+                    break;
+                }
+
+                builder.Append(key, position, indexOpen - position); // everything up to "["
+
+                // Find closing bracket.
+                var indexClose = key.IndexOf(']', indexOpen);
+                if (indexClose == -1)
+                {
+                    throw new ArgumentException(
+                        message: Resources.FormatJQueryFormValueProviderFactory_MissingClosingBracket(key),
+                        paramName: nameof(key));
+                }
+
+                if (indexClose == indexOpen + 1)
+                {
+                    // Empty brackets signify an array. Just remove.
+                }
+                else if (char.IsDigit(key[indexOpen + 1]))
+                {
+                    // Array index. Leave unchanged.
+                    builder.Append(key, indexOpen, indexClose - indexOpen + 1);
+                }
+                else
+                {
+                    // Field name. Convert to dot notation.
+                    if (builder.Length != 0)
+                    {
+                        // Was x[field], not [field] or [][field].
+                        builder.Append('.');
+                    }
+
+                    builder.Append(key, indexOpen + 1, indexClose - indexOpen - 1);
+                }
+
+                position = indexClose + 1;
+                indexOpen = key.IndexOf('[', position);
+            }
+
+            return builder.ToString();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryQueryStringValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryQueryStringValueProvider.cs
new file mode 100644
index 0000000000..4d50ab8b88
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryQueryStringValueProvider.cs
@@ -0,0 +1,29 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Globalization;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// An <see cref="IValueProvider"/> for jQuery formatted query string data.
+    /// </summary>
+    public class JQueryQueryStringValueProvider : JQueryValueProvider
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JQueryQueryStringValueProvider"/> class.
+        /// </summary>
+        /// <param name="bindingSource">The <see cref="BindingSource"/> of the data.</param>
+        /// <param name="values">The values.</param>
+        /// <param name="culture">The culture to return with ValueProviderResult instances.</param>
+        public JQueryQueryStringValueProvider(
+            BindingSource bindingSource,
+            IDictionary<string, StringValues> values,
+            CultureInfo culture)
+            : base(bindingSource, values, culture)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryQueryStringValueProviderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryQueryStringValueProviderFactory.cs
new file mode 100644
index 0000000000..f454bb6216
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryQueryStringValueProviderFactory.cs
@@ -0,0 +1,37 @@
+// 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.
+
+using System;
+using System.Globalization;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// An <see cref="IValueProviderFactory"/> for <see cref="JQueryQueryStringValueProvider"/>.
+    /// </summary>
+    public class JQueryQueryStringValueProviderFactory : IValueProviderFactory
+    {
+        /// <inheritdoc />
+        public Task CreateValueProviderAsync(ValueProviderFactoryContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var query = context.ActionContext.HttpContext.Request.Query;
+            if (query != null && query.Count > 0)
+            {
+                var valueProvider = new JQueryQueryStringValueProvider(
+                    BindingSource.Query,
+                    JQueryKeyValuePairNormalizer.GetValues(query, query.Count),
+                    CultureInfo.InvariantCulture);
+
+                context.ValueProviders.Add(valueProvider);
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryValueProvider.cs
new file mode 100644
index 0000000000..659a943934
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryValueProvider.cs
@@ -0,0 +1,103 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// An <see cref="IValueProvider"/> for jQuery formatted data.
+    /// </summary>
+    public abstract class JQueryValueProvider :
+        BindingSourceValueProvider,
+        IEnumerableValueProvider,
+        IKeyRewriterValueProvider
+    {
+        private readonly IDictionary<string, StringValues> _values;
+        private PrefixContainer _prefixContainer;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JQueryValueProvider"/> class.
+        /// </summary>
+        /// <param name="bindingSource">The <see cref="BindingSource"/> of the data.</param>
+        /// <param name="values">The values.</param>
+        /// <param name="culture">The culture to return with ValueProviderResult instances.</param>
+        protected JQueryValueProvider(
+            BindingSource bindingSource,
+            IDictionary<string, StringValues> values,
+            CultureInfo culture)
+            : base(bindingSource)
+        {
+            if (bindingSource == null)
+            {
+                throw new ArgumentNullException(nameof(bindingSource));
+            }
+
+            if (values == null)
+            {
+                throw new ArgumentNullException(nameof(values));
+            }
+
+            _values = values;
+            Culture = culture;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="CultureInfo"/> associated with the values.
+        /// </summary>
+        public CultureInfo Culture { get; }
+
+        /// <inheritdoc />
+        protected PrefixContainer PrefixContainer
+        {
+            get
+            {
+                if (_prefixContainer == null)
+                {
+                    _prefixContainer = new PrefixContainer(_values.Keys);
+                }
+
+                return _prefixContainer;
+            }
+        }
+
+        /// <inheritdoc />
+        public override bool ContainsPrefix(string prefix)
+        {
+            return PrefixContainer.ContainsPrefix(prefix);
+        }
+
+        /// <inheritdoc />
+        public IDictionary<string, string> GetKeysFromPrefix(string prefix)
+        {
+            return PrefixContainer.GetKeysFromPrefix(prefix);
+        }
+
+        /// <inheritdoc />
+        public override ValueProviderResult GetValue(string key)
+        {
+            StringValues values;
+            if (_values.TryGetValue(key, out values) && values.Count > 0)
+            {
+                return new ValueProviderResult(values, Culture);
+            }
+
+            return ValueProviderResult.None;
+        }
+
+        /// <inheritdoc />
+        /// <remarks>
+        /// Always returns <see langword="null"/> because <see cref="JQueryFormValueProviderFactory"/> creates this
+        /// <see cref="IValueProvider"/> with rewritten keys (if original contains brackets) or duplicate keys
+        /// (that <see cref="FormValueProvider"/> will match).
+        /// </remarks>
+        public IValueProvider Filter()
+        {
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingMetadata.cs
new file mode 100644
index 0000000000..3714298b69
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingMetadata.cs
@@ -0,0 +1,79 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    /// <summary>
+    /// Binding metadata details for a <see cref="ModelMetadata"/>.
+    /// </summary>
+    public class BindingMetadata
+    {
+        private DefaultModelBindingMessageProvider _messageProvider;
+
+        /// <summary>
+        /// Gets or sets the <see cref="ModelBinding.BindingSource"/>.
+        /// See <see cref="ModelMetadata.BindingSource"/>.
+        /// </summary>
+        public BindingSource BindingSource { get; set; }
+
+        /// <summary>
+        /// Gets or sets the binder model name. If <c>null</c> the property or parameter name will be used.
+        /// See <see cref="ModelMetadata.BinderModelName"/>.
+        /// </summary>
+        public string BinderModelName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Type"/> of the model binder used to bind the model.
+        /// See <see cref="ModelMetadata.BinderType"/>.
+        /// </summary>
+        public Type BinderType { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether or not the property can be model bound.
+        /// Will be ignored if the model metadata being created does not represent a property.
+        /// See <see cref="ModelMetadata.IsBindingAllowed"/>.
+        /// </summary>
+        public bool IsBindingAllowed { get; set; } = true;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether or not the request must contain a value for the model.
+        /// Will be ignored if the model metadata being created does not represent a property.
+        /// See <see cref="ModelMetadata.IsBindingRequired"/>.
+        /// </summary>
+        public bool IsBindingRequired { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether or not the model is read-only. Will be ignored
+        /// if the model metadata being created is not a property. If <c>null</c> then
+        /// <see cref="ModelMetadata.IsReadOnly"/> will be  computed based on the accessibility
+        /// of the property accessor and model <see cref="Type"/>. See <see cref="ModelMetadata.IsReadOnly"/>.
+        /// </summary>
+        public bool? IsReadOnly { get; set; }
+
+        /// <summary>
+        /// Gets the <see cref="Metadata.DefaultModelBindingMessageProvider"/> instance. See
+        /// <see cref="ModelMetadata.ModelBindingMessageProvider"/>.
+        /// </summary>
+        public DefaultModelBindingMessageProvider ModelBindingMessageProvider
+        {
+            get => _messageProvider;
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _messageProvider = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ModelBinding.IPropertyFilterProvider"/>.
+        /// See <see cref="ModelMetadata.PropertyFilterProvider"/>.
+        /// </summary>
+        public IPropertyFilterProvider PropertyFilterProvider { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingMetadataProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingMetadataProviderContext.cs
new file mode 100644
index 0000000000..587cf6fb69
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingMetadataProviderContext.cs
@@ -0,0 +1,67 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    /// <summary>
+    /// A context for an <see cref="IBindingMetadataProvider"/>.
+    /// </summary>
+    public class BindingMetadataProviderContext
+    {
+        /// <summary>
+        /// Creates a new <see cref="BindingMetadataProviderContext"/>.
+        /// </summary>
+        /// <param name="key">The <see cref="ModelMetadataIdentity"/> for the <see cref="ModelMetadata"/>.</param>
+        /// <param name="attributes">The attributes for the <see cref="ModelMetadata"/>.</param>
+        public BindingMetadataProviderContext(
+            ModelMetadataIdentity key,
+            ModelAttributes attributes)
+        {
+            if (attributes == null)
+            {
+                throw new ArgumentNullException(nameof(attributes));
+            }
+
+            Key = key;
+            Attributes = attributes.Attributes;
+            ParameterAttributes = attributes.ParameterAttributes;
+            PropertyAttributes = attributes.PropertyAttributes;
+            TypeAttributes = attributes.TypeAttributes;
+
+            BindingMetadata = new BindingMetadata();
+        }
+
+        /// <summary>
+        /// Gets the attributes.
+        /// </summary>
+        public IReadOnlyList<object> Attributes { get; }
+
+        /// <summary>
+        /// Gets the <see cref="ModelMetadataIdentity"/>.
+        /// </summary>
+        public ModelMetadataIdentity Key { get; }
+
+        /// <summary>
+        /// Gets the parameter attributes.
+        /// </summary>
+        public IReadOnlyList<object> ParameterAttributes { get; }
+
+        /// <summary>
+        /// Gets the property attributes.
+        /// </summary>
+        public IReadOnlyList<object> PropertyAttributes { get; }
+
+        /// <summary>
+        /// Gets the type attributes.
+        /// </summary>
+        public IReadOnlyList<object> TypeAttributes { get; }
+
+        /// <summary>
+        /// Gets the <see cref="Metadata.BindingMetadata"/>.
+        /// </summary>
+        public BindingMetadata BindingMetadata { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingSourceMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingSourceMetadataProvider.cs
new file mode 100644
index 0000000000..20c88b013f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingSourceMetadataProvider.cs
@@ -0,0 +1,48 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    public class BindingSourceMetadataProvider : IBindingMetadataProvider
+    {
+        /// <summary>
+        /// Creates a new <see cref="BindingSourceMetadataProvider"/> for the given <paramref name="type"/>.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="Type"/>. The provider sets <see cref="BindingSource"/> of the given <see cref="Type"/> or 
+        /// anything assignable to the given <see cref="Type"/>. 
+        /// </param>
+        /// <param name="bindingSource">
+        /// The <see cref="BindingSource"/> to assign to the given <paramref name="type"/>.
+        /// </param>
+        public BindingSourceMetadataProvider(Type type, BindingSource bindingSource)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            Type = type;
+            BindingSource = bindingSource;
+        }
+
+        public Type Type { get; }
+        public BindingSource BindingSource { get; }
+
+        /// <inheritdoc />
+        public void CreateBindingMetadata(BindingMetadataProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (Type.IsAssignableFrom(context.Key.ModelType))
+            {
+                context.BindingMetadata.BindingSource = BindingSource;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultMetadataDetails.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultMetadataDetails.cs
new file mode 100644
index 0000000000..cc9b540c5a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultMetadataDetails.cs
@@ -0,0 +1,77 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    /// <summary>
+    /// Holds associated metadata objects for a <see cref="DefaultModelMetadata"/>.
+    /// </summary>
+    /// <remarks>
+    /// Any modifications to the data must be thread-safe for multiple readers and writers.
+    /// </remarks>
+    public class DefaultMetadataDetails
+    {
+        /// <summary>
+        /// Creates a new <see cref="DefaultMetadataDetails"/>.
+        /// </summary>
+        /// <param name="key">The <see cref="ModelMetadataIdentity"/>.</param>
+        /// <param name="attributes">The set of model attributes.</param>
+        public DefaultMetadataDetails(ModelMetadataIdentity key, ModelAttributes attributes)
+        {
+            if (attributes == null)
+            {
+                throw new ArgumentNullException(nameof(attributes));
+            }
+
+            Key = key;
+            ModelAttributes = attributes;
+        }
+
+        /// <summary>
+        /// Gets or sets the set of model attributes.
+        /// </summary>
+        public ModelAttributes ModelAttributes { get; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Metadata.BindingMetadata"/>.
+        /// </summary>
+        public BindingMetadata BindingMetadata { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Metadata.DisplayMetadata"/>.
+        /// </summary>
+        public DisplayMetadata DisplayMetadata { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ModelMetadataIdentity"/>.
+        /// </summary>
+        public ModelMetadataIdentity Key { get; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ModelMetadata"/> entries for the model properties.
+        /// </summary>
+        public ModelMetadata[] Properties { get; set; }
+
+        /// <summary>
+        /// Gets or sets a property getter delegate to get the property value from a model object.
+        /// </summary>
+        public Func<object, object> PropertyGetter { get; set; }
+
+        /// <summary>
+        /// Gets or sets a property setter delegate to set the property value on a model object.
+        /// </summary>
+        public Action<object, object> PropertySetter { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Metadata.ValidationMetadata"/>
+        /// </summary>
+        public ValidationMetadata ValidationMetadata { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ModelMetadata"/> of the container type.
+        /// </summary>
+        public ModelMetadata ContainerMetadata { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelBindingMessageProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelBindingMessageProvider.cs
new file mode 100644
index 0000000000..30cffb2147
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelBindingMessageProvider.cs
@@ -0,0 +1,257 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Core;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    /// <summary>
+    /// Read / write <see cref="ModelBindingMessageProvider"/> implementation.
+    /// </summary>
+    public class DefaultModelBindingMessageProvider : ModelBindingMessageProvider
+    {
+        private Func<string, string> _missingBindRequiredValueAccessor;
+        private Func<string> _missingKeyOrValueAccessor;
+        private Func<string> _missingRequestBodyRequiredValueAccessor;
+        private Func<string, string> _valueMustNotBeNullAccessor;
+        private Func<string, string, string> _attemptedValueIsInvalidAccessor;
+        private Func<string, string> _nonPropertyAttemptedValueIsInvalidAccessor;
+        private Func<string, string> _unknownValueIsInvalidAccessor;
+        private Func<string> _nonPropertyUnknownValueIsInvalidAccessor;
+        private Func<string, string> _valueIsInvalidAccessor;
+        private Func<string, string> _valueMustBeANumberAccessor;
+        private Func<string> _nonPropertyValueMustBeANumberAccessor;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DefaultModelBindingMessageProvider"/> class.
+        /// </summary>
+        public DefaultModelBindingMessageProvider()
+        {
+            SetMissingBindRequiredValueAccessor(Resources.FormatModelBinding_MissingBindRequiredMember);
+            SetMissingKeyOrValueAccessor(Resources.FormatKeyValuePair_BothKeyAndValueMustBePresent);
+            SetMissingRequestBodyRequiredValueAccessor(Resources.FormatModelBinding_MissingRequestBodyRequiredMember);
+            SetValueMustNotBeNullAccessor(Resources.FormatModelBinding_NullValueNotValid);
+            SetAttemptedValueIsInvalidAccessor(Resources.FormatModelState_AttemptedValueIsInvalid);
+            SetNonPropertyAttemptedValueIsInvalidAccessor(Resources.FormatModelState_NonPropertyAttemptedValueIsInvalid);
+            SetUnknownValueIsInvalidAccessor(Resources.FormatModelState_UnknownValueIsInvalid);
+            SetNonPropertyUnknownValueIsInvalidAccessor(Resources.FormatModelState_NonPropertyUnknownValueIsInvalid);
+            SetValueIsInvalidAccessor(Resources.FormatHtmlGeneration_ValueIsInvalid);
+            SetValueMustBeANumberAccessor(Resources.FormatHtmlGeneration_ValueMustBeNumber);
+            SetNonPropertyValueMustBeANumberAccessor(Resources.FormatHtmlGeneration_NonPropertyValueMustBeNumber);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DefaultModelBindingMessageProvider"/> class based on
+        /// <paramref name="originalProvider"/>.
+        /// </summary>
+        /// <param name="originalProvider">The <see cref="DefaultModelBindingMessageProvider"/> to duplicate.</param>
+        public DefaultModelBindingMessageProvider(DefaultModelBindingMessageProvider originalProvider)
+        {
+            if (originalProvider == null)
+            {
+                throw new ArgumentNullException(nameof(originalProvider));
+            }
+
+            SetMissingBindRequiredValueAccessor(originalProvider.MissingBindRequiredValueAccessor);
+            SetMissingKeyOrValueAccessor(originalProvider.MissingKeyOrValueAccessor);
+            SetMissingRequestBodyRequiredValueAccessor(originalProvider.MissingRequestBodyRequiredValueAccessor);
+            SetValueMustNotBeNullAccessor(originalProvider.ValueMustNotBeNullAccessor);
+            SetAttemptedValueIsInvalidAccessor(originalProvider.AttemptedValueIsInvalidAccessor);
+            SetNonPropertyAttemptedValueIsInvalidAccessor(originalProvider.NonPropertyAttemptedValueIsInvalidAccessor);
+            SetUnknownValueIsInvalidAccessor(originalProvider.UnknownValueIsInvalidAccessor);
+            SetNonPropertyUnknownValueIsInvalidAccessor(originalProvider.NonPropertyUnknownValueIsInvalidAccessor);
+            SetValueIsInvalidAccessor(originalProvider.ValueIsInvalidAccessor);
+            SetValueMustBeANumberAccessor(originalProvider.ValueMustBeANumberAccessor);
+            SetNonPropertyValueMustBeANumberAccessor(originalProvider.NonPropertyValueMustBeANumberAccessor);
+        }
+
+        /// <inheritdoc/>
+        public override Func<string, string> MissingBindRequiredValueAccessor => _missingBindRequiredValueAccessor;
+
+        /// <summary>
+        /// Sets the <see cref="MissingBindRequiredValueAccessor"/> property.
+        /// </summary>
+        /// <param name="missingBindRequiredValueAccessor">The value to set.</param>
+        public void SetMissingBindRequiredValueAccessor(Func<string, string> missingBindRequiredValueAccessor)
+        {
+            if (missingBindRequiredValueAccessor == null)
+            {
+                throw new ArgumentNullException(nameof(missingBindRequiredValueAccessor));
+            }
+
+            _missingBindRequiredValueAccessor = missingBindRequiredValueAccessor;
+        }
+
+        /// <inheritdoc/>
+        public override Func<string> MissingKeyOrValueAccessor => _missingKeyOrValueAccessor;
+
+        /// <summary>
+        /// Sets the <see cref="MissingKeyOrValueAccessor"/> property.
+        /// </summary>
+        /// <param name="missingKeyOrValueAccessor">The value to set.</param>
+        public void SetMissingKeyOrValueAccessor(Func<string> missingKeyOrValueAccessor)
+        {
+            if (missingKeyOrValueAccessor == null)
+            {
+                throw new ArgumentNullException(nameof(missingKeyOrValueAccessor));
+            }
+
+            _missingKeyOrValueAccessor = missingKeyOrValueAccessor;
+        }
+
+        /// <inheritdoc/>
+        public override Func<string> MissingRequestBodyRequiredValueAccessor => _missingRequestBodyRequiredValueAccessor;
+
+        /// <summary>
+        /// Sets the <see cref="MissingRequestBodyRequiredValueAccessor"/> property.
+        /// </summary>
+        /// <param name="missingRequestBodyRequiredValueAccessor">The value to set.</param>
+        public void SetMissingRequestBodyRequiredValueAccessor(Func<string> missingRequestBodyRequiredValueAccessor)
+        {
+            if (missingRequestBodyRequiredValueAccessor == null)
+            {
+                throw new ArgumentNullException(nameof(missingRequestBodyRequiredValueAccessor));
+            }
+
+            _missingRequestBodyRequiredValueAccessor = missingRequestBodyRequiredValueAccessor;
+        }
+
+        /// <inheritdoc/>
+        public override Func<string, string> ValueMustNotBeNullAccessor => _valueMustNotBeNullAccessor;
+
+        /// <summary>
+        /// Sets the <see cref="ValueMustNotBeNullAccessor"/> property.
+        /// </summary>
+        /// <param name="valueMustNotBeNullAccessor">The value to set.</param>
+        public void SetValueMustNotBeNullAccessor(Func<string, string> valueMustNotBeNullAccessor)
+        {
+            if (valueMustNotBeNullAccessor == null)
+            {
+                throw new ArgumentNullException(nameof(valueMustNotBeNullAccessor));
+            }
+
+            _valueMustNotBeNullAccessor = valueMustNotBeNullAccessor;
+        }
+
+        /// <inheritdoc/>
+        public override Func<string, string, string> AttemptedValueIsInvalidAccessor => _attemptedValueIsInvalidAccessor;
+
+        /// <summary>
+        /// Sets the <see cref="AttemptedValueIsInvalidAccessor"/> property.
+        /// </summary>
+        /// <param name="attemptedValueIsInvalidAccessor">The value to set.</param>
+        public void SetAttemptedValueIsInvalidAccessor(Func<string, string, string> attemptedValueIsInvalidAccessor)
+        {
+            if (attemptedValueIsInvalidAccessor == null)
+            {
+                throw new ArgumentNullException(nameof(attemptedValueIsInvalidAccessor));
+            }
+
+            _attemptedValueIsInvalidAccessor = attemptedValueIsInvalidAccessor;
+        }
+
+        /// <inheritdoc/>
+        public override Func<string, string> NonPropertyAttemptedValueIsInvalidAccessor => _nonPropertyAttemptedValueIsInvalidAccessor;
+
+        /// <summary>
+        /// Sets the <see cref="NonPropertyAttemptedValueIsInvalidAccessor"/> property.
+        /// </summary>
+        /// <param name="nonPropertyAttemptedValueIsInvalidAccessor">The value to set.</param>
+        public void SetNonPropertyAttemptedValueIsInvalidAccessor(
+            Func<string, string> nonPropertyAttemptedValueIsInvalidAccessor)
+        {
+            if (nonPropertyAttemptedValueIsInvalidAccessor == null)
+            {
+                throw new ArgumentNullException(nameof(nonPropertyAttemptedValueIsInvalidAccessor));
+            }
+
+            _nonPropertyAttemptedValueIsInvalidAccessor = nonPropertyAttemptedValueIsInvalidAccessor;
+        }
+
+        /// <inheritdoc/>
+        public override Func<string, string> UnknownValueIsInvalidAccessor => _unknownValueIsInvalidAccessor;
+
+        /// <summary>
+        /// Sets the <see cref="UnknownValueIsInvalidAccessor"/> property.
+        /// </summary>
+        /// <param name="unknownValueIsInvalidAccessor">The value to set.</param>
+        public void SetUnknownValueIsInvalidAccessor(Func<string, string> unknownValueIsInvalidAccessor)
+        {
+            if (unknownValueIsInvalidAccessor == null)
+            {
+                throw new ArgumentNullException(nameof(unknownValueIsInvalidAccessor));
+            }
+
+            _unknownValueIsInvalidAccessor = unknownValueIsInvalidAccessor;
+        }
+
+        /// <inheritdoc/>
+        public override Func<string> NonPropertyUnknownValueIsInvalidAccessor => _nonPropertyUnknownValueIsInvalidAccessor;
+
+        /// <summary>
+        /// Sets the <see cref="NonPropertyUnknownValueIsInvalidAccessor"/> property.
+        /// </summary>
+        /// <param name="nonPropertyUnknownValueIsInvalidAccessor">The value to set.</param>
+        public void SetNonPropertyUnknownValueIsInvalidAccessor(Func<string> nonPropertyUnknownValueIsInvalidAccessor)
+        {
+            if (nonPropertyUnknownValueIsInvalidAccessor == null)
+            {
+                throw new ArgumentNullException(nameof(nonPropertyUnknownValueIsInvalidAccessor));
+            }
+
+            _nonPropertyUnknownValueIsInvalidAccessor = nonPropertyUnknownValueIsInvalidAccessor;
+        }
+
+        /// <inheritdoc/>
+        public override Func<string, string> ValueIsInvalidAccessor => _valueIsInvalidAccessor;
+
+        /// <summary>
+        /// Sets the <see cref="ValueIsInvalidAccessor"/> property.
+        /// </summary>
+        /// <param name="valueIsInvalidAccessor">The value to set.</param>
+        public void SetValueIsInvalidAccessor(Func<string, string> valueIsInvalidAccessor)
+        {
+            if (valueIsInvalidAccessor == null)
+            {
+                throw new ArgumentNullException(nameof(valueIsInvalidAccessor));
+            }
+
+            _valueIsInvalidAccessor = valueIsInvalidAccessor;
+        }
+
+        /// <inheritdoc/>
+        public override Func<string, string> ValueMustBeANumberAccessor => _valueMustBeANumberAccessor;
+
+        /// <summary>
+        /// Sets the <see cref="ValueMustBeANumberAccessor"/> property.
+        /// </summary>
+        /// <param name="valueMustBeANumberAccessor">The value to set.</param>
+        public void SetValueMustBeANumberAccessor(Func<string, string> valueMustBeANumberAccessor)
+        {
+            if (valueMustBeANumberAccessor == null)
+            {
+                throw new ArgumentNullException(nameof(valueMustBeANumberAccessor));
+            }
+
+            _valueMustBeANumberAccessor = valueMustBeANumberAccessor;
+        }
+
+        /// <inheritdoc/>
+        public override Func<string> NonPropertyValueMustBeANumberAccessor => _nonPropertyValueMustBeANumberAccessor;
+
+        /// <summary>
+        /// Sets the <see cref="NonPropertyValueMustBeANumberAccessor"/> property.
+        /// </summary>
+        /// <param name="nonPropertyValueMustBeANumberAccessor">The value to set.</param>
+        public void SetNonPropertyValueMustBeANumberAccessor(Func<string> nonPropertyValueMustBeANumberAccessor)
+        {
+            if (nonPropertyValueMustBeANumberAccessor == null)
+            {
+                throw new ArgumentNullException(nameof(nonPropertyValueMustBeANumberAccessor));
+            }
+
+            _nonPropertyValueMustBeANumberAccessor = nonPropertyValueMustBeANumberAccessor;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadata.cs
new file mode 100644
index 0000000000..bfb1bde8b5
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadata.cs
@@ -0,0 +1,462 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    /// <summary>
+    /// A default <see cref="ModelMetadata"/> implementation.
+    /// </summary>
+    public class DefaultModelMetadata : ModelMetadata
+    {
+        private readonly IModelMetadataProvider _provider;
+        private readonly ICompositeMetadataDetailsProvider _detailsProvider;
+        private readonly DefaultMetadataDetails _details;
+
+        // Default message provider for all DefaultModelMetadata instances; cloned before exposing to
+        // IBindingMetadataProvider instances to ensure customizations are not accidentally shared.
+        private readonly DefaultModelBindingMessageProvider _modelBindingMessageProvider;
+
+        private ReadOnlyDictionary<object, object> _additionalValues;
+        private ModelMetadata _elementMetadata;
+        private bool? _isBindingRequired;
+        private bool? _isReadOnly;
+        private bool? _isRequired;
+        private ModelPropertyCollection _properties;
+        private bool? _validateChildren;
+        private ReadOnlyCollection<object> _validatorMetadata;
+
+        /// <summary>
+        /// Creates a new <see cref="DefaultModelMetadata"/>.
+        /// </summary>
+        /// <param name="provider">The <see cref="IModelMetadataProvider"/>.</param>
+        /// <param name="detailsProvider">The <see cref="ICompositeMetadataDetailsProvider"/>.</param>
+        /// <param name="details">The <see cref="DefaultMetadataDetails"/>.</param>
+        public DefaultModelMetadata(
+            IModelMetadataProvider provider,
+            ICompositeMetadataDetailsProvider detailsProvider,
+            DefaultMetadataDetails details)
+            : this(provider, detailsProvider, details, new DefaultModelBindingMessageProvider())
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="DefaultModelMetadata"/>.
+        /// </summary>
+        /// <param name="provider">The <see cref="IModelMetadataProvider"/>.</param>
+        /// <param name="detailsProvider">The <see cref="ICompositeMetadataDetailsProvider"/>.</param>
+        /// <param name="details">The <see cref="DefaultMetadataDetails"/>.</param>
+        /// <param name="modelBindingMessageProvider">The <see cref="Metadata.DefaultModelBindingMessageProvider"/>.</param>
+        public DefaultModelMetadata(
+            IModelMetadataProvider provider,
+            ICompositeMetadataDetailsProvider detailsProvider,
+            DefaultMetadataDetails details,
+            DefaultModelBindingMessageProvider modelBindingMessageProvider)
+            : base(details.Key)
+        {
+            if (provider == null)
+            {
+                throw new ArgumentNullException(nameof(provider));
+            }
+
+            if (detailsProvider == null)
+            {
+                throw new ArgumentNullException(nameof(detailsProvider));
+            }
+
+            if (details == null)
+            {
+                throw new ArgumentNullException(nameof(details));
+            }
+
+            if (modelBindingMessageProvider == null)
+            {
+                throw new ArgumentNullException(nameof(modelBindingMessageProvider));
+            }
+
+            _provider = provider;
+            _detailsProvider = detailsProvider;
+            _details = details;
+            _modelBindingMessageProvider = modelBindingMessageProvider;
+        }
+
+        /// <summary>
+        /// Gets the set of attributes for the current instance.
+        /// </summary>
+        public ModelAttributes Attributes => _details.ModelAttributes;
+
+        /// <inheritdoc />
+        public override ModelMetadata ContainerMetadata => _details.ContainerMetadata;
+
+        /// <summary>
+        /// Gets the <see cref="Metadata.BindingMetadata"/> for the current instance.
+        /// </summary>
+        /// <remarks>
+        /// Accessing this property will populate the <see cref="Metadata.BindingMetadata"/> if necessary.
+        /// </remarks>
+        public BindingMetadata BindingMetadata
+        {
+            get
+            {
+                if (_details.BindingMetadata == null)
+                {
+                    var context = new BindingMetadataProviderContext(Identity, _details.ModelAttributes);
+
+                    // Provide a unique ModelBindingMessageProvider instance so providers' customizations are per-type.
+                    context.BindingMetadata.ModelBindingMessageProvider =
+                        new DefaultModelBindingMessageProvider(_modelBindingMessageProvider);
+
+                    _detailsProvider.CreateBindingMetadata(context);
+                    _details.BindingMetadata = context.BindingMetadata;
+                }
+
+                return _details.BindingMetadata;
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Metadata.DisplayMetadata"/> for the current instance.
+        /// </summary>
+        /// <remarks>
+        /// Accessing this property will populate the <see cref="Metadata.DisplayMetadata"/> if necessary.
+        /// </remarks>
+        public DisplayMetadata DisplayMetadata
+        {
+            get
+            {
+                if (_details.DisplayMetadata == null)
+                {
+                    var context = new DisplayMetadataProviderContext(Identity, _details.ModelAttributes);
+                    _detailsProvider.CreateDisplayMetadata(context);
+                    _details.DisplayMetadata = context.DisplayMetadata;
+                }
+
+                return _details.DisplayMetadata;
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Metadata.ValidationMetadata"/> for the current instance.
+        /// </summary>
+        /// <remarks>
+        /// Accessing this property will populate the <see cref="Metadata.ValidationMetadata"/> if necessary.
+        /// </remarks>
+        public ValidationMetadata ValidationMetadata
+        {
+            get
+            {
+                if (_details.ValidationMetadata == null)
+                {
+                    var context = new ValidationMetadataProviderContext(Identity, _details.ModelAttributes);
+                    _detailsProvider.CreateValidationMetadata(context);
+                    _details.ValidationMetadata = context.ValidationMetadata;
+                }
+
+                return _details.ValidationMetadata;
+            }
+        }
+
+        /// <inheritdoc />
+        public override IReadOnlyDictionary<object, object> AdditionalValues
+        {
+            get
+            {
+                if (_additionalValues == null)
+                {
+                    _additionalValues = new ReadOnlyDictionary<object, object>(DisplayMetadata.AdditionalValues);
+                }
+
+                return _additionalValues;
+            }
+        }
+
+        /// <inheritdoc />
+        public override BindingSource BindingSource => BindingMetadata.BindingSource;
+
+        /// <inheritdoc />
+        public override string BinderModelName => BindingMetadata.BinderModelName;
+
+        /// <inheritdoc />
+        public override Type BinderType => BindingMetadata.BinderType;
+
+        /// <inheritdoc />
+        public override bool ConvertEmptyStringToNull => DisplayMetadata.ConvertEmptyStringToNull;
+
+        /// <inheritdoc />
+        public override string DataTypeName => DisplayMetadata.DataTypeName;
+
+        /// <inheritdoc />
+        public override string Description
+        {
+            get
+            {
+                if (DisplayMetadata.Description == null)
+                {
+                    return null;
+                }
+
+                return DisplayMetadata.Description();
+            }
+        }
+
+        /// <inheritdoc />
+        public override string DisplayFormatString => DisplayMetadata.DisplayFormatStringProvider();
+
+        /// <inheritdoc />
+        public override string DisplayName
+        {
+            get
+            {
+                if (DisplayMetadata.DisplayName == null)
+                {
+                    return null;
+                }
+
+                return DisplayMetadata.DisplayName();
+            }
+        }
+
+        /// <inheritdoc />
+        public override string EditFormatString => DisplayMetadata.EditFormatStringProvider();
+
+        /// <inheritdoc />
+        public override ModelMetadata ElementMetadata
+        {
+            get
+            {
+                if (_elementMetadata == null && ElementType != null)
+                {
+                    _elementMetadata = _provider.GetMetadataForType(ElementType);
+                }
+
+                return _elementMetadata;
+            }
+        }
+
+        /// <inheritdoc />
+        public override IEnumerable<KeyValuePair<EnumGroupAndName, string>> EnumGroupedDisplayNamesAndValues
+            => DisplayMetadata.EnumGroupedDisplayNamesAndValues;
+
+        /// <inheritdoc />
+        public override IReadOnlyDictionary<string, string> EnumNamesAndValues => DisplayMetadata.EnumNamesAndValues;
+
+        /// <inheritdoc />
+        public override bool HasNonDefaultEditFormat => DisplayMetadata.HasNonDefaultEditFormat;
+
+        /// <inheritdoc />
+        public override bool HideSurroundingHtml => DisplayMetadata.HideSurroundingHtml;
+
+        /// <inheritdoc />
+        public override bool HtmlEncode => DisplayMetadata.HtmlEncode;
+
+        /// <inheritdoc />
+        public override bool IsBindingAllowed
+        {
+            get
+            {
+                if (MetadataKind == ModelMetadataKind.Type)
+                {
+                    return true;
+                }
+                else
+                {
+                    return BindingMetadata.IsBindingAllowed;
+                }
+            }
+        }
+
+        /// <inheritdoc />
+        public override bool IsBindingRequired
+        {
+            get
+            {
+                if (!_isBindingRequired.HasValue)
+                {
+                    if (MetadataKind == ModelMetadataKind.Type)
+                    {
+                        _isBindingRequired = false;
+                    }
+                    else
+                    {
+                        _isBindingRequired = BindingMetadata.IsBindingRequired;
+                    }
+                }
+
+                return _isBindingRequired.Value;
+            }
+        }
+
+        /// <inheritdoc />
+        public override bool IsEnum => DisplayMetadata.IsEnum;
+
+        /// <inheritdoc />
+        public override bool IsFlagsEnum => DisplayMetadata.IsFlagsEnum;
+
+        /// <inheritdoc />
+        public override bool IsReadOnly
+        {
+            get
+            {
+                if (!_isReadOnly.HasValue)
+                {
+                    if (MetadataKind == ModelMetadataKind.Type)
+                    {
+                        _isReadOnly = false;
+                    }
+                    else if (BindingMetadata.IsReadOnly.HasValue)
+                    {
+                        _isReadOnly = BindingMetadata.IsReadOnly;
+                    }
+                    else
+                    {
+                        _isReadOnly = _details.PropertySetter == null;
+                    }
+                }
+
+                return _isReadOnly.Value;
+            }
+        }
+
+        /// <inheritdoc />
+        public override bool IsRequired
+        {
+            get
+            {
+                if (!_isRequired.HasValue)
+                {
+                    if (ValidationMetadata.IsRequired.HasValue)
+                    {
+                        _isRequired = ValidationMetadata.IsRequired;
+                    }
+                    else
+                    {
+                        // Default to IsRequired = true for non-Nullable<T> value types.
+                        _isRequired = !IsReferenceOrNullableType;
+                    }
+                }
+
+                return _isRequired.Value;
+            }
+        }
+
+        /// <inheritdoc />
+        public override ModelBindingMessageProvider ModelBindingMessageProvider =>
+            BindingMetadata.ModelBindingMessageProvider;
+
+        /// <inheritdoc />
+        public override string NullDisplayText => DisplayMetadata.NullDisplayTextProvider();
+
+        /// <inheritdoc />
+        public override int Order => DisplayMetadata.Order;
+
+        /// <inheritdoc />
+        public override string Placeholder
+        {
+            get
+            {
+                if (DisplayMetadata.Placeholder == null)
+                {
+                    return null;
+                }
+
+                return DisplayMetadata.Placeholder();
+            }
+        }
+
+        /// <inheritdoc />
+        public override ModelPropertyCollection Properties
+        {
+            get
+            {
+                if (_properties == null)
+                {
+                    var properties = _provider.GetMetadataForProperties(ModelType);
+                    properties = properties.OrderBy(p => p.Order);
+                    _properties = new ModelPropertyCollection(properties);
+                }
+
+                return _properties;
+            }
+        }
+
+        /// <inheritdoc />
+        public override IPropertyFilterProvider PropertyFilterProvider => BindingMetadata.PropertyFilterProvider;
+
+        /// <inheritdoc />
+        public override bool ShowForDisplay => DisplayMetadata.ShowForDisplay;
+
+        /// <inheritdoc />
+        public override bool ShowForEdit => DisplayMetadata.ShowForEdit;
+
+        /// <inheritdoc />
+        public override string SimpleDisplayProperty => DisplayMetadata.SimpleDisplayProperty;
+
+        /// <inheritdoc />
+        public override string TemplateHint => DisplayMetadata.TemplateHint;
+
+        /// <inheritdoc />
+        public override IPropertyValidationFilter PropertyValidationFilter => ValidationMetadata.PropertyValidationFilter;
+
+        /// <inheritdoc />
+        public override bool ValidateChildren
+        {
+            get
+            {
+                if (!_validateChildren.HasValue)
+                {
+                    if (ValidationMetadata.ValidateChildren.HasValue)
+                    {
+                        _validateChildren = ValidationMetadata.ValidateChildren.Value;
+                    }
+                    else if (IsComplexType || IsEnumerableType)
+                    {
+                        _validateChildren = true;
+                    }
+                    else
+                    {
+                        _validateChildren = false;
+                    }
+                }
+
+                return _validateChildren.Value;
+            }
+        }
+
+        /// <inheritdoc />
+        public override IReadOnlyList<object> ValidatorMetadata
+        {
+            get
+            {
+                if (_validatorMetadata == null)
+                {
+                    _validatorMetadata = new ReadOnlyCollection<object>(ValidationMetadata.ValidatorMetadata);
+                }
+
+                return _validatorMetadata;
+            }
+        }
+
+        /// <inheritdoc />
+        public override Func<object, object> PropertyGetter => _details.PropertyGetter;
+
+        /// <inheritdoc />
+        public override Action<object, object> PropertySetter => _details.PropertySetter;
+
+        /// <inheritdoc />
+        public override ModelMetadata GetMetadataForType(Type modelType)
+        {
+            return _provider.GetMetadataForType(modelType);
+        }
+
+        /// <inheritdoc />
+        public override IEnumerable<ModelMetadata> GetMetadataForProperties(Type modelType)
+        {
+            return _provider.GetMetadataForProperties(modelType);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadataProvider.cs
new file mode 100644
index 0000000000..e15c0c3532
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadataProvider.cs
@@ -0,0 +1,383 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Reflection;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    /// <summary>
+    /// A default implementation of <see cref="IModelMetadataProvider"/> based on reflection.
+    /// </summary>
+    public class DefaultModelMetadataProvider : ModelMetadataProvider, IModelMetadataProvider2
+    {
+        private static readonly Func<ParameterInfo, Type, ModelMetadataIdentity> _modelMetadataIdentityForParameter;
+
+        private readonly TypeCache _typeCache = new TypeCache();
+        private readonly Func<ModelMetadataIdentity, ModelMetadataCacheEntry> _cacheEntryFactory;
+        private readonly ModelMetadataCacheEntry _metadataCacheEntryForObjectType;
+
+        static DefaultModelMetadataProvider()
+        {
+            var forParameterMethod = typeof(ModelMetadataIdentity).GetMethod(
+                nameof(ModelMetadataIdentity.ForParameter),
+                BindingFlags.Static | BindingFlags.NonPublic,
+                binder: null,
+                types: new[] { typeof(ParameterInfo), typeof(Type) },
+                modifiers: null);
+
+            _modelMetadataIdentityForParameter = (Func<ParameterInfo, Type, ModelMetadataIdentity>)
+                forParameterMethod.CreateDelegate(typeof(Func<ParameterInfo, Type, ModelMetadataIdentity>));
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="DefaultModelMetadataProvider"/>.
+        /// </summary>
+        /// <param name="detailsProvider">The <see cref="ICompositeMetadataDetailsProvider"/>.</param>
+        public DefaultModelMetadataProvider(ICompositeMetadataDetailsProvider detailsProvider)
+            : this(detailsProvider, new DefaultModelBindingMessageProvider())
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="DefaultModelMetadataProvider"/>.
+        /// </summary>
+        /// <param name="detailsProvider">The <see cref="ICompositeMetadataDetailsProvider"/>.</param>
+        /// <param name="optionsAccessor">The accessor for <see cref="MvcOptions"/>.</param>
+        public DefaultModelMetadataProvider(
+            ICompositeMetadataDetailsProvider detailsProvider,
+            IOptions<MvcOptions> optionsAccessor)
+            : this(detailsProvider, GetMessageProvider(optionsAccessor))
+        {
+        }
+
+        private DefaultModelMetadataProvider(
+            ICompositeMetadataDetailsProvider detailsProvider,
+            DefaultModelBindingMessageProvider modelBindingMessageProvider)
+        {
+            if (detailsProvider == null)
+            {
+                throw new ArgumentNullException(nameof(detailsProvider));
+            }
+
+            DetailsProvider = detailsProvider;
+            ModelBindingMessageProvider = modelBindingMessageProvider;
+
+            _cacheEntryFactory = CreateCacheEntry;
+            _metadataCacheEntryForObjectType = GetMetadataCacheEntryForObjectType();
+        }
+
+        /// <summary>
+        /// Gets the <see cref="ICompositeMetadataDetailsProvider"/>.
+        /// </summary>
+        protected ICompositeMetadataDetailsProvider DetailsProvider { get; }
+
+        /// <summary>
+        /// Gets the <see cref="Metadata.DefaultModelBindingMessageProvider"/>.
+        /// </summary>
+        /// <value>Same as <see cref="MvcOptions.ModelBindingMessageProvider"/> in all production scenarios.</value>
+        protected DefaultModelBindingMessageProvider ModelBindingMessageProvider { get; }
+
+        /// <inheritdoc />
+        public override IEnumerable<ModelMetadata> GetMetadataForProperties(Type modelType)
+        {
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            var cacheEntry = GetCacheEntry(modelType);
+
+            // We're relying on a safe race-condition for Properties - take care only
+            // to set the value onces the properties are fully-initialized.
+            if (cacheEntry.Details.Properties == null)
+            {
+                var key = ModelMetadataIdentity.ForType(modelType);
+                var propertyDetails = CreatePropertyDetails(key);
+
+                var properties = new ModelMetadata[propertyDetails.Length];
+                for (var i = 0; i < properties.Length; i++)
+                {
+                    propertyDetails[i].ContainerMetadata = cacheEntry.Metadata;
+                    properties[i] = CreateModelMetadata(propertyDetails[i]);
+                }
+
+                cacheEntry.Details.Properties = properties;
+            }
+
+            return cacheEntry.Details.Properties;
+        }
+
+        /// <inheritdoc />
+        public override ModelMetadata GetMetadataForParameter(ParameterInfo parameter)
+            => GetMetadataForParameter(parameter, parameter?.ParameterType);
+
+        /// <inheritdoc />
+        ModelMetadata IModelMetadataProvider2.GetMetadataForParameter(ParameterInfo parameter, Type modelType)
+            => GetMetadataForParameter(parameter, modelType);
+
+        internal ModelMetadata GetMetadataForParameter(ParameterInfo parameter, Type modelType)
+        {
+            if (parameter == null)
+            {
+                throw new ArgumentNullException(nameof(parameter));
+            }
+
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            var cacheEntry = GetCacheEntry(parameter, modelType);
+
+            return cacheEntry.Metadata;
+        }
+
+        /// <inheritdoc />
+        public override ModelMetadata GetMetadataForType(Type modelType)
+        {
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            var cacheEntry = GetCacheEntry(modelType);
+
+            return cacheEntry.Metadata;
+        }
+
+
+        /// <inheritdoc />
+        ModelMetadata IModelMetadataProvider2.GetMetadataForProperty(PropertyInfo parameter, Type modelType)
+            => GetMetadataForProperty(parameter, modelType);
+
+        internal ModelMetadata GetMetadataForProperty(PropertyInfo propertyInfo, Type modelType)
+        {
+            if (propertyInfo == null)
+            {
+                throw new ArgumentNullException(nameof(propertyInfo));
+            }
+
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            var cacheEntry = GetCacheEntry(propertyInfo, modelType);
+
+            return cacheEntry.Metadata;
+        }
+
+        private static DefaultModelBindingMessageProvider GetMessageProvider(IOptions<MvcOptions> optionsAccessor)
+        {
+            if (optionsAccessor == null)
+            {
+                throw new ArgumentNullException(nameof(optionsAccessor));
+            }
+
+            return optionsAccessor.Value.ModelBindingMessageProvider;
+        }
+
+        private ModelMetadataCacheEntry GetCacheEntry(Type modelType)
+        {
+            ModelMetadataCacheEntry cacheEntry;
+
+            // Perf: We cached model metadata cache entry for "object" type to save ConcurrentDictionary lookups.
+            if (modelType == typeof(object))
+            {
+                cacheEntry = _metadataCacheEntryForObjectType;
+            }
+            else
+            {
+                var key = ModelMetadataIdentity.ForType(modelType);
+
+                cacheEntry = _typeCache.GetOrAdd(key, _cacheEntryFactory);
+            }
+
+            return cacheEntry;
+        }
+
+        private ModelMetadataCacheEntry GetCacheEntry(ParameterInfo parameter, Type modelType)
+        {
+            return _typeCache.GetOrAdd(
+                _modelMetadataIdentityForParameter(parameter, modelType),
+                _cacheEntryFactory);
+        }
+
+        private ModelMetadataCacheEntry GetCacheEntry(PropertyInfo property, Type modelType)
+        {
+            return _typeCache.GetOrAdd(
+                ModelMetadataIdentity.ForProperty(modelType, property.Name, property.DeclaringType),
+                _cacheEntryFactory);
+        }
+
+        private ModelMetadataCacheEntry CreateCacheEntry(ModelMetadataIdentity key)
+        {
+            DefaultMetadataDetails details;
+            if (key.MetadataKind == ModelMetadataKind.Parameter)
+            {
+                details = CreateParameterDetails(key);
+            }
+            else if (key.MetadataKind == ModelMetadataKind.Property)
+            {
+                details = CreateSinglePropertyDetails(key);
+            }
+            else
+            {
+                details = CreateTypeDetails(key);
+            }
+
+            var metadata = CreateModelMetadata(details);
+            return new ModelMetadataCacheEntry(metadata, details);
+        }
+
+        private DefaultMetadataDetails CreateSinglePropertyDetails(ModelMetadataIdentity propertyKey)
+        {
+            var propertyHelpers = PropertyHelper.GetVisibleProperties(propertyKey.ContainerType);
+            for (var i = 0; i < propertyHelpers.Length; i++)
+            {
+                var propertyHelper = propertyHelpers[i];
+                if (propertyHelper.Name == propertyKey.Name)
+                {
+                    return CreateSinglePropertyDetails(propertyKey, propertyHelper);
+                }
+            }
+
+            Debug.Fail($"Unable to find property '{propertyKey.Name}' on type '{propertyKey.ContainerType}.");
+            return null;
+        }
+
+        private ModelMetadataCacheEntry GetMetadataCacheEntryForObjectType()
+        {
+            var key = ModelMetadataIdentity.ForType(typeof(object));
+            var entry = CreateCacheEntry(key);
+            return entry;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="ModelMetadata"/> from a <see cref="DefaultMetadataDetails"/>.
+        /// </summary>
+        /// <param name="entry">The <see cref="DefaultMetadataDetails"/> entry with cached data.</param>
+        /// <returns>A new <see cref="ModelMetadata"/> instance.</returns>
+        /// <remarks>
+        /// <see cref="DefaultModelMetadataProvider"/> will always create instances of
+        /// <see cref="DefaultModelMetadata"/> .Override this method to create a <see cref="ModelMetadata"/>
+        /// of a different concrete type.
+        /// </remarks>
+        protected virtual ModelMetadata CreateModelMetadata(DefaultMetadataDetails entry)
+        {
+            return new DefaultModelMetadata(this, DetailsProvider, entry, ModelBindingMessageProvider);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="DefaultMetadataDetails"/> entries for the properties of a model
+        /// <see cref="Type"/>.
+        /// </summary>
+        /// <param name="key">
+        /// The <see cref="ModelMetadataIdentity"/> identifying the model <see cref="Type"/>.
+        /// </param>
+        /// <returns>A details object for each property of the model <see cref="Type"/>.</returns>
+        /// <remarks>
+        /// The results of this method will be cached and used to satisfy calls to
+        /// <see cref="GetMetadataForProperties(Type)"/>. Override this method to provide a different
+        /// set of property data.
+        /// </remarks>
+        protected virtual DefaultMetadataDetails[] CreatePropertyDetails(ModelMetadataIdentity key)
+        {
+            var propertyHelpers = PropertyHelper.GetVisibleProperties(key.ModelType);
+
+            var propertyEntries = new List<DefaultMetadataDetails>(propertyHelpers.Length);
+            for (var i = 0; i < propertyHelpers.Length; i++)
+            {
+                var propertyHelper = propertyHelpers[i];
+
+                var propertyKey = ModelMetadataIdentity.ForProperty(
+                    propertyHelper.Property.PropertyType,
+                    propertyHelper.Name,
+                    key.ModelType);
+
+                var propertyEntry = CreateSinglePropertyDetails(propertyKey, propertyHelper);
+                propertyEntries.Add(propertyEntry);
+            }
+
+            return propertyEntries.ToArray();
+        }
+
+        private DefaultMetadataDetails CreateSinglePropertyDetails(
+            ModelMetadataIdentity propertyKey,
+            PropertyHelper propertyHelper)
+        {
+            Debug.Assert(propertyKey.MetadataKind == ModelMetadataKind.Property);
+            var containerType = propertyKey.ContainerType;
+
+            var attributes = ModelAttributes.GetAttributesForProperty(
+                containerType,
+                propertyHelper.Property,
+                propertyKey.ModelType);
+
+            var propertyEntry = new DefaultMetadataDetails(propertyKey, attributes);
+            if (propertyHelper.Property.CanRead && propertyHelper.Property.GetMethod?.IsPublic == true)
+            {
+                var getter = PropertyHelper.MakeNullSafeFastPropertyGetter(propertyHelper.Property);
+                propertyEntry.PropertyGetter = getter;
+            }
+
+            if (propertyHelper.Property.CanWrite &&
+                propertyHelper.Property.SetMethod?.IsPublic == true &&
+                !containerType.IsValueType)
+            {
+                propertyEntry.PropertySetter = propertyHelper.ValueSetter;
+            }
+
+            return propertyEntry;
+        }
+
+        /// <summary>
+        /// Creates the <see cref="DefaultMetadataDetails"/> entry for a model <see cref="Type"/>.
+        /// </summary>
+        /// <param name="key">
+        /// The <see cref="ModelMetadataIdentity"/> identifying the model <see cref="Type"/>.
+        /// </param>
+        /// <returns>A details object for the model <see cref="Type"/>.</returns>
+        /// <remarks>
+        /// The results of this method will be cached and used to satisfy calls to
+        /// <see cref="GetMetadataForType(Type)"/>. Override this method to provide a different
+        /// set of attributes.
+        /// </remarks>
+        protected virtual DefaultMetadataDetails CreateTypeDetails(ModelMetadataIdentity key)
+        {
+            return new DefaultMetadataDetails(
+                key,
+                ModelAttributes.GetAttributesForType(key.ModelType));
+        }
+
+        protected virtual DefaultMetadataDetails CreateParameterDetails(ModelMetadataIdentity key)
+        {
+            return new DefaultMetadataDetails(
+                key,
+                ModelAttributes.GetAttributesForParameter(key.ParameterInfo, key.ModelType));
+        }
+
+        private class TypeCache : ConcurrentDictionary<ModelMetadataIdentity, ModelMetadataCacheEntry>
+        {
+        }
+
+        private struct ModelMetadataCacheEntry
+        {
+            public ModelMetadataCacheEntry(ModelMetadata metadata, DefaultMetadataDetails details)
+            {
+                Metadata = metadata;
+                Details = details;
+            }
+
+            public ModelMetadata Metadata { get; }
+
+            public DefaultMetadataDetails Details { get; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DisplayMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DisplayMetadata.cs
new file mode 100644
index 0000000000..7d2f15ce36
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DisplayMetadata.cs
@@ -0,0 +1,273 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    /// <summary>
+    /// Display metadata details for a <see cref="ModelMetadata"/>.
+    /// </summary>
+    public class DisplayMetadata
+    {
+        private Func<string> _displayFormatStringProvider = () => null;
+        private Func<string> _editFormatStringProvider = () => null;
+        private Func<string> _nullDisplayTextProvider = () => null;
+
+        /// <summary>
+        /// Gets a set of additional values. See <see cref="ModelMetadata.AdditionalValues"/>
+        /// </summary>
+        public IDictionary<object, object> AdditionalValues { get; } = new Dictionary<object, object>();
+
+        /// <summary>
+        /// Gets or sets a value indicating whether or not to convert an empty string value or one containing only
+        /// whitespace characters to <see langword="null"/> when representing a model as text. See
+        /// <see cref="ModelMetadata.ConvertEmptyStringToNull"/>
+        /// </summary>
+        public bool ConvertEmptyStringToNull { get; set; } = true;
+
+        /// <summary>
+        /// Gets or sets the name of the data type.
+        /// See <see cref="ModelMetadata.DataTypeName"/>
+        /// </summary>
+        public string DataTypeName { get; set; }
+
+        /// <summary>
+        /// Gets or sets a delegate which is used to get a value for the
+        /// model description. See <see cref="ModelMetadata.Description"/>.
+        /// </summary>
+        public Func<string> Description { get; set; }
+
+        /// <summary>
+        /// Gets or sets a display format string for the model.
+        /// See <see cref="ModelMetadata.DisplayFormatString"/>
+        /// </summary>
+        /// <remarks>
+        /// Setting <see cref="DisplayFormatString"/> also changes <see cref="DisplayFormatStringProvider"/>.
+        /// </remarks>
+        public string DisplayFormatString
+        {
+            get
+            {
+                return DisplayFormatStringProvider();
+            }
+            set
+            {
+                DisplayFormatStringProvider = () => value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a delegate which is used to get the display format string for the model. See
+        /// <see cref="ModelMetadata.DisplayFormatString"/>.
+        /// </summary>
+        /// <remarks>
+        /// Setting <see cref="DisplayFormatStringProvider"/> also changes <see cref="DisplayFormatString"/>.
+        /// </remarks>
+        public Func<string> DisplayFormatStringProvider
+        {
+            get
+            {
+                return _displayFormatStringProvider;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _displayFormatStringProvider = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a delegate which is used to get a value for the
+        /// display name of the model. See <see cref="ModelMetadata.DisplayName"/>.
+        /// </summary>
+        public Func<string> DisplayName { get; set; }
+
+        /// <summary>
+        /// Gets or sets an edit format string for the model.
+        /// See <see cref="ModelMetadata.EditFormatString"/>
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Setting <see cref="EditFormatString"/> also changes <see cref="EditFormatStringProvider"/>.
+        /// </para>
+        /// <para>
+        /// <see cref="IDisplayMetadataProvider"/> instances that set this property to a non-<see langword="null"/>,
+        /// non-empty, non-default value should also set <see cref="HasNonDefaultEditFormat"/> to
+        /// <see langword="true"/>.
+        /// </para>
+        /// </remarks>
+        public string EditFormatString
+        {
+            get
+            {
+                return EditFormatStringProvider();
+            }
+            set
+            {
+                EditFormatStringProvider = () => value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a delegate which is used to get the edit format string for the model. See
+        /// <see cref="ModelMetadata.EditFormatString"/>.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Setting <see cref="EditFormatStringProvider"/> also changes <see cref="EditFormatString"/>.
+        /// </para>
+        /// <para>
+        /// <see cref="IDisplayMetadataProvider"/> instances that set this property to a non-default value should
+        /// also set <see cref="HasNonDefaultEditFormat"/> to <see langword="true"/>.
+        /// </para>
+        /// </remarks>
+        public Func<string> EditFormatStringProvider
+        {
+            get
+            {
+                return _editFormatStringProvider;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _editFormatStringProvider = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the ordered and grouped display names and values of all <see cref="System.Enum"/> values in
+        /// <see cref="ModelMetadata.UnderlyingOrModelType"/>. See
+        /// <see cref="ModelMetadata.EnumGroupedDisplayNamesAndValues"/>.
+        /// </summary>
+        public IEnumerable<KeyValuePair<EnumGroupAndName, string>> EnumGroupedDisplayNamesAndValues { get; set; }
+
+        /// <summary>
+        /// Gets the names and values of all <see cref="System.Enum"/> values in
+        /// <see cref="ModelMetadata.UnderlyingOrModelType"/>. See <see cref="ModelMetadata.EnumNamesAndValues"/>.
+        /// </summary>
+        // This could be implemented in DefaultModelMetadata. But value should be cached.
+        public IReadOnlyDictionary<string, string> EnumNamesAndValues { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether or not the model has a non-default edit format.
+        /// See <see cref="ModelMetadata.HasNonDefaultEditFormat"/>
+        /// </summary>
+        public bool HasNonDefaultEditFormat { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating if the surrounding HTML should be hidden.
+        /// See <see cref="ModelMetadata.HideSurroundingHtml"/>
+        /// </summary>
+        public bool HideSurroundingHtml { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating if the model value should be HTML encoded.
+        /// See <see cref="ModelMetadata.HtmlEncode"/>
+        /// </summary>
+        public bool HtmlEncode { get; set; } = true;
+
+        /// <summary>
+        /// Gets a value indicating whether <see cref="ModelMetadata.UnderlyingOrModelType"/> is for an
+        /// <see cref="System.Enum"/>. See <see cref="ModelMetadata.IsEnum"/>.
+        /// </summary>
+        // This could be implemented in DefaultModelMetadata. But value is needed in the details provider.
+        public bool IsEnum { get; set; }
+
+        /// <summary>
+        /// Gets a value indicating whether <see cref="ModelMetadata.UnderlyingOrModelType"/> is for an
+        /// <see cref="System.Enum"/> with an associated <see cref="System.FlagsAttribute"/>. See
+        /// <see cref="ModelMetadata.IsFlagsEnum"/>.
+        /// </summary>
+        // This could be implemented in DefaultModelMetadata. But value is needed in the details provider.
+        public bool IsFlagsEnum { get; set; }
+
+        /// <summary>
+        /// Gets or sets the text to display when the model value is <see langword="null"/>.
+        /// See <see cref="ModelMetadata.NullDisplayText"/>
+        /// </summary>
+        /// <remarks>
+        /// Setting <see cref="NullDisplayText"/> also changes <see cref="NullDisplayTextProvider"/>.
+        /// </remarks>
+        public string NullDisplayText
+        {
+            get
+            {
+                return NullDisplayTextProvider();
+            }
+            set
+            {
+                NullDisplayTextProvider = () => value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a delegate which is used to get the text to display when the model is <see langword="null"/>.
+        /// See <see cref="ModelMetadata.NullDisplayText"/>.
+        /// </summary>
+        /// <remarks>
+        /// Setting <see cref="NullDisplayTextProvider"/> also changes <see cref="NullDisplayText"/>.
+        /// </remarks>
+        public Func<string> NullDisplayTextProvider
+        {
+            get
+            {
+                return _nullDisplayTextProvider;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _nullDisplayTextProvider = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the order.
+        /// See <see cref="ModelMetadata.Order"/>
+        /// </summary>
+        public int Order { get; set; } = 10000;
+
+        /// <summary>
+        /// Gets or sets a delegate which is used to get a value for the
+        /// model's placeholder text. See <see cref="ModelMetadata.Placeholder"/>.
+        /// </summary>
+        public Func<string> Placeholder { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether or not to include in the model value in display.
+        /// See <see cref="ModelMetadata.ShowForDisplay"/>
+        /// </summary>
+        public bool ShowForDisplay { get; set; } = true;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether or not to include in the model value in an editor.
+        /// See <see cref="ModelMetadata.ShowForEdit"/>
+        /// </summary>
+        public bool ShowForEdit { get; set; } = true;
+
+        /// <summary>
+        /// Gets or sets a the property name of a model property to use for display.
+        /// See <see cref="ModelMetadata.SimpleDisplayProperty"/>
+        /// </summary>
+        public string SimpleDisplayProperty { get; set; }
+
+        /// <summary>
+        /// Gets or sets a hint for location of a display or editor template.
+        /// See <see cref="ModelMetadata.TemplateHint"/>
+        /// </summary>
+        public string TemplateHint { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DisplayMetadataProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DisplayMetadataProviderContext.cs
new file mode 100644
index 0000000000..650583557e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DisplayMetadataProviderContext.cs
@@ -0,0 +1,61 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    /// <summary>
+    /// A context for and <see cref="IDisplayMetadataProvider"/>.
+    /// </summary>
+    public class DisplayMetadataProviderContext
+    {
+        /// <summary>
+        /// Creates a new <see cref="DisplayMetadataProviderContext"/>.
+        /// </summary>
+        /// <param name="key">The <see cref="ModelMetadataIdentity"/> for the <see cref="ModelMetadata"/>.</param>
+        /// <param name="attributes">The attributes for the <see cref="ModelMetadata"/>.</param>
+        public DisplayMetadataProviderContext(
+            ModelMetadataIdentity key,
+            ModelAttributes attributes)
+        {
+            if (attributes == null)
+            {
+                throw new ArgumentNullException(nameof(attributes));
+            }
+
+            Key = key;
+            Attributes = attributes.Attributes;
+            PropertyAttributes = attributes.PropertyAttributes;
+            TypeAttributes = attributes.TypeAttributes;
+
+            DisplayMetadata = new DisplayMetadata();
+        }
+
+        /// <summary>
+        /// Gets the attributes.
+        /// </summary>
+        public IReadOnlyList<object> Attributes { get; }
+
+        /// <summary>
+        /// Gets the <see cref="Metadata.DisplayMetadata"/>.
+        /// </summary>
+        public DisplayMetadata DisplayMetadata { get; }
+
+        /// <summary>
+        /// Gets the <see cref="ModelMetadataIdentity"/>.
+        /// </summary>
+        public ModelMetadataIdentity Key { get; }
+
+        /// <summary>
+        /// Gets the property attributes.
+        /// </summary>
+        public IReadOnlyList<object> PropertyAttributes { get; }
+
+        /// <summary>
+        /// Gets the type attributes.
+        /// </summary>
+        public IReadOnlyList<object> TypeAttributes { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ExcludeBindingMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ExcludeBindingMetadataProvider.cs
new file mode 100644
index 0000000000..ca171d0c7c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ExcludeBindingMetadataProvider.cs
@@ -0,0 +1,50 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    /// <summary>
+    /// An <see cref="IBindingMetadataProvider"/> which configures <see cref="ModelMetadata.IsBindingAllowed"/> to
+    /// <c>false</c> for matching types.
+    /// </summary>
+    public class ExcludeBindingMetadataProvider : IBindingMetadataProvider
+    {
+        private readonly Type _type;
+
+        /// <summary>
+        /// Creates a new <see cref="ExcludeBindingMetadataProvider"/> for the given <paramref name="type"/>.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="Type"/>. All properties with this <see cref="Type"/> will have
+        /// <see cref="ModelMetadata.IsBindingAllowed"/> set to <c>false</c>.
+        /// </param>
+        public ExcludeBindingMetadataProvider(Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            _type = type;
+        }
+
+        /// <inheritdoc />
+        public void CreateBindingMetadata(BindingMetadataProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            // No-op if the metadata is not for the target type
+            if (!_type.IsAssignableFrom(context.Key.ModelType))
+            {
+                return;
+            }
+
+            context.BindingMetadata.IsBindingAllowed = false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IBindingMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IBindingMetadataProvider.cs
new file mode 100644
index 0000000000..654784db5f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IBindingMetadataProvider.cs
@@ -0,0 +1,17 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    /// <summary>
+    /// Provides <see cref="BindingMetadata"/> for a <see cref="DefaultModelMetadata"/>.
+    /// </summary>
+    public interface IBindingMetadataProvider : IMetadataDetailsProvider
+    {
+        /// <summary>
+        /// Sets the values for properties of <see cref="BindingMetadataProviderContext.BindingMetadata"/>. 
+        /// </summary>
+        /// <param name="context">The <see cref="BindingMetadataProviderContext"/>.</param>
+        void CreateBindingMetadata(BindingMetadataProviderContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ICompositeMetadataDetailsProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ICompositeMetadataDetailsProvider.cs
new file mode 100644
index 0000000000..58813af161
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ICompositeMetadataDetailsProvider.cs
@@ -0,0 +1,15 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    /// <summary>
+    /// A composite <see cref="IMetadataDetailsProvider"/>.
+    /// </summary>
+    public interface ICompositeMetadataDetailsProvider : 
+        IBindingMetadataProvider, 
+        IDisplayMetadataProvider, 
+        IValidationMetadataProvider
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IDisplayMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IDisplayMetadataProvider.cs
new file mode 100644
index 0000000000..a6e063da2a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IDisplayMetadataProvider.cs
@@ -0,0 +1,17 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    /// <summary>
+    /// Provides <see cref="DisplayMetadata"/> for a <see cref="DefaultModelMetadata"/>.
+    /// </summary>
+    public interface IDisplayMetadataProvider : IMetadataDetailsProvider
+    {
+        /// <summary>
+        /// Sets the values for properties of <see cref="DisplayMetadataProviderContext.DisplayMetadata"/>. 
+        /// </summary>
+        /// <param name="context">The <see cref="DisplayMetadataProviderContext"/>.</param>
+        void CreateDisplayMetadata(DisplayMetadataProviderContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IMetadataDetailsProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IMetadataDetailsProvider.cs
new file mode 100644
index 0000000000..143ceb4faf
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IMetadataDetailsProvider.cs
@@ -0,0 +1,14 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    /// <summary>
+    /// Marker interface for a provider of metadata details about model objects. Implementations should
+    /// implement one or more of <see cref="IBindingMetadataProvider"/>, <see cref="IDisplayMetadataProvider"/>, 
+    /// and <see cref="IValidationMetadataProvider"/>.
+    /// </summary>
+    public interface IMetadataDetailsProvider
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IModelMetadataProvider2.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IModelMetadataProvider2.cs
new file mode 100644
index 0000000000..b9d8d809f4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IModelMetadataProvider2.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using System;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    internal interface IModelMetadataProvider2
+    {
+        /// <summary>
+        /// Supplies metadata describing a parameter.
+        /// </summary>
+        /// <param name="parameter">The <see cref="ParameterInfo"/></param>
+        /// <param name="modelType">The actual model type.</param>
+        /// <returns>A <see cref="ModelMetadata"/> instance describing the <paramref name="parameter"/>.</returns>
+        ModelMetadata GetMetadataForParameter(ParameterInfo parameter, Type modelType);
+
+        /// <summary>
+        /// Supplies metadata describing a property.
+        /// </summary>
+        /// <param name="propertyInfo">The <see cref="PropertyInfo"/>.</param>
+        /// <param name="modelType">The actual model type.</param>
+        /// <returns>A <see cref="ModelMetadata"/> instance describing the <paramref name="propertyInfo"/>.</returns>
+        ModelMetadata GetMetadataForProperty(PropertyInfo propertyInfo, Type modelType);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IValidationMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IValidationMetadataProvider.cs
new file mode 100644
index 0000000000..557ccc8c7b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IValidationMetadataProvider.cs
@@ -0,0 +1,17 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    /// <summary>
+    /// Provides <see cref="ValidationMetadata"/> for a <see cref="DefaultModelMetadata"/>.
+    /// </summary>
+    public interface IValidationMetadataProvider : IMetadataDetailsProvider
+    {
+        /// <summary>
+        /// Gets the values for properties of <see cref="ValidationMetadata"/>. 
+        /// </summary>
+        /// <param name="context">The <see cref="ValidationMetadataProviderContext"/>.</param>
+        void CreateValidationMetadata(ValidationMetadataProviderContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/MetadataDetailsProviderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/MetadataDetailsProviderExtensions.cs
new file mode 100644
index 0000000000..dbb474956e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/MetadataDetailsProviderExtensions.cs
@@ -0,0 +1,56 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    /// <summary>
+    /// Extension methods for <see cref="IMetadataDetailsProvider"/>.
+    /// </summary>
+    public static class MetadataDetailsProviderExtensions
+    {
+        /// <summary>
+        /// Removes all metadata details providers of the specified type.
+        /// </summary>
+        /// <param name="list">The list of <see cref="IMetadataDetailsProvider"/>s.</param>
+        /// <typeparam name="TMetadataDetailsProvider">The type to remove.</typeparam>
+        public static void RemoveType<TMetadataDetailsProvider>(this IList<IMetadataDetailsProvider> list) where TMetadataDetailsProvider : IMetadataDetailsProvider
+        {
+            if (list == null)
+            {
+                throw new ArgumentNullException(nameof(list));
+            }
+
+            RemoveType(list, typeof(TMetadataDetailsProvider));
+        }
+
+        /// <summary>
+        /// Removes all metadata details providers of the specified type.
+        /// </summary>
+        /// <param name="list">The list of <see cref="IMetadataDetailsProvider"/>s.</param>
+        /// <param name="type">The type to remove.</param>
+        public static void RemoveType(this IList<IMetadataDetailsProvider> list, Type type)
+        {
+            if (list == null)
+            {
+                throw new ArgumentNullException(nameof(list));
+            }
+
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            for (var i = list.Count - 1; i >= 0; i--)
+            {
+                var metadataDetailsProvider = list[i];
+                if (metadataDetailsProvider.GetType() == type)
+                {
+                    list.RemoveAt(i);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ModelAttributes.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ModelAttributes.cs
new file mode 100644
index 0000000000..c5d48ed8a9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ModelAttributes.cs
@@ -0,0 +1,260 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Provides access to the combined list of attributes associated with a <see cref="Type"/>, property, or parameter.
+    /// </summary>
+    public class ModelAttributes
+    {
+        private static readonly IEnumerable<object> _emptyAttributesCollection = Enumerable.Empty<object>();
+
+        /// <summary>
+        /// Creates a new <see cref="ModelAttributes"/> for a <see cref="Type"/>.
+        /// </summary>
+        /// <param name="typeAttributes">The set of attributes for the <see cref="Type"/>.</param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version. The recommended alternative is " + nameof(ModelAttributes) + "." + nameof(GetAttributesForType) + ".")]
+        public ModelAttributes(IEnumerable<object> typeAttributes)
+            : this(typeAttributes, null, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="ModelAttributes"/> for a property.
+        /// </summary>
+        /// <param name="propertyAttributes">The set of attributes for the property.</param>
+        /// <param name="typeAttributes">
+        /// The set of attributes for the property's <see cref="Type"/>. See <see cref="PropertyInfo.PropertyType"/>.
+        /// </param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version. The recommended alternative is " + nameof(ModelAttributes) + "." + nameof(GetAttributesForProperty) + ".")]
+        public ModelAttributes(IEnumerable<object> propertyAttributes, IEnumerable<object> typeAttributes)
+            : this(typeAttributes, propertyAttributes, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="ModelAttributes"/>.
+        /// </summary>
+        /// <param name="typeAttributes">
+        /// If this instance represents a type, the set of attributes for that type.
+        /// If this instance represents a property, the set of attributes for the property's <see cref="Type"/>.
+        /// Otherwise, <c>null</c>.
+        /// </param>
+        /// <param name="propertyAttributes">
+        /// If this instance represents a property, the set of attributes for that property.
+        /// Otherwise, <c>null</c>.
+        /// </param>
+        /// <param name="parameterAttributes">
+        /// If this instance represents a parameter, the set of attributes for that parameter.
+        /// Otherwise, <c>null</c>.
+        /// </param>
+        internal ModelAttributes(
+            IEnumerable<object> typeAttributes,
+            IEnumerable<object> propertyAttributes,
+            IEnumerable<object> parameterAttributes)
+        {
+            if (propertyAttributes != null)
+            {
+                // Represents a property
+                if (typeAttributes == null)
+                {
+                    throw new ArgumentNullException(nameof(typeAttributes));
+                }
+
+                PropertyAttributes = propertyAttributes.ToArray();
+                TypeAttributes = typeAttributes.ToArray();
+                Attributes = PropertyAttributes.Concat(TypeAttributes).ToArray();
+            }
+            else if (parameterAttributes != null)
+            {
+                // Represents a parameter
+                if (typeAttributes == null)
+                {
+                    throw new ArgumentNullException(nameof(typeAttributes));
+                }
+
+                ParameterAttributes = parameterAttributes.ToArray();
+                TypeAttributes = typeAttributes.ToArray();
+                Attributes = ParameterAttributes.Concat(TypeAttributes).ToArray();
+            }
+            else if (typeAttributes != null)
+            {
+                // Represents a type
+                if (typeAttributes == null)
+                {
+                    throw new ArgumentNullException(nameof(typeAttributes));
+                }
+
+                Attributes = TypeAttributes = typeAttributes.ToArray();
+            }
+        }
+
+        /// <summary>
+        /// Gets the set of all attributes. If this instance represents the attributes for a property, the attributes
+        /// on the property definition are before those on the property's <see cref="Type"/>. If this instance
+        /// represents the attributes for a parameter, the attributes on the parameter definition are before those on
+        /// the parameter's <see cref="Type"/>.
+        /// </summary>
+        public IReadOnlyList<object> Attributes { get; }
+
+        /// <summary>
+        /// Gets the set of attributes on the property, or <c>null</c> if this instance does not represent the attributes
+        /// for a property.
+        /// </summary>
+        public IReadOnlyList<object> PropertyAttributes { get; }
+
+        /// <summary>
+        /// Gets the set of attributes on the parameter, or <c>null</c> if this instance does not represent the attributes
+        /// for a parameter.
+        /// </summary>
+        public IReadOnlyList<object> ParameterAttributes { get; }
+
+        /// <summary>
+        /// Gets the set of attributes on the <see cref="Type"/>. If this instance represents a property, then
+        /// <see cref="TypeAttributes"/> contains attributes retrieved from <see cref="PropertyInfo.PropertyType"/>.
+        /// If this instance represents a parameter, then contains attributes retrieved from
+        /// <see cref="ParameterInfo.ParameterType"/>.
+        /// </summary>
+        public IReadOnlyList<object> TypeAttributes { get; }
+
+        /// <summary>
+        /// Gets the attributes for the given <paramref name="property"/>.
+        /// </summary>
+        /// <param name="type">The <see cref="Type"/> in which caller found <paramref name="property"/>.
+        /// </param>
+        /// <param name="property">A <see cref="PropertyInfo"/> for which attributes need to be resolved.
+        /// </param>
+        /// <returns>
+        /// A <see cref="ModelAttributes"/> instance with the attributes of the property and its <see cref="Type"/>.
+        /// </returns>
+        public static ModelAttributes GetAttributesForProperty(Type type, PropertyInfo property)
+        {
+            return GetAttributesForProperty(type, property, property.PropertyType);
+        }
+
+        /// <summary>
+        /// Gets the attributes for the given <paramref name="property"/> with the specified <paramref name="modelType"/>.
+        /// </summary>
+        /// <param name="containerType">The <see cref="Type"/> in which caller found <paramref name="property"/>.
+        /// </param>
+        /// <param name="property">A <see cref="PropertyInfo"/> for which attributes need to be resolved.
+        /// </param>
+        /// <param name="modelType">The model type</param>
+        /// <returns>
+        /// A <see cref="ModelAttributes"/> instance with the attributes of the property and its <see cref="Type"/>.
+        /// </returns>
+        internal static ModelAttributes GetAttributesForProperty(Type containerType, PropertyInfo property, Type modelType)
+        {
+            if (containerType == null)
+            {
+                throw new ArgumentNullException(nameof(containerType));
+            }
+
+            if (property == null)
+            {
+                throw new ArgumentNullException(nameof(property));
+            }
+
+            var propertyAttributes = property.GetCustomAttributes();
+            var typeAttributes = modelType.GetCustomAttributes();
+
+            var metadataType = GetMetadataType(containerType);
+            if (metadataType != null)
+            {
+                var metadataProperty = metadataType.GetRuntimeProperty(property.Name);
+                if (metadataProperty != null)
+                {
+                    propertyAttributes = propertyAttributes.Concat(metadataProperty.GetCustomAttributes());
+                }
+            }
+
+            return new ModelAttributes(typeAttributes, propertyAttributes, parameterAttributes: null);
+        }
+
+        /// <summary>
+        /// Gets the attributes for the given <paramref name="type"/>.
+        /// </summary>
+        /// <param name="type">The <see cref="Type"/> for which attributes need to be resolved.
+        /// </param>
+        /// <returns>A <see cref="ModelAttributes"/> instance with the attributes of the <see cref="Type"/>.</returns>
+        public static ModelAttributes GetAttributesForType(Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            var attributes = type.GetCustomAttributes();
+
+            var metadataType = GetMetadataType(type);
+            if (metadataType != null)
+            {
+                attributes = attributes.Concat(metadataType.GetCustomAttributes());
+            }
+
+            return new ModelAttributes(attributes, propertyAttributes: null, parameterAttributes: null);
+        }
+
+        /// <summary>
+        /// Gets the attributes for the given <paramref name="parameterInfo"/>.
+        /// </summary>
+        /// <param name="parameterInfo">
+        /// The <see cref="ParameterInfo"/> for which attributes need to be resolved.
+        /// </param>
+        /// <returns>
+        /// A <see cref="ModelAttributes"/> instance with the attributes of the parameter and its <see cref="Type"/>.
+        /// </returns>
+        public static ModelAttributes GetAttributesForParameter(ParameterInfo parameterInfo)
+        {
+            // Prior versions called IModelMetadataProvider.GetMetadataForType(...) and therefore
+            // GetAttributesForType(...) for parameters. Maintain that set of attributes (including those from an
+            // ModelMetadataTypeAttribute reference) for back-compatibility.
+            var typeAttributes = GetAttributesForType(parameterInfo.ParameterType).TypeAttributes;
+            var parameterAttributes = parameterInfo.GetCustomAttributes();
+
+            return new ModelAttributes(typeAttributes, propertyAttributes: null, parameterAttributes);
+        }
+
+        /// <summary>
+        /// Gets the attributes for the given <paramref name="parameterInfo"/> with the specified <paramref name="modelType"/>.
+        /// </summary>
+        /// <param name="parameterInfo">
+        /// The <see cref="ParameterInfo"/> for which attributes need to be resolved.
+        /// </param>
+        /// <param name="modelType">The model type.</param>
+        /// <returns>
+        /// A <see cref="ModelAttributes"/> instance with the attributes of the parameter and its <see cref="Type"/>.
+        /// </returns>
+        internal static ModelAttributes GetAttributesForParameter(ParameterInfo parameterInfo, Type modelType)
+        {
+            if (parameterInfo == null)
+            {
+                throw new ArgumentNullException(nameof(parameterInfo));
+            }
+
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            // Prior versions called IModelMetadataProvider.GetMetadataForType(...) and therefore
+            // GetAttributesForType(...) for parameters. Maintain that set of attributes (including those from an
+            // ModelMetadataTypeAttribute reference) for back-compatibility.
+            var typeAttributes = GetAttributesForType(modelType).TypeAttributes;
+            var parameterAttributes = parameterInfo.GetCustomAttributes();
+
+            return new ModelAttributes(typeAttributes, propertyAttributes: null, parameterAttributes);
+        }
+
+        private static Type GetMetadataType(Type type)
+        {
+            return type.GetCustomAttribute<ModelMetadataTypeAttribute>()?.MetadataType;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ValidationMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ValidationMetadata.cs
new file mode 100644
index 0000000000..bd4ff327aa
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ValidationMetadata.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    /// <summary>
+    /// Validation metadata details for a <see cref="ModelMetadata"/>.
+    /// </summary>
+    public class ValidationMetadata
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether or not the model is a required value. Will be ignored
+        /// if the model metadata being created is not a property. If <c>null</c> then
+        /// <see cref="ModelMetadata.IsRequired"/> will be computed based on the model <see cref="System.Type"/>.
+        /// See <see cref="ModelMetadata.IsRequired"/>.
+        /// </summary>
+        public bool? IsRequired { get; set; }
+
+        /// <summary>
+        /// Gets or sets an <see cref="IPropertyValidationFilter"/> implementation that indicates whether this model
+        /// should be validated. See <see cref="ModelMetadata.PropertyValidationFilter"/>.
+        /// </summary>
+        public IPropertyValidationFilter PropertyValidationFilter { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value that indicates whether children of the model should be validated. If <c>null</c>
+        /// then <see cref="ModelMetadata.ValidateChildren"/> will be <c>true</c> if either of
+        /// <see cref="ModelMetadata.IsComplexType"/> or <see cref="ModelMetadata.IsEnumerableType"/> is <c>true</c>;
+        /// <c>false</c> otherwise.
+        /// </summary>
+        public bool? ValidateChildren { get; set; }
+
+        /// <summary>
+        /// Gets a list of metadata items for validators.
+        /// </summary>
+        /// <remarks>
+        /// <see cref="IValidationMetadataProvider"/> implementations should store metadata items
+        /// in this list, to be consumed later by an <see cref="Validation.IModelValidatorProvider"/>.
+        /// </remarks>
+        public IList<object> ValidatorMetadata { get; } = new List<object>();
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ValidationMetadataProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ValidationMetadataProviderContext.cs
new file mode 100644
index 0000000000..84cfdd76bf
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ValidationMetadataProviderContext.cs
@@ -0,0 +1,61 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    /// <summary>
+    /// A context for an <see cref="IValidationMetadataProvider"/>.
+    /// </summary>
+    public class ValidationMetadataProviderContext
+    {
+        /// <summary>
+        /// Creates a new <see cref="ValidationMetadataProviderContext"/>.
+        /// </summary>
+        /// <param name="key">The <see cref="ModelMetadataIdentity"/> for the <see cref="ModelMetadata"/>.</param>
+        /// <param name="attributes">The attributes for the <see cref="ModelMetadata"/>.</param>
+        public ValidationMetadataProviderContext(
+            ModelMetadataIdentity key,
+            ModelAttributes attributes)
+        {
+            if (attributes == null)
+            {
+                throw new ArgumentNullException(nameof(attributes));
+            }
+
+            Key = key;
+            Attributes = attributes.Attributes;
+            PropertyAttributes = attributes.PropertyAttributes;
+            TypeAttributes = attributes.TypeAttributes;
+
+            ValidationMetadata = new ValidationMetadata();
+        }
+
+        /// <summary>
+        /// Gets the attributes.
+        /// </summary>
+        public IReadOnlyList<object> Attributes { get; }
+
+        /// <summary>
+        /// Gets the <see cref="ModelMetadataIdentity"/>.
+        /// </summary>
+        public ModelMetadataIdentity Key { get; }
+
+        /// <summary>
+        /// Gets the property attributes.
+        /// </summary>
+        public IReadOnlyList<object> PropertyAttributes { get; }
+
+        /// <summary>
+        /// Gets the type attributes.
+        /// </summary>
+        public IReadOnlyList<object> TypeAttributes { get; }
+
+        /// <summary>
+        /// Gets the <see cref="Metadata.ValidationMetadata"/>.
+        /// </summary>
+        public ValidationMetadata ValidationMetadata { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderFactory.cs
new file mode 100644
index 0000000000..216fc7c803
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderFactory.cs
@@ -0,0 +1,365 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// A factory for <see cref="IModelBinder"/> instances.
+    /// </summary>
+    public class ModelBinderFactory : IModelBinderFactory
+    {
+        private readonly IModelMetadataProvider _metadataProvider;
+        private readonly IModelBinderProvider[] _providers;
+        private readonly ConcurrentDictionary<Key, IModelBinder> _cache;
+        private readonly IServiceProvider _serviceProvider;
+
+        /// <summary>
+        /// <para>This constructor is obsolete and will be removed in a future version. The recommended alternative
+        /// is the overload that also takes an <see cref="IServiceProvider"/>.</para>
+        /// <para>Creates a new <see cref="ModelBinderFactory"/>.</para>
+        /// </summary>
+        /// <param name="metadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
+        /// <param name="options">The <see cref="IOptions{TOptions}"/> for <see cref="MvcOptions"/>.</param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version. The recommended alternative"
+            + " is the overload that also takes an " + nameof(IServiceProvider) + ".")]
+        public ModelBinderFactory(IModelMetadataProvider metadataProvider, IOptions<MvcOptions> options)
+            : this(metadataProvider, options, GetDefaultServices())
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="ModelBinderFactory"/>.
+        /// </summary>
+        /// <param name="metadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
+        /// <param name="options">The <see cref="IOptions{TOptions}"/> for <see cref="MvcOptions"/>.</param>
+        /// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
+        public ModelBinderFactory(
+            IModelMetadataProvider metadataProvider,
+            IOptions<MvcOptions> options,
+            IServiceProvider serviceProvider)
+        {
+            _metadataProvider = metadataProvider;
+            _providers = options.Value.ModelBinderProviders.ToArray();
+            _serviceProvider = serviceProvider;
+            _cache = new ConcurrentDictionary<Key, IModelBinder>();
+
+            var loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();
+            var logger = loggerFactory.CreateLogger<ModelBinderFactory>();
+            logger.RegisteredModelBinderProviders(_providers);
+        }
+
+        /// <inheritdoc />
+        public IModelBinder CreateBinder(ModelBinderFactoryContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (_providers.Length == 0)
+            {
+                throw new InvalidOperationException(Resources.FormatModelBinderProvidersAreRequired(
+                    typeof(MvcOptions).FullName,
+                    nameof(MvcOptions.ModelBinderProviders),
+                    typeof(IModelBinderProvider).FullName));
+            }
+
+            if (TryGetCachedBinder(context.Metadata, context.CacheToken, out var binder))
+            {
+                return binder;
+            }
+
+            // Perf: We're calling the Uncached version of the API here so we can:
+            // 1. avoid allocating a context when the value is already cached
+            // 2. avoid checking the cache twice when the value is not cached
+            var providerContext = new DefaultModelBinderProviderContext(this, context);
+            binder = CreateBinderCoreUncached(providerContext, context.CacheToken);
+            if (binder == null)
+            {
+                var message = Resources.FormatCouldNotCreateIModelBinder(providerContext.Metadata.ModelType);
+                throw new InvalidOperationException(message);
+            }
+
+            Debug.Assert(!(binder is PlaceholderBinder));
+            AddToCache(context.Metadata, context.CacheToken, binder);
+
+            return binder;
+        }
+
+        // Called by the DefaultModelBinderProviderContext when we're recursively creating a binder
+        // so that all intermediate results can be cached.
+        private IModelBinder CreateBinderCoreCached(DefaultModelBinderProviderContext providerContext, object token)
+        {
+            if (TryGetCachedBinder(providerContext.Metadata, token, out var binder))
+            {
+                return binder;
+            }
+
+            // We're definitely creating a binder for an non-root node here, so it's OK for binder creation
+            // to fail.
+            binder = CreateBinderCoreUncached(providerContext, token) ?? NoOpBinder.Instance;
+
+            if (!(binder is PlaceholderBinder))
+            {
+                AddToCache(providerContext.Metadata, token, binder);
+            }
+
+            return binder;
+        }
+
+        private IModelBinder CreateBinderCoreUncached(DefaultModelBinderProviderContext providerContext, object token)
+        {
+            if (!providerContext.Metadata.IsBindingAllowed)
+            {
+                return NoOpBinder.Instance;
+            }
+
+            // A non-null token will usually be passed in at the top level (ParameterDescriptor likely).
+            // This prevents us from treating a parameter the same as a collection-element - which could
+            // happen looking at just model metadata.
+            var key = new Key(providerContext.Metadata, token);
+
+            // The providerContext.Visited is used here to break cycles in recursion. We need a separate
+            // per-operation cache for cycle breaking because the global cache (_cache) needs to always stay
+            // in a valid state.
+            //
+            // We store null as a sentinel inside the providerContext.Visited to track the fact that we've visited
+            // a given node but haven't yet created a binder for it. We don't want to eagerly create a
+            // PlaceholderBinder because that would result in lots of unnecessary indirection and allocations.
+            var visited = providerContext.Visited;
+
+            if (visited.TryGetValue(key, out var binder))
+            {
+                if (binder != null)
+                {
+                    return binder;
+                }
+
+                // If we're currently recursively building a binder for this type, just return
+                // a PlaceholderBinder. We'll fix it up later to point to the 'real' binder
+                // when the stack unwinds.
+                binder = new PlaceholderBinder();
+                visited[key] = binder;
+                return binder;
+            }
+
+            // OK this isn't a recursive case (yet) so add an entry and then ask the providers
+            // to create the binder.
+            visited.Add(key, null);
+
+            IModelBinder result = null;
+
+            for (var i = 0; i < _providers.Length; i++)
+            {
+                var provider = _providers[i];
+                result = provider.GetBinder(providerContext);
+                if (result != null)
+                {
+                    break;
+                }
+            }
+
+            // If the PlaceholderBinder was created, then it means we recursed. Hook it up to the 'real' binder.
+            if (visited[key] is PlaceholderBinder placeholderBinder)
+            {
+                // It's also possible that user code called into `CreateBinder` but then returned null, we don't
+                // want to create something that will null-ref later so just hook this up to the no-op binder.
+                placeholderBinder.Inner = result ?? NoOpBinder.Instance;
+            }
+
+            if (result != null)
+            {
+                visited[key] = result;
+            }
+
+            return result;
+        }
+
+        private void AddToCache(ModelMetadata metadata, object cacheToken, IModelBinder binder)
+        {
+            Debug.Assert(metadata != null);
+            Debug.Assert(binder != null);
+
+            if (cacheToken == null)
+            {
+                return;
+            }
+
+            _cache.TryAdd(new Key(metadata, cacheToken), binder);
+        }
+
+        private bool TryGetCachedBinder(ModelMetadata metadata, object cacheToken, out IModelBinder binder)
+        {
+            Debug.Assert(metadata != null);
+
+            if (cacheToken == null)
+            {
+                binder = null;
+                return false;
+            }
+
+            return _cache.TryGetValue(new Key(metadata, cacheToken), out binder);
+        }
+
+        private static IServiceProvider GetDefaultServices()
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+            return services.BuildServiceProvider();
+        }
+
+        private class DefaultModelBinderProviderContext : ModelBinderProviderContext
+        {
+            private readonly ModelBinderFactory _factory;
+
+            public DefaultModelBinderProviderContext(
+                ModelBinderFactory factory,
+                ModelBinderFactoryContext factoryContext)
+            {
+                _factory = factory;
+                Metadata = factoryContext.Metadata;
+                BindingInfo bindingInfo;
+                if (factoryContext.BindingInfo != null)
+                {
+                    bindingInfo = new BindingInfo(factoryContext.BindingInfo);
+                }
+                else
+                {
+                    bindingInfo = new BindingInfo();
+                }
+
+                bindingInfo.TryApplyBindingInfo(Metadata);
+                BindingInfo = bindingInfo;
+
+                MetadataProvider = _factory._metadataProvider;
+                Visited = new Dictionary<Key, IModelBinder>();
+            }
+
+            private DefaultModelBinderProviderContext(
+                DefaultModelBinderProviderContext parent,
+                ModelMetadata metadata,
+                BindingInfo bindingInfo)
+            {
+                Metadata = metadata;
+
+                _factory = parent._factory;
+                MetadataProvider = parent.MetadataProvider;
+                Visited = parent.Visited;
+                BindingInfo = bindingInfo;
+            }
+
+            public override BindingInfo BindingInfo { get; }
+
+            public override ModelMetadata Metadata { get; }
+
+            public override IModelMetadataProvider MetadataProvider { get; }
+
+            public Dictionary<Key, IModelBinder> Visited { get; }
+
+            public override IServiceProvider Services => _factory._serviceProvider;
+
+            public override IModelBinder CreateBinder(ModelMetadata metadata)
+            {
+                return CreateBinder(
+                    metadata,
+                    new BindingInfo()
+                    {
+                        BinderModelName = metadata.BinderModelName,
+                        BinderType = metadata.BinderType,
+                        BindingSource = metadata.BindingSource,
+                        PropertyFilterProvider = metadata.PropertyFilterProvider,
+                    });
+            }
+
+            public override IModelBinder CreateBinder(ModelMetadata metadata, BindingInfo bindingInfo)
+            {
+                if (metadata == null)
+                {
+                    throw new ArgumentNullException(nameof(metadata));
+                }
+
+                if (bindingInfo == null)
+                {
+                    throw new ArgumentNullException(nameof(bindingInfo));
+                }
+
+                // For non-root nodes we use the ModelMetadata as the cache token. This ensures that all non-root
+                // nodes with the same metadata will have the same binder. This is OK because for an non-root
+                // node there's no opportunity to customize binding info like there is for a parameter.
+                var token = metadata;
+
+                var nestedContext = new DefaultModelBinderProviderContext(this, metadata, bindingInfo);
+                return _factory.CreateBinderCoreCached(nestedContext, token);
+            }
+        }
+
+        // This key allows you to specify a ModelMetadata which represents the type/property being bound
+        // and a 'token' which acts as an arbitrary discriminator.
+        //
+        // This is necessary because the same metadata might be bound as a top-level parameter (with BindingInfo on
+        // the ParameterDescriptor) or in a call to TryUpdateModel (no BindingInfo) or as a collection element.
+        //
+        // We need to be able to tell the difference between these things to avoid over-caching.
+        private struct Key : IEquatable<Key>
+        {
+            private readonly ModelMetadata _metadata;
+            private readonly object _token; // Explicitly using ReferenceEquality for tokens.
+
+            public Key(ModelMetadata metadata, object token)
+            {
+                _metadata = metadata;
+                _token = token;
+            }
+
+            public bool Equals(Key other)
+            {
+                return _metadata.Equals(other._metadata) && object.ReferenceEquals(_token, other._token);
+            }
+
+            public override bool Equals(object obj)
+            {
+                var other = obj as Key?;
+                return other.HasValue && Equals(other.Value);
+            }
+
+            public override int GetHashCode()
+            {
+                var hash = new HashCodeCombiner();
+                hash.Add(_metadata);
+                hash.Add(RuntimeHelpers.GetHashCode(_token));
+                return hash;
+            }
+
+            public override string ToString()
+            {
+                switch (_metadata.MetadataKind)
+                {
+                    case ModelMetadataKind.Parameter:
+                        return $"{_token} (Parameter: '{_metadata.ParameterName}' Type: '{_metadata.ModelType.Name}')";
+                    case ModelMetadataKind.Property:
+                        return $"{_token} (Property: '{_metadata.ContainerType.Name}.{_metadata.PropertyName}' " +
+                            $"Type: '{_metadata.ModelType.Name}')";
+                    case ModelMetadataKind.Type:
+                        return $"{_token} (Type: '{_metadata.ModelType.Name}')";
+                    default:
+                        return $"Unsupported MetadataKind '{_metadata.MetadataKind}'.";
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderFactoryContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderFactoryContext.cs
new file mode 100644
index 0000000000..3ed2b371a4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderFactoryContext.cs
@@ -0,0 +1,27 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// A context object for <see cref="ModelBinderFactory.CreateBinder"/>.
+    /// </summary>
+    public class ModelBinderFactoryContext
+    {
+        /// <summary>
+        /// Gets or sets the <see cref="ModelBinding.BindingInfo"/>.
+        /// </summary>
+        public BindingInfo BindingInfo { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ModelMetadata"/>.
+        /// </summary>
+        public ModelMetadata Metadata { get; set; }
+
+        /// <summary>
+        /// Gets or sets the cache token. If <c>non-null</c> the resulting <see cref="IModelBinder"/>
+        /// will be cached.
+        /// </summary>
+        public object CacheToken { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderProviderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderProviderExtensions.cs
new file mode 100644
index 0000000000..791959a06a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderProviderExtensions.cs
@@ -0,0 +1,56 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Extension methods for <see cref="IModelBinderProvider"/>.
+    /// </summary>
+    public static class ModelBinderProviderExtensions
+    {
+        /// <summary>
+        /// Removes all model binder providers of the specified type.
+        /// </summary>
+        /// <param name="list">The list of <see cref="IModelBinderProvider"/>s.</param>
+        /// <typeparam name="TModelBinderProvider">The type to remove.</typeparam>
+        public static void RemoveType<TModelBinderProvider>(this IList<IModelBinderProvider> list) where TModelBinderProvider : IModelBinderProvider
+        {
+            if (list == null)
+            {
+                throw new ArgumentNullException(nameof(list));
+            }
+
+            RemoveType(list, typeof(TModelBinderProvider));
+        }
+
+        /// <summary>
+        /// Removes all model binder providers of the specified type.
+        /// </summary>
+        /// <param name="list">The list of <see cref="IModelBinderProvider"/>s.</param>
+        /// <param name="type">The type to remove.</param>
+        public static void RemoveType(this IList<IModelBinderProvider> list, Type type)
+        {
+            if (list == null)
+            {
+                throw new ArgumentNullException(nameof(list));
+            }
+
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            for (var i = list.Count - 1; i >= 0; i--)
+            {
+                var modelBinderProvider = list[i];
+                if (modelBinderProvider.GetType() == type)
+                {
+                    list.RemoveAt(i);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelMetadataProviderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelMetadataProviderExtensions.cs
new file mode 100644
index 0000000000..ab2c2ab3d4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelMetadataProviderExtensions.cs
@@ -0,0 +1,54 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Core;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Extensions methods for <see cref="IModelMetadataProvider"/>.
+    /// </summary>
+    public static class ModelMetadataProviderExtensions
+    {
+        /// <summary>
+        /// Gets a <see cref="ModelMetadata"/> for property identified by the provided
+        /// <paramref name="containerType"/> and <paramref name="propertyName"/>.
+        /// </summary>
+        /// <param name="provider">The <see cref="ModelMetadata"/>.</param>
+        /// <param name="containerType">The <see cref="Type"/> for which the property is defined.</param>
+        /// <param name="propertyName">The property name.</param>
+        /// <returns>A <see cref="ModelMetadata"/> for the property.</returns>
+        public static ModelMetadata GetMetadataForProperty(
+            this IModelMetadataProvider provider,
+            Type containerType,
+            string propertyName)
+        {
+            if (provider == null)
+            {
+                throw new ArgumentNullException(nameof(provider));
+            }
+
+            if (containerType == null)
+            {
+                throw new ArgumentNullException(nameof(containerType));
+            }
+
+            if (propertyName == null)
+            {
+                throw new ArgumentNullException(nameof(propertyName));
+            }
+
+            var containerMetadata = provider.GetMetadataForType(containerType);
+
+            var propertyMetadata = containerMetadata.Properties[propertyName];
+            if (propertyMetadata == null)
+            {
+                var message = Resources.FormatCommon_PropertyNotFound(containerType, propertyName);
+                throw new ArgumentException(message, nameof(propertyName));
+            }
+
+            return propertyMetadata;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelNames.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelNames.cs
new file mode 100644
index 0000000000..185c8345e0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelNames.cs
@@ -0,0 +1,43 @@
+// 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.
+
+using System;
+using System.Globalization;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public static class ModelNames
+    {
+        public static string CreateIndexModelName(string parentName, int index)
+        {
+            return CreateIndexModelName(parentName, index.ToString(CultureInfo.InvariantCulture));
+        }
+
+        public static string CreateIndexModelName(string parentName, string index)
+        {
+            return (parentName.Length == 0) ? "[" + index + "]" : parentName + "[" + index + "]";
+        }
+
+        public static string CreatePropertyModelName(string prefix, string propertyName)
+        {
+            if (string.IsNullOrEmpty(prefix))
+            {
+                return propertyName ?? string.Empty;
+            }
+
+            if (string.IsNullOrEmpty(propertyName))
+            {
+                return prefix ?? string.Empty;
+            }
+
+            if (propertyName.StartsWith("[", StringComparison.Ordinal))
+            {
+                // The propertyName might represent an indexer access, in which case combining
+                // with a 'dot' would be invalid. This case occurs only when called from ValidationVisitor.
+                return prefix + propertyName;
+            }
+
+            return prefix + "." + propertyName;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ObjectModelValidator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ObjectModelValidator.cs
new file mode 100644
index 0000000000..0b89489a5f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ObjectModelValidator.cs
@@ -0,0 +1,108 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Provides a base <see cref="IObjectModelValidator"/> implementation for validating an object graph.
+    /// </summary>
+    public abstract class ObjectModelValidator : IObjectModelValidator
+    {
+        private readonly IModelMetadataProvider _modelMetadataProvider;
+        private readonly ValidatorCache _validatorCache;
+        private readonly CompositeModelValidatorProvider _validatorProvider;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ObjectModelValidator"/>.
+        /// </summary>
+        /// <param name="modelMetadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
+        /// <param name="validatorProviders">The list of <see cref="IModelValidatorProvider"/>.</param>
+        public ObjectModelValidator(
+            IModelMetadataProvider modelMetadataProvider,
+            IList<IModelValidatorProvider> validatorProviders)
+        {
+            if (modelMetadataProvider == null)
+            {
+                throw new ArgumentNullException(nameof(modelMetadataProvider));
+            }
+
+            if (validatorProviders == null)
+            {
+                throw new ArgumentNullException(nameof(validatorProviders));
+            }
+
+            _modelMetadataProvider = modelMetadataProvider;
+            _validatorCache = new ValidatorCache();
+
+            _validatorProvider = new CompositeModelValidatorProvider(validatorProviders);
+        }
+
+        /// <inheritdoc />
+        public virtual void Validate(
+            ActionContext actionContext,
+            ValidationStateDictionary validationState,
+            string prefix,
+            object model)
+        {
+            var visitor = GetValidationVisitor(
+                actionContext,
+                _validatorProvider,
+                _validatorCache,
+                _modelMetadataProvider,
+                validationState);
+
+            var metadata = model == null ? null : _modelMetadataProvider.GetMetadataForType(model.GetType());
+            visitor.Validate(metadata, prefix, model, alwaysValidateAtTopLevel: false);
+        }
+
+        /// <summary>
+        /// Validates the provided object model.
+        /// If <paramref name="model"/> is <see langword="null"/> and the <paramref name="metadata"/>'s
+        /// <see cref="ModelMetadata.IsRequired"/> is <see langword="true"/>, will add one or more
+        /// model state errors that <see cref="Validate(ActionContext, ValidationStateDictionary, string, object)"/>
+        /// would not.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/>.</param>
+        /// <param name="validationState">The <see cref="ValidationStateDictionary"/>.</param>
+        /// <param name="prefix">The model prefix key.</param>
+        /// <param name="model">The model object.</param>
+        /// <param name="metadata">The <see cref="ModelMetadata"/>.</param>
+        public virtual void Validate(
+            ActionContext actionContext,
+            ValidationStateDictionary validationState,
+            string prefix,
+            object model,
+            ModelMetadata metadata)
+        {
+            var visitor = GetValidationVisitor(
+                actionContext,
+                _validatorProvider,
+                _validatorCache,
+                _modelMetadataProvider,
+                validationState);
+
+            visitor.Validate(metadata, prefix, model, alwaysValidateAtTopLevel: metadata.IsRequired);
+        }
+
+        /// <summary>
+        /// Gets a <see cref="ValidationVisitor"/> that traverses the object model graph and performs validation.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/>.</param>
+        /// <param name="validatorProvider">The <see cref="IModelValidatorProvider"/>.</param>
+        /// <param name="validatorCache">The <see cref="ValidatorCache"/>.</param>
+        /// <param name="metadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
+        /// <param name="validationState">The <see cref="ValidationStateDictionary"/>.</param>
+        /// <returns>A <see cref="ValidationVisitor"/> which traverses the object model graph.</returns>
+        public abstract ValidationVisitor GetValidationVisitor(
+            ActionContext actionContext,
+            IModelValidatorProvider validatorProvider,
+            ValidatorCache validatorCache,
+            IModelMetadataProvider metadataProvider,
+            ValidationStateDictionary validationState);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ParameterBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ParameterBinder.cs
new file mode 100644
index 0000000000..7a04fe8be3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ParameterBinder.cs
@@ -0,0 +1,371 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Binds and validates models specified by a <see cref="ParameterDescriptor"/>.
+    /// </summary>
+    public class ParameterBinder
+    {
+        private readonly IModelMetadataProvider _modelMetadataProvider;
+        private readonly IModelBinderFactory _modelBinderFactory;
+        private readonly MvcOptions _mvcOptions;
+        private readonly IObjectModelValidator _objectModelValidator;
+
+        /// <summary>
+        /// <para>This constructor is obsolete and will be removed in a future version. The recommended alternative
+        /// is the overload that also takes a <see cref="MvcOptions"/> accessor and an <see cref="ILoggerFactory"/>.
+        /// </para>
+        /// <para>Initializes a new instance of <see cref="ParameterBinder"/>.</para>
+        /// </summary>
+        /// <param name="modelMetadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
+        /// <param name="modelBinderFactory">The <see cref="IModelBinderFactory"/>.</param>
+        /// <param name="validator">The <see cref="IObjectModelValidator"/>.</param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version. The recommended alternative"
+            + " is the overload that also takes a " + nameof(MvcOptions) + " accessor and an "
+            + nameof(ILoggerFactory) + " .")]
+        public ParameterBinder(
+            IModelMetadataProvider modelMetadataProvider,
+            IModelBinderFactory modelBinderFactory,
+            IObjectModelValidator validator)
+            : this(
+                  modelMetadataProvider,
+                  modelBinderFactory,
+                  validator,
+                  Options.Create(new MvcOptions()),
+                  NullLoggerFactory.Instance)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ParameterBinder"/>.
+        /// </summary>
+        /// <param name="modelMetadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
+        /// <param name="modelBinderFactory">The <see cref="IModelBinderFactory"/>.</param>
+        /// <param name="validator">The <see cref="IObjectModelValidator"/>.</param>
+        /// <param name="mvcOptions">The <see cref="MvcOptions"/> accessor.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public ParameterBinder(
+            IModelMetadataProvider modelMetadataProvider,
+            IModelBinderFactory modelBinderFactory,
+            IObjectModelValidator validator,
+            IOptions<MvcOptions> mvcOptions,
+            ILoggerFactory loggerFactory)
+        {
+            if (modelMetadataProvider == null)
+            {
+                throw new ArgumentNullException(nameof(modelMetadataProvider));
+            }
+
+            if (modelBinderFactory == null)
+            {
+                throw new ArgumentNullException(nameof(modelBinderFactory));
+            }
+
+            if (validator == null)
+            {
+                throw new ArgumentNullException(nameof(validator));
+            }
+
+            if (mvcOptions == null)
+            {
+                throw new ArgumentNullException(nameof(mvcOptions));
+            }
+
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            _modelMetadataProvider = modelMetadataProvider;
+            _modelBinderFactory = modelBinderFactory;
+            _objectModelValidator = validator;
+            _mvcOptions = mvcOptions.Value;
+            Logger = loggerFactory.CreateLogger(GetType());
+        }
+
+        /// <summary>
+        /// The <see cref="ILogger"/> used for logging in this binder.
+        /// </summary>
+        protected ILogger Logger { get; }
+
+        /// <summary>
+        /// Initializes and binds a model specified by <paramref name="parameter"/>.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/>.</param>
+        /// <param name="valueProvider">The <see cref="IValueProvider"/>.</param>
+        /// <param name="parameter">The <see cref="ParameterDescriptor"/></param>
+        /// <returns>The result of model binding.</returns>
+        public Task<ModelBindingResult> BindModelAsync(
+            ActionContext actionContext,
+            IValueProvider valueProvider,
+            ParameterDescriptor parameter)
+        {
+            return BindModelAsync(actionContext, valueProvider, parameter, value: null);
+        }
+
+        /// <summary>
+        /// Binds a model specified by <paramref name="parameter"/> using <paramref name="value"/> as the initial value.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/>.</param>
+        /// <param name="valueProvider">The <see cref="IValueProvider"/>.</param>
+        /// <param name="parameter">The <see cref="ParameterDescriptor"/></param>
+        /// <param name="value">The initial model value.</param>
+        /// <returns>The result of model binding.</returns>
+        public virtual Task<ModelBindingResult> BindModelAsync(
+            ActionContext actionContext,
+            IValueProvider valueProvider,
+            ParameterDescriptor parameter,
+            object value)
+        {
+            if (actionContext == null)
+            {
+                throw new ArgumentNullException(nameof(actionContext));
+            }
+
+            if (valueProvider == null)
+            {
+                throw new ArgumentNullException(nameof(valueProvider));
+            }
+
+            if (parameter == null)
+            {
+                throw new ArgumentNullException(nameof(parameter));
+            }
+
+            var metadata = _modelMetadataProvider.GetMetadataForType(parameter.ParameterType);
+            var binder = _modelBinderFactory.CreateBinder(new ModelBinderFactoryContext
+            {
+                BindingInfo = parameter.BindingInfo,
+                Metadata = metadata,
+                CacheToken = parameter,
+            });
+
+            return BindModelAsync(
+                actionContext,
+                binder,
+                valueProvider,
+                parameter,
+                metadata,
+                value);
+        }
+
+        /// <summary>
+        /// Binds a model specified by <paramref name="parameter"/> using <paramref name="value"/> as the initial value.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/>.</param>
+        /// <param name="modelBinder">The <see cref="IModelBinder"/>.</param>
+        /// <param name="valueProvider">The <see cref="IValueProvider"/>.</param>
+        /// <param name="parameter">The <see cref="ParameterDescriptor"/></param>
+        /// <param name="metadata">The <see cref="ModelMetadata"/>.</param>
+        /// <param name="value">The initial model value.</param>
+        /// <returns>The result of model binding.</returns>
+        public virtual async Task<ModelBindingResult> BindModelAsync(
+            ActionContext actionContext,
+            IModelBinder modelBinder,
+            IValueProvider valueProvider,
+            ParameterDescriptor parameter,
+            ModelMetadata metadata,
+            object value)
+        {
+            if (actionContext == null)
+            {
+                throw new ArgumentNullException(nameof(actionContext));
+            }
+
+            if (modelBinder == null)
+            {
+                throw new ArgumentNullException(nameof(modelBinder));
+            }
+
+            if (valueProvider == null)
+            {
+                throw new ArgumentNullException(nameof(valueProvider));
+            }
+
+            if (parameter == null)
+            {
+                throw new ArgumentNullException(nameof(parameter));
+            }
+
+            if (metadata == null)
+            {
+                throw new ArgumentNullException(nameof(metadata));
+            }
+
+            if (parameter.BindingInfo?.RequestPredicate?.Invoke(actionContext) == false)
+            {
+                return ModelBindingResult.Failed();
+            }
+
+            var modelBindingContext = DefaultModelBindingContext.CreateBindingContext(
+                actionContext,
+                valueProvider,
+                metadata,
+                parameter.BindingInfo,
+                parameter.Name);
+            modelBindingContext.Model = value;
+
+            Logger.AttemptingToBindParameterOrProperty(parameter, modelBindingContext);
+
+            var parameterModelName = parameter.BindingInfo?.BinderModelName ?? metadata.BinderModelName;
+            if (parameterModelName != null)
+            {
+                // The name was set explicitly, always use that as the prefix.
+                modelBindingContext.ModelName = parameterModelName;
+            }
+            else if (modelBindingContext.ValueProvider.ContainsPrefix(parameter.Name))
+            {
+                // We have a match for the parameter name, use that as that prefix.
+                modelBindingContext.ModelName = parameter.Name;
+            }
+            else
+            {
+                // No match, fallback to empty string as the prefix.
+                modelBindingContext.ModelName = string.Empty;
+            }
+
+            await modelBinder.BindModelAsync(modelBindingContext);
+
+            Logger.DoneAttemptingToBindParameterOrProperty(parameter, modelBindingContext);
+
+            var modelBindingResult = modelBindingContext.Result;
+
+            if (_mvcOptions.AllowValidatingTopLevelNodes &&
+                _objectModelValidator is ObjectModelValidator baseObjectValidator)
+            {
+                Logger.AttemptingToValidateParameterOrProperty(parameter, modelBindingContext);
+
+                EnforceBindRequiredAndValidate(
+                    baseObjectValidator,
+                    actionContext,
+                    parameter,
+                    metadata,
+                    modelBindingContext,
+                    modelBindingResult);
+
+                Logger.DoneAttemptingToValidateParameterOrProperty(parameter, modelBindingContext);
+            }
+            else
+            {
+                // For legacy implementations (which directly implemented IObjectModelValidator), fall back to the
+                // back-compatibility logic. In this scenario, top-level validation attributes will be ignored like
+                // they were historically.
+                if (modelBindingResult.IsModelSet)
+                {
+                    _objectModelValidator.Validate(
+                        actionContext,
+                        modelBindingContext.ValidationState,
+                        modelBindingContext.ModelName,
+                        modelBindingResult.Model);
+                }
+            }
+
+            return modelBindingResult;
+        }
+
+        private void EnforceBindRequiredAndValidate(
+            ObjectModelValidator baseObjectValidator,
+            ActionContext actionContext,
+            ParameterDescriptor parameter,
+            ModelMetadata metadata,
+            ModelBindingContext modelBindingContext,
+            ModelBindingResult modelBindingResult)
+        {
+            RecalculateModelMetadata(parameter, modelBindingResult, ref metadata);
+
+            if (!modelBindingResult.IsModelSet && metadata.IsBindingRequired)
+            {
+                // Enforce BindingBehavior.Required (e.g., [BindRequired])
+                var modelName = modelBindingContext.FieldName;
+                var message = metadata.ModelBindingMessageProvider.MissingBindRequiredValueAccessor(modelName);
+                actionContext.ModelState.TryAddModelError(modelName, message);
+            }
+            else if (modelBindingResult.IsModelSet)
+            {
+                // Enforce any other validation rules
+                baseObjectValidator.Validate(
+                    actionContext,
+                    modelBindingContext.ValidationState,
+                    modelBindingContext.ModelName,
+                    modelBindingResult.Model,
+                    metadata);
+            }
+            else if (metadata.IsRequired)
+            {
+                // We need to special case the model name for cases where a 'fallback' to empty
+                // prefix occurred but binding wasn't successful. For these cases there will be no
+                // entry in validation state to match and determine the correct key.
+                //
+                // See https://github.com/aspnet/Mvc/issues/7503
+                //
+                // This is to avoid adding validation errors for an 'empty' prefix when a simple
+                // type fails to bind. The fix for #7503 uncovered this issue, and was likely the
+                // original problem being worked around that regressed #7503.
+                var modelName = modelBindingContext.ModelName;
+
+                if (string.IsNullOrEmpty(modelBindingContext.ModelName) &&
+                    parameter.BindingInfo?.BinderModelName == null)
+                {
+                    // If we get here then this is a fallback case. The model name wasn't explicitly set
+                    // and we ended up with an empty prefix.
+                    modelName = modelBindingContext.FieldName;
+                }
+                
+                // Run validation, we expect this to validate [Required].
+                baseObjectValidator.Validate(
+                    actionContext,
+                    modelBindingContext.ValidationState,
+                    modelName,
+                    modelBindingResult.Model,
+                    metadata);
+            }
+        }
+
+        private void RecalculateModelMetadata(
+            ParameterDescriptor parameter,
+            ModelBindingResult modelBindingResult,
+            ref ModelMetadata metadata)
+        {
+            // Attempt to recalculate ModelMetadata for top level parameters and properties using the actual
+            // model type. This ensures validation uses a combination of top-level validation metadata
+            // as well as metadata on the actual, rather than declared, model type.
+
+            if (!modelBindingResult.IsModelSet ||
+                modelBindingResult.Model == null ||
+                !(_modelMetadataProvider is IModelMetadataProvider2 modelMetadataProvider))
+            {
+                return;
+            }
+
+            var modelType = modelBindingResult.Model.GetType();
+            if (parameter is IParameterInfoParameterDescriptor parameterInfoParameter)
+            {
+                var parameterInfo = parameterInfoParameter.ParameterInfo;
+                if (modelType != parameterInfo.ParameterType)
+                {
+                    metadata = modelMetadataProvider.GetMetadataForParameter(parameterInfo, modelType);
+                }
+            }
+            else if (parameter is IPropertyInfoParameterDescriptor propertyInfoParameter)
+            {
+                var propertyInfo = propertyInfoParameter.PropertyInfo;
+                if (modelType != propertyInfo.PropertyType)
+                {
+                    metadata = modelMetadataProvider.GetMetadataForProperty(propertyInfo, modelType);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/QueryStringValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/QueryStringValueProvider.cs
new file mode 100644
index 0000000000..a905d72752
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/QueryStringValueProvider.cs
@@ -0,0 +1,98 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// An <see cref="IValueProvider"/> adapter for data stored in an <see cref="IQueryCollection"/>.
+    /// </summary>
+    public class QueryStringValueProvider : BindingSourceValueProvider, IEnumerableValueProvider
+    {
+        private readonly CultureInfo _culture;
+        private readonly IQueryCollection _values;
+        private PrefixContainer _prefixContainer;
+
+        /// <summary>
+        /// Creates a value provider for <see cref="IQueryCollection"/>.
+        /// </summary>
+        /// <param name="bindingSource">The <see cref="BindingSource"/> for the data.</param>
+        /// <param name="values">The key value pairs to wrap.</param>
+        /// <param name="culture">The culture to return with ValueProviderResult instances.</param>
+        public QueryStringValueProvider(
+            BindingSource bindingSource,
+            IQueryCollection values,
+            CultureInfo culture)
+            : base(bindingSource)
+        {
+            if (bindingSource == null)
+            {
+                throw new ArgumentNullException(nameof(bindingSource));
+            }
+
+            if (values == null)
+            {
+                throw new ArgumentNullException(nameof(values));
+            }
+
+            _values = values;
+            _culture = culture;
+        }
+
+        public CultureInfo Culture => _culture;
+
+        protected PrefixContainer PrefixContainer
+        {
+            get
+            {
+                if (_prefixContainer == null)
+                {
+                    _prefixContainer = new PrefixContainer(_values.Keys);
+                }
+
+                return _prefixContainer;
+            }
+        }
+
+        /// <inheritdoc />
+        public override bool ContainsPrefix(string prefix)
+        {
+            return PrefixContainer.ContainsPrefix(prefix);
+        }
+
+        /// <inheritdoc />
+        public virtual IDictionary<string, string> GetKeysFromPrefix(string prefix)
+        {
+            if (prefix == null)
+            {
+                throw new ArgumentNullException(nameof(prefix));
+            }
+
+            return PrefixContainer.GetKeysFromPrefix(prefix);
+        }
+
+        /// <inheritdoc />
+        public override ValueProviderResult GetValue(string key)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            var values = _values[key];
+            if (values.Count == 0)
+            {
+                return ValueProviderResult.None;
+            }
+            else
+            {
+                return new ValueProviderResult(values, _culture);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/QueryStringValueProviderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/QueryStringValueProviderFactory.cs
new file mode 100644
index 0000000000..b6e620df82
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/QueryStringValueProviderFactory.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using System;
+using System.Globalization;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// A <see cref="IValueProviderFactory"/> that creates <see cref="IValueProvider"/> instances that
+    /// read values from the request query-string.
+    /// </summary>
+    public class QueryStringValueProviderFactory : IValueProviderFactory
+    {
+        /// <inheritdoc />
+        public Task CreateValueProviderAsync(ValueProviderFactoryContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var query = context.ActionContext.HttpContext.Request.Query;
+            if (query != null && query.Count > 0)
+            {
+                var valueProvider = new QueryStringValueProvider(
+                    BindingSource.Query,
+                    query,
+                    CultureInfo.InvariantCulture);
+
+                context.ValueProviders.Add(valueProvider);
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/RouteValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/RouteValueProvider.cs
new file mode 100644
index 0000000000..72f556c1c0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/RouteValueProvider.cs
@@ -0,0 +1,101 @@
+// 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.
+
+using System;
+using System.Globalization;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Routing;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// An <see cref="IValueProvider"/> adapter for data stored in an <see cref="RouteValueDictionary"/>.
+    /// </summary>
+    public class RouteValueProvider : BindingSourceValueProvider
+    {
+        private readonly RouteValueDictionary _values;
+        private PrefixContainer _prefixContainer;
+
+        /// <summary>
+        /// Creates a new <see cref="RouteValueProvider"/>.
+        /// </summary>
+        /// <param name="bindingSource">The <see cref="BindingSource"/> of the data.</param>
+        /// <param name="values">The values.</param>
+        /// <remarks>Sets <see cref="Culture"/> to <see cref="CultureInfo.InvariantCulture" />.</remarks>
+        public RouteValueProvider(
+            BindingSource bindingSource,
+            RouteValueDictionary values)
+            : this(bindingSource, values, CultureInfo.InvariantCulture)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="RouteValueProvider"/>. 
+        /// </summary>
+        /// <param name="bindingSource">The <see cref="BindingSource"/> of the data.</param>
+        /// <param name="values">The values.</param>
+        /// <param name="culture">The culture for route value.</param>
+        public RouteValueProvider(BindingSource bindingSource, RouteValueDictionary values, CultureInfo culture)
+            : base(bindingSource)
+        {
+            if (bindingSource == null)
+            {
+                throw new ArgumentNullException(nameof(bindingSource));
+            }
+
+            if (values == null)
+            {
+                throw new ArgumentNullException(nameof(values));
+            }
+
+            if (culture == null)
+            {
+                throw new ArgumentNullException(nameof(culture));
+            }
+
+            _values = values;
+            Culture = culture;
+        }
+
+        protected PrefixContainer PrefixContainer
+        {
+            get
+            {
+                if (_prefixContainer == null)
+                {
+                    _prefixContainer = new PrefixContainer(_values.Keys);
+                }
+
+                return _prefixContainer;
+            }
+        }
+
+        protected CultureInfo Culture { get; }
+
+        /// <inheritdoc />
+        public override bool ContainsPrefix(string key)
+        {
+            return PrefixContainer.ContainsPrefix(key);
+        }
+
+        /// <inheritdoc />
+        public override ValueProviderResult GetValue(string key)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            object value;
+            if (_values.TryGetValue(key, out value))
+            {
+                var stringValue = value as string ?? value?.ToString() ?? string.Empty;
+                return new ValueProviderResult(stringValue, Culture);
+            }
+            else
+            {
+                return ValueProviderResult.None;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/RouteValueProviderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/RouteValueProviderFactory.cs
new file mode 100644
index 0000000000..c87ca932dc
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/RouteValueProviderFactory.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// A <see cref="IValueProviderFactory"/> for creating <see cref="RouteValueProvider"/> instances.
+    /// </summary>
+    public class RouteValueProviderFactory : IValueProviderFactory
+    {
+        /// <inheritdoc />
+        public Task CreateValueProviderAsync(ValueProviderFactoryContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var valueProvider = new RouteValueProvider(
+                BindingSource.Path,
+                context.ActionContext.RouteData.Values);
+
+            context.ValueProviders.Add(valueProvider);
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/SuppressChildValidationMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/SuppressChildValidationMetadataProvider.cs
new file mode 100644
index 0000000000..5c10bfdcb3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/SuppressChildValidationMetadataProvider.cs
@@ -0,0 +1,109 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// An <see cref="IValidationMetadataProvider"/> which configures <see cref="ModelMetadata.ValidateChildren"/> to
+    /// <c>false</c> for matching types.
+    /// </summary>
+    public class SuppressChildValidationMetadataProvider : IValidationMetadataProvider
+    {
+        /// <summary>
+        /// Creates a new <see cref="SuppressChildValidationMetadataProvider"/> for the given <paramref name="type"/>.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="Type"/>. This <see cref="Type"/> and all assignable values will have
+        /// <see cref="ModelMetadata.ValidateChildren"/> set to <c>false</c>.
+        /// </param>
+        public SuppressChildValidationMetadataProvider(Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            Type = type;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="SuppressChildValidationMetadataProvider"/> for the given <paramref name="fullTypeName"/>.
+        /// </summary>
+        /// <param name="fullTypeName">
+        /// The type full name. This type and all of its subclasses will have
+        /// <see cref="ModelMetadata.ValidateChildren"/> set to <c>false</c>.
+        /// </param>
+        public SuppressChildValidationMetadataProvider(string fullTypeName)
+        {
+            if (fullTypeName == null)
+            {
+                throw new ArgumentNullException(nameof(fullTypeName));
+            }
+
+            FullTypeName = fullTypeName;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Type"/> for which to suppress validation of children.
+        /// </summary>
+        public Type Type { get; }
+
+        /// <summary>
+        /// Gets the full name of a type for which to suppress validation of children.
+        /// </summary>
+        public string FullTypeName { get; }
+
+        /// <inheritdoc />
+        public void CreateValidationMetadata(ValidationMetadataProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (Type != null)
+            {
+                if (Type.IsAssignableFrom(context.Key.ModelType))
+                {
+                    context.ValidationMetadata.ValidateChildren = false;
+                }
+
+                return;
+            }
+
+            if (FullTypeName != null)
+            {
+                if (IsMatchingName(context.Key.ModelType))
+                {
+                    context.ValidationMetadata.ValidateChildren = false;
+                }
+
+                return;
+            }
+
+            Debug.Fail("We shouldn't get here.");
+        }
+
+        private bool IsMatchingName(Type type)
+        {
+            Debug.Assert(FullTypeName != null);
+
+            if (type == null)
+            {
+                return false;
+            }
+
+            if (string.Equals(type.FullName, FullTypeName, StringComparison.Ordinal))
+            {
+                return true;
+            }
+
+            return IsMatchingName(type.GetTypeInfo().BaseType);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/UnsupportedContentTypeException.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/UnsupportedContentTypeException.cs
new file mode 100644
index 0000000000..d9c1000af9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/UnsupportedContentTypeException.cs
@@ -0,0 +1,28 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// The <see cref="Exception"/> that is added to model state when a model binder for the body of the request is
+    /// unable to understand the request content type header.
+    /// </summary>
+    public class UnsupportedContentTypeException : Exception
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="UnsupportedContentTypeException"/> with the specified
+        /// exception <paramref name="message"/>.
+        /// </summary>
+        /// <param name="message">The message that describes the error.</param>
+        public UnsupportedContentTypeException(string message)
+            : base(message)
+        {
+            if (message == null)
+            {
+                throw new ArgumentNullException(nameof(message));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/UnsupportedContentTypeFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/UnsupportedContentTypeFilter.cs
new file mode 100644
index 0000000000..0c134d7dc9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/UnsupportedContentTypeFilter.cs
@@ -0,0 +1,53 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// A filter that scans for <see cref="UnsupportedContentTypeException"/> in the
+    /// <see cref="ActionContext.ModelState"/> and short-circuits the pipeline
+    /// with an Unsupported Media Type (415) response.
+    /// </summary>
+    public class UnsupportedContentTypeFilter : IActionFilter
+    {
+        /// <inheritdoc />
+        public void OnActionExecuting(ActionExecutingContext context)
+        {
+            if (HasUnsupportedContentTypeError(context))
+            {
+                context.Result = new UnsupportedMediaTypeResult();
+            }
+        }
+
+        private bool HasUnsupportedContentTypeError(ActionExecutingContext context)
+        {
+            var modelState = context.ModelState;
+            if (modelState.IsValid)
+            {
+                return false;
+            }
+
+            foreach (var kvp in modelState)
+            {
+                var errors = kvp.Value.Errors;
+                for (int i = 0; i < errors.Count; i++)
+                {
+                    var error = errors[i];
+                    if (error.Exception is UnsupportedContentTypeException)
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        /// <inheritdoc />
+        public void OnActionExecuted(ActionExecutedContext context)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/CompositeClientModelValidatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/CompositeClientModelValidatorProvider.cs
new file mode 100644
index 0000000000..e485b10ef0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/CompositeClientModelValidatorProvider.cs
@@ -0,0 +1,50 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    /// <summary>
+    /// Aggregate of <see cref="IClientModelValidatorProvider"/>s that delegates to its underlying providers.
+    /// </summary>
+    public class CompositeClientModelValidatorProvider : IClientModelValidatorProvider
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="CompositeClientModelValidatorProvider"/>.
+        /// </summary>
+        /// <param name="providers">
+        /// A collection of <see cref="IClientModelValidatorProvider"/> instances.
+        /// </param>
+        public CompositeClientModelValidatorProvider(IEnumerable<IClientModelValidatorProvider> providers)
+        {
+            if (providers == null)
+            {
+                throw new ArgumentNullException(nameof(providers));
+            }
+
+            ValidatorProviders = new List<IClientModelValidatorProvider>(providers);
+        }
+
+        /// <summary>
+        /// Gets a list of <see cref="IClientModelValidatorProvider"/> instances.
+        /// </summary>
+        public IReadOnlyList<IClientModelValidatorProvider> ValidatorProviders { get; }
+
+        /// <inheritdoc />
+        public void CreateValidators(ClientValidatorProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            // Perf: Avoid allocations
+            for (var i = 0; i < ValidatorProviders.Count; i++)
+            {
+                ValidatorProviders[i].CreateValidators(context);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/CompositeModelValidatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/CompositeModelValidatorProvider.cs
new file mode 100644
index 0000000000..4fb2d86be3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/CompositeModelValidatorProvider.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    /// <summary>
+    /// Aggregate of <see cref="IModelValidatorProvider"/>s that delegates to its underlying providers.
+    /// </summary>
+    public class CompositeModelValidatorProvider : IModelValidatorProvider
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="CompositeModelValidatorProvider"/>.
+        /// </summary>
+        /// <param name="providers">
+        /// A collection of <see cref="IModelValidatorProvider"/> instances.
+        /// </param>
+        public CompositeModelValidatorProvider(IList<IModelValidatorProvider> providers)
+        {
+            if (providers == null)
+            {
+                throw new ArgumentNullException(nameof(providers));
+            }
+
+            ValidatorProviders = providers;
+        }
+
+        /// <summary>
+        /// Gets the list of <see cref="IModelValidatorProvider"/> instances.
+        /// </summary>
+        public IList<IModelValidatorProvider> ValidatorProviders { get; }
+
+        /// <inheritdoc />
+        public void CreateValidators(ModelValidatorProviderContext context)
+        {
+            // Perf: Avoid allocations
+            for (var i = 0; i < ValidatorProviders.Count; i++)
+            {
+                ValidatorProviders[i].CreateValidators(context);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/IObjectModelValidator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/IObjectModelValidator.cs
new file mode 100644
index 0000000000..1a0ca7659d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/IObjectModelValidator.cs
@@ -0,0 +1,26 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    /// <summary>
+    /// Provides methods to validate an object graph.
+    /// </summary>
+    public interface IObjectModelValidator
+    {
+        /// <summary>
+        /// Validates the provided object.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/> associated with the current request.</param>
+        /// <param name="validationState">The <see cref="ValidationStateDictionary"/>. May be null.</param>
+        /// <param name="prefix">
+        /// The model prefix. Used to map the model object to entries in <paramref name="validationState"/>.
+        /// </param>
+        /// <param name="model">The model object.</param>
+        void Validate(
+            ActionContext actionContext,
+            ValidationStateDictionary validationState,
+            string prefix,
+            object model);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ModelValidatorProviderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ModelValidatorProviderExtensions.cs
new file mode 100644
index 0000000000..3fbb512290
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ModelValidatorProviderExtensions.cs
@@ -0,0 +1,56 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    /// <summary>
+    /// Extension methods for <see cref="IModelValidatorProvider"/>.
+    /// </summary>
+    public static class ModelValidatorProviderExtensions
+    {
+        /// <summary>
+        /// Removes all model validator providers of the specified type.
+        /// </summary>
+        /// <param name="list">This list of <see cref="IModelValidatorProvider"/>s.</param>
+        /// <typeparam name="TModelValidatorProvider">The type to remove.</typeparam>
+        public static void RemoveType<TModelValidatorProvider>(this IList<IModelValidatorProvider> list) where TModelValidatorProvider : IModelValidatorProvider
+        {
+            if (list == null)
+            {
+                throw new ArgumentNullException(nameof(list));
+            }
+
+            RemoveType(list, typeof(TModelValidatorProvider));
+        }
+
+        /// <summary>
+        /// Removes all model validator providers of the specified type.
+        /// </summary>
+        /// <param name="list">This list of <see cref="IModelValidatorProvider"/>s.</param>
+        /// <param name="type">The type to remove.</param>
+        public static void RemoveType(this IList<IModelValidatorProvider> list, Type type)
+        {
+            if (list == null)
+            {
+                throw new ArgumentNullException(nameof(list));
+            }
+
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            for (var i = list.Count - 1; i >= 0; i--)
+            {
+                var modelValidatorProvider = list[i];
+                if (modelValidatorProvider.GetType() == type)
+                {
+                    list.RemoveAt(i);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidateNeverAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidateNeverAttribute.cs
new file mode 100644
index 0000000000..a0c7181f3f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidateNeverAttribute.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    /// <summary>
+    /// <see cref="IPropertyValidationFilter"/> implementation that unconditionally indicates a property should be
+    /// excluded from validation. When applied to a property, the validation system excludes that property. When
+    /// applied to a type, the validation system excludes all properties within that type.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
+    public sealed class ValidateNeverAttribute : Attribute, IPropertyValidationFilter
+    {
+        /// <inheritdoc />
+        public bool ShouldValidateEntry(ValidationEntry entry, ValidationEntry parentEntry)
+        {
+            return false;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidationVisitor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidationVisitor.cs
new file mode 100644
index 0000000000..499959df27
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidationVisitor.cs
@@ -0,0 +1,360 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    /// <summary>
+    /// A visitor implementation that interprets <see cref="ValidationStateDictionary"/> to traverse
+    /// a model object graph and perform validation.
+    /// </summary>
+    public class ValidationVisitor
+    {
+        /// <summary>
+        /// Creates a new <see cref="ValidationVisitor"/>.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/> associated with the current request.</param>
+        /// <param name="validatorProvider">The <see cref="IModelValidatorProvider"/>.</param>
+        /// <param name="validatorCache">The <see cref="ValidatorCache"/> that provides a list of <see cref="IModelValidator"/>s.</param>
+        /// <param name="metadataProvider">The provider used for reading metadata for the model type.</param>
+        /// <param name="validationState">The <see cref="ValidationStateDictionary"/>.</param>
+        public ValidationVisitor(
+            ActionContext actionContext,
+            IModelValidatorProvider validatorProvider,
+            ValidatorCache validatorCache,
+            IModelMetadataProvider metadataProvider,
+            ValidationStateDictionary validationState)
+        {
+            if (actionContext == null)
+            {
+                throw new ArgumentNullException(nameof(actionContext));
+            }
+
+            if (validatorProvider == null)
+            {
+                throw new ArgumentNullException(nameof(validatorProvider));
+            }
+
+            if (validatorCache == null)
+            {
+                throw new ArgumentNullException(nameof(validatorCache));
+            }
+
+            Context = actionContext;
+            ValidatorProvider = validatorProvider;
+            Cache = validatorCache;
+
+            MetadataProvider = metadataProvider;
+            ValidationState = validationState;
+
+            ModelState = actionContext.ModelState;
+            CurrentPath = new ValidationStack();
+        }
+
+        protected IModelValidatorProvider ValidatorProvider { get; }
+        protected IModelMetadataProvider MetadataProvider { get; }
+        protected ValidatorCache Cache { get; }
+        protected ActionContext Context { get; }
+        protected ModelStateDictionary ModelState { get; }
+        protected ValidationStateDictionary ValidationState { get; }
+        protected ValidationStack CurrentPath { get; }
+
+        protected object Container { get; set; }
+        protected string Key { get; set; }
+        protected object Model { get; set; }
+        protected ModelMetadata Metadata { get; set; }
+        protected IValidationStrategy Strategy { get; set; }
+
+        /// <summary>
+        /// Indicates whether validation of a complex type should be performed if validation fails for any of its children. The default behavior is false.
+        /// </summary>
+        public bool ValidateComplexTypesIfChildValidationFails { get; set; }
+        /// <summary>
+        /// Validates a object.
+        /// </summary>
+        /// <param name="metadata">The <see cref="ModelMetadata"/> associated with the model.</param>
+        /// <param name="key">The model prefix key.</param>
+        /// <param name="model">The model object.</param>
+        /// <returns><c>true</c> if the object is valid, otherwise <c>false</c>.</returns>
+        public bool Validate(ModelMetadata metadata, string key, object model)
+        {
+            return Validate(metadata, key, model, alwaysValidateAtTopLevel: false);
+        }
+
+        /// <summary>
+        /// Validates a object.
+        /// </summary>
+        /// <param name="metadata">The <see cref="ModelMetadata"/> associated with the model.</param>
+        /// <param name="key">The model prefix key.</param>
+        /// <param name="model">The model object.</param>
+        /// <param name="alwaysValidateAtTopLevel">If <c>true</c>, applies validation rules even if the top-level value is <c>null</c>.</param>
+        /// <returns><c>true</c> if the object is valid, otherwise <c>false</c>.</returns>
+        public virtual bool Validate(ModelMetadata metadata, string key, object model, bool alwaysValidateAtTopLevel)
+        {
+            if (model == null && key != null && !alwaysValidateAtTopLevel)
+            {
+                var entry = ModelState[key];
+                if (entry != null && entry.ValidationState != ModelValidationState.Valid)
+                {
+                    entry.ValidationState = ModelValidationState.Valid;
+                }
+
+                return true;
+            }
+
+            return Visit(metadata, key, model);
+        }
+
+        /// <summary>
+        /// Validates a single node in a model object graph.
+        /// </summary>
+        /// <returns><c>true</c> if the node is valid, otherwise <c>false</c>.</returns>
+        protected virtual bool ValidateNode()
+        {
+            var state = ModelState.GetValidationState(Key);
+
+            // Rationale: we might see the same model state key used for two different objects.
+            // We want to run validation unless it's already known that this key is invalid.
+            if (state != ModelValidationState.Invalid)
+            {
+                var validators = Cache.GetValidators(Metadata, ValidatorProvider);
+
+                var count = validators.Count;
+                if (count > 0)
+                {
+                    var context = new ModelValidationContext(
+                        Context,
+                        Metadata,
+                        MetadataProvider,
+                        Container,
+                        Model);
+
+                    var results = new List<ModelValidationResult>();
+                    for (var i = 0; i < count; i++)
+                    {
+                        results.AddRange(validators[i].Validate(context));
+                    }
+
+                    var resultsCount = results.Count;
+                    for (var i = 0; i < resultsCount; i++)
+                    {
+                        var result = results[i];
+                        var key = ModelNames.CreatePropertyModelName(Key, result.MemberName);
+
+                        // It's OK for key to be the empty string here. This can happen when a top
+                        // level object implements IValidatableObject.
+                        ModelState.TryAddModelError(key, result.Message);
+                    }
+                }
+            }
+
+            state = ModelState.GetFieldValidationState(Key);
+            if (state == ModelValidationState.Invalid)
+            {
+                return false;
+            }
+            else
+            {
+                // If the field has an entry in ModelState, then record it as valid. Don't create
+                // extra entries if they don't exist already.
+                var entry = ModelState[Key];
+                if (entry != null)
+                {
+                    entry.ValidationState = ModelValidationState.Valid;
+                }
+
+                return true;
+            }
+        }
+
+        protected virtual bool Visit(ModelMetadata metadata, string key, object model)
+        {
+            RuntimeHelpers.EnsureSufficientExecutionStack();
+
+            if (model != null && !CurrentPath.Push(model))
+            {
+                // This is a cycle, bail.
+                return true;
+            }
+
+            var entry = GetValidationEntry(model);
+            key = entry?.Key ?? key ?? string.Empty;
+            metadata = entry?.Metadata ?? metadata;
+            var strategy = entry?.Strategy;
+
+            if (ModelState.HasReachedMaxErrors)
+            {
+                SuppressValidation(key);
+                return false;
+            }
+            else if (entry != null && entry.SuppressValidation)
+            {
+                // Use the key on the entry, because we might not have entries in model state.
+                SuppressValidation(entry.Key);
+                CurrentPath.Pop(model);
+                return true;
+            }
+
+            using (StateManager.Recurse(this, key ?? string.Empty, metadata, model, strategy))
+            {
+                if (Metadata.IsEnumerableType)
+                {
+                    return VisitComplexType(DefaultCollectionValidationStrategy.Instance);
+                }
+
+                if (Metadata.IsComplexType)
+                {
+                    return VisitComplexType(DefaultComplexObjectValidationStrategy.Instance);
+                }
+
+                return VisitSimpleType();
+            }
+        }
+
+        // Covers everything VisitSimpleType does not i.e. both enumerations and complex types.
+        protected virtual bool VisitComplexType(IValidationStrategy defaultStrategy)
+        {
+            var isValid = true;
+
+            if (Model != null && Metadata.ValidateChildren)
+            {
+                var strategy = Strategy ?? defaultStrategy;
+                isValid = VisitChildren(strategy);
+            }
+            else if (Model != null)
+            {
+                // Suppress validation for the entries matching this prefix. This will temporarily set
+                // the current node to 'skipped' but we're going to visit it right away, so subsequent
+                // code will set it to 'valid' or 'invalid'
+                SuppressValidation(Key);
+            }
+
+            // Double-checking HasReachedMaxErrors just in case this model has no properties.
+            // If validation has failed for any children, only validate the parent if ValidateComplexTypesIfChildValidationFails is true.
+            if ((isValid || ValidateComplexTypesIfChildValidationFails) && !ModelState.HasReachedMaxErrors)
+            {
+                isValid &= ValidateNode();
+            }
+
+            return isValid;
+        }
+
+        protected virtual bool VisitSimpleType()
+        {
+            if (ModelState.HasReachedMaxErrors)
+            {
+                SuppressValidation(Key);
+                return false;
+            }
+
+            return ValidateNode();
+        }
+
+        protected virtual bool VisitChildren(IValidationStrategy strategy)
+        {
+            var isValid = true;
+            var enumerator = strategy.GetChildren(Metadata, Key, Model);
+            var parentEntry = new ValidationEntry(Metadata, Key, Model);
+
+            while (enumerator.MoveNext())
+            {
+                var entry = enumerator.Current;
+                var metadata = entry.Metadata;
+                var key = entry.Key;
+                if (metadata.PropertyValidationFilter?.ShouldValidateEntry(entry, parentEntry) == false)
+                {
+                    SuppressValidation(key);
+                    continue;
+                }
+
+                isValid &= Visit(metadata, key, entry.Model);
+            }
+
+            return isValid;
+        }
+
+        protected virtual void SuppressValidation(string key)
+        {
+            if (key == null)
+            {
+                // If the key is null, that means that we shouldn't expect any entries in ModelState for
+                // this value, so there's nothing to do.
+                return;
+            }
+
+            var entries = ModelState.FindKeysWithPrefix(key);
+            foreach (var entry in entries)
+            {
+                entry.Value.ValidationState = ModelValidationState.Skipped;
+            }
+        }
+
+        protected virtual ValidationStateEntry GetValidationEntry(object model)
+        {
+            if (model == null || ValidationState == null)
+            {
+                return null;
+            }
+
+            ValidationState.TryGetValue(model, out var entry);
+            return entry;
+        }
+
+        protected struct StateManager : IDisposable
+        {
+            private readonly ValidationVisitor _visitor;
+            private readonly object _container;
+            private readonly string _key;
+            private readonly ModelMetadata _metadata;
+            private readonly object _model;
+            private readonly object _newModel;
+            private readonly IValidationStrategy _strategy;
+
+            public static StateManager Recurse(
+                ValidationVisitor visitor,
+                string key,
+                ModelMetadata metadata,
+                object model,
+                IValidationStrategy strategy)
+            {
+                var recursifier = new StateManager(visitor, model);
+
+                visitor.Container = visitor.Model;
+                visitor.Key = key;
+                visitor.Metadata = metadata;
+                visitor.Model = model;
+                visitor.Strategy = strategy;
+
+                return recursifier;
+            }
+
+            public StateManager(ValidationVisitor visitor, object newModel)
+            {
+                _visitor = visitor;
+                _newModel = newModel;
+
+                _container = _visitor.Container;
+                _key = _visitor.Key;
+                _metadata = _visitor.Metadata;
+                _model = _visitor.Model;
+                _strategy = _visitor.Strategy;
+            }
+
+            public void Dispose()
+            {
+                _visitor.Container = _container;
+                _visitor.Key = _key;
+                _visitor.Metadata = _metadata;
+                _visitor.Model = _model;
+                _visitor.Strategy = _strategy;
+
+                _visitor.CurrentPath.Pop(_newModel);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ValueProviderFactoryExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ValueProviderFactoryExtensions.cs
new file mode 100644
index 0000000000..40041c9427
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ValueProviderFactoryExtensions.cs
@@ -0,0 +1,56 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Extension methods for <see cref="IValueProviderFactory"/>.
+    /// </summary>
+    public static class ValueProviderFactoryExtensions
+    {
+        /// <summary>
+        /// Removes all value provider factories of the specified type.
+        /// </summary>
+        /// <param name="list">The list of <see cref="IValueProviderFactory"/>.</param>
+        /// <typeparam name="TValueProviderFactory">The type to remove.</typeparam>
+        public static void RemoveType<TValueProviderFactory>(this IList<IValueProviderFactory> list) where TValueProviderFactory : IValueProviderFactory
+        {
+            if (list == null)
+            {
+                throw new ArgumentNullException(nameof(list));
+            }
+
+            RemoveType(list, typeof(TValueProviderFactory));
+        }
+
+        /// <summary>
+        /// Removes all value provider factories of the specified type.
+        /// </summary>
+        /// <param name="list">The list of <see cref="IValueProviderFactory"/>.</param>
+        /// <param name="type">The type to remove.</param>
+        public static void RemoveType(this IList<IValueProviderFactory> list, Type type)
+        {
+            if (list == null)
+            {
+                throw new ArgumentNullException(nameof(list));
+            }
+
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            for (var i = list.Count - 1; i >= 0; i--)
+            {
+                var valueProviderFactory = list[i];
+                if (valueProviderFactory.GetType() == type)
+                {
+                    list.RemoveAt(i);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelMetadataTypeAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelMetadataTypeAttribute.cs
new file mode 100644
index 0000000000..a794257147
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelMetadataTypeAttribute.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// This attribute specifies the metadata class to associate with a data model class.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+    public class ModelMetadataTypeAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ModelMetadataTypeAttribute" /> class.
+        /// </summary>
+        /// <param name="type">The type of metadata class that is associated with a data model class.</param>
+        public ModelMetadataTypeAttribute(Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            MetadataType = type;
+        }
+
+        /// <summary>
+        /// Gets the type of metadata class that is associated with a data model class.
+        /// </summary>
+        public Type MetadataType { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/MvcOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/MvcOptions.cs
new file mode 100644
index 0000000000..72634a49fa
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/MvcOptions.cs
@@ -0,0 +1,369 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Authorization;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Provides programmatic configuration for the MVC framework.
+    /// </summary>
+    public class MvcOptions : IEnumerable<ICompatibilitySwitch>
+    {
+        private int _maxModelStateErrors = ModelStateDictionary.DefaultMaxAllowedErrors;
+
+        // See CompatibilitySwitch.cs for guide on how to implement these.
+        private readonly CompatibilitySwitch<bool> _allowBindingHeaderValuesToNonStringModelTypes;
+        private readonly CompatibilitySwitch<bool> _allowCombiningAuthorizeFilters;
+        private readonly CompatibilitySwitch<bool> _allowValidatingTopLevelNodes;
+        private readonly CompatibilitySwitch<InputFormatterExceptionPolicy> _inputFormatterExceptionPolicy;
+        private readonly CompatibilitySwitch<bool> _suppressBindingUndefinedValueToEnumType;
+        private readonly ICompatibilitySwitch[] _switches;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="MvcOptions"/>.
+        /// </summary>
+        public MvcOptions()
+        {
+            CacheProfiles = new Dictionary<string, CacheProfile>(StringComparer.OrdinalIgnoreCase);
+            Conventions = new List<IApplicationModelConvention>();
+            Filters = new FilterCollection();
+            FormatterMappings = new FormatterMappings();
+            InputFormatters = new FormatterCollection<IInputFormatter>();
+            OutputFormatters = new FormatterCollection<IOutputFormatter>();
+            ModelBinderProviders = new List<IModelBinderProvider>();
+            ModelBindingMessageProvider = new DefaultModelBindingMessageProvider();
+            ModelMetadataDetailsProviders = new List<IMetadataDetailsProvider>();
+            ModelValidatorProviders = new List<IModelValidatorProvider>();
+            ValueProviderFactories = new List<IValueProviderFactory>();
+
+            _allowCombiningAuthorizeFilters = new CompatibilitySwitch<bool>(nameof(AllowCombiningAuthorizeFilters));
+            _allowBindingHeaderValuesToNonStringModelTypes = new CompatibilitySwitch<bool>(nameof(AllowBindingHeaderValuesToNonStringModelTypes));
+            _allowValidatingTopLevelNodes = new CompatibilitySwitch<bool>(nameof(AllowValidatingTopLevelNodes));
+            _inputFormatterExceptionPolicy = new CompatibilitySwitch<InputFormatterExceptionPolicy>(nameof(InputFormatterExceptionPolicy), InputFormatterExceptionPolicy.AllExceptions);
+            _suppressBindingUndefinedValueToEnumType = new CompatibilitySwitch<bool>(nameof(SuppressBindingUndefinedValueToEnumType));
+
+            _switches = new ICompatibilitySwitch[]
+            {
+                _allowCombiningAuthorizeFilters,
+                _allowBindingHeaderValuesToNonStringModelTypes,
+                _allowValidatingTopLevelNodes,
+                _inputFormatterExceptionPolicy,
+                _suppressBindingUndefinedValueToEnumType,
+            };
+        }
+
+        /// <summary>
+        /// Gets or sets the flag which decides whether body model binding (for example, on an
+        /// action method parameter with <see cref="FromBodyAttribute"/>) should treat empty
+        /// input as valid. <see langword="false"/> by default.
+        /// </summary>
+        /// <example>
+        /// When <see langword="false"/>, actions that model bind the request body (for example,
+        /// using <see cref="FromBodyAttribute"/>) will register an error in the
+        /// <see cref="ModelStateDictionary"/> if the incoming request body is empty.
+        /// </example>
+        public bool AllowEmptyInputInBodyModelBinding { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value that determines if policies on instances of <see cref="AuthorizeFilter" />
+        /// will be combined into a single effective policy. The default value of the property is <c>false</c>.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Authorization policies are designed such that multiple authorization policies applied to an endpoint
+        /// should be combined and executed a single policy. The <see cref="AuthorizeFilter"/> (commonly applied
+        /// by <see cref="AuthorizeAttribute"/>) can be applied globally, to controllers, and to actions - which
+        /// specifies multiple authorization policies for an action. In all ASP.NET Core releases prior to 2.1
+        /// these multiple policies would not combine as intended. This compatibility switch configures whether the
+        /// old (unintended) behavior or the new combining behavior will be used when multiple authorization policies
+        /// are applied.
+        /// </para>
+        /// <para>
+        /// This property is associated with a compatibility switch and can provide a different behavior depending on
+        /// the configured compatibility version for the application. See <see cref="CompatibilityVersion"/> for
+        /// guidance and examples of setting the application's compatibility version.
+        /// </para>
+        /// <para>
+        /// Configuring the desired value of the compatibility switch by calling this property's setter will take precedence
+        /// over the value implied by the application's <see cref="CompatibilityVersion"/>.
+        /// </para>
+        /// <para>
+        /// If the application's compatibility version is set to <see cref="CompatibilityVersion.Version_2_0"/> then
+        /// this setting will have the value <c>false</c> unless explicitly configured.
+        /// </para>
+        /// <para>
+        /// If the application's compatibility version is set to <see cref="CompatibilityVersion.Version_2_1"/> or
+        /// higher then this setting will have the value <c>true</c> unless explicitly configured.
+        /// </para>
+        /// </remarks>
+        public bool AllowCombiningAuthorizeFilters
+        {
+            get => _allowCombiningAuthorizeFilters.Value;
+            set => _allowCombiningAuthorizeFilters.Value = value;
+        }
+
+        /// <summary>
+        /// Gets or sets a value that determines if <see cref="HeaderModelBinder"/> should bind to types other than
+        /// <see cref="string"/> or a collection of <see cref="string"/>. If set to <c>true</c>,
+        /// <see cref="HeaderModelBinder"/> would bind to simple types (like <see cref="string"/>, <see cref="int"/>,
+        /// <see cref="Enum"/>, <see cref="bool"/> etc.) or a collection of simple types. The default value of the
+        /// property is <c>false</c>.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// This property is associated with a compatibility switch and can provide a different behavior depending on
+        /// the configured compatibility version for the application. See <see cref="CompatibilityVersion"/> for
+        /// guidance and examples of setting the application's compatibility version.
+        /// </para>
+        /// <para>
+        /// Configuring the desired value of the compatibility switch by calling this property's setter will take precedence
+        /// over the value implied by the application's <see cref="CompatibilityVersion"/>.
+        /// </para>
+        /// <para>
+        /// If the application's compatibility version is set to <see cref="CompatibilityVersion.Version_2_0"/> then
+        /// this setting will have the value <c>false</c> unless explicitly configured.
+        /// </para>
+        /// <para>
+        /// If the application's compatibility version is set to <see cref="CompatibilityVersion.Version_2_1"/> or
+        /// higher then this setting will have the value <c>true</c> unless explicitly configured.
+        /// </para>
+        /// </remarks>
+        public bool AllowBindingHeaderValuesToNonStringModelTypes
+        {
+            get => _allowBindingHeaderValuesToNonStringModelTypes.Value;
+            set => _allowBindingHeaderValuesToNonStringModelTypes.Value = value;
+        }
+
+        /// <summary>
+        /// Gets or sets a value that determines if model bound action parameters, controller properties, page handler
+        /// parameters, or page model properties are validated (in addition to validating their elements or
+        /// properties). If set to <see langword="true"/>, <see cref="BindRequiredAttribute"/> and
+        /// <c>ValidationAttribute</c>s on these top-level nodes are checked. Otherwise, such attributes are ignored.
+        /// </summary>
+        /// <value>
+        /// The default value is <see langword="true"/> if the version is
+        /// <see cref="CompatibilityVersion.Version_2_1"/> or later; <see langword="false"/> otherwise.
+        /// </value>
+        /// <remarks>
+        /// <para>
+        /// This property is associated with a compatibility switch and can provide a different behavior depending on
+        /// the configured compatibility version for the application. See <see cref="CompatibilityVersion"/> for
+        /// guidance and examples of setting the application's compatibility version.
+        /// </para>
+        /// <para>
+        /// Configuring the desired value of the compatibility switch by calling this property's setter will take
+        /// precedence over the value implied by the application's <see cref="CompatibilityVersion"/>.
+        /// </para>
+        /// <para>
+        /// If the application's compatibility version is set to <see cref="CompatibilityVersion.Version_2_0"/> then
+        /// this setting will have the value <see langword="false"/> unless explicitly configured.
+        /// </para>
+        /// <para>
+        /// If the application's compatibility version is set to <see cref="CompatibilityVersion.Version_2_1"/> or
+        /// higher then this setting will have the value <see langword="true"/> unless explicitly configured.
+        /// </para>
+        /// </remarks>
+        public bool AllowValidatingTopLevelNodes
+        {
+            get => _allowValidatingTopLevelNodes.Value;
+            set => _allowValidatingTopLevelNodes.Value = value;
+        }
+
+        /// <summary>
+        /// Gets a Dictionary of CacheProfile Names, <see cref="CacheProfile"/> which are pre-defined settings for
+        /// response caching.
+        /// </summary>
+        public IDictionary<string, CacheProfile> CacheProfiles { get; }
+
+        /// <summary>
+        /// Gets a list of <see cref="IApplicationModelConvention"/> instances that will be applied to
+        /// the <see cref="ApplicationModel"/> when discovering actions.
+        /// </summary>
+        public IList<IApplicationModelConvention> Conventions { get; }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IFilterMetadata"/> which are used to construct filters that
+        /// apply to all actions.
+        /// </summary>
+        public FilterCollection Filters { get; }
+
+        /// <summary>
+        /// Used to specify mapping between the URL Format and corresponding media type.
+        /// </summary>
+        public FormatterMappings FormatterMappings { get; }
+
+        /// <summary>
+        /// Gets or sets a value which determines how the model binding system interprets exceptions thrown by an <see cref="IInputFormatter"/>.
+        /// The default value of the property is <see cref="InputFormatterExceptionPolicy.AllExceptions"/>.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// This property is associated with a compatibility switch and can provide a different behavior depending on
+        /// the configured compatibility version for the application. See <see cref="CompatibilityVersion"/> for
+        /// guidance and examples of setting the application's compatibility version.
+        /// </para>
+        /// <para>
+        /// Configuring the desired value of the compatibility switch by calling this property's setter will take precedence
+        /// over the value implied by the application's <see cref="CompatibilityVersion"/>.
+        /// </para>
+        /// <para>
+        /// If the application's compatibility version is set to <see cref="CompatibilityVersion.Version_2_0"/> then
+        /// this setting will have the value <see cref="InputFormatterExceptionPolicy.AllExceptions"/> unless
+        /// explicitly configured.
+        /// </para>
+        /// <para>
+        /// If the application's compatibility version is set to <see cref="CompatibilityVersion.Version_2_1"/> or
+        /// higher then this setting will have the value
+        /// <see cref="InputFormatterExceptionPolicy.MalformedInputExceptions"/> unless explicitly configured.
+        /// </para>
+        /// </remarks>
+        public InputFormatterExceptionPolicy InputFormatterExceptionPolicy
+        {
+            get => _inputFormatterExceptionPolicy.Value;
+            set => _inputFormatterExceptionPolicy.Value = value;
+        }
+
+        /// <summary>
+        /// Gets a list of <see cref="IInputFormatter"/>s that are used by this application.
+        /// </summary>
+        public FormatterCollection<IInputFormatter> InputFormatters { get; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the model binding system will bind undefined values to
+        /// enum types. The default value of the property is <c>false</c>.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// This property is associated with a compatibility switch and can provide a different behavior depending on
+        /// the configured compatibility version for the application. See <see cref="CompatibilityVersion"/> for
+        /// guidance and examples of setting the application's compatibility version.
+        /// </para>
+        /// <para>
+        /// Configuring the desired value of the compatibility switch by calling this property's setter will take precedence
+        /// over the value implied by the application's <see cref="CompatibilityVersion"/>.
+        /// </para>
+        /// <para>
+        /// If the application's compatibility version is set to <see cref="CompatibilityVersion.Version_2_0"/> then
+        /// this setting will have the value <c>false</c> unless explicitly configured.
+        /// </para>
+        /// <para>
+        /// If the application's compatibility version is set to <see cref="CompatibilityVersion.Version_2_1"/> or
+        /// higher then this setting will have the value <c>true</c> unless explicitly configured.
+        /// </para>
+        /// </remarks>
+        public bool SuppressBindingUndefinedValueToEnumType
+        {
+            get => _suppressBindingUndefinedValueToEnumType.Value;
+            set => _suppressBindingUndefinedValueToEnumType.Value = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the flag to buffer the request body in input formatters. Default is <c>false</c>.
+        /// </summary>
+        public bool SuppressInputFormatterBuffering { get; set; } = false;
+
+        /// <summary>
+        /// Gets or sets the maximum number of validation errors that are allowed by this application before further
+        /// errors are ignored.
+        /// </summary>
+        public int MaxModelValidationErrors
+        {
+            get => _maxModelStateErrors;
+            set
+            {
+                if (value < 0)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(value));
+                }
+
+                _maxModelStateErrors = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets a list of <see cref="IModelBinderProvider"/>s used by this application.
+        /// </summary>
+        public IList<IModelBinderProvider> ModelBinderProviders { get; }
+
+        /// <summary>
+        /// Gets the default <see cref="ModelBinding.Metadata.ModelBindingMessageProvider"/>. Changes here are copied to the
+        /// <see cref="ModelMetadata.ModelBindingMessageProvider"/> property of all <see cref="ModelMetadata"/>
+        /// instances unless overridden in a custom <see cref="IBindingMetadataProvider"/>.
+        /// </summary>
+        public DefaultModelBindingMessageProvider ModelBindingMessageProvider { get; }
+
+        /// <summary>
+        /// Gets a list of <see cref="IMetadataDetailsProvider"/> instances that will be used to
+        /// create <see cref="ModelMetadata"/> instances.
+        /// </summary>
+        /// <remarks>
+        /// A provider should implement one or more of the following interfaces, depending on what
+        /// kind of details are provided:
+        /// <ul>
+        /// <li><see cref="IBindingMetadataProvider"/></li>
+        /// <li><see cref="IDisplayMetadataProvider"/></li>
+        /// <li><see cref="IValidationMetadataProvider"/></li>
+        /// </ul>
+        /// </remarks>
+        public IList<IMetadataDetailsProvider> ModelMetadataDetailsProviders { get; }
+
+        /// <summary>
+        /// Gets a list of <see cref="IModelValidatorProvider"/>s used by this application.
+        /// </summary>
+        public IList<IModelValidatorProvider> ModelValidatorProviders { get; }
+
+        /// <summary>
+        /// Gets a list of <see cref="IOutputFormatter"/>s that are used by this application.
+        /// </summary>
+        public FormatterCollection<IOutputFormatter> OutputFormatters { get; }
+
+        /// <summary>
+        /// Gets or sets the flag which causes content negotiation to ignore Accept header
+        /// when it contains the media type */*. <see langword="false"/> by default.
+        /// </summary>
+        public bool RespectBrowserAcceptHeader { get; set; }
+
+        /// <summary>
+        /// Gets or sets the flag which decides whether an HTTP 406 Not Acceptable response
+        /// will be returned if no formatter has been selected to format the response.
+        /// <see langword="false"/> by default.
+        /// </summary>
+        public bool ReturnHttpNotAcceptable { get; set; }
+
+        /// <summary>
+        /// Gets a list of <see cref="IValueProviderFactory"/> used by this application.
+        /// </summary>
+        public IList<IValueProviderFactory> ValueProviderFactories { get; }
+
+        /// <summary>
+        /// Gets or sets the SSL port that is used by this application when <see cref="RequireHttpsAttribute"/>
+        /// is used. If not set the port won't be specified in the secured URL e.g. https://localhost/path.
+        /// </summary>
+        public int? SslPort { get; set; }
+
+        /// <summary>
+        /// Gets or sets the default value for the Permanent property of <see cref="RequireHttpsAttribute"/>.
+        /// </summary>
+        public bool RequireHttpsPermanent { get; set; }
+
+        IEnumerator<ICompatibilitySwitch> IEnumerable<ICompatibilitySwitch>.GetEnumerator()
+        {
+            return ((IEnumerable<ICompatibilitySwitch>)_switches).GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() => _switches.GetEnumerator();
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NoContentResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NoContentResult.cs
new file mode 100644
index 0000000000..09a700398e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NoContentResult.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class NoContentResult : StatusCodeResult
+    {
+        public NoContentResult()
+            : base(StatusCodes.Status204NoContent)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NonActionAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NonActionAttribute.cs
new file mode 100644
index 0000000000..aa2cec5f5b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NonActionAttribute.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Indicates that a controller method is not an action method.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public sealed class NonActionAttribute : Attribute
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NonControllerAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NonControllerAttribute.cs
new file mode 100644
index 0000000000..518b7c6c50
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NonControllerAttribute.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Indicates that the type and any derived types that this attribute is applied to
+    /// is not considered a controller by the default controller discovery mechanism.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+    public sealed class NonControllerAttribute : Attribute
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NonViewComponentAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NonViewComponentAttribute.cs
new file mode 100644
index 0000000000..68eda496df
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NonViewComponentAttribute.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Indicates that the type and any derived types that this attribute is applied to
+    /// is not considered a view component by the default view component discovery mechanism.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+    public class NonViewComponentAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NotFoundObjectResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NotFoundObjectResult.cs
new file mode 100644
index 0000000000..9260784017
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NotFoundObjectResult.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="ObjectResult"/> that when executed will produce a Not Found (404) response.
+    /// </summary>
+    public class NotFoundObjectResult : ObjectResult
+    {
+        /// <summary>
+        /// Creates a new <see cref="NotFoundObjectResult"/> instance.
+        /// </summary>
+        /// <param name="value">The value to format in the entity body.</param>
+        public NotFoundObjectResult(object value)
+            : base(value)
+        {
+            StatusCode = StatusCodes.Status404NotFound;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NotFoundResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NotFoundResult.cs
new file mode 100644
index 0000000000..b4b7de1600
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NotFoundResult.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Represents an <see cref="StatusCodeResult"/> that when
+    /// executed will produce a Not Found (404) response.
+    /// </summary>
+    public class NotFoundResult : StatusCodeResult
+    {
+        /// <summary>
+        /// Creates a new <see cref="NotFoundResult"/> instance.
+        /// </summary>
+        public NotFoundResult() : base(StatusCodes.Status404NotFound)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ObjectResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ObjectResult.cs
new file mode 100644
index 0000000000..1148ceffc1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ObjectResult.cs
@@ -0,0 +1,57 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class ObjectResult : ActionResult
+    {
+        public ObjectResult(object value)
+        {
+            Value = value;
+            Formatters = new FormatterCollection<IOutputFormatter>();
+            ContentTypes = new MediaTypeCollection();
+        }
+
+        public object Value { get; set; }
+
+        public FormatterCollection<IOutputFormatter> Formatters { get; set; }
+
+        public MediaTypeCollection ContentTypes { get; set; }
+
+        public Type DeclaredType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the HTTP status code.
+        /// </summary>
+        public int? StatusCode { get; set; }
+
+        public override Task ExecuteResultAsync(ActionContext context)
+        {
+            var executor = context.HttpContext.RequestServices.GetRequiredService<IActionResultExecutor<ObjectResult>>();
+            return executor.ExecuteAsync(context, this);
+        }
+
+        /// <summary>
+        /// This method is called before the formatter writes to the output stream.
+        /// </summary>
+        public virtual void OnFormatting(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (StatusCode.HasValue)
+            {
+                context.HttpContext.Response.StatusCode = StatusCode.Value;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/OkObjectResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/OkObjectResult.cs
new file mode 100644
index 0000000000..2990ffc843
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/OkObjectResult.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="ObjectResult"/> that when executed performs content negotiation, formats the entity body, and
+    /// will produce a <see cref="StatusCodes.Status200OK"/> response if negotiation and formatting succeed.
+    /// </summary>
+    public class OkObjectResult : ObjectResult
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OkObjectResult"/> class.
+        /// </summary>
+        /// <param name="value">The content to format into the entity body.</param>
+        public OkObjectResult(object value)
+            : base(value)
+        {
+            StatusCode = StatusCodes.Status200OK;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/OkResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/OkResult.cs
new file mode 100644
index 0000000000..49cd649c99
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/OkResult.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="StatusCodeResult"/> that when executed will produce an empty
+    /// <see cref="StatusCodes.Status200OK"/> response.
+    /// </summary>
+    public class OkResult : StatusCodeResult
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OkResult"/> class.
+        /// </summary>
+        public OkResult()
+            : base(StatusCodes.Status200OK)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/PhysicalFileResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/PhysicalFileResult.cs
new file mode 100644
index 0000000000..c83dc1442a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/PhysicalFileResult.cs
@@ -0,0 +1,82 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A <see cref="FileResult"/> on execution will write a file from disk to the response
+    /// using mechanisms provided by the host.
+    /// </summary>
+    public class PhysicalFileResult : FileResult
+    {
+        private string _fileName;
+
+        /// <summary>
+        /// Creates a new <see cref="PhysicalFileResult"/> instance with
+        /// the provided <paramref name="fileName"/> and the provided <paramref name="contentType"/>.
+        /// </summary>
+        /// <param name="fileName">The path to the file. The path must be an absolute path.</param>
+        /// <param name="contentType">The Content-Type header of the response.</param>
+        public PhysicalFileResult(string fileName, string contentType)
+            : this(fileName, MediaTypeHeaderValue.Parse(contentType))
+        {
+            if (fileName == null)
+            {
+                throw new ArgumentNullException(nameof(fileName));
+            }
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="PhysicalFileResult"/> instance with
+        /// the provided <paramref name="fileName"/> and the provided <paramref name="contentType"/>.
+        /// </summary>
+        /// <param name="fileName">The path to the file. The path must be an absolute path.</param>
+        /// <param name="contentType">The Content-Type header of the response.</param>
+        public PhysicalFileResult(string fileName, MediaTypeHeaderValue contentType)
+            : base(contentType?.ToString())
+        {
+            if (fileName == null)
+            {
+                throw new ArgumentNullException(nameof(fileName));
+            }
+
+            FileName = fileName;
+        }
+
+        /// <summary>
+        /// Gets or sets the path to the file that will be sent back as the response.
+        /// </summary>
+        public string FileName
+        {
+            get => _fileName;
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _fileName = value;
+            }
+        }
+
+        /// <inheritdoc />
+        public override Task ExecuteResultAsync(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var executor = context.HttpContext.RequestServices.GetRequiredService<IActionResultExecutor<PhysicalFileResult>>();
+            return executor.ExecuteAsync(context, this);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProblemDetails.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProblemDetails.cs
new file mode 100644
index 0000000000..35ac215562
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProblemDetails.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A machine-readable format for specifying errors in HTTP API responses based on https://tools.ietf.org/html/rfc7807.
+    /// </summary>
+    public class ProblemDetails
+    {
+        /// <summary>
+        /// A URI reference [RFC3986] that identifies the problem type. This specification encourages that, when
+        /// dereferenced, it provide human-readable documentation for the problem type
+        /// (e.g., using HTML [W3C.REC-html5-20141028]).  When this member is not present, its value is assumed to be
+        /// "about:blank".
+        /// </summary>
+        public string Type { get; set; }
+
+        /// <summary>
+        /// A short, human-readable summary of the problem type.It SHOULD NOT change from occurrence to occurrence
+        /// of the problem, except for purposes of localization(e.g., using proactive content negotiation;
+        /// see[RFC7231], Section 3.4).
+        /// </summary>
+        public string Title { get; set; }
+
+        /// <summary>
+        /// The HTTP status code([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.
+        /// </summary>
+        public int? Status { get; set; }
+
+        /// <summary>
+        /// A human-readable explanation specific to this occurrence of the problem.
+        /// </summary>
+        public string Detail { get; set; }
+
+        /// <summary>
+        /// A URI reference that identifies the specific occurrence of the problem.It may or may not yield further information if dereferenced.
+        /// </summary>
+        public string Instance { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesAttribute.cs
new file mode 100644
index 0000000000..202591a1b6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesAttribute.cs
@@ -0,0 +1,141 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Formatters.Internal;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A filter that specifies the expected <see cref="System.Type"/> the action will return and the supported
+    /// response content types. The <see cref="ContentTypes"/> value is used to set
+    /// <see cref="ObjectResult.ContentTypes"/>.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public class ProducesAttribute : Attribute, IResultFilter, IOrderedFilter, IApiResponseMetadataProvider
+    {
+        /// <summary>
+        /// Initializes an instance of <see cref="ProducesAttribute"/>.
+        /// </summary>
+        /// <param name="type">The <see cref="Type"/> of object that is going to be written in the response.</param>
+        public ProducesAttribute(Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            Type = type;
+            ContentTypes = new MediaTypeCollection();
+        }
+
+        /// <summary>
+        /// Initializes an instance of <see cref="ProducesAttribute"/> with allowed content types.
+        /// </summary>
+        /// <param name="contentType">The allowed content type for a response.</param>
+        /// <param name="additionalContentTypes">Additional allowed content types for a response.</param>
+        public ProducesAttribute(string contentType, params string[] additionalContentTypes)
+        {
+            if (contentType == null)
+            {
+                throw new ArgumentNullException(nameof(contentType));
+            }
+
+            // We want to ensure that the given provided content types are valid values, so
+            // we validate them using the semantics of MediaTypeHeaderValue.
+            MediaTypeHeaderValue.Parse(contentType);
+
+            for (var i = 0; i < additionalContentTypes.Length; i++)
+            {
+                MediaTypeHeaderValue.Parse(additionalContentTypes[i]);
+            }
+
+            ContentTypes = GetContentTypes(contentType, additionalContentTypes);
+        }
+
+        /// <inheritdoc />
+        public Type Type { get; set; }
+
+        /// <summary>
+        /// Gets or sets the supported response content types. Used to set <see cref="ObjectResult.ContentTypes"/>.
+        /// </summary>
+        public MediaTypeCollection ContentTypes { get; set; }
+
+        /// <inheritdoc />
+        public int StatusCode => StatusCodes.Status200OK;
+
+        /// <inheritdoc />
+        public int Order { get; set; }
+
+        /// <inheritdoc />
+        public virtual void OnResultExecuting(ResultExecutingContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var objectResult = context.Result as ObjectResult;
+
+            if (objectResult != null)
+            {
+                // Check if there are any IFormatFilter in the pipeline, and if any of them is active. If there is one,
+                // do not override the content type value.
+                for (var i = 0; i < context.Filters.Count; i++)
+                {
+                    var filter = context.Filters[i] as IFormatFilter;
+
+                    if (filter?.GetFormat(context) != null)
+                    {
+                        return;
+                    }
+                }
+
+                SetContentTypes(objectResult.ContentTypes);
+            }
+        }
+
+        /// <inheritdoc />
+        public virtual void OnResultExecuted(ResultExecutedContext context)
+        {
+        }
+
+        /// <inheritdoc />
+        public void SetContentTypes(MediaTypeCollection contentTypes)
+        {
+            contentTypes.Clear();
+            foreach (var contentType in ContentTypes)
+            {
+                contentTypes.Add(contentType);
+            }
+        }
+
+        private MediaTypeCollection GetContentTypes(string firstArg, string[] args)
+        {
+            var completeArgs = new List<string>();
+            completeArgs.Add(firstArg);
+            completeArgs.AddRange(args);
+            var contentTypes = new MediaTypeCollection();
+            foreach (var arg in completeArgs)
+            {
+                var contentType = new MediaType(arg);
+                if (contentType.HasWildcard)
+                {
+                    throw new InvalidOperationException(
+                        Resources.FormatMatchAllContentTypeIsNotAllowed(arg));
+                }
+
+                contentTypes.Add(arg);
+            }
+
+            return contentTypes;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesResponseTypeAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesResponseTypeAttribute.cs
new file mode 100644
index 0000000000..7c0d25c6a4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesResponseTypeAttribute.cs
@@ -0,0 +1,57 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.Formatters;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A filter that specifies the type of the value and status code returned by the action.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
+    public class ProducesResponseTypeAttribute : Attribute, IApiResponseMetadataProvider
+    {
+        /// <summary>
+        /// Initializes an instance of <see cref="ProducesResponseTypeAttribute"/>.
+        /// </summary>       
+        /// <param name="statusCode">The HTTP response status code.</param>
+        public ProducesResponseTypeAttribute(int statusCode)
+            : this(typeof(void), statusCode)
+        {
+        }
+
+        /// <summary>
+        /// Initializes an instance of <see cref="ProducesResponseTypeAttribute"/>.
+        /// </summary>
+        /// <param name="type">The <see cref="Type"/> of object that is going to be written in the response.</param>
+        /// <param name="statusCode">The HTTP response status code.</param>
+        public ProducesResponseTypeAttribute(Type type, int statusCode)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            Type = type;
+            StatusCode = statusCode;
+        }
+
+        /// <summary>
+        /// Gets or sets the type of the value returned by an action.
+        /// </summary>
+        public Type Type { get; set; }
+
+        /// <summary>
+        /// Gets or sets the HTTP status code of the response.
+        /// </summary>
+        public int StatusCode { get; set; }
+
+        /// <inheritdoc />
+        void IApiResponseMetadataProvider.SetContentTypes(MediaTypeCollection contentTypes)
+        {
+            // Users are supposed to use the 'Produces' attribute to set the content types that an action can support.
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..abaed09181
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Properties/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+// 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.
+
+using System.Runtime.CompilerServices;
+using Microsoft.AspNetCore.Mvc.Formatters;
+
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Core.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TestCommon, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
+[assembly: TypeForwardedTo(typeof(InputFormatterException))]
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..d60a46fe66
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Properties/Resources.Designer.cs
@@ -0,0 +1,1486 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.Core
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class Resources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.Core.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// The argument '{0}' is invalid. Media types which match all types or match all subtypes are not supported.
+        /// </summary>
+        internal static string MatchAllContentTypeIsNotAllowed
+        {
+            get => GetString("MatchAllContentTypeIsNotAllowed");
+        }
+
+        /// <summary>
+        /// The argument '{0}' is invalid. Media types which match all types or match all subtypes are not supported.
+        /// </summary>
+        internal static string FormatMatchAllContentTypeIsNotAllowed(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MatchAllContentTypeIsNotAllowed"), p0);
+
+        /// <summary>
+        /// The content-type '{0}' added in the '{1}' property is invalid. Media types which match all types or match all subtypes are not supported.
+        /// </summary>
+        internal static string ObjectResult_MatchAllContentType
+        {
+            get => GetString("ObjectResult_MatchAllContentType");
+        }
+
+        /// <summary>
+        /// The content-type '{0}' added in the '{1}' property is invalid. Media types which match all types or match all subtypes are not supported.
+        /// </summary>
+        internal static string FormatObjectResult_MatchAllContentType(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ObjectResult_MatchAllContentType"), p0, p1);
+
+        /// <summary>
+        /// The method '{0}' on type '{1}' returned an instance of '{2}'. Make sure to call Unwrap on the returned value to avoid unobserved faulted Task.
+        /// </summary>
+        internal static string ActionExecutor_WrappedTaskInstance
+        {
+            get => GetString("ActionExecutor_WrappedTaskInstance");
+        }
+
+        /// <summary>
+        /// The method '{0}' on type '{1}' returned an instance of '{2}'. Make sure to call Unwrap on the returned value to avoid unobserved faulted Task.
+        /// </summary>
+        internal static string FormatActionExecutor_WrappedTaskInstance(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ActionExecutor_WrappedTaskInstance"), p0, p1, p2);
+
+        /// <summary>
+        /// The method '{0}' on type '{1}' returned a Task instance even though it is not an asynchronous method.
+        /// </summary>
+        internal static string ActionExecutor_UnexpectedTaskInstance
+        {
+            get => GetString("ActionExecutor_UnexpectedTaskInstance");
+        }
+
+        /// <summary>
+        /// The method '{0}' on type '{1}' returned a Task instance even though it is not an asynchronous method.
+        /// </summary>
+        internal static string FormatActionExecutor_UnexpectedTaskInstance(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ActionExecutor_UnexpectedTaskInstance"), p0, p1);
+
+        /// <summary>
+        /// An action invoker could not be created for action '{0}'.
+        /// </summary>
+        internal static string ActionInvokerFactory_CouldNotCreateInvoker
+        {
+            get => GetString("ActionInvokerFactory_CouldNotCreateInvoker");
+        }
+
+        /// <summary>
+        /// An action invoker could not be created for action '{0}'.
+        /// </summary>
+        internal static string FormatActionInvokerFactory_CouldNotCreateInvoker(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ActionInvokerFactory_CouldNotCreateInvoker"), p0);
+
+        /// <summary>
+        /// The action descriptor must be of type '{0}'.
+        /// </summary>
+        internal static string ActionDescriptorMustBeBasedOnControllerAction
+        {
+            get => GetString("ActionDescriptorMustBeBasedOnControllerAction");
+        }
+
+        /// <summary>
+        /// The action descriptor must be of type '{0}'.
+        /// </summary>
+        internal static string FormatActionDescriptorMustBeBasedOnControllerAction(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ActionDescriptorMustBeBasedOnControllerAction"), p0);
+
+        /// <summary>
+        /// Value cannot be null or empty.
+        /// </summary>
+        internal static string ArgumentCannotBeNullOrEmpty
+        {
+            get => GetString("ArgumentCannotBeNullOrEmpty");
+        }
+
+        /// <summary>
+        /// Value cannot be null or empty.
+        /// </summary>
+        internal static string FormatArgumentCannotBeNullOrEmpty()
+            => GetString("ArgumentCannotBeNullOrEmpty");
+
+        /// <summary>
+        /// The '{0}' property of '{1}' must not be null.
+        /// </summary>
+        internal static string PropertyOfTypeCannotBeNull
+        {
+            get => GetString("PropertyOfTypeCannotBeNull");
+        }
+
+        /// <summary>
+        /// The '{0}' property of '{1}' must not be null.
+        /// </summary>
+        internal static string FormatPropertyOfTypeCannotBeNull(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("PropertyOfTypeCannotBeNull"), p0, p1);
+
+        /// <summary>
+        /// The '{0}' method of type '{1}' cannot return a null value.
+        /// </summary>
+        internal static string TypeMethodMustReturnNotNullValue
+        {
+            get => GetString("TypeMethodMustReturnNotNullValue");
+        }
+
+        /// <summary>
+        /// The '{0}' method of type '{1}' cannot return a null value.
+        /// </summary>
+        internal static string FormatTypeMethodMustReturnNotNullValue(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TypeMethodMustReturnNotNullValue"), p0, p1);
+
+        /// <summary>
+        /// The value '{0}' is invalid.
+        /// </summary>
+        internal static string ModelBinding_NullValueNotValid
+        {
+            get => GetString("ModelBinding_NullValueNotValid");
+        }
+
+        /// <summary>
+        /// The value '{0}' is invalid.
+        /// </summary>
+        internal static string FormatModelBinding_NullValueNotValid(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ModelBinding_NullValueNotValid"), p0);
+
+        /// <summary>
+        /// The passed expression of expression node type '{0}' is invalid. Only simple member access expressions for model properties are supported.
+        /// </summary>
+        internal static string Invalid_IncludePropertyExpression
+        {
+            get => GetString("Invalid_IncludePropertyExpression");
+        }
+
+        /// <summary>
+        /// The passed expression of expression node type '{0}' is invalid. Only simple member access expressions for model properties are supported.
+        /// </summary>
+        internal static string FormatInvalid_IncludePropertyExpression(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("Invalid_IncludePropertyExpression"), p0);
+
+        /// <summary>
+        /// No route matches the supplied values.
+        /// </summary>
+        internal static string NoRoutesMatched
+        {
+            get => GetString("NoRoutesMatched");
+        }
+
+        /// <summary>
+        /// No route matches the supplied values.
+        /// </summary>
+        internal static string FormatNoRoutesMatched()
+            => GetString("NoRoutesMatched");
+
+        /// <summary>
+        /// If an {0} provides a result value by setting the {1} property of {2} to a non-null value, then it cannot call the next filter by invoking {3}.
+        /// </summary>
+        internal static string AsyncActionFilter_InvalidShortCircuit
+        {
+            get => GetString("AsyncActionFilter_InvalidShortCircuit");
+        }
+
+        /// <summary>
+        /// If an {0} provides a result value by setting the {1} property of {2} to a non-null value, then it cannot call the next filter by invoking {3}.
+        /// </summary>
+        internal static string FormatAsyncActionFilter_InvalidShortCircuit(object p0, object p1, object p2, object p3)
+            => string.Format(CultureInfo.CurrentCulture, GetString("AsyncActionFilter_InvalidShortCircuit"), p0, p1, p2, p3);
+
+        /// <summary>
+        /// If an {0} cancels execution by setting the {1} property of {2} to 'true', then it cannot call the next filter by invoking {3}.
+        /// </summary>
+        internal static string AsyncResultFilter_InvalidShortCircuit
+        {
+            get => GetString("AsyncResultFilter_InvalidShortCircuit");
+        }
+
+        /// <summary>
+        /// If an {0} cancels execution by setting the {1} property of {2} to 'true', then it cannot call the next filter by invoking {3}.
+        /// </summary>
+        internal static string FormatAsyncResultFilter_InvalidShortCircuit(object p0, object p1, object p2, object p3)
+            => string.Format(CultureInfo.CurrentCulture, GetString("AsyncResultFilter_InvalidShortCircuit"), p0, p1, p2, p3);
+
+        /// <summary>
+        /// The type provided to '{0}' must implement '{1}'.
+        /// </summary>
+        internal static string FilterFactoryAttribute_TypeMustImplementIFilter
+        {
+            get => GetString("FilterFactoryAttribute_TypeMustImplementIFilter");
+        }
+
+        /// <summary>
+        /// The type provided to '{0}' must implement '{1}'.
+        /// </summary>
+        internal static string FormatFilterFactoryAttribute_TypeMustImplementIFilter(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("FilterFactoryAttribute_TypeMustImplementIFilter"), p0, p1);
+
+        /// <summary>
+        /// Cannot return null from an action method with a return type of '{0}'.
+        /// </summary>
+        internal static string ActionResult_ActionReturnValueCannotBeNull
+        {
+            get => GetString("ActionResult_ActionReturnValueCannotBeNull");
+        }
+
+        /// <summary>
+        /// Cannot return null from an action method with a return type of '{0}'.
+        /// </summary>
+        internal static string FormatActionResult_ActionReturnValueCannotBeNull(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ActionResult_ActionReturnValueCannotBeNull"), p0);
+
+        /// <summary>
+        /// The type '{0}' must derive from '{1}'.
+        /// </summary>
+        internal static string TypeMustDeriveFromType
+        {
+            get => GetString("TypeMustDeriveFromType");
+        }
+
+        /// <summary>
+        /// The type '{0}' must derive from '{1}'.
+        /// </summary>
+        internal static string FormatTypeMustDeriveFromType(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TypeMustDeriveFromType"), p0, p1);
+
+        /// <summary>
+        /// No encoding found for input formatter '{0}'. There must be at least one supported encoding registered in order for the formatter to read content.
+        /// </summary>
+        internal static string InputFormatterNoEncoding
+        {
+            get => GetString("InputFormatterNoEncoding");
+        }
+
+        /// <summary>
+        /// No encoding found for input formatter '{0}'. There must be at least one supported encoding registered in order for the formatter to read content.
+        /// </summary>
+        internal static string FormatInputFormatterNoEncoding(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("InputFormatterNoEncoding"), p0);
+
+        /// <summary>
+        /// Unsupported content type '{0}'.
+        /// </summary>
+        internal static string UnsupportedContentType
+        {
+            get => GetString("UnsupportedContentType");
+        }
+
+        /// <summary>
+        /// Unsupported content type '{0}'.
+        /// </summary>
+        internal static string FormatUnsupportedContentType(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("UnsupportedContentType"), p0);
+
+        /// <summary>
+        /// No supported media type registered for output formatter '{0}'. There must be at least one supported media type registered in order for the output formatter to write content.
+        /// </summary>
+        internal static string OutputFormatterNoMediaType
+        {
+            get => GetString("OutputFormatterNoMediaType");
+        }
+
+        /// <summary>
+        /// No supported media type registered for output formatter '{0}'. There must be at least one supported media type registered in order for the output formatter to write content.
+        /// </summary>
+        internal static string FormatOutputFormatterNoMediaType(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("OutputFormatterNoMediaType"), p0);
+
+        /// <summary>
+        /// The following errors occurred with attribute routing information:{0}{0}{1}
+        /// </summary>
+        internal static string AttributeRoute_AggregateErrorMessage
+        {
+            get => GetString("AttributeRoute_AggregateErrorMessage");
+        }
+
+        /// <summary>
+        /// The following errors occurred with attribute routing information:{0}{0}{1}
+        /// </summary>
+        internal static string FormatAttributeRoute_AggregateErrorMessage(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_AggregateErrorMessage"), p0, p1);
+
+        /// <summary>
+        /// The attribute route '{0}' cannot contain a parameter named '{{{1}}}'. Use '[{1}]' in the route template to insert the value '{2}'.
+        /// </summary>
+        internal static string AttributeRoute_CannotContainParameter
+        {
+            get => GetString("AttributeRoute_CannotContainParameter");
+        }
+
+        /// <summary>
+        /// The attribute route '{0}' cannot contain a parameter named '{{{1}}}'. Use '[{1}]' in the route template to insert the value '{2}'.
+        /// </summary>
+        internal static string FormatAttributeRoute_CannotContainParameter(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_CannotContainParameter"), p0, p1, p2);
+
+        /// <summary>
+        /// For action: '{0}'{1}Error: {2}
+        /// </summary>
+        internal static string AttributeRoute_IndividualErrorMessage
+        {
+            get => GetString("AttributeRoute_IndividualErrorMessage");
+        }
+
+        /// <summary>
+        /// For action: '{0}'{1}Error: {2}
+        /// </summary>
+        internal static string FormatAttributeRoute_IndividualErrorMessage(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_IndividualErrorMessage"), p0, p1, p2);
+
+        /// <summary>
+        /// An empty replacement token ('[]') is not allowed.
+        /// </summary>
+        internal static string AttributeRoute_TokenReplacement_EmptyTokenNotAllowed
+        {
+            get => GetString("AttributeRoute_TokenReplacement_EmptyTokenNotAllowed");
+        }
+
+        /// <summary>
+        /// An empty replacement token ('[]') is not allowed.
+        /// </summary>
+        internal static string FormatAttributeRoute_TokenReplacement_EmptyTokenNotAllowed()
+            => GetString("AttributeRoute_TokenReplacement_EmptyTokenNotAllowed");
+
+        /// <summary>
+        /// Token delimiters ('[', ']') are imbalanced.
+        /// </summary>
+        internal static string AttributeRoute_TokenReplacement_ImbalancedSquareBrackets
+        {
+            get => GetString("AttributeRoute_TokenReplacement_ImbalancedSquareBrackets");
+        }
+
+        /// <summary>
+        /// Token delimiters ('[', ']') are imbalanced.
+        /// </summary>
+        internal static string FormatAttributeRoute_TokenReplacement_ImbalancedSquareBrackets()
+            => GetString("AttributeRoute_TokenReplacement_ImbalancedSquareBrackets");
+
+        /// <summary>
+        /// The route template '{0}' has invalid syntax. {1}
+        /// </summary>
+        internal static string AttributeRoute_TokenReplacement_InvalidSyntax
+        {
+            get => GetString("AttributeRoute_TokenReplacement_InvalidSyntax");
+        }
+
+        /// <summary>
+        /// The route template '{0}' has invalid syntax. {1}
+        /// </summary>
+        internal static string FormatAttributeRoute_TokenReplacement_InvalidSyntax(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_TokenReplacement_InvalidSyntax"), p0, p1);
+
+        /// <summary>
+        /// While processing template '{0}', a replacement value for the token '{1}' could not be found. Available tokens: '{2}'. To use a '[' or ']' as a literal string in a route or within a constraint, use '[[' or ']]' instead.
+        /// </summary>
+        internal static string AttributeRoute_TokenReplacement_ReplacementValueNotFound
+        {
+            get => GetString("AttributeRoute_TokenReplacement_ReplacementValueNotFound");
+        }
+
+        /// <summary>
+        /// While processing template '{0}', a replacement value for the token '{1}' could not be found. Available tokens: '{2}'. To use a '[' or ']' as a literal string in a route or within a constraint, use '[[' or ']]' instead.
+        /// </summary>
+        internal static string FormatAttributeRoute_TokenReplacement_ReplacementValueNotFound(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_TokenReplacement_ReplacementValueNotFound"), p0, p1, p2);
+
+        /// <summary>
+        /// A replacement token is not closed.
+        /// </summary>
+        internal static string AttributeRoute_TokenReplacement_UnclosedToken
+        {
+            get => GetString("AttributeRoute_TokenReplacement_UnclosedToken");
+        }
+
+        /// <summary>
+        /// A replacement token is not closed.
+        /// </summary>
+        internal static string FormatAttributeRoute_TokenReplacement_UnclosedToken()
+            => GetString("AttributeRoute_TokenReplacement_UnclosedToken");
+
+        /// <summary>
+        /// An unescaped '[' token is not allowed inside of a replacement token. Use '[[' to escape.
+        /// </summary>
+        internal static string AttributeRoute_TokenReplacement_UnescapedBraceInToken
+        {
+            get => GetString("AttributeRoute_TokenReplacement_UnescapedBraceInToken");
+        }
+
+        /// <summary>
+        /// An unescaped '[' token is not allowed inside of a replacement token. Use '[[' to escape.
+        /// </summary>
+        internal static string FormatAttributeRoute_TokenReplacement_UnescapedBraceInToken()
+            => GetString("AttributeRoute_TokenReplacement_UnescapedBraceInToken");
+
+        /// <summary>
+        /// Unable to find the required services. Please add all the required services by calling '{0}.{1}' inside the call to '{2}' in the application startup code.
+        /// </summary>
+        internal static string UnableToFindServices
+        {
+            get => GetString("UnableToFindServices");
+        }
+
+        /// <summary>
+        /// Unable to find the required services. Please add all the required services by calling '{0}.{1}' inside the call to '{2}' in the application startup code.
+        /// </summary>
+        internal static string FormatUnableToFindServices(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("UnableToFindServices"), p0, p1, p2);
+
+        /// <summary>
+        /// Action: '{0}' - Template: '{1}'
+        /// </summary>
+        internal static string AttributeRoute_DuplicateNames_Item
+        {
+            get => GetString("AttributeRoute_DuplicateNames_Item");
+        }
+
+        /// <summary>
+        /// Action: '{0}' - Template: '{1}'
+        /// </summary>
+        internal static string FormatAttributeRoute_DuplicateNames_Item(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_DuplicateNames_Item"), p0, p1);
+
+        /// <summary>
+        /// Attribute routes with the same name '{0}' must have the same template:{1}{2}
+        /// </summary>
+        internal static string AttributeRoute_DuplicateNames
+        {
+            get => GetString("AttributeRoute_DuplicateNames");
+        }
+
+        /// <summary>
+        /// Attribute routes with the same name '{0}' must have the same template:{1}{2}
+        /// </summary>
+        internal static string FormatAttributeRoute_DuplicateNames(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_DuplicateNames"), p0, p1, p2);
+
+        /// <summary>
+        /// Error {0}:{1}{2}
+        /// </summary>
+        internal static string AttributeRoute_AggregateErrorMessage_ErrorNumber
+        {
+            get => GetString("AttributeRoute_AggregateErrorMessage_ErrorNumber");
+        }
+
+        /// <summary>
+        /// Error {0}:{1}{2}
+        /// </summary>
+        internal static string FormatAttributeRoute_AggregateErrorMessage_ErrorNumber(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_AggregateErrorMessage_ErrorNumber"), p0, p1, p2);
+
+        /// <summary>
+        /// A method '{0}' must not define attribute routed actions and non attribute routed actions at the same time:{1}{2}{1}{1}Use 'AcceptVerbsAttribute' to create a single route that allows multiple HTTP verbs and defines a route, or set a route template in all attributes that constrain HTTP verbs.
+        /// </summary>
+        internal static string AttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod
+        {
+            get => GetString("AttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod");
+        }
+
+        /// <summary>
+        /// A method '{0}' must not define attribute routed actions and non attribute routed actions at the same time:{1}{2}{1}{1}Use 'AcceptVerbsAttribute' to create a single route that allows multiple HTTP verbs and defines a route, or set a route template in all attributes that constrain HTTP verbs.
+        /// </summary>
+        internal static string FormatAttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod"), p0, p1, p2);
+
+        /// <summary>
+        /// Action: '{0}' - Route Template: '{1}' - HTTP Verbs: '{2}'
+        /// </summary>
+        internal static string AttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod_Item
+        {
+            get => GetString("AttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod_Item");
+        }
+
+        /// <summary>
+        /// Action: '{0}' - Route Template: '{1}' - HTTP Verbs: '{2}'
+        /// </summary>
+        internal static string FormatAttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod_Item(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod_Item"), p0, p1, p2);
+
+        /// <summary>
+        /// (none)
+        /// </summary>
+        internal static string AttributeRoute_NullTemplateRepresentation
+        {
+            get => GetString("AttributeRoute_NullTemplateRepresentation");
+        }
+
+        /// <summary>
+        /// (none)
+        /// </summary>
+        internal static string FormatAttributeRoute_NullTemplateRepresentation()
+            => GetString("AttributeRoute_NullTemplateRepresentation");
+
+        /// <summary>
+        /// Multiple actions matched. The following actions matched route data and had all constraints satisfied:{0}{0}{1}
+        /// </summary>
+        internal static string DefaultActionSelector_AmbiguousActions
+        {
+            get => GetString("DefaultActionSelector_AmbiguousActions");
+        }
+
+        /// <summary>
+        /// Multiple actions matched. The following actions matched route data and had all constraints satisfied:{0}{0}{1}
+        /// </summary>
+        internal static string FormatDefaultActionSelector_AmbiguousActions(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("DefaultActionSelector_AmbiguousActions"), p0, p1);
+
+        /// <summary>
+        /// Could not find file: {0}
+        /// </summary>
+        internal static string FileResult_InvalidPath
+        {
+            get => GetString("FileResult_InvalidPath");
+        }
+
+        /// <summary>
+        /// Could not find file: {0}
+        /// </summary>
+        internal static string FormatFileResult_InvalidPath(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("FileResult_InvalidPath"), p0);
+
+        /// <summary>
+        /// The input was not valid.
+        /// </summary>
+        internal static string SerializableError_DefaultError
+        {
+            get => GetString("SerializableError_DefaultError");
+        }
+
+        /// <summary>
+        /// The input was not valid.
+        /// </summary>
+        internal static string FormatSerializableError_DefaultError()
+            => GetString("SerializableError_DefaultError");
+
+        /// <summary>
+        /// If an {0} provides a result value by setting the {1} property of {2} to a non-null value, then it cannot call the next filter by invoking {3}.
+        /// </summary>
+        internal static string AsyncResourceFilter_InvalidShortCircuit
+        {
+            get => GetString("AsyncResourceFilter_InvalidShortCircuit");
+        }
+
+        /// <summary>
+        /// If an {0} provides a result value by setting the {1} property of {2} to a non-null value, then it cannot call the next filter by invoking {3}.
+        /// </summary>
+        internal static string FormatAsyncResourceFilter_InvalidShortCircuit(object p0, object p1, object p2, object p3)
+            => string.Format(CultureInfo.CurrentCulture, GetString("AsyncResourceFilter_InvalidShortCircuit"), p0, p1, p2, p3);
+
+        /// <summary>
+        /// If the '{0}' property is not set to true, '{1}' property must be specified.
+        /// </summary>
+        internal static string ResponseCache_SpecifyDuration
+        {
+            get => GetString("ResponseCache_SpecifyDuration");
+        }
+
+        /// <summary>
+        /// If the '{0}' property is not set to true, '{1}' property must be specified.
+        /// </summary>
+        internal static string FormatResponseCache_SpecifyDuration(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ResponseCache_SpecifyDuration"), p0, p1);
+
+        /// <summary>
+        /// The action '{0}' has ApiExplorer enabled, but is using conventional routing. Only actions which use attribute routing support ApiExplorer.
+        /// </summary>
+        internal static string ApiExplorer_UnsupportedAction
+        {
+            get => GetString("ApiExplorer_UnsupportedAction");
+        }
+
+        /// <summary>
+        /// The action '{0}' has ApiExplorer enabled, but is using conventional routing. Only actions which use attribute routing support ApiExplorer.
+        /// </summary>
+        internal static string FormatApiExplorer_UnsupportedAction(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ApiExplorer_UnsupportedAction"), p0);
+
+        /// <summary>
+        /// The media type "{0}" is not valid. MediaTypes containing wildcards (*) are not allowed in formatter mappings.
+        /// </summary>
+        internal static string FormatterMappings_NotValidMediaType
+        {
+            get => GetString("FormatterMappings_NotValidMediaType");
+        }
+
+        /// <summary>
+        /// The media type "{0}" is not valid. MediaTypes containing wildcards (*) are not allowed in formatter mappings.
+        /// </summary>
+        internal static string FormatFormatterMappings_NotValidMediaType(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("FormatterMappings_NotValidMediaType"), p0);
+
+        /// <summary>
+        /// The format provided is invalid '{0}'. A format must be a non-empty file-extension, optionally prefixed with a '.' character.
+        /// </summary>
+        internal static string Format_NotValid
+        {
+            get => GetString("Format_NotValid");
+        }
+
+        /// <summary>
+        /// The format provided is invalid '{0}'. A format must be a non-empty file-extension, optionally prefixed with a '.' character.
+        /// </summary>
+        internal static string FormatFormat_NotValid(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("Format_NotValid"), p0);
+
+        /// <summary>
+        /// The '{0}' cache profile is not defined.
+        /// </summary>
+        internal static string CacheProfileNotFound
+        {
+            get => GetString("CacheProfileNotFound");
+        }
+
+        /// <summary>
+        /// The '{0}' cache profile is not defined.
+        /// </summary>
+        internal static string FormatCacheProfileNotFound(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("CacheProfileNotFound"), p0);
+
+        /// <summary>
+        /// The model's runtime type '{0}' is not assignable to the type '{1}'.
+        /// </summary>
+        internal static string ModelType_WrongType
+        {
+            get => GetString("ModelType_WrongType");
+        }
+
+        /// <summary>
+        /// The model's runtime type '{0}' is not assignable to the type '{1}'.
+        /// </summary>
+        internal static string FormatModelType_WrongType(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ModelType_WrongType"), p0, p1);
+
+        /// <summary>
+        /// The type '{0}' cannot be activated by '{1}' because it is either a value type, an interface, an abstract class or an open generic type.
+        /// </summary>
+        internal static string ValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated
+        {
+            get => GetString("ValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated");
+        }
+
+        /// <summary>
+        /// The type '{0}' cannot be activated by '{1}' because it is either a value type, an interface, an abstract class or an open generic type.
+        /// </summary>
+        internal static string FormatValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated"), p0, p1);
+
+        /// <summary>
+        /// The type '{0}' must implement '{1}' to be used as a model binder.
+        /// </summary>
+        internal static string BinderType_MustBeIModelBinder
+        {
+            get => GetString("BinderType_MustBeIModelBinder");
+        }
+
+        /// <summary>
+        /// The type '{0}' must implement '{1}' to be used as a model binder.
+        /// </summary>
+        internal static string FormatBinderType_MustBeIModelBinder(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("BinderType_MustBeIModelBinder"), p0, p1);
+
+        /// <summary>
+        /// The provided binding source '{0}' is a composite. '{1}' requires that the source must represent a single type of input.
+        /// </summary>
+        internal static string BindingSource_CannotBeComposite
+        {
+            get => GetString("BindingSource_CannotBeComposite");
+        }
+
+        /// <summary>
+        /// The provided binding source '{0}' is a composite. '{1}' requires that the source must represent a single type of input.
+        /// </summary>
+        internal static string FormatBindingSource_CannotBeComposite(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("BindingSource_CannotBeComposite"), p0, p1);
+
+        /// <summary>
+        /// The provided binding source '{0}' is a greedy data source. '{1}' does not support greedy data sources.
+        /// </summary>
+        internal static string BindingSource_CannotBeGreedy
+        {
+            get => GetString("BindingSource_CannotBeGreedy");
+        }
+
+        /// <summary>
+        /// The provided binding source '{0}' is a greedy data source. '{1}' does not support greedy data sources.
+        /// </summary>
+        internal static string FormatBindingSource_CannotBeGreedy(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("BindingSource_CannotBeGreedy"), p0, p1);
+
+        /// <summary>
+        /// The property {0}.{1} could not be found.
+        /// </summary>
+        internal static string Common_PropertyNotFound
+        {
+            get => GetString("Common_PropertyNotFound");
+        }
+
+        /// <summary>
+        /// The property {0}.{1} could not be found.
+        /// </summary>
+        internal static string FormatCommon_PropertyNotFound(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("Common_PropertyNotFound"), p0, p1);
+
+        /// <summary>
+        /// The key '{0}' is invalid JQuery syntax because it is missing a closing bracket.
+        /// </summary>
+        internal static string JQueryFormValueProviderFactory_MissingClosingBracket
+        {
+            get => GetString("JQueryFormValueProviderFactory_MissingClosingBracket");
+        }
+
+        /// <summary>
+        /// The key '{0}' is invalid JQuery syntax because it is missing a closing bracket.
+        /// </summary>
+        internal static string FormatJQueryFormValueProviderFactory_MissingClosingBracket(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("JQueryFormValueProviderFactory_MissingClosingBracket"), p0);
+
+        /// <summary>
+        /// A value is required.
+        /// </summary>
+        internal static string KeyValuePair_BothKeyAndValueMustBePresent
+        {
+            get => GetString("KeyValuePair_BothKeyAndValueMustBePresent");
+        }
+
+        /// <summary>
+        /// A value is required.
+        /// </summary>
+        internal static string FormatKeyValuePair_BothKeyAndValueMustBePresent()
+            => GetString("KeyValuePair_BothKeyAndValueMustBePresent");
+
+        /// <summary>
+        /// The binding context has a null Model, but this binder requires a non-null model of type '{0}'.
+        /// </summary>
+        internal static string ModelBinderUtil_ModelCannotBeNull
+        {
+            get => GetString("ModelBinderUtil_ModelCannotBeNull");
+        }
+
+        /// <summary>
+        /// The binding context has a null Model, but this binder requires a non-null model of type '{0}'.
+        /// </summary>
+        internal static string FormatModelBinderUtil_ModelCannotBeNull(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ModelBinderUtil_ModelCannotBeNull"), p0);
+
+        /// <summary>
+        /// The binding context has a Model of type '{0}', but this binder can only operate on models of type '{1}'.
+        /// </summary>
+        internal static string ModelBinderUtil_ModelInstanceIsWrong
+        {
+            get => GetString("ModelBinderUtil_ModelInstanceIsWrong");
+        }
+
+        /// <summary>
+        /// The binding context has a Model of type '{0}', but this binder can only operate on models of type '{1}'.
+        /// </summary>
+        internal static string FormatModelBinderUtil_ModelInstanceIsWrong(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ModelBinderUtil_ModelInstanceIsWrong"), p0, p1);
+
+        /// <summary>
+        /// The binding context cannot have a null ModelMetadata.
+        /// </summary>
+        internal static string ModelBinderUtil_ModelMetadataCannotBeNull
+        {
+            get => GetString("ModelBinderUtil_ModelMetadataCannotBeNull");
+        }
+
+        /// <summary>
+        /// The binding context cannot have a null ModelMetadata.
+        /// </summary>
+        internal static string FormatModelBinderUtil_ModelMetadataCannotBeNull()
+            => GetString("ModelBinderUtil_ModelMetadataCannotBeNull");
+
+        /// <summary>
+        /// A value for the '{0}' property was not provided.
+        /// </summary>
+        internal static string ModelBinding_MissingBindRequiredMember
+        {
+            get => GetString("ModelBinding_MissingBindRequiredMember");
+        }
+
+        /// <summary>
+        /// A value for the '{0}' property was not provided.
+        /// </summary>
+        internal static string FormatModelBinding_MissingBindRequiredMember(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ModelBinding_MissingBindRequiredMember"), p0);
+
+        /// <summary>
+        /// A non-empty request body is required.
+        /// </summary>
+        internal static string ModelBinding_MissingRequestBodyRequiredMember
+        {
+            get => GetString("ModelBinding_MissingRequestBodyRequiredMember");
+        }
+
+        /// <summary>
+        /// A non-empty request body is required.
+        /// </summary>
+        internal static string FormatModelBinding_MissingRequestBodyRequiredMember()
+            => GetString("ModelBinding_MissingRequestBodyRequiredMember");
+
+        /// <summary>
+        /// The parameter conversion from type '{0}' to type '{1}' failed because no type converter can convert between these types.
+        /// </summary>
+        internal static string ValueProviderResult_NoConverterExists
+        {
+            get => GetString("ValueProviderResult_NoConverterExists");
+        }
+
+        /// <summary>
+        /// The parameter conversion from type '{0}' to type '{1}' failed because no type converter can convert between these types.
+        /// </summary>
+        internal static string FormatValueProviderResult_NoConverterExists(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ValueProviderResult_NoConverterExists"), p0, p1);
+
+        /// <summary>
+        /// Path '{0}' was not rooted.
+        /// </summary>
+        internal static string FileResult_PathNotRooted
+        {
+            get => GetString("FileResult_PathNotRooted");
+        }
+
+        /// <summary>
+        /// Path '{0}' was not rooted.
+        /// </summary>
+        internal static string FormatFileResult_PathNotRooted(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("FileResult_PathNotRooted"), p0);
+
+        /// <summary>
+        /// The supplied URL is not local. A URL with an absolute path is considered local if it does not have a host/authority part. URLs using virtual paths ('~/') are also local.
+        /// </summary>
+        internal static string UrlNotLocal
+        {
+            get => GetString("UrlNotLocal");
+        }
+
+        /// <summary>
+        /// The supplied URL is not local. A URL with an absolute path is considered local if it does not have a host/authority part. URLs using virtual paths ('~/') are also local.
+        /// </summary>
+        internal static string FormatUrlNotLocal()
+            => GetString("UrlNotLocal");
+
+        /// <summary>
+        /// The argument '{0}' is invalid. Empty or null formats are not supported.
+        /// </summary>
+        internal static string FormatFormatterMappings_GetMediaTypeMappingForFormat_InvalidFormat
+        {
+            get => GetString("FormatFormatterMappings_GetMediaTypeMappingForFormat_InvalidFormat");
+        }
+
+        /// <summary>
+        /// The argument '{0}' is invalid. Empty or null formats are not supported.
+        /// </summary>
+        internal static string FormatFormatFormatterMappings_GetMediaTypeMappingForFormat_InvalidFormat(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("FormatFormatterMappings_GetMediaTypeMappingForFormat_InvalidFormat"), p0);
+
+        /// <summary>
+        /// "Invalid values '{0}'."
+        /// </summary>
+        internal static string AcceptHeaderParser_ParseAcceptHeader_InvalidValues
+        {
+            get => GetString("AcceptHeaderParser_ParseAcceptHeader_InvalidValues");
+        }
+
+        /// <summary>
+        /// "Invalid values '{0}'."
+        /// </summary>
+        internal static string FormatAcceptHeaderParser_ParseAcceptHeader_InvalidValues(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("AcceptHeaderParser_ParseAcceptHeader_InvalidValues"), p0);
+
+        /// <summary>
+        /// The value '{0}' is not valid for {1}.
+        /// </summary>
+        internal static string ModelState_AttemptedValueIsInvalid
+        {
+            get => GetString("ModelState_AttemptedValueIsInvalid");
+        }
+
+        /// <summary>
+        /// The value '{0}' is not valid for {1}.
+        /// </summary>
+        internal static string FormatModelState_AttemptedValueIsInvalid(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ModelState_AttemptedValueIsInvalid"), p0, p1);
+
+        /// <summary>
+        /// The value '{0}' is not valid.
+        /// </summary>
+        internal static string ModelState_NonPropertyAttemptedValueIsInvalid
+        {
+            get => GetString("ModelState_NonPropertyAttemptedValueIsInvalid");
+        }
+
+        /// <summary>
+        /// The value '{0}' is not valid.
+        /// </summary>
+        internal static string FormatModelState_NonPropertyAttemptedValueIsInvalid(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ModelState_NonPropertyAttemptedValueIsInvalid"), p0);
+
+        /// <summary>
+        /// The supplied value is invalid for {0}.
+        /// </summary>
+        internal static string ModelState_UnknownValueIsInvalid
+        {
+            get => GetString("ModelState_UnknownValueIsInvalid");
+        }
+
+        /// <summary>
+        /// The supplied value is invalid for {0}.
+        /// </summary>
+        internal static string FormatModelState_UnknownValueIsInvalid(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ModelState_UnknownValueIsInvalid"), p0);
+
+        /// <summary>
+        /// The supplied value is invalid.
+        /// </summary>
+        internal static string ModelState_NonPropertyUnknownValueIsInvalid
+        {
+            get => GetString("ModelState_NonPropertyUnknownValueIsInvalid");
+        }
+
+        /// <summary>
+        /// The supplied value is invalid.
+        /// </summary>
+        internal static string FormatModelState_NonPropertyUnknownValueIsInvalid()
+            => GetString("ModelState_NonPropertyUnknownValueIsInvalid");
+
+        /// <summary>
+        /// The value '{0}' is invalid.
+        /// </summary>
+        internal static string HtmlGeneration_ValueIsInvalid
+        {
+            get => GetString("HtmlGeneration_ValueIsInvalid");
+        }
+
+        /// <summary>
+        /// The value '{0}' is invalid.
+        /// </summary>
+        internal static string FormatHtmlGeneration_ValueIsInvalid(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("HtmlGeneration_ValueIsInvalid"), p0);
+
+        /// <summary>
+        /// The field {0} must be a number.
+        /// </summary>
+        internal static string HtmlGeneration_ValueMustBeNumber
+        {
+            get => GetString("HtmlGeneration_ValueMustBeNumber");
+        }
+
+        /// <summary>
+        /// The field {0} must be a number.
+        /// </summary>
+        internal static string FormatHtmlGeneration_ValueMustBeNumber(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("HtmlGeneration_ValueMustBeNumber"), p0);
+
+        /// <summary>
+        /// The field must be a number.
+        /// </summary>
+        internal static string HtmlGeneration_NonPropertyValueMustBeNumber
+        {
+            get => GetString("HtmlGeneration_NonPropertyValueMustBeNumber");
+        }
+
+        /// <summary>
+        /// The field must be a number.
+        /// </summary>
+        internal static string FormatHtmlGeneration_NonPropertyValueMustBeNumber()
+            => GetString("HtmlGeneration_NonPropertyValueMustBeNumber");
+
+        /// <summary>
+        /// The list of '{0}' must not be empty. Add at least one supported encoding.
+        /// </summary>
+        internal static string TextInputFormatter_SupportedEncodingsMustNotBeEmpty
+        {
+            get => GetString("TextInputFormatter_SupportedEncodingsMustNotBeEmpty");
+        }
+
+        /// <summary>
+        /// The list of '{0}' must not be empty. Add at least one supported encoding.
+        /// </summary>
+        internal static string FormatTextInputFormatter_SupportedEncodingsMustNotBeEmpty(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TextInputFormatter_SupportedEncodingsMustNotBeEmpty"), p0);
+
+        /// <summary>
+        /// The list of '{0}' must not be empty. Add at least one supported encoding.
+        /// </summary>
+        internal static string TextOutputFormatter_SupportedEncodingsMustNotBeEmpty
+        {
+            get => GetString("TextOutputFormatter_SupportedEncodingsMustNotBeEmpty");
+        }
+
+        /// <summary>
+        /// The list of '{0}' must not be empty. Add at least one supported encoding.
+        /// </summary>
+        internal static string FormatTextOutputFormatter_SupportedEncodingsMustNotBeEmpty(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TextOutputFormatter_SupportedEncodingsMustNotBeEmpty"), p0);
+
+        /// <summary>
+        /// '{0}' is not supported by '{1}'. Use '{2}' instead.
+        /// </summary>
+        internal static string TextOutputFormatter_WriteResponseBodyAsyncNotSupported
+        {
+            get => GetString("TextOutputFormatter_WriteResponseBodyAsyncNotSupported");
+        }
+
+        /// <summary>
+        /// '{0}' is not supported by '{1}'. Use '{2}' instead.
+        /// </summary>
+        internal static string FormatTextOutputFormatter_WriteResponseBodyAsyncNotSupported(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TextOutputFormatter_WriteResponseBodyAsyncNotSupported"), p0, p1, p2);
+
+        /// <summary>
+        /// No media types found in '{0}.{1}'. Add at least one media type to the list of supported media types.
+        /// </summary>
+        internal static string Formatter_NoMediaTypes
+        {
+            get => GetString("Formatter_NoMediaTypes");
+        }
+
+        /// <summary>
+        /// No media types found in '{0}.{1}'. Add at least one media type to the list of supported media types.
+        /// </summary>
+        internal static string FormatFormatter_NoMediaTypes(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("Formatter_NoMediaTypes"), p0, p1);
+
+        /// <summary>
+        /// Could not create a model binder for model object of type '{0}'.
+        /// </summary>
+        internal static string CouldNotCreateIModelBinder
+        {
+            get => GetString("CouldNotCreateIModelBinder");
+        }
+
+        /// <summary>
+        /// Could not create a model binder for model object of type '{0}'.
+        /// </summary>
+        internal static string FormatCouldNotCreateIModelBinder(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("CouldNotCreateIModelBinder"), p0);
+
+        /// <summary>
+        /// '{0}.{1}' must not be empty. At least one '{2}' is required to bind from the body.
+        /// </summary>
+        internal static string InputFormattersAreRequired
+        {
+            get => GetString("InputFormattersAreRequired");
+        }
+
+        /// <summary>
+        /// '{0}.{1}' must not be empty. At least one '{2}' is required to bind from the body.
+        /// </summary>
+        internal static string FormatInputFormattersAreRequired(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("InputFormattersAreRequired"), p0, p1, p2);
+
+        /// <summary>
+        /// '{0}.{1}' must not be empty. At least one '{2}' is required to model bind.
+        /// </summary>
+        internal static string ModelBinderProvidersAreRequired
+        {
+            get => GetString("ModelBinderProvidersAreRequired");
+        }
+
+        /// <summary>
+        /// '{0}.{1}' must not be empty. At least one '{2}' is required to model bind.
+        /// </summary>
+        internal static string FormatModelBinderProvidersAreRequired(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ModelBinderProvidersAreRequired"), p0, p1, p2);
+
+        /// <summary>
+        /// '{0}.{1}' must not be empty. At least one '{2}' is required to format a response.
+        /// </summary>
+        internal static string OutputFormattersAreRequired
+        {
+            get => GetString("OutputFormattersAreRequired");
+        }
+
+        /// <summary>
+        /// '{0}.{1}' must not be empty. At least one '{2}' is required to format a response.
+        /// </summary>
+        internal static string FormatOutputFormattersAreRequired(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("OutputFormattersAreRequired"), p0, p1, p2);
+
+        /// <summary>
+        /// Multiple overloads of method '{0}' are not supported.
+        /// </summary>
+        internal static string MiddewareFilter_ConfigureMethodOverload
+        {
+            get => GetString("MiddewareFilter_ConfigureMethodOverload");
+        }
+
+        /// <summary>
+        /// Multiple overloads of method '{0}' are not supported.
+        /// </summary>
+        internal static string FormatMiddewareFilter_ConfigureMethodOverload(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MiddewareFilter_ConfigureMethodOverload"), p0);
+
+        /// <summary>
+        /// A public method named '{0}' could not be found in the '{1}' type.
+        /// </summary>
+        internal static string MiddewareFilter_NoConfigureMethod
+        {
+            get => GetString("MiddewareFilter_NoConfigureMethod");
+        }
+
+        /// <summary>
+        /// A public method named '{0}' could not be found in the '{1}' type.
+        /// </summary>
+        internal static string FormatMiddewareFilter_NoConfigureMethod(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MiddewareFilter_NoConfigureMethod"), p0, p1);
+
+        /// <summary>
+        /// Could not find '{0}' in the feature list.
+        /// </summary>
+        internal static string MiddlewareFilterBuilder_NoMiddlewareFeature
+        {
+            get => GetString("MiddlewareFilterBuilder_NoMiddlewareFeature");
+        }
+
+        /// <summary>
+        /// Could not find '{0}' in the feature list.
+        /// </summary>
+        internal static string FormatMiddlewareFilterBuilder_NoMiddlewareFeature(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MiddlewareFilterBuilder_NoMiddlewareFeature"), p0);
+
+        /// <summary>
+        /// The '{0}' property cannot be null.
+        /// </summary>
+        internal static string MiddlewareFilterBuilder_NullApplicationBuilder
+        {
+            get => GetString("MiddlewareFilterBuilder_NullApplicationBuilder");
+        }
+
+        /// <summary>
+        /// The '{0}' property cannot be null.
+        /// </summary>
+        internal static string FormatMiddlewareFilterBuilder_NullApplicationBuilder(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MiddlewareFilterBuilder_NullApplicationBuilder"), p0);
+
+        /// <summary>
+        /// The '{0}' method in the type '{1}' must have a return type of '{2}'.
+        /// </summary>
+        internal static string MiddlewareFilter_InvalidConfigureReturnType
+        {
+            get => GetString("MiddlewareFilter_InvalidConfigureReturnType");
+        }
+
+        /// <summary>
+        /// The '{0}' method in the type '{1}' must have a return type of '{2}'.
+        /// </summary>
+        internal static string FormatMiddlewareFilter_InvalidConfigureReturnType(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MiddlewareFilter_InvalidConfigureReturnType"), p0, p1, p2);
+
+        /// <summary>
+        /// Could not resolve a service of type '{0}' for the parameter '{1}' of method '{2}' on type '{3}'.
+        /// </summary>
+        internal static string MiddlewareFilter_ServiceResolutionFail
+        {
+            get => GetString("MiddlewareFilter_ServiceResolutionFail");
+        }
+
+        /// <summary>
+        /// Could not resolve a service of type '{0}' for the parameter '{1}' of method '{2}' on type '{3}'.
+        /// </summary>
+        internal static string FormatMiddlewareFilter_ServiceResolutionFail(object p0, object p1, object p2, object p3)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MiddlewareFilter_ServiceResolutionFail"), p0, p1, p2, p3);
+
+        /// <summary>
+        /// An {0} cannot be created without a valid instance of {1}.
+        /// </summary>
+        internal static string AuthorizeFilter_AuthorizationPolicyCannotBeCreated
+        {
+            get => GetString("AuthorizeFilter_AuthorizationPolicyCannotBeCreated");
+        }
+
+        /// <summary>
+        /// An {0} cannot be created without a valid instance of {1}.
+        /// </summary>
+        internal static string FormatAuthorizeFilter_AuthorizationPolicyCannotBeCreated(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("AuthorizeFilter_AuthorizationPolicyCannotBeCreated"), p0, p1);
+
+        /// <summary>
+        /// The '{0}' cannot bind to a model of type '{1}'. Change the model type to '{2}' instead.
+        /// </summary>
+        internal static string FormCollectionModelBinder_CannotBindToFormCollection
+        {
+            get => GetString("FormCollectionModelBinder_CannotBindToFormCollection");
+        }
+
+        /// <summary>
+        /// The '{0}' cannot bind to a model of type '{1}'. Change the model type to '{2}' instead.
+        /// </summary>
+        internal static string FormatFormCollectionModelBinder_CannotBindToFormCollection(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("FormCollectionModelBinder_CannotBindToFormCollection"), p0, p1, p2);
+
+        /// <summary>
+        /// '{0}' requires the response cache middleware.
+        /// </summary>
+        internal static string VaryByQueryKeys_Requires_ResponseCachingMiddleware
+        {
+            get => GetString("VaryByQueryKeys_Requires_ResponseCachingMiddleware");
+        }
+
+        /// <summary>
+        /// '{0}' requires the response cache middleware.
+        /// </summary>
+        internal static string FormatVaryByQueryKeys_Requires_ResponseCachingMiddleware(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("VaryByQueryKeys_Requires_ResponseCachingMiddleware"), p0);
+
+        /// <summary>
+        /// A duplicate entry for library reference {0} was found. Please check that all package references in all projects use the same casing for the same package references.
+        /// </summary>
+        internal static string CandidateResolver_DifferentCasedReference
+        {
+            get => GetString("CandidateResolver_DifferentCasedReference");
+        }
+
+        /// <summary>
+        /// A duplicate entry for library reference {0} was found. Please check that all package references in all projects use the same casing for the same package references.
+        /// </summary>
+        internal static string FormatCandidateResolver_DifferentCasedReference(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("CandidateResolver_DifferentCasedReference"), p0);
+
+        /// <summary>
+        /// Unable to create an instance of type '{0}'. The type specified in {1} must not be abstract and must have a parameterless constructor.
+        /// </summary>
+        internal static string MiddlewareFilterConfigurationProvider_CreateConfigureDelegate_CannotCreateType
+        {
+            get => GetString("MiddlewareFilterConfigurationProvider_CreateConfigureDelegate_CannotCreateType");
+        }
+
+        /// <summary>
+        /// Unable to create an instance of type '{0}'. The type specified in {1} must not be abstract and must have a parameterless constructor.
+        /// </summary>
+        internal static string FormatMiddlewareFilterConfigurationProvider_CreateConfigureDelegate_CannotCreateType(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MiddlewareFilterConfigurationProvider_CreateConfigureDelegate_CannotCreateType"), p0, p1);
+
+        /// <summary>
+        /// '{0}' and '{1}' are out of bounds for the string.
+        /// </summary>
+        internal static string Argument_InvalidOffsetLength
+        {
+            get => GetString("Argument_InvalidOffsetLength");
+        }
+
+        /// <summary>
+        /// '{0}' and '{1}' are out of bounds for the string.
+        /// </summary>
+        internal static string FormatArgument_InvalidOffsetLength(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("Argument_InvalidOffsetLength"), p0, p1);
+
+        /// <summary>
+        /// Could not create an instance of type '{0}'. Model bound complex types must not be abstract or value types and must have a parameterless constructor.
+        /// </summary>
+        internal static string ComplexTypeModelBinder_NoParameterlessConstructor_ForType
+        {
+            get => GetString("ComplexTypeModelBinder_NoParameterlessConstructor_ForType");
+        }
+
+        /// <summary>
+        /// Could not create an instance of type '{0}'. Model bound complex types must not be abstract or value types and must have a parameterless constructor.
+        /// </summary>
+        internal static string FormatComplexTypeModelBinder_NoParameterlessConstructor_ForType(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ComplexTypeModelBinder_NoParameterlessConstructor_ForType"), p0);
+
+        /// <summary>
+        /// Could not create an instance of type '{0}'. Model bound complex types must not be abstract or value types and must have a parameterless constructor. Alternatively, set the '{1}' property to a non-null value in the '{2}' constructor.
+        /// </summary>
+        internal static string ComplexTypeModelBinder_NoParameterlessConstructor_ForProperty
+        {
+            get => GetString("ComplexTypeModelBinder_NoParameterlessConstructor_ForProperty");
+        }
+
+        /// <summary>
+        /// Could not create an instance of type '{0}'. Model bound complex types must not be abstract or value types and must have a parameterless constructor. Alternatively, set the '{1}' property to a non-null value in the '{2}' constructor.
+        /// </summary>
+        internal static string FormatComplexTypeModelBinder_NoParameterlessConstructor_ForProperty(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ComplexTypeModelBinder_NoParameterlessConstructor_ForProperty"), p0, p1, p2);
+
+        /// <summary>
+        /// No page named '{0}' matches the supplied values.
+        /// </summary>
+        internal static string NoRoutesMatchedForPage
+        {
+            get => GetString("NoRoutesMatchedForPage");
+        }
+
+        /// <summary>
+        /// No page named '{0}' matches the supplied values.
+        /// </summary>
+        internal static string FormatNoRoutesMatchedForPage(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("NoRoutesMatchedForPage"), p0);
+
+        /// <summary>
+        /// The relative page path '{0}' can only be used while executing a Razor Page. Specify a root relative path with a leading '/' to generate a URL outside of a Razor Page.
+        /// </summary>
+        internal static string UrlHelper_RelativePagePathIsNotSupported
+        {
+            get => GetString("UrlHelper_RelativePagePathIsNotSupported");
+        }
+
+        /// <summary>
+        /// The relative page path '{0}' can only be used while executing a Razor Page. Specify a root relative path with a leading '/' to generate a URL outside of a Razor Page.
+        /// </summary>
+        internal static string FormatUrlHelper_RelativePagePathIsNotSupported(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("UrlHelper_RelativePagePathIsNotSupported"), p0);
+
+        /// <summary>
+        /// One or more validation errors occurred.
+        /// </summary>
+        internal static string ValidationProblemDescription_Title
+        {
+            get => GetString("ValidationProblemDescription_Title");
+        }
+
+        /// <summary>
+        /// One or more validation errors occurred.
+        /// </summary>
+        internal static string FormatValidationProblemDescription_Title()
+            => GetString("ValidationProblemDescription_Title");
+
+        /// <summary>
+        /// Action '{0}' does not have an attribute route. Action methods on controllers annotated with {1} must be attribute routed.
+        /// </summary>
+        internal static string ApiController_AttributeRouteRequired
+        {
+            get => GetString("ApiController_AttributeRouteRequired");
+        }
+
+        /// <summary>
+        /// Action '{0}' does not have an attribute route. Action methods on controllers annotated with {1} must be attribute routed.
+        /// </summary>
+        internal static string FormatApiController_AttributeRouteRequired(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ApiController_AttributeRouteRequired"), p0, p1);
+
+        /// <summary>
+        /// No file provider has been configured to process the supplied file.
+        /// </summary>
+        internal static string VirtualFileResultExecutor_NoFileProviderConfigured
+        {
+            get => GetString("VirtualFileResultExecutor_NoFileProviderConfigured");
+        }
+
+        /// <summary>
+        /// No file provider has been configured to process the supplied file.
+        /// </summary>
+        internal static string FormatVirtualFileResultExecutor_NoFileProviderConfigured()
+            => GetString("VirtualFileResultExecutor_NoFileProviderConfigured");
+
+        /// <summary>
+        /// Type {0} specified by {1} is invalid. Type specified by {1} must derive from {2}.
+        /// </summary>
+        internal static string ApplicationPartFactory_InvalidFactoryType
+        {
+            get => GetString("ApplicationPartFactory_InvalidFactoryType");
+        }
+
+        /// <summary>
+        /// Type {0} specified by {1} is invalid. Type specified by {1} must derive from {2}.
+        /// </summary>
+        internal static string FormatApplicationPartFactory_InvalidFactoryType(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ApplicationPartFactory_InvalidFactoryType"), p0, p1, p2);
+
+        /// <summary>
+        /// {0} specified on {1} cannot be self referential.
+        /// </summary>
+        internal static string RelatedAssemblyAttribute_AssemblyCannotReferenceSelf
+        {
+            get => GetString("RelatedAssemblyAttribute_AssemblyCannotReferenceSelf");
+        }
+
+        /// <summary>
+        /// {0} specified on {1} cannot be self referential.
+        /// </summary>
+        internal static string FormatRelatedAssemblyAttribute_AssemblyCannotReferenceSelf(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("RelatedAssemblyAttribute_AssemblyCannotReferenceSelf"), p0, p1);
+
+        /// <summary>
+        /// Related assembly '{0}' specified by assembly '{1}' could not be found in the directory {2}. Related assemblies must be co-located with the specifying assemblies.
+        /// </summary>
+        internal static string RelatedAssemblyAttribute_CouldNotBeFound
+        {
+            get => GetString("RelatedAssemblyAttribute_CouldNotBeFound");
+        }
+
+        /// <summary>
+        /// Related assembly '{0}' specified by assembly '{1}' could not be found in the directory {2}. Related assemblies must be co-located with the specifying assemblies.
+        /// </summary>
+        internal static string FormatRelatedAssemblyAttribute_CouldNotBeFound(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("RelatedAssemblyAttribute_CouldNotBeFound"), p0, p1, p2);
+
+        /// <summary>
+        /// Each related assembly must be declared by exactly one assembly. The assembly '{0}' was declared as related assembly by the following:
+        /// </summary>
+        internal static string ApplicationAssembliesProvider_DuplicateRelatedAssembly
+        {
+            get => GetString("ApplicationAssembliesProvider_DuplicateRelatedAssembly");
+        }
+
+        /// <summary>
+        /// Each related assembly must be declared by exactly one assembly. The assembly '{0}' was declared as related assembly by the following:
+        /// </summary>
+        internal static string FormatApplicationAssembliesProvider_DuplicateRelatedAssembly(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ApplicationAssembliesProvider_DuplicateRelatedAssembly"), p0);
+
+        /// <summary>
+        /// Assembly '{0}' declared as a related assembly by assembly '{1}' cannot define additional related assemblies.
+        /// </summary>
+        internal static string ApplicationAssembliesProvider_RelatedAssemblyCannotDefineAdditional
+        {
+            get => GetString("ApplicationAssembliesProvider_RelatedAssemblyCannotDefineAdditional");
+        }
+
+        /// <summary>
+        /// Assembly '{0}' declared as a related assembly by assembly '{1}' cannot define additional related assemblies.
+        /// </summary>
+        internal static string FormatApplicationAssembliesProvider_RelatedAssemblyCannotDefineAdditional(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ApplicationAssembliesProvider_RelatedAssemblyCannotDefineAdditional"), p0, p1);
+
+        /// <summary>
+        /// Could not create an instance of type '{0}'. Model bound complex types must not be abstract or value types and must have a parameterless constructor. Alternatively, give the '{1}' parameter a non-null default value.
+        /// </summary>
+        internal static string ComplexTypeModelBinder_NoParameterlessConstructor_ForParameter
+        {
+            get => GetString("ComplexTypeModelBinder_NoParameterlessConstructor_ForParameter");
+        }
+
+        /// <summary>
+        /// Could not create an instance of type '{0}'. Model bound complex types must not be abstract or value types and must have a parameterless constructor. Alternatively, give the '{1}' parameter a non-null default value.
+        /// </summary>
+        internal static string FormatComplexTypeModelBinder_NoParameterlessConstructor_ForParameter(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ComplexTypeModelBinder_NoParameterlessConstructor_ForParameter"), p0, p1);
+
+        /// <summary>
+        /// Action '{0}' has more than one parameter that were specified or inferred as bound from request body. Only one parameter per action may be bound from body. Inspect the following parameters, and use '{1}' to specify query string bound, '{2}' to specify route bound, and '{3}' for parameters to be bound from body:
+        /// </summary>
+        internal static string ApiController_MultipleBodyParametersFound
+        {
+            get => GetString("ApiController_MultipleBodyParametersFound");
+        }
+
+        /// <summary>
+        /// Action '{0}' has more than one parameter that were specified or inferred as bound from request body. Only one parameter per action may be bound from body. Inspect the following parameters, and use '{1}' to specify query string bound, '{2}' to specify route bound, and '{3}' for parameters to be bound from body:
+        /// </summary>
+        internal static string FormatApiController_MultipleBodyParametersFound(object p0, object p1, object p2, object p3)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ApiController_MultipleBodyParametersFound"), p0, p1, p2, p3);
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectResult.cs
new file mode 100644
index 0000000000..6aae329d12
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectResult.cs
@@ -0,0 +1,156 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="ActionResult"/> that returns a Found (302), Moved Permanently (301), Temporary Redirect (307),
+    /// or Permanent Redirect (308) response with a Location header to the supplied URL.
+    /// </summary>
+    public class RedirectResult : ActionResult, IKeepTempDataResult
+    {
+        private string _url;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectResult"/> class with the values
+        /// provided.
+        /// </summary>
+        /// <param name="url">The local URL to redirect to.</param>
+        public RedirectResult(string url)
+            : this(url, permanent: false)
+        {
+            if (url == null)
+            {
+                throw new ArgumentNullException(nameof(url));
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectResult"/> class with the values
+        /// provided.
+        /// </summary>
+        /// <param name="url">The URL to redirect to.</param>
+        /// <param name="permanent">Specifies whether the redirect should be permanent (301) or temporary (302).</param>
+        public RedirectResult(string url, bool permanent)
+            : this(url, permanent, preserveMethod: false)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectResult"/> class with the values
+        /// provided.
+        /// </summary>
+        /// <param name="url">The URL to redirect to.</param>
+        /// <param name="permanent">Specifies whether the redirect should be permanent (301) or temporary (302).</param>
+        /// <param name="preserveMethod">If set to true, make the temporary redirect (307) or permanent redirect (308) preserve the initial request method.</param>
+        public RedirectResult(string url, bool permanent, bool preserveMethod)
+        {
+            if (url == null)
+            {
+                throw new ArgumentNullException(nameof(url));
+            }
+
+            if (string.IsNullOrEmpty(url))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(url));
+            }
+
+            Permanent = permanent;
+            PreserveMethod = preserveMethod;
+            Url = url;
+        }
+
+        /// <summary>
+        /// Gets or sets the value that specifies that the redirect should be permanent if true or temporary if false.
+        /// </summary>
+        public bool Permanent { get; set; }
+
+        /// <summary>
+        /// Gets or sets an indication that the redirect preserves the initial request method.
+        /// </summary>
+        public bool PreserveMethod { get; set; }
+
+        /// <summary>
+        /// Gets or sets the URL to redirect to.
+        /// </summary>
+        public string Url
+        {
+            get => _url;
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                {
+                    throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(value));
+                }
+
+                _url = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IUrlHelper"/> for this result.
+        /// </summary>
+        public IUrlHelper UrlHelper { get; set; }
+
+        /// <inheritdoc />
+        public override Task ExecuteResultAsync(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var executor = context.HttpContext.RequestServices.GetRequiredService<IActionResultExecutor<RedirectResult>>();
+            return executor.ExecuteAsync(context, this);
+        }
+
+#pragma warning disable CS0809
+        [Obsolete("This implementation will be removed in a future release, use ExecuteResultAsync.")]
+        public override void ExecuteResult(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var services = context.HttpContext.RequestServices;
+            var urlHelperFactory = services.GetRequiredService<IUrlHelperFactory>();
+            var logger = services.GetRequiredService<ILogger<RedirectResult>>();
+
+            var urlHelper = UrlHelper ?? urlHelperFactory.GetUrlHelper(context);
+
+            // IsLocalUrl is called to handle URLs starting with '~/'.
+            var destinationUrl = Url;
+            if (urlHelper.IsLocalUrl(destinationUrl))
+            {
+                destinationUrl = urlHelper.Content(Url);
+            }
+
+            logger.RedirectResultExecuting(destinationUrl);
+
+            if (PreserveMethod)
+            {
+                context.HttpContext.Response.StatusCode = Permanent ?
+                    StatusCodes.Status308PermanentRedirect : StatusCodes.Status307TemporaryRedirect;
+                context.HttpContext.Response.Headers[HeaderNames.Location] = destinationUrl;
+            }
+            else
+            {
+                context.HttpContext.Response.Redirect(destinationUrl, Permanent);
+            }
+        }
+#pragma warning restore CS0809
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectToActionResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectToActionResult.cs
new file mode 100644
index 0000000000..7e48ac38c3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectToActionResult.cs
@@ -0,0 +1,228 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="ActionResult"/> that returns a Found (302), Moved Permanently (301), Temporary Redirect (307),
+    /// or Permanent Redirect (308) response with a Location header.
+    /// Targets a controller action.
+    /// </summary>
+    public class RedirectToActionResult : ActionResult, IKeepTempDataResult
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToActionResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="actionName">The name of the action to use for generating the URL.</param>
+        /// <param name="controllerName">The name of the controller to use for generating the URL.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        public RedirectToActionResult(
+            string actionName,
+            string controllerName,
+            object routeValues)
+            : this(actionName, controllerName, routeValues, permanent: false)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToActionResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="actionName">The name of the action to use for generating the URL.</param>
+        /// <param name="controllerName">The name of the controller to use for generating the URL.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        public RedirectToActionResult(
+            string actionName,
+            string controllerName,
+            object routeValues,
+            string fragment)
+            : this(actionName, controllerName, routeValues, permanent: false, fragment: fragment)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToActionResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="actionName">The name of the action to use for generating the URL.</param>
+        /// <param name="controllerName">The name of the controller to use for generating the URL.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="permanent">If set to true, makes the redirect permanent (301). Otherwise a temporary redirect is used (302).</param>
+        public RedirectToActionResult(
+            string actionName,
+            string controllerName,
+            object routeValues,
+            bool permanent)
+            : this(actionName, controllerName, routeValues, permanent, fragment: null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToActionResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="actionName">The name of the action to use for generating the URL.</param>
+        /// <param name="controllerName">The name of the controller to use for generating the URL.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="permanent">If set to true, makes the redirect permanent (301). Otherwise a temporary redirect is used (302).</param>
+        /// <param name="preserveMethod">If set to true, make the temporary redirect (307) or permanent redirect (308) preserve the initial request method.</param>
+        public RedirectToActionResult(
+            string actionName,
+            string controllerName,
+            object routeValues,
+            bool permanent,
+            bool preserveMethod)
+            : this(actionName, controllerName, routeValues, permanent, preserveMethod, fragment: null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToActionResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="actionName">The name of the action to use for generating the URL.</param>
+        /// <param name="controllerName">The name of the controller to use for generating the URL.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="permanent">If set to true, makes the redirect permanent (301). Otherwise a temporary redirect is used (302).</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        public RedirectToActionResult(
+            string actionName,
+            string controllerName,
+            object routeValues,
+            bool permanent,
+            string fragment)
+            : this(actionName, controllerName, routeValues, permanent, preserveMethod: false, fragment: fragment)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToActionResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="actionName">The name of the action to use for generating the URL.</param>
+        /// <param name="controllerName">The name of the controller to use for generating the URL.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="permanent">If set to true, makes the redirect permanent (301). Otherwise a temporary redirect is used (302).</param>
+        /// <param name="preserveMethod">If set to true, make the temporary redirect (307) and permanent redirect (308) preserve the initial request method.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        public RedirectToActionResult(
+            string actionName,
+            string controllerName,
+            object routeValues,
+            bool permanent,
+            bool preserveMethod,
+            string fragment)
+        {
+            ActionName = actionName;
+            ControllerName = controllerName;
+            RouteValues = routeValues == null ? null : new RouteValueDictionary(routeValues);
+            Permanent = permanent;
+            PreserveMethod = preserveMethod;
+            Fragment = fragment;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IUrlHelper" /> used to generate URLs.
+        /// </summary>
+        public IUrlHelper UrlHelper { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the action to use for generating the URL.
+        /// </summary>
+        public string ActionName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the controller to use for generating the URL.
+        /// </summary>
+        public string ControllerName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the route data to use for generating the URL.
+        /// </summary>
+        public RouteValueDictionary RouteValues { get; set; }
+
+        /// <summary>
+        /// Gets or sets an indication that the redirect is permanent.
+        /// </summary>
+        public bool Permanent { get; set; }
+
+        /// <summary>
+        /// Gets or sets an indication that the redirect preserves the initial request method.
+        /// </summary>
+        public bool PreserveMethod { get; set; }
+
+        /// <summary>
+        /// Gets or sets the fragment to add to the URL.
+        /// </summary>
+        public string Fragment { get; set; }
+
+        /// <inheritdoc />
+        public override Task ExecuteResultAsync(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var executor = context.HttpContext.RequestServices.GetRequiredService<IActionResultExecutor<RedirectToActionResult>>();
+            return executor.ExecuteAsync(context, this);
+        }
+
+#pragma warning disable CS0809
+        [Obsolete("This implementation will be removed in a future release, use ExecuteResultAsync.")]
+        public override void ExecuteResult(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var services = context.HttpContext.RequestServices;
+            var urlHelperFactory = services.GetRequiredService<IUrlHelperFactory>();
+            var logger = services.GetRequiredService<ILogger<RedirectToActionResultExecutor>>();
+
+            var urlHelper = UrlHelper ?? urlHelperFactory.GetUrlHelper(context);
+
+            var destinationUrl = urlHelper.Action(
+                ActionName,
+                ControllerName,
+                RouteValues,
+                protocol: null,
+                host: null,
+                fragment: Fragment);
+            if (string.IsNullOrEmpty(destinationUrl))
+            {
+                throw new InvalidOperationException(Resources.NoRoutesMatched);
+            }
+
+            logger.RedirectToActionResultExecuting(destinationUrl);
+
+            if (PreserveMethod)
+            {
+                context.HttpContext.Response.StatusCode = Permanent ?
+                    StatusCodes.Status308PermanentRedirect : StatusCodes.Status307TemporaryRedirect;
+                context.HttpContext.Response.Headers[HeaderNames.Location] = destinationUrl;
+            }
+            else
+            {
+                context.HttpContext.Response.Redirect(destinationUrl, Permanent);
+            }
+        }
+#pragma warning restore CS0809
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectToPageResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectToPageResult.cs
new file mode 100644
index 0000000000..4728a4a08c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectToPageResult.cs
@@ -0,0 +1,267 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="ActionResult"/> that returns a Found (302)
+    /// or Moved Permanently (301) response with a Location header.
+    /// Targets a registered route.
+    /// </summary>
+    public class RedirectToPageResult : ActionResult, IKeepTempDataResult
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToPageResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="pageName">The page to redirect to.</param>
+        public RedirectToPageResult(string pageName)
+            : this(pageName, routeValues: null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToPageResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="pageName">The page to redirect to.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        public RedirectToPageResult(string pageName, string pageHandler)
+            : this(pageName, pageHandler, routeValues: null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToPageResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="pageName">The page to redirect to.</param>
+        /// <param name="routeValues">The parameters for the route.</param>
+        public RedirectToPageResult(string pageName, object routeValues)
+            : this(pageName, pageHandler: null, routeValues: routeValues, permanent: false)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToPageResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="pageName">The page to redirect to.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The parameters for the route.</param>
+        public RedirectToPageResult(string pageName, string pageHandler, object routeValues)
+            : this(pageName, pageHandler, routeValues, permanent: false)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToPageResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The parameters for the page.</param>
+        /// <param name="permanent">If set to true, makes the redirect permanent (301). Otherwise a temporary redirect is used (302).</param>
+        public RedirectToPageResult(
+            string pageName,
+            string pageHandler,
+            object routeValues,
+            bool permanent)
+            : this(pageName, pageHandler, routeValues, permanent, fragment: null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToPageResult"/> with the values provided.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The parameters for the page.</param>
+        /// <param name="permanent">If set to true, makes the redirect permanent (301). Otherwise a temporary redirect is used (302).</param>
+        /// <param name="preserveMethod">If set to true, make the temporary redirect (307) or permanent redirect (308) preserve the initial request method.</param>
+        public RedirectToPageResult(
+            string pageName,
+            string pageHandler,
+            object routeValues,
+            bool permanent,
+            bool preserveMethod)
+            : this(pageName, pageHandler, routeValues, permanent, preserveMethod, fragment: null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToPageResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The parameters for the route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        public RedirectToPageResult(
+            string pageName,
+            string pageHandler,
+            object routeValues,
+            string fragment)
+            : this(pageName, pageHandler, routeValues, permanent: false, fragment: fragment)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToPageResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The parameters for the page.</param>
+        /// <param name="permanent">If set to true, makes the redirect permanent (301). Otherwise a temporary redirect is used (302).</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        public RedirectToPageResult(
+            string pageName,
+            string pageHandler,
+            object routeValues,
+            bool permanent,
+            string fragment)
+            : this(pageName, pageHandler, routeValues, permanent, preserveMethod: false, fragment: fragment)
+        {
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToPageResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The parameters for the page.</param>
+        /// <param name="permanent">If set to true, makes the redirect permanent (301). Otherwise a temporary redirect is used (302).</param>
+        /// <param name="preserveMethod">If set to true, make the temporary redirect (307) or permanent redirect (308) preserve the initial request method.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        public RedirectToPageResult(
+            string pageName,
+            string pageHandler,
+            object routeValues,
+            bool permanent,
+            bool preserveMethod,
+            string fragment)
+        {
+            PageName = pageName;
+            PageHandler = pageHandler;
+            RouteValues = routeValues == null ? null : new RouteValueDictionary(routeValues);
+            PreserveMethod = preserveMethod;
+            Permanent = permanent;
+            Fragment = fragment;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IUrlHelper" /> used to generate URLs.
+        /// </summary>
+        public IUrlHelper UrlHelper { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the page to route to.
+        /// </summary>
+        public string PageName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the page handler to redirect to.
+        /// </summary>
+        public string PageHandler { get; set; }
+
+        /// <summary>
+        /// Gets or sets the route data to use for generating the URL.
+        /// </summary>
+        public RouteValueDictionary RouteValues { get; set; }
+
+        /// <summary>
+        /// Gets or sets an indication that the redirect is permanent.
+        /// </summary>
+        public bool Permanent { get; set; }
+
+        /// <summary>
+        /// Gets or sets an indication that the redirect preserves the initial request method.
+        /// </summary>
+        public bool PreserveMethod { get; set; }
+
+        /// <summary>
+        /// Gets or sets the fragment to add to the URL.
+        /// </summary>
+        public string Fragment { get; set; }
+
+        /// <summary>
+        /// Gets or sets the protocol for the URL, such as "http" or "https".
+        /// </summary>
+        public string Protocol { get; set; }
+
+        /// <summary>
+        /// Gets or sets the host name of the URL.
+        /// </summary>
+        public string Host { get; set; }
+
+        /// <inheritdoc />
+        public override Task ExecuteResultAsync(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var executor = context.HttpContext.RequestServices.GetRequiredService<IActionResultExecutor<RedirectToPageResult>>();
+            return executor.ExecuteAsync(context, this);
+        }
+
+#pragma warning disable CS0809
+        [Obsolete("This implementation will be removed in a future release, use ExecuteResultAsync.")]
+        public override void ExecuteResult(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var services = context.HttpContext.RequestServices;
+            var urlHelperFactory = services.GetRequiredService<IUrlHelperFactory>();
+            var logger = services.GetRequiredService<ILogger<RedirectToPageResult>>();
+
+            var urlHelper = UrlHelper ?? urlHelperFactory.GetUrlHelper(context);
+            var destinationUrl = urlHelper.Page(
+                PageName,
+                PageHandler,
+                RouteValues,
+                Protocol,
+                Host,
+                fragment: Fragment);
+
+            if (string.IsNullOrEmpty(destinationUrl))
+            {
+                throw new InvalidOperationException(Resources.FormatNoRoutesMatchedForPage(PageName));
+            }
+
+            logger.RedirectToPageResultExecuting(PageName);
+
+            if (PreserveMethod)
+            {
+                context.HttpContext.Response.StatusCode = Permanent ?
+                    StatusCodes.Status308PermanentRedirect : StatusCodes.Status307TemporaryRedirect;
+                context.HttpContext.Response.Headers[HeaderNames.Location] = destinationUrl;
+            }
+            else
+            {
+                context.HttpContext.Response.Redirect(destinationUrl, Permanent);
+            }
+        }
+#pragma warning restore CS0809
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectToRouteResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectToRouteResult.cs
new file mode 100644
index 0000000000..500d8f3d2f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectToRouteResult.cs
@@ -0,0 +1,219 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="ActionResult"/> that returns a Found (302), Moved Permanently (301), Temporary Redirect (307),
+    /// or Permanent Redirect (308) response with a Location header.
+    /// Targets a registered route.
+    /// </summary>
+    public class RedirectToRouteResult : ActionResult, IKeepTempDataResult
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToRouteResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="routeValues">The parameters for the route.</param>
+        public RedirectToRouteResult(object routeValues)
+            : this(routeName: null, routeValues: routeValues)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToRouteResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The parameters for the route.</param>
+        public RedirectToRouteResult(
+            string routeName,
+            object routeValues)
+            : this(routeName, routeValues, permanent: false)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToRouteResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The parameters for the route.</param>
+        /// <param name="permanent">If set to true, makes the redirect permanent (301). Otherwise a temporary redirect is used (302).</param>
+        public RedirectToRouteResult(
+            string routeName,
+            object routeValues,
+            bool permanent)
+            : this(routeName, routeValues, permanent, fragment: null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToRouteResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The parameters for the route.</param>
+        /// <param name="permanent">If set to true, makes the redirect permanent (301). Otherwise a temporary redirect is used (302).</param>
+        /// <param name="preserveMethod">If set to true, make the temporary redirect (307) or permanent redirect (308) preserve the initial request method.</param>
+        public RedirectToRouteResult(
+            string routeName,
+            object routeValues,
+            bool permanent,
+            bool preserveMethod)
+            : this(routeName, routeValues, permanent, preserveMethod, fragment: null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToRouteResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The parameters for the route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        public RedirectToRouteResult(
+            string routeName,
+            object routeValues,
+            string fragment)
+            : this(routeName, routeValues, permanent: false, fragment: fragment)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToRouteResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The parameters for the route.</param>
+        /// <param name="permanent">If set to true, makes the redirect permanent (301). Otherwise a temporary redirect is used (302).</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        public RedirectToRouteResult(
+            string routeName,
+            object routeValues,
+            bool permanent,
+            string fragment)
+            : this(routeName, routeValues, permanent, preserveMethod: false, fragment: fragment)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RedirectToRouteResult"/> with the values
+        /// provided.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The parameters for the route.</param>
+        /// <param name="permanent">If set to true, makes the redirect permanent (301). Otherwise a temporary redirect is used (302).</param>
+        /// <param name="preserveMethod">If set to true, make the temporary redirect (307) or permanent redirect (308) preserve the initial request method.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        public RedirectToRouteResult(
+            string routeName,
+            object routeValues,
+            bool permanent,
+            bool preserveMethod,
+            string fragment)
+        {
+            RouteName = routeName;
+            RouteValues = routeValues == null ? null : new RouteValueDictionary(routeValues);
+            PreserveMethod = preserveMethod;
+            Permanent = permanent;
+            Fragment = fragment;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IUrlHelper" /> used to generate URLs.
+        /// </summary>
+        public IUrlHelper UrlHelper { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the route to use for generating the URL.
+        /// </summary>
+        public string RouteName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the route data to use for generating the URL.
+        /// </summary>
+        public RouteValueDictionary RouteValues { get; set; }
+
+        /// <summary>
+        /// Gets or sets an indication that the redirect is permanent.
+        /// </summary>
+        public bool Permanent { get; set; }
+
+        /// <summary>
+        /// Gets or sets an indication that the redirect preserves the initial request method.
+        /// </summary>
+        public bool PreserveMethod { get; set; }
+
+        /// <summary>
+        /// Gets or sets the fragment to add to the URL.
+        /// </summary>
+        public string Fragment { get; set; }
+
+        /// <inheritdoc />
+        public override Task ExecuteResultAsync(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var executor = context.HttpContext.RequestServices.GetRequiredService<IActionResultExecutor<RedirectToRouteResult>>();
+            return executor.ExecuteAsync(context, this);
+        }
+
+#pragma warning disable CS0809
+        [Obsolete("This implementation will be removed in a future release, use ExecuteResultAsync.")]
+        public override void ExecuteResult(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var services = context.HttpContext.RequestServices;
+            var urlHelperFactory = services.GetRequiredService<IUrlHelperFactory>();
+            var logger = services.GetRequiredService<ILogger<RedirectToRouteResult>>();
+
+            var urlHelper = UrlHelper ?? urlHelperFactory.GetUrlHelper(context);
+
+            var destinationUrl = urlHelper.RouteUrl(
+                RouteName,
+                RouteValues,
+                protocol: null,
+                host: null,
+                fragment: Fragment);
+            if (string.IsNullOrEmpty(destinationUrl))
+            {
+                throw new InvalidOperationException(Resources.NoRoutesMatched);
+            }
+
+            logger.RedirectToRouteResultExecuting(destinationUrl, RouteName);
+
+            if (PreserveMethod)
+            {
+                context.HttpContext.Response.StatusCode = Permanent ?
+                    StatusCodes.Status308PermanentRedirect : StatusCodes.Status307TemporaryRedirect;
+                context.HttpContext.Response.Headers[HeaderNames.Location] = destinationUrl;
+            }
+            else
+            {
+                context.HttpContext.Response.Redirect(destinationUrl, Permanent);
+            }
+        }
+#pragma warning restore CS0809
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RequestFormLimitsAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RequestFormLimitsAttribute.cs
new file mode 100644
index 0000000000..d1f1c73578
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RequestFormLimitsAttribute.cs
@@ -0,0 +1,154 @@
+// 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.
+
+using System;
+using System.IO;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Sets the specified limits to the <see cref="HttpRequest.Form"/>.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public class RequestFormLimitsAttribute : Attribute, IFilterFactory, IOrderedFilter
+    {
+        /// <summary>
+        /// Gets the order value for determining the order of execution of filters. Filters execute in
+        /// ascending numeric value of the <see cref="Order"/> property.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Filters are executed in an ordering determined by an ascending sort of the <see cref="Order"/> property.
+        /// </para>
+        /// <para>
+        /// The default Order for this attribute is 900 because it must run before ValidateAntiForgeryTokenAttribute and
+        /// after any filter which does authentication or login in order to allow them to behave as expected (ie Unauthenticated or Redirect instead of 400).
+        /// </para>
+        /// <para>
+        /// Look at <see cref="IOrderedFilter.Order"/> for more detailed info.
+        /// </para>
+        /// </remarks>
+        public int Order { get; set; } = 900;
+
+        /// <inheritdoc />
+        public bool IsReusable => true;
+
+        // Internal for unit testing
+        internal FormOptions FormOptions { get; } = new FormOptions();
+
+        /// <summary>
+        /// Enables full request body buffering. Use this if multiple components need to read the raw stream.
+        /// The default value is false.
+        /// </summary>
+        public bool BufferBody
+        {
+            get => FormOptions.BufferBody;
+            set => FormOptions.BufferBody = value;
+        }
+
+        /// <summary>
+        /// If <see cref="BufferBody"/> is enabled, this many bytes of the body will be buffered in memory.
+        /// If this threshold is exceeded then the buffer will be moved to a temp file on disk instead.
+        /// This also applies when buffering individual multipart section bodies.
+        /// </summary>
+        public int MemoryBufferThreshold
+        {
+            get => FormOptions.MemoryBufferThreshold;
+            set => FormOptions.MemoryBufferThreshold = value;
+        }
+
+        /// <summary>
+        /// If <see cref="BufferBody"/> is enabled, this is the limit for the total number of bytes that will
+        /// be buffered. Forms that exceed this limit will throw an <see cref="InvalidDataException"/> when parsed.
+        /// </summary>
+        public long BufferBodyLengthLimit
+        {
+            get => FormOptions.BufferBodyLengthLimit;
+            set => FormOptions.BufferBodyLengthLimit = value;
+        }
+
+        /// <summary>
+        /// A limit for the number of form entries to allow.
+        /// Forms that exceed this limit will throw an <see cref="InvalidDataException"/> when parsed.
+        /// </summary>
+        public int ValueCountLimit
+        {
+            get => FormOptions.ValueCountLimit;
+            set => FormOptions.ValueCountLimit = value;
+        }
+
+        /// <summary>
+        /// A limit on the length of individual keys. Forms containing keys that exceed this limit will
+        /// throw an <see cref="InvalidDataException"/> when parsed.
+        /// </summary>
+        public int KeyLengthLimit
+        {
+            get => FormOptions.KeyLengthLimit;
+            set => FormOptions.KeyLengthLimit = value;
+        }
+
+        /// <summary>
+        /// A limit on the length of individual form values. Forms containing values that exceed this
+        /// limit will throw an <see cref="InvalidDataException"/> when parsed.
+        /// </summary>
+        public int ValueLengthLimit
+        {
+            get => FormOptions.ValueLengthLimit;
+            set => FormOptions.ValueLengthLimit = value;
+        }
+
+        /// <summary>
+        /// A limit for the length of the boundary identifier. Forms with boundaries that exceed this
+        /// limit will throw an <see cref="InvalidDataException"/> when parsed.
+        /// </summary>
+        public int MultipartBoundaryLengthLimit
+        {
+            get => FormOptions.MultipartBoundaryLengthLimit;
+            set => FormOptions.MultipartBoundaryLengthLimit = value;
+        }
+
+        /// <summary>
+        /// A limit for the number of headers to allow in each multipart section. Headers with the same name will
+        /// be combined. Form sections that exceed this limit will throw an <see cref="InvalidDataException"/>
+        /// when parsed.
+        /// </summary>
+        public int MultipartHeadersCountLimit
+        {
+            get => FormOptions.MultipartHeadersCountLimit;
+            set => FormOptions.MultipartHeadersCountLimit = value;
+        }
+
+        /// <summary>
+        /// A limit for the total length of the header keys and values in each multipart section.
+        /// Form sections that exceed this limit will throw an <see cref="InvalidDataException"/> when parsed.
+        /// </summary>
+        public int MultipartHeadersLengthLimit
+        {
+            get => FormOptions.MultipartHeadersLengthLimit;
+            set => FormOptions.MultipartHeadersLengthLimit = value;
+        }
+
+        /// <summary>
+        /// A limit for the length of each multipart body. Forms sections that exceed this limit will throw an
+        /// <see cref="InvalidDataException"/> when parsed.
+        /// </summary>
+        public long MultipartBodyLengthLimit
+        {
+            get => FormOptions.MultipartBodyLengthLimit;
+            set => FormOptions.MultipartBodyLengthLimit = value;
+        }
+
+        /// <inheritdoc />
+        public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
+        {
+            var filter = serviceProvider.GetRequiredService<RequestFormLimitsFilter>();
+            filter.FormOptions = FormOptions;
+            return filter;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RequestSizeLimitAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RequestSizeLimitAttribute.cs
new file mode 100644
index 0000000000..95063ff857
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RequestSizeLimitAttribute.cs
@@ -0,0 +1,57 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Sets the request body size limit to the specified size.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public class RequestSizeLimitAttribute : Attribute, IFilterFactory, IOrderedFilter
+    {
+        private readonly long _bytes;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="RequestSizeLimitAttribute"/>.
+        /// </summary>
+        /// <param name="bytes">The request body size limit.</param>
+        public RequestSizeLimitAttribute(long bytes)
+        {
+            _bytes = bytes;
+        }
+
+        /// <summary>
+        /// Gets the order value for determining the order of execution of filters. Filters execute in
+        /// ascending numeric value of the <see cref="Order"/> property.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Filters are executed in an ordering determined by an ascending sort of the <see cref="Order"/> property.
+        /// </para>
+        /// <para>
+        /// The default Order for this attribute is 900 because it must run before ValidateAntiForgeryTokenAttribute and
+        /// after any filter which does authentication or login in order to allow them to behave as expected (ie Unauthenticated or Redirect instead of 400).
+        /// </para>
+        /// <para>
+        /// Look at <see cref="IOrderedFilter.Order"/> for more detailed info.
+        /// </para>
+        /// </remarks>
+        public int Order { get; set; } = 900;
+
+        /// <inheritdoc />
+        public bool IsReusable => true;
+
+        /// <inheritdoc />
+        public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
+        {
+            var filter = serviceProvider.GetRequiredService<RequestSizeLimitFilter>();
+            filter.Bytes = _bytes;
+            return filter;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RequireHttpsAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RequireHttpsAttribute.cs
new file mode 100644
index 0000000000..f8f9c19c01
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RequireHttpsAttribute.cs
@@ -0,0 +1,106 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An authorization filter that confirms requests are received over HTTPS.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = false)]
+    public class RequireHttpsAttribute : Attribute, IAuthorizationFilter, IOrderedFilter
+    {
+        private bool? _permanent;
+
+        /// <summary>
+        /// Specifies whether a permanent redirect, <c>301 Moved Permanently</c>,
+        /// should be used instead of a temporary redirect, <c>302 Found</c>.
+        /// </summary>
+        public bool Permanent
+        {
+            get { return _permanent ?? false; }
+            set { _permanent = value; }
+        }
+
+        /// <inheritdoc />
+        /// <value>Default is <c>int.MinValue + 50</c> to run this <see cref="IAuthorizationFilter"/> early.</value>
+        public int Order { get; set; } = int.MinValue + 50;
+
+        /// <summary>
+        /// Called early in the filter pipeline to confirm request is authorized. Confirms requests are received over
+        /// HTTPS. Takes no action for HTTPS requests. Otherwise if it was a GET request, sets
+        /// <see cref="AuthorizationFilterContext.Result"/> to a result which will redirect the client to the HTTPS
+        /// version of the request URI. Otherwise, sets <see cref="AuthorizationFilterContext.Result"/> to a result
+        /// which will set the status code to <c>403</c> (Forbidden).
+        /// </summary>
+        /// <inheritdoc />
+        public virtual void OnAuthorization(AuthorizationFilterContext filterContext)
+        {
+            if (filterContext == null)
+            {
+                throw new ArgumentNullException(nameof(filterContext));
+            }
+
+            if (!filterContext.HttpContext.Request.IsHttps)
+            {
+                HandleNonHttpsRequest(filterContext);
+            }
+        }
+
+        /// <summary>
+        /// Called from <see cref="OnAuthorization"/> if the request is not received over HTTPS. Expectation is
+        /// <see cref="AuthorizationFilterContext.Result"/> will not be <c>null</c> after this method returns.
+        /// </summary>
+        /// <param name="filterContext">The <see cref="AuthorizationFilterContext"/> to update.</param>
+        /// <remarks>
+        /// If it was a GET request, default implementation sets <see cref="AuthorizationFilterContext.Result"/> to a
+        /// result which will redirect the client to the HTTPS version of the request URI. Otherwise, default
+        /// implementation sets <see cref="AuthorizationFilterContext.Result"/> to a result which will set the status
+        /// code to <c>403</c> (Forbidden).
+        /// </remarks>
+        protected virtual void HandleNonHttpsRequest(AuthorizationFilterContext filterContext)
+        {
+            // only redirect for GET requests, otherwise the browser might not propagate the verb and request
+            // body correctly.
+            if (!string.Equals(filterContext.HttpContext.Request.Method, "GET", StringComparison.OrdinalIgnoreCase))
+            {
+                filterContext.Result = new StatusCodeResult(StatusCodes.Status403Forbidden);
+            }
+            else
+            {
+                var optionsAccessor = filterContext.HttpContext.RequestServices.GetRequiredService<IOptions<MvcOptions>>();
+
+                var request = filterContext.HttpContext.Request;
+
+                var host = request.Host;
+                if (optionsAccessor.Value.SslPort.HasValue && optionsAccessor.Value.SslPort > 0)
+                {
+                    // a specific SSL port is specified
+                    host = new HostString(host.Host, optionsAccessor.Value.SslPort.Value);
+                }
+                else
+                {
+                    // clear the port
+                    host = new HostString(host.Host);
+                }
+
+                var permanentValue = _permanent ?? optionsAccessor.Value.RequireHttpsPermanent;
+
+                var newUrl = string.Concat(
+                    "https://",
+                    host.ToUriComponent(),
+                    request.PathBase.ToUriComponent(),
+                    request.Path.ToUriComponent(),
+                    request.QueryString.ToUriComponent());
+
+                // redirect to HTTPS version of page
+                filterContext.Result = new RedirectResult(newUrl, permanentValue);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Resources.resx
new file mode 100644
index 0000000000..909febc6b4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Resources.resx
@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="MatchAllContentTypeIsNotAllowed" xml:space="preserve">
+    <value>The argument '{0}' is invalid. Media types which match all types or match all subtypes are not supported.</value>
+  </data>
+  <data name="ObjectResult_MatchAllContentType" xml:space="preserve">
+    <value>The content-type '{0}' added in the '{1}' property is invalid. Media types which match all types or match all subtypes are not supported.</value>
+  </data>
+  <data name="ActionExecutor_WrappedTaskInstance" xml:space="preserve">
+    <value>The method '{0}' on type '{1}' returned an instance of '{2}'. Make sure to call Unwrap on the returned value to avoid unobserved faulted Task.</value>
+  </data>
+  <data name="ActionExecutor_UnexpectedTaskInstance" xml:space="preserve">
+    <value>The method '{0}' on type '{1}' returned a Task instance even though it is not an asynchronous method.</value>
+  </data>
+  <data name="ActionInvokerFactory_CouldNotCreateInvoker" xml:space="preserve">
+    <value>An action invoker could not be created for action '{0}'.</value>
+  </data>
+  <data name="ActionDescriptorMustBeBasedOnControllerAction" xml:space="preserve">
+    <value>The action descriptor must be of type '{0}'.</value>
+  </data>
+  <data name="ArgumentCannotBeNullOrEmpty" xml:space="preserve">
+    <value>Value cannot be null or empty.</value>
+  </data>
+  <data name="PropertyOfTypeCannotBeNull" xml:space="preserve">
+    <value>The '{0}' property of '{1}' must not be null.</value>
+  </data>
+  <data name="TypeMethodMustReturnNotNullValue" xml:space="preserve">
+    <value>The '{0}' method of type '{1}' cannot return a null value.</value>
+  </data>
+  <data name="ModelBinding_NullValueNotValid" xml:space="preserve">
+    <value>The value '{0}' is invalid.</value>
+  </data>
+  <data name="Invalid_IncludePropertyExpression" xml:space="preserve">
+    <value>The passed expression of expression node type '{0}' is invalid. Only simple member access expressions for model properties are supported.</value>
+  </data>
+  <data name="NoRoutesMatched" xml:space="preserve">
+    <value>No route matches the supplied values.</value>
+  </data>
+  <data name="AsyncActionFilter_InvalidShortCircuit" xml:space="preserve">
+    <value>If an {0} provides a result value by setting the {1} property of {2} to a non-null value, then it cannot call the next filter by invoking {3}.</value>
+  </data>
+  <data name="AsyncResultFilter_InvalidShortCircuit" xml:space="preserve">
+    <value>If an {0} cancels execution by setting the {1} property of {2} to 'true', then it cannot call the next filter by invoking {3}.</value>
+  </data>
+  <data name="FilterFactoryAttribute_TypeMustImplementIFilter" xml:space="preserve">
+    <value>The type provided to '{0}' must implement '{1}'.</value>
+  </data>
+  <data name="ActionResult_ActionReturnValueCannotBeNull" xml:space="preserve">
+    <value>Cannot return null from an action method with a return type of '{0}'.</value>
+  </data>
+  <data name="TypeMustDeriveFromType" xml:space="preserve">
+    <value>The type '{0}' must derive from '{1}'.</value>
+  </data>
+  <data name="InputFormatterNoEncoding" xml:space="preserve">
+    <value>No encoding found for input formatter '{0}'. There must be at least one supported encoding registered in order for the formatter to read content.</value>
+  </data>
+  <data name="UnsupportedContentType" xml:space="preserve">
+    <value>Unsupported content type '{0}'.</value>
+  </data>
+  <data name="OutputFormatterNoMediaType" xml:space="preserve">
+    <value>No supported media type registered for output formatter '{0}'. There must be at least one supported media type registered in order for the output formatter to write content.</value>
+  </data>
+  <data name="AttributeRoute_AggregateErrorMessage" xml:space="preserve">
+    <value>The following errors occurred with attribute routing information:{0}{0}{1}</value>
+    <comment>{0} is the newline. {1} is the formatted list of errors using AttributeRoute_IndividualErrorMessage</comment>
+  </data>
+  <data name="AttributeRoute_CannotContainParameter" xml:space="preserve">
+    <value>The attribute route '{0}' cannot contain a parameter named '{{{1}}}'. Use '[{1}]' in the route template to insert the value '{2}'.</value>
+  </data>
+  <data name="AttributeRoute_IndividualErrorMessage" xml:space="preserve">
+    <value>For action: '{0}'{1}Error: {2}</value>
+    <comment>{1} is the newline.</comment>
+  </data>
+  <data name="AttributeRoute_TokenReplacement_EmptyTokenNotAllowed" xml:space="preserve">
+    <value>An empty replacement token ('[]') is not allowed.</value>
+  </data>
+  <data name="AttributeRoute_TokenReplacement_ImbalancedSquareBrackets" xml:space="preserve">
+    <value>Token delimiters ('[', ']') are imbalanced.</value>
+  </data>
+  <data name="AttributeRoute_TokenReplacement_InvalidSyntax" xml:space="preserve">
+    <value>The route template '{0}' has invalid syntax. {1}</value>
+    <comment>{1} is the specific error message.</comment>
+  </data>
+  <data name="AttributeRoute_TokenReplacement_ReplacementValueNotFound" xml:space="preserve">
+    <value>While processing template '{0}', a replacement value for the token '{1}' could not be found. Available tokens: '{2}'. To use a '[' or ']' as a literal string in a route or within a constraint, use '[[' or ']]' instead.</value>
+  </data>
+  <data name="AttributeRoute_TokenReplacement_UnclosedToken" xml:space="preserve">
+    <value>A replacement token is not closed.</value>
+  </data>
+  <data name="AttributeRoute_TokenReplacement_UnescapedBraceInToken" xml:space="preserve">
+    <value>An unescaped '[' token is not allowed inside of a replacement token. Use '[[' to escape.</value>
+  </data>
+  <data name="UnableToFindServices" xml:space="preserve">
+    <value>Unable to find the required services. Please add all the required services by calling '{0}.{1}' inside the call to '{2}' in the application startup code.</value>
+  </data>
+  <data name="AttributeRoute_DuplicateNames_Item" xml:space="preserve">
+    <value>Action: '{0}' - Template: '{1}'</value>
+    <comment>Formats an action descriptor display name and it's associated template.</comment>
+  </data>
+  <data name="AttributeRoute_DuplicateNames" xml:space="preserve">
+    <value>Attribute routes with the same name '{0}' must have the same template:{1}{2}</value>
+    <comment>{0} is the name of the attribute route, {1} is the newline, {2} is the list of errors formatted using ActionDescriptor_WithNamedAttributeRouteAndDifferentTemplate</comment>
+  </data>
+  <data name="AttributeRoute_AggregateErrorMessage_ErrorNumber" xml:space="preserve">
+    <value>Error {0}:{1}{2}</value>
+    <comment>{0} is the error number, {1} is Environment.NewLine {2} is the  error message</comment>
+  </data>
+  <data name="AttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod" xml:space="preserve">
+    <value>A method '{0}' must not define attribute routed actions and non attribute routed actions at the same time:{1}{2}{1}{1}Use 'AcceptVerbsAttribute' to create a single route that allows multiple HTTP verbs and defines a route, or set a route template in all attributes that constrain HTTP verbs.</value>
+    <comment>{0} is the MethodInfo.FullName, {1} is Environment.NewLine, {2} is the formatted list of actions defined by that method info.</comment>
+  </data>
+  <data name="AttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod_Item" xml:space="preserve">
+    <value>Action: '{0}' - Route Template: '{1}' - HTTP Verbs: '{2}'</value>
+  </data>
+  <data name="AttributeRoute_NullTemplateRepresentation" xml:space="preserve">
+    <value>(none)</value>
+  </data>
+  <data name="DefaultActionSelector_AmbiguousActions" xml:space="preserve">
+    <value>Multiple actions matched. The following actions matched route data and had all constraints satisfied:{0}{0}{1}</value>
+    <comment>0 is the newline - 1 is a newline separate list of action display names</comment>
+  </data>
+  <data name="FileResult_InvalidPath" xml:space="preserve">
+    <value>Could not find file: {0}</value>
+    <comment>{0} is the value for the provided path</comment>
+  </data>
+  <data name="SerializableError_DefaultError" xml:space="preserve">
+    <value>The input was not valid.</value>
+  </data>
+  <data name="AsyncResourceFilter_InvalidShortCircuit" xml:space="preserve">
+    <value>If an {0} provides a result value by setting the {1} property of {2} to a non-null value, then it cannot call the next filter by invoking {3}.</value>
+  </data>
+  <data name="ResponseCache_SpecifyDuration" xml:space="preserve">
+    <value>If the '{0}' property is not set to true, '{1}' property must be specified.</value>
+  </data>
+  <data name="ApiExplorer_UnsupportedAction" xml:space="preserve">
+    <value>The action '{0}' has ApiExplorer enabled, but is using conventional routing. Only actions which use attribute routing support ApiExplorer.</value>
+  </data>
+  <data name="FormatterMappings_NotValidMediaType" xml:space="preserve">
+    <value>The media type "{0}" is not valid. MediaTypes containing wildcards (*) are not allowed in formatter mappings.</value>
+  </data>
+  <data name="Format_NotValid" xml:space="preserve">
+    <value>The format provided is invalid '{0}'. A format must be a non-empty file-extension, optionally prefixed with a '.' character.</value>
+  </data>
+  <data name="CacheProfileNotFound" xml:space="preserve">
+    <value>The '{0}' cache profile is not defined.</value>
+  </data>
+  <data name="ModelType_WrongType" xml:space="preserve">
+    <value>The model's runtime type '{0}' is not assignable to the type '{1}'.</value>
+  </data>
+  <data name="ValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated" xml:space="preserve">
+    <value>The type '{0}' cannot be activated by '{1}' because it is either a value type, an interface, an abstract class or an open generic type.</value>
+  </data>
+  <data name="BinderType_MustBeIModelBinder" xml:space="preserve">
+    <value>The type '{0}' must implement '{1}' to be used as a model binder.</value>
+  </data>
+  <data name="BindingSource_CannotBeComposite" xml:space="preserve">
+    <value>The provided binding source '{0}' is a composite. '{1}' requires that the source must represent a single type of input.</value>
+  </data>
+  <data name="BindingSource_CannotBeGreedy" xml:space="preserve">
+    <value>The provided binding source '{0}' is a greedy data source. '{1}' does not support greedy data sources.</value>
+  </data>
+  <data name="Common_PropertyNotFound" xml:space="preserve">
+    <value>The property {0}.{1} could not be found.</value>
+  </data>
+  <data name="JQueryFormValueProviderFactory_MissingClosingBracket" xml:space="preserve">
+    <value>The key '{0}' is invalid JQuery syntax because it is missing a closing bracket.</value>
+  </data>
+  <data name="KeyValuePair_BothKeyAndValueMustBePresent" xml:space="preserve">
+    <value>A value is required.</value>
+  </data>
+  <data name="ModelBinderUtil_ModelCannotBeNull" xml:space="preserve">
+    <value>The binding context has a null Model, but this binder requires a non-null model of type '{0}'.</value>
+  </data>
+  <data name="ModelBinderUtil_ModelInstanceIsWrong" xml:space="preserve">
+    <value>The binding context has a Model of type '{0}', but this binder can only operate on models of type '{1}'.</value>
+  </data>
+  <data name="ModelBinderUtil_ModelMetadataCannotBeNull" xml:space="preserve">
+    <value>The binding context cannot have a null ModelMetadata.</value>
+  </data>
+  <data name="ModelBinding_MissingBindRequiredMember" xml:space="preserve">
+    <value>A value for the '{0}' property was not provided.</value>
+  </data>
+  <data name="ModelBinding_MissingRequestBodyRequiredMember" xml:space="preserve">
+    <value>A non-empty request body is required.</value>
+  </data>
+  <data name="ValueProviderResult_NoConverterExists" xml:space="preserve">
+    <value>The parameter conversion from type '{0}' to type '{1}' failed because no type converter can convert between these types.</value>
+  </data>
+  <data name="FileResult_PathNotRooted" xml:space="preserve">
+    <value>Path '{0}' was not rooted.</value>
+    <comment>{0} is the path which wasn't rooted</comment>
+  </data>
+  <data name="UrlNotLocal" xml:space="preserve">
+    <value>The supplied URL is not local. A URL with an absolute path is considered local if it does not have a host/authority part. URLs using virtual paths ('~/') are also local.</value>
+  </data>
+  <data name="FormatFormatterMappings_GetMediaTypeMappingForFormat_InvalidFormat" xml:space="preserve">
+    <value>The argument '{0}' is invalid. Empty or null formats are not supported.</value>
+  </data>
+  <data name="AcceptHeaderParser_ParseAcceptHeader_InvalidValues" xml:space="preserve">
+    <value>"Invalid values '{0}'."</value>
+  </data>
+  <data name="ModelState_AttemptedValueIsInvalid" xml:space="preserve">
+    <value>The value '{0}' is not valid for {1}.</value>
+  </data>
+  <data name="ModelState_NonPropertyAttemptedValueIsInvalid" xml:space="preserve">
+    <value>The value '{0}' is not valid.</value>
+  </data>
+  <data name="ModelState_UnknownValueIsInvalid" xml:space="preserve">
+    <value>The supplied value is invalid for {0}.</value>
+  </data>
+  <data name="ModelState_NonPropertyUnknownValueIsInvalid" xml:space="preserve">
+    <value>The supplied value is invalid.</value>
+  </data>
+  <data name="HtmlGeneration_ValueIsInvalid" xml:space="preserve">
+    <value>The value '{0}' is invalid.</value>
+  </data>
+  <data name="HtmlGeneration_ValueMustBeNumber" xml:space="preserve">
+    <value>The field {0} must be a number.</value>
+  </data>
+  <data name="HtmlGeneration_NonPropertyValueMustBeNumber" xml:space="preserve">
+    <value>The field must be a number.</value>
+  </data>
+  <data name="TextInputFormatter_SupportedEncodingsMustNotBeEmpty" xml:space="preserve">
+    <value>The list of '{0}' must not be empty. Add at least one supported encoding.</value>
+  </data>
+  <data name="TextOutputFormatter_SupportedEncodingsMustNotBeEmpty" xml:space="preserve">
+    <value>The list of '{0}' must not be empty. Add at least one supported encoding.</value>
+  </data>
+  <data name="TextOutputFormatter_WriteResponseBodyAsyncNotSupported" xml:space="preserve">
+    <value>'{0}' is not supported by '{1}'. Use '{2}' instead.</value>
+  </data>
+  <data name="Formatter_NoMediaTypes" xml:space="preserve">
+    <value>No media types found in '{0}.{1}'. Add at least one media type to the list of supported media types.</value>
+  </data>
+  <data name="CouldNotCreateIModelBinder" xml:space="preserve">
+    <value>Could not create a model binder for model object of type '{0}'.</value>
+  </data>
+  <data name="InputFormattersAreRequired" xml:space="preserve">
+    <value>'{0}.{1}' must not be empty. At least one '{2}' is required to bind from the body.</value>
+  </data>
+  <data name="ModelBinderProvidersAreRequired" xml:space="preserve">
+    <value>'{0}.{1}' must not be empty. At least one '{2}' is required to model bind.</value>
+  </data>
+  <data name="OutputFormattersAreRequired" xml:space="preserve">
+    <value>'{0}.{1}' must not be empty. At least one '{2}' is required to format a response.</value>
+  </data>
+  <data name="MiddewareFilter_ConfigureMethodOverload" xml:space="preserve">
+    <value>Multiple overloads of method '{0}' are not supported.</value>
+  </data>
+  <data name="MiddewareFilter_NoConfigureMethod" xml:space="preserve">
+    <value>A public method named '{0}' could not be found in the '{1}' type.</value>
+  </data>
+  <data name="MiddlewareFilterBuilder_NoMiddlewareFeature" xml:space="preserve">
+    <value>Could not find '{0}' in the feature list.</value>
+  </data>
+  <data name="MiddlewareFilterBuilder_NullApplicationBuilder" xml:space="preserve">
+    <value>The '{0}' property cannot be null.</value>
+  </data>
+  <data name="MiddlewareFilter_InvalidConfigureReturnType" xml:space="preserve">
+    <value>The '{0}' method in the type '{1}' must have a return type of '{2}'.</value>
+  </data>
+  <data name="MiddlewareFilter_ServiceResolutionFail" xml:space="preserve">
+    <value>Could not resolve a service of type '{0}' for the parameter '{1}' of method '{2}' on type '{3}'.</value>
+  </data>
+  <data name="AuthorizeFilter_AuthorizationPolicyCannotBeCreated" xml:space="preserve">
+    <value>An {0} cannot be created without a valid instance of {1}.</value>
+  </data>
+  <data name="FormCollectionModelBinder_CannotBindToFormCollection" xml:space="preserve">
+    <value>The '{0}' cannot bind to a model of type '{1}'. Change the model type to '{2}' instead.</value>
+  </data>
+  <data name="VaryByQueryKeys_Requires_ResponseCachingMiddleware" xml:space="preserve">
+    <value>'{0}' requires the response cache middleware.</value>
+  </data>
+  <data name="CandidateResolver_DifferentCasedReference" xml:space="preserve">
+    <value>A duplicate entry for library reference {0} was found. Please check that all package references in all projects use the same casing for the same package references.</value>
+    <comment>{0} is the dependency name.</comment>
+  </data>
+  <data name="MiddlewareFilterConfigurationProvider_CreateConfigureDelegate_CannotCreateType" xml:space="preserve">
+    <value>Unable to create an instance of type '{0}'. The type specified in {1} must not be abstract and must have a parameterless constructor.</value>
+    <comment>0 is the type to configure. 1 is the name of the parameter, configurationType.</comment>
+  </data>
+  <data name="Argument_InvalidOffsetLength" xml:space="preserve">
+    <value>'{0}' and '{1}' are out of bounds for the string.</value>
+    <comment>'{0}' and '{1}' are the parameters which combine to be out of bounds.</comment>
+  </data>
+  <data name="ComplexTypeModelBinder_NoParameterlessConstructor_ForType" xml:space="preserve">
+    <value>Could not create an instance of type '{0}'. Model bound complex types must not be abstract or value types and must have a parameterless constructor.</value>
+  </data>
+  <data name="ComplexTypeModelBinder_NoParameterlessConstructor_ForProperty" xml:space="preserve">
+    <value>Could not create an instance of type '{0}'. Model bound complex types must not be abstract or value types and must have a parameterless constructor. Alternatively, set the '{1}' property to a non-null value in the '{2}' constructor.</value>
+  </data>
+  <data name="NoRoutesMatchedForPage" xml:space="preserve">
+    <value>No page named '{0}' matches the supplied values.</value>
+  </data>
+  <data name="UrlHelper_RelativePagePathIsNotSupported" xml:space="preserve">
+    <value>The relative page path '{0}' can only be used while executing a Razor Page. Specify a root relative path with a leading '/' to generate a URL outside of a Razor Page.</value>
+  </data>
+  <data name="ValidationProblemDescription_Title" xml:space="preserve">
+    <value>One or more validation errors occurred.</value>
+  </data>
+  <data name="ApiController_AttributeRouteRequired" xml:space="preserve">
+    <value>Action '{0}' does not have an attribute route. Action methods on controllers annotated with {1} must be attribute routed.</value>
+  </data>
+  <data name="VirtualFileResultExecutor_NoFileProviderConfigured" xml:space="preserve">
+    <value>No file provider has been configured to process the supplied file.</value>
+  </data>
+  <data name="ApplicationPartFactory_InvalidFactoryType" xml:space="preserve">
+    <value>Type {0} specified by {1} is invalid. Type specified by {1} must derive from {2}.</value>
+  </data>
+  <data name="RelatedAssemblyAttribute_AssemblyCannotReferenceSelf" xml:space="preserve">
+    <value>{0} specified on {1} cannot be self referential.</value>
+  </data>
+  <data name="RelatedAssemblyAttribute_CouldNotBeFound" xml:space="preserve">
+    <value>Related assembly '{0}' specified by assembly '{1}' could not be found in the directory {2}. Related assemblies must be co-located with the specifying assemblies.</value>
+  </data>
+  <data name="ApplicationAssembliesProvider_DuplicateRelatedAssembly" xml:space="preserve">
+    <value>Each related assembly must be declared by exactly one assembly. The assembly '{0}' was declared as related assembly by the following:</value>
+  </data>
+  <data name="ApplicationAssembliesProvider_RelatedAssemblyCannotDefineAdditional" xml:space="preserve">
+    <value>Assembly '{0}' declared as a related assembly by assembly '{1}' cannot define additional related assemblies.</value>
+  </data>
+  <data name="ComplexTypeModelBinder_NoParameterlessConstructor_ForParameter" xml:space="preserve">
+    <value>Could not create an instance of type '{0}'. Model bound complex types must not be abstract or value types and must have a parameterless constructor. Alternatively, give the '{1}' parameter a non-null default value.</value>
+  </data>
+  <data name="ApiController_MultipleBodyParametersFound" xml:space="preserve">
+    <value>Action '{0}' has more than one parameter that was specified or inferred as bound from request body. Only one parameter per action may be bound from body. Inspect the following parameters, and use '{1}' to specify bound from query, '{2}' to specify bound from route, and '{3}' for parameters to be bound from body:</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ResponseCacheAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ResponseCacheAttribute.cs
new file mode 100644
index 0000000000..a3e2d6aaf4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ResponseCacheAttribute.cs
@@ -0,0 +1,136 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Specifies the parameters necessary for setting appropriate headers in response caching.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public class ResponseCacheAttribute : Attribute, IFilterFactory, IOrderedFilter
+    {
+        // A nullable-int cannot be used as an Attribute parameter.
+        // Hence this nullable-int is present to back the Duration property.
+        // The same goes for nullable-ResponseCacheLocation and nullable-bool.
+        private int? _duration;
+        private ResponseCacheLocation? _location;
+        private bool? _noStore;
+
+        /// <summary>
+        /// Gets or sets the duration in seconds for which the response is cached.
+        /// This sets "max-age" in "Cache-control" header.
+        /// </summary>
+        public int Duration
+        {
+            get => _duration ?? 0;
+            set => _duration = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the location where the data from a particular URL must be cached.
+        /// </summary>
+        public ResponseCacheLocation Location
+        {
+            get => _location ?? ResponseCacheLocation.Any;
+            set => _location = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the value which determines whether the data should be stored or not.
+        /// When set to <see langword="true"/>, it sets "Cache-control" header to "no-store".
+        /// Ignores the "Location" parameter for values other than "None".
+        /// Ignores the "duration" parameter.
+        /// </summary>
+        public bool NoStore
+        {
+            get => _noStore ?? false;
+            set => _noStore = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the value for the Vary response header.
+        /// </summary>
+        public string VaryByHeader { get; set; }
+
+        /// <summary>
+        /// Gets or sets the query keys to vary by.
+        /// </summary>
+        /// <remarks>
+        /// <see cref="VaryByQueryKeys"/> requires the response cache middleware.
+        /// </remarks>
+        public string[] VaryByQueryKeys { get; set; }
+
+        /// <summary>
+        /// Gets or sets the value of the cache profile name.
+        /// </summary>
+        public string CacheProfileName { get; set; }
+
+        /// <inheritdoc />
+        public int Order { get; set; }
+
+        /// <inheritdoc />
+        public bool IsReusable => true;
+
+        /// <summary>
+        /// Gets the <see cref="CacheProfile"/> for this attribute.
+        /// </summary>
+        /// <returns></returns>
+        public CacheProfile GetCacheProfile(MvcOptions options)
+        {
+            CacheProfile selectedProfile = null;
+            if (CacheProfileName != null)
+            {
+                options.CacheProfiles.TryGetValue(CacheProfileName, out selectedProfile);
+                if (selectedProfile == null)
+                {
+                    throw new InvalidOperationException(Resources.FormatCacheProfileNotFound(CacheProfileName));
+                }
+            }
+
+            // If the ResponseCacheAttribute parameters are set,
+            // then it must override the values from the Cache Profile.
+            // The below expression first checks if the duration is set by the attribute's parameter.
+            // If absent, it checks the selected cache profile (Note: There can be no cache profile as well)
+            // The same is the case for other properties.
+            _duration = _duration ?? selectedProfile?.Duration;
+            _noStore = _noStore ?? selectedProfile?.NoStore;
+            _location = _location ?? selectedProfile?.Location;
+            VaryByHeader = VaryByHeader ?? selectedProfile?.VaryByHeader;
+            VaryByQueryKeys = VaryByQueryKeys ?? selectedProfile?.VaryByQueryKeys;
+
+            return new CacheProfile
+            {
+                Duration = _duration,
+                Location = _location,
+                NoStore = _noStore,
+                VaryByHeader = VaryByHeader,
+                VaryByQueryKeys = VaryByQueryKeys,
+            };
+        }
+
+        /// <inheritdoc />
+        public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
+        {
+            if (serviceProvider == null)
+            {
+                throw new ArgumentNullException(nameof(serviceProvider));
+            }
+
+            var loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();
+            var optionsAccessor = serviceProvider.GetRequiredService<IOptions<MvcOptions>>();
+            var cacheProfile = GetCacheProfile(optionsAccessor.Value);
+
+            // ResponseCacheFilter cannot take any null values. Hence, if there are any null values,
+            // the properties convert them to their defaults and are passed on.
+            return new ResponseCacheFilter(cacheProfile, loggerFactory);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ResponseCacheLocation.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ResponseCacheLocation.cs
new file mode 100644
index 0000000000..8f9e852de0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ResponseCacheLocation.cs
@@ -0,0 +1,26 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Determines the value for the "Cache-control" header in the response.
+    /// </summary>
+    public enum ResponseCacheLocation
+    {
+        /// <summary>
+        /// Cached in both proxies and client.
+        /// Sets "Cache-control" header to "public".
+        /// </summary>
+        Any = 0,
+        /// <summary>
+        /// Cached only in the client.
+        /// Sets "Cache-control" header to "private".
+        /// </summary>
+        Client = 1,
+        /// <summary>
+        /// "Cache-control" and "Pragma" headers are set to "no-cache".
+        /// </summary>
+        None = 2
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RouteAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RouteAttribute.cs
new file mode 100644
index 0000000000..db42bd2bc1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RouteAttribute.cs
@@ -0,0 +1,52 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Specifies an attribute route on a controller.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
+    public class RouteAttribute : Attribute, IRouteTemplateProvider
+    {
+        private int? _order;
+
+        /// <summary>
+        /// Creates a new <see cref="RouteAttribute"/> with the given route template.
+        /// </summary>
+        /// <param name="template">The route template. May not be null.</param>
+        public RouteAttribute(string template)
+        {
+            if (template == null)
+            {
+                throw new ArgumentNullException(nameof(template));
+            }
+
+            Template = template;
+        }
+
+        /// <inheritdoc />
+        public string Template { get; }
+
+        /// <summary>
+        /// Gets the route order. The order determines the order of route execution. Routes with a lower order
+        /// value are tried first. If an action defines a route by providing an <see cref="IRouteTemplateProvider"/>
+        /// with a non <c>null</c> order, that order is used instead of this value. If neither the action nor the
+        /// controller defines an order, a default value of 0 is used.
+        /// </summary>
+        public int Order
+        {
+            get { return _order ?? 0; }
+            set { _order = value; }
+        }
+
+        /// <inheritdoc />
+        int? IRouteTemplateProvider.Order => _order;
+
+        /// <inheritdoc />
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/HttpMethodAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/HttpMethodAttribute.cs
new file mode 100644
index 0000000000..44095ee4ae
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/HttpMethodAttribute.cs
@@ -0,0 +1,72 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.Routing
+{
+    /// <summary>
+    /// Identifies an action that only supports a given set of HTTP methods.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
+    public abstract class HttpMethodAttribute : Attribute, IActionHttpMethodProvider, IRouteTemplateProvider
+    {
+        private int? _order;
+
+        /// <summary>
+        /// Creates a new <see cref="HttpMethodAttribute"/> with the given
+        /// set of HTTP methods.
+        /// <param name="httpMethods">The set of supported HTTP methods.</param>
+        /// </summary>
+        public HttpMethodAttribute(IEnumerable<string> httpMethods)
+            : this(httpMethods, null)
+        {
+            if (httpMethods == null)
+            {
+                throw new ArgumentNullException(nameof(httpMethods));
+            }
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="HttpMethodAttribute"/> with the given
+        /// set of HTTP methods an the given route template.
+        /// </summary>
+        /// <param name="httpMethods">The set of supported methods.</param>
+        /// <param name="template">The route template. May not be null.</param>
+        public HttpMethodAttribute(IEnumerable<string> httpMethods, string template)
+        {
+            if (httpMethods == null)
+            {
+                throw new ArgumentNullException(nameof(httpMethods));
+            }
+
+            HttpMethods = httpMethods;
+            Template = template;
+        }
+
+        /// <inheritdoc />
+        public IEnumerable<string> HttpMethods { get; }
+
+        /// <inheritdoc />
+        public string Template { get; }
+
+        /// <summary>
+        /// Gets the route order. The order determines the order of route execution. Routes with a lower
+        /// order value are tried first. When a route doesn't specify a value, it gets the value of the
+        /// <see cref="RouteAttribute.Order"/> or a default value of 0 if the <see cref="RouteAttribute"/>
+        /// doesn't define a value on the controller.
+        /// </summary>
+        public int Order
+        {
+            get { return _order ?? 0; }
+            set { _order = value; }
+        }
+
+        /// <inheritdoc />
+        int? IRouteTemplateProvider.Order => _order;
+
+        /// <inheritdoc />
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IActionHttpMethodProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IActionHttpMethodProvider.cs
new file mode 100644
index 0000000000..2c5d640ee8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IActionHttpMethodProvider.cs
@@ -0,0 +1,12 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.Routing
+{
+    public interface IActionHttpMethodProvider
+    {
+        IEnumerable<string> HttpMethods { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IRouteTemplateProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IRouteTemplateProvider.cs
new file mode 100644
index 0000000000..9d644cba37
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IRouteTemplateProvider.cs
@@ -0,0 +1,30 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Routing
+{
+    /// <summary>
+    /// Interface for attributes which can supply a route template for attribute routing.
+    /// </summary>
+    public interface IRouteTemplateProvider
+    {
+        /// <summary>
+        /// The route template. May be null.
+        /// </summary>
+        string Template { get; }
+
+        /// <summary>
+        /// Gets the route order. The order determines the order of route execution. Routes with a lower
+        /// order value are tried first. When a route doesn't specify a value, it gets a default value of 0.
+        /// A null value for the Order property means that the user didn't specify an explicit order for the
+        /// route.
+        /// </summary>
+        int? Order { get; }
+
+        /// <summary>
+        /// Gets the route name. The route name can be used to generate a link using a specific route, instead
+        ///  of relying on selection of a route based on the given set of route values.
+        /// </summary>
+        string Name { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IRouteValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IRouteValueProvider.cs
new file mode 100644
index 0000000000..6bd09db26b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IRouteValueProvider.cs
@@ -0,0 +1,84 @@
+// 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.
+
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Mvc.Controllers;
+
+namespace Microsoft.AspNetCore.Mvc.Routing
+{
+    /// <summary>
+    /// <para>
+    /// A metadata interface which specifies a route value which is required for the action selector to
+    /// choose an action. When applied to an action using attribute routing, the route value will be added
+    /// to the <see cref="RouteData.Values"/> when the action is selected.
+    /// </para>
+    /// <para>
+    /// When an <see cref="IRouteValueProvider"/> is used to provide a new route value to an action, all
+    /// actions in the application must also have a value associated with that key, or have an implicit value
+    /// of <c>null</c>. See remarks for more details.
+    /// </para>
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// The typical scheme for action selection in an MVC application is that an action will require the
+    /// matching values for its <see cref="ControllerActionDescriptor.ControllerName"/> and
+    /// <see cref="ControllerActionDescriptor.ActionName"/>
+    /// </para>
+    /// <example>
+    /// For an action like <code>MyApp.Controllers.HomeController.Index()</code>, in order to be selected, the
+    /// <see cref="RouteData.Values"/> must contain the values
+    /// { 
+    ///     "action": "Index",
+    ///     "controller": "Home"
+    /// }
+    /// </example>
+    /// <para>
+    /// If areas are in use in the application (see <see cref="AreaAttribute"/> which implements
+    /// <see cref="IRouteValueProvider"/>) then all actions are consider either in an area by having a
+    /// non-<c>null</c> area value (specified by <see cref="AreaAttribute"/> or another 
+    /// <see cref="IRouteValueProvider"/>) or are considered 'outside' of areas by having the value <c>null</c>.
+    /// </para>
+    /// <example>
+    /// Consider an application with two controllers, each with an <code>Index</code> action method:
+    ///     - <code>MyApp.Controllers.HomeController.Index()</code>
+    ///     - <code>MyApp.Areas.Blog.Controllers.HomeController.Index()</code>
+    /// where <code>MyApp.Areas.Blog.Controllers.HomeController</code> has an area attribute
+    /// <code>[Area("Blog")]</code>.
+    /// 
+    /// For <see cref="RouteData.Values"/> like:
+    /// { 
+    ///     "action": "Index",
+    ///     "controller": "Home"
+    /// }
+    /// 
+    /// <code>MyApp.Controllers.HomeController.Index()</code> will be selected.
+    /// <code>MyApp.Area.Blog.Controllers.HomeController.Index()</code> is not considered eligible because the
+    /// <see cref="RouteData.Values"/> does not contain the value 'Blog' for 'area'.
+    /// 
+    /// For <see cref="RouteData.Values"/> like:
+    /// {
+    ///     "area": "Blog",
+    ///     "action": "Index",
+    ///     "controller": "Home"
+    /// }
+    /// 
+    /// <code>MyApp.Area.Blog.Controllers.HomeController.Index()</code> will be selected.
+    /// <code>MyApp.Controllers.HomeController.Index()</code> is not considered eligible because the route values
+    /// contain a value for 'area'. <code>MyApp.Controllers.HomeController.Index()</code> cannot match any value
+    /// for 'area' other than <c>null</c>.
+    /// </example>
+    /// </remarks>
+    public interface IRouteValueProvider
+    {
+        /// <summary>
+        /// The route value key.
+        /// </summary>
+        string RouteKey { get; }
+
+        /// <summary>
+        /// The route value. If <c>null</c> or empty, requires the route value associated with <see cref="RouteKey"/>
+        /// to be missing or <c>null</c>.
+        /// </summary>
+        string RouteValue { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IUrlHelperFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IUrlHelperFactory.cs
new file mode 100644
index 0000000000..9eecb96115
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IUrlHelperFactory.cs
@@ -0,0 +1,18 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Routing
+{
+    /// <summary>
+    /// A factory for creating <see cref="IUrlHelper"/> instances.
+    /// </summary>
+    public interface IUrlHelperFactory
+    {
+        /// <summary>
+        /// Gets an <see cref="IUrlHelper"/> for the request associated with <paramref name="context"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ActionContext"/> associated with the current request.</param>
+        /// <returns>An <see cref="IUrlHelper"/> for the request associated with <paramref name="context"/></returns>
+        IUrlHelper GetUrlHelper(ActionContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/KnownRouteValueConstraint.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/KnownRouteValueConstraint.cs
new file mode 100644
index 0000000000..a80b3b510c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/KnownRouteValueConstraint.cs
@@ -0,0 +1,124 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.Routing
+{
+    public class KnownRouteValueConstraint : IRouteConstraint
+    {
+        private RouteValuesCollection _cachedValuesCollection;
+
+        public bool Match(
+            HttpContext httpContext,
+            IRouter route,
+            string routeKey,
+            RouteValueDictionary values,
+            RouteDirection routeDirection)
+        {
+            if (httpContext == null)
+            {
+                throw new ArgumentNullException(nameof(httpContext));
+            }
+
+            if (route == null)
+            {
+                throw new ArgumentNullException(nameof(route));
+            }
+
+            if (routeKey == null)
+            {
+                throw new ArgumentNullException(nameof(routeKey));
+            }
+
+            if (values == null)
+            {
+                throw new ArgumentNullException(nameof(values));
+            }
+
+            object obj;
+            if (values.TryGetValue(routeKey, out obj))
+            {
+                var value = obj as string;
+                if (value != null)
+                {
+                    var allValues = GetAndCacheAllMatchingValues(routeKey, httpContext);
+                    foreach (var existingValue in allValues)
+                    {
+                        if (string.Equals(value, existingValue, StringComparison.OrdinalIgnoreCase))
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        private string[] GetAndCacheAllMatchingValues(string routeKey, HttpContext httpContext)
+        {
+            var actionDescriptors = GetAndValidateActionDescriptorCollection(httpContext);
+            var version = actionDescriptors.Version;
+            var valuesCollection = _cachedValuesCollection;
+
+            if (valuesCollection == null ||
+                version != valuesCollection.Version)
+            {
+                var values = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+                for (var i = 0; i < actionDescriptors.Items.Count; i++)
+                {
+                    var action = actionDescriptors.Items[i];
+
+                    string value;
+                    if (action.RouteValues.TryGetValue(routeKey, out value) &&
+                        !string.IsNullOrEmpty(value))
+                    {
+                        values.Add(value);
+                    }
+                }
+
+                valuesCollection = new RouteValuesCollection(version, values.ToArray());
+                _cachedValuesCollection = valuesCollection;
+            }
+
+            return _cachedValuesCollection.Items;
+        }
+
+        private static ActionDescriptorCollection GetAndValidateActionDescriptorCollection(HttpContext httpContext)
+        {
+            var services = httpContext.RequestServices;
+            var provider = services.GetRequiredService<IActionDescriptorCollectionProvider>();
+            var descriptors = provider.ActionDescriptors;
+
+            if (descriptors == null)
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatPropertyOfTypeCannotBeNull("ActionDescriptors",
+                                                               provider.GetType()));
+            }
+
+            return descriptors;
+        }
+
+        private class RouteValuesCollection
+        {
+            public RouteValuesCollection(int version, string[] items)
+            {
+                Version = version;
+                Items = items;
+            }
+
+            public int Version { get; }
+
+            public string[] Items { get; }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/RouteValueAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/RouteValueAttribute.cs
new file mode 100644
index 0000000000..4c9d3ead75
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/RouteValueAttribute.cs
@@ -0,0 +1,55 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Routing
+{
+    /// <summary>
+    /// <para>
+    /// An attribute which specifies a required route value for an action or controller.
+    /// </para>
+    /// <para>
+    /// When placed on an action, the route data of a request must match the expectations of the required route data
+    /// in order for the action to be selected. All other actions without a route value for the given key cannot be
+    /// selected unless the route data of the request does omits a value matching the key.
+    /// See <see cref="IRouteValueProvider"/> for more details and examples.
+    /// </para>
+    /// <para>
+    /// When placed on a controller, unless overridden by the action, the constraint applies to all
+    /// actions defined by the controller.
+    /// </para>
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
+    public abstract class RouteValueAttribute : Attribute, IRouteValueProvider
+    {
+        /// <summary>
+        /// Creates a new <see cref="RouteValueAttribute"/>.
+        /// </summary>
+        /// <param name="routeKey">The route value key.</param>
+        /// <param name="routeValue">The expected route value.</param>
+        protected RouteValueAttribute(
+            string routeKey,
+            string routeValue)
+        {
+            if (routeKey == null)
+            {
+                throw new ArgumentNullException(nameof(routeKey));
+            }
+
+            if (routeValue == null)
+            {
+                throw new ArgumentNullException(nameof(routeValue));
+            }
+
+            RouteKey = routeKey;
+            RouteValue = routeValue;
+        }
+
+        /// <inheritdoc />
+        public string RouteKey { get; }
+
+        /// <inheritdoc />
+        public string RouteValue { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelper.cs
new file mode 100644
index 0000000000..31a8b4a9fd
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelper.cs
@@ -0,0 +1,392 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
+
+namespace Microsoft.AspNetCore.Mvc.Routing
+{
+    /// <summary>
+    /// An implementation of <see cref="IUrlHelper"/> that contains methods to
+    /// build URLs for ASP.NET MVC within an application.
+    /// </summary>
+    public class UrlHelper : IUrlHelper
+    {
+
+        // Perf: Share the StringBuilder object across multiple calls of GenerateURL for this UrlHelper
+        private StringBuilder _stringBuilder;
+        // Perf: Reuse the RouteValueDictionary across multiple calls of Action for this UrlHelper
+        private readonly RouteValueDictionary _routeValueDictionary;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UrlHelper"/> class using the specified
+        /// <paramref name="actionContext"/>.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="Mvc.ActionContext"/> for the current request.</param>
+        public UrlHelper(ActionContext actionContext)
+        {
+            if (actionContext == null)
+            {
+                throw new ArgumentNullException(nameof(actionContext));
+            }
+
+            ActionContext = actionContext;
+            _routeValueDictionary = new RouteValueDictionary();
+        }
+
+        /// <inheritdoc />
+        public ActionContext ActionContext { get; }
+
+        /// <summary>
+        /// Gets the <see cref="RouteValueDictionary"/> associated with the current request.
+        /// </summary>
+        protected RouteValueDictionary AmbientValues => ActionContext.RouteData.Values;
+
+        /// <summary>
+        /// Gets the <see cref="Http.HttpContext"/> associated with the current request.
+        /// </summary>
+        protected HttpContext HttpContext => ActionContext.HttpContext;
+
+        /// <summary>
+        /// Gets the top-level <see cref="IRouter"/> associated with the current request. Generally an
+        /// <see cref="IRouteCollection"/> implementation.
+        /// </summary>
+        protected IRouter Router => ActionContext.RouteData.Routers[0];
+
+        /// <inheritdoc />
+        public virtual string Action(UrlActionContext actionContext)
+        {
+            if (actionContext == null)
+            {
+                throw new ArgumentNullException(nameof(actionContext));
+            }
+
+            var valuesDictionary = GetValuesDictionary(actionContext.Values);
+
+            if (actionContext.Action == null)
+            {
+                object action;
+                if (!valuesDictionary.ContainsKey("action") &&
+                    AmbientValues.TryGetValue("action", out action))
+                {
+                    valuesDictionary["action"] = action;
+                }
+            }
+            else
+            {
+                valuesDictionary["action"] = actionContext.Action;
+            }
+
+            if (actionContext.Controller == null)
+            {
+                object controller;
+                if (!valuesDictionary.ContainsKey("controller") &&
+                    AmbientValues.TryGetValue("controller", out controller))
+                {
+                    valuesDictionary["controller"] = controller;
+                }
+            }
+            else
+            {
+                valuesDictionary["controller"] = actionContext.Controller;
+            }
+
+            var virtualPathData = GetVirtualPathData(routeName: null, values: valuesDictionary);
+            return GenerateUrl(actionContext.Protocol, actionContext.Host, virtualPathData, actionContext.Fragment);
+        }
+
+        /// <inheritdoc />
+        public virtual bool IsLocalUrl(string url)
+        {
+            if (string.IsNullOrEmpty(url))
+            {
+                return false;
+            }
+
+            // Allows "/" or "/foo" but not "//" or "/\".
+            if (url[0] == '/')
+            {
+                // url is exactly "/"
+                if (url.Length == 1)
+                {
+                    return true;
+                }
+
+                // url doesn't start with "//" or "/\"
+                if (url[1] != '/' && url[1] != '\\')
+                {
+                    return true;
+                }
+
+                return false;                    
+            }
+
+            // Allows "~/" or "~/foo" but not "~//" or "~/\".
+            if (url[0] == '~' && url.Length > 1 && url[1] == '/')
+            {
+                // url is exactly "~/"
+                if (url.Length == 2)
+                {
+                    return true;
+                }
+
+                // url doesn't start with "~//" or "~/\"
+                if (url[2] != '/' && url[2] != '\\')
+                {
+                    return true;
+                }
+
+                return false;
+            }
+
+            return false;
+        }
+
+        /// <inheritdoc />
+        public virtual string RouteUrl(UrlRouteContext routeContext)
+        {
+            if (routeContext == null)
+            {
+                throw new ArgumentNullException(nameof(routeContext));
+            }
+
+            var valuesDictionary = routeContext.Values as RouteValueDictionary ?? GetValuesDictionary(routeContext.Values);
+            var virtualPathData = GetVirtualPathData(routeContext.RouteName, valuesDictionary);
+            return GenerateUrl(routeContext.Protocol, routeContext.Host, virtualPathData, routeContext.Fragment);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="VirtualPathData"/> for the specified <paramref name="routeName"/> and route
+        /// <paramref name="values"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route that is used to generate the <see cref="VirtualPathData"/>.
+        /// </param>
+        /// <param name="values">
+        /// The <see cref="RouteValueDictionary"/>. The <see cref="Router"/> uses these values, in combination with
+        /// <see cref="AmbientValues"/>, to generate the URL.
+        /// </param>
+        /// <returns>The <see cref="VirtualPathData"/>.</returns>
+        protected virtual VirtualPathData GetVirtualPathData(string routeName, RouteValueDictionary values)
+        {
+            var context = new VirtualPathContext(HttpContext, AmbientValues, values, routeName);
+            return Router.GetVirtualPath(context);
+        }
+
+        // Internal for unit testing.
+        internal void AppendPathAndFragment(StringBuilder builder, VirtualPathData pathData, string fragment)
+        {
+            var pathBase = HttpContext.Request.PathBase;
+
+            if (!pathBase.HasValue)
+            {
+                if (pathData.VirtualPath.Length == 0)
+                {
+                    builder.Append("/");
+                }
+                else
+                {
+                    if (!pathData.VirtualPath.StartsWith("/", StringComparison.Ordinal))
+                    {
+                        builder.Append("/");
+                    }
+
+                    builder.Append(pathData.VirtualPath);
+                }
+            }
+            else
+            {
+                if (pathData.VirtualPath.Length == 0)
+                {
+                    builder.Append(pathBase.Value);
+                }
+                else
+                {
+                    builder.Append(pathBase.Value);
+
+                    if (pathBase.Value.EndsWith("/", StringComparison.Ordinal))
+                    {
+                        builder.Length--;
+                    }
+
+                    if (!pathData.VirtualPath.StartsWith("/", StringComparison.Ordinal))
+                    {
+                        builder.Append("/");
+                    }
+
+                    builder.Append(pathData.VirtualPath);
+                }
+            }
+
+            if (!string.IsNullOrEmpty(fragment))
+            {
+                builder.Append("#").Append(fragment);
+            }
+        }
+
+        /// <inheritdoc />
+        public virtual string Content(string contentPath)
+        {
+            if (string.IsNullOrEmpty(contentPath))
+            {
+                return null;
+            }
+            else if (contentPath[0] == '~')
+            {
+                var segment = new PathString(contentPath.Substring(1));
+                var applicationPath = HttpContext.Request.PathBase;
+
+                return applicationPath.Add(segment).Value;
+            }
+
+            return contentPath;
+        }
+
+        /// <inheritdoc />
+        public virtual string Link(string routeName, object values)
+        {
+            return RouteUrl(new UrlRouteContext()
+            {
+                RouteName = routeName,
+                Values = values,
+                Protocol = HttpContext.Request.Scheme,
+                Host = HttpContext.Request.Host.ToUriComponent()
+            });
+        }
+
+        private RouteValueDictionary GetValuesDictionary(object values)
+        {
+            // Perf: RouteValueDictionary can be cast to IDictionary<string, object>, but it is
+            // special cased to avoid allocating boxed Enumerator.
+            var routeValuesDictionary = values as RouteValueDictionary;
+            if (routeValuesDictionary != null)
+            {
+                _routeValueDictionary.Clear();
+                foreach (var kvp in routeValuesDictionary)
+                {
+                    _routeValueDictionary.Add(kvp.Key, kvp.Value);
+                }
+
+                return _routeValueDictionary;
+            }
+
+            var dictionaryValues = values as IDictionary<string, object>;
+            if (dictionaryValues != null)
+            {
+                _routeValueDictionary.Clear();
+                foreach (var kvp in dictionaryValues)
+                {
+                    _routeValueDictionary.Add(kvp.Key, kvp.Value);
+                }
+
+                return _routeValueDictionary;
+            }
+
+            return new RouteValueDictionary(values);
+        }
+
+        private StringBuilder GetStringBuilder()
+        {
+            if(_stringBuilder == null)
+            {
+                _stringBuilder = new StringBuilder();
+            }
+
+            return _stringBuilder;
+        }
+
+        /// <summary>
+        /// Generates the URL using the specified components.
+        /// </summary>
+        /// <param name="protocol">The protocol for the URL, such as "http" or "https".</param>
+        /// <param name="host">The host name for the URL.</param>
+        /// <param name="pathData">The <see cref="VirtualPathData"/>.</param>
+        /// <param name="fragment">The fragment for the URL.</param>
+        /// <returns>The generated URL.</returns>
+        protected virtual string GenerateUrl(string protocol, string host, VirtualPathData pathData, string fragment)
+        {
+            if (pathData == null)
+            {
+                return null;
+            }
+
+            // VirtualPathData.VirtualPath returns string.Empty instead of null.
+            Debug.Assert(pathData.VirtualPath != null);
+
+            // Perf: In most of the common cases, GenerateUrl is called with a null protocol, host and fragment.
+            // In such cases, we might not need to build any URL as the url generated is mostly same as the virtual path available in pathData.
+            // For such common cases, this FastGenerateUrl method saves a string allocation per GenerateUrl call.
+            string url;
+            if (TryFastGenerateUrl(protocol, host, pathData, fragment, out url))
+            {
+                return url;
+            }
+
+            var builder = GetStringBuilder();
+            try
+            {
+                if (string.IsNullOrEmpty(protocol) && string.IsNullOrEmpty(host))
+                {
+                    AppendPathAndFragment(builder, pathData, fragment);
+                    // We're returning a partial URL (just path + query + fragment), but we still want it to be rooted.
+                    if (builder.Length == 0 || builder[0] != '/')
+                    {
+                        builder.Insert(0, '/');
+                    }
+                }
+                else
+                {
+                    protocol = string.IsNullOrEmpty(protocol) ? "http" : protocol;
+                    builder.Append(protocol);
+
+                    builder.Append("://");
+
+                    host = string.IsNullOrEmpty(host) ? HttpContext.Request.Host.Value : host;
+                    builder.Append(host);
+                    AppendPathAndFragment(builder, pathData, fragment);
+                }
+
+                var path = builder.ToString();
+                return path;
+            }
+            finally
+            {
+                // Clear the StringBuilder so that it can reused for the next call.
+                builder.Clear();
+            }
+        }
+
+        private bool TryFastGenerateUrl(
+            string protocol,
+            string host,
+            VirtualPathData pathData,
+            string fragment,
+            out string url)
+        {
+            var pathBase = HttpContext.Request.PathBase;
+            url = null;
+
+            if (string.IsNullOrEmpty(protocol)
+                && string.IsNullOrEmpty(host)
+                && string.IsNullOrEmpty(fragment)
+                && !pathBase.HasValue)
+            {
+                if (pathData.VirtualPath.Length == 0)
+                {
+                    url = "/";
+                    return true;
+                }
+                else if (pathData.VirtualPath.StartsWith("/", StringComparison.Ordinal))
+                {
+                    url = pathData.VirtualPath;
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelperFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelperFactory.cs
new file mode 100644
index 0000000000..f9b8006850
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelperFactory.cs
@@ -0,0 +1,52 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Core;
+
+namespace Microsoft.AspNetCore.Mvc.Routing
+{
+    /// <summary>
+    /// A default implementation of <see cref="IUrlHelperFactory"/>.
+    /// </summary>
+    public class UrlHelperFactory : IUrlHelperFactory
+    {
+        /// <inheritdoc />
+        public IUrlHelper GetUrlHelper(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(Resources.ArgumentCannotBeNullOrEmpty, (nameof(context)));
+            }
+
+            var httpContext = context.HttpContext;
+
+            if (httpContext == null)
+            {
+                throw new ArgumentException(Resources.FormatPropertyOfTypeCannotBeNull(
+                    nameof(ActionContext.HttpContext),
+                    nameof(ActionContext)));
+            }
+
+            if (httpContext.Items == null)
+            {
+                throw new ArgumentException(Resources.FormatPropertyOfTypeCannotBeNull(
+                    nameof(HttpContext.Items),
+                    nameof(HttpContext)));
+            }
+
+            // Perf: Create only one UrlHelper per context
+            object value;
+            if (httpContext.Items.TryGetValue(typeof(IUrlHelper), out value) && value is IUrlHelper)
+            {
+                return (IUrlHelper)value;
+            }
+
+            var urlHelper = new UrlHelper(context);
+            httpContext.Items[typeof(IUrlHelper)] = urlHelper;
+
+            return urlHelper;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/SerializableError.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/SerializableError.cs
new file mode 100644
index 0000000000..77adaeae1e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/SerializableError.cs
@@ -0,0 +1,60 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Defines a serializable container for storing ModelState information.
+    /// This information is stored as key/value pairs.
+    /// </summary>
+    public sealed class SerializableError : Dictionary<string, object>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SerializableError"/> class.
+        /// </summary>
+        public SerializableError()
+            : base(StringComparer.OrdinalIgnoreCase)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="SerializableError"/>.
+        /// </summary>
+        /// <param name="modelState"><see cref="ModelStateDictionary"/> containing the validation errors.</param>
+        public SerializableError(ModelStateDictionary modelState)
+            : this()
+        {
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            if (modelState.IsValid)
+            {
+                return;
+            }
+
+            foreach (var keyModelStatePair in modelState)
+            {
+                var key = keyModelStatePair.Key;
+                var errors = keyModelStatePair.Value.Errors;
+                if (errors != null && errors.Count > 0)
+                {
+                    var errorMessages = errors.Select(error =>
+                    {
+                        return string.IsNullOrEmpty(error.ErrorMessage) ?
+                            Resources.SerializableError_DefaultError : error.ErrorMessage;
+                    }).ToArray();
+
+                    Add(key, errorMessages);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ServiceFilterAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ServiceFilterAttribute.cs
new file mode 100644
index 0000000000..525d1a82bb
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ServiceFilterAttribute.cs
@@ -0,0 +1,74 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A filter that finds another filter in an <see cref="IServiceProvider"/>.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Primarily used in <see cref="M:FilterCollection.AddService"/> calls.
+    /// </para>
+    /// <para>
+    /// Similar to the <see cref="TypeFilterAttribute"/> in that both use constructor injection. Use
+    /// <see cref="TypeFilterAttribute"/> instead if the filter is not itself a service.
+    /// </para>
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
+    [DebuggerDisplay("ServiceFilter: Type={ServiceType} Order={Order}")]
+    public class ServiceFilterAttribute : Attribute, IFilterFactory, IOrderedFilter
+    {
+        /// <summary>
+        /// Instantiates a new <see cref="ServiceFilterAttribute"/> instance.
+        /// </summary>
+        /// <param name="type">The <see cref="Type"/> of filter to find.</param>
+        public ServiceFilterAttribute(Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            ServiceType = type;
+        }
+
+        /// <inheritdoc />
+        public int Order { get; set; }
+
+        /// <summary>
+        /// Gets the <see cref="Type"/> of filter to find.
+        /// </summary>
+        public Type ServiceType { get; }
+
+        /// <inheritdoc />
+        public bool IsReusable { get; set; }
+
+        /// <inheritdoc />
+        public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
+        {
+            if (serviceProvider == null)
+            {
+                throw new ArgumentNullException(nameof(serviceProvider));
+            }
+
+            var service = serviceProvider.GetRequiredService(ServiceType);
+
+            var filter = service as IFilterMetadata;
+            if (filter == null)
+            {
+                throw new InvalidOperationException(Resources.FormatFilterFactoryAttribute_TypeMustImplementIFilter(
+                    typeof(ServiceFilterAttribute).Name,
+                    typeof(IFilterMetadata).Name));
+            }
+
+            return filter;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/SignInResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/SignInResult.cs
new file mode 100644
index 0000000000..040bbe040d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/SignInResult.cs
@@ -0,0 +1,94 @@
+// 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.
+
+using System;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="ActionResult"/> that on execution invokes <see cref="M:AuthenticationManager.SignInAsync"/>.
+    /// </summary>
+    public class SignInResult : ActionResult
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="SignInResult"/> with the
+        /// specified authentication scheme.
+        /// </summary>
+        /// <param name="authenticationScheme">The authentication scheme to use when signing in the user.</param>
+        /// <param name="principal">The claims principal containing the user claims.</param>
+        public SignInResult(string authenticationScheme, ClaimsPrincipal principal)
+            : this(authenticationScheme, principal, properties: null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="SignInResult"/> with the
+        /// specified authentication scheme and <paramref name="properties"/>.
+        /// </summary>
+        /// <param name="authenticationScheme">The authentication schemes to use when signing in the user.</param>
+        /// <param name="principal">The claims principal containing the user claims.</param>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the sign-in operation.</param>
+        public SignInResult(string authenticationScheme, ClaimsPrincipal principal, AuthenticationProperties properties)
+        {
+            if (authenticationScheme == null)
+            {
+                throw new ArgumentNullException(nameof(authenticationScheme));
+            }
+
+            if (principal == null)
+            {
+                throw new ArgumentNullException(nameof(principal));
+            }
+
+            AuthenticationScheme = authenticationScheme;
+            Principal = principal;
+            Properties = properties;
+        }
+
+        /// <summary>
+        /// Gets or sets the authentication scheme that is used to perform the sign-in operation.
+        /// </summary>
+        public string AuthenticationScheme { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ClaimsPrincipal"/> containing the user claims.
+        /// </summary>
+        public ClaimsPrincipal Principal { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="AuthenticationProperties"/> used to perform the sign-in operation.
+        /// </summary>
+        public AuthenticationProperties Properties { get; set; }
+
+        /// <inheritdoc />
+        public override async Task ExecuteResultAsync(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (AuthenticationScheme == null)
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatPropertyOfTypeCannotBeNull(
+                        /* property: */ nameof(AuthenticationScheme),
+                        /* type: */ nameof(SignInResult)));
+            }
+
+            var loggerFactory = context.HttpContext.RequestServices.GetRequiredService<ILoggerFactory>();
+            var logger = loggerFactory.CreateLogger<SignInResult>();
+
+            logger.SignInResultExecuting(AuthenticationScheme, Principal);
+
+            await context.HttpContext.SignInAsync(AuthenticationScheme, Principal, Properties);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/SignOutResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/SignOutResult.cs
new file mode 100644
index 0000000000..f972b9475c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/SignOutResult.cs
@@ -0,0 +1,120 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="ActionResult"/> that on execution invokes <see cref="M:AuthenticationManager.SignOutAsync"/>.
+    /// </summary>
+    public class SignOutResult : ActionResult
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="SignOutResult"/> with the default sign out scheme.
+        /// </summary>
+        public SignOutResult()
+            : this(Array.Empty<string>())
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="SignOutResult"/> with the
+        /// specified authentication scheme.
+        /// </summary>
+        /// <param name="authenticationScheme">The authentication scheme to use when signing out the user.</param>
+        public SignOutResult(string authenticationScheme)
+            : this(new[] { authenticationScheme })
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="SignOutResult"/> with the
+        /// specified authentication schemes.
+        /// </summary>
+        /// <param name="authenticationSchemes">The authentication schemes to use when signing out the user.</param>
+        public SignOutResult(IList<string> authenticationSchemes)
+            : this(authenticationSchemes, properties: null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="SignOutResult"/> with the
+        /// specified authentication scheme and <paramref name="properties"/>.
+        /// </summary>
+        /// <param name="authenticationScheme">The authentication schemes to use when signing out the user.</param>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the sign-out operation.</param>
+        public SignOutResult(string authenticationScheme, AuthenticationProperties properties)
+            : this(new[] { authenticationScheme }, properties)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="SignOutResult"/> with the
+        /// specified authentication schemes and <paramref name="properties"/>.
+        /// </summary>
+        /// <param name="authenticationSchemes">The authentication scheme to use when signing out the user.</param>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the sign-out operation.</param>
+        public SignOutResult(IList<string> authenticationSchemes, AuthenticationProperties properties)
+        {
+            if (authenticationSchemes == null)
+            {
+                throw new ArgumentNullException(nameof(authenticationSchemes));
+            }
+
+            AuthenticationSchemes = authenticationSchemes;
+            Properties = properties;
+        }
+
+        /// <summary>
+        /// Gets or sets the authentication schemes that are challenged.
+        /// </summary>
+        public IList<string> AuthenticationSchemes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="AuthenticationProperties"/> used to perform the sign-out operation.
+        /// </summary>
+        public AuthenticationProperties Properties { get; set; }
+
+        /// <inheritdoc />
+        public override async Task ExecuteResultAsync(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (AuthenticationSchemes == null)
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatPropertyOfTypeCannotBeNull(
+                        /* property: */ nameof(AuthenticationSchemes),
+                        /* type: */ nameof(SignOutResult)));
+            }
+
+            var loggerFactory = context.HttpContext.RequestServices.GetRequiredService<ILoggerFactory>();
+            var logger = loggerFactory.CreateLogger<SignOutResult>();
+
+            logger.SignOutResultExecuting(AuthenticationSchemes);
+
+            if (AuthenticationSchemes.Count == 0)
+            {
+                await context.HttpContext.SignOutAsync(Properties);
+            }
+            else
+            {
+                for (var i = 0; i < AuthenticationSchemes.Count; i++)
+                {
+                    await context.HttpContext.SignOutAsync(AuthenticationSchemes[i], Properties);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/StatusCodeResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/StatusCodeResult.cs
new file mode 100644
index 0000000000..8db690c94e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/StatusCodeResult.cs
@@ -0,0 +1,48 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Represents an <see cref="ActionResult"/> that when executed will
+    /// produce an HTTP response with the given response status code.
+    /// </summary>
+    public class StatusCodeResult : ActionResult
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StatusCodeResult"/> class
+        /// with the given <paramref name="statusCode"/>.
+        /// </summary>
+        /// <param name="statusCode">The HTTP status code of the response.</param>
+        public StatusCodeResult(int statusCode)
+        {
+            StatusCode = statusCode;
+        }
+
+        /// <summary>
+        /// Gets the HTTP status code.
+        /// </summary>
+        public int StatusCode { get; }
+
+        /// <inheritdoc />
+        public override void ExecuteResult(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var factory = context.HttpContext.RequestServices.GetRequiredService<ILoggerFactory>();
+            var logger = factory.CreateLogger<StatusCodeResult>();
+
+            logger.HttpStatusCodeResultExecuting(StatusCode);
+
+            context.HttpContext.Response.StatusCode = StatusCode;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/TypeFilterAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/TypeFilterAttribute.cs
new file mode 100644
index 0000000000..bc5c19802f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/TypeFilterAttribute.cs
@@ -0,0 +1,83 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A filter that creates another filter of type <see cref="ImplementationType"/>, retrieving missing constructor
+    /// arguments from dependency injection if available there.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Primarily used in <see cref="M:FilterCollection.Add"/> calls.
+    /// </para>
+    /// <para>
+    /// Similar to the <see cref="ServiceFilterAttribute"/> in that both use constructor injection. Use
+    /// <see cref="ServiceFilterAttribute"/> instead if the filter is itself a service.
+    /// </para>
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
+    [DebuggerDisplay("TypeFilter: Type={ImplementationType} Order={Order}")]
+    public class TypeFilterAttribute : Attribute, IFilterFactory, IOrderedFilter
+    {
+        private ObjectFactory _factory;
+
+        /// <summary>
+        /// Instantiates a new <see cref="TypeFilterAttribute"/> instance.
+        /// </summary>
+        /// <param name="type">The <see cref="Type"/> of filter to create.</param>
+        public TypeFilterAttribute(Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            ImplementationType = type;
+        }
+
+        /// <summary>
+        /// Gets or sets the non-service arguments to pass to the <see cref="ImplementationType"/> constructor.
+        /// </summary>
+        /// <remarks>
+        /// Service arguments are found in the dependency injection container i.e. this filter supports constructor
+        /// injection in addition to passing the given <see cref="Arguments"/>.
+        /// </remarks>
+        public object[] Arguments { get; set; }
+
+        /// <summary>
+        /// Gets the <see cref="Type"/> of filter to create.
+        /// </summary>
+        public Type ImplementationType { get; }
+
+        /// <inheritdoc />
+        public int Order { get; set; }
+
+        /// <inheritdoc />
+        public bool IsReusable { get; set; }
+
+        /// <inheritdoc />
+        public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
+        {
+            if (serviceProvider == null)
+            {
+                throw new ArgumentNullException(nameof(serviceProvider));
+            }
+
+            if (_factory == null)
+            {
+                var argumentTypes = Arguments?.Select(a => a.GetType())?.ToArray();
+
+                _factory = ActivatorUtilities.CreateFactory(ImplementationType, argumentTypes ?? Type.EmptyTypes);
+            }
+
+            return (IFilterMetadata)_factory(serviceProvider, Arguments);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnauthorizedResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnauthorizedResult.cs
new file mode 100644
index 0000000000..a92106ec84
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnauthorizedResult.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Represents an <see cref="UnauthorizedResult"/> that when
+    /// executed will produce an Unauthorized (401) response.
+    /// </summary>
+    public class UnauthorizedResult : StatusCodeResult
+    {
+        /// <summary>
+        /// Creates a new <see cref="UnauthorizedResult"/> instance.
+        /// </summary>
+        public UnauthorizedResult() : base(StatusCodes.Status401Unauthorized)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnprocessableEntityObjectResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnprocessableEntityObjectResult.cs
new file mode 100644
index 0000000000..002d9d97af
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnprocessableEntityObjectResult.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="ObjectResult"/> that when executed will produce a Unprocessable Entity (422) response.
+    /// </summary>
+    public class UnprocessableEntityObjectResult : ObjectResult
+    {
+        /// <summary>
+        /// Creates a new <see cref="UnprocessableEntityObjectResult"/> instance.
+        /// </summary>
+        /// <param name="modelState"><see cref="ModelStateDictionary"/> containing the validation errors.</param>
+        public UnprocessableEntityObjectResult(ModelStateDictionary modelState)
+            : this(new SerializableError(modelState))
+        {
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="UnprocessableEntityObjectResult"/> instance.
+        /// </summary>
+        /// <param name="error">Contains errors to be returned to the client.</param>
+        public UnprocessableEntityObjectResult(object error)
+            : base(error)
+        {
+            StatusCode = StatusCodes.Status422UnprocessableEntity;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnprocessableEntityResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnprocessableEntityResult.cs
new file mode 100644
index 0000000000..0851057499
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnprocessableEntityResult.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A <see cref="StatusCodeResult"/> that when
+    /// executed will produce a Unprocessable Entity (422) response.
+    /// </summary>
+    public class UnprocessableEntityResult : StatusCodeResult
+    {
+        /// <summary>
+        /// Creates a new <see cref="UnprocessableEntityResult"/> instance.
+        /// </summary>
+        public UnprocessableEntityResult()
+            : base(StatusCodes.Status422UnprocessableEntity)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnsupportedMediaTypeResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnsupportedMediaTypeResult.cs
new file mode 100644
index 0000000000..445ded67d0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnsupportedMediaTypeResult.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A <see cref="StatusCodeResult"/> that when
+    /// executed will produce a UnsupportedMediaType (415) response.
+    /// </summary>
+    public class UnsupportedMediaTypeResult : StatusCodeResult
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="UnsupportedMediaTypeResult"/>.
+        /// </summary>
+        public UnsupportedMediaTypeResult() : base(StatusCodes.Status415UnsupportedMediaType)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UrlHelperExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UrlHelperExtensions.cs
new file mode 100644
index 0000000000..93720a5826
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UrlHelperExtensions.cs
@@ -0,0 +1,501 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Routing;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public static class UrlHelperExtensions
+    {
+        /// <summary>
+        /// Generates a URL with an absolute path for an action method.
+        /// </summary>
+        /// <param name="helper">The <see cref="IUrlHelper"/>.</param>
+        /// <returns>The generated URL.</returns>
+        public static string Action(this IUrlHelper helper)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            return helper.Action(
+                action: null,
+                controller: null,
+                values: null,
+                protocol: null,
+                host: null,
+                fragment: null);
+        }
+
+        /// <summary>
+        /// Generates a URL with an absolute path for an action method, which contains the specified
+        /// <paramref name="action"/> name.
+        /// </summary>
+        /// <param name="helper">The <see cref="IUrlHelper"/>.</param>
+        /// <param name="action">The name of the action method.</param>
+        /// <returns>The generated URL.</returns>
+        public static string Action(this IUrlHelper helper, string action)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            return helper.Action(action, controller: null, values: null, protocol: null, host: null, fragment: null);
+        }
+
+        /// <summary>
+        /// Generates a URL with an absolute path for an action method, which contains the specified
+        /// <paramref name="action"/> name and route <paramref name="values"/>.
+        /// </summary>
+        /// <param name="helper">The <see cref="IUrlHelper"/>.</param>
+        /// <param name="action">The name of the action method.</param>
+        /// <param name="values">An object that contains route values.</param>
+        /// <returns>The generated URL.</returns>
+        public static string Action(this IUrlHelper helper, string action, object values)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            return helper.Action(action, controller: null, values: values, protocol: null, host: null, fragment: null);
+        }
+
+        /// <summary>
+        /// Generates a URL with an absolute path for an action method, which contains the specified
+        /// <paramref name="action"/> and <paramref name="controller"/> names.
+        /// </summary>
+        /// <param name="helper">The <see cref="IUrlHelper"/>.</param>
+        /// <param name="action">The name of the action method.</param>
+        /// <param name="controller">The name of the controller.</param>
+        /// <returns>The generated URL.</returns>
+        public static string Action(this IUrlHelper helper, string action, string controller)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            return helper.Action(action, controller, values: null, protocol: null, host: null, fragment: null);
+        }
+
+        /// <summary>
+        /// Generates a URL with an absolute path for an action method, which contains the specified
+        /// <paramref name="action"/> name, <paramref name="controller"/> name, and route <paramref name="values"/>.
+        /// </summary>
+        /// <param name="helper">The <see cref="IUrlHelper"/>.</param>
+        /// <param name="action">The name of the action method.</param>
+        /// <param name="controller">The name of the controller.</param>
+        /// <param name="values">An object that contains route values.</param>
+        /// <returns>The generated URL.</returns>
+        public static string Action(this IUrlHelper helper, string action, string controller, object values)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            return helper.Action(action, controller, values, protocol: null, host: null, fragment: null);
+        }
+
+        /// <summary>
+        /// Generates a URL with an absolute path for an action method, which contains the specified
+        /// <paramref name="action"/> name, <paramref name="controller"/> name, route <paramref name="values"/>, and
+        /// <paramref name="protocol"/> to use.
+        /// </summary>
+        /// <param name="helper">The <see cref="IUrlHelper"/>.</param>
+        /// <param name="action">The name of the action method.</param>
+        /// <param name="controller">The name of the controller.</param>
+        /// <param name="values">An object that contains route values.</param>
+        /// <param name="protocol">The protocol for the URL, such as "http" or "https".</param>
+        /// <returns>The generated URL.</returns>
+        public static string Action(
+            this IUrlHelper helper,
+            string action,
+            string controller,
+            object values,
+            string protocol)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            return helper.Action(action, controller, values, protocol, host: null, fragment: null);
+        }
+
+        /// <summary>
+        /// Generates a URL with an absolute path for an action method, which contains the specified
+        /// <paramref name="action"/> name, <paramref name="controller"/> name, route <paramref name="values"/>,
+        /// <paramref name="protocol"/> to use, and <paramref name="host"/> name.
+        /// Generates an absolute URL if the <paramref name="protocol"/> and <paramref name="host"/> are
+        /// non-<c>null</c>.
+        /// </summary>
+        /// <param name="helper">The <see cref="IUrlHelper"/>.</param>
+        /// <param name="action">The name of the action method.</param>
+        /// <param name="controller">The name of the controller.</param>
+        /// <param name="values">An object that contains route values.</param>
+        /// <param name="protocol">The protocol for the URL, such as "http" or "https".</param>
+        /// <param name="host">The host name for the URL.</param>
+        /// <returns>The generated URL.</returns>
+        public static string Action(
+            this IUrlHelper helper,
+            string action,
+            string controller,
+            object values,
+            string protocol,
+            string host)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            return helper.Action(action, controller, values, protocol, host, fragment: null);
+        }
+
+        /// <summary>
+        /// Generates a URL with an absolute path for an action method, which contains the specified
+        /// <paramref name="action"/> name, <paramref name="controller"/> name, route <paramref name="values"/>,
+        /// <paramref name="protocol"/> to use, <paramref name="host"/> name, and <paramref name="fragment"/>.
+        /// Generates an absolute URL if the <paramref name="protocol"/> and <paramref name="host"/> are
+        /// non-<c>null</c>.
+        /// </summary>
+        /// <param name="helper">The <see cref="IUrlHelper"/>.</param>
+        /// <param name="action">The name of the action method.</param>
+        /// <param name="controller">The name of the controller.</param>
+        /// <param name="values">An object that contains route values.</param>
+        /// <param name="protocol">The protocol for the URL, such as "http" or "https".</param>
+        /// <param name="host">The host name for the URL.</param>
+        /// <param name="fragment">The fragment for the URL.</param>
+        /// <returns>The generated URL.</returns>
+        public static string Action(
+            this IUrlHelper helper,
+            string action,
+            string controller,
+            object values,
+            string protocol,
+            string host,
+            string fragment)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            return helper.Action(new UrlActionContext()
+            {
+                Action = action,
+                Controller = controller,
+                Host = host,
+                Values = values,
+                Protocol = protocol,
+                Fragment = fragment
+            });
+        }
+
+        /// <summary>
+        /// Generates a URL with an absolute path for the specified route <paramref name="values"/>.
+        /// </summary>
+        /// <param name="helper">The <see cref="IUrlHelper"/>.</param>
+        /// <param name="values">An object that contains route values.</param>
+        /// <returns>The generated URL.</returns>
+        public static string RouteUrl(this IUrlHelper helper, object values)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            return helper.RouteUrl(routeName: null, values: values, protocol: null, host: null, fragment: null);
+        }
+
+        /// <summary>
+        /// Generates a URL with an absolute path for the specified <paramref name="routeName"/>.
+        /// </summary>
+        /// <param name="helper">The <see cref="IUrlHelper"/>.</param>
+        /// <param name="routeName">The name of the route that is used to generate URL.</param>
+        /// <returns>The generated URL.</returns>
+        public static string RouteUrl(this IUrlHelper helper, string routeName)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            return helper.RouteUrl(routeName, values: null, protocol: null, host: null, fragment: null);
+        }
+
+        /// <summary>
+        /// Generates a URL with an absolute path for the specified <paramref name="routeName"/> and route
+        /// <paramref name="values"/>.
+        /// </summary>
+        /// <param name="helper">The <see cref="IUrlHelper"/>.</param>
+        /// <param name="routeName">The name of the route that is used to generate URL.</param>
+        /// <param name="values">An object that contains route values.</param>
+        /// <returns>The generated URL.</returns>
+        public static string RouteUrl(this IUrlHelper helper, string routeName, object values)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            return helper.RouteUrl(routeName, values, protocol: null, host: null, fragment: null);
+        }
+
+        /// <summary>
+        /// Generates a URL with an absolute path for the specified route <paramref name="routeName"/> and route
+        /// <paramref name="values"/>, which contains the specified <paramref name="protocol"/> to use.
+        /// </summary>
+        /// <param name="helper">The <see cref="IUrlHelper"/>.</param>
+        /// <param name="routeName">The name of the route that is used to generate URL.</param>
+        /// <param name="values">An object that contains route values.</param>
+        /// <param name="protocol">The protocol for the URL, such as "http" or "https".</param>
+        /// <returns>The generated URL.</returns>
+        public static string RouteUrl(
+            this IUrlHelper helper,
+            string routeName,
+            object values,
+            string protocol)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            return helper.RouteUrl(routeName, values, protocol, host: null, fragment: null);
+        }
+
+        /// <summary>
+        /// Generates a URL with an absolute path for the specified route <paramref name="routeName"/> and route
+        /// <paramref name="values"/>, which contains the specified <paramref name="protocol"/> to use and
+        /// <paramref name="host"/> name. Generates an absolute URL if
+        /// <see cref="UrlActionContext.Protocol"/> and <see cref="UrlActionContext.Host"/> are non-<c>null</c>.
+        /// </summary>
+        /// <param name="helper">The <see cref="IUrlHelper"/>.</param>
+        /// <param name="routeName">The name of the route that is used to generate URL.</param>
+        /// <param name="values">An object that contains route values.</param>
+        /// <param name="protocol">The protocol for the URL, such as "http" or "https".</param>
+        /// <param name="host">The host name for the URL.</param>
+        /// <returns>The generated URL.</returns>
+        public static string RouteUrl(
+            this IUrlHelper helper,
+            string routeName,
+            object values,
+            string protocol,
+            string host)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            return helper.RouteUrl(routeName, values, protocol, host, fragment: null);
+        }
+
+        /// <summary>
+        /// Generates a URL with an absolute path for the specified route <paramref name="routeName"/> and route
+        /// <paramref name="values"/>, which contains the specified <paramref name="protocol"/> to use,
+        /// <paramref name="host"/> name and <paramref name="fragment"/>. Generates an absolute URL if
+        /// <see cref="UrlActionContext.Protocol"/> and <see cref="UrlActionContext.Host"/> are non-<c>null</c>.
+        /// </summary>
+        /// <param name="helper">The <see cref="IUrlHelper"/>.</param>
+        /// <param name="routeName">The name of the route that is used to generate URL.</param>
+        /// <param name="values">An object that contains route values.</param>
+        /// <param name="protocol">The protocol for the URL, such as "http" or "https".</param>
+        /// <param name="host">The host name for the URL.</param>
+        /// <param name="fragment">The fragment for the URL.</param>
+        /// <returns>The generated URL.</returns>
+        public static string RouteUrl(
+            this IUrlHelper helper,
+            string routeName,
+            object values,
+            string protocol,
+            string host,
+            string fragment)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            return helper.RouteUrl(new UrlRouteContext()
+            {
+                RouteName = routeName,
+                Values = values,
+                Protocol = protocol,
+                Host = host,
+                Fragment = fragment
+            });
+        }
+
+        /// <summary>
+        /// Generates a URL with an absolute path for the specified <paramref name="pageName"/>.
+        /// </summary>
+        /// <param name="urlHelper">The <see cref="IUrlHelper"/>.</param>
+        /// <param name="pageName">The page name to generate the url for.</param>
+        /// <returns>The generated URL.</returns>
+        public static string Page(this IUrlHelper urlHelper, string pageName)
+            => Page(urlHelper, pageName, values: null);
+
+        /// <summary>
+        /// Generates a URL with an absolute path for the specified <paramref name="pageName"/>.
+        /// </summary>
+        /// <param name="urlHelper">The <see cref="IUrlHelper"/>.</param>
+        /// <param name="pageName">The page name to generate the url for.</param>
+        /// <param name="pageHandler">The handler to generate the url for.</param>
+        /// <returns>The generated URL.</returns>
+        public static string Page(this IUrlHelper urlHelper, string pageName, string pageHandler)
+            => Page(urlHelper, pageName, pageHandler, values: null);
+
+        /// <summary>
+        /// Generates a URL with an absolute path for the specified <paramref name="pageName"/>.
+        /// </summary>
+        /// <param name="urlHelper">The <see cref="IUrlHelper"/>.</param>
+        /// <param name="pageName">The page name to generate the url for.</param>
+        /// <param name="values">An object that contains route values.</param>
+        /// <returns>The generated URL.</returns>
+        public static string Page(this IUrlHelper urlHelper, string pageName, object values)
+            => Page(urlHelper, pageName, pageHandler: null, values: values);
+
+        /// <summary>
+        /// Generates a URL with an absolute path for the specified <paramref name="pageName"/>.
+        /// </summary>
+        /// <param name="urlHelper">The <see cref="IUrlHelper"/>.</param>
+        /// <param name="pageName">The page name to generate the url for.</param>
+        /// <param name="pageHandler">The handler to generate the url for.</param>
+        /// <param name="values">An object that contains route values.</param>
+        /// <returns>The generated URL.</returns>
+        public static string Page(
+            this IUrlHelper urlHelper,
+            string pageName,
+            string pageHandler,
+            object values)
+            => Page(urlHelper, pageName, pageHandler, values, protocol: null);
+
+        /// <summary>
+        /// Generates a URL with an absolute path for the specified <paramref name="pageName"/>.
+        /// </summary>
+        /// <param name="urlHelper">The <see cref="IUrlHelper"/>.</param>
+        /// <param name="pageName">The page name to generate the url for.</param>
+        /// <param name="pageHandler">The handler to generate the url for.</param>
+        /// <param name="values">An object that contains route values.</param>
+        /// <param name="protocol">The protocol for the URL, such as "http" or "https".</param>
+        /// <returns>The generated URL.</returns>
+        public static string Page(
+            this IUrlHelper urlHelper,
+            string pageName,
+            string pageHandler,
+            object values,
+            string protocol)
+            => Page(urlHelper, pageName, pageHandler, values, protocol, host: null, fragment: null);
+
+        /// <summary>
+        /// Generates a URL with an absolute path for the specified <paramref name="pageName"/>.
+        /// </summary>
+        /// <param name="urlHelper">The <see cref="IUrlHelper"/>.</param>
+        /// <param name="pageName">The page name to generate the url for.</param>
+        /// <param name="pageHandler">The handler to generate the url for.</param>
+        /// <param name="values">An object that contains route values.</param>
+        /// <param name="protocol">The protocol for the URL, such as "http" or "https".</param>
+        /// <param name="host">The host name for the URL.</param>
+        /// <returns>The generated URL.</returns>
+        public static string Page(
+            this IUrlHelper urlHelper,
+            string pageName,
+            string pageHandler,
+            object values,
+            string protocol,
+            string host)
+            => Page(urlHelper, pageName, pageHandler, values, protocol, host, fragment: null);
+
+        /// <summary>
+        /// Generates a URL with an absolute path for the specified <paramref name="pageName"/>.
+        /// </summary>
+        /// <param name="urlHelper">The <see cref="IUrlHelper"/>.</param>
+        /// <param name="pageName">The page name to generate the url for.</param>
+        /// <param name="pageHandler">The handler to generate the url for.</param>
+        /// <param name="values">An object that contains route values.</param>
+        /// <param name="protocol">The protocol for the URL, such as "http" or "https".</param>
+        /// <param name="host">The host name for the URL.</param>
+        /// <param name="fragment">The fragment for the URL.</param>
+        /// <returns>The generated URL.</returns>
+        public static string Page(
+            this IUrlHelper urlHelper,
+            string pageName,
+            string pageHandler,
+            object values,
+            string protocol,
+            string host,
+            string fragment)
+        {
+            if (urlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(urlHelper));
+            }
+
+            var routeValues = new RouteValueDictionary(values);
+            var ambientValues = urlHelper.ActionContext.RouteData.Values;
+            if (string.IsNullOrEmpty(pageName))
+            {
+                if (!routeValues.ContainsKey("page") &&
+                    ambientValues.TryGetValue("page", out var value))
+                {
+                    routeValues["page"] = value;
+                }
+            }
+            else
+            {
+                routeValues["page"] = CalculatePageName(urlHelper.ActionContext, pageName);
+            }
+
+            if (string.IsNullOrEmpty(pageHandler))
+            {
+                if (!routeValues.ContainsKey("handler") &&
+                    ambientValues.TryGetValue("handler", out var handler))
+                {
+                    // Clear out formaction unless it's explicitly specified in the routeValues.
+                    routeValues["handler"] = null;
+                }
+            }
+            else
+            {
+                routeValues["handler"] = pageHandler;
+            }
+
+            return urlHelper.RouteUrl(
+                routeName: null,
+                values: routeValues,
+                protocol: protocol,
+                host: host,
+                fragment: fragment);
+        }
+
+        private static object CalculatePageName(ActionContext actionContext, string pageName)
+        {
+            Debug.Assert(pageName.Length > 0);
+            // Paths not qualified with a leading slash are treated as relative to the current page.
+            if (pageName[0] != '/')
+            {
+                var currentPagePath = NormalizedRouteValue.GetNormalizedRouteValue(actionContext, "page");
+                if (string.IsNullOrEmpty(currentPagePath))
+                {
+                    // Disallow the use sibling page routing, a Razor page specific feature, from a non-page action.
+                    throw new InvalidOperationException(Resources.FormatUrlHelper_RelativePagePathIsNotSupported(pageName));
+                }
+
+                return ViewEnginePath.CombinePath(currentPagePath, pageName);
+            }
+
+            return pageName;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ValidationProblemDetails.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ValidationProblemDetails.cs
new file mode 100644
index 0000000000..b27e790a90
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ValidationProblemDetails.cs
@@ -0,0 +1,69 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A <see cref="ProblemDetails"/> for validation errors.
+    /// </summary>
+    public class ValidationProblemDetails : ProblemDetails
+    {
+        /// <summary>
+        /// Intializes a new instance of <see cref="ValidationProblemDetails"/>.
+        /// </summary>
+        public ValidationProblemDetails()
+        {
+            Title = Resources.ValidationProblemDescription_Title;
+        }
+
+        public ValidationProblemDetails(ModelStateDictionary modelState)
+            : this()
+        {
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            foreach (var keyModelStatePair in modelState)
+            {
+                var key = keyModelStatePair.Key;
+                var errors = keyModelStatePair.Value.Errors;
+                if (errors != null && errors.Count > 0)
+                {
+                    if (errors.Count == 1)
+                    {
+                        var errorMessage = GetErrorMessage(errors[0]);
+                        Errors.Add(key, new[] { errorMessage });
+                    }
+                    else
+                    {
+                        var errorMessages = new string[errors.Count];
+                        for (var i = 0; i < errors.Count; i++)
+                        {
+                            errorMessages[i] = GetErrorMessage(errors[i]);
+                        }
+
+                        Errors.Add(key, errorMessages);
+                    }
+                }
+            }
+
+            string GetErrorMessage(ModelError error)
+            {
+                return string.IsNullOrEmpty(error.ErrorMessage) ?
+                    Resources.SerializableError_DefaultError :
+                    error.ErrorMessage;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the validation errors associated with this instance of <see cref="ValidationProblemDetails"/>.
+        /// </summary>
+        public IDictionary<string, string[]> Errors { get; } = new Dictionary<string, string[]>(StringComparer.Ordinal);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ViewFeatures/IKeepTempDataResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ViewFeatures/IKeepTempDataResult.cs
new file mode 100644
index 0000000000..5d86fc171e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ViewFeatures/IKeepTempDataResult.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// A marker interface for <see cref="IActionResult"/> types which need to have temp data saved.
+    /// </summary>
+    public interface IKeepTempDataResult : IActionResult
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/VirtualFileResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/VirtualFileResult.cs
new file mode 100644
index 0000000000..2e37c94a89
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/VirtualFileResult.cs
@@ -0,0 +1,92 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A <see cref="FileResult" /> that on execution writes the file specified using a virtual path to the response
+    /// using mechanisms provided by the host.
+    /// </summary>
+    public class VirtualFileResult : FileResult
+    {
+        private string _fileName;
+
+        /// <summary>
+        /// Creates a new <see cref="VirtualFileResult"/> instance with the provided <paramref name="fileName"/>
+        /// and the provided <paramref name="contentType"/>.
+        /// </summary>
+        /// <param name="fileName">The path to the file. The path must be relative/virtual.</param>
+        /// <param name="contentType">The Content-Type header of the response.</param>
+        public VirtualFileResult(string fileName, string contentType)
+            : this(fileName, MediaTypeHeaderValue.Parse(contentType))
+        {
+            if (fileName == null)
+            {
+                throw new ArgumentNullException(nameof(fileName));
+            }
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="VirtualFileResult"/> instance with
+        /// the provided <paramref name="fileName"/> and the
+        /// provided <paramref name="contentType"/>.
+        /// </summary>
+        /// <param name="fileName">The path to the file. The path must be relative/virtual.</param>
+        /// <param name="contentType">The Content-Type header of the response.</param>
+        public VirtualFileResult(string fileName, MediaTypeHeaderValue contentType)
+            : base(contentType?.ToString())
+        {
+            if (fileName == null)
+            {
+                throw new ArgumentNullException(nameof(fileName));
+            }
+
+            FileName = fileName;
+        }
+
+        /// <summary>
+        /// Gets or sets the path to the file that will be sent back as the response.
+        /// </summary>
+        public string FileName
+        {
+            get
+            {
+                return _fileName;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _fileName = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IFileProvider"/> used to resolve paths.
+        /// </summary>
+        public IFileProvider FileProvider { get; set; }
+
+        /// <inheritdoc />
+        public override Task ExecuteResultAsync(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var executor = context.HttpContext.RequestServices.GetRequiredService<IActionResultExecutor<VirtualFileResult>>();
+            return executor.ExecuteAsync(context, this);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/baseline.netcore.json
new file mode 100644
index 0000000000..b0e0b7509f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/baseline.netcore.json
@@ -0,0 +1,26187 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc.Core, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Builder.MvcApplicationBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "UseMvc",
+          "Parameters": [
+            {
+              "Name": "app",
+              "Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Builder.IApplicationBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "UseMvcWithDefaultRoute",
+          "Parameters": [
+            {
+              "Name": "app",
+              "Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Builder.IApplicationBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "UseMvc",
+          "Parameters": [
+            {
+              "Name": "app",
+              "Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder"
+            },
+            {
+              "Name": "configureRoutes",
+              "Type": "System.Action<Microsoft.AspNetCore.Routing.IRouteBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Builder.IApplicationBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Builder.MvcAreaRouteBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "MapAreaRoute",
+          "Parameters": [
+            {
+              "Name": "routeBuilder",
+              "Type": "Microsoft.AspNetCore.Routing.IRouteBuilder"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "areaName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "template",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Routing.IRouteBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MapAreaRoute",
+          "Parameters": [
+            {
+              "Name": "routeBuilder",
+              "Type": "Microsoft.AspNetCore.Routing.IRouteBuilder"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "areaName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "template",
+              "Type": "System.String"
+            },
+            {
+              "Name": "defaults",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Routing.IRouteBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MapAreaRoute",
+          "Parameters": [
+            {
+              "Name": "routeBuilder",
+              "Type": "Microsoft.AspNetCore.Routing.IRouteBuilder"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "areaName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "template",
+              "Type": "System.String"
+            },
+            {
+              "Name": "defaults",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "constraints",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Routing.IRouteBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MapAreaRoute",
+          "Parameters": [
+            {
+              "Name": "routeBuilder",
+              "Type": "Microsoft.AspNetCore.Routing.IRouteBuilder"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "areaName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "template",
+              "Type": "System.String"
+            },
+            {
+              "Name": "defaults",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "constraints",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "dataTokens",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Routing.IRouteBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.AcceptedAtActionResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ObjectResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_UrlHelper",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_UrlHelper",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ActionName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ActionName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ControllerName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ControllerName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteValues",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Routing.RouteValueDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RouteValues",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnFormatting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.AcceptedAtRouteResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ObjectResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_UrlHelper",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_UrlHelper",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RouteName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteValues",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Routing.RouteValueDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RouteValues",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnFormatting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.AcceptedResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ObjectResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Location",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Location",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnFormatting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "location",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "locationUri",
+              "Type": "System.Uri"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.AcceptVerbsAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Routing.IActionHttpMethodProvider",
+        "Microsoft.AspNetCore.Mvc.Routing.IRouteTemplateProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_HttpMethods",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.String>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Routing.IActionHttpMethodProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Route",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Route",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Routing.IRouteTemplateProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "method",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "methods",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ActionContextAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ActionNameAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ActionResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.IActionResult"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResult",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ActionResult<T0>",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Infrastructure.IConvertToActionResult"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Result",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Value",
+          "Parameters": [],
+          "ReturnType": "T0",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "op_Implicit",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionResult<T0>",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "op_Implicit",
+          "Parameters": [
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionResult"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionResult<T0>",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "T0"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionResult"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TValue",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiBehaviorOptions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_InvalidModelStateResponseFactory",
+          "Parameters": [],
+          "ReturnType": "System.Func<Microsoft.AspNetCore.Mvc.ActionContext, Microsoft.AspNetCore.Mvc.IActionResult>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_InvalidModelStateResponseFactory",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Func<Microsoft.AspNetCore.Mvc.ActionContext, Microsoft.AspNetCore.Mvc.IActionResult>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SuppressModelStateInvalidFilter",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SuppressModelStateInvalidFilter",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SuppressInferBindingSourcesForParameters",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SuppressInferBindingSourcesForParameters",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SuppressConsumesConstraintForFormFileParameters",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SuppressConsumesConstraintForFormFileParameters",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiControllerAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ControllerAttribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Internal.IApiBehaviorMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorerSettingsAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionGroupNameProvider",
+        "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionVisibilityProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_GroupName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionGroupNameProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_GroupName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IgnoreApi",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionVisibilityProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IgnoreApi",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.AreaAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Routing.RouteValueAttribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "areaName",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.BadRequestObjectResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ObjectResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "error",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.BadRequestResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.StatusCodeResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.BindAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelNameProvider",
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IPropertyFilterProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Include",
+          "Parameters": [],
+          "ReturnType": "System.String[]",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Prefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Prefix",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyFilter",
+          "Parameters": [],
+          "ReturnType": "System.Func<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata, System.Boolean>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IPropertyFilterProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "include",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.BindPropertiesAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_SupportsGet",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SupportsGet",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.BindPropertyAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelNameProvider",
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IBinderTypeProviderMetadata",
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IRequestPredicateProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_BindingSource",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SupportsGet",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SupportsGet",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BinderType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IBinderTypeProviderMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BinderType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BindingSource",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelNameProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.CacheProfile",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Duration",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Int32>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Duration",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.Int32>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Location",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<Microsoft.AspNetCore.Mvc.ResponseCacheLocation>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Location",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<Microsoft.AspNetCore.Mvc.ResponseCacheLocation>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NoStore",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Boolean>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_NoStore",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.Boolean>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_VaryByHeader",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_VaryByHeader",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_VaryByQueryKeys",
+          "Parameters": [],
+          "ReturnType": "System.String[]",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_VaryByQueryKeys",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String[]"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ChallengeResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AuthenticationSchemes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AuthenticationSchemes",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IList<System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Authentication.AuthenticationProperties",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Properties",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "authenticationScheme",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.Collections.Generic.IList<System.String>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "authenticationScheme",
+              "Type": "System.String"
+            },
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.Collections.Generic.IList<System.String>"
+            },
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.CompatibilityVersion",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Version_2_0",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Version_2_1",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Latest",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2147483647"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ConflictObjectResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ObjectResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "error",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ConflictResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.StatusCodeResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ConsumesAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IResourceFilter",
+        "Microsoft.AspNetCore.Mvc.Internal.IConsumesActionConstraint",
+        "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiRequestMetadataProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintContext"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraint",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ContentTypes",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.MediaTypeCollection",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ContentTypes",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.MediaTypeCollection"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnResourceExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResourceExecutingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IResourceFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnResourceExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResourceExecutedContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IResourceFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetContentTypes",
+          "Parameters": [
+            {
+              "Name": "contentTypes",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.MediaTypeCollection"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiRequestMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "otherContentTypes",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "ConsumesActionConstraintOrder",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ContentResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Content",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Content",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ContentType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ContentType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_StatusCode",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Int32>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_StatusCode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.Int32>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ControllerAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ControllerBase",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_HttpContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Http.HttpContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Request",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Http.HttpRequest",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Response",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Http.HttpResponse",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Routing.RouteData",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelState",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ControllerContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ControllerContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ControllerContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ControllerContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MetadataProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MetadataProvider",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelBinderFactory",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ModelBinderFactory",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Url",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Url",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ObjectValidator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ObjectValidator",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_User",
+          "Parameters": [],
+          "ReturnType": "System.Security.Claims.ClaimsPrincipal",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "StatusCode",
+          "Parameters": [
+            {
+              "Name": "statusCode",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.StatusCodeResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "StatusCode",
+          "Parameters": [
+            {
+              "Name": "statusCode",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ObjectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Content",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Content",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Content",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentEncoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Content",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "Microsoft.Net.Http.Headers.MediaTypeHeaderValue"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "NoContent",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.NoContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Ok",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.OkResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Ok",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.OkObjectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Redirect",
+          "Parameters": [
+            {
+              "Name": "url",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectPermanent",
+          "Parameters": [
+            {
+              "Name": "url",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "url",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectPermanentPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "url",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "LocalRedirect",
+          "Parameters": [
+            {
+              "Name": "localUrl",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.LocalRedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "LocalRedirectPermanent",
+          "Parameters": [
+            {
+              "Name": "localUrl",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.LocalRedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "LocalRedirectPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "localUrl",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.LocalRedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "LocalRedirectPermanentPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "localUrl",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.LocalRedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToAction",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPermanent",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPermanent",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPermanent",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPermanent",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPermanent",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPermanent",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPermanentPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoute",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoute",
+          "Parameters": [
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoute",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoute",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoute",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoutePreserveMethod",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoutePermanent",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoutePermanent",
+          "Parameters": [
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoutePermanent",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoutePermanent",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoutePermanent",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoutePermanentPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPage",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPage",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPage",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPage",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPage",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPage",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePermanent",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePermanent",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePermanent",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePermanent",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePermanent",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePreserveMethod",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePermanentPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileContents",
+              "Type": "System.Byte[]"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileContents",
+              "Type": "System.Byte[]"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "enableRangeProcessing",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileContents",
+              "Type": "System.Byte[]"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileContents",
+              "Type": "System.Byte[]"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "enableRangeProcessing",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileContents",
+              "Type": "System.Byte[]"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "lastModified",
+              "Type": "System.Nullable<System.DateTimeOffset>"
+            },
+            {
+              "Name": "entityTag",
+              "Type": "Microsoft.Net.Http.Headers.EntityTagHeaderValue"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileContents",
+              "Type": "System.Byte[]"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "lastModified",
+              "Type": "System.Nullable<System.DateTimeOffset>"
+            },
+            {
+              "Name": "entityTag",
+              "Type": "Microsoft.Net.Http.Headers.EntityTagHeaderValue"
+            },
+            {
+              "Name": "enableRangeProcessing",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileContents",
+              "Type": "System.Byte[]"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "lastModified",
+              "Type": "System.Nullable<System.DateTimeOffset>"
+            },
+            {
+              "Name": "entityTag",
+              "Type": "Microsoft.Net.Http.Headers.EntityTagHeaderValue"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileContents",
+              "Type": "System.Byte[]"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "lastModified",
+              "Type": "System.Nullable<System.DateTimeOffset>"
+            },
+            {
+              "Name": "entityTag",
+              "Type": "Microsoft.Net.Http.Headers.EntityTagHeaderValue"
+            },
+            {
+              "Name": "enableRangeProcessing",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileStream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileStreamResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileStream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "enableRangeProcessing",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileStreamResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileStream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileStreamResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileStream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "enableRangeProcessing",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileStreamResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileStream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "lastModified",
+              "Type": "System.Nullable<System.DateTimeOffset>"
+            },
+            {
+              "Name": "entityTag",
+              "Type": "Microsoft.Net.Http.Headers.EntityTagHeaderValue"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileStreamResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileStream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "lastModified",
+              "Type": "System.Nullable<System.DateTimeOffset>"
+            },
+            {
+              "Name": "entityTag",
+              "Type": "Microsoft.Net.Http.Headers.EntityTagHeaderValue"
+            },
+            {
+              "Name": "enableRangeProcessing",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileStreamResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileStream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "lastModified",
+              "Type": "System.Nullable<System.DateTimeOffset>"
+            },
+            {
+              "Name": "entityTag",
+              "Type": "Microsoft.Net.Http.Headers.EntityTagHeaderValue"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileStreamResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileStream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "lastModified",
+              "Type": "System.Nullable<System.DateTimeOffset>"
+            },
+            {
+              "Name": "entityTag",
+              "Type": "Microsoft.Net.Http.Headers.EntityTagHeaderValue"
+            },
+            {
+              "Name": "enableRangeProcessing",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileStreamResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "virtualPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.VirtualFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "virtualPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "enableRangeProcessing",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.VirtualFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "virtualPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.VirtualFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "virtualPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "enableRangeProcessing",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.VirtualFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "virtualPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "lastModified",
+              "Type": "System.Nullable<System.DateTimeOffset>"
+            },
+            {
+              "Name": "entityTag",
+              "Type": "Microsoft.Net.Http.Headers.EntityTagHeaderValue"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.VirtualFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "virtualPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "lastModified",
+              "Type": "System.Nullable<System.DateTimeOffset>"
+            },
+            {
+              "Name": "entityTag",
+              "Type": "Microsoft.Net.Http.Headers.EntityTagHeaderValue"
+            },
+            {
+              "Name": "enableRangeProcessing",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.VirtualFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "virtualPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "lastModified",
+              "Type": "System.Nullable<System.DateTimeOffset>"
+            },
+            {
+              "Name": "entityTag",
+              "Type": "Microsoft.Net.Http.Headers.EntityTagHeaderValue"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.VirtualFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "virtualPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "lastModified",
+              "Type": "System.Nullable<System.DateTimeOffset>"
+            },
+            {
+              "Name": "entityTag",
+              "Type": "Microsoft.Net.Http.Headers.EntityTagHeaderValue"
+            },
+            {
+              "Name": "enableRangeProcessing",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.VirtualFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PhysicalFile",
+          "Parameters": [
+            {
+              "Name": "physicalPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.PhysicalFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PhysicalFile",
+          "Parameters": [
+            {
+              "Name": "physicalPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "enableRangeProcessing",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.PhysicalFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PhysicalFile",
+          "Parameters": [
+            {
+              "Name": "physicalPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.PhysicalFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PhysicalFile",
+          "Parameters": [
+            {
+              "Name": "physicalPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "enableRangeProcessing",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.PhysicalFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PhysicalFile",
+          "Parameters": [
+            {
+              "Name": "physicalPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "lastModified",
+              "Type": "System.Nullable<System.DateTimeOffset>"
+            },
+            {
+              "Name": "entityTag",
+              "Type": "Microsoft.Net.Http.Headers.EntityTagHeaderValue"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.PhysicalFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PhysicalFile",
+          "Parameters": [
+            {
+              "Name": "physicalPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "lastModified",
+              "Type": "System.Nullable<System.DateTimeOffset>"
+            },
+            {
+              "Name": "entityTag",
+              "Type": "Microsoft.Net.Http.Headers.EntityTagHeaderValue"
+            },
+            {
+              "Name": "enableRangeProcessing",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.PhysicalFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PhysicalFile",
+          "Parameters": [
+            {
+              "Name": "physicalPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "lastModified",
+              "Type": "System.Nullable<System.DateTimeOffset>"
+            },
+            {
+              "Name": "entityTag",
+              "Type": "Microsoft.Net.Http.Headers.EntityTagHeaderValue"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.PhysicalFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PhysicalFile",
+          "Parameters": [
+            {
+              "Name": "physicalPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "lastModified",
+              "Type": "System.Nullable<System.DateTimeOffset>"
+            },
+            {
+              "Name": "entityTag",
+              "Type": "Microsoft.Net.Http.Headers.EntityTagHeaderValue"
+            },
+            {
+              "Name": "enableRangeProcessing",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.PhysicalFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Unauthorized",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.UnauthorizedResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "NotFound",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.NotFoundResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "NotFound",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.NotFoundObjectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BadRequest",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.BadRequestResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BadRequest",
+          "Parameters": [
+            {
+              "Name": "error",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.BadRequestObjectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BadRequest",
+          "Parameters": [
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.BadRequestObjectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "UnprocessableEntity",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.UnprocessableEntityResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "UnprocessableEntity",
+          "Parameters": [
+            {
+              "Name": "error",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.UnprocessableEntityObjectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "UnprocessableEntity",
+          "Parameters": [
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.UnprocessableEntityObjectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Conflict",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ConflictResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Conflict",
+          "Parameters": [
+            {
+              "Name": "error",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ConflictObjectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Conflict",
+          "Parameters": [
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ConflictObjectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationProblem",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.ValidationProblemDetails"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationProblem",
+          "Parameters": [
+            {
+              "Name": "modelStateDictionary",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationProblem",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Created",
+          "Parameters": [
+            {
+              "Name": "uri",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.CreatedResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Created",
+          "Parameters": [
+            {
+              "Name": "uri",
+              "Type": "System.Uri"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.CreatedResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreatedAtAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.CreatedAtActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreatedAtAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.CreatedAtActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreatedAtAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.CreatedAtActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreatedAtRoute",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.CreatedAtRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreatedAtRoute",
+          "Parameters": [
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.CreatedAtRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreatedAtRoute",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.CreatedAtRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accepted",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.AcceptedResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accepted",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.AcceptedResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accepted",
+          "Parameters": [
+            {
+              "Name": "uri",
+              "Type": "System.Uri"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.AcceptedResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accepted",
+          "Parameters": [
+            {
+              "Name": "uri",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.AcceptedResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accepted",
+          "Parameters": [
+            {
+              "Name": "uri",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.AcceptedResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accepted",
+          "Parameters": [
+            {
+              "Name": "uri",
+              "Type": "System.Uri"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.AcceptedResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AcceptedAtAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.AcceptedAtActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AcceptedAtAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.AcceptedAtActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AcceptedAtAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.AcceptedAtActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AcceptedAtAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.AcceptedAtActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AcceptedAtAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.AcceptedAtActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AcceptedAtAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.AcceptedAtActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AcceptedAtRoute",
+          "Parameters": [
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.AcceptedAtRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AcceptedAtRoute",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.AcceptedAtRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AcceptedAtRoute",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.AcceptedAtRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AcceptedAtRoute",
+          "Parameters": [
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.AcceptedAtRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AcceptedAtRoute",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.AcceptedAtRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Challenge",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ChallengeResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Challenge",
+          "Parameters": [
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ChallengeResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Challenge",
+          "Parameters": [
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ChallengeResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Challenge",
+          "Parameters": [
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            },
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ChallengeResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Forbid",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ForbidResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Forbid",
+          "Parameters": [
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ForbidResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Forbid",
+          "Parameters": [
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ForbidResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Forbid",
+          "Parameters": [
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            },
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ForbidResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SignIn",
+          "Parameters": [
+            {
+              "Name": "principal",
+              "Type": "System.Security.Claims.ClaimsPrincipal"
+            },
+            {
+              "Name": "authenticationScheme",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.SignInResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SignIn",
+          "Parameters": [
+            {
+              "Name": "principal",
+              "Type": "System.Security.Claims.ClaimsPrincipal"
+            },
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            },
+            {
+              "Name": "authenticationScheme",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.SignInResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SignOut",
+          "Parameters": [
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.SignOutResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SignOut",
+          "Parameters": [
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            },
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.SignOutResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "valueProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "includeExpressions",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, System.Object>>[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "propertyFilter",
+              "Type": "System.Func<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata, System.Boolean>"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "valueProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+            },
+            {
+              "Name": "includeExpressions",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, System.Object>>[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "valueProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+            },
+            {
+              "Name": "propertyFilter",
+              "Type": "System.Func<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata, System.Boolean>"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "valueProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+            },
+            {
+              "Name": "propertyFilter",
+              "Type": "System.Func<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata, System.Boolean>"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryValidateModel",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryValidateModel",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ControllerContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionContext",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionDescriptor",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ActionDescriptor",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValueProviderFactories",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ValueProviderFactories",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ControllerContextAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.CreatedAtActionResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ObjectResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_UrlHelper",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_UrlHelper",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ActionName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ActionName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ControllerName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ControllerName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteValues",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Routing.RouteValueDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RouteValues",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnFormatting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.CreatedAtRouteResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ObjectResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_UrlHelper",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_UrlHelper",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RouteName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteValues",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Routing.RouteValueDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RouteValues",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnFormatting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.CreatedResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ObjectResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Location",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Location",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnFormatting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "location",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "location",
+              "Type": "System.Uri"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.DisableRequestSizeLimitAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+        "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReusable",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateInstance",
+          "Parameters": [
+            {
+              "Name": "serviceProvider",
+              "Type": "System.IServiceProvider"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.EmptyResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResult",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.FileContentResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.FileResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FileContents",
+          "Parameters": [],
+          "ReturnType": "System.Byte[]",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FileContents",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Byte[]"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "fileContents",
+              "Type": "System.Byte[]"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "fileContents",
+              "Type": "System.Byte[]"
+            },
+            {
+              "Name": "contentType",
+              "Type": "Microsoft.Net.Http.Headers.MediaTypeHeaderValue"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.FileResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ContentType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FileDownloadName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FileDownloadName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_LastModified",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.DateTimeOffset>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_LastModified",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.DateTimeOffset>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_EntityTag",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Net.Http.Headers.EntityTagHeaderValue",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_EntityTag",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.Net.Http.Headers.EntityTagHeaderValue"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_EnableRangeProcessing",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_EnableRangeProcessing",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.FileStreamResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.FileResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FileStream",
+          "Parameters": [],
+          "ReturnType": "System.IO.Stream",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FileStream",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.IO.Stream"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "fileStream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "fileStream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "contentType",
+              "Type": "Microsoft.Net.Http.Headers.MediaTypeHeaderValue"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.MiddlewareFilterAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+        "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ConfigurationType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReusable",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateInstance",
+          "Parameters": [
+            {
+              "Name": "serviceProvider",
+              "Type": "System.IServiceProvider"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "configurationType",
+              "Type": "System.Type"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ForbidResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AuthenticationSchemes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AuthenticationSchemes",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IList<System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Authentication.AuthenticationProperties",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Properties",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "authenticationScheme",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.Collections.Generic.IList<System.String>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "authenticationScheme",
+              "Type": "System.String"
+            },
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.Collections.Generic.IList<System.String>"
+            },
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.FormatFilterAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_IsReusable",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateInstance",
+          "Parameters": [
+            {
+              "Name": "serviceProvider",
+              "Type": "System.IServiceProvider"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.FromBodyAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_BindingSource",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.FromFormAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceMetadata",
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelNameProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_BindingSource",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelNameProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.FromHeaderAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceMetadata",
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelNameProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_BindingSource",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelNameProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.FromQueryAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceMetadata",
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelNameProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_BindingSource",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelNameProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.FromRouteAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceMetadata",
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelNameProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_BindingSource",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelNameProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.FromServicesAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_BindingSource",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.HttpDeleteAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Routing.HttpMethodAttribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "template",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.HttpGetAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Routing.HttpMethodAttribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "template",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.HttpHeadAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Routing.HttpMethodAttribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "template",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.HttpOptionsAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Routing.HttpMethodAttribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "template",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.HttpPatchAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Routing.HttpMethodAttribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "template",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.HttpPostAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Routing.HttpMethodAttribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "template",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.HttpPutAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Routing.HttpMethodAttribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "template",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.IDesignTimeMvcBuilderConfiguration",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ConfigureMvc",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.IRequestFormLimitsPolicy",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.IRequestSizePolicy",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.LocalRedirectResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Permanent",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Permanent",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PreserveMethod",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PreserveMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Url",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Url",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_UrlHelper",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_UrlHelper",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResult",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "localUrl",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "localUrl",
+              "Type": "System.String"
+            },
+            {
+              "Name": "permanent",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "localUrl",
+              "Type": "System.String"
+            },
+            {
+              "Name": "permanent",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "preserveMethod",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinderAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelNameProvider",
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IBinderTypeProviderMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_BindingSource",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BinderType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IBinderTypeProviderMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BinderType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BindingSource",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelNameProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "binderType",
+              "Type": "System.Type"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelMetadataTypeAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_MetadataType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.MvcOptions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Infrastructure.ICompatibilitySwitch>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_AllowEmptyInputInBodyModelBinding",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AllowEmptyInputInBodyModelBinding",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AllowCombiningAuthorizeFilters",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AllowCombiningAuthorizeFilters",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AllowBindingHeaderValuesToNonStringModelTypes",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AllowBindingHeaderValuesToNonStringModelTypes",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AllowValidatingTopLevelNodes",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AllowValidatingTopLevelNodes",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_CacheProfiles",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, Microsoft.AspNetCore.Mvc.CacheProfile>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Conventions",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelConvention>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Filters",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.FilterCollection",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FormatterMappings",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.FormatterMappings",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_InputFormatterExceptionPolicy",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterExceptionPolicy",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_InputFormatterExceptionPolicy",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterExceptionPolicy"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_InputFormatters",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.FormatterCollection<Microsoft.AspNetCore.Mvc.Formatters.IInputFormatter>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SuppressBindingUndefinedValueToEnumType",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SuppressBindingUndefinedValueToEnumType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SuppressInputFormatterBuffering",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SuppressInputFormatterBuffering",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MaxModelValidationErrors",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MaxModelValidationErrors",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelBinderProviders",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelBindingMessageProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultModelBindingMessageProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelMetadataDetailsProviders",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelValidatorProviders",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidatorProvider>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_OutputFormatters",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.FormatterCollection<Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RespectBrowserAcceptHeader",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RespectBrowserAcceptHeader",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ReturnHttpNotAcceptable",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ReturnHttpNotAcceptable",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValueProviderFactories",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SslPort",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Int32>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SslPort",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.Int32>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RequireHttpsPermanent",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RequireHttpsPermanent",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.NoContentResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.StatusCodeResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.NonActionAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.NonControllerAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.NonViewComponentAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.NotFoundObjectResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ObjectResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.NotFoundResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.StatusCodeResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ObjectResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Value",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Value",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Formatters",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.FormatterCollection<Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Formatters",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.FormatterCollection<Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ContentTypes",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.MediaTypeCollection",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ContentTypes",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.MediaTypeCollection"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DeclaredType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DeclaredType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_StatusCode",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Int32>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_StatusCode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.Int32>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnFormatting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.OkObjectResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ObjectResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.OkResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.StatusCodeResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.PhysicalFileResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.FileResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FileName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FileName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "fileName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "fileName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "Microsoft.Net.Http.Headers.MediaTypeHeaderValue"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ProblemDetails",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Type",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Type",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Title",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Title",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Status",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Int32>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Status",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.Int32>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Detail",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Detail",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Instance",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Instance",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ProducesAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IResultFilter",
+        "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
+        "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiResponseMetadataProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Type",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiResponseMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Type",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ContentTypes",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.MediaTypeCollection",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ContentTypes",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.MediaTypeCollection"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_StatusCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiResponseMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnResultExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResultExecutingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IResultFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnResultExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResultExecutedContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IResultFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetContentTypes",
+          "Parameters": [
+            {
+              "Name": "contentTypes",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.MediaTypeCollection"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiResponseMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "additionalContentTypes",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ProducesResponseTypeAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiResponseMetadataProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Type",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiResponseMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Type",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_StatusCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiResponseMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_StatusCode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "statusCode",
+              "Type": "System.Int32"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "statusCode",
+              "Type": "System.Int32"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RedirectResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionResult",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewFeatures.IKeepTempDataResult"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Permanent",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Permanent",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PreserveMethod",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PreserveMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Url",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Url",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_UrlHelper",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_UrlHelper",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResult",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "url",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "url",
+              "Type": "System.String"
+            },
+            {
+              "Name": "permanent",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "url",
+              "Type": "System.String"
+            },
+            {
+              "Name": "permanent",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "preserveMethod",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionResult",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewFeatures.IKeepTempDataResult"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_UrlHelper",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_UrlHelper",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ActionName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ActionName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ControllerName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ControllerName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteValues",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Routing.RouteValueDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RouteValues",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Permanent",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Permanent",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PreserveMethod",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PreserveMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Fragment",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Fragment",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResult",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "permanent",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "permanent",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "preserveMethod",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "permanent",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "permanent",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "preserveMethod",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionResult",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewFeatures.IKeepTempDataResult"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_UrlHelper",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_UrlHelper",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PageName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PageName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PageHandler",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PageHandler",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteValues",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Routing.RouteValueDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RouteValues",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Permanent",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Permanent",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PreserveMethod",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PreserveMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Fragment",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Fragment",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Protocol",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Protocol",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Host",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Host",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResult",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "permanent",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "permanent",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "preserveMethod",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "permanent",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "permanent",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "preserveMethod",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionResult",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewFeatures.IKeepTempDataResult"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_UrlHelper",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_UrlHelper",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RouteName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteValues",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Routing.RouteValueDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RouteValues",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Permanent",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Permanent",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PreserveMethod",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PreserveMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Fragment",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Fragment",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResult",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "permanent",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "permanent",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "preserveMethod",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "permanent",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "permanent",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "preserveMethod",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RequestFormLimitsAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+        "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReusable",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BufferBody",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BufferBody",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MemoryBufferThreshold",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MemoryBufferThreshold",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BufferBodyLengthLimit",
+          "Parameters": [],
+          "ReturnType": "System.Int64",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BufferBodyLengthLimit",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int64"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValueCountLimit",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ValueCountLimit",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_KeyLengthLimit",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_KeyLengthLimit",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValueLengthLimit",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ValueLengthLimit",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MultipartBoundaryLengthLimit",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MultipartBoundaryLengthLimit",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MultipartHeadersCountLimit",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MultipartHeadersCountLimit",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MultipartHeadersLengthLimit",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MultipartHeadersLengthLimit",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MultipartBodyLengthLimit",
+          "Parameters": [],
+          "ReturnType": "System.Int64",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MultipartBodyLengthLimit",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int64"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateInstance",
+          "Parameters": [
+            {
+              "Name": "serviceProvider",
+              "Type": "System.IServiceProvider"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RequestSizeLimitAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+        "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReusable",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateInstance",
+          "Parameters": [
+            {
+              "Name": "serviceProvider",
+              "Type": "System.IServiceProvider"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "bytes",
+              "Type": "System.Int64"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RequireHttpsAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IAuthorizationFilter",
+        "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Permanent",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Permanent",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnAuthorization",
+          "Parameters": [
+            {
+              "Name": "filterContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IAuthorizationFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "HandleNonHttpsRequest",
+          "Parameters": [
+            {
+              "Name": "filterContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ResponseCacheAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+        "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Duration",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Duration",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Location",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ResponseCacheLocation",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Location",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ResponseCacheLocation"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NoStore",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_NoStore",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_VaryByHeader",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_VaryByHeader",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_VaryByQueryKeys",
+          "Parameters": [],
+          "ReturnType": "System.String[]",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_VaryByQueryKeys",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String[]"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_CacheProfileName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_CacheProfileName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReusable",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetCacheProfile",
+          "Parameters": [
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Mvc.MvcOptions"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.CacheProfile",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateInstance",
+          "Parameters": [
+            {
+              "Name": "serviceProvider",
+              "Type": "System.IServiceProvider"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ResponseCacheLocation",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Any",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Client",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "None",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RouteAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Routing.IRouteTemplateProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Template",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Routing.IRouteTemplateProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Routing.IRouteTemplateProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "template",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.SerializableError",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "System.Collections.Generic.Dictionary<System.String, System.Object>",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ServiceFilterAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+        "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ServiceType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReusable",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsReusable",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateInstance",
+          "Parameters": [
+            {
+              "Name": "serviceProvider",
+              "Type": "System.IServiceProvider"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.SignInResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AuthenticationScheme",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AuthenticationScheme",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Principal",
+          "Parameters": [],
+          "ReturnType": "System.Security.Claims.ClaimsPrincipal",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Principal",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Security.Claims.ClaimsPrincipal"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Authentication.AuthenticationProperties",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Properties",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "authenticationScheme",
+              "Type": "System.String"
+            },
+            {
+              "Name": "principal",
+              "Type": "System.Security.Claims.ClaimsPrincipal"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "authenticationScheme",
+              "Type": "System.String"
+            },
+            {
+              "Name": "principal",
+              "Type": "System.Security.Claims.ClaimsPrincipal"
+            },
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.SignOutResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AuthenticationSchemes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AuthenticationSchemes",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IList<System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Authentication.AuthenticationProperties",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Properties",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "authenticationScheme",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.Collections.Generic.IList<System.String>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "authenticationScheme",
+              "Type": "System.String"
+            },
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.Collections.Generic.IList<System.String>"
+            },
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.StatusCodeResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_StatusCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResult",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "statusCode",
+              "Type": "System.Int32"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TypeFilterAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+        "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Arguments",
+          "Parameters": [],
+          "ReturnType": "System.Object[]",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Arguments",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object[]"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ImplementationType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReusable",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsReusable",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateInstance",
+          "Parameters": [
+            {
+              "Name": "serviceProvider",
+              "Type": "System.IServiceProvider"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.UnauthorizedResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.StatusCodeResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.UnprocessableEntityObjectResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ObjectResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "error",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.UnprocessableEntityResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.StatusCodeResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.UnsupportedMediaTypeResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.StatusCodeResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.UrlHelperExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Action",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Action",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            },
+            {
+              "Name": "action",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Action",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            },
+            {
+              "Name": "action",
+              "Type": "System.String"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Action",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            },
+            {
+              "Name": "action",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controller",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Action",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            },
+            {
+              "Name": "action",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controller",
+              "Type": "System.String"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Action",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            },
+            {
+              "Name": "action",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controller",
+              "Type": "System.String"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "protocol",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Action",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            },
+            {
+              "Name": "action",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controller",
+              "Type": "System.String"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "protocol",
+              "Type": "System.String"
+            },
+            {
+              "Name": "host",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Action",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            },
+            {
+              "Name": "action",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controller",
+              "Type": "System.String"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "protocol",
+              "Type": "System.String"
+            },
+            {
+              "Name": "host",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RouteUrl",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RouteUrl",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            },
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RouteUrl",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            },
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RouteUrl",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            },
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "protocol",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RouteUrl",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            },
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "protocol",
+              "Type": "System.String"
+            },
+            {
+              "Name": "host",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RouteUrl",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            },
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "protocol",
+              "Type": "System.String"
+            },
+            {
+              "Name": "host",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Page",
+          "Parameters": [
+            {
+              "Name": "urlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Page",
+          "Parameters": [
+            {
+              "Name": "urlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Page",
+          "Parameters": [
+            {
+              "Name": "urlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Page",
+          "Parameters": [
+            {
+              "Name": "urlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Page",
+          "Parameters": [
+            {
+              "Name": "urlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "protocol",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Page",
+          "Parameters": [
+            {
+              "Name": "urlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "protocol",
+              "Type": "System.String"
+            },
+            {
+              "Name": "host",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Page",
+          "Parameters": [
+            {
+              "Name": "urlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "protocol",
+              "Type": "System.String"
+            },
+            {
+              "Name": "host",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ValidationProblemDetails",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ProblemDetails",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Errors",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String[]>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.VirtualFileResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.FileResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FileName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FileName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FileProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.FileProviders.IFileProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FileProvider",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.Extensions.FileProviders.IFileProvider"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "fileName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "fileName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "Microsoft.Net.Http.Headers.MediaTypeHeaderValue"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.IKeepTempDataResult",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.IActionResult"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Routing.HttpMethodAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Routing.IActionHttpMethodProvider",
+        "Microsoft.AspNetCore.Mvc.Routing.IRouteTemplateProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_HttpMethods",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.String>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Routing.IActionHttpMethodProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Template",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Routing.IRouteTemplateProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Routing.IRouteTemplateProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "httpMethods",
+              "Type": "System.Collections.Generic.IEnumerable<System.String>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "httpMethods",
+              "Type": "System.Collections.Generic.IEnumerable<System.String>"
+            },
+            {
+              "Name": "template",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Routing.IActionHttpMethodProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_HttpMethods",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.String>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Routing.IRouteTemplateProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Template",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Int32>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Routing.IRouteValueProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_RouteKey",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteValue",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetUrlHelper",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Routing.KnownRouteValueConstraint",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Routing.IRouteConstraint"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Match",
+          "Parameters": [
+            {
+              "Name": "httpContext",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            },
+            {
+              "Name": "route",
+              "Type": "Microsoft.AspNetCore.Routing.IRouter"
+            },
+            {
+              "Name": "routeKey",
+              "Type": "System.String"
+            },
+            {
+              "Name": "values",
+              "Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
+            },
+            {
+              "Name": "routeDirection",
+              "Type": "Microsoft.AspNetCore.Routing.RouteDirection"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Routing.IRouteConstraint",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Routing.RouteValueAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Routing.IRouteValueProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_RouteKey",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Routing.IRouteValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteValue",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Routing.IRouteValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "routeKey",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValue",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Routing.UrlHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.IUrlHelper"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionContext",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AmbientValues",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Routing.RouteValueDictionary",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HttpContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Http.HttpContext",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Router",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Routing.IRouter",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Action",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Routing.UrlActionContext"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsLocalUrl",
+          "Parameters": [
+            {
+              "Name": "url",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RouteUrl",
+          "Parameters": [
+            {
+              "Name": "routeContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Routing.UrlRouteContext"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetVirtualPathData",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "values",
+              "Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Routing.VirtualPathData",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Content",
+          "Parameters": [
+            {
+              "Name": "contentPath",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Link",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateUrl",
+          "Parameters": [
+            {
+              "Name": "protocol",
+              "Type": "System.String"
+            },
+            {
+              "Name": "host",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pathData",
+              "Type": "Microsoft.AspNetCore.Routing.VirtualPathData"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Routing.UrlHelperFactory",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetUrlHelper",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.DefaultModelBindingContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionContext",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ActionContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FieldName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FieldName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Model",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Model",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ModelMetadata",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ModelName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelState",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ModelState",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BinderModelName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BinderModelName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BindingSource",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BindingSource",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsTopLevelObject",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsTopLevelObject",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_OriginalValueProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_OriginalValueProvider",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValueProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ValueProvider",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyFilter",
+          "Parameters": [],
+          "ReturnType": "System.Func<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata, System.Boolean>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PropertyFilter",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Func<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata, System.Boolean>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidationState",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateDictionary",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ValidationState",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Result",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Result",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateBindingContext",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "valueProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+            },
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "bindingInfo",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo"
+            },
+            {
+              "Name": "modelName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EnterNestedScope",
+          "Parameters": [
+            {
+              "Name": "modelMetadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "fieldName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "modelName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext+NestedScope",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EnterNestedScope",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext+NestedScope",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExitNestedScope",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingBehavior",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Optional",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Never",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Required",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingBehaviorAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Behavior",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingBehavior",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "behavior",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingBehavior"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSourceValueProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceValueProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ContainsPrefix",
+          "Parameters": [
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetValue",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult",
+          "Virtual": true,
+          "Abstract": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BindingSource",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Filter",
+          "Parameters": [
+            {
+              "Name": "bindingSource",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "bindingSource",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.BindNeverAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingBehaviorAttribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.BindRequiredAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingBehaviorAttribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.CompositeValueProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Collections.ObjectModel.Collection<Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider>",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IEnumerableValueProvider",
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceValueProvider",
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IKeyRewriterValueProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ContainsPrefix",
+          "Parameters": [
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetValue",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateAsync",
+          "Parameters": [
+            {
+              "Name": "controllerContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ControllerContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.ModelBinding.CompositeValueProvider>",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateAsync",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "factories",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory>"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.ModelBinding.CompositeValueProvider>",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetKeysFromPrefix",
+          "Parameters": [
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IEnumerableValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "InsertItem",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetItem",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Filter",
+          "Parameters": [
+            {
+              "Name": "bindingSource",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Filter",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IKeyRewriterValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "valueProviders",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.DefaultPropertyFilterProvider<T0>",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IPropertyFilterProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Prefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyIncludeExpressions",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression<System.Func<T0, System.Object>>>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyFilter",
+          "Parameters": [],
+          "ReturnType": "System.Func<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata, System.Boolean>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IPropertyFilterProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TModel",
+          "ParameterPosition": 0,
+          "Class": true,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.EmptyModelMetadataProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultModelMetadataProvider",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.FormValueProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSourceValueProvider",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IEnumerableValueProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ContainsPrefix",
+          "Parameters": [
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetValue",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Culture",
+          "Parameters": [],
+          "ReturnType": "System.Globalization.CultureInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PrefixContainer",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Internal.PrefixContainer",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetKeysFromPrefix",
+          "Parameters": [
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IEnumerableValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "bindingSource",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            },
+            {
+              "Name": "values",
+              "Type": "Microsoft.AspNetCore.Http.IFormCollection"
+            },
+            {
+              "Name": "culture",
+              "Type": "System.Globalization.CultureInfo"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.FormValueProviderFactory",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateValueProviderAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderFactoryContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceValueProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Filter",
+          "Parameters": [
+            {
+              "Name": "bindingSource",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ICollectionModelBinder",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CanCreateInstance",
+          "Parameters": [
+            {
+              "Name": "targetType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.IEnumerableValueProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetKeysFromPrefix",
+          "Parameters": [
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.IKeyRewriterValueProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Filter",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateBinder",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderFactoryContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.JQueryFormValueProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ModelBinding.JQueryValueProvider",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "bindingSource",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Collections.Generic.IDictionary<System.String, Microsoft.Extensions.Primitives.StringValues>"
+            },
+            {
+              "Name": "culture",
+              "Type": "System.Globalization.CultureInfo"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.JQueryFormValueProviderFactory",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateValueProviderAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderFactoryContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.JQueryQueryStringValueProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ModelBinding.JQueryValueProvider",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "bindingSource",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Collections.Generic.IDictionary<System.String, Microsoft.Extensions.Primitives.StringValues>"
+            },
+            {
+              "Name": "culture",
+              "Type": "System.Globalization.CultureInfo"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.JQueryQueryStringValueProviderFactory",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateValueProviderAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderFactoryContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.JQueryValueProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSourceValueProvider",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IEnumerableValueProvider",
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IKeyRewriterValueProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ContainsPrefix",
+          "Parameters": [
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetValue",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Culture",
+          "Parameters": [],
+          "ReturnType": "System.Globalization.CultureInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PrefixContainer",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Internal.PrefixContainer",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetKeysFromPrefix",
+          "Parameters": [
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IEnumerableValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Filter",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IKeyRewriterValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "bindingSource",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Collections.Generic.IDictionary<System.String, Microsoft.Extensions.Primitives.StringValues>"
+            },
+            {
+              "Name": "culture",
+              "Type": "System.Globalization.CultureInfo"
+            }
+          ],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelAttributes",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Attributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyAttributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParameterAttributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TypeAttributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetAttributesForProperty",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "property",
+              "Type": "System.Reflection.PropertyInfo"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelAttributes",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetAttributesForType",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelAttributes",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetAttributesForParameter",
+          "Parameters": [
+            {
+              "Name": "parameterInfo",
+              "Type": "System.Reflection.ParameterInfo"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelAttributes",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "typeAttributes",
+              "Type": "System.Collections.Generic.IEnumerable<System.Object>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "propertyAttributes",
+              "Type": "System.Collections.Generic.IEnumerable<System.Object>"
+            },
+            {
+              "Name": "typeAttributes",
+              "Type": "System.Collections.Generic.IEnumerable<System.Object>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderFactory",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateBinder",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderFactoryContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "metadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcOptions>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "metadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcOptions>"
+            },
+            {
+              "Name": "serviceProvider",
+              "Type": "System.IServiceProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderFactoryContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_BindingInfo",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BindingInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Metadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Metadata",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_CacheToken",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_CacheToken",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderProviderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "RemoveType<T0>",
+          "Parameters": [
+            {
+              "Name": "list",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModelBinderProvider",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider"
+              ]
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "RemoveType",
+          "Parameters": [
+            {
+              "Name": "list",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider>"
+            },
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadataProviderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetMetadataForProperty",
+          "Parameters": [
+            {
+              "Name": "provider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "containerType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "propertyName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelNames",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateIndexModelName",
+          "Parameters": [
+            {
+              "Name": "parentName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateIndexModelName",
+          "Parameters": [
+            {
+              "Name": "parentName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "index",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreatePropertyModelName",
+          "Parameters": [
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "propertyName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ObjectModelValidator",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Validate",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "validationState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateDictionary"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Validate",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "validationState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateDictionary"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetValidationVisitor",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "validatorProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidatorProvider"
+            },
+            {
+              "Name": "validatorCache",
+              "Type": "Microsoft.AspNetCore.Mvc.Internal.ValidatorCache"
+            },
+            {
+              "Name": "metadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "validationState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateDictionary"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationVisitor",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "modelMetadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "validatorProviders",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidatorProvider>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Logger",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.Logging.ILogger",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "valueProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+            },
+            {
+              "Name": "parameter",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "valueProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+            },
+            {
+              "Name": "parameter",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "modelBinder",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+            },
+            {
+              "Name": "valueProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+            },
+            {
+              "Name": "parameter",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor"
+            },
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "modelMetadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "modelBinderFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory"
+            },
+            {
+              "Name": "validator",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "modelMetadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "modelBinderFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory"
+            },
+            {
+              "Name": "validator",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator"
+            },
+            {
+              "Name": "mvcOptions",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcOptions>"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.QueryStringValueProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSourceValueProvider",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IEnumerableValueProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ContainsPrefix",
+          "Parameters": [
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetValue",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Culture",
+          "Parameters": [],
+          "ReturnType": "System.Globalization.CultureInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PrefixContainer",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Internal.PrefixContainer",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetKeysFromPrefix",
+          "Parameters": [
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IEnumerableValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "bindingSource",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            },
+            {
+              "Name": "values",
+              "Type": "Microsoft.AspNetCore.Http.IQueryCollection"
+            },
+            {
+              "Name": "culture",
+              "Type": "System.Globalization.CultureInfo"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.QueryStringValueProviderFactory",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateValueProviderAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderFactoryContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.RouteValueProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSourceValueProvider",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ContainsPrefix",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetValue",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PrefixContainer",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Internal.PrefixContainer",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Culture",
+          "Parameters": [],
+          "ReturnType": "System.Globalization.CultureInfo",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "bindingSource",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            },
+            {
+              "Name": "values",
+              "Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "bindingSource",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            },
+            {
+              "Name": "values",
+              "Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
+            },
+            {
+              "Name": "culture",
+              "Type": "System.Globalization.CultureInfo"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.RouteValueProviderFactory",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateValueProviderAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderFactoryContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.SuppressChildValidationMetadataProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IValidationMetadataProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Type",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FullTypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateValidationMetadata",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadataProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IValidationMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "fullTypeName",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.UnsupportedContentTypeException",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Exception",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "message",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.UnsupportedContentTypeFilter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IActionFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "OnActionExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IActionFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnActionExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IActionFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderFactoryExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "RemoveType<T0>",
+          "Parameters": [
+            {
+              "Name": "list",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TValueProviderFactory",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory"
+              ]
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "RemoveType",
+          "Parameters": [
+            {
+              "Name": "list",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory>"
+            },
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.CompositeClientModelValidatorProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidatorProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ValidatorProviders",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidatorProvider>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateValidators",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientValidatorProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidatorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "providers",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidatorProvider>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.CompositeModelValidatorProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidatorProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ValidatorProviders",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidatorProvider>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateValidators",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidatorProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidatorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "providers",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidatorProvider>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Validate",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "validationState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateDictionary"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidatorProviderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "RemoveType<T0>",
+          "Parameters": [
+            {
+              "Name": "list",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidatorProvider>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModelValidatorProvider",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidatorProvider"
+              ]
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "RemoveType",
+          "Parameters": [
+            {
+              "Name": "list",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidatorProvider>"
+            },
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidateNeverAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IPropertyValidationFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ShouldValidateEntry",
+          "Parameters": [
+            {
+              "Name": "entry",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationEntry"
+            },
+            {
+              "Name": "parentEntry",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationEntry"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IPropertyValidationFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationVisitor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ValidatorProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidatorProvider",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MetadataProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Cache",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Internal.ValidatorCache",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Context",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionContext",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelState",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidationState",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateDictionary",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_CurrentPath",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Internal.ValidationStack",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Container",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Container",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Key",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Key",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Model",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Model",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Metadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Metadata",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Strategy",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IValidationStrategy",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Strategy",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IValidationStrategy"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidateComplexTypesIfChildValidationFails",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ValidateComplexTypesIfChildValidationFails",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Validate",
+          "Parameters": [
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Validate",
+          "Parameters": [
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "alwaysValidateAtTopLevel",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidateNode",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Visit",
+          "Parameters": [
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitComplexType",
+          "Parameters": [
+            {
+              "Name": "defaultStrategy",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IValidationStrategy"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitSimpleType",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "VisitChildren",
+          "Parameters": [
+            {
+              "Name": "strategy",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IValidationStrategy"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SuppressValidation",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetValidationEntry",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "validatorProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidatorProvider"
+            },
+            {
+              "Name": "validatorCache",
+              "Type": "Microsoft.AspNetCore.Mvc.Internal.ValidatorCache"
+            },
+            {
+              "Name": "metadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "validationState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateDictionary"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadata",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_BindingSource",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BindingSource",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BinderModelName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BinderModelName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BinderType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BinderType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsBindingAllowed",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsBindingAllowed",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsBindingRequired",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsBindingRequired",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReadOnly",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Boolean>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsReadOnly",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.Boolean>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelBindingMessageProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultModelBindingMessageProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ModelBindingMessageProvider",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultModelBindingMessageProvider"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyFilterProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IPropertyFilterProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PropertyFilterProvider",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IPropertyFilterProvider"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadataProviderContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Attributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Key",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParameterAttributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyAttributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TypeAttributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BindingMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity"
+            },
+            {
+              "Name": "attributes",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelAttributes"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingSourceMetadataProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IBindingMetadataProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Type",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BindingSource",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateBindingMetadata",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadataProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IBindingMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "bindingSource",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultMetadataDetails",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ModelAttributes",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelAttributes",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BindingMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BindingMetadata",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadata"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DisplayMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayMetadata",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DisplayMetadata"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Key",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata[]",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Properties",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata[]"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyGetter",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.Object, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PropertyGetter",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Func<System.Object, System.Object>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertySetter",
+          "Parameters": [],
+          "ReturnType": "System.Action<System.Object, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PropertySetter",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Action<System.Object, System.Object>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidationMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ValidationMetadata",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadata"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ContainerMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ContainerMetadata",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity"
+            },
+            {
+              "Name": "attributes",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelAttributes"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultModelBindingMessageProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelBindingMessageProvider",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_MissingBindRequiredValueAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String, System.String>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetMissingBindRequiredValueAccessor",
+          "Parameters": [
+            {
+              "Name": "missingBindRequiredValueAccessor",
+              "Type": "System.Func<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MissingKeyOrValueAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetMissingKeyOrValueAccessor",
+          "Parameters": [
+            {
+              "Name": "missingKeyOrValueAccessor",
+              "Type": "System.Func<System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MissingRequestBodyRequiredValueAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetMissingRequestBodyRequiredValueAccessor",
+          "Parameters": [
+            {
+              "Name": "missingRequestBodyRequiredValueAccessor",
+              "Type": "System.Func<System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValueMustNotBeNullAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String, System.String>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetValueMustNotBeNullAccessor",
+          "Parameters": [
+            {
+              "Name": "valueMustNotBeNullAccessor",
+              "Type": "System.Func<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AttemptedValueIsInvalidAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String, System.String, System.String>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetAttemptedValueIsInvalidAccessor",
+          "Parameters": [
+            {
+              "Name": "attemptedValueIsInvalidAccessor",
+              "Type": "System.Func<System.String, System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NonPropertyAttemptedValueIsInvalidAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String, System.String>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetNonPropertyAttemptedValueIsInvalidAccessor",
+          "Parameters": [
+            {
+              "Name": "nonPropertyAttemptedValueIsInvalidAccessor",
+              "Type": "System.Func<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_UnknownValueIsInvalidAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String, System.String>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetUnknownValueIsInvalidAccessor",
+          "Parameters": [
+            {
+              "Name": "unknownValueIsInvalidAccessor",
+              "Type": "System.Func<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NonPropertyUnknownValueIsInvalidAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetNonPropertyUnknownValueIsInvalidAccessor",
+          "Parameters": [
+            {
+              "Name": "nonPropertyUnknownValueIsInvalidAccessor",
+              "Type": "System.Func<System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValueIsInvalidAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String, System.String>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetValueIsInvalidAccessor",
+          "Parameters": [
+            {
+              "Name": "valueIsInvalidAccessor",
+              "Type": "System.Func<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValueMustBeANumberAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String, System.String>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetValueMustBeANumberAccessor",
+          "Parameters": [
+            {
+              "Name": "valueMustBeANumberAccessor",
+              "Type": "System.Func<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NonPropertyValueMustBeANumberAccessor",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetNonPropertyValueMustBeANumberAccessor",
+          "Parameters": [
+            {
+              "Name": "nonPropertyValueMustBeANumberAccessor",
+              "Type": "System.Func<System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "originalProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultModelBindingMessageProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultModelMetadata",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetMetadataForType",
+          "Parameters": [
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetMetadataForProperties",
+          "Parameters": [
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata>",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Attributes",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelAttributes",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ContainerMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BindingMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DisplayMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidationMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AdditionalValues",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyDictionary<System.Object, System.Object>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BindingSource",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BinderModelName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BinderType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ConvertEmptyStringToNull",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DataTypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Description",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayFormatString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_EditFormatString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ElementMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_EnumGroupedDisplayNamesAndValues",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<Microsoft.AspNetCore.Mvc.ModelBinding.EnumGroupAndName, System.String>>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_EnumNamesAndValues",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyDictionary<System.String, System.String>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasNonDefaultEditFormat",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HideSurroundingHtml",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HtmlEncode",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsBindingAllowed",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsBindingRequired",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsEnum",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsFlagsEnum",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReadOnly",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsRequired",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelBindingMessageProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelBindingMessageProvider",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NullDisplayText",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Placeholder",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelPropertyCollection",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyFilterProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IPropertyFilterProvider",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ShowForDisplay",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ShowForEdit",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SimpleDisplayProperty",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TemplateHint",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyValidationFilter",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IPropertyValidationFilter",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidateChildren",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidatorMetadata",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyGetter",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.Object, System.Object>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertySetter",
+          "Parameters": [],
+          "ReturnType": "System.Action<System.Object, System.Object>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "provider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "detailsProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ICompositeMetadataDetailsProvider"
+            },
+            {
+              "Name": "details",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultMetadataDetails"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "provider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "detailsProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ICompositeMetadataDetailsProvider"
+            },
+            {
+              "Name": "details",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultMetadataDetails"
+            },
+            {
+              "Name": "modelBindingMessageProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultModelBindingMessageProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultModelMetadataProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadataProvider",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetMetadataForType",
+          "Parameters": [
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetMetadataForProperties",
+          "Parameters": [
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata>",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DetailsProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ICompositeMetadataDetailsProvider",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelBindingMessageProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultModelBindingMessageProvider",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetMetadataForParameter",
+          "Parameters": [
+            {
+              "Name": "parameter",
+              "Type": "System.Reflection.ParameterInfo"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateModelMetadata",
+          "Parameters": [
+            {
+              "Name": "entry",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultMetadataDetails"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreatePropertyDetails",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultMetadataDetails[]",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateTypeDetails",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultMetadataDetails",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateParameterDetails",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DefaultMetadataDetails",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "detailsProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ICompositeMetadataDetailsProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "detailsProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ICompositeMetadataDetailsProvider"
+            },
+            {
+              "Name": "optionsAccessor",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcOptions>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DisplayMetadata",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_AdditionalValues",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.Object, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ConvertEmptyStringToNull",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ConvertEmptyStringToNull",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DataTypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DataTypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Description",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Description",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Func<System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayFormatString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayFormatString",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayFormatStringProvider",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayFormatStringProvider",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Func<System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Func<System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_EditFormatString",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_EditFormatString",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_EditFormatStringProvider",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_EditFormatStringProvider",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Func<System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_EnumGroupedDisplayNamesAndValues",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<Microsoft.AspNetCore.Mvc.ModelBinding.EnumGroupAndName, System.String>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_EnumGroupedDisplayNamesAndValues",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<Microsoft.AspNetCore.Mvc.ModelBinding.EnumGroupAndName, System.String>>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_EnumNamesAndValues",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_EnumNamesAndValues",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyDictionary<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasNonDefaultEditFormat",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HasNonDefaultEditFormat",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HideSurroundingHtml",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HideSurroundingHtml",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HtmlEncode",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HtmlEncode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsEnum",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsEnum",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsFlagsEnum",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsFlagsEnum",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NullDisplayText",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_NullDisplayText",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_NullDisplayTextProvider",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_NullDisplayTextProvider",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Func<System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Placeholder",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Placeholder",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Func<System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ShowForDisplay",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ShowForDisplay",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ShowForEdit",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ShowForEdit",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SimpleDisplayProperty",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SimpleDisplayProperty",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TemplateHint",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TemplateHint",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DisplayMetadataProviderContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Attributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DisplayMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Key",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyAttributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TypeAttributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity"
+            },
+            {
+              "Name": "attributes",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelAttributes"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ExcludeBindingMetadataProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IBindingMetadataProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateBindingMetadata",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadataProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IBindingMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IBindingMetadataProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateBindingMetadata",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadataProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ICompositeMetadataDetailsProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IBindingMetadataProvider",
+        "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IDisplayMetadataProvider",
+        "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IValidationMetadataProvider"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IDisplayMetadataProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateDisplayMetadata",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DisplayMetadataProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IValidationMetadataProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateValidationMetadata",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadataProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.MetadataDetailsProviderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "RemoveType<T0>",
+          "Parameters": [
+            {
+              "Name": "list",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TMetadataDetailsProvider",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider"
+              ]
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "RemoveType",
+          "Parameters": [
+            {
+              "Name": "list",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider>"
+            },
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadata",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_IsRequired",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Boolean>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsRequired",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.Boolean>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyValidationFilter",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IPropertyValidationFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PropertyValidationFilter",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IPropertyValidationFilter"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidateChildren",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Boolean>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ValidateChildren",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.Boolean>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidatorMetadata",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadataProviderContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Attributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Key",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyAttributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TypeAttributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidationMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity"
+            },
+            {
+              "Name": "attributes",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelAttributes"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.ArrayModelBinder<T0>",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.CollectionModelBinder<T0>",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CanCreateInstance",
+          "Parameters": [
+            {
+              "Name": "targetType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.ICollectionModelBinder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateEmptyCollection",
+          "Parameters": [
+            {
+              "Name": "targetType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ConvertToCollectionType",
+          "Parameters": [
+            {
+              "Name": "targetType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "collection",
+              "Type": "System.Collections.Generic.IEnumerable<T0>"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CopyToModel",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "sourceCollection",
+              "Type": "System.Collections.Generic.IEnumerable<T0>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "elementBinder",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "elementBinder",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TElement",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.ArrayModelBinderProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetBinder",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.BinderTypeModelBinder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "binderType",
+              "Type": "System.Type"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.BinderTypeModelBinderProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetBinder",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.BodyModelBinder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "formatters",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Formatters.IInputFormatter>"
+            },
+            {
+              "Name": "readerFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Infrastructure.IHttpRequestStreamReaderFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "formatters",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Formatters.IInputFormatter>"
+            },
+            {
+              "Name": "readerFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Infrastructure.IHttpRequestStreamReaderFactory"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "formatters",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Formatters.IInputFormatter>"
+            },
+            {
+              "Name": "readerFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Infrastructure.IHttpRequestStreamReaderFactory"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Mvc.MvcOptions"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.BodyModelBinderProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetBinder",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "formatters",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Formatters.IInputFormatter>"
+            },
+            {
+              "Name": "readerFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Infrastructure.IHttpRequestStreamReaderFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "formatters",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Formatters.IInputFormatter>"
+            },
+            {
+              "Name": "readerFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Infrastructure.IHttpRequestStreamReaderFactory"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "formatters",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Formatters.IInputFormatter>"
+            },
+            {
+              "Name": "readerFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Infrastructure.IHttpRequestStreamReaderFactory"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Mvc.MvcOptions"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.ByteArrayModelBinder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.ByteArrayModelBinderProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetBinder",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.CancellationTokenModelBinder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.CancellationTokenModelBinderProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetBinder",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.CollectionModelBinder<T0>",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.ICollectionModelBinder"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ElementBinder",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Logger",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.Logging.ILogger",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CanCreateInstance",
+          "Parameters": [
+            {
+              "Name": "targetType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.ICollectionModelBinder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateEmptyCollection",
+          "Parameters": [
+            {
+              "Name": "targetType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateInstance",
+          "Parameters": [
+            {
+              "Name": "targetType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ConvertToCollectionType",
+          "Parameters": [
+            {
+              "Name": "targetType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "collection",
+              "Type": "System.Collections.Generic.IEnumerable<T0>"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CopyToModel",
+          "Parameters": [
+            {
+              "Name": "target",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "sourceCollection",
+              "Type": "System.Collections.Generic.IEnumerable<T0>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "elementBinder",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "elementBinder",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TElement",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.CollectionModelBinderProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetBinder",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.ComplexTypeModelBinder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CanBindProperty",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            },
+            {
+              "Name": "propertyMetadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BindProperty",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateModel",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetProperty",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            },
+            {
+              "Name": "modelName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "propertyMetadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "propertyBinders",
+              "Type": "System.Collections.Generic.IDictionary<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "propertyBinders",
+              "Type": "System.Collections.Generic.IDictionary<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder>"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.ComplexTypeModelBinderProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetBinder",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.DecimalModelBinder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "supportedStyles",
+              "Type": "System.Globalization.NumberStyles"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "supportedStyles",
+              "Type": "System.Globalization.NumberStyles"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.DictionaryModelBinder<T0, T1>",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.CollectionModelBinder<System.Collections.Generic.KeyValuePair<T0, T1>>",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CanCreateInstance",
+          "Parameters": [
+            {
+              "Name": "targetType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.ICollectionModelBinder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ConvertToCollectionType",
+          "Parameters": [
+            {
+              "Name": "targetType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "collection",
+              "Type": "System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<T0, T1>>"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateEmptyCollection",
+          "Parameters": [
+            {
+              "Name": "targetType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "keyBinder",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+            },
+            {
+              "Name": "valueBinder",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "keyBinder",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+            },
+            {
+              "Name": "valueBinder",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TKey",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": []
+        },
+        {
+          "ParameterName": "TValue",
+          "ParameterPosition": 1,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.DictionaryModelBinderProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetBinder",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.DoubleModelBinder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "supportedStyles",
+              "Type": "System.Globalization.NumberStyles"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "supportedStyles",
+              "Type": "System.Globalization.NumberStyles"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.EnumTypeModelBinder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.SimpleTypeModelBinder",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CheckModel",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            },
+            {
+              "Name": "valueProviderResult",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "suppressBindingUndefinedValueToEnumType",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.EnumTypeModelBinderProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetBinder",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Mvc.MvcOptions"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.FloatingPointTypeModelBinderProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetBinder",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.FloatModelBinder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "supportedStyles",
+              "Type": "System.Globalization.NumberStyles"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "supportedStyles",
+              "Type": "System.Globalization.NumberStyles"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.FormCollectionModelBinder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.FormCollectionModelBinderProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetBinder",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.FormFileModelBinder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.FormFileModelBinderProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetBinder",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.HeaderModelBinder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            },
+            {
+              "Name": "innerModelBinder",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.HeaderModelBinderProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetBinder",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.KeyValuePairModelBinder<T0, T1>",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "keyBinder",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+            },
+            {
+              "Name": "valueBinder",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "keyBinder",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+            },
+            {
+              "Name": "valueBinder",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TKey",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": []
+        },
+        {
+          "ParameterName": "TValue",
+          "ParameterPosition": 1,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.KeyValuePairModelBinderProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetBinder",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.ServicesModelBinder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.ServicesModelBinderProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetBinder",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.SimpleTypeModelBinder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CheckModel",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            },
+            {
+              "Name": "valueProviderResult",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Binders.SimpleTypeModelBinderProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetBinder",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.ActionContextAccessor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionContext",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ActionContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollection",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Items",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Version",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "items",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor>"
+            },
+            {
+              "Name": "version",
+              "Type": "System.Int32"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.CompatibilitySwitch<T0>",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Infrastructure.ICompatibilitySwitch"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_IsValueSet",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Infrastructure.ICompatibilitySwitch",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Infrastructure.ICompatibilitySwitch",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Value",
+          "Parameters": [],
+          "ReturnType": "T0",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Value",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "initialValue",
+              "Type": "T0"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TValue",
+          "ParameterPosition": 0,
+          "New": true,
+          "Struct": true,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.ConfigureCompatibilityOptions<T0>",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.Extensions.Options.IPostConfigureOptions<T0>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DefaultValues",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyDictionary<System.String, System.Object>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Version",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.CompatibilityVersion",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PostConfigure",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "options",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.Extensions.Options.IPostConfigureOptions<T0>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            },
+            {
+              "Name": "compatibilityOptions",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.Infrastructure.MvcCompatibilityOptions>"
+            }
+          ],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TOptions",
+          "ParameterPosition": 0,
+          "Class": true,
+          "BaseTypeOrInterfaces": [
+            "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Infrastructure.ICompatibilitySwitch>"
+          ]
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.ContentResultExecutor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.ContentResult>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.ContentResult"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.ContentResult>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "logger",
+              "Type": "Microsoft.Extensions.Logging.ILogger<Microsoft.AspNetCore.Mvc.Infrastructure.ContentResultExecutor>"
+            },
+            {
+              "Name": "httpResponseStreamWriterFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.DefaultOutputFormatterSelector",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Infrastructure.OutputFormatterSelector",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "SelectFormatter",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterCanWriteContext"
+            },
+            {
+              "Name": "formatters",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter>"
+            },
+            {
+              "Name": "contentTypes",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.MediaTypeCollection"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "options",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcOptions>"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.FileContentResultExecutor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Infrastructure.FileResultExecutorBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.FileContentResult>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.FileContentResult"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.FileContentResult>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteFileAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.FileContentResult"
+            },
+            {
+              "Name": "range",
+              "Type": "Microsoft.Net.Http.Headers.RangeItemHeaderValue"
+            },
+            {
+              "Name": "rangeLength",
+              "Type": "System.Int64"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.FileResultExecutorBase",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Logger",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.Logging.ILogger",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetHeadersAndLog",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.FileResult"
+            },
+            {
+              "Name": "fileLength",
+              "Type": "System.Nullable<System.Int64>"
+            },
+            {
+              "Name": "enableRangeProcessing",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "lastModified",
+              "Type": "System.Nullable<System.DateTimeOffset>",
+              "DefaultValue": "default(System.Nullable<System.DateTimeOffset>)"
+            },
+            {
+              "Name": "etag",
+              "Type": "Microsoft.Net.Http.Headers.EntityTagHeaderValue",
+              "DefaultValue": "null"
+            }
+          ],
+          "ReturnType": "System.ValueTuple<Microsoft.Net.Http.Headers.RangeItemHeaderValue, System.Int64, System.Boolean>",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateLogger<T0>",
+          "Parameters": [
+            {
+              "Name": "factory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.Logging.ILogger",
+          "Static": true,
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteFileAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            },
+            {
+              "Name": "fileStream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "range",
+              "Type": "Microsoft.Net.Http.Headers.RangeItemHeaderValue"
+            },
+            {
+              "Name": "rangeLength",
+              "Type": "System.Int64"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Static": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "logger",
+              "Type": "Microsoft.Extensions.Logging.ILogger"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "BufferSize",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Static": true,
+          "Visibility": "Protected",
+          "GenericParameter": [],
+          "Constant": true,
+          "Literal": "65536"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.FileStreamResultExecutor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Infrastructure.FileResultExecutorBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.FileStreamResult>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.FileStreamResult"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.FileStreamResult>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteFileAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.FileStreamResult"
+            },
+            {
+              "Name": "range",
+              "Type": "Microsoft.Net.Http.Headers.RangeItemHeaderValue"
+            },
+            {
+              "Name": "rangeLength",
+              "Type": "System.Int64"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionContext",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ActionContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorChangeProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetChangeToken",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.Primitives.IChangeToken",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionDescriptors",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollection",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionInvokerFactory",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateInvoker",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Abstractions.IActionInvoker",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<T0>",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "result",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TResult",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": [
+            "Microsoft.AspNetCore.Mvc.IActionResult"
+          ]
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetResultDataType",
+          "Parameters": [
+            {
+              "Name": "returnType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Type",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Convert",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "returnType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionSelector",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "SelectCandidates",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Routing.RouteContext"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SelectBestCandidate",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Routing.RouteContext"
+            },
+            {
+              "Name": "candidates",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.ICompatibilitySwitch",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_IsValueSet",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Value",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Value",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.IConvertToActionResult",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Convert",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.IHttpRequestStreamReaderFactory",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateReader",
+          "Parameters": [
+            {
+              "Name": "stream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "encoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "System.IO.TextReader",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateWriter",
+          "Parameters": [
+            {
+              "Name": "stream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "encoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "System.IO.TextWriter",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.LocalRedirectResultExecutor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.LocalRedirectResult>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.LocalRedirectResult"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.LocalRedirectResult>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            },
+            {
+              "Name": "urlHelperFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.ModelStateInvalidFilter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IActionFilter",
+        "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReusable",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnActionExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IActionFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnActionExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IActionFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "apiBehaviorOptions",
+              "Type": "Microsoft.AspNetCore.Mvc.ApiBehaviorOptions"
+            },
+            {
+              "Name": "logger",
+              "Type": "Microsoft.Extensions.Logging.ILogger"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.MvcCompatibilityOptions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_CompatibilityVersion",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.CompatibilityVersion",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_CompatibilityVersion",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.CompatibilityVersion"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.ObjectResultExecutor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.ObjectResult>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Logger",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.Logging.ILogger",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FormatterSelector",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Infrastructure.OutputFormatterSelector",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_WriterFactory",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.IO.Stream, System.Text.Encoding, System.IO.TextWriter>",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.ObjectResult"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.ObjectResult>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "formatterSelector",
+              "Type": "Microsoft.AspNetCore.Mvc.Infrastructure.OutputFormatterSelector"
+            },
+            {
+              "Name": "writerFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.OutputFormatterSelector",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "SelectFormatter",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterCanWriteContext"
+            },
+            {
+              "Name": "formatters",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter>"
+            },
+            {
+              "Name": "mediaTypes",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.MediaTypeCollection"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.PhysicalFileResultExecutor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Infrastructure.FileResultExecutorBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.PhysicalFileResult>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.PhysicalFileResult"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.PhysicalFileResult>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteFileAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.PhysicalFileResult"
+            },
+            {
+              "Name": "range",
+              "Type": "Microsoft.Net.Http.Headers.RangeItemHeaderValue"
+            },
+            {
+              "Name": "rangeLength",
+              "Type": "System.Int64"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetFileStream",
+          "Parameters": [
+            {
+              "Name": "path",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.IO.Stream",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetFileInfo",
+          "Parameters": [
+            {
+              "Name": "path",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Infrastructure.PhysicalFileResultExecutor+FileMetadata",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.RedirectResultExecutor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.RedirectResult>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.RedirectResult"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.RedirectResult>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            },
+            {
+              "Name": "urlHelperFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.RedirectToActionResultExecutor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.RedirectToActionResult>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.RedirectToActionResult"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.RedirectToActionResult>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            },
+            {
+              "Name": "urlHelperFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.RedirectToPageResultExecutor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.RedirectToPageResult>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.RedirectToPageResult"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.RedirectToPageResult>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            },
+            {
+              "Name": "urlHelperFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.RedirectToRouteResultExecutor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.RedirectToRouteResult>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.RedirectToRouteResult>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            },
+            {
+              "Name": "urlHelperFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.VirtualFileResultExecutor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Infrastructure.FileResultExecutorBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.VirtualFileResult>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.VirtualFileResult"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.VirtualFileResult>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteFileAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.VirtualFileResult"
+            },
+            {
+              "Name": "fileInfo",
+              "Type": "Microsoft.Extensions.FileProviders.IFileInfo"
+            },
+            {
+              "Name": "range",
+              "Type": "Microsoft.Net.Http.Headers.RangeItemHeaderValue"
+            },
+            {
+              "Name": "rangeLength",
+              "Type": "System.Int64"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetFileStream",
+          "Parameters": [
+            {
+              "Name": "fileInfo",
+              "Type": "Microsoft.Extensions.FileProviders.IFileInfo"
+            }
+          ],
+          "ReturnType": "System.IO.Stream",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            },
+            {
+              "Name": "hostingEnvironment",
+              "Type": "Microsoft.AspNetCore.Hosting.IHostingEnvironment"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.FormatFilter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Formatters.Internal.IFormatFilter",
+        "Microsoft.AspNetCore.Mvc.Filters.IResourceFilter",
+        "Microsoft.AspNetCore.Mvc.Filters.IResultFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetFormat",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.Internal.IFormatFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnResourceExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResourceExecutingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IResourceFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnResourceExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResourceExecutedContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IResourceFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnResultExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResultExecutingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IResultFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnResultExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResultExecutedContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IResultFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "options",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcOptions>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "options",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcOptions>"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.FormatterMappings",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "SetMediaTypeMappingForFormat",
+          "Parameters": [
+            {
+              "Name": "format",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetMediaTypeMappingForFormat",
+          "Parameters": [
+            {
+              "Name": "format",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "Microsoft.Net.Http.Headers.MediaTypeHeaderValue"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetMediaTypeMappingForFormat",
+          "Parameters": [
+            {
+              "Name": "format",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ClearMediaTypeMappingForFormat",
+          "Parameters": [
+            {
+              "Name": "format",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.HttpNoContentOutputFormatter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_TreatNullValueAsNoContent",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TreatNullValueAsNoContent",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CanWriteResult",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterCanWriteContext"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Formatters.IInputFormatter",
+        "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiRequestFormatMetadataProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_SupportedMediaTypes",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.MediaTypeCollection",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetDefaultValueForType",
+          "Parameters": [
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CanRead",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.IInputFormatter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CanReadType",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReadAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.IInputFormatter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReadRequestBodyAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetSupportedContentTypes",
+          "Parameters": [
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "objectType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.String>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiRequestFormatMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.MediaType",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Type",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.Primitives.StringSegment",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MatchesAllTypes",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SubType",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.Primitives.StringSegment",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SubTypeWithoutSuffix",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.Primitives.StringSegment",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SubTypeSuffix",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.Primitives.StringSegment",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MatchesAllSubTypes",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MatchesAllSubTypesWithoutSuffix",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Encoding",
+          "Parameters": [],
+          "ReturnType": "System.Text.Encoding",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Charset",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.Primitives.StringSegment",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasWildcard",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsSubsetOf",
+          "Parameters": [
+            {
+              "Name": "set",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.MediaType"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetParameter",
+          "Parameters": [
+            {
+              "Name": "parameterName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.Primitives.StringSegment",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetParameter",
+          "Parameters": [
+            {
+              "Name": "parameterName",
+              "Type": "Microsoft.Extensions.Primitives.StringSegment"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.Primitives.StringSegment",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReplaceEncoding",
+          "Parameters": [
+            {
+              "Name": "mediaType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "encoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReplaceEncoding",
+          "Parameters": [
+            {
+              "Name": "mediaType",
+              "Type": "Microsoft.Extensions.Primitives.StringSegment"
+            },
+            {
+              "Name": "encoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetEncoding",
+          "Parameters": [
+            {
+              "Name": "mediaType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Text.Encoding",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetEncoding",
+          "Parameters": [
+            {
+              "Name": "mediaType",
+              "Type": "Microsoft.Extensions.Primitives.StringSegment"
+            }
+          ],
+          "ReturnType": "System.Text.Encoding",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateMediaTypeSegmentWithQuality",
+          "Parameters": [
+            {
+              "Name": "mediaType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "start",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.Internal.MediaTypeSegmentWithQuality",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "mediaType",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "mediaType",
+              "Type": "Microsoft.Extensions.Primitives.StringSegment"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "mediaType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "offset",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "length",
+              "Type": "System.Nullable<System.Int32>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.MediaTypeCollection",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Collections.ObjectModel.Collection<System.String>",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "Microsoft.Net.Http.Headers.MediaTypeHeaderValue"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Insert",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "item",
+              "Type": "Microsoft.Net.Http.Headers.MediaTypeHeaderValue"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Remove",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "Microsoft.Net.Http.Headers.MediaTypeHeaderValue"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter",
+        "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiResponseTypeMetadataProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_SupportedMediaTypes",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.MediaTypeCollection",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CanWriteType",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetSupportedContentTypes",
+          "Parameters": [
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "objectType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.String>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiResponseTypeMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CanWriteResult",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterCanWriteContext"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteResponseHeaders",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteResponseBodyAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.StreamOutputFormatter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CanWriteResult",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterCanWriteContext"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.StringOutputFormatter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Formatters.TextOutputFormatter",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CanWriteResult",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterCanWriteContext"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteResponseBodyAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext"
+            },
+            {
+              "Name": "encoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.TextInputFormatter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatter",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_SupportedEncodings",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.Text.Encoding>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReadRequestBodyAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReadRequestBodyAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext"
+            },
+            {
+              "Name": "encoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SelectCharacterEncoding",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext"
+            }
+          ],
+          "ReturnType": "System.Text.Encoding",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "UTF8EncodingWithoutBOM",
+          "Parameters": [],
+          "ReturnType": "System.Text.Encoding",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "UTF16EncodingLittleEndian",
+          "Parameters": [],
+          "ReturnType": "System.Text.Encoding",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.TextOutputFormatter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatter",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteResponseBodyAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext"
+            },
+            {
+              "Name": "selectedEncoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SupportedEncodings",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.Text.Encoding>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SelectCharacterEncoding",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext"
+            }
+          ],
+          "ReturnType": "System.Text.Encoding",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteResponseBodyAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.ActionFilterAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IActionFilter",
+        "Microsoft.AspNetCore.Mvc.Filters.IAsyncActionFilter",
+        "Microsoft.AspNetCore.Mvc.Filters.IResultFilter",
+        "Microsoft.AspNetCore.Mvc.Filters.IAsyncResultFilter",
+        "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnActionExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IActionFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnActionExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IActionFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnActionExecutionAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext"
+            },
+            {
+              "Name": "next",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ActionExecutionDelegate"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IAsyncActionFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnResultExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResultExecutingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IResultFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnResultExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResultExecutedContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IResultFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnResultExecutionAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResultExecutingContext"
+            },
+            {
+              "Name": "next",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResultExecutionDelegate"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IAsyncResultFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.ExceptionFilterAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IAsyncExceptionFilter",
+        "Microsoft.AspNetCore.Mvc.Filters.IExceptionFilter",
+        "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnExceptionAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ExceptionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IAsyncExceptionFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnException",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ExceptionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IExceptionFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.FilterCollection",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Collections.ObjectModel.Collection<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Add<T0>",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TFilterType",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+              ]
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "filterType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add<T0>",
+          "Parameters": [
+            {
+              "Name": "order",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TFilterType",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+              ]
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "filterType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "order",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddService<T0>",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TFilterType",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+              ]
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddService",
+          "Parameters": [
+            {
+              "Name": "filterType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddService<T0>",
+          "Parameters": [
+            {
+              "Name": "order",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TFilterType",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+              ]
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddService",
+          "Parameters": [
+            {
+              "Name": "filterType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "order",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.FilterScope",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "First",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Global",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Controller",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Action",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "Last",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.ResultFilterAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IResultFilter",
+        "Microsoft.AspNetCore.Mvc.Filters.IAsyncResultFilter",
+        "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnResultExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResultExecutingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IResultFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnResultExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResultExecutedContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IResultFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnResultExecutionAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResultExecutingContext"
+            },
+            {
+              "Name": "next",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResultExecutionDelegate"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IAsyncResultFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ControllerName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ControllerName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ActionName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ActionName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MethodInfo",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.MethodInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MethodInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Reflection.MethodInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ControllerTypeInfo",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.TypeInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ControllerTypeInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Reflection.TypeInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Controllers.ControllerActivatorProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Controllers.IControllerActivatorProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateActivator",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Func<Microsoft.AspNetCore.Mvc.ControllerContext, System.Object>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Controllers.IControllerActivatorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateReleaser",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Action<Microsoft.AspNetCore.Mvc.ControllerContext, System.Object>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Controllers.IControllerActivatorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "controllerActivator",
+              "Type": "Microsoft.AspNetCore.Mvc.Controllers.IControllerActivator"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Controllers.ControllerBoundPropertyDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyInfo",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.PropertyInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PropertyInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Reflection.PropertyInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Controllers.ControllerFactoryProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Controllers.IControllerFactoryProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateControllerFactory",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Func<Microsoft.AspNetCore.Mvc.ControllerContext, System.Object>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Controllers.IControllerFactoryProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateControllerReleaser",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Action<Microsoft.AspNetCore.Mvc.ControllerContext, System.Object>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Controllers.IControllerFactoryProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "activatorProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.Controllers.IControllerActivatorProvider"
+            },
+            {
+              "Name": "controllerFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Controllers.IControllerFactory"
+            },
+            {
+              "Name": "propertyActivators",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Internal.IControllerPropertyActivator>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Controllers.ControllerFeature",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Controllers",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.Reflection.TypeInfo>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Controllers.ControllerFeatureProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationParts.IApplicationFeatureProvider<Microsoft.AspNetCore.Mvc.Controllers.ControllerFeature>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "PopulateFeature",
+          "Parameters": [
+            {
+              "Name": "parts",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPart>"
+            },
+            {
+              "Name": "feature",
+              "Type": "Microsoft.AspNetCore.Mvc.Controllers.ControllerFeature"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationParts.IApplicationFeatureProvider<Microsoft.AspNetCore.Mvc.Controllers.ControllerFeature>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsController",
+          "Parameters": [
+            {
+              "Name": "typeInfo",
+              "Type": "System.Reflection.TypeInfo"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Controllers.ControllerParameterDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ParameterInfo",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.ParameterInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ParameterInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Reflection.ParameterInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Controllers.DefaultControllerActivator",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Controllers.IControllerActivator"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "controllerContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ControllerContext"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Controllers.IControllerActivator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Release",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ControllerContext"
+            },
+            {
+              "Name": "controller",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Controllers.IControllerActivator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "typeActivatorCache",
+              "Type": "Microsoft.AspNetCore.Mvc.Internal.ITypeActivatorCache"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Controllers.DefaultControllerFactory",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Controllers.IControllerFactory"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ControllerActivator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Controllers.IControllerActivator",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateController",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ControllerContext"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Controllers.IControllerFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReleaseController",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ControllerContext"
+            },
+            {
+              "Name": "controller",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Controllers.IControllerFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "controllerActivator",
+              "Type": "Microsoft.AspNetCore.Mvc.Controllers.IControllerActivator"
+            },
+            {
+              "Name": "propertyActivators",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Internal.IControllerPropertyActivator>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Controllers.IControllerActivator",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ControllerContext"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Release",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ControllerContext"
+            },
+            {
+              "Name": "controller",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Controllers.IControllerActivatorProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateActivator",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Func<Microsoft.AspNetCore.Mvc.ControllerContext, System.Object>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateReleaser",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Action<Microsoft.AspNetCore.Mvc.ControllerContext, System.Object>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Controllers.IControllerFactory",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateController",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ControllerContext"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReleaseController",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ControllerContext"
+            },
+            {
+              "Name": "controller",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Controllers.IControllerFactoryProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateControllerFactory",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Func<Microsoft.AspNetCore.Mvc.ControllerContext, System.Object>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateControllerReleaser",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Action<Microsoft.AspNetCore.Mvc.ControllerContext, System.Object>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Controllers.ServiceBasedControllerActivator",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Controllers.IControllerActivator"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ControllerContext"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Controllers.IControllerActivator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Release",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ControllerContext"
+            },
+            {
+              "Name": "controller",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Controllers.IControllerActivator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Authorization.AllowAnonymousFilter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Authorization.IAllowAnonymousFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Authorization.AuthorizeFilter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IAsyncAuthorizationFilter",
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_PolicyProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AuthorizeData",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Authorization.IAuthorizeData>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Policy",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Authorization.AuthorizationPolicy",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnAuthorizationAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IAsyncAuthorizationFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "policy",
+              "Type": "Microsoft.AspNetCore.Authorization.AuthorizationPolicy"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "policyProvider",
+              "Type": "Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider"
+            },
+            {
+              "Name": "authorizeData",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Authorization.IAuthorizeData>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "authorizeData",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Authorization.IAuthorizeData>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "policy",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPart",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartFactory",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetApplicationParts",
+          "Parameters": [
+            {
+              "Name": "assembly",
+              "Type": "System.Reflection.Assembly"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPart>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetApplicationPartFactory",
+          "Parameters": [
+            {
+              "Name": "assembly",
+              "Type": "System.Reflection.Assembly"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartFactory",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_FeatureProviders",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationParts.IApplicationFeatureProvider>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ApplicationParts",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPart>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PopulateFeature<T0>",
+          "Parameters": [
+            {
+              "Name": "feature",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TFeature",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationParts.AssemblyPart",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPart",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationParts.IApplicationPartTypeProvider",
+        "Microsoft.AspNetCore.Mvc.ApplicationParts.ICompilationReferencesProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Assembly",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.Assembly",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Types",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.Reflection.TypeInfo>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationParts.IApplicationPartTypeProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetReferencePaths",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.String>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationParts.ICompilationReferencesProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "assembly",
+              "Type": "System.Reflection.Assembly"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationParts.DefaultApplicationPartFactory",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartFactory",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Instance",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationParts.DefaultApplicationPartFactory",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetDefaultApplicationParts",
+          "Parameters": [
+            {
+              "Name": "assembly",
+              "Type": "System.Reflection.Assembly"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPart>",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetApplicationParts",
+          "Parameters": [
+            {
+              "Name": "assembly",
+              "Type": "System.Reflection.Assembly"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPart>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationParts.IApplicationFeatureProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationParts.IApplicationFeatureProvider<T0>",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationParts.IApplicationFeatureProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "PopulateFeature",
+          "Parameters": [
+            {
+              "Name": "parts",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPart>"
+            },
+            {
+              "Name": "feature",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TFeature",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationParts.IApplicationPartTypeProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Types",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.Reflection.TypeInfo>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationParts.ICompilationReferencesProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetReferencePaths",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.String>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartFactory",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetApplicationParts",
+          "Parameters": [
+            {
+              "Name": "assembly",
+              "Type": "System.Reflection.Assembly"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPart>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationParts.ProvideApplicationPartFactoryAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetFactoryType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "factoryType",
+              "Type": "System.Type"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "factoryTypeName",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationParts.RelatedAssemblyAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_AssemblyFileName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetRelatedAssemblies",
+          "Parameters": [
+            {
+              "Name": "assembly",
+              "Type": "System.Reflection.Assembly"
+            },
+            {
+              "Name": "throwOnError",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Reflection.Assembly>",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "assemblyFileName",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.ICommonModel",
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.IFilterModel",
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.IApiExplorerModel"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.Object, System.Object>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPropertyModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ActionMethod",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.MethodInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ActionName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ActionName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ApiExplorer",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.ApiExplorerModel",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IApiExplorerModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ApiExplorer",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ApiExplorerModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IApiExplorerModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Attributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.ICommonModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Controller",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.ControllerModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Controller",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ControllerModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Filters",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IFilterModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Parameters",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationModels.ParameterModel>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteValues",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Selectors",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionMethod",
+              "Type": "System.Reflection.MethodInfo"
+            },
+            {
+              "Name": "attributes",
+              "Type": "System.Collections.Generic.IReadOnlyList<System.Object>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.ApiExplorerModel",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_IsVisible",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Boolean>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsVisible",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.Boolean>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_GroupName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_GroupName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ApiExplorerModel"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModel",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.IPropertyModel",
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.IFilterModel",
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.IApiExplorerModel"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ApiExplorer",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.ApiExplorerModel",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IApiExplorerModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ApiExplorer",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ApiExplorerModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IApiExplorerModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Controllers",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationModels.ControllerModel>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Filters",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IFilterModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.Object, System.Object>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPropertyModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ControllerTypes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.Reflection.TypeInfo>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Result",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "controllerTypes",
+              "Type": "System.Collections.Generic.IEnumerable<System.Reflection.TypeInfo>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.AttributeRouteModel",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Attribute",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Routing.IRouteTemplateProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Template",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Template",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Int32>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.Int32>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SuppressLinkGeneration",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SuppressLinkGeneration",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SuppressPathMatching",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SuppressPathMatching",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsAbsoluteTemplate",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CombineAttributeRouteModel",
+          "Parameters": [
+            {
+              "Name": "left",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.AttributeRouteModel"
+            },
+            {
+              "Name": "right",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.AttributeRouteModel"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.AttributeRouteModel",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CombineTemplates",
+          "Parameters": [
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "template",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsOverridePattern",
+          "Parameters": [
+            {
+              "Name": "template",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReplaceTokens",
+          "Parameters": [
+            {
+              "Name": "template",
+              "Type": "System.String"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Collections.Generic.IDictionary<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "templateProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.Routing.IRouteTemplateProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.AttributeRouteModel"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.ControllerModel",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.ICommonModel",
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.IFilterModel",
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.IApiExplorerModel"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.Object, System.Object>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPropertyModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Actions",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ApiExplorer",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.ApiExplorerModel",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IApiExplorerModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ApiExplorer",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ApiExplorerModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IApiExplorerModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Application",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Application",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Attributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.ICommonModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ControllerName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ControllerName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ControllerType",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.TypeInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ControllerProperties",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationModels.PropertyModel>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Filters",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IFilterModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteValues",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Selectors",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "controllerType",
+              "Type": "System.Reflection.TypeInfo"
+            },
+            {
+              "Name": "attributes",
+              "Type": "System.Collections.Generic.IReadOnlyList<System.Object>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ControllerModel"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.IActionModelConvention",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Apply",
+          "Parameters": [
+            {
+              "Name": "action",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.IApiExplorerModel",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ApiExplorer",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.ApiExplorerModel",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ApiExplorer",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ApiExplorerModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelConvention",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Apply",
+          "Parameters": [
+            {
+              "Name": "application",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.IBindingModel",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_BindingInfo",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BindingInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.ICommonModel",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.IPropertyModel"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Attributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MemberInfo",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.MemberInfo",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.IControllerModelConvention",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Apply",
+          "Parameters": [
+            {
+              "Name": "controller",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ControllerModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.IFilterModel",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Filters",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.IParameterModelBaseConvention",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Apply",
+          "Parameters": [
+            {
+              "Name": "parameter",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ParameterModelBase"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.IParameterModelConvention",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Apply",
+          "Parameters": [
+            {
+              "Name": "parameter",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ParameterModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPropertyModel",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.Object, System.Object>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.ParameterModel",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ApplicationModels.ParameterModelBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.ICommonModel"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.Object, System.Object>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPropertyModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Action",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Action",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Attributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.ICommonModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParameterInfo",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.ParameterInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParameterName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ParameterName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "parameterInfo",
+              "Type": "System.Reflection.ParameterInfo"
+            },
+            {
+              "Name": "attributes",
+              "Type": "System.Collections.Generic.IReadOnlyList<System.Object>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ParameterModel"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.ParameterModelBase",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.IBindingModel"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Attributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.Object, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParameterType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BindingInfo",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IBindingModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BindingInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IBindingModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "parameterType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "attributes",
+              "Type": "System.Collections.Generic.IReadOnlyList<System.Object>"
+            }
+          ],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ParameterModelBase"
+            }
+          ],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.PropertyModel",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ApplicationModels.ParameterModelBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.ICommonModel"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.Object, System.Object>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPropertyModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Controller",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.ControllerModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Controller",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ControllerModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Attributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.ICommonModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyInfo",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.PropertyInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PropertyName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "propertyInfo",
+              "Type": "System.Reflection.PropertyInfo"
+            },
+            {
+              "Name": "attributes",
+              "Type": "System.Collections.Generic.IReadOnlyList<System.Object>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PropertyModel"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_AttributeRouteModel",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.AttributeRouteModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AttributeRouteModel",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.AttributeRouteModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ActionConstraints",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraintMetadata>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionGroupNameProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_GroupName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionVisibilityProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_IgnoreApi",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiRequestFormatMetadataProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetSupportedContentTypes",
+          "Parameters": [
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "objectType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.String>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiRequestMetadataProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "SetContentTypes",
+          "Parameters": [
+            {
+              "Name": "contentTypes",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.MediaTypeCollection"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiResponseMetadataProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Type",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_StatusCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetContentTypes",
+          "Parameters": [
+            {
+              "Name": "contentTypes",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.MediaTypeCollection"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiResponseTypeMetadataProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetSupportedContentTypes",
+          "Parameters": [
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "objectType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.String>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ActionConstraints.ActionMethodSelectorAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraint"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraint",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintContext"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraint",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsValidForRequest",
+          "Parameters": [
+            {
+              "Name": "routeContext",
+              "Type": "Microsoft.AspNetCore.Routing.RouteContext"
+            },
+            {
+              "Name": "action",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.ApplicationModelConventionExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "RemoveType<T0>",
+          "Parameters": [
+            {
+              "Name": "list",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelConvention>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TApplicationModelConvention",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelConvention"
+              ]
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "RemoveType",
+          "Parameters": [
+            {
+              "Name": "list",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelConvention>"
+            },
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelConvention>"
+            },
+            {
+              "Name": "controllerModelConvention",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.IControllerModelConvention"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelConvention>"
+            },
+            {
+              "Name": "actionModelConvention",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.IActionModelConvention"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelConvention>"
+            },
+            {
+              "Name": "parameterModelConvention",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.IParameterModelConvention"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelConvention>"
+            },
+            {
+              "Name": "parameterModelConvention",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.IParameterModelBaseConvention"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Services",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IServiceCollection",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PartManager",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Services",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IServiceCollection",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PartManager",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.MvcCoreMvcBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddMvcOptions",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.MvcOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddFormatterMappings",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.Formatters.FormatterMappings>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddApplicationPart",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "assembly",
+              "Type": "System.Reflection.Assembly"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ConfigureApplicationPartManager",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddControllersAsServices",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetCompatibilityVersion",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "version",
+              "Type": "Microsoft.AspNetCore.Mvc.CompatibilityVersion"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.MvcCoreMvcCoreBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddMvcOptions",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.MvcOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddFormatterMappings",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddFormatterMappings",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.Formatters.FormatterMappings>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddAuthorization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddAuthorization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Authorization.AuthorizationOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddControllersAsServices",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddApplicationPart",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "assembly",
+              "Type": "System.Reflection.Assembly"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ConfigureApplicationPartManager",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetCompatibilityVersion",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "version",
+              "Type": "Microsoft.AspNetCore.Mvc.CompatibilityVersion"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.MvcCoreServiceCollectionExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddMvcCore",
+          "Parameters": [
+            {
+              "Name": "services",
+              "Type": "Microsoft.Extensions.DependencyInjection.IServiceCollection"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddMvcCore",
+          "Parameters": [
+            {
+              "Name": "services",
+              "Type": "Microsoft.Extensions.DependencyInjection.IServiceCollection"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.MvcOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationVisitor+StateManager",
+      "Visibility": "Protected",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.IDisposable"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Recurse",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationVisitor"
+            },
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "strategy",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IValidationStrategy"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationVisitor+StateManager",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "visitor",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationVisitor"
+            },
+            {
+              "Name": "newModel",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Infrastructure.PhysicalFileResultExecutor+FileMetadata",
+      "Visibility": "Protected",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Exists",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Exists",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Length",
+          "Parameters": [],
+          "ReturnType": "System.Int64",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Length",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int64"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_LastModified",
+          "Parameters": [],
+          "ReturnType": "System.DateTimeOffset",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_LastModified",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.DateTimeOffset"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterException",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Exception",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "message",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "innerException",
+              "Type": "System.Exception"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsAuthorizationFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsAuthorizationFilter.cs
new file mode 100644
index 0000000000..0d853eae9d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsAuthorizationFilter.cs
@@ -0,0 +1,122 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Cors.Infrastructure;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Cors.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.Cors
+{
+    /// <summary>
+    /// A filter that applies the given <see cref="CorsPolicy"/> and adds appropriate response headers.
+    /// </summary>
+    public class CorsAuthorizationFilter : ICorsAuthorizationFilter
+    {
+        private readonly ICorsService _corsService;
+        private readonly ICorsPolicyProvider _corsPolicyProvider;
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="CorsAuthorizationFilter"/>.
+        /// </summary>
+        /// <param name="corsService">The <see cref="ICorsService"/>.</param>
+        /// <param name="policyProvider">The <see cref="ICorsPolicyProvider"/>.</param>
+        public CorsAuthorizationFilter(ICorsService corsService, ICorsPolicyProvider policyProvider)
+            : this(corsService, policyProvider, NullLoggerFactory.Instance)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="CorsAuthorizationFilter"/>.
+        /// </summary>
+        /// <param name="corsService">The <see cref="ICorsService"/>.</param>
+        /// <param name="policyProvider">The <see cref="ICorsPolicyProvider"/>.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public CorsAuthorizationFilter(
+            ICorsService corsService,
+            ICorsPolicyProvider policyProvider,
+            ILoggerFactory loggerFactory)
+        {
+            if (corsService == null)
+            {
+                throw new ArgumentNullException(nameof(corsService));
+            }
+
+            if (policyProvider == null)
+            {
+                throw new ArgumentNullException(nameof(policyProvider));
+            }
+
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            _corsService = corsService;
+            _corsPolicyProvider = policyProvider;
+            _logger = loggerFactory.CreateLogger(GetType());
+        }
+
+        /// <summary>
+        /// The policy name used to fetch a <see cref="CorsPolicy"/>.
+        /// </summary>
+        public string PolicyName { get; set; }
+
+        /// <inheritdoc />
+        // Since clients' preflight requests would not have data to authenticate requests, this
+        // filter must run before any other authorization filters.
+        public int Order => int.MinValue + 100;
+
+        /// <inheritdoc />
+        public async Task OnAuthorizationAsync(Filters.AuthorizationFilterContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            // If this filter is not closest to the action, it is not applicable.
+            if (!context.IsEffectivePolicy<ICorsAuthorizationFilter>(this))
+            {
+                _logger.NotMostEffectiveFilter(typeof(ICorsAuthorizationFilter));
+                return;
+            }
+
+            var httpContext = context.HttpContext;
+            var request = httpContext.Request;
+            if (request.Headers.ContainsKey(CorsConstants.Origin))
+            {
+                var policy = await _corsPolicyProvider.GetPolicyAsync(httpContext, PolicyName);
+
+                if (policy == null)
+                {
+                    throw new InvalidOperationException(
+                        Resources.FormatCorsAuthorizationFilter_MissingCorsPolicy(PolicyName));
+                }
+
+                var result = _corsService.EvaluatePolicy(context.HttpContext, policy);
+                _corsService.ApplyResult(result, context.HttpContext.Response);
+
+                var accessControlRequestMethod =
+                        httpContext.Request.Headers[CorsConstants.AccessControlRequestMethod];
+                if (string.Equals(
+                        request.Method,
+                        CorsConstants.PreflightHttpMethod,
+                        StringComparison.OrdinalIgnoreCase) &&
+                    !StringValues.IsNullOrEmpty(accessControlRequestMethod))
+                {
+                    // If this was a preflight, there is no need to run anything else.
+                    // Also the response is always 200 so that anyone after mvc can handle the pre flight request.
+                    context.Result = new StatusCodeResult(StatusCodes.Status200OK);
+                }
+
+                // Continue with other filters and action.
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/DependencyInjection/MvcCorsMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/DependencyInjection/MvcCorsMvcCoreBuilderExtensions.cs
new file mode 100644
index 0000000000..a4cf5c1800
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/DependencyInjection/MvcCorsMvcCoreBuilderExtensions.cs
@@ -0,0 +1,74 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Cors.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Cors;
+using Microsoft.AspNetCore.Mvc.Cors.Internal;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public static class MvcCorsMvcCoreBuilderExtensions
+    {
+        public static IMvcCoreBuilder AddCors(this IMvcCoreBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            AddCorsServices(builder.Services);
+            return builder;
+        }
+
+        public static IMvcCoreBuilder AddCors(
+            this IMvcCoreBuilder builder,
+            Action<CorsOptions> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (setupAction == null)
+            {
+                throw new ArgumentNullException(nameof(setupAction));
+            }
+
+            AddCorsServices(builder.Services);
+            builder.Services.Configure(setupAction);
+            
+            return builder;
+        }
+
+        public static IMvcCoreBuilder ConfigureCors(
+            this IMvcCoreBuilder builder,
+            Action<CorsOptions> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (setupAction == null)
+            {
+                throw new ArgumentNullException(nameof(setupAction));
+            }
+
+            builder.Services.Configure(setupAction);
+            return builder;
+        }
+
+        // Internal for testing.
+        internal static void AddCorsServices(IServiceCollection services)
+        {
+            services.AddCors();
+
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IApplicationModelProvider, CorsApplicationModelProvider>());
+            services.TryAddTransient<CorsAuthorizationFilter, CorsAuthorizationFilter>();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsApplicationModelProvider.cs
new file mode 100644
index 0000000000..4410412e28
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsApplicationModelProvider.cs
@@ -0,0 +1,91 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Cors.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Cors.Internal
+{
+    public class CorsApplicationModelProvider : IApplicationModelProvider
+    {
+        public int Order => -1000 + 10;
+
+        public void OnProvidersExecuted(ApplicationModelProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+            // Intentionally empty.
+        }
+
+        public void OnProvidersExecuting(ApplicationModelProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var isCorsEnabledGlobally = context.Result.Filters.OfType<ICorsAuthorizationFilter>().Any() ||
+                context.Result.Filters.OfType<CorsAuthorizationFilterFactory>().Any();
+
+            foreach (var controllerModel in context.Result.Controllers)
+            {
+                var enableCors = controllerModel.Attributes.OfType<IEnableCorsAttribute>().FirstOrDefault();
+                if (enableCors != null)
+                {
+                    controllerModel.Filters.Add(new CorsAuthorizationFilterFactory(enableCors.PolicyName));
+                }
+
+                var disableCors = controllerModel.Attributes.OfType<IDisableCorsAttribute>().FirstOrDefault();
+                if (disableCors != null)
+                {
+                    controllerModel.Filters.Add(new DisableCorsAuthorizationFilter());
+                }
+
+                var corsOnController = enableCors != null || disableCors != null || controllerModel.Filters.OfType<ICorsAuthorizationFilter>().Any();
+
+                foreach (var actionModel in controllerModel.Actions)
+                {
+                    enableCors = actionModel.Attributes.OfType<IEnableCorsAttribute>().FirstOrDefault();
+                    if (enableCors != null)
+                    {
+                        actionModel.Filters.Add(new CorsAuthorizationFilterFactory(enableCors.PolicyName));
+                    }
+
+                    disableCors = actionModel.Attributes.OfType<IDisableCorsAttribute>().FirstOrDefault();
+                    if (disableCors != null)
+                    {
+                        actionModel.Filters.Add(new DisableCorsAuthorizationFilter());
+                    }
+
+                    var corsOnAction = enableCors != null || disableCors != null || actionModel.Filters.OfType<ICorsAuthorizationFilter>().Any();
+
+                    if (isCorsEnabledGlobally || corsOnController || corsOnAction)
+                    {
+                        UpdateHttpMethodActionConstraint(actionModel);
+                    }
+                }
+            }
+        }
+
+        private static void UpdateHttpMethodActionConstraint(ActionModel actionModel)
+        {
+            for (var i = 0; i < actionModel.Selectors.Count; i++)
+            {
+                var selectorModel = actionModel.Selectors[i];
+                for (var j = 0; j < selectorModel.ActionConstraints.Count; j++)
+                {
+                    if (selectorModel.ActionConstraints[j] is HttpMethodActionConstraint httpConstraint)
+                    {
+                        selectorModel.ActionConstraints[j] = new CorsHttpMethodActionConstraint(httpConstraint);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsAuthorizationFilterFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsAuthorizationFilterFactory.cs
new file mode 100644
index 0000000000..9cb7146f5c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsAuthorizationFilterFactory.cs
@@ -0,0 +1,47 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.Cors.Internal
+{
+    /// <summary>
+    /// A filter factory which creates a new instance of <see cref="CorsAuthorizationFilter"/>.
+    /// </summary>
+    public class CorsAuthorizationFilterFactory : IFilterFactory, IOrderedFilter
+    {
+        private readonly string _policyName;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="CorsAuthorizationFilterFactory"/>.
+        /// </summary>
+        /// <param name="policyName">Name used to fetch a CORS policy.</param>
+        public CorsAuthorizationFilterFactory(string policyName)
+        {
+            _policyName = policyName;
+        }
+
+        /// <inheritdoc />
+        // Since clients' preflight requests would not have data to authenticate requests, this
+        // filter must run before any other authorization filters.
+        public int Order => int.MinValue + 100;
+
+        /// <inheritdoc />
+        public bool IsReusable => true;
+
+        /// <inheritdoc />
+        public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
+        {
+            if (serviceProvider == null)
+            {
+                throw new ArgumentNullException(nameof(serviceProvider));
+            }
+
+            var filter = serviceProvider.GetRequiredService<CorsAuthorizationFilter>();
+            filter.PolicyName = _policyName;
+            return filter;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsHttpMethodActionConstraint.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsHttpMethodActionConstraint.cs
new file mode 100644
index 0000000000..71ba2d696c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsHttpMethodActionConstraint.cs
@@ -0,0 +1,59 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.Extensions.Primitives;
+using Microsoft.AspNetCore.Mvc.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.Cors.Internal
+{
+    public class CorsHttpMethodActionConstraint : HttpMethodActionConstraint
+    {
+        private readonly string OriginHeader = "Origin";
+        private readonly string AccessControlRequestMethod = "Access-Control-Request-Method";
+        private readonly string PreflightHttpMethod = "OPTIONS";
+
+        public CorsHttpMethodActionConstraint(HttpMethodActionConstraint constraint)
+            : base(constraint.HttpMethods)
+        {
+        }
+
+        public override bool Accept(ActionConstraintContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var methods = (ReadOnlyCollection<string>)HttpMethods;
+            if (methods.Count == 0)
+            {
+                return true;
+            }
+
+            var request = context.RouteContext.HttpContext.Request;
+            // Perf: Check http method before accessing the Headers collection.
+            if (string.Equals(request.Method, PreflightHttpMethod, StringComparison.OrdinalIgnoreCase) &&
+                request.Headers.ContainsKey(OriginHeader) &&
+                request.Headers.TryGetValue(AccessControlRequestMethod, out var accessControlRequestMethod) &&
+                !StringValues.IsNullOrEmpty(accessControlRequestMethod))
+            {
+                for (var i = 0; i < methods.Count; i++)
+                {
+                    var supportedMethod = methods[i];
+                    if (string.Equals(supportedMethod, accessControlRequestMethod, StringComparison.OrdinalIgnoreCase))
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+
+            return base.Accept(context);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsLoggerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsLoggerExtensions.cs
new file mode 100644
index 0000000000..c3fab172b9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsLoggerExtensions.cs
@@ -0,0 +1,26 @@
+// 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.
+
+using System;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Cors.Internal
+{
+    public static class CorsLoggerExtensions
+    {
+        private static readonly Action<ILogger, Type, Exception> _notMostEffectiveFilter;
+
+        static CorsLoggerExtensions()
+        {
+            _notMostEffectiveFilter = LoggerMessage.Define<Type>(
+               LogLevel.Debug,
+               1,
+               "Skipping the execution of current filter as its not the most effective filter implementing the policy {FilterPolicy}.");
+        }
+
+        public static void NotMostEffectiveFilter(this ILogger logger, Type policyType)
+        {
+            _notMostEffectiveFilter(logger, policyType, null);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/DisableCorsAuthorizationFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/DisableCorsAuthorizationFilter.cs
new file mode 100644
index 0000000000..8ecd6cbfb6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/DisableCorsAuthorizationFilter.cs
@@ -0,0 +1,47 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Cors.Infrastructure;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.Cors.Internal
+{
+    /// <summary>
+    /// An <see cref="ICorsAuthorizationFilter"/> which ensures that an action does not run for a pre-flight request.
+    /// </summary>
+    public class DisableCorsAuthorizationFilter : ICorsAuthorizationFilter
+    {
+        /// <inheritdoc />
+        // Since clients' preflight requests would not have data to authenticate requests, this
+        // filter must run before any other authorization filters.
+        public int Order => int.MinValue + 100;
+
+        /// <inheritdoc />
+        public Task OnAuthorizationAsync(AuthorizationFilterContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var accessControlRequestMethod =
+                        context.HttpContext.Request.Headers[CorsConstants.AccessControlRequestMethod];
+            if (string.Equals(
+                    context.HttpContext.Request.Method,
+                    CorsConstants.PreflightHttpMethod,
+                    StringComparison.OrdinalIgnoreCase) &&
+                !StringValues.IsNullOrEmpty(accessControlRequestMethod))
+            {
+                // Short circuit if the request is preflight as that should not result in action execution.
+                context.Result = new StatusCodeResult(StatusCodes.Status200OK);
+            }
+
+            // Let the action be executed.
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/ICorsAuthorizationFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/ICorsAuthorizationFilter.cs
new file mode 100644
index 0000000000..6989ffd421
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Internal/ICorsAuthorizationFilter.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.Cors.Internal
+{
+    /// <summary>
+    /// A filter that can be used to enable/disable CORS support for a resource.
+    /// </summary>
+    public interface ICorsAuthorizationFilter : IAsyncAuthorizationFilter, IOrderedFilter
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj
new file mode 100644
index 0000000000..f6056e62e5
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ASP.NET Core MVC cross-origin resource sharing (CORS) features.</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>aspnetcore;aspnetcoremvc;cors</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Cors" Version="$(MicrosoftAspNetCoreCorsPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..19603aa2df
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// 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.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Cors.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..fe4a772e37
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Properties/Resources.Designer.cs
@@ -0,0 +1,44 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.Cors
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class Resources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.Cors.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// A CORS policy named '{0}' could not be found.
+        /// </summary>
+        internal static string CorsAuthorizationFilter_MissingCorsPolicy
+        {
+            get => GetString("CorsAuthorizationFilter_MissingCorsPolicy");
+        }
+
+        /// <summary>
+        /// A CORS policy named '{0}' could not be found.
+        /// </summary>
+        internal static string FormatCorsAuthorizationFilter_MissingCorsPolicy(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("CorsAuthorizationFilter_MissingCorsPolicy"), p0);
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Resources.resx
new file mode 100644
index 0000000000..6c4897ab7f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Resources.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CorsAuthorizationFilter_MissingCorsPolicy" xml:space="preserve">
+    <value>A CORS policy named '{0}' could not be found.</value>
+  </data>
+</root>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/baseline.netcore.json
new file mode 100644
index 0000000000..d00cbbb16b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/baseline.netcore.json
@@ -0,0 +1,165 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc.Cors, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.MvcCorsMvcCoreBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddCors",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddCors",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Cors.Infrastructure.CorsOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ConfigureCors",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Cors.Infrastructure.CorsOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Cors.CorsAuthorizationFilter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Cors.Internal.ICorsAuthorizationFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "OnAuthorizationAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IAsyncAuthorizationFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PolicyName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PolicyName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "corsService",
+              "Type": "Microsoft.AspNetCore.Cors.Infrastructure.ICorsService"
+            },
+            {
+              "Name": "policyProvider",
+              "Type": "Microsoft.AspNetCore.Cors.Infrastructure.ICorsPolicyProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "corsService",
+              "Type": "Microsoft.AspNetCore.Cors.Infrastructure.ICorsService"
+            },
+            {
+              "Name": "policyProvider",
+              "Type": "Microsoft.AspNetCore.Cors.Infrastructure.ICorsPolicyProvider"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/AttributeAdapterBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/AttributeAdapterBase.cs
new file mode 100644
index 0000000000..6f8d1a0d26
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/AttributeAdapterBase.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations
+{
+    /// <summary>
+    /// An abstract subclass of <see cref="ValidationAttributeAdapter{TAttribute}"/> which wraps up all the required
+    /// interfaces for the adapters.
+    /// </summary>
+    /// <typeparam name="TAttribute">The type of <see cref="ValidationAttribute"/> which is being wrapped.</typeparam>
+    public abstract class AttributeAdapterBase<TAttribute> :
+        ValidationAttributeAdapter<TAttribute>,
+        IAttributeAdapter
+        where TAttribute : ValidationAttribute
+    {
+        /// <summary>
+        /// Instantiates a new <see cref="AttributeAdapterBase{TAttribute}"/>.
+        /// </summary>
+        /// <param name="attribute">The <see cref="ValidationAttribute"/> being wrapped.</param>
+        /// <param name="stringLocalizer">The <see cref="IStringLocalizer"/> to be used in error generation.</param>
+        public AttributeAdapterBase(TAttribute attribute, IStringLocalizer stringLocalizer)
+            : base(attribute, stringLocalizer)
+        {
+        }
+
+        /// <inheritdoc/>
+        public abstract string GetErrorMessage(ModelValidationContextBase validationContext);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcBuilderExtensions.cs
new file mode 100644
index 0000000000..ddbd623b3e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcBuilderExtensions.cs
@@ -0,0 +1,53 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    /// <summary>
+    /// Extension methods for configuring MVC data annotations localization.
+    /// </summary>
+    public static class MvcDataAnnotationsMvcBuilderExtensions
+    {
+        /// <summary>
+        /// Adds MVC data annotations localization to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder AddDataAnnotationsLocalization(this IMvcBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return AddDataAnnotationsLocalization(builder, setupAction: null);
+        }
+
+        /// <summary>
+        /// Adds MVC data annotations localization to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="setupAction">The action to configure <see cref="MvcDataAnnotationsLocalizationOptions"/>.
+        /// </param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder AddDataAnnotationsLocalization(
+            this IMvcBuilder builder,
+            Action<MvcDataAnnotationsLocalizationOptions> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            DataAnnotationsLocalizationServices.AddDataAnnotationsLocalizationServices(
+                builder.Services,
+                setupAction);
+
+            return builder;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcCoreBuilderExtensions.cs
new file mode 100644
index 0000000000..160a73345e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcCoreBuilderExtensions.cs
@@ -0,0 +1,85 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    /// <summary>
+    /// Extensions for configuring MVC data annotations using an <see cref="IMvcBuilder"/>.
+    /// </summary>
+    public static class MvcDataAnnotationsMvcCoreBuilderExtensions
+    {
+        /// <summary>
+        /// Registers MVC data annotations.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcCoreBuilder AddDataAnnotations(this IMvcCoreBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            AddDataAnnotationsServices(builder.Services);
+            return builder;
+        }
+
+        /// <summary>
+        /// Adds MVC data annotations localization to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        public static IMvcCoreBuilder AddDataAnnotationsLocalization(this IMvcCoreBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return AddDataAnnotationsLocalization(builder, setupAction: null);
+        }
+
+        /// <summary>
+        /// Registers an action to configure <see cref="MvcDataAnnotationsLocalizationOptions"/> for MVC data
+        /// annotations localization.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="setupAction">An <see cref="Action{MvcDataAnnotationsLocalizationOptions}"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcCoreBuilder AddDataAnnotationsLocalization(
+            this IMvcCoreBuilder builder,
+            Action<MvcDataAnnotationsLocalizationOptions> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            AddDataAnnotationsLocalizationServices(builder.Services, setupAction);
+            return builder;
+        }
+
+        // Internal for testing.
+        internal static void AddDataAnnotationsServices(IServiceCollection services)
+        {
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IConfigureOptions<MvcOptions>, MvcDataAnnotationsMvcOptionsSetup>());
+            services.TryAddSingleton<IValidationAttributeAdapterProvider, ValidationAttributeAdapterProvider>();
+        }
+
+        // Internal for testing.
+        internal static void AddDataAnnotationsLocalizationServices(
+            IServiceCollection services,
+            Action<MvcDataAnnotationsLocalizationOptions> setupAction)
+        {
+            DataAnnotationsLocalizationServices.AddDataAnnotationsLocalizationServices(services, setupAction);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/HiddenInputAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/HiddenInputAttribute.cs
new file mode 100644
index 0000000000..e88393d48c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/HiddenInputAttribute.cs
@@ -0,0 +1,41 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Indicates associated property or all properties with the associated type should be edited using an
+    /// &lt;input&gt; element of type "hidden".
+    /// </summary>
+    /// <remarks>
+    /// When overriding a <see cref="HiddenInputAttribute"/> inherited from a base class, should apply both
+    /// <c>[HiddenInput(DisplayValue = true)]</c> (if the inherited attribute had <c>DisplayValue = false</c>) and a
+    /// <see cref="System.ComponentModel.DataAnnotations.UIHintAttribute"/> with some value other than "HiddenInput".
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
+    public sealed class HiddenInputAttribute : Attribute
+    {
+        /// <summary>
+        /// Instantiates a new instance of the <see cref="HiddenInputAttribute"/> class.
+        /// </summary>
+        public HiddenInputAttribute()
+        {
+            DisplayValue = true;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to display the value as well as provide a hidden &lt;input&gt;
+        /// element. The default value is <c>true</c>.
+        /// </summary>
+        /// <remarks>
+        /// If <c>false</c>, also causes the default <see cref="object"/> display and editor templates to return HTML
+        /// lacking the usual per-property &lt;div&gt; wrapper around the associated property and the default display
+        /// "HiddenInput" template to return <c>string.Empty</c> for the associated property. Thus the default
+        /// <see cref="object"/> display template effectively skips the property and the default <see cref="object"/>
+        /// editor template returns only the hidden &lt;input&gt; element for the property.
+        /// </remarks>
+        public bool DisplayValue { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/IAttributeAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/IAttributeAdapter.cs
new file mode 100644
index 0000000000..57765c869d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/IAttributeAdapter.cs
@@ -0,0 +1,20 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations
+{
+    /// <summary>
+    /// Interface so that adapters provide their relevant values to error messages.
+    /// </summary>
+    public interface IAttributeAdapter : IClientModelValidator
+    {
+        /// <summary>
+        /// Gets the error message.
+        /// </summary>
+        /// <param name="validationContext">The context to use in message creation.</param>
+        /// <returns>The localized error message.</returns>
+        string GetErrorMessage(ModelValidationContextBase validationContext);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/IValidationAttributeAdapterProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/IValidationAttributeAdapterProvider.cs
new file mode 100644
index 0000000000..dc973bc9ac
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/IValidationAttributeAdapterProvider.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations
+{
+    /// <summary>
+    /// Provider for supplying <see cref="IAttributeAdapter"/>'s.
+    /// </summary>
+    public interface IValidationAttributeAdapterProvider
+    {
+        /// <summary>
+        /// Returns the <see cref="IAttributeAdapter"/> for the given <see cref=" ValidationAttribute"/>.
+        /// </summary>
+        /// <param name="attribute">The <see cref="ValidationAttribute"/> to create an <see cref="IAttributeAdapter"/>
+        /// for.</param>
+        /// <param name="stringLocalizer">The <see cref="IStringLocalizer"/> which will be used to create messages.
+        /// </param>
+        /// <returns>An <see cref="IAttributeAdapter"/> for the given <paramref name="attribute"/>.</returns>
+        IAttributeAdapter GetAttributeAdapter(ValidationAttribute attribute, IStringLocalizer stringLocalizer);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/CompareAttributeAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/CompareAttributeAdapter.cs
new file mode 100644
index 0000000000..f64272fa04
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/CompareAttributeAdapter.cs
@@ -0,0 +1,108 @@
+// 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.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class CompareAttributeAdapter : AttributeAdapterBase<CompareAttribute>
+    {
+        private readonly string _otherProperty;
+
+        public CompareAttributeAdapter(CompareAttribute attribute, IStringLocalizer stringLocalizer)
+            : base(new CompareAttributeWrapper(attribute), stringLocalizer)
+        {
+            _otherProperty = "*." + attribute.OtherProperty;
+        }
+
+        public override void AddValidation(ClientModelValidationContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            MergeAttribute(context.Attributes, "data-val", "true");
+            MergeAttribute(context.Attributes, "data-val-equalto", GetErrorMessage(context));
+            MergeAttribute(context.Attributes, "data-val-equalto-other", _otherProperty);
+        }
+
+        /// <inheritdoc />
+        public override string GetErrorMessage(ModelValidationContextBase validationContext)
+        {
+            if (validationContext == null)
+            {
+                throw new ArgumentNullException(nameof(validationContext));
+            }
+
+            var displayName = validationContext.ModelMetadata.GetDisplayName();
+            var otherPropertyDisplayName = CompareAttributeWrapper.GetOtherPropertyDisplayName(
+                validationContext,
+                Attribute);
+
+            ((CompareAttributeWrapper)Attribute).ValidationContext = validationContext;
+
+            return GetErrorMessage(validationContext.ModelMetadata, displayName, otherPropertyDisplayName);
+        }
+
+        // TODO: This entire class is needed because System.ComponentModel.DataAnnotations.CompareAttribute doesn't
+        // populate OtherPropertyDisplayName until you call FormatErrorMessage.
+        private sealed class CompareAttributeWrapper : CompareAttribute
+        {
+            public ModelValidationContextBase ValidationContext { get; set; }
+
+            public CompareAttributeWrapper(CompareAttribute attribute)
+                : base(attribute.OtherProperty)
+            {
+                // Copy settable properties from wrapped attribute. Don't reset default message accessor (set as
+                // CompareAttribute constructor calls ValidationAttribute constructor) when all properties are null to
+                // preserve default error message. Reset the message accessor when just ErrorMessageResourceType is
+                // non-null to ensure correct InvalidOperationException.
+                if (!string.IsNullOrEmpty(attribute.ErrorMessage) ||
+                    !string.IsNullOrEmpty(attribute.ErrorMessageResourceName) ||
+                    attribute.ErrorMessageResourceType != null)
+                {
+                    ErrorMessage = attribute.ErrorMessage;
+                    ErrorMessageResourceName = attribute.ErrorMessageResourceName;
+                    ErrorMessageResourceType = attribute.ErrorMessageResourceType;
+                }
+            }
+
+            public override string FormatErrorMessage(string name)
+            {
+                var displayName = ValidationContext.ModelMetadata.GetDisplayName();
+                return string.Format(CultureInfo.CurrentCulture,
+                                     ErrorMessageString,
+                                     displayName,
+                                     GetOtherPropertyDisplayName(ValidationContext, this));
+            }
+
+            public static string GetOtherPropertyDisplayName(
+                ModelValidationContextBase validationContext,
+                CompareAttribute attribute)
+            {
+                // The System.ComponentModel.DataAnnotations.CompareAttribute doesn't populate the
+                // OtherPropertyDisplayName until after IsValid() is called. Therefore, at the time we get
+                // the error message for client validation, the display name is not populated and won't be used.
+                var otherPropertyDisplayName = attribute.OtherPropertyDisplayName;
+                if (otherPropertyDisplayName == null && validationContext.ModelMetadata.ContainerType != null)
+                {
+                    var otherProperty = validationContext.MetadataProvider.GetMetadataForProperty(
+                        validationContext.ModelMetadata.ContainerType,
+                        attribute.OtherProperty);
+                    if (otherProperty != null)
+                    {
+                        return otherProperty.GetDisplayName();
+                    }
+                }
+
+                return attribute.OtherProperty;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsClientModelValidatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsClientModelValidatorProvider.cs
new file mode 100644
index 0000000000..05d2aacac3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsClientModelValidatorProvider.cs
@@ -0,0 +1,109 @@
+// 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.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    /// <summary>
+    /// An implementation of <see cref="IClientModelValidatorProvider"/> which provides client validators
+    /// for attributes which derive from <see cref="ValidationAttribute"/>. It also provides
+    /// a validator for types which implement <see cref="IClientModelValidator"/>.
+    /// The logic to support <see cref="IClientModelValidator"/>
+    /// is implemented in <see cref="ValidationAttributeAdapter{TAttribute}"/>.
+    /// </summary>
+    public class DataAnnotationsClientModelValidatorProvider : IClientModelValidatorProvider
+    {
+        private readonly IOptions<MvcDataAnnotationsLocalizationOptions> _options;
+        private readonly IStringLocalizerFactory _stringLocalizerFactory;
+        private readonly IValidationAttributeAdapterProvider _validationAttributeAdapterProvider;
+
+        /// <summary>
+        /// Create a new instance of <see cref="DataAnnotationsClientModelValidatorProvider"/>.
+        /// </summary>
+        /// <param name="validationAttributeAdapterProvider">The <see cref="IValidationAttributeAdapterProvider"/>
+        /// that supplies <see cref="IAttributeAdapter"/>s.</param>
+        /// <param name="options">The <see cref="IOptions{MvcDataAnnotationsLocalizationOptions}"/>.</param>
+        /// <param name="stringLocalizerFactory">The <see cref="IStringLocalizerFactory"/>.</param>
+        public DataAnnotationsClientModelValidatorProvider(
+            IValidationAttributeAdapterProvider validationAttributeAdapterProvider,
+            IOptions<MvcDataAnnotationsLocalizationOptions> options,
+            IStringLocalizerFactory stringLocalizerFactory)
+        {
+            if (validationAttributeAdapterProvider == null)
+            {
+                throw new ArgumentNullException(nameof(validationAttributeAdapterProvider));
+            }
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            _validationAttributeAdapterProvider = validationAttributeAdapterProvider;
+            _options = options;
+            _stringLocalizerFactory = stringLocalizerFactory;
+        }
+
+        /// <inheritdoc />
+        public void CreateValidators(ClientValidatorProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+            IStringLocalizer stringLocalizer = null;
+            if (_options.Value.DataAnnotationLocalizerProvider != null && _stringLocalizerFactory != null)
+            {
+                // This will pass first non-null type (either containerType or modelType) to delegate.
+                // Pass the root model type(container type) if it is non null, else pass the model type.
+                stringLocalizer = _options.Value.DataAnnotationLocalizerProvider(
+                    context.ModelMetadata.ContainerType ?? context.ModelMetadata.ModelType,
+                    _stringLocalizerFactory);
+            }
+
+            var hasRequiredAttribute = false;
+
+            for (var i = 0; i < context.Results.Count; i++)
+            {
+                var validatorItem = context.Results[i];
+                if (validatorItem.Validator != null)
+                {
+                    // Check if a required attribute is already cached.
+                    hasRequiredAttribute |= validatorItem.Validator is RequiredAttributeAdapter;
+                    continue;
+                }
+
+                var attribute = validatorItem.ValidatorMetadata as ValidationAttribute;
+                if (attribute == null)
+                {
+                    continue;
+                }
+
+                hasRequiredAttribute |= attribute is RequiredAttribute;
+
+                var adapter = _validationAttributeAdapterProvider.GetAttributeAdapter(attribute, stringLocalizer);
+                if (adapter != null)
+                {
+                    validatorItem.Validator = adapter;
+                    validatorItem.IsReusable = true;
+                }
+            }
+
+            if (!hasRequiredAttribute && context.ModelMetadata.IsRequired)
+            {
+                // Add a default '[Required]' validator for generating HTML if necessary.
+                context.Results.Add(new ClientValidatorItem
+                {
+                    Validator = _validationAttributeAdapterProvider.GetAttributeAdapter(
+                        new RequiredAttribute(),
+                        stringLocalizer),
+                    IsReusable = true
+                });
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsLocalizationServices.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsLocalizationServices.cs
new file mode 100644
index 0000000000..f54cd9dd5d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsLocalizationServices.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public static class DataAnnotationsLocalizationServices
+    {
+        public static void AddDataAnnotationsLocalizationServices(
+            IServiceCollection services,
+            Action<MvcDataAnnotationsLocalizationOptions> setupAction)
+        {
+            services.AddLocalization();
+
+            if (setupAction != null)
+            {
+                services.Configure(setupAction);
+            }
+            else
+            {
+                services.TryAddEnumerable(
+                    ServiceDescriptor.Transient
+                    <IConfigureOptions<MvcDataAnnotationsLocalizationOptions>,
+                    MvcDataAnnotationsLocalizationOptionsSetup>());
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsMetadataProvider.cs
new file mode 100644
index 0000000000..0248cee5c5
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsMetadataProvider.cs
@@ -0,0 +1,364 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    /// <summary>
+    /// An implementation of <see cref="IBindingMetadataProvider"/> and <see cref="IDisplayMetadataProvider"/> for
+    /// the System.ComponentModel.DataAnnotations attribute classes.
+    /// </summary>
+    public class DataAnnotationsMetadataProvider :
+        IBindingMetadataProvider,
+        IDisplayMetadataProvider,
+        IValidationMetadataProvider
+    {
+        private readonly IStringLocalizerFactory _stringLocalizerFactory;
+        private readonly MvcDataAnnotationsLocalizationOptions _localizationOptions;
+
+        public DataAnnotationsMetadataProvider(
+            IOptions<MvcDataAnnotationsLocalizationOptions> options,
+            IStringLocalizerFactory stringLocalizerFactory)
+        {
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            _localizationOptions = options.Value;
+            _stringLocalizerFactory = stringLocalizerFactory;
+        }
+
+        /// <inheritdoc />
+        public void CreateBindingMetadata(BindingMetadataProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var editableAttribute = context.Attributes.OfType<EditableAttribute>().FirstOrDefault();
+            if (editableAttribute != null)
+            {
+                context.BindingMetadata.IsReadOnly = !editableAttribute.AllowEdit;
+            }
+        }
+
+        /// <inheritdoc />
+        public void CreateDisplayMetadata(DisplayMetadataProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var attributes = context.Attributes;
+            var dataTypeAttribute = attributes.OfType<DataTypeAttribute>().FirstOrDefault();
+            var displayAttribute = attributes.OfType<DisplayAttribute>().FirstOrDefault();
+            var displayColumnAttribute = attributes.OfType<DisplayColumnAttribute>().FirstOrDefault();
+            var displayFormatAttribute = attributes.OfType<DisplayFormatAttribute>().FirstOrDefault();
+            var displayNameAttribute = attributes.OfType<DisplayNameAttribute>().FirstOrDefault();
+            var hiddenInputAttribute = attributes.OfType<HiddenInputAttribute>().FirstOrDefault();
+            var scaffoldColumnAttribute = attributes.OfType<ScaffoldColumnAttribute>().FirstOrDefault();
+            var uiHintAttribute = attributes.OfType<UIHintAttribute>().FirstOrDefault();
+
+            // Special case the [DisplayFormat] attribute hanging off an applied [DataType] attribute. This property is
+            // non-null for DataType.Currency, DataType.Date, DataType.Time, and potentially custom [DataType]
+            // subclasses. The DataType.Currency, DataType.Date, and DataType.Time [DisplayFormat] attributes have a
+            // non-null DataFormatString and the DataType.Date and DataType.Time [DisplayFormat] attributes have
+            // ApplyFormatInEditMode==true.
+            if (displayFormatAttribute == null && dataTypeAttribute != null)
+            {
+                displayFormatAttribute = dataTypeAttribute.DisplayFormat;
+            }
+
+            var displayMetadata = context.DisplayMetadata;
+
+            // ConvertEmptyStringToNull
+            if (displayFormatAttribute != null)
+            {
+                displayMetadata.ConvertEmptyStringToNull = displayFormatAttribute.ConvertEmptyStringToNull;
+            }
+
+            // DataTypeName
+            if (dataTypeAttribute != null)
+            {
+                displayMetadata.DataTypeName = dataTypeAttribute.GetDataTypeName();
+            }
+            else if (displayFormatAttribute != null && !displayFormatAttribute.HtmlEncode)
+            {
+                displayMetadata.DataTypeName = DataType.Html.ToString();
+            }
+
+            var containerType = context.Key.ContainerType ?? context.Key.ModelType;
+            IStringLocalizer localizer = null;
+            if (_stringLocalizerFactory != null && _localizationOptions.DataAnnotationLocalizerProvider != null)
+            {
+                localizer = _localizationOptions.DataAnnotationLocalizerProvider(containerType, _stringLocalizerFactory);
+            }
+
+            // Description
+            if (displayAttribute != null)
+            {
+                if (localizer != null &&
+                    !string.IsNullOrEmpty(displayAttribute.Description) &&
+                    displayAttribute.ResourceType == null)
+                {
+                    displayMetadata.Description = () => localizer[displayAttribute.Description];
+                }
+                else
+                {
+                    displayMetadata.Description = () => displayAttribute.GetDescription();
+                }
+            }
+
+            // DisplayFormatString
+            if (displayFormatAttribute != null)
+            {
+                displayMetadata.DisplayFormatString = displayFormatAttribute.DataFormatString;
+            }
+
+            // DisplayName
+            // DisplayAttribute has precedence over DisplayNameAttribute.
+            if (displayAttribute?.GetName() != null)
+            {
+                if (localizer != null &&
+                    !string.IsNullOrEmpty(displayAttribute.Name) &&
+                    displayAttribute.ResourceType == null)
+                {
+                    displayMetadata.DisplayName = () => localizer[displayAttribute.Name];
+                }
+                else
+                {
+                    displayMetadata.DisplayName = () => displayAttribute.GetName();
+                }
+            }
+            else if (displayNameAttribute != null)
+            {
+                if (localizer != null &&
+                    !string.IsNullOrEmpty(displayNameAttribute.DisplayName))
+                {
+                    displayMetadata.DisplayName = () => localizer[displayNameAttribute.DisplayName];
+                }
+                else
+                {
+                    displayMetadata.DisplayName = () => displayNameAttribute.DisplayName;
+                }
+            }
+
+            // EditFormatString
+            if (displayFormatAttribute != null && displayFormatAttribute.ApplyFormatInEditMode)
+            {
+                displayMetadata.EditFormatString = displayFormatAttribute.DataFormatString;
+            }
+
+            // IsEnum et cetera
+            var underlyingType = Nullable.GetUnderlyingType(context.Key.ModelType) ?? context.Key.ModelType;
+            var underlyingTypeInfo = underlyingType.GetTypeInfo();
+
+            if (underlyingTypeInfo.IsEnum)
+            {
+                // IsEnum
+                displayMetadata.IsEnum = true;
+
+                // IsFlagsEnum
+                displayMetadata.IsFlagsEnum = underlyingTypeInfo.IsDefined(typeof(FlagsAttribute), inherit: false);
+
+                // EnumDisplayNamesAndValues and EnumNamesAndValues
+                //
+                // Order EnumDisplayNamesAndValues by DisplayAttribute.Order, then by the order of Enum.GetNames().
+                // That method orders by absolute value, then its behavior is undefined (but hopefully stable).
+                // Add to EnumNamesAndValues in same order but Dictionary does not guarantee order will be preserved.
+
+                var groupedDisplayNamesAndValues = new List<KeyValuePair<EnumGroupAndName, string>>();
+                var namesAndValues = new Dictionary<string, string>();
+                var enumLocalizer = _stringLocalizerFactory?.Create(underlyingType);
+
+                var enumFields = Enum.GetNames(underlyingType)
+                    .Select(name => underlyingType.GetField(name))
+                    .OrderBy(field => field.GetCustomAttribute<DisplayAttribute>(inherit: false)?.GetOrder() ?? 1000);
+
+                foreach (var field in enumFields)
+                {
+                    var groupName = GetDisplayGroup(field);
+                    var value = ((Enum)field.GetValue(obj: null)).ToString("d");
+
+                    groupedDisplayNamesAndValues.Add(new KeyValuePair<EnumGroupAndName, string>(
+                        new EnumGroupAndName(
+                            groupName,
+                            () => GetDisplayName(field, enumLocalizer)),
+                        value));
+                    namesAndValues.Add(field.Name, value);
+                }
+
+                displayMetadata.EnumGroupedDisplayNamesAndValues = groupedDisplayNamesAndValues;
+                displayMetadata.EnumNamesAndValues = namesAndValues;
+            }
+
+            // HasNonDefaultEditFormat
+            if (!string.IsNullOrEmpty(displayFormatAttribute?.DataFormatString) &&
+                displayFormatAttribute?.ApplyFormatInEditMode == true)
+            {
+                // Have a non-empty EditFormatString based on [DisplayFormat] from our cache.
+                if (dataTypeAttribute == null)
+                {
+                    // Attributes include no [DataType]; [DisplayFormat] was applied directly.
+                    displayMetadata.HasNonDefaultEditFormat = true;
+                }
+                else if (dataTypeAttribute.DisplayFormat != displayFormatAttribute)
+                {
+                    // Attributes include separate [DataType] and [DisplayFormat]; [DisplayFormat] provided override.
+                    displayMetadata.HasNonDefaultEditFormat = true;
+                }
+                else if (dataTypeAttribute.GetType() != typeof(DataTypeAttribute))
+                {
+                    // Attributes include [DisplayFormat] copied from [DataType] and [DataType] was of a subclass.
+                    // Assume the [DataType] constructor used the protected DisplayFormat setter to override its
+                    // default.  That is derived [DataType] provided override.
+                    displayMetadata.HasNonDefaultEditFormat = true;
+                }
+            }
+
+            // HideSurroundingHtml
+            if (hiddenInputAttribute != null)
+            {
+                displayMetadata.HideSurroundingHtml = !hiddenInputAttribute.DisplayValue;
+            }
+
+            // HtmlEncode
+            if (displayFormatAttribute != null)
+            {
+                displayMetadata.HtmlEncode = displayFormatAttribute.HtmlEncode;
+            }
+
+            // NullDisplayText
+            if (displayFormatAttribute != null)
+            {
+                displayMetadata.NullDisplayText = displayFormatAttribute.NullDisplayText;
+            }
+
+            // Order
+            if (displayAttribute?.GetOrder() != null)
+            {
+                displayMetadata.Order = displayAttribute.GetOrder().Value;
+            }
+
+            // Placeholder
+            if (displayAttribute != null)
+            {
+                if (localizer != null &&
+                    !string.IsNullOrEmpty(displayAttribute.Prompt) &&
+                    displayAttribute.ResourceType == null)
+                {
+                    displayMetadata.Placeholder = () => localizer[displayAttribute.Prompt];
+                }
+                else
+                {
+                    displayMetadata.Placeholder = () => displayAttribute.GetPrompt();
+                }
+            }
+
+            // ShowForDisplay
+            if (scaffoldColumnAttribute != null)
+            {
+                displayMetadata.ShowForDisplay = scaffoldColumnAttribute.Scaffold;
+            }
+
+            // ShowForEdit
+            if (scaffoldColumnAttribute != null)
+            {
+                displayMetadata.ShowForEdit = scaffoldColumnAttribute.Scaffold;
+            }
+
+            // SimpleDisplayProperty
+            if (displayColumnAttribute != null)
+            {
+                displayMetadata.SimpleDisplayProperty = displayColumnAttribute.DisplayColumn;
+            }
+
+            // TemplateHint
+            if (uiHintAttribute != null)
+            {
+                displayMetadata.TemplateHint = uiHintAttribute.UIHint;
+            }
+            else if (hiddenInputAttribute != null)
+            {
+                displayMetadata.TemplateHint = "HiddenInput";
+            }
+        }
+
+        /// <inheritdoc />
+        public void CreateValidationMetadata(ValidationMetadataProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            // RequiredAttribute marks a property as required by validation - this means that it
+            // must have a non-null value on the model during validation.
+            var requiredAttribute = context.Attributes.OfType<RequiredAttribute>().FirstOrDefault();
+            if (requiredAttribute != null)
+            {
+                context.ValidationMetadata.IsRequired = true;
+            }
+
+            foreach (var attribute in context.Attributes.OfType<ValidationAttribute>())
+            {
+                // If another provider has already added this attribute, do not repeat it.
+                // This will prevent attributes like RemoteAttribute (which implement ValidationAttribute and
+                // IClientModelValidator) to be added to the ValidationMetadata twice.
+                // This is to ensure we do not end up with duplication validation rules on the client side.
+                if (!context.ValidationMetadata.ValidatorMetadata.Contains(attribute))
+                {
+                    context.ValidationMetadata.ValidatorMetadata.Add(attribute);
+                }
+            }
+        }
+
+        private static string GetDisplayName(FieldInfo field, IStringLocalizer stringLocalizer)
+        {
+            var display = field.GetCustomAttribute<DisplayAttribute>(inherit: false);
+            if (display != null)
+            {
+                // Note [Display(Name = "")] is allowed but we will not attempt to localize the empty name.
+                var name = display.GetName();
+                if (stringLocalizer != null && !string.IsNullOrEmpty(name) && display.ResourceType == null)
+                {
+                    name = stringLocalizer[name];
+                }
+
+                return name ?? field.Name;
+            }
+
+            return field.Name;
+        }
+
+        // Return non-empty group specified in a [Display] attribute for a field, if any; string.Empty otherwise.
+        private static string GetDisplayGroup(FieldInfo field)
+        {
+            var display = field.GetCustomAttribute<DisplayAttribute>(inherit: false);
+            if (display != null)
+            {
+                // Note [Display(Group = "")] is allowed.
+                var group = display.GetGroupName();
+                if (group != null)
+                {
+                    return group;
+                }
+            }
+
+            return string.Empty;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidator.cs
new file mode 100644
index 0000000000..563fa078a7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidator.cs
@@ -0,0 +1,150 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    /// <summary>
+    /// Validates based on the given <see cref="ValidationAttribute"/>.
+    /// </summary>
+    public class DataAnnotationsModelValidator : IModelValidator
+    {
+        private static readonly object _emptyValidationContextInstance = new object();
+        private readonly IStringLocalizer _stringLocalizer;
+        private readonly IValidationAttributeAdapterProvider _validationAttributeAdapterProvider;
+
+        /// <summary>
+        ///  Create a new instance of <see cref="DataAnnotationsModelValidator"/>.
+        /// </summary>
+        /// <param name="attribute">The <see cref="ValidationAttribute"/> that defines what we're validating.</param>
+        /// <param name="stringLocalizer">The <see cref="IStringLocalizer"/> used to create messages.</param>
+        /// <param name="validationAttributeAdapterProvider">The <see cref="IValidationAttributeAdapterProvider"/>
+        /// which <see cref="ValidationAttributeAdapter{TAttribute}"/>'s will be created from.</param>
+        public DataAnnotationsModelValidator(
+            IValidationAttributeAdapterProvider validationAttributeAdapterProvider,
+            ValidationAttribute attribute,
+            IStringLocalizer stringLocalizer)
+        {
+            if (validationAttributeAdapterProvider == null)
+            {
+                throw new ArgumentNullException(nameof(validationAttributeAdapterProvider));
+            }
+
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            _validationAttributeAdapterProvider = validationAttributeAdapterProvider;
+            Attribute = attribute;
+            _stringLocalizer = stringLocalizer;
+        }
+
+        /// <summary>
+        /// The attribute being validated against.
+        /// </summary>
+        public ValidationAttribute Attribute { get; }
+
+        /// <summary>
+        /// Validates the context against the <see cref="ValidationAttribute"/>.
+        /// </summary>
+        /// <param name="validationContext">The context being validated.</param>
+        /// <returns>An enumerable of the validation results.</returns>
+        public IEnumerable<ModelValidationResult> Validate(ModelValidationContext validationContext)
+        {
+            if (validationContext == null)
+            {
+                throw new ArgumentNullException(nameof(validationContext));
+            }
+            if (validationContext.ModelMetadata == null)
+            {
+                throw new ArgumentException(
+                    Resources.FormatPropertyOfTypeCannotBeNull(
+                        nameof(validationContext.ModelMetadata),
+                        typeof(ModelValidationContext)),
+                    nameof(validationContext));
+            }
+            if (validationContext.MetadataProvider == null)
+            {
+                throw new ArgumentException(
+                    Resources.FormatPropertyOfTypeCannotBeNull(
+                        nameof(validationContext.MetadataProvider),
+                        typeof(ModelValidationContext)),
+                    nameof(validationContext));
+            }
+
+            var metadata = validationContext.ModelMetadata;
+            var memberName = metadata.Name;
+            var container = validationContext.Container;
+
+            var context = new ValidationContext(
+                instance: container ?? validationContext.Model ?? _emptyValidationContextInstance,
+                serviceProvider: validationContext.ActionContext?.HttpContext?.RequestServices,
+                items: null)
+            {
+                DisplayName = metadata.GetDisplayName(),
+                MemberName = memberName
+            };
+
+            var result = Attribute.GetValidationResult(validationContext.Model, context);
+            if (result != ValidationResult.Success)
+            {
+                string errorMessage;
+                if (_stringLocalizer != null &&
+                    !string.IsNullOrEmpty(Attribute.ErrorMessage) &&
+                    string.IsNullOrEmpty(Attribute.ErrorMessageResourceName) &&
+                    Attribute.ErrorMessageResourceType == null)
+                {
+                    errorMessage = GetErrorMessage(validationContext) ?? result.ErrorMessage;
+                }
+                else
+                {
+                    errorMessage = result.ErrorMessage;
+                }
+
+                var validationResults = new List<ModelValidationResult>();
+                if (result.MemberNames != null)
+                {
+                    foreach (var resultMemberName in result.MemberNames)
+                    {
+                        // ModelValidationResult.MemberName is used by invoking validators (such as ModelValidator) to
+                        // append construct the ModelKey for ModelStateDictionary. When validating at type level we
+                        // want the returned MemberNames if specified (e.g. "person.Address.FirstName"). For property
+                        // validation, the ModelKey can be constructed using the ModelMetadata and we should ignore
+                        // MemberName (we don't want "person.Name.Name"). However the invoking validator does not have
+                        // a way to distinguish between these two cases. Consequently we'll only set MemberName if this
+                        // validation returns a MemberName that is different from the property being validated.
+                        var newMemberName = string.Equals(resultMemberName, memberName, StringComparison.Ordinal) ?
+                            null :
+                            resultMemberName;
+                        var validationResult = new ModelValidationResult(newMemberName, errorMessage);
+
+                        validationResults.Add(validationResult);
+                    }
+                }
+
+                if (validationResults.Count == 0)
+                {
+                    // result.MemberNames was null or empty.
+                    validationResults.Add(new ModelValidationResult(memberName: null, message: errorMessage));
+                }
+
+                return validationResults;
+            }
+
+            return Enumerable.Empty<ModelValidationResult>();
+        }
+
+        private string GetErrorMessage(ModelValidationContextBase validationContext)
+        {
+            var adapter = _validationAttributeAdapterProvider.GetAttributeAdapter(Attribute, _stringLocalizer);
+            return adapter?.GetErrorMessage(validationContext);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidatorProvider.cs
new file mode 100644
index 0000000000..5ece07f042
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidatorProvider.cs
@@ -0,0 +1,102 @@
+// 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.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    /// <summary>
+    /// An implementation of <see cref="IModelValidatorProvider"/> which provides validators
+    /// for attributes which derive from <see cref="ValidationAttribute"/>. It also provides
+    /// a validator for types which implement <see cref="IValidatableObject"/>.
+    /// </summary>
+    public class DataAnnotationsModelValidatorProvider : IModelValidatorProvider
+    {
+        private readonly IOptions<MvcDataAnnotationsLocalizationOptions> _options;
+        private readonly IStringLocalizerFactory _stringLocalizerFactory;
+        private readonly IValidationAttributeAdapterProvider _validationAttributeAdapterProvider;
+
+        /// <summary>
+        /// Create a new instance of <see cref="DataAnnotationsModelValidatorProvider"/>.
+        /// </summary>
+        /// <param name="validationAttributeAdapterProvider">The <see cref="IValidationAttributeAdapterProvider"/>
+        /// that supplies <see cref="IAttributeAdapter"/>s.</param>
+        /// <param name="options">The <see cref="IOptions{MvcDataAnnotationsLocalizationOptions}"/>.</param>
+        /// <param name="stringLocalizerFactory">The <see cref="IStringLocalizerFactory"/>.</param>
+        /// <remarks><paramref name="options"/> and <paramref name="stringLocalizerFactory"/>
+        /// are nullable only for testing ease.</remarks>
+        public DataAnnotationsModelValidatorProvider(
+            IValidationAttributeAdapterProvider validationAttributeAdapterProvider,
+            IOptions<MvcDataAnnotationsLocalizationOptions> options,
+            IStringLocalizerFactory stringLocalizerFactory)
+        {
+            if (validationAttributeAdapterProvider == null)
+            {
+                throw new ArgumentNullException(nameof(validationAttributeAdapterProvider));
+            }
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            _validationAttributeAdapterProvider = validationAttributeAdapterProvider;
+            _options = options;
+            _stringLocalizerFactory = stringLocalizerFactory;
+        }
+
+        public void CreateValidators(ModelValidatorProviderContext context)
+        {
+            IStringLocalizer stringLocalizer = null;
+            if (_stringLocalizerFactory != null && _options.Value.DataAnnotationLocalizerProvider != null)
+            {
+                stringLocalizer = _options.Value.DataAnnotationLocalizerProvider(
+                    context.ModelMetadata.ContainerType ?? context.ModelMetadata.ModelType,
+                    _stringLocalizerFactory);
+            }
+
+            for (var i = 0; i < context.Results.Count; i++)
+            {
+                var validatorItem = context.Results[i];
+                if (validatorItem.Validator != null)
+                {
+                    continue;
+                }
+
+                var attribute = validatorItem.ValidatorMetadata as ValidationAttribute;
+                if (attribute == null)
+                {
+                    continue;
+                }
+
+                var validator = new DataAnnotationsModelValidator(
+                    _validationAttributeAdapterProvider,
+                    attribute,
+                    stringLocalizer);
+
+                validatorItem.Validator = validator;
+                validatorItem.IsReusable = true;
+                // Inserts validators based on whether or not they are 'required'. We want to run
+                // 'required' validators first so that we get the best possible error message.
+                if (attribute is RequiredAttribute)
+                {
+                    context.Results.Remove(validatorItem);
+                    context.Results.Insert(0, validatorItem);
+                }
+            }
+
+            // Produce a validator if the type supports IValidatableObject
+            if (typeof(IValidatableObject).IsAssignableFrom(context.ModelMetadata.ModelType))
+            {
+                context.Results.Add(new ValidatorItem
+                {
+                    Validator = new ValidatableObjectAdapter(),
+                    IsReusable = true
+                });
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataTypeAttributeAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataTypeAttributeAdapter.cs
new file mode 100644
index 0000000000..b9bfa16165
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataTypeAttributeAdapter.cs
@@ -0,0 +1,55 @@
+// 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.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    /// <summary>
+    /// A validation adapter that is used to map <see cref="DataTypeAttribute"/>'s to a single client side validation
+    /// rule.
+    /// </summary>
+    public class DataTypeAttributeAdapter : AttributeAdapterBase<DataTypeAttribute>
+    {
+        public DataTypeAttributeAdapter(DataTypeAttribute attribute, string ruleName, IStringLocalizer stringLocalizer)
+            : base(attribute, stringLocalizer)
+        {
+            if (string.IsNullOrEmpty(ruleName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(ruleName));
+            }
+
+            RuleName = ruleName;
+        }
+
+        public string RuleName { get; }
+
+        public override void AddValidation(ClientModelValidationContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            MergeAttribute(context.Attributes, "data-val", "true");
+            MergeAttribute(context.Attributes, RuleName, GetErrorMessage(context));
+        }
+
+        /// <inheritdoc/>
+        public override string GetErrorMessage(ModelValidationContextBase validationContext)
+        {
+            if (validationContext == null)
+            {
+                throw new ArgumentNullException(nameof(validationContext));
+            }
+
+            return GetErrorMessage(
+                validationContext.ModelMetadata,
+                validationContext.ModelMetadata.GetDisplayName(),
+                Attribute.GetDataTypeName());
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DefaultClientModelValidatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DefaultClientModelValidatorProvider.cs
new file mode 100644
index 0000000000..2fb0fe4769
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DefaultClientModelValidatorProvider.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    /// <summary>
+    /// A default implementation of <see cref="IClientModelValidatorProvider"/>.
+    /// </summary>
+    /// <remarks>
+    /// The <see cref="DefaultClientModelValidatorProvider"/> provides validators from 
+    /// <see cref="IClientModelValidator"/> instances in <see cref="ModelBinding.ModelMetadata.ValidatorMetadata"/>.
+    /// </remarks>
+    public class DefaultClientModelValidatorProvider : IClientModelValidatorProvider
+    {
+        /// <inheritdoc />
+        public void CreateValidators(ClientValidatorProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            // Perf: Avoid allocations
+            for (var i = 0; i < context.Results.Count; i++)
+            {
+                var validatorItem = context.Results[i];
+                // Don't overwrite anything that was done by a previous provider.
+                if (validatorItem.Validator != null)
+                {
+                    continue;
+                }
+
+                var validator = validatorItem.ValidatorMetadata as IClientModelValidator;
+                if (validator != null)
+                {
+                    validatorItem.Validator = validator;
+                    validatorItem.IsReusable = true;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/FileExtensionsAttributeAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/FileExtensionsAttributeAdapter.cs
new file mode 100644
index 0000000000..827188f769
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/FileExtensionsAttributeAdapter.cs
@@ -0,0 +1,57 @@
+// 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.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class FileExtensionsAttributeAdapter : AttributeAdapterBase<FileExtensionsAttribute>
+    {
+        private readonly string _extensions;
+        private readonly string _formattedExtensions;
+
+        public FileExtensionsAttributeAdapter(FileExtensionsAttribute attribute, IStringLocalizer stringLocalizer)
+            : base(attribute, stringLocalizer)
+        {
+            // Build the extension list based on how the JQuery Validation's 'extension' method expects it
+            // https://jqueryvalidation.org/extension-method/
+
+            // These lines follow the same approach as the FileExtensionsAttribute.
+            var normalizedExtensions = Attribute.Extensions.Replace(" ", string.Empty).Replace(".", string.Empty).ToLowerInvariant();
+            var parsedExtensions = normalizedExtensions.Split(',').Select(e => "." + e);
+            _formattedExtensions = string.Join(", ", parsedExtensions);
+            _extensions = string.Join(",", parsedExtensions);
+        }
+
+        /// <inheritdoc />
+        public override void AddValidation(ClientModelValidationContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            MergeAttribute(context.Attributes, "data-val", "true");
+            MergeAttribute(context.Attributes, "data-val-fileextensions", GetErrorMessage(context));
+            MergeAttribute(context.Attributes, "data-val-fileextensions-extensions", _extensions);
+        }
+
+        /// <inheritdoc />
+        public override string GetErrorMessage(ModelValidationContextBase validationContext)
+        {
+            if (validationContext == null)
+            {
+                throw new ArgumentNullException(nameof(validationContext));
+            }
+
+            return GetErrorMessage(
+                validationContext.ModelMetadata,
+                validationContext.ModelMetadata.GetDisplayName(),
+                _formattedExtensions);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/MaxLengthAttributeAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/MaxLengthAttributeAdapter.cs
new file mode 100644
index 0000000000..3a1a2cf9e9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/MaxLengthAttributeAdapter.cs
@@ -0,0 +1,48 @@
+// 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.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class MaxLengthAttributeAdapter : AttributeAdapterBase<MaxLengthAttribute>
+    {
+        private readonly string _max;
+
+        public MaxLengthAttributeAdapter(MaxLengthAttribute attribute, IStringLocalizer stringLocalizer)
+            : base(attribute, stringLocalizer)
+        {
+            _max = Attribute.Length.ToString(CultureInfo.InvariantCulture);
+        }
+
+        public override void AddValidation(ClientModelValidationContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            MergeAttribute(context.Attributes, "data-val", "true");
+            MergeAttribute(context.Attributes, "data-val-maxlength", GetErrorMessage(context));
+            MergeAttribute(context.Attributes, "data-val-maxlength-max", _max);
+        }
+
+        /// <inheritdoc />
+        public override string GetErrorMessage(ModelValidationContextBase validationContext)
+        {
+            if (validationContext == null)
+            {
+                throw new ArgumentNullException(nameof(validationContext));
+            }
+
+            return GetErrorMessage(
+                validationContext.ModelMetadata,
+                validationContext.ModelMetadata.GetDisplayName(),
+                Attribute.Length);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/MinLengthAttributeAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/MinLengthAttributeAdapter.cs
new file mode 100644
index 0000000000..8d713b823c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/MinLengthAttributeAdapter.cs
@@ -0,0 +1,48 @@
+// 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.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class MinLengthAttributeAdapter : AttributeAdapterBase<MinLengthAttribute>
+    {
+        private readonly string _min;
+
+        public MinLengthAttributeAdapter(MinLengthAttribute attribute, IStringLocalizer stringLocalizer)
+            : base(attribute, stringLocalizer)
+        {
+            _min = Attribute.Length.ToString(CultureInfo.InvariantCulture);
+        }
+
+        public override void AddValidation(ClientModelValidationContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            MergeAttribute(context.Attributes, "data-val", "true");
+            MergeAttribute(context.Attributes, "data-val-minlength", GetErrorMessage(context));
+            MergeAttribute(context.Attributes, "data-val-minlength-min", _min);
+        }
+
+        /// <inheritdoc />
+        public override string GetErrorMessage(ModelValidationContextBase validationContext)
+        {
+            if (validationContext == null)
+            {
+                throw new ArgumentNullException(nameof(validationContext));
+            }
+
+            return GetErrorMessage(
+                validationContext.ModelMetadata,
+                validationContext.ModelMetadata.GetDisplayName(),
+                Attribute.Length);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/MvcDataAnnotationsLocalizationOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/MvcDataAnnotationsLocalizationOptionsSetup.cs
new file mode 100644
index 0000000000..e91f13b255
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/MvcDataAnnotationsLocalizationOptionsSetup.cs
@@ -0,0 +1,26 @@
+// 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.
+
+using System;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    /// <summary>
+    /// Sets up default options for <see cref="MvcDataAnnotationsLocalizationOptions"/>.
+    /// </summary>
+    public class MvcDataAnnotationsLocalizationOptionsSetup : IConfigureOptions<MvcDataAnnotationsLocalizationOptions>
+    {
+        /// <inheritdoc />
+        public void Configure(MvcDataAnnotationsLocalizationOptions options)
+        {
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            options.DataAnnotationLocalizerProvider = (modelType, stringLocalizerFactory) =>
+                stringLocalizerFactory.Create(modelType);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/MvcDataAnnotationsMvcOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/MvcDataAnnotationsMvcOptionsSetup.cs
new file mode 100644
index 0000000000..1b94e5c157
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/MvcDataAnnotationsMvcOptionsSetup.cs
@@ -0,0 +1,63 @@
+// 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.
+
+using System;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    /// <summary>
+    /// Sets up default options for <see cref="MvcOptions"/>.
+    /// </summary>
+    public class MvcDataAnnotationsMvcOptionsSetup : IConfigureOptions<MvcOptions>
+    {
+        private readonly IStringLocalizerFactory _stringLocalizerFactory;
+        private readonly IValidationAttributeAdapterProvider _validationAttributeAdapterProvider;
+        private readonly IOptions<MvcDataAnnotationsLocalizationOptions> _dataAnnotationLocalizationOptions;
+
+        public MvcDataAnnotationsMvcOptionsSetup(
+            IValidationAttributeAdapterProvider validationAttributeAdapterProvider,
+            IOptions<MvcDataAnnotationsLocalizationOptions> dataAnnotationLocalizationOptions)
+        {
+            if (validationAttributeAdapterProvider == null)
+            {
+                throw new ArgumentNullException(nameof(validationAttributeAdapterProvider));
+            }
+
+            if (dataAnnotationLocalizationOptions == null)
+            {
+                throw new ArgumentNullException(nameof(dataAnnotationLocalizationOptions));
+            }
+
+            _validationAttributeAdapterProvider = validationAttributeAdapterProvider;
+            _dataAnnotationLocalizationOptions = dataAnnotationLocalizationOptions;
+        }
+
+        public MvcDataAnnotationsMvcOptionsSetup(
+            IValidationAttributeAdapterProvider validationAttributeAdapterProvider,
+            IOptions<MvcDataAnnotationsLocalizationOptions> dataAnnotationLocalizationOptions,
+            IStringLocalizerFactory stringLocalizerFactory)
+            : this(validationAttributeAdapterProvider, dataAnnotationLocalizationOptions)
+        {
+            _stringLocalizerFactory = stringLocalizerFactory;
+        }
+
+        public void Configure(MvcOptions options)
+        {
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            options.ModelMetadataDetailsProviders.Add(new DataAnnotationsMetadataProvider(
+                _dataAnnotationLocalizationOptions,
+                _stringLocalizerFactory));
+
+            options.ModelValidatorProviders.Add(new DataAnnotationsModelValidatorProvider(
+                _validationAttributeAdapterProvider,
+                _dataAnnotationLocalizationOptions,
+                _stringLocalizerFactory));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/NumericClientModelValidator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/NumericClientModelValidator.cs
new file mode 100644
index 0000000000..edc0286909
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/NumericClientModelValidator.cs
@@ -0,0 +1,54 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    /// <summary>
+    /// An implementation of <see cref="IClientModelValidator"/> that provides the rule for validating
+    /// numeric types.
+    /// </summary>
+    public class NumericClientModelValidator : IClientModelValidator
+    {
+        /// <inheritdoc />
+        public void AddValidation(ClientModelValidationContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            MergeAttribute(context.Attributes, "data-val", "true");
+            MergeAttribute(context.Attributes, "data-val-number", GetErrorMessage(context.ModelMetadata));
+        }
+
+        private static void MergeAttribute(IDictionary<string, string> attributes, string key, string value)
+        {
+            if (!attributes.ContainsKey(key))
+            {
+                attributes.Add(key, value);
+            }
+        }
+
+        private string GetErrorMessage(ModelMetadata modelMetadata)
+        {
+            if (modelMetadata == null)
+            {
+                throw new ArgumentNullException(nameof(modelMetadata));
+            }
+
+            var messageProvider = modelMetadata.ModelBindingMessageProvider;
+            var name = modelMetadata.DisplayName ?? modelMetadata.Name;
+            if (name == null)
+            {
+                return messageProvider.NonPropertyValueMustBeANumberAccessor();
+            }
+
+            return messageProvider.ValueMustBeANumberAccessor(name);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/NumericClientModelValidatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/NumericClientModelValidatorProvider.cs
new file mode 100644
index 0000000000..a2e182d381
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/NumericClientModelValidatorProvider.cs
@@ -0,0 +1,48 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    /// <summary>
+    /// An implementation of <see cref="IClientModelValidatorProvider"/> which provides client validators
+    /// for specific numeric types.
+    /// </summary>
+    public class NumericClientModelValidatorProvider : IClientModelValidatorProvider
+    {
+        /// <inheritdoc />
+        public void CreateValidators(ClientValidatorProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var typeToValidate = context.ModelMetadata.UnderlyingOrModelType;
+
+            // Check only the numeric types for which we set type='text'.
+            if (typeToValidate == typeof(float) ||
+                typeToValidate == typeof(double) ||
+                typeToValidate == typeof(decimal))
+            {
+                for (var i = 0; i < context.Results.Count; i++)
+                {
+                    var validator = context.Results[i].Validator;
+                    if (validator != null && validator is NumericClientModelValidator)
+                    {
+                        // A validator is already present. No need to add one.
+                        return;
+                    }
+                }
+
+                context.Results.Add(new ClientValidatorItem
+                {
+                    Validator = new NumericClientModelValidator(),
+                    IsReusable = true
+                });
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/RangeAttributeAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/RangeAttributeAdapter.cs
new file mode 100644
index 0000000000..345e6cc3b9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/RangeAttributeAdapter.cs
@@ -0,0 +1,59 @@
+// 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.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class RangeAttributeAdapter : AttributeAdapterBase<RangeAttribute>
+    {
+        private readonly string _max;
+        private readonly string _min;
+
+        public RangeAttributeAdapter(RangeAttribute attribute, IStringLocalizer stringLocalizer)
+            : base(attribute, stringLocalizer)
+        {
+            // This will trigger the conversion of Attribute.Minimum and Attribute.Maximum.
+            // This is needed, because the attribute is stateful and will convert from a string like
+            // "100m" to the decimal value 100.
+            //
+            // Validate a randomly selected number.
+            attribute.IsValid(3); 
+
+            _max = Convert.ToString(Attribute.Maximum, CultureInfo.InvariantCulture);
+            _min = Convert.ToString(Attribute.Minimum, CultureInfo.InvariantCulture);
+        }
+
+        public override void AddValidation(ClientModelValidationContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            MergeAttribute(context.Attributes, "data-val", "true");
+            MergeAttribute(context.Attributes, "data-val-range", GetErrorMessage(context));
+            MergeAttribute(context.Attributes, "data-val-range-max", _max);
+            MergeAttribute(context.Attributes, "data-val-range-min", _min);
+        }
+
+        /// <inheritdoc />
+        public override string GetErrorMessage(ModelValidationContextBase validationContext)
+        {
+            if (validationContext == null)
+            {
+                throw new ArgumentNullException(nameof(validationContext));
+            }
+
+            return GetErrorMessage(
+                validationContext.ModelMetadata,
+                validationContext.ModelMetadata.GetDisplayName(),
+                Attribute.Minimum,
+                Attribute.Maximum);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/RegularExpressionAttributeAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/RegularExpressionAttributeAdapter.cs
new file mode 100644
index 0000000000..552c5dcad2
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/RegularExpressionAttributeAdapter.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class RegularExpressionAttributeAdapter : AttributeAdapterBase<RegularExpressionAttribute>
+    {
+        public RegularExpressionAttributeAdapter(RegularExpressionAttribute attribute, IStringLocalizer stringLocalizer)
+            : base(attribute, stringLocalizer)
+        {
+        }
+
+        public override void AddValidation(ClientModelValidationContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            MergeAttribute(context.Attributes, "data-val", "true");
+            MergeAttribute(context.Attributes, "data-val-regex", GetErrorMessage(context));
+            MergeAttribute(context.Attributes, "data-val-regex-pattern", Attribute.Pattern);
+        }
+
+        /// <inheritdoc />
+        public override string GetErrorMessage(ModelValidationContextBase validationContext)
+        {
+            if (validationContext == null)
+            {
+                throw new ArgumentNullException(nameof(validationContext));
+            }
+
+            return GetErrorMessage(
+                validationContext.ModelMetadata,
+                validationContext.ModelMetadata.GetDisplayName(),
+                Attribute.Pattern);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/RequiredAttributeAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/RequiredAttributeAdapter.cs
new file mode 100644
index 0000000000..90e33ab49e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/RequiredAttributeAdapter.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class RequiredAttributeAdapter : AttributeAdapterBase<RequiredAttribute>
+    {
+        public RequiredAttributeAdapter(RequiredAttribute attribute, IStringLocalizer stringLocalizer)
+            : base(attribute, stringLocalizer)
+        {
+        }
+
+        public override void AddValidation(ClientModelValidationContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            MergeAttribute(context.Attributes, "data-val", "true");
+            MergeAttribute(context.Attributes, "data-val-required", GetErrorMessage(context));
+        }
+
+        /// <inheritdoc />
+        public override string GetErrorMessage(ModelValidationContextBase validationContext)
+        {
+            if (validationContext == null)
+            {
+                throw new ArgumentNullException(nameof(validationContext));
+            }
+
+            return GetErrorMessage(validationContext.ModelMetadata, validationContext.ModelMetadata.GetDisplayName());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/StringLengthAttributeAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/StringLengthAttributeAdapter.cs
new file mode 100644
index 0000000000..f733d4470a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/StringLengthAttributeAdapter.cs
@@ -0,0 +1,61 @@
+// 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.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class StringLengthAttributeAdapter : AttributeAdapterBase<StringLengthAttribute>
+    {
+        private readonly string _max;
+        private readonly string _min;
+
+        public StringLengthAttributeAdapter(StringLengthAttribute attribute, IStringLocalizer stringLocalizer)
+            : base(attribute, stringLocalizer)
+        {
+            _max = Attribute.MaximumLength.ToString(CultureInfo.InvariantCulture);
+            _min = Attribute.MinimumLength.ToString(CultureInfo.InvariantCulture);
+        }
+
+        /// <inheritdoc />
+        public override void AddValidation(ClientModelValidationContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            MergeAttribute(context.Attributes, "data-val", "true");
+            MergeAttribute(context.Attributes, "data-val-length", GetErrorMessage(context));
+
+            if (Attribute.MaximumLength != int.MaxValue)
+            {
+                MergeAttribute(context.Attributes, "data-val-length-max", _max);
+            }
+
+            if (Attribute.MinimumLength != 0)
+            {
+                MergeAttribute(context.Attributes, "data-val-length-min", _min);
+            }
+        }
+
+        /// <inheritdoc />
+        public override string GetErrorMessage(ModelValidationContextBase validationContext)
+        {
+            if (validationContext == null)
+            {
+                throw new ArgumentNullException(nameof(validationContext));
+            }
+
+            return GetErrorMessage(
+                validationContext.ModelMetadata,
+                validationContext.ModelMetadata.GetDisplayName(),
+                Attribute.MaximumLength,
+                Attribute.MinimumLength);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/ValidatableObjectAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/ValidatableObjectAdapter.cs
new file mode 100644
index 0000000000..55a9ca23a1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/ValidatableObjectAdapter.cs
@@ -0,0 +1,68 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class ValidatableObjectAdapter : IModelValidator
+    {
+        public IEnumerable<ModelValidationResult> Validate(ModelValidationContext context)
+        {
+            var model = context.Model;
+            if (model == null)
+            {
+                return Enumerable.Empty<ModelValidationResult>();
+            }
+
+            if (!(model is IValidatableObject validatable))
+            {
+                var message = Resources.FormatValidatableObjectAdapter_IncompatibleType(
+                    typeof(IValidatableObject).Name,
+                    model.GetType());
+
+                throw new InvalidOperationException(message);
+            }
+
+            // The constructed ValidationContext is intentionally slightly different from what
+            // DataAnnotationsModelValidator creates. The instance parameter would be context.Container
+            // (if non-null) in that class. But, DataAnnotationsModelValidator _also_ passes context.Model
+            // separately to any ValidationAttribute.
+            var validationContext = new ValidationContext(
+                instance: validatable,
+                serviceProvider: context.ActionContext?.HttpContext?.RequestServices,
+                items: null)
+            {
+                DisplayName = context.ModelMetadata.GetDisplayName(),
+                MemberName = context.ModelMetadata.Name,
+            };
+
+            return ConvertResults(validatable.Validate(validationContext));
+        }
+
+        private IEnumerable<ModelValidationResult> ConvertResults(IEnumerable<ValidationResult> results)
+        {
+            foreach (var result in results)
+            {
+                if (result != ValidationResult.Success)
+                {
+                    if (result.MemberNames == null || !result.MemberNames.Any())
+                    {
+                        yield return new ModelValidationResult(memberName: null, message: result.ErrorMessage);
+                    }
+                    else
+                    {
+                        foreach (var memberName in result.MemberNames)
+                        {
+                            yield return new ModelValidationResult(memberName, result.ErrorMessage);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj
new file mode 100644
index 0000000000..336474aae0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ASP.NET Core MVC metadata and validation system using System.ComponentModel.DataAnnotations.</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj" />
+
+    <PackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="$(MicrosoftExtensionsLocalizationPackageVersion)" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="$(SystemComponentModelAnnotationsPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/MvcDataAnnotationsLocalizationOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/MvcDataAnnotationsLocalizationOptions.cs
new file mode 100644
index 0000000000..99d8742296
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/MvcDataAnnotationsLocalizationOptions.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using System;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations
+{
+    /// <summary>
+    /// Provides programmatic configuration for DataAnnotations localization in the MVC framework.
+    /// </summary>
+    public class MvcDataAnnotationsLocalizationOptions
+    {
+        /// <summary>
+        /// The delegate to invoke for creating <see cref="IStringLocalizer"/>.
+        /// </summary>
+        public Func<Type, IStringLocalizerFactory, IStringLocalizer> DataAnnotationLocalizerProvider;
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..c375950300
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// 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.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.DataAnnotations.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..30ce539240
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Properties/Resources.Designer.cs
@@ -0,0 +1,72 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class Resources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.DataAnnotations.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// The model object inside the metadata claimed to be compatible with '{0}', but was actually '{1}'.
+        /// </summary>
+        internal static string ValidatableObjectAdapter_IncompatibleType
+        {
+            get => GetString("ValidatableObjectAdapter_IncompatibleType");
+        }
+
+        /// <summary>
+        /// The model object inside the metadata claimed to be compatible with '{0}', but was actually '{1}'.
+        /// </summary>
+        internal static string FormatValidatableObjectAdapter_IncompatibleType(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ValidatableObjectAdapter_IncompatibleType"), p0, p1);
+
+        /// <summary>
+        /// Value cannot be null or empty.
+        /// </summary>
+        internal static string ArgumentCannotBeNullOrEmpty
+        {
+            get => GetString("ArgumentCannotBeNullOrEmpty");
+        }
+
+        /// <summary>
+        /// Value cannot be null or empty.
+        /// </summary>
+        internal static string FormatArgumentCannotBeNullOrEmpty()
+            => GetString("ArgumentCannotBeNullOrEmpty");
+
+        /// <summary>
+        /// The '{0}' property of '{1}' must not be null.
+        /// </summary>
+        internal static string PropertyOfTypeCannotBeNull
+        {
+            get => GetString("PropertyOfTypeCannotBeNull");
+        }
+
+        /// <summary>
+        /// The '{0}' property of '{1}' must not be null.
+        /// </summary>
+        internal static string FormatPropertyOfTypeCannotBeNull(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("PropertyOfTypeCannotBeNull"), p0, p1);
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Resources.resx
new file mode 100644
index 0000000000..1c0fc25774
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Resources.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ValidatableObjectAdapter_IncompatibleType" xml:space="preserve">
+    <value>The model object inside the metadata claimed to be compatible with '{0}', but was actually '{1}'.</value>
+  </data>
+  <data name="ArgumentCannotBeNullOrEmpty" xml:space="preserve">
+    <value>Value cannot be null or empty.</value>
+  </data>
+  <data name="PropertyOfTypeCannotBeNull" xml:space="preserve">
+    <value>The '{0}' property of '{1}' must not be null.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationAttributeAdapterOfTAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationAttributeAdapterOfTAttribute.cs
new file mode 100644
index 0000000000..9a2d284098
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationAttributeAdapterOfTAttribute.cs
@@ -0,0 +1,85 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations
+{
+    /// <summary>
+    /// An implementation of <see cref="IClientModelValidator"/> which understands data annotation attributes.
+    /// </summary>
+    /// <typeparam name="TAttribute">The type of the attribute.</typeparam>
+    public abstract class ValidationAttributeAdapter<TAttribute> : IClientModelValidator
+        where TAttribute : ValidationAttribute
+    {
+        private readonly IStringLocalizer _stringLocalizer;
+        /// <summary>
+        /// Create a new instance of <see cref="ValidationAttributeAdapter{TAttribute}"/>.
+        /// </summary>
+        /// <param name="attribute">The <typeparamref name="TAttribute"/> instance to validate.</param>
+        /// <param name="stringLocalizer">The <see cref="IStringLocalizer"/>.</param>
+        public ValidationAttributeAdapter(TAttribute attribute, IStringLocalizer stringLocalizer)
+        {
+            Attribute = attribute;
+            _stringLocalizer = stringLocalizer;
+        }
+
+        /// <summary>
+        /// Gets the <typeparamref name="TAttribute"/> instance.
+        /// </summary>
+        public TAttribute Attribute { get; }
+
+        /// <inheritdoc />
+        public abstract void AddValidation(ClientModelValidationContext context);
+
+        /// <summary>
+        /// Adds the given <paramref name="key"/> and <paramref name="value"/> into
+        /// <paramref name="attributes"/> if <paramref name="attributes"/> does not contain a value for
+        /// <paramref name="key"/>.
+        /// </summary>
+        /// <param name="attributes">The HTML attributes dictionary.</param>
+        /// <param name="key">The attribute key.</param>
+        /// <param name="value">The attribute value.</param>
+        /// <returns><c>true</c> if an attribute was added, otherwise <c>false</c>.</returns>
+        protected static bool MergeAttribute(IDictionary<string, string> attributes, string key, string value)
+        {
+            if (attributes.ContainsKey(key))
+            {
+                return false;
+            }
+
+            attributes.Add(key, value);
+            return true;
+        }
+
+        /// <summary>
+        /// Gets the error message formatted using the <see cref="Attribute"/>.
+        /// </summary>
+        /// <param name="modelMetadata">The <see cref="ModelMetadata"/> associated with the model annotated with
+        /// <see cref="Attribute"/>.</param>
+        /// <param name="arguments">The value arguments which will be used in constructing the error message.</param>
+        /// <returns>Formatted error string.</returns>
+        protected virtual string GetErrorMessage(ModelMetadata modelMetadata, params object[] arguments)
+        {
+            if (modelMetadata == null)
+            {
+                throw new ArgumentNullException(nameof(modelMetadata));
+            }
+
+            if (_stringLocalizer != null &&
+                !string.IsNullOrEmpty(Attribute.ErrorMessage) &&
+                string.IsNullOrEmpty(Attribute.ErrorMessageResourceName) &&
+                Attribute.ErrorMessageResourceType == null)
+            {
+                return _stringLocalizer[Attribute.ErrorMessage, arguments];
+            }
+
+            return Attribute.FormatErrorMessage(modelMetadata.GetDisplayName());
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationAttributeAdapterProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationAttributeAdapterProvider.cs
new file mode 100644
index 0000000000..a16b405a5f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationAttributeAdapterProvider.cs
@@ -0,0 +1,89 @@
+// 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.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations
+{
+    /// <summary>
+    /// Creates an <see cref="IAttributeAdapter"/> for the given attribute.
+    /// </summary>
+    public class ValidationAttributeAdapterProvider : IValidationAttributeAdapterProvider
+    {
+        /// <summary>
+        /// Creates an <see cref="IAttributeAdapter"/> for the given attribute.
+        /// </summary>
+        /// <param name="attribute">The attribute to create an adapter for.</param>
+        /// <param name="stringLocalizer">The localizer to provide to the adapter.</param>
+        /// <returns>An <see cref="IAttributeAdapter"/> for the given attribute.</returns>
+        public IAttributeAdapter GetAttributeAdapter(ValidationAttribute attribute, IStringLocalizer stringLocalizer)
+        {
+            if (attribute == null)
+            {
+                throw new ArgumentNullException(nameof(attribute));
+            }
+
+            IAttributeAdapter adapter;
+
+            var type = attribute.GetType();
+
+            if (type == typeof(RegularExpressionAttribute))
+            {
+                adapter = new RegularExpressionAttributeAdapter((RegularExpressionAttribute)attribute, stringLocalizer);
+            }
+            else if (type == typeof(MaxLengthAttribute))
+            {
+                adapter = new MaxLengthAttributeAdapter((MaxLengthAttribute)attribute, stringLocalizer);
+            }
+            else if (type == typeof(RequiredAttribute))
+            {
+                adapter = new RequiredAttributeAdapter((RequiredAttribute)attribute, stringLocalizer);
+            }
+            else if (type == typeof(CompareAttribute))
+            {
+                adapter = new CompareAttributeAdapter((CompareAttribute)attribute, stringLocalizer);
+            }
+            else if (type == typeof(MinLengthAttribute))
+            {
+                adapter = new MinLengthAttributeAdapter((MinLengthAttribute)attribute, stringLocalizer);
+            }
+            else if (type == typeof(CreditCardAttribute))
+            {
+                adapter = new DataTypeAttributeAdapter((DataTypeAttribute)attribute, "data-val-creditcard", stringLocalizer);
+            }
+            else if (type == typeof(StringLengthAttribute))
+            {
+                adapter = new StringLengthAttributeAdapter((StringLengthAttribute)attribute, stringLocalizer);
+            }
+            else if (type == typeof(RangeAttribute))
+            {
+                adapter = new RangeAttributeAdapter((RangeAttribute)attribute, stringLocalizer);
+            }
+            else if (type == typeof(EmailAddressAttribute))
+            {
+                adapter = new DataTypeAttributeAdapter((DataTypeAttribute)attribute, "data-val-email", stringLocalizer);
+            }
+            else if (type == typeof(PhoneAttribute))
+            {
+                adapter = new DataTypeAttributeAdapter((DataTypeAttribute)attribute, "data-val-phone", stringLocalizer);
+            }
+            else if (type == typeof(UrlAttribute))
+            {
+                adapter = new DataTypeAttributeAdapter((DataTypeAttribute)attribute, "data-val-url", stringLocalizer);
+            }
+            else if (type == typeof(FileExtensionsAttribute))
+            {
+                adapter = new FileExtensionsAttributeAdapter((FileExtensionsAttribute)attribute, stringLocalizer);
+            }
+            else
+            {
+                adapter = null;
+            }
+
+            return adapter;
+        }
+    };
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/baseline.netcore.json
new file mode 100644
index 0000000000..6ef863e5b3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/baseline.netcore.json
@@ -0,0 +1,417 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc.DataAnnotations, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.HiddenInputAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayValue",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayValue",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.DataAnnotations.AttributeAdapterBase<T0>",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Mvc.DataAnnotations.ValidationAttributeAdapter<T0>",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.DataAnnotations.IAttributeAdapter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetErrorMessage",
+          "Parameters": [
+            {
+              "Name": "validationContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContextBase"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Abstract": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.DataAnnotations.IAttributeAdapter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "attribute",
+              "Type": "T0"
+            },
+            {
+              "Name": "stringLocalizer",
+              "Type": "Microsoft.Extensions.Localization.IStringLocalizer"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TAttribute",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": [
+            "System.ComponentModel.DataAnnotations.ValidationAttribute"
+          ]
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.DataAnnotations.IAttributeAdapter",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidator"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetErrorMessage",
+          "Parameters": [
+            {
+              "Name": "validationContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContextBase"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetAttributeAdapter",
+          "Parameters": [
+            {
+              "Name": "attribute",
+              "Type": "System.ComponentModel.DataAnnotations.ValidationAttribute"
+            },
+            {
+              "Name": "stringLocalizer",
+              "Type": "Microsoft.Extensions.Localization.IStringLocalizer"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.DataAnnotations.IAttributeAdapter",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.DataAnnotations.MvcDataAnnotationsLocalizationOptions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "DataAnnotationLocalizerProvider",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.Type, Microsoft.Extensions.Localization.IStringLocalizerFactory, Microsoft.Extensions.Localization.IStringLocalizer>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.DataAnnotations.ValidationAttributeAdapter<T0>",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidator"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Attribute",
+          "Parameters": [],
+          "ReturnType": "T0",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddValidation",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientModelValidationContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MergeAttribute",
+          "Parameters": [
+            {
+              "Name": "attributes",
+              "Type": "System.Collections.Generic.IDictionary<System.String, System.String>"
+            },
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetErrorMessage",
+          "Parameters": [
+            {
+              "Name": "modelMetadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "arguments",
+              "Type": "System.Object[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "attribute",
+              "Type": "T0"
+            },
+            {
+              "Name": "stringLocalizer",
+              "Type": "Microsoft.Extensions.Localization.IStringLocalizer"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TAttribute",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": [
+            "System.ComponentModel.DataAnnotations.ValidationAttribute"
+          ]
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.DataAnnotations.ValidationAttributeAdapterProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetAttributeAdapter",
+          "Parameters": [
+            {
+              "Name": "attribute",
+              "Type": "System.ComponentModel.DataAnnotations.ValidationAttribute"
+            },
+            {
+              "Name": "stringLocalizer",
+              "Type": "Microsoft.Extensions.Localization.IStringLocalizer"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.DataAnnotations.IAttributeAdapter",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.MvcDataAnnotationsMvcBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddDataAnnotationsLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddDataAnnotationsLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.DataAnnotations.MvcDataAnnotationsLocalizationOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.MvcDataAnnotationsMvcCoreBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddDataAnnotations",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddDataAnnotationsLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddDataAnnotationsLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.DataAnnotations.MvcDataAnnotationsLocalizationOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcBuilderExtensions.cs
new file mode 100644
index 0000000000..93e7bc7e40
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcBuilderExtensions.cs
@@ -0,0 +1,37 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    /// <summary>
+    /// Extensions methods for configuring MVC via an <see cref="IMvcBuilder"/>.
+    /// </summary>
+    public static class MvcJsonMvcBuilderExtensions
+    {
+        /// <summary>
+        /// Adds configuration of <see cref="MvcJsonOptions"/> for the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="setupAction">The <see cref="MvcJsonOptions"/> which need to be configured.</param>
+        public static IMvcBuilder AddJsonOptions(
+            this IMvcBuilder builder,
+            Action<MvcJsonOptions> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (setupAction == null)
+            {
+                throw new ArgumentNullException(nameof(setupAction));
+            }
+
+            builder.Services.Configure(setupAction);
+            return builder;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcCoreBuilderExtensions.cs
new file mode 100644
index 0000000000..accd9045eb
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcCoreBuilderExtensions.cs
@@ -0,0 +1,85 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.Formatters.Json;
+using Microsoft.AspNetCore.Mvc.Formatters.Json.Internal;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public static class MvcJsonMvcCoreBuilderExtensions
+    {
+        public static IMvcCoreBuilder AddJsonFormatters(this IMvcCoreBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            AddJsonFormatterServices(builder.Services);
+            return builder;
+        }
+
+        public static IMvcCoreBuilder AddJsonFormatters(
+            this IMvcCoreBuilder builder,
+            Action<JsonSerializerSettings> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (setupAction == null)
+            {
+                throw new ArgumentNullException(nameof(setupAction));
+            }
+
+            AddJsonFormatterServices(builder.Services);
+
+            builder.Services.Configure<MvcJsonOptions>((options) => setupAction(options.SerializerSettings));
+
+            return builder;
+        }
+
+        /// <summary>
+        /// Adds configuration of <see cref="MvcJsonOptions"/> for the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <param name="setupAction">The <see cref="MvcJsonOptions"/> which need to be configured.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        public static IMvcCoreBuilder AddJsonOptions(
+           this IMvcCoreBuilder builder,
+           Action<MvcJsonOptions> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (setupAction == null)
+            {
+                throw new ArgumentNullException(nameof(setupAction));
+            }
+
+            builder.Services.Configure(setupAction);
+            return builder;
+        }
+
+        // Internal for testing.
+        internal static void AddJsonFormatterServices(IServiceCollection services)
+        {
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IConfigureOptions<MvcOptions>, MvcJsonMvcOptionsSetup>());
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IPostConfigureOptions<MvcJsonOptions>, MvcJsonOptionsConfigureCompatibilityOptions>());
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IApiDescriptionProvider, JsonPatchOperationsArrayProvider>());
+            services.TryAddSingleton<JsonResultExecutor>();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/JsonArrayPool.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/JsonArrayPool.cs
new file mode 100644
index 0000000000..437f9bcf98
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/JsonArrayPool.cs
@@ -0,0 +1,39 @@
+// 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.
+
+using System;
+using System.Buffers;
+using Newtonsoft.Json;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Json.Internal
+{
+    public class JsonArrayPool<T> : IArrayPool<T>
+    {
+        private readonly ArrayPool<T> _inner;
+
+        public JsonArrayPool(ArrayPool<T> inner)
+        {
+            if (inner == null)
+            {
+                throw new ArgumentNullException(nameof(inner));
+            }
+
+            _inner = inner;
+        }
+
+        public T[] Rent(int minimumLength)
+        {
+            return _inner.Rent(minimumLength);
+        }
+
+        public void Return(T[] array)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException(nameof(array));
+            }
+
+            _inner.Return(array);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/JsonResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/JsonResultExecutor.cs
new file mode 100644
index 0000000000..f7e2fc09f2
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/JsonResultExecutor.cs
@@ -0,0 +1,136 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.Net.Http.Headers;
+using Newtonsoft.Json;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Json.Internal
+{
+    /// <summary>
+    /// Executes a <see cref="JsonResult"/> to write to the response.
+    /// </summary>
+    public class JsonResultExecutor
+    {
+        private static readonly string DefaultContentType = new MediaTypeHeaderValue("application/json")
+        {
+            Encoding = Encoding.UTF8
+        }.ToString();
+
+        private readonly IArrayPool<char> _charPool;
+
+        /// <summary>
+        /// Creates a new <see cref="JsonResultExecutor"/>.
+        /// </summary>
+        /// <param name="writerFactory">The <see cref="IHttpResponseStreamWriterFactory"/>.</param>
+        /// <param name="logger">The <see cref="ILogger{JsonResultExecutor}"/>.</param>
+        /// <param name="options">The <see cref="IOptions{MvcJsonOptions}"/>.</param>
+        /// <param name="charPool">The <see cref="ArrayPool{Char}"/> for creating <see cref="T:char[]"/> buffers.</param>
+        public JsonResultExecutor(
+            IHttpResponseStreamWriterFactory writerFactory,
+            ILogger<JsonResultExecutor> logger,
+            IOptions<MvcJsonOptions> options,
+            ArrayPool<char> charPool)
+        {
+            if (writerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(writerFactory));
+            }
+
+            if (logger == null)
+            {
+                throw new ArgumentNullException(nameof(logger));
+            }
+
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            if (charPool == null)
+            {
+                throw new ArgumentNullException(nameof(charPool));
+            }
+
+            WriterFactory = writerFactory;
+            Logger = logger;
+            Options = options.Value;
+            _charPool = new JsonArrayPool<char>(charPool);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="ILogger"/>.
+        /// </summary>
+        protected ILogger Logger { get; }
+
+        /// <summary>
+        /// Gets the <see cref="MvcJsonOptions"/>.
+        /// </summary>
+        protected MvcJsonOptions Options { get; }
+
+        /// <summary>
+        /// Gets the <see cref="IHttpResponseStreamWriterFactory"/>.
+        /// </summary>
+        protected IHttpResponseStreamWriterFactory WriterFactory { get; }
+
+        /// <summary>
+        /// Executes the <see cref="JsonResult"/> and writes the response.
+        /// </summary>
+        /// <param name="context">The <see cref="ActionContext"/>.</param>
+        /// <param name="result">The <see cref="JsonResult"/>.</param>
+        /// <returns>A <see cref="Task"/> which will complete when writing has completed.</returns>
+        public virtual Task ExecuteAsync(ActionContext context, JsonResult result)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            var response = context.HttpContext.Response;
+
+            ResponseContentTypeHelper.ResolveContentTypeAndEncoding(
+                result.ContentType,
+                response.ContentType,
+                DefaultContentType,
+                out var resolvedContentType,
+                out var resolvedContentTypeEncoding);
+
+            response.ContentType = resolvedContentType;
+
+            if (result.StatusCode != null)
+            {
+                response.StatusCode = result.StatusCode.Value;
+            }
+
+            var serializerSettings = result.SerializerSettings ?? Options.SerializerSettings;
+
+            Logger.JsonResultExecuting(result.Value);
+            using (var writer = WriterFactory.CreateWriter(response.Body, resolvedContentTypeEncoding))
+            {
+                using (var jsonWriter = new JsonTextWriter(writer))
+                {
+                    jsonWriter.ArrayPool = _charPool;
+                    jsonWriter.CloseOutput = false;
+                    jsonWriter.AutoCompleteOnClose = false;
+
+                    var jsonSerializer = JsonSerializer.Create(serializerSettings);
+                    jsonSerializer.Serialize(jsonWriter, result.Value);
+                }
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/JsonSerializerObjectPolicy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/JsonSerializerObjectPolicy.cs
new file mode 100644
index 0000000000..5cd0a0e3d6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/JsonSerializerObjectPolicy.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using Microsoft.Extensions.ObjectPool;
+using Newtonsoft.Json;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Json.Internal
+{
+    /// <summary>
+    /// <see cref="IPooledObjectPolicy{T}"/> for <see cref="JsonSerializer"/>.
+    /// </summary>
+    public class JsonSerializerObjectPolicy : IPooledObjectPolicy<JsonSerializer>
+    {
+        private readonly JsonSerializerSettings _serializerSettings;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="JsonSerializerObjectPolicy"/>.
+        /// </summary>
+        /// <param name="serializerSettings">The <see cref="JsonSerializerSettings"/> used to instantiate
+        /// <see cref="JsonSerializer"/> instances.</param>
+        public JsonSerializerObjectPolicy(JsonSerializerSettings serializerSettings)
+        {
+            _serializerSettings = serializerSettings;
+        }
+
+        /// <inheritdoc />
+        public JsonSerializer Create() => JsonSerializer.Create(_serializerSettings);
+
+        /// <inheritdoc />
+        public bool Return(JsonSerializer serializer) => true;
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/MediaTypeHeaderValues.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/MediaTypeHeaderValues.cs
new file mode 100644
index 0000000000..d9fb986507
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/MediaTypeHeaderValues.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Json.Internal
+{
+    internal class MediaTypeHeaderValues
+    {
+        public static readonly MediaTypeHeaderValue ApplicationJson
+            = MediaTypeHeaderValue.Parse("application/json").CopyAsReadOnly();
+
+        public static readonly MediaTypeHeaderValue TextJson
+            = MediaTypeHeaderValue.Parse("text/json").CopyAsReadOnly();
+
+        public static readonly MediaTypeHeaderValue ApplicationJsonPatch
+            = MediaTypeHeaderValue.Parse("application/json-patch+json").CopyAsReadOnly();
+
+        public static readonly MediaTypeHeaderValue ApplicationAnyJsonSyntax
+            = MediaTypeHeaderValue.Parse("application/*+json").CopyAsReadOnly();
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/MvcJsonLoggerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/MvcJsonLoggerExtensions.cs
new file mode 100644
index 0000000000..c06d819865
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/MvcJsonLoggerExtensions.cs
@@ -0,0 +1,39 @@
+// 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.
+
+using System;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Json.Internal
+{
+    internal static class MvcJsonLoggerExtensions
+    {
+        private static readonly Action<ILogger, Exception> _jsonInputFormatterCrashed;
+
+        private static readonly Action<ILogger, string, Exception> _jsonResultExecuting;
+
+        static MvcJsonLoggerExtensions()
+        {
+            _jsonInputFormatterCrashed = LoggerMessage.Define(
+                LogLevel.Debug,
+                1,
+                "JSON input formatter threw an exception.");
+
+            _jsonResultExecuting = LoggerMessage.Define<string>(
+                LogLevel.Information,
+                1,
+                "Executing JsonResult, writing value of type '{Type}'.");
+        }
+
+        public static void JsonInputException(this ILogger logger, Exception exception)
+        {
+            _jsonInputFormatterCrashed(logger, exception);
+        }
+
+        public static void JsonResultExecuting(this ILogger logger, object value)
+        {
+            var type = value == null ? "null" : value.GetType().FullName;
+            _jsonResultExecuting(logger, type, null);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/MvcJsonMvcOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/MvcJsonMvcOptionsSetup.cs
new file mode 100644
index 0000000000..33f2b51eac
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/MvcJsonMvcOptionsSetup.cs
@@ -0,0 +1,89 @@
+// 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.
+
+using System;
+using System.Buffers;
+using Microsoft.AspNetCore.JsonPatch;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.ObjectPool;
+using Microsoft.Extensions.Options;
+using Microsoft.Net.Http.Headers;
+using Newtonsoft.Json.Linq;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Json.Internal
+{
+    /// <summary>
+    /// Sets up JSON formatter options for <see cref="MvcOptions"/>.
+    /// </summary>
+    public class MvcJsonMvcOptionsSetup : IConfigureOptions<MvcOptions>
+    {
+        private readonly ILoggerFactory _loggerFactory;
+        private readonly MvcJsonOptions _jsonOptions;
+        private readonly ArrayPool<char> _charPool;
+        private readonly ObjectPoolProvider _objectPoolProvider;
+
+        public MvcJsonMvcOptionsSetup(
+            ILoggerFactory loggerFactory,
+            IOptions<MvcJsonOptions> jsonOptions,
+            ArrayPool<char> charPool,
+            ObjectPoolProvider objectPoolProvider)
+        {
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            if (jsonOptions == null)
+            {
+                throw new ArgumentNullException(nameof(jsonOptions));
+            }
+
+            if (charPool == null)
+            {
+                throw new ArgumentNullException(nameof(charPool));
+            }
+
+            if (objectPoolProvider == null)
+            {
+                throw new ArgumentNullException(nameof(objectPoolProvider));
+            }
+
+            _loggerFactory = loggerFactory;
+            _jsonOptions = jsonOptions.Value;
+            _charPool = charPool;
+            _objectPoolProvider = objectPoolProvider;
+        }
+
+        public void Configure(MvcOptions options)
+        {
+            options.OutputFormatters.Add(new JsonOutputFormatter(_jsonOptions.SerializerSettings, _charPool));
+
+            // Register JsonPatchInputFormatter before JsonInputFormatter, otherwise
+            // JsonInputFormatter would consume "application/json-patch+json" requests
+            // before JsonPatchInputFormatter gets to see them.
+            var jsonInputPatchLogger = _loggerFactory.CreateLogger<JsonPatchInputFormatter>();
+            options.InputFormatters.Add(new JsonPatchInputFormatter(
+                jsonInputPatchLogger,
+                _jsonOptions.SerializerSettings,
+                _charPool,
+                _objectPoolProvider,
+                options,
+                _jsonOptions));
+
+            var jsonInputLogger = _loggerFactory.CreateLogger<JsonInputFormatter>();
+            options.InputFormatters.Add(new JsonInputFormatter(
+                jsonInputLogger,
+                _jsonOptions.SerializerSettings,
+                _charPool,
+                _objectPoolProvider,
+                options,
+                _jsonOptions));
+
+            options.FormatterMappings.SetMediaTypeMappingForFormat("json", MediaTypeHeaderValues.ApplicationJson);
+
+            options.ModelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider(typeof(IJsonPatchDocument)));
+            options.ModelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider(typeof(JToken)));
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonInputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonInputFormatter.cs
new file mode 100644
index 0000000000..cc21792d71
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonInputFormatter.cs
@@ -0,0 +1,438 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.ExceptionServices;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Formatters.Json.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.ObjectPool;
+using Newtonsoft.Json;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// A <see cref="TextInputFormatter"/> for JSON content.
+    /// </summary>
+    public class JsonInputFormatter : TextInputFormatter, IInputFormatterExceptionPolicy
+    {
+        private readonly IArrayPool<char> _charPool;
+        private readonly ILogger _logger;
+        private readonly ObjectPoolProvider _objectPoolProvider;
+        private readonly MvcOptions _options;
+        private readonly MvcJsonOptions _jsonOptions;
+
+        // These fields are used when one of the legacy constructors is called that doesn't provide the MvcOptions or
+        // MvcJsonOptions.
+        private readonly bool _suppressInputFormatterBuffering;
+        private readonly bool _allowInputFormatterExceptionMessages;
+
+        private ObjectPool<JsonSerializer> _jsonSerializerPool;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="JsonInputFormatter"/>.
+        /// </summary>
+        /// <param name="logger">The <see cref="ILogger"/>.</param>
+        /// <param name="serializerSettings">
+        /// The <see cref="JsonSerializerSettings"/>. Should be either the application-wide settings
+        /// (<see cref="MvcJsonOptions.SerializerSettings"/>) or an instance
+        /// <see cref="JsonSerializerSettingsProvider.CreateSerializerSettings"/> initially returned.
+        /// </param>
+        /// <param name="charPool">The <see cref="ArrayPool{Char}"/>.</param>
+        /// <param name="objectPoolProvider">The <see cref="ObjectPoolProvider"/>.</param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version.")]
+        public JsonInputFormatter(
+            ILogger logger,
+            JsonSerializerSettings serializerSettings,
+            ArrayPool<char> charPool,
+            ObjectPoolProvider objectPoolProvider) :
+            this(logger, serializerSettings, charPool, objectPoolProvider, suppressInputFormatterBuffering: false)
+        {
+            // This constructor by default buffers the request body as its the most secure setting
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="JsonInputFormatter"/>.
+        /// </summary>
+        /// <param name="logger">The <see cref="ILogger"/>.</param>
+        /// <param name="serializerSettings">
+        /// The <see cref="JsonSerializerSettings"/>. Should be either the application-wide settings
+        /// (<see cref="MvcJsonOptions.SerializerSettings"/>) or an instance
+        /// <see cref="JsonSerializerSettingsProvider.CreateSerializerSettings"/> initially returned.
+        /// </param>
+        /// <param name="charPool">The <see cref="ArrayPool{Char}"/>.</param>
+        /// <param name="objectPoolProvider">The <see cref="ObjectPoolProvider"/>.</param>
+        /// <param name="suppressInputFormatterBuffering">Flag to buffer entire request body before deserializing it.</param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version.")]
+        public JsonInputFormatter(
+            ILogger logger,
+            JsonSerializerSettings serializerSettings,
+            ArrayPool<char> charPool,
+            ObjectPoolProvider objectPoolProvider,
+            bool suppressInputFormatterBuffering)
+            : this(logger, serializerSettings, charPool, objectPoolProvider, suppressInputFormatterBuffering, allowInputFormatterExceptionMessages: false)
+        {
+            // This constructor by default treats JSON deserialization exceptions as unsafe
+            // because this is the default in 2.0
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="JsonInputFormatter"/>.
+        /// </summary>
+        /// <param name="logger">The <see cref="ILogger"/>.</param>
+        /// <param name="serializerSettings">
+        /// The <see cref="JsonSerializerSettings"/>. Should be either the application-wide settings
+        /// (<see cref="MvcJsonOptions.SerializerSettings"/>) or an instance
+        /// <see cref="JsonSerializerSettingsProvider.CreateSerializerSettings"/> initially returned.
+        /// </param>
+        /// <param name="charPool">The <see cref="ArrayPool{Char}"/>.</param>
+        /// <param name="objectPoolProvider">The <see cref="ObjectPoolProvider"/>.</param>
+        /// <param name="suppressInputFormatterBuffering">Flag to buffer entire request body before deserializing it.</param>
+        /// <param name="allowInputFormatterExceptionMessages">If <see langword="true"/>, JSON deserialization exception messages will replaced by a generic message in model state.</param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version.")]
+        public JsonInputFormatter(
+            ILogger logger,
+            JsonSerializerSettings serializerSettings,
+            ArrayPool<char> charPool,
+            ObjectPoolProvider objectPoolProvider,
+            bool suppressInputFormatterBuffering,
+            bool allowInputFormatterExceptionMessages)
+        {
+            if (logger == null)
+            {
+                throw new ArgumentNullException(nameof(logger));
+            }
+
+            if (serializerSettings == null)
+            {
+                throw new ArgumentNullException(nameof(serializerSettings));
+            }
+
+            if (charPool == null)
+            {
+                throw new ArgumentNullException(nameof(charPool));
+            }
+
+            if (objectPoolProvider == null)
+            {
+                throw new ArgumentNullException(nameof(objectPoolProvider));
+            }
+
+            _logger = logger;
+            SerializerSettings = serializerSettings;
+            _charPool = new JsonArrayPool<char>(charPool);
+            _objectPoolProvider = objectPoolProvider;
+            _suppressInputFormatterBuffering = suppressInputFormatterBuffering;
+            _allowInputFormatterExceptionMessages = allowInputFormatterExceptionMessages;
+
+            SupportedEncodings.Add(UTF8EncodingWithoutBOM);
+            SupportedEncodings.Add(UTF16EncodingLittleEndian);
+
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.ApplicationJson);
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.TextJson);
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.ApplicationAnyJsonSyntax);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="JsonInputFormatter"/>.
+        /// </summary>
+        /// <param name="logger">The <see cref="ILogger"/>.</param>
+        /// <param name="serializerSettings">
+        /// The <see cref="JsonSerializerSettings"/>. Should be either the application-wide settings
+        /// (<see cref="MvcJsonOptions.SerializerSettings"/>) or an instance
+        /// <see cref="JsonSerializerSettingsProvider.CreateSerializerSettings"/> initially returned.
+        /// </param>
+        /// <param name="charPool">The <see cref="ArrayPool{Char}"/>.</param>
+        /// <param name="objectPoolProvider">The <see cref="ObjectPoolProvider"/>.</param>
+        /// <param name="options">The <see cref="MvcOptions"/>.</param>
+        /// <param name="jsonOptions">The <see cref="MvcJsonOptions"/>.</param>
+        public JsonInputFormatter(
+            ILogger logger,
+            JsonSerializerSettings serializerSettings,
+            ArrayPool<char> charPool,
+            ObjectPoolProvider objectPoolProvider,
+            MvcOptions options,
+            MvcJsonOptions jsonOptions)
+        {
+            if (logger == null)
+            {
+                throw new ArgumentNullException(nameof(logger));
+            }
+
+            if (serializerSettings == null)
+            {
+                throw new ArgumentNullException(nameof(serializerSettings));
+            }
+
+            if (charPool == null)
+            {
+                throw new ArgumentNullException(nameof(charPool));
+            }
+
+            if (objectPoolProvider == null)
+            {
+                throw new ArgumentNullException(nameof(objectPoolProvider));
+            }
+
+            _logger = logger;
+            SerializerSettings = serializerSettings;
+            _charPool = new JsonArrayPool<char>(charPool);
+            _objectPoolProvider = objectPoolProvider;
+            _options = options;
+            _jsonOptions = jsonOptions;
+
+            SupportedEncodings.Add(UTF8EncodingWithoutBOM);
+            SupportedEncodings.Add(UTF16EncodingLittleEndian);
+
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.ApplicationJson);
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.TextJson);
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.ApplicationAnyJsonSyntax);
+        }
+
+        /// <inheritdoc />
+        public virtual InputFormatterExceptionPolicy ExceptionPolicy
+        {
+            get
+            {
+                if (GetType() == typeof(JsonInputFormatter))
+                {
+                    return InputFormatterExceptionPolicy.MalformedInputExceptions;
+                }
+                return InputFormatterExceptionPolicy.AllExceptions;
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="JsonSerializerSettings"/> used to configure the <see cref="JsonSerializer"/>.
+        /// </summary>
+        /// <remarks>
+        /// Any modifications to the <see cref="JsonSerializerSettings"/> object after this
+        /// <see cref="JsonInputFormatter"/> has been used will have no effect.
+        /// </remarks>
+        protected JsonSerializerSettings SerializerSettings { get; }
+
+        /// <inheritdoc />
+        public override async Task<InputFormatterResult> ReadRequestBodyAsync(
+            InputFormatterContext context,
+            Encoding encoding)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (encoding == null)
+            {
+                throw new ArgumentNullException(nameof(encoding));
+            }
+
+            var request = context.HttpContext.Request;
+
+            var suppressInputFormatterBuffering = _options?.SuppressInputFormatterBuffering ?? _suppressInputFormatterBuffering;
+
+            if (!request.Body.CanSeek && !suppressInputFormatterBuffering)
+            {
+                // JSON.Net does synchronous reads. In order to avoid blocking on the stream, we asynchronously
+                // read everything into a buffer, and then seek back to the beginning.
+                request.EnableBuffering();
+                Debug.Assert(request.Body.CanSeek);
+
+                await request.Body.DrainAsync(CancellationToken.None);
+                request.Body.Seek(0L, SeekOrigin.Begin);
+            }
+
+            using (var streamReader = context.ReaderFactory(request.Body, encoding))
+            {
+                using (var jsonReader = new JsonTextReader(streamReader))
+                {
+                    jsonReader.ArrayPool = _charPool;
+                    jsonReader.CloseInput = false;
+
+                    var successful = true;
+                    Exception exception = null;
+                    void ErrorHandler(object sender, Newtonsoft.Json.Serialization.ErrorEventArgs eventArgs)
+                    {
+                        successful = false;
+
+                        // Handle path combinations such as "" + "Property", "Parent" + "Property", or "Parent" + "[12]".
+                        var key = eventArgs.ErrorContext.Path;
+                        if (!string.IsNullOrEmpty(context.ModelName))
+                        {
+                            if (string.IsNullOrEmpty(eventArgs.ErrorContext.Path))
+                            {
+                                key = context.ModelName;
+                            }
+                            else if (eventArgs.ErrorContext.Path[0] == '[')
+                            {
+                                key = context.ModelName + eventArgs.ErrorContext.Path;
+                            }
+                            else
+                            {
+                                key = context.ModelName + "." + eventArgs.ErrorContext.Path;
+                            }
+                        }
+
+                        var metadata = GetPathMetadata(context.Metadata, eventArgs.ErrorContext.Path);
+                        var modelStateException = WrapExceptionForModelState(eventArgs.ErrorContext.Error);
+                        context.ModelState.TryAddModelError(key, modelStateException, metadata);
+
+                        _logger.JsonInputException(eventArgs.ErrorContext.Error);
+
+                        exception = eventArgs.ErrorContext.Error;
+
+                        // Error must always be marked as handled
+                        // Failure to do so can cause the exception to be rethrown at every recursive level and
+                        // overflow the stack for x64 CLR processes
+                        eventArgs.ErrorContext.Handled = true;
+                    }
+
+                    var type = context.ModelType;
+                    var jsonSerializer = CreateJsonSerializer();
+                    jsonSerializer.Error += ErrorHandler;
+                    object model;
+                    try
+                    {
+                        model = jsonSerializer.Deserialize(jsonReader, type);
+                    }
+                    finally
+                    {
+                        // Clean up the error handler since CreateJsonSerializer() pools instances.
+                        jsonSerializer.Error -= ErrorHandler;
+                        ReleaseJsonSerializer(jsonSerializer);
+                    }
+
+                    if (successful)
+                    {
+                        if (model == null && !context.TreatEmptyInputAsDefaultValue)
+                        {
+                            // Some nonempty inputs might deserialize as null, for example whitespace,
+                            // or the JSON-encoded value "null". The upstream BodyModelBinder needs to
+                            // be notified that we don't regard this as a real input so it can register
+                            // a model binding error.
+                            return InputFormatterResult.NoValue();
+                        }
+                        else
+                        {
+                            return InputFormatterResult.Success(model);
+                        }
+                    }
+
+                    if (!(exception is JsonException || exception is OverflowException))
+                    {
+                        var exceptionDispatchInfo = ExceptionDispatchInfo.Capture(exception);
+                        exceptionDispatchInfo.Throw();
+                    }
+
+                    return InputFormatterResult.Failure();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called during deserialization to get the <see cref="JsonSerializer"/>.
+        /// </summary>
+        /// <returns>The <see cref="JsonSerializer"/> used during deserialization.</returns>
+        /// <remarks>
+        /// This method works in tandem with <see cref="ReleaseJsonSerializer(JsonSerializer)"/> to
+        /// manage the lifetimes of <see cref="JsonSerializer"/> instances.
+        /// </remarks>
+        protected virtual JsonSerializer CreateJsonSerializer()
+        {
+            if (_jsonSerializerPool == null)
+            {
+                _jsonSerializerPool = _objectPoolProvider.Create(new JsonSerializerObjectPolicy(SerializerSettings));
+            }
+
+            return _jsonSerializerPool.Get();
+        }
+
+        /// <summary>
+        /// Releases the <paramref name="serializer"/> instance.
+        /// </summary>
+        /// <param name="serializer">The <see cref="JsonSerializer"/> to release.</param>
+        /// <remarks>
+        /// This method works in tandem with <see cref="ReleaseJsonSerializer(JsonSerializer)"/> to
+        /// manage the lifetimes of <see cref="JsonSerializer"/> instances.
+        /// </remarks>
+        protected virtual void ReleaseJsonSerializer(JsonSerializer serializer)
+            => _jsonSerializerPool.Return(serializer);
+
+        private ModelMetadata GetPathMetadata(ModelMetadata metadata, string path)
+        {
+            var index = 0;
+            while (index >= 0 && index < path.Length)
+            {
+                if (path[index] == '[')
+                {
+                    // At start of "[0]".
+                    if (metadata.ElementMetadata == null)
+                    {
+                        // Odd case but don't throw just because ErrorContext had an odd-looking path.
+                        break;
+                    }
+
+                    metadata = metadata.ElementMetadata;
+                    index = path.IndexOf(']', index);
+                }
+                else if (path[index] == '.' || path[index] == ']')
+                {
+                    // Skip '.' in "prefix.property" or "[0].property" or ']' in "[0]".
+                    index++;
+                }
+                else
+                {
+                    // At start of "property", "property." or "property[0]".
+                    var endIndex = path.IndexOfAny(new[] { '.', '[' }, index);
+                    if (endIndex == -1)
+                    {
+                        endIndex = path.Length;
+                    }
+
+                    var propertyName = path.Substring(index, endIndex - index);
+                    if (metadata.Properties[propertyName] == null)
+                    {
+                        // Odd case but don't throw just because ErrorContext had an odd-looking path.
+                        break;
+                    }
+
+                    metadata = metadata.Properties[propertyName];
+                    index = endIndex;
+                }
+            }
+
+            return metadata;
+        }
+
+        private Exception WrapExceptionForModelState(Exception exception)
+        {
+            // In 2.0 and earlier we always gave a generic error message for errors that come from JSON.NET
+            // We only allow it in 2.1 and newer if the app opts-in.
+            if (!(_jsonOptions?.AllowInputFormatterExceptionMessages ?? _allowInputFormatterExceptionMessages))
+            {
+                // This app is not opted-in to JSON.NET messages, return the original exception.
+                return exception;
+            }
+
+            // It's not known that Json.NET currently ever raises error events with exceptions
+            // other than these two types, but we're being conservative and limiting which ones
+            // we regard as having safe messages to expose to clients
+            if (exception is JsonReaderException || exception is JsonSerializationException)
+            {
+                // InputFormatterException specifies that the message is safe to return to a client, it will
+                // be added to model state.
+                return new InputFormatterException(exception.Message, exception);
+            }
+
+            // Not a known exception type, so we're not going to assume that it's safe.
+            return exception;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonOutputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonOutputFormatter.cs
new file mode 100644
index 0000000000..744d558680
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonOutputFormatter.cs
@@ -0,0 +1,157 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.ComponentModel;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Formatters.Json.Internal;
+using Newtonsoft.Json;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// A <see cref="TextOutputFormatter"/> for JSON content.
+    /// </summary>
+    public class JsonOutputFormatter : TextOutputFormatter
+    {
+        private readonly IArrayPool<char> _charPool;
+
+        // Perf: JsonSerializers are relatively expensive to create, and are thread safe. We cache
+        // the serializer and invalidate it when the settings change.
+        private JsonSerializer _serializer;
+
+        /// <summary>
+        /// Initializes a new <see cref="JsonOutputFormatter"/> instance.
+        /// </summary>
+        /// <param name="serializerSettings">
+        /// The <see cref="JsonSerializerSettings"/>. Should be either the application-wide settings
+        /// (<see cref="MvcJsonOptions.SerializerSettings"/>) or an instance
+        /// <see cref="JsonSerializerSettingsProvider.CreateSerializerSettings"/> initially returned.
+        /// </param>
+        /// <param name="charPool">The <see cref="ArrayPool{Char}"/>.</param>
+        public JsonOutputFormatter(JsonSerializerSettings serializerSettings, ArrayPool<char> charPool)
+        {
+            if (serializerSettings == null)
+            {
+                throw new ArgumentNullException(nameof(serializerSettings));
+            }
+
+            if (charPool == null)
+            {
+                throw new ArgumentNullException(nameof(charPool));
+            }
+
+            SerializerSettings = serializerSettings;
+            _charPool = new JsonArrayPool<char>(charPool);
+
+            SupportedEncodings.Add(Encoding.UTF8);
+            SupportedEncodings.Add(Encoding.Unicode);
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.ApplicationJson);
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.TextJson);
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.ApplicationAnyJsonSyntax);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="JsonSerializerSettings"/> used to configure the <see cref="JsonSerializer"/>.
+        /// </summary>
+        /// <remarks>
+        /// Any modifications to the <see cref="JsonSerializerSettings"/> object after this
+        /// <see cref="JsonOutputFormatter"/> has been used will have no effect.
+        /// </remarks>
+        protected JsonSerializerSettings SerializerSettings { get; }
+
+        /// <summary>
+        /// Gets the <see cref="JsonSerializerSettings"/> used to configure the <see cref="JsonSerializer"/>.
+        /// </summary>
+        /// <remarks>
+        /// Any modifications to the <see cref="JsonSerializerSettings"/> object after this
+        /// <see cref="JsonOutputFormatter"/> has been used will have no effect.
+        /// </remarks>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public JsonSerializerSettings PublicSerializerSettings => SerializerSettings;
+
+        /// <summary>
+        /// Writes the given <paramref name="value"/> as JSON using the given
+        /// <paramref name="writer"/>.
+        /// </summary>
+        /// <param name="writer">The <see cref="TextWriter"/> used to write the <paramref name="value"/></param>
+        /// <param name="value">The value to write as JSON.</param>
+        public void WriteObject(TextWriter writer, object value)
+        {
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
+            using (var jsonWriter = CreateJsonWriter(writer))
+            {
+                var jsonSerializer = CreateJsonSerializer();
+                jsonSerializer.Serialize(jsonWriter, value);
+            }
+        }
+
+        /// <summary>
+        /// Called during serialization to create the <see cref="JsonWriter"/>.
+        /// </summary>
+        /// <param name="writer">The <see cref="TextWriter"/> used to write.</param>
+        /// <returns>The <see cref="JsonWriter"/> used during serialization.</returns>
+        protected virtual JsonWriter CreateJsonWriter(TextWriter writer)
+        {
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
+            var jsonWriter = new JsonTextWriter(writer)
+            {
+                ArrayPool = _charPool,
+                CloseOutput = false,
+                AutoCompleteOnClose = false
+            };
+
+            return jsonWriter;
+        }
+
+        /// <summary>
+        /// Called during serialization to create the <see cref="JsonSerializer"/>.
+        /// </summary>
+        /// <returns>The <see cref="JsonSerializer"/> used during serialization and deserialization.</returns>
+        protected virtual JsonSerializer CreateJsonSerializer()
+        {
+            if (_serializer == null)
+            {
+                _serializer = JsonSerializer.Create(SerializerSettings);
+            }
+
+            return _serializer;
+        }
+
+        /// <inheritdoc />
+        public override async Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (selectedEncoding == null)
+            {
+                throw new ArgumentNullException(nameof(selectedEncoding));
+            }
+
+            var response = context.HttpContext.Response;
+            using (var writer = context.WriterFactory(response.Body, selectedEncoding))
+            {
+                WriteObject(writer, context.Object);
+
+                // Perf: call FlushAsync to call WriteAsync on the stream with any content left in the TextWriter's
+                // buffers. This is better than just letting dispose handle it (which would result in a synchronous
+                // write).
+                await writer.FlushAsync();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchExtensions.cs
new file mode 100644
index 0000000000..e94b221f69
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchExtensions.cs
@@ -0,0 +1,81 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.JsonPatch;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Extensions for <see cref="JsonPatchDocument{T}"/>
+    /// </summary>
+    public static class JsonPatchExtensions
+    {
+        /// <summary>
+        /// Applies JSON patch operations on object and logs errors in <see cref="ModelStateDictionary"/>.
+        /// </summary>
+        /// <param name="patchDoc">The <see cref="JsonPatchDocument{T}"/>.</param>
+        /// <param name="objectToApplyTo">The entity on which <see cref="JsonPatchDocument{T}"/> is applied.</param>
+        /// <param name="modelState">The <see cref="ModelStateDictionary"/> to add errors.</param>
+        public static void ApplyTo<T>(
+            this JsonPatchDocument<T> patchDoc,
+            T objectToApplyTo,
+            ModelStateDictionary modelState) where T : class
+        {
+            if (patchDoc == null)
+            {
+                throw new ArgumentNullException(nameof(patchDoc));
+            }
+
+            if (objectToApplyTo == null)
+            {
+                throw new ArgumentNullException(nameof(objectToApplyTo));
+            }
+
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            patchDoc.ApplyTo(objectToApplyTo, modelState, prefix: string.Empty);
+        }
+
+        /// <summary>
+        /// Applies JSON patch operations on object and logs errors in <see cref="ModelStateDictionary"/>.
+        /// </summary>
+        /// <param name="patchDoc">The <see cref="JsonPatchDocument{T}"/>.</param>
+        /// <param name="objectToApplyTo">The entity on which <see cref="JsonPatchDocument{T}"/> is applied.</param>
+        /// <param name="modelState">The <see cref="ModelStateDictionary"/> to add errors.</param>
+        /// <param name="prefix">The prefix to use when looking up values in <see cref="ModelStateDictionary"/>.</param>
+        public static void ApplyTo<T>(
+            this JsonPatchDocument<T> patchDoc,
+            T objectToApplyTo,
+            ModelStateDictionary modelState,
+            string prefix) where T : class
+        {
+            if (patchDoc == null)
+            {
+                throw new ArgumentNullException(nameof(patchDoc));
+            }
+
+            if (objectToApplyTo == null)
+            {
+                throw new ArgumentNullException(nameof(objectToApplyTo));
+            }
+
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            patchDoc.ApplyTo(objectToApplyTo, jsonPatchError =>
+            {
+                var affectedObjectName = jsonPatchError.AffectedObject.GetType().Name;
+                var key = string.IsNullOrEmpty(prefix) ? affectedObjectName : prefix + "." + affectedObjectName;
+
+                modelState.TryAddModelError(key, jsonPatchError.ErrorMessage);
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchInputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchInputFormatter.cs
new file mode 100644
index 0000000000..96549d44d5
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchInputFormatter.cs
@@ -0,0 +1,184 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.JsonPatch;
+using Microsoft.AspNetCore.Mvc.Formatters.Json.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.ObjectPool;
+using Newtonsoft.Json;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// A <see cref="TextInputFormatter"/> for JSON Patch (application/json-patch+json) content.
+    /// </summary>
+    public class JsonPatchInputFormatter : JsonInputFormatter
+    {
+        /// <summary>
+        /// Initializes a new <see cref="JsonPatchInputFormatter"/> instance.
+        /// </summary>
+        /// <param name="logger">The <see cref="ILogger"/>.</param>
+        /// <param name="serializerSettings">
+        /// The <see cref="JsonSerializerSettings"/>. Should be either the application-wide settings
+        /// (<see cref="MvcJsonOptions.SerializerSettings"/>) or an instance
+        /// <see cref="JsonSerializerSettingsProvider.CreateSerializerSettings"/> initially returned.
+        /// </param>
+        /// <param name="charPool">The <see cref="ArrayPool{Char}"/>.</param>
+        /// <param name="objectPoolProvider">The <see cref="ObjectPoolProvider"/>.</param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version.")]
+        public JsonPatchInputFormatter(
+            ILogger logger,
+            JsonSerializerSettings serializerSettings,
+            ArrayPool<char> charPool,
+            ObjectPoolProvider objectPoolProvider)
+            : this(logger, serializerSettings, charPool, objectPoolProvider, suppressInputFormatterBuffering: false)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new <see cref="JsonPatchInputFormatter"/> instance.
+        /// </summary>
+        /// <param name="logger">The <see cref="ILogger"/>.</param>
+        /// <param name="serializerSettings">
+        /// The <see cref="JsonSerializerSettings"/>. Should be either the application-wide settings
+        /// (<see cref="MvcJsonOptions.SerializerSettings"/>) or an instance
+        /// <see cref="JsonSerializerSettingsProvider.CreateSerializerSettings"/> initially returned.
+        /// </param>
+        /// <param name="charPool">The <see cref="ArrayPool{Char}"/>.</param>
+        /// <param name="objectPoolProvider">The <see cref="ObjectPoolProvider"/>.</param>
+        /// <param name="suppressInputFormatterBuffering">Flag to buffer entire request body before deserializing it.</param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version.")]
+        public JsonPatchInputFormatter(
+            ILogger logger,
+            JsonSerializerSettings serializerSettings,
+            ArrayPool<char> charPool,
+            ObjectPoolProvider objectPoolProvider,
+            bool suppressInputFormatterBuffering)
+            : this(logger, serializerSettings, charPool, objectPoolProvider, suppressInputFormatterBuffering, allowInputFormatterExceptionMessages: false)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new <see cref="JsonPatchInputFormatter"/> instance.
+        /// </summary>
+        /// <param name="logger">The <see cref="ILogger"/>.</param>
+        /// <param name="serializerSettings">
+        /// The <see cref="JsonSerializerSettings"/>. Should be either the application-wide settings
+        /// (<see cref="MvcJsonOptions.SerializerSettings"/>) or an instance
+        /// <see cref="JsonSerializerSettingsProvider.CreateSerializerSettings"/> initially returned.
+        /// </param>
+        /// <param name="charPool">The <see cref="ArrayPool{Char}"/>.</param>
+        /// <param name="objectPoolProvider">The <see cref="ObjectPoolProvider"/>.</param>
+        /// <param name="suppressInputFormatterBuffering">Flag to buffer entire request body before deserializing it.</param>
+        /// <param name="allowInputFormatterExceptionMessages">
+        /// If <see langword="false"/>, JSON deserialization exception messages will replaced by a generic message in model state.
+        /// </param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version.")]
+        public JsonPatchInputFormatter(
+            ILogger logger,
+            JsonSerializerSettings serializerSettings,
+            ArrayPool<char> charPool,
+            ObjectPoolProvider objectPoolProvider,
+            bool suppressInputFormatterBuffering,
+            bool allowInputFormatterExceptionMessages)
+            : base(logger, serializerSettings, charPool, objectPoolProvider, suppressInputFormatterBuffering, allowInputFormatterExceptionMessages)
+        {
+            // Clear all values and only include json-patch+json value.
+            SupportedMediaTypes.Clear();
+
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.ApplicationJsonPatch);
+        }
+
+        /// <summary>
+        /// Initializes a new <see cref="JsonPatchInputFormatter"/> instance.
+        /// </summary>
+        /// <param name="logger">The <see cref="ILogger"/>.</param>
+        /// <param name="serializerSettings">
+        /// The <see cref="JsonSerializerSettings"/>. Should be either the application-wide settings
+        /// (<see cref="MvcJsonOptions.SerializerSettings"/>) or an instance
+        /// <see cref="JsonSerializerSettingsProvider.CreateSerializerSettings"/> initially returned.
+        /// </param>
+        /// <param name="charPool">The <see cref="ArrayPool{Char}"/>.</param>
+        /// <param name="objectPoolProvider">The <see cref="ObjectPoolProvider"/>.</param>
+        /// <param name="options">The <see cref="MvcOptions"/>.</param>
+        /// <param name="jsonOptions">The <see cref="MvcJsonOptions"/>.</param>
+        public JsonPatchInputFormatter(
+            ILogger logger,
+            JsonSerializerSettings serializerSettings,
+            ArrayPool<char> charPool,
+            ObjectPoolProvider objectPoolProvider,
+            MvcOptions options,
+            MvcJsonOptions jsonOptions)
+            : base(logger, serializerSettings, charPool, objectPoolProvider, options, jsonOptions)
+        {
+            // Clear all values and only include json-patch+json value.
+            SupportedMediaTypes.Clear();
+
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.ApplicationJsonPatch);
+        }
+        
+        /// <inheritdoc />
+        public override InputFormatterExceptionPolicy ExceptionPolicy
+        {
+            get
+            {
+                if (GetType() == typeof(JsonPatchInputFormatter))
+                {
+                    return InputFormatterExceptionPolicy.MalformedInputExceptions;
+                }
+                return InputFormatterExceptionPolicy.AllExceptions;
+            }
+        }
+
+        /// <inheritdoc />
+        public async override Task<InputFormatterResult> ReadRequestBodyAsync(
+            InputFormatterContext context,
+            Encoding encoding)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (encoding == null)
+            {
+                throw new ArgumentNullException(nameof(encoding));
+            }
+
+            var result = await base.ReadRequestBodyAsync(context, encoding);
+            if (!result.HasError)
+            {
+                var jsonPatchDocument = (IJsonPatchDocument)result.Model;
+                if (jsonPatchDocument != null && SerializerSettings.ContractResolver != null)
+                {
+                    jsonPatchDocument.ContractResolver = SerializerSettings.ContractResolver;
+                }
+            }
+
+            return result;
+        }
+
+        /// <inheritdoc />
+        public override bool CanRead(InputFormatterContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var modelTypeInfo = context.ModelType.GetTypeInfo();
+            if (!typeof(IJsonPatchDocument).GetTypeInfo().IsAssignableFrom(modelTypeInfo) ||
+                !modelTypeInfo.IsGenericType)
+            {
+                return false;
+            }
+
+            return base.CanRead(context);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchOperationsArrayProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchOperationsArrayProvider.cs
new file mode 100644
index 0000000000..840df5fdf8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchOperationsArrayProvider.cs
@@ -0,0 +1,62 @@
+// 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.
+
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.JsonPatch;
+using Microsoft.AspNetCore.JsonPatch.Operations;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Json
+{
+    /// <summary>
+    /// Implements a provider of <see cref="ApiDescription"/> to change parameters of 
+    /// type <see cref="IJsonPatchDocument"/> to an array of <see cref="Operation"/>.
+    /// </summary>
+    public class JsonPatchOperationsArrayProvider : IApiDescriptionProvider
+    {
+        private readonly IModelMetadataProvider _modelMetadataProvider;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="JsonPatchOperationsArrayProvider"/>.
+        /// </summary>        
+        /// <param name="modelMetadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
+        public JsonPatchOperationsArrayProvider(IModelMetadataProvider modelMetadataProvider)
+        {
+            _modelMetadataProvider = modelMetadataProvider;
+        }
+
+        /// <inheritdoc />
+        /// <remarks>
+        /// The order -999 ensures that this provider is executed right after the <c>Microsoft.AspNetCore.Mvc.ApiExplorer.DefaultApiDescriptionProvider</c>.
+        /// </remarks>
+        public int Order => -999;
+
+        /// <inheritdoc />
+        public void OnProvidersExecuting(ApiDescriptionProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            foreach (var result in context.Results)
+            {
+                foreach (var parameterDescription in result.ParameterDescriptions)
+                {
+                    if (typeof(IJsonPatchDocument).GetTypeInfo().IsAssignableFrom(parameterDescription.Type))
+                    {
+                        parameterDescription.Type = typeof(Operation[]);
+                        parameterDescription.ModelMetadata = _modelMetadataProvider.GetMetadataForType(typeof(Operation[]));
+                    }
+                }
+            }
+        }
+
+        /// <inheritdoc />
+        public void OnProvidersExecuted(ApiDescriptionProviderContext context)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonResult.cs
new file mode 100644
index 0000000000..4380224057
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonResult.cs
@@ -0,0 +1,76 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Formatters.Json.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An action result which formats the given object as JSON.
+    /// </summary>
+    public class JsonResult : ActionResult
+    {
+        /// <summary>
+        /// Creates a new <see cref="JsonResult"/> with the given <paramref name="value"/>.
+        /// </summary>
+        /// <param name="value">The value to format as JSON.</param>
+        public JsonResult(object value)
+        {
+            Value = value;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="JsonResult"/> with the given <paramref name="value"/>.
+        /// </summary>
+        /// <param name="value">The value to format as JSON.</param>
+        /// <param name="serializerSettings">The <see cref="JsonSerializerSettings"/> to be used by
+        /// the formatter.</param>
+        public JsonResult(object value, JsonSerializerSettings serializerSettings)
+        {
+            if (serializerSettings == null)
+            {
+                throw new ArgumentNullException(nameof(serializerSettings));
+            }
+
+            Value = value;
+            SerializerSettings = serializerSettings;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Net.Http.Headers.MediaTypeHeaderValue"/> representing the Content-Type header of the response.
+        /// </summary>
+        public string ContentType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="JsonSerializerSettings"/>.
+        /// </summary>
+        public JsonSerializerSettings SerializerSettings { get; set; }
+
+        /// <summary>
+        /// Gets or sets the HTTP status code.
+        /// </summary>
+        public int? StatusCode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the value to be formatted.
+        /// </summary>
+        public object Value { get; set; }
+
+        /// <inheritdoc />
+        public override Task ExecuteResultAsync(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var services = context.HttpContext.RequestServices;
+            var executor = services.GetRequiredService<JsonResultExecutor>();
+            return executor.ExecuteAsync(context, this);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonSerializerSettingsProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonSerializerSettingsProvider.cs
new file mode 100644
index 0000000000..8b6761559d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonSerializerSettingsProvider.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// Helper class which provides <see cref="JsonSerializerSettings"/>.
+    /// </summary>
+    public static class JsonSerializerSettingsProvider
+    {
+        private const int DefaultMaxDepth = 32;
+
+        // return shared resolver by default for perf so slow reflection logic is cached once
+        // developers can set their own resolver after the settings are returned if desired
+        private static readonly DefaultContractResolver SharedContractResolver = new DefaultContractResolver
+        {
+            NamingStrategy = new CamelCaseNamingStrategy(),
+        };
+
+        /// <summary>
+        /// Creates default <see cref="JsonSerializerSettings"/>.
+        /// </summary>
+        /// <returns>Default <see cref="JsonSerializerSettings"/>.</returns>
+        public static JsonSerializerSettings CreateSerializerSettings()
+        {
+            return new JsonSerializerSettings
+            {
+                ContractResolver = SharedContractResolver,
+
+                MissingMemberHandling = MissingMemberHandling.Ignore,
+
+                // Limit the object graph we'll consume to a fixed depth. This prevents stackoverflow exceptions
+                // from deserialization errors that might occur from deeply nested objects.
+                MaxDepth = DefaultMaxDepth,
+
+                // Do not change this setting
+                // Setting this to None prevents Json.NET from loading malicious, unsafe, or security-sensitive types
+                TypeNameHandling = TypeNameHandling.None,
+            };
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj
new file mode 100644
index 0000000000..608e370257
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ASP.NET Core MVC formatters for JSON input and output and for JSON PATCH input using Json.NET.</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>aspnetcore;aspnetcoremvc;json</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="$(MicrosoftAspNetCoreJsonPatchPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/MvcJsonOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/MvcJsonOptions.cs
new file mode 100644
index 0000000000..f27cf0b00c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/MvcJsonOptions.cs
@@ -0,0 +1,81 @@
+// 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.
+
+using System.Collections;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Newtonsoft.Json;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Provides programmatic configuration for JSON in the MVC framework.
+    /// </summary>
+    public class MvcJsonOptions : IEnumerable<ICompatibilitySwitch>
+    {
+        private readonly CompatibilitySwitch<bool> _allowInputFormatterExceptionMessages;
+        private readonly ICompatibilitySwitch[] _switches;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="MvcJsonOptions"/>.
+        /// </summary>
+        public MvcJsonOptions()
+        {
+            _allowInputFormatterExceptionMessages = new CompatibilitySwitch<bool>(nameof(AllowInputFormatterExceptionMessages));
+
+            _switches = new ICompatibilitySwitch[]
+            {
+                _allowInputFormatterExceptionMessages,
+            };
+        }
+
+        /// <summary>
+        /// Gets or sets a flag to determine whether error messsages from JSON deserialization by the 
+        /// <see cref="JsonInputFormatter"/> will be added to the <see cref="ModelStateDictionary"/>. The default
+        /// value is <c>false</c>, meaning that a generic error message will be used instead.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Error messages in the <see cref="ModelStateDictionary"/> are often communicated to clients, either in HTML
+        /// or using <see cref="BadRequestObjectResult"/>. In effect, this setting controls whether clients can receive
+        /// detailed error messages about submitted JSON data.
+        /// </para>
+        /// <para>
+        /// This property is associated with a compatibility switch and can provide a different behavior depending on 
+        /// the configured compatibility version for the application. See <see cref="CompatibilityVersion"/> for 
+        /// guidance and examples of setting the application's compatibility version.
+        /// </para>
+        /// <para>
+        /// Configuring the desired of the value compatibility switch by calling this property's setter will take precedence
+        /// over the value implied by the application's <see cref="CompatibilityVersion"/>.
+        /// </para>
+        /// <para>
+        /// If the application's compatibility version is set to <see cref="CompatibilityVersion.Version_2_0"/> then
+        /// this setting will have value <c>false</c> unless explicitly configured.
+        /// </para>
+        /// <para>
+        /// If the application's compatibility version is set to <see cref="CompatibilityVersion.Version_2_1"/> or
+        /// higher then this setting will have value <c>true</c> unless explicitly configured.
+        /// </para>
+        /// </remarks>
+        public bool AllowInputFormatterExceptionMessages
+        {
+            get => _allowInputFormatterExceptionMessages.Value;
+            set => _allowInputFormatterExceptionMessages.Value = value;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="JsonSerializerSettings"/> that are used by this application.
+        /// </summary>
+        public JsonSerializerSettings SerializerSettings { get; } = JsonSerializerSettingsProvider.CreateSerializerSettings();
+
+        IEnumerator<ICompatibilitySwitch> IEnumerable<ICompatibilitySwitch>.GetEnumerator()
+        {
+            return ((IEnumerable<ICompatibilitySwitch>)_switches).GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() => _switches.GetEnumerator();
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/MvcJsonOptionsConfigureCompatibilityOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/MvcJsonOptionsConfigureCompatibilityOptions.cs
new file mode 100644
index 0000000000..f33e6dc108
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/MvcJsonOptionsConfigureCompatibilityOptions.cs
@@ -0,0 +1,35 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    internal class MvcJsonOptionsConfigureCompatibilityOptions : ConfigureCompatibilityOptions<MvcJsonOptions>
+    {
+        public MvcJsonOptionsConfigureCompatibilityOptions(
+            ILoggerFactory loggerFactory,
+            IOptions<MvcCompatibilityOptions> compatibilityOptions) 
+            : base(loggerFactory, compatibilityOptions)
+        {
+        }
+
+        protected override IReadOnlyDictionary<string, object> DefaultValues
+        {
+            get
+            {
+                var values = new Dictionary<string, object>();
+
+                if (Version >= CompatibilityVersion.Version_2_1)
+                {
+                    values[nameof(MvcJsonOptions.AllowInputFormatterExceptionMessages)] = true;
+                }
+
+                return values;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/baseline.netcore.json
new file mode 100644
index 0000000000..9a1c0bda85
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/baseline.netcore.json
@@ -0,0 +1,910 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc.Formatters.Json, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.JsonPatchExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ApplyTo<T0>",
+          "Parameters": [
+            {
+              "Name": "patchDoc",
+              "Type": "Microsoft.AspNetCore.JsonPatch.JsonPatchDocument<T0>"
+            },
+            {
+              "Name": "objectToApplyTo",
+              "Type": "T0"
+            },
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ApplyTo<T0>",
+          "Parameters": [
+            {
+              "Name": "patchDoc",
+              "Type": "Microsoft.AspNetCore.JsonPatch.JsonPatchDocument<T0>"
+            },
+            {
+              "Name": "objectToApplyTo",
+              "Type": "T0"
+            },
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.JsonResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ContentType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ContentType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SerializerSettings",
+          "Parameters": [],
+          "ReturnType": "Newtonsoft.Json.JsonSerializerSettings",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SerializerSettings",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Newtonsoft.Json.JsonSerializerSettings"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_StatusCode",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Int32>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_StatusCode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.Int32>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Value",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Value",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "serializerSettings",
+              "Type": "Newtonsoft.Json.JsonSerializerSettings"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.MvcJsonOptions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Infrastructure.ICompatibilitySwitch>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_AllowInputFormatterExceptionMessages",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AllowInputFormatterExceptionMessages",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SerializerSettings",
+          "Parameters": [],
+          "ReturnType": "Newtonsoft.Json.JsonSerializerSettings",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.JsonInputFormatter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Formatters.TextInputFormatter",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Formatters.IInputFormatterExceptionPolicy"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ExceptionPolicy",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterExceptionPolicy",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.IInputFormatterExceptionPolicy",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SerializerSettings",
+          "Parameters": [],
+          "ReturnType": "Newtonsoft.Json.JsonSerializerSettings",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReadRequestBodyAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext"
+            },
+            {
+              "Name": "encoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateJsonSerializer",
+          "Parameters": [],
+          "ReturnType": "Newtonsoft.Json.JsonSerializer",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReleaseJsonSerializer",
+          "Parameters": [
+            {
+              "Name": "serializer",
+              "Type": "Newtonsoft.Json.JsonSerializer"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "logger",
+              "Type": "Microsoft.Extensions.Logging.ILogger"
+            },
+            {
+              "Name": "serializerSettings",
+              "Type": "Newtonsoft.Json.JsonSerializerSettings"
+            },
+            {
+              "Name": "charPool",
+              "Type": "System.Buffers.ArrayPool<System.Char>"
+            },
+            {
+              "Name": "objectPoolProvider",
+              "Type": "Microsoft.Extensions.ObjectPool.ObjectPoolProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "logger",
+              "Type": "Microsoft.Extensions.Logging.ILogger"
+            },
+            {
+              "Name": "serializerSettings",
+              "Type": "Newtonsoft.Json.JsonSerializerSettings"
+            },
+            {
+              "Name": "charPool",
+              "Type": "System.Buffers.ArrayPool<System.Char>"
+            },
+            {
+              "Name": "objectPoolProvider",
+              "Type": "Microsoft.Extensions.ObjectPool.ObjectPoolProvider"
+            },
+            {
+              "Name": "suppressInputFormatterBuffering",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "logger",
+              "Type": "Microsoft.Extensions.Logging.ILogger"
+            },
+            {
+              "Name": "serializerSettings",
+              "Type": "Newtonsoft.Json.JsonSerializerSettings"
+            },
+            {
+              "Name": "charPool",
+              "Type": "System.Buffers.ArrayPool<System.Char>"
+            },
+            {
+              "Name": "objectPoolProvider",
+              "Type": "Microsoft.Extensions.ObjectPool.ObjectPoolProvider"
+            },
+            {
+              "Name": "suppressInputFormatterBuffering",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "allowInputFormatterExceptionMessages",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "logger",
+              "Type": "Microsoft.Extensions.Logging.ILogger"
+            },
+            {
+              "Name": "serializerSettings",
+              "Type": "Newtonsoft.Json.JsonSerializerSettings"
+            },
+            {
+              "Name": "charPool",
+              "Type": "System.Buffers.ArrayPool<System.Char>"
+            },
+            {
+              "Name": "objectPoolProvider",
+              "Type": "Microsoft.Extensions.ObjectPool.ObjectPoolProvider"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Mvc.MvcOptions"
+            },
+            {
+              "Name": "jsonOptions",
+              "Type": "Microsoft.AspNetCore.Mvc.MvcJsonOptions"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.JsonOutputFormatter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Formatters.TextOutputFormatter",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_SerializerSettings",
+          "Parameters": [],
+          "ReturnType": "Newtonsoft.Json.JsonSerializerSettings",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PublicSerializerSettings",
+          "Parameters": [],
+          "ReturnType": "Newtonsoft.Json.JsonSerializerSettings",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteObject",
+          "Parameters": [
+            {
+              "Name": "writer",
+              "Type": "System.IO.TextWriter"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateJsonWriter",
+          "Parameters": [
+            {
+              "Name": "writer",
+              "Type": "System.IO.TextWriter"
+            }
+          ],
+          "ReturnType": "Newtonsoft.Json.JsonWriter",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateJsonSerializer",
+          "Parameters": [],
+          "ReturnType": "Newtonsoft.Json.JsonSerializer",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteResponseBodyAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext"
+            },
+            {
+              "Name": "selectedEncoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "serializerSettings",
+              "Type": "Newtonsoft.Json.JsonSerializerSettings"
+            },
+            {
+              "Name": "charPool",
+              "Type": "System.Buffers.ArrayPool<System.Char>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.JsonPatchInputFormatter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Formatters.JsonInputFormatter",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CanRead",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.IInputFormatter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ExceptionPolicy",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterExceptionPolicy",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.IInputFormatterExceptionPolicy",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReadRequestBodyAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext"
+            },
+            {
+              "Name": "encoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "logger",
+              "Type": "Microsoft.Extensions.Logging.ILogger"
+            },
+            {
+              "Name": "serializerSettings",
+              "Type": "Newtonsoft.Json.JsonSerializerSettings"
+            },
+            {
+              "Name": "charPool",
+              "Type": "System.Buffers.ArrayPool<System.Char>"
+            },
+            {
+              "Name": "objectPoolProvider",
+              "Type": "Microsoft.Extensions.ObjectPool.ObjectPoolProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "logger",
+              "Type": "Microsoft.Extensions.Logging.ILogger"
+            },
+            {
+              "Name": "serializerSettings",
+              "Type": "Newtonsoft.Json.JsonSerializerSettings"
+            },
+            {
+              "Name": "charPool",
+              "Type": "System.Buffers.ArrayPool<System.Char>"
+            },
+            {
+              "Name": "objectPoolProvider",
+              "Type": "Microsoft.Extensions.ObjectPool.ObjectPoolProvider"
+            },
+            {
+              "Name": "suppressInputFormatterBuffering",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "logger",
+              "Type": "Microsoft.Extensions.Logging.ILogger"
+            },
+            {
+              "Name": "serializerSettings",
+              "Type": "Newtonsoft.Json.JsonSerializerSettings"
+            },
+            {
+              "Name": "charPool",
+              "Type": "System.Buffers.ArrayPool<System.Char>"
+            },
+            {
+              "Name": "objectPoolProvider",
+              "Type": "Microsoft.Extensions.ObjectPool.ObjectPoolProvider"
+            },
+            {
+              "Name": "suppressInputFormatterBuffering",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "allowInputFormatterExceptionMessages",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "logger",
+              "Type": "Microsoft.Extensions.Logging.ILogger"
+            },
+            {
+              "Name": "serializerSettings",
+              "Type": "Newtonsoft.Json.JsonSerializerSettings"
+            },
+            {
+              "Name": "charPool",
+              "Type": "System.Buffers.ArrayPool<System.Char>"
+            },
+            {
+              "Name": "objectPoolProvider",
+              "Type": "Microsoft.Extensions.ObjectPool.ObjectPoolProvider"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Mvc.MvcOptions"
+            },
+            {
+              "Name": "jsonOptions",
+              "Type": "Microsoft.AspNetCore.Mvc.MvcJsonOptions"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.JsonSerializerSettingsProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateSerializerSettings",
+          "Parameters": [],
+          "ReturnType": "Newtonsoft.Json.JsonSerializerSettings",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.Json.JsonPatchOperationsArrayProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "modelMetadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.MvcJsonMvcBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddJsonOptions",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.MvcJsonOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.MvcJsonMvcCoreBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddJsonFormatters",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddJsonFormatters",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Newtonsoft.Json.JsonSerializerSettings>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddJsonOptions",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.MvcJsonOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DelegatingEnumerable.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DelegatingEnumerable.cs
new file mode 100644
index 0000000000..e548794e9e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DelegatingEnumerable.cs
@@ -0,0 +1,83 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
+{
+    /// <summary>
+    /// Serializes <see cref="IEnumerable{T}"/> types by delegating them through a concrete implementation.
+    /// </summary>
+    /// <typeparam name="TWrapped">The wrapping or original type of the <see cref="IEnumerable{T}"/> 
+    /// to proxy.</typeparam>
+    /// <typeparam name="TDeclared">The type parameter of the original <see cref="IEnumerable{T}"/> 
+    /// to proxy.</typeparam>
+    public class DelegatingEnumerable<TWrapped, TDeclared> : IEnumerable<TWrapped>
+    {
+        private readonly IEnumerable<TDeclared> _source;
+        private readonly IWrapperProvider _wrapperProvider;
+
+        /// <summary>
+        /// Initializes a <see cref="DelegatingEnumerable{TWrapped, TDeclared}"/>. 
+        /// </summary>
+        /// <remarks>
+        /// This constructor is necessary for <see cref="System.Runtime.Serialization.DataContractSerializer"/> 
+        /// to serialize.
+        /// </remarks>
+        public DelegatingEnumerable()
+        {
+            _source = Enumerable.Empty<TDeclared>();
+        }
+
+        /// <summary>
+        /// Initializes a <see cref="DelegatingEnumerable{TWrapped, TDeclared}"/> with the original
+        ///  <see cref="IEnumerable{T}"/> and the wrapper provider for wrapping individual elements.
+        /// </summary>
+        /// <param name="source">The <see cref="IEnumerable{T}"/> instance to get the enumerator from.</param>
+        /// <param name="elementWrapperProvider">The wrapper provider for wrapping individual elements.</param>
+        public DelegatingEnumerable(IEnumerable<TDeclared> source, IWrapperProvider elementWrapperProvider)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            _source = source;
+            _wrapperProvider = elementWrapperProvider;
+        }
+
+        /// <summary>
+        /// Gets a delegating enumerator of the original <see cref="IEnumerable{T}"/> source which is being
+        /// wrapped.
+        /// </summary>
+        /// <returns>The delegating enumerator of the original <see cref="IEnumerable{T}"/> source.</returns>
+        public IEnumerator<TWrapped> GetEnumerator()
+        {
+            return new DelegatingEnumerator<TWrapped, TDeclared>(_source.GetEnumerator(), _wrapperProvider);
+        }
+
+        /// <summary>
+        /// The serializer requires every type it encounters can be serialized and deserialized.
+        /// This type will never be used for deserialization, but we are required to implement the add
+        /// method so that the type can be serialized. This will never be called.
+        /// </summary>
+        /// <param name="item">The item to add. Unused.</param>
+        public void Add(object item)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Gets a delegating enumerator of the original <see cref="IEnumerable{T}"/> source which is being
+        /// wrapped.
+        /// </summary>
+        /// <returns>The delegating enumerator of the original <see cref="IEnumerable{T}"/> source.</returns>
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DelegatingEnumerator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DelegatingEnumerator.cs
new file mode 100644
index 0000000000..f59b5cdfa7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DelegatingEnumerator.cs
@@ -0,0 +1,76 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
+{
+    /// <summary>
+    /// Delegates enumeration of elements to the original enumerator and wraps the items
+    /// with the supplied <see cref="IWrapperProvider"/>.
+    /// </summary>
+    /// <typeparam name="TWrapped">The type to which the individual elements need to be wrapped to.</typeparam>
+    /// <typeparam name="TDeclared">The original type of the element being wrapped.</typeparam>
+    public class DelegatingEnumerator<TWrapped, TDeclared> : IEnumerator<TWrapped>
+    {
+        private readonly IEnumerator<TDeclared> _inner;
+        private readonly IWrapperProvider _wrapperProvider;
+
+        /// <summary>
+        /// Initializes a <see cref="DelegatingEnumerable{TWrapped, TDeclared}"/> which enumerates 
+        /// over the elements of the original enumerator and wraps them using the supplied
+        /// <see cref="IWrapperProvider"/>.
+        /// </summary>
+        /// <param name="inner">The original enumerator.</param>
+        /// <param name="wrapperProvider">The wrapper provider to wrap individual elements.</param>
+        public DelegatingEnumerator(IEnumerator<TDeclared> inner, IWrapperProvider wrapperProvider)
+        {
+            if (inner == null)
+            {
+                throw new ArgumentNullException(nameof(inner));
+            }
+
+            _inner = inner;
+            _wrapperProvider = wrapperProvider;
+        }
+
+        /// <inheritdoc />
+        public TWrapped Current
+        {
+            get
+            {
+                object obj = _inner.Current;
+                if (_wrapperProvider == null)
+                {
+                    // if there is no wrapper, then this cast should not fail
+                    return (TWrapped)obj;
+                }
+
+                return (TWrapped)_wrapperProvider.Wrap(obj);
+            }
+        }
+
+        /// <inheritdoc />
+        object IEnumerator.Current => Current;
+
+        /// <inheritdoc />
+        public void Dispose()
+        {
+            _inner.Dispose();
+        }
+
+        /// <inheritdoc />
+        public bool MoveNext()
+        {
+            return _inner.MoveNext();
+        }
+
+        /// <inheritdoc />
+        public void Reset()
+        {
+            _inner.Reset();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcBuilderExtensions.cs
new file mode 100644
index 0000000000..4210fbe0bc
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcBuilderExtensions.cs
@@ -0,0 +1,63 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    /// <summary>
+    /// Extension methods for adding XML formatters to MVC.
+    /// </summary>
+    public static class MvcXmlMvcBuilderExtensions
+    {
+        /// <summary>
+        /// Adds the XML DataContractSerializer formatters to MVC.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder AddXmlDataContractSerializerFormatters(this IMvcBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            AddXmlDataContractSerializerFormatterServices(builder.Services);
+            return builder;
+        }
+
+        /// <summary>
+        /// Adds the XML Serializer formatters to MVC.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder AddXmlSerializerFormatters(this IMvcBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            AddXmlSerializerFormatterServices(builder.Services);
+            return builder;
+        }
+
+        // Internal for testing.
+        internal static void AddXmlDataContractSerializerFormatterServices(IServiceCollection services)
+        {
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IConfigureOptions<MvcOptions>, MvcXmlDataContractSerializerMvcOptionsSetup>());
+        }
+
+        // Internal for testing.
+        internal static void AddXmlSerializerFormatterServices(IServiceCollection services)
+        {
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IConfigureOptions<MvcOptions>, MvcXmlSerializerMvcOptionsSetup>());
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcCoreBuilderExtensions.cs
new file mode 100644
index 0000000000..5e14f41647
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcCoreBuilderExtensions.cs
@@ -0,0 +1,63 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    /// <summary>
+    /// Extension methods for adding XML formatters to MVC.
+    /// </summary>
+    public static class MvcXmlMvcCoreBuilderExtensions
+    {
+        /// <summary>
+        /// Adds the XML DataContractSerializer formatters to MVC.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        public static IMvcCoreBuilder AddXmlDataContractSerializerFormatters(this IMvcCoreBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            AddXmlDataContractSerializerFormatterServices(builder.Services);
+            return builder;
+        }
+
+        /// <summary>
+        /// Adds the XML Serializer formatters to MVC.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        public static IMvcCoreBuilder AddXmlSerializerFormatters(this IMvcCoreBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            AddXmlSerializerFormatterServices(builder.Services);
+            return builder;
+        }
+
+        // Internal for testing.
+        internal static void AddXmlDataContractSerializerFormatterServices(IServiceCollection services)
+        {
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IConfigureOptions<MvcOptions>, MvcXmlDataContractSerializerMvcOptionsSetup>());
+        }
+
+        // Internal for testing.
+        internal static void AddXmlSerializerFormatterServices(IServiceCollection services)
+        {
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IConfigureOptions<MvcOptions>, MvcXmlSerializerMvcOptionsSetup>());
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/EnumerableWrapperProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/EnumerableWrapperProvider.cs
new file mode 100644
index 0000000000..ada373cf9d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/EnumerableWrapperProvider.cs
@@ -0,0 +1,76 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
+{
+    /// <summary>
+    /// Provides a <see cref="IWrapperProvider"/> for interface types which implement
+    /// <see cref="IEnumerable{T}"/>.
+    /// </summary>
+    public class EnumerableWrapperProvider : IWrapperProvider
+    {
+        private readonly IWrapperProvider _wrapperProvider;
+        private readonly ConstructorInfo _wrappingTypeConstructor;
+
+        /// <summary>
+        /// Initializes an instance of <see cref="EnumerableWrapperProvider"/>.
+        /// </summary>
+        /// <param name="sourceEnumerableOfT">Type of the original <see cref="IEnumerable{T}" />
+        /// that is being wrapped.</param>
+        /// <param name="elementWrapperProvider">The <see cref="IWrapperProvider"/> for the element type.
+        /// Can be null.</param>
+        public EnumerableWrapperProvider(
+            Type sourceEnumerableOfT,
+            IWrapperProvider elementWrapperProvider)
+        {
+            if (sourceEnumerableOfT == null)
+            {
+                throw new ArgumentNullException(nameof(sourceEnumerableOfT));
+            }
+
+            var enumerableOfT = ClosedGenericMatcher.ExtractGenericInterface(
+                sourceEnumerableOfT,
+                typeof(IEnumerable<>));
+            if (!sourceEnumerableOfT.GetTypeInfo().IsInterface || enumerableOfT == null)
+            {
+                throw new ArgumentException(
+                    Resources.FormatEnumerableWrapperProvider_InvalidSourceEnumerableOfT(typeof(IEnumerable<>).Name),
+                    nameof(sourceEnumerableOfT));
+            }
+
+            _wrapperProvider = elementWrapperProvider;
+
+            var declaredElementType = enumerableOfT.GenericTypeArguments[0];
+            var wrappedElementType = elementWrapperProvider?.WrappingType ?? declaredElementType;
+            WrappingType = typeof(DelegatingEnumerable<,>).MakeGenericType(wrappedElementType, declaredElementType);
+
+            _wrappingTypeConstructor = WrappingType.GetConstructor(new[]
+            {
+                sourceEnumerableOfT,
+                typeof(IWrapperProvider)
+            });
+        }
+
+        /// <inheritdoc />
+        public Type WrappingType
+        {
+            get;
+        }
+
+        /// <inheritdoc />
+        public object Wrap(object original)
+        {
+            if (original == null)
+            {
+                return null;
+            }
+
+            return _wrappingTypeConstructor.Invoke(new[] { original, _wrapperProvider });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/EnumerableWrapperProviderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/EnumerableWrapperProviderFactory.cs
new file mode 100644
index 0000000000..9438e87986
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/EnumerableWrapperProviderFactory.cs
@@ -0,0 +1,76 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
+{
+    /// <summary>
+    /// Creates an <see cref="EnumerableWrapperProvider"/> for interface types implementing the
+    /// <see cref="IEnumerable{T}"/> type.
+    /// </summary>
+    public class EnumerableWrapperProviderFactory : IWrapperProviderFactory
+    {
+        private readonly IEnumerable<IWrapperProviderFactory> _wrapperProviderFactories;
+
+        /// <summary>
+        /// Initializes an <see cref="EnumerableWrapperProviderFactory"/> with a list
+        /// <see cref="IWrapperProviderFactory"/>.
+        /// </summary>
+        /// <param name="wrapperProviderFactories">List of <see cref="IWrapperProviderFactory"/>.</param>
+        public EnumerableWrapperProviderFactory(IEnumerable<IWrapperProviderFactory> wrapperProviderFactories)
+        {
+            if (wrapperProviderFactories == null)
+            {
+                throw new ArgumentNullException(nameof(wrapperProviderFactories));
+            }
+
+            _wrapperProviderFactories = wrapperProviderFactories;
+        }
+
+        /// <summary>
+        /// Gets an <see cref="EnumerableWrapperProvider"/> for the provided context.
+        /// </summary>
+        /// <param name="context">The <see cref="WrapperProviderContext"/>.</param>
+        /// <returns>An instance of <see cref="EnumerableWrapperProvider"/> if the declared type is
+        /// an interface and implements <see cref="IEnumerable{T}"/>.</returns>
+        public IWrapperProvider GetProvider(WrapperProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (context.IsSerialization)
+            {
+                // Example: IEnumerable<SerializableError>
+                var declaredType = context.DeclaredType;
+                var declaredTypeInfo = declaredType.GetTypeInfo();
+
+                // We only wrap interfaces types(ex: IEnumerable<T>, IQueryable<T>, IList<T> etc.) and not
+                // concrete types like List<T>, Collection<T> which implement IEnumerable<T>.
+                if (declaredType != null && declaredTypeInfo.IsInterface && declaredTypeInfo.IsGenericType)
+                {
+                    var enumerableOfT = ClosedGenericMatcher.ExtractGenericInterface(
+                        declaredType,
+                        typeof(IEnumerable<>));
+                    if (enumerableOfT != null)
+                    {
+                        var elementType = enumerableOfT.GenericTypeArguments[0];
+                        var wrapperProviderContext = new WrapperProviderContext(elementType, context.IsSerialization);
+
+                        var elementWrapperProvider =
+                            _wrapperProviderFactories.GetWrapperProvider(wrapperProviderContext);
+
+                        return new EnumerableWrapperProvider(enumerableOfT, elementWrapperProvider);
+                    }
+                }
+            }
+
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IUnwrappable.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IUnwrappable.cs
new file mode 100644
index 0000000000..31f9cf4917
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IUnwrappable.cs
@@ -0,0 +1,20 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
+{
+    /// <summary>
+    /// Defines an interface for objects to be un-wrappable after deserialization.
+    /// </summary>
+    public interface IUnwrappable
+    {
+        /// <summary>
+        /// Unwraps an object.
+        /// </summary>
+        /// <param name="declaredType">The type to which the object should be un-wrapped to.</param>
+        /// <returns>The un-wrapped object.</returns>
+        object Unwrap(Type declaredType);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IWrapperProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IWrapperProvider.cs
new file mode 100644
index 0000000000..3c2c33c376
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IWrapperProvider.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
+{
+    /// <summary>
+    /// Defines an interface for wrapping objects for serialization or deserialization into xml.
+    /// </summary>
+    public interface IWrapperProvider
+    {
+        /// <summary>
+        /// Gets the wrapping type.
+        /// </summary>
+        Type WrappingType { get; }
+
+        /// <summary>
+        /// Wraps the given object to the wrapping type provided by <see cref="WrappingType"/>.
+        /// </summary>
+        /// <param name="original">The original non-wrapped object.</param>
+        /// <returns>Returns a wrapped object.</returns>
+        object Wrap(object original);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IWrapperProviderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IWrapperProviderFactory.cs
new file mode 100644
index 0000000000..9594d09d75
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IWrapperProviderFactory.cs
@@ -0,0 +1,18 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
+{
+    /// <summary>
+    /// Create a <see cref="IWrapperProvider"/> given a <see cref="WrapperProviderContext"/>.
+    /// </summary>
+    public interface IWrapperProviderFactory
+    {
+        /// <summary>
+        /// Gets the <see cref="IWrapperProvider"/> for the provided context.
+        /// </summary>
+        /// <param name="context">The <see cref="WrapperProviderContext"/>.</param>
+        /// <returns>A wrapping provider if the factory decides to wrap the type, else <c>null</c>.</returns>
+        IWrapperProvider GetProvider(WrapperProviderContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Internal/FormattingUtilities.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Internal/FormattingUtilities.cs
new file mode 100644
index 0000000000..7b97d7ca79
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Internal/FormattingUtilities.cs
@@ -0,0 +1,47 @@
+// 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.
+
+using System.Runtime.Serialization;
+using System.Xml;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal
+{
+    /// <summary>
+    /// Contains methods which are used by Xml input formatters.
+    /// </summary>
+    public static class FormattingUtilities
+    {
+        public static readonly int DefaultMaxDepth = 32;
+        public static readonly XsdDataContractExporter XsdDataContractExporter = new XsdDataContractExporter();
+
+        /// <summary>
+        /// Gets the default Reader Quotas for XmlReader.
+        /// </summary>
+        /// <returns>XmlReaderQuotas with default values</returns>
+        public static XmlDictionaryReaderQuotas GetDefaultXmlReaderQuotas()
+        {
+            return new XmlDictionaryReaderQuotas()
+            {
+                MaxArrayLength = int.MaxValue,
+                MaxBytesPerRead = int.MaxValue,
+                MaxDepth = DefaultMaxDepth,
+                MaxNameTableCharCount = int.MaxValue,
+                MaxStringContentLength = int.MaxValue
+            };
+        }
+
+        /// <summary>
+        /// Gets the default XmlWriterSettings.
+        /// </summary>
+        /// <returns>Default <see cref="XmlWriterSettings"/></returns>
+        public static XmlWriterSettings GetDefaultXmlWriterSettings()
+        {
+            return new XmlWriterSettings
+            {
+                OmitXmlDeclaration = true,
+                CloseOutput = false,
+                CheckCharacters = false
+            };
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Internal/MediaTypeHeaderValues.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Internal/MediaTypeHeaderValues.cs
new file mode 100644
index 0000000000..14f2a99ce4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Internal/MediaTypeHeaderValues.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal
+{
+    internal static class MediaTypeHeaderValues
+    {
+        public static readonly MediaTypeHeaderValue ApplicationXml
+            = MediaTypeHeaderValue.Parse("application/xml").CopyAsReadOnly();
+
+        public static readonly MediaTypeHeaderValue TextXml
+            = MediaTypeHeaderValue.Parse("text/xml").CopyAsReadOnly();
+
+        public static readonly MediaTypeHeaderValue ApplicationAnyXmlSyntax
+            = MediaTypeHeaderValue.Parse("application/*+xml").CopyAsReadOnly();
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Internal/MvcXmlDataContractSerializerMvcOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Internal/MvcXmlDataContractSerializerMvcOptionsSetup.cs
new file mode 100644
index 0000000000..c1cd77f685
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Internal/MvcXmlDataContractSerializerMvcOptionsSetup.cs
@@ -0,0 +1,60 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal
+{
+    /// <summary>
+    /// A <see cref="IConfigureOptions{TOptions}"/> implementation which will add the
+    /// data contract serializer formatters to <see cref="MvcOptions"/>.
+    /// </summary>
+    public class MvcXmlDataContractSerializerMvcOptionsSetup : IConfigureOptions<MvcOptions>
+    {
+        private readonly ILoggerFactory _loggerFactory;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="MvcXmlDataContractSerializerMvcOptionsSetup"/>.
+        /// </summary>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public MvcXmlDataContractSerializerMvcOptionsSetup(ILoggerFactory loggerFactory)
+        {
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            _loggerFactory = loggerFactory;
+        }
+
+        /// <summary>
+        /// Adds the data contract serializer formatters to <see cref="MvcOptions"/>.
+        /// </summary>
+        /// <param name="options">The <see cref="MvcOptions"/>.</param>
+        public void Configure(MvcOptions options)
+        {
+            options.ModelMetadataDetailsProviders.Add(new DataMemberRequiredBindingMetadataProvider());
+
+            options.OutputFormatters.Add(new XmlDataContractSerializerOutputFormatter(_loggerFactory));
+            options.InputFormatters.Add(new XmlDataContractSerializerInputFormatter(options));
+
+            // Do not override any user mapping
+            var key = "xml";
+            var mapping = options.FormatterMappings.GetMediaTypeMappingForFormat(key);
+            if (string.IsNullOrEmpty(mapping))
+            {
+                options.FormatterMappings.SetMediaTypeMappingForFormat(
+                    key,
+                    MediaTypeHeaderValues.ApplicationXml);
+            }
+
+            options.ModelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider("System.Xml.Linq.XObject"));
+            options.ModelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider("System.Xml.XmlNode"));
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Internal/MvcXmlSerializerMvcOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Internal/MvcXmlSerializerMvcOptionsSetup.cs
new file mode 100644
index 0000000000..6c7546e332
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Internal/MvcXmlSerializerMvcOptionsSetup.cs
@@ -0,0 +1,53 @@
+// 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.
+
+using System;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal
+{
+    /// <summary>
+    /// A <see cref="IConfigureOptions{TOptions}"/> implementation which will add the
+    /// XML serializer formatters to <see cref="MvcOptions"/>.
+    /// </summary>
+    public class MvcXmlSerializerMvcOptionsSetup : IConfigureOptions<MvcOptions>
+    {
+        private readonly ILoggerFactory _loggerFactory;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="MvcXmlSerializerMvcOptionsSetup"/>.
+        /// </summary>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public MvcXmlSerializerMvcOptionsSetup(ILoggerFactory loggerFactory)
+        {
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            _loggerFactory = loggerFactory;
+        }
+
+        /// <summary>
+        /// Adds the XML serializer formatters to <see cref="MvcOptions"/>.
+        /// </summary>
+        /// <param name="options">The <see cref="MvcOptions"/>.</param>
+        public void Configure(MvcOptions options)
+        {
+            // Do not override any user mapping
+            var key = "xml";
+            var mapping = options.FormatterMappings.GetMediaTypeMappingForFormat(key);
+            if (string.IsNullOrEmpty(mapping))
+            {
+                options.FormatterMappings.SetMediaTypeMappingForFormat(
+                    key,
+                    MediaTypeHeaderValues.ApplicationXml);
+            }
+
+            options.OutputFormatters.Add(new XmlSerializerOutputFormatter(_loggerFactory));
+            options.InputFormatters.Add(new XmlSerializerInputFormatter(options));
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/LoggerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/LoggerExtensions.cs
new file mode 100644
index 0000000000..dfb00627d4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/LoggerExtensions.cs
@@ -0,0 +1,37 @@
+// 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.
+
+using System;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal
+{
+    public static class LoggerExtensions
+    {
+        private static readonly Action<ILogger, string, Exception> _failedToCreateXmlSerializer;
+        private static readonly Action<ILogger, string, Exception> _failedToCreateDataContractSerializer;
+
+        static LoggerExtensions()
+        {
+            _failedToCreateXmlSerializer = LoggerMessage.Define<string>(
+                LogLevel.Warning,
+                1,
+                "An error occurred while trying to create an XmlSerializer for the type '{Type}'.");
+
+            _failedToCreateDataContractSerializer = LoggerMessage.Define<string>(
+                LogLevel.Warning,
+                2,
+                "An error occurred while trying to create a DataContractSerializer for the type '{Type}'.");
+        }
+
+        public static void FailedToCreateXmlSerializer(this ILogger logger, string typeName, Exception exception)
+        {
+            _failedToCreateXmlSerializer(logger, typeName, exception);
+        }
+        
+        public static void FailedToCreateDataContractSerializer(this ILogger logger, string typeName, Exception exception)
+        {
+            _failedToCreateDataContractSerializer(logger, typeName, exception);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj
new file mode 100644
index 0000000000..b716f5cbbb
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ASP.NET Core MVC formatters for XML input and output using DataContractSerializer and XmlSerializer.</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>aspnetcore;aspnetcoremvc;xml</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj" />
+
+    <PackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsPropertyHelperSourcesPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ModelBinding/DataMemberRequiredBindingMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ModelBinding/DataMemberRequiredBindingMetadataProvider.cs
new file mode 100644
index 0000000000..d1c6002158
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ModelBinding/DataMemberRequiredBindingMetadataProvider.cs
@@ -0,0 +1,56 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.Serialization;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    /// <summary>
+    /// An <see cref="IBindingMetadataProvider"/> for <see cref="DataMemberAttribute.IsRequired"/>.
+    /// </summary>
+    public class DataMemberRequiredBindingMetadataProvider : IBindingMetadataProvider
+    {
+        /// <inheritdoc />
+        public void CreateBindingMetadata(BindingMetadataProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            // Types cannot be required; only properties can
+            if (context.Key.MetadataKind != ModelMetadataKind.Property)
+            {
+                return;
+            }
+
+            if (context.BindingMetadata.IsBindingRequired)
+            {
+                // This value is already required, no need to look at attributes.
+                return;
+            }
+
+            var dataMemberAttribute = context
+                .PropertyAttributes
+                .OfType<DataMemberAttribute>()
+                .FirstOrDefault();
+            if (dataMemberAttribute == null || !dataMemberAttribute.IsRequired)
+            {
+                return;
+            }
+
+            // isDataContract == true iff the container type has at least one DataContractAttribute
+            var containerType = context.Key.ContainerType.GetTypeInfo();
+            var isDataContract = containerType.IsDefined(typeof(DataContractAttribute));
+            if (isDataContract)
+            {
+                // We don't need to add a validator, just to set IsRequired = true. The validation
+                // system will do the right thing.
+                context.BindingMetadata.IsBindingRequired = true;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..94864035dd
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Properties/Resources.Designer.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class Resources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.Formatters.Xml.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// The type must be an interface and must be or derive from '{0}'.
+        /// </summary>
+        internal static string EnumerableWrapperProvider_InvalidSourceEnumerableOfT
+        {
+            get => GetString("EnumerableWrapperProvider_InvalidSourceEnumerableOfT");
+        }
+
+        /// <summary>
+        /// The type must be an interface and must be or derive from '{0}'.
+        /// </summary>
+        internal static string FormatEnumerableWrapperProvider_InvalidSourceEnumerableOfT(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("EnumerableWrapperProvider_InvalidSourceEnumerableOfT"), p0);
+
+        /// <summary>
+        /// An error occurred while deserializing input data.
+        /// </summary>
+        internal static string ErrorDeserializingInputData
+        {
+            get => GetString("ErrorDeserializingInputData");
+        }
+
+        /// <summary>
+        /// An error occurred while deserializing input data.
+        /// </summary>
+        internal static string FormatErrorDeserializingInputData()
+            => GetString("ErrorDeserializingInputData");
+
+        /// <summary>
+        /// {0} does not recognize '{1}', so instead use '{2}' with '{3}' set to '{4}' for value type property '{5}' on type '{6}'.
+        /// </summary>
+        internal static string RequiredProperty_MustHaveDataMemberRequired
+        {
+            get => GetString("RequiredProperty_MustHaveDataMemberRequired");
+        }
+
+        /// <summary>
+        /// {0} does not recognize '{1}', so instead use '{2}' with '{3}' set to '{4}' for value type property '{5}' on type '{6}'.
+        /// </summary>
+        internal static string FormatRequiredProperty_MustHaveDataMemberRequired(object p0, object p1, object p2, object p3, object p4, object p5, object p6)
+            => string.Format(CultureInfo.CurrentCulture, GetString("RequiredProperty_MustHaveDataMemberRequired"), p0, p1, p2, p3, p4, p5, p6);
+
+        /// <summary>
+        /// The object to be wrapped must be of type '{0}' but was of type '{1}'.
+        /// </summary>
+        internal static string WrapperProvider_MismatchType
+        {
+            get => GetString("WrapperProvider_MismatchType");
+        }
+
+        /// <summary>
+        /// The object to be wrapped must be of type '{0}' but was of type '{1}'.
+        /// </summary>
+        internal static string FormatWrapperProvider_MismatchType(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("WrapperProvider_MismatchType"), p0, p1);
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Resources.resx
new file mode 100644
index 0000000000..b83867ae64
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Resources.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="EnumerableWrapperProvider_InvalidSourceEnumerableOfT" xml:space="preserve">
+    <value>The type must be an interface and must be or derive from '{0}'.</value>
+  </data>
+  <data name="ErrorDeserializingInputData" xml:space="preserve">
+    <value>An error occurred while deserializing input data.</value>
+  </data>
+  <data name="RequiredProperty_MustHaveDataMemberRequired" xml:space="preserve">
+    <value>{0} does not recognize '{1}', so instead use '{2}' with '{3}' set to '{4}' for value type property '{5}' on type '{6}'.</value>
+  </data>
+  <data name="WrapperProvider_MismatchType" xml:space="preserve">
+    <value>The object to be wrapped must be of type '{0}' but was of type '{1}'.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapper.cs
new file mode 100644
index 0000000000..d247b2fab9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapper.cs
@@ -0,0 +1,105 @@
+// 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.
+
+using System;
+using System.Xml;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
+{
+    /// <summary>
+    /// Wrapper class for <see cref="SerializableError"/> to enable it to be serialized by the xml formatters.
+    /// </summary>
+    [XmlRoot("Error")]
+    public sealed class SerializableErrorWrapper : IXmlSerializable, IUnwrappable
+    {
+        // Note: XmlSerializer requires to have default constructor
+        public SerializableErrorWrapper()
+        {
+            SerializableError = new SerializableError();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SerializableErrorWrapper"/> class.
+        /// </summary>
+        /// <param name="error">The <see cref="SerializableError"/> object that needs to be wrapped.</param>
+        public SerializableErrorWrapper(SerializableError error)
+        {
+            if (error == null)
+            {
+                throw new ArgumentNullException(nameof(error));
+            }
+
+            SerializableError = error;
+        }
+
+        /// <summary>
+        /// Gets the wrapped object which is serialized/deserialized into XML
+        /// representation.
+        /// </summary>
+        public SerializableError SerializableError { get; }
+
+        /// <inheritdoc />
+        public XmlSchema GetSchema()
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Generates a <see cref="SerializableError"/> object from its XML representation.
+        /// </summary>
+        /// <param name="reader">The <see cref="XmlReader"/> stream from which the object is deserialized.</param>
+        public void ReadXml(XmlReader reader)
+        {
+            if (reader.IsEmptyElement)
+            {
+                reader.Read();
+                return;
+            }
+
+            reader.ReadStartElement();
+            while (reader.NodeType != XmlNodeType.EndElement)
+            {
+                var key = XmlConvert.DecodeName(reader.LocalName);
+                var value = reader.ReadInnerXml();
+
+                SerializableError.Add(key, value);
+                reader.MoveToContent();
+            }
+
+            reader.ReadEndElement();
+        }
+
+        /// <summary>
+        /// Converts the wrapped <see cref="SerializableError"/> object into its XML representation.
+        /// </summary>
+        /// <param name="writer">The <see cref="XmlWriter"/> stream to which the object is serialized.</param>
+        public void WriteXml(XmlWriter writer)
+        {
+            foreach (var keyValuePair in SerializableError)
+            {
+                var key = keyValuePair.Key;
+                var value = keyValuePair.Value;
+                writer.WriteStartElement(XmlConvert.EncodeLocalName(key));
+                if (value != null)
+                {
+                    writer.WriteValue(value);
+                }
+
+                writer.WriteEndElement();
+            }
+        }
+
+        /// <inheritdoc />
+        public object Unwrap(Type declaredType)
+        {
+            if (declaredType == null)
+            {
+                throw new ArgumentNullException(nameof(declaredType));
+            }
+
+            return SerializableError;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapperProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapperProvider.cs
new file mode 100644
index 0000000000..bd83514e6a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapperProvider.cs
@@ -0,0 +1,37 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
+{
+    /// <summary>
+    /// Wraps the object of type <see cref="Microsoft.AspNetCore.Mvc.SerializableError"/>.
+    /// </summary>
+    public class SerializableErrorWrapperProvider : IWrapperProvider
+    {
+        /// <inheritdoc />
+        public Type WrappingType => typeof(SerializableErrorWrapper);
+
+        /// <inheritdoc />
+        public object Wrap(object original)
+        {
+            if (original == null)
+            {
+                throw new ArgumentNullException(nameof(original));
+            }
+
+            var error = original as SerializableError;
+            if (error == null)
+            {
+                throw new ArgumentException(
+                    Resources.FormatWrapperProvider_MismatchType(
+                        typeof(SerializableErrorWrapper).Name,
+                        original.GetType().Name),
+                    nameof(original));
+            }
+
+            return new SerializableErrorWrapper(error);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapperProviderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapperProviderFactory.cs
new file mode 100644
index 0000000000..5dfdb652f0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapperProviderFactory.cs
@@ -0,0 +1,39 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
+{
+    /// <summary>
+    /// Creates an <see cref="IWrapperProvider"/> for the type <see cref="Microsoft.AspNetCore.Mvc.SerializableError"/>.
+    /// </summary>
+    public class SerializableErrorWrapperProviderFactory : IWrapperProviderFactory
+    {
+        /// <summary>
+        /// Creates an instance of <see cref="SerializableErrorWrapperProvider"/> if the provided
+        /// <paramref name="context"/>'s <see cref="WrapperProviderContext.DeclaredType"/> is
+        /// <see cref="Microsoft.AspNetCore.Mvc.SerializableError"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="WrapperProviderContext"/>.</param>
+        /// <returns>
+        /// An instance of <see cref="SerializableErrorWrapperProvider"/> if the provided <paramref name="context"/>'s
+        /// <see cref="WrapperProviderContext.DeclaredType"/> is
+        /// <see cref="Microsoft.AspNetCore.Mvc.SerializableError"/>; otherwise <c>null</c>.
+        /// </returns>
+        public IWrapperProvider GetProvider(WrapperProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (context.DeclaredType == typeof(SerializableError))
+            {
+                return new SerializableErrorWrapperProvider();
+            }
+
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/WrapperProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/WrapperProviderContext.cs
new file mode 100644
index 0000000000..3164f67b69
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/WrapperProviderContext.cs
@@ -0,0 +1,42 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
+{
+    /// <summary>
+    /// The context used by an <see cref="IWrapperProvider"/> to wrap or un-wrap types.
+    /// </summary>
+    public class WrapperProviderContext
+    {
+        /// <summary>
+        /// Initializes a <see cref="WrapperProviderContext"/>.
+        /// </summary>
+        /// <param name="declaredType">The declared type of the object that needs to be wrapped.</param>
+        /// <param name="isSerialization"><see langword="true"/> if the wrapper provider is invoked during
+        /// serialization, otherwise <see langword="false"/>.</param>
+        public WrapperProviderContext(Type declaredType, bool isSerialization)
+        {
+            if (declaredType == null)
+            {
+                throw new ArgumentNullException(nameof(declaredType));
+            }
+
+            DeclaredType = declaredType;
+            IsSerialization = isSerialization;
+        }
+
+        /// <summary>
+        /// The declared type which could be wrapped/un-wrapped by a different type 
+        /// during serialization or deserialization.
+        /// </summary>
+        public Type DeclaredType { get; }
+
+        /// <summary>
+        /// <see langword="true"/> if a wrapper provider is invoked during serialization,
+        /// <see langword="false"/> otherwise.
+        /// </summary>
+        public bool IsSerialization { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/WrapperProviderFactoriesExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/WrapperProviderFactoriesExtensions.cs
new file mode 100644
index 0000000000..1ccea1645d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/WrapperProviderFactoriesExtensions.cs
@@ -0,0 +1,48 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
+{
+    /// <summary>
+    /// Extension methods for <see cref="IWrapperProviderFactory"/>.
+    /// </summary>
+    public static class WrapperProviderFactoriesExtensions
+    {
+        /// <summary>
+        /// Gets an instance of <see cref="IWrapperProvider"/> for the supplied
+        /// type.
+        /// </summary>
+        /// <param name="wrapperProviderFactories">A list of <see cref="IWrapperProviderFactory"/>.</param>
+        /// <param name="wrapperProviderContext">The <see cref="WrapperProviderContext"/>.</param>
+        /// <returns>An instance of <see cref="IWrapperProvider"/> if there is a wrapping provider for the
+        /// supplied type, else null.</returns>
+        public static IWrapperProvider GetWrapperProvider(
+            this IEnumerable<IWrapperProviderFactory> wrapperProviderFactories,
+            WrapperProviderContext wrapperProviderContext)
+        {
+            if (wrapperProviderFactories == null)
+            {
+                throw new ArgumentNullException(nameof(wrapperProviderFactories));
+            }
+
+            if (wrapperProviderContext == null)
+            {
+                throw new ArgumentNullException(nameof(wrapperProviderContext));
+            }
+
+            foreach (var wrapperProviderFactory in wrapperProviderFactories)
+            {
+                var wrapperProvider = wrapperProviderFactory.GetProvider(wrapperProviderContext);
+                if (wrapperProvider != null)
+                {
+                    return wrapperProvider;
+                }
+            }
+
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerInputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerInputFormatter.cs
new file mode 100644
index 0000000000..7916715002
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerInputFormatter.cs
@@ -0,0 +1,281 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Formatters.Xml;
+using Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.WebUtilities;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// This class handles deserialization of input XML data
+    /// to strongly-typed objects using <see cref="DataContractSerializer"/>.
+    /// </summary>
+    public class XmlDataContractSerializerInputFormatter : TextInputFormatter, IInputFormatterExceptionPolicy
+    {
+        private readonly ConcurrentDictionary<Type, object> _serializerCache = new ConcurrentDictionary<Type, object>();
+        private readonly XmlDictionaryReaderQuotas _readerQuotas = FormattingUtilities.GetDefaultXmlReaderQuotas();
+        private readonly bool _suppressInputFormatterBuffering;
+        private readonly MvcOptions _options;
+        private DataContractSerializerSettings _serializerSettings;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="XmlDataContractSerializerInputFormatter"/>.
+        /// </summary>
+        [Obsolete("This constructor is obsolete and will be removed in a future version.")]
+        public XmlDataContractSerializerInputFormatter()
+        {
+            SupportedEncodings.Add(UTF8EncodingWithoutBOM);
+            SupportedEncodings.Add(UTF16EncodingLittleEndian);
+
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.ApplicationXml);
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.TextXml);
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.ApplicationAnyXmlSyntax);
+
+            _serializerSettings = new DataContractSerializerSettings();
+
+            WrapperProviderFactories = new List<IWrapperProviderFactory>();
+            WrapperProviderFactories.Add(new SerializableErrorWrapperProviderFactory());
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="XmlDataContractSerializerInputFormatter"/>.
+        /// </summary>
+        /// <param name="suppressInputFormatterBuffering">Flag to buffer entire request body before deserializing it.</param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version.")]
+        public XmlDataContractSerializerInputFormatter(bool suppressInputFormatterBuffering)
+            : this()
+        {
+            _suppressInputFormatterBuffering = suppressInputFormatterBuffering;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="XmlDataContractSerializerInputFormatter"/>.
+        /// </summary>
+        /// <param name="options">The <see cref="MvcOptions"/>.</param>
+        public XmlDataContractSerializerInputFormatter(MvcOptions options)
+#pragma warning disable CS0618
+            : this()
+#pragma warning restore CS0618
+        {
+            _options = options;
+        }
+
+        /// <summary>
+        /// Gets the list of <see cref="IWrapperProviderFactory"/> to
+        /// provide the wrapping type for de-serialization.
+        /// </summary>
+        public IList<IWrapperProviderFactory> WrapperProviderFactories { get; }
+
+        /// <summary>
+        /// Indicates the acceptable input XML depth.
+        /// </summary>
+        public int MaxDepth
+        {
+            get { return _readerQuotas.MaxDepth; }
+            set { _readerQuotas.MaxDepth = value; }
+        }
+
+        /// <summary>
+        /// The quotas include - DefaultMaxDepth, DefaultMaxStringContentLength, DefaultMaxArrayLength,
+        /// DefaultMaxBytesPerRead, DefaultMaxNameTableCharCount
+        /// </summary>
+        public XmlDictionaryReaderQuotas XmlDictionaryReaderQuotas => _readerQuotas;
+
+        /// <summary>
+        /// Gets or sets the <see cref="DataContractSerializerSettings"/> used to configure the
+        /// <see cref="DataContractSerializer"/>.
+        /// </summary>
+        public DataContractSerializerSettings SerializerSettings
+        {
+            get => _serializerSettings;
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _serializerSettings = value;
+            }
+        }
+
+        /// <inheritdoc />
+        public virtual InputFormatterExceptionPolicy ExceptionPolicy
+        {
+            get
+            {
+                if (GetType() == typeof(XmlDataContractSerializerInputFormatter))
+                {
+                    return InputFormatterExceptionPolicy.MalformedInputExceptions;
+                }
+                return InputFormatterExceptionPolicy.AllExceptions;
+            }
+        }
+
+        /// <inheritdoc />
+        public override async Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterContext context, Encoding encoding)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (encoding == null)
+            {
+                throw new ArgumentNullException(nameof(encoding));
+            }
+
+            var request = context.HttpContext.Request;
+
+            var suppressInputFormatterBuffering = _options?.SuppressInputFormatterBuffering ?? _suppressInputFormatterBuffering;
+
+            if (!request.Body.CanSeek && !suppressInputFormatterBuffering)
+            {
+                // XmlDataContractSerializer does synchronous reads. In order to avoid blocking on the stream, we asynchronously
+                // read everything into a buffer, and then seek back to the beginning.
+                request.EnableBuffering();
+                Debug.Assert(request.Body.CanSeek);
+
+                await request.Body.DrainAsync(CancellationToken.None);
+                request.Body.Seek(0L, SeekOrigin.Begin);
+            }
+
+            try
+            {
+                using (var xmlReader = CreateXmlReader(new NonDisposableStream(request.Body), encoding))
+                {
+                    var type = GetSerializableType(context.ModelType);
+                    var serializer = GetCachedSerializer(type);
+
+                    var deserializedObject = serializer.ReadObject(xmlReader);
+
+                    // Unwrap only if the original type was wrapped.
+                    if (type != context.ModelType)
+                    {
+                        if (deserializedObject is IUnwrappable unwrappable)
+                        {
+                            deserializedObject = unwrappable.Unwrap(declaredType: context.ModelType);
+                        }
+                    }
+
+                    return InputFormatterResult.Success(deserializedObject);
+                }
+            }
+            catch (SerializationException exception)
+            {
+                throw new InputFormatterException(Resources.ErrorDeserializingInputData, exception);
+            }
+        }
+
+        /// <inheritdoc />
+        protected override bool CanReadType(Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            return GetCachedSerializer(GetSerializableType(type)) != null;
+        }
+
+        /// <summary>
+        /// Called during deserialization to get the <see cref="XmlReader"/>.
+        /// </summary>
+        /// <param name="readStream">The <see cref="Stream"/> from which to read.</param>
+        /// <param name="encoding">The <see cref="Encoding"/> used to read the stream.</param>
+        /// <returns>The <see cref="XmlReader"/> used during deserialization.</returns>
+        protected virtual XmlReader CreateXmlReader(Stream readStream, Encoding encoding)
+        {
+            if (readStream == null)
+            {
+                throw new ArgumentNullException(nameof(readStream));
+            }
+
+            if (encoding == null)
+            {
+                throw new ArgumentNullException(nameof(encoding));
+            }
+
+            return XmlDictionaryReader.CreateTextReader(readStream, encoding, _readerQuotas, onClose: null);
+        }
+
+        /// <summary>
+        /// Gets the type to which the XML will be deserialized.
+        /// </summary>
+        /// <param name="declaredType">The declared type.</param>
+        /// <returns>The type to which the XML will be deserialized.</returns>
+        protected virtual Type GetSerializableType(Type declaredType)
+        {
+            if (declaredType == null)
+            {
+                throw new ArgumentNullException(nameof(declaredType));
+            }
+
+            var wrapperProvider = WrapperProviderFactories.GetWrapperProvider(
+                new WrapperProviderContext(declaredType, isSerialization: false));
+
+            return wrapperProvider?.WrappingType ?? declaredType;
+        }
+
+        /// <summary>
+        /// Called during deserialization to get the <see cref="DataContractSerializer"/>.
+        /// </summary>
+        /// <param name="type">The type of object for which the serializer should be created.</param>
+        /// <returns>The <see cref="DataContractSerializer"/> used during deserialization.</returns>
+        protected virtual DataContractSerializer CreateSerializer(Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            try
+            {
+                // If the serializer does not support this type it will throw an exception.
+                return new DataContractSerializer(type, _serializerSettings);
+            }
+            catch (Exception)
+            {
+                // We do not surface the caught exception because if CanRead returns
+                // false, then this Formatter is not picked up at all.
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Gets the cached serializer or creates and caches the serializer for the given type.
+        /// </summary>
+        /// <returns>The <see cref="DataContractSerializer"/> instance.</returns>
+        protected virtual DataContractSerializer GetCachedSerializer(Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            if (!_serializerCache.TryGetValue(type, out var serializer))
+            {
+                serializer = CreateSerializer(type);
+                if (serializer != null)
+                {
+                    _serializerCache.TryAdd(type, serializer);
+                }
+            }
+
+            return (DataContractSerializer)serializer;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs
new file mode 100644
index 0000000000..a0f374cc27
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs
@@ -0,0 +1,288 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml;
+using Microsoft.AspNetCore.Mvc.Formatters.Xml;
+using Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// This class handles serialization of objects
+    /// to XML using <see cref="DataContractSerializer"/>
+    /// </summary>
+    public class XmlDataContractSerializerOutputFormatter : TextOutputFormatter
+    {
+        private readonly ConcurrentDictionary<Type, object> _serializerCache = new ConcurrentDictionary<Type, object>();
+        private readonly ILogger _logger;
+        private DataContractSerializerSettings _serializerSettings;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="XmlDataContractSerializerOutputFormatter"/>
+        /// with default <see cref="XmlWriterSettings"/>.
+        /// </summary>
+        public XmlDataContractSerializerOutputFormatter()
+            : this(FormattingUtilities.GetDefaultXmlWriterSettings())
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="XmlDataContractSerializerOutputFormatter"/>
+        /// with default <see cref="XmlWriterSettings"/>.
+        /// </summary>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public XmlDataContractSerializerOutputFormatter(ILoggerFactory loggerFactory)
+            : this(FormattingUtilities.GetDefaultXmlWriterSettings(), loggerFactory)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="XmlDataContractSerializerOutputFormatter"/>.
+        /// </summary>
+        /// <param name="writerSettings">The settings to be used by the <see cref="DataContractSerializer"/>.</param>
+        public XmlDataContractSerializerOutputFormatter(XmlWriterSettings writerSettings)
+            : this(writerSettings, loggerFactory: null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="XmlDataContractSerializerOutputFormatter"/>.
+        /// </summary>
+        /// <param name="writerSettings">The settings to be used by the <see cref="DataContractSerializer"/>.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public XmlDataContractSerializerOutputFormatter(XmlWriterSettings writerSettings, ILoggerFactory loggerFactory)
+        {
+            if (writerSettings == null)
+            {
+                throw new ArgumentNullException(nameof(writerSettings));
+            }
+
+            SupportedEncodings.Add(Encoding.UTF8);
+            SupportedEncodings.Add(Encoding.Unicode);
+
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.ApplicationXml);
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.TextXml);
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.ApplicationAnyXmlSyntax);
+
+            WriterSettings = writerSettings;
+
+            _serializerSettings = new DataContractSerializerSettings();
+
+            WrapperProviderFactories = new List<IWrapperProviderFactory>();
+            WrapperProviderFactories.Add(new EnumerableWrapperProviderFactory(WrapperProviderFactories));
+            WrapperProviderFactories.Add(new SerializableErrorWrapperProviderFactory());
+
+            _logger = loggerFactory?.CreateLogger(GetType());
+        }
+
+        /// <summary>
+        /// Gets the list of <see cref="IWrapperProviderFactory"/> to
+        /// provide the wrapping type for serialization.
+        /// </summary>
+        public IList<IWrapperProviderFactory> WrapperProviderFactories { get; }
+
+        /// <summary>
+        /// Gets the settings to be used by the XmlWriter.
+        /// </summary>
+        public XmlWriterSettings WriterSettings { get; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="DataContractSerializerSettings"/> used to configure the 
+        /// <see cref="DataContractSerializer"/>.
+        /// </summary>
+        public DataContractSerializerSettings SerializerSettings
+        {
+            get => _serializerSettings;
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _serializerSettings = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the type to be serialized.
+        /// </summary>
+        /// <param name="type">The original type to be serialized</param>
+        /// <returns>The original or wrapped type provided by any <see cref="IWrapperProvider"/>s.</returns>
+        protected virtual Type GetSerializableType(Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            var wrapperProvider = WrapperProviderFactories.GetWrapperProvider(new WrapperProviderContext(
+                type,
+                isSerialization: true));
+
+            return wrapperProvider?.WrappingType ?? type;
+        }
+
+        /// <inheritdoc />
+        protected override bool CanWriteType(Type type)
+        {
+            if (type == null)
+            {
+                return false;
+            }
+
+            return GetCachedSerializer(GetSerializableType(type)) != null;
+        }
+
+        /// <summary>
+        /// Create a new instance of <see cref="DataContractSerializer"/> for the given object type.
+        /// </summary>
+        /// <param name="type">The type of object for which the serializer should be created.</param>
+        /// <returns>A new instance of <see cref="DataContractSerializer"/></returns>
+        protected virtual DataContractSerializer CreateSerializer(Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            try
+            {
+                // Verify that type is a valid data contract by forcing the serializer to try to create a data contract
+                FormattingUtilities.XsdDataContractExporter.GetRootElementName(type);
+
+                // If the serializer does not support this type it will throw an exception.
+                return new DataContractSerializer(type, _serializerSettings);
+            }
+            catch (Exception ex)
+            {
+                _logger?.FailedToCreateDataContractSerializer(type.FullName, ex);
+
+                // We do not surface the caught exception because if CanWriteResult returns
+                // false, then this Formatter is not picked up at all.
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="XmlWriter"/> using the given <see cref="TextWriter"/> and
+        /// <see cref="XmlWriterSettings"/>.
+        /// </summary>
+        /// <param name="writer">
+        /// The underlying <see cref="TextWriter"/> which the <see cref="XmlWriter"/> should write to.
+        /// </param>
+        /// <param name="xmlWriterSettings">
+        /// The <see cref="XmlWriterSettings"/>.
+        /// </param>
+        /// <returns>A new instance of <see cref="XmlWriter"/></returns>
+        public virtual XmlWriter CreateXmlWriter(
+            TextWriter writer,
+            XmlWriterSettings xmlWriterSettings)
+        {
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
+            if (xmlWriterSettings == null)
+            {
+                throw new ArgumentNullException(nameof(xmlWriterSettings));
+            }
+
+            // We always close the TextWriter, so the XmlWriter shouldn't.
+            xmlWriterSettings.CloseOutput = false;
+
+            return XmlWriter.Create(writer, xmlWriterSettings);
+        }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="XmlWriter"/> using the given <see cref="TextWriter"/> and
+        /// <see cref="XmlWriterSettings"/>.
+        /// </summary>
+        /// <param name="context">The formatter context associated with the call.</param>
+        /// <param name="writer">
+        /// The underlying <see cref="TextWriter"/> which the <see cref="XmlWriter"/> should write to.
+        /// </param>
+        /// <param name="xmlWriterSettings">
+        /// The <see cref="XmlWriterSettings"/>.
+        /// </param>
+        /// <returns>A new instance of <see cref="XmlWriter"/>.</returns>
+        public virtual XmlWriter CreateXmlWriter(
+            OutputFormatterWriteContext context,
+            TextWriter writer,
+            XmlWriterSettings xmlWriterSettings)
+        {
+            return CreateXmlWriter(writer, xmlWriterSettings);
+        }
+
+        /// <inheritdoc />
+        public override async Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (selectedEncoding == null)
+            {
+                throw new ArgumentNullException(nameof(selectedEncoding));
+            }
+
+            var writerSettings = WriterSettings.Clone();
+            writerSettings.Encoding = selectedEncoding;
+
+            // Wrap the object only if there is a wrapping type.
+            var value = context.Object;
+            var wrappingType = GetSerializableType(context.ObjectType);
+            if (wrappingType != null && wrappingType != context.ObjectType)
+            {
+                var wrapperProvider = WrapperProviderFactories.GetWrapperProvider(new WrapperProviderContext(
+                    declaredType: context.ObjectType,
+                    isSerialization: true));
+
+                value = wrapperProvider.Wrap(value);
+            }
+
+            var dataContractSerializer = GetCachedSerializer(wrappingType);
+
+            using (var textWriter = context.WriterFactory(context.HttpContext.Response.Body, writerSettings.Encoding))
+            {
+                using (var xmlWriter = CreateXmlWriter(context, textWriter, writerSettings))
+                {
+                    dataContractSerializer.WriteObject(xmlWriter, value);
+                }
+
+                // Perf: call FlushAsync to call WriteAsync on the stream with any content left in the TextWriter's
+                // buffers. This is better than just letting dispose handle it (which would result in a synchronous 
+                // write).
+                await textWriter.FlushAsync();
+            }
+        }
+
+        /// <summary>
+        /// Gets the cached serializer or creates and caches the serializer for the given type.
+        /// </summary>
+        /// <returns>The <see cref="DataContractSerializer"/> instance.</returns>
+        protected virtual DataContractSerializer GetCachedSerializer(Type type)
+        {
+            if (!_serializerCache.TryGetValue(type, out var serializer))
+            {
+                serializer = CreateSerializer(type);
+                if (serializer != null)
+                {
+                    _serializerCache.TryAdd(type, serializer);
+                }
+            }
+
+            return (DataContractSerializer)serializer;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs
new file mode 100644
index 0000000000..6708c81257
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs
@@ -0,0 +1,259 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+using System.Xml.Serialization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Formatters.Xml;
+using Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.WebUtilities;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// This class handles deserialization of input XML data
+    /// to strongly-typed objects using <see cref="XmlSerializer"/>
+    /// </summary>
+    public class XmlSerializerInputFormatter : TextInputFormatter, IInputFormatterExceptionPolicy
+    {
+        private readonly ConcurrentDictionary<Type, object> _serializerCache = new ConcurrentDictionary<Type, object>();
+        private readonly XmlDictionaryReaderQuotas _readerQuotas = FormattingUtilities.GetDefaultXmlReaderQuotas();
+        private readonly bool _suppressInputFormatterBuffering;
+        private readonly MvcOptions _options;
+
+        /// <summary>
+        /// Initializes a new instance of XmlSerializerInputFormatter.
+        /// </summary>
+        [Obsolete("This constructor is obsolete and will be removed in a future version.")]
+        public XmlSerializerInputFormatter()
+        {
+            SupportedEncodings.Add(UTF8EncodingWithoutBOM);
+            SupportedEncodings.Add(UTF16EncodingLittleEndian);
+
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.ApplicationXml);
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.TextXml);
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.ApplicationAnyXmlSyntax);
+
+            WrapperProviderFactories = new List<IWrapperProviderFactory>();
+            WrapperProviderFactories.Add(new SerializableErrorWrapperProviderFactory());
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="XmlSerializerInputFormatter"/>.
+        /// </summary>
+        /// <param name="suppressInputFormatterBuffering">Flag to buffer entire request body before deserializing it.</param>
+        [Obsolete("This constructor is obsolete and will be removed in a future version.")]
+        public XmlSerializerInputFormatter(bool suppressInputFormatterBuffering)
+            : this()
+        {
+            _suppressInputFormatterBuffering = suppressInputFormatterBuffering;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="XmlSerializerInputFormatter"/>.
+        /// </summary>
+        /// <param name="options">The <see cref="MvcOptions"/>.</param>
+        public XmlSerializerInputFormatter(MvcOptions options)
+#pragma warning disable CS0618
+            : this()
+#pragma warning restore CS0618
+        {
+            _options = options;
+        }
+
+        /// <summary>
+        /// Gets the list of <see cref="IWrapperProviderFactory"/> to
+        /// provide the wrapping type for de-serialization.
+        /// </summary>
+        public IList<IWrapperProviderFactory> WrapperProviderFactories { get; }
+
+        /// <summary>
+        /// Indicates the acceptable input XML depth.
+        /// </summary>
+        public int MaxDepth
+        {
+            get { return _readerQuotas.MaxDepth; }
+            set { _readerQuotas.MaxDepth = value; }
+        }
+
+        /// <summary>
+        /// The quotas include - DefaultMaxDepth, DefaultMaxStringContentLength, DefaultMaxArrayLength,
+        /// DefaultMaxBytesPerRead, DefaultMaxNameTableCharCount
+        /// </summary>
+        public XmlDictionaryReaderQuotas XmlDictionaryReaderQuotas => _readerQuotas;
+
+        /// <inheritdoc />
+        public virtual InputFormatterExceptionPolicy ExceptionPolicy
+        {
+            get
+            {
+                if (GetType() == typeof(XmlSerializerInputFormatter))
+                {
+                    return InputFormatterExceptionPolicy.MalformedInputExceptions;
+                }
+                return InputFormatterExceptionPolicy.AllExceptions;
+            }
+        }
+
+        /// <inheritdoc />
+        public override async Task<InputFormatterResult> ReadRequestBodyAsync(
+            InputFormatterContext context,
+            Encoding encoding)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (encoding == null)
+            {
+                throw new ArgumentNullException(nameof(encoding));
+            }
+
+            var request = context.HttpContext.Request;
+
+            var suppressInputFormatterBuffering = _options?.SuppressInputFormatterBuffering ?? _suppressInputFormatterBuffering;
+
+            if (!request.Body.CanSeek && !suppressInputFormatterBuffering)
+            {
+                // XmlSerializer does synchronous reads. In order to avoid blocking on the stream, we asynchronously
+                // read everything into a buffer, and then seek back to the beginning.
+                request.EnableBuffering();
+                Debug.Assert(request.Body.CanSeek);
+
+                await request.Body.DrainAsync(CancellationToken.None);
+                request.Body.Seek(0L, SeekOrigin.Begin);
+            }
+
+            try
+            {
+                using (var xmlReader = CreateXmlReader(new NonDisposableStream(request.Body), encoding))
+                {
+                    var type = GetSerializableType(context.ModelType);
+
+                    var serializer = GetCachedSerializer(type);
+
+                    var deserializedObject = serializer.Deserialize(xmlReader);
+
+                    // Unwrap only if the original type was wrapped.
+                    if (type != context.ModelType)
+                    {
+                        if (deserializedObject is IUnwrappable unwrappable)
+                        {
+                            deserializedObject = unwrappable.Unwrap(declaredType: context.ModelType);
+                        }
+                    }
+
+                    return InputFormatterResult.Success(deserializedObject);
+                }
+            }
+            // XmlSerializer wraps actual exceptions (like FormatException or XmlException) into an InvalidOperationException
+            // https://github.com/dotnet/corefx/blob/master/src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializer.cs#L652
+            catch (InvalidOperationException exception) when (exception.InnerException is FormatException || exception.InnerException is XmlException)
+            {
+                throw new InputFormatterException(Resources.ErrorDeserializingInputData, exception);
+            }
+        }
+
+        /// <inheritdoc />
+        protected override bool CanReadType(Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            return GetCachedSerializer(GetSerializableType(type)) != null;
+        }
+
+        /// <summary>
+        /// Gets the type to which the XML will be deserialized.
+        /// </summary>
+        /// <param name="declaredType">The declared type.</param>
+        /// <returns>The type to which the XML will be deserialized.</returns>
+        protected virtual Type GetSerializableType(Type declaredType)
+        {
+            if (declaredType == null)
+            {
+                throw new ArgumentNullException(nameof(declaredType));
+            }
+
+            var wrapperProvider = WrapperProviderFactories.GetWrapperProvider(
+                                                    new WrapperProviderContext(declaredType, isSerialization: false));
+
+            return wrapperProvider?.WrappingType ?? declaredType;
+        }
+
+        /// <summary>
+        /// Called during deserialization to get the <see cref="XmlReader"/>.
+        /// </summary>
+        /// <param name="readStream">The <see cref="Stream"/> from which to read.</param>
+        /// <param name="encoding">The <see cref="Encoding"/> used to read the stream.</param>
+        /// <returns>The <see cref="XmlReader"/> used during deserialization.</returns>
+        protected virtual XmlReader CreateXmlReader(Stream readStream, Encoding encoding)
+        {
+            if (readStream == null)
+            {
+                throw new ArgumentNullException(nameof(readStream));
+            }
+
+            if (encoding == null)
+            {
+                throw new ArgumentNullException(nameof(encoding));
+            }
+
+            return XmlDictionaryReader.CreateTextReader(readStream, encoding, _readerQuotas, onClose: null);
+        }
+
+        /// <summary>
+        /// Called during deserialization to get the <see cref="XmlSerializer"/>.
+        /// </summary>
+        /// <returns>The <see cref="XmlSerializer"/> used during deserialization.</returns>
+        protected virtual XmlSerializer CreateSerializer(Type type)
+        {
+            try
+            {
+                // If the serializer does not support this type it will throw an exception.
+                return new XmlSerializer(type);
+            }
+            catch (Exception)
+            {
+                // We do not surface the caught exception because if CanRead returns
+                // false, then this Formatter is not picked up at all.
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Gets the cached serializer or creates and caches the serializer for the given type.
+        /// </summary>
+        /// <returns>The <see cref="XmlSerializer"/> instance.</returns>
+        protected virtual XmlSerializer GetCachedSerializer(Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            if (!_serializerCache.TryGetValue(type, out var serializer))
+            {
+                serializer = CreateSerializer(type);
+                if (serializer != null)
+                {
+                    _serializerCache.TryAdd(type, serializer);
+                }
+            }
+
+            return (XmlSerializer)serializer;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerOutputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerOutputFormatter.cs
new file mode 100644
index 0000000000..c71be18264
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerOutputFormatter.cs
@@ -0,0 +1,276 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml;
+using System.Xml.Serialization;
+using Microsoft.AspNetCore.Mvc.Formatters.Xml;
+using Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    /// <summary>
+    /// This class handles serialization of objects
+    /// to XML using <see cref="XmlSerializer"/>
+    /// </summary>
+    public class XmlSerializerOutputFormatter : TextOutputFormatter
+    {
+        private readonly ConcurrentDictionary<Type, object> _serializerCache = new ConcurrentDictionary<Type, object>();
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="XmlSerializerOutputFormatter"/>
+        /// with default <see cref="XmlWriterSettings"/>.
+        /// </summary>
+        public XmlSerializerOutputFormatter()
+            : this(FormattingUtilities.GetDefaultXmlWriterSettings())
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="XmlSerializerOutputFormatter"/>
+        /// with default <see cref="XmlWriterSettings"/>.
+        /// </summary>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public XmlSerializerOutputFormatter(ILoggerFactory loggerFactory)
+            : this(FormattingUtilities.GetDefaultXmlWriterSettings(), loggerFactory)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="XmlSerializerOutputFormatter"/>.
+        /// </summary>
+        /// <param name="writerSettings">The settings to be used by the <see cref="XmlSerializer"/>.</param>
+        public XmlSerializerOutputFormatter(XmlWriterSettings writerSettings)
+            : this(writerSettings, loggerFactory: null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="XmlSerializerOutputFormatter"/>
+        /// </summary>
+        /// <param name="writerSettings">The settings to be used by the <see cref="XmlSerializer"/>.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public XmlSerializerOutputFormatter(XmlWriterSettings writerSettings, ILoggerFactory loggerFactory)
+        {
+            if (writerSettings == null)
+            {
+                throw new ArgumentNullException(nameof(writerSettings));
+            }
+
+            SupportedEncodings.Add(Encoding.UTF8);
+            SupportedEncodings.Add(Encoding.Unicode);
+
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.ApplicationXml);
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.TextXml);
+            SupportedMediaTypes.Add(MediaTypeHeaderValues.ApplicationAnyXmlSyntax);
+
+            WriterSettings = writerSettings;
+
+            WrapperProviderFactories = new List<IWrapperProviderFactory>();
+            WrapperProviderFactories.Add(new EnumerableWrapperProviderFactory(WrapperProviderFactories));
+            WrapperProviderFactories.Add(new SerializableErrorWrapperProviderFactory());
+
+            _logger = loggerFactory?.CreateLogger(GetType());
+        }
+
+        /// <summary>
+        /// Gets the list of <see cref="IWrapperProviderFactory"/> to
+        /// provide the wrapping type for serialization.
+        /// </summary>
+        public IList<IWrapperProviderFactory> WrapperProviderFactories { get; }
+
+        /// <summary>
+        /// Gets the settings to be used by the XmlWriter.
+        /// </summary>
+        public XmlWriterSettings WriterSettings { get; }
+
+        /// <summary>
+        /// Gets the type to be serialized.
+        /// </summary>
+        /// <param name="type">The original type to be serialized</param>
+        /// <returns>The original or wrapped type provided by any <see cref="IWrapperProvider"/>.</returns>
+        protected virtual Type GetSerializableType(Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            var wrapperProvider = WrapperProviderFactories.GetWrapperProvider(new WrapperProviderContext(
+                type,
+                isSerialization: true));
+
+            return wrapperProvider?.WrappingType ?? type;
+        }
+
+        /// <inheritdoc />
+        protected override bool CanWriteType(Type type)
+        {
+            if (type == null)
+            {
+                return false;
+            }
+
+            return GetCachedSerializer(GetSerializableType(type)) != null;
+        }
+
+        /// <summary>
+        /// Create a new instance of <see cref="XmlSerializer"/> for the given object type.
+        /// </summary>
+        /// <param name="type">The type of object for which the serializer should be created.</param>
+        /// <returns>A new instance of <see cref="XmlSerializer"/></returns>
+        protected virtual XmlSerializer CreateSerializer(Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            try
+            {
+                // If the serializer does not support this type it will throw an exception.
+                return new XmlSerializer(type);
+            }
+            catch (Exception ex)
+            {
+                _logger?.FailedToCreateXmlSerializer(type.FullName, ex);
+
+                // We do not surface the caught exception because if CanWriteResult returns
+                // false, then this Formatter is not picked up at all.
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="XmlWriter"/> using the given <see cref="TextWriter"/> and
+        /// <see cref="XmlWriterSettings"/>.
+        /// </summary>
+        /// <param name="writer">
+        /// The underlying <see cref="TextWriter"/> which the <see cref="XmlWriter"/> should write to.
+        /// </param>
+        /// <param name="xmlWriterSettings">
+        /// The <see cref="XmlWriterSettings"/>.
+        /// </param>
+        /// <returns>A new instance of <see cref="XmlWriter"/>.</returns>
+        public virtual XmlWriter CreateXmlWriter(
+            TextWriter writer,
+            XmlWriterSettings xmlWriterSettings)
+        {
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
+            if (xmlWriterSettings == null)
+            {
+                throw new ArgumentNullException(nameof(xmlWriterSettings));
+            }
+
+            // We always close the TextWriter, so the XmlWriter shouldn't.
+            xmlWriterSettings.CloseOutput = false;
+
+            return XmlWriter.Create(writer, xmlWriterSettings);
+        }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="XmlWriter"/> using the given <see cref="TextWriter"/> and
+        /// <see cref="XmlWriterSettings"/>.
+        /// </summary>
+        /// <param name="context">The formatter context associated with the call.</param>
+        /// <param name="writer">
+        /// The underlying <see cref="TextWriter"/> which the <see cref="XmlWriter"/> should write to.
+        /// </param>
+        /// <param name="xmlWriterSettings">
+        /// The <see cref="XmlWriterSettings"/>.
+        /// </param>
+        /// <returns>A new instance of <see cref="XmlWriter"/></returns>
+        public virtual XmlWriter CreateXmlWriter(
+            OutputFormatterWriteContext context,
+            TextWriter writer,
+            XmlWriterSettings xmlWriterSettings)
+        {
+            return CreateXmlWriter(writer, xmlWriterSettings);
+        }
+
+        /// <inheritdoc />
+        public override async Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (selectedEncoding == null)
+            {
+                throw new ArgumentNullException(nameof(selectedEncoding));
+            }
+
+            var writerSettings = WriterSettings.Clone();
+            writerSettings.Encoding = selectedEncoding;
+
+            // Wrap the object only if there is a wrapping type.
+            var value = context.Object;
+            var wrappingType = GetSerializableType(context.ObjectType);
+            if (wrappingType != null && wrappingType != context.ObjectType)
+            {
+                var wrapperProvider = WrapperProviderFactories.GetWrapperProvider(new WrapperProviderContext(
+                    declaredType: context.ObjectType,
+                    isSerialization: true));
+
+                value = wrapperProvider.Wrap(value);
+            }
+
+            var xmlSerializer = GetCachedSerializer(wrappingType);
+
+            using (var textWriter = context.WriterFactory(context.HttpContext.Response.Body, writerSettings.Encoding))
+            {
+                using (var xmlWriter = CreateXmlWriter(context, textWriter, writerSettings))
+                {
+                    Serialize(xmlSerializer, xmlWriter, value);
+                }
+
+                // Perf: call FlushAsync to call WriteAsync on the stream with any content left in the TextWriter's
+                // buffers. This is better than just letting dispose handle it (which would result in a synchronous 
+                // write).
+                await textWriter.FlushAsync();
+            }
+        }
+
+        /// <summary>
+        /// Serializes value using the passed in <paramref name="xmlSerializer"/> and <paramref name="xmlWriter"/>.
+        /// </summary>
+        /// <param name="xmlSerializer">The serializer used to serialize the <paramref name="value"/>.</param>
+        /// <param name="xmlWriter">The writer used by the serializer <paramref name="xmlSerializer"/>
+        /// to serialize the <paramref name="value"/>.</param>
+        /// <param name="value">The value to be serialized.</param>
+        protected virtual void Serialize(XmlSerializer xmlSerializer, XmlWriter xmlWriter, object value)
+        {
+            xmlSerializer.Serialize(xmlWriter, value);
+        }
+
+        /// <summary>
+        /// Gets the cached serializer or creates and caches the serializer for the given type.
+        /// </summary>
+        /// <returns>The <see cref="XmlSerializer"/> instance.</returns>
+        protected virtual XmlSerializer GetCachedSerializer(Type type)
+        {
+            if (!_serializerCache.TryGetValue(type, out var serializer))
+            {
+                serializer = CreateSerializer(type);
+                if (serializer != null)
+                {
+                    _serializerCache.TryAdd(type, serializer);
+                }
+            }
+
+            return (XmlSerializer)serializer;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/baseline.netcore.json
new file mode 100644
index 0000000000..e617a3e461
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/baseline.netcore.json
@@ -0,0 +1,1500 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc.Formatters.Xml, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DataMemberRequiredBindingMetadataProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IBindingMetadataProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateBindingMetadata",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadataProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IBindingMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.XmlDataContractSerializerInputFormatter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Formatters.TextInputFormatter",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Formatters.IInputFormatterExceptionPolicy"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_WrapperProviderFactories",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProviderFactory>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MaxDepth",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MaxDepth",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_XmlDictionaryReaderQuotas",
+          "Parameters": [],
+          "ReturnType": "System.Xml.XmlDictionaryReaderQuotas",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SerializerSettings",
+          "Parameters": [],
+          "ReturnType": "System.Runtime.Serialization.DataContractSerializerSettings",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SerializerSettings",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Runtime.Serialization.DataContractSerializerSettings"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ExceptionPolicy",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterExceptionPolicy",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.IInputFormatterExceptionPolicy",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReadRequestBodyAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext"
+            },
+            {
+              "Name": "encoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CanReadType",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateXmlReader",
+          "Parameters": [
+            {
+              "Name": "readStream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "encoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "System.Xml.XmlReader",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetSerializableType",
+          "Parameters": [
+            {
+              "Name": "declaredType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Type",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateSerializer",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Runtime.Serialization.DataContractSerializer",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetCachedSerializer",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Runtime.Serialization.DataContractSerializer",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "suppressInputFormatterBuffering",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Mvc.MvcOptions"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.XmlDataContractSerializerOutputFormatter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Formatters.TextOutputFormatter",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_WrapperProviderFactories",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProviderFactory>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_WriterSettings",
+          "Parameters": [],
+          "ReturnType": "System.Xml.XmlWriterSettings",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SerializerSettings",
+          "Parameters": [],
+          "ReturnType": "System.Runtime.Serialization.DataContractSerializerSettings",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SerializerSettings",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Runtime.Serialization.DataContractSerializerSettings"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetSerializableType",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Type",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CanWriteType",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateSerializer",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Runtime.Serialization.DataContractSerializer",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateXmlWriter",
+          "Parameters": [
+            {
+              "Name": "writer",
+              "Type": "System.IO.TextWriter"
+            },
+            {
+              "Name": "xmlWriterSettings",
+              "Type": "System.Xml.XmlWriterSettings"
+            }
+          ],
+          "ReturnType": "System.Xml.XmlWriter",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateXmlWriter",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext"
+            },
+            {
+              "Name": "writer",
+              "Type": "System.IO.TextWriter"
+            },
+            {
+              "Name": "xmlWriterSettings",
+              "Type": "System.Xml.XmlWriterSettings"
+            }
+          ],
+          "ReturnType": "System.Xml.XmlWriter",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteResponseBodyAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext"
+            },
+            {
+              "Name": "selectedEncoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetCachedSerializer",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Runtime.Serialization.DataContractSerializer",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "writerSettings",
+              "Type": "System.Xml.XmlWriterSettings"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "writerSettings",
+              "Type": "System.Xml.XmlWriterSettings"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.XmlSerializerInputFormatter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Formatters.TextInputFormatter",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Formatters.IInputFormatterExceptionPolicy"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_WrapperProviderFactories",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProviderFactory>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MaxDepth",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MaxDepth",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_XmlDictionaryReaderQuotas",
+          "Parameters": [],
+          "ReturnType": "System.Xml.XmlDictionaryReaderQuotas",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ExceptionPolicy",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterExceptionPolicy",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.IInputFormatterExceptionPolicy",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReadRequestBodyAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext"
+            },
+            {
+              "Name": "encoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CanReadType",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetSerializableType",
+          "Parameters": [
+            {
+              "Name": "declaredType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Type",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateXmlReader",
+          "Parameters": [
+            {
+              "Name": "readStream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "encoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "System.Xml.XmlReader",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateSerializer",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Xml.Serialization.XmlSerializer",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetCachedSerializer",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Xml.Serialization.XmlSerializer",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "suppressInputFormatterBuffering",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Mvc.MvcOptions"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.XmlSerializerOutputFormatter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Formatters.TextOutputFormatter",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_WrapperProviderFactories",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProviderFactory>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_WriterSettings",
+          "Parameters": [],
+          "ReturnType": "System.Xml.XmlWriterSettings",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetSerializableType",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Type",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CanWriteType",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateSerializer",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Xml.Serialization.XmlSerializer",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateXmlWriter",
+          "Parameters": [
+            {
+              "Name": "writer",
+              "Type": "System.IO.TextWriter"
+            },
+            {
+              "Name": "xmlWriterSettings",
+              "Type": "System.Xml.XmlWriterSettings"
+            }
+          ],
+          "ReturnType": "System.Xml.XmlWriter",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateXmlWriter",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext"
+            },
+            {
+              "Name": "writer",
+              "Type": "System.IO.TextWriter"
+            },
+            {
+              "Name": "xmlWriterSettings",
+              "Type": "System.Xml.XmlWriterSettings"
+            }
+          ],
+          "ReturnType": "System.Xml.XmlWriter",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteResponseBodyAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext"
+            },
+            {
+              "Name": "selectedEncoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Serialize",
+          "Parameters": [
+            {
+              "Name": "xmlSerializer",
+              "Type": "System.Xml.Serialization.XmlSerializer"
+            },
+            {
+              "Name": "xmlWriter",
+              "Type": "System.Xml.XmlWriter"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetCachedSerializer",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Xml.Serialization.XmlSerializer",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "writerSettings",
+              "Type": "System.Xml.XmlWriterSettings"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "writerSettings",
+              "Type": "System.Xml.XmlWriterSettings"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.Xml.DelegatingEnumerable<T0, T1>",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IEnumerable<T0>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetEnumerator",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerator<T0>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IEnumerable<T0>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "source",
+              "Type": "System.Collections.Generic.IEnumerable<T1>"
+            },
+            {
+              "Name": "elementWrapperProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TWrapped",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": []
+        },
+        {
+          "ParameterName": "TDeclared",
+          "ParameterPosition": 1,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.Xml.DelegatingEnumerator<T0, T1>",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IEnumerator<T0>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MoveNext",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Reset",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Current",
+          "Parameters": [],
+          "ReturnType": "T0",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IEnumerator<T0>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "inner",
+              "Type": "System.Collections.Generic.IEnumerator<T1>"
+            },
+            {
+              "Name": "wrapperProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TWrapped",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": []
+        },
+        {
+          "ParameterName": "TDeclared",
+          "ParameterPosition": 1,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.Xml.EnumerableWrapperProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_WrappingType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Wrap",
+          "Parameters": [
+            {
+              "Name": "original",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "sourceEnumerableOfT",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "elementWrapperProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.Xml.EnumerableWrapperProviderFactory",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProviderFactory"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetProvider",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.Xml.WrapperProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProvider",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProviderFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "wrapperProviderFactories",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProviderFactory>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.Xml.IUnwrappable",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Unwrap",
+          "Parameters": [
+            {
+              "Name": "declaredType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_WrappingType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Wrap",
+          "Parameters": [
+            {
+              "Name": "original",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProviderFactory",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetProvider",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.Xml.WrapperProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProvider",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.Xml.SerializableErrorWrapper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.Xml.Serialization.IXmlSerializable",
+        "Microsoft.AspNetCore.Mvc.Formatters.Xml.IUnwrappable"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_SerializableError",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.SerializableError",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetSchema",
+          "Parameters": [],
+          "ReturnType": "System.Xml.Schema.XmlSchema",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Xml.Serialization.IXmlSerializable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReadXml",
+          "Parameters": [
+            {
+              "Name": "reader",
+              "Type": "System.Xml.XmlReader"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Xml.Serialization.IXmlSerializable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteXml",
+          "Parameters": [
+            {
+              "Name": "writer",
+              "Type": "System.Xml.XmlWriter"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Xml.Serialization.IXmlSerializable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Unwrap",
+          "Parameters": [
+            {
+              "Name": "declaredType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.Xml.IUnwrappable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "error",
+              "Type": "Microsoft.AspNetCore.Mvc.SerializableError"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.Xml.SerializableErrorWrapperProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_WrappingType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Wrap",
+          "Parameters": [
+            {
+              "Name": "original",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.Xml.SerializableErrorWrapperProviderFactory",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProviderFactory"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetProvider",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.Xml.WrapperProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProvider",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProviderFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.Xml.WrapperProviderContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DeclaredType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsSerialization",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "declaredType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "isSerialization",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Formatters.Xml.WrapperProviderFactoriesExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetWrapperProvider",
+          "Parameters": [
+            {
+              "Name": "wrapperProviderFactories",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProviderFactory>"
+            },
+            {
+              "Name": "wrapperProviderContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.Xml.WrapperProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProvider",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.MvcXmlMvcBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddXmlDataContractSerializerFormatters",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddXmlSerializerFormatters",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.MvcXmlMvcCoreBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddXmlDataContractSerializerFormatters",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddXmlSerializerFormatters",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/DependencyInjection/MvcLocalizationMvcBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/DependencyInjection/MvcLocalizationMvcBuilderExtensions.cs
new file mode 100644
index 0000000000..ddeb4f25b4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/DependencyInjection/MvcLocalizationMvcBuilderExtensions.cs
@@ -0,0 +1,319 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.Localization.Internal;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    /// <summary>
+    /// Extension methods for configuring MVC view and data annotations localization services.
+    /// </summary>
+    public static class MvcLocalizationMvcBuilderExtensions
+    {
+        /// <summary>
+        /// Adds MVC view localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder AddViewLocalization(this IMvcBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return AddViewLocalization(builder, LanguageViewLocationExpanderFormat.Suffix);
+        }
+
+        /// <summary>
+        ///  Adds MVC view localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="format">The view format for localized views.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder AddViewLocalization(
+            this IMvcBuilder builder,
+            LanguageViewLocationExpanderFormat format)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            AddViewLocalization(builder, format, setupAction: null);
+            return builder;
+        }
+
+        /// <summary>
+        ///  Adds MVC view localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="setupAction">An action to configure the <see cref="LocalizationOptions"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder AddViewLocalization(
+            this IMvcBuilder builder,
+            Action<LocalizationOptions> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            AddViewLocalization(builder, LanguageViewLocationExpanderFormat.Suffix, setupAction);
+            return builder;
+        }
+
+        /// <summary>
+        ///  Adds MVC view localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="format">The view format for localized views.</param>
+        /// <param name="setupAction">An action to configure the <see cref="LocalizationOptions"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder AddViewLocalization(
+            this IMvcBuilder builder,
+            LanguageViewLocationExpanderFormat format,
+            Action<LocalizationOptions> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            MvcLocalizationServices.AddLocalizationServices(builder.Services, format, setupAction);
+            return builder;
+        }
+
+        /// <summary>
+        /// Adds MVC view and data annotations localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        /// <remarks>
+        /// Adding localization also adds support for views via
+        /// <see cref="MvcViewFeaturesMvcCoreBuilderExtensions.AddViews(IMvcCoreBuilder)"/> and the Razor view engine
+        /// via <see cref="MvcRazorMvcCoreBuilderExtensions.AddRazorViewEngine(IMvcCoreBuilder)"/>.
+        /// </remarks>
+        public static IMvcBuilder AddMvcLocalization(this IMvcBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return AddMvcLocalization(
+                builder,
+                localizationOptionsSetupAction: null,
+                format: LanguageViewLocationExpanderFormat.Suffix,
+                dataAnnotationsLocalizationOptionsSetupAction: null);
+        }
+
+        /// <summary>
+        /// Adds MVC view and data annotations localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="localizationOptionsSetupAction">An action to configure the <see cref="LocalizationOptions"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        /// <remarks>
+        /// Adding localization also adds support for views via
+        /// <see cref="MvcViewFeaturesMvcCoreBuilderExtensions.AddViews(IMvcCoreBuilder)"/> and the Razor view engine
+        /// via <see cref="MvcRazorMvcCoreBuilderExtensions.AddRazorViewEngine(IMvcCoreBuilder)"/>.
+        /// </remarks>
+        public static IMvcBuilder AddMvcLocalization(
+            this IMvcBuilder builder,
+            Action<LocalizationOptions> localizationOptionsSetupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return AddMvcLocalization(
+                builder,
+                localizationOptionsSetupAction,
+                LanguageViewLocationExpanderFormat.Suffix,
+                dataAnnotationsLocalizationOptionsSetupAction: null);
+        }
+
+        /// <summary>
+        /// Adds MVC view and data annotations localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="format">The view format for localized views.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        /// <remarks>
+        /// Adding localization also adds support for views via
+        /// <see cref="MvcViewFeaturesMvcCoreBuilderExtensions.AddViews(IMvcCoreBuilder)"/> and the Razor view engine
+        /// via <see cref="MvcRazorMvcCoreBuilderExtensions.AddRazorViewEngine(IMvcCoreBuilder)"/>.
+        /// </remarks>
+        public static IMvcBuilder AddMvcLocalization(
+            this IMvcBuilder builder,
+            LanguageViewLocationExpanderFormat format)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return AddMvcLocalization(
+                builder,
+                localizationOptionsSetupAction: null,
+                format: format,
+                dataAnnotationsLocalizationOptionsSetupAction: null);
+        }
+
+        /// <summary>
+        /// Adds MVC view and data annotations localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="localizationOptionsSetupAction">An action to configure the
+        /// <see cref="LocalizationOptions"/>.</param>
+        /// <param name="format">The view format for localized views.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        /// <remarks>
+        /// Adding localization also adds support for views via
+        /// <see cref="MvcViewFeaturesMvcCoreBuilderExtensions.AddViews(IMvcCoreBuilder)"/> and the Razor view engine
+        /// via <see cref="MvcRazorMvcCoreBuilderExtensions.AddRazorViewEngine(IMvcCoreBuilder)"/>.
+        /// </remarks>
+        public static IMvcBuilder AddMvcLocalization(
+            this IMvcBuilder builder,
+            Action<LocalizationOptions> localizationOptionsSetupAction,
+            LanguageViewLocationExpanderFormat format)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return AddMvcLocalization(
+                builder,
+                localizationOptionsSetupAction: localizationOptionsSetupAction,
+                format: format,
+                dataAnnotationsLocalizationOptionsSetupAction: null);
+        }
+
+        /// <summary>
+        /// Adds MVC view and data annotations localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="dataAnnotationsLocalizationOptionsSetupAction">An action to configure the
+        /// <see cref="MvcDataAnnotationsLocalizationOptions"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        /// <remarks>
+        /// Adding localization also adds support for views via
+        /// <see cref="MvcViewFeaturesMvcCoreBuilderExtensions.AddViews(IMvcCoreBuilder)"/> and the Razor view engine
+        /// via <see cref="MvcRazorMvcCoreBuilderExtensions.AddRazorViewEngine(IMvcCoreBuilder)"/>.
+        /// </remarks>
+        public static IMvcBuilder AddMvcLocalization(
+            this IMvcBuilder builder,
+            Action<MvcDataAnnotationsLocalizationOptions> dataAnnotationsLocalizationOptionsSetupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return AddMvcLocalization(
+                builder,
+                localizationOptionsSetupAction: null,
+                format: LanguageViewLocationExpanderFormat.Suffix,
+                dataAnnotationsLocalizationOptionsSetupAction: dataAnnotationsLocalizationOptionsSetupAction);
+        }
+
+        /// <summary>
+        /// Adds MVC view and data annotations localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="localizationOptionsSetupAction">An action to configure the
+        /// <see cref="LocalizationOptions"/>.</param>
+        /// <param name="dataAnnotationsLocalizationOptionsSetupAction">An action to configure the
+        /// <see cref="MvcDataAnnotationsLocalizationOptions"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        /// <remarks>
+        /// Adding localization also adds support for views via
+        /// <see cref="MvcViewFeaturesMvcCoreBuilderExtensions.AddViews(IMvcCoreBuilder)"/> and the Razor view engine
+        /// via <see cref="MvcRazorMvcCoreBuilderExtensions.AddRazorViewEngine(IMvcCoreBuilder)"/>.
+        /// </remarks>
+        public static IMvcBuilder AddMvcLocalization(
+            this IMvcBuilder builder,
+            Action<LocalizationOptions> localizationOptionsSetupAction,
+            Action<MvcDataAnnotationsLocalizationOptions> dataAnnotationsLocalizationOptionsSetupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return AddMvcLocalization(
+                builder,
+                localizationOptionsSetupAction: localizationOptionsSetupAction,
+                format: LanguageViewLocationExpanderFormat.Suffix,
+                dataAnnotationsLocalizationOptionsSetupAction: dataAnnotationsLocalizationOptionsSetupAction);
+        }
+
+        /// <summary>
+        /// Adds MVC view and data annotations localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="format">The view format for localized views.</param>
+        /// <param name="dataAnnotationsLocalizationOptionsSetupAction">An action to configure the
+        /// <see cref="MvcDataAnnotationsLocalizationOptions"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        /// <remarks>
+        /// Adding localization also adds support for views via
+        /// <see cref="MvcViewFeaturesMvcCoreBuilderExtensions.AddViews(IMvcCoreBuilder)"/> and the Razor view engine
+        /// via <see cref="MvcRazorMvcCoreBuilderExtensions.AddRazorViewEngine(IMvcCoreBuilder)"/>.
+        /// </remarks>
+        public static IMvcBuilder AddMvcLocalization(
+            this IMvcBuilder builder,
+            LanguageViewLocationExpanderFormat format,
+            Action<MvcDataAnnotationsLocalizationOptions> dataAnnotationsLocalizationOptionsSetupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return AddMvcLocalization(
+                builder,
+                localizationOptionsSetupAction: null,
+                format: format,
+                dataAnnotationsLocalizationOptionsSetupAction: dataAnnotationsLocalizationOptionsSetupAction);
+        }
+
+        /// <summary>
+        /// Adds MVC view and data annotations localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="localizationOptionsSetupAction">An action to configure the <see cref="LocalizationOptions"/>.
+        /// Can be <c>null</c>.</param>
+        /// <param name="format">The view format for localized views.</param>
+        /// <param name="dataAnnotationsLocalizationOptionsSetupAction">An action to configure 
+        /// the <see cref="MvcDataAnnotationsLocalizationOptions"/>. Can be <c>null</c>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        /// <remarks>
+        /// Adding localization also adds support for views via
+        /// <see cref="MvcViewFeaturesMvcCoreBuilderExtensions.AddViews(IMvcCoreBuilder)"/> and the Razor view engine
+        /// via <see cref="MvcRazorMvcCoreBuilderExtensions.AddRazorViewEngine(IMvcCoreBuilder)"/>.
+        /// </remarks>
+        public static IMvcBuilder AddMvcLocalization(
+            this IMvcBuilder builder,
+            Action<LocalizationOptions> localizationOptionsSetupAction,
+            LanguageViewLocationExpanderFormat format,
+            Action<MvcDataAnnotationsLocalizationOptions> dataAnnotationsLocalizationOptionsSetupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return builder
+                .AddViewLocalization(format, localizationOptionsSetupAction)
+                .AddDataAnnotationsLocalization(dataAnnotationsLocalizationOptionsSetupAction);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/DependencyInjection/MvcLocalizationMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/DependencyInjection/MvcLocalizationMvcCoreBuilderExtensions.cs
new file mode 100644
index 0000000000..27b1f90a7f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/DependencyInjection/MvcLocalizationMvcCoreBuilderExtensions.cs
@@ -0,0 +1,344 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.Localization.Internal;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    /// <summary>
+    /// Extension methods for configuring MVC view and data annotations localization services.
+    /// </summary>
+    public static class MvcLocalizationMvcCoreBuilderExtensions
+    {
+        /// <summary>
+        /// Adds MVC view localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        /// <remarks>
+        /// Adding localization also adds support for views via
+        /// <see cref="MvcViewFeaturesMvcCoreBuilderExtensions.AddViews(IMvcCoreBuilder)"/> and the Razor view engine
+        /// via <see cref="MvcRazorMvcCoreBuilderExtensions.AddRazorViewEngine(IMvcCoreBuilder)"/>.
+        /// </remarks>
+        public static IMvcCoreBuilder AddViewLocalization(this IMvcCoreBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return AddViewLocalization(builder, LanguageViewLocationExpanderFormat.Suffix);
+        }
+
+        /// <summary>
+        ///  Adds MVC view localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <param name="format">The view format for localized views.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        /// <remarks>
+        /// Adding localization also adds support for views via
+        /// <see cref="MvcViewFeaturesMvcCoreBuilderExtensions.AddViews(IMvcCoreBuilder)"/> and the Razor view engine
+        /// via <see cref="MvcRazorMvcCoreBuilderExtensions.AddRazorViewEngine(IMvcCoreBuilder)"/>.
+        /// </remarks>
+        public static IMvcCoreBuilder AddViewLocalization(
+            this IMvcCoreBuilder builder,
+            LanguageViewLocationExpanderFormat format)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddViews();
+            builder.AddRazorViewEngine();
+
+            MvcLocalizationServices.AddLocalizationServices(builder.Services, format, setupAction: null);
+            return builder;
+        }
+
+        /// <summary>
+        /// Adds MVC view localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <param name="setupAction">An action to configure the <see cref="LocalizationOptions"/>.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        /// <remarks>
+        /// Adding localization also adds support for views via
+        /// <see cref="MvcViewFeaturesMvcCoreBuilderExtensions.AddViews(IMvcCoreBuilder)"/> and the Razor view engine
+        /// via <see cref="MvcRazorMvcCoreBuilderExtensions.AddRazorViewEngine(IMvcCoreBuilder)"/>.
+        /// </remarks>
+        public static IMvcCoreBuilder AddViewLocalization(
+            this IMvcCoreBuilder builder,
+            Action<LocalizationOptions> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return AddViewLocalization(builder, LanguageViewLocationExpanderFormat.Suffix, setupAction);
+        }
+
+        /// <summary>
+        ///  Adds MVC view localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <param name="format">The view format for localized views.</param>
+        /// <param name="setupAction">An action to configure the <see cref="LocalizationOptions"/>.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        /// <remarks>
+        /// Adding localization also adds support for views via
+        /// <see cref="MvcViewFeaturesMvcCoreBuilderExtensions.AddViews(IMvcCoreBuilder)"/> and the Razor view engine
+        /// via <see cref="MvcRazorMvcCoreBuilderExtensions.AddRazorViewEngine(IMvcCoreBuilder)"/>.
+        /// </remarks>
+        public static IMvcCoreBuilder AddViewLocalization(
+            this IMvcCoreBuilder builder,
+            LanguageViewLocationExpanderFormat format,
+            Action<LocalizationOptions> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddViews();
+            builder.AddRazorViewEngine();
+
+            MvcLocalizationServices.AddLocalizationServices(builder.Services, format, setupAction);
+            return builder;
+        }
+
+        /// <summary>
+        /// Adds MVC view and data annotations localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        /// <remarks>
+        /// Adding localization also adds support for views via
+        /// <see cref="MvcViewFeaturesMvcCoreBuilderExtensions.AddViews(IMvcCoreBuilder)"/> and the Razor view engine
+        /// via <see cref="MvcRazorMvcCoreBuilderExtensions.AddRazorViewEngine(IMvcCoreBuilder)"/>.
+        /// </remarks>
+        public static IMvcCoreBuilder AddMvcLocalization(this IMvcCoreBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return AddMvcLocalization(
+                builder,
+                localizationOptionsSetupAction: null,
+                format: LanguageViewLocationExpanderFormat.Suffix,
+                dataAnnotationsLocalizationOptionsSetupAction: null);
+        }
+
+        /// <summary>
+        /// Adds MVC view and data annotations localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <param name="localizationOptionsSetupAction">An action to configure the <see cref="LocalizationOptions"/>.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        /// <remarks>
+        /// Adding localization also adds support for views via
+        /// <see cref="MvcViewFeaturesMvcCoreBuilderExtensions.AddViews(IMvcCoreBuilder)"/> and the Razor view engine
+        /// via <see cref="MvcRazorMvcCoreBuilderExtensions.AddRazorViewEngine(IMvcCoreBuilder)"/>.
+        /// </remarks>
+        public static IMvcCoreBuilder AddMvcLocalization(
+            this IMvcCoreBuilder builder,
+            Action<LocalizationOptions> localizationOptionsSetupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return AddMvcLocalization(
+                builder,
+                localizationOptionsSetupAction,
+                LanguageViewLocationExpanderFormat.Suffix,
+                dataAnnotationsLocalizationOptionsSetupAction: null);
+        }
+
+        /// <summary>
+        /// Adds MVC view and data annotations localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <param name="format">The view format for localized views.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        /// <remarks>
+        /// Adding localization also adds support for views via
+        /// <see cref="MvcViewFeaturesMvcCoreBuilderExtensions.AddViews(IMvcCoreBuilder)"/> and the Razor view engine
+        /// via <see cref="MvcRazorMvcCoreBuilderExtensions.AddRazorViewEngine(IMvcCoreBuilder)"/>.
+        /// </remarks>
+        public static IMvcCoreBuilder AddMvcLocalization(
+            this IMvcCoreBuilder builder,
+            LanguageViewLocationExpanderFormat format)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return AddMvcLocalization(
+                builder,
+                localizationOptionsSetupAction: null,
+                format: format,
+                dataAnnotationsLocalizationOptionsSetupAction: null);
+        }
+
+        /// <summary>
+        /// Adds MVC view and data annotations localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <param name="localizationOptionsSetupAction">An action to configure the
+        /// <see cref="LocalizationOptions"/>.</param>
+        /// <param name="format">The view format for localized views.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        /// <remarks>
+        /// Adding localization also adds support for views via
+        /// <see cref="MvcViewFeaturesMvcCoreBuilderExtensions.AddViews(IMvcCoreBuilder)"/> and the Razor view engine
+        /// via <see cref="MvcRazorMvcCoreBuilderExtensions.AddRazorViewEngine(IMvcCoreBuilder)"/>.
+        /// </remarks>
+        public static IMvcCoreBuilder AddMvcLocalization(
+            this IMvcCoreBuilder builder,
+            Action<LocalizationOptions> localizationOptionsSetupAction,
+            LanguageViewLocationExpanderFormat format)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return AddMvcLocalization(
+                builder,
+                localizationOptionsSetupAction: localizationOptionsSetupAction,
+                format: format,
+                dataAnnotationsLocalizationOptionsSetupAction: null);
+        }
+
+        /// <summary>
+        /// Adds MVC view and data annotations localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <param name="dataAnnotationsLocalizationOptionsSetupAction">An action to configure
+        /// the <see cref="MvcDataAnnotationsLocalizationOptions"/>.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        /// <remarks>
+        /// Adding localization also adds support for views via
+        /// <see cref="MvcViewFeaturesMvcCoreBuilderExtensions.AddViews(IMvcCoreBuilder)"/> and the Razor view engine
+        /// via <see cref="MvcRazorMvcCoreBuilderExtensions.AddRazorViewEngine(IMvcCoreBuilder)"/>.
+        /// </remarks>
+        public static IMvcCoreBuilder AddMvcLocalization(
+            this IMvcCoreBuilder builder,
+            Action<MvcDataAnnotationsLocalizationOptions> dataAnnotationsLocalizationOptionsSetupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return AddMvcLocalization(
+                builder,
+                localizationOptionsSetupAction: null,
+                format: LanguageViewLocationExpanderFormat.Suffix,
+                dataAnnotationsLocalizationOptionsSetupAction: dataAnnotationsLocalizationOptionsSetupAction);
+        }
+
+        /// <summary>
+        /// Adds MVC view and data annotations localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <param name="localizationOptionsSetupAction">An action to configure the
+        /// <see cref="LocalizationOptions"/>.</param>
+        /// <param name="dataAnnotationsLocalizationOptionsSetupAction">An action to configure the
+        /// <see cref="MvcDataAnnotationsLocalizationOptions"/>.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        /// <remarks>
+        /// Adding localization also adds support for views via
+        /// <see cref="MvcViewFeaturesMvcCoreBuilderExtensions.AddViews(IMvcCoreBuilder)"/> and the Razor view engine
+        /// via <see cref="MvcRazorMvcCoreBuilderExtensions.AddRazorViewEngine(IMvcCoreBuilder)"/>.
+        /// </remarks>
+        public static IMvcCoreBuilder AddMvcLocalization(
+            this IMvcCoreBuilder builder,
+            Action<LocalizationOptions> localizationOptionsSetupAction,
+            Action<MvcDataAnnotationsLocalizationOptions> dataAnnotationsLocalizationOptionsSetupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return AddMvcLocalization(
+                builder,
+                localizationOptionsSetupAction: localizationOptionsSetupAction,
+                format: LanguageViewLocationExpanderFormat.Suffix,
+                dataAnnotationsLocalizationOptionsSetupAction: dataAnnotationsLocalizationOptionsSetupAction);
+        }
+
+        /// <summary>
+        /// Adds MVC view and data annotations localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <param name="format">The view format for localized views.</param>
+        /// <param name="dataAnnotationsLocalizationOptionsSetupAction">An action to configure the
+        /// <see cref="MvcDataAnnotationsLocalizationOptions"/>.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        /// <remarks>
+        /// Adding localization also adds support for views via
+        /// <see cref="MvcViewFeaturesMvcCoreBuilderExtensions.AddViews(IMvcCoreBuilder)"/> and the Razor view engine
+        /// via <see cref="MvcRazorMvcCoreBuilderExtensions.AddRazorViewEngine(IMvcCoreBuilder)"/>.
+        /// </remarks>
+        public static IMvcCoreBuilder AddMvcLocalization(
+            this IMvcCoreBuilder builder,
+            LanguageViewLocationExpanderFormat format,
+            Action<MvcDataAnnotationsLocalizationOptions> dataAnnotationsLocalizationOptionsSetupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return AddMvcLocalization(
+                builder,
+                localizationOptionsSetupAction: null,
+                format: format,
+                dataAnnotationsLocalizationOptionsSetupAction: dataAnnotationsLocalizationOptionsSetupAction);
+        }
+
+        /// <summary>
+        /// Adds MVC view and data annotations localization services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <param name="localizationOptionsSetupAction">An action to configure
+        /// the <see cref="LocalizationOptions"/>. Can be <c>null</c>.</param>
+        /// <param name="format">The view format for localized views.</param>
+        /// <param name="dataAnnotationsLocalizationOptionsSetupAction">An action to configure
+        /// the <see cref="MvcDataAnnotationsLocalizationOptions"/>. Can be <c>null</c>.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        /// <remarks>
+        /// Adding localization also adds support for views via
+        /// <see cref="MvcViewFeaturesMvcCoreBuilderExtensions.AddViews(IMvcCoreBuilder)"/> and the Razor view engine
+        /// via <see cref="MvcRazorMvcCoreBuilderExtensions.AddRazorViewEngine(IMvcCoreBuilder)"/>.
+        /// </remarks>
+        public static IMvcCoreBuilder AddMvcLocalization(
+            this IMvcCoreBuilder builder,
+            Action<LocalizationOptions> localizationOptionsSetupAction,
+            LanguageViewLocationExpanderFormat format,
+            Action<MvcDataAnnotationsLocalizationOptions> dataAnnotationsLocalizationOptionsSetupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return builder
+                .AddViewLocalization(format, localizationOptionsSetupAction)
+                .AddDataAnnotationsLocalization(dataAnnotationsLocalizationOptionsSetupAction);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizer.cs
new file mode 100644
index 0000000000..9ef531438f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizer.cs
@@ -0,0 +1,108 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.Localization
+{
+    /// <summary>
+    /// An <see cref="IHtmlLocalizer"/> that uses the provided <see cref="IStringLocalizer"/> to do HTML-aware
+    /// localization of content.
+    /// </summary>
+    public class HtmlLocalizer : IHtmlLocalizer
+    {
+        private readonly IStringLocalizer _localizer;
+
+        /// <summary>
+        /// Creates a new <see cref="HtmlLocalizer"/>.
+        /// </summary>
+        /// <param name="localizer">The <see cref="IStringLocalizer"/> to read strings from.</param>
+        public HtmlLocalizer(IStringLocalizer localizer)
+        {
+            if (localizer == null)
+            {
+                throw new ArgumentNullException(nameof(localizer));
+            }
+
+            _localizer = localizer;
+        }
+
+        /// <inheritdoc />
+        public virtual LocalizedHtmlString this[string name]
+        {
+            get
+            {
+                if (name == null)
+                {
+                    throw new ArgumentNullException(nameof(name));
+                }
+
+                return ToHtmlString(_localizer[name]);
+            }
+        }
+
+        /// <inheritdoc />
+        public virtual LocalizedHtmlString this[string name, params object[] arguments]
+        {
+            get
+            {
+                if (name == null)
+                {
+                    throw new ArgumentNullException(nameof(name));
+                }
+
+                return ToHtmlString(_localizer[name], arguments);
+            }
+        }
+
+        /// <inheritdoc />
+        public virtual LocalizedString GetString(string name)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            return _localizer[name];
+        }
+
+        /// <inheritdoc />
+        public virtual LocalizedString GetString(string name, params object[] arguments)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            return _localizer[name, arguments];
+        }
+
+        /// <inheritdoc />
+        public virtual IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures) =>
+            _localizer.GetAllStrings(includeParentCultures);
+
+        /// <inheritdoc />
+        public virtual IHtmlLocalizer WithCulture(CultureInfo culture)
+        {
+            if (culture == null)
+            {
+                throw new ArgumentNullException(nameof(culture));
+            }
+
+            return new HtmlLocalizer(_localizer.WithCulture(culture));
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="LocalizedHtmlString"/> for a <see cref="LocalizedString"/>.
+        /// </summary>
+        /// <param name="result">The <see cref="LocalizedString"/>.</param>
+        protected virtual LocalizedHtmlString ToHtmlString(LocalizedString result) =>
+            new LocalizedHtmlString(result.Name, result.Value, result.ResourceNotFound);
+
+        protected virtual LocalizedHtmlString ToHtmlString(LocalizedString result, object[] arguments) =>
+            new LocalizedHtmlString(result.Name, result.Value, result.ResourceNotFound, arguments);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerExtensions.cs
new file mode 100644
index 0000000000..30a463c9f6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerExtensions.cs
@@ -0,0 +1,73 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.Localization
+{
+    /// <summary>
+    /// Extension methods for <see cref="IHtmlLocalizer"/>.
+    /// </summary>
+    public static class HtmlLocalizerExtensions
+    {
+        /// <summary>
+        /// Gets the <see cref="LocalizedHtmlString"/> resource for a specific name.
+        /// </summary>
+        /// <param name="htmlLocalizer">The <see cref="IHtmlLocalizer"/>.</param>
+        /// <param name="name">The key to use.</param>
+        /// <returns>The <see cref="LocalizedHtmlString"/> resource.</returns>
+        public static LocalizedHtmlString GetHtml(this IHtmlLocalizer htmlLocalizer, string name)
+        {
+            if (htmlLocalizer == null)
+            {
+                throw new ArgumentNullException(nameof(htmlLocalizer));
+            }
+
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            return htmlLocalizer[name];
+        }
+
+        /// <summary>
+        /// Gets the <see cref="LocalizedHtmlString"/> resource for a specific name.
+        /// </summary>
+        /// <param name="htmlLocalizer">The <see cref="IHtmlLocalizer"/>.</param>
+        /// <param name="name">The key to use.</param>
+        /// <param name="arguments">The values to format the string with.</param>
+        /// <returns>The <see cref="LocalizedHtmlString"/> resource.</returns>
+        public static LocalizedHtmlString GetHtml(this IHtmlLocalizer htmlLocalizer, string name, params object[] arguments)
+        {
+            if (htmlLocalizer == null)
+            {
+                throw new ArgumentNullException(nameof(htmlLocalizer));
+            }
+
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            return htmlLocalizer[name, arguments];
+        }
+
+        /// <summary>
+        /// Gets all string resources including those for parent cultures.
+        /// </summary>
+        /// <param name="htmlLocalizer">The <see cref="IHtmlLocalizer"/>.</param>
+        /// <returns>The string resources.</returns>
+        public static IEnumerable<LocalizedString> GetAllStrings(this IHtmlLocalizer htmlLocalizer)
+        {
+            if (htmlLocalizer == null)
+            {
+                throw new ArgumentNullException(nameof(htmlLocalizer));
+            }
+
+            return htmlLocalizer.GetAllStrings(includeParentCultures: true);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerFactory.cs
new file mode 100644
index 0000000000..02684f1e4f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerFactory.cs
@@ -0,0 +1,68 @@
+// 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.
+
+using System;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.Localization
+{
+    /// <summary>
+    /// An <see cref="IHtmlLocalizerFactory"/> that creates instances of <see cref="HtmlLocalizer"/> using the
+    /// registered <see cref="IStringLocalizerFactory"/>.
+    /// </summary>
+    public class HtmlLocalizerFactory : IHtmlLocalizerFactory
+    {
+        private readonly IStringLocalizerFactory _factory;
+
+        /// <summary>
+        /// Creates a new <see cref="HtmlLocalizerFactory"/>.
+        /// </summary>
+        /// <param name="localizerFactory">The <see cref="IStringLocalizerFactory"/>.</param>
+        public HtmlLocalizerFactory(IStringLocalizerFactory localizerFactory)
+        {
+            if (localizerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(localizerFactory));
+            }
+
+            _factory = localizerFactory;
+        }
+
+        /// <summary>
+        /// Creates an <see cref="HtmlLocalizer"/> using the specified <see cref="Type"/>.
+        /// </summary>
+        /// <param name="resourceSource">The <see cref="Type"/> to load resources for.</param>
+        /// <returns>The <see cref="HtmlLocalizer"/>.</returns>
+        public virtual IHtmlLocalizer Create(Type resourceSource)
+        {
+            if (resourceSource == null)
+            {
+                throw new ArgumentNullException(nameof(resourceSource));
+            }
+
+            return new HtmlLocalizer(_factory.Create(resourceSource));
+        }
+
+        /// <summary>
+        /// Creates an <see cref="HtmlLocalizer"/> using the specified base name and location.
+        /// </summary>
+        /// <param name="baseName">The base name of the resource to load strings from.</param>
+        /// <param name="location">The location to load resources from.</param>
+        /// <returns>The <see cref="HtmlLocalizer"/>.</returns>
+        public virtual IHtmlLocalizer Create(string baseName, string location)
+        {
+            if (baseName == null)
+            {
+                throw new ArgumentNullException(nameof(baseName));
+            }
+
+            if (location == null)
+            {
+                throw new ArgumentNullException(nameof(location));
+            }
+
+            var localizer = _factory.Create(baseName, location);
+            return new HtmlLocalizer(localizer);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerOfT.cs
new file mode 100644
index 0000000000..cea9a40a1c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerOfT.cs
@@ -0,0 +1,94 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.Localization
+{
+    /// <summary>
+    /// An <see cref="IHtmlLocalizer"/> implementation that provides localized HTML content for the specified type
+    /// <typeparamref name="TResource"/>.
+    /// </summary>
+    /// <typeparam name="TResource">The <see cref="Type"/> to scope the resource names.</typeparam>
+    public class HtmlLocalizer<TResource> : IHtmlLocalizer<TResource>
+    {
+        private readonly IHtmlLocalizer _localizer;
+
+        /// <summary>
+        /// Creates a new <see cref="HtmlLocalizer{TResource}"/>.
+        /// </summary>
+        /// <param name="factory">The <see cref="IHtmlLocalizerFactory"/>.</param>
+        public HtmlLocalizer(IHtmlLocalizerFactory factory)
+        {
+            _localizer = factory.Create(typeof(TResource));
+        }
+
+        /// <inheritdoc />
+        public virtual LocalizedHtmlString this[string name]
+        {
+            get
+            {
+                if (name == null)
+                {
+                    throw new ArgumentNullException(nameof(name));
+                }
+
+                return _localizer[name];
+            }
+        }
+
+        /// <inheritdoc />
+        public virtual LocalizedHtmlString this[string name, params object[] arguments]
+        {
+            get
+            {
+                if (name == null)
+                {
+                    throw new ArgumentNullException(nameof(name));
+                }
+
+                return _localizer[name, arguments];
+            }
+        }
+
+        /// <inheritdoc />
+        public virtual LocalizedString GetString(string name)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            return _localizer.GetString(name);
+        }
+
+        /// <inheritdoc />
+        public virtual LocalizedString GetString(string name, params object[] arguments)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            return _localizer.GetString(name, arguments);
+        }
+
+        /// <inheritdoc />
+        public virtual IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures) =>
+            _localizer.GetAllStrings(includeParentCultures);
+
+        /// <inheritdoc />
+        public virtual IHtmlLocalizer WithCulture(CultureInfo culture)
+        {
+            if (culture == null)
+            {
+                throw new ArgumentNullException(nameof(culture));
+            }
+
+            return _localizer.WithCulture(culture);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizer.cs
new file mode 100644
index 0000000000..f9589a990c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizer.cs
@@ -0,0 +1,63 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Globalization;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.Localization
+{
+    /// <summary>
+    /// Represents a type that does HTML-aware localization of strings, by HTML encoding arguments that are
+    /// formatted in the resource string.
+    /// </summary>
+    public interface IHtmlLocalizer
+    {
+        /// <summary>
+        /// Gets the string resource with the given name.
+        /// </summary>
+        /// <param name="name">The name of the string resource.</param>
+        /// <returns>The string resource as a <see cref="LocalizedHtmlString"/>.</returns>
+        LocalizedHtmlString this[string name] { get; }
+
+        /// <summary>
+        /// Gets the string resource with the given name and formatted with the supplied arguments. The arguments will
+        /// be HTML encoded.
+        /// </summary>
+        /// <param name="name">The name of the string resource.</param>
+        /// <param name="arguments">The values to format the string with.</param>
+        /// <returns>The formatted string resource as a <see cref="LocalizedHtmlString"/>.</returns>
+        LocalizedHtmlString this[string name, params object[] arguments] { get; }
+
+        /// <summary>
+        /// Gets the string resource with the given name.
+        /// </summary>
+        /// <param name="name">The name of the string resource.</param>
+        /// <returns>The string resource as a <see cref="LocalizedString"/>.</returns>
+        LocalizedString GetString(string name);
+
+        /// <summary>
+        /// Gets the string resource with the given name and formatted with the supplied arguments.
+        /// </summary>
+        /// <param name="name">The name of the string resource.</param>
+        /// <param name="arguments">The values to format the string with.</param>
+        /// <returns>The formatted string resource as a <see cref="LocalizedString"/>.</returns>
+        LocalizedString GetString(string name, params object[] arguments);
+
+        /// <summary>
+        /// Gets all string resources.
+        /// </summary>
+        /// <param name="includeParentCultures">
+        /// A <see cref="System.Boolean"/> indicating whether to include strings from parent cultures.
+        /// </param>
+        /// <returns>The strings.</returns>
+        IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures);
+
+        /// <summary>
+        /// Creates a new <see cref="IHtmlLocalizer"/> for a specific <see cref="CultureInfo"/>.
+        /// </summary>
+        /// <param name="culture">The <see cref="CultureInfo"/> to use.</param>
+        /// <returns>A culture-specific <see cref="IHtmlLocalizer"/>.</returns>
+        IHtmlLocalizer WithCulture(CultureInfo culture);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizerFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizerFactory.cs
new file mode 100644
index 0000000000..3e26add97d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizerFactory.cs
@@ -0,0 +1,29 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Localization
+{
+    /// <summary>
+    /// A factory that creates <see cref="IHtmlLocalizer"/> instances.
+    /// </summary>
+    public interface IHtmlLocalizerFactory
+    {
+        /// <summary>
+        /// Creates an <see cref="IHtmlLocalizer"/> using the <see cref="System.Reflection.Assembly"/> and
+        /// <see cref="Type.FullName"/> of the specified <see cref="Type"/>.
+        /// </summary>
+        /// <param name="resourceSource">The <see cref="Type"/>.</param>
+        /// <returns>The <see cref="IHtmlLocalizer"/>.</returns>
+        IHtmlLocalizer Create(Type resourceSource);
+
+        /// <summary>
+        /// Creates an <see cref="IHtmlLocalizer"/>.
+        /// </summary>
+        /// <param name="baseName">The base name of the resource to load strings from.</param>
+        /// <param name="location">The location to load resources from.</param>
+        /// <returns>The <see cref="IHtmlLocalizer"/>.</returns>
+        IHtmlLocalizer Create(string baseName, string location);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizerOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizerOfT.cs
new file mode 100644
index 0000000000..923de5ab89
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizerOfT.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Localization
+{
+    /// <summary>
+    /// An <see cref="IHtmlLocalizer"/> that provides localized HTML content.
+    /// </summary>
+    /// <typeparam name="TResource">The <see cref="System.Type"/> to scope the resource names.</typeparam>
+    public interface IHtmlLocalizer<TResource> : IHtmlLocalizer
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IViewLocalizer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IViewLocalizer.cs
new file mode 100644
index 0000000000..63f1db6856
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IViewLocalizer.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Localization
+{
+    /// <summary>
+    /// Represents a type that provides HTML-aware localization for views.
+    /// </summary>
+    public interface IViewLocalizer : IHtmlLocalizer
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Internal/MvcLocalizationServices.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Internal/MvcLocalizationServices.cs
new file mode 100644
index 0000000000..4e1f26ebc0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Internal/MvcLocalizationServices.cs
@@ -0,0 +1,48 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.Localization.Internal
+{
+    public static class MvcLocalizationServices
+    {
+        public static void AddLocalizationServices(
+            IServiceCollection services,
+            LanguageViewLocationExpanderFormat format,
+            Action<LocalizationOptions> setupAction)
+        {
+            AddMvcViewLocalizationServices(services, format, setupAction);
+
+            if (setupAction == null)
+            {
+                services.AddLocalization();
+            }
+            else
+            {
+                services.AddLocalization(setupAction);
+            }
+        }
+
+        // To enable unit testing only 'MVC' specific services
+        public static void AddMvcViewLocalizationServices(
+            IServiceCollection services,
+            LanguageViewLocationExpanderFormat format,
+            Action<LocalizationOptions> setupAction)
+        {
+            services.Configure<RazorViewEngineOptions>(
+                options =>
+                {
+                    options.ViewLocationExpanders.Add(new LanguageViewLocationExpander(format));
+                });
+
+            services.TryAdd(ServiceDescriptor.Singleton<IHtmlLocalizerFactory, HtmlLocalizerFactory>());
+            services.TryAdd(ServiceDescriptor.Transient(typeof(IHtmlLocalizer<>), typeof(HtmlLocalizer<>)));
+            services.TryAdd(ServiceDescriptor.Transient<IViewLocalizer, ViewLocalizer>());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/LocalizedHtmlString.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/LocalizedHtmlString.cs
new file mode 100644
index 0000000000..ed91460d69
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/LocalizedHtmlString.cs
@@ -0,0 +1,101 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.Localization
+{
+    /// <summary>
+    /// An <see cref="IHtmlContent"/> with localized content.
+    /// </summary>
+    public class LocalizedHtmlString : IHtmlContent
+    {
+        private readonly object[] _arguments;
+
+        /// <summary>
+        /// Creates an instance of <see cref="LocalizedHtmlString"/>.
+        /// </summary>
+        /// <param name="name">The name of the string resource.</param>
+        /// <param name="value">The string resource.</param>
+        public LocalizedHtmlString(string name, string value)
+            : this(name, value, isResourceNotFound: false, arguments: Array.Empty<object>())
+        {
+        }
+
+        /// <summary>
+        /// Creates an instance of <see cref="LocalizedHtmlString"/>.
+        /// </summary>
+        /// <param name="name">The name of the string resource.</param>
+        /// <param name="value">The string resource.</param>
+        /// <param name="isResourceNotFound">A flag that indicates if the resource is not found.</param>
+        public LocalizedHtmlString(string name, string value, bool isResourceNotFound)
+            : this(name, value, isResourceNotFound, arguments: Array.Empty<object>())
+        {
+        }
+
+        /// <summary>
+        /// Creates an instance of <see cref="LocalizedHtmlString"/>.
+        /// </summary>
+        /// <param name="name">The name of the string resource.</param>
+        /// <param name="value">The string resource.</param>
+        /// <param name="isResourceNotFound">A flag that indicates if the resource is not found.</param>
+        /// <param name="arguments">The values to format the <paramref name="value"/> with.</param>
+        public LocalizedHtmlString(string name, string value, bool isResourceNotFound, params object[] arguments)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            if (value == null)
+            {
+                throw new ArgumentNullException(nameof(value));
+            }
+
+            if (arguments == null)
+            {
+                throw new ArgumentNullException(nameof(arguments));
+            }
+
+            Name = name;
+            Value = value;
+            IsResourceNotFound = isResourceNotFound;
+            _arguments = arguments;
+        }
+
+        /// <summary>
+        /// The name of the string resource.
+        /// </summary>
+        public string Name { get; }
+
+        /// <summary>
+        /// The string resource.
+        /// </summary>
+        public string Value { get; }
+
+        /// <summary>
+        /// Gets a flag that indicates if the resource is not found.
+        /// </summary>
+        public bool IsResourceNotFound { get; }
+
+        /// <inheritdoc />
+        public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+        {
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
+            if (encoder == null)
+            {
+                throw new ArgumentNullException(nameof(encoder));
+            }
+
+            var formattableString = new HtmlFormattableString(Value, _arguments);
+            formattableString.WriteTo(writer, encoder);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj
new file mode 100644
index 0000000000..ea50d25312
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ASP.NET Core MVC features that enable globalization and localization of applications.
+Commonly used types:
+Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer&lt;TResource&gt;
+Microsoft.AspNetCore.Mvc.Localization.IViewLocalizer</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>aspnetcore;aspnetcoremvc;localization</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Razor\Microsoft.AspNetCore.Mvc.Razor.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Localization" Version="$(MicrosoftAspNetCoreLocalizationPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="$(MicrosoftExtensionsLocalizationPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsPropertyHelperSourcesPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..caa20abd18
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Properties/Resources.Designer.cs
@@ -0,0 +1,62 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.Localization
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class Resources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.Localization.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// Must call CreateStringLocalizer method before using this property.
+        /// </summary>
+        internal static string NullStringLocalizer
+        {
+            get { return GetString("NullStringLocalizer"); }
+        }
+
+        /// <summary>
+        /// Must call CreateStringLocalizer method before using this property.
+        /// </summary>
+        internal static string FormatNullStringLocalizer()
+        {
+            return GetString("NullStringLocalizer");
+        }
+
+        /// <summary>
+        /// IStringLocalizerFactory is null. Must call other constructor overload to use this property.
+        /// </summary>
+        internal static string NullStringLocalizerFactory
+        {
+            get { return GetString("NullStringLocalizerFactory"); }
+        }
+
+        /// <summary>
+        /// IStringLocalizerFactory is null. Must call other constructor overload to use this property.
+        /// </summary>
+        internal static string FormatNullStringLocalizerFactory()
+        {
+            return GetString("NullStringLocalizerFactory");
+        }
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/ViewLocalizer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/ViewLocalizer.cs
new file mode 100644
index 0000000000..3ec50fe965
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/ViewLocalizer.cs
@@ -0,0 +1,130 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.Localization
+{
+    /// <summary>
+    /// An <see cref="IViewLocalizer"/> implementation that derives the resource location from the executing view's
+    /// file path.
+    /// </summary>
+    public class ViewLocalizer : IViewLocalizer, IViewContextAware
+    {
+        private readonly IHtmlLocalizerFactory _localizerFactory;
+        private readonly string _applicationName;
+        private IHtmlLocalizer _localizer;
+
+        /// <summary>
+        /// Creates a new <see cref="ViewLocalizer"/>.
+        /// </summary>
+        /// <param name="localizerFactory">The <see cref="IHtmlLocalizerFactory"/>.</param>
+        /// <param name="hostingEnvironment">The <see cref="IHostingEnvironment"/>.</param>
+        public ViewLocalizer(IHtmlLocalizerFactory localizerFactory, IHostingEnvironment hostingEnvironment)
+        {
+            if (localizerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(localizerFactory));
+            }
+
+            if (hostingEnvironment == null)
+            {
+                throw new ArgumentNullException(nameof(hostingEnvironment));
+            }
+
+            _applicationName = hostingEnvironment.ApplicationName;
+            _localizerFactory = localizerFactory;
+        }
+
+        /// <inheritdoc />
+        public virtual LocalizedHtmlString this[string key]
+        {
+            get
+            {
+                if (key == null)
+                {
+                    throw new ArgumentNullException(nameof(key));
+                }
+
+                return _localizer[key];
+            }
+        }
+
+        /// <inheritdoc />
+        public virtual LocalizedHtmlString this[string key, params object[] arguments]
+        {
+            get
+            {
+                if (key == null)
+                {
+                    throw new ArgumentNullException(nameof(key));
+                }
+
+                return _localizer[key, arguments];
+            }
+        }
+
+        /// <inheritdoc />
+        public LocalizedString GetString(string name) => _localizer.GetString(name);
+
+        /// <inheritdoc />
+        public LocalizedString GetString(string name, params object[] values) => _localizer.GetString(name, values);
+
+        /// <inheritdoc />
+        public IHtmlLocalizer WithCulture(CultureInfo culture) => _localizer.WithCulture(culture);
+
+        /// <inheritdoc />
+        public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures) =>
+            _localizer.GetAllStrings(includeParentCultures);
+
+        /// <summary>
+        /// Apply the specified <see cref="ViewContext"/>.
+        /// </summary>
+        /// <param name="viewContext">The <see cref="ViewContext"/>.</param>
+        public void Contextualize(ViewContext viewContext)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            // Given a view path "/Views/Home/Index.cshtml" we want a baseName like "MyApplication.Views.Home.Index"
+            var path = viewContext.ExecutingFilePath;
+
+            if (string.IsNullOrEmpty(path))
+            {
+                path = viewContext.View.Path;
+            }
+
+            Debug.Assert(!string.IsNullOrEmpty(path), "Couldn't determine a path for the view");
+
+            _localizer = _localizerFactory.Create(BuildBaseName(path), _applicationName);
+        }
+
+        private string BuildBaseName(string path)
+        {
+            var extension = Path.GetExtension(path);
+            var startIndex = path[0] == '/' || path[0] == '\\' ? 1 : 0;
+            var length = path.Length - startIndex - extension.Length;
+            var capacity = length + _applicationName.Length + 1;
+            var builder = new StringBuilder(path, startIndex, length, capacity);
+
+            builder.Replace('/', '.').Replace('\\', '.');
+
+            // Prepend the application name
+            builder.Insert(0, '.');
+            builder.Insert(0, _applicationName);
+
+            return builder.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/baseline.netcore.json
new file mode 100644
index 0000000000..196aed9900
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/baseline.netcore.json
@@ -0,0 +1,1350 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc.Localization, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Localization.HtmlLocalizer",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Localization.LocalizedHtmlString",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "arguments",
+              "Type": "System.Object[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Localization.LocalizedHtmlString",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetString",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.Localization.LocalizedString",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetString",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "arguments",
+              "Type": "System.Object[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.Localization.LocalizedString",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetAllStrings",
+          "Parameters": [
+            {
+              "Name": "includeParentCultures",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WithCulture",
+          "Parameters": [
+            {
+              "Name": "culture",
+              "Type": "System.Globalization.CultureInfo"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ToHtmlString",
+          "Parameters": [
+            {
+              "Name": "result",
+              "Type": "Microsoft.Extensions.Localization.LocalizedString"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Localization.LocalizedHtmlString",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ToHtmlString",
+          "Parameters": [
+            {
+              "Name": "result",
+              "Type": "Microsoft.Extensions.Localization.LocalizedString"
+            },
+            {
+              "Name": "arguments",
+              "Type": "System.Object[]"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Localization.LocalizedHtmlString",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "localizer",
+              "Type": "Microsoft.Extensions.Localization.IStringLocalizer"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Localization.HtmlLocalizerExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetHtml",
+          "Parameters": [
+            {
+              "Name": "htmlLocalizer",
+              "Type": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Localization.LocalizedHtmlString",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHtml",
+          "Parameters": [
+            {
+              "Name": "htmlLocalizer",
+              "Type": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "arguments",
+              "Type": "System.Object[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Localization.LocalizedHtmlString",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetAllStrings",
+          "Parameters": [
+            {
+              "Name": "htmlLocalizer",
+              "Type": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString>",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Localization.HtmlLocalizerFactory",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizerFactory"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "resourceSource",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizerFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "baseName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "location",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizerFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "localizerFactory",
+              "Type": "Microsoft.Extensions.Localization.IStringLocalizerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Localization.HtmlLocalizer<T0>",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer<T0>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Localization.LocalizedHtmlString",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "arguments",
+              "Type": "System.Object[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Localization.LocalizedHtmlString",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetString",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.Localization.LocalizedString",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetString",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "arguments",
+              "Type": "System.Object[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.Localization.LocalizedString",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetAllStrings",
+          "Parameters": [
+            {
+              "Name": "includeParentCultures",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WithCulture",
+          "Parameters": [
+            {
+              "Name": "culture",
+              "Type": "System.Globalization.CultureInfo"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "factory",
+              "Type": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TResource",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Localization.LocalizedHtmlString",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "arguments",
+              "Type": "System.Object[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Localization.LocalizedHtmlString",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetString",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.Localization.LocalizedString",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetString",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "arguments",
+              "Type": "System.Object[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.Localization.LocalizedString",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetAllStrings",
+          "Parameters": [
+            {
+              "Name": "includeParentCultures",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WithCulture",
+          "Parameters": [
+            {
+              "Name": "culture",
+              "Type": "System.Globalization.CultureInfo"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizerFactory",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "resourceSource",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "baseName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "location",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer<T0>",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer"
+      ],
+      "Members": [],
+      "GenericParameters": [
+        {
+          "ParameterName": "TResource",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Localization.IViewLocalizer",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Localization.LocalizedHtmlString",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Html.IHtmlContent"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Value",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsResourceNotFound",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteTo",
+          "Parameters": [
+            {
+              "Name": "writer",
+              "Type": "System.IO.TextWriter"
+            },
+            {
+              "Name": "encoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.String"
+            },
+            {
+              "Name": "isResourceNotFound",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.String"
+            },
+            {
+              "Name": "isResourceNotFound",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "arguments",
+              "Type": "System.Object[]",
+              "IsParams": true
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Localization.ViewLocalizer",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Localization.IViewLocalizer",
+        "Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Localization.LocalizedHtmlString",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "arguments",
+              "Type": "System.Object[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Localization.LocalizedHtmlString",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetString",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.Localization.LocalizedString",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetString",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Object[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.Localization.LocalizedString",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetAllStrings",
+          "Parameters": [
+            {
+              "Name": "includeParentCultures",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WithCulture",
+          "Parameters": [
+            {
+              "Name": "culture",
+              "Type": "System.Globalization.CultureInfo"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Contextualize",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "localizerFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizerFactory"
+            },
+            {
+              "Name": "hostingEnvironment",
+              "Type": "Microsoft.AspNetCore.Hosting.IHostingEnvironment"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.MvcLocalizationMvcBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddViewLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddViewLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "format",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.LanguageViewLocationExpanderFormat"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddViewLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.Extensions.Localization.LocalizationOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddViewLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "format",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.LanguageViewLocationExpanderFormat"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.Extensions.Localization.LocalizationOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddMvcLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddMvcLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "localizationOptionsSetupAction",
+              "Type": "System.Action<Microsoft.Extensions.Localization.LocalizationOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddMvcLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "format",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.LanguageViewLocationExpanderFormat"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddMvcLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "localizationOptionsSetupAction",
+              "Type": "System.Action<Microsoft.Extensions.Localization.LocalizationOptions>"
+            },
+            {
+              "Name": "format",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.LanguageViewLocationExpanderFormat"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddMvcLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "dataAnnotationsLocalizationOptionsSetupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.DataAnnotations.MvcDataAnnotationsLocalizationOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddMvcLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "localizationOptionsSetupAction",
+              "Type": "System.Action<Microsoft.Extensions.Localization.LocalizationOptions>"
+            },
+            {
+              "Name": "dataAnnotationsLocalizationOptionsSetupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.DataAnnotations.MvcDataAnnotationsLocalizationOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddMvcLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "format",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.LanguageViewLocationExpanderFormat"
+            },
+            {
+              "Name": "dataAnnotationsLocalizationOptionsSetupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.DataAnnotations.MvcDataAnnotationsLocalizationOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddMvcLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "localizationOptionsSetupAction",
+              "Type": "System.Action<Microsoft.Extensions.Localization.LocalizationOptions>"
+            },
+            {
+              "Name": "format",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.LanguageViewLocationExpanderFormat"
+            },
+            {
+              "Name": "dataAnnotationsLocalizationOptionsSetupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.DataAnnotations.MvcDataAnnotationsLocalizationOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.MvcLocalizationMvcCoreBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddViewLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddViewLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "format",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.LanguageViewLocationExpanderFormat"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddViewLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.Extensions.Localization.LocalizationOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddViewLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "format",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.LanguageViewLocationExpanderFormat"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.Extensions.Localization.LocalizationOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddMvcLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddMvcLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "localizationOptionsSetupAction",
+              "Type": "System.Action<Microsoft.Extensions.Localization.LocalizationOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddMvcLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "format",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.LanguageViewLocationExpanderFormat"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddMvcLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "localizationOptionsSetupAction",
+              "Type": "System.Action<Microsoft.Extensions.Localization.LocalizationOptions>"
+            },
+            {
+              "Name": "format",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.LanguageViewLocationExpanderFormat"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddMvcLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "dataAnnotationsLocalizationOptionsSetupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.DataAnnotations.MvcDataAnnotationsLocalizationOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddMvcLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "localizationOptionsSetupAction",
+              "Type": "System.Action<Microsoft.Extensions.Localization.LocalizationOptions>"
+            },
+            {
+              "Name": "dataAnnotationsLocalizationOptionsSetupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.DataAnnotations.MvcDataAnnotationsLocalizationOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddMvcLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "format",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.LanguageViewLocationExpanderFormat"
+            },
+            {
+              "Name": "dataAnnotationsLocalizationOptionsSetupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.DataAnnotations.MvcDataAnnotationsLocalizationOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddMvcLocalization",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "localizationOptionsSetupAction",
+              "Type": "System.Action<Microsoft.Extensions.Localization.LocalizationOptions>"
+            },
+            {
+              "Name": "format",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.LanguageViewLocationExpanderFormat"
+            },
+            {
+              "Name": "dataAnnotationsLocalizationOptionsSetupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.DataAnnotations.MvcDataAnnotationsLocalizationOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs
new file mode 100644
index 0000000000..daee08d222
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    /// <summary>
+    /// Configures an assembly as a <see cref="CompiledRazorAssemblyPart"/>.
+    /// </summary>
+    public class CompiledRazorAssemblyApplicationPartFactory : ApplicationPartFactory
+    {
+        /// <summary>
+        /// Gets the sequence of <see cref="ApplicationPart"/> instances that are created by this instance of <see cref="DefaultApplicationPartFactory"/>.
+        /// <para>
+        /// Applications may use this method to get the same behavior as this factory produces during MVC's default part discovery.
+        /// </para>
+        /// </summary>
+        /// <param name="assembly">The <see cref="Assembly"/>.</param>
+        /// <returns>The sequence of <see cref="ApplicationPart"/> instances.</returns>
+        public static IEnumerable<ApplicationPart> GetDefaultApplicationParts(Assembly assembly)
+        {
+            if (assembly == null)
+            {
+                throw new ArgumentNullException(nameof(assembly));
+            }
+
+            yield return new CompiledRazorAssemblyPart(assembly);
+        }
+
+        /// <inheritdoc />
+        public override IEnumerable<ApplicationPart> GetApplicationParts(Assembly assembly) => GetDefaultApplicationParts(assembly);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/CompiledRazorAssemblyPart.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/CompiledRazorAssemblyPart.cs
new file mode 100644
index 0000000000..36291ec4e8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/CompiledRazorAssemblyPart.cs
@@ -0,0 +1,42 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.AspNetCore.Razor.Hosting;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    /// <summary>
+    /// An <see cref="ApplicationPart"/> for compiled Razor assemblies.
+    /// </summary>
+    public class CompiledRazorAssemblyPart : ApplicationPart, IRazorCompiledItemProvider
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="CompiledRazorAssemblyPart"/>.
+        /// </summary>
+        /// <param name="assembly">The <see cref="System.Reflection.Assembly"/></param>
+        public CompiledRazorAssemblyPart(Assembly assembly)
+        {
+            Assembly = assembly ?? throw new ArgumentNullException(nameof(assembly));
+        }
+
+        /// <summary>
+        /// Gets the <see cref="System.Reflection.Assembly"/>.
+        /// </summary>
+        public Assembly Assembly { get; }
+
+        /// <inheritdoc />
+        public override string Name => Assembly.GetName().Name;
+
+        IEnumerable<RazorCompiledItem> IRazorCompiledItemProvider.CompiledItems
+        {
+            get
+            {
+                var loader = new RazorCompiledItemLoader();
+                return loader.LoadItems(Assembly);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/IRazorCompiledItemProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/IRazorCompiledItemProvider.cs
new file mode 100644
index 0000000000..bdf11d6d59
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/IRazorCompiledItemProvider.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Hosting;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    /// <summary>
+    /// Exposes one or more <see cref="RazorCompiledItem"/> instances from an <see cref="ApplicationPart"/>.
+    /// </summary>
+    public interface IRazorCompiledItemProvider
+    {
+        /// <summary>
+        /// Gets a sequence of <see cref="RazorCompiledItem"/> instances.
+        /// </summary>
+        IEnumerable<RazorCompiledItem> CompiledItems { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/RazorCompiledItemFeatureProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/RazorCompiledItemFeatureProvider.cs
new file mode 100644
index 0000000000..d59c4e9ffb
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/RazorCompiledItemFeatureProvider.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Razor.Hosting;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    internal class RazorCompiledItemFeatureProvider : IApplicationFeatureProvider<ViewsFeature>
+    {
+        public void PopulateFeature(IEnumerable<ApplicationPart> parts, ViewsFeature feature)
+        {
+            foreach (var provider in parts.OfType<IRazorCompiledItemProvider>())
+            {
+                // Ensure parts do not specify views with differing cases. This is not supported
+                // at runtime and we should flag at as such for precompiled views.
+                var duplicates = provider.CompiledItems
+                    .GroupBy(i => i.Identifier, StringComparer.OrdinalIgnoreCase)
+                    .FirstOrDefault(g => g.Count() > 1);
+
+                if (duplicates != null)
+                {
+                    var viewsDiffereningInCase = string.Join(Environment.NewLine, duplicates.Select(d => d.Identifier));
+
+                    var message = string.Join(
+                        Environment.NewLine,
+                        Resources.RazorViewCompiler_ViewPathsDifferOnlyInCase,
+                        viewsDiffereningInCase);
+                    throw new InvalidOperationException(message);
+                }
+
+                foreach (var item in provider.CompiledItems)
+                {
+                    var descriptor = new CompiledViewDescriptor(item, attribute: null);
+                    feature.ViewDescriptors.Add(descriptor);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompilationFailedException.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompilationFailedException.cs
new file mode 100644
index 0000000000..5e3899c0bb
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompilationFailedException.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Diagnostics;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+{
+    /// <summary>
+    /// An <see cref="Exception"/> thrown when accessing the result of a failed compilation.
+    /// </summary>
+    public class CompilationFailedException : Exception, ICompilationException
+    {
+        /// <summary>
+        /// Instantiates a new instance of <see cref="CompilationFailedException"/>.
+        /// </summary>
+        /// <param name="compilationFailures"><see cref="CompilationFailure"/>s containing
+        /// details of the compilation failure.</param>
+        public CompilationFailedException(
+                IEnumerable<CompilationFailure> compilationFailures)
+            : base(FormatMessage(compilationFailures))
+        {
+            if (compilationFailures == null)
+            {
+                throw new ArgumentNullException(nameof(compilationFailures));
+            }
+
+            CompilationFailures = compilationFailures;
+        }
+
+        /// <inheritdoc />
+        public IEnumerable<CompilationFailure> CompilationFailures { get; }
+
+        private static string FormatMessage(IEnumerable<CompilationFailure> compilationFailures)
+        {
+            return Resources.CompilationFailed + Environment.NewLine +
+                string.Join(
+                    Environment.NewLine,
+                    compilationFailures.SelectMany(f => f.Messages).Select(message => message.FormattedMessage));
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompiledViewDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompiledViewDescriptor.cs
new file mode 100644
index 0000000000..4b4c1ec3e8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompiledViewDescriptor.cs
@@ -0,0 +1,91 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Razor.Hosting;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+{
+    /// <summary>
+    /// Represents a compiled Razor View or Page.
+    /// </summary>
+    public class CompiledViewDescriptor
+    {
+        /// <summary>
+        /// Creates a new <see cref="CompiledViewDescriptor"/>.
+        /// </summary>
+        public CompiledViewDescriptor()
+        {
+
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="CompiledViewDescriptor"/>. At least one of <paramref name="attribute"/> or
+        /// <paramref name="item"/> must be non-<c>null</c>.
+        /// </summary>
+        /// <param name="item">The <see cref="RazorCompiledItem"/>.</param>
+        /// <param name="attribute">The <see cref="RazorViewAttribute"/>.</param>
+        public CompiledViewDescriptor(RazorCompiledItem item, RazorViewAttribute attribute)
+        {
+            if (item == null && attribute == null)
+            {
+                // We require at least one of these to be specified.
+                throw new ArgumentException(Resources.FormatCompiledViewDescriptor_NoData(nameof(item), nameof(attribute)));
+            }
+
+            Item = item;
+
+            //
+            // For now we expect that MVC views and pages will still have either:
+            // [RazorView(...)] or
+            // [RazorPage(...)].
+            //
+            // In theory we could look at the 'Item.Kind' to determine what kind of thing we're dealing
+            // with, but for compat reasons we're basing it on ViewAttribute since that's what 2.0 had.
+            ViewAttribute = attribute;
+
+            // We don't have access to the file provider here so we can't check if the files
+            // even exist or what their checksums are. For now leave this empty, it will be updated
+            // later.
+            ExpirationTokens = Array.Empty<IChangeToken>();
+            RelativePath = ViewPath.NormalizePath(item?.Identifier ?? attribute.Path);
+            IsPrecompiled = true;
+        }
+
+        /// <summary>
+        /// The normalized application relative path of the view.
+        /// </summary>
+        public string RelativePath { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="RazorViewAttribute"/> decorating the view.
+        /// </summary>
+        /// <remarks>
+        /// May be <c>null</c>.
+        /// </remarks>
+        public RazorViewAttribute ViewAttribute { get; set; }
+
+        /// <summary>
+        /// <see cref="IChangeToken"/> instances that indicate when this result has expired.
+        /// </summary>
+        public IList<IChangeToken> ExpirationTokens { get; set; }
+
+        /// <summary>
+        /// Gets a value that determines if the view is precompiled.
+        /// </summary>
+        public bool IsPrecompiled { get; set; }
+
+        /// <summary>
+        /// Gets the <see cref="RazorCompiledItem"/> descriptor for this view.
+        /// </summary>
+        public RazorCompiledItem Item { get; set; }
+
+        /// <summary>
+        /// Gets the type of the compiled item.
+        /// </summary>
+        public Type Type => Item?.Type ?? ViewAttribute?.ViewType;
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/IViewCompiler.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/IViewCompiler.cs
new file mode 100644
index 0000000000..f861fa8c58
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/IViewCompiler.cs
@@ -0,0 +1,12 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+{
+    public interface IViewCompiler
+    {
+        Task<CompiledViewDescriptor> CompileAsync(string relativePath);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/IViewCompilerProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/IViewCompilerProvider.cs
new file mode 100644
index 0000000000..34c65481f6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/IViewCompilerProvider.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+{
+    public interface IViewCompilerProvider
+    {
+        IViewCompiler GetCompiler();
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/MetadataReferenceFeature.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/MetadataReferenceFeature.cs
new file mode 100644
index 0000000000..7ad99a2afe
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/MetadataReferenceFeature.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+{
+    /// <summary>
+    /// Specifies the list of <see cref="MetadataReference"/> used in Razor compilation.
+    /// </summary>
+    public class MetadataReferenceFeature
+    {
+        /// <summary>
+        /// Gets the <see cref="MetadataReference"/> instances.
+        /// </summary>
+        public IList<MetadataReference> MetadataReferences { get; } = new List<MetadataReference>();
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/MetadataReferenceFeatureProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/MetadataReferenceFeatureProvider.cs
new file mode 100644
index 0000000000..f5a42ace01
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/MetadataReferenceFeatureProvider.cs
@@ -0,0 +1,61 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection.PortableExecutable;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.CodeAnalysis;
+using Microsoft.Extensions.DependencyModel;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+{
+    /// <summary>
+    /// An <see cref="IApplicationFeatureProvider{TFeature}"/> for <see cref="MetadataReferenceFeature"/> that 
+    /// uses <see cref="DependencyContext"/> for registered <see cref="AssemblyPart"/> instances to create 
+    /// <see cref="MetadataReference"/>.
+    /// </summary>
+    public class MetadataReferenceFeatureProvider : IApplicationFeatureProvider<MetadataReferenceFeature>
+    {
+        /// <inheritdoc />
+        public void PopulateFeature(IEnumerable<ApplicationPart> parts, MetadataReferenceFeature feature)
+        {
+            if (parts == null)
+            {
+                throw new ArgumentNullException(nameof(parts));
+            }
+
+            if (feature == null)
+            {
+                throw new ArgumentNullException(nameof(feature));
+            }
+
+            var libraryPaths = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            foreach (var providerPart in parts.OfType<ICompilationReferencesProvider>())
+            {
+                var referencePaths = providerPart.GetReferencePaths();
+                foreach (var path in referencePaths)
+                {
+                    if (libraryPaths.Add(path))
+                    {
+                        var metadataReference = CreateMetadataReference(path);
+                        feature.MetadataReferences.Add(metadataReference);
+                    }
+                }
+            }
+        }
+
+        private static MetadataReference CreateMetadataReference(string path)
+        {
+            using (var stream = File.OpenRead(path))
+            {
+                var moduleMetadata = ModuleMetadata.CreateFromStream(stream, PEStreamOptions.PrefetchMetadata);
+                var assemblyMetadata = AssemblyMetadata.Create(moduleMetadata);
+
+                return assemblyMetadata.GetReference(filePath: path);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorReferenceManager.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorReferenceManager.cs
new file mode 100644
index 0000000000..5b11ce10e3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorReferenceManager.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+{
+    /// <summary>
+    /// Manages compilation references for Razor compilation.
+    /// </summary>
+    public abstract class RazorReferenceManager
+    {
+        /// <summary>
+        /// Gets the set of compilation references to be used for Razor compilation.
+        /// </summary>
+        public abstract IReadOnlyList<MetadataReference> CompilationReferences { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewAttribute.cs
new file mode 100644
index 0000000000..1ac6aba09a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewAttribute.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+{
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+    public class RazorViewAttribute : Attribute
+    {
+        public RazorViewAttribute(string path, Type viewType)
+        {
+            Path = path;
+            ViewType = viewType;
+        }
+
+        /// <summary>
+        /// Gets the path of the view.
+        /// </summary>
+        public string Path { get; }
+
+        /// <summary>
+        /// Gets the view type.
+        /// </summary>
+        public Type ViewType { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RoslynCompilationContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RoslynCompilationContext.cs
new file mode 100644
index 0000000000..5536969721
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RoslynCompilationContext.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using System;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+{
+    /// <summary>
+    /// Context object used to pass information about the current Razor page compilation.
+    /// </summary>
+    public class RoslynCompilationContext
+    {
+        /// <summary>
+        /// Constructs a new instance of the <see cref="RoslynCompilationContext"/> type.
+        /// </summary>
+        /// <param name="compilation"><see cref="CSharpCompilation"/> to be set to <see cref="Compilation"/> property.</param>
+        public RoslynCompilationContext(CSharpCompilation compilation)
+        {
+            if (compilation == null)
+            {
+                throw new ArgumentNullException(nameof(compilation));
+            }
+
+            Compilation = compilation;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="CSharpCompilation"/> used for current source file compilation.
+        /// </summary>
+        public CSharpCompilation Compilation { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeature.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeature.cs
new file mode 100644
index 0000000000..dde65a6340
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeature.cs
@@ -0,0 +1,12 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+{
+    public class ViewsFeature
+    {
+        public IList<CompiledViewDescriptor> ViewDescriptors { get; } = new List<CompiledViewDescriptor>();
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeatureProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeatureProvider.cs
new file mode 100644
index 0000000000..deb57205de
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeatureProvider.cs
@@ -0,0 +1,113 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+{
+    /// <summary>
+    /// An <see cref="IApplicationFeatureProvider{TFeature}"/> for <see cref="ViewsFeature"/>.
+    /// </summary>
+    [Obsolete("This type is obsolete and will be removed in a future version. See " + nameof(IRazorCompiledItemProvider) + " for alternatives.")]
+    public class ViewsFeatureProvider : IApplicationFeatureProvider<ViewsFeature>
+    {
+        public static readonly string PrecompiledViewsAssemblySuffix = ".PrecompiledViews";
+
+        /// <inheritdoc />
+        public void PopulateFeature(IEnumerable<ApplicationPart> parts, ViewsFeature feature)
+        {
+            foreach (var assemblyPart in parts.OfType<AssemblyPart>())
+            {
+                var viewAttributes = GetViewAttributes(assemblyPart)
+                    .Select(attribute => (Attribute: attribute, RelativePath: ViewPath.NormalizePath(attribute.Path)));
+
+                var duplicates = viewAttributes.GroupBy(a => a.RelativePath, StringComparer.OrdinalIgnoreCase)
+                    .FirstOrDefault(g => g.Count() > 1);
+
+                if (duplicates != null)
+                {
+                    // Ensure parts do not specify views with differing cases. This is not supported
+                    // at runtime and we should flag at as such for precompiled views.
+                    var viewsDiffereningInCase = string.Join(Environment.NewLine, duplicates.Select(d => d.RelativePath));
+
+                    var message = string.Join(
+                        Environment.NewLine,
+                        Resources.RazorViewCompiler_ViewPathsDifferOnlyInCase,
+                        viewsDiffereningInCase);
+                    throw new InvalidOperationException(message);
+                }
+
+                foreach (var (attribute, relativePath) in viewAttributes)
+                {
+                    var viewDescriptor = new CompiledViewDescriptor
+                    {
+                        ExpirationTokens = Array.Empty<IChangeToken>(),
+                        RelativePath = relativePath,
+                        ViewAttribute = attribute,
+                        IsPrecompiled = true,
+                    };
+
+                    feature.ViewDescriptors.Add(viewDescriptor);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the sequence of <see cref="RazorViewAttribute"/> instances associated with the specified <paramref name="assemblyPart"/>.
+        /// </summary>
+        /// <param name="assemblyPart">The <see cref="AssemblyPart"/>.</param>
+        /// <returns>The sequence of <see cref="RazorViewAttribute"/> instances.</returns>
+        protected virtual IEnumerable<RazorViewAttribute> GetViewAttributes(AssemblyPart assemblyPart)
+        {
+            if (assemblyPart == null)
+            {
+                throw new ArgumentNullException(nameof(assemblyPart));
+            }
+
+            var featureAssembly = GetFeatureAssembly(assemblyPart);
+            if (featureAssembly != null)
+            {
+                return featureAssembly.GetCustomAttributes<RazorViewAttribute>();
+            }
+
+            return Enumerable.Empty<RazorViewAttribute>();
+        }
+
+        private static Assembly GetFeatureAssembly(AssemblyPart assemblyPart)
+        {
+            if (assemblyPart.Assembly.IsDynamic || string.IsNullOrEmpty((string)assemblyPart.Assembly.Location))
+            {
+                return null;
+            }
+
+            var precompiledAssemblyFileName = assemblyPart.Assembly.GetName().Name
+                + PrecompiledViewsAssemblySuffix
+                + ".dll";
+
+            var precompiledAssemblyFilePath = Path.Combine(
+                Path.GetDirectoryName(assemblyPart.Assembly.Location),
+                precompiledAssemblyFileName);
+
+            if (File.Exists(precompiledAssemblyFilePath))
+            {
+                try
+                {
+                    return Assembly.LoadFile(precompiledAssemblyFilePath);
+                }
+                catch (FileLoadException)
+                {
+                    // Don't throw if assembly cannot be loaded. This can happen if the file is not a managed assembly.
+                }
+            }
+
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs
new file mode 100644
index 0000000000..8b47c02345
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs
@@ -0,0 +1,91 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    /// <summary>
+    /// Extensions methods for configuring MVC via an <see cref="IMvcBuilder"/>.
+    /// </summary>
+    public static class MvcRazorMvcBuilderExtensions
+    {
+        /// <summary>
+        /// Configures a set of <see cref="RazorViewEngineOptions"/> for the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="setupAction">An action to configure the <see cref="RazorViewEngineOptions"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder AddRazorOptions(
+            this IMvcBuilder builder,
+            Action<RazorViewEngineOptions> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (setupAction == null)
+            {
+                throw new ArgumentNullException(nameof(setupAction));
+            }
+
+            builder.Services.Configure(setupAction);
+            return builder;
+        }
+
+        /// <summary>
+        /// Registers tag helpers as services and replaces the existing <see cref="ITagHelperActivator"/>
+        /// with an <see cref="ServiceBasedTagHelperActivator"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/> instance this method extends.</param>
+        /// <returns>The <see cref="IMvcBuilder"/> instance this method extends.</returns>
+        public static IMvcBuilder AddTagHelpersAsServices(this IMvcBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            TagHelpersAsServices.AddTagHelpersAsServices(builder.PartManager, builder.Services);
+            return builder;
+        }
+
+        /// <summary>
+        /// Adds an initialization callback for a given <typeparamref name="TTagHelper"/>.
+        /// </summary>
+        /// <remarks>
+        /// The callback will be invoked on any <typeparamref name="TTagHelper"/> instance before the
+        /// <see cref="ITagHelperComponent.ProcessAsync(TagHelperContext, TagHelperOutput)"/> method is called.
+        /// </remarks>
+        /// <typeparam name="TTagHelper">The type of <see cref="ITagHelper"/> being initialized.</typeparam>
+        /// <param name="builder">The <see cref="IMvcBuilder"/> instance this method extends.</param>
+        /// <param name="initialize">An action to initialize the <typeparamref name="TTagHelper"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/> instance this method extends.</returns>
+        public static IMvcBuilder InitializeTagHelper<TTagHelper>(
+            this IMvcBuilder builder,
+            Action<TTagHelper, ViewContext> initialize)
+            where TTagHelper : ITagHelper
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (initialize == null)
+            {
+                throw new ArgumentNullException(nameof(initialize));
+            }
+
+            var initializer = new TagHelperInitializer<TTagHelper>(initialize);
+
+            builder.Services.AddSingleton(typeof(ITagHelperInitializer<TTagHelper>), initializer);
+
+            return builder;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs
new file mode 100644
index 0000000000..2eb17bc862
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs
@@ -0,0 +1,226 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Mvc.Razor.Extensions;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using CompilationTagHelperFeature = Microsoft.CodeAnalysis.Razor.CompilationTagHelperFeature;
+using DefaultTagHelperDescriptorProvider = Microsoft.CodeAnalysis.Razor.DefaultTagHelperDescriptorProvider;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public static class MvcRazorMvcCoreBuilderExtensions
+    {
+        public static IMvcCoreBuilder AddRazorViewEngine(this IMvcCoreBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddViews();
+            AddRazorViewEngineFeatureProviders(builder);
+            AddRazorViewEngineServices(builder.Services);
+            return builder;
+        }
+
+        public static IMvcCoreBuilder AddRazorViewEngine(
+            this IMvcCoreBuilder builder,
+            Action<RazorViewEngineOptions> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (setupAction == null)
+            {
+                throw new ArgumentNullException(nameof(setupAction));
+            }
+
+            builder.AddViews();
+
+            AddRazorViewEngineFeatureProviders(builder);
+            AddRazorViewEngineServices(builder.Services);
+
+            builder.Services.Configure(setupAction);
+
+            return builder;
+        }
+
+        private static void AddRazorViewEngineFeatureProviders(IMvcCoreBuilder builder)
+        {
+            if (!builder.PartManager.FeatureProviders.OfType<MetadataReferenceFeatureProvider>().Any())
+            {
+                builder.PartManager.FeatureProviders.Add(new MetadataReferenceFeatureProvider());
+            }
+
+            if (!builder.PartManager.FeatureProviders.OfType<TagHelperFeatureProvider>().Any())
+            {
+                builder.PartManager.FeatureProviders.Add(new TagHelperFeatureProvider());
+            }
+
+            // ViewFeature items have precedence semantics - when two views have the same path \ identifier,
+            // the one that appears earlier in the list wins. Therefore the ordering of
+            // RazorCompiledItemFeatureProvider and ViewsFeatureProvider is pertinent - any view compiled
+            // using the Sdk will be prefered to views compiled using MvcPrecompilation.
+            if (!builder.PartManager.FeatureProviders.OfType<RazorCompiledItemFeatureProvider>().Any())
+            {
+                builder.PartManager.FeatureProviders.Add(new RazorCompiledItemFeatureProvider());
+            }
+
+#pragma warning disable CS0618 // Type or member is obsolete
+            if (!builder.PartManager.FeatureProviders.OfType<ViewsFeatureProvider>().Any())
+            {
+                builder.PartManager.FeatureProviders.Add(new ViewsFeatureProvider());
+            }
+#pragma warning restore CS0618 // Type or member is obsolete
+        }
+
+        /// <summary>
+        /// Registers discovered tag helpers as services and changes the existing <see cref="ITagHelperActivator"/>
+        /// for an <see cref="ServiceBasedTagHelperActivator"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/> instance this method extends.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/> instance this method extends.</returns>
+        public static IMvcCoreBuilder AddTagHelpersAsServices(this IMvcCoreBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            TagHelpersAsServices.AddTagHelpersAsServices(builder.PartManager, builder.Services);
+            return builder;
+        }
+
+        /// <summary>
+        /// Adds an initialization callback for a given <typeparamref name="TTagHelper"/>.
+        /// </summary>
+        /// <remarks>
+        /// The callback will be invoked on any <typeparamref name="TTagHelper"/> instance before the
+        /// <see cref="ITagHelperComponent.ProcessAsync(TagHelperContext, TagHelperOutput)"/> method is called.
+        /// </remarks>
+        /// <typeparam name="TTagHelper">The type of <see cref="ITagHelper"/> being initialized.</typeparam>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/> instance this method extends.</param>
+        /// <param name="initialize">An action to initialize the <typeparamref name="TTagHelper"/>.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/> instance this method extends.</returns>
+        public static IMvcCoreBuilder InitializeTagHelper<TTagHelper>(
+            this IMvcCoreBuilder builder,
+            Action<TTagHelper, ViewContext> initialize)
+            where TTagHelper : ITagHelper
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (initialize == null)
+            {
+                throw new ArgumentNullException(nameof(initialize));
+            }
+
+            var initializer = new TagHelperInitializer<TTagHelper>(initialize);
+
+            builder.Services.AddSingleton(typeof(ITagHelperInitializer<TTagHelper>), initializer);
+
+            return builder;
+        }
+
+        // Internal for testing.
+        internal static void AddRazorViewEngineServices(IServiceCollection services)
+        {
+            services.TryAddSingleton<CSharpCompiler>();
+            services.TryAddSingleton<RazorReferenceManager, DefaultRazorReferenceManager>();
+
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IConfigureOptions<MvcViewOptions>, MvcRazorMvcViewOptionsSetup>());
+
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IConfigureOptions<RazorViewEngineOptions>, RazorViewEngineOptionsSetup>());
+
+            services.TryAddSingleton<
+                IRazorViewEngineFileProviderAccessor,
+                DefaultRazorViewEngineFileProviderAccessor>();
+
+            services.TryAddSingleton<IRazorViewEngine>(s =>
+            {
+                var pageFactory = s.GetRequiredService<IRazorPageFactoryProvider>();
+                var pageActivator = s.GetRequiredService<IRazorPageActivator>();
+                var htmlEncoder = s.GetRequiredService<HtmlEncoder>();
+                var optionsAccessor = s.GetRequiredService<IOptions<RazorViewEngineOptions>>();
+                var razorFileSystem = s.GetRequiredService<RazorProjectFileSystem>();
+                var loggerFactory = s.GetRequiredService<ILoggerFactory>();
+                var diagnosticSource = s.GetRequiredService<DiagnosticSource>();
+
+                var viewEngine = new RazorViewEngine(pageFactory, pageActivator, htmlEncoder, optionsAccessor, razorFileSystem, loggerFactory, diagnosticSource);
+                return viewEngine;
+            });
+            services.TryAddSingleton<IViewCompilerProvider, RazorViewCompilerProvider>();
+
+            // In the default scenario the following services are singleton by virtue of being initialized as part of
+            // creating the singleton RazorViewEngine instance.
+            services.TryAddTransient<IRazorPageFactoryProvider, DefaultRazorPageFactoryProvider>();
+
+            //
+            // Razor compilation infrastructure
+            //
+            services.TryAddSingleton<LazyMetadataReferenceFeature>();
+            services.TryAddSingleton<RazorProjectFileSystem, FileProviderRazorProjectFileSystem>();
+            services.TryAddSingleton(s =>
+            {
+                var fileSystem = s.GetRequiredService<RazorProjectFileSystem>();
+                var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem, builder =>
+                {
+                    RazorExtensions.Register(builder);
+
+                    // Roslyn + TagHelpers infrastructure
+                    var metadataReferenceFeature = s.GetRequiredService<LazyMetadataReferenceFeature>();
+                    builder.Features.Add(metadataReferenceFeature);
+                    builder.Features.Add(new CompilationTagHelperFeature());
+
+                    // TagHelperDescriptorProviders (actually do tag helper discovery)
+                    builder.Features.Add(new DefaultTagHelperDescriptorProvider());
+                    builder.Features.Add(new ViewComponentTagHelperDescriptorProvider());
+                });
+
+                return projectEngine;
+            });
+
+            // Legacy Razor compilation services
+            services.TryAddSingleton<RazorProject>(s => s.GetRequiredService<RazorProjectEngine>().FileSystem);
+            services.TryAddSingleton<RazorTemplateEngine, MvcRazorTemplateEngine>();
+            services.TryAddSingleton(s => s.GetRequiredService<RazorProjectEngine>().Engine);
+
+            // This caches Razor page activation details that are valid for the lifetime of the application.
+            services.TryAddSingleton<IRazorPageActivator, RazorPageActivator>();
+
+            // Only want one ITagHelperActivator and ITagHelperComponentPropertyActivator so it can cache Type activation information. Types won't conflict.
+            services.TryAddSingleton<ITagHelperActivator, DefaultTagHelperActivator>();
+            services.TryAddSingleton<ITagHelperComponentPropertyActivator, TagHelperComponentPropertyActivator>();
+
+            services.TryAddSingleton<ITagHelperFactory, DefaultTagHelperFactory>();
+
+            // TagHelperComponents manager
+            services.TryAddScoped<ITagHelperComponentManager, TagHelperComponentManager>();
+
+            // Consumed by the Cache tag helper to cache results across the lifetime of the application.
+            services.TryAddSingleton<IMemoryCache, MemoryCache>();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs
new file mode 100644
index 0000000000..d69f37d59e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs
@@ -0,0 +1,61 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <summary>
+    /// Represents a deferred write operation in a <see cref="RazorPage"/>.
+    /// </summary>
+    public class HelperResult : IHtmlContent
+    {
+        private readonly Func<TextWriter, Task> _asyncAction;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="HelperResult"/>.
+        /// </summary>
+        /// <param name="asyncAction">The asynchronous delegate to invoke when
+        /// <see cref="WriteTo(TextWriter, HtmlEncoder)"/> is called.</param>
+        /// <remarks>Calls to <see cref="WriteTo(TextWriter, HtmlEncoder)"/> result in a blocking invocation of
+        /// <paramref name="asyncAction"/>.</remarks>
+        public HelperResult(Func<TextWriter, Task> asyncAction)
+        {
+            if (asyncAction == null)
+            {
+                throw new ArgumentNullException(nameof(asyncAction));
+            }
+
+            _asyncAction = asyncAction;
+        }
+
+        /// <summary>
+        /// Gets the asynchronous delegate to invoke when <see cref="WriteTo(TextWriter, HtmlEncoder)"/> is called.
+        /// </summary>
+        public Func<TextWriter, Task> WriteAction => _asyncAction;
+
+        /// <summary>
+        /// Method invoked to produce content from the <see cref="HelperResult"/>.
+        /// </summary>
+        /// <param name="writer">The <see cref="TextWriter"/> instance to write to.</param>
+        /// <param name="encoder">The <see cref="HtmlEncoder"/> to encode the content.</param>
+        public virtual void WriteTo(TextWriter writer, HtmlEncoder encoder)
+        {
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
+            if (encoder == null)
+            {
+                throw new ArgumentNullException(nameof(encoder));
+            }
+
+            _asyncAction(writer).GetAwaiter().GetResult();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPage.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPage.cs
new file mode 100644
index 0000000000..6a7773eae3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPage.cs
@@ -0,0 +1,70 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <summary>
+    /// Represents properties and methods that are used by <see cref="RazorView"/> for execution.
+    /// </summary>
+    public interface IRazorPage
+    {
+        /// <summary>
+        /// Gets or sets the view context of the rendering view.
+        /// </summary>
+        ViewContext ViewContext { get; set; }
+
+        /// <summary>
+        /// Gets or sets the body content.
+        /// </summary>
+        IHtmlContent BodyContent { get; set; }
+
+        /// <summary>
+        /// Gets or sets a flag that determines if the layout of this page is being rendered.
+        /// </summary>
+        /// <remarks>
+        /// Sections defined in a page are deferred and executed as part of the layout page.
+        /// When this flag is set, all write operations performed by the page are part of a
+        /// section being rendered.
+        /// </remarks>
+        bool IsLayoutBeingRendered { get; set; }
+
+        /// <summary>
+        /// Gets the application base relative path to the page.
+        /// </summary>
+        string Path { get; set; }
+
+        /// <summary>
+        /// Gets or sets the path of a layout page.
+        /// </summary>
+        string Layout { get; set; }
+
+        /// <summary>
+        /// Gets or sets the sections that can be rendered by this page.
+        /// </summary>
+        IDictionary<string, RenderAsyncDelegate> PreviousSectionWriters { get; set; }
+
+        /// <summary>
+        /// Gets the sections that are defined by this page.
+        /// </summary>
+        IDictionary<string, RenderAsyncDelegate> SectionWriters { get; }
+
+        /// <summary>
+        /// Renders the page and writes the output to the <see cref="ViewContext.Writer"/>.
+        /// </summary>
+        /// <returns>A task representing the result of executing the page.</returns>
+        Task ExecuteAsync();
+
+        /// <summary>
+        /// Verifies that all sections defined in <see cref="PreviousSectionWriters"/> were rendered, or
+        /// the body was rendered if no sections were defined.
+        /// </summary>
+        /// <exception cref="System.InvalidOperationException">if one or more sections were not rendered or if no sections were
+        /// defined and the body was not rendered.</exception>
+        void EnsureRenderedBodyOrSections();
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPageActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPageActivator.cs
new file mode 100644
index 0000000000..4a26dafcd7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPageActivator.cs
@@ -0,0 +1,20 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <summary>
+    /// Provides methods to activate properties on a <see cref="IRazorPage"/> instance.
+    /// </summary>
+    public interface IRazorPageActivator
+    {
+        /// <summary>
+        /// When implemented in a type, activates an instantiated page.
+        /// </summary>
+        /// <param name="page">The page to activate.</param>
+        /// <param name="context">The <see cref="ViewContext"/> for the executing view.</param>
+        void Activate(IRazorPage page, ViewContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPageFactoryProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPageFactoryProvider.cs
new file mode 100644
index 0000000000..a3989e07be
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPageFactoryProvider.cs
@@ -0,0 +1,18 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <summary>
+    /// Defines methods that are used for creating <see cref="IRazorPage"/> instances at a given path.
+    /// </summary>
+    public interface IRazorPageFactoryProvider
+    {
+        /// <summary>
+        /// Creates a <see cref="IRazorPage"/> factory for the specified path.
+        /// </summary>
+        /// <param name="relativePath">The path to locate the page.</param>
+        /// <returns>The <see cref="RazorPageFactoryResult"/> instance.</returns>
+        RazorPageFactoryResult CreateFactory(string relativePath);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorViewEngine.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorViewEngine.cs
new file mode 100644
index 0000000000..6af2cafef8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorViewEngine.cs
@@ -0,0 +1,50 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <summary>
+    /// An <see cref="IViewEngine"/> used to render pages that use the Razor syntax.
+    /// </summary>
+    public interface IRazorViewEngine : IViewEngine
+    {
+        /// <summary>
+        /// Finds the page with the given <paramref name="pageName"/> using view locations and information from the
+        /// <paramref name="context"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ActionContext"/>.</param>
+        /// <param name="pageName">The name or path of the page.</param>
+        /// <returns>The <see cref="RazorPageResult"/> of locating the page.</returns>
+        /// <remarks>
+        /// <remarks>Use <see cref="GetPage(string, string)"/> when the absolute or relative
+        /// path of the page is known.</remarks>
+        /// <seealso cref="IViewEngine.FindView"/>.
+        /// </remarks>
+        RazorPageResult FindPage(ActionContext context, string pageName);
+
+        /// <summary>
+        /// Gets the page with the given <paramref name="pagePath"/>, relative to <paramref name="executingFilePath"/>
+        /// unless <paramref name="pagePath"/> is already absolute.
+        /// </summary>
+        /// <param name="executingFilePath">The absolute path to the currently-executing page, if any.</param>
+        /// <param name="pagePath">The path to the page.</param>
+        /// <returns>The <see cref="RazorPageResult"/> of locating the page.</returns>
+        /// <remarks><seealso cref="IViewEngine.GetView"/>.</remarks>
+        RazorPageResult GetPage(string executingFilePath, string pagePath);
+
+        /// <summary>
+        /// Converts the given <paramref name="pagePath"/> to be absolute, relative to
+        /// <paramref name="executingFilePath"/> unless <paramref name="pagePath"/> is already absolute.
+        /// </summary>
+        /// <param name="executingFilePath">The absolute path to the currently-executing page, if any.</param>
+        /// <param name="pagePath">The path to the page.</param>
+        /// <returns>
+        /// The combination of <paramref name="executingFilePath"/> and <paramref name="pagePath"/> if
+        /// <paramref name="pagePath"/> is a relative path. The <paramref name="pagePath"/> value (unchanged)
+        /// otherwise.
+        /// </returns>
+        string GetAbsolutePath(string executingFilePath, string pagePath);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperActivator.cs
new file mode 100644
index 0000000000..7757980390
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperActivator.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <summary>
+    /// Provides methods to create a tag helper.
+    /// </summary>
+    public interface ITagHelperActivator
+    {
+        /// <summary>
+        /// Creates an <see cref="ITagHelper"/>.
+        /// </summary>
+        /// <typeparam name="TTagHelper">The <see cref="ITagHelper"/> type.</typeparam>
+        /// <param name="context">The <see cref="ViewContext"/> for the executing view.</param>
+        /// <returns>The tag helper.</returns>
+        TTagHelper Create<TTagHelper>(ViewContext context) where TTagHelper : ITagHelper;
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperFactory.cs
new file mode 100644
index 0000000000..181b805655
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperFactory.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <summary>
+    /// Provides methods to create and initialize tag helpers.
+    /// </summary>
+    public interface ITagHelperFactory
+    {
+        /// <summary>
+        /// Creates a new tag helper for the specified <paramref name="context"/>.
+        /// </summary>
+        /// <param name="context"><see cref="ViewContext"/> for the executing view.</param>
+        /// <returns>The tag helper.</returns>
+        TTagHelper CreateTagHelper<TTagHelper>(ViewContext context) where TTagHelper : ITagHelper;
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperInitializerOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperInitializerOfT.cs
new file mode 100644
index 0000000000..a3379fc2a0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperInitializerOfT.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <summary>
+    /// Initializes an <see cref="ITagHelper"/> before it's executed.
+    /// </summary>
+    /// <typeparam name="TTagHelper">The <see cref="ITagHelper"/> type.</typeparam>
+    public interface ITagHelperInitializer<TTagHelper>
+        where TTagHelper : ITagHelper
+    {
+        /// <summary>
+        /// Initializes the <typeparamref name="TTagHelper"/>.
+        /// </summary>
+        /// <param name="helper">The <typeparamref name="TTagHelper"/> to initialize.</param>
+        /// <param name="context">The <see cref="ViewContext"/> for the executing view.</param>
+        void Initialize(TTagHelper helper, ViewContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IViewLocationExpander.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IViewLocationExpander.cs
new file mode 100644
index 0000000000..d5ed2f7c7d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IViewLocationExpander.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <summary>
+    /// Specifies the contracts for a view location expander that is used by <see cref="RazorViewEngine"/> instances to
+    /// determine search paths for a view.
+    /// </summary>
+    /// <remarks>
+    /// Individual <see cref="IViewLocationExpander"/>s are invoked in two steps:
+    /// (1) <see cref="PopulateValues(ViewLocationExpanderContext)"/> is invoked and each expander
+    /// adds values that it would later consume as part of
+    /// <see cref="ExpandViewLocations(ViewLocationExpanderContext, IEnumerable{string})"/>.
+    /// The populated values are used to determine a cache key - if all values are identical to the last time
+    /// <see cref="PopulateValues(ViewLocationExpanderContext)"/> was invoked, the cached result
+    /// is used as the view location.
+    /// (2) If no result was found in the cache or if a view was not found at the cached location,
+    /// <see cref="ExpandViewLocations(ViewLocationExpanderContext, IEnumerable{string})"/> is invoked to determine
+    /// all potential paths for a view.
+    /// </remarks>
+    public interface IViewLocationExpander
+    {
+        /// <summary>
+        /// Invoked by a <see cref="RazorViewEngine"/> to determine the values that would be consumed by this instance
+        /// of <see cref="IViewLocationExpander"/>. The calculated values are used to determine if the view location
+        /// has changed since the last time it was located.
+        /// </summary>
+        /// <param name="context">The <see cref="ViewLocationExpanderContext"/> for the current view location
+        /// expansion operation.</param>
+        void PopulateValues(ViewLocationExpanderContext context);
+
+        /// <summary>
+        /// Invoked by a <see cref="RazorViewEngine"/> to determine potential locations for a view.
+        /// </summary>
+        /// <param name="context">The <see cref="ViewLocationExpanderContext"/> for the current view location
+        /// expansion operation.</param>
+        /// <param name="viewLocations">The sequence of view locations to expand.</param>
+        /// <returns>A list of expanded view locations.</returns>
+        IEnumerable<string> ExpandViewLocations(ViewLocationExpanderContext context,
+                                                IEnumerable<string> viewLocations);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CSharpCompiler.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CSharpCompiler.cs
new file mode 100644
index 0000000000..93703d49c9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CSharpCompiler.cs
@@ -0,0 +1,231 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Emit;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.Extensions.DependencyModel;
+using DependencyContextCompilationOptions = Microsoft.Extensions.DependencyModel.CompilationOptions;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class CSharpCompiler
+    {
+        private readonly RazorReferenceManager _referenceManager;
+        private readonly IHostingEnvironment _hostingEnvironment;
+        private bool _optionsInitialized;
+        private CSharpParseOptions _parseOptions;
+        private CSharpCompilationOptions _compilationOptions;
+        private EmitOptions _emitOptions;
+        private bool _emitPdb;
+
+        public CSharpCompiler(RazorReferenceManager manager, IHostingEnvironment hostingEnvironment)
+        {
+            _referenceManager = manager ?? throw new ArgumentNullException(nameof(manager));
+            _hostingEnvironment = hostingEnvironment ?? throw new ArgumentNullException(nameof(hostingEnvironment));
+        }
+
+        public virtual CSharpParseOptions ParseOptions
+        {
+            get
+            {
+                EnsureOptions();
+                return _parseOptions;
+            }
+        }
+
+        public virtual CSharpCompilationOptions CSharpCompilationOptions
+        {
+            get
+            {
+                EnsureOptions();
+                return _compilationOptions;
+            }
+        }
+
+        public virtual bool EmitPdb
+        {
+            get
+            {
+                EnsureOptions();
+                return _emitPdb;
+            }
+        }
+
+        public virtual EmitOptions EmitOptions
+        {
+            get
+            {
+                EnsureOptions();
+                return _emitOptions;
+            }
+        }
+
+        public SyntaxTree CreateSyntaxTree(SourceText sourceText)
+        {
+            return CSharpSyntaxTree.ParseText(
+                sourceText,
+                options: ParseOptions);
+        }
+
+        public CSharpCompilation CreateCompilation(string assemblyName)
+        {
+            return CSharpCompilation.Create(
+                assemblyName,
+                options: CSharpCompilationOptions,
+                references: _referenceManager.CompilationReferences);
+        }
+
+        // Internal for unit testing.
+        protected internal virtual DependencyContextCompilationOptions GetDependencyContextCompilationOptions()
+        {
+            if (!string.IsNullOrEmpty(_hostingEnvironment.ApplicationName))
+            {
+                var applicationAssembly = Assembly.Load(new AssemblyName(_hostingEnvironment.ApplicationName));
+                var dependencyContext = DependencyContext.Load(applicationAssembly);
+                if (dependencyContext?.CompilationOptions != null)
+                {
+                    return dependencyContext.CompilationOptions;
+                }
+            }
+
+            return DependencyContextCompilationOptions.Default;
+        }
+
+        private void EnsureOptions()
+        {
+            if (!_optionsInitialized)
+            {
+                var dependencyContextOptions = GetDependencyContextCompilationOptions();
+                _parseOptions = GetParseOptions(_hostingEnvironment, dependencyContextOptions);
+                _compilationOptions = GetCompilationOptions(_hostingEnvironment, dependencyContextOptions);
+                _emitOptions = GetEmitOptions(dependencyContextOptions);
+
+                _optionsInitialized = true;
+            }
+        }
+
+        private EmitOptions GetEmitOptions(DependencyContextCompilationOptions dependencyContextOptions)
+        {
+            // Assume we're always producing pdbs unless DebugType = none
+            _emitPdb = true;
+            DebugInformationFormat debugInformationFormat;
+            if (string.IsNullOrEmpty(dependencyContextOptions.DebugType))
+            {
+                debugInformationFormat = SymbolsUtility.SupportsFullPdbGeneration() ?
+                    DebugInformationFormat.Pdb :
+                    DebugInformationFormat.PortablePdb;
+            }
+            else
+            {
+                // Based on https://github.com/dotnet/roslyn/blob/1d28ff9ba248b332de3c84d23194a1d7bde07e4d/src/Compilers/CSharp/Portable/CommandLine/CSharpCommandLineParser.cs#L624-L640
+                switch (dependencyContextOptions.DebugType.ToLower())
+                {
+                    case "none":
+                        // There isn't a way to represent none in DebugInformationFormat.
+                        // We'll set EmitPdb to false and let callers handle it by setting a null pdb-stream.
+                        _emitPdb = false;
+                        return new EmitOptions();
+                    case "portable":
+                        debugInformationFormat = DebugInformationFormat.PortablePdb;
+                        break;
+                    case "embedded":
+                        // Roslyn does not expose enough public APIs to produce a binary with embedded pdbs.
+                        // We'll produce PortablePdb instead to continue providing a reasonable user experience.
+                        debugInformationFormat = DebugInformationFormat.PortablePdb;
+                        break;
+                    case "full":
+                    case "pdbonly":
+                        debugInformationFormat = SymbolsUtility.SupportsFullPdbGeneration() ?
+                            DebugInformationFormat.Pdb :
+                            DebugInformationFormat.PortablePdb;
+                        break;
+                    default:
+                        throw new InvalidOperationException(Resources.FormatUnsupportedDebugInformationFormat(dependencyContextOptions.DebugType));
+                }
+            }
+
+            var emitOptions = new EmitOptions(debugInformationFormat: debugInformationFormat);
+            return emitOptions;
+        }
+
+        private static CSharpCompilationOptions GetCompilationOptions(
+            IHostingEnvironment hostingEnvironment,
+            DependencyContextCompilationOptions dependencyContextOptions)
+        {
+            var csharpCompilationOptions = new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary);
+
+            // Disable 1702 until roslyn turns this off by default
+            csharpCompilationOptions = csharpCompilationOptions.WithSpecificDiagnosticOptions(
+                new Dictionary<string, ReportDiagnostic>
+                {
+                    {"CS1701", ReportDiagnostic.Suppress}, // Binding redirects
+                    {"CS1702", ReportDiagnostic.Suppress},
+                    {"CS1705", ReportDiagnostic.Suppress}
+                });
+
+            if (dependencyContextOptions.AllowUnsafe.HasValue)
+            {
+                csharpCompilationOptions = csharpCompilationOptions.WithAllowUnsafe(
+                    dependencyContextOptions.AllowUnsafe.Value);
+            }
+
+            OptimizationLevel optimizationLevel;
+            if (dependencyContextOptions.Optimize.HasValue)
+            {
+                optimizationLevel = dependencyContextOptions.Optimize.Value ?
+                    OptimizationLevel.Release :
+                    OptimizationLevel.Debug;
+            }
+            else
+            {
+                optimizationLevel = hostingEnvironment.IsDevelopment() ?
+                    OptimizationLevel.Debug :
+                    OptimizationLevel.Release;
+            }
+            csharpCompilationOptions = csharpCompilationOptions.WithOptimizationLevel(optimizationLevel);
+
+            if (dependencyContextOptions.WarningsAsErrors.HasValue)
+            {
+                var reportDiagnostic = dependencyContextOptions.WarningsAsErrors.Value ?
+                    ReportDiagnostic.Error :
+                    ReportDiagnostic.Default;
+                csharpCompilationOptions = csharpCompilationOptions.WithGeneralDiagnosticOption(reportDiagnostic);
+            }
+
+            return csharpCompilationOptions;
+        }
+
+        private static CSharpParseOptions GetParseOptions(
+            IHostingEnvironment hostingEnvironment,
+            DependencyContextCompilationOptions dependencyContextOptions)
+        {
+            var configurationSymbol = hostingEnvironment.IsDevelopment() ? "DEBUG" : "RELEASE";
+            var defines = dependencyContextOptions.Defines.Concat(new[] { configurationSymbol });
+
+            var parseOptions = new CSharpParseOptions(preprocessorSymbols: defines);
+
+            if (!string.IsNullOrEmpty(dependencyContextOptions.LanguageVersion))
+            {
+                if (LanguageVersionFacts.TryParse(dependencyContextOptions.LanguageVersion, out var languageVersion))
+                {
+                    parseOptions = parseOptions.WithLanguageVersion(languageVersion);
+                }
+                else
+                {
+                    Debug.Fail($"LanguageVersion {languageVersion} specified in the deps file could not be parsed.");
+                }
+            }
+
+            return parseOptions;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ChecksumValidator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ChecksumValidator.cs
new file mode 100644
index 0000000000..fea6a7ba2d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ChecksumValidator.cs
@@ -0,0 +1,122 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Hosting;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public static class ChecksumValidator
+    {
+        public static bool IsRecompilationSupported(RazorCompiledItem item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException(nameof(item));
+            }
+
+            // A Razor item only supports recompilation if its primary source file has a checksum.
+            //
+            // Other files (view imports) may or may not have existed at the time of compilation,
+            // so we may not have checksums for them.
+            var checksums = item.GetChecksumMetadata();
+            return checksums.Any(c => string.Equals(item.Identifier, c.Identifier, StringComparison.OrdinalIgnoreCase));
+        }
+
+        // Validates that we can use an existing precompiled view by comparing checksums with files on
+        // disk.
+        public static bool IsItemValid(RazorProjectFileSystem fileSystem, RazorCompiledItem item)
+        {
+            if (fileSystem == null)
+            {
+                throw new ArgumentNullException(nameof(fileSystem));
+            }
+
+            if (item == null)
+            {
+                throw new ArgumentNullException(nameof(item));
+            }
+
+            var checksums = item.GetChecksumMetadata();
+
+            // The checksum that matches 'Item.Identity' in this list is significant. That represents the main file.
+            //
+            // We don't really care about the validation unless the main file exists. This is because we expect
+            // most sites to have some _ViewImports in common location. That means that in the case you're
+            // using views from a 3rd party library, you'll always have **some** conflicts.
+            //
+            // The presence of the main file with the same content is a very strong signal that you're in a
+            // development scenario.
+            var primaryChecksum = checksums
+                .FirstOrDefault(c => string.Equals(item.Identifier, c.Identifier, StringComparison.OrdinalIgnoreCase));
+            if (primaryChecksum == null)
+            {
+                // No primary checksum, assume valid.
+                return true;
+            }
+
+            var projectItem = fileSystem.GetItem(primaryChecksum.Identifier);
+            if (!projectItem.Exists)
+            {
+                // Main file doesn't exist - assume valid.
+                return true;
+            }
+
+            var sourceDocument = RazorSourceDocument.ReadFrom(projectItem);
+            if (!string.Equals(sourceDocument.GetChecksumAlgorithm(), primaryChecksum.ChecksumAlgorithm) ||
+                !ChecksumsEqual(primaryChecksum.Checksum, sourceDocument.GetChecksum()))
+            {
+                // Main file exists, but checksums not equal.
+                return false;
+            }
+
+            for (var i = 0; i < checksums.Count; i++)
+            {
+                var checksum = checksums[i];
+                if (string.Equals(item.Identifier, checksum.Identifier, StringComparison.OrdinalIgnoreCase))
+                {
+                    // Ignore primary checksum on this pass.
+                    continue;
+                }
+
+                var importItem = fileSystem.GetItem(checksum.Identifier);
+                if (!importItem.Exists)
+                {
+                    // Import file doesn't exist - assume invalid.
+                    return false;
+                }
+
+                sourceDocument = RazorSourceDocument.ReadFrom(importItem);
+                if (!string.Equals(sourceDocument.GetChecksumAlgorithm(), checksum.ChecksumAlgorithm) ||
+                    !ChecksumsEqual(checksum.Checksum, sourceDocument.GetChecksum()))
+                {
+                    // Import file exists, but checksums not equal.
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private static bool ChecksumsEqual(string checksum, byte[] bytes)
+        {
+            if (bytes.Length * 2 != checksum.Length)
+            {
+                return false;
+            }
+
+            for (var i = 0; i < bytes.Length; i++)
+            {
+                var text = bytes[i].ToString("x2");
+                if (checksum[i * 2] != text[0] || checksum[i * 2 + 1] != text[1])
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompilationFailedExceptionFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompilationFailedExceptionFactory.cs
new file mode 100644
index 0000000000..0be6fa6b7d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompilationFailedExceptionFactory.cs
@@ -0,0 +1,159 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Diagnostics;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    internal static class CompilationFailedExceptionFactory
+    {
+        // error CS0234: The type or namespace name 'C' does not exist in the namespace 'N' (are you missing
+        // an assembly reference?)
+        private const string CS0234 = nameof(CS0234);
+        // error CS0246: The type or namespace name 'T' could not be found (are you missing a using directive
+        // or an assembly reference?)
+        private const string CS0246 = nameof(CS0246);
+
+        public static CompilationFailedException Create(
+            RazorCodeDocument codeDocument,
+            IEnumerable<RazorDiagnostic> diagnostics)
+        {
+            // If a SourceLocation does not specify a file path, assume it is produced from parsing the current file.
+            var messageGroups = diagnostics.GroupBy(
+                razorError => razorError.Span.FilePath ?? codeDocument.Source.FilePath,
+                StringComparer.Ordinal);
+
+            var failures = new List<CompilationFailure>();
+            foreach (var group in messageGroups)
+            {
+                var filePath = group.Key;
+                var fileContent = ReadContent(codeDocument, filePath);
+                var compilationFailure = new CompilationFailure(
+                    filePath,
+                    fileContent,
+                    compiledContent: string.Empty,
+                    messages: group.Select(parserError => CreateDiagnosticMessage(parserError, filePath)));
+                failures.Add(compilationFailure);
+            }
+
+            return new CompilationFailedException(failures);
+        }
+
+        public static CompilationFailedException Create(
+            RazorCodeDocument codeDocument,
+            string compilationContent,
+            string assemblyName,
+            IEnumerable<Diagnostic> diagnostics)
+        {
+            var diagnosticGroups = diagnostics
+                .Where(diagnostic => diagnostic.IsWarningAsError || diagnostic.Severity == DiagnosticSeverity.Error)
+                .GroupBy(diagnostic => GetFilePath(codeDocument, diagnostic), StringComparer.Ordinal);
+
+            var failures = new List<CompilationFailure>();
+            foreach (var group in diagnosticGroups)
+            {
+                var sourceFilePath = group.Key;
+                string sourceFileContent;
+                if (string.Equals(assemblyName, sourceFilePath, StringComparison.Ordinal))
+                {
+                    // The error is in the generated code and does not have a mapping line pragma
+                    sourceFileContent = compilationContent;
+                    sourceFilePath = Resources.GeneratedCodeFileName;
+                }
+                else
+                {
+                    sourceFileContent = ReadContent(codeDocument, sourceFilePath);
+                }
+
+                string additionalMessage = null;
+                if (group.Any(g =>
+                    string.Equals(CS0234, g.Id, StringComparison.OrdinalIgnoreCase) ||
+                    string.Equals(CS0246, g.Id, StringComparison.OrdinalIgnoreCase)))
+                {
+                    additionalMessage = Resources.FormatCompilation_DependencyContextIsNotSpecified(
+                        "Microsoft.NET.Sdk.Web",
+                        "PreserveCompilationContext");
+                }
+
+                var compilationFailure = new CompilationFailure(
+                    sourceFilePath,
+                    sourceFileContent,
+                    compilationContent,
+                    group.Select(GetDiagnosticMessage),
+                    additionalMessage);
+
+                failures.Add(compilationFailure);
+            }
+
+            return new CompilationFailedException(failures);
+        }
+
+        private static string ReadContent(RazorCodeDocument codeDocument, string filePath)
+        {
+            RazorSourceDocument sourceDocument;
+            if (string.IsNullOrEmpty(filePath) || string.Equals(codeDocument.Source.FilePath, filePath, StringComparison.Ordinal))
+            {
+                sourceDocument = codeDocument.Source;
+            }
+            else
+            {
+                sourceDocument = codeDocument.Imports.FirstOrDefault(f => string.Equals(f.FilePath, filePath, StringComparison.Ordinal));
+            }
+
+            if (sourceDocument != null)
+            {
+                var contentChars = new char[sourceDocument.Length];
+                sourceDocument.CopyTo(0, contentChars, 0, sourceDocument.Length);
+                return new string(contentChars);
+            }
+
+            return string.Empty;
+        }
+
+        private static DiagnosticMessage GetDiagnosticMessage(Diagnostic diagnostic)
+        {
+            var mappedLineSpan = diagnostic.Location.GetMappedLineSpan();
+            return new DiagnosticMessage(
+                diagnostic.GetMessage(),
+                CSharpDiagnosticFormatter.Instance.Format(diagnostic),
+                mappedLineSpan.Path,
+                mappedLineSpan.StartLinePosition.Line + 1,
+                mappedLineSpan.StartLinePosition.Character + 1,
+                mappedLineSpan.EndLinePosition.Line + 1,
+                mappedLineSpan.EndLinePosition.Character + 1);
+        }
+
+        private static DiagnosticMessage CreateDiagnosticMessage(
+            RazorDiagnostic razorDiagnostic,
+            string filePath)
+        {
+            var sourceSpan = razorDiagnostic.Span;
+            var message = razorDiagnostic.GetMessage();
+            return new DiagnosticMessage(
+                message: message,
+                formattedMessage: razorDiagnostic.ToString(),
+                filePath: filePath,
+                startLine: sourceSpan.LineIndex + 1,
+                startColumn: sourceSpan.CharacterIndex,
+                endLine: sourceSpan.LineIndex + 1,
+                endColumn: sourceSpan.CharacterIndex + sourceSpan.Length);
+        }
+
+        private static string GetFilePath(RazorCodeDocument codeDocument, Diagnostic diagnostic)
+        {
+            if (diagnostic.Location == Location.None)
+            {
+                return codeDocument.Source.FilePath;
+            }
+
+            return diagnostic.Location.GetMappedLineSpan().Path;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorPageFactoryProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorPageFactoryProvider.cs
new file mode 100644
index 0000000000..b5c7341830
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorPageFactoryProvider.cs
@@ -0,0 +1,68 @@
+// 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.
+
+using System;
+using System.Linq.Expressions;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    /// <summary>
+    /// Represents a <see cref="IRazorPageFactoryProvider"/> that creates <see cref="RazorPage"/> instances
+    /// from razor files in the file system.
+    /// </summary>
+    public class DefaultRazorPageFactoryProvider : IRazorPageFactoryProvider
+    {
+        private readonly IViewCompilerProvider _viewCompilerProvider;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="DefaultRazorPageFactoryProvider"/>.
+        /// </summary>
+        /// <param name="viewCompilerProvider">The <see cref="IViewCompilerProvider"/>.</param>
+        public DefaultRazorPageFactoryProvider(IViewCompilerProvider viewCompilerProvider)
+        {
+            _viewCompilerProvider = viewCompilerProvider;
+        }
+
+        private IViewCompiler Compiler => _viewCompilerProvider.GetCompiler();
+
+        /// <inheritdoc />
+        public RazorPageFactoryResult CreateFactory(string relativePath)
+        {
+            if (relativePath == null)
+            {
+                throw new ArgumentNullException(nameof(relativePath));
+            }
+
+            if (relativePath.StartsWith("~/", StringComparison.Ordinal))
+            {
+                // For tilde slash paths, drop the leading ~ to make it work with the underlying IFileProvider.
+                relativePath = relativePath.Substring(1);
+            }
+
+            var compileTask = Compiler.CompileAsync(relativePath);
+            var viewDescriptor = compileTask.GetAwaiter().GetResult();
+
+            var viewType = viewDescriptor.Type;
+            if (viewType != null)
+            {
+                var newExpression = Expression.New(viewType);
+                var pathProperty = viewType.GetTypeInfo().GetProperty(nameof(IRazorPage.Path));
+
+                // Generate: page.Path = relativePath;
+                // Use the normalized path specified from the result.
+                var propertyBindExpression = Expression.Bind(pathProperty, Expression.Constant(viewDescriptor.RelativePath));
+                var objectInitializeExpression = Expression.MemberInit(newExpression, propertyBindExpression);
+                var pageFactory = Expression
+                    .Lambda<Func<IRazorPage>>(objectInitializeExpression)
+                    .Compile();
+                return new RazorPageFactoryResult(viewDescriptor, pageFactory);
+            }
+            else
+            {
+                return new RazorPageFactoryResult(viewDescriptor, razorPageFactory: null);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorReferenceManager.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorReferenceManager.cs
new file mode 100644
index 0000000000..f1d59ef770
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorReferenceManager.cs
@@ -0,0 +1,60 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.CodeAnalysis;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class DefaultRazorReferenceManager : RazorReferenceManager
+    {
+        private readonly ApplicationPartManager _partManager;
+        private readonly IList<MetadataReference> _additionalMetadataReferences;
+        private object _compilationReferencesLock = new object();
+        private bool _compilationReferencesInitialized;
+        private IReadOnlyList<MetadataReference> _compilationReferences;
+
+        public DefaultRazorReferenceManager(
+            ApplicationPartManager partManager,
+            IOptions<RazorViewEngineOptions> optionsAccessor)
+        {
+            _partManager = partManager;
+            _additionalMetadataReferences = optionsAccessor.Value.AdditionalCompilationReferences;
+        }
+
+        public override IReadOnlyList<MetadataReference> CompilationReferences
+        {
+            get
+            {
+                return LazyInitializer.EnsureInitialized(
+                    ref _compilationReferences,
+                    ref _compilationReferencesInitialized,
+                    ref _compilationReferencesLock,
+                    GetCompilationReferences);
+            }
+        }
+
+        private IReadOnlyList<MetadataReference> GetCompilationReferences()
+        {
+            var feature = new MetadataReferenceFeature();
+            _partManager.PopulateFeature(feature);
+            var applicationReferences = feature.MetadataReferences;
+
+            if (_additionalMetadataReferences.Count == 0)
+            {
+                return applicationReferences.ToArray();
+            }
+
+            var compilationReferences = new List<MetadataReference>(applicationReferences.Count + _additionalMetadataReferences.Count);
+            compilationReferences.AddRange(applicationReferences);
+            compilationReferences.AddRange(_additionalMetadataReferences);
+
+            return compilationReferences;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorViewEngineFileProviderAccessor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorViewEngineFileProviderAccessor.cs
new file mode 100644
index 0000000000..5823a4b39c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorViewEngineFileProviderAccessor.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    /// <summary>
+    /// Default implementation of <see cref="IRazorViewEngineFileProviderAccessor"/>.
+    /// </summary>
+    public class DefaultRazorViewEngineFileProviderAccessor : IRazorViewEngineFileProviderAccessor
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="DefaultRazorViewEngineFileProviderAccessor"/>.
+        /// </summary>
+        /// <param name="optionsAccessor">Accessor to <see cref="RazorViewEngineOptions"/>.</param>
+        public DefaultRazorViewEngineFileProviderAccessor(IOptions<RazorViewEngineOptions> optionsAccessor)
+        {
+            var fileProviders = optionsAccessor.Value.FileProviders;
+            if (fileProviders.Count == 0)
+            {
+                FileProvider = new NullFileProvider();
+            }
+            else if (fileProviders.Count == 1)
+            {
+                FileProvider = fileProviders[0];
+            }
+            else
+            {
+                FileProvider = new CompositeFileProvider(fileProviders);
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="IFileProvider"/> used to look up Razor files.
+        /// </summary>
+        public IFileProvider FileProvider { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultTagHelperActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultTagHelperActivator.cs
new file mode 100644
index 0000000000..c52a77a2eb
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultTagHelperActivator.cs
@@ -0,0 +1,46 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    /// <summary>
+    /// Default implementation of <see cref="ITagHelperActivator"/>.
+    /// </summary>
+    public class DefaultTagHelperActivator : ITagHelperActivator
+    {
+        private readonly ITypeActivatorCache _typeActivatorCache;
+
+        /// <summary>
+        /// Instantiates a new <see cref="DefaultTagHelperActivator"/> instance.
+        /// </summary>
+        /// <param name="typeActivatorCache">The <see cref="ITypeActivatorCache"/>.</param>
+        public DefaultTagHelperActivator(ITypeActivatorCache typeActivatorCache)
+        {
+            if (typeActivatorCache == null)
+            {
+                throw new ArgumentNullException(nameof(typeActivatorCache));
+            }
+
+            _typeActivatorCache = typeActivatorCache;
+        }
+
+        /// <inheritdoc />
+        public TTagHelper Create<TTagHelper>(ViewContext context)
+            where TTagHelper : ITagHelper
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            return _typeActivatorCache.CreateInstance<TTagHelper>(
+                context.HttpContext.RequestServices,
+                typeof(TTagHelper));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultTagHelperFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultTagHelperFactory.cs
new file mode 100644
index 0000000000..6dd51965c3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultTagHelperFactory.cs
@@ -0,0 +1,92 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    /// <summary>
+    /// Default implementation for <see cref="ITagHelperFactory"/>.
+    /// </summary>
+    public class DefaultTagHelperFactory : ITagHelperFactory
+    {
+        private readonly ITagHelperActivator _activator;
+        private readonly ConcurrentDictionary<Type, PropertyActivator<ViewContext>[]> _injectActions;
+        private readonly Func<Type, PropertyActivator<ViewContext>[]> _getPropertiesToActivate;
+        private static readonly Func<PropertyInfo, PropertyActivator<ViewContext>> _createActivateInfo = CreateActivateInfo;
+
+        /// <summary>
+        /// Initializes a new <see cref="DefaultTagHelperFactory"/> instance.
+        /// </summary>
+        /// <param name="activator">
+        /// The <see cref="ITagHelperActivator"/> used to create tag helper instances.
+        /// </param>
+        public DefaultTagHelperFactory(ITagHelperActivator activator)
+        {
+            if (activator == null)
+            {
+                throw new ArgumentNullException(nameof(activator));
+            }
+
+            _activator = activator;
+            _injectActions = new ConcurrentDictionary<Type, PropertyActivator<ViewContext>[]>();
+            _getPropertiesToActivate = type =>
+                PropertyActivator<ViewContext>.GetPropertiesToActivate(
+                    type,
+                    typeof(ViewContextAttribute),
+                    _createActivateInfo);
+        }
+
+        /// <inheritdoc />
+        public TTagHelper CreateTagHelper<TTagHelper>(ViewContext context)
+            where TTagHelper : ITagHelper
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var tagHelper = _activator.Create<TTagHelper>(context);
+
+            var propertiesToActivate = _injectActions.GetOrAdd(
+                tagHelper.GetType(),
+                _getPropertiesToActivate);
+
+            for (var i = 0; i < propertiesToActivate.Length; i++)
+            {
+                var activateInfo = propertiesToActivate[i];
+                activateInfo.Activate(tagHelper, context);
+            }
+
+            InitializeTagHelper(tagHelper, context);
+
+            return tagHelper;
+        }
+
+        private static void InitializeTagHelper<TTagHelper>(TTagHelper tagHelper, ViewContext context)
+            where TTagHelper : ITagHelper
+        {
+            // Run any tag helper initializers in the container
+            var serviceProvider = context.HttpContext.RequestServices;
+            var initializers = serviceProvider.GetService<IEnumerable<ITagHelperInitializer<TTagHelper>>>();
+
+            foreach (var initializer in initializers)
+            {
+                initializer.Initialize(tagHelper, context);
+            }
+        }
+
+        private static PropertyActivator<ViewContext> CreateActivateInfo(PropertyInfo property)
+        {
+            return new PropertyActivator<ViewContext>(property, viewContext => viewContext);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ExpressionRewriter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ExpressionRewriter.cs
new file mode 100644
index 0000000000..6d3d9cc757
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ExpressionRewriter.cs
@@ -0,0 +1,215 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq.Expressions;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    /// <summary>
+    /// An expression rewriter which can hoist a simple expression lambda into a private field.
+    /// </summary>
+    public class ExpressionRewriter : CSharpSyntaxRewriter
+    {
+        private static readonly string FieldNameTemplate = "__h{0}";
+
+        public ExpressionRewriter(SemanticModel semanticModel)
+        {
+            SemanticModel = semanticModel;
+
+            Expressions = new List<KeyValuePair<SimpleLambdaExpressionSyntax, IdentifierNameSyntax>>();
+        }
+
+        // We only want to rewrite expressions for the top-level class definition.
+        private bool IsInsideClass { get; set; }
+
+        private SemanticModel SemanticModel { get; }
+
+        private List<KeyValuePair<SimpleLambdaExpressionSyntax, IdentifierNameSyntax>> Expressions { get; }
+
+        public static CSharpCompilation Rewrite(CSharpCompilation compilation)
+        {
+            var rewrittenTrees = new List<SyntaxTree>();
+            foreach (var tree in compilation.SyntaxTrees)
+            {
+                var semanticModel = compilation.GetSemanticModel(tree, ignoreAccessibility: true);
+                var rewriter = new ExpressionRewriter(semanticModel);
+
+                var rewrittenTree = tree.WithRootAndOptions(rewriter.Visit(tree.GetRoot()), tree.Options);
+                rewrittenTrees.Add(rewrittenTree);
+            }
+
+            return compilation.RemoveAllSyntaxTrees().AddSyntaxTrees(rewrittenTrees);
+        }
+
+        public override SyntaxNode VisitClassDeclaration(ClassDeclarationSyntax node)
+        {
+            if (IsInsideClass)
+            {
+                // Avoid recursing into nested classes.
+                return node;
+            }
+
+            Expressions.Clear();
+
+            IsInsideClass = true;
+
+            // Call base first to visit all the children and populate Expressions.
+            var classDeclaration = (ClassDeclarationSyntax)base.VisitClassDeclaration(node);
+
+            IsInsideClass = false;
+
+            var memberDeclarations = new List<MemberDeclarationSyntax>();
+            foreach (var kvp in Expressions)
+            {
+                var expression = kvp.Key;
+                var memberName = kvp.Value.GetFirstToken();
+
+                var expressionType = SemanticModel.GetTypeInfo(expression).ConvertedType;
+                var declaration = SyntaxFactory.FieldDeclaration(
+                    SyntaxFactory.List<AttributeListSyntax>(),
+                    SyntaxFactory.TokenList(
+                        SyntaxFactory.Token(SyntaxKind.PrivateKeyword),
+                        SyntaxFactory.Token(SyntaxKind.StaticKeyword),
+                        SyntaxFactory.Token(SyntaxKind.ReadOnlyKeyword)),
+                    SyntaxFactory.VariableDeclaration(
+                        SyntaxFactory.ParseTypeName(expressionType.ToDisplayString(
+                            SymbolDisplayFormat.FullyQualifiedFormat)),
+                        SyntaxFactory.SingletonSeparatedList(
+                            SyntaxFactory.VariableDeclarator(
+                                memberName,
+                                SyntaxFactory.BracketedArgumentList(),
+                                SyntaxFactory.EqualsValueClause(expression)))))
+                    .WithTriviaFrom(expression);
+                memberDeclarations.Add(declaration);
+            }
+
+            return classDeclaration.AddMembers(memberDeclarations.ToArray());
+        }
+
+        public override SyntaxNode VisitSimpleLambdaExpression(SimpleLambdaExpressionSyntax node)
+        {
+            Debug.Assert(IsInsideClass);
+
+            // If this lambda is an Expression and is suitable for hoisting, we rewrite this into a field access.
+            //
+            //  Before:
+            //      public Task ExecuteAsync(...)
+            //      {
+            //          ...
+            //          Html.EditorFor(m => m.Price);
+            //          ...
+            //      }
+            //
+            //
+            //  After:
+            //      private static readonly Expression<Func<Product, decimal>> __h0 = m => m.Price;
+            //      public Task ExecuteAsync(...)
+            //      {
+            //          ...
+            //          Html.EditorFor(__h0);
+            //          ...
+            //      }
+            //
+            var type = SemanticModel.GetTypeInfo(node);
+
+            // Due to an anomaly where Roslyn (depending on code sample) may finish compilation without diagnostic
+            // errors (this code path does not execute when diagnostic errors are present) we need to validate that
+            // the ConvertedType was determined/is not null.
+            if (type.ConvertedType == null ||
+                type.ConvertedType.Name != typeof(Expression).Name &&
+                type.ConvertedType.ContainingNamespace.Name != typeof(Expression).Namespace)
+            {
+                return node;
+            }
+
+            if (!node.Parent.IsKind(SyntaxKind.Argument))
+            {
+                return node;
+            }
+
+            var parameter = node.Parameter;
+            if (IsValidForHoisting(parameter, node.Body))
+            {
+                // Replace with a MemberAccess
+                var memberName = string.Format(FieldNameTemplate, Expressions.Count);
+                var memberAccess = PadMemberAccess(node, SyntaxFactory.IdentifierName(memberName));
+                Expressions.Add(new KeyValuePair<SimpleLambdaExpressionSyntax, IdentifierNameSyntax>(node, memberAccess));
+                return memberAccess;
+            }
+
+            return node;
+        }
+
+        private static IdentifierNameSyntax PadMemberAccess(
+            SimpleLambdaExpressionSyntax node,
+            IdentifierNameSyntax memberAccess)
+        {
+            var charactersToExclude = memberAccess.Identifier.Text.Length;
+            var triviaList = new SyntaxTriviaList();
+
+            // Go through each token and
+            // 1. Append leading trivia
+            // 2. Append the same number of whitespace as the length of the token text
+            // 3. Append trailing trivia
+            foreach (var token in node.DescendantTokens())
+            {
+                if (token.HasLeadingTrivia)
+                {
+                    triviaList = triviaList.AddRange(token.LeadingTrivia);
+                }
+
+                // Need to exclude the length of the member name from the padding.
+                var padding = token.Text.Length;
+                if (padding > charactersToExclude)
+                {
+                    padding -= charactersToExclude;
+                    charactersToExclude = 0;
+                }
+                else
+                {
+                    charactersToExclude -= padding;
+                    padding = 0;
+                }
+
+                if (padding > 0)
+                {
+                    triviaList = triviaList.Add(SyntaxFactory.Whitespace(new string(' ', padding)));
+                }
+
+                if (token.HasTrailingTrivia)
+                {
+                    triviaList = triviaList.AddRange(token.TrailingTrivia);
+                }
+            }
+
+            return memberAccess
+                .WithLeadingTrivia(node.GetLeadingTrivia())
+                .WithTrailingTrivia(triviaList);
+        }
+
+        private static bool IsValidForHoisting(ParameterSyntax parameter, CSharpSyntaxNode node)
+        {
+            if (node.IsKind(SyntaxKind.IdentifierName))
+            {
+                var identifier = (IdentifierNameSyntax)node;
+                if (identifier.Identifier.Text == parameter.Identifier.Text)
+                {
+                    return true;
+                }
+            }
+            else if (node.IsKind(SyntaxKind.SimpleMemberAccessExpression))
+            {
+                var memberAccess = (MemberAccessExpressionSyntax)node;
+                var lhs = memberAccess.Expression;
+                return IsValidForHoisting(parameter, lhs);
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/FileProviderRazorProject.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/FileProviderRazorProject.cs
new file mode 100644
index 0000000000..52af4ae3f3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/FileProviderRazorProject.cs
@@ -0,0 +1,91 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.Extensions.FileProviders;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class FileProviderRazorProjectFileSystem : RazorProjectFileSystem
+    {
+        private const string RazorFileExtension = ".cshtml";
+        private readonly IFileProvider _provider;
+        private readonly IHostingEnvironment _hostingEnvironment;
+
+        public FileProviderRazorProjectFileSystem(IRazorViewEngineFileProviderAccessor accessor, IHostingEnvironment hostingEnviroment)
+        {
+            if (accessor == null)
+            {
+                throw new ArgumentNullException(nameof(accessor));
+            }
+
+            if (hostingEnviroment == null)
+            {
+                throw new ArgumentNullException(nameof(hostingEnviroment));
+            }
+
+            _provider = accessor.FileProvider;
+            _hostingEnvironment = hostingEnviroment;
+        }
+
+        public override RazorProjectItem GetItem(string path)
+        {
+            path = NormalizeAndEnsureValidPath(path);
+            var fileInfo = _provider.GetFileInfo(path);
+
+            return new FileProviderRazorProjectItem(fileInfo, basePath: string.Empty, filePath: path, root: _hostingEnvironment.ContentRootPath);
+        }
+
+        public override IEnumerable<RazorProjectItem> EnumerateItems(string path)
+        {
+            path = NormalizeAndEnsureValidPath(path);
+            return EnumerateFiles(_provider.GetDirectoryContents(path), path, prefix: string.Empty);
+        }
+
+        private IEnumerable<RazorProjectItem> EnumerateFiles(IDirectoryContents directory, string basePath, string prefix)
+        {
+            if (directory.Exists)
+            {
+                foreach (var fileInfo in directory)
+                {
+                    if (fileInfo.IsDirectory)
+                    {
+                        var relativePath = prefix + "/" + fileInfo.Name;
+                        var subDirectory = _provider.GetDirectoryContents(JoinPath(basePath, relativePath));
+                        var children = EnumerateFiles(subDirectory, basePath, relativePath);
+                        foreach (var child in children)
+                        {
+                            yield return child;
+                        }
+                    }
+                    else if (string.Equals(RazorFileExtension, Path.GetExtension(fileInfo.Name), StringComparison.OrdinalIgnoreCase))
+                    {
+                        var filePath = prefix + "/" + fileInfo.Name;
+
+                        yield return new FileProviderRazorProjectItem(fileInfo, basePath, filePath: filePath, root: _hostingEnvironment.ContentRootPath);
+                    }
+                }
+            }
+        }
+
+        private static string JoinPath(string path1, string path2)
+        {
+            var hasTrailingSlash = path1.EndsWith("/", StringComparison.Ordinal);
+            var hasLeadingSlash = path2.StartsWith("/", StringComparison.Ordinal);
+            if (hasLeadingSlash && hasTrailingSlash)
+            {
+                return path1 + path2.Substring(1);
+            }
+            else if (hasLeadingSlash || hasTrailingSlash)
+            {
+                return path1 + path2;
+            }
+
+            return path1 + "/" + path2;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/FileProviderRazorProjectItem.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/FileProviderRazorProjectItem.cs
new file mode 100644
index 0000000000..6108d6875b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/FileProviderRazorProjectItem.cs
@@ -0,0 +1,65 @@
+// 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.
+
+using System;
+using System.IO;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.Extensions.FileProviders;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class FileProviderRazorProjectItem : RazorProjectItem
+    {
+        private string _root;
+        private string _relativePhysicalPath;
+        private bool _isRelativePhysicalPathSet;
+
+        public FileProviderRazorProjectItem(IFileInfo fileInfo, string basePath, string filePath, string root)
+        {
+            FileInfo = fileInfo;
+            BasePath = basePath;
+            FilePath = filePath;
+            _root = root;
+        }
+
+        public IFileInfo FileInfo { get; }
+
+        public override string BasePath { get; }
+
+        public override string FilePath { get; }
+
+        public override bool Exists => FileInfo.Exists;
+
+        public override string PhysicalPath => FileInfo.PhysicalPath;
+
+        public override string RelativePhysicalPath
+        {
+            get
+            {
+                if (!_isRelativePhysicalPathSet)
+                {
+                    _isRelativePhysicalPathSet = true;
+
+                    if (Exists)
+                    {
+                        if (_root != null &&
+                            !string.IsNullOrEmpty(PhysicalPath) &&
+                            PhysicalPath.StartsWith(_root, StringComparison.OrdinalIgnoreCase) &&
+                            PhysicalPath.Length > _root.Length &&
+                            (PhysicalPath[_root.Length] == Path.DirectorySeparatorChar || PhysicalPath[_root.Length] == Path.AltDirectorySeparatorChar))
+                        {
+                            _relativePhysicalPath = PhysicalPath.Substring(_root.Length + 1); // Include leading separator
+                        }
+                    }
+                }
+
+                return _relativePhysicalPath;
+            }
+        }
+
+        public override Stream Read()
+        {
+            return FileInfo.CreateReadStream();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/IRazorViewEngineFileProviderAccessor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/IRazorViewEngineFileProviderAccessor.cs
new file mode 100644
index 0000000000..670b7c3db3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/IRazorViewEngineFileProviderAccessor.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using Microsoft.Extensions.FileProviders;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    /// <summary>
+    /// Accessor to the <see cref="IFileProvider"/> used by <see cref="RazorViewEngine"/>.
+    /// </summary>
+    public interface IRazorViewEngineFileProviderAccessor
+    {
+        /// <summary>
+        /// Gets the <see cref="IFileProvider"/> used to look up Razor files.
+        /// </summary>
+        IFileProvider FileProvider { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/LazyMetadataReferenceFeature.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/LazyMetadataReferenceFeature.cs
new file mode 100644
index 0000000000..ead4b29630
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/LazyMetadataReferenceFeature.cs
@@ -0,0 +1,29 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Razor;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class LazyMetadataReferenceFeature : IMetadataReferenceFeature
+    {
+        private readonly RazorReferenceManager _referenceManager;
+
+        public LazyMetadataReferenceFeature(RazorReferenceManager referenceManager)
+        {
+            _referenceManager = referenceManager;
+        }
+
+        /// <remarks>
+        /// Invoking <see cref="RazorReferenceManager.CompilationReferences"/> ensures that compilation
+        /// references are lazily evaluated.
+        /// </remarks>
+        public IReadOnlyList<MetadataReference> References => _referenceManager.CompilationReferences;
+
+        public RazorEngine Engine { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorDiagnosticSourceExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorDiagnosticSourceExtensions.cs
new file mode 100644
index 0000000000..a60f5fb587
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorDiagnosticSourceExtensions.cs
@@ -0,0 +1,49 @@
+// 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.
+
+using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public static class MvcRazorDiagnosticSourceExtensions
+    {
+        public static void BeforeViewPage(
+            this DiagnosticSource diagnosticSource,
+            IRazorPage page,
+            ViewContext viewContext)
+        {
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.Razor.BeforeViewPage"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.Razor.BeforeViewPage",
+                    new
+                    {
+                        page = page,
+                        viewContext = viewContext,
+                        actionDescriptor = viewContext.ActionDescriptor,
+                        httpContext = viewContext.HttpContext,
+                    });
+            }
+        }
+
+        public static void AfterViewPage(
+            this DiagnosticSource diagnosticSource,
+            IRazorPage page,
+            ViewContext viewContext)
+        {
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.Razor.AfterViewPage"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.Razor.AfterViewPage",
+                    new
+                    {
+                        page = page,
+                        viewContext = viewContext,
+                        actionDescriptor = viewContext.ActionDescriptor,
+                        httpContext = viewContext.HttpContext,
+                    });
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorLoggerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorLoggerExtensions.cs
new file mode 100644
index 0000000000..21d7496abd
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorLoggerExtensions.cs
@@ -0,0 +1,212 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public static class MvcRazorLoggerExtensions
+    {
+        private static readonly double TimestampToTicks = TimeSpan.TicksPerSecond / (double)Stopwatch.Frequency;
+
+        private static readonly Action<ILogger, string, Exception> _generatedCodeToAssemblyCompilationStart;
+        private static readonly Action<ILogger, string, double, Exception> _generatedCodeToAssemblyCompilationEnd;
+
+        private static readonly Action<ILogger, string, Exception> _viewCompilerStartCodeGeneration;
+        private static readonly Action<ILogger, string, double, Exception> _viewCompilerEndCodeGeneration;
+        private static readonly Action<ILogger, string, Exception> _viewCompilerLocatedCompiledView;
+        private static readonly Action<ILogger, Exception> _viewCompilerNoCompiledViewsFound;
+        private static readonly Action<ILogger, string, Exception> _viewCompilerLocatedCompiledViewForPath;
+        private static readonly Action<ILogger, string, Exception> _viewCompilerRecompilingCompiledView;
+        private static readonly Action<ILogger, string, Exception> _viewCompilerCouldNotFindFileToCompileForPath;
+        private static readonly Action<ILogger, string, Exception> _viewCompilerFoundFileToCompileForPath;
+        private static readonly Action<ILogger, string, Exception> _viewCompilerInvalidatingCompiledFile;
+
+        private static readonly Action<ILogger, string, string, Exception> _viewLookupCacheMiss;
+        private static readonly Action<ILogger, string, string, Exception> _viewLookupCacheHit;
+        private static readonly Action<ILogger, string, Exception> _precompiledViewFound;
+
+        private static readonly Action<ILogger, string, Exception> _tagHelperComponentInitialized;
+        private static readonly Action<ILogger, string, Exception> _tagHelperComponentProcessed;
+
+
+        static MvcRazorLoggerExtensions()
+        {
+            _viewCompilerStartCodeGeneration = LoggerMessage.Define<string>(
+                LogLevel.Debug,
+                1,
+                "Code generation for the Razor file at '{FilePath}' started.");
+
+            _viewCompilerEndCodeGeneration = LoggerMessage.Define<string, double>(
+                LogLevel.Debug,
+                2,
+                "Code generation for the Razor file at '{FilePath}' completed in {ElapsedMilliseconds}ms.");
+
+            _viewCompilerLocatedCompiledView = LoggerMessage.Define<string>(
+                LogLevel.Debug,
+                3,
+                "Initializing Razor view compiler with compiled view: '{ViewName}'.");
+
+            _viewCompilerNoCompiledViewsFound = LoggerMessage.Define(
+                LogLevel.Debug,
+                4,
+                "Initializing Razor view compiler with no compiled views.");
+
+            _viewCompilerLocatedCompiledViewForPath = LoggerMessage.Define<string>(
+                LogLevel.Trace,
+                5,
+                "Located compiled view for view at path '{Path}'.");
+
+            _viewCompilerLocatedCompiledViewForPath = LoggerMessage.Define<string>(
+                LogLevel.Trace,
+                5,
+                "Located compiled view for view at path '{Path}'.");
+
+            _viewCompilerRecompilingCompiledView = LoggerMessage.Define<string>(
+                LogLevel.Trace,
+                6,
+                "Invalidating compiled view for view at path '{Path}'.");
+
+            _viewCompilerCouldNotFindFileToCompileForPath = LoggerMessage.Define<string>(
+                LogLevel.Trace,
+                7,
+                "Could not find a file for view at path '{Path}'.");
+
+            _viewCompilerFoundFileToCompileForPath = LoggerMessage.Define<string>(
+                LogLevel.Trace,
+                8,
+                "Found file at path '{Path}'.");
+
+            _viewCompilerInvalidatingCompiledFile = LoggerMessage.Define<string>(
+                LogLevel.Trace,
+                9,
+                "Invalidating compiled view at path '{Path}' with a file since the checksum did not match.");
+
+            _viewLookupCacheMiss = LoggerMessage.Define<string, string>(
+                LogLevel.Debug,
+                1,
+                "View lookup cache miss for view '{ViewName}' in controller '{ControllerName}'.");
+
+            _viewLookupCacheHit = LoggerMessage.Define<string, string>(
+                LogLevel.Debug,
+                2,
+                "View lookup cache hit for view '{ViewName}' in controller '{ControllerName}'.");
+
+            _precompiledViewFound = LoggerMessage.Define<string>(
+                LogLevel.Debug,
+                3,
+                "Using precompiled view for '{RelativePath}'.");
+
+            _generatedCodeToAssemblyCompilationStart = LoggerMessage.Define<string>(
+                LogLevel.Debug,
+                1,
+                "Compilation of the generated code for the Razor file at '{FilePath}' started.");
+
+            _generatedCodeToAssemblyCompilationEnd = LoggerMessage.Define<string, double>(
+                LogLevel.Debug,
+                2,
+                "Compilation of the generated code for the Razor file at '{FilePath}' completed in {ElapsedMilliseconds}ms.");
+
+            _tagHelperComponentInitialized = LoggerMessage.Define<string>(
+                LogLevel.Debug,
+                2,
+                "Tag helper component '{ComponentName}' initialized.");
+
+            _tagHelperComponentProcessed = LoggerMessage.Define<string>(
+                LogLevel.Debug,
+                3,
+                "Tag helper component '{ComponentName}' processed.");
+        }
+
+        public static void ViewCompilerStartCodeGeneration(this ILogger logger, string filePath)
+        {
+            _viewCompilerStartCodeGeneration(logger, filePath, null);
+        }
+
+        public static void ViewCompilerEndCodeGeneration(this ILogger logger, string filePath, long startTimestamp)
+        {
+            // Don't log if logging wasn't enabled at start of request as time will be wildly wrong.
+            if (startTimestamp != 0)
+            {
+                var currentTimestamp = Stopwatch.GetTimestamp();
+                var elapsed = new TimeSpan((long)(TimestampToTicks * (currentTimestamp - startTimestamp)));
+                _viewCompilerEndCodeGeneration(logger, filePath, elapsed.TotalMilliseconds, null);
+            }
+        }
+
+        public static void ViewCompilerLocatedCompiledView(this ILogger logger, string view)
+        {
+            _viewCompilerLocatedCompiledView(logger, view, null);
+        }
+
+        public static void ViewCompilerNoCompiledViewsFound(this ILogger logger)
+        {
+            _viewCompilerNoCompiledViewsFound(logger, null);
+        }
+
+        public static void ViewCompilerLocatedCompiledViewForPath(this ILogger logger, string path)
+        {
+            _viewCompilerLocatedCompiledViewForPath(logger, path, null);
+        }
+
+        public static void ViewCompilerCouldNotFindFileAtPath(this ILogger logger, string path)
+        {
+            _viewCompilerCouldNotFindFileToCompileForPath(logger, path, null);
+        }
+
+        public static void ViewCompilerFoundFileToCompile(this ILogger logger, string path)
+        {
+            _viewCompilerFoundFileToCompileForPath(logger, path, null);
+        }
+
+        public static void ViewCompilerInvalidingCompiledFile(this ILogger logger, string path)
+        {
+            _viewCompilerInvalidatingCompiledFile(logger, path, null);
+        }
+
+        public static void ViewLookupCacheMiss(this ILogger logger, string viewName, string controllerName)
+        {
+            _viewLookupCacheMiss(logger, viewName, controllerName, null);
+        }
+
+        public static void ViewLookupCacheHit(this ILogger logger, string viewName, string controllerName)
+        {
+            _viewLookupCacheHit(logger, viewName, controllerName, null);
+        }
+
+        public static void PrecompiledViewFound(this ILogger logger, string relativePath)
+        {
+            _precompiledViewFound(logger, relativePath, null);
+        }
+
+        public static void GeneratedCodeToAssemblyCompilationStart(this ILogger logger, string filePath)
+        {
+            _generatedCodeToAssemblyCompilationStart(logger, filePath, null);
+        }
+
+        public static void TagHelperComponentInitialized(this ILogger logger, string componentName)
+        {
+            _tagHelperComponentInitialized(logger, componentName, null);
+        }
+
+        public static void TagHelperComponentProcessed(this ILogger logger, string componentName)
+        {
+            _tagHelperComponentProcessed(logger, componentName, null);
+        }
+
+        public static void GeneratedCodeToAssemblyCompilationEnd(this ILogger logger, string filePath, long startTimestamp)
+        {
+            // Don't log if logging wasn't enabled at start of request as time will be wildly wrong.
+            if (startTimestamp != 0)
+            {
+                var currentTimestamp = Stopwatch.GetTimestamp();
+                var elapsed = new TimeSpan((long)(TimestampToTicks * (currentTimestamp - startTimestamp)));
+                _generatedCodeToAssemblyCompilationEnd(logger, filePath, elapsed.TotalMilliseconds, null);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorMvcViewOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorMvcViewOptionsSetup.cs
new file mode 100644
index 0000000000..8b35da8ddf
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorMvcViewOptionsSetup.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    /// <summary>
+    /// Configures <see cref="MvcViewOptions"/> to use <see cref="RazorViewEngine"/>.
+    /// </summary>
+    public class MvcRazorMvcViewOptionsSetup : IConfigureOptions<MvcViewOptions>
+    {
+        private readonly IRazorViewEngine _razorViewEngine;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="MvcRazorMvcViewOptionsSetup"/>.
+        /// </summary>
+        /// <param name="razorViewEngine">The <see cref="IRazorViewEngine"/>.</param>
+        public MvcRazorMvcViewOptionsSetup(IRazorViewEngine razorViewEngine)
+        {
+            if (razorViewEngine == null)
+            {
+                throw new ArgumentNullException(nameof(razorViewEngine));
+            }
+
+            _razorViewEngine = razorViewEngine;
+        }
+
+        /// <summary>
+        /// Configures <paramref name="options"/> to use <see cref="RazorViewEngine"/>.
+        /// </summary>
+        /// <param name="options">The <see cref="MvcViewOptions"/> to configure.</param>
+        public void Configure(MvcViewOptions options)
+        {
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            options.ViewEngines.Add(_razorViewEngine);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorInjectAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorInjectAttribute.cs
new file mode 100644
index 0000000000..72b1c31f49
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorInjectAttribute.cs
@@ -0,0 +1,12 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
+    public class RazorInjectAttribute : Attribute
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorPagePropertyActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorPagePropertyActivator.cs
new file mode 100644
index 0000000000..b163088361
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorPagePropertyActivator.cs
@@ -0,0 +1,151 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Reflection;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class RazorPagePropertyActivator
+    {
+        private readonly IModelMetadataProvider _metadataProvider;
+        private readonly Func<IModelMetadataProvider, ModelStateDictionary, ViewDataDictionary> _rootFactory;
+        private readonly Func<ViewDataDictionary, ViewDataDictionary> _nestedFactory;
+        private readonly Type _viewDataDictionaryType;
+        private readonly PropertyActivator<ViewContext>[] _propertyActivators;
+
+        public RazorPagePropertyActivator(
+            Type pageType,
+            Type declaredModelType,
+            IModelMetadataProvider metadataProvider,
+            PropertyValueAccessors propertyValueAccessors)
+        {
+            _metadataProvider = metadataProvider;
+
+            // In the absence of a model on the current type, we'll attempt to use ViewDataDictionary<object> on the current type.
+            var viewDataDictionaryModelType = declaredModelType ?? typeof(object);
+
+            if (viewDataDictionaryModelType != null)
+            {
+                _viewDataDictionaryType = typeof(ViewDataDictionary<>).MakeGenericType(viewDataDictionaryModelType);
+                _rootFactory = ViewDataDictionaryFactory.CreateFactory(viewDataDictionaryModelType.GetTypeInfo());
+                _nestedFactory = ViewDataDictionaryFactory.CreateNestedFactory(viewDataDictionaryModelType.GetTypeInfo());
+            }
+
+            _propertyActivators = PropertyActivator<ViewContext>.GetPropertiesToActivate(
+                pageType,
+                typeof(RazorInjectAttribute),
+                propertyInfo => CreateActivateInfo(propertyInfo, propertyValueAccessors),
+                includeNonPublic: true);
+        }
+
+        public void Activate(object page, ViewContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (_viewDataDictionaryType != null)
+            {
+                context.ViewData = CreateViewDataDictionary(context);
+            }
+
+            for (var i = 0; i < _propertyActivators.Length; i++)
+            {
+                var activateInfo = _propertyActivators[i];
+                activateInfo.Activate(page, context);
+            }
+        }
+
+        // Internal for unit testing.
+        internal ViewDataDictionary CreateViewDataDictionary(ViewContext context)
+        {
+            // Create a ViewDataDictionary<TModel> if the ViewContext.ViewData is not set or the type of
+            // ViewContext.ViewData is an incompatible type.
+            if (context.ViewData == null)
+            {
+                // Create ViewDataDictionary<TModel>(IModelMetadataProvider, ModelStateDictionary).
+                return _rootFactory(_metadataProvider, context.ModelState);
+            }
+            else if (context.ViewData.GetType() != _viewDataDictionaryType)
+            {
+                // Create ViewDataDictionary<TModel>(ViewDataDictionary).
+                return _nestedFactory(context.ViewData);
+            }
+
+            return context.ViewData;
+        }
+
+        private static PropertyActivator<ViewContext> CreateActivateInfo(
+            PropertyInfo property,
+            PropertyValueAccessors valueAccessors)
+        {
+            Func<ViewContext, object> valueAccessor;
+            if (typeof(ViewDataDictionary).IsAssignableFrom(property.PropertyType))
+            {
+                // Logic looks reversed in condition above but is OK. Support only properties of base
+                // ViewDataDictionary type and activationInfo.ViewDataDictionaryType. VDD<AnotherType> will fail when
+                // assigning to the property (InvalidCastException) and that's fine.
+                valueAccessor = context => context.ViewData;
+            }
+            else if (property.PropertyType == typeof(IUrlHelper))
+            {
+                // W.r.t. specificity of above condition: Users are much more likely to inject their own
+                // IUrlHelperFactory than to create a class implementing IUrlHelper (or a sub-interface) and inject
+                // that. But the second scenario is supported. (Note the class must implement ICanHasViewContext.)
+                valueAccessor = valueAccessors.UrlHelperAccessor;
+            }
+            else if (property.PropertyType == typeof(IJsonHelper))
+            {
+                valueAccessor = valueAccessors.JsonHelperAccessor;
+            }
+            else if (property.PropertyType == typeof(DiagnosticSource))
+            {
+                valueAccessor = valueAccessors.DiagnosticSourceAccessor;
+            }
+            else if (property.PropertyType == typeof(HtmlEncoder))
+            {
+                valueAccessor = valueAccessors.HtmlEncoderAccessor;
+            }
+            else if (property.PropertyType == typeof(IModelExpressionProvider))
+            {
+                valueAccessor = valueAccessors.ModelExpressionProviderAccessor;
+            }
+            else
+            {
+                valueAccessor = context =>
+                {
+                    var serviceProvider = context.HttpContext.RequestServices;
+                    var value = serviceProvider.GetRequiredService(property.PropertyType);
+                    (value as IViewContextAware)?.Contextualize(context);
+
+                    return value;
+                };
+            }
+
+            return new PropertyActivator<ViewContext>(property, valueAccessor);
+        }
+
+        public class PropertyValueAccessors
+        {
+            public Func<ViewContext, object> UrlHelperAccessor { get; set; }
+
+            public Func<ViewContext, object> JsonHelperAccessor { get; set; }
+
+            public Func<ViewContext, object> DiagnosticSourceAccessor { get; set; }
+
+            public Func<ViewContext, object> HtmlEncoderAccessor { get; set; }
+
+            public Func<ViewContext, object> ModelExpressionProviderAccessor { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewCompiler.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewCompiler.cs
new file mode 100644
index 0000000000..93b871cc76
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewCompiler.cs
@@ -0,0 +1,446 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Razor.Hosting;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Emit;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    /// <summary>
+    /// Caches the result of runtime compilation of Razor files for the duration of the application lifetime.
+    /// </summary>
+    public class RazorViewCompiler : IViewCompiler
+    {
+        private readonly object _cacheLock = new object();
+        private readonly Dictionary<string, CompiledViewDescriptor> _precompiledViews;
+        private readonly ConcurrentDictionary<string, string> _normalizedPathCache;
+        private readonly IFileProvider _fileProvider;
+        private readonly RazorProjectEngine _projectEngine;
+        private readonly Action<RoslynCompilationContext> _compilationCallback;
+        private readonly ILogger _logger;
+        private readonly CSharpCompiler _csharpCompiler;
+        private readonly IMemoryCache _cache;
+
+        public RazorViewCompiler(
+            IFileProvider fileProvider,
+            RazorProjectEngine projectEngine,
+            CSharpCompiler csharpCompiler,
+            Action<RoslynCompilationContext> compilationCallback,
+            IList<CompiledViewDescriptor> precompiledViews,
+            ILogger logger)
+        {
+            if (fileProvider == null)
+            {
+                throw new ArgumentNullException(nameof(fileProvider));
+            }
+
+            if (projectEngine == null)
+            {
+                throw new ArgumentNullException(nameof(projectEngine));
+            }
+
+            if (csharpCompiler == null)
+            {
+                throw new ArgumentNullException(nameof(csharpCompiler));
+            }
+
+            if (compilationCallback == null)
+            {
+                throw new ArgumentNullException(nameof(compilationCallback));
+            }
+
+            if (precompiledViews == null)
+            {
+                throw new ArgumentNullException(nameof(precompiledViews));
+            }
+
+            if (logger == null)
+            {
+                throw new ArgumentNullException(nameof(logger));
+            }
+
+            _fileProvider = fileProvider;
+            _projectEngine = projectEngine;
+            _csharpCompiler = csharpCompiler;
+            _compilationCallback = compilationCallback;
+            _logger = logger;
+
+            _normalizedPathCache = new ConcurrentDictionary<string, string>(StringComparer.Ordinal);
+
+            // This is our L0 cache, and is a durable store. Views migrate into the cache as they are requested
+            // from either the set of known precompiled views, or by being compiled.
+            _cache = new MemoryCache(new MemoryCacheOptions());
+
+            // We need to validate that the all of the precompiled views are unique by path (case-insenstive).
+            // We do this because there's no good way to canonicalize paths on windows, and it will create
+            // problems when deploying to linux. Rather than deal with these issues, we just don't support
+            // views that differ only by case.
+            _precompiledViews = new Dictionary<string, CompiledViewDescriptor>(
+                precompiledViews.Count,
+                StringComparer.OrdinalIgnoreCase);
+
+            foreach (var precompiledView in precompiledViews)
+            {
+                logger.ViewCompilerLocatedCompiledView(precompiledView.RelativePath);
+
+                if (!_precompiledViews.ContainsKey(precompiledView.RelativePath))
+                {
+                    // View ordering has precedence semantics, a view with a higher precedence was
+                    // already added to the list.
+                    _precompiledViews.Add(precompiledView.RelativePath, precompiledView);
+                }
+            }
+
+            if (_precompiledViews.Count == 0)
+            {
+                logger.ViewCompilerNoCompiledViewsFound();
+            }
+        }
+
+        /// <inheritdoc />
+        public Task<CompiledViewDescriptor> CompileAsync(string relativePath)
+        {
+            if (relativePath == null)
+            {
+                throw new ArgumentNullException(nameof(relativePath));
+            }
+
+            // Attempt to lookup the cache entry using the passed in path. This will succeed if the path is already
+            // normalized and a cache entry exists.
+            if (_cache.TryGetValue(relativePath, out Task<CompiledViewDescriptor> cachedResult))
+            {
+                return cachedResult;
+            }
+
+            var normalizedPath = GetNormalizedPath(relativePath);
+            if (_cache.TryGetValue(normalizedPath, out cachedResult))
+            {
+                return cachedResult;
+            }
+
+            // Entry does not exist. Attempt to create one.
+            cachedResult = OnCacheMiss(normalizedPath);
+            return cachedResult;
+        }
+
+        private Task<CompiledViewDescriptor> OnCacheMiss(string normalizedPath)
+        {
+            ViewCompilerWorkItem item;
+            TaskCompletionSource<CompiledViewDescriptor> taskSource;
+            MemoryCacheEntryOptions cacheEntryOptions;
+
+            // Safe races cannot be allowed when compiling Razor pages. To ensure only one compilation request succeeds
+            // per file, we'll lock the creation of a cache entry. Creating the cache entry should be very quick. The
+            // actual work for compiling files happens outside the critical section.
+            lock (_cacheLock)
+            {
+                // Double-checked locking to handle a possible race.
+                if (_cache.TryGetValue(normalizedPath, out Task<CompiledViewDescriptor> result))
+                {
+                    return result;
+                }
+
+                if (_precompiledViews.TryGetValue(normalizedPath, out var precompiledView))
+                {
+                    _logger.ViewCompilerLocatedCompiledViewForPath(normalizedPath);
+                    item = CreatePrecompiledWorkItem(normalizedPath, precompiledView);
+                }
+                else
+                {
+                    item = CreateRuntimeCompilationWorkItem(normalizedPath);
+                }
+
+                // At this point, we've decided what to do - but we should create the cache entry and
+                // release the lock first.
+                cacheEntryOptions = new MemoryCacheEntryOptions();
+
+                Debug.Assert(item.ExpirationTokens != null);
+                for (var i = 0; i < item.ExpirationTokens.Count; i++)
+                {
+                    cacheEntryOptions.ExpirationTokens.Add(item.ExpirationTokens[i]);
+                }
+
+                taskSource = new TaskCompletionSource<CompiledViewDescriptor>();
+                if (item.SupportsCompilation)
+                {
+                    // We'll compile in just a sec, be patient.
+                }
+                else
+                {
+                    // If we can't compile, we should have already created the descriptor
+                    Debug.Assert(item.Descriptor != null);
+                    taskSource.SetResult(item.Descriptor);
+                }
+
+                _cache.Set(normalizedPath, taskSource.Task, cacheEntryOptions);
+            }
+
+            // Now the lock has been released so we can do more expensive processing.
+            if (item.SupportsCompilation)
+            {
+                Debug.Assert(taskSource != null);
+
+                if (item.Descriptor?.Item != null &&
+                    ChecksumValidator.IsItemValid(_projectEngine.FileSystem, item.Descriptor.Item))
+                {
+                    // If the item has checksums to validate, we should also have a precompiled view.
+                    Debug.Assert(item.Descriptor != null);
+
+                    taskSource.SetResult(item.Descriptor);
+                    return taskSource.Task;
+                }
+
+                _logger.ViewCompilerInvalidingCompiledFile(item.NormalizedPath);
+                try
+                {
+                    var descriptor = CompileAndEmit(normalizedPath);
+                    descriptor.ExpirationTokens = cacheEntryOptions.ExpirationTokens;
+                    taskSource.SetResult(descriptor);
+                }
+                catch (Exception ex)
+                {
+                    taskSource.SetException(ex);
+                }
+            }
+
+            return taskSource.Task;
+        }
+
+        private ViewCompilerWorkItem CreatePrecompiledWorkItem(string normalizedPath, CompiledViewDescriptor precompiledView)
+        {
+            // We have a precompiled view - but we're not sure that we can use it yet.
+            //
+            // We need to determine first if we have enough information to 'recompile' this view. If that's the case
+            // we'll create change tokens for all of the files.
+            //
+            // Then we'll attempt to validate if any of those files have different content than the original sources
+            // based on checksums.
+            if (precompiledView.Item == null || !ChecksumValidator.IsRecompilationSupported(precompiledView.Item))
+            {
+                return new ViewCompilerWorkItem()
+                {
+                    // If we don't have a checksum for the primary source file we can't recompile.
+                    SupportsCompilation = false,
+
+                    ExpirationTokens = Array.Empty<IChangeToken>(), // Never expire because we can't recompile.
+                    Descriptor = precompiledView, // This will be used as-is.
+                };
+            }
+
+            var item = new ViewCompilerWorkItem()
+            {
+                SupportsCompilation = true,
+
+                Descriptor = precompiledView, // This might be used, if the checksums match.
+
+                // Used to validate and recompile
+                NormalizedPath = normalizedPath,
+                ExpirationTokens = new List<IChangeToken>(),
+            };
+
+            var checksums = precompiledView.Item.GetChecksumMetadata();
+            for (var i = 0; i < checksums.Count; i++)
+            {
+                // We rely on Razor to provide the right set of checksums. Trust the compiler, it has to do a good job,
+                // so it probably will.
+                item.ExpirationTokens.Add(_fileProvider.Watch(checksums[i].Identifier));
+            }
+
+            // We also need to create a new descriptor, because the original one doesn't have expiration tokens on
+            // it. These will be used by the view location cache, which is like an L1 cache for views (this class is
+            // the L2 cache).
+            item.Descriptor = new CompiledViewDescriptor()
+            {
+                ExpirationTokens = item.ExpirationTokens,
+                IsPrecompiled = true,
+                Item = precompiledView.Item,
+                RelativePath = precompiledView.RelativePath,
+                ViewAttribute = precompiledView.ViewAttribute,
+            };
+
+            return item;
+        }
+
+        private ViewCompilerWorkItem CreateRuntimeCompilationWorkItem(string normalizedPath)
+        {
+            var expirationTokens = new List<IChangeToken>()
+            {
+                _fileProvider.Watch(normalizedPath),
+            };
+
+            var projectItem = _projectEngine.FileSystem.GetItem(normalizedPath);
+            if (!projectItem.Exists)
+            {
+                _logger.ViewCompilerCouldNotFindFileAtPath(normalizedPath);
+
+                // If the file doesn't exist, we can't do compilation right now - we still want to cache
+                // the fact that we tried. This will allow us to retrigger compilation if the view file
+                // is added.
+                return new ViewCompilerWorkItem()
+                {
+                    // We don't have enough information to compile
+                    SupportsCompilation = false,
+
+                    Descriptor = new CompiledViewDescriptor()
+                    {
+                        RelativePath = normalizedPath,
+                        ExpirationTokens = expirationTokens,
+                    },
+
+                    // We can try again if the file gets created.
+                    ExpirationTokens = expirationTokens,
+                };
+            }
+
+            _logger.ViewCompilerFoundFileToCompile(normalizedPath);
+
+            // OK this means we can do compilation. For now let's just identify the other files we need to watch
+            // so we can create the cache entry. Compilation will happen after we release the lock.
+
+            var importFeature = _projectEngine.ProjectFeatures.OfType<IImportProjectFeature>().FirstOrDefault();
+
+            // There should always be an import feature unless someone has misconfigured their RazorProjectEngine.
+            // In that case once we attempt to parse the Razor file we'll explode and give the a user a decent
+            // error message; for now, lets just be extra protective and assume 0 imports to not give a bad error.
+            var imports = importFeature?.GetImports(projectItem) ?? Enumerable.Empty<RazorProjectItem>();
+            var physicalImports = imports.Where(import => import.FilePath != null);
+
+            // Now that we have non-dynamic imports we need to get their RazorProjectItem equivalents so we have their
+            // physical file paths (according to the FileSystem).
+            foreach (var physicalImport in physicalImports)
+            {
+                expirationTokens.Add(_fileProvider.Watch(physicalImport.FilePath));
+            }
+
+            return new ViewCompilerWorkItem()
+            {
+                SupportsCompilation = true,
+
+                NormalizedPath = normalizedPath,
+                ExpirationTokens = expirationTokens,
+            };
+        }
+
+        protected virtual CompiledViewDescriptor CompileAndEmit(string relativePath)
+        {
+            var projectItem = _projectEngine.FileSystem.GetItem(relativePath);
+            var codeDocument = _projectEngine.Process(projectItem);
+            var cSharpDocument = codeDocument.GetCSharpDocument();
+
+            if (cSharpDocument.Diagnostics.Count > 0)
+            {
+                throw CompilationFailedExceptionFactory.Create(
+                    codeDocument,
+                    cSharpDocument.Diagnostics);
+            }
+
+            var assembly = CompileAndEmit(codeDocument, cSharpDocument.GeneratedCode);
+
+            // Anything we compile from source will use Razor 2.1 and so should have the new metadata.
+            var loader = new RazorCompiledItemLoader();
+            var item = loader.LoadItems(assembly).SingleOrDefault();
+            var attribute = assembly.GetCustomAttribute<RazorViewAttribute>();
+
+            return new CompiledViewDescriptor(item, attribute);
+        }
+
+        internal Assembly CompileAndEmit(RazorCodeDocument codeDocument, string generatedCode)
+        {
+            _logger.GeneratedCodeToAssemblyCompilationStart(codeDocument.Source.FilePath);
+
+            var startTimestamp = _logger.IsEnabled(LogLevel.Debug) ? Stopwatch.GetTimestamp() : 0;
+
+            var assemblyName = Path.GetRandomFileName();
+            var compilation = CreateCompilation(generatedCode, assemblyName);
+
+            var emitOptions = _csharpCompiler.EmitOptions;
+            var emitPdbFile = _csharpCompiler.EmitPdb && emitOptions.DebugInformationFormat != DebugInformationFormat.Embedded;
+
+            using (var assemblyStream = new MemoryStream())
+            using (var pdbStream = emitPdbFile ? new MemoryStream() : null)
+            {
+                var result = compilation.Emit(
+                    assemblyStream,
+                    pdbStream,
+                    options: emitOptions);
+
+                if (!result.Success)
+                {
+                    throw CompilationFailedExceptionFactory.Create(
+                        codeDocument,
+                        generatedCode,
+                        assemblyName,
+                        result.Diagnostics);
+                }
+
+                assemblyStream.Seek(0, SeekOrigin.Begin);
+                pdbStream?.Seek(0, SeekOrigin.Begin);
+
+                var assembly = Assembly.Load(assemblyStream.ToArray(), pdbStream?.ToArray());
+                _logger.GeneratedCodeToAssemblyCompilationEnd(codeDocument.Source.FilePath, startTimestamp);
+
+                return assembly;
+            }
+        }
+
+        private CSharpCompilation CreateCompilation(string compilationContent, string assemblyName)
+        {
+            var sourceText = SourceText.From(compilationContent, Encoding.UTF8);
+            var syntaxTree = _csharpCompiler.CreateSyntaxTree(sourceText).WithFilePath(assemblyName);
+            var compilation = _csharpCompiler
+                .CreateCompilation(assemblyName)
+                .AddSyntaxTrees(syntaxTree);
+            compilation = ExpressionRewriter.Rewrite(compilation);
+
+            var compilationContext = new RoslynCompilationContext(compilation);
+            _compilationCallback(compilationContext);
+            compilation = compilationContext.Compilation;
+            return compilation;
+        }
+
+        private string GetNormalizedPath(string relativePath)
+        {
+            Debug.Assert(relativePath != null);
+            if (relativePath.Length == 0)
+            {
+                return relativePath;
+            }
+
+            if (!_normalizedPathCache.TryGetValue(relativePath, out var normalizedPath))
+            {
+                normalizedPath = ViewPath.NormalizePath(relativePath);
+                _normalizedPathCache[relativePath] = normalizedPath;
+            }
+
+            return normalizedPath;
+        }
+
+        private class ViewCompilerWorkItem
+        {
+            public bool SupportsCompilation { get; set; }
+
+            public string NormalizedPath { get; set; }
+
+            public IList<IChangeToken> ExpirationTokens { get; set; }
+
+            public CompiledViewDescriptor Descriptor { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewCompilerProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewCompilerProvider.cs
new file mode 100644
index 0000000000..c705a88aac
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewCompilerProvider.cs
@@ -0,0 +1,80 @@
+// 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.
+
+using System;
+using System.Threading;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class RazorViewCompilerProvider : IViewCompilerProvider
+    {
+        private readonly RazorProjectEngine _razorProjectEngine;
+        private readonly ApplicationPartManager _applicationPartManager;
+        private readonly IRazorViewEngineFileProviderAccessor _fileProviderAccessor;
+        private readonly CSharpCompiler _csharpCompiler;
+        private readonly RazorViewEngineOptions _viewEngineOptions;
+        private readonly ILogger<RazorViewCompiler> _logger;
+        private readonly Func<IViewCompiler> _createCompiler;
+
+        private object _initializeLock = new object();
+        private bool _initialized;
+        private IViewCompiler _compiler;
+
+        public RazorViewCompilerProvider(
+            ApplicationPartManager applicationPartManager,
+            RazorProjectEngine razorProjectEngine,
+            IRazorViewEngineFileProviderAccessor fileProviderAccessor,
+            CSharpCompiler csharpCompiler,
+            IOptions<RazorViewEngineOptions> viewEngineOptionsAccessor,
+            ILoggerFactory loggerFactory)
+        {
+            _applicationPartManager = applicationPartManager;
+            _razorProjectEngine = razorProjectEngine;
+            _fileProviderAccessor = fileProviderAccessor;
+            _csharpCompiler = csharpCompiler;
+            _viewEngineOptions = viewEngineOptionsAccessor.Value;
+
+            _logger = loggerFactory.CreateLogger<RazorViewCompiler>();
+            _createCompiler = CreateCompiler;
+        }
+
+        public IViewCompiler GetCompiler()
+        {
+            var fileProvider = _fileProviderAccessor.FileProvider;
+            if (fileProvider is NullFileProvider)
+            {
+                var message = Resources.FormatFileProvidersAreRequired(
+                    typeof(RazorViewEngineOptions).FullName,
+                    nameof(RazorViewEngineOptions.FileProviders),
+                    typeof(IFileProvider).FullName);
+                throw new InvalidOperationException(message);
+            }
+
+            return LazyInitializer.EnsureInitialized(
+                ref _compiler,
+                ref _initialized,
+                ref _initializeLock,
+                _createCompiler);
+        }
+
+        private IViewCompiler CreateCompiler()
+        {
+            var feature = new ViewsFeature();
+            _applicationPartManager.PopulateFeature(feature);
+
+            return new RazorViewCompiler(
+                _fileProviderAccessor.FileProvider,
+                _razorProjectEngine,
+                _csharpCompiler,
+                _viewEngineOptions.CompilationCallback,
+                feature.ViewDescriptors,
+                _logger);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewEngineOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewEngineOptionsSetup.cs
new file mode 100644
index 0000000000..e8c49113ba
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewEngineOptionsSetup.cs
@@ -0,0 +1,46 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    /// <summary>
+    /// Sets up default options for <see cref="RazorViewEngineOptions"/>.
+    /// </summary>
+    public class RazorViewEngineOptionsSetup : IConfigureOptions<RazorViewEngineOptions>
+    {
+        private readonly IHostingEnvironment _hostingEnvironment;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="RazorViewEngineOptions"/>.
+        /// </summary>
+        /// <param name="hostingEnvironment"><see cref="IHostingEnvironment"/> for the application.</param>
+        public RazorViewEngineOptionsSetup(IHostingEnvironment hostingEnvironment)
+        {
+            _hostingEnvironment = hostingEnvironment ?? throw new ArgumentNullException(nameof(hostingEnvironment));
+        }
+
+        public void Configure(RazorViewEngineOptions options)
+        {
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            if (_hostingEnvironment.ContentRootFileProvider != null)
+            {
+                options.FileProviders.Add(_hostingEnvironment.ContentRootFileProvider);
+            }
+
+            options.ViewLocationFormats.Add("/Views/{1}/{0}" + RazorViewEngine.ViewExtension);
+            options.ViewLocationFormats.Add("/Views/Shared/{0}" + RazorViewEngine.ViewExtension);
+
+            options.AreaViewLocationFormats.Add("/Areas/{2}/Views/{1}/{0}" + RazorViewEngine.ViewExtension);
+            options.AreaViewLocationFormats.Add("/Areas/{2}/Views/Shared/{0}" + RazorViewEngine.ViewExtension);
+            options.AreaViewLocationFormats.Add("/Views/Shared/{0}" + RazorViewEngine.ViewExtension);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ServiceBasedTagHelperActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ServiceBasedTagHelperActivator.cs
new file mode 100644
index 0000000000..d5ba1e6409
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ServiceBasedTagHelperActivator.cs
@@ -0,0 +1,28 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    /// <summary>
+    /// A <see cref="ITagHelperActivator"/> that retrieves tag helpers as services from the request's
+    /// <see cref="IServiceProvider"/>.
+    /// </summary>
+    public class ServiceBasedTagHelperActivator : ITagHelperActivator
+    {
+        /// <inheritdoc />
+        public TTagHelper Create<TTagHelper>(ViewContext context) where TTagHelper : ITagHelper
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            return context.HttpContext.RequestServices.GetRequiredService<TTagHelper>();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/SymbolsUtility.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/SymbolsUtility.cs
new file mode 100644
index 0000000000..280fe8c84a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/SymbolsUtility.cs
@@ -0,0 +1,52 @@
+// 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.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    /// <summary>
+    /// Utility type for determining if a platform supports full pdb file generation.
+    /// </summary>
+    internal static class SymbolsUtility
+    {
+        // Native pdb writer's CLSID
+        private const string SymWriterGuid = "0AE2DEB0-F901-478b-BB9F-881EE8066788";
+
+        /// <summary>
+        /// Determines if the current platform supports full pdb generation.
+        /// </summary>
+        /// <returns><c>true</c> if full pdb generation is supported; <c>false</c> otherwise.</returns>
+        public static bool SupportsFullPdbGeneration()
+        {
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                // Cross-plat always produce portable pdbs.
+                return false;
+            }
+
+            if (Type.GetType("Mono.Runtime") != null)
+            {
+                return false;
+            }
+
+            try
+            {
+                // Check for the pdb writer component that roslyn uses to generate pdbs
+                var type = Marshal.GetTypeFromCLSID(new Guid(SymWriterGuid));
+                if (type != null)
+                {
+                    // This line will throw if pdb generation is not supported.
+                    Activator.CreateInstance(type);
+                    return true;
+                }
+            }
+            catch
+            {
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/TagHelperComponentManager.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/TagHelperComponentManager.cs
new file mode 100644
index 0000000000..38dde4f941
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/TagHelperComponentManager.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    /// <summary>
+    /// The default implementation of the <see cref="ITagHelperComponentManager"/>.
+    /// </summary>
+    public class TagHelperComponentManager : ITagHelperComponentManager
+    {
+        /// <summary>
+        /// Creates a new <see cref="TagHelperComponentManager"/>.
+        /// </summary>
+        /// <param name="tagHelperComponents">The collection of <see cref="ITagHelperComponent"/>s.</param>
+        public TagHelperComponentManager(IEnumerable<ITagHelperComponent> tagHelperComponents)
+        {
+            if (tagHelperComponents == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelperComponents));
+            }
+
+            Components = new List<ITagHelperComponent>(tagHelperComponents);
+        }
+
+        /// <inheritdoc />
+        public ICollection<ITagHelperComponent> Components { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/TagHelpersAsServices.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/TagHelpersAsServices.cs
new file mode 100644
index 0000000000..a441c75de1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/TagHelpersAsServices.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public static class TagHelpersAsServices
+    {
+        public static void AddTagHelpersAsServices(ApplicationPartManager manager, IServiceCollection services)
+        {
+            if (manager == null)
+            {
+                throw new ArgumentNullException(nameof(manager));
+            }
+
+            if (services == null)
+            {
+                throw new ArgumentNullException(nameof(services));
+            }
+
+            var feature = new TagHelperFeature();
+            manager.PopulateFeature(feature);
+
+            foreach (var type in feature.TagHelpers.Select(t => t.AsType()))
+            {
+                services.TryAddTransient(type, type);
+            }
+
+            services.Replace(ServiceDescriptor.Transient<ITagHelperActivator, ServiceBasedTagHelperActivator>());
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheItem.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheItem.cs
new file mode 100644
index 0000000000..23fe788101
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheItem.cs
@@ -0,0 +1,34 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    /// <summary>
+    /// An item in <see cref="ViewLocationCacheResult"/>.
+    /// </summary>
+    public struct ViewLocationCacheItem
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="ViewLocationCacheItem"/>.
+        /// </summary>
+        /// <param name="razorPageFactory">The <see cref="IRazorPage"/> factory.</param>
+        /// <param name="location">The application relative path of the <see cref="IRazorPage"/>.</param>
+        public ViewLocationCacheItem(Func<IRazorPage> razorPageFactory, string location)
+        {
+            PageFactory = razorPageFactory;
+            Location = location;
+        }
+
+        /// <summary>
+        /// Gets the application relative path of the <see cref="IRazorPage"/>
+        /// </summary>
+        public string Location { get; }
+
+        /// <summary>
+        /// Gets the <see cref="IRazorPage"/> factory.
+        /// </summary>
+        public Func<IRazorPage> PageFactory { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheKey.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheKey.cs
new file mode 100644
index 0000000000..7643882f79
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheKey.cs
@@ -0,0 +1,158 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    /// <summary>
+    /// Key for entries in <see cref="RazorViewEngine.ViewLookupCache"/>.
+    /// </summary>
+    public struct ViewLocationCacheKey : IEquatable<ViewLocationCacheKey>
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="ViewLocationCacheKey"/>.
+        /// </summary>
+        /// <param name="viewName">The view name or path.</param>
+        /// <param name="isMainPage">Determines if the page being found is the main page for an action.</param>
+        public ViewLocationCacheKey(
+            string viewName,
+            bool isMainPage)
+            : this(
+                  viewName,
+                  controllerName: null,
+                  areaName: null,
+                  pageName: null,
+                  isMainPage: isMainPage,
+                  values: null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ViewLocationCacheKey"/>.
+        /// </summary>
+        /// <param name="viewName">The view name.</param>
+        /// <param name="controllerName">The controller name.</param>
+        /// <param name="areaName">The area name.</param>
+        /// <param name="pageName">The page name.</param>
+        /// <param name="isMainPage">Determines if the page being found is the main page for an action.</param>
+        /// <param name="values">Values from <see cref="IViewLocationExpander"/> instances.</param>
+        public ViewLocationCacheKey(
+            string viewName,
+            string controllerName,
+            string areaName,
+            string pageName,
+            bool isMainPage,
+            IReadOnlyDictionary<string, string> values)
+        {
+            ViewName = viewName;
+            ControllerName = controllerName;
+            AreaName = areaName;
+            PageName = pageName;
+            IsMainPage = isMainPage;
+            ViewLocationExpanderValues = values;
+        }
+
+        /// <summary>
+        /// Gets the view name.
+        /// </summary>
+        public string ViewName { get; }
+
+        /// <summary>
+        /// Gets the controller name.
+        /// </summary>
+        public string ControllerName { get; }
+
+        /// <summary>
+        /// Gets the area name.
+        /// </summary>
+        public string AreaName { get; }
+
+        /// <summary>
+        /// Gets the page name.
+        /// </summary>
+        public string PageName { get; }
+
+        /// <summary>
+        /// Determines if the page being found is the main page for an action.
+        /// </summary>
+        public bool IsMainPage { get; }
+
+        /// <summary>
+        /// Gets the values populated by <see cref="IViewLocationExpander"/> instances.
+        /// </summary>
+        public IReadOnlyDictionary<string, string> ViewLocationExpanderValues { get; }
+
+        /// <inheritdoc />
+        public bool Equals(ViewLocationCacheKey y)
+        {
+            if (IsMainPage != y.IsMainPage ||
+                !string.Equals(ViewName, y.ViewName, StringComparison.Ordinal) ||
+                !string.Equals(ControllerName, y.ControllerName, StringComparison.Ordinal) ||
+                !string.Equals(AreaName, y.AreaName, StringComparison.Ordinal) ||
+                !string.Equals(PageName, y.PageName, StringComparison.Ordinal))
+            {
+                return false;
+            }
+
+            if (ReferenceEquals(ViewLocationExpanderValues, y.ViewLocationExpanderValues))
+            {
+                return true;
+            }
+
+            if (ViewLocationExpanderValues == null ||
+                y.ViewLocationExpanderValues == null ||
+                (ViewLocationExpanderValues.Count != y.ViewLocationExpanderValues.Count))
+            {
+                return false;
+            }
+
+            foreach (var item in ViewLocationExpanderValues)
+            {
+                string yValue;
+                if (!y.ViewLocationExpanderValues.TryGetValue(item.Key, out yValue) ||
+                    !string.Equals(item.Value, yValue, StringComparison.Ordinal))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        /// <inheritdoc />
+        public override bool Equals(object obj)
+        {
+            if (obj is ViewLocationCacheKey)
+            {
+                return Equals((ViewLocationCacheKey)obj);
+            }
+
+            return false;
+        }
+
+        /// <inheritdoc />
+        public override int GetHashCode()
+        {
+            var hashCodeCombiner = HashCodeCombiner.Start();
+            hashCodeCombiner.Add(IsMainPage ? 1 : 0);
+            hashCodeCombiner.Add(ViewName, StringComparer.Ordinal);
+            hashCodeCombiner.Add(ControllerName, StringComparer.Ordinal);
+            hashCodeCombiner.Add(AreaName, StringComparer.Ordinal);
+            hashCodeCombiner.Add(PageName, StringComparer.Ordinal);
+
+            if (ViewLocationExpanderValues != null)
+            {
+                foreach (var item in ViewLocationExpanderValues)
+                {
+                    hashCodeCombiner.Add(item.Key, StringComparer.Ordinal);
+                    hashCodeCombiner.Add(item.Value, StringComparer.Ordinal);
+                }
+            }
+
+            return hashCodeCombiner;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheResult.cs
new file mode 100644
index 0000000000..c703bcaf19
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheResult.cs
@@ -0,0 +1,76 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    /// <summary>
+    /// Result of view location cache lookup.
+    /// </summary>
+    public class ViewLocationCacheResult
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="ViewLocationCacheResult"/>
+        /// for a view that was successfully found at the specified location.
+        /// </summary>
+        /// <param name="view">The <see cref="ViewLocationCacheItem"/> for the found view.</param>
+        /// <param name="viewStarts"><see cref="ViewLocationCacheItem"/>s for applicable _ViewStarts.</param>
+        public ViewLocationCacheResult(
+            ViewLocationCacheItem view,
+            IReadOnlyList<ViewLocationCacheItem> viewStarts)
+        {
+            if (viewStarts == null)
+            {
+                throw new ArgumentNullException(nameof(viewStarts));
+            }
+
+            ViewEntry = view;
+            ViewStartEntries = viewStarts;
+            Success = true;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ViewLocationCacheResult"/> for a
+        /// failed view lookup.
+        /// </summary>
+        /// <param name="searchedLocations">Locations that were searched.</param>
+        public ViewLocationCacheResult(IEnumerable<string> searchedLocations)
+        {
+            if (searchedLocations == null)
+            {
+                throw new ArgumentNullException(nameof(searchedLocations));
+            }
+
+            SearchedLocations = searchedLocations;
+        }
+
+        /// <summary>
+        /// <see cref="ViewLocationCacheItem"/> for the located view.
+        /// </summary>
+        /// <remarks><c>null</c> if <see cref="Success"/> is <c>false</c>.</remarks>
+        public ViewLocationCacheItem ViewEntry { get; }
+
+        /// <summary>
+        /// <see cref="ViewLocationCacheItem"/>s for applicable _ViewStarts.
+        /// </summary>
+        /// <remarks><c>null</c> if <see cref="Success"/> is <c>false</c>.</remarks>
+        public IReadOnlyList<ViewLocationCacheItem> ViewStartEntries { get; }
+
+        /// <summary>
+        /// The sequence of locations that were searched.
+        /// </summary>
+        /// <remarks>
+        /// When <see cref="Success"/> is <c>true</c> this includes all paths that were search prior to finding
+        /// a view at <see cref="ViewEntry"/>. When <see cref="Success"/> is <c>false</c>, this includes
+        /// all search paths.
+        /// </remarks>
+        public IEnumerable<string> SearchedLocations { get; }
+
+        /// <summary>
+        /// Gets a value that indicates whether the view was successfully found.
+        /// </summary>
+        public bool Success { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewPath.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewPath.cs
new file mode 100644
index 0000000000..813493ee76
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewPath.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public static class ViewPath
+    {
+        public static string NormalizePath(string path)
+        {
+            var addLeadingSlash = path[0] != '\\' && path[0] != '/';
+            var transformSlashes = path.IndexOf('\\') != -1;
+
+            if (!addLeadingSlash && !transformSlashes)
+            {
+                return path;
+            }
+
+            var length = path.Length;
+            if (addLeadingSlash)
+            {
+                length++;
+            }
+
+            var builder = new InplaceStringBuilder(length);
+            if (addLeadingSlash)
+            {
+                builder.Append('/');
+            }
+
+            for (var i = 0; i < path.Length; i++)
+            {
+                var ch = path[i];
+                if (ch == '\\')
+                {
+                    ch = '/';
+                }
+                builder.Append(ch);
+            }
+
+            return builder.ToString();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/LanguageViewLocationExpander.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/LanguageViewLocationExpander.cs
new file mode 100644
index 0000000000..1ed92110bc
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/LanguageViewLocationExpander.cs
@@ -0,0 +1,115 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <summary>
+    /// A <see cref="IViewLocationExpander"/> that adds the language as an extension prefix to view names. Language
+    /// that is getting added as extension prefix comes from <see cref="Microsoft.AspNetCore.Http.HttpContext"/>.
+    /// </summary>
+    /// <example>
+    /// For the default case with no areas, views are generated with the following patterns (assuming controller is
+    /// "Home", action is "Index" and language is "en")
+    /// Views/Home/en/Action
+    /// Views/Home/Action
+    /// Views/Shared/en/Action
+    /// Views/Shared/Action
+    /// </example>
+    public class LanguageViewLocationExpander : IViewLocationExpander
+    {
+        private const string ValueKey = "language";
+        private readonly LanguageViewLocationExpanderFormat _format;
+
+        /// <summary>
+        /// Instantiates a new <see cref="LanguageViewLocationExpander"/> instance.
+        /// </summary>
+        public LanguageViewLocationExpander()
+            : this(LanguageViewLocationExpanderFormat.Suffix)
+        {
+        }
+
+        /// <summary>
+        /// Instantiates a new <see cref="Internal.DefaultTagHelperActivator"/> instance.
+        /// </summary>
+        /// <param name="format">The <see cref="LanguageViewLocationExpanderFormat"/>.</param>
+        public LanguageViewLocationExpander(LanguageViewLocationExpanderFormat format)
+        {
+            _format = format;
+        }
+
+        /// <inheritdoc />
+        public void PopulateValues(ViewLocationExpanderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            // Using CurrentUICulture so it loads the locale specific resources for the views.
+            context.Values[ValueKey] = CultureInfo.CurrentUICulture.Name;
+        }
+
+        /// <inheritdoc />
+        public virtual IEnumerable<string> ExpandViewLocations(
+            ViewLocationExpanderContext context,
+            IEnumerable<string> viewLocations)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (viewLocations == null)
+            {
+                throw new ArgumentNullException(nameof(viewLocations));
+            }
+
+            context.Values.TryGetValue(ValueKey, out var value);
+
+            if (!string.IsNullOrEmpty(value))
+            {
+                CultureInfo culture;
+                try
+                {
+                    culture = new CultureInfo(value);
+                }
+                catch (CultureNotFoundException)
+                {
+                    return viewLocations;
+                }
+
+                return ExpandViewLocationsCore(viewLocations, culture);
+            }
+
+            return viewLocations;
+        }
+
+        private IEnumerable<string> ExpandViewLocationsCore(IEnumerable<string> viewLocations, CultureInfo cultureInfo)
+        {
+            foreach (var location in viewLocations)
+            {
+                var temporaryCultureInfo = cultureInfo;
+
+                while (temporaryCultureInfo != temporaryCultureInfo.Parent)
+                {
+                    if (_format == LanguageViewLocationExpanderFormat.SubFolder)
+                    {
+                        yield return location.Replace("{0}", temporaryCultureInfo.Name + "/{0}");
+                    }
+                    else
+                    {
+                        yield return location.Replace("{0}", "{0}." + temporaryCultureInfo.Name);
+                    }
+
+                    temporaryCultureInfo = temporaryCultureInfo.Parent;
+                }
+
+                yield return location;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/LanguageViewLocationExpanderFormat.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/LanguageViewLocationExpanderFormat.cs
new file mode 100644
index 0000000000..ad4b177bb0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/LanguageViewLocationExpanderFormat.cs
@@ -0,0 +1,27 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <summary>
+    /// Specifies the localized view format for <see cref="LanguageViewLocationExpander"/>.
+    /// </summary>
+    public enum LanguageViewLocationExpanderFormat
+    {
+        /// <summary>
+        /// Locale is a subfolder under which the view exists.
+        /// </summary>
+        /// <example>
+        /// Home/Views/en-US/Index.chtml
+        /// </example>
+        SubFolder,
+
+        /// <summary>
+        /// Locale is part of the view name as a suffix.
+        /// </summary>
+        /// <example>
+        /// Home/Views/Index.en-US.chtml
+        /// </example>
+        Suffix
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj
new file mode 100644
index 0000000000..74e943a8d9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj
@@ -0,0 +1,60 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ASP.NET Core MVC Razor view engine for CSHTML files.</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>aspnetcore;aspnetcoremvc;cshtml;razor</PackageTags>
+    <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
+    <Serviceable>true</Serviceable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.ViewFeatures\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="$(MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Runtime" Version="$(MicrosoftAspNetCoreRazorRuntimePackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Razor" Version="$(MicrosoftCodeAnalysisRazorPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="$(MicrosoftExtensionsFileProvidersCompositePackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.PropertyActivator.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsPropertyActivatorSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsPropertyHelperSourcesPackageVersion)" />
+  </ItemGroup>
+
+  <Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup;DocumentationProjectOutputGroup">
+
+    <PropertyGroup>
+      <!-- Make sure we create a symbols.nupkg -->
+      <IncludeSymbols>true</IncludeSymbols>
+      <NuspecProperties>
+        id=$(MSBuildProjectName);
+        version=$(PackageVersion);
+        authors=$(Authors);
+        licenseUrl=$(PackageLicenseUrl);
+        projectUrl=$(PackageProjectUrl);
+        iconUrl=$(PackageIconUrl);
+        copyright=$(Copyright);
+        description=$(Description);
+        tags=$([MSBuild]::Escape($(PackageTags)));
+        serviceable=$(Serviceable);
+        repositoryUrl=$(RepositoryUrl);
+        repositoryCommit=$(RepositoryCommit);
+        targetframework=$(TargetFramework);
+        MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion=$(MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion);
+        MicrosoftAspNetCoreRazorRuntimePackageVersion=$(MicrosoftAspNetCoreRazorRuntimePackageVersion);
+        MicrosoftCodeAnalysisRazorPackageVersion=$(MicrosoftCodeAnalysisRazorPackageVersion);
+        MicrosoftCodeAnalysisCSharpPackageVersion=$(MicrosoftCodeAnalysisCSharpPackageVersion);
+        MicrosoftExtensionsCachingMemoryPackageVersion=$(MicrosoftExtensionsCachingMemoryPackageVersion);
+        MicrosoftExtensionsFileProvidersCompositePackageVersion=$(MicrosoftExtensionsFileProvidersCompositePackageVersion);
+        MicrosoftDiaSymReaderNativePackageVersion=$(MicrosoftDiaSymReaderNativePackageVersion);
+        OutputBinary=@(BuiltProjectOutputGroupOutput);
+        OutputDocumentation=@(DocumentationProjectOutputGroupOutput);
+        OutputSymbol=@(DebugSymbolsProjectOutputGroupOutput);
+      </NuspecProperties>
+    </PropertyGroup>
+  </Target>
+</Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.nuspec b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.nuspec
new file mode 100644
index 0000000000..9ff2439b96
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.nuspec
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    <id>$id$</id>
+    <version>$version$</version>
+    <authors>$authors$</authors>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <licenseUrl>$licenseUrl$</licenseUrl>
+    <projectUrl>$projectUrl$</projectUrl>
+    <iconUrl>$iconUrl$</iconUrl>
+    <description>$description$</description>
+    <copyright>$copyright$</copyright>
+    <tags>$tags$</tags>
+    <serviceable>$serviceable$</serviceable>
+    <repository type="git" url="$repositoryUrl$" commit="$repositoryCommit$" />
+    <dependencies>
+      <group targetFramework=".NETStandard2.0">
+        <dependency id="Microsoft.AspNetCore.Mvc.ViewFeatures" version="$version$" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.AspNetCore.Mvc.Razor.Extensions" version="$MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion$" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.AspNetCore.Razor.Runtime" version="$MicrosoftAspNetCoreRazorRuntimePackageVersion$" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.CodeAnalysis.CSharp" version="$MicrosoftCodeAnalysisCSharpPackageVersion$" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.CodeAnalysis.Razor" version="$MicrosoftCodeAnalysisRazorPackageVersion$" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.Caching.Memory" version="$MicrosoftExtensionsCachingMemoryPackageVersion$" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.FileProviders.Composite" version="$MicrosoftExtensionsFileProvidersCompositePackageVersion$" exclude="Build,Analyzers" />
+      </group>
+      <group targetFramework=".NETFramework4.6.1">
+        <dependency id="Microsoft.AspNetCore.Mvc.ViewFeatures" version="$version$" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.AspNetCore.Mvc.Razor.Extensions" version="$MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion$" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.AspNetCore.Razor.Runtime" version="$MicrosoftAspNetCoreRazorRuntimePackageVersion$" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.CodeAnalysis.CSharp" version="$MicrosoftCodeAnalysisCSharpPackageVersion$" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.CodeAnalysis.Razor" version="$MicrosoftCodeAnalysisRazorPackageVersion$" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.Caching.Memory" version="$MicrosoftExtensionsCachingMemoryPackageVersion$" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.FileProviders.Composite" version="$MicrosoftExtensionsFileProvidersCompositePackageVersion$" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.DiaSymReader.Native" version="$MicrosoftDiaSymReaderNativePackageVersion$" exclude="Build,Analyzers" />
+      </group>
+    </dependencies>
+  </metadata>
+
+  <files>
+    <file src="$OutputBinary$" target="lib\$targetframework$\" />
+    <file src="$OutputDocumentation$" target="lib\$targetframework$\" />
+    <file src="$OutputSymbol$" target="lib\$targetframework$\" />
+  </files>
+</package>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..831fbe57e1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Properties/AssemblyInfo.cs
@@ -0,0 +1,7 @@
+// 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.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..3b6a518dd3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Properties/Resources.Designer.cs
@@ -0,0 +1,412 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class Resources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.Razor.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// Value cannot be null or empty.
+        /// </summary>
+        internal static string ArgumentCannotBeNullOrEmpty
+        {
+            get => GetString("ArgumentCannotBeNullOrEmpty");
+        }
+
+        /// <summary>
+        /// Value cannot be null or empty.
+        /// </summary>
+        internal static string FormatArgumentCannotBeNullOrEmpty()
+            => GetString("ArgumentCannotBeNullOrEmpty");
+
+        /// <summary>
+        /// One or more compilation failures occurred:
+        /// </summary>
+        internal static string CompilationFailed
+        {
+            get => GetString("CompilationFailed");
+        }
+
+        /// <summary>
+        /// One or more compilation failures occurred:
+        /// </summary>
+        internal static string FormatCompilationFailed()
+            => GetString("CompilationFailed");
+
+        /// <summary>
+        /// '{0}' cannot be invoked when a Layout page is set to be executed.
+        /// </summary>
+        internal static string FlushPointCannotBeInvoked
+        {
+            get => GetString("FlushPointCannotBeInvoked");
+        }
+
+        /// <summary>
+        /// '{0}' cannot be invoked when a Layout page is set to be executed.
+        /// </summary>
+        internal static string FormatFlushPointCannotBeInvoked(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("FlushPointCannotBeInvoked"), p0);
+
+        /// <summary>
+        /// The layout view '{0}' could not be located. The following locations were searched:{1}
+        /// </summary>
+        internal static string LayoutCannotBeLocated
+        {
+            get => GetString("LayoutCannotBeLocated");
+        }
+
+        /// <summary>
+        /// The layout view '{0}' could not be located. The following locations were searched:{1}
+        /// </summary>
+        internal static string FormatLayoutCannotBeLocated(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("LayoutCannotBeLocated"), p0, p1);
+
+        /// <summary>
+        /// Layout page '{0}' cannot be rendered after '{1}' has been invoked.
+        /// </summary>
+        internal static string LayoutCannotBeRendered
+        {
+            get => GetString("LayoutCannotBeRendered");
+        }
+
+        /// <summary>
+        /// Layout page '{0}' cannot be rendered after '{1}' has been invoked.
+        /// </summary>
+        internal static string FormatLayoutCannotBeRendered(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("LayoutCannotBeRendered"), p0, p1);
+
+        /// <summary>
+        /// There is no active writing scope to end.
+        /// </summary>
+        internal static string RazorPage_ThereIsNoActiveWritingScopeToEnd
+        {
+            get => GetString("RazorPage_ThereIsNoActiveWritingScopeToEnd");
+        }
+
+        /// <summary>
+        /// There is no active writing scope to end.
+        /// </summary>
+        internal static string FormatRazorPage_ThereIsNoActiveWritingScopeToEnd()
+            => GetString("RazorPage_ThereIsNoActiveWritingScopeToEnd");
+
+        /// <summary>
+        /// The {0} operation cannot be performed while inside a writing scope in '{1}'.
+        /// </summary>
+        internal static string RazorPage_CannotFlushWhileInAWritingScope
+        {
+            get => GetString("RazorPage_CannotFlushWhileInAWritingScope");
+        }
+
+        /// <summary>
+        /// The {0} operation cannot be performed while inside a writing scope in '{1}'.
+        /// </summary>
+        internal static string FormatRazorPage_CannotFlushWhileInAWritingScope(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("RazorPage_CannotFlushWhileInAWritingScope"), p0, p1);
+
+        /// <summary>
+        /// {0} invocation in '{1}' is invalid. {0} can only be called from a layout page.
+        /// </summary>
+        internal static string RazorPage_MethodCannotBeCalled
+        {
+            get => GetString("RazorPage_MethodCannotBeCalled");
+        }
+
+        /// <summary>
+        /// {0} invocation in '{1}' is invalid. {0} can only be called from a layout page.
+        /// </summary>
+        internal static string FormatRazorPage_MethodCannotBeCalled(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("RazorPage_MethodCannotBeCalled"), p0, p1);
+
+        /// <summary>
+        /// {0} has not been called for the page at '{1}'. To ignore call {2}().
+        /// </summary>
+        internal static string RenderBodyNotCalled
+        {
+            get => GetString("RenderBodyNotCalled");
+        }
+
+        /// <summary>
+        /// {0} has not been called for the page at '{1}'. To ignore call {2}().
+        /// </summary>
+        internal static string FormatRenderBodyNotCalled(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("RenderBodyNotCalled"), p0, p1, p2);
+
+        /// <summary>
+        /// Section '{0}' is already defined.
+        /// </summary>
+        internal static string SectionAlreadyDefined
+        {
+            get => GetString("SectionAlreadyDefined");
+        }
+
+        /// <summary>
+        /// Section '{0}' is already defined.
+        /// </summary>
+        internal static string FormatSectionAlreadyDefined(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("SectionAlreadyDefined"), p0);
+
+        /// <summary>
+        /// {0} invocation in '{1}' is invalid. The section '{2}' has already been rendered.
+        /// </summary>
+        internal static string SectionAlreadyRendered
+        {
+            get => GetString("SectionAlreadyRendered");
+        }
+
+        /// <summary>
+        /// {0} invocation in '{1}' is invalid. The section '{2}' has already been rendered.
+        /// </summary>
+        internal static string FormatSectionAlreadyRendered(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("SectionAlreadyRendered"), p0, p1, p2);
+
+        /// <summary>
+        /// The layout page '{0}' cannot find the section '{1}' in the content page '{2}'.
+        /// </summary>
+        internal static string SectionNotDefined
+        {
+            get => GetString("SectionNotDefined");
+        }
+
+        /// <summary>
+        /// The layout page '{0}' cannot find the section '{1}' in the content page '{2}'.
+        /// </summary>
+        internal static string FormatSectionNotDefined(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("SectionNotDefined"), p0, p1, p2);
+
+        /// <summary>
+        /// The following sections have been defined but have not been rendered by the page at '{0}': '{1}'. To ignore an unrendered section call {2}("sectionName").
+        /// </summary>
+        internal static string SectionsNotRendered
+        {
+            get => GetString("SectionsNotRendered");
+        }
+
+        /// <summary>
+        /// The following sections have been defined but have not been rendered by the page at '{0}': '{1}'. To ignore an unrendered section call {2}("sectionName").
+        /// </summary>
+        internal static string FormatSectionsNotRendered(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("SectionsNotRendered"), p0, p1, p2);
+
+        /// <summary>
+        /// '{0} must be set to access '{1}'.
+        /// </summary>
+        internal static string ViewContextMustBeSet
+        {
+            get => GetString("ViewContextMustBeSet");
+        }
+
+        /// <summary>
+        /// '{0} must be set to access '{1}'.
+        /// </summary>
+        internal static string FormatViewContextMustBeSet(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewContextMustBeSet"), p0, p1);
+
+        /// <summary>
+        /// Generated Code
+        /// </summary>
+        internal static string GeneratedCodeFileName
+        {
+            get => GetString("GeneratedCodeFileName");
+        }
+
+        /// <summary>
+        /// Generated Code
+        /// </summary>
+        internal static string FormatGeneratedCodeFileName()
+            => GetString("GeneratedCodeFileName");
+
+        /// <summary>
+        /// Unable to perform '{0}' assignment. Tag helper property '{1}.{2}' must not be null.
+        /// </summary>
+        internal static string RazorPage_InvalidTagHelperIndexerAssignment
+        {
+            get => GetString("RazorPage_InvalidTagHelperIndexerAssignment");
+        }
+
+        /// <summary>
+        /// Unable to perform '{0}' assignment. Tag helper property '{1}.{2}' must not be null.
+        /// </summary>
+        internal static string FormatRazorPage_InvalidTagHelperIndexerAssignment(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("RazorPage_InvalidTagHelperIndexerAssignment"), p0, p1, p2);
+
+        /// <summary>
+        /// Unexpected return value from '{1}.{2}' for URL '{0}'. If the '{1}' service has been overridden, change '{2}' to replace only the '~/' prefix. Otherwise, add the following directive to the Razor page to disable URL resolution relative to the application's 'webroot' setting:
+        /// 
+        /// @{3} "{4}, {5}"
+        /// </summary>
+        internal static string CouldNotResolveApplicationRelativeUrl_TagHelper
+        {
+            get => GetString("CouldNotResolveApplicationRelativeUrl_TagHelper");
+        }
+
+        /// <summary>
+        /// Unexpected return value from '{1}.{2}' for URL '{0}'. If the '{1}' service has been overridden, change '{2}' to replace only the '~/' prefix. Otherwise, add the following directive to the Razor page to disable URL resolution relative to the application's 'webroot' setting:
+        /// 
+        /// @{3} "{4}, {5}"
+        /// </summary>
+        internal static string FormatCouldNotResolveApplicationRelativeUrl_TagHelper(object p0, object p1, object p2, object p3, object p4, object p5)
+            => string.Format(CultureInfo.CurrentCulture, GetString("CouldNotResolveApplicationRelativeUrl_TagHelper"), p0, p1, p2, p3, p4, p5);
+
+        /// <summary>
+        /// A circular layout reference was detected when rendering '{0}'. The layout page '{1}' has already been rendered.
+        /// </summary>
+        internal static string LayoutHasCircularReference
+        {
+            get => GetString("LayoutHasCircularReference");
+        }
+
+        /// <summary>
+        /// A circular layout reference was detected when rendering '{0}'. The layout page '{1}' has already been rendered.
+        /// </summary>
+        internal static string FormatLayoutHasCircularReference(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("LayoutHasCircularReference"), p0, p1);
+
+        /// <summary>
+        /// One or more compilation references are missing. Ensure that your project is referencing '{0}' and the '{1}' property is not set to false.
+        /// </summary>
+        internal static string Compilation_DependencyContextIsNotSpecified
+        {
+            get => GetString("Compilation_DependencyContextIsNotSpecified");
+        }
+
+        /// <summary>
+        /// One or more compilation references are missing. Ensure that your project is referencing '{0}' and the '{1}' property is not set to false.
+        /// </summary>
+        internal static string FormatCompilation_DependencyContextIsNotSpecified(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("Compilation_DependencyContextIsNotSpecified"), p0, p1);
+
+        /// <summary>
+        /// '{0}' cannot be empty. These locations are required to locate a view for rendering.
+        /// </summary>
+        internal static string ViewLocationFormatsIsRequired
+        {
+            get => GetString("ViewLocationFormatsIsRequired");
+        }
+
+        /// <summary>
+        /// '{0}' cannot be empty. These locations are required to locate a view for rendering.
+        /// </summary>
+        internal static string FormatViewLocationFormatsIsRequired(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewLocationFormatsIsRequired"), p0);
+
+        /// <summary>
+        /// Nesting of TagHelper attribute writing scopes is not supported.
+        /// </summary>
+        internal static string RazorPage_NestingAttributeWritingScopesNotSupported
+        {
+            get => GetString("RazorPage_NestingAttributeWritingScopesNotSupported");
+        }
+
+        /// <summary>
+        /// Nesting of TagHelper attribute writing scopes is not supported.
+        /// </summary>
+        internal static string FormatRazorPage_NestingAttributeWritingScopesNotSupported()
+            => GetString("RazorPage_NestingAttributeWritingScopesNotSupported");
+
+        /// <summary>
+        /// '{0}.{1}' must not be empty. At least one '{2}' is required to locate a view for rendering.
+        /// </summary>
+        internal static string FileProvidersAreRequired
+        {
+            get => GetString("FileProvidersAreRequired");
+        }
+
+        /// <summary>
+        /// '{0}.{1}' must not be empty. At least one '{2}' is required to locate a view for rendering.
+        /// </summary>
+        internal static string FormatFileProvidersAreRequired(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("FileProvidersAreRequired"), p0, p1, p2);
+
+        /// <summary>
+        /// Path must begin with a forward slash '/'.
+        /// </summary>
+        internal static string RazorProject_PathMustStartWithForwardSlash
+        {
+            get => GetString("RazorProject_PathMustStartWithForwardSlash");
+        }
+
+        /// <summary>
+        /// Path must begin with a forward slash '/'.
+        /// </summary>
+        internal static string FormatRazorProject_PathMustStartWithForwardSlash()
+            => GetString("RazorProject_PathMustStartWithForwardSlash");
+
+        /// <summary>
+        /// The property '{0}' of '{1}' must not be null.
+        /// </summary>
+        internal static string PropertyMustBeSet
+        {
+            get => GetString("PropertyMustBeSet");
+        }
+
+        /// <summary>
+        /// The property '{0}' of '{1}' must not be null.
+        /// </summary>
+        internal static string FormatPropertyMustBeSet(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("PropertyMustBeSet"), p0, p1);
+
+        /// <summary>
+        /// The following precompiled view paths differ only in case, which is not supported:
+        /// </summary>
+        internal static string RazorViewCompiler_ViewPathsDifferOnlyInCase
+        {
+            get => GetString("RazorViewCompiler_ViewPathsDifferOnlyInCase");
+        }
+
+        /// <summary>
+        /// The following precompiled view paths differ only in case, which is not supported:
+        /// </summary>
+        internal static string FormatRazorViewCompiler_ViewPathsDifferOnlyInCase()
+            => GetString("RazorViewCompiler_ViewPathsDifferOnlyInCase");
+
+        /// <summary>
+        /// The debug type specified in the dependency context could be parsed. The debug type value '{0}' is not supported.
+        /// </summary>
+        internal static string UnsupportedDebugInformationFormat
+        {
+            get => GetString("UnsupportedDebugInformationFormat");
+        }
+
+        /// <summary>
+        /// The debug type specified in the dependency context could be parsed. The debug type value '{0}' is not supported.
+        /// </summary>
+        internal static string FormatUnsupportedDebugInformationFormat(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("UnsupportedDebugInformationFormat"), p0);
+
+        /// <summary>
+        /// At least one of the '{0}' or '{1}' values must be non-null.
+        /// </summary>
+        internal static string CompiledViewDescriptor_NoData
+        {
+            get => GetString("CompiledViewDescriptor_NoData");
+        }
+
+        /// <summary>
+        /// At least one of the '{0}' or '{1}' values must be non-null.
+        /// </summary>
+        internal static string FormatCompiledViewDescriptor_NoData(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("CompiledViewDescriptor_NoData"), p0, p1);
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs
new file mode 100644
index 0000000000..3d13f977f7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs
@@ -0,0 +1,319 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <summary>
+    /// Represents properties and methods that are needed in order to render a view that uses Razor syntax.
+    /// </summary>
+    public abstract class RazorPage : RazorPageBase
+    {
+        private readonly HashSet<string> _renderedSections = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        private bool _renderedBody;
+        private bool _ignoreBody;
+        private HashSet<string> _ignoredSections;
+
+        /// <summary>
+        /// An <see cref="HttpContext"/> representing the current request execution.
+        /// </summary>
+        public HttpContext Context => ViewContext?.HttpContext;
+
+        /// <summary>
+        /// In a Razor layout page, renders the portion of a content page that is not within a named section.
+        /// </summary>
+        /// <returns>The HTML content to render.</returns>
+        protected virtual IHtmlContent RenderBody()
+        {
+            if (BodyContent == null)
+            {
+                var message = Resources.FormatRazorPage_MethodCannotBeCalled(nameof(RenderBody), Path);
+                throw new InvalidOperationException(message);
+            }
+
+            _renderedBody = true;
+            return BodyContent;
+        }
+
+        /// <summary>
+        /// In a Razor layout page, ignores rendering the portion of a content page that is not within a named section.
+        /// </summary>
+        public void IgnoreBody()
+        {
+            _ignoreBody = true;
+        }
+
+        /// <summary>
+        /// Creates a named content section in the page that can be invoked in a Layout page using
+        /// <see cref="RenderSection(string)"/> or <see cref="RenderSectionAsync(string, bool)"/>.
+        /// </summary>
+        /// <param name="name">The name of the section to create.</param>
+        /// <param name="section">The <see cref="RenderAsyncDelegate"/> to execute when rendering the section.</param>
+        public override void DefineSection(string name, RenderAsyncDelegate section)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            if (section == null)
+            {
+                throw new ArgumentNullException(nameof(section));
+            }
+
+            if (SectionWriters.ContainsKey(name))
+            {
+                throw new InvalidOperationException(Resources.FormatSectionAlreadyDefined(name));
+            }
+            SectionWriters[name] = section;
+        }
+
+        /// <summary>
+        /// Returns a value that indicates whether the specified section is defined in the content page.
+        /// </summary>
+        /// <param name="name">The section name to search for.</param>
+        /// <returns><c>true</c> if the specified section is defined in the content page; otherwise, <c>false</c>.</returns>
+        public bool IsSectionDefined(string name)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            EnsureMethodCanBeInvoked(nameof(IsSectionDefined));
+            return PreviousSectionWriters.ContainsKey(name);
+        }
+
+        /// <summary>
+        /// In layout pages, renders the content of the section named <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The name of the section to render.</param>
+        /// <returns>An empty <see cref="IHtmlContent"/>.</returns>
+        /// <remarks>The method writes to the <see cref="RazorPageBase.Output"/> and the value returned is a token
+        /// value that allows the Write (produced due to @RenderSection(..)) to succeed. However the
+        /// value does not represent the rendered content.</remarks>
+        public HtmlString RenderSection(string name)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            return RenderSection(name, required: true);
+        }
+
+        /// <summary>
+        /// In layout pages, renders the content of the section named <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The section to render.</param>
+        /// <param name="required">Indicates if this section must be rendered.</param>
+        /// <returns>An empty <see cref="IHtmlContent"/>.</returns>
+        /// <remarks>The method writes to the <see cref="RazorPageBase.Output"/> and the value returned is a token
+        /// value that allows the Write (produced due to @RenderSection(..)) to succeed. However the
+        /// value does not represent the rendered content.</remarks>
+        public HtmlString RenderSection(string name, bool required)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            EnsureMethodCanBeInvoked(nameof(RenderSection));
+
+            var task = RenderSectionAsyncCore(name, required);
+            return task.GetAwaiter().GetResult();
+        }
+
+        /// <summary>
+        /// In layout pages, asynchronously renders the content of the section named <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The section to render.</param>
+        /// <returns>
+        /// A <see cref="Task{HtmlString}"/> that on completion returns an empty <see cref="IHtmlContent"/>.
+        /// </returns>
+        /// <remarks>The method writes to the <see cref="RazorPageBase.Output"/> and the value returned is a token
+        /// value that allows the Write (produced due to @RenderSection(..)) to succeed. However the
+        /// value does not represent the rendered content.</remarks>
+        public Task<HtmlString> RenderSectionAsync(string name)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            return RenderSectionAsync(name, required: true);
+        }
+
+        /// <summary>
+        /// In layout pages, asynchronously renders the content of the section named <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The section to render.</param>
+        /// <param name="required">Indicates the <paramref name="name"/> section must be registered
+        /// (using <c>@section</c>) in the page.</param>
+        /// <returns>
+        /// A <see cref="Task{HtmlString}"/> that on completion returns an empty <see cref="IHtmlContent"/>.
+        /// </returns>
+        /// <remarks>The method writes to the <see cref="RazorPageBase.Output"/> and the value returned is a token
+        /// value that allows the Write (produced due to @RenderSection(..)) to succeed. However the
+        /// value does not represent the rendered content.</remarks>
+        /// <exception cref="InvalidOperationException">if <paramref name="required"/> is <c>true</c> and the section
+        /// was not registered using the <c>@section</c> in the Razor page.</exception>
+        public Task<HtmlString> RenderSectionAsync(string name, bool required)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            EnsureMethodCanBeInvoked(nameof(RenderSectionAsync));
+            return RenderSectionAsyncCore(name, required);
+        }
+
+        private async Task<HtmlString> RenderSectionAsyncCore(string sectionName, bool required)
+        {
+            if (_renderedSections.Contains(sectionName))
+            {
+                var message = Resources.FormatSectionAlreadyRendered(nameof(RenderSectionAsync), Path, sectionName);
+                throw new InvalidOperationException(message);
+            }
+
+            if (PreviousSectionWriters.TryGetValue(sectionName, out var renderDelegate))
+            {
+                _renderedSections.Add(sectionName);
+
+                await renderDelegate();
+
+                // Return a token value that allows the Write call that wraps the RenderSection \ RenderSectionAsync
+                // to succeed.
+                return HtmlString.Empty;
+            }
+            else if (required)
+            {
+                // If the section is not found, and it is not optional, throw an error.
+                var message = Resources.FormatSectionNotDefined(
+                    ViewContext.ExecutingFilePath,
+                    sectionName,
+                    ViewContext.View.Path);
+                throw new InvalidOperationException(message);
+            }
+            else
+            {
+                // If the section is optional and not found, then don't do anything.
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// In layout pages, ignores rendering the content of the section named <paramref name="sectionName"/>.
+        /// </summary>
+        /// <param name="sectionName">The section to ignore.</param>
+        public void IgnoreSection(string sectionName)
+        {
+            if (sectionName == null)
+            {
+                throw new ArgumentNullException(nameof(sectionName));
+            }
+
+            if (!PreviousSectionWriters.ContainsKey(sectionName))
+            {
+                // If the section is not defined, throw an error.
+                throw new InvalidOperationException(Resources.FormatSectionNotDefined(
+                    ViewContext.ExecutingFilePath,
+                    sectionName,
+                    ViewContext.View.Path));
+            }
+
+            if (_ignoredSections == null)
+            {
+                _ignoredSections = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            }
+
+            _ignoredSections.Add(sectionName);
+        }
+
+        /// <inheritdoc />
+        public override void EnsureRenderedBodyOrSections()
+        {
+            // a) all sections defined for this page are rendered.
+            // b) if no sections are defined, then the body is rendered if it's available.
+            if (PreviousSectionWriters != null && PreviousSectionWriters.Count > 0)
+            {
+                var sectionsNotRendered = PreviousSectionWriters.Keys.Except(
+                    _renderedSections,
+                    StringComparer.OrdinalIgnoreCase);
+
+                string[] sectionsNotIgnored;
+                if (_ignoredSections != null)
+                {
+                    sectionsNotIgnored = sectionsNotRendered.Except(_ignoredSections, StringComparer.OrdinalIgnoreCase).ToArray();
+                }
+                else
+                {
+                    sectionsNotIgnored = sectionsNotRendered.ToArray();
+                }
+
+                if (sectionsNotIgnored.Length > 0)
+                {
+                    var sectionNames = string.Join(", ", sectionsNotIgnored);
+                    throw new InvalidOperationException(Resources.FormatSectionsNotRendered(Path, sectionNames, nameof(IgnoreSection)));
+                }
+            }
+            else if (BodyContent != null && !_renderedBody && !_ignoreBody)
+            {
+                // There are no sections defined, but RenderBody was NOT called.
+                // If a body was defined and the body not ignored, then RenderBody should have been called.
+                var message = Resources.FormatRenderBodyNotCalled(nameof(RenderBody), Path, nameof(IgnoreBody));
+                throw new InvalidOperationException(message);
+            }
+        }
+
+        public override void BeginContext(int position, int length, bool isLiteral)
+        {
+            const string BeginContextEvent = "Microsoft.AspNetCore.Mvc.Razor.BeginInstrumentationContext";
+
+            if (DiagnosticSource?.IsEnabled(BeginContextEvent) == true)
+            {
+                DiagnosticSource.Write(
+                    BeginContextEvent,
+                    new
+                    {
+                        httpContext = Context,
+                        path = Path,
+                        position = position,
+                        length = length,
+                        isLiteral = isLiteral,
+                    });
+            }
+        }
+
+        public override void EndContext()
+        {
+            const string EndContextEvent = "Microsoft.AspNetCore.Mvc.Razor.EndInstrumentationContext";
+
+            if (DiagnosticSource?.IsEnabled(EndContextEvent) == true)
+            {
+                DiagnosticSource.Write(
+                    EndContextEvent,
+                    new
+                    {
+                        httpContext = Context,
+                        path = Path,
+                    });
+            }
+        }
+
+        private void EnsureMethodCanBeInvoked(string methodName)
+        {
+            if (PreviousSectionWriters == null)
+            {
+                throw new InvalidOperationException(Resources.FormatRazorPage_MethodCannotBeCalled(methodName, Path));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageActivator.cs
new file mode 100644
index 0000000000..758255f494
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageActivator.cs
@@ -0,0 +1,87 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.Diagnostics;
+using System.Reflection;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <inheritdoc />
+    public class RazorPageActivator : IRazorPageActivator
+    {
+        // Name of the "public TModel Model" property on RazorPage<TModel>
+        private const string ModelPropertyName = "Model";
+        private readonly ConcurrentDictionary<Type, RazorPagePropertyActivator> _activationInfo;
+        private readonly IModelMetadataProvider _metadataProvider;
+
+        // Value accessors for common singleton properties activated in a RazorPage.
+        private readonly RazorPagePropertyActivator.PropertyValueAccessors _propertyAccessors;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RazorPageActivator"/> class.
+        /// </summary>
+        public RazorPageActivator(
+            IModelMetadataProvider metadataProvider,
+            IUrlHelperFactory urlHelperFactory,
+            IJsonHelper jsonHelper,
+            DiagnosticSource diagnosticSource,
+            HtmlEncoder htmlEncoder,
+            IModelExpressionProvider modelExpressionProvider)
+        {
+            _activationInfo = new ConcurrentDictionary<Type, RazorPagePropertyActivator>();
+            _metadataProvider = metadataProvider;
+
+            _propertyAccessors = new RazorPagePropertyActivator.PropertyValueAccessors
+            {
+                UrlHelperAccessor = context => urlHelperFactory.GetUrlHelper(context),
+                JsonHelperAccessor = context => jsonHelper,
+                DiagnosticSourceAccessor = context => diagnosticSource,
+                HtmlEncoderAccessor = context => htmlEncoder,
+                ModelExpressionProviderAccessor = context => modelExpressionProvider,
+            };
+        }
+
+        /// <inheritdoc />
+        public void Activate(IRazorPage page, ViewContext context)
+        {
+            if (page == null)
+            {
+                throw new ArgumentNullException(nameof(page));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var pageType = page.GetType();
+            RazorPagePropertyActivator propertyActivator;
+            if (!_activationInfo.TryGetValue(pageType, out propertyActivator))
+            {
+                // Look for a property named "Model". If it is non-null, we'll assume this is
+                // the equivalent of TModel Model property on RazorPage<TModel>.
+                //
+                // Otherwise if we don't have a model property the activator will just skip setting
+                // the view data.
+                var modelType = pageType.GetRuntimeProperty(ModelPropertyName)?.PropertyType;
+                propertyActivator = new RazorPagePropertyActivator(
+                    pageType,
+                    modelType,
+                    _metadataProvider,
+                    _propertyAccessors);
+
+                propertyActivator = _activationInfo.GetOrAdd(pageType, propertyActivator);
+            }
+
+            propertyActivator.Activate(page, context);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs
new file mode 100644
index 0000000000..96ef957f60
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs
@@ -0,0 +1,774 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.IO;
+using System.Security.Claims;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Antiforgery;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Razor.Runtime.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <summary>
+    /// Represents properties and methods that are needed in order to render a view that uses Razor syntax.
+    /// </summary>
+    public abstract class RazorPageBase : IRazorPage
+    {
+        private readonly Stack<TextWriter> _textWriterStack = new Stack<TextWriter>();
+        private StringWriter _valueBuffer;
+        private ITagHelperFactory _tagHelperFactory;
+        private IViewBufferScope _bufferScope;
+        private TextWriter _pageWriter;
+        private AttributeInfo _attributeInfo;
+        private TagHelperAttributeInfo _tagHelperAttributeInfo;
+        private IUrlHelper _urlHelper;
+
+        public virtual ViewContext ViewContext { get; set; }
+
+        public string Layout { get; set; }
+
+        /// <summary>
+        /// Gets the <see cref="TextWriter"/> that the page is writing output to.
+        /// </summary>
+        /// <summary>
+        /// Gets the <see cref="TextWriter"/> that the page is writing output to.
+        /// </summary>
+        public virtual TextWriter Output
+        {
+            get
+            {
+                if (ViewContext == null)
+                {
+                    var message = Resources.FormatViewContextMustBeSet("ViewContext", "Output");
+                    throw new InvalidOperationException(message);
+                }
+
+                return ViewContext.Writer;
+            }
+        }
+
+        /// <inheritdoc />
+        public string Path { get; set; }
+
+        /// <inheritdoc />
+        public IDictionary<string, RenderAsyncDelegate> SectionWriters { get; } =
+            new Dictionary<string, RenderAsyncDelegate>(StringComparer.OrdinalIgnoreCase);
+
+        /// <summary>
+        /// Gets the dynamic view data dictionary.
+        /// </summary>
+        public dynamic ViewBag => ViewContext?.ViewBag;
+
+        /// <inheritdoc />
+        public bool IsLayoutBeingRendered { get; set; }
+
+        /// <inheritdoc />
+        public IHtmlContent BodyContent { get; set; }
+
+        /// <inheritdoc />
+        public IDictionary<string, RenderAsyncDelegate> PreviousSectionWriters { get; set; }
+
+        /// <summary>
+        /// Gets or sets a <see cref="System.Diagnostics.DiagnosticSource"/> instance used to instrument the page execution.
+        /// </summary>
+        [RazorInject]
+        public DiagnosticSource DiagnosticSource { get; set; }
+
+        /// <summary>
+        /// Gets the <see cref="System.Text.Encodings.Web.HtmlEncoder"/> to use when this <see cref="RazorPage"/>
+        /// handles non-<see cref="IHtmlContent"/> C# expressions.
+        /// </summary>
+        [RazorInject]
+        public HtmlEncoder HtmlEncoder { get; set; }
+
+        /// <summary>
+        /// Gets the <see cref="ClaimsPrincipal"/> of the current logged in user.
+        /// </summary>
+        public virtual ClaimsPrincipal User => ViewContext?.HttpContext?.User;
+
+        /// <summary>
+        /// Gets the <see cref="ITempDataDictionary"/> from the <see cref="ViewContext"/>.
+        /// </summary>
+        /// <remarks>Returns null if <see cref="ViewContext"/> is null.</remarks>
+        public ITempDataDictionary TempData => ViewContext?.TempData;
+
+        private Stack<TagHelperScopeInfo> TagHelperScopes { get; } = new Stack<TagHelperScopeInfo>();
+
+        private ITagHelperFactory TagHelperFactory
+        {
+            get
+            {
+                if (_tagHelperFactory == null)
+                {
+                    var services = ViewContext.HttpContext.RequestServices;
+                    _tagHelperFactory = services.GetRequiredService<ITagHelperFactory>();
+                }
+
+                return _tagHelperFactory;
+            }
+        }
+
+        private IViewBufferScope BufferScope
+        {
+            get
+            {
+                if (_bufferScope == null)
+                {
+                    var services = ViewContext.HttpContext.RequestServices;
+                    _bufferScope = services.GetRequiredService<IViewBufferScope>();
+                }
+
+                return _bufferScope;
+            }
+        }
+
+        public abstract Task ExecuteAsync();
+
+        /// <summary>
+        /// Format an error message about using an indexer when the tag helper property is <c>null</c>.
+        /// </summary>
+        /// <param name="attributeName">Name of the HTML attribute associated with the indexer.</param>
+        /// <param name="tagHelperTypeName">Full name of the tag helper <see cref="Type"/>.</param>
+        /// <param name="propertyName">Dictionary property in the tag helper.</param>
+        /// <returns>An error message about using an indexer when the tag helper property is <c>null</c>.</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public string InvalidTagHelperIndexerAssignment(
+            string attributeName,
+            string tagHelperTypeName,
+            string propertyName)
+        {
+            return Resources.FormatRazorPage_InvalidTagHelperIndexerAssignment(
+                attributeName,
+                tagHelperTypeName,
+                propertyName);
+        }
+
+        /// <summary>
+        /// Creates and activates a <see cref="ITagHelper"/>.
+        /// </summary>
+        /// <typeparam name="TTagHelper">A <see cref="ITagHelper"/> type.</typeparam>
+        /// <returns>The activated <see cref="ITagHelper"/>.</returns>
+        /// <remarks>
+        /// <typeparamref name="TTagHelper"/> must have a parameterless constructor.
+        /// </remarks>
+        public TTagHelper CreateTagHelper<TTagHelper>() where TTagHelper : ITagHelper
+        {
+            return TagHelperFactory.CreateTagHelper<TTagHelper>(ViewContext);
+        }
+
+        /// <summary>
+        /// Starts a new writing scope and optionally overrides <see cref="HtmlEncoder"/> within that scope.
+        /// </summary>
+        /// <param name="encoder">
+        /// The <see cref="System.Text.Encodings.Web.HtmlEncoder"/> to use when this <see cref="RazorPage"/> handles
+        /// non-<see cref="IHtmlContent"/> C# expressions. If <c>null</c>, does not change <see cref="HtmlEncoder"/>.
+        /// </param>
+        /// <remarks>
+        /// All writes to the <see cref="Output"/> or <see cref="ViewContext.Writer"/> after calling this method will
+        /// be buffered until <see cref="EndTagHelperWritingScope"/> is called.
+        /// </remarks>
+        public void StartTagHelperWritingScope(HtmlEncoder encoder)
+        {
+            var buffer = new ViewBuffer(BufferScope, Path, ViewBuffer.TagHelperPageSize);
+            TagHelperScopes.Push(new TagHelperScopeInfo(buffer, HtmlEncoder, ViewContext.Writer));
+
+            // If passed an HtmlEncoder, override the property.
+            if (encoder != null)
+            {
+                HtmlEncoder = encoder;
+            }
+
+            // We need to replace the ViewContext's Writer to ensure that all content (including content written
+            // from HTML helpers) is redirected.
+            ViewContext.Writer = new ViewBufferTextWriter(buffer, ViewContext.Writer.Encoding);
+        }
+
+        /// <summary>
+        /// Ends the current writing scope that was started by calling <see cref="StartTagHelperWritingScope"/>.
+        /// </summary>
+        /// <returns>The buffered <see cref="TagHelperContent"/>.</returns>
+        public TagHelperContent EndTagHelperWritingScope()
+        {
+            if (TagHelperScopes.Count == 0)
+            {
+                throw new InvalidOperationException(Resources.RazorPage_ThereIsNoActiveWritingScopeToEnd);
+            }
+
+            var scopeInfo = TagHelperScopes.Pop();
+
+            // Get the content written during the current scope.
+            var tagHelperContent = new DefaultTagHelperContent();
+            tagHelperContent.AppendHtml(scopeInfo.Buffer);
+
+            // Restore previous scope.
+            HtmlEncoder = scopeInfo.HtmlEncoder;
+            ViewContext.Writer = scopeInfo.Writer;
+
+            return tagHelperContent;
+        }
+
+        /// <summary>
+        /// Starts a new scope for writing <see cref="ITagHelper"/> attribute values.
+        /// </summary>
+        /// <remarks>
+        /// All writes to the <see cref="Output"/> or <see cref="ViewContext.Writer"/> after calling this method will
+        /// be buffered until <see cref="EndWriteTagHelperAttribute"/> is called.
+        /// The content will be buffered using a shared <see cref="StringWriter"/> within this <see cref="RazorPage"/>
+        /// Nesting of <see cref="BeginWriteTagHelperAttribute"/> and <see cref="EndWriteTagHelperAttribute"/> method calls
+        /// is not supported.
+        /// </remarks>
+        public void BeginWriteTagHelperAttribute()
+        {
+            if (_pageWriter != null)
+            {
+                throw new InvalidOperationException(Resources.RazorPage_NestingAttributeWritingScopesNotSupported);
+            }
+
+            _pageWriter = ViewContext.Writer;
+
+            if (_valueBuffer == null)
+            {
+                _valueBuffer = new StringWriter();
+            }
+
+            // We need to replace the ViewContext's Writer to ensure that all content (including content written
+            // from HTML helpers) is redirected.
+            ViewContext.Writer = _valueBuffer;
+
+        }
+
+        /// <summary>
+        /// Ends the current writing scope that was started by calling <see cref="BeginWriteTagHelperAttribute"/>.
+        /// </summary>
+        /// <returns>The content buffered by the shared <see cref="StringWriter"/> of this <see cref="RazorPage"/>.</returns>
+        /// <remarks>
+        /// This method assumes that there will be no nesting of <see cref="BeginWriteTagHelperAttribute"/>
+        /// and <see cref="EndWriteTagHelperAttribute"/> method calls.
+        /// </remarks>
+        public string EndWriteTagHelperAttribute()
+        {
+            if (_pageWriter == null)
+            {
+                throw new InvalidOperationException(Resources.RazorPage_ThereIsNoActiveWritingScopeToEnd);
+            }
+
+            var content = _valueBuffer.ToString();
+            _valueBuffer.GetStringBuilder().Clear();
+
+            // Restore previous writer.
+            ViewContext.Writer = _pageWriter;
+            _pageWriter = null;
+
+            return content;
+        }
+
+        // Internal for unit testing.
+        protected internal virtual void PushWriter(TextWriter writer)
+        {
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
+            _textWriterStack.Push(ViewContext.Writer);
+            ViewContext.Writer = writer;
+        }
+
+        // Internal for unit testing.
+        protected internal virtual TextWriter PopWriter()
+        {
+            ViewContext.Writer = _textWriterStack.Pop();
+            return ViewContext.Writer;
+        }
+
+        public virtual string Href(string contentPath)
+        {
+            if (contentPath == null)
+            {
+                throw new ArgumentNullException(nameof(contentPath));
+            }
+
+            if (_urlHelper == null)
+            {
+                var services = ViewContext?.HttpContext.RequestServices;
+                var factory = services.GetRequiredService<IUrlHelperFactory>();
+                _urlHelper = factory.GetUrlHelper(ViewContext);
+            }
+
+            return _urlHelper.Content(contentPath);
+        }
+
+        /// <summary>
+        /// Creates a named content section in the page that can be invoked in a Layout page using
+        /// <c>RenderSection</c> or <c>RenderSectionAsync</c>
+        /// </summary>
+        /// <param name="name">The name of the section to create.</param>
+        /// <param name="section">The delegate to execute when rendering the section.</param>
+        /// <remarks>This is a temporary placeholder method to support ASP.NET Core 2.0.0 editor code generation.</remarks>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        protected void DefineSection(string name, Func<object, Task> section)
+            => DefineSection(name, () => section(null /* writer */));
+
+        /// <summary>
+        /// Creates a named content section in the page that can be invoked in a Layout page using
+        /// <c>RenderSection</c> or <c>RenderSectionAsync</c>
+        /// </summary>
+        /// <param name="name">The name of the section to create.</param>
+        /// <param name="section">The <see cref="RenderAsyncDelegate"/> to execute when rendering the section.</param>
+        public virtual void DefineSection(string name, RenderAsyncDelegate section)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            if (section == null)
+            {
+                throw new ArgumentNullException(nameof(section));
+            }
+
+            if (SectionWriters.ContainsKey(name))
+            {
+                throw new InvalidOperationException(Resources.FormatSectionAlreadyDefined(name));
+            }
+            SectionWriters[name] = section;
+        }
+
+
+        /// <summary>
+        /// Writes the specified <paramref name="value"/> with HTML encoding to <see cref="Output"/>.
+        /// </summary>
+        /// <param name="value">The <see cref="object"/> to write.</param>
+        public virtual void Write(object value)
+        {
+            if (value == null || value == HtmlString.Empty)
+            {
+                return;
+            }
+
+            var writer = Output;
+            var encoder = HtmlEncoder;
+            if (value is IHtmlContent htmlContent)
+            {
+                var bufferedWriter = writer as ViewBufferTextWriter;
+                if (bufferedWriter == null || !bufferedWriter.IsBuffering)
+                {
+                    htmlContent.WriteTo(writer, encoder);
+                }
+                else
+                {
+                    if (value is IHtmlContentContainer htmlContentContainer)
+                    {
+                        // This is likely another ViewBuffer.
+                        htmlContentContainer.MoveTo(bufferedWriter.Buffer);
+                    }
+                    else
+                    {
+                        // Perf: This is the common case for IHtmlContent, ViewBufferTextWriter is inefficient
+                        // for writing character by character.
+                        bufferedWriter.Buffer.AppendHtml(htmlContent);
+                    }
+                }
+
+                return;
+            }
+
+            Write(value.ToString());
+        }
+
+        /// <summary>
+        /// Writes the specified <paramref name="value"/> with HTML encoding to <see cref="Output"/>.
+        /// </summary>
+        /// <param name="value">The <see cref="string"/> to write.</param>
+        public virtual void Write(string value)
+        {
+            var writer = Output;
+            var encoder = HtmlEncoder;
+            if (!string.IsNullOrEmpty(value))
+            {
+                // Perf: Encode right away instead of writing it character-by-character.
+                // character-by-character isn't efficient when using a writer backed by a ViewBuffer.
+                var encoded = encoder.Encode(value);
+                writer.Write(encoded);
+            }
+        }
+
+        /// <summary>
+        /// Writes the specified <paramref name="value"/> without HTML encoding to <see cref="Output"/>.
+        /// </summary>
+        /// <param name="value">The <see cref="object"/> to write.</param>
+        public virtual void WriteLiteral(object value)
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            WriteLiteral(value.ToString());
+        }
+
+        /// <summary>
+        /// Writes the specified <paramref name="value"/> without HTML encoding to <see cref="Output"/>.
+        /// </summary>
+        /// <param name="value">The <see cref="string"/> to write.</param>
+        public virtual void WriteLiteral(string value)
+        {
+            if (!string.IsNullOrEmpty(value))
+            {
+                Output.Write(value);
+            }
+        }
+
+        public virtual void BeginWriteAttribute(
+            string name,
+            string prefix,
+            int prefixOffset,
+            string suffix,
+            int suffixOffset,
+            int attributeValuesCount)
+        {
+            if (prefix == null)
+            {
+                throw new ArgumentNullException(nameof(prefix));
+            }
+
+            if (suffix == null)
+            {
+                throw new ArgumentNullException(nameof(suffix));
+            }
+
+            _attributeInfo = new AttributeInfo(name, prefix, prefixOffset, suffix, suffixOffset, attributeValuesCount);
+
+            // Single valued attributes might be omitted in entirety if it the attribute value strictly evaluates to
+            // null  or false. Consequently defer the prefix generation until we encounter the attribute value.
+            if (attributeValuesCount != 1)
+            {
+                WritePositionTaggedLiteral(prefix, prefixOffset);
+            }
+        }
+
+        public void WriteAttributeValue(
+            string prefix,
+            int prefixOffset,
+            object value,
+            int valueOffset,
+            int valueLength,
+            bool isLiteral)
+        {
+            if (_attributeInfo.AttributeValuesCount == 1)
+            {
+                if (IsBoolFalseOrNullValue(prefix, value))
+                {
+                    // Value is either null or the bool 'false' with no prefix; don't render the attribute.
+                    _attributeInfo.Suppressed = true;
+                    return;
+                }
+
+                // We are not omitting the attribute. Write the prefix.
+                WritePositionTaggedLiteral(_attributeInfo.Prefix, _attributeInfo.PrefixOffset);
+
+                if (IsBoolTrueWithEmptyPrefixValue(prefix, value))
+                {
+                    // The value is just the bool 'true', write the attribute name instead of the string 'True'.
+                    value = _attributeInfo.Name;
+                }
+            }
+
+            // This block handles two cases.
+            // 1. Single value with prefix.
+            // 2. Multiple values with or without prefix.
+            if (value != null)
+            {
+                if (!string.IsNullOrEmpty(prefix))
+                {
+                    WritePositionTaggedLiteral(prefix, prefixOffset);
+                }
+
+                BeginContext(valueOffset, valueLength, isLiteral);
+
+                WriteUnprefixedAttributeValue(value, isLiteral);
+
+                EndContext();
+            }
+        }
+
+        public virtual void EndWriteAttribute()
+        {
+            if (!_attributeInfo.Suppressed)
+            {
+                WritePositionTaggedLiteral(_attributeInfo.Suffix, _attributeInfo.SuffixOffset);
+            }
+        }
+
+        public void BeginAddHtmlAttributeValues(
+            TagHelperExecutionContext executionContext,
+            string attributeName,
+            int attributeValuesCount,
+            HtmlAttributeValueStyle attributeValueStyle)
+        {
+            _tagHelperAttributeInfo = new TagHelperAttributeInfo(
+                executionContext,
+                attributeName,
+                attributeValuesCount,
+                attributeValueStyle);
+        }
+
+        public void AddHtmlAttributeValue(
+            string prefix,
+            int prefixOffset,
+            object value,
+            int valueOffset,
+            int valueLength,
+            bool isLiteral)
+        {
+            Debug.Assert(_tagHelperAttributeInfo.ExecutionContext != null);
+            if (_tagHelperAttributeInfo.AttributeValuesCount == 1)
+            {
+                if (IsBoolFalseOrNullValue(prefix, value))
+                {
+                    // The first value was 'null' or 'false' indicating that we shouldn't render the attribute. The
+                    // attribute is treated as a TagHelper attribute so it's only available in
+                    // TagHelperContext.AllAttributes for TagHelper authors to see (if they want to see why the
+                    // attribute was removed from TagHelperOutput.Attributes).
+                    _tagHelperAttributeInfo.ExecutionContext.AddTagHelperAttribute(
+                        _tagHelperAttributeInfo.Name,
+                        value?.ToString() ?? string.Empty,
+                        _tagHelperAttributeInfo.AttributeValueStyle);
+                    _tagHelperAttributeInfo.Suppressed = true;
+                    return;
+                }
+                else if (IsBoolTrueWithEmptyPrefixValue(prefix, value))
+                {
+                    _tagHelperAttributeInfo.ExecutionContext.AddHtmlAttribute(
+                        _tagHelperAttributeInfo.Name,
+                        _tagHelperAttributeInfo.Name,
+                        _tagHelperAttributeInfo.AttributeValueStyle);
+                    _tagHelperAttributeInfo.Suppressed = true;
+                    return;
+                }
+            }
+
+            if (value != null)
+            {
+                // Perf: We'll use this buffer for all of the attribute values and then clear it to
+                // reduce allocations.
+                if (_valueBuffer == null)
+                {
+                    _valueBuffer = new StringWriter();
+                }
+
+                PushWriter(_valueBuffer);
+                if (!string.IsNullOrEmpty(prefix))
+                {
+                    WriteLiteral(prefix);
+                }
+
+                WriteUnprefixedAttributeValue(value, isLiteral);
+                PopWriter();
+            }
+        }
+
+        public void EndAddHtmlAttributeValues(TagHelperExecutionContext executionContext)
+        {
+            if (!_tagHelperAttributeInfo.Suppressed)
+            {
+                // Perf: _valueBuffer might be null if nothing was written. If it is set, clear it so
+                // it is reset for the next value.
+                var content = _valueBuffer == null ? HtmlString.Empty : new HtmlString(_valueBuffer.ToString());
+                _valueBuffer?.GetStringBuilder().Clear();
+
+                executionContext.AddHtmlAttribute(_tagHelperAttributeInfo.Name, content, _tagHelperAttributeInfo.AttributeValueStyle);
+            }
+        }
+
+        /// <summary>
+        /// Invokes <see cref="TextWriter.FlushAsync"/> on <see cref="Output"/> and <see cref="m:Stream.FlushAsync"/>
+        /// on the response stream, writing out any buffered content to the <see cref="HttpResponse.Body"/>.
+        /// </summary>
+        /// <returns>A <see cref="Task{HtmlString}"/> that represents the asynchronous flush operation and on
+        /// completion returns an empty <see cref="IHtmlContent"/>.</returns>
+        /// <remarks>The value returned is a token value that allows FlushAsync to work directly in an HTML
+        /// section. However the value does not represent the rendered content.
+        /// This method also writes out headers, so any modifications to headers must be done before
+        /// <see cref="FlushAsync"/> is called. For example, call <see cref="SetAntiforgeryCookieAndHeader"/> to send
+        /// antiforgery cookie token and X-Frame-Options header to client before this method flushes headers out.
+        /// </remarks>
+        public virtual async Task<HtmlString> FlushAsync()
+        {
+            // If there are active scopes, then we should throw. Cannot flush content that has the potential to change.
+            if (TagHelperScopes.Count > 0)
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatRazorPage_CannotFlushWhileInAWritingScope(nameof(FlushAsync), Path));
+            }
+
+            // Calls to Flush are allowed if the page does not specify a Layout or if it is executing a section in the
+            // Layout.
+            if (!IsLayoutBeingRendered && !string.IsNullOrEmpty(Layout))
+            {
+                var message = Resources.FormatLayoutCannotBeRendered(Path, nameof(FlushAsync));
+                throw new InvalidOperationException(message);
+            }
+
+            await Output.FlushAsync();
+            await ViewContext?.HttpContext.Response.Body.FlushAsync();
+            return HtmlString.Empty;
+        }
+
+        /// <summary>
+        /// Sets antiforgery cookie and X-Frame-Options header on the response.
+        /// </summary>
+        /// <returns>An empty <see cref="IHtmlContent"/>.</returns>
+        /// <remarks> Call this method to send antiforgery cookie token and X-Frame-Options header to client
+        /// before <see cref="RazorPageBase.FlushAsync"/> flushes the headers. </remarks>
+        public virtual HtmlString SetAntiforgeryCookieAndHeader()
+        {
+            var antiforgery = ViewContext?.HttpContext.RequestServices.GetRequiredService<IAntiforgery>();
+            antiforgery.SetCookieTokenAndHeader(ViewContext?.HttpContext);
+
+            return HtmlString.Empty;
+        }
+
+        private void WriteUnprefixedAttributeValue(object value, bool isLiteral)
+        {
+            var stringValue = value as string;
+
+            // The extra branching here is to ensure that we call the Write*To(string) overload where possible.
+            if (isLiteral && stringValue != null)
+            {
+                WriteLiteral(stringValue);
+            }
+            else if (isLiteral)
+            {
+                WriteLiteral(value);
+            }
+            else if (stringValue != null)
+            {
+                Write(stringValue);
+            }
+            else
+            {
+                Write(value);
+            }
+        }
+
+        private void WritePositionTaggedLiteral(string value, int position)
+        {
+            BeginContext(position, value.Length, isLiteral: true);
+            WriteLiteral(value);
+            EndContext();
+        }
+
+        public abstract void BeginContext(int position, int length, bool isLiteral);
+
+        public abstract void EndContext();
+
+        private bool IsBoolFalseOrNullValue(string prefix, object value)
+        {
+            return string.IsNullOrEmpty(prefix) &&
+                (value == null ||
+                (value is bool && !(bool)value));
+        }
+
+        private bool IsBoolTrueWithEmptyPrefixValue(string prefix, object value)
+        {
+            // If the value is just the bool 'true', use the attribute name as the value.
+            return string.IsNullOrEmpty(prefix) &&
+                (value is bool && (bool)value);
+        }
+
+        public abstract void EnsureRenderedBodyOrSections();
+
+        private struct AttributeInfo
+        {
+            public AttributeInfo(
+                string name,
+                string prefix,
+                int prefixOffset,
+                string suffix,
+                int suffixOffset,
+                int attributeValuesCount)
+            {
+                Name = name;
+                Prefix = prefix;
+                PrefixOffset = prefixOffset;
+                Suffix = suffix;
+                SuffixOffset = suffixOffset;
+                AttributeValuesCount = attributeValuesCount;
+
+                Suppressed = false;
+            }
+
+            public int AttributeValuesCount { get; }
+
+            public string Name { get; }
+
+            public string Prefix { get; }
+
+            public int PrefixOffset { get; }
+
+            public string Suffix { get; }
+
+            public int SuffixOffset { get; }
+
+            public bool Suppressed { get; set; }
+        }
+
+        private struct TagHelperAttributeInfo
+        {
+            public TagHelperAttributeInfo(
+                TagHelperExecutionContext tagHelperExecutionContext,
+                string name,
+                int attributeValuesCount,
+                HtmlAttributeValueStyle attributeValueStyle)
+            {
+                ExecutionContext = tagHelperExecutionContext;
+                Name = name;
+                AttributeValuesCount = attributeValuesCount;
+                AttributeValueStyle = attributeValueStyle;
+
+                Suppressed = false;
+            }
+
+            public string Name { get; }
+
+            public TagHelperExecutionContext ExecutionContext { get; }
+
+            public int AttributeValuesCount { get; }
+
+            public HtmlAttributeValueStyle AttributeValueStyle { get; }
+
+            public bool Suppressed { get; set; }
+        }
+
+        private struct TagHelperScopeInfo
+        {
+            public TagHelperScopeInfo(ViewBuffer buffer, HtmlEncoder encoder, TextWriter writer)
+            {
+                Buffer = buffer;
+                HtmlEncoder = encoder;
+                Writer = writer;
+            }
+
+            public ViewBuffer Buffer { get; }
+
+            public HtmlEncoder HtmlEncoder { get; }
+
+            public TextWriter Writer { get; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageFactoryResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageFactoryResult.cs
new file mode 100644
index 0000000000..31f7b1ce94
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageFactoryResult.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <summary>
+    /// Result of <see cref="IRazorPageFactoryProvider.CreateFactory(string)"/>.
+    /// </summary>
+    public struct RazorPageFactoryResult
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="RazorPageFactoryResult"/> with the
+        /// specified <see cref="IRazorPage"/> factory.
+        /// </summary>
+        /// <param name="razorPageFactory">The <see cref="IRazorPage"/> factory.</param>
+        /// <param name="viewDescriptor">The <see cref="CompiledViewDescriptor"/>.</param>
+        public RazorPageFactoryResult(
+            CompiledViewDescriptor viewDescriptor,
+            Func<IRazorPage> razorPageFactory)
+        {
+            ViewDescriptor = viewDescriptor ?? throw new ArgumentNullException(nameof(viewDescriptor));
+            RazorPageFactory = razorPageFactory;
+        }
+
+        /// <summary>
+        /// The <see cref="IRazorPage"/> factory.
+        /// </summary>
+        /// <remarks>This property is <c>null</c> when <see cref="Success"/> is <c>false</c>.</remarks>
+        public Func<IRazorPage> RazorPageFactory { get; }
+
+        /// <summary>
+        /// Gets the <see cref="CompiledViewDescriptor"/>.
+        /// </summary>
+        public CompiledViewDescriptor ViewDescriptor { get; }
+
+        /// <summary>
+        /// Gets a value that determines if the page was successfully located.
+        /// </summary>
+        public bool Success => RazorPageFactory != null;
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs
new file mode 100644
index 0000000000..923cf13525
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <summary>
+    /// Represents the properties and methods that are needed in order to render a view that uses Razor syntax.
+    /// </summary>
+    /// <typeparam name="TModel">The type of the view data model.</typeparam>
+    public abstract class RazorPage<TModel> : RazorPage
+    {
+        /// <summary>
+        /// Gets the Model property of the <see cref="ViewData"/> property.
+        /// </summary>
+        public TModel Model => ViewData == null ? default(TModel) : ViewData.Model;
+
+        /// <summary>
+        /// Gets or sets the dictionary for view data.
+        /// </summary>
+        [RazorInject]
+        public ViewDataDictionary<TModel> ViewData { get; set; }
+
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageResult.cs
new file mode 100644
index 0000000000..c299e350fe
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageResult.cs
@@ -0,0 +1,75 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <summary>
+    /// Result of locating a <see cref="IRazorPage"/>.
+    /// </summary>
+    public struct RazorPageResult
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="RazorPageResult"/> for a successful discovery.
+        /// </summary>
+        /// <param name="name">The name of the page that was found.</param>
+        /// <param name="page">The located <see cref="IRazorPage"/>.</param>
+        public RazorPageResult(string name, IRazorPage page)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            if (page == null)
+            {
+                throw new ArgumentNullException(nameof(page));
+            }
+
+            Name = name;
+            Page = page;
+            SearchedLocations = null;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="RazorPageResult"/> for an unsuccessful discovery.
+        /// </summary>
+        /// <param name="name">The name of the page that was not found.</param>
+        /// <param name="searchedLocations">The locations that were searched.</param>
+        public RazorPageResult(string name, IEnumerable<string> searchedLocations)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            if (searchedLocations == null)
+            {
+                throw new ArgumentNullException(nameof(searchedLocations));
+            }
+
+            Name = name;
+            Page = null;
+            SearchedLocations = searchedLocations;
+        }
+
+        /// <summary>
+        /// Gets the name or the path of the page being located.
+        /// </summary>
+        public string Name { get; }
+
+        /// <summary>
+        /// Gets the <see cref="IRazorPage"/> if found.
+        /// </summary>
+        /// <remarks>This property is <c>null</c> if the page was not found.</remarks>
+        public IRazorPage Page { get; }
+
+        /// <summary>
+        /// Gets the locations that were searched when <see cref="Page"/> could not be found.
+        /// </summary>
+        /// <remarks>This property is <c>null</c> if the page was found.</remarks>
+        public IEnumerable<string> SearchedLocations { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorView.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorView.cs
new file mode 100644
index 0000000000..240c80681c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorView.cs
@@ -0,0 +1,327 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <summary>
+    /// Default implementation for <see cref="IView"/> that executes one or more <see cref="IRazorPage"/>
+    /// as parts of its execution.
+    /// </summary>
+    public class RazorView : IView
+    {
+        private readonly IRazorViewEngine _viewEngine;
+        private readonly IRazorPageActivator _pageActivator;
+        private readonly HtmlEncoder _htmlEncoder;
+        private readonly DiagnosticSource _diagnosticSource;
+        private IViewBufferScope _bufferScope;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="RazorView"/>
+        /// </summary>
+        /// <param name="viewEngine">The <see cref="IRazorViewEngine"/> used to locate Layout pages.</param>
+        /// <param name="pageActivator">The <see cref="IRazorPageActivator"/> used to activate pages.</param>
+        /// <param name="viewStartPages">The sequence of <see cref="IRazorPage" /> instances executed as _ViewStarts.
+        /// </param>
+        /// <param name="razorPage">The <see cref="IRazorPage"/> instance to execute.</param>
+        /// <param name="htmlEncoder">The HTML encoder.</param>
+        /// <param name="diagnosticSource">The <see cref="DiagnosticSource"/>.</param>
+        public RazorView(
+            IRazorViewEngine viewEngine,
+            IRazorPageActivator pageActivator,
+            IReadOnlyList<IRazorPage> viewStartPages,
+            IRazorPage razorPage,
+            HtmlEncoder htmlEncoder,
+            DiagnosticSource diagnosticSource)
+        {
+            if (viewEngine == null)
+            {
+                throw new ArgumentNullException(nameof(viewEngine));
+            }
+
+            if (pageActivator == null)
+            {
+                throw new ArgumentNullException(nameof(pageActivator));
+            }
+
+            if (viewStartPages == null)
+            {
+                throw new ArgumentNullException(nameof(viewStartPages));
+            }
+
+            if (razorPage == null)
+            {
+                throw new ArgumentNullException(nameof(razorPage));
+            }
+
+            if (htmlEncoder == null)
+            {
+                throw new ArgumentNullException(nameof(htmlEncoder));
+            }
+
+            if (diagnosticSource == null)
+            {
+                throw new ArgumentNullException(nameof(diagnosticSource));
+            }
+
+            _viewEngine = viewEngine;
+            _pageActivator = pageActivator;
+            ViewStartPages = viewStartPages;
+            RazorPage = razorPage;
+            _htmlEncoder = htmlEncoder;
+            _diagnosticSource = diagnosticSource;
+        }
+
+        /// <inheritdoc />
+        public string Path => RazorPage.Path;
+
+        /// <summary>
+        /// Gets <see cref="IRazorPage"/> instance that the views executes on.
+        /// </summary>
+        public IRazorPage RazorPage { get; }
+
+        /// <summary>
+        /// Gets the sequence of _ViewStart <see cref="IRazorPage"/> instances that are executed by this view.
+        /// </summary>
+        public IReadOnlyList<IRazorPage> ViewStartPages { get; }
+
+        /// <inheritdoc />
+        public virtual async Task RenderAsync(ViewContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            // This GetRequiredService call is by design. ViewBufferScope is a scoped service, RazorViewEngine
+            // is the component responsible for creating RazorViews and it is a Singleton service. It doesn't
+            // have access to the RequestServices so requiring the service when we render the page is the best
+            // we can do.
+            _bufferScope = context.HttpContext.RequestServices.GetRequiredService<IViewBufferScope>();
+            var bodyWriter = await RenderPageAsync(RazorPage, context, invokeViewStarts: true);
+            await RenderLayoutAsync(context, bodyWriter);
+        }
+
+        private async Task<ViewBufferTextWriter> RenderPageAsync(
+            IRazorPage page,
+            ViewContext context,
+            bool invokeViewStarts)
+        {
+            var writer = context.Writer as ViewBufferTextWriter;
+            if (writer == null)
+            {
+                Debug.Assert(_bufferScope != null);
+
+                // If we get here, this is likely the top-level page (not a partial) - this means
+                // that context.Writer is wrapping the output stream. We need to buffer, so create a buffered writer.
+                var buffer = new ViewBuffer(_bufferScope, page.Path, ViewBuffer.ViewPageSize);
+                writer = new ViewBufferTextWriter(buffer, context.Writer.Encoding, _htmlEncoder, context.Writer);
+            }
+            else
+            {
+                // This means we're writing something like a partial, where the output needs to be buffered.
+                // Create a new buffer, but without the ability to flush.
+                var buffer = new ViewBuffer(_bufferScope, page.Path, ViewBuffer.ViewPageSize);
+                writer = new ViewBufferTextWriter(buffer, context.Writer.Encoding);
+            }
+
+            // The writer for the body is passed through the ViewContext, allowing things like HtmlHelpers
+            // and ViewComponents to reference it.
+            var oldWriter = context.Writer;
+            var oldFilePath = context.ExecutingFilePath;
+
+            context.Writer = writer;
+            context.ExecutingFilePath = page.Path;
+
+            try
+            {
+                if (invokeViewStarts)
+                {
+                    // Execute view starts using the same context + writer as the page to render.
+                    await RenderViewStartsAsync(context);
+                }
+
+                await RenderPageCoreAsync(page, context);
+                return writer;
+            }
+            finally
+            {
+                context.Writer = oldWriter;
+                context.ExecutingFilePath = oldFilePath;
+            }
+        }
+
+        private async Task RenderPageCoreAsync(IRazorPage page, ViewContext context)
+        {
+            page.ViewContext = context;
+            _pageActivator.Activate(page, context);
+
+            _diagnosticSource.BeforeViewPage(page, context);
+
+            try
+            {
+                await page.ExecuteAsync();
+            }
+            finally
+            {
+                _diagnosticSource.AfterViewPage(page, context);
+            }
+        }
+
+        private async Task RenderViewStartsAsync(ViewContext context)
+        {
+            string layout = null;
+            var oldFilePath = context.ExecutingFilePath;
+            try
+            {
+                for (var i = 0; i < ViewStartPages.Count; i++)
+                {
+                    var viewStart = ViewStartPages[i];
+                    context.ExecutingFilePath = viewStart.Path;
+
+                    // If non-null, copy the layout value from the previous view start to the current. Otherwise leave
+                    // Layout default alone.
+                    if (layout != null)
+                    {
+                        viewStart.Layout = layout;
+                    }
+
+                    await RenderPageCoreAsync(viewStart, context);
+
+                    // Pass correct absolute path to next layout or the entry page if this view start set Layout to a
+                    // relative path.
+                    layout = _viewEngine.GetAbsolutePath(viewStart.Path, viewStart.Layout);
+                }
+            }
+            finally
+            {
+                context.ExecutingFilePath = oldFilePath;
+            }
+
+            // If non-null, copy the layout value from the view start page(s) to the entry page.
+            if (layout != null)
+            {
+                RazorPage.Layout = layout;
+            }
+        }
+
+        private async Task RenderLayoutAsync(
+            ViewContext context,
+            ViewBufferTextWriter bodyWriter)
+        {
+            // A layout page can specify another layout page. We'll need to continue
+            // looking for layout pages until they're no longer specified.
+            var previousPage = RazorPage;
+            var renderedLayouts = new List<IRazorPage>();
+
+            // This loop will execute Layout pages from the inside to the outside. With each
+            // iteration, bodyWriter is replaced with the aggregate of all the "body" content
+            // (including the layout page we just rendered).
+            while (!string.IsNullOrEmpty(previousPage.Layout))
+            {
+                if (!bodyWriter.IsBuffering)
+                {
+                    // Once a call to RazorPage.FlushAsync is made, we can no longer render Layout pages - content has
+                    // already been written to the client and the layout content would be appended rather than surround
+                    // the body content. Throwing this exception wouldn't return a 500 (since content has already been
+                    // written), but a diagnostic component should be able to capture it.
+
+                    var message = Resources.FormatLayoutCannotBeRendered(Path, nameof(Razor.RazorPage.FlushAsync));
+                    throw new InvalidOperationException(message);
+                }
+
+                var layoutPage = GetLayoutPage(context, previousPage.Path, previousPage.Layout);
+
+                if (renderedLayouts.Count > 0 &&
+                    renderedLayouts.Any(l => string.Equals(l.Path, layoutPage.Path, StringComparison.Ordinal)))
+                {
+                    // If the layout has been previously rendered as part of this view, we're potentially in a layout
+                    // rendering cycle.
+                    throw new InvalidOperationException(
+                        Resources.FormatLayoutHasCircularReference(previousPage.Path, layoutPage.Path));
+                }
+
+                // Notify the previous page that any writes that are performed on it are part of sections being written
+                // in the layout.
+                previousPage.IsLayoutBeingRendered = true;
+                layoutPage.PreviousSectionWriters = previousPage.SectionWriters;
+                layoutPage.BodyContent = bodyWriter.Buffer;
+                bodyWriter = await RenderPageAsync(layoutPage, context, invokeViewStarts: false);
+
+                renderedLayouts.Add(layoutPage);
+                previousPage = layoutPage;
+            }
+
+            // Now we've reached and rendered the outer-most layout page. Nothing left to execute.
+
+            // Ensure all defined sections were rendered or RenderBody was invoked for page without defined sections.
+            foreach (var layoutPage in renderedLayouts)
+            {
+                layoutPage.EnsureRenderedBodyOrSections();
+            }
+
+            if (bodyWriter.IsBuffering)
+            {
+                // If IsBuffering - then we've got a bunch of content in the view buffer. How to best deal with it
+                // really depends on whether or not we're writing directly to the output or if we're writing to
+                // another buffer.
+                var viewBufferTextWriter = context.Writer as ViewBufferTextWriter;
+                if (viewBufferTextWriter == null || !viewBufferTextWriter.IsBuffering)
+                {
+                    // This means we're writing to a 'real' writer, probably to the actual output stream.
+                    // We're using PagedBufferedTextWriter here to 'smooth' synchronous writes of IHtmlContent values.
+                    using (var writer = _bufferScope.CreateWriter(context.Writer))
+                    {
+                        await bodyWriter.Buffer.WriteToAsync(writer, _htmlEncoder);
+                    }
+                }
+                else
+                {
+                    // This means we're writing to another buffer. Use MoveTo to combine them.
+                    bodyWriter.Buffer.MoveTo(viewBufferTextWriter.Buffer);
+                }
+            }
+        }
+
+        private IRazorPage GetLayoutPage(ViewContext context, string executingFilePath, string layoutPath)
+        {
+            var layoutPageResult = _viewEngine.GetPage(executingFilePath, layoutPath);
+            var originalLocations = layoutPageResult.SearchedLocations;
+            if (layoutPageResult.Page == null)
+            {
+                layoutPageResult = _viewEngine.FindPage(context, layoutPath);
+            }
+
+            if (layoutPageResult.Page == null)
+            {
+                var locations = string.Empty;
+                if (originalLocations.Any())
+                {
+                    locations = Environment.NewLine + string.Join(Environment.NewLine, originalLocations);
+                }
+
+                if (layoutPageResult.SearchedLocations.Any())
+                {
+                    locations +=
+                        Environment.NewLine + string.Join(Environment.NewLine, layoutPageResult.SearchedLocations);
+                }
+
+                throw new InvalidOperationException(Resources.FormatLayoutCannotBeLocated(layoutPath, locations));
+            }
+
+            var layoutPage = layoutPageResult.Page;
+            return layoutPage;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngine.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngine.cs
new file mode 100644
index 0000000000..8d929fb883
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngine.cs
@@ -0,0 +1,520 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <summary>
+    /// Default implementation of <see cref="IRazorViewEngine"/>.
+    /// </summary>
+    /// <remarks>
+    /// For <c>ViewResults</c> returned from controllers, views should be located in
+    /// <see cref="RazorViewEngineOptions.ViewLocationFormats"/>
+    /// by default. For the controllers in an area, views should exist in
+    /// <see cref="RazorViewEngineOptions.AreaViewLocationFormats"/>.
+    /// </remarks>
+    public class RazorViewEngine : IRazorViewEngine
+    {
+        public static readonly string ViewExtension = ".cshtml";
+        private const string ViewStartFileName = "_ViewStart.cshtml";
+
+        private const string AreaKey = "area";
+        private const string ControllerKey = "controller";
+        private const string PageKey = "page";
+
+        private static readonly TimeSpan _cacheExpirationDuration = TimeSpan.FromMinutes(20);
+
+        private readonly IRazorPageFactoryProvider _pageFactory;
+        private readonly IRazorPageActivator _pageActivator;
+        private readonly HtmlEncoder _htmlEncoder;
+        private readonly ILogger _logger;
+        private readonly RazorViewEngineOptions _options;
+        private readonly RazorProject _razorFileSystem;
+        private readonly DiagnosticSource _diagnosticSource;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RazorViewEngine" />.
+        /// </summary>
+        [Obsolete("This constructor is obsolete and will be removed in a future version.")]
+        public RazorViewEngine(
+            IRazorPageFactoryProvider pageFactory,
+            IRazorPageActivator pageActivator,
+            HtmlEncoder htmlEncoder,
+            IOptions<RazorViewEngineOptions> optionsAccessor,
+            RazorProject razorProject,
+            ILoggerFactory loggerFactory,
+            DiagnosticSource diagnosticSource)
+        {
+            _options = optionsAccessor.Value;
+
+            if (_options.ViewLocationFormats.Count == 0)
+            {
+                throw new ArgumentException(
+                    Resources.FormatViewLocationFormatsIsRequired(nameof(RazorViewEngineOptions.ViewLocationFormats)),
+                    nameof(optionsAccessor));
+            }
+
+            if (_options.AreaViewLocationFormats.Count == 0)
+            {
+                throw new ArgumentException(
+                    Resources.FormatViewLocationFormatsIsRequired(nameof(RazorViewEngineOptions.AreaViewLocationFormats)),
+                    nameof(optionsAccessor));
+            }
+
+            _pageFactory = pageFactory;
+            _pageActivator = pageActivator;
+            _htmlEncoder = htmlEncoder;
+            _logger = loggerFactory.CreateLogger<RazorViewEngine>();
+            _razorFileSystem = razorProject;
+            _diagnosticSource = diagnosticSource;
+            ViewLookupCache = new MemoryCache(new MemoryCacheOptions());
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the RazorViewEngine
+        /// </summary>
+        public RazorViewEngine(
+            IRazorPageFactoryProvider pageFactory,
+            IRazorPageActivator pageActivator,
+            HtmlEncoder htmlEncoder,
+            IOptions<RazorViewEngineOptions> optionsAccessor,
+            RazorProjectFileSystem razorFileSystem,
+            ILoggerFactory loggerFactory,
+            DiagnosticSource diagnosticSource)
+#pragma warning disable CS0618 // Type or member is obsolete
+            : this (pageFactory, pageActivator, htmlEncoder, optionsAccessor, (RazorProject)razorFileSystem, loggerFactory, diagnosticSource)
+#pragma warning restore CS0618 // Type or member is obsolete
+        {
+        }
+
+        /// <summary>
+        /// A cache for results of view lookups.
+        /// </summary>
+        protected IMemoryCache ViewLookupCache { get; }
+
+        /// <summary>
+        /// Gets the case-normalized route value for the specified route <paramref name="key"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ActionContext"/>.</param>
+        /// <param name="key">The route key to lookup.</param>
+        /// <returns>The value corresponding to the key.</returns>
+        /// <remarks>
+        /// The casing of a route value in <see cref="ActionContext.RouteData"/> is determined by the client.
+        /// This making constructing paths for view locations in a case sensitive file system unreliable. Using the
+        /// <see cref="Abstractions.ActionDescriptor.RouteValues"/> to get route values
+        /// produces consistently cased results.
+        /// </remarks>
+        public static string GetNormalizedRouteValue(ActionContext context, string key)
+            => NormalizedRouteValue.GetNormalizedRouteValue(context, key);
+
+        /// <inheritdoc />
+        public RazorPageResult FindPage(ActionContext context, string pageName)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (string.IsNullOrEmpty(pageName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(pageName));
+            }
+
+            if (IsApplicationRelativePath(pageName) || IsRelativePath(pageName))
+            {
+                // A path; not a name this method can handle.
+                return new RazorPageResult(pageName, Enumerable.Empty<string>());
+            }
+
+            var cacheResult = LocatePageFromViewLocations(context, pageName, isMainPage: false);
+            if (cacheResult.Success)
+            {
+                var razorPage = cacheResult.ViewEntry.PageFactory();
+                return new RazorPageResult(pageName, razorPage);
+            }
+            else
+            {
+                return new RazorPageResult(pageName, cacheResult.SearchedLocations);
+            }
+        }
+
+        /// <inheritdoc />
+        public RazorPageResult GetPage(string executingFilePath, string pagePath)
+        {
+            if (string.IsNullOrEmpty(pagePath))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(pagePath));
+            }
+
+            if (!(IsApplicationRelativePath(pagePath) || IsRelativePath(pagePath)))
+            {
+                // Not a path this method can handle.
+                return new RazorPageResult(pagePath, Enumerable.Empty<string>());
+            }
+
+            var cacheResult = LocatePageFromPath(executingFilePath, pagePath, isMainPage: false);
+            if (cacheResult.Success)
+            {
+                var razorPage = cacheResult.ViewEntry.PageFactory();
+                return new RazorPageResult(pagePath, razorPage);
+            }
+            else
+            {
+                return new RazorPageResult(pagePath, cacheResult.SearchedLocations);
+            }
+        }
+
+        /// <inheritdoc />
+        public ViewEngineResult FindView(ActionContext context, string viewName, bool isMainPage)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (string.IsNullOrEmpty(viewName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(viewName));
+            }
+
+            if (IsApplicationRelativePath(viewName) || IsRelativePath(viewName))
+            {
+                // A path; not a name this method can handle.
+                return ViewEngineResult.NotFound(viewName, Enumerable.Empty<string>());
+            }
+
+            var cacheResult = LocatePageFromViewLocations(context, viewName, isMainPage);
+            return CreateViewEngineResult(cacheResult, viewName);
+        }
+
+        /// <inheritdoc />
+        public ViewEngineResult GetView(string executingFilePath, string viewPath, bool isMainPage)
+        {
+            if (string.IsNullOrEmpty(viewPath))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(viewPath));
+            }
+
+            if (!(IsApplicationRelativePath(viewPath) || IsRelativePath(viewPath)))
+            {
+                // Not a path this method can handle.
+                return ViewEngineResult.NotFound(viewPath, Enumerable.Empty<string>());
+            }
+
+            var cacheResult = LocatePageFromPath(executingFilePath, viewPath, isMainPage);
+            return CreateViewEngineResult(cacheResult, viewPath);
+        }
+
+        private ViewLocationCacheResult LocatePageFromPath(string executingFilePath, string pagePath, bool isMainPage)
+        {
+            var applicationRelativePath = GetAbsolutePath(executingFilePath, pagePath);
+            var cacheKey = new ViewLocationCacheKey(applicationRelativePath, isMainPage);
+            if (!ViewLookupCache.TryGetValue(cacheKey, out ViewLocationCacheResult cacheResult))
+            {
+                var expirationTokens = new HashSet<IChangeToken>();
+                cacheResult = CreateCacheResult(expirationTokens, applicationRelativePath, isMainPage);
+
+                var cacheEntryOptions = new MemoryCacheEntryOptions();
+                cacheEntryOptions.SetSlidingExpiration(_cacheExpirationDuration);
+                foreach (var expirationToken in expirationTokens)
+                {
+                    cacheEntryOptions.AddExpirationToken(expirationToken);
+                }
+
+                // No views were found at the specified location. Create a not found result.
+                if (cacheResult == null)
+                {
+                    cacheResult = new ViewLocationCacheResult(new[] { applicationRelativePath });
+                }
+
+                cacheResult = ViewLookupCache.Set(
+                    cacheKey,
+                    cacheResult,
+                    cacheEntryOptions);
+            }
+
+            return cacheResult;
+        }
+
+        private ViewLocationCacheResult LocatePageFromViewLocations(
+            ActionContext actionContext,
+            string pageName,
+            bool isMainPage)
+        {
+            var controllerName = GetNormalizedRouteValue(actionContext, ControllerKey);
+            var areaName = GetNormalizedRouteValue(actionContext, AreaKey);
+            string razorPageName = null;
+            if (actionContext.ActionDescriptor.RouteValues.ContainsKey(PageKey))
+            {
+                // Only calculate the Razor Page name if "page" is registered in RouteValues.
+                razorPageName = GetNormalizedRouteValue(actionContext, PageKey);
+            }
+
+            var expanderContext = new ViewLocationExpanderContext(
+                actionContext,
+                pageName,
+                controllerName,
+                areaName,
+                razorPageName,
+                isMainPage);
+            Dictionary<string, string> expanderValues = null;
+
+            if (_options.ViewLocationExpanders.Count > 0)
+            {
+                expanderValues = new Dictionary<string, string>(StringComparer.Ordinal);
+                expanderContext.Values = expanderValues;
+
+                // Perf: Avoid allocations
+                for (var i = 0; i < _options.ViewLocationExpanders.Count; i++)
+                {
+                    _options.ViewLocationExpanders[i].PopulateValues(expanderContext);
+                }
+            }
+
+            var cacheKey = new ViewLocationCacheKey(
+                expanderContext.ViewName,
+                expanderContext.ControllerName,
+                expanderContext.AreaName,
+                expanderContext.PageName,
+                expanderContext.IsMainPage,
+                expanderValues);
+
+            if (!ViewLookupCache.TryGetValue(cacheKey, out ViewLocationCacheResult cacheResult))
+            {
+                _logger.ViewLookupCacheMiss(cacheKey.ViewName, cacheKey.ControllerName);
+                cacheResult = OnCacheMiss(expanderContext, cacheKey);
+            }
+            else
+            {
+                _logger.ViewLookupCacheHit(cacheKey.ViewName, cacheKey.ControllerName);
+            }
+
+            return cacheResult;
+        }
+
+        /// <inheritdoc />
+        public string GetAbsolutePath(string executingFilePath, string pagePath)
+        {
+            if (string.IsNullOrEmpty(pagePath))
+            {
+                // Path is not valid; no change required.
+                return pagePath;
+            }
+
+            if (IsApplicationRelativePath(pagePath))
+            {
+                // An absolute path already; no change required.
+                return pagePath;
+            }
+
+            if (!IsRelativePath(pagePath))
+            {
+                // A page name; no change required.
+                return pagePath;
+            }
+
+            if (string.IsNullOrEmpty(executingFilePath))
+            {
+                // Given a relative path i.e. not yet application-relative (starting with "~/" or "/"), interpret
+                // path relative to currently-executing view, if any.
+                // Not yet executing a view. Start in app root.
+                var absolutePath = "/" + pagePath;
+                return ViewEnginePath.ResolvePath(absolutePath);
+            }
+
+            return ViewEnginePath.CombinePath(executingFilePath, pagePath);
+        }
+
+        // internal for tests
+        internal IEnumerable<string> GetViewLocationFormats(ViewLocationExpanderContext context)
+        {
+            if (!string.IsNullOrEmpty(context.AreaName) &&
+                !string.IsNullOrEmpty(context.ControllerName))
+            {
+                return _options.AreaViewLocationFormats;
+            }
+            else if (!string.IsNullOrEmpty(context.ControllerName))
+            {
+                return _options.ViewLocationFormats;
+            }
+            else if (!string.IsNullOrEmpty(context.AreaName) &&
+                !string.IsNullOrEmpty(context.PageName))
+            {
+                return _options.AreaPageViewLocationFormats;
+            }
+            else if (!string.IsNullOrEmpty(context.PageName))
+            {
+                return _options.PageViewLocationFormats;
+            }
+            else
+            {
+                // If we don't match one of these conditions, we'll just treat it like regular controller/action
+                // and use those search paths. This is what we did in 1.0.0 without giving much thought to it.
+                return _options.ViewLocationFormats;
+            }
+        }
+
+        private ViewLocationCacheResult OnCacheMiss(
+            ViewLocationExpanderContext expanderContext,
+            ViewLocationCacheKey cacheKey)
+        {
+            var viewLocations = GetViewLocationFormats(expanderContext);
+
+            for (var i = 0; i < _options.ViewLocationExpanders.Count; i++)
+            {
+                viewLocations = _options.ViewLocationExpanders[i].ExpandViewLocations(expanderContext, viewLocations);
+            }
+
+            ViewLocationCacheResult cacheResult = null;
+            var searchedLocations = new List<string>();
+            var expirationTokens = new HashSet<IChangeToken>();
+            foreach (var location in viewLocations)
+            {
+                var path = string.Format(
+                    CultureInfo.InvariantCulture,
+                    location,
+                    expanderContext.ViewName,
+                    expanderContext.ControllerName,
+                    expanderContext.AreaName);
+
+                path = ViewEnginePath.ResolvePath(path);
+
+                cacheResult = CreateCacheResult(expirationTokens, path, expanderContext.IsMainPage);
+                if (cacheResult != null)
+                {
+                    break;
+                }
+
+                searchedLocations.Add(path);
+            }
+
+            // No views were found at the specified location. Create a not found result.
+            if (cacheResult == null)
+            {
+                cacheResult = new ViewLocationCacheResult(searchedLocations);
+            }
+
+            var cacheEntryOptions = new MemoryCacheEntryOptions();
+            cacheEntryOptions.SetSlidingExpiration(_cacheExpirationDuration);
+            foreach (var expirationToken in expirationTokens)
+            {
+                cacheEntryOptions.AddExpirationToken(expirationToken);
+            }
+
+            return ViewLookupCache.Set(cacheKey, cacheResult, cacheEntryOptions);
+        }
+
+        // Internal for unit testing
+        internal ViewLocationCacheResult CreateCacheResult(
+            HashSet<IChangeToken> expirationTokens,
+            string relativePath,
+            bool isMainPage)
+        {
+            var factoryResult = _pageFactory.CreateFactory(relativePath);
+            var viewDescriptor = factoryResult.ViewDescriptor;
+            if (viewDescriptor?.ExpirationTokens != null)
+            {
+                for (var i = 0; i < viewDescriptor.ExpirationTokens.Count; i++)
+                {
+                    expirationTokens.Add(viewDescriptor.ExpirationTokens[i]);
+                }
+            }
+
+            if (factoryResult.Success)
+            {
+                // Only need to lookup _ViewStarts for the main page.
+                var viewStartPages = isMainPage ?
+                    GetViewStartPages(viewDescriptor.RelativePath, expirationTokens) :
+                    Array.Empty<ViewLocationCacheItem>();
+                if (viewDescriptor.IsPrecompiled)
+                {
+                    _logger.PrecompiledViewFound(relativePath);
+                }
+
+                return new ViewLocationCacheResult(
+                    new ViewLocationCacheItem(factoryResult.RazorPageFactory, relativePath),
+                    viewStartPages);
+            }
+
+            return null;
+        }
+
+        private IReadOnlyList<ViewLocationCacheItem> GetViewStartPages(
+            string path,
+            HashSet<IChangeToken> expirationTokens)
+        {
+            var viewStartPages = new List<ViewLocationCacheItem>();
+
+            foreach (var viewStartProjectItem in _razorFileSystem.FindHierarchicalItems(path, ViewStartFileName))
+            {
+                var result = _pageFactory.CreateFactory(viewStartProjectItem.FilePath);
+                var viewDescriptor = result.ViewDescriptor;
+                if (viewDescriptor?.ExpirationTokens != null)
+                {
+                    for (var i = 0; i < viewDescriptor.ExpirationTokens.Count; i++)
+                    {
+                        expirationTokens.Add(viewDescriptor.ExpirationTokens[i]);
+                    }
+                }
+
+                if (result.Success)
+                {
+                    // Populate the viewStartPages list so that _ViewStarts appear in the order the need to be
+                    // executed (closest last, furthest first). This is the reverse order in which
+                    // ViewHierarchyUtility.GetViewStartLocations returns _ViewStarts.
+                    viewStartPages.Insert(0, new ViewLocationCacheItem(result.RazorPageFactory, viewStartProjectItem.FilePath));
+                }
+            }
+
+            return viewStartPages;
+        }
+
+        private ViewEngineResult CreateViewEngineResult(ViewLocationCacheResult result, string viewName)
+        {
+            if (!result.Success)
+            {
+                return ViewEngineResult.NotFound(viewName, result.SearchedLocations);
+            }
+
+            var page = result.ViewEntry.PageFactory();
+
+            var viewStarts = new IRazorPage[result.ViewStartEntries.Count];
+            for (var i = 0; i < viewStarts.Length; i++)
+            {
+                var viewStartItem = result.ViewStartEntries[i];
+                viewStarts[i] = viewStartItem.PageFactory();
+            }
+
+            var view = new RazorView(this, _pageActivator, viewStarts, page, _htmlEncoder, _diagnosticSource);
+            return ViewEngineResult.Found(viewName, view);
+        }
+
+        private static bool IsApplicationRelativePath(string name)
+        {
+            Debug.Assert(!string.IsNullOrEmpty(name));
+            return name[0] == '~' || name[0] == '/';
+        }
+
+        private static bool IsRelativePath(string name)
+        {
+            Debug.Assert(!string.IsNullOrEmpty(name));
+
+            // Though ./ViewName looks like a relative path, framework searches for that view using view locations.
+            return name.EndsWith(ViewExtension, StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngineOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngineOptions.cs
new file mode 100644
index 0000000000..532c924d32
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngineOptions.cs
@@ -0,0 +1,183 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.CodeAnalysis;
+using Microsoft.Extensions.FileProviders;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <summary>
+    /// Provides programmatic configuration for the <see cref="RazorViewEngine"/>.
+    /// </summary>
+    public class RazorViewEngineOptions
+    {
+        private Action<RoslynCompilationContext> _compilationCallback = c => { };
+
+        /// <summary>
+        /// Gets a <see cref="IList{IViewLocationExpander}"/> used by the <see cref="RazorViewEngine"/>.
+        /// </summary>
+        public IList<IViewLocationExpander> ViewLocationExpanders { get; } = new List<IViewLocationExpander>();
+
+        /// <summary>
+        /// Gets the sequence of <see cref="IFileProvider" /> instances used by <see cref="RazorViewEngine"/> to
+        /// locate Razor files.
+        /// </summary>
+        /// <remarks>
+        /// At startup, this is initialized to include an instance of
+        /// <see cref="IHostingEnvironment.ContentRootFileProvider"/> that is rooted at the application root.
+        /// </remarks>
+        public IList<IFileProvider> FileProviders { get; } = new List<IFileProvider>();
+
+        /// <summary>
+        /// Gets the locations where <see cref="RazorViewEngine"/> will search for views.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// The locations of the views returned from controllers that do not belong to an area.
+        /// Locations are format strings (see https://msdn.microsoft.com/en-us/library/txafckwd.aspx) which may contain
+        /// the following format items:
+        /// </para>
+        /// <list type="bullet">
+        /// <item>
+        /// <description>{0} - Action Name</description>
+        /// </item>
+        /// <item>
+        /// <description>{1} - Controller Name</description>
+        /// </item>
+        /// </list>
+        /// <para>
+        /// The values for these locations are case-sensitive on case-sensitive file systems.
+        /// For example, the view for the <c>Test</c> action of <c>HomeController</c> should be located at
+        /// <c>/Views/Home/Test.cshtml</c>. Locations such as <c>/views/home/test.cshtml</c> would not be discovered.
+        /// </para>
+        /// </remarks>
+        public IList<string> ViewLocationFormats { get; } = new List<string>();
+
+        /// <summary>
+        /// Gets the locations where <see cref="RazorViewEngine"/> will search for views within an
+        /// area.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// The locations of the views returned from controllers that belong to an area.
+        /// Locations are format strings (see https://msdn.microsoft.com/en-us/library/txafckwd.aspx) which may contain
+        /// the following format items:
+        /// </para>
+        /// <list type="bullet">
+        /// <item>
+        /// <description>{0} - Action Name</description>
+        /// </item>
+        /// <item>
+        /// <description>{1} - Controller Name</description>
+        /// </item>
+        /// <item>
+        /// <description>{2} - Area Name</description>
+        /// </item>
+        /// </list>
+        /// <para>
+        /// The values for these locations are case-sensitive on case-sensitive file systems.
+        /// For example, the view for the <c>Test</c> action of <c>HomeController</c> under <c>Admin</c> area should
+        /// be located at <c>/Areas/Admin/Views/Home/Test.cshtml</c>.
+        /// Locations such as <c>/areas/admin/views/home/test.cshtml</c> would not be discovered.
+        /// </para>
+        /// </remarks>
+        public IList<string> AreaViewLocationFormats { get; } = new List<string>();
+
+        /// <summary>
+        /// Gets the locations where <see cref="RazorViewEngine"/> will search for views (such as layouts and partials)
+        /// when searched from the context of rendering a Razor Page.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Locations are format strings (see https://msdn.microsoft.com/en-us/library/txafckwd.aspx) which may contain
+        /// the following format items:
+        /// </para>
+        /// <list type="bullet">
+        /// <item>
+        /// <description>{0} - View Name</description>
+        /// </item>
+        /// <item>
+        /// <description>{1} - Page Name</description>
+        /// </item>
+        /// </list>
+        /// <para>
+        /// <see cref="PageViewLocationFormats"/> work in tandem with a view location expander to perform hierarchical
+        /// path lookups. For instance, given a Page like /Account/Manage/Index using /Pages as the root, the view engine
+        /// will search for views in the following locations:
+        ///
+        ///  /Pages/Account/Manage/{0}.cshtml
+        ///  /Pages/Account/{0}.cshtml
+        ///  /Pages/{0}.cshtml
+        ///  /Pages/Shared/{0}.cshtml
+        ///  /Views/Shared/{0}.cshtml
+        /// </para>
+        /// </remarks>
+        public IList<string> PageViewLocationFormats { get; } = new List<string>();
+
+        /// <summary>
+        /// Gets the locations where <see cref="RazorViewEngine"/> will search for views (such as layouts and partials)
+        /// when searched from the context of rendering a Razor Page within an area.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Locations are format strings (see https://msdn.microsoft.com/en-us/library/txafckwd.aspx) which may contain
+        /// the following format items:
+        /// </para>
+        /// <list type="bullet">
+        /// <item>
+        /// <description>{0} - View Name</description>
+        /// </item>
+        /// <item>
+        /// <description>{1} - Page Name</description>
+        /// </item>
+        /// <item>
+        /// <description>{2} - Area Name</description>
+        /// </item>
+        /// </list>
+        /// <para>
+        /// <see cref="AreaPageViewLocationFormats"/> work in tandem with a view location expander to perform hierarchical
+        /// path lookups. For instance, given a Page like /Areas/Account/Pages/Manage/User.cshtml using /Areas as the area pages root and
+        /// /Pages as the root, the view engine will search for views in the following locations:
+        ///
+        ///  /Areas/Accounts/Pages/Manage/{0}.cshtml
+        ///  /Areas/Accounts/Pages/{0}.cshtml
+        ///  /Areas/Accounts/Pages/Shared/{0}.cshtml
+        ///  /Areas/Accounts/Views/Shared/{0}.cshtml
+        ///  /Pages/Shared/{0}.cshtml
+        ///  /Views/Shared/{0}.cshtml
+        /// </para>
+        /// </remarks>
+        public IList<string> AreaPageViewLocationFormats { get; } = new List<string>();
+
+        /// <summary>
+        /// Gets the <see cref="MetadataReference" /> instances that should be included in Razor compilation, along with
+        /// those discovered by <see cref="MetadataReferenceFeatureProvider" />s.
+        /// </summary>
+        public IList<MetadataReference> AdditionalCompilationReferences { get; } = new List<MetadataReference>();
+
+        /// <summary>
+        /// Gets or sets the callback that is used to customize Razor compilation
+        /// to change compilation settings you can update <see cref="RoslynCompilationContext.Compilation"/> property.
+        /// </summary>
+        /// <remarks>
+        /// Customizations made here would not reflect in tooling (Intellisense).
+        /// </remarks>
+        public Action<RoslynCompilationContext> CompilationCallback
+        {
+            get => _compilationCallback;
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _compilationCallback = value;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs
new file mode 100644
index 0000000000..ecdce26f06
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs
@@ -0,0 +1,9 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public delegate Task RenderAsyncDelegate();
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Resources.resx
new file mode 100644
index 0000000000..19b0e8f053
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Resources.resx
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ArgumentCannotBeNullOrEmpty" xml:space="preserve">
+    <value>Value cannot be null or empty.</value>
+  </data>
+  <data name="CompilationFailed" xml:space="preserve">
+    <value>One or more compilation failures occurred:</value>
+  </data>
+  <data name="FlushPointCannotBeInvoked" xml:space="preserve">
+    <value>'{0}' cannot be invoked when a Layout page is set to be executed.</value>
+  </data>
+  <data name="LayoutCannotBeLocated" xml:space="preserve">
+    <value>The layout view '{0}' could not be located. The following locations were searched:{1}</value>
+  </data>
+  <data name="LayoutCannotBeRendered" xml:space="preserve">
+    <value>Layout page '{0}' cannot be rendered after '{1}' has been invoked.</value>
+  </data>
+  <data name="RazorPage_ThereIsNoActiveWritingScopeToEnd" xml:space="preserve">
+    <value>There is no active writing scope to end.</value>
+  </data>
+  <data name="RazorPage_CannotFlushWhileInAWritingScope" xml:space="preserve">
+    <value>The {0} operation cannot be performed while inside a writing scope in '{1}'.</value>
+  </data>
+  <data name="RazorPage_MethodCannotBeCalled" xml:space="preserve">
+    <value>{0} invocation in '{1}' is invalid. {0} can only be called from a layout page.</value>
+  </data>
+  <data name="RenderBodyNotCalled" xml:space="preserve">
+    <value>{0} has not been called for the page at '{1}'. To ignore call {2}().</value>
+  </data>
+  <data name="SectionAlreadyDefined" xml:space="preserve">
+    <value>Section '{0}' is already defined.</value>
+  </data>
+  <data name="SectionAlreadyRendered" xml:space="preserve">
+    <value>{0} invocation in '{1}' is invalid. The section '{2}' has already been rendered.</value>
+  </data>
+  <data name="SectionNotDefined" xml:space="preserve">
+    <value>The layout page '{0}' cannot find the section '{1}' in the content page '{2}'.</value>
+  </data>
+  <data name="SectionsNotRendered" xml:space="preserve">
+    <value>The following sections have been defined but have not been rendered by the page at '{0}': '{1}'. To ignore an unrendered section call {2}("sectionName").</value>
+  </data>
+  <data name="ViewContextMustBeSet" xml:space="preserve">
+    <value>'{0} must be set to access '{1}'.</value>
+  </data>
+  <data name="GeneratedCodeFileName" xml:space="preserve">
+    <value>Generated Code</value>
+  </data>
+  <data name="RazorPage_InvalidTagHelperIndexerAssignment" xml:space="preserve">
+    <value>Unable to perform '{0}' assignment. Tag helper property '{1}.{2}' must not be null.</value>
+  </data>
+  <data name="CouldNotResolveApplicationRelativeUrl_TagHelper" xml:space="preserve">
+    <value>Unexpected return value from '{1}.{2}' for URL '{0}'. If the '{1}' service has been overridden, change '{2}' to replace only the '~/' prefix. Otherwise, add the following directive to the Razor page to disable URL resolution relative to the application's 'webroot' setting:
+
+@{3} "{4}, {5}"</value>
+  </data>
+  <data name="LayoutHasCircularReference" xml:space="preserve">
+    <value>A circular layout reference was detected when rendering '{0}'. The layout page '{1}' has already been rendered.</value>
+  </data>
+  <data name="Compilation_DependencyContextIsNotSpecified" xml:space="preserve">
+    <value>One or more compilation references are missing. Ensure that your project is referencing '{0}' and the '{1}' property is not set to false.</value>
+  </data>
+  <data name="ViewLocationFormatsIsRequired" xml:space="preserve">
+    <value>'{0}' cannot be empty. These locations are required to locate a view for rendering.</value>
+  </data>
+  <data name="RazorPage_NestingAttributeWritingScopesNotSupported" xml:space="preserve">
+    <value>Nesting of TagHelper attribute writing scopes is not supported.</value>
+  </data>
+  <data name="FileProvidersAreRequired" xml:space="preserve">
+    <value>'{0}.{1}' must not be empty. At least one '{2}' is required to locate a view for rendering.</value>
+  </data>
+  <data name="RazorProject_PathMustStartWithForwardSlash" xml:space="preserve">
+    <value>Path must begin with a forward slash '/'.</value>
+  </data>
+  <data name="PropertyMustBeSet" xml:space="preserve">
+    <value>The property '{0}' of '{1}' must not be null.</value>
+  </data>
+  <data name="RazorViewCompiler_ViewPathsDifferOnlyInCase" xml:space="preserve">
+    <value>The following precompiled view paths differ only in case, which is not supported:</value>
+  </data>
+  <data name="UnsupportedDebugInformationFormat" xml:space="preserve">
+    <value>The debug type specified in the dependency context could be parsed. The debug type value '{0}' is not supported.</value>
+  </data>
+  <data name="CompiledViewDescriptor_NoData" xml:space="preserve">
+    <value>At least one of the '{0}' or '{1}' values must be non-null.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelperInitializerOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelperInitializerOfT.cs
new file mode 100644
index 0000000000..94d37f2dd8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelperInitializerOfT.cs
@@ -0,0 +1,46 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <inheritdoc />
+    public class TagHelperInitializer<TTagHelper> : ITagHelperInitializer<TTagHelper>
+        where TTagHelper : ITagHelper
+    {
+        private readonly Action<TTagHelper, ViewContext> _initializeDelegate;
+
+        /// <summary>
+        /// Creates a <see cref="TagHelperInitializer{TTagHelper}"/>.
+        /// </summary>
+        /// <param name="action">The initialization delegate.</param>
+        public TagHelperInitializer(Action<TTagHelper, ViewContext> action)
+        {
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            _initializeDelegate = action;
+        }
+
+        /// <inheritdoc />
+        public void Initialize(TTagHelper helper, ViewContext context)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            _initializeDelegate(helper, context);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/BodyTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/BodyTagHelper.cs
new file mode 100644
index 0000000000..111c67a0ab
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/BodyTagHelper.cs
@@ -0,0 +1,28 @@
+// 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.
+
+using System.ComponentModel;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers
+{
+    /// <summary>
+    /// A <see cref="TagHelperComponentTagHelper"/> targeting the &lt;body&gt; HTML element.
+    /// </summary>
+    [HtmlTargetElement("body")]
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public class BodyTagHelper : TagHelperComponentTagHelper
+    {
+        /// <summary>
+        /// Creates a new <see cref="BodyTagHelper"/>.
+        /// </summary>
+        /// <param name="manager">The <see cref="ITagHelperComponentManager"/> which contains the collection
+        /// of <see cref="ITagHelperComponent"/>s.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public BodyTagHelper(ITagHelperComponentManager manager, ILoggerFactory loggerFactory)
+            : base(manager, loggerFactory)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/HeadTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/HeadTagHelper.cs
new file mode 100644
index 0000000000..131b89c6ba
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/HeadTagHelper.cs
@@ -0,0 +1,28 @@
+// 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.
+
+using System.ComponentModel;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers
+{
+    /// <summary>
+    /// A <see cref="TagHelperComponentTagHelper"/> targeting the &lt;head&gt; HTML element.
+    /// </summary>
+    [HtmlTargetElement("head")]
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public class HeadTagHelper : TagHelperComponentTagHelper
+    {
+        /// <summary>
+        /// Creates a new <see cref="HeadTagHelper"/>.
+        /// </summary>
+        /// <param name="manager">The <see cref="ITagHelperComponentManager"/> which contains the collection
+        /// of <see cref="ITagHelperComponent"/>s.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public HeadTagHelper(ITagHelperComponentManager manager, ILoggerFactory loggerFactory)
+            : base(manager, loggerFactory)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/ITagHelperComponentManager.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/ITagHelperComponentManager.cs
new file mode 100644
index 0000000000..813372d558
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/ITagHelperComponentManager.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers
+{
+    /// <summary>
+    /// An implementation of this interface provides the collection of <see cref="ITagHelperComponent"/>s
+    /// that will be used by <see cref="TagHelperComponentTagHelper"/>s.
+    /// </summary>
+    public interface ITagHelperComponentManager
+    {
+        /// <summary>
+        /// Gets the collection of <see cref="ITagHelperComponent"/>s that will be used by
+        /// <see cref="TagHelperComponentTagHelper"/>s.
+        /// </summary>
+        ICollection<ITagHelperComponent> Components { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/ITagHelperComponentPropertyActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/ITagHelperComponentPropertyActivator.cs
new file mode 100644
index 0000000000..f502fd90c3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/ITagHelperComponentPropertyActivator.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers
+{
+    /// <summary>
+    /// Provides methods to activate properties of <see cref="ITagHelperComponent"/>s.
+    /// </summary>
+    public interface ITagHelperComponentPropertyActivator
+    {
+        /// <summary>
+        /// Activates properties of the <paramref name="tagHelperComponent"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ViewContext"/> for the executing view.</param>
+        /// <param name="tagHelperComponent">The <see cref="ITagHelperComponent"/> to activate properties of.</param>
+        void Activate(ViewContext context, ITagHelperComponent tagHelperComponent);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentPropertyActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentPropertyActivator.cs
new file mode 100644
index 0000000000..7da3e3ee4d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentPropertyActivator.cs
@@ -0,0 +1,60 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers
+{
+    /// <summary>
+    /// Default implementation of <see cref="ITagHelperComponentPropertyActivator"/>.
+    /// </summary>
+    internal class TagHelperComponentPropertyActivator : ITagHelperComponentPropertyActivator
+    {
+        private readonly ConcurrentDictionary<Type, PropertyActivator<ViewContext>[]> _propertiesToActivate;
+        private readonly Func<Type, PropertyActivator<ViewContext>[]> _getPropertiesToActivate = GetPropertiesToActivate;
+        private static readonly Func<PropertyInfo, PropertyActivator<ViewContext>> _createActivateInfo = CreateActivateInfo;
+
+        public TagHelperComponentPropertyActivator()
+        {
+            _propertiesToActivate = new ConcurrentDictionary<Type, PropertyActivator<ViewContext>[]>();
+        }
+
+        /// <inheritdoc />
+        public void Activate(ViewContext context, ITagHelperComponent tagHelperComponent)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var propertiesToActivate = _propertiesToActivate.GetOrAdd(
+                tagHelperComponent.GetType(),
+                _getPropertiesToActivate);
+
+            for (var i = 0; i < propertiesToActivate.Length; i++)
+            {
+                var activateInfo = propertiesToActivate[i];
+                activateInfo.Activate(tagHelperComponent, context);
+            }
+        }
+
+        private static PropertyActivator<ViewContext> CreateActivateInfo(PropertyInfo property)
+        {
+            return new PropertyActivator<ViewContext>(property, viewContext => viewContext);
+        }
+
+        private static PropertyActivator<ViewContext>[] GetPropertiesToActivate(Type type)
+        {
+            return PropertyActivator<ViewContext>.GetPropertiesToActivate(
+                type,
+                typeof(ViewContextAttribute),
+                _createActivateInfo);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentTagHelper.cs
new file mode 100644
index 0000000000..ddf68268bd
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentTagHelper.cs
@@ -0,0 +1,97 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers
+{
+    /// <summary>
+    /// Initializes and processes the <see cref="ITagHelperComponent"/>s added to the 
+    /// <see cref="ITagHelperComponentManager.Components"/> in the specified order.
+    /// </summary>
+    public abstract class TagHelperComponentTagHelper : TagHelper
+    {
+        private readonly ILogger _logger;
+        private readonly IEnumerable<ITagHelperComponent> _components;
+
+        /// <summary>
+        /// Creates a new <see cref="TagHelperComponentTagHelper"/> and orders the 
+        /// the collection of <see cref="ITagHelperComponent"/>s in <see cref="ITagHelperComponentManager.Components"/>.
+        /// </summary>
+        /// <param name="manager">The <see cref="ITagHelperComponentManager"/> which contains the collection
+        /// of <see cref="ITagHelperComponent"/>s.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        /// <remarks>The <see cref="ITagHelperComponentManager.Components"/> are ordered after the 
+        /// creation of the <see cref="ITagHelperComponentManager"/> to position the <see cref="ITagHelperComponent"/>s
+        /// added from controllers and views correctly.</remarks>
+        public TagHelperComponentTagHelper(
+            ITagHelperComponentManager manager,
+            ILoggerFactory loggerFactory)
+        {
+            if (manager == null)
+            {
+                throw new ArgumentNullException(nameof(manager));
+            }
+
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            _components = manager.Components.OrderBy(p => p.Order).ToArray();
+            _logger = loggerFactory.CreateLogger(GetType());
+        }
+
+        /// <summary>
+        /// Activates the <see cref="ViewContext"/> property of all the <see cref="ITagHelperComponentManager.Components"/>.
+        /// </summary>
+        [HtmlAttributeNotBound]
+        public ITagHelperComponentPropertyActivator PropertyActivator { get; set; }
+
+        [ViewContext]
+        [HtmlAttributeNotBound]
+        public ViewContext ViewContext { get; set; }
+
+        /// <inheritdoc />
+        public override void Init(TagHelperContext context)
+        {
+            if (PropertyActivator == null)
+            {
+                var serviceProvider = ViewContext.HttpContext.RequestServices;
+                PropertyActivator = serviceProvider.GetRequiredService<ITagHelperComponentPropertyActivator>();
+            }
+
+            foreach (var component in _components)
+            {
+                PropertyActivator.Activate(ViewContext, component);
+                component.Init(context);
+                if (_logger.IsEnabled(LogLevel.Debug))
+                {
+                    _logger.TagHelperComponentInitialized(component.GetType().FullName);
+                }
+            }
+        }
+
+        /// <inheritdoc />
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            foreach (var component in _components)
+            {
+                await component.ProcessAsync(context, output);
+                if (_logger.IsEnabled(LogLevel.Debug))
+                {
+                    _logger.TagHelperComponentProcessed(component.GetType().FullName);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperFeature.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperFeature.cs
new file mode 100644
index 0000000000..1f6561bd4d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperFeature.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers
+{
+    /// <summary>
+    /// The list of tag helper types in an MVC application. The <see cref="TagHelperFeature"/> can be populated
+    /// using the <see cref="ApplicationPartManager"/> that is available during startup at <see cref="IMvcBuilder.PartManager"/>
+    /// and <see cref="IMvcCoreBuilder.PartManager"/> or at a later stage by requiring the <see cref="ApplicationPartManager"/>
+    /// as a dependency in a component.
+    /// </summary>
+    public class TagHelperFeature
+    {
+        /// <summary>
+        /// Gets the list of tag helper types in an MVC application.
+        /// </summary>
+        public IList<TypeInfo> TagHelpers { get; } = new List<TypeInfo>();
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperFeatureProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperFeatureProvider.cs
new file mode 100644
index 0000000000..1b24fb7480
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperFeatureProvider.cs
@@ -0,0 +1,42 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers
+{
+    public class TagHelperFeatureProvider : IApplicationFeatureProvider<TagHelperFeature>
+    {
+        public void PopulateFeature(IEnumerable<ApplicationPart> parts, TagHelperFeature feature)
+        {
+            foreach (var part in parts)
+            {
+                if (IncludePart(part) && part is IApplicationPartTypeProvider typeProvider)
+                {
+                    foreach (var type in typeProvider.Types)
+                    {
+                        var typeInfo = type.GetTypeInfo();
+                        if (IncludeType(typeInfo) && !feature.TagHelpers.Contains(typeInfo))
+                        {
+                            feature.TagHelpers.Add(typeInfo);
+                        }
+                    }
+                }
+            }
+        }
+
+        protected virtual bool IncludePart(ApplicationPart part) => true;
+
+        protected virtual bool IncludeType(TypeInfo type)
+        {
+            // We don't need to check visibility here, that's handled by the type provider.
+            return
+                typeof(ITagHelper).GetTypeInfo().IsAssignableFrom(type) &&
+                !type.IsAbstract &&
+                !type.IsGenericType;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/UrlResolutionTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/UrlResolutionTagHelper.cs
new file mode 100644
index 0000000000..21ae7d4ce3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/UrlResolutionTagHelper.cs
@@ -0,0 +1,370 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Reflection;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers
+{
+    /// <summary>
+    /// <see cref="ITagHelper"/> implementation targeting elements containing attributes with URL expected values.
+    /// </summary>
+    /// <remarks>Resolves URLs starting with '~/' (relative to the application's 'webroot' setting) that are not
+    /// targeted by other <see cref="ITagHelper"/>s. Runs prior to other <see cref="ITagHelper"/>s to ensure
+    /// application-relative URLs are resolved.</remarks>
+    [HtmlTargetElement("*", Attributes = "[itemid^='~/']")]
+    [HtmlTargetElement("a", Attributes = "[href^='~/']")]
+    [HtmlTargetElement("applet", Attributes = "[archive^='~/']")]
+    [HtmlTargetElement("area", Attributes = "[href^='~/']", TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("audio", Attributes = "[src^='~/']")]
+    [HtmlTargetElement("base", Attributes = "[href^='~/']", TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("blockquote", Attributes = "[cite^='~/']")]
+    [HtmlTargetElement("button", Attributes = "[formaction^='~/']")]
+    [HtmlTargetElement("del", Attributes = "[cite^='~/']")]
+    [HtmlTargetElement("embed", Attributes = "[src^='~/']", TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("form", Attributes = "[action^='~/']")]
+    [HtmlTargetElement("html", Attributes = "[manifest^='~/']")]
+    [HtmlTargetElement("iframe", Attributes = "[src^='~/']")]
+    [HtmlTargetElement("img", Attributes = "[src^='~/']", TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("img", Attributes = "[srcset^='~/']", TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("input", Attributes = "[src^='~/']", TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("input", Attributes = "[formaction^='~/']", TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("ins", Attributes = "[cite^='~/']")]
+    [HtmlTargetElement("link", Attributes = "[href^='~/']", TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("menuitem", Attributes = "[icon^='~/']")]
+    [HtmlTargetElement("object", Attributes = "[archive^='~/']")]
+    [HtmlTargetElement("object", Attributes = "[data^='~/']")]
+    [HtmlTargetElement("q", Attributes = "[cite^='~/']")]
+    [HtmlTargetElement("script", Attributes = "[src^='~/']")]
+    [HtmlTargetElement("source", Attributes = "[src^='~/']", TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("source", Attributes = "[srcset^='~/']", TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("track", Attributes = "[src^='~/']", TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("video", Attributes = "[src^='~/']")]
+    [HtmlTargetElement("video", Attributes = "[poster^='~/']")]
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public class UrlResolutionTagHelper : TagHelper
+    {
+        // Valid whitespace characters defined by the HTML5 spec.
+        private static readonly char[] ValidAttributeWhitespaceChars =
+            new[] { '\t', '\n', '\u000C', '\r', ' ' };
+        private static readonly Dictionary<string, string[]> ElementAttributeLookups =
+            new Dictionary<string, string[]>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "a", new[] { "href" } },
+                { "applet", new[] { "archive" } },
+                { "area", new[] { "href" } },
+                { "audio", new[] { "src" } },
+                { "base", new[] { "href" } },
+                { "blockquote", new[] { "cite" } },
+                { "button", new[] { "formaction" } },
+                { "del", new[] { "cite" } },
+                { "embed", new[] { "src" } },
+                { "form", new[] { "action" } },
+                { "html", new[] { "manifest" } },
+                { "iframe", new[] { "src" } },
+                { "img", new[] { "src", "srcset" } },
+                { "input", new[] { "src", "formaction" } },
+                { "ins", new[] { "cite" } },
+                { "link", new[] { "href" } },
+                { "menuitem", new[] { "icon" } },
+                { "object", new[] { "archive", "data" } },
+                { "q", new[] { "cite" } },
+                { "script", new[] { "src" } },
+                { "source", new[] { "src", "srcset" } },
+                { "track", new[] { "src" } },
+                { "video", new[] { "poster", "src" } },
+            };
+
+        /// <summary>
+        /// Creates a new <see cref="UrlResolutionTagHelper"/>.
+        /// </summary>
+        /// <param name="urlHelperFactory">The <see cref="IUrlHelperFactory"/>.</param>
+        /// <param name="htmlEncoder">The <see cref="HtmlEncoder"/>.</param>
+        public UrlResolutionTagHelper(IUrlHelperFactory urlHelperFactory, HtmlEncoder htmlEncoder)
+        {
+            UrlHelperFactory = urlHelperFactory;
+            HtmlEncoder = htmlEncoder;
+        }
+
+        /// <inheritdoc />
+        public override int Order => -1000 - 999;
+
+        protected IUrlHelperFactory UrlHelperFactory { get; }
+
+        protected HtmlEncoder HtmlEncoder { get; }
+
+        [HtmlAttributeNotBound]
+        [ViewContext]
+        public ViewContext ViewContext { get; set; }
+
+        /// <inheritdoc />
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (output == null)
+            {
+                throw new ArgumentNullException(nameof(output));
+            }
+
+            if (output.TagName == null)
+            {
+                return;
+            }
+
+            string[] attributeNames;
+            if (ElementAttributeLookups.TryGetValue(output.TagName, out attributeNames))
+            {
+                for (var i = 0; i < attributeNames.Length; i++)
+                {
+                    ProcessUrlAttribute(attributeNames[i], output);
+                }
+            }
+
+            // itemid can be present on any HTML element.
+            ProcessUrlAttribute("itemid", output);
+        }
+
+        /// <summary>
+        /// Resolves and updates URL values starting with '~/' (relative to the application's 'webroot' setting) for
+        /// <paramref name="output"/>'s <see cref="TagHelperOutput.Attributes"/> whose
+        /// <see cref="TagHelperAttribute.Name"/> is <paramref name="attributeName"/>.
+        /// </summary>
+        /// <param name="attributeName">The attribute name used to lookup values to resolve.</param>
+        /// <param name="output">The <see cref="TagHelperOutput"/>.</param>
+        protected void ProcessUrlAttribute(string attributeName, TagHelperOutput output)
+        {
+            if (attributeName == null)
+            {
+                throw new ArgumentNullException(nameof(attributeName));
+            }
+
+            if (output == null)
+            {
+                throw new ArgumentNullException(nameof(output));
+            }
+
+            for (var i = 0; i < output.Attributes.Count; i++)
+            {
+                var attribute = output.Attributes[i];
+                if (!string.Equals(attribute.Name, attributeName, StringComparison.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
+
+                var stringValue = attribute.Value as string;
+                if (stringValue != null)
+                {
+                    string resolvedUrl;
+                    if (TryResolveUrl(stringValue, resolvedUrl: out resolvedUrl))
+                    {
+                        output.Attributes[i] = new TagHelperAttribute(
+                            attribute.Name,
+                            resolvedUrl,
+                            attribute.ValueStyle);
+                    }
+                }
+                else
+                {
+                    var htmlContent = attribute.Value as IHtmlContent;
+                    if (htmlContent != null)
+                    {
+                        var htmlString = htmlContent as HtmlString;
+                        if (htmlString != null)
+                        {
+                            // No need for a StringWriter in this case.
+                            stringValue = htmlString.ToString();
+                        }
+                        else
+                        {
+                            using (var writer = new StringWriter())
+                            {
+                                htmlContent.WriteTo(writer, HtmlEncoder);
+                                stringValue = writer.ToString();
+                            }
+                        }
+
+                        IHtmlContent resolvedUrl;
+                        if (TryResolveUrl(stringValue, resolvedUrl: out resolvedUrl))
+                        {
+                            output.Attributes[i] = new TagHelperAttribute(
+                                attribute.Name,
+                                resolvedUrl,
+                                attribute.ValueStyle);
+                        }
+                        else if (htmlString == null)
+                        {
+                            // Not a ~/ URL. Just avoid re-encoding the attribute value later.
+                            output.Attributes[i] = new TagHelperAttribute(
+                                attribute.Name,
+                                new HtmlString(stringValue),
+                                attribute.ValueStyle);
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Tries to resolve the given <paramref name="url"/> value relative to the application's 'webroot' setting.
+        /// </summary>
+        /// <param name="url">The URL to resolve.</param>
+        /// <param name="resolvedUrl">Absolute URL beginning with the application's virtual root. <c>null</c> if
+        /// <paramref name="url"/> could not be resolved.</param>
+        /// <returns><c>true</c> if the <paramref name="url"/> could be resolved; <c>false</c> otherwise.</returns>
+        protected bool TryResolveUrl(string url, out string resolvedUrl)
+        {
+            resolvedUrl = null;
+            var start = FindRelativeStart(url);
+            if (start == -1)
+            {
+                return false;
+            }
+
+            var trimmedUrl = CreateTrimmedString(url, start);
+
+            var urlHelper = UrlHelperFactory.GetUrlHelper(ViewContext);
+            resolvedUrl = urlHelper.Content(trimmedUrl);
+
+            return true;
+        }
+
+        /// <summary>
+        /// Tries to resolve the given <paramref name="url"/> value relative to the application's 'webroot' setting.
+        /// </summary>
+        /// <param name="url">The URL to resolve.</param>
+        /// <param name="resolvedUrl">
+        /// Absolute URL beginning with the application's virtual root. <c>null</c> if <paramref name="url"/> could
+        /// not be resolved.
+        /// </param>
+        /// <returns><c>true</c> if the <paramref name="url"/> could be resolved; <c>false</c> otherwise.</returns>
+        protected bool TryResolveUrl(string url, out IHtmlContent resolvedUrl)
+        {
+            resolvedUrl = null;
+            var start = FindRelativeStart(url);
+            if (start == -1)
+            {
+                return false;
+            }
+
+            var trimmedUrl = CreateTrimmedString(url, start);
+
+            var urlHelper = UrlHelperFactory.GetUrlHelper(ViewContext);
+            var appRelativeUrl = urlHelper.Content(trimmedUrl);
+            var postTildeSlashUrlValue = trimmedUrl.Substring(2);
+
+            if (!appRelativeUrl.EndsWith(postTildeSlashUrlValue, StringComparison.Ordinal))
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatCouldNotResolveApplicationRelativeUrl_TagHelper(
+                        url,
+                        nameof(IUrlHelper),
+                        nameof(IUrlHelper.Content),
+                        "removeTagHelper",
+                        typeof(UrlResolutionTagHelper).FullName,
+                        typeof(UrlResolutionTagHelper).GetTypeInfo().Assembly.GetName().Name));
+            }
+
+            resolvedUrl = new EncodeFirstSegmentContent(
+                appRelativeUrl,
+                appRelativeUrl.Length - postTildeSlashUrlValue.Length,
+                postTildeSlashUrlValue);
+
+            return true;
+        }
+
+        private static int FindRelativeStart(string url)
+        {
+            if (url == null || url.Length < 2)
+            {
+                return -1;
+            }
+
+            var maxTestLength = url.Length - 2;
+
+            var start = 0;
+            for (; start < url.Length; start++)
+            {
+                if (start > maxTestLength)
+                {
+                    return -1;
+                }
+
+                if (!IsCharWhitespace(url[start]))
+                {
+                    break;
+                }
+            }
+
+            // Before doing more work, ensure that the URL we're looking at is app-relative.
+            if (url[start] != '~' || url[start + 1] != '/')
+            {
+                return -1;
+            }
+
+            return start;
+        }
+
+        private static string CreateTrimmedString(string input, int start)
+        {
+            var end = input.Length - 1;
+            for (; end >= start; end--)
+            {
+                if (!IsCharWhitespace(input[end]))
+                {
+                    break;
+                }
+            }
+
+            var len = end - start + 1;
+
+            // Substring returns same string if start == 0 && len == Length
+            return input.Substring(start, len);
+        }
+
+        private static bool IsCharWhitespace(char ch)
+        {
+            for (var i = 0; i < ValidAttributeWhitespaceChars.Length; i++)
+            {
+                if (ValidAttributeWhitespaceChars[i] == ch)
+                {
+                    return true;
+                }
+            }
+            // the character is not white space
+            return false;
+        }
+
+        private class EncodeFirstSegmentContent : IHtmlContent
+        {
+            private readonly string _firstSegment;
+            private readonly int _firstSegmentLength;
+            private readonly string _secondSegment;
+
+            public EncodeFirstSegmentContent(string firstSegment, int firstSegmentLength, string secondSegment)
+            {
+                _firstSegment = firstSegment;
+                _firstSegmentLength = firstSegmentLength;
+                _secondSegment = secondSegment;
+            }
+
+            public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+            {
+                encoder.Encode(writer, _firstSegment, 0, _firstSegmentLength);
+                writer.Write(_secondSegment);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationExpanderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationExpanderContext.cs
new file mode 100644
index 0000000000..0ecc042ed3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationExpanderContext.cs
@@ -0,0 +1,86 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    /// <summary>
+    /// A context for containing information for <see cref="IViewLocationExpander"/>.
+    /// </summary>
+    public class ViewLocationExpanderContext
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="ViewLocationExpanderContext"/>.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="Mvc.ActionContext"/> for the current executing action.</param>
+        /// <param name="viewName">The view name.</param>
+        /// <param name="controllerName">The controller name.</param>
+        /// <param name="areaName">The area name.</param>
+        /// <param name="pageName">The page name.</param>
+        /// <param name="isMainPage">Determines if the page being found is the main page for an action.</param>
+        public ViewLocationExpanderContext(
+            ActionContext actionContext,
+            string viewName,
+            string controllerName,
+            string areaName,
+            string pageName,
+            bool isMainPage)
+        {
+            if (actionContext == null)
+            {
+                throw new ArgumentNullException(nameof(actionContext));
+            }
+
+            if (viewName == null)
+            {
+                throw new ArgumentNullException(nameof(viewName));
+            }
+
+            ActionContext = actionContext;
+            ViewName = viewName;
+            ControllerName = controllerName;
+            AreaName = areaName;
+            PageName = pageName;
+            IsMainPage = isMainPage;
+        }
+        
+        /// <summary>
+        /// Gets the <see cref="Mvc.ActionContext"/> for the current executing action.
+        /// </summary>
+        public ActionContext ActionContext { get; }
+
+        /// <summary>
+        /// Gets the view name.
+        /// </summary>
+        public string ViewName { get; }
+
+        /// <summary>
+        /// Gets the controller name.
+        /// </summary>
+        public string ControllerName { get; }
+
+        /// <summary>
+        /// Gets the page name. This will be the value of the <c>page</c> route value when rendering a Page from the
+        /// Razor Pages framework. This value will be <c>null</c> if rendering a view as the result of a controller.
+        /// </summary>
+        public string PageName { get; }
+
+        /// <summary>
+        /// Gets the area name.
+        /// </summary>
+        public string AreaName { get; }
+
+        /// <summary>
+        /// Determines if the page being found is the main page for an action.
+        /// </summary>
+        public bool IsMainPage { get; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IDictionary{TKey, TValue}"/> that is populated with values as part of
+        /// <see cref="IViewLocationExpander.PopulateValues(ViewLocationExpanderContext)"/>.
+        /// </summary>
+        public IDictionary<string, string> Values { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/baseline.netcore.json
new file mode 100644
index 0000000000..daae245f2e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/baseline.netcore.json
@@ -0,0 +1,3455 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc.Razor, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.HelperResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Html.IHtmlContent"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_WriteAction",
+          "Parameters": [],
+          "ReturnType": "System.Func<System.IO.TextWriter, System.Threading.Tasks.Task>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteTo",
+          "Parameters": [
+            {
+              "Name": "writer",
+              "Type": "System.IO.TextWriter"
+            },
+            {
+              "Name": "encoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "asyncAction",
+              "Type": "System.Func<System.IO.TextWriter, System.Threading.Tasks.Task>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BodyContent",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BodyContent",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Html.IHtmlContent"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsLayoutBeingRendered",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsLayoutBeingRendered",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Path",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Path",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Layout",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Layout",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PreviousSectionWriters",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, Microsoft.AspNetCore.Mvc.Razor.RenderAsyncDelegate>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PreviousSectionWriters",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IDictionary<System.String, Microsoft.AspNetCore.Mvc.Razor.RenderAsyncDelegate>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SectionWriters",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, Microsoft.AspNetCore.Mvc.Razor.RenderAsyncDelegate>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EnsureRenderedBodyOrSections",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.IRazorPageActivator",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Activate",
+          "Parameters": [
+            {
+              "Name": "page",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.IRazorPageFactoryProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateFactory",
+          "Parameters": [
+            {
+              "Name": "relativePath",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Razor.RazorPageFactoryResult",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "FindPage",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Razor.RazorPageResult",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetPage",
+          "Parameters": [
+            {
+              "Name": "executingFilePath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pagePath",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Razor.RazorPageResult",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetAbsolutePath",
+          "Parameters": [
+            {
+              "Name": "executingFilePath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pagePath",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.ITagHelperActivator",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Create<T0>",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "T0",
+          "GenericParameter": [
+            {
+              "ParameterName": "TTagHelper",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper"
+              ]
+            }
+          ]
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.ITagHelperFactory",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateTagHelper<T0>",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "T0",
+          "GenericParameter": [
+            {
+              "ParameterName": "TTagHelper",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper"
+              ]
+            }
+          ]
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.ITagHelperInitializer<T0>",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Initialize",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "T0"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TTagHelper",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": [
+            "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper"
+          ]
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.IViewLocationExpander",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "PopulateValues",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.ViewLocationExpanderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExpandViewLocations",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.ViewLocationExpanderContext"
+            },
+            {
+              "Name": "viewLocations",
+              "Type": "System.Collections.Generic.IEnumerable<System.String>"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.String>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.LanguageViewLocationExpander",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Razor.IViewLocationExpander"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "PopulateValues",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.ViewLocationExpanderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IViewLocationExpander",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExpandViewLocations",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.ViewLocationExpanderContext"
+            },
+            {
+              "Name": "viewLocations",
+              "Type": "System.Collections.Generic.IEnumerable<System.String>"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.String>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IViewLocationExpander",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "format",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.LanguageViewLocationExpanderFormat"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.LanguageViewLocationExpanderFormat",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "SubFolder",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Suffix",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.RazorPage",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Mvc.Razor.RazorPageBase",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "EnsureRenderedBodyOrSections",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Context",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Http.HttpContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderBody",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IgnoreBody",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DefineSection",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "section",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.RenderAsyncDelegate"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsSectionDefined",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderSection",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.HtmlString",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderSection",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "required",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.HtmlString",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderSectionAsync",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.HtmlString>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderSectionAsync",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "required",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.HtmlString>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IgnoreSection",
+          "Parameters": [
+            {
+              "Name": "sectionName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginContext",
+          "Parameters": [
+            {
+              "Name": "position",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "length",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "isLiteral",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndContext",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.RazorPageActivator",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Razor.IRazorPageActivator"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Activate",
+          "Parameters": [
+            {
+              "Name": "page",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPageActivator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "metadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "urlHelperFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory"
+            },
+            {
+              "Name": "jsonHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper"
+            },
+            {
+              "Name": "diagnosticSource",
+              "Type": "System.Diagnostics.DiagnosticSource"
+            },
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            },
+            {
+              "Name": "modelExpressionProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.RazorPageBase",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Razor.IRazorPage"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "EnsureRenderedBodyOrSections",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DefineSection",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "section",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.RenderAsyncDelegate"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginContext",
+          "Parameters": [
+            {
+              "Name": "position",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "length",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "isLiteral",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndContext",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Layout",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Layout",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Output",
+          "Parameters": [],
+          "ReturnType": "System.IO.TextWriter",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Path",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Path",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SectionWriters",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, Microsoft.AspNetCore.Mvc.Razor.RenderAsyncDelegate>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewBag",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsLayoutBeingRendered",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsLayoutBeingRendered",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BodyContent",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BodyContent",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Html.IHtmlContent"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PreviousSectionWriters",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, Microsoft.AspNetCore.Mvc.Razor.RenderAsyncDelegate>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PreviousSectionWriters",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IDictionary<System.String, Microsoft.AspNetCore.Mvc.Razor.RenderAsyncDelegate>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DiagnosticSource",
+          "Parameters": [],
+          "ReturnType": "System.Diagnostics.DiagnosticSource",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DiagnosticSource",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Diagnostics.DiagnosticSource"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HtmlEncoder",
+          "Parameters": [],
+          "ReturnType": "System.Text.Encodings.Web.HtmlEncoder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HtmlEncoder",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_User",
+          "Parameters": [],
+          "ReturnType": "System.Security.Claims.ClaimsPrincipal",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TempData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Abstract": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "InvalidTagHelperIndexerAssignment",
+          "Parameters": [
+            {
+              "Name": "attributeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "tagHelperTypeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "propertyName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateTagHelper<T0>",
+          "Parameters": [],
+          "ReturnType": "T0",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TTagHelper",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper"
+              ]
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "StartTagHelperWritingScope",
+          "Parameters": [
+            {
+              "Name": "encoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndTagHelperWritingScope",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginWriteTagHelperAttribute",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndWriteTagHelperAttribute",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PushWriter",
+          "Parameters": [
+            {
+              "Name": "writer",
+              "Type": "System.IO.TextWriter"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PopWriter",
+          "Parameters": [],
+          "ReturnType": "System.IO.TextWriter",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Href",
+          "Parameters": [
+            {
+              "Name": "contentPath",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DefineSection",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "section",
+              "Type": "System.Func<System.Object, System.Threading.Tasks.Task>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Write",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Write",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteLiteral",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteLiteral",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginWriteAttribute",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "prefixOffset",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "suffix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "suffixOffset",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "attributeValuesCount",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteAttributeValue",
+          "Parameters": [
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "prefixOffset",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "valueOffset",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "valueLength",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "isLiteral",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndWriteAttribute",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginAddHtmlAttributeValues",
+          "Parameters": [
+            {
+              "Name": "executionContext",
+              "Type": "Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext"
+            },
+            {
+              "Name": "attributeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "attributeValuesCount",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "attributeValueStyle",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddHtmlAttributeValue",
+          "Parameters": [
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "prefixOffset",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "valueOffset",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "valueLength",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "isLiteral",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndAddHtmlAttributeValues",
+          "Parameters": [
+            {
+              "Name": "executionContext",
+              "Type": "Microsoft.AspNetCore.Razor.Runtime.TagHelpers.TagHelperExecutionContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FlushAsync",
+          "Parameters": [],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.HtmlString>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetAntiforgeryCookieAndHeader",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Html.HtmlString",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.RazorPageFactoryResult",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_RazorPageFactory",
+          "Parameters": [],
+          "ReturnType": "System.Func<Microsoft.AspNetCore.Mvc.Razor.IRazorPage>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewDescriptor",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Razor.Compilation.CompiledViewDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Success",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "viewDescriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Compilation.CompiledViewDescriptor"
+            },
+            {
+              "Name": "razorPageFactory",
+              "Type": "System.Func<Microsoft.AspNetCore.Mvc.Razor.IRazorPage>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.RazorPage<T0>",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Mvc.Razor.RazorPage",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Model",
+          "Parameters": [],
+          "ReturnType": "T0",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<T0>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewData",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<T0>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TModel",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.RazorPageResult",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Page",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SearchedLocations",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "page",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "searchedLocations",
+              "Type": "System.Collections.Generic.IEnumerable<System.String>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.RazorView",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewEngines.IView"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Path",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewEngines.IView",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RazorPage",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewStartPages",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.Razor.IRazorPage>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewEngines.IView",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "viewEngine",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine"
+            },
+            {
+              "Name": "pageActivator",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.IRazorPageActivator"
+            },
+            {
+              "Name": "viewStartPages",
+              "Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.Razor.IRazorPage>"
+            },
+            {
+              "Name": "razorPage",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage"
+            },
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            },
+            {
+              "Name": "diagnosticSource",
+              "Type": "System.Diagnostics.DiagnosticSource"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.RazorViewEngine",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "FindView",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "viewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "isMainPage",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewEngines.ViewEngineResult",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetView",
+          "Parameters": [
+            {
+              "Name": "executingFilePath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "viewPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "isMainPage",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewEngines.ViewEngineResult",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewLookupCache",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.Caching.Memory.IMemoryCache",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetNormalizedRouteValue",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FindPage",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Razor.RazorPageResult",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetPage",
+          "Parameters": [
+            {
+              "Name": "executingFilePath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pagePath",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Razor.RazorPageResult",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetAbsolutePath",
+          "Parameters": [
+            {
+              "Name": "executingFilePath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pagePath",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "pageFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.IRazorPageFactoryProvider"
+            },
+            {
+              "Name": "pageActivator",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.IRazorPageActivator"
+            },
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            },
+            {
+              "Name": "optionsAccessor",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.Razor.RazorViewEngineOptions>"
+            },
+            {
+              "Name": "razorProject",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProject"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            },
+            {
+              "Name": "diagnosticSource",
+              "Type": "System.Diagnostics.DiagnosticSource"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "pageFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.IRazorPageFactoryProvider"
+            },
+            {
+              "Name": "pageActivator",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.IRazorPageActivator"
+            },
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            },
+            {
+              "Name": "optionsAccessor",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.Razor.RazorViewEngineOptions>"
+            },
+            {
+              "Name": "razorFileSystem",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectFileSystem"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            },
+            {
+              "Name": "diagnosticSource",
+              "Type": "System.Diagnostics.DiagnosticSource"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "ViewExtension",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.RazorViewEngineOptions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ViewLocationExpanders",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Razor.IViewLocationExpander>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FileProviders",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.Extensions.FileProviders.IFileProvider>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewLocationFormats",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AreaViewLocationFormats",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PageViewLocationFormats",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AreaPageViewLocationFormats",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AdditionalCompilationReferences",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.CodeAnalysis.MetadataReference>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_CompilationCallback",
+          "Parameters": [],
+          "ReturnType": "System.Action<Microsoft.AspNetCore.Mvc.Razor.Compilation.RoslynCompilationContext>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_CompilationCallback",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.Razor.Compilation.RoslynCompilationContext>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.RenderAsyncDelegate",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "System.MulticastDelegate",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Invoke",
+          "Parameters": [],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginInvoke",
+          "Parameters": [
+            {
+              "Name": "callback",
+              "Type": "System.AsyncCallback"
+            },
+            {
+              "Name": "object",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.IAsyncResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndInvoke",
+          "Parameters": [
+            {
+              "Name": "result",
+              "Type": "System.IAsyncResult"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "object",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "method",
+              "Type": "System.IntPtr"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.TagHelperInitializer<T0>",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Razor.ITagHelperInitializer<T0>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Initialize",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "T0"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.ITagHelperInitializer<T0>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "action",
+              "Type": "System.Action<T0, Microsoft.AspNetCore.Mvc.Rendering.ViewContext>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TTagHelper",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": [
+            "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper"
+          ]
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.ViewLocationExpanderContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ControllerName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PageName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AreaName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsMainPage",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Values",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Values",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IDictionary<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "viewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "areaName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "isMainPage",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.TagHelperComponentTagHelper",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "manager",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.ITagHelperComponentManager"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.TagHelperComponentTagHelper",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "manager",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.ITagHelperComponentManager"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.ITagHelperComponentManager",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Components",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.ITagHelperComponentPropertyActivator",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Activate",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "tagHelperComponent",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.TagHelperComponentTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Init",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ProcessAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            },
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyActivator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.ITagHelperComponentPropertyActivator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PropertyActivator",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.ITagHelperComponentPropertyActivator"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "manager",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.ITagHelperComponentManager"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.TagHelperFeature",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_TagHelpers",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.Reflection.TypeInfo>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.TagHelperFeatureProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationParts.IApplicationFeatureProvider<Microsoft.AspNetCore.Mvc.Razor.TagHelpers.TagHelperFeature>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "PopulateFeature",
+          "Parameters": [
+            {
+              "Name": "parts",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPart>"
+            },
+            {
+              "Name": "feature",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.TagHelperFeature"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationParts.IApplicationFeatureProvider<Microsoft.AspNetCore.Mvc.Razor.TagHelpers.TagHelperFeature>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IncludePart",
+          "Parameters": [
+            {
+              "Name": "part",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPart"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IncludeType",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Reflection.TypeInfo"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_UrlHelperFactory",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HtmlEncoder",
+          "Parameters": [],
+          "ReturnType": "System.Text.Encodings.Web.HtmlEncoder",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Process",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            },
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ProcessUrlAttribute",
+          "Parameters": [
+            {
+              "Name": "attributeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryResolveUrl",
+          "Parameters": [
+            {
+              "Name": "url",
+              "Type": "System.String"
+            },
+            {
+              "Name": "resolvedUrl",
+              "Type": "System.String",
+              "Direction": "Out"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryResolveUrl",
+          "Parameters": [
+            {
+              "Name": "url",
+              "Type": "System.String"
+            },
+            {
+              "Name": "resolvedUrl",
+              "Type": "Microsoft.AspNetCore.Html.IHtmlContent",
+              "Direction": "Out"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "urlHelperFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory"
+            },
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Compilation.CompilationFailedException",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Exception",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Diagnostics.ICompilationException"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_CompilationFailures",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Diagnostics.CompilationFailure>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Diagnostics.ICompilationException",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "compilationFailures",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Diagnostics.CompilationFailure>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Compilation.CompiledViewDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_RelativePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RelativePath",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewAttribute",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewAttribute",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ExpirationTokens",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.Extensions.Primitives.IChangeToken>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ExpirationTokens",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IList<Microsoft.Extensions.Primitives.IChangeToken>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsPrecompiled",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsPrecompiled",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItem",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Item",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItem"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Type",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItem"
+            },
+            {
+              "Name": "attribute",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompiler",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CompileAsync",
+          "Parameters": [
+            {
+              "Name": "relativePath",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Razor.Compilation.CompiledViewDescriptor>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompilerProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetCompiler",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompiler",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Compilation.MetadataReferenceFeature",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_MetadataReferences",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.CodeAnalysis.MetadataReference>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Compilation.MetadataReferenceFeatureProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationParts.IApplicationFeatureProvider<Microsoft.AspNetCore.Mvc.Razor.Compilation.MetadataReferenceFeature>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "PopulateFeature",
+          "Parameters": [
+            {
+              "Name": "parts",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPart>"
+            },
+            {
+              "Name": "feature",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Compilation.MetadataReferenceFeature"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationParts.IApplicationFeatureProvider<Microsoft.AspNetCore.Mvc.Razor.Compilation.MetadataReferenceFeature>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorReferenceManager",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_CompilationReferences",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.CodeAnalysis.MetadataReference>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Path",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "path",
+              "Type": "System.String"
+            },
+            {
+              "Name": "viewType",
+              "Type": "System.Type"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Compilation.RoslynCompilationContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Compilation",
+          "Parameters": [],
+          "ReturnType": "Microsoft.CodeAnalysis.CSharp.CSharpCompilation",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Compilation",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.CodeAnalysis.CSharp.CSharpCompilation"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "compilation",
+              "Type": "Microsoft.CodeAnalysis.CSharp.CSharpCompilation"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Compilation.ViewsFeature",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ViewDescriptors",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Razor.Compilation.CompiledViewDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Razor.Compilation.ViewsFeatureProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationParts.IApplicationFeatureProvider<Microsoft.AspNetCore.Mvc.Razor.Compilation.ViewsFeature>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "PopulateFeature",
+          "Parameters": [
+            {
+              "Name": "parts",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPart>"
+            },
+            {
+              "Name": "feature",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.Compilation.ViewsFeature"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationParts.IApplicationFeatureProvider<Microsoft.AspNetCore.Mvc.Razor.Compilation.ViewsFeature>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetViewAttributes",
+          "Parameters": [
+            {
+              "Name": "assemblyPart",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationParts.AssemblyPart"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute>",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "PrecompiledViewsAssemblySuffix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationParts.CompiledRazorAssemblyApplicationPartFactory",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartFactory",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetDefaultApplicationParts",
+          "Parameters": [
+            {
+              "Name": "assembly",
+              "Type": "System.Reflection.Assembly"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPart>",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetApplicationParts",
+          "Parameters": [
+            {
+              "Name": "assembly",
+              "Type": "System.Reflection.Assembly"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPart>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationParts.CompiledRazorAssemblyPart",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPart",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationParts.IRazorCompiledItemProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Assembly",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.Assembly",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "assembly",
+              "Type": "System.Reflection.Assembly"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationParts.IRazorCompiledItemProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_CompiledItems",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItem>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.MvcRazorMvcBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddRazorOptions",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.Razor.RazorViewEngineOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddTagHelpersAsServices",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "InitializeTagHelper<T0>",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "initialize",
+              "Type": "System.Action<T0, Microsoft.AspNetCore.Mvc.Rendering.ViewContext>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TTagHelper",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper"
+              ]
+            }
+          ]
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.MvcRazorMvcCoreBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddRazorViewEngine",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddRazorViewEngine",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.Razor.RazorViewEngineOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddTagHelpersAsServices",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "InitializeTagHelper<T0>",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "initialize",
+              "Type": "System.Action<T0, Microsoft.AspNetCore.Mvc.Rendering.ViewContext>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TTagHelper",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper"
+              ]
+            }
+          ]
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageApplicationModelConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageApplicationModelConvention.cs
new file mode 100644
index 0000000000..e1b6d778d5
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageApplicationModelConvention.cs
@@ -0,0 +1,17 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// Allows customization of the <see cref="PageApplicationModel"/>.
+    /// </summary>
+    public interface IPageApplicationModelConvention : IPageConvention
+    {
+        /// <summary>
+        /// Called to apply the convention to the <see cref="PageApplicationModel"/>.
+        /// </summary>
+        /// <param name="model">The <see cref="PageApplicationModel"/>.</param>
+        void Apply(PageApplicationModel model);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageApplicationModelProvider.cs
new file mode 100644
index 0000000000..9296955e2e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageApplicationModelProvider.cs
@@ -0,0 +1,44 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// Builds or modifies an <see cref="PageApplicationModelProviderContext"/> for Razor Page discovery.
+    /// </summary>
+    public interface IPageApplicationModelProvider
+    {
+        /// <summary>
+        /// Gets the order value for determining the order of execution of providers. Providers execute in
+        /// ascending numeric value of the <see cref="Order"/> property.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Providers are executed in an ordering determined by an ascending sort of the <see cref="Order"/> property.
+        /// A provider with a lower numeric value of <see cref="Order"/> will have its
+        /// <see cref="OnProvidersExecuting"/> called before that of a provider with a higher numeric value of
+        /// <see cref="Order"/>. The <see cref="OnProvidersExecuted"/> method is called in the reverse ordering after
+        /// all calls to <see cref="OnProvidersExecuting"/>. A provider with a lower numeric value of
+        /// <see cref="Order"/> will have its <see cref="OnProvidersExecuted"/> method called after that of a provider
+        /// with a higher numeric value of <see cref="Order"/>.
+        /// </para>
+        /// <para>
+        /// If two providers have the same numeric value of <see cref="Order"/>, then their relative execution order
+        /// is undefined.
+        /// </para>
+        /// </remarks>
+        int Order { get; }
+
+        /// <summary>
+        /// Executed for the first pass of building <see cref="PageApplicationModel"/> instances. See <see cref="Order"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="PageApplicationModelProviderContext"/>.</param>
+        void OnProvidersExecuting(PageApplicationModelProviderContext context);
+
+        /// <summary>
+        /// Executed for the second pass of building <see cref="PageApplicationModel"/> instances. See <see cref="Order"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="PageApplicationModelProviderContext"/>.</param>
+        void OnProvidersExecuted(PageApplicationModelProviderContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageConvention.cs
new file mode 100644
index 0000000000..3b23349536
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageConvention.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// Common interface for route and application model conventions that apply to Razor Pages.
+    /// </summary>
+    public interface IPageConvention
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageHandlerModelConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageHandlerModelConvention.cs
new file mode 100644
index 0000000000..df2b0c7a69
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageHandlerModelConvention.cs
@@ -0,0 +1,17 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// Allows customization of the <see cref="PageHandlerModel"/>.
+    /// </summary>
+    public interface IPageHandlerModelConvention : IPageConvention
+    {
+        /// <summary>
+        /// Called to apply the convention to the <see cref="PageHandlerModel"/>.
+        /// </summary>
+        /// <param name="model">The <see cref="PageHandlerModel"/>.</param>
+        void Apply(PageHandlerModel model);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageRouteModelConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageRouteModelConvention.cs
new file mode 100644
index 0000000000..693e11cf3a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageRouteModelConvention.cs
@@ -0,0 +1,17 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// Allows customization of the <see cref="PageRouteModel"/>.
+    /// </summary>
+    public interface IPageRouteModelConvention : IPageConvention
+    {
+        /// <summary>
+        /// Called to apply the convention to the <see cref="PageRouteModel"/>.
+        /// </summary>
+        /// <param name="model">The <see cref="PageRouteModel"/>.</param>
+        void Apply(PageRouteModel model);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageRouteModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageRouteModelProvider.cs
new file mode 100644
index 0000000000..300d8ecf9c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageRouteModelProvider.cs
@@ -0,0 +1,44 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// Builds or modifies an <see cref="PageRouteModelProviderContext"/> for Razor Page routing.
+    /// </summary>
+    public interface IPageRouteModelProvider
+    {
+        /// <summary>
+        /// Gets the order value for determining the order of execution of providers. Providers execute in
+        /// ascending numeric value of the <see cref="Order"/> property.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Providers are executed in an ordering determined by an ascending sort of the <see cref="Order"/> property.
+        /// A provider with a lower numeric value of <see cref="Order"/> will have its
+        /// <see cref="OnProvidersExecuting"/> called before that of a provider with a higher numeric value of
+        /// <see cref="Order"/>. The <see cref="OnProvidersExecuted"/> method is called in the reverse ordering after
+        /// all calls to <see cref="OnProvidersExecuting"/>. A provider with a lower numeric value of
+        /// <see cref="Order"/> will have its <see cref="OnProvidersExecuted"/> method called after that of a provider
+        /// with a higher numeric value of <see cref="Order"/>.
+        /// </para>
+        /// <para>
+        /// If two providers have the same numeric value of <see cref="Order"/>, then their relative execution order
+        /// is undefined.
+        /// </para>
+        /// </remarks>
+        int Order { get; }
+
+        /// <summary>
+        /// Executed for the first pass of building <see cref="PageRouteModel"/> instances. See <see cref="Order"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="PageRouteModelProviderContext"/>.</param>
+        void OnProvidersExecuting(PageRouteModelProviderContext context);
+
+        /// <summary>
+        /// Executed for the second pass of building <see cref="PageRouteModel"/> instances. See <see cref="Order"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="PageRouteModelProviderContext"/>.</param>
+        void OnProvidersExecuted(PageRouteModelProviderContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageApplicationModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageApplicationModel.cs
new file mode 100644
index 0000000000..5077e26a27
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageApplicationModel.cs
@@ -0,0 +1,158 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// Application model component for RazorPages.
+    /// </summary>
+    public class PageApplicationModel
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="PageApplicationModel"/>.
+        /// </summary>
+        public PageApplicationModel(
+            PageActionDescriptor actionDescriptor,
+            TypeInfo handlerType,
+            IReadOnlyList<object> handlerAttributes)
+            : this(actionDescriptor, handlerType, handlerType, handlerAttributes)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="PageApplicationModel"/>.
+        /// </summary>
+        public PageApplicationModel(
+            PageActionDescriptor actionDescriptor,
+            TypeInfo declaredModelType,
+            TypeInfo handlerType,
+            IReadOnlyList<object> handlerAttributes)
+        {
+            ActionDescriptor = actionDescriptor ?? throw new ArgumentNullException(nameof(actionDescriptor));
+            DeclaredModelType = declaredModelType;
+            HandlerType = handlerType;
+
+            Filters = new List<IFilterMetadata>();
+            Properties = new CopyOnWriteDictionary<object, object>(
+                actionDescriptor.Properties,
+                EqualityComparer<object>.Default);
+            HandlerMethods = new List<PageHandlerModel>();
+            HandlerProperties = new List<PagePropertyModel>();
+            HandlerTypeAttributes = handlerAttributes;
+        }
+
+        /// <summary>
+        /// A copy constructor for <see cref="PageApplicationModel"/>.
+        /// </summary>
+        /// <param name="other">The <see cref="PageApplicationModel"/> to copy from.</param>
+        public PageApplicationModel(PageApplicationModel other)
+        {
+            if (other == null)
+            {
+                throw new ArgumentNullException(nameof(other));
+            }
+
+            ActionDescriptor = other.ActionDescriptor;
+            HandlerType = other.HandlerType;
+            PageType = other.PageType;
+            ModelType = other.ModelType;
+
+            Filters = new List<IFilterMetadata>(other.Filters);
+            Properties = new Dictionary<object, object>(other.Properties);
+
+            HandlerMethods = new List<PageHandlerModel>(other.HandlerMethods.Select(m => new PageHandlerModel(m)));
+            HandlerProperties = new List<PagePropertyModel>(other.HandlerProperties.Select(p => new PagePropertyModel(p)));
+            HandlerTypeAttributes = other.HandlerTypeAttributes;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="PageActionDescriptor"/>.
+        /// </summary>
+        public PageActionDescriptor ActionDescriptor { get; }
+
+        /// <summary>
+        /// Gets the application root relative path for the page.
+        /// </summary>
+        public string RelativePath => ActionDescriptor.RelativePath;
+
+        /// <summary>
+        /// Gets the path relative to the base path for page discovery.
+        /// <para>
+        /// This value is the path of the file without extension, relative to the pages root directory.
+        /// e.g. the <see cref="ViewEnginePath"/> for the file /Pages/Catalog/Antiques.cshtml is <c>/Catalog/Antiques</c>
+        /// </para>
+        /// <para>
+        /// In an area, this value is the path of the file without extension, relative to the pages root directory for the specified area.
+        /// e.g. the <see cref="ViewEnginePath"/>  for the file Areas/Identity/Pages/Manage/Accounts.cshtml, is <c>/Manage/Accounts</c>.
+        /// </para>
+        /// </summary>
+        public string ViewEnginePath => ActionDescriptor.ViewEnginePath;
+
+        /// <summary>
+        /// Gets the area name.
+        /// </summary>
+        public string AreaName => ActionDescriptor.AreaName;
+
+        /// <summary>
+        /// Gets the route template for the page.
+        /// </summary>
+        public string RouteTemplate => ActionDescriptor.AttributeRouteInfo?.Template;
+
+        /// <summary>
+        /// Gets the applicable <see cref="IFilterMetadata"/> instances.
+        /// </summary>
+        public IList<IFilterMetadata> Filters { get; }
+
+        /// <summary>
+        /// Stores arbitrary metadata properties associated with the <see cref="PageApplicationModel"/>.
+        /// </summary>
+        public IDictionary<object, object> Properties { get; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="TypeInfo"/> of the Razor page.
+        /// </summary>
+        public TypeInfo PageType { get; set; }
+
+        /// <summary>
+        /// Gets the declared model <see cref="TypeInfo"/> of the model for the page.
+        /// Typically this <see cref="TypeInfo"/> will be the type specified by the @model directive
+        /// in the razor page.
+        /// </summary>
+        public TypeInfo DeclaredModelType { get; }
+
+        /// <summary>
+        /// Gets or sets the runtime model <see cref="TypeInfo"/> of the model for the razor page.
+        /// This is the <see cref="TypeInfo"/> that will be used at runtime to instantiate and populate
+        /// the model property of the page.
+        /// </summary>
+        public TypeInfo ModelType { get; set; }
+
+        /// <summary>
+        /// Gets the <see cref="TypeInfo"/> of the handler.
+        /// </summary>
+        public TypeInfo HandlerType { get; }
+
+        /// <summary>
+        /// Gets the sequence of attributes declared on <see cref="HandlerType"/>.
+        /// </summary>
+        public IReadOnlyList<object> HandlerTypeAttributes { get; }
+
+        /// <summary>
+        /// Gets the sequence of <see cref="PageHandlerModel"/> instances.
+        /// </summary>
+        public IList<PageHandlerModel> HandlerMethods { get; }
+
+        /// <summary>
+        /// Gets the sequence of <see cref="PagePropertyModel"/> instances on <see cref="PageHandlerModel"/>.
+        /// </summary>
+        public IList<PagePropertyModel> HandlerProperties { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageApplicationModelProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageApplicationModelProviderContext.cs
new file mode 100644
index 0000000000..cccb6824e5
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageApplicationModelProviderContext.cs
@@ -0,0 +1,35 @@
+// 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.
+
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// A context object for <see cref="IPageApplicationModelProvider"/>.
+    /// </summary>
+    public class PageApplicationModelProviderContext
+    {
+        public PageApplicationModelProviderContext(PageActionDescriptor descriptor, TypeInfo pageTypeInfo)
+        {
+            ActionDescriptor = descriptor;
+            PageType = pageTypeInfo;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="PageActionDescriptor"/>.
+        /// </summary>
+        public PageActionDescriptor ActionDescriptor { get; }
+
+        /// <summary>
+        /// Gets the page <see cref="TypeInfo"/>.
+        /// </summary>
+        public TypeInfo PageType { get; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ApplicationModels.PageApplicationModel"/>.
+        /// </summary>
+        public PageApplicationModel PageApplicationModel { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageConventionCollection.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageConventionCollection.cs
new file mode 100644
index 0000000000..ba38593f10
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageConventionCollection.cs
@@ -0,0 +1,423 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    public class PageConventionCollection : Collection<IPageConvention>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PageConventionCollection"/> class that is empty.
+        /// </summary>
+        public PageConventionCollection()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PageConventionCollection"/> class
+        /// as a wrapper for the specified list.
+        /// </summary>
+        /// <param name="conventions">The list that is wrapped by the new collection.</param>
+        public PageConventionCollection(IList<IPageConvention> conventions)
+            : base(conventions)
+        {
+        }
+
+        /// <summary>
+        /// Creates and adds an <see cref="IPageApplicationModelConvention"/> that invokes an action on the
+        /// <see cref="PageApplicationModel"/> for the page with the specified name.
+        /// </summary>
+        /// <param name="pageName">The name of the page e.g. <c>/Users/List</c></param>
+        /// <param name="action">The <see cref="Action"/>.</param>
+        /// <returns>The added <see cref="IPageApplicationModelConvention"/>.</returns>
+        public IPageApplicationModelConvention AddPageApplicationModelConvention(
+            string pageName,
+            Action<PageApplicationModel> action)
+        {
+            EnsureValidPageName(pageName);
+
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            return Add(new PageApplicationModelConvention(pageName, action));
+        }
+
+        /// <summary>
+        /// Creates and adds an <see cref="IPageApplicationModelConvention"/> that invokes an action on the
+        /// <see cref="PageApplicationModel"/> for the page with the specified name located in the specified area.
+        /// </summary>
+        /// <param name="areaName">The name of area.</param>
+        /// <param name="pageName">
+        /// The page name e.g. <c>/Users/List</c>
+        /// <para>
+        /// The page name is the path of the file without extension, relative to the pages root directory for the specified area.
+        /// e.g. the page name for the file Areas/Identity/Pages/Manage/Accounts.cshtml, is <c>/Manage/Accounts</c>.
+        /// </para>
+        /// </param>
+        /// <param name="action">The <see cref="Action"/>.</param>
+        /// <returns>The added <see cref="IPageApplicationModelConvention"/>.</returns>
+        public IPageApplicationModelConvention AddAreaPageApplicationModelConvention(
+            string areaName,
+            string pageName,
+            Action<PageApplicationModel> action)
+        {
+            if (string.IsNullOrEmpty(areaName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(areaName));
+            }
+
+            EnsureValidPageName(pageName);
+
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            return Add(new PageApplicationModelConvention(areaName, pageName, action));
+        }
+
+        /// <summary>
+        /// Creates and adds an <see cref="IPageApplicationModelConvention"/> that invokes an action on
+        /// <see cref="PageApplicationModel"/> instances for all page under the specified folder.
+        /// </summary>
+        /// <param name="folderPath">The path of the folder relative to the Razor Pages root. e.g. <c>/Users/</c></param>
+        /// <param name="action">The <see cref="Action"/>.</param>
+        /// <returns>The added <see cref="IPageApplicationModelConvention"/>.</returns>
+        public IPageApplicationModelConvention AddFolderApplicationModelConvention(string folderPath, Action<PageApplicationModel> action)
+        {
+            EnsureValidFolderPath(folderPath);
+
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            return Add(new FolderApplicationModelConvention(folderPath, action));
+        }
+
+        /// <summary>
+        /// Creates and adds an <see cref="IPageApplicationModelConvention"/> that invokes an action on
+        /// <see cref="PageApplicationModel"/> instances for all pages under the specified area folder.
+        /// </summary>
+        /// <param name="areaName">The name of area.</param>
+        /// <param name="folderPath">
+        /// The folder path e.g. <c>/Manage/</c>
+        /// <para>
+        /// The folder path is the path of the folder, relative to the pages root directory for the specified area.
+        /// e.g. the folder path for the file Areas/Identity/Pages/Manage/Accounts.cshtml, is <c>/Manage</c>.
+        /// </para>
+        /// </param>
+        /// <param name="action">The <see cref="Action"/>.</param>
+        /// <returns>The added <see cref="IPageApplicationModelConvention"/>.</returns>
+        public IPageApplicationModelConvention AddAreaFolderApplicationModelConvention(
+            string areaName,
+            string folderPath,
+            Action<PageApplicationModel> action)
+        {
+            if (string.IsNullOrEmpty(areaName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(areaName));
+            }
+
+            EnsureValidFolderPath(folderPath);
+
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            return Add(new FolderApplicationModelConvention(areaName, folderPath, action));
+        }
+
+        /// <summary>
+        /// Creates and adds an <see cref="IPageRouteModelConvention"/> that invokes an action on the
+        /// <see cref="PageRouteModel"/> for the page with the specified name.
+        /// </summary>
+        /// <param name="pageName">The name of the page e.g. <c>/Users/List</c></param>
+        /// <param name="action">The <see cref="Action"/>.</param>
+        /// <returns>The added <see cref="IPageRouteModelConvention"/>.</returns>
+        public IPageRouteModelConvention AddPageRouteModelConvention(string pageName, Action<PageRouteModel> action)
+        {
+            EnsureValidPageName(pageName);
+
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            return Add(new PageRouteModelConvention(pageName, action));
+        }
+
+        /// <summary>
+        /// Creates and adds an <see cref="IPageRouteModelConvention"/> that invokes an action on the
+        /// <see cref="PageRouteModel"/> for the page with the specified name located in the specified area.
+        /// </summary>
+        /// <param name="areaName">The area name.</param>
+        /// <param name="pageName">
+        /// The page name e.g. <c>/Users/List</c>
+        /// <para>
+        /// The page name is the path of the file without extension, relative to the pages root directory for the specified area.
+        /// e.g. the page name for the file Areas/Identity/Pages/Manage/Accounts.cshtml, is <c>/Manage/Accounts</c>.
+        /// </para>
+        /// </param>
+        /// <param name="action">The <see cref="Action"/>.</param>
+        /// <returns>The added <see cref="IPageRouteModelConvention"/>.</returns>
+        public IPageRouteModelConvention AddAreaPageRouteModelConvention(string areaName, string pageName, Action<PageRouteModel> action)
+        {
+            if (string.IsNullOrEmpty(areaName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(areaName));
+            }
+
+            EnsureValidPageName(pageName);
+
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            return Add(new PageRouteModelConvention(areaName, pageName, action));
+        }
+
+        /// <summary>
+        /// Creates and adds an <see cref="IPageRouteModelConvention"/> that invokes an action on
+        /// <see cref="PageRouteModel"/> instances for all page under the specified folder.
+        /// </summary>
+        /// <param name="folderPath">The path of the folder relative to the Razor Pages root. e.g. <c>/Users/</c></param>
+        /// <param name="action">The <see cref="Action"/>.</param>
+        /// <returns>The added <see cref="IPageApplicationModelConvention"/>.</returns>
+        public IPageRouteModelConvention AddFolderRouteModelConvention(string folderPath, Action<PageRouteModel> action)
+        {
+            EnsureValidFolderPath(folderPath);
+
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            return Add(new FolderRouteModelConvention(folderPath, action));
+        }
+
+        /// <summary>
+        /// Creates and adds an <see cref="IPageRouteModelConvention"/> that invokes an action on
+        /// <see cref="PageRouteModel"/> instances for all page under the specified area folder.
+        /// </summary>
+        /// <param name="areaName">The area name.</param>
+        /// <param name="folderPath">
+        /// The folder path e.g. <c>/Manage/</c>
+        /// <para>
+        /// The folder path is the path of the folder, relative to the pages root directory for the specified area.
+        /// e.g. the folder path for the file Areas/Identity/Pages/Manage/Accounts.cshtml, is <c>/Manage</c>.
+        /// </para>
+        /// </param>
+        /// <param name="action">The <see cref="Action"/>.</param>
+        /// <returns>The added <see cref="IPageApplicationModelConvention"/>.</returns>
+        public IPageRouteModelConvention AddAreaFolderRouteModelConvention(string areaName, string folderPath, Action<PageRouteModel> action)
+        {
+            if (string.IsNullOrEmpty(areaName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(areaName));
+            }
+
+            EnsureValidFolderPath(folderPath);
+
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            return Add(new FolderRouteModelConvention(areaName, folderPath, action));
+        }
+
+        /// <summary>
+        /// Removes all <see cref="IPageConvention"/> instances of the specified type.
+        /// </summary>
+        /// <typeparam name="TPageConvention">The type to remove.</typeparam>
+        public void RemoveType<TPageConvention>() where TPageConvention : IPageConvention
+        {
+            RemoveType(typeof(TPageConvention));
+        }
+
+        /// <summary>
+        /// Removes all <see cref="IPageConvention"/> instances of the specified type.
+        /// </summary>
+        /// <param name="pageConventionType">The type to remove.</param>
+        public void RemoveType(Type pageConventionType)
+        {
+            for (var i = Count - 1; i >= 0; i--)
+            {
+                var pageConvention = this[i];
+                if (pageConvention.GetType() == pageConventionType)
+                {
+                    RemoveAt(i);
+                }
+            }
+        }
+
+        // Internal for unit testing
+        internal static void EnsureValidPageName(string pageName)
+        {
+            if (string.IsNullOrEmpty(pageName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(pageName));
+            }
+
+            if (pageName[0] != '/' || pageName.EndsWith(".cshtml", StringComparison.OrdinalIgnoreCase))
+            {
+                throw new ArgumentException(Resources.FormatInvalidValidPageName(pageName), nameof(pageName));
+            }
+        }
+
+        // Internal for unit testing
+        internal static void EnsureValidFolderPath(string folderPath)
+        {
+            if (string.IsNullOrEmpty(folderPath))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(folderPath));
+            }
+
+            if (folderPath[0] != '/')
+            {
+                throw new ArgumentException(Resources.PathMustBeRootRelativePath, nameof(folderPath));
+            }
+        }
+
+        private TConvention Add<TConvention>(TConvention convention) where TConvention : IPageConvention
+        {
+            base.Add(convention);
+            return convention;
+        }
+
+        private class PageRouteModelConvention : IPageRouteModelConvention
+        {
+            private readonly string _areaName;
+            private readonly string _path;
+            private readonly Action<PageRouteModel> _action;
+
+            public PageRouteModelConvention(string path, Action<PageRouteModel> action)
+                : this(null, path, action)
+            {
+            }
+
+            public PageRouteModelConvention(string areaName, string path, Action<PageRouteModel> action)
+            {
+                _areaName = areaName;
+                _path = path;
+                _action = action;
+            }
+
+            public void Apply(PageRouteModel model)
+            {
+                if (string.Equals(_areaName, model.AreaName, StringComparison.OrdinalIgnoreCase) &&
+                    string.Equals(model.ViewEnginePath, _path, StringComparison.OrdinalIgnoreCase))
+                {
+                    _action(model);
+                }
+            }
+        }
+
+        private class FolderRouteModelConvention : IPageRouteModelConvention
+        {
+            private readonly string _areaName;
+            private readonly string _folderPath;
+            private readonly Action<PageRouteModel> _action;
+
+            public FolderRouteModelConvention(string folderPath, Action<PageRouteModel> action)
+                : this(null, folderPath, action)
+            {
+            }
+
+            public FolderRouteModelConvention(string areaName, string folderPath, Action<PageRouteModel> action)
+            {
+                _areaName = areaName;
+                _folderPath = folderPath.TrimEnd('/');
+                _action = action;
+            }
+
+            public void Apply(PageRouteModel model)
+            {
+                if (string.Equals(_areaName, model.AreaName, StringComparison.OrdinalIgnoreCase) &&
+                    PathBelongsToFolder(_folderPath, model.ViewEnginePath))
+                {
+                    _action(model);
+                }
+            }
+        }
+
+        private class PageApplicationModelConvention : IPageApplicationModelConvention
+        {
+            private readonly string _areaName;
+            private readonly string _path;
+            private readonly Action<PageApplicationModel> _action;
+
+            public PageApplicationModelConvention(string path, Action<PageApplicationModel> action)
+                : this(null, path, action)
+            {
+            }
+
+            public PageApplicationModelConvention(string areaName, string path, Action<PageApplicationModel> action)
+            {
+                _areaName = areaName;
+                _path = path;
+                _action = action;
+            }
+
+            public void Apply(PageApplicationModel model)
+            {
+                if (string.Equals(model.ViewEnginePath, _path, StringComparison.OrdinalIgnoreCase) &&
+                    string.Equals(model.AreaName, _areaName, StringComparison.OrdinalIgnoreCase))
+                {
+                    _action(model);
+                }
+            }
+        }
+
+        private class FolderApplicationModelConvention : IPageApplicationModelConvention
+        {
+            private readonly string _areaName;
+            private readonly string _folderPath;
+            private readonly Action<PageApplicationModel> _action;
+
+            public FolderApplicationModelConvention(string folderPath, Action<PageApplicationModel> action)
+                : this(null, folderPath, action)
+            {
+            }
+
+            public FolderApplicationModelConvention(string areaName, string folderPath, Action<PageApplicationModel> action)
+            {
+                _areaName = areaName;
+                _folderPath = folderPath.TrimEnd('/');
+                _action = action;
+            }
+
+            public void Apply(PageApplicationModel model)
+            {
+                if (string.Equals(_areaName, model.AreaName, StringComparison.OrdinalIgnoreCase) &&
+                    PathBelongsToFolder(_folderPath, model.ViewEnginePath))
+                {
+                    _action(model);
+                }
+            }
+        }
+
+        // Internal for unit testing
+        internal static bool PathBelongsToFolder(string folderPath, string viewEnginePath)
+        {
+            if (folderPath == "/")
+            {
+                // Root directory covers everything.
+                return true;
+            }
+
+            return viewEnginePath.Length > folderPath.Length &&
+                viewEnginePath.StartsWith(folderPath, StringComparison.OrdinalIgnoreCase) &&
+                viewEnginePath[folderPath.Length] == '/';
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageHandlerModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageHandlerModel.cs
new file mode 100644
index 0000000000..6923269c14
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageHandlerModel.cs
@@ -0,0 +1,98 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// Represents a handler in a <see cref="PageApplicationModel"/>.
+    /// </summary>
+    [DebuggerDisplay("PageHandlerModel: Name={" + nameof(PageHandlerModel.Name) + "}")]
+    public class PageHandlerModel : ICommonModel
+    {
+        /// <summary>
+        /// Creates a new <see cref="PageHandlerModel"/>.
+        /// </summary>
+        /// <param name="handlerMethod">The <see cref="System.Reflection.MethodInfo"/> for the handler.</param>
+        /// <param name="attributes">Any attributes annotated on the handler method.</param>
+        public PageHandlerModel(
+            MethodInfo handlerMethod,
+            IReadOnlyList<object> attributes)
+        {
+            MethodInfo = handlerMethod ?? throw new ArgumentNullException(nameof(handlerMethod));
+            Attributes = attributes ?? throw new ArgumentNullException(nameof(attributes));
+
+            Parameters = new List<PageParameterModel>();
+            Properties = new Dictionary<object, object>();
+        }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="PageHandlerModel"/> from a given <see cref="PageHandlerModel"/>.
+        /// </summary>
+        /// <param name="other">The <see cref="PageHandlerModel"/> which needs to be copied.</param>
+        public PageHandlerModel(PageHandlerModel other)
+        {
+            if (other == null)
+            {
+                throw new ArgumentNullException(nameof(other));
+            }
+
+            MethodInfo = other.MethodInfo;
+            HandlerName = other.HandlerName;
+            HttpMethod = other.HttpMethod;
+            Name = other.Name;
+
+            Page = other.Page;
+
+            // These are just metadata, safe to create new collections
+            Attributes = new List<object>(other.Attributes);
+            Properties = new Dictionary<object, object>(other.Properties);
+
+            // Make a deep copy of other 'model' types.
+            Parameters = new List<PageParameterModel>(other.Parameters.Select(p => new PageParameterModel(p) { Handler = this }));
+        }
+
+        /// <summary>
+        /// Gets the <see cref="System.Reflection.MethodInfo"/> for the handler.
+        /// </summary>
+        public MethodInfo MethodInfo { get; }
+
+        /// <summary>
+        /// Gets or sets the HTTP method supported by this handler.
+        /// </summary>
+        public string HttpMethod { get; set; }
+
+        /// <summary>
+        /// Gets or sets the handler method name.
+        /// </summary>
+        public string HandlerName { get; set; }
+
+        /// <summary>
+        /// Gets or sets a descriptive name for the handler.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets the sequence of <see cref="PageParameterModel"/> instances.
+        /// </summary>
+        public IList<PageParameterModel> Parameters { get; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="PageApplicationModel"/>.
+        /// </summary>
+        public PageApplicationModel Page { get; set; }
+
+        /// <inheritdoc />
+        public IReadOnlyList<object> Attributes { get; }
+
+        /// <inheritdoc />
+        public IDictionary<object, object> Properties { get; }
+
+        MemberInfo ICommonModel.MemberInfo => MethodInfo;
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageParameterModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageParameterModel.cs
new file mode 100644
index 0000000000..0b4851b1ee
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageParameterModel.cs
@@ -0,0 +1,56 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    [DebuggerDisplay("PageParameterModel: Name={ParameterName}")]
+    public class PageParameterModel : ParameterModelBase, ICommonModel, IBindingModel
+    {
+        public PageParameterModel(
+            ParameterInfo parameterInfo,
+            IReadOnlyList<object> attributes)
+            : base(parameterInfo?.ParameterType, attributes)
+        {
+            if (parameterInfo == null)
+            {
+                throw new ArgumentNullException(nameof(parameterInfo));
+            }
+
+            if (attributes == null)
+            {
+                throw new ArgumentNullException(nameof(attributes));
+            }
+
+            ParameterInfo = parameterInfo;
+        }
+
+        public PageParameterModel(PageParameterModel other)
+            : base(other)
+        {
+            if (other == null)
+            {
+                throw new ArgumentNullException(nameof(other));
+            }
+
+            Handler = other.Handler;
+            ParameterInfo = other.ParameterInfo;
+        }
+
+        public PageHandlerModel Handler { get; set; }
+
+        MemberInfo ICommonModel.MemberInfo => ParameterInfo.Member;
+
+        public ParameterInfo ParameterInfo { get; }
+
+        public string ParameterName
+        {
+            get => Name;
+            set => Name = value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PagePropertyModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PagePropertyModel.cs
new file mode 100644
index 0000000000..5af225dee6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PagePropertyModel.cs
@@ -0,0 +1,63 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// Represents a property in a <see cref="PageApplicationModel"/>.
+    /// </summary>
+    [DebuggerDisplay("PagePropertyModel: Name={PropertyName}")]
+    public class PagePropertyModel : ParameterModelBase, ICommonModel
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="PagePropertyModel"/>.
+        /// </summary>
+        /// <param name="propertyInfo">The <see cref="PropertyInfo"/> for the underlying property.</param>
+        /// <param name="attributes">Any attributes which are annotated on the property.</param>
+        public PagePropertyModel(
+            PropertyInfo propertyInfo,
+            IReadOnlyList<object> attributes)
+            : base(propertyInfo?.PropertyType, attributes)
+        {
+            PropertyInfo = propertyInfo ?? throw new ArgumentNullException(nameof(propertyInfo));
+        }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="PagePropertyModel"/> from a given <see cref="PagePropertyModel"/>.
+        /// </summary>
+        /// <param name="other">The <see cref="PagePropertyModel"/> which needs to be copied.</param>
+        public PagePropertyModel(PagePropertyModel other)
+            : base(other)
+        {
+            if (other == null)
+            {
+                throw new ArgumentNullException(nameof(other));
+            }
+
+            Page = other.Page;
+            BindingInfo = BindingInfo == null ? null : new BindingInfo(other.BindingInfo);
+            PropertyInfo = other.PropertyInfo;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="PageApplicationModel"/> this <see cref="PagePropertyModel"/> is associated with.
+        /// </summary>
+        public PageApplicationModel Page { get; set; }
+
+        MemberInfo ICommonModel.MemberInfo => PropertyInfo;
+
+        public PropertyInfo PropertyInfo { get; }
+
+        public string PropertyName
+        {
+            get => Name;
+            set => Name = value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModel.cs
new file mode 100644
index 0000000000..8c94ae18a7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModel.cs
@@ -0,0 +1,118 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.AspNetCore.Routing;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// A model component for routing RazorPages.
+    /// </summary>
+    public class PageRouteModel
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="PageRouteModel"/>.
+        /// </summary>
+        /// <param name="relativePath">The application relative path of the page.</param>
+        /// <param name="viewEnginePath">The path relative to the base path for page discovery.</param>
+        public PageRouteModel(string relativePath, string viewEnginePath)
+            : this(relativePath, viewEnginePath, areaName: null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="PageRouteModel"/>.
+        /// </summary>
+        /// <param name="relativePath">The application relative path of the page.</param>
+        /// <param name="viewEnginePath">The path relative to the base path for page discovery.</param>
+        /// <param name="areaName">The area name.</param>
+        public PageRouteModel(string relativePath, string viewEnginePath, string areaName)
+        {
+            RelativePath = relativePath ?? throw new ArgumentNullException(nameof(relativePath));
+            ViewEnginePath = viewEnginePath ?? throw new ArgumentNullException(nameof(viewEnginePath));
+            AreaName = areaName;
+
+            Properties = new Dictionary<object, object>();
+            Selectors = new List<SelectorModel>();
+            RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        }
+
+        /// <summary>
+        /// A copy constructor for <see cref="PageRouteModel"/>.
+        /// </summary>
+        /// <param name="other">The <see cref="PageRouteModel"/> to copy from.</param>
+        public PageRouteModel(PageRouteModel other)
+        {
+            if (other == null)
+            {
+                throw new ArgumentNullException(nameof(other));
+            }
+
+            RelativePath = other.RelativePath;
+            ViewEnginePath = other.ViewEnginePath;
+            AreaName = other.AreaName;
+
+            Properties = new Dictionary<object, object>(other.Properties);
+            Selectors = new List<SelectorModel>(other.Selectors.Select(m => new SelectorModel(m)));
+            RouteValues = new Dictionary<string, string>(other.RouteValues, StringComparer.OrdinalIgnoreCase);
+        }
+
+        /// <summary>
+        /// Gets the application root relative path for the page.
+        /// </summary>
+        public string RelativePath { get; }
+
+        /// <summary>
+        /// Gets the path relative to the base path for page discovery.
+        /// <para>
+        /// This value is the path of the file without extension, relative to the pages root directory.
+        /// e.g. the <see cref="ViewEnginePath"/> for the file /Pages/Catalog/Antiques.cshtml is <c>/Catalog/Antiques</c>
+        /// </para>
+        /// <para>
+        /// In an area, this value is the path of the file without extension, relative to the pages root directory for the specified area.
+        /// e.g. the <see cref="ViewEnginePath"/>  for the file Areas/Identity/Pages/Manage/Accounts.cshtml, is <c>/Manage/Accounts</c>.
+        /// </para>
+        /// </summary>
+        public string ViewEnginePath { get; }
+
+        /// <summary>
+        /// Gets the area name. Will be <c>null</c> for non-area pages.
+        /// </summary>
+        public string AreaName { get; }
+
+        /// <summary>
+        /// Stores arbitrary metadata properties associated with the <see cref="PageRouteModel"/>.
+        /// </summary>
+        public IDictionary<object, object> Properties { get; }
+
+        /// <summary>
+        /// Gets the <see cref="SelectorModel"/> instances.
+        /// </summary>
+        public IList<SelectorModel> Selectors { get; }
+
+        /// <summary>
+        /// Gets a collection of route values that must be present in the <see cref="RouteData.Values"/> 
+        /// for the corresponding page to be selected.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// The value of <see cref="ViewEnginePath"/> is considered an implicit route value corresponding
+        /// to the key <c>page</c>.
+        /// </para>
+        /// <para>
+        /// The value of <see cref="AreaName"/> is considered an implicit route value corresponding
+        /// to the key <c>area</c> when <see cref="AreaName"/> is not <c>null</c>.
+        /// </para>
+        /// <para>
+        /// These entries will be implicitly added to <see cref="ActionDescriptor.RouteValues"/>
+        /// when the action descriptor is created, but will not be visible in <see cref="RouteValues"/>.
+        /// </para>
+        /// </remarks>
+        public IDictionary<string, string> RouteValues { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelProviderContext.cs
new file mode 100644
index 0000000000..966eb3876b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelProviderContext.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    /// <summary>
+    /// A context object for <see cref="IPageRouteModelProvider"/>.
+    /// </summary>
+    public class PageRouteModelProviderContext
+    {
+        /// <summary>
+        /// Gets the <see cref="PageRouteModel"/> instances.
+        /// </summary>
+        public IList<PageRouteModel> RouteModels { get; } = new List<PageRouteModel>();
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/CompiledPageActionDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/CompiledPageActionDescriptor.cs
new file mode 100644
index 0000000000..cd81ea8888
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/CompiledPageActionDescriptor.cs
@@ -0,0 +1,63 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    /// <summary>
+    /// A <see cref="PageActionDescriptor"/> for a compiled Razor page.
+    /// </summary>
+    public class CompiledPageActionDescriptor : PageActionDescriptor
+    {
+        /// <summary>
+        /// Initializes an empty <see cref="CompiledPageActionDescriptor"/>.
+        /// </summary>
+        public CompiledPageActionDescriptor()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="CompiledPageActionDescriptor"/>
+        /// from the specified <paramref name="actionDescriptor"/> instance.
+        /// </summary>
+        /// <param name="actionDescriptor">The <see cref="PageActionDescriptor"/>.</param>
+        public CompiledPageActionDescriptor(PageActionDescriptor actionDescriptor)
+            : base(actionDescriptor)
+        {
+        }
+
+        /// <summary>
+        /// Gets the list of handler methods for the page. 
+        /// </summary>
+        public IList<HandlerMethodDescriptor> HandlerMethods { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="TypeInfo"/> of the type that defines handler methods for the page. This can be
+        /// the same as <see cref="PageTypeInfo"/> and <see cref="ModelTypeInfo"/> if the page does not have an
+        /// explicit model type defined.
+        /// </summary>
+        public TypeInfo HandlerTypeInfo { get; set; }
+
+        /// <summary>
+        /// Gets or sets the declared model <see cref="TypeInfo"/> of the model for the page.
+        /// Typically this <see cref="TypeInfo"/> will be the type specified by the @model directive
+        /// in the razor page.
+        /// </summary>
+        public TypeInfo DeclaredModelTypeInfo { get; set; }
+
+        /// <summary>
+        /// Gets or sets the runtime model <see cref="TypeInfo"/> of the model for the razor page.
+        /// This is the <see cref="TypeInfo"/> that will be used at runtime to instantiate and populate
+        /// the model property of the page.
+        /// </summary>
+        public TypeInfo ModelTypeInfo { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="TypeInfo"/> of the page.
+        /// </summary>
+        public TypeInfo PageTypeInfo { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcBuilderExtensions.cs
new file mode 100644
index 0000000000..6340d87005
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcBuilderExtensions.cs
@@ -0,0 +1,83 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    /// <summary>
+    /// Extensions methods for configuring Razor Pages via an <see cref="IMvcBuilder"/>.
+    /// </summary>
+    public static class MvcRazorPagesMvcBuilderExtensions
+    {
+        /// <summary>
+        /// Configures a set of <see cref="RazorViewEngineOptions"/> for the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="setupAction">An action to configure the <see cref="RazorViewEngineOptions"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder AddRazorPagesOptions(
+            this IMvcBuilder builder,
+            Action<RazorPagesOptions> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (setupAction == null)
+            {
+                throw new ArgumentNullException(nameof(setupAction));
+            }
+
+            builder.Services.Configure(setupAction);
+            return builder;
+        }
+
+        /// <summary>
+        /// Configures Razor Pages to use the specified <paramref name="rootDirectory"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <param name="rootDirectory">The application relative path to use as the root directory.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder WithRazorPagesRoot(this IMvcBuilder builder, string rootDirectory)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (string.IsNullOrEmpty(rootDirectory))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(rootDirectory));
+            }
+
+            if (rootDirectory[0] != '/')
+            {
+                throw new ArgumentException(Resources.PathMustBeRootRelativePath, nameof(rootDirectory));
+            }
+
+            builder.Services.Configure<RazorPagesOptions>(options => options.RootDirectory = rootDirectory);
+            return builder;
+        }
+
+        /// <summary>
+        /// Configures Razor Pages to be rooted at the content root (<see cref="IHostingEnvironment.ContentRootPath"/>).
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder WithRazorPagesAtContentRoot(this IMvcBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Services.Configure<RazorPagesOptions>(options => options.RootDirectory = "/");
+            return builder;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcCoreBuilderExtensions.cs
new file mode 100644
index 0000000000..35a6e75a45
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcCoreBuilderExtensions.cs
@@ -0,0 +1,133 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.AspNetCore.Mvc.RazorPages.Internal;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public static class MvcRazorPagesMvcCoreBuilderExtensions
+    {
+        public static IMvcCoreBuilder AddRazorPages(this IMvcCoreBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddRazorViewEngine();
+
+            AddServices(builder.Services);
+
+            return builder;
+        }
+
+        public static IMvcCoreBuilder AddRazorPages(
+            this IMvcCoreBuilder builder,
+            Action<RazorPagesOptions> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (setupAction == null)
+            {
+                throw new ArgumentNullException(nameof(setupAction));
+            }
+
+            builder.AddRazorViewEngine();
+
+            AddServices(builder.Services);
+
+            builder.Services.Configure(setupAction);
+
+            return builder;
+        }
+
+        /// <summary>
+        /// Configures Razor Pages to use the specified <paramref name="rootDirectory"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <param name="rootDirectory">The application relative path to use as the root directory.</param>
+        /// <returns></returns>
+        public static IMvcCoreBuilder WithRazorPagesRoot(this IMvcCoreBuilder builder, string rootDirectory)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (string.IsNullOrEmpty(rootDirectory))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(rootDirectory));
+            }
+
+            builder.Services.Configure<RazorPagesOptions>(options => options.RootDirectory = rootDirectory);
+            return builder;
+        }
+
+        // Internal for testing.
+        internal static void AddServices(IServiceCollection services)
+        {
+            // Options
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IConfigureOptions<RazorViewEngineOptions>, RazorPagesRazorViewEngineOptionsSetup>());
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IPostConfigureOptions<RazorPagesOptions>, RazorPagesOptionsConfigureCompatibilityOptions>());
+
+            // Action description and invocation
+            services.TryAddEnumerable(
+                ServiceDescriptor.Singleton<IActionDescriptorProvider, PageActionDescriptorProvider>());
+            services.TryAddSingleton<IActionDescriptorChangeProvider, PageActionDescriptorChangeProvider>();
+            services.TryAddEnumerable(
+                ServiceDescriptor.Singleton<IPageRouteModelProvider, RazorProjectPageRouteModelProvider>());
+            services.TryAddEnumerable(
+                ServiceDescriptor.Singleton<IPageRouteModelProvider, CompiledPageRouteModelProvider>());
+
+            services.TryAddEnumerable(
+                ServiceDescriptor.Singleton<IPageApplicationModelProvider, DefaultPageApplicationModelProvider>());
+            services.TryAddEnumerable(
+                ServiceDescriptor.Singleton<IPageApplicationModelProvider, AutoValidateAntiforgeryPageApplicationModelProvider>());
+            services.TryAddEnumerable(
+                ServiceDescriptor.Singleton<IPageApplicationModelProvider, AuthorizationPageApplicationModelProvider>());
+            services.TryAddEnumerable(
+                ServiceDescriptor.Singleton<IPageApplicationModelProvider, TempDataFilterPageApplicationModelProvider>());
+            services.TryAddEnumerable(
+                ServiceDescriptor.Singleton<IPageApplicationModelProvider, ViewDataAttributePageApplicationModelProvider>());
+            services.TryAddEnumerable(
+                ServiceDescriptor.Singleton<IPageApplicationModelProvider, ResponseCacheFilterApplicationModelProvider>());
+
+            services.TryAddEnumerable(
+                ServiceDescriptor.Singleton<IActionInvokerProvider, PageActionInvokerProvider>());
+
+            // Page and Page model creation and activation
+            services.TryAddSingleton<IPageModelActivatorProvider, DefaultPageModelActivatorProvider>();
+            services.TryAddSingleton<IPageModelFactoryProvider, DefaultPageModelFactoryProvider>();
+
+            services.TryAddSingleton<IPageActivatorProvider, DefaultPageActivatorProvider>();
+            services.TryAddSingleton<IPageFactoryProvider, DefaultPageFactoryProvider>();
+
+            services.TryAddSingleton<IPageLoader, DefaultPageLoader>();
+            services.TryAddSingleton<IPageHandlerMethodSelector, DefaultPageHandlerMethodSelector>();
+
+            // Page model binding
+#pragma warning disable CS0618 // Type or member is obsolete
+            services.TryAddSingleton<PageArgumentBinder, DefaultPageArgumentBinder>();
+#pragma warning restore CS0618 // Type or member is obsolete
+
+            // Action executors
+            services.TryAddSingleton<PageResultExecutor>();
+
+            services.TryAddTransient<PageSaveTempDataPropertyFilter>();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/PageConventionCollectionExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/PageConventionCollectionExtensions.cs
new file mode 100644
index 0000000000..577c8b5ed3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/PageConventionCollectionExtensions.cs
@@ -0,0 +1,504 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Authorization;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    /// <summary>
+    /// Extensions for <see cref="PageConventionCollection"/>.
+    /// </summary>
+    public static class PageConventionCollectionExtensions
+    {
+        /// <summary>
+        /// Configures the specified <paramref name="factory"/> to apply filters to all Razor Pages.
+        /// </summary>
+        /// <param name="conventions">The <see cref="PageConventionCollection"/> to configure.</param>
+        /// <param name="factory">The factory to create filters.</param>
+        /// <returns></returns>
+        public static IPageApplicationModelConvention ConfigureFilter(
+            this PageConventionCollection conventions,
+            Func<PageApplicationModel, IFilterMetadata> factory)
+        {
+            if (conventions == null)
+            {
+                throw new ArgumentNullException(nameof(conventions));
+            }
+
+            if (factory == null)
+            {
+                throw new ArgumentNullException(nameof(factory));
+            }
+
+            return conventions.AddFolderApplicationModelConvention("/", model => model.Filters.Add(factory(model)));
+        }
+
+        /// <summary>
+        /// Configures the specified <paramref name="filter"/> to apply to all Razor Pages.
+        /// </summary>
+        /// <param name="conventions">The <see cref="PageConventionCollection"/> to configure.</param>
+        /// <param name="filter">The <see cref="IFilterMetadata"/> to add.</param>
+        /// <returns>The <see cref="PageConventionCollection"/>.</returns>
+        public static PageConventionCollection ConfigureFilter(this PageConventionCollection conventions, IFilterMetadata filter)
+        {
+            if (conventions == null)
+            {
+                throw new ArgumentNullException(nameof(conventions));
+            }
+
+            if (filter == null)
+            {
+                throw new ArgumentNullException(nameof(filter));
+            }
+
+            conventions.AddFolderApplicationModelConvention("/", model => model.Filters.Add(filter));
+            return conventions;
+        }
+
+        /// <summary>
+        /// Adds a <see cref="AllowAnonymousFilter"/> to the page with the specified name.
+        /// </summary>
+        /// <param name="conventions">The <see cref="PageConventionCollection"/> to configure.</param>
+        /// <param name="pageName">The page name.</param>
+        /// <returns>The <see cref="PageConventionCollection"/>.</returns>
+        public static PageConventionCollection AllowAnonymousToPage(this PageConventionCollection conventions, string pageName)
+        {
+            if (conventions == null)
+            {
+                throw new ArgumentNullException(nameof(conventions));
+            }
+
+            if (string.IsNullOrEmpty(pageName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(pageName));
+            }
+
+            var anonymousFilter = new AllowAnonymousFilter();
+            conventions.AddPageApplicationModelConvention(pageName, model => model.Filters.Add(anonymousFilter));
+            return conventions;
+        }
+
+        /// <summary>
+        /// Adds a <see cref="AllowAnonymousFilter"/> to the page with the specified name located in the specified area.
+        /// </summary>
+        /// <param name="conventions">The <see cref="PageConventionCollection"/> to configure.</param>
+        /// <param name="areaName">The area name.</param>
+        /// <param name="pageName">
+        /// The page name e.g. <c>/Users/List</c>
+        /// <para>
+        /// The page name is the path of the file without extension, relative to the pages root directory for the specified area.
+        /// e.g. the page name for the file Areas/Identity/Pages/Manage/Accounts.cshtml, is <c>/Manage/Accounts</c>.
+        /// </para>
+        /// </param>
+        /// <returns>The <see cref="PageConventionCollection"/>.</returns>
+        public static PageConventionCollection AllowAnonymousToAreaPage(
+            this PageConventionCollection conventions,
+            string areaName,
+            string pageName)
+        {
+            if (conventions == null)
+            {
+                throw new ArgumentNullException(nameof(conventions));
+            }
+
+            if (string.IsNullOrEmpty(areaName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(areaName));
+            }
+
+            if (string.IsNullOrEmpty(pageName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(pageName));
+            }
+
+            var anonymousFilter = new AllowAnonymousFilter();
+            conventions.AddAreaPageApplicationModelConvention(areaName, pageName, model => model.Filters.Add(anonymousFilter));
+            return conventions;
+        }
+
+        /// <summary>
+        /// Adds a <see cref="AllowAnonymousFilter"/> to all pages under the specified folder.
+        /// </summary>
+        /// <param name="conventions">The <see cref="PageConventionCollection"/> to configure.</param>
+        /// <param name="folderPath">The folder path.</param>
+        /// <returns>The <see cref="PageConventionCollection"/>.</returns>
+        public static PageConventionCollection AllowAnonymousToFolder(this PageConventionCollection conventions, string folderPath)
+        {
+            if (conventions == null)
+            {
+                throw new ArgumentNullException(nameof(conventions));
+            }
+
+            if (string.IsNullOrEmpty(folderPath))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(folderPath));
+            }
+
+            var anonymousFilter = new AllowAnonymousFilter();
+            conventions.AddFolderApplicationModelConvention(folderPath, model => model.Filters.Add(anonymousFilter));
+            return conventions;
+        }
+
+        /// <summary>
+        /// Adds the specified <paramref name="convention"/> to <paramref name="conventions"/>.
+        /// The added convention will apply to all handler properties and parameters on handler methods.
+        /// </summary>
+        /// <param name="conventions">The <see cref="PageConventionCollection"/> to configure.</param>
+        /// <param name="convention">The <see cref="IParameterModelBaseConvention"/> to apply.</param>
+        /// <returns>The <see cref="PageConventionCollection"/>.</returns>
+        public static PageConventionCollection Add(this PageConventionCollection conventions, IParameterModelBaseConvention convention)
+        {
+            if (conventions == null)
+            {
+                throw new ArgumentNullException(nameof(conventions));
+            }
+
+            if (convention == null)
+            {
+                throw new ArgumentNullException(nameof(convention));
+            }
+
+            var adapter = new ParameterModelBaseConventionAdapter(convention);
+            conventions.Add(adapter);
+            return conventions;
+        }
+
+        /// <summary>
+        /// Adds a <see cref="AllowAnonymousFilter"/> to all pages under the specified area folder.
+        /// </summary>
+        /// <param name="conventions">The <see cref="PageConventionCollection"/> to configure.</param>
+        /// <param name="areaName">The area name.</param>
+        /// <param name="folderPath">
+        /// The folder path e.g. <c>/Manage/</c>
+        /// <para>
+        /// The folder path is the path of the folder, relative to the pages root directory for the specified area.
+        /// e.g. the folder path for the file Areas/Identity/Pages/Manage/Accounts.cshtml, is <c>/Manage</c>.
+        /// </para>
+        ///.</param>
+        /// <returns>The <see cref="PageConventionCollection"/>.</returns>
+        public static PageConventionCollection AllowAnonymousToAreaFolder(
+            this PageConventionCollection conventions,
+            string areaName,
+            string folderPath)
+        {
+            if (conventions == null)
+            {
+                throw new ArgumentNullException(nameof(conventions));
+            }
+
+            if (string.IsNullOrEmpty(areaName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(areaName));
+            }
+
+            if (string.IsNullOrEmpty(folderPath))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(folderPath));
+            }
+
+            var anonymousFilter = new AllowAnonymousFilter();
+            conventions.AddAreaFolderApplicationModelConvention(areaName, folderPath, model => model.Filters.Add(anonymousFilter));
+            return conventions;
+        }
+
+        /// <summary>
+        /// Adds a <see cref="AuthorizeFilter"/> with the specified policy to the page with the specified name.
+        /// </summary>
+        /// <param name="conventions">The <see cref="PageConventionCollection"/> to configure.</param>
+        /// <param name="pageName">The page name.</param>
+        /// <param name="policy">The authorization policy.</param>
+        /// <returns>The <see cref="PageConventionCollection"/>.</returns>
+        public static PageConventionCollection AuthorizePage(this PageConventionCollection conventions, string pageName, string policy)
+        {
+            if (conventions == null)
+            {
+                throw new ArgumentNullException(nameof(conventions));
+            }
+
+            if (string.IsNullOrEmpty(pageName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(pageName));
+            }
+
+            var authorizeFilter = new AuthorizeFilter(policy);
+            conventions.AddPageApplicationModelConvention(pageName, model => model.Filters.Add(authorizeFilter));
+            return conventions;
+        }
+
+        /// <summary>
+        /// Adds a <see cref="AuthorizeFilter"/> to the page with the specified name.
+        /// </summary>
+        /// <param name="conventions">The <see cref="PageConventionCollection"/> to configure.</param>
+        /// <param name="pageName">The page name.</param>
+        /// <returns>The <see cref="PageConventionCollection"/>.</returns>
+        public static PageConventionCollection AuthorizePage(this PageConventionCollection conventions, string pageName) =>
+            AuthorizePage(conventions, pageName, policy: string.Empty);
+
+        /// <summary>
+        /// Adds a <see cref="AuthorizeFilter"/> with default policy to the page with the specified name.
+        /// </summary>
+        /// <param name="conventions">The <see cref="PageConventionCollection"/> to configure.</param>
+        /// <param name="areaName">The area name.</param>
+        /// <param name="pageName">
+        /// The page name e.g. <c>/Users/List</c>
+        /// <para>
+        /// The page name is the path of the file without extension, relative to the pages root directory for the specified area.
+        /// e.g. the page name for the file Areas/Identity/Pages/Manage/Accounts.cshtml, is <c>/Manage/Accounts</c>.
+        /// </para>
+        /// </param>
+        /// <returns>The <see cref="PageConventionCollection"/>.</returns>
+        public static PageConventionCollection AuthorizeAreaPage(this PageConventionCollection conventions, string areaName, string pageName)
+            => AuthorizeAreaPage(conventions, areaName, pageName, policy: string.Empty);
+
+        /// <summary>
+        /// Adds a <see cref="AuthorizeFilter"/> with the specified policy to the page with the specified name.
+        /// </summary>
+        /// <param name="conventions">The <see cref="PageConventionCollection"/> to configure.</param>
+        /// <param name="areaName">The area name.</param>
+        /// <param name="pageName">
+        /// The page name e.g. <c>/Users/List</c>
+        /// <para>
+        /// The page name is the path of the file without extension, relative to the pages root directory for the specified area.
+        /// e.g. the page name for the file Areas/Identity/Pages/Manage/Accounts.cshtml, is <c>/Manage/Accounts</c>.
+        /// </para>
+        /// </param>
+        /// <param name="policy">The authorization policy.</param>
+        /// <returns>The <see cref="PageConventionCollection"/>.</returns>
+        public static PageConventionCollection AuthorizeAreaPage(
+            this PageConventionCollection conventions,
+            string areaName,
+            string pageName,
+            string policy)
+        {
+            if (conventions == null)
+            {
+                throw new ArgumentNullException(nameof(conventions));
+            }
+
+            if (string.IsNullOrEmpty(areaName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(areaName));
+            }
+
+            if (string.IsNullOrEmpty(pageName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(pageName));
+            }
+
+            var authorizeFilter = new AuthorizeFilter(policy);
+            conventions.AddAreaPageApplicationModelConvention(areaName, pageName, model => model.Filters.Add(authorizeFilter));
+            return conventions;
+        }
+
+        /// <summary>
+        /// Adds a <see cref="AuthorizeFilter"/> with the specified policy to all pages under the specified folder.
+        /// </summary>
+        /// <param name="conventions">The <see cref="PageConventionCollection"/> to configure.</param>
+        /// <param name="folderPath">The folder path.</param>
+        /// <param name="policy">The authorization policy.</param>
+        /// <returns>The <see cref="PageConventionCollection"/>.</returns>
+        public static PageConventionCollection AuthorizeFolder(this PageConventionCollection conventions, string folderPath, string policy)
+        {
+            if (conventions == null)
+            {
+                throw new ArgumentNullException(nameof(conventions));
+            }
+
+            if (string.IsNullOrEmpty(folderPath))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(folderPath));
+            }
+
+            var authorizeFilter = new AuthorizeFilter(policy);
+            conventions.AddFolderApplicationModelConvention(folderPath, model => model.Filters.Add(authorizeFilter));
+            return conventions;
+        }
+
+        /// <summary>
+        /// Adds a <see cref="AuthorizeFilter"/> to all pages under the specified folder.
+        /// </summary>
+        /// <param name="conventions">The <see cref="PageConventionCollection"/> to configure.</param>
+        /// <param name="folderPath">The folder path.</param>
+        /// <returns>The <see cref="PageConventionCollection"/>.</returns>
+        public static PageConventionCollection AuthorizeFolder(this PageConventionCollection conventions, string folderPath) =>
+            AuthorizeFolder(conventions, folderPath, policy: string.Empty);
+
+        /// <summary>
+        /// Adds a <see cref="AuthorizeFilter"/> with the default policy to all pages under the specified folder.
+        /// </summary>
+        /// <param name="conventions">The <see cref="PageConventionCollection"/> to configure.</param>
+        /// <param name="areaName">The area name.</param>
+        /// <param name="folderPath">
+        /// The folder path e.g. <c>/Manage/</c>
+        /// <para>
+        /// The folder path is the path of the folder, relative to the pages root directory for the specified area.
+        /// e.g. the folder path for the file Areas/Identity/Pages/Manage/Accounts.cshtml, is <c>/Manage</c>.
+        /// </para>
+        /// </param>
+        /// <returns>The <see cref="PageConventionCollection"/>.</returns>
+        public static PageConventionCollection AuthorizeAreaFolder(this PageConventionCollection conventions, string areaName, string folderPath)
+            => AuthorizeAreaFolder(conventions, areaName, folderPath, policy: string.Empty);
+
+        /// <summary>
+        /// Adds a <see cref="AuthorizeFilter"/> with the specified policy to all pages under the specified folder.
+        /// </summary>
+        /// <param name="conventions">The <see cref="PageConventionCollection"/> to configure.</param>
+        /// <param name="areaName">The area name.</param>
+        /// <param name="folderPath">
+        /// The folder path e.g. <c>/Manage/</c>
+        /// <para>
+        /// The folder path is the path of the folder, relative to the pages root directory for the specified area.
+        /// e.g. the folder path for the file Areas/Identity/Pages/Manage/Accounts.cshtml, is <c>/Manage</c>.
+        /// </para>
+        /// </param>
+        /// <param name="policy">The authorization policy.</param>
+        /// <returns>The <see cref="PageConventionCollection"/>.</returns>
+        public static PageConventionCollection AuthorizeAreaFolder(
+            this PageConventionCollection conventions,
+            string areaName,
+            string folderPath,
+            string policy)
+        {
+            if (conventions == null)
+            {
+                throw new ArgumentNullException(nameof(conventions));
+            }
+
+            if (string.IsNullOrEmpty(areaName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(areaName));
+            }
+
+            if (string.IsNullOrEmpty(folderPath))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(folderPath));
+            }
+
+            var authorizeFilter = new AuthorizeFilter(policy);
+            conventions.AddAreaFolderApplicationModelConvention(areaName, folderPath, model => model.Filters.Add(authorizeFilter));
+            return conventions;
+        }
+
+        /// <summary>
+        /// Adds the specified <paramref name="route"/> to the page at the specified <paramref name="pageName"/>.
+        /// <para>
+        /// The page can be routed via <paramref name="route"/> in addition to the default set of path based routes.
+        /// All links generated for this page will use the specified route.
+        /// </para>
+        /// </summary>
+        /// <param name="conventions">The <see cref="PageConventionCollection"/>.</param>
+        /// <param name="pageName">The page name.</param>
+        /// <param name="route">The route to associate with the page.</param>
+        /// <returns>The <see cref="PageConventionCollection"/>.</returns>
+        public static PageConventionCollection AddPageRoute(this PageConventionCollection conventions, string pageName, string route)
+        {
+            if (conventions == null)
+            {
+                throw new ArgumentNullException(nameof(conventions));
+            }
+
+            if (string.IsNullOrEmpty(pageName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(pageName));
+            }
+
+            if (route == null)
+            {
+                throw new ArgumentNullException(nameof(route));
+            }
+
+            conventions.AddPageRouteModelConvention(pageName, AddPageRouteThunk(route));
+
+            return conventions;
+        }
+
+        /// <summary>
+        /// Adds the specified <paramref name="route"/> to the page at the specified <paramref name="pageName"/> located in the specified
+        /// area.
+        /// <para>
+        /// The page can be routed via <paramref name="route"/> in addition to the default set of path based routes.
+        /// All links generated for this page will use the specified route.
+        /// </para>
+        /// </summary>
+        /// <param name="conventions">The <see cref="PageConventionCollection"/>.</param>
+        /// <param name="areaName">The area name.</param>
+        /// <param name="pageName">
+        /// The page name e.g. <c>/Users/List</c>
+        /// <para>
+        /// The page name is the path of the file without extension, relative to the pages root directory for the specified area.
+        /// e.g. the page name for the file Areas/Identity/Pages/Manage/Accounts.cshtml, is <c>/Manage/Accounts</c>.
+        /// </para>
+        /// </param>
+        /// <param name="route">The route to associate with the page.</param>
+        /// <returns>The <see cref="PageConventionCollection"/>.</returns>
+        public static PageConventionCollection AddAreaPageRoute(
+            this PageConventionCollection conventions,
+            string areaName,
+            string pageName,
+            string route)
+        {
+            if (conventions == null)
+            {
+                throw new ArgumentNullException(nameof(conventions));
+            }
+
+            if (string.IsNullOrEmpty(areaName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(areaName));
+            }
+
+            if (string.IsNullOrEmpty(pageName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(pageName));
+            }
+
+            if (route == null)
+            {
+                throw new ArgumentNullException(nameof(route));
+            }
+
+            conventions.AddAreaPageRouteModelConvention(areaName, pageName, AddPageRouteThunk(route));
+
+            return conventions;
+        }
+
+        private static Action<PageRouteModel> AddPageRouteThunk(string route)
+        {
+            return model =>
+            {
+                // Use the route specified in MapPageRoute for outbound routing.
+                foreach (var selector in model.Selectors)
+                {
+                    selector.AttributeRouteModel.SuppressLinkGeneration = true;
+                }
+
+                model.Selectors.Add(new SelectorModel
+                {
+                    AttributeRouteModel = new AttributeRouteModel
+                    {
+                        Template = route,
+                    }
+                });
+            };
+        }
+
+        private class ParameterModelBaseConventionAdapter : IPageConvention, IParameterModelBaseConvention
+        {
+            private readonly IParameterModelBaseConvention _convention;
+
+            public ParameterModelBaseConventionAdapter(IParameterModelBaseConvention convention)
+            {
+                _convention = convention;
+            }
+
+            public void Apply(ParameterModelBase parameter)
+            {
+                _convention.Apply(parameter);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/IAsyncPageFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/IAsyncPageFilter.cs
new file mode 100644
index 0000000000..1c6a0503df
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/IAsyncPageFilter.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A filter that asynchronously surrounds execution of a page handler method. This filter is executed only when
+    /// decorated on a handler's type and not on individual handler methods.
+    /// </summary>
+    public interface IAsyncPageFilter : IFilterMetadata
+    {
+        /// <summary>
+        /// Called asynchronously after the handler method has been selected, but before model binding occurs.
+        /// </summary>
+        /// <param name="context">The <see cref="PageHandlerSelectedContext"/>.</param>
+        /// <returns>A <see cref="Task"/> that on completion indicates the filter has executed.</returns>
+        Task OnPageHandlerSelectionAsync(PageHandlerSelectedContext context);
+
+        /// <summary>
+        /// Called asynchronously before the handler method is invoked, after model binding is complete.
+        /// </summary>
+        /// <param name="context">The <see cref="PageHandlerExecutingContext"/>.</param>
+        /// <param name="next">
+        /// The <see cref="PageHandlerExecutionDelegate"/>. Invoked to execute the next page filter or the handler method itself.
+        /// </param>
+        /// <returns>A <see cref="Task"/> that on completion indicates the filter has executed.</returns>
+        Task OnPageHandlerExecutionAsync(PageHandlerExecutingContext context, PageHandlerExecutionDelegate next);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/IPageFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/IPageFilter.cs
new file mode 100644
index 0000000000..6fde59efb1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/IPageFilter.cs
@@ -0,0 +1,30 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A filter that surrounds execution of a page handler method. This filter is executed only when decorated on a
+    /// handler's type and not on individual handler methods.
+    /// </summary>
+    public interface IPageFilter : IFilterMetadata
+    {
+        /// <summary>
+        /// Called after a handler method has been selected, but before model binding occurs.
+        /// </summary>
+        /// <param name="context">The <see cref="PageHandlerSelectedContext"/>.</param>
+        void OnPageHandlerSelected(PageHandlerSelectedContext context);
+
+        /// <summary>
+        /// Called before the handler method executes, after model binding is complete.
+        /// </summary>
+        /// <param name="context">The <see cref="PageHandlerExecutingContext"/>.</param>
+        void OnPageHandlerExecuting(PageHandlerExecutingContext context);
+
+        /// <summary>
+        /// Called after the handler method executes, before the action result executes.
+        /// </summary>
+        /// <param name="context">The <see cref="PageHandlerExecutedContext"/>.</param>
+        void OnPageHandlerExecuted(PageHandlerExecutedContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutedContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutedContext.cs
new file mode 100644
index 0000000000..5597fdc92e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutedContext.cs
@@ -0,0 +1,116 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.ExceptionServices;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A context for page filters, used specifically in 
+    /// <see cref="IPageFilter.OnPageHandlerExecuted(PageHandlerExecutedContext)"/> and 
+    /// <see cref="IAsyncPageFilter.OnPageHandlerExecutionAsync(PageHandlerExecutingContext, PageHandlerExecutionDelegate)"/>.
+    /// </summary>
+    public class PageHandlerExecutedContext : FilterContext
+    {
+        private Exception _exception;
+        private ExceptionDispatchInfo _exceptionDispatchInfo;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="PageHandlerExecutedContext"/>.
+        /// </summary>
+        /// <param name="pageContext">The <see cref="PageContext"/> associated with the current request.</param>
+        /// <param name="filters">The set of filters associated with the page.</param>
+        /// <param name="handlerMethod">The handler method to be invoked, may be null.</param>
+        /// <param name="handlerInstance">The handler instance associated with the page.</param>
+        public PageHandlerExecutedContext(
+            PageContext pageContext,
+            IList<IFilterMetadata> filters,
+            HandlerMethodDescriptor handlerMethod,
+            object handlerInstance)
+            : base(pageContext, filters)
+        {
+            if (handlerInstance == null)
+            {
+                throw new ArgumentNullException(nameof(handlerInstance));
+            }
+
+            HandlerMethod = handlerMethod;
+            HandlerInstance = handlerInstance;
+        }
+
+        /// <summary>
+        /// Gets the descriptor associated with the current page.
+        /// </summary>
+        public new virtual CompiledPageActionDescriptor ActionDescriptor =>
+            (CompiledPageActionDescriptor)base.ActionDescriptor;
+
+        /// <summary>
+        /// Gets or sets an indication that an page filter short-circuited the action and the page filter pipeline.
+        /// </summary>
+        public virtual bool Canceled { get; set; }
+
+        /// <summary>
+        /// Gets the handler instance containing the handler method.
+        /// </summary>
+        public virtual object HandlerInstance { get; }
+
+        /// <summary>
+        /// Gets the descriptor for the handler method that was invoked.
+        /// </summary>
+        public virtual HandlerMethodDescriptor HandlerMethod { get; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="System.Exception"/> caught while executing the action or action filters, if
+        /// any.
+        /// </summary>
+        public virtual Exception Exception
+        {
+            get
+            {
+                if (_exception == null && _exceptionDispatchInfo != null)
+                {
+                    return _exceptionDispatchInfo.SourceException;
+                }
+                else
+                {
+                    return _exception;
+                }
+            }
+
+            set
+            {
+                _exceptionDispatchInfo = null;
+                _exception = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="System.Runtime.ExceptionServices.ExceptionDispatchInfo"/> for the
+        /// <see cref="Exception"/>, if an <see cref="System.Exception"/> was caught and this information captured.
+        /// </summary>
+        public virtual ExceptionDispatchInfo ExceptionDispatchInfo
+        {
+            get => _exceptionDispatchInfo;
+
+            set
+            {
+                _exception = null;
+                _exceptionDispatchInfo = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets an indication that the <see cref="Exception"/> has been handled.
+        /// </summary>
+        public virtual bool ExceptionHandled { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IActionResult"/>.
+        /// </summary>
+        public virtual IActionResult Result { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutingContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutingContext.cs
new file mode 100644
index 0000000000..25b9b90b70
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutingContext.cs
@@ -0,0 +1,76 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A context for page filters, used specifically in 
+    /// <see cref="IPageFilter.OnPageHandlerExecuting(PageHandlerExecutingContext)"/> and 
+    /// <see cref="IAsyncPageFilter.OnPageHandlerExecutionAsync(PageHandlerExecutingContext, PageHandlerExecutionDelegate)"/>.
+    /// </summary>
+    public class PageHandlerExecutingContext : FilterContext
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="PageHandlerExecutingContext"/>.
+        /// </summary>
+        /// <param name="pageContext">The <see cref="PageContext"/> associated with the current request.</param>
+        /// <param name="filters">The set of filters associated with the page.</param>
+        /// <param name="handlerMethod">The handler method to be invoked, may be null.</param>
+        /// <param name="handlerArguments">The arguments to provide to the handler method.</param>
+        /// <param name="handlerInstance">The handler instance associated with the page.</param>
+        public PageHandlerExecutingContext(
+            PageContext pageContext,
+            IList<IFilterMetadata> filters,
+            HandlerMethodDescriptor handlerMethod,
+            IDictionary<string, object> handlerArguments,
+            object handlerInstance)
+            : base(pageContext, filters)
+        {
+            if (handlerArguments == null)
+            {
+                throw new ArgumentNullException(nameof(handlerArguments));
+            }
+
+            if (handlerInstance == null)
+            {
+                throw new ArgumentNullException(nameof(handlerInstance));
+            }
+
+            HandlerMethod = handlerMethod;
+            HandlerArguments = handlerArguments;
+            HandlerInstance = handlerInstance;
+        }
+
+        /// <summary>
+        /// Gets the descriptor associated with the current page.
+        /// </summary>
+        public new virtual CompiledPageActionDescriptor ActionDescriptor => 
+            (CompiledPageActionDescriptor)base.ActionDescriptor;
+
+        /// <summary>
+        /// Gets or sets the <see cref="IActionResult"/> to execute. Setting <see cref="Result"/> to a non-<c>null</c>
+        /// value inside a page filter will short-circuit the page and any remaining page filters.
+        /// </summary>
+        public virtual IActionResult Result { get; set; }
+
+        /// <summary>
+        /// Gets the arguments to pass when invoking the handler method. Keys are parameter names.
+        /// </summary>
+        public virtual IDictionary<string, object> HandlerArguments { get; }
+
+        /// <summary>
+        /// Gets the descriptor for the handler method about to be invoked.
+        /// </summary>
+        public virtual HandlerMethodDescriptor HandlerMethod { get; }
+
+        /// <summary>
+        /// Gets the object instance containing the handler method.
+        /// </summary>
+        public virtual object HandlerInstance { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutionDelegate.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutionDelegate.cs
new file mode 100644
index 0000000000..7bf9708b20
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutionDelegate.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A delegate that asynchronously returns a <see cref="PageHandlerExecutedContext"/> indicating the page or the next
+    /// page filter has executed.
+    /// </summary>
+    /// <returns>
+    /// A <see cref="Task"/> that on completion returns an <see cref="PageHandlerExecutedContext"/>.
+    /// </returns>
+    public delegate Task<PageHandlerExecutedContext> PageHandlerExecutionDelegate();
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerSelectedContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerSelectedContext.cs
new file mode 100644
index 0000000000..8489ab3fe5
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerSelectedContext.cs
@@ -0,0 +1,54 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    /// <summary>
+    /// A context for page filters, used specifically in 
+    /// <see cref="IPageFilter.OnPageHandlerSelected(PageHandlerSelectedContext)"/> and 
+    /// <see cref="IAsyncPageFilter.OnPageHandlerSelectionAsync(PageHandlerSelectedContext)"/>.
+    /// </summary>
+    public class PageHandlerSelectedContext : FilterContext
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="PageHandlerExecutedContext"/>.
+        /// </summary>
+        /// <param name="pageContext">The <see cref="PageContext"/> associated with the current request.</param>
+        /// <param name="filters">The set of filters associated with the page.</param>
+        /// <param name="handlerInstance">The handler instance associated with the page.</param>
+        public PageHandlerSelectedContext(
+            PageContext pageContext,
+            IList<IFilterMetadata> filters,
+            object handlerInstance)
+            : base(pageContext, filters)
+        {
+            if (handlerInstance == null)
+            {
+                throw new ArgumentNullException(nameof(handlerInstance));
+            }
+
+            HandlerInstance = handlerInstance;
+        }
+
+        /// <summary>
+        /// Gets the descriptor associated with the current page.
+        /// </summary>
+        public new virtual CompiledPageActionDescriptor ActionDescriptor => 
+            (CompiledPageActionDescriptor)base.ActionDescriptor;
+
+        /// <summary>
+        /// Gets or sets the descriptor for the handler method about to be invoked.
+        /// </summary>
+        public virtual HandlerMethodDescriptor HandlerMethod { get; set; }
+
+        /// <summary>
+        /// Gets the object instance containing the handler method.
+        /// </summary>
+        public virtual object HandlerInstance { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageActivatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageActivatorProvider.cs
new file mode 100644
index 0000000000..80578d5f17
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageActivatorProvider.cs
@@ -0,0 +1,28 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    /// <summary>
+    /// Provides methods to create a Razor page.
+    /// </summary>
+    public interface IPageActivatorProvider
+    {
+        /// <summary>
+        /// Creates a Razor page activator.
+        /// </summary>
+        /// <param name="descriptor">The <see cref="CompiledPageActionDescriptor"/>.</param>
+        /// <returns>The delegate used to activate the page.</returns>
+        Func<PageContext, ViewContext, object> CreateActivator(CompiledPageActionDescriptor descriptor);
+
+        /// <summary>
+        /// Releases a Razor page.
+        /// </summary>
+        /// <param name="descriptor">The <see cref="CompiledPageActionDescriptor"/>.</param>
+        /// <returns>The delegate used to dispose the activated page.</returns>
+        Action<PageContext, ViewContext, object> CreateReleaser(CompiledPageActionDescriptor descriptor);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageFactoryProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageFactoryProvider.cs
new file mode 100644
index 0000000000..a3b366784c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageFactoryProvider.cs
@@ -0,0 +1,28 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    /// <summary>
+    /// Provides methods for creation and disposal of Razor pages.
+    /// </summary>
+    public interface IPageFactoryProvider
+    {
+        /// <summary>
+        /// Creates a factory for producing Razor pages for the specified <see cref="PageContext"/>.
+        /// </summary>
+        /// <param name="descriptor">The <see cref="CompiledPageActionDescriptor"/>.</param>
+        /// <returns>The Razor page factory.</returns>
+        Func<PageContext, ViewContext, object> CreatePageFactory(CompiledPageActionDescriptor descriptor);
+
+        /// <summary>
+        /// Releases a Razor page.
+        /// </summary>
+        /// <param name="descriptor">The <see cref="CompiledPageActionDescriptor"/>.</param>
+        /// <returns>The delegate used to release the created page.</returns>
+        Action<PageContext, ViewContext, object> CreatePageDisposer(CompiledPageActionDescriptor descriptor);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageModelActivatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageModelActivatorProvider.cs
new file mode 100644
index 0000000000..8789141087
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageModelActivatorProvider.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    /// <summary>
+    /// Provides methods to create a Razor Page model.
+    /// </summary>
+    public interface IPageModelActivatorProvider
+    {
+        /// <summary>
+        /// Creates a Razor Page model activator.
+        /// </summary>
+        /// <param name="descriptor">The <see cref="CompiledPageActionDescriptor"/>.</param>
+        /// <returns>The delegate used to activate the page model.</returns>
+        Func<PageContext, object> CreateActivator(CompiledPageActionDescriptor descriptor);
+
+        /// <summary>
+        /// Releases a Razor Page model.
+        /// </summary>
+        /// <param name="descriptor">The <see cref="CompiledPageActionDescriptor"/>.</param>
+        /// <returns>The delegate used to dispose the activated Razor Page model.</returns>
+        Action<PageContext, object> CreateReleaser(CompiledPageActionDescriptor descriptor);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageModelFactoryProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageModelFactoryProvider.cs
new file mode 100644
index 0000000000..b99a7b1a2c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageModelFactoryProvider.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    /// <summary>
+    /// Provides methods for creation and disposal of Razor Page models.
+    /// </summary>
+    public interface IPageModelFactoryProvider
+    {
+        /// <summary>
+        /// Creates a factory for producing models for Razor Pages given the specified <see cref="PageContext"/>.
+        /// </summary>
+        /// <param name="descriptor">The <see cref="CompiledPageActionDescriptor"/>.</param>
+        /// <returns>The Razor Page model factory.</returns>
+        Func<PageContext, object> CreateModelFactory(CompiledPageActionDescriptor descriptor);
+
+        /// <summary>
+        /// Releases a Razor Page model.
+        /// </summary>
+        /// <param name="descriptor">The <see cref="CompiledPageActionDescriptor"/>.</param>
+        /// <returns>The delegate used to release the created Razor Page model.</returns>
+        Action<PageContext, object> CreateModelDisposer(CompiledPageActionDescriptor descriptor);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageActivatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageActivatorProvider.cs
new file mode 100644
index 0000000000..f0ec8404a9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageActivatorProvider.cs
@@ -0,0 +1,88 @@
+// 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.
+
+using System;
+using System.Linq.Expressions;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    /// <summary>
+    /// <see cref="IPageActivatorProvider"/> that uses type activation to create Pages.
+    /// </summary>
+    public class DefaultPageActivatorProvider : IPageActivatorProvider
+    {
+        private readonly Action<PageContext, ViewContext, object> _disposer = Dispose;
+
+        /// <inheritdoc />
+        public virtual Func<PageContext, ViewContext, object> CreateActivator(CompiledPageActionDescriptor actionDescriptor)
+        {
+            if (actionDescriptor == null)
+            {
+                throw new ArgumentNullException(nameof(actionDescriptor));
+            }
+
+            var pageTypeInfo = actionDescriptor.PageTypeInfo?.AsType();
+            if (pageTypeInfo == null)
+            {
+                throw new ArgumentException(Resources.FormatPropertyOfTypeCannotBeNull(
+                    nameof(actionDescriptor.PageTypeInfo),
+                    nameof(actionDescriptor)),
+                    nameof(actionDescriptor));
+            }
+
+            return CreatePageFactory(pageTypeInfo);
+        }
+
+        public virtual Action<PageContext, ViewContext, object> CreateReleaser(CompiledPageActionDescriptor actionDescriptor)
+        {
+            if (actionDescriptor == null)
+            {
+                throw new ArgumentNullException(nameof(actionDescriptor));
+            }
+
+            if (typeof(IDisposable).GetTypeInfo().IsAssignableFrom(actionDescriptor.PageTypeInfo))
+            {
+                return _disposer;
+            }
+
+            return null;
+        }
+
+        private static Func<PageContext, ViewContext, object> CreatePageFactory(Type pageTypeInfo)
+        {
+            var parameter1 = Expression.Parameter(typeof(PageContext), "pageContext");
+            var parameter2 = Expression.Parameter(typeof(ViewContext), "viewContext");
+
+            // new Page();
+            var newExpression = Expression.New(pageTypeInfo);
+
+            // () => new Page();
+            var pageFactory = Expression
+                .Lambda<Func<PageContext, ViewContext, object>>(newExpression, parameter1, parameter2)
+                .Compile();
+            return pageFactory;
+        }
+
+        private static void Dispose(PageContext context, ViewContext viewContext, object page)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            if (page == null)
+            {
+                throw new ArgumentNullException(nameof(page));
+            }
+
+            ((IDisposable)page).Dispose();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageFactoryProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageFactoryProvider.cs
new file mode 100644
index 0000000000..709921ab28
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageFactoryProvider.cs
@@ -0,0 +1,81 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Reflection;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    public class DefaultPageFactoryProvider : IPageFactoryProvider
+    {
+        private readonly IPageActivatorProvider _pageActivator;
+        private readonly IModelMetadataProvider _modelMetadataProvider;
+        private readonly RazorPagePropertyActivator.PropertyValueAccessors _propertyAccessors;
+
+        public DefaultPageFactoryProvider(
+            IPageActivatorProvider pageActivator,
+            IModelMetadataProvider metadataProvider,
+            IUrlHelperFactory urlHelperFactory,
+            IJsonHelper jsonHelper,
+            DiagnosticSource diagnosticSource,
+            HtmlEncoder htmlEncoder,
+            IModelExpressionProvider modelExpressionProvider)
+        {
+            _pageActivator = pageActivator;
+            _modelMetadataProvider = metadataProvider;
+            _propertyAccessors = new RazorPagePropertyActivator.PropertyValueAccessors
+            {
+                UrlHelperAccessor = context => urlHelperFactory.GetUrlHelper(context),
+                JsonHelperAccessor = context => jsonHelper,
+                DiagnosticSourceAccessor = context => diagnosticSource,
+                HtmlEncoderAccessor = context => htmlEncoder,
+                ModelExpressionProviderAccessor = context => modelExpressionProvider,
+            };
+        }
+
+        public virtual Func<PageContext, ViewContext, object> CreatePageFactory(CompiledPageActionDescriptor actionDescriptor)
+        {
+            if (!typeof(PageBase).GetTypeInfo().IsAssignableFrom(actionDescriptor.PageTypeInfo))
+            {
+                throw new InvalidOperationException(Resources.FormatActivatedInstance_MustBeAnInstanceOf(
+                    _pageActivator.GetType().FullName,
+                    typeof(PageBase).FullName));
+            }
+
+            var activatorFactory = _pageActivator.CreateActivator(actionDescriptor);
+            var declaredModelType = actionDescriptor.DeclaredModelTypeInfo?.AsType() ?? actionDescriptor.PageTypeInfo.AsType();
+            var propertyActivator = new RazorPagePropertyActivator(
+                actionDescriptor.PageTypeInfo.AsType(),
+                declaredModelType,
+                _modelMetadataProvider,
+                _propertyAccessors);
+
+            return (pageContext, viewContext) =>
+            {
+                var page = (PageBase)activatorFactory(pageContext, viewContext);
+                page.PageContext = pageContext;
+                page.Path = pageContext.ActionDescriptor.RelativePath;
+                page.ViewContext = viewContext;
+                propertyActivator.Activate(page, viewContext);
+                return page;
+            };
+        }
+
+        public virtual Action<PageContext, ViewContext, object> CreatePageDisposer(CompiledPageActionDescriptor descriptor)
+        {
+            if (descriptor == null)
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+
+            return _pageActivator.CreateReleaser(descriptor);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageModelActivatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageModelActivatorProvider.cs
new file mode 100644
index 0000000000..2ec04a81ab
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageModelActivatorProvider.cs
@@ -0,0 +1,68 @@
+// 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.
+
+using System;
+using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    /// <summary>
+    /// <see cref="IPageActivatorProvider"/> that uses type activation to create Razor Page instances.
+    /// </summary>
+    public class DefaultPageModelActivatorProvider : IPageModelActivatorProvider
+    {
+        private readonly Action<PageContext, object> _disposer = Dispose;
+
+        /// <inheritdoc />
+        public virtual Func<PageContext, object> CreateActivator(CompiledPageActionDescriptor actionDescriptor)
+        {
+            if (actionDescriptor == null)
+            {
+                throw new ArgumentNullException(nameof(actionDescriptor));
+            }
+
+            var modelTypeInfo = actionDescriptor.ModelTypeInfo?.AsType();
+            if (modelTypeInfo == null)
+            {
+                throw new ArgumentException(Resources.FormatPropertyOfTypeCannotBeNull(
+                    nameof(actionDescriptor.ModelTypeInfo),
+                    nameof(actionDescriptor)),
+                    nameof(actionDescriptor));
+            }
+
+            var factory = ActivatorUtilities.CreateFactory(modelTypeInfo, Type.EmptyTypes);
+            return (context) => factory(context.HttpContext.RequestServices, Array.Empty<object>());
+        }
+
+        public virtual Action<PageContext, object> CreateReleaser(CompiledPageActionDescriptor actionDescriptor)
+        {
+            if (actionDescriptor == null)
+            {
+                throw new ArgumentNullException(nameof(actionDescriptor));
+            }
+
+            if (typeof(IDisposable).GetTypeInfo().IsAssignableFrom(actionDescriptor.ModelTypeInfo))
+            {
+                return _disposer;
+            }
+
+            return null;
+        }
+
+        private static void Dispose(PageContext context, object page)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (page == null)
+            {
+                throw new ArgumentNullException(nameof(page));
+            }
+
+            ((IDisposable)page).Dispose();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageModelFactoryProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageModelFactoryProvider.cs
new file mode 100644
index 0000000000..6821916a4f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageModelFactoryProvider.cs
@@ -0,0 +1,70 @@
+// 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.
+
+using System;
+using System.Reflection;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    public class DefaultPageModelFactoryProvider : IPageModelFactoryProvider
+    {
+        private static readonly Func<PropertyInfo, PropertyActivator<PageContext>> _createActivateInfo =
+            CreateActivateInfo;
+        private readonly IPageModelActivatorProvider _modelActivator;
+
+        public DefaultPageModelFactoryProvider(IPageModelActivatorProvider modelActivator)
+        {
+            _modelActivator = modelActivator;
+        }
+
+        public virtual Func<PageContext, object> CreateModelFactory(CompiledPageActionDescriptor descriptor)
+        {
+            if (descriptor == null)
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+
+            if (descriptor.ModelTypeInfo == null)
+            {
+                return null;
+            }
+
+            var modelActivator = _modelActivator.CreateActivator(descriptor);
+            var propertyActivator = PropertyActivator<PageContext>.GetPropertiesToActivate(
+                    descriptor.ModelTypeInfo.AsType(),
+                    typeof(PageContextAttribute),
+                    _createActivateInfo,
+                    includeNonPublic: false);
+
+            return pageContext =>
+            {
+                var model = modelActivator(pageContext);
+                for (var i = 0; i < propertyActivator.Length; i++)
+                {
+                    propertyActivator[i].Activate(model, pageContext);
+                }
+
+                return model;
+            };
+        }
+
+        public virtual Action<PageContext, object> CreateModelDisposer(CompiledPageActionDescriptor descriptor)
+        {
+            if (descriptor == null)
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+
+            if (descriptor.ModelTypeInfo == null)
+            {
+                return null;
+            }
+
+            return _modelActivator.CreateReleaser(descriptor);
+        }
+
+        private static PropertyActivator<PageContext> CreateActivateInfo(PropertyInfo property) =>
+            new PropertyActivator<PageContext>(property, pageContext => pageContext);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandlerMethodDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandlerMethodDescriptor.cs
new file mode 100644
index 0000000000..5372a5d5fa
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandlerMethodDescriptor.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    public class HandlerMethodDescriptor
+    {
+        public MethodInfo MethodInfo { get; set; }
+
+        public string HttpMethod { get; set; }
+
+        public string Name { get; set; }
+
+        public IList<HandlerParameterDescriptor> Parameters { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandlerParameterDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandlerParameterDescriptor.cs
new file mode 100644
index 0000000000..cc1be6d7b8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandlerParameterDescriptor.cs
@@ -0,0 +1,17 @@
+// 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.
+
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    public class HandlerParameterDescriptor : ParameterDescriptor, IParameterInfoParameterDescriptor
+    {
+        /// <summary>
+        /// Gets or sets the <see cref="System.Reflection.ParameterInfo"/>.
+        /// </summary>
+        public ParameterInfo ParameterInfo { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/IPageHandlerMethodSelector.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/IPageHandlerMethodSelector.cs
new file mode 100644
index 0000000000..06ae8f1f73
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/IPageHandlerMethodSelector.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    public interface IPageHandlerMethodSelector
+    {
+        HandlerMethodDescriptor Select(PageContext context);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/IPageLoader.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/IPageLoader.cs
new file mode 100644
index 0000000000..5d9a9cc0c4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/IPageLoader.cs
@@ -0,0 +1,18 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    /// <summary>
+    /// Creates a <see cref="CompiledPageActionDescriptor"/> from a <see cref="PageActionDescriptor"/>.
+    /// </summary>
+    public interface IPageLoader
+    {
+        /// <summary>
+        /// Produces a <see cref="CompiledPageActionDescriptor"/> given a <see cref="PageActionDescriptor"/>.
+        /// </summary>
+        /// <param name="actionDescriptor">The <see cref="PageActionDescriptor"/>.</param>
+        /// <returns>The <see cref="CompiledPageActionDescriptor"/>.</returns>
+        CompiledPageActionDescriptor Load(PageActionDescriptor actionDescriptor);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionDescriptorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionDescriptorProvider.cs
new file mode 100644
index 0000000000..7e1dbb47c2
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionDescriptorProvider.cs
@@ -0,0 +1,111 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    public class PageActionDescriptorProvider : IActionDescriptorProvider
+    {
+        private readonly IPageRouteModelProvider[] _routeModelProviders;
+        private readonly MvcOptions _mvcOptions;
+        private readonly IPageRouteModelConvention[] _conventions;
+
+        public PageActionDescriptorProvider(
+            IEnumerable<IPageRouteModelProvider> pageRouteModelProviders,
+            IOptions<MvcOptions> mvcOptionsAccessor,
+            IOptions<RazorPagesOptions> pagesOptionsAccessor)
+        {
+            _routeModelProviders = pageRouteModelProviders.OrderBy(p => p.Order).ToArray();
+            _mvcOptions = mvcOptionsAccessor.Value;
+
+            _conventions = pagesOptionsAccessor.Value.Conventions
+                .OfType<IPageRouteModelConvention>()
+                .ToArray();
+        }
+
+        public int Order { get; set; } = -900; // Run after the default MVC provider, but before others.
+
+        public void OnProvidersExecuting(ActionDescriptorProviderContext context)
+        {
+            var pageRouteModels = BuildModel();
+
+            for (var i = 0; i < pageRouteModels.Count; i++)
+            {
+                AddActionDescriptors(context.Results, pageRouteModels[i]);
+            }
+        }
+
+        protected IList<PageRouteModel> BuildModel()
+        {
+            var context = new PageRouteModelProviderContext();
+
+            for (var i = 0; i < _routeModelProviders.Length; i++)
+            {
+                _routeModelProviders[i].OnProvidersExecuting(context);
+            }
+
+            for (var i = _routeModelProviders.Length - 1; i >= 0; i--)
+            {
+                _routeModelProviders[i].OnProvidersExecuted(context);
+            }
+
+            return context.RouteModels;
+        }
+
+        public void OnProvidersExecuted(ActionDescriptorProviderContext context)
+        {
+        }
+
+        private void AddActionDescriptors(IList<ActionDescriptor> actions, PageRouteModel model)
+        {
+            for (var i = 0; i < _conventions.Length; i++)
+            {
+                _conventions[i].Apply(model);
+            }
+
+            foreach (var selector in model.Selectors)
+            {
+                var descriptor = new PageActionDescriptor
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo
+                    {
+                        Name = selector.AttributeRouteModel.Name,
+                        Order = selector.AttributeRouteModel.Order ?? 0,
+                        Template = selector.AttributeRouteModel.Template,
+                        SuppressLinkGeneration = selector.AttributeRouteModel.SuppressLinkGeneration,
+                        SuppressPathMatching = selector.AttributeRouteModel.SuppressPathMatching,
+                    },
+                    DisplayName = $"Page: {model.ViewEnginePath}",
+                    FilterDescriptors = Array.Empty<FilterDescriptor>(),
+                    Properties = new Dictionary<object, object>(model.Properties),
+                    RelativePath = model.RelativePath,
+                    ViewEnginePath = model.ViewEnginePath,
+                    AreaName = model.AreaName,
+                };
+
+                foreach (var kvp in model.RouteValues)
+                {
+                    if (!descriptor.RouteValues.ContainsKey(kvp.Key))
+                    {
+                        descriptor.RouteValues.Add(kvp.Key, kvp.Value);
+                    }
+                }
+
+                if (!descriptor.RouteValues.ContainsKey("page"))
+                {
+                    descriptor.RouteValues.Add("page", model.ViewEnginePath);
+                }
+
+                actions.Add(descriptor);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageArgumentBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageArgumentBinder.cs
new file mode 100644
index 0000000000..a4d8f5cba6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageArgumentBinder.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    [Obsolete("This type is obsolete and will be removed in a future version.")]
+    public abstract class PageArgumentBinder
+    {
+        public async Task<object> BindModelAsync(PageContext context, Type type, object @default, string name)
+        {
+            var result = await BindAsync(context, null, name, type);
+            return result.IsModelSet ? result.Model : @default;
+        }
+
+        public Task<TModel> BindModelAsync<TModel>(PageContext context, string name)
+        {
+            return BindModelAsync(context, default(TModel), name);
+        }
+
+        public async Task<TModel> BindModelAsync<TModel>(PageContext context, TModel @default, string name)
+        {
+            var result = await BindAsync(context, null, name, typeof(TModel));
+            return result.IsModelSet ? (TModel)result.Model : @default;
+        }
+
+        public async Task<bool> TryUpdateModelAsync<TModel>(PageContext context, TModel value)
+        {
+            var result = await BindAsync(context, value, string.Empty, typeof(TModel));
+            return result.IsModelSet && context.ModelState.IsValid;
+        }
+
+        public async Task<bool> TryUpdateModelAsync<TModel>(PageContext context, TModel value, string name)
+        {
+            var result = await BindAsync(context, value, name, typeof(TModel));
+            return result.IsModelSet && context.ModelState.IsValid;
+        }
+
+        protected abstract Task<ModelBindingResult> BindAsync(PageContext context, object value, string name, Type type);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageBoundPropertyDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageBoundPropertyDescriptor.cs
new file mode 100644
index 0000000000..4bb1f43ca9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageBoundPropertyDescriptor.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    public class PageBoundPropertyDescriptor : ParameterDescriptor, IPropertyInfoParameterDescriptor
+    {
+        /// <summary>
+        /// Gets or sets the <see cref="System.Reflection.PropertyInfo"/> for this property.
+        /// </summary>
+        public PropertyInfo Property { get; set; }
+
+        PropertyInfo IPropertyInfoParameterDescriptor.PropertyInfo => Property;
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageDirectiveFeature.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageDirectiveFeature.cs
new file mode 100644
index 0000000000..ff09f6abbf
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageDirectiveFeature.cs
@@ -0,0 +1,111 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Razor.Extensions;
+using Microsoft.AspNetCore.Mvc.RazorPages.Internal;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    public static class PageDirectiveFeature
+    {
+        private static readonly RazorProjectEngine PageDirectiveEngine = RazorProjectEngine.Create(RazorConfiguration.Default, new EmptyRazorProjectFileSystem(), builder =>
+        {
+            for (var i = builder.Phases.Count - 1; i >= 0; i--)
+            {
+                var phase = builder.Phases[i];
+                builder.Phases.RemoveAt(i);
+                if (phase is IRazorDocumentClassifierPhase)
+                {
+                    break;
+                }
+            }
+
+            RazorExtensions.Register(builder);
+            builder.Features.Add(new PageDirectiveParserOptionsFeature());
+        });
+
+        public static bool TryGetPageDirective(ILogger logger, RazorProjectItem projectItem, out string template)
+        {
+            if (projectItem == null)
+            {
+                throw new ArgumentNullException(nameof(projectItem));
+            }
+
+            var codeDocument = PageDirectiveEngine.Process(projectItem);
+
+            var documentIRNode = codeDocument.GetDocumentIntermediateNode();
+            if (PageDirective.TryGetPageDirective(documentIRNode, out var pageDirective))
+            {
+                if (pageDirective.DirectiveNode is MalformedDirectiveIntermediateNode malformedNode)
+                {
+                    logger.MalformedPageDirective(projectItem.FilePath, malformedNode.Diagnostics);
+                }
+
+                template = pageDirective.RouteTemplate;
+                return true;
+            }
+
+            template = null;
+            return false;
+        }
+
+        private class PageDirectiveParserOptionsFeature : RazorEngineFeatureBase, IConfigureRazorParserOptionsFeature
+        {
+            public int Order { get; }
+
+            public void Configure(RazorParserOptionsBuilder options)
+            {
+                options.ParseLeadingDirectives = true;
+            }
+        }
+
+        private class EmptyRazorProjectFileSystem : RazorProjectFileSystem
+        {
+            public override IEnumerable<RazorProjectItem> EnumerateItems(string basePath)
+            {
+                return Enumerable.Empty<RazorProjectItem>();
+            }
+
+            public override IEnumerable<RazorProjectItem> FindHierarchicalItems(string basePath, string path, string fileName)
+            {
+                return Enumerable.Empty<RazorProjectItem>();
+            }
+
+            public override RazorProjectItem GetItem(string path)
+            {
+                return new NotFoundProjectItem(string.Empty, path);
+            }
+
+            private class NotFoundProjectItem : RazorProjectItem
+            {
+                public NotFoundProjectItem(string basePath, string path)
+                {
+                    BasePath = basePath;
+                    FilePath = path;
+                }
+
+                /// <inheritdoc />
+                public override string BasePath { get; }
+
+                /// <inheritdoc />
+                public override string FilePath { get; }
+
+                /// <inheritdoc />
+                public override bool Exists => false;
+
+                /// <inheritdoc />
+                public override string PhysicalPath => throw new NotSupportedException();
+
+                /// <inheritdoc />
+                public override Stream Read() => throw new NotSupportedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageModelAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageModelAttribute.cs
new file mode 100644
index 0000000000..0ae311a8ee
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageModelAttribute.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    /// <summary>
+    /// An attribute for base classes for page models. Applying this attribute to a type
+    /// marks all subclasses of that type as page model types.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+    public class PageModelAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageResultExecutor.cs
new file mode 100644
index 0000000000..10539c0b2a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageResultExecutor.cs
@@ -0,0 +1,99 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    /// <summary>
+    /// Executes a Razor Page.
+    /// </summary>
+    public class PageResultExecutor : ViewExecutor
+    {
+        private readonly IRazorViewEngine _razorViewEngine;
+        private readonly IRazorPageActivator _razorPageActivator;
+        private readonly DiagnosticSource _diagnosticSource;
+        private readonly HtmlEncoder _htmlEncoder;
+
+        /// <summary>
+        /// Creates a new <see cref="PageResultExecutor"/>.
+        /// </summary>
+        /// <param name="writerFactory">The <see cref="IHttpResponseStreamWriterFactory"/>.</param>
+        /// <param name="compositeViewEngine">The <see cref="ICompositeViewEngine"/>.</param>
+        /// <param name="razorViewEngine">The <see cref="IRazorViewEngine"/>.</param>
+        /// <param name="razorPageActivator">The <see cref="IRazorPageActivator"/>.</param>
+        /// <param name="diagnosticSource">The <see cref="DiagnosticSource"/>.</param>
+        /// <param name="htmlEncoder">The <see cref="HtmlEncoder"/>.</param>
+        public PageResultExecutor(
+            IHttpResponseStreamWriterFactory writerFactory,
+            ICompositeViewEngine compositeViewEngine,
+            IRazorViewEngine razorViewEngine,
+            IRazorPageActivator razorPageActivator,
+            DiagnosticSource diagnosticSource,
+            HtmlEncoder htmlEncoder)
+            : base(writerFactory, compositeViewEngine, diagnosticSource)
+        {
+            _razorViewEngine = razorViewEngine;
+            _htmlEncoder = htmlEncoder;
+            _razorPageActivator = razorPageActivator;
+            _diagnosticSource = diagnosticSource;
+        }
+
+        /// <summary>
+        /// Executes a Razor Page asynchronously.
+        /// </summary>
+        public virtual Task ExecuteAsync(PageContext pageContext, PageResult result)
+        {
+            if (pageContext == null)
+            {
+                throw new ArgumentNullException(nameof(pageContext));
+            }
+
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            if (result.Model != null)
+            {
+                pageContext.ViewData.Model = result.Model;
+            }
+
+            OnExecuting(pageContext);
+
+            var viewStarts = new IRazorPage[pageContext.ViewStartFactories.Count];
+            for (var i = 0; i < pageContext.ViewStartFactories.Count; i++)
+            {
+                viewStarts[i] = pageContext.ViewStartFactories[i]();
+            }
+
+            var viewContext = result.Page.ViewContext;
+            viewContext.View = new RazorView(
+                _razorViewEngine,
+                _razorPageActivator,
+                viewStarts,
+                new RazorPageAdapter(result.Page),
+                _htmlEncoder,
+                _diagnosticSource);
+
+            return ExecuteAsync(viewContext, result.ContentType, result.StatusCode);
+        }
+
+        private void OnExecuting(PageContext pageContext)
+        {
+            var viewDataValuesProvider = pageContext.HttpContext.Features.Get<IViewDataValuesProviderFeature>();
+            if (viewDataValuesProvider != null)
+            {
+                viewDataValuesProvider.ProvideViewDataValues(pageContext.ViewData);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageViewLocationExpander.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageViewLocationExpander.cs
new file mode 100644
index 0000000000..974bb5f99a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageViewLocationExpander.cs
@@ -0,0 +1,69 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Razor;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    public class PageViewLocationExpander : IViewLocationExpander
+    {
+        public IEnumerable<string> ExpandViewLocations(ViewLocationExpanderContext context, IEnumerable<string> viewLocations)
+        {
+            if ((context.ActionContext.ActionDescriptor is PageActionDescriptor) && !string.IsNullOrEmpty(context.PageName))
+            {
+                return ExpandPageHierarchy();
+            }
+
+            // Not a page - just act natural.
+            return viewLocations;
+
+            IEnumerable<string> ExpandPageHierarchy()
+            {
+                foreach (var location in viewLocations)
+                {
+                    // For pages, we only handle the 'page' token when it's surrounded by slashes.
+                    //
+                    // Explanation: 
+                    //      We need the ability to 'collapse' the segment which requires us to understand slashes.
+                    //      Imagine a path like /{1}/{0} - we might end up with //{0} if we don't do *something* with
+                    //      the slashes. Instead of picking on (leading or trailing), we choose both. This seems
+                    //      less arbitrary.
+                    //
+                    //
+                    // So given a Page like /Account/Manage/Index using /Pages as the root, and the default set of 
+                    // search paths, this will produce the expanded paths:
+                    //
+                    //  /Pages/Account/Manage/{0}.cshtml
+                    //  /Pages/Account/{0}.cshtml
+                    //  /Pages/{0}.cshtml
+                    //  /Views/Shared/{0}.cshtml
+
+                    if (!location.Contains("/{1}/"))
+                    {
+                        // If the location doesn't have the 'page' replacement token just return it as-is.
+                        yield return location;
+                        continue;
+                    }
+
+                    // For locations with the 'page' token - expand them into an ascending directory search,
+                    // but only up to the pages root.
+                    //
+                    // This is easy because the 'page' token already trims the root directory.
+                    var end = context.PageName.Length;
+
+                    while (end > 0 && (end = context.PageName.LastIndexOf('/', end - 1)) != -1)
+                    {
+                        // PageName always starts with `/`
+                        yield return location.Replace("/{1}/", context.PageName.Substring(0, end + 1));
+                    }
+                }
+            }
+        }
+
+        public void PopulateValues(ViewLocationExpanderContext context)
+        {
+            // The value we care about - 'page' is already part of the system. We don't need to add it manually.
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/RazorPageAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/RazorPageAdapter.cs
new file mode 100644
index 0000000000..452161083b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/RazorPageAdapter.cs
@@ -0,0 +1,79 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    // Implements IRazorPage so that RazorPageBase-derived classes don't get activated twice.
+    //
+    // The page gets activated before handler methods run, but the RazorView will also activate
+    // each page.
+    public class RazorPageAdapter : IRazorPage
+    {
+        private readonly RazorPageBase _page;
+
+        public RazorPageAdapter(RazorPageBase page)
+        {
+            if (page == null)
+            {
+                throw new ArgumentNullException(nameof(page));
+            }
+
+            _page = page;
+        }
+
+        public ViewContext ViewContext
+        {
+            get { return _page.ViewContext; }
+            set { _page.ViewContext = value; }
+        }
+
+        public IHtmlContent BodyContent
+        {
+            get { return _page.BodyContent; }
+            set { _page.BodyContent = value; }
+        }
+
+        public bool IsLayoutBeingRendered
+        {
+            get { return _page.IsLayoutBeingRendered; }
+            set { _page.IsLayoutBeingRendered = value; }
+        }
+
+        public string Path
+        {
+            get { return _page.Path; }
+            set { _page.Path = value; }
+        }
+
+        public string Layout
+        {
+            get { return _page.Layout; }
+            set { _page.Layout = value; }
+        }
+
+        public IDictionary<string, RenderAsyncDelegate> PreviousSectionWriters
+        {
+            get { return _page.PreviousSectionWriters; }
+            set { _page.PreviousSectionWriters = value; }
+        }
+
+        public IDictionary<string, RenderAsyncDelegate> SectionWriters => _page.SectionWriters;
+
+        public void EnsureRenderedBodyOrSections()
+        {
+            _page.EnsureRenderedBodyOrSections();
+        }
+
+        public Task ExecuteAsync()
+        {
+            return _page.ExecuteAsync();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/RazorPageAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/RazorPageAttribute.cs
new file mode 100644
index 0000000000..900827a018
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/RazorPageAttribute.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    public class RazorPageAttribute : RazorViewAttribute
+    {
+        public RazorPageAttribute(string path, Type viewType, string routeTemplate)
+            : base(path, viewType)
+        {
+            RouteTemplate = routeTemplate;
+        }
+
+        public string RouteTemplate { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/AuthorizationPageApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/AuthorizationPageApplicationModelProvider.cs
new file mode 100644
index 0000000000..ad047c1ede
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/AuthorizationPageApplicationModelProvider.cs
@@ -0,0 +1,48 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Authorization;
+using Microsoft.AspNetCore.Mvc.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class AuthorizationPageApplicationModelProvider : IPageApplicationModelProvider
+    {
+        private readonly IAuthorizationPolicyProvider _policyProvider;
+
+        public AuthorizationPageApplicationModelProvider(IAuthorizationPolicyProvider policyProvider)
+        {
+            _policyProvider = policyProvider;
+        }
+
+        // The order is set to execute after the DefaultPageApplicationModelProvider.
+        public int Order => -1000 + 10;
+
+        public void OnProvidersExecuting(PageApplicationModelProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var pageModel = context.PageApplicationModel;
+            var authorizeData = pageModel.HandlerTypeAttributes.OfType<IAuthorizeData>().ToArray();
+            if (authorizeData.Length > 0)
+            {
+                pageModel.Filters.Add(AuthorizationApplicationModelProvider.GetFilter(_policyProvider, authorizeData));
+            }
+            foreach (var attribute in pageModel.HandlerTypeAttributes.OfType<IAllowAnonymous>())
+            {
+                pageModel.Filters.Add(new AllowAnonymousFilter());
+            }
+        }
+
+        public void OnProvidersExecuted(PageApplicationModelProviderContext context)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/AutoValidateAntiforgeryPageApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/AutoValidateAntiforgeryPageApplicationModelProvider.cs
new file mode 100644
index 0000000000..2103a4606b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/AutoValidateAntiforgeryPageApplicationModelProvider.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class AutoValidateAntiforgeryPageApplicationModelProvider : IPageApplicationModelProvider
+    {
+        // The order is set to execute after the DefaultPageApplicationModelProvider.
+        public int Order => -1000 + 10;
+
+        public void OnProvidersExecuted(PageApplicationModelProviderContext context)
+        {
+        }
+
+        public void OnProvidersExecuting(PageApplicationModelProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var pageApplicationModel = context.PageApplicationModel;
+            
+            // Always require an antiforgery token on post
+            pageApplicationModel.Filters.Add(new AutoValidateAntiforgeryTokenAttribute());
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/CompiledPageActionDescriptorBuilder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/CompiledPageActionDescriptorBuilder.cs
new file mode 100644
index 0000000000..29f7214448
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/CompiledPageActionDescriptorBuilder.cs
@@ -0,0 +1,136 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    /// <summary>
+    /// Constructs a <see cref="CompiledPageActionDescriptor"/> from an <see cref="PageApplicationModel"/>.
+    /// </summary>
+    public static class CompiledPageActionDescriptorBuilder
+    {
+        /// <summary>
+        /// Creates a <see cref="CompiledPageActionDescriptor"/> from the specified <paramref name="applicationModel"/>.
+        /// </summary>
+        /// <param name="applicationModel">The <see cref="PageApplicationModel"/>.</param>
+        /// <param name="globalFilters">Global filters to apply to the page.</param>
+        /// <returns>The <see cref="CompiledPageActionDescriptor"/>.</returns>
+        public static CompiledPageActionDescriptor Build(
+            PageApplicationModel applicationModel,
+            FilterCollection globalFilters)
+        {
+            var boundProperties = CreateBoundProperties(applicationModel);
+            var filters = Enumerable.Concat(
+                    globalFilters.Select(f => new FilterDescriptor(f, FilterScope.Global)),
+                    applicationModel.Filters.Select(f => new FilterDescriptor(f, FilterScope.Action)))
+                .ToArray();
+            var handlerMethods = CreateHandlerMethods(applicationModel);
+
+            if (applicationModel.ModelType != null && applicationModel.DeclaredModelType != null &&
+                !applicationModel.DeclaredModelType.IsAssignableFrom(applicationModel.ModelType))
+            {
+                var message = Resources.FormatInvalidActionDescriptorModelType(
+                    applicationModel.ActionDescriptor.DisplayName,
+                    applicationModel.ModelType.Name,
+                    applicationModel.DeclaredModelType.Name);
+
+                throw new InvalidOperationException(message);
+            }
+
+            var actionDescriptor = applicationModel.ActionDescriptor;
+            return new CompiledPageActionDescriptor(actionDescriptor)
+            {
+                ActionConstraints = actionDescriptor.ActionConstraints,
+                AttributeRouteInfo = actionDescriptor.AttributeRouteInfo,
+                BoundProperties = boundProperties,
+                FilterDescriptors = filters,
+                HandlerMethods = handlerMethods,
+                HandlerTypeInfo = applicationModel.HandlerType,
+                DeclaredModelTypeInfo = applicationModel.DeclaredModelType,
+                ModelTypeInfo = applicationModel.ModelType,
+                RouteValues = actionDescriptor.RouteValues,
+                PageTypeInfo = applicationModel.PageType,
+                Properties = applicationModel.Properties,
+            };
+        }
+
+        // Internal for unit testing
+        internal static HandlerMethodDescriptor[] CreateHandlerMethods(PageApplicationModel applicationModel)
+        {
+            var handlerModels = applicationModel.HandlerMethods;
+            var handlerDescriptors = new HandlerMethodDescriptor[handlerModels.Count];
+
+            for (var i = 0; i < handlerDescriptors.Length; i++)
+            {
+                var handlerModel = handlerModels[i];
+
+                handlerDescriptors[i] = new HandlerMethodDescriptor
+                {
+                    HttpMethod = handlerModel.HttpMethod,
+                    Name = handlerModel.HandlerName,
+                    MethodInfo = handlerModel.MethodInfo,
+                    Parameters = CreateHandlerParameters(handlerModel),
+                };
+            }
+
+            return handlerDescriptors;
+        }
+
+        // internal for unit testing
+        internal static HandlerParameterDescriptor[] CreateHandlerParameters(PageHandlerModel handlerModel)
+        {
+            var methodParameters = handlerModel.Parameters;
+            var parameters = new HandlerParameterDescriptor[methodParameters.Count];
+
+            for (var i = 0; i < parameters.Length; i++)
+            {
+                var parameterModel = methodParameters[i];
+
+                parameters[i] = new HandlerParameterDescriptor
+                {
+                    BindingInfo = parameterModel.BindingInfo,
+                    Name = parameterModel.ParameterName,
+                    ParameterInfo = parameterModel.ParameterInfo,
+                    ParameterType = parameterModel.ParameterInfo.ParameterType,
+                };
+            }
+
+            return parameters;
+        }
+
+        // internal for unit testing
+        internal static PageBoundPropertyDescriptor[] CreateBoundProperties(PageApplicationModel applicationModel)
+        {
+            var results = new List<PageBoundPropertyDescriptor>();
+            var properties = applicationModel.HandlerProperties;
+            for (var i = 0; i < properties.Count; i++)
+            {
+                var propertyModel = properties[i];
+
+                // Only add properties which are explicitly marked to bind.
+                if (propertyModel.BindingInfo == null)
+                {
+                    continue;
+                }
+
+                var descriptor = new PageBoundPropertyDescriptor
+                {
+                    Property = propertyModel.PropertyInfo,
+                    Name = propertyModel.PropertyName,
+                    BindingInfo = propertyModel.BindingInfo,
+                    ParameterType = propertyModel.PropertyInfo.PropertyType,
+                };
+
+                results.Add(descriptor);
+            }
+
+            return results.ToArray();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/CompiledPageRouteModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/CompiledPageRouteModelProvider.cs
new file mode 100644
index 0000000000..544521e5a7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/CompiledPageRouteModelProvider.cs
@@ -0,0 +1,169 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Mvc.Razor.Extensions;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.AspNetCore.Razor.Hosting;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class CompiledPageRouteModelProvider : IPageRouteModelProvider
+    {
+        private readonly ApplicationPartManager _applicationManager;
+        private readonly RazorPagesOptions _pagesOptions;
+        private readonly RazorProjectEngine _razorProjectEngine;
+        private readonly ILogger<CompiledPageRouteModelProvider> _logger;
+        private readonly PageRouteModelFactory _routeModelFactory;
+
+        public CompiledPageRouteModelProvider(
+            ApplicationPartManager applicationManager,
+            IOptions<RazorPagesOptions> pagesOptionsAccessor,
+            RazorProjectEngine razorProjectEngine,
+            ILogger<CompiledPageRouteModelProvider> logger)
+        {
+            _applicationManager = applicationManager ?? throw new ArgumentNullException(nameof(applicationManager));
+            _pagesOptions = pagesOptionsAccessor?.Value ?? throw new ArgumentNullException(nameof(pagesOptionsAccessor));
+            _razorProjectEngine = razorProjectEngine ?? throw new ArgumentNullException(nameof(razorProjectEngine));
+            _logger = logger ?? throw new ArgumentNullException(nameof(razorProjectEngine));
+            _routeModelFactory = new PageRouteModelFactory(_pagesOptions, _logger);
+        }
+
+        public int Order => -1000;
+
+        public void OnProvidersExecuting(PageRouteModelProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            CreateModels(context);
+        }
+
+        public void OnProvidersExecuted(PageRouteModelProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+        }
+
+        private IEnumerable<CompiledViewDescriptor> GetViewDescriptors(ApplicationPartManager applicationManager)
+        {
+            if (applicationManager == null)
+            {
+                throw new ArgumentNullException(nameof(applicationManager));
+            }
+
+            var viewsFeature = GetViewFeature(applicationManager);
+
+            var visited = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            foreach (var viewDescriptor in viewsFeature.ViewDescriptors)
+            {
+                if (!visited.Add(viewDescriptor.RelativePath))
+                {
+                    // Already seen an descriptor with a higher "order"
+                    continue;
+                }
+
+                if (!viewDescriptor.IsPrecompiled)
+                {
+                    continue;
+                }
+
+                if (IsRazorPage(viewDescriptor))
+                {
+                    yield return viewDescriptor;
+                }
+            }
+
+            bool IsRazorPage(CompiledViewDescriptor viewDescriptor)
+            {
+                if (viewDescriptor.Item != null)
+                {
+                    return viewDescriptor.Item.Kind == RazorPageDocumentClassifierPass.RazorPageDocumentKind;
+                }
+                else if (viewDescriptor.ViewAttribute != null)
+                {
+                    return viewDescriptor.ViewAttribute is RazorPageAttribute;
+                }
+
+                return false;
+            }
+        }
+
+        protected virtual ViewsFeature GetViewFeature(ApplicationPartManager applicationManager)
+        {
+            var viewsFeature = new ViewsFeature();
+            applicationManager.PopulateFeature(viewsFeature);
+            return viewsFeature;
+        }
+
+        private void CreateModels(PageRouteModelProviderContext context)
+        {
+            var rootDirectory = _pagesOptions.RootDirectory;
+            if (!rootDirectory.EndsWith("/", StringComparison.Ordinal))
+            {
+                rootDirectory = rootDirectory + "/";
+            }
+
+            var areaRootDirectory = "/Areas/";
+            foreach (var viewDescriptor in GetViewDescriptors(_applicationManager))
+            {
+                if (viewDescriptor.Item != null && !ChecksumValidator.IsItemValid(_razorProjectEngine.FileSystem, viewDescriptor.Item))
+                {
+                    // If we get here, this compiled Page has different local content, so ignore it.
+                    continue;
+                }
+
+                var relativePath = viewDescriptor.RelativePath;
+                var routeTemplate = GetRouteTemplate(viewDescriptor);
+                PageRouteModel routeModel = null;
+
+                // When RootDirectory and AreaRootDirectory overlap (e.g. RootDirectory = '/', AreaRootDirectory = '/Areas'), we
+                // only want to allow a page to be associated with the area route.
+                if (_pagesOptions.AllowAreas && relativePath.StartsWith(areaRootDirectory, StringComparison.OrdinalIgnoreCase))
+                {
+                    routeModel = _routeModelFactory.CreateAreaRouteModel(relativePath, routeTemplate);
+                }
+                else if (relativePath.StartsWith(rootDirectory, StringComparison.OrdinalIgnoreCase))
+                {
+                    routeModel = _routeModelFactory.CreateRouteModel(relativePath, routeTemplate);
+                }
+
+                if (routeModel != null)
+                {
+                    context.RouteModels.Add(routeModel);
+                }
+            }
+        }
+
+        internal static string GetRouteTemplate(CompiledViewDescriptor viewDescriptor)
+        {
+            if (viewDescriptor.ViewAttribute != null)
+            {
+                return ((RazorPageAttribute)viewDescriptor.ViewAttribute).RouteTemplate;
+            }
+
+            if (viewDescriptor.Item != null)
+            {
+                return viewDescriptor.Item.Metadata
+                    .OfType<RazorCompiledItemMetadataAttribute>()
+                    .FirstOrDefault(f => f.Key == RazorPageDocumentClassifierPass.RouteTemplateKey)
+                    ?.Value;
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageApplicationModelProvider.cs
new file mode 100644
index 0000000000..cc6a02af02
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageApplicationModelProvider.cs
@@ -0,0 +1,425 @@
+// 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.
+
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class DefaultPageApplicationModelProvider : IPageApplicationModelProvider
+    {
+        private const string ModelPropertyName = "Model";
+        private readonly PageHandlerPageFilter _pageHandlerPageFilter = new PageHandlerPageFilter();
+        private readonly PageHandlerResultFilter _pageHandlerResultFilter = new PageHandlerResultFilter();
+        private readonly IModelMetadataProvider _modelMetadataProvider;
+        private readonly MvcOptions _options;
+        private readonly Func<ActionContext, bool> _supportsAllRequests;
+        private readonly Func<ActionContext, bool> _supportsNonGetRequests;
+
+
+        public DefaultPageApplicationModelProvider(
+            IModelMetadataProvider modelMetadataProvider,
+            IOptions<MvcOptions> options)
+        {
+            _modelMetadataProvider = modelMetadataProvider;
+            _options = options.Value;
+
+            _supportsAllRequests = _ => true;
+            _supportsNonGetRequests = context => !string.Equals(context.HttpContext.Request.Method, "GET", StringComparison.OrdinalIgnoreCase);
+        }
+
+        /// <inheritdoc />
+        public int Order => -1000;
+
+        /// <inheritdoc />
+        public void OnProvidersExecuting(PageApplicationModelProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            context.PageApplicationModel = CreateModel(context.ActionDescriptor, context.PageType);
+        }
+
+        /// <inheritdoc />
+        public void OnProvidersExecuted(PageApplicationModelProviderContext context)
+        {
+        }
+
+        /// <summary>
+        /// Creates a <see cref="PageApplicationModel"/> for the given <paramref name="pageTypeInfo"/>.
+        /// </summary>
+        /// <param name="actionDescriptor">The <see cref="PageActionDescriptor"/>.</param>
+        /// <param name="pageTypeInfo">The <see cref="TypeInfo"/>.</param>
+        /// <returns>A <see cref="PageApplicationModel"/> for the given <see cref="TypeInfo"/>.</returns>
+        protected virtual PageApplicationModel CreateModel(
+            PageActionDescriptor actionDescriptor,
+            TypeInfo pageTypeInfo)
+        {
+            if (actionDescriptor == null)
+            {
+                throw new ArgumentNullException(nameof(actionDescriptor));
+            }
+
+            if (pageTypeInfo == null)
+            {
+                throw new ArgumentNullException(nameof(pageTypeInfo));
+            }
+
+            if (!typeof(PageBase).GetTypeInfo().IsAssignableFrom(pageTypeInfo))
+            {
+                throw new InvalidOperationException(Resources.FormatInvalidPageType_WrongBase(
+                    pageTypeInfo.FullName,
+                    typeof(PageBase).FullName));
+            }
+
+            // Pages always have a model type. If it's not set explicitly by the developer using
+            // @model, it will be the same as the page type.
+            var modelProperty = pageTypeInfo.GetProperty(ModelPropertyName, BindingFlags.Public | BindingFlags.Instance);
+            if (modelProperty == null)
+            {
+                throw new InvalidOperationException(Resources.FormatInvalidPageType_NoModelProperty(
+                    pageTypeInfo.FullName,
+                    ModelPropertyName));
+            }
+
+            var modelTypeInfo = modelProperty.PropertyType.GetTypeInfo();
+            var declaredModelType = modelTypeInfo;
+
+            // Now we want figure out which type is the handler type.
+            TypeInfo handlerType;
+            if (modelProperty.PropertyType.IsDefined(typeof(PageModelAttribute), inherit: true))
+            {
+                handlerType = modelTypeInfo;
+            }
+            else
+            {
+                handlerType = pageTypeInfo;
+            }
+
+            var handlerTypeAttributes = handlerType.GetCustomAttributes(inherit: true);
+            var pageModel = new PageApplicationModel(
+                actionDescriptor,
+                declaredModelType,
+                handlerType,
+                handlerTypeAttributes)
+            {
+                PageType = pageTypeInfo,
+                ModelType = modelTypeInfo,
+            };
+
+            PopulateHandlerMethods(pageModel);
+            PopulateHandlerProperties(pageModel);
+            PopulateFilters(pageModel);
+
+            return pageModel;
+        }
+
+        // Internal for unit testing
+        internal void PopulateHandlerProperties(PageApplicationModel pageModel)
+        {
+            var properties = PropertyHelper.GetVisibleProperties(pageModel.HandlerType.AsType());
+
+            for (var i = 0; i < properties.Length; i++)
+            {
+                var propertyModel = CreatePropertyModel(properties[i].Property);
+                if (propertyModel != null)
+                {
+                    propertyModel.Page = pageModel;
+                    pageModel.HandlerProperties.Add(propertyModel);
+                }
+            }
+        }
+
+        // Internal for unit testing
+        internal void PopulateHandlerMethods(PageApplicationModel pageModel)
+        {
+            var methods = pageModel.HandlerType.GetMethods();
+
+            for (var i = 0; i < methods.Length; i++)
+            {
+                var handler = CreateHandlerModel(methods[i]);
+                if (handler != null)
+                {
+                    pageModel.HandlerMethods.Add(handler);
+                }
+            }
+        }
+
+        internal void PopulateFilters(PageApplicationModel pageModel)
+        {
+            for (var i = 0; i < pageModel.HandlerTypeAttributes.Count; i++)
+            {
+                if (pageModel.HandlerTypeAttributes[i] is IFilterMetadata filter)
+                {
+                    pageModel.Filters.Add(filter);
+                }
+            }
+
+            if (typeof(IAsyncPageFilter).IsAssignableFrom(pageModel.HandlerType) ||
+                typeof(IPageFilter).IsAssignableFrom(pageModel.HandlerType))
+            {
+                pageModel.Filters.Add(_pageHandlerPageFilter);
+            }
+
+            if (typeof(IAsyncResultFilter).IsAssignableFrom(pageModel.HandlerType) ||
+                typeof(IResultFilter).IsAssignableFrom(pageModel.HandlerType))
+            {
+                pageModel.Filters.Add(_pageHandlerResultFilter);
+            }
+        }
+
+        /// <summary>
+        /// Creates a <see cref="PageHandlerModel"/> for the specified <paramref name="method"/>.s
+        /// </summary>
+        /// <param name="method">The <see cref="MethodInfo"/>.</param>
+        /// <returns>The <see cref="PageHandlerModel"/>.</returns>
+        protected virtual PageHandlerModel CreateHandlerModel(MethodInfo method)
+        {
+            if (method == null)
+            {
+                throw new ArgumentNullException(nameof(method));
+            }
+
+            if (!IsHandler(method))
+            {
+                return null;
+            }
+
+            if (!TryParseHandlerMethod(method.Name, out var httpMethod, out var handlerName))
+            {
+                return null;
+            }
+
+            var handlerModel = new PageHandlerModel(
+                method,
+                method.GetCustomAttributes(inherit: true))
+            {
+                Name = method.Name,
+                HandlerName = handlerName,
+                HttpMethod = httpMethod,
+            };
+
+            var methodParameters = handlerModel.MethodInfo.GetParameters();
+
+            for (var i = 0; i < methodParameters.Length; i++)
+            {
+                var parameter = methodParameters[i];
+                var parameterModel = CreateParameterModel(parameter);
+                parameterModel.Handler = handlerModel;
+
+                handlerModel.Parameters.Add(parameterModel);
+            }
+
+            return handlerModel;
+        }
+
+        /// <summary>
+        /// Creates a <see cref="PageParameterModel"/> for the specified <paramref name="parameter"/>.
+        /// </summary>
+        /// <param name="parameter">The <see cref="ParameterInfo"/>.</param>
+        /// <returns>The <see cref="PageParameterModel"/>.</returns>
+        protected virtual PageParameterModel CreateParameterModel(ParameterInfo parameter)
+        {
+            if (parameter == null)
+            {
+                throw new ArgumentNullException(nameof(parameter));
+            }
+
+            var attributes = parameter.GetCustomAttributes(inherit: true);
+
+            BindingInfo bindingInfo;
+            if (_options.AllowValidatingTopLevelNodes && _modelMetadataProvider is ModelMetadataProvider modelMetadataProviderBase)
+            {
+                var modelMetadata = modelMetadataProviderBase.GetMetadataForParameter(parameter);
+                bindingInfo = BindingInfo.GetBindingInfo(attributes, modelMetadata);
+            }
+            else
+            {
+                bindingInfo = BindingInfo.GetBindingInfo(attributes);
+            }
+
+            return new PageParameterModel(parameter, attributes)
+            {
+                BindingInfo = bindingInfo,
+                ParameterName = parameter.Name,
+            };
+        }
+
+        /// <summary>
+        /// Creates a <see cref="PagePropertyModel"/> for the <paramref name="property"/>.
+        /// </summary>
+        /// <param name="property">The <see cref="PropertyInfo"/>.</param>
+        /// <returns>The <see cref="PagePropertyModel"/>.</returns>
+        protected virtual PagePropertyModel CreatePropertyModel(PropertyInfo property)
+        {
+            if (property == null)
+            {
+                throw new ArgumentNullException(nameof(property));
+            }
+
+            var propertyAttributes = property.GetCustomAttributes(inherit: true);
+
+            // BindingInfo for properties can be either specified by decorating the property with binding-specific attributes.
+            // ModelMetadata also adds information from the property's type and any configured IBindingMetadataProvider.
+            var propertyMetadata = _modelMetadataProvider.GetMetadataForProperty(property.DeclaringType, property.Name);
+            var bindingInfo = BindingInfo.GetBindingInfo(propertyAttributes, propertyMetadata);
+
+            if (bindingInfo == null)
+            {
+                // Look for BindPropertiesAttribute on the handler type if no BindingInfo was inferred for the property.
+                // This allows a user to enable model binding on properties by decorating the controller type with BindPropertiesAttribute.
+                var declaringType = property.DeclaringType;
+                var bindPropertiesAttribute = declaringType.GetCustomAttribute<BindPropertiesAttribute>(inherit: true);
+                if (bindPropertiesAttribute != null)
+                {
+                    var requestPredicate = bindPropertiesAttribute.SupportsGet ? _supportsAllRequests : _supportsNonGetRequests;
+                    bindingInfo = new BindingInfo
+                    {
+                        RequestPredicate = requestPredicate,
+                    };
+                }
+            }
+
+            var model = new PagePropertyModel(property, propertyAttributes)
+            {
+                PropertyName = property.Name,
+                BindingInfo = bindingInfo,
+            };
+
+            return model;
+        }
+
+        /// <summary>
+        /// Determines if the specified <paramref name="methodInfo"/> is a handler.
+        /// </summary>
+        /// <param name="methodInfo">The <see cref="MethodInfo"/>.</param>
+        /// <returns><c>true</c> if the <paramref name="methodInfo"/> is a handler. Otherwise <c>false</c>.</returns>
+        /// <remarks>
+        /// Override this method to provide custom logic to determine which methods are considered handlers.
+        /// </remarks>
+        protected virtual bool IsHandler(MethodInfo methodInfo)
+        {
+            // The SpecialName bit is set to flag members that are treated in a special way by some compilers
+            // (such as property accessors and operator overloading methods).
+            if (methodInfo.IsSpecialName)
+            {
+                return false;
+            }
+
+            // Overridden methods from Object class, e.g. Equals(Object), GetHashCode(), etc., are not valid.
+            if (methodInfo.GetBaseDefinition().DeclaringType == typeof(object))
+            {
+                return false;
+            }
+
+            if (methodInfo.IsStatic)
+            {
+                return false;
+            }
+
+            if (methodInfo.IsAbstract)
+            {
+                return false;
+            }
+
+            if (methodInfo.IsConstructor)
+            {
+                return false;
+            }
+
+            if (methodInfo.IsGenericMethod)
+            {
+                return false;
+            }
+
+            if (!methodInfo.IsPublic)
+            {
+                return false;
+            }
+
+            if (methodInfo.IsDefined(typeof(NonHandlerAttribute)))
+            {
+                return false;
+            }
+
+            // Exclude the whole hierarchy of Page.
+            var declaringType = methodInfo.DeclaringType;
+            if (declaringType == typeof(Page) ||
+                declaringType == typeof(PageBase) ||
+                declaringType == typeof(RazorPageBase))
+            {
+                return false;
+            }
+
+            // Exclude methods declared on PageModel
+            if (declaringType == typeof(PageModel))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        internal static bool TryParseHandlerMethod(string methodName, out string httpMethod, out string handler)
+        {
+            httpMethod = null;
+            handler = null;
+
+            // Handler method names always start with "On"
+            if (!methodName.StartsWith("On") || methodName.Length <= "On".Length)
+            {
+                return false;
+            }
+
+            // Now we parse the method name according to our conventions to determine the required HTTP method
+            // and optional 'handler name'.
+            //
+            // Valid names look like:
+            //  - OnGet
+            //  - OnPost
+            //  - OnFooBar
+            //  - OnTraceAsync
+            //  - OnPostEditAsync
+
+            var start = "On".Length;
+            var length = methodName.Length;
+            if (methodName.EndsWith("Async", StringComparison.Ordinal))
+            {
+                length -= "Async".Length;
+            }
+
+            if (start == length)
+            {
+                // There are no additional characters. This is "On" or "OnAsync".
+                return false;
+            }
+
+            // The http method follows "On" and is required to be at least one character. We use casing
+            // to determine where it ends.
+            var handlerNameStart = start + 1;
+            for (; handlerNameStart < length; handlerNameStart++)
+            {
+                if (char.IsUpper(methodName[handlerNameStart]))
+                {
+                    break;
+                }
+            }
+
+            httpMethod = methodName.Substring(start, handlerNameStart - start);
+
+            // The handler name follows the http method and is optional. It includes everything up to the end
+            // excluding the "Async" suffix (if present).
+            handler = handlerNameStart == length ? null : methodName.Substring(handlerNameStart, length - handlerNameStart);
+            return true;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageArgumentBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageArgumentBinder.cs
new file mode 100644
index 0000000000..7b3310bbdd
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageArgumentBinder.cs
@@ -0,0 +1,49 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+#pragma warning disable CS0618 // Type or member is obsolete
+    public class DefaultPageArgumentBinder : PageArgumentBinder
+#pragma warning restore CS0618 // Type or member is obsolete
+    {
+        private readonly ParameterBinder _parameterBinder;
+
+        public DefaultPageArgumentBinder(ParameterBinder binder)
+        {
+            _parameterBinder = binder;
+        }
+
+        protected override async Task<ModelBindingResult> BindAsync(PageContext pageContext, object value, string name, Type type)
+        {
+            var valueProvider = await GetCompositeValueProvider(pageContext);
+            var parameterDescriptor = new ParameterDescriptor
+            {
+                BindingInfo = null,
+                Name = name,
+                ParameterType = type,
+            };
+
+            return await _parameterBinder.BindModelAsync(pageContext, valueProvider, parameterDescriptor, value);
+        }
+
+        private static async Task<CompositeValueProvider> GetCompositeValueProvider(PageContext pageContext)
+        {
+            var factories = pageContext.ValueProviderFactories;
+            var valueProviderFactoryContext = new ValueProviderFactoryContext(pageContext);
+            for (var i = 0; i < factories.Count; i++)
+            {
+                var factory = factories[i];
+                await factory.CreateValueProviderAsync(valueProviderFactoryContext);
+            }
+
+            return new CompositeValueProvider(valueProviderFactoryContext.ValueProviders);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageHandlerMethodSelector.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageHandlerMethodSelector.cs
new file mode 100644
index 0000000000..2369705ed7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageHandlerMethodSelector.cs
@@ -0,0 +1,195 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    public class DefaultPageHandlerMethodSelector : IPageHandlerMethodSelector
+    {
+        private const string Handler = "handler";
+
+        private readonly IOptions<RazorPagesOptions> _options;
+
+        [Obsolete("This constructor will be removed in a future release. Use the other constructor.")]
+        public DefaultPageHandlerMethodSelector()
+        {
+        }
+
+        public DefaultPageHandlerMethodSelector(IOptions<RazorPagesOptions> options)
+        {
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            _options = options;
+        }
+
+        private bool AllowFuzzyHttpMethodMatching => _options?.Value.AllowMappingHeadRequestsToGetHandler ?? false;
+
+        public HandlerMethodDescriptor Select(PageContext context)
+        {
+            var handlers = SelectHandlers(context);
+            if (handlers == null || handlers.Count == 0)
+            {
+                return null;
+            }
+
+            List<HandlerMethodDescriptor> ambiguousMatches = null;
+            HandlerMethodDescriptor bestMatch = null;
+            for (var score = 2; score >= 0; score--)
+            {
+                for (var i = 0; i < handlers.Count; i++)
+                {
+                    var handler = handlers[i];
+                    if (GetScore(handler) == score)
+                    {
+                        if (bestMatch == null)
+                        {
+                            bestMatch = handler;
+                            continue;
+                        }
+
+                        if (ambiguousMatches == null)
+                        {
+                            ambiguousMatches = new List<HandlerMethodDescriptor>();
+                            ambiguousMatches.Add(bestMatch);
+                        }
+
+                        ambiguousMatches.Add(handler);
+                    }
+                }
+
+                if (ambiguousMatches != null)
+                {
+                    var ambiguousMethods = string.Join(", ", ambiguousMatches.Select(m => m.MethodInfo));
+                    throw new InvalidOperationException(Resources.FormatAmbiguousHandler(Environment.NewLine, ambiguousMethods));
+                }
+
+                if (bestMatch != null)
+                {
+                    return bestMatch;
+                }
+            }
+
+            return null;
+        }
+
+        private List<HandlerMethodDescriptor> SelectHandlers(PageContext context)
+        {
+            var handlers = context.ActionDescriptor.HandlerMethods;
+            var candidates = new List<HandlerMethodDescriptor>();
+
+            // Name is optional, may not be provided.
+            var handlerName = GetHandlerName(context);
+
+            // The handler selection process considers handlers according to a few criteria. Handlers
+            // have a defined HTTP method that they handle, and also optionally a 'name'.
+            //
+            // We don't really have a scenario for handler methods without a verb (we don't provide a way
+            // to create one). If we see one, it will just never match.
+            //
+            // The verb must match (with some fuzzy matching) and the handler name must match if
+            // there is one.
+            //
+            // The process is like this:
+            //
+            //  1. Match the possible candidates on HTTP method
+            //  1a. **Added in 2.1** if no candidates matched in 1, then do *fuzzy matching*
+            //  2. Match the candidates from 1 or 1a on handler name.
+
+            // Step 1: match on HTTP method.
+            var httpMethod = context.HttpContext.Request.Method;
+            for (var i = 0; i < handlers.Count; i++)
+            {
+                var handler = handlers[i];
+                if (handler.HttpMethod != null &&
+                    string.Equals(handler.HttpMethod, httpMethod, StringComparison.OrdinalIgnoreCase))
+                {
+                    candidates.Add(handler);
+                }
+            }
+
+            // Step 1a: do fuzzy HTTP method matching if needed.
+            if (candidates.Count == 0 && AllowFuzzyHttpMethodMatching)
+            {
+                var fuzzyHttpMethod = GetFuzzyMatchHttpMethod(context);
+                if (fuzzyHttpMethod != null)
+                {
+                    for (var i = 0; i < handlers.Count; i++)
+                    {
+                        var handler = handlers[i];
+                        if (handler.HttpMethod != null &&
+                            string.Equals(handler.HttpMethod, fuzzyHttpMethod, StringComparison.OrdinalIgnoreCase))
+                        {
+                            candidates.Add(handler);
+                        }
+                    }
+                }
+            }
+
+            // Step 2: remove candidates with non-matching handlers.
+            for (var i = candidates.Count - 1; i >= 0; i--)
+            {
+                var handler = candidates[i];
+                if (handler.Name != null &&
+                    !handler.Name.Equals(handlerName, StringComparison.OrdinalIgnoreCase))
+                {
+                    candidates.RemoveAt(i);
+                }
+            }
+
+            return candidates;
+        }
+
+        private static int GetScore(HandlerMethodDescriptor descriptor)
+        {
+            if (descriptor.Name != null)
+            {
+                return 2;
+            }
+            else if (descriptor.HttpMethod != null)
+            {
+                return 1;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+
+        private static string GetHandlerName(PageContext context)
+        {
+            var handlerName = Convert.ToString(context.RouteData.Values[Handler]);
+            if (!string.IsNullOrEmpty(handlerName))
+            {
+                return handlerName;
+            }
+
+            if (context.HttpContext.Request.Query.TryGetValue(Handler, out StringValues queryValues))
+            {
+                return queryValues[0];
+            }
+
+            return null;
+        }
+
+        private static string GetFuzzyMatchHttpMethod(PageContext context)
+        {
+            var httpMethod = context.HttpContext.Request.Method;
+
+            // Map HEAD to get.
+            if (string.Equals("HEAD", httpMethod, StringComparison.OrdinalIgnoreCase))
+            {
+                return "GET";
+            }
+
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageLoader.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageLoader.cs
new file mode 100644
index 0000000000..9bb9390bcc
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageLoader.cs
@@ -0,0 +1,114 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class DefaultPageLoader : IPageLoader
+    {
+        private readonly IPageApplicationModelProvider[] _applicationModelProviders;
+        private readonly IViewCompilerProvider _viewCompilerProvider;
+        private readonly PageConventionCollection _conventions;
+        private readonly FilterCollection _globalFilters;
+
+        public DefaultPageLoader(
+            IEnumerable<IPageApplicationModelProvider> applicationModelProviders,
+            IViewCompilerProvider viewCompilerProvider,
+            IOptions<RazorPagesOptions> pageOptions,
+            IOptions<MvcOptions> mvcOptions)
+        {
+            _applicationModelProviders = applicationModelProviders
+                .OrderBy(p => p.Order)
+                .ToArray();
+            _viewCompilerProvider = viewCompilerProvider;
+            _conventions = pageOptions.Value.Conventions;
+            _globalFilters = mvcOptions.Value.Filters;
+        }
+
+        private IViewCompiler Compiler => _viewCompilerProvider.GetCompiler();
+
+        public CompiledPageActionDescriptor Load(PageActionDescriptor actionDescriptor)
+        {
+            if (actionDescriptor == null)
+            {
+                throw new ArgumentNullException(nameof(actionDescriptor));
+            }
+
+            var compileTask = Compiler.CompileAsync(actionDescriptor.RelativePath);
+            var viewDescriptor = compileTask.GetAwaiter().GetResult();
+
+            var context = new PageApplicationModelProviderContext(actionDescriptor, viewDescriptor.Type.GetTypeInfo());
+            for (var i = 0; i < _applicationModelProviders.Length; i++)
+            {
+                _applicationModelProviders[i].OnProvidersExecuting(context);
+            }
+
+            for (var i = _applicationModelProviders.Length - 1; i >= 0; i--)
+            {
+                _applicationModelProviders[i].OnProvidersExecuted(context);
+            }
+
+            ApplyConventions(_conventions, context.PageApplicationModel);
+
+            return CompiledPageActionDescriptorBuilder.Build(context.PageApplicationModel, _globalFilters);
+        }
+
+        internal static void ApplyConventions(
+            PageConventionCollection conventions,
+            PageApplicationModel pageApplicationModel)
+        {
+            var applicationModelConventions = GetConventions<IPageApplicationModelConvention>(pageApplicationModel.HandlerTypeAttributes);
+            foreach (var convention in applicationModelConventions)
+            {
+                convention.Apply(pageApplicationModel);
+            }
+
+            var handlers = pageApplicationModel.HandlerMethods.ToArray();
+            foreach (var handlerModel in handlers)
+            {
+                var handlerModelConventions = GetConventions<IPageHandlerModelConvention>(handlerModel.Attributes);
+                foreach (var convention in handlerModelConventions)
+                {
+                    convention.Apply(handlerModel);
+                }
+
+                var parameterModels = handlerModel.Parameters.ToArray();
+                foreach (var parameterModel in parameterModels)
+                {
+                    var parameterModelConventions = GetConventions<IParameterModelBaseConvention>(parameterModel.Attributes);
+                    foreach (var convention in parameterModelConventions)
+                    {
+                        convention.Apply(parameterModel);
+                    }
+                }
+            }
+
+            var properties = pageApplicationModel.HandlerProperties.ToArray();
+            foreach (var propertyModel in properties)
+            {
+                var propertyModelConventions = GetConventions<IParameterModelBaseConvention>(propertyModel.Attributes);
+                foreach (var convention in propertyModelConventions)
+                {
+                    convention.Apply(propertyModel);
+                }
+            }
+
+            IEnumerable<TConvention> GetConventions<TConvention>(
+                IReadOnlyList<object> attributes)
+            {
+                return Enumerable.Concat(
+                    conventions.OfType<TConvention>(),
+                    attributes.OfType<TConvention>());
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ExecutorFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ExecutorFactory.cs
new file mode 100644
index 0000000000..6bea1e9605
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ExecutorFactory.cs
@@ -0,0 +1,202 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public static class ExecutorFactory
+    {
+        public static PageHandlerExecutorDelegate CreateExecutor(HandlerMethodDescriptor handlerDescriptor)
+        {
+            if (handlerDescriptor == null)
+            {
+                throw new ArgumentNullException(nameof(handlerDescriptor));
+            }
+            
+            var handler = CreateHandlerMethod(handlerDescriptor);
+
+            return handler.Execute;
+        }
+
+        private static HandlerMethod CreateHandlerMethod(HandlerMethodDescriptor handlerDescriptor)
+        {
+            var method = handlerDescriptor.MethodInfo;
+            var parameters = handlerDescriptor.Parameters.ToArray();
+
+            var returnType = method.ReturnType;
+            if (returnType == typeof(void))
+            {
+                return new VoidHandlerMethod(parameters, method);
+            }
+            else if (typeof(IActionResult).IsAssignableFrom(returnType))
+            {
+                return new ActionResultHandlerMethod(parameters, method);
+            }
+            else if (returnType == typeof(Task))
+            {
+                return new NonGenericTaskHandlerMethod(parameters, method);
+            }
+            else
+            {
+                var taskType = ClosedGenericMatcher.ExtractGenericInterface(returnType, typeof(Task<>));
+                if (taskType != null && typeof(IActionResult).IsAssignableFrom(taskType.GenericTypeArguments[0]))
+                {
+                    return new GenericTaskHandlerMethod(parameters, method);
+                }
+            }
+
+            throw new InvalidOperationException(Resources.FormatUnsupportedHandlerMethodType(returnType));
+        }
+
+        private abstract class HandlerMethod
+        {
+            protected static Expression[] Unpack(Expression arguments, HandlerParameterDescriptor[] parameters)
+            {
+                var unpackExpressions = new Expression[parameters.Length];
+                for (var i = 0; i < parameters.Length; i++)
+                {
+                    unpackExpressions[i] = Expression.Convert(
+                        Expression.ArrayIndex(arguments, Expression.Constant(i)),
+                        parameters[i].ParameterType);
+                }
+
+                return unpackExpressions;
+            }
+
+            protected HandlerMethod(HandlerParameterDescriptor[] parameters)
+            {
+                Parameters = parameters;
+            }
+
+            public HandlerParameterDescriptor[] Parameters { get; }
+
+            public abstract Task<IActionResult> Execute(object receiver, object[] arguments);
+        }
+
+        private class NonGenericTaskHandlerMethod : HandlerMethod
+        {
+            private readonly Func<object, object[], Task> _thunk;
+
+            public NonGenericTaskHandlerMethod(HandlerParameterDescriptor[] parameters, MethodInfo method)
+                : base(parameters)
+            {
+                var receiver = Expression.Parameter(typeof(object), "receiver");
+                var arguments = Expression.Parameter(typeof(object[]), "arguments");
+
+                _thunk = Expression.Lambda<Func<object, object[], Task>>(
+                    Expression.Call(
+                        Expression.Convert(receiver, method.DeclaringType),
+                        method,
+                        Unpack(arguments, parameters)),
+                    receiver,
+                    arguments).Compile();
+            }
+
+            public override async Task<IActionResult> Execute(object receiver, object[] arguments)
+            {
+                await _thunk(receiver, arguments);
+                return null;
+            }
+        }
+
+        private class GenericTaskHandlerMethod : HandlerMethod
+        {
+            private static readonly MethodInfo ConvertMethod = typeof(GenericTaskHandlerMethod).GetMethod(
+                nameof(Convert),
+                BindingFlags.NonPublic | BindingFlags.Static);
+
+            private readonly Func<object, object[], Task<object>> _thunk;
+
+            public GenericTaskHandlerMethod(HandlerParameterDescriptor[] parameters, MethodInfo method)
+                : base(parameters)
+            {
+                var receiver = Expression.Parameter(typeof(object), "receiver");
+                var arguments = Expression.Parameter(typeof(object[]), "arguments");
+
+                _thunk = Expression.Lambda<Func<object, object[], Task<object>>>(
+                    Expression.Call(
+                        ConvertMethod.MakeGenericMethod(method.ReturnType.GenericTypeArguments),
+                        Expression.Convert(
+                            Expression.Call(
+                                Expression.Convert(receiver, method.DeclaringType),
+                                method,
+                                Unpack(arguments, parameters)),
+                            typeof(object))),
+                    receiver,
+                    arguments).Compile();
+            }
+
+            public override async Task<IActionResult> Execute(object receiver, object[] arguments)
+            {
+                var result = await _thunk(receiver, arguments);
+                return (IActionResult)result;
+            }
+
+            private static async Task<object> Convert<T>(object taskAsObject)
+            {
+                var task = (Task<T>)taskAsObject;
+                return await task;
+            }
+        }
+
+        private class VoidHandlerMethod : HandlerMethod
+        {
+            private readonly Action<object, object[]> _thunk;
+
+            public VoidHandlerMethod(HandlerParameterDescriptor[] parameters, MethodInfo method)
+                : base(parameters)
+            {
+                var receiver = Expression.Parameter(typeof(object), "receiver");
+                var arguments = Expression.Parameter(typeof(object[]), "arguments");
+
+                _thunk = Expression.Lambda<Action<object, object[]>>(
+                    Expression.Call(
+                        Expression.Convert(receiver, method.DeclaringType),
+                        method,
+                        Unpack(arguments, parameters)),
+                    receiver,
+                    arguments).Compile();
+            }
+
+            public override Task<IActionResult> Execute(object receiver, object[] arguments)
+            {
+                _thunk(receiver, arguments);
+                return Task.FromResult<IActionResult>(null);
+            }
+        }
+
+        private class ActionResultHandlerMethod : HandlerMethod
+        {
+            private readonly Func<object, object[], IActionResult> _thunk;
+
+            public ActionResultHandlerMethod(HandlerParameterDescriptor[] parameters, MethodInfo method)
+                : base(parameters)
+            {
+                var receiver = Expression.Parameter(typeof(object), "receiver");
+                var arguments = Expression.Parameter(typeof(object[]), "arguments");
+
+                _thunk = Expression.Lambda<Func<object, object[], IActionResult>>(
+                    Expression.Convert(
+                        Expression.Call(
+                            Expression.Convert(receiver, method.DeclaringType),
+                            method,
+                            Unpack(arguments, parameters)),
+                        typeof(IActionResult)),
+                    receiver,
+                    arguments).Compile();
+            }
+
+            public override Task<IActionResult> Execute(object receiver, object[] arguments)
+            {
+                return Task.FromResult(_thunk(receiver, arguments));
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/MvcRazorPagesDiagnosticSourceExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/MvcRazorPagesDiagnosticSourceExtensions.cs
new file mode 100644
index 0000000000..fd7ca7f0bc
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/MvcRazorPagesDiagnosticSourceExtensions.cs
@@ -0,0 +1,289 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public static class MvcRazorPagesDiagnosticSourceExtensions
+    {
+        public static void BeforeHandlerMethod(
+            this DiagnosticSource diagnosticSource,
+            ActionContext actionContext,
+            HandlerMethodDescriptor handlerMethodDescriptor,
+            IDictionary<string, object> arguments,
+            object instance)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(actionContext != null);
+            Debug.Assert(handlerMethodDescriptor != null);
+            Debug.Assert(arguments != null);
+            Debug.Assert(instance != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeHandlerMethod"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeHandlerMethod",
+                    new
+                    {
+                        actionContext = actionContext,
+                        arguments = arguments,
+                        handlerMethodDescriptor = handlerMethodDescriptor,
+                        instance = instance,
+                    });
+            }
+        }
+
+        public static void AfterHandlerMethod(
+            this DiagnosticSource diagnosticSource,
+            ActionContext actionContext,
+            HandlerMethodDescriptor handlerMethodDescriptor,
+            IDictionary<string, object> arguments,
+            object instance,
+            IActionResult result)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(actionContext != null);
+            Debug.Assert(handlerMethodDescriptor != null);
+            Debug.Assert(arguments != null);
+            Debug.Assert(instance != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterHandlerMethod"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterHandlerMethod",
+                    new
+                    {
+                        actionContext = actionContext,
+                        arguments = arguments,
+                        handlerMethodDescriptor = handlerMethodDescriptor,
+                        instance = instance,
+                        result = result
+                    });
+            }
+        }
+        
+        public static void BeforeOnPageHandlerExecution(
+            this DiagnosticSource diagnosticSource,
+            PageHandlerExecutingContext handlerExecutionContext,
+            IAsyncPageFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(handlerExecutionContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeOnPageHandlerExecution"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeOnPageHandlerExecution",
+                    new
+                    {
+                        actionDescriptor = handlerExecutionContext.ActionDescriptor,
+                        handlerExecutionContext = handlerExecutionContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void AfterOnPageHandlerExecution(
+            this DiagnosticSource diagnosticSource,
+            PageHandlerExecutedContext handlerExecutedContext,
+            IAsyncPageFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(handlerExecutedContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterOnPageHandlerExecution"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterOnPageHandlerExecution",
+                    new
+                    {
+                        actionDescriptor = handlerExecutedContext.ActionDescriptor,
+                        handlerExecutedContext = handlerExecutedContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void BeforeOnPageHandlerExecuting(
+            this DiagnosticSource diagnosticSource,
+            PageHandlerExecutingContext handlerExecutingContext,
+            IPageFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(handlerExecutingContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeOnPageHandlerExecuting"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeOnPageHandlerExecuting",
+                    new
+                    {
+                        actionDescriptor = handlerExecutingContext.ActionDescriptor,
+                        handlerExecutingContext = handlerExecutingContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void AfterOnPageHandlerExecuting(
+            this DiagnosticSource diagnosticSource,
+            PageHandlerExecutingContext handlerExecutingContext,
+            IPageFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(handlerExecutingContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterOnPageHandlerExecuting"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterOnPageHandlerExecuting",
+                    new
+                    {
+                        actionDescriptor = handlerExecutingContext.ActionDescriptor,
+                        handlerExecutingContext = handlerExecutingContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void BeforeOnPageHandlerExecuted(
+            this DiagnosticSource diagnosticSource,
+            PageHandlerExecutedContext handlerExecutedContext,
+            IPageFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(handlerExecutedContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeOnPageHandlerExecuted"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeOnPageHandlerExecuted",
+                    new
+                    {
+                        actionDescriptor = handlerExecutedContext.ActionDescriptor,
+                        handlerExecutedContext = handlerExecutedContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void AfterOnPageHandlerExecuted(
+            this DiagnosticSource diagnosticSource,
+            PageHandlerExecutedContext handlerExecutedContext,
+            IPageFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(handlerExecutedContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterOnPageHandlerExecuted"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterOnPageHandlerExecuted",
+                    new
+                    {
+                        actionDescriptor = handlerExecutedContext.ActionDescriptor,
+                        handlerExecutedContext = handlerExecutedContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void BeforeOnPageHandlerSelection(
+            this DiagnosticSource diagnosticSource,
+            PageHandlerSelectedContext handlerSelectedContext,
+            IAsyncPageFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(handlerSelectedContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeOnPageHandlerSelection"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeOnPageHandlerSelection",
+                    new
+                    {
+                        actionDescriptor = handlerSelectedContext.ActionDescriptor,
+                        handlerSelectedContext = handlerSelectedContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void AfterOnPageHandlerSelection(
+            this DiagnosticSource diagnosticSource,
+            PageHandlerSelectedContext handlerSelectedContext,
+            IAsyncPageFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(handlerSelectedContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterOnPageHandlerSelection"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterOnPageHandlerSelection",
+                    new
+                    {
+                        actionDescriptor = handlerSelectedContext.ActionDescriptor,
+                        handlerSelectedContext = handlerSelectedContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void BeforeOnPageHandlerSelected(
+            this DiagnosticSource diagnosticSource,
+            PageHandlerSelectedContext handlerSelectedContext,
+            IPageFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(handlerSelectedContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeOnPageHandlerSelected"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeOnPageHandlerSelected",
+                    new
+                    {
+                        actionDescriptor = handlerSelectedContext.ActionDescriptor,
+                        handlerSelectedContext = handlerSelectedContext,
+                        filter = filter
+                    });
+            }
+        }
+
+        public static void AfterOnPageHandlerSelected(
+            this DiagnosticSource diagnosticSource,
+            PageHandlerSelectedContext handlerSelectedContext,
+            IPageFilter filter)
+        {
+            Debug.Assert(diagnosticSource != null);
+            Debug.Assert(handlerSelectedContext != null);
+            Debug.Assert(filter != null);
+
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterOnPageHandlerSelected"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterOnPageHandlerSelected",
+                    new
+                    {
+                        actionDescriptor = handlerSelectedContext.ActionDescriptor,
+                        handlerSelectedContext = handlerSelectedContext,
+                        filter = filter
+                    });
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionDescriptorChangeProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionDescriptorChangeProvider.cs
new file mode 100644
index 0000000000..c68ee3ed65
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionDescriptorChangeProvider.cs
@@ -0,0 +1,102 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class PageActionDescriptorChangeProvider : IActionDescriptorChangeProvider
+    {
+        private readonly IFileProvider _fileProvider;
+        private readonly string[] _searchPatterns;
+        private readonly string[] _additionalFilesToTrack;
+
+        public PageActionDescriptorChangeProvider(
+            RazorTemplateEngine templateEngine,
+            IRazorViewEngineFileProviderAccessor fileProviderAccessor,
+            IOptions<RazorPagesOptions> razorPagesOptions)
+        {
+            if (templateEngine == null)
+            {
+                throw new ArgumentNullException(nameof(templateEngine));
+            }
+
+            if (fileProviderAccessor == null)
+            {
+                throw new ArgumentNullException(nameof(fileProviderAccessor));
+            }
+
+            if (razorPagesOptions == null)
+            {
+                throw new ArgumentNullException(nameof(razorPagesOptions));
+            }
+
+            _fileProvider = fileProviderAccessor.FileProvider;
+
+            var rootDirectory = razorPagesOptions.Value.RootDirectory;
+            Debug.Assert(!string.IsNullOrEmpty(rootDirectory));
+            rootDirectory = rootDirectory.TrimEnd('/');
+
+            // Search pattern that matches all cshtml files under the Pages RootDirectory
+            var pagesRootSearchPattern = rootDirectory + "/**/*.cshtml";
+
+            // pagesRootSearchPattern will miss _ViewImports outside the RootDirectory despite these influencing
+            // compilation. e.g. when RootDirectory = /Dir1/Dir2, the search pattern will ignore changes to 
+            // [/_ViewImports.cshtml, /Dir1/_ViewImports.cshtml]. We need to additionally account for these.
+            var importFileAtPagesRoot = rootDirectory + "/" + templateEngine.Options.ImportsFileName;
+            var additionalImportFilePaths = templateEngine.GetImportItems(importFileAtPagesRoot)
+                .Select(item => item.FilePath);
+
+            if (razorPagesOptions.Value.AllowAreas)
+            {
+                // Search pattern that matches all cshtml files under the Pages AreaRootDirectory
+                var areaRootSearchPattern = "/Areas/**/*.cshtml";
+
+                var importFileAtAreaPagesRoot = $"/Areas/{templateEngine.Options.ImportsFileName}";
+                var importPathsOutsideAreaPagesRoot = templateEngine.GetImportItems(importFileAtAreaPagesRoot)
+                    .Select(item => item.FilePath);
+
+                additionalImportFilePaths = additionalImportFilePaths
+                    .Concat(importPathsOutsideAreaPagesRoot)
+                    .Distinct(StringComparer.OrdinalIgnoreCase);
+
+                _searchPatterns = new[]
+                {
+                    pagesRootSearchPattern,
+                    areaRootSearchPattern
+                };
+            }
+            else
+            {
+                _searchPatterns = new[] { pagesRootSearchPattern, };
+            }
+
+            _additionalFilesToTrack = additionalImportFilePaths.ToArray();
+        }
+
+        public IChangeToken GetChangeToken()
+        {
+            var changeTokens = new IChangeToken[_additionalFilesToTrack.Length + _searchPatterns.Length];
+            for (var i = 0; i < _additionalFilesToTrack.Length; i++)
+            {
+                changeTokens[i] = _fileProvider.Watch(_additionalFilesToTrack[i]);
+            }
+
+            for (var i = 0; i < _searchPatterns.Length; i++)
+            {
+                var wildcardChangeToken = _fileProvider.Watch(_searchPatterns[i]);
+                changeTokens[_additionalFilesToTrack.Length + i] = wildcardChangeToken;
+            }
+
+            return new CompositeChangeToken(changeTokens);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvoker.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvoker.cs
new file mode 100644
index 0000000000..9684c711f0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvoker.cs
@@ -0,0 +1,723 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.ExceptionServices;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class PageActionInvoker : ResourceInvoker, IActionInvoker
+    {
+        private readonly IPageHandlerMethodSelector _selector;
+        private readonly PageContext _pageContext;
+        private readonly ParameterBinder _parameterBinder;
+        private readonly ITempDataDictionaryFactory _tempDataFactory;
+        private readonly HtmlHelperOptions _htmlHelperOptions;
+        private readonly CompiledPageActionDescriptor _actionDescriptor;
+
+        private Dictionary<string, object> _arguments;
+        private HandlerMethodDescriptor _handler;
+        private PageBase _page;
+        private object _pageModel;
+        private ViewContext _viewContext;
+
+        private PageHandlerSelectedContext _handlerSelectedContext;
+        private PageHandlerExecutingContext _handlerExecutingContext;
+        private PageHandlerExecutedContext _handlerExecutedContext;
+
+        public PageActionInvoker(
+            IPageHandlerMethodSelector handlerMethodSelector,
+            DiagnosticSource diagnosticSource,
+            ILogger logger,
+            IActionResultTypeMapper mapper,
+            PageContext pageContext,
+            IFilterMetadata[] filterMetadata,
+            PageActionInvokerCacheEntry cacheEntry,
+            ParameterBinder parameterBinder,
+            ITempDataDictionaryFactory tempDataFactory,
+            HtmlHelperOptions htmlHelperOptions)
+            : base(
+                  diagnosticSource,
+                  logger,
+                  mapper,
+                  pageContext,
+                  filterMetadata,
+                  pageContext.ValueProviderFactories)
+        {
+            _selector = handlerMethodSelector;
+            _pageContext = pageContext;
+            CacheEntry = cacheEntry;
+            _parameterBinder = parameterBinder;
+            _tempDataFactory = tempDataFactory;
+            _htmlHelperOptions = htmlHelperOptions;
+
+            _actionDescriptor = pageContext.ActionDescriptor;
+        }
+
+        // Internal for testing
+        internal PageActionInvokerCacheEntry CacheEntry { get; }
+
+        private bool HasPageModel => _actionDescriptor.HandlerTypeInfo != _actionDescriptor.PageTypeInfo;
+
+        // Internal for testing
+        internal PageContext PageContext => _pageContext;
+
+        /// <remarks>
+        /// <see cref="ResourceInvoker"/> for details on what the variables in this method represent.
+        /// </remarks>
+        protected override async Task InvokeInnerFilterAsync()
+        {
+            var next = State.PageBegin;
+            var scope = Scope.Invoker;
+            var state = (object)null;
+            var isCompleted = false;
+
+            while (!isCompleted)
+            {
+                await Next(ref next, ref scope, ref state, ref isCompleted);
+            }
+        }
+
+        protected override void ReleaseResources()
+        {
+            if (_pageModel != null && CacheEntry.ReleaseModel != null)
+            {
+                CacheEntry.ReleaseModel(_pageContext, _pageModel);
+            }
+
+            if (_page != null && CacheEntry.ReleasePage != null)
+            {
+                CacheEntry.ReleasePage(_pageContext, _viewContext, _page);
+            }
+        }
+
+        protected override Task InvokeResultAsync(IActionResult result)
+        {
+            // We also have some special initialization we need to do for PageResult.
+            if (result is PageResult pageResult)
+            {
+                // If we used a PageModel then the Page isn't initialized yet.
+                if (_viewContext == null)
+                {
+                    _viewContext = new ViewContext(
+                        _pageContext,
+                        NullView.Instance,
+                        _pageContext.ViewData,
+                        _tempDataFactory.GetTempData(_pageContext.HttpContext),
+                        TextWriter.Null,
+                        _htmlHelperOptions);
+                    _viewContext.ExecutingFilePath = _pageContext.ActionDescriptor.RelativePath;
+                }
+
+                if (_page == null)
+                {
+                    _page = (PageBase)CacheEntry.PageFactory(_pageContext, _viewContext);
+                }
+                pageResult.Page = _page;
+                pageResult.ViewData = pageResult.ViewData ?? _pageContext.ViewData;
+            }
+
+            return base.InvokeResultAsync(result);
+        }
+
+        private object CreateInstance()
+        {
+            if (HasPageModel)
+            {
+                // Since this is a PageModel, we need to activate it, and then run a handler method on the model.
+                _pageModel = CacheEntry.ModelFactory(_pageContext);
+                _pageContext.ViewData.Model = _pageModel;
+
+                return _pageModel;
+            }
+            else
+            {
+                // Since this is a Page without a PageModel, we need to create the Page before running a handler method.
+                _viewContext = new ViewContext(
+                    _pageContext,
+                    NullView.Instance,
+                    _pageContext.ViewData,
+                    _tempDataFactory.GetTempData(_pageContext.HttpContext),
+                    TextWriter.Null,
+                    _htmlHelperOptions);
+                _viewContext.ExecutingFilePath = _pageContext.ActionDescriptor.RelativePath;
+
+                _page = (PageBase)CacheEntry.PageFactory(_pageContext, _viewContext);
+
+                if (_actionDescriptor.ModelTypeInfo == _actionDescriptor.PageTypeInfo)
+                {
+                    _pageContext.ViewData.Model = _page;
+                }
+
+                return _page;
+            }
+        }
+
+        private HandlerMethodDescriptor SelectHandler()
+        {
+            return _selector.Select(_pageContext);
+        }
+
+        private Task BindArgumentsAsync()
+        {
+            // Perf: Avoid allocating async state machines where possible. We only need the state
+            // machine if you need to bind properties or arguments.
+            if (_actionDescriptor.BoundProperties.Count == 0 && (_handler == null || _handler.Parameters.Count == 0))
+            {
+                return Task.CompletedTask;
+            }
+
+            return BindArgumentsCoreAsync();
+        }
+
+        private async Task BindArgumentsCoreAsync()
+        {
+            await CacheEntry.PropertyBinder(_pageContext, _instance);
+
+            if (_handler == null)
+            {
+                return;
+            }
+
+            // We do two separate cache lookups, once for the binder and once for the executor.
+            // Reducing it to a single lookup requires a lot of code change with little value.
+            PageHandlerBinderDelegate handlerBinder = null;
+            for (var i = 0; i < _actionDescriptor.HandlerMethods.Count; i++)
+            {
+                if (object.ReferenceEquals(_handler, _actionDescriptor.HandlerMethods[i]))
+                {
+                    handlerBinder = CacheEntry.HandlerBinders[i];
+                    break;
+                }
+            }
+
+            await handlerBinder(_pageContext, _arguments);
+        }
+
+        private static object[] PrepareArguments(
+            IDictionary<string, object> argumentsInDictionary,
+            HandlerMethodDescriptor handler)
+        {
+            if (handler.Parameters.Count == 0)
+            {
+                return null;
+            }
+
+            var arguments = new object[handler.Parameters.Count];
+            for (var i = 0; i < arguments.Length; i++)
+            {
+                var parameter = handler.Parameters[i];
+
+                if (argumentsInDictionary.TryGetValue(parameter.ParameterInfo.Name, out var value))
+                {
+                    // Do nothing, already set the value.
+                }
+                else if (!ParameterDefaultValue.TryGetDefaultValue(parameter.ParameterInfo, out value) &&
+                    parameter.ParameterInfo.ParameterType.IsValueType)
+                {
+                    value = Activator.CreateInstance(parameter.ParameterInfo.ParameterType);
+                }
+
+                arguments[i] = value;
+            }
+
+            return arguments;
+        }
+
+        private async Task InvokeHandlerMethodAsync()
+        {
+            var handler = _handler;
+            if (_handler != null)
+            {
+                var arguments = PrepareArguments(_arguments, handler);
+
+                PageHandlerExecutorDelegate executor = null;
+                for (var i = 0; i < _actionDescriptor.HandlerMethods.Count; i++)
+                {
+                    if (object.ReferenceEquals(handler, _actionDescriptor.HandlerMethods[i]))
+                    {
+                        executor = CacheEntry.HandlerExecutors[i];
+                        break;
+                    }
+                }
+
+                Debug.Assert(executor != null, "We should always find a executor for a handler");
+
+                _diagnosticSource.BeforeHandlerMethod(_pageContext, handler, _arguments, _instance);
+                _logger.ExecutingHandlerMethod(_pageContext, handler, arguments);
+
+                try
+                {
+                    _result = await executor(_instance, arguments);
+                    _logger.ExecutedHandlerMethod(_pageContext, handler, _result);
+                }
+                finally
+                {
+                    _diagnosticSource.AfterHandlerMethod(_pageContext, handler, _arguments, _instance, _result);
+                }
+            }
+
+            // Pages have an implicit 'return Page()' even without a handler method.
+            if (_result == null)
+            {
+                _result = new PageResult();
+            }
+
+            // Ensure ViewData is set on PageResult for backwards compatibility (For example, Identity UI accesses
+            // ViewData in a PageFilter's PageHandlerExecutedMethod)
+            if (_result is PageResult pageResult)
+            {
+                pageResult.ViewData = pageResult.ViewData ?? _pageContext.ViewData;
+            }
+        }
+
+        private Task Next(ref State next, ref Scope scope, ref object state, ref bool isCompleted)
+        {
+            switch (next)
+            {
+                case State.PageBegin:
+                    {
+                        _instance = CreateInstance();
+
+                        goto case State.PageSelectHandlerBegin;
+                    }
+
+                case State.PageSelectHandlerBegin:
+                    {
+                        _cursor.Reset();
+
+                        _handler = SelectHandler();
+
+                        goto case State.PageSelectHandlerNext;
+                    }
+
+                case State.PageSelectHandlerNext:
+
+                    var currentSelector = _cursor.GetNextFilter<IPageFilter, IAsyncPageFilter>();
+                    if (currentSelector.FilterAsync != null)
+                    {
+                        if (_handlerSelectedContext == null)
+                        {
+                            _handlerSelectedContext = new PageHandlerSelectedContext(_pageContext, _filters, _instance)
+                            {
+                                HandlerMethod = _handler,
+                            };
+                        }
+
+                        state = currentSelector.FilterAsync;
+                        goto case State.PageSelectHandlerAsyncBegin;
+                    }
+                    else if (currentSelector.Filter != null)
+                    {
+                        if (_handlerSelectedContext == null)
+                        {
+                            _handlerSelectedContext = new PageHandlerSelectedContext(_pageContext, _filters, _instance)
+                            {
+                                HandlerMethod = _handler,
+                            };
+                        }
+
+                        state = currentSelector.Filter;
+                        goto case State.PageSelectHandlerSync;
+                    }
+                    else
+                    {
+                        goto case State.PageSelectHandlerEnd;
+                    }
+
+                case State.PageSelectHandlerAsyncBegin:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_handlerSelectedContext != null);
+
+                        var filter = (IAsyncPageFilter)state;
+                        var handlerSelectedContext = _handlerSelectedContext;
+
+                        _diagnosticSource.BeforeOnPageHandlerSelection(handlerSelectedContext, filter);
+                        _logger.BeforeExecutingMethodOnFilter(
+                            PageLoggerExtensions.PageFilter,
+                            nameof(IAsyncPageFilter.OnPageHandlerSelectionAsync),
+                            filter);
+
+                        var task = filter.OnPageHandlerSelectionAsync(handlerSelectedContext);
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.PageSelectHandlerAsyncEnd;
+                            return task;
+                        }
+
+                        goto case State.PageSelectHandlerAsyncEnd;
+                    }
+
+                case State.PageSelectHandlerAsyncEnd:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_handlerSelectedContext != null);
+
+                        var filter = (IAsyncPageFilter)state;
+
+                        _diagnosticSource.AfterOnPageHandlerSelection(_handlerSelectedContext, filter);
+                        _logger.AfterExecutingMethodOnFilter(
+                            PageLoggerExtensions.PageFilter,
+                            nameof(IAsyncPageFilter.OnPageHandlerSelectionAsync),
+                            filter);
+
+                        goto case State.PageSelectHandlerNext;
+                    }
+
+                case State.PageSelectHandlerSync:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_handlerSelectedContext != null);
+
+                        var filter = (IPageFilter)state;
+                        var handlerSelectedContext = _handlerSelectedContext;
+
+                        _diagnosticSource.BeforeOnPageHandlerSelected(handlerSelectedContext, filter);
+                        _logger.BeforeExecutingMethodOnFilter(
+                            PageLoggerExtensions.PageFilter,
+                            nameof(IPageFilter.OnPageHandlerSelected),
+                            filter);
+
+                        filter.OnPageHandlerSelected(handlerSelectedContext);
+
+                        _diagnosticSource.AfterOnPageHandlerSelected(handlerSelectedContext, filter);
+
+                        goto case State.PageSelectHandlerNext;
+                    }
+
+                case State.PageSelectHandlerEnd:
+                    {
+                        if (_handlerSelectedContext != null)
+                        {
+                            _handler = _handlerSelectedContext.HandlerMethod;
+                        }
+
+                        _arguments = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+
+                        _cursor.Reset();
+
+                        var task = BindArgumentsAsync();
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.PageNext;
+                            return task;
+                        }
+
+                        goto case State.PageNext;
+                    }
+
+                case State.PageNext:
+                    {
+                        var current = _cursor.GetNextFilter<IPageFilter, IAsyncPageFilter>();
+                        if (current.FilterAsync != null)
+                        {
+                            if (_handlerExecutingContext == null)
+                            {
+                                _handlerExecutingContext = new PageHandlerExecutingContext(_pageContext, _filters, _handler, _arguments, _instance);
+                            }
+
+                            state = current.FilterAsync;
+                            goto case State.PageAsyncBegin;
+                        }
+                        else if (current.Filter != null)
+                        {
+                            if (_handlerExecutingContext == null)
+                            {
+                                _handlerExecutingContext = new PageHandlerExecutingContext(_pageContext, _filters, _handler, _arguments, _instance);
+                            }
+
+                            state = current.Filter;
+                            goto case State.PageSyncBegin;
+                        }
+                        else
+                        {
+                            goto case State.PageInside;
+                        }
+                    }
+
+                case State.PageAsyncBegin:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_handlerExecutingContext != null);
+
+                        var filter = (IAsyncPageFilter)state;
+                        var handlerExecutingContext = _handlerExecutingContext;
+
+                        _diagnosticSource.BeforeOnPageHandlerExecution(handlerExecutingContext, filter);
+                        _logger.BeforeExecutingMethodOnFilter(
+                            PageLoggerExtensions.PageFilter,
+                            nameof(IAsyncPageFilter.OnPageHandlerExecutionAsync),
+                            filter);
+
+                        var task = filter.OnPageHandlerExecutionAsync(handlerExecutingContext, InvokeNextPageFilterAwaitedAsync);
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.PageAsyncEnd;
+                            return task;
+                        }
+
+                        goto case State.PageAsyncEnd;
+                    }
+
+                case State.PageAsyncEnd:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_handlerExecutingContext != null);
+
+                        var filter = (IAsyncPageFilter)state;
+
+                        if (_handlerExecutedContext == null)
+                        {
+                            // If we get here then the filter didn't call 'next' indicating a short circuit.
+                            _logger.PageFilterShortCircuited(filter);
+
+                            _handlerExecutedContext = new PageHandlerExecutedContext(
+                                _pageContext,
+                                _filters,
+                                _handler,
+                                _instance)
+                            {
+                                Canceled = true,
+                                Result = _handlerExecutingContext.Result,
+                            };
+                        }
+
+                        _diagnosticSource.AfterOnPageHandlerExecution(_handlerExecutedContext, filter);
+                        _logger.AfterExecutingMethodOnFilter(
+                           PageLoggerExtensions.PageFilter,
+                           nameof(IAsyncPageFilter.OnPageHandlerExecutionAsync),
+                           filter);
+
+                        goto case State.PageEnd;
+                    }
+
+                case State.PageSyncBegin:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_handlerExecutingContext != null);
+
+                        var filter = (IPageFilter)state;
+                        var handlerExecutingContext = _handlerExecutingContext;
+
+                        _diagnosticSource.BeforeOnPageHandlerExecuting(handlerExecutingContext, filter);
+                        _logger.BeforeExecutingMethodOnFilter(
+                           PageLoggerExtensions.PageFilter,
+                           nameof(IPageFilter.OnPageHandlerExecuting),
+                           filter);
+
+                        filter.OnPageHandlerExecuting(handlerExecutingContext);
+
+                        _diagnosticSource.AfterOnPageHandlerExecuting(handlerExecutingContext, filter);
+                        _logger.AfterExecutingMethodOnFilter(
+                           PageLoggerExtensions.PageFilter,
+                           nameof(IPageFilter.OnPageHandlerExecuting),
+                           filter);
+
+                        if (handlerExecutingContext.Result != null)
+                        {
+                            // Short-circuited by setting a result.
+                            _logger.PageFilterShortCircuited(filter);
+
+                            _handlerExecutedContext = new PageHandlerExecutedContext(
+                                _pageContext,
+                                _filters,
+                                _handler,
+                                _instance)
+                            {
+                                Canceled = true,
+                                Result = _handlerExecutingContext.Result,
+                            };
+
+                            goto case State.PageEnd;
+                        }
+
+                        var task = InvokeNextPageFilterAsync();
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.PageSyncEnd;
+                            return task;
+                        }
+
+                        goto case State.PageSyncEnd;
+                    }
+
+                case State.PageSyncEnd:
+                    {
+                        Debug.Assert(state != null);
+                        Debug.Assert(_handlerExecutingContext != null);
+                        Debug.Assert(_handlerExecutedContext != null);
+
+                        var filter = (IPageFilter)state;
+                        var handlerExecutedContext = _handlerExecutedContext;
+
+                        _diagnosticSource.BeforeOnPageHandlerExecuted(handlerExecutedContext, filter);
+                        _logger.BeforeExecutingMethodOnFilter(
+                           PageLoggerExtensions.PageFilter,
+                           nameof(IPageFilter.OnPageHandlerExecuted),
+                           filter);
+
+                        filter.OnPageHandlerExecuted(handlerExecutedContext);
+
+                        _diagnosticSource.AfterOnPageHandlerExecuted(handlerExecutedContext, filter);
+                        _logger.AfterExecutingMethodOnFilter(
+                           PageLoggerExtensions.PageFilter,
+                           nameof(IPageFilter.OnPageHandlerExecuted),
+                           filter);
+
+                        goto case State.PageEnd;
+                    }
+
+                case State.PageInside:
+                    {
+                        var task = InvokeHandlerMethodAsync();
+                        if (task.Status != TaskStatus.RanToCompletion)
+                        {
+                            next = State.PageEnd;
+                            return task;
+                        }
+
+                        goto case State.PageEnd;
+                    }
+
+                case State.PageEnd:
+                    {
+                        if (scope == Scope.Page)
+                        {
+                            if (_handlerExecutedContext == null)
+                            {
+                                _handlerExecutedContext = new PageHandlerExecutedContext(_pageContext, _filters, _handler, _instance)
+                                {
+                                    Result = _result,
+                                };
+                            }
+
+                            isCompleted = true;
+                            return Task.CompletedTask;
+                        }
+
+                        var handlerExecutedContext = _handlerExecutedContext;
+                        Rethrow(handlerExecutedContext);
+
+                        if (handlerExecutedContext != null)
+                        {
+                            _result = handlerExecutedContext.Result;
+                        }
+
+                        isCompleted = true;
+                        return Task.CompletedTask;
+                    }
+
+                default:
+                    throw new InvalidOperationException();
+            }
+        }
+
+        private async Task InvokeNextPageFilterAsync()
+        {
+            try
+            {
+                var next = State.PageNext;
+                var state = (object)null;
+                var scope = Scope.Page;
+                var isCompleted = false;
+                while (!isCompleted)
+                {
+                    await Next(ref next, ref scope, ref state, ref isCompleted);
+                }
+            }
+            catch (Exception exception)
+            {
+                _handlerExecutedContext = new PageHandlerExecutedContext(_pageContext, _filters, _handler, _instance)
+                {
+                    ExceptionDispatchInfo = ExceptionDispatchInfo.Capture(exception),
+                };
+            }
+
+            Debug.Assert(_handlerExecutedContext != null);
+        }
+
+        private async Task<PageHandlerExecutedContext> InvokeNextPageFilterAwaitedAsync()
+        {
+            Debug.Assert(_handlerExecutingContext != null);
+            if (_handlerExecutingContext.Result != null)
+            {
+                // If we get here, it means that an async filter set a result AND called next(). This is forbidden.
+                var message = Resources.FormatAsyncPageFilter_InvalidShortCircuit(
+                    typeof(IAsyncPageFilter).Name,
+                    nameof(PageHandlerExecutingContext.Result),
+                    typeof(PageHandlerExecutingContext).Name,
+                    typeof(PageHandlerExecutionDelegate).Name);
+
+                throw new InvalidOperationException(message);
+            }
+
+            await InvokeNextPageFilterAsync();
+
+            Debug.Assert(_handlerExecutedContext != null);
+            return _handlerExecutedContext;
+        }
+
+        private static void Rethrow(PageHandlerExecutedContext context)
+        {
+            if (context == null)
+            {
+                return;
+            }
+
+            if (context.ExceptionHandled)
+            {
+                return;
+            }
+
+            if (context.ExceptionDispatchInfo != null)
+            {
+                context.ExceptionDispatchInfo.Throw();
+            }
+
+            if (context.Exception != null)
+            {
+                throw context.Exception;
+            }
+        }
+
+        private enum Scope
+        {
+            Invoker,
+            Page,
+        }
+
+        private enum State
+        {
+            PageBegin,
+            PageSelectHandlerBegin,
+            PageSelectHandlerNext,
+            PageSelectHandlerAsyncBegin,
+            PageSelectHandlerAsyncEnd,
+            PageSelectHandlerSync,
+            PageSelectHandlerEnd,
+            PageNext,
+            PageAsyncBegin,
+            PageAsyncEnd,
+            PageSyncBegin,
+            PageSyncEnd,
+            PageInside,
+            PageEnd,
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvokerCacheEntry.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvokerCacheEntry.cs
new file mode 100644
index 0000000000..f2844d2023
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvokerCacheEntry.cs
@@ -0,0 +1,79 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class PageActionInvokerCacheEntry
+    {
+        public PageActionInvokerCacheEntry(
+            CompiledPageActionDescriptor actionDescriptor,
+            Func<IModelMetadataProvider, ModelStateDictionary, ViewDataDictionary> viewDataFactory,
+            Func<PageContext, ViewContext, object> pageFactory,
+            Action<PageContext, ViewContext, object> releasePage,
+            Func<PageContext, object> modelFactory,
+            Action<PageContext, object> releaseModel,
+            Func<PageContext, object, Task> propertyBinder,
+            PageHandlerExecutorDelegate[] handlerExecutors,
+            PageHandlerBinderDelegate[] handlerBinders,
+            IReadOnlyList<Func<IRazorPage>> viewStartFactories,
+            FilterItem[] cacheableFilters)
+        {
+            ActionDescriptor = actionDescriptor;
+            ViewDataFactory = viewDataFactory;
+            PageFactory = pageFactory;
+            ReleasePage = releasePage;
+            ModelFactory = modelFactory;
+            ReleaseModel = releaseModel;
+            PropertyBinder = propertyBinder;
+            HandlerExecutors = handlerExecutors;
+            HandlerBinders = handlerBinders;
+            ViewStartFactories = viewStartFactories;
+            CacheableFilters = cacheableFilters;
+        }
+
+        public CompiledPageActionDescriptor ActionDescriptor { get; }
+
+        public Func<PageContext, ViewContext, object> PageFactory { get; }
+
+        /// <summary>
+        /// The action invoked to release a page. This may be <c>null</c>.
+        /// </summary>
+        public Action<PageContext, ViewContext, object> ReleasePage { get; }
+
+        public Func<PageContext, object> ModelFactory { get; }
+
+        /// <summary>
+        /// The delegate invoked to release a model. This may be <c>null</c>.
+        /// </summary>
+        public Action<PageContext, object> ReleaseModel { get; }
+
+        /// <summary>
+        /// The delegate invoked to bind either the handler type (page or model).
+        /// This may be <c>null</c>.
+        /// </summary>
+        public Func<PageContext, object, Task> PropertyBinder { get; }
+
+        public PageHandlerExecutorDelegate[] HandlerExecutors { get; }
+
+        public PageHandlerBinderDelegate[] HandlerBinders { get; }
+
+        public Func<IModelMetadataProvider, ModelStateDictionary, ViewDataDictionary> ViewDataFactory { get; }
+
+        /// <summary>
+        /// Gets the applicable ViewStart pages.
+        /// </summary>
+        public IReadOnlyList<Func<IRazorPage>> ViewStartFactories { get; }
+
+        public FilterItem[] CacheableFilters { get; }
+
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvokerProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvokerProvider.cs
new file mode 100644
index 0000000000..007a2f9b14
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvokerProvider.cs
@@ -0,0 +1,289 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class PageActionInvokerProvider : IActionInvokerProvider
+    {
+        private const string ViewStartFileName = "_ViewStart.cshtml";
+
+        private readonly IPageLoader _loader;
+        private readonly IPageFactoryProvider _pageFactoryProvider;
+        private readonly IPageModelFactoryProvider _modelFactoryProvider;
+        private readonly IModelBinderFactory _modelBinderFactory;
+        private readonly IRazorPageFactoryProvider _razorPageFactoryProvider;
+        private readonly IActionDescriptorCollectionProvider _collectionProvider;
+        private readonly IFilterProvider[] _filterProviders;
+        private readonly IReadOnlyList<IValueProviderFactory> _valueProviderFactories;
+        private readonly ParameterBinder _parameterBinder;
+        private readonly IModelMetadataProvider _modelMetadataProvider;
+        private readonly ITempDataDictionaryFactory _tempDataFactory;
+        private readonly MvcOptions _mvcOptions;
+        private readonly HtmlHelperOptions _htmlHelperOptions;
+        private readonly IPageHandlerMethodSelector _selector;
+        private readonly RazorProjectFileSystem _razorFileSystem;
+        private readonly DiagnosticSource _diagnosticSource;
+        private readonly ILogger<PageActionInvoker> _logger;
+        private readonly IActionResultTypeMapper _mapper;
+        private volatile InnerCache _currentCache;
+
+        public PageActionInvokerProvider(
+            IPageLoader loader,
+            IPageFactoryProvider pageFactoryProvider,
+            IPageModelFactoryProvider modelFactoryProvider,
+            IRazorPageFactoryProvider razorPageFactoryProvider,
+            IActionDescriptorCollectionProvider collectionProvider,
+            IEnumerable<IFilterProvider> filterProviders,
+            ParameterBinder parameterBinder,
+            IModelMetadataProvider modelMetadataProvider,
+            IModelBinderFactory modelBinderFactory,
+            ITempDataDictionaryFactory tempDataFactory,
+            IOptions<MvcOptions> mvcOptions,
+            IOptions<HtmlHelperOptions> htmlHelperOptions,
+            IPageHandlerMethodSelector selector,
+            RazorProjectFileSystem razorFileSystem,
+            DiagnosticSource diagnosticSource,
+            ILoggerFactory loggerFactory,
+            IActionResultTypeMapper mapper)
+        {
+            _loader = loader;
+            _pageFactoryProvider = pageFactoryProvider;
+            _modelFactoryProvider = modelFactoryProvider;
+            _modelBinderFactory = modelBinderFactory;
+            _razorPageFactoryProvider = razorPageFactoryProvider;
+            _collectionProvider = collectionProvider;
+            _filterProviders = filterProviders.ToArray();
+            _valueProviderFactories = mvcOptions.Value.ValueProviderFactories.ToArray();
+            _parameterBinder = parameterBinder;
+            _modelMetadataProvider = modelMetadataProvider;
+            _tempDataFactory = tempDataFactory;
+            _mvcOptions = mvcOptions.Value;
+            _htmlHelperOptions = htmlHelperOptions.Value;
+            _selector = selector;
+            _razorFileSystem = razorFileSystem;
+            _diagnosticSource = diagnosticSource;
+            _logger = loggerFactory.CreateLogger<PageActionInvoker>();
+            _mapper = mapper;
+        }
+
+        public int Order { get; } = -1000;
+
+        public void OnProvidersExecuting(ActionInvokerProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var actionContext = context.ActionContext;
+            var actionDescriptor = actionContext.ActionDescriptor as PageActionDescriptor;
+            if (actionDescriptor == null)
+            {
+                return;
+            }
+
+            var cache = CurrentCache;
+            IFilterMetadata[] filters;
+            if (!cache.Entries.TryGetValue(actionDescriptor, out var cacheEntry))
+            {
+                actionContext.ActionDescriptor = _loader.Load(actionDescriptor);
+
+                var filterFactoryResult = FilterFactory.GetAllFilters(_filterProviders, actionContext);
+                filters = filterFactoryResult.Filters;
+                cacheEntry = CreateCacheEntry(context, filterFactoryResult.CacheableFilters);
+                cacheEntry = cache.Entries.GetOrAdd(actionDescriptor, cacheEntry);
+            }
+            else
+            {
+                filters = FilterFactory.CreateUncachedFilters(
+                    _filterProviders,
+                    actionContext,
+                    cacheEntry.CacheableFilters);
+            }
+
+            context.Result = CreateActionInvoker(actionContext, cacheEntry, filters);
+        }
+
+        public void OnProvidersExecuted(ActionInvokerProviderContext context)
+        {
+
+        }
+
+        private InnerCache CurrentCache
+        {
+            get
+            {
+                var current = _currentCache;
+                var actionDescriptors = _collectionProvider.ActionDescriptors;
+
+                if (current == null || current.Version != actionDescriptors.Version)
+                {
+                    current = new InnerCache(actionDescriptors.Version);
+                    _currentCache = current;
+                }
+
+                return current;
+            }
+        }
+
+        private PageActionInvoker CreateActionInvoker(
+            ActionContext actionContext,
+            PageActionInvokerCacheEntry cacheEntry,
+            IFilterMetadata[] filters)
+        {
+            var pageContext = new PageContext(actionContext)
+            {
+                ActionDescriptor = cacheEntry.ActionDescriptor,
+                ValueProviderFactories = new CopyOnWriteList<IValueProviderFactory>(_valueProviderFactories),
+                ViewData = cacheEntry.ViewDataFactory(_modelMetadataProvider, actionContext.ModelState),
+                ViewStartFactories = cacheEntry.ViewStartFactories.ToList(),
+            };
+
+            return new PageActionInvoker(
+                _selector,
+                _diagnosticSource,
+                _logger,
+                _mapper,
+                pageContext,
+                filters,
+                cacheEntry,
+                _parameterBinder,
+                _tempDataFactory,
+                _htmlHelperOptions);
+        }
+
+        private PageActionInvokerCacheEntry CreateCacheEntry(
+            ActionInvokerProviderContext context,
+            FilterItem[] cachedFilters)
+        {
+            var compiledActionDescriptor = (CompiledPageActionDescriptor)context.ActionContext.ActionDescriptor;
+
+            var viewDataFactory = ViewDataDictionaryFactory.CreateFactory(compiledActionDescriptor.DeclaredModelTypeInfo);
+
+            var pageFactory = _pageFactoryProvider.CreatePageFactory(compiledActionDescriptor);
+            var pageDisposer = _pageFactoryProvider.CreatePageDisposer(compiledActionDescriptor);
+            var propertyBinder = PageBinderFactory.CreatePropertyBinder(
+                _parameterBinder,
+                _modelMetadataProvider,
+                _modelBinderFactory,
+                compiledActionDescriptor);
+
+            Func<PageContext, object> modelFactory = null;
+            Action<PageContext, object> modelReleaser = null;
+            if (compiledActionDescriptor.ModelTypeInfo != compiledActionDescriptor.PageTypeInfo)
+            {
+                modelFactory = _modelFactoryProvider.CreateModelFactory(compiledActionDescriptor);
+                modelReleaser = _modelFactoryProvider.CreateModelDisposer(compiledActionDescriptor);
+            }
+
+            var viewStartFactories = GetViewStartFactories(compiledActionDescriptor);
+
+            var handlerExecutors = GetHandlerExecutors(compiledActionDescriptor);
+            var handlerBinders = GetHandlerBinders(compiledActionDescriptor);
+
+            return new PageActionInvokerCacheEntry(
+                compiledActionDescriptor,
+                viewDataFactory,
+                pageFactory,
+                pageDisposer,
+                modelFactory,
+                modelReleaser,
+                propertyBinder,
+                handlerExecutors,
+                handlerBinders,
+                viewStartFactories,
+                cachedFilters);
+        }
+
+        // Internal for testing.
+        internal List<Func<IRazorPage>> GetViewStartFactories(CompiledPageActionDescriptor descriptor)
+        {
+            var viewStartFactories = new List<Func<IRazorPage>>();
+            // Always pick up all _ViewStarts, including the ones outside the Pages root.
+            var viewStartItems = _razorFileSystem.FindHierarchicalItems(
+                descriptor.RelativePath,
+                ViewStartFileName);
+            foreach (var item in viewStartItems)
+            {
+                var factoryResult = _razorPageFactoryProvider.CreateFactory(item.FilePath);
+                if (factoryResult.Success)
+                {
+                    viewStartFactories.Insert(0, factoryResult.RazorPageFactory);
+                }
+            }
+
+            return viewStartFactories;
+        }
+
+        private static PageHandlerExecutorDelegate[] GetHandlerExecutors(CompiledPageActionDescriptor actionDescriptor)
+        {
+            if (actionDescriptor.HandlerMethods == null || actionDescriptor.HandlerMethods.Count == 0)
+            {
+                return Array.Empty<PageHandlerExecutorDelegate>();
+            }
+
+            var results = new PageHandlerExecutorDelegate[actionDescriptor.HandlerMethods.Count];
+
+            for (var i = 0; i < actionDescriptor.HandlerMethods.Count; i++)
+            {
+                results[i] = ExecutorFactory.CreateExecutor(actionDescriptor.HandlerMethods[i]);
+            }
+
+            return results;
+        }
+
+        private PageHandlerBinderDelegate[] GetHandlerBinders(CompiledPageActionDescriptor actionDescriptor)
+        {
+            if (actionDescriptor.HandlerMethods == null ||actionDescriptor.HandlerMethods.Count == 0)
+            {
+                return Array.Empty<PageHandlerBinderDelegate>();
+            }
+
+            var results = new PageHandlerBinderDelegate[actionDescriptor.HandlerMethods.Count];
+
+            for (var i = 0; i < actionDescriptor.HandlerMethods.Count; i++)
+            {
+                results[i] = PageBinderFactory.CreateHandlerBinder(
+                    _parameterBinder,
+                    _modelMetadataProvider,
+                    _modelBinderFactory,
+                    actionDescriptor,
+                    actionDescriptor.HandlerMethods[i],
+                    _mvcOptions);
+            }
+
+            return results;
+        }
+
+        internal class InnerCache
+        {
+            public InnerCache(int version)
+            {
+                Version = version;
+            }
+
+            public ConcurrentDictionary<ActionDescriptor, PageActionInvokerCacheEntry> Entries { get; } =
+                new ConcurrentDictionary<ActionDescriptor, PageActionInvokerCacheEntry>();
+
+            public int Version { get; }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageBinderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageBinderFactory.cs
new file mode 100644
index 0000000000..6fcc9e08c8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageBinderFactory.cs
@@ -0,0 +1,179 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    internal static class PageBinderFactory
+    {
+        internal static readonly Func<PageContext, object, Task> NullPropertyBinder = (context, arguments) => Task.CompletedTask;
+        internal static readonly PageHandlerBinderDelegate NullHandlerBinder = (context, arguments) => Task.CompletedTask;
+
+        public static Func<PageContext, object, Task> CreatePropertyBinder(
+            ParameterBinder parameterBinder,
+            IModelMetadataProvider modelMetadataProvider,
+            IModelBinderFactory modelBinderFactory,
+            CompiledPageActionDescriptor actionDescriptor)
+        {
+            if (parameterBinder == null)
+            {
+                throw new ArgumentNullException(nameof(parameterBinder));
+            }
+
+            if (actionDescriptor == null)
+            {
+                throw new ArgumentNullException(nameof(actionDescriptor));
+            }
+
+            var properties = actionDescriptor.BoundProperties;
+            if (properties == null || properties.Count == 0)
+            {
+                return NullPropertyBinder;
+            }
+
+            var handlerType = actionDescriptor.HandlerTypeInfo.AsType();
+            var propertyBindingInfo = new BinderItem[properties.Count];
+            for (var i = 0; i < properties.Count; i++)
+            {
+                var property = properties[i];
+                var metadata = modelMetadataProvider.GetMetadataForProperty(handlerType, property.Name);
+                var binder = modelBinderFactory.CreateBinder(new ModelBinderFactoryContext
+                {
+                    BindingInfo = property.BindingInfo,
+                    Metadata = metadata,
+                    CacheToken = property,
+                });
+
+                propertyBindingInfo[i] = new BinderItem(binder, metadata);
+            }
+
+            return Bind;
+
+            async Task Bind(PageContext pageContext, object instance)
+            {
+                var valueProvider = await CompositeValueProvider.CreateAsync(pageContext, pageContext.ValueProviderFactories);
+                for (var i = 0; i < properties.Count; i++)
+                {
+                    var property = properties[i];
+                    var bindingInfo = propertyBindingInfo[i];
+                    var modelMetadata = bindingInfo.ModelMetadata;
+
+                    if (!modelMetadata.IsBindingAllowed)
+                    {
+                        continue;
+                    }
+
+                    var result = await parameterBinder.BindModelAsync(
+                       pageContext,
+                       bindingInfo.ModelBinder,
+                       valueProvider,
+                       property,
+                       modelMetadata,
+                       value: null);
+
+                    if (result.IsModelSet)
+                    {
+                        PropertyValueSetter.SetValue(bindingInfo.ModelMetadata, instance, result.Model);
+                    }
+                }
+            }
+        }
+
+        public static PageHandlerBinderDelegate CreateHandlerBinder(
+            ParameterBinder parameterBinder,
+            IModelMetadataProvider modelMetadataProvider,
+            IModelBinderFactory modelBinderFactory,
+            CompiledPageActionDescriptor actionDescriptor,
+            HandlerMethodDescriptor handler,
+            MvcOptions mvcOptions)
+        {
+            if (handler.Parameters == null || handler.Parameters.Count == 0)
+            {
+                return NullHandlerBinder;
+            }
+
+            var handlerType = actionDescriptor.HandlerTypeInfo.AsType();
+            var parameterBindingInfo = new BinderItem[handler.Parameters.Count];
+            for (var i = 0; i < parameterBindingInfo.Length; i++)
+            {
+                var parameter = handler.Parameters[i];
+                ModelMetadata metadata;
+                if (mvcOptions.AllowValidatingTopLevelNodes &&
+                    modelMetadataProvider is ModelMetadataProvider modelMetadataProviderBase)
+                {
+                    // The default model metadata provider derives from ModelMetadataProvider
+                    // and can therefore supply information about attributes applied to parameters.
+                    metadata = modelMetadataProviderBase.GetMetadataForParameter(parameter.ParameterInfo);
+                }
+                else
+                {
+                    // For backward compatibility, if there's a custom model metadata provider that
+                    // only implements the older IModelMetadataProvider interface, access the more
+                    // limited metadata information it supplies. In this scenario, validation attributes
+                    // are not supported on parameters.
+                    metadata = modelMetadataProvider.GetMetadataForType(parameter.ParameterType);
+                }
+
+                var binder = modelBinderFactory.CreateBinder(new ModelBinderFactoryContext
+                {
+                    BindingInfo = parameter.BindingInfo,
+                    Metadata = metadata,
+                    CacheToken = parameter,
+                });
+
+                parameterBindingInfo[i] = new BinderItem(binder, metadata);
+            }
+
+            return Bind;
+
+            async Task Bind(PageContext pageContext, IDictionary<string, object> arguments)
+            {
+                var valueProvider = await CompositeValueProvider.CreateAsync(pageContext, pageContext.ValueProviderFactories);
+
+                for (var i = 0; i < parameterBindingInfo.Length; i++)
+                {
+                    var parameter = handler.Parameters[i];
+                    var bindingInfo = parameterBindingInfo[i];
+                    var modelMetadata = bindingInfo.ModelMetadata;
+
+                    if (!modelMetadata.IsBindingAllowed)
+                    {
+                        continue;
+                    }
+
+                    var result = await parameterBinder.BindModelAsync(
+                        pageContext,
+                        bindingInfo.ModelBinder,
+                        valueProvider,
+                        parameter,
+                        modelMetadata,
+                        value: null);
+
+                    if (result.IsModelSet)
+                    {
+                        arguments[parameter.Name] = result.Model;
+                    }
+                }
+            }
+        }
+
+        private struct BinderItem
+        {
+            public BinderItem(IModelBinder modelBinder, ModelMetadata modelMetadata)
+            {
+                ModelMetadata = modelMetadata;
+                ModelBinder = modelBinder;
+            }
+
+            public ModelMetadata ModelMetadata { get; }
+
+            public IModelBinder ModelBinder { get; }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerBinderDelegate.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerBinderDelegate.cs
new file mode 100644
index 0000000000..7bea47fc51
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerBinderDelegate.cs
@@ -0,0 +1,10 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public delegate Task PageHandlerBinderDelegate(PageContext pageContext, IDictionary<string, object> arguments);
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerExecutorDelegate.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerExecutorDelegate.cs
new file mode 100644
index 0000000000..e90c24dc75
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerExecutorDelegate.cs
@@ -0,0 +1,9 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public delegate Task<IActionResult> PageHandlerExecutorDelegate(object handler, object[] arguments);
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerPageFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerPageFilter.cs
new file mode 100644
index 0000000000..662fa6113a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerPageFilter.cs
@@ -0,0 +1,82 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class PageHandlerPageFilter : IAsyncPageFilter, IOrderedFilter
+    {
+        /// <remarks>
+        /// Filters on handlers run furthest from the action.
+        /// </remarks>t
+        public int Order => int.MinValue;
+
+        public Task OnPageHandlerExecutionAsync(PageHandlerExecutingContext context, PageHandlerExecutionDelegate next)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (next == null)
+            {
+                throw new ArgumentNullException(nameof(next));
+            }
+
+            var handlerInstance = context.HandlerInstance;
+            if (handlerInstance == null)
+            {
+                throw new InvalidOperationException(Resources.FormatPropertyOfTypeCannotBeNull(
+                    nameof(context.HandlerInstance),
+                    nameof(PageHandlerExecutedContext)));
+            }
+
+            if (handlerInstance is IAsyncPageFilter asyncPageFilter)
+            {
+                return asyncPageFilter.OnPageHandlerExecutionAsync(context, next);
+            }
+            else if (handlerInstance is IPageFilter pageFilter)
+            {
+                return ExecuteSyncFilter(context, next, pageFilter);
+            }
+            else
+            {
+                return next();
+            }
+        }
+
+        public Task OnPageHandlerSelectionAsync(PageHandlerSelectedContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (context.HandlerInstance is IAsyncPageFilter asyncPageFilter)
+            {
+                return asyncPageFilter.OnPageHandlerSelectionAsync(context);
+            }
+            else if (context.HandlerInstance is IPageFilter pageFilter)
+            {
+                pageFilter.OnPageHandlerSelected(context);
+            }
+
+            return Task.CompletedTask;
+        }
+
+        private static async Task ExecuteSyncFilter(
+            PageHandlerExecutingContext context,
+            PageHandlerExecutionDelegate next,
+            IPageFilter pageFilter)
+        {
+            pageFilter.OnPageHandlerExecuting(context);
+            if (context.Result == null)
+            {
+                pageFilter.OnPageHandlerExecuted(await next());
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerResultFIlter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerResultFIlter.cs
new file mode 100644
index 0000000000..9d0b3dcd09
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerResultFIlter.cs
@@ -0,0 +1,63 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class PageHandlerResultFilter : IAsyncResultFilter, IOrderedFilter
+    {
+        /// <remarks>
+        /// Filters on handlers run furthest from the action.
+        /// </remarks>
+        public int Order => int.MinValue;
+
+        public Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (next == null)
+            {
+                throw new ArgumentNullException(nameof(next));
+            }
+
+            var handler = context.Controller;
+            if (handler == null)
+            {
+                throw new InvalidOperationException(Resources.FormatPropertyOfTypeCannotBeNull(
+                    nameof(context.Controller),
+                    nameof(ResultExecutingContext)));
+            }
+
+            if (handler is IAsyncResultFilter asyncResultFilter)
+            {
+                return asyncResultFilter.OnResultExecutionAsync(context, next);
+            }
+            else if (handler is IResultFilter resultFilter)
+            {
+                return ExecuteSyncFilter(context, next, resultFilter);
+            }
+            else
+            {
+                return next();
+            }
+        }
+
+        private static async Task ExecuteSyncFilter(
+            ResultExecutingContext context, 
+            ResultExecutionDelegate next, 
+            IResultFilter resultFilter)
+        {
+            resultFilter.OnResultExecuting(context);
+            if (!context.Cancel)
+            {
+                resultFilter.OnResultExecuted(await next());
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageLoggerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageLoggerExtensions.cs
new file mode 100644
index 0000000000..a5d7c960d4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageLoggerExtensions.cs
@@ -0,0 +1,151 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    internal static class PageLoggerExtensions
+    {
+        public const string PageFilter = "Page Filter";
+
+        private static readonly Action<ILogger, string, string[], ModelValidationState, Exception> _handlerMethodExecuting;
+        private static readonly Action<ILogger, string, string, Exception> _handlerMethodExecuted;
+        private static readonly Action<ILogger, object, Exception> _pageFilterShortCircuit;
+        private static readonly Action<ILogger, string, string[], Exception> _malformedPageDirective;
+        private static readonly Action<ILogger, string, Exception> _unsupportedAreaPath;
+        private static readonly Action<ILogger, Type, Exception> _notMostEffectiveFilter;
+        private static readonly Action<ILogger, string, string, string, Exception> _beforeExecutingMethodOnFilter;
+        private static readonly Action<ILogger, string, string, string, Exception> _afterExecutingMethodOnFilter;
+
+        static PageLoggerExtensions()
+        {
+            // These numbers start at 101 intentionally to avoid conflict with the IDs used by ResourceInvoker.
+
+            _handlerMethodExecuting = LoggerMessage.Define<string, string[], ModelValidationState>(
+                LogLevel.Information,
+                101,
+                "Executing handler method {HandlerName} with arguments ({Arguments}) - ModelState is {ValidationState}");
+
+            _handlerMethodExecuted = LoggerMessage.Define<string, string>(
+                LogLevel.Debug,
+                102,
+                "Executed handler method {HandlerName}, returned result {ActionResult}.");
+
+            _pageFilterShortCircuit = LoggerMessage.Define<object>(
+               LogLevel.Debug,
+               3,
+               "Request was short circuited at page filter '{PageFilter}'.");
+
+            _malformedPageDirective = LoggerMessage.Define<string, string[]>(
+                LogLevel.Warning,
+                104,
+                "The page directive at '{FilePath}' is malformed. Please fix the following issues: {Diagnostics}");
+
+            _notMostEffectiveFilter = LoggerMessage.Define<Type>(
+               LogLevel.Debug,
+               1,
+               "Skipping the execution of current filter as its not the most effective filter implementing the policy {FilterPolicy}.");
+
+            _beforeExecutingMethodOnFilter = LoggerMessage.Define<string, string, string>(
+                LogLevel.Trace,
+                1,
+                "{FilterType}: Before executing {Method} on filter {Filter}.");
+
+            _afterExecutingMethodOnFilter = LoggerMessage.Define<string, string, string>(
+                LogLevel.Trace,
+                2,
+                "{FilterType}: After executing {Method} on filter {Filter}.");
+
+            _unsupportedAreaPath = LoggerMessage.Define<string>(
+                LogLevel.Warning,
+                1,
+                "The page at '{FilePath}' is located under the area root directory '/Areas/' but does not follow the path format '/Areas/AreaName/Pages/Directory/FileName.cshtml");
+        }
+
+        public static void ExecutingHandlerMethod(this ILogger logger, PageContext context, HandlerMethodDescriptor handler, object[] arguments)
+        {
+            if (logger.IsEnabled(LogLevel.Information))
+            {
+                var handlerName = handler.MethodInfo.Name;
+
+                string[] convertedArguments;
+                if (arguments == null)
+                {
+                    convertedArguments = null;
+                }
+                else
+                {
+                    convertedArguments = new string[arguments.Length];
+                    for (var i = 0; i < arguments.Length; i++)
+                    {
+                        convertedArguments[i] = Convert.ToString(arguments[i]);
+                    }
+                }
+
+                var validationState = context.ModelState.ValidationState;
+
+                _handlerMethodExecuting(logger, handlerName, convertedArguments, validationState, null);
+            }
+        }
+
+        public static void ExecutedHandlerMethod(this ILogger logger, PageContext context, HandlerMethodDescriptor handler, IActionResult result)
+        {
+            if (logger.IsEnabled(LogLevel.Debug))
+            {
+                var handlerName = handler.MethodInfo.Name;
+                _handlerMethodExecuted(logger, handlerName, Convert.ToString(result), null);
+            }
+        }
+
+        public static void BeforeExecutingMethodOnFilter(this ILogger logger, string filterType, string methodName, IFilterMetadata filter)
+        {
+            _beforeExecutingMethodOnFilter(logger, filterType, methodName, filter.GetType().ToString(), null);
+        }
+
+        public static void AfterExecutingMethodOnFilter(this ILogger logger, string filterType, string methodName, IFilterMetadata filter)
+        {
+            _afterExecutingMethodOnFilter(logger, filterType, methodName, filter.GetType().ToString(), null);
+        }
+
+        public static void PageFilterShortCircuited(
+            this ILogger logger,
+            IFilterMetadata filter)
+        {
+            _pageFilterShortCircuit(logger, filter, null);
+        }
+
+        public static void MalformedPageDirective(this ILogger logger, string filePath, IList<RazorDiagnostic> diagnostics)
+        {
+            if (logger.IsEnabled(LogLevel.Warning))
+            {
+                var messages = new string[diagnostics.Count];
+                for (var i = 0; i < diagnostics.Count; i++)
+                {
+                    messages[i] = diagnostics[i].GetMessage();
+                }
+
+                _malformedPageDirective(logger, filePath, messages, null);
+            }
+        }
+
+        public static void NotMostEffectiveFilter(this ILogger logger, Type policyType)
+        {
+            _notMostEffectiveFilter(logger, policyType, null);
+        }
+
+        public static void UnsupportedAreaPath(this ILogger logger, string filePath)
+        {
+            if (logger.IsEnabled(LogLevel.Warning))
+            {
+                _unsupportedAreaPath(logger, filePath, null);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageRouteModelFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageRouteModelFactory.cs
new file mode 100644
index 0000000000..e3d2d6289a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageRouteModelFactory.cs
@@ -0,0 +1,177 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    internal class PageRouteModelFactory
+    {
+        private static readonly string IndexFileName = "Index" + RazorViewEngine.ViewExtension;
+        private readonly RazorPagesOptions _options;
+        private readonly ILogger _logger;
+        private readonly string _normalizedRootDirectory;
+        private readonly string _normalizedAreaRootDirectory;
+
+        public PageRouteModelFactory(
+            RazorPagesOptions options,
+            ILogger logger)
+        {
+            _options = options ?? throw new ArgumentNullException(nameof(options));
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+
+            _normalizedRootDirectory = NormalizeDirectory(options.RootDirectory);
+            _normalizedAreaRootDirectory = "/Areas/";
+        }
+
+        public PageRouteModel CreateRouteModel(string relativePath, string routeTemplate)
+        {
+            var viewEnginePath = GetViewEnginePath(_normalizedRootDirectory, relativePath);
+            var routeModel = new PageRouteModel(relativePath, viewEnginePath);
+
+            PopulateRouteModel(routeModel, viewEnginePath, routeTemplate);
+
+            return routeModel;
+        }
+
+        public PageRouteModel CreateAreaRouteModel(string relativePath, string routeTemplate)
+        {
+            if (!TryParseAreaPath(relativePath, out var areaResult))
+            {
+                return null;
+            }
+
+            var routeModel = new PageRouteModel(relativePath, areaResult.viewEnginePath, areaResult.areaName);
+
+            var routePrefix = CreateAreaRoute(areaResult.areaName, areaResult.viewEnginePath);
+            PopulateRouteModel(routeModel, routePrefix, routeTemplate);
+            routeModel.RouteValues["area"] = areaResult.areaName;
+
+            return routeModel;
+        }
+
+        private static void PopulateRouteModel(PageRouteModel model, string pageRoute, string routeTemplate)
+        {
+            model.RouteValues.Add("page", model.ViewEnginePath);
+
+            var selectorModel = CreateSelectorModel(pageRoute, routeTemplate);
+            model.Selectors.Add(selectorModel);
+
+            var fileName = Path.GetFileName(model.RelativePath);
+            if (!AttributeRouteModel.IsOverridePattern(routeTemplate) &&
+                string.Equals(IndexFileName, fileName, StringComparison.OrdinalIgnoreCase))
+            {
+                // For pages without an override route, and ending in /Index.cshtml, we want to allow 
+                // incoming routing, but force outgoing routes to match to the path sans /Index.
+                selectorModel.AttributeRouteModel.SuppressLinkGeneration = true;
+
+                var index = pageRoute.LastIndexOf('/');
+                var parentDirectoryPath = index == -1 ?
+                    string.Empty :
+                    pageRoute.Substring(0, index);
+                model.Selectors.Add(CreateSelectorModel(parentDirectoryPath, routeTemplate));
+            }
+        }
+
+        // Internal for unit testing
+        internal bool TryParseAreaPath(
+            string relativePath,
+            out (string areaName, string viewEnginePath) result)
+        {
+            // path = "/Areas/Products/Pages/Manage/Home.cshtml"
+            // Result ("Products", "/Manage/Home")
+            const string AreaPagesRoot = "/Pages/";
+
+            result = default;
+            Debug.Assert(relativePath.StartsWith("/", StringComparison.Ordinal));
+            // Parse the area root directory.
+            var areaRootEndIndex = relativePath.IndexOf('/', startIndex: 1);
+            if (areaRootEndIndex == -1 ||
+                areaRootEndIndex >= relativePath.Length - 1 || // There's at least one token after the area root.
+                !relativePath.StartsWith(_normalizedAreaRootDirectory, StringComparison.OrdinalIgnoreCase)) // The path must start with area root.
+            {
+                _logger.UnsupportedAreaPath(relativePath);
+                return false;
+            }
+
+            // The first directory that follows the area root is the area name.
+            var areaEndIndex = relativePath.IndexOf('/', startIndex: areaRootEndIndex + 1);
+            if (areaEndIndex == -1 || areaEndIndex == relativePath.Length)
+            {
+                _logger.UnsupportedAreaPath(relativePath);
+                return false;
+            }
+
+            var areaName = relativePath.Substring(areaRootEndIndex + 1, areaEndIndex - areaRootEndIndex - 1);
+            // Ensure the next token is the "Pages" directory
+            if (string.Compare(relativePath, areaEndIndex, AreaPagesRoot, 0, AreaPagesRoot.Length, StringComparison.OrdinalIgnoreCase) != 0)
+            {
+                _logger.UnsupportedAreaPath(relativePath);
+                return false;
+            }
+
+            // Include the trailing slash of the root directory at the start of the viewEnginePath
+            var pageNameIndex = areaEndIndex + AreaPagesRoot.Length - 1;
+            var viewEnginePath = relativePath.Substring(pageNameIndex, relativePath.Length - pageNameIndex - RazorViewEngine.ViewExtension.Length);
+
+            result = (areaName, viewEnginePath);
+            return true;
+        }
+
+        private string GetViewEnginePath(string rootDirectory, string path)
+        {
+            // rootDirectory = "/Pages/AllMyPages/"
+            // path = "/Pages/AllMyPages/Home.cshtml"
+            // Result = "/Home"
+            Debug.Assert(path.StartsWith(rootDirectory, StringComparison.OrdinalIgnoreCase));
+            Debug.Assert(path.EndsWith(RazorViewEngine.ViewExtension, StringComparison.OrdinalIgnoreCase));
+            var startIndex = rootDirectory.Length - 1;
+            var endIndex = path.Length - RazorViewEngine.ViewExtension.Length;
+            return path.Substring(startIndex, endIndex - startIndex);
+        }
+
+        private static string CreateAreaRoute(string areaName, string viewEnginePath)
+        {
+            // AreaName = Products, ViewEnginePath = /List/Categories
+            // Result = /Products/List/Categories
+            Debug.Assert(!string.IsNullOrEmpty(areaName));
+            Debug.Assert(!string.IsNullOrEmpty(viewEnginePath));
+            Debug.Assert(viewEnginePath.StartsWith("/", StringComparison.Ordinal));
+
+            var builder = new InplaceStringBuilder(1 + areaName.Length + viewEnginePath.Length);
+            builder.Append('/');
+            builder.Append(areaName);
+            builder.Append(viewEnginePath);
+
+            return builder.ToString();
+        }
+
+        private static SelectorModel CreateSelectorModel(string prefix, string routeTemplate)
+        {
+            return new SelectorModel
+            {
+                AttributeRouteModel = new AttributeRouteModel
+                {
+                    Template = AttributeRouteModel.CombineTemplates(prefix, routeTemplate),
+                }
+            };
+        }
+
+        private static string NormalizeDirectory(string directory)
+        {
+            Debug.Assert(directory.StartsWith("/", StringComparison.Ordinal));
+            if (directory.Length > 1 && !directory.EndsWith("/", StringComparison.Ordinal))
+            {
+                return directory + "/";
+            }
+
+            return directory;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilter.cs
new file mode 100644
index 0000000000..73633bf59c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilter.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    internal class PageSaveTempDataPropertyFilter : SaveTempDataPropertyFilterBase, IPageFilter
+    {
+        public PageSaveTempDataPropertyFilter(ITempDataDictionaryFactory factory)
+            : base(factory)
+        {
+        }
+
+        public void OnPageHandlerSelected(PageHandlerSelectedContext context)
+        {
+        }
+
+        public void OnPageHandlerExecuting(PageHandlerExecutingContext context)
+        {
+            Subject = context.HandlerInstance;
+            var tempData = _tempDataFactory.GetTempData(context.HttpContext);
+
+            SetPropertyVaules(tempData);
+        }
+
+        public void OnPageHandlerExecuted(PageHandlerExecutedContext context)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilterFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilterFactory.cs
new file mode 100644
index 0000000000..b50ce6b2a9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilterFactory.cs
@@ -0,0 +1,37 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    internal class PageSaveTempDataPropertyFilterFactory : IFilterFactory
+    {
+
+        public PageSaveTempDataPropertyFilterFactory(IReadOnlyList<LifecycleProperty> properties)
+        {
+            Properties = properties;
+        }
+
+        public IReadOnlyList<LifecycleProperty> Properties { get; }
+
+        public bool IsReusable => false;
+
+        public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
+        {
+            if (serviceProvider == null)
+            {
+                throw new ArgumentNullException(nameof(serviceProvider));
+            }
+
+            var service = serviceProvider.GetRequiredService<PageSaveTempDataPropertyFilter>();
+            service.Properties = Properties;
+
+            return service;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilter.cs
new file mode 100644
index 0000000000..1199f1a91e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilter.cs
@@ -0,0 +1,50 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    internal class PageViewDataAttributeFilter : IPageFilter, IViewDataValuesProviderFeature
+    {
+        public PageViewDataAttributeFilter(IReadOnlyList<LifecycleProperty> properties)
+        {
+            Properties = properties;
+        }
+
+        public IReadOnlyList<LifecycleProperty> Properties { get;  }
+
+        public object Subject { get; set; }
+
+        public void OnPageHandlerExecuted(PageHandlerExecutedContext context)
+        {
+        }
+
+        public void OnPageHandlerExecuting(PageHandlerExecutingContext context)
+        {
+            Subject = context.HandlerInstance;
+            context.HttpContext.Features.Set<IViewDataValuesProviderFeature>(this);
+        }
+
+        public void OnPageHandlerSelected(PageHandlerSelectedContext context)
+        {
+        }
+
+        public void ProvideViewDataValues(ViewDataDictionary viewData)
+        {
+            for (var i = 0; i < Properties.Count; i++)
+            {
+                var property = Properties[i];
+                var value = property.GetValue(Subject);
+
+                if (value != null)
+                {
+                    viewData[property.Key] = value;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilterFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilterFactory.cs
new file mode 100644
index 0000000000..e75f518aec
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilterFactory.cs
@@ -0,0 +1,28 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    internal class PageViewDataAttributeFilterFactory : IFilterFactory
+    {
+        public PageViewDataAttributeFilterFactory(IReadOnlyList<LifecycleProperty> properties)
+        {
+            Properties = properties;
+        }
+
+        public IReadOnlyList<LifecycleProperty> Properties { get; }
+
+        // PageViewDataAttributeFilter is stateful and cannot be reused.
+        public bool IsReusable => false;
+
+        public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
+        {
+            return new PageViewDataAttributeFilter(Properties);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/RazorPagesRazorViewEngineOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/RazorPagesRazorViewEngineOptionsSetup.cs
new file mode 100644
index 0000000000..a0d19edf2f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/RazorPagesRazorViewEngineOptionsSetup.cs
@@ -0,0 +1,80 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class RazorPagesRazorViewEngineOptionsSetup : IConfigureOptions<RazorViewEngineOptions>
+    {
+        private readonly RazorPagesOptions _pagesOptions;
+
+        public RazorPagesRazorViewEngineOptionsSetup(IOptions<RazorPagesOptions> pagesOptions)
+        {
+            _pagesOptions = pagesOptions?.Value ?? throw new ArgumentNullException(nameof(pagesOptions));
+        }
+
+        public void Configure(RazorViewEngineOptions options)
+        {
+            if (options == null)
+            {
+                throw new ArgumentNullException(nameof(options));
+            }
+
+            var rootDirectory = _pagesOptions.RootDirectory;
+            Debug.Assert(!string.IsNullOrEmpty(rootDirectory));
+            var defaultPageSearchPath = CombinePath(rootDirectory, "{1}/{0}" + RazorViewEngine.ViewExtension);
+            options.PageViewLocationFormats.Add(defaultPageSearchPath);
+
+            // /Pages/Shared/{0}.cshtml
+            var pagesSharedDirectory = CombinePath(rootDirectory, "Shared/{0}" + RazorViewEngine.ViewExtension);
+            options.PageViewLocationFormats.Add(pagesSharedDirectory);
+
+            options.PageViewLocationFormats.Add("/Views/Shared/{0}" + RazorViewEngine.ViewExtension);
+
+            var areaDirectory = CombinePath("/Areas/", "{2}");
+            // Areas/{2}/Pages/
+            var areaPagesDirectory = CombinePath(areaDirectory, "/Pages/");
+
+            // Areas/{2}/Pages/{1}/{0}.cshtml
+            // Areas/{2}/Pages/Shared/{0}.cshtml
+            // Areas/{2}/Views/Shared/{0}.cshtml
+            // Pages/Shared/{0}.cshtml
+            // Views/Shared/{0}.cshtml
+            var areaSearchPath = CombinePath(areaPagesDirectory, "{1}/{0}" + RazorViewEngine.ViewExtension);
+            options.AreaPageViewLocationFormats.Add(areaSearchPath);
+
+            var areaPagesSharedSearchPath = CombinePath(areaPagesDirectory, "Shared/{0}" + RazorViewEngine.ViewExtension);
+            options.AreaPageViewLocationFormats.Add(areaPagesSharedSearchPath);
+
+            var areaViewsSharedSearchPath = CombinePath(areaDirectory, "Views/Shared/{0}" + RazorViewEngine.ViewExtension);
+            options.AreaPageViewLocationFormats.Add(areaViewsSharedSearchPath);
+
+            options.AreaPageViewLocationFormats.Add(pagesSharedDirectory);
+            options.AreaPageViewLocationFormats.Add("/Views/Shared/{0}" + RazorViewEngine.ViewExtension);
+
+            options.ViewLocationFormats.Add(pagesSharedDirectory);
+            options.AreaViewLocationFormats.Add(pagesSharedDirectory);
+
+            options.ViewLocationExpanders.Add(new PageViewLocationExpander());
+        }
+
+        private static string CombinePath(string path1, string path2)
+        {
+            if (path1.EndsWith("/", StringComparison.Ordinal) || path2.StartsWith("/", StringComparison.Ordinal))
+            {
+                return path1 + path2;
+            }
+            else if (path1.EndsWith("/", StringComparison.Ordinal) && path2.StartsWith("/", StringComparison.Ordinal))
+            {
+                return path1 + path2.Substring(1);
+            }
+
+            return path1 + "/" + path2;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/RazorProjectPageRouteModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/RazorProjectPageRouteModelProvider.cs
new file mode 100644
index 0000000000..81cf7b6a42
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/RazorProjectPageRouteModelProvider.cs
@@ -0,0 +1,135 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class RazorProjectPageRouteModelProvider : IPageRouteModelProvider
+    {
+        private const string AreaRootDirectory = "/Areas";
+        private readonly RazorProjectFileSystem _razorFileSystem;
+        private readonly RazorPagesOptions _pagesOptions;
+        private readonly PageRouteModelFactory _routeModelFactory;
+        private readonly ILogger<RazorProjectPageRouteModelProvider> _logger;
+
+        public RazorProjectPageRouteModelProvider(
+            RazorProjectFileSystem razorFileSystem,
+            IOptions<RazorPagesOptions> pagesOptionsAccessor,
+            ILoggerFactory loggerFactory)
+        {
+            _razorFileSystem = razorFileSystem;
+            _pagesOptions = pagesOptionsAccessor.Value;
+            _logger = loggerFactory.CreateLogger<RazorProjectPageRouteModelProvider>();
+            _routeModelFactory = new PageRouteModelFactory(_pagesOptions, _logger);
+        }
+
+        /// <remarks>
+        /// Ordered to execute after <see cref="CompiledPageRouteModelProvider"/>.
+        /// </remarks>
+        public int Order => -1000 + 10;
+
+        public void OnProvidersExecuted(PageRouteModelProviderContext context)
+        {
+        }
+
+        public void OnProvidersExecuting(PageRouteModelProviderContext context)
+        {
+            // When RootDirectory and AreaRootDirectory overlap, e.g. RootDirectory = /, AreaRootDirectoryy = /Areas;
+            // we need to ensure that the page is only route-able via the area route. By adding area routes first,
+            // we'll ensure non area routes get skipped when it encounters an IsAlreadyRegistered check.
+
+            if (_pagesOptions.AllowAreas)
+            {
+                AddAreaPageModels(context);
+            }
+
+            AddPageModels(context);
+        }
+
+        private void AddPageModels(PageRouteModelProviderContext context)
+        {
+            foreach (var item in _razorFileSystem.EnumerateItems(_pagesOptions.RootDirectory))
+            {
+                if (!IsRouteable(item))
+                {
+                    continue;
+                }
+
+                var relativePath = item.CombinedPath;
+                if (context.RouteModels.Any(m => string.Equals(relativePath, m.RelativePath, StringComparison.OrdinalIgnoreCase)))
+                {
+                    // A route for this file was already registered either by the CompiledPageRouteModel or as an area route.
+                    // by this provider. Skip registering an additional entry.
+
+                    // Note: We're comparing duplicates based on root-relative paths. This eliminates a page from being discovered
+                    // by overlapping area and non-area routes where ViewEnginePath would be different.
+                    continue;
+                }
+
+                if (!PageDirectiveFeature.TryGetPageDirective(_logger, item, out var routeTemplate))
+                {
+                    // .cshtml pages without @page are not RazorPages.
+                    continue;
+                }
+
+                if (_pagesOptions.AllowAreas && relativePath.StartsWith(AreaRootDirectory, StringComparison.OrdinalIgnoreCase))
+                {
+                    // Ignore Razor pages that are under the area root directory when AllowAreas is enabled. 
+                    // Conforming page paths will be added by AddAreaPageModels.
+                    _logger.UnsupportedAreaPath(relativePath);
+                    continue;
+                }
+
+                var routeModel = _routeModelFactory.CreateRouteModel(relativePath, routeTemplate);
+                if (routeModel != null)
+                {
+                    context.RouteModels.Add(routeModel);
+                }
+            }
+        }
+
+        private void AddAreaPageModels(PageRouteModelProviderContext context)
+        {
+            foreach (var item in _razorFileSystem.EnumerateItems(AreaRootDirectory))
+            {
+                if (!IsRouteable(item))
+                {
+                    continue;
+                }
+
+                var relativePath = item.CombinedPath;
+                if (context.RouteModels.Any(m => string.Equals(relativePath, m.RelativePath, StringComparison.OrdinalIgnoreCase)))
+                {
+                    // A route for this file was already registered either by the CompiledPageRouteModel.
+                    // Skip registering an additional entry.
+                    continue;
+                }
+
+                if (!PageDirectiveFeature.TryGetPageDirective(_logger, item, out var routeTemplate))
+                {
+                    // .cshtml pages without @page are not RazorPages.
+                    continue;
+                }
+
+                var routeModel = _routeModelFactory.CreateAreaRouteModel(relativePath, routeTemplate);
+                if (routeModel != null)
+                {
+                    context.RouteModels.Add(routeModel);
+                }
+            }
+        }
+
+        private static bool IsRouteable(RazorProjectItem item)
+        {
+            // Pages like _ViewImports should not be routable.
+            return !item.FileName.StartsWith("_", StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ResponseCacheFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ResponseCacheFilter.cs
new file mode 100644
index 0000000000..6fde160028
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ResponseCacheFilter.cs
@@ -0,0 +1,108 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    /// <summary>
+    /// A <see cref="IPageFilter"/> which sets the appropriate headers related to response caching.
+    /// </summary>
+    public class ResponseCacheFilter : IPageFilter, IResponseCacheFilter
+    {
+        private readonly ResponseCacheFilterExecutor _executor;
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="ResponseCacheFilter"/>
+        /// </summary>
+        /// <param name="cacheProfile">The profile which contains the settings for
+        /// <see cref="ResponseCacheFilter"/>.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        public ResponseCacheFilter(CacheProfile cacheProfile, ILoggerFactory loggerFactory)
+        {
+            _executor = new ResponseCacheFilterExecutor(cacheProfile);
+            _logger = loggerFactory.CreateLogger(GetType());
+        }
+
+        /// <summary>
+        /// Gets or sets the duration in seconds for which the response is cached.
+        /// This is a required parameter.
+        /// This sets "max-age" in "Cache-control" header.
+        /// </summary>
+        public int Duration
+        {
+            get => _executor.Duration;
+            set => _executor.Duration = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the location where the data from a particular URL must be cached.
+        /// </summary>
+        public ResponseCacheLocation Location
+        {
+            get => _executor.Location;
+            set => _executor.Location = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the value which determines whether the data should be stored or not.
+        /// When set to <see langword="true"/>, it sets "Cache-control" header to "no-store".
+        /// Ignores the "Location" parameter for values other than "None".
+        /// Ignores the "duration" parameter.
+        /// </summary>
+        public bool NoStore
+        {
+            get => _executor.NoStore;
+            set => _executor.NoStore = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the value for the Vary response header.
+        /// </summary>
+        public string VaryByHeader
+        {
+            get => _executor.VaryByHeader;
+            set => _executor.VaryByHeader = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the query keys to vary by.
+        /// </summary>
+        /// <remarks>
+        /// <see cref="VaryByQueryKeys"/> requires the response cache middleware.
+        /// </remarks>
+        public string[] VaryByQueryKeys
+        {
+            get => _executor.VaryByQueryKeys;
+            set => _executor.VaryByQueryKeys = value;
+        }
+
+        public void OnPageHandlerSelected(PageHandlerSelectedContext context)
+        {
+        }
+
+        public void OnPageHandlerExecuting(PageHandlerExecutingContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (!context.IsEffectivePolicy<IResponseCacheFilter>(this))
+            {
+                _logger.NotMostEffectiveFilter(typeof(IResponseCacheFilter));
+                return;
+            }
+
+            _executor.Execute(context);
+        }
+
+        public void OnPageHandlerExecuted(PageHandlerExecutedContext context)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ResponseCacheFilterApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ResponseCacheFilterApplicationModelProvider.cs
new file mode 100644
index 0000000000..27a8a7cb9b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ResponseCacheFilterApplicationModelProvider.cs
@@ -0,0 +1,51 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class ResponseCacheFilterApplicationModelProvider : IPageApplicationModelProvider
+    {
+        private readonly MvcOptions _mvcOptions;
+        private readonly ILoggerFactory _loggerFactory;
+
+        public ResponseCacheFilterApplicationModelProvider(IOptions<MvcOptions> mvcOptionsAccessor, ILoggerFactory loggerFactory)
+        {
+            if (mvcOptionsAccessor == null)
+            {
+                throw new ArgumentNullException(nameof(mvcOptionsAccessor));
+            }
+
+            _mvcOptions = mvcOptionsAccessor.Value;
+            _loggerFactory = loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory));
+        }
+
+        // The order is set to execute after the DefaultPageApplicationModelProvider.
+        public int Order => -1000 + 10;
+
+        public void OnProvidersExecuting(PageApplicationModelProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var pageModel = context.PageApplicationModel;
+            var responseCacheAttributes = pageModel.HandlerTypeAttributes.OfType<ResponseCacheAttribute>();
+            foreach (var attribute in responseCacheAttributes)
+            {
+                var cacheProfile = attribute.GetCacheProfile(_mvcOptions);
+                context.PageApplicationModel.Filters.Add(new ResponseCacheFilter(cacheProfile, _loggerFactory));
+            }
+        }
+
+        public void OnProvidersExecuted(PageApplicationModelProviderContext context)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/TempDataFilterPageApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/TempDataFilterPageApplicationModelProvider.cs
new file mode 100644
index 0000000000..411c13c608
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/TempDataFilterPageApplicationModelProvider.cs
@@ -0,0 +1,47 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    internal class TempDataFilterPageApplicationModelProvider : IPageApplicationModelProvider
+    {
+        private readonly MvcViewOptions _options;
+
+        public TempDataFilterPageApplicationModelProvider(IOptions<MvcViewOptions> options)
+        {
+            _options = options.Value;
+        }
+
+        // The order is set to execute after the DefaultPageApplicationModelProvider.
+        public int Order => -1000 + 10;
+
+        public void OnProvidersExecuted(PageApplicationModelProviderContext context)
+        {
+        }
+
+        public void OnProvidersExecuting(PageApplicationModelProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var pageApplicationModel = context.PageApplicationModel;
+            var handlerType = pageApplicationModel.HandlerType.AsType();
+
+            var tempDataProperties = SaveTempDataPropertyFilterBase.GetTempDataProperties(handlerType, _options);
+            if (tempDataProperties == null)
+            {
+                return;
+            }
+
+            var filter = new PageSaveTempDataPropertyFilterFactory(tempDataProperties);
+            pageApplicationModel.Filters.Add(filter);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ViewDataAttributePageApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ViewDataAttributePageApplicationModelProvider.cs
new file mode 100644
index 0000000000..cdfbe11f0c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ViewDataAttributePageApplicationModelProvider.cs
@@ -0,0 +1,42 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.RazorPages.Internal;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    internal class ViewDataAttributePageApplicationModelProvider : IPageApplicationModelProvider
+    {
+        /// <inheritdoc />
+        /// <remarks>This order ensures that <see cref="ViewDataAttributePageApplicationModelProvider"/> runs after the <see cref="DefaultPageApplicationModelProvider"/>.</remarks>
+        public int Order => -1000 + 10;
+
+        /// <inheritdoc />
+        public void OnProvidersExecuted(PageApplicationModelProviderContext context)
+        {
+        }
+
+        /// <inheritdoc />
+        public void OnProvidersExecuting(PageApplicationModelProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var handlerType = context.PageApplicationModel.HandlerType.AsType();
+
+            var viewDataProperties = ViewDataAttributePropertyProvider.GetViewDataProperties(handlerType);
+            if (viewDataProperties == null)
+            {
+                return;
+            }
+
+            var filter = new PageViewDataAttributeFilterFactory(viewDataProperties);
+            context.PageApplicationModel.Filters.Add(filter);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj
new file mode 100644
index 0000000000..f0be433ea5
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ASP.NET Core MVC Razor Pages.</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>aspnetcore;aspnetcoremvc;cshtml;razor</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Razor\Microsoft.AspNetCore.Mvc.Razor.csproj" />
+
+    <PackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.ParameterDefaultValue.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.PropertyActivator.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsPropertyActivatorSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsPropertyHelperSourcesPackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Filters\" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/NonHandlerAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/NonHandlerAttribute.cs
new file mode 100644
index 0000000000..5c9cf53994
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/NonHandlerAttribute.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    /// <summary>
+    /// Specifies that the targeted method is not a page handler method.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public class NonHandlerAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs
new file mode 100644
index 0000000000..c6ee14940d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    /// <summary>
+    /// A base class for a Razor page.
+    /// </summary>
+    public abstract class Page : PageBase
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageActionDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageActionDescriptor.cs
new file mode 100644
index 0000000000..bf4780d165
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageActionDescriptor.cs
@@ -0,0 +1,86 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    [DebuggerDisplay("{DebuggerDisplayString,nq}")]
+    public class PageActionDescriptor : ActionDescriptor
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="PageActionDescriptor"/>.
+        /// </summary>
+        public PageActionDescriptor()
+        {
+        }
+
+        /// <summary>
+        /// A copy constructor for <see cref="PageActionDescriptor"/>.
+        /// </summary>
+        /// <param name="other">The <see cref="PageActionDescriptor"/> to copy from.</param>
+        public PageActionDescriptor(PageActionDescriptor other)
+        {
+            if (other == null)
+            {
+                throw new ArgumentNullException(nameof(other));
+            }
+
+            RelativePath = other.RelativePath;
+            ViewEnginePath = other.ViewEnginePath;
+            AreaName = other.AreaName;
+        }
+
+        /// <summary>
+        /// Gets or sets the application root relative path for the page.
+        /// </summary>
+        public string RelativePath { get; set; }
+
+        /// <summary>
+        /// Gets or sets the path relative to the base path for page discovery.
+        /// <para>
+        /// This value is the path of the file without extension, relative to the pages root directory.
+        /// e.g. the <see cref="ViewEnginePath"/> for the file /Pages/Catalog/Antiques.cshtml is <c>/Catalog/Antiques</c>
+        /// </para>
+        /// <para>
+        /// In an area, this value is the path of the file without extension, relative to the pages root directory for the specified area.
+        /// e.g. the <see cref="ViewEnginePath"/>  for the file Areas/Identity/Pages/Manage/Accounts.cshtml, is <c>/Manage/Accounts</c>.
+        /// </para>
+        /// </summary>
+        public string ViewEnginePath { get; set; }
+
+        /// <summary>
+        /// Gets or sets the area name for this page.
+        /// This value will be <c>null</c> for non-area pages.
+        /// </summary>
+        public string AreaName { get; set; }
+
+        /// <inheritdoc />
+        public override string DisplayName
+        {
+            get
+            {
+                if (base.DisplayName == null && ViewEnginePath != null)
+                {
+                    base.DisplayName = ViewEnginePath;
+                }
+
+                return base.DisplayName;
+            }
+
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                base.DisplayName = value;
+            }
+        }
+
+        private string DebuggerDisplayString() => $"{{ViewEnginePath = {nameof(ViewEnginePath)}, RelativePath = {nameof(RelativePath)}}}";
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageBase.cs
new file mode 100644
index 0000000000..12b88777e8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageBase.cs
@@ -0,0 +1,1599 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Linq.Expressions;
+using System.Security.Claims;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    /// <summary>
+    /// A base class for a Razor page.
+    /// </summary>
+    public abstract class PageBase : RazorPageBase
+    {
+        private IObjectModelValidator _objectValidator;
+        private IModelMetadataProvider _metadataProvider;
+        private IModelBinderFactory _modelBinderFactory;
+
+        /// <summary>
+        /// The <see cref="RazorPages.PageContext"/>.
+        /// </summary>
+        public PageContext PageContext { get; set; }
+
+        /// <inheritdoc />
+        public override ViewContext ViewContext { get; set; }
+
+        /// <summary>
+        /// Gets the <see cref="Http.HttpContext"/>.
+        /// </summary>
+        public HttpContext HttpContext => PageContext?.HttpContext;
+
+        /// <summary>
+        /// Gets the <see cref="HttpRequest"/>.
+        /// </summary>
+        public HttpRequest Request => HttpContext?.Request;
+
+        /// <summary>
+        /// Gets the <see cref="HttpResponse"/>.
+        /// </summary>
+        public HttpResponse Response => HttpContext?.Response;
+
+        /// <summary>
+        /// Gets the <see cref="AspNetCore.Routing.RouteData"/> for the executing action.
+        /// </summary>
+        public RouteData RouteData => PageContext.RouteData;
+
+        /// <summary>
+        /// Gets the <see cref="ModelStateDictionary"/>.
+        /// </summary>
+        public ModelStateDictionary ModelState => PageContext?.ModelState;
+
+        private IObjectModelValidator ObjectValidator
+        {
+            get
+            {
+                if (_objectValidator == null)
+                {
+                    _objectValidator = HttpContext?.RequestServices?.GetRequiredService<IObjectModelValidator>();
+                }
+
+                return _objectValidator;
+            }
+        }
+
+        private IModelMetadataProvider MetadataProvider
+        {
+            get
+            {
+                if (_metadataProvider == null)
+                {
+                    _metadataProvider = HttpContext?.RequestServices?.GetRequiredService<IModelMetadataProvider>();
+                }
+
+                return _metadataProvider;
+            }
+        }
+
+        private IModelBinderFactory ModelBinderFactory
+        {
+            get
+            {
+                if (_modelBinderFactory == null)
+                {
+                    _modelBinderFactory = HttpContext?.RequestServices?.GetRequiredService<IModelBinderFactory>();
+                }
+
+                return _modelBinderFactory;
+            }
+        }
+
+        /// <inheritdoc />
+        public override void EnsureRenderedBodyOrSections()
+        {
+            // This will never be called by MVC. MVC only calls this method on layout pages, and a Page can never be a layout page.
+            throw new NotSupportedException();
+        }
+
+        /// <inheritdoc />
+        public override void BeginContext(int position, int length, bool isLiteral)
+        {
+            const string BeginContextEvent = "Microsoft.AspNetCore.Mvc.Razor.BeginInstrumentationContext";
+
+            if (DiagnosticSource?.IsEnabled(BeginContextEvent) == true)
+            {
+                DiagnosticSource.Write(
+                    BeginContextEvent,
+                    new
+                    {
+                        httpContext = ViewContext,
+                        path = Path,
+                        position = position,
+                        length = length,
+                        isLiteral = isLiteral,
+                    });
+            }
+        }
+
+        /// <inheritdoc />
+        public override void EndContext()
+        {
+            const string EndContextEvent = "Microsoft.AspNetCore.Mvc.Razor.EndInstrumentationContext";
+
+            if (DiagnosticSource?.IsEnabled(EndContextEvent) == true)
+            {
+                DiagnosticSource.Write(
+                    EndContextEvent,
+                    new
+                    {
+                        httpContext = ViewContext,
+                        path = Path,
+                    });
+            }
+        }
+
+        /// <summary>
+        /// Creates a <see cref="BadRequestResult"/> that produces a <see cref="StatusCodes.Status400BadRequest"/> response.
+        /// </summary>
+        /// <returns>The created <see cref="BadRequestResult"/> for the response.</returns>
+        [NonAction]
+        public virtual BadRequestResult BadRequest()
+            => new BadRequestResult();
+
+        /// <summary>
+        /// Creates a <see cref="BadRequestObjectResult"/> that produces a <see cref="StatusCodes.Status400BadRequest"/> response.
+        /// </summary>
+        /// <param name="error">An error object to be returned to the client.</param>
+        /// <returns>The created <see cref="BadRequestObjectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual BadRequestObjectResult BadRequest(object error)
+            => new BadRequestObjectResult(error);
+
+        /// <summary>
+        /// Creates a <see cref="BadRequestObjectResult"/> that produces a <see cref="StatusCodes.Status400BadRequest"/> response.
+        /// </summary>
+        /// <param name="modelState">The <see cref="ModelStateDictionary" /> containing errors to be returned to the client.</param>
+        /// <returns>The created <see cref="BadRequestObjectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual BadRequestObjectResult BadRequest(ModelStateDictionary modelState)
+        {
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            return new BadRequestObjectResult(modelState);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ChallengeResult"/>.
+        /// </summary>
+        /// <returns>The created <see cref="ChallengeResult"/> for the response.</returns>
+        /// <remarks>
+        /// The behavior of this method depends on the <see cref="IAuthenticationService"/> in use.
+        /// <see cref="StatusCodes.Status401Unauthorized"/> and <see cref="StatusCodes.Status403Forbidden"/>
+        /// are among likely status results.
+        /// </remarks>
+        public virtual ChallengeResult Challenge()
+            => new ChallengeResult();
+
+        /// <summary>
+        /// Creates a <see cref="ChallengeResult"/> with the specified authentication schemes.
+        /// </summary>
+        /// <param name="authenticationSchemes">The authentication schemes to challenge.</param>
+        /// <returns>The created <see cref="ChallengeResult"/> for the response.</returns>
+        /// <remarks>
+        /// The behavior of this method depends on the <see cref="IAuthenticationService"/> in use.
+        /// <see cref="StatusCodes.Status401Unauthorized"/> and <see cref="StatusCodes.Status403Forbidden"/>
+        /// are among likely status results.
+        /// </remarks>
+        public virtual ChallengeResult Challenge(params string[] authenticationSchemes)
+            => new ChallengeResult(authenticationSchemes);
+
+        /// <summary>
+        /// Creates a <see cref="ChallengeResult"/> with the specified <paramref name="properties" />.
+        /// </summary>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the authentication
+        /// challenge.</param>
+        /// <returns>The created <see cref="ChallengeResult"/> for the response.</returns>
+        /// <remarks>
+        /// The behavior of this method depends on the <see cref="AuthenticationService"/> in use.
+        /// <see cref="StatusCodes.Status401Unauthorized"/> and <see cref="StatusCodes.Status403Forbidden"/>
+        /// are among likely status results.
+        /// </remarks>
+        public virtual ChallengeResult Challenge(AuthenticationProperties properties)
+            => new ChallengeResult(properties);
+
+        /// <summary>
+        /// Creates a <see cref="ChallengeResult"/> with the specified authentication schemes and
+        /// <paramref name="properties" />.
+        /// </summary>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the authentication
+        /// challenge.</param>
+        /// <param name="authenticationSchemes">The authentication schemes to challenge.</param>
+        /// <returns>The created <see cref="ChallengeResult"/> for the response.</returns>
+        /// <remarks>
+        /// The behavior of this method depends on the <see cref="IAuthenticationService"/> in use.
+        /// <see cref="StatusCodes.Status401Unauthorized"/> and <see cref="StatusCodes.Status403Forbidden"/>
+        /// are among likely status results.
+        /// </remarks>
+        public virtual ChallengeResult Challenge(
+            AuthenticationProperties properties,
+            params string[] authenticationSchemes)
+            => new ChallengeResult(authenticationSchemes, properties);
+
+        /// <summary>
+        /// Creates a <see cref="ContentResult"/> object with <see cref="StatusCodes.Status200OK"/> by specifying a
+        /// <paramref name="content"/> string.
+        /// </summary>
+        /// <param name="content">The content to write to the response.</param>
+        /// <returns>The created <see cref="ContentResult"/> object for the response.</returns>
+        public virtual ContentResult Content(string content)
+            => Content(content, (MediaTypeHeaderValue)null);
+
+        /// <summary>
+        /// Creates a <see cref="ContentResult"/> object with <see cref="StatusCodes.Status200OK"/> by specifying a 
+        /// <paramref name="content"/> string and a content type.
+        /// </summary>
+        /// <param name="content">The content to write to the response.</param>
+        /// <param name="contentType">The content type (MIME type).</param>
+        /// <returns>The created <see cref="ContentResult"/> object for the response.</returns>
+        public virtual ContentResult Content(string content, string contentType)
+            => Content(content, MediaTypeHeaderValue.Parse(contentType));
+
+        /// <summary>
+        /// Creates a <see cref="ContentResult"/> object with <see cref="StatusCodes.Status200OK"/> by specifying a 
+        /// <paramref name="content"/> string, a <paramref name="contentType"/>, and <paramref name="contentEncoding"/>.
+        /// </summary>
+        /// <param name="content">The content to write to the response.</param>
+        /// <param name="contentType">The content type (MIME type).</param>
+        /// <param name="contentEncoding">The content encoding.</param>
+        /// <returns>The created <see cref="ContentResult"/> object for the response.</returns>
+        /// <remarks>
+        /// If encoding is provided by both the 'charset' and the <paramref name="contentEncoding"/> parameters, then
+        /// the <paramref name="contentEncoding"/> parameter is chosen as the final encoding.
+        /// </remarks>
+        public virtual ContentResult Content(string content, string contentType, Encoding contentEncoding)
+        {
+            var mediaTypeHeaderValue = MediaTypeHeaderValue.Parse(contentType);
+            mediaTypeHeaderValue.Encoding = contentEncoding ?? mediaTypeHeaderValue.Encoding;
+            return Content(content, mediaTypeHeaderValue);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ContentResult"/> object with <see cref="StatusCodes.Status200OK"/> by specifying a 
+        /// <paramref name="content"/> string and a <paramref name="contentType"/>.
+        /// </summary>
+        /// <param name="content">The content to write to the response.</param>
+        /// <param name="contentType">The content type (MIME type).</param>
+        /// <returns>The created <see cref="ContentResult"/> object for the response.</returns>
+        public virtual ContentResult Content(string content, MediaTypeHeaderValue contentType)
+        {
+            return new ContentResult
+            {
+                Content = content,
+                ContentType = contentType?.ToString()
+            };
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ForbidResult"/> (<see cref="StatusCodes.Status403Forbidden"/> by default).
+        /// </summary>
+        /// <returns>The created <see cref="ForbidResult"/> for the response.</returns>
+        /// <remarks>
+        /// Some authentication schemes, such as cookies, will convert <see cref="StatusCodes.Status403Forbidden"/> to
+        /// a redirect to show a login page.
+        /// </remarks>
+        public virtual ForbidResult Forbid()
+            => new ForbidResult();
+
+        /// <summary>
+        /// Creates a <see cref="ForbidResult"/> (<see cref="StatusCodes.Status403Forbidden"/> by default) with the
+        /// specified authentication schemes.
+        /// </summary>
+        /// <param name="authenticationSchemes">The authentication schemes to challenge.</param>
+        /// <returns>The created <see cref="ForbidResult"/> for the response.</returns>
+        /// <remarks>
+        /// Some authentication schemes, such as cookies, will convert <see cref="StatusCodes.Status403Forbidden"/> to
+        /// a redirect to show a login page.
+        /// </remarks>
+        public virtual ForbidResult Forbid(params string[] authenticationSchemes)
+            => new ForbidResult(authenticationSchemes);
+
+        /// <summary>
+        /// Creates a <see cref="ForbidResult"/> (<see cref="StatusCodes.Status403Forbidden"/> by default) with the
+        /// specified <paramref name="properties" />.
+        /// </summary>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the authentication
+        /// challenge.</param>
+        /// <returns>The created <see cref="ForbidResult"/> for the response.</returns>
+        /// <remarks>
+        /// Some authentication schemes, such as cookies, will convert <see cref="StatusCodes.Status403Forbidden"/> to 
+        /// a redirect to show a login page.
+        /// </remarks>
+        public virtual ForbidResult Forbid(AuthenticationProperties properties)
+            => new ForbidResult(properties);
+
+        /// <summary>
+        /// Creates a <see cref="ForbidResult"/> (<see cref="StatusCodes.Status403Forbidden"/> by default) with the 
+        /// specified authentication schemes and <paramref name="properties" />.
+        /// </summary>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the authentication
+        /// challenge.</param>
+        /// <param name="authenticationSchemes">The authentication schemes to challenge.</param>
+        /// <returns>The created <see cref="ForbidResult"/> for the response.</returns>
+        /// <remarks>
+        /// Some authentication schemes, such as cookies, will convert <see cref="StatusCodes.Status403Forbidden"/> to
+        /// a redirect to show a login page.
+        /// </remarks>
+        public virtual ForbidResult Forbid(AuthenticationProperties properties, params string[] authenticationSchemes)
+            => new ForbidResult(authenticationSchemes, properties);
+
+        /// <summary>
+        /// Returns a file with the specified <paramref name="fileContents" /> as content
+        /// (<see cref="StatusCodes.Status200OK"/>) and the specified <paramref name="contentType" /> as the Content-Type.
+        /// </summary>
+        /// <param name="fileContents">The file contents.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <returns>The created <see cref="FileContentResult"/> for the response.</returns>
+        public virtual FileContentResult File(byte[] fileContents, string contentType)
+            => File(fileContents, contentType, fileDownloadName: null);
+
+        /// <summary>
+        /// Returns a file with the specified <paramref name="fileContents" /> as content (<see cref="StatusCodes.Status200OK"/>), the
+        /// specified <paramref name="contentType" /> as the Content-Type and the
+        /// specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// </summary>
+        /// <param name="fileContents">The file contents.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <returns>The created <see cref="FileContentResult"/> for the response.</returns>
+        public virtual FileContentResult File(byte[] fileContents, string contentType, string fileDownloadName)
+            => new FileContentResult(fileContents, contentType) { FileDownloadName = fileDownloadName };
+
+        /// <summary>
+        /// Returns a file in the specified <paramref name="fileStream" /> (<see cref="StatusCodes.Status200OK"/>)
+        /// with the specified <paramref name="contentType" /> as the Content-Type.
+        /// </summary>
+        /// <param name="fileStream">The <see cref="Stream"/> with the contents of the file.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <returns>The created <see cref="FileStreamResult"/> for the response.</returns>
+        public virtual FileStreamResult File(Stream fileStream, string contentType)
+            => File(fileStream, contentType, fileDownloadName: null);
+
+        /// <summary>
+        /// Returns a file in the specified <paramref name="fileStream" /> (<see cref="StatusCodes.Status200OK"/>) with the
+        /// specified <paramref name="contentType" /> as the Content-Type and the
+        /// specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// </summary>
+        /// <param name="fileStream">The <see cref="Stream"/> with the contents of the file.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <returns>The created <see cref="FileStreamResult"/> for the response.</returns>
+        public virtual FileStreamResult File(Stream fileStream, string contentType, string fileDownloadName)
+            => new FileStreamResult(fileStream, contentType) { FileDownloadName = fileDownloadName };
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="virtualPath" /> (<see cref="StatusCodes.Status200OK"/>) with the
+        /// specified <paramref name="contentType" /> as the Content-Type.
+        /// </summary>
+        /// <param name="virtualPath">The virtual path of the file to be returned.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <returns>The created <see cref="VirtualFileResult"/> for the response.</returns>
+        public virtual VirtualFileResult File(string virtualPath, string contentType)
+            => File(virtualPath, contentType, fileDownloadName: null);
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="virtualPath" /> (<see cref="StatusCodes.Status200OK"/>) with the
+        /// specified <paramref name="contentType" /> as the Content-Type and the
+        /// specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// </summary>
+        /// <param name="virtualPath">The virtual path of the file to be returned.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <returns>The created <see cref="VirtualFileResult"/> for the response.</returns>
+        public virtual VirtualFileResult File(string virtualPath, string contentType, string fileDownloadName)
+            => new VirtualFileResult(virtualPath, contentType) { FileDownloadName = fileDownloadName };
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="physicalPath" /> (<see cref="StatusCodes.Status200OK"/>) with the
+        /// specified <paramref name="contentType" /> as the Content-Type.
+        /// </summary>
+        /// <param name="physicalPath">The physical path of the file to be returned.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <returns>The created <see cref="PhysicalFileResult"/> for the response.</returns>
+        public virtual PhysicalFileResult PhysicalFile(string physicalPath, string contentType)
+            => PhysicalFile(physicalPath, contentType, fileDownloadName: null);
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="physicalPath" /> (<see cref="StatusCodes.Status200OK"/>) with the
+        /// specified <paramref name="contentType" /> as the Content-Type and the
+        /// specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// </summary>
+        /// <param name="physicalPath">The physical path of the file to be returned.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <returns>The created <see cref="PhysicalFileResult"/> for the response.</returns>
+        public virtual PhysicalFileResult PhysicalFile(
+            string physicalPath,
+            string contentType,
+            string fileDownloadName)
+            => new PhysicalFileResult(physicalPath, contentType) { FileDownloadName = fileDownloadName };
+
+        /// <summary>
+        /// Creates a <see cref="LocalRedirectResult"/> object that redirects 
+        /// (<see cref="StatusCodes.Status302Found"/>) to the specified local <paramref name="localUrl"/>.
+        /// </summary>
+        /// <param name="localUrl">The local URL to redirect to.</param>
+        /// <returns>The created <see cref="LocalRedirectResult"/> for the response.</returns>
+        public virtual LocalRedirectResult LocalRedirect(string localUrl)
+        {
+            if (string.IsNullOrEmpty(localUrl))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(localUrl));
+            }
+
+            return new LocalRedirectResult(localUrl);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="LocalRedirectResult"/> object with <see cref="LocalRedirectResult.Permanent"/> set to
+        /// true (<see cref="StatusCodes.Status301MovedPermanently"/>) using the specified <paramref name="localUrl"/>.
+        /// </summary>
+        /// <param name="localUrl">The local URL to redirect to.</param>
+        /// <returns>The created <see cref="LocalRedirectResult"/> for the response.</returns>
+        public virtual LocalRedirectResult LocalRedirectPermanent(string localUrl)
+        {
+            if (string.IsNullOrEmpty(localUrl))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(localUrl));
+            }
+
+            return new LocalRedirectResult(localUrl, permanent: true);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="LocalRedirectResult"/> object with <see cref="LocalRedirectResult.Permanent"/> set to
+        /// false and <see cref="LocalRedirectResult.PreserveMethod"/> set to true 
+        /// (<see cref="StatusCodes.Status307TemporaryRedirect"/>) using the specified <paramref name="localUrl"/>.
+        /// </summary>
+        /// <param name="localUrl">The local URL to redirect to.</param>
+        /// <returns>The created <see cref="LocalRedirectResult"/> for the response.</returns>
+        public virtual LocalRedirectResult LocalRedirectPreserveMethod(string localUrl)
+        {
+            if (string.IsNullOrEmpty(localUrl))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(localUrl));
+            }
+
+            return new LocalRedirectResult(localUrl: localUrl, permanent: false, preserveMethod: true);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="LocalRedirectResult"/> object with <see cref="LocalRedirectResult.Permanent"/> set to
+        /// true and <see cref="LocalRedirectResult.PreserveMethod"/> set to true 
+        /// (<see cref="StatusCodes.Status308PermanentRedirect"/>) using the specified <paramref name="localUrl"/>.
+        /// </summary>
+        /// <param name="localUrl">The local URL to redirect to.</param>
+        /// <returns>The created <see cref="LocalRedirectResult"/> for the response.</returns>
+        public virtual LocalRedirectResult LocalRedirectPermanentPreserveMethod(string localUrl)
+        {
+            if (string.IsNullOrEmpty(localUrl))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(localUrl));
+            }
+
+            return new LocalRedirectResult(localUrl: localUrl, permanent: true, preserveMethod: true);
+        }
+
+        /// <summary>
+        /// Creates an <see cref="NotFoundResult"/> that produces a <see cref="StatusCodes.Status404NotFound"/> response.
+        /// </summary>
+        /// <returns>The created <see cref="NotFoundResult"/> for the response.</returns>
+        public virtual NotFoundResult NotFound()
+            => new NotFoundResult();
+
+        /// <summary>
+        /// Creates an <see cref="NotFoundObjectResult"/> that produces a <see cref="StatusCodes.Status404NotFound"/> response.
+        /// </summary>
+        /// <returns>The created <see cref="NotFoundObjectResult"/> for the response.</returns>
+        public virtual NotFoundObjectResult NotFound(object value)
+            => new NotFoundObjectResult(value);
+
+        /// <summary>
+        /// Creates a <see cref="PageResult"/> object that renders this page as a view to the response.
+        /// </summary>
+        /// <returns>The created <see cref="PageResult"/> object for the response.</returns>
+        /// <remarks>
+        /// Returning a <see cref="PageResult"/> from a page handler method is equivalent to returning void.
+        /// The view associated with the page will be executed.
+        /// </remarks>
+        public virtual PageResult Page() => new PageResult();
+
+        /// <summary>
+        /// Creates a <see cref="RedirectResult"/> object that redirects to the specified <paramref name="url"/>.
+        /// </summary>
+        /// <param name="url">The URL to redirect to.</param>
+        /// <returns>The created <see cref="RedirectResult"/> for the response.</returns>
+        public virtual RedirectResult Redirect(string url)
+        {
+            if (string.IsNullOrEmpty(url))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(url));
+            }
+
+            return new RedirectResult(url);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="RedirectResult"/> object with <see cref="RedirectResult.Permanent"/> set to true
+        /// (<see cref="StatusCodes.Status301MovedPermanently"/>) using the specified <paramref name="url"/>.
+        /// </summary>
+        /// <param name="url">The URL to redirect to.</param>
+        /// <returns>The created <see cref="RedirectResult"/> for the response.</returns>
+        public virtual RedirectResult RedirectPermanent(string url)
+        {
+            if (string.IsNullOrEmpty(url))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(url));
+            }
+
+            return new RedirectResult(url, permanent: true);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="RedirectResult"/> object with <see cref="RedirectResult.Permanent"/> set to false
+        /// and <see cref="RedirectResult.PreserveMethod"/> set to true (<see cref="StatusCodes.Status307TemporaryRedirect"/>) 
+        /// using the specified <paramref name="url"/>.
+        /// </summary>
+        /// <param name="url">The URL to redirect to.</param>
+        /// <returns>The created <see cref="RedirectResult"/> for the response.</returns>
+        public virtual RedirectResult RedirectPreserveMethod(string url)
+        {
+            if (string.IsNullOrEmpty(url))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(url));
+            }
+
+            return new RedirectResult(url: url, permanent: false, preserveMethod: true);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="RedirectResult"/> object with <see cref="RedirectResult.Permanent"/> set to true
+        /// and <see cref="RedirectResult.PreserveMethod"/> set to true (<see cref="StatusCodes.Status308PermanentRedirect"/>) 
+        /// using the specified <paramref name="url"/>.
+        /// </summary>
+        /// <param name="url">The URL to redirect to.</param>
+        /// <returns>The created <see cref="RedirectResult"/> for the response.</returns>
+        public virtual RedirectResult RedirectPermanentPreserveMethod(string url)
+        {
+            if (string.IsNullOrEmpty(url))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(url));
+            }
+
+            return new RedirectResult(url: url, permanent: true, preserveMethod: true);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified action using the <paramref name="actionName"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToAction(string actionName)
+            => RedirectToAction(actionName, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified action using the 
+        /// <paramref name="actionName"/> and <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToAction(string actionName, object routeValues)
+            => RedirectToAction(actionName, controllerName: null, routeValues: routeValues);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified action using the 
+        /// <paramref name="actionName"/> and the <paramref name="controllerName"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToAction(string actionName, string controllerName)
+            => RedirectToAction(actionName, controllerName, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified action using the specified
+        /// <paramref name="actionName"/>, <paramref name="controllerName"/>, and <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToAction(
+            string actionName,
+            string controllerName,
+            object routeValues)
+            => RedirectToAction(actionName, controllerName, routeValues, fragment: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified action using the specified
+        /// <paramref name="actionName"/>, <paramref name="controllerName"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToAction(
+            string actionName,
+            string controllerName,
+            string fragment)
+            => RedirectToAction(actionName, controllerName, routeValues: null, fragment: fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified action using the specified <paramref name="actionName"/>,
+        /// <paramref name="controllerName"/>, <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToAction(
+            string actionName,
+            string controllerName,
+            object routeValues,
+            string fragment)
+            => new RedirectToActionResult(actionName, controllerName, routeValues, fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status307TemporaryRedirect"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to false and <see cref="RedirectToActionResult.PreserveMethod"/> 
+        /// set to true, using the specified <paramref name="actionName"/>, <paramref name="controllerName"/>, 
+        /// <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>       
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToActionPreserveMethod(
+            string actionName = null,
+            string controllerName = null,
+            object routeValues = null,
+            string fragment = null)
+        {
+            return new RedirectToActionResult(
+                actionName: actionName,
+                controllerName: controllerName,
+                routeValues: routeValues,
+                permanent: false,
+                preserveMethod: true,
+                fragment: fragment);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to true using the specified <paramref name="actionName"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToActionPermanent(string actionName)
+        {
+            return RedirectToActionPermanent(actionName, routeValues: null);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to true using the specified <paramref name="actionName"/> 
+        /// and <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToActionPermanent(string actionName, object routeValues)
+        {
+            return RedirectToActionPermanent(actionName, controllerName: null, routeValues: routeValues);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to true using the specified <paramref name="actionName"/> 
+        /// and <paramref name="controllerName"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToActionPermanent(string actionName, string controllerName)
+        {
+            return RedirectToActionPermanent(actionName, controllerName, routeValues: null);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to true using the specified <paramref name="actionName"/>,
+        /// <paramref name="controllerName"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToActionPermanent(
+            string actionName,
+            string controllerName,
+            string fragment)
+        {
+            return RedirectToActionPermanent(actionName, controllerName, routeValues: null, fragment: fragment);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to true using the specified <paramref name="actionName"/>,
+        /// <paramref name="controllerName"/>, and <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToActionPermanent(
+            string actionName,
+            string controllerName,
+            object routeValues)
+        {
+            return RedirectToActionPermanent(actionName, controllerName, routeValues, fragment: null);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to true using the specified <paramref name="actionName"/>,
+        /// <paramref name="controllerName"/>, <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToActionPermanent(
+            string actionName,
+            string controllerName,
+            object routeValues,
+            string fragment)
+        {
+            return new RedirectToActionResult(
+                actionName,
+                controllerName,
+                routeValues,
+                permanent: true,
+                fragment: fragment);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status308PermanentRedirect"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to true and <see cref="RedirectToActionResult.PreserveMethod"/>
+        /// set to true, using the specified <paramref name="actionName"/>, <paramref name="controllerName"/>, 
+        /// <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>        
+        public virtual RedirectToActionResult RedirectToActionPermanentPreserveMethod(
+            string actionName = null,
+            string controllerName = null,
+            object routeValues = null,
+            string fragment = null)
+        {
+            return new RedirectToActionResult(
+                actionName: actionName,
+                controllerName: controllerName,
+                routeValues: routeValues,
+                permanent: true,
+                preserveMethod: true,
+                fragment: fragment);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified route using the specified <paramref name="routeName"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        public virtual RedirectToRouteResult RedirectToRoute(string routeName)
+        {
+            return RedirectToRoute(routeName, routeValues: null);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified route using the specified <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        public virtual RedirectToRouteResult RedirectToRoute(object routeValues)
+        {
+            return RedirectToRoute(routeName: null, routeValues: routeValues);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified route using the specified
+        /// <paramref name="routeName"/> and <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        public virtual RedirectToRouteResult RedirectToRoute(string routeName, object routeValues)
+        {
+            return RedirectToRoute(routeName, routeValues, fragment: null);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified route using the specified
+        /// <paramref name="routeName"/> and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        public virtual RedirectToRouteResult RedirectToRoute(string routeName, string fragment)
+        {
+            return RedirectToRoute(routeName, routeValues: null, fragment: fragment);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified route using the specified
+        /// <paramref name="routeName"/>, <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        public virtual RedirectToRouteResult RedirectToRoute(
+            string routeName,
+            object routeValues,
+            string fragment)
+        {
+            return new RedirectToRouteResult(routeName, routeValues, fragment);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status307TemporaryRedirect"/>) to the specified route with 
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to false and <see cref="RedirectToRouteResult.PreserveMethod"/>
+        /// set to true, using the specified <paramref name="routeName"/>, <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>       
+        public virtual RedirectToRouteResult RedirectToRoutePreserveMethod(
+            string routeName = null,
+            object routeValues = null,
+            string fragment = null)
+        {
+            return new RedirectToRouteResult(
+                routeName: routeName,
+                routeValues: routeValues,
+                permanent: false,
+                preserveMethod: true,
+                fragment: fragment);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified route with 
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to true using the specified <paramref name="routeName"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        public virtual RedirectToRouteResult RedirectToRoutePermanent(string routeName)
+        {
+            return RedirectToRoutePermanent(routeName, routeValues: null);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified route with 
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to true using the specified <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        public virtual RedirectToRouteResult RedirectToRoutePermanent(object routeValues)
+        {
+            return RedirectToRoutePermanent(routeName: null, routeValues: routeValues);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified route with
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to true using the specified <paramref name="routeName"/>
+        /// and <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        public virtual RedirectToRouteResult RedirectToRoutePermanent(string routeName, object routeValues)
+        {
+            return RedirectToRoutePermanent(routeName, routeValues, fragment: null);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified route with 
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to true using the specified <paramref name="routeName"/>
+        /// and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        public virtual RedirectToRouteResult RedirectToRoutePermanent(string routeName, string fragment)
+        {
+            return RedirectToRoutePermanent(routeName, routeValues: null, fragment: fragment);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified route with
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to true using the specified <paramref name="routeName"/>,
+        /// <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        public virtual RedirectToRouteResult RedirectToRoutePermanent(
+            string routeName,
+            object routeValues,
+            string fragment)
+            => new RedirectToRouteResult(routeName, routeValues, permanent: true, fragment: fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status308PermanentRedirect"/>) to the specified route with
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to true and <see cref="RedirectToRouteResult.PreserveMethod"/>
+        /// set to true, using the specified <paramref name="routeName"/>, <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>       
+        public virtual RedirectToRouteResult RedirectToRoutePermanentPreserveMethod(
+            string routeName = null,
+            object routeValues = null,
+            string fragment = null)
+        {
+            return new RedirectToRouteResult(
+                routeName: routeName,
+                routeValues: routeValues,
+                permanent: true,
+                preserveMethod: true,
+                fragment: fragment);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the current page.
+        /// </summary>
+        /// <returns>The <see cref="RedirectToPageResult"/>.</returns>
+        public virtual RedirectToPageResult RedirectToPage()
+            => RedirectToPage(pageName: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the current page with the specified <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/>.</returns>
+        public virtual RedirectToPageResult RedirectToPage(object routeValues)
+            => RedirectToPage(pageName: null, routeValues: routeValues);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified <paramref name="pageName"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/>.</returns>
+        public virtual RedirectToPageResult RedirectToPage(string pageName)
+            => RedirectToPage(pageName, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="pageHandler"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/>.</returns>
+        public virtual RedirectToPageResult RedirectToPage(string pageName, string pageHandler)
+            => RedirectToPage(pageName, pageHandler, routeValues: null, fragment: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/>.</returns>
+        public virtual RedirectToPageResult RedirectToPage(string pageName, object routeValues)
+            => RedirectToPage(pageName, pageHandler: null, routeValues: routeValues, fragment: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/>.</returns>
+        public virtual RedirectToPageResult RedirectToPage(string pageName, string pageHandler, string fragment)
+            => RedirectToPage(pageName, pageHandler, routeValues: null, fragment: fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="routeValues"/> and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/>.</returns>
+        public virtual RedirectToPageResult RedirectToPage(string pageName, string pageHandler, object routeValues, string fragment)
+            => new RedirectToPageResult(pageName, pageHandler, routeValues, fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified <paramref name="pageName"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/> with <see cref="RedirectToPageResult.Permanent"/> set.</returns>
+        public virtual RedirectToPageResult RedirectToPagePermanent(string pageName)
+            => RedirectToPagePermanent(pageName, pageHandler: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/> with <see cref="RedirectToPageResult.Permanent"/> set.</returns>
+        public virtual RedirectToPageResult RedirectToPagePermanent(string pageName, object routeValues)
+            => RedirectToPagePermanent(pageName, pageHandler: null, routeValues: routeValues, fragment: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="pageHandler"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/> with <see cref="RedirectToPageResult.Permanent"/> set.</returns>
+        public virtual RedirectToPageResult RedirectToPagePermanent(string pageName, string pageHandler)
+            => RedirectToPagePermanent(pageName, pageHandler, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/> with <see cref="RedirectToPageResult.Permanent"/> set.</returns>
+        public virtual RedirectToPageResult RedirectToPagePermanent(string pageName, string pageHandler, object routeValues)
+            => RedirectToPagePermanent(pageName, pageHandler, routeValues, fragment: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/> with <see cref="RedirectToPageResult.Permanent"/> set.</returns>
+        public virtual RedirectToPageResult RedirectToPagePermanent(string pageName, string pageHandler, string fragment)
+            => RedirectToPagePermanent(pageName, pageHandler, routeValues: null, fragment: fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="routeValues"/> and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/> with <see cref="RedirectToPageResult.Permanent"/> set.</returns>
+        public virtual RedirectToPageResult RedirectToPagePermanent(string pageName, string pageHandler, object routeValues, string fragment)
+            => new RedirectToPageResult(pageName, pageHandler, routeValues, permanent: true, fragment: fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status307TemporaryRedirect"/>) to the specified page with 
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to false and <see cref="RedirectToRouteResult.PreserveMethod"/>
+        /// set to true, using the specified <paramref name="pageName"/>, <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns> 
+        public virtual RedirectToPageResult RedirectToPagePreserveMethod(
+            string pageName = null,
+            string pageHandler = null,
+            object routeValues = null,
+            string fragment = null)
+        {
+            return new RedirectToPageResult(
+                pageName: pageName,
+                pageHandler: pageHandler,
+                routeValues: routeValues,
+                permanent: false,
+                preserveMethod: true,
+                fragment: fragment);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status308PermanentRedirect"/>) to the specified route with
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to true and <see cref="RedirectToRouteResult.PreserveMethod"/>
+        /// set to true, using the specified <paramref name="pageName"/>, <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>  
+        public virtual RedirectToPageResult RedirectToPagePermanentPreserveMethod(
+            string pageName = null,
+            string pageHandler = null,
+            object routeValues = null,
+            string fragment = null)
+        {
+            return new RedirectToPageResult(
+                pageName: pageName,
+                pageHandler: pageHandler,
+                routeValues: routeValues,
+                permanent: true,
+                preserveMethod: true,
+                fragment: fragment);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="SignInResult"/> with the specified authentication scheme.
+        /// </summary>
+        /// <param name="principal">The <see cref="ClaimsPrincipal"/> containing the user claims.</param>
+        /// <param name="authenticationScheme">The authentication scheme to use for the sign-in operation.</param>
+        /// <returns>The created <see cref="SignInResult"/> for the response.</returns>
+        public virtual SignInResult SignIn(ClaimsPrincipal principal, string authenticationScheme)
+            => new SignInResult(authenticationScheme, principal);
+
+        /// <summary>
+        /// Creates a <see cref="SignInResult"/> with the specified authentication scheme and
+        /// <paramref name="properties" />.
+        /// </summary>
+        /// <param name="principal">The <see cref="ClaimsPrincipal"/> containing the user claims.</param>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the sign-in operation.</param>
+        /// <param name="authenticationScheme">The authentication scheme to use for the sign-in operation.</param>
+        /// <returns>The created <see cref="SignInResult"/> for the response.</returns>
+        public virtual SignInResult SignIn(
+            ClaimsPrincipal principal,
+            AuthenticationProperties properties,
+            string authenticationScheme)
+            => new SignInResult(authenticationScheme, principal, properties);
+
+        /// <summary>
+        /// Creates a <see cref="SignOutResult"/> with the specified authentication schemes.
+        /// </summary>
+        /// <param name="authenticationSchemes">The authentication schemes to use for the sign-out operation.</param>
+        /// <returns>The created <see cref="SignOutResult"/> for the response.</returns>
+        public virtual SignOutResult SignOut(params string[] authenticationSchemes)
+            => new SignOutResult(authenticationSchemes);
+
+        /// <summary>
+        /// Creates a <see cref="SignOutResult"/> with the specified authentication schemes and
+        /// <paramref name="properties" />.
+        /// </summary>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the sign-out operation.</param>
+        /// <param name="authenticationSchemes">The authentication scheme to use for the sign-out operation.</param>
+        /// <returns>The created <see cref="SignOutResult"/> for the response.</returns>
+        public virtual SignOutResult SignOut(AuthenticationProperties properties, params string[] authenticationSchemes)
+            => new SignOutResult(authenticationSchemes, properties);
+
+        /// <summary>
+        /// Creates a <see cref="StatusCodeResult"/> object by specifying a <paramref name="statusCode"/>.
+        /// </summary>
+        /// <param name="statusCode">The status code to set on the response.</param>
+        /// <returns>The created <see cref="StatusCodeResult"/> object for the response.</returns>
+        public virtual StatusCodeResult StatusCode(int statusCode)
+            => new StatusCodeResult(statusCode);
+
+        /// <summary>
+        /// Creates a <see cref="ObjectResult"/> object by specifying a <paramref name="statusCode"/> and <paramref name="value"/>
+        /// </summary>
+        /// <param name="statusCode">The status code to set on the response.</param>
+        /// <param name="value">The value to set on the <see cref="ObjectResult"/>.</param>
+        /// <returns>The created <see cref="ObjectResult"/> object for the response.</returns>
+        public virtual ObjectResult StatusCode(int statusCode, object value)
+            => new ObjectResult(value) { StatusCode = statusCode };
+
+        /// <summary>
+        /// Creates an <see cref="UnauthorizedResult"/> that produces an <see cref="StatusCodes.Status401Unauthorized"/> response.
+        /// </summary>
+        /// <returns>The created <see cref="UnauthorizedResult"/> for the response.</returns>
+        public virtual UnauthorizedResult Unauthorized()
+            => new UnauthorizedResult();
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using values from the <see cref="RazorPages.Page"/>'s current
+        /// <see cref="IValueProvider"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        public virtual Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model)
+            where TModel : class
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            return TryUpdateModelAsync(model, prefix: string.Empty);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using values from the <see cref="RazorPages.Page"/>'s current
+        /// <see cref="IValueProvider"/> and a <paramref name="prefix"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="prefix">The prefix to use when looking up values in the current <see cref="IValueProvider"/>.
+        /// </param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        public virtual async Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model,
+            string prefix)
+            where TModel : class
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (prefix == null)
+            {
+                throw new ArgumentNullException(nameof(prefix));
+            }
+            var valueProvider = await CompositeValueProvider.CreateAsync(PageContext, PageContext.ValueProviderFactories);
+            return await TryUpdateModelAsync(model, prefix, valueProvider);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using the <paramref name="valueProvider"/> and a
+        /// <paramref name="prefix"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>.
+        /// </param>
+        /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        public virtual Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model,
+            string prefix,
+            IValueProvider valueProvider)
+            where TModel : class
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (prefix == null)
+            {
+                throw new ArgumentNullException(nameof(prefix));
+            }
+
+            if (valueProvider == null)
+            {
+                throw new ArgumentNullException(nameof(valueProvider));
+            }
+
+            return ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                prefix,
+                PageContext,
+                MetadataProvider,
+                ModelBinderFactory,
+                valueProvider,
+                ObjectValidator);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using values from the <see cref="RazorPages.Page"/>'s current
+        /// <see cref="IValueProvider"/> and a <paramref name="prefix"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="prefix">The prefix to use when looking up values in the current <see cref="IValueProvider"/>.
+        /// </param>
+        /// <param name="includeExpressions"> <see cref="Expression"/>(s) which represent top-level properties
+        /// which need to be included for the current model.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        public async Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model,
+            string prefix,
+            params Expression<Func<TModel, object>>[] includeExpressions)
+           where TModel : class
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (includeExpressions == null)
+            {
+                throw new ArgumentNullException(nameof(includeExpressions));
+            }
+
+            var valueProvider = await CompositeValueProvider.CreateAsync(PageContext, PageContext.ValueProviderFactories);
+            return await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                prefix,
+                PageContext,
+                MetadataProvider,
+                ModelBinderFactory,
+                valueProvider,
+                ObjectValidator,
+                includeExpressions);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using values from the <see cref="RazorPages.Page"/>'s current
+        /// <see cref="IValueProvider"/> and a <paramref name="prefix"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="prefix">The prefix to use when looking up values in the current <see cref="IValueProvider"/>.
+        /// </param>
+        /// <param name="propertyFilter">A predicate which can be used to filter properties at runtime.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        public async Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model,
+            string prefix,
+            Func<ModelMetadata, bool> propertyFilter)
+            where TModel : class
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (propertyFilter == null)
+            {
+                throw new ArgumentNullException(nameof(propertyFilter));
+            }
+
+            var valueProvider = await CompositeValueProvider.CreateAsync(PageContext, PageContext.ValueProviderFactories);
+            return await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                prefix,
+                PageContext,
+                MetadataProvider,
+                ModelBinderFactory,
+                valueProvider,
+                ObjectValidator,
+                propertyFilter);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using the <paramref name="valueProvider"/> and a
+        /// <paramref name="prefix"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>.
+        /// </param>
+        /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
+        /// <param name="includeExpressions"> <see cref="Expression"/>(s) which represent top-level properties
+        /// which need to be included for the current model.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        public Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model,
+            string prefix,
+            IValueProvider valueProvider,
+            params Expression<Func<TModel, object>>[] includeExpressions)
+           where TModel : class
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (valueProvider == null)
+            {
+                throw new ArgumentNullException(nameof(valueProvider));
+            }
+
+            if (includeExpressions == null)
+            {
+                throw new ArgumentNullException(nameof(includeExpressions));
+            }
+
+            return ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                prefix,
+                PageContext,
+                MetadataProvider,
+                ModelBinderFactory,
+                valueProvider,
+                ObjectValidator,
+                includeExpressions);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using the <paramref name="valueProvider"/> and a
+        /// <paramref name="prefix"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>.
+        /// </param>
+        /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
+        /// <param name="propertyFilter">A predicate which can be used to filter properties at runtime.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        public Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model,
+            string prefix,
+            IValueProvider valueProvider,
+            Func<ModelMetadata, bool> propertyFilter)
+            where TModel : class
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (valueProvider == null)
+            {
+                throw new ArgumentNullException(nameof(valueProvider));
+            }
+
+            if (propertyFilter == null)
+            {
+                throw new ArgumentNullException(nameof(propertyFilter));
+            }
+
+            return ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                prefix,
+                PageContext,
+                MetadataProvider,
+                ModelBinderFactory,
+                valueProvider,
+                ObjectValidator,
+                propertyFilter);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using values from the <see cref="RazorPages.Page"/>'s current
+        /// <see cref="IValueProvider"/> and a <paramref name="prefix"/>.
+        /// </summary>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="modelType">The type of model instance to update.</param>
+        /// <param name="prefix">The prefix to use when looking up values in the current <see cref="IValueProvider"/>.
+        /// </param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        public virtual async Task<bool> TryUpdateModelAsync(
+            object model,
+            Type modelType,
+            string prefix)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            var valueProvider = await CompositeValueProvider.CreateAsync(PageContext, PageContext.ValueProviderFactories);
+            return await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                modelType,
+                prefix,
+                PageContext,
+                MetadataProvider,
+                ModelBinderFactory,
+                valueProvider,
+                ObjectValidator);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using the <paramref name="valueProvider"/> and a
+        /// <paramref name="prefix"/>.
+        /// </summary>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="modelType">The type of model instance to update.</param>
+        /// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>.
+        /// </param>
+        /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
+        /// <param name="propertyFilter">A predicate which can be used to filter properties at runtime.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        public Task<bool> TryUpdateModelAsync(
+            object model,
+            Type modelType,
+            string prefix,
+            IValueProvider valueProvider,
+            Func<ModelMetadata, bool> propertyFilter)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            if (valueProvider == null)
+            {
+                throw new ArgumentNullException(nameof(valueProvider));
+            }
+
+            if (propertyFilter == null)
+            {
+                throw new ArgumentNullException(nameof(propertyFilter));
+            }
+
+            return ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                modelType,
+                prefix,
+                PageContext,
+                MetadataProvider,
+                ModelBinderFactory,
+                valueProvider,
+                ObjectValidator,
+                propertyFilter);
+        }
+
+        /// <summary>
+        /// Validates the specified <paramref name="model"/> instance.
+        /// </summary>
+        /// <param name="model">The model to validate.</param>
+        /// <returns><c>true</c> if the <see cref="ModelState"/> is valid; <c>false</c> otherwise.</returns>
+        public virtual bool TryValidateModel(
+            object model)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            return TryValidateModel(model, prefix: null);
+        }
+
+        /// <summary>
+        /// Validates the specified <paramref name="model"/> instance.
+        /// </summary>
+        /// <param name="model">The model to validate.</param>
+        /// <param name="prefix">The key to use when looking up information in <see cref="ModelState"/>.
+        /// </param>
+        /// <returns><c>true</c> if the <see cref="ModelState"/> is valid;<c>false</c> otherwise.</returns>
+        public virtual bool TryValidateModel(
+            object model,
+            string prefix)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            ObjectValidator.Validate(
+                PageContext,
+                validationState: null,
+                prefix: prefix ?? string.Empty,
+                model: model);
+            return ModelState.IsValid;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs
new file mode 100644
index 0000000000..cfede5d167
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs
@@ -0,0 +1,118 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    /// <summary>
+    /// The context associated with the current request for a Razor page.
+    /// </summary>
+    public class PageContext : ActionContext
+    {
+        private CompiledPageActionDescriptor _actionDescriptor;
+        private IList<IValueProviderFactory> _valueProviderFactories;
+        private ViewDataDictionary _viewData;
+        private IList<Func<IRazorPage>> _viewStartFactories;
+
+        /// <summary>
+        /// Creates an empty <see cref="PageContext"/>.
+        /// </summary>
+        /// <remarks>
+        /// The default constructor is provided for unit test purposes only.
+        /// </remarks>
+        public PageContext()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="PageContext"/>.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/>.</param>
+        public PageContext(ActionContext actionContext)
+            : base(actionContext)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="PageActionDescriptor"/>.
+        /// </summary>
+        public virtual new CompiledPageActionDescriptor ActionDescriptor
+        {
+            get => _actionDescriptor;
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _actionDescriptor = value;
+                base.ActionDescriptor = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the list of <see cref="IValueProviderFactory"/> instances for the current request.
+        /// </summary>
+        public virtual IList<IValueProviderFactory> ValueProviderFactories
+        {
+            get
+            {
+                if (_valueProviderFactories == null)
+                {
+                    _valueProviderFactories = new List<IValueProviderFactory>();
+                }
+
+                return _valueProviderFactories;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _valueProviderFactories = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets <see cref="ViewDataDictionary"/>.
+        /// </summary>
+        public virtual ViewDataDictionary ViewData
+        {
+            get => _viewData;
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _viewData = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the applicable _ViewStart instances.
+        /// </summary>
+        public virtual IList<Func<IRazorPage>> ViewStartFactories
+        {
+            get => _viewStartFactories;
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _viewStartFactories = value;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageContextAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageContextAttribute.cs
new file mode 100644
index 0000000000..d92ec99c26
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageContextAttribute.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    /// <summary>
+    /// Specifies that a Razor Page model property should be set with the current <see cref="PageContext"/> when creating
+    /// the model instance. The property must have a public set method.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
+    public class PageContextAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs
new file mode 100644
index 0000000000..ce5a76af27
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs
@@ -0,0 +1,1729 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Linq.Expressions;
+using System.Security.Claims;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    [PageModel]
+    public abstract class PageModel : IAsyncPageFilter, IPageFilter
+    {
+        private IModelMetadataProvider _metadataProvider;
+        private IModelBinderFactory _modelBinderFactory;
+        private IObjectModelValidator _objectValidator;
+        private ITempDataDictionary _tempData;
+        private IUrlHelper _urlHelper;
+        private PageContext _pageContext;
+
+        /// <summary>
+        /// Gets the <see cref="RazorPages.PageContext"/>.
+        /// </summary>
+        [PageContext]
+        public PageContext PageContext
+        {
+            get
+            {
+                if (_pageContext == null)
+                {
+                    _pageContext = new PageContext();
+                }
+
+                return _pageContext;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _pageContext = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Http.HttpContext"/>.
+        /// </summary>
+        public HttpContext HttpContext => PageContext.HttpContext;
+
+        /// <summary>
+        /// Gets the <see cref="HttpRequest"/>.
+        /// </summary>
+        public HttpRequest Request => HttpContext?.Request;
+
+        /// <summary>
+        /// Gets the <see cref="HttpResponse"/>.
+        /// </summary>
+        public HttpResponse Response => HttpContext?.Response;
+
+        /// <summary>
+        /// Gets the <see cref="AspNetCore.Routing.RouteData"/> for the executing action.
+        /// </summary>
+        public RouteData RouteData => PageContext.RouteData;
+
+        /// <summary>
+        /// Gets the <see cref="ModelStateDictionary"/>.
+        /// </summary>
+        public ModelStateDictionary ModelState => PageContext.ModelState;
+
+        /// <summary>
+        /// Gets the <see cref="ClaimsPrincipal"/> for user associated with the executing action.
+        /// </summary>
+        public ClaimsPrincipal User => HttpContext?.User;
+
+        /// <summary>
+        /// Gets or sets <see cref="ITempDataDictionary"/> used by <see cref="PageResult"/>.
+        /// </summary>
+        public ITempDataDictionary TempData
+        {
+            get
+            {
+                if (_tempData == null)
+                {
+                    var factory = HttpContext?.RequestServices?.GetRequiredService<ITempDataDictionaryFactory>();
+                    _tempData = factory?.GetTempData(HttpContext);
+                }
+
+                return _tempData;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _tempData = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IUrlHelper"/>.
+        /// </summary>
+        public IUrlHelper Url
+        {
+            get
+            {
+                if (_urlHelper == null)
+                {
+                    var factory = HttpContext?.RequestServices?.GetRequiredService<IUrlHelperFactory>();
+                    _urlHelper = factory?.GetUrlHelper(PageContext);
+                }
+
+                return _urlHelper;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _urlHelper = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets <see cref="ViewDataDictionary"/> used by <see cref="PageResult"/>.
+        /// </summary>
+        public ViewDataDictionary ViewData => PageContext?.ViewData;
+
+        private IObjectModelValidator ObjectValidator
+        {
+            get
+            {
+                if (_objectValidator == null)
+                {
+                    _objectValidator = HttpContext?.RequestServices?.GetRequiredService<IObjectModelValidator>();
+                }
+
+                return _objectValidator;
+            }
+        }
+
+        private IModelMetadataProvider MetadataProvider
+        {
+            get
+            {
+                if (_metadataProvider == null)
+                {
+                    _metadataProvider = HttpContext?.RequestServices?.GetRequiredService<IModelMetadataProvider>();
+                }
+
+                return _metadataProvider;
+            }
+        }
+
+        private IModelBinderFactory ModelBinderFactory
+        {
+            get
+            {
+                if (_modelBinderFactory == null)
+                {
+                    _modelBinderFactory = HttpContext?.RequestServices?.GetRequiredService<IModelBinderFactory>();
+                }
+
+                return _modelBinderFactory;
+            }
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using values from the <see cref="PageModel"/>'s current
+        /// <see cref="IValueProvider"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        protected internal Task<bool> TryUpdateModelAsync<TModel>(TModel model)
+            where TModel : class
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            return TryUpdateModelAsync(model, name: string.Empty);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using values from the <see cref="PageModel"/>'s current
+        /// <see cref="IValueProvider"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="name">The model name.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        protected internal async Task<bool> TryUpdateModelAsync<TModel>(TModel model, string name)
+            where TModel : class
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            var valueProvider = await CompositeValueProvider.CreateAsync(PageContext, PageContext.ValueProviderFactories);
+            return await TryUpdateModelAsync(model, name, valueProvider);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using the <paramref name="valueProvider"/> and a
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="name">The name to use when looking up values in the <paramref name="valueProvider"/>.
+        /// </param>
+        /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        protected internal Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model,
+            string name,
+            IValueProvider valueProvider)
+            where TModel : class
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            if (valueProvider == null)
+            {
+                throw new ArgumentNullException(nameof(valueProvider));
+            }
+
+            return ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                name,
+                PageContext,
+                MetadataProvider,
+                ModelBinderFactory,
+                valueProvider,
+                ObjectValidator);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using values from the <see cref="PageModel"/>'s current
+        /// <see cref="IValueProvider"/> and a <paramref name="name"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="name">The name to use when looking up values in the current <see cref="IValueProvider"/>.
+        /// </param>
+        /// <param name="includeExpressions"> <see cref="Expression"/>(s) which represent top-level properties
+        /// which need to be included for the current model.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        protected internal async Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model,
+            string name,
+            params Expression<Func<TModel, object>>[] includeExpressions)
+           where TModel : class
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (includeExpressions == null)
+            {
+                throw new ArgumentNullException(nameof(includeExpressions));
+            }
+
+            var valueProvider = await CompositeValueProvider.CreateAsync(PageContext, PageContext.ValueProviderFactories);
+            return await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                name,
+                PageContext,
+                MetadataProvider,
+                ModelBinderFactory,
+                valueProvider,
+                ObjectValidator,
+                includeExpressions);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using values from the <see cref="PageModel"/>'s current
+        /// <see cref="IValueProvider"/> and a <paramref name="name"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="name">The name to use when looking up values in the current <see cref="IValueProvider"/>.
+        /// </param>
+        /// <param name="propertyFilter">A predicate which can be used to filter properties at runtime.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        protected internal async Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model,
+            string name,
+            Func<ModelMetadata, bool> propertyFilter)
+            where TModel : class
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (propertyFilter == null)
+            {
+                throw new ArgumentNullException(nameof(propertyFilter));
+            }
+
+            var valueProvider = await CompositeValueProvider.CreateAsync(PageContext, PageContext.ValueProviderFactories);
+            return await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                name,
+                PageContext,
+                MetadataProvider,
+                ModelBinderFactory,
+                valueProvider,
+                ObjectValidator,
+                propertyFilter);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using the <paramref name="valueProvider"/> and a
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="name">The name to use when looking up values in the <paramref name="valueProvider"/>.
+        /// </param>
+        /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
+        /// <param name="includeExpressions"> <see cref="Expression"/>(s) which represent top-level properties
+        /// which need to be included for the current model.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        protected internal Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model,
+            string name,
+            IValueProvider valueProvider,
+            params Expression<Func<TModel, object>>[] includeExpressions)
+           where TModel : class
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (valueProvider == null)
+            {
+                throw new ArgumentNullException(nameof(valueProvider));
+            }
+
+            if (includeExpressions == null)
+            {
+                throw new ArgumentNullException(nameof(includeExpressions));
+            }
+
+            return ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                name,
+                PageContext,
+                MetadataProvider,
+                ModelBinderFactory,
+                valueProvider,
+                ObjectValidator,
+                includeExpressions);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using the <paramref name="valueProvider"/> and a
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model object.</typeparam>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="name">The name to use when looking up values in the <paramref name="valueProvider"/>.
+        /// </param>
+        /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
+        /// <param name="propertyFilter">A predicate which can be used to filter properties at runtime.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        protected internal Task<bool> TryUpdateModelAsync<TModel>(
+            TModel model,
+            string name,
+            IValueProvider valueProvider,
+            Func<ModelMetadata, bool> propertyFilter)
+            where TModel : class
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (valueProvider == null)
+            {
+                throw new ArgumentNullException(nameof(valueProvider));
+            }
+
+            if (propertyFilter == null)
+            {
+                throw new ArgumentNullException(nameof(propertyFilter));
+            }
+
+            return ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                name,
+                PageContext,
+                MetadataProvider,
+                ModelBinderFactory,
+                valueProvider,
+                ObjectValidator,
+                propertyFilter);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using values from the <see cref="PageModel"/>'s current
+        /// <see cref="IValueProvider"/> and a <paramref name="name"/>.
+        /// </summary>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="modelType">The type of model instance to update.</param>
+        /// <param name="name">The name to use when looking up values in the current <see cref="IValueProvider"/>.
+        /// </param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        protected internal async Task<bool> TryUpdateModelAsync(
+            object model,
+            Type modelType,
+            string name)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            var valueProvider = await CompositeValueProvider.CreateAsync(PageContext, PageContext.ValueProviderFactories);
+            return await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                modelType,
+                name,
+                PageContext,
+                MetadataProvider,
+                ModelBinderFactory,
+                valueProvider,
+                ObjectValidator);
+        }
+
+        /// <summary>
+        /// Updates the specified <paramref name="model"/> instance using the <paramref name="valueProvider"/> and a
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="model">The model instance to update.</param>
+        /// <param name="modelType">The type of model instance to update.</param>
+        /// <param name="name">The name to use when looking up values in the <paramref name="valueProvider"/>.
+        /// </param>
+        /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
+        /// <param name="propertyFilter">A predicate which can be used to filter properties at runtime.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful.</returns>
+        protected internal Task<bool> TryUpdateModelAsync(
+            object model,
+            Type modelType,
+            string name,
+            IValueProvider valueProvider,
+            Func<ModelMetadata, bool> propertyFilter)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            if (valueProvider == null)
+            {
+                throw new ArgumentNullException(nameof(valueProvider));
+            }
+
+            if (propertyFilter == null)
+            {
+                throw new ArgumentNullException(nameof(propertyFilter));
+            }
+
+            return ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                modelType,
+                name,
+                PageContext,
+                MetadataProvider,
+                ModelBinderFactory,
+                valueProvider,
+                ObjectValidator,
+                propertyFilter);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="BadRequestResult"/> that produces a <see cref="StatusCodes.Status400BadRequest"/> response.
+        /// </summary>
+        /// <returns>The created <see cref="BadRequestResult"/> for the response.</returns>
+        [NonAction]
+        public virtual BadRequestResult BadRequest()
+            => new BadRequestResult();
+
+        /// <summary>
+        /// Creates a <see cref="BadRequestObjectResult"/> that produces a <see cref="StatusCodes.Status400BadRequest"/> response.
+        /// </summary>
+        /// <param name="error">An error object to be returned to the client.</param>
+        /// <returns>The created <see cref="BadRequestObjectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual BadRequestObjectResult BadRequest(object error)
+            => new BadRequestObjectResult(error);
+
+        /// <summary>
+        /// Creates a <see cref="BadRequestObjectResult"/> that produces a <see cref="StatusCodes.Status400BadRequest"/> response.
+        /// </summary>
+        /// <param name="modelState">The <see cref="ModelStateDictionary" /> containing errors to be returned to the client.</param>
+        /// <returns>The created <see cref="BadRequestObjectResult"/> for the response.</returns>
+        [NonAction]
+        public virtual BadRequestObjectResult BadRequest(ModelStateDictionary modelState)
+        {
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            return new BadRequestObjectResult(modelState);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ChallengeResult"/>.
+        /// </summary>
+        /// <returns>The created <see cref="ChallengeResult"/> for the response.</returns>
+        /// <remarks>
+        /// The behavior of this method depends on the <see cref="IAuthenticationService"/> in use.
+        /// <see cref="StatusCodes.Status401Unauthorized"/> and <see cref="StatusCodes.Status403Forbidden"/>
+        /// are among likely status results.
+        /// </remarks>
+        public virtual ChallengeResult Challenge()
+            => new ChallengeResult();
+
+        /// <summary>
+        /// Creates a <see cref="ChallengeResult"/> with the specified authentication schemes.
+        /// </summary>
+        /// <param name="authenticationSchemes">The authentication schemes to challenge.</param>
+        /// <returns>The created <see cref="ChallengeResult"/> for the response.</returns>
+        /// <remarks>
+        /// The behavior of this method depends on the <see cref="IAuthenticationService"/> in use.
+        /// <see cref="StatusCodes.Status401Unauthorized"/> and <see cref="StatusCodes.Status403Forbidden"/>
+        /// are among likely status results.
+        /// </remarks>
+        public virtual ChallengeResult Challenge(params string[] authenticationSchemes)
+            => new ChallengeResult(authenticationSchemes);
+
+        /// <summary>
+        /// Creates a <see cref="ChallengeResult"/> with the specified <paramref name="properties" />.
+        /// </summary>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the authentication
+        /// challenge.</param>
+        /// <returns>The created <see cref="ChallengeResult"/> for the response.</returns>
+        /// <remarks>
+        /// The behavior of this method depends on the <see cref="IAuthenticationService"/> in use.
+        /// <see cref="StatusCodes.Status401Unauthorized"/> and <see cref="StatusCodes.Status403Forbidden"/>
+        /// are among likely status results.
+        /// </remarks>
+        public virtual ChallengeResult Challenge(AuthenticationProperties properties)
+            => new ChallengeResult(properties);
+
+        /// <summary>
+        /// Creates a <see cref="ChallengeResult"/> with the specified authentication schemes and
+        /// <paramref name="properties" />.
+        /// </summary>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the authentication
+        /// challenge.</param>
+        /// <param name="authenticationSchemes">The authentication schemes to challenge.</param>
+        /// <returns>The created <see cref="ChallengeResult"/> for the response.</returns>
+        /// <remarks>
+        /// The behavior of this method depends on the <see cref="IAuthenticationService"/> in use.
+        /// <see cref="StatusCodes.Status401Unauthorized"/> and <see cref="StatusCodes.Status403Forbidden"/>
+        /// are among likely status results.
+        /// </remarks>
+        public virtual ChallengeResult Challenge(
+            AuthenticationProperties properties,
+            params string[] authenticationSchemes)
+            => new ChallengeResult(authenticationSchemes, properties);
+
+        /// <summary>
+        /// Creates a <see cref="ContentResult"/> object with <see cref="StatusCodes.Status200OK"/> by specifying a
+        /// <paramref name="content"/> string.
+        /// </summary>
+        /// <param name="content">The content to write to the response.</param>
+        /// <returns>The created <see cref="ContentResult"/> object for the response.</returns>
+        public virtual ContentResult Content(string content)
+            => Content(content, (MediaTypeHeaderValue)null);
+
+        /// <summary>
+        /// Creates a <see cref="ContentResult"/> object with <see cref="StatusCodes.Status200OK"/> by specifying a 
+        /// <paramref name="content"/> string and a content type.
+        /// </summary>
+        /// <param name="content">The content to write to the response.</param>
+        /// <param name="contentType">The content type (MIME type).</param>
+        /// <returns>The created <see cref="ContentResult"/> object for the response.</returns>
+        public virtual ContentResult Content(string content, string contentType)
+            => Content(content, MediaTypeHeaderValue.Parse(contentType));
+
+        /// <summary>
+        /// Creates a <see cref="ContentResult"/> object with <see cref="StatusCodes.Status200OK"/> by specifying a 
+        /// <paramref name="content"/> string, a <paramref name="contentType"/>, and <paramref name="contentEncoding"/>.
+        /// </summary>
+        /// <param name="content">The content to write to the response.</param>
+        /// <param name="contentType">The content type (MIME type).</param>
+        /// <param name="contentEncoding">The content encoding.</param>
+        /// <returns>The created <see cref="ContentResult"/> object for the response.</returns>
+        /// <remarks>
+        /// If encoding is provided by both the 'charset' and the <paramref name="contentEncoding"/> parameters, then
+        /// the <paramref name="contentEncoding"/> parameter is chosen as the final encoding.
+        /// </remarks>
+        public virtual ContentResult Content(string content, string contentType, Encoding contentEncoding)
+        {
+            var mediaTypeHeaderValue = MediaTypeHeaderValue.Parse(contentType);
+            mediaTypeHeaderValue.Encoding = contentEncoding ?? mediaTypeHeaderValue.Encoding;
+            return Content(content, mediaTypeHeaderValue);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ContentResult"/> object with <see cref="StatusCodes.Status200OK"/> by specifying a 
+        /// <paramref name="content"/> string and a <paramref name="contentType"/>.
+        /// </summary>
+        /// <param name="content">The content to write to the response.</param>
+        /// <param name="contentType">The content type (MIME type).</param>
+        /// <returns>The created <see cref="ContentResult"/> object for the response.</returns>
+        public virtual ContentResult Content(string content, MediaTypeHeaderValue contentType)
+        {
+            return new ContentResult
+            {
+                Content = content,
+                ContentType = contentType?.ToString()
+            };
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ForbidResult"/> (<see cref="StatusCodes.Status403Forbidden"/> by default).
+        /// </summary>
+        /// <returns>The created <see cref="ForbidResult"/> for the response.</returns>
+        /// <remarks>
+        /// Some authentication schemes, such as cookies, will convert <see cref="StatusCodes.Status403Forbidden"/> to
+        /// a redirect to show a login page.
+        /// </remarks>
+        public virtual ForbidResult Forbid()
+            => new ForbidResult();
+
+        /// <summary>
+        /// Creates a <see cref="ForbidResult"/> (<see cref="StatusCodes.Status403Forbidden"/> by default) with the
+        /// specified authentication schemes.
+        /// </summary>
+        /// <param name="authenticationSchemes">The authentication schemes to challenge.</param>
+        /// <returns>The created <see cref="ForbidResult"/> for the response.</returns>
+        /// <remarks>
+        /// Some authentication schemes, such as cookies, will convert <see cref="StatusCodes.Status403Forbidden"/> to
+        /// a redirect to show a login page.
+        /// </remarks>
+        public virtual ForbidResult Forbid(params string[] authenticationSchemes)
+            => new ForbidResult(authenticationSchemes);
+
+        /// <summary>
+        /// Creates a <see cref="ForbidResult"/> (<see cref="StatusCodes.Status403Forbidden"/> by default) with the
+        /// specified <paramref name="properties" />.
+        /// </summary>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the authentication
+        /// challenge.</param>
+        /// <returns>The created <see cref="ForbidResult"/> for the response.</returns>
+        /// <remarks>
+        /// Some authentication schemes, such as cookies, will convert <see cref="StatusCodes.Status403Forbidden"/> to 
+        /// a redirect to show a login page.
+        /// </remarks>
+        public virtual ForbidResult Forbid(AuthenticationProperties properties)
+            => new ForbidResult(properties);
+
+        /// <summary>
+        /// Creates a <see cref="ForbidResult"/> (<see cref="StatusCodes.Status403Forbidden"/> by default) with the 
+        /// specified authentication schemes and <paramref name="properties" />.
+        /// </summary>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the authentication
+        /// challenge.</param>
+        /// <param name="authenticationSchemes">The authentication schemes to challenge.</param>
+        /// <returns>The created <see cref="ForbidResult"/> for the response.</returns>
+        /// <remarks>
+        /// Some authentication schemes, such as cookies, will convert <see cref="StatusCodes.Status403Forbidden"/> to
+        /// a redirect to show a login page.
+        /// </remarks>
+        public virtual ForbidResult Forbid(AuthenticationProperties properties, params string[] authenticationSchemes)
+            => new ForbidResult(authenticationSchemes, properties);
+
+        /// <summary>
+        /// Returns a file with the specified <paramref name="fileContents" /> as content
+        /// (<see cref="StatusCodes.Status200OK"/>) and the specified <paramref name="contentType" /> as the Content-Type.
+        /// </summary>
+        /// <param name="fileContents">The file contents.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <returns>The created <see cref="FileContentResult"/> for the response.</returns>
+        public virtual FileContentResult File(byte[] fileContents, string contentType)
+            => File(fileContents, contentType, fileDownloadName: null);
+
+        /// <summary>
+        /// Returns a file with the specified <paramref name="fileContents" /> as content (<see cref="StatusCodes.Status200OK"/>), the
+        /// specified <paramref name="contentType" /> as the Content-Type and the
+        /// specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// </summary>
+        /// <param name="fileContents">The file contents.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <returns>The created <see cref="FileContentResult"/> for the response.</returns>
+        public virtual FileContentResult File(byte[] fileContents, string contentType, string fileDownloadName)
+            => new FileContentResult(fileContents, contentType) { FileDownloadName = fileDownloadName };
+
+        /// <summary>
+        /// Returns a file in the specified <paramref name="fileStream" /> (<see cref="StatusCodes.Status200OK"/>)
+        /// with the specified <paramref name="contentType" /> as the Content-Type.
+        /// </summary>
+        /// <param name="fileStream">The <see cref="Stream"/> with the contents of the file.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <returns>The created <see cref="FileStreamResult"/> for the response.</returns>
+        public virtual FileStreamResult File(Stream fileStream, string contentType)
+            => File(fileStream, contentType, fileDownloadName: null);
+
+        /// <summary>
+        /// Returns a file in the specified <paramref name="fileStream" /> (<see cref="StatusCodes.Status200OK"/>) with the
+        /// specified <paramref name="contentType" /> as the Content-Type and the
+        /// specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// </summary>
+        /// <param name="fileStream">The <see cref="Stream"/> with the contents of the file.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <returns>The created <see cref="FileStreamResult"/> for the response.</returns>
+        public virtual FileStreamResult File(Stream fileStream, string contentType, string fileDownloadName)
+            => new FileStreamResult(fileStream, contentType) { FileDownloadName = fileDownloadName };
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="virtualPath" /> (<see cref="StatusCodes.Status200OK"/>) with the
+        /// specified <paramref name="contentType" /> as the Content-Type.
+        /// </summary>
+        /// <param name="virtualPath">The virtual path of the file to be returned.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <returns>The created <see cref="VirtualFileResult"/> for the response.</returns>
+        public virtual VirtualFileResult File(string virtualPath, string contentType)
+            => File(virtualPath, contentType, fileDownloadName: null);
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="virtualPath" /> (<see cref="StatusCodes.Status200OK"/>) with the
+        /// specified <paramref name="contentType" /> as the Content-Type and the
+        /// specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// </summary>
+        /// <param name="virtualPath">The virtual path of the file to be returned.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <returns>The created <see cref="VirtualFileResult"/> for the response.</returns>
+        public virtual VirtualFileResult File(string virtualPath, string contentType, string fileDownloadName)
+            => new VirtualFileResult(virtualPath, contentType) { FileDownloadName = fileDownloadName };
+
+        /// <summary>
+        /// Creates a <see cref="LocalRedirectResult"/> object that redirects 
+        /// (<see cref="StatusCodes.Status302Found"/>) to the specified local <paramref name="localUrl"/>.
+        /// </summary>
+        /// <param name="localUrl">The local URL to redirect to.</param>
+        /// <returns>The created <see cref="LocalRedirectResult"/> for the response.</returns>
+        public virtual LocalRedirectResult LocalRedirect(string localUrl)
+        {
+            if (string.IsNullOrEmpty(localUrl))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(localUrl));
+            }
+
+            return new LocalRedirectResult(localUrl);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="LocalRedirectResult"/> object with <see cref="LocalRedirectResult.Permanent"/> set to
+        /// true (<see cref="StatusCodes.Status301MovedPermanently"/>) using the specified <paramref name="localUrl"/>.
+        /// </summary>
+        /// <param name="localUrl">The local URL to redirect to.</param>
+        /// <returns>The created <see cref="LocalRedirectResult"/> for the response.</returns>
+        public virtual LocalRedirectResult LocalRedirectPermanent(string localUrl)
+        {
+            if (string.IsNullOrEmpty(localUrl))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(localUrl));
+            }
+
+            return new LocalRedirectResult(localUrl, permanent: true);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="LocalRedirectResult"/> object with <see cref="LocalRedirectResult.Permanent"/> set to
+        /// false and <see cref="LocalRedirectResult.PreserveMethod"/> set to true 
+        /// (<see cref="StatusCodes.Status307TemporaryRedirect"/>) using the specified <paramref name="localUrl"/>.
+        /// </summary>
+        /// <param name="localUrl">The local URL to redirect to.</param>
+        /// <returns>The created <see cref="LocalRedirectResult"/> for the response.</returns>
+        public virtual LocalRedirectResult LocalRedirectPreserveMethod(string localUrl)
+        {
+            if (string.IsNullOrEmpty(localUrl))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(localUrl));
+            }
+
+            return new LocalRedirectResult(localUrl: localUrl, permanent: false, preserveMethod: true);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="LocalRedirectResult"/> object with <see cref="LocalRedirectResult.Permanent"/> set to
+        /// true and <see cref="LocalRedirectResult.PreserveMethod"/> set to true 
+        /// (<see cref="StatusCodes.Status308PermanentRedirect"/>) using the specified <paramref name="localUrl"/>.
+        /// </summary>
+        /// <param name="localUrl">The local URL to redirect to.</param>
+        /// <returns>The created <see cref="LocalRedirectResult"/> for the response.</returns>
+        public virtual LocalRedirectResult LocalRedirectPermanentPreserveMethod(string localUrl)
+        {
+            if (string.IsNullOrEmpty(localUrl))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(localUrl));
+            }
+
+            return new LocalRedirectResult(localUrl: localUrl, permanent: true, preserveMethod: true);
+        }
+
+        /// <summary>
+        /// Creates an <see cref="NotFoundResult"/> that produces a <see cref="StatusCodes.Status404NotFound"/> response.
+        /// </summary>
+        /// <returns>The created <see cref="NotFoundResult"/> for the response.</returns>
+        public virtual NotFoundResult NotFound()
+            => new NotFoundResult();
+
+        /// <summary>
+        /// Creates an <see cref="NotFoundObjectResult"/> that produces a <see cref="StatusCodes.Status404NotFound"/> response.
+        /// </summary>
+        /// <returns>The created <see cref="NotFoundObjectResult"/> for the response.</returns>
+        public virtual NotFoundObjectResult NotFound(object value)
+            => new NotFoundObjectResult(value);
+
+        /// <summary>
+        /// Creates a <see cref="PageResult"/> object that renders the page.
+        /// </summary>
+        /// <returns>The <see cref="PageResult"/>.</returns>
+        public virtual PageResult Page() => new PageResult();
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="physicalPath" /> (<see cref="StatusCodes.Status200OK"/>) with the
+        /// specified <paramref name="contentType" /> as the Content-Type.
+        /// </summary>
+        /// <param name="physicalPath">The physical path of the file to be returned.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <returns>The created <see cref="PhysicalFileResult"/> for the response.</returns>
+        public virtual PhysicalFileResult PhysicalFile(string physicalPath, string contentType)
+            => PhysicalFile(physicalPath, contentType, fileDownloadName: null);
+
+        /// <summary>
+        /// Returns the file specified by <paramref name="physicalPath" /> (<see cref="StatusCodes.Status200OK"/>) with the
+        /// specified <paramref name="contentType" /> as the Content-Type and the
+        /// specified <paramref name="fileDownloadName" /> as the suggested file name.
+        /// </summary>
+        /// <param name="physicalPath">The physical path of the file to be returned.</param>
+        /// <param name="contentType">The Content-Type of the file.</param>
+        /// <param name="fileDownloadName">The suggested file name.</param>
+        /// <returns>The created <see cref="PhysicalFileResult"/> for the response.</returns>
+        public virtual PhysicalFileResult PhysicalFile(
+            string physicalPath,
+            string contentType,
+            string fileDownloadName)
+            => new PhysicalFileResult(physicalPath, contentType) { FileDownloadName = fileDownloadName };
+
+        /// <summary>
+        /// Creates a <see cref="RedirectResult"/> object that redirects (<see cref="StatusCodes.Status302Found"/>)
+        /// to the specified <paramref name="url"/>.
+        /// </summary>
+        /// <param name="url">The URL to redirect to.</param>
+        /// <returns>The created <see cref="RedirectResult"/> for the response.</returns>
+        protected internal RedirectResult Redirect(string url)
+        {
+            if (string.IsNullOrEmpty(url))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(url));
+            }
+
+            return new RedirectResult(url);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="RedirectResult"/> object with <see cref="RedirectResult.Permanent"/> set to true
+        /// (<see cref="StatusCodes.Status301MovedPermanently"/>) using the specified <paramref name="url"/>.
+        /// </summary>
+        /// <param name="url">The URL to redirect to.</param>
+        /// <returns>The created <see cref="RedirectResult"/> for the response.</returns>
+        public virtual RedirectResult RedirectPermanent(string url)
+        {
+            if (string.IsNullOrEmpty(url))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(url));
+            }
+
+            return new RedirectResult(url, permanent: true);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="RedirectResult"/> object with <see cref="RedirectResult.Permanent"/> set to false
+        /// and <see cref="RedirectResult.PreserveMethod"/> set to true (<see cref="StatusCodes.Status307TemporaryRedirect"/>) 
+        /// using the specified <paramref name="url"/>.
+        /// </summary>
+        /// <param name="url">The URL to redirect to.</param>
+        /// <returns>The created <see cref="RedirectResult"/> for the response.</returns>
+        public virtual RedirectResult RedirectPreserveMethod(string url)
+        {
+            if (string.IsNullOrEmpty(url))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(url));
+            }
+
+            return new RedirectResult(url: url, permanent: false, preserveMethod: true);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="RedirectResult"/> object with <see cref="RedirectResult.Permanent"/> set to true
+        /// and <see cref="RedirectResult.PreserveMethod"/> set to true (<see cref="StatusCodes.Status308PermanentRedirect"/>) 
+        /// using the specified <paramref name="url"/>.
+        /// </summary>
+        /// <param name="url">The URL to redirect to.</param>
+        /// <returns>The created <see cref="RedirectResult"/> for the response.</returns>
+        public virtual RedirectResult RedirectPermanentPreserveMethod(string url)
+        {
+            if (string.IsNullOrEmpty(url))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(url));
+            }
+
+            return new RedirectResult(url: url, permanent: true, preserveMethod: true);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified action using the <paramref name="actionName"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToAction(string actionName)
+            => RedirectToAction(actionName, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified action using the 
+        /// <paramref name="actionName"/> and <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToAction(string actionName, object routeValues)
+            => RedirectToAction(actionName, controllerName: null, routeValues: routeValues);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified action using the 
+        /// <paramref name="actionName"/> and the <paramref name="controllerName"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the pageModel.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToAction(string actionName, string controllerName)
+            => RedirectToAction(actionName, controllerName, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified action using the specified
+        /// <paramref name="actionName"/>, <paramref name="controllerName"/>, and <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the pageModel.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToAction(
+            string actionName,
+            string controllerName,
+            object routeValues)
+            => RedirectToAction(actionName, controllerName, routeValues, fragment: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified action using the specified
+        /// <paramref name="actionName"/>, <paramref name="controllerName"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the pageModel.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToAction(
+            string actionName,
+            string controllerName,
+            string fragment)
+            => RedirectToAction(actionName, controllerName, routeValues: null, fragment: fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified action using the specified <paramref name="actionName"/>,
+        /// <paramref name="controllerName"/>, <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the pageModel.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToAction(
+            string actionName,
+            string controllerName,
+            object routeValues,
+            string fragment)
+        {
+            return new RedirectToActionResult(actionName, controllerName, routeValues, fragment)
+            {
+                UrlHelper = Url,
+            };
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status307TemporaryRedirect"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to false and <see cref="RedirectToActionResult.PreserveMethod"/> 
+        /// set to true, using the specified <paramref name="actionName"/>, <paramref name="controllerName"/>, 
+        /// <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the pageModel.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>       
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToActionPreserveMethod(
+            string actionName = null,
+            string controllerName = null,
+            object routeValues = null,
+            string fragment = null)
+        {
+            return new RedirectToActionResult(
+                actionName: actionName,
+                controllerName: controllerName,
+                routeValues: routeValues,
+                permanent: false,
+                preserveMethod: true,
+                fragment: fragment)
+            {
+                UrlHelper = Url,
+            };
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to true using the specified <paramref name="actionName"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToActionPermanent(string actionName)
+            => RedirectToActionPermanent(actionName, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to true using the specified <paramref name="actionName"/> 
+        /// and <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToActionPermanent(string actionName, object routeValues)
+            => RedirectToActionPermanent(actionName, controllerName: null, routeValues: routeValues);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to true using the specified <paramref name="actionName"/> 
+        /// and <paramref name="controllerName"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the pageModel.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToActionPermanent(string actionName, string controllerName)
+            => RedirectToActionPermanent(actionName, controllerName, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to true using the specified <paramref name="actionName"/>,
+        /// <paramref name="controllerName"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the pageModel.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToActionPermanent(
+            string actionName,
+            string controllerName,
+            string fragment)
+            => RedirectToActionPermanent(actionName, controllerName, routeValues: null, fragment: fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to true using the specified <paramref name="actionName"/>,
+        /// <paramref name="controllerName"/>, and <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the pageModel.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToActionPermanent(
+            string actionName,
+            string controllerName,
+            object routeValues)
+            => RedirectToActionPermanent(actionName, controllerName, routeValues, fragment: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to true using the specified <paramref name="actionName"/>,
+        /// <paramref name="controllerName"/>, <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the pageModel.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>
+        public virtual RedirectToActionResult RedirectToActionPermanent(
+            string actionName,
+            string controllerName,
+            object routeValues,
+            string fragment)
+        {
+            return new RedirectToActionResult(
+                actionName,
+                controllerName,
+                routeValues,
+                permanent: true,
+                fragment: fragment)
+            {
+                UrlHelper = Url,
+            };
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status308PermanentRedirect"/>) to the specified action with 
+        /// <see cref="RedirectToActionResult.Permanent"/> set to true and <see cref="RedirectToActionResult.PreserveMethod"/>
+        /// set to true, using the specified <paramref name="actionName"/>, <paramref name="controllerName"/>, 
+        /// <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the pageModel.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToActionResult"/> for the response.</returns>        
+        public virtual RedirectToActionResult RedirectToActionPermanentPreserveMethod(
+            string actionName = null,
+            string controllerName = null,
+            object routeValues = null,
+            string fragment = null)
+        {
+            return new RedirectToActionResult(
+                actionName: actionName,
+                controllerName: controllerName,
+                routeValues: routeValues,
+                permanent: true,
+                preserveMethod: true,
+                fragment: fragment)
+            {
+                UrlHelper = Url,
+            };
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified route using the specified <paramref name="routeName"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        public virtual RedirectToRouteResult RedirectToRoute(string routeName)
+            => RedirectToRoute(routeName, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified route using the specified <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        public virtual RedirectToRouteResult RedirectToRoute(object routeValues)
+            => RedirectToRoute(routeName: null, routeValues: routeValues);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified route using the specified
+        /// <paramref name="routeName"/> and <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        public virtual RedirectToRouteResult RedirectToRoute(string routeName, object routeValues)
+            => RedirectToRoute(routeName, routeValues, fragment: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified route using the specified
+        /// <paramref name="routeName"/> and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        public virtual RedirectToRouteResult RedirectToRoute(string routeName, string fragment)
+            => RedirectToRoute(routeName, routeValues: null, fragment: fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified route using the specified
+        /// <paramref name="routeName"/>, <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        public virtual RedirectToRouteResult RedirectToRoute(
+            string routeName,
+            object routeValues,
+            string fragment)
+        {
+            return new RedirectToRouteResult(routeName, routeValues, fragment)
+            {
+                UrlHelper = Url,
+            };
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status307TemporaryRedirect"/>) to the specified route with 
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to false and <see cref="RedirectToRouteResult.PreserveMethod"/>
+        /// set to true, using the specified <paramref name="routeName"/>, <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>       
+        public virtual RedirectToRouteResult RedirectToRoutePreserveMethod(
+            string routeName = null,
+            object routeValues = null,
+            string fragment = null)
+        {
+            return new RedirectToRouteResult(
+                routeName: routeName,
+                routeValues: routeValues,
+                permanent: false,
+                preserveMethod: true,
+                fragment: fragment)
+            {
+                UrlHelper = Url,
+            };
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified route with 
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to true using the specified <paramref name="routeName"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        public virtual RedirectToRouteResult RedirectToRoutePermanent(string routeName)
+            => RedirectToRoutePermanent(routeName, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified route with 
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to true using the specified <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        public virtual RedirectToRouteResult RedirectToRoutePermanent(object routeValues)
+            => RedirectToRoutePermanent(routeName: null, routeValues: routeValues);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified route with
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to true using the specified <paramref name="routeName"/>
+        /// and <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        public virtual RedirectToRouteResult RedirectToRoutePermanent(string routeName, object routeValues)
+            => RedirectToRoutePermanent(routeName, routeValues, fragment: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified route with 
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to true using the specified <paramref name="routeName"/>
+        /// and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        public virtual RedirectToRouteResult RedirectToRoutePermanent(string routeName, string fragment)
+            => RedirectToRoutePermanent(routeName, routeValues: null, fragment: fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified route with
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to true using the specified <paramref name="routeName"/>,
+        /// <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>
+        public virtual RedirectToRouteResult RedirectToRoutePermanent(
+            string routeName,
+            object routeValues,
+            string fragment)
+        {
+            return new RedirectToRouteResult(routeName, routeValues, permanent: true, fragment: fragment)
+            {
+                UrlHelper = Url,
+            };
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status308PermanentRedirect"/>) to the specified route with
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to true and <see cref="RedirectToRouteResult.PreserveMethod"/>
+        /// set to true, using the specified <paramref name="routeName"/>, <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>       
+        public virtual RedirectToRouteResult RedirectToRoutePermanentPreserveMethod(
+            string routeName = null,
+            object routeValues = null,
+            string fragment = null)
+        {
+            return new RedirectToRouteResult(
+                routeName: routeName,
+                routeValues: routeValues,
+                permanent: true,
+                preserveMethod: true,
+                fragment: fragment)
+            {
+                UrlHelper = Url,
+            };
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the current page.
+        /// </summary>
+        /// <returns>The <see cref="RedirectToPageResult"/>.</returns>
+        public virtual RedirectToPageResult RedirectToPage()
+            => RedirectToPage(pageName: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the current page with the specified <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/>.</returns>
+        public virtual RedirectToPageResult RedirectToPage(object routeValues)
+            => RedirectToPage(pageName: null, routeValues: routeValues);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified <paramref name="pageName"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/>.</returns>
+        public virtual RedirectToPageResult RedirectToPage(string pageName)
+            => RedirectToPage(pageName, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="pageHandler"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/>.</returns>
+        public virtual RedirectToPageResult RedirectToPage(string pageName, string pageHandler)
+            => RedirectToPage(pageName, pageHandler, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="pageHandler"/> and <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/>.</returns>
+        public virtual RedirectToPageResult RedirectToPage(string pageName, string pageHandler, object routeValues)
+            => RedirectToPage(pageName, pageHandler, routeValues, fragment: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/>.</returns>
+        public virtual RedirectToPageResult RedirectToPage(string pageName, object routeValues)
+            => RedirectToPage(pageName, pageHandler: null, routeValues: routeValues, fragment: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/>.</returns>
+        public virtual RedirectToPageResult RedirectToPage(string pageName, string pageHandler, string fragment)
+            => RedirectToPage(pageName, pageHandler, routeValues: null, fragment: fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status302Found"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="routeValues"/> and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/>.</returns>
+        public virtual RedirectToPageResult RedirectToPage(string pageName, string pageHandler, object routeValues, string fragment)
+            => new RedirectToPageResult(pageName, pageHandler, routeValues, fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified <paramref name="pageName"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/> with <see cref="RedirectToPageResult.Permanent"/> set.</returns>
+        public virtual RedirectToPageResult RedirectToPagePermanent(string pageName)
+            => RedirectToPagePermanent(pageName, pageHandler: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/> with <see cref="RedirectToPageResult.Permanent"/> set.</returns>
+        public virtual RedirectToPageResult RedirectToPagePermanent(string pageName, object routeValues)
+            => RedirectToPagePermanent(pageName, pageHandler: null, routeValues: routeValues, fragment: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified <paramref name="pageName"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/> with <see cref="RedirectToPageResult.Permanent"/> set.</returns>
+        public virtual RedirectToPageResult RedirectToPagePermanent(string pageName, string pageHandler)
+            => RedirectToPagePermanent(pageName, pageHandler, routeValues: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="routeValues"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/> with <see cref="RedirectToPageResult.Permanent"/> set.</returns>
+        public virtual RedirectToPageResult RedirectToPagePermanent(string pageName, string pageHandler, object routeValues)
+            => RedirectToPagePermanent(pageName, pageHandler, routeValues, fragment: null);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/> with <see cref="RedirectToPageResult.Permanent"/> set.</returns>
+        public virtual RedirectToPageResult RedirectToPagePermanent(string pageName, string pageHandler, string fragment)
+            => RedirectToPagePermanent(pageName, pageHandler, routeValues: null, fragment: fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/> with <see cref="RedirectToPageResult.Permanent"/> set.</returns>
+        public virtual RedirectToPageResult RedirectToPagePermanent(string pageName, object routeValues, string fragment)
+            => RedirectToPagePermanent(pageName, pageHandler: null, routeValues: routeValues, fragment: fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status301MovedPermanently"/>) to the specified <paramref name="pageName"/>
+        /// using the specified <paramref name="routeValues"/> and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The parameters for a route.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The <see cref="RedirectToPageResult"/> with <see cref="RedirectToPageResult.Permanent"/> set.</returns>
+        public virtual RedirectToPageResult RedirectToPagePermanent(string pageName, string pageHandler, object routeValues, string fragment)
+            => new RedirectToPageResult(pageName, pageHandler, routeValues, permanent: true, fragment: fragment);
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status307TemporaryRedirect"/>) to the specified page with 
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to false and <see cref="RedirectToRouteResult.PreserveMethod"/>
+        /// set to true, using the specified <paramref name="pageName"/>, <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns> 
+        public virtual RedirectToPageResult RedirectToPagePreserveMethod(
+            string pageName = null,
+            string pageHandler = null,
+            object routeValues = null,
+            string fragment = null)
+        {
+            return new RedirectToPageResult(
+                pageName: pageName,
+                pageHandler: pageHandler,
+                routeValues: routeValues,
+                permanent: false,
+                preserveMethod: true,
+                fragment: fragment);
+        }
+
+        /// <summary>
+        /// Redirects (<see cref="StatusCodes.Status308PermanentRedirect"/>) to the specified route with
+        /// <see cref="RedirectToRouteResult.Permanent"/> set to true and <see cref="RedirectToRouteResult.PreserveMethod"/>
+        /// set to true, using the specified <paramref name="pageName"/>, <paramref name="routeValues"/>, and <paramref name="fragment"/>.
+        /// </summary>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to redirect to.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="fragment">The fragment to add to the URL.</param>
+        /// <returns>The created <see cref="RedirectToRouteResult"/> for the response.</returns>  
+        public virtual RedirectToPageResult RedirectToPagePermanentPreserveMethod(
+            string pageName = null,
+            string pageHandler = null,
+            object routeValues = null,
+            string fragment = null)
+        {
+            return new RedirectToPageResult(
+                pageName: pageName,
+                pageHandler: pageHandler,
+                routeValues: routeValues,
+                permanent: true,
+                preserveMethod: true,
+                fragment: fragment);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="SignInResult"/> with the specified authentication scheme.
+        /// </summary>
+        /// <param name="principal">The <see cref="ClaimsPrincipal"/> containing the user claims.</param>
+        /// <param name="authenticationScheme">The authentication scheme to use for the sign-in operation.</param>
+        /// <returns>The created <see cref="SignInResult"/> for the response.</returns>
+        public virtual SignInResult SignIn(ClaimsPrincipal principal, string authenticationScheme)
+            => new SignInResult(authenticationScheme, principal);
+
+        /// <summary>
+        /// Creates a <see cref="SignInResult"/> with the specified authentication scheme and
+        /// <paramref name="properties" />.
+        /// </summary>
+        /// <param name="principal">The <see cref="ClaimsPrincipal"/> containing the user claims.</param>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the sign-in operation.</param>
+        /// <param name="authenticationScheme">The authentication scheme to use for the sign-in operation.</param>
+        /// <returns>The created <see cref="SignInResult"/> for the response.</returns>
+        public virtual SignInResult SignIn(
+            ClaimsPrincipal principal,
+            AuthenticationProperties properties,
+            string authenticationScheme)
+            => new SignInResult(authenticationScheme, principal, properties);
+
+        /// <summary>
+        /// Creates a <see cref="SignOutResult"/> with the specified authentication schemes.
+        /// </summary>
+        /// <param name="authenticationSchemes">The authentication schemes to use for the sign-out operation.</param>
+        /// <returns>The created <see cref="SignOutResult"/> for the response.</returns>
+        public virtual SignOutResult SignOut(params string[] authenticationSchemes)
+            => new SignOutResult(authenticationSchemes);
+
+        /// <summary>
+        /// Creates a <see cref="SignOutResult"/> with the specified authentication schemes and
+        /// <paramref name="properties" />.
+        /// </summary>
+        /// <param name="properties"><see cref="AuthenticationProperties"/> used to perform the sign-out operation.</param>
+        /// <param name="authenticationSchemes">The authentication scheme to use for the sign-out operation.</param>
+        /// <returns>The created <see cref="SignOutResult"/> for the response.</returns>
+        public virtual SignOutResult SignOut(AuthenticationProperties properties, params string[] authenticationSchemes)
+            => new SignOutResult(authenticationSchemes, properties);
+
+        /// <summary>
+        /// Creates a <see cref="StatusCodeResult"/> object by specifying a <paramref name="statusCode"/>.
+        /// </summary>
+        /// <param name="statusCode">The status code to set on the response.</param>
+        /// <returns>The created <see cref="StatusCodeResult"/> object for the response.</returns>
+        public virtual StatusCodeResult StatusCode(int statusCode)
+            => new StatusCodeResult(statusCode);
+
+        /// <summary>
+        /// Creates a <see cref="ObjectResult"/> object by specifying a <paramref name="statusCode"/> and <paramref name="value"/>
+        /// </summary>
+        /// <param name="statusCode">The status code to set on the response.</param>
+        /// <param name="value">The value to set on the <see cref="ObjectResult"/>.</param>
+        /// <returns>The created <see cref="ObjectResult"/> object for the response.</returns>
+        public virtual ObjectResult StatusCode(int statusCode, object value)
+        {
+            return new ObjectResult(value)
+            {
+                StatusCode = statusCode
+            };
+        }
+
+        /// <summary>
+        /// Creates an <see cref="UnauthorizedResult"/> that produces an <see cref="StatusCodes.Status401Unauthorized"/> response.
+        /// </summary>
+        /// <returns>The created <see cref="UnauthorizedResult"/> for the response.</returns>
+        public virtual UnauthorizedResult Unauthorized()
+            => new UnauthorizedResult();
+
+        /// <summary>
+        /// Validates the specified <paramref name="model"/> instance.
+        /// </summary>
+        /// <param name="model">The model to validate.</param>
+        /// <returns><c>true</c> if the <see cref="ModelState"/> is valid; <c>false</c> otherwise.</returns>
+        public virtual bool TryValidateModel(
+            object model)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            return TryValidateModel(model, name: null);
+        }
+
+        /// <summary>
+        /// Validates the specified <paramref name="model"/> instance.
+        /// </summary>
+        /// <param name="model">The model to validate.</param>
+        /// <param name="name">The key to use when looking up information in <see cref="ModelState"/>.
+        /// </param>
+        /// <returns><c>true</c> if the <see cref="ModelState"/> is valid;<c>false</c> otherwise.</returns>
+        public virtual bool TryValidateModel(
+            object model,
+            string name)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            ObjectValidator.Validate(
+                PageContext,
+                validationState: null,
+                prefix: name ?? string.Empty,
+                model: model);
+            return ModelState.IsValid;
+        }
+
+#region IAsyncPageFilter \ IPageFilter
+        /// <summary>
+        /// Called after a handler method has been selected, but before model binding occurs.
+        /// </summary>
+        /// <param name="context">The <see cref="PageHandlerSelectedContext"/>.</param>
+        public virtual void OnPageHandlerSelected(PageHandlerSelectedContext context)
+        {
+        }
+
+        /// <summary>
+        /// Called before the handler method executes, after model binding is complete.
+        /// </summary>
+        /// <param name="context">The <see cref="PageHandlerExecutingContext"/>.</param>
+        public virtual void OnPageHandlerExecuting(PageHandlerExecutingContext context)
+        {
+        }
+
+        /// <summary>
+        /// Called after the handler method executes, before the action result executes.
+        /// </summary>
+        /// <param name="context">The <see cref="PageHandlerExecutedContext"/>.</param>
+        public virtual void OnPageHandlerExecuted(PageHandlerExecutedContext context)
+        {
+        }
+
+        /// <summary>
+        /// Called asynchronously after the handler method has been selected, but before model binding occurs.
+        /// </summary>
+        /// <param name="context">The <see cref="PageHandlerSelectedContext"/>.</param>
+        /// <returns>A <see cref="Task"/> that on completion indicates the filter has executed.</returns>
+        public virtual Task OnPageHandlerSelectionAsync(PageHandlerSelectedContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            OnPageHandlerSelected(context);
+            return Task.CompletedTask;
+        }
+
+        /// <summary>
+        /// Called asynchronously before the handler method is invoked, after model binding is complete.
+        /// </summary>
+        /// <param name="context">The <see cref="PageHandlerExecutingContext"/>.</param>
+        /// <param name="next">
+        /// The <see cref="PageHandlerExecutionDelegate"/>. Invoked to execute the next page filter or the handler method itself.
+        /// </param>
+        /// <returns>A <see cref="Task"/> that on completion indicates the filter has executed.</returns>
+        public virtual async Task OnPageHandlerExecutionAsync(PageHandlerExecutingContext context, PageHandlerExecutionDelegate next)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (next == null)
+            {
+                throw new ArgumentNullException(nameof(next));
+            }
+
+            OnPageHandlerExecuting(context);
+            if (context.Result == null)
+            {
+                OnPageHandlerExecuted(await next());
+            }
+        }
+#endregion
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageResult.cs
new file mode 100644
index 0000000000..1f533b93fc
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageResult.cs
@@ -0,0 +1,57 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    /// <summary>
+    /// An <see cref="ActionResult"/> that renders a Razor Page.
+    /// </summary>
+    public class PageResult : ActionResult
+    {
+        /// <summary>
+        /// Gets or sets the Content-Type header for the response.
+        /// </summary>
+        public string ContentType { get; set; }
+
+        /// <summary>
+        /// Gets the page model.
+        /// </summary>
+        public object Model => ViewData?.Model;
+
+        /// <summary>
+        /// Gets or sets the <see cref="PageBase"/> to be executed.
+        /// </summary>
+        public PageBase Page { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ViewDataDictionary"/> for the page to be executed.
+        /// </summary>
+        public ViewDataDictionary ViewData { get; set; }
+
+        /// <summary>
+        /// Gets or sets the HTTP status code.
+        /// </summary>
+        public int? StatusCode { get; set; }
+
+        /// <inheritdoc />
+        public override Task ExecuteResultAsync(ActionContext context)
+        {
+            if (!(context is PageContext pageContext))
+            {
+                throw new ArgumentException(Resources.FormatPageViewResult_ContextIsInvalid(
+                    nameof(context),
+                    nameof(Page),
+                    nameof(PageResult)));
+            }
+
+            var executor = context.HttpContext.RequestServices.GetRequiredService<PageResultExecutor>();
+            return executor.ExecuteAsync(pageContext, this);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..458502d802
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/AssemblyInfo.cs
@@ -0,0 +1,7 @@
+// 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.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..eec543945b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/Resources.Designer.cs
@@ -0,0 +1,198 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class Resources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.RazorPages.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// The '{0}' property of '{1}' must not be null.
+        /// </summary>
+        internal static string PropertyOfTypeCannotBeNull
+        {
+            get => GetString("PropertyOfTypeCannotBeNull");
+        }
+
+        /// <summary>
+        /// The '{0}' property of '{1}' must not be null.
+        /// </summary>
+        internal static string FormatPropertyOfTypeCannotBeNull(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("PropertyOfTypeCannotBeNull"), p0, p1);
+
+        /// <summary>
+        /// Page created by '{0}' must be an instance of '{1}'.
+        /// </summary>
+        internal static string ActivatedInstance_MustBeAnInstanceOf
+        {
+            get => GetString("ActivatedInstance_MustBeAnInstanceOf");
+        }
+
+        /// <summary>
+        /// Page created by '{0}' must be an instance of '{1}'.
+        /// </summary>
+        internal static string FormatActivatedInstance_MustBeAnInstanceOf(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ActivatedInstance_MustBeAnInstanceOf"), p0, p1);
+
+        /// <summary>
+        /// The context used to execute '{0}' must be an instance of '{1}'. Returning a '{2}' from a controller is a not supported.
+        /// </summary>
+        internal static string PageViewResult_ContextIsInvalid
+        {
+            get => GetString("PageViewResult_ContextIsInvalid");
+        }
+
+        /// <summary>
+        /// The context used to execute '{0}' must be an instance of '{1}'. Returning a '{2}' from a controller is a not supported.
+        /// </summary>
+        internal static string FormatPageViewResult_ContextIsInvalid(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("PageViewResult_ContextIsInvalid"), p0, p1, p2);
+
+        /// <summary>
+        /// Value cannot be null or empty.
+        /// </summary>
+        internal static string ArgumentCannotBeNullOrEmpty
+        {
+            get => GetString("ArgumentCannotBeNullOrEmpty");
+        }
+
+        /// <summary>
+        /// Value cannot be null or empty.
+        /// </summary>
+        internal static string FormatArgumentCannotBeNullOrEmpty()
+            => GetString("ArgumentCannotBeNullOrEmpty");
+
+        /// <summary>
+        /// Unsupported handler method return type '{0}'.
+        /// </summary>
+        internal static string UnsupportedHandlerMethodType
+        {
+            get => GetString("UnsupportedHandlerMethodType");
+        }
+
+        /// <summary>
+        /// Unsupported handler method return type '{0}'.
+        /// </summary>
+        internal static string FormatUnsupportedHandlerMethodType(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("UnsupportedHandlerMethodType"), p0);
+
+        /// <summary>
+        /// Multiple handlers matched. The following handlers matched route data and had all constraints satisfied:{0}{0}{1}
+        /// </summary>
+        internal static string AmbiguousHandler
+        {
+            get => GetString("AmbiguousHandler");
+        }
+
+        /// <summary>
+        /// Multiple handlers matched. The following handlers matched route data and had all constraints satisfied:{0}{0}{1}
+        /// </summary>
+        internal static string FormatAmbiguousHandler(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("AmbiguousHandler"), p0, p1);
+
+        /// <summary>
+        /// Path must be a root relative path that starts with a forward slash '/'.
+        /// </summary>
+        internal static string PathMustBeRootRelativePath
+        {
+            get => GetString("PathMustBeRootRelativePath");
+        }
+
+        /// <summary>
+        /// Path must be a root relative path that starts with a forward slash '/'.
+        /// </summary>
+        internal static string FormatPathMustBeRootRelativePath()
+            => GetString("PathMustBeRootRelativePath");
+
+        /// <summary>
+        /// If an {0} provides a result value by setting the {1} property of {2} to a non-null value, then it cannot call the next filter by invoking {3}.
+        /// </summary>
+        internal static string AsyncPageFilter_InvalidShortCircuit
+        {
+            get => GetString("AsyncPageFilter_InvalidShortCircuit");
+        }
+
+        /// <summary>
+        /// If an {0} provides a result value by setting the {1} property of {2} to a non-null value, then it cannot call the next filter by invoking {3}.
+        /// </summary>
+        internal static string FormatAsyncPageFilter_InvalidShortCircuit(object p0, object p1, object p2, object p3)
+            => string.Format(CultureInfo.CurrentCulture, GetString("AsyncPageFilter_InvalidShortCircuit"), p0, p1, p2, p3);
+
+        /// <summary>
+        /// The type '{0}' is not a valid page. A page must inherit from '{1}'.
+        /// </summary>
+        internal static string InvalidPageType_WrongBase
+        {
+            get => GetString("InvalidPageType_WrongBase");
+        }
+
+        /// <summary>
+        /// The type '{0}' is not a valid page. A page must inherit from '{1}'.
+        /// </summary>
+        internal static string FormatInvalidPageType_WrongBase(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("InvalidPageType_WrongBase"), p0, p1);
+
+        /// <summary>
+        /// The type '{0}' is not a valid page. A page must define a public, non-static '{1}' property.
+        /// </summary>
+        internal static string InvalidPageType_NoModelProperty
+        {
+            get => GetString("InvalidPageType_NoModelProperty");
+        }
+
+        /// <summary>
+        /// The type '{0}' is not a valid page. A page must define a public, non-static '{1}' property.
+        /// </summary>
+        internal static string FormatInvalidPageType_NoModelProperty(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("InvalidPageType_NoModelProperty"), p0, p1);
+
+        /// <summary>
+        /// '{0}' is not a valid page name. A page name is path relative to the Razor Pages root directory that starts with a leading forward slash ('/') and does not contain the file extension e.g "/Users/Edit".
+        /// </summary>
+        internal static string InvalidValidPageName
+        {
+            get => GetString("InvalidValidPageName");
+        }
+
+        /// <summary>
+        /// '{0}' is not a valid page name. A page name is path relative to the Razor Pages root directory that starts with a leading forward slash ('/') and does not contain the file extension e.g "/Users/Edit".
+        /// </summary>
+        internal static string FormatInvalidValidPageName(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("InvalidValidPageName"), p0);
+
+        /// <summary>
+        /// The model type for '{0}' is of type '{1}' which is not assignable to its declared model type '{2}'.
+        /// </summary>
+        internal static string InvalidActionDescriptorModelType
+        {
+            get => GetString("InvalidActionDescriptorModelType");
+        }
+
+        /// <summary>
+        /// The model type for '{0}' is of type '{1}' which is not assignable to its declared model type '{2}'.
+        /// </summary>
+        internal static string FormatInvalidActionDescriptorModelType(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("InvalidActionDescriptorModelType"), p0, p1, p2);
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/RazorPagesOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/RazorPagesOptions.cs
new file mode 100644
index 0000000000..b3b0b15e11
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/RazorPagesOptions.cs
@@ -0,0 +1,144 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    /// <summary>
+    /// Provides configuration for RazorPages.
+    /// </summary>
+    public class RazorPagesOptions : IEnumerable<ICompatibilitySwitch>
+    {
+        private readonly CompatibilitySwitch<bool> _allowAreas;
+        private readonly CompatibilitySwitch<bool> _allowMappingHeadRequestsToGetHandler;
+        private readonly ICompatibilitySwitch[] _switches;
+
+        private string _root = "/Pages";
+
+        public RazorPagesOptions()
+        {
+            _allowAreas = new CompatibilitySwitch<bool>(nameof(AllowAreas));
+            _allowMappingHeadRequestsToGetHandler = new CompatibilitySwitch<bool>(nameof(AllowMappingHeadRequestsToGetHandler));
+
+            _switches = new ICompatibilitySwitch[]
+            {
+                _allowAreas,
+                _allowMappingHeadRequestsToGetHandler,
+            };
+        }
+
+        /// <summary>
+        /// Gets a collection of <see cref="IPageConvention"/> instances that are applied during
+        /// route and page model construction.
+        /// </summary>
+        public PageConventionCollection Conventions { get; } = new PageConventionCollection();
+
+        /// <summary>
+        /// Application relative path used as the root of discovery for Razor Page files.
+        /// Defaults to the <c>/Pages</c> directory under application root.
+        /// </summary>
+        public string RootDirectory
+        {
+            get => _root;
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                {
+                    throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(value));
+                }
+
+                if (value[0] != '/')
+                {
+                    throw new ArgumentException(Resources.PathMustBeRootRelativePath, nameof(value));
+                }
+
+                _root = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value that determines if areas are enabled for Razor Pages.
+        /// Defaults to <c>false</c>.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// When enabled, any Razor Page under the directory structure <c>/Area/AreaName/Pages/</c>
+        /// will be associated with an area with the name <c>AreaName</c>.
+        /// </para>
+        /// <para>
+        /// This property is associated with a compatibility switch and can provide a different behavior depending on 
+        /// the configured compatibility version for the application. See <see cref="CompatibilityVersion"/> for 
+        /// guidance and examples of setting the application's compatibility version.
+        /// </para>
+        /// <para>
+        /// Configuring the desired of the value compatibility switch by calling this property's setter will take precedence
+        /// over the value implied by the application's <see cref="CompatibilityVersion"/>.
+        /// </para>
+        /// <para>
+        /// If the application's compatibility version is set to <see cref="CompatibilityVersion.Version_2_0"/> then
+        /// this setting will have value <c>false</c> unless explicitly configured.
+        /// </para>
+        /// <para>
+        /// If the application's compatibility version is set to <see cref="CompatibilityVersion.Version_2_1"/> or
+        /// higher then this setting will have value <c>true</c> unless explicitly configured.
+        /// </para>
+        /// </remarks>
+        public bool AllowAreas
+        {
+            get => _allowAreas.Value;
+            set => _allowAreas.Value = value;
+        }
+
+        /// <summary>
+        /// Gets or sets a value that determines if HTTP method matching for Razor Pages handler methods will use
+        /// fuzzy matching.
+        /// Defaults to <c>false</c>.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// When enabled, Razor Pages handler methods will be more flexible in which HTTP methods will be accepted
+        /// by GET and POST handler methods. This allows a GET handler methods to accept the HEAD HTTP methods in 
+        /// addition to GET. A more specific handler method can still be defined to accept HEAD, and the most 
+        /// specific handler will be invoked.
+        /// </para>
+        /// <para>
+        /// This setting reduces the number of handler methods that must be written to correctly respond to typical
+        /// web traffic including requests from internet infrastructure such as web crawlers.
+        /// </para>
+        /// <para>
+        /// This property is associated with a compatibility switch and can provide a different behavior depending on 
+        /// the configured compatibility version for the application. See <see cref="CompatibilityVersion"/> for 
+        /// guidance and examples of setting the application's compatibility version.
+        /// </para>
+        /// <para>
+        /// Configuring the desired of the value compatibility switch by calling this property's setter will take precedence
+        /// over the value implied by the application's <see cref="CompatibilityVersion"/>.
+        /// </para>
+        /// <para>
+        /// If the application's compatibility version is set to <see cref="CompatibilityVersion.Version_2_0"/> then
+        /// this setting will have value <c>false</c> unless explicitly configured.
+        /// </para>
+        /// <para>
+        /// If the application's compatibility version is set to <see cref="CompatibilityVersion.Version_2_1"/> or
+        /// higher then this setting will have value <c>true</c> unless explicitly configured.
+        /// </para>
+        /// </remarks>
+        public bool AllowMappingHeadRequestsToGetHandler
+        {
+            get => _allowMappingHeadRequestsToGetHandler.Value;
+            set => _allowMappingHeadRequestsToGetHandler.Value = value;
+        }
+
+        IEnumerator<ICompatibilitySwitch> IEnumerable<ICompatibilitySwitch>.GetEnumerator()
+        {
+            return ((IEnumerable<ICompatibilitySwitch>)_switches).GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() => _switches.GetEnumerator();
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/RazorPagesOptionsConfigureCompatibilityOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/RazorPagesOptionsConfigureCompatibilityOptions.cs
new file mode 100644
index 0000000000..8f5d21d8bc
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/RazorPagesOptionsConfigureCompatibilityOptions.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    internal class RazorPagesOptionsConfigureCompatibilityOptions : ConfigureCompatibilityOptions<RazorPagesOptions>
+    {
+        public RazorPagesOptionsConfigureCompatibilityOptions(
+            ILoggerFactory loggerFactory,
+            IOptions<MvcCompatibilityOptions> compatibilityOptions) 
+            : base(loggerFactory, compatibilityOptions)
+        {
+        }
+
+        protected override IReadOnlyDictionary<string, object> DefaultValues
+        {
+            get
+            {
+                var values = new Dictionary<string, object>();
+
+                if (Version >= CompatibilityVersion.Version_2_1)
+                {
+                    values[nameof(RazorPagesOptions.AllowAreas)] = true;
+                    values[nameof(RazorPagesOptions.AllowMappingHeadRequestsToGetHandler)] = true;
+                }
+
+                return values;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Resources.resx
new file mode 100644
index 0000000000..2d9e11cd41
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Resources.resx
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="PropertyOfTypeCannotBeNull" xml:space="preserve">
+    <value>The '{0}' property of '{1}' must not be null.</value>
+  </data>
+  <data name="ActivatedInstance_MustBeAnInstanceOf" xml:space="preserve">
+    <value>Page created by '{0}' must be an instance of '{1}'.</value>
+  </data>
+  <data name="PageViewResult_ContextIsInvalid" xml:space="preserve">
+    <value>The context used to execute '{0}' must be an instance of '{1}'. Returning a '{2}' from a controller is a not supported.</value>
+  </data>
+  <data name="ArgumentCannotBeNullOrEmpty" xml:space="preserve">
+    <value>Value cannot be null or empty.</value>
+  </data>
+  <data name="UnsupportedHandlerMethodType" xml:space="preserve">
+    <value>Unsupported handler method return type '{0}'.</value>
+  </data>
+  <data name="AmbiguousHandler" xml:space="preserve">
+    <value>Multiple handlers matched. The following handlers matched route data and had all constraints satisfied:{0}{0}{1}</value>
+  </data>
+  <data name="PathMustBeRootRelativePath" xml:space="preserve">
+    <value>Path must be a root relative path that starts with a forward slash '/'.</value>
+  </data>
+  <data name="AsyncPageFilter_InvalidShortCircuit" xml:space="preserve">
+    <value>If an {0} provides a result value by setting the {1} property of {2} to a non-null value, then it cannot call the next filter by invoking {3}.</value>
+  </data>
+  <data name="InvalidPageType_WrongBase" xml:space="preserve">
+    <value>The type '{0}' is not a valid page. A page must inherit from '{1}'.</value>
+  </data>
+  <data name="InvalidPageType_NoModelProperty" xml:space="preserve">
+    <value>The type '{0}' is not a valid page. A page must define a public, non-static '{1}' property.</value>
+  </data>
+  <data name="InvalidValidPageName" xml:space="preserve">
+    <value>'{0}' is not a valid page name. A page name is path relative to the Razor Pages root directory that starts with a leading forward slash ('/') and does not contain the file extension e.g "/Users/Edit".</value>
+  </data>
+  <data name="InvalidActionDescriptorModelType" xml:space="preserve">
+    <value>The model type for '{0}' is of type '{1}' which is not assignable to its declared model type '{2}'.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/baseline.netcore.json
new file mode 100644
index 0000000000..7a48f0e5f8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/baseline.netcore.json
@@ -0,0 +1,7982 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc.RazorPages, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.IAsyncPageFilter",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "OnPageHandlerSelectionAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.PageHandlerSelectedContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnPageHandlerExecutionAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutingContext"
+            },
+            {
+              "Name": "next",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutionDelegate"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.IPageFilter",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "OnPageHandlerSelected",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.PageHandlerSelectedContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnPageHandlerExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnPageHandlerExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutedContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutedContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Filters.FilterContext",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionDescriptor",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Canceled",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Canceled",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HandlerInstance",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HandlerMethod",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Exception",
+          "Parameters": [],
+          "ReturnType": "System.Exception",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Exception",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Exception"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ExceptionDispatchInfo",
+          "Parameters": [],
+          "ReturnType": "System.Runtime.ExceptionServices.ExceptionDispatchInfo",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ExceptionDispatchInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Runtime.ExceptionServices.ExceptionDispatchInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ExceptionHandled",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ExceptionHandled",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Result",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Result",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IActionResult"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "pageContext",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageContext"
+            },
+            {
+              "Name": "filters",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>"
+            },
+            {
+              "Name": "handlerMethod",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor"
+            },
+            {
+              "Name": "handlerInstance",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutingContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Filters.FilterContext",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionDescriptor",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Result",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Result",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IActionResult"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HandlerArguments",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HandlerMethod",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HandlerInstance",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "pageContext",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageContext"
+            },
+            {
+              "Name": "filters",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>"
+            },
+            {
+              "Name": "handlerMethod",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor"
+            },
+            {
+              "Name": "handlerArguments",
+              "Type": "System.Collections.Generic.IDictionary<System.String, System.Object>"
+            },
+            {
+              "Name": "handlerInstance",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutionDelegate",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "System.MulticastDelegate",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Invoke",
+          "Parameters": [],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutedContext>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginInvoke",
+          "Parameters": [
+            {
+              "Name": "callback",
+              "Type": "System.AsyncCallback"
+            },
+            {
+              "Name": "object",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.IAsyncResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndInvoke",
+          "Parameters": [
+            {
+              "Name": "result",
+              "Type": "System.IAsyncResult"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutedContext>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "object",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "method",
+              "Type": "System.IntPtr"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Filters.PageHandlerSelectedContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Filters.FilterContext",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionDescriptor",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HandlerMethod",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HandlerMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HandlerInstance",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "pageContext",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageContext"
+            },
+            {
+              "Name": "filters",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>"
+            },
+            {
+              "Name": "handlerInstance",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.RazorPages.PageActionDescriptor",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_HandlerMethods",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HandlerMethods",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HandlerTypeInfo",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.TypeInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HandlerTypeInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Reflection.TypeInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DeclaredModelTypeInfo",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.TypeInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DeclaredModelTypeInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Reflection.TypeInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelTypeInfo",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.TypeInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ModelTypeInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Reflection.TypeInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PageTypeInfo",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.TypeInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PageTypeInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Reflection.TypeInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionDescriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageActionDescriptor"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.IPageActivatorProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateActivator",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Func<Microsoft.AspNetCore.Mvc.RazorPages.PageContext, Microsoft.AspNetCore.Mvc.Rendering.ViewContext, System.Object>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateReleaser",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Action<Microsoft.AspNetCore.Mvc.RazorPages.PageContext, Microsoft.AspNetCore.Mvc.Rendering.ViewContext, System.Object>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.IPageFactoryProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreatePageFactory",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Func<Microsoft.AspNetCore.Mvc.RazorPages.PageContext, Microsoft.AspNetCore.Mvc.Rendering.ViewContext, System.Object>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreatePageDisposer",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Action<Microsoft.AspNetCore.Mvc.RazorPages.PageContext, Microsoft.AspNetCore.Mvc.Rendering.ViewContext, System.Object>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.IPageModelActivatorProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateActivator",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Func<Microsoft.AspNetCore.Mvc.RazorPages.PageContext, System.Object>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateReleaser",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Action<Microsoft.AspNetCore.Mvc.RazorPages.PageContext, System.Object>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.IPageModelFactoryProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateModelFactory",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Func<Microsoft.AspNetCore.Mvc.RazorPages.PageContext, System.Object>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateModelDisposer",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Action<Microsoft.AspNetCore.Mvc.RazorPages.PageContext, System.Object>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.NonHandlerAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.Page",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Mvc.RazorPages.PageBase",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.PageActionDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_RelativePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RelativePath",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewEnginePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewEnginePath",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AreaName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AreaName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageActionDescriptor"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.PageBase",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Mvc.Razor.RazorPageBase",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EnsureRenderedBodyOrSections",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PageContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RazorPages.PageContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PageContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HttpContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Http.HttpContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Request",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Http.HttpRequest",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Response",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Http.HttpResponse",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Routing.RouteData",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelState",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginContext",
+          "Parameters": [
+            {
+              "Name": "position",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "length",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "isLiteral",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndContext",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BadRequest",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.BadRequestResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BadRequest",
+          "Parameters": [
+            {
+              "Name": "error",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.BadRequestObjectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BadRequest",
+          "Parameters": [
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.BadRequestObjectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Challenge",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ChallengeResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Challenge",
+          "Parameters": [
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ChallengeResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Challenge",
+          "Parameters": [
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ChallengeResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Challenge",
+          "Parameters": [
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            },
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ChallengeResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Content",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Content",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Content",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentEncoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Content",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "Microsoft.Net.Http.Headers.MediaTypeHeaderValue"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Forbid",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ForbidResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Forbid",
+          "Parameters": [
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ForbidResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Forbid",
+          "Parameters": [
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ForbidResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Forbid",
+          "Parameters": [
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            },
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ForbidResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileContents",
+              "Type": "System.Byte[]"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileContents",
+              "Type": "System.Byte[]"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileStream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileStreamResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileStream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileStreamResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "virtualPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.VirtualFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "virtualPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.VirtualFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PhysicalFile",
+          "Parameters": [
+            {
+              "Name": "physicalPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.PhysicalFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PhysicalFile",
+          "Parameters": [
+            {
+              "Name": "physicalPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.PhysicalFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "LocalRedirect",
+          "Parameters": [
+            {
+              "Name": "localUrl",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.LocalRedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "LocalRedirectPermanent",
+          "Parameters": [
+            {
+              "Name": "localUrl",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.LocalRedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "LocalRedirectPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "localUrl",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.LocalRedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "LocalRedirectPermanentPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "localUrl",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.LocalRedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "NotFound",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.NotFoundResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "NotFound",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.NotFoundObjectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Page",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RazorPages.PageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Redirect",
+          "Parameters": [
+            {
+              "Name": "url",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectPermanent",
+          "Parameters": [
+            {
+              "Name": "url",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "url",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectPermanentPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "url",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPermanent",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPermanent",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPermanent",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPermanent",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPermanent",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPermanent",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPermanentPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoute",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoute",
+          "Parameters": [
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoute",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoute",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoute",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoutePreserveMethod",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoutePermanent",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoutePermanent",
+          "Parameters": [
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoutePermanent",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoutePermanent",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoutePermanent",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoutePermanentPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPage",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPage",
+          "Parameters": [
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPage",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPage",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPage",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPage",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPage",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePermanent",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePermanent",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePermanent",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePermanent",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePermanent",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePermanent",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePreserveMethod",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePermanentPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SignIn",
+          "Parameters": [
+            {
+              "Name": "principal",
+              "Type": "System.Security.Claims.ClaimsPrincipal"
+            },
+            {
+              "Name": "authenticationScheme",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.SignInResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SignIn",
+          "Parameters": [
+            {
+              "Name": "principal",
+              "Type": "System.Security.Claims.ClaimsPrincipal"
+            },
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            },
+            {
+              "Name": "authenticationScheme",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.SignInResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SignOut",
+          "Parameters": [
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.SignOutResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SignOut",
+          "Parameters": [
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            },
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.SignOutResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "StatusCode",
+          "Parameters": [
+            {
+              "Name": "statusCode",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.StatusCodeResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "StatusCode",
+          "Parameters": [
+            {
+              "Name": "statusCode",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ObjectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Unauthorized",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.UnauthorizedResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "valueProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "includeExpressions",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, System.Object>>[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "propertyFilter",
+              "Type": "System.Func<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata, System.Boolean>"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "valueProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+            },
+            {
+              "Name": "includeExpressions",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, System.Object>>[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "valueProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+            },
+            {
+              "Name": "propertyFilter",
+              "Type": "System.Func<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata, System.Boolean>"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            },
+            {
+              "Name": "valueProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+            },
+            {
+              "Name": "propertyFilter",
+              "Type": "System.Func<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata, System.Boolean>"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryValidateModel",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryValidateModel",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "prefix",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.PageContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionContext",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionDescriptor",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ActionDescriptor",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValueProviderFactories",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ValueProviderFactories",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewData",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewStartFactories",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.Func<Microsoft.AspNetCore.Mvc.Razor.IRazorPage>>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewStartFactories",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IList<System.Func<Microsoft.AspNetCore.Mvc.Razor.IRazorPage>>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.PageContextAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.PageModel",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IAsyncPageFilter",
+        "Microsoft.AspNetCore.Mvc.Filters.IPageFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_PageContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RazorPages.PageContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PageContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HttpContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Http.HttpContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Request",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Http.HttpRequest",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Response",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Http.HttpResponse",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Routing.RouteData",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelState",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_User",
+          "Parameters": [],
+          "ReturnType": "System.Security.Claims.ClaimsPrincipal",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TempData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TempData",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Url",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Url",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "valueProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "includeExpressions",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, System.Object>>[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "propertyFilter",
+              "Type": "System.Func<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata, System.Boolean>"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "valueProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+            },
+            {
+              "Name": "includeExpressions",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, System.Object>>[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "valueProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+            },
+            {
+              "Name": "propertyFilter",
+              "Type": "System.Func<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata, System.Boolean>"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "Class": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "valueProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider"
+            },
+            {
+              "Name": "propertyFilter",
+              "Type": "System.Func<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata, System.Boolean>"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BadRequest",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.BadRequestResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BadRequest",
+          "Parameters": [
+            {
+              "Name": "error",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.BadRequestObjectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BadRequest",
+          "Parameters": [
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.BadRequestObjectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Challenge",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ChallengeResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Challenge",
+          "Parameters": [
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ChallengeResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Challenge",
+          "Parameters": [
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ChallengeResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Challenge",
+          "Parameters": [
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            },
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ChallengeResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Content",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Content",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Content",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentEncoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Content",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "Microsoft.Net.Http.Headers.MediaTypeHeaderValue"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Forbid",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ForbidResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Forbid",
+          "Parameters": [
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ForbidResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Forbid",
+          "Parameters": [
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ForbidResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Forbid",
+          "Parameters": [
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            },
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ForbidResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileContents",
+              "Type": "System.Byte[]"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileContents",
+              "Type": "System.Byte[]"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileContentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileStream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileStreamResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "fileStream",
+              "Type": "System.IO.Stream"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.FileStreamResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "virtualPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.VirtualFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "File",
+          "Parameters": [
+            {
+              "Name": "virtualPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.VirtualFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "LocalRedirect",
+          "Parameters": [
+            {
+              "Name": "localUrl",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.LocalRedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "LocalRedirectPermanent",
+          "Parameters": [
+            {
+              "Name": "localUrl",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.LocalRedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "LocalRedirectPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "localUrl",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.LocalRedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "LocalRedirectPermanentPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "localUrl",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.LocalRedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "NotFound",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.NotFoundResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "NotFound",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.NotFoundObjectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Page",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RazorPages.PageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PhysicalFile",
+          "Parameters": [
+            {
+              "Name": "physicalPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.PhysicalFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PhysicalFile",
+          "Parameters": [
+            {
+              "Name": "physicalPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fileDownloadName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.PhysicalFileResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Redirect",
+          "Parameters": [
+            {
+              "Name": "url",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectResult",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectPermanent",
+          "Parameters": [
+            {
+              "Name": "url",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "url",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectPermanentPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "url",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToAction",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPermanent",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPermanent",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPermanent",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPermanent",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPermanent",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPermanent",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToActionPermanentPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToActionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoute",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoute",
+          "Parameters": [
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoute",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoute",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoute",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoutePreserveMethod",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoutePermanent",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoutePermanent",
+          "Parameters": [
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoutePermanent",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoutePermanent",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoutePermanent",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoutePermanentPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPage",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPage",
+          "Parameters": [
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPage",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPage",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPage",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPage",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPage",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPage",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePermanent",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePermanent",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePermanent",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePermanent",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePermanent",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePermanent",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePermanent",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePreserveMethod",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToPagePermanentPreserveMethod",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object",
+              "DefaultValue": "null"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String",
+              "DefaultValue": "null"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToPageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SignIn",
+          "Parameters": [
+            {
+              "Name": "principal",
+              "Type": "System.Security.Claims.ClaimsPrincipal"
+            },
+            {
+              "Name": "authenticationScheme",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.SignInResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SignIn",
+          "Parameters": [
+            {
+              "Name": "principal",
+              "Type": "System.Security.Claims.ClaimsPrincipal"
+            },
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            },
+            {
+              "Name": "authenticationScheme",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.SignInResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SignOut",
+          "Parameters": [
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.SignOutResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SignOut",
+          "Parameters": [
+            {
+              "Name": "properties",
+              "Type": "Microsoft.AspNetCore.Authentication.AuthenticationProperties"
+            },
+            {
+              "Name": "authenticationSchemes",
+              "Type": "System.String[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.SignOutResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "StatusCode",
+          "Parameters": [
+            {
+              "Name": "statusCode",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.StatusCodeResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "StatusCode",
+          "Parameters": [
+            {
+              "Name": "statusCode",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ObjectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Unauthorized",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.UnauthorizedResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryValidateModel",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryValidateModel",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnPageHandlerSelected",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.PageHandlerSelectedContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IPageFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnPageHandlerExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IPageFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnPageHandlerExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutedContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IPageFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnPageHandlerSelectionAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.PageHandlerSelectedContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IAsyncPageFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnPageHandlerExecutionAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutingContext"
+            },
+            {
+              "Name": "next",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutionDelegate"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IAsyncPageFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.PageResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ContentType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ContentType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Model",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Page",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RazorPages.PageBase",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Page",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageBase"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewData",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_StatusCode",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Int32>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_StatusCode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.Int32>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Infrastructure.ICompatibilitySwitch>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Conventions",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RootDirectory",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RootDirectory",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AllowAreas",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AllowAreas",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AllowMappingHeadRequestsToGetHandler",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AllowMappingHeadRequestsToGetHandler",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.DefaultPageActivatorProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.RazorPages.IPageActivatorProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateActivator",
+          "Parameters": [
+            {
+              "Name": "actionDescriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Func<Microsoft.AspNetCore.Mvc.RazorPages.PageContext, Microsoft.AspNetCore.Mvc.Rendering.ViewContext, System.Object>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.RazorPages.IPageActivatorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateReleaser",
+          "Parameters": [
+            {
+              "Name": "actionDescriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Action<Microsoft.AspNetCore.Mvc.RazorPages.PageContext, Microsoft.AspNetCore.Mvc.Rendering.ViewContext, System.Object>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.RazorPages.IPageActivatorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.DefaultPageFactoryProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.RazorPages.IPageFactoryProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreatePageFactory",
+          "Parameters": [
+            {
+              "Name": "actionDescriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Func<Microsoft.AspNetCore.Mvc.RazorPages.PageContext, Microsoft.AspNetCore.Mvc.Rendering.ViewContext, System.Object>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.RazorPages.IPageFactoryProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreatePageDisposer",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Action<Microsoft.AspNetCore.Mvc.RazorPages.PageContext, Microsoft.AspNetCore.Mvc.Rendering.ViewContext, System.Object>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.RazorPages.IPageFactoryProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "pageActivator",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.IPageActivatorProvider"
+            },
+            {
+              "Name": "metadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "urlHelperFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory"
+            },
+            {
+              "Name": "jsonHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper"
+            },
+            {
+              "Name": "diagnosticSource",
+              "Type": "System.Diagnostics.DiagnosticSource"
+            },
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            },
+            {
+              "Name": "modelExpressionProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.DefaultPageModelActivatorProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.RazorPages.IPageModelActivatorProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateActivator",
+          "Parameters": [
+            {
+              "Name": "actionDescriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Func<Microsoft.AspNetCore.Mvc.RazorPages.PageContext, System.Object>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.RazorPages.IPageModelActivatorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateReleaser",
+          "Parameters": [
+            {
+              "Name": "actionDescriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Action<Microsoft.AspNetCore.Mvc.RazorPages.PageContext, System.Object>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.RazorPages.IPageModelActivatorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.DefaultPageModelFactoryProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.RazorPages.IPageModelFactoryProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateModelFactory",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Func<Microsoft.AspNetCore.Mvc.RazorPages.PageContext, System.Object>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.RazorPages.IPageModelFactoryProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateModelDisposer",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Action<Microsoft.AspNetCore.Mvc.RazorPages.PageContext, System.Object>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.RazorPages.IPageModelFactoryProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "modelActivator",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.IPageModelActivatorProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_MethodInfo",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.MethodInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MethodInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Reflection.MethodInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HttpMethod",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HttpMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Parameters",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerParameterDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Parameters",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerParameterDescriptor>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerParameterDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ParameterInfo",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.ParameterInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ParameterInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Reflection.ParameterInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageHandlerMethodSelector",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Select",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageLoader",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Load",
+          "Parameters": [
+            {
+              "Name": "actionDescriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageActionDescriptor"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionDescriptorProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Abstractions.IActionDescriptorProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Abstractions.IActionDescriptorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptorProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Abstractions.IActionDescriptorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BuildModel",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModel>",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptorProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Abstractions.IActionDescriptorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "pageRouteModelProviders",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ApplicationModels.IPageRouteModelProvider>"
+            },
+            {
+              "Name": "mvcOptionsAccessor",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcOptions>"
+            },
+            {
+              "Name": "pagesOptionsAccessor",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageArgumentBinder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageContext"
+            },
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "default",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageContext"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<T0>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageContext"
+            },
+            {
+              "Name": "default",
+              "Type": "T0"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<T0>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageContext"
+            },
+            {
+              "Name": "value",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryUpdateModelAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageContext"
+            },
+            {
+              "Name": "value",
+              "Type": "T0"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Boolean>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "BindAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageContext"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult>",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageBoundPropertyDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Property",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.PropertyInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Property",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Reflection.PropertyInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageDirectiveFeature",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "TryGetPageDirective",
+          "Parameters": [
+            {
+              "Name": "logger",
+              "Type": "Microsoft.Extensions.Logging.ILogger"
+            },
+            {
+              "Name": "projectItem",
+              "Type": "Microsoft.AspNetCore.Razor.Language.RazorProjectItem"
+            },
+            {
+              "Name": "template",
+              "Type": "System.String",
+              "Direction": "Out"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageModelAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageResultExecutor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewExecutor",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "pageContext",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageContext"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageResult"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "writerFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory"
+            },
+            {
+              "Name": "compositeViewEngine",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine"
+            },
+            {
+              "Name": "razorViewEngine",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine"
+            },
+            {
+              "Name": "razorPageActivator",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.IRazorPageActivator"
+            },
+            {
+              "Name": "diagnosticSource",
+              "Type": "System.Diagnostics.DiagnosticSource"
+            },
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageViewLocationExpander",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Razor.IViewLocationExpander"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExpandViewLocations",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.ViewLocationExpanderContext"
+            },
+            {
+              "Name": "viewLocations",
+              "Type": "System.Collections.Generic.IEnumerable<System.String>"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.String>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IViewLocationExpander",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PopulateValues",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.ViewLocationExpanderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IViewLocationExpander",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAdapter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Razor.IRazorPage"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_BodyContent",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BodyContent",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Html.IHtmlContent"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsLayoutBeingRendered",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsLayoutBeingRendered",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Path",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Path",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Layout",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Layout",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PreviousSectionWriters",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, Microsoft.AspNetCore.Mvc.Razor.RenderAsyncDelegate>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PreviousSectionWriters",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IDictionary<System.String, Microsoft.AspNetCore.Mvc.Razor.RenderAsyncDelegate>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SectionWriters",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, Microsoft.AspNetCore.Mvc.Razor.RenderAsyncDelegate>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EnsureRenderedBodyOrSections",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Razor.IRazorPage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "page",
+              "Type": "Microsoft.AspNetCore.Mvc.Razor.RazorPageBase"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_RouteTemplate",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "path",
+              "Type": "System.String"
+            },
+            {
+              "Name": "viewType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "routeTemplate",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.DefaultPageHandlerMethodSelector",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageHandlerMethodSelector"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Select",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageHandlerMethodSelector",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "options",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelConvention",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.IPageConvention"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Apply",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPageConvention",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPageHandlerModelConvention",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.IPageConvention"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Apply",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageHandlerModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPageRouteModelConvention",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.IPageConvention"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Apply",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPageRouteModelProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnProvidersExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelProviderContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionDescriptor",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RazorPages.PageActionDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RelativePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewEnginePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AreaName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteTemplate",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Filters",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.Object, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PageType",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.TypeInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PageType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Reflection.TypeInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DeclaredModelType",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.TypeInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelType",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.TypeInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ModelType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Reflection.TypeInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HandlerType",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.TypeInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HandlerTypeAttributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HandlerMethods",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationModels.PageHandlerModel>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HandlerProperties",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationModels.PagePropertyModel>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionDescriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageActionDescriptor"
+            },
+            {
+              "Name": "handlerType",
+              "Type": "System.Reflection.TypeInfo"
+            },
+            {
+              "Name": "handlerAttributes",
+              "Type": "System.Collections.Generic.IReadOnlyList<System.Object>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionDescriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageActionDescriptor"
+            },
+            {
+              "Name": "declaredModelType",
+              "Type": "System.Reflection.TypeInfo"
+            },
+            {
+              "Name": "handlerType",
+              "Type": "System.Reflection.TypeInfo"
+            },
+            {
+              "Name": "handlerAttributes",
+              "Type": "System.Collections.Generic.IReadOnlyList<System.Object>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionDescriptor",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RazorPages.PageActionDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PageType",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.TypeInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PageApplicationModel",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PageApplicationModel",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "descriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.RazorPages.PageActionDescriptor"
+            },
+            {
+              "Name": "pageTypeInfo",
+              "Type": "System.Reflection.TypeInfo"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Collections.ObjectModel.Collection<Microsoft.AspNetCore.Mvc.ApplicationModels.IPageConvention>",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddPageApplicationModelConvention",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "action",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelConvention",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddAreaPageApplicationModelConvention",
+          "Parameters": [
+            {
+              "Name": "areaName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "action",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelConvention",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddFolderApplicationModelConvention",
+          "Parameters": [
+            {
+              "Name": "folderPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "action",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelConvention",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddAreaFolderApplicationModelConvention",
+          "Parameters": [
+            {
+              "Name": "areaName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "folderPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "action",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelConvention",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddPageRouteModelConvention",
+          "Parameters": [
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "action",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModel>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPageRouteModelConvention",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddAreaPageRouteModelConvention",
+          "Parameters": [
+            {
+              "Name": "areaName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "action",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModel>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPageRouteModelConvention",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddFolderRouteModelConvention",
+          "Parameters": [
+            {
+              "Name": "folderPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "action",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModel>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPageRouteModelConvention",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddAreaFolderRouteModelConvention",
+          "Parameters": [
+            {
+              "Name": "areaName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "folderPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "action",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModel>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPageRouteModelConvention",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RemoveType<T0>",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TPageConvention",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": [
+                "Microsoft.AspNetCore.Mvc.ApplicationModels.IPageConvention"
+              ]
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "RemoveType",
+          "Parameters": [
+            {
+              "Name": "pageConventionType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationModels.IPageConvention>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageHandlerModel",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.ICommonModel"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.Object, System.Object>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPropertyModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MethodInfo",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.MethodInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HttpMethod",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HttpMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HandlerName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HandlerName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.ICommonModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Parameters",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationModels.PageParameterModel>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Page",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Page",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Attributes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Object>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.ICommonModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "handlerMethod",
+              "Type": "System.Reflection.MethodInfo"
+            },
+            {
+              "Name": "attributes",
+              "Type": "System.Collections.Generic.IReadOnlyList<System.Object>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageHandlerModel"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageParameterModel",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ApplicationModels.ParameterModelBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.ICommonModel"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Handler",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageHandlerModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Handler",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageHandlerModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParameterInfo",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.ParameterInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ParameterName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ParameterName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "parameterInfo",
+              "Type": "System.Reflection.ParameterInfo"
+            },
+            {
+              "Name": "attributes",
+              "Type": "System.Collections.Generic.IReadOnlyList<System.Object>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageParameterModel"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.PagePropertyModel",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ApplicationModels.ParameterModelBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.ICommonModel"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Page",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Page",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyInfo",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.PropertyInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PropertyName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "propertyInfo",
+              "Type": "System.Reflection.PropertyInfo"
+            },
+            {
+              "Name": "attributes",
+              "Type": "System.Collections.Generic.IReadOnlyList<System.Object>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PagePropertyModel"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModel",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_RelativePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewEnginePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AreaName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.Object, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Selectors",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteValues",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "relativePath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "viewEnginePath",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "relativePath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "viewEnginePath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "areaName",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModel"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelProviderContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_RouteModels",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModel>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.MvcRazorPagesMvcBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddRazorPagesOptions",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WithRazorPagesRoot",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "rootDirectory",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WithRazorPagesAtContentRoot",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.MvcRazorPagesMvcCoreBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddRazorPages",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddRazorPages",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WithRazorPagesRoot",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "rootDirectory",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.PageConventionCollectionExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ConfigureFilter",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection"
+            },
+            {
+              "Name": "factory",
+              "Type": "System.Func<Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelConvention",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ConfigureFilter",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection"
+            },
+            {
+              "Name": "filter",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AllowAnonymousToPage",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AllowAnonymousToAreaPage",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection"
+            },
+            {
+              "Name": "areaName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AllowAnonymousToFolder",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection"
+            },
+            {
+              "Name": "folderPath",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection"
+            },
+            {
+              "Name": "convention",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.IParameterModelBaseConvention"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AllowAnonymousToAreaFolder",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection"
+            },
+            {
+              "Name": "areaName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "folderPath",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AuthorizePage",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "policy",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AuthorizePage",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AuthorizeAreaPage",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection"
+            },
+            {
+              "Name": "areaName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AuthorizeAreaPage",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection"
+            },
+            {
+              "Name": "areaName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "policy",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AuthorizeFolder",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection"
+            },
+            {
+              "Name": "folderPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "policy",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AuthorizeFolder",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection"
+            },
+            {
+              "Name": "folderPath",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AuthorizeAreaFolder",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection"
+            },
+            {
+              "Name": "areaName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "folderPath",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AuthorizeAreaFolder",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection"
+            },
+            {
+              "Name": "areaName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "folderPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "policy",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddPageRoute",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "route",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddAreaPageRoute",
+          "Parameters": [
+            {
+              "Name": "conventions",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection"
+            },
+            {
+              "Name": "areaName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "route",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/AnchorTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/AnchorTagHelper.cs
new file mode 100644
index 0000000000..175523d2fb
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/AnchorTagHelper.cs
@@ -0,0 +1,283 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Routing;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    /// <summary>
+    /// <see cref="ITagHelper"/> implementation targeting &lt;a&gt; elements.
+    /// </summary>
+    [HtmlTargetElement("a", Attributes = ActionAttributeName)]
+    [HtmlTargetElement("a", Attributes = ControllerAttributeName)]
+    [HtmlTargetElement("a", Attributes = AreaAttributeName)]
+    [HtmlTargetElement("a", Attributes = PageAttributeName)]
+    [HtmlTargetElement("a", Attributes = PageHandlerAttributeName)]
+    [HtmlTargetElement("a", Attributes = FragmentAttributeName)]
+    [HtmlTargetElement("a", Attributes = HostAttributeName)]
+    [HtmlTargetElement("a", Attributes = ProtocolAttributeName)]
+    [HtmlTargetElement("a", Attributes = RouteAttributeName)]
+    [HtmlTargetElement("a", Attributes = RouteValuesDictionaryName)]
+    [HtmlTargetElement("a", Attributes = RouteValuesPrefix + "*")]
+    public class AnchorTagHelper : TagHelper
+    {
+        private const string ActionAttributeName = "asp-action";
+        private const string ControllerAttributeName = "asp-controller";
+        private const string AreaAttributeName = "asp-area";
+        private const string PageAttributeName = "asp-page";
+        private const string PageHandlerAttributeName = "asp-page-handler";
+        private const string FragmentAttributeName = "asp-fragment";
+        private const string HostAttributeName = "asp-host";
+        private const string ProtocolAttributeName = "asp-protocol";
+        private const string RouteAttributeName = "asp-route";
+        private const string RouteValuesDictionaryName = "asp-all-route-data";
+        private const string RouteValuesPrefix = "asp-route-";
+        private const string Href = "href";
+        private IDictionary<string, string> _routeValues;
+
+        /// <summary>
+        /// Creates a new <see cref="AnchorTagHelper"/>.
+        /// </summary>
+        /// <param name="generator">The <see cref="IHtmlGenerator"/>.</param>
+        public AnchorTagHelper(IHtmlGenerator generator)
+        {
+            Generator = generator;
+        }
+
+        /// <inheritdoc />
+        public override int Order => -1000;
+
+        protected IHtmlGenerator Generator { get; }
+
+        /// <summary>
+        /// The name of the action method.
+        /// </summary>
+        /// <remarks>
+        /// Must be <c>null</c> if <see cref="Route"/> or <see cref="Page"/> is non-<c>null</c>.
+        /// </remarks>
+        [HtmlAttributeName(ActionAttributeName)]
+        public string Action { get; set; }
+
+        /// <summary>
+        /// The name of the controller.
+        /// </summary>
+        /// <remarks>
+        /// Must be <c>null</c> if <see cref="Route"/> or <see cref="Page"/> is non-<c>null</c>.
+        /// </remarks>
+        [HtmlAttributeName(ControllerAttributeName)]
+        public string Controller { get; set; }
+
+        /// <summary>
+        /// The name of the area.
+        /// </summary>
+        /// <remarks>
+        /// Must be <c>null</c> if <see cref="Route"/> or <see cref="Page"/> is non-<c>null</c>.
+        /// </remarks>
+        [HtmlAttributeName(AreaAttributeName)]
+        public string Area { get; set; }
+
+        /// <summary>
+        /// The name of the page.
+        /// </summary>
+        /// <remarks>
+        /// Must be <c>null</c> if <see cref="Route"/> or <see cref="Action"/>, <see cref="Controller"/>
+        /// or <see cref="Area"/> is non-<c>null</c>.
+        /// </remarks>
+        [HtmlAttributeName(PageAttributeName)]
+        public string Page { get; set; }
+
+        /// <summary>
+        /// The name of the page handler.
+        /// </summary>
+        /// <remarks>
+        /// Must be <c>null</c> if <see cref="Route"/> or <see cref="Action"/>, or <see cref="Controller"/>
+        /// is non-<c>null</c>.
+        /// </remarks>
+        [HtmlAttributeName(PageHandlerAttributeName)]
+        public string PageHandler { get; set; }
+
+        /// <summary>
+        /// The protocol for the URL, such as &quot;http&quot; or &quot;https&quot;.
+        /// </summary>
+        [HtmlAttributeName(ProtocolAttributeName)]
+        public string Protocol { get; set; }
+
+        /// <summary>
+        /// The host name.
+        /// </summary>
+        [HtmlAttributeName(HostAttributeName)]
+        public string Host { get; set; }
+
+        /// <summary>
+        /// The URL fragment name.
+        /// </summary>
+        [HtmlAttributeName(FragmentAttributeName)]
+        public string Fragment { get; set; }
+
+        /// <summary>
+        /// Name of the route.
+        /// </summary>
+        /// <remarks>
+        /// Must be <c>null</c> if one of <see cref="Action"/>, <see cref="Controller"/>, <see cref="Area"/> 
+        /// or <see cref="Page"/> is non-<c>null</c>.
+        /// </remarks>
+        [HtmlAttributeName(RouteAttributeName)]
+        public string Route { get; set; }
+
+        /// <summary>
+        /// Additional parameters for the route.
+        /// </summary>
+        [HtmlAttributeName(RouteValuesDictionaryName, DictionaryAttributePrefix = RouteValuesPrefix)]
+        public IDictionary<string, string> RouteValues
+        {
+            get
+            {
+                if (_routeValues == null)
+                {
+                    _routeValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+                }
+
+                return _routeValues;
+            }
+            set
+            {
+                _routeValues = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Rendering.ViewContext"/> for the current request.
+        /// </summary>
+        [HtmlAttributeNotBound]
+        [ViewContext]
+        public ViewContext ViewContext { get; set; }
+
+        /// <inheritdoc />
+        /// <remarks>Does nothing if user provides an <c>href</c> attribute.</remarks>
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (output == null)
+            {
+                throw new ArgumentNullException(nameof(output));
+            }
+
+            // If "href" is already set, it means the user is attempting to use a normal anchor.
+            if (output.Attributes.ContainsName(Href))
+            {
+                if (Action != null ||
+                    Controller != null ||
+                    Area != null ||
+                    Page != null ||
+                    PageHandler != null ||
+                    Route != null ||
+                    Protocol != null ||
+                    Host != null ||
+                    Fragment != null ||
+                    (_routeValues != null && _routeValues.Count > 0))
+                {
+                    // User specified an href and one of the bound attributes; can't determine the href attribute.
+                    throw new InvalidOperationException(
+                        Resources.FormatAnchorTagHelper_CannotOverrideHref(
+                            Href,
+                            "<a>",
+                            RouteValuesPrefix,
+                            ActionAttributeName,
+                            ControllerAttributeName,
+                            AreaAttributeName,
+                            RouteAttributeName,
+                            ProtocolAttributeName,
+                            HostAttributeName,
+                            FragmentAttributeName,
+                            PageAttributeName,
+                            PageHandlerAttributeName));
+                }
+
+                return;
+            }
+
+            var routeLink = Route != null;
+            var actionLink = Controller != null || Action != null;
+            var pageLink = Page != null || PageHandler != null;
+
+            if ((routeLink && actionLink) || (routeLink && pageLink) || (actionLink && pageLink))
+            {
+                var message = string.Join(
+                    Environment.NewLine,
+                    Resources.FormatCannotDetermineAttributeFor(Href, "<a>"),
+                    RouteAttributeName,
+                    ControllerAttributeName + ", " + ActionAttributeName,
+                    PageAttributeName + ", " + PageHandlerAttributeName);
+
+                throw new InvalidOperationException(message);
+            }
+
+            RouteValueDictionary routeValues = null;
+            if (_routeValues != null && _routeValues.Count > 0)
+            {
+                routeValues = new RouteValueDictionary(_routeValues);
+            }
+
+            if (Area != null)
+            {
+                // Unconditionally replace any value from asp-route-area.
+                if (routeValues == null)
+                {
+                    routeValues = new RouteValueDictionary();
+                }
+                routeValues["area"] = Area;
+            }
+
+            TagBuilder tagBuilder;
+            if (pageLink)
+            {
+                tagBuilder = Generator.GeneratePageLink(
+                    ViewContext,
+                    linkText: string.Empty,
+                    pageName: Page,
+                    pageHandler: PageHandler,
+                    protocol: Protocol,
+                    hostname: Host,
+                    fragment: Fragment,
+                    routeValues: routeValues,
+                    htmlAttributes: null);
+            }
+            else if (routeLink)
+            {
+                tagBuilder = Generator.GenerateRouteLink(
+                    ViewContext,
+                    linkText: string.Empty,
+                    routeName: Route,
+                    protocol: Protocol,
+                    hostName: Host,
+                    fragment: Fragment,
+                    routeValues: routeValues,
+                    htmlAttributes: null);
+            }
+            else
+            {
+                tagBuilder = Generator.GenerateActionLink(
+                   ViewContext,
+                   linkText: string.Empty,
+                   actionName: Action,
+                   controllerName: Controller,
+                   protocol: Protocol,
+                   hostname: Host,
+                   fragment: Fragment,
+                   routeValues: routeValues,
+                   htmlAttributes: null);
+            }
+
+            output.MergeAttributes(tagBuilder);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/CacheTagKey.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/CacheTagKey.cs
new file mode 100644
index 0000000000..f1d6730ae0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/CacheTagKey.cs
@@ -0,0 +1,326 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.TagHelpers.Internal;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Cache
+{
+    /// <summary>
+    /// An instance of <see cref="CacheTagKey"/> represents the state of <see cref="CacheTagHelper"/>
+    /// or <see cref="DistributedCacheTagHelper"/> keys.
+    /// </summary>
+    public class CacheTagKey : IEquatable<CacheTagKey>
+    {
+        private static readonly char[] AttributeSeparator = new[] { ',' };
+        private static readonly Func<IRequestCookieCollection, string, string> CookieAcccessor = (c, key) => c[key];
+        private static readonly Func<IHeaderDictionary, string, string> HeaderAccessor = (c, key) => c[key];
+        private static readonly Func<IQueryCollection, string, string> QueryAccessor = (c, key) => c[key];
+        private static readonly Func<RouteValueDictionary, string, string> RouteValueAccessor = (c, key) => c[key]?.ToString();
+
+        private const string CacheKeyTokenSeparator = "||";
+        private const string VaryByName = "VaryBy";
+        private const string VaryByHeaderName = "VaryByHeader";
+        private const string VaryByQueryName = "VaryByQuery";
+        private const string VaryByRouteName = "VaryByRoute";
+        private const string VaryByCookieName = "VaryByCookie";
+        private const string VaryByUserName = "VaryByUser";
+
+        private readonly string _prefix;
+        private readonly string _varyBy;
+        private readonly DateTimeOffset? _expiresOn;
+        private readonly TimeSpan? _expiresAfter;
+        private readonly TimeSpan? _expiresSliding;
+        private readonly IList<KeyValuePair<string, string>> _headers;
+        private readonly IList<KeyValuePair<string, string>> _queries;
+        private readonly IList<KeyValuePair<string, string>> _routeValues;
+        private readonly IList<KeyValuePair<string, string>> _cookies;
+        private readonly bool _varyByUser;
+        private readonly string _username;
+
+        private string _generatedKey;
+        private int? _hashcode;
+
+        /// <summary>
+        /// Creates an instance of <see cref="CacheTagKey"/> for a specific <see cref="CacheTagHelper"/>.
+        /// </summary>
+        /// <param name="tagHelper">The <see cref="CacheTagHelper"/>.</param>
+        /// <param name="context">The <see cref="TagHelperContext"/>.</param>
+        /// <returns>A new <see cref="CacheTagKey"/>.</returns>
+        public CacheTagKey(CacheTagHelper tagHelper, TagHelperContext context)
+            : this(tagHelper)
+        {
+            Key = context.UniqueId;
+            _prefix = nameof(CacheTagHelper);
+        }
+
+        /// <summary>
+        /// Creates an instance of <see cref="CacheTagKey"/> for a specific <see cref="DistributedCacheTagHelper"/>.
+        /// </summary>
+        /// <param name="tagHelper">The <see cref="DistributedCacheTagHelper"/>.</param>
+        /// <returns>A new <see cref="CacheTagKey"/>.</returns>
+        public CacheTagKey(DistributedCacheTagHelper tagHelper)
+            : this((CacheTagHelperBase)tagHelper)
+        {
+            Key = tagHelper.Name;
+            _prefix = nameof(DistributedCacheTagHelper);
+        }
+
+        private CacheTagKey(CacheTagHelperBase tagHelper)
+        {
+            var httpContext = tagHelper.ViewContext.HttpContext;
+            var request = httpContext.Request;
+
+            _expiresAfter = tagHelper.ExpiresAfter;
+            _expiresOn = tagHelper.ExpiresOn;
+            _expiresSliding = tagHelper.ExpiresSliding;
+            _varyBy = tagHelper.VaryBy;
+            _cookies = ExtractCollection(tagHelper.VaryByCookie, request.Cookies, CookieAcccessor);
+            _headers = ExtractCollection(tagHelper.VaryByHeader, request.Headers, HeaderAccessor);
+            _queries = ExtractCollection(tagHelper.VaryByQuery, request.Query, QueryAccessor);
+            _routeValues = ExtractCollection(tagHelper.VaryByRoute, tagHelper.ViewContext.RouteData.Values, RouteValueAccessor);
+            _varyByUser = tagHelper.VaryByUser;
+
+            if (_varyByUser)
+            {
+                _username = httpContext.User?.Identity?.Name;
+            }
+        }
+
+        // Internal for unit testing.
+        internal string Key { get; }
+
+        /// <summary>
+        /// Creates a <see cref="string"/> representation of the key.
+        /// </summary>
+        /// <returns>A <see cref="string"/> uniquely representing the key.</returns>
+        public string GenerateKey()
+        {
+            // Caching as the key is immutable and it can be called multiple times during a request.
+            if (_generatedKey != null)
+            {
+                return _generatedKey;
+            }
+
+            var builder = new StringBuilder(_prefix);
+            builder
+                .Append(CacheKeyTokenSeparator)
+                .Append(Key);
+
+            if (!string.IsNullOrEmpty(_varyBy))
+            {
+                builder
+                    .Append(CacheKeyTokenSeparator)
+                    .Append(VaryByName)
+                    .Append(CacheKeyTokenSeparator)
+                    .Append(_varyBy);
+            }
+
+            AddStringCollection(builder, VaryByCookieName, _cookies);
+            AddStringCollection(builder, VaryByHeaderName, _headers);
+            AddStringCollection(builder, VaryByQueryName, _queries);
+            AddStringCollection(builder, VaryByRouteName, _routeValues);
+
+            if (_varyByUser)
+            {
+                builder
+                    .Append(CacheKeyTokenSeparator)
+                    .Append(VaryByUserName)
+                    .Append(CacheKeyTokenSeparator)
+                    .Append(_username);
+            }
+
+            _generatedKey = builder.ToString();
+
+            return _generatedKey;
+        }
+
+        /// <summary>
+        /// Creates a hashed value of the key.
+        /// </summary>
+        /// <returns>A cryptographic hash of the key.</returns>
+        public string GenerateHashedKey()
+        {
+            var key = GenerateKey();
+
+            // The key is typically too long to be useful, so we use a cryptographic hash
+            // as the actual key (better randomization and key distribution, so small vary
+            // values will generate dramatically different keys).
+            using (var sha256 = CryptographyAlgorithms.CreateSHA256())
+            {
+                var contentBytes = Encoding.UTF8.GetBytes(key);
+                var hashedBytes = sha256.ComputeHash(contentBytes);
+                return Convert.ToBase64String(hashedBytes);
+            }
+        }
+
+        /// <inheritdoc />
+        public override bool Equals(object obj)
+        {
+            var other = obj as CacheTagKey;
+            if (other == null)
+            {
+                return false;
+            }
+
+            return Equals(other);
+        }
+
+        /// <inheritdoc />
+        public bool Equals(CacheTagKey other)
+        {
+            return string.Equals(other.Key, Key, StringComparison.Ordinal) &&
+                other._expiresAfter == _expiresAfter &&
+                other._expiresOn == _expiresOn &&
+                other._expiresSliding == _expiresSliding &&
+                string.Equals(other._varyBy, _varyBy, StringComparison.Ordinal) &&
+                AreSame(_cookies, other._cookies) &&
+                AreSame(_headers, other._headers) &&
+                AreSame(_queries, other._queries) &&
+                AreSame(_routeValues, other._routeValues) &&
+                _varyByUser == other._varyByUser &&
+                (!_varyByUser || string.Equals(other._username, _username, StringComparison.Ordinal));
+        }
+
+        /// <inheritdoc />
+        public override int GetHashCode()
+        {
+            // The hashcode is intentionally not using the computed
+            // stringified key in order to prevent string allocations
+            // in the common case where it's not explicitly required.
+
+            // Caching as the key is immutable and it can be called
+            // multiple times during a request.
+            if (_hashcode.HasValue)
+            {
+                return _hashcode.Value;
+            }
+
+            var hashCodeCombiner = new HashCodeCombiner();
+
+            hashCodeCombiner.Add(Key, StringComparer.Ordinal);
+            hashCodeCombiner.Add(_expiresAfter);
+            hashCodeCombiner.Add(_expiresOn);
+            hashCodeCombiner.Add(_expiresSliding);
+            hashCodeCombiner.Add(_varyBy, StringComparer.Ordinal);
+            hashCodeCombiner.Add(_username, StringComparer.Ordinal);
+
+            CombineCollectionHashCode(hashCodeCombiner, VaryByCookieName, _cookies);
+            CombineCollectionHashCode(hashCodeCombiner, VaryByHeaderName, _headers);
+            CombineCollectionHashCode(hashCodeCombiner, VaryByQueryName, _queries);
+            CombineCollectionHashCode(hashCodeCombiner, VaryByRouteName, _routeValues);
+
+            _hashcode = hashCodeCombiner.CombinedHash;
+
+            return _hashcode.Value;
+        }
+
+        private static IList<KeyValuePair<string, string>> ExtractCollection<TSourceCollection>(string keys, TSourceCollection collection, Func<TSourceCollection, string, string> accessor)
+        {
+            if (string.IsNullOrEmpty(keys))
+            {
+                return null;
+            }
+
+            var tokenizer = new StringTokenizer(keys, AttributeSeparator);
+
+            var result = new List<KeyValuePair<string, string>>();
+
+            foreach (var item in tokenizer)
+            {
+                var trimmedValue = item.Trim();
+
+                if (trimmedValue.Length != 0)
+                {
+                    var value = accessor(collection, trimmedValue.Value);
+                    result.Add(new KeyValuePair<string, string>(trimmedValue.Value, value ?? string.Empty));
+                }
+            }
+
+            return result;
+        }
+
+        private static void AddStringCollection(
+            StringBuilder builder,
+            string collectionName,
+            IList<KeyValuePair<string, string>> values)
+        {
+            if (values == null || values.Count == 0)
+            {
+                return;
+            }
+
+            // keyName(param1=value1|param2=value2)
+            builder
+                .Append(CacheKeyTokenSeparator)
+                .Append(collectionName)
+                .Append("(");
+
+            for (var i = 0; i < values.Count; i++)
+            {
+                var item = values[i];
+
+                if (i > 0)
+                {
+                    builder.Append(CacheKeyTokenSeparator);
+                }
+
+                builder
+                    .Append(item.Key)
+                    .Append(CacheKeyTokenSeparator)
+                    .Append(item.Value);
+            }
+
+            builder.Append(")");
+        }
+
+        private static void CombineCollectionHashCode(
+            HashCodeCombiner hashCodeCombiner,
+            string collectionName,
+            IList<KeyValuePair<string, string>> values)
+        {
+            if (values != null)
+            {
+                hashCodeCombiner.Add(collectionName, StringComparer.Ordinal);
+
+                for (var i = 0; i < values.Count; i++)
+                {
+                    var item = values[i];
+                    hashCodeCombiner.Add(item.Key);
+                    hashCodeCombiner.Add(item.Value);
+                }
+            }
+        }
+
+        private static bool AreSame(IList<KeyValuePair<string, string>> values1, IList<KeyValuePair<string, string>> values2)
+        {
+            if (values1 == values2)
+            {
+                return true;
+            }
+
+            if (values1 == null || values2 == null || values1.Count != values2.Count)
+            {
+                return false;
+            }
+
+            for (var i = 0; i < values1.Count; i++)
+            {
+                if (!string.Equals(values1[i].Key, values2[i].Key, StringComparison.Ordinal) ||
+                    !string.Equals(values1[i].Value, values2[i].Value, StringComparison.Ordinal))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperFormatter.cs
new file mode 100644
index 0000000000..3e0fbfb317
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperFormatter.cs
@@ -0,0 +1,49 @@
+// 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.
+
+using System;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Cache
+{
+    /// <summary>
+    /// Implements <see cref="IDistributedCacheTagHelperFormatter"/> by serializing the content
+    /// in UTF8.
+    /// </summary>
+    public class DistributedCacheTagHelperFormatter : IDistributedCacheTagHelperFormatter
+    {
+        /// <inheritdoc />
+        public Task<byte[]> SerializeAsync(DistributedCacheTagHelperFormattingContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (context.Html == null)
+            {
+                throw new ArgumentException(
+                    Resources.FormatPropertyOfTypeCannotBeNull(
+                        nameof(DistributedCacheTagHelperFormattingContext.Html),
+                        typeof(DistributedCacheTagHelperFormattingContext).FullName));
+            }
+
+            var serialized = Encoding.UTF8.GetBytes(context.Html.ToString());
+            return Task.FromResult(serialized);
+        }
+
+        /// <inheritdoc />
+        public Task<HtmlString> DeserializeAsync(byte[] value)
+        {
+            if (value == null)
+            {
+                throw new ArgumentNullException(nameof(value));
+            }
+
+            var content = Encoding.UTF8.GetString(value);
+            return Task.FromResult(new HtmlString(content));
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperFormattingContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperFormattingContext.cs
new file mode 100644
index 0000000000..3b1de01ff4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperFormattingContext.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Cache
+{
+    /// <summary>
+    /// Represents an object containing the information to serialize with <see cref="IDistributedCacheTagHelperFormatter" />.
+    /// </summary>
+    public class DistributedCacheTagHelperFormattingContext
+    {
+        /// <summary>
+        /// Gets the <see cref="HtmlString"/> instance.
+        /// </summary>
+        public HtmlString Html { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperService.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperService.cs
new file mode 100644
index 0000000000..34629a2664
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperService.cs
@@ -0,0 +1,216 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.TagHelpers.Internal;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Cache
+{
+    /// <summary>
+    /// Implements <see cref="IDistributedCacheTagHelperService"/> and ensures
+    /// multiple concurrent requests are gated.
+    /// The entries are stored like this:
+    /// <list type="bullet">
+    /// <item>
+    /// <description>Int32 representing the hashed cache key size.</description>
+    /// </item>
+    /// <item>
+    /// <description>The UTF8 encoded hashed cache key.</description>
+    /// </item>
+    /// <item>
+    /// <description>The UTF8 encoded cached content.</description>
+    /// </item>
+    /// </list>
+    /// </summary>
+    public class DistributedCacheTagHelperService : IDistributedCacheTagHelperService
+    {
+        private readonly IDistributedCacheTagHelperStorage _storage;
+        private readonly IDistributedCacheTagHelperFormatter _formatter;
+        private readonly HtmlEncoder _htmlEncoder;
+        private readonly ILogger _logger;
+        private readonly ConcurrentDictionary<CacheTagKey, Task<IHtmlContent>> _workers;
+
+        public DistributedCacheTagHelperService(
+            IDistributedCacheTagHelperStorage storage,
+            IDistributedCacheTagHelperFormatter formatter,
+            HtmlEncoder HtmlEncoder,
+            ILoggerFactory loggerFactory)
+        {
+            if (storage == null)
+            {
+                throw new ArgumentNullException(nameof(storage));
+            }
+
+            if (formatter == null)
+            {
+                throw new ArgumentNullException(nameof(formatter));
+            }
+
+            if (HtmlEncoder == null)
+            {
+                throw new ArgumentNullException(nameof(HtmlEncoder));
+            }
+
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            _formatter = formatter;
+            _storage = storage;
+            _htmlEncoder = HtmlEncoder;
+            _logger = loggerFactory.CreateLogger<DistributedCacheTagHelperService>();
+            _workers = new ConcurrentDictionary<CacheTagKey, Task<IHtmlContent>>();
+        }
+
+        /// <inheritdoc />
+        public async Task<IHtmlContent> ProcessContentAsync(TagHelperOutput output, CacheTagKey key, DistributedCacheEntryOptions options)
+        {
+            IHtmlContent content = null;
+
+            while (content == null)
+            {
+                Task<IHtmlContent> result;
+
+                // Is there any request already processing the value?
+                if (!_workers.TryGetValue(key, out result))
+                {
+                    // There is a small race condition here between TryGetValue and TryAdd that might cause the
+                    // content to be computed more than once. We don't care about this race as the probability of
+                    // happening is very small and the impact is not critical.
+                    var tcs = new TaskCompletionSource<IHtmlContent>();
+
+                    _workers.TryAdd(key, tcs.Task);
+
+                    try
+                    {
+                        var serializedKey = Encoding.UTF8.GetBytes(key.GenerateKey());
+                        var storageKey = key.GenerateHashedKey();
+                        var value = await _storage.GetAsync(storageKey);
+
+                        if (value == null)
+                        {
+                            // The value is not cached, we need to render the tag helper output
+                            var processedContent = await output.GetChildContentAsync();
+
+                            var stringBuilder = new StringBuilder();
+                            using (var writer = new StringWriter(stringBuilder))
+                            {
+                                processedContent.WriteTo(writer, _htmlEncoder);
+                            }
+
+                            var formattingContext = new DistributedCacheTagHelperFormattingContext
+                            {
+                                Html = new HtmlString(stringBuilder.ToString())
+                            };
+
+                            // Then cache the result
+                            value = await _formatter.SerializeAsync(formattingContext);
+
+                            var encodeValue = Encode(value, serializedKey);
+
+                            await _storage.SetAsync(storageKey, encodeValue, options);
+
+                            content = formattingContext.Html;
+                        }
+                        else
+                        {
+                            // The value was found in the storage, decode and ensure
+                            // there is no cache key hash collision
+                            byte[] decodedValue = Decode(value, serializedKey);
+
+                            try
+                            {
+                                if (decodedValue != null)
+                                {
+                                    content = await _formatter.DeserializeAsync(decodedValue);
+                                }
+                            }
+                            catch (Exception e)
+                            {
+                                _logger.DistributedFormatterDeserializationException(storageKey, e);
+                            }
+                            finally
+                            {
+                                // If the deserialization fails the content is rendered
+                                if (content == null)
+                                {
+                                    content = await output.GetChildContentAsync();
+                                }
+                            }
+                        }
+                    }
+                    catch
+                    {
+                        content = null;
+                        throw;
+                    }
+                    finally
+                    {
+                        // Remove the worker task before setting the result.
+                        // If the result is null, other threads would potentially
+                        // acquire it otherwise.
+                        _workers.TryRemove(key, out result);
+
+                        // Notify all other awaiters to render the content
+                        tcs.TrySetResult(content);
+                    }
+                }
+                else
+                {
+                    content = await result;
+                }
+            }
+
+            return content;
+        }
+
+        private byte[] Encode(byte[] value, byte[] serializedKey)
+        {
+            using (var buffer = new MemoryStream())
+            {
+                var keyLength = BitConverter.GetBytes(serializedKey.Length);
+
+                buffer.Write(keyLength, 0, keyLength.Length);
+                buffer.Write(serializedKey, 0, serializedKey.Length);
+                buffer.Write(value, 0, value.Length);
+
+                return buffer.ToArray();
+            }
+        }
+
+        private byte[] Decode(byte[] value, byte[] expectedKey)
+        {
+            byte[] decoded = null;
+
+            using (var buffer = new MemoryStream(value))
+            {
+                var keyLengthBuffer = new byte[sizeof(int)];
+                buffer.Read(keyLengthBuffer, 0, keyLengthBuffer.Length);
+
+                var keyLength = BitConverter.ToInt32(keyLengthBuffer, 0);
+                var serializedKeyBuffer = new byte[keyLength];
+                buffer.Read(serializedKeyBuffer, 0, serializedKeyBuffer.Length);
+
+                // Ensure we are reading the expected key before continuing
+                if (serializedKeyBuffer.SequenceEqual(expectedKey))
+                {
+                    decoded = new byte[value.Length - keyLengthBuffer.Length - serializedKeyBuffer.Length];
+                    buffer.Read(decoded, 0, decoded.Length);
+                }
+            }
+
+            return decoded;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperStorage.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperStorage.cs
new file mode 100644
index 0000000000..2409f9d5ea
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperStorage.cs
@@ -0,0 +1,54 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Caching.Distributed;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Cache
+{
+    /// <summary>
+    /// Implements <see cref="IDistributedCacheTagHelperStorage"/> by storing the content
+    /// in using <see cref="IDistributedCache"/> as the store.
+    /// </summary>
+    public class DistributedCacheTagHelperStorage : IDistributedCacheTagHelperStorage
+    {
+        private readonly IDistributedCache _distributedCache;
+
+        /// <summary>
+        /// Creates a new <see cref="DistributedCacheTagHelperStorage"/>.
+        /// </summary>
+        /// <param name="distributedCache">The <see cref="IDistributedCache"/> to use.</param>
+        public DistributedCacheTagHelperStorage(IDistributedCache distributedCache)
+        {
+            _distributedCache = distributedCache;
+        }
+
+        /// <inheritdoc />
+        public Task<byte[]> GetAsync(string key)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+            
+            return _distributedCache.GetAsync(key);
+        }
+
+        /// <inheritdoc />
+        public Task SetAsync(string key, byte[] value, DistributedCacheEntryOptions options)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            if (value == null)
+            {
+                throw new ArgumentNullException(nameof(value));
+            }
+
+            return _distributedCache.SetAsync(key, value, options);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperFormatter.cs
new file mode 100644
index 0000000000..6236b7d719
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperFormatter.cs
@@ -0,0 +1,29 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Cache
+{
+    /// <summary>
+    /// An implementation of this interface provides a service to
+    /// serialize html fragments for being store by <see cref="IDistributedCacheTagHelperStorage" />
+    /// </summary>
+    public interface IDistributedCacheTagHelperFormatter
+    {
+        /// <summary>
+        /// Serializes some html content.
+        /// </summary>
+        /// <param name="context">The <see cref="DistributedCacheTagHelperFormattingContext" /> to serialize.</param>
+        /// <returns>The serialized result.</returns>
+        Task<byte[]> SerializeAsync(DistributedCacheTagHelperFormattingContext context);
+
+        /// <summary>
+        /// Deserialize some html content.
+        /// </summary>
+        /// <param name="value">The value to deserialize.</param>
+        /// <returns>The deserialized content, <value>null</value> otherwise.</returns>
+        Task<HtmlString> DeserializeAsync(byte[] value);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperService.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperService.cs
new file mode 100644
index 0000000000..15abaab386
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperService.cs
@@ -0,0 +1,26 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.Caching.Distributed;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Cache
+{
+    /// <summary>
+    /// An implementation of this interface provides a service to process
+    /// the content or fetches it from cache for distributed cache tag helpers.
+    /// </summary>
+    public interface IDistributedCacheTagHelperService
+    {
+        /// <summary>
+        /// Processes the html content of a distributed cache tag helper.
+        /// </summary>
+        /// <param name="output">The <see cref="TagHelperOutput" />.</param>
+        /// <param name="key">The key in the storage.</param>
+        /// <param name="options">The <see cref="DistributedCacheEntryOptions"/>.</param>
+        /// <returns>A cached or new content for the cache tag helper.</returns>
+        Task<IHtmlContent> ProcessContentAsync(TagHelperOutput output, CacheTagKey key, DistributedCacheEntryOptions options);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperStorage.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperStorage.cs
new file mode 100644
index 0000000000..2d29c436d7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperStorage.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.Extensions.Caching.Distributed;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Cache
+{
+    /// <summary>
+    /// An implementation of this interface provides a service to 
+    /// cache distributed html fragments from the &lt;distributed-cache&gt;
+    /// tag helper.
+    /// </summary>
+    public interface IDistributedCacheTagHelperStorage
+    {
+        /// <summary>
+        /// Gets the content from the cache and deserializes it.
+        /// </summary>
+        /// <param name="key">The unique key to use in the cache.</param>
+        /// <returns>The stored value if it exists, <value>null</value> otherwise.</returns>
+        Task<byte[]> GetAsync(string key);
+
+        /// <summary>
+        /// Sets the content in the cache and serialized it.
+        /// </summary>
+        /// <param name="key">The unique key to use in the cache.</param>
+        /// <param name="value">The value to cache.</param>
+        /// <param name="options">The cache entry options.</param>
+        Task SetAsync(string key, byte[] value, DistributedCacheEntryOptions options);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelper.cs
new file mode 100644
index 0000000000..4a7bb989b7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelper.cs
@@ -0,0 +1,282 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.TagHelpers.Cache;
+using Microsoft.AspNetCore.Mvc.TagHelpers.Internal;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    /// <summary>
+    /// <see cref="TagHelper"/> implementation targeting &lt;cache&gt; elements.
+    /// </summary>
+    public class CacheTagHelper : CacheTagHelperBase
+    {
+        /// <summary>
+        /// Prefix used by <see cref="CacheTagHelper"/> instances when creating entries in <see cref="MemoryCache"/>.
+        /// </summary>
+        public static readonly string CacheKeyPrefix = nameof(CacheTagHelper);
+
+        private const string CachePriorityAttributeName = "priority";
+
+        // We need to come up with a value for the size of entries when storing a gating Task on the cache. Any value
+        // greater than 0 will suffice. We choose 56 bytes as an approximation of the size of the task that we store
+        // in the cache. This size got calculated as an upper bound for the size of an actual task on an x64 architecture
+        // and corresponds to 24 bytes for the object header block plus the 40 bytes added by the members of the task
+        // object.
+        private const int PlaceholderSize = 64;
+
+        /// <summary>
+        /// Creates a new <see cref="CacheTagHelper"/>.
+        /// </summary>
+        /// <param name="factory">The factory containing the private <see cref="IMemoryCache"/> instance
+        /// used by the <see cref="CacheTagHelper"/>.</param>
+        /// <param name="htmlEncoder">The <see cref="HtmlEncoder"/> to use.</param>
+        public CacheTagHelper(CacheTagHelperMemoryCacheFactory factory, HtmlEncoder htmlEncoder) : base(htmlEncoder)
+        {
+            MemoryCache = factory.Cache;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="IMemoryCache"/> instance used to cache entries.
+        /// </summary>
+        protected IMemoryCache MemoryCache { get; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="CacheItemPriority"/> policy for the cache entry.
+        /// </summary>
+        [HtmlAttributeName(CachePriorityAttributeName)]
+        public CacheItemPriority? Priority { get; set; }
+
+        /// <inheritdoc />
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (output == null)
+            {
+                throw new ArgumentNullException(nameof(output));
+            }
+
+            IHtmlContent content;
+            if (Enabled)
+            {
+                var cacheKey = new CacheTagKey(this, context);
+                if (MemoryCache.TryGetValue(cacheKey, out Task<IHtmlContent> cachedResult))
+                {
+                    // There is either some value already cached (as a Task) or a worker processing the output.
+                    content = await cachedResult;
+                }
+                else
+                {
+                    content = await CreateCacheEntry(cacheKey, output);
+                }
+            }
+            else
+            {
+                content = await output.GetChildContentAsync();
+            }
+
+            // Clear the contents of the "cache" element since we don't want to render it.
+            output.SuppressOutput();
+            output.Content.SetHtmlContent(content);
+        }
+
+        private async Task<IHtmlContent> CreateCacheEntry(CacheTagKey cacheKey, TagHelperOutput output)
+        {
+            var tokenSource = new CancellationTokenSource();
+
+            var options = GetMemoryCacheEntryOptions();
+            options.AddExpirationToken(new CancellationChangeToken(tokenSource.Token));
+            options.SetSize(PlaceholderSize);
+            var tcs = new TaskCompletionSource<IHtmlContent>();
+
+            // The returned value is ignored, we only do this so that
+            // the compiler doesn't complain about the returned task
+            // not being awaited
+            _ = MemoryCache.Set(cacheKey, tcs.Task, options);
+
+            IHtmlContent content;
+            try
+            {
+                // The entry is set instead of assigning a value to the
+                // task so that the expiration options are not impacted
+                // by the time it took to compute it.
+
+                // Use the CreateEntry to ensure a cache scope is created that will copy expiration tokens from
+                // cache entries created from the GetChildContentAsync call to the current entry.
+                var entry = MemoryCache.CreateEntry(cacheKey);
+
+                // The result is processed inside an entry
+                // such that the tokens are inherited.
+
+                var result = ProcessContentAsync(output);
+                content = await result;
+                options.SetSize(GetSize(content));
+                entry.SetOptions(options);
+
+                entry.Value = result;
+
+                // An entry gets committed to the cache when disposed gets called. We only want to do this when
+                // the content has been correctly generated (didn't throw an exception). For that reason the entry
+                // can't be put inside a using block.
+                entry.Dispose();
+
+                // Set the result on the TCS once we've commited the entry to the cache since commiting to the cache
+                // may throw.
+                tcs.SetResult(content);
+                return content;
+            }
+            catch (Exception ex)
+            {
+                // Remove the worker task from the cache in case it can't complete.
+                tokenSource.Cancel();
+
+                // Fail the TCS so other awaiters see the exception.
+                tcs.TrySetException(ex);
+                throw;
+            }
+            finally
+            {
+                // The tokenSource needs to be disposed as the MemoryCache
+                // will register a callback on the Token.
+                tokenSource.Dispose();
+            }
+        }
+
+        private long GetSize(IHtmlContent content)
+        {
+            if (content is CharBufferHtmlContent charBuffer)
+            {
+                // We need to multiply the size of the buffer
+                // by a factor of two due to the fact that
+                // characters in .NET are UTF-16 which means
+                // every character uses two bytes (surrogates
+                // are represented as two characters)
+                return charBuffer.Buffer.Length * sizeof(char);
+            }
+
+            Debug.Fail($"{nameof(content)} should be an {nameof(CharBufferHtmlContent)}.");
+            return -1;
+        }
+
+        // Internal for unit testing
+        internal MemoryCacheEntryOptions GetMemoryCacheEntryOptions()
+        {
+            var hasEvictionCriteria = false;
+            var options = new MemoryCacheEntryOptions();
+            if (ExpiresOn != null)
+            {
+                hasEvictionCriteria = true;
+                options.SetAbsoluteExpiration(ExpiresOn.Value);
+            }
+
+            if (ExpiresAfter != null)
+            {
+                hasEvictionCriteria = true;
+                options.SetAbsoluteExpiration(ExpiresAfter.Value);
+            }
+
+            if (ExpiresSliding != null)
+            {
+                hasEvictionCriteria = true;
+                options.SetSlidingExpiration(ExpiresSliding.Value);
+            }
+
+            if (Priority != null)
+            {
+                options.SetPriority(Priority.Value);
+            }
+
+            if (!hasEvictionCriteria)
+            {
+                options.SetSlidingExpiration(DefaultExpiration);
+            }
+
+            return options;
+        }
+
+        private async Task<IHtmlContent> ProcessContentAsync(TagHelperOutput output)
+        {
+            var content = await output.GetChildContentAsync();
+
+            using (var writer = new CharBufferTextWriter())
+            {
+                content.WriteTo(writer, HtmlEncoder);
+                return new CharBufferHtmlContent(writer.Buffer);
+            }
+        }
+
+        private class CharBufferTextWriter : TextWriter
+        {
+            public CharBufferTextWriter()
+            {
+                Buffer = new PagedCharBuffer(CharArrayBufferSource.Instance);
+            }
+
+            public override Encoding Encoding => Null.Encoding;
+
+            public PagedCharBuffer Buffer { get; }
+
+            public override void Write(char value)
+            {
+                Buffer.Append(value);
+            }
+
+            public override void Write(char[] buffer, int index, int count)
+            {
+                Buffer.Append(buffer, index, count);
+            }
+
+            public override void Write(string value)
+            {
+                Buffer.Append(value);
+            }
+        }
+
+        private class CharBufferHtmlContent : IHtmlContent
+        {
+            private readonly PagedCharBuffer _buffer;
+
+            public CharBufferHtmlContent(PagedCharBuffer buffer)
+            {
+                _buffer = buffer;
+            }
+
+            public PagedCharBuffer Buffer => _buffer;
+
+            public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+            {
+                var length = Buffer.Length;
+                if (length == 0)
+                {
+                    return;
+                }
+
+                for (var i = 0; i < Buffer.Pages.Count; i++)
+                {
+                    var page = Buffer.Pages[i];
+                    var pageLength = Math.Min(length, page.Length);
+                    writer.Write(page, index: 0, count: pageLength);
+                    length -= pageLength;
+                }
+
+                Debug.Assert(length == 0);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperBase.cs
new file mode 100644
index 0000000000..ca7dfdcb70
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperBase.cs
@@ -0,0 +1,120 @@
+// 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.
+
+using System;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    /// <summary>
+    /// <see cref="TagHelper"/> base implementation for caching elements.
+    /// </summary>
+    public abstract class CacheTagHelperBase : TagHelper
+    {
+        private const string VaryByAttributeName = "vary-by";
+        private const string VaryByHeaderAttributeName = "vary-by-header";
+        private const string VaryByQueryAttributeName = "vary-by-query";
+        private const string VaryByRouteAttributeName = "vary-by-route";
+        private const string VaryByCookieAttributeName = "vary-by-cookie";
+        private const string VaryByUserAttributeName = "vary-by-user";
+        private const string ExpiresOnAttributeName = "expires-on";
+        private const string ExpiresAfterAttributeName = "expires-after";
+        private const string ExpiresSlidingAttributeName = "expires-sliding";
+        private const string EnabledAttributeName = "enabled";
+
+        /// <summary>
+        /// The default duration, from the time the cache entry was added, when it should be evicted.
+        /// This default duration will only be used if no other expiration criteria is specified.
+        /// The default expiration time is a sliding expiration of 30 seconds.
+        /// </summary>
+        public static readonly TimeSpan DefaultExpiration = TimeSpan.FromSeconds(30);
+
+        /// <summary>
+        /// Creates a new <see cref="CacheTagHelperBase"/>.
+        /// </summary>
+        /// <param name="htmlEncoder">The <see cref="HtmlEncoder"/> to use.</param>
+        public CacheTagHelperBase(HtmlEncoder htmlEncoder)
+        {
+            HtmlEncoder = htmlEncoder;
+        }
+
+        /// <inheritdoc />
+        public override int Order => -1000;
+
+        /// <summary>
+        /// Gets the <see cref="System.Text.Encodings.Web.HtmlEncoder"/> which encodes the content to be cached.
+        /// </summary>
+        protected HtmlEncoder HtmlEncoder { get; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ViewContext"/> for the current executing View.
+        /// </summary>
+        [HtmlAttributeNotBound]
+        [ViewContext]
+        public ViewContext ViewContext { get; set; }
+
+        /// <summary>
+        /// Gets or sets a <see cref="string" /> to vary the cached result by.
+        /// </summary>
+        [HtmlAttributeName(VaryByAttributeName)]
+        public string VaryBy { get; set; }
+
+        /// <summary>
+        /// Gets or sets a comma-delimited set of HTTP request headers to vary the cached result by.
+        /// </summary>
+        [HtmlAttributeName(VaryByHeaderAttributeName)]
+        public string VaryByHeader { get; set; }
+
+        /// <summary>
+        /// Gets or sets a comma-delimited set of query parameters to vary the cached result by.
+        /// </summary>
+        [HtmlAttributeName(VaryByQueryAttributeName)]
+        public string VaryByQuery { get; set; }
+
+        /// <summary>
+        /// Gets or sets a comma-delimited set of route data parameters to vary the cached result by.
+        /// </summary>
+        [HtmlAttributeName(VaryByRouteAttributeName)]
+        public string VaryByRoute { get; set; }
+
+        /// <summary>
+        /// Gets or sets a comma-delimited set of cookie names to vary the cached result by.
+        /// </summary>
+        [HtmlAttributeName(VaryByCookieAttributeName)]
+        public string VaryByCookie { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value that determines if the cached result is to be varied by the Identity for the logged in
+        /// <see cref="Http.HttpContext.User"/>.
+        /// </summary>
+        [HtmlAttributeName(VaryByUserAttributeName)]
+        public bool VaryByUser { get; set; }
+
+        /// <summary>
+        /// Gets or sets the exact <see cref="DateTimeOffset"/> the cache entry should be evicted.
+        /// </summary>
+        [HtmlAttributeName(ExpiresOnAttributeName)]
+        public DateTimeOffset? ExpiresOn { get; set; }
+
+        /// <summary>
+        /// Gets or sets the duration, from the time the cache entry was added, when it should be evicted.
+        /// </summary>
+        [HtmlAttributeName(ExpiresAfterAttributeName)]
+        public TimeSpan? ExpiresAfter { get; set; }
+
+        /// <summary>
+        /// Gets or sets the duration from last access that the cache entry should be evicted.
+        /// </summary>
+        [HtmlAttributeName(ExpiresSlidingAttributeName)]
+        public TimeSpan? ExpiresSliding { get; set; }
+
+        /// <summary>
+        /// Gets or sets the value which determines if the tag helper is enabled or not.
+        /// </summary>
+        [HtmlAttributeName(EnabledAttributeName)]
+        public bool Enabled { get; set; } = true;
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperOptions.cs
new file mode 100644
index 0000000000..0e141b26ff
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperOptions.cs
@@ -0,0 +1,17 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    /// <summary>
+    /// Provides programmatic configuration for the cache tag helper in the MVC framework.
+    /// </summary>
+    public class CacheTagHelperOptions
+    {
+        /// <summary>
+        /// The maximum total size in bytes that will be cached by the <see cref="CacheTagHelper"/>
+        /// at any given time.
+        /// </summary>
+        public long SizeLimit { get; set; } = 100 * 1024 * 1024; // 100MB
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/DependencyInjection/TagHelperExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/DependencyInjection/TagHelperExtensions.cs
new file mode 100644
index 0000000000..5161244492
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/DependencyInjection/TagHelperExtensions.cs
@@ -0,0 +1,86 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.TagHelpers;
+using Microsoft.AspNetCore.Mvc.TagHelpers.Cache;
+using Microsoft.AspNetCore.Mvc.TagHelpers.Internal;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    /// <summary>
+    /// Extension methods for configuring Razor cache tag helpers.
+    /// </summary>
+    public static class TagHelperServicesExtensions
+    {
+        /// <summary>
+        ///  Adds MVC cache tag helper services to the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        public static IMvcCoreBuilder AddCacheTagHelper(this IMvcCoreBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Services.TryAddSingleton<IDistributedCacheTagHelperStorage, DistributedCacheTagHelperStorage>();
+            builder.Services.TryAddSingleton<IDistributedCacheTagHelperFormatter, DistributedCacheTagHelperFormatter>();
+            builder.Services.TryAddSingleton<IDistributedCacheTagHelperService, DistributedCacheTagHelperService>();
+
+            // Required default services for cache tag helpers
+            builder.Services.AddDistributedMemoryCache();
+            builder.Services.TryAddSingleton<CacheTagHelperMemoryCacheFactory>();
+
+            return builder;
+        }
+
+        /// <summary>
+        ///  Configures the memory size limits on the cache of the <see cref="CacheTagHelper"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="configure">The <see cref="Action{CacheTagHelperOptions}"/>to configure the cache options.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder AddCacheTagHelperLimits(this IMvcBuilder builder, Action<CacheTagHelperOptions> configure)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (configure == null)
+            {
+                throw new ArgumentNullException(nameof(configure));
+            }
+
+            builder.Services.Configure(configure);
+
+            return builder;
+        }
+
+        /// <summary>
+        ///  Configures the memory size limits on the cache of the <see cref="CacheTagHelper"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <param name="configure">The <see cref="Action{CacheTagHelperOptions}"/>to configure the cache options.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        public static IMvcCoreBuilder AddCacheTagHelperLimits(this IMvcCoreBuilder builder, Action<CacheTagHelperOptions> configure)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (configure == null)
+            {
+                throw new ArgumentNullException(nameof(configure));
+            }
+
+            builder.Services.Configure(configure);
+
+            return builder;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/DistributedCacheTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/DistributedCacheTagHelper.cs
new file mode 100644
index 0000000000..7256f950d9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/DistributedCacheTagHelper.cs
@@ -0,0 +1,116 @@
+// 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.
+
+using System;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.TagHelpers.Cache;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.Memory;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    /// <summary>
+    /// <see cref="TagHelper"/> implementation targeting &lt;distributed-cache&gt; elements.
+    /// </summary>
+    [HtmlTargetElement("distributed-cache", Attributes = NameAttributeName)]
+    public class DistributedCacheTagHelper : CacheTagHelperBase
+    {
+        private readonly IDistributedCacheTagHelperService _distributedCacheService;
+
+        /// <summary>
+        /// Prefix used by <see cref="DistributedCacheTagHelper"/> instances when creating entries in <see cref="IDistributedCacheTagHelperStorage"/>.
+        /// </summary>
+        public static readonly string CacheKeyPrefix = nameof(DistributedCacheTagHelper);
+
+        private const string NameAttributeName = "name";
+
+        /// <summary>
+        /// Creates a new <see cref="CacheTagHelper"/>.
+        /// </summary>
+        /// <param name="distributedCacheService">The <see cref="IDistributedCacheTagHelperService"/>.</param>
+        /// <param name="htmlEncoder">The <see cref="HtmlEncoder"/>.</param>
+        public DistributedCacheTagHelper(
+            IDistributedCacheTagHelperService distributedCacheService,
+            HtmlEncoder htmlEncoder)
+            : base(htmlEncoder)
+        {
+            _distributedCacheService = distributedCacheService;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="IMemoryCache"/> instance used to cache workers.
+        /// </summary>
+        protected IMemoryCache MemoryCache { get; }
+
+        /// <summary>
+        /// Gets or sets a unique name to discriminate cached entries.
+        /// </summary>
+        [HtmlAttributeName(NameAttributeName)]
+        public string Name { get; set; }
+
+        /// <inheritdoc />
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (output == null)
+            {
+                throw new ArgumentNullException(nameof(output));
+            }
+
+            IHtmlContent content;
+            if (Enabled)
+            {
+                var cacheKey = new CacheTagKey(this);
+
+                content = await _distributedCacheService.ProcessContentAsync(output, cacheKey, GetDistributedCacheEntryOptions());
+            }
+            else
+            {
+                content = await output.GetChildContentAsync();
+            }
+
+            // Clear the contents of the "cache" element since we don't want to render it.
+            output.SuppressOutput();
+
+            output.Content.SetHtmlContent(content);
+        }
+
+        // Internal for unit testing
+        internal DistributedCacheEntryOptions GetDistributedCacheEntryOptions()
+        {
+            var hasEvictionCriteria = false;
+            var options = new DistributedCacheEntryOptions();
+            if (ExpiresOn != null)
+            {
+                hasEvictionCriteria = true;
+                options.SetAbsoluteExpiration(ExpiresOn.Value);
+            }
+
+            if (ExpiresAfter != null)
+            {
+                hasEvictionCriteria = true;
+                options.SetAbsoluteExpiration(ExpiresAfter.Value);
+            }
+
+            if (ExpiresSliding != null)
+            {
+                hasEvictionCriteria = true;
+                options.SetSlidingExpiration(ExpiresSliding.Value);
+            }
+
+            if (!hasEvictionCriteria)
+            {
+                options.SetSlidingExpiration(DefaultExpiration);
+            }
+
+            return options;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/EnvironmentTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/EnvironmentTagHelper.cs
new file mode 100644
index 0000000000..b45a518eb7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/EnvironmentTagHelper.cs
@@ -0,0 +1,156 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    /// <summary>
+    /// <see cref="ITagHelper"/> implementation targeting &lt;environment&gt; elements that conditionally renders
+    /// content based on the current value of <see cref="IHostingEnvironment.EnvironmentName"/>.
+    /// If the environment is not listed in the specified <see cref="Names"/> or <see cref="Include"/>, 
+    /// or if it is in <see cref="Exclude"/>, the content will not be rendered.
+    /// </summary>
+    public class EnvironmentTagHelper : TagHelper
+    {
+        private static readonly char[] NameSeparator = new[] { ',' };
+
+        /// <summary>
+        /// Creates a new <see cref="EnvironmentTagHelper"/>.
+        /// </summary>
+        /// <param name="hostingEnvironment">The <see cref="IHostingEnvironment"/>.</param>
+        public EnvironmentTagHelper(IHostingEnvironment hostingEnvironment)
+        {
+            HostingEnvironment = hostingEnvironment;
+        }
+
+        /// <inheritdoc />
+        public override int Order => -1000;
+
+        /// <summary>
+        /// A comma separated list of environment names in which the content should be rendered.
+        /// If the current environment is also in the <see cref="Exclude"/> list, the content will not be rendered.
+        /// </summary>
+        /// <remarks>
+        /// The specified environment names are compared case insensitively to the current value of
+        /// <see cref="IHostingEnvironment.EnvironmentName"/>.
+        /// </remarks>
+        public string Names { get; set; }
+
+        /// <summary>
+        /// A comma separated list of environment names in which the content should be rendered.
+        /// If the current environment is also in the <see cref="Exclude"/> list, the content will not be rendered.
+        /// </summary>
+        /// <remarks>
+        /// The specified environment names are compared case insensitively to the current value of
+        /// <see cref="IHostingEnvironment.EnvironmentName"/>.
+        /// </remarks>
+        public string Include { get; set; }
+
+        /// <summary>
+        /// A comma separated list of environment names in which the content will not be rendered.
+        /// </summary>
+        /// <remarks>
+        /// The specified environment names are compared case insensitively to the current value of
+        /// <see cref="IHostingEnvironment.EnvironmentName"/>.
+        /// </remarks>
+        public string Exclude { get; set; }
+
+        protected IHostingEnvironment HostingEnvironment { get; }
+
+        /// <inheritdoc />
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (output == null)
+            {
+                throw new ArgumentNullException(nameof(output));
+            }
+
+            // Always strip the outer tag name as we never want <environment> to render
+            output.TagName = null;
+
+            if (string.IsNullOrWhiteSpace(Names) && string.IsNullOrWhiteSpace(Include) && string.IsNullOrWhiteSpace(Exclude))
+            {
+                // No names specified, do nothing
+                return;
+            }
+
+            var currentEnvironmentName = HostingEnvironment.EnvironmentName?.Trim();
+            if (string.IsNullOrEmpty(currentEnvironmentName))
+            {
+                // No current environment name, do nothing
+                return;
+            }
+
+            if (Exclude != null)
+            {
+                var tokenizer = new StringTokenizer(Exclude, NameSeparator);
+                foreach (var item in tokenizer)
+                {
+                    var environment = item.Trim();
+                    if (environment.HasValue && environment.Length > 0)
+                    {
+                        if (environment.Equals(currentEnvironmentName, StringComparison.OrdinalIgnoreCase))
+                        {
+                            // Matching environment name found, suppress output
+                            output.SuppressOutput();
+                            return;
+                        }
+                    }
+                }
+            }
+
+            var hasEnvironments = false;
+            if (Names != null)
+            {
+                var tokenizer = new StringTokenizer(Names, NameSeparator);
+                foreach (var item in tokenizer)
+                {
+                    var environment = item.Trim();
+                    if (environment.HasValue && environment.Length > 0)
+                    {
+                        hasEnvironments = true;
+                        if (environment.Equals(currentEnvironmentName, StringComparison.OrdinalIgnoreCase))
+                        {
+                            // Matching environment name found, do nothing
+                            return;
+                        }
+                    }
+                }
+            }
+
+            if (Include != null)
+            {
+                var tokenizer = new StringTokenizer(Include, NameSeparator);
+                foreach (var item in tokenizer)
+                {
+                    var environment = item.Trim();
+                    if (environment.HasValue && environment.Length > 0)
+                    {
+                        hasEnvironments = true;
+                        if (environment.Equals(currentEnvironmentName, StringComparison.OrdinalIgnoreCase))
+                        {
+                            // Matching environment name found, do nothing
+                            return;
+                        }
+                    }
+                }
+            }
+
+            if (hasEnvironments)
+            {
+                // This instance had at least one non-empty environment (names or include) specified but none of these
+                // environments matched the current environment. Suppress the output in this case.
+                output.SuppressOutput();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FormActionTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FormActionTagHelper.cs
new file mode 100644
index 0000000000..18c89f37e4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FormActionTagHelper.cs
@@ -0,0 +1,271 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Routing;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    /// <summary>
+    /// <see cref="ITagHelper"/> implementation targeting &lt;button&gt; elements and &lt;input&gt; elements with
+    /// their <c>type</c> attribute set to <c>image</c> or <c>submit</c>.
+    /// </summary>
+    [HtmlTargetElement("button", Attributes = ActionAttributeName)]
+    [HtmlTargetElement("button", Attributes = ControllerAttributeName)]
+    [HtmlTargetElement("button", Attributes = AreaAttributeName)]
+    [HtmlTargetElement("button", Attributes = PageAttributeName)]
+    [HtmlTargetElement("button", Attributes = PageHandlerAttributeName)]
+    [HtmlTargetElement("button", Attributes = FragmentAttributeName)]
+    [HtmlTargetElement("button", Attributes = RouteAttributeName)]
+    [HtmlTargetElement("button", Attributes = RouteValuesDictionaryName)]
+    [HtmlTargetElement("button", Attributes = RouteValuesPrefix + "*")]
+    [HtmlTargetElement("input", Attributes = ImageActionAttributeSelector, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("input", Attributes = ImageControllerAttributeSelector, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("input", Attributes = ImageAreaAttributeSelector, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("input", Attributes = ImagePageAttributeSelector, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("input", Attributes = ImagePageHandlerAttributeSelector, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("input", Attributes = ImageFragmentAttributeSelector, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("input", Attributes = ImageRouteAttributeSelector, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("input", Attributes = ImageRouteValuesDictionarySelector, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("input", Attributes = ImageRouteValuesSelector, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("input", Attributes = SubmitActionAttributeSelector, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("input", Attributes = SubmitControllerAttributeSelector, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("input", Attributes = SubmitAreaAttributeSelector, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("input", Attributes = SubmitPageAttributeSelector, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("input", Attributes = SubmitPageHandlerAttributeSelector, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("input", Attributes = SubmitFragmentAttributeSelector, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("input", Attributes = SubmitRouteAttributeSelector, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("input", Attributes = SubmitRouteValuesDictionarySelector, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("input", Attributes = SubmitRouteValuesSelector, TagStructure = TagStructure.WithoutEndTag)]
+    public class FormActionTagHelper : TagHelper
+    {
+        private const string ActionAttributeName = "asp-action";
+        private const string AreaAttributeName = "asp-area";
+        private const string ControllerAttributeName = "asp-controller";
+        private const string PageAttributeName = "asp-page";
+        private const string PageHandlerAttributeName = "asp-page-handler";
+        private const string FragmentAttributeName = "asp-fragment";
+        private const string RouteAttributeName = "asp-route";
+        private const string RouteValuesDictionaryName = "asp-all-route-data";
+        private const string RouteValuesPrefix = "asp-route-";
+        private const string FormAction = "formaction";
+
+        private const string ImageTypeSelector = "[type=image], ";
+        private const string ImageActionAttributeSelector = ImageTypeSelector + ActionAttributeName;
+        private const string ImageAreaAttributeSelector = ImageTypeSelector + AreaAttributeName;
+        private const string ImagePageAttributeSelector = ImageTypeSelector + PageAttributeName;
+        private const string ImagePageHandlerAttributeSelector = ImageTypeSelector + PageHandlerAttributeName;
+        private const string ImageFragmentAttributeSelector = ImageTypeSelector + FragmentAttributeName;
+        private const string ImageControllerAttributeSelector = ImageTypeSelector + ControllerAttributeName;
+        private const string ImageRouteAttributeSelector = ImageTypeSelector + RouteAttributeName;
+        private const string ImageRouteValuesDictionarySelector = ImageTypeSelector + RouteValuesDictionaryName;
+        private const string ImageRouteValuesSelector = ImageTypeSelector + RouteValuesPrefix + "*";
+
+        private const string SubmitTypeSelector = "[type=submit], ";
+        private const string SubmitActionAttributeSelector = SubmitTypeSelector + ActionAttributeName;
+        private const string SubmitAreaAttributeSelector = SubmitTypeSelector + AreaAttributeName;
+        private const string SubmitPageAttributeSelector = SubmitTypeSelector + PageAttributeName;
+        private const string SubmitPageHandlerAttributeSelector = SubmitTypeSelector + PageHandlerAttributeName;
+        private const string SubmitFragmentAttributeSelector = SubmitTypeSelector + FragmentAttributeName;
+        private const string SubmitControllerAttributeSelector = SubmitTypeSelector + ControllerAttributeName;
+        private const string SubmitRouteAttributeSelector = SubmitTypeSelector + RouteAttributeName;
+        private const string SubmitRouteValuesDictionarySelector = SubmitTypeSelector + RouteValuesDictionaryName;
+        private const string SubmitRouteValuesSelector = SubmitTypeSelector + RouteValuesPrefix + "*";
+
+        private IDictionary<string, string> _routeValues;
+
+        /// <summary>
+        /// Creates a new <see cref="FormActionTagHelper"/>.
+        /// </summary>
+        /// <param name="urlHelperFactory">The <see cref="IUrlHelperFactory"/>.</param>
+        public FormActionTagHelper(IUrlHelperFactory urlHelperFactory)
+        {
+            UrlHelperFactory = urlHelperFactory;
+        }
+
+        /// <inheritdoc />
+        public override int Order => -1000;
+
+        /// <summary>
+        /// Gets or sets the <see cref="Rendering.ViewContext"/> for the current request.
+        /// </summary>
+        [HtmlAttributeNotBound]
+        [ViewContext]
+        public ViewContext ViewContext { get; set; }
+
+        protected IUrlHelperFactory UrlHelperFactory { get; }
+
+        /// <summary>
+        /// The name of the action method.
+        /// </summary>
+        [HtmlAttributeName(ActionAttributeName)]
+        public string Action { get; set; }
+
+        /// <summary>
+        /// The name of the controller.
+        /// </summary>
+        [HtmlAttributeName(ControllerAttributeName)]
+        public string Controller { get; set; }
+
+        /// <summary>
+        /// The name of the area.
+        /// </summary>
+        [HtmlAttributeName(AreaAttributeName)]
+        public string Area { get; set; }
+
+        /// <summary>
+        /// The name of the page.
+        /// </summary>
+        [HtmlAttributeName(PageAttributeName)]
+        public string Page { get; set; }
+
+        /// <summary>
+        /// The name of the page handler.
+        /// </summary>
+        [HtmlAttributeName(PageHandlerAttributeName)]
+        public string PageHandler { get; set; }
+
+        /// <summary>
+        /// Gets or sets the URL fragment.
+        /// </summary>
+        [HtmlAttributeName(FragmentAttributeName)]
+        public string Fragment { get; set; }
+
+        /// <summary>
+        /// Name of the route.
+        /// </summary>
+        /// <remarks>
+        /// Must be <c>null</c> if <see cref="Action"/> or <see cref="Controller"/> is non-<c>null</c>.
+        /// </remarks>
+        [HtmlAttributeName(RouteAttributeName)]
+        public string Route { get; set; }
+
+        /// <summary>
+        /// Additional parameters for the route.
+        /// </summary>
+        [HtmlAttributeName(RouteValuesDictionaryName, DictionaryAttributePrefix = RouteValuesPrefix)]
+        public IDictionary<string, string> RouteValues
+        {
+            get
+            {
+                if (_routeValues == null)
+                {
+                    _routeValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+                }
+
+                return _routeValues;
+            }
+            set
+            {
+                _routeValues = value;
+            }
+        }
+
+        /// <inheritdoc />
+        /// <remarks>Does nothing if user provides an <c>formaction</c> attribute.</remarks>
+        /// <exception cref="InvalidOperationException">
+        /// Thrown if <c>formaction</c> attribute is provided and <see cref="Action"/>, <see cref="Controller"/>,
+        /// <see cref="Fragment"/> or <see cref="Route"/> are non-<c>null</c> or if the user provided <c>asp-route-*</c> attributes.
+        /// Also thrown if <see cref="Route"/> and one or both of <see cref="Action"/> and <see cref="Controller"/>
+        /// are non-<c>null</c>
+        /// </exception>
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (output == null)
+            {
+                throw new ArgumentNullException(nameof(output));
+            }
+
+            // If "formaction" is already set, it means the user is attempting to use a normal button or input element.
+            if (output.Attributes.ContainsName(FormAction))
+            {
+                if (Action != null ||
+                    Controller != null ||
+                    Area != null ||
+                    Page != null ||
+                    PageHandler != null ||
+                    Fragment != null ||
+                    Route != null ||
+                    (_routeValues != null && _routeValues.Count > 0))
+                {
+                    // User specified a formaction and one of the bound attributes; can't override that formaction
+                    // attribute.
+                    throw new InvalidOperationException(
+                        Resources.FormatFormActionTagHelper_CannotOverrideFormAction(
+                            FormAction,
+                            output.TagName,
+                            RouteValuesPrefix,
+                            ActionAttributeName,
+                            ControllerAttributeName,
+                            AreaAttributeName,
+                            FragmentAttributeName,
+                            RouteAttributeName,
+                            PageAttributeName,
+                            PageHandlerAttributeName));
+                }
+
+                return;
+            }
+
+            var routeLink = Route != null;
+            var actionLink = Controller != null || Action != null;
+            var pageLink = Page != null || PageHandler != null;
+
+            if ((routeLink && actionLink) || (routeLink && pageLink) || (actionLink && pageLink))
+            {
+                var message = string.Join(
+                    Environment.NewLine,
+                    Resources.FormatCannotDetermineAttributeFor(FormAction, '<' + output.TagName + '>'),
+                    RouteAttributeName,
+                    ControllerAttributeName + ", " + ActionAttributeName,
+                    PageAttributeName + ", " + PageHandlerAttributeName);
+
+                throw new InvalidOperationException(message);
+            }
+
+            RouteValueDictionary routeValues = null;
+            if (_routeValues != null && _routeValues.Count > 0)
+            {
+                routeValues = new RouteValueDictionary(_routeValues);
+            }
+
+            if (Area != null)
+            {
+                if (routeValues == null)
+                {
+                    routeValues = new RouteValueDictionary();
+                }
+
+                // Unconditionally replace any value from asp-route-area.
+                routeValues["area"] = Area;
+            }
+
+            var urlHelper = UrlHelperFactory.GetUrlHelper(ViewContext);
+            string url;
+            if (pageLink)
+            {
+                url = urlHelper.Page(Page, PageHandler, routeValues, protocol: null, host: null, fragment: Fragment);
+            }
+            else if (routeLink)
+            {
+                url = urlHelper.RouteUrl(Route, routeValues, protocol: null, host: null, fragment: Fragment);
+            }
+            else
+            {
+                url = urlHelper.Action(Action, Controller, routeValues, protocol: null, host: null, fragment: Fragment);
+            }
+
+            output.Attributes.SetAttribute(FormAction, url);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FormTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FormTagHelper.cs
new file mode 100644
index 0000000000..ad10121751
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FormTagHelper.cs
@@ -0,0 +1,324 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Routing;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    /// <summary>
+    /// <see cref="ITagHelper"/> implementation targeting &lt;form&gt; elements.
+    /// </summary>
+    [HtmlTargetElement("form")]
+    public class FormTagHelper : TagHelper
+    {
+        private const string ActionAttributeName = "asp-action";
+        private const string AntiforgeryAttributeName = "asp-antiforgery";
+        private const string AreaAttributeName = "asp-area";
+        private const string PageAttributeName = "asp-page";
+        private const string PageHandlerAttributeName = "asp-page-handler";
+        private const string FragmentAttributeName = "asp-fragment";
+        private const string ControllerAttributeName = "asp-controller";
+        private const string RouteAttributeName = "asp-route";
+        private const string RouteValuesDictionaryName = "asp-all-route-data";
+        private const string RouteValuesPrefix = "asp-route-";
+        private const string HtmlActionAttributeName = "action";
+        private IDictionary<string, string> _routeValues;
+
+        /// <summary>
+        /// Creates a new <see cref="FormTagHelper"/>.
+        /// </summary>
+        /// <param name="generator">The <see cref="IHtmlGenerator"/>.</param>
+        public FormTagHelper(IHtmlGenerator generator)
+        {
+            Generator = generator;
+        }
+
+        // This TagHelper's order must be lower than the RenderAtEndOfFormTagHelper. I.e it must be executed before
+        // RenderAtEndOfFormTagHelper does.
+        /// <inheritdoc />
+        public override int Order => -1000;
+
+        [HtmlAttributeNotBound]
+        [ViewContext]
+        public ViewContext ViewContext { get; set; }
+
+        protected IHtmlGenerator Generator { get; }
+
+        /// <summary>
+        /// The name of the action method.
+        /// </summary>
+        [HtmlAttributeName(ActionAttributeName)]
+        public string Action { get; set; }
+
+        /// <summary>
+        /// The name of the controller.
+        /// </summary>
+        [HtmlAttributeName(ControllerAttributeName)]
+        public string Controller { get; set; }
+
+        /// <summary>
+        /// The name of the area.
+        /// </summary>
+        [HtmlAttributeName(AreaAttributeName)]
+        public string Area { get; set; }
+
+        /// <summary>
+        /// The name of the page.
+        /// </summary>
+        [HtmlAttributeName(PageAttributeName)]
+        public string Page { get; set; }
+
+        /// <summary>
+        /// The name of the page handler.
+        /// </summary>
+        [HtmlAttributeName(PageHandlerAttributeName)]
+        public string PageHandler { get; set; }
+
+        /// <summary>
+        /// Whether the antiforgery token should be generated.
+        /// </summary>
+        /// <value>Defaults to <c>false</c> if user provides an <c>action</c> attribute
+        /// or if the <c>method</c> is <see cref="FormMethod.Get"/>; <c>true</c> otherwise.</value>
+        [HtmlAttributeName(AntiforgeryAttributeName)]
+        public bool? Antiforgery { get; set; }
+
+        /// <summary>
+        /// Gets or sets the URL fragment.
+        /// </summary>
+        [HtmlAttributeName(FragmentAttributeName)]
+        public string Fragment { get; set; }
+
+        /// <summary>
+        /// Name of the route.
+        /// </summary>
+        /// <remarks>
+        /// Must be <c>null</c> if <see cref="Action"/> or <see cref="Controller"/> is non-<c>null</c>.
+        /// </remarks>
+        [HtmlAttributeName(RouteAttributeName)]
+        public string Route { get; set; }
+
+        /// <summary>
+        /// The HTTP method to use.
+        /// </summary>
+        /// <remarks>Passed through to the generated HTML in all cases.</remarks>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public string Method { get; set; }
+
+        /// <summary>
+        /// Additional parameters for the route.
+        /// </summary>
+        [HtmlAttributeName(RouteValuesDictionaryName, DictionaryAttributePrefix = RouteValuesPrefix)]
+        public IDictionary<string, string> RouteValues
+        {
+            get
+            {
+                if (_routeValues == null)
+                {
+                    _routeValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+                }
+
+                return _routeValues;
+            }
+            set
+            {
+                _routeValues = value;
+            }
+        }
+
+        /// <inheritdoc />
+        /// <remarks>
+        /// Does nothing if user provides an <c>action</c> attribute and <see cref="Antiforgery"/> is <c>null</c> or
+        /// <c>false</c>.
+        /// </remarks>
+        /// <exception cref="InvalidOperationException">
+        /// Thrown if <c>action</c> attribute is provided and <see cref="Action"/>, <see cref="Controller"/> or <see cref="Fragment"/> are
+        /// non-<c>null</c> or if the user provided <c>asp-route-*</c> attributes.
+        /// </exception>
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (output == null)
+            {
+                throw new ArgumentNullException(nameof(output));
+            }
+
+            if (Method != null)
+            {
+                output.CopyHtmlAttribute(nameof(Method), context);
+            }
+
+            var antiforgeryDefault = true;
+            var routeableParametersProvided = Action != null ||
+                Controller != null ||
+                Area != null ||
+                Page != null ||
+                PageHandler != null ||
+                Fragment != null ||
+                Route != null ||
+                (_routeValues != null && _routeValues.Count > 0);
+
+            // If "action" is already set, it means the user is attempting to use a normal <form>.
+            if (output.Attributes.TryGetAttribute(HtmlActionAttributeName, out var actionAttribute))
+            {
+                if (routeableParametersProvided)
+                {
+                    // User also specified bound attributes we cannot use.
+                    throw new InvalidOperationException(
+                        Resources.FormatFormTagHelper_CannotOverrideAction(
+                            HtmlActionAttributeName,
+                            "<form>",
+                            RouteValuesPrefix,
+                            ActionAttributeName,
+                            ControllerAttributeName,
+                            FragmentAttributeName,
+                            AreaAttributeName,
+                            RouteAttributeName,
+                            PageAttributeName,
+                            PageHandlerAttributeName));
+                }
+
+                string attributeValue = null;
+                switch (actionAttribute.Value)
+                {
+                    case HtmlString htmlString:
+                        attributeValue = htmlString.ToString();
+                        break;
+                    case string stringValue:
+                        attributeValue = stringValue;
+                        break;
+                }
+
+                if (string.IsNullOrEmpty(attributeValue))
+                {
+                    // User is using the FormTagHelper like a normal <form> tag that has an empty or complex IHtmlContent action attribute.
+                    // e.g. <form action="" method="..."> or <form action="@CustomUrlIHtmlContent" method="...">
+
+                    if (string.Equals(Method ?? "get", "get", StringComparison.OrdinalIgnoreCase))
+                    {
+                        antiforgeryDefault = false;
+                    }
+                    else
+                    {
+                        // Antiforgery default is already set to true
+                    }
+                }
+                else
+                {
+                    // User is likely using the <form> element to submit to another site. Do not send an antiforgery token to unknown sites.
+                    antiforgeryDefault = false;
+                }
+            }
+            else
+            {
+                var routeLink = Route != null;
+                var actionLink = Controller != null || Action != null;
+                var pageLink = Page != null || PageHandler != null;
+
+                if ((routeLink && actionLink) || (routeLink && pageLink) || (actionLink && pageLink))
+                {
+                    var message = string.Join(
+                        Environment.NewLine,
+                        Resources.FormatCannotDetermineAttributeFor(HtmlActionAttributeName, "<form>"),
+                        RouteAttributeName,
+                        ControllerAttributeName + ", " + ActionAttributeName,
+                        PageAttributeName);
+
+                    throw new InvalidOperationException(message);
+                }
+
+                RouteValueDictionary routeValues = null;
+                if (_routeValues != null && _routeValues.Count > 0)
+                {
+                    routeValues = new RouteValueDictionary(_routeValues);
+                }
+
+                if (Area != null)
+                {
+                    if (routeValues == null)
+                    {
+                        routeValues = new RouteValueDictionary();
+                    }
+
+                    // Unconditionally replace any value from asp-route-area.
+                    routeValues["area"] = Area;
+                }
+
+                TagBuilder tagBuilder = null;
+                if (!routeableParametersProvided &&
+                    _routeValues == null &&
+                    // Antiforgery will sometime be set globally via TagHelper Initializers, verify it was provided in the cshtml. 
+                    !context.AllAttributes.ContainsName(AntiforgeryAttributeName))
+                {
+                    // A <form> tag that doesn't utilize asp-* attributes. Let it flow to the output.
+                    Method = Method ?? "get";
+                }
+                else if (pageLink)
+                {
+                    tagBuilder = Generator.GeneratePageForm(
+                        ViewContext,
+                        Page,
+                        PageHandler,
+                        routeValues,
+                        Fragment,
+                        method: null,
+                        htmlAttributes: null);
+                }
+                else if (routeLink)
+                {
+                    tagBuilder = Generator.GenerateRouteForm(
+                        ViewContext,
+                        Route,
+                        routeValues,
+                        Fragment,
+                        method: null,
+                        htmlAttributes: null);
+                }
+                else
+                {
+                    tagBuilder = Generator.GenerateForm(
+                        ViewContext,
+                        Action,
+                        Controller,
+                        Fragment,
+                        routeValues,
+                        method: null,
+                        htmlAttributes: null);
+                }
+
+                if (tagBuilder != null)
+                {
+                    output.MergeAttributes(tagBuilder);
+                    if (tagBuilder.HasInnerHtml)
+                    {
+                        output.PostContent.AppendHtml(tagBuilder.InnerHtml);
+                    }
+                }
+
+                if (string.Equals(Method, "get", StringComparison.OrdinalIgnoreCase))
+                {
+                    antiforgeryDefault = false;
+                }
+            }
+
+            if (Antiforgery ?? antiforgeryDefault)
+            {
+                var antiforgeryTag = Generator.GenerateAntiforgery(ViewContext);
+                if (antiforgeryTag != null)
+                {
+                    output.PostContent.AppendHtml(antiforgeryTag);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ImageTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ImageTagHelper.cs
new file mode 100644
index 0000000000..587dfc3567
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ImageTagHelper.cs
@@ -0,0 +1,115 @@
+// 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.
+
+using System;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.TagHelpers.Internal;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.Caching.Memory;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    /// <summary>
+    /// <see cref="ITagHelper"/> implementation targeting &lt;img&gt; elements that supports file versioning.
+    /// </summary>
+    /// <remarks>
+    /// The tag helper won't process for cases with just the 'src' attribute.
+    /// </remarks>
+    [HtmlTargetElement(
+        "img",
+        Attributes = AppendVersionAttributeName + "," + SrcAttributeName,
+        TagStructure = TagStructure.WithoutEndTag)]
+    public class ImageTagHelper : UrlResolutionTagHelper
+    {
+        private const string AppendVersionAttributeName = "asp-append-version";
+        private const string SrcAttributeName = "src";
+
+        private FileVersionProvider _fileVersionProvider;
+
+        /// <summary>
+        /// Creates a new <see cref="ImageTagHelper"/>.
+        /// </summary>
+        /// <param name="hostingEnvironment">The <see cref="IHostingEnvironment"/>.</param>
+        /// <param name="cache">The <see cref="IMemoryCache"/>.</param>
+        /// <param name="htmlEncoder">The <see cref="HtmlEncoder"/> to use.</param>
+        /// <param name="urlHelperFactory">The <see cref="IUrlHelperFactory"/>.</param>
+        public ImageTagHelper(
+            IHostingEnvironment hostingEnvironment,
+            IMemoryCache cache,
+            HtmlEncoder htmlEncoder,
+            IUrlHelperFactory urlHelperFactory)
+            : base(urlHelperFactory, htmlEncoder)
+        {
+            HostingEnvironment = hostingEnvironment;
+            Cache = cache;
+        }
+
+        /// <inheritdoc />
+        public override int Order => -1000;
+
+        /// <summary>
+        /// Source of the image.
+        /// </summary>
+        /// <remarks>
+        /// Passed through to the generated HTML in all cases.
+        /// </remarks>
+        [HtmlAttributeName(SrcAttributeName)]
+        public string Src { get; set; }
+
+        /// <summary>
+        /// Value indicating if file version should be appended to the src urls.
+        /// </summary>
+        /// <remarks>
+        /// If <c>true</c> then a query string "v" with the encoded content of the file is added.
+        /// </remarks>
+        [HtmlAttributeName(AppendVersionAttributeName)]
+        public bool AppendVersion { get; set; }
+
+        protected IHostingEnvironment HostingEnvironment { get; }
+
+        protected IMemoryCache Cache { get; }
+
+        /// <inheritdoc />
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (output == null)
+            {
+                throw new ArgumentNullException(nameof(output));
+            }
+
+            output.CopyHtmlAttribute(SrcAttributeName, context);
+            ProcessUrlAttribute(SrcAttributeName, output);
+
+            if (AppendVersion)
+            {
+                EnsureFileVersionProvider();
+
+                // Retrieve the TagHelperOutput variation of the "src" attribute in case other TagHelpers in the
+                // pipeline have touched the value. If the value is already encoded this ImageTagHelper may
+                // not function properly.
+                Src = output.Attributes[SrcAttributeName].Value as string;
+
+                output.Attributes.SetAttribute(SrcAttributeName, _fileVersionProvider.AddFileVersionToPath(Src));
+            }
+        }
+
+        private void EnsureFileVersionProvider()
+        {
+            if (_fileVersionProvider == null)
+            {
+                _fileVersionProvider = new FileVersionProvider(
+                    HostingEnvironment.WebRootFileProvider,
+                    Cache,
+                    ViewContext.HttpContext.Request.PathBase);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/InputTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/InputTagHelper.cs
new file mode 100644
index 0000000000..8ea3effdd4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/InputTagHelper.cs
@@ -0,0 +1,508 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    /// <summary>
+    /// <see cref="ITagHelper"/> implementation targeting &lt;input&gt; elements with an <c>asp-for</c> attribute.
+    /// </summary>
+    [HtmlTargetElement("input", Attributes = ForAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    public class InputTagHelper : TagHelper
+    {
+        private const string ForAttributeName = "asp-for";
+        private const string FormatAttributeName = "asp-format";
+
+        // Mapping from datatype names and data annotation hints to values for the <input/> element's "type" attribute.
+        private static readonly Dictionary<string, string> _defaultInputTypes =
+            new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "HiddenInput", InputType.Hidden.ToString().ToLowerInvariant() },
+                { "Password", InputType.Password.ToString().ToLowerInvariant() },
+                { "Text", InputType.Text.ToString().ToLowerInvariant() },
+                { "PhoneNumber", "tel" },
+                { "Url", "url" },
+                { "EmailAddress", "email" },
+                { "Date", "date" },
+                { "DateTime", "datetime-local" },
+                { "DateTime-local", "datetime-local" },
+                { nameof(DateTimeOffset), "text" },
+                { "Time", "time" },
+                { "Week", "week" },
+                { "Month", "month" },
+                { nameof(Byte), "number" },
+                { nameof(SByte), "number" },
+                { nameof(Int16), "number" },
+                { nameof(UInt16), "number" },
+                { nameof(Int32), "number" },
+                { nameof(UInt32), "number" },
+                { nameof(Int64), "number" },
+                { nameof(UInt64), "number" },
+                { nameof(Single), InputType.Text.ToString().ToLowerInvariant() },
+                { nameof(Double), InputType.Text.ToString().ToLowerInvariant() },
+                { nameof(Boolean), InputType.CheckBox.ToString().ToLowerInvariant() },
+                { nameof(Decimal), InputType.Text.ToString().ToLowerInvariant() },
+                { nameof(String), InputType.Text.ToString().ToLowerInvariant() },
+                { nameof(IFormFile), "file" },
+                { TemplateRenderer.IEnumerableOfIFormFileName, "file" },
+            };
+
+        // Mapping from <input/> element's type to RFC 3339 date and time formats.
+        private static readonly Dictionary<string, string> _rfc3339Formats =
+            new Dictionary<string, string>(StringComparer.Ordinal)
+            {
+                { "date", "{0:yyyy-MM-dd}" },
+                { "datetime", @"{0:yyyy-MM-ddTHH\:mm\:ss.fffK}" },
+                { "datetime-local", @"{0:yyyy-MM-ddTHH\:mm\:ss.fff}" },
+                { "time", @"{0:HH\:mm\:ss.fff}" },
+            };
+
+        /// <summary>
+        /// Creates a new <see cref="InputTagHelper"/>.
+        /// </summary>
+        /// <param name="generator">The <see cref="IHtmlGenerator"/>.</param>
+        public InputTagHelper(IHtmlGenerator generator)
+        {
+            Generator = generator;
+        }
+
+        /// <inheritdoc />
+        public override int Order => -1000;
+
+        protected IHtmlGenerator Generator { get; }
+
+        [HtmlAttributeNotBound]
+        [ViewContext]
+        public ViewContext ViewContext { get; set; }
+
+        /// <summary>
+        /// An expression to be evaluated against the current model.
+        /// </summary>
+        [HtmlAttributeName(ForAttributeName)]
+        public ModelExpression For { get; set; }
+
+        /// <summary>
+        /// The format string (see https://msdn.microsoft.com/en-us/library/txafckwd.aspx) used to format the
+        /// <see cref="For"/> result. Sets the generated "value" attribute to that formatted string.
+        /// </summary>
+        /// <remarks>
+        /// Not used if the provided (see <see cref="InputTypeName"/>) or calculated "type" attribute value is
+        /// <c>checkbox</c>, <c>password</c>, or <c>radio</c>. That is, <see cref="Format"/> is used when calling
+        /// <see cref="IHtmlGenerator.GenerateTextBox"/>.
+        /// </remarks>
+        [HtmlAttributeName(FormatAttributeName)]
+        public string Format { get; set; }
+
+        /// <summary>
+        /// The type of the &lt;input&gt; element.
+        /// </summary>
+        /// <remarks>
+        /// Passed through to the generated HTML in all cases. Also used to determine the <see cref="IHtmlGenerator"/>
+        /// helper to call and the default <see cref="Format"/> value. A default <see cref="Format"/> is not calculated
+        /// if the provided (see <see cref="InputTypeName"/>) or calculated "type" attribute value is <c>checkbox</c>,
+        /// <c>hidden</c>, <c>password</c>, or <c>radio</c>.
+        /// </remarks>
+        [HtmlAttributeName("type")]
+        public string InputTypeName { get; set; }
+
+        /// <summary>
+        /// The name of the &lt;input&gt; element.
+        /// </summary>
+        /// <remarks>
+        /// Passed through to the generated HTML in all cases. Also used to determine whether <see cref="For"/> is
+        /// valid with an empty <see cref="ModelExpression.Name"/>.
+        /// </remarks>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// The value of the &lt;input&gt; element.
+        /// </summary>
+        /// <remarks>
+        /// Passed through to the generated HTML in all cases. Also used to determine the generated "checked" attribute
+        /// if <see cref="InputTypeName"/> is "radio". Must not be <c>null</c> in that case.
+        /// </remarks>
+        public string Value { get; set; }
+
+        /// <inheritdoc />
+        /// <remarks>Does nothing if <see cref="For"/> is <c>null</c>.</remarks>
+        /// <exception cref="InvalidOperationException">
+        /// Thrown if <see cref="Format"/> is non-<c>null</c> but <see cref="For"/> is <c>null</c>.
+        /// </exception>
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (output == null)
+            {
+                throw new ArgumentNullException(nameof(output));
+            }
+
+            // Pass through attributes that are also well-known HTML attributes. Must be done prior to any copying
+            // from a TagBuilder.
+            if (InputTypeName != null)
+            {
+                output.CopyHtmlAttribute("type", context);
+            }
+
+            if (Name != null)
+            {
+                output.CopyHtmlAttribute(nameof(Name), context);
+            }
+
+            if (Value != null)
+            {
+                output.CopyHtmlAttribute(nameof(Value), context);
+            }
+
+            // Note null or empty For.Name is allowed because TemplateInfo.HtmlFieldPrefix may be sufficient.
+            // IHtmlGenerator will enforce name requirements.
+            var metadata = For.Metadata;
+            var modelExplorer = For.ModelExplorer;
+            if (metadata == null)
+            {
+                throw new InvalidOperationException(Resources.FormatTagHelpers_NoProvidedMetadata(
+                    "<input>",
+                    ForAttributeName,
+                    nameof(IModelMetadataProvider),
+                    For.Name));
+            }
+
+            string inputType;
+            string inputTypeHint;
+            if (string.IsNullOrEmpty(InputTypeName))
+            {
+                // Note GetInputType never returns null.
+                inputType = GetInputType(modelExplorer, out inputTypeHint);
+            }
+            else
+            {
+                inputType = InputTypeName.ToLowerInvariant();
+                inputTypeHint = null;
+            }
+
+            // inputType may be more specific than default the generator chooses below.
+            if (!output.Attributes.ContainsName("type"))
+            {
+                output.Attributes.SetAttribute("type", inputType);
+            }
+
+            // Ensure Generator does not throw due to empty "fullName" if user provided a name attribute.
+            IDictionary<string, object> htmlAttributes = null;
+            if (string.IsNullOrEmpty(For.Name) &&
+                string.IsNullOrEmpty(ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix) &&
+                !string.IsNullOrEmpty(Name))
+            {
+                htmlAttributes = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase)
+                {
+                    { "name", Name },
+                };
+            }
+
+            TagBuilder tagBuilder;
+            switch (inputType)
+            {
+                case "hidden":
+                    tagBuilder = GenerateHidden(modelExplorer, htmlAttributes);
+                    break;
+
+                case "checkbox":
+                    tagBuilder = GenerateCheckBox(modelExplorer, output, htmlAttributes);
+                    break;
+
+                case "password":
+                    tagBuilder = Generator.GeneratePassword(
+                        ViewContext,
+                        modelExplorer,
+                        For.Name,
+                        value: null,
+                        htmlAttributes: htmlAttributes);
+                    break;
+
+                case "radio":
+                    tagBuilder = GenerateRadio(modelExplorer, htmlAttributes);
+                    break;
+
+                default:
+                    tagBuilder = GenerateTextBox(modelExplorer, inputTypeHint, inputType, htmlAttributes);
+                    break;
+            }
+
+            if (tagBuilder != null)
+            {
+                // This TagBuilder contains the one <input/> element of interest.
+                output.MergeAttributes(tagBuilder);
+                if (tagBuilder.HasInnerHtml)
+                {
+                    // Since this is not the "checkbox" special-case, no guarantee that output is a self-closing
+                    // element. A later tag helper targeting this element may change output.TagMode.
+                    output.Content.AppendHtml(tagBuilder.InnerHtml);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets an &lt;input&gt; element's "type" attribute value based on the given <paramref name="modelExplorer"/>
+        /// or <see cref="InputType"/>.
+        /// </summary>
+        /// <param name="modelExplorer">The <see cref="ModelExplorer"/> to use.</param>
+        /// <param name="inputTypeHint">When this method returns, contains the string, often the name of a
+        /// <see cref="ModelMetadata.ModelType"/> base class, used to determine this method's return value.</param>
+        /// <returns>An &lt;input&gt; element's "type" attribute value.</returns>
+        protected string GetInputType(ModelExplorer modelExplorer, out string inputTypeHint)
+        {
+            foreach (var hint in GetInputTypeHints(modelExplorer))
+            {
+                if (_defaultInputTypes.TryGetValue(hint, out var inputType))
+                {
+                    inputTypeHint = hint;
+                    return inputType;
+                }
+            }
+
+            inputTypeHint = InputType.Text.ToString().ToLowerInvariant();
+            return inputTypeHint;
+        }
+
+        private TagBuilder GenerateCheckBox(
+            ModelExplorer modelExplorer,
+            TagHelperOutput output,
+            IDictionary<string, object> htmlAttributes)
+        {
+            if (modelExplorer.ModelType == typeof(string))
+            {
+                if (modelExplorer.Model != null)
+                {
+                    if (!bool.TryParse(modelExplorer.Model.ToString(), out var potentialBool))
+                    {
+                        throw new InvalidOperationException(Resources.FormatInputTagHelper_InvalidStringResult(
+                            ForAttributeName,
+                            modelExplorer.Model.ToString(),
+                            typeof(bool).FullName));
+                    }
+                }
+            }
+            else if (modelExplorer.ModelType != typeof(bool))
+            {
+                throw new InvalidOperationException(Resources.FormatInputTagHelper_InvalidExpressionResult(
+                       "<input>",
+                       ForAttributeName,
+                       modelExplorer.ModelType.FullName,
+                       typeof(bool).FullName,
+                       typeof(string).FullName,
+                       "type",
+                       "checkbox"));
+            }
+
+            // hiddenForCheckboxTag always rendered after the returned element
+            var hiddenForCheckboxTag = Generator.GenerateHiddenForCheckbox(ViewContext, modelExplorer, For.Name);
+            if (hiddenForCheckboxTag != null)
+            {
+                var renderingMode =
+                    output.TagMode == TagMode.SelfClosing ? TagRenderMode.SelfClosing : TagRenderMode.StartTag;
+                hiddenForCheckboxTag.TagRenderMode = renderingMode;
+                if (!hiddenForCheckboxTag.Attributes.ContainsKey("name") &&
+                    !string.IsNullOrEmpty(Name))
+                {
+                    // The checkbox and hidden elements should have the same name attribute value. Attributes will
+                    // match if both are present because both have a generated value. Reach here in the special case
+                    // where user provided a non-empty fallback name.
+                    hiddenForCheckboxTag.MergeAttribute("name", Name);
+                }
+
+                if (ViewContext.FormContext.CanRenderAtEndOfForm)
+                {
+                    ViewContext.FormContext.EndOfFormContent.Add(hiddenForCheckboxTag);
+                }
+                else
+                {
+                    output.PostElement.AppendHtml(hiddenForCheckboxTag);
+                }
+            }
+
+            return Generator.GenerateCheckBox(
+                ViewContext,
+                modelExplorer,
+                For.Name,
+                isChecked: null,
+                htmlAttributes: htmlAttributes);
+        }
+
+        private TagBuilder GenerateRadio(ModelExplorer modelExplorer, IDictionary<string, object> htmlAttributes)
+        {
+            // Note empty string is allowed.
+            if (Value == null)
+            {
+                throw new InvalidOperationException(Resources.FormatInputTagHelper_ValueRequired(
+                    "<input>",
+                    nameof(Value).ToLowerInvariant(),
+                    "type",
+                    "radio"));
+            }
+
+            return Generator.GenerateRadioButton(
+                ViewContext,
+                modelExplorer,
+                For.Name,
+                Value,
+                isChecked: null,
+                htmlAttributes: htmlAttributes);
+        }
+
+        private TagBuilder GenerateTextBox(
+            ModelExplorer modelExplorer,
+            string inputTypeHint,
+            string inputType,
+            IDictionary<string, object> htmlAttributes)
+        {
+            var format = Format;
+            if (string.IsNullOrEmpty(format))
+            {
+                if (!modelExplorer.Metadata.HasNonDefaultEditFormat &&
+                    string.Equals("week", inputType, StringComparison.OrdinalIgnoreCase) &&
+                    (modelExplorer.Model is DateTime || modelExplorer.Model is DateTimeOffset))
+                {
+                    modelExplorer = modelExplorer.GetExplorerForModel(FormatWeekHelper.GetFormattedWeek(modelExplorer));
+                }
+                else
+                {
+                    format = GetFormat(modelExplorer, inputTypeHint, inputType);
+                }
+            }
+
+            if (htmlAttributes == null)
+            {
+                htmlAttributes = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+            }
+
+            htmlAttributes["type"] = inputType;
+            if (string.Equals(inputType, "file") &&
+                string.Equals(
+                    inputTypeHint,
+                    TemplateRenderer.IEnumerableOfIFormFileName,
+                    StringComparison.OrdinalIgnoreCase))
+            {
+                htmlAttributes["multiple"] = "multiple";
+            }
+
+            return Generator.GenerateTextBox(
+                ViewContext,
+                modelExplorer,
+                For.Name,
+                modelExplorer.Model,
+                format,
+                htmlAttributes);
+        }
+
+        // Imitate Generator.GenerateHidden() using Generator.GenerateTextBox(). This adds support for asp-format that
+        // is not available in Generator.GenerateHidden().
+        private TagBuilder GenerateHidden(ModelExplorer modelExplorer, IDictionary<string, object> htmlAttributes)
+        {
+            var value = For.Model;
+            if (value is byte[] byteArrayValue)
+            {
+                value = Convert.ToBase64String(byteArrayValue);
+            }
+
+            if (htmlAttributes == null)
+            {
+                htmlAttributes = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+            }
+
+            // In DefaultHtmlGenerator(), GenerateTextBox() calls GenerateInput() _almost_ identically to how
+            // GenerateHidden() does and the main switch inside GenerateInput() handles InputType.Text and
+            // InputType.Hidden identically. No behavior differences at all when a type HTML attribute already exists.
+            htmlAttributes["type"] = "hidden";
+
+            return Generator.GenerateTextBox(ViewContext, modelExplorer, For.Name, value, Format, htmlAttributes);
+        }
+
+        // Get a fall-back format based on the metadata.
+        private string GetFormat(ModelExplorer modelExplorer, string inputTypeHint, string inputType)
+        {
+            string format;
+            if (string.Equals("month", inputType, StringComparison.OrdinalIgnoreCase))
+            {
+                // "month" is a new HTML5 input type that only will be rendered in Rfc3339 mode
+                format = "{0:yyyy-MM}";
+            }
+            else if (string.Equals("decimal", inputTypeHint, StringComparison.OrdinalIgnoreCase) &&
+                string.Equals("text", inputType, StringComparison.Ordinal) &&
+                string.IsNullOrEmpty(modelExplorer.Metadata.EditFormatString))
+            {
+                // Decimal data is edited using an <input type="text"/> element, with a reasonable format.
+                // EditFormatString has precedence over this fall-back format.
+                format = "{0:0.00}";
+            }
+            else if (ViewContext.Html5DateRenderingMode == Html5DateRenderingMode.Rfc3339 &&
+                !modelExplorer.Metadata.HasNonDefaultEditFormat &&
+                (typeof(DateTime) == modelExplorer.Metadata.UnderlyingOrModelType ||
+                 typeof(DateTimeOffset) == modelExplorer.Metadata.UnderlyingOrModelType))
+            {
+                // Rfc3339 mode _may_ override EditFormatString in a limited number of cases. Happens only when
+                // EditFormatString has a default format i.e. came from a [DataType] attribute.
+                if (string.Equals("text", inputType) &&
+                    string.Equals(nameof(DateTimeOffset), inputTypeHint, StringComparison.OrdinalIgnoreCase))
+                {
+                    // Auto-select a format that round-trips Offset and sub-Second values in a DateTimeOffset. Not
+                    // done if user chose the "text" type in .cshtml file or with data annotations i.e. when
+                    // inputTypeHint==null or "text".
+                    format = _rfc3339Formats["datetime"];
+                }
+                else if (_rfc3339Formats.TryGetValue(inputType, out var rfc3339Format))
+                {
+                    format = rfc3339Format;
+                }
+                else
+                {
+                    // Otherwise use default EditFormatString.
+                    format = modelExplorer.Metadata.EditFormatString;
+                }
+            }
+            else
+            {
+                // Otherwise use EditFormatString, if any.
+                format = modelExplorer.Metadata.EditFormatString;
+            }
+
+            return format;
+        }
+
+        // A variant of TemplateRenderer.GetViewNames(). Main change relates to bool? handling.
+        private static IEnumerable<string> GetInputTypeHints(ModelExplorer modelExplorer)
+        {
+            if (!string.IsNullOrEmpty(modelExplorer.Metadata.TemplateHint))
+            {
+                yield return modelExplorer.Metadata.TemplateHint;
+            }
+
+            if (!string.IsNullOrEmpty(modelExplorer.Metadata.DataTypeName))
+            {
+                yield return modelExplorer.Metadata.DataTypeName;
+            }
+
+            // In most cases, we don't want to search for Nullable<T>. We want to search for T, which should handle
+            // both T and Nullable<T>. However we special-case bool? to avoid turning an <input/> into a <select/>.
+            var fieldType = modelExplorer.ModelType;
+            if (typeof(bool?) != fieldType)
+            {
+                fieldType = modelExplorer.Metadata.UnderlyingOrModelType;
+            }
+
+            foreach (var typeName in TemplateRenderer.GetTypeNames(modelExplorer.Metadata, fieldType))
+            {
+                yield return typeName;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/AttributeMatcher.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/AttributeMatcher.cs
new file mode 100644
index 0000000000..5caa08dc5b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/AttributeMatcher.cs
@@ -0,0 +1,94 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
+{
+    /// <summary>
+    /// Methods for determining how an <see cref="ITagHelper"/> should run based on the attributes that were specified.
+    /// </summary>
+    public static class AttributeMatcher
+    {
+        /// <summary>
+        /// Determines the most effective mode a <see cref="ITagHelper" /> can run in based on which modes have
+        /// all their required attributes present.
+        /// </summary>
+        /// <typeparam name="TMode">The type representing the <see cref="ITagHelper" />'s modes.</typeparam>
+        /// <param name="context">The <see cref="TagHelperContext"/>.</param>
+        /// <param name="modeInfos">The modes and their required attributes.</param>
+        /// <param name="compare">A comparer delegate.</param>
+        /// <param name="result">The resulting most effective mode.</param>
+        /// <returns><c>true</c> if a mode was determined, otherwise <c>false</c>.</returns>
+        public static bool TryDetermineMode<TMode>(
+            TagHelperContext context,
+            IReadOnlyList<ModeAttributes<TMode>> modeInfos,
+            Func<TMode, TMode, int> compare,
+            out TMode result)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (modeInfos == null)
+            {
+                throw new ArgumentNullException(nameof(modeInfos));
+            }
+
+            if (compare == null)
+            {
+                throw new ArgumentNullException(nameof(compare));
+            }
+
+            var foundResult = false;
+            result = default(TMode);
+
+            // Perf: Avoid allocating enumerator
+            for (var i = 0; i < modeInfos.Count; i++)
+            {
+                var modeInfo = modeInfos[i];
+                if (!HasMissingAttributes(context, modeInfo.Attributes) &&
+                    compare(result, modeInfo.Mode) <= 0)
+                {
+                    foundResult = true;
+                    result = modeInfo.Mode;
+                }
+            }
+
+            return foundResult;
+        }
+
+        private static bool HasMissingAttributes(TagHelperContext context, string[] requiredAttributes)
+        {
+            if (context.AllAttributes.Count < requiredAttributes.Length)
+            {
+                // If there are fewer attributes present than required, one or more of them must be missing.
+                return true;
+            }
+
+            // Check for all attribute values
+            // Perf: Avoid allocating enumerator
+            for (var i = 0; i < requiredAttributes.Length; i++)
+            {
+                TagHelperAttribute attribute;
+                if (!context.AllAttributes.TryGetAttribute(requiredAttributes[i], out attribute))
+                {
+                    // Missing attribute.
+                    return true;
+                }
+
+                var valueAsString = attribute.Value as string;
+                if (valueAsString != null && string.IsNullOrEmpty(valueAsString))
+                {
+                    // Treat attributes with empty values as missing.
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/CacheTagHelperMemoryCacheFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/CacheTagHelperMemoryCacheFactory.cs
new file mode 100644
index 0000000000..7239f80260
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/CacheTagHelperMemoryCacheFactory.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
+{
+    public class CacheTagHelperMemoryCacheFactory
+    {
+        public CacheTagHelperMemoryCacheFactory(IOptions<CacheTagHelperOptions> options)
+        {
+            Cache = new MemoryCache(new MemoryCacheOptions
+            {
+                SizeLimit = options.Value.SizeLimit
+            });
+        }
+
+        // For testing only.
+        internal CacheTagHelperMemoryCacheFactory(IMemoryCache cache)
+        {
+            Cache = cache;
+        }
+
+        public IMemoryCache Cache { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/CryptographyAlgorithms.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/CryptographyAlgorithms.cs
new file mode 100644
index 0000000000..02c28552e1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/CryptographyAlgorithms.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using System.Security.Cryptography;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
+{
+    public static class CryptographyAlgorithms
+    {
+        public static SHA256 CreateSHA256()
+        {
+            try
+            {
+                return SHA256.Create();
+            }
+            // SHA256.Create is documented to throw this exception on FIPS compliant machines.
+            // See: https://msdn.microsoft.com/en-us/library/z08hz7ad%28v=vs.110%29.aspx?f=255&MSPPError=-2147217396
+            catch (System.Reflection.TargetInvocationException)
+            {
+                // Fallback to a FIPS compliant SHA256 algorithm.
+                return new SHA256CryptoServiceProvider();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/CurrentValues.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/CurrentValues.cs
new file mode 100644
index 0000000000..6126d91507
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/CurrentValues.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
+{
+    public class CurrentValues
+    {
+        public CurrentValues(ICollection<string> values)
+        {
+            Debug.Assert(values != null);
+            Values = values;
+        }
+
+        public ICollection<string> Values { get; }
+
+        public ICollection<string> ValuesAndEncodedValues { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/FileProviderGlobbingDirectory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/FileProviderGlobbingDirectory.cs
new file mode 100644
index 0000000000..c2d0bf6227
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/FileProviderGlobbingDirectory.cs
@@ -0,0 +1,99 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
+{
+    public class FileProviderGlobbingDirectory : DirectoryInfoBase
+    {
+        private const char DirectorySeparatorChar = '/';
+        private readonly IFileProvider _fileProvider;
+        private readonly IFileInfo _fileInfo;
+        private readonly FileProviderGlobbingDirectory _parent;
+        private readonly bool _isRoot;
+
+        public FileProviderGlobbingDirectory(
+            IFileProvider fileProvider,
+            IFileInfo fileInfo,
+            FileProviderGlobbingDirectory parent)
+        {
+            if (fileProvider == null)
+            {
+                throw new ArgumentNullException(nameof(fileProvider));
+            }
+
+            _fileProvider = fileProvider;
+            _fileInfo = fileInfo;
+            _parent = parent;
+
+            if (_fileInfo == null)
+            {
+                // We're the root of the directory tree
+                RelativePath = string.Empty;
+                _isRoot = true;
+            }
+            else if (!string.IsNullOrEmpty(parent?.RelativePath))
+            {
+                // We have a parent and they have a relative path so concat that with my name
+                RelativePath = _parent.RelativePath + DirectorySeparatorChar + _fileInfo.Name;
+            }
+            else
+            {
+                // We have a parent which is the root, so just use my name
+                RelativePath = _fileInfo.Name;
+            }
+        }
+
+        public string RelativePath { get; }
+
+        public override string FullName
+        {
+            get
+            {
+                if (_isRoot)
+                {
+                    // We're the root, so just use our name
+                    return Name;
+                }
+
+                return _parent.FullName + DirectorySeparatorChar + Name;
+            }
+        }
+
+        public override string Name => _fileInfo?.Name;
+
+        public override DirectoryInfoBase ParentDirectory => _parent;
+
+        public override IEnumerable<FileSystemInfoBase> EnumerateFileSystemInfos()
+        {
+            foreach (var fileInfo in _fileProvider.GetDirectoryContents(RelativePath))
+            {
+                yield return BuildFileResult(fileInfo);
+            }
+        }
+
+        public override DirectoryInfoBase GetDirectory(string path)
+        {
+            return new FileProviderGlobbingDirectory(_fileProvider, _fileProvider.GetFileInfo(path), this);
+        }
+
+        public override FileInfoBase GetFile(string path)
+        {
+            return new FileProviderGlobbingFile(_fileProvider.GetFileInfo(path), this);
+        }
+
+        private FileSystemInfoBase BuildFileResult(IFileInfo fileInfo)
+        {
+            if (fileInfo.IsDirectory)
+            {
+                return new FileProviderGlobbingDirectory(_fileProvider, fileInfo, this);
+            }
+
+            return new FileProviderGlobbingFile(fileInfo, this);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/FileProviderGlobbingFile.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/FileProviderGlobbingFile.cs
new file mode 100644
index 0000000000..2696781c8c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/FileProviderGlobbingFile.cs
@@ -0,0 +1,37 @@
+// 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.
+
+using System;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
+{
+    public class FileProviderGlobbingFile : FileInfoBase
+    {
+        private const char DirectorySeparatorChar = '/';
+
+        public FileProviderGlobbingFile(IFileInfo fileInfo, DirectoryInfoBase parent)
+        {
+            if (fileInfo == null)
+            {
+                throw new ArgumentNullException(nameof(fileInfo));
+            }
+
+            if (parent == null)
+            {
+                throw new ArgumentNullException(nameof(parent));
+            }
+
+            Name = fileInfo.Name;
+            ParentDirectory = parent;
+            FullName = ParentDirectory.FullName + DirectorySeparatorChar + Name;
+        }
+
+        public override string FullName { get; }
+
+        public override string Name { get; }
+
+        public override DirectoryInfoBase ParentDirectory { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/FileVersionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/FileVersionProvider.cs
new file mode 100644
index 0000000000..19bdf34d09
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/FileVersionProvider.cs
@@ -0,0 +1,123 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.FileProviders;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
+{
+    /// <summary>
+    /// Provides version hash for a specified file.
+    /// </summary>
+    public class FileVersionProvider
+    {
+        private const string VersionKey = "v";
+        private static readonly char[] QueryStringAndFragmentTokens = new [] { '?', '#' };
+        private readonly IFileProvider _fileProvider;
+        private readonly IMemoryCache _cache;
+        private readonly PathString _requestPathBase;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="FileVersionProvider"/>.
+        /// </summary>
+        /// <param name="fileProvider">The file provider to get and watch files.</param>
+        /// <param name="cache"><see cref="IMemoryCache"/> where versioned urls of files are cached.</param>
+        /// <param name="requestPathBase">The base path for the current HTTP request.</param>
+        public FileVersionProvider(
+            IFileProvider fileProvider,
+            IMemoryCache cache,
+            PathString requestPathBase)
+        {
+            if (fileProvider == null)
+            {
+                throw new ArgumentNullException(nameof(fileProvider));
+            }
+
+            if (cache == null)
+            {
+                throw new ArgumentNullException(nameof(cache));
+            }
+
+            _fileProvider = fileProvider;
+            _cache = cache;
+            _requestPathBase = requestPathBase;
+        }
+
+        /// <summary>
+        /// Adds version query parameter to the specified file path.
+        /// </summary>
+        /// <param name="path">The path of the file to which version should be added.</param>
+        /// <returns>Path containing the version query string.</returns>
+        /// <remarks>
+        /// The version query string is appended with the key "v".
+        /// </remarks>
+        public string AddFileVersionToPath(string path)
+        {
+            if (path == null)
+            {
+                throw new ArgumentNullException(nameof(path));
+            }
+
+            var resolvedPath = path;
+
+            var queryStringOrFragmentStartIndex = path.IndexOfAny(QueryStringAndFragmentTokens);
+            if (queryStringOrFragmentStartIndex != -1)
+            {
+                resolvedPath = path.Substring(0, queryStringOrFragmentStartIndex);
+            }
+
+            Uri uri;
+            if (Uri.TryCreate(resolvedPath, UriKind.Absolute, out uri) && !uri.IsFile)
+            {
+                // Don't append version if the path is absolute.
+                return path;
+            }
+
+            string value;
+            if (!_cache.TryGetValue(path, out value))
+            {
+                var cacheEntryOptions = new MemoryCacheEntryOptions();
+                cacheEntryOptions.AddExpirationToken(_fileProvider.Watch(resolvedPath));
+                var fileInfo = _fileProvider.GetFileInfo(resolvedPath);
+
+                if (!fileInfo.Exists &&
+                    _requestPathBase.HasValue &&
+                    resolvedPath.StartsWith(_requestPathBase.Value, StringComparison.OrdinalIgnoreCase))
+                {
+                    var requestPathBaseRelativePath = resolvedPath.Substring(_requestPathBase.Value.Length);
+                    cacheEntryOptions.AddExpirationToken(_fileProvider.Watch(requestPathBaseRelativePath));
+                    fileInfo = _fileProvider.GetFileInfo(requestPathBaseRelativePath);
+                }
+
+                if (fileInfo.Exists)
+                {
+                    value = QueryHelpers.AddQueryString(path, VersionKey, GetHashForFile(fileInfo));
+                }
+                else
+                {
+                    // if the file is not in the current server.
+                    value = path;
+                }
+
+                value = _cache.Set(path, value, cacheEntryOptions);
+            }
+
+            return value;
+        }
+
+        private static string GetHashForFile(IFileInfo fileInfo)
+        {
+            using (var sha256 = CryptographyAlgorithms.CreateSHA256())
+            {
+                using (var readStream = fileInfo.CreateReadStream())
+                {
+                    var hash = sha256.ComputeHash(readStream);
+                    return WebEncoders.Base64UrlEncode(hash);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/GlobbingUrlBuilder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/GlobbingUrlBuilder.cs
new file mode 100644
index 0000000000..8464d0bc90
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/GlobbingUrlBuilder.cs
@@ -0,0 +1,380 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.FileSystemGlobbing;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
+{
+    /// <summary>
+    /// Utility methods for <see cref="AspNetCore.Razor.TagHelpers.ITagHelper"/>'s that support
+    /// attributes containing file globbing patterns.
+    /// </summary>
+    public class GlobbingUrlBuilder
+    {
+        // Valid whitespace characters defined by the HTML5 spec.
+        private static readonly char[] ValidAttributeWhitespaceChars =
+            new[] { '\t', '\n', '\u000C', '\r', ' ' };
+        private static readonly PathComparer DefaultPathComparer = new PathComparer();
+        private static readonly char[] PatternSeparator = new[] { ',' };
+        private static readonly char[] PathSeparator = new[] { '/' };
+        private readonly FileProviderGlobbingDirectory _baseGlobbingDirectory;
+
+        /// <summary>
+        /// Creates a new <see cref="GlobbingUrlBuilder"/>.
+        /// </summary>
+        /// <param name="fileProvider">The file provider.</param>
+        /// <param name="cache">The cache.</param>
+        /// <param name="requestPathBase">The request path base.</param>
+        public GlobbingUrlBuilder(IFileProvider fileProvider, IMemoryCache cache, PathString requestPathBase)
+        {
+            if (fileProvider == null)
+            {
+                throw new ArgumentNullException(nameof(fileProvider));
+            }
+
+            if (cache == null)
+            {
+                throw new ArgumentNullException(nameof(cache));
+            }
+
+            FileProvider = fileProvider;
+            Cache = cache;
+            RequestPathBase = requestPathBase;
+            _baseGlobbingDirectory = new FileProviderGlobbingDirectory(fileProvider, fileInfo: null, parent: null);
+        }
+
+        /// <summary>
+        /// The <see cref="IMemoryCache"/> to cache globbing results in.
+        /// </summary>
+        public IMemoryCache Cache { get; }
+
+        /// <summary>
+        /// The <see cref="IFileProvider"/> used to watch for changes to file globbing results.
+        /// </summary>
+        public IFileProvider FileProvider { get; }
+
+        /// <summary>
+        /// The base path of the current request (i.e. <see cref="HttpRequest.PathBase"/>).
+        /// </summary>
+        public PathString RequestPathBase { get; }
+
+        // Internal for testing.
+        internal Func<Matcher> MatcherBuilder { get; set; }
+
+        /// <summary>
+        /// Builds a list of URLs.
+        /// </summary>
+        /// <param name="staticUrl">The statically declared URL. This will always be added to the result.</param>
+        /// <param name="includePattern">The file globbing include pattern.</param>
+        /// <param name="excludePattern">The file globbing exclude pattern.</param>
+        /// <returns>The list of URLs</returns>
+        public virtual IReadOnlyList<string> BuildUrlList(
+            string staticUrl,
+            string includePattern,
+            string excludePattern)
+        {
+            // Get urls that match the globbing patterns specified
+            var globbedUrls = ExpandGlobbedUrl(includePattern, excludePattern);
+
+            if (staticUrl == null)
+            {
+                return globbedUrls;
+            }
+
+            // The staticUrl always appears first in the sequence.
+            var urls = new List<string>(1 + globbedUrls.Count)
+            {
+                staticUrl
+            };
+
+            for (var i = 0; i < globbedUrls.Count; i++)
+            {
+                if (!string.Equals(staticUrl, globbedUrls[i], StringComparison.Ordinal))
+                {
+                    urls.Add(globbedUrls[i]);
+                }
+            }
+
+            return urls;
+        }
+
+        private IReadOnlyList<string> ExpandGlobbedUrl(string include, string exclude)
+        {
+            if (string.IsNullOrEmpty(include))
+            {
+                return Array.Empty<string>();
+            }
+
+            var cacheKey = new GlobbingUrlKey(include, exclude);
+            List<string> files;
+            if (Cache.TryGetValue(cacheKey, out files))
+            {
+                return files;
+            }
+
+            var includeTokenizer = new StringTokenizer(include, PatternSeparator);
+            var includeEnumerator = includeTokenizer.GetEnumerator();
+            if (!includeEnumerator.MoveNext())
+            {
+                return Array.Empty<string>();
+            }
+
+            var options = new MemoryCacheEntryOptions();
+            var trimmedIncludePatterns = new List<string>();
+            foreach (var includePattern in includeTokenizer)
+            {
+                var changeToken = FileProvider.Watch(includePattern.Value);
+                options.AddExpirationToken(changeToken);
+                trimmedIncludePatterns.Add(NormalizePath(includePattern));
+            }
+            var matcher = MatcherBuilder != null ? MatcherBuilder() : new Matcher();
+            matcher.AddIncludePatterns(trimmedIncludePatterns);
+
+            if (!string.IsNullOrWhiteSpace(exclude))
+            {
+                var excludeTokenizer = new StringTokenizer(exclude, PatternSeparator);
+                var trimmedExcludePatterns = new List<string>();
+                foreach (var excludePattern in excludeTokenizer)
+                {
+                    trimmedExcludePatterns.Add(NormalizePath(excludePattern));
+                }
+                matcher.AddExcludePatterns(trimmedExcludePatterns);
+            }
+
+            return Cache.Set(
+                cacheKey,
+                FindFiles(matcher),
+                options);
+        }
+
+        private List<string> FindFiles(Matcher matcher)
+        {
+            var matches = matcher.Execute(_baseGlobbingDirectory);
+            var matchedUrls = new List<string>();
+            foreach (var matchedPath in matches.Files)
+            {
+                // Resolve the path to site root
+                var relativePath = new PathString("/" + matchedPath.Path);
+                var matchedUrl = RequestPathBase.Add(relativePath).ToString();
+                var index = matchedUrls.BinarySearch(matchedUrl, DefaultPathComparer);
+                if (index < 0)
+                {
+                    // Item doesn't already exist. Insert it.
+                    matchedUrls.Insert(~index, matchedUrl);
+                }
+            }
+
+            return matchedUrls;
+        }
+
+        private class PathComparer : IComparer<string>
+        {
+            public int Compare(string x, string y)
+            {
+                // < 0 = x < y
+                // > 0 = x > y
+
+                if (string.Equals(x, y, StringComparison.Ordinal))
+                {
+                    return 0;
+                }
+
+                if (string.IsNullOrEmpty(x) || string.IsNullOrEmpty(y))
+                {
+                    return string.Compare(x, y, StringComparison.Ordinal);
+                }
+
+                var xExtIndex = x.LastIndexOf('.');
+                var yExtIndex = y.LastIndexOf('.');
+
+                // Ensure extension index is in the last segment, i.e. in the file name
+                var xSlashIndex = x.LastIndexOf('/');
+                var ySlashIndex = y.LastIndexOf('/');
+                xExtIndex = xExtIndex > xSlashIndex ? xExtIndex : -1;
+                yExtIndex = yExtIndex > ySlashIndex ? yExtIndex : -1;
+
+                // Get paths without their extensions, if they have one
+                var xLength = xExtIndex >= 0 ? xExtIndex : x.Length;
+                var yLength = yExtIndex >= 0 ? yExtIndex : y.Length;
+                var compareLength = Math.Max(xLength, yLength);
+
+                // In the resulting sequence, we want shorter paths to appear prior to longer paths. For paths of equal
+                // depth, we'll compare individual segments. The first segment that differs determines the result.
+                // For e.g.
+                // Foo.cshtml < Foo.xhtml
+                // Bar.cshtml < Foo.cshtml
+                // ZZ/z.txt < A/A/a.txt
+                // ZZ/a/z.txt < ZZ/z/a.txt
+
+                if (string.Compare(x, 0, y, 0, compareLength, StringComparison.Ordinal) == 0)
+                {
+                    // Only extension differs so just compare the extension
+                    if (xExtIndex >= 0 && yExtIndex >= 0)
+                    {
+                        var length = x.Length - xExtIndex;
+                        return string.Compare(x, xExtIndex, y, yExtIndex, length, StringComparison.Ordinal);
+                    }
+
+                    return xExtIndex - yExtIndex;
+                }
+
+                var xNoExt = xExtIndex >= 0 ? x.Substring(0, xExtIndex) : x;
+                var yNoExt = yExtIndex >= 0 ? y.Substring(0, yExtIndex) : y;
+
+                var result = 0;
+                var xEnumerator = new StringTokenizer(xNoExt, PathSeparator).GetEnumerator();
+                var yEnumerator = new StringTokenizer(yNoExt, PathSeparator).GetEnumerator();
+                StringSegment xSegment;
+                StringSegment ySegment;
+                while (TryGetNextSegment(ref xEnumerator, out xSegment))
+                {
+                    if (!TryGetNextSegment(ref yEnumerator, out ySegment))
+                    {
+                        // Different path depths (right is shorter), so shallower path wins.
+                        return 1;
+                    }
+
+                    if (result != 0)
+                    {
+                        // Once we've determined that a segment differs, we need to ensure that the two paths
+                        // are of equal depth.
+                        continue;
+                    }
+
+                    var length = Math.Max(xSegment.Length, ySegment.Length);
+                    result = string.Compare(
+                        xSegment.Buffer,
+                        xSegment.Offset,
+                        ySegment.Buffer,
+                        ySegment.Offset,
+                        length,
+                        StringComparison.Ordinal);
+                }
+
+                if (TryGetNextSegment(ref yEnumerator, out ySegment))
+                {
+                    // Different path depths (left is shorter). Shallower path wins.
+                    return -1;
+                }
+                else
+                {
+                    // Segments are of equal length
+                    return result;
+                }
+            }
+
+            private static bool TryGetNextSegment(ref StringTokenizer.Enumerator enumerator, out StringSegment segment)
+            {
+                while (enumerator.MoveNext())
+                {
+                    if (enumerator.Current.HasValue && enumerator.Current.Length > 0)
+                    {
+                        segment = enumerator.Current;
+                        return true;
+                    }
+                }
+
+                segment = default(StringSegment);
+                return false;
+            }
+        }
+
+        private static string NormalizePath(StringSegment value)
+        {
+            if (!value.HasValue || value.Length == 0)
+            {
+                return null;
+            }
+
+            value = Trim(value);
+            if (value.StartsWith("~/", StringComparison.Ordinal))
+            {
+                value = new StringSegment(value.Buffer, value.Offset + 2, value.Length - 2);
+            }
+            else if (value.StartsWith("/", StringComparison.Ordinal) ||
+                value.StartsWith("\\", StringComparison.Ordinal))
+            {
+                // Trim the leading slash as the matcher runs from the provided root only anyway
+                value = new StringSegment(value.Buffer, value.Offset + 1, value.Length - 1);
+            }
+
+            return value.Value;
+        }
+
+        private static bool IsWhiteSpace(string value, int index)
+        {
+            for (var i = 0; i < ValidAttributeWhitespaceChars.Length; i++)
+            {
+                if (value[index] == ValidAttributeWhitespaceChars[i])
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private static StringSegment Trim(StringSegment value)
+        {
+            var offset = value.Offset;
+            while (offset < value.Offset + value.Length)
+            {
+                if (!IsWhiteSpace(value.Buffer, offset))
+                {
+                    break;
+                }
+
+                offset++;
+            }
+
+            var trimmedEnd = value.Offset + value.Length - 1;
+            while (trimmedEnd >= offset)
+            {
+                if (!IsWhiteSpace(value.Buffer, trimmedEnd))
+                {
+                    break;
+                }
+
+                trimmedEnd--;
+            }
+
+            return new StringSegment(value.Buffer, offset, trimmedEnd - offset + 1);
+        }
+
+        private struct GlobbingUrlKey : IEquatable<GlobbingUrlKey>
+        {
+            public GlobbingUrlKey(string include, string exclude)
+            {
+                Include = include;
+                Exclude = exclude;
+            }
+
+            public string Include { get; }
+
+            public string Exclude { get; }
+
+            public bool Equals(GlobbingUrlKey other)
+            {
+                return string.Equals(Include, other.Include, StringComparison.Ordinal) &&
+                    string.Equals(Exclude, other.Exclude, StringComparison.Ordinal);
+
+            }
+
+            public override int GetHashCode()
+            {
+                var hashCodeCombiner = HashCodeCombiner.Start();
+                hashCodeCombiner.Add(Include);
+                hashCodeCombiner.Add(Exclude);
+
+                return hashCodeCombiner.CombinedHash;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/JavaScriptResources.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/JavaScriptResources.cs
new file mode 100644
index 0000000000..ad0bdf93a4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/JavaScriptResources.cs
@@ -0,0 +1,61 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
+{
+    /// <summary>
+    /// Methods for loading JavaScript from assembly embedded resources.
+    /// </summary>
+    public static class JavaScriptResources
+    {
+        private static readonly Assembly ResourcesAssembly = typeof(JavaScriptResources).GetTypeInfo().Assembly;
+
+        private static readonly ConcurrentDictionary<string, string> Cache =
+            new ConcurrentDictionary<string, string>(StringComparer.Ordinal);
+
+        /// <summary>
+        /// Gets an embedded JavaScript file resource and decodes it for use as a .NET format string.
+        /// </summary>
+        public static string GetEmbeddedJavaScript(string resourceName)
+        {
+            return GetEmbeddedJavaScript(resourceName, ResourcesAssembly.GetManifestResourceStream, Cache);
+        }
+
+        // Internal for testing
+        internal static string GetEmbeddedJavaScript(
+            string resourceName,
+            Func<string, Stream> getManifestResourceStream,
+            ConcurrentDictionary<string, string> cache)
+        {
+            return cache.GetOrAdd(resourceName, key =>
+            {
+                // Load the JavaScript from embedded resource
+                using (var resourceStream = getManifestResourceStream(key))
+                {
+                    Debug.Assert(
+                        resourceStream != null,
+                        "Embedded resource missing. Ensure 'prebuild' script has run.");
+
+                    using (var streamReader = new StreamReader(resourceStream))
+                    {
+                        var script = streamReader.ReadToEnd();
+
+                        return PrepareFormatString(script);
+                    }
+                }
+            });
+        }
+
+        private static string PrepareFormatString(string input)
+        {
+            // Remove final ");". Those characters are in the file only to allow minification.
+            return input.Substring(0, input.Length - 2);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/ModeAttributesOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/ModeAttributesOfT.cs
new file mode 100644
index 0000000000..d5079b7d46
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/ModeAttributesOfT.cs
@@ -0,0 +1,33 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
+{
+    /// <summary>
+    /// A mapping of a <see cref="AspNetCore.Razor.TagHelpers.ITagHelper"/> mode to its required attributes.
+    /// </summary>
+    /// <typeparam name="TMode">The type representing the <see cref="AspNetCore.Razor.TagHelpers.ITagHelper"/>'s mode.</typeparam>
+    public class ModeAttributes<TMode>
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="ModeAttributes{TMode}"/>.
+        /// </summary>
+        /// <param name="mode">The <see cref="AspNetCore.Razor.TagHelpers.ITagHelper"/>'s mode.</param>
+        /// <param name="attributes">The names of attributes required for this mode.</param>
+        public ModeAttributes(TMode mode, string[] attributes)
+        {
+            Mode = mode;
+            Attributes = attributes;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="AspNetCore.Razor.TagHelpers.ITagHelper"/>'s mode.
+        /// </summary>
+        public TMode Mode { get; }
+
+        /// <summary>
+        /// Gets the names of attributes required for this mode.
+        /// </summary>
+        public string[] Attributes { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/MvcTagHelpersLoggerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/MvcTagHelpersLoggerExtensions.cs
new file mode 100644
index 0000000000..1943e1bcb8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Internal/MvcTagHelpersLoggerExtensions.cs
@@ -0,0 +1,26 @@
+// 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.
+
+using System;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
+{
+    internal static class MvcTagHelperLoggerExtensions
+    {
+        private static readonly Action<ILogger, string, Exception> _distributedFormatterDeserializedFailed;
+
+        static MvcTagHelperLoggerExtensions()
+        {
+            _distributedFormatterDeserializedFailed = LoggerMessage.Define<string>(
+                LogLevel.Error,
+                1,
+                "Couldn't deserialize cached value for key {Key}.");
+        }
+
+        public static void DistributedFormatterDeserializationException(this ILogger logger, string key, Exception exception)
+        {
+            _distributedFormatterDeserializedFailed(logger, key, exception);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/LabelTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/LabelTagHelper.cs
new file mode 100644
index 0000000000..b0668eed68
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/LabelTagHelper.cs
@@ -0,0 +1,92 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    /// <summary>
+    /// <see cref="ITagHelper"/> implementation targeting &lt;label&gt; elements with an <c>asp-for</c> attribute.
+    /// </summary>
+    [HtmlTargetElement("label", Attributes = ForAttributeName)]
+    public class LabelTagHelper : TagHelper
+    {
+        private const string ForAttributeName = "asp-for";
+
+        /// <summary>
+        /// Creates a new <see cref="LabelTagHelper"/>.
+        /// </summary>
+        /// <param name="generator">The <see cref="IHtmlGenerator"/>.</param>
+        public LabelTagHelper(IHtmlGenerator generator)
+        {
+            Generator = generator;
+        }
+
+        /// <inheritdoc />
+        public override int Order => -1000;
+
+        [HtmlAttributeNotBound]
+        [ViewContext]
+        public ViewContext ViewContext { get; set; }
+
+        protected IHtmlGenerator Generator { get; }
+
+        /// <summary>
+        /// An expression to be evaluated against the current model.
+        /// </summary>
+        [HtmlAttributeName(ForAttributeName)]
+        public ModelExpression For { get; set; }
+
+        /// <inheritdoc />
+        /// <remarks>Does nothing if <see cref="For"/> is <c>null</c>.</remarks>
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (output == null)
+            {
+                throw new ArgumentNullException(nameof(output));
+            }
+
+            var tagBuilder = Generator.GenerateLabel(
+                ViewContext,
+                For.ModelExplorer,
+                For.Name,
+                labelText: null,
+                htmlAttributes: null);
+
+            if (tagBuilder != null)
+            {
+                output.MergeAttributes(tagBuilder);
+
+                // Do not update the content if another tag helper targeting this element has already done so.
+                if (!output.IsContentModified)
+                {
+                    // We check for whitespace to detect scenarios such as:
+                    // <label for="Name">
+                    // </label>
+                    var childContent = await output.GetChildContentAsync();
+                    if (childContent.IsEmptyOrWhiteSpace)
+                    {
+                        // Provide default label text (if any) since there was nothing useful in the Razor source.
+                        if (tagBuilder.HasInnerHtml)
+                        {
+                            output.Content.SetHtmlContent(tagBuilder.InnerHtml);
+                        }
+                    }
+                    else
+                    {
+                        output.Content.SetHtmlContent(childContent);
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/LinkTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/LinkTagHelper.cs
new file mode 100644
index 0000000000..84655b04be
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/LinkTagHelper.cs
@@ -0,0 +1,535 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.TagHelpers.Internal;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.Caching.Memory;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    /// <summary>
+    /// <see cref="ITagHelper"/> implementation targeting &lt;link&gt; elements that supports fallback href paths.
+    /// </summary>
+    /// <remarks>
+    /// The tag helper won't process for cases with just the 'href' attribute.
+    /// </remarks>
+    [HtmlTargetElement("link", Attributes = HrefIncludeAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("link", Attributes = HrefExcludeAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("link", Attributes = FallbackHrefAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("link", Attributes = FallbackHrefIncludeAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("link", Attributes = FallbackHrefExcludeAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("link", Attributes = FallbackTestClassAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("link", Attributes = FallbackTestPropertyAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("link", Attributes = FallbackTestValueAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    [HtmlTargetElement("link", Attributes = AppendVersionAttributeName, TagStructure = TagStructure.WithoutEndTag)]
+    public class LinkTagHelper : UrlResolutionTagHelper
+    {
+
+        private static readonly string FallbackJavaScriptResourceName =
+            typeof(LinkTagHelper).Namespace + ".compiler.resources.LinkTagHelper_FallbackJavaScript.js";
+
+        private const string HrefIncludeAttributeName = "asp-href-include";
+        private const string HrefExcludeAttributeName = "asp-href-exclude";
+        private const string FallbackHrefAttributeName = "asp-fallback-href";
+        private const string FallbackHrefIncludeAttributeName = "asp-fallback-href-include";
+        private const string FallbackHrefExcludeAttributeName = "asp-fallback-href-exclude";
+        private const string FallbackTestClassAttributeName = "asp-fallback-test-class";
+        private const string FallbackTestPropertyAttributeName = "asp-fallback-test-property";
+        private const string FallbackTestValueAttributeName = "asp-fallback-test-value";
+        private const string AppendVersionAttributeName = "asp-append-version";
+        private const string HrefAttributeName = "href";
+        private const string RelAttributeName = "rel";
+        private static readonly Func<Mode, Mode, int> Compare = (a, b) => a - b;
+
+        private FileVersionProvider _fileVersionProvider;
+
+        private static readonly ModeAttributes<Mode>[] ModeDetails = new[] {
+            // Regular src with file version alone
+            new ModeAttributes<Mode>(Mode.AppendVersion, new[] { AppendVersionAttributeName }),
+            // Globbed Href (include only) no static href
+            new ModeAttributes<Mode>(Mode.GlobbedHref, new [] { HrefIncludeAttributeName }),
+            // Globbed Href (include & exclude), no static href
+            new ModeAttributes<Mode>(Mode.GlobbedHref, new [] { HrefIncludeAttributeName, HrefExcludeAttributeName }),
+            // Fallback with static href
+            new ModeAttributes<Mode>(
+                Mode.Fallback,
+                new[]
+                {
+                    FallbackHrefAttributeName,
+                    FallbackTestClassAttributeName,
+                    FallbackTestPropertyAttributeName,
+                    FallbackTestValueAttributeName
+                }),
+            // Fallback with globbed href (include only)
+            new ModeAttributes<Mode>(
+                Mode.Fallback,
+                new[]
+                {
+                    FallbackHrefIncludeAttributeName,
+                    FallbackTestClassAttributeName,
+                    FallbackTestPropertyAttributeName,
+                    FallbackTestValueAttributeName
+                }),
+            // Fallback with globbed href (include & exclude)
+            new ModeAttributes<Mode>(
+                Mode.Fallback,
+                new[]
+                {
+                    FallbackHrefIncludeAttributeName,
+                    FallbackHrefExcludeAttributeName,
+                    FallbackTestClassAttributeName,
+                    FallbackTestPropertyAttributeName,
+                    FallbackTestValueAttributeName
+                }),
+        };
+        private StringWriter _stringWriter;
+
+        /// <summary>
+        /// Creates a new <see cref="LinkTagHelper"/>.
+        /// </summary>
+        /// <param name="hostingEnvironment">The <see cref="IHostingEnvironment"/>.</param>
+        /// <param name="cache">The <see cref="IMemoryCache"/>.</param>
+        /// <param name="htmlEncoder">The <see cref="HtmlEncoder"/>.</param>
+        /// <param name="javaScriptEncoder">The <see cref="JavaScriptEncoder"/>.</param>
+        /// <param name="urlHelperFactory">The <see cref="IUrlHelperFactory"/>.</param>
+        public LinkTagHelper(
+            IHostingEnvironment hostingEnvironment,
+            IMemoryCache cache,
+            HtmlEncoder htmlEncoder,
+            JavaScriptEncoder javaScriptEncoder,
+            IUrlHelperFactory urlHelperFactory)
+            : base(urlHelperFactory, htmlEncoder)
+        {
+            HostingEnvironment = hostingEnvironment;
+            Cache = cache;
+            JavaScriptEncoder = javaScriptEncoder;
+        }
+
+        /// <inheritdoc />
+        public override int Order => -1000;
+
+        /// <summary>
+        /// Address of the linked resource.
+        /// </summary>
+        /// <remarks>
+        /// Passed through to the generated HTML in all cases.
+        /// </remarks>
+        [HtmlAttributeName(HrefAttributeName)]
+        public string Href { get; set; }
+
+        /// <summary>
+        /// A comma separated list of globbed file patterns of CSS stylesheets to load.
+        /// The glob patterns are assessed relative to the application's 'webroot' setting.
+        /// </summary>
+        [HtmlAttributeName(HrefIncludeAttributeName)]
+        public string HrefInclude { get; set; }
+
+        /// <summary>
+        /// A comma separated list of globbed file patterns of CSS stylesheets to exclude from loading.
+        /// The glob patterns are assessed relative to the application's 'webroot' setting.
+        /// Must be used in conjunction with <see cref="HrefInclude"/>.
+        /// </summary>
+        [HtmlAttributeName(HrefExcludeAttributeName)]
+        public string HrefExclude { get; set; }
+
+        /// <summary>
+        /// The URL of a CSS stylesheet to fallback to in the case the primary one fails.
+        /// </summary>
+        [HtmlAttributeName(FallbackHrefAttributeName)]
+        public string FallbackHref { get; set; }
+
+        /// <summary>
+        /// Value indicating if file version should be appended to the href urls.
+        /// </summary>
+        /// <remarks>
+        /// If <c>true</c> then a query string "v" with the encoded content of the file is added.
+        /// </remarks>
+        [HtmlAttributeName(AppendVersionAttributeName)]
+        public bool? AppendVersion { get; set; }
+
+        /// <summary>
+        /// A comma separated list of globbed file patterns of CSS stylesheets to fallback to in the case the primary
+        /// one fails.
+        /// The glob patterns are assessed relative to the application's 'webroot' setting.
+        /// </summary>
+        [HtmlAttributeName(FallbackHrefIncludeAttributeName)]
+        public string FallbackHrefInclude { get; set; }
+
+        /// <summary>
+        /// A comma separated list of globbed file patterns of CSS stylesheets to exclude from the fallback list, in
+        /// the case the primary one fails.
+        /// The glob patterns are assessed relative to the application's 'webroot' setting.
+        /// Must be used in conjunction with <see cref="FallbackHrefInclude"/>.
+        /// </summary>
+        [HtmlAttributeName(FallbackHrefExcludeAttributeName)]
+        public string FallbackHrefExclude { get; set; }
+
+        /// <summary>
+        /// The class name defined in the stylesheet to use for the fallback test.
+        /// Must be used in conjunction with <see cref="FallbackTestProperty"/> and <see cref="FallbackTestValue"/>,
+        /// and either <see cref="FallbackHref"/> or <see cref="FallbackHrefInclude"/>.
+        /// </summary>
+        [HtmlAttributeName(FallbackTestClassAttributeName)]
+        public string FallbackTestClass { get; set; }
+
+        /// <summary>
+        /// The CSS property name to use for the fallback test.
+        /// Must be used in conjunction with <see cref="FallbackTestClass"/> and <see cref="FallbackTestValue"/>,
+        /// and either <see cref="FallbackHref"/> or <see cref="FallbackHrefInclude"/>.
+        /// </summary>
+        [HtmlAttributeName(FallbackTestPropertyAttributeName)]
+        public string FallbackTestProperty { get; set; }
+
+        /// <summary>
+        /// The CSS property value to use for the fallback test.
+        /// Must be used in conjunction with <see cref="FallbackTestClass"/> and <see cref="FallbackTestProperty"/>,
+        /// and either <see cref="FallbackHref"/> or <see cref="FallbackHrefInclude"/>.
+        /// </summary>
+        [HtmlAttributeName(FallbackTestValueAttributeName)]
+        public string FallbackTestValue { get; set; }
+
+        protected IHostingEnvironment HostingEnvironment { get; }
+
+        protected IMemoryCache Cache { get; }
+
+        protected JavaScriptEncoder JavaScriptEncoder { get; }
+
+        // Internal for ease of use when testing.
+        protected internal GlobbingUrlBuilder GlobbingUrlBuilder { get; set; }
+
+        // Shared writer for determining the string content of a TagHelperAttribute's Value.
+        private StringWriter StringWriter
+        {
+            get
+            {
+                if (_stringWriter == null)
+                {
+                    _stringWriter = new StringWriter();
+                }
+
+                return _stringWriter;
+            }
+        }
+
+        /// <inheritdoc />
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (output == null)
+            {
+                throw new ArgumentNullException(nameof(output));
+            }
+
+            // Pass through attribute that is also a well-known HTML attribute.
+            if (Href != null)
+            {
+                output.CopyHtmlAttribute(HrefAttributeName, context);
+            }
+
+            // If there's no "href" attribute in output.Attributes this will noop.
+            ProcessUrlAttribute(HrefAttributeName, output);
+
+            // Retrieve the TagHelperOutput variation of the "href" attribute in case other TagHelpers in the
+            // pipeline have touched the value. If the value is already encoded this LinkTagHelper may
+            // not function properly.
+            Href = output.Attributes[HrefAttributeName]?.Value as string;
+
+            Mode mode;
+            if (!AttributeMatcher.TryDetermineMode(context, ModeDetails, Compare, out mode))
+            {
+                // No attributes matched so we have nothing to do
+                return;
+            }
+
+            if (AppendVersion == true)
+            {
+                EnsureFileVersionProvider();
+
+                if (Href != null)
+                {
+                    var index = output.Attributes.IndexOfName(HrefAttributeName);
+                    var existingAttribute = output.Attributes[index];
+                    output.Attributes[index] = new TagHelperAttribute(
+                        existingAttribute.Name,
+                        _fileVersionProvider.AddFileVersionToPath(Href),
+                        existingAttribute.ValueStyle);
+                }
+            }
+
+            var builder = output.PostElement;
+            builder.Clear();
+
+            if (mode == Mode.GlobbedHref || mode == Mode.Fallback && !string.IsNullOrEmpty(HrefInclude))
+            {
+                BuildGlobbedLinkTags(output.Attributes, builder);
+                if (string.IsNullOrEmpty(Href))
+                {
+                    // Only HrefInclude is specified. Don't render the original tag.
+                    output.TagName = null;
+                    output.Content.SetHtmlContent(HtmlString.Empty);
+                }
+            }
+
+            if (mode == Mode.Fallback && HasStyleSheetLinkType(output.Attributes))
+            {
+                string resolvedUrl;
+                if (TryResolveUrl(FallbackHref, resolvedUrl: out resolvedUrl))
+                {
+                    FallbackHref = resolvedUrl;
+                }
+
+                BuildFallbackBlock(output.Attributes, builder);
+            }
+        }
+
+        private void BuildGlobbedLinkTags(TagHelperAttributeList attributes, TagHelperContent builder)
+        {
+            EnsureGlobbingUrlBuilder();
+
+            // Build a <link /> tag for each matched href.
+            var urls = GlobbingUrlBuilder.BuildUrlList(null, HrefInclude, HrefExclude);
+            for (var i = 0; i < urls.Count; i++)
+            {
+                var url = urls[i];
+
+                // "url" values come from bound attributes and globbing. Must always be non-null.
+                Debug.Assert(url != null);
+
+                if (string.Equals(Href, url, StringComparison.OrdinalIgnoreCase))
+                {
+                    // Don't build duplicate link tag for the original href url.
+                    continue;
+                }
+
+                BuildLinkTag(url, attributes, builder);
+            }
+        }
+
+        private void BuildFallbackBlock(TagHelperAttributeList attributes, TagHelperContent builder)
+        {
+            EnsureGlobbingUrlBuilder();
+            var fallbackHrefs = GlobbingUrlBuilder.BuildUrlList(
+                FallbackHref,
+                FallbackHrefInclude,
+                FallbackHrefExclude);
+
+            if (fallbackHrefs.Count == 0)
+            {
+                return;
+            }
+
+            builder.AppendHtml(HtmlString.NewLine);
+
+            // Build the <meta /> tag that's used to test for the presence of the stylesheet
+            builder
+                .AppendHtml("<meta name=\"x-stylesheet-fallback-test\" content=\"\" class=\"")
+                .Append(FallbackTestClass)
+                .AppendHtml("\" />");
+
+            // Build the <script /> tag that checks the effective style of <meta /> tag above and renders the extra
+            // <link /> tag to load the fallback stylesheet if the test CSS property value is found to be false,
+            // indicating that the primary stylesheet failed to load.
+            // GetEmbeddedJavaScript returns JavaScript to which we add '"{0}","{1}",{2});'
+            builder
+                .AppendHtml("<script>")
+                .AppendHtml(JavaScriptResources.GetEmbeddedJavaScript(FallbackJavaScriptResourceName))
+                .AppendHtml("\"")
+                .AppendHtml(JavaScriptEncoder.Encode(FallbackTestProperty))
+                .AppendHtml("\",\"")
+                .AppendHtml(JavaScriptEncoder.Encode(FallbackTestValue))
+                .AppendHtml("\",");
+
+            AppendFallbackHrefs(builder, fallbackHrefs);
+
+            builder.AppendHtml(", \"");
+
+            // Perf: Avoid allocating enumerator
+            for (var i = 0; i < attributes.Count; i++)
+            {
+                var attribute = attributes[i];
+                if (string.Equals(attribute.Name, HrefAttributeName, StringComparison.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
+
+                attribute.WriteTo(StringWriter, HtmlEncoder);
+                StringWriter.Write(' ');
+            }
+
+            var stringBuilder = StringWriter.GetStringBuilder();
+            var scriptTags = stringBuilder.ToString();
+            stringBuilder.Clear();
+            var encodedScriptTags = JavaScriptEncoder.Encode(scriptTags);
+            builder.AppendHtml(encodedScriptTags);
+
+            builder.AppendHtml("\");</script>");
+        }
+
+        private bool HasStyleSheetLinkType(TagHelperAttributeList attributes)
+        {
+            TagHelperAttribute relAttribute;
+            if (!attributes.TryGetAttribute(RelAttributeName, out relAttribute) ||
+                relAttribute.Value == null)
+            {
+                return false;
+            }
+
+            var attributeValue = relAttribute.Value;
+            var contentValue = attributeValue as IHtmlContent;
+            var stringValue = attributeValue as string;
+            if (contentValue != null)
+            {
+                contentValue.WriteTo(StringWriter, HtmlEncoder);
+                stringValue = StringWriter.ToString();
+
+                // Reset writer
+                StringWriter.GetStringBuilder().Clear();
+            }
+            else if (stringValue == null)
+            {
+                stringValue = attributeValue.ToString();
+            }
+
+            var hasRelStylesheet = string.Equals("stylesheet", stringValue, StringComparison.Ordinal);
+
+            return hasRelStylesheet;
+        }
+
+        private void AppendFallbackHrefs(TagHelperContent builder, IReadOnlyList<string> fallbackHrefs)
+        {
+            builder.AppendHtml("[");
+            var firstAdded = false;
+            // Perf: Avoid allocating enumerator
+            for (var i = 0; i < fallbackHrefs.Count; i++)
+            {
+                if (firstAdded)
+                {
+                    builder.AppendHtml(",\"");
+                }
+                else
+                {
+                    builder.AppendHtml("\"");
+                    firstAdded = true;
+                }
+
+                // fallbackHrefs come from bound attributes (a C# context) and globbing. Must always be non-null.
+                Debug.Assert(fallbackHrefs[i] != null);
+
+                var valueToWrite = fallbackHrefs[i];
+                if (AppendVersion == true)
+                {
+                    valueToWrite = _fileVersionProvider.AddFileVersionToPath(fallbackHrefs[i]);
+                }
+
+                // Must HTML-encode the href attribute value to ensure the written <link/> element is valid. Must also
+                // JavaScript-encode that value to ensure the doc.write() statement is valid.
+                valueToWrite = HtmlEncoder.Encode(valueToWrite);
+                valueToWrite = JavaScriptEncoder.Encode(valueToWrite);
+
+                builder.AppendHtml(valueToWrite);
+                builder.AppendHtml("\"");
+            }
+            builder.AppendHtml("]");
+        }
+
+        private void EnsureGlobbingUrlBuilder()
+        {
+            if (GlobbingUrlBuilder == null)
+            {
+                GlobbingUrlBuilder = new GlobbingUrlBuilder(
+                    HostingEnvironment.WebRootFileProvider,
+                    Cache,
+                    ViewContext.HttpContext.Request.PathBase);
+            }
+        }
+
+        private void EnsureFileVersionProvider()
+        {
+            if (_fileVersionProvider == null)
+            {
+                _fileVersionProvider = new FileVersionProvider(
+                    HostingEnvironment.WebRootFileProvider,
+                    Cache,
+                    ViewContext.HttpContext.Request.PathBase);
+            }
+        }
+
+        private void BuildLinkTag(string href, TagHelperAttributeList attributes, TagHelperContent builder)
+        {
+            builder.AppendHtml("<link ");
+
+            var addHref = true;
+
+            // Perf: Avoid allocating enumerator
+            for (var i = 0; i < attributes.Count; i++)
+            {
+                var attribute = attributes[i];
+
+                if (string.Equals(attribute.Name, HrefAttributeName, StringComparison.OrdinalIgnoreCase))
+                {
+                    addHref = false;
+
+                    AppendVersionedHref(attribute.Name, href, builder);
+                }
+                else
+                {
+                    attribute.CopyTo(builder);
+                    builder.AppendHtml(" ");
+                }
+            }
+
+            if (addHref)
+            {
+                AppendVersionedHref(HrefAttributeName, href, builder);
+            }
+
+            builder.AppendHtml("/>");
+        }
+
+        private void AppendVersionedHref(string hrefName, string hrefValue, TagHelperContent builder)
+        {
+            if (AppendVersion == true)
+            {
+                hrefValue = _fileVersionProvider.AddFileVersionToPath(hrefValue);
+            }
+
+            builder
+                .AppendHtml(hrefName)
+                .AppendHtml("=\"")
+                .Append(hrefValue)
+                .AppendHtml("\" ");
+        }
+
+        private enum Mode
+        {
+            /// <summary>
+            /// Just adding a file version for the generated urls.
+            /// </summary>
+            AppendVersion = 0,
+
+            /// <summary>
+            /// Just performing file globbing search for the href, rendering a separate &lt;link&gt; for each match.
+            /// </summary>
+            GlobbedHref = 1,
+
+            /// <summary>
+            /// Rendering a fallback block if primary stylesheet fails to load. Will also do globbing for both the
+            /// primary and fallback hrefs if the appropriate properties are set.
+            /// </summary>
+            Fallback = 2,
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj
new file mode 100644
index 0000000000..75d40d73c2
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ASP.NET Core MVC default tag helpers. Contains tag helpers for anchor tags, HTML input elements, caching, scripts, links (for CSS), and more.</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>aspnetcore;aspnetcoremvc;taghelper;taghelpers</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="compiler\resources\**\*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Razor\Microsoft.AspNetCore.Mvc.Razor.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Runtime" Version="$(MicrosoftAspNetCoreRazorRuntimePackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="$(MicrosoftAspNetCoreRoutingAbstractionsPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Primitives" Version="$(MicrosoftExtensionsPrimitivesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsPropertyHelperSourcesPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/OptionTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/OptionTagHelper.cs
new file mode 100644
index 0000000000..8f2678e968
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/OptionTagHelper.cs
@@ -0,0 +1,130 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TagHelpers.Internal;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    /// <summary>
+    /// <see cref="ITagHelper"/> implementation targeting &lt;option&gt; elements.
+    /// </summary>
+    /// <remarks>
+    /// This <see cref="ITagHelper"/> works in conjunction with <see cref="SelectTagHelper"/>. It reads elements
+    /// content but does not modify that content. The only modification it makes is to add a <c>selected</c> attribute
+    /// in some cases.
+    /// </remarks>
+    public class OptionTagHelper : TagHelper
+    {
+        /// <summary>
+        /// Creates a new <see cref="OptionTagHelper"/>.
+        /// </summary>
+        /// <param name="generator">The <see cref="IHtmlGenerator"/>.</param>
+        public OptionTagHelper(IHtmlGenerator generator)
+        {
+            Generator = generator;
+        }
+
+        /// <inheritdoc />
+        public override int Order => -1000;
+
+        protected IHtmlGenerator Generator { get; }
+
+        [HtmlAttributeNotBound]
+        [ViewContext]
+        public ViewContext ViewContext { get; set; }
+
+        /// <summary>
+        /// Specifies a value for the &lt;option&gt; element.
+        /// </summary>
+        /// <remarks>
+        /// Passed through to the generated HTML in all cases.
+        /// </remarks>
+        public string Value { get; set; }
+
+        /// <inheritdoc />
+        /// <remarks>
+        /// Does nothing unless <see cref="TagHelperContext.Items"/> contains a
+        /// <see cref="SelectTagHelper"/> <see cref="Type"/> entry and that entry is a non-<c>null</c>
+        /// <see cref="CurrentValues"/> instance. Also does nothing if the associated &lt;option&gt; is already
+        /// selected.
+        /// </remarks>
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (output == null)
+            {
+                throw new ArgumentNullException(nameof(output));
+            }
+
+            // Pass through attributes that are also well-known HTML attributes.
+            if (Value != null)
+            {
+                output.CopyHtmlAttribute(nameof(Value), context);
+            }
+
+            // Nothing to do if this <option/> is already selected.
+            if (!output.Attributes.ContainsName("selected"))
+            {
+                // Is this <option/> element a child of a <select/> element the SelectTagHelper targeted?
+                object formDataEntry;
+                context.Items.TryGetValue(typeof(SelectTagHelper), out formDataEntry);
+
+                // ... And did the SelectTagHelper determine any selected values?
+                var currentValues = formDataEntry as CurrentValues;
+                if (currentValues?.Values != null && currentValues.Values.Count != 0)
+                {
+                    // Select this <option/> element if value attribute or (if no value attribute) body matches a
+                    // selected value. Body is encoded as-needed while executing child content. But TagHelperOutput
+                    // itself encodes attribute values later, when start tag is generated.
+                    bool selected;
+                    if (Value != null)
+                    {
+                        selected = currentValues.Values.Contains(Value);
+                    }
+                    else
+                    {
+                        if (currentValues.ValuesAndEncodedValues == null)
+                        {
+                            // Include encoded versions of all selected values when comparing with body.
+                            var allValues = new HashSet<string>(currentValues.Values, StringComparer.OrdinalIgnoreCase);
+                            foreach (var selectedValue in currentValues.Values)
+                            {
+                                allValues.Add(Generator.Encode(selectedValue));
+                            }
+
+                            currentValues.ValuesAndEncodedValues = allValues;
+                        }
+
+                        TagHelperContent childContent;
+                        if (output.IsContentModified)
+                        {
+                            // Another tag helper has modified the body. Use what they wrote.
+                            childContent = output.Content;
+                        }
+                        else
+                        {
+                            childContent = await output.GetChildContentAsync();
+                        }
+
+                        selected = currentValues.ValuesAndEncodedValues.Contains(childContent.GetContent());
+                    }
+
+                    if (selected)
+                    {
+                        output.Attributes.Add("selected", "selected");
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/PartialTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/PartialTagHelper.cs
new file mode 100644
index 0000000000..b8451f663e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/PartialTagHelper.cs
@@ -0,0 +1,178 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    /// <summary>
+    /// Renders a partial view.
+    /// </summary>
+    [HtmlTargetElement("partial", Attributes = "name", TagStructure = TagStructure.WithoutEndTag)]
+    public class PartialTagHelper : TagHelper
+    {
+        private const string ForAttributeName = "for";
+        private const string ModelAttributeName = "model";
+        private object _model;
+        private bool _hasModel;
+        private bool _hasFor;
+        private ModelExpression _for;
+
+        private readonly ICompositeViewEngine _viewEngine;
+        private readonly IViewBufferScope _viewBufferScope;
+
+        public PartialTagHelper(
+            ICompositeViewEngine viewEngine,
+            IViewBufferScope viewBufferScope)
+        {
+            _viewEngine = viewEngine ?? throw new ArgumentNullException(nameof(viewEngine));
+            _viewBufferScope = viewBufferScope ?? throw new ArgumentNullException(nameof(viewBufferScope));
+        }
+
+        /// <summary>
+        /// The name or path of the partial view that is rendered to the response.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// An expression to be evaluated against the current model. Cannot be used together with <see cref="Model"/>.
+        /// </summary>
+        [HtmlAttributeName(ForAttributeName)]
+        public ModelExpression For
+        {
+            get => _for;
+            set
+            {
+                _for = value ?? throw new ArgumentNullException(nameof(value));
+                _hasFor = true;
+            }
+        }
+
+        /// <summary>
+        /// The model to pass into the partial view. Cannot be used together with <see cref="For"/>.
+        /// </summary>
+        [HtmlAttributeName(ModelAttributeName)]
+        public object Model
+        {
+            get => _model;
+            set
+            {
+                _model = value;
+                _hasModel = true;
+            }
+        }
+
+        /// <summary>
+        /// A <see cref="ViewDataDictionary"/> to pass into the partial view.
+        /// </summary>
+        public ViewDataDictionary ViewData { get; set; }
+
+        [HtmlAttributeNotBound]
+        [ViewContext]
+        public ViewContext ViewContext { get; set; }
+
+        /// <inheritdoc />
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (output == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var model = ResolveModel();
+            var viewBuffer = new ViewBuffer(_viewBufferScope, Name, ViewBuffer.PartialViewPageSize);
+            using (var writer = new ViewBufferTextWriter(viewBuffer, Encoding.UTF8))
+            {
+                await RenderPartialViewAsync(writer, model);
+
+                // Reset the TagName. We don't want `partial` to render.
+                output.TagName = null;
+                output.Content.SetHtmlContent(viewBuffer);
+            }
+        }
+
+        // Internal for testing
+        internal object ResolveModel()
+        {
+            // 1. Disallow specifying values for both Model and For
+            // 2. If a Model was assigned, use it even if it's null.
+            // 3. For cannot have a null value. Use it if it was assigned to.
+            // 4. Fall back to using the Model property on ViewContext.ViewData if none of the above conditions are met.
+
+            if (_hasFor && _hasModel)
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatPartialTagHelper_InvalidModelAttributes(
+                        typeof(PartialTagHelper).FullName,
+                        ForAttributeName,
+                        ModelAttributeName));
+            }
+
+            if (_hasModel)
+            {
+                return Model;
+            }
+
+            if (_hasFor)
+            {
+                return For.Model;
+            }
+
+            // A value for Model or For was not specified, fallback to the ViewContext's ViewData model.
+            return ViewContext.ViewData.Model;
+        }
+
+        private async Task RenderPartialViewAsync(TextWriter writer, object model)
+        {
+            var viewEngineResult = _viewEngine.GetView(ViewContext.ExecutingFilePath, Name, isMainPage: false);
+            var getViewLocations = viewEngineResult.SearchedLocations;
+            if (!viewEngineResult.Success)
+            {
+                viewEngineResult = _viewEngine.FindView(ViewContext, Name, isMainPage: false);
+            }
+
+            if (!viewEngineResult.Success)
+            {
+                var searchedLocations = Enumerable.Concat(getViewLocations, viewEngineResult.SearchedLocations);
+                var locations = string.Empty;
+                if (searchedLocations.Any())
+                {
+                    locations += Environment.NewLine + string.Join(Environment.NewLine, searchedLocations);
+                }
+
+                throw new InvalidOperationException(
+                    Resources.FormatViewEngine_PartialViewNotFound(Name, locations));
+            }
+
+            var view = viewEngineResult.View;
+            // Determine which ViewData we should use to construct a new ViewData
+            var baseViewData = ViewData ?? ViewContext.ViewData;
+            var newViewData = new ViewDataDictionary<object>(baseViewData, model);
+            var partialViewContext = new ViewContext(ViewContext, view, newViewData, writer);
+
+            if (For?.Name != null)
+            {
+                newViewData.TemplateInfo.HtmlFieldPrefix = newViewData.TemplateInfo.GetFullHtmlFieldName(For.Name);
+            }
+
+            using (view as IDisposable)
+            {
+                await view.RenderAsync(partialViewContext);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..4516d25702
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/AssemblyInfo.cs
@@ -0,0 +1,7 @@
+// 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.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..93ac7fa60e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/Resources.Designer.cs
@@ -0,0 +1,226 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class Resources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.TagHelpers.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// Cannot determine the '{0}' attribute for {1}. The following attributes are mutually exclusive:
+        /// </summary>
+        internal static string CannotDetermineAttributeFor
+        {
+            get => GetString("CannotDetermineAttributeFor");
+        }
+
+        /// <summary>
+        /// Cannot determine the '{0}' attribute for {1}. The following attributes are mutually exclusive:
+        /// </summary>
+        internal static string FormatCannotDetermineAttributeFor(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("CannotDetermineAttributeFor"), p0, p1);
+
+        /// <summary>
+        /// Cannot override the '{0}' attribute for {1}. An {1} with a specified '{0}' must not have attributes starting with '{2}' or an '{3}', '{4}', '{5}', '{6}', '{7}', '{8}', '{9}', '{10}' or '{11}' attribute.
+        /// </summary>
+        internal static string AnchorTagHelper_CannotOverrideHref
+        {
+            get => GetString("AnchorTagHelper_CannotOverrideHref");
+        }
+
+        /// <summary>
+        /// Cannot override the '{0}' attribute for {1}. An {1} with a specified '{0}' must not have attributes starting with '{2}' or an '{3}', '{4}', '{5}', '{6}', '{7}', '{8}', '{9}', '{10}' or '{11}' attribute.
+        /// </summary>
+        internal static string FormatAnchorTagHelper_CannotOverrideHref(object p0, object p1, object p2, object p3, object p4, object p5, object p6, object p7, object p8, object p9, object p10, object p11)
+            => string.Format(CultureInfo.CurrentCulture, GetString("AnchorTagHelper_CannotOverrideHref"), p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);
+
+        /// <summary>
+        /// Cannot override the '{0}' attribute for {1}. A {1} with a specified '{0}' must not have attributes starting with '{2}' or an '{3}', '{4}', '{5}', '{6}', '{7}', '{8}' or '{9}' attribute.
+        /// </summary>
+        internal static string FormTagHelper_CannotOverrideAction
+        {
+            get => GetString("FormTagHelper_CannotOverrideAction");
+        }
+
+        /// <summary>
+        /// Cannot override the '{0}' attribute for {1}. A {1} with a specified '{0}' must not have attributes starting with '{2}' or an '{3}', '{4}', '{5}', '{6}', '{7}', '{8}' or '{9}' attribute.
+        /// </summary>
+        internal static string FormatFormTagHelper_CannotOverrideAction(object p0, object p1, object p2, object p3, object p4, object p5, object p6, object p7, object p8, object p9)
+            => string.Format(CultureInfo.CurrentCulture, GetString("FormTagHelper_CannotOverrideAction"), p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
+
+        /// <summary>
+        /// Unexpected '{1}' expression result type '{2}' for {0}. '{1}' must be of type '{3}' or '{4}' that can be parsed as a '{3}' if '{5}' is '{6}'.
+        /// </summary>
+        internal static string InputTagHelper_InvalidExpressionResult
+        {
+            get => GetString("InputTagHelper_InvalidExpressionResult");
+        }
+
+        /// <summary>
+        /// Unexpected '{1}' expression result type '{2}' for {0}. '{1}' must be of type '{3}' or '{4}' that can be parsed as a '{3}' if '{5}' is '{6}'.
+        /// </summary>
+        internal static string FormatInputTagHelper_InvalidExpressionResult(object p0, object p1, object p2, object p3, object p4, object p5, object p6)
+            => string.Format(CultureInfo.CurrentCulture, GetString("InputTagHelper_InvalidExpressionResult"), p0, p1, p2, p3, p4, p5, p6);
+
+        /// <summary>
+        /// Unexpected expression result value '{1}' for {0}. '{1}' cannot be parsed as a '{2}'.
+        /// </summary>
+        internal static string InputTagHelper_InvalidStringResult
+        {
+            get => GetString("InputTagHelper_InvalidStringResult");
+        }
+
+        /// <summary>
+        /// Unexpected expression result value '{1}' for {0}. '{1}' cannot be parsed as a '{2}'.
+        /// </summary>
+        internal static string FormatInputTagHelper_InvalidStringResult(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("InputTagHelper_InvalidStringResult"), p0, p1, p2);
+
+        /// <summary>
+        /// '{1}' must not be null for {0} if '{2}' is '{3}'.
+        /// </summary>
+        internal static string InputTagHelper_ValueRequired
+        {
+            get => GetString("InputTagHelper_ValueRequired");
+        }
+
+        /// <summary>
+        /// '{1}' must not be null for {0} if '{2}' is '{3}'.
+        /// </summary>
+        internal static string FormatInputTagHelper_ValueRequired(object p0, object p1, object p2, object p3)
+            => string.Format(CultureInfo.CurrentCulture, GetString("InputTagHelper_ValueRequired"), p0, p1, p2, p3);
+
+        /// <summary>
+        /// The {2} was unable to provide metadata about '{1}' expression value '{3}' for {0}.
+        /// </summary>
+        internal static string TagHelpers_NoProvidedMetadata
+        {
+            get => GetString("TagHelpers_NoProvidedMetadata");
+        }
+
+        /// <summary>
+        /// The {2} was unable to provide metadata about '{1}' expression value '{3}' for {0}.
+        /// </summary>
+        internal static string FormatTagHelpers_NoProvidedMetadata(object p0, object p1, object p2, object p3)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelpers_NoProvidedMetadata"), p0, p1, p2, p3);
+
+        /// <summary>
+        /// The value of argument '{0}' ({1}) is invalid for Enum type '{2}'.
+        /// </summary>
+        internal static string InvalidEnumArgument
+        {
+            get => GetString("InvalidEnumArgument");
+        }
+
+        /// <summary>
+        /// The value of argument '{0}' ({1}) is invalid for Enum type '{2}'.
+        /// </summary>
+        internal static string FormatInvalidEnumArgument(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("InvalidEnumArgument"), p0, p1, p2);
+
+        /// <summary>
+        /// The attribute '{0}' does not exist in the {1}.
+        /// </summary>
+        internal static string TagHelperOutput_AttributeDoesNotExist
+        {
+            get => GetString("TagHelperOutput_AttributeDoesNotExist");
+        }
+
+        /// <summary>
+        /// The attribute '{0}' does not exist in the {1}.
+        /// </summary>
+        internal static string FormatTagHelperOutput_AttributeDoesNotExist(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TagHelperOutput_AttributeDoesNotExist"), p0, p1);
+
+        /// <summary>
+        /// The '{0}' property of '{1}' must not be null.
+        /// </summary>
+        internal static string PropertyOfTypeCannotBeNull
+        {
+            get => GetString("PropertyOfTypeCannotBeNull");
+        }
+
+        /// <summary>
+        /// The '{0}' property of '{1}' must not be null.
+        /// </summary>
+        internal static string FormatPropertyOfTypeCannotBeNull(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("PropertyOfTypeCannotBeNull"), p0, p1);
+
+        /// <summary>
+        /// Cannot override the '{0}' attribute for &lt;{1}&gt;. &lt;{1}&gt; elements with a specified '{0}' must not have attributes starting with '{2}' or an '{3}', '{4}', '{5}', '{6}', '{7}', '{8}' or '{9}' attribute.
+        /// </summary>
+        internal static string FormActionTagHelper_CannotOverrideFormAction
+        {
+            get => GetString("FormActionTagHelper_CannotOverrideFormAction");
+        }
+
+        /// <summary>
+        /// Cannot override the '{0}' attribute for &lt;{1}&gt;. &lt;{1}&gt; elements with a specified '{0}' must not have attributes starting with '{2}' or an '{3}', '{4}', '{5}', '{6}', '{7}', '{8}' or '{9}' attribute.
+        /// </summary>
+        internal static string FormatFormActionTagHelper_CannotOverrideFormAction(object p0, object p1, object p2, object p3, object p4, object p5, object p6, object p7, object p8, object p9)
+            => string.Format(CultureInfo.CurrentCulture, GetString("FormActionTagHelper_CannotOverrideFormAction"), p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
+
+        /// <summary>
+        /// Value cannot contain HTML space characters.
+        /// </summary>
+        internal static string ArgumentCannotContainHtmlSpace
+        {
+            get => GetString("ArgumentCannotContainHtmlSpace");
+        }
+
+        /// <summary>
+        /// Value cannot contain HTML space characters.
+        /// </summary>
+        internal static string FormatArgumentCannotContainHtmlSpace()
+            => GetString("ArgumentCannotContainHtmlSpace");
+
+        /// <summary>
+        /// The partial view '{0}' was not found. The following locations were searched:{1}
+        /// </summary>
+        internal static string ViewEngine_PartialViewNotFound
+        {
+            get => GetString("ViewEngine_PartialViewNotFound");
+        }
+
+        /// <summary>
+        /// The partial view '{0}' was not found. The following locations were searched:{1}
+        /// </summary>
+        internal static string FormatViewEngine_PartialViewNotFound(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewEngine_PartialViewNotFound"), p0, p1);
+
+        /// <summary>
+        /// Cannot use '{0}' with both '{1}' and '{2}' attributes.
+        /// </summary>
+        internal static string PartialTagHelper_InvalidModelAttributes
+        {
+            get => GetString("PartialTagHelper_InvalidModelAttributes");
+        }
+
+        /// <summary>
+        /// Cannot use '{0}' with both '{1}' and '{2}' attributes.
+        /// </summary>
+        internal static string FormatPartialTagHelper_InvalidModelAttributes(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("PartialTagHelper_InvalidModelAttributes"), p0, p1, p2);
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/RenderAtEndOfFormTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/RenderAtEndOfFormTagHelper.cs
new file mode 100644
index 0000000000..d1e2537044
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/RenderAtEndOfFormTagHelper.cs
@@ -0,0 +1,74 @@
+// 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.
+
+using System;
+using System.ComponentModel;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    /// <summary>
+    /// <see cref="ITagHelper"/> implementation targeting all form elements
+    /// to generate content before the form end tag.
+    /// </summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [HtmlTargetElement("form")]
+    public class RenderAtEndOfFormTagHelper : TagHelper
+    {
+        // This TagHelper's order must be greater than the FormTagHelper's. I.e it must be executed after
+        // FormTaghelper does.
+        /// <inheritdoc />
+        public override int Order => -900;
+
+        [HtmlAttributeNotBound]
+        [ViewContext]
+        public ViewContext ViewContext { get; set; }
+
+        /// <inheritdoc />
+        public override void Init(TagHelperContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            // Push the new FormContext.
+            ViewContext.FormContext = new FormContext
+            {
+                CanRenderAtEndOfForm = true
+            };
+        }
+
+        /// <inheritdoc />
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (output == null)
+            {
+                throw new ArgumentNullException(nameof(output));
+            }
+
+            await output.GetChildContentAsync();
+
+            var formContext = ViewContext.FormContext;
+            if (formContext.HasEndOfFormContent)
+            {
+                // Perf: Avoid allocating enumerator
+                for (var i = 0; i < formContext.EndOfFormContent.Count; i++)
+                {
+                    output.PostContent.AppendHtml(formContext.EndOfFormContent[i]);
+                }
+            }
+
+            // Reset the FormContext
+            ViewContext.FormContext = new FormContext();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Rendering/ValidationSummary.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Rendering/ValidationSummary.cs
new file mode 100644
index 0000000000..936e5c3627
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Rendering/ValidationSummary.cs
@@ -0,0 +1,26 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Acceptable validation summary rendering modes.
+    /// </summary>
+    public enum ValidationSummary
+    {
+        /// <summary>
+        /// No validation summary.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Validation summary with model-level errors only (excludes all property errors).
+        /// </summary>
+        ModelOnly,
+
+        /// <summary>
+        /// Validation summary with all errors.
+        /// </summary>
+        All
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Resources.resx
new file mode 100644
index 0000000000..1d6166e955
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Resources.resx
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CannotDetermineAttributeFor" xml:space="preserve">
+    <value>Cannot determine the '{0}' attribute for {1}. The following attributes are mutually exclusive:</value>
+  </data>
+  <data name="AnchorTagHelper_CannotOverrideHref" xml:space="preserve">
+    <value>Cannot override the '{0}' attribute for {1}. An {1} with a specified '{0}' must not have attributes starting with '{2}' or an '{3}', '{4}', '{5}', '{6}', '{7}', '{8}', '{9}', '{10}' or '{11}' attribute.</value>
+  </data>
+  <data name="FormTagHelper_CannotOverrideAction" xml:space="preserve">
+    <value>Cannot override the '{0}' attribute for {1}. A {1} with a specified '{0}' must not have attributes starting with '{2}' or an '{3}', '{4}', '{5}', '{6}', '{7}', '{8}' or '{9}' attribute.</value>
+  </data>
+  <data name="InputTagHelper_InvalidExpressionResult" xml:space="preserve">
+    <value>Unexpected '{1}' expression result type '{2}' for {0}. '{1}' must be of type '{3}' or '{4}' that can be parsed as a '{3}' if '{5}' is '{6}'.</value>
+  </data>
+  <data name="InputTagHelper_InvalidStringResult" xml:space="preserve">
+    <value>Unexpected expression result value '{1}' for {0}. '{1}' cannot be parsed as a '{2}'.</value>
+  </data>
+  <data name="InputTagHelper_ValueRequired" xml:space="preserve">
+    <value>'{1}' must not be null for {0} if '{2}' is '{3}'.</value>
+  </data>
+  <data name="TagHelpers_NoProvidedMetadata" xml:space="preserve">
+    <value>The {2} was unable to provide metadata about '{1}' expression value '{3}' for {0}.</value>
+  </data>
+  <data name="InvalidEnumArgument" xml:space="preserve">
+    <value>The value of argument '{0}' ({1}) is invalid for Enum type '{2}'.</value>
+  </data>
+  <data name="TagHelperOutput_AttributeDoesNotExist" xml:space="preserve">
+    <value>The attribute '{0}' does not exist in the {1}.</value>
+  </data>
+  <data name="PropertyOfTypeCannotBeNull" xml:space="preserve">
+    <value>The '{0}' property of '{1}' must not be null.</value>
+  </data>
+  <data name="FormActionTagHelper_CannotOverrideFormAction" xml:space="preserve">
+    <value>Cannot override the '{0}' attribute for &lt;{1}&gt;. &lt;{1}&gt; elements with a specified '{0}' must not have attributes starting with '{2}' or an '{3}', '{4}', '{5}', '{6}', '{7}', '{8}' or '{9}' attribute.</value>
+  </data>
+  <data name="ArgumentCannotContainHtmlSpace" xml:space="preserve">
+    <value>Value cannot contain HTML space characters.</value>
+  </data>
+  <data name="ViewEngine_PartialViewNotFound" xml:space="preserve">
+    <value>The partial view '{0}' was not found. The following locations were searched:{1}</value>
+  </data>
+  <data name="PartialTagHelper_InvalidModelAttributes" xml:space="preserve">
+    <value>Cannot use '{0}' with both '{1}' and '{2}' attributes.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ScriptTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ScriptTagHelper.cs
new file mode 100644
index 0000000000..8faf17807f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ScriptTagHelper.cs
@@ -0,0 +1,451 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.TagHelpers.Internal;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.Caching.Memory;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    /// <summary>
+    /// <see cref="ITagHelper"/> implementation targeting &lt;script&gt; elements that supports fallback src paths.
+    /// </summary>
+    /// <remarks>
+    /// The tag helper won't process for cases with just the 'src' attribute.
+    /// </remarks>
+    [HtmlTargetElement("script", Attributes = SrcIncludeAttributeName)]
+    [HtmlTargetElement("script", Attributes = SrcExcludeAttributeName)]
+    [HtmlTargetElement("script", Attributes = FallbackSrcAttributeName)]
+    [HtmlTargetElement("script", Attributes = FallbackSrcIncludeAttributeName)]
+    [HtmlTargetElement("script", Attributes = FallbackSrcExcludeAttributeName)]
+    [HtmlTargetElement("script", Attributes = FallbackTestExpressionAttributeName)]
+    [HtmlTargetElement("script", Attributes = AppendVersionAttributeName)]
+    public class ScriptTagHelper : UrlResolutionTagHelper
+    {
+        private const string SrcIncludeAttributeName = "asp-src-include";
+        private const string SrcExcludeAttributeName = "asp-src-exclude";
+        private const string FallbackSrcAttributeName = "asp-fallback-src";
+        private const string FallbackSrcIncludeAttributeName = "asp-fallback-src-include";
+        private const string FallbackSrcExcludeAttributeName = "asp-fallback-src-exclude";
+        private const string FallbackTestExpressionAttributeName = "asp-fallback-test";
+        private const string SrcAttributeName = "src";
+        private const string AppendVersionAttributeName = "asp-append-version";
+        private static readonly Func<Mode, Mode, int> Compare = (a, b) => a - b;
+        private FileVersionProvider _fileVersionProvider;
+        private StringWriter _stringWriter;
+
+        private static readonly ModeAttributes<Mode>[] ModeDetails = new[] {
+            // Regular src with file version alone
+            new ModeAttributes<Mode>(Mode.AppendVersion, new[] { AppendVersionAttributeName }),
+            // Globbed src (include only)
+            new ModeAttributes<Mode>(Mode.GlobbedSrc, new [] { SrcIncludeAttributeName }),
+            // Globbed src (include & exclude)
+            new ModeAttributes<Mode>(Mode.GlobbedSrc, new [] { SrcIncludeAttributeName, SrcExcludeAttributeName }),
+            // Fallback with static src
+            new ModeAttributes<Mode>(Mode.Fallback,
+                new[]
+                {
+                    FallbackSrcAttributeName,
+                    FallbackTestExpressionAttributeName
+                }),
+            // Fallback with globbed src (include only)
+            new ModeAttributes<Mode>(
+                Mode.Fallback,
+                new[]
+                {
+                    FallbackSrcIncludeAttributeName,
+                    FallbackTestExpressionAttributeName
+                }),
+            // Fallback with globbed src (include & exclude)
+            new ModeAttributes<Mode>(
+                Mode.Fallback,
+                new[]
+                {
+                    FallbackSrcIncludeAttributeName,
+                    FallbackSrcExcludeAttributeName,
+                    FallbackTestExpressionAttributeName
+                }),
+        };
+
+        /// <summary>
+        /// Creates a new <see cref="ScriptTagHelper"/>.
+        /// </summary>
+        /// <param name="hostingEnvironment">The <see cref="IHostingEnvironment"/>.</param>
+        /// <param name="cache">The <see cref="IMemoryCache"/>.</param>
+        /// <param name="htmlEncoder">The <see cref="HtmlEncoder"/>.</param>
+        /// <param name="javaScriptEncoder">The <see cref="JavaScriptEncoder"/>.</param>
+        /// <param name="urlHelperFactory">The <see cref="IUrlHelperFactory"/>.</param>
+        public ScriptTagHelper(
+            IHostingEnvironment hostingEnvironment,
+            IMemoryCache cache,
+            HtmlEncoder htmlEncoder,
+            JavaScriptEncoder javaScriptEncoder,
+            IUrlHelperFactory urlHelperFactory)
+            : base(urlHelperFactory, htmlEncoder)
+        {
+            HostingEnvironment = hostingEnvironment;
+            Cache = cache;
+            JavaScriptEncoder = javaScriptEncoder;
+        }
+
+        /// <inheritdoc />
+        public override int Order => -1000;
+
+        /// <summary>
+        /// Address of the external script to use.
+        /// </summary>
+        /// <remarks>
+        /// Passed through to the generated HTML in all cases.
+        /// </remarks>
+        [HtmlAttributeName(SrcAttributeName)]
+        public string Src { get; set; }
+
+        /// <summary>
+        /// A comma separated list of globbed file patterns of JavaScript scripts to load.
+        /// The glob patterns are assessed relative to the application's 'webroot' setting.
+        /// </summary>
+        [HtmlAttributeName(SrcIncludeAttributeName)]
+        public string SrcInclude { get; set; }
+
+        /// <summary>
+        /// A comma separated list of globbed file patterns of JavaScript scripts to exclude from loading.
+        /// The glob patterns are assessed relative to the application's 'webroot' setting.
+        /// Must be used in conjunction with <see cref="SrcInclude"/>.
+        /// </summary>
+        [HtmlAttributeName(SrcExcludeAttributeName)]
+        public string SrcExclude { get; set; }
+
+        /// <summary>
+        /// The URL of a Script tag to fallback to in the case the primary one fails.
+        /// </summary>
+        [HtmlAttributeName(FallbackSrcAttributeName)]
+        public string FallbackSrc { get; set; }
+
+        /// <summary>
+        /// Value indicating if file version should be appended to src urls.
+        /// </summary>
+        /// <remarks>
+        /// A query string "v" with the encoded content of the file is added.
+        /// </remarks>
+        [HtmlAttributeName(AppendVersionAttributeName)]
+        public bool? AppendVersion { get; set; }
+
+        /// <summary>
+        /// A comma separated list of globbed file patterns of JavaScript scripts to fallback to in the case the
+        /// primary one fails.
+        /// The glob patterns are assessed relative to the application's 'webroot' setting.
+        /// </summary>
+        [HtmlAttributeName(FallbackSrcIncludeAttributeName)]
+        public string FallbackSrcInclude { get; set; }
+
+        /// <summary>
+        /// A comma separated list of globbed file patterns of JavaScript scripts to exclude from the fallback list, in
+        /// the case the primary one fails.
+        /// The glob patterns are assessed relative to the application's 'webroot' setting.
+        /// Must be used in conjunction with <see cref="FallbackSrcInclude"/>.
+        /// </summary>
+        [HtmlAttributeName(FallbackSrcExcludeAttributeName)]
+        public string FallbackSrcExclude { get; set; }
+
+        /// <summary>
+        /// The script method defined in the primary script to use for the fallback test.
+        /// </summary>
+        [HtmlAttributeName(FallbackTestExpressionAttributeName)]
+        public string FallbackTestExpression { get; set; }
+
+        protected IHostingEnvironment HostingEnvironment { get; }
+
+        protected IMemoryCache Cache { get; }
+
+        protected JavaScriptEncoder JavaScriptEncoder { get; }
+
+        // Internal for ease of use when testing.
+        protected internal GlobbingUrlBuilder GlobbingUrlBuilder { get; set; }
+
+        // Shared writer for determining the string content of a TagHelperAttribute's Value.
+        private StringWriter StringWriter
+        {
+            get
+            {
+                if (_stringWriter == null)
+                {
+                    _stringWriter = new StringWriter();
+                }
+
+                return _stringWriter;
+            }
+        }
+
+        /// <inheritdoc />
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (output == null)
+            {
+                throw new ArgumentNullException(nameof(output));
+            }
+
+            // Pass through attribute that is also a well-known HTML attribute.
+            if (Src != null)
+            {
+                output.CopyHtmlAttribute(SrcAttributeName, context);
+            }
+
+            // If there's no "src" attribute in output.Attributes this will noop.
+            ProcessUrlAttribute(SrcAttributeName, output);
+
+            // Retrieve the TagHelperOutput variation of the "src" attribute in case other TagHelpers in the
+            // pipeline have touched the value. If the value is already encoded this ScriptTagHelper may
+            // not function properly.
+            Src = output.Attributes[SrcAttributeName]?.Value as string;
+
+            Mode mode;
+            if (!AttributeMatcher.TryDetermineMode(context, ModeDetails, Compare, out mode))
+            {
+                // No attributes matched so we have nothing to do
+                return;
+            }
+
+            if (AppendVersion == true)
+            {
+                EnsureFileVersionProvider();
+
+                if (Src != null)
+                {
+                    var index = output.Attributes.IndexOfName(SrcAttributeName);
+                    var existingAttribute = output.Attributes[index];
+                    output.Attributes[index] = new TagHelperAttribute(
+                        existingAttribute.Name,
+                        _fileVersionProvider.AddFileVersionToPath(Src),
+                        existingAttribute.ValueStyle);
+                }
+            }
+
+            var builder = output.PostElement;
+            builder.Clear();
+
+            if (mode == Mode.GlobbedSrc || mode == Mode.Fallback && !string.IsNullOrEmpty(SrcInclude))
+            {
+                BuildGlobbedScriptTags(output.Attributes, builder);
+                if (string.IsNullOrEmpty(Src))
+                {
+                    // Only SrcInclude is specified. Don't render the original tag.
+                    output.TagName = null;
+                    output.Content.SetContent(string.Empty);
+                }
+            }
+
+            if (mode == Mode.Fallback)
+            {
+                string resolvedUrl;
+                if (TryResolveUrl(FallbackSrc, resolvedUrl: out resolvedUrl))
+                {
+                    FallbackSrc = resolvedUrl;
+                }
+
+                BuildFallbackBlock(output.Attributes, builder);
+            }
+        }
+
+        private void BuildGlobbedScriptTags(
+            TagHelperAttributeList attributes,
+            TagHelperContent builder)
+        {
+            EnsureGlobbingUrlBuilder();
+
+            // Build a <script> tag for each matched src as well as the original one in the source file
+            var urls = GlobbingUrlBuilder.BuildUrlList(null, SrcInclude, SrcExclude);
+            foreach (var url in urls)
+            {
+                // "url" values come from bound attributes and globbing. Must always be non-null.
+                Debug.Assert(url != null);
+
+                if (string.Equals(url, Src, StringComparison.OrdinalIgnoreCase))
+                {
+                    // Don't build duplicate script tag for the original source url.
+                    continue;
+                }
+
+                BuildScriptTag(url, attributes, builder);
+            }
+        }
+
+        private void BuildFallbackBlock(TagHelperAttributeList attributes, TagHelperContent builder)
+        {
+            EnsureGlobbingUrlBuilder();
+
+            var fallbackSrcs = GlobbingUrlBuilder.BuildUrlList(FallbackSrc, FallbackSrcInclude, FallbackSrcExclude);
+            if (fallbackSrcs.Count > 0)
+            {
+                // Build the <script> tag that checks the test method and if it fails, renders the extra script.
+                builder.AppendHtml(Environment.NewLine)
+                       .AppendHtml("<script>(")
+                       .AppendHtml(FallbackTestExpression)
+                       .AppendHtml("||document.write(\"");
+
+                foreach (var src in fallbackSrcs)
+                {
+                    // Fallback "src" values come from bound attributes and globbing. Must always be non-null.
+                    Debug.Assert(src != null);
+
+                    StringWriter.Write("<script");
+
+                    var addSrc = true;
+
+                    // Perf: Avoid allocating enumerator
+                    for (var i = 0; i < attributes.Count; i++)
+                    {
+                        var attribute = attributes[i];
+                        if (!attribute.Name.Equals(SrcAttributeName, StringComparison.OrdinalIgnoreCase))
+                        {
+                            StringWriter.Write(' ');
+                            attribute.WriteTo(StringWriter, HtmlEncoder);
+                        }
+                        else
+                        {
+                            addSrc = false;
+                            WriteVersionedSrc(attribute.Name, src, attribute.ValueStyle, StringWriter);
+                        }
+                    }
+
+                    if (addSrc)
+                    {
+                        WriteVersionedSrc(SrcAttributeName, src, HtmlAttributeValueStyle.DoubleQuotes, StringWriter);
+                    }
+
+                    StringWriter.Write("></script>");
+                }
+
+                var stringBuilder = StringWriter.GetStringBuilder();
+                var scriptTags = stringBuilder.ToString();
+                stringBuilder.Clear();
+                var encodedScriptTags = JavaScriptEncoder.Encode(scriptTags);
+                builder.AppendHtml(encodedScriptTags);
+
+                builder.AppendHtml("\"));</script>");
+            }
+        }
+
+        private string GetVersionedSrc(string srcValue)
+        {
+            if (AppendVersion == true)
+            {
+                srcValue = _fileVersionProvider.AddFileVersionToPath(srcValue);
+            }
+
+            return srcValue;
+        }
+
+        private void AppendVersionedSrc(
+            string srcName,
+            string srcValue,
+            HtmlAttributeValueStyle valueStyle,
+            IHtmlContentBuilder builder)
+        {
+            srcValue = GetVersionedSrc(srcValue);
+
+            builder.AppendHtml(" ");
+            var attribute = new TagHelperAttribute(srcName, srcValue, valueStyle);
+            attribute.CopyTo(builder);
+        }
+
+        private void WriteVersionedSrc(
+            string srcName,
+            string srcValue,
+            HtmlAttributeValueStyle valueStyle,
+            TextWriter writer)
+        {
+            srcValue = GetVersionedSrc(srcValue);
+
+            writer.Write(' ');
+            var attribute = new TagHelperAttribute(srcName, srcValue, valueStyle);
+            attribute.WriteTo(writer, HtmlEncoder);
+        }
+
+        private void EnsureGlobbingUrlBuilder()
+        {
+            if (GlobbingUrlBuilder == null)
+            {
+                GlobbingUrlBuilder = new GlobbingUrlBuilder(
+                    HostingEnvironment.WebRootFileProvider,
+                    Cache,
+                    ViewContext.HttpContext.Request.PathBase);
+            }
+        }
+
+        private void EnsureFileVersionProvider()
+        {
+            if (_fileVersionProvider == null)
+            {
+                _fileVersionProvider = new FileVersionProvider(
+                    HostingEnvironment.WebRootFileProvider,
+                    Cache,
+                    ViewContext.HttpContext.Request.PathBase);
+            }
+        }
+
+        private void BuildScriptTag(
+            string src,
+            TagHelperAttributeList attributes,
+            TagHelperContent builder)
+        {
+            builder.AppendHtml("<script");
+
+            var addSrc = true;
+
+            // Perf: Avoid allocating enumerator
+            for (var i = 0; i < attributes.Count; i++)
+            {
+                var attribute = attributes[i];
+                if (!attribute.Name.Equals(SrcAttributeName, StringComparison.OrdinalIgnoreCase))
+                {
+                    builder.AppendHtml(" ");
+                    attribute.CopyTo(builder);
+                }
+                else
+                {
+                    addSrc = false;
+                    AppendVersionedSrc(attribute.Name, src, attribute.ValueStyle, builder);
+                }
+            }
+
+            if (addSrc)
+            {
+                AppendVersionedSrc(SrcAttributeName, src, HtmlAttributeValueStyle.DoubleQuotes, builder);
+            }
+
+            builder.AppendHtml("></script>");
+        }
+
+        private enum Mode
+        {
+            /// <summary>
+            /// Just adding a file version for the generated urls.
+            /// </summary>
+            AppendVersion = 0,
+
+            /// <summary>
+            /// Just performing file globbing search for the src, rendering a separate &lt;script&gt; for each match.
+            /// </summary>
+            GlobbedSrc = 1,
+
+            /// <summary>
+            /// Rendering a fallback block if primary javascript fails to load. Will also do globbing for both the
+            /// primary and fallback srcs if the appropriate properties are set.
+            /// </summary>
+            Fallback = 2
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/SelectTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/SelectTagHelper.cs
new file mode 100644
index 0000000000..f0e5dd2d06
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/SelectTagHelper.cs
@@ -0,0 +1,172 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TagHelpers.Internal;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    /// <summary>
+    /// <see cref="ITagHelper"/> implementation targeting &lt;select&gt; elements with <c>asp-for</c> and/or
+    /// <c>asp-items</c> attribute(s).
+    /// </summary>
+    [HtmlTargetElement("select", Attributes = ForAttributeName)]
+    [HtmlTargetElement("select", Attributes = ItemsAttributeName)]
+    public class SelectTagHelper : TagHelper
+    {
+        private const string ForAttributeName = "asp-for";
+        private const string ItemsAttributeName = "asp-items";
+        private bool _allowMultiple;
+        private ICollection<string> _currentValues;
+
+        /// <summary>
+        /// Creates a new <see cref="SelectTagHelper"/>.
+        /// </summary>
+        /// <param name="generator">The <see cref="IHtmlGenerator"/>.</param>
+        public SelectTagHelper(IHtmlGenerator generator)
+        {
+            Generator = generator;
+        }
+
+        /// <inheritdoc />
+        public override int Order => -1000;
+
+        protected IHtmlGenerator Generator { get; }
+
+        [HtmlAttributeNotBound]
+        [ViewContext]
+        public ViewContext ViewContext { get; set; }
+
+        /// <summary>
+        /// An expression to be evaluated against the current model.
+        /// </summary>
+        [HtmlAttributeName(ForAttributeName)]
+        public ModelExpression For { get; set; }
+
+        /// <summary>
+        /// A collection of <see cref="SelectListItem"/> objects used to populate the &lt;select&gt; element with
+        /// &lt;optgroup&gt; and &lt;option&gt; elements.
+        /// </summary>
+        [HtmlAttributeName(ItemsAttributeName)]
+        public IEnumerable<SelectListItem> Items { get; set; }
+
+        /// <summary>
+        /// The name of the &lt;input&gt; element.
+        /// </summary>
+        /// <remarks>
+        /// Passed through to the generated HTML in all cases. Also used to determine whether <see cref="For"/> is
+        /// valid with an empty <see cref="ModelExpression.Name"/>.
+        /// </remarks>
+        public string Name { get; set; }
+
+        /// <inheritdoc />
+        public override void Init(TagHelperContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (For == null)
+            {
+                // Informs contained elements that they're running within a targeted <select/> element.
+                context.Items[typeof(SelectTagHelper)] = null;
+                return;
+            }
+
+            // Note null or empty For.Name is allowed because TemplateInfo.HtmlFieldPrefix may be sufficient.
+            // IHtmlGenerator will enforce name requirements.
+            if (For.Metadata == null)
+            {
+                throw new InvalidOperationException(Resources.FormatTagHelpers_NoProvidedMetadata(
+                    "<select>",
+                    ForAttributeName,
+                    nameof(IModelMetadataProvider),
+                    For.Name));
+            }
+
+            // Base allowMultiple on the instance or declared type of the expression to avoid a
+            // "SelectExpressionNotEnumerable" InvalidOperationException during generation.
+            // Metadata.IsEnumerableType is similar but does not take runtime type into account.
+            var realModelType = For.ModelExplorer.ModelType;
+            _allowMultiple = typeof(string) != realModelType &&
+                typeof(IEnumerable).IsAssignableFrom(realModelType);
+            _currentValues = Generator.GetCurrentValues(ViewContext, For.ModelExplorer, For.Name, _allowMultiple);
+
+            // Whether or not (not being highly unlikely) we generate anything, could update contained <option/>
+            // elements. Provide selected values for <option/> tag helpers.
+            var currentValues = _currentValues == null ? null : new CurrentValues(_currentValues);
+            context.Items[typeof(SelectTagHelper)] = currentValues;
+        }
+
+        /// <inheritdoc />
+        /// <remarks>Does nothing if <see cref="For"/> is <c>null</c>.</remarks>
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (output == null)
+            {
+                throw new ArgumentNullException(nameof(output));
+            }
+
+            // Pass through attribute that is also a well-known HTML attribute. Must be done prior to any copying
+            // from a TagBuilder.
+            if (Name != null)
+            {
+                output.CopyHtmlAttribute(nameof(Name), context);
+            }
+
+            // Ensure GenerateSelect() _never_ looks anything up in ViewData.
+            var items = Items ?? Enumerable.Empty<SelectListItem>();
+
+            if (For == null)
+            {
+                var options = Generator.GenerateGroupsAndOptions(optionLabel: null, selectList: items);
+                output.PostContent.AppendHtml(options);
+                return;
+            }
+
+            // Ensure Generator does not throw due to empty "fullName" if user provided a name attribute.
+            IDictionary<string, object> htmlAttributes = null;
+            if (string.IsNullOrEmpty(For.Name) &&
+                string.IsNullOrEmpty(ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix) &&
+                !string.IsNullOrEmpty(Name))
+            {
+                htmlAttributes = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase)
+                {
+                    { "name", Name },
+                };
+            }
+
+            var tagBuilder = Generator.GenerateSelect(
+                ViewContext,
+                For.ModelExplorer,
+                optionLabel: null,
+                expression: For.Name,
+                selectList: items,
+                currentValues: _currentValues,
+                allowMultiple: _allowMultiple,
+                htmlAttributes: htmlAttributes);
+
+            if (tagBuilder != null)
+            {
+                output.MergeAttributes(tagBuilder);
+                if (tagBuilder.HasInnerHtml)
+                {
+                    output.PostContent.AppendHtml(tagBuilder.InnerHtml);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/TagHelperOutputExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/TagHelperOutputExtensions.cs
new file mode 100644
index 0000000000..8075b5bf0e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/TagHelperOutputExtensions.cs
@@ -0,0 +1,428 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    /// <summary>
+    /// Utility related extensions for <see cref="TagHelperOutput"/>.
+    /// </summary>
+    public static class TagHelperOutputExtensions
+    {
+        private static readonly char[] SpaceChars = { '\u0020', '\u0009', '\u000A', '\u000C', '\u000D' };
+
+        /// <summary>
+        /// Copies a user-provided attribute from <paramref name="context"/>'s
+        /// <see cref="TagHelperContext.AllAttributes"/> to <paramref name="tagHelperOutput"/>'s
+        /// <see cref="TagHelperOutput.Attributes"/>.
+        /// </summary>
+        /// <param name="tagHelperOutput">The <see cref="TagHelperOutput"/> this method extends.</param>
+        /// <param name="attributeName">The name of the bound attribute.</param>
+        /// <param name="context">The <see cref="TagHelperContext"/>.</param>
+        /// <remarks>
+        /// <para>
+        /// Only copies the attribute if <paramref name="tagHelperOutput"/>'s
+        /// <see cref="TagHelperOutput.Attributes"/> does not contain an attribute with the given
+        /// <paramref name="attributeName"/>.
+        /// </para>
+        /// <para>
+        /// Duplicate attributes same name in <paramref name="context"/>'s <see cref="TagHelperContext.AllAttributes"/>
+        /// or <paramref name="tagHelperOutput"/>'s <see cref="TagHelperOutput.Attributes"/> may result in copied
+        /// attribute order not being maintained.
+        /// </para></remarks>
+        public static void CopyHtmlAttribute(
+            this TagHelperOutput tagHelperOutput,
+            string attributeName,
+            TagHelperContext context)
+        {
+            if (tagHelperOutput == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelperOutput));
+            }
+
+            if (attributeName == null)
+            {
+                throw new ArgumentNullException(nameof(attributeName));
+            }
+
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (!tagHelperOutput.Attributes.ContainsName(attributeName))
+            {
+                var copiedAttribute = false;
+
+                // We iterate context.AllAttributes backwards since we prioritize TagHelperOutput values occurring
+                // before the current context.AllAttribtes[i].
+                for (var i = context.AllAttributes.Count - 1; i >= 0; i--)
+                {
+                    // We look for the original attribute so we can restore the exact attribute name the user typed in
+                    // approximately the same position where the user wrote it in the Razor source.
+                    if (string.Equals(
+                        attributeName,
+                        context.AllAttributes[i].Name,
+                        StringComparison.OrdinalIgnoreCase))
+                    {
+                        CopyHtmlAttribute(i, tagHelperOutput, context);
+                        copiedAttribute = true;
+                    }
+                }
+
+                if (!copiedAttribute)
+                {
+                    throw new ArgumentException(
+                        Resources.FormatTagHelperOutput_AttributeDoesNotExist(attributeName, nameof(TagHelperContext)),
+                        nameof(attributeName));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Merges the given <paramref name="tagBuilder"/>'s <see cref="TagBuilder.Attributes"/> into the
+        /// <paramref name="tagHelperOutput"/>.
+        /// </summary>
+        /// <param name="tagHelperOutput">The <see cref="TagHelperOutput"/> this method extends.</param>
+        /// <param name="tagBuilder">The <see cref="TagBuilder"/> to merge attributes from.</param>
+        /// <remarks>Existing <see cref="TagHelperOutput.Attributes"/> on the given <paramref name="tagHelperOutput"/>
+        /// are not overridden; "class" attributes are merged with spaces.</remarks>
+        public static void MergeAttributes(this TagHelperOutput tagHelperOutput, TagBuilder tagBuilder)
+        {
+            if (tagHelperOutput == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelperOutput));
+            }
+
+            if (tagBuilder == null)
+            {
+                throw new ArgumentNullException(nameof(tagBuilder));
+            }
+
+            foreach (var attribute in tagBuilder.Attributes)
+            {
+                if (!tagHelperOutput.Attributes.ContainsName(attribute.Key))
+                {
+                    tagHelperOutput.Attributes.Add(attribute.Key, attribute.Value);
+                }
+                else if (string.Equals(attribute.Key, "class", StringComparison.OrdinalIgnoreCase))
+                {
+                    TagHelperAttribute classAttribute;
+                    var found = tagHelperOutput.Attributes.TryGetAttribute("class", out classAttribute);
+                    Debug.Assert(found);
+
+                    var newAttribute = new TagHelperAttribute(
+                        classAttribute.Name,
+                        new ClassAttributeHtmlContent(classAttribute.Value, attribute.Value),
+                        classAttribute.ValueStyle);
+
+                    tagHelperOutput.Attributes.SetAttribute(newAttribute);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Removes the given <paramref name="attributes"/> from <paramref name="tagHelperOutput"/>'s
+        /// <see cref="TagHelperOutput.Attributes"/>.
+        /// </summary>
+        /// <param name="tagHelperOutput">The <see cref="TagHelperOutput"/> this method extends.</param>
+        /// <param name="attributes">Attributes to remove.</param>
+        public static void RemoveRange(
+            this TagHelperOutput tagHelperOutput,
+            IEnumerable<TagHelperAttribute> attributes)
+        {
+            if (tagHelperOutput == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelperOutput));
+            }
+
+            if (attributes == null)
+            {
+                throw new ArgumentNullException(nameof(attributes));
+            }
+
+            foreach (var attribute in attributes.ToArray())
+            {
+                tagHelperOutput.Attributes.Remove(attribute);
+            }
+        }
+
+        /// <summary>
+        /// Adds the given <paramref name="classValue"/> to the <paramref name="tagHelperOutput"/>'s
+        /// <see cref="TagHelperOutput.Attributes"/>.
+        /// </summary>
+        /// <param name="tagHelperOutput">The <see cref="TagHelperOutput"/> this method extends.</param>
+        /// <param name="classValue">The class value to add.</param>
+        /// <param name="htmlEncoder">The current HTML encoder.</param>
+        public static void AddClass(
+            this TagHelperOutput tagHelperOutput,
+            string classValue,
+            HtmlEncoder htmlEncoder)
+        {
+            if (tagHelperOutput == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelperOutput));
+            }
+
+            if (string.IsNullOrEmpty(classValue))
+            {
+                return;
+            }
+
+            var encodedSpaceChars = SpaceChars.Where(x => !x.Equals('\u0020')).Select(x => htmlEncoder.Encode(x.ToString())).ToArray();
+
+            if (SpaceChars.Any(classValue.Contains) || encodedSpaceChars.Any(value => classValue.IndexOf(value, StringComparison.Ordinal) >= 0))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotContainHtmlSpace, nameof(classValue));
+            }
+
+            if (!tagHelperOutput.Attributes.TryGetAttribute("class", out TagHelperAttribute classAttribute))
+            {
+                tagHelperOutput.Attributes.Add("class", classValue);
+            }
+            else
+            {
+                var currentClassValue = ExtractClassValue(classAttribute, htmlEncoder);
+
+                var encodedClassValue = htmlEncoder.Encode(classValue);
+
+                if (string.Equals(currentClassValue, encodedClassValue, StringComparison.Ordinal))
+                {
+                    return;
+                }
+
+                var arrayOfClasses = currentClassValue.Split(SpaceChars, StringSplitOptions.RemoveEmptyEntries)
+                    .SelectMany(perhapsEncoded => perhapsEncoded.Split(encodedSpaceChars, StringSplitOptions.RemoveEmptyEntries))
+                    .ToArray();
+
+                if (arrayOfClasses.Contains(encodedClassValue, StringComparer.Ordinal))
+                {
+                    return;
+                }
+
+                var newClassAttribute = new TagHelperAttribute(
+                    classAttribute.Name,
+                    new HtmlString($"{currentClassValue} {encodedClassValue}"),
+                    classAttribute.ValueStyle);
+
+                tagHelperOutput.Attributes.SetAttribute(newClassAttribute);
+            }
+        }
+
+        /// <summary>
+        /// Removes the given <paramref name="classValue"/> from the <paramref name="tagHelperOutput"/>'s
+        /// <see cref="TagHelperOutput.Attributes"/>.
+        /// </summary>
+        /// <param name="tagHelperOutput">The <see cref="TagHelperOutput"/> this method extends.</param>
+        /// <param name="classValue">The class value to remove.</param>
+        /// <param name="htmlEncoder">The current HTML encoder.</param>
+        public static void RemoveClass(
+            this TagHelperOutput tagHelperOutput,
+            string classValue,
+            HtmlEncoder htmlEncoder)
+        {
+            if (tagHelperOutput == null)
+            {
+                throw new ArgumentNullException(nameof(tagHelperOutput));
+            }
+
+            var encodedSpaceChars = SpaceChars.Where(x => !x.Equals('\u0020')).Select(x => htmlEncoder.Encode(x.ToString())).ToArray();
+
+            if (SpaceChars.Any(classValue.Contains) || encodedSpaceChars.Any(value => classValue.IndexOf(value, StringComparison.Ordinal) >= 0))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotContainHtmlSpace, nameof(classValue));
+            }
+
+            if (!tagHelperOutput.Attributes.TryGetAttribute("class", out TagHelperAttribute classAttribute))
+            {
+                return;
+            }
+
+            var currentClassValue = ExtractClassValue(classAttribute, htmlEncoder);
+
+            if (string.IsNullOrEmpty(currentClassValue))
+            {
+                return;
+            }
+
+            var encodedClassValue = htmlEncoder.Encode(classValue);
+
+            if (string.Equals(currentClassValue, encodedClassValue, StringComparison.Ordinal))
+            {
+                tagHelperOutput.Attributes.Remove(tagHelperOutput.Attributes["class"]);
+                return;
+            }
+
+            if (!currentClassValue.Contains(encodedClassValue))
+            {
+                return;
+            }
+
+            var listOfClasses = currentClassValue.Split(SpaceChars, StringSplitOptions.RemoveEmptyEntries)
+                .SelectMany(perhapsEncoded => perhapsEncoded.Split(encodedSpaceChars, StringSplitOptions.RemoveEmptyEntries))
+                .ToList();
+
+            if (!listOfClasses.Contains(encodedClassValue))
+            {
+                return;
+            }
+
+            listOfClasses.RemoveAll(x => x.Equals(encodedClassValue));
+
+            if (listOfClasses.Any())
+            {
+                var joinedClasses = new HtmlString(string.Join(" ", listOfClasses));
+                tagHelperOutput.Attributes.SetAttribute(classAttribute.Name, joinedClasses);
+            }
+            else
+            {
+                tagHelperOutput.Attributes.Remove(tagHelperOutput.Attributes["class"]);
+            }
+        }
+
+        private static string ExtractClassValue(
+            TagHelperAttribute classAttribute,
+            HtmlEncoder htmlEncoder)
+        {
+            string extractedClassValue;
+            switch (classAttribute.Value)
+            {
+                case string valueAsString:
+                    extractedClassValue = htmlEncoder.Encode(valueAsString);
+                    break;
+                case HtmlString valueAsHtmlString:
+                    extractedClassValue = valueAsHtmlString.Value;
+                    break;
+                case IHtmlContent htmlContent:
+                    using (var stringWriter = new StringWriter())
+                    {
+                        htmlContent.WriteTo(stringWriter, htmlEncoder);
+                        extractedClassValue = stringWriter.ToString();
+                    }
+                    break;
+                default:
+                    extractedClassValue = htmlEncoder.Encode(classAttribute.Value?.ToString());
+                    break;
+            }
+            var currentClassValue = extractedClassValue ?? string.Empty;
+            return currentClassValue;
+        }
+
+        private static void CopyHtmlAttribute(
+            int allAttributeIndex,
+            TagHelperOutput tagHelperOutput,
+            TagHelperContext context)
+        {
+            var existingAttribute = context.AllAttributes[allAttributeIndex];
+
+            // Move backwards through context.AllAttributes from the provided index until we find a familiar attribute
+            // in tagHelperOutput where we can insert the copied value after the familiar one.
+            for (var i = allAttributeIndex - 1; i >= 0; i--)
+            {
+                var previousName = context.AllAttributes[i].Name;
+                var index = IndexOfFirstMatch(previousName, tagHelperOutput.Attributes);
+                if (index != -1)
+                {
+                    tagHelperOutput.Attributes.Insert(index + 1, existingAttribute);
+                    return;
+                }
+            }
+
+            // Move forward through context.AllAttributes from the provided index until we find a familiar attribute in
+            // tagHelperOutput where we can insert the copied value.
+            for (var i = allAttributeIndex + 1; i < context.AllAttributes.Count; i++)
+            {
+                var nextName = context.AllAttributes[i].Name;
+                var index = IndexOfFirstMatch(nextName, tagHelperOutput.Attributes);
+                if (index != -1)
+                {
+                    tagHelperOutput.Attributes.Insert(index, existingAttribute);
+                    return;
+                }
+            }
+
+            // Couldn't determine the attribute's location, add it to the end.
+            tagHelperOutput.Attributes.Add(existingAttribute);
+        }
+
+        private static int IndexOfFirstMatch(string name, TagHelperAttributeList attributes)
+        {
+            for (var i = 0; i < attributes.Count; i++)
+            {
+                if (string.Equals(name, attributes[i].Name, StringComparison.OrdinalIgnoreCase))
+                {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
+        private class ClassAttributeHtmlContent : IHtmlContent
+        {
+            private readonly object _left;
+            private readonly string _right;
+
+            public ClassAttributeHtmlContent(object left, string right)
+            {
+                _left = left;
+                _right = right;
+            }
+
+            public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+            {
+                if (writer == null)
+                {
+                    throw new ArgumentNullException(nameof(writer));
+                }
+
+                if (encoder == null)
+                {
+                    throw new ArgumentNullException(nameof(encoder));
+                }
+
+                // Write out "{left} {right}" in the common nothing-empty case.
+                var wroteLeft = false;
+                if (_left != null)
+                {
+                    var htmlContent = _left as IHtmlContent;
+                    if (htmlContent != null)
+                    {
+                        // Ignore case where htmlContent is HtmlString.Empty. At worst, will add a leading space to the
+                        // generated attribute value.
+                        htmlContent.WriteTo(writer, encoder);
+                        wroteLeft = true;
+                    }
+                    else
+                    {
+                        var stringValue = _left.ToString();
+                        if (!string.IsNullOrEmpty(stringValue))
+                        {
+                            encoder.Encode(writer, stringValue);
+                            wroteLeft = true;
+                        }
+                    }
+                }
+
+                if (!string.IsNullOrEmpty(_right))
+                {
+                    if (wroteLeft)
+                    {
+                        writer.Write(' ');
+                    }
+
+                    encoder.Encode(writer, _right);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/TextAreaTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/TextAreaTagHelper.cs
new file mode 100644
index 0000000000..293b60a05a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/TextAreaTagHelper.cs
@@ -0,0 +1,105 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    /// <summary>
+    /// <see cref="ITagHelper"/> implementation targeting &lt;textarea&gt; elements with an <c>asp-for</c> attribute.
+    /// </summary>
+    [HtmlTargetElement("textarea", Attributes = ForAttributeName)]
+    public class TextAreaTagHelper : TagHelper
+    {
+        private const string ForAttributeName = "asp-for";
+
+        /// <summary>
+        /// Creates a new <see cref="TextAreaTagHelper"/>.
+        /// </summary>
+        /// <param name="generator">The <see cref="IHtmlGenerator"/>.</param>
+        public TextAreaTagHelper(IHtmlGenerator generator)
+        {
+            Generator = generator;
+        }
+
+        /// <inheritdoc />
+        public override int Order => -1000;
+
+        protected IHtmlGenerator Generator { get; }
+
+        [HtmlAttributeNotBound]
+        [ViewContext]
+        public ViewContext ViewContext { get; set; }
+
+        /// <summary>
+        /// An expression to be evaluated against the current model.
+        /// </summary>
+        [HtmlAttributeName(ForAttributeName)]
+        public ModelExpression For { get; set; }
+
+        /// <summary>
+        /// The name of the &lt;input&gt; element.
+        /// </summary>
+        /// <remarks>
+        /// Passed through to the generated HTML in all cases. Also used to determine whether <see cref="For"/> is
+        /// valid with an empty <see cref="ModelExpression.Name"/>.
+        /// </remarks>
+        public string Name { get; set; }
+
+        /// <inheritdoc />
+        /// <remarks>Does nothing if <see cref="For"/> is <c>null</c>.</remarks>
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (output == null)
+            {
+                throw new ArgumentNullException(nameof(output));
+            }
+
+            // Pass through attribute that is also a well-known HTML attribute. Must be done prior to any copying
+            // from a TagBuilder.
+            if (Name != null)
+            {
+                output.CopyHtmlAttribute(nameof(Name), context);
+            }
+
+            // Ensure Generator does not throw due to empty "fullName" if user provided a name attribute.
+            IDictionary<string, object> htmlAttributes = null;
+            if (string.IsNullOrEmpty(For.Name) &&
+                string.IsNullOrEmpty(ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix) &&
+                !string.IsNullOrEmpty(Name))
+            {
+                htmlAttributes = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase)
+                {
+                    { "name", Name },
+                };
+            }
+
+            var tagBuilder = Generator.GenerateTextArea(
+                ViewContext,
+                For.ModelExplorer,
+                For.Name,
+                rows: 0,
+                columns: 0,
+                htmlAttributes: htmlAttributes);
+
+            if (tagBuilder != null)
+            {
+                output.MergeAttributes(tagBuilder);
+                if (tagBuilder.HasInnerHtml)
+                {
+                    // Overwrite current Content to ensure expression result round-trips correctly.
+                    output.Content.SetHtmlContent(tagBuilder.InnerHtml);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationMessageTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationMessageTagHelper.cs
new file mode 100644
index 0000000000..8858623013
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationMessageTagHelper.cs
@@ -0,0 +1,110 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    /// <summary>
+    /// <see cref="ITagHelper"/> implementation targeting any HTML element with an <c>asp-validation-for</c>
+    /// attribute.
+    /// </summary>
+    [HtmlTargetElement("span", Attributes = ValidationForAttributeName)]
+    public class ValidationMessageTagHelper : TagHelper
+    {
+        private const string DataValidationForAttributeName = "data-valmsg-for";
+        private const string ValidationForAttributeName = "asp-validation-for";
+
+        /// <summary>
+        /// Creates a new <see cref="ValidationMessageTagHelper"/>.
+        /// </summary>
+        /// <param name="generator">The <see cref="IHtmlGenerator"/>.</param>
+        public ValidationMessageTagHelper(IHtmlGenerator generator)
+        {
+            Generator = generator;
+        }
+
+        /// <inheritdoc />
+        public override int Order => -1000;
+
+        [HtmlAttributeNotBound]
+        [ViewContext]
+        public ViewContext ViewContext { get; set; }
+
+        protected IHtmlGenerator Generator { get; }
+
+        [HtmlAttributeName(ValidationForAttributeName)]
+        public ModelExpression For { get; set; }
+
+        /// <inheritdoc />
+        /// <remarks>Does nothing if <see cref="For"/> is <c>null</c>.</remarks>
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (output == null)
+            {
+                throw new ArgumentNullException(nameof(output));
+            }
+
+            if (For != null)
+            {
+                // Ensure Generator does not throw due to empty "fullName" if user provided data-valmsg-for attribute.
+                // Assume data-valmsg-for value is non-empty if attribute is present at all. Should align with name of
+                // another tag helper e.g. an <input/> and those tag helpers bind Name.
+                IDictionary<string, object> htmlAttributes = null;
+                if (string.IsNullOrEmpty(For.Name) &&
+                    string.IsNullOrEmpty(ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix) &&
+                    output.Attributes.ContainsName(DataValidationForAttributeName))
+                {
+                    htmlAttributes = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { DataValidationForAttributeName, "-non-empty-value-" },
+                    };
+                }
+
+                var tagBuilder = Generator.GenerateValidationMessage(
+                    ViewContext,
+                    For.ModelExplorer,
+                    For.Name,
+                    message: null,
+                    tag: null,
+                    htmlAttributes: htmlAttributes);
+
+                if (tagBuilder != null)
+                {
+                    output.MergeAttributes(tagBuilder);
+
+                    // Do not update the content if another tag helper targeting this element has already done so.
+                    if (!output.IsContentModified)
+                    {
+                        // We check for whitespace to detect scenarios such as:
+                        // <span validation-for="Name">
+                        // </span>
+                        var childContent = await output.GetChildContentAsync();
+                        if (childContent.IsEmptyOrWhiteSpace)
+                        {
+                            // Provide default message text (if any) since there was nothing useful in the Razor source.
+                            if (tagBuilder.HasInnerHtml)
+                            {
+                                output.Content.SetHtmlContent(tagBuilder.InnerHtml);
+                            }
+                        }
+                        else
+                        {
+                            output.Content.SetHtmlContent(childContent);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationSummaryTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationSummaryTagHelper.cs
new file mode 100644
index 0000000000..ee090b28c6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationSummaryTagHelper.cs
@@ -0,0 +1,112 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    /// <summary>
+    /// <see cref="ITagHelper"/> implementation targeting any HTML element with an <c>asp-validation-summary</c>
+    /// attribute.
+    /// </summary>
+    [HtmlTargetElement("div", Attributes = ValidationSummaryAttributeName)]
+    public class ValidationSummaryTagHelper : TagHelper
+    {
+        private const string ValidationSummaryAttributeName = "asp-validation-summary";
+        private ValidationSummary _validationSummary;
+
+        /// <summary>
+        /// Creates a new <see cref="ValidationSummaryTagHelper"/>.
+        /// </summary>
+        /// <param name="generator">The <see cref="IHtmlGenerator"/>.</param>
+        public ValidationSummaryTagHelper(IHtmlGenerator generator)
+        {
+            Generator = generator;
+        }
+
+        /// <inheritdoc />
+        public override int Order => -1000;
+
+        [HtmlAttributeNotBound]
+        [ViewContext]
+        public ViewContext ViewContext { get; set; }
+
+        [HtmlAttributeNotBound]
+        protected IHtmlGenerator Generator { get; }
+
+        /// <summary>
+        /// If <see cref="ValidationSummary.All"/> or <see cref="ValidationSummary.ModelOnly"/>, appends a validation
+        /// summary. Otherwise (<see cref="ValidationSummary.None"/>, the default), this tag helper does nothing.
+        /// </summary>
+        /// <exception cref="ArgumentException">
+        /// Thrown if setter is called with an undefined <see cref="ValidationSummary"/> value e.g.
+        /// <c>(ValidationSummary)23</c>.
+        /// </exception>
+        [HtmlAttributeName(ValidationSummaryAttributeName)]
+        public ValidationSummary ValidationSummary
+        {
+            get => _validationSummary;
+            set
+            {
+                switch (value)
+                {
+                    case ValidationSummary.All:
+                    case ValidationSummary.ModelOnly:
+                    case ValidationSummary.None:
+                        _validationSummary = value;
+                        break;
+
+                    default:
+                        throw new ArgumentException(
+                            message: Resources.FormatInvalidEnumArgument(
+                                nameof(value),
+                                value,
+                                typeof(ValidationSummary).FullName),
+                            paramName: nameof(value));
+                }
+            }
+        }
+
+        /// <inheritdoc />
+        /// <remarks>Does nothing if <see cref="ValidationSummary"/> is <see cref="ValidationSummary.None"/>.</remarks>
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (output == null)
+            {
+                throw new ArgumentNullException(nameof(output));
+            }
+
+            if (ValidationSummary == ValidationSummary.None)
+            {
+                return;
+            }
+
+            var tagBuilder = Generator.GenerateValidationSummary(
+                ViewContext,
+                excludePropertyErrors: ValidationSummary == ValidationSummary.ModelOnly,
+                message: null,
+                headerTag: null,
+                htmlAttributes: null);
+            if (tagBuilder == null)
+            {
+                // The generator determined no element was necessary.
+                output.SuppressOutput();
+                return;
+            }
+
+            output.MergeAttributes(tagBuilder);
+            if (tagBuilder.HasInnerHtml)
+            {
+                output.PostContent.AppendHtml(tagBuilder.InnerHtml);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/_grunt.readme b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/_grunt.readme
new file mode 100644
index 0000000000..ed50eafb60
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/_grunt.readme
@@ -0,0 +1 @@
+To recreate minified js files, rename _gruntfile.js to gruntfile.js, _package.json to package.json, and run build.
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/_gruntfile.js b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/_gruntfile.js
new file mode 100644
index 0000000000..a18adbf35d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/_gruntfile.js
@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+module.exports = function (grunt) {
+    grunt.initConfig({
+        jshint: {
+            scripts: [ "js/**/*.js" ]
+        },
+        uglify: {
+            scripts: {
+                files: [{
+                    expand: true,
+                    cwd: "js",
+                    src: "**/*.js",
+                    dest: "compiler/resources"
+                }]
+            }
+        }
+    });
+
+    grunt.loadNpmTasks("grunt-contrib-jshint");
+    grunt.loadNpmTasks("grunt-contrib-uglify");
+
+    grunt.registerTask("default", [ "jshint", "uglify" ]);
+};
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/_package.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/_package.json
new file mode 100644
index 0000000000..ea557bf64e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/_package.json
@@ -0,0 +1,10 @@
+{
+    "version": "1.0.0",
+    "name": "Microsoft.AspNetCore.Mvc.TagHelpers",
+    "private": true,
+    "devDependencies": {
+        "grunt": "~0.4.5",
+        "grunt-contrib-jshint": "~0.11.0",
+        "grunt-contrib-uglify": "~0.7.0"
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/baseline.netcore.json
new file mode 100644
index 0000000000..1de8718123
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/baseline.netcore.json
@@ -0,0 +1,3935 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc.TagHelpers, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.ValidationSummary",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "None",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "ModelOnly",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "All",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.AnchorTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Generator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Action",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Action",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Controller",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Controller",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Area",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Area",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Page",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Page",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PageHandler",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PageHandler",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Protocol",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Protocol",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Host",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Host",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Fragment",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Fragment",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Route",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Route",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteValues",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RouteValues",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IDictionary<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Process",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            },
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "generator",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelperBase",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ProcessAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            },
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MemoryCache",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.Caching.Memory.IMemoryCache",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Priority",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<Microsoft.Extensions.Caching.Memory.CacheItemPriority>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Priority",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<Microsoft.Extensions.Caching.Memory.CacheItemPriority>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "factory",
+              "Type": "Microsoft.AspNetCore.Mvc.TagHelpers.Internal.CacheTagHelperMemoryCacheFactory"
+            },
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "CacheKeyPrefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelperBase",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HtmlEncoder",
+          "Parameters": [],
+          "ReturnType": "System.Text.Encodings.Web.HtmlEncoder",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_VaryBy",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_VaryBy",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_VaryByHeader",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_VaryByHeader",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_VaryByQuery",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_VaryByQuery",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_VaryByRoute",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_VaryByRoute",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_VaryByCookie",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_VaryByCookie",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_VaryByUser",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_VaryByUser",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ExpiresOn",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.DateTimeOffset>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ExpiresOn",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.DateTimeOffset>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ExpiresAfter",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.TimeSpan>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ExpiresAfter",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.TimeSpan>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ExpiresSliding",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.TimeSpan>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ExpiresSliding",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.TimeSpan>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Enabled",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Enabled",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "DefaultExpiration",
+          "Parameters": [],
+          "ReturnType": "System.TimeSpan",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelperOptions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_SizeLimit",
+          "Parameters": [],
+          "ReturnType": "System.Int64",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SizeLimit",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int64"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.DistributedCacheTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelperBase",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ProcessAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            },
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MemoryCache",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.Caching.Memory.IMemoryCache",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "distributedCacheService",
+              "Type": "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.IDistributedCacheTagHelperService"
+            },
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "CacheKeyPrefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.EnvironmentTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Names",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Names",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Include",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Include",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Exclude",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Exclude",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HostingEnvironment",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Hosting.IHostingEnvironment",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Process",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            },
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "hostingEnvironment",
+              "Type": "Microsoft.AspNetCore.Hosting.IHostingEnvironment"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.FormActionTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_UrlHelperFactory",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Action",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Action",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Controller",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Controller",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Area",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Area",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Page",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Page",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PageHandler",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PageHandler",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Fragment",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Fragment",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Route",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Route",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteValues",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RouteValues",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IDictionary<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Process",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            },
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "urlHelperFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.FormTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Generator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Action",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Action",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Controller",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Controller",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Area",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Area",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Page",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Page",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PageHandler",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_PageHandler",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Antiforgery",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Boolean>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Antiforgery",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.Boolean>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Fragment",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Fragment",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Route",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Route",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Method",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Method",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteValues",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RouteValues",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IDictionary<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Process",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            },
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "generator",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.ImageTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Src",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Src",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AppendVersion",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AppendVersion",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HostingEnvironment",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Hosting.IHostingEnvironment",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Cache",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.Caching.Memory.IMemoryCache",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Process",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            },
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "hostingEnvironment",
+              "Type": "Microsoft.AspNetCore.Hosting.IHostingEnvironment"
+            },
+            {
+              "Name": "cache",
+              "Type": "Microsoft.Extensions.Caching.Memory.IMemoryCache"
+            },
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            },
+            {
+              "Name": "urlHelperFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.InputTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Generator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_For",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_For",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Format",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Format",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_InputTypeName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_InputTypeName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Value",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Value",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Process",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            },
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetInputType",
+          "Parameters": [
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "inputTypeHint",
+              "Type": "System.String",
+              "Direction": "Out"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "generator",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.LabelTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ProcessAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            },
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Generator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_For",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_For",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "generator",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.LinkTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Href",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Href",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HrefInclude",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HrefInclude",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HrefExclude",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HrefExclude",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FallbackHref",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FallbackHref",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AppendVersion",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Boolean>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AppendVersion",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.Boolean>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FallbackHrefInclude",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FallbackHrefInclude",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FallbackHrefExclude",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FallbackHrefExclude",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FallbackTestClass",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FallbackTestClass",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FallbackTestProperty",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FallbackTestProperty",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FallbackTestValue",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FallbackTestValue",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HostingEnvironment",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Hosting.IHostingEnvironment",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Cache",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.Caching.Memory.IMemoryCache",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_JavaScriptEncoder",
+          "Parameters": [],
+          "ReturnType": "System.Text.Encodings.Web.JavaScriptEncoder",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_GlobbingUrlBuilder",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.TagHelpers.Internal.GlobbingUrlBuilder",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_GlobbingUrlBuilder",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.TagHelpers.Internal.GlobbingUrlBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Process",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            },
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "hostingEnvironment",
+              "Type": "Microsoft.AspNetCore.Hosting.IHostingEnvironment"
+            },
+            {
+              "Name": "cache",
+              "Type": "Microsoft.Extensions.Caching.Memory.IMemoryCache"
+            },
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            },
+            {
+              "Name": "javaScriptEncoder",
+              "Type": "System.Text.Encodings.Web.JavaScriptEncoder"
+            },
+            {
+              "Name": "urlHelperFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.OptionTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ProcessAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            },
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Generator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Value",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Value",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "generator",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.PartialTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ProcessAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            },
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_For",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_For",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Model",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Model",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewData",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "viewEngine",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine"
+            },
+            {
+              "Name": "viewBufferScope",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.Internal.IViewBufferScope"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.RenderAtEndOfFormTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Init",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ProcessAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            },
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.ScriptTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Src",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Src",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SrcInclude",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SrcInclude",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SrcExclude",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SrcExclude",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FallbackSrc",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FallbackSrc",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AppendVersion",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Boolean>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AppendVersion",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.Boolean>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FallbackSrcInclude",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FallbackSrcInclude",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FallbackSrcExclude",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FallbackSrcExclude",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FallbackTestExpression",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FallbackTestExpression",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HostingEnvironment",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Hosting.IHostingEnvironment",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Cache",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.Caching.Memory.IMemoryCache",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_JavaScriptEncoder",
+          "Parameters": [],
+          "ReturnType": "System.Text.Encodings.Web.JavaScriptEncoder",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_GlobbingUrlBuilder",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.TagHelpers.Internal.GlobbingUrlBuilder",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_GlobbingUrlBuilder",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.TagHelpers.Internal.GlobbingUrlBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Process",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            },
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "hostingEnvironment",
+              "Type": "Microsoft.AspNetCore.Hosting.IHostingEnvironment"
+            },
+            {
+              "Name": "cache",
+              "Type": "Microsoft.Extensions.Caching.Memory.IMemoryCache"
+            },
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            },
+            {
+              "Name": "javaScriptEncoder",
+              "Type": "System.Text.Encodings.Web.JavaScriptEncoder"
+            },
+            {
+              "Name": "urlHelperFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.SelectTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Init",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Generator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_For",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_For",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Items",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Items",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Process",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            },
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "generator",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.TagHelperOutputExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CopyHtmlAttribute",
+          "Parameters": [
+            {
+              "Name": "tagHelperOutput",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            },
+            {
+              "Name": "attributeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MergeAttributes",
+          "Parameters": [
+            {
+              "Name": "tagHelperOutput",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            },
+            {
+              "Name": "tagBuilder",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RemoveRange",
+          "Parameters": [
+            {
+              "Name": "tagHelperOutput",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            },
+            {
+              "Name": "attributes",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddClass",
+          "Parameters": [
+            {
+              "Name": "tagHelperOutput",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            },
+            {
+              "Name": "classValue",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RemoveClass",
+          "Parameters": [
+            {
+              "Name": "tagHelperOutput",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            },
+            {
+              "Name": "classValue",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.TextAreaTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Generator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_For",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_For",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Process",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            },
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "generator",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.ValidationMessageTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ProcessAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            },
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Generator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_For",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_For",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "generator",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.ValidationSummaryTagHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Generator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidationSummary",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ValidationSummary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ValidationSummary",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ValidationSummary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Process",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            },
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "generator",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.CacheTagKey",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "System.IEquatable<Microsoft.AspNetCore.Mvc.TagHelpers.Cache.CacheTagKey>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GenerateKey",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateHashedKey",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "obj",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Equals",
+          "Parameters": [
+            {
+              "Name": "other",
+              "Type": "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.CacheTagKey"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Mvc.TagHelpers.Cache.CacheTagKey>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetHashCode",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "tagHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelper"
+            },
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "tagHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.TagHelpers.DistributedCacheTagHelper"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.DistributedCacheTagHelperFormatter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.IDistributedCacheTagHelperFormatter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "SerializeAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.DistributedCacheTagHelperFormattingContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Byte[]>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.IDistributedCacheTagHelperFormatter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DeserializeAsync",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Byte[]"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.HtmlString>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.IDistributedCacheTagHelperFormatter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.DistributedCacheTagHelperFormattingContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Html",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Html.HtmlString",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Html",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Html.HtmlString"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.DistributedCacheTagHelperService",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.IDistributedCacheTagHelperService"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ProcessContentAsync",
+          "Parameters": [
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            },
+            {
+              "Name": "key",
+              "Type": "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.CacheTagKey"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.IDistributedCacheTagHelperService",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "storage",
+              "Type": "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.IDistributedCacheTagHelperStorage"
+            },
+            {
+              "Name": "formatter",
+              "Type": "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.IDistributedCacheTagHelperFormatter"
+            },
+            {
+              "Name": "HtmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.DistributedCacheTagHelperStorage",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.IDistributedCacheTagHelperStorage"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetAsync",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Byte[]>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.IDistributedCacheTagHelperStorage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetAsync",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Byte[]"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.IDistributedCacheTagHelperStorage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "distributedCache",
+              "Type": "Microsoft.Extensions.Caching.Distributed.IDistributedCache"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.IDistributedCacheTagHelperFormatter",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "SerializeAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.DistributedCacheTagHelperFormattingContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Byte[]>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DeserializeAsync",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Byte[]"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.HtmlString>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.IDistributedCacheTagHelperService",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ProcessContentAsync",
+          "Parameters": [
+            {
+              "Name": "output",
+              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
+            },
+            {
+              "Name": "key",
+              "Type": "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.CacheTagKey"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TagHelpers.Cache.IDistributedCacheTagHelperStorage",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetAsync",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Byte[]>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetAsync",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Byte[]"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.TagHelperServicesExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddCacheTagHelper",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddCacheTagHelperLimits",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelperOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddCacheTagHelperLimits",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "configure",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelperOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/compiler/resources/LinkTagHelper_FallbackJavaScript.js b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/compiler/resources/LinkTagHelper_FallbackJavaScript.js
new file mode 100644
index 0000000000..7d4596bfea
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/compiler/resources/LinkTagHelper_FallbackJavaScript.js
@@ -0,0 +1 @@
+!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}();
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/js/LinkTagHelper_FallbackJavaScript.js b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/js/LinkTagHelper_FallbackJavaScript.js
new file mode 100644
index 0000000000..17e229dc49
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/js/LinkTagHelper_FallbackJavaScript.js
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+(
+ /**
+  * This function finds the previous element (assumed to be meta) and tests its current CSS style using the passed
+  * values, to determine if a stylesheet was loaded. If not, this function loads the fallback stylesheet via
+  * document.write.
+  *
+  * @param {string} cssTestPropertyName - The name of the CSS property to test.
+  * @param {string} cssTestPropertyValue - The value to test the specified CSS property for.
+  * @param {string[]} fallbackHrefs - The URLs to the stylesheets to load in the case the test fails.
+  * @param {string} extraAttributes - The extra attributes string that should be included on the generated link tags.
+  */
+ function loadFallbackStylesheet(cssTestPropertyName, cssTestPropertyValue, fallbackHrefs, extraAttributes) {
+    var doc = document,
+        // Find the last script tag on the page which will be this one, as JS executes as it loads
+        scriptElements = doc.getElementsByTagName("SCRIPT"),
+        // Find the meta tag before this script tag, that's the element we're going to test the CSS property on
+        meta = scriptElements[scriptElements.length - 1].previousElementSibling,
+        // Get the current style of the meta tag starting with standards-based API and falling back to <=IE8 API
+        metaStyle = (doc.defaultView && doc.defaultView.getComputedStyle) ? doc.defaultView.getComputedStyle(meta)
+            : meta.currentStyle,
+        i;
+
+    if (metaStyle && metaStyle[cssTestPropertyName] !== cssTestPropertyValue) {
+        for (i = 0; i < fallbackHrefs.length; i++) {
+            doc.write('<link href="' + fallbackHrefs[i] + '" ' + extraAttributes + '/>');
+        }
+    }
+})();
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Handlers/CookieContainerHandler.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Handlers/CookieContainerHandler.cs
new file mode 100644
index 0000000000..bde4250b50
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Handlers/CookieContainerHandler.cs
@@ -0,0 +1,61 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Net.Http.Headers;
+
+namespace Microsoft.AspNetCore.Mvc.Testing.Handlers
+{
+    /// <summary>
+    /// A <see cref="DelegatingHandler"/> that manages cookies associated with one or
+    /// more pairs of <see cref="HttpRequestMessage"/> and <see cref="HttpResponseMessage"/>.
+    /// </summary>
+    public class CookieContainerHandler : DelegatingHandler
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="CookieContainerHandler"/>.
+        /// </summary>
+        public CookieContainerHandler()
+            : this(new CookieContainer())
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="CookieContainerHandler"/>.
+        /// </summary>
+        /// <param name="cookieContainer">The <see cref="CookieContainer"/> to use for
+        /// storing and retrieving cookies.
+        /// </param>
+        public CookieContainerHandler(CookieContainer cookieContainer)
+        {
+            Container = cookieContainer;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="CookieContainer"/> used to store and retrieve cookies.
+        /// </summary>
+        public CookieContainer Container { get; }
+
+        /// <inheritdoc />
+        protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            var cookieHeader = Container.GetCookieHeader(request.RequestUri);
+            request.Headers.Add(HeaderNames.Cookie, cookieHeader);
+
+            var response = await base.SendAsync(request, cancellationToken);
+
+            if (response.Headers.TryGetValues(HeaderNames.SetCookie, out var setCookieHeaders))
+            {
+                foreach (var header in setCookieHeaders)
+                {
+                    Container.SetCookies(response.RequestMessage.RequestUri, header);
+                }
+            }
+
+            return response;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Handlers/RedirectHandler.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Handlers/RedirectHandler.cs
new file mode 100644
index 0000000000..63158713d3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Handlers/RedirectHandler.cs
@@ -0,0 +1,161 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Net;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.Testing.Handlers
+{
+    /// <summary>
+    /// A <see cref="DelegatingHandler"/> that follows redirect responses.
+    /// </summary>
+    public class RedirectHandler : DelegatingHandler
+    {
+        internal const int DefaultMaxRedirects = 7;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="RedirectHandler"/>.
+        /// </summary>
+        public RedirectHandler()
+            : this(maxRedirects: DefaultMaxRedirects)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="RedirectHandler"/>.
+        /// </summary>
+        /// <param name="maxRedirects">The maximun number of redirect responses to follow. It must be
+        /// equal or greater than 0.</param>
+        public RedirectHandler(int maxRedirects)
+        {
+            if (maxRedirects <= 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(maxRedirects));
+            }
+
+            MaxRedirects = maxRedirects;
+        }
+
+        /// <summary>
+        /// Gets the maximum number of redirects this handler will follow.
+        /// </summary>
+        public int MaxRedirects { get; }
+
+        /// <inheritdoc />
+        protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            var remainingRedirects = MaxRedirects;
+
+            var originalRequestContent = HasBody(request) ? await DuplicateRequestContent(request) : null;
+            var response = await base.SendAsync(request, cancellationToken);
+            while (IsRedirect(response) && remainingRedirects >= 0)
+            {
+                remainingRedirects--;
+                var redirectRequest = GetRedirectRequest(response, originalRequestContent);
+                originalRequestContent = HasBody(redirectRequest) ? await DuplicateRequestContent(redirectRequest) : null;
+                response = await base.SendAsync(redirectRequest, cancellationToken);
+            }
+
+            return response;
+        }
+
+        private static bool HasBody(HttpRequestMessage request) =>
+            request.Method == HttpMethod.Post || request.Method == HttpMethod.Put;
+
+        private static async Task<HttpContent> DuplicateRequestContent(HttpRequestMessage request)
+        {
+            if (request.Content == null)
+            {
+                return null;
+            }
+            var originalRequestContent = request.Content;
+            var (originalBody, copy) = await CopyBody(request);
+
+            var contentCopy = new StreamContent(copy);
+            request.Content = new StreamContent(originalBody);
+
+            CopyContentHeaders(originalRequestContent, request.Content, contentCopy);
+
+            return contentCopy;
+        }
+
+        private static void CopyContentHeaders(
+            HttpContent originalRequestContent,
+            HttpContent newRequestContent,
+            HttpContent contentCopy)
+        {
+            foreach (var header in originalRequestContent.Headers)
+            {
+                contentCopy.Headers.Add(header.Key, header.Value);
+                newRequestContent.Headers.Add(header.Key, header.Value);
+            }
+        }
+
+        private static async Task<(Stream originalBody, Stream copy)> CopyBody(HttpRequestMessage request)
+        {
+            var originalBody = await request.Content.ReadAsStreamAsync();
+            var bodyCopy = new MemoryStream();
+            await originalBody.CopyToAsync(bodyCopy);
+            bodyCopy.Seek(0, SeekOrigin.Begin);
+            if (originalBody.CanSeek)
+            {
+                originalBody.Seek(0, SeekOrigin.Begin);
+            }
+            else
+            {
+                originalBody = new MemoryStream();
+                await bodyCopy.CopyToAsync(originalBody);
+                originalBody.Seek(0, SeekOrigin.Begin);
+                bodyCopy.Seek(0, SeekOrigin.Begin);
+            }
+
+            return (originalBody, bodyCopy);
+        }
+
+        private static HttpRequestMessage GetRedirectRequest(
+            HttpResponseMessage response,
+            HttpContent originalContent)
+        {
+            var location = response.Headers.Location;
+            if (!location.IsAbsoluteUri)
+            {
+                location = new Uri(
+                    new Uri(response.RequestMessage.RequestUri.GetLeftPart(UriPartial.Authority)),
+                    location);
+            }
+
+            var redirect = !ShouldKeepVerb(response) ?
+                new HttpRequestMessage(HttpMethod.Get, location) :
+                new HttpRequestMessage(response.RequestMessage.Method, location)
+                {
+                    Content = originalContent
+                };
+
+            foreach (var header in response.RequestMessage.Headers)
+            {
+                redirect.Headers.Add(header.Key, header.Value);
+            }
+
+            foreach (var property in response.RequestMessage.Properties)
+            {
+                redirect.Properties.Add(property.Key, property.Value);
+            }
+
+            return redirect;
+        }
+
+        private static bool ShouldKeepVerb(HttpResponseMessage response) =>
+            response.StatusCode == HttpStatusCode.RedirectKeepVerb ||
+                (int)response.StatusCode == 308;
+
+        private bool IsRedirect(HttpResponseMessage response) => 
+            response.StatusCode == HttpStatusCode.MovedPermanently ||
+                response.StatusCode == HttpStatusCode.Redirect ||
+                response.StatusCode == HttpStatusCode.RedirectKeepVerb ||
+                (int)response.StatusCode == 308;
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj
new file mode 100644
index 0000000000..cf0a443e19
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Support for writing functional tests for MVC applications.</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>aspnetcore;aspnetcoremvc;aspnetcoremvctesting</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostPackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="build\**\*.targets" Pack="true" PackagePath="%(Identity)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..cd0ce4b518
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Properties/Resources.Designer.cs
@@ -0,0 +1,58 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.Testing
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class Resources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.Testing.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// No method 'public static {0} CreateWebHostBuilder(string[] args)' found on '{1}'. Alternatively, {2} can be extended and 'protected virtual {0} {3}()' can be overridden to provide your own {0} instance.
+        /// </summary>
+        internal static string MissingCreateWebHostBuilderMethod
+        {
+            get => GetString("MissingCreateWebHostBuilderMethod");
+        }
+
+        /// <summary>
+        /// No method 'public static {0} CreateWebHostBuilder(string[] args)' found on '{1}'. Alternatively, {2} can be extended and 'protected virtual {0} {3}()' can be overridden to provide your own {0} instance.
+        /// </summary>
+        internal static string FormatMissingCreateWebHostBuilderMethod(object p0, object p1, object p2, object p3)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MissingCreateWebHostBuilderMethod"), p0, p1, p2, p3);
+
+        /// <summary>
+        /// Can't find'{0}'. This file is required for functional tests to run properly. There should be a copy of the file on your source project bin folder. If that is not the case, make sure that the property PreserveCompilationContext is set to true on your project file. E.g '&lt;PreserveCompilationContext&gt;true&lt;/PreserveCompilationContext&gt;'. For functional tests to work they need to either run from the build output folder or the {1} file from your application's output directory must be copied to the folder where the tests are running on. A common cause for this error is having shadow copying enabled when the tests run.
+        /// </summary>
+        internal static string MissingDepsFile
+        {
+            get => GetString("MissingDepsFile");
+        }
+
+        /// <summary>
+        /// Can't find'{0}'. This file is required for functional tests to run properly. There should be a copy of the file on your source project bin folder. If that is not the case, make sure that the property PreserveCompilationContext is set to true on your project file. E.g '&lt;PreserveCompilationContext&gt;true&lt;/PreserveCompilationContext&gt;'. For functional tests to work they need to either run from the build output folder or the {1} file from your application's output directory must be copied to the folder where the tests are running on. A common cause for this error is having shadow copying enabled when the tests run.
+        /// </summary>
+        internal static string FormatMissingDepsFile(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MissingDepsFile"), p0, p1);
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Resources.resx
new file mode 100644
index 0000000000..8174cf1f2d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Resources.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="MissingCreateWebHostBuilderMethod" xml:space="preserve">
+    <value>No method 'public static {0} CreateWebHostBuilder(string[] args)' found on '{1}'. Alternatively, {2} can be extended and 'protected virtual {0} {3}()' can be overridden to provide your own {0} instance.</value>
+  </data>
+  <data name="MissingDepsFile" xml:space="preserve">
+    <value>Can't find'{0}'. This file is required for functional tests to run properly. There should be a copy of the file on your source project bin folder. If that is not the case, make sure that the property PreserveCompilationContext is set to true on your project file. E.g '&lt;PreserveCompilationContext&gt;true&lt;/PreserveCompilationContext&gt;'. For functional tests to work they need to either run from the build output folder or the {1} file from your application's output directory must be copied to the folder where the tests are running on. A common cause for this error is having shadow copying enabled when the tests run.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactory.cs
new file mode 100644
index 0000000000..3e31e9b5aa
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactory.cs
@@ -0,0 +1,454 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Reflection;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.Extensions.DependencyModel;
+
+namespace Microsoft.AspNetCore.Mvc.Testing
+{
+    /// <summary>
+    /// Factory for bootstrapping an application in memory for functional end to end tests.
+    /// </summary>
+    /// <typeparam name="TEntryPoint">A type in the entry point assembly of the application.
+    /// Typically the Startup or Program classes can be used.</typeparam>
+    public class WebApplicationFactory<TEntryPoint> : IDisposable where TEntryPoint : class
+    {
+        private bool _disposed;
+        private TestServer _server;
+        private Action<IWebHostBuilder> _configuration;
+        private IList<HttpClient> _clients = new List<HttpClient>();
+        private List<WebApplicationFactory<TEntryPoint>> _derivedFactories =
+            new List<WebApplicationFactory<TEntryPoint>>();
+
+        /// <summary>
+        /// <para>
+        /// Creates an instance of <see cref="WebApplicationFactory{TEntryPoint}"/>. This factory can be used to
+        /// create a <see cref="TestServer"/> instance using the MVC application defined by <typeparamref name="TEntryPoint"/>
+        /// and one or more <see cref="HttpClient"/> instances used to send <see cref="HttpRequestMessage"/> to the <see cref="TestServer"/>.
+        /// The <see cref="WebApplicationFactory{TEntryPoint}"/> will find the entry point class of <typeparamref name="TEntryPoint"/>
+        /// assembly and initialize the application by calling <c>IWebHostBuilder CreateWebHostBuilder(string [] args)</c>
+        /// on <typeparamref name="TEntryPoint"/>.
+        /// </para>
+        /// <para>
+        /// This constructor will infer the application content root path by searching for a
+        /// <see cref="WebApplicationFactoryContentRootAttribute"/> on the assembly containing the functional tests with
+        /// a key equal to the <typeparamref name="TEntryPoint"/> assembly <see cref="Assembly.FullName"/>.
+        /// In case an attribute with the right key can't be found, <see cref="WebApplicationFactory{TEntryPoint}"/>
+        /// will fall back to searching for a solution file (*.sln) and then appending <typeparamref name="TEntryPoint"/> asembly name
+        /// to the solution directory. The application root directory will be used to discover views and content files.
+        /// </para>
+        /// <para>
+        /// The application assemblies will be loaded from the dependency context of the assembly containing
+        /// <typeparamref name="TEntryPoint" />. This means that project dependencies of the assembly containing
+        /// <typeparamref name="TEntryPoint" /> will be loaded as application assemblies.
+        /// </para>
+        /// </summary>
+        public WebApplicationFactory()
+        {
+            _configuration = ConfigureWebHost;
+        }
+
+        /// <summary>
+        /// Finalizes an instance of the <see cref="WebApplicationFactory{TEntryPoint}"/> class.
+        /// </summary>
+        ~WebApplicationFactory()
+        {
+            Dispose(false);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="TestServer"/> created by this <see cref="WebApplicationFactory{TEntryPoint}"/>.
+        /// </summary>
+        public TestServer Server => _server;
+
+        /// <summary>
+        /// Gets the <see cref="IReadOnlyList{WebApplicationFactory}"/> of factories created from this factory
+        /// by further customizing the <see cref="IWebHostBuilder"/> when calling 
+        /// <see cref="WebApplicationFactory{TEntryPoint}.WithWebHostBuilder(Action{IWebHostBuilder})"/>.
+        /// </summary>
+        public IReadOnlyList<WebApplicationFactory<TEntryPoint>> Factories => _derivedFactories.AsReadOnly();
+
+        /// <summary>
+        /// Gets the <see cref="WebApplicationFactoryClientOptions"/> used by <see cref="CreateClient()"/>.
+        /// </summary>
+        public WebApplicationFactoryClientOptions ClientOptions { get; private set; } = new WebApplicationFactoryClientOptions();
+
+        /// <summary>
+        /// Creates a new <see cref="WebApplicationFactory{TEntryPoint}"/> with a <see cref="IWebHostBuilder"/>
+        /// that is further customized by <paramref name="configuration"/>.
+        /// </summary>
+        /// <param name="configuration">
+        /// An <see cref="Action{IWebHostBuilder}"/> to configure the <see cref="IWebHostBuilder"/>.
+        /// </param>
+        /// <returns>A new <see cref="WebApplicationFactory{TEntryPoint}"/>.</returns>
+        public WebApplicationFactory<TEntryPoint> WithWebHostBuilder(Action<IWebHostBuilder> configuration) =>
+            WithWebHostBuilderCore(configuration);
+
+        internal virtual WebApplicationFactory<TEntryPoint> WithWebHostBuilderCore(Action<IWebHostBuilder> configuration)
+        {
+            var factory = new DelegatedWebApplicationFactory(
+                ClientOptions,
+                CreateServer,
+                CreateWebHostBuilder,
+                GetTestAssemblies,
+                ConfigureClient,
+                builder =>
+                {
+                    _configuration(builder);
+                    configuration(builder);
+                });
+
+            _derivedFactories.Add(factory);
+
+            return factory;
+        }
+
+        private void EnsureServer()
+        {
+            if (_server != null)
+            {
+                return;
+            }
+
+            EnsureDepsFile();
+
+
+            var builder = CreateWebHostBuilder();
+            SetContentRoot(builder);
+            _configuration(builder);
+            _server = CreateServer(builder);
+        }
+
+        private void SetContentRoot(IWebHostBuilder builder)
+        {
+            var metadataAttributes = GetContentRootMetadataAttributes(
+                typeof(TEntryPoint).Assembly.FullName,
+                typeof(TEntryPoint).Assembly.GetName().Name);
+
+            string contentRoot = null;
+            for (var i = 0; i < metadataAttributes.Length; i++)
+            {
+                var contentRootAttribute = metadataAttributes[i];
+                var contentRootCandidate = Path.Combine(
+                    AppContext.BaseDirectory,
+                    contentRootAttribute.ContentRootPath);
+
+                var contentRootMarker = Path.Combine(
+                    contentRootCandidate,
+                    Path.GetFileName(contentRootAttribute.ContentRootTest));
+
+                if (File.Exists(contentRootMarker))
+                {
+                    contentRoot = contentRootCandidate;
+                    break;
+                }
+            }
+
+            if (contentRoot != null)
+            {
+                builder.UseContentRoot(contentRoot);
+            }
+            else
+            {
+                builder.UseSolutionRelativeContentRoot(typeof(TEntryPoint).Assembly.GetName().Name);
+            }
+        }
+
+        private WebApplicationFactoryContentRootAttribute[] GetContentRootMetadataAttributes(
+            string tEntryPointAssemblyFullName,
+            string tEntryPointAssemblyName)
+        {
+            var testAssembly = GetTestAssemblies();
+            var metadataAttributes = testAssembly
+                .SelectMany(a => a.GetCustomAttributes<WebApplicationFactoryContentRootAttribute>())
+                .Where(a => string.Equals(a.Key, tEntryPointAssemblyFullName, StringComparison.OrdinalIgnoreCase) ||
+                            string.Equals(a.Key, tEntryPointAssemblyName, StringComparison.OrdinalIgnoreCase))
+                .OrderBy(a => a.Priority)
+                .ToArray();
+
+            return metadataAttributes;
+        }
+
+        /// <summary>
+        /// Gets the assemblies containing the functional tests. The
+        /// <see cref="WebApplicationFactoryContentRootAttribute"/> applied to these
+        /// assemblies defines the content root to use for the given
+        /// <typeparamref name="TEntryPoint"/>.
+        /// </summary>
+        /// <returns>The list of <see cref="Assembly"/> containing tests.</returns>
+        protected virtual IEnumerable<Assembly> GetTestAssemblies()
+        {
+            try
+            {
+                // The default dependency context will be populated in .net core applications.
+                var context = DependencyContext.Default;
+                if (context == null || context.CompileLibraries.Count == 0)
+                {
+                    // The app domain friendly name will be populated in full framework.
+                    return new[] { Assembly.Load(AppDomain.CurrentDomain.FriendlyName) };
+                }
+
+                var runtimeProjectLibraries = context.RuntimeLibraries
+                    .ToDictionary(r => r.Name, r => r, StringComparer.Ordinal);
+
+                // Find the list of projects
+                var projects = context.CompileLibraries.Where(l => l.Type == "project");
+
+                var entryPointAssemblyName = typeof(TEntryPoint).Assembly.GetName().Name;
+
+                // Find the list of projects referencing TEntryPoint.
+                var candidates = context.CompileLibraries
+                    .Where(library => library.Dependencies.Any(d => string.Equals(d.Name, entryPointAssemblyName, StringComparison.Ordinal)));
+
+                var testAssemblies = new List<Assembly>();
+                foreach (var candidate in candidates)
+                {
+                    if (runtimeProjectLibraries.TryGetValue(candidate.Name, out var runtimeLibrary))
+                    {
+                        var runtimeAssemblies = runtimeLibrary.GetDefaultAssemblyNames(context);
+                        testAssemblies.AddRange(runtimeAssemblies.Select(Assembly.Load));
+                    }
+                }
+
+                return testAssemblies;
+            }
+            catch (Exception)
+            {
+            }
+
+            return Array.Empty<Assembly>();
+        }
+
+        private void EnsureDepsFile()
+        {
+            var depsFileName = $"{typeof(TEntryPoint).Assembly.GetName().Name}.deps.json";
+            var depsFile = new FileInfo(Path.Combine(AppContext.BaseDirectory, depsFileName));
+            if (!depsFile.Exists)
+            {
+                throw new InvalidOperationException(Resources.FormatMissingDepsFile(
+                    depsFile.FullName,
+                    Path.GetFileName(depsFile.FullName)));
+            }
+        }
+
+        /// <summary>
+        /// Creates a <see cref="IWebHostBuilder"/> used to set up <see cref="TestServer"/>.
+        /// </summary>
+        /// <remarks>
+        /// The default implementation of this method looks for a <c>public static IWebHostBuilder CreateDefaultBuilder(string[] args)</c>
+        /// method defined on the entry point of the assembly of <typeparamref name="TEntryPoint" /> and invokes it passing an empty string
+        /// array as arguments.
+        /// </remarks>
+        /// <returns>A <see cref="IWebHostBuilder"/> instance.</returns>
+        protected virtual IWebHostBuilder CreateWebHostBuilder()
+        {
+            var builder = WebHostBuilderFactory.CreateFromTypesAssemblyEntryPoint<TEntryPoint>(Array.Empty<string>());
+            if (builder == null)
+            {
+                throw new InvalidOperationException(Resources.FormatMissingCreateWebHostBuilderMethod(
+                    nameof(IWebHostBuilder),
+                    typeof(TEntryPoint).Assembly.EntryPoint.DeclaringType.FullName,
+                    typeof(WebApplicationFactory<TEntryPoint>).Name,
+                    nameof(CreateWebHostBuilder)));
+            }
+            else
+            {
+                return builder.UseEnvironment("Development");
+            }
+        }
+
+        /// <summary>
+        /// Creates the <see cref="TestServer"/> with the bootstrapped application in <paramref name="builder"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IWebHostBuilder"/> used to
+        /// create the server.</param>
+        /// <returns>The <see cref="TestServer"/> with the bootstrapped application.</returns>
+        protected virtual TestServer CreateServer(IWebHostBuilder builder) => new TestServer(builder);
+
+        /// <summary>
+        /// Gives a fixture an opportunity to configure the application before it gets built.
+        /// </summary>
+        /// <param name="builder">The <see cref="IWebHostBuilder"/> for the application.</param>
+        protected virtual void ConfigureWebHost(IWebHostBuilder builder)
+        {
+        }
+
+        /// <summary>
+        /// Creates an instance of <see cref="HttpClient"/> that automatically follows
+        /// redirects and handles cookies.
+        /// </summary>
+        /// <returns>The <see cref="HttpClient"/>.</returns>
+        public HttpClient CreateClient() =>
+            CreateClient(ClientOptions);
+
+        /// <summary>
+        /// Creates an instance of <see cref="HttpClient"/> that automatically follows
+        /// redirects and handles cookies.
+        /// </summary>
+        /// <returns>The <see cref="HttpClient"/>.</returns>
+        public HttpClient CreateClient(WebApplicationFactoryClientOptions options) =>
+            CreateDefaultClient(options.BaseAddress, options.CreateHandlers());
+
+        /// <summary>
+        /// Creates a new instance of an <see cref="HttpClient"/> that can be used to
+        /// send <see cref="HttpRequestMessage"/> to the server. The base address of the <see cref="HttpClient"/>
+        /// instance will be set to <c>http://localhost</c>.
+        /// </summary>
+        /// <param name="handlers">A list of <see cref="DelegatingHandler"/> instances to set up on the
+        /// <see cref="HttpClient"/>.</param>
+        /// <returns>The <see cref="HttpClient"/>.</returns>
+        public HttpClient CreateDefaultClient(params DelegatingHandler[] handlers)
+        {
+            EnsureServer();
+
+            HttpClient client;
+            if (handlers == null || handlers.Length == 0)
+            {
+                client = _server.CreateClient();
+            }
+            else
+            {
+                for (var i = handlers.Length - 1; i > 0; i--)
+                {
+                    handlers[i - 1].InnerHandler = handlers[i];
+                }
+
+                var serverHandler = _server.CreateHandler();
+                handlers[handlers.Length - 1].InnerHandler = serverHandler;
+
+                client = new HttpClient(handlers[0]);
+            }
+
+            _clients.Add(client);
+
+            ConfigureClient(client);
+
+            return client;
+        }
+
+        /// <summary>
+        /// Configures <see cref="HttpClient"/> instances created by this <see cref="WebApplicationFactory{TEntryPoint}"/>.
+        /// </summary>
+        /// <param name="client">The <see cref="HttpClient"/> instance getting configured.</param>
+        protected virtual void ConfigureClient(HttpClient client)
+        {
+            if (client == null)
+            {
+                throw new ArgumentNullException(nameof(client));
+            }
+
+            client.BaseAddress = new Uri("http://localhost");
+        }
+
+        /// <summary>
+        /// Creates a new instance of an <see cref="HttpClient"/> that can be used to
+        /// send <see cref="HttpRequestMessage"/> to the server.
+        /// </summary>
+        /// <param name="baseAddress">The base address of the <see cref="HttpClient"/> instance.</param>
+        /// <param name="handlers">A list of <see cref="DelegatingHandler"/> instances to set up on the
+        /// <see cref="HttpClient"/>.</param>
+        /// <returns>The <see cref="HttpClient"/>.</returns>
+        public HttpClient CreateDefaultClient(Uri baseAddress, params DelegatingHandler[] handlers)
+        {
+            var client = CreateDefaultClient(handlers);
+            client.BaseAddress = baseAddress;
+
+            return client;
+        }
+
+        /// <inheritdoc />
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        /// <param name="disposing">
+        /// <see langword="true" /> to release both managed and unmanaged resources;
+        /// <see langword="false" /> to release only unmanaged resources.
+        /// </param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            if (disposing)
+            {
+                foreach (var client in _clients)
+                {
+                    client.Dispose();
+                }
+
+                foreach (var factory in _derivedFactories)
+                {
+                    factory.Dispose();
+                }
+
+                _server?.Dispose();
+            }
+
+            _disposed = true;
+        }
+
+        private class DelegatedWebApplicationFactory : WebApplicationFactory<TEntryPoint>
+        {
+            private readonly Func<IWebHostBuilder, TestServer> _createServer;
+            private readonly Func<IWebHostBuilder> _createWebHostBuilder;
+            private readonly Func<IEnumerable<Assembly>> _getTestAssemblies;
+            private readonly Action<HttpClient> _configureClient;
+
+            public DelegatedWebApplicationFactory(
+                WebApplicationFactoryClientOptions options,
+                Func<IWebHostBuilder, TestServer> createServer,
+                Func<IWebHostBuilder> createWebHostBuilder,
+                Func<IEnumerable<Assembly>> getTestAssemblies,
+                Action<HttpClient> configureClient,
+                Action<IWebHostBuilder> configureWebHost)
+            {
+                ClientOptions = new WebApplicationFactoryClientOptions(options);
+                _createServer = createServer;
+                _createWebHostBuilder = createWebHostBuilder;
+                _getTestAssemblies = getTestAssemblies;
+                _configureClient = configureClient;
+                _configuration = configureWebHost;
+            }
+
+            protected override TestServer CreateServer(IWebHostBuilder builder) => _createServer(builder);
+
+            protected override IWebHostBuilder CreateWebHostBuilder() => _createWebHostBuilder();
+
+            protected override IEnumerable<Assembly> GetTestAssemblies() => _getTestAssemblies();
+
+            protected override void ConfigureWebHost(IWebHostBuilder builder) => _configuration(builder);
+
+            protected override void ConfigureClient(HttpClient client) => _configureClient(client);
+
+            internal override WebApplicationFactory<TEntryPoint> WithWebHostBuilderCore(Action<IWebHostBuilder> configuration)
+            {
+                return new DelegatedWebApplicationFactory(
+                    ClientOptions,
+                    _createServer,
+                    _createWebHostBuilder,
+                    _getTestAssemblies,
+                    _configureClient,
+                    builder =>
+                    {
+                        _configuration(builder);
+                        configuration(builder);
+                    });
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactoryClientOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactoryClientOptions.cs
new file mode 100644
index 0000000000..c934b2fd56
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactoryClientOptions.cs
@@ -0,0 +1,83 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using Microsoft.AspNetCore.Mvc.Testing.Handlers;
+
+namespace Microsoft.AspNetCore.Mvc.Testing
+{
+    /// <summary>
+    /// The default options to use to when creating
+    /// <see cref="HttpClient"/> instances by calling
+    /// <see cref="WebApplicationFactory{TEntryPoint}.CreateClient(WebApplicationFactoryClientOptions)"/>.
+    /// </summary>
+    public class WebApplicationFactoryClientOptions
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="WebApplicationFactoryClientOptions"/>.
+        /// </summary>
+        public WebApplicationFactoryClientOptions()
+        {
+        }
+
+        // Copy constructor
+        internal WebApplicationFactoryClientOptions(WebApplicationFactoryClientOptions clientOptions)
+        {
+            BaseAddress = clientOptions.BaseAddress;
+            AllowAutoRedirect = clientOptions.AllowAutoRedirect;
+            MaxAutomaticRedirections = clientOptions.MaxAutomaticRedirections;
+            HandleCookies = clientOptions.HandleCookies;
+        }
+
+        /// <summary>
+        /// Gets or sets the base address of <see cref="HttpClient"/> instances created by calling
+        /// <see cref="WebApplicationFactory{TEntryPoint}.CreateClient(WebApplicationFactoryClientOptions)"/>.
+        /// The default is <c>http://localhost</c>.
+        /// </summary>
+        public Uri BaseAddress { get; set; } = new Uri("http://localhost");
+
+        /// <summary>
+        /// Gets or sets whether or not <see cref="HttpClient"/> instances created by calling
+        /// <see cref="WebApplicationFactory{TEntryPoint}.CreateClient(WebApplicationFactoryClientOptions)"/>
+        /// should automatically follow redirect responses.
+        /// The default is <c>true</c>.
+        /// /// </summary>
+        public bool AllowAutoRedirect { get; set; } = true;
+
+        /// <summary>
+        /// Gets or sets the maximum number of redirect responses that <see cref="HttpClient"/> instances
+        /// created by calling <see cref="WebApplicationFactory{TEntryPoint}.CreateClient(WebApplicationFactoryClientOptions)"/>
+        /// should follow.
+        /// The default is <c>7</c>.
+        /// </summary>
+        public int MaxAutomaticRedirections { get; set; } = RedirectHandler.DefaultMaxRedirects;
+
+        /// <summary>
+        /// Gets or sets whether <see cref="HttpClient"/> instances created by calling 
+        /// <see cref="WebApplicationFactory{TEntryPoint}.CreateClient(WebApplicationFactoryClientOptions)"/>
+        /// should handle cookies.
+        /// The default is <c>true</c>.
+        /// </summary>
+        public bool HandleCookies { get; set; } = true;
+
+        internal DelegatingHandler[] CreateHandlers()
+        {
+            return CreateHandlersCore().ToArray();
+
+            IEnumerable<DelegatingHandler> CreateHandlersCore()
+            {
+                if (AllowAutoRedirect)
+                {
+                    yield return new RedirectHandler(MaxAutomaticRedirections);
+                }
+                if (HandleCookies)
+                {
+                    yield return new CookieContainerHandler();
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactoryContentRootAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactoryContentRootAttribute.cs
new file mode 100644
index 0000000000..a2ea31cb45
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactoryContentRootAttribute.cs
@@ -0,0 +1,83 @@
+// 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.
+
+using System;
+using System.Globalization;
+using System.IO;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Mvc.Testing
+{
+    /// <summary>
+    /// Metadata that <see cref="WebApplicationFactory{TEntryPoint}"/> uses to find out the content
+    /// root for the web application represented by <c>TEntryPoint</c>.
+    /// <see cref="WebApplicationFactory{TEntryPoint}"/> will iterate over all the instances of
+    /// <see cref="WebApplicationFactoryContentRootAttribute"/>, filter the instances whose
+    /// <see cref="Key"/> is equal to <c>TEntryPoint</c> <see cref="Assembly.FullName"/>,
+    /// order them by <see cref="Priority"/> in ascending order.
+    /// <see cref="WebApplicationFactory{TEntryPoint}"/> will check for the existence of the marker
+    /// in <code>Path.Combine(<see cref="ContentRootPath"/>, Path.GetFileName(<see cref="ContentRootTest"/>))"</code>
+    /// and if the file exists it will set the content root to <see cref="ContentRootPath"/>.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Assembly, Inherited = false, AllowMultiple = true)]
+    public sealed class WebApplicationFactoryContentRootAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="WebApplicationFactoryContentRootAttribute"/>.
+        /// </summary>
+        /// <param name="key">
+        /// The key of this <see cref="WebApplicationFactoryContentRootAttribute"/>. This
+        /// key is used by <see cref="WebApplicationFactory{TEntryPoint}"/> to determine what of the
+        /// <see cref="WebApplicationFactoryContentRootAttribute"/> instances on the test assembly should be used
+        /// to match a given TEntryPoint class.
+        /// </param>
+        /// <param name="contentRootPath">The path to the content root. This path can be either relative or absolute.
+        /// In case the path is relative, the path will be combined with
+        /// <code><see cref="Directory.GetCurrentDirectory()"/></code></param>
+        /// <param name="contentRootTest">
+        /// A file that will be use as a marker to determine that the content root path for the given context is correct.
+        /// </param>
+        /// <param name="priority">
+        /// The priority of this content root attribute compared to other attributes. When
+        /// multiple <see cref="WebApplicationFactoryContentRootAttribute"/> instances are applied for the
+        /// same key, they are processed with <see cref="int.Parse(string)"/>, ordered in ascending order and applied
+        /// in priority until a match is found.
+        /// </param>
+        public WebApplicationFactoryContentRootAttribute(
+            string key,
+            string contentRootPath,
+            string contentRootTest,
+            string priority)
+        {
+            Key = key;
+            ContentRootPath = contentRootPath;
+            ContentRootTest = contentRootTest;
+            if (int.TryParse(priority, NumberStyles.Integer, CultureInfo.InvariantCulture, out var parsedPriority))
+            {
+                Priority = parsedPriority;
+            }
+        }
+
+        /// <summary>
+        /// Gets the key for the content root associated with this project. Typically <see cref="Assembly.FullName"/>.
+        /// </summary>
+        public string Key { get; }
+
+        /// <summary>
+        /// Gets the content root path for a given project. This content root can be relative or absolute. If it is a
+        /// relative path, it will be combined with <see cref="AppContext.BaseDirectory"/>.
+        /// </summary>
+        public string ContentRootPath { get; }
+
+        /// <summary>
+        /// A marker file used to ensure that the path the content root is being set to is correct.
+        /// </summary>
+        public string ContentRootTest { get; }
+
+        /// <summary>
+        /// Gets a number for determining the probing order when multiple <see cref="WebApplicationFactoryContentRootAttribute"/>
+        /// instances with the same key are present on the test <see cref="Assembly"/>.
+        /// </summary>
+        public int Priority { get; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/baseline.netcore.json
new file mode 100644
index 0000000000..c0806560a2
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/baseline.netcore.json
@@ -0,0 +1,494 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc.Testing, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory<T0>",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "System.IDisposable"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Finalize",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Server",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.TestHost.TestServer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Factories",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory<T0>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ClientOptions",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WithWebHostBuilder",
+          "Parameters": [
+            {
+              "Name": "configuration",
+              "Type": "System.Action<Microsoft.AspNetCore.Hosting.IWebHostBuilder>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory<T0>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetTestAssemblies",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.Reflection.Assembly>",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateWebHostBuilder",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Hosting.IWebHostBuilder",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateServer",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Hosting.IWebHostBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.TestHost.TestServer",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ConfigureWebHost",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.AspNetCore.Hosting.IWebHostBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateClient",
+          "Parameters": [],
+          "ReturnType": "System.Net.Http.HttpClient",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateClient",
+          "Parameters": [
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions"
+            }
+          ],
+          "ReturnType": "System.Net.Http.HttpClient",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateDefaultClient",
+          "Parameters": [
+            {
+              "Name": "handlers",
+              "Type": "System.Net.Http.DelegatingHandler[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "System.Net.Http.HttpClient",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ConfigureClient",
+          "Parameters": [
+            {
+              "Name": "client",
+              "Type": "System.Net.Http.HttpClient"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateDefaultClient",
+          "Parameters": [
+            {
+              "Name": "baseAddress",
+              "Type": "System.Uri"
+            },
+            {
+              "Name": "handlers",
+              "Type": "System.Net.Http.DelegatingHandler[]",
+              "IsParams": true
+            }
+          ],
+          "ReturnType": "System.Net.Http.HttpClient",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [
+            {
+              "Name": "disposing",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TEntryPoint",
+          "ParameterPosition": 0,
+          "Class": true,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_BaseAddress",
+          "Parameters": [],
+          "ReturnType": "System.Uri",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_BaseAddress",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Uri"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AllowAutoRedirect",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AllowAutoRedirect",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MaxAutomaticRedirections",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MaxAutomaticRedirections",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HandleCookies",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HandleCookies",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryContentRootAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Key",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ContentRootPath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ContentRootTest",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Priority",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentRootPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "contentRootTest",
+              "Type": "System.String"
+            },
+            {
+              "Name": "priority",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Testing.Handlers.CookieContainerHandler",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Net.Http.DelegatingHandler",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Container",
+          "Parameters": [],
+          "ReturnType": "System.Net.CookieContainer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SendAsync",
+          "Parameters": [
+            {
+              "Name": "request",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            },
+            {
+              "Name": "cancellationToken",
+              "Type": "System.Threading.CancellationToken"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Net.Http.HttpResponseMessage>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "cookieContainer",
+              "Type": "System.Net.CookieContainer"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Testing.Handlers.RedirectHandler",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Net.Http.DelegatingHandler",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_MaxRedirects",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SendAsync",
+          "Parameters": [
+            {
+              "Name": "request",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            },
+            {
+              "Name": "cancellationToken",
+              "Type": "System.Threading.CancellationToken"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<System.Net.Http.HttpResponseMessage>",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "maxRedirects",
+              "Type": "System.Int32"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Testing.targets b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Testing.targets
new file mode 100644
index 0000000000..6cd039b00b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Testing.targets
@@ -0,0 +1,59 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!--
+    Work around https://github.com/NuGet/Home/issues/4412. MVC uses DependencyContext.Load() which looks next to a .dll
+    for a .deps.json. Information isn't available elsewhere. Need the .deps.json file for all web site applications.
+  -->
+  <PropertyGroup>
+    <!--
+      The functional tests act as the host application for all test websites. Since the CLI copies all reference
+      assembly dependencies in websites to their corresponding bin/{config}/refs folder we need to re-calculate
+      reference assemblies for this project so there's a corresponding refs folder in our output. Without it
+      our websites deps files will fail to find their assembly references.
+    -->
+
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+  </PropertyGroup>
+
+    <Target Name="_ResolveMvcTestProjectReferences" DependsOnTargets="ResolveReferences">
+      <ItemGroup>
+        <_ContentRootProjectReferences
+          Include="@(ReferencePath)"
+          Condition="'%(ReferencePath.ReferenceSourceTarget)' == 'ProjectReference' and '%(ReferencePath.TargetFrameworkIdentifier)' != '.NETStandard'" />
+      </ItemGroup>
+    </Target>
+
+  <Target Name="_AddContentRootForProjectReferences" BeforeTargets="BeforeCompile" DependsOnTargets="_ResolveMvcTestProjectReferences">
+    <ItemGroup>
+      <WebApplicationFactoryContentRootAttribute
+        Condition="'%(_ContentRootProjectReferences.Identity)' != ''"
+        Include="%(_ContentRootProjectReferences.Identity)"
+        AssemblyName="%(_ContentRootProjectReferences.FusionName)"
+        ContentRootPath="$([System.IO.Path]::GetDirectoryName(%(_ContentRootProjectReferences.MSBuildSourceProjectFile)))"
+        ContentRootTest="$([System.IO.Path]::GetFileName(%(_ContentRootProjectReferences.MSBuildSourceProjectFile)))"
+        Priority="0" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <AssemblyAttribute 
+        Condition=" '%(WebApplicationFactoryContentRootAttribute.Identity)' != '' "
+        Include="Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryContentRootAttribute">
+        <_Parameter1>%(WebApplicationFactoryContentRootAttribute.AssemblyName)</_Parameter1>
+        <_Parameter2>%(WebApplicationFactoryContentRootAttribute.ContentRootPath)</_Parameter2>
+        <_Parameter3>%(WebApplicationFactoryContentRootAttribute.ContentRootTest)</_Parameter3>
+        <_Parameter4>%(WebApplicationFactoryContentRootAttribute.Priority)</_Parameter4>
+      </AssemblyAttribute>
+    </ItemGroup>
+  </Target>
+
+  <Target Name="CopyAditionalFiles" AfterTargets="Build;_ResolveMvcTestProjectReferences" Condition="'$(TargetFramework)'!=''">
+    <ItemGroup>
+      <DepsFilePaths
+        Condition="'%(_ContentRootProjectReferences.Identity)' != ''"
+        Include="$([System.IO.Path]::ChangeExtension('%(_ContentRootProjectReferences.ResolvedFrom)', '.deps.json'))" />
+    </ItemGroup>
+
+    <Copy SourceFiles="%(DepsFilePaths.FullPath)" DestinationFolder="$(OutputPath)" Condition="Exists('%(DepsFilePaths.FullPath)')" />
+  </Target>
+    
+</Project>
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AutoValidateAntiforgeryTokenAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AutoValidateAntiforgeryTokenAttribute.cs
new file mode 100644
index 0000000000..673e52c261
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AutoValidateAntiforgeryTokenAttribute.cs
@@ -0,0 +1,51 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An attribute that causes validation of antiforgery tokens for all unsafe HTTP methods. An antiforgery
+    /// token is required for HTTP methods other than GET, HEAD, OPTIONS, and TRACE.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="AutoValidateAntiforgeryTokenAttribute"/> can be applied as a global filter to trigger
+    /// validation of antiforgery tokens by default for an application. Use
+    /// <see cref="IgnoreAntiforgeryTokenAttribute"/> to suppress validation of the antiforgery token for
+    /// a controller or action.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public class AutoValidateAntiforgeryTokenAttribute : Attribute, IFilterFactory, IOrderedFilter
+    {
+        /// <summary>
+        /// Gets the order value for determining the order of execution of filters. Filters execute in
+        /// ascending numeric value of the <see cref="Order"/> property.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Filters are executed in a sequence determined by an ascending sort of the <see cref="Order"/> property.
+        /// </para>
+        /// <para>
+        /// The default Order for this attribute is 1000 because it must run after any filter which does authentication 
+        /// or login in order to allow them to behave as expected (ie Unauthenticated or Redirect instead of 400).
+        /// </para>
+        /// <para>
+        /// Look at <see cref="IOrderedFilter.Order"/> for more detailed info.
+        /// </para>
+        /// </remarks>
+        public int Order { get; set; } = 1000;
+
+        /// <inheritdoc />
+        public bool IsReusable => true;
+
+        /// <inheritdoc />
+        public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
+        {
+            return serviceProvider.GetRequiredService<AutoValidateAntiforgeryTokenAuthorizationFilter>();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Controller.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Controller.cs
new file mode 100644
index 0000000000..5c680ffaaa
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Controller.cs
@@ -0,0 +1,379 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A base class for an MVC controller with view support.
+    /// </summary>
+    public abstract class Controller : ControllerBase, IActionFilter, IAsyncActionFilter, IDisposable
+    {
+        private ITempDataDictionary _tempData;
+        private DynamicViewData _viewBag;
+        private ViewDataDictionary _viewData;
+
+        /// <summary>
+        /// Gets or sets <see cref="ViewDataDictionary"/> used by <see cref="ViewResult"/> and <see cref="ViewBag"/>.
+        /// </summary>
+        /// <remarks>
+        /// By default, this property is intiailized when <see cref="Controllers.IControllerActivator"/> activates
+        /// controllers.
+        /// <para>
+        /// This property can be accessed after the controller has been activated, for example, in a controller action
+        /// or by overriding <see cref="OnActionExecuting(ActionExecutingContext)"/>.
+        /// </para>
+        /// <para>
+        /// This property can be also accessed from within a unit test where it is initialized with
+        /// <see cref="EmptyModelMetadataProvider"/>.
+        /// </para>
+        /// </remarks>
+        [ViewDataDictionary]
+        public ViewDataDictionary ViewData
+        {
+            get
+            {
+                if (_viewData == null)
+                {
+                    // This should run only for the controller unit test scenarios
+                    _viewData = new ViewDataDictionary(new EmptyModelMetadataProvider(), ControllerContext.ModelState);
+                }
+
+                return _viewData;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(ViewData));
+                }
+
+                _viewData = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets <see cref="ITempDataDictionary"/> used by <see cref="ViewResult"/>.
+        /// </summary>
+        public ITempDataDictionary TempData
+        {
+            get
+            {
+                if (_tempData == null)
+                {
+                    var factory = HttpContext?.RequestServices?.GetRequiredService<ITempDataDictionaryFactory>();
+                    _tempData = factory?.GetTempData(HttpContext);
+                }
+
+                return _tempData;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _tempData = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the dynamic view bag.
+        /// </summary>
+        public dynamic ViewBag
+        {
+            get
+            {
+                if (_viewBag == null)
+                {
+                    _viewBag = new DynamicViewData(() => ViewData);
+                }
+
+                return _viewBag;
+            }
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ViewResult"/> object that renders a view to the response.
+        /// </summary>
+        /// <returns>The created <see cref="ViewResult"/> object for the response.</returns>
+        [NonAction]
+        public virtual ViewResult View()
+        {
+            return View(viewName: null);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ViewResult"/> object by specifying a <paramref name="viewName"/>.
+        /// </summary>
+        /// <param name="viewName">The name or path of the view that is rendered to the response.</param>
+        /// <returns>The created <see cref="ViewResult"/> object for the response.</returns>
+        [NonAction]
+        public virtual ViewResult View(string viewName)
+        {
+            return View(viewName, model: ViewData.Model);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ViewResult"/> object by specifying a <paramref name="model"/>
+        /// to be rendered by the view.
+        /// </summary>
+        /// <param name="model">The model that is rendered by the view.</param>
+        /// <returns>The created <see cref="ViewResult"/> object for the response.</returns>
+        [NonAction]
+        public virtual ViewResult View(object model)
+        {
+            return View(viewName: null, model: model);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ViewResult"/> object by specifying a <paramref name="viewName"/>
+        /// and the <paramref name="model"/> to be rendered by the view.
+        /// </summary>
+        /// <param name="viewName">The name or path of the view that is rendered to the response.</param>
+        /// <param name="model">The model that is rendered by the view.</param>
+        /// <returns>The created <see cref="ViewResult"/> object for the response.</returns>
+        [NonAction]
+        public virtual ViewResult View(string viewName, object model)
+        {
+            ViewData.Model = model;
+
+            return new ViewResult()
+            {
+                ViewName = viewName,
+                ViewData = ViewData,
+                TempData = TempData
+            };
+        }
+
+        /// <summary>
+        /// Creates a <see cref="PartialViewResult"/> object that renders a partial view to the response.
+        /// </summary>
+        /// <returns>The created <see cref="PartialViewResult"/> object for the response.</returns>
+        [NonAction]
+        public virtual PartialViewResult PartialView()
+        {
+            return PartialView(viewName: null);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="PartialViewResult"/> object by specifying a <paramref name="viewName"/>.
+        /// </summary>
+        /// <param name="viewName">The name or path of the partial view that is rendered to the response.</param>
+        /// <returns>The created <see cref="PartialViewResult"/> object for the response.</returns>
+        [NonAction]
+        public virtual PartialViewResult PartialView(string viewName)
+        {
+            return PartialView(viewName, model: ViewData.Model);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="PartialViewResult"/> object by specifying a <paramref name="model"/>
+        /// to be rendered by the partial view.
+        /// </summary>
+        /// <param name="model">The model that is rendered by the partial view.</param>
+        /// <returns>The created <see cref="PartialViewResult"/> object for the response.</returns>
+        [NonAction]
+        public virtual PartialViewResult PartialView(object model)
+        {
+            return PartialView(viewName: null, model: model);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="PartialViewResult"/> object by specifying a <paramref name="viewName"/>
+        /// and the <paramref name="model"/> to be rendered by the partial view.
+        /// </summary>
+        /// <param name="viewName">The name or path of the partial view that is rendered to the response.</param>
+        /// <param name="model">The model that is rendered by the partial view.</param>
+        /// <returns>The created <see cref="PartialViewResult"/> object for the response.</returns>
+        [NonAction]
+        public virtual PartialViewResult PartialView(string viewName, object model)
+        {
+            ViewData.Model = model;
+
+            return new PartialViewResult()
+            {
+                ViewName = viewName,
+                ViewData = ViewData,
+                TempData = TempData
+            };
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ViewComponentResult"/> by specifying the name of a view component to render.
+        /// </summary>
+        /// <param name="componentName">
+        /// The view component name. Can be a view component
+        /// <see cref="ViewComponents.ViewComponentDescriptor.ShortName"/> or
+        /// <see cref="ViewComponents.ViewComponentDescriptor.FullName"/>.</param>
+        /// <returns>The created <see cref="ViewComponentResult"/> object for the response.</returns>
+        [NonAction]
+        public virtual ViewComponentResult ViewComponent(string componentName)
+        {
+            return ViewComponent(componentName, arguments: null);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ViewComponentResult"/> by specifying the <see cref="Type"/> of a view component to
+        /// render.
+        /// </summary>
+        /// <param name="componentType">The view component <see cref="Type"/>.</param>
+        /// <returns>The created <see cref="ViewComponentResult"/> object for the response.</returns>
+        [NonAction]
+        public virtual ViewComponentResult ViewComponent(Type componentType)
+        {
+            return ViewComponent(componentType, arguments: null);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ViewComponentResult"/> by specifying the name of a view component to render.
+        /// </summary>
+        /// <param name="componentName">
+        /// The view component name. Can be a view component
+        /// <see cref="ViewComponents.ViewComponentDescriptor.ShortName"/> or
+        /// <see cref="ViewComponents.ViewComponentDescriptor.FullName"/>.</param>
+        /// <param name="arguments">
+        /// An <see cref="object"/> with properties representing arguments to be passed to the invoked view component
+        /// method. Alternatively, an <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance
+        /// containing the invocation arguments.
+        /// </param>
+        /// <returns>The created <see cref="ViewComponentResult"/> object for the response.</returns>
+        [NonAction]
+        public virtual ViewComponentResult ViewComponent(string componentName, object arguments)
+        {
+            return new ViewComponentResult
+            {
+                ViewComponentName = componentName,
+                Arguments = arguments,
+                ViewData = ViewData,
+                TempData = TempData
+            };
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ViewComponentResult"/> by specifying the <see cref="Type"/> of a view component to
+        /// render.
+        /// </summary>
+        /// <param name="componentType">The view component <see cref="Type"/>.</param>
+        /// <param name="arguments">
+        /// An <see cref="object"/> with properties representing arguments to be passed to the invoked view component
+        /// method. Alternatively, an <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance
+        /// containing the invocation arguments.
+        /// </param>
+        /// <returns>The created <see cref="ViewComponentResult"/> object for the response.</returns>
+        [NonAction]
+        public virtual ViewComponentResult ViewComponent(Type componentType, object arguments)
+        {
+            return new ViewComponentResult
+            {
+                ViewComponentType = componentType,
+                Arguments = arguments,
+                ViewData = ViewData,
+                TempData = TempData
+            };
+        }
+
+        /// <summary>
+        /// Creates a <see cref="JsonResult"/> object that serializes the specified <paramref name="data"/> object
+        /// to JSON.
+        /// </summary>
+        /// <param name="data">The object to serialize.</param>
+        /// <returns>The created <see cref="JsonResult"/> that serializes the specified <paramref name="data"/>
+        /// to JSON format for the response.</returns>
+        [NonAction]
+        public virtual JsonResult Json(object data)
+        {
+            return new JsonResult(data);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="JsonResult"/> object that serializes the specified <paramref name="data"/> object
+        /// to JSON.
+        /// </summary>
+        /// <param name="data">The object to serialize.</param>
+        /// <param name="serializerSettings">The <see cref="JsonSerializerSettings"/> to be used by
+        /// the formatter.</param>
+        /// <returns>The created <see cref="JsonResult"/> that serializes the specified <paramref name="data"/>
+        /// as JSON format for the response.</returns>
+        /// <remarks>Callers should cache an instance of <see cref="JsonSerializerSettings"/> to avoid
+        /// recreating cached data with each call.</remarks>
+        [NonAction]
+        public virtual JsonResult Json(object data, JsonSerializerSettings serializerSettings)
+        {
+            if (serializerSettings == null)
+            {
+                throw new ArgumentNullException(nameof(serializerSettings));
+            }
+
+            return new JsonResult(data, serializerSettings);
+        }
+
+        /// <summary>
+        /// Called before the action method is invoked.
+        /// </summary>
+        /// <param name="context">The action executing context.</param>
+        [NonAction]
+        public virtual void OnActionExecuting(ActionExecutingContext context)
+        {
+        }
+
+        /// <summary>
+        /// Called after the action method is invoked.
+        /// </summary>
+        /// <param name="context">The action executed context.</param>
+        [NonAction]
+        public virtual void OnActionExecuted(ActionExecutedContext context)
+        {
+        }
+
+        /// <summary>
+        /// Called before the action method is invoked.
+        /// </summary>
+        /// <param name="context">The action executing context.</param>
+        /// <param name="next">The <see cref="ActionExecutionDelegate"/> to execute. Invoke this delegate in the body
+        /// of <see cref="OnActionExecutionAsync" /> to continue execution of the action.</param>
+        /// <returns>A <see cref="Task"/> instance.</returns>
+        [NonAction]
+        public virtual async Task OnActionExecutionAsync(
+            ActionExecutingContext context,
+            ActionExecutionDelegate next)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (next == null)
+            {
+                throw new ArgumentNullException(nameof(next));
+            }
+
+            OnActionExecuting(context);
+            if (context.Result == null)
+            {
+                OnActionExecuted(await next());
+            }
+        }
+
+        /// <inheritdoc />
+        public void Dispose() => Dispose(disposing: true);
+
+        /// <summary>
+        /// Releases all resources currently used by this <see cref="Controller"/> instance.
+        /// </summary>
+        /// <param name="disposing"><c>true</c> if this method is being invoked by the <see cref="Dispose()"/> method,
+        /// otherwise <c>false</c>.</param>
+        protected virtual void Dispose(bool disposing)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/CookieTempDataProviderOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/CookieTempDataProviderOptions.cs
new file mode 100644
index 0000000000..58ee79d044
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/CookieTempDataProviderOptions.cs
@@ -0,0 +1,95 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Provides programmatic configuration for cookies set by <see cref="CookieTempDataProvider"/>
+    /// </summary>
+    public class CookieTempDataProviderOptions
+    {
+        private CookieBuilder _cookieBuilder = new CookieBuilder
+        {
+            Name = CookieTempDataProvider.CookieName,
+            HttpOnly = true,
+
+            // Check the comment on CookieBuilder below for more details
+            SameSite = SameSiteMode.Lax,
+
+            // This cookie has been marked as non-essential because a user could use the SessionStateTempDataProvider,
+            // which is more common in production scenarios. Check the comment on CookieBuilder below
+            // for more information.
+            IsEssential = false,
+
+            // Some browsers do not allow non-secure endpoints to set cookies with a 'secure' flag or overwrite cookies
+            // whose 'secure' flag is set (http://httpwg.org/http-extensions/draft-ietf-httpbis-cookie-alone.html).
+            // Since mixing secure and non-secure endpoints is a common scenario in applications, we are relaxing the
+            // restriction on secure policy on some cookies by setting to 'None'. Cookies related to authentication or
+            // authorization use a stronger policy than 'None'.
+            SecurePolicy = CookieSecurePolicy.None,
+        };
+
+        /// <summary>
+        /// <para>
+        /// Determines the settings used to create the cookie in <see cref="CookieTempDataProvider"/>.
+        /// </para>
+        /// <para>
+        /// <see cref="CookieBuilder.SameSite"/> defaults to <see cref="SameSiteMode.Lax"/>. Setting this to
+        /// <see cref="SameSiteMode.Strict"/> may cause browsers to not send back the cookie to the server in an
+        /// OAuth login flow.
+        /// <see cref="CookieBuilder.SecurePolicy"/> defaults to <see cref="CookieSecurePolicy.SameAsRequest" />.
+        /// <see cref="CookieBuilder.HttpOnly"/> defaults to <c>true</c>.
+        /// <see cref="CookieBuilder.IsEssential"/> defaults to <c>false</c>, This property is only considered when a
+        /// user opts into the CookiePolicyMiddleware. If you are using this middleware and want to use
+        /// <see cref="CookieTempDataProvider"/>, then either set this property to <c>true</c> or
+        /// request user consent for non-essential cookies.
+        /// </para>
+        /// </summary>
+        public CookieBuilder Cookie
+        {
+            get => _cookieBuilder;
+            set => _cookieBuilder = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        #region Obsolete API
+        /// <summary>
+        /// <para>
+        /// This property is obsolete and will be removed in a future version. The recommended alternative is <seealso cref="CookieBuilder.Path"/> on <see cref="Cookie"/>.
+        /// </para>
+        /// <para>
+        /// The path set on the cookie. If set to <c>null</c>, the "path" attribute on the cookie is set to the current
+        /// request's <see cref="HttpRequest.PathBase"/> value. If the value of <see cref="HttpRequest.PathBase"/> is
+        /// <c>null</c> or empty, then the "path" attribute is set to the value of <see cref="CookieOptions.Path"/>.
+        /// </para>
+        /// </summary>
+        [Obsolete("This property is obsolete and will be removed in a future version. The recommended alternative is " + nameof(Cookie) + "." + nameof(CookieBuilder.Path) + ".")]
+        public string Path { get => Cookie.Path; set => Cookie.Path = value; }
+
+        /// <summary>
+        /// <para>
+        /// This property is obsolete and will be removed in a future version. The recommended alternative is <seealso cref="CookieBuilder.Domain"/> on <see cref="Cookie"/>.
+        /// </para>
+        /// <para>
+        /// The domain set on a cookie. Defaults to <c>null</c>.
+        /// </para>
+        /// </summary>
+        [Obsolete("This property is obsolete and will be removed in a future version. The recommended alternative is " + nameof(Cookie) + "." + nameof(CookieBuilder.Domain) + ".")]
+        public string Domain { get => Cookie.Domain; set => Cookie.Domain = value; }
+
+        /// <summary>
+        /// <para>
+        /// This property is obsolete and will be removed in a future version. The recommended alternative is <seealso cref="CookieBuilder.Name"/> on <see cref="Cookie"/>.
+        /// </para>
+        /// <para>
+        /// The name of the cookie which stores TempData. Defaults to <see cref="CookieTempDataProvider.CookieName"/>. 
+        /// </para>
+        /// </summary>
+        [Obsolete("This property is obsolete and will be removed in a future version. The recommended alternative is " + nameof(Cookie) + "." + nameof(CookieBuilder.Name) + ".")]
+        public string CookieName { get; set; } = CookieTempDataProvider.CookieName;
+        #endregion
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcBuilderExtensions.cs
new file mode 100644
index 0000000000..5e1ebc4364
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcBuilderExtensions.cs
@@ -0,0 +1,143 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    /// <summary>
+    /// Extensions methods for configuring MVC via an <see cref="IMvcBuilder"/>.
+    /// </summary>
+    public static class MvcViewFeaturesMvcBuilderExtensions
+    {
+        /// <summary>
+        /// Adds configuration of <see cref="MvcViewOptions"/> for the application.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="setupAction">
+        /// An <see cref="Action{MvcViewOptions}"/> to configure the provided <see cref="MvcViewOptions"/>.
+        /// </param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder AddViewOptions(
+            this IMvcBuilder builder,
+            Action<MvcViewOptions> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (setupAction == null)
+            {
+                throw new ArgumentNullException(nameof(setupAction));
+            }
+
+            builder.Services.Configure(setupAction);
+            return builder;
+        }
+
+        /// <summary>
+        /// Registers discovered view components as services in the <see cref="IServiceCollection"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder AddViewComponentsAsServices(this IMvcBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            var feature = new ViewComponentFeature();
+            builder.PartManager.PopulateFeature(feature);
+
+            foreach (var viewComponent in feature.ViewComponents.Select(vc => vc.AsType()))
+            {
+                builder.Services.TryAddTransient(viewComponent, viewComponent);
+            }
+
+            builder.Services.Replace(ServiceDescriptor.Singleton<IViewComponentActivator, ServiceBasedViewComponentActivator>());
+
+            return builder;
+        }
+
+        /// <summary>
+        /// Registers <see cref="SessionStateTempDataProvider"/> as the default <see cref="ITempDataProvider"/>
+        /// in the <see cref="IServiceCollection"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder AddSessionStateTempDataProvider(this IMvcBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            // Ensure the TempData basics are registered.
+            MvcViewFeaturesMvcCoreBuilderExtensions.AddViewServices(builder.Services);
+
+            var descriptor = ServiceDescriptor.Singleton(typeof(ITempDataProvider), typeof(SessionStateTempDataProvider));
+            builder.Services.Replace(descriptor);
+
+            return builder;
+        }
+
+        /// <summary>
+        /// Registers <see cref="CookieTempDataProvider"/> as the default <see cref="ITempDataProvider"/> in the
+        /// <see cref="IServiceCollection"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder AddCookieTempDataProvider(this IMvcBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            // Ensure the TempData basics are registered.
+            MvcViewFeaturesMvcCoreBuilderExtensions.AddViewServices(builder.Services);
+
+            var descriptor = ServiceDescriptor.Singleton(typeof(ITempDataProvider), typeof(CookieTempDataProvider));
+            builder.Services.Replace(descriptor);
+
+            return builder;
+        }
+
+        /// <summary>
+        /// Registers <see cref="CookieTempDataProvider"/> as the default <see cref="ITempDataProvider"/> in the
+        /// <see cref="IServiceCollection"/>.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcBuilder"/>.</param>
+        /// <param name="setupAction">
+        /// An <see cref="Action{CookieTempDataProviderOptions}"/> to configure the provided
+        /// <see cref="CookieTempDataProviderOptions"/>.
+        /// </param>
+        /// <returns>The <see cref="IMvcBuilder"/>.</returns>
+        public static IMvcBuilder AddCookieTempDataProvider(
+            this IMvcBuilder builder,
+            Action<CookieTempDataProviderOptions> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (setupAction == null)
+            {
+                throw new ArgumentNullException(nameof(setupAction));
+            }
+
+            AddCookieTempDataProvider(builder);
+            builder.Services.Configure(setupAction);
+
+            return builder;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs
new file mode 100644
index 0000000000..ebedcbc56c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs
@@ -0,0 +1,228 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public static class MvcViewFeaturesMvcCoreBuilderExtensions
+    {
+        public static IMvcCoreBuilder AddViews(this IMvcCoreBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDataAnnotations();
+            AddViewComponentApplicationPartsProviders(builder.PartManager);
+            AddViewServices(builder.Services);
+            return builder;
+        }
+
+        /// <summary>
+        /// Registers <see cref="CookieTempDataProvider"/> as the default <see cref="ITempDataProvider"/> in the
+        /// <see cref="IServiceCollection"/>. Also registers the default view services.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        public static IMvcCoreBuilder AddCookieTempDataProvider(this IMvcCoreBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            // Ensure the TempData basics are registered.
+            AddViewServices(builder.Services);
+
+            var descriptor = ServiceDescriptor.Singleton(typeof(ITempDataProvider), typeof(CookieTempDataProvider));
+            builder.Services.Replace(descriptor);
+
+            return builder;
+        }
+
+        private static void AddViewComponentApplicationPartsProviders(ApplicationPartManager manager)
+        {
+            if (!manager.FeatureProviders.OfType<ViewComponentFeatureProvider>().Any())
+            {
+                manager.FeatureProviders.Add(new ViewComponentFeatureProvider());
+            }
+        }
+
+        public static IMvcCoreBuilder AddViews(
+            this IMvcCoreBuilder builder,
+            Action<MvcViewOptions> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (setupAction == null)
+            {
+                throw new ArgumentNullException(nameof(setupAction));
+            }
+
+            AddViews(builder);
+            builder.Services.Configure(setupAction);
+
+            return builder;
+        }
+
+        /// <summary>
+        /// Registers <see cref="CookieTempDataProvider"/> as the default <see cref="ITempDataProvider"/> in the
+        /// <see cref="IServiceCollection"/>. Also registers the default view services.
+        /// </summary>
+        /// <param name="builder">The <see cref="IMvcCoreBuilder"/>.</param>
+        /// <param name="setupAction">
+        /// An <see cref="Action{CookieTempDataProviderOptions}"/> to configure the provided
+        /// <see cref="CookieTempDataProviderOptions"/>.
+        /// </param>
+        /// <returns>The <see cref="IMvcCoreBuilder"/>.</returns>
+        public static IMvcCoreBuilder AddCookieTempDataProvider(
+            this IMvcCoreBuilder builder,
+            Action<CookieTempDataProviderOptions> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (setupAction == null)
+            {
+                throw new ArgumentNullException(nameof(setupAction));
+            }
+
+            AddCookieTempDataProvider(builder);
+            builder.Services.Configure(setupAction);
+
+            return builder;
+        }
+
+        public static IMvcCoreBuilder ConfigureViews(
+            this IMvcCoreBuilder builder,
+            Action<MvcViewOptions> setupAction)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (setupAction == null)
+            {
+                throw new ArgumentNullException(nameof(setupAction));
+            }
+
+            builder.Services.Configure(setupAction);
+            return builder;
+        }
+
+        // Internal for testing.
+        internal static void AddViewServices(IServiceCollection services)
+        {
+            services.AddDataProtection();
+            services.AddAntiforgery();
+            services.AddWebEncoders();
+
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IConfigureOptions<MvcViewOptions>, MvcViewOptionsSetup>());
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IPostConfigureOptions<MvcViewOptions>, MvcViewOptionsConfigureCompatibilityOptions>());
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IConfigureOptions<MvcOptions>, TempDataMvcOptionsSetup>());
+
+            //
+            // View Engine and related infrastructure
+            //
+            services.TryAddSingleton<ICompositeViewEngine, CompositeViewEngine>();
+            services.TryAddSingleton<IActionResultExecutor<ViewResult>, ViewResultExecutor>();
+            services.TryAddSingleton<IActionResultExecutor<PartialViewResult>, PartialViewResultExecutor>();
+
+            // Support for activating ViewDataDictionary
+            services.TryAddEnumerable(
+                ServiceDescriptor
+                    .Transient<IControllerPropertyActivator, ViewDataDictionaryControllerPropertyActivator>());
+
+            //
+            // HTML Helper
+            //
+            services.TryAddTransient<IHtmlHelper, HtmlHelper>();
+            services.TryAddTransient(typeof(IHtmlHelper<>), typeof(HtmlHelper<>));
+            services.TryAddSingleton<IHtmlGenerator, DefaultHtmlGenerator>();
+            services.TryAddSingleton<ExpressionTextCache>();
+            services.TryAddSingleton<IModelExpressionProvider, ModelExpressionProvider>();
+            services.TryAddSingleton<ValidationHtmlAttributeProvider, DefaultValidationHtmlAttributeProvider>();
+
+            //
+            // JSON Helper
+            //
+            services.TryAddSingleton<IJsonHelper, JsonHelper>();
+            services.TryAdd(ServiceDescriptor.Singleton(serviceProvider =>
+            {
+                var options = serviceProvider.GetRequiredService<IOptions<MvcJsonOptions>>().Value;
+                var charPool = serviceProvider.GetRequiredService<ArrayPool<char>>();
+                return new JsonOutputFormatter(options.SerializerSettings, charPool);
+            }));
+
+            //
+            // View Components
+            //
+
+            // These do caching so they should stay singleton
+            services.TryAddSingleton<IViewComponentSelector, DefaultViewComponentSelector>();
+            services.TryAddSingleton<IViewComponentFactory, DefaultViewComponentFactory>();
+            services.TryAddSingleton<IViewComponentActivator, DefaultViewComponentActivator>();
+            services.TryAddSingleton<
+                IViewComponentDescriptorCollectionProvider,
+                DefaultViewComponentDescriptorCollectionProvider>();
+            services.TryAddSingleton<IActionResultExecutor<ViewComponentResult>, ViewComponentResultExecutor>();
+
+            services.TryAddSingleton<ViewComponentInvokerCache>();
+            services.TryAddTransient<IViewComponentDescriptorProvider, DefaultViewComponentDescriptorProvider>();
+            services.TryAddSingleton<IViewComponentInvokerFactory, DefaultViewComponentInvokerFactory>();
+            services.TryAddTransient<IViewComponentHelper, DefaultViewComponentHelper>();
+
+            //
+            // Temp Data
+            //
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IApplicationModelProvider, TempDataApplicationModelProvider>());
+            services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IApplicationModelProvider, ViewDataAttributeApplicationModelProvider>());
+            services.TryAddSingleton<SaveTempDataFilter>();
+
+
+            services.TryAddTransient<ControllerSaveTempDataPropertyFilter>();
+
+            // This does caching so it should stay singleton
+            services.TryAddSingleton<ITempDataProvider, CookieTempDataProvider>();
+
+            //
+            // Antiforgery
+            //
+            services.TryAddSingleton<ValidateAntiforgeryTokenAuthorizationFilter>();
+            services.TryAddSingleton<AutoValidateAntiforgeryTokenAuthorizationFilter>();
+
+            // These are stateless so their lifetime isn't really important.
+            services.TryAddSingleton<ITempDataDictionaryFactory, TempDataDictionaryFactory>();
+            services.TryAddSingleton(ArrayPool<ViewBufferValue>.Shared);
+            services.TryAddScoped<IViewBufferScope, MemoryPoolViewBufferScope>();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewComponentHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewComponentHelper.cs
new file mode 100644
index 0000000000..60c2552ebc
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewComponentHelper.cs
@@ -0,0 +1,41 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Supports the rendering of view components in a view.
+    /// </summary>
+    public interface IViewComponentHelper
+    {
+        /// <summary>
+        /// Invokes a view component with the specified <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The name of the view component.</param>
+        /// <param name="arguments">
+        /// An <see cref="object"/> with properties representing arguments to be passed to the invoked view component
+        /// method. Alternatively, an <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance
+        /// containing the invocation arguments.
+        /// </param>
+        /// <returns>A <see cref="Task"/> that on completion returns the rendered <see cref="IHtmlContent" />.
+        /// </returns>
+        Task<IHtmlContent> InvokeAsync(string name, object arguments);
+
+        /// <summary>
+        /// Invokes a view component of type <paramref name="componentType" />.
+        /// </summary>
+        /// <param name="componentType">The view component <see cref="Type"/>.</param>
+        /// <param name="arguments">
+        /// An <see cref="object"/> with properties representing arguments to be passed to the invoked view component
+        /// method. Alternatively, an <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance
+        /// containing the invocation arguments.
+        /// </param>
+        /// <returns>A <see cref="Task"/> that on completion returns the rendered <see cref="IHtmlContent" />.
+        /// </returns>
+        Task<IHtmlContent> InvokeAsync(Type componentType, object arguments);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewComponentResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewComponentResult.cs
new file mode 100644
index 0000000000..3ecce8ca7a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewComponentResult.cs
@@ -0,0 +1,28 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Result type of a <see cref="ViewComponent"/>.
+    /// </summary>
+    public interface IViewComponentResult
+    {
+        /// <summary>
+        /// Executes the result of a <see cref="ViewComponent"/> using the specified <paramref name="context"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ViewComponentContext"/> for the current component execution.</param>
+        void Execute(ViewComponentContext context);
+
+        /// <summary>
+        /// Asynchronously executes the result of a <see cref="ViewComponent"/> using the specified
+        /// <paramref name="context"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ViewComponentContext"/> for the current component execution.</param>
+        /// <returns>A <see cref="Task"/> that represents the asynchronous execution.</returns>
+        Task ExecuteAsync(ViewComponentContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs
new file mode 100644
index 0000000000..21e2d9d43e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs
@@ -0,0 +1,20 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Contract for contextualizing a property activated by a view with the <see cref="ViewContext"/>.
+    /// </summary>
+    /// <remarks>This interface is used for contextualizing properties added to a Razor page using <c>@inject</c>.</remarks>
+    public interface IViewContextAware
+    {
+        /// <summary>
+        /// Contextualizes the instance with the specified <paramref name="viewContext"/>.
+        /// </summary>
+        /// <param name="viewContext">The <see cref="ViewContext"/>.</param>
+        void Contextualize(ViewContext viewContext);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IgnoreAntiforgeryTokenAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IgnoreAntiforgeryTokenAttribute.cs
new file mode 100644
index 0000000000..e07516f3dd
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IgnoreAntiforgeryTokenAttribute.cs
@@ -0,0 +1,34 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A filter that skips antiforgery token validation.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public class IgnoreAntiforgeryTokenAttribute : Attribute, IAntiforgeryPolicy, IOrderedFilter
+    {
+        /// <summary>
+        /// Gets the order value for determining the order of execution of filters. Filters execute in
+        /// ascending numeric value of the <see cref="Order"/> property.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Filters are executed in an ordering determined by an ascending sort of the <see cref="Order"/> property.
+        /// </para>
+        /// <para>
+        /// The default Order for this attribute is 1000 because it must run after any filter which does authentication 
+        /// or login in order to allow them to behave as expected (ie Unauthenticated or Redirect instead of 400).
+        /// </para>
+        /// <para>
+        /// Look at <see cref="IOrderedFilter.Order"/> for more detailed info.
+        /// </para>
+        /// </remarks>
+        public int Order { get; set; } = 1000;
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ArrayPoolBufferSource.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ArrayPoolBufferSource.cs
new file mode 100644
index 0000000000..b21e645cbc
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ArrayPoolBufferSource.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using System.Buffers;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class ArrayPoolBufferSource : ICharBufferSource
+    {
+        private readonly ArrayPool<char> _pool;
+
+        public ArrayPoolBufferSource(ArrayPool<char> pool)
+        {
+            _pool = pool;
+        }
+
+        public char[] Rent(int bufferSize) => _pool.Rent(bufferSize);
+
+        public void Return(char[] buffer) => _pool.Return(buffer);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/AutoValidateAntiforgeryTokenAuthorizationFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/AutoValidateAntiforgeryTokenAuthorizationFilter.cs
new file mode 100644
index 0000000000..f159ed2da3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/AutoValidateAntiforgeryTokenAuthorizationFilter.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Antiforgery;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class AutoValidateAntiforgeryTokenAuthorizationFilter : ValidateAntiforgeryTokenAuthorizationFilter
+    {
+        public AutoValidateAntiforgeryTokenAuthorizationFilter(IAntiforgery antiforgery, ILoggerFactory loggerFactory)
+            : base(antiforgery, loggerFactory)
+        {
+        }
+
+        protected override bool ShouldValidate(AuthorizationFilterContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var method = context.HttpContext.Request.Method;
+            if (string.Equals("GET", method, StringComparison.OrdinalIgnoreCase) ||
+                string.Equals("HEAD", method, StringComparison.OrdinalIgnoreCase) ||
+                string.Equals("TRACE", method, StringComparison.OrdinalIgnoreCase) ||
+                string.Equals("OPTIONS", method, StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+
+            // Anything else requires a token.
+            return true;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/CachedExpressionCompiler.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/CachedExpressionCompiler.cs
new file mode 100644
index 0000000000..aa35a7592f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/CachedExpressionCompiler.cs
@@ -0,0 +1,157 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public static class CachedExpressionCompiler
+    {
+        // This is the entry point to the cached expression compilation system. The system
+        // will try to turn the expression into an actual delegate as quickly as possible,
+        // relying on cache lookups and other techniques to save time if appropriate.
+        // If the provided expression is particularly obscure and the system doesn't know
+        // how to handle it, we'll just compile the expression as normal.
+        public static Func<TModel, TResult> Process<TModel, TResult>(
+            Expression<Func<TModel, TResult>> expression)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return Compiler<TModel, TResult>.Compile(expression);
+        }
+
+        private static class Compiler<TModel, TResult>
+        {
+            private static Func<TModel, TResult> _identityFunc;
+
+            private static readonly ConcurrentDictionary<MemberInfo, Func<TModel, TResult>> _simpleMemberAccessCache =
+                new ConcurrentDictionary<MemberInfo, Func<TModel, TResult>>();
+
+            private static readonly ConcurrentDictionary<MemberInfo, Func<object, TResult>> _constMemberAccessCache =
+                new ConcurrentDictionary<MemberInfo, Func<object, TResult>>();
+
+            public static Func<TModel, TResult> Compile(Expression<Func<TModel, TResult>> expression)
+            {
+                if (expression == null)
+                {
+                    throw new ArgumentNullException(nameof(expression));
+                }
+
+                return CompileFromIdentityFunc(expression)
+                       ?? CompileFromConstLookup(expression)
+                       ?? CompileFromMemberAccess(expression)
+                       ?? CompileSlow(expression);
+            }
+
+            private static Func<TModel, TResult> CompileFromConstLookup(
+                Expression<Func<TModel, TResult>> expression)
+            {
+                if (expression == null)
+                {
+                    throw new ArgumentNullException(nameof(expression));
+                }
+
+                var constantExpression = expression.Body as ConstantExpression;
+                if (constantExpression != null)
+                {
+                    // model => {const}
+
+                    var constantValue = (TResult)constantExpression.Value;
+                    return _ => constantValue;
+                }
+
+                return null;
+            }
+
+            private static Func<TModel, TResult> CompileFromIdentityFunc(
+                Expression<Func<TModel, TResult>> expression)
+            {
+                if (expression == null)
+                {
+                    throw new ArgumentNullException(nameof(expression));
+                }
+
+                if (expression.Body == expression.Parameters[0])
+                {
+                    // model => model
+
+                    // Don't need to lock, as all identity funcs are identical.
+                    if (_identityFunc == null)
+                    {
+                        _identityFunc = expression.Compile();
+                    }
+
+                    return _identityFunc;
+                }
+
+                return null;
+            }
+
+            private static Func<TModel, TResult> CompileFromMemberAccess(
+                Expression<Func<TModel, TResult>> expression)
+            {
+                if (expression == null)
+                {
+                    throw new ArgumentNullException(nameof(expression));
+                }
+
+                // Performance tests show that on the x64 platform, special-casing static member and
+                // captured local variable accesses is faster than letting the fingerprinting system
+                // handle them. On the x86 platform, the fingerprinting system is faster, but only
+                // by around one microsecond, so it's not worth it to complicate the logic here with
+                // an architecture check.
+
+                var memberExpression = expression.Body as MemberExpression;
+                if (memberExpression != null)
+                {
+                    if (memberExpression.Expression == expression.Parameters[0] || memberExpression.Expression == null)
+                    {
+                        // model => model.Member or model => StaticMember
+                        return _simpleMemberAccessCache.GetOrAdd(memberExpression.Member, _ => expression.Compile());
+                    }
+
+                    var constantExpression = memberExpression.Expression as ConstantExpression;
+                    if (constantExpression != null)
+                    {
+                        // model => {const}.Member (captured local variable)
+                        var compiledExpression = _constMemberAccessCache.GetOrAdd(memberExpression.Member, _ =>
+                        {
+                            // rewrite as capturedLocal => ((TDeclaringType)capturedLocal).Member
+                            var parameterExpression = Expression.Parameter(typeof(object), "capturedLocal");
+                            var castExpression =
+                                Expression.Convert(parameterExpression, memberExpression.Member.DeclaringType);
+                            var replacementMemberExpression = memberExpression.Update(castExpression);
+                            var replacementExpression = Expression.Lambda<Func<object, TResult>>(
+                                replacementMemberExpression,
+                                parameterExpression);
+
+                            return replacementExpression.Compile();
+                        });
+
+                        var capturedLocal = constantExpression.Value;
+                        return _ => compiledExpression(capturedLocal);
+                    }
+                }
+
+                return null;
+            }
+
+            private static Func<TModel, TResult> CompileSlow(Expression<Func<TModel, TResult>> expression)
+            {
+                if (expression == null)
+                {
+                    throw new ArgumentNullException(nameof(expression));
+                }
+
+                // fallback compilation system - just compile the expression directly
+                return expression.Compile();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/CharArrayBufferSource.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/CharArrayBufferSource.cs
new file mode 100644
index 0000000000..50d526172d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/CharArrayBufferSource.cs
@@ -0,0 +1,17 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class CharArrayBufferSource : ICharBufferSource
+    {
+        public static readonly CharArrayBufferSource Instance = new CharArrayBufferSource();
+
+        public char[] Rent(int bufferSize) => new char[bufferSize];
+
+        public void Return(char[] buffer)
+        {
+            // Do nothing.
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerSaveTempDataPropertyFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerSaveTempDataPropertyFilter.cs
new file mode 100644
index 0000000000..96228d5b7b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerSaveTempDataPropertyFilter.cs
@@ -0,0 +1,29 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    internal class ControllerSaveTempDataPropertyFilter : SaveTempDataPropertyFilterBase, IActionFilter
+    {
+        public ControllerSaveTempDataPropertyFilter(ITempDataDictionaryFactory factory)
+            : base(factory)
+        {
+        }
+
+        public void OnActionExecuted(ActionExecutedContext context)
+        {
+        }
+
+        /// <inheritdoc />
+        public void OnActionExecuting(ActionExecutingContext context)
+        {
+            Subject = context.Controller;
+            var tempData = _tempDataFactory.GetTempData(context.HttpContext);
+
+            SetPropertyVaules(tempData);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerSaveTempDataPropertyFilterFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerSaveTempDataPropertyFilterFactory.cs
new file mode 100644
index 0000000000..22b7754f72
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerSaveTempDataPropertyFilterFactory.cs
@@ -0,0 +1,35 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    internal class ControllerSaveTempDataPropertyFilterFactory : IFilterFactory
+    {
+        public ControllerSaveTempDataPropertyFilterFactory(IReadOnlyList<LifecycleProperty> properties)
+        {
+            TempDataProperties = properties;
+        }
+
+        public IReadOnlyList<LifecycleProperty> TempDataProperties { get; }
+
+        public bool IsReusable => false;
+
+        public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
+        {
+            if (serviceProvider == null)
+            {
+                throw new ArgumentNullException(nameof(serviceProvider));
+            }
+
+            var service = serviceProvider.GetRequiredService<ControllerSaveTempDataPropertyFilter>();
+            service.Properties = TempDataProperties;
+            return service;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerViewDataAttributeFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerViewDataAttributeFilter.cs
new file mode 100644
index 0000000000..f08508736d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerViewDataAttributeFilter.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    internal class ControllerViewDataAttributeFilter : IActionFilter, IViewDataValuesProviderFeature
+    {
+        public ControllerViewDataAttributeFilter(IReadOnlyList<LifecycleProperty> properties)
+        {
+            Properties = properties;
+        }
+
+        public object Subject { get; set; }
+
+        public IReadOnlyList<LifecycleProperty> Properties { get; }
+
+        public void OnActionExecuted(ActionExecutedContext context)
+        {
+        }
+
+        public void OnActionExecuting(ActionExecutingContext context)
+        {
+            Subject = context.Controller;
+            context.HttpContext.Features.Set<IViewDataValuesProviderFeature>(this);
+        }
+
+        public void ProvideViewDataValues(ViewDataDictionary viewData)
+        {
+            for (var i = 0; i < Properties.Count; i++)
+            {
+                var property = Properties[i];
+                var value = property.GetValue(Subject);
+
+                if (value != null)
+                {
+                    viewData[property.Key] = value;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerViewDataAttributeFilterFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerViewDataAttributeFilterFactory.cs
new file mode 100644
index 0000000000..61e9e172df
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerViewDataAttributeFilterFactory.cs
@@ -0,0 +1,28 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    internal class ControllerViewDataAttributeFilterFactory : IFilterFactory
+    {
+        public ControllerViewDataAttributeFilterFactory(IReadOnlyList<LifecycleProperty> properties)
+        {
+            Properties = properties;
+        }
+
+        public IReadOnlyList<LifecycleProperty> Properties { get; }
+
+        // ControllerViewDataAttributeFilter is stateful and cannot be reused.
+        public bool IsReusable => false;
+
+        public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
+        {
+            return new ControllerViewDataAttributeFilter(Properties);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultDisplayTemplates.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultDisplayTemplates.cs
new file mode 100644
index 0000000000..eb071f5807
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultDisplayTemplates.cs
@@ -0,0 +1,297 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public static class DefaultDisplayTemplates
+    {
+        public static IHtmlContent BooleanTemplate(IHtmlHelper htmlHelper)
+        {
+            bool? value = null;
+            if (htmlHelper.ViewData.Model != null)
+            {
+                value = Convert.ToBoolean(htmlHelper.ViewData.Model, CultureInfo.InvariantCulture);
+            }
+
+            return htmlHelper.ViewData.ModelMetadata.IsNullableValueType ?
+                BooleanTemplateDropDownList(value) :
+                BooleanTemplateCheckbox(value ?? false);
+        }
+
+        private static IHtmlContent BooleanTemplateCheckbox(bool value)
+        {
+            var inputTag = new TagBuilder("input");
+            inputTag.AddCssClass("check-box");
+            inputTag.Attributes["disabled"] = "disabled";
+            inputTag.Attributes["type"] = "checkbox";
+            if (value)
+            {
+                inputTag.Attributes["checked"] = "checked";
+            }
+
+            inputTag.TagRenderMode = TagRenderMode.SelfClosing;
+            return inputTag;
+        }
+
+        private static IHtmlContent BooleanTemplateDropDownList(bool? value)
+        {
+            var selectTag = new TagBuilder("select");
+            selectTag.AddCssClass("list-box");
+            selectTag.AddCssClass("tri-state");
+            selectTag.Attributes["disabled"] = "disabled";
+
+            foreach (var item in TriStateValues(value))
+            {
+                selectTag.InnerHtml.AppendHtml(DefaultHtmlGenerator.GenerateOption(item, item.Text));
+            }
+
+            return selectTag;
+        }
+
+        // Will soon need to be shared with the default editor templates implementations.
+        internal static List<SelectListItem> TriStateValues(bool? value)
+        {
+            return new List<SelectListItem>
+            {
+                new SelectListItem(Resources.Common_TriState_NotSet, string.Empty, !value.HasValue),
+                new SelectListItem(Resources.Common_TriState_True, "true", (value == true)),
+                new SelectListItem(Resources.Common_TriState_False, "false", (value == false)),
+            };
+        }
+
+        public static IHtmlContent CollectionTemplate(IHtmlHelper htmlHelper)
+        {
+            var model = htmlHelper.ViewData.Model;
+            if (model == null)
+            {
+                return HtmlString.Empty;
+            }
+
+            var enumerable = model as IEnumerable;
+            if (enumerable == null)
+            {
+                // Only way we could reach here is if user passed templateName: "Collection" to a Display() overload.
+                throw new InvalidOperationException(Resources.FormatTemplates_TypeMustImplementIEnumerable(
+                    "Collection", model.GetType().FullName, typeof(IEnumerable).FullName));
+            }
+
+            var elementMetadata = htmlHelper.ViewData.ModelMetadata.ElementMetadata;
+            Debug.Assert(elementMetadata != null);
+            var typeInCollectionIsNullableValueType = elementMetadata.IsNullableValueType;
+
+            var serviceProvider = htmlHelper.ViewContext.HttpContext.RequestServices;
+            var metadataProvider = serviceProvider.GetRequiredService<IModelMetadataProvider>();
+
+            // Use typeof(string) instead of typeof(object) for IEnumerable collections. Neither type is Nullable<T>.
+            if (elementMetadata.ModelType == typeof(object))
+            {
+                elementMetadata = metadataProvider.GetMetadataForType(typeof(string));
+            }
+
+            var oldPrefix = htmlHelper.ViewData.TemplateInfo.HtmlFieldPrefix;
+            try
+            {
+                htmlHelper.ViewData.TemplateInfo.HtmlFieldPrefix = string.Empty;
+
+                var collection = model as ICollection;
+                var result = collection == null ? new HtmlContentBuilder() : new HtmlContentBuilder(collection.Count);
+                var viewEngine = serviceProvider.GetRequiredService<ICompositeViewEngine>();
+                var viewBufferScope = serviceProvider.GetRequiredService<IViewBufferScope>();
+
+                var index = 0;
+                foreach (var item in enumerable)
+                {
+                    var itemMetadata = elementMetadata;
+                    if (item != null && !typeInCollectionIsNullableValueType)
+                    {
+                        itemMetadata = metadataProvider.GetMetadataForType(item.GetType());
+                    }
+
+                    var modelExplorer = new ModelExplorer(
+                        metadataProvider,
+                        container: htmlHelper.ViewData.ModelExplorer,
+                        metadata: itemMetadata,
+                        model: item);
+                    var fieldName = string.Format(CultureInfo.InvariantCulture, "{0}[{1}]", oldPrefix, index++);
+
+                    var templateBuilder = new TemplateBuilder(
+                        viewEngine,
+                        viewBufferScope,
+                        htmlHelper.ViewContext,
+                        htmlHelper.ViewData,
+                        modelExplorer,
+                        htmlFieldName: fieldName,
+                        templateName: null,
+                        readOnly: true,
+                        additionalViewData: null);
+                    result.AppendHtml(templateBuilder.Build());
+                }
+
+                return result;
+            }
+            finally
+            {
+                htmlHelper.ViewData.TemplateInfo.HtmlFieldPrefix = oldPrefix;
+            }
+        }
+
+        public static IHtmlContent DecimalTemplate(IHtmlHelper htmlHelper)
+        {
+            if (htmlHelper.ViewData.TemplateInfo.FormattedModelValue == htmlHelper.ViewData.Model)
+            {
+                htmlHelper.ViewData.TemplateInfo.FormattedModelValue =
+                    string.Format(CultureInfo.CurrentCulture, "{0:0.00}", htmlHelper.ViewData.Model);
+            }
+
+            return StringTemplate(htmlHelper);
+        }
+
+        public static IHtmlContent EmailAddressTemplate(IHtmlHelper htmlHelper)
+        {
+            var uriString = "mailto:" + ((htmlHelper.ViewData.Model == null) ?
+                string.Empty :
+                htmlHelper.ViewData.Model.ToString());
+            var linkedText = (htmlHelper.ViewData.TemplateInfo.FormattedModelValue == null) ?
+                string.Empty :
+                htmlHelper.ViewData.TemplateInfo.FormattedModelValue.ToString();
+
+            return HyperlinkTemplate(uriString, linkedText);
+        }
+
+        public static IHtmlContent HiddenInputTemplate(IHtmlHelper htmlHelper)
+        {
+            if (htmlHelper.ViewData.ModelMetadata.HideSurroundingHtml)
+            {
+                return HtmlString.Empty;
+            }
+
+            return StringTemplate(htmlHelper);
+        }
+
+        public static IHtmlContent HtmlTemplate(IHtmlHelper htmlHelper)
+        {
+            return new HtmlString(htmlHelper.ViewData.TemplateInfo.FormattedModelValue.ToString());
+        }
+
+        public static IHtmlContent ObjectTemplate(IHtmlHelper htmlHelper)
+        {
+            var viewData = htmlHelper.ViewData;
+            var templateInfo = viewData.TemplateInfo;
+            var modelExplorer = viewData.ModelExplorer;
+
+            if (modelExplorer.Model == null)
+            {
+                return new HtmlString(modelExplorer.Metadata.NullDisplayText);
+            }
+
+            if (templateInfo.TemplateDepth > 1)
+            {
+                var text = modelExplorer.GetSimpleDisplayText();
+                if (modelExplorer.Metadata.HtmlEncode)
+                {
+                    text = htmlHelper.Encode(text);
+                }
+
+                return new HtmlString(text);
+            }
+
+            var serviceProvider = htmlHelper.ViewContext.HttpContext.RequestServices;
+            var viewEngine = serviceProvider.GetRequiredService<ICompositeViewEngine>();
+            var viewBufferScope = serviceProvider.GetRequiredService<IViewBufferScope>();
+
+            var content = new HtmlContentBuilder(modelExplorer.Metadata.Properties.Count);
+            foreach (var propertyExplorer in modelExplorer.Properties)
+            {
+                var propertyMetadata = propertyExplorer.Metadata;
+                if (!ShouldShow(propertyExplorer, templateInfo))
+                {
+                    continue;
+                }
+
+                var templateBuilder = new TemplateBuilder(
+                    viewEngine,
+                    viewBufferScope,
+                    htmlHelper.ViewContext,
+                    htmlHelper.ViewData,
+                    propertyExplorer,
+                    htmlFieldName: propertyMetadata.PropertyName,
+                    templateName: null,
+                    readOnly: true,
+                    additionalViewData: null);
+
+                var templateBuilderResult = templateBuilder.Build();
+                if (!propertyMetadata.HideSurroundingHtml)
+                {
+                    var label = propertyMetadata.GetDisplayName();
+                    if (!string.IsNullOrEmpty(label))
+                    {
+                        var labelTag = new TagBuilder("div");
+                        labelTag.InnerHtml.SetContent(label);
+                        labelTag.AddCssClass("display-label");
+                        content.AppendLine(labelTag);
+                    }
+
+                    var valueDivTag = new TagBuilder("div");
+                    valueDivTag.AddCssClass("display-field");
+                    valueDivTag.InnerHtml.SetHtmlContent(templateBuilderResult);
+                    content.AppendLine(valueDivTag);
+                }
+                else
+                {
+                    content.AppendHtml(templateBuilderResult);
+                }
+            }
+
+            return content;
+        }
+
+        private static bool ShouldShow(ModelExplorer modelExplorer, TemplateInfo templateInfo)
+        {
+            return
+                modelExplorer.Metadata.ShowForDisplay &&
+                !modelExplorer.Metadata.IsComplexType &&
+                !templateInfo.Visited(modelExplorer);
+        }
+
+        public static IHtmlContent StringTemplate(IHtmlHelper htmlHelper)
+        {
+            var value = htmlHelper.ViewData.TemplateInfo.FormattedModelValue;
+            if (value == null)
+            {
+                return HtmlString.Empty;
+            }
+
+            return new StringHtmlContent(value.ToString());
+        }
+
+        public static IHtmlContent UrlTemplate(IHtmlHelper htmlHelper)
+        {
+            var uriString = (htmlHelper.ViewData.Model == null) ? string.Empty : htmlHelper.ViewData.Model.ToString();
+            var linkedText = (htmlHelper.ViewData.TemplateInfo.FormattedModelValue == null) ?
+                string.Empty :
+                htmlHelper.ViewData.TemplateInfo.FormattedModelValue.ToString();
+
+            return HyperlinkTemplate(uriString, linkedText);
+        }
+
+        // Neither uriString nor linkedText need be encoded prior to calling this method.
+        private static IHtmlContent HyperlinkTemplate(string uriString, string linkedText)
+        {
+            var hyperlinkTag = new TagBuilder("a");
+            hyperlinkTag.MergeAttribute("href", uriString);
+            hyperlinkTag.InnerHtml.SetContent(linkedText);
+            return hyperlinkTag;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultEditorTemplates.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultEditorTemplates.cs
new file mode 100644
index 0000000000..408448c651
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultEditorTemplates.cs
@@ -0,0 +1,567 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public static class DefaultEditorTemplates
+    {
+        private const string HtmlAttributeKey = "htmlAttributes";
+        private const string UsePasswordValue = "Switch.Microsoft.AspNetCore.Mvc.UsePasswordValue";
+
+        public static IHtmlContent BooleanTemplate(IHtmlHelper htmlHelper)
+        {
+            bool? value = null;
+            if (htmlHelper.ViewData.Model != null)
+            {
+                value = Convert.ToBoolean(htmlHelper.ViewData.Model, CultureInfo.InvariantCulture);
+            }
+
+            return htmlHelper.ViewData.ModelMetadata.IsNullableValueType ?
+                BooleanTemplateDropDownList(htmlHelper, value) :
+                BooleanTemplateCheckbox(htmlHelper, value ?? false);
+        }
+
+        private static IHtmlContent BooleanTemplateCheckbox(IHtmlHelper htmlHelper, bool value)
+        {
+            return htmlHelper.CheckBox(
+                expression: null,
+                isChecked: value,
+                htmlAttributes: CreateHtmlAttributes(htmlHelper, "check-box"));
+        }
+
+        private static IHtmlContent BooleanTemplateDropDownList(IHtmlHelper htmlHelper, bool? value)
+        {
+            return htmlHelper.DropDownList(
+                expression: null,
+                selectList: DefaultDisplayTemplates.TriStateValues(value),
+                optionLabel: null,
+                htmlAttributes: CreateHtmlAttributes(htmlHelper, "list-box tri-state"));
+        }
+
+        public static IHtmlContent CollectionTemplate(IHtmlHelper htmlHelper)
+        {
+            var viewData = htmlHelper.ViewData;
+            var model = viewData.Model;
+            if (model == null)
+            {
+                return HtmlString.Empty;
+            }
+
+            var enumerable = model as IEnumerable;
+            if (enumerable == null)
+            {
+                // Only way we could reach here is if user passed templateName: "Collection" to an Editor() overload.
+                throw new InvalidOperationException(Resources.FormatTemplates_TypeMustImplementIEnumerable(
+                    "Collection", model.GetType().FullName, typeof(IEnumerable).FullName));
+            }
+
+            var elementMetadata = htmlHelper.ViewData.ModelMetadata.ElementMetadata;
+            Debug.Assert(elementMetadata != null);
+            var typeInCollectionIsNullableValueType = elementMetadata.IsNullableValueType;
+
+            var serviceProvider = htmlHelper.ViewContext.HttpContext.RequestServices;
+            var metadataProvider = serviceProvider.GetRequiredService<IModelMetadataProvider>();
+
+            // Use typeof(string) instead of typeof(object) for IEnumerable collections. Neither type is Nullable<T>.
+            if (elementMetadata.ModelType == typeof(object))
+            {
+                elementMetadata = metadataProvider.GetMetadataForType(typeof(string));
+            }
+
+            var oldPrefix = viewData.TemplateInfo.HtmlFieldPrefix;
+            try
+            {
+                viewData.TemplateInfo.HtmlFieldPrefix = string.Empty;
+
+                var collection = model as ICollection;
+                var result = collection == null ? new HtmlContentBuilder() : new HtmlContentBuilder(collection.Count);
+                var viewEngine = serviceProvider.GetRequiredService<ICompositeViewEngine>();
+                var viewBufferScope = serviceProvider.GetRequiredService<IViewBufferScope>();
+
+                var index = 0;
+                foreach (var item in enumerable)
+                {
+                    var itemMetadata = elementMetadata;
+                    if (item != null && !typeInCollectionIsNullableValueType)
+                    {
+                        itemMetadata = metadataProvider.GetMetadataForType(item.GetType());
+                    }
+
+                    var modelExplorer = new ModelExplorer(
+                        metadataProvider,
+                        container: htmlHelper.ViewData.ModelExplorer,
+                        metadata: itemMetadata,
+                        model: item);
+                    var fieldName = string.Format(CultureInfo.InvariantCulture, "{0}[{1}]", oldPrefix, index++);
+
+                    var templateBuilder = new TemplateBuilder(
+                        viewEngine,
+                        viewBufferScope,
+                        htmlHelper.ViewContext,
+                        htmlHelper.ViewData,
+                        modelExplorer,
+                        htmlFieldName: fieldName,
+                        templateName: null,
+                        readOnly: false,
+                        additionalViewData: null);
+                    result.AppendHtml(templateBuilder.Build());
+                }
+
+                return result;
+            }
+            finally
+            {
+                viewData.TemplateInfo.HtmlFieldPrefix = oldPrefix;
+            }
+        }
+
+        public static IHtmlContent DecimalTemplate(IHtmlHelper htmlHelper)
+        {
+            if (htmlHelper.ViewData.TemplateInfo.FormattedModelValue == htmlHelper.ViewData.Model)
+            {
+                htmlHelper.ViewData.TemplateInfo.FormattedModelValue =
+                    string.Format(CultureInfo.CurrentCulture, "{0:0.00}", htmlHelper.ViewData.Model);
+            }
+
+            return StringTemplate(htmlHelper);
+        }
+
+        public static IHtmlContent HiddenInputTemplate(IHtmlHelper htmlHelper)
+        {
+            var viewData = htmlHelper.ViewData;
+            var model = viewData.Model;
+
+            IHtmlContent display;
+            if (viewData.ModelMetadata.HideSurroundingHtml)
+            {
+                display = null;
+            }
+            else
+            {
+                display = DefaultDisplayTemplates.StringTemplate(htmlHelper);
+            }
+
+            var htmlAttributesObject = viewData[HtmlAttributeKey];
+            var hidden = htmlHelper.Hidden(expression: null, value: model, htmlAttributes: htmlAttributesObject);
+            if (viewData.ModelMetadata.HideSurroundingHtml)
+            {
+                return hidden;
+            }
+
+            return new HtmlContentBuilder(capacity: 2)
+                .AppendHtml(display)
+                .AppendHtml(hidden);
+        }
+
+        private static IDictionary<string, object> CreateHtmlAttributes(
+            IHtmlHelper htmlHelper,
+            string className,
+            string inputType = null)
+        {
+            var htmlAttributesObject = htmlHelper.ViewData[HtmlAttributeKey];
+            if (htmlAttributesObject != null)
+            {
+                return MergeHtmlAttributes(htmlAttributesObject, className, inputType);
+            }
+
+            var htmlAttributes = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "class", className }
+            };
+
+            if (inputType != null)
+            {
+                htmlAttributes.Add("type", inputType);
+            }
+
+            return htmlAttributes;
+        }
+
+        private static IDictionary<string, object> MergeHtmlAttributes(
+            object htmlAttributesObject,
+            string className,
+            string inputType)
+        {
+            var htmlAttributes = HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributesObject);
+
+            if (htmlAttributes.TryGetValue("class", out var htmlClassObject))
+            {
+                var htmlClassName = htmlClassObject + " " + className;
+                htmlAttributes["class"] = htmlClassName;
+            }
+            else
+            {
+                htmlAttributes.Add("class", className);
+            }
+
+            // The input type from the provided htmlAttributes overrides the inputType parameter.
+            if (inputType != null && !htmlAttributes.ContainsKey("type"))
+            {
+                htmlAttributes.Add("type", inputType);
+            }
+
+            return htmlAttributes;
+        }
+
+        public static IHtmlContent MultilineTemplate(IHtmlHelper htmlHelper)
+        {
+            return htmlHelper.TextArea(
+                expression: string.Empty,
+                value: htmlHelper.ViewContext.ViewData.TemplateInfo.FormattedModelValue.ToString(),
+                rows: 0,
+                columns: 0,
+                htmlAttributes: CreateHtmlAttributes(htmlHelper, "text-box multi-line"));
+        }
+
+        public static IHtmlContent ObjectTemplate(IHtmlHelper htmlHelper)
+        {
+            var viewData = htmlHelper.ViewData;
+            var templateInfo = viewData.TemplateInfo;
+            var modelExplorer = viewData.ModelExplorer;
+
+            if (templateInfo.TemplateDepth > 1)
+            {
+                if (modelExplorer.Model == null)
+                {
+                    return new HtmlString(modelExplorer.Metadata.NullDisplayText);
+                }
+
+                var text = modelExplorer.GetSimpleDisplayText();
+                if (modelExplorer.Metadata.HtmlEncode)
+                {
+                    return new StringHtmlContent(text);
+                }
+
+                return new HtmlString(text);
+            }
+
+            var serviceProvider = htmlHelper.ViewContext.HttpContext.RequestServices;
+            var viewEngine = serviceProvider.GetRequiredService<ICompositeViewEngine>();
+            var viewBufferScope = serviceProvider.GetRequiredService<IViewBufferScope>();
+
+            var content = new HtmlContentBuilder(modelExplorer.Metadata.Properties.Count);
+            foreach (var propertyExplorer in modelExplorer.Properties)
+            {
+                var propertyMetadata = propertyExplorer.Metadata;
+                if (!ShouldShow(propertyExplorer, templateInfo))
+                {
+                    continue;
+                }
+
+                var templateBuilder = new TemplateBuilder(
+                    viewEngine,
+                    viewBufferScope,
+                    htmlHelper.ViewContext,
+                    htmlHelper.ViewData,
+                    propertyExplorer,
+                    htmlFieldName: propertyMetadata.PropertyName,
+                    templateName: null,
+                    readOnly: false,
+                    additionalViewData: null);
+
+                var templateBuilderResult = templateBuilder.Build();
+                if (!propertyMetadata.HideSurroundingHtml)
+                {
+                    var label = htmlHelper.Label(propertyMetadata.PropertyName, labelText: null, htmlAttributes: null);
+                    using (var writer = new HasContentTextWriter())
+                    {
+                        label.WriteTo(writer, PassThroughHtmlEncoder.Default);
+                        if (writer.HasContent)
+                        {
+                            var labelTag = new TagBuilder("div");
+                            labelTag.AddCssClass("editor-label");
+                            labelTag.InnerHtml.SetHtmlContent(label);
+                            content.AppendLine(labelTag);
+                        }
+                    }
+
+                    var valueDivTag = new TagBuilder("div");
+                    valueDivTag.AddCssClass("editor-field");
+
+                    valueDivTag.InnerHtml.AppendHtml(templateBuilderResult);
+                    valueDivTag.InnerHtml.AppendHtml(" ");
+                    valueDivTag.InnerHtml.AppendHtml(htmlHelper.ValidationMessage(
+                        propertyMetadata.PropertyName,
+                        message: null,
+                        htmlAttributes: null,
+                        tag: null));
+
+                    content.AppendLine(valueDivTag);
+                }
+                else
+                {
+                    content.AppendHtml(templateBuilderResult);
+                }
+            }
+
+            return content;
+        }
+
+        public static IHtmlContent PasswordTemplate(IHtmlHelper htmlHelper)
+        {
+            object value = null;
+            if (AppContext.TryGetSwitch(UsePasswordValue, out var usePasswordValue) && usePasswordValue)
+            {
+                value = htmlHelper.ViewData.TemplateInfo.FormattedModelValue;
+            }
+
+            return htmlHelper.Password(
+                expression: null,
+                value: value,
+                htmlAttributes: CreateHtmlAttributes(htmlHelper, "text-box single-line password"));
+        }
+
+        private static bool ShouldShow(ModelExplorer modelExplorer, TemplateInfo templateInfo)
+        {
+            return
+                modelExplorer.Metadata.ShowForEdit &&
+                !modelExplorer.Metadata.IsComplexType &&
+                !templateInfo.Visited(modelExplorer);
+        }
+
+        public static IHtmlContent StringTemplate(IHtmlHelper htmlHelper)
+        {
+            return GenerateTextBox(htmlHelper);
+        }
+
+        public static IHtmlContent PhoneNumberInputTemplate(IHtmlHelper htmlHelper)
+        {
+            return GenerateTextBox(htmlHelper, inputType: "tel");
+        }
+
+        public static IHtmlContent UrlInputTemplate(IHtmlHelper htmlHelper)
+        {
+            return GenerateTextBox(htmlHelper, inputType: "url");
+        }
+
+        public static IHtmlContent EmailAddressInputTemplate(IHtmlHelper htmlHelper)
+        {
+            return GenerateTextBox(htmlHelper, inputType: "email");
+        }
+
+        public static IHtmlContent DateTimeOffsetTemplate(IHtmlHelper htmlHelper)
+        {
+            ApplyRfc3339DateFormattingIfNeeded(htmlHelper, @"{0:yyyy-MM-ddTHH\:mm\:ss.fffK}");
+            return GenerateTextBox(htmlHelper, inputType: "text");
+        }
+
+        public static IHtmlContent DateTimeLocalInputTemplate(IHtmlHelper htmlHelper)
+        {
+            ApplyRfc3339DateFormattingIfNeeded(htmlHelper, @"{0:yyyy-MM-ddTHH\:mm\:ss.fff}");
+            return GenerateTextBox(htmlHelper, inputType: "datetime-local");
+        }
+
+        public static IHtmlContent DateInputTemplate(IHtmlHelper htmlHelper)
+        {
+            ApplyRfc3339DateFormattingIfNeeded(htmlHelper, "{0:yyyy-MM-dd}");
+            return GenerateTextBox(htmlHelper, inputType: "date");
+        }
+
+        public static IHtmlContent TimeInputTemplate(IHtmlHelper htmlHelper)
+        {
+            ApplyRfc3339DateFormattingIfNeeded(htmlHelper, @"{0:HH\:mm\:ss.fff}");
+            return GenerateTextBox(htmlHelper, inputType: "time");
+        }
+
+        public static IHtmlContent MonthInputTemplate(IHtmlHelper htmlHelper)
+        {
+            // "month" is a new HTML5 input type that only will be rendered in Rfc3339 mode
+            htmlHelper.Html5DateRenderingMode = Html5DateRenderingMode.Rfc3339;
+            ApplyRfc3339DateFormattingIfNeeded(htmlHelper, "{0:yyyy-MM}");
+            return GenerateTextBox(htmlHelper, inputType: "month");
+        }
+
+        public static IHtmlContent WeekInputTemplate(IHtmlHelper htmlHelper)
+        {
+            return GenerateTextBox(htmlHelper, inputType: "week");
+        }
+
+        public static IHtmlContent NumberInputTemplate(IHtmlHelper htmlHelper)
+        {
+            return GenerateTextBox(htmlHelper, inputType: "number");
+        }
+
+        public static IHtmlContent FileInputTemplate(IHtmlHelper htmlHelper)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return GenerateTextBox(htmlHelper, inputType: "file");
+        }
+
+        public static IHtmlContent FileCollectionInputTemplate(IHtmlHelper htmlHelper)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            var htmlAttributes =
+                CreateHtmlAttributes(htmlHelper, className: "text-box single-line", inputType: "file");
+            htmlAttributes["multiple"] = "multiple";
+
+            return GenerateTextBox(htmlHelper, htmlHelper.ViewData.TemplateInfo.FormattedModelValue, htmlAttributes);
+        }
+
+        private static void ApplyRfc3339DateFormattingIfNeeded(IHtmlHelper htmlHelper, string format)
+        {
+            if (htmlHelper.Html5DateRenderingMode != Html5DateRenderingMode.Rfc3339)
+            {
+                return;
+            }
+
+            var metadata = htmlHelper.ViewData.ModelMetadata;
+            var value = htmlHelper.ViewData.Model;
+            if (htmlHelper.ViewData.TemplateInfo.FormattedModelValue != value && metadata.HasNonDefaultEditFormat)
+            {
+                return;
+            }
+
+            if (value is DateTime || value is DateTimeOffset)
+            {
+                htmlHelper.ViewData.TemplateInfo.FormattedModelValue =
+                    string.Format(CultureInfo.InvariantCulture, format, value);
+            }
+        }
+
+        private static IHtmlContent GenerateTextBox(IHtmlHelper htmlHelper, string inputType = null)
+        {
+            return GenerateTextBox(htmlHelper, inputType, htmlHelper.ViewData.TemplateInfo.FormattedModelValue);
+        }
+
+        private static IHtmlContent GenerateTextBox(IHtmlHelper htmlHelper, string inputType, object value)
+        {
+            var htmlAttributes =
+                CreateHtmlAttributes(htmlHelper, className: "text-box single-line", inputType: inputType);
+
+            return GenerateTextBox(htmlHelper, value, htmlAttributes);
+        }
+
+        private static IHtmlContent GenerateTextBox(IHtmlHelper htmlHelper, object value, object htmlAttributes)
+        {
+            return htmlHelper.TextBox(
+                expression: null,
+                value: value,
+                format: null,
+                htmlAttributes: htmlAttributes);
+        }
+
+        private class HasContentTextWriter : TextWriter
+        {
+            public bool HasContent { get; private set; }
+
+            public override Encoding Encoding => Null.Encoding;
+
+            public override void Write(char value)
+            {
+                HasContent = true;
+            }
+
+            public override void Write(char[] buffer, int index, int count)
+            {
+                if (count > 0)
+                {
+                    HasContent = true;
+                }
+            }
+
+            public override void Write(string value)
+            {
+                if (!string.IsNullOrEmpty(value))
+                {
+                    HasContent = true;
+                }
+            }
+        }
+
+        // An HTML encoder which passes through all input data. Does no encoding.
+        // Copied from Microsoft.AspNetCore.Razor.TagHelpers.NullHtmlEncoder.
+        private class PassThroughHtmlEncoder : HtmlEncoder
+        {
+            private PassThroughHtmlEncoder()
+            {
+            }
+
+            public static new PassThroughHtmlEncoder Default { get; } = new PassThroughHtmlEncoder();
+
+            public override int MaxOutputCharactersPerInputCharacter => 1;
+
+            public override string Encode(string value)
+            {
+                return value;
+            }
+
+            public override void Encode(TextWriter output, char[] value, int startIndex, int characterCount)
+            {
+                if (output == null)
+                {
+                    throw new ArgumentNullException(nameof(output));
+                }
+
+                if (characterCount == 0)
+                {
+                    return;
+                }
+
+                output.Write(value, startIndex, characterCount);
+            }
+
+            public override void Encode(TextWriter output, string value, int startIndex, int characterCount)
+            {
+                if (output == null)
+                {
+                    throw new ArgumentNullException(nameof(output));
+                }
+
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                if (characterCount == 0)
+                {
+                    return;
+                }
+
+                output.Write(value.Substring(startIndex, characterCount));
+            }
+
+            public override unsafe int FindFirstCharacterToEncode(char* text, int textLength)
+            {
+                return -1;
+            }
+
+            public override unsafe bool TryEncodeUnicodeScalar(
+                int unicodeScalar,
+                char* buffer,
+                int bufferLength,
+                out int numberOfCharactersWritten)
+            {
+                numberOfCharactersWritten = 0;
+
+                return false;
+            }
+
+            public override bool WillEncode(int unicodeScalar)
+            {
+                return false;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DynamicViewData.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DynamicViewData.cs
new file mode 100644
index 0000000000..8f17e95800
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DynamicViewData.cs
@@ -0,0 +1,73 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Dynamic;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class DynamicViewData : DynamicObject
+    {
+        private readonly Func<ViewDataDictionary> _viewDataFunc;
+
+        public DynamicViewData(Func<ViewDataDictionary> viewDataFunc)
+        {
+            if (viewDataFunc == null)
+            {
+                throw new ArgumentNullException(nameof(viewDataFunc));
+            }
+
+            _viewDataFunc = viewDataFunc;
+        }
+
+        private ViewDataDictionary ViewData
+        {
+            get
+            {
+                var viewData = _viewDataFunc();
+                if (viewData == null)
+                {
+                    throw new InvalidOperationException(Resources.DynamicViewData_ViewDataNull);
+                }
+
+                return viewData;
+            }
+        }
+
+        // Implementing this function extends the ViewBag contract, supporting or improving some scenarios. For example
+        // having this method improves the debugging experience as it provides the debugger with the list of all
+        // properties currently defined on the object.
+        public override IEnumerable<string> GetDynamicMemberNames()
+        {
+            return ViewData.Keys;
+        }
+
+        public override bool TryGetMember(GetMemberBinder binder, out object result)
+        {
+            if (binder == null)
+            {
+                throw new ArgumentNullException(nameof(binder));
+            }
+
+            result = ViewData[binder.Name];
+
+            // ViewDataDictionary[key] will never throw a KeyNotFoundException.
+            // Similarly, return true so caller does not throw.
+            return true;
+        }
+
+        public override bool TrySetMember(SetMemberBinder binder, object value)
+        {
+            if (binder == null)
+            {
+                throw new ArgumentNullException(nameof(binder));
+            }
+
+            ViewData[binder.Name] = value;
+
+            // Can always add / update a ViewDataDictionary value.
+            return true;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionHelper.cs
new file mode 100644
index 0000000000..b2c47f3892
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionHelper.cs
@@ -0,0 +1,292 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public static class ExpressionHelper
+    {
+        public static string GetExpressionText(string expression)
+        {
+            // If it's exactly "model", then give them an empty string, to replicate the lambda behavior.
+            return string.Equals(expression, "model", StringComparison.OrdinalIgnoreCase) ? string.Empty : expression;
+        }
+
+        public static string GetExpressionText(LambdaExpression expression)
+        {
+            return GetExpressionText(expression, expressionTextCache: null);
+        }
+
+        public static string GetExpressionText(LambdaExpression expression, ExpressionTextCache expressionTextCache)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            string expressionText;
+            if (expressionTextCache != null &&
+                expressionTextCache.Entries.TryGetValue(expression, out expressionText))
+            {
+                return expressionText;
+            }
+
+            // Determine size of string needed (length) and number of segments it contains (segmentCount). Put another
+            // way, segmentCount tracks the number of times the loop below should iterate. This avoids adding ".model"
+            // and / or an extra leading "." and then removing them after the loop. Other information collected in this
+            // first loop helps with length and segmentCount adjustments. doNotCache is somewhat separate: If
+            // true, expression strings are not cached for the expression.
+            //
+            // After the corrections below the first loop, length is usually exactly the size of the returned string.
+            // However when containsIndexers is true, the calculation is approximate because either evaluating indexer
+            // expressions multiple times or saving indexer strings can get expensive. Optimizing for the common case
+            // of a collection (not a dictionary) with less than 100 elements. If that assumption proves to be
+            // incorrect, the StringBuilder will be enlarged but hopefully just once.
+            var doNotCache = false;
+            var lastIsModel = false;
+            var length = 0;
+            var segmentCount = 0;
+            var trailingMemberExpressions = 0;
+
+            var part = expression.Body;
+            while (part != null)
+            {
+                switch (part.NodeType)
+                {
+                    case ExpressionType.Call:
+                        // Will exit loop if at Method().Property or [i,j].Property. In that case (like [i].Property),
+                        // don't cache and don't remove ".Model" (if that's .Property).
+                        doNotCache = true;
+                        lastIsModel = false;
+
+                        var methodExpression = (MethodCallExpression)part;
+                        if (IsSingleArgumentIndexer(methodExpression))
+                        {
+                            length += "[99]".Length;
+                            part = methodExpression.Object;
+                            segmentCount++;
+                            trailingMemberExpressions = 0;
+                        }
+                        else
+                        {
+                            // Unsupported.
+                            part = null;
+                        }
+                        break;
+
+                    case ExpressionType.ArrayIndex:
+                        var binaryExpression = (BinaryExpression)part;
+
+                        doNotCache = true;
+                        lastIsModel = false;
+                        length += "[99]".Length;
+                        part = binaryExpression.Left;
+                        segmentCount++;
+                        trailingMemberExpressions = 0;
+                        break;
+
+                    case ExpressionType.MemberAccess:
+                        var memberExpressionPart = (MemberExpression)part;
+                        var name = memberExpressionPart.Member.Name;
+
+                        // If identifier contains "__", it is "reserved for use by the implementation" and likely
+                        // compiler- or Razor-generated e.g. the name of a field in a delegate's generated class.
+                        if (name.Contains("__"))
+                        {
+                            // Exit loop.
+                            part = null;
+                        }
+                        else
+                        {
+                            lastIsModel = string.Equals("model", name, StringComparison.OrdinalIgnoreCase);
+                            length += name.Length + 1;
+                            part = memberExpressionPart.Expression;
+                            segmentCount++;
+                            trailingMemberExpressions++;
+                        }
+                        break;
+
+                    case ExpressionType.Parameter:
+                        // Unsupported but indicates previous member access was not the view's Model.
+                        lastIsModel = false;
+                        part = null;
+                        break;
+
+                    default:
+                        // Unsupported.
+                        part = null;
+                        break;
+                }
+            }
+
+            // If name would start with ".model", then strip that part away.
+            if (lastIsModel)
+            {
+                length -= ".model".Length;
+                segmentCount--;
+                trailingMemberExpressions--;
+            }
+
+            // Trim the leading "." if present. The loop below special-cases the last property to avoid this addition.
+            if (trailingMemberExpressions > 0)
+            {
+                length--;
+            }
+
+            Debug.Assert(segmentCount >= 0);
+            if (segmentCount == 0)
+            {
+                Debug.Assert(!doNotCache);
+                if (expressionTextCache != null)
+                {
+                    expressionTextCache.Entries.TryAdd(expression, string.Empty);
+                }
+
+                return string.Empty;
+            }
+
+            var builder = new StringBuilder(length);
+            part = expression.Body;
+            while (part != null && segmentCount > 0)
+            {
+                segmentCount--;
+                switch (part.NodeType)
+                {
+                    case ExpressionType.Call:
+                        Debug.Assert(doNotCache);
+                        var methodExpression = (MethodCallExpression)part;
+
+                        InsertIndexerInvocationText(builder, methodExpression.Arguments.Single(), expression);
+
+                        part = methodExpression.Object;
+                        break;
+
+                    case ExpressionType.ArrayIndex:
+                        Debug.Assert(doNotCache);
+                        var binaryExpression = (BinaryExpression)part;
+
+                        InsertIndexerInvocationText(builder, binaryExpression.Right, expression);
+
+                        part = binaryExpression.Left;
+                        break;
+
+                    case ExpressionType.MemberAccess:
+                        var memberExpression = (MemberExpression)part;
+                        var name = memberExpression.Member.Name;
+                        Debug.Assert(!name.Contains("__"));
+
+                        builder.Insert(0, name);
+                        if (segmentCount > 0)
+                        {
+                            // One or more parts to the left of this part are coming.
+                            builder.Insert(0, '.');
+                        }
+
+                        part = memberExpression.Expression;
+                        break;
+
+                    default:
+                        // Should be unreachable due to handling in above loop.
+                        Debug.Assert(false);
+                        break;
+                }
+            }
+
+            Debug.Assert(segmentCount == 0);
+            expressionText = builder.ToString();
+            if (expressionTextCache != null && !doNotCache)
+            {
+                expressionTextCache.Entries.TryAdd(expression, expressionText);
+            }
+
+            return expressionText;
+        }
+
+        private static void InsertIndexerInvocationText(
+            StringBuilder builder,
+            Expression indexExpression,
+            LambdaExpression parentExpression)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            if (indexExpression == null)
+            {
+                throw new ArgumentNullException(nameof(indexExpression));
+            }
+
+            if (parentExpression == null)
+            {
+                throw new ArgumentNullException(nameof(parentExpression));
+            }
+
+            if (parentExpression.Parameters == null)
+            {
+                throw new ArgumentException(Resources.FormatPropertyOfTypeCannotBeNull(
+                    nameof(parentExpression.Parameters),
+                    nameof(parentExpression)));
+            }
+
+            var converted = Expression.Convert(indexExpression, typeof(object));
+            var fakeParameter = Expression.Parameter(typeof(object), null);
+            var lambda = Expression.Lambda<Func<object, object>>(converted, fakeParameter);
+            Func<object, object> func;
+
+            try
+            {
+                func = CachedExpressionCompiler.Process(lambda);
+            }
+            catch (InvalidOperationException ex)
+            {
+                var parameters = parentExpression.Parameters.ToArray();
+                throw new InvalidOperationException(
+                    Resources.FormatExpressionHelper_InvalidIndexerExpression(indexExpression, parameters[0].Name),
+                    ex);
+            }
+
+            builder.Insert(0, ']');
+            builder.Insert(0, Convert.ToString(func(null), CultureInfo.InvariantCulture));
+            builder.Insert(0, '[');
+        }
+
+        public static bool IsSingleArgumentIndexer(Expression expression)
+        {
+            var methodExpression = expression as MethodCallExpression;
+            if (methodExpression == null || methodExpression.Arguments.Count != 1)
+            {
+                return false;
+            }
+
+            // Check whether GetDefaultMembers() (if present in CoreCLR) would return a member of this type. Compiler
+            // names the indexer property, if any, in a generated [DefaultMember] attribute for the containing type.
+            var declaringType = methodExpression.Method.DeclaringType;
+            var defaultMember = declaringType.GetTypeInfo().GetCustomAttribute<DefaultMemberAttribute>(inherit: true);
+            if (defaultMember == null)
+            {
+                return false;
+            }
+
+            // Find default property (the indexer) and confirm its getter is the method in this expression.
+            var runtimeProperties = declaringType.GetRuntimeProperties();
+            foreach (var property in runtimeProperties)
+            {
+                if ((string.Equals(defaultMember.MemberName, property.Name, StringComparison.Ordinal) &&
+                    property.GetMethod == methodExpression.Method))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionMetadataProvider.cs
new file mode 100644
index 0000000000..38d89f80bc
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionMetadataProvider.cs
@@ -0,0 +1,219 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq.Expressions;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public static class ExpressionMetadataProvider
+    {
+        public static ModelExplorer FromLambdaExpression<TModel, TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            ViewDataDictionary<TModel> viewData,
+            IModelMetadataProvider metadataProvider)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            if (viewData == null)
+            {
+                throw new ArgumentNullException(nameof(viewData));
+            }
+
+            string propertyName = null;
+            Type containerType = null;
+            var legalExpression = false;
+
+            // Need to verify the expression is valid; it needs to at least end in something
+            // that we can convert to a meaningful string for model binding purposes
+
+            switch (expression.Body.NodeType)
+            {
+                case ExpressionType.ArrayIndex:
+                    // ArrayIndex always means a single-dimensional indexer;
+                    // multi-dimensional indexer is a method call to Get().
+                    legalExpression = true;
+                    break;
+
+                case ExpressionType.Call:
+                    // Only legal method call is a single argument indexer/DefaultMember call
+                    legalExpression = ExpressionHelper.IsSingleArgumentIndexer(expression.Body);
+                    break;
+
+                case ExpressionType.MemberAccess:
+                    // Property/field access is always legal
+                    var memberExpression = (MemberExpression)expression.Body;
+                    propertyName = memberExpression.Member is PropertyInfo ? memberExpression.Member.Name : null;
+                    if (string.Equals(propertyName, "Model", StringComparison.Ordinal) &&
+                        memberExpression.Type == typeof(TModel) &&
+                        memberExpression.Expression.NodeType == ExpressionType.Constant)
+                    {
+                        // Special case the Model property in RazorPage<TModel>. (m => Model) should behave identically
+                        // to (m => m). But do the more complicated thing for (m => m.Model) since that is a slightly
+                        // different beast.)
+                        return FromModel(viewData, metadataProvider);
+                    }
+
+                    // memberExpression.Expression can be null when this is a static field or property.
+                    //
+                    // This can be the case if the expression is like (m => Person.Name) where Name is a static field
+                    // or property on the Person type.
+                    containerType = memberExpression.Expression?.Type;
+
+                    legalExpression = true;
+                    break;
+
+                case ExpressionType.Parameter:
+                    // Parameter expression means "model => model", so we delegate to FromModel
+                    return FromModel(viewData, metadataProvider);
+            }
+
+            if (!legalExpression)
+            {
+                throw new InvalidOperationException(Resources.TemplateHelpers_TemplateLimitations);
+            }
+
+            Func<object, object> modelAccessor = (container) =>
+            {
+                try
+                {
+                    return CachedExpressionCompiler.Process(expression)((TModel)container);
+                }
+                catch (NullReferenceException)
+                {
+                    return null;
+                }
+            };
+
+            ModelMetadata metadata = null;
+            if (containerType != null && propertyName != null)
+            {
+                // Ex:
+                //    m => m.Color (simple property access)
+                //    m => m.Color.Red (nested property access)
+                //    m => m.Widgets[0].Size (expression ending with property-access)
+                metadata = metadataProvider.GetMetadataForType(containerType).Properties[propertyName];
+            }
+            
+            if (metadata == null)
+            {
+                // Ex:
+                //    m => 5 (arbitrary expression)
+                //    m => foo (arbitrary expression)
+                //    m => m.Widgets[0] (expression ending with non-property-access)
+                //
+                // This can also happen for any case where we cannot retrieve a model metadata.
+                // This will happen for:
+                // - fields
+                // - statics
+                // - non-visibility (internal/private)
+                metadata = metadataProvider.GetMetadataForType(typeof(TResult));
+                Debug.Assert(metadata != null);
+            }
+
+            return viewData.ModelExplorer.GetExplorerForExpression(metadata, modelAccessor);
+        }
+
+        /// <summary>
+        /// Gets <see cref="ModelExplorer"/> for named <paramref name="expression"/> in given
+        /// <paramref name="viewData"/>.
+        /// </summary>
+        /// <param name="expression">Expression name, relative to <c>viewData.Model</c>.</param>
+        /// <param name="viewData">
+        /// The <see cref="ViewDataDictionary"/> that may contain the <paramref name="expression"/> value.
+        /// </param>
+        /// <param name="metadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
+        /// <returns>
+        /// <see cref="ModelExplorer"/> for named <paramref name="expression"/> in given <paramref name="viewData"/>.
+        /// </returns>
+        public static ModelExplorer FromStringExpression(
+            string expression,
+            ViewDataDictionary viewData,
+            IModelMetadataProvider metadataProvider)
+        {
+            if (viewData == null)
+            {
+                throw new ArgumentNullException(nameof(viewData));
+            }
+
+            var viewDataInfo = ViewDataEvaluator.Eval(viewData, expression);
+            if (viewDataInfo == null)
+            {
+                // Try getting a property from ModelMetadata if we couldn't find an answer in ViewData
+                var propertyExplorer = viewData.ModelExplorer.GetExplorerForProperty(expression);
+                if (propertyExplorer != null)
+                {
+                    return propertyExplorer;
+                }
+            }
+
+            if (viewDataInfo != null)
+            {
+                if (viewDataInfo.Container == viewData &&
+                    viewDataInfo.Value == viewData.Model &&
+                    string.IsNullOrEmpty(expression))
+                {
+                    // Nothing for empty expression in ViewData and ViewDataEvaluator just returned the model. Handle
+                    // using FromModel() for its object special case.
+                    return FromModel(viewData, metadataProvider);
+                }
+
+                ModelExplorer containerExplorer = viewData.ModelExplorer;
+                if (viewDataInfo.Container != null)
+                {
+                    containerExplorer = metadataProvider.GetModelExplorerForType(
+                        viewDataInfo.Container.GetType(),
+                        viewDataInfo.Container);
+                }
+
+                if (viewDataInfo.PropertyInfo != null)
+                {
+                    // We've identified a property access, which provides us with accurate metadata.
+                    var containerMetadata = metadataProvider.GetMetadataForType(viewDataInfo.Container.GetType());
+                    var propertyMetadata = containerMetadata.Properties[viewDataInfo.PropertyInfo.Name];
+
+                    Func<object, object> modelAccessor = (ignore) => viewDataInfo.Value;
+                    return containerExplorer.GetExplorerForExpression(propertyMetadata, modelAccessor);
+                }
+                else if (viewDataInfo.Value != null)
+                {
+                    // We have a value, even though we may not know where it came from.
+                    var valueMetadata = metadataProvider.GetMetadataForType(viewDataInfo.Value.GetType());
+                    return containerExplorer.GetExplorerForExpression(valueMetadata, viewDataInfo.Value);
+                }
+            }
+
+            // Treat the expression as string if we don't find anything better.
+            var stringMetadata = metadataProvider.GetMetadataForType(typeof(string));
+            return viewData.ModelExplorer.GetExplorerForExpression(stringMetadata, modelAccessor: null);
+        }
+
+        private static ModelExplorer FromModel(
+            ViewDataDictionary viewData,
+            IModelMetadataProvider metadataProvider)
+        {
+            if (viewData == null)
+            {
+                throw new ArgumentNullException(nameof(viewData));
+            }
+
+            if (viewData.ModelMetadata.ModelType == typeof(object))
+            {
+                // Use common simple type rather than object so e.g. Editor() at least generates a TextBox.
+                var model = viewData.Model == null ? null : Convert.ToString(viewData.Model, CultureInfo.CurrentCulture);
+                return metadataProvider.GetModelExplorerForType(typeof(string), model);
+            }
+            else
+            {
+                return viewData.ModelExplorer;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionTextCache.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionTextCache.cs
new file mode 100644
index 0000000000..cc774bebfc
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionTextCache.cs
@@ -0,0 +1,124 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    /// <summary>
+    /// This class holds the cache for the expression text that is computed by ExpressionHelper.
+    /// </summary>
+    public class ExpressionTextCache
+    {
+        /// <inheritdoc />
+        public ConcurrentDictionary<LambdaExpression, string> Entries { get; } =
+            new ConcurrentDictionary<LambdaExpression, string>(LambdaExpressionComparer.Instance);
+
+        // This comparer is tightly coupled with the logic of ExpressionHelper.GetExpressionText.
+        // It is not designed to accurately compare any two arbitrary LambdaExpressions.
+        private class LambdaExpressionComparer : IEqualityComparer<LambdaExpression>
+        {
+            public static readonly LambdaExpressionComparer Instance = new LambdaExpressionComparer();
+
+            public bool Equals(LambdaExpression lambdaExpression1, LambdaExpression lambdaExpression2)
+            {
+                if (ReferenceEquals(lambdaExpression1,lambdaExpression2))
+                {
+                    return true;
+                }
+                // We will cache only pure member access expressions. Hence we compare two expressions
+                // to be equal only if they are identical member access expressions.
+                var expression1 = lambdaExpression1.Body;
+                var expression2 = lambdaExpression2.Body;
+
+                while (true)
+                {
+                    if (expression1 == null && expression2 == null)
+                    {
+                        return true;
+                    }
+
+                    if (expression1 == null || expression2 == null)
+                    {
+                        return false;
+                    }
+
+                    if (expression1.NodeType != expression2.NodeType)
+                    {
+                        return false;
+                    }
+
+                    switch (expression1.NodeType)
+                    {
+                        case ExpressionType.MemberAccess:
+                            var memberExpression1 = (MemberExpression)expression1;
+                            var memberName1 = memberExpression1.Member.Name;
+                            expression1 = memberExpression1.Expression;
+
+                            var memberExpression2 = (MemberExpression)expression2;
+                            var memberName2 = memberExpression2.Member.Name;
+                            expression2 = memberExpression2.Expression;
+
+                            // If identifier contains "__", it is "reserved for use by the implementation" and likely
+                            // compiler- or Razor-generated e.g. the name of a field in a delegate's generated class.
+                            if (memberName1.Contains("__") && memberName2.Contains("__"))
+                            {
+                                return true;
+                            }
+
+                            if (!string.Equals(memberName1, memberName2, StringComparison.Ordinal))
+                            {
+                                return false;
+                            }
+                            break;
+
+                        case ExpressionType.ArrayIndex:
+                            // Shouldn't be cached. Just in case, ensure indexers are all different.
+                            return false;
+
+                        case ExpressionType.Call:
+                            // Shouldn't be cached. Just in case, ensure indexers and other calls are all different.
+                            return false;
+
+                        default:
+                            // Everything else terminates name generation. Haven't found a difference so far...
+                            return true;
+                    }
+                }
+            }
+
+            public int GetHashCode(LambdaExpression lambdaExpression)
+            {
+                var expression = lambdaExpression.Body;
+                var hashCodeCombiner = HashCodeCombiner.Start();
+
+                while (true)
+                {
+                    if (expression != null && expression.NodeType == ExpressionType.MemberAccess)
+                    {
+                        var memberExpression = (MemberExpression)expression;
+                        var memberName = memberExpression.Member.Name;
+
+                        if (memberName.Contains("__"))
+                        {
+                            break;
+                        }
+
+                        hashCodeCombiner.Add(memberName, StringComparer.Ordinal);
+                        expression = memberExpression.Expression;
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+
+                return hashCodeCombiner.CombinedHash;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/FormatWeekHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/FormatWeekHelper.cs
new file mode 100644
index 0000000000..56e8329a69
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/FormatWeekHelper.cs
@@ -0,0 +1,56 @@
+// 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.
+
+using System;
+using System.Globalization;
+using System.Threading;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class FormatWeekHelper
+    {
+        public static string GetFormattedWeek(ModelExplorer modelExplorer)
+        {
+            var value = modelExplorer.Model;
+            var metadata = modelExplorer.Metadata;
+
+            if (value is DateTimeOffset dateTimeOffset)
+            {
+                value = dateTimeOffset.DateTime;
+            }
+
+            if (value is DateTime date)
+            {
+                var calendar = Thread.CurrentThread.CurrentCulture.Calendar;
+                var day = calendar.GetDayOfWeek(date);
+
+                // Get the week number consistent with ISO 8601. See blog post:
+                // https://blogs.msdn.microsoft.com/shawnste/2006/01/24/iso-8601-week-of-year-format-in-microsoft-net/
+                if (day >= DayOfWeek.Monday && day <= DayOfWeek.Wednesday)
+                {
+                    date = date.AddDays(3);
+                }
+
+                var week = calendar.GetWeekOfYear(date, CalendarWeekRule.FirstFourDayWeek, DayOfWeek.Monday);
+                var year = calendar.GetYear(date);
+                var month = calendar.GetMonth(date);
+
+                // Last week (either 52 or 53) includes January dates (1st, 2nd, 3rd) 
+                if (week >= 52 && month == 1)
+                {
+                    year--;
+                }
+
+                // First week includes December dates (29th, 30th, 31st)
+                if (week == 1 && month == 12)
+                {
+                    year++;
+                }
+
+                return $"{year:0000}-W{week:00}";
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/HtmlAttributePropertyHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/HtmlAttributePropertyHelper.cs
new file mode 100644
index 0000000000..3b0db8ee6e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/HtmlAttributePropertyHelper.cs
@@ -0,0 +1,41 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.Reflection;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    internal class HtmlAttributePropertyHelper : PropertyHelper
+    {
+        private static readonly ConcurrentDictionary<Type, PropertyHelper[]> ReflectionCache =
+            new ConcurrentDictionary<Type, PropertyHelper[]>();
+
+        public static new PropertyHelper[] GetProperties(Type type)
+        {
+            return GetProperties(type, CreateInstance, ReflectionCache);
+        }
+
+        private static PropertyHelper CreateInstance(PropertyInfo property)
+        {
+            return new HtmlAttributePropertyHelper(property);
+        }
+
+        public HtmlAttributePropertyHelper(PropertyInfo property)
+            : base(property)
+        {
+        }
+
+        public override string Name
+        {
+            get => base.Name;
+
+            protected set
+            {
+                base.Name = value == null ? null : value.Replace('_', '-');
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ICharBufferSource.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ICharBufferSource.cs
new file mode 100644
index 0000000000..99e23c1997
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ICharBufferSource.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public interface ICharBufferSource
+    {
+        char[] Rent(int bufferSize);
+
+        void Return(char[] buffer);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ISaveTempDataCallback.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ISaveTempDataCallback.cs
new file mode 100644
index 0000000000..6f3aa16493
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ISaveTempDataCallback.cs
@@ -0,0 +1,12 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public interface ISaveTempDataCallback : IFilterMetadata
+    {
+        void OnTempDataSaving(ITempDataDictionary tempData);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/IViewBufferScope.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/IViewBufferScope.cs
new file mode 100644
index 0000000000..2b6f7ee37d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/IViewBufferScope.cs
@@ -0,0 +1,34 @@
+// 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.
+
+using System.IO;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    /// <summary>
+    /// Creates and manages the lifetime of <see cref="T:ViewBufferValue[]"/> instances.
+    /// </summary>
+    public interface IViewBufferScope
+    {
+        /// <summary>
+        /// Gets a <see cref="T:ViewBufferValue[]"/>.
+        /// </summary>
+        /// <param name="pageSize">The minimum size of the segment.</param>
+        /// <returns>The <see cref="T:ViewBufferValue[]"/>.</returns>
+        ViewBufferValue[] GetPage(int pageSize);
+
+        /// <summary>
+        /// Returns a <see cref="T:ViewBufferValue[]"/> that can be reused.
+        /// </summary>
+        /// <param name="segment">The <see cref="T:ViewBufferValue[]"/>.</param>
+        void ReturnSegment(ViewBufferValue[] segment);
+
+        /// <summary>
+        /// Creates a <see cref="PagedBufferedTextWriter"/> that will delegate to the provided
+        /// <paramref name="writer"/>.
+        /// </summary>
+        /// <param name="writer">The <see cref="TextWriter"/>.</param>
+        /// <returns>A <see cref="PagedBufferedTextWriter"/>.</returns>
+        PagedBufferedTextWriter CreateWriter(TextWriter writer);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/IViewDataValuesProviderFeature.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/IViewDataValuesProviderFeature.cs
new file mode 100644
index 0000000000..50648d6ecf
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/IViewDataValuesProviderFeature.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public interface IViewDataValuesProviderFeature
+    {
+        void ProvideViewDataValues(ViewDataDictionary viewData);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/LifecycleProperty.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/LifecycleProperty.cs
new file mode 100644
index 0000000000..5eaf6e1491
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/LifecycleProperty.cs
@@ -0,0 +1,39 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Reflection;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    [DebuggerDisplay("{PropertyInfo, nq}")]
+    public readonly struct LifecycleProperty
+    {
+        private readonly PropertyHelper _propertyHelper;
+        private readonly bool _isReferenceTypeOrNullable;
+
+        public LifecycleProperty(PropertyInfo propertyInfo, string key)
+        {
+            Key = key;
+            _propertyHelper = new PropertyHelper(propertyInfo);
+            var propertyType = propertyInfo.PropertyType;
+            _isReferenceTypeOrNullable = !propertyType.IsValueType || Nullable.GetUnderlyingType(propertyType) != null;
+        }
+
+        public string Key { get; }
+
+        public PropertyInfo PropertyInfo => _propertyHelper.Property;
+
+        public object GetValue(object instance) => _propertyHelper.GetValue(instance);
+
+        public void SetValue(object instance, object value)
+        {
+            if (value != null || _isReferenceTypeOrNullable)
+            {
+                _propertyHelper.SetValue(instance, value);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MemoryPoolViewBufferScope.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MemoryPoolViewBufferScope.cs
new file mode 100644
index 0000000000..9b72316f02
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MemoryPoolViewBufferScope.cs
@@ -0,0 +1,130 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.IO;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    /// <summary>
+    /// A <see cref="IViewBufferScope"/> that uses pooled memory.
+    /// </summary>
+    public class MemoryPoolViewBufferScope : IViewBufferScope, IDisposable
+    {
+        public static readonly int MinimumSize = 16;
+        private readonly ArrayPool<ViewBufferValue> _viewBufferPool;
+        private readonly ArrayPool<char> _charPool;
+        private List<ViewBufferValue[]> _available;
+        private List<ViewBufferValue[]> _leased;
+        private bool _disposed;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="MemoryPoolViewBufferScope"/>.
+        /// </summary>
+        /// <param name="viewBufferPool">
+        /// The <see cref="ArrayPool{ViewBufferValue}"/> for creating <see cref="ViewBufferValue"/> instances.
+        /// </param>
+        /// <param name="charPool">
+        /// The <see cref="ArrayPool{Char}"/> for creating <see cref="PagedBufferedTextWriter"/> instances.
+        /// </param>
+        public MemoryPoolViewBufferScope(ArrayPool<ViewBufferValue> viewBufferPool, ArrayPool<char> charPool)
+        {
+            _viewBufferPool = viewBufferPool;
+            _charPool = charPool;
+        }
+
+        /// <inheritdoc />
+        public ViewBufferValue[] GetPage(int pageSize)
+        {
+            if (pageSize <= 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(pageSize));
+            }
+
+            if (_disposed)
+            {
+                throw new ObjectDisposedException(typeof(MemoryPoolViewBufferScope).FullName);
+            }
+
+            if (_leased == null)
+            {
+                _leased = new List<ViewBufferValue[]>(1);
+            }
+
+            ViewBufferValue[] segment = null;
+
+            // Reuse pages that have been returned before going back to the memory pool.
+            if (_available != null && _available.Count > 0)
+            {
+                segment = _available[_available.Count - 1];
+                _available.RemoveAt(_available.Count - 1);
+                return segment;
+            }
+
+            try
+            {
+                segment = _viewBufferPool.Rent(Math.Max(pageSize, MinimumSize));
+                _leased.Add(segment);
+            }
+            catch when (segment != null)
+            {
+                _viewBufferPool.Return(segment);
+                throw;
+            }
+
+            return segment;
+        }
+
+        /// <inheritdoc />
+        public void ReturnSegment(ViewBufferValue[] segment)
+        {
+            if (segment == null)
+            {
+                throw new ArgumentNullException(nameof(segment));
+            }
+
+            Array.Clear(segment, 0, segment.Length);
+
+            if (_available == null)
+            {
+                _available = new List<ViewBufferValue[]>();
+            }
+
+            _available.Add(segment);
+        }
+
+        /// <inheritdoc />
+        public PagedBufferedTextWriter CreateWriter(TextWriter writer)
+        {
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
+            return new PagedBufferedTextWriter(_charPool, writer);
+        }
+
+        /// <inheritdoc />
+        public void Dispose()
+        {
+            if (!_disposed)
+            {
+                _disposed = true;
+
+                if (_leased == null)
+                {
+                    return;
+                }
+
+                for (var i = 0; i < _leased.Count; i++)
+                {
+                    _viewBufferPool.Return(_leased[i], clearArray: true);
+                }
+
+                _leased.Clear();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewFeaturesDiagnosticSourceExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewFeaturesDiagnosticSourceExtensions.cs
new file mode 100644
index 0000000000..305b16a87d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewFeaturesDiagnosticSourceExtensions.cs
@@ -0,0 +1,160 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    internal static class MvcViewFeaturesDiagnosticSourceExtensions
+    {
+        public static void BeforeViewComponent(
+            this DiagnosticSource diagnosticSource,
+            ViewComponentContext context,
+            object viewComponent)
+        {
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeViewComponent"))
+            {
+                diagnosticSource.Write(
+                "Microsoft.AspNetCore.Mvc.BeforeViewComponent",
+                new
+                {
+                    actionDescriptor = context.ViewContext.ActionDescriptor,
+                    viewComponentContext = context,
+                    viewComponent = viewComponent
+                });
+            }
+        }
+
+        public static void AfterViewComponent(
+            this DiagnosticSource diagnosticSource,
+            ViewComponentContext context,
+            IViewComponentResult result,
+            object viewComponent)
+        {
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterViewComponent"))
+            {
+                diagnosticSource.Write(
+                "Microsoft.AspNetCore.Mvc.AfterViewComponent",
+                new
+                {
+                    actionDescriptor = context.ViewContext.ActionDescriptor,
+                    viewComponentContext = context,
+                    viewComponentResult = result,
+                    viewComponent = viewComponent
+                });
+            }
+        }
+
+        public static void ViewComponentBeforeViewExecute(
+            this DiagnosticSource diagnosticSource,
+            ViewComponentContext context,
+            IView view)
+        {
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.ViewComponentBeforeViewExecute"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.ViewComponentBeforeViewExecute",
+                    new
+                    {
+                        actionDescriptor = context.ViewContext.ActionDescriptor,
+                        viewComponentContext = context,
+                        view = view
+                    });
+            }
+        }
+
+        public static void ViewComponentAfterViewExecute(
+            this DiagnosticSource diagnosticSource,
+            ViewComponentContext context,
+            IView view)
+        {
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.ViewComponentAfterViewExecute"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.ViewComponentAfterViewExecute",
+                    new
+                    {
+                        actionDescriptor = context.ViewContext.ActionDescriptor,
+                        viewComponentContext = context,
+                        view = view
+                    });
+            }
+        }
+
+        public static void BeforeView(
+            this DiagnosticSource diagnosticSource,
+            IView view,
+            ViewContext viewContext)
+        {
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.BeforeView"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.BeforeView",
+                    new { view = view, viewContext = viewContext, });
+            }
+        }
+
+        public static void AfterView(
+            this DiagnosticSource diagnosticSource,
+            IView view,
+            ViewContext viewContext)
+        {
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.AfterView"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.AfterView",
+                    new { view = view, viewContext = viewContext, });
+            }
+        }
+
+        public static void ViewFound(
+            this DiagnosticSource diagnosticSource,
+            ActionContext actionContext,
+            bool isMainPage,
+            PartialViewResult viewResult,
+            string viewName,
+            IView view)
+        {
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.ViewFound"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.ViewFound",
+                    new
+                    {
+                        actionContext = actionContext,
+                        isMainPage = isMainPage,
+                        result = viewResult,
+                        viewName = viewName,
+                        view = view,
+                    });
+            }
+        }
+
+        public static void ViewNotFound(
+            this DiagnosticSource diagnosticSource,
+            ActionContext actionContext,
+            bool isMainPage,
+            PartialViewResult viewResult,
+            string viewName,
+            IEnumerable<string> searchedLocations)
+        {
+            if (diagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.ViewNotFound"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNetCore.Mvc.ViewNotFound",
+                    new
+                    {
+                        actionContext = actionContext,
+                        isMainPage = isMainPage,
+                        result = viewResult,
+                        viewName = viewName,
+                        searchedLocations = searchedLocations,
+                    });
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewFeaturesLoggerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewFeaturesLoggerExtensions.cs
new file mode 100644
index 0000000000..7f77416b12
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewFeaturesLoggerExtensions.cs
@@ -0,0 +1,304 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    internal static class MvcViewFeaturesLoggerExtensions
+    {
+        private static readonly double TimestampToTicks = TimeSpan.TicksPerSecond / (double)Stopwatch.Frequency;
+
+        private static readonly Action<ILogger, string, string[], Exception> _viewComponentExecuting;
+        private static readonly Action<ILogger, string, double, string, Exception> _viewComponentExecuted;
+
+        private static readonly Action<ILogger, string, double, Exception> _partialViewFound;
+        private static readonly Action<ILogger, string, IEnumerable<string>, Exception> _partialViewNotFound;
+        private static readonly Action<ILogger, string, Exception> _partialViewResultExecuting;
+        private static readonly Action<ILogger, string, double, Exception> _partialViewResultExecuted;
+
+        private static readonly Action<ILogger, string, Exception> _antiforgeryTokenInvalid;
+
+        private static readonly Action<ILogger, string, Exception> _viewComponentResultExecuting;
+
+        private static readonly Action<ILogger, string, Exception> _viewResultExecuting;
+        private static readonly Action<ILogger, string, double, Exception> _viewResultExecuted;
+        private static readonly Action<ILogger, string, double, Exception> _viewFound;
+        private static readonly Action<ILogger, string, IEnumerable<string>, Exception> _viewNotFound;
+
+        private static readonly Action<ILogger, string, Exception> _tempDataCookieNotFound;
+        private static readonly Action<ILogger, string, Exception> _tempDataCookieLoadSuccess;
+        private static readonly Action<ILogger, string, Exception> _tempDataCookieLoadFailure;
+
+        private static readonly Action<ILogger, Type, Exception> _notMostEffectiveFilter;
+
+        static MvcViewFeaturesLoggerExtensions()
+        {
+            _viewComponentExecuting = LoggerMessage.Define<string, string[]>(
+                LogLevel.Debug,
+                1,
+                "Executing view component {ViewComponentName} with arguments ({Arguments}).");
+
+            _viewComponentExecuted = LoggerMessage.Define<string, double, string>(
+                LogLevel.Debug,
+                2,
+                "Executed view component {ViewComponentName} in {ElapsedMilliseconds}ms and returned " +
+                "{ViewComponentResult}");
+
+            _partialViewResultExecuting = LoggerMessage.Define<string>(
+                LogLevel.Information,
+                1,
+                "Executing PartialViewResult, running view {PartialViewName}.");
+
+            _partialViewFound = LoggerMessage.Define<string, double>(
+                LogLevel.Debug,
+                2,
+                "The partial view path '{PartialViewFilePath}' was found in {ElapsedMilliseconds}ms.");
+
+            _partialViewNotFound = LoggerMessage.Define<string, IEnumerable<string>>(
+                LogLevel.Error,
+                3,
+                "The partial view '{PartialViewName}' was not found. Searched locations: {SearchedViewLocations}");
+
+            _partialViewResultExecuted = LoggerMessage.Define<string, double>(
+                LogLevel.Information,
+                4,
+                "Executed PartialViewResult - view {PartialViewName} executed in {ElapsedMilliseconds}ms.");
+
+            _antiforgeryTokenInvalid = LoggerMessage.Define<string>(
+                LogLevel.Information,
+                1,
+                "Antiforgery token validation failed. {Message}");
+
+            _viewComponentResultExecuting = LoggerMessage.Define<string>(
+                LogLevel.Information,
+                1,
+                "Executing ViewComponentResult, running {ViewComponentName}.");
+
+            _viewResultExecuting = LoggerMessage.Define<string>(
+                LogLevel.Information,
+                1,
+                "Executing ViewResult, running view {ViewName}.");
+
+            _viewFound = LoggerMessage.Define<string, double>(
+                LogLevel.Debug,
+                2,
+                "The view path '{ViewFilePath}' was found in {ElapsedMilliseconds}ms.");
+
+            _viewNotFound = LoggerMessage.Define<string, IEnumerable<string>>(
+                LogLevel.Error,
+                3,
+                "The view '{ViewName}' was not found. Searched locations: {SearchedViewLocations}");
+
+            _viewResultExecuted = LoggerMessage.Define<string, double>(
+                LogLevel.Information,
+                4,
+                "Executed ViewResult - view {ViewName} executed in {ElapsedMilliseconds}ms.");
+
+            _tempDataCookieNotFound = LoggerMessage.Define<string>(
+                LogLevel.Debug,
+                1,
+                "The temp data cookie {CookieName} was not found.");
+
+            _tempDataCookieLoadSuccess = LoggerMessage.Define<string>(
+                LogLevel.Debug,
+                2,
+                "The temp data cookie {CookieName} was used to successfully load temp data.");
+
+            _tempDataCookieLoadFailure = LoggerMessage.Define<string>(
+                LogLevel.Warning,
+                3,
+                "The temp data cookie {CookieName} could not be loaded.");
+
+            _notMostEffectiveFilter = LoggerMessage.Define<Type>(
+                LogLevel.Trace,
+                1,
+                "Skipping the execution of current filter as its not the most effective filter implementing the policy {FilterPolicy}.");
+        }
+
+        public static IDisposable ViewComponentScope(this ILogger logger, ViewComponentContext context)
+        {
+            return logger.BeginScope(new ViewComponentLogScope(context.ViewComponentDescriptor));
+        }
+
+        public static void ViewComponentExecuting(
+            this ILogger logger,
+            ViewComponentContext context,
+            object[] arguments)
+        {
+            var formattedArguments = GetFormattedArguments(arguments);
+            _viewComponentExecuting(logger, context.ViewComponentDescriptor.DisplayName, formattedArguments, null);
+        }
+
+        private static string[] GetFormattedArguments(object[] arguments)
+        {
+            if (arguments == null || arguments.Length == 0)
+            {
+                return Array.Empty<string>();
+            }
+
+            var formattedArguments = new string[arguments.Length];
+            for (var i = 0; i < formattedArguments.Length; i++)
+            {
+                formattedArguments[i] = Convert.ToString(arguments[i]);
+            }
+
+            return formattedArguments;
+        }
+
+        public static void ViewComponentExecuted(
+            this ILogger logger,
+            ViewComponentContext context,
+            TimeSpan timespan,
+            object result)
+        {
+            // Don't log if logging wasn't enabled at start of request as time will be wildly wrong.
+            _viewComponentExecuted(
+                logger,
+                context.ViewComponentDescriptor.DisplayName,
+                timespan.TotalMilliseconds,
+                Convert.ToString(result),
+                null);
+        }
+
+        public static void PartialViewFound(
+            this ILogger logger,
+            IView view,
+            TimeSpan timespan)
+        {
+            _partialViewFound(logger, view.Path, timespan.TotalMilliseconds, null);
+        }
+
+        public static void PartialViewNotFound(
+            this ILogger logger,
+            string partialViewName,
+            IEnumerable<string> searchedLocations)
+        {
+            _partialViewNotFound(logger, partialViewName, searchedLocations, null);
+        }
+
+        public static void PartialViewResultExecuting(this ILogger logger, string partialViewName)
+        {
+            _partialViewResultExecuting(logger, partialViewName, null);
+        }
+
+        public static void PartialViewResultExecuted(this ILogger logger, string partialViewName, TimeSpan timespan)
+        {
+            _partialViewResultExecuted(logger, partialViewName, timespan.TotalMilliseconds, null);
+        }
+
+        public static void AntiforgeryTokenInvalid(this ILogger logger, string message, Exception exception)
+        {
+            _antiforgeryTokenInvalid(logger, message, exception);
+        }
+
+        public static void ViewComponentResultExecuting(this ILogger logger, string viewComponentName)
+        {
+            if (logger.IsEnabled(LogLevel.Information))
+            {
+                _viewComponentResultExecuting(logger, viewComponentName, null);
+            }
+        }
+
+        public static void ViewComponentResultExecuting(this ILogger logger, Type viewComponentType)
+        {
+            if (logger.IsEnabled(LogLevel.Information))
+            {
+                _viewComponentResultExecuting(logger, viewComponentType.Name, null);
+            }
+        }
+
+        public static void ViewResultExecuting(this ILogger logger, string viewName)
+        {
+            _viewResultExecuting(logger, viewName, null);
+        }
+
+        public static void ViewResultExecuted(this ILogger logger, string viewName, TimeSpan timespan)
+        {
+            _viewResultExecuted(logger, viewName, timespan.TotalMilliseconds, null);
+        }
+
+        public static void ViewFound(this ILogger logger, IView view, TimeSpan timespan)
+        {
+            _viewFound(logger, view.Path, timespan.TotalMilliseconds, null);
+        }
+
+        public static void ViewNotFound(this ILogger logger, string viewName,
+            IEnumerable<string> searchedLocations)
+        {
+            _viewNotFound(logger, viewName, searchedLocations, null);
+        }
+
+        public static void TempDataCookieNotFound(this ILogger logger, string cookieName)
+        {
+            _tempDataCookieNotFound(logger, cookieName, null);
+        }
+
+        public static void TempDataCookieLoadSuccess(this ILogger logger, string cookieName)
+        {
+            _tempDataCookieLoadSuccess(logger, cookieName, null);
+        }
+
+        public static void TempDataCookieLoadFailure(this ILogger logger, string cookieName, Exception exception)
+        {
+            _tempDataCookieLoadFailure(logger, cookieName, exception);
+        }
+
+        public static void NotMostEffectiveFilter(this ILogger logger, Type policyType)
+        {
+            _notMostEffectiveFilter(logger, policyType, null);
+        }
+
+        private class ViewComponentLogScope : IReadOnlyList<KeyValuePair<string, object>>
+        {
+            private readonly ViewComponentDescriptor _descriptor;
+
+            public ViewComponentLogScope(ViewComponentDescriptor descriptor)
+            {
+                _descriptor = descriptor;
+            }
+
+            public KeyValuePair<string, object> this[int index]
+            {
+                get
+                {
+                    if (index == 0)
+                    {
+                        return new KeyValuePair<string, object>("ViewComponentName", _descriptor.DisplayName);
+                    }
+                    else if (index == 1)
+                    {
+                        return new KeyValuePair<string, object>("ViewComponentId", _descriptor.Id);
+                    }
+                    throw new IndexOutOfRangeException(nameof(index));
+                }
+            }
+
+            public int Count => 2;
+
+            public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
+            {
+                for (var i = 0; i < Count; ++i)
+                {
+                    yield return this[i];
+                }
+            }
+
+            public override string ToString()
+            {
+                return _descriptor.DisplayName;
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                return GetEnumerator();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewOptionsSetup.cs
new file mode 100644
index 0000000000..5e59f56345
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewOptionsSetup.cs
@@ -0,0 +1,64 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    /// <summary>
+    /// Sets up default options for <see cref="MvcViewOptions"/>.
+    /// </summary>
+    public class MvcViewOptionsSetup : IConfigureOptions<MvcViewOptions>
+    {
+        private readonly IOptions<MvcDataAnnotationsLocalizationOptions> _dataAnnotationsLocalizationOptions;
+        private readonly IValidationAttributeAdapterProvider _validationAttributeAdapterProvider;
+        private readonly IStringLocalizerFactory _stringLocalizerFactory;
+
+        public MvcViewOptionsSetup(
+            IOptions<MvcDataAnnotationsLocalizationOptions> dataAnnotationLocalizationOptions,
+            IValidationAttributeAdapterProvider validationAttributeAdapterProvider)
+        {
+            if (dataAnnotationLocalizationOptions == null)
+            {
+                throw new ArgumentNullException(nameof(dataAnnotationLocalizationOptions));
+            }
+
+            if (validationAttributeAdapterProvider == null)
+            {
+                throw new ArgumentNullException(nameof(validationAttributeAdapterProvider));
+            }
+
+            _dataAnnotationsLocalizationOptions = dataAnnotationLocalizationOptions;
+            _validationAttributeAdapterProvider = validationAttributeAdapterProvider;
+        }
+
+        public MvcViewOptionsSetup(
+            IOptions<MvcDataAnnotationsLocalizationOptions> dataAnnotationOptions,
+            IValidationAttributeAdapterProvider validationAttributeAdapterProvider,
+            IStringLocalizerFactory stringLocalizerFactory)
+            : this(dataAnnotationOptions, validationAttributeAdapterProvider)
+        {
+            if (stringLocalizerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(stringLocalizerFactory));
+            }
+
+            _stringLocalizerFactory = stringLocalizerFactory;
+        }
+
+        public void Configure(MvcViewOptions options)
+        {
+            // Set up client validators
+            options.ClientModelValidatorProviders.Add(new DefaultClientModelValidatorProvider());
+            options.ClientModelValidatorProviders.Add(new DataAnnotationsClientModelValidatorProvider(
+                _validationAttributeAdapterProvider,
+                _dataAnnotationsLocalizationOptions,
+                _stringLocalizerFactory));
+            options.ClientModelValidatorProviders.Add(new NumericClientModelValidatorProvider());
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/NameAndIdProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/NameAndIdProvider.cs
new file mode 100644
index 0000000000..83f9e518e9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/NameAndIdProvider.cs
@@ -0,0 +1,214 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    /// <summary>
+    /// Provides cached values for "name" and "id" HTML attributes.
+    /// </summary>
+    public static class NameAndIdProvider
+    {
+        private static readonly object PreviousNameAndIdKey = typeof(PreviousNameAndId);
+
+        /// <summary>
+        /// Returns a valid HTML 4.01 "id" attribute value for an element with the given <paramref name="fullName"/>.
+        /// </summary>
+        /// <param name="viewContext">A <see cref="ViewContext"/> instance for the current scope.</param>
+        /// <param name="fullName">
+        /// The fully-qualified expression name, ignoring the current model. Also the original HTML element name.
+        /// </param>
+        /// <param name="invalidCharReplacement">
+        /// The <see cref="string"/> (normally a single <see cref="char"/>) to substitute for invalid characters in
+        /// <paramref name="fullName"/>.
+        /// </param>
+        /// <returns>
+        /// Valid HTML 4.01 "id" attribute value for an element with the given <paramref name="fullName"/>.
+        /// </returns>
+        /// <remarks>
+        /// Similar to <see cref="TagBuilder.CreateSanitizedId"/> but caches value for repeated invocations.
+        /// </remarks>
+        public static string CreateSanitizedId(ViewContext viewContext, string fullName, string invalidCharReplacement)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            if (invalidCharReplacement == null)
+            {
+                throw new ArgumentNullException(nameof(invalidCharReplacement));
+            }
+
+            if (string.IsNullOrEmpty(fullName))
+            {
+                return string.Empty;
+            }
+
+            // Check cache to avoid whatever TagBuilder.CreateSanitizedId() may do.
+            var items = viewContext.HttpContext.Items;
+            object previousNameAndIdObject;
+            PreviousNameAndId previousNameAndId = null;
+            if (items.TryGetValue(PreviousNameAndIdKey, out previousNameAndIdObject) &&
+                (previousNameAndId = (PreviousNameAndId)previousNameAndIdObject) != null &&
+                string.Equals(previousNameAndId.FullName, fullName, StringComparison.Ordinal))
+            {
+                return previousNameAndId.SanitizedId;
+            }
+
+            var sanitizedId = TagBuilder.CreateSanitizedId(fullName, invalidCharReplacement);
+
+            if (previousNameAndId == null)
+            {
+                // Do not create a PreviousNameAndId when TagBuilder.CreateSanitizedId() only examined fullName.
+                if (string.Equals(fullName, sanitizedId, StringComparison.Ordinal))
+                {
+                    return sanitizedId;
+                }
+
+                previousNameAndId = new PreviousNameAndId();
+                items[PreviousNameAndIdKey] = previousNameAndId;
+            }
+
+            previousNameAndId.FullName = fullName;
+            previousNameAndId.SanitizedId = sanitizedId;
+
+            return previousNameAndId.SanitizedId;
+        }
+
+        /// <summary>
+        /// Adds a valid HTML 4.01 "id" attribute for an element with the given <paramref name="fullName"/>. Does
+        /// nothing if <see cref="TagBuilder.Attributes"/> already contains an "id" attribute or the
+        /// <paramref name="fullName"/> is <c>null</c> or empty.
+        /// </summary>
+        /// <param name="viewContext">A <see cref="ViewContext"/> instance for the current scope.</param>
+        /// <param name="tagBuilder">A <see cref="TagBuilder"/> instance that will contain the "id" attribute.</param>
+        /// <param name="fullName">
+        /// The fully-qualified expression name, ignoring the current model. Also the original HTML element name.
+        /// </param>
+        /// <param name="invalidCharReplacement">
+        /// The <see cref="string"/> (normally a single <see cref="char"/>) to substitute for invalid characters in
+        /// <paramref name="fullName"/>.
+        /// </param>
+        /// <remarks>
+        /// Similar to <see cref="TagBuilder.GenerateId"/> but caches value for repeated invocations.
+        /// </remarks>
+        /// <seealso cref="CreateSanitizedId"/>
+        public static void GenerateId(
+            ViewContext viewContext,
+            TagBuilder tagBuilder,
+            string fullName,
+            string invalidCharReplacement)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            if (tagBuilder == null)
+            {
+                throw new ArgumentNullException(nameof(tagBuilder));
+            }
+
+            if (invalidCharReplacement == null)
+            {
+                throw new ArgumentNullException(nameof(invalidCharReplacement));
+            }
+
+            if (string.IsNullOrEmpty(fullName))
+            {
+                return;
+            }
+
+            if (!tagBuilder.Attributes.ContainsKey("id"))
+            {
+                var sanitizedId = CreateSanitizedId(viewContext, fullName, invalidCharReplacement);
+
+                // Duplicate check for null or empty to cover the corner case where fullName contains only invalid
+                // characters and invalidCharReplacement is empty.
+                if (!string.IsNullOrEmpty(sanitizedId))
+                {
+                    tagBuilder.Attributes["id"] = sanitizedId;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns the full HTML element name for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="viewContext">A <see cref="ViewContext"/> instance for the current scope.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <returns>Fully-qualified expression name for <paramref name="expression"/>.</returns>
+        /// <remarks>
+        /// Similar to <see cref="TemplateInfo.GetFullHtmlFieldName"/> but caches value for repeated invocations.
+        /// </remarks>
+        public static string GetFullHtmlFieldName(ViewContext viewContext, string expression)
+        {
+            var htmlFieldPrefix = viewContext.ViewData.TemplateInfo.HtmlFieldPrefix;
+            if (string.IsNullOrEmpty(expression))
+            {
+                return htmlFieldPrefix;
+            }
+
+            if (string.IsNullOrEmpty(htmlFieldPrefix))
+            {
+                return expression;
+            }
+
+            // Need to concatenate. See if we've already done that.
+            var items = viewContext.HttpContext.Items;
+            object previousNameAndIdObject;
+            PreviousNameAndId previousNameAndId = null;
+            if (items.TryGetValue(PreviousNameAndIdKey, out previousNameAndIdObject) &&
+                (previousNameAndId = (PreviousNameAndId)previousNameAndIdObject) != null &&
+                string.Equals(previousNameAndId.HtmlFieldPrefix, htmlFieldPrefix, StringComparison.Ordinal) &&
+                string.Equals(previousNameAndId.Expression, expression, StringComparison.Ordinal))
+            {
+                return previousNameAndId.OutputFullName;
+            }
+
+            if (previousNameAndId == null)
+            {
+                previousNameAndId = new PreviousNameAndId();
+                items[PreviousNameAndIdKey] = previousNameAndId;
+            }
+
+            previousNameAndId.HtmlFieldPrefix = htmlFieldPrefix;
+            previousNameAndId.Expression = expression;
+            if (expression.StartsWith("[", StringComparison.Ordinal))
+            {
+                // The expression might represent an indexer access, in which case  with a 'dot' would be invalid.
+                previousNameAndId.OutputFullName = htmlFieldPrefix + expression;
+            }
+            else
+            {
+                previousNameAndId.OutputFullName = htmlFieldPrefix + "." + expression;
+            }
+
+            return previousNameAndId.OutputFullName;
+        }
+
+        private class PreviousNameAndId
+        {
+            // Cached ambient input for NameAndIdProvider.GetFullHtmlFieldName(). TemplateInfo.HtmlFieldPrefix may
+            // change during the lifetime of a ViewContext.
+            public string HtmlFieldPrefix { get; set; }
+
+            // Cached input for NameAndIdProvider.GetFullHtmlFieldName().
+            public string Expression { get; set; }
+
+            // Cached return value for NameAndIdProvider.GetFullHtmlFieldName().
+            public string OutputFullName { get; set; }
+
+            // Cached input for NameAndIdProvider.CreateSanitizedId(). Since IHtmlHelper.GenerateIdFromName() is
+            // available to all, there is no guarantee this is equal to OutputFullName when CreateSanitizedId() is
+            // called.
+            public string FullName { get; set; }
+
+            // Cached return value for NameAndIdProvider.CreateSanitizedId().
+            public string SanitizedId { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/NullView.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/NullView.cs
new file mode 100644
index 0000000000..6ce44ca33c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/NullView.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class NullView : IView
+    {
+        public static readonly NullView Instance = new NullView();
+
+        public string Path => string.Empty;
+
+        public Task RenderAsync(ViewContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/PagedBufferedTextWriter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/PagedBufferedTextWriter.cs
new file mode 100644
index 0000000000..5dce67153b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/PagedBufferedTextWriter.cs
@@ -0,0 +1,115 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class PagedBufferedTextWriter : TextWriter
+    {
+        private readonly TextWriter _inner;
+        private readonly PagedCharBuffer _charBuffer;
+
+        public PagedBufferedTextWriter(ArrayPool<char> pool, TextWriter inner)
+        {
+            _charBuffer = new PagedCharBuffer(new ArrayPoolBufferSource(pool));
+            _inner = inner;
+        }
+
+        public override Encoding Encoding => _inner.Encoding;
+
+        public override void Flush()
+        {
+            // Don't do anything. We'll call FlushAsync.
+        }
+
+        public override async Task FlushAsync()
+        {
+            var length = _charBuffer.Length;
+            if (length == 0)
+            {
+                return;
+            }
+
+            var pages = _charBuffer.Pages;
+            for (var i = 0; i < pages.Count; i++)
+            {
+                var page = pages[i];
+                var pageLength = Math.Min(length, page.Length);
+                if (pageLength != 0)
+                {
+                    await _inner.WriteAsync(page, index: 0, count: pageLength);
+                }
+
+                length -= pageLength;
+            }
+
+            Debug.Assert(length == 0);
+            _charBuffer.Clear();
+        }
+
+        public override void Write(char value)
+        {
+            _charBuffer.Append(value);
+        }
+
+        public override void Write(char[] buffer)
+        {
+            if (buffer == null)
+            {
+                return;
+            }
+
+            _charBuffer.Append(buffer, 0, buffer.Length);
+        }
+
+        public override void Write(char[] buffer, int index, int count)
+        {
+            if (buffer == null)
+            {
+                throw new ArgumentNullException(nameof(buffer));
+            }
+
+            _charBuffer.Append(buffer, index, count);
+        }
+
+        public override void Write(string value)
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            _charBuffer.Append(value);
+        }
+
+        public override async Task WriteAsync(char value)
+        {
+            await FlushAsync();
+            await _inner.WriteAsync(value);
+        }
+
+        public override async Task WriteAsync(char[] buffer, int index, int count)
+        {
+            await FlushAsync();
+            await _inner.WriteAsync(buffer, index, count);
+        }
+
+        public override async Task WriteAsync(string value)
+        {
+            await FlushAsync();
+            await _inner.WriteAsync(value);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+            _charBuffer.Dispose();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/PagedCharBuffer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/PagedCharBuffer.cs
new file mode 100644
index 0000000000..f086daf67b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/PagedCharBuffer.cs
@@ -0,0 +1,159 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class PagedCharBuffer : IDisposable
+    {
+        public const int PageSize = 1024;
+        private int _charIndex;
+
+        public PagedCharBuffer(ICharBufferSource bufferSource)
+        {
+            BufferSource = bufferSource;
+        }
+
+        public ICharBufferSource BufferSource { get; }
+
+        public IList<char[]> Pages { get; } = new List<char[]>();
+
+        public int Length
+        {
+            get
+            {
+                var length = _charIndex;
+                for (var i = 0; i < Pages.Count - 1; i++)
+                {
+                    length += Pages[i].Length;
+                }
+
+                return length;
+            }
+        }
+
+        private char[] CurrentPage { get; set; }
+
+        public void Append(char value)
+        {
+            var page = GetCurrentPage();
+            page[_charIndex++] = value;
+        }
+
+        public void Append(string value)
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            var index = 0;
+            var count = value.Length;
+
+            while (count > 0)
+            {
+                var page = GetCurrentPage();
+                var copyLength = Math.Min(count, page.Length - _charIndex);
+                Debug.Assert(copyLength > 0);
+
+                value.CopyTo(
+                    index,
+                    page,
+                    _charIndex,
+                    copyLength);
+
+                _charIndex += copyLength;
+                index += copyLength;
+
+                count -= copyLength;
+            }
+        }
+
+        public void Append(char[] buffer, int index, int count)
+        {
+            while (count > 0)
+            {
+                var page = GetCurrentPage();
+                var copyLength = Math.Min(count, page.Length - _charIndex);
+                Debug.Assert(copyLength > 0);
+
+                Array.Copy(
+                    buffer,
+                    index,
+                    page,
+                    _charIndex,
+                    copyLength);
+
+                _charIndex += copyLength;
+                index += copyLength;
+                count -= copyLength;
+            }
+        }
+
+        /// <summary>
+        /// Return all but one of the pages to the <see cref="ICharBufferSource"/>.
+        /// This way if someone writes a large chunk of content, we can return those buffers and avoid holding them
+        /// for extended durations.
+        /// </summary>
+        public void Clear()
+        {
+            for (var i = Pages.Count - 1; i > 0; i--)
+            {
+                var page = Pages[i];
+
+                try
+                {
+                    Pages.RemoveAt(i);
+                }
+                finally
+                {
+                    BufferSource.Return(page);
+                }
+            }
+
+            _charIndex = 0;
+            CurrentPage = Pages.Count > 0 ? Pages[0] : null;
+        }
+
+        private char[] GetCurrentPage()
+        {
+            if (CurrentPage == null || _charIndex == CurrentPage.Length)
+            {
+                CurrentPage = NewPage();
+                _charIndex = 0;
+            }
+
+            return CurrentPage;
+        }
+
+        private char[] NewPage()
+        {
+            char[] page = null;
+            try
+            {
+                page = BufferSource.Rent(PageSize);
+                Pages.Add(page);
+            }
+            catch when (page != null)
+            {
+                BufferSource.Return(page);
+                throw;
+            }
+
+            return page;
+        }
+
+        public void Dispose()
+        {
+            for (var i = 0; i < Pages.Count; i++)
+            {
+                BufferSource.Return(Pages[i]);
+            }
+
+            Pages.Clear();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/SaveTempDataFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/SaveTempDataFilter.cs
new file mode 100644
index 0000000000..2ecf4cbbef
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/SaveTempDataFilter.cs
@@ -0,0 +1,160 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    /// <summary>
+    /// A filter that saves temp data.
+    /// </summary>
+    public class SaveTempDataFilter : IResourceFilter, IResultFilter
+    {
+        // Internal for unit testing
+        internal static readonly object SaveTempDataFilterContextKey = new object();
+
+        private readonly ITempDataDictionaryFactory _factory;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="SaveTempDataFilter"/>.
+        /// </summary>
+        /// <param name="factory">The <see cref="ITempDataDictionaryFactory"/>.</param>
+        public SaveTempDataFilter(ITempDataDictionaryFactory factory)
+        {
+            _factory = factory;
+        }
+
+        /// <inheritdoc />
+        public void OnResourceExecuting(ResourceExecutingContext context)
+        {
+            if (!context.HttpContext.Items.ContainsKey(SaveTempDataFilterContextKey))
+            {
+                var tempDataContext = new SaveTempDataContext()
+                {
+                    Filters = context.Filters,
+                    TempDataDictionaryFactory = _factory
+                };
+                context.HttpContext.Items.Add(SaveTempDataFilterContextKey, tempDataContext);
+            }
+
+            if (!context.HttpContext.Response.HasStarted)
+            {
+                context.HttpContext.Response.OnStarting((state) =>
+                {
+                    var httpContext = (HttpContext)state;
+
+                    var saveTempDataContext = GetTempDataContext(context.HttpContext);
+                    if (saveTempDataContext.RequestHasUnhandledException)
+                    {
+                        return Task.CompletedTask;
+                    }
+
+                    // If temp data was already saved, skip trying to save again as the calls here would potentially fail
+                    // because the session feature might not be available at this point.
+                    // Example: An action returns NoContentResult and since NoContentResult does not write anything to
+                    // the body of the response, this delegate would get executed way late in the pipeline at which point
+                    // the session feature would have been removed.
+                    if (saveTempDataContext.TempDataSaved)
+                    {
+                        return Task.CompletedTask;
+                    }
+
+                    SaveTempData(
+                        result: null,
+                        factory: saveTempDataContext.TempDataDictionaryFactory,
+                        filters: saveTempDataContext.Filters,
+                        httpContext: httpContext);
+
+                    return Task.CompletedTask;
+                },
+                state: context.HttpContext);
+            }
+        }
+
+        /// <inheritdoc />
+        public void OnResourceExecuted(ResourceExecutedContext context)
+        {
+            // If there is an unhandled exception, we would like to avoid setting tempdata as 
+            // the end user is going to see an error page anyway and also it helps us in avoiding
+            // accessing resources like Session too late in the request lifecyle where SessionFeature might
+            // not be available.
+            if (!context.HttpContext.Response.HasStarted && context.Exception != null)
+            {
+                var saveTempDataContext = GetTempDataContext(context.HttpContext);
+                if (saveTempDataContext != null)
+                {
+                    saveTempDataContext.RequestHasUnhandledException = true;
+                }
+            }
+        }
+
+        /// <inheritdoc />
+        public void OnResultExecuting(ResultExecutingContext context)
+        {
+        }
+
+        /// <inheritdoc />
+        public void OnResultExecuted(ResultExecutedContext context)
+        {
+            // We are doing this here again because the OnStarting delegate above might get fired too late in scenarios
+            // where the action result doesn't write anything to the body. This causes the delegate to be executed
+            // late in the pipeline at which point SessionFeature would not be available.
+            if (!context.HttpContext.Response.HasStarted)
+            {
+                SaveTempData(context.Result, _factory, context.Filters, context.HttpContext);
+
+                var saveTempDataContext = GetTempDataContext(context.HttpContext);
+                if (saveTempDataContext != null)
+                {
+                    saveTempDataContext.TempDataSaved = true;
+                }
+            }
+        }
+
+        private SaveTempDataContext GetTempDataContext(HttpContext httpContext)
+        {
+            SaveTempDataContext saveTempDataContext = null;
+            if (httpContext.Items.TryGetValue(SaveTempDataFilterContextKey, out var value))
+            {
+                saveTempDataContext = (SaveTempDataContext)value;
+            }
+            return saveTempDataContext;
+        }
+
+        private static void SaveTempData(
+            IActionResult result,
+            ITempDataDictionaryFactory factory,
+            IList<IFilterMetadata> filters,
+            HttpContext httpContext)
+        {
+            var tempData = factory.GetTempData(httpContext);
+
+            for (var i = 0; i < filters.Count; i++)
+            {
+                if (filters[i] is ISaveTempDataCallback callback)
+                {
+                    callback.OnTempDataSaving(tempData);
+                }
+            }
+
+            if (result is IKeepTempDataResult)
+            {
+                tempData.Keep();
+            }
+
+            tempData.Save();
+        }
+
+        internal class SaveTempDataContext
+        {
+            public bool RequestHasUnhandledException { get; set; }
+            public bool TempDataSaved { get; set; }
+            public IList<IFilterMetadata> Filters { get; set; }
+            public ITempDataDictionaryFactory TempDataDictionaryFactory { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/SaveTempDataPropertyFilterBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/SaveTempDataPropertyFilterBase.cs
new file mode 100644
index 0000000000..c560584798
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/SaveTempDataPropertyFilterBase.cs
@@ -0,0 +1,142 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Reflection;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public abstract class SaveTempDataPropertyFilterBase : ISaveTempDataCallback
+    {
+        protected readonly ITempDataDictionaryFactory _tempDataFactory;
+
+        public SaveTempDataPropertyFilterBase(ITempDataDictionaryFactory tempDataFactory)
+        {
+            _tempDataFactory = tempDataFactory;
+        }
+
+        /// <summary>
+        /// Describes the temp data properties which exist on <see cref="Subject"/>
+        /// </summary>
+        public IReadOnlyList<LifecycleProperty> Properties { get; set; }
+
+        /// <summary>
+        /// The <see cref="object"/> which has the temp data properties.
+        /// </summary>
+        public object Subject { get; set; }
+
+        /// <summary>
+        /// Tracks the values which originally existed in temp data.
+        /// </summary>
+        public IDictionary<PropertyInfo, object> OriginalValues { get; } = new Dictionary<PropertyInfo, object>();
+
+        /// <summary>
+        /// Puts the modified values of <see cref="Subject"/> into <paramref name="tempData"/>.
+        /// </summary>
+        /// <param name="tempData">The <see cref="ITempDataDictionary"/> to be updated.</param>
+        public void OnTempDataSaving(ITempDataDictionary tempData)
+        {
+            if (Subject == null)
+            {
+                return;
+            }
+
+            for (var i = 0; i < Properties.Count; i++)
+            {
+                var property = Properties[i];
+                OriginalValues.TryGetValue(property.PropertyInfo, out var originalValue);
+
+                var newValue = property.GetValue(Subject);
+                if (newValue != null && !newValue.Equals(originalValue))
+                {
+                    tempData[property.Key] = newValue;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sets the values of the properties of <see cref="Subject"/> from <paramref name="tempData"/>.
+        /// </summary>
+        /// <param name="tempData">The <see cref="ITempDataDictionary"/>.</param>
+        protected void SetPropertyVaules(ITempDataDictionary tempData)
+        {
+            if (Properties == null)
+            {
+                return;
+            }
+
+            Debug.Assert(Subject != null, "Subject must be set before this method is invoked.");
+
+            for (var i = 0; i < Properties.Count; i++)
+            {
+                var property = Properties[i];
+                var value = tempData[property.Key];
+
+                OriginalValues[property.PropertyInfo] = value;
+                property.SetValue(Subject, value);
+            }
+        }
+
+        public static IReadOnlyList<LifecycleProperty> GetTempDataProperties(Type type, MvcViewOptions viewOptions)
+        {
+            List<LifecycleProperty> results = null;
+
+            var propertyHelpers = PropertyHelper.GetVisibleProperties(type: type);
+            var prefix = viewOptions.SuppressTempDataAttributePrefix ?
+                string.Empty :
+                "TempDataProperty-";
+
+            for (var i = 0; i < propertyHelpers.Length; i++)
+            {
+                var propertyHelper = propertyHelpers[i];
+                var property = propertyHelper.Property;
+                var tempDataAttribute = property.GetCustomAttribute<TempDataAttribute>();
+                if (tempDataAttribute != null)
+                {
+                    ValidateProperty(propertyHelper.Property);
+                    if (results == null)
+                    {
+                        results = new List<LifecycleProperty>();
+                    }
+
+                    var key = tempDataAttribute.Key;
+                    if (string.IsNullOrEmpty(key))
+                    {
+                        key = prefix + property.Name;
+                    }
+
+                    results.Add(new LifecycleProperty(property, key));
+                }
+            }
+
+            return results;
+        }
+
+        private static void ValidateProperty(PropertyInfo property)
+        {
+            if (!(property.SetMethod != null &&
+                property.SetMethod.IsPublic &&
+                property.GetMethod != null &&
+                property.GetMethod.IsPublic))
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatTempDataProperties_PublicGetterSetter(property.DeclaringType.FullName, property.Name, nameof(TempDataAttribute)));
+            }
+
+            var propertyType = Nullable.GetUnderlyingType(property.PropertyType) ?? property.PropertyType;
+
+            if (!TempDataSerializer.CanSerializeType(propertyType, out var errorMessage))
+            {
+                var messageWithPropertyInfo = Resources.FormatTempDataProperties_InvalidType(
+                    property.DeclaringType.FullName,
+                    property.Name,
+                    nameof(TempDataAttribute));
+
+                throw new InvalidOperationException($"{messageWithPropertyInfo} {errorMessage}");
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataApplicationModelProvider.cs
new file mode 100644
index 0000000000..7a111b4919
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataApplicationModelProvider.cs
@@ -0,0 +1,53 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    internal class TempDataApplicationModelProvider : IApplicationModelProvider
+    {
+        private readonly MvcViewOptions _options;
+
+        public TempDataApplicationModelProvider(IOptions<MvcViewOptions> options)
+        {
+            _options = options.Value;
+        }
+
+        /// <inheritdoc />
+        /// <remarks>This order ensures that <see cref="TempDataApplicationModelProvider"/> runs after the <see cref="DefaultApplicationModelProvider"/>.</remarks>
+        public int Order => -1000 + 10;
+
+        /// <inheritdoc />
+        public void OnProvidersExecuted(ApplicationModelProviderContext context)
+        {
+        }
+
+        /// <inheritdoc />
+        public void OnProvidersExecuting(ApplicationModelProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            foreach (var controllerModel in context.Result.Controllers)
+            {
+                var modelType = controllerModel.ControllerType.AsType();
+
+                var tempDataProperties = SaveTempDataPropertyFilterBase.GetTempDataProperties(modelType, _options);
+                if (tempDataProperties == null)
+                {
+                    continue;
+                }
+
+                var filter = new ControllerSaveTempDataPropertyFilterFactory(tempDataProperties);
+                controllerModel.Filters.Add(filter);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataMvcOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataMvcOptionsSetup.cs
new file mode 100644
index 0000000000..9d471020b3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataMvcOptionsSetup.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    /// <summary>
+    /// Sets up default options for <see cref="MvcOptions"/>.
+    /// </summary>
+    public class TempDataMvcOptionsSetup : IConfigureOptions<MvcOptions>
+    {
+        public void Configure(MvcOptions options)
+        {
+            options.Filters.Add(new SaveTempDataAttribute());
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataSerializer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataSerializer.cs
new file mode 100644
index 0000000000..fd92d4d8ca
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataSerializer.cs
@@ -0,0 +1,254 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.Extensions.Internal;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Bson;
+using Newtonsoft.Json.Linq;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class TempDataSerializer
+    {
+        private readonly JsonSerializer _jsonSerializer =
+            JsonSerializer.Create(JsonSerializerSettingsProvider.CreateSerializerSettings());
+
+        private static readonly MethodInfo _convertArrayMethodInfo = typeof(TempDataSerializer).GetMethod(
+            nameof(ConvertArray), BindingFlags.Static | BindingFlags.NonPublic);
+        private static readonly MethodInfo _convertDictionaryMethodInfo = typeof(TempDataSerializer).GetMethod(
+            nameof(ConvertDictionary), BindingFlags.Static | BindingFlags.NonPublic);
+
+        private static readonly ConcurrentDictionary<Type, Func<JArray, object>> _arrayConverters =
+            new ConcurrentDictionary<Type, Func<JArray, object>>();
+        private static readonly ConcurrentDictionary<Type, Func<JObject, object>> _dictionaryConverters =
+            new ConcurrentDictionary<Type, Func<JObject, object>>();
+
+        private static readonly Dictionary<JTokenType, Type> _tokenTypeLookup = new Dictionary<JTokenType, Type>
+        {
+            { JTokenType.String, typeof(string) },
+            { JTokenType.Integer, typeof(int) },
+            { JTokenType.Boolean, typeof(bool) },
+            { JTokenType.Float, typeof(float) },
+            { JTokenType.Guid, typeof(Guid) },
+            { JTokenType.Date, typeof(DateTime) },
+            { JTokenType.TimeSpan, typeof(TimeSpan) },
+            { JTokenType.Uri, typeof(Uri) },
+        };
+
+        public IDictionary<string, object> Deserialize(byte[] value)
+        {
+            Dictionary<string, object> tempDataDictionary;
+
+            using (var memoryStream = new MemoryStream(value))
+            using (var reader = new BsonDataReader(memoryStream))
+            {
+                tempDataDictionary = _jsonSerializer.Deserialize<Dictionary<string, object>>(reader);
+                if (tempDataDictionary == null)
+                {
+                    return new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+                }
+            }
+
+            var convertedDictionary = new Dictionary<string, object>(
+                tempDataDictionary,
+                StringComparer.OrdinalIgnoreCase);
+            foreach (var item in tempDataDictionary)
+            {
+                var jArrayValue = item.Value as JArray;
+                var jObjectValue = item.Value as JObject;
+                if (jArrayValue != null && jArrayValue.Count > 0)
+                {
+                    var arrayType = jArrayValue[0].Type;
+                    if (_tokenTypeLookup.TryGetValue(arrayType, out var returnType))
+                    {
+                        var arrayConverter = _arrayConverters.GetOrAdd(returnType, type =>
+                        {
+                            return (Func<JArray, object>)_convertArrayMethodInfo
+                                .MakeGenericMethod(type)
+                                .CreateDelegate(typeof(Func<JArray, object>));
+                        });
+                        var result = arrayConverter(jArrayValue);
+
+                        convertedDictionary[item.Key] = result;
+                    }
+                    else
+                    {
+                        var message = Resources.FormatTempData_CannotDeserializeToken(nameof(JToken), arrayType);
+                        throw new InvalidOperationException(message);
+                    }
+                }
+                else if (jObjectValue != null)
+                {
+                    if (!jObjectValue.HasValues)
+                    {
+                        convertedDictionary[item.Key] = null;
+                        continue;
+                    }
+
+                    var jTokenType = jObjectValue.Properties().First().Value.Type;
+                    if (_tokenTypeLookup.TryGetValue(jTokenType, out var valueType))
+                    {
+                        var dictionaryConverter = _dictionaryConverters.GetOrAdd(valueType, type =>
+                        {
+                            return (Func<JObject, object>)_convertDictionaryMethodInfo
+                                .MakeGenericMethod(type)
+                                .CreateDelegate(typeof(Func<JObject, object>));
+                        });
+                        var result = dictionaryConverter(jObjectValue);
+
+                        convertedDictionary[item.Key] = result;
+                    }
+                    else
+                    {
+                        var message = Resources.FormatTempData_CannotDeserializeToken(nameof(JToken), jTokenType);
+                        throw new InvalidOperationException(message);
+                    }
+                }
+                else if (item.Value is long longValue)
+                {
+                    if (longValue >= int.MinValue && longValue <= int.MaxValue)
+                    {
+                        // BsonReader casts all ints to longs. We'll attempt to work around this by force converting
+                        // longs to ints when there's no loss of precision.
+                        convertedDictionary[item.Key] = (int)longValue;
+                    }
+                }
+            }
+
+            return convertedDictionary;
+        }
+
+        public byte[] Serialize(IDictionary<string, object> values)
+        {
+            var hasValues = (values != null && values.Count > 0);
+            if (hasValues)
+            {
+                foreach (var item in values.Values)
+                {
+                    if (item != null)
+                    {
+                        // We want to allow only simple types to be serialized.
+                        EnsureObjectCanBeSerialized(item);
+                    }
+                }
+
+                using (var memoryStream = new MemoryStream())
+                {
+                    using (var writer = new BsonDataWriter(memoryStream))
+                    {
+                        _jsonSerializer.Serialize(writer, values);
+                        return memoryStream.ToArray();
+                    }
+                }
+            }
+            else
+            {
+                return new byte[0];
+            }
+        }
+
+        public void EnsureObjectCanBeSerialized(object item)
+        {
+            item = item ?? throw new ArgumentNullException(nameof(item));
+
+            var itemType = item.GetType();
+
+            if (!CanSerializeType(itemType, out var errorMessage))
+            {
+                throw new InvalidOperationException(errorMessage);
+            }
+        }
+
+        public static bool CanSerializeType(Type typeToSerialize, out string errorMessage)
+        {
+            typeToSerialize = typeToSerialize ?? throw new ArgumentNullException(nameof(typeToSerialize));
+
+            errorMessage = null;
+
+            Type actualType = null;
+            if (typeToSerialize.IsArray)
+            {
+                actualType = typeToSerialize.GetElementType();
+            }
+            else if (typeToSerialize.GetTypeInfo().IsGenericType)
+            {
+                if (ClosedGenericMatcher.ExtractGenericInterface(typeToSerialize, typeof(IList<>)) != null)
+                {
+                    var genericTypeArguments = typeToSerialize.GenericTypeArguments;
+                    Debug.Assert(genericTypeArguments.Length == 1, "IList<T> has one generic argument");
+                    actualType = genericTypeArguments[0];
+                }
+                else if (ClosedGenericMatcher.ExtractGenericInterface(typeToSerialize, typeof(IDictionary<,>)) != null)
+                {
+                    var genericTypeArguments = typeToSerialize.GenericTypeArguments;
+                    Debug.Assert(
+                        genericTypeArguments.Length == 2,
+                        "IDictionary<TKey, TValue> has two generic arguments");
+
+                    // The key must be of type string.
+                    if (genericTypeArguments[0] != typeof(string))
+                    {
+                        errorMessage = Resources.FormatTempData_CannotSerializeDictionary(
+                            typeof(TempDataSerializer).FullName,
+                            genericTypeArguments[0],
+                            typeof(string).FullName);
+                        return false;
+                    }
+                    else
+                    {
+                        actualType = genericTypeArguments[1];
+                    }
+                }
+            }
+
+            actualType = actualType ?? typeToSerialize;
+            if (!IsSimpleType(actualType))
+            {
+                errorMessage = Resources.FormatTempData_CannotSerializeType(
+                    typeof(TempDataSerializer).FullName,
+                    actualType);
+                return false;
+            }
+
+            return true;
+        }
+
+        private static IList<TVal> ConvertArray<TVal>(JArray array)
+        {
+            return array.Values<TVal>().ToArray();
+        }
+
+        private static IDictionary<string, TVal> ConvertDictionary<TVal>(JObject jObject)
+        {
+            var convertedDictionary = new Dictionary<string, TVal>(StringComparer.Ordinal);
+            foreach (var item in jObject)
+            {
+                convertedDictionary.Add(item.Key, jObject.Value<TVal>(item.Key));
+            }
+            return convertedDictionary;
+        }
+
+        private static bool IsSimpleType(Type type)
+        {
+            var typeInfo = type.GetTypeInfo();
+
+            return typeInfo.IsPrimitive ||
+                typeInfo.IsEnum ||
+                type.Equals(typeof(decimal)) ||
+                type.Equals(typeof(string)) ||
+                type.Equals(typeof(DateTime)) ||
+                type.Equals(typeof(Guid)) ||
+                type.Equals(typeof(DateTimeOffset)) ||
+                type.Equals(typeof(TimeSpan)) ||
+                type.Equals(typeof(Uri));
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ValidateAntiforgeryTokenAuthorizationFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ValidateAntiforgeryTokenAuthorizationFilter.cs
new file mode 100644
index 0000000000..7225eb76c1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ValidateAntiforgeryTokenAuthorizationFilter.cs
@@ -0,0 +1,65 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Antiforgery;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class ValidateAntiforgeryTokenAuthorizationFilter : IAsyncAuthorizationFilter, IAntiforgeryPolicy
+    {
+        private readonly IAntiforgery _antiforgery;
+        private readonly ILogger _logger;
+
+        public ValidateAntiforgeryTokenAuthorizationFilter(IAntiforgery antiforgery, ILoggerFactory loggerFactory)
+        {
+            if (antiforgery == null)
+            {
+                throw new ArgumentNullException(nameof(antiforgery));
+            }
+
+            _antiforgery = antiforgery;
+            _logger = loggerFactory.CreateLogger(GetType());
+        }
+
+        public async Task OnAuthorizationAsync(AuthorizationFilterContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (!context.IsEffectivePolicy<IAntiforgeryPolicy>(this))
+            {
+                _logger.NotMostEffectiveFilter(typeof(IAntiforgeryPolicy));
+                return;
+            }
+
+            if (ShouldValidate(context))
+            {
+                try
+                {
+                    await _antiforgery.ValidateRequestAsync(context.HttpContext);
+                }
+                catch (AntiforgeryValidationException exception)
+                {
+                    _logger.AntiforgeryTokenInvalid(exception.Message, exception);
+                    context.Result = new BadRequestResult();
+                }
+            }
+        }
+
+        protected virtual bool ShouldValidate(AuthorizationFilterContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ValidationHelpers.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ValidationHelpers.cs
new file mode 100644
index 0000000000..54c40227dd
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ValidationHelpers.cs
@@ -0,0 +1,113 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public static class ValidationHelpers
+    {
+        public static string GetModelErrorMessageOrDefault(ModelError modelError)
+        {
+            Debug.Assert(modelError != null);
+
+            if (!string.IsNullOrEmpty(modelError.ErrorMessage))
+            {
+                return modelError.ErrorMessage;
+            }
+
+            // Default in the ValidationSummary case is no error message.
+            return string.Empty;
+        }
+
+        public static string GetModelErrorMessageOrDefault(
+            ModelError modelError,
+            ModelStateEntry containingEntry,
+            ModelExplorer modelExplorer)
+        {
+            Debug.Assert(modelError != null);
+            Debug.Assert(containingEntry != null);
+            Debug.Assert(modelExplorer != null);
+
+            if (!string.IsNullOrEmpty(modelError.ErrorMessage))
+            {
+                return modelError.ErrorMessage;
+            }
+
+            // Default in the ValidationMessage case is a fallback error message.
+            var attemptedValue = containingEntry.AttemptedValue ?? "null";
+            return modelExplorer.Metadata.ModelBindingMessageProvider.ValueIsInvalidAccessor(attemptedValue);
+        }
+
+        // Returns non-null list of model states, which caller will render in order provided.
+        public static IList<ModelStateEntry> GetModelStateList(
+            ViewDataDictionary viewData,
+            bool excludePropertyErrors)
+        {
+            if (excludePropertyErrors)
+            {
+                viewData.ModelState.TryGetValue(viewData.TemplateInfo.HtmlFieldPrefix, out var ms);
+
+                if (ms != null)
+                {
+                    return new[] { ms };
+                }
+            }
+            else if (viewData.ModelState.Count > 0)
+            {
+                var metadata = viewData.ModelMetadata;
+                var modelStateDictionary = viewData.ModelState;
+                var entries = new List<ModelStateEntry>();
+                Visit(modelStateDictionary.Root, metadata, entries);
+
+                if (entries.Count < modelStateDictionary.Count)
+                {
+                    // Account for entries in the ModelStateDictionary that do not have corresponding ModelMetadata values.
+                    foreach (var entry in modelStateDictionary)
+                    {
+                        if (!entries.Contains(entry.Value))
+                        {
+                            entries.Add(entry.Value);
+                        }
+                    }
+                }
+
+                return entries;
+            }
+
+            return Array.Empty<ModelStateEntry>();
+        }
+
+        private static void Visit(
+            ModelStateEntry modelStateEntry,
+            ModelMetadata metadata,
+            List<ModelStateEntry> orderedModelStateEntries)
+        {
+            if (metadata.ElementMetadata != null && modelStateEntry.Children != null)
+            {
+                foreach (var indexEntry in modelStateEntry.Children)
+                {
+                    Visit(indexEntry, metadata.ElementMetadata, orderedModelStateEntries);
+                }
+            }
+
+            for (var i = 0; i < metadata.Properties.Count; i++)
+            {
+                var propertyMetadata = metadata.Properties[i];
+                var propertyModelStateEntry = modelStateEntry.GetModelStateForProperty(propertyMetadata.PropertyName);
+                if (propertyModelStateEntry != null)
+                {
+                    Visit(propertyModelStateEntry, propertyMetadata, orderedModelStateEntries);
+                }
+            }
+
+            if (!modelStateEntry.IsContainerNode)
+            {
+                orderedModelStateEntries.Add(modelStateEntry);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBuffer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBuffer.cs
new file mode 100644
index 0000000000..5143e515d4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBuffer.cs
@@ -0,0 +1,390 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    /// <summary>
+    /// An <see cref="IHtmlContentBuilder"/> that is backed by a buffer provided by <see cref="IViewBufferScope"/>.
+    /// </summary>
+    [DebuggerDisplay("{DebuggerToString()}")]
+    public class ViewBuffer : IHtmlContentBuilder
+    {
+        public static readonly int PartialViewPageSize = 32;
+        public static readonly int TagHelperPageSize = 32;
+        public static readonly int ViewComponentPageSize = 32;
+        public static readonly int ViewPageSize = 256;
+
+        private readonly IViewBufferScope _bufferScope;
+        private readonly string _name;
+        private readonly int _pageSize;
+        private ViewBufferPage _currentPage;         // Limits allocation if the ViewBuffer has only one page (frequent case).
+        private List<ViewBufferPage> _multiplePages; // Allocated only if necessary
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ViewBuffer"/>.
+        /// </summary>
+        /// <param name="bufferScope">The <see cref="IViewBufferScope"/>.</param>
+        /// <param name="name">A name to identify this instance.</param>
+        /// <param name="pageSize">The size of buffer pages.</param>
+        public ViewBuffer(IViewBufferScope bufferScope, string name, int pageSize)
+        {
+            if (bufferScope == null)
+            {
+                throw new ArgumentNullException(nameof(bufferScope));
+            }
+
+            if (pageSize <= 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(pageSize));
+            }
+
+            _bufferScope = bufferScope;
+            _name = name;
+            _pageSize = pageSize;
+        }
+
+        /// <summary>
+        /// Get the <see cref="ViewBufferPage"/> count.
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                if (_multiplePages != null)
+                {
+                    return _multiplePages.Count;
+                }
+                if (_currentPage != null)
+                {
+                    return 1;
+                }
+                return 0;
+            }
+        }
+
+        /// <summary>
+        /// Gets a <see cref="ViewBufferPage"/>.
+        /// </summary>
+        public ViewBufferPage this[int index]
+        {
+            get
+            {
+                if (_multiplePages != null)
+                {
+                    return _multiplePages[index];
+                }
+                if (index == 0 && _currentPage != null)
+                {
+                    return _currentPage;
+                }
+                throw new IndexOutOfRangeException();
+            }
+        }
+
+        /// <inheritdoc />
+        public IHtmlContentBuilder Append(string unencoded)
+        {
+            if (unencoded == null)
+            {
+                return this;
+            }
+
+            // Text that needs encoding is the uncommon case in views, which is why it
+            // creates a wrapper and pre-encoded text does not.
+            AppendValue(new ViewBufferValue(new EncodingWrapper(unencoded)));
+            return this;
+        }
+
+        /// <inheritdoc />
+        public IHtmlContentBuilder AppendHtml(IHtmlContent content)
+        {
+            if (content == null)
+            {
+                return this;
+            }
+
+            AppendValue(new ViewBufferValue(content));
+            return this;
+        }
+
+        /// <inheritdoc />
+        public IHtmlContentBuilder AppendHtml(string encoded)
+        {
+            if (encoded == null)
+            {
+                return this;
+            }
+
+            AppendValue(new ViewBufferValue(encoded));
+            return this;
+        }
+
+        private void AppendValue(ViewBufferValue value)
+        {
+            var page = GetCurrentPage();
+            page.Append(value);
+        }
+
+        private ViewBufferPage GetCurrentPage()
+        {
+            if (_currentPage == null || _currentPage.IsFull)
+            {
+                AddPage(new ViewBufferPage(_bufferScope.GetPage(_pageSize)));
+            }
+            return _currentPage;
+        }
+
+        private void AddPage(ViewBufferPage page)
+        {
+            if (_multiplePages != null)
+            {
+                _multiplePages.Add(page);
+            }
+            else if (_currentPage != null)
+            {
+                _multiplePages = new List<ViewBufferPage>(2);
+                _multiplePages.Add(_currentPage);
+                _multiplePages.Add(page);
+            }
+
+            _currentPage = page;
+        }
+
+        /// <inheritdoc />
+        public IHtmlContentBuilder Clear()
+        {
+            _multiplePages = null;
+            _currentPage = null;
+            return this;
+        }
+
+        /// <inheritdoc />
+        public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+        {
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
+            if (encoder == null)
+            {
+                throw new ArgumentNullException(nameof(encoder));
+            }
+
+            for (var i = 0; i < Count; i++)
+            {
+                var page = this[i];
+                for (var j = 0; j < page.Count; j++)
+                {
+                    var value = page.Buffer[j];
+
+                    if (value.Value is string valueAsString)
+                    {
+                        writer.Write(valueAsString);
+                        continue;
+                    }
+
+                    if (value.Value is IHtmlContent valueAsHtmlContent)
+                    {
+                        valueAsHtmlContent.WriteTo(writer, encoder);
+                        continue;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Writes the buffered content to <paramref name="writer"/>.
+        /// </summary>
+        /// <param name="writer">The <see cref="TextWriter"/>.</param>
+        /// <param name="encoder">The <see cref="HtmlEncoder"/>.</param>
+        /// <returns>A <see cref="Task"/> which will complete once content has been written.</returns>
+        public async Task WriteToAsync(TextWriter writer, HtmlEncoder encoder)
+        {
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
+            if (encoder == null)
+            {
+                throw new ArgumentNullException(nameof(encoder));
+            }
+
+            for (var i = 0; i < Count; i++)
+            {
+                var page = this[i];
+                for (var j = 0; j < page.Count; j++)
+                {
+                    var value = page.Buffer[j];
+
+                    if (value.Value is string valueAsString)
+                    {
+                        await writer.WriteAsync(valueAsString);
+                        continue;
+                    }
+
+                    if (value.Value is ViewBuffer valueAsViewBuffer)
+                    {
+                        await valueAsViewBuffer.WriteToAsync(writer, encoder);
+                        continue;
+                    }
+
+                    if (value.Value is IHtmlContent valueAsHtmlContent)
+                    {
+                        valueAsHtmlContent.WriteTo(writer, encoder);
+                        await writer.FlushAsync();
+                        continue;
+                    }
+                }
+            }
+        }
+
+        private string DebuggerToString() => _name;
+
+        public void CopyTo(IHtmlContentBuilder destination)
+        {
+            if (destination == null)
+            {
+                throw new ArgumentNullException(nameof(destination));
+            }
+
+            for (var i = 0; i < Count; i++)
+            {
+                var page = this[i];
+                for (var j = 0; j < page.Count; j++)
+                {
+                    var value = page.Buffer[j];
+
+                    string valueAsString;
+                    IHtmlContentContainer valueAsContainer;
+                    if ((valueAsString = value.Value as string) != null)
+                    {
+                        destination.AppendHtml(valueAsString);
+                    }
+                    else if ((valueAsContainer = value.Value as IHtmlContentContainer) != null)
+                    {
+                        valueAsContainer.CopyTo(destination);
+                    }
+                    else
+                    {
+                        destination.AppendHtml((IHtmlContent)value.Value);
+                    }
+                }
+            }
+        }
+
+        public void MoveTo(IHtmlContentBuilder destination)
+        {
+            if (destination == null)
+            {
+                throw new ArgumentNullException(nameof(destination));
+            }
+
+            // Perf: We have an efficient implementation when the destination is another view buffer,
+            // we can just insert our pages as-is.
+            if (destination is ViewBuffer other)
+            {
+                MoveTo(other);
+                return;
+            }
+
+            for (var i = 0; i < Count; i++)
+            {
+                var page = this[i];
+                for (var j = 0; j < page.Count; j++)
+                {
+                    var value = page.Buffer[j];
+
+                    string valueAsString;
+                    IHtmlContentContainer valueAsContainer;
+                    if ((valueAsString = value.Value as string) != null)
+                    {
+                        destination.AppendHtml(valueAsString);
+                    }
+                    else if ((valueAsContainer = value.Value as IHtmlContentContainer) != null)
+                    {
+                        valueAsContainer.MoveTo(destination);
+                    }
+                    else
+                    {
+                        destination.AppendHtml((IHtmlContent)value.Value);
+                    }
+                }
+            }
+
+            for (var i = 0; i < Count; i++)
+            {
+                var page = this[i];
+                Array.Clear(page.Buffer, 0, page.Count);
+                _bufferScope.ReturnSegment(page.Buffer);
+            }
+
+            Clear();
+        }
+
+        private void MoveTo(ViewBuffer destination)
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                var page = this[i];
+
+                var destinationPage = destination.Count == 0 ? null : destination[destination.Count - 1];
+
+                // If the source page is less or equal to than half full, let's copy it's content to the destination
+                // page if possible.
+                var isLessThanHalfFull = 2 * page.Count <= page.Capacity;
+                if (isLessThanHalfFull &&
+                    destinationPage != null &&
+                    destinationPage.Capacity - destinationPage.Count >= page.Count)
+                {
+                    // We have room, let's copy the items.
+                    Array.Copy(
+                        sourceArray: page.Buffer,
+                        sourceIndex: 0,
+                        destinationArray: destinationPage.Buffer,
+                        destinationIndex: destinationPage.Count,
+                        length: page.Count);
+
+                    destinationPage.Count += page.Count;
+
+                    // Now we can return the source page, and it can be reused in the scope of this request.
+                    Array.Clear(page.Buffer, 0, page.Count);
+                    _bufferScope.ReturnSegment(page.Buffer);
+
+                }
+                else
+                {
+                    // Otherwise, let's just add the source page to the other buffer.
+                    destination.AddPage(page);
+                }
+
+            }
+
+            Clear();
+        }
+
+        private class EncodingWrapper : IHtmlContent
+        {
+            private readonly string _unencoded;
+
+            public EncodingWrapper(string unencoded)
+            {
+                _unencoded = unencoded;
+            }
+
+            public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+            {
+                encoder.Encode(writer, _unencoded);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferPage.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferPage.cs
new file mode 100644
index 0000000000..b561e71825
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferPage.cs
@@ -0,0 +1,23 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class ViewBufferPage
+    {
+        public ViewBufferPage(ViewBufferValue[] buffer)
+        {
+            Buffer = buffer;
+        }
+
+        public ViewBufferValue[] Buffer { get; }
+
+        public int Capacity => Buffer.Length;
+
+        public int Count { get; set; }
+
+        public bool IsFull => Count == Capacity;
+
+        public void Append(ViewBufferValue value) => Buffer[Count++] = value;
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferTextWriter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferTextWriter.cs
new file mode 100644
index 0000000000..e7d3761677
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferTextWriter.cs
@@ -0,0 +1,436 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    /// <summary>
+    /// <para>
+    /// A <see cref="TextWriter"/> that is backed by a unbuffered writer (over the Response stream) and/or a 
+    /// <see cref="ViewBuffer"/>
+    /// </para>
+    /// <para>
+    /// When <c>Flush</c> or <c>FlushAsync</c> is invoked, the writer copies all content from the buffer to
+    /// the writer and switches to writing to the unbuffered writer for all further write operations.
+    /// </para>
+    /// </summary>
+    public class ViewBufferTextWriter : TextWriter
+    {
+        private readonly TextWriter _inner;
+        private readonly HtmlEncoder _htmlEncoder;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="ViewBufferTextWriter"/>.
+        /// </summary>
+        /// <param name="buffer">The <see cref="ViewBuffer"/> for buffered output.</param>
+        /// <param name="encoding">The <see cref="System.Text.Encoding"/>.</param>
+        public ViewBufferTextWriter(ViewBuffer buffer, Encoding encoding)
+        {
+            if (buffer == null)
+            {
+                throw new ArgumentNullException(nameof(buffer));
+            }
+
+            if (encoding == null)
+            {
+                throw new ArgumentNullException(nameof(encoding));
+            }
+
+            Buffer = buffer;
+            Encoding = encoding;
+        }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="ViewBufferTextWriter"/>.
+        /// </summary>
+        /// <param name="buffer">The <see cref="ViewBuffer"/> for buffered output.</param>
+        /// <param name="encoding">The <see cref="System.Text.Encoding"/>.</param>
+        /// <param name="htmlEncoder">The HTML encoder.</param>
+        /// <param name="inner">
+        /// The inner <see cref="TextWriter"/> to write output to when this instance is no longer buffering.
+        /// </param>
+        public ViewBufferTextWriter(ViewBuffer buffer, Encoding encoding, HtmlEncoder htmlEncoder, TextWriter inner)
+        {
+            if (buffer == null)
+            {
+                throw new ArgumentNullException(nameof(buffer));
+            }
+
+            if (encoding == null)
+            {
+                throw new ArgumentNullException(nameof(encoding));
+            }
+
+            if (htmlEncoder == null)
+            {
+                throw new ArgumentNullException(nameof(htmlEncoder));
+            }
+
+            if (inner == null)
+            {
+                throw new ArgumentNullException(nameof(inner));
+            }
+
+            Buffer = buffer;
+            Encoding = encoding;
+            _htmlEncoder = htmlEncoder;
+            _inner = inner;
+        }
+
+        /// <inheritdoc />
+        public override Encoding Encoding { get; }
+
+        /// <inheritdoc />
+        public bool IsBuffering { get; private set; } = true;
+
+        /// <summary>
+        /// Gets the <see cref="ViewBuffer"/>.
+        /// </summary>
+        public ViewBuffer Buffer { get; }
+
+        /// <inheritdoc />
+        public override void Write(char value)
+        {
+            if (IsBuffering)
+            {
+                Buffer.AppendHtml(value.ToString());
+            }
+            else
+            {
+                _inner.Write(value);
+            }
+        }
+
+        /// <inheritdoc />
+        public override void Write(char[] buffer, int index, int count)
+        {
+            if (buffer == null)
+            {
+                throw new ArgumentNullException(nameof(buffer));
+            }
+
+            if (index < 0 || index >= buffer.Length)
+            {
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
+
+            if (count < 0 || (buffer.Length - index < count))
+            {
+                throw new ArgumentOutOfRangeException(nameof(count));
+            }
+
+            if (IsBuffering)
+            {
+                Buffer.AppendHtml(new string(buffer, index, count));
+            }
+            else
+            {
+                _inner.Write(buffer, index, count);
+            }
+        }
+
+        /// <inheritdoc />
+        public override void Write(string value)
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                return;
+            }
+
+            if (IsBuffering)
+            {
+                Buffer.AppendHtml(value);
+            }
+            else
+            {
+                _inner.Write(value);
+            }
+        }
+
+        /// <inheritdoc />
+        public override void Write(object value)
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            IHtmlContentContainer container;
+            IHtmlContent content;
+            if ((container = value as IHtmlContentContainer) != null)
+            {
+                Write(container);
+            }
+            else if ((content = value as IHtmlContent) != null)
+            {
+                Write(content);
+            }
+            else
+            {
+                Write(value.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Writes an <see cref="IHtmlContent"/> value.
+        /// </summary>
+        /// <param name="value">The <see cref="IHtmlContent"/> value.</param>
+        public void Write(IHtmlContent value)
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            if (IsBuffering)
+            {
+                Buffer.AppendHtml(value);
+            }
+            else
+            {
+                value.WriteTo(_inner, _htmlEncoder);
+            }
+        }
+
+        /// <summary>
+        /// Writes an <see cref="IHtmlContentContainer"/> value.
+        /// </summary>
+        /// <param name="value">The <see cref="IHtmlContentContainer"/> value.</param>
+        public void Write(IHtmlContentContainer value)
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            if (IsBuffering)
+            {
+                value.MoveTo(Buffer);
+            }
+            else
+            {
+                value.WriteTo(_inner, _htmlEncoder);
+            }
+        }
+
+        /// <inheritdoc />
+        public override void WriteLine(object value)
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            IHtmlContentContainer container;
+            IHtmlContent content;
+            if ((container = value as IHtmlContentContainer) != null)
+            {
+                Write(container);
+                Write(NewLine);
+            }
+            else if ((content = value as IHtmlContent) != null)
+            {
+                Write(content);
+                Write(NewLine);
+            }
+            else
+            {
+                Write(value.ToString());
+                Write(NewLine);
+            }
+        }
+
+        /// <inheritdoc />
+        public override Task WriteAsync(char value)
+        {
+            if (IsBuffering)
+            {
+                Buffer.AppendHtml(value.ToString());
+                return Task.CompletedTask;
+            }
+            else
+            {
+                return _inner.WriteAsync(value);
+            }
+        }
+
+        /// <inheritdoc />
+        public override Task WriteAsync(char[] buffer, int index, int count)
+        {
+            if (buffer == null)
+            {
+                throw new ArgumentNullException(nameof(buffer));
+            }
+
+            if (index < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(index));
+            }
+            if (count < 0 || (buffer.Length - index < count))
+            {
+                throw new ArgumentOutOfRangeException(nameof(count));
+            }
+
+            if (IsBuffering)
+            {
+                Buffer.AppendHtml(new string(buffer, index, count));
+                return Task.CompletedTask;
+            }
+            else
+            {
+                return _inner.WriteAsync(buffer, index, count);
+            }
+        }
+
+        /// <inheritdoc />
+        public override Task WriteAsync(string value)
+        {
+            if (IsBuffering)
+            {
+                Buffer.AppendHtml(value);
+                return Task.CompletedTask;
+            }
+            else
+            {
+                return _inner.WriteAsync(value);
+            }
+        }
+
+        /// <inheritdoc />
+        public override void WriteLine()
+        {
+            if (IsBuffering)
+            {
+                Buffer.AppendHtml(NewLine);
+            }
+            else
+            {
+                _inner.WriteLine();
+            }
+        }
+
+        /// <inheritdoc />
+        public override void WriteLine(string value)
+        {
+            if (IsBuffering)
+            {
+                Buffer.AppendHtml(value);
+                Buffer.AppendHtml(NewLine);
+            }
+            else
+            {
+                _inner.WriteLine(value);
+            }
+        }
+
+        /// <inheritdoc />
+        public override Task WriteLineAsync(char value)
+        {
+            if (IsBuffering)
+            {
+                Buffer.AppendHtml(value.ToString());
+                Buffer.AppendHtml(NewLine);
+                return Task.CompletedTask;
+            }
+            else
+            {
+                return _inner.WriteLineAsync(value);
+            }
+        }
+
+        /// <inheritdoc />
+        public override Task WriteLineAsync(char[] value, int start, int offset)
+        {
+            if (IsBuffering)
+            {
+                Buffer.AppendHtml(new string(value, start, offset));
+                Buffer.AppendHtml(NewLine);
+                return Task.CompletedTask;
+            }
+            else
+            {
+                return _inner.WriteLineAsync(value, start, offset);
+            }
+        }
+
+        /// <inheritdoc />
+        public override Task WriteLineAsync(string value)
+        {
+            if (IsBuffering)
+            {
+                Buffer.AppendHtml(value);
+                Buffer.AppendHtml(NewLine);
+                return Task.CompletedTask;
+            }
+            else
+            {
+                return _inner.WriteLineAsync(value);
+            }
+        }
+
+        /// <inheritdoc />
+        public override Task WriteLineAsync()
+        {
+            if (IsBuffering)
+            {
+                Buffer.AppendHtml(NewLine);
+                return Task.CompletedTask;
+            }
+            else
+            {
+                return _inner.WriteLineAsync();
+            }
+        }
+
+        /// <summary>
+        /// Copies the buffered content to the unbuffered writer and invokes flush on it.
+        /// Additionally causes this instance to no longer buffer and direct all write operations
+        /// to the unbuffered writer.
+        /// </summary>
+        public override void Flush()
+        {
+            if (_inner == null || _inner is ViewBufferTextWriter)
+            {
+                return;
+            }
+
+            if (IsBuffering)
+            {
+                IsBuffering = false;
+                Buffer.WriteTo(_inner, _htmlEncoder);
+                Buffer.Clear();
+            }
+
+            _inner.Flush();
+        }
+
+        /// <summary>
+        /// Copies the buffered content to the unbuffered writer and invokes flush on it.
+        /// Additionally causes this instance to no longer buffer and direct all write operations
+        /// to the unbuffered writer.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> that represents the asynchronous copy and flush operations.</returns>
+        public override async Task FlushAsync()
+        {
+            if (_inner == null || _inner is ViewBufferTextWriter)
+            {
+                return;
+            }
+
+            if (IsBuffering)
+            {
+                IsBuffering = false;
+                await Buffer.WriteToAsync(_inner, _htmlEncoder);
+                Buffer.Clear();
+            }
+
+            await _inner.FlushAsync();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferValue.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferValue.cs
new file mode 100644
index 0000000000..89c9581848
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferValue.cs
@@ -0,0 +1,62 @@
+// 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.
+
+using System.Diagnostics;
+using System.IO;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    /// <summary>
+    /// Encapsulates a string or <see cref="IHtmlContent"/> value.
+    /// </summary>
+    [DebuggerDisplay("{DebuggerToString()}")]
+    public struct ViewBufferValue
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="ViewBufferValue"/> with a <c>string</c> value.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public ViewBufferValue(string value)
+        {
+            Value = value;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ViewBufferValue"/> with a <see cref="IHtmlContent"/> value.
+        /// </summary>
+        /// <param name="content">The <see cref="IHtmlContent"/>.</param>
+        public ViewBufferValue(IHtmlContent content)
+        {
+            Value = content;
+        }
+
+        /// <summary>
+        /// Gets the value.
+        /// </summary>
+        public object Value { get; }
+
+        private string DebuggerToString()
+        {
+            using (var writer = new StringWriter())
+            {
+                var valueAsString = Value as string;
+                if (valueAsString != null)
+                {
+                    writer.Write(valueAsString);
+                    return writer.ToString();
+                }
+
+                var valueAsContent = Value as IHtmlContent;
+                if (valueAsContent != null)
+                {
+                    valueAsContent.WriteTo(writer, HtmlEncoder.Default);
+                    return writer.ToString();
+                }
+
+                return "(null)";
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataAttributeApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataAttributeApplicationModelProvider.cs
new file mode 100644
index 0000000000..3237558537
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataAttributeApplicationModelProvider.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    internal class ViewDataAttributeApplicationModelProvider : IApplicationModelProvider
+    {
+        /// <inheritdoc />
+        /// <remarks>This order ensures that <see cref="ViewDataAttributeApplicationModelProvider"/> runs after the <see cref="DefaultApplicationModelProvider"/>.</remarks>
+        public int Order => -1000 + 10;
+
+        /// <inheritdoc />
+        public void OnProvidersExecuted(ApplicationModelProviderContext context)
+        {
+        }
+
+        /// <inheritdoc />
+        public void OnProvidersExecuting(ApplicationModelProviderContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            foreach (var controllerModel in context.Result.Controllers)
+            {
+                var controllerType = controllerModel.ControllerType.AsType();
+
+                var viewDataProperties = ViewDataAttributePropertyProvider.GetViewDataProperties(controllerType);
+                if (viewDataProperties == null)
+                {
+                    continue;
+                }
+
+                var filter = new ControllerViewDataAttributeFilterFactory(viewDataProperties);
+                controllerModel.Filters.Add(filter);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataAttributePropertyProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataAttributePropertyProvider.cs
new file mode 100644
index 0000000000..494a4b6c2d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataAttributePropertyProvider.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public static class ViewDataAttributePropertyProvider
+    {
+        public static IReadOnlyList<LifecycleProperty> GetViewDataProperties(Type type)
+        {
+            List<LifecycleProperty> results = null;
+
+            var propertyHelpers = PropertyHelper.GetVisibleProperties(type: type);
+
+            for (var i = 0; i < propertyHelpers.Length; i++)
+            {
+                var propertyHelper = propertyHelpers[i];
+                var property = propertyHelper.Property;
+                var tempDataAttribute = property.GetCustomAttribute<ViewDataAttribute>();
+                if (tempDataAttribute != null)
+                {
+                    if (results == null)
+                    {
+                        results = new List<LifecycleProperty>();
+                    }
+
+                    var key = tempDataAttribute.Key;
+                    if (string.IsNullOrEmpty(key))
+                    {
+                        key = property.Name;
+                    }
+
+                    results.Add(new LifecycleProperty(property, key));
+                }
+            }
+
+            return results;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataDictionaryFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataDictionaryFactory.cs
new file mode 100644
index 0000000000..86bd602f6c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataDictionaryFactory.cs
@@ -0,0 +1,60 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Linq.Expressions;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public static class ViewDataDictionaryFactory
+    {
+        public static Func<IModelMetadataProvider, ModelStateDictionary, ViewDataDictionary> CreateFactory(TypeInfo modelType)
+        {
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            var type = typeof(ViewDataDictionary<>).MakeGenericType(modelType);
+            var constructor = type.GetConstructor(new[] { typeof(IModelMetadataProvider), typeof(ModelStateDictionary) });
+            Debug.Assert(constructor != null);
+
+            var parameter1 = Expression.Parameter(typeof(IModelMetadataProvider), "metadataProvider");
+            var parameter2 = Expression.Parameter(typeof(ModelStateDictionary), "modelState");
+
+            return
+                Expression.Lambda<Func<IModelMetadataProvider, ModelStateDictionary, ViewDataDictionary>>(
+                    Expression.Convert(
+                        Expression.New(constructor, parameter1, parameter2),
+                        typeof(ViewDataDictionary)),
+                    parameter1,
+                    parameter2)
+                .Compile();
+        }
+
+        public static Func<ViewDataDictionary, ViewDataDictionary> CreateNestedFactory(TypeInfo modelType)
+        {
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            var type = typeof(ViewDataDictionary<>).MakeGenericType(modelType);
+            var constructor = type.GetConstructor(new[] { typeof(ViewDataDictionary) });
+            Debug.Assert(constructor != null);
+
+            var parameter = Expression.Parameter(typeof(ViewDataDictionary), "viewDataDictionary");
+
+            return
+                Expression.Lambda<Func<ViewDataDictionary, ViewDataDictionary>>(
+                    Expression.Convert(
+                        Expression.New(constructor, parameter),
+                        typeof(ViewDataDictionary)),
+                    parameter)
+                .Compile();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
new file mode 100644
index 0000000000..27d839320d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ASP.NET Core MVC view rendering features. Contains common types used in most MVC applications as well as view rendering features such as view engines, views, view components, and HTML helpers.
+Commonly used types:
+Microsoft.AspNetCore.Mvc.Controller
+Microsoft.AspNetCore.Mvc.ValidateAntiForgeryTokenAttribute
+Microsoft.AspNetCore.Mvc.ViewComponent</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.DataAnnotations\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Formatters.Json\Microsoft.AspNetCore.Mvc.Formatters.Json.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="$(MicrosoftAspNetCoreAntiforgeryPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.ChunkingCookieManager.Sources" PrivateAssets="All" Version="$(MicrosoftAspNetCoreChunkingCookieManagerSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="$(MicrosoftAspNetCoreDiagnosticsAbstractionsPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="$(MicrosoftAspNetCoreHtmlAbstractionsPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.ObjectMethodExecutor.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.PropertyActivator.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsPropertyActivatorSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsPropertyHelperSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.ValueStopwatch.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsValueStopwatchSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.WebEncoders" Version="$(MicrosoftExtensionsWebEncodersPackageVersion)" />
+    <PackageReference Include="Newtonsoft.Json.Bson" Version="$(NewtonsoftJsonBsonPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelStateDictionaryExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelStateDictionaryExtensions.cs
new file mode 100644
index 0000000000..7e023c4b7f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelStateDictionaryExtensions.cs
@@ -0,0 +1,215 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// Extensions methods for <see cref="ModelStateDictionary"/>.
+    /// </summary>
+    public static class ModelStateDictionaryExtensions
+    {
+        /// <summary>
+        /// Adds the specified <paramref name="errorMessage"/> to the <see cref="ModelStateEntry.Errors"/> instance
+        /// that is associated with the specified <paramref name="expression"/>. If the maximum number of allowed
+        /// errors has already been recorded, ensures that a <see cref="TooManyModelErrorsException"/> exception is
+        /// recorded instead.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <param name="modelState">The <see cref="ModelStateDictionary"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against an item in the current model.</param>
+        /// <param name="errorMessage">The error message to add.</param>
+        public static void AddModelError<TModel>(
+            this ModelStateDictionary modelState,
+            Expression<Func<TModel, object>> expression,
+            string errorMessage)
+        {
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            if (errorMessage == null)
+            {
+                throw new ArgumentNullException(nameof(errorMessage));
+            }
+
+            modelState.AddModelError(GetExpressionText(expression), errorMessage);
+        }
+
+        /// <summary>
+        /// Adds the specified <paramref name="exception"/> to the <see cref="ModelStateEntry.Errors"/> instance
+        /// that is associated with the specified <paramref name="expression"/>. If the maximum number of allowed
+        /// errors has already been recorded, ensures that a <see cref="TooManyModelErrorsException"/> exception is
+        /// recorded instead.
+        /// </summary>
+        /// <remarks>
+        /// This method allows adding the <paramref name="exception"/> to the current <see cref="ModelStateDictionary"/>
+        /// when <see cref="ModelMetadata"/> is not available or the exact <paramref name="exception"/> 
+        /// must be maintained for later use (even if it is for example a <see cref="FormatException"/>).
+        /// </remarks>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <param name="modelState">The <see cref="ModelStateDictionary"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against an item in the current model.</param>
+        /// <param name="exception">The <see cref="Exception"/> to add.</param>
+        public static void TryAddModelException<TModel>(
+            this ModelStateDictionary modelState,
+            Expression<Func<TModel, object>> expression,
+            Exception exception)
+        {
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            modelState.TryAddModelException(GetExpressionText(expression), exception);
+        }
+
+        /// <summary>
+        /// Adds the specified <paramref name="exception"/> to the <see cref="ModelStateEntry.Errors"/> instance
+        /// that is associated with the specified <paramref name="expression"/>. If the maximum number of allowed
+        /// errors has already been recorded, ensures that a <see cref="TooManyModelErrorsException"/> exception is
+        /// recorded instead.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <param name="modelState">The <see cref="ModelStateDictionary"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against an item in the current model.</param>
+        /// <param name="exception">The <see cref="Exception"/> to add.</param>
+        /// <param name="metadata">The <see cref="ModelMetadata"/> associated with the model.</param>
+        public static void AddModelError<TModel>(
+            this ModelStateDictionary modelState,
+            Expression<Func<TModel, object>> expression,
+            Exception exception,
+            ModelMetadata metadata)
+        {
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            if (metadata == null)
+            {
+                throw new ArgumentNullException(nameof(metadata));
+            }
+
+            modelState.AddModelError(GetExpressionText(expression), exception, metadata);
+        }
+
+        /// <summary>
+        /// Removes the specified <paramref name="expression"/> from the <see cref="ModelStateDictionary"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <param name="modelState">The <see cref="ModelStateDictionary"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against an item in the current model.</param>
+        /// <returns>
+        /// true if the element is successfully removed; otherwise, false.
+        /// This method also returns false if <paramref name="expression"/> was not found in the model-state dictionary.
+        /// </returns>
+        public static bool Remove<TModel>(
+            this ModelStateDictionary modelState,
+            Expression<Func<TModel, object>> expression)
+        {
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return modelState.Remove(GetExpressionText(expression));
+        }
+
+        /// <summary>
+        /// Removes all the entries for the specified <paramref name="expression"/> from the
+        /// <see cref="ModelStateDictionary"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <param name="modelState">The <see cref="ModelStateDictionary"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against an item in the current model.</param>
+        public static void RemoveAll<TModel>(
+            this ModelStateDictionary modelState,
+            Expression<Func<TModel, object>> expression)
+        {
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            string modelKey = GetExpressionText(expression);
+            if (string.IsNullOrEmpty(modelKey))
+            {
+                var modelMetadata = new EmptyModelMetadataProvider().GetMetadataForType(typeof(TModel));
+                for (var i = 0; i < modelMetadata.Properties.Count; i++)
+                {
+                    var property = modelMetadata.Properties[i];
+                    var childKey = property.BinderModelName ?? property.PropertyName;
+                    var entries = modelState.FindKeysWithPrefix(childKey).ToArray();
+                    foreach (var entry in entries)
+                    {
+                        modelState.Remove(entry.Key);
+                    }
+                }
+            }
+            else
+            {
+                var entries = modelState.FindKeysWithPrefix(modelKey).ToArray();
+                foreach (var entry in entries)
+                {
+                    modelState.Remove(entry.Key);
+                }
+            }
+        }
+
+        private static string GetExpressionText(LambdaExpression expression)
+        {
+            // We check if expression is wrapped with conversion to object expression
+            // and unwrap it if necessary, because Expression<Func<TModel, object>>
+            // automatically creates a convert to object expression for expressions
+            // returning value types
+            var unaryExpression = expression.Body as UnaryExpression;
+
+            if (IsConversionToObject(unaryExpression))
+            {
+                return ExpressionHelper.GetExpressionText(Expression.Lambda(
+                    unaryExpression.Operand,
+                    expression.Parameters[0]));
+            }
+
+            return ExpressionHelper.GetExpressionText(expression);
+        }
+
+        private static bool IsConversionToObject(UnaryExpression expression)
+        {
+            return expression?.NodeType == ExpressionType.Convert &&
+                expression.Operand?.NodeType == ExpressionType.MemberAccess &&
+                expression.Type == typeof(object);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewOptions.cs
new file mode 100644
index 0000000000..9d0627da96
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewOptions.cs
@@ -0,0 +1,108 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Provides programmatic configuration for views in the MVC framework.
+    /// </summary>
+    public class MvcViewOptions : IEnumerable<ICompatibilitySwitch>
+    {
+        private readonly CompatibilitySwitch<bool> _suppressTempDataAttributePrefix;
+        private readonly ICompatibilitySwitch[] _switches;
+        private HtmlHelperOptions _htmlHelperOptions = new HtmlHelperOptions();
+
+        public MvcViewOptions()
+        {
+            _suppressTempDataAttributePrefix = new CompatibilitySwitch<bool>(nameof(SuppressTempDataAttributePrefix));
+            _switches = new[]
+            {
+                _suppressTempDataAttributePrefix,
+            };
+        }
+
+        /// <summary>
+        /// Gets or sets programmatic configuration for the HTML helpers and <see cref="Rendering.ViewContext"/>.
+        /// </summary>
+        public HtmlHelperOptions HtmlHelperOptions
+        {
+            get => _htmlHelperOptions;
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _htmlHelperOptions = value;
+            }
+        }
+
+        /// <summary>
+        /// <para>
+        /// Gets or sets a value that determines if the <see cref="ITempDataDictionary"/> keys for
+        /// properties annotated with <see cref="TempDataAttribute"/> include the prefix <c>TempDataProperty-</c>.
+        /// </para>
+        /// <para>
+        /// When <see cref="TempDataAttribute.Key"/> is not specified, the lookup key for properties annotated
+        /// with <see cref="TempDataAttribute"/> is derived from the property name. In releases prior to ASP.NET Core 2.1,
+        /// the calculated key was the property name prefixed by the value <c>TempDataProperty-</c>.
+        /// e.g. <c>TempDataProperty-SuccessMessage</c>. When this option is <c>true</c>, the calculated key for the property is
+        /// the property name e.g. <c>SuccessMessage</c>.
+        /// </para>
+        /// <para>
+        /// Defaults to <c>false</c>.
+        /// </para>
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// This property is associated with a compatibility switch and can provide a different behavior depending on
+        /// the configured compatibility version for the application. See <see cref="CompatibilityVersion"/> for
+        /// guidance and examples of setting the application's compatibility version.
+        /// </para>
+        /// <para>
+        /// Configuring the desired value of the compatibility switch by calling this property's setter will take precedence
+        /// over the value implied by the application's <see cref="CompatibilityVersion"/>.
+        /// </para>
+        /// <para>
+        /// If the application's compatibility version is set to <see cref="CompatibilityVersion.Version_2_0"/> then
+        /// this setting will have the value <c>false</c> unless explicitly configured.
+        /// </para>
+        /// <para>
+        /// If the application's compatibility version is set to <see cref="CompatibilityVersion.Version_2_1"/> or
+        /// higher then this setting will have the value <c>true</c> unless explicitly configured.
+        /// </para>
+        /// </remarks>
+        public bool SuppressTempDataAttributePrefix
+        {
+            get => _suppressTempDataAttributePrefix.Value;
+            set => _suppressTempDataAttributePrefix.Value = value;
+        }
+
+        /// <summary>
+        /// Gets a list <see cref="IViewEngine"/>s used by this application.
+        /// </summary>
+        public IList<IViewEngine> ViewEngines { get; } = new List<IViewEngine>();
+
+        /// <summary>
+        /// Gets a list of <see cref="IClientModelValidatorProvider"/> instances.
+        /// </summary>
+        public IList<IClientModelValidatorProvider> ClientModelValidatorProviders { get; } =
+            new List<IClientModelValidatorProvider>();
+
+        IEnumerator<ICompatibilitySwitch> IEnumerable<ICompatibilitySwitch>.GetEnumerator()
+        {
+            return ((IEnumerable<ICompatibilitySwitch>)_switches).GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() => _switches.GetEnumerator();
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/PartialViewResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/PartialViewResult.cs
new file mode 100644
index 0000000000..e9f2763057
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/PartialViewResult.cs
@@ -0,0 +1,72 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Represents an <see cref="ActionResult"/> that renders a partial view to the response.
+    /// </summary>
+    public class PartialViewResult : ActionResult
+    {
+        /// <summary>
+        /// Gets or sets the HTTP status code.
+        /// </summary>
+        public int? StatusCode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name or path of the partial view that is rendered to the response.
+        /// </summary>
+        /// <remarks>
+        /// When <c>null</c>, defaults to <see cref="ControllerActionDescriptor.ActionName"/>.
+        /// </remarks>
+        public string ViewName { get; set; }
+
+        /// <summary>
+        /// Gets the view data model.
+        /// </summary>
+        public object Model => ViewData?.Model;
+
+        /// <summary>
+        /// Gets or sets the <see cref="ViewDataDictionary"/> used for rendering the view for this result.
+        /// </summary>
+        public ViewDataDictionary ViewData { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ITempDataDictionary"/> used for rendering the view for this result.
+        /// </summary>
+        public ITempDataDictionary TempData { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IViewEngine"/> used to locate views.
+        /// </summary>
+        /// <remarks>When <c>null</c>, an instance of <see cref="ICompositeViewEngine"/> from
+        /// <c>ActionContext.HttpContext.RequestServices</c> is used.</remarks>
+        public IViewEngine ViewEngine { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Content-Type header for the response.
+        /// </summary>
+        public string ContentType { get; set; }
+
+        /// <inheritdoc />
+        public override Task ExecuteResultAsync(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var services = context.HttpContext.RequestServices;
+            var executor = services.GetRequiredService<IActionResultExecutor<PartialViewResult>>();
+            return executor.ExecuteAsync(context, this);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..c49b597b20
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/AssemblyInfo.cs
@@ -0,0 +1,8 @@
+// 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.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ViewFeatures.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..78f9ebcfb6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/Resources.Designer.cs
@@ -0,0 +1,842 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class Resources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.ViewFeatures.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// The view component name '{0}' matched multiple types:{1}{2}
+        /// </summary>
+        internal static string ViewComponent_AmbiguousTypeMatch
+        {
+            get => GetString("ViewComponent_AmbiguousTypeMatch");
+        }
+
+        /// <summary>
+        /// The view component name '{0}' matched multiple types:{1}{2}
+        /// </summary>
+        internal static string FormatViewComponent_AmbiguousTypeMatch(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AmbiguousTypeMatch"), p0, p1, p2);
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' should be declared to return {2}&lt;T&gt;.
+        /// </summary>
+        internal static string ViewComponent_AsyncMethod_ShouldReturnTask
+        {
+            get => GetString("ViewComponent_AsyncMethod_ShouldReturnTask");
+        }
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' should be declared to return {2}&lt;T&gt;.
+        /// </summary>
+        internal static string FormatViewComponent_AsyncMethod_ShouldReturnTask(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AsyncMethod_ShouldReturnTask"), p0, p1, p2);
+
+        /// <summary>
+        /// A view component must return a non-null value.
+        /// </summary>
+        internal static string ViewComponent_MustReturnValue
+        {
+            get => GetString("ViewComponent_MustReturnValue");
+        }
+
+        /// <summary>
+        /// A view component must return a non-null value.
+        /// </summary>
+        internal static string FormatViewComponent_MustReturnValue()
+            => GetString("ViewComponent_MustReturnValue");
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' should be declared to return a value.
+        /// </summary>
+        internal static string ViewComponent_SyncMethod_ShouldReturnValue
+        {
+            get => GetString("ViewComponent_SyncMethod_ShouldReturnValue");
+        }
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' should be declared to return a value.
+        /// </summary>
+        internal static string FormatViewComponent_SyncMethod_ShouldReturnValue(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_SyncMethod_ShouldReturnValue"), p0, p1);
+
+        /// <summary>
+        /// A view component named '{0}' could not be found. A view component must be a public non-abstract class, not contain any generic parameters, and either be decorated with '{1}' or have a class name ending with the '{2}' suffix. A view component must not be decorated with '{3}'.
+        /// </summary>
+        internal static string ViewComponent_CannotFindComponent
+        {
+            get => GetString("ViewComponent_CannotFindComponent");
+        }
+
+        /// <summary>
+        /// A view component named '{0}' could not be found. A view component must be a public non-abstract class, not contain any generic parameters, and either be decorated with '{1}' or have a class name ending with the '{2}' suffix. A view component must not be decorated with '{3}'.
+        /// </summary>
+        internal static string FormatViewComponent_CannotFindComponent(object p0, object p1, object p2, object p3)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_CannotFindComponent"), p0, p1, p2, p3);
+
+        /// <summary>
+        /// An invoker could not be created for the view component '{0}'.
+        /// </summary>
+        internal static string ViewComponent_IViewComponentFactory_ReturnedNull
+        {
+            get => GetString("ViewComponent_IViewComponentFactory_ReturnedNull");
+        }
+
+        /// <summary>
+        /// An invoker could not be created for the view component '{0}'.
+        /// </summary>
+        internal static string FormatViewComponent_IViewComponentFactory_ReturnedNull(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_IViewComponentFactory_ReturnedNull"), p0);
+
+        /// <summary>
+        /// Could not find an '{0}' or '{1}' method for the view component '{2}'.
+        /// </summary>
+        internal static string ViewComponent_CannotFindMethod
+        {
+            get => GetString("ViewComponent_CannotFindMethod");
+        }
+
+        /// <summary>
+        /// Could not find an '{0}' or '{1}' method for the view component '{2}'.
+        /// </summary>
+        internal static string FormatViewComponent_CannotFindMethod(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_CannotFindMethod"), p0, p1, p2);
+
+        /// <summary>
+        /// View components only support returning {0}, {1} or {2}.
+        /// </summary>
+        internal static string ViewComponent_InvalidReturnValue
+        {
+            get => GetString("ViewComponent_InvalidReturnValue");
+        }
+
+        /// <summary>
+        /// View components only support returning {0}, {1} or {2}.
+        /// </summary>
+        internal static string FormatViewComponent_InvalidReturnValue(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_InvalidReturnValue"), p0, p1, p2);
+
+        /// <summary>
+        /// Value cannot be null or empty.
+        /// </summary>
+        internal static string ArgumentCannotBeNullOrEmpty
+        {
+            get => GetString("ArgumentCannotBeNullOrEmpty");
+        }
+
+        /// <summary>
+        /// Value cannot be null or empty.
+        /// </summary>
+        internal static string FormatArgumentCannotBeNullOrEmpty()
+            => GetString("ArgumentCannotBeNullOrEmpty");
+
+        /// <summary>
+        /// The '{0}' property of '{1}' must not be null.
+        /// </summary>
+        internal static string PropertyOfTypeCannotBeNull
+        {
+            get => GetString("PropertyOfTypeCannotBeNull");
+        }
+
+        /// <summary>
+        /// The '{0}' property of '{1}' must not be null.
+        /// </summary>
+        internal static string FormatPropertyOfTypeCannotBeNull(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("PropertyOfTypeCannotBeNull"), p0, p1);
+
+        /// <summary>
+        /// The '{0}' method of type '{1}' cannot return a null value.
+        /// </summary>
+        internal static string TypeMethodMustReturnNotNullValue
+        {
+            get => GetString("TypeMethodMustReturnNotNullValue");
+        }
+
+        /// <summary>
+        /// The '{0}' method of type '{1}' cannot return a null value.
+        /// </summary>
+        internal static string FormatTypeMethodMustReturnNotNullValue(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TypeMethodMustReturnNotNullValue"), p0, p1);
+
+        /// <summary>
+        /// Property '{0}' is of type '{1}', but this method requires a value of type '{2}'.
+        /// </summary>
+        internal static string ArgumentPropertyUnexpectedType
+        {
+            get => GetString("ArgumentPropertyUnexpectedType");
+        }
+
+        /// <summary>
+        /// Property '{0}' is of type '{1}', but this method requires a value of type '{2}'.
+        /// </summary>
+        internal static string FormatArgumentPropertyUnexpectedType(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ArgumentPropertyUnexpectedType"), p0, p1, p2);
+
+        /// <summary>
+        /// The partial view '{0}' was not found or no view engine supports the searched locations. The following locations were searched:{1}
+        /// </summary>
+        internal static string Common_PartialViewNotFound
+        {
+            get => GetString("Common_PartialViewNotFound");
+        }
+
+        /// <summary>
+        /// The partial view '{0}' was not found or no view engine supports the searched locations. The following locations were searched:{1}
+        /// </summary>
+        internal static string FormatCommon_PartialViewNotFound(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("Common_PartialViewNotFound"), p0, p1);
+
+        /// <summary>
+        /// False
+        /// </summary>
+        internal static string Common_TriState_False
+        {
+            get => GetString("Common_TriState_False");
+        }
+
+        /// <summary>
+        /// False
+        /// </summary>
+        internal static string FormatCommon_TriState_False()
+            => GetString("Common_TriState_False");
+
+        /// <summary>
+        /// Not Set
+        /// </summary>
+        internal static string Common_TriState_NotSet
+        {
+            get => GetString("Common_TriState_NotSet");
+        }
+
+        /// <summary>
+        /// Not Set
+        /// </summary>
+        internal static string FormatCommon_TriState_NotSet()
+            => GetString("Common_TriState_NotSet");
+
+        /// <summary>
+        /// True
+        /// </summary>
+        internal static string Common_TriState_True
+        {
+            get => GetString("Common_TriState_True");
+        }
+
+        /// <summary>
+        /// True
+        /// </summary>
+        internal static string FormatCommon_TriState_True()
+            => GetString("Common_TriState_True");
+
+        /// <summary>
+        /// ViewData value must not be null.
+        /// </summary>
+        internal static string DynamicViewData_ViewDataNull
+        {
+            get => GetString("DynamicViewData_ViewDataNull");
+        }
+
+        /// <summary>
+        /// ViewData value must not be null.
+        /// </summary>
+        internal static string FormatDynamicViewData_ViewDataNull()
+            => GetString("DynamicViewData_ViewDataNull");
+
+        /// <summary>
+        /// The expression compiler was unable to evaluate the indexer expression '{0}' because it references the model parameter '{1}' which is unavailable.
+        /// </summary>
+        internal static string ExpressionHelper_InvalidIndexerExpression
+        {
+            get => GetString("ExpressionHelper_InvalidIndexerExpression");
+        }
+
+        /// <summary>
+        /// The expression compiler was unable to evaluate the indexer expression '{0}' because it references the model parameter '{1}' which is unavailable.
+        /// </summary>
+        internal static string FormatExpressionHelper_InvalidIndexerExpression(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ExpressionHelper_InvalidIndexerExpression"), p0, p1);
+
+        /// <summary>
+        /// The IModelMetadataProvider was unable to provide metadata for expression '{0}'.
+        /// </summary>
+        internal static string HtmlHelper_NullModelMetadata
+        {
+            get => GetString("HtmlHelper_NullModelMetadata");
+        }
+
+        /// <summary>
+        /// The IModelMetadataProvider was unable to provide metadata for expression '{0}'.
+        /// </summary>
+        internal static string FormatHtmlHelper_NullModelMetadata(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("HtmlHelper_NullModelMetadata"), p0);
+
+        /// <summary>
+        /// Must call 'Contextualize' method before using this HtmlHelper instance.
+        /// </summary>
+        internal static string HtmlHelper_NotContextualized
+        {
+            get => GetString("HtmlHelper_NotContextualized");
+        }
+
+        /// <summary>
+        /// Must call 'Contextualize' method before using this HtmlHelper instance.
+        /// </summary>
+        internal static string FormatHtmlHelper_NotContextualized()
+            => GetString("HtmlHelper_NotContextualized");
+
+        /// <summary>
+        /// There is no ViewData item of type '{0}' that has the key '{1}'.
+        /// </summary>
+        internal static string HtmlHelper_MissingSelectData
+        {
+            get => GetString("HtmlHelper_MissingSelectData");
+        }
+
+        /// <summary>
+        /// There is no ViewData item of type '{0}' that has the key '{1}'.
+        /// </summary>
+        internal static string FormatHtmlHelper_MissingSelectData(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("HtmlHelper_MissingSelectData"), p0, p1);
+
+        /// <summary>
+        /// The parameter '{0}' must evaluate to an IEnumerable when multiple selection is allowed.
+        /// </summary>
+        internal static string HtmlHelper_SelectExpressionNotEnumerable
+        {
+            get => GetString("HtmlHelper_SelectExpressionNotEnumerable");
+        }
+
+        /// <summary>
+        /// The parameter '{0}' must evaluate to an IEnumerable when multiple selection is allowed.
+        /// </summary>
+        internal static string FormatHtmlHelper_SelectExpressionNotEnumerable(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("HtmlHelper_SelectExpressionNotEnumerable"), p0);
+
+        /// <summary>
+        /// The type '{0}' is not supported. Type must be an {1} that does not have an associated {2}.
+        /// </summary>
+        internal static string HtmlHelper_TypeNotSupported_ForGetEnumSelectList
+        {
+            get => GetString("HtmlHelper_TypeNotSupported_ForGetEnumSelectList");
+        }
+
+        /// <summary>
+        /// The type '{0}' is not supported. Type must be an {1} that does not have an associated {2}.
+        /// </summary>
+        internal static string FormatHtmlHelper_TypeNotSupported_ForGetEnumSelectList(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("HtmlHelper_TypeNotSupported_ForGetEnumSelectList"), p0, p1, p2);
+
+        /// <summary>
+        /// The ViewData item that has the key '{0}' is of type '{1}' but must be of type '{2}'.
+        /// </summary>
+        internal static string HtmlHelper_WrongSelectDataType
+        {
+            get => GetString("HtmlHelper_WrongSelectDataType");
+        }
+
+        /// <summary>
+        /// The ViewData item that has the key '{0}' is of type '{1}' but must be of type '{2}'.
+        /// </summary>
+        internal static string FormatHtmlHelper_WrongSelectDataType(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("HtmlHelper_WrongSelectDataType"), p0, p1, p2);
+
+        /// <summary>
+        /// The '{0}' template was used with an object of type '{1}', which does not implement '{2}'.
+        /// </summary>
+        internal static string Templates_TypeMustImplementIEnumerable
+        {
+            get => GetString("Templates_TypeMustImplementIEnumerable");
+        }
+
+        /// <summary>
+        /// The '{0}' template was used with an object of type '{1}', which does not implement '{2}'.
+        /// </summary>
+        internal static string FormatTemplates_TypeMustImplementIEnumerable(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("Templates_TypeMustImplementIEnumerable"), p0, p1, p2);
+
+        /// <summary>
+        /// Templates can be used only with field access, property access, single-dimension array index, or single-parameter custom indexer expressions.
+        /// </summary>
+        internal static string TemplateHelpers_TemplateLimitations
+        {
+            get => GetString("TemplateHelpers_TemplateLimitations");
+        }
+
+        /// <summary>
+        /// Templates can be used only with field access, property access, single-dimension array index, or single-parameter custom indexer expressions.
+        /// </summary>
+        internal static string FormatTemplateHelpers_TemplateLimitations()
+            => GetString("TemplateHelpers_TemplateLimitations");
+
+        /// <summary>
+        /// Unable to locate an appropriate template for type {0}.
+        /// </summary>
+        internal static string TemplateHelpers_NoTemplate
+        {
+            get => GetString("TemplateHelpers_NoTemplate");
+        }
+
+        /// <summary>
+        /// Unable to locate an appropriate template for type {0}.
+        /// </summary>
+        internal static string FormatTemplateHelpers_NoTemplate(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TemplateHelpers_NoTemplate"), p0);
+
+        /// <summary>
+        /// The model item passed is null, but this ViewDataDictionary instance requires a non-null model item of type '{0}'.
+        /// </summary>
+        internal static string ViewData_ModelCannotBeNull
+        {
+            get => GetString("ViewData_ModelCannotBeNull");
+        }
+
+        /// <summary>
+        /// The model item passed is null, but this ViewDataDictionary instance requires a non-null model item of type '{0}'.
+        /// </summary>
+        internal static string FormatViewData_ModelCannotBeNull(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewData_ModelCannotBeNull"), p0);
+
+        /// <summary>
+        /// The model item passed into the ViewDataDictionary is of type '{0}', but this ViewDataDictionary instance requires a model item of type '{1}'.
+        /// </summary>
+        internal static string ViewData_WrongTModelType
+        {
+            get => GetString("ViewData_WrongTModelType");
+        }
+
+        /// <summary>
+        /// The model item passed into the ViewDataDictionary is of type '{0}', but this ViewDataDictionary instance requires a model item of type '{1}'.
+        /// </summary>
+        internal static string FormatViewData_WrongTModelType(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewData_WrongTModelType"), p0, p1);
+
+        /// <summary>
+        /// The partial view '{0}' was not found. The following locations were searched:{1}
+        /// </summary>
+        internal static string ViewEngine_PartialViewNotFound
+        {
+            get => GetString("ViewEngine_PartialViewNotFound");
+        }
+
+        /// <summary>
+        /// The partial view '{0}' was not found. The following locations were searched:{1}
+        /// </summary>
+        internal static string FormatViewEngine_PartialViewNotFound(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewEngine_PartialViewNotFound"), p0, p1);
+
+        /// <summary>
+        /// The view '{0}' was not found. The following locations were searched:{1}
+        /// </summary>
+        internal static string ViewEngine_ViewNotFound
+        {
+            get => GetString("ViewEngine_ViewNotFound");
+        }
+
+        /// <summary>
+        /// The view '{0}' was not found. The following locations were searched:{1}
+        /// </summary>
+        internal static string FormatViewEngine_ViewNotFound(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewEngine_ViewNotFound"), p0, p1);
+
+        /// <summary>
+        /// The value must be greater than or equal to zero.
+        /// </summary>
+        internal static string HtmlHelper_TextAreaParameterOutOfRange
+        {
+            get => GetString("HtmlHelper_TextAreaParameterOutOfRange");
+        }
+
+        /// <summary>
+        /// The value must be greater than or equal to zero.
+        /// </summary>
+        internal static string FormatHtmlHelper_TextAreaParameterOutOfRange()
+            => GetString("HtmlHelper_TextAreaParameterOutOfRange");
+
+        /// <summary>
+        /// Validation parameter names in unobtrusive client validation rules cannot be empty. Client rule type: {0}
+        /// </summary>
+        internal static string UnobtrusiveJavascript_ValidationParameterCannotBeEmpty
+        {
+            get => GetString("UnobtrusiveJavascript_ValidationParameterCannotBeEmpty");
+        }
+
+        /// <summary>
+        /// Validation parameter names in unobtrusive client validation rules cannot be empty. Client rule type: {0}
+        /// </summary>
+        internal static string FormatUnobtrusiveJavascript_ValidationParameterCannotBeEmpty(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("UnobtrusiveJavascript_ValidationParameterCannotBeEmpty"), p0);
+
+        /// <summary>
+        /// Validation parameter names in unobtrusive client validation rules must start with a lowercase letter and consist of only lowercase letters or digits. Validation parameter name: {0}, client rule type: {1}
+        /// </summary>
+        internal static string UnobtrusiveJavascript_ValidationParameterMustBeLegal
+        {
+            get => GetString("UnobtrusiveJavascript_ValidationParameterMustBeLegal");
+        }
+
+        /// <summary>
+        /// Validation parameter names in unobtrusive client validation rules must start with a lowercase letter and consist of only lowercase letters or digits. Validation parameter name: {0}, client rule type: {1}
+        /// </summary>
+        internal static string FormatUnobtrusiveJavascript_ValidationParameterMustBeLegal(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("UnobtrusiveJavascript_ValidationParameterMustBeLegal"), p0, p1);
+
+        /// <summary>
+        /// Validation type names in unobtrusive client validation rules cannot be empty. Client rule type: {0}
+        /// </summary>
+        internal static string UnobtrusiveJavascript_ValidationTypeCannotBeEmpty
+        {
+            get => GetString("UnobtrusiveJavascript_ValidationTypeCannotBeEmpty");
+        }
+
+        /// <summary>
+        /// Validation type names in unobtrusive client validation rules cannot be empty. Client rule type: {0}
+        /// </summary>
+        internal static string FormatUnobtrusiveJavascript_ValidationTypeCannotBeEmpty(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("UnobtrusiveJavascript_ValidationTypeCannotBeEmpty"), p0);
+
+        /// <summary>
+        /// Validation type names in unobtrusive client validation rules must consist of only lowercase letters. Invalid name: "{0}", client rule type: {1}
+        /// </summary>
+        internal static string UnobtrusiveJavascript_ValidationTypeMustBeLegal
+        {
+            get => GetString("UnobtrusiveJavascript_ValidationTypeMustBeLegal");
+        }
+
+        /// <summary>
+        /// Validation type names in unobtrusive client validation rules must consist of only lowercase letters. Invalid name: "{0}", client rule type: {1}
+        /// </summary>
+        internal static string FormatUnobtrusiveJavascript_ValidationTypeMustBeLegal(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("UnobtrusiveJavascript_ValidationTypeMustBeLegal"), p0, p1);
+
+        /// <summary>
+        /// Validation type names in unobtrusive client validation rules must be unique. The following validation type was seen more than once: {0}
+        /// </summary>
+        internal static string UnobtrusiveJavascript_ValidationTypeMustBeUnique
+        {
+            get => GetString("UnobtrusiveJavascript_ValidationTypeMustBeUnique");
+        }
+
+        /// <summary>
+        /// Validation type names in unobtrusive client validation rules must be unique. The following validation type was seen more than once: {0}
+        /// </summary>
+        internal static string FormatUnobtrusiveJavascript_ValidationTypeMustBeUnique(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("UnobtrusiveJavascript_ValidationTypeMustBeUnique"), p0);
+
+        /// <summary>
+        /// The type '{0}' must derive from '{1}'.
+        /// </summary>
+        internal static string TypeMustDeriveFromType
+        {
+            get => GetString("TypeMustDeriveFromType");
+        }
+
+        /// <summary>
+        /// The type '{0}' must derive from '{1}'.
+        /// </summary>
+        internal static string FormatTypeMustDeriveFromType(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TypeMustDeriveFromType"), p0, p1);
+
+        /// <summary>
+        /// Could not find a replacement for view expansion token '{0}'.
+        /// </summary>
+        internal static string TemplatedViewLocationExpander_NoReplacementToken
+        {
+            get => GetString("TemplatedViewLocationExpander_NoReplacementToken");
+        }
+
+        /// <summary>
+        /// Could not find a replacement for view expansion token '{0}'.
+        /// </summary>
+        internal static string FormatTemplatedViewLocationExpander_NoReplacementToken(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TemplatedViewLocationExpander_NoReplacementToken"), p0);
+
+        /// <summary>
+        /// {0} must be executed before {1} can be invoked.
+        /// </summary>
+        internal static string TemplatedExpander_PopulateValuesMustBeInvokedFirst
+        {
+            get => GetString("TemplatedExpander_PopulateValuesMustBeInvokedFirst");
+        }
+
+        /// <summary>
+        /// {0} must be executed before {1} can be invoked.
+        /// </summary>
+        internal static string FormatTemplatedExpander_PopulateValuesMustBeInvokedFirst(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TemplatedExpander_PopulateValuesMustBeInvokedFirst"), p0, p1);
+
+        /// <summary>
+        /// The result of value factory cannot be null.
+        /// </summary>
+        internal static string TemplatedExpander_ValueFactoryCannotReturnNull
+        {
+            get => GetString("TemplatedExpander_ValueFactoryCannotReturnNull");
+        }
+
+        /// <summary>
+        /// The result of value factory cannot be null.
+        /// </summary>
+        internal static string FormatTemplatedExpander_ValueFactoryCannotReturnNull()
+            => GetString("TemplatedExpander_ValueFactoryCannotReturnNull");
+
+        /// <summary>
+        /// Type: '{0}' - Name: '{1}'
+        /// </summary>
+        internal static string ViewComponent_AmbiguousTypeMatch_Item
+        {
+            get => GetString("ViewComponent_AmbiguousTypeMatch_Item");
+        }
+
+        /// <summary>
+        /// Type: '{0}' - Name: '{1}'
+        /// </summary>
+        internal static string FormatViewComponent_AmbiguousTypeMatch_Item(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AmbiguousTypeMatch_Item"), p0, p1);
+
+        /// <summary>
+        /// The property {0}.{1} could not be found.
+        /// </summary>
+        internal static string Common_PropertyNotFound
+        {
+            get => GetString("Common_PropertyNotFound");
+        }
+
+        /// <summary>
+        /// The property {0}.{1} could not be found.
+        /// </summary>
+        internal static string FormatCommon_PropertyNotFound(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("Common_PropertyNotFound"), p0, p1);
+
+        /// <summary>
+        /// No URL for remote validation could be found.
+        /// </summary>
+        internal static string RemoteAttribute_NoUrlFound
+        {
+            get => GetString("RemoteAttribute_NoUrlFound");
+        }
+
+        /// <summary>
+        /// No URL for remote validation could be found.
+        /// </summary>
+        internal static string FormatRemoteAttribute_NoUrlFound()
+            => GetString("RemoteAttribute_NoUrlFound");
+
+        /// <summary>
+        /// '{0}' is invalid.
+        /// </summary>
+        internal static string RemoteAttribute_RemoteValidationFailed
+        {
+            get => GetString("RemoteAttribute_RemoteValidationFailed");
+        }
+
+        /// <summary>
+        /// '{0}' is invalid.
+        /// </summary>
+        internal static string FormatRemoteAttribute_RemoteValidationFailed(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("RemoteAttribute_RemoteValidationFailed"), p0);
+
+        /// <summary>
+        /// The name of an HTML field cannot be null or empty. Instead use methods {0}.{1} or {2}.{3} with a non-empty {4} argument value.
+        /// </summary>
+        internal static string HtmlGenerator_FieldNameCannotBeNullOrEmpty
+        {
+            get => GetString("HtmlGenerator_FieldNameCannotBeNullOrEmpty");
+        }
+
+        /// <summary>
+        /// The name of an HTML field cannot be null or empty. Instead use methods {0}.{1} or {2}.{3} with a non-empty {4} argument value.
+        /// </summary>
+        internal static string FormatHtmlGenerator_FieldNameCannotBeNullOrEmpty(object p0, object p1, object p2, object p3, object p4)
+            => string.Format(CultureInfo.CurrentCulture, GetString("HtmlGenerator_FieldNameCannotBeNullOrEmpty"), p0, p1, p2, p3, p4);
+
+        /// <summary>
+        /// Either the '{0}' or '{1}' property must be set in order to invoke a view component.
+        /// </summary>
+        internal static string ViewComponentResult_NameOrTypeMustBeSet
+        {
+            get => GetString("ViewComponentResult_NameOrTypeMustBeSet");
+        }
+
+        /// <summary>
+        /// Either the '{0}' or '{1}' property must be set in order to invoke a view component.
+        /// </summary>
+        internal static string FormatViewComponentResult_NameOrTypeMustBeSet(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponentResult_NameOrTypeMustBeSet"), p0, p1);
+
+        /// <summary>
+        /// Cannot deserialize {0} of type '{1}'.
+        /// </summary>
+        internal static string TempData_CannotDeserializeToken
+        {
+            get => GetString("TempData_CannotDeserializeToken");
+        }
+
+        /// <summary>
+        /// Cannot deserialize {0} of type '{1}'.
+        /// </summary>
+        internal static string FormatTempData_CannotDeserializeToken(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TempData_CannotDeserializeToken"), p0, p1);
+
+        /// <summary>
+        /// The '{0}' cannot serialize a dictionary with a key of type '{1}'. The key must be of type '{2}'.
+        /// </summary>
+        internal static string TempData_CannotSerializeDictionary
+        {
+            get => GetString("TempData_CannotSerializeDictionary");
+        }
+
+        /// <summary>
+        /// The '{0}' cannot serialize a dictionary with a key of type '{1}'. The key must be of type '{2}'.
+        /// </summary>
+        internal static string FormatTempData_CannotSerializeDictionary(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TempData_CannotSerializeDictionary"), p0, p1, p2);
+
+        /// <summary>
+        /// The '{0}' cannot serialize an object of type '{1}'.
+        /// </summary>
+        internal static string TempData_CannotSerializeType
+        {
+            get => GetString("TempData_CannotSerializeType");
+        }
+
+        /// <summary>
+        /// The '{0}' cannot serialize an object of type '{1}'.
+        /// </summary>
+        internal static string FormatTempData_CannotSerializeType(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TempData_CannotSerializeType"), p0, p1);
+
+        /// <summary>
+        /// The collection already contains an entry with key '{0}'.
+        /// </summary>
+        internal static string Dictionary_DuplicateKey
+        {
+            get => GetString("Dictionary_DuplicateKey");
+        }
+
+        /// <summary>
+        /// The collection already contains an entry with key '{0}'.
+        /// </summary>
+        internal static string FormatDictionary_DuplicateKey(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("Dictionary_DuplicateKey"), p0);
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' cannot return a {2}.
+        /// </summary>
+        internal static string ViewComponent_SyncMethod_CannotReturnTask
+        {
+            get => GetString("ViewComponent_SyncMethod_CannotReturnTask");
+        }
+
+        /// <summary>
+        /// Method '{0}' of view component '{1}' cannot return a {2}.
+        /// </summary>
+        internal static string FormatViewComponent_SyncMethod_CannotReturnTask(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_SyncMethod_CannotReturnTask"), p0, p1, p2);
+
+        /// <summary>
+        /// View component '{0}' must have exactly one public method named '{1}' or '{2}'.
+        /// </summary>
+        internal static string ViewComponent_AmbiguousMethods
+        {
+            get => GetString("ViewComponent_AmbiguousMethods");
+        }
+
+        /// <summary>
+        /// View component '{0}' must have exactly one public method named '{1}' or '{2}'.
+        /// </summary>
+        internal static string FormatViewComponent_AmbiguousMethods(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AmbiguousMethods"), p0, p1, p2);
+
+        /// <summary>
+        /// The type '{0}' cannot be activated by '{1}' because it is either a value type, an interface, an abstract class or an open generic type.
+        /// </summary>
+        internal static string ValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated
+        {
+            get => GetString("ValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated");
+        }
+
+        /// <summary>
+        /// The type '{0}' cannot be activated by '{1}' because it is either a value type, an interface, an abstract class or an open generic type.
+        /// </summary>
+        internal static string FormatValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated"), p0, p1);
+
+        /// <summary>
+        /// The {0} was unable to provide metadata for expression '{1}'.
+        /// </summary>
+        internal static string CreateModelExpression_NullModelMetadata
+        {
+            get => GetString("CreateModelExpression_NullModelMetadata");
+        }
+
+        /// <summary>
+        /// The {0} was unable to provide metadata for expression '{1}'.
+        /// </summary>
+        internal static string FormatCreateModelExpression_NullModelMetadata(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("CreateModelExpression_NullModelMetadata"), p0, p1);
+
+        /// <summary>
+        /// '{0}.{1}' must not be empty. At least one '{2}' is required to locate a view for rendering.
+        /// </summary>
+        internal static string ViewEnginesAreRequired
+        {
+            get => GetString("ViewEnginesAreRequired");
+        }
+
+        /// <summary>
+        /// '{0}.{1}' must not be empty. At least one '{2}' is required to locate a view for rendering.
+        /// </summary>
+        internal static string FormatViewEnginesAreRequired(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("ViewEnginesAreRequired"), p0, p1, p2);
+
+        /// <summary>
+        /// The '{0}.{1}' property with {2} is invalid.
+        /// </summary>
+        internal static string TempDataProperties_InvalidType
+        {
+            get => GetString("TempDataProperties_InvalidType");
+        }
+
+        /// <summary>
+        /// The '{0}.{1}' property with {2} is invalid.
+        /// </summary>
+        internal static string FormatTempDataProperties_InvalidType(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TempDataProperties_InvalidType"), p0, p1, p2);
+
+        /// <summary>
+        /// The '{0}.{1}' property with {2} is invalid. A property using {2} must have a public getter and setter.
+        /// </summary>
+        internal static string TempDataProperties_PublicGetterSetter
+        {
+            get => GetString("TempDataProperties_PublicGetterSetter");
+        }
+
+        /// <summary>
+        /// The '{0}.{1}' property with {2} is invalid. A property using {2} must have a public getter and setter.
+        /// </summary>
+        internal static string FormatTempDataProperties_PublicGetterSetter(object p0, object p1, object p2)
+            => string.Format(CultureInfo.CurrentCulture, GetString("TempDataProperties_PublicGetterSetter"), p0, p1, p2);
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/RemoteAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/RemoteAttribute.cs
new file mode 100644
index 0000000000..119ba657a3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/RemoteAttribute.cs
@@ -0,0 +1,320 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A <see cref="ValidationAttribute"/> which configures Unobtrusive validation to send an Ajax request to the
+    /// web site. The invoked action should return JSON indicating whether the value is valid.
+    /// </summary>
+    /// <remarks>Does no server-side validation of the final form submission.</remarks>
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
+    public class RemoteAttribute : ValidationAttribute, IClientModelValidator
+    {
+        private string _additionalFields = string.Empty;
+        private string[] _additionalFieldsSplit = Array.Empty<string>();
+        private bool _checkedForLocalizer;
+        private IStringLocalizer _stringLocalizer;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemoteAttribute"/> class.
+        /// </summary>
+        /// <remarks>
+        /// Intended for subclasses that support URL generation with no route, action, or controller names.
+        /// </remarks>
+        protected RemoteAttribute()
+            : base(errorMessageAccessor: () => Resources.RemoteAttribute_RemoteValidationFailed)
+        {
+            RouteData = new RouteValueDictionary();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemoteAttribute"/> class.
+        /// </summary>
+        /// <param name="routeName">
+        /// The route name used when generating the URL where client should send a validation request.
+        /// </param>
+        /// <remarks>
+        /// Finds the <paramref name="routeName"/> in any area of the application.
+        /// </remarks>
+        public RemoteAttribute(string routeName)
+            : this()
+        {
+            RouteName = routeName;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemoteAttribute"/> class.
+        /// </summary>
+        /// <param name="action">
+        /// The action name used when generating the URL where client should send a validation request.
+        /// </param>
+        /// <param name="controller">
+        /// The controller name used when generating the URL where client should send a validation request.
+        /// </param>
+        /// <remarks>
+        /// <para>
+        /// If either <paramref name="action"/> or <paramref name="controller"/> is <c>null</c>, uses the corresponding
+        /// ambient value.
+        /// </para>
+        /// <para>Finds the <paramref name="controller"/> in the current area.</para>
+        /// </remarks>
+        public RemoteAttribute(string action, string controller)
+            : this()
+        {
+            if (action != null)
+            {
+                RouteData["action"] = action;
+            }
+
+            if (controller != null)
+            {
+                RouteData["controller"] = controller;
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemoteAttribute"/> class.
+        /// </summary>
+        /// <param name="action">
+        /// The action name used when generating the URL where client should send a validation request.
+        /// </param>
+        /// <param name="controller">
+        /// The controller name used when generating the URL where client should send a validation request.
+        /// </param>
+        /// <param name="areaName">The name of the area containing the <paramref name="controller"/>.</param>
+        /// <remarks>
+        /// <para>
+        /// If either <paramref name="action"/> or <paramref name="controller"/> is <c>null</c>, uses the corresponding
+        /// ambient value.
+        /// </para>
+        /// If <paramref name="areaName"/> is <c>null</c>, finds the <paramref name="controller"/> in the root area.
+        /// Use the <see cref="RemoteAttribute(string, string)"/> overload find the <paramref name="controller"/> in
+        /// the current area. Or explicitly pass the current area's name as the <paramref name="areaName"/> argument to
+        /// this overload.
+        /// </remarks>
+        public RemoteAttribute(string action, string controller, string areaName)
+            : this(action, controller)
+        {
+            RouteData["area"] = areaName;
+        }
+
+        /// <summary>
+        /// Gets or sets the HTTP method (<c>"Get"</c> or <c>"Post"</c>) client should use when sending a validation
+        /// request.
+        /// </summary>
+        public string HttpMethod { get; set; }
+
+        /// <summary>
+        /// Gets or sets the comma-separated names of fields the client should include in a validation request.
+        /// </summary>
+        public string AdditionalFields
+        {
+            get => _additionalFields;
+            set
+            {
+                _additionalFields = value ?? string.Empty;
+                _additionalFieldsSplit = SplitAndTrimPropertyNames(value)
+                    .Select(field => FormatPropertyForClientValidation(field))
+                    .ToArray();
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="RouteValueDictionary"/> used when generating the URL where client should send a
+        /// validation request.
+        /// </summary>
+        protected RouteValueDictionary RouteData { get; }
+
+        /// <summary>
+        /// Gets or sets the route name used when generating the URL where client should send a validation request.
+        /// </summary>
+        protected string RouteName { get; set; }
+
+        /// <summary>
+        /// Formats <paramref name="property"/> and <see cref="AdditionalFields"/> for use in generated HTML.
+        /// </summary>
+        /// <param name="property">
+        /// Name of the property associated with this <see cref="RemoteAttribute"/> instance.
+        /// </param>
+        /// <returns>Comma-separated names of fields the client should include in a validation request.</returns>
+        /// <remarks>
+        /// Excludes any whitespace from <see cref="AdditionalFields"/> in the return value.
+        /// Prefixes each field name in the return value with <c>"*."</c>.
+        /// </remarks>
+        public string FormatAdditionalFieldsForClientValidation(string property)
+        {
+            if (string.IsNullOrEmpty(property))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(property));
+            }
+
+            var delimitedAdditionalFields = string.Join(",", _additionalFieldsSplit);
+            if (!string.IsNullOrEmpty(delimitedAdditionalFields))
+            {
+                delimitedAdditionalFields = "," + delimitedAdditionalFields;
+            }
+
+            var formattedString = FormatPropertyForClientValidation(property) + delimitedAdditionalFields;
+
+            return formattedString;
+        }
+
+        /// <summary>
+        /// Formats <paramref name="property"/> for use in generated HTML.
+        /// </summary>
+        /// <param name="property">One field name the client should include in a validation request.</param>
+        /// <returns>Name of a field the client should include in a validation request.</returns>
+        /// <remarks>Returns <paramref name="property"/> with a <c>"*."</c> prefix.</remarks>
+        public static string FormatPropertyForClientValidation(string property)
+        {
+            if (string.IsNullOrEmpty(property))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(property));
+            }
+
+            return "*." + property;
+        }
+
+        /// <summary>
+        /// Returns the URL where the client should send a validation request.
+        /// </summary>
+        /// <param name="context">The <see cref="ClientModelValidationContext"/> used to generate the URL.</param>
+        /// <returns>The URL where the client should send a validation request.</returns>
+        protected virtual string GetUrl(ClientModelValidationContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var services = context.ActionContext.HttpContext.RequestServices;
+            var factory = services.GetRequiredService<IUrlHelperFactory>();
+            var urlHelper = factory.GetUrlHelper(context.ActionContext);
+
+            var url = urlHelper.RouteUrl(new UrlRouteContext()
+            {
+                RouteName = this.RouteName,
+                Values = RouteData,
+            });
+
+            if (url == null)
+            {
+                throw new InvalidOperationException(Resources.RemoteAttribute_NoUrlFound);
+            }
+
+            return url;
+        }
+
+        /// <inheritdoc />
+        public override string FormatErrorMessage(string name)
+        {
+            return string.Format(CultureInfo.CurrentCulture, ErrorMessageString, name);
+        }
+
+        /// <inheritdoc />
+        /// <remarks>
+        /// Always returns <c>true</c> since this <see cref="ValidationAttribute"/> does no validation itself.
+        /// Related validations occur only when the client sends a validation request.
+        /// </remarks>
+        public override bool IsValid(object value)
+        {
+            return true;
+        }
+
+        public virtual void AddValidation(ClientModelValidationContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            MergeAttribute(context.Attributes, "data-val", "true");
+
+            CheckForLocalizer(context);
+            var errorMessage = GetErrorMessage(context.ModelMetadata.GetDisplayName());
+            MergeAttribute(context.Attributes, "data-val-remote", errorMessage);
+
+            MergeAttribute(context.Attributes, "data-val-remote-url", GetUrl(context));
+
+            if (!string.IsNullOrEmpty(HttpMethod))
+            {
+                MergeAttribute(context.Attributes, "data-val-remote-type", HttpMethod);
+            }
+
+            var additionalFields = FormatAdditionalFieldsForClientValidation(context.ModelMetadata.PropertyName);
+            MergeAttribute(context.Attributes, "data-val-remote-additionalfields", additionalFields);
+        }
+
+        private static void MergeAttribute(IDictionary<string, string> attributes, string key, string value)
+        {
+            if (!attributes.ContainsKey(key))
+            {
+                attributes.Add(key, value);
+            }
+        }
+
+        private static IEnumerable<string> SplitAndTrimPropertyNames(string original)
+        {
+            if (string.IsNullOrEmpty(original))
+            {
+                return Array.Empty<string>();
+            }
+
+            var split = original
+                .Split(',')
+                .Select(piece => piece.Trim())
+                .Where(trimmed => !string.IsNullOrEmpty(trimmed));
+
+            return split;
+        }
+
+        private void CheckForLocalizer(ClientModelValidationContext context)
+        {
+            if (!_checkedForLocalizer)
+            {
+                _checkedForLocalizer = true;
+
+                var services = context.ActionContext.HttpContext.RequestServices;
+                var options = services.GetRequiredService<IOptions<MvcDataAnnotationsLocalizationOptions>>();
+                var factory = services.GetService<IStringLocalizerFactory>();
+
+                var provider = options.Value.DataAnnotationLocalizerProvider;
+                if (factory != null && provider != null)
+                {
+                    _stringLocalizer = provider(
+                        context.ModelMetadata.ContainerType ?? context.ModelMetadata.ModelType,
+                        factory);
+                }
+            }
+        }
+
+        private string GetErrorMessage(string displayName)
+        {
+            if (_stringLocalizer != null &&
+                !string.IsNullOrEmpty(ErrorMessage) &&
+                string.IsNullOrEmpty(ErrorMessageResourceName) &&
+                ErrorMessageResourceType == null)
+            {
+                return _stringLocalizer[ErrorMessage, displayName];
+            }
+
+            return FormatErrorMessage(displayName);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/FormMethod.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/FormMethod.cs
new file mode 100644
index 0000000000..b765d4877b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/FormMethod.cs
@@ -0,0 +1,11 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public enum FormMethod
+    {
+        Get,
+        Post
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/Html5DateRenderingMode.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/Html5DateRenderingMode.cs
new file mode 100644
index 0000000000..60eac82a91
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/Html5DateRenderingMode.cs
@@ -0,0 +1,23 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Controls the value-rendering method For HTML5 input elements of types such as date, time, datetime and
+    /// datetime-local.
+    /// </summary>
+    public enum Html5DateRenderingMode
+    {
+        /// <summary>
+        /// Render date and time values as Rfc3339 compliant strings to support HTML5 date and time types of input
+        /// elements.
+        /// </summary>
+        Rfc3339 = 0,
+
+        /// <summary>
+        /// Render date and time values according to the current culture's ToString behavior.
+        /// </summary>
+        CurrentCulture,
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayExtensions.cs
new file mode 100644
index 0000000000..4bb28b35d6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayExtensions.cs
@@ -0,0 +1,675 @@
+// 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.
+
+using System;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Display-related extensions for <see cref="IHtmlHelper"/> and <see cref="IHtmlHelper{TModel}"/>.
+    /// </summary>
+    public static class HtmlHelperDisplayExtensions
+    {
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using a display template. The template is found
+        /// using the <paramref name="expression"/>'s <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">
+        /// Expression name, relative to the current model. May identify a single property or an
+        /// <see cref="object"/> that contains the properties to display.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the created HTML.</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> display template includes markup for each property in the
+        /// <paramref name="expression"/>'s value.
+        /// </para>
+        /// <para>
+        /// Example <paramref name="expression"/>s include <c>string.Empty</c> which identifies the current model and
+        /// <c>"prop"</c> which identifies the current model's "prop" property.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>DisplayTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent Display(this IHtmlHelper htmlHelper, string expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Display(expression, templateName: null, htmlFieldName: null, additionalViewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using a display template and specified
+        /// additional view data. The template is found using the <paramref name="expression"/>'s
+        /// <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">
+        /// Expression name, relative to the current model. May identify a single property or an
+        /// <see cref="object"/> that contains the properties to display.
+        /// </param>
+        /// <param name="additionalViewData">
+        /// An anonymous <see cref="object"/> or <see cref="System.Collections.Generic.IDictionary{String, Object}"/>
+        /// that can contain additional view data that will be merged into the
+        /// <see cref="ViewFeatures.ViewDataDictionary{TModel}"/> instance created for the template.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the created HTML.</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> display template includes markup for each property in the
+        /// <paramref name="expression"/>'s value.
+        /// </para>
+        /// <para>
+        /// Example <paramref name="expression"/>s include <c>string.Empty</c> which identifies the current model and
+        /// <c>"prop"</c> which identifies the current model's "prop" property.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>DisplayTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent Display(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            object additionalViewData)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Display(
+                expression,
+                templateName: null,
+                htmlFieldName: null,
+                additionalViewData: additionalViewData);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using a display template. The template is found
+        /// using the <paramref name="templateName"/> or the <paramref name="expression"/>'s
+        /// <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">
+        /// Expression name, relative to the current model. May identify a single property or an
+        /// <see cref="object"/> that contains the properties to display.
+        /// </param>
+        /// <param name="templateName">The name of the template used to create the HTML markup.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the created HTML.</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> display template includes markup for each property in the
+        /// <paramref name="expression"/>'s value.
+        /// </para>
+        /// <para>
+        /// Example <paramref name="expression"/>s include <c>string.Empty</c> which identifies the current model and
+        /// <c>"prop"</c> which identifies the current model's "prop" property.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>DisplayTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent Display(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            string templateName)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Display(expression, templateName, htmlFieldName: null, additionalViewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using a display template and specified
+        /// additional view data. The template is found using the <paramref name="templateName"/> or the
+        /// <paramref name="expression"/>'s <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">
+        /// Expression name, relative to the current model. May identify a single property or an
+        /// <see cref="object"/> that contains the properties to display.
+        /// </param>
+        /// <param name="templateName">The name of the template used to create the HTML markup.</param>
+        /// <param name="additionalViewData">
+        /// An anonymous <see cref="object"/> or <see cref="System.Collections.Generic.IDictionary{String, Object}"/>
+        /// that can contain additional view data that will be merged into the
+        /// <see cref="ViewFeatures.ViewDataDictionary{TModel}"/> instance created for the template.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the created HTML.</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> display template includes markup for each property in the
+        /// <paramref name="expression"/>'s value.
+        /// </para>
+        /// <para>
+        /// Example <paramref name="expression"/>s include <c>string.Empty</c> which identifies the current model and
+        /// <c>"prop"</c> which identifies the current model's "prop" property.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>DisplayTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent Display(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            string templateName,
+            object additionalViewData)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Display(
+                expression,
+                templateName,
+                htmlFieldName: null,
+                additionalViewData: additionalViewData);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using a display template and specified HTML
+        /// field name. The template is found using the <paramref name="templateName"/> or the
+        /// <paramref name="expression"/>'s<see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">
+        /// Expression name, relative to the current model. May identify a single property or an
+        /// <see cref="object"/> that contains the properties to display.
+        /// </param>
+        /// <param name="templateName">The name of the template used to create the HTML markup.</param>
+        /// <param name="htmlFieldName">
+        /// A <see cref="string"/> used to disambiguate the names of HTML elements that are created for
+        /// properties that have the same name.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the created HTML.</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> display template includes markup for each property in the
+        /// <paramref name="expression"/>'s value.
+        /// </para>
+        /// <para>
+        /// Example <paramref name="expression"/>s include <c>string.Empty</c> which identifies the current model and
+        /// <c>"prop"</c> which identifies the current model's "prop" property.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>DisplayTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent Display(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            string templateName,
+            string htmlFieldName)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Display(expression, templateName, htmlFieldName, additionalViewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using a display template. The template is found
+        /// using the <paramref name="expression"/>'s <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the created HTML.</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> display template includes markup for each property in the
+        /// <paramref name="expression"/> result.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>DisplayTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent DisplayFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.DisplayFor(
+                expression,
+                templateName: null,
+                htmlFieldName: null,
+                additionalViewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using a display template and specified
+        /// additional view data. The template is found using the <paramref name="expression"/>'s
+        /// <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="additionalViewData">
+        /// An anonymous <see cref="object"/> or <see cref="System.Collections.Generic.IDictionary{String, Object}"/>
+        /// that can contain additional view data that will be merged into the
+        /// <see cref="ViewFeatures.ViewDataDictionary{TModel}"/> instance created for the template.
+        /// </param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the created HTML.</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> display template includes markup for each property in the
+        /// <paramref name="expression"/> result.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>DisplayTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent DisplayFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression,
+            object additionalViewData)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.DisplayFor(
+                expression,
+                templateName: null,
+                htmlFieldName: null,
+                additionalViewData: additionalViewData);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using a display template. The template is found
+        /// using the <paramref name="templateName"/> or the <paramref name="expression"/>'s
+        /// <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="templateName">The name of the template used to create the HTML markup.</param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the created HTML.</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> display template includes markup for each property in the
+        /// <paramref name="expression"/> result.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>DisplayTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent DisplayFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression,
+            string templateName)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.DisplayFor(
+                expression,
+                templateName,
+                htmlFieldName: null,
+                additionalViewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using a display template and specified
+        /// additional view data. The template is found using the <paramref name="templateName"/> or the
+        /// <paramref name="expression"/>'s <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="templateName">The name of the template used to create the HTML markup.</param>
+        /// <param name="additionalViewData">
+        /// An anonymous <see cref="object"/> or <see cref="System.Collections.Generic.IDictionary{String, Object}"/>
+        /// that can contain additional view data that will be merged into the
+        /// <see cref="ViewFeatures.ViewDataDictionary{TModel}"/> instance created for the template.
+        /// </param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the created HTML.</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> display template includes markup for each property in the
+        /// <paramref name="expression"/> result.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>DisplayTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent DisplayFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression,
+            string templateName,
+            object additionalViewData)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.DisplayFor(
+                expression,
+                templateName,
+                htmlFieldName: null,
+                additionalViewData: additionalViewData);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using a display template and specified HTML
+        /// field name. The template is found using the <paramref name="templateName"/> or the
+        /// <paramref name="expression"/>'s <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="templateName">The name of the template used to create the HTML markup.</param>
+        /// <param name="htmlFieldName">
+        /// A <see cref="string"/> used to disambiguate the names of HTML elements that are created for properties
+        /// that have the same name.
+        /// </param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the created HTML.</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> display template includes markup for each property in the
+        /// <paramref name="expression"/> result.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>DisplayTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent DisplayFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression,
+            string templateName,
+            string htmlFieldName)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.DisplayFor(
+                expression,
+                templateName: templateName,
+                htmlFieldName: htmlFieldName,
+                additionalViewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the current model, using a display template. The template is found using the
+        /// model's <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the created HTML.</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> display template includes markup for each property in the
+        /// current model.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>DisplayTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent DisplayForModel(this IHtmlHelper htmlHelper)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Display(
+                expression: null,
+                templateName: null,
+                htmlFieldName: null,
+                additionalViewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the current model, using a display template and specified additional view data. The
+        /// template is found using the model's <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="additionalViewData">
+        /// An anonymous <see cref="object"/> or <see cref="System.Collections.Generic.IDictionary{String, Object}"/>
+        /// that can contain additional view data that will be merged into the
+        /// <see cref="ViewFeatures.ViewDataDictionary{TModel}"/> instance created for the template.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the created HTML.</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> display template includes markup for each property in the
+        /// current model.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>DisplayTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent DisplayForModel(this IHtmlHelper htmlHelper, object additionalViewData)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Display(
+                expression: null,
+                templateName: null,
+                htmlFieldName: null,
+                additionalViewData: additionalViewData);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the current model, using a display template. The template is found using the
+        /// <paramref name="templateName"/> or the model's <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="templateName">The name of the template used to create the HTML markup.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the created HTML.</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> display template includes markup for each property in the
+        /// current model.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>DisplayTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent DisplayForModel(this IHtmlHelper htmlHelper, string templateName)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Display(
+                expression: null,
+                templateName: templateName,
+                htmlFieldName: null,
+                additionalViewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the current model, using a display template and specified additional view data. The
+        /// template is found using the <paramref name="templateName"/> or the model's
+        /// <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="templateName">The name of the template used to create the HTML markup.</param>
+        /// <param name="additionalViewData">
+        /// An anonymous <see cref="object"/> or <see cref="System.Collections.Generic.IDictionary{String, Object}"/>
+        /// that can contain additional view data that will be merged into the
+        /// <see cref="ViewFeatures.ViewDataDictionary{TModel}"/> instance created for the template.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the created HTML.</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> display template includes markup for each property in the
+        /// current model.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>DisplayTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent DisplayForModel(
+            this IHtmlHelper htmlHelper,
+            string templateName,
+            object additionalViewData)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Display(
+                expression: null,
+                templateName: templateName,
+                htmlFieldName: null,
+                additionalViewData: additionalViewData);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the current model, using a display template and specified HTML field name. The
+        /// template is found using the <paramref name="templateName"/> or the model's
+        /// <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="templateName">The name of the template used to create the HTML markup.</param>
+        /// <param name="htmlFieldName">
+        /// A <see cref="string"/> used to disambiguate the names of HTML elements that are created for
+        /// properties that have the same name.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the created HTML.</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> display template includes markup for each property in the
+        /// current model.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>DisplayTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent DisplayForModel(
+            this IHtmlHelper htmlHelper,
+            string templateName,
+            string htmlFieldName)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Display(
+                expression: null,
+                templateName: templateName,
+                htmlFieldName: htmlFieldName,
+                additionalViewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the current model, using a display template, specified HTML field name, and
+        /// additional view data. The template is found using the <paramref name="templateName"/> or the model's
+        /// <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="templateName">The name of the template used to create the HTML markup.</param>
+        /// <param name="htmlFieldName">
+        /// A <see cref="string"/> used to disambiguate the names of HTML elements that are created for
+        /// properties that have the same name.
+        /// </param>
+        /// <param name="additionalViewData">
+        /// An anonymous <see cref="object"/> or <see cref="System.Collections.Generic.IDictionary{String, Object}"/>
+        /// that can contain additional view data that will be merged into the
+        /// <see cref="ViewFeatures.ViewDataDictionary{TModel}"/> instance created for the template.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the created HTML.</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> display template includes markup for each property in the
+        /// current model.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>DisplayTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent DisplayForModel(
+            this IHtmlHelper htmlHelper,
+            string templateName,
+            string htmlFieldName,
+            object additionalViewData)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Display(
+                expression: null,
+                templateName: templateName,
+                htmlFieldName: htmlFieldName,
+                additionalViewData: additionalViewData);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayNameExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayNameExtensions.cs
new file mode 100644
index 0000000000..21aec446b6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayNameExtensions.cs
@@ -0,0 +1,58 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// DisplayName-related extensions for <see cref="IHtmlHelper"/> and <see cref="IHtmlHelper{TModel}"/>.
+    /// </summary>
+    public static class HtmlHelperDisplayNameExtensions
+    {
+        /// <summary>
+        /// Returns the display name for the current model.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <returns>A <see cref="string"/> containing the display name.</returns>
+        public static string DisplayNameForModel(this IHtmlHelper htmlHelper)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.DisplayName(expression: null);
+        }
+
+        /// <summary>
+        /// Returns the display name for the specified <paramref name="expression"/>
+        /// if the current model represents a collection.
+        /// </summary>
+        /// <param name="htmlHelper">
+        /// The <see cref="IHtmlHelper{T}"/> of <see cref="IEnumerable{TModelItem}"/> instance this method extends.
+        /// </param>
+        /// <param name="expression">An expression to be evaluated against an item in the current model.</param>
+        /// <typeparam name="TModelItem">The type of items in the model collection.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A <see cref="string"/> containing the display name.</returns>
+        public static string DisplayNameFor<TModelItem, TResult>(
+            this IHtmlHelper<IEnumerable<TModelItem>> htmlHelper,
+            Expression<Func<TModelItem, TResult>> expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.DisplayNameForInnerType(expression);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperEditorExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperEditorExtensions.cs
new file mode 100644
index 0000000000..645d75789b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperEditorExtensions.cs
@@ -0,0 +1,660 @@
+// 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.
+
+using System;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Editor-related extensions for <see cref="IHtmlHelper"/> and <see cref="IHtmlHelper{TModel}"/>.
+    /// </summary>
+    public static class HtmlHelperEditorExtensions
+    {
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using an editor template. The template is found
+        /// using the <paramref name="expression"/>'s <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">
+        /// Expression name, relative to the current model. May identify a single property or an
+        /// <see cref="object"/> that contains the properties to edit.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element(s).</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> editor template includes &lt;label&gt; and &lt;input&gt;
+        /// elements for each property in the <paramref name="expression"/>'s value.
+        /// </para>
+        /// <para>
+        /// Example <paramref name="expression"/>s include <c>string.Empty</c> which identifies the current model and
+        /// <c>"prop"</c> which identifies the current model's "prop" property.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>EditorTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent Editor(this IHtmlHelper htmlHelper, string expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Editor(expression, templateName: null, htmlFieldName: null, additionalViewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using an editor template and specified
+        /// additional view data. The template is found using the <paramref name="expression"/>'s
+        /// <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">
+        /// Expression name, relative to the current model. May identify a single property or an
+        /// <see cref="object"/> that contains the properties to edit.
+        /// </param>
+        /// <param name="additionalViewData">
+        /// An anonymous <see cref="object"/> or <see cref="System.Collections.Generic.IDictionary{String, Object}"/>
+        /// that can contain additional view data that will be merged into the
+        /// <see cref="ViewFeatures.ViewDataDictionary{TModel}"/> instance created for the template.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element(s).</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> editor template includes &lt;label&gt; and &lt;input&gt;
+        /// elements for each property in the <paramref name="expression"/>'s value.
+        /// </para>
+        /// <para>
+        /// Example <paramref name="expression"/>s include <c>string.Empty</c> which identifies the current model and
+        /// <c>"prop"</c> which identifies the current model's "prop" property.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>EditorTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent Editor(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            object additionalViewData)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Editor(
+                expression,
+                templateName: null,
+                htmlFieldName: null,
+                additionalViewData: additionalViewData);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using an editor template. The template is found
+        /// using the <paramref name="templateName"/> or the <paramref name="expression"/>'s
+        /// <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">
+        /// Expression name, relative to the current model. May identify a single property or an
+        /// <see cref="object"/> that contains the properties to edit.
+        /// </param>
+        /// <param name="templateName">The name of the template used to create the HTML markup.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element(s).</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> editor template includes &lt;label&gt; and &lt;input&gt;
+        /// elements for each property in the <paramref name="expression"/>'s value.
+        /// </para>
+        /// <para>
+        /// Example <paramref name="expression"/>s include <c>string.Empty</c> which identifies the current model and
+        /// <c>"prop"</c> which identifies the current model's "prop" property.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>EditorTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent Editor(this IHtmlHelper htmlHelper, string expression, string templateName)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Editor(expression, templateName, htmlFieldName: null, additionalViewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using an editor template and specified
+        /// additional view data. The template is found using the <paramref name="templateName"/> or the
+        /// <paramref name="expression"/>'s <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">
+        /// Expression name, relative to the current model. May identify a single property or an
+        /// <see cref="object"/> that contains the properties to edit.
+        /// </param>
+        /// <param name="templateName">The name of the template used to create the HTML markup.</param>
+        /// <param name="additionalViewData">
+        /// An anonymous <see cref="object"/> or <see cref="System.Collections.Generic.IDictionary{String, Object}"/>
+        /// that can contain additional view data that will be merged into the
+        /// <see cref="ViewFeatures.ViewDataDictionary{TModel}"/> instance created for the template.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element(s).</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> editor template includes &lt;label&gt; and &lt;input&gt;
+        /// elements for each property in the <paramref name="expression"/>'s value.
+        /// </para>
+        /// <para>
+        /// Example <paramref name="expression"/>s include <c>string.Empty</c> which identifies the current model and
+        /// <c>"prop"</c> which identifies the current model's "prop" property.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>EditorTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent Editor(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            string templateName,
+            object additionalViewData)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Editor(
+                expression,
+                templateName,
+                htmlFieldName: null,
+                additionalViewData: additionalViewData);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using an editor template and specified HTML
+        /// field name. The template is found using the <paramref name="templateName"/> or the
+        /// <paramref name="expression"/>'s <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">
+        /// Expression name, relative to the current model. May identify a single property or an
+        /// <see cref="object"/> that contains the properties to edit.
+        /// </param>
+        /// <param name="templateName">The name of the template used to create the HTML markup.</param>
+        /// <param name="htmlFieldName">
+        /// A <see cref="string"/> used to disambiguate the names of HTML elements that are created for
+        /// properties that have the same name.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element(s).</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> editor template includes &lt;label&gt; and &lt;input&gt;
+        /// elements for each property in the <paramref name="expression"/>'s value.
+        /// </para>
+        /// <para>
+        /// Example <paramref name="expression"/>s include <c>string.Empty</c> which identifies the current model and
+        /// <c>"prop"</c> which identifies the current model's "prop" property.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>EditorTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent Editor(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            string templateName,
+            string htmlFieldName)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Editor(expression, templateName, htmlFieldName, additionalViewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using an editor template. The template is found
+        /// using the <paramref name="expression"/>'s <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element(s).</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> editor template includes &lt;label&gt; and &lt;input&gt;
+        /// elements for each property in the <paramref name="expression"/> result.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>EditorTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent EditorFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.EditorFor(expression, templateName: null, htmlFieldName: null, additionalViewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using an editor template and specified
+        /// additional view data. The template is found using the <paramref name="expression"/>'s
+        /// <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="additionalViewData">
+        /// An anonymous <see cref="object"/> or <see cref="System.Collections.Generic.IDictionary{String, Object}"/>
+        /// that can contain additional view data that will be merged into the
+        /// <see cref="ViewFeatures.ViewDataDictionary{TModel}"/> instance created for the template.
+        /// </param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element(s).</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> editor template includes &lt;label&gt; and &lt;input&gt;
+        /// elements for each property in the <paramref name="expression"/> result.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>EditorTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent EditorFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression,
+            object additionalViewData)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.EditorFor(
+                expression,
+                templateName: null,
+                htmlFieldName: null,
+                additionalViewData: additionalViewData);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using an editor template. The template is found
+        /// using the <paramref name="templateName"/> or the <paramref name="expression"/>'s
+        /// <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="templateName">The name of the template that is used to create the HTML markup.</param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element(s).</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> editor template includes &lt;label&gt; and &lt;input&gt;
+        /// elements for each property in the <paramref name="expression"/> result.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>EditorTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent EditorFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression,
+            string templateName)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.EditorFor(expression, templateName, htmlFieldName: null, additionalViewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using an editor template and specified
+        /// additional view data. The template is found using the <paramref name="templateName"/> or the
+        /// <paramref name="expression"/>'s <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="templateName">The name of the template that is used to create the HTML markup.</param>
+        /// <param name="additionalViewData">
+        /// An anonymous <see cref="object"/> or <see cref="System.Collections.Generic.IDictionary{String, Object}"/>
+        /// that can contain additional view data that will be merged into the
+        /// <see cref="ViewFeatures.ViewDataDictionary{TModel}"/> instance created for the template.
+        /// </param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element(s).</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> editor template includes &lt;label&gt; and &lt;input&gt;
+        /// elements for each property in the <paramref name="expression"/> result.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>EditorTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent EditorFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression,
+            string templateName,
+            object additionalViewData)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.EditorFor(
+                expression,
+                templateName,
+                htmlFieldName: null,
+                additionalViewData: additionalViewData);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using an editor template and specified HTML
+        /// field name. The template is found using the <paramref name="templateName"/> or the
+        /// <paramref name="expression"/>'s <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="templateName">The name of the template that is used to create the HTML markup.</param>
+        /// <param name="htmlFieldName">
+        /// A <see cref="string"/> used to disambiguate the names of HTML elements that are created for properties
+        /// that have the same name.
+        /// </param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element(s).</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> editor template includes &lt;label&gt; and &lt;input&gt;
+        /// elements for each property in the <paramref name="expression"/> result.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>EditorTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent EditorFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression,
+            string templateName,
+            string htmlFieldName)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.EditorFor(expression, templateName, htmlFieldName, additionalViewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the current model, using an editor template. The template is found using the
+        /// model's <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element(s).</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> editor template includes &lt;label&gt; and &lt;input&gt;
+        /// elements for each property in the current model.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>EditorTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent EditorForModel(this IHtmlHelper htmlHelper)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Editor(
+                expression: null,
+                templateName: null,
+                htmlFieldName: null,
+                additionalViewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the current model, using an editor template and specified additional view data. The
+        /// template is found using the model's <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="additionalViewData">
+        /// An anonymous <see cref="object"/> or <see cref="System.Collections.Generic.IDictionary{String, Object}"/>
+        /// that can contain additional view data that will be merged into the
+        /// <see cref="ViewFeatures.ViewDataDictionary{TModel}"/> instance created for the template.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element(s).</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> editor template includes &lt;label&gt; and &lt;input&gt;
+        /// elements for each property in the current model.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>EditorTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent EditorForModel(this IHtmlHelper htmlHelper, object additionalViewData)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Editor(
+                expression: null,
+                templateName: null,
+                htmlFieldName: null,
+                additionalViewData: additionalViewData);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the current model, using an editor template. The template is found using the
+        /// <paramref name="templateName"/> or the model's <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="templateName">The name of the template used to create the HTML markup.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element(s).</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> editor template includes &lt;label&gt; and &lt;input&gt;
+        /// elements for each property in the current model.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>EditorTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent EditorForModel(this IHtmlHelper htmlHelper, string templateName)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Editor(
+                expression: null,
+                templateName: templateName,
+                htmlFieldName: null,
+                additionalViewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the current model, using an editor template and specified additional view data. The
+        /// template is found using the <paramref name="templateName"/> or the model's
+        /// <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="templateName">The name of the template used to create the HTML markup.</param>
+        /// <param name="additionalViewData">
+        /// An anonymous <see cref="object"/> or <see cref="System.Collections.Generic.IDictionary{String, Object}"/>
+        /// that can contain additional view data that will be merged into the
+        /// <see cref="ViewFeatures.ViewDataDictionary{TModel}"/> instance created for the template.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element(s).</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> editor template includes &lt;label&gt; and &lt;input&gt;
+        /// elements for each property in the current model.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>EditorTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent EditorForModel(
+            this IHtmlHelper htmlHelper,
+            string templateName,
+            object additionalViewData)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Editor(
+                expression: null,
+                templateName: templateName,
+                htmlFieldName: null,
+                additionalViewData: additionalViewData);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the current model, using an editor template and specified HTML field name. The
+        /// template is found using the <paramref name="templateName"/> or the model's
+        /// <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="templateName">The name of the template used to create the HTML markup.</param>
+        /// <param name="htmlFieldName">
+        /// A <see cref="string"/> used to disambiguate the names of HTML elements that are created for
+        /// properties that have the same name.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element(s).</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> editor template includes &lt;label&gt; and &lt;input&gt;
+        /// elements for each property in the current model.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>EditorTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent EditorForModel(
+            this IHtmlHelper htmlHelper,
+            string templateName,
+            string htmlFieldName)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Editor(
+                expression: null,
+                templateName: templateName,
+                htmlFieldName: htmlFieldName,
+                additionalViewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the current model, using an editor template, specified HTML field name, and
+        /// additional view data. The template is found using the <paramref name="templateName"/> or the model's
+        /// <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="templateName">The name of the template used to create the HTML markup.</param>
+        /// <param name="htmlFieldName">
+        /// A <see cref="string"/> used to disambiguate the names of HTML elements that are created for
+        /// properties that have the same name.
+        /// </param>
+        /// <param name="additionalViewData">
+        /// An anonymous <see cref="object"/> or <see cref="System.Collections.Generic.IDictionary{String, Object}"/>
+        /// that can contain additional view data that will be merged into the
+        /// <see cref="ViewFeatures.ViewDataDictionary{TModel}"/> instance created for the template.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element(s).</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> editor template includes &lt;label&gt; and &lt;input&gt;
+        /// elements for each property in the current model.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>EditorTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent EditorForModel(
+            this IHtmlHelper htmlHelper,
+            string templateName,
+            string htmlFieldName,
+            object additionalViewData)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Editor(
+                expression: null,
+                templateName: templateName,
+                htmlFieldName: htmlFieldName,
+                additionalViewData: additionalViewData);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperFormExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperFormExtensions.cs
new file mode 100644
index 0000000000..3a354679c4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperFormExtensions.cs
@@ -0,0 +1,677 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Form-related extensions for <see cref="IHtmlHelper"/>.
+    /// </summary>
+    public static class HtmlHelperFormExtensions
+    {
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. The &lt;form&gt;'s <c>action</c> attribute value will
+        /// match the current request.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static MvcForm BeginForm(this IHtmlHelper htmlHelper)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            // Generates <form action="{current url}" method="post">.
+            return htmlHelper.BeginForm(
+                actionName: null,
+                controllerName: null,
+                routeValues: null,
+                method: FormMethod.Post,
+                antiforgery: null,
+                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. The &lt;form&gt;'s <c>action</c> attribute value will
+        /// match the current request.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="antiforgery">
+        /// If <c>true</c>, &lt;form&gt; elements will include an antiforgery token.
+        /// If <c>false</c>, suppresses the generation an &lt;input&gt; of type "hidden" with an antiforgery token.
+        /// If <c>null</c>, &lt;form&gt; elements will include an antiforgery token.
+        /// </param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static MvcForm BeginForm(this IHtmlHelper htmlHelper, bool? antiforgery)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            // Generates <form action="{current url}" method="post">.
+            return htmlHelper.BeginForm(
+                actionName: null,
+                controllerName: null,
+                routeValues: null,
+                method: FormMethod.Post,
+                antiforgery: antiforgery,
+                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. When the user submits the form, the
+        /// current action will process the request.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="method">The HTTP method for processing the form, either GET or POST.</param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static MvcForm BeginForm(this IHtmlHelper htmlHelper, FormMethod method)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.BeginForm(
+                actionName: null,
+                controllerName: null,
+                routeValues: null,
+                method: method,
+                antiforgery: null,
+                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. When the user submits the form, the
+        /// current action will process the request.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="method">The HTTP method for processing the form, either GET or POST.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the HTML
+        /// attributes.
+        /// </param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static MvcForm BeginForm(
+            this IHtmlHelper htmlHelper,
+            FormMethod method,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.BeginForm(
+                actionName: null,
+                controllerName: null,
+                routeValues: null,
+                method: method,
+                antiforgery: null,
+                htmlAttributes: htmlAttributes);
+        }
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. When the user submits the form, the
+        /// current action will process the request.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="method">The HTTP method for processing the form, either GET or POST.</param>
+        /// <param name="antiforgery">
+        /// If <c>true</c>, &lt;form&gt; elements will include an antiforgery token.
+        /// If <c>false</c>, suppresses the generation an &lt;input&gt; of type "hidden" with an antiforgery token.
+        /// If <c>null</c>, &lt;form&gt; elements will include an antiforgery token only if
+        /// <paramref name="method"/> is not <see cref="FormMethod.Get"/>.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the HTML
+        /// attributes.
+        /// </param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static MvcForm BeginForm(
+            this IHtmlHelper htmlHelper,
+            FormMethod method,
+            bool? antiforgery,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.BeginForm(
+                actionName: null,
+                controllerName: null,
+                routeValues: null,
+                method: method,
+                antiforgery: antiforgery,
+                htmlAttributes: htmlAttributes);
+        }
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. When the user submits the form, the
+        /// current action will process the request.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the route
+        /// parameters.
+        /// </param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static MvcForm BeginForm(this IHtmlHelper htmlHelper, object routeValues)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.BeginForm(
+                actionName: null,
+                controllerName: null,
+                routeValues: routeValues,
+                method: FormMethod.Post,
+                antiforgery: null,
+                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. When the user submits the form, the action with name
+        /// <paramref name="actionName"/> will process the request.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="actionName">The name of the action method.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static MvcForm BeginForm(
+            this IHtmlHelper htmlHelper,
+            string actionName,
+            string controllerName)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.BeginForm(
+                actionName,
+                controllerName,
+                routeValues: null,
+                method: FormMethod.Post,
+                antiforgery: null,
+                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. When the user submits the form, the action with name
+        /// <paramref name="actionName"/> will process the request.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="actionName">The name of the action method.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the route
+        /// parameters.
+        /// </param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static MvcForm BeginForm(
+            this IHtmlHelper htmlHelper,
+            string actionName,
+            string controllerName,
+            object routeValues)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.BeginForm(
+                actionName,
+                controllerName,
+                routeValues,
+                FormMethod.Post,
+                antiforgery: null,
+                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. When the user submits the form, the action with name
+        /// <paramref name="actionName"/> will process the request.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="actionName">The name of the action method.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="method">The HTTP method for processing the form, either GET or POST.</param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static MvcForm BeginForm(
+            this IHtmlHelper htmlHelper,
+            string actionName,
+            string controllerName,
+            FormMethod method)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.BeginForm(
+                actionName,
+                controllerName,
+                routeValues: null,
+                method: method,
+                antiforgery: null,
+                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. When the user submits the form, the action with name
+        /// <paramref name="actionName"/> will process the request.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="actionName">The name of the action method.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the route
+        /// parameters.
+        /// </param>
+        /// <param name="method">The HTTP method for processing the form, either GET or POST.</param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static MvcForm BeginForm(
+            this IHtmlHelper htmlHelper,
+            string actionName,
+            string controllerName,
+            object routeValues,
+            FormMethod method)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.BeginForm(
+                actionName,
+                controllerName,
+                routeValues,
+                method,
+                antiforgery: null,
+                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. When the user submits the form, the action with name
+        /// <paramref name="actionName"/> will process the request.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="actionName">The name of the action method.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="method">The HTTP method for processing the form, either GET or POST.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the HTML
+        /// attributes.
+        /// </param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static MvcForm BeginForm(
+            this IHtmlHelper htmlHelper,
+            string actionName,
+            string controllerName,
+            FormMethod method,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.BeginForm(
+                actionName,
+                controllerName,
+                routeValues: null,
+                method: method,
+                antiforgery: null,
+                htmlAttributes: htmlAttributes);
+        }
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. The first route that can provide a URL with the
+        /// specified <paramref name="routeValues"/> generates the &lt;form&gt;'s <c>action</c> attribute value.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the route
+        /// parameters.
+        /// </param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static MvcForm BeginRouteForm(this IHtmlHelper htmlHelper, object routeValues)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.BeginRouteForm(
+                routeName: null,
+                routeValues: routeValues,
+                method: FormMethod.Post,
+                antiforgery: null,
+                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. The first route that can provide a URL with the
+        /// specified <paramref name="routeValues"/> generates the &lt;form&gt;'s <c>action</c> attribute value.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the route
+        /// parameters.
+        /// </param>
+        /// <param name="antiforgery">
+        /// If <c>true</c>, &lt;form&gt; elements will include an antiforgery token.
+        /// If <c>false</c>, suppresses the generation an &lt;input&gt; of type "hidden" with an antiforgery token.
+        /// If <c>null</c>, &lt;form&gt; elements will include an antiforgery token.
+        /// </param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static MvcForm BeginRouteForm(this IHtmlHelper htmlHelper, object routeValues, bool? antiforgery)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.BeginRouteForm(
+                routeName: null,
+                routeValues: routeValues,
+                method: FormMethod.Post,
+                antiforgery: antiforgery,
+                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. The route with name <paramref name="routeName"/>
+        /// generates the &lt;form&gt;'s <c>action</c> attribute value.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="routeName">The name of the route.</param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static MvcForm BeginRouteForm(this IHtmlHelper htmlHelper, string routeName)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.BeginRouteForm(
+                routeName,
+                routeValues: null,
+                method: FormMethod.Post,
+                antiforgery: null,
+                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. The route with name <paramref name="routeName"/>
+        /// generates the &lt;form&gt;'s <c>action</c> attribute value.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="antiforgery">
+        /// If <c>true</c>, &lt;form&gt; elements will include an antiforgery token.
+        /// If <c>false</c>, suppresses the generation an &lt;input&gt; of type "hidden" with an antiforgery token.
+        /// If <c>null</c>, &lt;form&gt; elements will include an antiforgery token.
+        /// </param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static MvcForm BeginRouteForm(this IHtmlHelper htmlHelper, string routeName, bool? antiforgery)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.BeginRouteForm(
+                routeName,
+                routeValues: null,
+                method: FormMethod.Post,
+                antiforgery: antiforgery,
+                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. The route with name <paramref name="routeName"/>
+        /// generates the &lt;form&gt;'s <c>action</c> attribute value.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the route
+        /// parameters.
+        /// </param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static MvcForm BeginRouteForm(
+            this IHtmlHelper htmlHelper,
+            string routeName,
+            object routeValues)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.BeginRouteForm(
+                routeName, 
+                routeValues, 
+                FormMethod.Post,
+                antiforgery: null,
+                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. The route with name <paramref name="routeName"/>
+        /// generates the &lt;form&gt;'s <c>action</c> attribute value.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="method">The HTTP method for processing the form, either GET or POST.</param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static MvcForm BeginRouteForm(
+            this IHtmlHelper htmlHelper,
+            string routeName,
+            FormMethod method)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.BeginRouteForm(
+                routeName,
+                routeValues: null,
+                method: method,
+                antiforgery: null,
+                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. The route with name <paramref name="routeName"/>
+        /// generates the &lt;form&gt;'s <c>action</c> attribute value.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the route
+        /// parameters.
+        /// </param>
+        /// <param name="method">The HTTP method for processing the form, either GET or POST.</param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static MvcForm BeginRouteForm(
+            this IHtmlHelper htmlHelper,
+            string routeName,
+            object routeValues,
+            FormMethod method)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.BeginRouteForm(
+                routeName,
+                routeValues,
+                method,
+                antiforgery: null,
+                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. The route with name <paramref name="routeName"/>
+        /// generates the &lt;form&gt;'s <c>action</c> attribute value.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="method">The HTTP method for processing the form, either GET or POST.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the HTML
+        /// attributes.
+        /// </param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static MvcForm BeginRouteForm(
+            this IHtmlHelper htmlHelper,
+            string routeName,
+            FormMethod method,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.BeginRouteForm(
+                routeName,
+                routeValues: null,
+                method: method,
+                antiforgery: null,
+                htmlAttributes: htmlAttributes);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperInputExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperInputExtensions.cs
new file mode 100644
index 0000000000..6afc1148bc
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperInputExtensions.cs
@@ -0,0 +1,925 @@
+// 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.
+
+using System;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Input-related extensions for <see cref="IHtmlHelper"/> and <see cref="IHtmlHelper{TModel}"/>.
+    /// </summary>
+    public static class HtmlHelperInputExtensions
+    {
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "checkbox" with value "true" and an &lt;input&gt; element of type
+        /// "hidden" with value "false" for the specified <paramref name="expression"/>. Adds a "checked" attribute to
+        /// the "checkbox" element based on the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; elements.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// checkbox element's "name" attribute. Sanitizes <paramref name="expression"/> to set checkbox element's "id"
+        /// attribute.
+        /// </remarks>
+        public static IHtmlContent CheckBox(this IHtmlHelper htmlHelper, string expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.CheckBox(expression, isChecked: null, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "checkbox" with value "true" and an &lt;input&gt; element of type
+        /// "hidden" with value "false" for the specified <paramref name="expression"/>. Adds a "checked" attribute to
+        /// the "checkbox" element based on the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <paramref name="isChecked"/> parameter,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="isChecked">If <c>true</c>, checkbox is initially checked.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; elements.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// checkbox element's "name" attribute. Sanitizes <paramref name="expression"/> to set checkbox element's "id"
+        /// attribute.
+        /// </remarks>
+        public static IHtmlContent CheckBox(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            bool isChecked)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.CheckBox(expression, isChecked, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "checkbox" with value "true" and an &lt;input&gt; element of type
+        /// "hidden" with value "false" for the specified <paramref name="expression"/>. Adds a "checked" attribute to
+        /// the "checkbox" element based on the first non-<c>null</c> value found in:
+        /// the <paramref name="htmlAttributes"/> dictionary entry with key "checked",
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the checkbox element. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the HTML
+        /// attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; elements.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// checkbox element's "name" attribute. Sanitizes <paramref name="expression"/> to set checkbox element's "id"
+        /// attribute.
+        /// </remarks>
+        public static IHtmlContent CheckBox(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.CheckBox(expression, isChecked: null, htmlAttributes: htmlAttributes);
+        }
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "checkbox" with value "true" and an &lt;input&gt; element of type
+        /// "hidden" with value "false" for the specified <paramref name="expression"/>. Adds a "checked" attribute to
+        /// the "checkbox" element based on the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper{TModel}.NameFor"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; elements.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and the string representation of the
+        /// <paramref name="expression"/> to set checkbox element's "name" attribute. Sanitizes the string
+        /// representation of the <paramref name="expression"/> to set checkbox element's "id" attribute.
+        /// </remarks>
+        public static IHtmlContent CheckBoxFor<TModel>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, bool>> expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.CheckBoxFor(expression, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "hidden" for the specified <paramref name="expression"/>. Adds a
+        /// "value" attribute to the element containing the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;input&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        public static IHtmlContent Hidden(this IHtmlHelper htmlHelper, string expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Hidden(expression, value: null, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "hidden" for the specified <paramref name="expression"/>. Adds a
+        /// "value" attribute to the element containing the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <paramref name="value"/> parameter,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="value">If non-<c>null</c>, value to include in the element.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;input&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        public static IHtmlContent Hidden(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            object value)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Hidden(expression, value, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "hidden" for the specified <paramref name="expression"/>. Adds a
+        /// "value" attribute to the element containing the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper{TModel}.NameFor"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and the string representation of the
+        /// <paramref name="expression"/> to set &lt;input&gt; element's "name" attribute. Sanitizes the string
+        /// representation of the <paramref name="expression"/> to set element's "id" attribute.
+        /// </remarks>
+        public static IHtmlContent HiddenFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.HiddenFor(expression, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "password" for the specified <paramref name="expression"/>. Does
+        /// not add a "value" attribute.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;input&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute. Sets &lt;input&gt; element's "value" attribute to <c>string.Empty</c>.
+        /// </remarks>
+        public static IHtmlContent Password(this IHtmlHelper htmlHelper, string expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Password(expression, value: null, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "password" for the specified <paramref name="expression"/>. Adds a
+        /// "value" attribute containing the <paramref name="value"/> parameter if that is non-<c>null</c>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="value">If non-<c>null</c>, value to include in the element.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;input&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        public static IHtmlContent Password(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            object value)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Password(expression, value, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "password" for the specified <paramref name="expression"/>. Does
+        /// not add a "value" attribute.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and the string representation of the
+        /// <paramref name="expression"/> to set &lt;input&gt; element's "name" attribute. Sanitizes the string
+        /// representation of the <paramref name="expression"/> to set element's "id" attribute.
+        /// </remarks>
+        public static IHtmlContent PasswordFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.PasswordFor(expression, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "radio" for the specified <paramref name="expression"/>.
+        /// Adds a "value" attribute to the element containing the <paramref name="value"/> parameter if that is
+        /// non-<c>null</c>.
+        /// Adds a "checked" attribute to the element if <paramref name="value"/> matches the first non-<c>null</c>
+        /// value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="value">Value to include in the element. Must not be <c>null</c>.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;input&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute. Sets &lt;input&gt; element's "value" attribute to <paramref name="value"/>.
+        /// </remarks>
+        public static IHtmlContent RadioButton(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            object value)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.RadioButton(expression, value, isChecked: null, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "radio" for the specified <paramref name="expression"/>.
+        /// Adds a "value" attribute to the element containing the first non-<c>null</c> value found in:
+        /// the <paramref name="value"/> parameter, or
+        /// the <paramref name="htmlAttributes"/> dictionary entry with key "value".
+        /// Adds a "checked" attribute to the element if <paramref name="value"/> matches the first non-<c>null</c>
+        /// value found in:
+        /// the <paramref name="htmlAttributes"/> dictionary entry with key "checked",
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="value">
+        /// If non-<c>null</c>, value to include in the element. Must not be <c>null</c> if no "checked" entry exists
+        /// in <paramref name="htmlAttributes"/>.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the HTML
+        /// attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;input&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        public static IHtmlContent RadioButton(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            object value,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.RadioButton(expression, value, isChecked: null, htmlAttributes: htmlAttributes);
+        }
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "radio" for the specified <paramref name="expression"/>.
+        /// Adds a "value" attribute to the element containing the <paramref name="value"/> parameter if that is
+        /// non-<c>null</c>.
+        /// Adds a "checked" attribute to the element if <paramref name="value"/> matches the first non-<c>null</c>
+        /// value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <paramref name="isChecked"/> parameter,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="value">
+        /// If non-<c>null</c>, value to include in the element. Must not be <c>null</c> if
+        /// <paramref name="isChecked"/> is also <c>null</c>.
+        /// </param>
+        /// <param name="isChecked">
+        /// If <c>true</c>, radio button is initially selected. Must not be <c>null</c> if
+        /// <paramref name="value"/> is also <c>null</c>.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;input&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        public static IHtmlContent RadioButton(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            object value,
+            bool isChecked)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.RadioButton(expression, value, isChecked, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "radio" for the specified <paramref name="expression"/>.
+        /// Adds a "value" attribute to the element containing the <paramref name="value"/> parameter.
+        /// Adds a "checked" attribute to the element if <paramref name="value"/> matches the first non-<c>null</c>
+        /// value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper{TModel}.NameFor"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="value">Value to include in the element. Must not be <c>null</c>.</param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and the string representation of the
+        /// <paramref name="expression"/> to set &lt;select&gt; element's "name" attribute. Sanitizes the string
+        /// representation of the <paramref name="expression"/> to set element's "id" attribute. Converts the
+        /// <paramref name="value"/> to a <see cref="string"/> to set element's "value" attribute.
+        /// </remarks>
+        public static IHtmlContent RadioButtonFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression,
+            object value)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            if (value == null)
+            {
+                throw new ArgumentNullException(nameof(value));
+            }
+
+            return htmlHelper.RadioButtonFor(expression, value, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "text" for the specified <paramref name="expression"/>. Adds a
+        /// "value" attribute to the element containing the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;input&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        public static IHtmlContent TextBox(this IHtmlHelper htmlHelper, string expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.TextBox(expression, value: null, format: null, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "text" for the specified <paramref name="expression"/>. Adds a
+        /// "value" attribute to the element containing the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <paramref name="value"/> parameter,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="value">If non-<c>null</c>, value to include in the element.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;input&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        public static IHtmlContent TextBox(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            object value)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.TextBox(expression, value, format: null, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "text" for the specified <paramref name="expression"/>. Adds a
+        /// "value" attribute to the element containing the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <paramref name="value"/> parameter,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="value">If non-<c>null</c>, value to include in the element.</param>
+        /// <param name="format">
+        /// The format string (see https://msdn.microsoft.com/en-us/library/txafckwd.aspx) used to format the "value"
+        /// attribute unless that came from model binding.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;input&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        public static IHtmlContent TextBox(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            object value,
+            string format)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.TextBox(expression, value, format, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "text" for the specified <paramref name="expression"/>. Adds a
+        /// "value" attribute to the element containing the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <paramref name="value"/> parameter,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name,
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>, or
+        /// the <paramref name="htmlAttributes"/> dictionary entry with key "value".
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="value">If non-<c>null</c>, value to include in the element.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the HTML
+        /// attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;input&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        public static IHtmlContent TextBox(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            object value,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.TextBox(expression, value, format: null, htmlAttributes: htmlAttributes);
+        }
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "text" for the specified <paramref name="expression"/>. Adds a
+        /// "value" attribute to the element containing the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper{TModel}.NameFor"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and the string representation of the
+        /// <paramref name="expression"/> to set &lt;input&gt; element's "name" attribute. Sanitizes the string
+        /// representation of the <paramref name="expression"/> to set element's "id" attribute.
+        /// </remarks>
+        public static IHtmlContent TextBoxFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.TextBoxFor(expression, format: null, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "text" for the specified <paramref name="expression"/>. Adds a
+        /// "value" attribute to the element containing the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper{TModel}.NameFor"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="format">
+        /// The format string (see https://msdn.microsoft.com/en-us/library/txafckwd.aspx) used to format the
+        /// <paramref name="expression"/> value when using that in the "value" attribute.
+        /// </param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and the string representation of the
+        /// <paramref name="expression"/> to set &lt;input&gt; element's "name" attribute. Sanitizes the string
+        /// representation of the <paramref name="expression"/> to set element's "id" attribute.
+        /// </remarks>
+        public static IHtmlContent TextBoxFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression,
+            string format)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.TextBoxFor(expression, format, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "text" for the specified <paramref name="expression"/>. Adds a
+        /// "value" attribute to the element containing the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>, or
+        /// the <paramref name="htmlAttributes"/> dictionary entry with key "value".
+        /// See <see cref="IHtmlHelper{TModel}.NameFor"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the HTML
+        /// attributes.
+        /// </param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and the string representation of the
+        /// <paramref name="expression"/> to set &lt;input&gt; element's "name" attribute. Sanitizes the string
+        /// representation of the <paramref name="expression"/> to set element's "id" attribute.
+        /// </remarks>
+        public static IHtmlContent TextBoxFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.TextBoxFor(expression, format: null, htmlAttributes: htmlAttributes);
+        }
+
+        /// <summary>
+        /// Returns a &lt;textarea&gt; element for the specified <paramref name="expression"/>. Adds content to the
+        /// element body based on the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;textarea&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;textarea&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        public static IHtmlContent TextArea(
+            this IHtmlHelper htmlHelper,
+            string expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.TextArea(expression, value: null, rows: 0, columns: 0, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns a &lt;textarea&gt; element for the specified <paramref name="expression"/>. Adds content to the
+        /// element body based on the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the HTML
+        /// attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;textarea&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;textarea&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        public static IHtmlContent TextArea(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.TextArea(expression, value: null, rows: 0, columns: 0, htmlAttributes: htmlAttributes);
+        }
+
+        /// <summary>
+        /// Returns a &lt;textarea&gt; element for the specified <paramref name="expression"/>. Adds content to the
+        /// element body based on the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <paramref name="value"/> parameter,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="value">If non-<c>null</c>, value to include in the element.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;textarea&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;textarea&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        public static IHtmlContent TextArea(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            string value)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.TextArea(expression, value, rows: 0, columns: 0, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns a &lt;textarea&gt; element for the specified <paramref name="expression"/>. Adds content to the
+        /// element body based on the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <paramref name="value"/> parameter,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="value">If non-<c>null</c>, value to include in the element.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the HTML
+        /// attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;textarea&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;textarea&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        public static IHtmlContent TextArea(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            string value,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.TextArea(expression, value, rows: 0, columns: 0, htmlAttributes: htmlAttributes);
+        }
+
+        /// <summary>
+        /// Returns a &lt;textarea&gt; element for the specified <paramref name="expression"/>. Adds content to the
+        /// element body based on the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper{TModel}.NameFor"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;textarea&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and the string representation of the
+        /// <paramref name="expression"/> to set &lt;textarea&gt; element's "name" attribute. Sanitizes the string
+        /// representation of the <paramref name="expression"/> to set element's "id" attribute.
+        /// </remarks>
+        public static IHtmlContent TextAreaFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.TextAreaFor(expression, rows: 0, columns: 0, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns a &lt;textarea&gt; element for the specified <paramref name="expression"/>. Adds content to the
+        /// element body based on the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper{TModel}.NameFor"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the HTML
+        /// attributes.
+        /// </param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;textarea&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and the string representation of the
+        /// <paramref name="expression"/> to set &lt;textarea&gt; element's "name" attribute. Sanitizes the string
+        /// representation of the <paramref name="expression"/> to set element's "id" attribute.
+        /// </remarks>
+        public static IHtmlContent TextAreaFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.TextAreaFor(expression, rows: 0, columns: 0, htmlAttributes: htmlAttributes);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperLabelExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperLabelExtensions.cs
new file mode 100644
index 0000000000..fc66fc420b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperLabelExtensions.cs
@@ -0,0 +1,206 @@
+// 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.
+
+using System;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Label-related extensions for <see cref="IHtmlHelper"/> and <see cref="IHtmlHelper{TModel}"/>.
+    /// </summary>
+    public static class HtmlHelperLabelExtensions
+    {
+        /// <summary>
+        /// Returns a &lt;label&gt; element for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;label&gt; element.</returns>
+        public static IHtmlContent Label(this IHtmlHelper htmlHelper, string expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Label(expression, labelText: null, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns a &lt;label&gt; element for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="labelText">The inner text of the element.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;label&gt; element.</returns>
+        public static IHtmlContent Label(this IHtmlHelper htmlHelper, string expression, string labelText)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Label(expression, labelText, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns a &lt;label&gt; element for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;label&gt; element.</returns>
+        public static IHtmlContent LabelFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.LabelFor(expression, labelText: null, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns a &lt;label&gt; element for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="labelText">The inner text of the element.</param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;label&gt; element.</returns>
+        public static IHtmlContent LabelFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression,
+            string labelText)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.LabelFor<TResult>(expression, labelText, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns a &lt;label&gt; element for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the HTML
+        /// attributes.
+        /// </param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;label&gt; element.</returns>
+        public static IHtmlContent LabelFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.LabelFor<TResult>(expression, labelText: null, htmlAttributes: htmlAttributes);
+        }
+
+        /// <summary>
+        /// Returns a &lt;label&gt; element for the current model.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;label&gt; element.</returns>
+        public static IHtmlContent LabelForModel(this IHtmlHelper htmlHelper)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Label(expression: null, labelText: null, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns a &lt;label&gt; element for the current model.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="labelText">The inner text of the element.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;label&gt; element.</returns>
+        public static IHtmlContent LabelForModel(this IHtmlHelper htmlHelper, string labelText)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Label(expression: null, labelText: labelText, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns a &lt;label&gt; element for the current model.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the HTML
+        /// attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;label&gt; element.</returns>
+        public static IHtmlContent LabelForModel(this IHtmlHelper htmlHelper, object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Label(expression: null, labelText: null, htmlAttributes: htmlAttributes);
+        }
+
+        /// <summary>
+        /// Returns a &lt;label&gt; element for the current model.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="labelText">The inner text of the element.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the HTML
+        /// attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;label&gt; element.</returns>
+        public static IHtmlContent LabelForModel(
+            this IHtmlHelper htmlHelper,
+            string labelText,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Label(expression: null, labelText: labelText, htmlAttributes: htmlAttributes);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperLinkExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperLinkExtensions.cs
new file mode 100644
index 0000000000..aab8bc53fa
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperLinkExtensions.cs
@@ -0,0 +1,462 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Link-related extensions for <see cref="IHtmlHelper"/>.
+    /// </summary>
+    public static class HtmlHelperLinkExtensions
+    {
+        /// <summary>
+        /// Returns an anchor (&lt;a&gt;) element that contains a URL path to the specified action.
+        /// </summary>
+        /// <param name="helper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="linkText">The inner text of the anchor element. Must not be <c>null</c>.</param>
+        /// <param name="actionName">The name of the action.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the anchor element.</returns>
+        public static IHtmlContent ActionLink(
+            this IHtmlHelper helper,
+            string linkText,
+            string actionName)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            if (linkText == null)
+            {
+                throw new ArgumentNullException(nameof(linkText));
+            }
+
+            return helper.ActionLink(
+                linkText,
+                actionName,
+                controllerName: null,
+                protocol: null,
+                hostname: null,
+                fragment: null,
+                routeValues: null,
+                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an anchor (&lt;a&gt;) element that contains a URL path to the specified action.
+        /// </summary>
+        /// <param name="helper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="linkText">The inner text of the anchor element. Must not be <c>null</c>.</param>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the route
+        /// parameters.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the anchor element.</returns>
+        public static IHtmlContent ActionLink(
+            this IHtmlHelper helper,
+            string linkText,
+            string actionName,
+            object routeValues)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            if (linkText == null)
+            {
+                throw new ArgumentNullException(nameof(linkText));
+            }
+
+            return helper.ActionLink(
+                linkText,
+                actionName,
+                controllerName: null,
+                protocol: null,
+                hostname: null,
+                fragment: null,
+                routeValues: routeValues,
+                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an anchor (&lt;a&gt;) element that contains a URL path to the specified action.
+        /// </summary>
+        /// <param name="helper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="linkText">The inner text of the anchor element. Must not be <c>null</c>.</param>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the route
+        /// parameters.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the HTML
+        /// attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the anchor element.</returns>
+        public static IHtmlContent ActionLink(
+            this IHtmlHelper helper,
+            string linkText,
+            string actionName,
+            object routeValues,
+            object htmlAttributes)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            if (linkText == null)
+            {
+                throw new ArgumentNullException(nameof(linkText));
+            }
+
+            return helper.ActionLink(
+                linkText,
+                actionName,
+                controllerName: null,
+                protocol: null,
+                hostname: null,
+                fragment: null,
+                routeValues: routeValues,
+                htmlAttributes: htmlAttributes);
+        }
+
+        /// <summary>
+        /// Returns an anchor (&lt;a&gt;) element that contains a URL path to the specified action.
+        /// </summary>
+        /// <param name="helper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="linkText">The inner text of the anchor element. Must not be <c>null</c>.</param>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the anchor element.</returns>
+        public static IHtmlContent ActionLink(
+            this IHtmlHelper helper,
+            string linkText,
+            string actionName,
+            string controllerName)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            if (linkText == null)
+            {
+                throw new ArgumentNullException(nameof(linkText));
+            }
+
+            return helper.ActionLink(
+                linkText,
+                actionName,
+                controllerName,
+                protocol: null,
+                hostname: null,
+                fragment: null,
+                routeValues: null,
+                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an anchor (&lt;a&gt;) element that contains a URL path to the specified action.
+        /// </summary>
+        /// <param name="helper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="linkText">The inner text of the anchor element. Must not be <c>null</c>.</param>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the route
+        /// parameters.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the anchor element.</returns>
+        public static IHtmlContent ActionLink(
+            this IHtmlHelper helper,
+            string linkText,
+            string actionName,
+            string controllerName,
+            object routeValues)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            if (linkText == null)
+            {
+                throw new ArgumentNullException(nameof(linkText));
+            }
+
+            return helper.ActionLink(
+                linkText,
+                actionName,
+                controllerName,
+                protocol: null,
+                hostname: null,
+                fragment: null,
+                routeValues: routeValues,
+                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an anchor (&lt;a&gt;) element that contains a URL path to the specified action.
+        /// </summary>
+        /// <param name="helper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="linkText">The inner text of the anchor element. Must not be <c>null</c>.</param>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the route
+        /// parameters.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the HTML
+        /// attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the anchor element.</returns>
+        public static IHtmlContent ActionLink(
+            this IHtmlHelper helper,
+            string linkText,
+            string actionName,
+            string controllerName,
+            object routeValues,
+            object htmlAttributes)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            if (linkText == null)
+            {
+                throw new ArgumentNullException(nameof(linkText));
+            }
+
+            return helper.ActionLink(
+                linkText,
+                actionName,
+                controllerName,
+                protocol: null,
+                hostname: null,
+                fragment: null,
+                routeValues: routeValues,
+                htmlAttributes: htmlAttributes);
+        }
+
+        /// <summary>
+        /// Returns an anchor (&lt;a&gt;) element that contains a URL path to the specified route.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="linkText">The inner text of the anchor element. Must not be <c>null</c>.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the route
+        /// parameters.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the anchor element.</returns>
+        public static IHtmlContent RouteLink(
+            this IHtmlHelper htmlHelper,
+            string linkText,
+            object routeValues)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (linkText == null)
+            {
+                throw new ArgumentNullException(nameof(linkText));
+            }
+
+            return htmlHelper.RouteLink(
+                                linkText,
+                                routeName: null,
+                                protocol: null,
+                                hostName: null,
+                                fragment: null,
+                                routeValues: routeValues,
+                                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an anchor (&lt;a&gt;) element that contains a URL path to the specified route.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="linkText">The inner text of the anchor element. Must not be <c>null</c>.</param>
+        /// <param name="routeName">The name of the route.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the anchor element.</returns>
+        public static IHtmlContent RouteLink(
+            this IHtmlHelper htmlHelper,
+            string linkText,
+            string routeName)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (linkText == null)
+            {
+                throw new ArgumentNullException(nameof(linkText));
+            }
+
+            return htmlHelper.RouteLink(
+                                linkText,
+                                routeName,
+                                protocol: null,
+                                hostName: null,
+                                fragment: null,
+                                routeValues: null,
+                                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an anchor (&lt;a&gt;) element that contains a URL path to the specified route.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="linkText">The inner text of the anchor element. Must not be <c>null</c>.</param>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the route
+        /// parameters.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the anchor element.</returns>
+        public static IHtmlContent RouteLink(
+            this IHtmlHelper htmlHelper,
+            string linkText,
+            string routeName,
+            object routeValues)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (linkText == null)
+            {
+                throw new ArgumentNullException(nameof(linkText));
+            }
+
+            return htmlHelper.RouteLink(
+                                linkText,
+                                routeName,
+                                protocol: null,
+                                hostName: null,
+                                fragment: null,
+                                routeValues: routeValues,
+                                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns an anchor (&lt;a&gt;) element that contains a URL path to the specified route.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="linkText">The inner text of the anchor element. Must not be <c>null</c>.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the route
+        /// parameters.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the HTML
+        /// attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the anchor element.</returns>
+        public static IHtmlContent RouteLink(
+            this IHtmlHelper htmlHelper,
+            string linkText,
+            object routeValues,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (linkText == null)
+            {
+                throw new ArgumentNullException(nameof(linkText));
+            }
+
+            return htmlHelper.RouteLink(
+                                linkText,
+                                routeName: null,
+                                protocol: null,
+                                hostName: null,
+                                fragment: null,
+                                routeValues: routeValues,
+                                htmlAttributes: htmlAttributes);
+        }
+
+        /// <summary>
+        /// Returns an anchor (&lt;a&gt;) element that contains a URL path to the specified route.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="linkText">The inner text of the anchor element. Must not be <c>null</c>.</param>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the route
+        /// parameters.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the HTML
+        /// attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the anchor element.</returns>
+        public static IHtmlContent RouteLink(
+            this IHtmlHelper htmlHelper,
+            string linkText,
+            string routeName,
+            object routeValues,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (linkText == null)
+            {
+                throw new ArgumentNullException(nameof(linkText));
+            }
+
+            return htmlHelper.RouteLink(
+                                 linkText,
+                                 routeName,
+                                 protocol: null,
+                                 hostName: null,
+                                 fragment: null,
+                                 routeValues: routeValues,
+                                 htmlAttributes: htmlAttributes);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperNameExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperNameExtensions.cs
new file mode 100644
index 0000000000..7ca12fa98b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperNameExtensions.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Name-related extensions for <see cref="IHtmlHelper"/>.
+    /// </summary>
+    public static class HtmlHelperNameExtensions
+    {
+        /// <summary>
+        /// Returns the full HTML element name for the current model. Uses
+        /// <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> (if non-empty) to reflect relationship between
+        /// current <see cref="ViewFeatures.ViewDataDictionary.Model"/> and the top-level view's model.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <returns>A <see cref="string"/> containing the element name.</returns>
+        public static string NameForModel(this IHtmlHelper htmlHelper)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Name(expression: null);
+        }
+
+        /// <summary>
+        /// Returns the HTML element Id for the current model.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <returns>A <see cref="string"/> containing the element Id.</returns>
+        public static string IdForModel(this IHtmlHelper htmlHelper)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Id(expression: null);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperPartialExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperPartialExtensions.cs
new file mode 100644
index 0000000000..ff51c6cfd6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperPartialExtensions.cs
@@ -0,0 +1,372 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// PartialView-related extensions for <see cref="IHtmlHelper"/>.
+    /// </summary>
+    public static class HtmlHelperPartialExtensions
+    {
+        /// <summary>
+        /// Returns HTML markup for the specified partial view.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="partialViewName">
+        /// The name or path of the partial view used to create the HTML markup. Must not be <c>null</c>.
+        /// </param>
+        /// <returns>
+        /// A <see cref="Task"/> that on completion returns a new <see cref="IHtmlContent"/> instance containing
+        /// the created HTML.
+        /// </returns>
+        public static Task<IHtmlContent> PartialAsync(
+            this IHtmlHelper htmlHelper,
+            string partialViewName)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (partialViewName == null)
+            {
+                throw new ArgumentNullException(nameof(partialViewName));
+            }
+
+            return htmlHelper.PartialAsync(partialViewName, htmlHelper.ViewData.Model, viewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the specified partial view.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="partialViewName">
+        /// The name or path of the partial view used to create the HTML markup. Must not be <c>null</c>.
+        /// </param>
+        /// <param name="viewData">A <see cref="ViewDataDictionary"/> to pass into the partial view.</param>
+        /// <returns>
+        /// A <see cref="Task"/> that on completion returns a new <see cref="IHtmlContent"/> instance containing
+        /// the created HTML.
+        /// </returns>
+        public static Task<IHtmlContent> PartialAsync(
+            this IHtmlHelper htmlHelper,
+            string partialViewName,
+            ViewDataDictionary viewData)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (partialViewName == null)
+            {
+                throw new ArgumentNullException(nameof(partialViewName));
+            }
+
+            return htmlHelper.PartialAsync(partialViewName, htmlHelper.ViewData.Model, viewData);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the specified partial view.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="partialViewName">
+        /// The name or path of the partial view used to create the HTML markup. Must not be <c>null</c>.
+        /// </param>
+        /// <param name="model">A model to pass into the partial view.</param>
+        /// <returns>
+        /// A <see cref="Task"/> that on completion returns a new <see cref="IHtmlContent"/> instance containing
+        /// the created HTML.
+        /// </returns>
+        public static Task<IHtmlContent> PartialAsync(
+            this IHtmlHelper htmlHelper,
+            string partialViewName,
+            object model)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (partialViewName == null)
+            {
+                throw new ArgumentNullException(nameof(partialViewName));
+            }
+
+            return htmlHelper.PartialAsync(partialViewName, model, viewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the specified partial view.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="partialViewName">
+        /// The name or path of the partial view used to create the HTML markup. Must not be <c>null</c>.
+        /// </param>
+        /// <returns>
+        /// Returns a new <see cref="IHtmlContent"/> instance containing the created HTML.
+        /// </returns>
+        /// <remarks>
+        /// This method synchronously calls and blocks on
+        /// <see cref="IHtmlHelper.PartialAsync(string, object, ViewDataDictionary)"/>
+        /// </remarks>
+        public static IHtmlContent Partial(this IHtmlHelper htmlHelper, string partialViewName)
+        {
+            return Partial(htmlHelper, partialViewName, htmlHelper.ViewData.Model, viewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the specified partial view.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="partialViewName">
+        /// The name or path of the partial view used to create the HTML markup. Must not be <c>null</c>.
+        /// </param>
+        /// <param name="viewData">A <see cref="ViewDataDictionary"/> to pass into the partial view.</param>
+        /// <returns>
+        /// Returns a new <see cref="IHtmlContent"/> instance containing the created HTML.
+        /// </returns>
+        /// <remarks>
+        /// This method synchronously calls and blocks on
+        /// <see cref="IHtmlHelper.PartialAsync(string, object, ViewDataDictionary)"/>
+        /// </remarks>
+        public static IHtmlContent Partial(
+            this IHtmlHelper htmlHelper,
+            string partialViewName,
+            ViewDataDictionary viewData)
+        {
+            return Partial(htmlHelper, partialViewName, htmlHelper.ViewData.Model, viewData);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the specified partial view.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="partialViewName">
+        /// The name or path of the partial view used to create the HTML markup. Must not be <c>null</c>.
+        /// </param>
+        /// <param name="model">A model to pass into the partial view.</param>
+        /// <returns>
+        /// Returns a new <see cref="IHtmlContent"/> instance containing the created HTML.
+        /// </returns>
+        /// <remarks>
+        /// This method synchronously calls and blocks on
+        /// <see cref="IHtmlHelper.PartialAsync(string, object, ViewDataDictionary)"/>
+        /// </remarks>
+        public static IHtmlContent Partial(this IHtmlHelper htmlHelper, string partialViewName, object model)
+        {
+            return Partial(htmlHelper, partialViewName, model, viewData: null);
+        }
+
+        /// <summary>
+        /// Returns HTML markup for the specified partial view.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="partialViewName">
+        /// The name or path of the partial view used to create the HTML markup. Must not be <c>null</c>.
+        /// </param>
+        /// <param name="model">A model to pass into the partial view.</param>
+        /// <param name="viewData">A <see cref="ViewDataDictionary"/> to pass into the partial view.</param>
+        /// <returns>
+        /// Returns a new <see cref="IHtmlContent"/> instance containing the created HTML.
+        /// </returns>
+        /// <remarks>
+        /// This method synchronously calls and blocks on
+        /// <see cref="IHtmlHelper.PartialAsync(string, object, ViewDataDictionary)"/>
+        /// </remarks>
+        public static IHtmlContent Partial(
+            this IHtmlHelper htmlHelper,
+            string partialViewName,
+            object model,
+            ViewDataDictionary viewData)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (partialViewName == null)
+            {
+                throw new ArgumentNullException(nameof(partialViewName));
+            }
+
+            var result = htmlHelper.PartialAsync(partialViewName, model, viewData);
+            return result.GetAwaiter().GetResult();
+        }
+
+        /// <summary>
+        /// Renders HTML markup for the specified partial view.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="partialViewName">
+        /// The name or path of the partial view used to create the HTML markup. Must not be <c>null</c>.
+        /// </param>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static void RenderPartial(this IHtmlHelper htmlHelper, string partialViewName)
+        {
+            RenderPartial(htmlHelper, partialViewName, htmlHelper.ViewData.Model, viewData: null);
+        }
+
+        /// <summary>
+        /// Renders HTML markup for the specified partial view.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="partialViewName">
+        /// The name or path of the partial view used to create the HTML markup. Must not be <c>null</c>.
+        /// </param>
+        /// <param name="viewData">A <see cref="ViewDataDictionary"/> to pass into the partial view.</param>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static void RenderPartial(
+            this IHtmlHelper htmlHelper,
+            string partialViewName,
+            ViewDataDictionary viewData)
+        {
+            RenderPartial(htmlHelper, partialViewName, htmlHelper.ViewData.Model, viewData);
+        }
+
+        /// <summary>
+        /// Renders HTML markup for the specified partial view.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="partialViewName">
+        /// The name or path of the partial view used to create the HTML markup. Must not be <c>null</c>.
+        /// </param>
+        /// <param name="model">A model to pass into the partial view.</param>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static void RenderPartial(this IHtmlHelper htmlHelper, string partialViewName, object model)
+        {
+            RenderPartial(htmlHelper, partialViewName, model, viewData: null);
+        }
+
+        /// <summary>
+        /// Renders HTML markup for the specified partial view.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="partialViewName">
+        /// The name or path of the partial view used to create the HTML markup. Must not be <c>null</c>.
+        /// </param>
+        /// <param name="model">A model to pass into the partial view.</param>
+        /// <param name="viewData">A <see cref="ViewDataDictionary"/> to pass into the partial view.</param>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static void RenderPartial(
+            this IHtmlHelper htmlHelper,
+            string partialViewName,
+            object model,
+            ViewDataDictionary viewData)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (partialViewName == null)
+            {
+                throw new ArgumentNullException(nameof(partialViewName));
+            }
+
+            var result = htmlHelper.RenderPartialAsync(partialViewName, model, viewData);
+            result.GetAwaiter().GetResult();
+        }
+
+        /// <summary>
+        /// Renders HTML markup for the specified partial view.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="partialViewName">
+        /// The name or path of the partial view used to create the HTML markup. Must not be <c>null</c>.
+        /// </param>
+        /// <returns>A <see cref="Task"/> that renders the created HTML when it executes.</returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static Task RenderPartialAsync(
+            this IHtmlHelper htmlHelper,
+            string partialViewName)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (partialViewName == null)
+            {
+                throw new ArgumentNullException(nameof(partialViewName));
+            }
+
+            return htmlHelper.RenderPartialAsync(partialViewName, htmlHelper.ViewData.Model, viewData: null);
+        }
+
+        /// <summary>
+        /// Renders HTML markup for the specified partial view.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="partialViewName">
+        /// The name or path of the partial view used to create the HTML markup. Must not be <c>null</c>.
+        /// </param>
+        /// <param name="viewData">A <see cref="ViewDataDictionary"/> to pass into the partial view.</param>
+        /// <returns>A <see cref="Task"/> that renders the created HTML when it executes.</returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static Task RenderPartialAsync(
+            this IHtmlHelper htmlHelper,
+            string partialViewName,
+            ViewDataDictionary viewData)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (partialViewName == null)
+            {
+                throw new ArgumentNullException(nameof(partialViewName));
+            }
+
+            return htmlHelper.RenderPartialAsync(partialViewName, htmlHelper.ViewData.Model, viewData);
+        }
+
+        /// <summary>
+        /// Renders HTML markup for the specified partial view.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="partialViewName">
+        /// The name or path of the partial view used to create the HTML markup. Must not be <c>null</c>.
+        /// </param>
+        /// <param name="model">A model to pass into the partial view.</param>
+        /// <returns>A <see cref="Task"/> that renders the created HTML when it executes.</returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        public static Task RenderPartialAsync(
+            this IHtmlHelper htmlHelper,
+            string partialViewName,
+            object model)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (partialViewName == null)
+            {
+                throw new ArgumentNullException(nameof(partialViewName));
+            }
+
+            return htmlHelper.RenderPartialAsync(partialViewName, model, viewData: null);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperSelectExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperSelectExtensions.cs
new file mode 100644
index 0000000000..884b964102
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperSelectExtensions.cs
@@ -0,0 +1,464 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Select-related extensions for <see cref="IHtmlHelper"/> and <see cref="IHtmlHelper{TModel}"/>.
+    /// </summary>
+    public static class HtmlHelperSelectExtensions
+    {
+        /// <summary>
+        /// Returns a single-selection HTML &lt;select&gt; element for the <paramref name="expression"/>. Adds
+        /// &lt;option&gt; elements based on the <see cref="IHtmlHelper.ViewData"/> entry with full name. Adds a
+        /// "selected" attribute to an &lt;option&gt; if its <see cref="SelectListItem.Value"/> (if non-<c>null</c>) or
+        /// <see cref="SelectListItem.Text"/> matches the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;select&gt; element.</returns>
+        /// <remarks>
+        /// <para>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;select&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </para>
+        /// <para>
+        /// The <see cref="IHtmlHelper.ViewData"/> entry with full name must be a non-<c>null</c> collection of
+        /// <see cref="SelectListItem"/> objects.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent DropDownList(this IHtmlHelper htmlHelper, string expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.DropDownList(expression, selectList: null, optionLabel: null, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns a single-selection HTML &lt;select&gt; element for the <paramref name="expression"/>. Adds
+        /// &lt;option&gt; elements based on <paramref name="optionLabel"/> and the <see cref="IHtmlHelper.ViewData"/>
+        /// entry with full name. Adds a "selected" attribute to an &lt;option&gt; if its
+        /// <see cref="SelectListItem.Value"/> (if non-<c>null</c>) or <see cref="SelectListItem.Text"/> matches the
+        /// first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="optionLabel">
+        /// The text for a default empty item. Does not include such an item if argument is <c>null</c>.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;select&gt; element.</returns>
+        /// <remarks>
+        /// <para>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;select&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </para>
+        /// <para>
+        /// The <see cref="IHtmlHelper.ViewData"/> entry with full name must be a non-<c>null</c> collection of
+        /// <see cref="SelectListItem"/> objects.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent DropDownList(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            string optionLabel)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.DropDownList(
+                expression,
+                selectList: null,
+                optionLabel: optionLabel,
+                htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns a single-selection HTML &lt;select&gt; element for the <paramref name="expression"/>. Adds
+        /// &lt;option&gt; elements based on <paramref name="selectList"/>. Adds a "selected" attribute to an
+        /// &lt;option&gt; if its <see cref="SelectListItem.Value"/> (if non-<c>null</c>) or
+        /// <see cref="SelectListItem.Text"/> matches the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name (unless used instead of
+        /// <paramref name="selectList"/>), or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="selectList">
+        /// A collection of <see cref="SelectListItem"/> objects used to populate the &lt;select&gt; element with
+        /// &lt;optgroup&gt; and &lt;option&gt; elements. If <c>null</c>, uses the <see cref="IHtmlHelper.ViewData"/>
+        /// entry with full name and that entry must be a collection of <see cref="SelectListItem"/> objects.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;select&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;select&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        public static IHtmlContent DropDownList(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            IEnumerable<SelectListItem> selectList)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.DropDownList(expression, selectList, optionLabel: null, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns a single-selection HTML &lt;select&gt; element for the <paramref name="expression"/>. Adds
+        /// &lt;option&gt; elements based on <paramref name="selectList"/>. Adds a "selected" attribute to an
+        /// &lt;option&gt; if its <see cref="SelectListItem.Value"/> (if non-<c>null</c>) or
+        /// <see cref="SelectListItem.Text"/> matches the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name (unless used instead of
+        /// <paramref name="selectList"/>), or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="selectList">
+        /// A collection of <see cref="SelectListItem"/> objects used to populate the &lt;select&gt; element with
+        /// &lt;optgroup&gt; and &lt;option&gt; elements. If <c>null</c>, uses the <see cref="IHtmlHelper.ViewData"/>
+        /// entry with full name and that entry must be a collection of <see cref="SelectListItem"/> objects.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the &lt;select&gt; element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;select&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;select&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        public static IHtmlContent DropDownList(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            IEnumerable<SelectListItem> selectList,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.DropDownList(expression, selectList, optionLabel: null, htmlAttributes: htmlAttributes);
+        }
+
+        /// <summary>
+        /// Returns a single-selection HTML &lt;select&gt; element for the <paramref name="expression"/>. Adds
+        /// &lt;option&gt; elements based on <paramref name="optionLabel"/> and <paramref name="selectList"/>. Adds a
+        /// "selected" attribute to an &lt;option&gt; if its <see cref="SelectListItem.Value"/> (if non-<c>null</c>) or
+        /// <see cref="SelectListItem.Text"/> matches the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name (unless used instead of
+        /// <paramref name="selectList"/>), or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="selectList">
+        /// A collection of <see cref="SelectListItem"/> objects used to populate the &lt;select&gt; element with
+        /// &lt;optgroup&gt; and &lt;option&gt; elements. If <c>null</c>, uses the <see cref="IHtmlHelper.ViewData"/>
+        /// entry with full name and that entry must be a collection of <see cref="SelectListItem"/> objects.
+        /// </param>
+        /// <param name="optionLabel">
+        /// The text for a default empty item. Does not include such an item if argument is <c>null</c>.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;select&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;select&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        public static IHtmlContent DropDownList(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            IEnumerable<SelectListItem> selectList,
+            string optionLabel)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.DropDownList(expression, selectList, optionLabel, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns a single-selection HTML &lt;select&gt; element for the <paramref name="expression"/>. Adds
+        /// &lt;option&gt; elements based on <paramref name="selectList"/>. Adds a "selected" attribute to an
+        /// &lt;option&gt; if its <see cref="SelectListItem.Value"/> (if non-<c>null</c>) or
+        /// <see cref="SelectListItem.Text"/> matches the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper{TModel}.NameFor"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="selectList">
+        /// A collection of <see cref="SelectListItem"/> objects used to populate the &lt;select&gt; element with
+        /// &lt;optgroup&gt; and &lt;option&gt; elements. If <c>null</c>, uses the <see cref="IHtmlHelper.ViewData"/>
+        /// entry with full name and that entry must be a collection of <see cref="SelectListItem"/> objects.
+        /// </param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;select&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and the string representation of the
+        /// <paramref name="expression"/> to set &lt;select&gt; element's "name" attribute. Sanitizes the string
+        /// representation of the <paramref name="expression"/> to set element's "id" attribute.
+        /// </remarks>
+        public static IHtmlContent DropDownListFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression,
+            IEnumerable<SelectListItem> selectList)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.DropDownListFor(expression, selectList, optionLabel: null, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns a single-selection HTML &lt;select&gt; element for the <paramref name="expression"/>. Adds
+        /// &lt;option&gt; elements based on <paramref name="selectList"/>. Adds a "selected" attribute to an
+        /// &lt;option&gt; if its <see cref="SelectListItem.Value"/> (if non-<c>null</c>) or
+        /// <see cref="SelectListItem.Text"/> matches the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper{TModel}.NameFor"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="selectList">
+        /// A collection of <see cref="SelectListItem"/> objects used to populate the &lt;select&gt; element with
+        /// &lt;optgroup&gt; and &lt;option&gt; elements. If <c>null</c>, uses the <see cref="IHtmlHelper.ViewData"/>
+        /// entry with full name and that entry must be a collection of <see cref="SelectListItem"/> objects.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the &lt;select&gt; element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;select&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and the string representation of the
+        /// <paramref name="expression"/> to set &lt;select&gt; element's "name" attribute. Sanitizes the string
+        /// representation of the <paramref name="expression"/> to set element's "id" attribute.
+        /// </remarks>
+        public static IHtmlContent DropDownListFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression,
+            IEnumerable<SelectListItem> selectList,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.DropDownListFor(
+                expression,
+                selectList,
+                optionLabel: null,
+                htmlAttributes: htmlAttributes);
+        }
+
+        /// <summary>
+        /// Returns a single-selection HTML &lt;select&gt; element for the <paramref name="expression"/>. Adds
+        /// &lt;option&gt; elements based on <paramref name="optionLabel"/> and <paramref name="selectList"/>. Adds a
+        /// "selected" attribute to an &lt;option&gt; if its <see cref="SelectListItem.Value"/> (if non-<c>null</c>) or
+        /// <see cref="SelectListItem.Text"/> matches the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper{TModel}.NameFor"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="selectList">
+        /// A collection of <see cref="SelectListItem"/> objects used to populate the &lt;select&gt; element with
+        /// &lt;optgroup&gt; and &lt;option&gt; elements. If <c>null</c>, uses the <see cref="IHtmlHelper.ViewData"/>
+        /// entry with full name and that entry must be a collection of <see cref="SelectListItem"/> objects.
+        /// </param>
+        /// <param name="optionLabel">
+        /// The text for a default empty item. Does not include such an item if argument is <c>null</c>.
+        /// </param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;select&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and the string representation of the
+        /// <paramref name="expression"/> to set &lt;select&gt; element's "name" attribute. Sanitizes the string
+        /// representation of the <paramref name="expression"/> to set element's "id" attribute.
+        /// </remarks>
+        public static IHtmlContent DropDownListFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression,
+            IEnumerable<SelectListItem> selectList,
+            string optionLabel)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.DropDownListFor(expression, selectList, optionLabel, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns a multi-selection &lt;select&gt; element for the <paramref name="expression"/>. Adds
+        /// &lt;option&gt; elements based on the <see cref="IHtmlHelper.ViewData"/> entry with full name. Adds a
+        /// "selected" attribute to an &lt;option&gt; if its <see cref="SelectListItem.Value"/> (if non-<c>null</c>) or
+        /// <see cref="SelectListItem.Text"/> matches the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;select&gt; element.</returns>
+        /// <remarks>
+        /// <para>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;select&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </para>
+        /// <para>
+        /// The <see cref="IHtmlHelper.ViewData"/> entry with full name must be a non-<c>null</c> collection of
+        /// <see cref="SelectListItem"/> objects.
+        /// </para>
+        /// </remarks>
+        public static IHtmlContent ListBox(this IHtmlHelper htmlHelper, string expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.ListBox(expression, selectList: null, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns a multi-selection &lt;select&gt; element for the <paramref name="expression"/>. Adds
+        /// &lt;option&gt; elements based on <paramref name="selectList"/>. Adds a "selected" attribute to an
+        /// &lt;option&gt; if its <see cref="SelectListItem.Value"/> (if non-<c>null</c>) or
+        /// <see cref="SelectListItem.Text"/> matches the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name (unless used instead of
+        /// <paramref name="selectList"/>), or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="selectList">
+        /// A collection of <see cref="SelectListItem"/> objects used to populate the &lt;select&gt; element with
+        /// &lt;optgroup&gt; and &lt;option&gt; elements. If <c>null</c>, uses the <see cref="IHtmlHelper.ViewData"/>
+        /// entry with full name and that entry must be a collection of <see cref="SelectListItem"/> objects.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;select&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;select&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        public static IHtmlContent ListBox(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            IEnumerable<SelectListItem> selectList)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.ListBox(expression, selectList, htmlAttributes: null);
+        }
+
+        /// <summary>
+        /// Returns a multi-selection &lt;select&gt; element for the  <paramref name="expression"/>. Adds
+        /// &lt;option&gt; elements based on <paramref name="selectList"/>. Adds a "selected" attribute to an
+        /// &lt;option&gt; if its <see cref="SelectListItem.Value"/> (if non-<c>null</c>) or
+        /// <see cref="SelectListItem.Text"/> matches the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="selectList">
+        /// A collection of <see cref="SelectListItem"/> objects used to populate the &lt;select&gt; element with
+        /// &lt;optgroup&gt; and &lt;option&gt; elements. If <c>null</c>, uses the <see cref="IHtmlHelper.ViewData"/>
+        /// entry with full name and that entry must be a collection of <see cref="SelectListItem"/> objects.
+        /// </param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;select&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="ViewFeatures.TemplateInfo.HtmlFieldPrefix"/> and the string representation of the
+        /// <paramref name="expression"/> to set &lt;select&gt; element's "name" attribute. Sanitizes the string
+        /// representation of the <paramref name="expression"/> to set element's "id" attribute.
+        /// </remarks>
+        public static IHtmlContent ListBoxFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression,
+            IEnumerable<SelectListItem> selectList)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.ListBoxFor(expression, selectList, htmlAttributes: null);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperValidationExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperValidationExtensions.cs
new file mode 100644
index 0000000000..956aa0d9ca
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperValidationExtensions.cs
@@ -0,0 +1,607 @@
+// 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.
+
+using System;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Validation-related extensions for <see cref="IHtmlHelper"/> and <see cref="IHtmlHelper{TModel}"/>.
+    /// </summary>
+    public static class HtmlHelperValidationExtensions
+    {
+        /// <summary>
+        /// Returns the validation message if an error exists in the <see cref="ModelBinding.ModelStateDictionary"/>
+        /// object for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <returns>
+        /// A new <see cref="IHtmlContent"/> containing a <see cref="ViewContext.ValidationMessageElement"/> element.
+        /// An empty <see cref="IHtmlContent"/> if the <paramref name="expression"/> is valid and client-side
+        /// validation is disabled.
+        /// </returns>
+        /// <remarks>
+        /// Method extracts an error string from the <see cref="ModelBinding.ModelStateDictionary"/> object. Message
+        /// will always be visible but client-side validation may update the associated CSS class.
+        /// </remarks>
+        public static IHtmlContent ValidationMessage(
+            this IHtmlHelper htmlHelper,
+            string expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.ValidationMessage(expression, message: null, htmlAttributes: null, tag: null);
+        }
+
+        /// <summary>
+        /// Returns the validation message if an error exists in the <see cref="ModelBinding.ModelStateDictionary"/>
+        /// object for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="message">
+        /// The message to be displayed. If <c>null</c> or empty, method extracts an error string from the
+        /// <see cref="ModelBinding.ModelStateDictionary"/> object. Message will always be visible but client-side
+        /// validation may update the associated CSS class.
+        /// </param>
+        /// <returns>
+        /// A new <see cref="IHtmlContent"/> containing a <see cref="ViewContext.ValidationMessageElement"/> element.
+        /// An empty <see cref="IHtmlContent"/> if the <paramref name="expression"/> is valid and client-side
+        /// validation is disabled.
+        /// </returns>
+        public static IHtmlContent ValidationMessage(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            string message)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.ValidationMessage(expression, message, htmlAttributes: null, tag: null);
+        }
+
+        /// <summary>
+        /// Returns the validation message if an error exists in the <see cref="ModelBinding.ModelStateDictionary"/>
+        /// object for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the
+        /// (<see cref="ViewContext.ValidationMessageElement"/>) element. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the HTML
+        /// attributes.
+        /// </param>
+        /// <returns>
+        /// A new <see cref="IHtmlContent"/> containing a <see cref="ViewContext.ValidationMessageElement"/> element.
+        /// An empty <see cref="IHtmlContent"/> if the <paramref name="expression"/> is valid and client-side
+        /// validation is disabled.
+        /// </returns>
+        /// <remarks>
+        /// Method extracts an error string from the <see cref="ModelBinding.ModelStateDictionary"/> object. Message
+        /// will always be visible but client-side validation may update the associated CSS class.
+        /// </remarks>
+        public static IHtmlContent ValidationMessage(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.ValidationMessage(expression, message: null, htmlAttributes: htmlAttributes, tag: null);
+        }
+
+        /// <summary>
+        /// Returns the validation message if an error exists in the <see cref="ModelBinding.ModelStateDictionary"/>
+        /// object for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="message">
+        /// The message to be displayed. If <c>null</c> or empty, method extracts an error string from the
+        /// <see cref="ModelBinding.ModelStateDictionary"/> object. Message will always be visible but client-side
+        /// validation may update the associated CSS class.
+        /// </param>
+        /// <param name="tag">
+        /// The tag to wrap the <paramref name="message"/> in the generated HTML. Its default value is
+        /// <see cref="ViewContext.ValidationMessageElement"/>.
+        /// </param>
+        /// <returns>
+        /// A new <see cref="IHtmlContent"/> containing a <paramref name="tag"/> element. An empty
+        /// <see cref="IHtmlContent"/> if the <paramref name="expression"/> is valid and client-side validation is
+        /// disabled.
+        /// </returns>
+        public static IHtmlContent ValidationMessage(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            string message,
+            string tag)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.ValidationMessage(expression, message, htmlAttributes: null, tag: tag);
+        }
+
+        /// <summary>
+        /// Returns the validation message if an error exists in the <see cref="ModelBinding.ModelStateDictionary"/>
+        /// object for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="message">
+        /// The message to be displayed. If <c>null</c> or empty, method extracts an error string from the
+        /// <see cref="ModelBinding.ModelStateDictionary"/> object. Message will always be visible but client-side
+        /// validation may update the associated CSS class.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the
+        /// (<see cref="ViewContext.ValidationMessageElement"/>) element. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the HTML
+        /// attributes.
+        /// </param>
+        /// <returns>
+        /// A new <see cref="IHtmlContent"/> containing a <see cref="ViewContext.ValidationMessageElement"/> element.
+        /// An empty <see cref="IHtmlContent"/> if the <paramref name="expression"/> is valid and client-side
+        /// validation is disabled.
+        /// </returns>
+        public static IHtmlContent ValidationMessage(
+            this IHtmlHelper htmlHelper,
+            string expression,
+            string message,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.ValidationMessage(expression, message, htmlAttributes, tag: null);
+        }
+
+        /// <summary>
+        /// Returns the validation message if an error exists in the <see cref="ModelBinding.ModelStateDictionary"/>
+        /// object for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>
+        /// A new <see cref="IHtmlContent"/> containing a <see cref="ViewContext.ValidationMessageElement"/> element.
+        /// An empty <see cref="IHtmlContent"/> if the <paramref name="expression"/> is valid and client-side
+        /// validation is disabled.
+        /// </returns>
+        /// <remarks>
+        /// Method extracts an error string from the <see cref="ModelBinding.ModelStateDictionary"/> object. Message
+        /// will always be visible but client-side validation may update the associated CSS class.
+        /// </remarks>
+        public static IHtmlContent ValidationMessageFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.ValidationMessageFor(expression, message: null, htmlAttributes: null, tag: null);
+        }
+
+        /// <summary>
+        /// Returns the validation message if an error exists in the <see cref="ModelBinding.ModelStateDictionary"/>
+        /// object for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="message">
+        /// The message to be displayed. If <c>null</c> or empty, method extracts an error string from the
+        /// <see cref="ModelBinding.ModelStateDictionary"/> object. Message will always be visible but client-side
+        /// validation may update the associated CSS class.
+        /// </param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>
+        /// A new <see cref="IHtmlContent"/> containing a <see cref="ViewContext.ValidationMessageElement"/> element.
+        /// An empty <see cref="IHtmlContent"/> if the <paramref name="expression"/> is valid and client-side
+        /// validation is disabled.
+        /// </returns>
+        public static IHtmlContent ValidationMessageFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression,
+            string message)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.ValidationMessageFor(expression, message, htmlAttributes: null, tag: null);
+        }
+
+        /// <summary>
+        /// Returns the validation message if an error exists in the <see cref="ModelBinding.ModelStateDictionary"/>
+        /// object for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="message">
+        /// The message to be displayed. If <c>null</c> or empty, method extracts an error string from the
+        /// <see cref="ModelBinding.ModelStateDictionary"/> object. Message will always be visible but client-side
+        /// validation may update the associated CSS class.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the
+        /// (<see cref="ViewContext.ValidationMessageElement"/>) element. Alternatively, an
+        /// <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing the HTML
+        /// attributes.
+        /// </param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>
+        /// A new <see cref="IHtmlContent"/> containing a <see cref="ViewContext.ValidationMessageElement"/> element.
+        /// An empty <see cref="IHtmlContent"/> if the <paramref name="expression"/> is valid and client-side
+        /// validation is disabled.
+        /// </returns>
+        public static IHtmlContent ValidationMessageFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression,
+            string message,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.ValidationMessageFor(expression, message, htmlAttributes, tag: null);
+        }
+
+        /// <summary>
+        /// Returns the validation message if an error exists in the <see cref="ModelBinding.ModelStateDictionary"/>
+        /// object for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="message">
+        /// The message to be displayed. If <c>null</c> or empty, method extracts an error string from the
+        /// <see cref="ModelBinding.ModelStateDictionary"/> object. Message will always be visible but client-side
+        /// validation may update the associated CSS class.
+        /// </param>
+        /// <param name="tag">
+        /// The tag to wrap the <paramref name="message"/> in the generated HTML. Its default value is
+        /// <see cref="ViewContext.ValidationMessageElement"/>.
+        /// </param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>
+        /// A new <see cref="IHtmlContent"/> containing the <paramref name="tag"/> element. An empty
+        /// <see cref="IHtmlContent"/> if the <paramref name="expression"/> is valid and client-side validation is
+        /// disabled.
+        /// </returns>
+        public static IHtmlContent ValidationMessageFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression,
+            string message,
+            string tag)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.ValidationMessageFor(expression, message, htmlAttributes: null, tag: tag);
+        }
+
+        /// <summary>
+        /// Returns an unordered list (&lt;ul&gt; element) of validation messages that are in the
+        /// <see cref="ModelBinding.ModelStateDictionary"/> object.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <returns>
+        /// New <see cref="IHtmlContent"/> containing a &lt;div&gt; element wrapping the &lt;ul&gt; element.
+        /// An empty <see cref="IHtmlContent"/> if the current model is valid and client-side validation is disabled.
+        /// </returns>
+        public static IHtmlContent ValidationSummary(this IHtmlHelper htmlHelper)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.ValidationSummary(
+                excludePropertyErrors: false,
+                message: null,
+                htmlAttributes: null,
+                tag: null);
+        }
+
+        /// <summary>
+        /// Returns an unordered list (&lt;ul&gt; element) of validation messages that are in the
+        /// <see cref="ModelBinding.ModelStateDictionary"/> object.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="excludePropertyErrors">
+        /// If <c>true</c>, display model-level errors only; otherwise display all errors.
+        /// </param>
+        /// <returns>
+        /// New <see cref="IHtmlContent"/> containing a &lt;div&gt; element wrapping the &lt;ul&gt; element.
+        /// An empty <see cref="IHtmlContent"/> if the current model is valid and client-side validation is disabled.
+        /// </returns>
+        public static IHtmlContent ValidationSummary(this IHtmlHelper htmlHelper, bool excludePropertyErrors)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.ValidationSummary(
+                excludePropertyErrors,
+                message: null,
+                htmlAttributes: null,
+                tag: null);
+        }
+
+        /// <summary>
+        /// Returns an unordered list (&lt;ul&gt; element) of validation messages that are in the
+        /// <see cref="ModelBinding.ModelStateDictionary"/> object.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="message">The message to display with the validation summary.</param>
+        /// <returns>
+        /// New <see cref="IHtmlContent"/> containing a &lt;div&gt; element wrapping the
+        /// <see cref="ViewContext.ValidationSummaryMessageElement" /> element (which wraps the
+        /// <paramref name="message"/>) and the &lt;ul&gt; element. An empty <see cref="IHtmlContent"/> if the current
+        /// model is valid and client-side validation is disabled.
+        /// </returns>
+        public static IHtmlContent ValidationSummary(this IHtmlHelper htmlHelper, string message)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.ValidationSummary(
+                excludePropertyErrors: false,
+                message: message,
+                htmlAttributes: null,
+                tag: null);
+        }
+
+        /// <summary>
+        /// Returns an unordered list (&lt;ul&gt; element) of validation messages that are in the
+        /// <see cref="ModelBinding.ModelStateDictionary"/> object.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="message">The message to display with the validation summary.</param>
+        /// <param name="tag">
+        /// The tag to wrap the <paramref name="message"/> in the generated HTML. Its default value is
+        /// <see cref="ViewContext.ValidationSummaryMessageElement" />.
+        /// </param>
+        /// <returns>
+        /// New <see cref="IHtmlContent"/> containing a &lt;div&gt; element wrapping the <paramref name="tag"/> element
+        /// and the &lt;ul&gt; element. An empty <see cref="IHtmlContent"/> if the current model is valid and
+        /// client-side validation is disabled.
+        /// </returns>
+        public static IHtmlContent ValidationSummary(this IHtmlHelper htmlHelper, string message, string tag)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.ValidationSummary(
+                excludePropertyErrors: false,
+                message: message,
+                htmlAttributes: null,
+                tag: tag);
+        }
+
+        /// <summary>
+        /// Returns an unordered list (&lt;ul&gt; element) of validation messages that are in the
+        /// <see cref="ModelBinding.ModelStateDictionary"/> object.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="excludePropertyErrors">
+        /// If <c>true</c>, display model-level errors only; otherwise display all errors.
+        /// </param>
+        /// <param name="message">The message to display with the validation summary.</param>
+        /// <returns>
+        /// New <see cref="IHtmlContent"/> containing a &lt;div&gt; element wrapping the
+        /// <see cref="ViewContext.ValidationSummaryMessageElement" /> element (which, in turn, wraps the
+        /// <paramref name="message"/>) and the &lt;ul&gt; element. An empty <see cref="IHtmlContent"/> if the current
+        /// model is valid and client-side validation is disabled.
+        /// </returns>
+        public static IHtmlContent ValidationSummary(
+            this IHtmlHelper htmlHelper,
+            bool excludePropertyErrors,
+            string message)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.ValidationSummary(
+                excludePropertyErrors,
+                message,
+                htmlAttributes: null,
+                tag: null);
+        }
+
+        /// <summary>
+        /// Returns an unordered list (&lt;ul&gt; element) of validation messages that are in the
+        /// <see cref="ModelBinding.ModelStateDictionary"/> object.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="message">The message to display with the validation summary.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the topmost (&lt;div&gt;) element.
+        /// Alternatively, an <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing
+        /// the HTML attributes.
+        /// </param>
+        /// <returns>
+        /// New <see cref="IHtmlContent"/> containing a &lt;div&gt; element wrapping the
+        /// <see cref="ViewContext.ValidationSummaryMessageElement" /> element (which wraps the
+        /// <paramref name="message"/>) and the &lt;ul&gt; element. An empty <see cref="IHtmlContent"/> if the current
+        /// model is valid and client-side validation is disabled.
+        /// </returns>
+        public static IHtmlContent ValidationSummary(
+            this IHtmlHelper htmlHelper,
+            string message,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.ValidationSummary(
+                excludePropertyErrors: false,
+                message: message,
+                htmlAttributes: htmlAttributes,
+                tag: null);
+        }
+
+        /// <summary>
+        /// Returns an unordered list (&lt;ul&gt; element) of validation messages that are in the
+        /// <see cref="ModelBinding.ModelStateDictionary"/> object.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="message">The message to display with the validation summary.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the topmost (&lt;div&gt;) element.
+        /// Alternatively, an <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing
+        /// the HTML attributes.
+        /// </param>
+        /// <param name="tag">
+        /// The tag to wrap the <paramref name="message"/> in the generated HTML. Its default value is
+        /// <see cref="ViewContext.ValidationSummaryMessageElement" />.
+        /// </param>
+        /// <returns>
+        /// New <see cref="IHtmlContent"/> containing a &lt;div&gt; element wrapping the <paramref name="tag"/> element
+        /// and the &lt;ul&gt; element. An empty <see cref="IHtmlContent"/> if the current model is valid and
+        /// client-side validation is disabled.
+        /// </returns>
+        public static IHtmlContent ValidationSummary(
+            this IHtmlHelper htmlHelper,
+            string message,
+            object htmlAttributes,
+            string tag)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.ValidationSummary(
+                excludePropertyErrors: false,
+                message: message,
+                htmlAttributes: htmlAttributes,
+                tag: tag);
+        }
+
+        /// <summary>
+        /// Returns an unordered list (&lt;ul&gt; element) of validation messages that are in the
+        /// <see cref="ModelBinding.ModelStateDictionary"/> object.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="excludePropertyErrors">
+        /// If <c>true</c>, display model-level errors only; otherwise display all errors.
+        /// </param>
+        /// <param name="message">The message to display with the validation summary.</param>
+        /// <param name="tag">
+        /// The tag to wrap the <paramref name="message"/> in the generated HTML. Its default value is
+        /// <see cref="ViewContext.ValidationSummaryMessageElement" />.
+        /// </param>
+        /// <returns>
+        /// New <see cref="IHtmlContent"/> containing a &lt;div&gt; element wrapping the <paramref name="tag"/> element
+        /// and the &lt;ul&gt; element. An empty <see cref="IHtmlContent"/> if the current model is valid and
+        /// client-side validation is disabled.
+        /// </returns>
+        public static IHtmlContent ValidationSummary(
+            this IHtmlHelper htmlHelper,
+            bool excludePropertyErrors,
+            string message,
+            string tag)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.ValidationSummary(
+                excludePropertyErrors,
+                message,
+                htmlAttributes: null,
+                tag: tag);
+        }
+
+        /// <summary>
+        /// Returns an unordered list (&lt;ul&gt; element) of validation messages that are in the
+        /// <see cref="ModelBinding.ModelStateDictionary"/> object.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="excludePropertyErrors">
+        /// If <c>true</c>, display model-level errors only; otherwise display all errors.
+        /// </param>
+        /// <param name="message">The message to display with the validation summary.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the topmost (&lt;div&gt;) element.
+        /// Alternatively, an <see cref="System.Collections.Generic.IDictionary{String, Object}"/> instance containing
+        /// the HTML attributes.
+        /// </param>
+        /// <returns>
+        /// New <see cref="IHtmlContent"/> containing a &lt;div&gt; element wrapping the
+        /// <see cref="ViewContext.ValidationSummaryMessageElement" /> element (which wraps the
+        /// <paramref name="message"/>) and the &lt;ul&gt; element. An empty <see cref="IHtmlContent"/> if the current
+        /// model is valid and client-side validation is disabled.
+        /// </returns>
+        public static IHtmlContent ValidationSummary(
+            this IHtmlHelper htmlHelper,
+            bool excludePropertyErrors,
+            string message,
+            object htmlAttributes)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.ValidationSummary(excludePropertyErrors, message, htmlAttributes, tag: null);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperValueExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperValueExtensions.cs
new file mode 100644
index 0000000000..8def65a53c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperValueExtensions.cs
@@ -0,0 +1,121 @@
+// 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.
+
+using System;
+using System.Linq.Expressions;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Value-related extensions for <see cref="IHtmlHelper"/> and <see cref="IHtmlHelper{TModel}"/>.
+    /// </summary>
+    public static class HtmlHelperValueExtensions
+    {
+        /// <summary>
+        /// Returns the formatted value for the specified <paramref name="expression"/>. Specifically, returns the
+        /// first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <returns>A <see cref="string"/> containing the formatted value.</returns>
+        /// <remarks>
+        /// Converts the expression result to a <see cref="string"/> directly.
+        /// </remarks>
+        public static string Value(this IHtmlHelper htmlHelper, string expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Value(expression, format: null);
+        }
+
+        /// <summary>
+        /// Returns the formatted value for the specified <paramref name="expression"/>. Specifically, returns the
+        /// first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper{TModel}.NameFor"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A <see cref="string"/> containing the formatted value.</returns>
+        /// <remarks>
+        /// Converts the <paramref name="expression"/> result to a <see cref="string"/> directly.
+        /// </remarks>
+        public static string ValueFor<TModel, TResult>(
+            this IHtmlHelper<TModel> htmlHelper,
+            Expression<Func<TModel, TResult>> expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return htmlHelper.ValueFor(expression, format: null);
+        }
+
+        /// <summary>
+        /// Returns the formatted value for the current model. Specifically, returns the
+        /// first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name, or
+        /// the <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <returns>A <see cref="string"/> containing the formatted value.</returns>
+        /// <remarks>
+        /// Converts the model value to a <see cref="string"/> directly.
+        /// </remarks>
+        public static string ValueForModel(this IHtmlHelper htmlHelper)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Value(expression: null, format: null);
+        }
+
+        /// <summary>
+        /// Returns the formatted value for the current model. Specifically, returns the
+        /// first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <see cref="IHtmlHelper.ViewData"/> entry with full name, or
+        /// the <see cref="ViewFeatures.ViewDataDictionary.Model"/>.
+        /// See <see cref="IHtmlHelper.Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="format">
+        /// The format string (see https://msdn.microsoft.com/en-us/library/txafckwd.aspx) used to format the return
+        /// value unless that came from model binding.
+        /// </param>
+        /// <returns>A <see cref="string"/> containing the formatted value.</returns>
+        /// <remarks>
+        /// Converts the model value to a <see cref="string"/> directly if
+        /// <paramref name="format"/> is <c>null</c> or empty.
+        /// </remarks>
+        public static string ValueForModel(this IHtmlHelper htmlHelper, string format)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            return htmlHelper.Value(expression: null, format: format);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelper.cs
new file mode 100644
index 0000000000..357d429c94
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelper.cs
@@ -0,0 +1,736 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Base HTML helpers.
+    /// </summary>
+    public interface IHtmlHelper
+    {
+        /// <summary>
+        /// Set this property to <see cref="Html5DateRenderingMode.CurrentCulture" /> to have templated helpers such as
+        /// <see cref="Editor" /> and <see cref="IHtmlHelper{TModel}.EditorFor" /> render date and time
+        /// values using the current culture. By default, these helpers render dates and times as RFC 3339 compliant strings.
+        /// </summary>
+        Html5DateRenderingMode Html5DateRenderingMode { get; set; }
+
+        /// <summary>
+        /// Gets the <see cref="string"/> that replaces periods in the ID attribute of an element.
+        /// </summary>
+        string IdAttributeDotReplacement { get; }
+
+        /// <summary>
+        /// Gets the metadata provider. Intended for use in <see cref="IHtmlHelper"/> extension methods.
+        /// </summary>
+        IModelMetadataProvider MetadataProvider { get; }
+
+        /// <summary>
+        /// Gets the view bag.
+        /// </summary>
+        dynamic ViewBag { get; }
+
+        /// <summary>
+        /// Gets the context information about the view.
+        /// </summary>
+        ViewContext ViewContext { get; }
+
+        /// <summary>
+        /// Gets the current view data.
+        /// </summary>
+        ViewDataDictionary ViewData { get; }
+
+        /// <summary>
+        /// Gets the current <see cref="ITempDataDictionary"/> instance.
+        /// </summary>
+        ITempDataDictionary TempData { get; }
+
+        /// <summary>
+        /// Gets the <see cref="UrlEncoder"/> to be used for encoding a URL.
+        /// </summary>
+        UrlEncoder UrlEncoder { get; }
+
+        /// <summary>
+        /// Returns an anchor (&lt;a&gt;) element that contains a URL path to the specified action.
+        /// </summary>
+        /// <param name="linkText">The inner text of the anchor element. Must not be <c>null</c>.</param>
+        /// <param name="actionName">The name of the action.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="protocol">The protocol for the URL, such as &quot;http&quot; or &quot;https&quot;.</param>
+        /// <param name="hostname">The host name for the URL.</param>
+        /// <param name="fragment">The URL fragment name (the anchor name).</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the route parameters.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the anchor element.</returns>
+        IHtmlContent ActionLink(
+            string linkText,
+            string actionName,
+            string controllerName,
+            string protocol,
+            string hostname,
+            string fragment,
+            object routeValues,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Returns a &lt;hidden&gt; element (antiforgery token) that will be validated when the containing
+        /// &lt;form&gt; is submitted.
+        /// </summary>
+        /// <returns><see cref="IHtmlContent"/> containing the &lt;hidden&gt; element.</returns>
+        IHtmlContent AntiForgeryToken();
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. When the user submits the form, the action with name
+        /// <paramref name="actionName"/> will process the request.
+        /// </summary>
+        /// <param name="actionName">The name of the action method.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the route parameters.
+        /// </param>
+        /// <param name="method">The HTTP method for processing the form, either GET or POST.</param>
+        /// <param name="antiforgery">
+        /// If <c>true</c>, &lt;form&gt; elements will include an antiforgery token.
+        /// If <c>false</c>, suppresses the generation an &lt;input&gt; of type "hidden" with an antiforgery token.
+        /// If <c>null</c>, &lt;form&gt; elements will include an antiforgery token only if
+        /// <paramref name="method"/> is not <see cref="FormMethod.Get"/>.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        MvcForm BeginForm(
+            string actionName,
+            string controllerName,
+            object routeValues,
+            FormMethod method,
+            bool? antiforgery,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. The route with name <paramref name="routeName"/>
+        /// generates the &lt;form&gt;'s <c>action</c> attribute value.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the route parameters.
+        /// </param>
+        /// <param name="method">The HTTP method for processing the form, either GET or POST.</param>
+        /// <param name="antiforgery">
+        /// If <c>true</c>, &lt;form&gt; elements will include an antiforgery token.
+        /// If <c>false</c>, suppresses the generation an &lt;input&gt; of type "hidden" with an antiforgery token.
+        /// If <c>null</c>, &lt;form&gt; elements will include an antiforgery token only if
+        /// <paramref name="method"/> is not <see cref="FormMethod.Get"/>.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        MvcForm BeginRouteForm(
+            string routeName,
+            object routeValues,
+            FormMethod method,
+            bool? antiforgery,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "checkbox" with value "true" and an &lt;input&gt; element of type
+        /// "hidden" with value "false" for the specified <paramref name="expression"/>. Adds a "checked" attribute to
+        /// the "checkbox" element based on the first non-<c>null</c> value found in:
+        /// the <paramref name="htmlAttributes"/> dictionary entry with key "checked",
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <see cref="ViewData"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewDataDictionary.Model"/>.
+        /// If <paramref name="isChecked"/> is non-<c>null</c>, instead uses the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="isChecked"/> parameter.
+        /// See <see cref="Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="isChecked">If <c>true</c>, checkbox is initially checked.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the checkbox element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; elements.</returns>
+        /// <remarks>
+        /// Combines <see cref="TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set checkbox
+        /// element's "name" attribute. Sanitizes <paramref name="expression"/> to set checkbox element's "id"
+        /// attribute.
+        /// </remarks>
+        IHtmlContent CheckBox(string expression, bool? isChecked, object htmlAttributes);
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using a display template, specified HTML field
+        /// name, and additional view data. The template is found using the <paramref name="templateName"/> or the
+        /// <paramref name="expression"/>'s <see cref="ModelMetadata"/>.
+        /// </summary>
+        /// <param name="expression">
+        /// Expression name, relative to the current model. May identify a single property or an
+        /// <see cref="object"/> that contains the properties to display.
+        /// </param>
+        /// <param name="templateName">The name of the template used to create the HTML markup.</param>
+        /// <param name="htmlFieldName">
+        /// A <see cref="string"/> used to disambiguate the names of HTML elements that are created for
+        /// properties that have the same name.
+        /// </param>
+        /// <param name="additionalViewData">
+        /// An anonymous <see cref="object"/> or <see cref="IDictionary{String, Object}"/> that can contain additional
+        /// view data that will be merged into the <see cref="ViewDataDictionary{TModel}"/> instance created for the
+        /// template.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the created HTML.</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> display template includes markup for each property in the
+        /// <paramref name="expression"/>'s value.
+        /// </para>
+        /// <para>
+        /// Example <paramref name="expression"/>s include <c>string.Empty</c> which identifies the current model and
+        /// <c>"prop"</c> which identifies the current model's "prop" property.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>DisplayTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        IHtmlContent Display(
+            string expression,
+            string templateName,
+            string htmlFieldName,
+            object additionalViewData);
+
+        /// <summary>
+        /// Returns the display name for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <returns>A <see cref="string"/> containing the display name.</returns>
+        string DisplayName(string expression);
+
+        /// <summary>
+        /// Returns the simple display text for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <returns>
+        /// A <see cref="string"/> containing the simple display text.
+        /// If the expression result is <c>null</c>, returns <see cref="ModelMetadata.NullDisplayText"/>.
+        /// </returns>
+        string DisplayText(string expression);
+
+        /// <summary>
+        /// Returns a single-selection HTML &lt;select&gt; element for the <paramref name="expression"/>. Adds
+        /// &lt;option&gt; elements based on <paramref name="optionLabel"/> and <paramref name="selectList"/>. Adds a
+        /// "selected" attribute to an &lt;option&gt; if its <see cref="SelectListItem.Value"/> (if non-<c>null</c>) or
+        /// <see cref="SelectListItem.Text"/> matches the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <see cref="ViewData"/> entry with full name (unless used instead of <paramref name="selectList"/>), or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewDataDictionary.Model"/>.
+        /// See <see cref="Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="selectList">
+        /// A collection of <see cref="SelectListItem"/> objects used to populate the &lt;select&gt; element with
+        /// &lt;optgroup&gt; and &lt;option&gt; elements. If <c>null</c>, uses the <see cref="ViewData"/> entry with
+        /// full name and that entry must be a collection of <see cref="SelectListItem"/> objects.
+        /// </param>
+        /// <param name="optionLabel">
+        /// The text for a default empty item. Does not include such an item if argument is <c>null</c>.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the &lt;select&gt; element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;select&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;select&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        IHtmlContent DropDownList(
+            string expression,
+            IEnumerable<SelectListItem> selectList,
+            string optionLabel,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using an editor template, specified HTML field
+        /// name, and additional view data. The template is found using the <paramref name="templateName"/> or the
+        /// <paramref name="expression"/>'s <see cref="ModelMetadata"/>.
+        /// </summary>
+        /// <param name="expression">
+        /// Expression name, relative to the current model. May identify a single property or an
+        /// <see cref="object"/> that contains the properties to edit.
+        /// </param>
+        /// <param name="templateName">The name of the template used to create the HTML markup.</param>
+        /// <param name="htmlFieldName">
+        /// A <see cref="string"/> used to disambiguate the names of HTML elements that are created for
+        /// properties that have the same name.
+        /// </param>
+        /// <param name="additionalViewData">
+        /// An anonymous <see cref="object"/> or <see cref="IDictionary{String, Object}"/> that can contain additional
+        /// view data that will be merged into the <see cref="ViewDataDictionary{TModel}"/> instance created for the
+        /// template.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element(s).</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> editor template includes &lt;label&gt; and &lt;input&gt;
+        /// elements for each property in the <paramref name="expression"/>'s value.
+        /// </para>
+        /// <para>
+        /// Example <paramref name="expression"/>s include <c>string.Empty</c> which identifies the current model and
+        /// <c>"prop"</c> which identifies the current model's "prop" property.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>EditorTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        IHtmlContent Editor(string expression, string templateName, string htmlFieldName, object additionalViewData);
+
+        /// <summary>
+        /// Converts the <paramref name="value"/> to an HTML-encoded <see cref="string"/>.
+        /// </summary>
+        /// <param name="value">The <see cref="object"/> to encode.</param>
+        /// <returns>The HTML-encoded <see cref="string"/>.</returns>
+        string Encode(object value);
+
+        /// <summary>
+        /// Converts the specified <see cref="string"/> to an HTML-encoded <see cref="string"/>.
+        /// </summary>
+        /// <param name="value">The <see cref="string"/> to encode.</param>
+        /// <returns>The HTML-encoded <see cref="string"/>.</returns>
+        string Encode(string value);
+
+        /// <summary>
+        /// Renders the &lt;/form&gt; end tag to the response.
+        /// </summary>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        void EndForm();
+
+        /// <summary>
+        /// Formats the value.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <param name="format">
+        /// The format string (see https://msdn.microsoft.com/en-us/library/txafckwd.aspx) used to format the return
+        /// value.
+        /// </param>
+        /// <returns>A <see cref="string"/> containing the formatted value.</returns>
+        /// <remarks>
+        /// Converts <paramref name="value"/> to a <see cref="string"/> directly if
+        /// <paramref name="format"/> is <c>null</c> or empty.
+        /// </remarks>
+        string FormatValue(object value, string format);
+
+        /// <summary>
+        /// Returns an HTML element Id for the specified expression <paramref name="fullName"/>.
+        /// </summary>
+        /// <param name="fullName">
+        /// Fully-qualified expression name, ignoring the current model. Must not be <c>null</c>. See
+        /// <see cref="Name"/> for more information about a "full name".
+        /// </param>
+        /// <returns>A <see cref="string"/> containing the element Id.</returns>
+        string GenerateIdFromName(string fullName);
+
+        /// <summary>
+        /// Returns a select list for the given <typeparamref name="TEnum"/>.
+        /// </summary>
+        /// <typeparam name="TEnum">Type to generate a select list for.</typeparam>
+        /// <returns>
+        /// An <see cref="IEnumerable{SelectListItem}"/> containing the select list for the given
+        /// <typeparamref name="TEnum"/>.
+        /// </returns>
+        /// <exception cref="ArgumentException">
+        /// Thrown if <typeparamref name="TEnum"/> is not an <see cref="Enum"/> or if it has a
+        /// <see cref="FlagsAttribute"/>.
+        /// </exception>
+        IEnumerable<SelectListItem> GetEnumSelectList<TEnum>() where TEnum : struct;
+
+        /// <summary>
+        /// Returns a select list for the given <paramref name="enumType"/>.
+        /// </summary>
+        /// <param name="enumType"><see cref="Type"/> to generate a select list for.</param>
+        /// <returns>
+        /// An <see cref="IEnumerable{SelectListItem}"/> containing the select list for the given
+        /// <paramref name="enumType"/>.
+        /// </returns>
+        /// <exception cref="ArgumentException">
+        /// Thrown if <paramref name="enumType"/> is not an <see cref="Enum"/> or if it has a
+        /// <see cref="FlagsAttribute"/>.
+        /// </exception>
+        IEnumerable<SelectListItem> GetEnumSelectList(Type enumType);
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "hidden" for the specified <paramref name="expression"/>. Adds a
+        /// "value" attribute to the element containing the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <paramref name="value"/> parameter,
+        /// the <see cref="ViewData"/> entry with full name,
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewDataDictionary.Model"/>, or
+        /// the <paramref name="htmlAttributes"/> dictionary entry with key "value".
+        /// See <see cref="Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="value">If non-<c>null</c>, value to include in the element.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;input&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        IHtmlContent Hidden(string expression, object value, object htmlAttributes);
+
+        /// <summary>
+        /// Returns the HTML element Id for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <returns>A <see cref="string"/> containing the element Id.</returns>
+        string Id(string expression);
+
+        /// <summary>
+        /// Returns a &lt;label&gt; element for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="labelText">The inner text of the element.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;label&gt; element.</returns>
+        IHtmlContent Label(string expression, string labelText, object htmlAttributes);
+
+        /// <summary>
+        /// Returns a multi-selection &lt;select&gt; element for the <paramref name="expression"/>. Adds
+        /// &lt;option&gt; elements based on <paramref name="selectList"/>. Adds a "selected" attribute to an
+        /// &lt;option&gt; if its <see cref="SelectListItem.Value"/> (if non-<c>null</c>) or
+        /// <see cref="SelectListItem.Text"/> matches an entry in the first non-<c>null</c> collection found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <see cref="ViewData"/> entry with full name (unless used instead of <paramref name="selectList"/>), or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewDataDictionary.Model"/>.
+        /// See <see cref="Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="selectList">
+        /// A collection of <see cref="SelectListItem"/> objects used to populate the &lt;select&gt; element with
+        /// &lt;optgroup&gt; and &lt;option&gt; elements. If <c>null</c>, finds the <see cref="SelectListItem"/>
+        /// collection with name <paramref name="expression"/> in <see cref="ViewData"/>.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the &lt;select&gt; element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;select&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;select&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        IHtmlContent ListBox(string expression, IEnumerable<SelectListItem> selectList, object htmlAttributes);
+
+        /// <summary>
+        /// Returns the full HTML element name for the specified <paramref name="expression"/>. Uses
+        /// <see cref="TemplateInfo.HtmlFieldPrefix"/> (if non-empty) to reflect relationship between current
+        /// <see cref="ViewDataDictionary.Model"/> and the top-level view's model.
+        /// </summary>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <returns>A <see cref="string"/> containing the element name.</returns>
+        string Name(string expression);
+
+        /// <summary>
+        /// Returns HTML markup for the specified partial view.
+        /// </summary>
+        /// <param name="partialViewName">
+        /// The name of the partial view used to create the HTML markup. Must not be <c>null</c>.
+        /// </param>
+        /// <param name="model">A model to pass into the partial view.</param>
+        /// <param name="viewData">A <see cref="ViewDataDictionary"/> to pass into the partial view.</param>
+        /// <returns>
+        /// A <see cref="Task"/> that on completion returns a new <see cref="IHtmlContent"/> instance containing
+        /// the created HTML.
+        /// </returns>
+        Task<IHtmlContent> PartialAsync(string partialViewName, object model, ViewDataDictionary viewData);
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "password" for the specified <paramref name="expression"/>. Adds a
+        /// "value" attribute containing the first non-<c>null</c> value in:
+        /// the <paramref name="value"/> parameter, or
+        /// the <paramref name="htmlAttributes"/> dictionary entry with key "value".
+        /// </summary>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="value">If non-<c>null</c>, value to include in the element.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;input&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        IHtmlContent Password(string expression, object value, object htmlAttributes);
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "radio" for the specified <paramref name="expression"/>.
+        /// Adds a "value" attribute to the element containing the first non-<c>null</c> value found in:
+        /// the <paramref name="value"/> parameter, or
+        /// the <paramref name="htmlAttributes"/> dictionary entry with key "value".
+        /// Adds a "checked" attribute to the element if <paramref name="value"/> matches the first non-<c>null</c>
+        /// value found in:
+        /// the <paramref name="htmlAttributes"/> dictionary entry with key "checked",
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <see cref="ViewData"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewDataDictionary.Model"/>.
+        /// If <paramref name="isChecked"/> is non-<c>null</c>, instead uses the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="isChecked"/> parameter.
+        /// See <see cref="Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="value">
+        /// If non-<c>null</c>, value to include in the element. Must not be <c>null</c> if
+        /// <paramref name="isChecked"/> is also <c>null</c> and no "checked" entry exists in
+        /// <paramref name="htmlAttributes"/>.
+        /// </param>
+        /// <param name="isChecked">
+        /// If <c>true</c>, radio button is initially selected. Must not be <c>null</c> if
+        /// <paramref name="value"/> is also <c>null</c> and no "checked" entry exists in
+        /// <paramref name="htmlAttributes"/>.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;input&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        IHtmlContent RadioButton(string expression, object value, bool? isChecked, object htmlAttributes);
+
+        /// <summary>
+        /// Wraps HTML markup in an <see cref="HtmlString"/>, without HTML-encoding the specified
+        /// <paramref name="value"/>.
+        /// </summary>
+        /// <param name="value">HTML markup <see cref="string"/>.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the wrapped <see cref="string"/>.</returns>
+        IHtmlContent Raw(string value);
+
+        /// <summary>
+        /// Wraps HTML markup from the string representation of an <see cref="object"/> in an
+        /// <see cref="HtmlString"/>, without HTML-encoding the string representation.
+        /// </summary>
+        /// <param name="value">The <see cref="object"/> to wrap.</param>
+        /// <returns><see cref="IHtmlContent"/> containing the wrapped string representation.</returns>
+        IHtmlContent Raw(object value);
+
+        /// <summary>
+        /// Renders HTML markup for the specified partial view.
+        /// </summary>
+        /// <param name="partialViewName">
+        /// The name or path of the partial view used to create the HTML markup. Must not be <c>null</c>.
+        /// </param>
+        /// <param name="model">A model to pass into the partial view.</param>
+        /// <param name="viewData">A <see cref="ViewDataDictionary"/> to pass into the partial view.</param>
+        /// <returns>A <see cref="Task"/> that renders the created HTML when it executes.</returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        Task RenderPartialAsync(string partialViewName, object model, ViewDataDictionary viewData);
+
+        /// <summary>
+        /// Returns an anchor (&lt;a&gt;) element that contains a URL path to the specified route.
+        /// </summary>
+        /// <param name="linkText">The inner text of the anchor element. Must not be <c>null</c>.</param>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="protocol">The protocol for the URL, such as &quot;http&quot; or &quot;https&quot;.</param>
+        /// <param name="hostName">The host name for the URL.</param>
+        /// <param name="fragment">The URL fragment name (the anchor name).</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the route parameters.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the anchor element.</returns>
+        IHtmlContent RouteLink(
+            string linkText,
+            string routeName,
+            string protocol,
+            string hostName,
+            string fragment,
+            object routeValues,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Returns a &lt;textarea&gt; element for the specified <paramref name="expression"/>. Adds content to the
+        /// element body based on the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <paramref name="value"/> parameter,
+        /// the <see cref="ViewData"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewDataDictionary.Model"/>.
+        /// See <see cref="Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="value">If non-<c>null</c>, value to include in the element.</param>
+        /// <param name="rows">Number of rows in the textarea.</param>
+        /// <param name="columns">Number of columns in the textarea.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;textarea&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;textarea&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        IHtmlContent TextArea(string expression, string value, int rows, int columns, object htmlAttributes);
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "text" for the specified <paramref name="expression"/>. Adds a
+        /// "value" attribute to the element containing the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <paramref name="value"/> parameter,
+        /// the <see cref="ViewData"/> entry with full name,
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewDataDictionary.Model"/>, or
+        /// the <paramref name="htmlAttributes"/> dictionary entry with key "value".
+        /// See <see cref="Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="value">If non-<c>null</c>, value to include in the element.</param>
+        /// <param name="format">
+        /// The format string (see https://msdn.microsoft.com/en-us/library/txafckwd.aspx) used to format the "value"
+        /// attribute unless that came from model binding.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;input&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </remarks>
+        IHtmlContent TextBox(string expression, object value, string format, object htmlAttributes);
+
+        /// <summary>
+        /// Returns the validation message if an error exists in the <see cref="ModelStateDictionary"/> object
+        /// for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="message">
+        /// The message to be displayed. If <c>null</c> or empty, method extracts an error string from the
+        /// <see cref="ModelStateDictionary"/> object. Message will always be visible but client-side validation may
+        /// update the associated CSS class.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the <paramref name="tag"/> element.
+        /// Alternatively, an <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <param name="tag">
+        /// The tag to wrap the <paramref name="message"/> in the generated HTML. Its default value is
+        /// <see cref="ViewContext.ValidationMessageElement"/>.
+        /// </param>
+        /// <returns>
+        /// A new <see cref="IHtmlContent"/> containing a <paramref name="tag"/> element. An empty
+        /// <see cref="IHtmlContent"/> if the <paramref name="expression"/> is valid and client-side validation is
+        /// disabled.
+        /// </returns>
+        IHtmlContent ValidationMessage(string expression, string message, object htmlAttributes, string tag);
+
+        /// <summary>
+        /// Returns an unordered list (&lt;ul&gt; element) of validation messages that are in the
+        /// <see cref="ModelStateDictionary"/> object.
+        /// </summary>
+        /// <param name="excludePropertyErrors">
+        /// If <c>true</c>, display model-level errors only; otherwise display all errors.
+        /// </param>
+        /// <param name="message">The message to display with the validation summary.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the topmost (&lt;div&gt;) element.
+        /// Alternatively, an <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <param name="tag">
+        /// The tag to wrap the <paramref name="message"/> in the generated HTML. Its default value is
+        /// <see cref="ViewContext.ValidationSummaryMessageElement" />.
+        /// </param>
+        /// <returns>
+        /// New <see cref="IHtmlContent"/> containing a &lt;div&gt; element wrapping the <paramref name="tag"/> element
+        /// and the &lt;ul&gt; element. An empty <see cref="IHtmlContent"/> if the current model is valid and
+        /// client-side validation is disabled.
+        /// </returns>
+        IHtmlContent ValidationSummary(
+            bool excludePropertyErrors,
+            string message,
+            object htmlAttributes,
+            string tag);
+
+        /// <summary>
+        /// Returns the formatted value for the specified <paramref name="expression"/>. Specifically, returns the
+        /// first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <see cref="ViewData"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewDataDictionary.Model"/>.
+        /// See <see cref="Name"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="format">
+        /// The format string (see https://msdn.microsoft.com/en-us/library/txafckwd.aspx) used to format the return
+        /// value unless that came from model binding.
+        /// </param>
+        /// <returns>A <see cref="string"/> containing the formatted value.</returns>
+        /// <remarks>
+        /// Converts the expression result to a <see cref="string"/> directly if
+        /// <paramref name="format"/> is <c>null</c> or empty.
+        /// </remarks>
+        string Value(string expression, string format);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelperOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelperOfT.cs
new file mode 100644
index 0000000000..df4d14d95d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelperOfT.cs
@@ -0,0 +1,445 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// An <see cref="IHtmlHelper"/> for Linq expressions.
+    /// </summary>
+    /// <typeparam name="TModel">The type of the model.</typeparam>
+    public interface IHtmlHelper<TModel> : IHtmlHelper
+    {
+        /// <summary>
+        /// Gets the current view data.
+        /// </summary>
+        new ViewDataDictionary<TModel> ViewData { get; }
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "checkbox" with value "true" and an &lt;input&gt; element of type
+        /// "hidden" with value "false" for the specified <paramref name="expression"/>. Adds a "checked" attribute to
+        /// the "checkbox" element based on the first non-<c>null</c> value found in:
+        /// the <paramref name="htmlAttributes"/> dictionary entry with key "checked", or
+        /// the <see cref="ActionContext.ModelState"/> entry with full name.
+        /// If <paramref name="expression"/> evaluates to a non-<c>null</c> value, instead uses the first
+        /// non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewDataDictionary.Model"/>.
+        /// See <see cref="NameFor"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the checkbox element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; elements.</returns>
+        /// <remarks>
+        /// Combines <see cref="TemplateInfo.HtmlFieldPrefix"/> and the string representation of the
+        /// <paramref name="expression"/> to set checkbox element's "name" attribute. Sanitizes the string
+        /// representation of the <paramref name="expression"/> to set checkbox element's "id" attribute.
+        /// </remarks>
+        IHtmlContent CheckBoxFor(Expression<Func<TModel, bool>> expression, object htmlAttributes);
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using a display template, specified HTML field
+        /// name, and additional view data. The template is found using the <paramref name="templateName"/> or the
+        /// <paramref name="expression"/>'s <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="templateName">The name of the template used to create the HTML markup.</param>
+        /// <param name="htmlFieldName">
+        /// A <see cref="string"/> used to disambiguate the names of HTML elements that are created for properties
+        /// that have the same name.
+        /// </param>
+        /// <param name="additionalViewData">
+        /// An anonymous <see cref="object"/> or <see cref="IDictionary{String, Object}"/> that can contain additional
+        /// view data that will be merged into the <see cref="ViewDataDictionary{TModel}"/> instance created for the
+        /// template.
+        /// </param>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the created HTML.</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> display template includes markup for each property in the
+        /// <paramref name="expression"/> result.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>DisplayTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        IHtmlContent DisplayFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            string templateName,
+            string htmlFieldName,
+            object additionalViewData);
+
+        /// <summary>
+        /// Returns the display name for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A <see cref="string"/> containing the display name.</returns>
+        string DisplayNameFor<TResult>(Expression<Func<TModel, TResult>> expression);
+
+        /// <summary>
+        /// Returns the display name for the specified <paramref name="expression"/>
+        /// if the current model represents a collection.
+        /// </summary>
+        /// <param name="expression">An expression to be evaluated against an item in the current model.</param>
+        /// <typeparam name="TModelItem">The type of items in the model collection.</typeparam>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A <see cref="string"/> containing the display name.</returns>
+        string DisplayNameForInnerType<TModelItem, TResult>(
+            Expression<Func<TModelItem, TResult>> expression);
+
+        /// <summary>
+        /// Returns the simple display text for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>
+        /// A <see cref="string"/> containing the simple display text.
+        /// If the <paramref name="expression"/> result is <c>null</c>, returns
+        /// <see cref="ModelBinding.ModelMetadata.NullDisplayText"/>.
+        /// </returns>
+        string DisplayTextFor<TResult>(Expression<Func<TModel, TResult>> expression);
+
+        /// <summary>
+        /// Returns a single-selection HTML &lt;select&gt; element for the <paramref name="expression"/>. Adds
+        /// &lt;option&gt; elements based on <paramref name="optionLabel"/> and <paramref name="selectList"/>. Adds a
+        /// "selected" attribute to an &lt;option&gt; if its <see cref="SelectListItem.Value"/> (if non-<c>null</c>) or
+        /// <see cref="SelectListItem.Text"/> matches the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewDataDictionary.Model"/>.
+        /// See <see cref="NameFor"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="selectList">
+        /// A collection of <see cref="SelectListItem"/> objects used to populate the &lt;select&gt; element with
+        /// &lt;optgroup&gt; and &lt;option&gt; elements. If <c>null</c>, uses the <see cref="ViewData"/> entry with
+        /// full name and that entry must be a collection of <see cref="SelectListItem"/> objects.
+        /// </param>
+        /// <param name="optionLabel">
+        /// The text for a default empty item. Does not include such an item if argument is <c>null</c>.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the &lt;select&gt; element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;select&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="TemplateInfo.HtmlFieldPrefix"/> and the string representation of the
+        /// <paramref name="expression"/> to set &lt;select&gt; element's "name" attribute. Sanitizes the string
+        /// representation of the <paramref name="expression"/> to set element's "id" attribute.
+        /// </remarks>
+        IHtmlContent DropDownListFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            IEnumerable<SelectListItem> selectList,
+            string optionLabel,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Returns HTML markup for the <paramref name="expression"/>, using an editor template, specified HTML field
+        /// name, and additional view data. The template is found using the <paramref name="templateName"/> or the
+        /// <paramref name="expression"/>'s <see cref="ModelBinding.ModelMetadata"/>.
+        /// </summary>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="templateName">The name of the template that is used to create the HTML markup.</param>
+        /// <param name="htmlFieldName">
+        /// A <see cref="string"/> used to disambiguate the names of HTML elements that are created for properties
+        /// that have the same name.
+        /// </param>
+        /// <param name="additionalViewData">
+        /// An anonymous <see cref="object"/> or <see cref="IDictionary{String, Object}"/> that can contain additional
+        /// view data that will be merged into the <see cref="ViewDataDictionary{TModel}"/> instance created for the
+        /// template.
+        /// </param>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element(s).</returns>
+        /// <remarks>
+        /// <para>
+        /// For example the default <see cref="object"/> editor template includes &lt;label&gt; and &lt;input&gt;
+        /// elements for each property in the <paramref name="expression"/> result.
+        /// </para>
+        /// <para>
+        /// Custom templates are found under a <c>EditorTemplates</c> folder. The folder name is case-sensitive on
+        /// case-sensitive file systems.
+        /// </para>
+        /// </remarks>
+        IHtmlContent EditorFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            string templateName,
+            string htmlFieldName,
+            object additionalViewData);
+
+        /// <inheritdoc cref="IHtmlHelper.Encode(object)"/>
+        new string Encode(object value);
+
+        /// <inheritdoc cref="IHtmlHelper.Encode(string)"/>
+        new string Encode(string value);
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "hidden" for the specified <paramref name="expression"/>. Adds a
+        /// "value" attribute to the element containing the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewDataDictionary.Model"/>, or
+        /// the <paramref name="htmlAttributes"/> dictionary entry with key "value".
+        /// See <see cref="NameFor"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="TemplateInfo.HtmlFieldPrefix"/> and the string representation of the
+        /// <paramref name="expression"/> to set &lt;input&gt; element's "name" attribute. Sanitizes the string
+        /// representation of the <paramref name="expression"/> to set element's "id" attribute.
+        /// </remarks>
+        IHtmlContent HiddenFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Returns the HTML element Id for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A <see cref="string"/> containing the element Id.</returns>
+        string IdFor<TResult>(Expression<Func<TModel, TResult>> expression);
+
+        /// <summary>
+        /// Returns a &lt;label&gt; element for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="labelText">The inner text of the element.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;label&gt; element.</returns>
+        IHtmlContent LabelFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            string labelText,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Returns a multi-selection &lt;select&gt; element for the <paramref name="expression"/>. Adds
+        /// &lt;option&gt; elements based on <paramref name="selectList"/>. Adds a "selected" attribute to an
+        /// &lt;option&gt; if its <see cref="SelectListItem.Value"/> (if non-<c>null</c>) or
+        /// <see cref="SelectListItem.Text"/> matches an entry in the first non-<c>null</c> collection found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewDataDictionary.Model"/>.
+        /// See <see cref="NameFor"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="selectList">
+        /// A collection of <see cref="SelectListItem"/> objects used to populate the &lt;select&gt; element with
+        /// &lt;optgroup&gt; and &lt;option&gt; elements. If <c>null</c>, finds the <see cref="SelectListItem"/>
+        /// collection with name <paramref name="expression"/> in <see cref="ViewData"/>.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the &lt;select&gt; element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;select&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="TemplateInfo.HtmlFieldPrefix"/> and the string representation of the
+        /// <paramref name="expression"/> to set &lt;select&gt; element's "name" attribute. Sanitizes the string
+        /// representation of the <paramref name="expression"/> to set element's "id" attribute.
+        /// </remarks>
+        IHtmlContent ListBoxFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            IEnumerable<SelectListItem> selectList,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Returns the full HTML element name for the specified <paramref name="expression"/>. Uses
+        /// <see cref="TemplateInfo.HtmlFieldPrefix"/> (if non-empty) to reflect relationship between current
+        /// <see cref="ViewDataDictionary.Model"/> and the top-level view's model.
+        /// </summary>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A <see cref="string"/> containing the element name.</returns>
+        string NameFor<TResult>(Expression<Func<TModel, TResult>> expression);
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "password" for the specified <paramref name="expression"/>. Adds a
+        /// "value" attribute containing the <paramref name="htmlAttributes"/> dictionary entry with key "value" (if
+        /// any).
+        /// </summary>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="TemplateInfo.HtmlFieldPrefix"/> and the string representation of the
+        /// <paramref name="expression"/> to set &lt;input&gt; element's "name" attribute. Sanitizes the string
+        /// representation of the <paramref name="expression"/> to set element's "id" attribute.
+        /// </remarks>
+        IHtmlContent PasswordFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "radio" for the specified <paramref name="expression"/>.
+        /// Adds a "value" attribute to the element containing the first non-<c>null</c> value found in:
+        /// the <paramref name="value"/> parameter, or
+        /// the <paramref name="htmlAttributes"/> dictionary entry with key "value".
+        /// Adds a "checked" attribute to the element if <paramref name="value"/> matches the first non-<c>null</c>
+        /// value found in:
+        /// the <paramref name="htmlAttributes"/> dictionary entry with key "checked", or
+        /// the <see cref="ActionContext.ModelState"/> entry with full name.
+        /// If <paramref name="expression"/> evaluates to a non-<c>null</c> value, instead uses the first
+        /// non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewDataDictionary.Model"/>.
+        /// See <see cref="NameFor"/> for more information about a "full name".
+        /// Adds a "value" attribute to the element containing the <paramref name="value"/> parameter.
+        /// </summary>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="value">Value to include in the element. Must not be <c>null</c>.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="TemplateInfo.HtmlFieldPrefix"/> and the string representation of the
+        /// <paramref name="expression"/> to set &lt;select&gt; element's "name" attribute. Sanitizes the string
+        /// representation of the <paramref name="expression"/> to set element's "id" attribute.
+        /// </remarks>
+        IHtmlContent RadioButtonFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            object value,
+            object htmlAttributes);
+
+        /// <inheritdoc cref="IHtmlHelper.Raw(object)"/>
+        new IHtmlContent Raw(object value);
+
+        /// <inheritdoc cref="IHtmlHelper.Raw(string)"/>
+        new IHtmlContent Raw(string value);
+
+        /// <summary>
+        /// Returns a &lt;textarea&gt; element for the specified <paramref name="expression"/>. Adds content to the
+        /// element body based on the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewDataDictionary.Model"/>.
+        /// See <see cref="NameFor"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="rows">Number of rows in the textarea.</param>
+        /// <param name="columns">Number of columns in the textarea.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;textarea&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="TemplateInfo.HtmlFieldPrefix"/> and the string representation of the
+        /// <paramref name="expression"/> to set &lt;textarea&gt; element's "name" attribute. Sanitizes the string
+        /// representation of the <paramref name="expression"/> to set element's "id" attribute.
+        /// </remarks>
+        IHtmlContent TextAreaFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            int rows,
+            int columns,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Returns an &lt;input&gt; element of type "text" for the specified <paramref name="expression"/>. Adds a
+        /// "value" attribute to the element containing the first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name,
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewDataDictionary.Model"/>, or
+        /// the <paramref name="htmlAttributes"/> dictionary entry with key "value".
+        /// See <see cref="NameFor"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="format">
+        /// The format string (see https://msdn.microsoft.com/en-us/library/txafckwd.aspx) used to format the
+        /// <paramref name="expression"/> value when using that in the "value" attribute.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the &lt;input&gt; element.</returns>
+        /// <remarks>
+        /// Combines <see cref="TemplateInfo.HtmlFieldPrefix"/> and the string representation of the
+        /// <paramref name="expression"/> to set &lt;input&gt; element's "name" attribute. Sanitizes the string
+        /// representation of the <paramref name="expression"/> to set element's "id" attribute.
+        /// </remarks>
+        IHtmlContent TextBoxFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            string format,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Returns the validation message if an error exists in the <see cref="ModelBinding.ModelStateDictionary"/>
+        /// object for the specified <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="message">
+        /// The message to be displayed. If <c>null</c> or empty, method extracts an error string from the
+        /// <see cref="ModelBinding.ModelStateDictionary"/> object. Message will always be visible but client-side
+        /// validation may update the associated CSS class.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the <paramref name="tag"/> element.
+        /// Alternatively, an <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <param name="tag">
+        /// The tag to wrap the <paramref name="message"/> in the generated HTML. Its default value is
+        /// <see cref="ViewContext.ValidationMessageElement"/>.
+        /// </param>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>
+        /// A new <see cref="IHtmlContent"/> containing the <paramref name="tag"/> element. <c>null</c> if the
+        /// <paramref name="expression"/> is valid and client-side validation is disabled.
+        /// </returns>
+        IHtmlContent ValidationMessageFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            string message,
+            object htmlAttributes,
+            string tag);
+
+        /// <summary>
+        /// Returns the formatted value for the specified <paramref name="expression"/>. Specifically, returns the
+        /// first non-<c>null</c> value found in:
+        /// the <see cref="ActionContext.ModelState"/> entry with full name, or
+        /// the <paramref name="expression"/> evaluated against <see cref="ViewDataDictionary.Model"/>.
+        /// See <see cref="NameFor"/> for more information about a "full name".
+        /// </summary>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <param name="format">
+        /// The format string (see https://msdn.microsoft.com/en-us/library/txafckwd.aspx) used to format the
+        /// <paramref name="expression"/> value when returning that value.
+        /// </param>
+        /// <typeparam name="TResult">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <returns>A <see cref="string"/> containing the formatted value.</returns>
+        /// <remarks>
+        /// Converts the <paramref name="expression"/> result to a <see cref="string"/> directly if
+        /// <paramref name="format"/> is <c>null</c> or empty.
+        /// </remarks>
+        string ValueFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            string format);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IJsonHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IJsonHelper.cs
new file mode 100644
index 0000000000..c958590e0c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IJsonHelper.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using Microsoft.AspNetCore.Html;
+using Newtonsoft.Json;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Base JSON helpers.
+    /// </summary>
+    public interface IJsonHelper
+    {
+        /// <summary>
+        /// Returns serialized JSON for the <paramref name="value"/>.
+        /// </summary>
+        /// <param name="value">The value to serialize as JSON.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the serialized JSON.</returns>
+        IHtmlContent Serialize(object value);
+
+        /// <summary>
+        /// Returns serialized JSON for the <paramref name="value"/>.
+        /// </summary>
+        /// <param name="value">The value to serialize as JSON.</param>
+        /// <param name="serializerSettings">
+        /// The <see cref="JsonSerializerSettings"/> to be used by the serializer.
+        /// </param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the serialized JSON.</returns>
+        IHtmlContent Serialize(object value, JsonSerializerSettings serializerSettings);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MultiSelectList.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MultiSelectList.cs
new file mode 100644
index 0000000000..360b75b87e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MultiSelectList.cs
@@ -0,0 +1,239 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Represents a list that lets users select multiple items.
+    /// This class is typically rendered as an HTML <code>&lt;select multiple="multiple"&gt;</code> element with the specified collection
+    /// of <see cref="SelectListItem"/> objects.
+    /// </summary>
+    public class MultiSelectList : IEnumerable<SelectListItem>
+    {
+        private readonly IList<SelectListGroup> _groups;
+        private IList<SelectListItem> _selectListItems;
+
+        public MultiSelectList(IEnumerable items)
+            : this(items, selectedValues: null)
+        {
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+        }
+
+        public MultiSelectList(IEnumerable items, IEnumerable selectedValues)
+            : this(items, dataValueField: null, dataTextField: null, selectedValues: selectedValues)
+        {
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+        }
+
+        public MultiSelectList(IEnumerable items, string dataValueField, string dataTextField)
+            : this(items, dataValueField, dataTextField, selectedValues: null)
+        {
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+        }
+
+        public MultiSelectList(
+            IEnumerable items,
+            string dataValueField,
+            string dataTextField,
+            IEnumerable selectedValues)
+            : this(items, dataValueField, dataTextField, selectedValues, dataGroupField: null)
+        {
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the MultiSelectList class by using the items to include in the list,
+        /// the data value field, the data text field, the selected values, and the data group field.
+        /// </summary>
+        /// <param name="items">The items used to build each <see cref="SelectListItem"/> of the list.</param>
+        /// <param name="dataValueField">The data value field. Used to match the Value property of the corresponding
+        /// <see cref="SelectListItem"/>.</param>
+        /// <param name="dataTextField">The data text field. Used to match the Text property of the corresponding
+        /// <see cref="SelectListItem"/>.</param>
+        /// <param name="selectedValues">The selected values field. Used to match the Selected property of the
+        /// corresponding <see cref="SelectListItem"/>.</param>
+        /// <param name="dataGroupField">The data group field. Used to match the Group property of the corresponding
+        /// <see cref="SelectListItem"/>.</param>
+        public MultiSelectList(
+            IEnumerable items,
+            string dataValueField,
+            string dataTextField,
+            IEnumerable selectedValues,
+            string dataGroupField)
+        {
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+
+            Items = items;
+            DataValueField = dataValueField;
+            DataTextField = dataTextField;
+            SelectedValues = selectedValues;
+            DataGroupField = dataGroupField;
+
+            if (DataGroupField != null)
+            {
+                _groups = new List<SelectListGroup>();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the data group field.
+        /// </summary>
+        public string DataGroupField { get; }
+
+        public string DataTextField { get; }
+
+        public string DataValueField { get; }
+
+        public IEnumerable Items { get; }
+
+        public IEnumerable SelectedValues { get; }
+
+        public virtual IEnumerator<SelectListItem> GetEnumerator()
+        {
+            if (_selectListItems == null)
+            {
+                _selectListItems = GetListItems();
+            }
+
+            return _selectListItems.GetEnumerator();
+        }
+
+        private IList<SelectListItem> GetListItems()
+        {
+            return (!string.IsNullOrEmpty(DataValueField)) ?
+                GetListItemsWithValueField() :
+                GetListItemsWithoutValueField();
+        }
+
+        private IList<SelectListItem> GetListItemsWithValueField()
+        {
+            var selectedValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            if (SelectedValues != null)
+            {
+                foreach (var value in SelectedValues)
+                {
+                    var stringValue = Convert.ToString(value, CultureInfo.CurrentCulture);
+                    selectedValues.Add(stringValue);
+                }
+            }
+
+            var listItems = new List<SelectListItem>();
+            foreach (var item in Items)
+            {
+                var value = Eval(item, DataValueField);
+                var newListItem = new SelectListItem
+                {
+                    Group = GetGroup(item),
+                    Value = value,
+                    Text = Eval(item, DataTextField),
+                    Selected = selectedValues.Contains(value),
+                };
+
+                listItems.Add(newListItem);
+            }
+
+            return listItems;
+        }
+
+        private IList<SelectListItem> GetListItemsWithoutValueField()
+        {
+            var selectedValues = new HashSet<object>();
+            if (SelectedValues != null)
+            {
+                selectedValues.UnionWith(SelectedValues.Cast<object>());
+            }
+
+            var listItems = new List<SelectListItem>();
+            foreach (var item in Items)
+            {
+                var newListItem = new SelectListItem
+                {
+                    Group = GetGroup(item),
+                    Text = Eval(item, DataTextField),
+                    Selected = selectedValues.Contains(item),
+                };
+
+                listItems.Add(newListItem);
+            }
+
+            return listItems;
+        }
+
+        private static string Eval(object container, string expression)
+        {
+            var value = container;
+            if (!string.IsNullOrEmpty(expression))
+            {
+                var viewDataInfo = ViewDataEvaluator.Eval(container, expression);
+                value = viewDataInfo.Value;
+            }
+
+            return Convert.ToString(value, CultureInfo.CurrentCulture);
+        }
+
+        private SelectListGroup GetGroup(object container)
+        {
+            if (_groups == null)
+            {
+                return null;
+            }
+
+            var groupName = Eval(container, DataGroupField);
+            if (string.IsNullOrEmpty(groupName))
+            {
+                return null;
+            }
+
+            // We use StringComparison.CurrentCulture because the group name is used to display as the value of
+            // optgroup HTML tag's label attribute.
+            SelectListGroup group = null;
+            for (var index = 0; index < _groups.Count; index++)
+            {
+                if (string.Equals(_groups[index].Name, groupName, StringComparison.CurrentCulture))
+                {
+                    group = _groups[index];
+                    break;
+                }
+            }
+
+            if (group == null)
+            {
+                group = new SelectListGroup() { Name = groupName };
+                _groups.Add(group);
+            }
+
+            return group;
+        }
+
+        #region IEnumerable Members
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MvcForm.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MvcForm.cs
new file mode 100644
index 0000000000..78837e1b23
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MvcForm.cs
@@ -0,0 +1,96 @@
+// 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.
+
+using System;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// An HTML form element in an MVC view.
+    /// </summary>
+    public class MvcForm : IDisposable
+    {
+        private readonly ViewContext _viewContext;
+        private readonly HtmlEncoder _htmlEncoder;
+
+        private bool _disposed;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="MvcForm"/>.
+        /// </summary>
+        /// <param name="viewContext">The <see cref="ViewContext"/>.</param>
+        /// <param name="htmlEncoder">The <see cref="HtmlEncoder"/>.</param>
+        public MvcForm(ViewContext viewContext, HtmlEncoder htmlEncoder)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            if (htmlEncoder == null)
+            {
+                throw new ArgumentNullException(nameof(htmlEncoder));
+            }
+
+            _viewContext = viewContext;
+            _htmlEncoder = htmlEncoder;
+        }
+
+        /// <inheritdoc />
+        public void Dispose()
+        {
+            if (!_disposed)
+            {
+                _disposed = true;
+                GenerateEndForm();
+            }
+        }
+
+        /// <summary>
+        /// Renders the &lt;/form&gt; end tag to the response.
+        /// </summary>
+        public void EndForm()
+        {
+            Dispose();
+        }
+
+        /// <summary>
+        /// Renders <see cref="ViewFeatures.FormContext.EndOfFormContent"/> and
+        /// the &lt;/form&gt;.
+        /// </summary>
+        protected virtual void GenerateEndForm()
+        {
+            RenderEndOfFormContent();
+            _viewContext.Writer.Write("</form>");
+            _viewContext.FormContext = new FormContext();
+        }
+
+        private void RenderEndOfFormContent()
+        {
+            var formContext = _viewContext.FormContext;
+            if (!formContext.HasEndOfFormContent)
+            {
+                return;
+            }
+
+            var viewBufferWriter = _viewContext.Writer as ViewBufferTextWriter;
+            if (viewBufferWriter == null)
+            {
+                foreach (var content in formContext.EndOfFormContent)
+                {
+                    content.WriteTo(_viewContext.Writer, _htmlEncoder);
+                }
+            }
+            else
+            {
+                foreach (var content in formContext.EndOfFormContent)
+                {
+                    viewBufferWriter.Write(content);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectList.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectList.cs
new file mode 100644
index 0000000000..7d30bffeb7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectList.cs
@@ -0,0 +1,94 @@
+// 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.
+
+using System;
+using System.Collections;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Represents a list that lets users select a single item.
+    /// This class is typically rendered as an HTML <code>&lt;select&gt;</code> element with the specified collection
+    /// of <see cref="SelectListItem"/> objects.
+    /// </summary>
+    public class SelectList : MultiSelectList
+    {
+        public SelectList(IEnumerable items)
+            : this(items, selectedValue: null)
+        {
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+        }
+
+        public SelectList(IEnumerable items, object selectedValue)
+            : this(items, dataValueField: null, dataTextField: null, selectedValue: selectedValue)
+        {
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+        }
+
+        public SelectList(IEnumerable items, string dataValueField, string dataTextField)
+            : this(items, dataValueField, dataTextField, selectedValue: null)
+        {
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+        }
+
+        public SelectList(
+            IEnumerable items,
+            string dataValueField,
+            string dataTextField,
+            object selectedValue)
+            : base(items, dataValueField, dataTextField, ToEnumerable(selectedValue))
+        {
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+
+            SelectedValue = selectedValue;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the SelectList class by using the specified items for the list,
+        /// the data value field, the data text field, a selected value, and the data group field.
+        /// </summary>
+        /// <param name="items">The items used to build each <see cref="SelectListItem"/> of the list.</param>
+        /// <param name="dataValueField">The data value field. Used to match the Value property of the corresponding
+        /// <see cref="SelectListItem"/>.</param>
+        /// <param name="dataTextField">The data text field. Used to match the Text property of the corresponding
+        /// <see cref="SelectListItem"/>.</param>
+        /// <param name="selectedValue">The selected values. Used to match the Selected property of the corresponding
+        /// <see cref="SelectListItem"/>.</param>
+        /// <param name="dataGroupField">The data group field. Used to match the Group property of the corresponding
+        /// <see cref="SelectListItem"/>.</param>
+        public SelectList(
+            IEnumerable items,
+            string dataValueField,
+            string dataTextField,
+            object selectedValue,
+            string dataGroupField)
+            : base(items, dataValueField, dataTextField, ToEnumerable(selectedValue), dataGroupField)
+        {
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+
+            SelectedValue = selectedValue;
+        }
+
+        public object SelectedValue { get; }
+
+        private static IEnumerable ToEnumerable(object selectedValue)
+        {
+            return (selectedValue != null) ? new[] { selectedValue } : null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectListGroup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectListGroup.cs
new file mode 100644
index 0000000000..1d0db39154
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectListGroup.cs
@@ -0,0 +1,23 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Represents the optgroup HTML element and its attributes.
+    /// In a select list, multiple groups with the same name are supported.
+    /// They are compared with reference equality.
+    /// </summary>
+    public class SelectListGroup
+    {
+        /// <summary>
+        /// Gets or sets a value that indicates whether this <see cref="SelectListGroup"/> is disabled.
+        /// </summary>
+        public bool Disabled { get; set; }
+
+        /// <summary>
+        /// Represents the value of the optgroup's label.
+        /// </summary>
+        public string Name { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectListItem.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectListItem.cs
new file mode 100644
index 0000000000..4a3efe43fb
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectListItem.cs
@@ -0,0 +1,89 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Represents an item in a <see cref="SelectList"/> or <see cref="MultiSelectList"/>.
+    /// This class is typically rendered as an HTML <code>&lt;option&gt;</code> element with the specified
+    /// attribute values.
+    /// </summary>
+    public class SelectListItem
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="SelectListItem"/>.
+        /// </summary>
+        public SelectListItem() { }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="SelectListItem"/>.
+        /// </summary>
+        /// <param name="text">The display text of this <see cref="SelectListItem"/>.</param>
+        /// <param name="value">The value of this <see cref="SelectListItem"/>.</param>
+        public SelectListItem(string text, string value)
+            : this()
+        {
+            Text = text;
+            Value = value;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="SelectListItem"/>.
+        /// </summary>
+        /// <param name="text">The display text of this <see cref="SelectListItem"/>.</param>
+        /// <param name="value">The value of this <see cref="SelectListItem"/>.</param>
+        /// <param name="selected">Value that indicates whether this <see cref="SelectListItem"/> is selected.</param>
+        public SelectListItem(string text, string value, bool selected)
+            : this(text, value)
+        {
+            Selected = selected;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="SelectListItem"/>.
+        /// </summary>
+        /// <param name="text">The display text of this <see cref="SelectListItem"/>.</param>
+        /// <param name="value">The value of this <see cref="SelectListItem"/>.</param>
+        /// <param name="selected">Value that indicates whether this <see cref="SelectListItem"/> is selected.</param>
+        /// <param name="disabled">Value that indicates whether this <see cref="SelectListItem"/> is disabled.</param>
+        public SelectListItem(string text, string value, bool selected, bool disabled)
+            : this(text, value, selected)
+        {
+            Disabled = disabled;
+        }
+
+        /// <summary>
+        /// Gets or sets a value that indicates whether this <see cref="SelectListItem"/> is disabled.
+        /// This property is typically rendered as a <code>disabled="disabled"</code> attribute in the HTML
+        /// <code>&lt;option&gt;</code> element.
+        /// </summary>
+        public bool Disabled { get; set; }
+
+        /// <summary>
+        /// Represents the optgroup HTML element this item is wrapped into.
+        /// In a select list, multiple groups with the same name are supported.
+        /// They are compared with reference equality.
+        /// </summary>
+        public SelectListGroup Group { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value that indicates whether this <see cref="SelectListItem"/> is selected.
+        /// This property is typically rendered as a <code>selected="selected"</code> attribute in the HTML
+        /// <code>&lt;option&gt;</code> element.
+        /// </summary>
+        public bool Selected { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value that indicates the display text of this <see cref="SelectListItem"/>.
+        /// This property is typically rendered as the inner HTML in the HTML <code>&lt;option&gt;</code> element.
+        /// </summary>
+        public string Text { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value that indicates the value of this <see cref="SelectListItem"/>.
+        /// This property is typically rendered as a <code>value="..."</code> attribute in the HTML
+        /// <code>&lt;option&gt;</code> element.
+        /// </summary>
+        public string Value { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/TagBuilder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/TagBuilder.cs
new file mode 100644
index 0000000000..e3e4edfbb8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/TagBuilder.cs
@@ -0,0 +1,429 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Contains methods and properties that are used to create HTML elements. This class is often used to write HTML
+    /// helpers and tag helpers.
+    /// </summary>
+    [DebuggerDisplay("{DebuggerToString()}")]
+    public class TagBuilder : IHtmlContent
+    {
+        private AttributeDictionary _attributes;
+        private HtmlContentBuilder _innerHtml;
+
+        /// <summary>
+        /// Creates a new HTML tag that has the specified tag name.
+        /// </summary>
+        /// <param name="tagName">An HTML tag name.</param>
+        public TagBuilder(string tagName)
+        {
+            if (string.IsNullOrEmpty(tagName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(tagName));
+            }
+
+            TagName = tagName;
+        }
+
+        /// <summary>
+        /// Gets the set of attributes that will be written to the tag.
+        /// </summary>
+        public AttributeDictionary Attributes
+        {
+            get
+            {
+                // Perf: Avoid allocating `_attributes` if possible
+                if (_attributes == null)
+                {
+                    _attributes = new AttributeDictionary();
+                }
+
+                return _attributes;
+            }
+        }
+
+        /// <summary>
+        /// Gets the inner HTML content of the element.
+        /// </summary>
+        public IHtmlContentBuilder InnerHtml
+        {
+            get
+            {
+                if (_innerHtml == null)
+                {
+                    _innerHtml = new HtmlContentBuilder();
+                }
+
+                return _innerHtml;
+            }
+        }
+
+        /// <summary>
+        /// Gets an indication <see cref="InnerHtml"/> is not empty.
+        /// </summary>
+        public bool HasInnerHtml => _innerHtml?.Count > 0;
+
+        /// <summary>
+        /// Gets the tag name for this tag.
+        /// </summary>
+        public string TagName { get; }
+
+        /// <summary>
+        /// The <see cref="Rendering.TagRenderMode"/> with which the tag is written.
+        /// </summary>
+        /// <remarks>Defaults to <see cref="TagRenderMode.Normal"/>.</remarks>
+        public TagRenderMode TagRenderMode { get; set; } = TagRenderMode.Normal;
+
+        /// <summary>
+        /// Adds a CSS class to the list of CSS classes in the tag.
+        /// If there are already CSS classes on the tag then a space character and the new class will be appended to
+        /// the existing list.
+        /// </summary>
+        /// <param name="value">The CSS class name to add.</param>
+        public void AddCssClass(string value)
+        {
+            string currentValue;
+
+            if (Attributes.TryGetValue("class", out currentValue))
+            {
+                Attributes["class"] = value + " " + currentValue;
+            }
+            else
+            {
+                Attributes["class"] = value;
+            }
+        }
+
+        /// <summary>
+        /// Returns a valid HTML 4.01 "id" attribute value for an element with the given <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">
+        /// The fully-qualified expression name, ignoring the current model. Also the original HTML element name.
+        /// </param>
+        /// <param name="invalidCharReplacement">
+        /// The <see cref="string"/> (normally a single <see cref="char"/>) to substitute for invalid characters in
+        /// <paramref name="name"/>.
+        /// </param>
+        /// <returns>
+        /// Valid HTML 4.01 "id" attribute value for an element with the given <paramref name="name"/>.
+        /// </returns>
+        /// <remarks>
+        /// Valid "id" attributes are defined in https://www.w3.org/TR/html401/types.html#type-id.
+        /// </remarks>
+        public static string CreateSanitizedId(string name, string invalidCharReplacement)
+        {
+            if (invalidCharReplacement == null)
+            {
+                throw new ArgumentNullException(nameof(invalidCharReplacement));
+            }
+
+            if (string.IsNullOrEmpty(name))
+            {
+                return string.Empty;
+            }
+
+            // If there are no invalid characters in the string, then we don't have to create the buffer.
+            var firstIndexOfInvalidCharacter = 1;
+            for (; firstIndexOfInvalidCharacter < name.Length; firstIndexOfInvalidCharacter++)
+            {
+                if (!Html401IdUtil.IsValidIdCharacter(name[firstIndexOfInvalidCharacter]))
+                {
+                    break;
+                }
+            }
+
+            var firstChar = name[0];
+            var startsWithAsciiLetter = Html401IdUtil.IsAsciiLetter(firstChar);
+            if (!startsWithAsciiLetter)
+            {
+                // The first character must be a letter according to the HTML 4.01 specification.
+                firstChar = 'z';
+            }
+
+            if (firstIndexOfInvalidCharacter == name.Length && startsWithAsciiLetter)
+            {
+                return name;
+            }
+
+            var stringBuffer = new StringBuilder(name.Length);
+            stringBuffer.Append(firstChar);
+
+            // Characters until 'firstIndexOfInvalidCharacter' have already been checked for validity.
+            // So just copy them. This avoids running them through Html401IdUtil.IsValidIdCharacter again.
+            for (var index = 1; index < firstIndexOfInvalidCharacter; index++)
+            {
+                stringBuffer.Append(name[index]);
+            }
+
+            for (var index = firstIndexOfInvalidCharacter; index < name.Length; index++)
+            {
+                var thisChar = name[index];
+                if (Html401IdUtil.IsValidIdCharacter(thisChar))
+                {
+                    stringBuffer.Append(thisChar);
+                }
+                else
+                {
+                    stringBuffer.Append(invalidCharReplacement);
+                }
+            }
+
+            return stringBuffer.ToString();
+        }
+
+        /// <summary>
+        /// Adds a valid HTML 4.01 "id" attribute for an element with the given <paramref name="name"/>. Does
+        /// nothing if <see cref="Attributes"/> already contains an "id" attribute or the <paramref name="name"/>
+        /// is <c>null</c> or empty.
+        /// </summary>
+        /// <param name="name">
+        /// The fully-qualified expression name, ignoring the current model. Also the original HTML element name.
+        /// </param>
+        /// <param name="invalidCharReplacement">
+        /// The <see cref="string"/> (normally a single <see cref="char"/>) to substitute for invalid characters in
+        /// <paramref name="name"/>.
+        /// </param>
+        /// <seealso cref="CreateSanitizedId(string, string)"/>
+        public void GenerateId(string name, string invalidCharReplacement)
+        {
+            if (invalidCharReplacement == null)
+            {
+                throw new ArgumentNullException(nameof(invalidCharReplacement));
+            }
+
+            if (string.IsNullOrEmpty(name))
+            {
+                return;
+            }
+
+            if (!Attributes.ContainsKey("id"))
+            {
+                var sanitizedId = CreateSanitizedId(name, invalidCharReplacement);
+
+                // Duplicate check for null or empty to cover the corner case where name contains only invalid
+                // characters and invalidCharReplacement is empty.
+                if (!string.IsNullOrEmpty(sanitizedId))
+                {
+                    Attributes["id"] = sanitizedId;
+                }
+            }
+        }
+
+        private void AppendAttributes(TextWriter writer, HtmlEncoder encoder)
+        {
+            // Perf: Avoid allocating enumerator for `_attributes` if possible
+            if (_attributes != null && _attributes.Count > 0)
+            {
+                foreach (var attribute in Attributes)
+                {
+                    var key = attribute.Key;
+                    if (string.Equals(key, "id", StringComparison.OrdinalIgnoreCase) &&
+                        string.IsNullOrEmpty(attribute.Value))
+                    {
+                        continue;
+                    }
+
+                    writer.Write(" ");
+                    writer.Write(key);
+                    writer.Write("=\"");
+                    if (attribute.Value != null)
+                    {
+                        encoder.Encode(writer, attribute.Value);
+                    }
+
+                    writer.Write("\"");
+                }
+            }
+        }
+
+        public void MergeAttribute(string key, string value)
+        {
+            MergeAttribute(key, value, replaceExisting: false);
+        }
+
+        public void MergeAttribute(string key, string value, bool replaceExisting)
+        {
+            if (string.IsNullOrEmpty(key))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(key));
+            }
+
+            if (replaceExisting || !Attributes.ContainsKey(key))
+            {
+                Attributes[key] = value;
+            }
+        }
+
+        public void MergeAttributes<TKey, TValue>(IDictionary<TKey, TValue> attributes)
+        {
+            MergeAttributes(attributes, replaceExisting: false);
+        }
+
+        public void MergeAttributes<TKey, TValue>(IDictionary<TKey, TValue> attributes, bool replaceExisting)
+        {
+            // Perf: Avoid allocating enumerator for `attributes` if possible
+            if (attributes != null && attributes.Count > 0)
+            {
+                foreach (var entry in attributes)
+                {
+                    var key = Convert.ToString(entry.Key, CultureInfo.InvariantCulture);
+                    var value = Convert.ToString(entry.Value, CultureInfo.InvariantCulture);
+                    MergeAttribute(key, value, replaceExisting);
+                }
+            }
+        }
+
+        /// <inheritdoc />
+        public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+        {
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
+            if (encoder == null)
+            {
+                throw new ArgumentNullException(nameof(encoder));
+            }
+
+            WriteTo(this, writer, encoder, TagRenderMode);
+        }
+
+        /// <summary>
+        /// Returns an <see cref="IHtmlContent"/> that renders the body.
+        /// </summary>
+        /// <returns>An <see cref="IHtmlContent"/> that renders the body.</returns>
+        public IHtmlContent RenderBody() => _innerHtml;
+
+        /// <summary>
+        /// Returns an <see cref="IHtmlContent"/> that renders the start tag.
+        /// </summary>
+        /// <returns>An <see cref="IHtmlContent"/> that renders the start tag.</returns>
+        public IHtmlContent RenderStartTag() => new RenderTagHtmlContent(this, TagRenderMode.StartTag);
+
+        /// <summary>
+        /// Returns an <see cref="IHtmlContent"/> that renders the end tag.
+        /// </summary>
+        /// <returns>An <see cref="IHtmlContent"/> that renders the end tag.</returns>
+        public IHtmlContent RenderEndTag() => new RenderTagHtmlContent(this, TagRenderMode.EndTag);
+
+        /// <summary>
+        /// Returns an <see cref="IHtmlContent"/> that renders the self-closing tag.
+        /// </summary>
+        /// <returns>An <see cref="IHtmlContent"/> that renders the self-closing tag.</returns>
+        public IHtmlContent RenderSelfClosingTag() => new RenderTagHtmlContent(this, TagRenderMode.SelfClosing);
+
+        private static void WriteTo(
+            TagBuilder tagBuilder,
+            TextWriter writer,
+            HtmlEncoder encoder,
+            TagRenderMode tagRenderMode)
+        {
+            switch (tagRenderMode)
+            {
+                case TagRenderMode.StartTag:
+                    writer.Write("<");
+                    writer.Write(tagBuilder.TagName);
+                    tagBuilder.AppendAttributes(writer, encoder);
+                    writer.Write(">");
+                    break;
+                case TagRenderMode.EndTag:
+                    writer.Write("</");
+                    writer.Write(tagBuilder.TagName);
+                    writer.Write(">");
+                    break;
+                case TagRenderMode.SelfClosing:
+                    writer.Write("<");
+                    writer.Write(tagBuilder.TagName);
+                    tagBuilder.AppendAttributes(writer, encoder);
+                    writer.Write(" />");
+                    break;
+                default:
+                    writer.Write("<");
+                    writer.Write(tagBuilder.TagName);
+                    tagBuilder.AppendAttributes(writer, encoder);
+                    writer.Write(">");
+                    if (tagBuilder._innerHtml != null)
+                    {
+                        tagBuilder._innerHtml.WriteTo(writer, encoder);
+                    }
+                    writer.Write("</");
+                    writer.Write(tagBuilder.TagName);
+                    writer.Write(">");
+                    break;
+            }
+        }
+
+        private string DebuggerToString()
+        {
+            using (var writer = new StringWriter())
+            {
+                WriteTo(writer, HtmlEncoder.Default);
+                return writer.ToString();
+            }
+        }
+
+        private class RenderTagHtmlContent : IHtmlContent
+        {
+            private readonly TagBuilder _tagBuilder;
+            private readonly TagRenderMode _tagRenderMode;
+
+            public RenderTagHtmlContent(TagBuilder tagBuilder, TagRenderMode tagRenderMode)
+            {
+                _tagBuilder = tagBuilder;
+                _tagRenderMode = tagRenderMode;
+            }
+
+            public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+            {
+                TagBuilder.WriteTo(_tagBuilder, writer, encoder, _tagRenderMode);
+            }
+        }
+
+        private static class Html401IdUtil
+        {
+            public static bool IsAsciiLetter(char testChar)
+            {
+                return (('A' <= testChar && testChar <= 'Z') || ('a' <= testChar && testChar <= 'z'));
+            }
+
+            public static bool IsValidIdCharacter(char testChar)
+            {
+                return (IsAsciiLetter(testChar) || IsAsciiDigit(testChar) || IsAllowableSpecialCharacter(testChar));
+            }
+
+            private static bool IsAsciiDigit(char testChar)
+            {
+                return ('0' <= testChar && testChar <= '9');
+            }
+
+            private static bool IsAllowableSpecialCharacter(char testChar)
+            {
+                switch (testChar)
+                {
+                    case '-':
+                    case '_':
+                    case ':':
+                        // Note '.' is valid according to the HTML 4.01 specification. Disallowed here to avoid
+                        // confusion with CSS class selectors or when using jQuery.
+                        return true;
+
+                    default:
+                        return false;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/TagRenderMode.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/TagRenderMode.cs
new file mode 100644
index 0000000000..c9d89b2c72
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/TagRenderMode.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public enum TagRenderMode
+    {
+        Normal,
+        StartTag,
+        EndTag,
+        SelfClosing
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewComponentHelperExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewComponentHelperExtensions.cs
new file mode 100644
index 0000000000..d973a8a5eb
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewComponentHelperExtensions.cs
@@ -0,0 +1,84 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Extension methods for <see cref="IViewComponentHelper"/>.
+    /// </summary>
+    public static class ViewComponentHelperExtensions
+    {
+        /// <summary>
+        /// Invokes a view component with the specified <paramref name="name"/>.
+        /// </summary>
+        /// <param name="helper">The <see cref="IViewComponentHelper"/>.</param>
+        /// <param name="name">The name of the view component.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns the rendered <see cref="IHtmlContent" />.
+        /// </returns>
+        public static Task<IHtmlContent> InvokeAsync(this IViewComponentHelper helper, string name)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            return helper.InvokeAsync(name, arguments: null);
+        }
+
+        /// <summary>
+        /// Invokes a view component of type <paramref name="componentType" />.
+        /// </summary>
+        /// <param name="helper">The <see cref="IViewComponentHelper"/>.</param>
+        /// <param name="componentType">The view component <see cref="Type"/>.</param>
+        /// <returns>A <see cref="Task"/> that on completion returns the rendered <see cref="IHtmlContent" />.
+        /// </returns>
+        public static Task<IHtmlContent> InvokeAsync(this IViewComponentHelper helper, Type componentType)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            return helper.InvokeAsync(componentType, arguments: null);
+        }
+
+        /// <summary>
+        /// Invokes a view component of type <typeparamref name="TComponent"/>.
+        /// </summary>
+        /// <param name="helper">The <see cref="IViewComponentHelper"/>.</param>
+        /// <param name="arguments">Arguments to be passed to the invoked view component method.</param>
+        /// <typeparam name="TComponent">The <see cref="Type"/> of the view component.</typeparam>
+        /// <returns>A <see cref="Task"/> that on completion returns the rendered <see cref="IHtmlContent" />.
+        /// </returns>
+        public static Task<IHtmlContent> InvokeAsync<TComponent>(this IViewComponentHelper helper, object arguments)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            return helper.InvokeAsync(typeof(TComponent), arguments);
+        }
+
+        /// <summary>
+        /// Invokes a view component of type <typeparamref name="TComponent"/>.
+        /// </summary>
+        /// <param name="helper">The <see cref="IViewComponentHelper"/>.</param>
+        /// <typeparam name="TComponent">The <see cref="Type"/> of the view component.</typeparam>
+        /// <returns>A <see cref="Task"/> that on completion returns the rendered <see cref="IHtmlContent" />.
+        /// </returns>
+        public static Task<IHtmlContent> InvokeAsync<TComponent>(this IViewComponentHelper helper)
+        {
+            if (helper == null)
+            {
+                throw new ArgumentNullException(nameof(helper));
+            }
+
+            return helper.InvokeAsync(typeof(TComponent), arguments: null);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewContext.cs
new file mode 100644
index 0000000000..88b8b0d74d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewContext.cs
@@ -0,0 +1,234 @@
+// 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.
+
+using System;
+using System.IO;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Context for view execution.
+    /// </summary>
+    public class ViewContext : ActionContext
+    {
+        private FormContext _formContext;
+        private DynamicViewData _viewBag;
+
+        /// <summary>
+        /// Creates an empty <see cref="ViewContext"/>.
+        /// </summary>
+        /// <remarks>
+        /// The default constructor is provided for unit test purposes only.
+        /// </remarks>
+        public ViewContext()
+        {
+            ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider(), ModelState);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ViewContext"/>.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/>.</param>
+        /// <param name="view">The <see cref="IView"/> being rendered.</param>
+        /// <param name="viewData">The <see cref="ViewDataDictionary"/>.</param>
+        /// <param name="tempData">The <see cref="ITempDataDictionary"/>.</param>
+        /// <param name="writer">The <see cref="TextWriter"/> to render output to.</param>
+        /// <param name="htmlHelperOptions">The <see cref="HtmlHelperOptions"/> to apply to this instance.</param>
+        public ViewContext(
+            ActionContext actionContext,
+            IView view,
+            ViewDataDictionary viewData,
+            ITempDataDictionary tempData,
+            TextWriter writer,
+            HtmlHelperOptions htmlHelperOptions)
+            : base(actionContext)
+        {
+            if (actionContext == null)
+            {
+                throw new ArgumentNullException(nameof(actionContext));
+            }
+
+            if (view == null)
+            {
+                throw new ArgumentNullException(nameof(view));
+            }
+
+            if (viewData == null)
+            {
+                throw new ArgumentNullException(nameof(viewData));
+            }
+
+            if (tempData == null)
+            {
+                throw new ArgumentNullException(nameof(tempData));
+            }
+
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
+            if (htmlHelperOptions == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelperOptions));
+            }
+
+            View = view;
+            ViewData = viewData;
+            TempData = tempData;
+            Writer = writer;
+
+            FormContext = new FormContext();
+
+            ClientValidationEnabled = htmlHelperOptions.ClientValidationEnabled;
+            Html5DateRenderingMode = htmlHelperOptions.Html5DateRenderingMode;
+            ValidationSummaryMessageElement = htmlHelperOptions.ValidationSummaryMessageElement;
+            ValidationMessageElement = htmlHelperOptions.ValidationMessageElement;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ViewContext"/>.
+        /// </summary>
+        /// <param name="viewContext">The <see cref="ViewContext"/> to copy values from.</param>
+        /// <param name="view">The <see cref="IView"/> being rendered.</param>
+        /// <param name="viewData">The <see cref="ViewDataDictionary"/>.</param>
+        /// <param name="writer">The <see cref="TextWriter"/> to render output to.</param>
+        public ViewContext(
+            ViewContext viewContext,
+            IView view,
+            ViewDataDictionary viewData,
+            TextWriter writer)
+            : base(viewContext)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            if (view == null)
+            {
+                throw new ArgumentNullException(nameof(view));
+            }
+
+            if (viewData == null)
+            {
+                throw new ArgumentNullException(nameof(viewData));
+            }
+
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
+            FormContext = viewContext.FormContext;
+
+            ClientValidationEnabled = viewContext.ClientValidationEnabled;
+            Html5DateRenderingMode = viewContext.Html5DateRenderingMode;
+            ValidationSummaryMessageElement = viewContext.ValidationSummaryMessageElement;
+            ValidationMessageElement = viewContext.ValidationMessageElement;
+
+            ExecutingFilePath = viewContext.ExecutingFilePath;
+            View = view;
+            ViewData = viewData;
+            TempData = viewContext.TempData;
+            Writer = writer;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="FormContext"/> for the form element being rendered.
+        /// A default context is returned if no form is currently being rendered.
+        /// </summary>
+        public virtual FormContext FormContext
+        {
+            get => _formContext;
+
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _formContext = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value that indicates whether client-side validation is enabled.
+        /// </summary>
+        public bool ClientValidationEnabled { get; set; }
+
+        /// <summary>
+        /// Set this property to <see cref="Html5DateRenderingMode.CurrentCulture" /> to have templated helpers such as
+        /// <see cref="IHtmlHelper.Editor" /> and <see cref="IHtmlHelper{TModel}.EditorFor" /> render date and time
+        /// values using the current culture. By default, these helpers render dates and times as RFC 3339 compliant strings.
+        /// </summary>
+        public Html5DateRenderingMode Html5DateRenderingMode { get; set; }
+
+        /// <summary>
+        /// Element name used to wrap a top-level message generated by <see cref="IHtmlHelper.ValidationSummary"/> and
+        /// other overloads.
+        /// </summary>
+        public string ValidationSummaryMessageElement { get; set; }
+
+        /// <summary>
+        /// Element name used to wrap a top-level message generated by <see cref="IHtmlHelper.ValidationMessage"/> and
+        /// other overloads.
+        /// </summary>
+        public string ValidationMessageElement { get; set; }
+
+        /// <summary>
+        /// Gets the dynamic view bag.
+        /// </summary>
+        public dynamic ViewBag
+        {
+            get
+            {
+                if (_viewBag == null)
+                {
+                    _viewBag = new DynamicViewData(() => ViewData);
+                }
+
+                return _viewBag;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IView"/> currently being rendered, if any.
+        /// </summary>
+        public IView View { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ViewDataDictionary"/>.
+        /// </summary>
+        public ViewDataDictionary ViewData { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ITempDataDictionary"/> instance.
+        /// </summary>
+        public ITempDataDictionary TempData { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="TextWriter"/> used to write the output.
+        /// </summary>
+        public TextWriter Writer { get; set; }
+
+        /// <summary>
+        /// Gets or sets the path of the view file currently being rendered.
+        /// </summary>
+        /// <remarks>
+        /// The rendering of a view may involve one or more files (e.g. _ViewStart, Layouts etc).
+        /// This property contains the path of the file currently being rendered.
+        /// </remarks>
+        public string ExecutingFilePath { get; set; }
+
+        public FormContext GetFormContextForClientValidation()
+        {
+            return ClientValidationEnabled ? FormContext : null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Resources.resx
new file mode 100644
index 0000000000..4bfed7a827
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Resources.resx
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ViewComponent_AmbiguousTypeMatch" xml:space="preserve">
+    <value>The view component name '{0}' matched multiple types:{1}{2}</value>
+    <comment>{1} is the newline character</comment>
+  </data>
+  <data name="ViewComponent_AsyncMethod_ShouldReturnTask" xml:space="preserve">
+    <value>Method '{0}' of view component '{1}' should be declared to return {2}&lt;T&gt;.</value>
+  </data>
+  <data name="ViewComponent_MustReturnValue" xml:space="preserve">
+    <value>A view component must return a non-null value.</value>
+  </data>
+  <data name="ViewComponent_SyncMethod_ShouldReturnValue" xml:space="preserve">
+    <value>Method '{0}' of view component '{1}' should be declared to return a value.</value>
+  </data>
+  <data name="ViewComponent_CannotFindComponent" xml:space="preserve">
+    <value>A view component named '{0}' could not be found. A view component must be a public non-abstract class, not contain any generic parameters, and either be decorated with '{1}' or have a class name ending with the '{2}' suffix. A view component must not be decorated with '{3}'.</value>
+  </data>
+  <data name="ViewComponent_IViewComponentFactory_ReturnedNull" xml:space="preserve">
+    <value>An invoker could not be created for the view component '{0}'.</value>
+  </data>
+  <data name="ViewComponent_CannotFindMethod" xml:space="preserve">
+    <value>Could not find an '{0}' or '{1}' method for the view component '{2}'.</value>
+  </data>
+  <data name="ViewComponent_InvalidReturnValue" xml:space="preserve">
+    <value>View components only support returning {0}, {1} or {2}.</value>
+  </data>
+  <data name="ArgumentCannotBeNullOrEmpty" xml:space="preserve">
+    <value>Value cannot be null or empty.</value>
+  </data>
+  <data name="PropertyOfTypeCannotBeNull" xml:space="preserve">
+    <value>The '{0}' property of '{1}' must not be null.</value>
+  </data>
+  <data name="TypeMethodMustReturnNotNullValue" xml:space="preserve">
+    <value>The '{0}' method of type '{1}' cannot return a null value.</value>
+  </data>
+  <data name="ArgumentPropertyUnexpectedType" xml:space="preserve">
+    <value>Property '{0}' is of type '{1}', but this method requires a value of type '{2}'.</value>
+  </data>
+  <data name="Common_PartialViewNotFound" xml:space="preserve">
+    <value>The partial view '{0}' was not found or no view engine supports the searched locations. The following locations were searched:{1}</value>
+  </data>
+  <data name="Common_TriState_False" xml:space="preserve">
+    <value>False</value>
+  </data>
+  <data name="Common_TriState_NotSet" xml:space="preserve">
+    <value>Not Set</value>
+  </data>
+  <data name="Common_TriState_True" xml:space="preserve">
+    <value>True</value>
+  </data>
+  <data name="DynamicViewData_ViewDataNull" xml:space="preserve">
+    <value>ViewData value must not be null.</value>
+  </data>
+  <data name="ExpressionHelper_InvalidIndexerExpression" xml:space="preserve">
+    <value>The expression compiler was unable to evaluate the indexer expression '{0}' because it references the model parameter '{1}' which is unavailable.</value>
+  </data>
+  <data name="HtmlHelper_NullModelMetadata" xml:space="preserve">
+    <value>The IModelMetadataProvider was unable to provide metadata for expression '{0}'.</value>
+  </data>
+  <data name="HtmlHelper_NotContextualized" xml:space="preserve">
+    <value>Must call 'Contextualize' method before using this HtmlHelper instance.</value>
+  </data>
+  <data name="HtmlHelper_MissingSelectData" xml:space="preserve">
+    <value>There is no ViewData item of type '{0}' that has the key '{1}'.</value>
+  </data>
+  <data name="HtmlHelper_SelectExpressionNotEnumerable" xml:space="preserve">
+    <value>The parameter '{0}' must evaluate to an IEnumerable when multiple selection is allowed.</value>
+  </data>
+  <data name="HtmlHelper_TypeNotSupported_ForGetEnumSelectList" xml:space="preserve">
+    <value>The type '{0}' is not supported. Type must be an {1} that does not have an associated {2}.</value>
+  </data>
+  <data name="HtmlHelper_WrongSelectDataType" xml:space="preserve">
+    <value>The ViewData item that has the key '{0}' is of type '{1}' but must be of type '{2}'.</value>
+  </data>
+  <data name="Templates_TypeMustImplementIEnumerable" xml:space="preserve">
+    <value>The '{0}' template was used with an object of type '{1}', which does not implement '{2}'.</value>
+  </data>
+  <data name="TemplateHelpers_TemplateLimitations" xml:space="preserve">
+    <value>Templates can be used only with field access, property access, single-dimension array index, or single-parameter custom indexer expressions.</value>
+  </data>
+  <data name="TemplateHelpers_NoTemplate" xml:space="preserve">
+    <value>Unable to locate an appropriate template for type {0}.</value>
+  </data>
+  <data name="ViewData_ModelCannotBeNull" xml:space="preserve">
+    <value>The model item passed is null, but this ViewDataDictionary instance requires a non-null model item of type '{0}'.</value>
+  </data>
+  <data name="ViewData_WrongTModelType" xml:space="preserve">
+    <value>The model item passed into the ViewDataDictionary is of type '{0}', but this ViewDataDictionary instance requires a model item of type '{1}'.</value>
+  </data>
+  <data name="ViewEngine_PartialViewNotFound" xml:space="preserve">
+    <value>The partial view '{0}' was not found. The following locations were searched:{1}</value>
+  </data>
+  <data name="ViewEngine_ViewNotFound" xml:space="preserve">
+    <value>The view '{0}' was not found. The following locations were searched:{1}</value>
+  </data>
+  <data name="HtmlHelper_TextAreaParameterOutOfRange" xml:space="preserve">
+    <value>The value must be greater than or equal to zero.</value>
+  </data>
+  <data name="UnobtrusiveJavascript_ValidationParameterCannotBeEmpty" xml:space="preserve">
+    <value>Validation parameter names in unobtrusive client validation rules cannot be empty. Client rule type: {0}</value>
+  </data>
+  <data name="UnobtrusiveJavascript_ValidationParameterMustBeLegal" xml:space="preserve">
+    <value>Validation parameter names in unobtrusive client validation rules must start with a lowercase letter and consist of only lowercase letters or digits. Validation parameter name: {0}, client rule type: {1}</value>
+  </data>
+  <data name="UnobtrusiveJavascript_ValidationTypeCannotBeEmpty" xml:space="preserve">
+    <value>Validation type names in unobtrusive client validation rules cannot be empty. Client rule type: {0}</value>
+  </data>
+  <data name="UnobtrusiveJavascript_ValidationTypeMustBeLegal" xml:space="preserve">
+    <value>Validation type names in unobtrusive client validation rules must consist of only lowercase letters. Invalid name: "{0}", client rule type: {1}</value>
+  </data>
+  <data name="UnobtrusiveJavascript_ValidationTypeMustBeUnique" xml:space="preserve">
+    <value>Validation type names in unobtrusive client validation rules must be unique. The following validation type was seen more than once: {0}</value>
+  </data>
+  <data name="TypeMustDeriveFromType" xml:space="preserve">
+    <value>The type '{0}' must derive from '{1}'.</value>
+  </data>
+  <data name="TemplatedViewLocationExpander_NoReplacementToken" xml:space="preserve">
+    <value>Could not find a replacement for view expansion token '{0}'.</value>
+  </data>
+  <data name="TemplatedExpander_PopulateValuesMustBeInvokedFirst" xml:space="preserve">
+    <value>{0} must be executed before {1} can be invoked.</value>
+  </data>
+  <data name="TemplatedExpander_ValueFactoryCannotReturnNull" xml:space="preserve">
+    <value>The result of value factory cannot be null.</value>
+  </data>
+  <data name="ViewComponent_AmbiguousTypeMatch_Item" xml:space="preserve">
+    <value>Type: '{0}' - Name: '{1}'</value>
+  </data>
+  <data name="Common_PropertyNotFound" xml:space="preserve">
+    <value>The property {0}.{1} could not be found.</value>
+  </data>
+  <data name="RemoteAttribute_NoUrlFound" xml:space="preserve">
+    <value>No URL for remote validation could be found.</value>
+  </data>
+  <data name="RemoteAttribute_RemoteValidationFailed" xml:space="preserve">
+    <value>'{0}' is invalid.</value>
+  </data>
+  <data name="HtmlGenerator_FieldNameCannotBeNullOrEmpty" xml:space="preserve">
+    <value>The name of an HTML field cannot be null or empty. Instead use methods {0}.{1} or {2}.{3} with a non-empty {4} argument value.</value>
+  </data>
+  <data name="ViewComponentResult_NameOrTypeMustBeSet" xml:space="preserve">
+    <value>Either the '{0}' or '{1}' property must be set in order to invoke a view component.</value>
+  </data>
+  <data name="TempData_CannotDeserializeToken" xml:space="preserve">
+    <value>Cannot deserialize {0} of type '{1}'.</value>
+  </data>
+  <data name="TempData_CannotSerializeDictionary" xml:space="preserve">
+    <value>The '{0}' cannot serialize a dictionary with a key of type '{1}'. The key must be of type '{2}'.</value>
+  </data>
+  <data name="TempData_CannotSerializeType" xml:space="preserve">
+    <value>The '{0}' cannot serialize an object of type '{1}'.</value>
+  </data>
+  <data name="Dictionary_DuplicateKey" xml:space="preserve">
+    <value>The collection already contains an entry with key '{0}'.</value>
+  </data>
+  <data name="ViewComponent_SyncMethod_CannotReturnTask" xml:space="preserve">
+    <value>Method '{0}' of view component '{1}' cannot return a {2}.</value>
+  </data>
+  <data name="ViewComponent_AmbiguousMethods" xml:space="preserve">
+    <value>View component '{0}' must have exactly one public method named '{1}' or '{2}'.</value>
+  </data>
+  <data name="ValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated" xml:space="preserve">
+    <value>The type '{0}' cannot be activated by '{1}' because it is either a value type, an interface, an abstract class or an open generic type.</value>
+  </data>
+  <data name="CreateModelExpression_NullModelMetadata" xml:space="preserve">
+    <value>The {0} was unable to provide metadata for expression '{1}'.</value>
+  </data>
+  <data name="ViewEnginesAreRequired" xml:space="preserve">
+    <value>'{0}.{1}' must not be empty. At least one '{2}' is required to locate a view for rendering.</value>
+  </data>
+  <data name="TempDataProperties_InvalidType" xml:space="preserve">
+    <value>The '{0}.{1}' property with {2} is invalid.</value>
+  </data>
+  <data name="TempDataProperties_PublicGetterSetter" xml:space="preserve">
+    <value>The '{0}.{1}' property with {2} is invalid. A property using {2} must have a public getter and setter.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SkipStatusCodePagesAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SkipStatusCodePagesAttribute.cs
new file mode 100644
index 0000000000..bfc644764f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SkipStatusCodePagesAttribute.cs
@@ -0,0 +1,37 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Diagnostics;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A filter that prevents execution of the StatusCodePages middleware.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public class SkipStatusCodePagesAttribute : Attribute, IResourceFilter
+    {
+        /// <inheritdoc />
+        public void OnResourceExecuted(ResourceExecutedContext context)
+        {
+        }
+
+        /// <inheritdoc />
+        public void OnResourceExecuting(ResourceExecutingContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var statusCodeFeature = context.HttpContext.Features.Get<IStatusCodePagesFeature>();
+            if (statusCodeFeature != null)
+            {
+                // Turn off the StatusCodePages feature.
+                statusCodeFeature.Enabled = false;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataAttribute.cs
new file mode 100644
index 0000000000..e4e6e5c747
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataAttribute.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Properties decorated with <see cref="TempDataAttribute"/> will have their values stored in
+    /// and loaded from the <see cref="ITempDataDictionary"/>. <see cref="TempDataAttribute"/>
+    /// is supported on properties of Controllers, Razor Pages, and Razor Page Models.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property, Inherited = true, AllowMultiple = false)]
+    public sealed class TempDataAttribute : Attribute
+    {
+        /// <summary>
+        /// Gets or sets the key used to get or add the property from value from <see cref="ITempDataDictionary"/>.
+        /// When unspecified, the key is derived from the property name.
+        /// </summary>
+        public string Key { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs
new file mode 100644
index 0000000000..fcf1bd3f8f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs
@@ -0,0 +1,50 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Specifies that the class or method that this attribute is applied validates the anti-forgery token.
+    /// If the anti-forgery token is not available, or if the token is invalid, the validation will fail
+    /// and the action method will not execute.
+    /// </summary>
+    /// <remarks>
+    /// This attribute helps defend against cross-site request forgery. It won't prevent other forgery or tampering
+    /// attacks.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public class ValidateAntiForgeryTokenAttribute : Attribute, IFilterFactory, IOrderedFilter
+    {
+        /// <summary>
+        /// Gets the order value for determining the order of execution of filters. Filters execute in
+        /// ascending numeric value of the <see cref="Order"/> property.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Filters are executed in an ordering determined by an ascending sort of the <see cref="Order"/> property.
+        /// </para>
+        /// <para>
+        /// The default Order for this attribute is 1000 because it must run after any filter which does authentication 
+        /// or login in order to allow them to behave as expected (ie Unauthenticated or Redirect instead of 400).
+        /// </para>
+        /// <para>
+        /// Look at <see cref="IOrderedFilter.Order"/> for more detailed info.
+        /// </para>
+        /// </remarks>
+        public int Order { get; set; } = 1000;
+
+        /// <inheritdoc />
+        public bool IsReusable => true;
+
+        /// <inheritdoc />
+        public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
+        {
+            return serviceProvider.GetRequiredService<ValidateAntiforgeryTokenAuthorizationFilter>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponent.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponent.cs
new file mode 100644
index 0000000000..f0ae37312b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponent.cs
@@ -0,0 +1,232 @@
+// 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.
+
+using System;
+using System.Security.Claims;
+using System.Security.Principal;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// A base class for view components.
+    /// </summary>
+    [ViewComponent]
+    public abstract class ViewComponent
+    {
+        private IUrlHelper _url;
+        private dynamic _viewBag;
+        private ViewComponentContext _viewComponentContext;
+        private ICompositeViewEngine _viewEngine;
+
+        /// <summary>
+        /// Gets the <see cref="Http.HttpContext"/>.
+        /// </summary>
+        public HttpContext HttpContext => ViewContext?.HttpContext;
+
+        /// <summary>
+        /// Gets the <see cref="HttpRequest"/>.
+        /// </summary>
+        public HttpRequest Request => ViewContext?.HttpContext?.Request;
+
+        /// <summary>
+        /// Gets the <see cref="IPrincipal"/> for the current user.
+        /// </summary>
+        public IPrincipal User => ViewContext?.HttpContext?.User;
+
+        /// <summary>
+        /// Gets the <see cref="ClaimsPrincipal"/> for the current user.
+        /// </summary>
+        public ClaimsPrincipal UserClaimsPrincipal => ViewContext?.HttpContext?.User;
+
+        /// <summary>
+        /// Gets the <see cref="RouteData"/> for the current request.
+        /// </summary>
+        public RouteData RouteData => ViewContext?.RouteData;
+
+        /// <summary>
+        /// Gets the view bag.
+        /// </summary>
+        public dynamic ViewBag
+        {
+            get
+            {
+                if (_viewBag == null)
+                {
+                    _viewBag = new DynamicViewData(() => ViewData);
+                }
+
+                return _viewBag;
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="ModelStateDictionary"/>.
+        /// </summary>
+        public ModelStateDictionary ModelState => ViewData?.ModelState;
+
+        /// <summary>
+        /// Gets or sets the <see cref="IUrlHelper"/>.
+        /// </summary>
+        public IUrlHelper Url
+        {
+            get
+            {
+                if (_url == null)
+                {
+                    // May be null in unit-testing scenarios.
+                    var services = ViewComponentContext.ViewContext?.HttpContext?.RequestServices;
+                    var factory = services?.GetRequiredService<IUrlHelperFactory>();
+                    _url = factory?.GetUrlHelper(ViewComponentContext.ViewContext);
+                }
+
+                return _url;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _url = value;
+            }
+        }
+
+        [ViewComponentContext]
+        public ViewComponentContext ViewComponentContext
+        {
+            get
+            {
+                // This should run only for the ViewComponent unit test scenarios.
+                if (_viewComponentContext == null)
+                {
+                    _viewComponentContext = new ViewComponentContext();
+                }
+
+                return _viewComponentContext;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _viewComponentContext = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="ViewContext"/>.
+        /// </summary>
+        public ViewContext ViewContext => ViewComponentContext.ViewContext;
+
+        /// <summary>
+        /// Gets the <see cref="ViewDataDictionary"/>.
+        /// </summary>
+        public ViewDataDictionary ViewData => ViewComponentContext.ViewData;
+
+        /// <summary>
+        /// Gets the <see cref="ITempDataDictionary"/>.
+        /// </summary>
+        public ITempDataDictionary TempData => ViewComponentContext.TempData;
+
+        /// <summary>
+        /// Gets or sets the <see cref="ICompositeViewEngine"/>.
+        /// </summary>
+        public ICompositeViewEngine ViewEngine
+        {
+            get
+            {
+                if (_viewEngine == null)
+                {
+                    // May be null in unit-testing scenarios.
+                    var services = ViewComponentContext.ViewContext?.HttpContext?.RequestServices;
+                    _viewEngine = services?.GetRequiredService<ICompositeViewEngine>();
+                }
+
+                return _viewEngine;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _viewEngine = value;
+            }
+        }
+
+        /// <summary>
+        /// Returns a result which will render HTML encoded text.
+        /// </summary>
+        /// <param name="content">The content, will be HTML encoded before output.</param>
+        /// <returns>A <see cref="ContentViewComponentResult"/>.</returns>
+        public ContentViewComponentResult Content(string content)
+        {
+            if (content == null)
+            {
+                throw new ArgumentNullException(nameof(content));
+            }
+
+            return new ContentViewComponentResult(content);
+        }
+
+        /// <summary>
+        /// Returns a result which will render the partial view with name <c>&quot;Default&quot;</c>.
+        /// </summary>
+        /// <returns>A <see cref="ViewViewComponentResult"/>.</returns>
+        public ViewViewComponentResult View()
+        {
+            return View(viewName: null);
+        }
+
+        /// <summary>
+        /// Returns a result which will render the partial view with name <paramref name="viewName"/>.
+        /// </summary>
+        /// <param name="viewName">The name of the partial view to render.</param>
+        /// <returns>A <see cref="ViewViewComponentResult"/>.</returns>
+        public ViewViewComponentResult View(string viewName)
+        {
+            return View(viewName, ViewData.Model);
+        }
+
+        /// <summary>
+        /// Returns a result which will render the partial view with name <c>&quot;Default&quot;</c>.
+        /// </summary>
+        /// <param name="model">The model object for the view.</param>
+        /// <returns>A <see cref="ViewViewComponentResult"/>.</returns>
+        public ViewViewComponentResult View<TModel>(TModel model)
+        {
+            return View(viewName: null, model: model);
+        }
+
+        /// <summary>
+        /// Returns a result which will render the partial view with name <paramref name="viewName"/>.
+        /// </summary>
+        /// <param name="viewName">The name of the partial view to render.</param>
+        /// <param name="model">The model object for the view.</param>
+        /// <returns>A <see cref="ViewViewComponentResult"/>.</returns>
+        public ViewViewComponentResult View<TModel>(string viewName, TModel model)
+        {
+            var viewData = new ViewDataDictionary<TModel>(ViewData, model);
+            return new ViewViewComponentResult
+            {
+                ViewEngine = ViewEngine,
+                ViewName = viewName,
+                ViewData = viewData
+            };
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentAttribute.cs
new file mode 100644
index 0000000000..44e701dfaf
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentAttribute.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Indicates the class and all subclasses are view components. Optionally specifies a view component's name. If
+    /// defining a base class for multiple view components, associate this attribute with that base.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+    public class ViewComponentAttribute : Attribute
+    {
+        /// <summary>
+        /// Gets or sets the name of the view component. Do not supply a name in an attribute associated with a view
+        /// component base class.
+        /// </summary>
+        public string Name { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResult.cs
new file mode 100644
index 0000000000..898f676067
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResult.cs
@@ -0,0 +1,72 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// An <see cref="IActionResult"/> which renders a view component to the response.
+    /// </summary>
+    public class ViewComponentResult : ActionResult
+    {
+        /// <summary>
+        /// Gets or sets the arguments provided to the view component.
+        /// </summary>
+        public object Arguments { get; set; }
+
+        /// <summary>
+        /// Gets or sets the HTTP status code.
+        /// </summary>
+        public int? StatusCode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the view component to invoke. Will be ignored if <see cref="ViewComponentType"/>
+        /// is set to a non-<c>null</c> value.
+        /// </summary>
+        public string ViewComponentName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the type of the view component to invoke.
+        /// </summary>
+        public Type ViewComponentType { get; set; }
+
+        /// <summary>
+        /// Get the view data model.
+        /// </summary>
+        public object Model => ViewData?.Model;
+
+        /// <summary>
+        /// Gets or sets the <see cref="ViewDataDictionary"/> for this result.
+        /// </summary>
+        public ViewDataDictionary ViewData { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ITempDataDictionary"/> for this result.
+        /// </summary>
+        public ITempDataDictionary TempData { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Content-Type header for the response.
+        /// </summary>
+        public string ContentType { get; set; }
+
+        /// <inheritdoc />
+        public override Task ExecuteResultAsync(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var services = context.HttpContext.RequestServices;
+            var executor = services.GetRequiredService<IActionResultExecutor<ViewComponentResult>>();
+            return executor.ExecuteAsync(context, this);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ContentViewComponentResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ContentViewComponentResult.cs
new file mode 100644
index 0000000000..3f93189678
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ContentViewComponentResult.cs
@@ -0,0 +1,63 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// An <see cref="IViewComponentResult"/> which writes text when executed.
+    /// </summary>
+    /// <remarks>
+    /// The provided content will be HTML-encoded when written. To write pre-encoded content, use an
+    /// <see cref="HtmlContentViewComponentResult"/>.
+    /// </remarks>
+    public class ContentViewComponentResult : IViewComponentResult
+    {
+        /// <summary>
+        /// Initializes a new <see cref="ContentViewComponentResult"/>.
+        /// </summary>
+        /// <param name="content">Content to write. The content will be HTML encoded when written.</param>
+        public ContentViewComponentResult(string content)
+        {
+            if (content == null)
+            {
+                throw new ArgumentNullException(nameof(content));
+            }
+
+            Content = content;
+        }
+
+        /// <summary>
+        /// Gets the content.
+        /// </summary>
+        public string Content { get; }
+
+        /// <summary>
+        /// Encodes and writes the <see cref="Content"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ViewComponentContext"/>.</param>
+        public void Execute(ViewComponentContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            context.HtmlEncoder.Encode(context.Writer, Content);
+        }
+
+        /// <summary>
+        /// Encodes and writes the <see cref="Content"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ViewComponentContext"/>.</param>
+        /// <returns>A completed <see cref="Task"/>.</returns>
+        public Task ExecuteAsync(ViewComponentContext context)
+        {
+            Execute(context);
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentActivator.cs
new file mode 100644
index 0000000000..b321a3c44a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentActivator.cs
@@ -0,0 +1,82 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// A default implementation of <see cref="IViewComponentActivator"/>.
+    /// </summary>
+    /// <remarks>
+    /// The <see cref="DefaultViewComponentActivator"/> can provide the current instance of
+    /// <see cref="ViewComponentContext"/> to a public property of a view component marked
+    /// with <see cref="ViewComponentContextAttribute"/>. 
+    /// </remarks>
+    public class DefaultViewComponentActivator : IViewComponentActivator
+    {
+        private readonly ITypeActivatorCache _typeActivatorCache;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="DefaultViewComponentActivator"/> class.
+        /// </summary>
+        /// <param name="typeActivatorCache">
+        /// The <see cref="ITypeActivatorCache"/> used to create new view component instances.
+        /// </param>
+        public DefaultViewComponentActivator(ITypeActivatorCache typeActivatorCache)
+        {
+            if (typeActivatorCache == null)
+            {
+                throw new ArgumentNullException(nameof(typeActivatorCache));
+            }
+
+            _typeActivatorCache = typeActivatorCache;
+        }
+
+        /// <inheritdoc />
+        public virtual object Create(ViewComponentContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var componentType = context.ViewComponentDescriptor.TypeInfo;
+            
+            if (componentType == null)
+            {
+                throw new ArgumentException(Resources.FormatPropertyOfTypeCannotBeNull(
+                    nameof(context.ViewComponentDescriptor.TypeInfo),
+                    nameof(context.ViewComponentDescriptor)));
+            }
+
+            var viewComponent = _typeActivatorCache.CreateInstance<object>(
+                context.ViewContext.HttpContext.RequestServices,
+                context.ViewComponentDescriptor.TypeInfo.AsType());
+
+            return viewComponent;
+        }
+
+        /// <inheritdoc />
+        public virtual void Release(ViewComponentContext context, object viewComponent)
+        {
+            if (context == null)
+            {
+                throw new InvalidOperationException(nameof(context));
+            }
+
+            if (viewComponent == null)
+            {
+                throw new InvalidOperationException(nameof(viewComponent));
+            }
+
+            var disposable = viewComponent as IDisposable;
+            if (disposable != null)
+            {
+                disposable.Dispose();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorCollectionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorCollectionProvider.cs
new file mode 100644
index 0000000000..64ab00cda9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorCollectionProvider.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// A default implementation of <see cref="IViewComponentDescriptorCollectionProvider"/>
+    /// </summary>
+    public class DefaultViewComponentDescriptorCollectionProvider : IViewComponentDescriptorCollectionProvider
+    {
+        private readonly IViewComponentDescriptorProvider _descriptorProvider;
+        private ViewComponentDescriptorCollection _viewComponents;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="DefaultViewComponentDescriptorCollectionProvider"/>.
+        /// </summary>
+        /// <param name="descriptorProvider">The <see cref="IViewComponentDescriptorProvider"/>.</param>
+        public DefaultViewComponentDescriptorCollectionProvider(IViewComponentDescriptorProvider descriptorProvider)
+        {
+            _descriptorProvider = descriptorProvider;
+        }
+
+        /// <inheritdoc />
+        public ViewComponentDescriptorCollection ViewComponents
+        {
+            get
+            {
+                if (_viewComponents == null)
+                {
+                    _viewComponents = GetViewComponents();
+                }
+
+                return _viewComponents;
+            }
+        }
+
+        private ViewComponentDescriptorCollection GetViewComponents()
+        {
+            var descriptors = _descriptorProvider.GetViewComponents();
+            return new ViewComponentDescriptorCollection(descriptors.ToArray(), version: 0);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorProvider.cs
new file mode 100644
index 0000000000..238bb47e1f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorProvider.cs
@@ -0,0 +1,122 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// Default implementation of <see cref="IViewComponentDescriptorProvider"/>.
+    /// </summary>
+    public class DefaultViewComponentDescriptorProvider : IViewComponentDescriptorProvider
+    {
+        private const string AsyncMethodName = "InvokeAsync";
+        private const string SyncMethodName = "Invoke";
+        private readonly ApplicationPartManager _partManager;
+
+        /// <summary>
+        /// Creates a new <see cref="DefaultViewComponentDescriptorProvider"/>.
+        /// </summary>
+        /// <param name="partManager">The <see cref="ApplicationPartManager"/>.</param>
+        public DefaultViewComponentDescriptorProvider(ApplicationPartManager partManager)
+        {
+            if (partManager == null)
+            {
+                throw new ArgumentNullException(nameof(partManager));
+            }
+
+            _partManager = partManager;
+        }
+
+        /// <inheritdoc />
+        public virtual IEnumerable<ViewComponentDescriptor> GetViewComponents()
+        {
+            return GetCandidateTypes().Select(CreateDescriptor);
+        }
+
+        /// <summary>
+        /// Gets the candidate <see cref="TypeInfo"/> instances provided by the <see cref="ApplicationPartManager"/>.
+        /// </summary>
+        /// <returns>A list of <see cref="TypeInfo"/> instances.</returns>
+        protected virtual IEnumerable<TypeInfo> GetCandidateTypes()
+        {
+            var feature = new ViewComponentFeature();
+            _partManager.PopulateFeature(feature);
+            return feature.ViewComponents;
+        }
+
+        private static ViewComponentDescriptor CreateDescriptor(TypeInfo typeInfo)
+        {
+            var methodInfo = FindMethod(typeInfo.AsType());
+            var candidate = new ViewComponentDescriptor
+            {
+                FullName = ViewComponentConventions.GetComponentFullName(typeInfo),
+                ShortName = ViewComponentConventions.GetComponentName(typeInfo),
+                TypeInfo = typeInfo,
+                MethodInfo = methodInfo,
+                Parameters = methodInfo.GetParameters()
+            };
+
+            return candidate;
+        }
+
+        private static MethodInfo FindMethod(Type componentType)
+        {
+            var componentName = componentType.FullName;
+            var methods = componentType.GetMethods(BindingFlags.Public | BindingFlags.Instance)
+                .Where(method =>
+                    string.Equals(method.Name, AsyncMethodName, StringComparison.Ordinal) ||
+                    string.Equals(method.Name, SyncMethodName, StringComparison.Ordinal))
+                .ToArray();
+
+            if (methods.Length == 0)
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatViewComponent_CannotFindMethod(SyncMethodName, AsyncMethodName, componentName));
+            }
+            else if (methods.Length > 1)
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatViewComponent_AmbiguousMethods(componentName, AsyncMethodName, SyncMethodName));
+            }
+
+            var selectedMethod = methods[0];
+            if (string.Equals(selectedMethod.Name, AsyncMethodName, StringComparison.Ordinal))
+            {
+                if (!selectedMethod.ReturnType.GetTypeInfo().IsGenericType ||
+                    selectedMethod.ReturnType.GetGenericTypeDefinition() != typeof(Task<>))
+                {
+                    throw new InvalidOperationException(Resources.FormatViewComponent_AsyncMethod_ShouldReturnTask(
+                        AsyncMethodName,
+                        componentName,
+                        nameof(Task)));
+                }
+            }
+            else
+            {
+                // Will invoke synchronously. Method must not return void, Task or Task<T>.
+                if (selectedMethod.ReturnType == typeof(void))
+                {
+                    throw new InvalidOperationException(Resources.FormatViewComponent_SyncMethod_ShouldReturnValue(
+                        SyncMethodName,
+                        componentName));
+                }
+                else if (typeof(Task).IsAssignableFrom(selectedMethod.ReturnType))
+                {
+                    throw new InvalidOperationException(Resources.FormatViewComponent_SyncMethod_CannotReturnTask(
+                        SyncMethodName,
+                        componentName,
+                        nameof(Task)));
+                }
+            }
+
+            return selectedMethod;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentFactory.cs
new file mode 100644
index 0000000000..f0f77ac59d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentFactory.cs
@@ -0,0 +1,92 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.Reflection;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// Default implementation for <see cref="IViewComponentFactory"/>.
+    /// </summary>
+    public class DefaultViewComponentFactory : IViewComponentFactory
+    {
+        private readonly IViewComponentActivator _activator;
+        private readonly Func<Type, PropertyActivator<ViewComponentContext>[]> _getPropertiesToActivate;
+        private readonly ConcurrentDictionary<Type, PropertyActivator<ViewComponentContext>[]> _injectActions;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="DefaultViewComponentFactory"/>
+        /// </summary>
+        /// <param name="activator">
+        /// The <see cref="IViewComponentActivator"/> used to create new view component instances.
+        /// </param>
+        public DefaultViewComponentFactory(IViewComponentActivator activator)
+        {
+            if (activator == null)
+            {
+                throw new ArgumentNullException(nameof(activator));
+            }
+
+            _activator = activator;
+
+            _getPropertiesToActivate = type => PropertyActivator<ViewComponentContext>.GetPropertiesToActivate(
+                type,
+                typeof(ViewComponentContextAttribute),
+                CreateActivateInfo);
+
+            _injectActions = new ConcurrentDictionary<Type, PropertyActivator<ViewComponentContext>[]>();
+        }
+
+        /// <inheritdoc />
+        public object CreateViewComponent(ViewComponentContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var component = _activator.Create(context);
+
+            InjectProperties(context, component);
+
+            return component;
+        }
+
+        private void InjectProperties(ViewComponentContext context, object viewComponent)
+        {
+            var propertiesToActivate = _injectActions.GetOrAdd(
+                viewComponent.GetType(),
+                _getPropertiesToActivate);
+
+            for (var i = 0; i < propertiesToActivate.Length; i++)
+            {
+                var activateInfo = propertiesToActivate[i];
+                activateInfo.Activate(viewComponent, context);
+            }
+        }
+
+        private static PropertyActivator<ViewComponentContext> CreateActivateInfo(PropertyInfo property)
+        {
+            return new PropertyActivator<ViewComponentContext>(property, context => context);
+        }
+
+        /// <inheritdoc />
+        public void ReleaseViewComponent(ViewComponentContext context, object component)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (component == null)
+            {
+                throw new ArgumentNullException(nameof(component));
+            }
+
+            _activator.Release(context, component);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentHelper.cs
new file mode 100644
index 0000000000..0743508566
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentHelper.cs
@@ -0,0 +1,179 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// Default implementation for <see cref="IViewComponentHelper"/>.
+    /// </summary>
+    public class DefaultViewComponentHelper : IViewComponentHelper, IViewContextAware
+    {
+        private readonly IViewComponentDescriptorCollectionProvider _descriptorProvider;
+        private readonly HtmlEncoder _htmlEncoder;
+        private readonly IViewComponentInvokerFactory _invokerFactory;
+        private readonly IViewComponentSelector _selector;
+        private readonly IViewBufferScope _viewBufferScope;
+        private ViewContext _viewContext;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="DefaultViewComponentHelper"/>.
+        /// </summary>
+        /// <param name="descriptorProvider">The <see cref="IViewComponentDescriptorCollectionProvider"/>
+        /// used to locate view components.</param>
+        /// <param name="htmlEncoder">The <see cref="HtmlEncoder"/>.</param>
+        /// <param name="selector">The <see cref="IViewComponentSelector"/>.</param>
+        /// <param name="invokerFactory">The <see cref="IViewComponentInvokerFactory"/>.</param>
+        /// <param name="viewBufferScope">The <see cref="IViewBufferScope"/> that manages the lifetime of
+        /// <see cref="ViewBuffer"/> instances.</param>
+        public DefaultViewComponentHelper(
+            IViewComponentDescriptorCollectionProvider descriptorProvider,
+            HtmlEncoder htmlEncoder,
+            IViewComponentSelector selector,
+            IViewComponentInvokerFactory invokerFactory,
+            IViewBufferScope viewBufferScope)
+        {
+            if (descriptorProvider == null)
+            {
+                throw new ArgumentNullException(nameof(descriptorProvider));
+            }
+
+            if (htmlEncoder == null)
+            {
+                throw new ArgumentNullException(nameof(htmlEncoder));
+            }
+
+            if (selector == null)
+            {
+                throw new ArgumentNullException(nameof(selector));
+            }
+
+            if (invokerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(invokerFactory));
+            }
+
+            if (viewBufferScope == null)
+            {
+                throw new ArgumentNullException(nameof(viewBufferScope));
+            }
+
+            _descriptorProvider = descriptorProvider;
+            _htmlEncoder = htmlEncoder;
+            _selector = selector;
+            _invokerFactory = invokerFactory;
+            _viewBufferScope = viewBufferScope;
+        }
+
+        /// <inheritdoc />
+        public void Contextualize(ViewContext viewContext)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            _viewContext = viewContext;
+        }
+
+        /// <inheritdoc />
+        public Task<IHtmlContent> InvokeAsync(string name, object arguments)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            var descriptor = _selector.SelectComponent(name);
+            if (descriptor == null)
+            {
+                throw new InvalidOperationException(Resources.FormatViewComponent_CannotFindComponent(
+                    name,
+                    nameof(ViewComponentAttribute),
+                    ViewComponentConventions.ViewComponentSuffix,
+                    nameof(NonViewComponentAttribute)));
+            }
+
+            return InvokeCoreAsync(descriptor, arguments);
+        }
+
+        /// <inheritdoc />
+        public Task<IHtmlContent> InvokeAsync(Type componentType, object arguments)
+        {
+            if (componentType == null)
+            {
+                throw new ArgumentNullException(nameof(componentType));
+            }
+
+            var descriptor = SelectComponent(componentType);
+            return InvokeCoreAsync(descriptor, arguments);
+        }
+
+        private ViewComponentDescriptor SelectComponent(Type componentType)
+        {
+            var descriptors = _descriptorProvider.ViewComponents;
+            for (var i = 0; i < descriptors.Items.Count; i++)
+            {
+                var descriptor = descriptors.Items[i];
+                if (descriptor.TypeInfo == componentType?.GetTypeInfo())
+                {
+                    return descriptor;
+                }
+            }
+
+            throw new InvalidOperationException(Resources.FormatViewComponent_CannotFindComponent(
+                componentType.FullName,
+                nameof(ViewComponentAttribute),
+                ViewComponentConventions.ViewComponentSuffix,
+                nameof(NonViewComponentAttribute)));
+        }
+
+        // Internal for testing
+        internal IDictionary<string, object> GetArgumentDictionary(ViewComponentDescriptor descriptor, object arguments)
+        {
+            if (arguments != null)
+            {
+                if (descriptor.Parameters.Count == 1 && descriptor.Parameters[0].ParameterType.IsAssignableFrom(arguments.GetType()))
+                {
+                    return new Dictionary<string, object>(capacity: 1, comparer: StringComparer.OrdinalIgnoreCase)
+                    {
+                        { descriptor.Parameters[0].Name, arguments }
+                    };
+                }
+            }
+
+            return PropertyHelper.ObjectToDictionary(arguments);
+        }
+
+        private async Task<IHtmlContent> InvokeCoreAsync(ViewComponentDescriptor descriptor, object arguments)
+        {
+            var argumentDictionary = GetArgumentDictionary(descriptor, arguments);
+
+            var viewBuffer = new ViewBuffer(_viewBufferScope, descriptor.FullName, ViewBuffer.ViewComponentPageSize);
+            using (var writer = new ViewBufferTextWriter(viewBuffer, _viewContext.Writer.Encoding))
+            {
+                var context = new ViewComponentContext(descriptor, argumentDictionary, _htmlEncoder, _viewContext, writer);
+
+                var invoker = _invokerFactory.CreateInstance(context);
+                if (invoker == null)
+                {
+                    throw new InvalidOperationException(
+                        Resources.FormatViewComponent_IViewComponentFactory_ReturnedNull(descriptor.FullName));
+                }
+
+                await invoker.InvokeAsync(context);
+                return viewBuffer;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs
new file mode 100644
index 0000000000..d2a8614bda
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs
@@ -0,0 +1,231 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// Default implementation for <see cref="IViewComponentInvoker"/>.
+    /// </summary>
+    public class DefaultViewComponentInvoker : IViewComponentInvoker
+    {
+        private readonly IViewComponentFactory _viewComponentFactory;
+        private readonly ViewComponentInvokerCache _viewComponentInvokerCache;
+        private readonly DiagnosticSource _diagnosticSource;
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="DefaultViewComponentInvoker"/>.
+        /// </summary>
+        /// <param name="viewComponentFactory">The <see cref="IViewComponentFactory"/>.</param>
+        /// <param name="viewComponentInvokerCache">The <see cref="ViewComponentInvokerCache"/>.</param>
+        /// <param name="diagnosticSource">The <see cref="DiagnosticSource"/>.</param>
+        /// <param name="logger">The <see cref="ILogger"/>.</param>
+        public DefaultViewComponentInvoker(
+            IViewComponentFactory viewComponentFactory,
+            ViewComponentInvokerCache viewComponentInvokerCache,
+            DiagnosticSource diagnosticSource,
+            ILogger logger)
+        {
+            if (viewComponentFactory == null)
+            {
+                throw new ArgumentNullException(nameof(viewComponentFactory));
+            }
+
+            if (viewComponentInvokerCache == null)
+            {
+                throw new ArgumentNullException(nameof(viewComponentInvokerCache));
+            }
+
+            if (diagnosticSource == null)
+            {
+                throw new ArgumentNullException(nameof(diagnosticSource));
+            }
+
+            if (logger == null)
+            {
+                throw new ArgumentNullException(nameof(logger));
+            }
+
+            _viewComponentFactory = viewComponentFactory;
+            _viewComponentInvokerCache = viewComponentInvokerCache;
+            _diagnosticSource = diagnosticSource;
+            _logger = logger;
+        }
+
+        /// <inheritdoc />
+        public async Task InvokeAsync(ViewComponentContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var executor = _viewComponentInvokerCache.GetViewComponentMethodExecutor(context);
+
+            var returnType = executor.MethodReturnType;
+
+            if (returnType == typeof(void) || returnType == typeof(Task))
+            {
+                throw new InvalidOperationException(Resources.ViewComponent_MustReturnValue);
+            }
+
+            IViewComponentResult result;
+            if (executor.IsMethodAsync)
+            {
+                result = await InvokeAsyncCore(executor, context);
+            }
+            else
+            {
+                // We support falling back to synchronous if there is no InvokeAsync method, in this case we'll still
+                // execute the IViewResult asynchronously.
+                result = InvokeSyncCore(executor, context);
+            }
+
+            await result.ExecuteAsync(context);
+        }
+
+        private async Task<IViewComponentResult> InvokeAsyncCore(ObjectMethodExecutor executor, ViewComponentContext context)
+        {
+            var component = _viewComponentFactory.CreateViewComponent(context);
+
+            using (_logger.ViewComponentScope(context))
+            {
+                var arguments = PrepareArguments(context.Arguments, executor);
+
+                _diagnosticSource.BeforeViewComponent(context, component);
+                _logger.ViewComponentExecuting(context, arguments);
+
+                var stopwatch = ValueStopwatch.StartNew();
+
+                object resultAsObject;
+                var returnType = executor.MethodReturnType;
+
+                if (returnType == typeof(Task<IViewComponentResult>))
+                {
+                    resultAsObject = await (Task<IViewComponentResult>)executor.Execute(component, arguments);
+                }
+                else if (returnType == typeof(Task<string>))
+                {
+                    resultAsObject = await (Task<string>)executor.Execute(component, arguments);
+                }
+                else if (returnType == typeof(Task<IHtmlContent>))
+                {
+                    resultAsObject = await (Task<IHtmlContent>)executor.Execute(component, arguments);
+                }
+                else
+                {
+                    resultAsObject = await executor.ExecuteAsync(component, arguments);
+                }
+
+                var viewComponentResult = CoerceToViewComponentResult(resultAsObject);
+                _logger.ViewComponentExecuted(context, stopwatch.GetElapsedTime(), viewComponentResult);
+                _diagnosticSource.AfterViewComponent(context, viewComponentResult, component);
+
+                _viewComponentFactory.ReleaseViewComponent(context, component);
+
+                return viewComponentResult;
+            }
+        }
+
+        private IViewComponentResult InvokeSyncCore(ObjectMethodExecutor executor, ViewComponentContext context)
+        {
+            var component = _viewComponentFactory.CreateViewComponent(context);
+
+            using (_logger.ViewComponentScope(context))
+            {
+                var arguments = PrepareArguments(context.Arguments, executor);
+
+                _diagnosticSource.BeforeViewComponent(context, component);
+                _logger.ViewComponentExecuting(context, arguments);
+
+                var stopwatch = ValueStopwatch.StartNew();
+                object result;
+
+                try
+                {
+                    result = executor.Execute(component, arguments);
+                }
+                finally
+                {
+                    _viewComponentFactory.ReleaseViewComponent(context, component);
+                }
+
+                var viewComponentResult = CoerceToViewComponentResult(result);
+                _logger.ViewComponentExecuted(context, stopwatch.GetElapsedTime(), viewComponentResult);
+                _diagnosticSource.AfterViewComponent(context, viewComponentResult, component);
+
+                _viewComponentFactory.ReleaseViewComponent(context, component);
+
+                return viewComponentResult;
+            }
+        }
+
+        private static IViewComponentResult CoerceToViewComponentResult(object value)
+        {
+            if (value == null)
+            {
+                throw new InvalidOperationException(Resources.ViewComponent_MustReturnValue);
+            }
+
+            var componentResult = value as IViewComponentResult;
+            if (componentResult != null)
+            {
+                return componentResult;
+            }
+
+            var stringResult = value as string;
+            if (stringResult != null)
+            {
+                return new ContentViewComponentResult(stringResult);
+            }
+
+            var htmlContent = value as IHtmlContent;
+            if (htmlContent != null)
+            {
+                return new HtmlContentViewComponentResult(htmlContent);
+            }
+
+            throw new InvalidOperationException(Resources.FormatViewComponent_InvalidReturnValue(
+                typeof(string).Name,
+                typeof(IHtmlContent).Name,
+                typeof(IViewComponentResult).Name));
+        }
+
+        private static object[] PrepareArguments(
+            IDictionary<string, object> parameters,
+            ObjectMethodExecutor objectMethodExecutor)
+        {
+            var declaredParameterInfos = objectMethodExecutor.MethodParameters;
+            var count = declaredParameterInfos.Length;
+            if (count == 0)
+            {
+                return null;
+            }
+
+            var arguments = new object[count];
+            for (var index = 0; index < count; index++)
+            {
+                var parameterInfo = declaredParameterInfos[index];
+
+                if (!parameters.TryGetValue(parameterInfo.Name, out var value))
+                {
+                    value = objectMethodExecutor.GetDefaultValueForParameter(index);
+                }
+
+                arguments[index] = value;
+            }
+
+            return arguments;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs
new file mode 100644
index 0000000000..1dd5d172e6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs
@@ -0,0 +1,69 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    public class DefaultViewComponentInvokerFactory : IViewComponentInvokerFactory
+    {
+        private readonly IViewComponentFactory _viewComponentFactory;
+        private readonly ViewComponentInvokerCache _viewComponentInvokerCache;
+        private readonly ILogger _logger;
+        private readonly DiagnosticSource _diagnosticSource;
+
+        public DefaultViewComponentInvokerFactory(
+            IViewComponentFactory viewComponentFactory,
+            ViewComponentInvokerCache viewComponentInvokerCache,
+            DiagnosticSource diagnosticSource,
+            ILoggerFactory loggerFactory)
+        {
+            if (viewComponentFactory == null)
+            {
+                throw new ArgumentNullException(nameof(viewComponentFactory));
+            }
+
+            if (viewComponentInvokerCache == null)
+            {
+                throw new ArgumentNullException(nameof(viewComponentInvokerCache));
+            }
+
+            if (diagnosticSource == null)
+            {
+                throw new ArgumentNullException(nameof(diagnosticSource));
+            }
+
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            _viewComponentFactory = viewComponentFactory;
+            _diagnosticSource = diagnosticSource;
+            _viewComponentInvokerCache = viewComponentInvokerCache;
+
+            _logger = loggerFactory.CreateLogger<DefaultViewComponentInvoker>();
+        }
+
+        /// <inheritdoc />
+        // We don't currently make use of the descriptor or the arguments here (they are available on the context).
+        // We might do this some day to cache which method we select, so resist the urge to 'clean' this without
+        // considering that possibility.
+        public IViewComponentInvoker CreateInstance(ViewComponentContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            return new DefaultViewComponentInvoker(
+                _viewComponentFactory,
+                _viewComponentInvokerCache,
+                _diagnosticSource,
+                _logger);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentSelector.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentSelector.cs
new file mode 100644
index 0000000000..18be71ebb1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentSelector.cs
@@ -0,0 +1,112 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// Default implementation of <see cref="IViewComponentSelector"/>.
+    /// </summary>
+    public class DefaultViewComponentSelector : IViewComponentSelector
+    {
+        private readonly IViewComponentDescriptorCollectionProvider _descriptorProvider;
+
+        private ViewComponentDescriptorCache _cache;
+
+        /// <summary>
+        /// Creates a new <see cref="DefaultViewComponentSelector"/>.
+        /// </summary>
+        /// <param name="descriptorProvider">The <see cref="IViewComponentDescriptorCollectionProvider"/>.</param>
+        public DefaultViewComponentSelector(IViewComponentDescriptorCollectionProvider descriptorProvider)
+        {
+            _descriptorProvider = descriptorProvider;
+        }
+
+        /// <inheritdoc />
+        public ViewComponentDescriptor SelectComponent(string componentName)
+        {
+            if (componentName == null)
+            {
+                throw new ArgumentNullException(nameof(componentName));
+            }
+
+            var collection = _descriptorProvider.ViewComponents;
+            if (_cache == null || _cache.Version != collection.Version)
+            {
+                _cache = new ViewComponentDescriptorCache(collection);
+            }
+
+            // ViewComponent names can either be fully-qualified, or refer to the 'short-name'. If the provided
+            // name contains a '.' - then it's a fully-qualified name.
+            if (componentName.Contains("."))
+            {
+                return _cache.SelectByFullName(componentName);
+            }
+            else
+            {
+                return _cache.SelectByShortName(componentName);
+            }
+        }
+
+        private class ViewComponentDescriptorCache
+        {
+            private readonly ILookup<string, ViewComponentDescriptor> _lookupByShortName;
+            private readonly ILookup<string, ViewComponentDescriptor> _lookupByFullName;
+
+            public ViewComponentDescriptorCache(ViewComponentDescriptorCollection collection)
+            {
+                Version = collection.Version;
+
+                _lookupByShortName = collection.Items.ToLookup(c => c.ShortName, c => c);
+                _lookupByFullName = collection.Items.ToLookup(c => c.FullName, c => c);
+            }
+
+            public int Version { get; }
+
+            public ViewComponentDescriptor SelectByShortName(string name)
+            {
+                return Select(_lookupByShortName, name);
+            }
+
+            public ViewComponentDescriptor SelectByFullName(string name)
+            {
+                return Select(_lookupByFullName, name);
+            }
+
+            private static ViewComponentDescriptor Select(
+                ILookup<string, ViewComponentDescriptor> candidates,
+                string name)
+            {
+                var matches = candidates[name];
+
+                var count = matches.Count();
+                if (count == 0)
+                {
+                    return null;
+                }
+                else if (count == 1)
+                {
+                    return matches.Single();
+                }
+                else
+                {
+                    var matchedTypes = new List<string>();
+                    foreach (var candidate in matches)
+                    {
+                        matchedTypes.Add(Resources.FormatViewComponent_AmbiguousTypeMatch_Item(
+                            candidate.TypeInfo.FullName,
+                            candidate.FullName));
+                    }
+
+                    var typeNames = string.Join(Environment.NewLine, matchedTypes);
+                    throw new InvalidOperationException(
+                        Resources.FormatViewComponent_AmbiguousTypeMatch(name, Environment.NewLine, typeNames));
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/HtmlContentViewComponentResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/HtmlContentViewComponentResult.cs
new file mode 100644
index 0000000000..e13faea8c8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/HtmlContentViewComponentResult.cs
@@ -0,0 +1,63 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// An <see cref="IViewComponentResult"/> which writes an <see cref="IHtmlContent"/> when executed.
+    /// </summary>
+    /// <remarks>
+    /// The provided content will be HTML-encoded as specified when the content was created. To encoded and write
+    /// text, use a <see cref="ContentViewComponentResult"/>.
+    /// </remarks>
+    public class HtmlContentViewComponentResult : IViewComponentResult
+    {
+        /// <summary>
+        /// Initializes a new <see cref="HtmlContentViewComponentResult"/>.
+        /// </summary>
+        public HtmlContentViewComponentResult(IHtmlContent encodedContent)
+        {
+            if (encodedContent == null)
+            {
+                throw new ArgumentNullException(nameof(encodedContent));
+            }
+
+            EncodedContent = encodedContent;
+        }
+
+        /// <summary>
+        /// Gets the encoded content.
+        /// </summary>
+        public IHtmlContent EncodedContent { get; }
+
+        /// <summary>
+        /// Writes the <see cref="EncodedContent"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ViewComponentContext"/>.</param>
+        public void Execute(ViewComponentContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            context.Writer.Write(EncodedContent);
+        }
+
+        /// <summary>
+        /// Writes the <see cref="EncodedContent"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ViewComponentContext"/>.</param>
+        /// <returns>A completed <see cref="Task"/>.</returns>
+        public Task ExecuteAsync(ViewComponentContext context)
+        {
+            Execute(context);
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentActivator.cs
new file mode 100644
index 0000000000..92c3b4971b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentActivator.cs
@@ -0,0 +1,28 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// Provides methods to instantiate and release a ViewComponent.
+    /// </summary>
+    public interface IViewComponentActivator
+    {
+        /// <summary>
+        /// Instantiates a ViewComponent.
+        /// </summary>
+        /// <param name="context">
+        /// The <see cref="ViewComponentContext"/> for the executing <see cref="ViewComponent"/>.
+        /// </param>
+        object Create(ViewComponentContext context);
+
+        /// <summary>
+        /// Releases a ViewComponent instance.
+        /// </summary>
+        /// <param name="context">
+        /// The <see cref="ViewComponentContext"/> associated with the <paramref name="viewComponent"/>.
+        /// </param>
+        /// <param name="viewComponent">The <see cref="ViewComponent"/> to release.</param>
+        void Release(ViewComponentContext context, object viewComponent);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorCollectionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorCollectionProvider.cs
new file mode 100644
index 0000000000..b34927b814
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorCollectionProvider.cs
@@ -0,0 +1,28 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// Provides the currently cached collection of <see cref="ViewComponentDescriptor"/>.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// The default implementation does not update the cache, it is up to the user
+    /// to create or use an implementation that can update the available view components in
+    /// the application. The implementor is also responsible for updating the
+    /// <see cref="ViewComponentDescriptorCollection.Version"/> in a thread safe way.
+    /// </para>
+    /// <para>
+    /// Default consumers of this service, are aware of the version and will recache
+    /// data as appropriate, but rely on the version being unique.
+    /// </para>
+    /// </remarks>
+    public interface IViewComponentDescriptorCollectionProvider
+    {
+        /// <summary>
+        /// Returns the current cached <see cref="ViewComponentDescriptorCollection"/>.
+        /// </summary>
+        ViewComponentDescriptorCollection ViewComponents { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorProvider.cs
new file mode 100644
index 0000000000..19555e0d30
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorProvider.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// Discovers the view components in the application.
+    /// </summary>
+    public interface IViewComponentDescriptorProvider
+    {
+        /// <summary>
+        /// Gets the set of <see cref="ViewComponentDescriptor"/>.
+        /// </summary>
+        /// <returns>A list of <see cref="ViewComponentDescriptor"/>.</returns>
+        IEnumerable<ViewComponentDescriptor> GetViewComponents();
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentFactory.cs
new file mode 100644
index 0000000000..e3ff201f70
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentFactory.cs
@@ -0,0 +1,25 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// Provides methods for creation and disposal of view components.
+    /// </summary>
+    public interface IViewComponentFactory
+    {
+        /// <summary>
+        /// Creates a new controller for the specified <paramref name="context"/>.
+        /// </summary>
+        /// <param name="context"><see cref="ViewComponentContext"/> for the view component.</param>
+        /// <returns>The view component.</returns>
+        object CreateViewComponent(ViewComponentContext context);
+
+        /// <summary>
+        /// Releases a view component instance.
+        /// </summary>
+        /// <param name="context">The context associated with the <paramref name="component"/>.</param>
+        /// <param name="component">The view component.</param>
+        void ReleaseViewComponent(ViewComponentContext context, object component);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentInvoker.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentInvoker.cs
new file mode 100644
index 0000000000..02ef85421e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentInvoker.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// Specifies the contract for execution of a view component.
+    /// </summary>
+    public interface IViewComponentInvoker
+    {
+        /// <summary>
+        /// Executes the view component specified by <see cref="ViewComponentContext.ViewComponentDescriptor"/>
+        /// of <paramref name="context"/> and writes the result to <see cref="ViewComponentContext.Writer"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ViewComponentContext"/>.</param>
+        /// <returns>A <see cref="Task"/> that represents the asynchronous operation of execution.</returns>
+        Task InvokeAsync(ViewComponentContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentInvokerFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentInvokerFactory.cs
new file mode 100644
index 0000000000..5269162086
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentInvokerFactory.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    public interface IViewComponentInvokerFactory
+    {
+        IViewComponentInvoker CreateInstance(ViewComponentContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentSelector.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentSelector.cs
new file mode 100644
index 0000000000..a2cdc8338f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentSelector.cs
@@ -0,0 +1,18 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// Selects a view component based on a view component name.
+    /// </summary>
+    public interface IViewComponentSelector
+    {
+        /// <summary>
+        /// Selects a view component based on <paramref name="componentName"/>.
+        /// </summary>
+        /// <param name="componentName">The view component name.</param>
+        /// <returns>A <see cref="ViewComponentDescriptor"/>, or <c>null</c> if no match is found.</returns>
+        ViewComponentDescriptor SelectComponent(string componentName);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ServiceBasedViewComponentActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ServiceBasedViewComponentActivator.cs
new file mode 100644
index 0000000000..deb26a9e44
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ServiceBasedViewComponentActivator.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using System;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// A <see cref="IViewComponentActivator"/> that retrieves view components as services from the request's
+    /// <see cref="IServiceProvider"/>.
+    /// </summary>
+    public class ServiceBasedViewComponentActivator : IViewComponentActivator
+    {
+        /// <inheritdoc />
+        public object Create(ViewComponentContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var viewComponentType = context.ViewComponentDescriptor.TypeInfo.AsType();
+
+            return context.ViewContext.HttpContext.RequestServices.GetRequiredService(viewComponentType);
+        }
+
+        /// <inheritdoc />
+        public virtual void Release(ViewComponentContext context, object viewComponent)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentContext.cs
new file mode 100644
index 0000000000..32e4fbd338
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentContext.cs
@@ -0,0 +1,141 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// A context for view components.
+    /// </summary>
+    public class ViewComponentContext
+    {
+        /// <summary>
+        /// Creates a new <see cref="ViewComponentContext"/>.
+        /// </summary>
+        /// <remarks>
+        /// The default constructor is provided for unit test purposes only.
+        /// </remarks>
+        public ViewComponentContext()
+        {
+            ViewComponentDescriptor = new ViewComponentDescriptor();
+            ViewContext = new ViewContext();
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="ViewComponentContext"/>.
+        /// </summary>
+        /// <param name="viewComponentDescriptor">
+        /// The <see cref="ViewComponentContext"/> for the view component being invoked.
+        /// </param>
+        /// <param name="arguments">The view component arguments.</param>
+        /// <param name="htmlEncoder">The <see cref="HtmlEncoder"/> to use.</param>
+        /// <param name="viewContext">The <see cref="ViewContext"/>.</param>
+        /// <param name="writer">The <see cref="TextWriter"/> for writing output.</param>
+        public ViewComponentContext(
+            ViewComponentDescriptor viewComponentDescriptor,
+            IDictionary<string, object> arguments,
+            HtmlEncoder htmlEncoder,
+            ViewContext viewContext,
+            TextWriter writer)
+        {
+            if (viewComponentDescriptor == null)
+            {
+                throw new ArgumentNullException(nameof(viewComponentDescriptor));
+            }
+
+            if (arguments == null)
+            {
+                throw new ArgumentNullException(nameof(arguments));
+            }
+
+            if (htmlEncoder == null)
+            {
+                throw new ArgumentNullException(nameof(htmlEncoder));
+            }
+
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
+            ViewComponentDescriptor = viewComponentDescriptor;
+            Arguments = arguments;
+            HtmlEncoder = htmlEncoder;
+
+            // We want to create a defensive copy of the VDD here so that changes done in the VC
+            // aren't visible in the calling view.
+            ViewContext = new ViewContext(
+                viewContext,
+                viewContext.View,
+                new ViewDataDictionary<object>(viewContext.ViewData),
+                writer);
+        }
+
+        /// <summary>
+        /// Gets or sets the view component arguments.
+        /// </summary>
+        /// <remarks>
+        /// The property setter is provided for unit test purposes only.
+        /// </remarks>
+        public IDictionary<string, object> Arguments { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="System.Text.Encodings.Web.HtmlEncoder"/>.
+        /// </summary>
+        /// <remarks>
+        /// The property setter is provided for unit test purposes only.
+        /// </remarks>
+        public HtmlEncoder HtmlEncoder { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ViewComponents.ViewComponentDescriptor"/> for the view component being invoked.
+        /// </summary>
+        /// <remarks>
+        /// The property setter is provided for unit test purposes only.
+        /// </remarks>
+        public ViewComponentDescriptor ViewComponentDescriptor { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Rendering.ViewContext"/>.
+        /// </summary>
+        /// <remarks>
+        /// The property setter is provided for unit test purposes only.
+        /// </remarks>
+        public ViewContext ViewContext { get; set; }
+
+        /// <summary>
+        /// Gets the <see cref="ViewDataDictionary"/>.
+        /// </summary>
+        /// <remarks>
+        /// This is an alias for <c>ViewContext.ViewData</c>.
+        /// </remarks>
+        public ViewDataDictionary ViewData => ViewContext.ViewData;
+
+        /// <summary>
+        /// Gets the <see cref="ITempDataDictionary"/>.
+        /// </summary>
+        /// <remarks>
+        /// This is an alias for <c>ViewContext.TempData</c>.
+        /// </remarks>
+        public ITempDataDictionary TempData => ViewContext.TempData;
+
+        /// <summary>
+        /// Gets the <see cref="TextWriter"/> for output.
+        /// </summary>
+        /// <remarks>
+        /// This is an alias for <c>ViewContext.Writer</c>.
+        /// </remarks>
+        public TextWriter Writer => ViewContext.Writer;
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentContextAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentContextAttribute.cs
new file mode 100644
index 0000000000..aa70e13569
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentContextAttribute.cs
@@ -0,0 +1,17 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// Specifies that a controller property should be set with the current
+    /// <see cref="ViewComponentContext"/> when creating the view component. The property must have a public
+    /// set method.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
+    public class ViewComponentContextAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentConventions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentConventions.cs
new file mode 100644
index 0000000000..7f0e501c6b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentConventions.cs
@@ -0,0 +1,96 @@
+// 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.
+
+using System;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    public static class ViewComponentConventions
+    {
+        public static readonly string ViewComponentSuffix = "ViewComponent";
+
+        public static string GetComponentName(TypeInfo componentType)
+        {
+            if (componentType == null)
+            {
+                throw new ArgumentNullException(nameof(componentType));
+            }
+
+            var attribute = componentType.GetCustomAttribute<ViewComponentAttribute>();
+            if (attribute != null && !string.IsNullOrEmpty(attribute.Name))
+            {
+                var separatorIndex = attribute.Name.LastIndexOf('.');
+                if (separatorIndex >= 0)
+                {
+                    return attribute.Name.Substring(separatorIndex + 1);
+                }
+                else
+                {
+                    return attribute.Name;
+                }
+            }
+
+            return GetShortNameByConvention(componentType);
+        }
+
+        public static string GetComponentFullName(TypeInfo componentType)
+        {
+            if (componentType == null)
+            {
+                throw new ArgumentNullException(nameof(componentType));
+            }
+
+            var attribute = componentType.GetCustomAttribute<ViewComponentAttribute>();
+            if (!string.IsNullOrEmpty(attribute?.Name))
+            {
+                return attribute.Name;
+            }
+
+            // If the view component didn't define a name explicitly then use the namespace + the
+            // 'short name'.
+            var shortName = GetShortNameByConvention(componentType);
+            if (string.IsNullOrEmpty(componentType.Namespace))
+            {
+                return shortName;
+            }
+            else
+            {
+                return componentType.Namespace + "." + shortName;
+            }
+        }
+
+        private static string GetShortNameByConvention(TypeInfo componentType)
+        {
+            if (componentType.Name.EndsWith(ViewComponentSuffix, StringComparison.OrdinalIgnoreCase))
+            {
+                return componentType.Name.Substring(0, componentType.Name.Length - ViewComponentSuffix.Length);
+            }
+            else
+            {
+                return componentType.Name;
+            }
+        }
+
+        public static bool IsComponent(TypeInfo typeInfo)
+        {
+            if (typeInfo == null)
+            {
+                throw new ArgumentNullException(nameof(typeInfo));
+            }
+
+            if (!typeInfo.IsClass ||
+                !typeInfo.IsPublic ||
+                typeInfo.IsAbstract ||
+                typeInfo.ContainsGenericParameters ||
+                typeInfo.IsDefined(typeof(NonViewComponentAttribute)))
+            {
+                return false;
+            }
+
+            return
+                typeInfo.Name.EndsWith(ViewComponentSuffix, StringComparison.OrdinalIgnoreCase) ||
+                typeInfo.IsDefined(typeof(ViewComponentAttribute));
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptor.cs
new file mode 100644
index 0000000000..4aa1125757
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptor.cs
@@ -0,0 +1,134 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// A descriptor for a view component.
+    /// </summary>
+    [DebuggerDisplay("{DisplayName}")]
+    public class ViewComponentDescriptor
+    {
+        private string _displayName;
+
+        /// <summary>
+        /// Creates a new <see cref="ViewComponentDescriptor"/>.
+        /// </summary>
+        public ViewComponentDescriptor()
+        {
+            Id = Guid.NewGuid().ToString();
+        }
+
+        /// <summary>
+        /// Gets or sets the display name of the view component.
+        /// </summary>
+        public string DisplayName
+        {
+            get
+            {
+                if (_displayName == null)
+                {
+                    _displayName = TypeInfo?.FullName;
+                }
+
+                return _displayName;
+            }
+
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _displayName = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the full name.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// The full name is defaulted to the full namespace of the view component class, prepended to
+        /// the class name with a '.' character as the separator. If the view component class uses
+        /// <code>ViewComponent</code> as a suffix, the suffix will be omitted from the <see cref="FullName"/>.
+        /// </para>
+        /// <example>
+        ///     Class Name: Contoso.Products.LoginViewComponent
+        ///     View Component FullName: Contoso.Products.Login
+        /// </example>
+        /// <example>
+        ///     Class Name: Contoso.Blog.Tags
+        ///     View Component FullName: Contoso.Blog.Tags
+        /// </example>
+        /// <para>
+        /// If <see cref="ViewComponentAttribute.Name"/> is used to set a name, then this will be used as
+        /// the <see cref="FullName"/>.
+        /// </para>
+        /// <example>
+        ///     [ViewComponent(Name = "Contoso.Forum.UsersOnline")]
+        ///     public class OnlineUsersViewComponent
+        ///     {
+        ///     }
+        ///     View Component FullName: Contoso.Forum.UsersOnline
+        /// </example>
+        /// </remarks>
+        public string FullName { get; set; }
+
+        /// <summary>
+        /// Gets or set the generated unique identifier for this <see cref="ViewComponentDescriptor"/>.
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the short name.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// The short name is defaulted to the name of the view component class. If the view component class uses
+        /// <code>ViewComponent</code> as a suffix, the suffix will be omitted from the <see cref="ShortName"/>.
+        /// </para>
+        /// <example>
+        ///     Class Name: Contoso.Products.LoginViewComponent
+        ///     View Component ShortName: Login
+        /// </example>
+        /// <example>
+        ///     Class Name: Contoso.Blog.Tags
+        ///     View Component ShortName: Tags
+        /// </example>
+        /// <para>
+        /// If <see cref="ViewComponentAttribute.Name"/> is used to set a name, then the last segment of the 
+        /// value (using '.' as a separate) will be used as the <see cref="ShortName"/>.
+        /// </para>
+        /// <example>
+        ///     [ViewComponent(Name = "Contoso.Forum.UsersOnline")]
+        ///     public class OnlineUsersViewComponent
+        ///     {
+        ///     }
+        ///     View Component ShortName: UsersOnline
+        /// </example>
+        /// </remarks>
+        public string ShortName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="System.Reflection.TypeInfo"/>.
+        /// </summary>
+        public TypeInfo TypeInfo { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="System.Reflection.MethodInfo"/> to invoke.
+        /// </summary>
+        public MethodInfo MethodInfo { get; set; }
+
+        /// <summary>
+        /// Gets or sets the parameters associated with the method described by <see cref="MethodInfo"/>.
+        /// </summary>
+        public IReadOnlyList<ParameterInfo> Parameters { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptorCollection.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptorCollection.cs
new file mode 100644
index 0000000000..0f8d6e14d7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptorCollection.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// A cached collection of <see cref="ViewComponentDescriptor" />.
+    /// </summary>
+    public class ViewComponentDescriptorCollection
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewComponentDescriptorCollection"/>.
+        /// </summary>
+        /// <param name="items">The result of view component discovery</param>
+        /// <param name="version">The unique version of discovered view components.</param>
+        public ViewComponentDescriptorCollection(IEnumerable<ViewComponentDescriptor> items, int version)
+        {
+            if (items == null)
+            {
+                throw new ArgumentNullException(nameof(items));
+            }
+
+            Items = new List<ViewComponentDescriptor>(items);
+            Version = version;
+        }
+
+        /// <summary>
+        /// Returns the cached <see cref="IReadOnlyList{ViewComponentDescriptor}"/>.
+        /// </summary>
+        public IReadOnlyList<ViewComponentDescriptor> Items { get; }
+
+        /// <summary>
+        /// Returns the unique version of the currently cached items.
+        /// </summary>
+        public int Version { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentFeature.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentFeature.cs
new file mode 100644
index 0000000000..6abb947f21
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentFeature.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// The list of view component types in an MVC application.The <see cref="ViewComponentFeature"/> can be populated
+    /// using the <see cref="ApplicationPartManager"/> that is available during startup at <see cref="IMvcBuilder.PartManager"/>
+    /// and <see cref="IMvcCoreBuilder.PartManager"/> or at a later stage by requiring the <see cref="ApplicationPartManager"/>
+    /// as a dependency in a component.
+    /// </summary>
+    public class ViewComponentFeature
+    {
+        /// <summary>
+        /// Gets the list of view component types in an MVC application.
+        /// </summary>
+        public IList<TypeInfo> ViewComponents { get; } = new List<TypeInfo>();
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentFeatureProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentFeatureProvider.cs
new file mode 100644
index 0000000000..eb953fb5af
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentFeatureProvider.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// Discovers view components from a list of <see cref="ApplicationPart"/> instances.
+    /// </summary>
+    public class ViewComponentFeatureProvider : IApplicationFeatureProvider<ViewComponentFeature>
+    {
+        /// <inheritdoc />
+        public void PopulateFeature(IEnumerable<ApplicationPart> parts, ViewComponentFeature feature)
+        {
+            if (parts == null)
+            {
+                throw new ArgumentNullException(nameof(parts));
+            }
+
+            if (feature == null)
+            {
+                throw new ArgumentNullException(nameof(feature));
+            }
+
+            foreach (var type in parts.OfType<IApplicationPartTypeProvider>().SelectMany(p => p.Types))
+            {
+                if (ViewComponentConventions.IsComponent(type) && ! feature.ViewComponents.Contains(type))
+                {
+                    feature.ViewComponents.Add(type);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentInvokerCache.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentInvokerCache.cs
new file mode 100644
index 0000000000..e19a2673c5
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentInvokerCache.cs
@@ -0,0 +1,84 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class ViewComponentInvokerCache
+    {
+        private readonly IViewComponentDescriptorCollectionProvider _collectionProvider;
+
+        private volatile InnerCache _currentCache;
+
+        public ViewComponentInvokerCache(IViewComponentDescriptorCollectionProvider collectionProvider)
+        {
+            _collectionProvider = collectionProvider;
+        }
+
+        private InnerCache CurrentCache
+        {
+            get
+            {
+                var current = _currentCache;
+                var actionDescriptors = _collectionProvider.ViewComponents;
+
+                if (current == null || current.Version != actionDescriptors.Version)
+                {
+                    current = new InnerCache(actionDescriptors.Version);
+                    _currentCache = current;
+                }
+
+                return current;
+            }
+        }
+
+        internal ObjectMethodExecutor GetViewComponentMethodExecutor(ViewComponentContext viewComponentContext)
+        {
+            var cache = CurrentCache;
+            var viewComponentDescriptor = viewComponentContext.ViewComponentDescriptor;
+
+            ObjectMethodExecutor executor;
+            if (cache.Entries.TryGetValue(viewComponentDescriptor, out executor))
+            {
+                return executor;
+            }
+
+            var methodInfo = viewComponentContext.ViewComponentDescriptor?.MethodInfo;
+            if (methodInfo == null)
+            {
+                throw new InvalidOperationException(Resources.FormatPropertyOfTypeCannotBeNull(
+                    nameof(ViewComponentDescriptor.MethodInfo),
+                    nameof(ViewComponentDescriptor)));
+            }
+
+            var parameterDefaultValues = ParameterDefaultValues
+                .GetParameterDefaultValues(methodInfo);
+
+            executor = ObjectMethodExecutor.Create(
+                viewComponentDescriptor.MethodInfo,
+                viewComponentDescriptor.TypeInfo,
+                parameterDefaultValues);
+
+            cache.Entries.TryAdd(viewComponentDescriptor, executor);
+            return executor;
+        }
+
+        private class InnerCache
+        {
+            public InnerCache(int version)
+            {
+                Version = version;
+            }
+
+            public ConcurrentDictionary<ViewComponentDescriptor, ObjectMethodExecutor> Entries { get; } =
+                new ConcurrentDictionary<ViewComponentDescriptor, ObjectMethodExecutor>();
+
+            public int Version { get; }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs
new file mode 100644
index 0000000000..7ccf1df877
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs
@@ -0,0 +1,142 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    /// <summary>
+    /// A <see cref="IViewComponentResult"/> that renders a partial view when executed.
+    /// </summary>
+    public class ViewViewComponentResult : IViewComponentResult
+    {
+        // {0} is the component name, {1} is the view name.
+        private const string ViewPathFormat = "Components/{0}/{1}";
+        private const string DefaultViewName = "Default";
+
+        private DiagnosticSource _diagnosticSource;
+
+        /// <summary>
+        /// Gets or sets the view name.
+        /// </summary>
+        public string ViewName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ViewDataDictionary"/>.
+        /// </summary>
+        public ViewDataDictionary ViewData { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ITempDataDictionary"/> instance.
+        /// </summary>
+        public ITempDataDictionary TempData { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ViewEngine"/>.
+        /// </summary>
+        public IViewEngine ViewEngine { get; set; }
+
+        /// <summary>
+        /// Locates and renders a view specified by <see cref="ViewName"/>. If <see cref="ViewName"/> is <c>null</c>,
+        /// then the view name searched for is<c>&quot;Default&quot;</c>.
+        /// </summary>
+        /// <param name="context">The <see cref="ViewComponentContext"/> for the current component execution.</param>
+        /// <remarks>
+        /// This method synchronously calls and blocks on <see cref="ExecuteAsync(ViewComponentContext)"/>.
+        /// </remarks>
+        public void Execute(ViewComponentContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var task = ExecuteAsync(context);
+            task.GetAwaiter().GetResult();
+        }
+
+        /// <summary>
+        /// Locates and renders a view specified by <see cref="ViewName"/>. If <see cref="ViewName"/> is <c>null</c>,
+        /// then the view name searched for is<c>&quot;Default&quot;</c>.
+        /// </summary>
+        /// <param name="context">The <see cref="ViewComponentContext"/> for the current component execution.</param>
+        /// <returns>A <see cref="Task"/> which will complete when view rendering is completed.</returns>
+        public async Task ExecuteAsync(ViewComponentContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var viewEngine = ViewEngine ?? ResolveViewEngine(context);
+            var viewContext = context.ViewContext;
+            var isNullOrEmptyViewName = string.IsNullOrEmpty(ViewName);
+
+            ViewEngineResult result = null;
+            IEnumerable<string> originalLocations = null;
+            if (!isNullOrEmptyViewName)
+            {
+                // If view name was passed in is already a path, the view engine will handle this.
+                result = viewEngine.GetView(viewContext.ExecutingFilePath, ViewName, isMainPage: false);
+                originalLocations = result.SearchedLocations;
+            }
+
+            if (result == null || !result.Success)
+            {
+                // This will produce a string like:
+                //
+                //  Components/Cart/Default
+                //
+                // The view engine will combine this with other path info to search paths like:
+                //
+                //  Views/Shared/Components/Cart/Default.cshtml
+                //  Views/Home/Components/Cart/Default.cshtml
+                //  Areas/Blog/Views/Shared/Components/Cart/Default.cshtml
+                //
+                // This supports a controller or area providing an override for component views.
+                var viewName = isNullOrEmptyViewName ? DefaultViewName : ViewName;
+                var qualifiedViewName = string.Format(
+                    CultureInfo.InvariantCulture,
+                    ViewPathFormat,
+                    context.ViewComponentDescriptor.ShortName,
+                    viewName);
+
+                result = viewEngine.FindView(viewContext, qualifiedViewName, isMainPage: false);
+            }
+
+            var view = result.EnsureSuccessful(originalLocations).View;
+            using (view as IDisposable)
+            {
+                if (_diagnosticSource == null)
+                {
+                    _diagnosticSource = viewContext.HttpContext.RequestServices.GetRequiredService<DiagnosticSource>();
+                }
+
+                _diagnosticSource.ViewComponentBeforeViewExecute(context, view);
+
+                var childViewContext = new ViewContext(
+                    viewContext,
+                    view,
+                    ViewData ?? context.ViewData,
+                    context.Writer);
+                await view.RenderAsync(childViewContext);
+
+                _diagnosticSource.ViewComponentAfterViewExecute(context, view);
+            }
+        }
+
+        private static IViewEngine ResolveViewEngine(ViewComponentContext context)
+        {
+            return context.ViewContext.HttpContext.RequestServices.GetRequiredService<ICompositeViewEngine>();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataAttribute.cs
new file mode 100644
index 0000000000..ca0cee6ea0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataAttribute.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Properties decorated with <see cref="ViewDataAttribute"/> will have their values stored in
+    /// and loaded from the <see cref="ViewDataDictionary"/>. <see cref="ViewDataDictionary"/>
+    /// is supported on properties of Controllers, and Razor Page handlers.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property, Inherited = true, AllowMultiple = false)]
+    public sealed class ViewDataAttribute : Attribute
+    {
+        /// <summary>
+        /// Gets or sets the key used to get or add the property from value from <see cref="ViewDataDictionary"/>.
+        /// When unspecified, the key is the property name.
+        /// </summary>
+        public string Key { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/CompositeViewEngine.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/CompositeViewEngine.cs
new file mode 100644
index 0000000000..d0478b2aeb
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/CompositeViewEngine.cs
@@ -0,0 +1,128 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.ViewEngines
+{
+    /// <inheritdoc />
+    public class CompositeViewEngine : ICompositeViewEngine
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="CompositeViewEngine"/>.
+        /// </summary>
+        /// <param name="optionsAccessor">The options accessor for <see cref="MvcViewOptions"/>.</param>
+        public CompositeViewEngine(IOptions<MvcViewOptions> optionsAccessor)
+        {
+            ViewEngines = optionsAccessor.Value.ViewEngines.ToArray();
+        }
+
+        /// <inheritdoc />
+        public IReadOnlyList<IViewEngine> ViewEngines { get; }
+
+        /// <inheritdoc />
+        public ViewEngineResult FindView(ActionContext context, string viewName, bool isMainPage)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (string.IsNullOrEmpty(viewName))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(viewName));
+            }
+
+            if (ViewEngines.Count == 0)
+            {
+                throw new InvalidOperationException(Resources.FormatViewEnginesAreRequired(
+                    typeof(MvcViewOptions).FullName,
+                    nameof(MvcViewOptions.ViewEngines),
+                    typeof(IViewEngine).FullName));
+            }
+
+            // Do not allocate in the common cases: ViewEngines contains one entry or initial attempt is successful.
+            IEnumerable<string> searchedLocations = null;
+            List<string> searchedList = null;
+            for (var i = 0; i < ViewEngines.Count; i++)
+            {
+                var result = ViewEngines[i].FindView(context, viewName, isMainPage);
+                if (result.Success)
+                {
+                    return result;
+                }
+
+                if (searchedLocations == null)
+                {
+                    // First failure.
+                    searchedLocations = result.SearchedLocations;
+                }
+                else
+                {
+                    if (searchedList == null)
+                    {
+                        // Second failure.
+                        searchedList = new List<string>(searchedLocations);
+                        searchedLocations = searchedList;
+                    }
+
+                    searchedList.AddRange(result.SearchedLocations);
+                }
+            }
+
+            return ViewEngineResult.NotFound(viewName, searchedLocations ?? Enumerable.Empty<string>());
+        }
+
+        /// <inheritdoc />
+        public ViewEngineResult GetView(string executingFilePath, string viewPath, bool isMainPage)
+        {
+            if (string.IsNullOrEmpty(viewPath))
+            {
+                throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(viewPath));
+            }
+
+            if (ViewEngines.Count == 0)
+            {
+                throw new InvalidOperationException(Resources.FormatViewEnginesAreRequired(
+                    typeof(MvcViewOptions).FullName,
+                    nameof(MvcViewOptions.ViewEngines),
+                    typeof(IViewEngine).FullName));
+            }
+
+            // Do not allocate in the common cases: ViewEngines contains one entry or initial attempt is successful.
+            IEnumerable<string> searchedLocations = null;
+            List<string> searchedList = null;
+            for (var i = 0; i < ViewEngines.Count; i++)
+            {
+                var result = ViewEngines[i].GetView(executingFilePath, viewPath, isMainPage);
+                if (result.Success)
+                {
+                    return result;
+                }
+
+                if (searchedLocations == null)
+                {
+                    // First failure.
+                    searchedLocations = result.SearchedLocations;
+                }
+                else
+                {
+                    if (searchedList == null)
+                    {
+                        // Second failure.
+                        searchedList = new List<string>(searchedLocations);
+                        searchedLocations = searchedList;
+                    }
+
+                    searchedList.AddRange(result.SearchedLocations);
+                }
+            }
+
+            return ViewEngineResult.NotFound(viewPath, searchedLocations ?? Enumerable.Empty<string>());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/ICompositeViewEngine.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/ICompositeViewEngine.cs
new file mode 100644
index 0000000000..053edca3dd
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/ICompositeViewEngine.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ViewEngines
+{
+    /// <summary>
+    /// Represents an <see cref="IViewEngine"/> that delegates to one of a collection of view engines.
+    /// </summary>
+    public interface ICompositeViewEngine : IViewEngine
+    {
+        /// <summary>
+        /// Gets the list of <see cref="IViewEngine"/> this instance of <see cref="ICompositeViewEngine"/> delegates
+        /// to.
+        /// </summary>
+        IReadOnlyList<IViewEngine> ViewEngines { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/IView.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/IView.cs
new file mode 100644
index 0000000000..165b577170
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/IView.cs
@@ -0,0 +1,26 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.ViewEngines
+{
+    /// <summary>
+    /// Specifies the contract for a view.
+    /// </summary>
+    public interface IView
+    {
+        /// <summary>
+        /// Gets the path of the view as resolved by the <see cref="IViewEngine"/>.
+        /// </summary>
+        string Path { get; }
+
+        /// <summary>
+        /// Asynchronously renders the view using the specified <paramref name="context"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ViewContext"/>.</param>
+        /// <returns>A <see cref="Task"/> that on completion renders the view.</returns>
+        Task RenderAsync(ViewContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/IViewEngine.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/IViewEngine.cs
new file mode 100644
index 0000000000..f6f5c93cc7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/IViewEngine.cs
@@ -0,0 +1,33 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewEngines
+{
+    /// <summary>
+    /// Defines the contract for a view engine.
+    /// </summary>
+    public interface IViewEngine
+    {
+        /// <summary>
+        /// Finds the view with the given <paramref name="viewName"/> using view locations and information from the
+        /// <paramref name="context"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="ActionContext"/>.</param>
+        /// <param name="viewName">The name or path of the view that is rendered to the response.</param>
+        /// <param name="isMainPage">Determines if the page being found is the main page for an action.</param>
+        /// <returns>The <see cref="ViewEngineResult"/> of locating the view.</returns>
+        /// <remarks>Use <see cref="GetView(string, string, bool)"/> when the absolute or relative
+        /// path of the view is known.</remarks>
+        ViewEngineResult FindView(ActionContext context, string viewName, bool isMainPage);
+
+        /// <summary>
+        /// Gets the view with the given <paramref name="viewPath"/>, relative to <paramref name="executingFilePath"/>
+        /// unless <paramref name="viewPath"/> is already absolute.
+        /// </summary>
+        /// <param name="executingFilePath">The absolute path to the currently-executing view, if any.</param>
+        /// <param name="viewPath">The path to the view.</param>
+        /// <param name="isMainPage">Determines if the page being found is the main page for an action.</param>
+        /// <returns>The <see cref="ViewEngineResult"/> of locating the view.</returns>
+        ViewEngineResult GetView(string executingFilePath, string viewPath, bool isMainPage);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/ViewEngineResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/ViewEngineResult.cs
new file mode 100644
index 0000000000..6fb58cc334
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/ViewEngineResult.cs
@@ -0,0 +1,97 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace Microsoft.AspNetCore.Mvc.ViewEngines
+{
+    public class ViewEngineResult
+    {
+        private ViewEngineResult()
+        {
+        }
+
+        public IEnumerable<string> SearchedLocations { get; private set; }
+
+        public IView View { get; private set; }
+
+        public string ViewName { get; private set; }
+
+        public bool Success => View != null;
+
+        public static ViewEngineResult NotFound(
+            string viewName,
+            IEnumerable<string> searchedLocations)
+        {
+            if (viewName == null)
+            {
+                throw new ArgumentNullException(nameof(viewName));
+            }
+
+            if (searchedLocations == null)
+            {
+                throw new ArgumentNullException(nameof(searchedLocations));
+            }
+
+            return new ViewEngineResult
+            {
+                SearchedLocations = searchedLocations,
+                ViewName = viewName,
+            };
+        }
+
+        public static ViewEngineResult Found(string viewName, IView view)
+        {
+            if (viewName == null)
+            {
+                throw new ArgumentNullException(nameof(viewName));
+            }
+
+            if (view == null)
+            {
+                throw new ArgumentNullException(nameof(view));
+            }
+
+            return new ViewEngineResult
+            {
+                View = view,
+                ViewName = viewName,
+            };
+        }
+
+        /// <summary>
+        /// Ensure this <see cref="ViewEngineResult"/> was successful.
+        /// </summary>
+        /// <param name="originalLocations">
+        /// Additional <see cref="SearchedLocations"/> to include in the thrown <see cref="InvalidOperationException"/>
+        /// if <see cref="Success"/> is <c>false</c>.
+        /// </param>
+        /// <exception cref="InvalidOperationException">
+        /// Thrown if <see cref="Success"/> is <c>false</c>.
+        /// </exception>
+        /// <returns>This <see cref="ViewEngineResult"/> if <see cref="Success"/> is <c>true</c>.</returns>
+        public ViewEngineResult EnsureSuccessful(IEnumerable<string> originalLocations)
+        {
+            if (!Success)
+            {
+                var locations = string.Empty;
+                if (originalLocations != null && originalLocations.Any())
+                {
+                    locations = Environment.NewLine + string.Join(Environment.NewLine, originalLocations);
+                }
+
+                if (SearchedLocations.Any())
+                {
+                    locations += Environment.NewLine + string.Join(Environment.NewLine, SearchedLocations);
+                }
+
+                throw new InvalidOperationException(Resources.FormatViewEngine_ViewNotFound(ViewName, locations));
+            }
+
+            return this;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/AntiforgeryExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/AntiforgeryExtensions.cs
new file mode 100644
index 0000000000..42470db504
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/AntiforgeryExtensions.cs
@@ -0,0 +1,68 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Antiforgery;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public static class AntiforgeryExtensions
+    {
+        /// <summary>
+        /// Generates an &lt;input type="hidden"&gt; element for an antiforgery token.
+        /// </summary>
+        /// <param name="antiforgery">The <see cref="IAntiforgery"/> instance.</param>
+        /// <param name="httpContext">The <see cref="HttpContext"/> associated with the current request.</param>
+        /// <returns>
+        /// A <see cref="IHtmlContent"/> containing an &lt;input type="hidden"&gt; element. This element should be put
+        /// inside a &lt;form&gt;.
+        /// </returns>
+        /// <remarks>
+        /// This method has a side effect:
+        /// A response cookie is set if there is no valid cookie associated with the request.
+        /// </remarks>
+        public static IHtmlContent GetHtml(this IAntiforgery antiforgery, HttpContext httpContext)
+        {
+            if (antiforgery == null)
+            {
+                throw new ArgumentNullException(nameof(antiforgery));
+            }
+
+            if (httpContext == null)
+            {
+                throw new ArgumentNullException(nameof(httpContext));
+            }
+
+            var tokenSet = antiforgery.GetAndStoreTokens(httpContext);
+            return new InputContent(tokenSet);
+        }
+
+        private class InputContent : IHtmlContent
+        {
+            private readonly string _fieldName;
+            private readonly string _requestToken;
+
+            public InputContent(AntiforgeryTokenSet tokenSet)
+            {
+                _fieldName = tokenSet.FormFieldName;
+                _requestToken = tokenSet.RequestToken;
+            }
+
+            // Though _requestToken normally contains only US-ASCII letters, numbers, '-', and '_', must assume the
+            // IAntiforgeryTokenSerializer implementation has been overridden. Similarly, users may choose a
+            // _fieldName containing almost any character.
+            public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+            {
+                writer.Write("<input name=\"");
+                encoder.Encode(writer, _fieldName);
+                writer.Write("\" type=\"hidden\" value=\"");
+                encoder.Encode(writer, _requestToken);
+                writer.Write("\" />");
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/AttributeDictionary.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/AttributeDictionary.cs
new file mode 100644
index 0000000000..0c55c80a4e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/AttributeDictionary.cs
@@ -0,0 +1,607 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// A dictionary for HTML attributes.
+    /// </summary>
+    public class AttributeDictionary : IDictionary<string, string>, IReadOnlyDictionary<string, string>
+    {
+        private List<KeyValuePair<string, string>> _items;
+
+        /// <inheritdoc />
+        public string this[string key]
+        {
+            get
+            {
+                if (key == null)
+                {
+                    throw new ArgumentNullException(nameof(key));
+                }
+
+                var index = Find(key);
+                if (index < 0)
+                {
+                    throw new KeyNotFoundException();
+                }
+                else
+                {
+                    return Get(index).Value;
+                }
+            }
+
+            set
+            {
+                if (key == null)
+                {
+                    throw new ArgumentNullException(nameof(key));
+                }
+
+                var item = new KeyValuePair<string, string>(key, value);
+                var index = Find(key);
+                if (index < 0)
+                {
+                    Insert(~index, item);
+                }
+                else
+                {
+                    Set(index, item);
+                }
+            }
+        }
+
+        /// <inheritdoc />
+        public int Count => _items == null ? 0 : _items.Count;
+
+        /// <inheritdoc />
+        public bool IsReadOnly => false;
+
+        /// <inheritdoc />
+        public ICollection<string> Keys => new KeyCollection(this);
+
+        /// <inheritdoc />
+        public ICollection<string> Values => new ValueCollection(this);
+
+        /// <inheritdoc />
+        IEnumerable<string> IReadOnlyDictionary<string, string>.Keys => new KeyCollection(this);
+
+        /// <inheritdoc />
+        IEnumerable<string> IReadOnlyDictionary<string, string>.Values => new ValueCollection(this);
+
+        private KeyValuePair<string, string> Get(int index)
+        {
+            Debug.Assert(index >= 0 && index < Count);
+            return _items[index];
+        }
+
+        private void Set(int index, KeyValuePair<string, string> value)
+        {
+            Debug.Assert(index >= 0 && index <= Count);
+            Debug.Assert(value.Key != null);
+
+            if (_items == null)
+            {
+                _items = new List<KeyValuePair<string, string>>();
+            }
+
+            _items[index] = value;
+        }
+
+        private void Insert(int index, KeyValuePair<string, string> value)
+        {
+            Debug.Assert(index >= 0 && index <= Count);
+            Debug.Assert(value.Key != null);
+
+            if (_items == null)
+            {
+                _items = new List<KeyValuePair<string, string>>();
+            }
+
+            _items.Insert(index, value);
+        }
+
+        private void Remove(int index)
+        {
+            Debug.Assert(index >= 0 && index < Count);
+
+            _items.RemoveAt(index);
+        }
+
+        // This API is a lot like List<T>.BinarySearch https://msdn.microsoft.com/en-us/library/3f90y839(v=vs.110).aspx
+        // If an item is not found, we return the compliment of where it belongs. Then we don't need to search again
+        // to do something with it.
+        private int Find(string key)
+        {
+            Debug.Assert(key != null);
+
+            if (Count == 0)
+            {
+                return ~0;
+            }
+
+            var start = 0;
+            var end = Count - 1;
+
+            while (start <= end)
+            {
+                var pivot = start + (end - start >> 1);
+
+                var compare = StringComparer.OrdinalIgnoreCase.Compare(Get(pivot).Key, key);
+                if (compare == 0)
+                {
+                    return pivot;
+                }
+                if (compare < 0)
+                {
+                    start = pivot + 1;
+                }
+                else
+                {
+                    end = pivot - 1;
+                }
+            }
+
+            return ~start;
+        }
+
+        /// <inheritdoc />
+        public void Clear()
+        {
+            if (_items != null)
+            {
+                _items.Clear();
+            }
+        }
+
+        /// <inheritdoc />
+        public void Add(KeyValuePair<string, string> item)
+        {
+            if (item.Key == null)
+            {
+                throw new ArgumentException(
+                    Resources.FormatPropertyOfTypeCannotBeNull(
+                        nameof(KeyValuePair<string, string>.Key),
+                        nameof(KeyValuePair<string, string>)),
+                    nameof(item));
+            }
+
+            var index = Find(item.Key);
+            if (index < 0)
+            {
+                Insert(~index, item);
+            }
+            else
+            {
+                throw new InvalidOperationException(Resources.FormatDictionary_DuplicateKey(item.Key));
+            }
+        }
+
+        /// <inheritdoc />
+        public void Add(string key, string value)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            Add(new KeyValuePair<string, string>(key, value));
+        }
+
+        /// <inheritdoc />
+        public bool Contains(KeyValuePair<string, string> item)
+        {
+            if (item.Key == null)
+            {
+                throw new ArgumentException(
+                    Resources.FormatPropertyOfTypeCannotBeNull(
+                        nameof(KeyValuePair<string, string>.Key),
+                        nameof(KeyValuePair<string, string>)),
+                    nameof(item));
+            }
+
+            var index = Find(item.Key);
+            if (index < 0)
+            {
+                return false;
+            }
+            else
+            {
+                return string.Equals(item.Value, Get(index).Value, StringComparison.OrdinalIgnoreCase);
+            }
+        }
+
+        /// <inheritdoc />
+        public bool ContainsKey(string key)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            if (Count == 0)
+            {
+                return false;
+            }
+
+            return Find(key) >= 0;
+        }
+
+        /// <inheritdoc />
+        public void CopyTo(KeyValuePair<string, string>[] array, int arrayIndex)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException(nameof(array));
+            }
+
+            if (arrayIndex < 0 || arrayIndex >= array.Length)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            for (var i = 0; i < Count; i++)
+            {
+                array[arrayIndex + i] = Get(i);
+            }
+        }
+
+        /// <inheritdoc />
+        public Enumerator GetEnumerator()
+        {
+            return new Enumerator(this);
+        }
+
+        /// <inheritdoc />
+        public bool Remove(KeyValuePair<string, string> item)
+        {
+            if (item.Key == null)
+            {
+                throw new ArgumentException(
+                    Resources.FormatPropertyOfTypeCannotBeNull(
+                        nameof(KeyValuePair<string, string>.Key),
+                        nameof(KeyValuePair<string, string>)),
+                    nameof(item));
+            }
+
+            var index = Find(item.Key);
+            if (index < 0)
+            {
+                return false;
+            }
+            else if (string.Equals(item.Value, Get(index).Value, StringComparison.OrdinalIgnoreCase))
+            {
+                Remove(index);
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        /// <inheritdoc />
+        public bool Remove(string key)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            var index = Find(key);
+            if (index < 0)
+            {
+                return false;
+            }
+            else
+            {
+                Remove(index);
+                return true;
+            }
+        }
+
+        /// <inheritdoc />
+        public bool TryGetValue(string key, out string value)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            var index = Find(key);
+            if (index < 0)
+            {
+                value = null;
+                return false;
+            }
+            else
+            {
+                value = Get(index).Value;
+                return true;
+            }
+        }
+
+        /// <inheritdoc />
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        /// <inheritdoc />
+        IEnumerator<KeyValuePair<string, string>> IEnumerable<KeyValuePair<string, string>>.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        /// <summary>
+        /// An enumerator for <see cref="AttributeDictionary"/>.
+        /// </summary>
+        public struct Enumerator : IEnumerator<KeyValuePair<string, string>>
+        {
+            private readonly AttributeDictionary _attributes;
+
+            private int _index;
+
+            /// <summary>
+            /// Creates a new <see cref="Enumerator"/>.
+            /// </summary>
+            /// <param name="attributes">The <see cref="AttributeDictionary"/>.</param>
+            public Enumerator(AttributeDictionary attributes)
+            {
+                _attributes = attributes;
+
+                _index = -1;
+            }
+
+            /// <inheritdoc />
+            public KeyValuePair<string, string> Current => _attributes.Get(_index);
+
+            /// <inheritdoc />
+            object IEnumerator.Current => Current;
+
+            /// <inheritdoc />
+            public void Dispose()
+            {
+            }
+
+            /// <inheritdoc />
+            public bool MoveNext()
+            {
+                _index++;
+                return _index < _attributes.Count;
+            }
+
+            /// <inheritdoc />
+            public void Reset()
+            {
+                _index = -1;
+            }
+        }
+
+        private class KeyCollection : ICollection<string>
+        {
+            private readonly AttributeDictionary _attributes;
+
+            public KeyCollection(AttributeDictionary attributes)
+            {
+                _attributes = attributes;
+            }
+
+            public int Count => _attributes.Count;
+
+            public bool IsReadOnly => true;
+
+            public void Add(string item)
+            {
+                throw new NotSupportedException();
+            }
+
+            public void Clear()
+            {
+                throw new NotSupportedException();
+            }
+
+            public bool Contains(string item)
+            {
+                if (item == null)
+                {
+                    throw new ArgumentNullException(nameof(item));
+                }
+
+                for (var i = 0; i < _attributes.Count; i++)
+                {
+                    if (string.Equals(item, _attributes.Get(i).Key, StringComparison.OrdinalIgnoreCase))
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+
+            public void CopyTo(string[] array, int arrayIndex)
+            {
+                if (array == null)
+                {
+                    throw new ArgumentNullException(nameof(array));
+                }
+
+                if (arrayIndex < 0 || arrayIndex >= array.Length)
+                {
+                    throw new IndexOutOfRangeException();
+                }
+
+                for (var i = 0; i < _attributes.Count; i++)
+                {
+                    array[arrayIndex + i] = _attributes.Get(i).Key;
+                }
+            }
+
+            public Enumerator GetEnumerator()
+            {
+                return new Enumerator(_attributes);
+            }
+
+            public bool Remove(string item)
+            {
+                throw new NotSupportedException();
+            }
+
+            IEnumerator<string> IEnumerable<string>.GetEnumerator()
+            {
+                return GetEnumerator();
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                return GetEnumerator();
+            }
+
+            public struct Enumerator : IEnumerator<string>
+            {
+                private readonly AttributeDictionary _attributes;
+
+                private int _index;
+
+                public Enumerator(AttributeDictionary attributes)
+                {
+                    _attributes = attributes;
+
+                    _index = -1;
+                }
+
+                public string Current => _attributes.Get(_index).Key;
+
+                object IEnumerator.Current => Current;
+
+                public void Dispose()
+                {
+                }
+
+                public bool MoveNext()
+                {
+                    _index++;
+                    return _index < _attributes.Count;
+                }
+
+                public void Reset()
+                {
+                    _index = -1;
+                }
+            }
+        }
+
+        private class ValueCollection : ICollection<string>
+        {
+            private readonly AttributeDictionary _attributes;
+
+            public ValueCollection(AttributeDictionary attributes)
+            {
+                _attributes = attributes;
+            }
+
+            public int Count => _attributes.Count;
+
+            public bool IsReadOnly => true;
+
+            public void Add(string item)
+            {
+                throw new NotSupportedException();
+            }
+
+            public void Clear()
+            {
+                throw new NotSupportedException();
+            }
+
+            public bool Contains(string item)
+            {
+                for (var i = 0; i < _attributes.Count; i++)
+                {
+                    if (string.Equals(item, _attributes.Get(i).Value, StringComparison.OrdinalIgnoreCase))
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+
+            public void CopyTo(string[] array, int arrayIndex)
+            {
+                if (array == null)
+                {
+                    throw new ArgumentNullException(nameof(array));
+                }
+
+                if (arrayIndex < 0 || arrayIndex >= array.Length)
+                {
+                    throw new IndexOutOfRangeException();
+                }
+
+                for (var i = 0; i < _attributes.Count; i++)
+                {
+                    array[arrayIndex + i] = _attributes.Get(i).Value;
+                }
+            }
+
+            public Enumerator GetEnumerator()
+            {
+                return new Enumerator(_attributes);
+            }
+
+            public bool Remove(string item)
+            {
+                throw new NotSupportedException();
+            }
+
+            IEnumerator<string> IEnumerable<string>.GetEnumerator()
+            {
+                return GetEnumerator();
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                return GetEnumerator();
+            }
+
+            public struct Enumerator : IEnumerator<string>
+            {
+                private readonly AttributeDictionary _attributes;
+
+                private int _index;
+
+                public Enumerator(AttributeDictionary attributes)
+                {
+                    _attributes = attributes;
+
+                    _index = -1;
+                }
+
+                public string Current => _attributes.Get(_index).Key;
+
+                object IEnumerator.Current => Current;
+
+                public void Dispose()
+                {
+                }
+
+                public bool MoveNext()
+                {
+                    _index++;
+                    return _index < _attributes.Count;
+                }
+
+                public void Reset()
+                {
+                    _index = -1;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/CookieTempDataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/CookieTempDataProvider.cs
new file mode 100644
index 0000000000..073c400f78
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/CookieTempDataProvider.cs
@@ -0,0 +1,127 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.AspNetCore.Internal;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Provides data from cookie to the current <see cref="ITempDataDictionary"/> object.
+    /// </summary>
+    public class CookieTempDataProvider : ITempDataProvider
+    {
+        public static readonly string CookieName = ".AspNetCore.Mvc.CookieTempDataProvider";
+        private static readonly string Purpose = "Microsoft.AspNetCore.Mvc.CookieTempDataProviderToken.v1";
+
+        private readonly IDataProtector _dataProtector;
+        private readonly ILogger _logger;
+        private readonly TempDataSerializer _tempDataSerializer;
+        private readonly ChunkingCookieManager _chunkingCookieManager;
+        private readonly CookieTempDataProviderOptions _options;
+
+        public CookieTempDataProvider(
+            IDataProtectionProvider dataProtectionProvider,
+            ILoggerFactory loggerFactory,
+            IOptions<CookieTempDataProviderOptions> options)
+        {
+            _dataProtector = dataProtectionProvider.CreateProtector(Purpose);
+            _logger = loggerFactory.CreateLogger<CookieTempDataProvider>();
+            _tempDataSerializer = new TempDataSerializer();
+            _chunkingCookieManager = new ChunkingCookieManager();
+            _options = options.Value;
+        }
+
+        public IDictionary<string, object> LoadTempData(HttpContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (context.Request.Cookies.ContainsKey(_options.Cookie.Name))
+            {
+                // The cookie we use for temp data is user input, and might be invalid in many ways.
+                //
+                // Since TempData is a best-effort system, we don't want to throw and get a 500 if the cookie is
+                // bad, we will just clear it and ignore the exception. The common case that we've identified for
+                // this is misconfigured data protection settings, which can cause the key used to create the 
+                // cookie to no longer be available.
+                try
+                {
+                    var encodedValue = _chunkingCookieManager.GetRequestCookie(context, _options.Cookie.Name);
+                    if (!string.IsNullOrEmpty(encodedValue))
+                    {
+                        var protectedData = WebEncoders.Base64UrlDecode(encodedValue);
+                        var unprotectedData = _dataProtector.Unprotect(protectedData);
+                        var tempData = _tempDataSerializer.Deserialize(unprotectedData);
+
+                        _logger.TempDataCookieLoadSuccess(_options.Cookie.Name);
+                        return tempData;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.TempDataCookieLoadFailure(_options.Cookie.Name, ex);
+
+                    // If we've failed, we want to try and clear the cookie so that this won't keep happening
+                    // over and over.
+                    if (!context.Response.HasStarted)
+                    {
+                        _chunkingCookieManager.DeleteCookie(context, _options.Cookie.Name, _options.Cookie.Build(context));
+                    }
+                }
+            }
+
+            _logger.TempDataCookieNotFound(_options.Cookie.Name);
+            return new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+        }
+
+        public void SaveTempData(HttpContext context, IDictionary<string, object> values)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var cookieOptions = _options.Cookie.Build(context);
+            SetCookiePath(context, cookieOptions);
+
+            var hasValues = (values != null && values.Count > 0);
+            if (hasValues)
+            {
+                var bytes = _tempDataSerializer.Serialize(values);
+                bytes = _dataProtector.Protect(bytes);
+                var encodedValue = WebEncoders.Base64UrlEncode(bytes);
+                _chunkingCookieManager.AppendResponseCookie(context, _options.Cookie.Name, encodedValue, cookieOptions);
+            }
+            else
+            {
+                _chunkingCookieManager.DeleteCookie(context, _options.Cookie.Name, cookieOptions);
+            }
+        }
+
+        private void SetCookiePath(HttpContext httpContext, CookieOptions cookieOptions)
+        {
+            if (!string.IsNullOrEmpty(_options.Cookie.Path))
+            {
+                cookieOptions.Path = _options.Cookie.Path;
+            }
+            else
+            {
+                var pathBase = httpContext.Request.PathBase.ToString();
+                if (!string.IsNullOrEmpty(pathBase))
+                {
+                    cookieOptions.Path = pathBase;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs
new file mode 100644
index 0000000000..e502341da4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs
@@ -0,0 +1,1645 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using System.Reflection;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Antiforgery;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Internal;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class DefaultHtmlGenerator : IHtmlGenerator
+    {
+        private const string HiddenListItem = @"<li style=""display:none""></li>";
+        private static readonly MethodInfo ConvertEnumFromStringMethod =
+            typeof(DefaultHtmlGenerator).GetTypeInfo().GetDeclaredMethod(nameof(ConvertEnumFromString));
+
+        // See: (http://www.w3.org/TR/html5/forms.html#the-input-element)
+        private static readonly string[] _placeholderInputTypes =
+            new[] { "text", "search", "url", "tel", "email", "password", "number" };
+
+        private readonly IAntiforgery _antiforgery;
+        private readonly IModelMetadataProvider _metadataProvider;
+        private readonly IUrlHelperFactory _urlHelperFactory;
+        private readonly HtmlEncoder _htmlEncoder;
+        private readonly ValidationHtmlAttributeProvider _validationAttributeProvider;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DefaultHtmlGenerator"/> class.
+        /// </summary>
+        /// <param name="antiforgery">The <see cref="IAntiforgery"/> instance which is used to generate antiforgery
+        /// tokens.</param>
+        /// <param name="optionsAccessor">The accessor for <see cref="MvcViewOptions"/>.</param>
+        /// <param name="metadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
+        /// <param name="urlHelperFactory">The <see cref="IUrlHelperFactory"/>.</param>
+        /// <param name="htmlEncoder">The <see cref="HtmlEncoder"/>.</param>
+        /// <param name="validationAttributeProvider">The <see cref="ValidationHtmlAttributeProvider"/>.</param>
+        public DefaultHtmlGenerator(
+            IAntiforgery antiforgery,
+            IOptions<MvcViewOptions> optionsAccessor,
+            IModelMetadataProvider metadataProvider,
+            IUrlHelperFactory urlHelperFactory,
+            HtmlEncoder htmlEncoder,
+            ValidationHtmlAttributeProvider validationAttributeProvider)
+        {
+            if (antiforgery == null)
+            {
+                throw new ArgumentNullException(nameof(antiforgery));
+            }
+
+            if (optionsAccessor == null)
+            {
+                throw new ArgumentNullException(nameof(optionsAccessor));
+            }
+
+            if (metadataProvider == null)
+            {
+                throw new ArgumentNullException(nameof(metadataProvider));
+            }
+
+            if (urlHelperFactory == null)
+            {
+                throw new ArgumentNullException(nameof(urlHelperFactory));
+            }
+
+            if (htmlEncoder == null)
+            {
+                throw new ArgumentNullException(nameof(htmlEncoder));
+            }
+
+            if (validationAttributeProvider == null)
+            {
+                throw new ArgumentNullException(nameof(validationAttributeProvider));
+            }
+
+            _antiforgery = antiforgery;
+            _metadataProvider = metadataProvider;
+            _urlHelperFactory = urlHelperFactory;
+            _htmlEncoder = htmlEncoder;
+            _validationAttributeProvider = validationAttributeProvider;
+
+            // Underscores are fine characters in id's.
+            IdAttributeDotReplacement = optionsAccessor.Value.HtmlHelperOptions.IdAttributeDotReplacement;
+        }
+
+        /// <inheritdoc />
+        public string IdAttributeDotReplacement { get; }
+
+        /// <inheritdoc />
+        public string Encode(string value)
+        {
+            return !string.IsNullOrEmpty(value) ? _htmlEncoder.Encode(value) : string.Empty;
+        }
+
+        /// <inheritdoc />
+        public string Encode(object value)
+        {
+            return (value != null) ? _htmlEncoder.Encode(value.ToString()) : string.Empty;
+        }
+
+        /// <inheritdoc />
+        public string FormatValue(object value, string format)
+        {
+            return ViewDataDictionary.FormatValue(value, format);
+        }
+
+        /// <inheritdoc />
+        public virtual TagBuilder GenerateActionLink(
+            ViewContext viewContext,
+            string linkText,
+            string actionName,
+            string controllerName,
+            string protocol,
+            string hostname,
+            string fragment,
+            object routeValues,
+            object htmlAttributes)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            if (linkText == null)
+            {
+                throw new ArgumentNullException(nameof(linkText));
+            }
+
+            var urlHelper = _urlHelperFactory.GetUrlHelper(viewContext);
+            var url = urlHelper.Action(actionName, controllerName, routeValues, protocol, hostname, fragment);
+            return GenerateLink(linkText, url, htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public virtual TagBuilder GeneratePageLink(
+            ViewContext viewContext,
+            string linkText,
+            string pageName,
+            string pageHandler,
+            string protocol,
+            string hostname,
+            string fragment,
+            object routeValues,
+            object htmlAttributes)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            if (linkText == null)
+            {
+                throw new ArgumentNullException(nameof(linkText));
+            }
+
+            var urlHelper = _urlHelperFactory.GetUrlHelper(viewContext);
+            var url = urlHelper.Page(pageName, pageHandler, routeValues, protocol, hostname, fragment);
+            return GenerateLink(linkText, url, htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public virtual IHtmlContent GenerateAntiforgery(ViewContext viewContext)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            var formContext = viewContext.FormContext;
+            if (formContext.CanRenderAtEndOfForm)
+            {
+                // Inside a BeginForm/BeginRouteForm or a <form> tag helper. So, the antiforgery token might have
+                // already been created and appended to the 'end form' content (the AntiForgeryToken HTML helper does
+                // this) OR the <form> tag helper might have already generated an antiforgery token.
+                if (formContext.HasAntiforgeryToken)
+                {
+                    return HtmlString.Empty;
+                }
+
+                formContext.HasAntiforgeryToken = true;
+            }
+
+            return _antiforgery.GetHtml(viewContext.HttpContext);
+        }
+
+        /// <inheritdoc />
+        public virtual TagBuilder GenerateCheckBox(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string expression,
+            bool? isChecked,
+            object htmlAttributes)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            if (modelExplorer != null)
+            {
+                // CheckBoxFor() case. That API does not support passing isChecked directly.
+                Debug.Assert(!isChecked.HasValue);
+
+                if (modelExplorer.Model != null)
+                {
+                    if (bool.TryParse(modelExplorer.Model.ToString(), out var modelChecked))
+                    {
+                        isChecked = modelChecked;
+                    }
+                }
+            }
+
+            var htmlAttributeDictionary = GetHtmlAttributeDictionaryOrNull(htmlAttributes);
+            if (isChecked.HasValue && htmlAttributeDictionary != null)
+            {
+                // Explicit isChecked value must override "checked" in dictionary.
+                htmlAttributeDictionary.Remove("checked");
+            }
+
+            // Use ViewData only in CheckBox case (metadata null) and when the user didn't pass an isChecked value.
+            return GenerateInput(
+                viewContext,
+                InputType.CheckBox,
+                modelExplorer,
+                expression,
+                value: "true",
+                useViewData: (modelExplorer == null && !isChecked.HasValue),
+                isChecked: isChecked ?? false,
+                setId: true,
+                isExplicitValue: false,
+                format: null,
+                htmlAttributes: htmlAttributeDictionary);
+        }
+
+        /// <inheritdoc />
+        public virtual TagBuilder GenerateHiddenForCheckbox(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string expression)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            var tagBuilder = new TagBuilder("input");
+            tagBuilder.MergeAttribute("type", GetInputTypeString(InputType.Hidden));
+            tagBuilder.MergeAttribute("value", "false");
+            tagBuilder.TagRenderMode = TagRenderMode.SelfClosing;
+
+            var fullName = NameAndIdProvider.GetFullHtmlFieldName(viewContext, expression);
+            if (!string.IsNullOrEmpty(fullName))
+            {
+                tagBuilder.MergeAttribute("name", fullName);
+            }
+
+            return tagBuilder;
+        }
+
+        /// <inheritdoc />
+        public virtual TagBuilder GenerateForm(
+            ViewContext viewContext,
+            string actionName,
+            string controllerName,
+            object routeValues,
+            string method,
+            object htmlAttributes)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            var defaultMethod = false;
+            if (string.IsNullOrEmpty(method))
+            {
+                defaultMethod = true;
+            }
+            else if (string.Equals(method, "post", StringComparison.OrdinalIgnoreCase))
+            {
+                defaultMethod = true;
+            }
+
+            string action;
+            if (actionName == null && controllerName == null && routeValues == null && defaultMethod)
+            {
+                // Submit to the original URL in the special case that user called the BeginForm() overload without
+                // parameters (except for the htmlAttributes parameter). Also reachable in the even-more-unusual case
+                // that user called another BeginForm() overload with default argument values.
+                var request = viewContext.HttpContext.Request;
+                action = request.PathBase + request.Path + request.QueryString;
+            }
+            else
+            {
+                var urlHelper = _urlHelperFactory.GetUrlHelper(viewContext);
+                action = urlHelper.Action(action: actionName, controller: controllerName, values: routeValues);
+            }
+
+            return GenerateFormCore(viewContext, action, method, htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public virtual TagBuilder GeneratePageForm(
+            ViewContext viewContext,
+            string pageName,
+            string pageHandler,
+            object routeValues,
+            string fragment,
+            string method,
+            object htmlAttributes)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            var urlHelper = _urlHelperFactory.GetUrlHelper(viewContext);
+            var action = urlHelper.Page(pageName, pageHandler, routeValues, protocol: null, host: null, fragment: fragment);
+
+            return GenerateFormCore(viewContext, action, method, htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public TagBuilder GenerateRouteForm(
+            ViewContext viewContext,
+            string routeName,
+            object routeValues,
+            string method,
+            object htmlAttributes)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            var urlHelper = _urlHelperFactory.GetUrlHelper(viewContext);
+            var action = urlHelper.RouteUrl(routeName, routeValues);
+
+            return GenerateFormCore(viewContext, action, method, htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public virtual TagBuilder GenerateHidden(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string expression,
+            object value,
+            bool useViewData,
+            object htmlAttributes)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            // Special-case opaque values and arbitrary binary data.
+            if (value is byte[] byteArrayValue)
+            {
+                value = Convert.ToBase64String(byteArrayValue);
+            }
+
+            var htmlAttributeDictionary = GetHtmlAttributeDictionaryOrNull(htmlAttributes);
+            return GenerateInput(
+                viewContext,
+                InputType.Hidden,
+                modelExplorer,
+                expression,
+                value,
+                useViewData,
+                isChecked: false,
+                setId: true,
+                isExplicitValue: true,
+                format: null,
+                htmlAttributes: htmlAttributeDictionary);
+        }
+
+        /// <inheritdoc />
+        public virtual TagBuilder GenerateLabel(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string expression,
+            string labelText,
+            object htmlAttributes)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            if (modelExplorer == null)
+            {
+                throw new ArgumentNullException(nameof(modelExplorer));
+            }
+
+            var resolvedLabelText = labelText ??
+                modelExplorer.Metadata.DisplayName ??
+                modelExplorer.Metadata.PropertyName;
+            if (resolvedLabelText == null && expression != null)
+            {
+                var index = expression.LastIndexOf('.');
+                if (index == -1)
+                {
+                    // Expression does not contain a dot separator.
+                    resolvedLabelText = expression;
+                }
+                else
+                {
+                    resolvedLabelText = expression.Substring(index + 1);
+                }
+            }
+
+            var tagBuilder = new TagBuilder("label");
+            var fullName = NameAndIdProvider.GetFullHtmlFieldName(viewContext, expression);
+            var idString = NameAndIdProvider.CreateSanitizedId(viewContext, fullName, IdAttributeDotReplacement);
+            tagBuilder.Attributes.Add("for", idString);
+            tagBuilder.InnerHtml.SetContent(resolvedLabelText);
+            tagBuilder.MergeAttributes(GetHtmlAttributeDictionaryOrNull(htmlAttributes), replaceExisting: true);
+
+            return tagBuilder;
+        }
+
+        /// <inheritdoc />
+        public virtual TagBuilder GeneratePassword(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string expression,
+            object value,
+            object htmlAttributes)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            var htmlAttributeDictionary = GetHtmlAttributeDictionaryOrNull(htmlAttributes);
+            return GenerateInput(
+                viewContext,
+                InputType.Password,
+                modelExplorer,
+                expression,
+                value,
+                useViewData: false,
+                isChecked: false,
+                setId: true,
+                isExplicitValue: true,
+                format: null,
+                htmlAttributes: htmlAttributeDictionary);
+        }
+
+        /// <inheritdoc />
+        public virtual TagBuilder GenerateRadioButton(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string expression,
+            object value,
+            bool? isChecked,
+            object htmlAttributes)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            var htmlAttributeDictionary = GetHtmlAttributeDictionaryOrNull(htmlAttributes);
+            if (modelExplorer == null)
+            {
+                // RadioButton() case. Do not override checked attribute if isChecked is implicit.
+                if (!isChecked.HasValue &&
+                    (htmlAttributeDictionary == null || !htmlAttributeDictionary.ContainsKey("checked")))
+                {
+                    // Note value may be null if isChecked is non-null.
+                    if (value == null)
+                    {
+                        throw new ArgumentNullException(nameof(value));
+                    }
+
+                    // isChecked not provided nor found in the given attributes; fall back to view data.
+                    var valueString = Convert.ToString(value, CultureInfo.CurrentCulture);
+                    isChecked = string.Equals(
+                        EvalString(viewContext, expression),
+                        valueString,
+                        StringComparison.OrdinalIgnoreCase);
+                }
+            }
+            else
+            {
+                // RadioButtonFor() case. That API does not support passing isChecked directly.
+                Debug.Assert(!isChecked.HasValue);
+
+                // Need a value to determine isChecked.
+                Debug.Assert(value != null);
+
+                var model = modelExplorer.Model;
+                var valueString = Convert.ToString(value, CultureInfo.CurrentCulture);
+                isChecked = model != null &&
+                    string.Equals(model.ToString(), valueString, StringComparison.OrdinalIgnoreCase);
+            }
+
+            if (isChecked.HasValue && htmlAttributeDictionary != null)
+            {
+                // Explicit isChecked value must override "checked" in dictionary.
+                htmlAttributeDictionary.Remove("checked");
+            }
+
+            return GenerateInput(
+                viewContext,
+                InputType.Radio,
+                modelExplorer,
+                expression,
+                value,
+                useViewData: false,
+                isChecked: isChecked ?? false,
+                setId: true,
+                isExplicitValue: true,
+                format: null,
+                htmlAttributes: htmlAttributeDictionary);
+        }
+
+        /// <inheritdoc />
+        public virtual TagBuilder GenerateRouteLink(
+            ViewContext viewContext,
+            string linkText,
+            string routeName,
+            string protocol,
+            string hostName,
+            string fragment,
+            object routeValues,
+            object htmlAttributes)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            if (linkText == null)
+            {
+                throw new ArgumentNullException(nameof(linkText));
+            }
+
+            var urlHelper = _urlHelperFactory.GetUrlHelper(viewContext);
+            var url = urlHelper.RouteUrl(routeName, routeValues, protocol, hostName, fragment);
+            return GenerateLink(linkText, url, htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public TagBuilder GenerateSelect(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string optionLabel,
+            string expression,
+            IEnumerable<SelectListItem> selectList,
+            bool allowMultiple,
+            object htmlAttributes)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            var currentValues = GetCurrentValues(viewContext, modelExplorer, expression, allowMultiple);
+            return GenerateSelect(
+                viewContext,
+                modelExplorer,
+                optionLabel,
+                expression,
+                selectList,
+                currentValues,
+                allowMultiple,
+                htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public virtual TagBuilder GenerateSelect(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string optionLabel,
+            string expression,
+            IEnumerable<SelectListItem> selectList,
+            ICollection<string> currentValues,
+            bool allowMultiple,
+            object htmlAttributes)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            var fullName = NameAndIdProvider.GetFullHtmlFieldName(viewContext, expression);
+            var htmlAttributeDictionary = GetHtmlAttributeDictionaryOrNull(htmlAttributes);
+            if (!IsFullNameValid(fullName, htmlAttributeDictionary))
+            {
+                throw new ArgumentException(
+                    Resources.FormatHtmlGenerator_FieldNameCannotBeNullOrEmpty(
+                        typeof(IHtmlHelper).FullName,
+                        nameof(IHtmlHelper.Editor),
+                        typeof(IHtmlHelper<>).FullName,
+                        nameof(IHtmlHelper<object>.EditorFor),
+                        "htmlFieldName"),
+                    nameof(expression));
+            }
+
+            // If we got a null selectList, try to use ViewData to get the list of items.
+            if (selectList == null)
+            {
+                selectList = GetSelectListItems(viewContext, expression);
+            }
+
+            modelExplorer = modelExplorer ??
+                ExpressionMetadataProvider.FromStringExpression(expression, viewContext.ViewData, _metadataProvider);
+
+            // Convert each ListItem to an <option> tag and wrap them with <optgroup> if requested.
+            var listItemBuilder = GenerateGroupsAndOptions(optionLabel, selectList, currentValues);
+
+            var tagBuilder = new TagBuilder("select");
+            tagBuilder.InnerHtml.SetHtmlContent(listItemBuilder);
+            tagBuilder.MergeAttributes(htmlAttributeDictionary);
+            NameAndIdProvider.GenerateId(viewContext, tagBuilder, fullName, IdAttributeDotReplacement);
+            if (!string.IsNullOrEmpty(fullName))
+            {
+                tagBuilder.MergeAttribute("name", fullName, replaceExisting: true);
+            }
+
+            if (allowMultiple)
+            {
+                tagBuilder.MergeAttribute("multiple", "multiple");
+            }
+
+            // If there are any errors for a named field, we add the css attribute.
+            if (viewContext.ViewData.ModelState.TryGetValue(fullName, out var entry))
+            {
+                if (entry.Errors.Count > 0)
+                {
+                    tagBuilder.AddCssClass(HtmlHelper.ValidationInputCssClassName);
+                }
+            }
+
+            AddValidationAttributes(viewContext, tagBuilder, modelExplorer, expression);
+
+            return tagBuilder;
+        }
+
+        /// <inheritdoc />
+        public virtual TagBuilder GenerateTextArea(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string expression,
+            int rows,
+            int columns,
+            object htmlAttributes)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            if (rows < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(rows), Resources.HtmlHelper_TextAreaParameterOutOfRange);
+            }
+
+            if (columns < 0)
+            {
+                throw new ArgumentOutOfRangeException(
+                    nameof(columns),
+                    Resources.HtmlHelper_TextAreaParameterOutOfRange);
+            }
+
+            var fullName = NameAndIdProvider.GetFullHtmlFieldName(viewContext, expression);
+            var htmlAttributeDictionary = GetHtmlAttributeDictionaryOrNull(htmlAttributes);
+            if (!IsFullNameValid(fullName, htmlAttributeDictionary))
+            {
+                throw new ArgumentException(
+                    Resources.FormatHtmlGenerator_FieldNameCannotBeNullOrEmpty(
+                        typeof(IHtmlHelper).FullName,
+                        nameof(IHtmlHelper.Editor),
+                        typeof(IHtmlHelper<>).FullName,
+                        nameof(IHtmlHelper<object>.EditorFor),
+                        "htmlFieldName"),
+                    nameof(expression));
+            }
+
+            viewContext.ViewData.ModelState.TryGetValue(fullName, out var entry);
+
+            var value = string.Empty;
+            if (entry != null && entry.AttemptedValue != null)
+            {
+                value = entry.AttemptedValue;
+            }
+            else if (modelExplorer.Model != null)
+            {
+                value = modelExplorer.Model.ToString();
+            }
+
+            var tagBuilder = new TagBuilder("textarea");
+            NameAndIdProvider.GenerateId(viewContext, tagBuilder, fullName, IdAttributeDotReplacement);
+            tagBuilder.MergeAttributes(htmlAttributeDictionary, replaceExisting: true);
+            if (rows > 0)
+            {
+                tagBuilder.MergeAttribute("rows", rows.ToString(CultureInfo.InvariantCulture), replaceExisting: true);
+            }
+
+            if (columns > 0)
+            {
+                tagBuilder.MergeAttribute(
+                    "cols",
+                    columns.ToString(CultureInfo.InvariantCulture),
+                    replaceExisting: true);
+            }
+
+            if (!string.IsNullOrEmpty(fullName))
+            {
+                tagBuilder.MergeAttribute("name", fullName, replaceExisting: true);
+            }
+
+            AddPlaceholderAttribute(viewContext.ViewData, tagBuilder, modelExplorer, expression);
+            AddValidationAttributes(viewContext, tagBuilder, modelExplorer, expression);
+
+            // If there are any errors for a named field, we add this CSS attribute.
+            if (entry != null && entry.Errors.Count > 0)
+            {
+                tagBuilder.AddCssClass(HtmlHelper.ValidationInputCssClassName);
+            }
+
+            // The first newline is always trimmed when a TextArea is rendered, so we add an extra one
+            // in case the value being rendered is something like "\r\nHello"
+            tagBuilder.InnerHtml.AppendLine();
+            tagBuilder.InnerHtml.Append(value);
+
+            return tagBuilder;
+        }
+
+        /// <inheritdoc />
+        public virtual TagBuilder GenerateTextBox(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string expression,
+            object value,
+            string format,
+            object htmlAttributes)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            var htmlAttributeDictionary = GetHtmlAttributeDictionaryOrNull(htmlAttributes);
+            return GenerateInput(
+                viewContext,
+                InputType.Text,
+                modelExplorer,
+                expression,
+                value,
+                useViewData: (modelExplorer == null && value == null),
+                isChecked: false,
+                setId: true,
+                isExplicitValue: true,
+                format: format,
+                htmlAttributes: htmlAttributeDictionary);
+        }
+
+        /// <inheritdoc />
+        public virtual TagBuilder GenerateValidationMessage(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string expression,
+            string message,
+            string tag,
+            object htmlAttributes)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            var fullName = NameAndIdProvider.GetFullHtmlFieldName(viewContext, expression);
+            var htmlAttributeDictionary = GetHtmlAttributeDictionaryOrNull(htmlAttributes);
+            if (!IsFullNameValid(fullName, htmlAttributeDictionary, fallbackAttributeName: "data-valmsg-for"))
+            {
+                throw new ArgumentException(
+                    Resources.FormatHtmlGenerator_FieldNameCannotBeNullOrEmpty(
+                        typeof(IHtmlHelper).FullName,
+                        nameof(IHtmlHelper.Editor),
+                        typeof(IHtmlHelper<>).FullName,
+                        nameof(IHtmlHelper<object>.EditorFor),
+                        "htmlFieldName"),
+                    nameof(expression));
+            }
+
+            var formContext = viewContext.ClientValidationEnabled ? viewContext.FormContext : null;
+            if (!viewContext.ViewData.ModelState.ContainsKey(fullName) && formContext == null)
+            {
+                return null;
+            }
+
+            var tryGetModelStateResult = viewContext.ViewData.ModelState.TryGetValue(fullName, out var entry);
+            var modelErrors = tryGetModelStateResult ? entry.Errors : null;
+
+            ModelError modelError = null;
+            if (modelErrors != null && modelErrors.Count != 0)
+            {
+                modelError = modelErrors.FirstOrDefault(m => !string.IsNullOrEmpty(m.ErrorMessage)) ?? modelErrors[0];
+            }
+
+            if (modelError == null && formContext == null)
+            {
+                return null;
+            }
+
+            // Even if there are no model errors, we generate the span and add the validation message
+            // if formContext is not null.
+            if (string.IsNullOrEmpty(tag))
+            {
+                tag = viewContext.ValidationMessageElement;
+            }
+
+            var tagBuilder = new TagBuilder(tag);
+            tagBuilder.MergeAttributes(htmlAttributeDictionary);
+
+            // Only the style of the span is changed according to the errors if message is null or empty.
+            // Otherwise the content and style is handled by the client-side validation.
+            var className = (modelError != null) ?
+                HtmlHelper.ValidationMessageCssClassName :
+                HtmlHelper.ValidationMessageValidCssClassName;
+            tagBuilder.AddCssClass(className);
+
+            if (!string.IsNullOrEmpty(message))
+            {
+                tagBuilder.InnerHtml.SetContent(message);
+            }
+            else if (modelError != null)
+            {
+                modelExplorer = modelExplorer ?? ExpressionMetadataProvider.FromStringExpression(
+                    expression,
+                    viewContext.ViewData,
+                    _metadataProvider);
+                tagBuilder.InnerHtml.SetContent(
+                    ValidationHelpers.GetModelErrorMessageOrDefault(modelError, entry, modelExplorer));
+            }
+
+            if (formContext != null)
+            {
+                if (!string.IsNullOrEmpty(fullName))
+                {
+                    tagBuilder.MergeAttribute("data-valmsg-for", fullName);
+                }
+
+                var replaceValidationMessageContents = string.IsNullOrEmpty(message);
+                tagBuilder.MergeAttribute("data-valmsg-replace",
+                    replaceValidationMessageContents.ToString().ToLowerInvariant());
+            }
+
+            return tagBuilder;
+        }
+
+        /// <inheritdoc />
+        public virtual TagBuilder GenerateValidationSummary(
+            ViewContext viewContext,
+            bool excludePropertyErrors,
+            string message,
+            string headerTag,
+            object htmlAttributes)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            var viewData = viewContext.ViewData;
+            if (!viewContext.ClientValidationEnabled && viewData.ModelState.IsValid)
+            {
+                // Client-side validation is not enabled to add to the generated element and element will be empty.
+                return null;
+            }
+
+            if (excludePropertyErrors &&
+                (!viewData.ModelState.TryGetValue(viewData.TemplateInfo.HtmlFieldPrefix, out var entryForModel) ||
+                 entryForModel.Errors.Count == 0))
+            {
+                // Client-side validation (if enabled) will not affect the generated element and element will be empty.
+                return null;
+            }
+
+            TagBuilder messageTag;
+            if (string.IsNullOrEmpty(message))
+            {
+                messageTag = null;
+            }
+            else
+            {
+                if (string.IsNullOrEmpty(headerTag))
+                {
+                    headerTag = viewContext.ValidationSummaryMessageElement;
+                }
+
+                messageTag = new TagBuilder(headerTag);
+                messageTag.InnerHtml.SetContent(message);
+            }
+
+            // If excludePropertyErrors is true, describe any validation issue with the current model in a single item.
+            // Otherwise, list individual property errors.
+            var isHtmlSummaryModified = false;
+            var modelStates = ValidationHelpers.GetModelStateList(viewData, excludePropertyErrors);
+
+            var htmlSummary = new TagBuilder("ul");
+            foreach (var modelState in modelStates)
+            {
+                // Perf: Avoid allocations
+                for (var i = 0; i < modelState.Errors.Count; i++)
+                {
+                    var modelError = modelState.Errors[i];
+                    var errorText = ValidationHelpers.GetModelErrorMessageOrDefault(modelError);
+
+                    if (!string.IsNullOrEmpty(errorText))
+                    {
+                        var listItem = new TagBuilder("li");
+                        listItem.InnerHtml.SetContent(errorText);
+                        htmlSummary.InnerHtml.AppendLine(listItem);
+                        isHtmlSummaryModified = true;
+                    }
+                }
+            }
+
+            if (!isHtmlSummaryModified)
+            {
+                htmlSummary.InnerHtml.AppendHtml(HiddenListItem);
+                htmlSummary.InnerHtml.AppendLine();
+            }
+
+            var tagBuilder = new TagBuilder("div");
+            tagBuilder.MergeAttributes(GetHtmlAttributeDictionaryOrNull(htmlAttributes));
+
+            if (viewData.ModelState.IsValid)
+            {
+                tagBuilder.AddCssClass(HtmlHelper.ValidationSummaryValidCssClassName);
+            }
+            else
+            {
+                tagBuilder.AddCssClass(HtmlHelper.ValidationSummaryCssClassName);
+            }
+
+            if (messageTag != null)
+            {
+                tagBuilder.InnerHtml.AppendLine(messageTag);
+            }
+
+            tagBuilder.InnerHtml.AppendHtml(htmlSummary);
+
+            if (viewContext.ClientValidationEnabled && !excludePropertyErrors)
+            {
+                // Inform the client where to replace the list of property errors after validation.
+                tagBuilder.MergeAttribute("data-valmsg-summary", "true");
+            }
+
+            return tagBuilder;
+        }
+
+        /// <inheritdoc />
+        public virtual ICollection<string> GetCurrentValues(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string expression,
+            bool allowMultiple)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            var fullName = NameAndIdProvider.GetFullHtmlFieldName(viewContext, expression);
+            var type = allowMultiple ? typeof(string[]) : typeof(string);
+            var rawValue = GetModelStateValue(viewContext, fullName, type);
+
+            // If ModelState did not contain a current value, fall back to ViewData- or ModelExplorer-supplied value.
+            if (rawValue == null)
+            {
+                if (modelExplorer == null)
+                {
+                    // Html.DropDownList() and Html.ListBox() helper case.
+                    rawValue = viewContext.ViewData.Eval(expression);
+                    if (rawValue is IEnumerable<SelectListItem>)
+                    {
+                        // This ViewData item contains the fallback selectList collection for GenerateSelect().
+                        // Do not try to use this collection.
+                        rawValue = null;
+                    }
+                }
+                else
+                {
+                    // <select/>, Html.DropDownListFor() and Html.ListBoxFor() helper case. Do not use ViewData.
+                    rawValue = modelExplorer.Model;
+                }
+
+                if (rawValue == null)
+                {
+                    return null;
+                }
+            }
+
+            // Convert raw value to a collection.
+            IEnumerable rawValues;
+            if (allowMultiple)
+            {
+                rawValues = rawValue as IEnumerable;
+                if (rawValues == null || rawValues is string)
+                {
+                    throw new InvalidOperationException(
+                        Resources.FormatHtmlHelper_SelectExpressionNotEnumerable(nameof(expression)));
+                }
+            }
+            else
+            {
+                rawValues = new[] { rawValue };
+            }
+
+            modelExplorer = modelExplorer ??
+                ExpressionMetadataProvider.FromStringExpression(expression, viewContext.ViewData, _metadataProvider);
+            var metadata = modelExplorer.Metadata;
+            if (allowMultiple && metadata.IsEnumerableType)
+            {
+                metadata = metadata.ElementMetadata;
+            }
+
+            var enumNames = metadata.EnumNamesAndValues;
+            var isTargetEnum = metadata.IsEnum;
+
+            // Logic below assumes isTargetEnum and enumNames are consistent. Confirm that expectation is met.
+            Debug.Assert(isTargetEnum ^ enumNames == null);
+
+            var innerType = metadata.UnderlyingOrModelType;
+
+            // Convert raw value collection to strings.
+            var currentValues = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            foreach (var value in rawValues)
+            {
+                // Add original or converted string.
+                var stringValue = (value as string) ?? Convert.ToString(value, CultureInfo.CurrentCulture);
+
+                // Do not add simple names of enum properties here because whitespace isn't relevant for their binding.
+                // Will add matching names just below.
+                if (enumNames == null || !enumNames.ContainsKey(stringValue.Trim()))
+                {
+                    currentValues.Add(stringValue);
+                }
+
+                // Remainder handles isEnum cases. Convert.ToString() returns field names for enum values but select
+                // list may (well, should) contain integer values.
+                var enumValue = value as Enum;
+                if (isTargetEnum && enumValue == null && value != null)
+                {
+                    var valueType = value.GetType();
+                    if (typeof(long).IsAssignableFrom(valueType) || typeof(ulong).IsAssignableFrom(valueType))
+                    {
+                        // E.g. user added an int to a ViewData entry and called a string-based HTML helper.
+                        enumValue = ConvertEnumFromInteger(value, innerType);
+                    }
+                    else if (!string.IsNullOrEmpty(stringValue))
+                    {
+                        // E.g. got a string from ModelState.
+                        var methodInfo = ConvertEnumFromStringMethod.MakeGenericMethod(innerType);
+                        enumValue = (Enum)methodInfo.Invoke(obj: null, parameters: new[] { stringValue });
+                    }
+                }
+
+                if (enumValue != null)
+                {
+                    // Add integer value.
+                    var integerString = enumValue.ToString("d");
+                    currentValues.Add(integerString);
+
+                    // isTargetEnum may be false when raw value has a different type than the target e.g. ViewData
+                    // contains enum values and property has type int or string.
+                    if (isTargetEnum)
+                    {
+                        // Add all simple names for this value.
+                        var matchingNames = enumNames
+                            .Where(kvp => string.Equals(integerString, kvp.Value, StringComparison.Ordinal))
+                            .Select(kvp => kvp.Key);
+                        foreach (var name in matchingNames)
+                        {
+                            currentValues.Add(name);
+                        }
+                    }
+                }
+            }
+
+            return currentValues;
+        }
+
+        internal static string EvalString(ViewContext viewContext, string key, string format)
+        {
+            return Convert.ToString(viewContext.ViewData.Eval(key, format), CultureInfo.CurrentCulture);
+        }
+
+        /// <remarks>
+        /// Not used directly in HtmlHelper. Exposed for use in DefaultDisplayTemplates.
+        /// </remarks>
+        internal static TagBuilder GenerateOption(SelectListItem item, string text)
+        {
+            return GenerateOption(item, text, item.Selected);
+        }
+
+        internal static TagBuilder GenerateOption(SelectListItem item, string text, bool selected)
+        {
+            var tagBuilder = new TagBuilder("option");
+            tagBuilder.InnerHtml.SetContent(text);
+
+            if (item.Value != null)
+            {
+                tagBuilder.Attributes["value"] = item.Value;
+            }
+
+            if (selected)
+            {
+                tagBuilder.Attributes["selected"] = "selected";
+            }
+
+            if (item.Disabled)
+            {
+                tagBuilder.Attributes["disabled"] = "disabled";
+            }
+
+            return tagBuilder;
+        }
+
+        internal static object GetModelStateValue(ViewContext viewContext, string key, Type destinationType)
+        {
+            if (viewContext.ViewData.ModelState.TryGetValue(key, out var entry) && entry.RawValue != null)
+            {
+                return ModelBindingHelper.ConvertTo(entry.RawValue, destinationType, culture: null);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Generate a &lt;form&gt; element.
+        /// </summary>
+        /// <param name="viewContext">A <see cref="ViewContext"/> instance for the current scope.</param>
+        /// <param name="action">The URL where the form-data should be submitted.</param>
+        /// <param name="method">The HTTP method for processing the form, either GET or POST.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>
+        /// A <see cref="TagBuilder"/> instance for the &lt;/form&gt; element.
+        /// </returns>
+        protected virtual TagBuilder GenerateFormCore(
+            ViewContext viewContext,
+            string action,
+            string method,
+            object htmlAttributes)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            var tagBuilder = new TagBuilder("form");
+            tagBuilder.MergeAttributes(GetHtmlAttributeDictionaryOrNull(htmlAttributes));
+
+            // action is implicitly generated from other parameters, so htmlAttributes take precedence.
+            tagBuilder.MergeAttribute("action", action);
+
+            if (string.IsNullOrEmpty(method))
+            {
+                // Occurs only when called from a tag helper.
+                method = "post";
+            }
+
+            // For tag helpers, htmlAttributes will be null; replaceExisting value does not matter.
+            // method is an explicit parameter to HTML helpers, so it takes precedence over the htmlAttributes.
+            tagBuilder.MergeAttribute("method", method, replaceExisting: true);
+
+            return tagBuilder;
+        }
+
+        protected virtual TagBuilder GenerateInput(
+            ViewContext viewContext,
+            InputType inputType,
+            ModelExplorer modelExplorer,
+            string expression,
+            object value,
+            bool useViewData,
+            bool isChecked,
+            bool setId,
+            bool isExplicitValue,
+            string format,
+            IDictionary<string, object> htmlAttributes)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            // Not valid to use TextBoxForModel() and so on in a top-level view; would end up with an unnamed input
+            // elements. But we support the *ForModel() methods in any lower-level template, once HtmlFieldPrefix is
+            // non-empty.
+            var fullName = NameAndIdProvider.GetFullHtmlFieldName(viewContext, expression);
+            if (!IsFullNameValid(fullName, htmlAttributes))
+            {
+                throw new ArgumentException(
+                    Resources.FormatHtmlGenerator_FieldNameCannotBeNullOrEmpty(
+                        typeof(IHtmlHelper).FullName,
+                        nameof(IHtmlHelper.Editor),
+                        typeof(IHtmlHelper<>).FullName,
+                        nameof(IHtmlHelper<object>.EditorFor),
+                        "htmlFieldName"),
+                    nameof(expression));
+            }
+
+            var inputTypeString = GetInputTypeString(inputType);
+            var tagBuilder = new TagBuilder("input")
+            {
+                TagRenderMode = TagRenderMode.SelfClosing,
+            };
+
+            tagBuilder.MergeAttributes(htmlAttributes);
+            tagBuilder.MergeAttribute("type", inputTypeString);
+            if (!string.IsNullOrEmpty(fullName))
+            {
+                tagBuilder.MergeAttribute("name", fullName, replaceExisting: true);
+            }
+
+            var suppliedTypeString = tagBuilder.Attributes["type"];
+            if (_placeholderInputTypes.Contains(suppliedTypeString))
+            {
+                AddPlaceholderAttribute(viewContext.ViewData, tagBuilder, modelExplorer, expression);
+            }
+
+            var valueParameter = FormatValue(value, format);
+            var usedModelState = false;
+            switch (inputType)
+            {
+                case InputType.CheckBox:
+                    var modelStateWasChecked = GetModelStateValue(viewContext, fullName, typeof(bool)) as bool?;
+                    if (modelStateWasChecked.HasValue)
+                    {
+                        isChecked = modelStateWasChecked.Value;
+                        usedModelState = true;
+                    }
+
+                    goto case InputType.Radio;
+
+                case InputType.Radio:
+                    if (!usedModelState)
+                    {
+                        if (GetModelStateValue(viewContext, fullName, typeof(string)) is string modelStateValue)
+                        {
+                            isChecked = string.Equals(modelStateValue, valueParameter, StringComparison.Ordinal);
+                            usedModelState = true;
+                        }
+                    }
+
+                    if (!usedModelState && useViewData)
+                    {
+                        isChecked = EvalBoolean(viewContext, expression);
+                    }
+
+                    if (isChecked)
+                    {
+                        tagBuilder.MergeAttribute("checked", "checked");
+                    }
+
+                    tagBuilder.MergeAttribute("value", valueParameter, isExplicitValue);
+                    break;
+
+                case InputType.Password:
+                    if (value != null)
+                    {
+                        tagBuilder.MergeAttribute("value", valueParameter, isExplicitValue);
+                    }
+
+                    break;
+
+                case InputType.Text:
+                default:
+                    var attributeValue = (string)GetModelStateValue(viewContext, fullName, typeof(string));
+                    if (attributeValue == null)
+                    {
+                        attributeValue = useViewData ? EvalString(viewContext, expression, format) : valueParameter;
+                    }
+
+                    var addValue = true;
+                    object typeAttributeValue;
+                    if (htmlAttributes != null && htmlAttributes.TryGetValue("type", out typeAttributeValue))
+                    {
+                        var typeAttributeString = typeAttributeValue.ToString();
+                        if (string.Equals(typeAttributeString, "file", StringComparison.OrdinalIgnoreCase) ||
+                            string.Equals(typeAttributeString, "image", StringComparison.OrdinalIgnoreCase))
+                        {
+                            // 'value' attribute is not needed for 'file' and 'image' input types.
+                            addValue = false;
+                        }
+                    }
+
+                    if (addValue)
+                    {
+                        tagBuilder.MergeAttribute("value", attributeValue, replaceExisting: isExplicitValue);
+                    }
+
+                    break;
+            }
+
+            if (setId)
+            {
+                NameAndIdProvider.GenerateId(viewContext, tagBuilder, fullName, IdAttributeDotReplacement);
+            }
+
+            // If there are any errors for a named field, we add the CSS attribute.
+            if (viewContext.ViewData.ModelState.TryGetValue(fullName, out var entry) && entry.Errors.Count > 0)
+            {
+                tagBuilder.AddCssClass(HtmlHelper.ValidationInputCssClassName);
+            }
+
+            AddValidationAttributes(viewContext, tagBuilder, modelExplorer, expression);
+
+            return tagBuilder;
+        }
+
+        protected virtual TagBuilder GenerateLink(
+            string linkText,
+            string url,
+            object htmlAttributes)
+        {
+            if (linkText == null)
+            {
+                throw new ArgumentNullException(nameof(linkText));
+            }
+
+            var tagBuilder = new TagBuilder("a");
+            tagBuilder.InnerHtml.SetContent(linkText);
+
+            tagBuilder.MergeAttributes(GetHtmlAttributeDictionaryOrNull(htmlAttributes));
+            tagBuilder.MergeAttribute("href", url);
+
+            return tagBuilder;
+        }
+
+        /// <summary>
+        /// Adds a placeholder attribute to the <paramref name="tagBuilder" />.
+        /// </summary>
+        /// <param name="viewData">A <see cref="ViewDataDictionary"/> instance for the current scope.</param>
+        /// <param name="tagBuilder">A <see cref="TagBuilder"/> instance.</param>
+        /// <param name="modelExplorer">The <see cref="ModelExplorer"/> for the <paramref name="expression"/>.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        protected virtual void AddPlaceholderAttribute(
+            ViewDataDictionary viewData,
+            TagBuilder tagBuilder,
+            ModelExplorer modelExplorer,
+            string expression)
+        {
+            modelExplorer = modelExplorer ?? ExpressionMetadataProvider.FromStringExpression(
+                expression,
+                viewData,
+                _metadataProvider);
+
+            var placeholder = modelExplorer.Metadata.Placeholder;
+            if (!string.IsNullOrEmpty(placeholder))
+            {
+                tagBuilder.MergeAttribute("placeholder", placeholder);
+            }
+        }
+
+        /// <summary>
+        /// Adds validation attributes to the <paramref name="tagBuilder" /> if client validation
+        /// is enabled.
+        /// </summary>
+        /// <param name="viewContext">A <see cref="ViewContext"/> instance for the current scope.</param>
+        /// <param name="tagBuilder">A <see cref="TagBuilder"/> instance.</param>
+        /// <param name="modelExplorer">The <see cref="ModelExplorer"/> for the <paramref name="expression"/>.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        protected virtual void AddValidationAttributes(
+            ViewContext viewContext,
+            TagBuilder tagBuilder,
+            ModelExplorer modelExplorer,
+            string expression)
+        {
+            modelExplorer = modelExplorer ?? ExpressionMetadataProvider.FromStringExpression(
+                expression,
+                viewContext.ViewData,
+                _metadataProvider);
+
+            _validationAttributeProvider.AddAndTrackValidationAttributes(
+                viewContext,
+                modelExplorer,
+                expression,
+                tagBuilder.Attributes);
+        }
+
+        private static Enum ConvertEnumFromInteger(object value, Type targetType)
+        {
+            try
+            {
+                return (Enum)Enum.ToObject(targetType, value);
+            }
+            catch (Exception exception)
+            when (exception is FormatException || exception.InnerException is FormatException)
+            {
+                // The integer was too large for this enum type.
+                return null;
+            }
+        }
+
+        private static object ConvertEnumFromString<TEnum>(string value) where TEnum : struct
+        {
+            if (Enum.TryParse(value, out TEnum enumValue))
+            {
+                return enumValue;
+            }
+
+            // Do not return default(TEnum) when parse was unsuccessful.
+            return null;
+        }
+
+        private static bool EvalBoolean(ViewContext viewContext, string key)
+        {
+            return Convert.ToBoolean(viewContext.ViewData.Eval(key), CultureInfo.InvariantCulture);
+        }
+
+        private static string EvalString(ViewContext viewContext, string key)
+        {
+            return Convert.ToString(viewContext.ViewData.Eval(key), CultureInfo.CurrentCulture);
+        }
+
+        // Only need a dictionary if htmlAttributes is non-null. TagBuilder.MergeAttributes() is fine with null.
+        private static IDictionary<string, object> GetHtmlAttributeDictionaryOrNull(object htmlAttributes)
+        {
+            IDictionary<string, object> htmlAttributeDictionary = null;
+            if (htmlAttributes != null)
+            {
+                htmlAttributeDictionary = htmlAttributes as IDictionary<string, object>;
+                if (htmlAttributeDictionary == null)
+                {
+                    htmlAttributeDictionary = HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes);
+                }
+            }
+
+            return htmlAttributeDictionary;
+        }
+
+        private static string GetInputTypeString(InputType inputType)
+        {
+            switch (inputType)
+            {
+                case InputType.CheckBox:
+                    return "checkbox";
+                case InputType.Hidden:
+                    return "hidden";
+                case InputType.Password:
+                    return "password";
+                case InputType.Radio:
+                    return "radio";
+                case InputType.Text:
+                    return "text";
+                default:
+                    return "text";
+            }
+        }
+
+        private static IEnumerable<SelectListItem> GetSelectListItems(
+            ViewContext viewContext,
+            string expression)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            // Method is called only if user did not pass a select list in. They must provide select list items in the
+            // ViewData dictionary and definitely not as the Model. (Even if the Model datatype were correct, a
+            // <select> element generated for a collection of SelectListItems would be useless.)
+            var value = viewContext.ViewData.Eval(expression);
+
+            // First check whether above evaluation was successful and did not match ViewData.Model.
+            if (value == null || value == viewContext.ViewData.Model)
+            {
+                throw new InvalidOperationException(Resources.FormatHtmlHelper_MissingSelectData(
+                    $"IEnumerable<{nameof(SelectListItem)}>",
+                    expression));
+            }
+
+            // Second check the Eval() call returned a collection of SelectListItems.
+            var selectList = value as IEnumerable<SelectListItem>;
+            if (selectList == null)
+            {
+                throw new InvalidOperationException(Resources.FormatHtmlHelper_WrongSelectDataType(
+                    expression,
+                    value.GetType().FullName,
+                    $"IEnumerable<{nameof(SelectListItem)}>"));
+            }
+
+            return selectList;
+        }
+
+        private static bool IsFullNameValid(string fullName, IDictionary<string, object> htmlAttributeDictionary)
+        {
+            return IsFullNameValid(fullName, htmlAttributeDictionary, fallbackAttributeName: "name");
+        }
+
+        private static bool IsFullNameValid(
+            string fullName,
+            IDictionary<string, object> htmlAttributeDictionary,
+            string fallbackAttributeName)
+        {
+            if (string.IsNullOrEmpty(fullName))
+            {
+                // fullName==null is normally an error because name="" is not valid in HTML 5.
+                if (htmlAttributeDictionary == null)
+                {
+                    return false;
+                }
+
+                // Check if user has provided an explicit name attribute.
+                // Generalized a bit because other attributes e.g. data-valmsg-for refer to element names.
+                htmlAttributeDictionary.TryGetValue(fallbackAttributeName, out var attributeObject);
+                var attributeString = Convert.ToString(attributeObject, CultureInfo.InvariantCulture);
+                if (string.IsNullOrEmpty(attributeString))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent GenerateGroupsAndOptions(string optionLabel, IEnumerable<SelectListItem> selectList)
+        {
+            return GenerateGroupsAndOptions(optionLabel, selectList, currentValues: null);
+        }
+
+        private IHtmlContent GenerateGroupsAndOptions(
+            string optionLabel,
+            IEnumerable<SelectListItem> selectList,
+            ICollection<string> currentValues)
+        {
+            var itemsList = selectList as IList<SelectListItem>;
+            if (itemsList == null)
+            {
+                itemsList = selectList.ToList();
+            }
+
+            var count = itemsList.Count;
+            if (optionLabel != null)
+            {
+                count++;
+            }
+
+            // Short-circuit work below if there's nothing to add.
+            if (count == 0)
+            {
+                return HtmlString.Empty;
+            }
+
+            var listItemBuilder = new HtmlContentBuilder(count);
+
+            // Make optionLabel the first item that gets rendered.
+            if (optionLabel != null)
+            {
+                listItemBuilder.AppendLine(GenerateOption(
+                    new SelectListItem()
+                    {
+                        Text = optionLabel,
+                        Value = string.Empty,
+                        Selected = false,
+                    },
+                    currentValues: null));
+            }
+
+            // Group items in the SelectList if requested.
+            // The worst case complexity of this algorithm is O(number of groups*n).
+            // If there aren't any groups, it is O(n) where n is number of items in the list.
+            var optionGenerated = new bool[itemsList.Count];
+            for (var i = 0; i < itemsList.Count; i++)
+            {
+                if (!optionGenerated[i])
+                {
+                    var item = itemsList[i];
+                    var optGroup = item.Group;
+                    if (optGroup != null)
+                    {
+                        var groupBuilder = new TagBuilder("optgroup");
+                        if (optGroup.Name != null)
+                        {
+                            groupBuilder.MergeAttribute("label", optGroup.Name);
+                        }
+
+                        if (optGroup.Disabled)
+                        {
+                            groupBuilder.MergeAttribute("disabled", "disabled");
+                        }
+
+                        groupBuilder.InnerHtml.AppendLine();
+
+                        for (var j = i; j < itemsList.Count; j++)
+                        {
+                            var groupItem = itemsList[j];
+
+                            if (!optionGenerated[j] &&
+                                object.ReferenceEquals(optGroup, groupItem.Group))
+                            {
+                                groupBuilder.InnerHtml.AppendLine(GenerateOption(groupItem, currentValues));
+                                optionGenerated[j] = true;
+                            }
+                        }
+
+                        listItemBuilder.AppendLine(groupBuilder);
+                    }
+                    else
+                    {
+                        listItemBuilder.AppendLine(GenerateOption(item, currentValues));
+                        optionGenerated[i] = true;
+                    }
+                }
+            }
+
+            return listItemBuilder;
+        }
+
+        private IHtmlContent GenerateOption(SelectListItem item, ICollection<string> currentValues)
+        {
+            var selected = item.Selected;
+            if (currentValues != null)
+            {
+                var value = item.Value ?? item.Text;
+                selected = currentValues.Contains(value);
+            }
+
+            var tagBuilder = GenerateOption(item, item.Text, selected);
+            return tagBuilder;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGeneratorExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGeneratorExtensions.cs
new file mode 100644
index 0000000000..fd58824cd0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGeneratorExtensions.cs
@@ -0,0 +1,51 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public static class DefaultHtmlGeneratorExtensions
+    {
+        public static TagBuilder GenerateForm(
+            this IHtmlGenerator generator,
+            ViewContext viewContext,
+            string actionName,
+            string controllerName,
+            string fragment,
+            object routeValues,
+            string method,
+            object htmlAttributes)
+        {
+            var tagBuilder = generator.GenerateForm(viewContext, actionName, controllerName, routeValues, method, htmlAttributes);
+
+            // Append the fragment to action
+            if (fragment != null)
+            {
+                tagBuilder.Attributes["action"] += "#" + fragment;
+            }
+
+            return tagBuilder;
+        }
+
+        public static TagBuilder GenerateRouteForm(
+            this IHtmlGenerator generator,
+            ViewContext viewContext,
+            string routeName,
+            object routeValues,
+            string fragment,
+            string method,
+            object htmlAttributes)
+        {
+            var tagBuilder = generator.GenerateRouteForm(viewContext, routeName, routeValues, method, htmlAttributes);
+
+            // Append the fragment to action
+            if (fragment != null)
+            {
+                tagBuilder.Attributes["action"] += "#" + fragment;
+            }
+
+            return tagBuilder;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultValidationHtmlAttributeProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultValidationHtmlAttributeProvider.cs
new file mode 100644
index 0000000000..7fe4a5bc70
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultValidationHtmlAttributeProvider.cs
@@ -0,0 +1,103 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Default implementation of <see cref="ValidationHtmlAttributeProvider"/>.
+    /// </summary>
+    public class DefaultValidationHtmlAttributeProvider : ValidationHtmlAttributeProvider
+    {
+        private readonly IModelMetadataProvider _metadataProvider;
+        private readonly ClientValidatorCache _clientValidatorCache;
+        private readonly IClientModelValidatorProvider _clientModelValidatorProvider;
+
+        /// <summary>
+        /// Initializes a new <see cref="DefaultValidationHtmlAttributeProvider"/> instance.
+        /// </summary>
+        /// <param name="optionsAccessor">The accessor for <see cref="MvcViewOptions"/>.</param>
+        /// <param name="metadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
+        /// <param name="clientValidatorCache">The <see cref="ClientValidatorCache"/> that provides
+        /// a list of <see cref="IClientModelValidator"/>s.</param>
+        public DefaultValidationHtmlAttributeProvider(
+            IOptions<MvcViewOptions> optionsAccessor,
+            IModelMetadataProvider metadataProvider,
+            ClientValidatorCache clientValidatorCache)
+        {
+            if (optionsAccessor == null)
+            {
+                throw new ArgumentNullException(nameof(optionsAccessor));
+            }
+
+            if (metadataProvider == null)
+            {
+                throw new ArgumentNullException(nameof(metadataProvider));
+            }
+
+            if (clientValidatorCache == null)
+            {
+                throw new ArgumentNullException(nameof(clientValidatorCache));
+            }
+
+            _clientValidatorCache = clientValidatorCache;
+            _metadataProvider = metadataProvider;
+
+            var clientValidatorProviders = optionsAccessor.Value.ClientModelValidatorProviders;
+            _clientModelValidatorProvider = new CompositeClientModelValidatorProvider(clientValidatorProviders);
+        }
+
+        /// <inheritdoc />
+        public override void AddValidationAttributes(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            IDictionary<string, string> attributes)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            if (modelExplorer == null)
+            {
+                throw new ArgumentNullException(nameof(modelExplorer));
+            }
+
+            if (attributes == null)
+            {
+                throw new ArgumentNullException(nameof(attributes));
+            }
+
+            var formContext = viewContext.ClientValidationEnabled ? viewContext.FormContext : null;
+            if (formContext == null)
+            {
+                return;
+            }
+
+            var validators = _clientValidatorCache.GetValidators(
+                modelExplorer.Metadata,
+                _clientModelValidatorProvider);
+            if (validators.Count > 0)
+            {
+                var validationContext = new ClientModelValidationContext(
+                    viewContext,
+                    modelExplorer.Metadata,
+                    _metadataProvider,
+                    attributes);
+
+                for (var i = 0; i < validators.Count; i++)
+                {
+                    var validator = validators[i];
+                    validator.AddValidation(validationContext);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/FormContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/FormContext.cs
new file mode 100644
index 0000000000..4245044e29
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/FormContext.cs
@@ -0,0 +1,149 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Information about the current &lt;form&gt;.
+    /// </summary>
+    /// <remarks>
+    /// Literal &lt;form&gt; elements in a view will share the default <see cref="FormContext"/> instance unless tag
+    /// helpers are enabled.
+    /// </remarks>
+    public class FormContext
+    {
+        private Dictionary<string, bool> _renderedFields;
+        private Dictionary<string, object> _formData;
+        private IList<IHtmlContent> _endOfFormContent;
+
+        /// <summary>
+        /// Gets a property bag for any information you wish to associate with a &lt;form/&gt; in an
+        /// <see cref="Rendering.IHtmlHelper"/> implementation or extension method.
+        /// </summary>
+        public IDictionary<string, object> FormData
+        {
+            get
+            {
+                if (_formData == null)
+                {
+                    _formData = new Dictionary<string, object>(StringComparer.Ordinal);
+                }
+
+                return _formData;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets an indication the current &lt;form&gt; element contains an antiforgery token. Do not use
+        /// unless <see cref="CanRenderAtEndOfForm"/> is <c>true</c>.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if the current &lt;form&gt; element contains an antiforgery token; <c>false</c> otherwise.
+        /// </value>
+        public bool HasAntiforgeryToken { get; set; }
+
+        /// <summary>
+        /// Gets an indication the <see cref="FormData"/> property bag has been used and likely contains entries.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if the backing field for <see cref="FormData"/> is non-<c>null</c>; <c>false</c> otherwise.
+        /// </value>
+        public bool HasFormData => _formData != null;
+
+        /// <summary>
+        /// Gets an indication the <see cref="EndOfFormContent"/> collection has been used and likely contains entries.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if the backing field for <see cref="EndOfFormContent"/> is non-<c>null</c>; <c>false</c>
+        /// otherwise.
+        /// </value>
+        public bool HasEndOfFormContent => _endOfFormContent != null;
+
+        /// <summary>
+        /// Gets an <see cref="IHtmlContent"/> collection that should be rendered just prior to the next &lt;/form&gt;
+        /// end tag. Do not use unless <see cref="CanRenderAtEndOfForm"/> is <c>true</c>.
+        /// </summary>
+        public IList<IHtmlContent> EndOfFormContent
+        {
+            get
+            {
+                if (_endOfFormContent == null)
+                {
+                    _endOfFormContent = new List<IHtmlContent>();
+                }
+
+                return _endOfFormContent;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets an indication whether extra content can be rendered at the end of the content of this
+        /// &lt;form&gt; element. That is, <see cref="EndOfFormContent"/> will be rendered just prior to the
+        /// &lt;/form&gt; end tag.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if the framework will render <see cref="EndOfFormContent"/>; <c>false</c> otherwise. In
+        /// particular, <c>true</c> if the current &lt;form&gt; is associated with a tag helper or will be generated by
+        /// an HTML helper; <c>false</c> when using the default <see cref="FormContext"/> instance.
+        /// </value>
+        public bool CanRenderAtEndOfForm { get; set; }
+
+        /// <summary>
+        /// Gets a dictionary mapping full HTML field names to indications that the named field has been rendered in
+        /// this &lt;form&gt;.
+        /// </summary>
+        private Dictionary<string, bool> RenderedFields
+        {
+            get
+            {
+                if (_renderedFields == null)
+                {
+                    _renderedFields = new Dictionary<string, bool>(StringComparer.Ordinal);
+                }
+
+                return _renderedFields;
+            }
+        }
+
+        /// <summary>
+        /// Returns an indication based on <see cref="RenderedFields"/> that the given <paramref name="fieldName"/> has
+        /// been rendered in this &lt;form&gt;.
+        /// </summary>
+        /// <param name="fieldName">The full HTML name of a field that may have been rendered.</param>
+        /// <returns>
+        /// <c>true</c> if the given <paramref name="fieldName"/> has been rendered; <c>false</c> otherwise.
+        /// </returns>
+        public bool RenderedField(string fieldName)
+        {
+            if (fieldName == null)
+            {
+                throw new ArgumentNullException(nameof(fieldName));
+            }
+
+            bool result;
+            RenderedFields.TryGetValue(fieldName, out result);
+
+            return result;
+        }
+
+        /// <summary>
+        /// Updates <see cref="RenderedFields"/> to indicate <paramref name="fieldName"/> has been rendered in this
+        /// &lt;form&gt;.
+        /// </summary>
+        /// <param name="fieldName">The full HTML name of a field that may have been rendered.</param>
+        /// <param name="value">If <c>true</c>, the given <paramref name="fieldName"/> has been rendered.</param>
+        public void RenderedField(string fieldName, bool value)
+        {
+            if (fieldName == null)
+            {
+                throw new ArgumentNullException(nameof(fieldName));
+            }
+
+            RenderedFields[fieldName] = value;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs
new file mode 100644
index 0000000000..8abb93d274
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs
@@ -0,0 +1,1250 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Default implementation of <see cref="IHtmlHelper"/>.
+    /// </summary>
+    public class HtmlHelper : IHtmlHelper, IViewContextAware
+    {
+        public static readonly string ValidationInputCssClassName = "input-validation-error";
+        public static readonly string ValidationInputValidCssClassName = "input-validation-valid";
+        public static readonly string ValidationMessageCssClassName = "field-validation-error";
+        public static readonly string ValidationMessageValidCssClassName = "field-validation-valid";
+        public static readonly string ValidationSummaryCssClassName = "validation-summary-errors";
+        public static readonly string ValidationSummaryValidCssClassName = "validation-summary-valid";
+
+        private readonly IHtmlGenerator _htmlGenerator;
+        private readonly ICompositeViewEngine _viewEngine;
+        private readonly HtmlEncoder _htmlEncoder;
+        private readonly IViewBufferScope _bufferScope;
+
+        private ViewContext _viewContext;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HtmlHelper"/> class.
+        /// </summary>
+        public HtmlHelper(
+            IHtmlGenerator htmlGenerator,
+            ICompositeViewEngine viewEngine,
+            IModelMetadataProvider metadataProvider,
+            IViewBufferScope bufferScope,
+            HtmlEncoder htmlEncoder,
+            UrlEncoder urlEncoder)
+        {
+            if (htmlGenerator == null)
+            {
+                throw new ArgumentNullException(nameof(htmlGenerator));
+            }
+
+            if (viewEngine == null)
+            {
+                throw new ArgumentNullException(nameof(viewEngine));
+            }
+
+            if (metadataProvider == null)
+            {
+                throw new ArgumentNullException(nameof(metadataProvider));
+            }
+
+            if (bufferScope == null)
+            {
+                throw new ArgumentNullException(nameof(bufferScope));
+            }
+
+            if (htmlEncoder == null)
+            {
+                throw new ArgumentNullException(nameof(htmlEncoder));
+            }
+
+            if (urlEncoder == null)
+            {
+                throw new ArgumentNullException(nameof(urlEncoder));
+            }
+
+            _viewEngine = viewEngine;
+            _htmlGenerator = htmlGenerator;
+            _htmlEncoder = htmlEncoder;
+            _bufferScope = bufferScope;
+            MetadataProvider = metadataProvider;
+            UrlEncoder = urlEncoder;
+        }
+
+        /// <inheritdoc />
+        public Html5DateRenderingMode Html5DateRenderingMode
+        {
+            get => ViewContext.Html5DateRenderingMode;
+            set => ViewContext.Html5DateRenderingMode = value;
+        }
+
+        /// <inheritdoc />
+        public string IdAttributeDotReplacement => _htmlGenerator.IdAttributeDotReplacement;
+
+        /// <inheritdoc />
+        public ViewContext ViewContext
+        {
+            get
+            {
+                if (_viewContext == null)
+                {
+                    throw new InvalidOperationException(Resources.HtmlHelper_NotContextualized);
+                }
+
+                return _viewContext;
+            }
+            private set => _viewContext = value;
+        }
+
+        /// <inheritdoc />
+        public dynamic ViewBag => ViewContext.ViewBag;
+
+        /// <inheritdoc />
+        public ViewDataDictionary ViewData => ViewContext.ViewData;
+
+        /// <inheritdoc />
+        public ITempDataDictionary TempData => ViewContext.TempData;
+
+        /// <inheritdoc />
+        public UrlEncoder UrlEncoder { get; }
+
+        /// <inheritdoc />
+        public IModelMetadataProvider MetadataProvider { get; }
+
+        /// <summary>
+        /// Creates a dictionary from an object, by adding each public instance property as a key with its associated
+        /// value to the dictionary. It will expose public properties from derived types as well. This is typically
+        /// used with objects of an anonymous type.
+        ///
+        /// If the <paramref name="value"/> is already an <see cref="IDictionary{String, Object}"/> instance, then it
+        /// is returned as-is.
+        /// <example>
+        /// <c>new { data_name="value" }</c> will translate to the entry <c>{ "data_name", "value" }</c>
+        /// in the resulting dictionary.
+        /// </example>
+        /// </summary>
+        /// <param name="value">The <see cref="object"/> to be converted.</param>
+        /// <returns>The created dictionary of property names and property values.</returns>
+        public static IDictionary<string, object> ObjectToDictionary(object value)
+        {
+            return PropertyHelper.ObjectToDictionary(value);
+        }
+
+        /// <summary>
+        /// Creates a dictionary of HTML attributes from the input object,
+        /// translating underscores to dashes in each public instance property.
+        /// </summary>
+        /// <param name="htmlAttributes">Anonymous object describing HTML attributes.</param>
+        /// <returns>A dictionary that represents HTML attributes.</returns>
+        /// <remarks>
+        /// If the object is already an <see cref="IDictionary{String, Object}"/> instance, then a shallow copy is
+        /// returned.
+        /// <example>
+        /// <c>new { data_name="value" }</c> will translate to the entry <c>{ "data-name", "value" }</c>
+        /// in the resulting dictionary.
+        /// </example>
+        /// </remarks>
+        public static IDictionary<string, object> AnonymousObjectToHtmlAttributes(object htmlAttributes)
+        {
+            if (htmlAttributes is IDictionary<string, object> dictionary)
+            {
+                return new Dictionary<string, object>(dictionary, StringComparer.OrdinalIgnoreCase);
+            }
+
+            dictionary = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+
+            if (htmlAttributes != null)
+            {
+                foreach (var helper in HtmlAttributePropertyHelper.GetProperties(htmlAttributes.GetType()))
+                {
+                    dictionary[helper.Name] = helper.GetValue(htmlAttributes);
+                }
+            }
+
+            return dictionary;
+        }
+
+        public virtual void Contextualize(ViewContext viewContext)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            ViewContext = viewContext;
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent ActionLink(
+            string linkText,
+            string actionName,
+            string controllerName,
+            string protocol,
+            string hostname,
+            string fragment,
+            object routeValues,
+            object htmlAttributes)
+        {
+            if (linkText == null)
+            {
+                throw new ArgumentNullException(nameof(linkText));
+            }
+
+            var tagBuilder = _htmlGenerator.GenerateActionLink(
+                ViewContext,
+                linkText,
+                actionName,
+                controllerName,
+                protocol,
+                hostname,
+                fragment,
+                routeValues,
+                htmlAttributes);
+            if (tagBuilder == null)
+            {
+                return HtmlString.Empty;
+            }
+
+            return tagBuilder;
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent AntiForgeryToken()
+        {
+            var html = _htmlGenerator.GenerateAntiforgery(ViewContext);
+            return html ?? HtmlString.Empty;
+        }
+
+        /// <inheritdoc />
+        public MvcForm BeginForm(
+            string actionName,
+            string controllerName,
+            object routeValues,
+            FormMethod method,
+            bool? antiforgery,
+            object htmlAttributes)
+        {
+            // Push the new FormContext; MvcForm.GenerateEndForm() does the corresponding pop.
+            _viewContext.FormContext = new FormContext
+            {
+                CanRenderAtEndOfForm = true
+            };
+
+            return GenerateForm(actionName, controllerName, routeValues, method, antiforgery, htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public MvcForm BeginRouteForm(
+            string routeName,
+            object routeValues,
+            FormMethod method,
+            bool? antiforgery,
+            object htmlAttributes)
+        {
+            // Push the new FormContext; MvcForm.GenerateEndForm() does the corresponding pop.
+            _viewContext.FormContext = new FormContext
+            {
+                CanRenderAtEndOfForm = true
+            };
+
+            return GenerateRouteForm(routeName, routeValues, method, antiforgery, htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public void EndForm()
+        {
+            var mvcForm = CreateForm();
+            mvcForm.EndForm();
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent CheckBox(string expression, bool? isChecked, object htmlAttributes)
+        {
+            return GenerateCheckBox(
+                modelExplorer: null,
+                expression: expression,
+                isChecked: isChecked,
+                htmlAttributes: htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public string Encode(string value)
+        {
+            return _htmlGenerator.Encode(value);
+        }
+
+        /// <inheritdoc />
+        public string Encode(object value)
+        {
+            return _htmlGenerator.Encode(value);
+        }
+
+        /// <inheritdoc />
+        public string FormatValue(object value, string format)
+        {
+            return _htmlGenerator.FormatValue(value, format);
+        }
+
+        /// <inheritdoc />
+        public string GenerateIdFromName(string fullName)
+        {
+            if (fullName == null)
+            {
+                throw new ArgumentNullException(nameof(fullName));
+            }
+
+            return NameAndIdProvider.CreateSanitizedId(ViewContext, fullName, IdAttributeDotReplacement);
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent Display(
+            string expression,
+            string templateName,
+            string htmlFieldName,
+            object additionalViewData)
+        {
+            var metadata = ExpressionMetadataProvider.FromStringExpression(expression, ViewData, MetadataProvider);
+
+            return GenerateDisplay(
+                metadata,
+                htmlFieldName ?? ExpressionHelper.GetExpressionText(expression),
+                templateName,
+                additionalViewData);
+        }
+
+        /// <inheritdoc />
+        public string DisplayName(string expression)
+        {
+            var modelExplorer = ExpressionMetadataProvider.FromStringExpression(expression, ViewData, MetadataProvider);
+            return GenerateDisplayName(modelExplorer, expression);
+        }
+
+        /// <inheritdoc />
+        public string DisplayText(string expression)
+        {
+            var modelExplorer = ExpressionMetadataProvider.FromStringExpression(expression, ViewData, MetadataProvider);
+            return GenerateDisplayText(modelExplorer);
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent DropDownList(
+            string expression,
+            IEnumerable<SelectListItem> selectList,
+            string optionLabel,
+            object htmlAttributes)
+        {
+            return GenerateDropDown(
+                modelExplorer: null,
+                expression: expression,
+                selectList: selectList,
+                optionLabel: optionLabel,
+                htmlAttributes: htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent Editor(
+            string expression,
+            string templateName,
+            string htmlFieldName,
+            object additionalViewData)
+        {
+            var modelExplorer = ExpressionMetadataProvider.FromStringExpression(expression, ViewData, MetadataProvider);
+
+            return GenerateEditor(
+                modelExplorer,
+                htmlFieldName ?? ExpressionHelper.GetExpressionText(expression),
+                templateName,
+                additionalViewData);
+        }
+
+        /// <inheritdoc />
+        public IEnumerable<SelectListItem> GetEnumSelectList<TEnum>() where TEnum : struct
+        {
+            var type = typeof(TEnum);
+            var metadata = MetadataProvider.GetMetadataForType(type);
+            if (!metadata.IsEnum || metadata.IsFlagsEnum)
+            {
+                var message = Resources.FormatHtmlHelper_TypeNotSupported_ForGetEnumSelectList(
+                    type.FullName,
+                    nameof(Enum).ToLowerInvariant(),
+                    nameof(FlagsAttribute));
+                throw new ArgumentException(message, nameof(TEnum));
+            }
+
+            return GetEnumSelectList(metadata);
+        }
+
+        /// <inheritdoc />
+        public IEnumerable<SelectListItem> GetEnumSelectList(Type enumType)
+        {
+            if (enumType == null)
+            {
+                throw new ArgumentNullException(nameof(enumType));
+            }
+
+            var metadata = MetadataProvider.GetMetadataForType(enumType);
+            if (!metadata.IsEnum || metadata.IsFlagsEnum)
+            {
+                var message = Resources.FormatHtmlHelper_TypeNotSupported_ForGetEnumSelectList(
+                    enumType.FullName,
+                    nameof(Enum).ToLowerInvariant(),
+                    nameof(FlagsAttribute));
+                throw new ArgumentException(message, nameof(enumType));
+            }
+
+            return GetEnumSelectList(metadata);
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent Hidden(string expression, object value, object htmlAttributes)
+        {
+            return GenerateHidden(
+                modelExplorer: null,
+                expression: expression,
+                value: value,
+                useViewData: (value == null),
+                htmlAttributes: htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public string Id(string expression)
+        {
+            return GenerateId(expression);
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent Label(string expression, string labelText, object htmlAttributes)
+        {
+            var modelExplorer = ExpressionMetadataProvider.FromStringExpression(expression, ViewData, MetadataProvider);
+            return GenerateLabel(
+                modelExplorer,
+                expression,
+                labelText,
+                htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent ListBox(string expression, IEnumerable<SelectListItem> selectList, object htmlAttributes)
+        {
+            return GenerateListBox(
+                modelExplorer: null,
+                expression: expression,
+                selectList: selectList,
+                htmlAttributes: htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public string Name(string expression)
+        {
+            return GenerateName(expression);
+        }
+
+        /// <inheritdoc />
+        public async Task<IHtmlContent> PartialAsync(
+            string partialViewName,
+            object model,
+            ViewDataDictionary viewData)
+        {
+            if (partialViewName == null)
+            {
+                throw new ArgumentNullException(nameof(partialViewName));
+            }
+
+            var viewBuffer = new ViewBuffer(_bufferScope, partialViewName, ViewBuffer.PartialViewPageSize);
+            using (var writer = new ViewBufferTextWriter(viewBuffer, Encoding.UTF8))
+            {
+                await RenderPartialCoreAsync(partialViewName, model, viewData, writer);
+                return viewBuffer;
+            }
+        }
+
+        /// <inheritdoc />
+        public Task RenderPartialAsync(string partialViewName, object model, ViewDataDictionary viewData)
+        {
+            if (partialViewName == null)
+            {
+                throw new ArgumentNullException(nameof(partialViewName));
+            }
+
+            return RenderPartialCoreAsync(partialViewName, model, viewData, ViewContext.Writer);
+        }
+
+        protected virtual IHtmlContent GenerateDisplay(
+            ModelExplorer modelExplorer,
+            string htmlFieldName,
+            string templateName,
+            object additionalViewData)
+        {
+            var templateBuilder = new TemplateBuilder(
+                _viewEngine,
+                _bufferScope,
+                ViewContext,
+                ViewData,
+                modelExplorer,
+                htmlFieldName,
+                templateName,
+                readOnly: true,
+                additionalViewData: additionalViewData);
+
+            return templateBuilder.Build();
+        }
+
+        protected virtual async Task RenderPartialCoreAsync(
+            string partialViewName,
+            object model,
+            ViewDataDictionary viewData,
+            TextWriter writer)
+        {
+            if (partialViewName == null)
+            {
+                throw new ArgumentNullException(nameof(partialViewName));
+            }
+
+            var viewEngineResult = _viewEngine.GetView(
+                ViewContext.ExecutingFilePath,
+                partialViewName,
+                isMainPage: false);
+            var originalLocations = viewEngineResult.SearchedLocations;
+            if (!viewEngineResult.Success)
+            {
+                viewEngineResult = _viewEngine.FindView(ViewContext, partialViewName, isMainPage: false);
+            }
+
+            if (!viewEngineResult.Success)
+            {
+                var locations = string.Empty;
+                if (originalLocations.Any())
+                {
+                    locations = Environment.NewLine + string.Join(Environment.NewLine, originalLocations);
+                }
+
+                if (viewEngineResult.SearchedLocations.Any())
+                {
+                    locations +=
+                        Environment.NewLine + string.Join(Environment.NewLine, viewEngineResult.SearchedLocations);
+                }
+
+                throw new InvalidOperationException(
+                    Resources.FormatViewEngine_PartialViewNotFound(partialViewName, locations));
+            }
+
+            var view = viewEngineResult.View;
+            using (view as IDisposable)
+            {
+                // Determine which ViewData we should use to construct a new ViewData
+                var baseViewData = viewData ?? ViewData;
+
+                var newViewData = new ViewDataDictionary<object>(baseViewData, model);
+                var viewContext = new ViewContext(ViewContext, view, newViewData, writer);
+
+                await viewEngineResult.View.RenderAsync(viewContext);
+            }
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent Password(string expression, object value, object htmlAttributes)
+        {
+            return GeneratePassword(
+                modelExplorer: null,
+                expression: expression,
+                value: value,
+                htmlAttributes: htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent RadioButton(string expression, object value, bool? isChecked, object htmlAttributes)
+        {
+            return GenerateRadioButton(
+                modelExplorer: null,
+                expression: expression,
+                value: value,
+                isChecked: isChecked,
+                htmlAttributes: htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent Raw(string value)
+        {
+            return new HtmlString(value);
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent Raw(object value)
+        {
+            return new HtmlString(value?.ToString());
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent RouteLink(
+            string linkText,
+            string routeName,
+            string protocol,
+            string hostName,
+            string fragment,
+            object routeValues,
+            object htmlAttributes)
+        {
+            if (linkText == null)
+            {
+                throw new ArgumentNullException(nameof(linkText));
+            }
+
+            var tagBuilder = _htmlGenerator.GenerateRouteLink(
+                ViewContext,
+                linkText,
+                routeName,
+                protocol,
+                hostName,
+                fragment,
+                routeValues,
+                htmlAttributes);
+            if (tagBuilder == null)
+            {
+                return HtmlString.Empty;
+            }
+
+            return tagBuilder;
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent ValidationMessage(string expression, string message, object htmlAttributes, string tag)
+        {
+            return GenerateValidationMessage(
+                modelExplorer: null,
+                expression: expression,
+                message: message,
+                tag: tag,
+                htmlAttributes: htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent ValidationSummary(
+            bool excludePropertyErrors,
+            string message,
+            object htmlAttributes,
+            string tag)
+        {
+            return GenerateValidationSummary(excludePropertyErrors, message, htmlAttributes, tag);
+        }
+
+        /// <summary>
+        /// Returns the HTTP method that handles form input (GET or POST) as a string.
+        /// </summary>
+        /// <param name="method">The HTTP method that handles the form.</param>
+        /// <returns>The form method string, either "get" or "post".</returns>
+        public static string GetFormMethodString(FormMethod method)
+        {
+            switch (method)
+            {
+                case FormMethod.Get:
+                    return "get";
+                case FormMethod.Post:
+                    return "post";
+                default:
+                    return "post";
+            }
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent TextArea(string expression, string value, int rows, int columns, object htmlAttributes)
+        {
+            var modelExplorer = ExpressionMetadataProvider.FromStringExpression(expression, ViewData, MetadataProvider);
+            if (value != null)
+            {
+                // As a special case we allow treating a string value as a model of arbitrary type.
+                // So pass through the string representation, even though the ModelMetadata might
+                // be for some other type.
+                //
+                // We do this because thought we're displaying something as a string, we want to have
+                // the right set of validation attributes.
+                modelExplorer = new ModelExplorer(
+                    MetadataProvider,
+                    modelExplorer.Container,
+                    modelExplorer.Metadata,
+                    value);
+            }
+
+            return GenerateTextArea(modelExplorer, expression, rows, columns, htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent TextBox(string expression, object value, string format, object htmlAttributes)
+        {
+            return GenerateTextBox(
+                modelExplorer: null,
+                expression: expression,
+                value: value,
+                format: format,
+                htmlAttributes: htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public string Value(string expression, string format)
+        {
+            return GenerateValue(expression, value: null, format: format, useViewData: true);
+        }
+
+        /// <summary>
+        /// Override this method to return an <see cref="MvcForm"/> subclass. That subclass may change
+        /// <see cref="EndForm()"/> behavior.
+        /// </summary>
+        /// <returns>A new <see cref="MvcForm"/> instance.</returns>
+        protected virtual MvcForm CreateForm()
+        {
+            return new MvcForm(ViewContext, _htmlEncoder);
+        }
+
+        protected virtual IHtmlContent GenerateCheckBox(
+            ModelExplorer modelExplorer,
+            string expression,
+            bool? isChecked,
+            object htmlAttributes)
+        {
+            var checkbox = _htmlGenerator.GenerateCheckBox(
+                ViewContext,
+                modelExplorer,
+                expression,
+                isChecked,
+                htmlAttributes);
+
+            var hiddenForCheckbox = _htmlGenerator.GenerateHiddenForCheckbox(ViewContext, modelExplorer, expression);
+            if (checkbox == null || hiddenForCheckbox == null)
+            {
+                return HtmlString.Empty;
+            }
+
+            if (!hiddenForCheckbox.Attributes.ContainsKey("name") &&
+                checkbox.Attributes.TryGetValue("name", out var name))
+            {
+                // The checkbox and hidden elements should have the same name attribute value. Attributes will match
+                // if both are present because both have a generated value. Reach here in the special case where user
+                // provided a non-empty fallback name.
+                hiddenForCheckbox.MergeAttribute("name", name);
+            }
+
+            if (ViewContext.FormContext.CanRenderAtEndOfForm)
+            {
+                ViewContext.FormContext.EndOfFormContent.Add(hiddenForCheckbox);
+                return checkbox;
+            }
+
+            return new HtmlContentBuilder(capacity: 2)
+                .AppendHtml(checkbox)
+                .AppendHtml(hiddenForCheckbox);
+        }
+
+        protected virtual string GenerateDisplayName(ModelExplorer modelExplorer, string expression)
+        {
+            if (modelExplorer == null)
+            {
+                throw new ArgumentNullException(nameof(modelExplorer));
+            }
+
+            // We don't call ModelMetadata.GetDisplayName here because
+            // we want to fall back to the field name rather than the ModelType.
+            // This is similar to how the GenerateLabel get the text of a label.
+            var resolvedDisplayName = modelExplorer.Metadata.DisplayName ?? modelExplorer.Metadata.PropertyName;
+            if (resolvedDisplayName == null && expression != null)
+            {
+                var index = expression.LastIndexOf('.');
+                if (index == -1)
+                {
+                    // Expression does not contain a dot separator.
+                    resolvedDisplayName = expression;
+                }
+                else
+                {
+                    resolvedDisplayName = expression.Substring(index + 1);
+                }
+            }
+
+            return resolvedDisplayName ?? string.Empty;
+        }
+
+        protected virtual string GenerateDisplayText(ModelExplorer modelExplorer)
+        {
+            return modelExplorer.GetSimpleDisplayText() ?? string.Empty;
+        }
+
+        protected IHtmlContent GenerateDropDown(
+            ModelExplorer modelExplorer,
+            string expression,
+            IEnumerable<SelectListItem> selectList,
+            string optionLabel,
+            object htmlAttributes)
+        {
+            var tagBuilder = _htmlGenerator.GenerateSelect(
+                ViewContext,
+                modelExplorer,
+                optionLabel,
+                expression,
+                selectList,
+                allowMultiple: false,
+                htmlAttributes: htmlAttributes);
+            if (tagBuilder == null)
+            {
+                return HtmlString.Empty;
+            }
+
+            return tagBuilder;
+        }
+
+        protected virtual IHtmlContent GenerateEditor(
+            ModelExplorer modelExplorer,
+            string htmlFieldName,
+            string templateName,
+            object additionalViewData)
+        {
+            var templateBuilder = new TemplateBuilder(
+                _viewEngine,
+                _bufferScope,
+                ViewContext,
+                ViewData,
+                modelExplorer,
+                htmlFieldName,
+                templateName,
+                readOnly: false,
+                additionalViewData: additionalViewData);
+
+            return templateBuilder.Build();
+        }
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. When the user submits the form, the action with name
+        /// <paramref name="actionName"/> will process the request.
+        /// </summary>
+        /// <param name="actionName">The name of the action method.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the route parameters.
+        /// </param>
+        /// <param name="method">The HTTP method for processing the form, either GET or POST.</param>
+        /// <param name="antiforgery">
+        /// If <c>true</c>, &lt;form&gt; elements will include an antiforgery token.
+        /// If <c>false</c>, suppresses the generation an &lt;input&gt; of type "hidden" with an antiforgery token.
+        /// If <c>null</c>, &lt;form&gt; elements will include an antiforgery token only if
+        /// <paramref name="method"/> is not <see cref="FormMethod.Get"/>.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        protected virtual MvcForm GenerateForm(
+            string actionName,
+            string controllerName,
+            object routeValues,
+            FormMethod method,
+            bool? antiforgery,
+            object htmlAttributes)
+        {
+            var tagBuilder = _htmlGenerator.GenerateForm(
+                ViewContext,
+                actionName,
+                controllerName,
+                routeValues,
+                GetFormMethodString(method),
+                htmlAttributes);
+            if (tagBuilder != null)
+            {
+                tagBuilder.TagRenderMode = TagRenderMode.StartTag;
+                tagBuilder.WriteTo(ViewContext.Writer, _htmlEncoder);
+            }
+
+            var shouldGenerateAntiforgery = antiforgery ?? method != FormMethod.Get;
+            if (shouldGenerateAntiforgery)
+            {
+                ViewContext.FormContext.EndOfFormContent.Add(_htmlGenerator.GenerateAntiforgery(ViewContext));
+            }
+
+            return CreateForm();
+        }
+
+        /// <summary>
+        /// Renders a &lt;form&gt; start tag to the response. The route with name <paramref name="routeName"/>
+        /// generates the &lt;form&gt;'s <c>action</c> attribute value.
+        /// </summary>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the route parameters.
+        /// </param>
+        /// <param name="method">The HTTP method for processing the form, either GET or POST.</param>
+        /// <param name="antiforgery">
+        /// If <c>true</c>, &lt;form&gt; elements will include an antiforgery token.
+        /// If <c>false</c>, suppresses the generation an &lt;input&gt; of type "hidden" with an antiforgery token.
+        /// If <c>null</c>, &lt;form&gt; elements will include an antiforgery token only if
+        /// <paramref name="method"/> is not <see cref="FormMethod.Get"/>.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>
+        /// An <see cref="MvcForm"/> instance which renders the &lt;/form&gt; end tag when disposed.
+        /// </returns>
+        /// <remarks>
+        /// In this context, "renders" means the method writes its output using <see cref="ViewContext.Writer"/>.
+        /// </remarks>
+        protected virtual MvcForm GenerateRouteForm(
+            string routeName,
+            object routeValues,
+            FormMethod method,
+            bool? antiforgery,
+            object htmlAttributes)
+        {
+            var tagBuilder = _htmlGenerator.GenerateRouteForm(
+                ViewContext,
+                routeName,
+                routeValues,
+                GetFormMethodString(method),
+                htmlAttributes);
+            if (tagBuilder != null)
+            {
+                tagBuilder.TagRenderMode = TagRenderMode.StartTag;
+                tagBuilder.WriteTo(ViewContext.Writer, _htmlEncoder);
+            }
+
+            var shouldGenerateAntiforgery = antiforgery ?? method != FormMethod.Get;
+            if (shouldGenerateAntiforgery)
+            {
+                ViewContext.FormContext.EndOfFormContent.Add(_htmlGenerator.GenerateAntiforgery(ViewContext));
+            }
+
+            return CreateForm();
+        }
+
+        protected virtual IHtmlContent GenerateHidden(
+            ModelExplorer modelExplorer,
+            string expression,
+            object value,
+            bool useViewData,
+            object htmlAttributes)
+        {
+            var tagBuilder = _htmlGenerator.GenerateHidden(
+                ViewContext,
+                modelExplorer,
+                expression,
+                value,
+                useViewData,
+                htmlAttributes);
+            if (tagBuilder == null)
+            {
+                return HtmlString.Empty;
+            }
+
+            return tagBuilder;
+        }
+
+        protected virtual string GenerateId(string expression)
+        {
+            var fullName = NameAndIdProvider.GetFullHtmlFieldName(ViewContext, expression);
+
+            return GenerateIdFromName(fullName);
+        }
+
+        protected virtual IHtmlContent GenerateLabel(
+            ModelExplorer modelExplorer,
+            string expression,
+            string labelText,
+            object htmlAttributes)
+        {
+            if (modelExplorer == null)
+            {
+                throw new ArgumentNullException(nameof(modelExplorer));
+            }
+
+            var tagBuilder = _htmlGenerator.GenerateLabel(
+                ViewContext,
+                modelExplorer,
+                expression,
+                labelText,
+                htmlAttributes);
+            if (tagBuilder == null)
+            {
+                return HtmlString.Empty;
+            }
+
+            // Do not generate an empty <label> element unless user passed string.Empty for the label text. This is
+            // primarily done for back-compatibility. (Note HtmlContentBuilder ignores (no-ops) an attempt to add
+            // string.Empty. So tagBuilder.HasInnerHtml isn't sufficient here.)
+            if (!tagBuilder.HasInnerHtml && labelText == null)
+            {
+                if (tagBuilder.Attributes.Count == 0)
+                {
+                    // Element has no content and no attributes.
+                    return HtmlString.Empty;
+                }
+                else if (tagBuilder.Attributes.Count == 1 &&
+                    tagBuilder.Attributes.TryGetValue("for", out var forAttribute) &&
+                    string.IsNullOrEmpty(forAttribute))
+                {
+                    // Element has no content and only an empty (therefore useless) "for" attribute.
+                    return HtmlString.Empty;
+                }
+            }
+
+            return tagBuilder;
+        }
+
+        protected IHtmlContent GenerateListBox(
+            ModelExplorer modelExplorer,
+            string expression,
+            IEnumerable<SelectListItem> selectList,
+            object htmlAttributes)
+        {
+            var tagBuilder = _htmlGenerator.GenerateSelect(
+                ViewContext,
+                modelExplorer,
+                optionLabel: null,
+                expression: expression,
+                selectList: selectList,
+                allowMultiple: true,
+                htmlAttributes: htmlAttributes);
+            if (tagBuilder == null)
+            {
+                return HtmlString.Empty;
+            }
+
+            return tagBuilder;
+        }
+
+        protected virtual string GenerateName(string expression)
+        {
+            var fullName = NameAndIdProvider.GetFullHtmlFieldName(ViewContext, expression);
+            return fullName;
+        }
+
+        protected virtual IHtmlContent GeneratePassword(
+            ModelExplorer modelExplorer,
+            string expression,
+            object value,
+            object htmlAttributes)
+        {
+            var tagBuilder = _htmlGenerator.GeneratePassword(
+                ViewContext,
+                modelExplorer,
+                expression,
+                value,
+                htmlAttributes);
+            if (tagBuilder == null)
+            {
+                return HtmlString.Empty;
+            }
+
+            return tagBuilder;
+        }
+
+        protected virtual IHtmlContent GenerateRadioButton(
+            ModelExplorer modelExplorer,
+            string expression,
+            object value,
+            bool? isChecked,
+            object htmlAttributes)
+        {
+            var tagBuilder = _htmlGenerator.GenerateRadioButton(
+                ViewContext,
+                modelExplorer,
+                expression,
+                value,
+                isChecked,
+                htmlAttributes);
+            if (tagBuilder == null)
+            {
+                return HtmlString.Empty;
+            }
+
+            return tagBuilder;
+        }
+
+        protected virtual IHtmlContent GenerateTextArea(
+            ModelExplorer modelExplorer,
+            string expression,
+            int rows,
+            int columns,
+            object htmlAttributes)
+        {
+            var tagBuilder = _htmlGenerator.GenerateTextArea(
+                ViewContext,
+                modelExplorer,
+                expression,
+                rows,
+                columns,
+                htmlAttributes);
+            if (tagBuilder == null)
+            {
+                return HtmlString.Empty;
+            }
+
+            return tagBuilder;
+        }
+
+        protected virtual IHtmlContent GenerateTextBox(
+            ModelExplorer modelExplorer,
+            string expression,
+            object value,
+            string format,
+            object htmlAttributes)
+        {
+            var tagBuilder = _htmlGenerator.GenerateTextBox(
+                ViewContext,
+                modelExplorer,
+                expression,
+                value,
+                format,
+                htmlAttributes);
+            if (tagBuilder == null)
+            {
+                return HtmlString.Empty;
+            }
+
+            return tagBuilder;
+        }
+
+        protected virtual IHtmlContent GenerateValidationMessage(
+            ModelExplorer modelExplorer,
+            string expression,
+            string message,
+            string tag,
+            object htmlAttributes)
+        {
+            var tagBuilder = _htmlGenerator.GenerateValidationMessage(
+                ViewContext,
+                modelExplorer,
+                expression,
+                message,
+                tag,
+                htmlAttributes);
+            if (tagBuilder == null)
+            {
+                return HtmlString.Empty;
+            }
+
+            return tagBuilder;
+        }
+
+        protected virtual IHtmlContent GenerateValidationSummary(
+            bool excludePropertyErrors,
+            string message,
+            object htmlAttributes,
+            string tag)
+        {
+            var tagBuilder = _htmlGenerator.GenerateValidationSummary(
+                ViewContext,
+                excludePropertyErrors,
+                message,
+                headerTag: tag,
+                htmlAttributes: htmlAttributes);
+            if (tagBuilder == null)
+            {
+                return HtmlString.Empty;
+            }
+
+            return tagBuilder;
+        }
+
+        protected virtual string GenerateValue(string expression, object value, string format, bool useViewData)
+        {
+            var fullName = NameAndIdProvider.GetFullHtmlFieldName(ViewContext, expression);
+            var attemptedValue =
+                (string)DefaultHtmlGenerator.GetModelStateValue(ViewContext, fullName, typeof(string));
+
+            string resolvedValue;
+            if (attemptedValue != null)
+            {
+                // case 1: if ModelState has a value then it's already formatted so ignore format string
+                resolvedValue = attemptedValue;
+            }
+            else if (useViewData)
+            {
+                // case 2: format the value from ViewData
+                resolvedValue = DefaultHtmlGenerator.EvalString(ViewContext, expression, format);
+            }
+            else
+            {
+                // case 3: format the explicit value from ModelMetadata
+                resolvedValue = FormatValue(value, format);
+            }
+
+            return resolvedValue;
+        }
+
+        /// <summary>
+        /// Returns a select list for the given <paramref name="metadata"/>.
+        /// </summary>
+        /// <param name="metadata"><see cref="ModelMetadata"/> to generate a select list for.</param>
+        /// <returns>
+        /// An <see cref="IEnumerable{SelectListItem}"/> containing the select list for the given
+        /// <paramref name="metadata"/>.
+        /// </returns>
+        /// <exception cref="ArgumentException">
+        /// Thrown if <paramref name="metadata"/>'s <see cref="ModelMetadata.ModelType"/> is not an <see cref="Enum"/>
+        /// or if it has a <see cref="FlagsAttribute"/>.
+        /// </exception>
+        protected virtual IEnumerable<SelectListItem> GetEnumSelectList(ModelMetadata metadata)
+        {
+            if (metadata == null)
+            {
+                throw new ArgumentNullException(nameof(metadata));
+            }
+
+            if (!metadata.IsEnum || metadata.IsFlagsEnum)
+            {
+                var message = Resources.FormatHtmlHelper_TypeNotSupported_ForGetEnumSelectList(
+                    metadata.ModelType.FullName,
+                    nameof(Enum).ToLowerInvariant(),
+                    nameof(FlagsAttribute));
+                throw new ArgumentException(message, nameof(metadata));
+            }
+
+            var selectList = new List<SelectListItem>();
+            var groupList = new Dictionary<string, SelectListGroup>();
+            foreach (var keyValuePair in metadata.EnumGroupedDisplayNamesAndValues)
+            {
+                var selectListItem = new SelectListItem
+                {
+                    Text = keyValuePair.Key.Name,
+                    Value = keyValuePair.Value,
+                };
+
+                if (!string.IsNullOrEmpty(keyValuePair.Key.Group))
+                {
+                    if (!groupList.ContainsKey(keyValuePair.Key.Group))
+                    {
+                        groupList[keyValuePair.Key.Group] = new SelectListGroup() { Name = keyValuePair.Key.Group };
+                    }
+
+                    selectListItem.Group = groupList[keyValuePair.Key.Group];
+                }
+
+                selectList.Add(selectListItem);
+            }
+
+            return selectList;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOfT.cs
new file mode 100644
index 0000000000..833a271740
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOfT.cs
@@ -0,0 +1,434 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class HtmlHelper<TModel> : HtmlHelper, IHtmlHelper<TModel>
+    {
+        private readonly ExpressionTextCache _expressionTextCache;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HtmlHelper{TModel}"/> class.
+        /// </summary>
+        public HtmlHelper(
+            IHtmlGenerator htmlGenerator,
+            ICompositeViewEngine viewEngine,
+            IModelMetadataProvider metadataProvider,
+            IViewBufferScope bufferScope,
+            HtmlEncoder htmlEncoder,
+            UrlEncoder urlEncoder,
+            ExpressionTextCache expressionTextCache)
+            : base(
+                  htmlGenerator,
+                  viewEngine,
+                  metadataProvider,
+                  bufferScope,
+                  htmlEncoder,
+                  urlEncoder)
+        {
+            if (expressionTextCache == null)
+            {
+                throw new ArgumentNullException(nameof(expressionTextCache));
+            }
+
+            _expressionTextCache = expressionTextCache;
+        }
+
+        /// <inheritdoc />
+        public new ViewDataDictionary<TModel> ViewData { get; private set; }
+
+        public override void Contextualize(ViewContext viewContext)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            if (viewContext.ViewData == null)
+            {
+                throw new ArgumentException(Resources.FormatPropertyOfTypeCannotBeNull(
+                        nameof(ViewContext.ViewData),
+                        typeof(ViewContext)),
+                    nameof(viewContext));
+            }
+
+            ViewData = viewContext.ViewData as ViewDataDictionary<TModel>;
+
+            if (ViewData == null)
+            {
+                // The view data that we have at this point might be of a more derived type than the one defined at compile time.
+                // For example ViewDataDictionary<Derived> where our TModel is Base and Derived : Base.
+                // This can't happen for regular views, but it can happen in razor pages if someone modified the model type through
+                // the page application model.
+                // In that case, we check if the type of the current view data, 'ViewDataDictionary<TRuntime>' is "covariant" with the
+                // one defined at compile time 'ViewDataDictionary<TCompile>'
+                var runtimeType = viewContext.ViewData.ModelMetadata.ModelType;
+                if (runtimeType != null && typeof(TModel) != runtimeType && typeof(TModel).IsAssignableFrom(runtimeType))
+                {
+                    ViewData = new ViewDataDictionary<TModel>(viewContext.ViewData, viewContext.ViewData.Model);
+                }
+            }
+
+            if (ViewData == null)
+            {
+                // viewContext may contain a base ViewDataDictionary instance. So complain about that type, not TModel.
+                throw new ArgumentException(Resources.FormatArgumentPropertyUnexpectedType(
+                        nameof(ViewContext.ViewData),
+                        viewContext.ViewData.GetType().FullName,
+                        typeof(ViewDataDictionary<TModel>).FullName),
+                    nameof(viewContext));
+            }
+
+            base.Contextualize(viewContext);
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent CheckBoxFor(
+            Expression<Func<TModel, bool>> expression,
+            object htmlAttributes)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            var modelExplorer = GetModelExplorer(expression);
+            return GenerateCheckBox(
+                modelExplorer,
+                GetExpressionName(expression),
+                isChecked: null,
+                htmlAttributes: htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent DropDownListFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            IEnumerable<SelectListItem> selectList,
+            string optionLabel,
+            object htmlAttributes)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            var modelExplorer = GetModelExplorer(expression);
+            return GenerateDropDown(
+                modelExplorer,
+                GetExpressionName(expression),
+                selectList,
+                optionLabel,
+                htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent DisplayFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            string templateName,
+            string htmlFieldName,
+            object additionalViewData)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            var modelExplorer = GetModelExplorer(expression);
+            return GenerateDisplay(
+                modelExplorer,
+                htmlFieldName ?? GetExpressionName(expression),
+                templateName,
+                additionalViewData);
+        }
+
+        /// <inheritdoc />
+        public string DisplayNameFor<TResult>(Expression<Func<TModel, TResult>> expression)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            var modelExplorer = GetModelExplorer(expression);
+            return GenerateDisplayName(modelExplorer, GetExpressionName(expression));
+        }
+
+        /// <inheritdoc />
+        public string DisplayNameForInnerType<TModelItem, TResult>(
+            Expression<Func<TModelItem, TResult>> expression)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            var modelExplorer = ExpressionMetadataProvider.FromLambdaExpression<TModelItem, TResult>(
+                expression,
+                new ViewDataDictionary<TModelItem>(ViewData, model: null),
+                MetadataProvider);
+
+            var expressionText = ExpressionHelper.GetExpressionText(expression, _expressionTextCache);
+            if (modelExplorer == null)
+            {
+                throw new InvalidOperationException(Resources.FormatHtmlHelper_NullModelMetadata(expressionText));
+            }
+
+            return GenerateDisplayName(modelExplorer, expressionText);
+        }
+
+        /// <inheritdoc />
+        public string DisplayTextFor<TResult>(Expression<Func<TModel, TResult>> expression)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return GenerateDisplayText(GetModelExplorer(expression));
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent EditorFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            string templateName,
+            string htmlFieldName,
+            object additionalViewData)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            var modelExplorer = GetModelExplorer(expression);
+            return GenerateEditor(
+                modelExplorer,
+                htmlFieldName ?? GetExpressionName(expression),
+                templateName,
+                additionalViewData);
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent HiddenFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            object htmlAttributes)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            var modelExplorer = GetModelExplorer(expression);
+            return GenerateHidden(
+                modelExplorer,
+                GetExpressionName(expression),
+                modelExplorer.Model,
+                useViewData: false,
+                htmlAttributes: htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public string IdFor<TResult>(Expression<Func<TModel, TResult>> expression)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return GenerateId(GetExpressionName(expression));
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent LabelFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            string labelText,
+            object htmlAttributes)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            var modelExplorer = GetModelExplorer(expression);
+            return GenerateLabel(modelExplorer, GetExpressionName(expression), labelText, htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent ListBoxFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            IEnumerable<SelectListItem> selectList,
+            object htmlAttributes)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            var modelExplorer = GetModelExplorer(expression);
+            var name = GetExpressionName(expression);
+
+            return GenerateListBox(modelExplorer, name, selectList, htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public string NameFor<TResult>(Expression<Func<TModel, TResult>> expression)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            var expressionName = GetExpressionName(expression);
+            return Name(expressionName);
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent PasswordFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            object htmlAttributes)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            var modelExplorer = GetModelExplorer(expression);
+            return GeneratePassword(
+                modelExplorer,
+                GetExpressionName(expression),
+                value: null,
+                htmlAttributes: htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent RadioButtonFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            object value,
+            object htmlAttributes)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            if (value == null)
+            {
+                throw new ArgumentNullException(nameof(value));
+            }
+
+            var modelExplorer = GetModelExplorer(expression);
+            return GenerateRadioButton(
+                modelExplorer,
+                GetExpressionName(expression),
+                value,
+                isChecked: null,
+                htmlAttributes: htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent TextAreaFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            int rows,
+            int columns,
+            object htmlAttributes)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            var modelExplorer = GetModelExplorer(expression);
+            return GenerateTextArea(modelExplorer, GetExpressionName(expression), rows, columns, htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent TextBoxFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            string format,
+            object htmlAttributes)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            var modelExplorer = GetModelExplorer(expression);
+            return GenerateTextBox(
+                modelExplorer,
+                GetExpressionName(expression),
+                modelExplorer.Model,
+                format,
+                htmlAttributes);
+        }
+
+        protected string GetExpressionName<TResult>(Expression<Func<TModel, TResult>> expression)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            return ExpressionHelper.GetExpressionText(expression, _expressionTextCache);
+        }
+
+        protected ModelExplorer GetModelExplorer<TResult>(Expression<Func<TModel, TResult>> expression)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            var modelExplorer =
+                ExpressionMetadataProvider.FromLambdaExpression(expression, ViewData, MetadataProvider);
+            if (modelExplorer == null)
+            {
+                var expressionName = GetExpressionName(expression);
+                throw new InvalidOperationException(Resources.FormatHtmlHelper_NullModelMetadata(expressionName));
+            }
+
+            return modelExplorer;
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent ValidationMessageFor<TResult>(
+            Expression<Func<TModel, TResult>> expression,
+            string message,
+            object htmlAttributes,
+            string tag)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            var modelExplorer = GetModelExplorer(expression);
+            return GenerateValidationMessage(
+                modelExplorer,
+                GetExpressionName(expression),
+                message,
+                tag,
+                htmlAttributes);
+        }
+
+        /// <inheritdoc />
+        public string ValueFor<TResult>(Expression<Func<TModel, TResult>> expression, string format)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            var modelExplorer = GetModelExplorer(expression);
+            return GenerateValue(GetExpressionName(expression), modelExplorer.Model, format, useViewData: false);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOptions.cs
new file mode 100644
index 0000000000..952bc7b4d9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOptions.cs
@@ -0,0 +1,60 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Provides programmatic configuration for the HTML helpers and <see cref="ViewContext"/>.
+    /// </summary>
+    public class HtmlHelperOptions
+    {
+        private string _idAttributeDotReplacement = "_";
+
+        /// <summary>
+        /// Gets or sets the <see cref="Html5DateRenderingMode.Html5DateRenderingMode"/> value.
+        /// </summary>
+        /// <remarks>
+        /// Set this property to <see cref="Html5DateRenderingMode.CurrentCulture" /> to have templated helpers such as
+        /// <see cref="IHtmlHelper.Editor" /> and <see cref="IHtmlHelper{TModel}.EditorFor" /> render date and time
+        /// values using the current culture. By default, these helpers render dates and times as RFC 3339 compliant strings.
+        /// </remarks>
+        public Html5DateRenderingMode Html5DateRenderingMode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="string"/> that replaces periods in the ID attribute of an element.
+        /// </summary>
+        public string IdAttributeDotReplacement
+        {
+            get => _idAttributeDotReplacement;
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _idAttributeDotReplacement = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value that indicates whether client-side validation is enabled.
+        /// </summary>
+        public bool ClientValidationEnabled { get; set; } = true;
+
+        /// <summary>
+        /// Gets or sets the element name used to wrap a top-level message generated by
+        /// <see cref="IHtmlHelper.ValidationMessage"/> and other overloads.
+        /// </summary>
+        public string ValidationMessageElement { get; set; } = "span";
+
+        /// <summary>
+        /// Gets or sets the element name used to wrap a top-level message generated by
+        /// <see cref="IHtmlHelper.ValidationSummary"/> and other overloads.
+        /// </summary>
+        public string ValidationSummaryMessageElement { get; set; } = "span";
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IAntiforgeryPolicy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IAntiforgeryPolicy.cs
new file mode 100644
index 0000000000..ef925a6383
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IAntiforgeryPolicy.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// A marker interface for filters which define a policy for antiforgery token validation.
+    /// </summary>
+    public interface IAntiforgeryPolicy : IFilterMetadata
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IHtmlGenerator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IHtmlGenerator.cs
new file mode 100644
index 0000000000..f0f59d4ba2
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IHtmlGenerator.cs
@@ -0,0 +1,485 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Contract for a service supporting <see cref="IHtmlHelper"/> and <c>ITagHelper</c> implementations.
+    /// </summary>
+    public interface IHtmlGenerator
+    {
+        string IdAttributeDotReplacement { get; }
+
+        string Encode(string value);
+
+        string Encode(object value);
+
+        string FormatValue(object value, string format);
+
+        /// <summary>
+        /// Generate a &lt;a&gt; element for a link to an action.
+        /// </summary>
+        /// <param name="viewContext">The <see cref="ViewContext"/> instance for the current scope.</param>
+        /// <param name="linkText">The text to insert inside the element.</param>
+        /// <param name="actionName">The name of the action method.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="protocol">The protocol (scheme) for the generated link.</param>
+        /// <param name="hostname">The hostname for the generated link.</param>
+        /// <param name="fragment">The fragment for the generated link.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the route parameters.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>
+        /// A <see cref="TagBuilder"/> instance for the &lt;a&gt; element.
+        /// </returns>
+        TagBuilder GenerateActionLink(
+            ViewContext viewContext,
+            string linkText,
+            string actionName,
+            string controllerName,
+            string protocol,
+            string hostname,
+            string fragment,
+            object routeValues,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Generate a &lt;a&gt; element for a link to an action.
+        /// </summary>
+        /// <param name="viewContext">The <see cref="ViewContext"/> instance for the current scope.</param>
+        /// <param name="linkText">The text to insert inside the element.</param>
+        /// <param name="pageName">The page name.</param>
+        /// <param name="pageHandler">The page handler.</param>
+        /// <param name="protocol">The protocol (scheme) for the generated link.</param>
+        /// <param name="hostname">The hostname for the generated link.</param>
+        /// <param name="fragment">The fragment for the generated link.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the route parameters.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>
+        /// A <see cref="TagBuilder"/> instance for the &lt;a&gt; element.
+        /// </returns>
+        TagBuilder GeneratePageLink(
+            ViewContext viewContext,
+            string linkText,
+            string pageName,
+            string pageHandler,
+            string protocol,
+            string hostname,
+            string fragment,
+            object routeValues,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Generate an &lt;input type="hidden".../&gt; element containing an antiforgery token.
+        /// </summary>
+        /// <param name="viewContext">The <see cref="ViewContext"/> instance for the current scope.</param>
+        /// <returns>
+        /// An <see cref="IHtmlContent"/> instance for the &lt;input type="hidden".../&gt; element. Intended to be used
+        /// inside a &lt;form&gt; element.
+        /// </returns>
+        IHtmlContent GenerateAntiforgery(ViewContext viewContext);
+
+        /// <summary>
+        /// Generate a &lt;input type="checkbox".../&gt; element.
+        /// </summary>
+        /// <param name="viewContext">The <see cref="ViewContext"/> instance for the current scope.</param>
+        /// <param name="modelExplorer">The <see cref="ModelExplorer"/> for the <paramref name="expression"/>.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="isChecked">The initial state of the checkbox element.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>
+        /// A <see cref="TagBuilder"/> instance for the &lt;input type="checkbox".../&gt; element.
+        /// </returns>
+        TagBuilder GenerateCheckBox(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string expression,
+            bool? isChecked,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Generate an additional &lt;input type="hidden".../&gt; for checkboxes. This addresses scenarios where
+        /// unchecked checkboxes are not sent in the request. Sending a hidden input makes it possible to know that the
+        /// checkbox was present on the page when the request was submitted.
+        /// </summary>
+        TagBuilder GenerateHiddenForCheckbox(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string expression);
+
+        /// <summary>
+        /// Generate a &lt;form&gt; element. When the user submits the form, the action with name
+        /// <paramref name="actionName"/> will process the request.
+        /// </summary>
+        /// <param name="viewContext">A <see cref="ViewContext"/> instance for the current scope.</param>
+        /// <param name="actionName">The name of the action method.</param>
+        /// <param name="controllerName">The name of the controller.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the route parameters.
+        /// </param>
+        /// <param name="method">The HTTP method for processing the form, either GET or POST.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>
+        /// A <see cref="TagBuilder"/> instance for the &lt;/form&gt; element.
+        /// </returns>
+        TagBuilder GenerateForm(
+            ViewContext viewContext,
+            string actionName,
+            string controllerName,
+            object routeValues,
+            string method,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Generate a &lt;form&gt; element. When the user submits the form, the page with name
+        /// <paramref name="pageName"/> will process the request.
+        /// </summary>
+        /// <param name="viewContext">A <see cref="ViewContext"/> instance for the current scope.</param>
+        /// <param name="pageName">The name of the page.</param>
+        /// <param name="pageHandler">The page handler to generate a form for.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the route parameters.
+        /// </param>
+        /// <param name="fragment">The url fragment.</param>
+        /// <param name="method">The HTTP method for processing the form, either GET or POST.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>
+        /// A <see cref="TagBuilder"/> instance for the &lt;/form&gt; element.
+        /// </returns>
+        TagBuilder GeneratePageForm(
+            ViewContext viewContext,
+            string pageName,
+            string pageHandler,
+            object routeValues,
+            string fragment,
+            string method,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Generate a &lt;form&gt; element. The route with name <paramref name="routeName"/> generates the
+        /// &lt;form&gt;'s <c>action</c> attribute value.
+        /// </summary>
+        /// <param name="viewContext">A <see cref="ViewContext"/> instance for the current scope.</param>
+        /// <param name="routeName">The name of the route.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the route parameters.
+        /// </param>
+        /// <param name="method">The HTTP method for processing the form, either GET or POST.</param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>
+        /// A <see cref="TagBuilder"/> instance for the &lt;/form&gt; element.
+        /// </returns>
+        TagBuilder GenerateRouteForm(
+            ViewContext viewContext,
+            string routeName,
+            object routeValues,
+            string method,
+            object htmlAttributes);
+
+        TagBuilder GenerateHidden(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string expression,
+            object value,
+            bool useViewData,
+            object htmlAttributes);
+
+        TagBuilder GenerateLabel(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string expression,
+            string labelText,
+            object htmlAttributes);
+
+        TagBuilder GeneratePassword(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string expression,
+            object value,
+            object htmlAttributes);
+
+        TagBuilder GenerateRadioButton(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string expression,
+            object value,
+            bool? isChecked,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Generate a &lt;a&gt; element for a link to an action.
+        /// </summary>
+        /// <param name="viewContext">The <see cref="ViewContext"/> instance for the current scope.</param>
+        /// <param name="linkText">The text to insert inside the element.</param>
+        /// <param name="routeName">The name of the route to use for link generation.</param>
+        /// <param name="protocol">The protocol (scheme) for the generated link.</param>
+        /// <param name="hostName">The hostname for the generated link.</param>
+        /// <param name="fragment">The fragment for the generated link.</param>
+        /// <param name="routeValues">
+        /// An <see cref="object"/> that contains the parameters for a route. The parameters are retrieved through
+        /// reflection by examining the properties of the <see cref="object"/>. This <see cref="object"/> is typically
+        /// created using <see cref="object"/> initializer syntax. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the route parameters.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>
+        /// A <see cref="TagBuilder"/> instance for the &lt;a&gt; element.
+        /// </returns>
+        TagBuilder GenerateRouteLink(
+            ViewContext viewContext,
+            string linkText,
+            string routeName,
+            string protocol,
+            string hostName,
+            string fragment,
+            object routeValues,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Generate a &lt;select&gt; element for the <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="viewContext">A <see cref="ViewContext"/> instance for the current scope.</param>
+        /// <param name="modelExplorer">
+        /// <see cref="ModelExplorer"/> for the <paramref name="expression"/>. If <c>null</c>, determines validation
+        /// attributes using <paramref name="viewContext"/> and the <paramref name="expression"/>.
+        /// </param>
+        /// <param name="optionLabel">Optional text for a default empty &lt;option&gt; element.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="selectList">
+        /// A collection of <see cref="SelectListItem"/> objects used to populate the &lt;select&gt; element with
+        /// &lt;optgroup&gt; and &lt;option&gt; elements. If <c>null</c>, finds this collection at
+        /// <c>ViewContext.ViewData[expression]</c>.
+        /// </param>
+        /// <param name="allowMultiple">
+        /// If <c>true</c>, includes a <c>multiple</c> attribute in the generated HTML. Otherwise generates a
+        /// single-selection &lt;select&gt; element.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the &lt;select&gt; element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>A new <see cref="TagBuilder"/> describing the &lt;select&gt; element.</returns>
+        /// <remarks>
+        /// <para>
+        /// Combines <see cref="TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;select&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </para>
+        /// <para>
+        /// See <see cref="GetCurrentValues"/> for information about how current values are determined.
+        /// </para>
+        /// </remarks>
+        TagBuilder GenerateSelect(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string optionLabel,
+            string expression,
+            IEnumerable<SelectListItem> selectList,
+            bool allowMultiple,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Generate a &lt;select&gt; element for the <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="viewContext">A <see cref="ViewContext"/> instance for the current scope.</param>
+        /// <param name="modelExplorer">
+        /// <see cref="ModelExplorer"/> for the <paramref name="expression"/>. If <c>null</c>, determines validation
+        /// attributes using <paramref name="viewContext"/> and the <paramref name="expression"/>.
+        /// </param>
+        /// <param name="optionLabel">Optional text for a default empty &lt;option&gt; element.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="selectList">
+        /// A collection of <see cref="SelectListItem"/> objects used to populate the &lt;select&gt; element with
+        /// &lt;optgroup&gt; and &lt;option&gt; elements. If <c>null</c>, finds this collection at
+        /// <c>ViewContext.ViewData[expression]</c>.
+        /// </param>
+        /// <param name="currentValues">
+        /// An <see cref="ICollection{String}"/> containing values for &lt;option&gt; elements to select. If
+        /// <c>null</c>, selects &lt;option&gt; elements based on <see cref="SelectListItem.Selected"/> values in
+        /// <paramref name="selectList"/>.
+        /// </param>
+        /// <param name="allowMultiple">
+        /// If <c>true</c>, includes a <c>multiple</c> attribute in the generated HTML. Otherwise generates a
+        /// single-selection &lt;select&gt; element.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the &lt;select&gt; element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>A new <see cref="TagBuilder"/> describing the &lt;select&gt; element.</returns>
+        /// <remarks>
+        /// <para>
+        /// Combines <see cref="TemplateInfo.HtmlFieldPrefix"/> and <paramref name="expression"/> to set
+        /// &lt;select&gt; element's "name" attribute. Sanitizes <paramref name="expression"/> to set element's "id"
+        /// attribute.
+        /// </para>
+        /// <para>
+        /// See <see cref="GetCurrentValues"/> for information about how the <paramref name="currentValues"/>
+        /// collection may be created.
+        /// </para>
+        /// </remarks>
+        TagBuilder GenerateSelect(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string optionLabel,
+            string expression,
+            IEnumerable<SelectListItem> selectList,
+            ICollection<string> currentValues,
+            bool allowMultiple,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Generates &lt;optgroup&gt; and &lt;option&gt; elements.
+        /// </summary>
+        /// <param name="optionLabel">Optional text for a default empty &lt;option&gt; element.</param>
+        /// <param name="selectList">
+        /// A collection of <see cref="SelectListItem"/> objects used to generate &lt;optgroup&gt; and &lt;option&gt;
+        /// elements.
+        /// </param>
+        /// <returns>
+        /// An <see cref="IHtmlContent"/> instance for &lt;optgroup&gt; and &lt;option&gt; elements.
+        /// </returns>
+        IHtmlContent GenerateGroupsAndOptions(string optionLabel, IEnumerable<SelectListItem> selectList);
+
+        TagBuilder GenerateTextArea(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string expression,
+            int rows,
+            int columns,
+            object htmlAttributes);
+
+        TagBuilder GenerateTextBox(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string expression,
+            object value,
+            string format,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Generate a <paramref name="tag"/> element if the <paramref name="viewContext"/>'s
+        /// <see cref="ActionContext.ModelState"/> contains an error for the <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="viewContext">A <see cref="ViewContext"/> instance for the current scope.</param>
+        /// <param name="modelExplorer">The <see cref="ModelExplorer"/> for the <paramref name="expression"/>.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="message">
+        /// The message to be displayed. If <c>null</c> or empty, method extracts an error string from the
+        /// <see cref="ModelBinding.ModelStateDictionary"/> object. Message will always be visible but client-side
+        /// validation may update the associated CSS class.
+        /// </param>
+        /// <param name="tag">
+        /// The tag to wrap the <paramref name="message"/> in the generated HTML. Its default value is
+        /// <see cref="ViewContext.ValidationMessageElement"/>.
+        /// </param>
+        /// <param name="htmlAttributes">
+        /// An <see cref="object"/> that contains the HTML attributes for the element. Alternatively, an
+        /// <see cref="IDictionary{String, Object}"/> instance containing the HTML attributes.
+        /// </param>
+        /// <returns>
+        /// A <see cref="TagBuilder"/> containing a <paramref name="tag"/> element if the
+        /// <paramref name="viewContext"/>'s <see cref="ActionContext.ModelState"/> contains an error for the
+        /// <paramref name="expression"/> or (as a placeholder) if client-side validation is enabled. <c>null</c> if
+        /// the <paramref name="expression"/> is valid and client-side validation is disabled.
+        /// </returns>
+        /// <remarks><see cref="ViewContext.ValidationMessageElement"/> is <c>"span"</c> by default.</remarks>
+        TagBuilder GenerateValidationMessage(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string expression,
+            string message,
+            string tag,
+            object htmlAttributes);
+
+        TagBuilder GenerateValidationSummary(
+            ViewContext viewContext,
+            bool excludePropertyErrors,
+            string message,
+            string headerTag,
+            object htmlAttributes);
+
+        /// <summary>
+        /// Gets the collection of current values for the given <paramref name="expression"/>.
+        /// </summary>
+        /// <param name="viewContext">A <see cref="ViewContext"/> instance for the current scope.</param>
+        /// <param name="modelExplorer">
+        /// <see cref="ModelExplorer"/> for the <paramref name="expression"/>. If <c>null</c>, calculates the
+        /// <paramref name="expression"/> result using <see cref="ViewDataDictionary.Eval(string)"/>.
+        /// </param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="allowMultiple">
+        /// If <c>true</c>, require a collection <paramref name="expression"/> result. Otherwise, treat result as a
+        /// single value.
+        /// </param>
+        /// <returns>
+        /// <para>
+        /// <c>null</c> if no <paramref name="expression"/> result is found. Otherwise a
+        /// <see cref="ICollection{String}"/> containing current values for the given
+        /// <paramref name="expression"/>.
+        /// </para>
+        /// <para>
+        /// Converts the <paramref name="expression"/> result to a <see cref="string"/>. If that result is an
+        /// <see cref="System.Collections.IEnumerable"/> type, instead converts each item in the collection and returns
+        /// them separately.
+        /// </para>
+        /// <para>
+        /// If the <paramref name="expression"/> result or the element type is an <see cref="System.Enum"/>, returns a
+        /// <see cref="string"/> containing the integer representation of the <see cref="System.Enum"/> value as well
+        /// as all <see cref="System.Enum"/> names for that value. Otherwise returns the default <see cref="string"/>
+        /// conversion of the value.
+        /// </para>
+        /// </returns>
+        /// <remarks>
+        /// See <see cref="M:GenerateSelect"/> for information about how the return value may be used.
+        /// </remarks>
+        ICollection<string> GetCurrentValues(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string expression,
+            bool allowMultiple);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IModelExpressionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IModelExpressionProvider.cs
new file mode 100644
index 0000000000..93f6002eb0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IModelExpressionProvider.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using System;
+using System.Linq.Expressions;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Provides <see cref="ModelExpression"/> for a Lambda expression.
+    /// </summary>
+    public interface IModelExpressionProvider
+    {
+        /// <summary>
+        /// Returns a <see cref="ModelExpression"/> instance describing the given <paramref name="expression"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the <paramref name="viewData"/>'s <see cref="ViewDataDictionary{T}.Model"/>.</typeparam>
+        /// <typeparam name="TValue">The type of the <paramref name="expression"/> result.</typeparam>
+        /// <param name="viewData">The <see cref="ViewDataDictionary{TModel}"/> containing the <see cref="ViewDataDictionary{T}.Model"/> 
+        /// against which <paramref name="expression"/> is evaluated. </param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <returns>A new <see cref="ModelExpression"/> instance describing the given <paramref name="expression"/>.</returns>
+        ModelExpression CreateModelExpression<TModel, TValue>(
+            ViewDataDictionary<TModel> viewData,
+            Expression<Func<TModel, TValue>> expression);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ITempDataDictionary.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ITempDataDictionary.cs
new file mode 100644
index 0000000000..3b40c43407
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ITempDataDictionary.cs
@@ -0,0 +1,42 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Represents a set of data that persists only from one request to the next.
+    /// </summary>
+    public interface ITempDataDictionary : IDictionary<string, object>
+    {
+        /// <summary>
+        /// Loads the dictionary by using the registered <see cref="ITempDataProvider"/>.
+        /// </summary>
+        void Load();
+
+        /// <summary>
+        /// Saves the dictionary by using the registered <see cref="ITempDataProvider"/>.
+        /// </summary>
+        void Save();
+
+        /// <summary>
+        /// Marks all keys in the dictionary for retention.
+        /// </summary>
+        void Keep();
+
+        /// <summary>
+        /// Marks the specified key in the dictionary for retention.
+        /// </summary>
+        /// <param name="key">The key to retain in the dictionary.</param>
+        void Keep(string key);
+
+        /// <summary>
+        /// Returns an object that contains the element that is associated with the specified key,
+        /// without marking the key for deletion.
+        /// </summary>
+        /// <param name="key">The key of the element to return.</param>
+        /// <returns>An object that contains the element that is associated with the specified key.</returns>
+        object Peek(string key);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ITempDataDictionaryFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ITempDataDictionaryFactory.cs
new file mode 100644
index 0000000000..6513695e5b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ITempDataDictionaryFactory.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// A factory which provides access to an <see cref="ITempDataDictionary"/> instance
+    /// for a request.
+    /// </summary>
+    public interface ITempDataDictionaryFactory
+    {
+        /// <summary>
+        /// Gets or creates an <see cref="ITempDataDictionary"/> instance for the request associated with the
+        /// given <paramref name="context"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="HttpContext"/>.</param>
+        /// <returns>
+        /// An <see cref="ITempDataDictionary"/> instance for the request associated with the given
+        /// <paramref name="context"/>.
+        /// </returns>
+        ITempDataDictionary GetTempData(HttpContext context);
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ITempDataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ITempDataProvider.cs
new file mode 100644
index 0000000000..2ebfa3eb96
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ITempDataProvider.cs
@@ -0,0 +1,28 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Defines the contract for temporary-data providers that store data that is viewed on the next request.
+    /// </summary>
+    public interface ITempDataProvider
+    {
+        /// <summary>
+        /// Loads the temporary data.
+        /// </summary>
+        /// <param name="context">The <see cref="HttpContext"/>.</param>
+        /// <returns>The temporary data.</returns>
+        IDictionary<string, object> LoadTempData(HttpContext context);
+
+        /// <summary>
+        /// Saves the temporary data.
+        /// </summary>
+        /// <param name="context">The <see cref="HttpContext"/>.</param>
+        /// <param name="values">The values to save.</param>
+        void SaveTempData(HttpContext context, IDictionary<string, object> values);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/InputType.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/InputType.cs
new file mode 100644
index 0000000000..03ebd45b6b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/InputType.cs
@@ -0,0 +1,14 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public enum InputType
+    {
+        CheckBox,
+        Hidden,
+        Password,
+        Radio,
+        Text
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/JsonHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/JsonHelper.cs
new file mode 100644
index 0000000000..21f40342ae
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/JsonHelper.cs
@@ -0,0 +1,113 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.Globalization;
+using System.IO;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Newtonsoft.Json;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Default implementation of <see cref="IJsonHelper"/>.
+    /// </summary>
+    public class JsonHelper : IJsonHelper
+    {
+        private readonly JsonOutputFormatter _jsonOutputFormatter;
+        private readonly ArrayPool<char> _charPool;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="JsonHelper"/> that is backed by <paramref name="jsonOutputFormatter"/>.
+        /// </summary>
+        /// <param name="jsonOutputFormatter">The <see cref="JsonOutputFormatter"/> used to serialize JSON.</param>
+        /// <param name="charPool">
+        /// The <see cref="ArrayPool{Char}"/> for use with custom <see cref="JsonSerializerSettings"/> (see
+        /// <see cref="Serialize(object, JsonSerializerSettings)"/>).
+        /// </param>
+        public JsonHelper(JsonOutputFormatter jsonOutputFormatter, ArrayPool<char> charPool)
+        {
+            if (jsonOutputFormatter == null)
+            {
+                throw new ArgumentNullException(nameof(jsonOutputFormatter));
+            }
+            if (charPool == null)
+            {
+                throw new ArgumentNullException(nameof(charPool));
+            }
+
+            _jsonOutputFormatter = jsonOutputFormatter;
+            _charPool = charPool;
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent Serialize(object value)
+        {
+            var settings = ShallowCopy(_jsonOutputFormatter.PublicSerializerSettings);
+            settings.StringEscapeHandling = StringEscapeHandling.EscapeHtml;
+
+            return Serialize(value, settings);
+        }
+
+        /// <inheritdoc />
+        public IHtmlContent Serialize(object value, JsonSerializerSettings serializerSettings)
+        {
+            if (serializerSettings == null)
+            {
+                throw new ArgumentNullException(nameof(serializerSettings));
+            }
+
+            var jsonOutputFormatter = new JsonOutputFormatter(serializerSettings, _charPool);
+
+            return SerializeInternal(jsonOutputFormatter, value);
+        }
+
+        private IHtmlContent SerializeInternal(JsonOutputFormatter jsonOutputFormatter, object value)
+        {
+            var stringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            jsonOutputFormatter.WriteObject(stringWriter, value);
+
+            return new HtmlString(stringWriter.ToString());
+        }
+
+        private static JsonSerializerSettings ShallowCopy(JsonSerializerSettings settings)
+        {
+            var copiedSettings = new JsonSerializerSettings
+            {
+                FloatParseHandling = settings.FloatParseHandling,
+                FloatFormatHandling = settings.FloatFormatHandling,
+                DateParseHandling = settings.DateParseHandling,
+                DateTimeZoneHandling = settings.DateTimeZoneHandling,
+                DateFormatHandling = settings.DateFormatHandling,
+                Formatting = settings.Formatting,
+                MaxDepth = settings.MaxDepth,
+                DateFormatString = settings.DateFormatString,
+                Context = settings.Context,
+                Error = settings.Error,
+                SerializationBinder = settings.SerializationBinder,
+                TraceWriter = settings.TraceWriter,
+                Culture = settings.Culture,
+                ReferenceResolverProvider = settings.ReferenceResolverProvider,
+                EqualityComparer = settings.EqualityComparer,
+                ContractResolver = settings.ContractResolver,
+                ConstructorHandling = settings.ConstructorHandling,
+                TypeNameAssemblyFormatHandling = settings.TypeNameAssemblyFormatHandling,
+                MetadataPropertyHandling = settings.MetadataPropertyHandling,
+                TypeNameHandling = settings.TypeNameHandling,
+                PreserveReferencesHandling = settings.PreserveReferencesHandling,
+                Converters = settings.Converters,
+                DefaultValueHandling = settings.DefaultValueHandling,
+                NullValueHandling = settings.NullValueHandling,
+                ObjectCreationHandling = settings.ObjectCreationHandling,
+                MissingMemberHandling = settings.MissingMemberHandling,
+                ReferenceLoopHandling = settings.ReferenceLoopHandling,
+                CheckAdditionalContent = settings.CheckAdditionalContent,
+            };
+
+            return copiedSettings;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExplorer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExplorer.cs
new file mode 100644
index 0000000000..9b38ea9d4a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExplorer.cs
@@ -0,0 +1,475 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Associates a model object with it's corresponding <see cref="ModelMetadata"/>.
+    /// </summary>
+    [DebuggerDisplay("DeclaredType={Metadata.ModelType.Name} PropertyName={Metadata.PropertyName}")]
+    public class ModelExplorer
+    {
+        private readonly IModelMetadataProvider _metadataProvider;
+
+        private object _model;
+        private Func<object, object> _modelAccessor;
+        private ModelExplorer[] _properties;
+
+        /// <summary>
+        /// Creates a new <see cref="ModelExplorer"/>.
+        /// </summary>
+        /// <param name="metadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
+        /// <param name="metadata">The <see cref="ModelMetadata"/>.</param>
+        /// <param name="model">The model object. May be <c>null</c>.</param>
+        public ModelExplorer(
+            IModelMetadataProvider metadataProvider,
+            ModelMetadata metadata,
+            object model)
+        {
+            if (metadataProvider == null)
+            {
+                throw new ArgumentNullException(nameof(metadataProvider));
+            }
+
+            if (metadata == null)
+            {
+                throw new ArgumentNullException(nameof(metadata));
+            }
+
+            _metadataProvider = metadataProvider;
+            Metadata = metadata;
+            _model = model;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="ModelExplorer"/>.
+        /// </summary>
+        /// <param name="metadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
+        /// <param name="container">The container <see cref="ModelExplorer"/>.</param>
+        /// <param name="metadata">The <see cref="ModelMetadata"/>.</param>
+        /// <param name="modelAccessor">A model accessor function..</param>
+        public ModelExplorer(
+            IModelMetadataProvider metadataProvider,
+            ModelExplorer container,
+            ModelMetadata metadata,
+            Func<object, object> modelAccessor)
+        {
+            if (metadataProvider == null)
+            {
+                throw new ArgumentNullException(nameof(metadataProvider));
+            }
+
+            if (container == null)
+            {
+                throw new ArgumentNullException(nameof(container));
+            }
+
+            if (metadata == null)
+            {
+                throw new ArgumentNullException(nameof(metadata));
+            }
+
+            _metadataProvider = metadataProvider;
+            Container = container;
+            Metadata = metadata;
+            _modelAccessor = modelAccessor;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="ModelExplorer"/>.
+        /// </summary>
+        /// <param name="metadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
+        /// <param name="container">The container <see cref="ModelExplorer"/>.</param>
+        /// <param name="metadata">The <see cref="ModelMetadata"/>.</param>
+        /// <param name="model">The model object. May be <c>null</c>.</param>
+        public ModelExplorer(
+            IModelMetadataProvider metadataProvider,
+            ModelExplorer container,
+            ModelMetadata metadata,
+            object model)
+        {
+            if (metadataProvider == null)
+            {
+                throw new ArgumentNullException(nameof(metadataProvider));
+            }
+
+            if (metadata == null)
+            {
+                throw new ArgumentNullException(nameof(metadata));
+            }
+
+            _metadataProvider = metadataProvider;
+            Container = container;
+            Metadata = metadata;
+            _model = model;
+        }
+
+        /// <summary>
+        /// Gets the container <see cref="ModelExplorer"/>.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// The <see cref="Container"/> will most commonly be set as a result of calling
+        /// <see cref="GetExplorerForProperty(string)"/>. In this case, the returned <see cref="ModelExplorer"/> will
+        /// have it's <see cref="Container"/> set to the instance upon which <see cref="GetExplorerForProperty(string)"/>
+        /// was called.
+        /// </para>
+        /// <para>
+        /// This however is not a requirement. The <see cref="Container"/> is informational, and may not
+        /// represent a type that defines the property represented by <see cref="Metadata"/>. This can
+        /// occur when constructing a <see cref="ModelExplorer"/> based on evaluation of a complex
+        /// expression.
+        /// </para>
+        /// <para>
+        /// If calling code relies on a parent-child relationship between <see cref="ModelExplorer"/>
+        /// instances, then use <see cref="ModelMetadata.ContainerType"/> to validate this assumption.
+        /// </para>
+        /// </remarks>
+        public ModelExplorer Container { get; }
+
+        /// <summary>
+        /// Gets the <see cref="ModelMetadata"/>.
+        /// </summary>
+        public ModelMetadata Metadata { get; }
+
+        /// <summary>
+        /// Gets the model object.
+        /// </summary>
+        /// <remarks>
+        /// Retrieving the <see cref="Model"/> object will execute the model accessor function if this
+        /// <see cref="ModelExplorer"/> was provided with one.
+        /// </remarks>
+        public object Model
+        {
+            get
+            {
+                if (_model == null && _modelAccessor != null)
+                {
+                    Debug.Assert(Container != null);
+                    _model = _modelAccessor(Container.Model);
+
+                    // Null-out the accessor so we don't invoke it repeatedly if it returns null.
+                    _modelAccessor = null;
+                }
+
+                return _model;
+            }
+        }
+
+        /// <remarks>
+        /// Retrieving the <see cref="ModelType"/> will execute the model accessor function if this
+        /// <see cref="ModelExplorer"/> was provided with one.
+        /// </remarks>
+        public Type ModelType
+        {
+            get
+            {
+                if (Metadata.IsNullableValueType)
+                {
+                    // We have a model, but if it's a nullable value type, then Model.GetType() will return
+                    // the non-nullable type (int? -> int). Since it's a value type, there's no subclassing,
+                    // just go with the declared type.
+                    return Metadata.ModelType;
+                }
+
+                if (Model == null)
+                {
+                    // If the model is null, then use the declared model type;
+                    return Metadata.ModelType;
+                }
+
+                // We have a model, and it's not a nullable, so use the runtime type to handle
+                // cases where the model is a subclass of the declared type and has extra data.
+                return Model.GetType();
+            }
+        }
+
+        /// <summary>
+        /// Gets the properties.
+        /// </summary>
+        /// <remarks>
+        /// Includes a <see cref="ModelExplorer"/> for each property of the <see cref="ModelMetadata"/>
+        /// for <see cref="ModelType"/>.
+        /// </remarks>
+        public IEnumerable<ModelExplorer> Properties => PropertiesInternal;
+
+        private ModelExplorer[] PropertiesInternal
+        {
+            get
+            {
+                if (_properties == null)
+                {
+                    var metadata = GetMetadataForRuntimeType();
+                    var properties = metadata.Properties;
+                    var propertyHelpers = PropertyHelper.GetProperties(ModelType);
+
+                    _properties = new ModelExplorer[properties.Count];
+                    for (var i = 0; i < properties.Count; i++)
+                    {
+                        var propertyMetadata = properties[i];
+                        PropertyHelper propertyHelper = null;
+                        for (var j = 0; j < propertyHelpers.Length; j++)
+                        {
+                            if (string.Equals(
+                                propertyMetadata.PropertyName,
+                                propertyHelpers[j].Property.Name,
+                                StringComparison.Ordinal))
+                            {
+                                propertyHelper = propertyHelpers[j];
+                                break;
+                            }
+                        }
+
+                        Debug.Assert(propertyHelper != null);
+                        _properties[i] = CreateExplorerForProperty(propertyMetadata, propertyHelper);
+                    }
+                }
+
+                return _properties;
+            }
+        }
+
+        /// <summary>
+        /// Gets a <see cref="ModelExplorer"/> for the given <paramref name="model"/> value.
+        /// </summary>
+        /// <param name="model">The model value.</param>
+        /// <returns>A <see cref="ModelExplorer"/>.</returns>
+        public ModelExplorer GetExplorerForModel(object model)
+        {
+            if (Container == null)
+            {
+                return new ModelExplorer(_metadataProvider, Metadata, model);
+            }
+            else
+            {
+                return new ModelExplorer(_metadataProvider, Container, Metadata, model);
+            }
+        }
+
+        /// <summary>
+        /// Gets a <see cref="ModelExplorer"/> for the property with given <paramref name="name"/>, or <c>null</c> if
+        /// the property cannot be found.
+        /// </summary>
+        /// <param name="name">The property name.</param>
+        /// <returns>A <see cref="ModelExplorer"/>, or <c>null</c>.</returns>
+        public ModelExplorer GetExplorerForProperty(string name)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            for (var i = 0; i < PropertiesInternal.Length; i++)
+            {
+                var property = PropertiesInternal[i];
+                if (string.Equals(name, property.Metadata.PropertyName, StringComparison.Ordinal))
+                {
+                    return property;
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Gets a <see cref="ModelExplorer"/> for the property with given <paramref name="name"/>, or <c>null</c> if
+        /// the property cannot be found.
+        /// </summary>
+        /// <param name="name">The property name.</param>
+        /// <param name="modelAccessor">An accessor for the model value.</param>
+        /// <returns>A <see cref="ModelExplorer"/>, or <c>null</c>.</returns>
+        /// <remarks>
+        /// As this creates a model explorer with a specific model accessor function, the result is not cached.
+        /// </remarks>
+        public ModelExplorer GetExplorerForProperty(string name, Func<object, object> modelAccessor)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            var metadata = GetMetadataForRuntimeType();
+
+            var propertyMetadata = metadata.Properties[name];
+            if (propertyMetadata == null)
+            {
+                return null;
+            }
+
+            return new ModelExplorer(_metadataProvider, this, propertyMetadata, modelAccessor);
+        }
+
+        /// <summary>
+        /// Gets a <see cref="ModelExplorer"/> for the property with given <paramref name="name"/>, or <c>null</c> if
+        /// the property cannot be found.
+        /// </summary>
+        /// <param name="name">The property name.</param>
+        /// <param name="model">The model value.</param>
+        /// <returns>A <see cref="ModelExplorer"/>, or <c>null</c>.</returns>
+        /// <remarks>
+        /// As this creates a model explorer with a specific model value, the result is not cached.
+        /// </remarks>
+        public ModelExplorer GetExplorerForProperty(string name, object model)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            var metadata = GetMetadataForRuntimeType();
+
+            var propertyMetadata = metadata.Properties[name];
+            if (propertyMetadata == null)
+            {
+                return null;
+            }
+
+            return new ModelExplorer(_metadataProvider, this, propertyMetadata, model);
+        }
+
+        /// <summary>
+        /// Gets a <see cref="ModelExplorer"/> for the provided model value and model <see cref="Type"/>.
+        /// </summary>
+        /// <param name="modelType">The model <see cref="Type"/>.</param>
+        /// <param name="model">The model value.</param>
+        /// <returns>A <see cref="ModelExplorer"/>.</returns>
+        /// <remarks>
+        /// <para>
+        /// A <see cref="ModelExplorer"/> created by <see cref="GetExplorerForExpression(Type, object)"/>
+        /// represents the result of executing an arbitrary expression against the model contained
+        /// in the current <see cref="ModelExplorer"/> instance.
+        /// </para>
+        /// <para>
+        /// The returned <see cref="ModelExplorer"/> will have the current instance set as its <see cref="Container"/>.
+        /// </para>
+        /// </remarks>
+        public ModelExplorer GetExplorerForExpression(Type modelType, object model)
+        {
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            var metadata = _metadataProvider.GetMetadataForType(modelType);
+            return GetExplorerForExpression(metadata, model);
+        }
+
+        /// <summary>
+        /// Gets a <see cref="ModelExplorer"/> for the provided model value and model <see cref="Type"/>.
+        /// </summary>
+        /// <param name="metadata">The <see cref="ModelMetadata"/> associated with the model.</param>
+        /// <param name="model">The model value.</param>
+        /// <returns>A <see cref="ModelExplorer"/>.</returns>
+        /// <remarks>
+        /// <para>
+        /// A <see cref="ModelExplorer"/> created by
+        /// <see cref="GetExplorerForExpression(ModelMetadata, object)"/>
+        /// represents the result of executing an arbitrary expression against the model contained
+        /// in the current <see cref="ModelExplorer"/> instance.
+        /// </para>
+        /// <para>
+        /// The returned <see cref="ModelExplorer"/> will have the current instance set as its <see cref="Container"/>.
+        /// </para>
+        /// </remarks>
+        public ModelExplorer GetExplorerForExpression(ModelMetadata metadata, object model)
+        {
+            if (metadata == null)
+            {
+                throw new ArgumentNullException(nameof(metadata));
+            }
+
+            return new ModelExplorer(_metadataProvider, this, metadata, model);
+        }
+
+        /// <summary>
+        /// Gets a <see cref="ModelExplorer"/> for the provided model value and model <see cref="Type"/>.
+        /// </summary>
+        /// <param name="modelType">The model <see cref="Type"/>.</param>
+        /// <param name="modelAccessor">A model accessor function.</param>
+        /// <returns>A <see cref="ModelExplorer"/>.</returns>
+        /// <remarks>
+        /// <para>
+        /// A <see cref="ModelExplorer"/> created by
+        /// <see cref="GetExplorerForExpression(Type, Func{object, object})"/>
+        /// represents the result of executing an arbitrary expression against the model contained
+        /// in the current <see cref="ModelExplorer"/> instance.
+        /// </para>
+        /// <para>
+        /// The returned <see cref="ModelExplorer"/> will have the current instance set as its <see cref="Container"/>.
+        /// </para>
+        /// </remarks>
+        public ModelExplorer GetExplorerForExpression(Type modelType, Func<object, object> modelAccessor)
+        {
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            var metadata = _metadataProvider.GetMetadataForType(modelType);
+            return GetExplorerForExpression(metadata, modelAccessor);
+        }
+
+        /// <summary>
+        /// Gets a <see cref="ModelExplorer"/> for the provided model value and model <see cref="Type"/>.
+        /// </summary>
+        /// <param name="metadata">The <see cref="ModelMetadata"/> associated with the model.</param>
+        /// <param name="modelAccessor">A model accessor function.</param>
+        /// <returns>A <see cref="ModelExplorer"/>.</returns>
+        /// <remarks>
+        /// <para>
+        /// A <see cref="ModelExplorer"/> created by
+        /// <see cref="GetExplorerForExpression(ModelMetadata, Func{object, object})"/>
+        /// represents the result of executing an arbitrary expression against the model contained
+        /// in the current <see cref="ModelExplorer"/> instance.
+        /// </para>
+        /// <para>
+        /// The returned <see cref="ModelExplorer"/> will have the current instance set as its <see cref="Container"/>.
+        /// </para>
+        /// </remarks>
+        public ModelExplorer GetExplorerForExpression(ModelMetadata metadata, Func<object, object> modelAccessor)
+        {
+            if (metadata == null)
+            {
+                throw new ArgumentNullException(nameof(metadata));
+            }
+
+            return new ModelExplorer(_metadataProvider, this, metadata, modelAccessor);
+        }
+
+        private ModelMetadata GetMetadataForRuntimeType()
+        {
+            // We want to make sure we're looking at the runtime properties of the model, and for
+            // that we need the model metadata of the runtime type.
+            var metadata = Metadata;
+            if (Metadata.ModelType != ModelType)
+            {
+                metadata = _metadataProvider.GetMetadataForType(ModelType);
+            }
+
+            return metadata;
+        }
+
+        private ModelExplorer CreateExplorerForProperty(
+            ModelMetadata propertyMetadata,
+            PropertyHelper propertyHelper)
+        {
+            if (propertyHelper == null)
+            {
+                return new ModelExplorer(_metadataProvider, this, propertyMetadata, modelAccessor: null);
+            }
+
+            var modelAccessor = new Func<object, object>((c) =>
+            {
+                return c == null ? null : propertyHelper.GetValue(c);
+            });
+
+            return new ModelExplorer(_metadataProvider, this, propertyMetadata, modelAccessor);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExplorerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExplorerExtensions.cs
new file mode 100644
index 0000000000..c1eaa04c99
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExplorerExtensions.cs
@@ -0,0 +1,85 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Extension methods for <see cref="ModelExplorer"/>.
+    /// </summary>
+    public static class ModelExplorerExtensions
+    {
+        /// <summary>
+        /// Gets a simple display string for the <see cref="ModelExplorer.Model"/> property
+        /// of <paramref name="modelExplorer"/>.
+        /// </summary>
+        /// <param name="modelExplorer">The <see cref="ModelExplorer"/>.</param>
+        /// <returns>A simple display string for the model.</returns>
+        public static string GetSimpleDisplayText(this ModelExplorer modelExplorer)
+        {
+            if (modelExplorer == null)
+            {
+                throw new ArgumentNullException(nameof(modelExplorer));
+            }
+
+            if (modelExplorer.Metadata.SimpleDisplayProperty != null)
+            {
+                var propertyExplorer = modelExplorer.GetExplorerForProperty(
+                    modelExplorer.Metadata.SimpleDisplayProperty);
+                if (propertyExplorer?.Model != null)
+                {
+                    return propertyExplorer.Model.ToString();
+                }
+            }
+
+            if (modelExplorer.Model == null)
+            {
+                return modelExplorer.Metadata.NullDisplayText;
+            }
+
+            if (modelExplorer.Metadata.IsEnum && modelExplorer.Model is Enum modelEnum)
+            {
+                var enumStringValue = modelEnum.ToString("d");
+                var enumGroupedDisplayNamesAndValues = modelExplorer.Metadata.EnumGroupedDisplayNamesAndValues;
+
+                Debug.Assert(enumGroupedDisplayNamesAndValues != null);
+
+                foreach (var kvp in enumGroupedDisplayNamesAndValues)
+                {
+                    if (string.Equals(kvp.Value, enumStringValue, StringComparison.Ordinal))
+                    {
+                        return kvp.Key.Name;
+                    }
+                }
+            }
+
+            var stringResult = Convert.ToString(modelExplorer.Model, CultureInfo.CurrentCulture);
+            if (stringResult == null)
+            {
+                return string.Empty;
+            }
+
+            if (!stringResult.Equals(modelExplorer.Model.GetType().FullName, StringComparison.Ordinal))
+            {
+                return stringResult;
+            }
+
+            var firstProperty = modelExplorer.Properties.FirstOrDefault();
+            if (firstProperty == null)
+            {
+                return string.Empty;
+            }
+
+            if (firstProperty.Model == null)
+            {
+                return firstProperty.Metadata.NullDisplayText;
+            }
+
+            return Convert.ToString(firstProperty.Model, CultureInfo.CurrentCulture);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExpression.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExpression.cs
new file mode 100644
index 0000000000..73089f5212
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExpression.cs
@@ -0,0 +1,67 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Describes an <see cref="System.Linq.Expressions.Expression"/> passed to a tag helper.
+    /// </summary>
+    public sealed class ModelExpression
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ModelExpression"/> class.
+        /// </summary>
+        /// <param name="name">
+        /// String representation of the <see cref="System.Linq.Expressions.Expression"/> of interest.
+        /// </param>
+        /// <param name="modelExplorer">
+        /// Includes the model and metadata about the <see cref="System.Linq.Expressions.Expression"/> of interest.
+        /// </param>
+        public ModelExpression(string name, ModelExplorer modelExplorer)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            if (modelExplorer == null)
+            {
+                throw new ArgumentNullException(nameof(modelExplorer));
+            }
+
+            Name = name;
+            ModelExplorer = modelExplorer;
+        }
+
+        /// <summary>
+        /// String representation of the <see cref="System.Linq.Expressions.Expression"/> of interest.
+        /// </summary>
+        public string Name { get; }
+
+        /// <summary>
+        /// Metadata about the <see cref="System.Linq.Expressions.Expression"/> of interest.
+        /// </summary>
+        public ModelMetadata Metadata => ModelExplorer.Metadata;
+
+        /// <summary>
+        /// Gets the model object for the <see cref="System.Linq.Expressions.Expression"/> of interest.
+        /// </summary>
+        /// <remarks>
+        /// Getting <see cref="Model"/> will evaluate a compiled version of the original
+        /// <see cref="System.Linq.Expressions.Expression"/>.
+        /// </remarks>
+        public object Model => ModelExplorer.Model;
+
+        /// <summary>
+        /// Gets the model explorer for the <see cref="System.Linq.Expressions.Expression"/> of interest.
+        /// </summary>
+        /// <remarks>
+        /// Getting <see cref="ModelExplorer.Model"/> will evaluate a compiled version of the original
+        /// <see cref="System.Linq.Expressions.Expression"/>.
+        /// </remarks>
+        public ModelExplorer ModelExplorer { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExpressionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExpressionProvider.cs
new file mode 100644
index 0000000000..46c8830068
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExpressionProvider.cs
@@ -0,0 +1,68 @@
+// 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.
+
+using System;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// A default implementation of <see cref="IModelMetadataProvider"/>.
+    /// </summary>
+    public class ModelExpressionProvider : IModelExpressionProvider
+    {
+        private readonly IModelMetadataProvider _modelMetadataProvider;
+        private readonly ExpressionTextCache _expressionTextCache;
+
+        /// <summary>
+        /// Creates a  new <see cref="ModelExpressionProvider"/>.
+        /// </summary>
+        /// <param name="modelMetadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
+        /// <param name="expressionTextCache">The <see cref="ExpressionTextCache"/>.</param>
+        public ModelExpressionProvider(
+            IModelMetadataProvider modelMetadataProvider,
+            ExpressionTextCache expressionTextCache)
+        {
+            if (modelMetadataProvider == null)
+            {
+                throw new ArgumentNullException(nameof(modelMetadataProvider));
+            }
+
+            if (expressionTextCache == null)
+            {
+                throw new ArgumentNullException(nameof(expressionTextCache));
+            }
+
+            _modelMetadataProvider = modelMetadataProvider;
+            _expressionTextCache = expressionTextCache;
+        }
+
+        /// <inheritdoc />
+        public ModelExpression CreateModelExpression<TModel, TValue>(
+            ViewDataDictionary<TModel> viewData,
+            Expression<Func<TModel, TValue>> expression)
+        {
+            if (viewData == null)
+            {
+                throw new ArgumentNullException(nameof(viewData));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            var name = ExpressionHelper.GetExpressionText(expression, _expressionTextCache);
+            var modelExplorer = ExpressionMetadataProvider.FromLambdaExpression(expression, viewData, _modelMetadataProvider);
+            if (modelExplorer == null)
+            {
+                throw new InvalidOperationException(
+                    Resources.FormatCreateModelExpression_NullModelMetadata(nameof(IModelMetadataProvider), name));
+            }
+
+            return new ModelExpression(name, modelExplorer);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelMetadataProviderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelMetadataProviderExtensions.cs
new file mode 100644
index 0000000000..e20d5855a7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelMetadataProviderExtensions.cs
@@ -0,0 +1,43 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Extensions methods for <see cref="IModelMetadataProvider"/>.
+    /// </summary>
+    public static class ModelMetadataProviderExtensions
+    {
+        /// <summary>
+        /// Gets a <see cref="ModelExplorer"/> for the provided <paramref name="modelType"/> and
+        /// <paramref name="model"/>.
+        /// </summary>
+        /// <param name="provider">The <see cref="IModelMetadataProvider"/>.</param>
+        /// <param name="modelType">The declared <see cref="Type"/> of the model object.</param>
+        /// <param name="model">The model object.</param>
+        /// <returns>
+        /// A <see cref="ModelExplorer"/> for the <paramref name="modelType"/> and <paramref name="model"/>.
+        /// </returns>
+        public static ModelExplorer GetModelExplorerForType(
+            this IModelMetadataProvider provider,
+            Type modelType,
+            object model)
+        {
+            if (provider == null)
+            {
+                throw new ArgumentNullException(nameof(provider));
+            }
+
+            if (modelType == null)
+            {
+                throw new ArgumentNullException(nameof(modelType));
+            }
+
+            var modelMetadata = provider.GetMetadataForType(modelType);
+            return new ModelExplorer(provider, modelMetadata, model);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/MvcViewOptionsConfigureCompatibilityOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/MvcViewOptionsConfigureCompatibilityOptions.cs
new file mode 100644
index 0000000000..81de59fe12
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/MvcViewOptionsConfigureCompatibilityOptions.cs
@@ -0,0 +1,35 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    internal class MvcViewOptionsConfigureCompatibilityOptions : ConfigureCompatibilityOptions<MvcViewOptions>
+    {
+        public MvcViewOptionsConfigureCompatibilityOptions(
+            ILoggerFactory loggerFactory,
+            IOptions<MvcCompatibilityOptions> compatibilityOptions)
+            : base(loggerFactory, compatibilityOptions)
+        {
+        }
+
+        protected override IReadOnlyDictionary<string, object> DefaultValues
+        {
+            get
+            {
+                var values = new Dictionary<string, object>();
+
+                if (Version >= CompatibilityVersion.Version_2_1)
+                {
+                    values[nameof(MvcViewOptions.SuppressTempDataAttributePrefix)] = true;
+                }
+
+                return values;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/PartialViewResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/PartialViewResultExecutor.cs
new file mode 100644
index 0000000000..18ecbebe3d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/PartialViewResultExecutor.cs
@@ -0,0 +1,226 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Finds and executes an <see cref="IView"/> for a <see cref="PartialViewResult"/>.
+    /// </summary>
+    public class PartialViewResultExecutor : ViewExecutor, IActionResultExecutor<PartialViewResult>
+    {
+        private const string ActionNameKey = "action";
+
+        /// <summary>
+        /// Creates a new <see cref="PartialViewResultExecutor"/>.
+        /// </summary>
+        /// <param name="viewOptions">The <see cref="IOptions{MvcViewOptions}"/>.</param>
+        /// <param name="writerFactory">The <see cref="IHttpResponseStreamWriterFactory"/>.</param>
+        /// <param name="viewEngine">The <see cref="ICompositeViewEngine"/>.</param>
+        /// <param name="tempDataFactory">The <see cref="ITempDataDictionaryFactory"/>.</param>
+        /// <param name="diagnosticSource">The <see cref="DiagnosticSource"/>.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        /// <param name="modelMetadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
+        public PartialViewResultExecutor(
+            IOptions<MvcViewOptions> viewOptions,
+            IHttpResponseStreamWriterFactory writerFactory,
+            ICompositeViewEngine viewEngine,
+            ITempDataDictionaryFactory tempDataFactory,
+            DiagnosticSource diagnosticSource,
+            ILoggerFactory loggerFactory,
+            IModelMetadataProvider modelMetadataProvider)
+            : base(viewOptions, writerFactory, viewEngine, tempDataFactory, diagnosticSource, modelMetadataProvider)
+        {
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            Logger = loggerFactory.CreateLogger<PartialViewResultExecutor>();
+        }
+
+        /// <summary>
+        /// Gets the <see cref="ILogger"/>.
+        /// </summary>
+        protected ILogger Logger { get; }
+
+        /// <summary>
+        /// Attempts to find the <see cref="IView"/> associated with <paramref name="viewResult"/>.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/> associated with the current request.</param>
+        /// <param name="viewResult">The <see cref="PartialViewResult"/>.</param>
+        /// <returns>A <see cref="ViewEngineResult"/>.</returns>
+        public virtual ViewEngineResult FindView(ActionContext actionContext, PartialViewResult viewResult)
+        {
+            if (actionContext == null)
+            {
+                throw new ArgumentNullException(nameof(actionContext));
+            }
+
+            if (viewResult == null)
+            {
+                throw new ArgumentNullException(nameof(viewResult));
+            }
+
+            var viewEngine = viewResult.ViewEngine ?? ViewEngine;
+            var viewName = viewResult.ViewName ?? GetActionName(actionContext);
+
+            var stopwatch = ValueStopwatch.StartNew();
+
+            var result = viewEngine.GetView(executingFilePath: null, viewPath: viewName, isMainPage: false);
+            var originalResult = result;
+            if (!result.Success)
+            {
+                result = viewEngine.FindView(actionContext, viewName, isMainPage: false);
+            }
+
+            Logger.PartialViewResultExecuting(result.ViewName);
+            if (!result.Success)
+            {
+                if (originalResult.SearchedLocations.Any())
+                {
+                    if (result.SearchedLocations.Any())
+                    {
+                        // Return a new ViewEngineResult listing all searched locations.
+                        var locations = new List<string>(originalResult.SearchedLocations);
+                        locations.AddRange(result.SearchedLocations);
+                        result = ViewEngineResult.NotFound(viewName, locations);
+                    }
+                    else
+                    {
+                        // GetView() searched locations but FindView() did not. Use first ViewEngineResult.
+                        result = originalResult;
+                    }
+                }
+            }
+
+            if (result.Success)
+            {
+                DiagnosticSource.ViewFound(
+                    actionContext,
+                    isMainPage: false,
+                    viewResult: viewResult,
+                    viewName: viewName,
+                    view: result.View);
+
+                Logger.PartialViewFound(result.View, stopwatch.GetElapsedTime());
+            }
+            else
+            {
+                DiagnosticSource.ViewNotFound(
+                    actionContext,
+                    isMainPage: false,
+                    viewResult: viewResult,
+                    viewName: viewName,
+                    searchedLocations: result.SearchedLocations);
+
+                Logger.PartialViewNotFound(viewName, result.SearchedLocations);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Executes the <see cref="IView"/> asynchronously.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/> associated with the current request.</param>
+        /// <param name="view">The <see cref="IView"/>.</param>
+        /// <param name="viewResult">The <see cref="PartialViewResult"/>.</param>
+        /// <returns>A <see cref="Task"/> which will complete when view execution is completed.</returns>
+        public virtual Task ExecuteAsync(ActionContext actionContext, IView view, PartialViewResult viewResult)
+        {
+            if (actionContext == null)
+            {
+                throw new ArgumentNullException(nameof(actionContext));
+            }
+
+            if (view == null)
+            {
+                throw new ArgumentNullException(nameof(view));
+            }
+
+            if (viewResult == null)
+            {
+                throw new ArgumentNullException(nameof(viewResult));
+            }
+
+            return ExecuteAsync(
+                actionContext,
+                view,
+                viewResult.ViewData,
+                viewResult.TempData,
+                viewResult.ContentType,
+                viewResult.StatusCode);
+        }
+
+        /// <inheritdoc />
+        public virtual async Task ExecuteAsync(ActionContext context, PartialViewResult result)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            var stopwatch = ValueStopwatch.StartNew();
+
+            var viewEngineResult = FindView(context, result);
+            viewEngineResult.EnsureSuccessful(originalLocations: null);
+
+            var view = viewEngineResult.View;
+            using (view as IDisposable)
+            {
+                await ExecuteAsync(context, view, result);
+            }
+
+            Logger.PartialViewResultExecuted(result.ViewName, stopwatch.GetElapsedTime());
+        }
+
+        private static string GetActionName(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            object routeValue;
+            if (!context.RouteData.Values.TryGetValue(ActionNameKey, out routeValue))
+            {
+                return null;
+            }
+
+            var actionDescriptor = context.ActionDescriptor;
+            string normalizedValue = null;
+            string value;
+            if (actionDescriptor.RouteValues.TryGetValue(ActionNameKey, out value) &&
+                !string.IsNullOrEmpty(value))
+            {
+                normalizedValue = value;
+            }
+
+            var stringRouteValue = routeValue?.ToString();
+            if (string.Equals(normalizedValue, stringRouteValue, StringComparison.OrdinalIgnoreCase))
+            {
+                return normalizedValue;
+            }
+
+            return stringRouteValue;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/SaveTempDataAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/SaveTempDataAttribute.cs
new file mode 100644
index 0000000000..908afc2fca
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/SaveTempDataAttribute.cs
@@ -0,0 +1,37 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// A filter that saves the <see cref="ITempDataDictionary"/> for a request.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public class SaveTempDataAttribute : Attribute, IFilterFactory, IOrderedFilter
+    {
+        public SaveTempDataAttribute()
+        {
+            // Since SaveTempDataFilter registers for a response's OnStarting callback, we want this filter to run 
+            // as early as possible to get the opportunity to register the call back before any other result filter 
+            // starts writing to the response stream.
+            Order = int.MinValue + 100;
+        }
+
+        // <inheritdoc />
+        public int Order { get; set; }
+
+        /// <inheritdoc />
+        public bool IsReusable => true;
+
+        /// <inheritdoc />
+        public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
+        {
+            return serviceProvider.GetRequiredService<SaveTempDataFilter>();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/SessionStateTempDataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/SessionStateTempDataProvider.cs
new file mode 100644
index 0000000000..f933e1163f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/SessionStateTempDataProvider.cs
@@ -0,0 +1,71 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Provides session-state data to the current <see cref="ITempDataDictionary"/> object.
+    /// </summary>
+    public class SessionStateTempDataProvider : ITempDataProvider
+    {
+        // Internal for testing
+        internal const string TempDataSessionStateKey = "__ControllerTempData";
+        private readonly TempDataSerializer _tempDataSerializer;
+
+        public SessionStateTempDataProvider()
+        {
+            _tempDataSerializer = new TempDataSerializer();
+        }
+
+        /// <inheritdoc />
+        public virtual IDictionary<string, object> LoadTempData(HttpContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            // Accessing Session property will throw if the session middleware is not enabled.
+            var session = context.Session;
+
+            byte[] value;
+            if (session.TryGetValue(TempDataSessionStateKey, out value))
+            {
+                // If we got it from Session, remove it so that no other request gets it
+                session.Remove(TempDataSessionStateKey);
+
+                return _tempDataSerializer.Deserialize(value);
+            }
+
+            return new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+        }
+
+        /// <inheritdoc />
+        public virtual void SaveTempData(HttpContext context, IDictionary<string, object> values)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            // Accessing Session property will throw if the session middleware is not enabled.
+            var session = context.Session;
+
+            var hasValues = (values != null && values.Count > 0);
+            if (hasValues)
+            {
+                var bytes = _tempDataSerializer.Serialize(values);
+                session.Set(TempDataSessionStateKey, bytes);
+            }
+            else
+            {
+                session.Remove(TempDataSessionStateKey);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/StringHtmlContent.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/StringHtmlContent.cs
new file mode 100644
index 0000000000..38715b89fd
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/StringHtmlContent.cs
@@ -0,0 +1,54 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Html;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// String content which gets encoded when written.
+    /// </summary>
+    [DebuggerDisplay("{DebuggerToString()}")]
+    public class StringHtmlContent : IHtmlContent
+    {
+        private readonly string _input;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="StringHtmlContent"/>
+        /// </summary>
+        /// <param name="input"><see cref="string"/> to be HTML encoded when <see cref="WriteTo"/> is called.</param>
+        public StringHtmlContent(string input)
+        {
+            _input = input;
+        }
+
+        /// <inheritdoc />
+        public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+        {
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
+            if (encoder == null)
+            {
+                throw new ArgumentNullException(nameof(encoder));
+            }
+
+            encoder.Encode(writer, _input);
+        }
+
+        private string DebuggerToString()
+        {
+            using (var writer = new StringWriter())
+            {
+                WriteTo(writer, HtmlEncoder.Default);
+                return writer.ToString();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TempDataDictionary.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TempDataDictionary.cs
new file mode 100644
index 0000000000..95abb49bb4
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TempDataDictionary.cs
@@ -0,0 +1,299 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <inheritdoc />
+    public class TempDataDictionary : ITempDataDictionary
+    {
+        // Perf: Everything here is lazy because the TempDataDictionary is frequently created and passed around
+        // without being manipulated.
+        private Dictionary<string, object> _data;
+        private bool _loaded;
+        private readonly ITempDataProvider _provider;
+        private readonly HttpContext _context;
+        private HashSet<string> _initialKeys;
+        private HashSet<string> _retainedKeys;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TempDataDictionary"/> class.
+        /// </summary>
+        /// <param name="context">The <see cref="HttpContext"/>.</param>
+        /// <param name="provider">The <see cref="ITempDataProvider"/> used to Load and Save data.</param>
+        public TempDataDictionary(HttpContext context, ITempDataProvider provider)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (provider == null)
+            {
+                throw new ArgumentNullException(nameof(provider));
+            }
+
+            _provider = provider;
+            _loaded = false;
+            _context = context;
+        }
+
+        public int Count
+        {
+            get
+            {
+                Load();
+                return _data.Count;
+            }
+        }
+
+        public ICollection<string> Keys
+        {
+            get
+            {
+                Load();
+                return _data.Keys;
+            }
+        }
+
+        public ICollection<object> Values
+        {
+            get
+            {
+                Load();
+                return _data.Values;
+            }
+        }
+
+        bool ICollection<KeyValuePair<string, object>>.IsReadOnly
+        {
+            get
+            {
+                Load();
+                return ((ICollection<KeyValuePair<string, object>>)_data).IsReadOnly;
+            }
+        }
+
+        public object this[string key]
+        {
+            get
+            {
+                Load();
+                object value;
+                if (TryGetValue(key, out value))
+                {
+                    // Mark the key for deletion since it is read.
+                    _initialKeys.Remove(key);
+                    return value;
+                }
+                return null;
+            }
+            set
+            {
+                Load();
+                _data[key] = value;
+                _initialKeys.Add(key);
+            }
+        }
+
+        /// <inheritdoc />
+        public void Keep()
+        {
+            // if the data is not loaded, we can assume none of it has been read
+            // and so silently return.
+            if (!_loaded)
+            {
+                return;
+            }
+
+            _retainedKeys.Clear();
+            _retainedKeys.UnionWith(_data.Keys);
+        }
+
+        /// <inheritdoc />
+        public void Keep(string key)
+        {
+            Load();
+            _retainedKeys.Add(key);
+        }
+
+        /// <inheritdoc />
+        public void Load()
+        {
+            if (_loaded)
+            {
+                return;
+            }
+
+            var providerDictionary = _provider.LoadTempData(_context);
+            _data = (providerDictionary != null)
+                ? new Dictionary<string, object>(providerDictionary, StringComparer.OrdinalIgnoreCase)
+                : new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+            _initialKeys = new HashSet<string>(_data.Keys, StringComparer.OrdinalIgnoreCase);
+            _retainedKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            _loaded = true;
+        }
+
+        /// <inheritdoc />
+        public void Save()
+        {
+            if (!_loaded)
+            {
+                return;
+            }
+
+            // Because it is not possible to delete while enumerating, a copy of the keys must be taken.
+            // Use the size of the dictionary as an upper bound to avoid creating more than one copy of the keys.
+            var removeCount = 0;
+            var keys = new string[_data.Count];
+            foreach (var entry in _data)
+            {
+                if (!_initialKeys.Contains(entry.Key) && !_retainedKeys.Contains(entry.Key))
+                {
+                    keys[removeCount] = entry.Key;
+                    removeCount++;
+                }
+            }
+            for (var i = 0; i < removeCount; i++)
+            {
+                _data.Remove(keys[i]);
+            }
+
+            _provider.SaveTempData(_context, _data);
+        }
+
+        /// <inheritdoc />
+        public object Peek(string key)
+        {
+            Load();
+            object value;
+            _data.TryGetValue(key, out value);
+            return value;
+        }
+
+        public void Add(string key, object value)
+        {
+            Load();
+            _data.Add(key, value);
+            _initialKeys.Add(key);
+        }
+
+        public void Clear()
+        {
+            Load();
+            _data.Clear();
+            _retainedKeys.Clear();
+            _initialKeys.Clear();
+        }
+
+        public bool ContainsKey(string key)
+        {
+            Load();
+            return _data.ContainsKey(key);
+        }
+
+        public bool ContainsValue(object value)
+        {
+            Load();
+            return _data.ContainsValue(value);
+        }
+
+        public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
+        {
+            Load();
+            return new TempDataDictionaryEnumerator(this);
+        }
+
+        public bool Remove(string key)
+        {
+            Load();
+            _retainedKeys.Remove(key);
+            _initialKeys.Remove(key);
+            return _data.Remove(key);
+        }
+
+        public bool TryGetValue(string key, out object value)
+        {
+            Load();
+            // Mark the key for deletion since it is read.
+            _initialKeys.Remove(key);
+            return _data.TryGetValue(key, out value);
+        }
+
+        void ICollection<KeyValuePair<string, object>>.CopyTo(KeyValuePair<string, object>[] array, int index)
+        {
+            Load();
+            ((ICollection<KeyValuePair<string, object>>)_data).CopyTo(array, index);
+        }
+
+        void ICollection<KeyValuePair<string, object>>.Add(KeyValuePair<string, object> keyValuePair)
+        {
+            Load();
+            _initialKeys.Add(keyValuePair.Key);
+            ((ICollection<KeyValuePair<string, object>>)_data).Add(keyValuePair);
+        }
+
+        bool ICollection<KeyValuePair<string, object>>.Contains(KeyValuePair<string, object> keyValuePair)
+        {
+            Load();
+            return ((ICollection<KeyValuePair<string, object>>)_data).Contains(keyValuePair);
+        }
+
+        bool ICollection<KeyValuePair<string, object>>.Remove(KeyValuePair<string, object> keyValuePair)
+        {
+            Load();
+            _initialKeys.Remove(keyValuePair.Key);
+            return ((ICollection<KeyValuePair<string, object>>)_data).Remove(keyValuePair);
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            Load();
+            return new TempDataDictionaryEnumerator(this);
+        }
+
+        private sealed class TempDataDictionaryEnumerator : IEnumerator<KeyValuePair<string, object>>
+        {
+            private readonly IEnumerator<KeyValuePair<string, object>> _enumerator;
+            private readonly TempDataDictionary _tempData;
+
+            public TempDataDictionaryEnumerator(TempDataDictionary tempData)
+            {
+                _tempData = tempData;
+                _enumerator = _tempData._data.GetEnumerator();
+            }
+
+            public KeyValuePair<string, object> Current
+            {
+                get
+                {
+                    var kvp = _enumerator.Current;
+                    // Mark the key for deletion since it is read.
+                    _tempData._initialKeys.Remove(kvp.Key);
+                    return kvp;
+                }
+            }
+
+            object IEnumerator.Current => Current;
+
+            public bool MoveNext()
+            {
+                return _enumerator.MoveNext();
+            }
+
+            public void Reset()
+            {
+                _enumerator.Reset();
+            }
+
+            void IDisposable.Dispose()
+            {
+                _enumerator.Dispose();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TempDataDictionaryFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TempDataDictionaryFactory.cs
new file mode 100644
index 0000000000..b1138b02db
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TempDataDictionaryFactory.cs
@@ -0,0 +1,55 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// A default implementation of <see cref="ITempDataDictionaryFactory"/>.
+    /// </summary>
+    public class TempDataDictionaryFactory : ITempDataDictionaryFactory
+    {
+        private static readonly object Key = typeof(ITempDataDictionary);
+
+        private readonly ITempDataProvider _provider;
+
+        /// <summary>
+        /// Creates a new <see cref="TempDataDictionaryFactory"/>.
+        /// </summary>
+        /// <param name="provider">The <see cref="ITempDataProvider"/>.</param>
+        public TempDataDictionaryFactory(ITempDataProvider provider)
+        {
+            if (provider == null)
+            {
+                throw new ArgumentNullException(nameof(provider));
+            }
+
+            _provider = provider;
+        }
+
+        /// <inheritdoc />
+        public ITempDataDictionary GetTempData(HttpContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            object obj;
+            ITempDataDictionary result;
+            if (context.Items.TryGetValue(Key, out obj))
+            {
+                result = (ITempDataDictionary)obj;
+            }
+            else
+            {
+                result = new TempDataDictionary(context, _provider);
+                context.Items.Add(Key, result);
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateBuilder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateBuilder.cs
new file mode 100644
index 0000000000..62d4b3ea86
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateBuilder.cs
@@ -0,0 +1,163 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class TemplateBuilder
+    {
+        private readonly IViewEngine _viewEngine;
+        private readonly IViewBufferScope _bufferScope;
+        private readonly ViewContext _viewContext;
+        private readonly ViewDataDictionary _viewData;
+        private readonly ModelExplorer _modelExplorer;
+        private object _model;
+        private readonly ModelMetadata _metadata;
+        private readonly string _htmlFieldName;
+        private readonly string _templateName;
+        private readonly bool _readOnly;
+        private readonly object _additionalViewData;
+
+        public TemplateBuilder(
+            IViewEngine viewEngine,
+            IViewBufferScope bufferScope,
+            ViewContext viewContext,
+            ViewDataDictionary viewData,
+            ModelExplorer modelExplorer,
+            string htmlFieldName,
+            string templateName,
+            bool readOnly,
+            object additionalViewData)
+        {
+            if (viewEngine == null)
+            {
+                throw new ArgumentNullException(nameof(viewEngine));
+            }
+
+            if (bufferScope == null)
+            {
+                throw new ArgumentNullException(nameof(bufferScope));
+            }
+
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            if (viewData == null)
+            {
+                throw new ArgumentNullException(nameof(viewData));
+            }
+
+            if (modelExplorer == null)
+            {
+                throw new ArgumentNullException(nameof(modelExplorer));
+            }
+
+            _viewEngine = viewEngine;
+            _bufferScope = bufferScope;
+            _viewContext = viewContext;
+            _viewData = viewData;
+            _modelExplorer = modelExplorer;
+            _htmlFieldName = htmlFieldName;
+            _templateName = templateName;
+            _readOnly = readOnly;
+            _additionalViewData = additionalViewData;
+
+            _model = modelExplorer.Model;
+            _metadata = modelExplorer.Metadata;
+        }
+
+        public IHtmlContent Build()
+        {
+            if (_metadata.ConvertEmptyStringToNull && string.Empty.Equals(_model))
+            {
+                _model = null;
+            }
+
+            // Normally this shouldn't happen, unless someone writes their own custom Object templates which
+            // don't check to make sure that the object hasn't already been displayed
+            if (_viewData.TemplateInfo.Visited(_modelExplorer))
+            {
+                return HtmlString.Empty;
+            }
+
+            // Create VDD of type object so any model type is allowed.
+            var viewData = new ViewDataDictionary<object>(_viewData);
+
+            // Create a new ModelExplorer in order to preserve the model metadata of the original _viewData even
+            // though _model may have been reset to null. Otherwise we might lose track of the model type /property.
+            viewData.ModelExplorer = _modelExplorer.GetExplorerForModel(_model);
+
+            var formatString = _readOnly ? 
+                viewData.ModelMetadata.DisplayFormatString : 
+                viewData.ModelMetadata.EditFormatString;
+
+            var formattedModelValue = _model;
+            if (_model == null)
+            {
+                if (_readOnly)
+                {
+                    formattedModelValue = _metadata.NullDisplayText;
+                }
+            }
+            else if (!string.IsNullOrEmpty(formatString))
+            {
+                formattedModelValue = string.Format(CultureInfo.CurrentCulture, formatString, _model);
+            }
+            else if ((string.Equals("week", _templateName, StringComparison.OrdinalIgnoreCase) ||
+                string.Equals("week", viewData.ModelMetadata.DataTypeName, StringComparison.OrdinalIgnoreCase)))
+            {
+                // "week" is a new HTML5 input type that only will be rendered in Rfc3339 mode
+                formattedModelValue = FormatWeekHelper.GetFormattedWeek(_modelExplorer);
+            }
+            else if (viewData.ModelMetadata.IsEnum && _model is Enum modelEnum)
+            {
+                // Cover the case where the model is an enum and we want the string value of it
+                var value = modelEnum.ToString("d");
+                var enumGrouped = viewData.ModelMetadata.EnumGroupedDisplayNamesAndValues;
+                Debug.Assert(enumGrouped != null);
+                foreach (var kvp in enumGrouped)
+                {
+                    if (kvp.Value == value)
+                    {
+                        // Creates a ModelExplorer with the same Metadata except that the Model is a string instead of an Enum
+                        formattedModelValue = kvp.Key.Name;
+                        break;
+                    }
+                }
+            }
+
+            viewData.TemplateInfo.FormattedModelValue = formattedModelValue;
+            viewData.TemplateInfo.HtmlFieldPrefix = _viewData.TemplateInfo.GetFullHtmlFieldName(_htmlFieldName);
+
+            if (_additionalViewData != null)
+            {
+                foreach (var kvp in HtmlHelper.ObjectToDictionary(_additionalViewData))
+                {
+                    viewData[kvp.Key] = kvp.Value;
+                }
+            }
+
+            var visitedObjectsKey = _model ?? _modelExplorer.ModelType;
+            viewData.TemplateInfo.AddVisited(visitedObjectsKey);
+
+            var templateRenderer = new TemplateRenderer(
+                _viewEngine,
+                _bufferScope,
+                _viewContext,
+                viewData,
+                _templateName,
+                _readOnly);
+
+            return templateRenderer.Render();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateInfo.cs
new file mode 100644
index 0000000000..76abaa2389
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateInfo.cs
@@ -0,0 +1,100 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class TemplateInfo
+    {
+        // Keep a collection of visited objects to prevent infinite recursion.
+        private readonly HashSet<object> _visitedObjects;
+
+        private object _formattedModelValue;
+        private string _htmlFieldPrefix;
+
+        public TemplateInfo()
+        {
+            _htmlFieldPrefix = string.Empty;
+            _formattedModelValue = string.Empty;
+            _visitedObjects = new HashSet<object>();
+        }
+
+        public TemplateInfo(TemplateInfo original)
+        {
+            FormattedModelValue = original.FormattedModelValue;
+            HtmlFieldPrefix = original.HtmlFieldPrefix;
+            _visitedObjects = new HashSet<object>(original._visitedObjects);
+        }
+
+        /// <summary>
+        /// Gets or sets the formatted model value.
+        /// </summary>
+        /// <remarks>
+        /// Will never return <c>null</c> to avoid problems when using HTML helpers within a template.  Otherwise the
+        /// helpers could find elements in the `ViewDataDictionary`, not the intended Model properties.
+        /// </remarks>
+        /// <value>The formatted model value.</value>
+        public object FormattedModelValue
+        {
+            get { return _formattedModelValue; }
+            set { _formattedModelValue = value ?? string.Empty; }
+        }
+
+        /// <summary>
+        /// Gets or sets the HTML field prefix.
+        /// </summary>
+        /// <remarks>
+        /// Will never return <c>null</c> for consistency with <see cref="FormattedModelValue"/>.
+        /// </remarks>
+        /// <value>The HTML field prefix.</value>
+        public string HtmlFieldPrefix
+        {
+            get { return _htmlFieldPrefix; }
+            set { _htmlFieldPrefix = value ?? string.Empty; }
+        }
+
+        public int TemplateDepth
+        {
+            get { return _visitedObjects.Count; }
+        }
+
+        public bool AddVisited(object value)
+        {
+            return _visitedObjects.Add(value);
+        }
+
+        /// <summary>
+        /// Returns the full HTML element name for the specified <paramref name="partialFieldName"/>.
+        /// </summary>
+        /// <param name="partialFieldName">Expression name, relative to the current model.</param>
+        /// <returns>Fully-qualified expression name for <paramref name="partialFieldName"/>.</returns>
+        public string GetFullHtmlFieldName(string partialFieldName)
+        {
+            if (string.IsNullOrEmpty(partialFieldName))
+            {
+                return HtmlFieldPrefix;
+            }
+
+            if (string.IsNullOrEmpty(HtmlFieldPrefix))
+            {
+                return partialFieldName;
+            }
+
+            if (partialFieldName.StartsWith("[", StringComparison.Ordinal))
+            {
+                // The partialFieldName might represent an indexer access, in which case combining
+                // with a 'dot' would be invalid.
+                return HtmlFieldPrefix + partialFieldName;
+            }
+
+            return HtmlFieldPrefix + "." + partialFieldName;
+        }
+
+        public bool Visited(ModelExplorer modelExplorer)
+        {
+            return _visitedObjects.Contains(modelExplorer.Model ?? modelExplorer.Metadata.ModelType);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateRenderer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateRenderer.cs
new file mode 100644
index 0000000000..f90a3441ed
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateRenderer.cs
@@ -0,0 +1,269 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class TemplateRenderer
+    {
+        private const string DisplayTemplateViewPath = "DisplayTemplates";
+        private const string EditorTemplateViewPath = "EditorTemplates";
+        public const string IEnumerableOfIFormFileName = "IEnumerable`" + nameof(IFormFile);
+
+        private static readonly Dictionary<string, Func<IHtmlHelper, IHtmlContent>> _defaultDisplayActions =
+            new Dictionary<string, Func<IHtmlHelper, IHtmlContent>>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "Collection", DefaultDisplayTemplates.CollectionTemplate },
+                { "EmailAddress", DefaultDisplayTemplates.EmailAddressTemplate },
+                { "HiddenInput", DefaultDisplayTemplates.HiddenInputTemplate },
+                { "Html", DefaultDisplayTemplates.HtmlTemplate },
+                { "Text", DefaultDisplayTemplates.StringTemplate },
+                { "Url", DefaultDisplayTemplates.UrlTemplate },
+                { typeof(bool).Name, DefaultDisplayTemplates.BooleanTemplate },
+                { typeof(decimal).Name, DefaultDisplayTemplates.DecimalTemplate },
+                { typeof(string).Name, DefaultDisplayTemplates.StringTemplate },
+                { typeof(object).Name, DefaultDisplayTemplates.ObjectTemplate },
+            };
+
+        private static readonly Dictionary<string, Func<IHtmlHelper, IHtmlContent>> _defaultEditorActions =
+            new Dictionary<string, Func<IHtmlHelper, IHtmlContent>>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "Collection", DefaultEditorTemplates.CollectionTemplate },
+                { "EmailAddress", DefaultEditorTemplates.EmailAddressInputTemplate },
+                { "HiddenInput", DefaultEditorTemplates.HiddenInputTemplate },
+                { "MultilineText", DefaultEditorTemplates.MultilineTemplate },
+                { "Password", DefaultEditorTemplates.PasswordTemplate },
+                { "PhoneNumber", DefaultEditorTemplates.PhoneNumberInputTemplate },
+                { "Text", DefaultEditorTemplates.StringTemplate },
+                { "Url", DefaultEditorTemplates.UrlInputTemplate },
+                { "Date", DefaultEditorTemplates.DateInputTemplate },
+                { "DateTime", DefaultEditorTemplates.DateTimeLocalInputTemplate },
+                { "DateTime-local", DefaultEditorTemplates.DateTimeLocalInputTemplate },
+                { nameof(DateTimeOffset), DefaultEditorTemplates.DateTimeOffsetTemplate },
+                { "Time", DefaultEditorTemplates.TimeInputTemplate },
+                { "Month", DefaultEditorTemplates.MonthInputTemplate },
+                { "Week", DefaultEditorTemplates.WeekInputTemplate },
+                { typeof(byte).Name, DefaultEditorTemplates.NumberInputTemplate },
+                { typeof(sbyte).Name, DefaultEditorTemplates.NumberInputTemplate },
+                { typeof(short).Name, DefaultEditorTemplates.NumberInputTemplate },
+                { typeof(ushort).Name, DefaultEditorTemplates.NumberInputTemplate },
+                { typeof(int).Name, DefaultEditorTemplates.NumberInputTemplate },
+                { typeof(uint).Name, DefaultEditorTemplates.NumberInputTemplate },
+                { typeof(long).Name, DefaultEditorTemplates.NumberInputTemplate },
+                { typeof(ulong).Name, DefaultEditorTemplates.NumberInputTemplate },
+                { typeof(bool).Name, DefaultEditorTemplates.BooleanTemplate },
+                { typeof(decimal).Name, DefaultEditorTemplates.DecimalTemplate },
+                { typeof(string).Name, DefaultEditorTemplates.StringTemplate },
+                { typeof(object).Name, DefaultEditorTemplates.ObjectTemplate },
+                { typeof(IFormFile).Name, DefaultEditorTemplates.FileInputTemplate },
+                { IEnumerableOfIFormFileName, DefaultEditorTemplates.FileCollectionInputTemplate },
+            };
+
+        private readonly IViewEngine _viewEngine;
+        private readonly IViewBufferScope _bufferScope;
+        private readonly ViewContext _viewContext;
+        private readonly ViewDataDictionary _viewData;
+        private readonly string _templateName;
+        private readonly bool _readOnly;
+
+        public TemplateRenderer(
+            IViewEngine viewEngine,
+            IViewBufferScope bufferScope,
+            ViewContext viewContext,
+            ViewDataDictionary viewData,
+            string templateName,
+            bool readOnly)
+        {
+            if (viewEngine == null)
+            {
+                throw new ArgumentNullException(nameof(viewEngine));
+            }
+
+            if (bufferScope == null)
+            {
+                throw new ArgumentNullException(nameof(bufferScope));
+            }
+
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            if (viewData == null)
+            {
+                throw new ArgumentNullException(nameof(viewData));
+            }
+
+            _viewEngine = viewEngine;
+            _bufferScope = bufferScope;
+            _viewContext = viewContext;
+            _viewData = viewData;
+            _templateName = templateName;
+            _readOnly = readOnly;
+        }
+
+        public IHtmlContent Render()
+        {
+            var defaultActions = GetDefaultActions();
+            var modeViewPath = _readOnly ? DisplayTemplateViewPath : EditorTemplateViewPath;
+
+            foreach (var viewName in GetViewNames())
+            {
+                var viewEngineResult = _viewEngine.GetView(_viewContext.ExecutingFilePath, viewName, isMainPage: false);
+                if (!viewEngineResult.Success)
+                {
+                    var fullViewName = modeViewPath + "/" + viewName;
+                    viewEngineResult = _viewEngine.FindView(_viewContext, fullViewName, isMainPage: false);
+                }
+
+                if (viewEngineResult.Success)
+                {
+                    var viewBuffer = new ViewBuffer(_bufferScope, viewName, ViewBuffer.PartialViewPageSize);
+                    using (var writer = new ViewBufferTextWriter(viewBuffer, _viewContext.Writer.Encoding))
+                    {
+                        // Forcing synchronous behavior so users don't have to await templates.
+                        var view = viewEngineResult.View;
+                        using (view as IDisposable)
+                        {
+                            var viewContext = new ViewContext(_viewContext, viewEngineResult.View, _viewData, writer);
+                            var renderTask = viewEngineResult.View.RenderAsync(viewContext);
+                            renderTask.GetAwaiter().GetResult();
+                            return viewBuffer;
+                        }
+                    }
+                }
+
+                if (defaultActions.TryGetValue(viewName, out var defaultAction))
+                {
+                    return defaultAction(MakeHtmlHelper(_viewContext, _viewData));
+                }
+            }
+
+            throw new InvalidOperationException(
+                Resources.FormatTemplateHelpers_NoTemplate(_viewData.ModelExplorer.ModelType.FullName));
+        }
+
+        private Dictionary<string, Func<IHtmlHelper, IHtmlContent>> GetDefaultActions()
+        {
+            return _readOnly ? _defaultDisplayActions : _defaultEditorActions;
+        }
+
+        private IEnumerable<string> GetViewNames()
+        {
+            var metadata = _viewData.ModelMetadata;
+            var templateHints = new[]
+            {
+                _templateName,
+                metadata.TemplateHint,
+                metadata.DataTypeName
+            };
+
+            foreach (var templateHint in templateHints.Where(s => !string.IsNullOrEmpty(s)))
+            {
+                yield return templateHint;
+            }
+
+            // We don't want to search for Nullable<T>, we want to search for T (which should handle both T and
+            // Nullable<T>).
+            var fieldType = metadata.UnderlyingOrModelType;
+            foreach (var typeName in GetTypeNames(metadata, fieldType))
+            {
+                yield return typeName;
+            }
+        }
+
+        public static IEnumerable<string> GetTypeNames(ModelMetadata modelMetadata, Type fieldType)
+        {
+            // Not returning type name here for IEnumerable<IFormFile> since we will be returning
+            // a more specific name, IEnumerableOfIFormFileName.
+            var fieldTypeInfo = fieldType.GetTypeInfo();
+
+            if (typeof(IEnumerable<IFormFile>) != fieldType)
+            {
+                yield return fieldType.Name;
+            }
+
+            if (fieldType == typeof(string))
+            {
+                // Nothing more to provide
+                yield break;
+            }
+            else if (!modelMetadata.IsComplexType)
+            {
+                // IsEnum is false for the Enum class itself
+                if (fieldTypeInfo.IsEnum)
+                {
+                    // Same as fieldType.BaseType.Name in this case
+                    yield return "Enum";
+                }
+                else if (fieldType == typeof(DateTimeOffset))
+                {
+                    yield return "DateTime";
+                }
+
+                yield return "String";
+                yield break;
+            }
+            else if (!fieldTypeInfo.IsInterface)
+            {
+                var type = fieldType;
+                while (true)
+                {
+                    type = type.GetTypeInfo().BaseType;
+                    if (type == null || type == typeof(object))
+                    {
+                        break;
+                    }
+
+                    yield return type.Name;
+                }
+            }
+
+            if (typeof(IEnumerable).IsAssignableFrom(fieldType))
+            {
+                if (typeof(IEnumerable<IFormFile>).IsAssignableFrom(fieldType))
+                {
+                    yield return IEnumerableOfIFormFileName;
+
+                    // Specific name has already been returned, now return the generic name.
+                    if (typeof(IEnumerable<IFormFile>) == fieldType)
+                    {
+                        yield return fieldType.Name;
+                    }
+                }
+
+                yield return "Collection";
+            }
+            else if (typeof(IFormFile) != fieldType && typeof(IFormFile).IsAssignableFrom(fieldType))
+            {
+                yield return nameof(IFormFile);
+            }
+
+            yield return "Object";
+        }
+
+        private static IHtmlHelper MakeHtmlHelper(ViewContext viewContext, ViewDataDictionary viewData)
+        {
+            var newHelper = viewContext.HttpContext.RequestServices.GetRequiredService<IHtmlHelper>();
+
+            if (newHelper is IViewContextAware contextable)
+            {
+                var newViewContext = new ViewContext(viewContext, viewContext.View, viewData, viewContext.Writer);
+                contextable.Contextualize(newViewContext);
+            }
+
+            return newHelper;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TryGetValueDelegate.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TryGetValueDelegate.cs
new file mode 100644
index 0000000000..44b2e4e3dd
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TryGetValueDelegate.cs
@@ -0,0 +1,7 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public delegate bool TryGetValueDelegate(object dictionary, string key, out object value);
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TryGetValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TryGetValueProvider.cs
new file mode 100644
index 0000000000..a121363f4f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TryGetValueProvider.cs
@@ -0,0 +1,101 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Threading;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public static class TryGetValueProvider
+    {
+        private static readonly Dictionary<Type, TryGetValueDelegate> _tryGetValueDelegateCache =
+            new Dictionary<Type, TryGetValueDelegate>();
+        private static readonly ReaderWriterLockSlim _tryGetValueDelegateCacheLock = new ReaderWriterLockSlim();
+
+        // Information about private static method declared below.
+        private static readonly MethodInfo _strongTryGetValueImplInfo =
+            typeof(TryGetValueProvider).GetTypeInfo().GetDeclaredMethod(nameof(StrongTryGetValueImpl));
+
+        public static TryGetValueDelegate CreateInstance(Type targetType)
+        {
+            if (targetType == null)
+            {
+                throw new ArgumentNullException(nameof(targetType));
+            }
+
+            TryGetValueDelegate result;
+
+            // Cache delegates since properties of model types are re-evaluated numerous times.
+            _tryGetValueDelegateCacheLock.EnterReadLock();
+            try
+            {
+                if (_tryGetValueDelegateCache.TryGetValue(targetType, out result))
+                {
+                    return result;
+                }
+            }
+            finally
+            {
+                _tryGetValueDelegateCacheLock.ExitReadLock();
+            }
+
+            var dictionaryType = ClosedGenericMatcher.ExtractGenericInterface(targetType, typeof(IDictionary<,>));
+
+            // Just wrap a call to the underlying IDictionary<TKey, TValue>.TryGetValue() where string can be cast to
+            // TKey.
+            if (dictionaryType != null)
+            {
+                var typeArguments = dictionaryType.GenericTypeArguments;
+                var keyType = typeArguments[0];
+                var returnType = typeArguments[1];
+
+                if (keyType.IsAssignableFrom(typeof(string)))
+                {
+                    var implementationMethod = _strongTryGetValueImplInfo.MakeGenericMethod(keyType, returnType);
+                    result = (TryGetValueDelegate)implementationMethod.CreateDelegate(typeof(TryGetValueDelegate));
+                }
+            }
+
+            // Wrap a call to the underlying IDictionary.Item().
+            if (result == null && typeof(IDictionary).IsAssignableFrom(targetType))
+            {
+                result = TryGetValueFromNonGenericDictionary;
+            }
+
+            _tryGetValueDelegateCacheLock.EnterWriteLock();
+            try
+            {
+                _tryGetValueDelegateCache[targetType] = result;
+            }
+            finally
+            {
+                _tryGetValueDelegateCacheLock.ExitWriteLock();
+            }
+
+            return result;
+        }
+
+        private static bool StrongTryGetValueImpl<TKey, TValue>(object dictionary, string key, out object value)
+        {
+            var strongDict = (IDictionary<TKey, TValue>)dictionary;
+
+            TValue strongValue;
+            var success = strongDict.TryGetValue((TKey)(object)key, out strongValue);
+            value = strongValue;
+            return success;
+        }
+
+        private static bool TryGetValueFromNonGenericDictionary(object dictionary, string key, out object value)
+        {
+            var weakDict = (IDictionary)dictionary;
+
+            var success = weakDict.Contains(key);
+            value = success ? weakDict[key] : null;
+            return success;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ValidationHtmlAttributeProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ValidationHtmlAttributeProvider.cs
new file mode 100644
index 0000000000..75ce264ed6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ValidationHtmlAttributeProvider.cs
@@ -0,0 +1,91 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Contract for a service providing validation attributes for expressions.
+    /// </summary>
+    public abstract class ValidationHtmlAttributeProvider
+    {
+        /// <summary>
+        /// Adds validation-related HTML attributes to the <paramref name="attributes" /> if client validation is
+        /// enabled.
+        /// </summary>
+        /// <param name="viewContext">A <see cref="ViewContext"/> instance for the current scope.</param>
+        /// <param name="modelExplorer">The <see cref="ModelExplorer"/> for an expression.</param>
+        /// <param name="attributes">
+        /// The <see cref="Dictionary{TKey, TValue}"/> to receive the validation attributes. Maps the validation
+        /// attribute names to their <see cref="string"/> values. Values must be HTML encoded before they are written
+        /// to an HTML document or response.
+        /// </param>
+        /// <remarks>
+        /// Adds nothing to <paramref name="attributes"/> if client-side validation is disabled.
+        /// </remarks>
+        public abstract void AddValidationAttributes(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            IDictionary<string, string> attributes);
+
+        /// <summary>
+        /// Adds validation-related HTML attributes to the <paramref name="attributes" /> if client validation is
+        /// enabled and validation attributes have not yet been added for this <paramref name="expression"/> in the
+        /// current &lt;form&gt;.
+        /// </summary>
+        /// <param name="viewContext">A <see cref="ViewContext"/> instance for the current scope.</param>
+        /// <param name="modelExplorer">The <see cref="ModelExplorer"/> for the <paramref name="expression"/>.</param>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="attributes">
+        /// The <see cref="Dictionary{TKey, TValue}"/> to receive the validation attributes. Maps the validation
+        /// attribute names to their <see cref="string"/> values. Values must be HTML encoded before they are written
+        /// to an HTML document or response.
+        /// </param>
+        /// <remarks>
+        /// Tracks the <paramref name="expression"/> in the current <see cref="FormContext"/> to avoid generating
+        /// duplicate validation attributes. That is, validation attributes are added only if no previous call has
+        /// added them for a field with this name in the &lt;form&gt;.
+        /// </remarks>
+        public virtual void AddAndTrackValidationAttributes(
+            ViewContext viewContext,
+            ModelExplorer modelExplorer,
+            string expression,
+            IDictionary<string, string> attributes)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            if (modelExplorer == null)
+            {
+                throw new ArgumentNullException(nameof(modelExplorer));
+            }
+
+            if (attributes == null)
+            {
+                throw new ArgumentNullException(nameof(attributes));
+            }
+
+            // Don't track fields when client-side validation is disabled.
+            var formContext = viewContext.ClientValidationEnabled ? viewContext.FormContext : null;
+            if (formContext == null)
+            {
+                return;
+            }
+
+            var fullName = viewContext.ViewData.TemplateInfo.GetFullHtmlFieldName(expression);
+            if (formContext.RenderedField(fullName))
+            {
+                return;
+            }
+
+            formContext.RenderedField(fullName, true);
+
+            AddValidationAttributes(viewContext, modelExplorer, attributes);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewComponentResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewComponentResultExecutor.cs
new file mode 100644
index 0000000000..164de35ba1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewComponentResultExecutor.cs
@@ -0,0 +1,158 @@
+// 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.
+
+using System;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewComponentResultExecutor : IActionResultExecutor<ViewComponentResult>
+    {
+        private readonly HtmlEncoder _htmlEncoder;
+        private readonly HtmlHelperOptions _htmlHelperOptions;
+        private readonly ILogger<ViewComponentResult> _logger;
+        private readonly IModelMetadataProvider _modelMetadataProvider;
+        private readonly ITempDataDictionaryFactory _tempDataDictionaryFactory;
+
+        public ViewComponentResultExecutor(
+            IOptions<MvcViewOptions> mvcHelperOptions,
+            ILoggerFactory loggerFactory,
+            HtmlEncoder htmlEncoder,
+            IModelMetadataProvider modelMetadataProvider,
+            ITempDataDictionaryFactory tempDataDictionaryFactory)
+        {
+            if (mvcHelperOptions == null)
+            {
+                throw new ArgumentNullException(nameof(mvcHelperOptions));
+            }
+
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            if (htmlEncoder == null)
+            {
+                throw new ArgumentNullException(nameof(htmlEncoder));
+            }
+
+            if (modelMetadataProvider == null)
+            {
+                throw new ArgumentNullException(nameof(modelMetadataProvider));
+            }
+
+            if (tempDataDictionaryFactory == null)
+            {
+                throw new ArgumentNullException(nameof(tempDataDictionaryFactory));
+            }
+
+            _htmlHelperOptions = mvcHelperOptions.Value.HtmlHelperOptions;
+            _logger = loggerFactory.CreateLogger<ViewComponentResult>();
+            _htmlEncoder = htmlEncoder;
+            _modelMetadataProvider = modelMetadataProvider;
+            _tempDataDictionaryFactory = tempDataDictionaryFactory;
+        }
+
+        /// <inheritdoc />
+        public virtual async Task ExecuteAsync(ActionContext context, ViewComponentResult result)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            var response = context.HttpContext.Response;
+
+            var viewData = result.ViewData;
+            if (viewData == null)
+            {
+                viewData = new ViewDataDictionary(_modelMetadataProvider, context.ModelState);
+            }
+
+            var tempData = result.TempData;
+            if (tempData == null)
+            {
+                tempData = _tempDataDictionaryFactory.GetTempData(context.HttpContext);
+            }
+
+            ResponseContentTypeHelper.ResolveContentTypeAndEncoding(
+                result.ContentType,
+                response.ContentType,
+                ViewExecutor.DefaultContentType,
+                out var resolvedContentType,
+                out var resolvedContentTypeEncoding);
+
+            response.ContentType = resolvedContentType;
+
+            if (result.StatusCode != null)
+            {
+                response.StatusCode = result.StatusCode.Value;
+            }
+
+            using (var writer = new HttpResponseStreamWriter(response.Body, resolvedContentTypeEncoding))
+            {
+                var viewContext = new ViewContext(
+                    context,
+                    NullView.Instance,
+                    viewData,
+                    tempData,
+                    writer,
+                    _htmlHelperOptions);
+
+                OnExecuting(viewContext);
+
+                // IViewComponentHelper is stateful, we want to make sure to retrieve it every time we need it.
+                var viewComponentHelper = context.HttpContext.RequestServices.GetRequiredService<IViewComponentHelper>();
+                (viewComponentHelper as IViewContextAware)?.Contextualize(viewContext);
+
+                var viewComponentResult = await GetViewComponentResult(viewComponentHelper, _logger, result);
+                viewComponentResult.WriteTo(writer, _htmlEncoder);
+            }
+        }
+
+        private void OnExecuting(ViewContext viewContext)
+        {
+            var viewDataValuesProvider = viewContext.HttpContext.Features.Get<IViewDataValuesProviderFeature>();
+            if (viewDataValuesProvider != null)
+            {
+                viewDataValuesProvider.ProvideViewDataValues(viewContext.ViewData);
+            }
+        }
+
+        private Task<IHtmlContent> GetViewComponentResult(IViewComponentHelper viewComponentHelper, ILogger logger, ViewComponentResult result)
+        {
+            if (result.ViewComponentType == null && result.ViewComponentName == null)
+            {
+                throw new InvalidOperationException(Resources.FormatViewComponentResult_NameOrTypeMustBeSet(
+                    nameof(ViewComponentResult.ViewComponentName),
+                    nameof(ViewComponentResult.ViewComponentType)));
+            }
+            else if (result.ViewComponentType == null)
+            {
+                logger.ViewComponentResultExecuting(result.ViewComponentName);
+                return viewComponentHelper.InvokeAsync(result.ViewComponentName, result.Arguments);
+            }
+            else
+            {
+                logger.ViewComponentResultExecuting(result.ViewComponentType);
+                return viewComponentHelper.InvokeAsync(result.ViewComponentType, result.Arguments);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewContextAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewContextAttribute.cs
new file mode 100644
index 0000000000..c266d07873
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewContextAttribute.cs
@@ -0,0 +1,17 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Specifies that a tag helper property should be set with the current
+    /// <see cref="Rendering.ViewContext"/> when creating the tag helper. The property must have a
+    /// public set method.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
+    public class ViewContextAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs
new file mode 100644
index 0000000000..c560b810db
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs
@@ -0,0 +1,618 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewDataDictionary : IDictionary<string, object>
+    {
+        private readonly IDictionary<string, object> _data;
+        private readonly Type _declaredModelType;
+        private readonly IModelMetadataProvider _metadataProvider;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewDataDictionary"/> class.
+        /// </summary>
+        /// <param name="metadataProvider">
+        /// <see cref="IModelMetadataProvider"/> instance used to create <see cref="ViewFeatures.ModelExplorer"/>
+        /// instances.
+        /// </param>
+        /// <param name="modelState"><see cref="ModelStateDictionary"/> instance for this scope.</param>
+        /// <remarks>For use when creating a <see cref="ViewDataDictionary"/> for a new top-level scope.</remarks>
+        public ViewDataDictionary(
+            IModelMetadataProvider metadataProvider,
+            ModelStateDictionary modelState)
+            : this(metadataProvider, modelState, declaredModelType: typeof(object))
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewDataDictionary"/> class based entirely on an existing
+        /// instance.
+        /// </summary>
+        /// <param name="source"><see cref="ViewDataDictionary"/> instance to copy initial values from.</param>
+        /// <remarks>
+        /// <para>
+        /// For use when copying a <see cref="ViewDataDictionary"/> instance and the declared <see cref="Model"/>
+        /// <see cref="Type"/> will not change e.g. when copying from a <see cref="ViewDataDictionary{TModel}"/>
+        /// instance to a base <see cref="ViewDataDictionary"/> instance.
+        /// </para>
+        /// <para>
+        /// This constructor should not be used in any context where <see cref="Model"/> may be set to a value
+        /// incompatible with the declared type of <paramref name="source"/>.
+        /// </para>
+        /// </remarks>
+        public ViewDataDictionary(ViewDataDictionary source)
+            : this(source, source.Model, source._declaredModelType)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewDataDictionary"/> class.
+        /// </summary>
+        /// <param name="metadataProvider">
+        /// <see cref="IModelMetadataProvider"/> instance used to create <see cref="ViewFeatures.ModelExplorer"/>
+        /// instances.
+        /// </param>
+        /// <remarks>Internal for testing.</remarks>
+        internal ViewDataDictionary(IModelMetadataProvider metadataProvider)
+            : this(metadataProvider, new ModelStateDictionary())
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewDataDictionary"/> class.
+        /// </summary>
+        /// <param name="metadataProvider">
+        /// <see cref="IModelMetadataProvider"/> instance used to create <see cref="ViewFeatures.ModelExplorer"/>
+        /// instances.
+        /// </param>
+        /// <param name="declaredModelType">
+        /// <see cref="Type"/> of <see cref="Model"/> values expected. Used to set <see cref="ModelMetadata"/>.
+        /// </param>
+        /// <remarks>
+        /// For use when creating a derived <see cref="ViewDataDictionary"/> for a new top-level scope.
+        /// </remarks>
+        protected ViewDataDictionary(
+            IModelMetadataProvider metadataProvider,
+            Type declaredModelType)
+            : this(metadataProvider, new ModelStateDictionary(), declaredModelType)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewDataDictionary"/> class.
+        /// </summary>
+        /// <param name="metadataProvider">
+        /// <see cref="IModelMetadataProvider"/> instance used to create <see cref="ViewFeatures.ModelExplorer"/>
+        /// instances.
+        /// </param>
+        /// <param name="modelState"><see cref="ModelStateDictionary"/> instance for this scope.</param>
+        /// <param name="declaredModelType">
+        /// <see cref="Type"/> of <see cref="Model"/> values expected. Used to set <see cref="ModelMetadata"/>.
+        /// </param>
+        /// <remarks>
+        /// For use when creating a derived <see cref="ViewDataDictionary"/> for a new top-level scope.
+        /// </remarks>
+        // This is the core constructor called when Model is unknown.
+        protected ViewDataDictionary(
+            IModelMetadataProvider metadataProvider,
+            ModelStateDictionary modelState,
+            Type declaredModelType)
+            : this(metadataProvider,
+                   modelState,
+                   declaredModelType,
+                   data: new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase),
+                   templateInfo: new TemplateInfo())
+        {
+            if (metadataProvider == null)
+            {
+                throw new ArgumentNullException(nameof(metadataProvider));
+            }
+
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            if (declaredModelType == null)
+            {
+                throw new ArgumentNullException(nameof(declaredModelType));
+            }
+
+            // Base ModelMetadata on the declared type.
+            ModelExplorer = _metadataProvider.GetModelExplorerForType(declaredModelType, model: null);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewDataDictionary"/> class based in part on an existing
+        /// instance.
+        /// </summary>
+        /// <param name="source"><see cref="ViewDataDictionary"/> instance to copy initial values from.</param>
+        /// <param name="declaredModelType">
+        /// <see cref="Type"/> of <see cref="Model"/> values expected. Used to set <see cref="ModelMetadata"/>.
+        /// </param>
+        /// <remarks>
+        /// <para>
+        /// For use when copying a <see cref="ViewDataDictionary"/> instance and new instance's declared
+        /// <see cref="Model"/> <see cref="Type"/> is known but <see cref="Model"/> should be copied from the existing
+        /// instance e.g. when copying from a base <see cref="ViewDataDictionary"/> instance to a
+        /// <see cref="ViewDataDictionary{TModel}"/> instance.
+        /// </para>
+        /// <para>
+        /// This constructor may <c>throw</c> if <c>source.Model</c> is non-<c>null</c> and incompatible with
+        /// <paramref name="declaredModelType"/>. Pass <c>model: null</c> to
+        /// <see cref="ViewDataDictionary(ViewDataDictionary, object, Type)"/> to ignore <c>source.Model</c>.
+        /// </para>
+        /// </remarks>
+        protected ViewDataDictionary(ViewDataDictionary source, Type declaredModelType)
+            : this(source, model: source.Model, declaredModelType: declaredModelType)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewDataDictionary"/> class based in part on an existing
+        /// instance. This constructor is careful to avoid exceptions <see cref="SetModel"/> may throw when
+        /// <paramref name="model"/> is <c>null</c>.
+        /// </summary>
+        /// <param name="source"><see cref="ViewDataDictionary"/> instance to copy initial values from.</param>
+        /// <param name="model">Value for the <see cref="Model"/> property.</param>
+        /// <param name="declaredModelType">
+        /// <see cref="Type"/> of <see cref="Model"/> values expected. Used to set <see cref="ModelMetadata"/>.
+        /// </param>
+        /// <remarks>
+        /// <para>
+        /// For use when copying a <see cref="ViewDataDictionary"/> instance and new instance's declared
+        /// <see cref="Model"/> <see cref="Type"/> and <see cref="Model"/> are known.
+        /// </para>
+        /// <para>
+        /// This constructor may <c>throw</c> if <paramref name="model"/> is non-<c>null</c> and incompatible with
+        /// <paramref name="declaredModelType"/>.
+        /// </para>
+        /// </remarks>
+        // This is the core constructor called when Model is known.
+        protected ViewDataDictionary(ViewDataDictionary source, object model, Type declaredModelType)
+            : this(source._metadataProvider,
+                   source.ModelState,
+                   declaredModelType,
+                   data: new CopyOnWriteDictionary<string, object>(source, StringComparer.OrdinalIgnoreCase),
+                   templateInfo: new TemplateInfo(source.TemplateInfo))
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            // A non-null Model must always be assignable to both _declaredModelType and ModelMetadata.ModelType.
+            //
+            // ModelMetadata.ModelType should also be assignable to _declaredModelType. Though corner cases exist such
+            // as a ViewDataDictionary<List<int>> holding information about an IEnumerable<int> property (because an
+            // @model directive matched the runtime type though the view's name did not), we'll throw away the property
+            // metadata in those cases -- preserving invariant that ModelType can be assigned to _declaredModelType.
+            //
+            // More generally, since defensive copies to base VDD and VDD<object> abound, it's important to preserve
+            // metadata despite _declaredModelType changes.
+            var modelType = model?.GetType();
+            var modelOrDeclaredType = modelType ?? declaredModelType;
+            if (source.ModelMetadata.MetadataKind == ModelMetadataKind.Type &&
+                source.ModelMetadata.ModelType == typeof(object) &&
+                modelOrDeclaredType != typeof(object))
+            {
+                // Base ModelMetadata on new type when there's no property information to preserve and type changes to
+                // something besides typeof(object).
+                ModelExplorer = _metadataProvider.GetModelExplorerForType(modelOrDeclaredType, model);
+            }
+            else if (!declaredModelType.IsAssignableFrom(source.ModelMetadata.ModelType))
+            {
+                // Base ModelMetadata on new type when existing metadata is incompatible with the new declared type.
+                ModelExplorer = _metadataProvider.GetModelExplorerForType(modelOrDeclaredType, model);
+            }
+            else if (modelType != null && !source.ModelMetadata.ModelType.IsAssignableFrom(modelType))
+            {
+                // Base ModelMetadata on new type when new model is incompatible with the existing metadata.
+                ModelExplorer = _metadataProvider.GetModelExplorerForType(modelType, model);
+            }
+            else if (object.ReferenceEquals(model, source.ModelExplorer.Model))
+            {
+                // Source's ModelExplorer is already exactly correct.
+                ModelExplorer = source.ModelExplorer;
+            }
+            else
+            {
+                // The existing metadata is compatible with the value and declared type but it's a new value.
+                ModelExplorer = new ModelExplorer(
+                    _metadataProvider,
+                    source.ModelExplorer.Container,
+                    source.ModelMetadata,
+                    model);
+            }
+
+            // Ensure the given Model is compatible with _declaredModelType. Do not do this one of the following
+            // special cases:
+            // - Constructing a ViewDataDictionary<TModel> where TModel is a non-Nullable value type. This may for
+            // example occur when activating a RazorPage<int> and the container is null.
+            // - Constructing a ViewDataDictionary<object> immediately before overwriting ModelExplorer with correct
+            // information. See TemplateBuilder.Build().
+            if (model != null)
+            {
+                EnsureCompatible(model);
+            }
+        }
+
+        private ViewDataDictionary(
+            IModelMetadataProvider metadataProvider,
+            ModelStateDictionary modelState,
+            Type declaredModelType,
+            IDictionary<string, object> data,
+            TemplateInfo templateInfo)
+        {
+            _metadataProvider = metadataProvider;
+            ModelState = modelState;
+            _declaredModelType = declaredModelType;
+            _data = data;
+            TemplateInfo = templateInfo;
+        }
+
+        /// <summary>
+        /// Gets or sets the current model.
+        /// </summary>
+        public object Model
+        {
+            get
+            {
+                return ModelExplorer.Model;
+            }
+            set
+            {
+                // Reset ModelExplorer to ensure Model and ModelExplorer.Model remain equal.
+                SetModel(value);
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="ModelStateDictionary"/>.
+        /// </summary>
+        public ModelStateDictionary ModelState { get; }
+
+        /// <summary>
+        /// Gets the <see cref="ModelBinding.ModelMetadata"/> for an expression, the <see cref="Model"/> (if
+        /// non-<c>null</c>), or the declared <see cref="Type"/>.
+        /// </summary>
+        /// <remarks>
+        /// Value is never <c>null</c> but may describe the <see cref="object"/> class in some cases. This may for
+        /// example occur in controllers.
+        /// </remarks>
+        public ModelMetadata ModelMetadata
+        {
+            get
+            {
+                return ModelExplorer.Metadata;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ViewFeatures.ModelExplorer"/> for the <see cref="Model"/>.
+        /// </summary>
+        public ModelExplorer ModelExplorer { get; set; }
+
+        /// <summary>
+        /// Gets the <see cref="ViewFeatures.TemplateInfo"/>.
+        /// </summary>
+        public TemplateInfo TemplateInfo { get; }
+
+        #region IDictionary properties
+        /// <inheritdoc />
+        // Do not just pass through to _data: Indexer should not throw a KeyNotFoundException.
+        public object this[string index]
+        {
+            get
+            {
+                object result;
+                _data.TryGetValue(index, out result);
+                return result;
+            }
+            set
+            {
+                _data[index] = value;
+            }
+        }
+
+        /// <inheritdoc />
+        public int Count
+        {
+            get { return _data.Count; }
+        }
+
+        /// <inheritdoc />
+        public bool IsReadOnly
+        {
+            get { return _data.IsReadOnly; }
+        }
+
+        /// <inheritdoc />
+        public ICollection<string> Keys
+        {
+            get { return _data.Keys; }
+        }
+
+        /// <inheritdoc />
+        public ICollection<object> Values
+        {
+            get { return _data.Values; }
+        }
+        #endregion
+
+        // for unit testing
+        internal IDictionary<string, object> Data
+        {
+            get { return _data; }
+        }
+
+        /// <summary>
+        /// Gets value of named <paramref name="expression"/> in this <see cref="ViewDataDictionary"/>.
+        /// </summary>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <returns>Value of named <paramref name="expression"/> in this <see cref="ViewDataDictionary"/>.</returns>
+        /// <remarks>
+        /// Looks up <paramref name="expression"/> in the dictionary first. Falls back to evaluating it against
+        /// <see cref="Model"/>.
+        /// </remarks>
+        public object Eval(string expression)
+        {
+            var info = GetViewDataInfo(expression);
+            return info?.Value;
+        }
+
+        /// <summary>
+        /// Gets value of named <paramref name="expression"/> in this <see cref="ViewDataDictionary"/>, formatted
+        /// using given <paramref name="format"/>.
+        /// </summary>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <param name="format">
+        /// The format string (see https://msdn.microsoft.com/en-us/library/txafckwd.aspx).
+        /// </param>
+        /// <returns>
+        /// Value of named <paramref name="expression"/> in this <see cref="ViewDataDictionary"/>, formatted using
+        /// given <paramref name="format"/>.
+        /// </returns>
+        /// <remarks>
+        /// Looks up <paramref name="expression"/> in the dictionary first. Falls back to evaluating it against
+        /// <see cref="Model"/>.
+        /// </remarks>
+        public string Eval(string expression, string format)
+        {
+            var value = Eval(expression);
+            return FormatValue(value, format);
+        }
+
+        /// <summary>
+        /// Formats the given <paramref name="value"/> using given <paramref name="format"/>.
+        /// </summary>
+        /// <param name="value">The value to format.</param>
+        /// <param name="format">
+        /// The format string (see https://msdn.microsoft.com/en-us/library/txafckwd.aspx).
+        /// </param>
+        /// <returns>The formatted <see cref="string"/>.</returns>
+        public static string FormatValue(object value, string format)
+        {
+            if (value == null)
+            {
+                return string.Empty;
+            }
+
+            if (string.IsNullOrEmpty(format))
+            {
+                return Convert.ToString(value, CultureInfo.CurrentCulture);
+            }
+            else
+            {
+                return string.Format(CultureInfo.CurrentCulture, format, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets <see cref="ViewDataInfo"/> for named <paramref name="expression"/> in this
+        /// <see cref="ViewDataDictionary"/>.
+        /// </summary>
+        /// <param name="expression">Expression name, relative to the current model.</param>
+        /// <returns>
+        /// <see cref="ViewDataInfo"/> for named <paramref name="expression"/> in this
+        /// <see cref="ViewDataDictionary"/>.
+        /// </returns>
+        /// <remarks>
+        /// Looks up <paramref name="expression"/> in the dictionary first. Falls back to evaluating it against
+        /// <see cref="Model"/>.
+        /// </remarks>
+        public ViewDataInfo GetViewDataInfo(string expression)
+        {
+            return ViewDataEvaluator.Eval(this, expression);
+        }
+
+        /// <summary>
+        /// Set <see cref="ModelExplorer"/> to ensure <see cref="Model"/> and <see cref="ModelExplorer.Model"/>
+        /// reflect the new <paramref name="value"/>.
+        /// </summary>
+        /// <param name="value">New <see cref="Model"/> value.</param>
+        protected virtual void SetModel(object value)
+        {
+            // Update ModelExplorer to reflect the new value. When possible, preserve ModelMetadata to avoid losing
+            // property information.
+            var modelType = value?.GetType();
+            if (ModelMetadata.MetadataKind == ModelMetadataKind.Type &&
+                ModelMetadata.ModelType == typeof(object) &&
+                modelType != null &&
+                modelType != typeof(object))
+            {
+                // Base ModelMetadata on new type when there's no property information to preserve and type changes to
+                // something besides typeof(object).
+                ModelExplorer = _metadataProvider.GetModelExplorerForType(modelType, value);
+            }
+            else if (modelType != null && !ModelMetadata.ModelType.IsAssignableFrom(modelType))
+            {
+                // Base ModelMetadata on new type when new model is incompatible with the existing metadata. The most
+                // common case is _declaredModelType==typeof(object), metadata was copied from another VDD, and user
+                // code sets the Model to a new type e.g. within a view component or a view that lacks an @model
+                // directive.
+                ModelExplorer = _metadataProvider.GetModelExplorerForType(modelType, value);
+            }
+            else if (object.ReferenceEquals(value, Model))
+            {
+                // The metadata matches and the model is literally the same; usually nothing to do here.
+                if (value == null &&
+                    !ModelMetadata.IsReferenceOrNullableType &&
+                    _declaredModelType != ModelMetadata.ModelType)
+                {
+                    // Base ModelMetadata on declared type when setting Model to null, source VDD's Model was never
+                    // set, and source VDD had a non-Nullable value type. Though _declaredModelType might also be a
+                    // non-Nullable value type, would need to duplicate logic behind
+                    // ModelMetadata.IsReferenceOrNullableType to avoid this allocation in the error case.
+                    ModelExplorer = _metadataProvider.GetModelExplorerForType(_declaredModelType, value);
+                }
+            }
+            else
+            {
+                // The existing metadata is compatible with the value but it's a new value.
+                ModelExplorer = new ModelExplorer(_metadataProvider, ModelExplorer.Container, ModelMetadata, value);
+            }
+
+            EnsureCompatible(value);
+        }
+
+        // Throw if given value is incompatible with the declared Model Type.
+        private void EnsureCompatible(object value)
+        {
+            // IsCompatibleObject verifies if the value is either an instance of _declaredModelType or (if value is
+            // null) that _declaredModelType is a nullable type.
+            var castWillSucceed = IsCompatibleWithDeclaredType(value);
+            if (!castWillSucceed)
+            {
+                string message;
+                if (value == null)
+                {
+                    message = Resources.FormatViewData_ModelCannotBeNull(_declaredModelType);
+                }
+                else
+                {
+                    message = Resources.FormatViewData_WrongTModelType(value.GetType(), _declaredModelType);
+                }
+
+                throw new InvalidOperationException(message);
+            }
+        }
+
+        // Call after updating the ModelExplorer because this uses both _declaredModelType and ModelMetadata. May
+        // otherwise get incorrect compatibility errors.
+        private bool IsCompatibleWithDeclaredType(object value)
+        {
+            if (value == null)
+            {
+                // In this case ModelMetadata.ModelType matches _declaredModelType.
+                return ModelMetadata.IsReferenceOrNullableType;
+            }
+            else
+            {
+                return _declaredModelType.IsAssignableFrom(value.GetType());
+            }
+        }
+
+        #region IDictionary methods
+        /// <inheritdoc />
+        public void Add(string key, object value)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            _data.Add(key, value);
+        }
+
+        /// <inheritdoc />
+        public bool ContainsKey(string key)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            return _data.ContainsKey(key);
+        }
+
+        /// <inheritdoc />
+        public bool Remove(string key)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            return _data.Remove(key);
+        }
+
+        /// <inheritdoc />
+        public bool TryGetValue(string key, out object value)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            return _data.TryGetValue(key, out value);
+        }
+
+        /// <inheritdoc />
+        public void Add(KeyValuePair<string, object> item)
+        {
+            _data.Add(item);
+        }
+
+        /// <inheritdoc />
+        public void Clear()
+        {
+            _data.Clear();
+        }
+
+        /// <inheritdoc />
+        public bool Contains(KeyValuePair<string, object> item)
+        {
+            return _data.Contains(item);
+        }
+
+        /// <inheritdoc />
+        public void CopyTo(KeyValuePair<string, object>[] array, int arrayIndex)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException(nameof(array));
+            }
+
+            _data.CopyTo(array, arrayIndex);
+        }
+
+        /// <inheritdoc />
+        public bool Remove(KeyValuePair<string, object> item)
+        {
+            return _data.Remove(item);
+        }
+
+        /// <inheritdoc />
+        IEnumerator<KeyValuePair<string, object>> IEnumerable<KeyValuePair<string, object>>.GetEnumerator()
+        {
+            return _data.GetEnumerator();
+        }
+
+        /// <inheritdoc />
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return _data.GetEnumerator();
+        }
+        #endregion
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryAttribute.cs
new file mode 100644
index 0000000000..578e3c04a1
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryAttribute.cs
@@ -0,0 +1,17 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Specifies that a controller property should be set with the current
+    /// <see cref="ViewDataDictionary"/> when creating the controller. The property must have a public
+    /// set method.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
+    public class ViewDataDictionaryAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs
new file mode 100644
index 0000000000..352c4aba5b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs
@@ -0,0 +1,89 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.Threading;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewDataDictionaryControllerPropertyActivator : IControllerPropertyActivator
+    {
+        private readonly Func<Type, PropertyActivator<ControllerContext>[]> _getPropertiesToActivate;
+        private readonly IModelMetadataProvider _modelMetadataProvider;
+        private ConcurrentDictionary<Type, PropertyActivator<ControllerContext>[]> _activateActions;
+        private bool _initialized;
+        private object _initializeLock = new object();
+
+        public ViewDataDictionaryControllerPropertyActivator(IModelMetadataProvider modelMetadataProvider)
+        {
+            _modelMetadataProvider = modelMetadataProvider;
+            _getPropertiesToActivate = GetPropertiesToActivate;
+        }
+
+        public void Activate(ControllerContext actionContext, object controller)
+        {
+            LazyInitializer.EnsureInitialized(
+                ref _activateActions,
+                ref _initialized,
+                ref _initializeLock);
+
+            var controllerType = controller.GetType();
+            var propertiesToActivate = _activateActions.GetOrAdd(
+                controllerType,
+                _getPropertiesToActivate);
+
+            for (var i = 0; i < propertiesToActivate.Length; i++)
+            {
+                var activateInfo = propertiesToActivate[i];
+                activateInfo.Activate(controller, actionContext);
+            }
+        }
+
+        public Action<ControllerContext, object> GetActivatorDelegate(ControllerActionDescriptor actionDescriptor)
+        {
+            var controllerType = actionDescriptor.ControllerTypeInfo?.AsType();
+            if (controllerType == null)
+            {
+                throw new ArgumentException(Resources.FormatPropertyOfTypeCannotBeNull(
+                    nameof(actionDescriptor.ControllerTypeInfo),
+                    nameof(actionDescriptor)),
+                    nameof(actionDescriptor));
+            }
+
+            var propertiesToActivate = GetPropertiesToActivate(controllerType);
+
+            void Activate(ControllerContext controllerContext, object controller)
+            {
+                for (var i = 0; i < propertiesToActivate.Length; i++)
+                {
+                    var activateInfo = propertiesToActivate[i];
+                    activateInfo.Activate(controller, controllerContext);
+                }
+            }
+
+            return Activate;
+        }
+
+        private PropertyActivator<ControllerContext>[] GetPropertiesToActivate(Type type)
+        {
+            var activators = PropertyActivator<ControllerContext>.GetPropertiesToActivate(
+                type,
+                typeof(ViewDataDictionaryAttribute),
+                p => new PropertyActivator<ControllerContext>(p, GetViewDataDictionary));
+
+            return activators;
+        }
+
+        private ViewDataDictionary GetViewDataDictionary(ControllerContext context)
+        {
+            return new ViewDataDictionary(
+                _modelMetadataProvider,
+                context.ModelState);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryOfT.cs
new file mode 100644
index 0000000000..5cd4f4391b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryOfT.cs
@@ -0,0 +1,95 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewDataDictionary<TModel> : ViewDataDictionary
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewDataDictionary{TModel}"/> class.
+        /// </summary>
+        /// <remarks>
+        /// For use when creating a <see cref="ViewDataDictionary{TModel}"/> for a new top-level scope.
+        /// </remarks>
+        /// <inheritdoc />
+        // References may not show up due to Type.GetConstructor() use in RazorPageActivator.
+        public ViewDataDictionary(
+            IModelMetadataProvider metadataProvider,
+            ModelStateDictionary modelState)
+            : base(metadataProvider, modelState, declaredModelType: typeof(TModel))
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewDataDictionary{TModel}"/> class based in part on an
+        /// existing <see cref="ViewDataDictionary"/> instance.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// For use when copying a <see cref="ViewDataDictionary"/> instance and <typeparamref name="TModel"/> is known
+        /// but <see cref="Model"/> should be copied from the existing instance e.g. when copying from a base
+        /// <see cref="ViewDataDictionary"/> instance to a <see cref="ViewDataDictionary{TModel}"/> instance.
+        /// </para>
+        /// <para>
+        /// This constructor may <c>throw</c> if <c>source.Model</c> is non-<c>null</c> and incompatible with
+        /// <typeparamref name="TModel"/>. Pass <c>model: null</c> to
+        /// <see cref="ViewDataDictionary{TModel}(ViewDataDictionary, object)"/> to ignore <c>source.Model</c>.
+        /// </para>
+        /// </remarks>
+        /// <inheritdoc />
+        // References may not show up due to Type.GetConstructor() use in RazorPageActivator.
+        public ViewDataDictionary(ViewDataDictionary source)
+            : base(source, declaredModelType: typeof(TModel))
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewDataDictionary{TModel}"/> class based in part on an
+        /// existing <see cref="ViewDataDictionary"/> instance. This constructor is careful to avoid exceptions
+        /// <see cref="ViewDataDictionary.SetModel"/> may throw when <paramref name="model"/> is <c>null</c>.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// For use when copying a <see cref="ViewDataDictionary"/> instance and <typeparamref name="TModel"/> and
+        /// <see cref="Model"/> are known.
+        /// </para>
+        /// <para>
+        /// This constructor may <c>throw</c> if <paramref name="model"/> is non-<c>null</c> and incompatible with
+        /// <typeparamref name="TModel"/>.
+        /// </para>
+        /// </remarks>
+        /// <inheritdoc />
+        // Model parameter type is object to allow "model: null" calls even when TModel is a value type. A TModel
+        // parameter would likely require IEquatable<TModel> type restrictions to pass expected null value to the base
+        // constructor.
+        public ViewDataDictionary(ViewDataDictionary source, object model)
+            : base(source, model, declaredModelType: typeof(TModel))
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewDataDictionary{TModel}"/> class.
+        /// </summary>
+        /// <remarks>Internal for testing.</remarks>
+        /// <inheritdoc />
+        internal ViewDataDictionary(IModelMetadataProvider metadataProvider)
+            : base(metadataProvider, declaredModelType: typeof(TModel))
+        {
+        }
+
+        /// <inheritdoc />
+        public new TModel Model
+        {
+            get
+            {
+                return (base.Model == null) ? default(TModel) : (TModel)base.Model;
+            }
+            set
+            {
+                base.Model = value;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataEvaluator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataEvaluator.cs
new file mode 100644
index 0000000000..e0846cc5ff
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataEvaluator.cs
@@ -0,0 +1,211 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public static class ViewDataEvaluator
+    {
+        /// <summary>
+        /// Gets <see cref="ViewDataInfo"/> for named <paramref name="expression"/> in given
+        /// <paramref name="viewData"/>.
+        /// </summary>
+        /// <param name="viewData">
+        /// The <see cref="ViewDataDictionary"/> that may contain the <paramref name="expression"/> value.
+        /// </param>
+        /// <param name="expression">Expression name, relative to <c>viewData.Model</c>.</param>
+        /// <returns>
+        /// <see cref="ViewDataInfo"/> for named <paramref name="expression"/> in given <paramref name="viewData"/>.
+        /// </returns>
+        public static ViewDataInfo Eval(ViewDataDictionary viewData, string expression)
+        {
+            if (viewData == null)
+            {
+                throw new ArgumentNullException(nameof(viewData));
+            }
+
+            // While it is not valid to generate a field for the top-level model itself because the result is an
+            // unnamed input element, do not throw here if full name is null or empty. Support is needed for cases
+            // such as Html.Label() and Html.Value(), where the user's code is not creating a name attribute. Checks
+            // are in place at higher levels for the invalid cases.
+            var fullName = viewData.TemplateInfo.GetFullHtmlFieldName(expression);
+
+            // Given an expression "one.two.three.four" we look up the following (pseudo-code):
+            //  this["one.two.three.four"]
+            //  this["one.two.three"]["four"]
+            //  this["one.two"]["three.four]
+            //  this["one.two"]["three"]["four"]
+            //  this["one"]["two.three.four"]
+            //  this["one"]["two.three"]["four"]
+            //  this["one"]["two"]["three.four"]
+            //  this["one"]["two"]["three"]["four"]
+
+            // Try to find a matching ViewData entry using the full expression name. If that fails, fall back to
+            // ViewData.Model using the expression's relative name.
+            var result = EvalComplexExpression(viewData, fullName);
+            if (result == null)
+            {
+                if (string.IsNullOrEmpty(expression))
+                {
+                    // Null or empty expression name means current model even if that model is null.
+                    result = new ViewDataInfo(container: viewData, value: viewData.Model);
+                }
+                else
+                {
+                    result = EvalComplexExpression(viewData.Model, expression);
+                }
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Gets <see cref="ViewDataInfo"/> for named <paramref name="expression"/> in given
+        /// <paramref name="indexableObject"/>.
+        /// </summary>
+        /// <param name="indexableObject">
+        /// The <see cref="object"/> that may contain the <paramref name="expression"/> value.
+        /// </param>
+        /// <param name="expression">Expression name, relative to <paramref name="indexableObject"/>.</param>
+        /// <returns>
+        /// <see cref="ViewDataInfo"/> for named <paramref name="expression"/> in given
+        /// <paramref name="indexableObject"/>.
+        /// </returns>
+        public static ViewDataInfo Eval(object indexableObject, string expression)
+        {
+            // Run through many of the same cases as other Eval() overload.
+            return EvalComplexExpression(indexableObject, expression);
+        }
+
+        private static ViewDataInfo EvalComplexExpression(object indexableObject, string expression)
+        {
+            if (indexableObject == null)
+            {
+                return null;
+            }
+
+            if (expression == null)
+            {
+                // In case a Dictionary indexableObject contains a "" entry, don't short-circuit the logic below.
+                expression = string.Empty;
+            }
+
+            return InnerEvalComplexExpression(indexableObject, expression);
+        }
+
+        private static ViewDataInfo InnerEvalComplexExpression(object indexableObject, string expression)
+        {
+            Debug.Assert(expression != null);
+            var leftExpression = expression;
+            do
+            {
+                var targetInfo = GetPropertyValue(indexableObject, leftExpression);
+                if (targetInfo != null)
+                {
+                    if (leftExpression.Length == expression.Length)
+                    {
+                        // Nothing remaining in expression after leftExpression.
+                        return targetInfo;
+                    }
+
+                    if (targetInfo.Value != null)
+                    {
+                        var rightExpression = expression.Substring(leftExpression.Length + 1);
+                        targetInfo = InnerEvalComplexExpression(targetInfo.Value, rightExpression);
+                        if (targetInfo != null)
+                        {
+                            return targetInfo;
+                        }
+                    }
+                }
+
+                leftExpression = GetNextShorterExpression(leftExpression);
+            }
+            while (!string.IsNullOrEmpty(leftExpression));
+
+            return null;
+        }
+
+        // Given "one.two.three.four" initially, calls return
+        //  "one.two.three"
+        //  "one.two"
+        //  "one"
+        //  ""
+        // Recursion of InnerEvalComplexExpression() further sub-divides these cases to cover the full set of
+        // combinations shown in Eval(ViewDataDictionary, string) comments.
+        private static string GetNextShorterExpression(string expression)
+        {
+            if (string.IsNullOrEmpty(expression))
+            {
+                return string.Empty;
+            }
+
+            var lastDot = expression.LastIndexOf('.');
+            if (lastDot == -1)
+            {
+                return string.Empty;
+            }
+
+            return expression.Substring(startIndex: 0, length: lastDot);
+        }
+
+        private static ViewDataInfo GetIndexedPropertyValue(object indexableObject, string key)
+        {
+            var dict = indexableObject as IDictionary<string, object>;
+            object value = null;
+            var success = false;
+
+            if (dict != null)
+            {
+                success = dict.TryGetValue(key, out value);
+            }
+            else
+            {
+                // Fall back to TryGetValue() calls for other Dictionary types.
+                var tryDelegate = TryGetValueProvider.CreateInstance(indexableObject.GetType());
+                if (tryDelegate != null)
+                {
+                    success = tryDelegate(indexableObject, key, out value);
+                }
+            }
+
+            if (success)
+            {
+                return new ViewDataInfo(indexableObject, value);
+            }
+
+            return null;
+        }
+
+        // This method handles one "segment" of a complex property expression
+        private static ViewDataInfo GetPropertyValue(object container, string propertyName)
+        {
+            // First, try to evaluate the property based on its indexer.
+            var value = GetIndexedPropertyValue(container, propertyName);
+            if (value != null)
+            {
+                return value;
+            }
+
+            // Do not attempt to find a property with an empty name and or of a ViewDataDictionary.
+            if (string.IsNullOrEmpty(propertyName) || container is ViewDataDictionary)
+            {
+                return null;
+            }
+
+            // If the indexer didn't return anything useful, try to use PropertyInfo and treat the expression
+            // as a property name.
+            var propertyInfo = container.GetType().GetRuntimeProperty(propertyName);
+            if (propertyInfo == null)
+            {
+                return null;
+            }
+
+            return new ViewDataInfo(container, propertyInfo);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataInfo.cs
new file mode 100644
index 0000000000..f9ce77ed3b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataInfo.cs
@@ -0,0 +1,92 @@
+// 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.
+
+using System;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewDataInfo
+    {
+        private static readonly Func<object> _propertyInfoResolver = () => null;
+
+        private object _value;
+        private Func<object> _valueAccessor;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewDataInfo"/> class with info about a
+        /// <see cref="ViewDataDictionary"/> lookup which has already been evaluated.
+        /// </summary>
+        /// <param name="container">The <see cref="object"/> that <paramref name="value"/> was evaluated from.</param>
+        /// <param name="value">The evaluated value.</param>
+        public ViewDataInfo(object container, object value)
+        {
+            Container = container;
+            _value = value;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewDataInfo"/> class with info about a
+        /// <see cref="ViewDataDictionary"/> lookup which is evaluated when <see cref="Value"/> is read.
+        /// It uses <see cref="System.Reflection.PropertyInfo.GetValue(object)"/> on <paramref name="propertyInfo"/>
+        /// passing parameter <paramref name="container"/> to lazily evaluate the value.
+        /// </summary>
+        /// <param name="container">The <see cref="object"/> that <see cref="Value"/> will be evaluated from.</param>
+        /// <param name="propertyInfo">The <see cref="PropertyInfo"/> that will be used to evaluate <see cref="Value"/>.</param>
+        public ViewDataInfo(object container, PropertyInfo propertyInfo)
+            : this(container, propertyInfo, _propertyInfoResolver)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ViewDataInfo"/> class with info about a
+        /// <see cref="ViewDataDictionary"/> lookup which is evaluated when <see cref="Value"/> is read.
+        /// It uses <paramref name="valueAccessor"/> to lazily evaluate the value.
+        /// </summary>
+        /// <param name="container">The <see cref="object"/> that has the <see cref="Value"/>.</param>
+        /// <param name="propertyInfo">The <see cref="PropertyInfo"/> that represents <see cref="Value"/>'s property.</param>
+        /// <param name="valueAccessor">A delegate that will return the <see cref="Value"/>.</param>
+        public ViewDataInfo(object container, PropertyInfo propertyInfo, Func<object> valueAccessor)
+        {
+            Container = container;
+            PropertyInfo = propertyInfo;
+            _valueAccessor = valueAccessor;
+        }
+
+        public object Container { get; }
+
+        public PropertyInfo PropertyInfo { get; }
+
+        public object Value
+        {
+            get
+            {
+                if (_valueAccessor != null)
+                {
+                    ResolveValue();
+                }
+
+                return _value;
+            }
+            set
+            {
+                _value = value;
+                _valueAccessor = null;
+            }
+        }
+
+        private void ResolveValue()
+        {
+            if (ReferenceEquals(_valueAccessor, _propertyInfoResolver))
+            {
+                _value = PropertyInfo.GetValue(Container);
+            }
+            else
+            {
+                _value = _valueAccessor();
+            }
+
+            _valueAccessor = null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewExecutor.cs
new file mode 100644
index 0000000000..748a9c94b7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewExecutor.cs
@@ -0,0 +1,272 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Executes an <see cref="IView"/>.
+    /// </summary>
+    public class ViewExecutor
+    {
+        /// <summary>
+        /// The default content-type header value for views, <c>text/html; charset=utf-8</c>.
+        /// </summary>
+        public static readonly string DefaultContentType = "text/html; charset=utf-8";
+
+        /// <summary>
+        /// Creates a new <see cref="ViewExecutor"/>.
+        /// </summary>
+        /// <param name="viewOptions">The <see cref="IOptions{MvcViewOptions}"/>.</param>
+        /// <param name="writerFactory">The <see cref="IHttpResponseStreamWriterFactory"/>.</param>
+        /// <param name="viewEngine">The <see cref="ICompositeViewEngine"/>.</param>
+        /// <param name="tempDataFactory">The <see cref="ITempDataDictionaryFactory"/>.</param>
+        /// <param name="diagnosticSource">The <see cref="DiagnosticSource"/>.</param>
+        /// <param name="modelMetadataProvider">The <see cref="IModelMetadataProvider" />.</param>
+        public ViewExecutor(
+            IOptions<MvcViewOptions> viewOptions,
+            IHttpResponseStreamWriterFactory writerFactory,
+            ICompositeViewEngine viewEngine,
+            ITempDataDictionaryFactory tempDataFactory,
+            DiagnosticSource diagnosticSource,
+            IModelMetadataProvider modelMetadataProvider)
+            : this(writerFactory, viewEngine, diagnosticSource)
+        {
+            if (viewOptions == null)
+            {
+                throw new ArgumentNullException(nameof(viewOptions));
+            }
+
+            if (tempDataFactory == null)
+            {
+                throw new ArgumentNullException(nameof(tempDataFactory));
+            }
+
+            if (diagnosticSource == null)
+            {
+                throw new ArgumentNullException(nameof(diagnosticSource));
+            }
+
+            ViewOptions = viewOptions.Value;
+            TempDataFactory = tempDataFactory;
+            ModelMetadataProvider = modelMetadataProvider;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="ViewExecutor"/>.
+        /// </summary>
+        /// <param name="writerFactory">The <see cref="IHttpResponseStreamWriterFactory"/>.</param>
+        /// <param name="viewEngine">The <see cref="ICompositeViewEngine"/>.</param>
+        /// <param name="diagnosticSource">The <see cref="System.Diagnostics.DiagnosticSource"/>.</param>
+        protected ViewExecutor(
+            IHttpResponseStreamWriterFactory writerFactory,
+            ICompositeViewEngine viewEngine,
+            DiagnosticSource diagnosticSource)
+        {
+            if (writerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(writerFactory));
+            }
+
+            if (viewEngine == null)
+            {
+                throw new ArgumentNullException(nameof(viewEngine));
+            }
+
+            if (diagnosticSource == null)
+            {
+                throw new ArgumentNullException(nameof(diagnosticSource));
+            }
+
+            WriterFactory = writerFactory;
+            ViewEngine = viewEngine;
+            DiagnosticSource = diagnosticSource;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="DiagnosticSource"/>.
+        /// </summary>
+        protected DiagnosticSource DiagnosticSource { get; }
+
+        /// <summary>
+        /// Gets the <see cref="ITempDataDictionaryFactory"/>.
+        /// </summary>
+        protected ITempDataDictionaryFactory TempDataFactory { get; }
+
+        /// <summary>
+        /// Gets the default <see cref="IViewEngine"/>.
+        /// </summary>
+        protected IViewEngine ViewEngine { get; }
+
+        /// <summary>
+        /// Gets the <see cref="MvcViewOptions"/>.
+        /// </summary>
+        protected MvcViewOptions ViewOptions { get; }
+
+        /// <summary>
+        /// Gets the <see cref="IModelMetadataProvider"/>.
+        /// </summary>
+        protected IModelMetadataProvider ModelMetadataProvider { get; }
+
+        /// <summary>
+        /// Gets the <see cref="IHttpResponseStreamWriterFactory"/>.
+        /// </summary>
+        protected IHttpResponseStreamWriterFactory WriterFactory { get; }
+
+        /// <summary>
+        /// Executes a view asynchronously.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/> associated with the current request.</param>
+        /// <param name="view">The <see cref="IView"/>.</param>
+        /// <param name="viewData">The <see cref="ViewDataDictionary"/>.</param>
+        /// <param name="tempData">The <see cref="ITempDataDictionary"/>.</param>
+        /// <param name="contentType">
+        /// The content-type header value to set in the response. If <c>null</c>,
+        /// <see cref="DefaultContentType"/> will be used.
+        /// </param>
+        /// <param name="statusCode">
+        /// The HTTP status code to set in the response. May be <c>null</c>.
+        /// </param>
+        /// <returns>A <see cref="Task"/> which will complete when view execution is completed.</returns>
+        public virtual async Task ExecuteAsync(
+            ActionContext actionContext,
+            IView view,
+            ViewDataDictionary viewData,
+            ITempDataDictionary tempData,
+            string contentType,
+            int? statusCode)
+        {
+            if (actionContext == null)
+            {
+                throw new ArgumentNullException(nameof(actionContext));
+            }
+
+            if (view == null)
+            {
+                throw new ArgumentNullException(nameof(view));
+            }
+
+            if (ViewOptions == null)
+            {
+                throw new InvalidOperationException(Resources.FormatPropertyOfTypeCannotBeNull(nameof(ViewOptions), GetType().Name));
+            }
+
+            if (TempDataFactory == null)
+            {
+                throw new InvalidOperationException(Resources.FormatPropertyOfTypeCannotBeNull(nameof(TempDataFactory), GetType().Name));
+            }
+
+            if (ModelMetadataProvider == null)
+            {
+                throw new InvalidOperationException(Resources.FormatPropertyOfTypeCannotBeNull(nameof(ModelMetadataProvider), GetType().Name));
+            }
+
+            if (viewData == null)
+            {
+                viewData = new ViewDataDictionary(ModelMetadataProvider, actionContext.ModelState);
+            }
+
+            if (tempData == null)
+            {
+                tempData = TempDataFactory.GetTempData(actionContext.HttpContext);
+            }
+
+            var viewContext = new ViewContext(
+                actionContext,
+                view,
+                viewData,
+                tempData,
+                TextWriter.Null,
+                ViewOptions.HtmlHelperOptions);
+
+            await ExecuteAsync(viewContext, contentType, statusCode);
+        }
+
+        /// <summary>
+        /// Executes a view asynchronously.
+        /// </summary>
+        /// <param name="viewContext">The <see cref="ViewContext"/> associated with the current request.</param>
+        /// <param name="contentType">
+        /// The content-type header value to set in the response. If <c>null</c>,
+        /// <see cref="DefaultContentType"/> will be used.
+        /// </param>
+        /// <param name="statusCode">
+        /// The HTTP status code to set in the response. May be <c>null</c>.
+        /// </param>
+        /// <returns>A <see cref="Task"/> which will complete when view execution is completed.</returns>
+        protected async Task ExecuteAsync(
+            ViewContext viewContext,
+            string contentType,
+            int? statusCode)
+        {
+            if (viewContext == null)
+            {
+                throw new ArgumentNullException(nameof(viewContext));
+            }
+
+            var response = viewContext.HttpContext.Response;
+
+            ResponseContentTypeHelper.ResolveContentTypeAndEncoding(
+                contentType,
+                response.ContentType,
+                DefaultContentType,
+                out var resolvedContentType,
+                out var resolvedContentTypeEncoding);
+
+            response.ContentType = resolvedContentType;
+
+            if (statusCode != null)
+            {
+                response.StatusCode = statusCode.Value;
+            }
+
+            OnExecuting(viewContext);
+
+            using (var writer = WriterFactory.CreateWriter(response.Body, resolvedContentTypeEncoding))
+            {
+                var view = viewContext.View;
+
+                var oldWriter = viewContext.Writer;
+                try
+                {
+                    viewContext.Writer = writer;
+
+                    DiagnosticSource.BeforeView(view, viewContext);
+
+                    await view.RenderAsync(viewContext);
+
+                    DiagnosticSource.AfterView(view, viewContext);
+                }
+                finally
+                {
+                    viewContext.Writer = oldWriter;
+                }
+
+                // Perf: Invoke FlushAsync to ensure any buffered content is asynchronously written to the underlying
+                // response asynchronously. In the absence of this line, the buffer gets synchronously written to the
+                // response as part of the Dispose which has a perf impact.
+                await writer.FlushAsync();
+            }
+        }
+
+        private void OnExecuting(ViewContext viewContext)
+        {
+            var viewDataValuesProvider = viewContext.HttpContext.Features.Get<IViewDataValuesProviderFeature>();
+            if (viewDataValuesProvider != null)
+            {
+                viewDataValuesProvider.ProvideViewDataValues(viewContext.ViewData);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewResultExecutor.cs
new file mode 100644
index 0000000000..af284f0908
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewResultExecutor.cs
@@ -0,0 +1,211 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Finds and executes an <see cref="IView"/> for a <see cref="ViewResult"/>.
+    /// </summary>
+    public class ViewResultExecutor : ViewExecutor, IActionResultExecutor<ViewResult>
+    {
+        private const string ActionNameKey = "action";
+
+        /// <summary>
+        /// Creates a new <see cref="ViewResultExecutor"/>.
+        /// </summary>
+        /// <param name="viewOptions">The <see cref="IOptions{MvcViewOptions}"/>.</param>
+        /// <param name="writerFactory">The <see cref="IHttpResponseStreamWriterFactory"/>.</param>
+        /// <param name="viewEngine">The <see cref="ICompositeViewEngine"/>.</param>
+        /// <param name="tempDataFactory">The <see cref="ITempDataDictionaryFactory"/>.</param>
+        /// <param name="diagnosticSource">The <see cref="DiagnosticSource"/>.</param>
+        /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
+        /// <param name="modelMetadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
+        public ViewResultExecutor(
+            IOptions<MvcViewOptions> viewOptions,
+            IHttpResponseStreamWriterFactory writerFactory,
+            ICompositeViewEngine viewEngine,
+            ITempDataDictionaryFactory tempDataFactory,
+            DiagnosticSource diagnosticSource,
+            ILoggerFactory loggerFactory,
+            IModelMetadataProvider modelMetadataProvider)
+            : base(viewOptions, writerFactory, viewEngine, tempDataFactory, diagnosticSource, modelMetadataProvider)
+        {
+            if (loggerFactory == null)
+            {
+                throw new ArgumentNullException(nameof(loggerFactory));
+            }
+
+            Logger = loggerFactory.CreateLogger<ViewResultExecutor>();
+        }
+
+        /// <summary>
+        /// Gets the <see cref="ILogger"/>.
+        /// </summary>
+        protected ILogger Logger { get; }
+
+        /// <summary>
+        /// Attempts to find the <see cref="IView"/> associated with <paramref name="viewResult"/>.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/> associated with the current request.</param>
+        /// <param name="viewResult">The <see cref="ViewResult"/>.</param>
+        /// <returns>A <see cref="ViewEngineResult"/>.</returns>
+        public virtual ViewEngineResult FindView(ActionContext actionContext, ViewResult viewResult)
+        {
+            if (actionContext == null)
+            {
+                throw new ArgumentNullException(nameof(actionContext));
+            }
+
+            if (viewResult == null)
+            {
+                throw new ArgumentNullException(nameof(viewResult));
+            }
+
+            var viewEngine = viewResult.ViewEngine ?? ViewEngine;
+
+            var viewName = viewResult.ViewName ?? GetActionName(actionContext);
+
+            var stopwatch = ValueStopwatch.StartNew();
+
+            var result = viewEngine.GetView(executingFilePath: null, viewPath: viewName, isMainPage: true);
+            var originalResult = result;
+            if (!result.Success)
+            {
+                result = viewEngine.FindView(actionContext, viewName, isMainPage: true);
+            }
+
+            Logger.ViewResultExecuting(result.ViewName);
+            if (!result.Success)
+            {
+                if (originalResult.SearchedLocations.Any())
+                {
+                    if (result.SearchedLocations.Any())
+                    {
+                        // Return a new ViewEngineResult listing all searched locations.
+                        var locations = new List<string>(originalResult.SearchedLocations);
+                        locations.AddRange(result.SearchedLocations);
+                        result = ViewEngineResult.NotFound(viewName, locations);
+                    }
+                    else
+                    {
+                        // GetView() searched locations but FindView() did not. Use first ViewEngineResult.
+                        result = originalResult;
+                    }
+                }
+            }
+
+            if (result.Success)
+            {
+                if (DiagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.ViewFound"))
+                {
+                    DiagnosticSource.Write(
+                        "Microsoft.AspNetCore.Mvc.ViewFound",
+                        new
+                        {
+                            actionContext = actionContext,
+                            isMainPage = true,
+                            result = viewResult,
+                            viewName = viewName,
+                            view = result.View,
+                        });
+                }
+
+                Logger.ViewFound(result.View, stopwatch.GetElapsedTime());
+            }
+            else
+            {
+                if (DiagnosticSource.IsEnabled("Microsoft.AspNetCore.Mvc.ViewNotFound"))
+                {
+                    DiagnosticSource.Write(
+                        "Microsoft.AspNetCore.Mvc.ViewNotFound",
+                        new
+                        {
+                            actionContext = actionContext,
+                            isMainPage = true,
+                            result = viewResult,
+                            viewName = viewName,
+                            searchedLocations = result.SearchedLocations
+                        });
+                }
+                Logger.ViewNotFound(viewName, result.SearchedLocations);
+            }
+
+            return result;
+        }
+
+        /// <inheritdoc />
+        public async Task ExecuteAsync(ActionContext context, ViewResult result)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            var stopwatch = ValueStopwatch.StartNew();
+
+            var viewEngineResult = FindView(context, result);
+            viewEngineResult.EnsureSuccessful(originalLocations: null);
+
+            var view = viewEngineResult.View;
+            using (view as IDisposable)
+            {
+                await ExecuteAsync(
+                    context,
+                    view,
+                    result.ViewData,
+                    result.TempData,
+                    result.ContentType,
+                    result.StatusCode);
+            }
+
+            Logger.ViewResultExecuted(viewEngineResult.ViewName, stopwatch.GetElapsedTime());
+        }
+
+        private static string GetActionName(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (!context.RouteData.Values.TryGetValue(ActionNameKey, out var routeValue))
+            {
+                return null;
+            }
+
+            var actionDescriptor = context.ActionDescriptor;
+            string normalizedValue = null;
+            if (actionDescriptor.RouteValues.TryGetValue(ActionNameKey, out var value) &&
+                !string.IsNullOrEmpty(value))
+            {
+                normalizedValue = value;
+            }
+
+            var stringRouteValue = routeValue?.ToString();
+            if (string.Equals(normalizedValue, stringRouteValue, StringComparison.OrdinalIgnoreCase))
+            {
+                return normalizedValue;
+            }
+
+            return stringRouteValue;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewResult.cs
new file mode 100644
index 0000000000..c98562fc9e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewResult.cs
@@ -0,0 +1,71 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Represents an <see cref="ActionResult"/> that renders a view to the response.
+    /// </summary>
+    public class ViewResult : ActionResult
+    {
+        /// <summary>
+        /// Gets or sets the HTTP status code.
+        /// </summary>
+        public int? StatusCode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name or path of the view that is rendered to the response.
+        /// </summary>
+        /// <remarks>
+        /// When <c>null</c>, defaults to <see cref="ControllerActionDescriptor.ActionName"/>.
+        /// </remarks>
+        public string ViewName { get; set; }
+
+        /// <summary>
+        /// Gets the view data model.
+        /// </summary>
+        public object Model => ViewData?.Model;
+
+        /// <summary>
+        /// Gets or sets the <see cref="ViewDataDictionary"/> for this result.
+        /// </summary>
+        public ViewDataDictionary ViewData { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ITempDataDictionary"/> for this result.
+        /// </summary>
+        public ITempDataDictionary TempData { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IViewEngine"/> used to locate views.
+        /// </summary>
+        /// <remarks>When <c>null</c>, an instance of <see cref="ICompositeViewEngine"/> from
+        /// <c>ActionContext.HttpContext.RequestServices</c> is used.</remarks>
+        public IViewEngine ViewEngine { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Content-Type header for the response.
+        /// </summary>
+        public string ContentType { get; set; }
+
+        /// <inheritdoc />
+        public override async Task ExecuteResultAsync(ActionContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var executor = context.HttpContext.RequestServices.GetRequiredService<IActionResultExecutor<ViewResult>>();
+            await executor.ExecuteAsync(context, this);
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/baseline.netcore.json
new file mode 100644
index 0000000000..b3fca10e2b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/baseline.netcore.json
@@ -0,0 +1,18066 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc.ViewFeatures, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.AutoValidateAntiforgeryTokenAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+        "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReusable",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateInstance",
+          "Parameters": [
+            {
+              "Name": "serviceProvider",
+              "Type": "System.IServiceProvider"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Controller",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "BaseType": "Microsoft.AspNetCore.Mvc.ControllerBase",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IActionFilter",
+        "Microsoft.AspNetCore.Mvc.Filters.IAsyncActionFilter",
+        "System.IDisposable"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ViewData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewData",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TempData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TempData",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewBag",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "View",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "View",
+          "Parameters": [
+            {
+              "Name": "viewName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "View",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "View",
+          "Parameters": [
+            {
+              "Name": "viewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PartialView",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.PartialViewResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PartialView",
+          "Parameters": [
+            {
+              "Name": "viewName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.PartialViewResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PartialView",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.PartialViewResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PartialView",
+          "Parameters": [
+            {
+              "Name": "viewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.PartialViewResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ViewComponent",
+          "Parameters": [
+            {
+              "Name": "componentName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewComponentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ViewComponent",
+          "Parameters": [
+            {
+              "Name": "componentType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewComponentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ViewComponent",
+          "Parameters": [
+            {
+              "Name": "componentName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "arguments",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewComponentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ViewComponent",
+          "Parameters": [
+            {
+              "Name": "componentType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "arguments",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewComponentResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Json",
+          "Parameters": [
+            {
+              "Name": "data",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.JsonResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Json",
+          "Parameters": [
+            {
+              "Name": "data",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "serializerSettings",
+              "Type": "Newtonsoft.Json.JsonSerializerSettings"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.JsonResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnActionExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IActionFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnActionExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IActionFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnActionExecutionAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext"
+            },
+            {
+              "Name": "next",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ActionExecutionDelegate"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IAsyncActionFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [
+            {
+              "Name": "disposing",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.CookieTempDataProviderOptions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Cookie",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Http.CookieBuilder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Cookie",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Http.CookieBuilder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Path",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Path",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Domain",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Domain",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_CookieName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_CookieName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.IgnoreAntiforgeryTokenAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewFeatures.IAntiforgeryPolicy",
+        "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.IViewComponentHelper",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "InvokeAsync",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "arguments",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "InvokeAsync",
+          "Parameters": [
+            {
+              "Name": "componentType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "arguments",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.IViewComponentResult",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.MvcViewOptions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Infrastructure.ICompatibilitySwitch>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_HtmlHelperOptions",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelperOptions",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HtmlHelperOptions",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelperOptions"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SuppressTempDataAttributePrefix",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_SuppressTempDataAttributePrefix",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewEngines",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ClientModelValidatorProviders",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidatorProvider>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.PartialViewResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_StatusCode",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Int32>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_StatusCode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.Int32>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Model",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewData",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TempData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TempData",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewEngine",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewEngine",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ContentType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ContentType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.RemoteAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.ComponentModel.DataAnnotations.ValidationAttribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidator"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_HttpMethod",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HttpMethod",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_AdditionalFields",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_AdditionalFields",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Routing.RouteValueDictionary",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_RouteName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FormatAdditionalFieldsForClientValidation",
+          "Parameters": [
+            {
+              "Name": "property",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FormatPropertyForClientValidation",
+          "Parameters": [
+            {
+              "Name": "property",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetUrl",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientModelValidationContext"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FormatErrorMessage",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsValid",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddValidation",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientModelValidationContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "action",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controller",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "action",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controller",
+              "Type": "System.String"
+            },
+            {
+              "Name": "areaName",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.SkipStatusCodePagesAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IResourceFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "OnResourceExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResourceExecutedContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IResourceFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnResourceExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ResourceExecutingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IResourceFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.TempDataAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Key",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Key",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ValidateAntiForgeryTokenAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+        "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReusable",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateInstance",
+          "Parameters": [
+            {
+              "Name": "serviceProvider",
+              "Type": "System.IServiceProvider"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponent",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_HttpContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Http.HttpContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Request",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Http.HttpRequest",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_User",
+          "Parameters": [],
+          "ReturnType": "System.Security.Principal.IPrincipal",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_UserClaimsPrincipal",
+          "Parameters": [],
+          "ReturnType": "System.Security.Claims.ClaimsPrincipal",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_RouteData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Routing.RouteData",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewBag",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelState",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Url",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Url",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewComponentContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewComponentContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TempData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewEngine",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewEngine",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Content",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewComponents.ContentViewComponentResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "View",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "View",
+          "Parameters": [
+            {
+              "Name": "viewName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "View<T0>",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "View<T0>",
+          "Parameters": [
+            {
+              "Name": "viewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponentAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponentResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Arguments",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Arguments",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_StatusCode",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Int32>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_StatusCode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.Int32>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewComponentName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewComponentName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewComponentType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewComponentType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Model",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewData",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TempData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TempData",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ContentType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ContentType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewDataAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Key",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Key",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_StatusCode",
+          "Parameters": [],
+          "ReturnType": "System.Nullable<System.Int32>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_StatusCode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Nullable<System.Int32>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Model",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewData",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TempData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TempData",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewEngine",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewEngine",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ContentType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ContentType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewEngines.CompositeViewEngine",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "FindView",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "viewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "isMainPage",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewEngines.ViewEngineResult",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetView",
+          "Parameters": [
+            {
+              "Name": "executingFilePath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "viewPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "isMainPage",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewEngines.ViewEngineResult",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewEngines",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "optionsAccessor",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcViewOptions>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ViewEngines",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewEngines.IView",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Path",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "FindView",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "viewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "isMainPage",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewEngines.ViewEngineResult",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetView",
+          "Parameters": [
+            {
+              "Name": "executingFilePath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "viewPath",
+              "Type": "System.String"
+            },
+            {
+              "Name": "isMainPage",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewEngines.ViewEngineResult",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewEngines.ViewEngineResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_SearchedLocations",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_View",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewEngines.IView",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Success",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "NotFound",
+          "Parameters": [
+            {
+              "Name": "viewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "searchedLocations",
+              "Type": "System.Collections.Generic.IEnumerable<System.String>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewEngines.ViewEngineResult",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Found",
+          "Parameters": [
+            {
+              "Name": "viewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "view",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewEngines.IView"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewEngines.ViewEngineResult",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EnsureSuccessful",
+          "Parameters": [
+            {
+              "Name": "originalLocations",
+              "Type": "System.Collections.Generic.IEnumerable<System.String>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewEngines.ViewEngineResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.ContentViewComponentResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.IViewComponentResult"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Content",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IViewComponentResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IViewComponentResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.DefaultViewComponentActivator",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentActivator"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentActivator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Release",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            },
+            {
+              "Name": "viewComponent",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentActivator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "typeActivatorCache",
+              "Type": "Microsoft.AspNetCore.Mvc.Internal.ITypeActivatorCache"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.DefaultViewComponentDescriptorCollectionProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentDescriptorCollectionProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ViewComponents",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentDescriptorCollection",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentDescriptorCollectionProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "descriptorProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentDescriptorProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.DefaultViewComponentDescriptorProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentDescriptorProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetViewComponents",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentDescriptor>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentDescriptorProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetCandidateTypes",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.Reflection.TypeInfo>",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "partManager",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.DefaultViewComponentFactory",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentFactory"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateViewComponent",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReleaseViewComponent",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            },
+            {
+              "Name": "component",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "activator",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentActivator"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.DefaultViewComponentHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.IViewComponentHelper",
+        "Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Contextualize",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "InvokeAsync",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "arguments",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IViewComponentHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "InvokeAsync",
+          "Parameters": [
+            {
+              "Name": "componentType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "arguments",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IViewComponentHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "descriptorProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentDescriptorCollectionProvider"
+            },
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            },
+            {
+              "Name": "selector",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentSelector"
+            },
+            {
+              "Name": "invokerFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentInvokerFactory"
+            },
+            {
+              "Name": "viewBufferScope",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.Internal.IViewBufferScope"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.DefaultViewComponentInvoker",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentInvoker"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "InvokeAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentInvoker",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "viewComponentFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentFactory"
+            },
+            {
+              "Name": "viewComponentInvokerCache",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.Internal.ViewComponentInvokerCache"
+            },
+            {
+              "Name": "diagnosticSource",
+              "Type": "System.Diagnostics.DiagnosticSource"
+            },
+            {
+              "Name": "logger",
+              "Type": "Microsoft.Extensions.Logging.ILogger"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.DefaultViewComponentInvokerFactory",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentInvokerFactory"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateInstance",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentInvoker",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentInvokerFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "viewComponentFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentFactory"
+            },
+            {
+              "Name": "viewComponentInvokerCache",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.Internal.ViewComponentInvokerCache"
+            },
+            {
+              "Name": "diagnosticSource",
+              "Type": "System.Diagnostics.DiagnosticSource"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.DefaultViewComponentSelector",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentSelector"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "SelectComponent",
+          "Parameters": [
+            {
+              "Name": "componentName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentDescriptor",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentSelector",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "descriptorProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentDescriptorCollectionProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.HtmlContentViewComponentResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.IViewComponentResult"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_EncodedContent",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IViewComponentResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IViewComponentResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "encodedContent",
+              "Type": "Microsoft.AspNetCore.Html.IHtmlContent"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentActivator",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Release",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            },
+            {
+              "Name": "viewComponent",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentDescriptorCollectionProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ViewComponents",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentDescriptorCollection",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentDescriptorProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetViewComponents",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentDescriptor>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentFactory",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateViewComponent",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReleaseViewComponent",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            },
+            {
+              "Name": "component",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentInvoker",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "InvokeAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentInvokerFactory",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateInstance",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentInvoker",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentSelector",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "SelectComponent",
+          "Parameters": [
+            {
+              "Name": "componentName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentDescriptor",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.ServiceBasedViewComponentActivator",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentActivator"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Create",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentActivator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Release",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            },
+            {
+              "Name": "viewComponent",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentActivator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Arguments",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Arguments",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IDictionary<System.String, System.Object>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HtmlEncoder",
+          "Parameters": [],
+          "ReturnType": "System.Text.Encodings.Web.HtmlEncoder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HtmlEncoder",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewComponentDescriptor",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentDescriptor",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewComponentDescriptor",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentDescriptor"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TempData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Writer",
+          "Parameters": [],
+          "ReturnType": "System.IO.TextWriter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "viewComponentDescriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentDescriptor"
+            },
+            {
+              "Name": "arguments",
+              "Type": "System.Collections.Generic.IDictionary<System.String, System.Object>"
+            },
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            },
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "writer",
+              "Type": "System.IO.TextWriter"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContextAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentConventions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetComponentName",
+          "Parameters": [
+            {
+              "Name": "componentType",
+              "Type": "System.Reflection.TypeInfo"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetComponentFullName",
+          "Parameters": [
+            {
+              "Name": "componentType",
+              "Type": "System.Reflection.TypeInfo"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IsComponent",
+          "Parameters": [
+            {
+              "Name": "typeInfo",
+              "Type": "System.Reflection.TypeInfo"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "ViewComponentSuffix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentDescriptor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DisplayName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_DisplayName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_FullName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FullName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Id",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Id",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ShortName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ShortName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TypeInfo",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.TypeInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TypeInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Reflection.TypeInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MethodInfo",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.MethodInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MethodInfo",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Reflection.MethodInfo"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Parameters",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<System.Reflection.ParameterInfo>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Parameters",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Collections.Generic.IReadOnlyList<System.Reflection.ParameterInfo>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentDescriptorCollection",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Items",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentDescriptor>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Version",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "items",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentDescriptor>"
+            },
+            {
+              "Name": "version",
+              "Type": "System.Int32"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentFeature",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ViewComponents",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<System.Reflection.TypeInfo>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentFeatureProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationParts.IApplicationFeatureProvider<Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentFeature>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "PopulateFeature",
+          "Parameters": [
+            {
+              "Name": "parts",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPart>"
+            },
+            {
+              "Name": "feature",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentFeature"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationParts.IApplicationFeatureProvider<Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentFeature>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.IViewComponentResult"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ViewName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewName",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewData",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TempData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TempData",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewEngine",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewEngine",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Execute",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IViewComponentResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IViewComponentResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.FormMethod",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Get",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Post",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.Html5DateRenderingMode",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Rfc3339",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "CurrentCulture",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.HtmlHelperDisplayExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Display",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Display",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Display",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Display",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Display",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlFieldName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlFieldName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayForModel",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayForModel",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayForModel",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayForModel",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayForModel",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlFieldName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayForModel",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlFieldName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.HtmlHelperDisplayNameExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "DisplayNameForModel",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayNameFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<System.Collections.Generic.IEnumerable<T0>>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModelItem",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.HtmlHelperEditorExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Editor",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Editor",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Editor",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Editor",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Editor",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlFieldName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EditorFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "EditorFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "EditorFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "EditorFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "EditorFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlFieldName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "EditorForModel",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EditorForModel",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EditorForModel",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EditorForModel",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EditorForModel",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlFieldName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EditorForModel",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlFieldName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.HtmlHelperFormExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "BeginForm",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginForm",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "antiforgery",
+              "Type": "System.Nullable<System.Boolean>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginForm",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.FormMethod"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginForm",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.FormMethod"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginForm",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.FormMethod"
+            },
+            {
+              "Name": "antiforgery",
+              "Type": "System.Nullable<System.Boolean>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginForm",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginForm",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginForm",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginForm",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.FormMethod"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginForm",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.FormMethod"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginForm",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.FormMethod"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginRouteForm",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginRouteForm",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "antiforgery",
+              "Type": "System.Nullable<System.Boolean>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginRouteForm",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginRouteForm",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "antiforgery",
+              "Type": "System.Nullable<System.Boolean>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginRouteForm",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginRouteForm",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.FormMethod"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginRouteForm",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.FormMethod"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginRouteForm",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.FormMethod"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.HtmlHelperInputExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CheckBox",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CheckBox",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "isChecked",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CheckBox",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CheckBoxFor<T0>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, System.Boolean>>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "Hidden",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Hidden",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "HiddenFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "Password",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Password",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PasswordFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "RadioButton",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RadioButton",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RadioButton",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "isChecked",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RadioButtonFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TextBox",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TextBox",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TextBox",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TextBox",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TextBoxFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TextBoxFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TextBoxFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TextArea",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TextArea",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TextArea",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TextArea",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TextAreaFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TextAreaFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.HtmlHelperLabelExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Label",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Label",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "labelText",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "LabelFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "LabelFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            },
+            {
+              "Name": "labelText",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "LabelFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "LabelForModel",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "LabelForModel",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "labelText",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "LabelForModel",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "LabelForModel",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "labelText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.HtmlHelperLinkExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ActionLink",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ActionLink",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ActionLink",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ActionLink",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ActionLink",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ActionLink",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RouteLink",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RouteLink",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RouteLink",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RouteLink",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RouteLink",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.HtmlHelperNameExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "NameForModel",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "IdForModel",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.HtmlHelperPartialExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "PartialAsync",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "partialViewName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent>",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PartialAsync",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "partialViewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "viewData",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent>",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PartialAsync",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "partialViewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent>",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Partial",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "partialViewName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Partial",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "partialViewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "viewData",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Partial",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "partialViewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Partial",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "partialViewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "viewData",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderPartial",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "partialViewName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderPartial",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "partialViewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "viewData",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderPartial",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "partialViewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderPartial",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "partialViewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "viewData",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderPartialAsync",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "partialViewName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderPartialAsync",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "partialViewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "viewData",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderPartialAsync",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "partialViewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.HtmlHelperSelectExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "DropDownList",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DropDownList",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "optionLabel",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DropDownList",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DropDownList",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DropDownList",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            },
+            {
+              "Name": "optionLabel",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DropDownListFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "DropDownListFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "DropDownListFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            },
+            {
+              "Name": "optionLabel",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ListBox",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ListBox",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ListBoxFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.HtmlHelperValidationExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ValidationMessage",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationMessage",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationMessage",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationMessage",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "tag",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationMessage",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationMessageFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationMessageFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationMessageFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationMessageFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "tag",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationSummary",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationSummary",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "excludePropertyErrors",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationSummary",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationSummary",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "tag",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationSummary",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "excludePropertyErrors",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationSummary",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationSummary",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "tag",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationSummary",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "excludePropertyErrors",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "tag",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationSummary",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "excludePropertyErrors",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.HtmlHelperValueExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Value",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValueFor<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValueForModel",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValueForModel",
+          "Parameters": [
+            {
+              "Name": "htmlHelper",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Html5DateRenderingMode",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.Html5DateRenderingMode",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Html5DateRenderingMode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.Html5DateRenderingMode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IdAttributeDotReplacement",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MetadataProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewBag",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TempData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_UrlEncoder",
+          "Parameters": [],
+          "ReturnType": "System.Text.Encodings.Web.UrlEncoder",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ActionLink",
+          "Parameters": [
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "protocol",
+              "Type": "System.String"
+            },
+            {
+              "Name": "hostname",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AntiForgeryToken",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginForm",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.FormMethod"
+            },
+            {
+              "Name": "antiforgery",
+              "Type": "System.Nullable<System.Boolean>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginRouteForm",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.FormMethod"
+            },
+            {
+              "Name": "antiforgery",
+              "Type": "System.Nullable<System.Boolean>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CheckBox",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "isChecked",
+              "Type": "System.Nullable<System.Boolean>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Display",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlFieldName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayName",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayText",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DropDownList",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            },
+            {
+              "Name": "optionLabel",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Editor",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlFieldName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Encode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Encode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndForm",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FormatValue",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateIdFromName",
+          "Parameters": [
+            {
+              "Name": "fullName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetEnumSelectList<T0>",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>",
+          "GenericParameter": [
+            {
+              "ParameterName": "TEnum",
+              "ParameterPosition": 0,
+              "New": true,
+              "Struct": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetEnumSelectList",
+          "Parameters": [
+            {
+              "Name": "enumType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Hidden",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Id",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Label",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "labelText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ListBox",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Name",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PartialAsync",
+          "Parameters": [
+            {
+              "Name": "partialViewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "viewData",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Password",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RadioButton",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "isChecked",
+              "Type": "System.Nullable<System.Boolean>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Raw",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Raw",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderPartialAsync",
+          "Parameters": [
+            {
+              "Name": "partialViewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "viewData",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RouteLink",
+          "Parameters": [
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "protocol",
+              "Type": "System.String"
+            },
+            {
+              "Name": "hostName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TextArea",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.String"
+            },
+            {
+              "Name": "rows",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "columns",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TextBox",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationMessage",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "tag",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationSummary",
+          "Parameters": [
+            {
+              "Name": "excludePropertyErrors",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "tag",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Value",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ViewData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<T0>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CheckBoxFor",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, System.Boolean>>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlFieldName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayNameFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayNameForInnerType<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModelItem",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayTextFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "DropDownListFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            },
+            {
+              "Name": "optionLabel",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "EditorFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlFieldName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "Encode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Encode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "HiddenFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "IdFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "LabelFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "labelText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ListBoxFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "NameFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "PasswordFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "RadioButtonFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "Raw",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Raw",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TextAreaFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "rows",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "columns",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TextBoxFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationMessageFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "tag",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValueFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TModel",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Serialize",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Serialize",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "serializerSettings",
+              "Type": "Newtonsoft.Json.JsonSerializerSettings"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.MultiSelectList",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DataGroupField",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DataTextField",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_DataValueField",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Items",
+          "Parameters": [],
+          "ReturnType": "System.Collections.IEnumerable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_SelectedValues",
+          "Parameters": [],
+          "ReturnType": "System.Collections.IEnumerable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetEnumerator",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerator<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>",
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "items",
+              "Type": "System.Collections.IEnumerable"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "items",
+              "Type": "System.Collections.IEnumerable"
+            },
+            {
+              "Name": "selectedValues",
+              "Type": "System.Collections.IEnumerable"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "items",
+              "Type": "System.Collections.IEnumerable"
+            },
+            {
+              "Name": "dataValueField",
+              "Type": "System.String"
+            },
+            {
+              "Name": "dataTextField",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "items",
+              "Type": "System.Collections.IEnumerable"
+            },
+            {
+              "Name": "dataValueField",
+              "Type": "System.String"
+            },
+            {
+              "Name": "dataTextField",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selectedValues",
+              "Type": "System.Collections.IEnumerable"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "items",
+              "Type": "System.Collections.IEnumerable"
+            },
+            {
+              "Name": "dataValueField",
+              "Type": "System.String"
+            },
+            {
+              "Name": "dataTextField",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selectedValues",
+              "Type": "System.Collections.IEnumerable"
+            },
+            {
+              "Name": "dataGroupField",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "System.IDisposable"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndForm",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateEndForm",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.SelectList",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.Rendering.MultiSelectList",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_SelectedValue",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "items",
+              "Type": "System.Collections.IEnumerable"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "items",
+              "Type": "System.Collections.IEnumerable"
+            },
+            {
+              "Name": "selectedValue",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "items",
+              "Type": "System.Collections.IEnumerable"
+            },
+            {
+              "Name": "dataValueField",
+              "Type": "System.String"
+            },
+            {
+              "Name": "dataTextField",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "items",
+              "Type": "System.Collections.IEnumerable"
+            },
+            {
+              "Name": "dataValueField",
+              "Type": "System.String"
+            },
+            {
+              "Name": "dataTextField",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selectedValue",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "items",
+              "Type": "System.Collections.IEnumerable"
+            },
+            {
+              "Name": "dataValueField",
+              "Type": "System.String"
+            },
+            {
+              "Name": "dataTextField",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selectedValue",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "dataGroupField",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.SelectListGroup",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Disabled",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Disabled",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.SelectListItem",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Disabled",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Disabled",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Group",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.SelectListGroup",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Group",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.SelectListGroup"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Selected",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Selected",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Text",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Text",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Value",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Value",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "text",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "text",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selected",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "text",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selected",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "disabled",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Html.IHtmlContent"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Attributes",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.AttributeDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_InnerHtml",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContentBuilder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasInnerHtml",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TagRenderMode",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagRenderMode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TagRenderMode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.TagRenderMode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddCssClass",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateSanitizedId",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "invalidCharReplacement",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateId",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "invalidCharReplacement",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MergeAttribute",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MergeAttribute",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.String"
+            },
+            {
+              "Name": "replaceExisting",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MergeAttributes<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "attributes",
+              "Type": "System.Collections.Generic.IDictionary<T0, T1>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TKey",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TValue",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "MergeAttributes<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "attributes",
+              "Type": "System.Collections.Generic.IDictionary<T0, T1>"
+            },
+            {
+              "Name": "replaceExisting",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TKey",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TValue",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteTo",
+          "Parameters": [
+            {
+              "Name": "writer",
+              "Type": "System.IO.TextWriter"
+            },
+            {
+              "Name": "encoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderBody",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderStartTag",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderEndTag",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderSelfClosingTag",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "tagName",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.TagRenderMode",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "Normal",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "StartTag",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "EndTag",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        },
+        {
+          "Kind": "Field",
+          "Name": "SelfClosing",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "3"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.ViewComponentHelperExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "InvokeAsync",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.IViewComponentHelper"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent>",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "InvokeAsync",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.IViewComponentHelper"
+            },
+            {
+              "Name": "componentType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent>",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "InvokeAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.IViewComponentHelper"
+            },
+            {
+              "Name": "arguments",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent>",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TComponent",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "InvokeAsync<T0>",
+          "Parameters": [
+            {
+              "Name": "helper",
+              "Type": "Microsoft.AspNetCore.Mvc.IViewComponentHelper"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent>",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TComponent",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ActionContext",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_FormContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.FormContext",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FormContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.FormContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ClientValidationEnabled",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ClientValidationEnabled",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Html5DateRenderingMode",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.Html5DateRenderingMode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Html5DateRenderingMode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.Html5DateRenderingMode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidationSummaryMessageElement",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ValidationSummaryMessageElement",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidationMessageElement",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ValidationMessageElement",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewBag",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_View",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewEngines.IView",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_View",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewEngines.IView"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ViewData",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TempData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_TempData",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Writer",
+          "Parameters": [],
+          "ReturnType": "System.IO.TextWriter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Writer",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.IO.TextWriter"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ExecutingFilePath",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ExecutingFilePath",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetFormContextForClientValidation",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.FormContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "view",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewEngines.IView"
+            },
+            {
+              "Name": "viewData",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            },
+            {
+              "Name": "tempData",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary"
+            },
+            {
+              "Name": "writer",
+              "Type": "System.IO.TextWriter"
+            },
+            {
+              "Name": "htmlHelperOptions",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelperOptions"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "view",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewEngines.IView"
+            },
+            {
+              "Name": "viewData",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            },
+            {
+              "Name": "writer",
+              "Type": "System.IO.TextWriter"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionaryExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddModelError<T0>",
+          "Parameters": [
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, System.Object>>"
+            },
+            {
+              "Name": "errorMessage",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryAddModelException<T0>",
+          "Parameters": [
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, System.Object>>"
+            },
+            {
+              "Name": "exception",
+              "Type": "System.Exception"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddModelError<T0>",
+          "Parameters": [
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, System.Object>>"
+            },
+            {
+              "Name": "exception",
+              "Type": "System.Exception"
+            },
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "Remove<T0>",
+          "Parameters": [
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, System.Object>>"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "RemoveAll<T0>",
+          "Parameters": [
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, System.Object>>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Contextualize",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.AntiforgeryExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetHtml",
+          "Parameters": [
+            {
+              "Name": "antiforgery",
+              "Type": "Microsoft.AspNetCore.Antiforgery.IAntiforgery"
+            },
+            {
+              "Name": "httpContext",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.AttributeDictionary",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IDictionary<System.String, System.String>",
+        "System.Collections.Generic.IReadOnlyDictionary<System.String, System.String>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Count",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.String, System.String>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReadOnly",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.String, System.String>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "System.Collections.Generic.KeyValuePair<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.String, System.String>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Clear",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.String, System.String>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Contains",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "System.Collections.Generic.KeyValuePair<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.String, System.String>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CopyTo",
+          "Parameters": [
+            {
+              "Name": "array",
+              "Type": "System.Collections.Generic.KeyValuePair<System.String, System.String>[]"
+            },
+            {
+              "Name": "arrayIndex",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.String, System.String>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Remove",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "System.Collections.Generic.KeyValuePair<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.String, System.String>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Item",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Keys",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<System.String>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Values",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<System.String>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ContainsKey",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetEnumerator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.AttributeDictionary+Enumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Remove",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryGetValue",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.String",
+              "Direction": "Out"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.CookieTempDataProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "LoadTempData",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SaveTempData",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Collections.Generic.IDictionary<System.String, System.Object>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "dataProtectionProvider",
+              "Type": "Microsoft.AspNetCore.DataProtection.IDataProtectionProvider"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            },
+            {
+              "Name": "options",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.CookieTempDataProviderOptions>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "CookieName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.DefaultHtmlGenerator",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_IdAttributeDotReplacement",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Encode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Encode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FormatValue",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateActionLink",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "protocol",
+              "Type": "System.String"
+            },
+            {
+              "Name": "hostname",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GeneratePageLink",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "protocol",
+              "Type": "System.String"
+            },
+            {
+              "Name": "hostname",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateAntiforgery",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateCheckBox",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "isChecked",
+              "Type": "System.Nullable<System.Boolean>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateHiddenForCheckbox",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateForm",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "method",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GeneratePageForm",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            },
+            {
+              "Name": "method",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateRouteForm",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "method",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateHidden",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "useViewData",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateLabel",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "labelText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GeneratePassword",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateRadioButton",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "isChecked",
+              "Type": "System.Nullable<System.Boolean>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateRouteLink",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "protocol",
+              "Type": "System.String"
+            },
+            {
+              "Name": "hostName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateSelect",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "optionLabel",
+              "Type": "System.String"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            },
+            {
+              "Name": "allowMultiple",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateSelect",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "optionLabel",
+              "Type": "System.String"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            },
+            {
+              "Name": "currentValues",
+              "Type": "System.Collections.Generic.ICollection<System.String>"
+            },
+            {
+              "Name": "allowMultiple",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateTextArea",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "rows",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "columns",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateTextBox",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateValidationMessage",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "tag",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateValidationSummary",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "excludePropertyErrors",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "headerTag",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetCurrentValues",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "allowMultiple",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.ICollection<System.String>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateFormCore",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "action",
+              "Type": "System.String"
+            },
+            {
+              "Name": "method",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateInput",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "inputType",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.InputType"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "useViewData",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "isChecked",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "setId",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "isExplicitValue",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Collections.Generic.IDictionary<System.String, System.Object>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateLink",
+          "Parameters": [
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "url",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddPlaceholderAttribute",
+          "Parameters": [
+            {
+              "Name": "viewData",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            },
+            {
+              "Name": "tagBuilder",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddValidationAttributes",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "tagBuilder",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateGroupsAndOptions",
+          "Parameters": [
+            {
+              "Name": "optionLabel",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "antiforgery",
+              "Type": "Microsoft.AspNetCore.Antiforgery.IAntiforgery"
+            },
+            {
+              "Name": "optionsAccessor",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcViewOptions>"
+            },
+            {
+              "Name": "metadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "urlHelperFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory"
+            },
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            },
+            {
+              "Name": "validationAttributeProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ValidationHtmlAttributeProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.DefaultHtmlGeneratorExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GenerateForm",
+          "Parameters": [
+            {
+              "Name": "generator",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator"
+            },
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "method",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateRouteForm",
+          "Parameters": [
+            {
+              "Name": "generator",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator"
+            },
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            },
+            {
+              "Name": "method",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.DefaultValidationHtmlAttributeProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ValidationHtmlAttributeProvider",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddValidationAttributes",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "attributes",
+              "Type": "System.Collections.Generic.IDictionary<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "optionsAccessor",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcViewOptions>"
+            },
+            {
+              "Name": "metadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "clientValidatorCache",
+              "Type": "Microsoft.AspNetCore.Mvc.Internal.ClientValidatorCache"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.FormContext",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_FormData",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasAntiforgeryToken",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HasAntiforgeryToken",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasFormData",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HasEndOfFormContent",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_EndOfFormContent",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Html.IHtmlContent>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_CanRenderAtEndOfForm",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_CanRenderAtEndOfForm",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderedField",
+          "Parameters": [
+            {
+              "Name": "fieldName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderedField",
+          "Parameters": [
+            {
+              "Name": "fieldName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+        "Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Html5DateRenderingMode",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.Html5DateRenderingMode",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Html5DateRenderingMode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.Html5DateRenderingMode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IdAttributeDotReplacement",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewBag",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TempData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_UrlEncoder",
+          "Parameters": [],
+          "ReturnType": "System.Text.Encodings.Web.UrlEncoder",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MetadataProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ObjectToDictionary",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AnonymousObjectToHtmlAttributes",
+          "Parameters": [
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Contextualize",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ActionLink",
+          "Parameters": [
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "protocol",
+              "Type": "System.String"
+            },
+            {
+              "Name": "hostname",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AntiForgeryToken",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginForm",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.FormMethod"
+            },
+            {
+              "Name": "antiforgery",
+              "Type": "System.Nullable<System.Boolean>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginRouteForm",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.FormMethod"
+            },
+            {
+              "Name": "antiforgery",
+              "Type": "System.Nullable<System.Boolean>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndForm",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CheckBox",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "isChecked",
+              "Type": "System.Nullable<System.Boolean>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Encode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Encode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FormatValue",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateIdFromName",
+          "Parameters": [
+            {
+              "Name": "fullName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Display",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlFieldName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayName",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayText",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DropDownList",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            },
+            {
+              "Name": "optionLabel",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Editor",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlFieldName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetEnumSelectList<T0>",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TEnum",
+              "ParameterPosition": 0,
+              "New": true,
+              "Struct": true,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetEnumSelectList",
+          "Parameters": [
+            {
+              "Name": "enumType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Hidden",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Id",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Label",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "labelText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ListBox",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Name",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "PartialAsync",
+          "Parameters": [
+            {
+              "Name": "partialViewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "viewData",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderPartialAsync",
+          "Parameters": [
+            {
+              "Name": "partialViewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "viewData",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateDisplay",
+          "Parameters": [
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "htmlFieldName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RenderPartialCoreAsync",
+          "Parameters": [
+            {
+              "Name": "partialViewName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "viewData",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            },
+            {
+              "Name": "writer",
+              "Type": "System.IO.TextWriter"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Password",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RadioButton",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "isChecked",
+              "Type": "System.Nullable<System.Boolean>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Raw",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Raw",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RouteLink",
+          "Parameters": [
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "protocol",
+              "Type": "System.String"
+            },
+            {
+              "Name": "hostName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationMessage",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "tag",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationSummary",
+          "Parameters": [
+            {
+              "Name": "excludePropertyErrors",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "tag",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetFormMethodString",
+          "Parameters": [
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.FormMethod"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TextArea",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.String"
+            },
+            {
+              "Name": "rows",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "columns",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TextBox",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Value",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateForm",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateCheckBox",
+          "Parameters": [
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "isChecked",
+              "Type": "System.Nullable<System.Boolean>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateDisplayName",
+          "Parameters": [
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateDisplayText",
+          "Parameters": [
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateDropDown",
+          "Parameters": [
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            },
+            {
+              "Name": "optionLabel",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateEditor",
+          "Parameters": [
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "htmlFieldName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateForm",
+          "Parameters": [
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.FormMethod"
+            },
+            {
+              "Name": "antiforgery",
+              "Type": "System.Nullable<System.Boolean>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateRouteForm",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "method",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.FormMethod"
+            },
+            {
+              "Name": "antiforgery",
+              "Type": "System.Nullable<System.Boolean>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.MvcForm",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateHidden",
+          "Parameters": [
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "useViewData",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateId",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateLabel",
+          "Parameters": [
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "labelText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateListBox",
+          "Parameters": [
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateName",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GeneratePassword",
+          "Parameters": [
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateRadioButton",
+          "Parameters": [
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "isChecked",
+              "Type": "System.Nullable<System.Boolean>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateTextArea",
+          "Parameters": [
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "rows",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "columns",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateTextBox",
+          "Parameters": [
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateValidationMessage",
+          "Parameters": [
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "tag",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateValidationSummary",
+          "Parameters": [
+            {
+              "Name": "excludePropertyErrors",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "tag",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateValue",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            },
+            {
+              "Name": "useViewData",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetEnumSelectList",
+          "Parameters": [
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "htmlGenerator",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator"
+            },
+            {
+              "Name": "viewEngine",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine"
+            },
+            {
+              "Name": "metadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "bufferScope",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.Internal.IViewBufferScope"
+            },
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            },
+            {
+              "Name": "urlEncoder",
+              "Type": "System.Text.Encodings.Web.UrlEncoder"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "ValidationInputCssClassName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "ValidationInputValidCssClassName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "ValidationMessageCssClassName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "ValidationMessageValidCssClassName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "ValidationSummaryCssClassName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "ValidationSummaryValidCssClassName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelper<T0>",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelper",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Contextualize",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewData",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<T0>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CheckBoxFor",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, System.Boolean>>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "DropDownListFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            },
+            {
+              "Name": "optionLabel",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlFieldName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayNameFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayNameForInnerType<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModelItem",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "DisplayTextFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "EditorFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "templateName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlFieldName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "additionalViewData",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "HiddenFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "IdFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "LabelFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "labelText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ListBoxFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "NameFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "PasswordFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "RadioButtonFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TextAreaFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "rows",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "columns",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "TextBoxFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetExpressionName<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetModelExplorer<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer",
+          "Visibility": "Protected",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValidationMessageFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "tag",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "ValueFor<T0>",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T0>>"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<T0>",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TResult",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "htmlGenerator",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator"
+            },
+            {
+              "Name": "viewEngine",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine"
+            },
+            {
+              "Name": "metadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "bufferScope",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.Internal.IViewBufferScope"
+            },
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            },
+            {
+              "Name": "urlEncoder",
+              "Type": "System.Text.Encodings.Web.UrlEncoder"
+            },
+            {
+              "Name": "expressionTextCache",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.Internal.ExpressionTextCache"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TModel",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelperOptions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Html5DateRenderingMode",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.Html5DateRenderingMode",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Html5DateRenderingMode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.Html5DateRenderingMode"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IdAttributeDotReplacement",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IdAttributeDotReplacement",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ClientValidationEnabled",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ClientValidationEnabled",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidationMessageElement",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ValidationMessageElement",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ValidationSummaryMessageElement",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ValidationSummaryMessageElement",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.IAntiforgeryPolicy",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata"
+      ],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_IdAttributeDotReplacement",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Encode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Encode",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FormatValue",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateActionLink",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "protocol",
+              "Type": "System.String"
+            },
+            {
+              "Name": "hostname",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GeneratePageLink",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "protocol",
+              "Type": "System.String"
+            },
+            {
+              "Name": "hostname",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateAntiforgery",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateCheckBox",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "isChecked",
+              "Type": "System.Nullable<System.Boolean>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateHiddenForCheckbox",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateForm",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "actionName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "controllerName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "method",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GeneratePageForm",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "pageName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "pageHandler",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            },
+            {
+              "Name": "method",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateRouteForm",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "method",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateHidden",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "useViewData",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateLabel",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "labelText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GeneratePassword",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateRadioButton",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "isChecked",
+              "Type": "System.Nullable<System.Boolean>"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateRouteLink",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "linkText",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "protocol",
+              "Type": "System.String"
+            },
+            {
+              "Name": "hostName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "fragment",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateSelect",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "optionLabel",
+              "Type": "System.String"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            },
+            {
+              "Name": "allowMultiple",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateSelect",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "optionLabel",
+              "Type": "System.String"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            },
+            {
+              "Name": "currentValues",
+              "Type": "System.Collections.Generic.ICollection<System.String>"
+            },
+            {
+              "Name": "allowMultiple",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateGroupsAndOptions",
+          "Parameters": [
+            {
+              "Name": "optionLabel",
+              "Type": "System.String"
+            },
+            {
+              "Name": "selectList",
+              "Type": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateTextArea",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "rows",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "columns",
+              "Type": "System.Int32"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateTextBox",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateValidationMessage",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "tag",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GenerateValidationSummary",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "excludePropertyErrors",
+              "Type": "System.Boolean"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "headerTag",
+              "Type": "System.String"
+            },
+            {
+              "Name": "htmlAttributes",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.TagBuilder",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetCurrentValues",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "allowMultiple",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.ICollection<System.String>",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateModelExpression<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "viewData",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TValue",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.InputType",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "CheckBox",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Hidden",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Password",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Radio",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "3"
+        },
+        {
+          "Kind": "Field",
+          "Name": "Text",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "4"
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IDictionary<System.String, System.Object>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Load",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Save",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Keep",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Keep",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Peek",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetTempData",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataProvider",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "LoadTempData",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SaveTempData",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Collections.Generic.IDictionary<System.String, System.Object>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.JsonHelper",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Serialize",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Serialize",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "serializerSettings",
+              "Type": "Newtonsoft.Json.JsonSerializerSettings"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "jsonOutputFormatter",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.JsonOutputFormatter"
+            },
+            {
+              "Name": "charPool",
+              "Type": "System.Buffers.ArrayPool<System.Char>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Container",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Metadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Model",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelType",
+          "Parameters": [],
+          "ReturnType": "System.Type",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Properties",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetExplorerForModel",
+          "Parameters": [
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetExplorerForProperty",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetExplorerForProperty",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "modelAccessor",
+              "Type": "System.Func<System.Object, System.Object>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetExplorerForProperty",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetExplorerForExpression",
+          "Parameters": [
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetExplorerForExpression",
+          "Parameters": [
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetExplorerForExpression",
+          "Parameters": [
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "modelAccessor",
+              "Type": "System.Func<System.Object, System.Object>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetExplorerForExpression",
+          "Parameters": [
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "modelAccessor",
+              "Type": "System.Func<System.Object, System.Object>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "metadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "metadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "container",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "modelAccessor",
+              "Type": "System.Func<System.Object, System.Object>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "metadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "container",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "metadata",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorerExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetSimpleDisplayText",
+          "Parameters": [
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Metadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Model",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelExplorer",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpressionProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateModelExpression<T0, T1>",
+          "Parameters": [
+            {
+              "Name": "viewData",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<T0>"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.Linq.Expressions.Expression<System.Func<T0, T1>>"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TModel",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            },
+            {
+              "ParameterName": "TValue",
+              "ParameterPosition": 1,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "modelMetadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "expressionTextCache",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.Internal.ExpressionTextCache"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelMetadataProviderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetModelExplorerForType",
+          "Parameters": [
+            {
+              "Name": "provider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "modelType",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.PartialViewResultExecutor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewExecutor",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.PartialViewResult>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Logger",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.Logging.ILogger",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FindView",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "viewResult",
+              "Type": "Microsoft.AspNetCore.Mvc.PartialViewResult"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewEngines.ViewEngineResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "view",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewEngines.IView"
+            },
+            {
+              "Name": "viewResult",
+              "Type": "Microsoft.AspNetCore.Mvc.PartialViewResult"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.PartialViewResult"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.PartialViewResult>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "viewOptions",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcViewOptions>"
+            },
+            {
+              "Name": "writerFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory"
+            },
+            {
+              "Name": "viewEngine",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine"
+            },
+            {
+              "Name": "tempDataFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory"
+            },
+            {
+              "Name": "diagnosticSource",
+              "Type": "System.Diagnostics.DiagnosticSource"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            },
+            {
+              "Name": "modelMetadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.SaveTempDataAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+        "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReusable",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateInstance",
+          "Parameters": [
+            {
+              "Name": "serviceProvider",
+              "Type": "System.IServiceProvider"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IFilterFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.SessionStateTempDataProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "LoadTempData",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SaveTempData",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            },
+            {
+              "Name": "values",
+              "Type": "System.Collections.Generic.IDictionary<System.String, System.Object>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.StringHtmlContent",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Html.IHtmlContent"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "WriteTo",
+          "Parameters": [
+            {
+              "Name": "writer",
+              "Type": "System.IO.TextWriter"
+            },
+            {
+              "Name": "encoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Html.IHtmlContent",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "input",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.TempDataDictionary",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Item",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Keys",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<System.String>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Values",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<System.Object>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ContainsKey",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Remove",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryGetValue",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object",
+              "Direction": "Out"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Count",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.String, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Clear",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.String, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetEnumerator",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<System.String, System.Object>>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Keep",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Keep",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Load",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Save",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Peek",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ContainsValue",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            },
+            {
+              "Name": "provider",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.TempDataDictionaryFactory",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetTempData",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "provider",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.TemplateInfo",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_FormattedModelValue",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_FormattedModelValue",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_HtmlFieldPrefix",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HtmlFieldPrefix",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TemplateDepth",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddVisited",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetFullHtmlFieldName",
+          "Parameters": [
+            {
+              "Name": "partialFieldName",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Visited",
+          "Parameters": [
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "original",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.TemplateInfo"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.TryGetValueDelegate",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "System.MulticastDelegate",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Invoke",
+          "Parameters": [
+            {
+              "Name": "dictionary",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object",
+              "Direction": "Out"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BeginInvoke",
+          "Parameters": [
+            {
+              "Name": "dictionary",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object",
+              "Direction": "Out"
+            },
+            {
+              "Name": "callback",
+              "Type": "System.AsyncCallback"
+            },
+            {
+              "Name": "object",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.IAsyncResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "EndInvoke",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object",
+              "Direction": "Out"
+            },
+            {
+              "Name": "result",
+              "Type": "System.IAsyncResult"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "object",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "method",
+              "Type": "System.IntPtr"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.TryGetValueProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateInstance",
+          "Parameters": [
+            {
+              "Name": "targetType",
+              "Type": "System.Type"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.TryGetValueDelegate",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.ValidationHtmlAttributeProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddValidationAttributes",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "attributes",
+              "Type": "System.Collections.Generic.IDictionary<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Abstract": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddAndTrackValidationAttributes",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "modelExplorer",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "attributes",
+              "Type": "System.Collections.Generic.IDictionary<System.String, System.String>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewComponentResultExecutor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.ViewComponentResult>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewComponentResult"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.ViewComponentResult>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "mvcHelperOptions",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcViewOptions>"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            },
+            {
+              "Name": "htmlEncoder",
+              "Type": "System.Text.Encodings.Web.HtmlEncoder"
+            },
+            {
+              "Name": "modelMetadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "tempDataDictionaryFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IDictionary<System.String, System.Object>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Count",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.String, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsReadOnly",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.String, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "System.Collections.Generic.KeyValuePair<System.String, System.Object>"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.String, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Clear",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.String, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Contains",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "System.Collections.Generic.KeyValuePair<System.String, System.Object>"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.String, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CopyTo",
+          "Parameters": [
+            {
+              "Name": "array",
+              "Type": "System.Collections.Generic.KeyValuePair<System.String, System.Object>[]"
+            },
+            {
+              "Name": "arrayIndex",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.String, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Remove",
+          "Parameters": [
+            {
+              "Name": "item",
+              "Type": "System.Collections.Generic.KeyValuePair<System.String, System.Object>"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.String, System.Object>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Model",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Model",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelState",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelMetadata",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelExplorer",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ModelExplorer",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TemplateInfo",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.TemplateInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Item",
+          "Parameters": [
+            {
+              "Name": "index",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Keys",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<System.String>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Values",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.ICollection<System.Object>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Eval",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Eval",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FormatValue",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "format",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetViewDataInfo",
+          "Parameters": [
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SetModel",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Add",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ContainsKey",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Remove",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "TryGetValue",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object",
+              "Direction": "Out"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "metadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "source",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "metadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "declaredModelType",
+              "Type": "System.Type"
+            }
+          ],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "metadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            },
+            {
+              "Name": "declaredModelType",
+              "Type": "System.Type"
+            }
+          ],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "source",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            },
+            {
+              "Name": "declaredModelType",
+              "Type": "System.Type"
+            }
+          ],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "source",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "declaredModelType",
+              "Type": "System.Type"
+            }
+          ],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionaryAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionaryControllerPropertyActivator",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Internal.IControllerPropertyActivator"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Activate",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ControllerContext"
+            },
+            {
+              "Name": "controller",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Internal.IControllerPropertyActivator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetActivatorDelegate",
+          "Parameters": [
+            {
+              "Name": "actionDescriptor",
+              "Type": "Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor"
+            }
+          ],
+          "ReturnType": "System.Action<Microsoft.AspNetCore.Mvc.ControllerContext, System.Object>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Internal.IControllerPropertyActivator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "modelMetadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<T0>",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Model",
+          "Parameters": [],
+          "ReturnType": "T0",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Model",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "metadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            },
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "source",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "source",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            },
+            {
+              "Name": "model",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "TModel",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataEvaluator",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Eval",
+          "Parameters": [
+            {
+              "Name": "viewData",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataInfo",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Eval",
+          "Parameters": [
+            {
+              "Name": "indexableObject",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "expression",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataInfo",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataInfo",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Container",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_PropertyInfo",
+          "Parameters": [],
+          "ReturnType": "System.Reflection.PropertyInfo",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Value",
+          "Parameters": [],
+          "ReturnType": "System.Object",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Value",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "container",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "value",
+              "Type": "System.Object"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "container",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "propertyInfo",
+              "Type": "System.Reflection.PropertyInfo"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "container",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "propertyInfo",
+              "Type": "System.Reflection.PropertyInfo"
+            },
+            {
+              "Name": "valueAccessor",
+              "Type": "System.Func<System.Object>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewExecutor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_DiagnosticSource",
+          "Parameters": [],
+          "ReturnType": "System.Diagnostics.DiagnosticSource",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_TempDataFactory",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewEngine",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ViewOptions",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.MvcViewOptions",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelMetadataProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_WriterFactory",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "view",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewEngines.IView"
+            },
+            {
+              "Name": "viewData",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary"
+            },
+            {
+              "Name": "tempData",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "statusCode",
+              "Type": "System.Nullable<System.Int32>"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "viewContext",
+              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
+            },
+            {
+              "Name": "contentType",
+              "Type": "System.String"
+            },
+            {
+              "Name": "statusCode",
+              "Type": "System.Nullable<System.Int32>"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "viewOptions",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcViewOptions>"
+            },
+            {
+              "Name": "writerFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory"
+            },
+            {
+              "Name": "viewEngine",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine"
+            },
+            {
+              "Name": "tempDataFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory"
+            },
+            {
+              "Name": "diagnosticSource",
+              "Type": "System.Diagnostics.DiagnosticSource"
+            },
+            {
+              "Name": "modelMetadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "writerFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory"
+            },
+            {
+              "Name": "viewEngine",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine"
+            },
+            {
+              "Name": "diagnosticSource",
+              "Type": "System.Diagnostics.DiagnosticSource"
+            }
+          ],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "DefaultContentType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewResultExecutor",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ViewFeatures.ViewExecutor",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.ViewResult>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Logger",
+          "Parameters": [],
+          "ReturnType": "Microsoft.Extensions.Logging.ILogger",
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "FindView",
+          "Parameters": [
+            {
+              "Name": "actionContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "viewResult",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewResult"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ViewEngines.ViewEngineResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ExecuteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            },
+            {
+              "Name": "result",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewResult"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor<Microsoft.AspNetCore.Mvc.ViewResult>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "viewOptions",
+              "Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcViewOptions>"
+            },
+            {
+              "Name": "writerFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory"
+            },
+            {
+              "Name": "viewEngine",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine"
+            },
+            {
+              "Name": "tempDataFactory",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory"
+            },
+            {
+              "Name": "diagnosticSource",
+              "Type": "System.Diagnostics.DiagnosticSource"
+            },
+            {
+              "Name": "loggerFactory",
+              "Type": "Microsoft.Extensions.Logging.ILoggerFactory"
+            },
+            {
+              "Name": "modelMetadataProvider",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.MvcViewFeaturesMvcBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddViewOptions",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.MvcViewOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddViewComponentsAsServices",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddSessionStateTempDataProvider",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddCookieTempDataProvider",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddCookieTempDataProvider",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.CookieTempDataProviderOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.MvcViewFeaturesMvcCoreBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddViews",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddCookieTempDataProvider",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddViews",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.MvcViewOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddCookieTempDataProvider",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.CookieTempDataProviderOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ConfigureViews",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.MvcViewOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.AttributeDictionary+Enumerator",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<System.String, System.String>>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MoveNext",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Reset",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Current",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.KeyValuePair<System.String, System.String>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<System.String, System.String>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "attributes",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.AttributeDictionary"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.AttributeDictionary+KeyCollection+Enumerator",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IEnumerator<System.String>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MoveNext",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Reset",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Current",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IEnumerator<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "attributes",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.AttributeDictionary"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures.AttributeDictionary+ValueCollection+Enumerator",
+      "Visibility": "Public",
+      "Kind": "Struct",
+      "Sealed": true,
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IEnumerator<System.String>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MoveNext",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Reset",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.IEnumerator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Current",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IEnumerator<System.String>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "attributes",
+              "Type": "Microsoft.AspNetCore.Mvc.ViewFeatures.AttributeDictionary"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ApiController.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ApiController.cs
new file mode 100644
index 0000000000..ef5c4d6a38
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ApiController.cs
@@ -0,0 +1,580 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using System.Security.Principal;
+using System.Text;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.WebApiCompatShim;
+using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
+
+namespace System.Web.Http
+{
+    [UseWebApiRoutes]
+    [UseWebApiActionConventions]
+    [UseWebApiParameterConventions]
+    [UseWebApiOverloading]
+    [Controller]
+    public abstract class ApiController : IDisposable
+    {
+        private ControllerContext _controllerContext;
+        private HttpRequestMessage _request;
+        private IModelMetadataProvider _metadataProvider;
+        private IObjectModelValidator _objectValidator;
+        private IUrlHelper _urlHelper;
+
+        /// <summary>
+        /// Gets the <see cref="Microsoft.AspNetCore.Mvc.ActionContext"/>.
+        /// </summary>
+        public ActionContext ActionContext => ControllerContext;
+
+        /// <summary>
+        /// Gets or sets the <see cref="ControllerContext"/>.
+        /// </summary>
+        /// <remarks>The setter is intended for unit testing purposes only.</remarks>
+        [ControllerContext]
+        public ControllerContext ControllerContext
+        {
+            get
+            {
+                if (_controllerContext == null)
+                {
+                    _controllerContext = new ControllerContext();
+                }
+
+                return _controllerContext;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException(nameof(value));
+                }
+
+                _controllerContext = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the http context.
+        /// </summary>
+        public HttpContext Context
+        {
+            get
+            {
+                return ControllerContext.HttpContext;
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="IModelMetadataProvider"/>.
+        /// </summary>
+        /// <remarks>The setter is intended for unit testing purposes only.</remarks>
+        public IModelMetadataProvider MetadataProvider
+        {
+            get
+            {
+                if (_metadataProvider == null)
+                {
+                    _metadataProvider = Context?.RequestServices.GetRequiredService<IModelMetadataProvider>();
+                }
+
+                return _metadataProvider;
+            }
+            set
+            {
+                _metadataProvider = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IObjectModelValidator"/>.
+        /// </summary>
+        public IObjectModelValidator ObjectValidator
+        {
+            get
+            {
+                if (_objectValidator == null)
+                {
+                    _objectValidator = Context?.RequestServices.GetRequiredService<IObjectModelValidator>();
+                }
+
+                return _objectValidator;
+            }
+            set
+            {
+                _objectValidator = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets model state after the model binding process. This ModelState will be empty before model binding
+        /// happens.
+        /// </summary>
+        public ModelStateDictionary ModelState
+        {
+            get
+            {
+                return ControllerContext.ModelState;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the HTTP request message.
+        /// </summary>
+        /// <remarks>The setter is intended for unit testing purposes only.</remarks>
+        public HttpRequestMessage Request
+        {
+            get
+            {
+                if (_request == null && ActionContext != null)
+                {
+                    _request = ControllerContext.HttpContext.GetHttpRequestMessage();
+                }
+
+                return _request;
+            }
+            set
+            {
+                _request = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets a factory used to generate URLs to other APIs.
+        /// </summary>
+        /// <remarks>The setter is intended for unit testing purposes only.</remarks>
+        public IUrlHelper Url
+        {
+            get
+            {
+                if (_urlHelper == null)
+                {
+                    var factory = Context?.RequestServices.GetRequiredService<IUrlHelperFactory>();
+                    _urlHelper = factory?.GetUrlHelper(ActionContext);
+                }
+
+                return _urlHelper;
+            }
+            set
+            {
+                _urlHelper = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the current principal associated with this request.
+        /// </summary>
+        public IPrincipal User
+        {
+            get
+            {
+                return Context?.User;
+            }
+        }
+
+        /// <summary>
+        /// Creates a <see cref="BadRequestResult"/> (400 Bad Request).
+        /// </summary>
+        /// <returns>A <see cref="BadRequestResult"/>.</returns>
+        [NonAction]
+        public virtual BadRequestResult BadRequest()
+        {
+            return new BadRequestResult();
+        }
+
+        /// <summary>
+        /// Creates a <see cref="BadRequestErrorMessageResult"/> (400 Bad Request) with the specified error message.
+        /// </summary>
+        /// <param name="message">The user-visible error message.</param>
+        /// <returns>A <see cref="BadRequestErrorMessageResult"/> with the specified error message.</returns>
+        [NonAction]
+        public virtual BadRequestErrorMessageResult BadRequest(string message)
+        {
+            if (message == null)
+            {
+                throw new ArgumentNullException(nameof(message));
+            }
+
+            return new BadRequestErrorMessageResult(message);
+        }
+
+        /// <summary>
+        /// Creates an <see cref="InvalidModelStateResult"/> (400 Bad Request) with the specified model state.
+        /// </summary>
+        /// <param name="modelState">The model state to include in the error.</param>
+        /// <returns>An <see cref="InvalidModelStateResult"/> with the specified model state.</returns>
+        [NonAction]
+        public virtual InvalidModelStateResult BadRequest(ModelStateDictionary modelState)
+        {
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            return new InvalidModelStateResult(modelState, includeErrorDetail: false);
+        }
+
+        /// <summary>Creates a <see cref="ConflictResult"/> (409 Conflict).</summary>
+        /// <returns>A <see cref="ConflictResult"/>.</returns>
+        [NonAction]
+        public virtual ConflictResult Conflict()
+        {
+            return new ConflictResult();
+        }
+
+        /// <summary>
+        /// Creates a <see cref="NegotiatedContentResult{T}"/> with the specified values.
+        /// </summary>
+        /// <typeparam name="T">The type of content in the entity body.</typeparam>
+        /// <param name="statusCode">The HTTP status code for the response message.</param>
+        /// <param name="value">The content value to negotiate and format in the entity body.</param>
+        /// <returns>A <see cref="NegotiatedContentResult{T}"/> with the specified values.</returns>
+        [NonAction]
+        public virtual NegotiatedContentResult<T> Content<T>(HttpStatusCode statusCode, T value)
+        {
+            if (value == null)
+            {
+                throw new ArgumentNullException(nameof(value));
+            }
+
+            return new NegotiatedContentResult<T>(statusCode, value);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="CreatedResult"/> (201 Created) with the specified values.
+        /// </summary>
+        /// <param name="location">
+        /// The location at which the content has been created. Must be a relative or absolute URL.
+        /// </param>
+        /// <param name="content">The content value to format in the entity body.</param>
+        /// <returns>A <see cref="CreatedResult"/> with the specified values.</returns>
+        [NonAction]
+        public virtual CreatedResult Created(string location, object content)
+        {
+            if (location == null)
+            {
+                throw new ArgumentNullException(nameof(location));
+            }
+
+            return new CreatedResult(location, content);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="CreatedResult"/> (201 Created) with the specified values.
+        /// </summary>
+        /// <param name="uri">The location at which the content has been created.</param>
+        /// <param name="content">The content value to format in the entity body.</param>
+        /// <returns>A <see cref="CreatedResult"/> with the specified values.</returns>
+        [NonAction]
+        public virtual CreatedResult Created(Uri uri, object content)
+        {
+            if (uri == null)
+            {
+                throw new ArgumentNullException(nameof(uri));
+            }
+
+            string location;
+            if (uri.IsAbsoluteUri)
+            {
+                location = uri.AbsoluteUri;
+            }
+            else
+            {
+                location = uri.GetComponents(UriComponents.SerializationInfoString, UriFormat.UriEscaped);
+            }
+            return Created(location, content);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="CreatedAtRouteResult"/> (201 Created) with the specified values.
+        /// </summary>
+        /// <param name="routeName">The name of the route to use for generating the URL.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <param name="content">The content value to format in the entity body.</param>
+        /// <returns>A <see cref="CreatedAtRouteResult"/> with the specified values.</returns>
+        [NonAction]
+        public virtual CreatedAtRouteResult CreatedAtRoute(
+            string routeName,
+            object routeValues,
+            object content)
+        {
+            if (routeName == null)
+            {
+                throw new ArgumentNullException(nameof(routeName));
+            }
+
+            return new CreatedAtRouteResult(routeName, routeValues, content);
+        }
+
+        /// <summary
+        /// >Creates an <see cref="InternalServerErrorResult"/> (500 Internal Server Error).
+        /// </summary>
+        /// <returns>A <see cref="InternalServerErrorResult"/>.</returns>
+        [NonAction]
+        public virtual InternalServerErrorResult InternalServerError()
+        {
+            return new InternalServerErrorResult();
+        }
+
+        /// <summary>
+        /// Creates an <see cref="ExceptionResult"/> (500 Internal Server Error) with the specified exception.
+        /// </summary>
+        /// <param name="exception">The exception to include in the error.</param>
+        /// <returns>An <see cref="ExceptionResult"/> with the specified exception.</returns>
+        [NonAction]
+        public virtual ExceptionResult InternalServerError(Exception exception)
+        {
+            if (exception == null)
+            {
+                throw new ArgumentNullException(nameof(exception));
+            }
+
+            return new ExceptionResult(exception, includeErrorDetail: false);
+        }
+
+        /// <summary>
+        /// Creates an <see cref="JsonResult"/> (200 OK) with the specified value.
+        /// </summary>
+        /// <typeparam name="T">The type of content in the entity body.</typeparam>
+        /// <param name="content">The content value to serialize in the entity body.</param>
+        /// <returns>A <see cref="JsonResult"/> with the specified value.</returns>
+        [NonAction]
+        public virtual JsonResult Json<T>(T content)
+        {
+            if (content == null)
+            {
+                throw new ArgumentNullException(nameof(content));
+            }
+
+            return new JsonResult(content);
+        }
+
+        /// <summary>
+        /// Creates an <see cref="JsonResult"/> (200 OK) with the specified values.
+        /// </summary>
+        /// <typeparam name="T">The type of content in the entity body.</typeparam>
+        /// <param name="content">The content value to serialize in the entity body.</param>
+        /// <param name="serializerSettings">The serializer settings.</param>
+        /// <returns>A <see cref="JsonResult"/> with the specified values.</returns>
+        [NonAction]
+        public virtual JsonResult Json<T>(T content, JsonSerializerSettings serializerSettings)
+        {
+            if (content == null)
+            {
+                throw new ArgumentNullException(nameof(content));
+            }
+
+            if (serializerSettings == null)
+            {
+                throw new ArgumentNullException(nameof(serializerSettings));
+            }
+
+            return new JsonResult(content, serializerSettings);
+        }
+
+        /// <summary>
+        /// Creates an <see cref="JsonResult"/> (200 OK) with the specified values.
+        /// </summary>
+        /// <typeparam name="T">The type of content in the entity body.</typeparam>
+        /// <param name="content">The content value to serialize in the entity body.</param>
+        /// <param name="serializerSettings">The serializer settings.</param>
+        /// <param name="encoding">The content encoding.</param>
+        /// <returns>A <see cref="JsonResult"/> with the specified values.</returns>
+        [NonAction]
+        public virtual JsonResult Json<T>(
+            T content,
+            JsonSerializerSettings serializerSettings,
+            Encoding encoding)
+        {
+            if (content == null)
+            {
+                throw new ArgumentNullException(nameof(content));
+            }
+
+            if (serializerSettings == null)
+            {
+                throw new ArgumentNullException(nameof(serializerSettings));
+            }
+
+            if (encoding == null)
+            {
+                throw new ArgumentNullException(nameof(encoding));
+            }
+
+            var result = new JsonResult(content, serializerSettings);
+            result.ContentType = $"application/json; charset={encoding.WebName}";
+
+            return result;
+        }
+
+        /// <summary>
+        /// Creates an <see cref="NotFoundResult"/> (404 Not Found).
+        /// </summary>
+        /// <returns>A <see cref="NotFoundResult"/>.</returns>
+        [NonAction]
+        public virtual NotFoundResult NotFound()
+        {
+            return new NotFoundResult();
+        }
+
+        /// <summary>
+        /// Creates an <see cref="OkResult"/> (200 OK).
+        /// </summary>
+        /// <returns>An <see cref="OkResult"/>.</returns>
+        [NonAction]
+        public virtual OkResult Ok()
+        {
+            return new OkResult();
+        }
+
+        /// <summary>
+        /// Creates an <see cref="OkObjectResult"/> (200 OK) with the specified values.
+        /// </summary>
+        /// <typeparam name="T">The type of content in the entity body.</typeparam>
+        /// <param name="content">The content value to negotiate and format in the entity body.</param>
+        /// <returns>An <see cref="OkObjectResult"/> with the specified values.</returns>
+        [NonAction]
+        public virtual OkObjectResult Ok<T>(T content)
+        {
+            return new OkObjectResult(content);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="RedirectResult"/> (302 Found) with the specified value.
+        /// </summary>
+        /// <param name="location">The location to which to redirect.</param>
+        /// <returns>A <see cref="RedirectResult"/> with the specified value.</returns>
+        [NonAction]
+        public virtual RedirectResult Redirect(string location)
+        {
+            if (location == null)
+            {
+                throw new ArgumentNullException(nameof(location));
+            }
+
+            // This is how redirect was implemented in legacy webapi - string URIs are assumed to be absolute.
+            return Redirect(new Uri(location));
+        }
+
+        /// <summary>
+        /// Creates a <see cref="RedirectResult"/> (302 Found) with the specified value.
+        /// </summary>
+        /// <param name="location">The location to which to redirect.</param>
+        /// <returns>A <see cref="RedirectResult"/> with the specified value.</returns>
+        [NonAction]
+        public virtual RedirectResult Redirect(Uri location)
+        {
+            if (location == null)
+            {
+                throw new ArgumentNullException(nameof(location));
+            }
+
+            string uri;
+            if (location.IsAbsoluteUri)
+            {
+                uri = location.AbsoluteUri;
+            }
+            else
+            {
+                uri = location.GetComponents(UriComponents.SerializationInfoString, UriFormat.UriEscaped);
+            }
+
+            return new RedirectResult(uri);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="RedirectToRouteResult"/> (302 Found) with the specified values.
+        /// </summary>
+        /// <param name="routeName">The name of the route to use for generating the URL.</param>
+        /// <param name="routeValues">The route data to use for generating the URL.</param>
+        /// <returns>A <see cref="RedirectToRouteResult"/> with the specified values.</returns>
+        [NonAction]
+        public virtual RedirectToRouteResult RedirectToRoute(string routeName, object routeValues)
+        {
+            if (routeName == null)
+            {
+                throw new ArgumentNullException(nameof(routeName));
+            }
+
+            if (routeValues == null)
+            {
+                throw new ArgumentNullException(nameof(routeValues));
+            }
+
+            return new RedirectToRouteResult(routeName, routeValues)
+            {
+                UrlHelper = Url,
+            };
+        }
+
+        /// <summary>
+        /// Creates a <see cref="ResponseMessageResult"/> with the specified response.
+        /// </summary>
+        /// <param name="response">The HTTP response message.</param>
+        /// <returns>A <see cref="ResponseMessageResult"/> for the specified response.</returns>
+        [NonAction]
+        public virtual ResponseMessageResult ResponseMessage(HttpResponseMessage response)
+        {
+            if (response == null)
+            {
+                throw new ArgumentNullException(nameof(response));
+            }
+
+            return new ResponseMessageResult(response);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="StatusCodeResult"/> with the specified status code.
+        /// </summary>
+        /// <param name="status">The HTTP status code for the response message</param>
+        /// <returns>A <see cref="StatusCodeResult"/> with the specified status code.</returns>
+        [NonAction]
+        public virtual StatusCodeResult StatusCode(HttpStatusCode status)
+        {
+            return new StatusCodeResult((int)status);
+        }
+
+        /// <inheritdoc />
+        public void Dispose() => Dispose(disposing: true);
+
+        /// <summary>
+        /// Validates the given entity and adds the validation errors to the <see cref="ApiController.ModelState"/>
+        /// under an empty prefix.
+        /// </summary>
+        /// <typeparam name="TEntity">The type of the entity to be validated.</typeparam>
+        /// <param name="entity">The entity being validated.</param>
+        public void Validate<TEntity>(TEntity entity)
+        {
+            Validate(entity, keyPrefix: string.Empty);
+        }
+
+        /// <summary>
+        /// Validates the given entity and adds the validation errors to the <see cref="ApiController.ModelState"/>.
+        /// </summary>
+        /// <typeparam name="TEntity">The type of the entity to be validated.</typeparam>
+        /// <param name="entity">The entity being validated.</param>
+        /// <param name="keyPrefix">
+        /// The key prefix under which the model state errors would be added in the
+        /// <see cref="ApiController.ModelState"/>.
+        /// </param>
+        public void Validate<TEntity>(TEntity entity, string keyPrefix)
+        {
+            ObjectValidator.Validate(
+                ControllerContext,
+                validationState: null,
+                prefix: keyPrefix,
+                model: entity);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/BadRequestErrorMessageResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/BadRequestErrorMessageResult.cs
new file mode 100644
index 0000000000..f9f313f899
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/BadRequestErrorMessageResult.cs
@@ -0,0 +1,41 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace System.Web.Http
+{
+    /// <summary>
+    /// An action result that returns a <see cref="StatusCodes.Status400BadRequest"/> response and performs
+    /// content negotiation on an <see cref="HttpError"/> with a <see cref="HttpError.Message"/>.
+    /// </summary>
+    public class BadRequestErrorMessageResult : ObjectResult
+    {
+        /// <summary>Initializes a new instance of the <see cref="BadRequestErrorMessageResult"/> class.</summary>
+        /// <param name="message">The user-visible error message.</param>
+        public BadRequestErrorMessageResult(string message)
+            : base(new HttpError(message))
+        {
+            if (message == null)
+            {
+                throw new ArgumentNullException(nameof(message));
+            }
+
+            Message = message;
+        }
+
+        /// <summary>
+        /// Gets the error message.
+        /// </summary>
+        public string Message { get; private set; }
+
+        /// <inheritdoc />
+        public override Task ExecuteResultAsync(ActionContext context)
+        {
+            context.HttpContext.Response.StatusCode = StatusCodes.Status400BadRequest;
+            return base.ExecuteResultAsync(context);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ConflictResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ConflictResult.cs
new file mode 100644
index 0000000000..ee83c08611
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ConflictResult.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace System.Web.Http
+{
+    /// <summary>
+    /// An action result that returns an empty <see cref="StatusCodes.Status409Conflict"/> response.
+    /// </summary>
+    public class ConflictResult : StatusCodeResult
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConflictResult"/> class.
+        /// </summary>
+        public ConflictResult()
+            : base(StatusCodes.Status409Conflict)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/IUseWebApiActionConventions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/IUseWebApiActionConventions.cs
new file mode 100644
index 0000000000..e2ac33be1a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/IUseWebApiActionConventions.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    /// <summary>
+    /// Indicates actions without attribute routes in a controller use ASP.NET Web API routing conventions.
+    /// </summary>
+    public interface IUseWebApiActionConventions
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/IUseWebApiOverloading.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/IUseWebApiOverloading.cs
new file mode 100644
index 0000000000..cb92ea4661
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/IUseWebApiOverloading.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    /// <summary>
+    /// Indicates actions in a controller should be selected only if all non-optional parameters are satisfied. Applies
+    /// the <see cref="OverloadActionConstraint"/> to all actions in the controller.
+    /// </summary>
+    public interface IUseWebApiOverloading
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/IUseWebApiParameterConventions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/IUseWebApiParameterConventions.cs
new file mode 100644
index 0000000000..1f74ef2fc6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/IUseWebApiParameterConventions.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    /// <summary>
+    /// Indicates the model binding system should use ASP.NET Web API conventions for parameters of a controller's
+    /// actions. For example, bind simple types from the URI.
+    /// </summary>
+    public interface IUseWebApiParameterConventions
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/IUseWebApiRoutes.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/IUseWebApiRoutes.cs
new file mode 100644
index 0000000000..f0efadbd90
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/IUseWebApiRoutes.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    /// <summary>
+    /// Indicates the controller is in the "api" area.
+    /// </summary>
+    public interface IUseWebApiRoutes
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/UseWebApiActionConventionsAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/UseWebApiActionConventionsAttribute.cs
new file mode 100644
index 0000000000..15a0725f50
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/UseWebApiActionConventionsAttribute.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    /// <summary>
+    /// Indicates actions without attribute routes in a controller use ASP.NET Web API routing conventions.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+    public class UseWebApiActionConventionsAttribute : Attribute, IUseWebApiActionConventions
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/UseWebApiOverloadingAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/UseWebApiOverloadingAttribute.cs
new file mode 100644
index 0000000000..f253f0f0bf
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/UseWebApiOverloadingAttribute.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    /// <summary>
+    /// Indicates actions in a controller should be selected only if all non-optional parameters are satisfied. Applies
+    /// the <see cref="OverloadActionConstraint"/> to all actions in the controller.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+    public class UseWebApiOverloadingAttribute : Attribute, IUseWebApiOverloading
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/UseWebApiParameterConventionsAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/UseWebApiParameterConventionsAttribute.cs
new file mode 100644
index 0000000000..3626945271
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/UseWebApiParameterConventionsAttribute.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    /// <summary>
+    /// Indicates the model binding system should use ASP.NET Web API conventions for parameters of a controller's
+    /// actions. For example, bind simple types from the URI.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+    public class UseWebApiParameterConventionsAttribute : Attribute, IUseWebApiParameterConventions
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/UseWebApiRoutesAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/UseWebApiRoutesAttribute.cs
new file mode 100644
index 0000000000..17d14aba37
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/UseWebApiRoutesAttribute.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    /// <summary>
+    /// Indicates the controller is in the "api" area.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+    public class UseWebApiRoutesAttribute : Attribute, IUseWebApiRoutes
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/WebApiActionConventionsApplicationModelConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/WebApiActionConventionsApplicationModelConvention.cs
new file mode 100644
index 0000000000..95b4168a9a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/WebApiActionConventionsApplicationModelConvention.cs
@@ -0,0 +1,117 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    public class WebApiActionConventionsApplicationModelConvention : IControllerModelConvention
+    {
+        private static readonly string[] SupportedHttpMethodConventions = new string[]
+        {
+            "GET",
+            "PUT",
+            "POST",
+            "DELETE",
+            "PATCH",
+            "HEAD",
+            "OPTIONS",
+        };
+
+        public void Apply(ControllerModel controller)
+        {
+            if (controller == null)
+            {
+                throw new ArgumentNullException(nameof(controller));
+            }
+
+            if (IsConventionApplicable(controller))
+            {
+                var newActions = new List<ActionModel>();
+
+                foreach (var action in controller.Actions)
+                {
+                    SetHttpMethodFromConvention(action);
+
+                    // Action Name doesn't really come into play with attribute routed actions. However for a
+                    // non-attribute-routed action we need to create a 'named' version and an 'unnamed' version.
+                    if (!IsActionAttributeRouted(action))
+                    {
+                        var namedAction = action;
+
+                        var unnamedAction = new ActionModel(namedAction);
+                        unnamedAction.RouteValues.Add("action", null);
+                        newActions.Add(unnamedAction);
+                    }
+                }
+
+                foreach (var action in newActions)
+                {
+                    controller.Actions.Add(action);
+                }
+            }
+        }
+
+        private bool IsConventionApplicable(ControllerModel controller)
+        {
+            return controller.Attributes.OfType<IUseWebApiActionConventions>().Any();
+        }
+
+        private bool IsActionAttributeRouted(ActionModel action)
+        {
+            foreach (var controllerSelectorModel in action.Controller.Selectors)
+            {
+                if (controllerSelectorModel.AttributeRouteModel?.Template != null)
+                {
+                    return true;
+                }
+            }
+
+            foreach (var actionSelectorModel in action.Selectors)
+            {
+                if (actionSelectorModel.AttributeRouteModel?.Template != null)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private void SetHttpMethodFromConvention(ActionModel action)
+        {
+            foreach (var selector in action.Selectors)
+            {
+                if (selector.ActionConstraints.OfType<HttpMethodActionConstraint>().Count() > 0)
+                {
+                    // If the HttpMethods are set from attributes, don't override it with the convention
+                    return;
+                }
+            }
+
+            // The Method name is used to infer verb constraints. Changing the action name has no impact.
+            foreach (var verb in SupportedHttpMethodConventions)
+            {
+                if (action.ActionMethod.Name.StartsWith(verb, StringComparison.OrdinalIgnoreCase))
+                {
+                    foreach (var selector in action.Selectors)
+                    {
+                        selector.ActionConstraints.Add(new HttpMethodActionConstraint(new[] { verb }));
+                    }
+
+                    return;
+                }
+            }
+
+            // If no convention matches, then assume POST
+            foreach (var actionSelectorModel in action.Selectors)
+            {
+                actionSelectorModel.ActionConstraints.Add(new HttpMethodActionConstraint(new[] { "POST" }));
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/WebApiOverloadingApplicationModelConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/WebApiOverloadingApplicationModelConvention.cs
new file mode 100644
index 0000000000..5a90c715ca
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/WebApiOverloadingApplicationModelConvention.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    public class WebApiOverloadingApplicationModelConvention : IActionModelConvention
+    {
+        public void Apply(ActionModel action)
+        {
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            if (IsConventionApplicable(action.Controller))
+            {
+                foreach (var actionSelectorModel in action.Selectors)
+                {
+                    actionSelectorModel.ActionConstraints.Add(new OverloadActionConstraint());
+                }
+            }
+        }
+
+        private bool IsConventionApplicable(ControllerModel controller)
+        {
+            return controller.Attributes.OfType<IUseWebApiOverloading>().Any();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/WebApiParameterConventionsApplicationModelConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/WebApiParameterConventionsApplicationModelConvention.cs
new file mode 100644
index 0000000000..473ee95bb7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/WebApiParameterConventionsApplicationModelConvention.cs
@@ -0,0 +1,90 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+using System.Web.Http;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    public class WebApiParameterConventionsApplicationModelConvention : IActionModelConvention
+    {
+        public void Apply(ActionModel action)
+        {
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            if (IsConventionApplicable(action.Controller))
+            {
+                var optionalParameters = new HashSet<string>();
+                var uriBindingSource = (new FromUriAttribute()).BindingSource;
+                foreach (var parameter in action.Parameters)
+                {
+                    // Some IBindingSourceMetadata attributes like ModelBinder attribute return null 
+                    // as their binding source. Special case to ensure we do not ignore them.
+                    if (parameter.BindingInfo?.BindingSource != null ||
+                        parameter.Attributes.OfType<IBindingSourceMetadata>().Any())
+                    {
+                        // This has a binding behavior configured, just leave it alone.
+                    }
+                    else if (CanConvertFromString(parameter.ParameterInfo.ParameterType))
+                    {
+                        // Simple types are by-default from the URI.
+                        parameter.BindingInfo = parameter.BindingInfo ?? new BindingInfo();
+                        parameter.BindingInfo.BindingSource = uriBindingSource;
+                    }
+                    else
+                    {
+                        // Complex types are by-default from the body.
+                        parameter.BindingInfo = parameter.BindingInfo ?? new BindingInfo();
+                        parameter.BindingInfo.BindingSource = BindingSource.Body;
+                    }
+
+                    // For all non IOptionalBinderMetadata, which are not URL source (like FromQuery etc.) do not
+                    // participate in overload selection and hence are added to the hashset so that they can be
+                    // ignored in OverloadActionConstraint.
+                    var optionalMetadata = parameter.Attributes.OfType<IOptionalBinderMetadata>().SingleOrDefault();
+                    if (parameter.ParameterInfo.HasDefaultValue && parameter.BindingInfo.BindingSource == uriBindingSource ||
+                        optionalMetadata != null && optionalMetadata.IsOptional ||
+                        optionalMetadata == null && parameter.BindingInfo.BindingSource != uriBindingSource)
+                    {
+                        optionalParameters.Add(parameter.ParameterName);
+                    }
+                }
+
+                action.Properties.Add("OptionalParameters", optionalParameters);
+            }
+        }
+
+        private bool IsConventionApplicable(ControllerModel controller)
+        {
+            return controller.Attributes.OfType<IUseWebApiParameterConventions>().Any();
+        }
+
+        private static bool CanConvertFromString(Type destinationType)
+        {
+            destinationType = Nullable.GetUnderlyingType(destinationType) ?? destinationType;
+            return IsSimpleType(destinationType) ||
+                   TypeDescriptor.GetConverter(destinationType).CanConvertFrom(typeof(string));
+        }
+
+        private static bool IsSimpleType(Type type)
+        {
+            return type.GetTypeInfo().IsPrimitive ||
+                type.Equals(typeof(decimal)) ||
+                type.Equals(typeof(string)) ||
+                type.Equals(typeof(DateTime)) ||
+                type.Equals(typeof(Guid)) ||
+                type.Equals(typeof(DateTimeOffset)) ||
+                type.Equals(typeof(TimeSpan)) ||
+                type.Equals(typeof(Uri));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/WebApiRoutesApplicationModelConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/WebApiRoutesApplicationModelConvention.cs
new file mode 100644
index 0000000000..cb397dcd74
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Conventions/WebApiRoutesApplicationModelConvention.cs
@@ -0,0 +1,37 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    public class WebApiRoutesApplicationModelConvention : IControllerModelConvention
+    {
+        private readonly string _area;
+
+        public WebApiRoutesApplicationModelConvention(string area)
+        {
+            _area = area;
+        }
+
+        public void Apply(ControllerModel controller)
+        {
+            if (controller == null)
+            {
+                throw new ArgumentNullException(nameof(controller));
+            }
+
+            if (IsConventionApplicable(controller))
+            {
+                controller.RouteValues.Add("area", _area);
+            }
+        }
+
+        private bool IsConventionApplicable(ControllerModel controller)
+        {
+            return controller.Attributes.OfType<IUseWebApiRoutes>().Any();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ExceptionResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ExceptionResult.cs
new file mode 100644
index 0000000000..ea5a7c86ea
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ExceptionResult.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace System.Web.Http
+{
+    /// <summary>
+    /// An action result that returns a <see cref="StatusCodes.Status500InternalServerError"/> response and
+    /// performs content negotiation on an <see cref="HttpError"/> based on an <see cref="Exception"/>.
+    /// </summary>
+    public class ExceptionResult : ObjectResult
+    {
+        /// <summary>Initializes a new instance of the <see cref="ExceptionResult"/> class.</summary>
+        /// <param name="exception">The exception to include in the error.</param>
+        /// <param name="includeErrorDetail">
+        /// <see langword="true"/> if the error should include exception messages; otherwise, <see langword="false"/>.
+        /// </param>
+        public ExceptionResult(Exception exception, bool includeErrorDetail)
+            : base(new HttpError(exception, includeErrorDetail))
+        {
+            Exception = exception;
+            IncludeErrorDetail = includeErrorDetail;
+        }
+
+        /// <summary>
+        /// Gets the exception to include in the error.
+        /// </summary>
+        public Exception Exception { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether the error should include exception messages.
+        /// </summary>
+        public bool IncludeErrorDetail { get; private set; }
+
+        /// <inheritdoc />
+        public override Task ExecuteResultAsync(ActionContext context)
+        {
+            context.HttpContext.Response.StatusCode = StatusCodes.Status500InternalServerError;
+            return base.ExecuteResultAsync(context);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/FormDataCollectionExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/FormDataCollectionExtensions.cs
new file mode 100644
index 0000000000..a9539e83a0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/FormDataCollectionExtensions.cs
@@ -0,0 +1,114 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Net.Http.Formatting;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    public static class FormDataCollectionExtensions
+    {
+        // This is a helper method to use Model Binding over a JQuery syntax.
+        // Normalize from JQuery to MVC keys. The model binding infrastructure uses MVC keys
+        // x[] --> x
+        // [] --> ""
+        // x[field]  --> x.field, where field is not a number
+        public static string NormalizeJQueryToMvc(string key)
+        {
+            if (key == null)
+            {
+                return string.Empty;
+            }
+
+            StringBuilder sb = null;
+            var i = 0;
+            while (true)
+            {
+                var indexOpen = key.IndexOf('[', i);
+                if (indexOpen < 0)
+                {
+                    // Fast path, no normalization needed.
+                    // This skips the string conversion and allocating the string builder.
+                    if (i == 0)
+                    {
+                        return key;
+                    }
+                    sb = sb ?? new StringBuilder();
+                    sb.Append(key, i, key.Length - i);
+                    break; // no more brackets
+                }
+
+                sb = sb ?? new StringBuilder();
+                sb.Append(key, i, indexOpen - i); // everything up to "["
+
+                // Find closing bracket.
+                var indexClose = key.IndexOf(']', indexOpen);
+                if (indexClose == -1)
+                {
+                    throw new ArgumentException(Resources.JQuerySyntaxMissingClosingBracket, nameof(key));
+                }
+
+                if (indexClose == indexOpen + 1)
+                {
+                    // Empty bracket. Signifies array. Just remove.
+                }
+                else
+                {
+                    if (char.IsDigit(key[indexOpen + 1]))
+                    {
+                        // array index. Leave unchanged.
+                        sb.Append(key, indexOpen, indexClose - indexOpen + 1);
+                    }
+                    else
+                    {
+                        // Field name.  Convert to dot notation.
+                        sb.Append('.');
+                        sb.Append(key, indexOpen + 1, indexClose - indexOpen - 1);
+                    }
+                }
+
+                i = indexClose + 1;
+                if (i >= key.Length)
+                {
+                    break; // end of string
+                }
+            }
+            return sb.ToString();
+        }
+
+        public static IEnumerable<KeyValuePair<string, string>> GetJQueryNameValuePairs(
+            this FormDataCollection formData)
+        {
+            if (formData == null)
+            {
+                throw new ArgumentNullException(nameof(formData));
+            }
+
+            var count = 0;
+
+            foreach (var kv in formData)
+            {
+                ThrowIfMaxHttpCollectionKeysExceeded(count);
+
+                var key = NormalizeJQueryToMvc(kv.Key);
+                var value = kv.Value ?? string.Empty;
+                yield return new KeyValuePair<string, string>(key, value);
+
+                count++;
+            }
+        }
+
+        private static void ThrowIfMaxHttpCollectionKeysExceeded(int count)
+        {
+            if (count >= MediaTypeFormatter.MaxHttpCollectionKeys)
+            {
+                var message = Resources.FormatMaxHttpCollectionKeyLimitReached(
+                    MediaTypeFormatter.MaxHttpCollectionKeys,
+                    typeof(MediaTypeFormatter));
+                throw new InvalidOperationException(message);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Formatters/HttpResponseMessageOutputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Formatters/HttpResponseMessageOutputFormatter.cs
new file mode 100644
index 0000000000..f224fa4c49
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Formatters/HttpResponseMessageOutputFormatter.cs
@@ -0,0 +1,79 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.Formatters;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    public class HttpResponseMessageOutputFormatter : IOutputFormatter
+    {
+        public bool CanWriteResult(OutputFormatterCanWriteContext context)
+        {
+            return context.Object is HttpResponseMessage;
+        }
+
+        public async Task WriteAsync(OutputFormatterWriteContext context)
+        {
+            var response = context.HttpContext.Response;
+
+            var responseMessage = context.Object as HttpResponseMessage;
+            if (responseMessage == null)
+            {
+                var message = Resources.FormatHttpResponseMessageFormatter_UnsupportedType(
+                    nameof(HttpResponseMessageOutputFormatter),
+                    nameof(HttpResponseMessage));
+
+                throw new InvalidOperationException(message);
+            }
+
+            using (responseMessage)
+            {
+                response.StatusCode = (int)responseMessage.StatusCode;
+
+                var responseFeature = context.HttpContext.Features.Get<IHttpResponseFeature>();
+                if (responseFeature != null)
+                {
+                    responseFeature.ReasonPhrase = responseMessage.ReasonPhrase;
+                }
+
+                var responseHeaders = responseMessage.Headers;
+
+                // Ignore the Transfer-Encoding header if it is just "chunked".
+                // We let the host decide about whether the response should be chunked or not.
+                if (responseHeaders.TransferEncodingChunked == true &&
+                    responseHeaders.TransferEncoding.Count == 1)
+                {
+                    responseHeaders.TransferEncoding.Clear();
+                }
+                
+                foreach (var header in responseHeaders)
+                {
+                    response.Headers.Append(header.Key, header.Value.ToArray());
+                }
+
+                if (responseMessage.Content != null)
+                {
+                    var contentHeaders = responseMessage.Content.Headers;
+                    
+                    // Copy the response content headers only after ensuring they are complete.
+                    // We ask for Content-Length first because HttpContent lazily computes this
+                    // and only afterwards writes the value into the content headers.
+                    var unused = contentHeaders.ContentLength;
+                    
+                    foreach (var header in contentHeaders)
+                    {
+                        response.Headers.Append(header.Key, header.Value.ToArray());
+                    }
+
+                    await responseMessage.Content.CopyToAsync(response.Body);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpError.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpError.cs
new file mode 100644
index 0000000000..f86b30da3a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpError.cs
@@ -0,0 +1,285 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using ShimResources = Microsoft.AspNetCore.Mvc.WebApiCompatShim.Resources;
+
+namespace System.Web.Http
+{
+    /// <summary>
+    /// Defines a serializable container for storing error information. This information is stored
+    /// as key/value pairs. The dictionary keys to look up standard error information are available
+    /// on the <see cref="HttpErrorKeys"/> type.
+    /// </summary>
+    [XmlRoot("Error")]
+    public sealed class HttpError : Dictionary<string, object>, IXmlSerializable
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpError"/> class.
+        /// </summary>
+        public HttpError()
+            : base(StringComparer.OrdinalIgnoreCase)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpError"/> class containing error message
+        /// <paramref name="message"/>.
+        /// </summary>
+        /// <param name="message">The error message to associate with this instance.</param>
+        public HttpError(string message)
+            : this()
+        {
+            if (message == null)
+            {
+                throw new ArgumentNullException(nameof(message));
+            }
+
+            Message = message;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpError"/> class for <paramref name="exception"/>.
+        /// </summary>
+        /// <param name="exception">The exception to use for error information.</param>
+        /// <param name="includeErrorDetail">
+        /// <c>true</c> to include the exception information in the error;<c>false</c> otherwise.
+        /// </param>
+        public HttpError(Exception exception, bool includeErrorDetail)
+            : this()
+        {
+            if (exception == null)
+            {
+                throw new ArgumentNullException(nameof(exception));
+            }
+
+            Message = ShimResources.HttpError_GenericError;
+
+            if (includeErrorDetail)
+            {
+                Add(HttpErrorKeys.ExceptionMessageKey, exception.Message);
+                Add(HttpErrorKeys.ExceptionTypeKey, exception.GetType().FullName);
+                Add(HttpErrorKeys.StackTraceKey, exception.StackTrace);
+                if (exception.InnerException != null)
+                {
+                    Add(HttpErrorKeys.InnerExceptionKey, new HttpError(exception.InnerException, includeErrorDetail));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpError"/> class for <paramref name="modelState"/>.
+        /// </summary>
+        /// <param name="modelState">The invalid model state to use for error information.</param>
+        /// <param name="includeErrorDetail">
+        /// <c>true</c> to include exception messages in the error; <c>false</c> otherwise.
+        /// </param>
+        public HttpError(ModelStateDictionary modelState, bool includeErrorDetail)
+            : this()
+        {
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            if (modelState.IsValid)
+            {
+                throw new ArgumentException(ShimResources.HttpError_ValidModelState, nameof(modelState));
+            }
+
+            Message = ShimResources.HttpError_BadRequest;
+
+            var modelStateError = new HttpError();
+            foreach (KeyValuePair<string, ModelStateEntry> keyModelStatePair in modelState)
+            {
+                var key = keyModelStatePair.Key;
+                var errors = keyModelStatePair.Value.Errors;
+                if (errors != null && errors.Count > 0)
+                {
+                    var errorMessages = errors.Select(error =>
+                    {
+                        if (includeErrorDetail && error.Exception != null)
+                        {
+                            return error.Exception.Message;
+                        }
+                        else
+                        {
+                            return
+                                string.IsNullOrEmpty(error.ErrorMessage) ?
+                                    ShimResources.HttpError_GenericError :
+                                    error.ErrorMessage;
+                        }
+                    }).ToArray();
+                    modelStateError.Add(key, errorMessages);
+                }
+            }
+
+            Add(HttpErrorKeys.ModelStateKey, modelStateError);
+        }
+
+        /// <summary>
+        /// The high-level, user-visible message explaining the cause of the error. Information carried in this field
+        /// should be considered public in that it will go over the wire regardless of the value of error detail
+        /// policy. As a result care should be taken not to disclose sensitive information about the server or the
+        /// application.
+        /// </summary>
+        public string Message
+        {
+            get { return GetPropertyValue<string>(HttpErrorKeys.MessageKey); }
+            set { this[HttpErrorKeys.MessageKey] = value; }
+        }
+
+        /// <summary>
+        /// The <see cref="ModelState"/> containing information about the errors that occurred during model binding.
+        /// </summary>
+        /// <remarks>
+        /// The inclusion of <see cref="System.Exception"/> information carried in the <see cref="ModelState"/> is
+        /// controlled by the error detail policy. All other information in the <see cref="ModelState"/>
+        /// should be considered public in that it will go over the wire. As a result care should be taken not to
+        /// disclose sensitive information about the server or the application.
+        /// </remarks>
+        public HttpError ModelState
+        {
+            get { return GetPropertyValue<HttpError>(HttpErrorKeys.ModelStateKey); }
+        }
+
+        /// <summary>
+        /// A detailed description of the error intended for the developer to understand exactly what failed.
+        /// </summary>
+        /// <remarks>
+        /// The inclusion of this field is controlled by the error detail policy. The
+        /// field is expected to contain information about the server or the application that should not
+        /// be disclosed broadly.
+        /// </remarks>
+        public string MessageDetail
+        {
+            get { return GetPropertyValue<string>(HttpErrorKeys.MessageDetailKey); }
+            set { this[HttpErrorKeys.MessageDetailKey] = value; }
+        }
+
+        /// <summary>
+        /// The message of the <see cref="System.Exception"/> if available.
+        /// </summary>
+        /// <remarks>
+        /// The inclusion of this field is controlled by the error detail policy. The
+        /// field is expected to contain information about the server or the application that should not
+        /// be disclosed broadly.
+        /// </remarks>
+        public string ExceptionMessage
+        {
+            get { return GetPropertyValue<string>(HttpErrorKeys.ExceptionMessageKey); }
+            set { this[HttpErrorKeys.ExceptionMessageKey] = value; }
+        }
+
+        /// <summary>
+        /// The type of the <see cref="System.Exception"/> if available.
+        /// </summary>
+        /// <remarks>
+        /// The inclusion of this field is controlled by the error detail policy. The
+        /// field is expected to contain information about the server or the application that should not
+        /// be disclosed broadly.
+        /// </remarks>
+        public string ExceptionType
+        {
+            get { return GetPropertyValue<string>(HttpErrorKeys.ExceptionTypeKey); }
+            set { this[HttpErrorKeys.ExceptionTypeKey] = value; }
+        }
+
+        /// <summary>
+        /// The stack trace information associated with this instance if available.
+        /// </summary>
+        /// <remarks>
+        /// The inclusion of this field is controlled by the error detail policy. The
+        /// field is expected to contain information about the server or the application that should not
+        /// be disclosed broadly.
+        /// </remarks>
+        public string StackTrace
+        {
+            get { return GetPropertyValue<string>(HttpErrorKeys.StackTraceKey); }
+            set { this[HttpErrorKeys.StackTraceKey] = value; }
+        }
+
+        /// <summary>
+        /// The inner <see cref="System.Exception"/> associated with this instance if available.
+        /// </summary>
+        /// <remarks>
+        /// The inclusion of this field is controlled by the error detail policy. The
+        /// field is expected to contain information about the server or the application that should not
+        /// be disclosed broadly.
+        /// </remarks>
+        public HttpError InnerException
+        {
+            get { return GetPropertyValue<HttpError>(HttpErrorKeys.InnerExceptionKey); }
+        }
+
+        /// <summary>
+        /// Gets a particular property value from this error instance.
+        /// </summary>
+        /// <typeparam name="TValue">The type of the property.</typeparam>
+        /// <param name="key">The name of the error property.</param>
+        /// <returns>The value of the error property.</returns>
+        public TValue GetPropertyValue<TValue>(string key)
+        {
+            object value;
+            if (TryGetValue(key, out value) && value is TValue)
+            {
+                return (TValue)value;
+            }
+
+            return default(TValue);
+        }
+
+        XmlSchema IXmlSerializable.GetSchema()
+        {
+            return null;
+        }
+
+        void IXmlSerializable.ReadXml(XmlReader reader)
+        {
+            if (reader.IsEmptyElement)
+            {
+                reader.Read();
+                return;
+            }
+
+            reader.ReadStartElement();
+            while (reader.NodeType != System.Xml.XmlNodeType.EndElement)
+            {
+                var key = XmlConvert.DecodeName(reader.LocalName);
+                var value = reader.ReadInnerXml();
+
+                Add(key, value);
+                reader.MoveToContent();
+            }
+            reader.ReadEndElement();
+        }
+
+        void IXmlSerializable.WriteXml(XmlWriter writer)
+        {
+            foreach (var keyValuePair in this)
+            {
+                var key = keyValuePair.Key;
+                var value = keyValuePair.Value;
+                writer.WriteStartElement(XmlConvert.EncodeLocalName(key));
+                if (value != null)
+                {
+                    var innerError = value as HttpError;
+                    if (innerError == null)
+                    {
+                        writer.WriteValue(value);
+                    }
+                    else
+                    {
+                        ((IXmlSerializable)innerError).WriteXml(writer);
+                    }
+                }
+                writer.WriteEndElement();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpErrorKeys.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpErrorKeys.cs
new file mode 100644
index 0000000000..48cb0dec17
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpErrorKeys.cs
@@ -0,0 +1,56 @@
+// 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.
+
+namespace System.Web.Http
+{
+    /// <summary>
+    /// Provides keys to look up error information stored in the <see cref="HttpError"/> dictionary.
+    /// </summary>
+    public static class HttpErrorKeys
+    {
+        /// <summary>
+        /// Provides a key for the Message.
+        /// </summary>
+        public static readonly string MessageKey = "Message";
+
+        /// <summary>
+        /// Provides a key for the MessageDetail.
+        /// </summary>
+        public static readonly string MessageDetailKey = "MessageDetail";
+
+        /// <summary>
+        /// Provides a key for the ModelState.
+        /// </summary>
+        public static readonly string ModelStateKey = "ModelState";
+
+        /// <summary>
+        /// Provides a key for the ExceptionMessage.
+        /// </summary>
+        public static readonly string ExceptionMessageKey = "ExceptionMessage";
+
+        /// <summary>
+        /// Provides a key for the ExceptionType.
+        /// </summary>
+        public static readonly string ExceptionTypeKey = "ExceptionType";
+
+        /// <summary>
+        /// Provides a key for the StackTrace.
+        /// </summary>
+        public static readonly string StackTraceKey = "StackTrace";
+
+        /// <summary>
+        /// Provides a key for the InnerException.
+        /// </summary>
+        public static readonly string InnerExceptionKey = "InnerException";
+
+        /// <summary>
+        /// Provides a key for the MessageLanguage.
+        /// </summary>
+        public static readonly string MessageLanguageKey = "MessageLanguage";
+
+        /// <summary>
+        /// Provides a key for the ErrorCode.
+        /// </summary>
+        public static readonly string ErrorCodeKey = "ErrorCode";
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs
new file mode 100644
index 0000000000..1879f81e1d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs
@@ -0,0 +1,521 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Net.Http.Formatting;
+using System.Net.Http.Headers;
+using System.Web.Http;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.WebApiCompatShim;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using ShimResources = Microsoft.AspNetCore.Mvc.WebApiCompatShim.Resources;
+
+namespace System.Net.Http
+{
+    /// <summary>
+    /// Provides extension methods for the <see cref="HttpRequestMessage"/> class.
+    /// </summary>
+    public static class HttpRequestMessageExtensions
+    {
+        /// <summary>
+        /// Helper method that performs content negotiation and creates a <see cref="HttpResponseMessage"/>
+        /// representing an error with an instance of <see cref="ObjectContent{T}"/> wrapping an
+        /// <see cref="HttpError"/> with message <paramref name="message"/>. If no formatter is found, this method
+        /// returns a response with status 406 NotAcceptable.
+        /// </summary>
+        /// <remarks>
+        /// This method requires that <paramref name="request"/> has been associated with an instance of
+        /// <see cref="HttpContext"/>.
+        /// </remarks>
+        /// <param name="request">The request.</param>
+        /// <param name="statusCode">The status code of the created response.</param>
+        /// <param name="message">The error message.</param>
+        /// <returns>
+        /// An error response with error message <paramref name="message"/> and status code
+        /// <paramref name="statusCode"/>.
+        /// </returns>
+        public static HttpResponseMessage CreateErrorResponse(
+            this HttpRequestMessage request,
+            HttpStatusCode statusCode,
+            string message)
+        {
+            if (request == null)
+            {
+                throw new ArgumentNullException(nameof(request));
+            }
+
+            if (message == null)
+            {
+                throw new ArgumentNullException(nameof(message));
+            }
+
+            return request.CreateErrorResponse(statusCode, new HttpError(message));
+        }
+
+        /// <summary>
+        /// Helper method that performs content negotiation and creates a <see cref="HttpResponseMessage"/>
+        /// representing an error with an instance of <see cref="ObjectContent{T}"/> wrapping an
+        /// <see cref="HttpError"/> with error message <paramref name="message"/> for exception
+        /// <paramref name="exception"/>. If no formatter is found, this method returns a response with status 406
+        /// NotAcceptable.
+        /// </summary>
+        /// <remarks>
+        /// This method requires that <paramref name="request"/> has been associated with an instance of
+        /// <see cref="HttpContext"/>.
+        /// </remarks>
+        /// <param name="request">The request.</param>
+        /// <param name="statusCode">The status code of the created response.</param>
+        /// <param name="message">The error message.</param>
+        /// <param name="exception">The exception.</param>
+        /// <returns>An error response for <paramref name="exception"/> with error message <paramref name="message"/>
+        /// and status code <paramref name="statusCode"/>.</returns>
+        public static HttpResponseMessage CreateErrorResponse(
+            this HttpRequestMessage request,
+            HttpStatusCode statusCode,
+            string message,
+            Exception exception)
+        {
+            if (request == null)
+            {
+                throw new ArgumentNullException(nameof(request));
+            }
+
+            if (message == null)
+            {
+                throw new ArgumentNullException(nameof(message));
+            }
+
+            if (exception == null)
+            {
+                throw new ArgumentNullException(nameof(exception));
+            }
+
+            var error = new HttpError(exception, includeErrorDetail: false) { Message = message };
+            return request.CreateErrorResponse(statusCode, error);
+        }
+
+        /// <summary>
+        /// Helper method that performs content negotiation and creates a <see cref="HttpResponseMessage"/>
+        /// representing an error with an instance of <see cref="ObjectContent{T}"/> wrapping an
+        /// <see cref="HttpError"/> for exception <paramref name="exception"/>. If no formatter is found, this method
+        /// returns a response with status 406 NotAcceptable.
+        /// </summary>
+        /// <remarks>
+        /// This method requires that <paramref name="request"/> has been associated with an instance of
+        /// <see cref="HttpContext"/>.
+        /// </remarks>
+        /// <param name="request">The request.</param>
+        /// <param name="statusCode">The status code of the created response.</param>
+        /// <param name="exception">The exception.</param>
+        /// <returns>
+        /// An error response for <paramref name="exception"/> with status code <paramref name="statusCode"/>.
+        /// </returns>
+        public static HttpResponseMessage CreateErrorResponse(
+            this HttpRequestMessage request,
+            HttpStatusCode statusCode,
+            Exception exception)
+        {
+            if (request == null)
+            {
+                throw new ArgumentNullException(nameof(request));
+            }
+
+            if (exception == null)
+            {
+                throw new ArgumentNullException(nameof(exception));
+            }
+
+            return request.CreateErrorResponse(statusCode, new HttpError(exception, includeErrorDetail: false));
+        }
+
+        /// <summary>
+        /// Helper method that performs content negotiation and creates a <see cref="HttpResponseMessage"/>
+        /// representing an error with an instance of <see cref="ObjectContent{T}"/> wrapping an
+        /// <see cref="HttpError"/> for model state <paramref name="modelState"/>. If no formatter is found, this
+        /// method returns a response with status 406 NotAcceptable.
+        /// </summary>
+        /// <remarks>
+        /// This method requires that <paramref name="request"/> has been associated with an instance of
+        /// <see cref="HttpContext"/>.
+        /// </remarks>
+        /// <param name="request">The request.</param>
+        /// <param name="statusCode">The status code of the created response.</param>
+        /// <param name="modelState">The model state.</param>
+        /// <returns>
+        /// An error response for <paramref name="modelState"/> with status code <paramref name="statusCode"/>.
+        /// </returns>
+        public static HttpResponseMessage CreateErrorResponse(
+            this HttpRequestMessage request,
+            HttpStatusCode statusCode,
+            ModelStateDictionary modelState)
+        {
+            if (request == null)
+            {
+                throw new ArgumentNullException(nameof(request));
+            }
+
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            return request.CreateErrorResponse(statusCode, new HttpError(modelState, includeErrorDetail: false));
+        }
+
+        /// <summary>
+        /// Helper method that performs content negotiation and creates a <see cref="HttpResponseMessage"/>
+        /// representing an error with an instance of <see cref="ObjectContent{T}"/> wrapping <paramref name="error"/>
+        /// as the content. If no formatter is found, this method returns a response with status 406 NotAcceptable.
+        /// </summary>
+        /// <remarks>
+        /// This method requires that <paramref name="request"/> has been associated with an instance of
+        /// <see cref="HttpContext"/>.
+        /// </remarks>
+        /// <param name="request">The request.</param>
+        /// <param name="statusCode">The status code of the created response.</param>
+        /// <param name="error">The error to wrap.</param>
+        /// <returns>
+        /// An error response wrapping <paramref name="error"/> with status code <paramref name="statusCode"/>.
+        /// </returns>
+        public static HttpResponseMessage CreateErrorResponse(
+            this HttpRequestMessage request,
+            HttpStatusCode statusCode,
+            HttpError error)
+        {
+            if (request == null)
+            {
+                throw new ArgumentNullException(nameof(request));
+            }
+
+            if (error == null)
+            {
+                throw new ArgumentNullException(nameof(error));
+            }
+
+            return request.CreateResponse<HttpError>(statusCode, error);
+        }
+
+        /// <summary>
+        /// Helper method that performs content negotiation and creates a <see cref="HttpResponseMessage"/> with an
+        /// instance of <see cref="ObjectContent{T}"/> as the content and <see cref="System.Net.HttpStatusCode.OK"/>
+        /// as the status code if a formatter can be found. If no formatter is found, this method returns a response
+        /// with status 406 NotAcceptable.
+        /// </summary>
+        /// <remarks>
+        /// This method requires that <paramref name="request"/> has been associated with an instance of
+        /// <see cref="HttpContext"/>.
+        /// </remarks>
+        /// <typeparam name="T">The type of the value.</typeparam>
+        /// <param name="request">The request.</param>
+        /// <param name="value">The value to wrap. Can be <c>null</c>.</param>
+        /// <returns>
+        /// A response wrapping <paramref name="value"/> with <see cref="System.Net.HttpStatusCode.OK"/> status code.
+        /// </returns>
+        public static HttpResponseMessage CreateResponse<T>(this HttpRequestMessage request, T value)
+        {
+            if (request == null)
+            {
+                throw new ArgumentNullException(nameof(request));
+            }
+
+            if (value == null)
+            {
+                throw new ArgumentNullException(nameof(value));
+            }
+
+            return request.CreateResponse<T>(HttpStatusCode.OK, value, formatters: null);
+        }
+
+        /// <summary>
+        /// Helper method that performs content negotiation and creates a <see cref="HttpResponseMessage"/> with an
+        /// instance of <see cref="ObjectContent{T}"/> as the content if a formatter can be found. If no formatter is
+        /// found, this method returns a response with status 406 NotAcceptable.
+        /// configuration.
+        /// </summary>
+        /// <remarks>
+        /// This method requires that <paramref name="request"/> has been associated with an instance of
+        /// <see cref="HttpContext"/>.
+        /// </remarks>
+        /// <typeparam name="T">The type of the value.</typeparam>
+        /// <param name="request">The request.</param>
+        /// <param name="statusCode">The status code of the created response.</param>
+        /// <param name="value">The value to wrap. Can be <c>null</c>.</param>
+        /// <returns>A response wrapping <paramref name="value"/> with <paramref name="statusCode"/>.</returns>
+        public static HttpResponseMessage CreateResponse<T>(
+            this HttpRequestMessage request,
+            HttpStatusCode statusCode,
+            T value)
+        {
+            return request.CreateResponse<T>(statusCode, value, formatters: null);
+        }
+
+        /// <summary>
+        /// Helper method that performs content negotiation and creates a <see cref="HttpResponseMessage"/> with an
+        /// instance of <see cref="ObjectContent{T}"/> as the content if a formatter can be found. If no formatter is
+        /// found, this method returns a response with status 406 NotAcceptable.
+        /// </summary>
+        /// <remarks>
+        /// This method will get the <see cref="HttpContext"/> instance associated with <paramref name="request"/>.
+        /// </remarks>
+        /// <typeparam name="T">The type of the value.</typeparam>
+        /// <param name="request">The request.</param>
+        /// <param name="statusCode">The status code of the created response.</param>
+        /// <param name="value">The value to wrap. Can be <c>null</c>.</param>
+        /// <param name="formatters">The set of <see cref="MediaTypeFormatter"/> objects from which to choose.</param>
+        /// <returns>A response wrapping <paramref name="value"/> with <paramref name="statusCode"/>.</returns>
+        public static HttpResponseMessage CreateResponse<T>(
+            this HttpRequestMessage request,
+            HttpStatusCode statusCode,
+            T value,
+            IEnumerable<MediaTypeFormatter> formatters)
+        {
+            if (request == null)
+            {
+                throw new ArgumentNullException(nameof(request));
+            }
+
+            var context = GetHttpContext(request);
+
+            if (formatters == null)
+            {
+                // Get the default formatters from options
+                var options = context.RequestServices.GetRequiredService<IOptions<WebApiCompatShimOptions>>();
+                formatters = options.Value.Formatters;
+            }
+
+            var contentNegotiator = context.RequestServices.GetRequiredService<IContentNegotiator>();
+
+            var result = contentNegotiator.Negotiate(typeof(T), request, formatters);
+            if (result?.Formatter == null)
+            {
+                // Return a 406 when we're actually performing conneg and it fails to find a formatter.
+                return new HttpResponseMessage(HttpStatusCode.NotAcceptable)
+                {
+                    RequestMessage = request
+                };
+            }
+            else
+            {
+                return request.CreateResponse(statusCode, value, result.Formatter, result.MediaType);
+            }
+        }
+
+        /// <summary>
+        /// Helper method that creates a <see cref="HttpResponseMessage"/> with an <see cref="ObjectContent{T}"/>
+        /// instance containing the provided <paramref name="value"/>. The given <paramref name="mediaType"/> is used
+        /// to find an instance of <see cref="MediaTypeFormatter"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of the value.</typeparam>
+        /// <param name="request">The request.</param>
+        /// <param name="statusCode">The status code of the created response.</param>
+        /// <param name="value">The value to wrap. Can be <c>null</c>.</param>
+        /// <param name="mediaType">
+        /// The media type used to look up an instance of <see cref="MediaTypeFormatter"/>.
+        /// </param>
+        /// <returns>A response wrapping <paramref name="value"/> with <paramref name="statusCode"/>.</returns>
+        public static HttpResponseMessage CreateResponse<T>(
+            this HttpRequestMessage request,
+            HttpStatusCode statusCode,
+            T value,
+            string mediaType)
+        {
+            return request.CreateResponse(statusCode, value, new MediaTypeHeaderValue(mediaType));
+        }
+
+        /// <summary>
+        /// Helper method that creates a <see cref="HttpResponseMessage"/> with an <see cref="ObjectContent{T}"/>
+        /// instance containing the provided <paramref name="value"/>. The given <paramref name="mediaType"/> is used
+        /// to find an instance of <see cref="MediaTypeFormatter"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of the value.</typeparam>
+        /// <param name="request">The request.</param>
+        /// <param name="statusCode">The status code of the created response.</param>
+        /// <param name="value">The value to wrap. Can be <c>null</c>.</param>
+        /// <param name="mediaType">
+        /// The media type used to look up an instance of <see cref="MediaTypeFormatter"/>.
+        /// </param>
+        /// <returns>A response wrapping <paramref name="value"/> with <paramref name="statusCode"/>.</returns>
+        public static HttpResponseMessage CreateResponse<T>(
+            this HttpRequestMessage request,
+            HttpStatusCode statusCode,
+            T value,
+            MediaTypeHeaderValue mediaType)
+        {
+            if (request == null)
+            {
+                throw new ArgumentNullException(nameof(request));
+            }
+
+            if (value == null)
+            {
+                throw new ArgumentNullException(nameof(value));
+            }
+
+            if (mediaType == null)
+            {
+                throw new ArgumentNullException(nameof(mediaType));
+            }
+
+            var context = GetHttpContext(request);
+
+            // Get the default formatters from options
+            var options = context.RequestServices.GetRequiredService<IOptions<WebApiCompatShimOptions>>();
+            var formatters = options.Value.Formatters;
+
+            var formatter = formatters.FindWriter(typeof(T), mediaType);
+            if (formatter == null)
+            {
+                var message = ShimResources.FormatHttpRequestMessage_CouldNotFindMatchingFormatter(
+                    mediaType.ToString(),
+                    value.GetType());
+                throw new InvalidOperationException(message);
+            }
+
+            return request.CreateResponse(statusCode, value, formatter, mediaType);
+        }
+
+        /// <summary>
+        /// Helper method that creates a <see cref="HttpResponseMessage"/> with an <see cref="ObjectContent{T}"/>
+        /// instance containing the provided <paramref name="value"/> and the given <paramref name="formatter"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of the value.</typeparam>
+        /// <param name="request">The request.</param>
+        /// <param name="statusCode">The status code of the created response.</param>
+        /// <param name="value">The value to wrap. Can be <c>null</c>.</param>
+        /// <param name="formatter">The formatter to use.</param>
+        /// <returns>A response wrapping <paramref name="value"/> with <paramref name="statusCode"/>.</returns>
+        public static HttpResponseMessage CreateResponse<T>(
+            this HttpRequestMessage request,
+            HttpStatusCode statusCode,
+            T value,
+            MediaTypeFormatter formatter)
+        {
+            if (request == null)
+            {
+                throw new ArgumentNullException(nameof(request));
+            }
+
+            if (value == null)
+            {
+                throw new ArgumentNullException(nameof(value));
+            }
+
+            if (formatter == null)
+            {
+                throw new ArgumentNullException(nameof(formatter));
+            }
+
+            return request.CreateResponse(statusCode, value, formatter, (MediaTypeHeaderValue)null);
+        }
+
+        /// <summary>
+        /// Helper method that creates a <see cref="HttpResponseMessage"/> with an <see cref="ObjectContent{T}"/>
+        /// instance containing the provided <paramref name="value"/> and the given <paramref name="formatter"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of the value.</typeparam>
+        /// <param name="request">The request.</param>
+        /// <param name="statusCode">The status code of the created response.</param>
+        /// <param name="value">The value to wrap. Can be <c>null</c>.</param>
+        /// <param name="formatter">The formatter to use.</param>
+        /// <param name="mediaType">
+        /// The media type override to set on the response's content. Can be <c>null</c>.
+        /// </param>
+        /// <returns>A response wrapping <paramref name="value"/> with <paramref name="statusCode"/>.</returns>
+        public static HttpResponseMessage CreateResponse<T>(
+            this HttpRequestMessage request,
+            HttpStatusCode statusCode,
+            T value,
+            MediaTypeFormatter formatter,
+            string mediaType)
+        {
+            if (request == null)
+            {
+                throw new ArgumentNullException(nameof(request));
+            }
+
+            if (value == null)
+            {
+                throw new ArgumentNullException(nameof(value));
+            }
+
+            if (formatter == null)
+            {
+                throw new ArgumentNullException(nameof(formatter));
+            }
+
+            var mediaTypeHeader = mediaType != null ? new MediaTypeHeaderValue(mediaType) : null;
+            return request.CreateResponse(statusCode, value, formatter, mediaTypeHeader);
+        }
+
+        /// <summary>
+        /// Helper method that creates a <see cref="HttpResponseMessage"/> with an <see cref="ObjectContent{T}"/>
+        /// instance containing the provided <paramref name="value"/> and the given <paramref name="formatter"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of the value.</typeparam>
+        /// <param name="request">The request.</param>
+        /// <param name="statusCode">The status code of the created response.</param>
+        /// <param name="value">The value to wrap. Can be <c>null</c>.</param>
+        /// <param name="formatter">The formatter to use.</param>
+        /// <param name="mediaType">
+        /// The media type override to set on the response's content. Can be <c>null</c>.
+        /// </param>
+        /// <returns>A response wrapping <paramref name="value"/> with <paramref name="statusCode"/>.</returns>
+        public static HttpResponseMessage CreateResponse<T>(
+            this HttpRequestMessage request,
+            HttpStatusCode statusCode,
+            T value,
+            MediaTypeFormatter formatter,
+            MediaTypeHeaderValue mediaType)
+        {
+            if (request == null)
+            {
+                throw new ArgumentNullException(nameof(request));
+            }
+
+            if (formatter == null)
+            {
+                throw new ArgumentNullException(nameof(formatter));
+            }
+
+            var response = new HttpResponseMessage(statusCode)
+            {
+                RequestMessage = request,
+            };
+
+            response.Content = new ObjectContent<T>(value, formatter, mediaType);
+
+            return response;
+        }
+
+        private static HttpContext GetHttpContext(HttpRequestMessage request)
+        {
+            var context = request.GetProperty<HttpContext>(nameof(HttpContext));
+            if (context == null)
+            {
+                var message = ShimResources.FormatHttpRequestMessage_MustHaveHttpContext(
+                    nameof(HttpRequestMessage),
+                    "HttpRequestMessageHttpContextExtensions.GetHttpRequestMessage");
+                throw new InvalidOperationException(message);
+            }
+
+            return context;
+        }
+
+        private static T GetProperty<T>(this HttpRequestMessage request, string key)
+        {
+            object value;
+            request.Properties.TryGetValue(key, out value);
+
+            if (value is T)
+            {
+                return (T)value;
+            }
+            else
+            {
+                return default(T);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageFeature.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageFeature.cs
new file mode 100644
index 0000000000..9937d4d2c3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageFeature.cs
@@ -0,0 +1,77 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Net.Http;
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    public class HttpRequestMessageFeature : IHttpRequestMessageFeature
+    {
+        private readonly HttpContext _httpContext;
+        private HttpRequestMessage _httpRequestMessage;
+
+        public HttpRequestMessageFeature(HttpContext httpContext)
+        {
+            if (httpContext == null)
+            {
+                throw new ArgumentNullException(nameof(httpContext));
+            }
+
+            _httpContext = httpContext;
+        }
+
+        public HttpRequestMessage HttpRequestMessage
+        {
+            get
+            {
+                if (_httpRequestMessage == null)
+                {
+                    _httpRequestMessage = CreateHttpRequestMessage(_httpContext);
+                }
+
+                return _httpRequestMessage;
+            }
+
+            set
+            {
+                _httpRequestMessage = value;
+            }
+        }
+
+        private static HttpRequestMessage CreateHttpRequestMessage(HttpContext httpContext)
+        {
+            var httpRequest = httpContext.Request;
+            var uriString =
+                httpRequest.Scheme + "://" +
+                httpRequest.Host +
+                httpRequest.PathBase +
+                httpRequest.Path +
+                httpRequest.QueryString;
+
+            var message = new HttpRequestMessage(new HttpMethod(httpRequest.Method), uriString);
+
+            // This allows us to pass the message through APIs defined in legacy code and then
+            // operate on the HttpContext inside.
+            message.Properties[nameof(HttpContext)] = httpContext;
+
+            message.Content = new StreamContent(httpRequest.Body);
+
+            foreach (var header in httpRequest.Headers)
+            {
+                // Every header should be able to fit into one of the two header collections.
+                // Try message.Headers first since that accepts more of them.
+                if (!message.Headers.TryAddWithoutValidation(header.Key, (IEnumerable<string>)header.Value))
+                {
+                    var added = message.Content.Headers.TryAddWithoutValidation(header.Key, (IEnumerable<string>)header.Value);
+                    Debug.Assert(added);
+                }
+            }
+
+            return message;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageHttpContextExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageHttpContextExtensions.cs
new file mode 100644
index 0000000000..36636bb49a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageHttpContextExtensions.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using System.Net.Http;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    public static class HttpRequestMessageHttpContextExtensions
+    {
+        public static HttpRequestMessage GetHttpRequestMessage(this HttpContext httpContext)
+        {
+            var feature = httpContext.Features.Get<IHttpRequestMessageFeature>();
+            if (feature == null)
+            {
+                feature = new HttpRequestMessageFeature(httpContext);
+                httpContext.Features.Set(feature);
+            }
+
+            return feature.HttpRequestMessage;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageModelBinder.cs
new file mode 100644
index 0000000000..29fd9aa437
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageModelBinder.cs
@@ -0,0 +1,26 @@
+// 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.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    /// <summary>
+    /// <see cref="IModelBinder"/> implementation to bind models of type <see cref="HttpRequestMessage"/>.
+    /// </summary>
+    public class HttpRequestMessageModelBinder : IModelBinder
+    {
+        /// <inheritdoc />
+        public Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            var model = bindingContext.HttpContext.GetHttpRequestMessage();
+            bindingContext.ValidationState.Add(model, new ValidationStateEntry() { SuppressValidation = true });
+            bindingContext.Result = ModelBindingResult.Success(model);
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageModelBinderProvider.cs
new file mode 100644
index 0000000000..bb06a4d243
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageModelBinderProvider.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using System.Net.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    /// <summary>
+    /// <see cref="IModelBinderProvider"/> implementation to bind models of type <see cref="HttpRequestMessage"/>.
+    /// </summary>
+    public class HttpRequestMessageModelBinderProvider : IModelBinderProvider
+    {
+        /// <inheritdoc />
+        public IModelBinder GetBinder(ModelBinderProviderContext context)
+        {
+            if (context.Metadata.ModelType == typeof(HttpRequestMessage))
+            {
+                return new HttpRequestMessageModelBinder();
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/IHttpRequestMessageFeature.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/IHttpRequestMessageFeature.cs
new file mode 100644
index 0000000000..ecad550a9e
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/IHttpRequestMessageFeature.cs
@@ -0,0 +1,12 @@
+// 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.
+
+using System.Net.Http;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    public interface IHttpRequestMessageFeature
+    {
+        HttpRequestMessage HttpRequestMessage { get; set; }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpResponseException.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpResponseException.cs
new file mode 100644
index 0000000000..866642f6c5
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpResponseException.cs
@@ -0,0 +1,41 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using ShimResources = Microsoft.AspNetCore.Mvc.WebApiCompatShim.Resources;
+
+namespace System.Web.Http
+{
+    public class HttpResponseException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpResponseException"/> class.
+        /// </summary>
+        /// <param name="statusCode">The status code of the response.</param>
+        public HttpResponseException(HttpStatusCode statusCode)
+            : this(new HttpResponseMessage(statusCode))
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpResponseException"/> class.
+        /// </summary>
+        /// <param name="response">The response message.</param>
+        public HttpResponseException(HttpResponseMessage response)
+            : base(ShimResources.HttpResponseExceptionMessage)
+        {
+            if (response == null)
+            {
+                throw new ArgumentNullException(nameof(response));
+            }
+
+            Response = response;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="HttpResponseMessage"/> to return to the client.
+        /// </summary>
+        public HttpResponseMessage Response { get; private set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpResponseExceptionActionFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpResponseExceptionActionFilter.cs
new file mode 100644
index 0000000000..d214ee63b0
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpResponseExceptionActionFilter.cs
@@ -0,0 +1,59 @@
+// 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.
+
+using System;
+using System.Net.Http;
+using System.Web.Http;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    /// <summary>
+    /// An action filter that sets <see cref="ActionExecutedContext.Result"/> to an <see cref="ObjectResult"/>
+    /// if the exception type is <see cref="HttpResponseException"/>.
+    /// This filter runs immediately after the action.
+    /// </summary>
+    public class HttpResponseExceptionActionFilter : IActionFilter, IOrderedFilter
+    {
+        /// <inheritdoc />
+        // Return a high number by default so that it runs closest to the action.
+        public int Order { get; set; } = int.MaxValue - 10;
+
+        /// <inheritdoc />
+        public void OnActionExecuting(ActionExecutingContext context)
+        {
+        }
+
+        /// <inheritdoc />
+        public void OnActionExecuted(ActionExecutedContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            var httpResponseException = context.Exception as HttpResponseException;
+            if (httpResponseException != null)
+            {
+                var request = context.HttpContext.GetHttpRequestMessage();
+                var response = httpResponseException.Response;
+
+                if (response != null && response.RequestMessage == null)
+                {
+                    response.RequestMessage = request;
+                }
+
+                var objectResult = new ObjectResult(response)
+                {
+                    DeclaredType = typeof(HttpResponseMessage)
+                };
+
+                context.Result = objectResult;
+
+                // Its marked as handled as in webapi because an HttpResponseException
+                // was considered as a 'success' response.
+                context.ExceptionHandled = true;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/InternalServerErrorResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/InternalServerErrorResult.cs
new file mode 100644
index 0000000000..840f439645
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/InternalServerErrorResult.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace System.Web.Http
+{
+    /// <summary>
+    /// An action result that returns an empty <see cref="StatusCodes.Status500InternalServerError"/> response.
+    /// </summary>
+    public class InternalServerErrorResult : StatusCodeResult
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InternalServerErrorResult"/> class.
+        /// </summary>
+        public InternalServerErrorResult()
+            : base(StatusCodes.Status500InternalServerError)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/InvalidModelStateResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/InvalidModelStateResult.cs
new file mode 100644
index 0000000000..7bd992b650
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/InvalidModelStateResult.cs
@@ -0,0 +1,51 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace System.Web.Http
+{
+    /// <summary>
+    /// An action result that returns a <see cref="StatusCodes.Status400BadRequest"/> response and performs
+    /// content negotiation on an <see cref="HttpError"/> based on a <see cref="ModelStateDictionary"/>.
+    /// </summary>
+    public class InvalidModelStateResult : ObjectResult
+    {
+        /// <summary>Initializes a new instance of the <see cref="InvalidModelStateResult"/> class.</summary>
+        /// <param name="modelState">The model state to include in the error.</param>
+        /// <param name="includeErrorDetail">
+        /// <see langword="true"/> if the error should include exception messages; otherwise, <see langword="false"/>.
+        /// </param>
+        public InvalidModelStateResult(ModelStateDictionary modelState, bool includeErrorDetail)
+            : base(new HttpError(modelState, includeErrorDetail))
+        {
+            if (modelState == null)
+            {
+                throw new ArgumentNullException(nameof(modelState));
+            }
+
+            ModelState = modelState;
+            IncludeErrorDetail = includeErrorDetail;
+        }
+
+        /// <summary>
+        /// Gets the model state to include in the error.
+        /// </summary>
+        public ModelStateDictionary ModelState { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether the error should include exception messages.
+        /// </summary>
+        public bool IncludeErrorDetail { get; private set; }
+
+        /// <inheritdoc />
+        public override Task ExecuteResultAsync(ActionContext context)
+        {
+            context.HttpContext.Response.StatusCode = StatusCodes.Status400BadRequest;
+            return base.ExecuteResultAsync(context);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj
new file mode 100644
index 0000000000..ab1d11a599
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Provides compatibility in ASP.NET Core MVC with ASP.NET Web API 2 to simplify migration of existing Web API implementations.
+Commonly used types:
+System.Web.Http.ApiController</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>aspnetcore;aspnetcoremvc;aspnetwebapi</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Formatters.Json\Microsoft.AspNetCore.Mvc.Formatters.Json.csproj" />
+
+    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="$(MicrosoftAspNetWebApiClientPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="$(MicrosoftAspNetCoreWebUtilitiesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsPropertyHelperSourcesPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/NegotiatedContentResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/NegotiatedContentResult.cs
new file mode 100644
index 0000000000..d828be7387
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/NegotiatedContentResult.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using System.Net;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+
+namespace System.Web.Http
+{
+    /// <summary>
+    /// An action result that performs content negotiation.
+    /// </summary>
+    /// <typeparam name="T">The type of content in the entity body.</typeparam>
+    public class NegotiatedContentResult<T> : ObjectResult
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NegotiatedContentResult{T}"/> class with the values provided.
+        /// </summary>
+        /// <param name="statusCode">The HTTP status code for the response message.</param>
+        /// <param name="content">The content value to negotiate and format in the entity body.</param>
+        public NegotiatedContentResult(HttpStatusCode statusCode, T content)
+            : base(content)
+        {
+            StatusCode = (int)statusCode;
+            Content = content;
+        }
+
+        /// <summary>
+        /// Gets the content value to negotiate and format in the entity body.
+        /// </summary>
+        public T Content { get; private set; }
+
+        /// <inheritdoc />
+        public override Task ExecuteResultAsync(ActionContext context)
+        {
+            context.HttpContext.Response.StatusCode = (int)StatusCode;
+            return base.ExecuteResultAsync(context);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/OverloadActionConstraint.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/OverloadActionConstraint.cs
new file mode 100644
index 0000000000..67e5df033c
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/OverloadActionConstraint.cs
@@ -0,0 +1,194 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Net.Http.Formatting;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Routing;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    /// <summary>
+    /// An <see cref="IActionConstraint"/> limiting candidate actions to those for which the request satisfies all
+    /// non-optional parameters.
+    /// </summary>
+    public class OverloadActionConstraint : IActionConstraint
+    {
+        /// <inheritdoc />
+        public int Order => int.MaxValue;
+
+        /// <inheritdoc />
+        public bool Accept(ActionConstraintContext context)
+        {
+            var candidates = context.Candidates.Select(c => new
+            {
+                Action = c,
+                Parameters = GetOverloadableParameters(c),
+            });
+
+            // Combined route value keys and query string keys. These are the values available for overload selection.
+            var requestKeys = GetCombinedKeys(context.RouteContext);
+
+            // Group candidates by the highest number of keys, and then process them until we find an action
+            // with all parameters satisfied.
+            foreach (var group in candidates.GroupBy(c => c.Parameters?.Count ?? 0).OrderByDescending(g => g.Key))
+            {
+                var foundMatch = false;
+                foreach (var candidate in group)
+                {
+                    var allFound = true;
+                    if (candidate.Parameters != null)
+                    {
+                        foreach (var parameter in candidate.Parameters)
+                        {
+                            if (!requestKeys.Contains(parameter.Prefix))
+                            {
+                                if (candidate.Action.Action == context.CurrentCandidate.Action)
+                                {
+                                    return false;
+                                }
+
+                                allFound = false;
+                                break;
+                            }
+                        }
+                    }
+
+                    if (allFound)
+                    {
+                        foundMatch = true;
+                    }
+                }
+
+                if (foundMatch)
+                {
+                    return group.Any(c => c.Action.Action == context.CurrentCandidate.Action);
+                }
+            }
+
+            return false;
+        }
+
+        private List<OverloadedParameter> GetOverloadableParameters(ActionSelectorCandidate candidate)
+        {
+            if (candidate.Action.Parameters == null)
+            {
+                return null;
+            }
+
+            var isOverloaded = false;
+            foreach (var constraint in candidate.Constraints)
+            {
+                if (constraint is OverloadActionConstraint)
+                {
+                    isOverloaded = true;
+                }
+            }
+
+            if (!isOverloaded)
+            {
+                return null;
+            }
+
+            var parameters = new List<OverloadedParameter>();
+            object optionalParametersObject;
+            candidate.Action.Properties.TryGetValue("OptionalParameters", out optionalParametersObject);
+            var optionalParameters = (HashSet<string>)optionalParametersObject;
+            foreach (var parameter in candidate.Action.Parameters)
+            {
+                // We only consider parameters that are marked as bound from the URL.
+                var source = parameter.BindingInfo?.BindingSource;
+                if (source == null)
+                {
+                    continue;
+                }
+
+                if ((source.CanAcceptDataFrom(BindingSource.Path) ||
+                    source.CanAcceptDataFrom(BindingSource.Query)) &&
+                    CanConvertFromString(parameter.ParameterType))
+                {
+                    if (optionalParameters != null)
+                    {
+                        var isOptional = optionalParameters.Contains(parameter.Name);
+                        if (isOptional)
+                        {
+                            // Optional parameters are ignored in overloading. If a parameter doesn't specify that it's
+                            // required then treat it as optional (MVC default). WebAPI parameters will all by-default
+                            // specify themselves as required unless they have a default value.
+                            continue;
+                        }
+                    }
+
+                    var prefix = parameter.BindingInfo?.BinderModelName ?? parameter.Name;
+
+                    parameters.Add(new OverloadedParameter()
+                    {
+                        ParameterDescriptor = parameter,
+                        Prefix = prefix,
+                    });
+                }
+            }
+
+            return parameters;
+        }
+
+        private static ISet<string> GetCombinedKeys(RouteContext routeContext)
+        {
+            var keys = new HashSet<string>(routeContext.RouteData.Values.Keys, StringComparer.OrdinalIgnoreCase);
+            keys.Remove("controller");
+            keys.Remove("action");
+
+            var queryString = routeContext.HttpContext.Request.QueryString.ToUriComponent();
+
+            if (queryString.Length > 0)
+            {
+                // We need to chop off the leading '?'
+                var queryData = new FormDataCollection(queryString.Substring(1));
+
+                var queryNameValuePairs = queryData.GetJQueryNameValuePairs();
+
+                if (queryNameValuePairs != null)
+                {
+                    foreach (var queryNameValuePair in queryNameValuePairs)
+                    {
+                        keys.Add(queryNameValuePair.Key);
+                    }
+                }
+            }
+
+            return keys;
+        }
+
+        private static bool CanConvertFromString(Type destinationType)
+        {
+            destinationType = Nullable.GetUnderlyingType(destinationType) ?? destinationType;
+            return IsSimpleType(destinationType) ||
+                   TypeDescriptor.GetConverter(destinationType).CanConvertFrom(typeof(string));
+        }
+
+        private static bool IsSimpleType(Type type)
+        {
+            return type.GetTypeInfo().IsPrimitive ||
+                type.Equals(typeof(decimal)) ||
+                type.Equals(typeof(string)) ||
+                type.Equals(typeof(DateTime)) ||
+                type.Equals(typeof(Guid)) ||
+                type.Equals(typeof(DateTimeOffset)) ||
+                type.Equals(typeof(TimeSpan)) ||
+                type.Equals(typeof(Uri));
+        }
+
+        private class OverloadedParameter
+        {
+            public ParameterDescriptor ParameterDescriptor { get; set; }
+
+            public string Prefix { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ParameterBinding/FromUriAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ParameterBinding/FromUriAttribute.cs
new file mode 100644
index 0000000000..0002337087
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ParameterBinding/FromUriAttribute.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using WebApiShimResources = Microsoft.AspNetCore.Mvc.WebApiCompatShim.Resources;
+
+namespace System.Web.Http
+{
+    /// <summary>
+    /// An attribute that specifies that the value can be bound from the query string or route data.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)]
+    public class FromUriAttribute :
+        Attribute,
+        IOptionalBinderMetadata,
+        IBindingSourceMetadata,
+        IModelNameProvider
+    {
+        private static readonly BindingSource FromUriSource = CompositeBindingSource.Create(
+            new BindingSource[] { BindingSource.Path, BindingSource.Query },
+            WebApiShimResources.BindingSource_URL);
+
+        /// <inheritdoc />
+        public BindingSource BindingSource { get { return FromUriSource; } }
+
+        /// <inheritdoc />
+        public bool IsOptional { get; set; }
+
+        /// <inheritdoc />
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ParameterBinding/IOptionalBinderMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ParameterBinding/IOptionalBinderMetadata.cs
new file mode 100644
index 0000000000..367fd52614
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ParameterBinding/IOptionalBinderMetadata.cs
@@ -0,0 +1,24 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    /// <summary>
+    /// <para>
+    /// An type that designates an optional parameter for the purposes
+    /// of ASP.NET Web API action overloading. Optional parameters do not participate in overloading, and
+    /// do not have to have a value for the action to be selected.
+    /// </para>
+    /// <para>
+    /// This has no impact when used without ASP.NET Web API action overloading.
+    /// </para>
+    /// </summary>
+    public interface IOptionalBinderMetadata
+    {
+        /// <summary>
+        /// Gets a value indicating whether the parameter participates in ASP.NET Web API action overloading. If
+        /// <c>true</c>, the parameter does not participate in overloading. Otherwise, it does.
+        /// </summary>
+        bool IsOptional { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..a97fe6be81
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Properties/AssemblyInfo.cs
@@ -0,0 +1,11 @@
+// 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.
+
+using System.Runtime.CompilerServices;
+
+[assembly: TypeForwardedTo(typeof(System.Net.Http.Formatting.ContentNegotiationResult))]
+[assembly: TypeForwardedTo(typeof(System.Net.Http.Formatting.DefaultContentNegotiator))]
+[assembly: TypeForwardedTo(typeof(System.Net.Http.Formatting.FormDataCollection ))]
+[assembly: TypeForwardedTo(typeof(System.Net.Http.Formatting.IContentNegotiator))]
+[assembly: TypeForwardedTo(typeof(System.Net.Http.Formatting.MediaTypeFormatterMatch))]
+[assembly: TypeForwardedTo(typeof(System.Net.Http.Formatting.MediaTypeFormatterMatchRanking))]
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..508a740cb9
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Properties/Resources.Designer.cs
@@ -0,0 +1,184 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class Resources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.WebApiCompatShim.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// The request is invalid.
+        /// </summary>
+        internal static string HttpError_BadRequest
+        {
+            get => GetString("HttpError_BadRequest");
+        }
+
+        /// <summary>
+        /// The request is invalid.
+        /// </summary>
+        internal static string FormatHttpError_BadRequest()
+            => GetString("HttpError_BadRequest");
+
+        /// <summary>
+        /// An error has occurred.
+        /// </summary>
+        internal static string HttpError_GenericError
+        {
+            get => GetString("HttpError_GenericError");
+        }
+
+        /// <summary>
+        /// An error has occurred.
+        /// </summary>
+        internal static string FormatHttpError_GenericError()
+            => GetString("HttpError_GenericError");
+
+        /// <summary>
+        /// The model state is valid.
+        /// </summary>
+        internal static string HttpError_ValidModelState
+        {
+            get => GetString("HttpError_ValidModelState");
+        }
+
+        /// <summary>
+        /// The model state is valid.
+        /// </summary>
+        internal static string FormatHttpError_ValidModelState()
+            => GetString("HttpError_ValidModelState");
+
+        /// <summary>
+        /// Could not find a formatter matching the media type '{0}' that can write an instance of '{1}'.
+        /// </summary>
+        internal static string HttpRequestMessage_CouldNotFindMatchingFormatter
+        {
+            get => GetString("HttpRequestMessage_CouldNotFindMatchingFormatter");
+        }
+
+        /// <summary>
+        /// Could not find a formatter matching the media type '{0}' that can write an instance of '{1}'.
+        /// </summary>
+        internal static string FormatHttpRequestMessage_CouldNotFindMatchingFormatter(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("HttpRequestMessage_CouldNotFindMatchingFormatter"), p0, p1);
+
+        /// <summary>
+        /// The {0} instance is not properly initialized. Use {1} to create an {0} for the current request.
+        /// </summary>
+        internal static string HttpRequestMessage_MustHaveHttpContext
+        {
+            get => GetString("HttpRequestMessage_MustHaveHttpContext");
+        }
+
+        /// <summary>
+        /// The {0} instance is not properly initialized. Use {1} to create an {0} for the current request.
+        /// </summary>
+        internal static string FormatHttpRequestMessage_MustHaveHttpContext(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("HttpRequestMessage_MustHaveHttpContext"), p0, p1);
+
+        /// <summary>
+        /// The {0} only supports writing objects of type {1}.
+        /// </summary>
+        internal static string HttpResponseMessageFormatter_UnsupportedType
+        {
+            get => GetString("HttpResponseMessageFormatter_UnsupportedType");
+        }
+
+        /// <summary>
+        /// The {0} only supports writing objects of type {1}.
+        /// </summary>
+        internal static string FormatHttpResponseMessageFormatter_UnsupportedType(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("HttpResponseMessageFormatter_UnsupportedType"), p0, p1);
+
+        /// <summary>
+        /// The key is invalid JQuery syntax because it is missing a closing bracket.
+        /// </summary>
+        internal static string JQuerySyntaxMissingClosingBracket
+        {
+            get => GetString("JQuerySyntaxMissingClosingBracket");
+        }
+
+        /// <summary>
+        /// The key is invalid JQuery syntax because it is missing a closing bracket.
+        /// </summary>
+        internal static string FormatJQuerySyntaxMissingClosingBracket()
+            => GetString("JQuerySyntaxMissingClosingBracket");
+
+        /// <summary>
+        /// The number of keys in a NameValueCollection has exceeded the limit of '{0}'. You can adjust it by modifying the MaxHttpCollectionKeys property on the '{1}' class.
+        /// </summary>
+        internal static string MaxHttpCollectionKeyLimitReached
+        {
+            get => GetString("MaxHttpCollectionKeyLimitReached");
+        }
+
+        /// <summary>
+        /// The number of keys in a NameValueCollection has exceeded the limit of '{0}'. You can adjust it by modifying the MaxHttpCollectionKeys property on the '{1}' class.
+        /// </summary>
+        internal static string FormatMaxHttpCollectionKeyLimitReached(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("MaxHttpCollectionKeyLimitReached"), p0, p1);
+
+        /// <summary>
+        /// Processing of the HTTP request resulted in an exception. Please see the HTTP response returned by the 'Response' property of this exception for details.
+        /// </summary>
+        internal static string HttpResponseExceptionMessage
+        {
+            get => GetString("HttpResponseExceptionMessage");
+        }
+
+        /// <summary>
+        /// Processing of the HTTP request resulted in an exception. Please see the HTTP response returned by the 'Response' property of this exception for details.
+        /// </summary>
+        internal static string FormatHttpResponseExceptionMessage()
+            => GetString("HttpResponseExceptionMessage");
+
+        /// <summary>
+        /// Failed to generate a URL using route '{0}'.
+        /// </summary>
+        internal static string CreatedAtRoute_RouteFailed
+        {
+            get => GetString("CreatedAtRoute_RouteFailed");
+        }
+
+        /// <summary>
+        /// Failed to generate a URL using route '{0}'.
+        /// </summary>
+        internal static string FormatCreatedAtRoute_RouteFailed(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("CreatedAtRoute_RouteFailed"), p0);
+
+        /// <summary>
+        /// URL
+        /// </summary>
+        internal static string BindingSource_URL
+        {
+            get => GetString("BindingSource_URL");
+        }
+
+        /// <summary>
+        /// URL
+        /// </summary>
+        internal static string FormatBindingSource_URL()
+            => GetString("BindingSource_URL");
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Resources.resx
new file mode 100644
index 0000000000..f4448a3035
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Resources.resx
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="HttpError_BadRequest" xml:space="preserve">
+    <value>The request is invalid.</value>
+  </data>
+  <data name="HttpError_GenericError" xml:space="preserve">
+    <value>An error has occurred.</value>
+  </data>
+  <data name="HttpError_ValidModelState" xml:space="preserve">
+    <value>The model state is valid.</value>
+  </data>
+  <data name="HttpRequestMessage_CouldNotFindMatchingFormatter" xml:space="preserve">
+    <value>Could not find a formatter matching the media type '{0}' that can write an instance of '{1}'.</value>
+  </data>
+  <data name="HttpRequestMessage_MustHaveHttpContext" xml:space="preserve">
+    <value>The {0} instance is not properly initialized. Use {1} to create an {0} for the current request.</value>
+  </data>
+  <data name="HttpResponseMessageFormatter_UnsupportedType" xml:space="preserve">
+    <value>The {0} only supports writing objects of type {1}.</value>
+  </data>
+  <data name="JQuerySyntaxMissingClosingBracket" xml:space="preserve">
+    <value>The key is invalid JQuery syntax because it is missing a closing bracket.</value>
+  </data>
+  <data name="MaxHttpCollectionKeyLimitReached" xml:space="preserve">
+    <value>The number of keys in a NameValueCollection has exceeded the limit of '{0}'. You can adjust it by modifying the MaxHttpCollectionKeys property on the '{1}' class.</value>
+  </data>
+  <data name="HttpResponseExceptionMessage" xml:space="preserve">
+    <value>Processing of the HTTP request resulted in an exception. Please see the HTTP response returned by the 'Response' property of this exception for details.</value>
+  </data>
+  <data name="CreatedAtRoute_RouteFailed" xml:space="preserve">
+    <value>Failed to generate a URL using route '{0}'.</value>
+  </data>
+  <data name="BindingSource_URL" xml:space="preserve">
+    <value>URL</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ResponseMessageResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ResponseMessageResult.cs
new file mode 100644
index 0000000000..c771faa632
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ResponseMessageResult.cs
@@ -0,0 +1,34 @@
+// 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.
+
+using System.Net.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace System.Web.Http
+{
+    /// <summary>
+    /// An action result that returns a specified response message.
+    /// </summary>
+    public class ResponseMessageResult : ObjectResult
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ResponseMessageResult"/> class.
+        /// </summary>
+        /// <param name="response">The response message.</param>
+        public ResponseMessageResult(HttpResponseMessage response)
+            : base(response)
+        {
+            if (response == null)
+            {
+                throw new ArgumentNullException(nameof(response));
+            }
+
+            Response = response;
+        }
+
+        /// <summary>
+        /// Gets the response message.
+        /// </summary>
+        public HttpResponseMessage Response { get; private set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Routing/WebApiCompatShimRouteBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Routing/WebApiCompatShimRouteBuilderExtensions.cs
new file mode 100644
index 0000000000..f16f2f5c61
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Routing/WebApiCompatShimRouteBuilderExtensions.cs
@@ -0,0 +1,70 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.WebApiCompatShim;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Routing.Constraints;
+
+namespace Microsoft.AspNetCore.Builder
+{
+    public static class WebApiCompatShimRouteBuilderExtensions
+    {
+        public static IRouteBuilder MapWebApiRoute(
+            this IRouteBuilder routeCollectionBuilder,
+            string name,
+            string template)
+        {
+            return MapWebApiRoute(routeCollectionBuilder, name, template, defaults: null);
+        }
+
+        public static IRouteBuilder MapWebApiRoute(
+            this IRouteBuilder routeCollectionBuilder,
+            string name,
+            string template,
+            object defaults)
+        {
+            return MapWebApiRoute(routeCollectionBuilder, name, template, defaults, constraints: null);
+        }
+
+        public static IRouteBuilder MapWebApiRoute(
+            this IRouteBuilder routeCollectionBuilder,
+            string name,
+            string template,
+            object defaults,
+            object constraints)
+        {
+            return MapWebApiRoute(routeCollectionBuilder, name, template, defaults, constraints, dataTokens: null);
+        }
+
+        public static IRouteBuilder MapWebApiRoute(
+            this IRouteBuilder routeCollectionBuilder,
+            string name,
+            string template,
+            object defaults,
+            object constraints,
+            object dataTokens)
+        {
+            var mutableDefaults = ObjectToDictionary(defaults);
+            mutableDefaults.Add("area", WebApiCompatShimOptionsSetup.DefaultAreaName);
+
+            var mutableConstraints = ObjectToDictionary(constraints);
+            mutableConstraints.Add("area", new RequiredRouteConstraint());
+
+            return routeCollectionBuilder.MapRoute(name, template, mutableDefaults, mutableConstraints, dataTokens);
+        }
+
+        private static IDictionary<string, object> ObjectToDictionary(object value)
+        {
+            var dictionary = value as IDictionary<string, object>;
+            if (dictionary != null)
+            {
+                return new RouteValueDictionary(dictionary);
+            }
+            else
+            {
+                return new RouteValueDictionary(value);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/WebApiCompatShimMvcBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/WebApiCompatShimMvcBuilderExtensions.cs
new file mode 100644
index 0000000000..1fa6a5fd02
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/WebApiCompatShimMvcBuilderExtensions.cs
@@ -0,0 +1,26 @@
+// 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.
+
+using System.Net.Http.Formatting;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.WebApiCompatShim;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public static class WebApiCompatShimMvcBuilderExtensions
+    {
+        public static IMvcBuilder AddWebApiConventions(this IMvcBuilder builder)
+        {
+            builder.Services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IConfigureOptions<MvcOptions>, WebApiCompatShimOptionsSetup>());
+            builder.Services.TryAddEnumerable(
+                ServiceDescriptor.Transient<IConfigureOptions<WebApiCompatShimOptions>, WebApiCompatShimOptionsSetup>());
+
+            builder.Services.TryAddSingleton<IContentNegotiator, DefaultContentNegotiator>();
+
+            return builder;
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/WebApiCompatShimOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/WebApiCompatShimOptions.cs
new file mode 100644
index 0000000000..c18b8a2be5
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/WebApiCompatShimOptions.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using System.Linq;
+using System.Net.Http.Formatting;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    public class WebApiCompatShimOptions
+    {
+        public WebApiCompatShimOptions()
+        {
+            // Start with an empty collection, our options setup will add the default formatters.
+            Formatters = new MediaTypeFormatterCollection(Enumerable.Empty<MediaTypeFormatter>());
+        }
+
+        public MediaTypeFormatterCollection Formatters { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/WebApiCompatShimOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/WebApiCompatShimOptionsSetup.cs
new file mode 100644
index 0000000000..1cd98c2ad7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/WebApiCompatShimOptionsSetup.cs
@@ -0,0 +1,46 @@
+// 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.
+
+using System.Net.Http;
+using System.Net.Http.Formatting;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    public class WebApiCompatShimOptionsSetup
+        : IConfigureOptions<MvcOptions>, IConfigureOptions<WebApiCompatShimOptions>
+    {
+        public static readonly string DefaultAreaName = "api";
+
+        public string Name { get; set; }
+
+        public void Configure(MvcOptions options)
+        {
+            // Add webapi behaviors to controllers with the appropriate attributes
+            options.Conventions.Add(new WebApiActionConventionsApplicationModelConvention());
+            options.Conventions.Add(new WebApiParameterConventionsApplicationModelConvention());
+            options.Conventions.Add(new WebApiOverloadingApplicationModelConvention());
+            options.Conventions.Add(new WebApiRoutesApplicationModelConvention(area: DefaultAreaName));
+
+            // Add an action filter for handling the HttpResponseException.
+            options.Filters.Add(new HttpResponseExceptionActionFilter());
+
+            // Add a model binder to be able to bind HttpRequestMessage
+            options.ModelBinderProviders.Insert(0, new HttpRequestMessageModelBinderProvider());
+
+            // Add a formatter to write out an HttpResponseMessage to the response
+            options.OutputFormatters.Insert(0, new HttpResponseMessageOutputFormatter());
+
+            options.ModelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider(typeof(HttpRequestMessage)));
+            options.ModelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider(typeof(HttpResponseMessage)));
+        }
+
+        public void Configure(WebApiCompatShimOptions options)
+        {
+            // Add the default formatters
+            options.Formatters.AddRange(new MediaTypeFormatterCollection());
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/baseline.netcore.json
new file mode 100644
index 0000000000..cd830febca
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/baseline.netcore.json
@@ -0,0 +1,3166 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc.WebApiCompatShim, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "System.Net.Http.HttpRequestMessageExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CreateErrorResponse",
+          "Parameters": [
+            {
+              "Name": "request",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            },
+            {
+              "Name": "statusCode",
+              "Type": "System.Net.HttpStatusCode"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Net.Http.HttpResponseMessage",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateErrorResponse",
+          "Parameters": [
+            {
+              "Name": "request",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            },
+            {
+              "Name": "statusCode",
+              "Type": "System.Net.HttpStatusCode"
+            },
+            {
+              "Name": "message",
+              "Type": "System.String"
+            },
+            {
+              "Name": "exception",
+              "Type": "System.Exception"
+            }
+          ],
+          "ReturnType": "System.Net.Http.HttpResponseMessage",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateErrorResponse",
+          "Parameters": [
+            {
+              "Name": "request",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            },
+            {
+              "Name": "statusCode",
+              "Type": "System.Net.HttpStatusCode"
+            },
+            {
+              "Name": "exception",
+              "Type": "System.Exception"
+            }
+          ],
+          "ReturnType": "System.Net.Http.HttpResponseMessage",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateErrorResponse",
+          "Parameters": [
+            {
+              "Name": "request",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            },
+            {
+              "Name": "statusCode",
+              "Type": "System.Net.HttpStatusCode"
+            },
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "ReturnType": "System.Net.Http.HttpResponseMessage",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateErrorResponse",
+          "Parameters": [
+            {
+              "Name": "request",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            },
+            {
+              "Name": "statusCode",
+              "Type": "System.Net.HttpStatusCode"
+            },
+            {
+              "Name": "error",
+              "Type": "System.Web.Http.HttpError"
+            }
+          ],
+          "ReturnType": "System.Net.Http.HttpResponseMessage",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateResponse<T0>",
+          "Parameters": [
+            {
+              "Name": "request",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            },
+            {
+              "Name": "value",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Net.Http.HttpResponseMessage",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateResponse<T0>",
+          "Parameters": [
+            {
+              "Name": "request",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            },
+            {
+              "Name": "statusCode",
+              "Type": "System.Net.HttpStatusCode"
+            },
+            {
+              "Name": "value",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Net.Http.HttpResponseMessage",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateResponse<T0>",
+          "Parameters": [
+            {
+              "Name": "request",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            },
+            {
+              "Name": "statusCode",
+              "Type": "System.Net.HttpStatusCode"
+            },
+            {
+              "Name": "value",
+              "Type": "T0"
+            },
+            {
+              "Name": "formatters",
+              "Type": "System.Collections.Generic.IEnumerable<System.Net.Http.Formatting.MediaTypeFormatter>"
+            }
+          ],
+          "ReturnType": "System.Net.Http.HttpResponseMessage",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateResponse<T0>",
+          "Parameters": [
+            {
+              "Name": "request",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            },
+            {
+              "Name": "statusCode",
+              "Type": "System.Net.HttpStatusCode"
+            },
+            {
+              "Name": "value",
+              "Type": "T0"
+            },
+            {
+              "Name": "mediaType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Net.Http.HttpResponseMessage",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateResponse<T0>",
+          "Parameters": [
+            {
+              "Name": "request",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            },
+            {
+              "Name": "statusCode",
+              "Type": "System.Net.HttpStatusCode"
+            },
+            {
+              "Name": "value",
+              "Type": "T0"
+            },
+            {
+              "Name": "mediaType",
+              "Type": "System.Net.Http.Headers.MediaTypeHeaderValue"
+            }
+          ],
+          "ReturnType": "System.Net.Http.HttpResponseMessage",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateResponse<T0>",
+          "Parameters": [
+            {
+              "Name": "request",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            },
+            {
+              "Name": "statusCode",
+              "Type": "System.Net.HttpStatusCode"
+            },
+            {
+              "Name": "value",
+              "Type": "T0"
+            },
+            {
+              "Name": "formatter",
+              "Type": "System.Net.Http.Formatting.MediaTypeFormatter"
+            }
+          ],
+          "ReturnType": "System.Net.Http.HttpResponseMessage",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateResponse<T0>",
+          "Parameters": [
+            {
+              "Name": "request",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            },
+            {
+              "Name": "statusCode",
+              "Type": "System.Net.HttpStatusCode"
+            },
+            {
+              "Name": "value",
+              "Type": "T0"
+            },
+            {
+              "Name": "formatter",
+              "Type": "System.Net.Http.Formatting.MediaTypeFormatter"
+            },
+            {
+              "Name": "mediaType",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Net.Http.HttpResponseMessage",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreateResponse<T0>",
+          "Parameters": [
+            {
+              "Name": "request",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            },
+            {
+              "Name": "statusCode",
+              "Type": "System.Net.HttpStatusCode"
+            },
+            {
+              "Name": "value",
+              "Type": "T0"
+            },
+            {
+              "Name": "formatter",
+              "Type": "System.Net.Http.Formatting.MediaTypeFormatter"
+            },
+            {
+              "Name": "mediaType",
+              "Type": "System.Net.Http.Headers.MediaTypeHeaderValue"
+            }
+          ],
+          "ReturnType": "System.Net.Http.HttpResponseMessage",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "System.Web.Http.ApiController",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "ImplementedInterfaces": [
+        "System.IDisposable"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ActionContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ActionContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ControllerContext",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ControllerContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ControllerContext",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ControllerContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Context",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Http.HttpContext",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MetadataProvider",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MetadataProvider",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ObjectValidator",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ObjectValidator",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelState",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Request",
+          "Parameters": [],
+          "ReturnType": "System.Net.Http.HttpRequestMessage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Request",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Url",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.IUrlHelper",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Url",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "Microsoft.AspNetCore.Mvc.IUrlHelper"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_User",
+          "Parameters": [],
+          "ReturnType": "System.Security.Principal.IPrincipal",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BadRequest",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.BadRequestResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BadRequest",
+          "Parameters": [
+            {
+              "Name": "message",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Web.Http.BadRequestErrorMessageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "BadRequest",
+          "Parameters": [
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            }
+          ],
+          "ReturnType": "System.Web.Http.InvalidModelStateResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Conflict",
+          "Parameters": [],
+          "ReturnType": "System.Web.Http.ConflictResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Content<T0>",
+          "Parameters": [
+            {
+              "Name": "statusCode",
+              "Type": "System.Net.HttpStatusCode"
+            },
+            {
+              "Name": "value",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Web.Http.NegotiatedContentResult<T0>",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "Created",
+          "Parameters": [
+            {
+              "Name": "location",
+              "Type": "System.String"
+            },
+            {
+              "Name": "content",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.CreatedResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Created",
+          "Parameters": [
+            {
+              "Name": "uri",
+              "Type": "System.Uri"
+            },
+            {
+              "Name": "content",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.CreatedResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "CreatedAtRoute",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "content",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.CreatedAtRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "InternalServerError",
+          "Parameters": [],
+          "ReturnType": "System.Web.Http.InternalServerErrorResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "InternalServerError",
+          "Parameters": [
+            {
+              "Name": "exception",
+              "Type": "System.Exception"
+            }
+          ],
+          "ReturnType": "System.Web.Http.ExceptionResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Json<T0>",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.JsonResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "Json<T0>",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "T0"
+            },
+            {
+              "Name": "serializerSettings",
+              "Type": "Newtonsoft.Json.JsonSerializerSettings"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.JsonResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "Json<T0>",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "T0"
+            },
+            {
+              "Name": "serializerSettings",
+              "Type": "Newtonsoft.Json.JsonSerializerSettings"
+            },
+            {
+              "Name": "encoding",
+              "Type": "System.Text.Encoding"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.JsonResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "NotFound",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.NotFoundResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Ok",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.OkResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Ok<T0>",
+          "Parameters": [
+            {
+              "Name": "content",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.OkObjectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "T",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "Redirect",
+          "Parameters": [
+            {
+              "Name": "location",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Redirect",
+          "Parameters": [
+            {
+              "Name": "location",
+              "Type": "System.Uri"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "RedirectToRoute",
+          "Parameters": [
+            {
+              "Name": "routeName",
+              "Type": "System.String"
+            },
+            {
+              "Name": "routeValues",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.RedirectToRouteResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ResponseMessage",
+          "Parameters": [
+            {
+              "Name": "response",
+              "Type": "System.Net.Http.HttpResponseMessage"
+            }
+          ],
+          "ReturnType": "System.Web.Http.ResponseMessageResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "StatusCode",
+          "Parameters": [
+            {
+              "Name": "status",
+              "Type": "System.Net.HttpStatusCode"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.StatusCodeResult",
+          "Virtual": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.IDisposable",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Validate<T0>",
+          "Parameters": [
+            {
+              "Name": "entity",
+              "Type": "T0"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TEntity",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "Validate<T0>",
+          "Parameters": [
+            {
+              "Name": "entity",
+              "Type": "T0"
+            },
+            {
+              "Name": "keyPrefix",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TEntity",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Method",
+          "Name": "Dispose",
+          "Parameters": [
+            {
+              "Name": "disposing",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Protected",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "System.Web.Http.BadRequestErrorMessageResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ObjectResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Message",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "message",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "System.Web.Http.ConflictResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.StatusCodeResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "System.Web.Http.ExceptionResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ObjectResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Exception",
+          "Parameters": [],
+          "ReturnType": "System.Exception",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IncludeErrorDetail",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "exception",
+              "Type": "System.Exception"
+            },
+            {
+              "Name": "includeErrorDetail",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "System.Web.Http.HttpError",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Sealed": true,
+      "BaseType": "System.Collections.Generic.Dictionary<System.String, System.Object>",
+      "ImplementedInterfaces": [
+        "System.Xml.Serialization.IXmlSerializable"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Message",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Message",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelState",
+          "Parameters": [],
+          "ReturnType": "System.Web.Http.HttpError",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MessageDetail",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MessageDetail",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ExceptionMessage",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ExceptionMessage",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ExceptionType",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_ExceptionType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_StackTrace",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_StackTrace",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_InnerException",
+          "Parameters": [],
+          "ReturnType": "System.Web.Http.HttpError",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetPropertyValue<T0>",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "T0",
+          "Visibility": "Public",
+          "GenericParameter": [
+            {
+              "ParameterName": "TValue",
+              "ParameterPosition": 0,
+              "BaseTypeOrInterfaces": []
+            }
+          ]
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "message",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "exception",
+              "Type": "System.Exception"
+            },
+            {
+              "Name": "includeErrorDetail",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            },
+            {
+              "Name": "includeErrorDetail",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "System.Web.Http.HttpErrorKeys",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "MessageKey",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "MessageDetailKey",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "ModelStateKey",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "ExceptionMessageKey",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "ExceptionTypeKey",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "StackTraceKey",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "InnerExceptionKey",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "MessageLanguageKey",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "ErrorCodeKey",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "System.Web.Http.HttpResponseException",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Exception",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Response",
+          "Parameters": [],
+          "ReturnType": "System.Net.Http.HttpResponseMessage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "statusCode",
+              "Type": "System.Net.HttpStatusCode"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "response",
+              "Type": "System.Net.Http.HttpResponseMessage"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "System.Web.Http.InternalServerErrorResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.StatusCodeResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "System.Web.Http.InvalidModelStateResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ObjectResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_ModelState",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IncludeErrorDetail",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "modelState",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary"
+            },
+            {
+              "Name": "includeErrorDetail",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "System.Web.Http.NegotiatedContentResult<T0>",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ObjectResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "ExecuteResultAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Virtual": true,
+          "Override": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.IActionResult",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Content",
+          "Parameters": [],
+          "ReturnType": "T0",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "statusCode",
+              "Type": "System.Net.HttpStatusCode"
+            },
+            {
+              "Name": "content",
+              "Type": "T0"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": [
+        {
+          "ParameterName": "T",
+          "ParameterPosition": 0,
+          "BaseTypeOrInterfaces": []
+        }
+      ]
+    },
+    {
+      "Name": "System.Web.Http.FromUriAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IOptionalBinderMetadata",
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceMetadata",
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelNameProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_BindingSource",
+          "Parameters": [],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IBindingSourceMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_IsOptional",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IOptionalBinderMetadata",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_IsOptional",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Boolean"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelNameProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "System.Web.Http.ResponseMessageResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "Microsoft.AspNetCore.Mvc.ObjectResult",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Response",
+          "Parameters": [],
+          "ReturnType": "System.Net.Http.HttpResponseMessage",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "response",
+              "Type": "System.Net.Http.HttpResponseMessage"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Builder.WebApiCompatShimRouteBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "MapWebApiRoute",
+          "Parameters": [
+            {
+              "Name": "routeCollectionBuilder",
+              "Type": "Microsoft.AspNetCore.Routing.IRouteBuilder"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "template",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Routing.IRouteBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MapWebApiRoute",
+          "Parameters": [
+            {
+              "Name": "routeCollectionBuilder",
+              "Type": "Microsoft.AspNetCore.Routing.IRouteBuilder"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "template",
+              "Type": "System.String"
+            },
+            {
+              "Name": "defaults",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Routing.IRouteBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MapWebApiRoute",
+          "Parameters": [
+            {
+              "Name": "routeCollectionBuilder",
+              "Type": "Microsoft.AspNetCore.Routing.IRouteBuilder"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "template",
+              "Type": "System.String"
+            },
+            {
+              "Name": "defaults",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "constraints",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Routing.IRouteBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MapWebApiRoute",
+          "Parameters": [
+            {
+              "Name": "routeCollectionBuilder",
+              "Type": "Microsoft.AspNetCore.Routing.IRouteBuilder"
+            },
+            {
+              "Name": "name",
+              "Type": "System.String"
+            },
+            {
+              "Name": "template",
+              "Type": "System.String"
+            },
+            {
+              "Name": "defaults",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "constraints",
+              "Type": "System.Object"
+            },
+            {
+              "Name": "dataTokens",
+              "Type": "System.Object"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Routing.IRouteBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.ModelBinding.IOptionalBinderMetadata",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_IsOptional",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.IUseWebApiActionConventions",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.IUseWebApiOverloading",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.IUseWebApiParameterConventions",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.IUseWebApiRoutes",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.UseWebApiActionConventionsAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.WebApiCompatShim.IUseWebApiActionConventions"
+      ],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.UseWebApiOverloadingAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.WebApiCompatShim.IUseWebApiOverloading"
+      ],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.UseWebApiParameterConventionsAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.WebApiCompatShim.IUseWebApiParameterConventions"
+      ],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.UseWebApiRoutesAttribute",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "BaseType": "System.Attribute",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.WebApiCompatShim.IUseWebApiRoutes"
+      ],
+      "Members": [
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.WebApiActionConventionsApplicationModelConvention",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.IControllerModelConvention"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Apply",
+          "Parameters": [
+            {
+              "Name": "controller",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ControllerModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IControllerModelConvention",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.WebApiOverloadingApplicationModelConvention",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.IActionModelConvention"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Apply",
+          "Parameters": [
+            {
+              "Name": "action",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IActionModelConvention",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.WebApiParameterConventionsApplicationModelConvention",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.IActionModelConvention"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Apply",
+          "Parameters": [
+            {
+              "Name": "action",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IActionModelConvention",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.WebApiRoutesApplicationModelConvention",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ApplicationModels.IControllerModelConvention"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Apply",
+          "Parameters": [
+            {
+              "Name": "controller",
+              "Type": "Microsoft.AspNetCore.Mvc.ApplicationModels.ControllerModel"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ApplicationModels.IControllerModelConvention",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "area",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.HttpResponseMessageOutputFormatter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "CanWriteResult",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterCanWriteContext"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "WriteAsync",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.FormDataCollectionExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "NormalizeJQueryToMvc",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Static": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetJQueryNameValuePairs",
+          "Parameters": [
+            {
+              "Name": "formData",
+              "Type": "System.Net.Http.Formatting.FormDataCollection"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String, System.String>>",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.HttpRequestMessageFeature",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.WebApiCompatShim.IHttpRequestMessageFeature"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_HttpRequestMessage",
+          "Parameters": [],
+          "ReturnType": "System.Net.Http.HttpRequestMessage",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.IHttpRequestMessageFeature",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HttpRequestMessage",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.IHttpRequestMessageFeature",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "httpContext",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.HttpRequestMessageHttpContextExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetHttpRequestMessage",
+          "Parameters": [
+            {
+              "Name": "httpContext",
+              "Type": "Microsoft.AspNetCore.Http.HttpContext"
+            }
+          ],
+          "ReturnType": "System.Net.Http.HttpRequestMessage",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.HttpRequestMessageModelBinder",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "BindModelAsync",
+          "Parameters": [
+            {
+              "Name": "bindingContext",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext"
+            }
+          ],
+          "ReturnType": "System.Threading.Tasks.Task",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.HttpRequestMessageModelBinderProvider",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "GetBinder",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ModelBinding.ModelBinderProviderContext"
+            }
+          ],
+          "ReturnType": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.IHttpRequestMessageFeature",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_HttpRequestMessage",
+          "Parameters": [],
+          "ReturnType": "System.Net.Http.HttpRequestMessage",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_HttpRequestMessage",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.HttpResponseExceptionActionFilter",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.Filters.IActionFilter",
+        "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Order",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Int32"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnActionExecuting",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IActionFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "OnActionExecuted",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.Filters.IActionFilter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.OverloadActionConstraint",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraint"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Order",
+          "Parameters": [],
+          "ReturnType": "System.Int32",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraint",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Accept",
+          "Parameters": [
+            {
+              "Name": "context",
+              "Type": "Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintContext"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraint",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.WebApiCompatShimOptions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Formatters",
+          "Parameters": [],
+          "ReturnType": "System.Net.Http.Formatting.MediaTypeFormatterCollection",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Formatters",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Net.Http.Formatting.MediaTypeFormatterCollection"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.WebApiCompatShimOptionsSetup",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "Microsoft.Extensions.Options.IConfigureOptions<Microsoft.AspNetCore.Mvc.MvcOptions>",
+        "Microsoft.Extensions.Options.IConfigureOptions<Microsoft.AspNetCore.Mvc.WebApiCompatShim.WebApiCompatShimOptions>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Name",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Name",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Configure",
+          "Parameters": [
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Mvc.MvcOptions"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.Extensions.Options.IConfigureOptions<Microsoft.AspNetCore.Mvc.MvcOptions>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Configure",
+          "Parameters": [
+            {
+              "Name": "options",
+              "Type": "Microsoft.AspNetCore.Mvc.WebApiCompatShim.WebApiCompatShimOptions"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "Microsoft.Extensions.Options.IConfigureOptions<Microsoft.AspNetCore.Mvc.WebApiCompatShim.WebApiCompatShimOptions>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Field",
+          "Name": "DefaultAreaName",
+          "Parameters": [],
+          "ReturnType": "System.String",
+          "Static": true,
+          "ReadOnly": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.WebApiCompatShimMvcBuilderExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddWebApiConventions",
+          "Parameters": [
+            {
+              "Name": "builder",
+              "Type": "Microsoft.Extensions.DependencyInjection.IMvcBuilder"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "System.Net.Http.Formatting.ContentNegotiationResult",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Formatter",
+          "Parameters": [],
+          "ReturnType": "System.Net.Http.Formatting.MediaTypeFormatter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_Formatter",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Net.Http.Formatting.MediaTypeFormatter"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MediaType",
+          "Parameters": [],
+          "ReturnType": "System.Net.Http.Headers.MediaTypeHeaderValue",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "set_MediaType",
+          "Parameters": [
+            {
+              "Name": "value",
+              "Type": "System.Net.Http.Headers.MediaTypeHeaderValue"
+            }
+          ],
+          "ReturnType": "System.Void",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "formatter",
+              "Type": "System.Net.Http.Formatting.MediaTypeFormatter"
+            },
+            {
+              "Name": "mediaType",
+              "Type": "System.Net.Http.Headers.MediaTypeHeaderValue"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "System.Net.Http.Formatting.DefaultContentNegotiator",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "System.Net.Http.Formatting.IContentNegotiator"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_ExcludeMatchOnTypeOnly",
+          "Parameters": [],
+          "ReturnType": "System.Boolean",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Negotiate",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "request",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            },
+            {
+              "Name": "formatters",
+              "Type": "System.Collections.Generic.IEnumerable<System.Net.Http.Formatting.MediaTypeFormatter>"
+            }
+          ],
+          "ReturnType": "System.Net.Http.Formatting.ContentNegotiationResult",
+          "Virtual": true,
+          "ImplementedInterface": "System.Net.Http.Formatting.IContentNegotiator",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ComputeFormatterMatches",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "request",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            },
+            {
+              "Name": "formatters",
+              "Type": "System.Collections.Generic.IEnumerable<System.Net.Http.Formatting.MediaTypeFormatter>"
+            }
+          ],
+          "ReturnType": "System.Collections.ObjectModel.Collection<System.Net.Http.Formatting.MediaTypeFormatterMatch>",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SelectResponseMediaTypeFormatter",
+          "Parameters": [
+            {
+              "Name": "matches",
+              "Type": "System.Collections.Generic.ICollection<System.Net.Http.Formatting.MediaTypeFormatterMatch>"
+            }
+          ],
+          "ReturnType": "System.Net.Http.Formatting.MediaTypeFormatterMatch",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SelectResponseCharacterEncoding",
+          "Parameters": [
+            {
+              "Name": "request",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            },
+            {
+              "Name": "formatter",
+              "Type": "System.Net.Http.Formatting.MediaTypeFormatter"
+            }
+          ],
+          "ReturnType": "System.Text.Encoding",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MatchMediaTypeMapping",
+          "Parameters": [
+            {
+              "Name": "request",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            },
+            {
+              "Name": "formatter",
+              "Type": "System.Net.Http.Formatting.MediaTypeFormatter"
+            }
+          ],
+          "ReturnType": "System.Net.Http.Formatting.MediaTypeFormatterMatch",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MatchAcceptHeader",
+          "Parameters": [
+            {
+              "Name": "sortedAcceptValues",
+              "Type": "System.Collections.Generic.IEnumerable<System.Net.Http.Headers.MediaTypeWithQualityHeaderValue>"
+            },
+            {
+              "Name": "formatter",
+              "Type": "System.Net.Http.Formatting.MediaTypeFormatter"
+            }
+          ],
+          "ReturnType": "System.Net.Http.Formatting.MediaTypeFormatterMatch",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MatchRequestMediaType",
+          "Parameters": [
+            {
+              "Name": "request",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            },
+            {
+              "Name": "formatter",
+              "Type": "System.Net.Http.Formatting.MediaTypeFormatter"
+            }
+          ],
+          "ReturnType": "System.Net.Http.Formatting.MediaTypeFormatterMatch",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ShouldMatchOnType",
+          "Parameters": [
+            {
+              "Name": "sortedAcceptValues",
+              "Type": "System.Collections.Generic.IEnumerable<System.Net.Http.Headers.MediaTypeWithQualityHeaderValue>"
+            }
+          ],
+          "ReturnType": "System.Boolean",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "MatchType",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "formatter",
+              "Type": "System.Net.Http.Formatting.MediaTypeFormatter"
+            }
+          ],
+          "ReturnType": "System.Net.Http.Formatting.MediaTypeFormatterMatch",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SortMediaTypeWithQualityHeaderValuesByQFactor",
+          "Parameters": [
+            {
+              "Name": "headerValues",
+              "Type": "System.Collections.Generic.ICollection<System.Net.Http.Headers.MediaTypeWithQualityHeaderValue>"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.Net.Http.Headers.MediaTypeWithQualityHeaderValue>",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "SortStringWithQualityHeaderValuesByQFactor",
+          "Parameters": [
+            {
+              "Name": "headerValues",
+              "Type": "System.Collections.Generic.ICollection<System.Net.Http.Headers.StringWithQualityHeaderValue>"
+            }
+          ],
+          "ReturnType": "System.Collections.Generic.IEnumerable<System.Net.Http.Headers.StringWithQualityHeaderValue>",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "UpdateBestMatch",
+          "Parameters": [
+            {
+              "Name": "current",
+              "Type": "System.Net.Http.Formatting.MediaTypeFormatterMatch"
+            },
+            {
+              "Name": "potentialReplacement",
+              "Type": "System.Net.Http.Formatting.MediaTypeFormatterMatch"
+            }
+          ],
+          "ReturnType": "System.Net.Http.Formatting.MediaTypeFormatterMatch",
+          "Virtual": true,
+          "Visibility": "Protected",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "excludeMatchOnTypeOnly",
+              "Type": "System.Boolean"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "System.Net.Http.Formatting.FormDataCollection",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [
+        "System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String, System.String>>"
+      ],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Item",
+          "Parameters": [
+            {
+              "Name": "name",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "ReadAsNameValueCollection",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Specialized.NameValueCollection",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "Get",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetValues",
+          "Parameters": [
+            {
+              "Name": "key",
+              "Type": "System.String"
+            }
+          ],
+          "ReturnType": "System.String[]",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "GetEnumerator",
+          "Parameters": [],
+          "ReturnType": "System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<System.String, System.String>>",
+          "Sealed": true,
+          "Virtual": true,
+          "ImplementedInterface": "System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String, System.String>>",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "pairs",
+              "Type": "System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String, System.String>>"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "uri",
+              "Type": "System.Uri"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "query",
+              "Type": "System.String"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "System.Net.Http.Formatting.IContentNegotiator",
+      "Visibility": "Public",
+      "Kind": "Interface",
+      "Abstract": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "Negotiate",
+          "Parameters": [
+            {
+              "Name": "type",
+              "Type": "System.Type"
+            },
+            {
+              "Name": "request",
+              "Type": "System.Net.Http.HttpRequestMessage"
+            },
+            {
+              "Name": "formatters",
+              "Type": "System.Collections.Generic.IEnumerable<System.Net.Http.Formatting.MediaTypeFormatter>"
+            }
+          ],
+          "ReturnType": "System.Net.Http.Formatting.ContentNegotiationResult",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "System.Net.Http.Formatting.MediaTypeFormatterMatch",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "get_Formatter",
+          "Parameters": [],
+          "ReturnType": "System.Net.Http.Formatting.MediaTypeFormatter",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_MediaType",
+          "Parameters": [],
+          "ReturnType": "System.Net.Http.Headers.MediaTypeHeaderValue",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Quality",
+          "Parameters": [],
+          "ReturnType": "System.Double",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "get_Ranking",
+          "Parameters": [],
+          "ReturnType": "System.Net.Http.Formatting.MediaTypeFormatterMatchRanking",
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Constructor",
+          "Name": ".ctor",
+          "Parameters": [
+            {
+              "Name": "formatter",
+              "Type": "System.Net.Http.Formatting.MediaTypeFormatter"
+            },
+            {
+              "Name": "mediaType",
+              "Type": "System.Net.Http.Headers.MediaTypeHeaderValue"
+            },
+            {
+              "Name": "quality",
+              "Type": "System.Nullable<System.Double>"
+            },
+            {
+              "Name": "ranking",
+              "Type": "System.Net.Http.Formatting.MediaTypeFormatterMatchRanking"
+            }
+          ],
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    },
+    {
+      "Name": "System.Net.Http.Formatting.MediaTypeFormatterMatchRanking",
+      "Visibility": "Public",
+      "Kind": "Enumeration",
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Field",
+          "Name": "None",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "0"
+        },
+        {
+          "Kind": "Field",
+          "Name": "MatchOnCanWriteType",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "1"
+        },
+        {
+          "Kind": "Field",
+          "Name": "MatchOnRequestAcceptHeaderLiteral",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "2"
+        },
+        {
+          "Kind": "Field",
+          "Name": "MatchOnRequestAcceptHeaderSubtypeMediaRange",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "3"
+        },
+        {
+          "Kind": "Field",
+          "Name": "MatchOnRequestAcceptHeaderAllMediaRange",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "4"
+        },
+        {
+          "Kind": "Field",
+          "Name": "MatchOnRequestWithMediaTypeMapping",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "5"
+        },
+        {
+          "Kind": "Field",
+          "Name": "MatchOnRequestMediaType",
+          "Parameters": [],
+          "GenericParameter": [],
+          "Literal": "6"
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc/DesignTimeMvcServiceCollectionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc/DesignTimeMvcServiceCollectionProvider.cs
new file mode 100644
index 0000000000..63d88557fa
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc/DesignTimeMvcServiceCollectionProvider.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    internal class DesignTimeMvcServiceCollectionProvider
+    {
+        // This method invoked by RazorTooling using reflection.
+        public static void PopulateServiceCollection(IServiceCollection services, string assemblyName)
+        {
+            var assembly = Assembly.Load(new AssemblyName(assemblyName));
+
+            var partManager = new ApplicationPartManager();
+            partManager.ApplicationParts.Add(new AssemblyPart(assembly));
+
+            services.AddSingleton(partManager);
+            services.AddMvc();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj
new file mode 100644
index 0000000000..76c448b86b
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj
@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>ASP.NET Core MVC is a web framework that gives you a powerful, patterns-based way to build dynamic websites and web APIs. ASP.NET Core MVC enables a clean separation of concerns and gives you full control over markup.</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Analyzers\Microsoft.AspNetCore.Mvc.Analyzers.csproj" PrivateAssets="None" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.ApiExplorer\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Cors\Microsoft.AspNetCore.Mvc.Cors.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.DataAnnotations\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Formatters.Json\Microsoft.AspNetCore.Mvc.Formatters.Json.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Localization\Microsoft.AspNetCore.Mvc.Localization.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.RazorPages\Microsoft.AspNetCore.Mvc.RazorPages.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TagHelpers\Microsoft.AspNetCore.Mvc.TagHelpers.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.ViewFeatures\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj" />
+
+    <!-- Including these here specifically so that apps referencing the MVC package get razor compiler targets -->
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="$(MicrosoftAspNetCoreRazorDesignPackageVersion)">
+      <PrivateAssets>None</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="$(MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion)">
+      <PrivateAssets>None</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc/MvcServiceCollectionExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc/MvcServiceCollectionExtensions.cs
new file mode 100644
index 0000000000..037bcdd2d3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc/MvcServiceCollectionExtensions.cs
@@ -0,0 +1,111 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
+using Microsoft.AspNetCore.Mvc.TagHelpers;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    /// <summary>
+    /// Extension methods for setting up MVC services in an <see cref="IServiceCollection" />.
+    /// </summary>
+    public static class MvcServiceCollectionExtensions
+    {
+        /// <summary>
+        /// Adds MVC services to the specified <see cref="IServiceCollection" />.
+        /// </summary>
+        /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
+        /// <returns>An <see cref="IMvcBuilder"/> that can be used to further configure the MVC services.</returns>
+        public static IMvcBuilder AddMvc(this IServiceCollection services)
+        {
+            if (services == null)
+            {
+                throw new ArgumentNullException(nameof(services));
+            }
+
+            var builder = services.AddMvcCore();
+
+            builder.AddApiExplorer();
+            builder.AddAuthorization();
+
+            AddDefaultFrameworkParts(builder.PartManager);
+
+            // Order added affects options setup order
+
+            // Default framework order
+            builder.AddFormatterMappings();
+            builder.AddViews();
+            builder.AddRazorViewEngine();
+            builder.AddRazorPages();
+            builder.AddCacheTagHelper();
+
+            // +1 order
+            builder.AddDataAnnotations(); // +1 order
+
+            // +10 order
+            builder.AddJsonFormatters();
+
+            builder.AddCors();
+
+            return new MvcBuilder(builder.Services, builder.PartManager);
+        }
+
+        private static void AddDefaultFrameworkParts(ApplicationPartManager partManager)
+        {
+            var mvcTagHelpersAssembly = typeof(InputTagHelper).GetTypeInfo().Assembly;
+            if (!partManager.ApplicationParts.OfType<AssemblyPart>().Any(p => p.Assembly == mvcTagHelpersAssembly))
+            {
+                partManager.ApplicationParts.Add(new FrameworkAssemblyPart(mvcTagHelpersAssembly));
+            }
+
+            var mvcRazorAssembly = typeof(UrlResolutionTagHelper).GetTypeInfo().Assembly;
+            if (!partManager.ApplicationParts.OfType<AssemblyPart>().Any(p => p.Assembly == mvcRazorAssembly))
+            {
+                partManager.ApplicationParts.Add(new FrameworkAssemblyPart(mvcRazorAssembly));
+            }
+        }
+
+        /// <summary>
+        /// Adds MVC services to the specified <see cref="IServiceCollection" />.
+        /// </summary>
+        /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
+        /// <param name="setupAction">An <see cref="Action{MvcOptions}"/> to configure the provided <see cref="MvcOptions"/>.</param>
+        /// <returns>An <see cref="IMvcBuilder"/> that can be used to further configure the MVC services.</returns>
+        public static IMvcBuilder AddMvc(this IServiceCollection services, Action<MvcOptions> setupAction)
+        {
+            if (services == null)
+            {
+                throw new ArgumentNullException(nameof(services));
+            }
+
+            if (setupAction == null)
+            {
+                throw new ArgumentNullException(nameof(setupAction));
+            }
+
+            var builder = services.AddMvc();
+            builder.Services.Configure(setupAction);
+
+            return builder;
+        }
+
+        [DebuggerDisplay("{Name}")]
+        private class FrameworkAssemblyPart : AssemblyPart, ICompilationReferencesProvider
+        {
+            public FrameworkAssemblyPart(Assembly assembly)
+                : base(assembly)
+            {
+            }
+
+            IEnumerable<string> ICompilationReferencesProvider.GetReferencePaths() => Enumerable.Empty<string>();
+        }
+    }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..b67eceacc6
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// 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.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc/baseline.netcore.json
new file mode 100644
index 0000000000..50cfc70d58
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc/baseline.netcore.json
@@ -0,0 +1,51 @@
+{
+  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
+  "Types": [
+    {
+      "Name": "Microsoft.Extensions.DependencyInjection.MvcServiceCollectionExtensions",
+      "Visibility": "Public",
+      "Kind": "Class",
+      "Abstract": true,
+      "Static": true,
+      "Sealed": true,
+      "ImplementedInterfaces": [],
+      "Members": [
+        {
+          "Kind": "Method",
+          "Name": "AddMvc",
+          "Parameters": [
+            {
+              "Name": "services",
+              "Type": "Microsoft.Extensions.DependencyInjection.IServiceCollection"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        },
+        {
+          "Kind": "Method",
+          "Name": "AddMvc",
+          "Parameters": [
+            {
+              "Name": "services",
+              "Type": "Microsoft.Extensions.DependencyInjection.IServiceCollection"
+            },
+            {
+              "Name": "setupAction",
+              "Type": "System.Action<Microsoft.AspNetCore.Mvc.MvcOptions>"
+            }
+          ],
+          "ReturnType": "Microsoft.Extensions.DependencyInjection.IMvcBuilder",
+          "Static": true,
+          "Extension": true,
+          "Visibility": "Public",
+          "GenericParameter": []
+        }
+      ],
+      "GenericParameters": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Directory.Build.props b/src/Mvc/test/Directory.Build.props
new file mode 100644
index 0000000000..ece617ffe1
--- /dev/null
+++ b/src/Mvc/test/Directory.Build.props
@@ -0,0 +1,25 @@
+<Project>
+  <Import Project="..\Directory.Build.props" />
+
+  <PropertyGroup>
+    <DeveloperBuildTestTfms>netcoreapp2.1</DeveloperBuildTestTfms>
+    <StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
+    <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' ">netcoreapp2.1</StandardTestTfms>
+    <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestTfms);net461</StandardTestTfms>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <IsPackable>false</IsPackable>
+    <WarningsNotAsErrors>xUnit1026:$(WarningsNotAsErrors)</WarningsNotAsErrors>
+    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)MvcTests.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
+    <PackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Filters/FilterContextTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Filters/FilterContextTest.cs
new file mode 100644
index 0000000000..0902e7f179
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Filters/FilterContextTest.cs
@@ -0,0 +1,131 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Routing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    public class FilterContextTest
+    {
+        [Fact]
+        public void IsEffectivePolicy_FindsAnotherFilter_ReturnsFalse()
+        {
+            // Arrange
+            var filters = new IFilterMetadata[]
+            {
+                Mock.Of<ITestFilterPolicy>(),
+                Mock.Of<IAnotherTestFilterPolicy>(),
+                Mock.Of<ITestFilterPolicy>(),
+            };
+
+            var context = new TestFilterContext(filters);
+
+            // Act
+            var result = context.IsEffectivePolicy((ITestFilterPolicy)filters.First());
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsEffectivePolicy_FindsFilterOfInterest_ReturnsTrue()
+        {
+            // Arrange
+            var filters = new IFilterMetadata[]
+            {
+                Mock.Of<ITestFilterPolicy>(),
+                Mock.Of<IAnotherTestFilterPolicy>(),
+                Mock.Of<ITestFilterPolicy>(),
+            };
+
+            var context = new TestFilterContext(filters);
+
+            // Act
+            var result = context.IsEffectivePolicy((ITestFilterPolicy)filters.Last());
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void IsEffectivePolicy_NoMatch_ReturnsFalse()
+        {
+            // Arrange
+            var filters = new IFilterMetadata[]
+            {
+                Mock.Of<ITestFilterPolicy>(),
+                Mock.Of<ITestFilterPolicy>(),
+            };
+
+            var context = new TestFilterContext(filters);
+
+            // Act
+            var result = context.IsEffectivePolicy(Mock.Of<IAnotherTestFilterPolicy>());
+
+            // Assert
+            Assert.False(result);
+        }
+
+
+        [Fact]
+        public void FindEffectivePolicy_FindsLastFilter_ReturnsIt()
+        {
+            // Arrange
+            var filters = new IFilterMetadata[]
+            {
+                Mock.Of<ITestFilterPolicy>(),
+                Mock.Of<IAnotherTestFilterPolicy>(),
+                Mock.Of<ITestFilterPolicy>(),
+            };
+
+            var context = new TestFilterContext(filters);
+
+            // Act
+            var result = context.FindEffectivePolicy<ITestFilterPolicy>();
+
+            // Assert
+            Assert.Same(filters.Last(), result);
+        }
+
+        [Fact]
+        public void FindEffectivePolicy_NoMatch_ReturnsNull()
+        {
+            // Arrange
+            var filters = new IFilterMetadata[]
+            {
+                Mock.Of<ITestFilterPolicy>(),
+                Mock.Of<ITestFilterPolicy>(),
+            };
+
+            var context = new TestFilterContext(filters);
+
+            // Act
+            var result = context.FindEffectivePolicy<IAnotherTestFilterPolicy>();
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        internal class ITestFilterPolicy : IFilterMetadata
+        {
+        }
+
+        internal class IAnotherTestFilterPolicy : IFilterMetadata
+        {
+        }
+
+        private class TestFilterContext : FilterContext
+        {
+            public TestFilterContext(IList<IFilterMetadata> filters) 
+                : base(new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor()), filters)
+            {
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj
new file mode 100644
index 0000000000..1ca6c1dee7
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/BindingInfoTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/BindingInfoTest.cs
new file mode 100644
index 0000000000..cdd8d4570f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/BindingInfoTest.cs
@@ -0,0 +1,196 @@
+// 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.
+
+using System;
+using System.Linq;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class BindingInfoTest
+    {
+        [Fact]
+        public void GetBindingInfo_WithAttributes_ConstructsBindingInfo()
+        {
+            // Arrange
+            var attributes = new object[]
+            {
+                new FromQueryAttribute { Name = "Test" },
+            };
+
+            // Act
+            var bindingInfo = BindingInfo.GetBindingInfo(attributes);
+
+            // Assert
+            Assert.NotNull(bindingInfo);
+            Assert.Same("Test", bindingInfo.BinderModelName);
+            Assert.Same(BindingSource.Query, bindingInfo.BindingSource);
+        }
+
+        [Fact]
+        public void GetBindingInfo_ReadsPropertyPredicateProvider()
+        {
+            // Arrange
+            var bindAttribute = new BindAttribute(include: "SomeProperty");
+            var attributes = new object[]
+            {
+                bindAttribute,
+            };
+
+            // Act
+            var bindingInfo = BindingInfo.GetBindingInfo(attributes);
+
+            // Assert
+            Assert.NotNull(bindingInfo);
+            Assert.Same(bindAttribute, bindingInfo.PropertyFilterProvider);
+        }
+
+        [Fact]
+        public void GetBindingInfo_ReadsRequestPredicateProvider()
+        {
+            // Arrange
+            var attributes = new object[]
+            {
+                new BindPropertyAttribute { Name = "PropertyPrefix", SupportsGet = true, },
+            };
+
+            // Act
+            var bindingInfo = BindingInfo.GetBindingInfo(attributes);
+
+            // Assert
+            Assert.NotNull(bindingInfo);
+            Assert.Same("PropertyPrefix", bindingInfo.BinderModelName);
+            Assert.NotNull(bindingInfo.RequestPredicate);
+        }
+
+        [Fact]
+        public void GetBindingInfo_ReturnsNull_IfNoBindingAttributesArePresent()
+        {
+            // Arrange
+            var attributes = new object[] { new ControllerAttribute(), new BindNeverAttribute(), };
+
+            // Act
+            var bindingInfo = BindingInfo.GetBindingInfo(attributes);
+
+            // Assert
+            Assert.Null(bindingInfo);
+        }
+
+        [Fact]
+        public void GetBindingInfo_WithAttributesAndModelMetadata_UsesValuesFromBindingInfo_IfAttributesPresent()
+        {
+            // Arrange
+            var attributes = new object[]
+            {
+                new ModelBinderAttribute { BinderType = typeof(object), Name = "Test" },
+            };
+            var modelType = typeof(Guid);
+            var provider = new TestModelMetadataProvider();
+            provider.ForType(modelType).BindingDetails(metadata =>
+            {
+                metadata.BindingSource = BindingSource.Special;
+                metadata.BinderType = typeof(string);
+                metadata.BinderModelName = "Different";
+            });
+            var modelMetadata = provider.GetMetadataForType(modelType);
+
+            // Act
+            var bindingInfo = BindingInfo.GetBindingInfo(attributes, modelMetadata);
+
+            // Assert
+            Assert.NotNull(bindingInfo);
+            Assert.Same(typeof(object), bindingInfo.BinderType);
+            Assert.Same("Test", bindingInfo.BinderModelName);
+        }
+
+        [Fact]
+        public void GetBindingInfo_WithAttributesAndModelMetadata_UsesBinderNameFromModelMetadata_WhenNotFoundViaAttributes()
+        {
+            // Arrange
+            var attributes = new object[] { new ModelBinderAttribute(typeof(object)), new ControllerAttribute(), new BindNeverAttribute(), };
+            var modelType = typeof(Guid);
+            var provider = new TestModelMetadataProvider();
+            provider.ForType(modelType).BindingDetails(metadata =>
+            {
+                metadata.BindingSource = BindingSource.Special;
+                metadata.BinderType = typeof(string);
+                metadata.BinderModelName = "Different";
+            });
+            var modelMetadata = provider.GetMetadataForType(modelType);
+
+            // Act
+            var bindingInfo = BindingInfo.GetBindingInfo(attributes, modelMetadata);
+
+            // Assert
+            Assert.NotNull(bindingInfo);
+            Assert.Same(typeof(object), bindingInfo.BinderType);
+            Assert.Same("Different", bindingInfo.BinderModelName);
+            Assert.Same(BindingSource.Custom, bindingInfo.BindingSource);
+        }
+
+        [Fact]
+        public void GetBindingInfo_WithAttributesAndModelMetadata_UsesModelBinderFromModelMetadata_WhenNotFoundViaAttributes()
+        {
+            // Arrange
+            var attributes = new object[] { new ControllerAttribute(), new BindNeverAttribute(), };
+            var modelType = typeof(Guid);
+            var provider = new TestModelMetadataProvider();
+            provider.ForType(modelType).BindingDetails(metadata =>
+            {
+                metadata.BinderType = typeof(string);
+            });
+            var modelMetadata = provider.GetMetadataForType(modelType);
+
+            // Act
+            var bindingInfo = BindingInfo.GetBindingInfo(attributes, modelMetadata);
+
+            // Assert
+            Assert.NotNull(bindingInfo);
+            Assert.Same(typeof(string), bindingInfo.BinderType);
+        }
+
+        [Fact]
+        public void GetBindingInfo_WithAttributesAndModelMetadata_UsesBinderSourceFromModelMetadata_WhenNotFoundViaAttributes()
+        {
+            // Arrange
+            var attributes = new object[] { new BindPropertyAttribute(), new ControllerAttribute(), new BindNeverAttribute(), };
+            var modelType = typeof(Guid);
+            var provider = new TestModelMetadataProvider();
+            provider.ForType(modelType).BindingDetails(metadata =>
+            {
+                metadata.BindingSource = BindingSource.Services;
+            });
+            var modelMetadata = provider.GetMetadataForType(modelType);
+
+            // Act
+            var bindingInfo = BindingInfo.GetBindingInfo(attributes, modelMetadata);
+
+            // Assert
+            Assert.NotNull(bindingInfo);
+            Assert.Same(BindingSource.Services, bindingInfo.BindingSource);
+        }
+
+        [Fact]
+        public void GetBindingInfo_WithAttributesAndModelMetadata_UsesPropertyPredicateProviderFromModelMetadata_WhenNotFoundViaAttributes()
+        {
+            // Arrange
+            var attributes = new object[] { new ModelBinderAttribute(typeof(object)), new ControllerAttribute(), new BindNeverAttribute(), };
+            var propertyFilterProvider = Mock.Of<IPropertyFilterProvider>();
+            var modelType = typeof(Guid);
+            var provider = new TestModelMetadataProvider();
+            provider.ForType(modelType).BindingDetails(metadata =>
+            {
+                metadata.PropertyFilterProvider = propertyFilterProvider;
+            });
+            var modelMetadata = provider.GetMetadataForType(modelType);
+
+            // Act
+            var bindingInfo = BindingInfo.GetBindingInfo(attributes, modelMetadata);
+
+            // Assert
+            Assert.NotNull(bindingInfo);
+            Assert.Same(propertyFilterProvider, bindingInfo.PropertyFilterProvider);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelMetadataTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelMetadataTest.cs
new file mode 100644
index 0000000000..b637350e3f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelMetadataTest.cs
@@ -0,0 +1,787 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class ModelMetadataTest
+    {
+        // IsComplexType
+        private struct IsComplexTypeModel
+        {
+        }
+
+        [Theory]
+        [InlineData(typeof(string))]
+        [InlineData(typeof(Nullable<int>))]
+        [InlineData(typeof(int))]
+        public void IsComplexType_ReturnsFalseForSimpleTypes(Type type)
+        {
+            // Arrange & Act
+            var modelMetadata = new TestModelMetadata(type);
+
+            // Assert
+            Assert.False(modelMetadata.IsComplexType);
+        }
+
+        [Theory]
+        [InlineData(typeof(object))]
+        [InlineData(typeof(IDisposable))]
+        [InlineData(typeof(IsComplexTypeModel))]
+        [InlineData(typeof(Nullable<IsComplexTypeModel>))]
+        public void IsComplexType_ReturnsTrueForComplexTypes(Type type)
+        {
+            // Arrange & Act
+            var modelMetadata = new TestModelMetadata(type);
+
+            // Assert
+            Assert.True(modelMetadata.IsComplexType);
+        }
+
+        // IsCollectionType / IsEnumerableType
+
+        private class NonCollectionType
+        {
+        }
+
+        private class DerivedList : List<int>
+        {
+        }
+
+        private class JustEnumerable : IEnumerable
+        {
+            public IEnumerator GetEnumerator()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public static TheoryData<Type> NonCollectionNonEnumerableData
+        {
+            get
+            {
+                return new TheoryData<Type>
+                {
+                    typeof(object),
+                    typeof(int),
+                    typeof(NonCollectionType),
+                    typeof(string),
+                };
+            }
+        }
+
+        public static TheoryData<Type> CollectionAndEnumerableData
+        {
+            get
+            {
+                return new TheoryData<Type>
+                {
+                    typeof(int[]),
+                    typeof(List<string>),
+                    typeof(DerivedList),
+                    typeof(Collection<int>),
+                    typeof(Dictionary<object, object>),
+                    typeof(CollectionImplementation),
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(NonCollectionNonEnumerableData))]
+        [InlineData(typeof(IEnumerable))]
+        [InlineData(typeof(IEnumerable<string>))]
+        [InlineData(typeof(JustEnumerable))]
+        public void IsCollectionType_ReturnsFalseForNonCollectionTypes(Type type)
+        {
+            // Arrange & Act
+            var modelMetadata = new TestModelMetadata(type);
+
+            // Assert
+            Assert.False(modelMetadata.IsCollectionType);
+        }
+
+        [Theory]
+        [MemberData(nameof(CollectionAndEnumerableData))]
+        public void IsCollectionType_ReturnsTrueForCollectionTypes(Type type)
+        {
+            // Arrange & Act
+            var modelMetadata = new TestModelMetadata(type);
+
+            // Assert
+            Assert.True(modelMetadata.IsCollectionType);
+        }
+
+        [Theory]
+        [MemberData(nameof(NonCollectionNonEnumerableData))]
+        public void IsEnumerableType_ReturnsFalseForNonEnumerableTypes(Type type)
+        {
+            // Arrange & Act
+            var modelMetadata = new TestModelMetadata(type);
+
+            // Assert
+            Assert.False(modelMetadata.IsEnumerableType);
+        }
+
+        [Theory]
+        [MemberData(nameof(CollectionAndEnumerableData))]
+        [InlineData(typeof(IEnumerable))]
+        [InlineData(typeof(IEnumerable<string>))]
+        [InlineData(typeof(JustEnumerable))]
+        public void IsEnumerableType_ReturnsTrueForEnumerableTypes(Type type)
+        {
+            // Arrange & Act
+            var modelMetadata = new TestModelMetadata(type);
+
+            // Assert
+            Assert.True(modelMetadata.IsEnumerableType);
+        }
+
+        // IsNullableValueType
+
+        [Theory]
+        [InlineData(typeof(string), false)]
+        [InlineData(typeof(IDisposable), false)]
+        [InlineData(typeof(Nullable<int>), true)]
+        [InlineData(typeof(int), false)]
+        [InlineData(typeof(DerivedList), false)]
+        [InlineData(typeof(IsComplexTypeModel), false)]
+        [InlineData(typeof(Nullable<IsComplexTypeModel>), true)]
+        public void IsNullableValueType_ReturnsExpectedValue(Type modelType, bool expected)
+        {
+            // Arrange & Act
+            var modelMetadata = new TestModelMetadata(modelType);
+
+            // Assert
+            Assert.Equal(expected, modelMetadata.IsNullableValueType);
+        }
+
+        // IsReferenceOrNullableType
+
+        [Theory]
+        [InlineData(typeof(string), true)]
+        [InlineData(typeof(IDisposable), true)]
+        [InlineData(typeof(Nullable<int>), true)]
+        [InlineData(typeof(int), false)]
+        [InlineData(typeof(DerivedList), true)]
+        [InlineData(typeof(IsComplexTypeModel), false)]
+        [InlineData(typeof(Nullable<IsComplexTypeModel>), true)]
+        public void IsReferenceOrNullableType_ReturnsExpectedValue(Type modelType, bool expected)
+        {
+            // Arrange & Act
+            var modelMetadata = new TestModelMetadata(modelType);
+
+            // Assert
+            Assert.Equal(expected, modelMetadata.IsReferenceOrNullableType);
+        }
+
+        // UnderlyingOrModelType
+
+        [Theory]
+        [InlineData(typeof(string), typeof(string))]
+        [InlineData(typeof(IDisposable), typeof(IDisposable))]
+        [InlineData(typeof(Nullable<int>), typeof(int))]
+        [InlineData(typeof(int), typeof(int))]
+        [InlineData(typeof(DerivedList), typeof(DerivedList))]
+        [InlineData(typeof(IsComplexTypeModel), typeof(IsComplexTypeModel))]
+        [InlineData(typeof(Nullable<IsComplexTypeModel>), typeof(IsComplexTypeModel))]
+        public void UnderlyingOrModelType_ReturnsExpectedValue(Type modelType, Type expected)
+        {
+            // Arrange & Act
+            var modelMetadata = new TestModelMetadata(modelType);
+
+            // Assert
+            Assert.Equal(expected, modelMetadata.UnderlyingOrModelType);
+        }
+
+        // ElementType
+
+        [Theory]
+        [InlineData(typeof(object))]
+        [InlineData(typeof(int))]
+        [InlineData(typeof(NonCollectionType))]
+        [InlineData(typeof(string))]
+        public void ElementType_ReturnsNull_ForNonCollections(Type modelType)
+        {
+            // Arrange
+            var metadata = new TestModelMetadata(modelType);
+
+            // Act
+            var elementType = metadata.ElementType;
+
+            // Assert
+            Assert.Null(elementType);
+        }
+
+        [Theory]
+        [InlineData(typeof(int[]), typeof(int))]
+        [InlineData(typeof(List<string>), typeof(string))]
+        [InlineData(typeof(DerivedList), typeof(int))]
+        [InlineData(typeof(IEnumerable), typeof(object))]
+        [InlineData(typeof(IEnumerable<string>), typeof(string))]
+        [InlineData(typeof(Collection<int>), typeof(int))]
+        [InlineData(typeof(Dictionary<object, object>), typeof(KeyValuePair<object, object>))]
+        [InlineData(typeof(DerivedDictionary), typeof(KeyValuePair<string, int>))]
+        public void ElementType_ReturnsExpectedMetadata(Type modelType, Type expected)
+        {
+            // Arrange
+            var metadata = new TestModelMetadata(modelType);
+
+            // Act
+            var elementType = metadata.ElementType;
+
+            // Assert
+            Assert.NotNull(elementType);
+            Assert.Equal(expected, elementType);
+        }
+
+        // ContainerType
+
+        [Fact]
+        public void ContainerType_IsNull_ForType()
+        {
+            // Arrange & Act
+            var metadata = new TestModelMetadata(typeof(int));
+
+            // Assert
+            Assert.Null(metadata.ContainerType);
+        }
+
+        [Fact]
+        public void ContainerType_IsNull_ForParameter()
+        {
+            // Arrange & Act
+            var method = typeof(CollectionImplementation).GetMethod(nameof(CollectionImplementation.Add));
+            var parameter = method.GetParameters()[0]; // Add(string item)
+            var metadata = new TestModelMetadata(parameter);
+
+            // Assert
+            Assert.Null(metadata.ContainerType);
+        }
+
+        [Fact]
+        public void ContainerType_ReturnExpectedMetadata_ForProperty()
+        {
+            // Arrange & Act
+            var metadata = new TestModelMetadata(typeof(int), nameof(string.Length), typeof(string));
+
+            // Assert
+            Assert.Equal(typeof(string), metadata.ContainerType);
+        }
+
+        // Name / ParameterName / PropertyName
+
+        [Fact]
+        public void Names_ReturnExpectedMetadata_ForType()
+        {
+            // Arrange & Act
+            var metadata = new TestModelMetadata(typeof(int));
+
+            // Assert
+            Assert.Null(metadata.Name);
+            Assert.Null(metadata.ParameterName);
+            Assert.Null(metadata.PropertyName);
+        }
+
+        [Fact]
+        public void Names_ReturnExpectedMetadata_ForParameter()
+        {
+            // Arrange & Act
+            var method = typeof(CollectionImplementation).GetMethod(nameof(CollectionImplementation.Add));
+            var parameter = method.GetParameters()[0]; // Add(string item)
+            var metadata = new TestModelMetadata(parameter);
+
+            // Assert
+            Assert.Equal("item", metadata.Name);
+            Assert.Equal("item", metadata.ParameterName);
+            Assert.Null(metadata.PropertyName);
+        }
+
+        [Fact]
+        public void Names_ReturnExpectedMetadata_ForProperty()
+        {
+            // Arrange & Act
+            var metadata = new TestModelMetadata(typeof(int), nameof(string.Length), typeof(string));
+
+            // Assert
+            Assert.Equal(nameof(string.Length), metadata.Name);
+            Assert.Null(metadata.ParameterName);
+            Assert.Equal(nameof(string.Length), metadata.PropertyName);
+        }
+
+        // GetDisplayName()
+
+        [Fact]
+        public void GetDisplayName_ReturnsDisplayName_IfSet()
+        {
+            // Arrange
+            var metadata = new TestModelMetadata(typeof(int), "Length", typeof(string));
+            metadata.SetDisplayName("displayName");
+
+            // Act
+            var result = metadata.GetDisplayName();
+
+            // Assert
+            Assert.Equal("displayName", result);
+        }
+
+        [Fact]
+        public void GetDisplayName_ReturnsParameterName_WhenSetAndDisplayNameIsNull()
+        {
+            // Arrange
+            var method = typeof(CollectionImplementation).GetMethod(nameof(CollectionImplementation.Add));
+            var parameter = method.GetParameters()[0]; // Add(string item)
+            var metadata = new TestModelMetadata(parameter);
+
+            // Act
+            var result = metadata.GetDisplayName();
+
+            // Assert
+            Assert.Equal("item", result);
+        }
+
+        [Fact]
+        public void GetDisplayName_ReturnsPropertyName_WhenSetAndDisplayNameIsNull()
+        {
+            // Arrange
+            var metadata = new TestModelMetadata(typeof(int), "Length", typeof(string));
+
+            // Act
+            var result = metadata.GetDisplayName();
+
+            // Assert
+            Assert.Equal("Length", result);
+        }
+
+        [Fact]
+        public void GetDisplayName_ReturnsTypeName_WhenPropertyNameAndDisplayNameAreNull()
+        {
+            // Arrange
+            var metadata = new TestModelMetadata(typeof(string));
+
+            // Act
+            var result = metadata.GetDisplayName();
+
+            // Assert
+            Assert.Equal("String", result);
+        }
+
+        // Virtual methods and properties that throw NotImplementedException in the abstract class.
+
+        [Fact]
+        public void GetContainerMetadata_ThrowsNotImplementedException_ByDefault()
+        {
+            // Arrange
+            var metadata = new TestModelMetadata(typeof(DerivedList));
+
+            // Act & Assert
+            Assert.Throws<NotImplementedException>(() => metadata.ContainerMetadata);
+        }
+
+        [Fact]
+        public void GetMetadataForType_ByDefaultThrows_NotImplementedException()
+        {
+            // Arrange
+            var metadata = new TestModelMetadata(typeof(string));
+
+            // Act & Assert
+            var result = Assert.Throws<NotImplementedException>(() => metadata.GetMetadataForType(typeof(string)));
+        }
+
+        [Fact]
+        public void GetMetadataForProperties_ByDefaultThrows_NotImplementedException()
+        {
+            // Arrange
+            var metadata = new TestModelMetadata(typeof(string));
+
+            // Act & Assert
+            var result = Assert.Throws<NotImplementedException>(() => metadata.GetMetadataForProperties(typeof(string)));
+        }
+
+        private class TestModelMetadata : ModelMetadata
+        {
+            private string _displayName;
+
+            public TestModelMetadata(Type modelType)
+                : base(ModelMetadataIdentity.ForType(modelType))
+            {
+            }
+
+            public TestModelMetadata(ParameterInfo parameter)
+                : base(ModelMetadataIdentity.ForParameter(parameter))
+            {
+            }
+
+            public TestModelMetadata(Type modelType, string propertyName, Type containerType)
+                : base(ModelMetadataIdentity.ForProperty(modelType, propertyName, containerType))
+            {
+            }
+
+            public override IReadOnlyDictionary<object, object> AdditionalValues
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override string BinderModelName
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override Type BinderType
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override BindingSource BindingSource
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override bool ConvertEmptyStringToNull
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override string DataTypeName
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override string Description
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override string DisplayFormatString
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override string DisplayName
+            {
+                get
+                {
+                    return _displayName;
+                }
+            }
+
+            public void SetDisplayName(string displayName)
+            {
+                _displayName = displayName;
+            }
+
+            public override string EditFormatString
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override ModelMetadata ElementMetadata
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override IEnumerable<KeyValuePair<EnumGroupAndName, string>> EnumGroupedDisplayNamesAndValues
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override IReadOnlyDictionary<string, string> EnumNamesAndValues
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override bool HasNonDefaultEditFormat
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override bool HideSurroundingHtml
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override bool HtmlEncode
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override bool IsBindingAllowed
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override bool IsBindingRequired
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override bool IsEnum
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override bool IsFlagsEnum
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override bool IsReadOnly
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override bool IsRequired
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override ModelBindingMessageProvider ModelBindingMessageProvider
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override string NullDisplayText
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override int Order
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override string Placeholder
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override ModelPropertyCollection Properties
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override IPropertyFilterProvider PropertyFilterProvider
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override bool ShowForDisplay
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override bool ShowForEdit
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override string SimpleDisplayProperty
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override string TemplateHint
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override IPropertyValidationFilter PropertyValidationFilter
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override bool ValidateChildren
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override IReadOnlyList<object> ValidatorMetadata
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override Func<object, object> PropertyGetter
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override Action<object, object> PropertySetter
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+        }
+
+        private class CollectionImplementation : ICollection<string>
+        {
+            public int Count
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public bool IsReadOnly
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public void Add(string item)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void Clear()
+            {
+                throw new NotImplementedException();
+            }
+
+            public bool Contains(string item)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void CopyTo(string[] array, int arrayIndex)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IEnumerator<string> GetEnumerator()
+            {
+                throw new NotImplementedException();
+            }
+
+            public bool Remove(string item)
+            {
+                throw new NotImplementedException();
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class DerivedDictionary : Dictionary<string, int>
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelStateDictionaryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelStateDictionaryTest.cs
new file mode 100644
index 0000000000..75a01945d2
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelStateDictionaryTest.cs
@@ -0,0 +1,1537 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class ModelStateDictionaryTest
+    {
+        [Theory]
+        [InlineData("")]
+        [InlineData("foo")]
+        public void ContainsKey_ReturnsFalse_IfNodeHasNotBeenMutated(string key)
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.AddModelError("foo.bar", "some error");
+
+            // Act
+            var result = dictionary.ContainsKey(key);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData("foo")]
+        public void ContainsKey_ReturnsFalse_IfNodeHasBeenRemoved(string key)
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.AddModelError(key, "some error");
+
+            // Act
+            var remove = dictionary.Remove(key);
+            var containsKey = dictionary.ContainsKey(key);
+
+            // Assert
+            Assert.True(remove);
+            Assert.False(containsKey);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData("foo")]
+        [InlineData("foo.bar")]
+        [InlineData("foo[bar]")]
+        public void ContainsKey_ReturnsTrue_IfNodeHasBeenMutated(string key)
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.MarkFieldSkipped(key);
+
+            // Act
+            var result = dictionary.ContainsKey(key);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData("foo")]
+        [InlineData("foo.bar")]
+        [InlineData("foo.bar[10]")]
+        public void IndexerDoesNotReturnIntermediaryNodes(string key)
+        {
+            // Arrange
+            var modelStateDictionary = new ModelStateDictionary();
+            modelStateDictionary.AddModelError("foo.bar[10].baz", "error-message");
+
+            // Act
+            var result = modelStateDictionary[key];
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Theory]
+        [InlineData("prop")]
+        [InlineData("first.second")]
+        [InlineData("[0].prop")]
+        [InlineData("[qux]")]
+        [InlineData("[test].prop")]
+        [InlineData("first[0].second")]
+        [InlineData("first.second[0].third")]
+        [InlineData("first[second][0]")]
+        [InlineData("first.second.third[0]")]
+        [InlineData("first.second.third[0].fourth")]
+        [InlineData("first[0][second]")]
+        public void Indexer_ReturnsValuesAddedUsingSetModelValue(string key)
+        {
+            // Arrange
+            var value = "Hello world";
+            var modelStateDictionary = new ModelStateDictionary();
+            modelStateDictionary.SetModelValue(key, value, value);
+
+            // Act
+            var result = modelStateDictionary[key];
+
+            // Assert
+            Assert.Equal(value, result.RawValue);
+        }
+
+        [Fact]
+        public void Clear_RemovesAllEntries()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.AddModelError("a", "a-error");
+            dictionary.AddModelError("b", "b-error");
+            dictionary.AddModelError("c", "c-error");
+
+            // Act
+            dictionary.Clear();
+
+            // Assert
+            Assert.Empty(dictionary);
+            Assert.Equal(0, dictionary.ErrorCount);
+            Assert.Empty(dictionary);
+            Assert.Equal(ModelValidationState.Valid, dictionary.ValidationState);
+        }
+
+        [Fact]
+        public void Clear_RemovesAllEntries_IfDictionaryIsEmpty()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+
+            // Act
+            dictionary.Clear();
+
+            // Assert
+            Assert.Empty(dictionary);
+            Assert.Equal(0, dictionary.ErrorCount);
+            Assert.Empty(dictionary);
+            Assert.Equal(ModelValidationState.Valid, dictionary.ValidationState);
+        }
+
+        [Fact]
+        public void MarkFieldSkipped_MarksFieldAsSkipped_IfStateIsUnvalidated()
+        {
+            // Arrange
+            var source = new ModelStateDictionary();
+            source.SetModelValue("key", "value", "value");
+
+            // Act
+            source.MarkFieldSkipped("key");
+
+            // Assert
+            Assert.Equal(ModelValidationState.Skipped, source["key"].ValidationState);
+        }
+
+        [Fact]
+        public void MarkFieldSkipped_MarksFieldAsSkipped_IfStateIsValid()
+        {
+            // Arrange
+            var source = new ModelStateDictionary();
+            source.MarkFieldValid("key");
+
+            // Act
+            source.MarkFieldSkipped("key");
+
+            // Assert
+            Assert.Equal(ModelValidationState.Skipped, source["key"].ValidationState);
+        }
+
+        [Fact]
+        public void MarkFieldSkipped_MarksFieldAsSkipped_IfKeyIsNotPresent()
+        {
+            // Arrange
+            var source = new ModelStateDictionary();
+
+            // Act
+            source.MarkFieldSkipped("key");
+
+            // Assert
+            Assert.Equal(0, source.ErrorCount);
+            Assert.Single(source);
+            Assert.Equal(ModelValidationState.Skipped, source["key"].ValidationState);
+        }
+
+        [Fact]
+        public void MarkFieldSkipped_Throws_IfStateIsInvalid()
+        {
+            // Arrange
+            var source = new ModelStateDictionary();
+            source.AddModelError("key", "some error");
+
+            // Act
+            var exception = Assert.Throws<InvalidOperationException>(() => source.MarkFieldSkipped("key"));
+
+            // Assert
+            Assert.Equal(
+                "A field previously marked invalid should not be marked skipped.",
+                exception.Message);
+        }
+
+        [Fact]
+        public void MarkFieldValid_MarksFieldAsValid_IfStateIsUnvalidated()
+        {
+            // Arrange
+            var source = new ModelStateDictionary();
+            source.SetModelValue("key", "value", "value");
+
+            // Act
+            source.MarkFieldValid("key");
+
+            // Assert
+            Assert.Equal(ModelValidationState.Valid, source["key"].ValidationState);
+        }
+
+        [Fact]
+        public void MarkFieldValid_MarksFieldAsValid_IfStateIsSkipped()
+        {
+            // Arrange
+            var source = new ModelStateDictionary();
+            source.MarkFieldSkipped("key");
+
+            // Act
+            source.MarkFieldValid("key");
+
+            // Assert
+            Assert.Equal(ModelValidationState.Valid, source["key"].ValidationState);
+        }
+
+        [Fact]
+        public void MarkFieldValid_MarksFieldAsValid_IfKeyIsNotPresent()
+        {
+            // Arrange
+            var source = new ModelStateDictionary();
+
+            // Act
+            source.MarkFieldValid("key");
+
+            // Assert
+            Assert.Equal(0, source.ErrorCount);
+            Assert.Single(source);
+            Assert.Equal(ModelValidationState.Valid, source["key"].ValidationState);
+        }
+
+        [Fact]
+        public void MarkFieldValid_Throws_IfStateIsInvalid()
+        {
+            // Arrange
+            var source = new ModelStateDictionary();
+            source.AddModelError("key", "some-error");
+
+            // Act
+            var exception = Assert.Throws<InvalidOperationException>(() => source.MarkFieldValid("key"));
+
+            // Assert
+            Assert.Equal(
+                "A field previously marked invalid should not be marked valid.",
+                exception.Message);
+        }
+
+        [Fact]
+        public void CopyConstructor_CopiesModelStateData()
+        {
+            // Arrange
+            var source = new ModelStateDictionary();
+            source.SetModelValue("key", "attempted-value", "raw-value");
+            var entry = source["key"];
+            entry.AttemptedValue = "attempted-value";
+            entry.RawValue = "raw-value";
+            entry.Errors.Add(new ModelError(new InvalidOperationException()));
+            entry.Errors.Add(new ModelError("error-message"));
+            entry.ValidationState = ModelValidationState.Skipped;
+            // Act
+            var target = new ModelStateDictionary(source);
+
+            // Assert
+            Assert.Equal(2, target.ErrorCount);
+            Assert.Single(target);
+            var actual = target["key"];
+            Assert.Equal(entry.RawValue, actual.RawValue);
+            Assert.Equal(entry.AttemptedValue, actual.AttemptedValue);
+            Assert.Equal(entry.Errors, actual.Errors);
+            Assert.Equal(entry.ValidationState, actual.ValidationState);
+        }
+
+        [Fact]
+        public void TryAddModelException_Succeeds()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            var exception = new TestException();
+
+            // Act
+            dictionary.TryAddModelException("some key", exception);
+
+            // Assert
+            var kvp = Assert.Single(dictionary);
+            Assert.Equal("some key", kvp.Key);
+            var error = Assert.Single(kvp.Value.Errors);
+            Assert.Same(exception, error.Exception);
+        }
+
+        [Fact]
+        public void AddModelErrorCreatesModelStateIfNotPresent()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+
+            // Act
+            dictionary.AddModelError("some key", "some error");
+
+            // Assert
+            Assert.Equal(1, dictionary.ErrorCount);
+            var kvp = Assert.Single(dictionary);
+            Assert.Equal("some key", kvp.Key);
+            var error = Assert.Single(kvp.Value.Errors);
+            Assert.Equal("some error", error.ErrorMessage);
+        }
+
+        [Fact]
+        public void AddModelErrorUsesExistingModelStateIfPresent()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.AddModelError("some key", "some error");
+            var exception = new Exception();
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), nameof(string.Length));
+
+            // Act
+            dictionary.AddModelError("some key", exception, metadata);
+
+            // Assert
+            Assert.Equal(2, dictionary.ErrorCount);
+            var kvp = Assert.Single(dictionary);
+            Assert.Equal("some key", kvp.Key);
+
+            Assert.Equal(2, kvp.Value.Errors.Count);
+            Assert.Equal("some error", kvp.Value.Errors[0].ErrorMessage);
+            Assert.Same(exception, kvp.Value.Errors[1].Exception);
+        }
+
+        [Fact]
+        public void ConstructorWithDictionaryParameter()
+        {
+            // Arrange
+            var oldDictionary = new ModelStateDictionary();
+            oldDictionary.SetModelValue("foo", "bar", "bar");
+
+            // Act
+            var newDictionary = new ModelStateDictionary(oldDictionary);
+
+            // Assert
+            Assert.Single(newDictionary);
+            Assert.Equal("bar", newDictionary["foo"].RawValue);
+        }
+
+        [Fact]
+        public void GetFieldValidationState_ReturnsUnvalidatedIfDictionaryDoesNotContainKey()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+
+            // Act
+            var validationState = dictionary.GetFieldValidationState("foo");
+
+            // Assert
+            Assert.Equal(ModelValidationState.Unvalidated, validationState);
+        }
+
+        [Fact]
+        public void GetValidationState_ReturnsValidationStateForKey_IgnoresChildren()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.AddModelError("foo.bar", "error text");
+
+            // Act
+            var validationState = dictionary.GetValidationState("foo");
+
+            // Assert
+            Assert.Equal(ModelValidationState.Unvalidated, validationState);
+        }
+
+        [Theory]
+        [InlineData("foo")]
+        [InlineData("foo.bar")]
+        [InlineData("foo[bar]")]
+        public void GetFieldValidationState_ReturnsInvalidIfKeyChildContainsErrors(string key)
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.AddModelError(key, "error text");
+
+            // Act
+            var validationState = dictionary.GetFieldValidationState("foo");
+
+            // Assert
+            Assert.Equal(ModelValidationState.Invalid, validationState);
+        }
+
+        [Theory]
+        [InlineData("foo")]
+        [InlineData("foo.bar")]
+        [InlineData("foo[bar]")]
+        public void GetFieldValidationState_ReturnsValidIfModelStateDoesNotContainErrors(string key)
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.MarkFieldValid(key);
+
+            // Act
+            var validationState = dictionary.GetFieldValidationState("foo");
+
+            // Assert
+            Assert.Equal(ModelValidationState.Valid, validationState);
+        }
+
+        [Theory]
+        [InlineData("[0].foo.bar")]
+        [InlineData("[0].foo.bar[0]")]
+        public void GetFieldValidationState_IndexedPrefix_ReturnsInvalidIfKeyChildContainsErrors(string key)
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.AddModelError(key, "error text");
+
+            // Act
+            var validationState = dictionary.GetFieldValidationState("[0].foo");
+
+            // Assert
+            Assert.Equal(ModelValidationState.Invalid, validationState);
+        }
+
+        [Theory]
+        [InlineData("[0].foo.bar")]
+        [InlineData("[0].foo.bar[0]")]
+        public void GetFieldValidationState_IndexedPrefix_ReturnsValidIfModelStateDoesNotContainErrors(string key)
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.MarkFieldValid(key);
+
+            // Act
+            var validationState = dictionary.GetFieldValidationState("[0].foo");
+
+            // Assert
+            Assert.Equal(ModelValidationState.Valid, validationState);
+        }
+
+        [Fact]
+        public void IsValidPropertyReturnsFalseIfErrors()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.MarkFieldValid("foo");
+            dictionary.AddModelError("bar", "some error");
+
+            // Act
+            var isValid = dictionary.IsValid;
+            var validationState = dictionary.ValidationState;
+
+            // Assert
+            Assert.False(isValid);
+            Assert.Equal(ModelValidationState.Invalid, validationState);
+        }
+
+        [Fact]
+        public void IsValidPropertyReturnsTrueIfNoErrors()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.MarkFieldValid("foo");
+            dictionary.MarkFieldSkipped("bar");
+
+            // Act
+            var isValid = dictionary.IsValid;
+            var validationState = dictionary.ValidationState;
+
+            // Assert
+            Assert.True(isValid);
+            Assert.Equal(ModelValidationState.Valid, validationState);
+        }
+
+        [Fact]
+        public void IsValidPropertyReturnsFalse_IfSomeFieldsAreNotValidated()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.MarkFieldValid("foo");
+            dictionary.SetModelValue("qux", "value", "value");
+            dictionary.AddModelError("baz", "some error");
+
+            // Act
+            var isValid = dictionary.IsValid;
+            var validationState = dictionary.ValidationState;
+
+            // Assert
+            Assert.False(isValid);
+            Assert.Equal(ModelValidationState.Unvalidated, validationState);
+        }
+
+        [Fact]
+        public void MergeCopiesDictionaryEntries()
+        {
+            // Arrange
+            var dictionary1 = new ModelStateDictionary();
+            dictionary1.SetModelValue("foo", "RawValue1", "AttemptedValue1");
+            dictionary1.AddModelError("foo", "value1-Error1");
+            dictionary1.AddModelError("foo", "value1-Error2");
+
+            var dictionary2 = new ModelStateDictionary();
+            dictionary2.SetModelValue("bar", "RawValue2", "AttemptedValue2");
+            dictionary2.AddModelError("bar", "value2-Error1");
+
+            // Act
+            dictionary1.Merge(dictionary2);
+
+            // Assert
+            Assert.Equal(2, dictionary1.Count);
+            var item = dictionary1["foo"];
+            Assert.Equal("AttemptedValue1", item.AttemptedValue);
+            Assert.Equal("RawValue1", item.RawValue);
+
+            item = dictionary1["bar"];
+            Assert.Equal("AttemptedValue2", item.AttemptedValue);
+            Assert.Equal("RawValue2", item.RawValue);
+            Assert.Collection(item.Errors,
+                error => Assert.Equal("value2-Error1", error.ErrorMessage));
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData("key1")]
+        public void MergeCopiesDictionaryOverwritesExistingValues(string key)
+        {
+            // Arrange
+            var dictionary1 = new ModelStateDictionary();
+            dictionary1.SetModelValue(key, "RawValue1", "AttemptedValue1");
+            dictionary1.AddModelError(key, "value1-Error1");
+            dictionary1.AddModelError(key, "value1-Error2");
+            dictionary1.SetModelValue("other-key", null, null);
+
+            var dictionary2 = new ModelStateDictionary();
+            dictionary2.SetModelValue(key, "RawValue2", "AttemptedValue2");
+            dictionary2.AddModelError(key, "value2-Error1");
+
+            // Act
+            dictionary1.Merge(dictionary2);
+
+            // Assert
+            Assert.Equal(2, dictionary1.Count);
+            var item = dictionary1["other-key"];
+            Assert.Null(item.AttemptedValue);
+            Assert.Null(item.RawValue);
+            Assert.Empty(item.Errors);
+
+            item = dictionary1[key];
+            Assert.Equal("AttemptedValue2", item.AttemptedValue);
+            Assert.Equal("RawValue2", item.RawValue);
+            Assert.Collection(item.Errors,
+                error => Assert.Equal("value2-Error1", error.ErrorMessage));
+        }
+
+        [Fact]
+        public void MergeDoesNothingIfParameterIsNull()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.SetModelValue("foo", "value", "value");
+
+            // Act
+            dictionary.Merge(null);
+
+            // Assert
+            Assert.Single(dictionary);
+            Assert.True(dictionary.ContainsKey("foo"));
+        }
+
+        [Fact]
+        public void SetAttemptedValueCreatesModelStateIfNotPresent()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+
+            // Act
+            dictionary.SetModelValue("some key", new string[] { "some value" }, "some value");
+
+            // Assert
+            Assert.Single(dictionary);
+            var modelState = dictionary["some key"];
+
+            Assert.Empty(modelState.Errors);
+            Assert.Equal(new string[] { "some value" }, modelState.RawValue);
+            Assert.Equal("some value", modelState.AttemptedValue);
+        }
+
+        [Fact]
+        public void SetAttemptedValueUsesExistingModelStateIfPresent()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.AddModelError("some key", "some error");
+            var ex = new Exception();
+
+            // Act
+            dictionary.SetModelValue("some key", new string[] { "some value" }, "some value");
+
+            // Assert
+            Assert.Single(dictionary);
+            var modelState = dictionary["some key"];
+
+            Assert.Single(modelState.Errors);
+            Assert.Equal("some error", modelState.Errors[0].ErrorMessage);
+            Assert.Equal(new string[] { "some value" }, modelState.RawValue);
+            Assert.Equal("some value", modelState.AttemptedValue);
+        }
+
+        [Fact]
+        public void GetFieldValidity_ReturnsUnvalidated_IfNoEntryExistsForKey()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.SetModelValue("user.Name", new string[] { "some value" }, "some value");
+
+            // Act
+            var validationState = dictionary.GetFieldValidationState("not-user");
+
+            // Assert
+            Assert.Equal(ModelValidationState.Unvalidated, validationState);
+        }
+
+        [Fact]
+        public void GetFieldValidity_ReturnsUnvalidated_IfAnyItemInSubtreeIsInvalid()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.MarkFieldValid("user.Address");
+            dictionary.SetModelValue("user.Name", new string[] { "some value" }, "some value");
+            dictionary.AddModelError("user.Age", "Age is not a valid int");
+
+            // Act
+            var validationState = dictionary.GetFieldValidationState("user");
+
+            // Assert
+            Assert.Equal(ModelValidationState.Unvalidated, validationState);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData("user")]
+        [InlineData("user.Age")]
+        public void GetFieldValidity_ReturnsInvalid_IfAllKeysAreValidatedAndAnyEntryIsInvalid(string key)
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.MarkFieldValid("user.Address");
+            dictionary.MarkFieldValid("user.Name");
+            dictionary.AddModelError("user.Age", "Age is not a valid int");
+
+            // Act
+            var validationState = dictionary.GetFieldValidationState(key);
+
+            // Assert
+            Assert.Equal(ModelValidationState.Invalid, validationState);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData("[0]")]
+        [InlineData("[0].product")]
+        public void GetFieldValidity_ReturnsInvalid_IfAllKeysAreValidatedAndAnyEntryIsInvalid_Collection(string key)
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.MarkFieldValid("[0].product.Name");
+            dictionary.MarkFieldValid("[0].product.Age[0]");
+            dictionary.AddModelError("[0].product.Name", "Name is invalid");
+
+            // Act
+            var validationState = dictionary.GetFieldValidationState(key);
+
+            // Assert
+            Assert.Equal(ModelValidationState.Invalid, validationState);
+        }
+
+        [Fact]
+        public void GetFieldValidity_ReturnsValid_IfAllKeysAreValid()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.MarkFieldValid("user.Address");
+            dictionary.MarkFieldValid("user.Name");
+
+            // Act
+            var validationState = dictionary.GetFieldValidationState("user");
+
+            // Assert
+            Assert.Equal(ModelValidationState.Valid, validationState);
+        }
+
+        [Fact]
+        public void AddModelError_WithErrorString_AddsTooManyModelErrors_WhenMaxErrorsIsReached()
+        {
+            // Arrange
+            var expected = "The maximum number of allowed model errors has been reached.";
+            var dictionary = new ModelStateDictionary
+            {
+                MaxAllowedErrors = 5
+            };
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), nameof(string.Length));
+
+            // Act
+            dictionary.AddModelError("key1", "error1");
+            dictionary.AddModelError("key2", new Exception(), metadata);
+            dictionary.AddModelError("key3", new Exception(), metadata);
+            dictionary.AddModelError("key4", "error4");
+            dictionary.AddModelError("key5", "error5");
+
+            // Assert
+            Assert.True(dictionary.HasReachedMaxErrors);
+            Assert.Equal(5, dictionary.ErrorCount);
+            var error = Assert.Single(dictionary[string.Empty].Errors);
+            Assert.IsType<TooManyModelErrorsException>(error.Exception);
+            Assert.Equal(expected, error.Exception.Message);
+
+            // TooManyModelErrorsException added instead of key5 error.
+            Assert.DoesNotContain("key5", dictionary.Keys);
+        }
+
+        [Fact]
+        public void TryAddModelException_ReturnsFalse_AndAddsMaxModelErrorMessage()
+        {
+            // Arrange
+            var expected = "The maximum number of allowed model errors has been reached.";
+            var dictionary = new ModelStateDictionary
+            {
+                MaxAllowedErrors = 3
+            };
+
+            // Act and Assert
+            var result = dictionary.TryAddModelError("key1", "error1");
+            Assert.True(result);
+
+            result = dictionary.TryAddModelException("key2", new Exception());
+            Assert.True(result);
+
+            result = dictionary.TryAddModelException("key3", new Exception());
+            Assert.False(result);
+
+            Assert.Equal(3, dictionary.Count);
+            var error = Assert.Single(dictionary[string.Empty].Errors);
+            Assert.IsType<TooManyModelErrorsException>(error.Exception);
+            Assert.Equal(expected, error.Exception.Message);
+
+            // TooManyModelErrorsException added instead of key3 exception.
+            Assert.DoesNotContain("key3", dictionary.Keys);
+        }
+
+        [Fact]
+        public void TryAddModelError_WithErrorString_ReturnsFalse_AndAddsMaxModelErrorMessage()
+        {
+            // Arrange
+            var expected = "The maximum number of allowed model errors has been reached.";
+            var dictionary = new ModelStateDictionary
+            {
+                MaxAllowedErrors = 3
+            };
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), nameof(string.Length));
+
+            // Act and Assert
+            Assert.False(dictionary.HasReachedMaxErrors);
+            var result = dictionary.TryAddModelError("key1", "error1");
+            Assert.True(result);
+
+            Assert.False(dictionary.HasReachedMaxErrors);
+            result = dictionary.TryAddModelError("key2", new Exception(), metadata);
+            Assert.True(result);
+
+            Assert.False(dictionary.HasReachedMaxErrors); // Still room for TooManyModelErrorsException.
+            result = dictionary.TryAddModelError("key3", "error3");
+            Assert.False(result);
+
+            Assert.True(dictionary.HasReachedMaxErrors);
+            result = dictionary.TryAddModelError("key4", "error4"); // no-op
+            Assert.False(result);
+
+            Assert.True(dictionary.HasReachedMaxErrors);
+            Assert.Equal(3, dictionary.ErrorCount);
+            Assert.Equal(3, dictionary.Count);
+
+            var error = Assert.Single(dictionary[string.Empty].Errors);
+            Assert.IsType<TooManyModelErrorsException>(error.Exception);
+            Assert.Equal(expected, error.Exception.Message);
+
+            // TooManyModelErrorsException added instead of key3 error.
+            Assert.DoesNotContain("key3", dictionary.Keys);
+
+            // Last addition did nothing.
+            Assert.DoesNotContain("key4", dictionary.Keys);
+        }
+
+        [Fact]
+        public void AddModelError_WithException_AddsTooManyModelError_WhenMaxErrorIsReached()
+        {
+            // Arrange
+            var expected = "The maximum number of allowed model errors has been reached.";
+            var dictionary = new ModelStateDictionary
+            {
+                MaxAllowedErrors = 4
+            };
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), nameof(string.Length));
+            dictionary.AddModelError("key1", new Exception(), metadata);
+            dictionary.AddModelError("key2", "error2");
+            dictionary.AddModelError("key3", "error3");
+            dictionary.AddModelError("key3", new Exception(), metadata);
+
+            // Act and Assert
+            Assert.True(dictionary.HasReachedMaxErrors);
+            Assert.Equal(4, dictionary.ErrorCount);
+            Assert.Equal(4, dictionary.Count);
+            var error = Assert.Single(dictionary[string.Empty].Errors);
+            Assert.IsType<TooManyModelErrorsException>(error.Exception);
+            Assert.Equal(expected, error.Exception.Message);
+
+            // Second key3 model error resulted in TooManyModelErrorsException instead.
+            error = Assert.Single(dictionary["key3"].Errors);
+            Assert.Null(error.Exception);
+            Assert.Equal("error3", error.ErrorMessage);
+        }
+
+        [Fact]
+        public void TryAddModelError_WithException_ReturnsFalse_AndAddsMaxModelErrorMessage()
+        {
+            // Arrange
+            var expected = "The maximum number of allowed model errors has been reached.";
+            var dictionary = new ModelStateDictionary
+            {
+                MaxAllowedErrors = 3
+            };
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), nameof(string.Length));
+
+            // Act and Assert
+            var result = dictionary.TryAddModelError("key1", "error1");
+            Assert.True(result);
+
+            result = dictionary.TryAddModelError("key2", new Exception(), metadata);
+            Assert.True(result);
+
+            result = dictionary.TryAddModelError("key3", new Exception(), metadata);
+            Assert.False(result);
+
+            Assert.Equal(3, dictionary.Count);
+            var error = Assert.Single(dictionary[string.Empty].Errors);
+            Assert.IsType<TooManyModelErrorsException>(error.Exception);
+            Assert.Equal(expected, error.Exception.Message);
+        }
+
+        [Fact]
+        public void ModelStateDictionary_TracksAddedErrorsOverCopyConstructor()
+        {
+            // Arrange
+            var expected = "The maximum number of allowed model errors has been reached.";
+            var dictionary = new ModelStateDictionary
+            {
+                MaxAllowedErrors = 3
+            };
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), nameof(string.Length));
+
+            // Act
+            dictionary.AddModelError("key1", "error1");
+            dictionary.TryAddModelError("key3", new Exception(), metadata);
+
+            var copy = new ModelStateDictionary(dictionary);
+            copy.AddModelError("key2", "error2");
+
+            // Assert
+            Assert.Equal(3, copy.Count);
+            var error = Assert.Single(copy[string.Empty].Errors);
+            Assert.IsType<TooManyModelErrorsException>(error.Exception);
+            Assert.Equal(expected, error.Exception.Message);
+        }
+
+        [Theory]
+        [InlineData(2, false)]
+        [InlineData(3, true)]
+        [InlineData(4, true)]
+        public void ModelStateDictionary_HasReachedMaxErrors(int errorCount, bool expected)
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary()
+            {
+                MaxAllowedErrors = 3
+            };
+
+            for (var i = 0; i < errorCount; i++)
+            {
+                dictionary.AddModelError("key" + i, "error");
+            }
+
+            // Act
+            var canAdd = dictionary.HasReachedMaxErrors;
+
+            // Assert
+            Assert.Equal(expected, canAdd);
+        }
+
+        [Fact]
+        public void ModelStateDictionary_ReturnExceptionMessage_WhenModelStateNotSet()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            var exception = new FormatException("The supplied value is invalid for Length.");
+
+            // Act
+            dictionary.TryAddModelException("key", exception);
+
+            // Assert
+            var error = Assert.Single(dictionary["key"].Errors);
+            Assert.Same(exception, error.Exception);
+        }
+
+        [Fact]
+        public void ModelStateDictionary_ReturnGenericErrorMessage_WhenModelStateNotSet()
+        {
+            // Arrange
+            var expected = "The supplied value is invalid for Length.";
+            var dictionary = new ModelStateDictionary();
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), nameof(string.Length));
+
+            // Act
+            dictionary.TryAddModelError("key", new FormatException(), metadata);
+
+            // Assert
+            var error = Assert.Single(dictionary["key"].Errors);
+            Assert.Equal(expected, error.ErrorMessage);
+        }
+
+        [Fact]
+        public void ModelStateDictionary_AddsCustomErrorMessage_WhenModelStateNotSet()
+        {
+            // Arrange
+            var expected = "Hmm, the supplied value is not valid for Length.";
+            var dictionary = new ModelStateDictionary();
+
+            var bindingMetadataProvider = new DefaultBindingMetadataProvider();
+            var compositeProvider = new DefaultCompositeMetadataDetailsProvider(new[] { bindingMetadataProvider });
+            var optionsAccessor = new OptionsAccessor();
+            optionsAccessor.Value.ModelBindingMessageProvider.SetUnknownValueIsInvalidAccessor(
+                name => $"Hmm, the supplied value is not valid for { name }.");
+
+            var provider = new DefaultModelMetadataProvider(compositeProvider, optionsAccessor);
+            var metadata = provider.GetMetadataForProperty(typeof(string), nameof(string.Length));
+
+            // Act
+            dictionary.TryAddModelError("key", new FormatException(), metadata);
+
+            // Assert
+            var entry = Assert.Single(dictionary);
+            Assert.Equal("key", entry.Key);
+            var error = Assert.Single(entry.Value.Errors);
+            Assert.Equal(expected, error.ErrorMessage);
+        }
+
+        [Fact]
+        public void ModelStateDictionary_AddsCustomErrorMessage_WhenModelStateNotSet_WithParameter()
+        {
+            // Arrange
+            var expected = "Hmm, the supplied value is not valid.";
+            var dictionary = new ModelStateDictionary();
+
+            var bindingMetadataProvider = new DefaultBindingMetadataProvider();
+            var compositeProvider = new DefaultCompositeMetadataDetailsProvider(new[] { bindingMetadataProvider });
+            var optionsAccessor = new OptionsAccessor();
+            optionsAccessor.Value.ModelBindingMessageProvider.SetNonPropertyUnknownValueIsInvalidAccessor(
+                () => "Hmm, the supplied value is not valid.");
+
+            var method = typeof(string).GetMethod(nameof(string.Copy));
+            var parameter = method.GetParameters()[0]; // Copy(string str)
+            var provider = new DefaultModelMetadataProvider(compositeProvider, optionsAccessor);
+            var metadata = provider.GetMetadataForParameter(parameter);
+
+            // Act
+            dictionary.TryAddModelError("key", new FormatException(), metadata);
+
+            // Assert
+            var entry = Assert.Single(dictionary);
+            Assert.Equal("key", entry.Key);
+            var error = Assert.Single(entry.Value.Errors);
+            Assert.Equal(expected, error.ErrorMessage);
+        }
+
+        [Fact]
+        public void ModelStateDictionary_AddsCustomErrorMessage_WhenModelStateNotSet_WithType()
+        {
+            // Arrange
+            var expected = "Hmm, the supplied value is not valid.";
+            var dictionary = new ModelStateDictionary();
+
+            var bindingMetadataProvider = new DefaultBindingMetadataProvider();
+            var compositeProvider = new DefaultCompositeMetadataDetailsProvider(new[] { bindingMetadataProvider });
+            var optionsAccessor = new OptionsAccessor();
+            optionsAccessor.Value.ModelBindingMessageProvider.SetNonPropertyUnknownValueIsInvalidAccessor(
+                () => "Hmm, the supplied value is not valid.");
+
+            var provider = new DefaultModelMetadataProvider(compositeProvider, optionsAccessor);
+            var metadata = provider.GetMetadataForType(typeof(int));
+
+            // Act
+            dictionary.TryAddModelError("key", new FormatException(), metadata);
+
+            // Assert
+            var entry = Assert.Single(dictionary);
+            Assert.Equal("key", entry.Key);
+            var error = Assert.Single(entry.Value.Errors);
+            Assert.Equal(expected, error.ErrorMessage);
+        }
+
+        [Fact]
+        public void TryAddModelException_ReturnExceptionMessage_WhenModelStateSet()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.SetModelValue("key", new string[] { "some value" }, "some value");
+            var exception = new FormatException("The value 'some value' is not valid for Length.");
+
+            // Act
+            dictionary.TryAddModelException("key", exception);
+
+            // Assert
+            var error = Assert.Single(dictionary["key"].Errors);
+            Assert.Same(exception, error.Exception);
+        }
+
+        [Fact]
+        public void ModelStateDictionary_ReturnSpecificErrorMessage_WhenModelStateSet()
+        {
+            // Arrange
+            var expected = "The value 'some value' is not valid for Length.";
+            var dictionary = new ModelStateDictionary();
+            dictionary.SetModelValue("key", new string[] { "some value" }, "some value");
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), nameof(string.Length));
+
+            // Act
+            dictionary.TryAddModelError("key", new FormatException(), metadata);
+
+            // Assert
+            var error = Assert.Single(dictionary["key"].Errors);
+            Assert.Equal(expected, error.ErrorMessage);
+        }
+
+        [Fact]
+        public void ModelStateDictionary_AddsCustomErrorMessage_WhenModelStateSet()
+        {
+            // Arrange
+            var expected = "Hmm, the value 'some value' is not valid for Length.";
+            var dictionary = new ModelStateDictionary();
+            dictionary.SetModelValue("key", new string[] { "some value" }, "some value");
+
+            var bindingMetadataProvider = new DefaultBindingMetadataProvider();
+            var compositeProvider = new DefaultCompositeMetadataDetailsProvider(new[] { bindingMetadataProvider });
+            var optionsAccessor = new OptionsAccessor();
+            optionsAccessor.Value.ModelBindingMessageProvider.SetAttemptedValueIsInvalidAccessor(
+                (value, name) => $"Hmm, the value '{ value }' is not valid for { name }.");
+
+            var provider = new DefaultModelMetadataProvider(compositeProvider, optionsAccessor);
+            var metadata = provider.GetMetadataForProperty(typeof(string), nameof(string.Length));
+
+            // Act
+            dictionary.TryAddModelError("key", new FormatException(), metadata);
+
+            // Assert
+            var entry = Assert.Single(dictionary);
+            Assert.Equal("key", entry.Key);
+            var error = Assert.Single(entry.Value.Errors);
+            Assert.Equal(expected, error.ErrorMessage);
+        }
+
+        [Fact]
+        public void ModelStateDictionary_AddsCustomErrorMessage_WhenModelStateSet_WithParameter()
+        {
+            // Arrange
+            var expected = "Hmm, the value 'some value' is not valid.";
+            var dictionary = new ModelStateDictionary();
+            dictionary.SetModelValue("key", new string[] { "some value" }, "some value");
+
+            var bindingMetadataProvider = new DefaultBindingMetadataProvider();
+            var compositeProvider = new DefaultCompositeMetadataDetailsProvider(new[] { bindingMetadataProvider });
+            var optionsAccessor = new OptionsAccessor();
+            optionsAccessor.Value.ModelBindingMessageProvider.SetNonPropertyAttemptedValueIsInvalidAccessor(
+                value => $"Hmm, the value '{ value }' is not valid.");
+
+            var method = typeof(string).GetMethod(nameof(string.Copy));
+            var parameter = method.GetParameters()[0]; // Copy(string str)
+            var provider = new DefaultModelMetadataProvider(compositeProvider, optionsAccessor);
+            var metadata = provider.GetMetadataForParameter(parameter);
+
+            // Act
+            dictionary.TryAddModelError("key", new FormatException(), metadata);
+
+            // Assert
+            var entry = Assert.Single(dictionary);
+            Assert.Equal("key", entry.Key);
+            var error = Assert.Single(entry.Value.Errors);
+            Assert.Equal(expected, error.ErrorMessage);
+        }
+
+        [Fact]
+        public void ModelStateDictionary_AddsCustomErrorMessage_WhenModelStateSet_WithType()
+        {
+            // Arrange
+            var expected = "Hmm, the value 'some value' is not valid.";
+            var dictionary = new ModelStateDictionary();
+            dictionary.SetModelValue("key", new string[] { "some value" }, "some value");
+
+            var bindingMetadataProvider = new DefaultBindingMetadataProvider();
+            var compositeProvider = new DefaultCompositeMetadataDetailsProvider(new[] { bindingMetadataProvider });
+            var optionsAccessor = new OptionsAccessor();
+            optionsAccessor.Value.ModelBindingMessageProvider.SetNonPropertyAttemptedValueIsInvalidAccessor(
+                (value) => $"Hmm, the value '{ value }' is not valid.");
+
+            var provider = new DefaultModelMetadataProvider(compositeProvider, optionsAccessor);
+            var metadata = provider.GetMetadataForType(typeof(int));
+
+            // Act
+            dictionary.TryAddModelError("key", new FormatException(), metadata);
+
+            // Assert
+            var entry = Assert.Single(dictionary);
+            Assert.Equal("key", entry.Key);
+            var error = Assert.Single(entry.Value.Errors);
+            Assert.Equal(expected, error.ErrorMessage);
+        }
+
+        [Fact]
+        public void ModelStateDictionary_NoErrorMessage_ForUnrecognizedException()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.SetModelValue("key", new string[] { "some value" }, "some value");
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), nameof(string.Length));
+
+            // Act
+            dictionary.TryAddModelError("key", new InvalidOperationException(), metadata);
+
+            // Assert
+            var error = Assert.Single(dictionary["key"].Errors);
+            Assert.Empty(error.ErrorMessage);
+        }
+
+        [Fact]
+        public void TryAddModelException_AddsErrorMessage_ForInputFormatterException()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            var exception = new InputFormatterException("This is an InputFormatterException.");
+
+            // Act
+            dictionary.TryAddModelException("key", exception);
+
+            // Assert
+            var entry = Assert.Single(dictionary);
+            Assert.Equal("key", entry.Key);
+            var error = Assert.Single(entry.Value.Errors);
+            Assert.Same(exception, error.Exception);
+        }
+
+        [Fact]
+        public void ModelStateDictionary_AddsErrorMessage_ForInputFormatterException()
+        {
+            // Arrange
+            var expectedMessage = "This is an InputFormatterException";
+            var dictionary = new ModelStateDictionary();
+
+            var bindingMetadataProvider = new DefaultBindingMetadataProvider();
+            var compositeProvider = new DefaultCompositeMetadataDetailsProvider(new[] { bindingMetadataProvider });
+            var provider = new DefaultModelMetadataProvider(compositeProvider, new OptionsAccessor());
+            var metadata = provider.GetMetadataForType(typeof(int));
+
+            // Act
+            dictionary.TryAddModelError("key", new InputFormatterException(expectedMessage), metadata);
+
+            // Assert
+            var entry = Assert.Single(dictionary);
+            Assert.Equal("key", entry.Key);
+            var error = Assert.Single(entry.Value.Errors);
+            Assert.Equal(expectedMessage, error.ErrorMessage);
+        }
+
+        [Fact]
+        public void ModelStateDictionary_ClearEntriesThatMatchWithKey_NonEmptyKey()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.MarkFieldValid("Property1");
+            dictionary.AddModelError("Property2", "Property2 invalid.");
+            dictionary.AddModelError("Property3", "Property invalid.");
+            dictionary.MarkFieldSkipped("Property4");
+
+            // Act
+            dictionary.ClearValidationState("Property1");
+            dictionary.ClearValidationState("Property2");
+            dictionary.ClearValidationState("Property4");
+
+            // Assert
+            Assert.Empty(dictionary["Property1"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["Property1"].ValidationState);
+            Assert.Empty(dictionary["Property2"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["Property2"].ValidationState);
+            Assert.Single(dictionary["Property3"].Errors);
+            Assert.Equal(ModelValidationState.Invalid, dictionary["Property3"].ValidationState);
+            Assert.Empty(dictionary["Property4"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["Property4"].ValidationState);
+        }
+
+        [Fact]
+        public void ModelStateDictionary_ClearEntriesPrefixedWithKey_NonEmptyKey()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.MarkFieldValid("Product");
+            dictionary.AddModelError("Product.Detail1", "Product Detail1 invalid.");
+            dictionary.AddModelError("Product.Detail2[0]", "Product Detail2[0] invalid.");
+            dictionary.AddModelError("Product.Detail2[1]", "Product Detail2[1] invalid.");
+            dictionary.MarkFieldSkipped("Product.Detail2[2]");
+            dictionary.MarkFieldSkipped("Product.Detail3");
+            dictionary.AddModelError("ProductName", "ProductName invalid.");
+
+            // Act
+            dictionary.ClearValidationState("Product");
+
+            // Assert
+            Assert.Empty(dictionary["Product"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["Product"].ValidationState);
+            Assert.Empty(dictionary["Product.Detail1"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["Product.Detail1"].ValidationState);
+            Assert.Empty(dictionary["Product.Detail2[0]"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["Product.Detail2[0]"].ValidationState);
+            Assert.Empty(dictionary["Product.Detail2[1]"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["Product.Detail2[1]"].ValidationState);
+            Assert.Empty(dictionary["Product.Detail2[2]"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["Product.Detail2[2]"].ValidationState);
+            Assert.Empty(dictionary["Product.Detail3"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["Product.Detail3"].ValidationState);
+            Assert.Single(dictionary["ProductName"].Errors);
+            Assert.Equal(ModelValidationState.Invalid, dictionary["ProductName"].ValidationState);
+        }
+
+        [Fact]
+        public void ModelStateDictionary_ClearEntries_KeyHasDot_NonEmptyKey()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.MarkFieldValid("Product");
+            dictionary.AddModelError("Product.Detail1", "Product Detail1 invalid.");
+            dictionary.AddModelError("Product.Detail1.Name", "Product Detail1 Name invalid.");
+            dictionary.MarkFieldSkipped("Product.Detail1Name");
+
+            // Act
+            dictionary.ClearValidationState("Product.Detail1");
+
+            // Assert
+            Assert.Equal(ModelValidationState.Valid, dictionary["Product"].ValidationState);
+            Assert.Empty(dictionary["Product.Detail1"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["Product.Detail1"].ValidationState);
+            Assert.Empty(dictionary["Product.Detail1.Name"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["Product.Detail1.Name"].ValidationState);
+            Assert.Equal(ModelValidationState.Skipped, dictionary["Product.Detail1Name"].ValidationState);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        public void ModelStateDictionary_ClearsAllEntries_EmptyKey(string modelKey)
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.MarkFieldValid("Property1");
+            dictionary.AddModelError("Property2", "Property2 invalid.");
+            dictionary.AddModelError("Property3", "Property invalid.");
+            dictionary.MarkFieldSkipped("Property4");
+
+            // Act
+            dictionary.ClearValidationState(modelKey);
+
+            // Assert
+            Assert.Empty(dictionary["Property1"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["Property1"].ValidationState);
+            Assert.Empty(dictionary["Property2"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["Property2"].ValidationState);
+            Assert.Empty(dictionary["Property3"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["Property3"].ValidationState);
+            Assert.Empty(dictionary["Property4"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["Property4"].ValidationState);
+        }
+
+        [Fact]
+        public void GetEnumerable_ReturnsEmptySequenceWhenDictionaryIsEmpty()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+
+            // Act & Assert
+            Assert.Empty(dictionary);
+        }
+
+        [Fact]
+        public void GetEnumerable_ReturnsAllNonContainerNodes()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.MarkFieldValid("Property1");
+            dictionary.SetModelValue("Property1.Property2", "value", "value");
+            dictionary.AddModelError("Property2", "Property invalid.");
+            dictionary.AddModelError("Property2[Property3]", "Property2[Property3] invalid.");
+            dictionary.MarkFieldSkipped("Property4");
+            dictionary.Remove("Property2");
+
+            // Act & Assert
+            Assert.Collection(
+                dictionary,
+                entry =>
+                {
+                    Assert.Equal("Property1", entry.Key);
+                    Assert.Equal(ModelValidationState.Valid, entry.Value.ValidationState);
+                    Assert.Null(entry.Value.RawValue);
+                    Assert.Null(entry.Value.AttemptedValue);
+                    Assert.Empty(entry.Value.Errors);
+                },
+                entry =>
+                {
+                    Assert.Equal("Property4", entry.Key);
+                    Assert.Equal(ModelValidationState.Skipped, entry.Value.ValidationState);
+                    Assert.Null(entry.Value.RawValue);
+                    Assert.Null(entry.Value.AttemptedValue);
+                    Assert.Empty(entry.Value.Errors);
+                },
+                entry =>
+                {
+                    Assert.Equal("Property1.Property2", entry.Key);
+                    Assert.Equal(ModelValidationState.Unvalidated, entry.Value.ValidationState);
+                    Assert.Equal("value", entry.Value.RawValue);
+                    Assert.Equal("value", entry.Value.AttemptedValue);
+                    Assert.Empty(entry.Value.Errors);
+                },
+                entry =>
+                {
+                    Assert.Equal("Property2[Property3]", entry.Key);
+                    Assert.Equal(ModelValidationState.Invalid, entry.Value.ValidationState);
+                    Assert.Null(entry.Value.RawValue);
+                    Assert.Null(entry.Value.AttemptedValue);
+                    Assert.Collection(entry.Value.Errors,
+                        error => Assert.Equal("Property2[Property3] invalid.", error.ErrorMessage));
+                });
+        }
+
+        [Fact]
+        public void GetEnumerable_WorksCorrectlyWhenSiblingIsAPrefix()
+        {
+            // Arrange
+            var modelStateDictionary = new ModelStateDictionary();
+            modelStateDictionary.SetModelValue("prop", "value1", "value1");
+            modelStateDictionary.SetModelValue("property_name", "value3", "value3");
+            modelStateDictionary.SetModelValue("property", "value2", "value2");
+
+            // Act & Assert
+            Assert.Collection(modelStateDictionary,
+                entry =>
+                {
+                    Assert.Equal("prop", entry.Key);
+                    Assert.Equal("value1", entry.Value.RawValue);
+                },
+                entry =>
+                {
+                    Assert.Equal("property", entry.Key);
+                    Assert.Equal("value2", entry.Value.RawValue);
+                },
+                entry =>
+                {
+                    Assert.Equal("property_name", entry.Key);
+                    Assert.Equal("value3", entry.Value.RawValue);
+                });
+        }
+
+        [Fact]
+        public void KeysEnumerable_ReturnsEmptySequenceWhenDictionaryIsEmpty()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+
+            // Act
+            var keys = dictionary.Keys;
+
+            // Assert
+            Assert.Empty(keys);
+        }
+
+        [Fact]
+        public void KeysEnumerable_ReturnsAllKeys()
+        {
+            // Arrange
+            var expected = new[] { "Property1", "Property4", "Property1.Property2", "Property2[Property3]" };
+            var dictionary = new ModelStateDictionary();
+            dictionary.MarkFieldValid("Property1");
+            dictionary.AddModelError("Property1.Property2", "Property2 invalid.");
+            dictionary.AddModelError("Property2", "Property invalid.");
+            dictionary.AddModelError("Property2[Property3]", "Property2[Property3] invalid.");
+            dictionary.MarkFieldSkipped("Property4");
+            dictionary.Remove("Property2");
+
+            // Act
+            var keys = dictionary.Keys;
+
+            // Assert
+            Assert.Equal(expected, keys);
+        }
+
+        [Fact]
+        public void ValuesEnumerable_ReturnsEmptySequenceWhenDictionaryIsEmpty()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+
+            // Act
+            var values = dictionary.Values;
+
+            // Assert
+            Assert.Empty(values);
+        }
+
+        [Fact]
+        public void ValuesEnumerable_ReturnsAllEntries()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.MarkFieldValid("Property1");
+            dictionary.SetModelValue("Property1.Property2", "value", "value");
+            dictionary.AddModelError("Property2", "Property invalid.");
+            dictionary.AddModelError("Property2[Property3]", "Property2[Property3] invalid.");
+            dictionary.MarkFieldSkipped("Property4");
+            dictionary.Remove("Property2");
+
+            // Act & Assert
+            Assert.Collection(dictionary.Values,
+                value =>
+                {
+                    Assert.Equal(ModelValidationState.Valid, value.ValidationState);
+                    Assert.Null(value.RawValue);
+                    Assert.Null(value.AttemptedValue);
+                    Assert.Empty(value.Errors);
+                },
+                value =>
+                {
+                    Assert.Equal(ModelValidationState.Skipped, value.ValidationState);
+                    Assert.Null(value.RawValue);
+                    Assert.Null(value.AttemptedValue);
+                    Assert.Empty(value.Errors);
+                },
+                value =>
+                {
+                    Assert.Equal(ModelValidationState.Unvalidated, value.ValidationState);
+                    Assert.Equal("value", value.RawValue);
+                    Assert.Equal("value", value.AttemptedValue);
+                    Assert.Empty(value.Errors);
+                },
+                value =>
+                {
+                    Assert.Equal(ModelValidationState.Invalid, value.ValidationState);
+                    Assert.Null(value.RawValue);
+                    Assert.Null(value.AttemptedValue);
+                    Assert.Collection(
+                        value.Errors,
+                        error => Assert.Equal("Property2[Property3] invalid.", error.ErrorMessage));
+                });
+        }
+
+        [Fact]
+        public void GetModelStateForProperty_ReturnsModelStateForImmediateChildren()
+        {
+            // Arrange
+            var modelStateDictionary = new ModelStateDictionary();
+            modelStateDictionary.SetModelValue("property1", "value1", "value1");
+            modelStateDictionary.SetModelValue("property1.property2", "value2", "value2");
+
+            // Act 1
+            var property1 = modelStateDictionary.Root.GetModelStateForProperty("property1");
+            var property2 = modelStateDictionary.Root.GetModelStateForProperty("property1.property2");
+
+            // Assert 1
+            Assert.Equal("value1", property1.RawValue);
+            Assert.Null(property2);
+
+            // Act 2
+            property2 = property1.GetModelStateForProperty("property2");
+            Assert.Equal("value2", property2.RawValue);
+        }
+
+        [Fact]
+        public void GetModelStateForProperty_ReturnsModelStateForIndexedChildren()
+        {
+            // Arrange
+            var modelStateDictionary = new ModelStateDictionary();
+            modelStateDictionary.SetModelValue("[property]", "value1", "value1");
+
+            // Act
+            var property = modelStateDictionary.Root.GetModelStateForProperty("[property]");
+
+            // Assert
+            Assert.Equal("value1", property.RawValue);
+        }
+
+        private class OptionsAccessor : IOptions<MvcOptions>
+        {
+            public MvcOptions Value { get; } = new MvcOptions();
+        }
+    }
+
+    internal class TestException : Exception
+    {
+        public TestException()
+        {
+            Message = "This is a test exception";
+        }
+
+        public override string Message { get; }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ValueProviderResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ValueProviderResultTest.cs
new file mode 100644
index 0000000000..dd639bc564
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ValueProviderResultTest.cs
@@ -0,0 +1,194 @@
+// 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.
+
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class ValueProviderResultTest
+    {
+        [Fact]
+        public void Construct_With_NullString()
+        {
+            // Arrange & Act
+            var result = new ValueProviderResult((string)null);
+
+            // Assert
+            Assert.Equal(0, result.Length);
+            Assert.Empty(result.Values);
+            Assert.Null(result.FirstValue);
+            Assert.Equal(ValueProviderResult.None, result);
+            Assert.Null((string)result);
+            Assert.Null((string[])result);
+        }
+
+        [Fact]
+        public void Construct_With_NullArray()
+        {
+            // Arrange & Act
+            var result = new ValueProviderResult((string[])null);
+
+            // Assert
+            Assert.Equal(0, result.Length);
+            Assert.Empty(result.Values);
+            Assert.Null(result.FirstValue);
+            Assert.Equal(ValueProviderResult.None, result);
+            Assert.Null((string)result);
+            Assert.Null((string[])result);
+        }
+
+        [Fact]
+        public void Construct_With_None()
+        {
+            // Arrange & Act
+            var result = ValueProviderResult.None;
+
+            // Assert
+            Assert.Equal(0, result.Length);
+            Assert.Empty(result.Values);
+            Assert.Null(result.FirstValue);
+            Assert.Equal(ValueProviderResult.None, result);
+            Assert.Equal(ValueProviderResult.None, new ValueProviderResult(new StringValues()));
+            Assert.Null((string)result);
+            Assert.Empty((string[])result);
+        }
+
+        [Fact]
+        public void Construct_With_String()
+        {
+            // Arrange & Act
+            var result = new ValueProviderResult("Hi There");
+
+            // Assert
+            Assert.Equal(1, result.Length);
+            Assert.Equal("Hi There", result.Values);
+            Assert.Equal("Hi There", result.FirstValue);
+            Assert.NotEqual(ValueProviderResult.None, result);
+            Assert.Equal("Hi There", (string)result);
+            Assert.Equal(new string[] { "Hi There" }, (string[])result);
+        }
+
+        [Fact]
+        public void Construct_With_Array()
+        {
+            // Arrange & Act
+            var result = new ValueProviderResult(new string[] { "Hi", "There" });
+
+            // Assert
+            Assert.Equal(2, result.Length);
+            Assert.Equal(new string[] { "Hi", "There" }, result.Values);
+            Assert.Equal("Hi", result.FirstValue);
+            Assert.NotEqual(ValueProviderResult.None, result);
+            Assert.Equal("Hi,There", (string)result);
+            Assert.Equal(new string[] { "Hi", "There" }, (string[])result);
+        }
+
+        [Fact]
+        public void Enumerator_WithString()
+        {
+            // Arrange
+            var result = new ValueProviderResult("Hi There");
+
+            // Act & Assert
+            Assert.Equal<string>(new string[] { "Hi There", }, result);
+        }
+
+        [Fact]
+        public void Enumerator_WithArray()
+        {
+            // Arrange
+            var result = new ValueProviderResult(new string[] { "Hi", "There" });
+
+            // Act & Assert
+            Assert.Equal<string>(new string[] { "Hi", "There" }, result);
+        }
+
+        public static TheoryData<ValueProviderResult, ValueProviderResult, bool> EqualsData
+        {
+            get
+            {
+                return new TheoryData<ValueProviderResult, ValueProviderResult, bool>()
+                {
+                    {
+                        new ValueProviderResult("Hi"),
+                        new ValueProviderResult("Hi"),
+                        true
+                    },
+                    {
+                        new ValueProviderResult("Hi"),
+                        new ValueProviderResult(new string[] { "Hi"}),
+                        true
+                    },
+                    {
+                        new ValueProviderResult(new string[] { "Hi"}),
+                        new ValueProviderResult("Hi"),
+                        true
+                    },
+                    {
+                        new ValueProviderResult(new string[] { "Hi"}),
+                        new ValueProviderResult(new string[] { "Hi"}),
+                        true
+                    },
+                    {
+                        new ValueProviderResult(new string[] { "Hi", "There"}),
+                        new ValueProviderResult(new string[] { "Hi", "There"}),
+                        true
+                    },
+                    {
+                        new ValueProviderResult("Hi,There"),
+                        new ValueProviderResult(new string[] { "Hi", "There"}),
+                        false
+                    },
+                    {
+                        new ValueProviderResult(new string[] { "Hi", string.Empty }),
+                        new ValueProviderResult(new string[] { "Hi", "There"}),
+                        false
+                    },
+                    {
+                        new ValueProviderResult(new string[] { "Hi", "There" }),
+                        new ValueProviderResult(new string[] { "Hi", "ThEre"}),
+                        false
+                    },
+                    {
+                        new ValueProviderResult(new string[] { "Hi", }),
+                        new ValueProviderResult(new string[] { "Hi", string.Empty }),
+                        false
+                    },
+                    {
+                        new ValueProviderResult(),
+                        new ValueProviderResult((string)null),
+                        true
+                    },
+                    {
+                        new ValueProviderResult(),
+                        new ValueProviderResult("hi"),
+                        false
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(EqualsData))]
+        public void Operator_Equals(ValueProviderResult x, ValueProviderResult y, bool expected)
+        {
+            // Arrange
+            var result = x == y;
+
+            // Act & Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Theory]
+        [MemberData(nameof(EqualsData))]
+        public void Operator_NotEquals(ValueProviderResult x, ValueProviderResult y, bool expected)
+        {
+            // Arrange
+            var result = x != y;
+
+            // Act & Assert
+            Assert.NotEqual(expected, result);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Properties/AssemblyInfo.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..3337ebeac2
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// 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.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/ActionsMustNotBeAsyncVoidFacts.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/ActionsMustNotBeAsyncVoidFacts.cs
new file mode 100644
index 0000000000..1d536be95a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/ActionsMustNotBeAsyncVoidFacts.cs
@@ -0,0 +1,174 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Analyzers.Infrastructure;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    public class ActionsMustNotBeAsyncVoidFacts : AnalyzerTestBase
+    {
+        protected override DiagnosticAnalyzer DiagnosticAnalyzer { get; }
+            = new ActionsMustNotBeAsyncVoidAnalyzer();
+
+        protected override CodeFixProvider CodeFixProvider { get; }
+            = new ActionsMustNotBeAsyncVoidFixProvider();
+
+        [Fact]
+        public async Task NoDiagnosticsAreReturned_FoEmptyScenarios()
+        {
+            // Arrange
+            var test = @"";
+            var project = CreateProject(test);
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async Task NoDiagnosticsAreReturned_WhenMethodIsNotAControllerAction()
+        {
+            // Arrange
+            var test =
+@"
+using System.Threading.Tasks;
+
+public class UserViewModel
+{
+    public async void Index() => await Task.Delay(10);
+}";
+            var project = CreateProject(test);
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async Task DiagnosticsAreReturned_WhenMethodIsAControllerAction()
+        {
+            // Arrange
+            var expectedDiagnostic = new DiagnosticResult
+            {
+                Id = "MVC7003",
+                Message = "Controller actions must not have async void signature.",
+                Severity = DiagnosticSeverity.Warning,
+                Locations = new[] { new DiagnosticResultLocation("Test.cs", 7, 18) }
+            };
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
+
+public class HomeController : Controller
+{
+    public async void Index()
+    {
+        await Response.Body.FlushAsync();
+    }
+}";
+            var expectedFix =
+@"
+using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
+
+public class HomeController : Controller
+{
+    public async Task Index()
+    {
+        await Response.Body.FlushAsync();
+    }
+}";
+            var project = CreateProject(test);
+
+            // Act & Assert
+            var actualDiagnostics = await GetDiagnosticAsync(project);
+            Assert.DiagnosticsEqual(new[] { expectedDiagnostic }, actualDiagnostics);
+            var actualFix = await ApplyCodeFixAsync(project, actualDiagnostics);
+            Assert.Equal(expectedFix, actualFix, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task DiagnosticsAreReturned_WhenActionMethodIsExpressionBodied()
+        {
+            // Arrange
+            var expectedDiagnostic = new DiagnosticResult
+            {
+                Id = "MVC7003",
+                Message = "Controller actions must not have async void signature.",
+                Severity = DiagnosticSeverity.Warning,
+                Locations = new[] { new DiagnosticResultLocation("Test.cs", 7, 18) }
+            };
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
+
+public class HomeController : Controller
+{
+    public async void Index() => await Response.Body.FlushAsync();
+}";
+            var expectedFix =
+@"
+using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
+
+public class HomeController : Controller
+{
+    public async Task Index() => await Response.Body.FlushAsync();
+}";
+            var project = CreateProject(test);
+
+            // Act & Assert
+            var actualDiagnostics = await GetDiagnosticAsync(project);
+            Assert.DiagnosticsEqual(new[] { expectedDiagnostic }, actualDiagnostics);
+            var actualFix = await ApplyCodeFixAsync(project, actualDiagnostics);
+            Assert.Equal(expectedFix, actualFix, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task CodeFix_ProducesFullyQualifiedNamespaces()
+        {
+            // Arrange
+            var expectedDiagnostic = new DiagnosticResult
+            {
+                Id = "MVC7003",
+                Message = "Controller actions must not have async void signature.",
+                Severity = DiagnosticSeverity.Warning,
+                Locations = new[] { new DiagnosticResultLocation("Test.cs", 6, 18) }
+            };
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+public class HomeController : Controller
+{
+    public async void Index() => await Response.Body.FlushAsync();
+}";
+            var expectedFix =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+public class HomeController : Controller
+{
+    public async System.Threading.Tasks.Task Index() => await Response.Body.FlushAsync();
+}";
+            var project = CreateProject(test);
+
+            // Act & Assert
+            var actualDiagnostics = await GetDiagnosticAsync(project);
+            Assert.DiagnosticsEqual(new[] { expectedDiagnostic }, actualDiagnostics);
+            var actualFix = await ApplyCodeFixAsync(project, actualDiagnostics);
+            Assert.Equal(expectedFix, actualFix, ignoreLineEndingDifferences: true);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/ApActionsDoNotRequireExplicitModelValidationCheckFacts.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/ApActionsDoNotRequireExplicitModelValidationCheckFacts.cs
new file mode 100644
index 0000000000..d74c584349
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/ApActionsDoNotRequireExplicitModelValidationCheckFacts.cs
@@ -0,0 +1,361 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Analyzers.Infrastructure;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    public class ApiActionsDoNotRequireExplicitModelValidationCheckFacts : AnalyzerTestBase
+    {
+        protected override DiagnosticAnalyzer DiagnosticAnalyzer { get; }
+            = new ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer();
+
+        protected override CodeFixProvider CodeFixProvider { get; }
+            = new ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProvider();
+
+        [Fact]
+        public async Task NoDiagnosticsAreReturned_FoEmptyScenarios()
+        {
+            // Arrange
+            var test = @"";
+            var project = CreateProject(test);
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async Task NoDiagnosticsAreReturned_WhenTypeIsNotApiController()
+        {
+            // Arrange
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+public class HomeController : Controller
+{
+    public IActionResult Index() => View();
+}";
+            var project = CreateProject(test);
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async Task NoDiagnosticsAreReturned_WhenActionDoesNotHaveModelStateCheck()
+        {
+            // Arrange
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+[ApiController]
+public class PetController : Controller
+{
+    public IActionResult GetPetId()
+    {
+        return Ok(new object());
+    }
+}";
+            var project = CreateProject(test);
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async Task NoDiagnosticsAreReturned_WhenAActionsUseExpressionBodies()
+        {
+            // Arrange
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+[ApiController]
+public class PetController : Controller
+{
+    public IActionResult GetPetId() => ModelState.IsVald ? OK() : BadResult();
+}";
+            var project = CreateProject(test);
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async Task NoDiagnosticsAreReturned_ForNonActions()
+        {
+            // Arrange
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+[ApiController]
+public class PetController : ControllerBase
+{
+    private int GetPetIdPrivate() => 0;
+    protected int GetPetIdProtected() => 0;
+    public static IActionResult FindPetByStatus(int status) => null;
+    [NonAction]
+    public object Reset(int state) => null;
+}";
+
+            var project = CreateProject(test);
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public Task DiagnosticsAndCodeFixes_WhenActionHasModelStateIsValidCheck()
+        {
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+[ApiController]
+public class PetController : ControllerBase
+{
+    public IActionResult GetPetId()
+    {
+        if (!ModelState.IsValid)
+        {
+            return BadRequest();
+        }
+
+        return Ok();
+    }
+}";
+
+            // Act & Assert
+            return VerifyAsync(test);
+        }
+
+
+        [Fact]
+        public Task DiagnosticsAndCodeFixes_WhenActionHasModelStateIsValidCheck_UsingComparisonToFalse()
+        {
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+[ApiController]
+public class PetController : ControllerBase
+{
+    public IActionResult GetPetId()
+    {
+        if (ModelState.IsValid == false)
+        {
+            return BadRequest();
+        }
+
+        return Ok();
+    }
+}";
+
+            // Act & Assert
+            return VerifyAsync(test);
+        }
+
+        [Fact]
+        public Task DiagnosticsAndCodeFixes_WhenActionHasModelStateIsValidCheck_WithoutBraces()
+        {
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+[ApiController]
+public class PetController : ControllerBase
+{
+    public IActionResult GetPetId()
+    {
+        if (!ModelState.IsValid)
+            return BadRequest();
+
+        return Ok();
+    }
+}";
+            return VerifyAsync(test);
+        }
+
+        private async Task VerifyAsync(string test)
+        {
+            // Arrange
+            var expectedDiagnostic = new DiagnosticResult
+            {
+                Id = "MVC7001",
+                Message = "Actions on types annotated with ApiControllerAttribute do not require explicit ModelState validity check.",
+                Severity = DiagnosticSeverity.Warning,
+                Locations = new[] { new DiagnosticResultLocation("Test.cs", 9, 9) }
+            };
+            var expectedFix =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+[ApiController]
+public class PetController : ControllerBase
+{
+    public IActionResult GetPetId()
+    {
+        return Ok();
+    }
+}";
+            var project = CreateProject(test);
+
+            // Act & Assert
+            var actualDiagnostics = await GetDiagnosticAsync(project);
+            Assert.DiagnosticsEqual(new[] { expectedDiagnostic }, actualDiagnostics);
+            var actualFix = await ApplyCodeFixAsync(project, actualDiagnostics);
+            Assert.Equal(expectedFix, actualFix, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task DiagnosticsAndCodeFixes_WhenModelStateIsInElseIf()
+        {
+            // Arrange
+            var expectedDiagnostic = new DiagnosticResult
+            {
+                Id = "MVC7001",
+                Message = "Actions on types annotated with ApiControllerAttribute do not require explicit ModelState validity check.",
+                Severity = DiagnosticSeverity.Warning,
+                Locations = new[] { new DiagnosticResultLocation("Test.cs", 13, 9) }
+            };
+
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+[ApiController]
+public class PetController : ControllerBase
+{
+    public IActionResult GetPetId()
+    {
+        if (User == null)
+        {
+            return Unauthorized();
+        }
+        else if (!ModelState.IsValid)
+        {
+            return BadRequest(ModelState);
+        }
+
+        return Ok();
+    }
+}";
+            var expectedFix =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+[ApiController]
+public class PetController : ControllerBase
+{
+    public IActionResult GetPetId()
+    {
+        if (User == null)
+        {
+            return Unauthorized();
+        }
+
+        return Ok();
+    }
+}";
+            var project = CreateProject(test);
+
+            // Act & Assert
+            var actualDiagnostics = await GetDiagnosticAsync(project);
+            Assert.DiagnosticsEqual(new[] { expectedDiagnostic }, actualDiagnostics);
+            var actualFix = await ApplyCodeFixAsync(project, actualDiagnostics);
+            Assert.Equal(expectedFix, actualFix, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task DiagnosticsAndCodeFixes_WhenModelStateIsInNestedBlock()
+        {
+            // Arrange
+            var expectedDiagnostic = new DiagnosticResult
+            {
+                Id = "MVC7001",
+                Message = "Actions on types annotated with ApiControllerAttribute do not require explicit ModelState validity check.",
+                Severity = DiagnosticSeverity.Warning,
+                Locations = new[] { new DiagnosticResultLocation("Test.cs", 15, 13) }
+            };
+
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+[ApiController]
+public class PetController : ControllerBase
+{
+    public IActionResult GetPetId()
+    {
+        if (User == null)
+        {
+            return Unauthorized();
+        }
+        else
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
+
+            Debug.Assert(ModelState.Count == 0);
+        }
+
+        return Ok();
+    }
+}";
+            var expectedFix =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+[ApiController]
+public class PetController : ControllerBase
+{
+    public IActionResult GetPetId()
+    {
+        if (User == null)
+        {
+            return Unauthorized();
+        }
+        else
+        {
+            Debug.Assert(ModelState.Count == 0);
+        }
+
+        return Ok();
+    }
+}";
+
+            var project = CreateProject(test);
+
+            // Act & Assert
+            var actualDiagnostics = await GetDiagnosticAsync(project);
+            Assert.DiagnosticsEqual(new[] { expectedDiagnostic }, actualDiagnostics);
+            var actualFix = await ApplyCodeFixAsync(project, actualDiagnostics);
+            Assert.Equal(expectedFix, actualFix, ignoreLineEndingDifferences: true);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/ApiActionsAreAttributeRoutedFacts.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/ApiActionsAreAttributeRoutedFacts.cs
new file mode 100644
index 0000000000..c9225692aa
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/ApiActionsAreAttributeRoutedFacts.cs
@@ -0,0 +1,294 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Analyzers.Infrastructure;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    public class ApiActionsAreAttributeRoutedFacts : AnalyzerTestBase
+    {
+        protected override DiagnosticAnalyzer DiagnosticAnalyzer { get; }
+            = new ApiActionsAreAttributeRoutedAnalyzer();
+
+        protected override CodeFixProvider CodeFixProvider { get; }
+            = new ApiActionsAreAttributeRoutedFixProvider();
+
+        [Fact]
+        public async Task NoDiagnosticsAreReturned_FoEmptyScenarios()
+        {
+            // Arrange
+            var test = @"";
+            var project = CreateProject(test);
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async Task NoDiagnosticsAreReturned_WhenTypeIsNotApiController()
+        {
+            // Arrange
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+public class HomeController : Controller
+{
+    public IActionResult Index() => View();
+}";
+            var project = CreateProject(test);
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async Task NoDiagnosticsAreReturned_WhenApiControllerActionHasAttribute()
+        {
+            // Arrange
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+[ApiController]
+public class PetController : Controller
+{
+    [HttpGet]
+    public int GetPetId() => 0;
+}";
+            var project = CreateProject(test);
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async Task NoDiagnosticsAreReturned_ForConstructors()
+        {
+            // Arrange
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+[ApiController]
+public class PetController : Controller
+{
+    public PetController(){ }
+}";
+            var project = CreateProject(test);
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async Task NoDiagnosticsAreReturned_ForNonActions()
+        {
+            // Arrange
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+[ApiController]
+public class PetController : Controller
+{
+    private int GetPetIdPrivate() => 0;
+    protected int GetPetIdProtected() => 0;
+    public static IActionResult FindPetByStatus(int status) => null;
+    [NonAction]
+    public object Reset(int state) => null;
+}";
+            var project = CreateProject(test);
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async Task DiagnosticsAndCodeFixes_WhenApiControllerActionDoesNotHaveAttribute()
+        {
+            // Arrange
+            var expectedDiagnostic = new DiagnosticResult
+            {
+                Id = "MVC7000",
+                Message = "Actions on types annotated with ApiControllerAttribute must be attribute routed.",
+                Severity = DiagnosticSeverity.Warning,
+                Locations = new[] { new DiagnosticResultLocation("Test.cs", 8, 16) }
+            };
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+[ApiController]
+[Route]
+public class PetController : Controller
+{
+    public int GetPetId() => 0;
+}";
+            var expectedFix =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+[ApiController]
+[Route]
+public class PetController : Controller
+{
+    [HttpGet]
+    public int GetPetId() => 0;
+}";
+            var project = CreateProject(test);
+
+            // Act & Assert
+            var actualDiagnostics = await GetDiagnosticAsync(project);
+            Assert.DiagnosticsEqual(new[] { expectedDiagnostic }, actualDiagnostics);
+            var actualFix = await ApplyCodeFixAsync(project, actualDiagnostics);
+            Assert.Equal(expectedFix, actualFix, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task CodeFixes_ApplyFullyQualifiedNames()
+        {
+            // Arrange
+            var test =
+@"
+[Microsoft.AspNetCore.Mvc.ApiController]
+[Microsoft.AspNetCore.Mvc.Route]
+public class PetController
+{
+    public object GetPet() => null;
+}";
+            var expectedFix =
+@"
+[Microsoft.AspNetCore.Mvc.ApiController]
+[Microsoft.AspNetCore.Mvc.Route]
+public class PetController
+{
+    [Microsoft.AspNetCore.Mvc.HttpGet]
+    public object GetPet() => null;
+}";
+            var project = CreateProject(test);
+
+            // Act & Assert
+            var actualDiagnostics = await GetDiagnosticAsync(project);
+            var actualFix = await ApplyCodeFixAsync(project, actualDiagnostics);
+            Assert.Equal(expectedFix, actualFix, ignoreLineEndingDifferences: true);
+        }
+
+        [Theory]
+        [InlineData("id")]
+        [InlineData("petId")]
+        public async Task CodeFixes_WithIdParameter(string idParameter)
+        {
+            // Arrange
+            var test =
+$@"
+using Microsoft.AspNetCore.Mvc;
+[ApiController]
+[Route]
+public class PetController
+{{
+    public IActionResult Post(string notid, int {idParameter}) => null;
+}}";
+            var expectedFix =
+$@"
+using Microsoft.AspNetCore.Mvc;
+[ApiController]
+[Route]
+public class PetController
+{{
+    [HttpPost(""{{{idParameter}}}"")]
+    public IActionResult Post(string notid, int {idParameter}) => null;
+}}";
+            var project = CreateProject(test);
+
+            // Act & Assert
+            var actualDiagnostics = await GetDiagnosticAsync(project);
+            var actualFix = await ApplyCodeFixAsync(project, actualDiagnostics);
+            Assert.Equal(expectedFix, actualFix, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task CodeFixes_WithRouteParameter()
+        {
+            // Arrange
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+[ApiController]
+[Route]
+public class PetController
+{
+    public IActionResult DeletePetByStatus([FromRoute] Status status, [FromRoute] Category category) => null;
+}";
+            var expectedFix =
+@"
+using Microsoft.AspNetCore.Mvc;
+[ApiController]
+[Route]
+public class PetController
+{
+    [HttpDelete(""{status}/{category}"")]
+    public IActionResult DeletePetByStatus([FromRoute] Status status, [FromRoute] Category category) => null;
+}";
+            var project = CreateProject(test);
+
+            // Act & Assert
+            var actualDiagnostics = await GetDiagnosticAsync(project);
+            var actualFix = await ApplyCodeFixAsync(project, actualDiagnostics);
+            Assert.Equal(expectedFix, actualFix, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task CodeFixes_WhenAttributeCannotBeInferred()
+        {
+            // Arrange
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+[ApiController]
+[Route]
+public class PetController
+{
+    public IActionResult ModifyPet() => null;
+}";
+            var expectedFix =
+@"
+using Microsoft.AspNetCore.Mvc;
+[ApiController]
+[Route]
+public class PetController
+{
+    [HttpPut]
+    public IActionResult ModifyPet() => null;
+}";
+            var project = CreateProject(test);
+
+            // Act & Assert
+            var actualDiagnostics = await GetDiagnosticAsync(project);
+            // There isn't a good way to test all fixes simultaneously. We'll pick the last one to verify when we
+            // expect to have 4 fixes.
+            var actualFix = await ApplyCodeFixAsync(project, actualDiagnostics, codeFixIndex: 3);
+            Assert.Equal(expectedFix, actualFix, ignoreLineEndingDifferences: true);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/ApiActionsShouldUseActionResultOfTFacts.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/ApiActionsShouldUseActionResultOfTFacts.cs
new file mode 100644
index 0000000000..5dc16ac2fe
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/ApiActionsShouldUseActionResultOfTFacts.cs
@@ -0,0 +1,257 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Analyzers.Infrastructure;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    public class ApiActionsShouldUseActionResultOfTFacts : AnalyzerTestBase
+    {
+        protected override DiagnosticAnalyzer DiagnosticAnalyzer { get; }
+            = new ApiActionsShouldUseActionResultOfTAnalyzer();
+
+        protected override CodeFixProvider CodeFixProvider { get; }
+            = new ApiActionsShouldUseActionResultOfTCodeFixProvider();
+
+        [Fact]
+        public async Task NoDiagnosticsAreReturned_FoEmptyScenarios()
+        {
+            // Arrange
+            var test = @"";
+            var project = CreateProject(test);
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async Task NoDiagnosticsAreReturned_WhenTypeIsNotApiController()
+        {
+            // Arrange
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+public class HomeController:  ControllerBase
+{
+    public IActionResult Index() => View();
+}";
+            var project = CreateProject(test);
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async Task NoDiagnosticsAreReturned_ForNonActions()
+        {
+            // Arrange
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+[ApiController]
+public class PetController:  ControllerBaseBase
+{
+    private int GetPetIdPrivate() => 0;
+    protected int GetPetIdProtected() => 0;
+    public static IActionResult FindPetByStatus(int status) => null;
+    [NonAction]
+    public object Reset(int state) => null;
+}";
+            var project = CreateProject(test);
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async Task NoDiagnosticsAreReturned_WhenActionAreExpressionBodiedMembers()
+        {
+            // Arrange
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+[ApiController]
+public class PetController:  ControllerBase
+{
+    public IActionResult GetPetId() => ModelState.IsValid ? OK(new object()) : BadResult();
+}";
+            var project = CreateProject(test);
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Theory]
+        [InlineData("Pet")]
+        [InlineData("List<Pet>")]
+        [InlineData("System.Threading.Task<Pet>")]
+        public async Task NoDiagnosticsAreReturned_WhenTypeReturnsNonObjectResult(string returnType)
+        {
+            // Arrange
+            var test =
+$@"
+using Microsoft.AspNetCore.Mvc;
+
+public class Pet {{ }}
+
+[ApiController]
+public class PetController:  ControllerBase
+{{
+    public {returnType} GetPetId() => null;
+}}";
+            var project = CreateProject(test);
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async     Task NoDiagnosticsAreReturned_WhenTypeReturnsActionResultOfT()
+        {
+            // Arrange
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+public class Pet { }
+
+[ApiController]
+public class PetController:  ControllerBase
+{
+    public ActionResult<Pet> GetPetId() => null;
+}";
+            var project = CreateProject(test);
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async Task DiagnosticsAreReturned_WhenActionsReturnIActionResult()
+        {
+            // Arrange
+            var expectedDiagnostic = new DiagnosticResult
+            {
+                Id = "MVC7002",
+                Message = "Actions on types annotated with ApiControllerAttribute should return ActionResult<T>.",
+                Severity = DiagnosticSeverity.Warning,
+                Locations = new[] { new DiagnosticResultLocation("Test.cs", 9, 12) }
+            };
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+public class Pet {}
+
+[ApiController]
+public class PetController:  ControllerBase
+{
+    public IActionResult GetPet()
+    {
+        return Ok(new Pet());
+    }
+}";
+            var expectedFix =
+@"
+using Microsoft.AspNetCore.Mvc;
+
+public class Pet {}
+
+[ApiController]
+public class PetController:  ControllerBase
+{
+    public ActionResult<Pet> GetPet()
+    {
+        return Ok(new Pet());
+    }
+}";
+            var project = CreateProject(test);
+
+            // Act
+            var actualDiagnostics = await GetDiagnosticAsync(project);
+            Assert.DiagnosticsEqual(new[] { expectedDiagnostic }, actualDiagnostics);
+
+            var actualFix = await ApplyCodeFixAsync(project, actualDiagnostics);
+            Assert.Equal(expectedFix, actualFix, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task DiagnosticsAreReturned_WhenActionReturnsAsyncIActionResult()
+        {
+            // Arrange
+            var expectedDiagnostic = new DiagnosticResult
+            {
+                Id = "MVC7002",
+                Message = "Actions on types annotated with ApiControllerAttribute should return ActionResult<T>.",
+                Severity = DiagnosticSeverity.Warning,
+                Locations = new[] { new DiagnosticResultLocation("Test.cs", 8, 18) }
+            };
+
+            var test =
+@"
+using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
+
+[ApiController]
+public class PetController:  ControllerBase
+{
+    public async Task<IActionResult> GetPet()
+    {
+        await Task.Delay(0);
+        return Ok(new Pet());
+    }
+}
+public class Pet {}";
+
+            var expectedFix =
+@"
+using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
+
+[ApiController]
+public class PetController:  ControllerBase
+{
+    public async Task<ActionResult<Pet>> GetPet()
+    {
+        await Task.Delay(0);
+        return Ok(new Pet());
+    }
+}
+public class Pet {}";
+            var project = CreateProject(test);
+
+            // Act & Assert
+            var actualDiagnostics = await GetDiagnosticAsync(project);
+            Assert.DiagnosticsEqual(new[] { expectedDiagnostic }, actualDiagnostics);
+
+            var actualFix = await ApplyCodeFixAsync(project, actualDiagnostics);
+            Assert.Equal(expectedFix, actualFix, ignoreLineEndingDifferences: true);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test.csproj
new file mode 100644
index 0000000000..b5d9571c75
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+    <Compile Include="..\Microsoft.AspNetCore.Mvc.Analyzers.Test\Infrastructure\*.cs" Link="Infrastructure\%(FileName)%(Extension)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Analyzers.Experimental\Microsoft.AspNetCore.Mvc.Analyzers.Experimental.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/xunit.runner.json b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/xunit.runner.json
new file mode 100644
index 0000000000..1c72a421ad
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.Test/xunit.runner.json
@@ -0,0 +1,3 @@
+{
+  "shadowCopy": false
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/AvoidHtmlPartialAnalyzerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/AvoidHtmlPartialAnalyzerTest.cs
new file mode 100644
index 0000000000..1dc47a4110
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/AvoidHtmlPartialAnalyzerTest.cs
@@ -0,0 +1,202 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Analyzers.Infrastructure;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    public class AvoidHtmlPartialAnalyzerTest : AnalyzerTestBase
+    {
+        private static DiagnosticDescriptor DiagnosticDescriptor = DiagnosticDescriptors.MVC1000_HtmlHelperPartialShouldBeAvoided;
+
+        protected override DiagnosticAnalyzer DiagnosticAnalyzer { get; } = new AvoidHtmlPartialAnalyzer();
+
+        [Fact]
+        public async Task NoDiagnosticsAreReturned_FoEmptyScenarios()
+        {
+            // Arrange
+            var project = CreateProject(source: string.Empty);
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async Task NoDiagnosticsAreReturned_ForNonUseOfHtmlPartial()
+        {
+            // Arrange
+            var project = CreateProjectFromFile();
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async Task NoDiagnosticsAreReturned_ForUseOfHtmlPartialAsync()
+        {
+            // Arrange
+            var project = CreateProjectFromFile();
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async Task DiagnosticsAreReturned_ForUseOfHtmlPartial()
+        {
+            // Arrange
+            var project = CreateProjectFromFile();
+            var expectedLocation = DefaultMarkerLocation.Value;
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Collection(
+                result,
+                diagnostic =>
+                {
+
+                    Assert.Equal(DiagnosticDescriptor.Id, diagnostic.Id);
+                    Assert.Same(DiagnosticDescriptor, diagnostic.Descriptor);
+                    Assert.DiagnosticLocation(expectedLocation, diagnostic.Location);
+                });
+        }
+
+        [Fact]
+        public async Task DiagnosticsAreReturned_ForUseOfHtmlPartial_WithAdditionalParameters()
+        {
+            // Arrange
+            var project = CreateProjectFromFile();
+            var expectedLocation = DefaultMarkerLocation.Value;
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Collection(
+                result,
+                diagnostic =>
+                {
+
+                    Assert.Equal(DiagnosticDescriptor.Id, diagnostic.Id);
+                    Assert.Same(DiagnosticDescriptor, diagnostic.Descriptor);
+                    Assert.DiagnosticLocation(expectedLocation, diagnostic.Location);
+                });
+        }
+
+        [Fact]
+        public async Task DiagnosticsAreReturned_ForUseOfHtmlPartial_InSections()
+        {
+            // Arrange
+            var project = CreateProjectFromFile();
+            var expectedLocation = DefaultMarkerLocation.Value;
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Collection(
+                result,
+                diagnostic =>
+                {
+
+                    Assert.Equal(DiagnosticDescriptor.Id, diagnostic.Id);
+                    Assert.Same(DiagnosticDescriptor, diagnostic.Descriptor);
+                    Assert.DiagnosticLocation(expectedLocation, diagnostic.Location);
+                });
+        }
+
+        [Fact]
+        public async Task NoDiagnosticsAreReturned_ForUseOfRenderPartialAsync()
+        {
+            // Arrange
+            var project = CreateProjectFromFile();
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async Task DiagnosticsAreReturned_ForUseOfRenderPartial()
+        {
+            // Arrange
+            var project = CreateProjectFromFile();
+            var expectedLocation = DefaultMarkerLocation.Value;
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Collection(
+                result,
+                diagnostic =>
+                {
+
+                    Assert.Equal(DiagnosticDescriptor.Id, diagnostic.Id);
+                    Assert.Same(DiagnosticDescriptor, diagnostic.Descriptor);
+                    Assert.DiagnosticLocation(expectedLocation, diagnostic.Location);
+                });
+        }
+
+        [Fact]
+        public async Task DiagnosticsAreReturned_ForUseOfRenderPartial_WithAdditionalParameters()
+        {
+            // Arrange
+            var project = CreateProjectFromFile();
+            var expectedLocation = DefaultMarkerLocation.Value;
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Collection(
+                result,
+                diagnostic =>
+                {
+
+                    Assert.Equal(DiagnosticDescriptor.Id, diagnostic.Id);
+                    Assert.Same(DiagnosticDescriptor, diagnostic.Descriptor);
+                    Assert.DiagnosticLocation(expectedLocation, diagnostic.Location);
+                });
+        }
+
+        [Fact]
+        public async Task DiagnosticsAreReturned_ForUseOfRenderPartial_InSections()
+        {
+            // Arrange
+            var project = CreateProjectFromFile();
+            var expectedLocation = DefaultMarkerLocation.Value;
+
+            // Act
+            var result = await GetDiagnosticAsync(project);
+
+            // Assert
+            Assert.Collection(
+                result,
+                diagnostic =>
+                {
+
+                    Assert.Equal(DiagnosticDescriptor.Id, diagnostic.Id);
+                    Assert.Same(DiagnosticDescriptor, diagnostic.Descriptor);
+                    Assert.DiagnosticLocation(expectedLocation, diagnostic.Location);
+                });
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Infrastructure/AnalyzerTestBase.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Infrastructure/AnalyzerTestBase.cs
new file mode 100644
index 0000000000..73f2cae3f6
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Infrastructure/AnalyzerTestBase.cs
@@ -0,0 +1,180 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.Extensions.DependencyModel;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers.Infrastructure
+{
+    public abstract class AnalyzerTestBase : IDisposable
+    {
+        private static readonly object WorkspaceLock = new object();
+
+        public Workspace Workspace { get; private set; }
+
+        protected abstract DiagnosticAnalyzer DiagnosticAnalyzer { get; }
+
+        protected virtual CodeFixProvider CodeFixProvider { get; }
+
+        public IDictionary<string, DiagnosticResultLocation> MarkerLocations { get; } = new Dictionary<string, DiagnosticResultLocation>();
+
+        public DiagnosticResultLocation? DefaultMarkerLocation { get; private set; }
+
+        protected Project CreateProjectFromFile([CallerMemberName] string fileName = "")
+        {
+            var solutionDirectory = TestPathUtilities.GetSolutionRootDirectory("Mvc");
+            var projectDirectory = Path.Combine(solutionDirectory, "test", GetType().Assembly.GetName().Name);
+
+            var filePath = Path.Combine(projectDirectory, "TestFiles", fileName + ".cs");
+            if (!File.Exists(filePath))
+            {
+                throw new FileNotFoundException($"TestFile {fileName} could not be found at {filePath}.", filePath);
+            }
+
+            const string MarkerStart = "/*MM";
+            const string MarkerEnd = "*/";
+
+            var lines = File.ReadAllLines(filePath);
+            for (var i = 0; i < lines.Length; i++)
+            {
+                var line = lines[i];
+                var markerStartIndex = line.IndexOf(MarkerStart, StringComparison.Ordinal);
+                if (markerStartIndex != -1)
+                {
+                    var markerEndIndex = line.IndexOf(MarkerEnd, markerStartIndex, StringComparison.Ordinal);
+                    var markerName = line.Substring(markerStartIndex + 2, markerEndIndex - markerStartIndex - 2);
+                    var resultLocation = new DiagnosticResultLocation(i + 1, markerStartIndex + 1); ;
+
+                    if (DefaultMarkerLocation == null)
+                    {
+                        DefaultMarkerLocation = resultLocation;
+                    }
+
+                    MarkerLocations[markerName] = resultLocation;
+                    line = line.Substring(0, markerStartIndex) + line.Substring(markerEndIndex + MarkerEnd.Length);
+                }
+
+                lines[i] = line;
+            }
+
+            var inputSource = string.Join(Environment.NewLine, lines);
+            return CreateProject(inputSource);
+        }
+
+        protected Project CreateProject(string source)
+        {
+            var projectId = ProjectId.CreateNewId(debugName: "TestProject");
+            var newFileName = "Test.cs";
+            var documentId = DocumentId.CreateNewId(projectId, debugName: newFileName);
+            var metadataReferences = DependencyContext.Load(GetType().Assembly)
+                .CompileLibraries
+                .SelectMany(c => c.ResolveReferencePaths())
+                .Select(path => MetadataReference.CreateFromFile(path))
+                .Cast<MetadataReference>()
+                .ToList();
+
+            lock (WorkspaceLock)
+            {
+                if (Workspace == null)
+                {
+                    Workspace = new AdhocWorkspace();
+                }
+            }
+
+            var solution = Workspace
+                .CurrentSolution
+                .AddProject(projectId, "TestProject", "TestProject", LanguageNames.CSharp)
+                .AddMetadataReferences(projectId, metadataReferences)
+                .AddDocument(documentId, newFileName, SourceText.From(source));
+
+            return solution.GetProject(projectId);
+        }
+
+        protected async Task<Diagnostic[]> GetDiagnosticAsync(Project project)
+        {
+            var compilation = await project.GetCompilationAsync();
+            var compilationWithAnalyzers = compilation.WithAnalyzers(ImmutableArray.Create(DiagnosticAnalyzer));
+            var diagnostics = await compilationWithAnalyzers.GetAnalyzerDiagnosticsAsync();
+            return diagnostics.OrderBy(d => d.Location.SourceSpan.Start).ToArray();
+        }
+
+        protected Task<string> ApplyCodeFixAsync(
+            Project project,
+            Diagnostic[] analyzerDiagnostic,
+            int codeFixIndex = 0)
+        {
+            var diagnostic = analyzerDiagnostic.Single();
+            return ApplyCodeFixAsync(project, diagnostic, codeFixIndex);
+        }
+
+        protected async Task<string> ApplyCodeFixAsync(
+            Project project,
+            Diagnostic analyzerDiagnostic,
+            int codeFixIndex = 0)
+        {
+            if (CodeFixProvider == null)
+            {
+                throw new InvalidOperationException($"{nameof(CodeFixProvider)} has not been assigned.");
+            }
+
+            var document = project.Documents.Single();
+            var actions = new List<CodeAction>();
+            var context = new CodeFixContext(document, analyzerDiagnostic, (a, d) => actions.Add(a), CancellationToken.None);
+            await CodeFixProvider.RegisterCodeFixesAsync(context);
+
+            if (actions.Count == 0)
+            {
+                throw new InvalidOperationException("CodeFix produced no actions to apply.");
+            }
+
+            var updatedSolution = await ApplyFixAsync(actions[codeFixIndex]);
+            // Todo: figure out why this doesn't work.
+            // var updatedProject = updatedSolution.GetProject(project.Id);
+            // await EnsureCompilable(updatedProject);
+
+            var updatedDocument = updatedSolution.GetDocument(document.Id);
+            var sourceText = await updatedDocument.GetTextAsync();
+            return sourceText.ToString();
+        }
+
+        private static async Task EnsureCompilable(Project project)
+        {
+            var compilation = await project
+                .WithCompilationOptions(new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary))
+                .GetCompilationAsync();
+            var diagnostics = compilation.GetDiagnostics();
+            if (diagnostics.Length != 0)
+            {
+                var message = string.Join(
+                    Environment.NewLine,
+                    diagnostics.Select(d => CSharpDiagnosticFormatter.Instance.Format(d)));
+                throw new InvalidOperationException($"Compilation failed:{Environment.NewLine}{message}");
+            }
+        }
+
+        private static async Task<Solution> ApplyFixAsync(CodeAction codeAction)
+        {
+            var operations = await codeAction.GetOperationsAsync(CancellationToken.None);
+            return Assert.Single(operations.OfType<ApplyChangesOperation>()).ChangedSolution;
+        }
+
+        public void Dispose()
+        {
+            Workspace?.Dispose();
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Infrastructure/Assert.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Infrastructure/Assert.cs
new file mode 100644
index 0000000000..ea57f2f5b8
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Infrastructure/Assert.cs
@@ -0,0 +1,194 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Analyzers.Infrastructure;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Simplification;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers
+{
+    internal class Assert : Xunit.Assert
+    {
+        public static void DiagnosticsEqual(IEnumerable<DiagnosticResult> expected, IEnumerable<Diagnostic> actual)
+        {
+            var expectedCount = expected.Count();
+            var actualCount = actual.Count();
+
+            if (expectedCount != actualCount)
+            {
+                throw new DiagnosticsAssertException(
+                    expected,
+                    actual,
+                    $"Mismatch between number of diagnostics returned, expected \"{expectedCount}\" actual \"{actualCount}.");
+            }
+
+            foreach (var (expectedItem, actualItem) in expected.Zip(actual, (a, b) => (a, b)))
+            {
+                if (expectedItem.Line == -1 && expectedItem.Column == -1)
+                {
+                    if (actualItem.Location != Location.None)
+                    {
+                        throw new DiagnosticAssertException(
+                            expectedItem,
+                            actualItem,
+                            $"Expected: A project diagnostic with no location. Actual {actualItem.Location}.");
+                    }
+                }
+                else
+                {
+                    VerifyLocation(expectedItem, actualItem);
+                }
+
+                if (actualItem.Id != expectedItem.Id)
+                {
+                    throw new DiagnosticAssertException(
+                        expectedItem,
+                        actualItem,
+                        $"Expected: Expected id: {expectedItem.Id}. Actual id: {actualItem.Id}.");
+                }
+
+                if (actualItem.Severity != expectedItem.Severity)
+                {
+                    throw new DiagnosticAssertException(
+                        expectedItem,
+                        actualItem,
+                        $"Expected: Expected severity: {expectedItem.Severity}. Actual severity: {actualItem.Severity}.");
+                }
+
+                if (actualItem.GetMessage() != expectedItem.Message)
+                {
+                    throw new DiagnosticAssertException(
+                        expectedItem,
+                        actualItem,
+                        $"Expected: Expected message: {expectedItem.Message}. Actual message: {actualItem.GetMessage()}.");
+                }
+            }
+        }
+
+        private static void VerifyLocation(DiagnosticResult expected, Diagnostic actual)
+        {
+            if (expected.Locations.Length == 0)
+            {
+                return;
+            }
+
+            var expectedLocation = expected.Locations[0];
+            Assert.DiagnosticLocation(expectedLocation, actual.Location);
+
+        }
+
+        public static void DiagnosticLocation(DiagnosticResultLocation expected, Location actual)
+        {
+            var actualSpan = actual.GetLineSpan();
+            var actualLinePosition = actualSpan.StartLinePosition;
+
+            // Only check line position if there is an actual line in the real diagnostic
+            if (actualLinePosition.Line > 0)
+            {
+                if (actualLinePosition.Line + 1 != expected.Line)
+                {
+                    throw new DiagnosticLocationAssertException(
+                        expected,
+                        actual,
+                        $"Expected diagnostic to be on line \"{expected.Line}\" was actually on line \"{actualLinePosition.Line + 1}\"");
+                }
+            }
+
+            // Only check column position if there is an actual column position in the real diagnostic
+            if (actualLinePosition.Character > 0)
+            {
+                if (actualLinePosition.Character + 1 != expected.Column)
+                {
+                    throw new DiagnosticLocationAssertException(
+                        expected,
+                        actual,
+                        $"Expected diagnostic to start at column \"{expected.Column}\" was actually on line \"{actualLinePosition.Character + 1}\"");
+                }
+            }
+        }
+
+        private static string FormatDiagnostics(IEnumerable<Diagnostic> diagnostics)
+        {
+            return string.Join(Environment.NewLine, diagnostics.Select(FormatDiagnostic));
+        }
+
+        private static string FormatDiagnostic(Diagnostic diagnostic)
+        {
+            var builder = new StringBuilder();
+            builder.AppendLine(diagnostic.ToString());
+
+            var location = diagnostic.Location;
+            if (location == Location.None)
+            {
+                builder.Append($"Location unknown: ({diagnostic.Id})");
+            }
+            else
+            {
+                True(location.IsInSource,
+                    $"Test base does not currently handle diagnostics in metadata locations. Diagnostic in metadata: {diagnostic}");
+
+                var linePosition = location.GetLineSpan().StartLinePosition;
+                builder.Append($"({(linePosition.Line + 1)}, {(linePosition.Character + 1)}, {diagnostic.Id})");
+            }
+
+            return builder.ToString();
+        }
+
+        private static async Task<string> GetStringFromDocumentAsync(Document document)
+        {
+            var simplifiedDoc = await Simplifier.ReduceAsync(document, Simplifier.Annotation);
+            var root = await simplifiedDoc.GetSyntaxRootAsync();
+            root = Formatter.Format(root, Formatter.Annotation, simplifiedDoc.Project.Solution.Workspace);
+            return root.GetText().ToString();
+        }
+
+        private class DiagnosticsAssertException : Xunit.Sdk.EqualException
+        {
+            public DiagnosticsAssertException(
+                IEnumerable<DiagnosticResult> expected,
+                IEnumerable<Diagnostic> actual,
+                string message)
+                : base(expected, actual)
+            {
+                Message = message + Environment.NewLine + FormatDiagnostics(actual);
+            }
+
+            public override string Message { get; }
+        }
+
+        private class DiagnosticAssertException : Xunit.Sdk.EqualException
+        {
+            public DiagnosticAssertException(
+                DiagnosticResult expected,
+                Diagnostic actual,
+                string message)
+                : base(expected, actual)
+            {
+                Message = message + Environment.NewLine + FormatDiagnostic(actual);
+            }
+
+            public override string Message { get; }
+        }
+
+        private class DiagnosticLocationAssertException : Xunit.Sdk.EqualException
+        {
+            public DiagnosticLocationAssertException(
+                DiagnosticResultLocation expected,
+                Location actual,
+                string message)
+                : base(expected, actual)
+            {
+                Message = message;
+            }
+
+            public override string Message { get; }
+        }
+
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Infrastructure/DiagnosticResult.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Infrastructure/DiagnosticResult.cs
new file mode 100644
index 0000000000..c1c32bd025
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Infrastructure/DiagnosticResult.cs
@@ -0,0 +1,75 @@
+// 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.
+
+using System;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Mvc.Analyzers.Infrastructure
+{
+    /// <summary>
+    /// Location where the diagnostic appears, as determined by path, line number, and column number.
+    /// </summary>
+    public struct DiagnosticResultLocation
+    {
+        public DiagnosticResultLocation(int line, int column)
+            : this("Test.cs", line, column)
+        {
+        }
+
+        public DiagnosticResultLocation(string path, int line, int column)
+        {
+            if (line < -1)
+            {
+                throw new ArgumentOutOfRangeException(nameof(line), "line must be >= -1");
+            }
+
+            if (column < -1)
+            {
+                throw new ArgumentOutOfRangeException(nameof(column), "column must be >= -1");
+            }
+
+            Path = path;
+            Line = line;
+            Column = column;
+        }
+
+        public string Path { get; }
+        public int Line { get; }
+        public int Column { get; }
+    }
+
+    /// <summary>
+    /// Struct that stores information about a Diagnostic appearing in a source
+    /// </summary>
+    public struct DiagnosticResult
+    {
+        private DiagnosticResultLocation[] _locations;
+
+        public DiagnosticResultLocation[] Locations
+        {
+            get
+            {
+                if (_locations == null)
+                {
+                    _locations = new DiagnosticResultLocation[] { };
+                }
+
+                return _locations;
+            }
+
+            set => _locations = value;
+        }
+
+        public DiagnosticSeverity Severity { get; set; }
+
+        public string Id { get; set; }
+
+        public string Message { get; set; }
+
+        public string Path => Locations.Length > 0 ? Locations[0].Path : "";
+
+        public int Line => Locations.Length > 0 ? Locations[0].Line : -1;
+
+        public int Column => Locations.Length > 0 ? Locations[0].Column : -1;
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Microsoft.AspNetCore.Mvc.Analyzers.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Microsoft.AspNetCore.Mvc.Analyzers.Test.csproj
new file mode 100644
index 0000000000..53db6da506
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/Microsoft.AspNetCore.Mvc.Analyzers.Test.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Analyzers\Microsoft.AspNetCore.Mvc.Analyzers.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfHtmlPartial.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfHtmlPartial.cs
new file mode 100644
index 0000000000..7b00e3249f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfHtmlPartial.cs
@@ -0,0 +1,33 @@
+namespace AspNetCore
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class DiagnosticsAreReturned_ForUseOfHtmlPartial : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+#pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(0, 25, true);
+            Write(/*MM*/Html.Partial("Some-Partial"));
+            EndContext();
+            EndContext();
+        }
+#pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfHtmlPartial_InSections.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfHtmlPartial_InSections.cs
new file mode 100644
index 0000000000..6daed38d2f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfHtmlPartial_InSections.cs
@@ -0,0 +1,35 @@
+namespace AspNetCore
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class DiagnosticsAreReturned_ForUseOfHtmlPartial_InSections : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+#pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(0, 25, true);
+            DefineSection("name", async () => {
+                Write(/*MM*/Html.Partial("Test"));
+            });
+            EndContext();
+            EndContext();
+        }
+#pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfHtmlPartial_WithAdditionalParameters.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfHtmlPartial_WithAdditionalParameters.cs
new file mode 100644
index 0000000000..3d26ae36f9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfHtmlPartial_WithAdditionalParameters.cs
@@ -0,0 +1,33 @@
+namespace AspNetCore
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class DiagnosticsAreReturned_ForUseOfHtmlPartial_WithAdditionalParameters : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+#pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(0, 25, true);
+            Write(/*MM*/Html.Partial("Some-Partial", new object()));
+            EndContext();
+            EndContext();
+        }
+#pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfRenderPartial.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfRenderPartial.cs
new file mode 100644
index 0000000000..827b3d938e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfRenderPartial.cs
@@ -0,0 +1,33 @@
+namespace AspNetCore
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class DiagnosticsAreReturned_ForUseOfRenderPartial : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+#pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(0, 25, true);
+            /*MM1*/Html.RenderPartial("Some-Partial");
+            EndContext();
+            EndContext();
+        }
+#pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfRenderPartial_InSections.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfRenderPartial_InSections.cs
new file mode 100644
index 0000000000..39c1c4bcbc
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfRenderPartial_InSections.cs
@@ -0,0 +1,35 @@
+namespace AspNetCore
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class DiagnosticsAreReturned_ForUseOfHtmlRenderPartial_InSections : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+#pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(0, 25, true);
+            DefineSection("name", async () => {
+                /*MM*/Html.RenderPartial("Test");
+            });
+            EndContext();
+            EndContext();
+        }
+#pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfRenderPartial_WithAdditionalParameters.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfRenderPartial_WithAdditionalParameters.cs
new file mode 100644
index 0000000000..cbff6f75ee
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/DiagnosticsAreReturned_ForUseOfRenderPartial_WithAdditionalParameters.cs
@@ -0,0 +1,33 @@
+namespace AspNetCore
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class DiagnosticsAreReturned_ForUseOfRenderPartial_WithAdditionalParameters : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+#pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(0, 25, true);
+            /*MM*/Html.RenderPartial("Some-Partial", new object());
+            EndContext();
+            EndContext();
+        }
+#pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/NoDiagnosticsAreReturned_ForNonUseOfHtmlPartial.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/NoDiagnosticsAreReturned_ForNonUseOfHtmlPartial.cs
new file mode 100644
index 0000000000..b41217ac90
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/NoDiagnosticsAreReturned_ForNonUseOfHtmlPartial.cs
@@ -0,0 +1,33 @@
+namespace AspNetCore
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class NoDiagnosticsAreReturned_ForNonUseOfHtmlPartial : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+#pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(0, 25, true);
+            WriteLiteral("Hello world");
+            EndContext();
+            EndContext();
+        }
+#pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/NoDiagnosticsAreReturned_ForUseOfHtmlPartialAsync.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/NoDiagnosticsAreReturned_ForUseOfHtmlPartialAsync.cs
new file mode 100644
index 0000000000..72e9baf096
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/NoDiagnosticsAreReturned_ForUseOfHtmlPartialAsync.cs
@@ -0,0 +1,33 @@
+namespace AspNetCore
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class NoDiagnosticsAreReturned_ForUseOfHtmlPartialAsync : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+#pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(0, 25, true);
+            await Html.PartialAsync("Some-Partial");
+            EndContext();
+            EndContext();
+        }
+#pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/NoDiagnosticsAreReturned_ForUseOfRenderPartialAsync.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/NoDiagnosticsAreReturned_ForUseOfRenderPartialAsync.cs
new file mode 100644
index 0000000000..e1edee2686
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/TestFiles/NoDiagnosticsAreReturned_ForUseOfRenderPartialAsync.cs
@@ -0,0 +1,33 @@
+namespace AspNetCore
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class NoDiagnosticsAreReturned_ForUseOfRenderPartialAsync : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+#pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(0, 25, true);
+            await Html.RenderPartialAsync("Some-Partial");
+            EndContext();
+            EndContext();
+        }
+#pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/xunit.runner.json b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/xunit.runner.json
new file mode 100644
index 0000000000..1c72a421ad
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Analyzers.Test/xunit.runner.json
@@ -0,0 +1,3 @@
+{
+  "shadowCopy": false
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs
new file mode 100644
index 0000000000..c55d427d9d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs
@@ -0,0 +1,2170 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Routing.Constraints;
+using Microsoft.Extensions.Options;
+using Microsoft.Net.Http.Headers;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Description
+{
+    public class DefaultApiDescriptionProviderTest
+    {
+        [Fact]
+        public void GetApiDescription_IgnoresNonControllerActionDescriptor()
+        {
+            // Arrange
+            var action = new ActionDescriptor();
+            action.SetProperty(new ApiDescriptionActionData());
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            Assert.Empty(descriptions);
+        }
+
+        [Fact]
+        public void GetApiDescription_IgnoresActionWithoutApiExplorerData()
+        {
+            // Arrange
+            var action = new ControllerActionDescriptor();
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            Assert.Empty(descriptions);
+        }
+
+        [Fact]
+        public void GetApiDescription_PopulatesActionDescriptor()
+        {
+            // Arrange
+            var action = CreateActionDescriptor();
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            Assert.Same(action, description.ActionDescriptor);
+        }
+
+        [Fact]
+        public void GetApiDescription_PopulatesGroupName()
+        {
+            // Arrange
+            var action = CreateActionDescriptor();
+            action.GetProperty<ApiDescriptionActionData>().GroupName = "Customers";
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            Assert.Equal("Customers", description.GroupName);
+        }
+
+        [Fact]
+        public void GetApiDescription_HttpMethodIsNullWithoutConstraint()
+        {
+            // Arrange
+            var action = CreateActionDescriptor();
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            Assert.Null(description.HttpMethod);
+        }
+
+
+        [Fact]
+        public void GetApiDescription_CreatesMultipleDescriptionsForMultipleHttpMethods()
+        {
+            // Arrange
+            var action = CreateActionDescriptor();
+            action.ActionConstraints = new List<IActionConstraintMetadata>()
+            {
+                new HttpMethodActionConstraint(new string[] { "PUT", "POST" }),
+                new HttpMethodActionConstraint(new string[] { "GET" }),
+            };
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            Assert.Equal(3, descriptions.Count);
+
+            Assert.Single(descriptions, d => d.HttpMethod == "PUT");
+            Assert.Single(descriptions, d => d.HttpMethod == "POST");
+            Assert.Single(descriptions, d => d.HttpMethod == "GET");
+        }
+
+        [Theory]
+        [InlineData("api/products/{id}", false, null, null)]
+        [InlineData("api/products/{id?}", true, null, null)]
+        [InlineData("api/products/{id=5}", true, null, "5")]
+        [InlineData("api/products/{id:int}", false, typeof(IntRouteConstraint), null)]
+        [InlineData("api/products/{id:int?}", true, typeof(IntRouteConstraint), null)]
+        [InlineData("api/products/{id:int=5}", true, null, "5")]
+        [InlineData("api/products/{*id}", false, null, null)]
+        [InlineData("api/products/{*id:int}", false, typeof(IntRouteConstraint), null)]
+        [InlineData("api/products/{*id:int=5}", true, typeof(IntRouteConstraint), "5")]
+        public void GetApiDescription_PopulatesParameters_ThatAppearOnlyOnRouteTemplate(
+            string template,
+            bool isOptional,
+            Type constraintType,
+            object defaultValue)
+        {
+            // Arrange
+            var action = CreateActionDescriptor();
+            action.AttributeRouteInfo = new AttributeRouteInfo { Template = template };
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+
+            var parameter = Assert.Single(description.ParameterDescriptions);
+            Assert.Equal(BindingSource.Path, parameter.Source);
+            Assert.Equal(isOptional, parameter.RouteInfo.IsOptional);
+            Assert.Equal("id", parameter.Name);
+
+            if (constraintType != null)
+            {
+                Assert.IsType(constraintType, Assert.Single(parameter.RouteInfo.Constraints));
+            }
+
+            if (defaultValue != null)
+            {
+                Assert.Equal(defaultValue, parameter.RouteInfo.DefaultValue);
+            }
+            else
+            {
+                Assert.Null(parameter.RouteInfo.DefaultValue);
+            }
+        }
+
+        [Theory]
+        [InlineData("api/products/{id}", false, null, null)]
+        [InlineData("api/products/{id?}", true, null, null)]
+        [InlineData("api/products/{id=5}", true, null, "5")]
+        [InlineData("api/products/{id:int}", false, typeof(IntRouteConstraint), null)]
+        [InlineData("api/products/{id:int?}", true, typeof(IntRouteConstraint), null)]
+        [InlineData("api/products/{id:int=5}", true, typeof(IntRouteConstraint), "5")]
+        [InlineData("api/products/{*id}", false, null, null)]
+        [InlineData("api/products/{*id:int}", false, typeof(IntRouteConstraint), null)]
+        [InlineData("api/products/{*id:int=5}", true, typeof(IntRouteConstraint), "5")]
+        public void GetApiDescription_PopulatesParametersThatAppearOnRouteTemplate_AndHaveAssociatedParameterDescriptor(
+            string template,
+            bool isOptional,
+            Type constraintType,
+            object defaultValue)
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(FromRouting));
+            action.AttributeRouteInfo = new AttributeRouteInfo { Template = template };
+
+            var parameterDescriptor = action.Parameters[0];
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+
+            var parameter = Assert.Single(description.ParameterDescriptions);
+            Assert.Equal(BindingSource.Path, parameter.Source);
+            Assert.Equal(isOptional, parameter.RouteInfo.IsOptional);
+            Assert.Equal("id", parameter.Name);
+
+            if (constraintType != null)
+            {
+                Assert.IsType(constraintType, Assert.Single(parameter.RouteInfo.Constraints));
+            }
+
+            if (defaultValue != null)
+            {
+                Assert.Equal(defaultValue, parameter.RouteInfo.DefaultValue);
+            }
+            else
+            {
+                Assert.Null(parameter.RouteInfo.DefaultValue);
+            }
+        }
+
+        [Fact]
+        public void GetApiDescription_ParameterDescription_IncludesParameterDescriptor()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(FromBody));
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            var parameterDescription = Assert.Single(description.ParameterDescriptions);
+            var actionParameterDescriptor = Assert.Single(action.Parameters);
+            Assert.Equal(actionParameterDescriptor, parameterDescription.ParameterDescriptor);
+        }
+
+        // Only a parameter which comes from a route or model binding or unknown should
+        // include route info.
+        [Theory]
+        [InlineData("api/products/{id}", nameof(FromBody), "Body")]
+        [InlineData("api/products/{id}", nameof(FromHeader), "Header")]
+        public void GetApiDescription_ParameterDescription_DoesNotIncludeRouteInfo(
+            string template,
+            string methodName,
+            string source)
+        {
+            // Arrange
+            var action = CreateActionDescriptor(methodName);
+            action.AttributeRouteInfo = new AttributeRouteInfo { Template = template };
+
+            var expected = new BindingSource(source, displayName: null, isGreedy: false, isFromRequest: false);
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            var parameters = description.ParameterDescriptions;
+
+            var id = Assert.Single(parameters, p => p.Source == expected);
+            Assert.Null(id.RouteInfo);
+        }
+
+        // Only a parameter which comes from a route or model binding or unknown should
+        // include route info. If the source is model binding, we also check if it's an optional
+        // parameter, and only change the source if it's a match.
+        [Theory]
+        [InlineData("api/products/{id}", nameof(FromRouting), "Path")]
+        [InlineData("api/products/{id}", nameof(FromModelBinding), "Path")]
+        [InlineData("api/products/{id?}", nameof(FromModelBinding), "ModelBinding")]
+        [InlineData("api/products/{id=5}", nameof(FromModelBinding), "ModelBinding")]
+        [InlineData("api/products/{id}", nameof(FromCustom), "Custom")]
+        public void GetApiDescription_ParameterDescription_IncludesRouteInfo(
+            string template,
+            string methodName,
+            string source)
+        {
+            // Arrange
+            var action = CreateActionDescriptor(methodName);
+            action.AttributeRouteInfo = new AttributeRouteInfo { Template = template };
+
+            var expected = new BindingSource(source, displayName: null, isGreedy: false, isFromRequest: false);
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            var parameters = description.ParameterDescriptions;
+
+            var id = Assert.Single(parameters, p => p.Source == expected);
+            Assert.NotNull(id.RouteInfo);
+        }
+
+        [Theory]
+        [InlineData("api/products/{id}", false)]
+        [InlineData("api/products/{id?}", true)]
+        [InlineData("api/products/{id=5}", true)]
+        public void GetApiDescription_ParameterFromPathAndDescriptor_IsOptionalIfRouteParameterIsOptional(
+            string template,
+            bool expectedOptional)
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(FromRouting));
+            action.AttributeRouteInfo = new AttributeRouteInfo { Template = template };
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            var parameter = Assert.Single(description.ParameterDescriptions);
+            Assert.Equal(expectedOptional, parameter.RouteInfo.IsOptional);
+        }
+
+        [Theory]
+        [InlineData("api/Products/{id}", "api/Products/{id}")]
+        [InlineData("api/Products/{id?}", "api/Products/{id}")]
+        [InlineData("api/Products/{id:int}", "api/Products/{id}")]
+        [InlineData("api/Products/{id:int?}", "api/Products/{id}")]
+        [InlineData("api/Products/{*id}", "api/Products/{id}")]
+        [InlineData("api/Products/{*id:int}", "api/Products/{id}")]
+        [InlineData("api/Products/{id1}-{id2:int}", "api/Products/{id1}-{id2}")]
+        [InlineData("api/{id1}/{id2?}/{id3:int}/{id4:int?}/{*id5:int}", "api/{id1}/{id2}/{id3}/{id4}/{id5}")]
+        public void GetApiDescription_PopulatesRelativePath(string template, string relativePath)
+        {
+            // Arrange
+            var action = CreateActionDescriptor();
+            action.AttributeRouteInfo = new AttributeRouteInfo
+            {
+                Template = template
+            };
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            Assert.Equal(relativePath, description.RelativePath);
+        }
+
+        [Fact]
+        public void GetApiDescription_DetectsMultipleParameters_OnTheSameSegment()
+        {
+            // Arrange
+            var action = CreateActionDescriptor();
+            action.AttributeRouteInfo = new AttributeRouteInfo
+            {
+                Template = "api/Products/{id1}-{id2:int}"
+            };
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            var id1 = Assert.Single(description.ParameterDescriptions, p => p.Name == "id1");
+            Assert.Equal(BindingSource.Path, id1.Source);
+            Assert.Empty(id1.RouteInfo.Constraints);
+
+            var id2 = Assert.Single(description.ParameterDescriptions, p => p.Name == "id2");
+            Assert.Equal(BindingSource.Path, id2.Source);
+            Assert.IsType<IntRouteConstraint>(Assert.Single(id2.RouteInfo.Constraints));
+        }
+
+        [Fact]
+        public void GetApiDescription_DetectsMultipleParameters_OnDifferentSegments()
+        {
+            // Arrange
+            var action = CreateActionDescriptor();
+            action.AttributeRouteInfo = new AttributeRouteInfo
+            {
+                Template = "api/Products/{id1}-{id2}/{id3:int}/{id4:int?}/{*id5:int}"
+            };
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+
+            Assert.Single(description.ParameterDescriptions, p => p.Name == "id1");
+            Assert.Single(description.ParameterDescriptions, p => p.Name == "id2");
+            Assert.Single(description.ParameterDescriptions, p => p.Name == "id3");
+            Assert.Single(description.ParameterDescriptions, p => p.Name == "id4");
+            Assert.Single(description.ParameterDescriptions, p => p.Name == "id5");
+        }
+
+        [Fact]
+        public void GetApiDescription_PopulatesResponseType_WithProduct()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(ReturnsProduct));
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            var responseType = Assert.Single(description.SupportedResponseTypes);
+            Assert.Equal(typeof(Product), responseType.Type);
+            Assert.NotNull(responseType.ModelMetadata);
+        }
+
+        [Theory]
+        [InlineData(nameof(ReturnsActionResultOfProduct))]
+        [InlineData(nameof(ReturnsTaskOfActionResultOfProduct))]
+        public void GetApiDescription_PopulatesResponseType_ForActionResultOfT(string methodName)
+        {
+            // Arrange
+            var action = CreateActionDescriptor(methodName);
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            var responseType = Assert.Single(description.SupportedResponseTypes);
+            Assert.Equal(typeof(Product), responseType.Type);
+            Assert.NotNull(responseType.ModelMetadata);
+        }
+
+        [Theory]
+        [InlineData(nameof(ReturnsActionResultOfSequenceOfProducts))]
+        [InlineData(nameof(ReturnsTaskOfActionResultOfSequenceOfProducts))]
+        public void GetApiDescription_PopulatesResponseType_ForActionResultOfSequenceOfT(string methodName)
+        {
+            // Arrange
+            var action = CreateActionDescriptor(methodName);
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            var responseType = Assert.Single(description.SupportedResponseTypes);
+            Assert.Equal(typeof(IEnumerable<Product>), responseType.Type);
+            Assert.NotNull(responseType.ModelMetadata);
+        }
+
+        [Fact]
+        public void GetApiDescription_PopulatesResponseType_WithTaskOfProduct()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(ReturnsTaskOfProduct));
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            var responseType = Assert.Single(description.SupportedResponseTypes);
+            Assert.Equal(typeof(Product), responseType.Type);
+            Assert.NotNull(responseType.ModelMetadata);
+        }
+
+        [Theory]
+        [InlineData(nameof(ReturnsObject))]
+        [InlineData(nameof(ReturnsActionResult))]
+        [InlineData(nameof(ReturnsJsonResult))]
+        [InlineData(nameof(ReturnsTaskOfObject))]
+        [InlineData(nameof(ReturnsTaskOfActionResult))]
+        [InlineData(nameof(ReturnsTaskOfJsonResult))]
+        public void GetApiDescription_DoesNotPopulatesResponseInformation_WhenUnknown(string methodName)
+        {
+            // Arrange
+            var action = CreateActionDescriptor(methodName);
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            Assert.Empty(description.SupportedResponseTypes);
+        }
+
+        public static TheoryData ReturnsActionResultWithProducesAndProducesContentTypeData
+        {
+            get
+            {
+                var filterDescriptors = new List<FilterDescriptor>()
+                {
+                    new FilterDescriptor(
+                        new ProducesAttribute("text/json", "application/json") { Type = typeof(Customer) },
+                        FilterScope.Action),
+                    new FilterDescriptor(
+                        new ProducesResponseTypeAttribute(304),
+                        FilterScope.Action),
+                    new FilterDescriptor(
+                        new ProducesResponseTypeAttribute(typeof(BadData), 400),
+                        FilterScope.Action),
+                    new FilterDescriptor(
+                        new ProducesResponseTypeAttribute(typeof(ErrorDetails), 500),
+                        FilterScope.Action),
+                };
+
+                return new TheoryData<Type, string, List<FilterDescriptor>>
+                {
+                    {
+                        typeof(DefaultApiDescriptionProviderTest),
+                        nameof(DefaultApiDescriptionProviderTest.ReturnsTaskOfActionResult),
+                        filterDescriptors
+                    },
+                    {
+                        typeof(DefaultApiDescriptionProviderTest),
+                        nameof(DefaultApiDescriptionProviderTest.ReturnsActionResult),
+                        filterDescriptors
+                    },
+                    {
+                        typeof(DefaultApiDescriptionProviderTest),
+                        nameof(DefaultApiDescriptionProviderTest.ReturnsActionResult),
+                        filterDescriptors
+                    },
+                    {
+                        typeof(DerivedProducesController),
+                        nameof(DerivedProducesController.ReturnsActionResult),
+                        filterDescriptors
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ReturnsActionResultWithProducesAndProducesContentTypeData))]
+        public void GetApiDescription_ReturnsActionResultWithProduces_And_ProducesContentType(
+            Type controllerType,
+            string methodName,
+            List<FilterDescriptor> filterDescriptors)
+        {
+            // Arrange
+            var action = CreateActionDescriptor(methodName, controllerType);
+            action.FilterDescriptors = filterDescriptors;
+            var expectedMediaTypes = new[] { "application/json", "text/json" };
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            Assert.Equal(4, description.SupportedResponseTypes.Count);
+
+            Assert.Collection(
+                description.SupportedResponseTypes.OrderBy(responseType => responseType.StatusCode),
+                responseType =>
+                {
+                    Assert.Equal(200, responseType.StatusCode);
+                    Assert.Equal(typeof(Customer), responseType.Type);
+                    Assert.NotNull(responseType.ModelMetadata);
+                    Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+                },
+                responseType =>
+                {
+                    Assert.Equal(304, responseType.StatusCode);
+                    Assert.Equal(typeof(void), responseType.Type);
+                    Assert.Null(responseType.ModelMetadata);
+                    Assert.Empty(responseType.ApiResponseFormats);
+                },
+                responseType =>
+                {
+                    Assert.Equal(400, responseType.StatusCode);
+                    Assert.Equal(typeof(BadData), responseType.Type);
+                    Assert.NotNull(responseType.ModelMetadata);
+                    Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+                },
+                responseType =>
+                {
+                    Assert.Equal(500, responseType.StatusCode);
+                    Assert.Equal(typeof(ErrorDetails), responseType.Type);
+                    Assert.NotNull(responseType.ModelMetadata);
+                    Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+                });
+        }
+
+        public static TheoryData<Type, string, List<FilterDescriptor>> ReturnsVoidOrTaskWithProducesContentTypeData
+        {
+            get
+            {
+                var filterDescriptors = new List<FilterDescriptor>()
+                {
+                    // Since action is returning Void or Task, it does not make sense to provide a value for the
+                    // 'Type' property to ProducesAttribute. But the same action could return other types of data
+                    // based on runtime conditions.
+                    new FilterDescriptor(
+                        new ProducesAttribute("text/json", "application/json"),
+                        FilterScope.Action),
+                    new FilterDescriptor(
+                        new ProducesResponseTypeAttribute(200),
+                        FilterScope.Action),
+                    new FilterDescriptor(
+                        new ProducesResponseTypeAttribute(typeof(BadData), 400),
+                        FilterScope.Action),
+                    new FilterDescriptor(
+                        new ProducesResponseTypeAttribute(typeof(ErrorDetails), 500),
+                        FilterScope.Action)
+                };
+
+                return new TheoryData<Type, string, List<FilterDescriptor>>
+                {
+                    {
+                        typeof(DefaultApiDescriptionProviderTest),
+                        nameof(DefaultApiDescriptionProviderTest.ReturnsVoid),
+                        filterDescriptors
+                    },
+                    {
+                        typeof(DefaultApiDescriptionProviderTest),
+                        nameof(DefaultApiDescriptionProviderTest.ReturnsTask),
+                        filterDescriptors
+                    },
+                    {
+                        typeof(DerivedProducesController),
+                        nameof(DerivedProducesController.ReturnsVoid),
+                        filterDescriptors
+                    },
+                    {
+                        typeof(DerivedProducesController),
+                        nameof(DerivedProducesController.ReturnsTask),
+                        filterDescriptors
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ReturnsVoidOrTaskWithProducesContentTypeData))]
+        public void GetApiDescription_ReturnsVoidWithProducesContentType(
+            Type controllerType,
+            string methodName,
+            List<FilterDescriptor> filterDescriptors)
+        {
+            // Arrange
+            var action = CreateActionDescriptor(methodName, controllerType);
+            action.FilterDescriptors = filterDescriptors;
+            var expectedMediaTypes = new[] { "application/json", "text/json" };
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            Assert.Equal(3, description.SupportedResponseTypes.Count);
+
+            Assert.Collection(
+                description.SupportedResponseTypes.OrderBy(responseType => responseType.StatusCode),
+                responseType =>
+                {
+                    Assert.Equal(typeof(void), responseType.Type);
+                    Assert.Equal(200, responseType.StatusCode);
+                    Assert.Null(responseType.ModelMetadata);
+                    Assert.Empty(responseType.ApiResponseFormats);
+                },
+                responseType =>
+                {
+                    Assert.Equal(typeof(BadData), responseType.Type);
+                    Assert.Equal(400, responseType.StatusCode);
+                    Assert.NotNull(responseType.ModelMetadata);
+                    Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+                },
+                responseType =>
+                {
+                    Assert.Equal(typeof(ErrorDetails), responseType.Type);
+                    Assert.Equal(500, responseType.StatusCode);
+                    Assert.NotNull(responseType.ModelMetadata);
+                    Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+                });
+        }
+
+        [Theory]
+        [InlineData(nameof(ReturnsActionResultOfProduct))]
+        [InlineData(nameof(ReturnsTaskOfActionResultOfProduct))]
+        public void GetApiDescription_ReturnsActionResultOfTWithProducesContentType(
+            string methodName)
+        {
+            // Arrange
+            var action = CreateActionDescriptor(methodName);
+            action.FilterDescriptors = new List<FilterDescriptor>()
+            {
+                // Since action is returning Void or Task, it does not make sense to provide a value for the
+                // 'Type' property to ProducesAttribute. But the same action could return other types of data
+                // based on runtime conditions.
+                new FilterDescriptor(
+                    new ProducesAttribute("text/json", "application/json"),
+                    FilterScope.Action),
+                new FilterDescriptor(
+                    new ProducesResponseTypeAttribute(200),
+                    FilterScope.Action),
+                new FilterDescriptor(
+                    new ProducesResponseTypeAttribute(202),
+                    FilterScope.Action),
+                new FilterDescriptor(
+                    new ProducesResponseTypeAttribute(typeof(BadData), 400),
+                    FilterScope.Action),
+                new FilterDescriptor(
+                    new ProducesResponseTypeAttribute(typeof(ErrorDetails), 500),
+                    FilterScope.Action)
+            };
+            var expectedMediaTypes = new[] { "application/json", "text/json" };
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            Assert.Equal(4, description.SupportedResponseTypes.Count);
+
+            Assert.Collection(
+                description.SupportedResponseTypes.OrderBy(responseType => responseType.StatusCode),
+                responseType =>
+                {
+                    Assert.Equal(typeof(Product), responseType.Type);
+                    Assert.Equal(200, responseType.StatusCode);
+                    Assert.NotNull(responseType.ModelMetadata);
+                    Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+                },
+                responseType =>
+                {
+                    Assert.Equal(typeof(void), responseType.Type);
+                    Assert.Equal(202, responseType.StatusCode);
+                    Assert.Null(responseType.ModelMetadata);
+                    Assert.Empty(GetSortedMediaTypes(responseType));
+                },
+                responseType =>
+                {
+                    Assert.Equal(typeof(BadData), responseType.Type);
+                    Assert.Equal(400, responseType.StatusCode);
+                    Assert.NotNull(responseType.ModelMetadata);
+                    Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+                },
+                responseType =>
+                {
+                    Assert.Equal(typeof(ErrorDetails), responseType.Type);
+                    Assert.Equal(500, responseType.StatusCode);
+                    Assert.NotNull(responseType.ModelMetadata);
+                    Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+                });
+        }
+
+        [Theory]
+        [InlineData(nameof(ReturnsActionResultOfProduct))]
+        [InlineData(nameof(ReturnsTaskOfActionResultOfProduct))]
+        public void GetApiDescription_ReturnsActionResultOfTWithProducesContentType_ForStatusCode201(
+            string methodName)
+        {
+            // Arrange
+            var action = CreateActionDescriptor(methodName);
+            action.FilterDescriptors = new List<FilterDescriptor>()
+            {
+                // Since action is returning Void or Task, it does not make sense to provide a value for the
+                // 'Type' property to ProducesAttribute. But the same action could return other types of data
+                // based on runtime conditions.
+                new FilterDescriptor(
+                    new ProducesAttribute("text/json", "application/json"),
+                    FilterScope.Action),
+                new FilterDescriptor(
+                    new ProducesResponseTypeAttribute(201),
+                    FilterScope.Action),
+                new FilterDescriptor(
+                    new ProducesResponseTypeAttribute(204),
+                    FilterScope.Action),
+                new FilterDescriptor(
+                    new ProducesResponseTypeAttribute(typeof(BadData), 400),
+                    FilterScope.Action),
+                new FilterDescriptor(
+                    new ProducesResponseTypeAttribute(typeof(ErrorDetails), 500),
+                    FilterScope.Action)
+            };
+            var expectedMediaTypes = new[] { "application/json", "text/json" };
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            Assert.Equal(4, description.SupportedResponseTypes.Count);
+
+            Assert.Collection(
+                description.SupportedResponseTypes.OrderBy(responseType => responseType.StatusCode),
+                responseType =>
+                {
+                    Assert.Equal(typeof(Product), responseType.Type);
+                    Assert.Equal(201, responseType.StatusCode);
+                    Assert.NotNull(responseType.ModelMetadata);
+                    Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+                },
+                responseType =>
+                {
+                    Assert.Equal(typeof(void), responseType.Type);
+                    Assert.Equal(204, responseType.StatusCode);
+                    Assert.Null(responseType.ModelMetadata);
+                    Assert.Empty(GetSortedMediaTypes(responseType));
+                },
+                responseType =>
+                {
+                    Assert.Equal(typeof(BadData), responseType.Type);
+                    Assert.Equal(400, responseType.StatusCode);
+                    Assert.NotNull(responseType.ModelMetadata);
+                    Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+                },
+                responseType =>
+                {
+                    Assert.Equal(typeof(ErrorDetails), responseType.Type);
+                    Assert.Equal(500, responseType.StatusCode);
+                    Assert.NotNull(responseType.ModelMetadata);
+                    Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+                });
+        }
+
+        [Theory]
+        [InlineData(nameof(ReturnsActionResultOfSequenceOfProducts))]
+        [InlineData(nameof(ReturnsTaskOfActionResultOfSequenceOfProducts))]
+        public void GetApiDescription_ReturnsActionResultOfSequenceOfTWithProducesContentType(
+            string methodName)
+        {
+            // Arrange
+            var action = CreateActionDescriptor(methodName);
+            action.FilterDescriptors = new List<FilterDescriptor>()
+            {
+                // Since action is returning Void or Task, it does not make sense to provide a value for the
+                // 'Type' property to ProducesAttribute. But the same action could return other types of data
+                // based on runtime conditions.
+                new FilterDescriptor(
+                    new ProducesAttribute("text/json", "application/json"),
+                    FilterScope.Action),
+                new FilterDescriptor(
+                    new ProducesResponseTypeAttribute(200),
+                    FilterScope.Action),
+                new FilterDescriptor(
+                    new ProducesResponseTypeAttribute(201),
+                    FilterScope.Action),
+                new FilterDescriptor(
+                    new ProducesResponseTypeAttribute(typeof(BadData), 400),
+                    FilterScope.Action),
+                new FilterDescriptor(
+                    new ProducesResponseTypeAttribute(typeof(ErrorDetails), 500),
+                    FilterScope.Action)
+            };
+            var expectedMediaTypes = new[] { "application/json", "text/json" };
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            Assert.Equal(4, description.SupportedResponseTypes.Count);
+
+            Assert.Collection(
+                description.SupportedResponseTypes.OrderBy(responseType => responseType.StatusCode),
+                responseType =>
+                {
+                    Assert.Equal(typeof(IEnumerable<Product>), responseType.Type);
+                    Assert.Equal(200, responseType.StatusCode);
+                    Assert.NotNull(responseType.ModelMetadata);
+                    Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+                },
+                responseType =>
+                {
+                    Assert.Equal(typeof(IEnumerable<Product>), responseType.Type);
+                    Assert.Equal(201, responseType.StatusCode);
+                    Assert.NotNull(responseType.ModelMetadata);
+                    Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+                },
+                responseType =>
+                {
+                    Assert.Equal(typeof(BadData), responseType.Type);
+                    Assert.Equal(400, responseType.StatusCode);
+                    Assert.NotNull(responseType.ModelMetadata);
+                    Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+                },
+                responseType =>
+                {
+                    Assert.Equal(typeof(ErrorDetails), responseType.Type);
+                    Assert.Equal(500, responseType.StatusCode);
+                    Assert.NotNull(responseType.ModelMetadata);
+                    Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+                });
+        }
+
+        [Theory]
+        [InlineData(nameof(ReturnsVoid))]
+        [InlineData(nameof(ReturnsTask))]
+        public void GetApiDescription_DefaultVoidStatus(string methodName)
+        {
+            // Arrange
+            var action = CreateActionDescriptor(methodName);
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            var responseType = Assert.Single(description.SupportedResponseTypes);
+            Assert.Equal(typeof(void), responseType.Type);
+            Assert.Equal(200, responseType.StatusCode);
+            Assert.Null(responseType.ModelMetadata);
+        }
+
+        [Theory]
+        [InlineData(nameof(ReturnsVoid))]
+        [InlineData(nameof(ReturnsTask))]
+        public void GetApiDescription_VoidWithResponseTypeAttributeStatus(string methodName)
+        {
+            // Arrange
+            var action = CreateActionDescriptor(methodName);
+            var filter = new ProducesResponseTypeAttribute(typeof(void), statusCode: 204);
+            action.FilterDescriptors = new List<FilterDescriptor>
+            {
+                new FilterDescriptor(filter, FilterScope.Action)
+            };
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            var responseType = Assert.Single(description.SupportedResponseTypes);
+            Assert.Equal(typeof(void), responseType.Type);
+            Assert.Equal(204, responseType.StatusCode);
+            Assert.Null(responseType.ModelMetadata);
+        }
+
+        [Theory]
+        [InlineData(nameof(ReturnsObject))]
+        [InlineData(nameof(ReturnsVoid))]
+        [InlineData(nameof(ReturnsActionResult))]
+        [InlineData(nameof(ReturnsJsonResult))]
+        [InlineData(nameof(ReturnsTaskOfObject))]
+        [InlineData(nameof(ReturnsTask))]
+        [InlineData(nameof(ReturnsTaskOfActionResult))]
+        [InlineData(nameof(ReturnsTaskOfJsonResult))]
+        public void GetApiDescription_PopulatesResponseInformation_WhenSetByFilter(string methodName)
+        {
+            // Arrange
+            var action = CreateActionDescriptor(methodName);
+            var filter = new ContentTypeAttribute("text/*")
+            {
+                Type = typeof(Order)
+            };
+
+            action.FilterDescriptors = new List<FilterDescriptor>
+            {
+                new FilterDescriptor(filter, FilterScope.Action)
+            };
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            var responseTypes = Assert.Single(description.SupportedResponseTypes);
+            Assert.NotNull(responseTypes.ModelMetadata);
+            Assert.Equal(200, responseTypes.StatusCode);
+            Assert.Equal(typeof(Order), responseTypes.Type);
+
+            foreach (var responseFormat in responseTypes.ApiResponseFormats)
+            {
+                Assert.StartsWith("text/", responseFormat.MediaType);
+            }
+        }
+
+        [Fact]
+        public void GetApiDescription_IncludesResponseFormats()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(ReturnsProduct));
+            var expectedMediaTypes = new[] { "application/json", "application/xml", "text/json", "text/xml" };
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            var responseType = Assert.Single(description.SupportedResponseTypes);
+            Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+        }
+
+        [Fact]
+        public void GetApiDescription_IncludesResponseFormats_FilteredByAttribute()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(ReturnsProduct));
+            var expectedMediaTypes = new[] { "text/json", "text/xml" };
+            action.FilterDescriptors = new List<FilterDescriptor>
+            {
+                new FilterDescriptor(new ContentTypeAttribute("text/*"), FilterScope.Action)
+            };
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            var responseType = Assert.Single(description.SupportedResponseTypes);
+            Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+        }
+
+        [Fact]
+        public void GetApiDescription_IncludesResponseFormats_FilteredByType()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(ReturnsObject));
+            var filter = new ContentTypeAttribute("text/*")
+            {
+                Type = typeof(Order)
+            };
+
+            action.FilterDescriptors = new List<FilterDescriptor>
+            {
+                new FilterDescriptor(filter, FilterScope.Action)
+            };
+
+            var formatters = CreateOutputFormatters();
+
+            // This will just format Order
+            formatters[0].SupportedTypes.Add(typeof(Order));
+
+            // This will just format Product
+            formatters[1].SupportedTypes.Add(typeof(Product));
+
+            // Act
+            var descriptions = GetApiDescriptions(action, outputFormatters: formatters);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            var responseType = Assert.Single(description.SupportedResponseTypes);
+            Assert.Equal(typeof(Order), responseType.Type);
+            Assert.NotNull(responseType.ModelMetadata);
+            var apiResponseFormat = Assert.Single(
+                responseType.ApiResponseFormats.Where(responseFormat => responseFormat.MediaType == "text/json"));
+            Assert.Same(formatters[0], apiResponseFormat.Formatter);
+        }
+
+        [Fact]
+        public void GetApiDescription_RequestFormatsEmpty_WithNoBodyParameter()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsProduct));
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            Assert.Empty(description.SupportedRequestFormats);
+        }
+
+        [Fact]
+        public void GetApiDescription_IncludesRequestFormats()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsProduct_Body));
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            Assert.Collection(
+                description.SupportedRequestFormats.OrderBy(f => f.MediaType.ToString()),
+                f => Assert.Equal("application/json", f.MediaType.ToString()),
+                f => Assert.Equal("application/xml", f.MediaType.ToString()),
+                f => Assert.Equal("text/json", f.MediaType.ToString()),
+                f => Assert.Equal("text/xml", f.MediaType.ToString()));
+        }
+
+        [Fact]
+        public void GetApiDescription_IncludesRequestFormats_FilteredByAttribute()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsProduct_Body));
+
+            action.FilterDescriptors = new List<FilterDescriptor>
+            {
+                new FilterDescriptor(new ContentTypeAttribute("text/*"), FilterScope.Action)
+            };
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            Assert.Collection(
+                description.SupportedRequestFormats.OrderBy(f => f.MediaType.ToString()),
+                f => Assert.Equal("text/json", f.MediaType.ToString()),
+                f => Assert.Equal("text/xml", f.MediaType.ToString()));
+        }
+
+        [Fact]
+        public void GetApiDescription_IncludesRequestFormats_FilteredByType()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsProduct_Body));
+
+            action.FilterDescriptors = new List<FilterDescriptor>
+            {
+                new FilterDescriptor(new ContentTypeAttribute("text/*"), FilterScope.Action)
+            };
+
+            var formatters = CreateInputFormatters();
+
+            // This will just format Order
+            formatters[0].SupportedTypes.Add(typeof(Order));
+
+            // This will just format Product
+            formatters[1].SupportedTypes.Add(typeof(Product));
+
+            // Act
+            var descriptions = GetApiDescriptions(action, inputFormatters: formatters);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+
+            var format = Assert.Single(description.SupportedRequestFormats);
+            Assert.Equal("text/xml", format.MediaType.ToString());
+            Assert.Same(formatters[1], format.Formatter);
+        }
+
+        [Fact]
+        public void GetApiDescription_ParameterDescription_ModelBoundParameter()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsProduct));
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+
+            var parameters = description.ParameterDescriptions;
+            Assert.Equal(3, parameters.Count);
+
+            var parameter = Assert.Single(parameters, p => p.Name == "ProductId");
+            Assert.Same(BindingSource.ModelBinding, parameter.Source);
+            Assert.Equal(typeof(int), parameter.Type);
+
+            parameter = Assert.Single(parameters, p => p.Name == "Name");
+            Assert.Same(BindingSource.ModelBinding, parameter.Source);
+            Assert.Equal(typeof(string), parameter.Type);
+
+            parameter = Assert.Single(parameters, p => p.Name == "Description");
+            Assert.Same(BindingSource.ModelBinding, parameter.Source);
+            Assert.Equal(typeof(string), parameter.Type);
+        }
+
+        [Fact]
+        public void GetApiDescription_ParameterDescription_IsRequiredSet()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(RequiredParameter));
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            var parameter = Assert.Single(description.ParameterDescriptions);
+            Assert.Equal("name", parameter.Name);
+            Assert.Same(BindingSource.ModelBinding, parameter.Source);
+            Assert.Equal(typeof(string), parameter.Type);
+            Assert.True(parameter.ModelMetadata.IsRequired);
+            Assert.True(parameter.ModelMetadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void GetApiDescription_ParameterDescription_IsRequiredNotSet_IfNotValiatingTopLevelNodes()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(RequiredParameter));
+
+            // Act
+            var descriptions = GetApiDescriptions(action, allowValidatingTopLevelNodes: false);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            var parameter = Assert.Single(description.ParameterDescriptions);
+            Assert.Equal("name", parameter.Name);
+            Assert.Same(BindingSource.ModelBinding, parameter.Source);
+            Assert.Equal(typeof(string), parameter.Type);
+            Assert.False(parameter.ModelMetadata.IsRequired);
+            Assert.False(parameter.ModelMetadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void GetApiDescription_ParameterDescription_SourceFromRouteData()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsId_Route));
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+
+            var parameter = Assert.Single(description.ParameterDescriptions);
+            Assert.Equal("id", parameter.Name);
+            Assert.Same(BindingSource.Path, parameter.Source);
+        }
+
+        [Fact]
+        public void GetApiDescription_ParameterDescription_SourceFromQueryString()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsId_Query));
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+
+            var parameter = Assert.Single(description.ParameterDescriptions);
+            Assert.Equal("id", parameter.Name);
+            Assert.Same(BindingSource.Query, parameter.Source);
+        }
+
+        [Fact]
+        public void GetApiDescription_ParameterDescription_SourceFromBody()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsProduct_Body));
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+
+            var parameter = Assert.Single(description.ParameterDescriptions);
+            Assert.Equal("product", parameter.Name);
+            Assert.Same(BindingSource.Body, parameter.Source);
+        }
+
+        [Fact]
+        public void GetApiDescription_ParameterDescription_SourceFromForm()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsProduct_Form));
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+
+            var parameters = description.ParameterDescriptions;
+            Assert.Equal(3, parameters.Count);
+
+            var parameter = Assert.Single(parameters, p => p.Name == "ProductId");
+            Assert.Same(BindingSource.Form, parameter.Source);
+            Assert.Equal(typeof(int), parameter.Type);
+
+            parameter = Assert.Single(parameters, p => p.Name == "Name");
+            Assert.Same(BindingSource.Form, parameter.Source);
+            Assert.Equal(typeof(string), parameter.Type);
+
+            parameter = Assert.Single(parameters, p => p.Name == "Description");
+            Assert.Same(BindingSource.Form, parameter.Source);
+            Assert.Equal(typeof(string), parameter.Type);
+        }
+
+        [Fact]
+        public void GetApiDescription_ParameterDescription_SourceFromFormFile()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsFormFile));
+            action.FilterDescriptors = new[]
+            {
+                new FilterDescriptor(new ConsumesAttribute("multipart/form-data"), FilterScope.Action),
+            };
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+
+            var parameters = description.ParameterDescriptions;
+            var parameter = Assert.Single(parameters);
+            Assert.Same(BindingSource.FormFile, parameter.Source);
+
+            var requestFormat = Assert.Single(description.SupportedRequestFormats);
+            Assert.Equal("multipart/form-data", requestFormat.MediaType);
+            Assert.Null(requestFormat.Formatter);
+        }
+
+        [Fact]
+        public void GetApiDescription_ParameterDescription_SourceFromHeader()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsId_Header));
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+
+            var parameter = Assert.Single(description.ParameterDescriptions);
+            Assert.Equal("id", parameter.Name);
+            Assert.Same(BindingSource.Header, parameter.Source);
+        }
+
+        // 'Hidden' parameters are hidden (not returned).
+        [Fact]
+        public void GetApiDescription_ParameterDescription_SourceFromServices()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsFormatters_Services));
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            Assert.Empty(description.ParameterDescriptions);
+        }
+
+        [Fact]
+        public void GetApiDescription_ParameterDescription_SourceFromCustomModelBinder()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsProduct_Custom));
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+
+            var parameter = Assert.Single(description.ParameterDescriptions);
+            Assert.Equal("product", parameter.Name);
+            Assert.Same(BindingSource.Custom, parameter.Source);
+        }
+
+        [Fact]
+        public void GetApiDescription_ParameterDescription_SourceFromDefault_ModelBinderAttribute_WithoutBinderType()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsProduct_Default));
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+
+            var parameters = description.ParameterDescriptions;
+            Assert.Equal(3, parameters.Count);
+
+            var parameter = Assert.Single(parameters, p => p.Name == "ProductId");
+            Assert.Same(BindingSource.ModelBinding, parameter.Source);
+            Assert.Equal(typeof(int), parameter.Type);
+
+            parameter = Assert.Single(parameters, p => p.Name == "Name");
+            Assert.Same(BindingSource.ModelBinding, parameter.Source);
+            Assert.Equal(typeof(string), parameter.Type);
+
+            parameter = Assert.Single(parameters, p => p.Name == "Description");
+            Assert.Same(BindingSource.ModelBinding, parameter.Source);
+            Assert.Equal(typeof(string), parameter.Type);
+        }
+
+        [Fact]
+        public void GetApiDescription_ParameterDescription_ComplexDTO()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsProductChangeDTO));
+            var parameterDescriptor = action.Parameters.Single();
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            Assert.Equal(4, description.ParameterDescriptions.Count);
+
+            var id = Assert.Single(description.ParameterDescriptions, p => p.Name == "Id");
+            Assert.Same(BindingSource.Path, id.Source);
+            Assert.Equal(typeof(int), id.Type);
+
+            var product = Assert.Single(description.ParameterDescriptions, p => p.Name == "Product");
+            Assert.Same(BindingSource.Body, product.Source);
+            Assert.Equal(typeof(Product), product.Type);
+
+            var userId = Assert.Single(description.ParameterDescriptions, p => p.Name == "UserId");
+            Assert.Same(BindingSource.Header, userId.Source);
+            Assert.Equal(typeof(string), userId.Type);
+
+            var comments = Assert.Single(description.ParameterDescriptions, p => p.Name == "Comments");
+            Assert.Same(BindingSource.ModelBinding, comments.Source);
+            Assert.Equal(typeof(string), comments.Type);
+        }
+
+        // The method under test uses an attribute on the parameter to set a 'default' source
+        [Fact]
+        public void GetApiDescription_ParameterDescription_ComplexDTO_AmbientValueProviderMetadata()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsProductChangeDTO_Query));
+            var parameterDescriptor = action.Parameters.Single();
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            Assert.Equal(4, description.ParameterDescriptions.Count);
+
+            var id = Assert.Single(description.ParameterDescriptions, p => p.Name == "Id");
+            Assert.Same(BindingSource.Path, id.Source);
+            Assert.Equal(typeof(int), id.Type);
+
+            var product = Assert.Single(description.ParameterDescriptions, p => p.Name == "Product");
+            Assert.Same(BindingSource.Body, product.Source);
+            Assert.Equal(typeof(Product), product.Type);
+
+            var userId = Assert.Single(description.ParameterDescriptions, p => p.Name == "UserId");
+            Assert.Same(BindingSource.Header, userId.Source);
+            Assert.Equal(typeof(string), userId.Type);
+
+            var comments = Assert.Single(description.ParameterDescriptions, p => p.Name == "Comments");
+            Assert.Same(BindingSource.Query, comments.Source);
+            Assert.Equal(typeof(string), comments.Type);
+        }
+
+        [Fact]
+        public void GetApiDescription_ParameterDescription_ComplexDTO_AnotherLevel()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsOrderDTO));
+            var parameterDescriptor = action.Parameters.Single();
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            Assert.Equal(4, description.ParameterDescriptions.Count);
+
+            var id = Assert.Single(description.ParameterDescriptions, p => p.Name == "Id");
+            Assert.Same(BindingSource.Path, id.Source);
+            Assert.Equal(typeof(int), id.Type);
+
+            var quantity = Assert.Single(description.ParameterDescriptions, p => p.Name == "Quantity");
+            Assert.Same(BindingSource.ModelBinding, quantity.Source);
+            Assert.Equal(typeof(int), quantity.Type);
+
+            var productId = Assert.Single(description.ParameterDescriptions, p => p.Name == "Product.Id");
+            Assert.Same(BindingSource.ModelBinding, productId.Source);
+            Assert.Equal(typeof(int), productId.Type);
+
+            var price = Assert.Single(description.ParameterDescriptions, p => p.Name == "Product.Price");
+            Assert.Same(BindingSource.Query, price.Source);
+            Assert.Equal(typeof(decimal), price.Type);
+        }
+
+        // The method under test uses an attribute on the parameter to set a 'default' source
+        [Fact]
+        public void GetApiDescription_ParameterDescription_ComplexDTO_AnotherLevel_AmbientValueProviderMetadata()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsOrderDTO_Query));
+            var parameterDescriptor = action.Parameters.Single();
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            Assert.Equal(4, description.ParameterDescriptions.Count);
+
+            var id = Assert.Single(description.ParameterDescriptions, p => p.Name == "Id");
+            Assert.Same(BindingSource.Path, id.Source);
+            Assert.Equal(typeof(int), id.Type);
+
+            var quantity = Assert.Single(description.ParameterDescriptions, p => p.Name == "Quantity");
+            Assert.Same(BindingSource.Query, quantity.Source);
+            Assert.Equal(typeof(int), quantity.Type);
+
+            var productId = Assert.Single(description.ParameterDescriptions, p => p.Name == "Product.Id");
+            Assert.Same(BindingSource.Query, productId.Source);
+            Assert.Equal(typeof(int), productId.Type);
+
+            var productPrice = Assert.Single(description.ParameterDescriptions, p => p.Name == "Product.Price");
+            Assert.Same(BindingSource.Query, productPrice.Source);
+            Assert.Equal(typeof(decimal), productPrice.Type);
+        }
+
+        [Fact]
+        public void GetApiDescription_ParameterDescription_BreaksCycles()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsCycle));
+            var parameterDescriptor = action.Parameters.Single();
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+
+            var c = Assert.Single(description.ParameterDescriptions);
+            Assert.Same(BindingSource.Query, c.Source);
+            Assert.Equal("C.C.C.C", c.Name);
+            Assert.Equal(typeof(Cycle1), c.Type);
+        }
+
+        [Fact]
+        public void GetApiDescription_ParameterDescription_DTOWithCollection()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsHasCollection));
+            var parameterDescriptor = action.Parameters.Single();
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+
+            var products = Assert.Single(description.ParameterDescriptions);
+            Assert.Same(BindingSource.Query, products.Source);
+            Assert.Equal("Products", products.Name);
+            Assert.Equal(typeof(Product[]), products.Type);
+        }
+
+        // If a property/parameter is a collection, we automatically treat it as a leaf-node.
+        [Fact]
+        public void GetApiDescription_ParameterDescription_DTOWithCollection_ElementsWithBinderMetadataIgnored()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsHasCollection_Complex));
+            var parameterDescriptor = action.Parameters.Single();
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+
+            var items = Assert.Single(description.ParameterDescriptions);
+            Assert.Same(BindingSource.ModelBinding, items.Source);
+            Assert.Equal("Items", items.Name);
+            Assert.Equal(typeof(Child[]), items.Type);
+        }
+
+        [Fact]
+        public void GetApiDescription_ParameterDescription_RedundentMetadata_NotMergedWithParent()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsRedundentMetadata));
+            var parameterDescriptor = action.Parameters.Single();
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+
+            var parameters = description.ParameterDescriptions;
+            Assert.Equal(2, parameters.Count);
+
+            var id = Assert.Single(parameters, p => p.Name == "Id");
+            Assert.Same(BindingSource.Query, id.Source);
+            Assert.Equal(typeof(int), id.Type);
+
+            var name = Assert.Single(parameters, p => p.Name == "Name");
+            Assert.Same(BindingSource.Query, name.Source);
+            Assert.Equal(typeof(string), name.Type);
+        }
+
+        [Fact]
+        public void GetApiDescription_ParameterDescription_RedundentMetadata_WithParameterMetadata()
+        {
+            // Arrange
+            var action = CreateActionDescriptor(nameof(AcceptsPerson));
+            var parameterDescriptor = action.Parameters.Single();
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+
+            var name = Assert.Single(description.ParameterDescriptions, p => p.Name == "Name");
+            Assert.Same(BindingSource.Header, name.Source);
+            Assert.Equal(typeof(string), name.Type);
+
+            var id = Assert.Single(description.ParameterDescriptions, p => p.Name == "Id");
+            Assert.Same(BindingSource.Form, id.Source);
+            Assert.Equal(typeof(int), id.Type);
+        }
+
+        [Fact]
+        public void GetApiDescription_WithControllerProperties_Merges_ParameterDescription()
+        {
+            // Arrange
+            var action = CreateActionDescriptor("FromQueryName", typeof(TestController));
+            var parameterDescriptor = action.Parameters.Single();
+
+            // Act
+            var descriptions = GetApiDescriptions(action);
+
+            // Assert
+            var description = Assert.Single(descriptions);
+            Assert.Equal(5, description.ParameterDescriptions.Count);
+
+            var name = Assert.Single(description.ParameterDescriptions, p => p.Name == "name");
+            Assert.Same(BindingSource.Query, name.Source);
+            Assert.Equal(typeof(string), name.Type);
+
+            var id = Assert.Single(description.ParameterDescriptions, p => p.Name == "Id");
+            Assert.Same(BindingSource.Path, id.Source);
+            Assert.Equal(typeof(int), id.Type);
+
+            var product = Assert.Single(description.ParameterDescriptions, p => p.Name == "Product");
+            Assert.Same(BindingSource.Body, product.Source);
+            Assert.Equal(typeof(Product), product.Type);
+
+            var userId = Assert.Single(description.ParameterDescriptions, p => p.Name == "UserId");
+            Assert.Same(BindingSource.Header, userId.Source);
+            Assert.Equal(typeof(string), userId.Type);
+
+            var comments = Assert.Single(description.ParameterDescriptions, p => p.Name == "Comments");
+            Assert.Same(BindingSource.ModelBinding, comments.Source);
+            Assert.Equal(typeof(string), comments.Type);
+        }
+
+        private IReadOnlyList<ApiDescription> GetApiDescriptions(
+            ActionDescriptor action,
+            List<MockInputFormatter> inputFormatters = null,
+            List<MockOutputFormatter> outputFormatters = null,
+            bool allowValidatingTopLevelNodes = true)
+        {
+            var context = new ApiDescriptionProviderContext(new ActionDescriptor[] { action });
+
+            var options = new MvcOptions
+            {
+                AllowValidatingTopLevelNodes = allowValidatingTopLevelNodes,
+            };
+            foreach (var formatter in inputFormatters ?? CreateInputFormatters())
+            {
+                options.InputFormatters.Add(formatter);
+            }
+
+            foreach (var formatter in outputFormatters ?? CreateOutputFormatters())
+            {
+                options.OutputFormatters.Add(formatter);
+            }
+
+            var optionsAccessor = Options.Create(options);
+
+            var constraintResolver = new Mock<IInlineConstraintResolver>();
+            constraintResolver.Setup(c => c.ResolveConstraint("int"))
+                .Returns(new IntRouteConstraint());
+
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+            var provider = new DefaultApiDescriptionProvider(
+                optionsAccessor,
+                constraintResolver.Object,
+                modelMetadataProvider,
+                new ActionResultTypeMapper());
+
+            provider.OnProvidersExecuting(context);
+            provider.OnProvidersExecuted(context);
+
+            return new ReadOnlyCollection<ApiDescription>(context.Results);
+        }
+
+        private List<MockInputFormatter> CreateInputFormatters()
+        {
+            // Include some default formatters that look reasonable, some tests will override this.
+            var formatters = new List<MockInputFormatter>()
+            {
+                new MockInputFormatter(),
+                new MockInputFormatter(),
+            };
+
+            formatters[0].SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/json"));
+            formatters[0].SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("text/json"));
+
+            formatters[1].SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/xml"));
+            formatters[1].SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("text/xml"));
+
+            return formatters;
+        }
+
+        private List<MockOutputFormatter> CreateOutputFormatters()
+        {
+            // Include some default formatters that look reasonable, some tests will override this.
+            var formatters = new List<MockOutputFormatter>()
+            {
+                new MockOutputFormatter(),
+                new MockOutputFormatter(),
+            };
+
+            formatters[0].SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/json"));
+            formatters[0].SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("text/json"));
+
+            formatters[1].SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/xml"));
+            formatters[1].SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("text/xml"));
+
+            return formatters;
+        }
+
+        private ControllerActionDescriptor CreateActionDescriptor(string methodName = null, Type controllerType = null)
+        {
+            var action = new ControllerActionDescriptor();
+            action.SetProperty(new ApiDescriptionActionData());
+
+            if (controllerType != null)
+            {
+                action.MethodInfo = controllerType.GetMethod(
+                    methodName ?? "ReturnsObject",
+                    BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+
+                action.ControllerTypeInfo = controllerType.GetTypeInfo();
+                action.BoundProperties = new List<ParameterDescriptor>();
+
+                foreach (var property in controllerType.GetProperties())
+                {
+                    var bindingInfo = BindingInfo.GetBindingInfo(property.GetCustomAttributes().OfType<object>());
+                    if (bindingInfo != null)
+                    {
+                        action.BoundProperties.Add(new ParameterDescriptor()
+                        {
+                            BindingInfo = bindingInfo,
+                            Name = property.Name,
+                            ParameterType = property.PropertyType,
+                        });
+                    }
+                }
+            }
+            else
+            {
+                action.MethodInfo = GetType().GetMethod(
+                    methodName ?? "ReturnsObject",
+                    BindingFlags.Instance | BindingFlags.NonPublic);
+            }
+
+            action.Parameters = new List<ParameterDescriptor>();
+            foreach (var parameter in action.MethodInfo.GetParameters())
+            {
+                action.Parameters.Add(new ControllerParameterDescriptor()
+                {
+                    Name = parameter.Name,
+                    ParameterType = parameter.ParameterType,
+                    BindingInfo = BindingInfo.GetBindingInfo(parameter.GetCustomAttributes().OfType<object>()),
+                    ParameterInfo = parameter
+                });
+            }
+
+            return action;
+        }
+
+        private IEnumerable<string> GetSortedMediaTypes(ApiResponseType apiResponseType)
+        {
+            return apiResponseType.ApiResponseFormats
+                .OrderBy(responseType => responseType.MediaType)
+                .Select(responseType => responseType.MediaType);
+        }
+
+        private object ReturnsObject()
+        {
+            return null;
+        }
+
+        private void ReturnsVoid()
+        {
+
+        }
+
+        private IActionResult ReturnsActionResult()
+        {
+            return null;
+        }
+
+        private JsonResult ReturnsJsonResult()
+        {
+            return null;
+        }
+
+        private Task<Product> ReturnsTaskOfProduct()
+        {
+            return null;
+        }
+
+        private Task<object> ReturnsTaskOfObject()
+        {
+            return null;
+        }
+
+        private Task ReturnsTask()
+        {
+            return null;
+        }
+
+        private Task<IActionResult> ReturnsTaskOfActionResult()
+        {
+            return null;
+        }
+
+        private Task<JsonResult> ReturnsTaskOfJsonResult()
+        {
+            return null;
+        }
+
+        private Product ReturnsProduct()
+        {
+            return null;
+        }
+
+        private ActionResult<Product> ReturnsActionResultOfProduct() => null;
+
+        private ActionResult<IEnumerable<Product>> ReturnsActionResultOfSequenceOfProducts() => null;
+
+        private Task<ActionResult<Product>> ReturnsTaskOfActionResultOfProduct() => null;
+
+        private Task<ActionResult<IEnumerable<Product>>> ReturnsTaskOfActionResultOfSequenceOfProducts() => null;
+
+        private void AcceptsProduct(Product product)
+        {
+        }
+
+        private void RequiredParameter([BindRequired, Required] string name)
+        {
+        }
+
+        private void AcceptsProduct_Body([FromBody] Product product)
+        {
+        }
+
+        private void AcceptsProduct_Form([FromForm] Product product)
+        {
+        }
+
+        private void AcceptsFormFile([FromFormFile] IFormFile formFile)
+        {
+        }
+
+        // This will show up as source = model binding
+        private void AcceptsProduct_Default([ModelBinder] Product product)
+        {
+        }
+
+        // This will show up as source = unknown
+        private void AcceptsProduct_Custom([ModelBinder(BinderType = typeof(BodyModelBinder))] Product product)
+        {
+        }
+
+        private void AcceptsId_Route([FromRoute] int id)
+        {
+        }
+
+        private void AcceptsId_Query([FromQuery] int id)
+        {
+        }
+
+        private void AcceptsId_Header([FromHeader] int id)
+        {
+        }
+
+        private void AcceptsFormatters_Services([FromServices] ITestService tempDataProvider)
+        {
+        }
+
+        private void AcceptsProductChangeDTO(ProductChangeDTO dto)
+        {
+        }
+
+        private void AcceptsProductChangeDTO_Query([FromQuery] ProductChangeDTO dto)
+        {
+        }
+
+        private void AcceptsOrderDTO(OrderDTO dto)
+        {
+        }
+
+        private void AcceptsOrderDTO_Query([FromQuery] OrderDTO dto)
+        {
+        }
+
+        private void AcceptsCycle(Cycle1 c)
+        {
+        }
+
+        private void AcceptsHasCollection(HasCollection c)
+        {
+        }
+
+        private void AcceptsHasCollection_Complex(HasCollection_Complex c)
+        {
+        }
+
+        private void AcceptsRedundentMetadata([FromQuery] RedundentMetadata r)
+        {
+        }
+
+        private void AcceptsPerson([FromForm] Person person)
+        {
+        }
+
+        private void FromRouting([FromRoute] int id)
+        {
+        }
+
+        private void FromModelBinding(int id)
+        {
+        }
+
+        private void FromCustom([ModelBinder(BinderType = typeof(BodyModelBinder))] int id)
+        {
+        }
+
+        private void FromHeader([FromHeader] int id)
+        {
+        }
+
+        private void FromBody([FromBody] int id)
+        {
+        }
+
+        private class TestController
+        {
+            [FromRoute]
+            public int Id { get; set; }
+
+            [FromBody]
+            public Product Product { get; set; }
+
+            [FromHeader]
+            public string UserId { get; set; }
+
+            [ModelBinder]
+            public string Comments { get; set; }
+
+            public string NotBound { get; set; }
+
+            public void FromQueryName([FromQuery] string name)
+            {
+            }
+        }
+
+        public class Customer
+        {
+        }
+
+        public class BadData
+        {
+        }
+
+        public class ErrorDetails
+        {
+        }
+
+        public class BaseProducesController : Controller
+        {
+            public IActionResult ReturnsActionResult()
+            {
+                return null;
+            }
+
+            public Task ReturnsTask()
+            {
+                return null;
+            }
+
+            public void ReturnsVoid()
+            {
+            }
+        }
+
+        public class DerivedProducesController : BaseProducesController
+        {
+        }
+
+        private class Product
+        {
+            public int ProductId { get; set; }
+
+            public string Name { get; set; }
+
+            public string Description { get; set; }
+        }
+
+        private class Order
+        {
+            public int OrderId { get; set; }
+
+            public int ProductId { get; set; }
+
+            public int Quantity { get; set; }
+
+            public decimal Price { get; set; }
+        }
+
+        private class ProductChangeDTO
+        {
+            [FromRoute]
+            public int Id { get; set; }
+
+            [FromBody]
+            public Product Product { get; set; }
+
+            [FromHeader]
+            public string UserId { get; set; }
+
+            public string Comments { get; set; }
+        }
+
+        private class OrderDTO
+        {
+            [FromRoute]
+            public int Id { get; set; }
+
+            public int Quantity { get; set; }
+
+            public OrderProductDTO Product { get; set; }
+        }
+
+        private class OrderProductDTO
+        {
+            public int Id { get; set; }
+
+            [FromQuery]
+            public decimal Price { get; set; }
+        }
+
+        private class Cycle1
+        {
+            public Cycle2 C { get; set; }
+        }
+
+        private class Cycle2
+        {
+            [FromQuery]
+            public Cycle1 C { get; set; }
+        }
+
+        private class HasCollection
+        {
+            [FromQuery]
+            public Product[] Products { get; set; }
+        }
+
+        private class HasCollection_Complex
+        {
+            public Child[] Items { get; set; }
+        }
+
+        private class Child
+        {
+            [FromQuery]
+            public int Id { get; set; }
+
+            public string Name { get; set; }
+        }
+
+        private class RedundentMetadata
+        {
+            [FromQuery]
+            public int Id { get; set; }
+
+            [FromQuery]
+            public string Name { get; set; }
+        }
+
+        public class Person
+        {
+            [FromHeader(Name = "Name")]
+            public string Name { get; set; }
+
+            [FromForm]
+            public int Id { get; set; }
+        }
+
+        private class MockInputFormatter : TextInputFormatter
+        {
+            public List<Type> SupportedTypes { get; } = new List<Type>();
+
+            public override Task<InputFormatterResult> ReadRequestBodyAsync(
+                InputFormatterContext context,
+                Encoding effectiveEncoding)
+            {
+                throw new NotImplementedException();
+            }
+
+            protected override bool CanReadType(Type type)
+            {
+                if (SupportedTypes.Count == 0)
+                {
+                    return true;
+                }
+                else if (type == null)
+                {
+                    return false;
+                }
+                else
+                {
+                    return SupportedTypes.Contains(type);
+                }
+            }
+        }
+
+        private class MockOutputFormatter : OutputFormatter
+        {
+            public List<Type> SupportedTypes { get; } = new List<Type>();
+
+            public override Task WriteResponseBodyAsync(OutputFormatterWriteContext context)
+            {
+                throw new NotImplementedException();
+            }
+
+            protected override bool CanWriteType(Type type)
+            {
+                if (SupportedTypes.Count == 0)
+                {
+                    return true;
+                }
+                else if (type == null)
+                {
+                    return false;
+                }
+                else
+                {
+                    return SupportedTypes.Contains(type);
+                }
+            }
+        }
+
+        private class ContentTypeAttribute :
+            Attribute,
+            IFilterMetadata,
+            IApiResponseMetadataProvider,
+            IApiRequestMetadataProvider
+        {
+            public ContentTypeAttribute(string mediaType)
+            {
+                ContentTypes.Add(mediaType);
+                StatusCode = 200;
+            }
+
+            public MediaTypeCollection ContentTypes { get; } = new MediaTypeCollection();
+
+            public int StatusCode { get; set; }
+
+            public Type Type { get; set; }
+
+            public void SetContentTypes(MediaTypeCollection contentTypes)
+            {
+                contentTypes.Clear();
+                foreach (var contentType in ContentTypes)
+                {
+                    contentTypes.Add(contentType);
+                }
+            }
+        }
+
+        private interface ITestService
+        {
+
+        }
+
+        private class FromFormFileAttribute : Attribute, IBindingSourceMetadata
+        {
+            public BindingSource BindingSource => BindingSource.FormFile;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj
new file mode 100644
index 0000000000..7a812822b1
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedAtActionResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedAtActionResultTests.cs
new file mode 100644
index 0000000000..d6ab7ad228
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedAtActionResultTests.cs
@@ -0,0 +1,321 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class AcceptedAtActionResultTests
+    {
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        [InlineData("actionName")]
+        public void Constructor_InitializesActionName(string actionName)
+        {
+            // Act
+            var result = new AcceptedAtActionResult(actionName: actionName, controllerName: null, routeValues: null, value: null);
+
+            // Assert
+            Assert.Equal(actionName, result.ActionName);
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        [InlineData("controllerName")]
+        public void Constructor_InitializesControllerName(string controllerName)
+        {
+            // Act
+            var result = new AcceptedAtActionResult(actionName: null, controllerName: controllerName, routeValues: null, value: null);
+
+            // Assert
+            Assert.Equal(controllerName, result.ControllerName);
+        }
+
+        public static TheoryData<object, int> RouteValuesData()
+        {
+            return new TheoryData<object, int>()
+            {
+                { null, -1 },
+                { "value", 1 },
+                { new object(), 0 }
+            };
+        }
+
+        [Theory]
+        [MemberData(nameof(RouteValuesData))]
+        public void Constructor_InitializesRouteValues(object routeValues, int expectedRouteValuesCount)
+        {
+            // Act
+            var result = new AcceptedAtActionResult(actionName: null, controllerName: null, routeValues: routeValues, value: null);
+
+            // Assert
+            if (expectedRouteValuesCount == -1)
+            {
+                Assert.Null(result.RouteValues);
+            }
+            else
+            {
+                Assert.Equal(expectedRouteValuesCount, result.RouteValues.Count);
+            }
+        }
+
+        public static TheoryData<object> ValuesData
+        {
+            get
+            {
+                return new TheoryData<object>
+                {
+                    null,
+                    "Test string",
+                    new object(),
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ValuesData))]
+        public void Constructor_InitializesStatusCodeAndValue(object value)
+        {
+            // Arrange 
+            var url = "testAction";
+
+            // Act         
+            var result = new AcceptedAtActionResult(
+                actionName: url,
+                controllerName: null,
+                routeValues: null,
+                value: value);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status202Accepted, result.StatusCode);
+            Assert.Same(value, result.Value);
+        }
+
+        [Fact]
+        public void UrlHelper_Get_ReturnsNull()
+        {
+            // Act         
+            var result = new AcceptedAtActionResult(actionName: null, controllerName: null, routeValues: null, value: null);
+
+            // Assert
+            Assert.Null(result.UrlHelper);
+        }
+
+        [Theory]
+        [MemberData(nameof(ValuesData))]
+        public async Task ExecuteResultAsync_SetsObjectValueOfFormatter(object value)
+        {
+            // Arrange
+            var url = "testAction";
+            var formatter = CreateMockFormatter();
+            var httpContext = GetHttpContext(formatter);
+            object actual = null;
+            formatter.Setup(f => f.WriteAsync(It.IsAny<OutputFormatterWriteContext>()))
+                .Callback((OutputFormatterWriteContext context) => actual = context.Object)
+                .Returns(Task.FromResult(0));
+
+            var actionContext = GetActionContext(httpContext);
+            var urlHelper = GetMockUrlHelper(url);
+
+            // Act
+            var result = new AcceptedAtActionResult(
+                actionName: url,
+                controllerName: null,
+                routeValues: null,
+                value: value);
+
+            result.UrlHelper = urlHelper;
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Same(value, actual);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_SetsStatusCodeAndLocationHeader()
+        {
+            // Arrange
+            var expectedUrl = "testAction";
+            var formatter = CreateMockFormatter();
+            var httpContext = GetHttpContext(formatter);
+            var actionContext = GetActionContext(httpContext);
+            var urlHelper = GetMockUrlHelper(expectedUrl);
+
+            // Act
+            var result = new AcceptedAtActionResult(
+                actionName: expectedUrl,
+                controllerName: null,
+                routeValues: null,
+                value: null);
+
+            result.UrlHelper = urlHelper;
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status202Accepted, httpContext.Response.StatusCode);
+            Assert.Equal(expectedUrl, httpContext.Response.Headers["Location"]);
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public async Task ExecuteResultAsync_ThrowsIfActionUrlIsNullOrEmpty(string returnValue)
+        {
+            // Arrange
+            var formatter = CreateMockFormatter();
+            var httpContext = GetHttpContext(formatter);
+            var actionContext = GetActionContext(httpContext);
+            var urlHelper = GetMockUrlHelper(returnValue);
+
+            // Act
+            var result = new AcceptedAtActionResult(
+                actionName: null,
+                controllerName: null,
+                routeValues: null,
+                value: null);
+
+            result.UrlHelper = urlHelper;
+
+            // Assert
+            await ExceptionAssert.ThrowsAsync<InvalidOperationException>(() =>
+                result.ExecuteResultAsync(actionContext),
+                "No route matches the supplied values.");
+        }
+
+        [Fact]
+        public void OnFormatting_NullUrlHelperContextHasRequestServices_ReturnsRequestServicesAction()
+        {
+            // Arrange
+            var context = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+            context.HttpContext.RequestServices = new ForwardingServiceProvider();
+
+            // Act
+            var result = new AcceptedAtActionResult(actionName: null, controllerName: null, routeValues: null, value: null);
+            result.OnFormatting(context);
+
+            // Assert
+            var header = context.HttpContext.Response.Headers.Last();
+            Assert.Equal("Location", header.Key);
+            Assert.Equal("abc", header.Value);
+        }
+
+        [Fact]
+        public void OnFormatting_NullUrlHelperContextNoRequestServices_ThrowsArgumentNullExeption()
+        {
+            // Arrange
+            var context = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+
+            // Act
+            var result = new AcceptedAtActionResult(actionName: null, controllerName: null, routeValues: null, value: null);
+
+            // Assert
+            Assert.Throws<ArgumentNullException>("provider", () => result.OnFormatting(context));
+        }
+
+        [Fact]
+        public void OnFormatting_NullContext_ThrowsArgumentNullException()
+        {
+            // Act
+            var result = new AcceptedAtActionResult("actionName", "controllerName", "routeValues", "value");
+
+            // Assert
+            Assert.Throws<ArgumentNullException>("context", () => result.OnFormatting(null));
+        }
+
+        private static ActionContext GetActionContext(HttpContext httpContext)
+        {
+            var routeData = new RouteData();
+            routeData.Routers.Add(Mock.Of<IRouter>());
+
+            return new ActionContext(
+                httpContext,
+                routeData,
+                new ActionDescriptor());
+        }
+
+        private static HttpContext GetHttpContext(Mock<IOutputFormatter> formatter)
+        {
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = CreateServices(formatter);
+            return httpContext;
+        }
+
+        private static Mock<IOutputFormatter> CreateMockFormatter()
+        {
+            var formatter = new Mock<IOutputFormatter>
+            {
+                CallBase = true
+            };
+            formatter.Setup(f => f.CanWriteResult(It.IsAny<OutputFormatterWriteContext>())).Returns(true);
+
+            return formatter;
+        }
+
+        private static IServiceProvider CreateServices(Mock<IOutputFormatter> formatter)
+        {
+            var options = Options.Create(new MvcOptions());
+            options.Value.OutputFormatters.Add(formatter.Object);
+            var services = new ServiceCollection();
+            services.AddSingleton<IActionResultExecutor<ObjectResult>>(new ObjectResultExecutor(
+                new DefaultOutputFormatterSelector(options, NullLoggerFactory.Instance),
+                new TestHttpResponseStreamWriterFactory(),
+                NullLoggerFactory.Instance));
+
+            return services.BuildServiceProvider();
+        }
+
+        private static IUrlHelper GetMockUrlHelper(string returnValue)
+        {
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper.Setup(o => o.Action(It.IsAny<UrlActionContext>())).Returns(returnValue);
+
+            return urlHelper.Object;
+        }
+
+        private class ForwardingServiceProvider : IServiceProvider
+        {
+            public object GetService(Type serviceType) => new ForwardingUrlHelperFactory();
+        }
+
+        private class ForwardingUrlHelperFactory : IUrlHelperFactory
+        {
+            public IUrlHelper GetUrlHelper(ActionContext context) => new ForwardingUrlHelper() { ActionValue = "abc" };
+        }
+
+        private class ForwardingUrlHelper : IUrlHelper
+        {
+            public string ActionValue { get; set; }
+
+            public ActionContext ActionContext => null;
+
+            public string Action(UrlActionContext actionContext) => ActionValue;
+
+            public string Content(string contentPath) => null;
+
+            public bool IsLocalUrl(string url) => false;
+
+            public string Link(string routeName, object values) => null;
+
+            public string RouteUrl(UrlRouteContext routeContext) => null;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedAtRouteResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedAtRouteResultTests.cs
new file mode 100644
index 0000000000..2200131971
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedAtRouteResultTests.cs
@@ -0,0 +1,199 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class AcceptedAtRouteResultTests
+    {
+        public static TheoryData<object> ValuesData
+        {
+            get
+            {
+                return new TheoryData<object>
+                {
+                    null,
+                    "Test string",
+                    new object(),
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ValuesData))]
+        public void Constructor_InitializesStatusCodeAndValue(object value)
+        {
+            // Arrange & Act
+            var result = new AcceptedAtRouteResult(
+                routeName: null,
+                routeValues: null,
+                value: value);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status202Accepted, result.StatusCode);
+            Assert.Same(value, result.Value);
+        }
+
+        [Theory]
+        [MemberData(nameof(ValuesData))]
+        public async Task ExecuteResultAsync_SetsObjectValueOfFormatter(object value)
+        {
+            // Arrange
+            var url = "testAction";
+            var formatter = CreateMockFormatter();
+            var httpContext = GetHttpContext(formatter);
+            object actual = null;
+            formatter.Setup(f => f.WriteAsync(It.IsAny<OutputFormatterWriteContext>()))
+                .Callback((OutputFormatterWriteContext context) => actual = context.Object)
+                .Returns(Task.FromResult(0));
+
+            var actionContext = GetActionContext(httpContext);
+            var urlHelper = GetMockUrlHelper(url);
+            var routeValues = new RouteValueDictionary(new Dictionary<string, string>()
+            {
+                { "test", "case" },
+                { "sample", "route" }
+            });
+
+            // Act
+            var result = new AcceptedAtRouteResult(
+                routeName: "sample",
+                routeValues: routeValues,
+                value: value);
+            result.UrlHelper = urlHelper;
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Same(value, actual);
+        }
+
+        public static TheoryData<object> AcceptedAtRouteData
+        {
+            get
+            {
+                return new TheoryData<object>
+                {
+                    null,
+                    new Dictionary<string, string>()
+                    {
+                        { "hello", "world" }
+                    },
+                    new RouteValueDictionary(
+                        new Dictionary<string, string>()
+                        {
+                            { "test", "case" },
+                            { "sample", "route" }
+                        }),
+                    };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(AcceptedAtRouteData))]
+        public async Task ExecuteResultAsync_SetsStatusCodeAndLocationHeader(object values)
+        {
+            // Arrange
+            var expectedUrl = "testAction";
+            var formatter = CreateMockFormatter();
+            var httpContext = GetHttpContext(formatter);
+            var actionContext = GetActionContext(httpContext);
+            var urlHelper = GetMockUrlHelper(expectedUrl);
+
+            // Act
+            var result = new AcceptedAtRouteResult(routeValues: values, value: null);
+            result.UrlHelper = urlHelper;
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status202Accepted, httpContext.Response.StatusCode);
+            Assert.Equal(expectedUrl, httpContext.Response.Headers["Location"]);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_ThrowsIfRouteUrlIsNull()
+        {
+            // Arrange
+            var formatter = CreateMockFormatter();
+            var httpContext = GetHttpContext(formatter);
+            var actionContext = GetActionContext(httpContext);
+            var urlHelper = GetMockUrlHelper(returnValue: null);
+
+            // Act
+            var result = new AcceptedAtRouteResult(
+                routeName: null,
+                routeValues: new Dictionary<string, object>(),
+                value: null);
+
+            result.UrlHelper = urlHelper;
+
+            // Assert
+            await ExceptionAssert.ThrowsAsync<InvalidOperationException>(() =>
+                result.ExecuteResultAsync(actionContext),
+                "No route matches the supplied values.");
+        }
+
+        private static ActionContext GetActionContext(HttpContext httpContext)
+        {
+            var routeData = new RouteData();
+            routeData.Routers.Add(Mock.Of<IRouter>());
+
+            return new ActionContext(
+                httpContext,
+                routeData,
+                new ActionDescriptor());
+        }
+
+        private static HttpContext GetHttpContext(Mock<IOutputFormatter> formatter)
+        {
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = CreateServices(formatter);
+            return httpContext;
+        }
+
+        private static Mock<IOutputFormatter> CreateMockFormatter()
+        {
+            var formatter = new Mock<IOutputFormatter>
+            {
+                CallBase = true
+            };
+            formatter.Setup(f => f.CanWriteResult(It.IsAny<OutputFormatterWriteContext>())).Returns(true);
+
+            return formatter;
+        }
+
+        private static IServiceProvider CreateServices(Mock<IOutputFormatter> formatter)
+        {
+            var options = Options.Create(new MvcOptions());
+            options.Value.OutputFormatters.Add(formatter.Object);
+            var services = new ServiceCollection();
+            services.AddSingleton<IActionResultExecutor<ObjectResult>>(new ObjectResultExecutor(
+                new DefaultOutputFormatterSelector(options, NullLoggerFactory.Instance),
+                new TestHttpResponseStreamWriterFactory(),
+                NullLoggerFactory.Instance));
+
+            return services.BuildServiceProvider();
+        }
+
+        private static IUrlHelper GetMockUrlHelper(string returnValue)
+        {
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper.Setup(o => o.Link(It.IsAny<string>(), It.IsAny<object>())).Returns(returnValue);
+
+            return urlHelper.Object;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedResultTests.cs
new file mode 100644
index 0000000000..8c32191534
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedResultTests.cs
@@ -0,0 +1,151 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Core.Test
+{
+    public class AcceptedResultTests
+    {
+        public static TheoryData<object> ValuesData
+        {
+            get
+            {
+                return new TheoryData<object>
+                {
+                    null,
+                    "Test string",
+                    new object(),
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ValuesData))]
+        public void Constructor_InitializesStatusCodeAndValue(object value)
+        {
+            // Arrange & Act
+            var result = new AcceptedResult("testlocation", value);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status202Accepted, result.StatusCode);
+            Assert.Same(value, result.Value);
+        }
+
+        [Theory]
+        [MemberData(nameof(ValuesData))]
+        public async Task ExecuteResultAsync_SetsObjectValueOfFormatter(object value)
+        {
+            // Arrange
+            var location = "/test/";
+            var formatter = CreateMockFormatter();
+            var httpContext = GetHttpContext(formatter);
+            object actual = null;
+            formatter.Setup(f => f.WriteAsync(It.IsAny<OutputFormatterWriteContext>()))
+                .Callback((OutputFormatterWriteContext context) => actual = context.Object)
+                .Returns(Task.FromResult(0));
+
+            var actionContext = GetActionContext(httpContext);
+
+            // Act
+            var result = new AcceptedResult(location, value);
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Same(value, actual);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_SetsStatusCodeAndLocationHeader()
+        {
+            // Arrange
+            var location = "/test/";
+            var formatter = CreateMockFormatter();
+            var httpContext = GetHttpContext(formatter);
+            var actionContext = GetActionContext(httpContext);
+
+            // Act
+            var result = new AcceptedResult(location, "testInput");
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status202Accepted, httpContext.Response.StatusCode);
+            Assert.Equal(location, httpContext.Response.Headers["Location"]);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_OverwritesLocationHeader()
+        {
+            // Arrange
+            var location = "/test/";
+            var formatter = CreateMockFormatter();
+            var httpContext = GetHttpContext(formatter);
+            var actionContext = GetActionContext(httpContext);
+            httpContext.Response.Headers["Location"] = "/different/location/";
+
+            // Act
+            var result = new AcceptedResult(location, "testInput");
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status202Accepted, httpContext.Response.StatusCode);
+            Assert.Equal(location, httpContext.Response.Headers["Location"]);
+        }
+
+        private static ActionContext GetActionContext(HttpContext httpContext)
+        {
+            var routeData = new RouteData();
+            routeData.Routers.Add(Mock.Of<IRouter>());
+            return new ActionContext(
+                httpContext,
+                routeData,
+                new ActionDescriptor());
+        }
+
+        private static HttpContext GetHttpContext(Mock<IOutputFormatter> formatter)
+        {
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = CreateServices(formatter);
+            return httpContext;
+        }
+
+        private static Mock<IOutputFormatter> CreateMockFormatter()
+        {
+            var formatter = new Mock<IOutputFormatter>
+            {
+                CallBase = true
+            };
+            formatter.Setup(f => f.CanWriteResult(It.IsAny<OutputFormatterWriteContext>())).Returns(true);
+
+            return formatter;
+        }
+
+        private static IServiceProvider CreateServices(Mock<IOutputFormatter> formatter)
+        {
+            var options = Options.Create(new MvcOptions());
+            options.Value.OutputFormatters.Add(formatter.Object);
+            var services = new ServiceCollection();
+            services.AddSingleton<IActionResultExecutor<ObjectResult>>(new ObjectResultExecutor(
+                new DefaultOutputFormatterSelector(options, NullLoggerFactory.Instance),
+                new TestHttpResponseStreamWriterFactory(),
+                NullLoggerFactory.Instance));
+
+            return services.BuildServiceProvider();
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ActionResultOfTTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ActionResultOfTTest.cs
new file mode 100644
index 0000000000..2445e84677
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ActionResultOfTTest.cs
@@ -0,0 +1,68 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class ActionResultOfTTest
+    {
+        [Fact]
+        public void Convert_ReturnsResultIfSet()
+        {
+            // Arrange
+            var expected = new OkResult();
+            var actionResultOfT = new ActionResult<string>(expected);
+            var convertToActionResult = (IConvertToActionResult)actionResultOfT;
+
+            // Act
+            var result = convertToActionResult.Convert();
+
+            // Assert
+            Assert.Same(expected, result);
+        }
+
+        [Fact]
+        public void Convert_ReturnsObjectResultWrappingValue()
+        {
+            // Arrange
+            var value = new BaseItem();
+            var actionResultOfT = new ActionResult<BaseItem>(value);
+            var convertToActionResult = (IConvertToActionResult)actionResultOfT;
+
+            // Act
+            var result = convertToActionResult.Convert();
+
+            // Assert
+            var objectResult = Assert.IsType<ObjectResult>(result);
+            Assert.Same(value, objectResult.Value);
+            Assert.Equal(typeof(BaseItem), objectResult.DeclaredType);
+        }
+
+        [Fact]
+        public void Convert_InfersDeclaredTypeFromActionResultTypeParameter()
+        {
+            // Arrange
+            var value = new DeriviedItem();
+            var actionResultOfT = new ActionResult<BaseItem>(value);
+            var convertToActionResult = (IConvertToActionResult)actionResultOfT;
+
+            // Act
+            var result = convertToActionResult.Convert();
+
+            // Assert
+            var objectResult = Assert.IsType<ObjectResult>(result);
+            Assert.Same(value, objectResult.Value);
+            Assert.Equal(typeof(BaseItem), objectResult.DeclaredType);
+        }
+
+        private class BaseItem
+        {
+        }
+
+        private class DeriviedItem : BaseItem
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/ActionModelTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/ActionModelTest.cs
new file mode 100644
index 0000000000..8a43002db1
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/ActionModelTest.cs
@@ -0,0 +1,161 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    public class ActionModelTest
+    {
+        [Fact]
+        public void CopyConstructor_DoesDeepCopyOfOtherModels()
+        {
+            // Arrange
+            var action = new ActionModel(typeof(TestController).GetMethod(nameof(TestController.Edit)),
+                                         new List<object>());
+
+            var parameter = new ParameterModel(action.ActionMethod.GetParameters()[0],
+                                               new List<object>());
+            parameter.Action = action;
+            action.Parameters.Add(parameter);
+
+            var route = new AttributeRouteModel(new HttpGetAttribute("api/Products"));
+            action.Selectors.Add(new SelectorModel()
+            {
+                AttributeRouteModel = route
+            });
+
+            var apiExplorer = action.ApiExplorer;
+            apiExplorer.IsVisible = false;
+            apiExplorer.GroupName = "group1";
+
+            // Act
+            var action2 = new ActionModel(action);
+
+            // Assert
+            Assert.NotSame(action.Parameters, action2.Parameters);
+            Assert.NotNull(action2.Parameters);
+            Assert.Single(action2.Parameters);
+            Assert.NotSame(parameter, action2.Parameters[0]);
+            Assert.NotSame(apiExplorer, action2.ApiExplorer);
+            Assert.NotSame(action.Selectors, action2.Selectors);
+            Assert.NotNull(action2.Selectors);
+            Assert.Single(action2.Selectors);
+            Assert.NotSame(action.Selectors[0], action2.Selectors[0]);
+            Assert.NotSame(route, action2.Selectors[0].AttributeRouteModel);
+
+            Assert.NotSame(action, action2.Parameters[0].Action);
+            Assert.Same(action2, action2.Parameters[0].Action);
+        }
+
+        [Fact]
+        public void CopyConstructor_CopiesAllProperties()
+        {
+            // Arrange
+            var action = new ActionModel(
+                typeof(TestController).GetMethod("Edit"),
+                new List<object>()
+                {
+                    new HttpGetAttribute(),
+                    new MyFilterAttribute(),
+                });
+
+            var selectorModel = new SelectorModel();
+            selectorModel.ActionConstraints.Add(new HttpMethodActionConstraint(new string[] { "GET" }));
+            action.Selectors.Add(selectorModel);
+            action.ActionName = "Edit";
+
+            action.Controller = new ControllerModel
+                (typeof(TestController).GetTypeInfo(),
+                new List<object>());
+            action.Filters.Add(new MyFilterAttribute());
+            action.RouteValues.Add("key", "value");
+            action.Properties.Add(new KeyValuePair<object, object>("test key", "test value"));
+
+            // Act
+            var action2 = new ActionModel(action);
+
+            // Assert
+            foreach (var property in typeof(ActionModel).GetProperties())
+            {
+                // Reflection is used to make sure the test fails when a new property is added.
+                if (property.Name.Equals("ApiExplorer") ||
+                    property.Name.Equals("Selectors") ||
+                    property.Name.Equals("Parameters"))
+                {
+                    // This test excludes other ApplicationModel objects on purpose because we deep copy them.
+                    continue;
+                }
+
+                var value1 = property.GetValue(action);
+                var value2 = property.GetValue(action2);
+
+                if (typeof(IEnumerable<object>).IsAssignableFrom(property.PropertyType))
+                {
+                    Assert.Equal<object>((IEnumerable<object>)value1, (IEnumerable<object>)value2);
+
+                    // Ensure non-default value
+                    Assert.NotEmpty((IEnumerable<object>)value1);
+                }
+                else if (typeof(IDictionary<string, string>).IsAssignableFrom(property.PropertyType))
+                {
+                    Assert.Equal(value1, value2);
+
+                    // Ensure non-default value
+                    Assert.NotEmpty((IDictionary<string, string>)value1);
+                }
+                else if (typeof(IDictionary<object, object>).IsAssignableFrom(property.PropertyType))
+                {
+                    Assert.Equal(value1, value2);
+
+                    // Ensure non-default value
+                    Assert.NotEmpty((IDictionary<object, object>)value1);
+                }
+                else if (property.PropertyType.GetTypeInfo().IsValueType ||
+                    Nullable.GetUnderlyingType(property.PropertyType) != null)
+                {
+                    Assert.Equal(value1, value2);
+
+                    // Ensure non-default value
+                    Assert.NotEqual(value1, Activator.CreateInstance(property.PropertyType));
+                }
+                else if (property.Name.Equals(nameof(ActionModel.DisplayName)))
+                {
+                    // DisplayName is re-calculated, hence reference equality wouldn't work.
+                    Assert.Equal(value1, value2);
+                }
+                else
+                {
+                    Assert.Same(value1, value2);
+
+                    // Ensure non-default value
+                    Assert.NotNull(value1);
+                }
+            }
+        }
+
+        private class TestController
+        {
+            public void Edit(int id)
+            {
+            }
+        }
+
+        private class MyFilterAttribute : Attribute, IFilterMetadata
+        {
+        }
+
+        private class MyRouteValueAttribute : Attribute, IRouteValueProvider
+        {
+            public string RouteKey { get; set; }
+
+            public string RouteValue { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/AttributeRouteModelTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/AttributeRouteModelTests.cs
new file mode 100644
index 0000000000..c7a578850b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/AttributeRouteModelTests.cs
@@ -0,0 +1,670 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    public class AttributeRouteModelTests
+    {
+        [Fact]
+        public void CopyConstructor_CopiesAllProperties()
+        {
+            // Arrange
+            var route = new AttributeRouteModel(new HttpGetAttribute("/api/Products"))
+            {
+                Name = "products",
+                Order = 5,
+                SuppressLinkGeneration = true,
+                SuppressPathMatching = true,
+            };
+
+            // Act
+            var route2 = new AttributeRouteModel(route);
+
+            // Assert
+            foreach (var property in typeof(AttributeRouteModel).GetProperties())
+            {
+                var value1 = property.GetValue(route);
+                var value2 = property.GetValue(route2);
+
+                if (typeof(IEnumerable<object>).GetTypeInfo().IsAssignableFrom(property.PropertyType.GetTypeInfo()))
+                {
+                    Assert.Equal<object>((IEnumerable<object>)value1, (IEnumerable<object>)value2);
+
+                    // Ensure non-default value
+                    Assert.NotEmpty((IEnumerable<object>)value1);
+                }
+                else if (property.PropertyType.GetTypeInfo().IsValueType ||
+                    Nullable.GetUnderlyingType(property.PropertyType) != null)
+                {
+                    Assert.Equal(value1, value2);
+
+                    // Ensure non-default value
+                    Assert.NotEqual(value1, Activator.CreateInstance(property.PropertyType));
+                }
+                else
+                {
+                    Assert.Same(value1, value2);
+
+                    // Ensure non-default value
+                    Assert.NotNull(value1);
+                }
+            }
+        }
+
+        [Theory]
+        [InlineData(null, null, null)]
+        [InlineData("", null, "")]
+        [InlineData(null, "", "")]
+        [InlineData("/", null, "")]
+        [InlineData(null, "/", "")]
+        [InlineData("/", "", "")]
+        [InlineData("", "/", "")]
+        [InlineData("/", "/", "")]
+        [InlineData("~/", null, "")]
+        [InlineData("~/", "", "")]
+        [InlineData("~/", "/", "")]
+        [InlineData("~/", "~/", "")]
+        [InlineData(null, "~/", "")]
+        [InlineData("", "~/", "")]
+        [InlineData("/", "~/", "")]
+        public void Combine_EmptyTemplates(string left, string right, string expected)
+        {
+            // Arrange & Act
+            var combined = AttributeRouteModel.CombineTemplates(left, right);
+
+            // Assert
+            Assert.Equal(expected, combined);
+        }
+
+        [Theory]
+        [InlineData("home", null, "home")]
+        [InlineData("home", "", "home")]
+        [InlineData("/home/", "/", "")]
+        [InlineData("/home/", "~/", "")]
+        [InlineData(null, "GetEmployees", "GetEmployees")]
+        [InlineData("/", "GetEmployees", "GetEmployees")]
+        [InlineData("~/", "Blog/Index/", "Blog/Index")]
+        [InlineData("", "/GetEmployees/{id}/", "GetEmployees/{id}")]
+        [InlineData("~/home", null, "home")]
+        [InlineData("~/home", "", "home")]
+        [InlineData("~/home", "/", "")]
+        [InlineData(null, "~/home", "home")]
+        [InlineData("", "~/home", "home")]
+        [InlineData("", "~/home/", "home")]
+        [InlineData("/", "~/home", "home")]
+        public void Combine_OneTemplateHasValue(string left, string right, string expected)
+        {
+            // Arrange & Act
+            var combined = AttributeRouteModel.CombineTemplates(left, right);
+
+            // Assert
+            Assert.Equal(expected, combined);
+        }
+
+        [Theory]
+        [InlineData("home", "About", "home/About")]
+        [InlineData("home/", "/About", "About")]
+        [InlineData("home/", "/About/", "About")]
+        [InlineData("/home/{action}", "{id}", "home/{action}/{id}")]
+        [InlineData("home", "~/index", "index")]
+        [InlineData("home", "~/index/", "index")]
+        public void Combine_BothTemplatesHasValue(string left, string right, string expected)
+        {
+            // Arrange & Act
+            var combined = AttributeRouteModel.CombineTemplates(left, right);
+
+            // Assert
+            Assert.Equal(expected, combined);
+        }
+
+        [Theory]
+        [InlineData("~~/", null, "~~")]
+        [InlineData("~~/", "", "~~")]
+        [InlineData("~~/", "//", "//")]
+        [InlineData("~~/", "~~/", "~~/~~")]
+        [InlineData("~~/", "home", "~~/home")]
+        [InlineData("~~/", "home/", "~~/home")]
+        [InlineData("//", null, "//")]
+        [InlineData("//", "", "//")]
+        [InlineData("//", "//", "//")]
+        [InlineData("//", "~~/", "/~~")]
+        [InlineData("//", "home", "/home")]
+        [InlineData("//", "home/", "/home")]
+        [InlineData("////", null, "//")]
+        [InlineData("~~//", null, "~~/")]
+        public void Combine_InvalidTemplates(string left, string right, string expected)
+        {
+            // Arrange & Act
+            var combined = AttributeRouteModel.CombineTemplates(left, right);
+
+            // Assert
+            Assert.Equal(expected, combined);
+        }
+
+        [Theory]
+        [MemberData(nameof(ReplaceTokens_ValueValuesData))]
+        public void ReplaceTokens_ValidValues(string template, Dictionary<string, string> values, string expected)
+        {
+            // Arrange
+            // Act
+            var result = AttributeRouteModel.ReplaceTokens(template, values);
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Theory]
+        [MemberData(nameof(ReplaceTokens_InvalidFormatValuesData))]
+        public void ReplaceTokens_InvalidFormat(string template, Dictionary<string, string> values, string reason)
+        {
+            // Arrange
+            var expected = string.Format(
+                "The route template '{0}' has invalid syntax. {1}",
+                template,
+                reason);
+
+            // Act
+            var ex = Assert.Throws<InvalidOperationException>(
+                () => { AttributeRouteModel.ReplaceTokens(template, values); });
+
+            // Assert
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Theory]
+        [InlineData("[area]/[controller]/[action]/{deptName:regex(^[a-zA-Z]{1}[a-zA-Z0-9_]*$)}", "a-zA-Z")]
+        [InlineData("[area]/[controller]/[action2]", "action2")]
+        public void ReplaceTokens_UnknownValue(string template, string token)
+        {
+            // Arrange
+            var values = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "area", "Help" },
+                { "controller", "Admin" },
+                { "action", "SeeUsers" },
+            };
+
+            var expected =
+                $"While processing template '{template}', " +
+                $"a replacement value for the token '{token}' could not be found. " +
+                "Available tokens: 'action, area, controller'. To use a '[' or ']' as a literal string in a " +
+                "route or within a constraint, use '[[' or ']]' instead.";
+
+            // Act
+            var ex = Assert.Throws<InvalidOperationException>(
+                () => { AttributeRouteModel.ReplaceTokens(template, values); });
+
+            // Assert
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Theory]
+        [MemberData(nameof(CombineOrdersTestData))]
+        public void Combine_Orders(
+            AttributeRouteModel left,
+            AttributeRouteModel right,
+            int? expected)
+        {
+            // Arrange & Act
+            var combined = AttributeRouteModel.CombineAttributeRouteModel(left, right);
+
+            // Assert
+            Assert.NotNull(combined);
+            Assert.Equal(expected, combined.Order);
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidReflectedAttributeRouteModelsTestData))]
+        public void Combine_ValidReflectedAttributeRouteModels(
+            AttributeRouteModel left,
+            AttributeRouteModel right,
+            AttributeRouteModel expectedResult)
+        {
+            // Arrange & Act
+            var combined = AttributeRouteModel.CombineAttributeRouteModel(left, right);
+
+            // Assert
+            Assert.NotNull(combined);
+            Assert.Equal(expectedResult.Template, combined.Template);
+        }
+
+        [Theory]
+        [MemberData(nameof(NullOrNullTemplateReflectedAttributeRouteModelTestData))]
+        public void Combine_NullOrNullTemplateReflectedAttributeRouteModels(
+            AttributeRouteModel left,
+            AttributeRouteModel right)
+        {
+            // Arrange & Act
+            var combined = AttributeRouteModel.CombineAttributeRouteModel(left, right);
+
+            // Assert
+            Assert.Null(combined);
+        }
+
+        [Theory]
+        [MemberData(nameof(RightOverridesReflectedAttributeRouteModelTestData))]
+        public void Combine_RightOverridesReflectedAttributeRouteModel(
+            AttributeRouteModel left,
+            AttributeRouteModel right)
+        {
+            // Arrange
+            var expectedTemplate = AttributeRouteModel.CombineTemplates(null, right.Template);
+
+            // Act
+            var combined = AttributeRouteModel.CombineAttributeRouteModel(left, right);
+
+            // Assert
+            Assert.NotNull(combined);
+            Assert.Equal(expectedTemplate, combined.Template);
+            Assert.Equal(combined.Order, right.Order);
+        }
+
+        [Theory]
+        [MemberData(nameof(CombineNamesTestData))]
+        public void Combine_Names(
+            AttributeRouteModel left,
+            AttributeRouteModel right,
+            string expectedName)
+        {
+            // Arrange & Act
+            var combined = AttributeRouteModel.CombineAttributeRouteModel(left, right);
+
+            // Assert
+            Assert.NotNull(combined);
+            Assert.Equal(expectedName, combined.Name);
+        }
+
+        [Fact]
+        public void Combine_SetsSuppressLinkGenerationToFalse_IfNeitherIsTrue()
+        {
+            // Arrange
+            var left = new AttributeRouteModel
+            {
+                Template = "Template"
+            };
+            var right = new AttributeRouteModel();
+            var combined = AttributeRouteModel.CombineAttributeRouteModel(left, right);
+
+            // Assert
+            Assert.False(combined.SuppressLinkGeneration);
+        }
+
+        [Theory]
+        [InlineData(false, true)]
+        [InlineData(true, false)]
+        [InlineData(true, true)]
+        public void Combine_SetsSuppressLinkGenerationToTrue_IfEitherIsTrue(bool leftSuppress, bool rightSuppress)
+        {
+            // Arrange
+            var left = new AttributeRouteModel
+            {
+                Template = "Template",
+                SuppressLinkGeneration = leftSuppress,
+            };
+            var right = new AttributeRouteModel
+            {
+                SuppressLinkGeneration = rightSuppress,
+            };
+            var combined = AttributeRouteModel.CombineAttributeRouteModel(left, right);
+
+            // Assert
+            Assert.True(combined.SuppressLinkGeneration);
+        }
+
+        [Fact]
+        public void Combine_SetsSuppressPathGenerationToFalse_IfNeitherIsTrue()
+        {
+            // Arrange
+            var left = new AttributeRouteModel
+            {
+                Template = "Template",
+            };
+            var right = new AttributeRouteModel();
+            var combined = AttributeRouteModel.CombineAttributeRouteModel(left, right);
+
+            // Assert
+            Assert.False(combined.SuppressPathMatching);
+        }
+
+        [Theory]
+        [InlineData(false, true)]
+        [InlineData(true, false)]
+        [InlineData(true, true)]
+        public void Combine_SetsSuppressPathGenerationToTrue_IfEitherIsTrue(bool leftSuppress, bool rightSuppress)
+        {
+            // Arrange
+            var left = new AttributeRouteModel
+            {
+                Template = "Template",
+                SuppressPathMatching = leftSuppress,
+            };
+            var right = new AttributeRouteModel
+            {
+                SuppressPathMatching = rightSuppress,
+            };
+            var combined = AttributeRouteModel.CombineAttributeRouteModel(left, right);
+
+            // Assert
+            Assert.True(combined.SuppressPathMatching);
+        }
+
+        public static IEnumerable<object[]> CombineNamesTestData
+        {
+            get
+            {
+                // AttributeRoute on the controller, attribute route on the action, expected name.
+                var data = new TheoryData<AttributeRouteModel, AttributeRouteModel, string>();
+
+                // Combined name is null if no name is provided.
+                data.Add(Create(template: "/", order: null, name: null), null, null);
+                data.Add(Create(template: "~/", order: null, name: null), null, null);
+                data.Add(Create(template: "", order: null, name: null), null, null);
+                data.Add(Create(template: "home", order: null, name: null), null, null);
+                data.Add(Create(template: "/", order: 1, name: null), null, null);
+                data.Add(Create(template: "~/", order: 1, name: null), null, null);
+                data.Add(Create(template: "", order: 1, name: null), null, null);
+                data.Add(Create(template: "home", order: 1, name: null), null, null);
+
+                // Combined name is inherited if no right name is provided and the template is empty.
+                data.Add(Create(template: "/", order: null, name: "Named"), null, "Named");
+                data.Add(Create(template: "~/", order: null, name: "Named"), null, "Named");
+                data.Add(Create(template: "", order: null, name: "Named"), null, "Named");
+                data.Add(Create(template: "home", order: null, name: "Named"), null, "Named");
+                data.Add(Create(template: "home", order: null, name: "Named"), Create(null, null, null), "Named");
+                data.Add(Create(template: "", order: null, name: "Named"), Create("", null, null), "Named");
+
+                // Order doesn't matter for combining the name.
+                data.Add(Create(template: "", order: null, name: "Named"), Create("", 1, null), "Named");
+                data.Add(Create(template: "", order: 1, name: "Named"), Create("", 1, null), "Named");
+                data.Add(Create(template: "", order: 2, name: "Named"), Create("", 1, null), "Named");
+                data.Add(Create(template: "", order: null, name: "Named"), Create("index", 1, null), null);
+                data.Add(Create(template: "", order: 1, name: "Named"), Create("index", 1, null), null);
+                data.Add(Create(template: "", order: 2, name: "Named"), Create("index", 1, null), null);
+                data.Add(Create(template: "", order: null, name: "Named"), Create("", 1, "right"), "right");
+                data.Add(Create(template: "", order: 1, name: "Named"), Create("", 1, "right"), "right");
+                data.Add(Create(template: "", order: 2, name: "Named"), Create("", 1, "right"), "right");
+
+                // Combined name is not inherited if right name is provided or the template is not empty.
+                data.Add(Create(template: "/", order: null, name: "Named"), Create(null, null, "right"), "right");
+                data.Add(Create(template: "~/", order: null, name: "Named"), Create(null, null, "right"), "right");
+                data.Add(Create(template: "", order: null, name: "Named"), Create(null, null, "right"), "right");
+                data.Add(Create(template: "home", order: null, name: "Named"), Create(null, null, "right"), "right");
+                data.Add(Create(template: "home", order: null, name: "Named"), Create("index", null, null), null);
+                data.Add(Create(template: "home", order: null, name: "Named"), Create("/", null, null), null);
+                data.Add(Create(template: "home", order: null, name: "Named"), Create("~/", null, null), null);
+                data.Add(Create(template: "home", order: null, name: "Named"), Create("index", null, "right"), "right");
+                data.Add(Create(template: "home", order: null, name: "Named"), Create("/", null, "right"), "right");
+                data.Add(Create(template: "home", order: null, name: "Named"), Create("~/", null, "right"), "right");
+                data.Add(Create(template: "home", order: null, name: "Named"), Create("index", null, ""), "");
+
+                return data;
+            }
+        }
+
+        public static IEnumerable<object[]> CombineOrdersTestData
+        {
+            get
+            {
+                // AttributeRoute on the controller, attribute route on the action, expected order.
+                var data = new TheoryData<AttributeRouteModel, AttributeRouteModel, int?>();
+
+                data.Add(Create("", order: 1), Create("", order: 2), 2);
+                data.Add(Create("", order: 1), Create("", order: null), 1);
+                data.Add(Create("", order: 1), null, 1);
+                data.Add(Create("", order: 1), Create("/", order: 2), 2);
+                data.Add(Create("", order: 1), Create("/", order: null), null);
+                data.Add(Create("", order: null), Create("", order: 2), 2);
+                data.Add(Create("", order: null), Create("", order: null), null);
+                data.Add(Create("", order: null), null, null);
+                data.Add(Create("", order: null), Create("/", order: 2), 2);
+                data.Add(Create("", order: null), Create("/", order: null), null);
+                data.Add(null, Create("", order: 2), 2);
+                data.Add(null, Create("", order: null), null);
+                data.Add(null, Create("/", order: 2), 2);
+                data.Add(null, Create("/", order: null), null);
+
+                // We don't a test case for (left = null, right = null) as it is already tested in another test
+                // and will produce a null ReflectedAttributeRouteModel, which complicates the test case.
+
+                return data;
+            }
+        }
+
+        public static IEnumerable<object[]> RightOverridesReflectedAttributeRouteModelTestData
+        {
+            get
+            {
+                // AttributeRoute on the controller, attribute route on the action.
+                var data = new TheoryData<AttributeRouteModel, AttributeRouteModel>();
+                var leftModel = Create("Home", order: 3);
+
+                data.Add(leftModel, Create("/"));
+                data.Add(leftModel, Create("~/"));
+                data.Add(null, Create("/"));
+                data.Add(null, Create("~/"));
+                data.Add(Create(null), Create("/"));
+                data.Add(Create(null), Create("~/"));
+
+                return data;
+            }
+        }
+
+        public static IEnumerable<object[]> NullOrNullTemplateReflectedAttributeRouteModelTestData
+        {
+            get
+            {
+                // AttributeRoute on the controller, attribute route on the action.
+                var data = new TheoryData<AttributeRouteModel, AttributeRouteModel>();
+
+                data.Add(null, null);
+                data.Add(null, Create(null));
+                data.Add(Create(null), null);
+                data.Add(Create(null), Create(null));
+
+                return data;
+            }
+        }
+
+        public static IEnumerable<object[]> ValidReflectedAttributeRouteModelsTestData
+        {
+            get
+            {
+                // AttributeRoute on the controller, attribute route on the action, expected combined attribute route.
+                var data = new TheoryData<AttributeRouteModel, AttributeRouteModel, AttributeRouteModel>();
+                data.Add(null, Create("Index"), Create("Index"));
+                data.Add(Create(null), Create("Index"), Create("Index"));
+                data.Add(Create("Home"), null, Create("Home"));
+                data.Add(Create("Home"), Create(null), Create("Home"));
+                data.Add(Create("Home"), Create("Index"), Create("Home/Index"));
+                data.Add(Create("Blog"), Create("/Index"), Create("Index"));
+
+                return data;
+            }
+        }
+
+        public static IEnumerable<object[]> ReplaceTokens_ValueValuesData
+        {
+            get
+            {
+                yield return new object[]
+                {
+                    "[controller]/[action]",
+                    new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Home" },
+                        { "action", "Index" }
+                    },
+                    "Home/Index"
+                };
+
+                yield return new object[]
+                {
+                    "[controller]",
+                    new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Home" },
+                        { "action", "Index" }
+                    },
+                    "Home"
+                };
+
+                yield return new object[]
+                {
+                    "[controller][[",
+                    new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Home" },
+                        { "action", "Index" }
+                    },
+                    "Home["
+                };
+
+                yield return new object[]
+                {
+                    "[coNTroller]",
+                    new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Home" },
+                        { "action", "Index" }
+                    },
+                    "Home"
+                };
+
+                yield return new object[]
+                {
+                    "thisisSomeText[action]",
+                    new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Home" },
+                        { "action", "Index" }
+                    },
+                    "thisisSomeTextIndex"
+                };
+
+                yield return new object[]
+                {
+                    "[[-]][[/[[controller]]",
+                    new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Home" },
+                        { "action", "Index" }
+                    },
+                    "[-][/[controller]"
+                };
+
+                yield return new object[]
+                {
+                    "[contr[[oller]/[act]]ion]",
+                    new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "contr[oller", "Home" },
+                        { "act]ion", "Index" }
+                    },
+                    "Home/Index"
+                };
+
+                yield return new object[]
+                {
+                    "[controller][action]",
+                    new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Home" },
+                        { "action", "Index" }
+                    },
+                    "HomeIndex"
+                };
+
+                yield return new object[]
+                {
+                    "[contr}oller]/[act{ion]/{id}",
+                    new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "contr}oller", "Home" },
+                        { "act{ion", "Index" }
+                    },
+                    "Home/Index/{id}"
+                };
+            }
+        }
+
+        public static IEnumerable<object[]> ReplaceTokens_InvalidFormatValuesData
+        {
+            get
+            {
+                yield return new object[]
+                {
+                    "[",
+                    new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase),
+                    "A replacement token is not closed."
+                };
+
+                yield return new object[]
+                {
+                    "text]",
+                    new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase),
+                    "Token delimiters ('[', ']') are imbalanced.",
+                };
+
+                yield return new object[]
+                {
+                    "text]morecooltext",
+                    new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase),
+                    "Token delimiters ('[', ']') are imbalanced.",
+                };
+
+                yield return new object[]
+                {
+                    "[action",
+                    new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase),
+                    "A replacement token is not closed.",
+                };
+
+                yield return new object[]
+                {
+                    "[action]]][",
+                    new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "action]", "Index" }
+                    },
+                    "A replacement token is not closed.",
+                };
+
+                yield return new object[]
+                {
+                    "[action]]",
+                    new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase),
+                    "A replacement token is not closed."
+                };
+
+                yield return new object[]
+                {
+                    "[ac[tion]",
+                    new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase),
+                    "An unescaped '[' token is not allowed inside of a replacement token. Use '[[' to escape."
+                };
+
+                yield return new object[]
+                {
+                    "[]",
+                    new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase),
+                    "An empty replacement token ('[]') is not allowed.",
+                };
+            }
+        }
+
+        private static AttributeRouteModel Create(string template, int? order = null, string name = null)
+        {
+            return new AttributeRouteModel
+            {
+                Template = template,
+                Order = order,
+                Name = name
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/ControllerModelTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/ControllerModelTest.cs
new file mode 100644
index 0000000000..dc19724cd6
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/ControllerModelTest.cs
@@ -0,0 +1,170 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    public class ControllerModelTest
+    {
+        [Fact]
+        public void CopyConstructor_DoesDeepCopyOfOtherModels()
+        {
+            // Arrange
+            var controller = new ControllerModel(typeof(TestController).GetTypeInfo(),
+                                                 new List<object>());
+
+            var action = new ActionModel(typeof(TestController).GetMethod("Edit"),
+                                         new List<object>());
+            controller.Actions.Add(action);
+            action.Controller = controller;
+
+            controller.ControllerProperties.Add(new PropertyModel(
+                controller.ControllerType.AsType().GetProperty("TestProperty"),
+                new List<object>() { }));
+
+            var route = new AttributeRouteModel(new HttpGetAttribute("api/Products"));
+            controller.Selectors.Add(new SelectorModel() { AttributeRouteModel = route });
+
+            var apiExplorer = controller.ApiExplorer;
+            controller.ApiExplorer.GroupName = "group";
+            controller.ApiExplorer.IsVisible = true;
+
+            // Act
+            var controller2 = new ControllerModel(controller);
+
+            // Assert
+            Assert.NotSame(action, controller2.Actions[0]);
+            Assert.NotNull(controller2.ControllerProperties);
+            Assert.Single(controller2.ControllerProperties);
+            Assert.NotNull(controller2.Selectors);
+            Assert.Single(controller2.Selectors);
+            Assert.NotSame(route, controller2.Selectors[0].AttributeRouteModel);
+            Assert.NotSame(apiExplorer, controller2.ApiExplorer);
+
+            Assert.NotSame(controller.Selectors[0].ActionConstraints, controller2.Selectors[0].ActionConstraints);
+            Assert.NotSame(controller.Actions, controller2.Actions);
+            Assert.NotSame(controller.Attributes, controller2.Attributes);
+            Assert.NotSame(controller.Filters, controller2.Filters);
+            Assert.NotSame(controller.RouteValues, controller2.RouteValues);
+
+            Assert.NotSame(controller, controller2.Actions[0].Controller);
+            Assert.Same(controller2, controller2.Actions[0].Controller);
+            Assert.NotSame(controller, controller2.ControllerProperties[0].Controller);
+            Assert.Same(controller2, controller2.ControllerProperties[0].Controller);
+        }
+
+        [Fact]
+        public void CopyConstructor_CopiesAllProperties()
+        {
+            // Arrange
+            var controller = new ControllerModel(
+                typeof(TestController).GetTypeInfo(),
+                new List<object>()
+                {
+                    new HttpGetAttribute(),
+                    new MyFilterAttribute(),
+                });
+
+            var selectorModel = new SelectorModel();
+            selectorModel.ActionConstraints.Add(new HttpMethodActionConstraint(new string[] { "GET" }));
+            controller.Selectors.Add(selectorModel);
+            controller.Application = new ApplicationModel();
+            controller.ControllerName = "cool";
+            controller.Filters.Add(new MyFilterAttribute());
+            controller.RouteValues.Add("key", "value");
+            controller.Properties.Add(new KeyValuePair<object, object>("test key", "test value"));
+            controller.ControllerProperties.Add(
+                new PropertyModel(typeof(TestController).GetProperty("TestProperty"), new List<object>()));
+
+            // Act
+            var controller2 = new ControllerModel(controller);
+
+            // Assert
+            foreach (var property in typeof(ControllerModel).GetProperties())
+            {
+                if (property.Name.Equals("Actions") ||
+                    property.Name.Equals("Selectors") ||
+                    property.Name.Equals("ApiExplorer") ||
+                    property.Name.Equals("ControllerProperties"))
+                {
+                    // This test excludes other ApplicationModel objects on purpose because we deep copy them.
+                    continue;
+                }
+
+                var value1 = property.GetValue(controller);
+                var value2 = property.GetValue(controller2);
+
+                if (typeof(IEnumerable<object>).IsAssignableFrom(property.PropertyType))
+                {
+                    Assert.Equal<object>((IEnumerable<object>)value1, (IEnumerable<object>)value2);
+
+                    // Ensure non-default value
+                    Assert.NotEmpty((IEnumerable<object>)value1);
+                }
+                else if (typeof(IDictionary<string, string>).IsAssignableFrom(property.PropertyType))
+                {
+                    Assert.Equal(value1, value2);
+
+                    // Ensure non-default value
+                    Assert.NotEmpty((IDictionary<string, string>)value1);
+                }
+                else if (typeof(IDictionary<object, object>).IsAssignableFrom(property.PropertyType))
+                {
+                    Assert.Equal(value1, value2);
+
+                    // Ensure non-default value
+                    Assert.NotEmpty((IDictionary<object, object>)value1);
+                }
+                else if (property.PropertyType.GetTypeInfo().IsValueType ||
+                    Nullable.GetUnderlyingType(property.PropertyType) != null)
+                {
+                    Assert.Equal(value1, value2);
+
+                    // Ensure non-default value
+                    Assert.NotEqual(value1, Activator.CreateInstance(property.PropertyType));
+                }
+                else if (property.Name.Equals(nameof(ControllerModel.DisplayName)))
+                {
+                    // DisplayName is re-calculated, hence reference equality wouldn't work.
+                    Assert.Equal(value1, value2);
+                }
+                else
+                {
+                    Assert.Same(value1, value2);
+
+                    // Ensure non-default value
+                    Assert.NotNull(value1);
+                }
+            }
+        }
+
+        private class TestController
+        {
+            public string TestProperty { get; set; }
+
+            public void Edit()
+            {
+            }
+        }
+
+        private class MyFilterAttribute : Attribute, IFilterMetadata
+        {
+        }
+
+        private class MyRouteValueAttribute : Attribute, IRouteValueProvider
+        {
+            public string RouteKey { get; set; }
+
+            public string RouteValue { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/ParameterModelTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/ParameterModelTest.cs
new file mode 100644
index 0000000000..f89323a4ef
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/ParameterModelTest.cs
@@ -0,0 +1,89 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    public class ParameterModelTest
+    {
+        [Fact]
+        public void CopyConstructor_CopiesAllProperties()
+        {
+            // Arrange
+            var parameter = new ParameterModel(typeof(TestController).GetMethod("Edit").GetParameters()[0],
+                                               new List<object>() { new FromBodyAttribute() });
+
+            parameter.Action = new ActionModel(typeof(TestController).GetMethod("Edit"), new List<object>());
+            parameter.BindingInfo = new BindingInfo()
+            {
+                BindingSource = BindingSource.Body
+            };
+
+            parameter.ParameterName = "id";
+            parameter.Properties.Add(new KeyValuePair<object, object>("test key", "test value"));
+
+            // Act
+            var parameter2 = new ParameterModel(parameter);
+
+            // Assert
+            foreach (var property in typeof(ParameterModel).GetProperties())
+            {
+                if (property.Name.Equals("BindingInfo"))
+                {
+                    // This test excludes other mutable objects on purpose because we deep copy them.
+                    continue;
+                }
+
+                var value1 = property.GetValue(parameter);
+                var value2 = property.GetValue(parameter2);
+
+                if (typeof(IEnumerable<object>).IsAssignableFrom(property.PropertyType))
+                {
+                    Assert.Equal<object>((IEnumerable<object>)value1, (IEnumerable<object>)value2);
+
+                    // Ensure non-default value
+                    Assert.NotEmpty((IEnumerable<object>)value1);
+                }
+                else if (typeof(IDictionary<object, object>).IsAssignableFrom(property.PropertyType))
+                {
+                    Assert.Equal(value1, value2);
+
+                    // Ensure non-default value
+                    Assert.NotEmpty((IDictionary<object, object>)value1);
+                }
+                else if (property.PropertyType.GetTypeInfo().IsValueType ||
+                    Nullable.GetUnderlyingType(property.PropertyType) != null)
+                {
+                    Assert.Equal(value1, value2);
+
+                    // Ensure non-default value
+                    Assert.NotEqual(value1, Activator.CreateInstance(property.PropertyType));
+                }
+                else if (property.Name.Equals(nameof(ActionModel.DisplayName)))
+                {
+                    // DisplayName is re-calculated, hence reference equality wouldn't work.
+                    Assert.Equal(value1, value2);
+                }
+                else
+                {
+                    Assert.Same(value1, value2);
+
+                    // Ensure non-default value
+                    Assert.NotNull(value1);
+                }
+            }
+        }
+
+        private class TestController
+        {
+            public void Edit(int id)
+            {
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/PropertyModelTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/PropertyModelTest.cs
new file mode 100644
index 0000000000..dde1ba6769
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModel/PropertyModelTest.cs
@@ -0,0 +1,78 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    public class PropertyModelTest
+    {
+        [Fact]
+        public void CopyConstructor_CopiesAllProperties()
+        {
+            // Arrange
+            var propertyModel = new PropertyModel(typeof(TestController).GetProperty("Property"),
+                                               new List<object>() { new FromBodyAttribute() });
+
+            propertyModel.Controller = new ControllerModel(typeof(TestController).GetTypeInfo(), new List<object>());
+            propertyModel.BindingInfo = BindingInfo.GetBindingInfo(propertyModel.Attributes);
+            propertyModel.PropertyName = "Property";
+            propertyModel.Properties.Add(new KeyValuePair<object, object>("test key", "test value"));
+
+            // Act
+            var propertyModel2 = new PropertyModel(propertyModel);
+
+            // Assert
+            foreach (var property in typeof(PropertyModel).GetProperties())
+            {
+                if (property.Name.Equals("BindingInfo"))
+                {
+                    // This test excludes other mutable objects on purpose because we deep copy them.
+                    continue;
+                }
+
+                var value1 = property.GetValue(propertyModel);
+                var value2 = property.GetValue(propertyModel2);
+
+                if (typeof(IEnumerable<object>).IsAssignableFrom(property.PropertyType))
+                {
+                    Assert.Equal<object>((IEnumerable<object>)value1, (IEnumerable<object>)value2);
+
+                    // Ensure non-default value
+                    Assert.NotEmpty((IEnumerable<object>)value1);
+                }
+                else if (typeof(IDictionary<object, object>).IsAssignableFrom(property.PropertyType))
+                {
+                    Assert.Equal(value1, value2);
+
+                    // Ensure non-default value
+                    Assert.NotEmpty((IDictionary<object, object>)value1);
+                }
+                else if (property.PropertyType.GetTypeInfo().IsValueType ||
+                    Nullable.GetUnderlyingType(property.PropertyType) != null)
+                {
+                    Assert.Equal(value1, value2);
+
+                    // Ensure non-default value
+                    Assert.NotEqual(value1, Activator.CreateInstance(property.PropertyType));
+                }
+                else
+                {
+                    Assert.Same(value1, value2);
+
+                    // Ensure non-default value
+                    Assert.NotNull(value1);
+                }
+            }
+        }
+
+        private class TestController
+        {
+            public string Property { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs
new file mode 100644
index 0000000000..1904003bdd
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs
@@ -0,0 +1,587 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyModel;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    public class ApplicationAssembliesProviderTest
+    {
+        private static readonly Assembly ThisAssembly = typeof(ApplicationAssembliesProviderTest).Assembly;
+
+        [Fact]
+        public void ResolveAssemblies_ReturnsCurrentAssembly_IfNoDepsFileIsPresent()
+        {
+            // Arrange
+            var provider = new TestApplicationAssembliesProvider();
+
+            // Act
+            var result = provider.ResolveAssemblies(ThisAssembly);
+
+            // Assert
+            Assert.Equal(new[] { ThisAssembly }, result);
+        }
+
+        [Fact]
+        public void ResolveAssemblies_ReturnsCurrentAssembly_IfDepsFileDoesNotHaveAnyCompileLibraries()
+        {
+            // Arrange
+            var runtimeLibraries = new[]
+            {
+                GetRuntimeLibrary("MyApp", "Microsoft.AspNetCore.All"),
+                GetRuntimeLibrary("Microsoft.AspNetCore.All", "Microsoft.NETCore.App"),
+                GetRuntimeLibrary("Microsoft.NETCore.App"),
+                GetRuntimeLibrary("ClassLibrary"),
+            };
+            var dependencyContext = GetDependencyContext(compileLibraries: Array.Empty<CompilationLibrary>(), runtimeLibraries);
+            var provider = new TestApplicationAssembliesProvider
+            {
+                DependencyContext = dependencyContext,
+            };
+
+            // Act
+            var result = provider.ResolveAssemblies(ThisAssembly);
+
+            // Assert
+            Assert.Equal(new[] { ThisAssembly }, result);
+        }
+
+        [Fact]
+        public void ResolveAssemblies_ReturnsRelatedAssembliesOrderedByName()
+        {
+            // Arrange
+            var assembly1 = typeof(ApplicationAssembliesProvider).Assembly;
+            var assembly2 = typeof(IActionResult).Assembly;
+            var assembly3 = typeof(FactAttribute).Assembly;
+
+            var relatedAssemblies = new[] { assembly1, assembly2, assembly3 };
+            var provider = new TestApplicationAssembliesProvider
+            {
+                GetRelatedAssembliesDelegate = (assembly) => relatedAssemblies,
+            };
+
+            // Act
+            var result = provider.ResolveAssemblies(ThisAssembly);
+
+            // Assert
+            Assert.Equal(new[] { ThisAssembly, assembly2, assembly1, assembly3 }, result);
+        }
+
+        [Fact]
+        public void ResolveAssemblies_ReturnsLibrariesFromTheDepsFileThatReferenceMvc()
+        {
+            // Arrange
+            var mvcAssembly = typeof(IActionResult).Assembly;
+            var classLibrary = typeof(FactAttribute).Assembly;
+
+            var libraries = new Dictionary<string, string[]>
+            {
+                [ThisAssembly.GetName().Name] = new[] { mvcAssembly.GetName().Name, classLibrary.GetName().Name },
+                [mvcAssembly.GetName().Name] = Array.Empty<string>(),
+                [classLibrary.GetName().Name] = new[] { mvcAssembly.GetName().Name },
+            };
+
+            var dependencyContext = GetDependencyContext(libraries);
+
+            var provider = new TestApplicationAssembliesProvider
+            {
+                DependencyContext = dependencyContext,
+            };
+
+            // Act
+            var result = provider.ResolveAssemblies(ThisAssembly);
+
+            // Assert
+            Assert.Equal(new[] { ThisAssembly, classLibrary, }, result);
+        }
+
+        [Fact]
+        public void ResolveAssemblies_ReturnsRelatedAssembliesForLibrariesFromDepsFile()
+        {
+            // Arrange
+            var mvcAssembly = typeof(IActionResult).Assembly;
+            var classLibrary = typeof(object).Assembly;
+            var relatedPart = typeof(FactAttribute).Assembly;
+
+            var libraries = new Dictionary<string, string[]>
+            {
+                [ThisAssembly.GetName().Name] = new[] { relatedPart.GetName().Name, classLibrary.GetName().Name },
+                [classLibrary.GetName().Name] = new[] { mvcAssembly.GetName().Name },
+                [relatedPart.GetName().Name] = new[] { mvcAssembly.GetName().Name },
+                [mvcAssembly.GetName().Name] = Array.Empty<string>(),
+            };
+
+            var dependencyContext = GetDependencyContext(libraries);
+
+            var provider = new TestApplicationAssembliesProvider
+            {
+                DependencyContext = dependencyContext,
+                GetRelatedAssembliesDelegate = (assembly) =>
+                {
+                    if (assembly == classLibrary)
+                    {
+                        return new[] { relatedPart };
+                    }
+
+                    return Array.Empty<Assembly>();
+                },
+            };
+
+            // Act
+            var result = provider.ResolveAssemblies(ThisAssembly);
+
+            // Assert
+            Assert.Equal(new[] { ThisAssembly, classLibrary, relatedPart, }, result);
+        }
+
+        [Fact]
+        public void ResolveAssemblies_ThrowsIfRelatedAssemblyDefinesAdditionalRelatedAssemblies()
+        {
+            // Arrange
+            var expected = $"Assembly 'TestRelatedAssembly' declared as a related assembly by assembly '{ThisAssembly}' cannot define additional related assemblies.";
+            var assembly1 = typeof(ApplicationAssembliesProvider).Assembly;
+            var assembly2 = new TestAssembly();
+
+            var relatedAssemblies = new[] { assembly1, assembly2 };
+            var provider = new TestApplicationAssembliesProvider
+            {
+                GetRelatedAssembliesDelegate = (assembly) => relatedAssemblies,
+            };
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => provider.ResolveAssemblies(ThisAssembly).ToArray());
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public void ResolveAssemblies_ThrowsIfMultipleAssembliesDeclareTheSameRelatedPart()
+        {
+            // Arrange
+            var mvcAssembly = typeof(IActionResult).Assembly;
+            var libraryAssembly1 = typeof(HttpContext).Assembly;
+            var libraryAssembly2 = typeof(JsonConverter).Assembly;
+            var relatedPart = typeof(FactAttribute).Assembly;
+            var expected = string.Join(
+                Environment.NewLine,
+                $"Each related assembly must be declared by exactly one assembly. The assembly '{relatedPart.FullName}' was declared as related assembly by the following:",
+                libraryAssembly1.FullName,
+                libraryAssembly2.FullName);
+
+            var libraries = new Dictionary<string, string[]>
+            {
+                [ThisAssembly.GetName().Name] = new[] { relatedPart.GetName().Name, libraryAssembly1.GetName().Name },
+                [libraryAssembly1.GetName().Name] = new[] { mvcAssembly.GetName().Name },
+                [libraryAssembly2.GetName().Name] = new[] { mvcAssembly.GetName().Name },
+                [mvcAssembly.GetName().Name] = Array.Empty<string>(),
+            };
+
+            var dependencyContext = GetDependencyContext(libraries);
+
+            var provider = new TestApplicationAssembliesProvider
+            {
+                DependencyContext = dependencyContext,
+                GetRelatedAssembliesDelegate = (assembly) =>
+                {
+                    if (assembly == libraryAssembly1 || assembly == libraryAssembly2)
+                    {
+                        return new[] { relatedPart };
+                    }
+
+                    return Array.Empty<Assembly>();
+                },
+            };
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => provider.ResolveAssemblies(ThisAssembly).ToArray());
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public void CandidateResolver_ThrowsIfDependencyContextContainsDuplicateRuntimeLibraryNames()
+        {
+            // Arrange
+            var upperCaseLibrary = "Microsoft.AspNetCore.Mvc";
+            var mixedCaseLibrary = "microsoft.aspNetCore.mvc";
+
+            var libraries = new Dictionary<string, string[]>
+            {
+                [upperCaseLibrary] = Array.Empty<string>(),
+                [mixedCaseLibrary] = Array.Empty<string>(),
+            };
+            var dependencyContext = GetDependencyContext(libraries);
+
+            // Act
+            var exception = Assert.Throws<InvalidOperationException>(() => ApplicationAssembliesProvider.GetCandidateLibraries(dependencyContext).ToArray());
+
+            // Assert
+            Assert.Equal($"A duplicate entry for library reference {mixedCaseLibrary} was found. Please check that all package references in all projects use the same casing for the same package references.", exception.Message);
+        }
+
+        [Fact]
+        public void GetCandidateLibraries_IgnoresMvcAssemblies()
+        {
+            // Arrange
+            var expected = GetRuntimeLibrary("SomeRandomAssembly", "Microsoft.AspNetCore.Mvc.Abstractions");
+            var runtimeLibraries = new[]
+            {
+                GetRuntimeLibrary("Microsoft.AspNetCore.Mvc.Core"),
+                GetRuntimeLibrary("Microsoft.AspNetCore.Mvc"),
+                GetRuntimeLibrary("Microsoft.AspNetCore.Mvc.Abstractions"),
+                expected,
+            };
+
+            var compileLibraries = new[]
+            {
+                GetCompileLibrary("Microsoft.AspNetCore.Mvc.Core"),
+                GetCompileLibrary("Microsoft.AspNetCore.Mvc"),
+                GetCompileLibrary("Microsoft.AspNetCore.Mvc.Abstractions"),
+                GetCompileLibrary("SomeRandomAssembly", "Microsoft.AspNetCore.Mvc.Abstractions"),
+            };
+            var dependencyContext = GetDependencyContext(compileLibraries, runtimeLibraries);
+
+            // Act
+            var candidates = ApplicationAssembliesProvider.GetCandidateLibraries(dependencyContext);
+
+            // Assert
+            Assert.Equal(new[] { expected }, candidates);
+        }
+
+        [Fact]
+        public void GetCandidateLibraries_ReturnsRuntimeLibraries_IfCompileLibraryDependencyToMvcIsPresent()
+        {
+            // Arrange
+            // When an app is running against Microsoft.AspNetCore.All shared runtime or if the DependencyContext is queried
+            // from an app that's running on Microsoft.NETCore.App (e.g. in a unit testing scenario), the
+            // runtime library does not state that the app references Mvc whereas the compile library does. This test validates
+            // that we correctly recognize this scenario.
+            var expected = GetRuntimeLibrary("MyApp", "Microsoft.AspNetCore.All");
+            var runtimeLibraries = new[]
+            {
+                expected,
+                GetRuntimeLibrary("Microsoft.AspNetCore.All", "Microsoft.NETCore.App"),
+                GetRuntimeLibrary("Microsoft.NETCore.App"),
+            };
+
+            var compileLibraries = new[]
+            {
+                GetCompileLibrary("MyApp", "Microsoft.AspNetCore.All"),
+                GetCompileLibrary("Microsoft.AspNetCore.All", "Microsoft.AspNetCore.Mvc", "Microsoft.NETCore.App"),
+                GetCompileLibrary("Microsoft.AspNetCore.Mvc"),
+                GetCompileLibrary("Microsoft.NETCore.App"),
+            };
+            var dependencyContext = GetDependencyContext(compileLibraries, runtimeLibraries);
+
+            // Act
+            var candidates = ApplicationAssembliesProvider.GetCandidateLibraries(dependencyContext);
+
+            // Assert
+            Assert.Equal(new[] { expected }, candidates);
+        }
+
+        [Fact]
+        public void GetCandidateLibraries_DoesNotThrow_IfLibraryDoesNotAppearAsCompileOrRuntimeLibrary()
+        {
+            // Arrange
+            var expected = GetRuntimeLibrary("MyApplication", "Microsoft.AspNetCore.Server.Kestrel", "Microsoft.AspNetCore.Mvc");
+            var compileLibraries = new[]
+            {
+                GetCompileLibrary("MyApplication", "Microsoft.AspNetCore.Server.Kestrel", "Microsoft.AspNetCore.Mvc"),
+                GetCompileLibrary("Microsoft.AspNetCore.Mvc"),
+                GetCompileLibrary("Microsoft.AspNetCore.Server.Kestrel", "Libuv"),
+            };
+
+            var runtimeLibraries = new[]
+            {
+                expected,
+                GetRuntimeLibrary("Microsoft.AspNetCore.Server.Kestrel", "Libuv"),
+                GetRuntimeLibrary("Microsoft.AspNetCore.Mvc"),
+            };
+
+            var dependencyContext = GetDependencyContext(compileLibraries, runtimeLibraries);
+
+            // Act
+            var candidates = ApplicationAssembliesProvider.GetCandidateLibraries(dependencyContext).ToList();
+
+            // Assert
+            Assert.Equal(new[] { expected }, candidates);
+        }
+
+        [Fact]
+        public void GetCandidateLibraries_DoesNotThrow_IfCompileLibraryIsPresentButNotRuntimeLibrary()
+        {
+            // Arrange
+            var expected = GetRuntimeLibrary("MyApplication", "Microsoft.AspNetCore.Server.Kestrel", "Microsoft.AspNetCore.Mvc");
+            var compileLibraries = new[]
+            {
+                GetCompileLibrary("MyApplication", "Microsoft.AspNetCore.Server.Kestrel", "Microsoft.AspNetCore.Mvc"),
+                GetCompileLibrary("Microsoft.AspNetCore.Mvc"),
+                GetCompileLibrary("Microsoft.AspNetCore.Server.Kestrel", "Libuv"),
+                GetCompileLibrary("Libuv"),
+            };
+
+            var runtimeLibraries = new[]
+            {
+                expected,
+                GetRuntimeLibrary("Microsoft.AspNetCore.Server.Kestrel", "Libuv"),
+                GetRuntimeLibrary("Microsoft.AspNetCore.Mvc"),
+            };
+
+            var dependencyContext = GetDependencyContext(compileLibraries, runtimeLibraries);
+
+            // Act
+            var candidates = ApplicationAssembliesProvider.GetCandidateLibraries(dependencyContext).ToList();
+
+            // Assert
+            Assert.Equal(new[] { expected }, candidates);
+        }
+
+        [Fact]
+        public void GetCandidateLibraries_ReturnsLibrariesReferencingAnyMvcAssembly()
+        {
+            // Arrange
+            var libraries = new Dictionary<string, string[]>
+            {
+                ["Foo"] = new[] { "Microsoft.AspNetCore.Mvc.Core" },
+                ["Bar"] = new[] { "Microsoft.AspNetCore.Mvc" },
+                ["Qux"] = new[] { "Not.Mvc.Assembly", "Unofficial.Microsoft.AspNetCore.Mvc" },
+                ["Baz"] = new[] { "Microsoft.AspNetCore.Mvc.Abstractions" },
+                ["Microsoft.AspNetCore.Mvc.Core"] = Array.Empty<string>(),
+                ["Microsoft.AspNetCore.Mvc"] = Array.Empty<string>(),
+                ["Not.Mvc.Assembly"] = Array.Empty<string>(),
+                ["Unofficial.Microsoft.AspNetCore.Mvc"] = Array.Empty<string>(),
+                ["Microsoft.AspNetCore.Mvc.Abstractions"] = Array.Empty<string>(),
+            };
+            var dependencyContext = GetDependencyContext(libraries);
+
+            // Act
+            var candidates = ApplicationAssembliesProvider.GetCandidateLibraries(dependencyContext);
+
+            // Assert
+            Assert.Equal(new[] { "Bar", "Baz", "Foo", }, candidates.Select(a => a.Name));
+        }
+
+        [Fact]
+        public void GetCandidateLibraries_LibraryNameComparisonsAreCaseInsensitive()
+        {
+            // Arrange
+            var libraries = new Dictionary<string, string[]>
+            {
+                ["Foo"] = new[] { "MICROSOFT.ASPNETCORE.MVC.CORE" },
+                ["Bar"] = new[] { "microsoft.aspnetcore.mvc" },
+                ["Qux"] = new[] { "Not.Mvc.Assembly", "Unofficial.Microsoft.AspNetCore.Mvc" },
+                ["Baz"] = new[] { "mIcRoSoFt.AsPnEtCoRe.MvC.aBsTrAcTiOnS" },
+                ["Microsoft.AspNetCore.Mvc.Core"] = Array.Empty<string>(),
+                ["LibraryA"] = new[] { "LIBRARYB" },
+                ["LibraryB"] = new[] { "microsoft.aspnetcore.mvc" },
+                ["Microsoft.AspNetCore.Mvc"] = Array.Empty<string>(),
+                ["Not.Mvc.Assembly"] = Array.Empty<string>(),
+                ["Unofficial.Microsoft.AspNetCore.Mvc"] = Array.Empty<string>(),
+                ["Microsoft.AspNetCore.Mvc.Abstractions"] = Array.Empty<string>(),
+            };
+            var dependencyContext = GetDependencyContext(libraries);
+
+            // Act
+            var candidates = ApplicationAssembliesProvider.GetCandidateLibraries(dependencyContext);
+
+            // Assert
+            Assert.Equal(new[] { "Bar", "Baz", "Foo", "LibraryA", "LibraryB" }, candidates.Select(a => a.Name));
+        }
+
+        [Fact]
+        public void GetCandidateLibraries_ReturnsLibrariesWithTransitiveReferencesToAnyMvcAssembly()
+        {
+            // Arrange
+            var expectedLibraries = new[] { "Bar", "Baz", "Foo", "LibraryA", "LibraryB", "LibraryC", "LibraryE", "LibraryG", "LibraryH" };
+
+            var libraries = new Dictionary<string, string[]>
+            {
+                ["Foo"] = new[] { "Bar" },
+                ["Bar"] = new[] { "Microsoft.AspNetCore.Mvc" },
+                ["Qux"] = new[] { "Not.Mvc.Assembly", "Unofficial.Microsoft.AspNetCore.Mvc" },
+                ["Baz"] = new[] { "Microsoft.AspNetCore.Mvc.Abstractions" },
+                ["Microsoft.AspNetCore.Mvc"] = Array.Empty<string>(),
+                ["Not.Mvc.Assembly"] = Array.Empty<string>(),
+                ["Microsoft.AspNetCore.Mvc.Abstractions"] = Array.Empty<string>(),
+                ["Unofficial.Microsoft.AspNetCore.Mvc"] = Array.Empty<string>(),
+                ["LibraryA"] = new[] { "LibraryB" },
+                ["LibraryB"] = new[] { "LibraryC" },
+                ["LibraryC"] = new[] { "LibraryD", "Microsoft.AspNetCore.Mvc.Abstractions" },
+                ["LibraryD"] = Array.Empty<string>(),
+                ["LibraryE"] = new[] { "LibraryF", "LibraryG" },
+                ["LibraryF"] = Array.Empty<string>(),
+                ["LibraryG"] = new[] { "LibraryH" },
+                ["LibraryH"] = new[] { "LibraryI", "Microsoft.AspNetCore.Mvc" },
+                ["LibraryI"] = Array.Empty<string>(),
+            };
+            var dependencyContext = GetDependencyContext(libraries);
+
+            // Act
+            var candidates = ApplicationAssembliesProvider.GetCandidateLibraries(dependencyContext);
+
+            // Assert
+            Assert.Equal(expectedLibraries, candidates.Select(a => a.Name));
+        }
+
+        [Fact]
+        public void GetCandidateLibraries_SkipsMvcAssemblies()
+        {
+            // Arrange
+            var libraries = new Dictionary<string, string[]>
+            {
+                ["MvcSandbox"] = new[] { "Microsoft.AspNetCore.Mvc.Core", "Microsoft.AspNetCore.Mvc" },
+                ["Microsoft.AspNetCore.Mvc.Core"] = new[] { "Microsoft.AspNetCore.HttpAbstractions" },
+                ["Microsoft.AspNetCore.HttpAbstractions"] = Array.Empty<string>(),
+                ["Microsoft.AspNetCore.Mvc"] = new[] { "Microsoft.AspNetCore.Mvc.Abstractions", "Microsoft.AspNetCore.Mvc.Core" },
+                ["Microsoft.AspNetCore.Mvc.Abstractions"] = Array.Empty<string>(),
+                ["Microsoft.AspNetCore.Mvc.TagHelpers"] = new[] { "Microsoft.AspNetCore.Mvc.Razor" },
+                ["Microsoft.AspNetCore.Mvc.Razor"] = Array.Empty<string>(),
+                ["ControllersAssembly"] = new[] { "Microsoft.AspNetCore.Mvc" },
+            };
+
+            var dependencyContext = GetDependencyContext(libraries);
+
+            // Act
+            var candidates = ApplicationAssembliesProvider.GetCandidateLibraries(dependencyContext);
+
+            // Assert
+            Assert.Equal(new[] { "ControllersAssembly", "MvcSandbox" }, candidates.Select(a => a.Name));
+        }
+
+        // This test verifies DefaultAssemblyPartDiscoveryProvider.ReferenceAssemblies reflects the actual loadable assemblies
+        // of the libraries that Microsoft.AspNetCore.Mvc depends on.
+        // If we add or remove dependencies, this test should be changed together.
+        [Fact]
+        public void ReferenceAssemblies_ReturnsLoadableReferenceAssemblies()
+        {
+            // Arrange
+            var excludeAssemblies = new string[]
+            {
+                "Microsoft.AspNetCore.Mvc.Core.Test",
+                "Microsoft.AspNetCore.Mvc.Razor.Extensions.Reference",
+                "Microsoft.AspNetCore.Mvc.TestCommon",
+                "Microsoft.AspNetCore.Mvc.TestDiagnosticListener",
+                "Microsoft.AspNetCore.Mvc.WebApiCompatShim",
+            };
+
+            var additionalAssemblies = new[]
+            {
+                // The following assemblies are not reachable from Microsoft.AspNetCore.Mvc
+                "Microsoft.AspNetCore.All",
+                "Microsoft.AspNetCore.Mvc.Formatters.Xml",
+            };
+
+            var dependencyContextLibraries = DependencyContext.Load(ThisAssembly)
+                .CompileLibraries
+                .Where(r => r.Name.StartsWith("Microsoft.AspNetCore.Mvc", StringComparison.OrdinalIgnoreCase) &&
+                    !excludeAssemblies.Contains(r.Name, StringComparer.OrdinalIgnoreCase))
+                .Select(r => r.Name);
+
+            var expected = dependencyContextLibraries
+                .Concat(additionalAssemblies)
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .OrderBy(p => p, StringComparer.OrdinalIgnoreCase);
+
+            // Act
+            var referenceAssemblies = ApplicationAssembliesProvider
+                .ReferenceAssemblies
+                .OrderBy(p => p, StringComparer.OrdinalIgnoreCase);
+
+            // Assert
+            Assert.Equal(expected, referenceAssemblies, StringComparer.OrdinalIgnoreCase);
+        }
+
+        private class TestApplicationAssembliesProvider : ApplicationAssembliesProvider
+        {
+            public DependencyContext DependencyContext { get; set; }
+
+            public Func<Assembly, IReadOnlyList<Assembly>> GetRelatedAssembliesDelegate { get; set; } = (assembly) => Array.Empty<Assembly>();
+
+            protected override DependencyContext LoadDependencyContext(Assembly assembly) => DependencyContext;
+
+            protected override IReadOnlyList<Assembly> GetRelatedAssemblies(Assembly assembly) => GetRelatedAssembliesDelegate(assembly);
+
+            protected override IEnumerable<Assembly> GetLibraryAssemblies(DependencyContext dependencyContext, RuntimeLibrary runtimeLibrary)
+            {
+                var assemblyName = new AssemblyName(runtimeLibrary.Name);
+                yield return Assembly.Load(assemblyName);
+            }
+        }
+
+        private static DependencyContext GetDependencyContext(IDictionary<string, string[]> libraries)
+        {
+            var compileLibraries = new List<CompilationLibrary>();
+            var runtimeLibraries = new List<RuntimeLibrary>();
+
+            foreach (var kvp in libraries.OrderBy(kvp => kvp.Key, StringComparer.Ordinal))
+            {
+                var compileLibrary = GetCompileLibrary(kvp.Key, kvp.Value);
+                compileLibraries.Add(compileLibrary);
+
+                var runtimeLibrary = GetRuntimeLibrary(kvp.Key, kvp.Value);
+                runtimeLibraries.Add(runtimeLibrary);
+            }
+
+            return GetDependencyContext(compileLibraries, runtimeLibraries);
+        }
+
+        private static DependencyContext GetDependencyContext(
+            IReadOnlyList<CompilationLibrary> compileLibraries,
+            IReadOnlyList<RuntimeLibrary> runtimeLibraries)
+        {
+            var dependencyContext = new DependencyContext(
+                new TargetInfo("framework", "runtime", "signature", isPortable: true),
+                CompilationOptions.Default,
+                compileLibraries,
+                runtimeLibraries,
+                Enumerable.Empty<RuntimeFallbacks>());
+            return dependencyContext;
+        }
+
+        private static RuntimeLibrary GetRuntimeLibrary(string name, params string[] dependencyNames)
+        {
+            var dependencies = dependencyNames?.Select(d => new Dependency(d, "42.0.0")) ?? new Dependency[0];
+
+            return new RuntimeLibrary(
+                "package",
+                name,
+                "23.0.0",
+                "hash",
+                new RuntimeAssetGroup[0],
+                new RuntimeAssetGroup[0],
+                new ResourceAssembly[0],
+                dependencies: dependencies.ToArray(),
+                serviceable: true);
+        }
+
+        private static CompilationLibrary GetCompileLibrary(string name, params string[] dependencyNames)
+        {
+            var dependencies = dependencyNames?.Select(d => new Dependency(d, "42.0.0")) ?? new Dependency[0];
+
+            return new CompilationLibrary(
+                "package",
+                name,
+                "23.0.0",
+                "hash",
+                Enumerable.Empty<string>(),
+                dependencies: dependencies.ToArray(),
+                serviceable: true);
+        }
+
+        private class TestAssembly : Assembly
+        {
+            public override string FullName => "TestRelatedAssembly";
+
+            public override bool IsDefined(Type attributeType, bool inherit)
+            {
+                return attributeType == typeof(RelatedAssemblyAttribute);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationPartManagerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationPartManagerTest.cs
new file mode 100644
index 0000000000..8b841f02ab
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationPartManagerTest.cs
@@ -0,0 +1,151 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    public class ApplicationPartManagerTest
+    {
+        [Fact]
+        public void PopulateFeature_InvokesAllProvidersSequentially_ForAGivenFeature()
+        {
+            // Arrange
+            var manager = new ApplicationPartManager();
+            manager.ApplicationParts.Add(new ControllersPart("ControllersPartA"));
+            manager.ApplicationParts.Add(new ViewComponentsPart("ViewComponentsPartB"));
+            manager.ApplicationParts.Add(new ControllersPart("ControllersPartC"));
+            manager.FeatureProviders.Add(
+                new ControllersFeatureProvider((f, v) => f.Values.Add($"ControllersFeatureProvider1{v}")));
+            manager.FeatureProviders.Add(
+                new ControllersFeatureProvider((f, v) => f.Values.Add($"ControllersFeatureProvider2{v}")));
+
+            var feature = new ControllersFeature();
+            var expectedResults = new[]
+            {
+                "ControllersFeatureProvider1ControllersPartA",
+                "ControllersFeatureProvider1ControllersPartC",
+                "ControllersFeatureProvider2ControllersPartA",
+                "ControllersFeatureProvider2ControllersPartC"
+            };
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            Assert.Equal(expectedResults, feature.Values.ToArray());
+        }
+
+        [Fact]
+        public void PopulateFeature_InvokesOnlyProviders_ForAGivenFeature()
+        {
+            // Arrange
+            var manager = new ApplicationPartManager();
+            manager.ApplicationParts.Add(new ControllersPart("ControllersPart"));
+            manager.FeatureProviders.Add(
+                new ControllersFeatureProvider((f, v) => f.Values.Add($"ControllersFeatureProvider{v}")));
+            manager.FeatureProviders.Add(
+                new NotControllersedFeatureProvider((f, v) => f.Values.Add($"ViewComponentsFeatureProvider{v}")));
+
+            var feature = new ControllersFeature();
+            var expectedResults = new[] { "ControllersFeatureProviderControllersPart" };
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            Assert.Equal(expectedResults, feature.Values.ToArray());
+        }
+
+        [Fact]
+        public void PopulateFeature_SkipProviders_ForOtherFeatures()
+        {
+            // Arrange
+            var manager = new ApplicationPartManager();
+            manager.ApplicationParts.Add(new ViewComponentsPart("ViewComponentsPart"));
+            manager.FeatureProviders.Add(
+                new ControllersFeatureProvider((f, v) => f.Values.Add($"ControllersFeatureProvider{v}")));
+
+            var feature = new ControllersFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            Assert.Empty(feature.Values.ToArray());
+        }
+
+        private class ControllersPart : ApplicationPart
+        {
+            public ControllersPart(string value)
+            {
+                Value = value;
+            }
+
+            public override string Name => "Test";
+
+            public string Value { get; }
+        }
+
+        private class ViewComponentsPart : ApplicationPart
+        {
+            public ViewComponentsPart(string value)
+            {
+                Value = value;
+            }
+
+            public override string Name => "Other";
+
+            public string Value { get; }
+        }
+
+        private class ControllersFeature
+        {
+            public IList<string> Values { get; } = new List<string>();
+        }
+
+        private class ViewComponentsFeature
+        {
+            public IList<string> Values { get; } = new List<string>();
+        }
+
+        private class NotControllersedFeatureProvider : IApplicationFeatureProvider<ViewComponentsFeature>
+        {
+            private readonly Action<ViewComponentsFeature, string> _operation;
+
+            public NotControllersedFeatureProvider(Action<ViewComponentsFeature, string> operation)
+            {
+                _operation = operation;
+            }
+
+            public void PopulateFeature(IEnumerable<ApplicationPart> parts, ViewComponentsFeature feature)
+            {
+                foreach (var part in parts.OfType<ViewComponentsPart>())
+                {
+                    _operation(feature, part.Value);
+                }
+            }
+        }
+
+        private class ControllersFeatureProvider : IApplicationFeatureProvider<ControllersFeature>
+        {
+            private readonly Action<ControllersFeature, string> _operation;
+
+            public ControllersFeatureProvider(Action<ControllersFeature, string> operation)
+            {
+                _operation = operation;
+            }
+
+            public void PopulateFeature(IEnumerable<ApplicationPart> parts, ControllersFeature feature)
+            {
+                foreach (var part in parts.OfType<ControllersPart>())
+                {
+                    _operation(feature, part.Value);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/AssemblyPartTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/AssemblyPartTest.cs
new file mode 100644
index 0000000000..b922a9eff0
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/AssemblyPartTest.cs
@@ -0,0 +1,104 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Reflection.Emit;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    public class AssemblyPartTest
+    {
+        [Fact]
+        public void AssemblyPart_Name_ReturnsAssemblyName()
+        {
+            // Arrange
+            var part = new AssemblyPart(typeof(AssemblyPartTest).GetTypeInfo().Assembly);
+
+            // Act
+            var name = part.Name;
+
+            // Assert
+            Assert.Equal("Microsoft.AspNetCore.Mvc.Core.Test", name);
+        }
+
+        [Fact]
+        public void AssemblyPart_Types_ReturnsDefinedTypes()
+        {
+            // Arrange
+            var assembly = typeof(AssemblyPartTest).GetTypeInfo().Assembly;
+            var part = new AssemblyPart(assembly);
+
+            // Act
+            var types = part.Types;
+
+            // Assert
+            Assert.Equal(assembly.DefinedTypes, types);
+            Assert.NotSame(assembly.DefinedTypes, types);
+        }
+
+        [Fact]
+        public void AssemblyPart_Assembly_ReturnsAssembly()
+        {
+            // Arrange
+            var assembly = typeof(AssemblyPartTest).GetTypeInfo().Assembly;
+            var part = new AssemblyPart(assembly);
+
+            // Act & Assert
+            Assert.Equal(part.Assembly, assembly);
+        }
+
+        [Fact]
+        public void GetReferencePaths_ReturnsReferencesFromDependencyContext_IfPreserveCompilationContextIsSet()
+        {
+            // Arrange
+            var assembly = GetType().GetTypeInfo().Assembly;
+            var part = new AssemblyPart(assembly);
+
+            // Act
+            var references = part.GetReferencePaths().ToList();
+
+            // Assert
+            Assert.Contains(assembly.Location, references);
+            Assert.Contains(
+                typeof(AssemblyPart).GetTypeInfo().Assembly.GetName().Name,
+                references.Select(Path.GetFileNameWithoutExtension));
+        }
+
+        [Fact]
+        public void GetReferencePaths_ReturnsAssemblyLocation_IfPreserveCompilationContextIsNotSet()
+        {
+            // Arrange
+            // src projects do not have preserveCompilationContext specified.
+            var assembly = typeof(AssemblyPart).GetTypeInfo().Assembly;
+            var part = new AssemblyPart(assembly);
+
+            // Act
+            var references = part.GetReferencePaths().ToList();
+
+            // Assert
+            var actual = Assert.Single(references);
+            Assert.Equal(assembly.Location, actual);
+        }
+
+        [Fact]
+        public void GetReferencePaths_ReturnsEmptySequenceForDynamicAssembly()
+        {
+            // Arrange
+            var name = new AssemblyName($"DynamicAssembly-{Guid.NewGuid()}");
+            var assembly = AssemblyBuilder.DefineDynamicAssembly(name,
+                AssemblyBuilderAccess.RunAndCollect);
+
+            var part = new AssemblyPart(assembly);
+
+            // Act
+            var references = part.GetReferencePaths().ToList();
+
+            // Assert
+            Assert.Empty(references);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/RelatedAssemblyPartTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/RelatedAssemblyPartTest.cs
new file mode 100644
index 0000000000..efce8dfaad
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/RelatedAssemblyPartTest.cs
@@ -0,0 +1,136 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Reflection;
+using System.Reflection.Emit;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    public class RelatedAssemblyPartTest
+    {
+        private static readonly string AssemblyDirectory = Path.GetTempPath().TrimEnd(Path.DirectorySeparatorChar);
+
+        [Fact]
+        public void GetRelatedAssemblies_Noops_ForDynamicAssemblies()
+        {
+            // Arrange
+            var name = new AssemblyName($"DynamicAssembly-{Guid.NewGuid()}");
+            var assembly = AssemblyBuilder.DefineDynamicAssembly(name, AssemblyBuilderAccess.RunAndCollect);
+
+            // Act
+            var result = RelatedAssemblyAttribute.GetRelatedAssemblies(assembly, throwOnError: true);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public void GetRelatedAssemblies_ThrowsIfRelatedAttributeReferencesSelf()
+        {
+            // Arrange
+            var expected = "RelatedAssemblyAttribute specified on MyAssembly cannot be self referential.";
+            var assembly = new TestAssembly { AttributeAssembly = "MyAssembly" };
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => RelatedAssemblyAttribute.GetRelatedAssemblies(assembly, throwOnError: true));
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public void GetRelatedAssemblies_ThrowsIfAssemblyCannotBeFound()
+        {
+            // Arrange
+            var expected = $"Related assembly 'DoesNotExist' specified by assembly 'MyAssembly' could not be found in the directory {AssemblyDirectory}. Related assemblies must be co-located with the specifying assemblies.";
+            var assemblyPath = Path.Combine(AssemblyDirectory, "MyAssembly.dll");
+            var assembly = new TestAssembly
+            {
+                AttributeAssembly = "DoesNotExist"
+            };
+
+            // Act & Assert
+            var ex = Assert.Throws<FileNotFoundException>(() => RelatedAssemblyAttribute.GetRelatedAssemblies(assembly, throwOnError: true));
+            Assert.Equal(expected, ex.Message);
+            Assert.Equal(Path.Combine(AssemblyDirectory, "DoesNotExist.dll"), ex.FileName);
+        }
+
+        [Fact]
+        public void GetRelatedAssemblies_LoadsRelatedAssembly()
+        {
+            // Arrange
+            var destination = Path.Combine(AssemblyDirectory, "RelatedAssembly.dll");
+            var assembly = new TestAssembly
+            {
+                AttributeAssembly = "RelatedAssembly",
+            };
+            var relatedAssembly = typeof(RelatedAssemblyPartTest).Assembly;
+
+            var result = RelatedAssemblyAttribute.GetRelatedAssemblies(assembly, throwOnError: true, file => true, file =>
+            {
+                Assert.Equal(file, destination);
+                return relatedAssembly;
+            });
+            Assert.Equal(new[] { relatedAssembly }, result);
+        }
+
+        [Fact]
+        public void GetAssemblyLocation_UsesCodeBase()
+        {
+            // Arrange
+            var destination = Path.Combine(AssemblyDirectory, "RelatedAssembly.dll");
+            var codeBase = "file://x/file/Assembly.dll";
+            var expected = new Uri(codeBase).LocalPath;
+            var assembly = new TestAssembly
+            {
+                CodeBaseSettable = codeBase,
+            };
+
+            // Act
+            var actual = RelatedAssemblyAttribute.GetAssemblyLocation(assembly);
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void GetAssemblyLocation_UsesLocation_IfCodeBaseIsNotLocal()
+        {
+            // Arrange
+            var destination = Path.Combine(AssemblyDirectory, "RelatedAssembly.dll");
+            var expected = Path.Combine(AssemblyDirectory, "Some-Dir", "Assembly.dll");
+            var assembly = new TestAssembly
+            {
+                CodeBaseSettable = "https://www.microsoft.com/test.dll",
+                LocationSettable = expected,
+            };
+
+            // Act
+            var actual = RelatedAssemblyAttribute.GetAssemblyLocation(assembly);
+            Assert.Equal(expected, actual);
+        }
+
+        private class TestAssembly : Assembly
+        {
+            public override AssemblyName GetName()
+            {
+                return new AssemblyName("MyAssembly");
+            }
+
+            public string AttributeAssembly { get; set; }
+
+            public string CodeBaseSettable { get; set; } = Path.Combine(AssemblyDirectory, "MyAssembly.dll");
+
+            public override string CodeBase => CodeBaseSettable;
+
+            public string LocationSettable { get; set; } = Path.Combine(AssemblyDirectory, "MyAssembly.dll");
+
+            public override string Location => LocationSettable;
+
+            public override object[] GetCustomAttributes(Type attributeType, bool inherit)
+            {
+                var attribute = new RelatedAssemblyAttribute(AttributeAssembly);
+                return new[] { attribute };
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Authorization/AuthorizeFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Authorization/AuthorizeFilterTest.cs
new file mode 100644
index 0000000000..765fccd0e3
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Authorization/AuthorizeFilterTest.cs
@@ -0,0 +1,490 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Authorization
+{
+    public class AuthorizeFilterTest
+    {
+        [Fact]
+        public void InvalidUser()
+        {
+            var authorizationContext = GetAuthorizationContext();
+            Assert.Contains(authorizationContext.HttpContext.User.Identities, i => i.IsAuthenticated);
+        }
+
+        [Fact]
+        public async Task DefaultConstructor_DeniesAnonymousUsers()
+        {
+            // Arrange
+            var authorizationContext = GetAuthorizationContext(anonymous: true);
+            // The type 'AuthorizeFilter' is both a filter by itself and also a filter factory.
+            // The default filter provider first checks if a type is a filter factory and creates an instance of
+            // this filter.
+            var authorizeFilterFactory = new AuthorizeFilter();
+            var filterFactory = authorizeFilterFactory as IFilterFactory;
+            var authorizeFilter = (AuthorizeFilter)filterFactory.CreateInstance(
+                authorizationContext.HttpContext.RequestServices);
+
+            // Act
+            await authorizeFilter.OnAuthorizationAsync(authorizationContext);
+
+            // Assert
+            Assert.IsType<ChallengeResult>(authorizationContext.Result);
+        }
+
+        [Fact]
+        public async Task AuthorizeFilter_CreatedWithAuthorizeData_ThrowsWhenOnAuthorizationAsyncIsCalled()
+        {
+            // Arrange
+            var authorizeFilter = new AuthorizeFilter(new[] { new AuthorizeAttribute() });
+            var authorizationContext = GetAuthorizationContext();
+            var expected = "An AuthorizationPolicy cannot be created without a valid instance of " +
+                "IAuthorizationPolicyProvider.";
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => authorizeFilter.OnAuthorizationAsync(authorizationContext));
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public async Task AuthorizeFilter_CreatedWithPolicy_ThrowsWhenOnAuthorizationAsyncIsCalled()
+        {
+            // Arrange
+            var authorizeFilter = new AuthorizeFilter(new[] { new AuthorizeAttribute() });
+            var authorizationContext = GetAuthorizationContext();
+            var expected = "An AuthorizationPolicy cannot be created without a valid instance of " +
+                "IAuthorizationPolicyProvider.";
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => authorizeFilter.OnAuthorizationAsync(authorizationContext));
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public async Task AuthorizeFilterCanAuthorizeNonAuthenticatedUser()
+        {
+            // Arrange
+            var authorizeFilter = new AuthorizeFilter(new AuthorizationPolicyBuilder().RequireAssertion(_ => true).Build());
+            var authorizationContext = GetAuthorizationContext(anonymous: true);
+            authorizationContext.HttpContext.User = new ClaimsPrincipal();
+
+            // Act
+            await authorizeFilter.OnAuthorizationAsync(authorizationContext);
+
+            // Assert
+            Assert.Null(authorizationContext.Result);
+        }
+
+        [Fact]
+        public async Task AuthorizeFilterWillCallPolicyProviderOnAuthorization()
+        {
+            // Arrange
+            var policyProvider = new Mock<IAuthorizationPolicyProvider>();
+            var getPolicyCount = 0;
+            policyProvider.Setup(p => p.GetPolicyAsync(It.IsAny<string>())).ReturnsAsync(new AuthorizationPolicyBuilder().RequireAssertion(_ => true).Build())
+                .Callback(() => getPolicyCount++);
+            var authorizeFilter = new AuthorizeFilter(policyProvider.Object, new AuthorizeAttribute[] { new AuthorizeAttribute("whatever") });
+            var authorizationContext = GetAuthorizationContext();
+
+            // Act & Assert
+            await authorizeFilter.OnAuthorizationAsync(authorizationContext);
+            Assert.Equal(1, getPolicyCount);
+            Assert.Null(authorizationContext.Result);
+
+            await authorizeFilter.OnAuthorizationAsync(authorizationContext);
+            Assert.Equal(2, getPolicyCount);
+            Assert.Null(authorizationContext.Result);
+
+            await authorizeFilter.OnAuthorizationAsync(authorizationContext);
+            Assert.Equal(3, getPolicyCount);
+            Assert.Null(authorizationContext.Result);
+
+            // Make sure we don't cache the policy
+            Assert.Null(authorizeFilter.Policy);
+        }
+
+        [Fact]
+        public async Task AuthorizeFilterCanAuthorizeNullUser()
+        {
+            // Arrange
+            var authorizeFilter = new AuthorizeFilter(new AuthorizationPolicyBuilder().RequireAssertion(_ => true).Build());
+            var authorizationContext = GetAuthorizationContext(anonymous: true);
+
+            // Act
+            await authorizeFilter.OnAuthorizationAsync(authorizationContext);
+
+            // Assert
+            Assert.Null(authorizationContext.Result);
+        }
+
+        [Fact]
+        public async Task Invoke_ValidClaimShouldNotFail()
+        {
+            // Arrange
+            var authorizeFilter = new AuthorizeFilter(new AuthorizationPolicyBuilder().RequireClaim("Permission", "CanViewPage").Build());
+            var authorizationContext = GetAuthorizationContext();
+
+            // Act
+            await authorizeFilter.OnAuthorizationAsync(authorizationContext);
+
+            // Assert
+            Assert.Null(authorizationContext.Result);
+        }
+
+        [Fact]
+        public async Task Invoke_EmptyClaimsShouldChallengeAnonymousUser()
+        {
+            // Arrange
+            var authorizeFilter = new AuthorizeFilter(new AuthorizationPolicyBuilder().RequireAuthenticatedUser().Build());
+            var authorizationContext = GetAuthorizationContext(anonymous: true);
+
+            // Act
+            await authorizeFilter.OnAuthorizationAsync(authorizationContext);
+
+            // Assert
+            Assert.IsType<ChallengeResult>(authorizationContext.Result);
+        }
+
+        [Fact]
+        public async Task Invoke_EmptyClaimsWithAllowAnonymousAttributeShouldNotRejectAnonymousUser()
+        {
+            // Arrange
+            var authorizeFilter = new AuthorizeFilter(new AuthorizationPolicyBuilder().RequireAuthenticatedUser().Build());
+            var authorizationContext = GetAuthorizationContext(anonymous: true);
+
+            authorizationContext.Filters.Add(new AllowAnonymousFilter());
+
+            // Act
+            await authorizeFilter.OnAuthorizationAsync(authorizationContext);
+
+            // Assert
+            Assert.Null(authorizationContext.Result);
+        }
+
+        [Fact]
+        public async Task Invoke_EmptyClaimsShouldAuthorizeAuthenticatedUser()
+        {
+            // Arrange
+            var authorizeFilter = new AuthorizeFilter(new AuthorizationPolicyBuilder().RequireAuthenticatedUser().Build());
+            var authorizationContext = GetAuthorizationContext();
+
+            // Act
+            await authorizeFilter.OnAuthorizationAsync(authorizationContext);
+
+            // Assert
+            Assert.Null(authorizationContext.Result);
+        }
+
+        [Fact]
+        public async Task Invoke_AuthSchemesFailShouldSetEmptyPrincipalOnContext()
+        {
+            // Arrange
+            var authorizeFilter = new AuthorizeFilter(new AuthorizationPolicyBuilder("Fails")
+                .RequireAuthenticatedUser()
+                .Build());
+            var authorizationContext = GetAuthorizationContext();
+
+            // Act
+            await authorizeFilter.OnAuthorizationAsync(authorizationContext);
+
+            // Assert
+            Assert.NotNull(authorizationContext.HttpContext.User?.Identity);
+        }
+
+        [Fact]
+        public async Task Invoke_SingleValidClaimShouldSucceed()
+        {
+            // Arrange
+            var authorizeFilter = new AuthorizeFilter(new AuthorizationPolicyBuilder().RequireClaim("Permission", "CanViewComment", "CanViewPage").Build());
+            var authorizationContext = GetAuthorizationContext();
+
+            // Act
+            await authorizeFilter.OnAuthorizationAsync(authorizationContext);
+
+            // Assert
+            Assert.Null(authorizationContext.Result);
+        }
+
+        [Fact]
+        public async Task AuthorizationFilterCombinesMultipleFilters()
+        {
+            // Arrange
+            var authorizeFilter = new AuthorizeFilter(new AuthorizationPolicyBuilder().RequireAssertion(a => true).Build());
+            var authorizationContext = GetAuthorizationContext(anonymous: false, registerServices: s => s.Configure<MvcOptions>(o => o.AllowCombiningAuthorizeFilters = true));
+            // Effective policy should fail, if both are combined
+            authorizationContext.Filters.Add(authorizeFilter);
+            var secondFilter = new AuthorizeFilter(new AuthorizationPolicyBuilder().RequireAssertion(a => false).Build());
+            authorizationContext.Filters.Add(secondFilter);
+
+            // Act
+            await secondFilter.OnAuthorizationAsync(authorizationContext);
+
+            // Assert
+            Assert.IsType<ForbidResult>(authorizationContext.Result);
+        }
+
+        [Fact]
+        public async Task AuthorizationFilterIgnoresFirstFilterWhenCombining()
+        {
+            // Arrange
+            var authorizeFilter = new AuthorizeFilter(new AuthorizationPolicyBuilder().RequireAssertion(a => false).Build());
+            var authorizationContext = GetAuthorizationContext(anonymous: false, registerServices: s => s.Configure<MvcOptions>(o => o.AllowCombiningAuthorizeFilters = true));
+            // Effective policy should fail, if both are combined
+            authorizationContext.Filters.Add(authorizeFilter);
+            var secondFilter = new AuthorizeFilter(new AuthorizationPolicyBuilder().RequireAssertion(a => false).Build());
+            authorizationContext.Filters.Add(secondFilter);
+
+            // Act
+            await authorizeFilter.OnAuthorizationAsync(authorizationContext);
+
+            // Assert
+            Assert.Null(authorizationContext.Result);
+        }
+
+        [Fact]
+        public async Task AuthorizationFilterCombinesDerivedFilters()
+        {
+            // Arrange
+            var authorizeFilter = new AuthorizeFilter(new AuthorizationPolicyBuilder().RequireAssertion(a => true).Build());
+            var authorizationContext = GetAuthorizationContext(anonymous: false, registerServices: s => s.Configure<MvcOptions>(o => o.AllowCombiningAuthorizeFilters = true));
+            // Effective policy should fail, if both are combined
+            authorizationContext.Filters.Add(authorizeFilter);
+            authorizationContext.Filters.Add(new DerivedAuthorizeFilter());
+            authorizationContext.Filters.Add(new DerivedAuthorizeFilter());
+            var lastFilter = new DerivedAuthorizeFilter();
+            authorizationContext.Filters.Add(lastFilter);
+
+            // Act
+            await lastFilter.OnAuthorizationAsync(authorizationContext);
+
+            // Assert
+            Assert.IsType<ForbidResult>(authorizationContext.Result);
+        }
+    
+        public class DerivedAuthorizeFilter : AuthorizeFilter 
+        {
+            public DerivedAuthorizeFilter() : base(new AuthorizationPolicyBuilder().RequireAssertion(a => false).Build())
+            { }
+        }
+
+        [Fact]
+        public async Task AuthZResourceShouldBeAuthorizationFilterContext()
+        {
+            // Arrange
+            var authorizeFilter = new AuthorizeFilter(new AuthorizationPolicyBuilder().RequireAssertion(c => c.Resource is AuthorizationFilterContext).Build());
+            var authorizationContext = GetAuthorizationContext();
+
+            // Act
+            await authorizeFilter.OnAuthorizationAsync(authorizationContext);
+
+            // Assert
+            Assert.Null(authorizationContext.Result);
+        }
+
+        [Fact]
+        public async Task Invoke_RequireUnknownRoleShouldForbid()
+        {
+            // Arrange
+            var authorizeFilter = new AuthorizeFilter(new AuthorizationPolicyBuilder().RequireRole("Wut").Build());
+            var authorizationContext = GetAuthorizationContext();
+
+            // Act
+            await authorizeFilter.OnAuthorizationAsync(authorizationContext);
+
+            // Assert
+            Assert.IsType<ForbidResult>(authorizationContext.Result);
+        }
+
+        [Fact]
+        public async Task Invoke_InvalidClaimShouldForbid()
+        {
+            // Arrange
+            var authorizeFilter = new AuthorizeFilter(new AuthorizationPolicyBuilder()
+                .RequireClaim("Permission", "CanViewComment")
+                .Build());
+            var authorizationContext = GetAuthorizationContext();
+
+            // Act
+            await authorizeFilter.OnAuthorizationAsync(authorizationContext);
+
+            // Assert
+            Assert.IsType<ForbidResult>(authorizationContext.Result);
+        }
+
+        [Fact]
+        public void CreateInstance_ReturnsSelfIfPolicyIsSet()
+        {
+            // Arrange
+            var authorizeFilter = new AuthorizeFilter(new AuthorizationPolicyBuilder()
+                .RequireAssertion(_ => true)
+                .Build());
+            var factory = (IFilterFactory)authorizeFilter;
+
+            // Act
+            var result = factory.CreateInstance(new ServiceCollection().BuildServiceProvider());
+
+            // Assert
+            Assert.Same(authorizeFilter, result);
+        }
+
+        [Fact]
+        public void CreateInstance_ReturnsSelfIfPolicyProviderIsSet()
+        {
+            // Arrange
+            var authorizeFilter = new AuthorizeFilter(new AuthorizationPolicyBuilder()
+                .RequireAssertion(_ => true)
+                .Build());
+            var factory = (IFilterFactory)authorizeFilter;
+
+            // Act
+            var result = factory.CreateInstance(new ServiceCollection().BuildServiceProvider());
+
+            // Assert
+            Assert.Same(authorizeFilter, result);
+        }
+
+        public static TheoryData AuthorizeFiltersCreatedWithoutPolicyOrPolicyProvider
+        {
+            get
+            {
+                return new TheoryData<AuthorizeFilter>
+                {
+                    new AuthorizeFilter(new[] { new AuthorizeAttribute()}),
+                    new AuthorizeFilter("some-policy"),
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(AuthorizeFiltersCreatedWithoutPolicyOrPolicyProvider))]
+        public void CreateInstance_ReturnsNewFilterIfPolicyAndPolicyProviderAreNotSet(AuthorizeFilter authorizeFilter)
+        {
+            // Arrange
+            var factory = (IFilterFactory)authorizeFilter;
+            var serviceProvider = new ServiceCollection()
+                .AddOptions()
+                .AddAuthorization(options =>
+                {
+                    var policy = new AuthorizationPolicyBuilder()
+                        .RequireAssertion(_ => true)
+                        .Build();
+                    options.AddPolicy("some-policy", policy);
+                })
+                .BuildServiceProvider();
+
+            // Act
+            var result = factory.CreateInstance(serviceProvider);
+
+            // Assert
+            Assert.NotSame(authorizeFilter, result);
+            var actual = Assert.IsType<AuthorizeFilter>(result);
+            Assert.NotNull(actual.Policy);
+        }
+
+        [Theory]
+        [MemberData(nameof(AuthorizeFiltersCreatedWithoutPolicyOrPolicyProvider))]
+        public void CreateInstance_ReturnsNewFilterIfPolicyAndPolicyProviderAreNotSetAndCustomProviderIsUsed(
+            AuthorizeFilter authorizeFilter)
+        {
+            // Arrange
+            var factory = (IFilterFactory)authorizeFilter;
+            var policyProvider = Mock.Of<IAuthorizationPolicyProvider>();
+            var serviceProvider = new ServiceCollection()
+                .AddSingleton(policyProvider)
+                .BuildServiceProvider();
+
+            // Act
+            var result = factory.CreateInstance(serviceProvider);
+
+            // Assert
+            Assert.NotSame(authorizeFilter, result);
+            var actual = Assert.IsType<AuthorizeFilter>(result);
+            Assert.Same(policyProvider, actual.PolicyProvider);
+        }
+
+        private AuthorizationFilterContext GetAuthorizationContext(
+            bool anonymous = false,
+            Action<IServiceCollection> registerServices = null)
+        {
+            var basicPrincipal = new ClaimsPrincipal(
+                new ClaimsIdentity(
+                    new Claim[] {
+                        new Claim("Permission", "CanViewPage"),
+                        new Claim(ClaimTypes.Role, "Administrator"),
+                        new Claim(ClaimTypes.Role, "User"),
+                        new Claim(ClaimTypes.NameIdentifier, "John")},
+                        "Basic"));
+
+            var validUser = basicPrincipal;
+
+            var bearerIdentity = new ClaimsIdentity(
+                    new Claim[] {
+                        new Claim("Permission", "CupBearer"),
+                        new Claim(ClaimTypes.Role, "Token"),
+                        new Claim(ClaimTypes.NameIdentifier, "John Bear")},
+                        "Bearer");
+
+            var bearerPrincipal = new ClaimsPrincipal(bearerIdentity);
+
+            validUser.AddIdentity(bearerIdentity);
+
+            // ServiceProvider
+            var serviceCollection = new ServiceCollection();
+
+            var auth = new Mock<IAuthenticationService>();
+
+            serviceCollection.AddOptions();
+            serviceCollection.AddLogging();
+            serviceCollection.AddSingleton(auth.Object);
+            serviceCollection.AddAuthorization();
+            serviceCollection.AddAuthorizationPolicyEvaluator();
+            if (registerServices != null)
+            {
+                registerServices(serviceCollection);
+            }
+
+            var serviceProvider = serviceCollection.BuildServiceProvider();
+
+            // HttpContext
+            var httpContext = new Mock<HttpContext>();
+            auth.Setup(c => c.AuthenticateAsync(httpContext.Object, "Bearer")).ReturnsAsync(AuthenticateResult.Success(new AuthenticationTicket(bearerPrincipal, "Bearer")));
+            auth.Setup(c => c.AuthenticateAsync(httpContext.Object, "Basic")).ReturnsAsync(AuthenticateResult.Success(new AuthenticationTicket(basicPrincipal, "Basic")));
+            auth.Setup(c => c.AuthenticateAsync(httpContext.Object, "Fails")).ReturnsAsync(AuthenticateResult.Fail("Fails"));
+            httpContext.SetupProperty(c => c.User);
+            if (!anonymous)
+            {
+                httpContext.Object.User = validUser;
+            }
+            httpContext.SetupGet(c => c.RequestServices).Returns(serviceProvider);
+
+            // AuthorizationFilterContext
+            var actionContext = new ActionContext(
+                httpContext: httpContext.Object,
+                routeData: new RouteData(),
+                actionDescriptor: new ActionDescriptor());
+
+            var authorizationContext = new Filters.AuthorizationFilterContext(
+                actionContext,
+                Enumerable.Empty<IFilterMetadata>().ToList()
+            );
+
+            return authorizationContext;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/BadRequestObjectResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/BadRequestObjectResultTests.cs
new file mode 100644
index 0000000000..b7b9330231
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/BadRequestObjectResultTests.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class BadRequestObjectResultTests
+    {
+        [Fact]
+        public void BadRequestObjectResult_SetsStatusCodeAndValue()
+        {
+            // Arrange & Act
+            var obj = new object();
+            var badRequestObjectResult = new BadRequestObjectResult(obj);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status400BadRequest, badRequestObjectResult.StatusCode);
+            Assert.Equal(obj, badRequestObjectResult.Value);
+        }
+
+        [Fact]
+        public void BadRequestObjectResult_ModelState_SetsStatusCodeAndValue()
+        {
+            // Arrange & Act
+            var badRequestObjectResult = new BadRequestObjectResult(new ModelStateDictionary());
+
+            // Assert
+            Assert.Equal(StatusCodes.Status400BadRequest, badRequestObjectResult.StatusCode);
+            var errors = Assert.IsType<SerializableError>(badRequestObjectResult.Value);
+            Assert.Empty(errors);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/BadRequestResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/BadRequestResultTests.cs
new file mode 100644
index 0000000000..45979cf32d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/BadRequestResultTests.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class BadRequestResultTests
+    {
+        [Fact]
+        public void BadRequestResult_InitializesStatusCode()
+        {
+            // Arrange & act
+            var badRequest = new BadRequestResult();
+
+            // Assert
+            Assert.Equal(StatusCodes.Status400BadRequest, badRequest.StatusCode);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/BindAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/BindAttributeTest.cs
new file mode 100644
index 0000000000..93b614e477
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/BindAttributeTest.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class BindAttributeTest
+    {
+        [Theory]
+        [InlineData("UserName", true)]
+        [InlineData("Username", false)]
+        [InlineData("Password", false)]
+        [InlineData("LastName", true)]
+        [InlineData("MiddleName", true)]
+        [InlineData(" ", false)]
+        [InlineData("foo", true)]
+        [InlineData("bar", true)]
+        public void BindAttribute_Include(string property, bool isIncluded)
+        {
+            // Arrange
+            var bind = new BindAttribute(new string[] { "UserName", "FirstName", "LastName, MiddleName,  ,foo,bar " });
+
+            var context = new DefaultModelBindingContext();
+
+            var identity = ModelMetadataIdentity.ForProperty(typeof(int), property, typeof(string));
+            context.ModelMetadata = new Mock<ModelMetadata>(identity).Object;
+
+            // Act
+            var propertyFilter = bind.PropertyFilter;
+
+            // Assert
+            Assert.Equal(isIncluded, propertyFilter(context.ModelMetadata));
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcApplicationBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcApplicationBuilderExtensionsTest.cs
new file mode 100644
index 0000000000..8470b7ea25
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcApplicationBuilderExtensionsTest.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Builder;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Core.Builder
+{
+    public class MvcApplicationBuilderExtensionsTest
+    {
+        [Fact]
+        public void UseMvc_ThrowsInvalidOperationException_IfMvcMarkerServiceIsNotRegistered()
+        {
+            // Arrange
+            var applicationBuilderMock = new Mock<IApplicationBuilder>();
+            applicationBuilderMock
+                .Setup(s => s.ApplicationServices)
+                .Returns(Mock.Of<IServiceProvider>());
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(
+                () => applicationBuilderMock.Object.UseMvc(rb => { }));
+
+            Assert.Equal(
+                "Unable to find the required services. Please add all the required services by calling " +
+                "'IServiceCollection.AddMvc' inside the call to 'ConfigureServices(...)' " +
+                "in the application startup code.",
+                exception.Message);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcAreaRouteBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcAreaRouteBuilderExtensionsTest.cs
new file mode 100644
index 0000000000..b699ff614f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcAreaRouteBuilderExtensionsTest.cs
@@ -0,0 +1,297 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Routing.Constraints;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Builder
+{
+    public class MvcAreaRouteBuilderExtensionsTest
+    {
+        [Fact]
+        public void MapAreaRoute_Simple()
+        {
+            // Arrange
+            var builder = CreateRouteBuilder();
+
+            // Act
+            builder.MapAreaRoute(name: null, areaName: "admin", template: "site/Admin/");
+
+            // Assert
+            var route = Assert.IsType<Route>((Assert.Single(builder.Routes)));
+
+            Assert.Null(route.Name);
+            Assert.Equal("site/Admin/", route.RouteTemplate);
+            Assert.Collection(
+                route.Constraints.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("area", kvp.Key);
+                    Assert.IsType<StringRouteConstraint>(kvp.Value);
+                });
+            Assert.Empty(route.DataTokens);
+            Assert.Collection(
+                route.Defaults.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("area", kvp.Key);
+                    Assert.Equal("admin", kvp.Value);
+                });
+        }
+
+        [Fact]
+        public void MapAreaRoute_Defaults()
+        {
+            // Arrange
+            var builder = CreateRouteBuilder();
+
+            // Act
+            builder.MapAreaRoute(
+                name: "admin_area",
+                areaName: "admin",
+                template: "site/Admin/",
+                defaults: new { action = "Home" });
+
+            // Assert
+            var route = Assert.IsType<Route>((Assert.Single(builder.Routes)));
+
+            Assert.Equal("admin_area", route.Name);
+            Assert.Equal("site/Admin/", route.RouteTemplate);
+            Assert.Collection(
+                route.Constraints.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("area", kvp.Key);
+                    Assert.IsType<StringRouteConstraint>(kvp.Value);
+                });
+            Assert.Empty(route.DataTokens);
+            Assert.Collection(
+                route.Defaults.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("action", kvp.Key);
+                    Assert.Equal("Home", kvp.Value);
+                },
+                kvp =>
+                {
+                    Assert.Equal("area", kvp.Key);
+                    Assert.Equal("admin", kvp.Value);
+                });
+        }
+
+        [Fact]
+        public void MapAreaRoute_DefaultsAndConstraints()
+        {
+            // Arrange
+            var builder = CreateRouteBuilder();
+
+            // Act
+            builder.MapAreaRoute(
+                name: "admin_area",
+                areaName: "admin",
+                template: "site/Admin/",
+                defaults: new { action = "Home" },
+                constraints: new { id = new IntRouteConstraint() });
+
+            // Assert
+            var route = Assert.IsType<Route>((Assert.Single(builder.Routes)));
+
+            Assert.Equal("admin_area", route.Name);
+            Assert.Equal("site/Admin/", route.RouteTemplate);
+            Assert.Collection(
+                route.Constraints.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("area", kvp.Key);
+                    Assert.IsType<StringRouteConstraint>(kvp.Value);
+                },
+                kvp =>
+                {
+                    Assert.Equal("id", kvp.Key);
+                    Assert.IsType<IntRouteConstraint>(kvp.Value);
+                });
+            Assert.Empty(route.DataTokens);
+            Assert.Collection(
+                route.Defaults.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("action", kvp.Key);
+                    Assert.Equal("Home", kvp.Value);
+                },
+                kvp =>
+                {
+                    Assert.Equal("area", kvp.Key);
+                    Assert.Equal("admin", kvp.Value);
+                });
+        }
+
+        [Fact]
+        public void MapAreaRoute_DefaultsConstraintsAndDataTokens()
+        {
+            // Arrange
+            var builder = CreateRouteBuilder();
+
+            // Act
+            builder.MapAreaRoute(
+                name: "admin_area",
+                areaName: "admin",
+                template: "site/Admin/",
+                defaults: new { action = "Home" },
+                constraints: new { id = new IntRouteConstraint() },
+                dataTokens: new { some_token = "hello" });
+
+            // Assert
+            var route = Assert.IsType<Route>((Assert.Single(builder.Routes)));
+
+            Assert.Equal("admin_area", route.Name);
+            Assert.Equal("site/Admin/", route.RouteTemplate);
+            Assert.Collection(
+                route.Constraints.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("area", kvp.Key);
+                    Assert.IsType<StringRouteConstraint>(kvp.Value);
+                },
+                kvp =>
+                {
+                    Assert.Equal("id", kvp.Key);
+                    Assert.IsType<IntRouteConstraint>(kvp.Value);
+                });
+            Assert.Collection(
+                route.DataTokens.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("some_token", kvp.Key);
+                    Assert.Equal("hello", kvp.Value);
+                });
+            Assert.Collection(
+                route.Defaults.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("action", kvp.Key);
+                    Assert.Equal("Home", kvp.Value);
+                },
+                kvp =>
+                {
+                    Assert.Equal("area", kvp.Key);
+                    Assert.Equal("admin", kvp.Value);
+                });
+        }
+
+        [Fact]
+        public void MapAreaRoute_DoesNotReplaceValuesForAreaIfAlreadyPresentInConstraintsOrDefaults()
+        {
+            // Arrange
+            var builder = CreateRouteBuilder();
+
+            // Act
+            builder.MapAreaRoute(
+                name: "admin_area",
+                areaName: "admin",
+                template: "site/Admin/",
+                defaults: new { area = "Home" },
+                constraints: new { area = new IntRouteConstraint() },
+                dataTokens: new { some_token = "hello" });
+
+            // Assert
+            var route = Assert.IsType<Route>((Assert.Single(builder.Routes)));
+
+            Assert.Equal("admin_area", route.Name);
+            Assert.Equal("site/Admin/", route.RouteTemplate);
+            Assert.Collection(
+                route.Constraints.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("area", kvp.Key);
+                    Assert.IsType<IntRouteConstraint>(kvp.Value);
+                });
+            Assert.Collection(
+                route.DataTokens.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("some_token", kvp.Key);
+                    Assert.Equal("hello", kvp.Value);
+                });
+            Assert.Collection(
+                route.Defaults.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("area", kvp.Key);
+                    Assert.Equal("Home", kvp.Value);
+                });
+        }
+
+        [Fact]
+        public void MapAreaRoute_UsesPassedInAreaNameAsIs()
+        {
+            // Arrange
+            var builder = CreateRouteBuilder();
+            var areaName = "user.admin";
+
+            // Act
+            builder.MapAreaRoute(name: null, areaName: areaName, template: "site/Admin/");
+
+            // Assert
+            var route = Assert.IsType<Route>((Assert.Single(builder.Routes)));
+
+            Assert.Null(route.Name);
+            Assert.Equal("site/Admin/", route.RouteTemplate);
+            Assert.Collection(
+                route.Constraints.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("area", kvp.Key);
+                    Assert.IsType<StringRouteConstraint>(kvp.Value);
+
+                    var values = new RouteValueDictionary(new { area = areaName });
+                    var match = kvp.Value.Match(
+                        new DefaultHttpContext(),
+                        route: new Mock<IRouter>().Object,
+                        routeKey: kvp.Key,
+                        values: values,
+                        routeDirection: RouteDirection.UrlGeneration);
+
+                    Assert.True(match);
+                });
+            Assert.Empty(route.DataTokens);
+            Assert.Collection(
+                route.Defaults.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("area", kvp.Key);
+                    Assert.Equal(kvp.Value, areaName);
+                });
+        }
+
+        private IServiceProvider CreateServices()
+        {
+            var services = new ServiceCollection();
+            services.AddOptions();
+            services.AddRouting();
+            return services.BuildServiceProvider();
+        }
+
+        private IRouteBuilder CreateRouteBuilder()
+        {
+            var builder = new Mock<IRouteBuilder>();
+            builder
+                .SetupGet(b => b.ServiceProvider)
+                .Returns(CreateServices());
+            builder
+                .SetupGet(b => b.Routes)
+                .Returns(new List<IRouter>());
+            builder
+                .SetupGet(b => b.DefaultHandler)
+                .Returns(Mock.Of<IRouter>());
+
+            return builder.Object;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ChallengeResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ChallengeResultTest.cs
new file mode 100644
index 0000000000..b1ec100e5f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ChallengeResultTest.cs
@@ -0,0 +1,78 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class ChallengeResultTest
+    {
+        [Fact]
+        public async Task ChallengeResult_Execute()
+        {
+            // Arrange
+            var result = new ChallengeResult("", null);
+
+            var auth = new Mock<IAuthenticationService>();
+
+            var httpContext = new Mock<HttpContext>();
+            httpContext.SetupGet(c => c.RequestServices)
+                .Returns(CreateServices().AddSingleton(auth.Object).BuildServiceProvider());
+
+            var routeData = new RouteData();
+            routeData.Routers.Add(Mock.Of<IRouter>());
+
+            var actionContext = new ActionContext(httpContext.Object,
+                                                  routeData,
+                                                  new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            auth.Verify(c => c.ChallengeAsync(httpContext.Object, "", null), Times.Exactly(1));
+        }
+
+        [Fact]
+        public async Task ChallengeResult_ExecuteNoSchemes()
+        {
+            // Arrange
+            var result = new ChallengeResult(new string[] { }, null);
+
+            var auth = new Mock<IAuthenticationService>();
+            var httpContext = new Mock<HttpContext>();
+            httpContext.SetupGet(c => c.RequestServices)
+                .Returns(CreateServices().AddSingleton(auth.Object).BuildServiceProvider());
+
+            var routeData = new RouteData();
+            routeData.Routers.Add(Mock.Of<IRouter>());
+
+            var actionContext = new ActionContext(httpContext.Object,
+                                                  routeData,
+                                                  new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            auth.Verify(c => c.ChallengeAsync(httpContext.Object, null, null), Times.Exactly(1));
+        }
+
+        private static IServiceCollection CreateServices()
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+            services.AddAuthenticationCore();
+            return services;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ConflictObjectResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ConflictObjectResultTest.cs
new file mode 100644
index 0000000000..6efabdbe34
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ConflictObjectResultTest.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class ConflictObjectResultTest
+    {
+        [Fact]
+        public void ConflictObjectResult_SetsStatusCodeAndValue()
+        {
+            // Arrange & Act
+            var obj = new object();
+            var conflictObjectResult = new ConflictObjectResult(obj);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status409Conflict, conflictObjectResult.StatusCode);
+            Assert.Equal(obj, conflictObjectResult.Value);
+        }
+
+        [Fact]
+        public void ConflictObjectResult_ModelState_SetsStatusCodeAndValue()
+        {
+            // Arrange & Act
+            var conflictObjectResult = new ConflictObjectResult(new ModelStateDictionary());
+
+            // Assert
+            Assert.Equal(StatusCodes.Status409Conflict, conflictObjectResult.StatusCode);
+            var errors = Assert.IsType<SerializableError>(conflictObjectResult.Value);
+            Assert.Empty(errors);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ConflictResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ConflictResultTest.cs
new file mode 100644
index 0000000000..16835c55ef
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ConflictResultTest.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class ConflictResultTest
+    {
+        [Fact]
+        public void ConflictResult_InitializesStatusCode()
+        {
+            // Arrange & act
+            var conflictResult = new ConflictResult();
+
+            // Assert
+            Assert.Equal(StatusCodes.Status409Conflict, conflictResult.StatusCode);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ConsumesAttributeTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ConsumesAttributeTests.cs
new file mode 100644
index 0000000000..a2738ed9a2
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ConsumesAttributeTests.cs
@@ -0,0 +1,428 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Net.Http.Headers;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class ConsumesAttributeTests
+    {
+        [Theory]
+        [InlineData("application")]
+        [InlineData("")]
+        public void Constructor_ForInvalidContentType_Throws(string contentType)
+        {
+            // Arrange
+            var expectedMessage = string.Format("The header contains invalid values at index 0: '{0}'", contentType);
+
+            // Act & Assert
+            var exception = Assert.Throws<FormatException>(() => new ConsumesAttribute(contentType));
+            Assert.Equal(expectedMessage, exception.Message);
+        }
+
+        [Theory]
+        [InlineData("", "")]
+        [InlineData("application/xml,, application/json", "")]
+        [InlineData(", application/json", "")]
+        [InlineData("invalid", "invalid")]
+        [InlineData("application/xml,invalid, application/json", "invalid")]
+        [InlineData("invalid, application/json", "invalid")]
+        public void Constructor_UnparsableContentType_Throws(string content, string invalidContentType)
+        {
+            // Act
+            var contentTypes = content.Split(',').Select(contentType => contentType.Trim()).ToArray();
+
+            // Assert
+            var ex = Assert.Throws<FormatException>(
+                       () => new ConsumesAttribute(contentTypes[0], contentTypes.Skip(1).ToArray()));
+            Assert.Equal("The header contains invalid values at index 0: '" + (invalidContentType ?? "<null>") + "'",
+                         ex.Message);
+        }
+
+        [Theory]
+        [InlineData("application/*", "application/*")]
+        [InlineData("application/xml, application/*, application/json", "application/*")]
+        [InlineData("application/*, application/json", "application/*")]
+
+        [InlineData("*/*", "*/*")]
+        [InlineData("application/xml, */*, application/json", "*/*")]
+        [InlineData("*/*, application/json", "*/*")]
+        public void Constructor_InvalidContentType_Throws(string content, string invalidContentType)
+        {
+            // Act
+            var contentTypes = content.Split(',').Select(contentType => contentType.Trim()).ToArray();
+
+            // Assert
+            var ex = Assert.Throws<InvalidOperationException>(
+                       () => new ConsumesAttribute(contentTypes[0], contentTypes.Skip(1).ToArray()));
+
+            Assert.Equal(
+                string.Format("The argument '{0}' is invalid. " +
+                              "Media types which match all types or match all subtypes are not supported.",
+                              invalidContentType),
+                ex.Message);
+        }
+
+        [Theory]
+        [InlineData("application/json")]
+        [InlineData("application/json;Parameter1=12")]
+        [InlineData("text/xml")]
+        public void Accept_MatchesForMachingRequestContentType(string contentType)
+        {
+            // Arrange
+            var constraint = new ConsumesAttribute("application/json", "text/xml");
+            var action = new ActionDescriptor()
+            {
+                FilterDescriptors =
+                    new List<FilterDescriptor>() { new FilterDescriptor(constraint, FilterScope.Action) }
+            };
+
+            var context = new ActionConstraintContext();
+            context.Candidates = new List<ActionSelectorCandidate>()
+            {
+                new ActionSelectorCandidate(action, new [] { constraint }),
+            };
+
+            context.CurrentCandidate = context.Candidates[0];
+            context.RouteContext = CreateRouteContext(contentType: contentType);
+
+            // Act & Assert
+            Assert.True(constraint.Accept(context));
+        }
+
+        [Fact]
+        public void Accept_TheFirstCandidateReturnsFalse_IfALaterOneMatches()
+        {
+            // Arrange
+            var constraint1 = new ConsumesAttribute("application/json", "text/xml");
+            var action1 = new ActionDescriptor()
+            {
+                FilterDescriptors =
+                    new List<FilterDescriptor>() { new FilterDescriptor(constraint1, FilterScope.Action) }
+            };
+
+            var constraint2 = new Mock<ITestConsumeConstraint>();
+            var action2 = new ActionDescriptor()
+            {
+                FilterDescriptors =
+                    new List<FilterDescriptor>() { new FilterDescriptor(constraint2.Object, FilterScope.Action) }
+            };
+
+            constraint2.Setup(o => o.Accept(It.IsAny<ActionConstraintContext>()))
+                       .Returns(true);
+
+            var context = new ActionConstraintContext();
+            context.Candidates = new List<ActionSelectorCandidate>()
+            {
+                new ActionSelectorCandidate(action1, new [] { constraint1 }),
+                new ActionSelectorCandidate(action2, new [] { constraint2.Object }),
+            };
+
+            context.CurrentCandidate = context.Candidates[0];
+            context.RouteContext = CreateRouteContext(contentType: "application/custom");
+
+            // Act & Assert
+            Assert.False(constraint1.Accept(context));
+        }
+
+        [Theory]
+        [InlineData("application/custom")]
+        [InlineData("")]
+        [InlineData(null)]
+        public void Accept_ForNoMatchingCandidates_SelectsTheFirstCandidate(string contentType)
+        {
+            // Arrange
+            var constraint1 = new ConsumesAttribute("application/json", "text/xml");
+            var action1 = new ActionDescriptor()
+            {
+                FilterDescriptors =
+                    new List<FilterDescriptor>() { new FilterDescriptor(constraint1, FilterScope.Action) }
+            };
+
+            var constraint2 = new Mock<ITestConsumeConstraint>();
+            var action2 = new ActionDescriptor()
+            {
+                FilterDescriptors =
+                    new List<FilterDescriptor>() { new FilterDescriptor(constraint2.Object, FilterScope.Action) }
+            };
+
+            constraint2.Setup(o => o.Accept(It.IsAny<ActionConstraintContext>()))
+                       .Returns(false);
+
+            var context = new ActionConstraintContext();
+            context.Candidates = new List<ActionSelectorCandidate>()
+            {
+                new ActionSelectorCandidate(action1, new [] { constraint1 }),
+                new ActionSelectorCandidate(action2, new [] { constraint2.Object }),
+            };
+
+            context.CurrentCandidate = context.Candidates[0];
+            context.RouteContext = CreateRouteContext(contentType: contentType);
+
+            // Act & Assert
+            Assert.True(constraint1.Accept(context));
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        public void Accept_ForNoRequestType_SelectsTheCandidateWithoutConstraintIfPresent(string contentType)
+        {
+            // Arrange
+            var constraint1 = new ConsumesAttribute("application/json");
+            var actionWithConstraint = new ActionDescriptor()
+            {
+                FilterDescriptors =
+                    new List<FilterDescriptor>() { new FilterDescriptor(constraint1, FilterScope.Action) }
+            };
+
+            var constraint2 = new ConsumesAttribute("text/xml");
+            var actionWithConstraint2 = new ActionDescriptor()
+            {
+                FilterDescriptors =
+                    new List<FilterDescriptor>() { new FilterDescriptor(constraint2, FilterScope.Action) }
+            };
+
+            var actionWithoutConstraint = new ActionDescriptor();
+
+            var context = new ActionConstraintContext();
+            context.Candidates = new List<ActionSelectorCandidate>()
+            {
+                new ActionSelectorCandidate(actionWithConstraint, new [] { constraint1 }),
+                new ActionSelectorCandidate(actionWithConstraint2, new [] { constraint2 }),
+                new ActionSelectorCandidate(actionWithoutConstraint, new List<IActionConstraint>()),
+            };
+
+            context.RouteContext = CreateRouteContext(contentType: contentType);
+
+            // Act & Assert
+            context.CurrentCandidate = context.Candidates[0];
+            Assert.False(constraint1.Accept(context));
+            context.CurrentCandidate = context.Candidates[1];
+            Assert.False(constraint2.Accept(context));
+        }
+
+        [Theory]
+        [InlineData("application/xml")]
+        [InlineData("application/custom")]
+        [InlineData("invalid/invalid")]
+        public void Accept_UnrecognizedMediaType_SelectsTheCandidateWithoutConstraintIfPresent(string contentType)
+        {
+            // Arrange
+            var actionWithoutConstraint = new ActionDescriptor();
+            var constraint1 = new ConsumesAttribute("application/json");
+            var actionWithConstraint = new ActionDescriptor()
+            {
+                FilterDescriptors =
+                    new List<FilterDescriptor>() { new FilterDescriptor(constraint1, FilterScope.Action) }
+            };
+
+            var constraint2 = new ConsumesAttribute("text/xml");
+            var actionWithConstraint2 = new ActionDescriptor()
+            {
+                FilterDescriptors =
+                    new List<FilterDescriptor>() { new FilterDescriptor(constraint2, FilterScope.Action) }
+            };
+
+            var context = new ActionConstraintContext();
+            context.Candidates = new List<ActionSelectorCandidate>()
+            {
+                new ActionSelectorCandidate(actionWithConstraint, new [] { constraint1 }),
+                new ActionSelectorCandidate(actionWithConstraint2, new [] { constraint2 }),
+                new ActionSelectorCandidate(actionWithoutConstraint, new List<IActionConstraint>()),
+            };
+
+            context.RouteContext = CreateRouteContext(contentType: contentType);
+
+            // Act & Assert
+            context.CurrentCandidate = context.Candidates[0];
+            Assert.False(constraint1.Accept(context));
+
+            context.CurrentCandidate = context.Candidates[1];
+            Assert.False(constraint2.Accept(context));
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        public void Accept_ForNoRequestType_ReturnsTrueForAllConstraints(string contentType)
+        {
+            // Arrange
+            var constraint1 = new ConsumesAttribute("application/json");
+            var actionWithConstraint = new ActionDescriptor()
+            {
+                FilterDescriptors =
+                    new List<FilterDescriptor>() { new FilterDescriptor(constraint1, FilterScope.Action) }
+            };
+
+            var constraint2 = new ConsumesAttribute("text/xml");
+            var actionWithConstraint2 = new ActionDescriptor()
+            {
+                FilterDescriptors =
+                    new List<FilterDescriptor>() { new FilterDescriptor(constraint2, FilterScope.Action) }
+            };
+
+            var actionWithoutConstraint = new ActionDescriptor();
+
+            var context = new ActionConstraintContext();
+            context.Candidates = new List<ActionSelectorCandidate>()
+            {
+                new ActionSelectorCandidate(actionWithConstraint, new [] { constraint1 }),
+                new ActionSelectorCandidate(actionWithConstraint2, new [] { constraint2 }),
+            };
+
+            context.RouteContext = CreateRouteContext(contentType: contentType);
+
+            // Act & Assert
+            context.CurrentCandidate = context.Candidates[0];
+            Assert.True(constraint1.Accept(context));
+            context.CurrentCandidate = context.Candidates[1];
+            Assert.True(constraint2.Accept(context));
+        }
+
+        [Theory]
+        [InlineData("application/xml")]
+        [InlineData("application/custom")]
+        public void OnResourceExecuting_ForNoContentTypeMatch_SetsUnsupportedMediaTypeResult(string contentType)
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.ContentType = contentType;
+            var consumesFilter = new ConsumesAttribute("application/json");
+            var actionWithConstraint = new ActionDescriptor()
+            {
+                ActionConstraints = new List<IActionConstraintMetadata>() { consumesFilter },
+                FilterDescriptors =
+                    new List<FilterDescriptor>() { new FilterDescriptor(consumesFilter, FilterScope.Action) }
+            };
+            var actionContext = new ActionContext(httpContext, new RouteData(), actionWithConstraint);
+
+            var resourceExecutingContext = new ResourceExecutingContext(
+                actionContext,
+                new[] { consumesFilter },
+                new List<IValueProviderFactory>());
+
+            // Act
+            consumesFilter.OnResourceExecuting(resourceExecutingContext);
+
+            // Assert
+            Assert.NotNull(resourceExecutingContext.Result);
+            Assert.IsType<UnsupportedMediaTypeResult>(resourceExecutingContext.Result);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        public void OnResourceExecuting_NullOrEmptyRequestContentType_IsNoOp(string contentType)
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.ContentType = contentType;
+            var consumesFilter = new ConsumesAttribute("application/json");
+            var actionWithConstraint = new ActionDescriptor()
+            {
+                ActionConstraints = new List<IActionConstraintMetadata>() { consumesFilter },
+                FilterDescriptors =
+                    new List<FilterDescriptor>() { new FilterDescriptor(consumesFilter, FilterScope.Action) }
+            };
+            var actionContext = new ActionContext(httpContext, new RouteData(), actionWithConstraint);
+
+            var resourceExecutingContext = new ResourceExecutingContext(
+                actionContext,
+                new[] { consumesFilter },
+                new List<IValueProviderFactory>());
+
+            // Act
+            consumesFilter.OnResourceExecuting(resourceExecutingContext);
+
+            // Assert
+            Assert.Null(resourceExecutingContext.Result);
+        }
+
+        [Theory]
+        [InlineData("application/xml")]
+        [InlineData("application/json")]
+        public void OnResourceExecuting_ForAContentTypeMatch_IsNoOp(string contentType)
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.ContentType = contentType;
+            var consumesFilter = new ConsumesAttribute("application/json", "application/xml");
+            var actionWithConstraint = new ActionDescriptor()
+            {
+                ActionConstraints = new List<IActionConstraintMetadata>() { consumesFilter },
+                FilterDescriptors =
+                    new List<FilterDescriptor>() { new FilterDescriptor(consumesFilter, FilterScope.Action) }
+            };
+            var actionContext = new ActionContext(httpContext, new RouteData(), actionWithConstraint);
+            var resourceExecutingContext = new ResourceExecutingContext(
+                actionContext,
+                new[] { consumesFilter },
+                new List<IValueProviderFactory>());
+
+            // Act
+            consumesFilter.OnResourceExecuting(resourceExecutingContext);
+
+            // Assert
+            Assert.Null(resourceExecutingContext.Result);
+        }
+
+        [Fact]
+        public void SetContentTypes_ClearsAndSetsContentTypes()
+        {
+            // Arrange
+            var attribute = new ConsumesAttribute("application/json", "text/json");
+
+            var contentTypes = new MediaTypeCollection()
+            {
+                MediaTypeHeaderValue.Parse("application/xml"),
+                MediaTypeHeaderValue.Parse("text/xml"),
+            };
+
+            // Act
+            attribute.SetContentTypes(contentTypes);
+
+            // Assert
+            Assert.Collection(
+                contentTypes.OrderBy(t => t),
+                t => Assert.Equal("application/json", t),
+                t => Assert.Equal("text/json", t));
+        }
+
+        private static RouteContext CreateRouteContext(string contentType = null, object routeValues = null)
+        {
+            var httpContext = new DefaultHttpContext();
+            if (contentType != null)
+            {
+                httpContext.Request.ContentType = contentType;
+            }
+
+            var routeContext = new RouteContext(httpContext);
+            routeContext.RouteData = new RouteData();
+
+            foreach (var kvp in new RouteValueDictionary(routeValues))
+            {
+                routeContext.RouteData.Values.Add(kvp.Key, kvp.Value);
+            }
+
+            return routeContext;
+        }
+
+        public interface ITestConsumeConstraint : IConsumesActionConstraint, IResourceFilter
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ContentResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ContentResultTest.cs
new file mode 100644
index 0000000000..a9e878cc8f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ContentResultTest.cs
@@ -0,0 +1,289 @@
+// 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.
+
+using System.Buffers;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Net.Http.Headers;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class ContentResultTest
+    {
+        private static readonly int DefaultCharacterChunkSize =
+            MemoryPoolHttpResponseStreamWriterFactory.DefaultBufferSize;
+
+        [Fact]
+        public async Task ContentResult_Response_NullContent_SetsContentTypeAndEncoding()
+        {
+            // Arrange
+            var contentResult = new ContentResult
+            {
+                Content = null,
+                ContentType = new MediaTypeHeaderValue("text/plain")
+                {
+                    Encoding = Encoding.UTF7
+                }.ToString()
+            };
+            var httpContext = GetHttpContext();
+            var actionContext = GetActionContext(httpContext);
+
+            // Act
+            await contentResult.ExecuteResultAsync(actionContext);
+
+            // Assert
+            MediaTypeAssert.Equal("text/plain; charset=utf-7", httpContext.Response.ContentType);
+        }
+
+        public static TheoryData<MediaTypeHeaderValue, string, string, string, byte[]> ContentResultContentTypeData
+        {
+            get
+            {
+                // contentType, content, responseContentType, expectedContentType, expectedData
+                return new TheoryData<MediaTypeHeaderValue, string, string, string, byte[]>
+                {
+                    {
+                        null,
+                        "κόσμε",
+                        null,
+                        "text/plain; charset=utf-8",
+                        new byte[] { 206, 186, 225, 189, 185, 207, 131, 206, 188, 206, 181 } //utf-8 without BOM
+                    },
+                    {
+                        new MediaTypeHeaderValue("text/foo"),
+                        "κόσμε",
+                        null,
+                        "text/foo",
+                        new byte[] { 206, 186, 225, 189, 185, 207, 131, 206, 188, 206, 181 } //utf-8 without BOM
+                    },
+                    {
+                        MediaTypeHeaderValue.Parse("text/foo;p1=p1-value"),
+                        "κόσμε",
+                        null,
+                        "text/foo; p1=p1-value",
+                        new byte[] { 206, 186, 225, 189, 185, 207, 131, 206, 188, 206, 181 } //utf-8 without BOM
+                    },
+                    {
+                        new MediaTypeHeaderValue("text/foo") { Encoding = Encoding.ASCII },
+                        "abcd",
+                        null,
+                        "text/foo; charset=us-ascii",
+                        new byte[] { 97, 98, 99, 100 }
+                    },
+                    {
+                        null,
+                        "abcd",
+                        "text/bar",
+                        "text/bar",
+                        new byte[] { 97, 98, 99, 100 }
+                    },
+                    {
+                        null,
+                        "abcd",
+                        "application/xml; charset=us-ascii",
+                        "application/xml; charset=us-ascii",
+                        new byte[] { 97, 98, 99, 100 }
+                    },
+                    {
+                        null,
+                        "abcd",
+                        "Invalid content type",
+                        "Invalid content type",
+                        new byte[] { 97, 98, 99, 100 }
+                    },
+                    {
+                        new MediaTypeHeaderValue("text/foo") { Charset = "us-ascii" },
+                        "abcd",
+                        "text/bar",
+                        "text/foo; charset=us-ascii",
+                        new byte[] { 97, 98, 99, 100 }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ContentResultContentTypeData))]
+        public async Task ContentResult_ExecuteResultAsync_SetContentTypeAndEncoding_OnResponse(
+            MediaTypeHeaderValue contentType,
+            string content,
+            string responseContentType,
+            string expectedContentType,
+            byte[] expectedContentData)
+        {
+            // Arrange
+            var contentResult = new ContentResult
+            {
+                Content = content,
+                ContentType = contentType?.ToString()
+            };
+            var httpContext = GetHttpContext();
+            var memoryStream = new MemoryStream();
+            httpContext.Response.Body = memoryStream;
+            httpContext.Response.ContentType = responseContentType;
+            var actionContext = GetActionContext(httpContext);
+
+            // Act
+            await contentResult.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var finalResponseContentType = httpContext.Response.ContentType;
+            Assert.Equal(expectedContentType, finalResponseContentType);
+            Assert.Equal(expectedContentData, memoryStream.ToArray());
+            Assert.Equal(expectedContentData.Length, httpContext.Response.ContentLength);
+        }
+
+        public static TheoryData<string, string> ContentResult_WritesDataCorrectly_ForDifferentContentSizesData
+        {
+            get
+            {
+                // content, contentType
+                return new TheoryData<string, string>
+                {
+                    {  string.Empty, "text/plain; charset=utf-8" },
+                    {  new string('a', DefaultCharacterChunkSize), "text/plain; charset=utf-8" },
+                    {  new string('a', DefaultCharacterChunkSize - 1), "text/plain; charset=utf-8" },
+                    {  new string('a', DefaultCharacterChunkSize + 1), "text/plain; charset=utf-8" },
+                    {  new string('a', DefaultCharacterChunkSize - 2), "text/plain; charset=utf-8" },
+                    {  new string('a', DefaultCharacterChunkSize + 2), "text/plain; charset=utf-8" },
+                    {  new string('a', DefaultCharacterChunkSize - 3), "text/plain; charset=utf-8" },
+                    {  new string('a', DefaultCharacterChunkSize + 3), "text/plain; charset=utf-8" },
+                    {  new string('a', DefaultCharacterChunkSize * 2), "text/plain; charset=utf-8" },
+                    {  new string('a', DefaultCharacterChunkSize * 3), "text/plain; charset=utf-8" },
+                    {  new string('a', (DefaultCharacterChunkSize * 2) - 1), "text/plain; charset=utf-8" },
+                    {  new string('a', (DefaultCharacterChunkSize * 2) - 2), "text/plain; charset=utf-8" },
+                    {  new string('a', (DefaultCharacterChunkSize * 2) - 3), "text/plain; charset=utf-8" },
+                    {  new string('a', (DefaultCharacterChunkSize * 2) + 1), "text/plain; charset=utf-8" },
+                    {  new string('a', (DefaultCharacterChunkSize * 2) + 2), "text/plain; charset=utf-8" },
+                    {  new string('a', (DefaultCharacterChunkSize * 2) + 3), "text/plain; charset=utf-8" },
+                    {  new string('a', (DefaultCharacterChunkSize * 3) - 1), "text/plain; charset=utf-8" },
+                    {  new string('a', (DefaultCharacterChunkSize * 3) - 2), "text/plain; charset=utf-8" },
+                    {  new string('a', (DefaultCharacterChunkSize * 3) - 3), "text/plain; charset=utf-8" },
+                    {  new string('a', (DefaultCharacterChunkSize * 3) + 1), "text/plain; charset=utf-8" },
+                    {  new string('a', (DefaultCharacterChunkSize * 3) + 2), "text/plain; charset=utf-8" },
+                    {  new string('a', (DefaultCharacterChunkSize * 3) + 3), "text/plain; charset=utf-8" },
+
+                    {  new string('色', DefaultCharacterChunkSize), "text/plain; charset=utf-16" },
+                    {  new string('色', DefaultCharacterChunkSize - 1), "text/plain; charset=utf-16" },
+                    {  new string('色', DefaultCharacterChunkSize + 1), "text/plain; charset=utf-16" },
+                    {  new string('色', DefaultCharacterChunkSize - 2), "text/plain; charset=utf-16" },
+                    {  new string('色', DefaultCharacterChunkSize + 2), "text/plain; charset=utf-16" },
+                    {  new string('色', DefaultCharacterChunkSize - 3), "text/plain; charset=utf-16" },
+                    {  new string('色', DefaultCharacterChunkSize + 3), "text/plain; charset=utf-16" },
+                    {  new string('色', DefaultCharacterChunkSize * 2), "text/plain; charset=utf-16" },
+                    {  new string('色', DefaultCharacterChunkSize * 3), "text/plain; charset=utf-16" },
+                    {  new string('色', (DefaultCharacterChunkSize * 2) - 1), "text/plain; charset=utf-16" },
+                    {  new string('色', (DefaultCharacterChunkSize * 2) - 2), "text/plain; charset=utf-16" },
+                    {  new string('色', (DefaultCharacterChunkSize * 2) - 3), "text/plain; charset=utf-16" },
+                    {  new string('色', (DefaultCharacterChunkSize * 2) + 1), "text/plain; charset=utf-16" },
+                    {  new string('色', (DefaultCharacterChunkSize * 2) + 2), "text/plain; charset=utf-16" },
+                    {  new string('色', (DefaultCharacterChunkSize * 2) + 3), "text/plain; charset=utf-16" },
+                    {  new string('色', (DefaultCharacterChunkSize * 3) - 1), "text/plain; charset=utf-16" },
+                    {  new string('色', (DefaultCharacterChunkSize * 3) - 2), "text/plain; charset=utf-16" },
+                    {  new string('色', (DefaultCharacterChunkSize * 3) - 3), "text/plain; charset=utf-16" },
+                    {  new string('色', (DefaultCharacterChunkSize * 3) + 1), "text/plain; charset=utf-16" },
+                    {  new string('色', (DefaultCharacterChunkSize * 3) + 2), "text/plain; charset=utf-16" },
+                    {  new string('色', (DefaultCharacterChunkSize * 3) + 3), "text/plain; charset=utf-16" },
+
+                    {  new string('色', DefaultCharacterChunkSize), "text/plain; charset=utf-32" },
+                    {  new string('色', DefaultCharacterChunkSize - 1), "text/plain; charset=utf-32" },
+                    {  new string('色', DefaultCharacterChunkSize + 1), "text/plain; charset=utf-32" },
+                    {  new string('色', DefaultCharacterChunkSize - 2), "text/plain; charset=utf-32" },
+                    {  new string('色', DefaultCharacterChunkSize + 2), "text/plain; charset=utf-32" },
+                    {  new string('色', DefaultCharacterChunkSize - 3), "text/plain; charset=utf-32" },
+                    {  new string('色', DefaultCharacterChunkSize + 3), "text/plain; charset=utf-32" },
+                    {  new string('色', DefaultCharacterChunkSize * 2), "text/plain; charset=utf-32" },
+                    {  new string('色', DefaultCharacterChunkSize * 3), "text/plain; charset=utf-32" },
+                    {  new string('色', (DefaultCharacterChunkSize * 2) - 1), "text/plain; charset=utf-32" },
+                    {  new string('色', (DefaultCharacterChunkSize * 2) - 2), "text/plain; charset=utf-32" },
+                    {  new string('色', (DefaultCharacterChunkSize * 2) - 3), "text/plain; charset=utf-32" },
+                    {  new string('色', (DefaultCharacterChunkSize * 2) + 1), "text/plain; charset=utf-32" },
+                    {  new string('色', (DefaultCharacterChunkSize * 2) + 2), "text/plain; charset=utf-32" },
+                    {  new string('色', (DefaultCharacterChunkSize * 2) + 3), "text/plain; charset=utf-32" },
+                    {  new string('色', (DefaultCharacterChunkSize * 3) - 1), "text/plain; charset=utf-32" },
+                    {  new string('色', (DefaultCharacterChunkSize * 3) - 2), "text/plain; charset=utf-32" },
+                    {  new string('色', (DefaultCharacterChunkSize * 3) - 3), "text/plain; charset=utf-32" },
+                    {  new string('色', (DefaultCharacterChunkSize * 3) + 1), "text/plain; charset=utf-32" },
+                    {  new string('色', (DefaultCharacterChunkSize * 3) + 2), "text/plain; charset=utf-32" },
+                    {  new string('色', (DefaultCharacterChunkSize * 3) + 3), "text/plain; charset=utf-32" },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ContentResult_WritesDataCorrectly_ForDifferentContentSizesData))]
+        public async Task ContentResult_WritesDataCorrectly_ForDifferentContentSizes(string content, string contentType)
+        {
+            // Arrange
+            var contentResult = new ContentResult
+            {
+                Content = content,
+                ContentType = contentType
+            };
+            var httpContext = GetHttpContext();
+            var memoryStream = new MemoryStream();
+            httpContext.Response.Body = memoryStream;
+            var actionContext = GetActionContext(httpContext);
+            var encoding = MediaTypeHeaderValue.Parse(contentType).Encoding;
+
+            // Act
+            await contentResult.ExecuteResultAsync(actionContext);
+
+            // Assert
+            memoryStream.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(memoryStream, encoding);
+            var actualContent = await streamReader.ReadToEndAsync();
+            Assert.Equal(content, actualContent);
+        }
+
+        private static ActionContext GetActionContext(HttpContext httpContext)
+        {
+            var routeData = new RouteData();
+            routeData.Routers.Add(Mock.Of<IRouter>());
+
+            return new ActionContext(httpContext,
+                                    routeData,
+                                    new ActionDescriptor());
+        }
+
+        private static IServiceCollection CreateServices(params ViewComponentDescriptor[] descriptors)
+        {
+            // An array pool could return a buffer which is greater or equal to the size of the default character
+            // chunk size. Since the tests here depend on a specific character buffer size to test boundary conditions,
+            // make sure to only return a buffer of that size.
+            var charArrayPool = new Mock<ArrayPool<char>>();
+            charArrayPool
+                .Setup(ap => ap.Rent(DefaultCharacterChunkSize))
+                .Returns(new char[DefaultCharacterChunkSize]);
+
+            var services = new ServiceCollection();
+            services.AddSingleton<IActionResultExecutor<ContentResult>>(new ContentResultExecutor(
+                new Logger<ContentResultExecutor>(NullLoggerFactory.Instance),
+                new MemoryPoolHttpResponseStreamWriterFactory(ArrayPool<byte>.Shared, charArrayPool.Object)));
+            return services;
+        }
+
+        private static HttpContext GetHttpContext()
+        {
+            var services = CreateServices();
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = services.BuildServiceProvider();
+
+            return httpContext;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ControllerBaseTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ControllerBaseTest.cs
new file mode 100644
index 0000000000..4ff9dac6ec
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ControllerBaseTest.cs
@@ -0,0 +1,2948 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Microsoft.Net.Http.Headers;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Core.Test
+{
+    public class ControllerBaseTest
+    {
+        public static IEnumerable<object[]> PublicNormalMethodsFromControllerBase
+        {
+            get
+            {
+                return typeof(ControllerBase).GetTypeInfo()
+                    .DeclaredMethods
+                    .Where(method => method.IsPublic &&
+                    !method.IsSpecialName &&
+                    !method.Name.Equals("Dispose", StringComparison.OrdinalIgnoreCase))
+                    .Select(method => new[] { method });
+            }
+        }
+
+        [Fact]
+        public void Redirect_WithParameterUrl_SetsRedirectResultSameUrl()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var url = "/test/url";
+
+            // Act
+            var result = controller.Redirect(url);
+
+            // Assert
+            Assert.IsType<RedirectResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void RedirectPermanent_WithParameterUrl_SetsRedirectResultPermanentAndSameUrl()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var url = "/test/url";
+
+            // Act
+            var result = controller.RedirectPermanent(url);
+
+            // Assert
+            Assert.IsType<RedirectResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void RedirectPermanent_WithParameterUrl_SetsRedirectResultPreserveMethodAndSameUrl()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var url = "/test/url";
+
+            // Act
+            var result = controller.RedirectPreserveMethod(url);
+
+            // Assert
+            Assert.IsType<RedirectResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void RedirectPermanent_WithParameterUrl_SetsRedirectResultPermanentPreserveMethodAndSameUrl()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var url = "/test/url";
+
+            // Act
+            var result = controller.RedirectPermanentPreserveMethod(url);
+
+            // Assert
+            Assert.IsType<RedirectResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void Redirect_WithParameter_NullOrEmptyUrl_Throws(string url)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => controller.Redirect(url: url), "url");
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void RedirectPreserveMethod_WithParameter_NullOrEmptyUrl_Throws(string url)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => controller.RedirectPreserveMethod(url: url), "url");
+        }
+
+        [Fact]
+        public void LocalRedirect_WithParameterUrl_SetsLocalRedirectResultWithSameUrl()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var url = "/test/url";
+
+            // Act
+            var result = controller.LocalRedirect(url);
+
+            // Assert
+            Assert.IsType<LocalRedirectResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void LocalRedirectPermanent_WithParameterUrl_SetsLocalRedirectResultPermanentWithSameUrl()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var url = "/test/url";
+
+            // Act
+            var result = controller.LocalRedirectPermanent(url);
+
+            // Assert
+            Assert.IsType<LocalRedirectResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void LocalRedirectPermanent_WithParameterUrl_SetsLocalRedirectResultPreserveMethodWithSameUrl()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var url = "/test/url";
+
+            // Act
+            var result = controller.LocalRedirectPreserveMethod(url);
+
+            // Assert
+            Assert.IsType<LocalRedirectResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void LocalRedirectPermanent_WithParameterUrl_SetsLocalRedirectResultPermanentPreservesMethodWithSameUrl()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var url = "/test/url";
+
+            // Act
+            var result = controller.LocalRedirectPermanentPreserveMethod(url);
+
+            // Assert
+            Assert.IsType<LocalRedirectResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void LocalRedirect_WithParameter_NullOrEmptyUrl_Throws(string url)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => controller.LocalRedirect(localUrl: url), "localUrl");
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void LocalRedirectPreserveMethod_WithParameter_NullOrEmptyUrl_Throws(string url)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => controller.LocalRedirectPreserveMethod(localUrl: url), "localUrl");
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void LocalRedirectPermanentPreserveMethod_WithParameter_NullOrEmptyUrl_Throws(string url)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => controller.LocalRedirectPermanentPreserveMethod(localUrl: url), "localUrl");
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void RedirectPermanent_WithParameter_NullOrEmptyUrl_Throws(string url)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => controller.RedirectPermanent(url: url), "url");
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void RedirectPermanentPreserveMethod_WithParameter_NullOrEmptyUrl_Throws(string url)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => controller.RedirectPermanentPreserveMethod(url: url), "url");
+        }
+
+        [Fact]
+        public void RedirectToAction_WithParameterActionName_SetsResultActionName()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var resultTemporary = controller.RedirectToAction("SampleAction");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.False(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal("SampleAction", resultTemporary.ActionName);
+        }
+
+        [Fact]
+        public void RedirectToActionPreserveMethod_WithParameterActionName_SetsResultActionName()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var resultTemporary = controller.RedirectToActionPreserveMethod(actionName: "SampleAction");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.True(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal("SampleAction", resultTemporary.ActionName);
+        }
+
+        [Fact]
+        public void RedirectToActionPermanent_WithParameterActionName_SetsResultActionNameAndPermanent()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var resultPermanent = controller.RedirectToActionPermanent("SampleAction");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.False(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal("SampleAction", resultPermanent.ActionName);
+        }
+
+        [Fact]
+        public void RedirectToActionPermanentPreserveMethod_WithParameterActionName_SetsResultActionNameAndPermanent()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var resultPermanent = controller.RedirectToActionPermanentPreserveMethod(actionName: "SampleAction");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal("SampleAction", resultPermanent.ActionName);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        [InlineData("SampleController")]
+        public void RedirectToAction_WithParameterActionAndControllerName_SetsEqualNames(string controllerName)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var resultTemporary = controller.RedirectToAction("SampleAction", controllerName);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.False(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal("SampleAction", resultTemporary.ActionName);
+            Assert.Equal(controllerName, resultTemporary.ControllerName);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        [InlineData("SampleController")]
+        public void RedirectToActionPreserveMethod_WithParameterActionAndControllerName_SetsEqualNames(string controllerName)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var resultTemporary = controller.RedirectToActionPreserveMethod(actionName: "SampleAction", controllerName: controllerName);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.True(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal("SampleAction", resultTemporary.ActionName);
+            Assert.Equal(controllerName, resultTemporary.ControllerName);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        [InlineData("SampleController")]
+        public void RedirectToActionPermanent_WithParameterActionAndControllerName_SetsEqualNames(string controllerName)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var resultPermanent = controller.RedirectToActionPermanent("SampleAction", controllerName);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.False(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal("SampleAction", resultPermanent.ActionName);
+            Assert.Equal(controllerName, resultPermanent.ControllerName);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        [InlineData("SampleController")]
+        public void RedirectToActionPermanentPreserveMethod_WithParameterActionAndControllerName_SetsEqualNames(string controllerName)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var resultPermanent = controller.RedirectToActionPermanentPreserveMethod(actionName: "SampleAction", controllerName: controllerName);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal("SampleAction", resultPermanent.ActionName);
+            Assert.Equal(controllerName, resultPermanent.ControllerName);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToAction_WithParameterActionControllerRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var resultTemporary = controller.RedirectToAction("SampleAction", "SampleController", routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.False(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal("SampleAction", resultTemporary.ActionName);
+            Assert.Equal("SampleController", resultTemporary.ControllerName);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPreserveMethod_WithParameterActionControllerRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var resultTemporary = controller.RedirectToActionPreserveMethod(
+                actionName: "SampleAction",
+                controllerName: "SampleController",
+                routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.True(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal("SampleAction", resultTemporary.ActionName);
+            Assert.Equal("SampleController", resultTemporary.ControllerName);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPermanent_WithParameterActionControllerRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var resultPermanent = controller.RedirectToActionPermanent(
+                "SampleAction",
+                "SampleController",
+                routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.False(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal("SampleAction", resultPermanent.ActionName);
+            Assert.Equal("SampleController", resultPermanent.ControllerName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPermanentPreserveMethod_WithParameterActionControllerRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var resultPermanent = controller.RedirectToActionPermanentPreserveMethod(
+                actionName: "SampleAction",
+                controllerName: "SampleController",
+                routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal("SampleAction", resultPermanent.ActionName);
+            Assert.Equal("SampleController", resultPermanent.ControllerName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToAction_WithParameterActionAndRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var resultTemporary = controller.RedirectToAction(actionName: null, routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.False(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Null(resultTemporary.ActionName);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPreserveMethod_WithParameterActionAndRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var resultTemporary = controller.RedirectToActionPreserveMethod(actionName: null, routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.True(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Null(resultTemporary.ActionName);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToAction_WithParameterActionAndControllerAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var controller = new TestableController();
+            var expectedAction = "Action";
+            var expectedController = "Home";
+            var expectedFragment = "test";
+
+            // Act
+            var result = controller.RedirectToAction("Action", "Home", routeValues, "test");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Equal(expectedAction, result.ActionName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedController, result.ControllerName);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPreserveMethod_WithParameterActionAndControllerAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var controller = new TestableController();
+            var expectedAction = "Action";
+            var expectedController = "Home";
+            var expectedFragment = "test";
+
+            // Act
+            var result = controller.RedirectToActionPreserveMethod("Action", "Home", routeValues, "test");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Equal(expectedAction, result.ActionName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedController, result.ControllerName);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPermanent_WithParameterActionAndRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var resultPermanent = controller.RedirectToActionPermanent(null, routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.False(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Null(resultPermanent.ActionName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPermanentPreserveMethod_WithParameterActionAndRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var resultPermanent = controller.RedirectToActionPermanentPreserveMethod(actionName: null, routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Null(resultPermanent.ActionName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPermanent_WithParameterActionAndControllerAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var controller = new TestableController();
+            var expectedAction = "Action";
+            var expectedController = "Home";
+            var expectedFragment = "test";
+
+            // Act
+            var result = controller.RedirectToActionPermanent("Action", "Home", routeValues, fragment: "test");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Equal(expectedAction, result.ActionName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedController, result.ControllerName);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPermanentPreserveMethod_WithParameterActionAndControllerAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var controller = new TestableController();
+            var expectedAction = "Action";
+            var expectedController = "Home";
+            var expectedFragment = "test";
+
+            // Act
+            var result = controller.RedirectToActionPermanentPreserveMethod(
+                actionName: "Action",
+                controllerName: "Home",
+                routeValues: routeValues,
+                fragment: "test");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Equal(expectedAction, result.ActionName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedController, result.ControllerName);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoute_WithParameterRouteValues_SetsResultEqualRouteValues(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var resultTemporary = controller.RedirectToRoute(routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultTemporary);
+            Assert.False(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePreserveMethod_WithParameterRouteValues_SetsResultEqualRouteValues(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var resultTemporary = controller.RedirectToRoutePreserveMethod(routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultTemporary);
+            Assert.True(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoute_WithParameterRouteNameAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var controller = new TestableController();
+            var expectedRoute = "TestRoute";
+            var expectedFragment = "test";
+
+            // Act
+            var result = controller.RedirectToRoute("TestRoute", routeValues, "test");
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Equal(expectedRoute, result.RouteName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePreserveMethod_WithParameterRouteNameAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var controller = new TestableController();
+            var expectedRoute = "TestRoute";
+            var expectedFragment = "test";
+
+            // Act
+            var result = controller.RedirectToRoutePreserveMethod(routeName: "TestRoute", routeValues: routeValues, fragment: "test");
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Equal(expectedRoute, result.RouteName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePermanent_WithParameterRouteValues_SetsResultEqualRouteValuesAndPermanent(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var resultPermanent = controller.RedirectToRoutePermanent(routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultPermanent);
+            Assert.False(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePermanentPreserveMethod_WithParameterRouteValues_SetsResultEqualRouteValuesAndPermanent(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var resultPermanent = controller.RedirectToRoutePermanentPreserveMethod(routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePermanent_WithParameterRouteNameAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var controller = new TestableController();
+            var expectedRoute = "TestRoute";
+            var expectedFragment = "test";
+
+            // Act
+            var result = controller.RedirectToRoutePermanent("TestRoute", routeValues, "test");
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Equal(expectedRoute, result.RouteName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePermanentPreserveMethod_WithParameterRouteNameAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var controller = new TestableController();
+            var expectedRoute = "TestRoute";
+            var expectedFragment = "test";
+
+            // Act
+            var result = controller.RedirectToRoutePermanentPreserveMethod(routeName: "TestRoute", routeValues: routeValues, fragment: "test");
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Equal(expectedRoute, result.RouteName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Fact]
+        public void RedirectToRoute_WithParameterRouteName_SetsResultSameRouteName()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultTemporary = controller.RedirectToRoute(routeName);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultTemporary);
+            Assert.False(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Same(routeName, resultTemporary.RouteName);
+        }
+
+        [Fact]
+        public void RedirectToRoutePreserveMethod_WithParameterRouteName_SetsResultSameRouteName()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var routeName = "CustomRouteName";
+
+            // Act;
+            var resultTemporary = controller.RedirectToRoutePreserveMethod(routeName: routeName);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultTemporary);
+            Assert.True(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Same(routeName, resultTemporary.RouteName);
+        }
+
+        [Fact]
+        public void RedirectToRoutePermanent_WithParameterRouteName_SetsResultSameRouteNameAndPermanent()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultPermanent = controller.RedirectToRoutePermanent(routeName);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultPermanent);
+            Assert.False(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Same(routeName, resultPermanent.RouteName);
+        }
+
+        [Fact]
+        public void RedirectToRoutePermanentPreserveMethod_WithParameterRouteName_SetsResultSameRouteNameAndPermanent()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultPermanent = controller.RedirectToRoutePermanentPreserveMethod(routeName: routeName);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Same(routeName, resultPermanent.RouteName);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoute_WithParameterRouteNameAndRouteValues_SetsResultSameRouteNameAndRouteValues(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var controller = new TestableController();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultTemporary = controller.RedirectToRoute(routeName, routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultTemporary);
+            Assert.False(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Same(routeName, resultTemporary.RouteName);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePreserveMethod_WithParameterRouteNameAndRouteValues_SetsResultSameRouteNameAndRouteValues(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var controller = new TestableController();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultTemporary = controller.RedirectToRoutePreserveMethod(routeName: routeName, routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultTemporary);
+            Assert.True(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Same(routeName, resultTemporary.RouteName);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePermanent_WithParameterRouteNameAndRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var controller = new TestableController();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultPermanent = controller.RedirectToRoutePermanent(routeName, routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultPermanent);
+            Assert.False(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Same(routeName, resultPermanent.RouteName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Fact]
+        public void RedirectToPage_WithPageName()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var pageName = "/Page";
+
+            // Act
+            var result = controller.RedirectToPage(pageName);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+        }
+
+        [Fact]
+        public void RedirectToPage_WithPageNameAndHandler()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var pageName = "/Page-Name";
+            var pageHandler = "page-handler";
+
+            // Act
+            var result = controller.RedirectToPage(pageName, pageHandler);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Equal(pageHandler, result.PageHandler);
+        }
+
+        [Fact]
+        public void RedirectToPage_WithPageNameAndRouteValues()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var pageName = "/Page-Name";
+            var routeVaues = new { key = "value" };
+
+            // Act
+            var result = controller.RedirectToPage(pageName, routeVaues);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Collection(
+                result.RouteValues,
+                item =>
+                {
+                    Assert.Equal("key", item.Key);
+                    Assert.Equal("value", item.Value);
+                });
+        }
+
+        [Fact]
+        public void RedirectToPage_WithPageNameHandlerAndFragment()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var pageName = "/Page-Name";
+            var pageHandler = "page-handler";
+            var fragment = "fragment";
+
+            // Act
+            var result = controller.RedirectToPage(pageName, pageHandler, fragment);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Equal(pageHandler, result.PageHandler);
+            Assert.Equal(fragment, result.Fragment);
+        }
+
+        [Fact]
+        public void RedirectToPage_WithPageNameRouteValuesHandlerAndFragment()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var pageName = "/Page-Name";
+            var pageHandler = "page-handler";
+            var fragment = "fragment";
+            var routeValues = new { key = "value" };
+
+            // Act
+            var result = controller.RedirectToPage(pageName, pageHandler, routeValues, fragment);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Equal(pageHandler, result.PageHandler);
+            Assert.Collection(
+                result.RouteValues,
+                item =>
+                {
+                    Assert.Equal("key", item.Key);
+                    Assert.Equal("value", item.Value);
+                });
+            Assert.Equal(fragment, result.Fragment);
+        }
+
+        [Fact]
+        public void RedirectToPagePermanent_WithPageName()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var pageName = "/Page-Name";
+
+            // Act
+            var result = controller.RedirectToPagePermanent(pageName);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.True(result.Permanent);
+        }
+
+        [Fact]
+        public void RedirectToPagePermanent_WithPageNameAndPageHandler()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var pageName = "/Page-Name";
+            var pageHandler = "page-handler";
+
+            // Act
+            var result = controller.RedirectToPagePermanent(pageName, pageHandler);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Equal(pageHandler, result.PageHandler);
+            Assert.True(result.Permanent);
+        }
+
+        [Fact]
+        public void RedirectToPagePermanent_WithPageNameAndRouteValues()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var pageName = "/Page-Name";
+            var routeValues = new { key = "value" };
+
+            // Act
+            var result = controller.RedirectToPagePermanent(pageName, routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Collection(
+                result.RouteValues,
+                item =>
+                {
+                    Assert.Equal("key", item.Key);
+                    Assert.Equal("value", item.Value);
+                });
+            Assert.True(result.Permanent);
+        }
+
+        [Fact]
+        public void RedirectToPagePermanent_WithPageNamePageHandlerAndFragment()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var pageName = "/Page-Name";
+            var pageHandler = "page-handler";
+            var fragment = "fragment";
+
+            // Act
+            var result = controller.RedirectToPagePermanent(pageName, pageHandler, fragment);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Equal(pageHandler, result.PageHandler);
+            Assert.Equal(fragment, result.Fragment);
+            Assert.True(result.Permanent);
+        }
+
+        [Fact]
+        public void RedirectToPagePermanent_WithPageNamePageHandlerRouteValuesAndFragment()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var pageName = "/Page-Name";
+            var pageHandler = "page-handler";
+            var routeValues = new { key = "value" };
+            var fragment = "fragment";
+
+            // Act
+            var result = controller.RedirectToPagePermanent(pageName, pageHandler, routeValues, fragment);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Equal(pageHandler, result.PageHandler);
+            Assert.Collection(
+                result.RouteValues,
+                item =>
+                {
+                    Assert.Equal("key", item.Key);
+                    Assert.Equal("value", item.Value);
+                });
+            Assert.Equal(fragment, result.Fragment);
+            Assert.True(result.Permanent);
+        }
+
+        [Fact]
+        public void RedirectToPagePreserveMethod_WithParameterUrl_SetsRedirectResultPreserveMethod()
+        {
+            // Arrange
+            var pageModel = new TestableController();
+            var url = "/test/url";
+
+            // Act
+            var result = pageModel.RedirectToPagePreserveMethod(url);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Same(url, result.PageName);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToPagePreserveMethod_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestableController();
+            var pageName = "CustomRouteName";
+
+            // Act
+            var resultPermanent = pageModel.RedirectToPagePreserveMethod(pageName, routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.False(resultPermanent.Permanent);
+            Assert.Same(pageName, resultPermanent.PageName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToPagePermanentPreserveMethod_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestableController();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultPermanent = pageModel.RedirectToPagePermanentPreserveMethod(routeName, routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Same(routeName, resultPermanent.PageName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePermanentPreserveMethod_WithParameterRouteNameAndRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var controller = new TestableController();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultPermanent = controller.RedirectToRoutePermanentPreserveMethod(routeName: routeName, routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Same(routeName, resultPermanent.RouteName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Fact]
+        public void Created_WithStringParameter_SetsCreatedLocation()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var uri = "http://test/url";
+
+            // Act
+            var result = controller.Created(uri, null);
+
+            // Assert
+            Assert.IsType<CreatedResult>(result);
+            Assert.Equal(StatusCodes.Status201Created, result.StatusCode);
+            Assert.Same(uri, result.Location);
+        }
+
+        [Fact]
+        public void Created_WithAbsoluteUriParameter_SetsCreatedLocation()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var uri = new Uri("http://test/url");
+
+            // Act
+            var result = controller.Created(uri, null);
+
+            // Assert
+            Assert.IsType<CreatedResult>(result);
+            Assert.Equal(StatusCodes.Status201Created, result.StatusCode);
+            Assert.Equal(uri.OriginalString, result.Location);
+        }
+
+        [Fact]
+        public void Created_WithRelativeUriParameter_SetsCreatedLocation()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var uri = new Uri("/test/url", UriKind.Relative);
+
+            // Act
+            var result = controller.Created(uri, null);
+
+            // Assert
+            Assert.IsType<CreatedResult>(result);
+            Assert.Equal(StatusCodes.Status201Created, result.StatusCode);
+            Assert.Equal(uri.OriginalString, result.Location);
+        }
+
+        [Fact]
+        public void CreatedAtAction_WithParameterActionName_SetsResultActionName()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var result = controller.CreatedAtAction("SampleAction", null);
+
+            // Assert
+            Assert.IsType<CreatedAtActionResult>(result);
+            Assert.Equal(StatusCodes.Status201Created, result.StatusCode);
+            Assert.Equal("SampleAction", result.ActionName);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        [InlineData("SampleController")]
+        public void CreatedAtAction_WithActionControllerAndNullRouteValue_SetsSameValue(
+            string controllerName)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var result = controller.CreatedAtAction("SampleAction", controllerName, null, null);
+
+            // Assert
+            Assert.IsType<CreatedAtActionResult>(result);
+            Assert.Equal(StatusCodes.Status201Created, result.StatusCode);
+            Assert.Equal("SampleAction", result.ActionName);
+            Assert.Equal(controllerName, result.ControllerName);
+        }
+
+        [Fact]
+        public void CreatedAtAction_WithActionControllerRouteValues_SetsSameValues()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var expected = new Dictionary<string, object>
+                {
+                    { "test", "case" },
+                    { "sample", "route" },
+                };
+
+            // Act
+            var result = controller.CreatedAtAction(
+                "SampleAction",
+                "SampleController",
+                new RouteValueDictionary(expected), null);
+
+            // Assert
+            Assert.IsType<CreatedAtActionResult>(result);
+            Assert.Equal(StatusCodes.Status201Created, result.StatusCode);
+            Assert.Equal("SampleAction", result.ActionName);
+            Assert.Equal("SampleController", result.ControllerName);
+            Assert.Equal(expected, result.RouteValues);
+        }
+
+        [Fact]
+        public void CreatedAtRoute_WithParameterRouteName_SetsResultSameRouteName()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var routeName = "SampleRoute";
+
+            // Act
+            var result = controller.CreatedAtRoute(routeName, null);
+
+            // Assert
+            Assert.IsType<CreatedAtRouteResult>(result);
+            Assert.Same(routeName, result.RouteName);
+        }
+
+        [Fact]
+        public void CreatedAtRoute_WithParameterRouteValues_SetsResultSameRouteValues()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var expected = new Dictionary<string, object>
+                {
+                    { "test", "case" },
+                    { "sample", "route" },
+                };
+
+            // Act
+            var result = controller.CreatedAtRoute(new RouteValueDictionary(expected), null);
+
+            // Assert
+            Assert.IsType<CreatedAtRouteResult>(result);
+            Assert.Equal(StatusCodes.Status201Created, result.StatusCode);
+            Assert.Equal(expected, result.RouteValues);
+        }
+
+        [Fact]
+        public void CreatedAtRoute_WithParameterRouteNameAndValues_SetsResultSameProperties()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var routeName = "SampleRoute";
+            var expected = new Dictionary<string, object>
+                {
+                    { "test", "case" },
+                    { "sample", "route" },
+                };
+
+            // Act
+            var result = controller.CreatedAtRoute(routeName, new RouteValueDictionary(expected), null);
+
+            // Assert
+            Assert.IsType<CreatedAtRouteResult>(result);
+            Assert.Equal(StatusCodes.Status201Created, result.StatusCode);
+            Assert.Same(routeName, result.RouteName);
+            Assert.Equal(expected, result.RouteValues);
+        }
+
+        [Fact]
+        public void Accepted_SetsStatusCode()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var result = controller.Accepted();
+
+            // Assert
+            Assert.IsType<AcceptedResult>(result);
+            Assert.Equal(StatusCodes.Status202Accepted, result.StatusCode);
+        }
+
+        [Fact]
+        public void Accepted_SetsValue()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var value = new object();
+
+            // Act
+            var result = controller.Accepted(value);
+
+            // Assert
+            Assert.IsType<AcceptedResult>(result);
+            Assert.Equal(StatusCodes.Status202Accepted, result.StatusCode);
+            Assert.Same(value, result.Value);
+        }
+
+        [Fact]
+        public void Accepted_StringUri_SetsAcceptedLocation()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var uri = "http://test/url";
+
+            // Act
+            var result = controller.Accepted(uri);
+
+            // Assert
+            Assert.IsType<AcceptedResult>(result);
+            Assert.Equal(StatusCodes.Status202Accepted, result.StatusCode);
+            Assert.Same(uri, result.Location);
+        }
+
+        [Fact]
+        public void Accepted_AbsoluteUri_SetsAcceptedLocation()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var uri = new Uri("http://test/url");
+
+            // Act
+            var result = controller.Accepted(uri);
+
+            // Assert
+            Assert.IsType<AcceptedResult>(result);
+            Assert.Equal(StatusCodes.Status202Accepted, result.StatusCode);
+            Assert.Equal(uri.OriginalString, result.Location);
+        }
+
+        [Fact]
+        public void Accepted_RelativeUri_SetsAcceptedLocation()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var uri = new Uri("/test/url", UriKind.Relative);
+
+            // Act
+            var result = controller.Accepted(uri);
+
+            // Assert
+            Assert.IsType<AcceptedResult>(result);
+            Assert.Equal(StatusCodes.Status202Accepted, result.StatusCode);
+            Assert.Equal(uri.OriginalString, result.Location);
+        }
+
+        [Fact]
+        public void AcceptedAtAction_SetsActionName()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var result = controller.AcceptedAtAction("SampleAction");
+
+            // Assert
+            Assert.IsType<AcceptedAtActionResult>(result);
+            Assert.Equal(StatusCodes.Status202Accepted, result.StatusCode);
+            Assert.Equal("SampleAction", result.ActionName);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        [InlineData("SampleController")]
+        public void AcceptedAtAction_SetsActionController(string controllerName)
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var result = controller.AcceptedAtAction("SampleAction", controllerName);
+
+            // Assert
+            Assert.IsType<AcceptedAtActionResult>(result);
+            Assert.Equal(StatusCodes.Status202Accepted, result.StatusCode);
+            Assert.Equal("SampleAction", result.ActionName);
+            Assert.Equal(controllerName, result.ControllerName);
+        }
+
+        [Fact]
+        public void AcceptedAtAction_SetsActionControllerRouteValues()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var expected = new Dictionary<string, object>
+            {
+                { "test", "case" },
+                { "sample", "route" },
+            };
+
+            // Act
+            var result = controller.AcceptedAtAction(
+                "SampleAction",
+                "SampleController",
+                new RouteValueDictionary(expected));
+
+            // Assert
+            Assert.IsType<AcceptedAtActionResult>(result);
+            Assert.Equal(StatusCodes.Status202Accepted, result.StatusCode);
+            Assert.Equal("SampleAction", result.ActionName);
+            Assert.Equal("SampleController", result.ControllerName);
+            Assert.Equal(expected, result.RouteValues);
+        }
+
+        [Fact]
+        public void AcceptedAtRoute_SetsRouteValues()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var expected = new Dictionary<string, object>
+            {
+                { "test", "case" },
+                { "sample", "route" },
+            };
+
+            // Act
+            var result = controller.AcceptedAtRoute(new RouteValueDictionary(expected));
+
+            // Assert
+            Assert.IsType<AcceptedAtRouteResult>(result);
+            Assert.Equal(StatusCodes.Status202Accepted, result.StatusCode);
+            Assert.Equal(expected, result.RouteValues);
+        }
+
+        [Fact]
+        public void AcceptedAtRoute_SetsRouteNameAndValues()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var routeName = "SampleRoute";
+            var expected = new Dictionary<string, object>
+            {
+                { "test", "case" },
+                { "sample", "route" },
+            };
+
+            // Act
+            var result = controller.AcceptedAtRoute(routeName, new RouteValueDictionary(expected));
+
+            // Assert
+            Assert.IsType<AcceptedAtRouteResult>(result);
+            Assert.Equal(StatusCodes.Status202Accepted, result.StatusCode);
+            Assert.Same(routeName, result.RouteName);
+            Assert.Equal(expected, result.RouteValues);
+        }
+
+        [Fact]
+        public void File_WithContents()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var fileContents = new byte[0];
+
+            // Act
+            var result = controller.File(fileContents, "application/pdf");
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Same(fileContents, result.FileContents);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal(string.Empty, result.FileDownloadName);
+            Assert.False(result.EnableRangeProcessing);
+        }
+
+        [Fact]
+        public void File_WithContents_EnableRangeProcessing()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var fileContents = new byte[0];
+
+            // Act
+            var result = controller.File(fileContents, "application/pdf", true);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Same(fileContents, result.FileContents);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal(string.Empty, result.FileDownloadName);
+            Assert.True(result.EnableRangeProcessing);
+        }
+
+        [Theory]
+        [InlineData(null, null, false)]
+        [InlineData(null, "\"Etag\"", false)]
+        [InlineData("05/01/2008 +1:00", null, true)]
+        [InlineData("05/01/2008 +1:00", "\"Etag\"", true)]
+        public void File_WithContents_LastModifiedAndEtag(string lastModifiedString, string entityTagString, bool enableRangeProcessing)
+        {
+            // Arrange
+            var controller = new TestableController();
+            var fileContents = new byte[0];
+            var lastModified = (lastModifiedString == null) ? (DateTimeOffset?)null : DateTimeOffset.Parse(lastModifiedString);
+            var entityTag = (entityTagString == null) ? null : new EntityTagHeaderValue(entityTagString);
+
+            // Act
+            var result = controller.File(fileContents, "application/pdf", lastModified, entityTag, enableRangeProcessing);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Same(fileContents, result.FileContents);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal(string.Empty, result.FileDownloadName);
+            Assert.Equal(lastModified, result.LastModified);
+            Assert.Equal(entityTag, result.EntityTag);
+            Assert.Equal(enableRangeProcessing, result.EnableRangeProcessing);
+        }
+
+        [Fact]
+        public void File_WithContentsAndFileDownloadName()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var fileContents = new byte[0];
+
+            // Act
+            var result = controller.File(fileContents, "application/pdf", "someDownloadName");
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Same(fileContents, result.FileContents);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal("someDownloadName", result.FileDownloadName);
+            Assert.False(result.EnableRangeProcessing);
+        }
+
+        [Theory]
+        [InlineData(null, null, false)]
+        [InlineData(null, "\"Etag\"", false)]
+        [InlineData("05/01/2008 +1:00", null, true)]
+        [InlineData("05/01/2008 +1:00", "\"Etag\"", true)]
+        public void File_WithContentsAndFileDownloadName_LastModifiedAndEtag(string lastModifiedString, string entityTagString, bool enableRangeProcessing)
+        {
+            // Arrange
+            var controller = new TestableController();
+            var fileContents = new byte[0];
+            var lastModified = (lastModifiedString == null) ? (DateTimeOffset?)null : DateTimeOffset.Parse(lastModifiedString);
+            var entityTag = (entityTagString == null) ? null : new EntityTagHeaderValue(entityTagString);
+
+            // Act
+            var result = controller.File(fileContents, "application/pdf", "someDownloadName", lastModified, entityTag, enableRangeProcessing);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Same(fileContents, result.FileContents);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal("someDownloadName", result.FileDownloadName);
+            Assert.Equal(lastModified, result.LastModified);
+            Assert.Equal(entityTag, result.EntityTag);
+            Assert.Equal(enableRangeProcessing, result.EnableRangeProcessing);
+        }
+
+        [Fact]
+        public void File_WithPath()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var path = Path.GetFullPath("somepath");
+
+            // Act
+            var result = controller.File(path, "application/pdf");
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Equal(path, result.FileName);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal(string.Empty, result.FileDownloadName);
+            Assert.False(result.EnableRangeProcessing);
+        }
+
+        [Theory]
+        [InlineData(null, null, false)]
+        [InlineData(null, "\"Etag\"", false)]
+        [InlineData("05/01/2008 +1:00", null, true)]
+        [InlineData("05/01/2008 +1:00", "\"Etag\"", true)]
+        public void File_WithPath_LastModifiedAndEtag(string lastModifiedString, string entityTagString, bool enableRangeProcessing)
+        {
+            // Arrange
+            var controller = new TestableController();
+            var path = Path.GetFullPath("somepath");
+            var lastModified = (lastModifiedString == null) ? (DateTimeOffset?)null : DateTimeOffset.Parse(lastModifiedString);
+            var entityTag = (entityTagString == null) ? null : new EntityTagHeaderValue(entityTagString);
+
+            // Act
+            var result = controller.File(path, "application/pdf", lastModified, entityTag, enableRangeProcessing);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Equal(path, result.FileName);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal(string.Empty, result.FileDownloadName);
+            Assert.Equal(lastModified, result.LastModified);
+            Assert.Equal(entityTag, result.EntityTag);
+            Assert.Equal(enableRangeProcessing, result.EnableRangeProcessing);
+        }
+
+        [Fact]
+        public void File_WithPathAndFileDownloadName()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var path = Path.GetFullPath("somepath");
+
+            // Act
+            var result = controller.File(path, "application/pdf", "someDownloadName");
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Equal(path, result.FileName);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal("someDownloadName", result.FileDownloadName);
+            Assert.False(result.EnableRangeProcessing);
+        }
+
+        [Theory]
+        [InlineData(null, null, false)]
+        [InlineData(null, "\"Etag\"", false)]
+        [InlineData("05/01/2008 +1:00", null, true)]
+        [InlineData("05/01/2008 +1:00", "\"Etag\"", true)]
+        public void File_WithPathAndFileDownloadName_LastModifiedAndEtag(string lastModifiedString, string entityTagString, bool enableRangeProcessing)
+        {
+            // Arrange
+            var controller = new TestableController();
+            var path = Path.GetFullPath("somepath");
+            var lastModified = (lastModifiedString == null) ? (DateTimeOffset?)null : DateTimeOffset.Parse(lastModifiedString);
+            var entityTag = (entityTagString == null) ? null : new EntityTagHeaderValue(entityTagString);
+
+            // Act
+            var result = controller.File(path, "application/pdf", "someDownloadName", lastModified, entityTag, enableRangeProcessing);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Equal(path, result.FileName);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal("someDownloadName", result.FileDownloadName);
+            Assert.Equal(lastModified, result.LastModified);
+            Assert.Equal(entityTag, result.EntityTag);
+            Assert.Equal(enableRangeProcessing, result.EnableRangeProcessing);
+        }
+
+        [Fact]
+        public void File_WithStream()
+        {
+            // Arrange
+            var mockHttpContext = new Mock<HttpContext>();
+            mockHttpContext.Setup(x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()));
+
+            var controller = new TestableController();
+            controller.ControllerContext.HttpContext = mockHttpContext.Object;
+
+            var fileStream = Stream.Null;
+
+            // Act
+            var result = controller.File(fileStream, "application/pdf");
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Same(fileStream, result.FileStream);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal(string.Empty, result.FileDownloadName);
+            Assert.False(result.EnableRangeProcessing);
+        }
+
+        [Theory]
+        [InlineData(null, null, false)]
+        [InlineData(null, "\"Etag\"", false)]
+        [InlineData("05/01/2008 +1:00", null, true)]
+        [InlineData("05/01/2008 +1:00", "\"Etag\"", true)]
+        public void File_WithStream_LastModifiedAndEtag(string lastModifiedString, string entityTagString, bool enableRangeProcessing)
+        {
+            // Arrange
+            var mockHttpContext = new Mock<HttpContext>();
+            mockHttpContext.Setup(x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()));
+
+            var controller = new TestableController();
+            controller.ControllerContext.HttpContext = mockHttpContext.Object;
+
+            var fileStream = Stream.Null;
+            var lastModified = (lastModifiedString == null) ? (DateTimeOffset?)null : DateTimeOffset.Parse(lastModifiedString);
+            var entityTag = (entityTagString == null) ? null : new EntityTagHeaderValue(entityTagString);
+
+            // Act
+            var result = controller.File(fileStream, "application/pdf", lastModified, entityTag, enableRangeProcessing);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Same(fileStream, result.FileStream);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal(string.Empty, result.FileDownloadName);
+            Assert.Equal(lastModified, result.LastModified);
+            Assert.Equal(entityTag, result.EntityTag);
+            Assert.Equal(enableRangeProcessing, result.EnableRangeProcessing);
+        }
+
+        [Fact]
+        public void File_WithStreamAndFileDownloadName()
+        {
+            // Arrange
+            var mockHttpContext = new Mock<HttpContext>();
+
+            var controller = new TestableController();
+            controller.ControllerContext.HttpContext = mockHttpContext.Object;
+
+            var fileStream = Stream.Null;
+
+            // Act
+            var result = controller.File(fileStream, "application/pdf", "someDownloadName");
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Same(fileStream, result.FileStream);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal("someDownloadName", result.FileDownloadName);
+            Assert.False(result.EnableRangeProcessing);
+        }
+
+        [Theory]
+        [InlineData(null, null, false)]
+        [InlineData(null, "\"Etag\"", false)]
+        [InlineData("05/01/2008 +1:00", null, true)]
+        [InlineData("05/01/2008 +1:00", "\"Etag\"", true)]
+        public void File_WithStreamAndFileDownloadName_LastModifiedAndEtag(string lastModifiedString, string entityTagString, bool enableRangeProcessing)
+        {
+            // Arrange
+            var mockHttpContext = new Mock<HttpContext>();
+
+            var controller = new TestableController();
+            controller.ControllerContext.HttpContext = mockHttpContext.Object;
+
+            var fileStream = Stream.Null;
+            var lastModified = (lastModifiedString == null) ? (DateTimeOffset?)null : DateTimeOffset.Parse(lastModifiedString);
+            var entityTag = (entityTagString == null) ? null : new EntityTagHeaderValue(entityTagString);
+
+            // Act
+            var result = controller.File(fileStream, "application/pdf", "someDownloadName", lastModified, entityTag, enableRangeProcessing);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Same(fileStream, result.FileStream);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal("someDownloadName", result.FileDownloadName);
+            Assert.Equal(lastModified, result.LastModified);
+            Assert.Equal(entityTag, result.EntityTag);
+            Assert.Equal(enableRangeProcessing, result.EnableRangeProcessing);
+        }
+
+        [Fact]
+        public void HttpUnauthorized_SetsStatusCode()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var result = controller.Unauthorized();
+
+            // Assert
+            Assert.IsType<UnauthorizedResult>(result);
+            Assert.Equal(StatusCodes.Status401Unauthorized, result.StatusCode);
+        }
+
+        [Fact]
+        public void HttpNotFound_SetsStatusCode()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var result = controller.NotFound();
+
+            // Assert
+            Assert.IsType<NotFoundResult>(result);
+            Assert.Equal(StatusCodes.Status404NotFound, result.StatusCode);
+        }
+
+        [Fact]
+        public void HttpNotFound_SetsStatusCodeAndResponseContent()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var result = controller.NotFound("Test Content");
+
+            // Assert
+            Assert.IsType<NotFoundObjectResult>(result);
+            Assert.Equal(StatusCodes.Status404NotFound, result.StatusCode);
+            Assert.Equal("Test Content", result.Value);
+        }
+
+        [Fact]
+        public void Ok_SetsStatusCode()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var result = controller.Ok();
+
+            // Assert
+            Assert.IsType<OkResult>(result);
+            Assert.Equal(StatusCodes.Status200OK, result.StatusCode);
+        }
+
+        [Fact]
+        public void BadRequest_SetsStatusCode()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var result = controller.BadRequest();
+
+            // Assert
+            Assert.IsType<BadRequestResult>(result);
+            Assert.Equal(StatusCodes.Status400BadRequest, result.StatusCode);
+        }
+
+        [Fact]
+        public void BadRequest_SetsStatusCodeAndValue_Object()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var obj = new object();
+
+            // Act
+            var result = controller.BadRequest(obj);
+
+            // Assert
+            Assert.IsType<BadRequestObjectResult>(result);
+            Assert.Equal(StatusCodes.Status400BadRequest, result.StatusCode);
+            Assert.Equal(obj, result.Value);
+        }
+
+        [Fact]
+        public void BadRequest_SetsStatusCodeAndValue_ModelState()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var result = controller.BadRequest(new ModelStateDictionary());
+
+            // Assert
+            Assert.IsType<BadRequestObjectResult>(result);
+            Assert.Equal(StatusCodes.Status400BadRequest, result.StatusCode);
+            var errors = Assert.IsType<SerializableError>(result.Value);
+            Assert.Empty(errors);
+        }
+
+        [Fact]
+        public void UnprocessableEntity_SetsStatusCode()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var result = controller.UnprocessableEntity();
+
+            // Assert
+            Assert.IsType<UnprocessableEntityResult>(result);
+            Assert.Equal(StatusCodes.Status422UnprocessableEntity, result.StatusCode);
+        }
+
+        [Fact]
+        public void UnprocessableEntity_SetsStatusCodeAndValue_Object()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var obj = new object();
+
+            // Act
+            var result = controller.UnprocessableEntity(obj);
+
+            // Assert
+            Assert.IsType<UnprocessableEntityObjectResult>(result);
+            Assert.Equal(StatusCodes.Status422UnprocessableEntity, result.StatusCode);
+            Assert.Equal(obj, result.Value);
+        }
+
+        [Fact]
+        public void UnprocessableEntity_SetsStatusCodeAndValue_ModelState()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var result = controller.UnprocessableEntity(new ModelStateDictionary());
+
+            // Assert
+            Assert.IsType<UnprocessableEntityObjectResult>(result);
+            Assert.Equal(StatusCodes.Status422UnprocessableEntity, result.StatusCode);
+            var errors = Assert.IsType<SerializableError>(result.Value);
+            Assert.Empty(errors);
+        }
+
+        [Fact]
+        public void Conflict_SetsStatusCode()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var obj = new object();
+
+            // Act
+            var result = controller.Conflict();
+
+            // Assert
+            Assert.IsType<ConflictResult>(result);
+            Assert.Equal(StatusCodes.Status409Conflict, result.StatusCode);
+        }
+
+        [Fact]
+        public void Conflict_SetsStatusCodeAndValue_Object()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var obj = new object();
+
+            // Act
+            var result = controller.Conflict(obj);
+
+            // Assert
+            Assert.IsType<ConflictObjectResult>(result);
+            Assert.Equal(StatusCodes.Status409Conflict, result.StatusCode);
+            Assert.Equal(obj, result.Value);
+        }
+
+        [Fact]
+        public void Conflict_SetsStatusCodeAndValue_ModelState()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var result = controller.Conflict(new ModelStateDictionary());
+
+            // Assert
+            Assert.IsType<ConflictObjectResult>(result);
+            Assert.Equal(StatusCodes.Status409Conflict, result.StatusCode);
+            var errors = Assert.IsType<SerializableError>(result.Value);
+            Assert.Empty(errors);
+        }
+
+        [Theory]
+        [MemberData(nameof(PublicNormalMethodsFromControllerBase))]
+        public void NonActionAttribute_IsOnEveryPublicNormalMethodFromControllerBase(MethodInfo method)
+        {
+            // Arrange & Act & Assert
+            Assert.True(method.IsDefined(typeof(NonActionAttribute)));
+        }
+
+        [Fact]
+        public void Controller_NoContent()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var result = controller.NoContent();
+
+            // Assert
+            Assert.Equal(StatusCodes.Status204NoContent, result.StatusCode);
+        }
+
+        [Fact]
+        public void Controller_Content_WithParameterContentString_SetsResultContent()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var actualContentResult = controller.Content("TestContent");
+
+            // Assert
+            Assert.IsType<ContentResult>(actualContentResult);
+            Assert.Equal("TestContent", actualContentResult.Content);
+            Assert.Null(actualContentResult.ContentType);
+        }
+
+        [Fact]
+        public void Controller_Content_WithParameterContentStringAndContentType_SetsResultContentAndContentType()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var actualContentResult = controller.Content("TestContent", "text/plain");
+
+            // Assert
+            Assert.IsType<ContentResult>(actualContentResult);
+            Assert.Equal("TestContent", actualContentResult.Content);
+            Assert.Null(MediaType.GetEncoding(actualContentResult.ContentType));
+            Assert.Equal("text/plain", actualContentResult.ContentType.ToString());
+        }
+
+        [Fact]
+        public void Controller_Content_WithParameterContentAndTypeAndEncoding_SetsResultContentAndTypeAndEncoding()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var actualContentResult = controller.Content("TestContent", "text/plain", Encoding.UTF8);
+
+            // Assert
+            Assert.IsType<ContentResult>(actualContentResult);
+            Assert.Equal("TestContent", actualContentResult.Content);
+            Assert.Same(Encoding.UTF8, MediaType.GetEncoding(actualContentResult.ContentType));
+            Assert.Equal("text/plain; charset=utf-8", actualContentResult.ContentType.ToString());
+        }
+
+        [Fact]
+        public void Controller_Content_NoContentType_DefaultEncodingIsUsed()
+        {
+            // Arrange
+            var contentController = new ContentController();
+            var expected = MediaTypeHeaderValue.Parse("text/plain; charset=utf-8");
+
+            // Act
+            var contentResult = (ContentResult)contentController.Content_WithNoEncoding();
+
+            // Assert
+            // The default content type of ContentResult is used when the result is executed.
+            Assert.Null(contentResult.ContentType);
+        }
+
+        [Fact]
+        public void Controller_Content_InvalidCharset_DefaultEncodingIsUsed()
+        {
+            // Arrange
+            var contentController = new ContentController();
+            var contentType = "text/xml; charset=invalid; p1=p1-value";
+
+            // Act
+            var contentResult = (ContentResult)contentController.Content_WithInvalidCharset();
+
+            // Assert
+            Assert.NotNull(contentResult.ContentType);
+            Assert.Equal(contentType, contentResult.ContentType.ToString());
+            // The default encoding of ContentResult is used when this result is executed.
+            Assert.Null(MediaType.GetEncoding(contentResult.ContentType));
+        }
+
+        [Fact]
+        public void Controller_Content_CharsetAndEncodingProvided_EncodingIsUsed()
+        {
+            // Arrange
+            var contentController = new ContentController();
+            var contentType = "text/xml; charset=us-ascii; p1=p1-value";
+
+            // Act
+            var contentResult = (ContentResult)contentController.Content_WithEncodingInCharset_AndEncodingParameter();
+
+            // Assert
+            MediaTypeAssert.Equal(contentType, contentResult.ContentType);
+        }
+
+        [Fact]
+        public void Controller_Content_CharsetInContentType_IsUsedForEncoding()
+        {
+            // Arrange
+            var contentController = new ContentController();
+            var contentType = "text/xml; charset=us-ascii; p1=p1-value";
+
+            // Act
+            var contentResult = (ContentResult)contentController.Content_WithEncodingInCharset();
+
+            // Assert
+            Assert.Equal(contentType, contentResult.ContentType);
+        }
+
+        [Fact]
+        public void Controller_StatusCode_SetObject()
+        {
+            // Arrange
+            var statusCode = 204;
+            var value = new { Value = 42 };
+
+            var statusCodeController = new StatusCodeController();
+
+            // Act
+            var result = (ObjectResult)statusCodeController.StatusCode_Object(statusCode, value);
+
+            // Assert
+            Assert.Equal(statusCode, result.StatusCode);
+            Assert.Equal(value, result.Value);
+        }
+
+        [Fact]
+        public void Controller_StatusCode_SetObjectNull()
+        {
+            // Arrange
+            var statusCode = 204;
+            object value = null;
+
+            var statusCodeController = new StatusCodeController();
+
+            // Act
+            var result = statusCodeController.StatusCode_Object(statusCode, value);
+
+            // Assert
+            Assert.Equal(statusCode, result.StatusCode);
+            Assert.Equal(value, result.Value);
+        }
+
+        [Fact]
+        public void Controller_StatusCode_SetsStatusCode()
+        {
+            // Arrange
+            var statusCode = 205;
+            var statusCodeController = new StatusCodeController();
+
+            // Act
+            var result = statusCodeController.StatusCode_Int(statusCode);
+
+            // Assert
+            Assert.Equal(statusCode, result.StatusCode);
+        }
+
+        public static IEnumerable<object[]> RedirectTestData
+        {
+            get
+            {
+                yield return new object[]
+                {
+                    null,
+                    null,
+                };
+
+                yield return new object[]
+                {
+                    new Dictionary<string, object> { { "hello", "world" } },
+                    new RouteValueDictionary() { { "hello", "world" } },
+                };
+
+                var expected2 = new Dictionary<string, object>
+                {
+                    { "test", "case" },
+                    { "sample", "route" },
+                };
+
+                yield return new object[]
+                {
+                    new RouteValueDictionary(expected2),
+                    new RouteValueDictionary(expected2),
+                };
+            }
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_FallsBackOnEmptyPrefix_IfNotSpecified()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var valueProvider = Mock.Of<IValueProvider>();
+            var binder = new StubModelBinder(context =>
+            {
+                Assert.Empty(context.ModelName);
+                Assert.Same(valueProvider, Assert.IsType<CompositeValueProvider>(context.ValueProvider)[0]);
+
+                // Include and exclude should be null, resulting in property
+                // being included.
+                Assert.True(context.PropertyFilter(context.ModelMetadata.Properties["Property1"]));
+                Assert.True(context.PropertyFilter(context.ModelMetadata.Properties["Property2"]));
+            });
+
+            var controller = GetController(binder, valueProvider);
+            var model = new MyModel();
+
+            // Act
+            var result = await controller.TryUpdateModelAsync(model);
+
+            // Assert
+            Assert.NotEqual(0, binder.BindModelCount);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_UsesModelTypeNameIfSpecified()
+        {
+            // Arrange
+            var modelName = "mymodel";
+
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var valueProvider = Mock.Of<IValueProvider>();
+            var binder = new StubModelBinder(context =>
+            {
+                Assert.Same(valueProvider, Assert.IsType<CompositeValueProvider>(context.ValueProvider)[0]);
+
+                // Include and exclude should be null, resulting in property
+                // being included.
+                Assert.True(context.PropertyFilter(context.ModelMetadata.Properties["Property1"]));
+                Assert.True(context.PropertyFilter(context.ModelMetadata.Properties["Property2"]));
+            });
+
+            var controller = GetController(binder, valueProvider);
+            var model = new MyModel();
+
+            // Act
+            var result = await controller.TryUpdateModelAsync(model, modelName);
+
+            // Assert
+            Assert.NotEqual(0, binder.BindModelCount);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_UsesModelValueProviderIfSpecified()
+        {
+            // Arrange
+            var modelName = "mymodel";
+
+            var valueProvider = Mock.Of<IValueProvider>();
+            var binder = new StubModelBinder(context =>
+                  {
+                      Assert.Same(valueProvider, context.ValueProvider);
+
+                      // Include and exclude should be null, resulting in property
+                      // being included.
+                      Assert.True(context.PropertyFilter(context.ModelMetadata.Properties["Property1"]));
+                      Assert.True(context.PropertyFilter(context.ModelMetadata.Properties["Property2"]));
+                  });
+
+            var controller = GetController(binder, valueProvider: null);
+            var model = new MyModel();
+
+            // Act
+            var result = await controller.TryUpdateModelAsync(model, modelName, valueProvider);
+
+            // Assert
+            Assert.NotEqual(0, binder.BindModelCount);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_PropertyFilterOverload_UsesPassedArguments()
+        {
+            // Arrange
+            var modelName = "mymodel";
+
+            Func<ModelMetadata, bool> propertyFilter = (m) =>
+                string.Equals(m.PropertyName, "Include1", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(m.PropertyName, "Include2", StringComparison.OrdinalIgnoreCase);
+
+            var valueProvider = Mock.Of<IValueProvider>();
+            var binder = new StubModelBinder(context =>
+            {
+                Assert.Same(valueProvider, Assert.IsType<CompositeValueProvider>(context.ValueProvider)[0]);
+
+                Assert.True(context.PropertyFilter(context.ModelMetadata.Properties["Include1"]));
+                Assert.True(context.PropertyFilter(context.ModelMetadata.Properties["Include2"]));
+
+                Assert.False(context.PropertyFilter(context.ModelMetadata.Properties["Exclude1"]));
+                Assert.False(context.PropertyFilter(context.ModelMetadata.Properties["Exclude2"]));
+
+            });
+
+            var controller = GetController(binder, valueProvider);
+            var model = new MyModel();
+
+            // Act
+            await controller.TryUpdateModelAsync(model, modelName, propertyFilter);
+
+            // Assert
+            Assert.NotEqual(0, binder.BindModelCount);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_PropertyFilterWithValueProviderOverload_UsesPassedArguments()
+        {
+            // Arrange
+            var modelName = "mymodel";
+
+            Func<ModelMetadata, bool> propertyFilter = (m) =>
+                string.Equals(m.PropertyName, "Include1", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(m.PropertyName, "Include2", StringComparison.OrdinalIgnoreCase);
+
+            var valueProvider = Mock.Of<IValueProvider>();
+            var binder = new StubModelBinder(context =>
+            {
+                Assert.Same(valueProvider, context.ValueProvider);
+
+                Assert.True(context.PropertyFilter(context.ModelMetadata.Properties["Include1"]));
+                Assert.True(context.PropertyFilter(context.ModelMetadata.Properties["Include2"]));
+
+                Assert.False(context.PropertyFilter(context.ModelMetadata.Properties["Exclude1"]));
+                Assert.False(context.PropertyFilter(context.ModelMetadata.Properties["Exclude2"]));
+            });
+            var controller = GetController(binder, valueProvider: null);
+
+            var model = new MyModel();
+
+            // Act
+            await controller.TryUpdateModelAsync(model, modelName, valueProvider, propertyFilter);
+
+            // Assert
+            Assert.NotEqual(0, binder.BindModelCount);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData("prefix")]
+        public async Task TryUpdateModel_IncludeExpressionOverload_UsesPassedArguments(string prefix)
+        {
+            // Arrange
+            var valueProvider = new Mock<IValueProvider>();
+            valueProvider
+                .Setup(v => v.ContainsPrefix(prefix))
+                .Returns(true);
+
+            var binder = new StubModelBinder(context =>
+            {
+                Assert.Same(
+                    valueProvider.Object,
+                    Assert.IsType<CompositeValueProvider>(context.ValueProvider)[0]);
+
+                Assert.True(context.PropertyFilter(context.ModelMetadata.Properties["Property1"]));
+                Assert.True(context.PropertyFilter(context.ModelMetadata.Properties["Property2"]));
+
+                Assert.False(context.PropertyFilter(context.ModelMetadata.Properties["Exclude1"]));
+                Assert.False(context.PropertyFilter(context.ModelMetadata.Properties["Exclude2"]));
+            });
+
+
+            var controller = GetController(binder, valueProvider.Object);
+            var model = new MyModel();
+
+            // Act
+            await controller.TryUpdateModelAsync(model, prefix, m => m.Property1, m => m.Property2);
+
+            // Assert
+            Assert.NotEqual(0, binder.BindModelCount);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData("prefix")]
+        public async Task
+            TryUpdateModel_IncludeExpressionWithValueProviderOverload_UsesPassedArguments(string prefix)
+        {
+            // Arrange
+            var valueProvider = new Mock<IValueProvider>();
+            valueProvider
+                .Setup(v => v.ContainsPrefix(prefix))
+                .Returns(true);
+
+            var binder = new StubModelBinder(context =>
+            {
+                Assert.Same(valueProvider.Object, context.ValueProvider);
+
+                Assert.True(context.PropertyFilter(context.ModelMetadata.Properties["Property1"]));
+                Assert.True(context.PropertyFilter(context.ModelMetadata.Properties["Property2"]));
+
+                Assert.False(context.PropertyFilter(context.ModelMetadata.Properties["Exclude1"]));
+                Assert.False(context.PropertyFilter(context.ModelMetadata.Properties["Exclude2"]));
+            });
+
+            var controller = GetController(binder, valueProvider: null);
+            var model = new MyModel();
+
+            // Act
+            await controller.TryUpdateModelAsync(model, prefix, valueProvider.Object, m => m.Property1, m => m.Property2);
+
+            // Assert
+            Assert.NotEqual(0, binder.BindModelCount);
+        }
+
+        [Fact]
+        public async Task TryUpdateModelNonGeneric_PropertyFilterWithValueProviderOverload_UsesPassedArguments()
+        {
+            // Arrange
+            var modelName = "mymodel";
+
+            Func<ModelMetadata, bool> propertyFilter = (m) =>
+                string.Equals(m.PropertyName, "Include1", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(m.PropertyName, "Include2", StringComparison.OrdinalIgnoreCase);
+
+            var valueProvider = Mock.Of<IValueProvider>();
+
+            var binder = new StubModelBinder(context =>
+            {
+                Assert.Same(valueProvider, context.ValueProvider);
+
+                Assert.True(context.PropertyFilter(context.ModelMetadata.Properties["Include1"]));
+                Assert.True(context.PropertyFilter(context.ModelMetadata.Properties["Include2"]));
+
+                Assert.False(context.PropertyFilter(context.ModelMetadata.Properties["Exclude1"]));
+                Assert.False(context.PropertyFilter(context.ModelMetadata.Properties["Exclude2"]));
+            });
+
+            var controller = GetController(binder, valueProvider: null);
+
+            var model = new MyModel();
+
+            // Act
+            await controller.TryUpdateModelAsync(model, model.GetType(), modelName, valueProvider, propertyFilter);
+
+            // Assert
+            Assert.NotEqual(0, binder.BindModelCount);
+        }
+
+        [Fact]
+        public async Task TryUpdateModelNonGeneric_ModelTypeOverload_UsesPassedArguments()
+        {
+            // Arrange
+            var modelName = "mymodel";
+
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var valueProvider = Mock.Of<IValueProvider>();
+            var binder = new StubModelBinder(context =>
+            {
+                Assert.Same(valueProvider, Assert.IsType<CompositeValueProvider>(context.ValueProvider)[0]);
+
+                // Include and exclude should be null, resulting in property
+                // being included.
+                Assert.True(context.PropertyFilter(context.ModelMetadata.Properties["Property1"]));
+                Assert.True(context.PropertyFilter(context.ModelMetadata.Properties["Property2"]));
+            });
+
+            var controller = GetController(binder, valueProvider);
+            var model = new MyModel();
+
+            // Act
+            var result = await controller.TryUpdateModelAsync(model, model.GetType(), modelName);
+
+            // Assert
+            Assert.NotEqual(0, binder.BindModelCount);
+        }
+
+        [Fact]
+        public async Task TryUpdateModelNonGeneric_BindToBaseDeclaredType_ModelTypeOverload()
+        {
+            // Arrange
+            var modelName = "mymodel";
+
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var valueProvider = Mock.Of<IValueProvider>();
+            var binder = new StubModelBinder(context =>
+            {
+                Assert.Same(valueProvider, Assert.IsType<CompositeValueProvider>(context.ValueProvider)[0]);
+
+                // Include and exclude should be null, resulting in property
+                // being included.
+                Assert.True(context.PropertyFilter(context.ModelMetadata.Properties["Property1"]));
+                Assert.True(context.PropertyFilter(context.ModelMetadata.Properties["Property2"]));
+            });
+
+            var controller = GetController(binder, valueProvider);
+            MyModel model = new MyDerivedModel();
+
+            // Act
+            var result = await controller.TryUpdateModelAsync(model, model.GetType(), modelName);
+
+            // Assert
+            Assert.NotEqual(0, binder.BindModelCount);
+        }
+
+        [Fact]
+        public void ControllerExposes_RequestServices()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            var serviceProvider = Mock.Of<IServiceProvider>();
+            var httpContext = new Mock<HttpContext>();
+            httpContext.Setup(c => c.RequestServices)
+                           .Returns(serviceProvider);
+
+            controller.ControllerContext.HttpContext = httpContext.Object;
+
+            // Act
+            var innerServiceProvider = controller.HttpContext?.RequestServices;
+
+            // Assert
+            Assert.Same(serviceProvider, innerServiceProvider);
+        }
+
+        [Fact]
+        public void ControllerExposes_Request()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            var request = Mock.Of<HttpRequest>();
+            var httpContext = new Mock<HttpContext>();
+            httpContext.Setup(c => c.Request)
+                           .Returns(request);
+
+            controller.ControllerContext.HttpContext = httpContext.Object;
+
+            // Act
+            var innerRequest = controller.Request;
+
+            // Assert
+            Assert.Same(request, innerRequest);
+        }
+
+        [Fact]
+        public void ControllerExposes_Response()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            var response = Mock.Of<HttpResponse>();
+            var httpContext = new Mock<HttpContext>();
+            httpContext.Setup(c => c.Response)
+                           .Returns(response);
+
+            controller.ControllerContext.HttpContext = httpContext.Object;
+
+            // Act
+            var innerResponse = controller.Response;
+
+            // Assert
+            Assert.Same(response, innerResponse);
+        }
+
+        [Fact]
+        public void ControllerExposes_RouteData()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            var routeData = Mock.Of<RouteData>();
+            controller.ControllerContext.RouteData = routeData;
+
+            // Act
+            var innerRouteData = controller.RouteData;
+
+            // Assert
+            Assert.Same(routeData, innerRouteData);
+        }
+
+        [Fact]
+        public void TryValidateModelWithValidModel_ReturnsTrue()
+        {
+            // Arrange
+            var binder = new StubModelBinder();
+            var controller = GetController(binder, valueProvider: null);
+            controller.ObjectValidator = new DefaultObjectValidator(
+                controller.MetadataProvider,
+                new[] { Mock.Of<IModelValidatorProvider>() });
+
+            var model = new TryValidateModelModel();
+
+            // Act
+            var result = controller.TryValidateModel(model);
+
+            // Assert
+            Assert.True(result);
+            Assert.True(controller.ModelState.IsValid);
+        }
+
+        [Fact]
+        public void TryValidateModelWithInvalidModelWithPrefix_ReturnsFalse()
+        {
+            // Arrange
+            var model = new TryValidateModelModel();
+            var validationResult = new[]
+            {
+                new ModelValidationResult(string.Empty, "Out of range!")
+            };
+
+            var validator = new Mock<IModelValidator>();
+            validator.Setup(v => v.Validate(It.IsAny<ModelValidationContext>()))
+                .Returns(validationResult);
+            var validator1 = new ValidatorItem(validator.Object);
+            validator1.Validator = validator.Object;
+
+            var provider = new Mock<IModelValidatorProvider>();
+            provider.Setup(v => v.CreateValidators(It.IsAny<ModelValidatorProviderContext>()))
+                .Callback<ModelValidatorProviderContext>(c => c.Results.Add(validator1));
+
+            var binder = new StubModelBinder();
+            var controller = GetController(binder, valueProvider: null);
+            controller.ObjectValidator = new DefaultObjectValidator(
+                controller.MetadataProvider,
+                new[] { provider.Object });
+
+            // Act
+            var result = controller.TryValidateModel(model, "Prefix");
+
+            // Assert
+            Assert.False(result);
+            Assert.Single(controller.ModelState);
+            var error = Assert.Single(controller.ModelState["Prefix.IntegerProperty"].Errors);
+            Assert.Equal("Out of range!", error.ErrorMessage);
+        }
+
+        [Fact]
+        public void TryValidateModelWithInvalidModelNoPrefix_ReturnsFalse()
+        {
+            // Arrange
+            var model = new TryValidateModelModel();
+            var validationResult = new[]
+            {
+                new ModelValidationResult(string.Empty, "Out of range!")
+            };
+
+            var validator = new Mock<IModelValidator>();
+            validator.Setup(v => v.Validate(It.IsAny<ModelValidationContext>()))
+                .Returns(validationResult);
+            var validator1 = new ValidatorItem(validator.Object);
+            validator1.Validator = validator.Object;
+
+            var provider = new Mock<IModelValidatorProvider>();
+            provider.Setup(v => v.CreateValidators(It.IsAny<ModelValidatorProviderContext>()))
+                .Callback<ModelValidatorProviderContext>(c => c.Results.Add(validator1));
+
+            var binder = new StubModelBinder();
+            var controller = GetController(binder, valueProvider: null);
+            controller.ObjectValidator = new DefaultObjectValidator(
+                controller.MetadataProvider,
+                new[] { provider.Object });
+
+            // Act
+            var result = controller.TryValidateModel(model);
+
+            // Assert
+            Assert.False(result);
+            Assert.Single(controller.ModelState);
+            var error = Assert.Single(controller.ModelState["IntegerProperty"].Errors);
+            Assert.Equal("Out of range!", error.ErrorMessage);
+        }
+
+        [Fact]
+        public void TryValidateModel_Succeeds_WithoutValidatorMetadata()
+        {
+            // Arrange
+            // Do not add a Mock validator provider to this test. Test is intended to demonstrate ease of unit testing
+            // and exercise DataAnnotationsModelValidatorProvider, avoiding #3586 regressions.
+            var model = new TryValidateModelModel();
+            var controller = GetController(binder: null, valueProvider: null);
+
+            // Act
+            var result = controller.TryValidateModel(model);
+
+            // Assert
+            Assert.True(controller.ModelState.IsValid);
+        }
+
+        [Fact]
+        public void RedirectToPage_WithPageName_Handler_AndRouteValues()
+        {
+            // Arrange
+            var controller = new TestableController();
+
+            // Act
+            var result = controller.RedirectToPage("page", "handler", new { test = "value" });
+
+            // Assert
+            Assert.Equal("page", result.PageName);
+            Assert.Equal("handler", result.PageHandler);
+            Assert.Collection(result.RouteValues,
+                item =>
+                {
+                    Assert.Equal("test", item.Key);
+                    Assert.Equal("value", item.Value);
+                });
+        }
+
+        private static ControllerBase GetController(IModelBinder binder, IValueProvider valueProvider)
+        {
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var services = new ServiceCollection();
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+
+            var httpContext = new DefaultHttpContext()
+            {
+                RequestServices = services.BuildServiceProvider()
+            };
+
+            var validatorProviders = new[]
+            {
+                new DataAnnotationsModelValidatorProvider(
+                    new ValidationAttributeAdapterProvider(),
+                    Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                    stringLocalizerFactory: null),
+            };
+
+            valueProvider = valueProvider ?? new SimpleValueProvider();
+            var controllerContext = new ControllerContext()
+            {
+                HttpContext = httpContext,
+                ValueProviderFactories = new[] { new SimpleValueProviderFactory(valueProvider), },
+            };
+
+            var binderFactory = new Mock<IModelBinderFactory>();
+            binderFactory
+                .Setup(f => f.CreateBinder(It.IsAny<ModelBinderFactoryContext>()))
+                .Returns(binder);
+
+            var controller = new TestableController()
+            {
+                ControllerContext = controllerContext,
+                MetadataProvider = metadataProvider,
+                ModelBinderFactory = binderFactory.Object,
+                ObjectValidator = new DefaultObjectValidator(metadataProvider, validatorProviders),
+            };
+
+            return controller;
+        }
+
+        private class MyModel
+        {
+            public string Property1 { get; set; }
+            public string Property2 { get; set; }
+
+            public string Include1 { get; set; }
+            public string Include2 { get; set; }
+
+            public string Exclude1 { get; set; }
+            public string Exclude2 { get; set; }
+        }
+
+        private class MyDerivedModel : MyModel
+        {
+            public string Property3 { get; set; }
+        }
+
+        private class TryValidateModelModel
+        {
+            public int IntegerProperty { get; set; }
+        }
+
+
+        private class TestableController : ControllerBase
+        {
+        }
+
+        private class DisposableObject : IDisposable
+        {
+            public void Dispose()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class StatusCodeController : ControllerBase
+        {
+            public StatusCodeResult StatusCode_Int(int statusCode)
+            {
+                return StatusCode(statusCode);
+            }
+
+            public ObjectResult StatusCode_Object(int statusCode, object value)
+            {
+                return StatusCode(statusCode, value);
+            }
+        }
+
+        private class ContentController : ControllerBase
+        {
+            public IActionResult Content_WithNoEncoding()
+            {
+                return Content("Hello!!");
+            }
+
+            public IActionResult Content_WithEncodingInCharset()
+            {
+                return Content("Hello!!", "text/xml; charset=us-ascii; p1=p1-value");
+            }
+
+            public IActionResult Content_WithInvalidCharset()
+            {
+                return Content("Hello!!", "text/xml; charset=invalid; p1=p1-value");
+            }
+
+            public IActionResult Content_WithEncodingInCharset_AndEncodingParameter()
+            {
+                return Content("Hello!!", "text/xml; charset=invalid; p1=p1-value", Encoding.ASCII);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerActivatorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerActivatorProviderTest.cs
new file mode 100644
index 0000000000..0f224078b2
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerActivatorProviderTest.cs
@@ -0,0 +1,157 @@
+// 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.
+
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Controllers
+{
+    public class ControllerActivatorProviderTest
+    {
+        [Fact]
+        public void CreateActivator_InvokesIControllerActivator_IfItIsNotDefaultControllerActivator()
+        {
+            // Arrange
+            var expected = new object();
+            var activator = new Mock<IControllerActivator>();
+            activator.Setup(a => a.Create(It.IsAny<ControllerContext>()))
+                .Returns(expected)
+                .Verifiable();
+            var activatorProvider = new ControllerActivatorProvider(activator.Object);
+            var descriptor = new ControllerActionDescriptor
+            {
+                ControllerTypeInfo = typeof(object).GetTypeInfo(),
+            };
+
+            // Act
+            var activatorDelegate = activatorProvider.CreateActivator(descriptor);
+            var result = activatorDelegate(new ControllerContext());
+
+            // Assert
+            Assert.Same(expected, result);
+            activator.Verify();
+        }
+
+        [Fact]
+        public void CreateActivator_ActivatesControllerInstance()
+        {
+            // Arrange
+            var expected = new TestService();
+            var activator = new DefaultControllerActivator(Mock.Of<ITypeActivatorCache>());
+            var activatorProvider = new ControllerActivatorProvider(activator);
+            var descriptor = new ControllerActionDescriptor
+            {
+                ControllerTypeInfo = typeof(TestController).GetTypeInfo(),
+            };
+            var serviceProvider = new ServiceCollection()
+                .AddSingleton(expected)
+                .BuildServiceProvider();
+            var context = new ControllerContext
+            {
+                HttpContext = new DefaultHttpContext
+                {
+                    RequestServices = serviceProvider,
+                },
+            };
+
+            // Act
+            var activatorDelegate = activatorProvider.CreateActivator(descriptor);
+            var result = activatorDelegate(context);
+
+            // Assert
+            var actual = Assert.IsType<TestController>(result);
+            Assert.Same(expected, actual.TestService);
+        }
+
+        [Fact]
+        public void CreateReleaser_InvokesIControllerActivator_IfItIsNotDefaultControllerActivator()
+        {
+            // Arrange
+            var expected = new object();
+            var activator = new Mock<IControllerActivator>();
+            activator.Setup(a => a.Release(It.IsAny<ControllerContext>(), expected))
+                .Verifiable();
+            var activatorProvider = new ControllerActivatorProvider(activator.Object);
+            var descriptor = new ControllerActionDescriptor
+            {
+                ControllerTypeInfo = typeof(object).GetTypeInfo(),
+            };
+
+            // Act
+            var releaseDelegate = activatorProvider.CreateReleaser(descriptor);
+            releaseDelegate(new ControllerContext(), expected);
+
+            // Assert
+            activator.Verify();
+        }
+
+        [Fact]
+        public void CreateReleaser_ReturnsNullIfControllerIsNotDisposable()
+        {
+            // Arrange
+            var activator = new DefaultControllerActivator(Mock.Of<ITypeActivatorCache>());
+            var activatorProvider = new ControllerActivatorProvider(activator);
+            var descriptor = new ControllerActionDescriptor
+            {
+                ControllerTypeInfo = typeof(TestController).GetTypeInfo(),
+            };
+
+            // Act
+            var releaseDelegate = activatorProvider.CreateReleaser(descriptor);
+
+            // Assert
+            Assert.Null(releaseDelegate);
+        }
+
+        [Fact]
+        public void CreateReleaser_ReturnsDelegateThatDisposesInstance()
+        {
+            // Arrange
+            var activator = new DefaultControllerActivator(Mock.Of<ITypeActivatorCache>());
+            var activatorProvider = new ControllerActivatorProvider(activator);
+            var descriptor = new ControllerActionDescriptor
+            {
+                ControllerTypeInfo = typeof(DisposableController).GetTypeInfo(),
+            };
+            var controller = new DisposableController();
+
+            // Act
+            var releaseDelegate = activatorProvider.CreateReleaser(descriptor);
+
+            // Assert
+            Assert.NotNull(releaseDelegate);
+            releaseDelegate(new ControllerContext(), controller);
+            Assert.True(controller.Disposed);
+        }
+
+        private class TestController
+        {
+            public TestController(TestService testService)
+            {
+                TestService = testService;
+            }
+
+            public TestService TestService { get; }
+        }
+
+        private class DisposableController : IDisposable
+        {
+            public bool Disposed { get; private set; }
+
+            public void Dispose()
+            {
+                Disposed = true;
+            }
+        }
+
+        private class TestService
+        {
+
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerFactoryProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerFactoryProviderTest.cs
new file mode 100644
index 0000000000..00f4492239
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerFactoryProviderTest.cs
@@ -0,0 +1,163 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Controllers
+{
+    public class ControllerFactoryProviderTest
+    {
+        [Fact]
+        public void CreateControllerFactory_InvokesIControllerFactory_IfItIsNotDefaultControllerFactory()
+        {
+            // Arrange
+            var expected = new object();
+            var factory = new Mock<IControllerFactory>();
+            factory.Setup(f => f.CreateController(It.IsAny<ControllerContext>()))
+                .Returns(expected)
+                .Verifiable();
+            var provider = new ControllerFactoryProvider(
+                Mock.Of<IControllerActivatorProvider>(),
+                factory.Object,
+                Enumerable.Empty<IControllerPropertyActivator>());
+            var descriptor = new ControllerActionDescriptor
+            {
+                ControllerTypeInfo = typeof(object).GetTypeInfo(),
+            };
+
+            // Act
+            var factoryResult = provider.CreateControllerFactory(descriptor);
+            var result = factoryResult(new ControllerContext());
+
+            // Assert
+            Assert.Same(result, expected);
+            factory.Verify();
+        }
+
+        [Fact]
+        public void CreateControllerReleaser_InvokesIControllerFactory_IfItIsNotDefaultControllerFactory()
+        {
+            // Arrange
+            var controller = new object();
+            var factory = new Mock<IControllerFactory>();
+            factory.Setup(f => f.ReleaseController(It.IsAny<ControllerContext>(), controller))
+                .Verifiable();
+            var provider = new ControllerFactoryProvider(
+                Mock.Of<IControllerActivatorProvider>(),
+                factory.Object,
+                Enumerable.Empty<IControllerPropertyActivator>());
+            var descriptor = new ControllerActionDescriptor
+            {
+                ControllerTypeInfo = typeof(object).GetTypeInfo(),
+            };
+
+            // Act
+            var releaser = provider.CreateControllerReleaser(descriptor);
+            releaser(new ControllerContext(), controller);
+
+            // Assert
+            factory.Verify();
+        }
+
+        [Fact]
+        public void CreateControllerReleaser_UsesControllerActivatorAndPropertyActivator()
+        {
+            // Arrange
+            var expectedProperty1 = new object();
+            var expectedProperty2 = new object();
+            var expectedController = new TestController();
+            var factory = new DefaultControllerFactory(
+                Mock.Of<IControllerActivator>(),
+                Enumerable.Empty<IControllerPropertyActivator>());
+            var activatorProvider = new Mock<IControllerActivatorProvider>();
+            activatorProvider.Setup(p => p.CreateActivator(It.IsAny<ControllerActionDescriptor>()))
+                .Returns(_ => expectedController)
+                .Verifiable();
+
+            var propertyActivator1 = new Mock<IControllerPropertyActivator>();
+            propertyActivator1.Setup(p => p.GetActivatorDelegate(It.IsAny<ControllerActionDescriptor>()))
+                .Returns((context, controllerObject) =>
+                {
+                    ((TestController)controllerObject).ActivatedValue1 = expectedProperty1;
+                })
+                .Verifiable();
+
+            var propertyActivator2 = new Mock<IControllerPropertyActivator>();
+            propertyActivator2.Setup(p => p.GetActivatorDelegate(It.IsAny<ControllerActionDescriptor>()))
+                .Returns((context, controllerObject) =>
+                {
+                    ((TestController)controllerObject).ActivatedValue2 = expectedProperty2;
+                })
+                .Verifiable();
+
+            var propertyActivators = new[]
+            {
+                propertyActivator1.Object,
+                propertyActivator2.Object,
+            };
+            var provider = new ControllerFactoryProvider(
+                activatorProvider.Object,
+                factory,
+                propertyActivators);
+            var descriptor = new ControllerActionDescriptor
+            {
+                ControllerTypeInfo = typeof(TestController).GetTypeInfo(),
+            };
+
+            // Act
+            var factoryDelegate = provider.CreateControllerFactory(descriptor);
+            var controller = factoryDelegate(new ControllerContext());
+
+            // Assert
+            var actual = Assert.IsType<TestController>(controller);
+            Assert.Same(expectedController, actual);
+            Assert.Same(expectedProperty1, actual.ActivatedValue1);
+            Assert.Same(expectedProperty2, actual.ActivatedValue2);
+            activatorProvider.Verify();
+            propertyActivator1.Verify();
+            propertyActivator2.Verify();
+        }
+
+        [Fact]
+        public void CreateControllerReleaser_ReturnsReleaser()
+        {
+            // Arrange
+            var controller = new object();
+            var factory = new DefaultControllerFactory(
+                Mock.Of<IControllerActivator>(),
+                Enumerable.Empty<IControllerPropertyActivator>());
+            Action<ControllerContext, object> expected = (_, __) => { };
+            var activatorProvider = new Mock<IControllerActivatorProvider>();
+            activatorProvider.Setup(p => p.CreateReleaser(It.IsAny<ControllerActionDescriptor>()))
+                .Returns(expected)
+                .Verifiable();
+            var provider = new ControllerFactoryProvider(
+                activatorProvider.Object,
+                factory,
+                Enumerable.Empty<IControllerPropertyActivator>());
+            var descriptor = new ControllerActionDescriptor
+            {
+                ControllerTypeInfo = typeof(object).GetTypeInfo(),
+            };
+
+            // Act
+            var actual = provider.CreateControllerReleaser(descriptor);
+
+            // Assert
+            Assert.Same(expected, actual);
+            activatorProvider.Verify();
+        }
+
+        private class TestController
+        {
+            public object ActivatedValue1 { get; set; }
+
+            public object ActivatedValue2 { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerFeatureProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerFeatureProviderTest.cs
new file mode 100644
index 0000000000..e0d5102a54
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerFeatureProviderTest.cs
@@ -0,0 +1,544 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.ControllerFeatureProviderControllers;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Controllers
+{
+    public class ControllerFeatureProviderTest
+    {
+        [Fact]
+        public void UserDefinedClass_DerivedFromController_IsController()
+        {
+            // Arrange
+            var controllerType = typeof(StoreController).GetTypeInfo();
+            var manager = GetApplicationPartManager(controllerType);
+            var feature = new ControllerFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            var discovered = Assert.Single(feature.Controllers);
+            Assert.Equal(controllerType, discovered);
+        }
+
+        [Fact]
+        public void UserDefinedClass_DerivedFromControllerBase_IsController()
+        {
+            // Arrange
+            var controllerType = typeof(ProductsController).GetTypeInfo();
+            var manager = GetApplicationPartManager(controllerType);
+            var feature = new ControllerFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            var discovered = Assert.Single(feature.Controllers);
+            Assert.Equal(controllerType, discovered);
+        }
+
+        [Fact]
+        public void UserDefinedClass_DerivedFromControllerBaseWithoutSuffix_IsController()
+        {
+            // Arrange
+            var controllerType = typeof(Products).GetTypeInfo();
+            var manager = GetApplicationPartManager(controllerType);
+            var feature = new ControllerFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            var discovered = Assert.Single(feature.Controllers);
+            Assert.Equal(controllerType, discovered);
+        }
+
+        [Fact]
+        public void FrameworkControllerClass_IsNotController()
+        {
+            // Arrange
+            var controllerType = typeof(Controller).GetTypeInfo();
+            var manager = GetApplicationPartManager(controllerType);
+            var feature = new ControllerFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            Assert.Empty(feature.Controllers);
+        }
+
+        [Fact]
+        public void FrameworkBaseControllerClass_IsNotController()
+        {
+            // Arrange
+            var controllerType = typeof(ControllerBase).GetTypeInfo();
+            var manager = GetApplicationPartManager(controllerType);
+            var feature = new ControllerFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            Assert.Empty(feature.Controllers);
+        }
+
+        [Fact]
+        public void UserDefinedControllerClass_IsNotController()
+        {
+            // Arrange
+            var controllerType = typeof(ControllerFeatureProviderControllers.Controller).GetTypeInfo();
+            var manager = GetApplicationPartManager(controllerType);
+            var feature = new ControllerFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            Assert.Empty(feature.Controllers);
+        }
+
+        [Fact]
+        public void Interface_IsNotController()
+        {
+            // Arrange
+            var controllerType = typeof(ITestController).GetTypeInfo();
+            var manager = GetApplicationPartManager(controllerType);
+            var feature = new ControllerFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            Assert.Empty(feature.Controllers);
+        }
+        
+        [Fact]
+        public void ValueTypeClass_IsNotController()
+        {
+            // Arrange
+            var controllerType = typeof(int).GetTypeInfo();
+            var manager = GetApplicationPartManager(controllerType);
+            var feature = new ControllerFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            Assert.Empty(feature.Controllers);
+        }
+
+        [Fact]
+        public void AbstractClass_IsNotController()
+        {
+            // Arrange
+            var controllerType = typeof(AbstractController).GetTypeInfo();
+            var manager = GetApplicationPartManager(controllerType);
+            var feature = new ControllerFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            Assert.Empty(feature.Controllers);
+        }
+
+        [Fact]
+        public void DerivedAbstractClass_IsController()
+        {
+            // Arrange
+            var controllerType = typeof(DerivedAbstractController).GetTypeInfo();
+            var manager = GetApplicationPartManager(controllerType);
+            var feature = new ControllerFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            var discovered = Assert.Single(feature.Controllers);
+            Assert.Equal(controllerType, discovered);
+        }
+
+        [Fact]
+        public void OpenGenericClass_IsNotController()
+        {
+            // Arrange
+            var controllerType = typeof(OpenGenericController<>).GetTypeInfo();
+            var manager = GetApplicationPartManager(controllerType);
+            var feature = new ControllerFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            Assert.Empty(feature.Controllers);
+        }
+
+        [Fact]
+        public void WithoutSuffixOrAncestorWithController_IsNotController()
+        {
+            // Arrange
+            var controllerType = typeof(NoSuffixPoco).GetTypeInfo();
+            var manager = GetApplicationPartManager(controllerType);
+            var feature = new ControllerFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            Assert.Empty(feature.Controllers);
+        }
+
+        [Fact]
+        public void ClosedGenericClass_IsController()
+        {
+            // Arrange
+            var controllerType = typeof(OpenGenericController<string>).GetTypeInfo();
+            var manager = GetApplicationPartManager(controllerType);
+            var feature = new ControllerFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            var discovered = Assert.Single(feature.Controllers);
+            Assert.Equal(controllerType, discovered);
+        }
+
+        [Fact]
+        public void DerivedGenericClass_IsController()
+        {
+            // Arrange
+            var controllerType = typeof(DerivedGenericController).GetTypeInfo();
+            var manager = GetApplicationPartManager(controllerType);
+            var feature = new ControllerFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            var discovered = Assert.Single(feature.Controllers);
+            Assert.Equal(controllerType, discovered);
+        }
+
+        [Fact]
+        public void Poco_WithNamingConvention_IsController()
+        {
+            // Arrange
+            var controllerType = typeof(PocoController).GetTypeInfo();
+            var manager = GetApplicationPartManager(controllerType);
+            var feature = new ControllerFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            var discovered = Assert.Single(feature.Controllers);
+            Assert.Equal(controllerType, discovered);
+        }
+
+        [Fact]
+        public void NoControllerSuffix_IsController()
+        {
+            // Arrange
+            var controllerType = typeof(NoSuffix).GetTypeInfo();
+            var manager = GetApplicationPartManager(controllerType);
+            var feature = new ControllerFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            var discovered = Assert.Single(feature.Controllers);
+            Assert.Equal(controllerType, discovered);
+        }
+
+        [Theory]
+        [InlineData(typeof(DescendantLevel1))]
+        [InlineData(typeof(DescendantLevel2))]
+        public void AncestorTypeHasControllerAttribute_IsController(Type type)
+        {
+            // Arrange
+            var manager = GetApplicationPartManager(type.GetTypeInfo());
+            var feature = new ControllerFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            var discovered = Assert.Single(feature.Controllers);
+            Assert.Equal(type.GetTypeInfo(), discovered);
+        }
+
+        [Fact]
+        public void AncestorTypeDoesNotHaveControllerAttribute_IsNotController()
+        {
+            // Arrange
+            var controllerType = typeof(NoSuffixNoControllerAttribute).GetTypeInfo();
+            var manager = GetApplicationPartManager(controllerType);
+            var feature = new ControllerFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            Assert.Empty(feature.Controllers);
+        }
+
+        [Fact]
+        public void GetFeature_OnlyRunsOnParts_ThatImplementIApplicationPartTypeProvider()
+        {
+            // Arrange
+            var otherPart = new Mock<ApplicationPart>();
+            otherPart
+                .As<IApplicationPartTypeProvider>()
+                .Setup(t => t.Types)
+                .Returns(new[] { typeof(PocoController).GetTypeInfo() });
+
+            var parts = new[] {
+                Mock.Of<ApplicationPart>(),
+                new TestApplicationPart(typeof(NoSuffix).GetTypeInfo()),
+                otherPart.Object
+            };
+
+            var feature = new ControllerFeature();
+
+            var expected = new List<TypeInfo>
+            {
+                typeof(NoSuffix).GetTypeInfo(),
+                typeof(PocoController).GetTypeInfo()
+            };
+
+            var provider = new ControllerFeatureProvider();
+
+            // Act
+            provider.PopulateFeature(parts, feature);
+
+            // Assert
+            Assert.Equal(expected, feature.Controllers.ToList());
+        }
+
+        [Fact]
+        public void GetFeature_DoesNotAddDuplicates_ToTheListOfControllers()
+        {
+            // Arrange
+            var otherPart = new Mock<ApplicationPart>();
+            otherPart
+                .As<IApplicationPartTypeProvider>()
+                .Setup(t => t.Types)
+                .Returns(new[] { typeof(PocoController).GetTypeInfo() });
+
+            var parts = new[] {
+                Mock.Of<ApplicationPart>(),
+                new TestApplicationPart(typeof(NoSuffix)),
+                otherPart.Object
+            };
+
+            var feature = new ControllerFeature();
+
+            var expected = new List<TypeInfo>
+            {
+                typeof(NoSuffix).GetTypeInfo(),
+                typeof(PocoController).GetTypeInfo()
+            };
+
+            var provider = new ControllerFeatureProvider();
+
+            provider.PopulateFeature(parts, feature);
+
+            // Act
+            provider.PopulateFeature(parts, feature);
+
+            // Assert
+            Assert.Equal(expected, feature.Controllers.ToList());
+        }
+
+        [Theory]
+        [InlineData(typeof(BaseNonControllerController))]
+        [InlineData(typeof(BaseNonControllerControllerChild))]
+        [InlineData(typeof(BasePocoNonControllerController))]
+        [InlineData(typeof(BasePocoNonControllerControllerChild))]
+        [InlineData(typeof(NonController))]
+        [InlineData(typeof(NonControllerChild))]
+        [InlineData(typeof(BaseNonControllerAttributeChildControllerControllerAttributeController))]
+        [InlineData(typeof(PersonModel))] // Verifies that POCO type hierarchies that don't derive from controller return false.
+        public void IsController_ReturnsFalse_IfTypeOrAncestorHasNonControllerAttribute(Type type)
+        {
+            // Arrange
+            var manager = GetApplicationPartManager(type.GetTypeInfo());
+            var feature = new ControllerFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            Assert.Empty(feature.Controllers);
+        }
+
+        private static ApplicationPartManager GetApplicationPartManager(params TypeInfo[] types)
+        {
+            var manager = new ApplicationPartManager();
+            manager.ApplicationParts.Add(new TestApplicationPart(types));
+            manager.FeatureProviders.Add(new ControllerFeatureProvider());
+
+            return manager;
+        }
+    }
+}
+
+// These controllers are used to test the ControllerFeatureProvider implementation
+// which REQUIRES that they be public top-level classes. To avoid having to stub out the
+// implementation of this class to test it, they are just top level classes. Don't reuse
+// these outside this test - find a better way or use nested classes to keep the tests
+// independent.
+namespace Microsoft.AspNetCore.Mvc.ControllerFeatureProviderControllers
+{
+    public abstract class AbstractController : Controller
+    {
+    }
+
+    public class DerivedAbstractController : AbstractController
+    {
+    }
+
+    public class StoreController : Controller
+    {
+    }
+
+    public class ProductsController : ControllerBase
+    {
+    }
+
+    public class Products : ControllerBase
+    {
+    }
+
+    [Controller]
+    public abstract class Controller
+    {
+    }
+
+    public abstract class NoControllerAttributeBaseController
+    {
+    }
+
+    public class NoSuffixNoControllerAttribute : NoControllerAttributeBaseController
+    {
+    }
+
+    public class OpenGenericController<T> : Controller
+    {
+    }
+
+    public class DerivedGenericController : OpenGenericController<string>
+    {
+    }
+
+    public interface ITestController
+    {
+    }
+
+    public class NoSuffix : Controller
+    {
+    }
+
+    public class NoSuffixPoco
+    {
+
+    }
+
+    public class PocoController
+    {
+    }
+
+    [Controller]
+    public class CustomBase
+    {
+
+    }
+
+    [Controller]
+    public abstract class CustomAbstractBaseController
+    {
+
+    }
+
+    public class DescendantLevel1 : CustomBase
+    {
+
+    }
+
+    public class DescendantLevel2 : DescendantLevel1
+    {
+
+    }
+
+    public class AbstractChildWithoutSuffix : CustomAbstractBaseController
+    {
+
+    }
+
+    [NonController]
+    public class BasePocoNonControllerController
+    {
+
+    }
+
+    [Controller]
+    public class BaseNonControllerAttributeChildControllerControllerAttributeController : BaseNonControllerController
+    {
+ 
+    }
+
+    public class BasePocoNonControllerControllerChild : BasePocoNonControllerController
+    {
+
+    }
+
+    [NonController]
+    public class BaseNonControllerController : Controller
+    {
+
+    }
+
+    public class BaseNonControllerControllerChild : BaseNonControllerController
+    {
+
+    }
+
+    [NonController]
+    public class NonControllerChild : Controller
+    {
+
+    }
+
+    [NonController]
+    public class NonController : Controller
+    {
+
+    }
+
+    public class DataModelBase
+    {
+
+    }
+
+    public class EntityDataModel : DataModelBase
+    {
+
+    }
+
+    public class PersonModel : EntityDataModel
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/DefaultControllerActivatorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/DefaultControllerActivatorTest.cs
new file mode 100644
index 0000000000..90305c7a08
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/DefaultControllerActivatorTest.cs
@@ -0,0 +1,160 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Routing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Controllers
+{
+    public class DefaultControllerActivatorTest
+    {
+        [Theory]
+        [InlineData(typeof(TypeDerivingFromController))]
+        [InlineData(typeof(PocoType))]
+        public void Create_CreatesInstancesOfTypes(Type type)
+        {
+            // Arrange
+            var activator = new DefaultControllerActivator(new TypeActivatorCache());
+            var serviceProvider = new Mock<IServiceProvider>(MockBehavior.Strict);
+
+            var httpContext = new DefaultHttpContext
+            {
+                RequestServices = serviceProvider.Object
+            };
+
+            var context = new ControllerContext(
+                new ActionContext(
+                    httpContext,
+                    new RouteData(),
+                    new ControllerActionDescriptor
+                    {
+                        ControllerTypeInfo = type.GetTypeInfo()
+                    }));
+
+            // Act
+            var instance = activator.Create(context);
+
+            // Assert
+            Assert.IsType(type, instance);
+        }
+
+        [Fact]
+        public void Release_DisposesController_IfDisposable()
+        {
+            // Arrange
+            var controller = new MyController();
+            var activator = new DefaultControllerActivator(Mock.Of<ITypeActivatorCache>());
+
+            // Act
+            activator.Release(new ControllerContext(), controller);
+
+            // Assert
+            Assert.True(controller.Disposed);
+        }
+
+        [Fact]
+        public void DefaultControllerActivator_ReleasesNonIDisposableController()
+        {
+            // Arrange
+            var activator = new DefaultControllerActivator(Mock.Of<ITypeActivatorCache>());
+            var controller = new object();
+
+            // Act + Assert (does not throw)
+            activator.Release(Mock.Of<ControllerContext>(), controller);
+        }
+
+        [Fact]
+        public void Create_TypeActivatesTypesWithServices()
+        {
+            // Arrange
+            var activator = new DefaultControllerActivator(new TypeActivatorCache());
+            var serviceProvider = new Mock<IServiceProvider>(MockBehavior.Strict);
+            var testService = new TestService();
+            serviceProvider.Setup(s => s.GetService(typeof(TestService)))
+                           .Returns(testService)
+                           .Verifiable();
+
+            var httpContext = new DefaultHttpContext
+            {
+                RequestServices = serviceProvider.Object
+            };
+
+            var context = new ControllerContext(
+                new ActionContext(
+                    httpContext,
+                    new RouteData(),
+                    new ControllerActionDescriptor
+                    {
+                        ControllerTypeInfo = typeof(TypeDerivingFromControllerWithServices).GetTypeInfo()
+                    }));
+
+            // Act
+            var instance = activator.Create(context);
+
+            // Assert
+            var controller = Assert.IsType<TypeDerivingFromControllerWithServices>(instance);
+            Assert.Same(testService, controller.TestService);
+            serviceProvider.Verify();
+        }
+
+        public class Controller
+        {
+        }
+
+        private class TypeDerivingFromController : Controller
+        {
+        }
+
+        private class TypeDerivingFromControllerWithServices : Controller
+        {
+            public TypeDerivingFromControllerWithServices(TestService service)
+            {
+                TestService = service;
+            }
+
+            public TestService TestService { get; }
+        }
+
+        private IServiceProvider GetServices()
+        {
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var services = new Mock<IServiceProvider>();
+            services
+                .Setup(s => s.GetService(typeof(IUrlHelper)))
+                .Returns(Mock.Of<IUrlHelper>());
+            services
+                .Setup(s => s.GetService(typeof(IModelMetadataProvider)))
+                .Returns(metadataProvider);
+            services
+                .Setup(s => s.GetService(typeof(IObjectModelValidator)))
+                .Returns(new DefaultObjectValidator(metadataProvider, new List<IModelValidatorProvider>()));
+            return services.Object;
+        }
+
+        private class PocoType
+        {
+        }
+
+        private class TestService
+        {
+        }
+
+        private class MyController : IDisposable
+        {
+            public bool Disposed { get; set; }
+
+            public void Dispose()
+            {
+                Disposed = true;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/DefaultControllerFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/DefaultControllerFactoryTest.cs
new file mode 100644
index 0000000000..436693bbb9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/DefaultControllerFactoryTest.cs
@@ -0,0 +1,282 @@
+// 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.
+
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Controllers
+{
+    public class DefaultControllerFactoryTest
+    {
+        [Fact]
+        public void CreateController_UsesControllerActivatorToInstantiateController()
+        {
+            // Arrange
+            var expected = new MyController();
+            var actionDescriptor = new ControllerActionDescriptor
+            {
+                ControllerTypeInfo = typeof(MyController).GetTypeInfo()
+            };
+
+            var context = new ControllerContext()
+            {
+                ActionDescriptor = actionDescriptor,
+                HttpContext = new DefaultHttpContext()
+                {
+                    RequestServices = GetServices(),
+                },
+            };
+
+            var activator = new Mock<IControllerActivator>();
+            activator.Setup(a => a.Create(context))
+                     .Returns(expected)
+                     .Verifiable();
+
+            var controllerFactory = CreateControllerFactory(activator.Object);
+
+            // Act
+            var result = controllerFactory.CreateController(context);
+
+            // Assert
+            var controller = Assert.IsType<MyController>(result);
+            Assert.Same(expected, controller);
+            activator.Verify();
+        }
+
+        [Fact]
+        public void CreateController_SetsPropertiesFromActionContextHierarchy()
+        {
+            // Arrange
+            var actionDescriptor = new ControllerActionDescriptor
+            {
+                ControllerTypeInfo = typeof(ControllerWithAttributes).GetTypeInfo()
+            };
+
+            var context = new ControllerContext()
+            {
+                ActionDescriptor = actionDescriptor,
+                HttpContext = new DefaultHttpContext()
+                {
+                    RequestServices = GetServices(),
+                },
+            };
+            var factory = CreateControllerFactory(new DefaultControllerActivator(new TypeActivatorCache()));
+
+            // Act
+            var result = factory.CreateController(context);
+
+            // Assert
+            var controller = Assert.IsType<ControllerWithAttributes>(result);
+            Assert.Same(context, controller.ActionContext);
+        }
+
+        [Fact]
+        public void CreateController_SetsControllerContext()
+        {
+            // Arrange
+            var actionDescriptor = new ControllerActionDescriptor
+            {
+                ControllerTypeInfo = typeof(ControllerWithAttributes).GetTypeInfo()
+            };
+
+            var context = new ControllerContext()
+            {
+                ActionDescriptor = actionDescriptor,
+                HttpContext = new DefaultHttpContext()
+                {
+                    RequestServices = GetServices(),
+                },
+            };
+            var factory = CreateControllerFactory(new DefaultControllerActivator(new TypeActivatorCache()));
+
+            // Act
+            var result = factory.CreateController(context);
+
+            // Assert
+            var controller = Assert.IsType<ControllerWithAttributes>(result);
+            Assert.Same(context, controller.ControllerContext);
+        }
+
+        [Fact]
+        public void CreateController_IgnoresPropertiesThatAreNotDecoratedWithAttribute()
+        {
+            // Arrange
+            var actionDescriptor = new ControllerActionDescriptor
+            {
+                ControllerTypeInfo = typeof(ControllerWithoutAttributes).GetTypeInfo()
+            };
+
+            var context = new ControllerContext()
+            {
+                ActionDescriptor = actionDescriptor,
+                HttpContext = new DefaultHttpContext()
+                {
+                    RequestServices = GetServices(),
+                },
+            };
+            var factory = CreateControllerFactory(new DefaultControllerActivator(new TypeActivatorCache()));
+
+            // Act
+            var result = factory.CreateController(context);
+
+            // Assert
+            var controller = Assert.IsType<ControllerWithoutAttributes>(result);
+            Assert.Null(controller.ActionContext);
+        }
+
+        [Fact]
+        public void CreateController_IgnoresNonPublicProperties()
+        {
+            // Arrange
+            var actionDescriptor = new ControllerActionDescriptor
+            {
+                ControllerTypeInfo = typeof(ControllerWithNonVisibleProperties).GetTypeInfo()
+            };
+
+            var context = new ControllerContext()
+            {
+                ActionDescriptor = actionDescriptor,
+                HttpContext = new DefaultHttpContext()
+                {
+                    RequestServices = GetServices(),
+                },
+            };
+            var factory = CreateControllerFactory(new DefaultControllerActivator(new TypeActivatorCache()));
+
+            // Act
+            var result = factory.CreateController(context);
+
+            // Assert
+            var controller = Assert.IsType<ControllerWithNonVisibleProperties>(result);
+            Assert.Null(controller.ActionContext);
+            Assert.Null(controller.ControllerContext);
+        }
+
+        [Fact]
+        public void CreateController_ThrowsIConstructorCannotBeActivated()
+        {
+            // Arrange
+            var actionDescriptor = new ControllerActionDescriptor
+            {
+                ControllerTypeInfo = typeof(ControllerThatCannotBeActivated).GetTypeInfo()
+            };
+
+            var context = new ControllerContext()
+            {
+                ActionDescriptor = actionDescriptor,
+                HttpContext = new DefaultHttpContext()
+                {
+                    RequestServices = GetServices(),
+                },
+            };
+            var factory = CreateControllerFactory(new DefaultControllerActivator(new TypeActivatorCache()));
+
+            // Act and Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => factory.CreateController(context));
+            Assert.Equal(
+                $"Unable to resolve service for type '{typeof(TestService).FullName}' while attempting to activate " +
+                $"'{typeof(ControllerThatCannotBeActivated).FullName}'.",
+                exception.Message);
+        }
+
+        [Fact]
+        public void DefaultControllerFactory_DelegatesDisposalToControllerActivator()
+        {
+            // Arrange
+            var activatorMock = new Mock<IControllerActivator>();
+            activatorMock.Setup(s => s.Release(It.IsAny<ControllerContext>(), It.IsAny<object>()));
+
+            var factory = CreateControllerFactory(activatorMock.Object);
+            var controller = new MyController();
+
+            // Act + Assert
+            factory.ReleaseController(new ControllerContext(), controller);
+
+            activatorMock.Verify();
+        }
+
+        private IServiceProvider GetServices()
+        {
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var services = new Mock<IServiceProvider>();
+            services
+                .Setup(s => s.GetService(typeof(IUrlHelper)))
+                .Returns(Mock.Of<IUrlHelper>());
+            services
+                .Setup(s => s.GetService(typeof(IModelMetadataProvider)))
+                .Returns(metadataProvider);
+            services
+                .Setup(s => s.GetService(typeof(IObjectModelValidator)))
+                .Returns(new DefaultObjectValidator(
+                    metadataProvider,
+                    TestModelValidatorProvider.CreateDefaultProvider().ValidatorProviders));
+            return services.Object;
+        }
+
+        private static DefaultControllerFactory CreateControllerFactory(IControllerActivator controllerActivator = null)
+        {
+            var activatorMock = new Mock<IControllerActivator>();
+
+            controllerActivator = controllerActivator ?? activatorMock.Object;
+            var propertyActivators = new IControllerPropertyActivator[]
+            {
+                new DefaultControllerPropertyActivator(),
+            };
+
+            return new DefaultControllerFactory(controllerActivator, propertyActivators);
+        }
+
+        private class ControllerWithoutAttributes
+        {
+            public ActionContext ActionContext { get; set; }
+
+            public ControllerContext ControllerContext { get; set; }
+        }
+
+        public class ControllerWithNonVisibleProperties
+        {
+            internal ActionContext ActionContext { get; set; }
+
+            public ControllerContext ControllerContext { get; private set; }
+        }
+
+        private class ControllerWithAttributes
+        {
+            [ActionContext]
+            public ActionContext ActionContext { get; set; }
+
+            [ControllerContext]
+            public ControllerContext ControllerContext { get; set; }
+        }
+
+        private class MyController : IDisposable
+        {
+            public bool Disposed { get; set; }
+
+            public void Dispose()
+            {
+                Disposed = true;
+            }
+        }
+
+        private class ControllerThatCannotBeActivated
+        {
+            public ControllerThatCannotBeActivated(TestService service)
+            {
+                Service = service;
+            }
+
+            public TestService Service { get; }
+        }
+
+        private class TestService
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ServiceBasedControllerActivatorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ServiceBasedControllerActivatorTest.cs
new file mode 100644
index 0000000000..cb4d868270
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ServiceBasedControllerActivatorTest.cs
@@ -0,0 +1,82 @@
+// 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.
+
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Controllers
+{
+    public class ServiceBasedControllerActivatorTest
+    {
+        [Fact]
+        public void Create_GetsServicesFromServiceProvider()
+        {
+            // Arrange
+            var controller = new DIController();
+            var serviceProvider = new Mock<IServiceProvider>(MockBehavior.Strict);
+            serviceProvider.Setup(s => s.GetService(typeof(DIController)))
+                           .Returns(controller)
+                           .Verifiable();
+            var httpContext = new DefaultHttpContext
+            {
+                RequestServices = serviceProvider.Object
+            };
+            var activator = new ServiceBasedControllerActivator();
+            var context = new ControllerContext(new ActionContext(
+                httpContext,
+                new RouteData(),
+                new ControllerActionDescriptor
+                {
+                    ControllerTypeInfo = typeof(DIController).GetTypeInfo()
+                }));
+
+            // Act
+            var instance = activator.Create(context);
+
+            // Assert
+            Assert.Same(controller, instance);
+            serviceProvider.Verify();
+        }
+
+        [Fact]
+        public void Create_ThrowsIfControllerIsNotRegisteredInServiceProvider()
+        {
+            // Arrange
+            var expected = "No service for type '" + typeof(DIController) + "' has been registered.";
+            var controller = new DIController();
+
+            var httpContext = new DefaultHttpContext
+            {
+                RequestServices = Mock.Of<IServiceProvider>()
+            };
+
+            var activator = new ServiceBasedControllerActivator();
+            var context = new ControllerContext(
+                new ActionContext(
+                httpContext,
+                new RouteData(),
+                new ControllerActionDescriptor
+                {
+                    ControllerTypeInfo = typeof(DIController).GetTypeInfo()
+                }));
+
+            // Act and Assert
+            var ex = Assert.Throws<InvalidOperationException>(
+                () => activator.Create(context));
+
+            Assert.Equal(expected, ex.Message);
+        }
+
+        private class Controller
+        {
+        }
+
+        private class DIController : Controller
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedAtActionResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedAtActionResultTests.cs
new file mode 100644
index 0000000000..5c21c139fc
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedAtActionResultTests.cs
@@ -0,0 +1,116 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class CreatedAtActionResultTests
+    {
+        [Fact]
+        public async Task CreatedAtActionResult_ReturnsStatusCode_SetsLocationHeader()
+        {
+            // Arrange
+            var expectedUrl = "testAction";
+            var httpContext = GetHttpContext();
+            var actionContext = GetActionContext(httpContext);
+            var urlHelper = GetMockUrlHelper(expectedUrl);
+
+            // Act
+            var result = new CreatedAtActionResult(
+                actionName: expectedUrl,
+                controllerName: null,
+                routeValues: null,
+                value: null);
+
+            result.UrlHelper = urlHelper;
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status201Created, httpContext.Response.StatusCode);
+            Assert.Equal(expectedUrl, httpContext.Response.Headers["Location"]);
+        }
+
+        [Fact]
+        public async Task CreatedAtActionResult_ThrowsOnNullUrl()
+        {
+            // Arrange
+            var httpContext = GetHttpContext();
+            var actionContext = GetActionContext(httpContext);
+            var urlHelper = GetMockUrlHelper(returnValue: null);
+
+            var result = new CreatedAtActionResult(
+                actionName: null,
+                controllerName: null,
+                routeValues: null,
+                value: null);
+
+            result.UrlHelper = urlHelper;
+
+            // Act & Assert
+            await ExceptionAssert.ThrowsAsync<InvalidOperationException>(
+                async () => await result.ExecuteResultAsync(actionContext),
+            "No route matches the supplied values.");
+        }
+
+        private static ActionContext GetActionContext(HttpContext httpContext)
+        {
+            var routeData = new RouteData();
+            routeData.Routers.Add(Mock.Of<IRouter>());
+
+            return new ActionContext(httpContext,
+                                    routeData,
+                                    new ActionDescriptor());
+        }
+        private static HttpContext GetHttpContext()
+        {
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.PathBase = new PathString("");
+            httpContext.Response.Body = new MemoryStream();
+            httpContext.RequestServices = CreateServices();
+            return httpContext;
+        }
+
+        private static IServiceProvider CreateServices()
+        {
+            var options = Options.Create(new MvcOptions());
+            options.Value.OutputFormatters.Add(new StringOutputFormatter());
+            options.Value.OutputFormatters.Add(new JsonOutputFormatter(
+                new JsonSerializerSettings(),
+                ArrayPool<char>.Shared));
+
+            var services = new ServiceCollection();
+            services.AddSingleton<IActionResultExecutor<ObjectResult>>(new ObjectResultExecutor(
+                new DefaultOutputFormatterSelector(options, NullLoggerFactory.Instance),
+                new TestHttpResponseStreamWriterFactory(),
+                NullLoggerFactory.Instance));
+
+            return services.BuildServiceProvider();
+        }
+
+        private static IUrlHelper GetMockUrlHelper(string returnValue)
+        {
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper.Setup(o => o.Action(It.IsAny<UrlActionContext>())).Returns(returnValue);
+
+            return urlHelper.Object;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedAtRouteResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedAtRouteResultTests.cs
new file mode 100644
index 0000000000..9f19dc1794
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedAtRouteResultTests.cs
@@ -0,0 +1,131 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class CreatedAtRouteResultTests
+    {
+        public static IEnumerable<object[]> CreatedAtRouteData
+        {
+            get
+            {
+                yield return new object[] { null };
+                yield return
+                    new object[] {
+                        new Dictionary<string, string>() { { "hello", "world" } }
+                    };
+                yield return
+                    new object[] {
+                        new RouteValueDictionary(new Dictionary<string, string>() {
+                            { "test", "case" },
+                            { "sample", "route" }
+                        })
+                    };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(CreatedAtRouteData))]
+        public async Task CreatedAtRouteResult_ReturnsStatusCode_SetsLocationHeader(object values)
+        {
+            // Arrange
+            var expectedUrl = "testAction";
+            var httpContext = GetHttpContext();
+            var actionContext = GetActionContext(httpContext);
+            var urlHelper = GetMockUrlHelper(expectedUrl);
+
+            // Act
+            var result = new CreatedAtRouteResult(routeName: null, routeValues: values, value: null);
+            result.UrlHelper = urlHelper;
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status201Created, httpContext.Response.StatusCode);
+            Assert.Equal(expectedUrl, httpContext.Response.Headers["Location"]);
+        }
+
+        [Fact]
+        public async Task CreatedAtRouteResult_ThrowsOnNullUrl()
+        {
+            // Arrange
+            var httpContext = GetHttpContext();
+            var actionContext = GetActionContext(httpContext);
+            var urlHelper = GetMockUrlHelper(returnValue: null);
+
+            var result = new CreatedAtRouteResult(
+                routeName: null,
+                routeValues: new Dictionary<string, object>(),
+                value: null);
+
+            result.UrlHelper = urlHelper;
+
+            // Act & Assert
+            await ExceptionAssert.ThrowsAsync<InvalidOperationException>(
+                async () => await result.ExecuteResultAsync(actionContext),
+            "No route matches the supplied values.");
+        }
+
+        private static ActionContext GetActionContext(HttpContext httpContext)
+        {
+            var routeData = new RouteData();
+            routeData.Routers.Add(Mock.Of<IRouter>());
+
+            return new ActionContext(httpContext,
+                                    routeData,
+                                    new ActionDescriptor());
+        }
+
+        private static HttpContext GetHttpContext()
+        {
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.PathBase = new PathString("");
+            httpContext.Response.Body = new MemoryStream();
+            httpContext.RequestServices = CreateServices();
+            return httpContext;
+        }
+
+        private static IServiceProvider CreateServices()
+        {
+            var options = Options.Create(new MvcOptions());
+            options.Value.OutputFormatters.Add(new StringOutputFormatter());
+            options.Value.OutputFormatters.Add(new JsonOutputFormatter(
+                new JsonSerializerSettings(),
+                ArrayPool<char>.Shared));
+
+            var services = new ServiceCollection();
+            services.AddSingleton<IActionResultExecutor<ObjectResult>>(new ObjectResultExecutor(
+                new DefaultOutputFormatterSelector(options, NullLoggerFactory.Instance),
+                new TestHttpResponseStreamWriterFactory(),
+                NullLoggerFactory.Instance));
+
+            return services.BuildServiceProvider();
+        }
+
+        private static IUrlHelper GetMockUrlHelper(string returnValue)
+        {
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper.Setup(o => o.Link(It.IsAny<string>(), It.IsAny<object>())).Returns(returnValue);
+
+            return urlHelper.Object;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedResultTests.cs
new file mode 100644
index 0000000000..84de33aed6
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedResultTests.cs
@@ -0,0 +1,109 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class CreatedResultTests
+    {
+        [Fact]
+        public void CreatedResult_SetsLocation()
+        {
+            // Arrange
+            var location = "http://test/location";
+
+            // Act
+            var result = new CreatedResult(location, "testInput");
+
+            // Assert
+            Assert.Same(location, result.Location);
+        }
+
+        [Fact]
+        public async Task CreatedResult_ReturnsStatusCode_SetsLocationHeader()
+        {
+            // Arrange
+            var location = "/test/";
+            var httpContext = GetHttpContext();
+            var actionContext = GetActionContext(httpContext);
+            var result = new CreatedResult(location, "testInput");
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status201Created, httpContext.Response.StatusCode);
+            Assert.Equal(location, httpContext.Response.Headers["Location"]);
+        }
+
+        [Fact]
+        public async Task CreatedResult_OverwritesLocationHeader()
+        {
+            // Arrange
+            var location = "/test/";
+            var httpContext = GetHttpContext();
+            var actionContext = GetActionContext(httpContext);
+            httpContext.Response.Headers["Location"] = "/different/location/";
+            var result = new CreatedResult(location, "testInput");
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status201Created, httpContext.Response.StatusCode);
+            Assert.Equal(location, httpContext.Response.Headers["Location"]);
+        }
+
+        private static ActionContext GetActionContext(HttpContext httpContext)
+        {
+            var routeData = new RouteData();
+            routeData.Routers.Add(Mock.Of<IRouter>());
+
+            return new ActionContext(httpContext,
+                                    routeData,
+                                    new ActionDescriptor());
+        }
+
+        private static HttpContext GetHttpContext()
+        {
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.PathBase = new PathString("");
+            httpContext.Response.Body = new MemoryStream();
+            httpContext.RequestServices = CreateServices();
+            return httpContext;
+        }
+
+        private static IServiceProvider CreateServices()
+        {
+            var options = Options.Create(new MvcOptions());
+            options.Value.OutputFormatters.Add(new StringOutputFormatter());
+            options.Value.OutputFormatters.Add(new JsonOutputFormatter(
+                new JsonSerializerSettings(),
+                ArrayPool<char>.Shared));
+
+            var services = new ServiceCollection();
+            services.AddSingleton<IActionResultExecutor<ObjectResult>>(new ObjectResultExecutor(
+                new DefaultOutputFormatterSelector(options, NullLoggerFactory.Instance),
+                new TestHttpResponseStreamWriterFactory(),
+                NullLoggerFactory.Instance));
+
+            return services.BuildServiceProvider();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/ApplicationModelConventionExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/ApplicationModelConventionExtensionsTest.cs
new file mode 100644
index 0000000000..51811324e8
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/ApplicationModelConventionExtensionsTest.cs
@@ -0,0 +1,499 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Xunit;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public class ApplicationModelConventionExtensionsTest
+    {
+        [Fact]
+        public void DefaultParameterModelConvention_AppliesToAllParametersInApp()
+        {
+            // Arrange
+            var app = new ApplicationModel();
+            var controllerType = typeof(HelloController);
+            var controllerModel = new ControllerModel(controllerType.GetTypeInfo(), Array.Empty<object>());
+            app.Controllers.Add(controllerModel);
+
+            var actionModel = new ActionModel(controllerType.GetMethod(nameof(HelloController.GetInfo)), Array.Empty<object>());
+            controllerModel.Actions.Add(actionModel);
+            var parameterModel = new ParameterModel(
+                controllerType.GetMethod(nameof(HelloController.GetInfo)).GetParameters()[0],
+                Array.Empty<object>());
+            actionModel.Parameters.Add(parameterModel);
+
+            var options = new MvcOptions();
+            options.Conventions.Add(new SimpleParameterConvention());
+
+            // Act
+            options.Conventions[0].Apply(app);
+
+            // Assert
+            var kvp = Assert.Single(parameterModel.Properties);
+            Assert.Equal("TestProperty", kvp.Key);
+            Assert.Equal("TestValue", kvp.Value);
+        }
+
+        [Fact]
+        public void DefaultActionModelConvention_AppliesToAllActionsInApp()
+        {
+            // Arrange
+            var app = new ApplicationModel();
+            var controllerType1 = typeof(HelloController).GetTypeInfo();
+            var actionMethod1 = controllerType1.GetMethod(nameof(HelloController.GetHello));
+            var controllerModel1 = new ControllerModel(controllerType1, Array.Empty<object>())
+            {
+                Actions =
+                {
+                    new ActionModel(actionMethod1, Array.Empty<object>()),
+                }
+            };
+
+            var controllerType2 = typeof(WorldController).GetTypeInfo();
+            var actionMethod2 = controllerType2.GetMethod(nameof(WorldController.GetWorld));
+            var controllerModel2 = new ControllerModel(controllerType2, Array.Empty<object>())
+            {
+                Actions =
+                {
+                    new ActionModel(actionMethod2, Array.Empty<object>()),
+                },
+            };
+
+            app.Controllers.Add(controllerModel1);
+            app.Controllers.Add(controllerModel2);
+
+            var options = new MvcOptions();
+            options.Conventions.Add(new SimpleActionConvention());
+
+            // Act
+            options.Conventions[0].Apply(app);
+
+            // Assert
+            var kvp = Assert.Single(controllerModel1.Actions[0].Properties);
+            Assert.Equal("TestProperty", kvp.Key);
+            Assert.Equal("TestValue", kvp.Value);
+
+            kvp = Assert.Single(controllerModel2.Actions[0].Properties);
+            Assert.Equal("TestProperty", kvp.Key);
+            Assert.Equal("TestValue", kvp.Value);
+        }
+
+        [Fact]
+        public void AddedParameterConvention_AppliesToAllPropertiesAndParameters()
+        {
+            // Arrange
+            var app = new ApplicationModel();
+            var controllerType1 = typeof(HelloController).GetTypeInfo();
+            var parameterModel1 = new ParameterModel(
+                controllerType1.GetMethod(nameof(HelloController.GetInfo)).GetParameters()[0],
+                Array.Empty<object>());
+            var actionMethod1 = controllerType1.GetMethod(nameof(HelloController.GetInfo));
+            var property1 = controllerType1.GetProperty(nameof(HelloController.Property1));
+            var controllerModel1 = new ControllerModel(controllerType1, Array.Empty<object>())
+            {
+                ControllerProperties =
+                {
+                    new PropertyModel(property1, Array.Empty<object>()),
+                },
+                Actions =
+                {
+                    new ActionModel(actionMethod1, Array.Empty<object>())
+                    {
+                        Parameters =
+                        {
+                            parameterModel1,
+                        }
+                    }
+                }
+            };
+
+            var controllerType2 = typeof(WorldController).GetTypeInfo();
+            var property2 = controllerType2.GetProperty(nameof(WorldController.Property2));
+            var controllerModel2 = new ControllerModel(controllerType2, Array.Empty<object>())
+            {
+                ControllerProperties =
+                {
+                    new PropertyModel(property2, Array.Empty<object>()),
+                },
+            };
+
+            app.Controllers.Add(controllerModel1);
+            app.Controllers.Add(controllerModel2);
+
+            var options = new MvcOptions();
+            var convention = new SimplePropertyConvention();
+            options.Conventions.Add(convention);
+
+            // Act
+            ApplicationModelConventions.ApplyConventions(app, options.Conventions);
+
+            // Assert
+            var kvp = Assert.Single(controllerModel1.ControllerProperties[0].Properties);
+            Assert.Equal("TestProperty", kvp.Key);
+            Assert.Equal("TestValue", kvp.Value);
+
+            kvp = Assert.Single(controllerModel2.ControllerProperties[0].Properties);
+            Assert.Equal("TestProperty", kvp.Key);
+            Assert.Equal("TestValue", kvp.Value);
+
+            kvp = Assert.Single(controllerModel1.Actions[0].Parameters[0].Properties);
+            Assert.Equal("TestProperty", kvp.Key);
+            Assert.Equal("TestValue", kvp.Value);
+        }
+
+        [Fact]
+        public void DefaultControllerModelConvention_AppliesToAllControllers()
+        {
+            // Arrange
+            var options = new MvcOptions();
+            var app = new ApplicationModel();
+            app.Controllers.Add(new ControllerModel(typeof(HelloController).GetTypeInfo(), Array.Empty<object>()));
+            app.Controllers.Add(new ControllerModel(typeof(WorldController).GetTypeInfo(), Array.Empty<object>()));
+            options.Conventions.Add(new SimpleControllerConvention());
+
+            // Act
+            options.Conventions[0].Apply(app);
+
+            // Assert
+            foreach (var controller in app.Controllers)
+            {
+                var kvp = Assert.Single(controller.Properties);
+                Assert.Equal("TestProperty", kvp.Key);
+                Assert.Equal("TestValue", kvp.Value);
+            }
+        }
+
+        [Fact]
+        public void RemoveType_RemovesAllOfType()
+        {
+            // Arrange
+            var list = new List<IApplicationModelConvention>
+            {
+                new FooApplicationModelConvention(),
+                new BarApplicationModelConvention(),
+                new FooApplicationModelConvention()
+            };
+
+            // Act
+            list.RemoveType(typeof(FooApplicationModelConvention));
+
+            // Assert
+            var convention = Assert.Single(list);
+            Assert.IsType<BarApplicationModelConvention>(convention);
+        }
+
+        [Fact]
+        public void ApplicationModelConventions_CopiesControllerModelCollectionOnApply()
+        {
+            // Arrange
+            var applicationModel = new ApplicationModel();
+            applicationModel.Controllers.Add(
+                new ControllerModel(typeof(HelloController).GetTypeInfo(), Array.Empty<object>())
+                {
+                    Application = applicationModel
+                });
+
+            var controllerModelConvention = new ControllerModelCollectionModifyingConvention();
+            var conventions = new List<IApplicationModelConvention>();
+            conventions.Add(controllerModelConvention);
+
+            // Act & Assert
+            ApplicationModelConventions.ApplyConventions(applicationModel, conventions);
+        }
+
+        [Fact]
+        public void ApplicationModelConventions_CopiesControllerModelCollectionOnApply_WhenRegisteredAsAnAttribute()
+        {
+            // Arrange
+            var controllerModelConvention = new ControllerModelCollectionModifyingConvention();
+            var applicationModel = new ApplicationModel();
+            applicationModel.Controllers.Add(
+                new ControllerModel(typeof(HelloController).GetTypeInfo(), new[] { controllerModelConvention })
+                {
+                    Application = applicationModel
+                });
+
+            var conventions = new List<IApplicationModelConvention>();
+
+            // Act & Assert
+            ApplicationModelConventions.ApplyConventions(applicationModel, conventions);
+        }
+
+        [Fact]
+        public void ApplicationModelConventions_CopiesActionModelCollectionOnApply()
+        {
+            // Arrange
+            var controllerType = typeof(HelloController).GetTypeInfo();
+            var applicationModel = new ApplicationModel();
+            var controllerModel = new ControllerModel(controllerType, Array.Empty<object>())
+            {
+                Application = applicationModel
+            };
+            controllerModel.Actions.Add(
+                new ActionModel(controllerType.GetMethod(nameof(HelloController.GetHello)), Array.Empty<object>())
+                {
+                    Controller = controllerModel
+                });
+            applicationModel.Controllers.Add(controllerModel);
+
+            var actionModelConvention = new ActionModelCollectionModifyingConvention();
+            var conventions = new List<IApplicationModelConvention>();
+            conventions.Add(actionModelConvention);
+
+            // Act & Assert
+            ApplicationModelConventions.ApplyConventions(applicationModel, conventions);
+        }
+
+        [Fact]
+        public void ApplicationModelConventions_CopiesPropertyModelCollectionOnApply()
+        {
+            // Arrange
+            var controllerType = typeof(HelloController).GetTypeInfo();
+            var applicationModel = new ApplicationModel();
+            var controllerModel = new ControllerModel(controllerType, Array.Empty<object>())
+            {
+                Application = applicationModel
+            };
+            controllerModel.ControllerProperties.Add(
+                new PropertyModel(controllerType.GetProperty(nameof(HelloController.Property1)), Array.Empty<object>())
+                {
+                    Controller = controllerModel
+                });
+            applicationModel.Controllers.Add(controllerModel);
+
+            var propertyModelConvention = new ParameterModelBaseConvention();
+            var conventions = new List<IApplicationModelConvention>();
+            conventions.Add(propertyModelConvention);
+
+            // Act & Assert
+            ApplicationModelConventions.ApplyConventions(applicationModel, conventions);
+        }
+
+        [Fact]
+        public void ApplicationModelConventions_CopiesPropertyModelCollectionOnApply_WhenAppliedViaAttributes()
+        {
+            // Arrange
+            var propertyModelConvention = new ParameterModelBaseConvention();
+            var controllerType = typeof(HelloController).GetTypeInfo();
+            var applicationModel = new ApplicationModel();
+            var controllerModel = new ControllerModel(controllerType, Array.Empty<object>())
+            {
+                Application = applicationModel
+            };
+            controllerModel.ControllerProperties.Add(
+                new PropertyModel(controllerType.GetProperty(nameof(HelloController.Property1)), new[] { propertyModelConvention })
+                {
+                    Controller = controllerModel
+                });
+            applicationModel.Controllers.Add(controllerModel);
+
+            var conventions = new List<IApplicationModelConvention>();
+
+            // Act & Assert
+            ApplicationModelConventions.ApplyConventions(applicationModel, conventions);
+        }
+
+        [Fact]
+        public void ApplicationModelConventions_CopiesParameterModelCollectionOnApply()
+        {
+            // Arrange
+            var controllerType = typeof(HelloController).GetTypeInfo();
+            var app = new ApplicationModel();
+            var controllerModel = new ControllerModel(controllerType, Array.Empty<object>())
+            {
+                Application = app
+            };
+            app.Controllers.Add(controllerModel);
+            var actionModel = new ActionModel(controllerType.GetMethod(nameof(HelloController.GetInfo)), Array.Empty<object>())
+            {
+                Controller = controllerModel
+            };
+            controllerModel.Actions.Add(actionModel);
+            var parameterModel = new ParameterModel(
+                controllerType.GetMethod(nameof(HelloController.GetInfo)).GetParameters()[0],
+                Array.Empty<object>())
+            {
+                Action = actionModel
+            };
+            actionModel.Parameters.Add(parameterModel);
+
+            var parameterModelConvention = new ParameterModelCollectionModifyingConvention();
+            var conventions = new List<IApplicationModelConvention>();
+            conventions.Add(parameterModelConvention);
+
+            // Act & Assert
+            ApplicationModelConventions.ApplyConventions(app, conventions);
+        }
+
+        [Fact]
+        public void ApplicationModelConventions_CopiesParameterModelCollectionOnApply_WhenRegisteredViaAttribute()
+        {
+            // Arrange
+            var parameterModelConvention = new ParameterModelCollectionModifyingConvention();
+            var controllerType = typeof(HelloController).GetTypeInfo();
+            var app = new ApplicationModel();
+            var controllerModel = new ControllerModel(controllerType, Array.Empty<object>())
+            {
+                Application = app
+            };
+            app.Controllers.Add(controllerModel);
+            var actionModel = new ActionModel(controllerType.GetMethod(nameof(HelloController.GetInfo)), Array.Empty<object>())
+            {
+                Controller = controllerModel
+            };
+            controllerModel.Actions.Add(actionModel);
+            var parameterModel = new ParameterModel(
+                controllerType.GetMethod(nameof(HelloController.GetInfo)).GetParameters()[0],
+                new[] { parameterModelConvention })
+            {
+                Action = actionModel
+            };
+            actionModel.Parameters.Add(parameterModel);
+
+            var conventions = new List<IApplicationModelConvention>();
+
+            // Act & Assert
+            ApplicationModelConventions.ApplyConventions(app, conventions);
+        }
+
+        [Fact]
+        public void GenericRemoveType_RemovesAllOfType()
+        {
+            // Arrange
+            var list = new List<IApplicationModelConvention>
+            {
+                new FooApplicationModelConvention(),
+                new BarApplicationModelConvention(),
+                new FooApplicationModelConvention()
+            };
+
+            // Act
+            list.RemoveType<FooApplicationModelConvention>();
+
+            // Assert
+            var convention = Assert.Single(list);
+            Assert.IsType<BarApplicationModelConvention>(convention);
+        }
+
+        private class FooApplicationModelConvention : IApplicationModelConvention
+        {
+            public void Apply(ApplicationModel application)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class BarApplicationModelConvention : IApplicationModelConvention
+        {
+            public void Apply(ApplicationModel application)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class HelloController
+        {
+            public string Property1 { get; set; }
+
+            public string GetHello()
+            {
+                return "Hello";
+            }
+
+            public string GetInfo(int id)
+            {
+                return "GetInfo(int id)";
+            }
+        }
+
+        private class WorldController
+        {
+            public string Property2 { get; set; }
+
+            public string GetWorld()
+            {
+                return "World!";
+            }
+        }
+
+        private class SimpleParameterConvention : IParameterModelConvention
+        {
+            public void Apply(ParameterModel parameter)
+            {
+                parameter.Properties.Add("TestProperty", "TestValue");
+            }
+        }
+
+        private class SimpleActionConvention : IActionModelConvention
+        {
+            public void Apply(ActionModel action)
+            {
+                action.Properties.Add("TestProperty", "TestValue");
+            }
+        }
+
+        private class SimplePropertyConvention : IParameterModelBaseConvention
+        {
+            public void Apply(ParameterModelBase action)
+            {
+                action.Properties.Add("TestProperty", "TestValue");
+            }
+        }
+
+        private class SimpleControllerConvention : IControllerModelConvention
+        {
+            public void Apply(ControllerModel controller)
+            {
+                controller.Properties.Add("TestProperty", "TestValue");
+            }
+        }
+
+        private class ControllerModelCollectionModifyingConvention : IControllerModelConvention
+        {
+            public void Apply(ControllerModel controller)
+            {
+                controller.Application.Controllers.Remove(controller);
+            }
+        }
+
+        private class TestApplicationModelConvention : IApplicationModelConvention
+        {
+            public void Apply(ApplicationModel application)
+            {
+                application.Controllers.RemoveAt(0);
+            }
+        }
+
+        private class ActionModelCollectionModifyingConvention : IActionModelConvention
+        {
+            public void Apply(ActionModel action)
+            {
+                action.Controller.Actions.Remove(action);
+            }
+        }
+
+        private class ParameterModelBaseConvention : IParameterModelBaseConvention
+        {
+            public void Apply(ParameterModelBase modelBase)
+            {
+                var property = (PropertyModel)modelBase;
+                property.Controller.ControllerProperties.Remove(property);
+            }
+        }
+
+        private class ParameterModelCollectionModifyingConvention : IParameterModelConvention
+        {
+            public void Apply(ParameterModel parameter)
+            {
+                parameter.Action.Parameters.Remove(parameter);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcBuilderExtensionsTest.cs
new file mode 100644
index 0000000000..1aa3240f6f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcBuilderExtensionsTest.cs
@@ -0,0 +1,148 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.MvcServiceCollectionExtensionsTestControllers;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class MvcBuilderExtensionsTest
+    {
+        [Fact]
+        public void AddApplicationPart_AddsAnApplicationPart_ToTheListOfPartsOnTheBuilder()
+        {
+            // Arrange
+            var manager = new ApplicationPartManager();
+            var builder = new MvcBuilder(Mock.Of<IServiceCollection>(), manager);
+
+            var assembly = typeof(MvcBuilder).GetTypeInfo().Assembly;
+
+            // Act
+            var result = builder.AddApplicationPart(assembly);
+
+            // Assert
+            Assert.Same(result, builder);
+            var part = Assert.Single(builder.PartManager.ApplicationParts);
+            var assemblyPart = Assert.IsType<AssemblyPart>(part);
+            Assert.Equal(assembly, assemblyPart.Assembly);
+        }
+
+        [Fact]
+        public void ConfigureApplicationParts_InvokesSetupAction()
+        {
+            // Arrange
+            var builder = new MvcBuilder(
+                Mock.Of<IServiceCollection>(),
+                new ApplicationPartManager());
+
+            var part = new TestApplicationPart();
+
+            // Act
+            var result = builder.ConfigureApplicationPartManager(manager =>
+            {
+                manager.ApplicationParts.Add(part);
+            });
+
+            // Assert
+            Assert.Same(result, builder);
+            Assert.Equal(new ApplicationPart[] { part }, builder.PartManager.ApplicationParts.ToArray());
+        }
+
+        [Fact]
+        public void WithControllersAsServices_AddsTypesToControllerTypeProviderAndServiceCollection()
+        {
+            // Arrange
+            var collection = new ServiceCollection();
+            var controllerTypes = new[]
+            {
+                typeof(ControllerTypeA),
+                typeof(TypeBController),
+            }.Select(t => t.GetTypeInfo()).ToArray();
+
+            var builder = new MvcBuilder(collection, GetApplicationPartManager(controllerTypes));
+
+            // Act
+            builder.AddControllersAsServices();
+
+            // Assert
+            var services = collection.ToList();
+            Assert.Equal(3, services.Count);
+            Assert.Equal(typeof(ControllerTypeA), services[0].ServiceType);
+            Assert.Equal(typeof(ControllerTypeA), services[0].ImplementationType);
+            Assert.Equal(ServiceLifetime.Transient, services[0].Lifetime);
+
+            Assert.Equal(typeof(TypeBController), services[1].ServiceType);
+            Assert.Equal(typeof(TypeBController), services[1].ImplementationType);
+            Assert.Equal(ServiceLifetime.Transient, services[1].Lifetime);
+
+            Assert.Equal(typeof(IControllerActivator), services[2].ServiceType);
+            Assert.Equal(typeof(ServiceBasedControllerActivator), services[2].ImplementationType);
+            Assert.Equal(ServiceLifetime.Transient, services[2].Lifetime);
+        }
+
+        [Fact]
+        public void AddControllerAsServices_MultipleCalls_RetainsPreviouslyAddedTypes()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var manager = new ApplicationPartManager();
+            manager.ApplicationParts.Add(new TestApplicationPart(typeof(ControllerOne), typeof(ControllerTwo)));
+            manager.FeatureProviders.Add(new TestFeatureProvider());
+            var builder = new MvcBuilder(services, manager);
+
+            builder.AddControllersAsServices();
+
+            // Act
+            builder.AddControllersAsServices();
+
+            // Assert 2
+            var collection = services.ToList();
+            Assert.Equal(3, collection.Count);
+            Assert.Single(collection, d => d.ServiceType.Equals(typeof(ControllerOne)));
+            Assert.Single(collection, d => d.ServiceType.Equals(typeof(ControllerTwo)));
+        }
+
+        private class ControllerOne
+        {
+        }
+
+        private class ControllerTwo
+        {
+        }
+
+        private static ApplicationPartManager GetApplicationPartManager(params TypeInfo[] types)
+        {
+            var manager = new ApplicationPartManager();
+            manager.ApplicationParts.Add(new TestApplicationPart(types));
+            manager.FeatureProviders.Add(new ControllerFeatureProvider());
+
+            return manager;
+        }
+    }
+}
+
+// These controllers are used to test the UseControllersAsServices implementation
+// which REQUIRES that they be public top-level classes. To avoid having to stub out the
+// implementation of this class to test it, they are just top level classes. Don't reuse
+// these outside this test - find a better way or use nested classes to keep the tests
+// independent.
+namespace Microsoft.AspNetCore.Mvc.MvcServiceCollectionExtensionsTestControllers
+{
+    public class ControllerTypeA : Microsoft.AspNetCore.Mvc.Controller
+    {
+
+    }
+
+    public class TypeBController
+    {
+
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcCoreBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcCoreBuilderExtensionsTest.cs
new file mode 100644
index 0000000000..4fc6d41572
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcCoreBuilderExtensionsTest.cs
@@ -0,0 +1,55 @@
+// 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.
+
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.DependencyInjection
+{
+    public class MvcCoreBuilderExtensionsTest
+    {
+        [Fact]
+        public void AddApplicationPart_AddsAnApplicationPart_ToTheListOfPartsOnTheBuilder()
+        {
+            // Arrange
+            var manager = new ApplicationPartManager();
+            var builder = new MvcCoreBuilder(Mock.Of<IServiceCollection>(), manager);
+            var assembly = typeof(MvcCoreBuilder).GetTypeInfo().Assembly;
+
+            // Act
+            var result = builder.AddApplicationPart(assembly);
+
+            // Assert
+            Assert.Same(result, builder);
+            var part = Assert.Single(builder.PartManager.ApplicationParts);
+            var assemblyPart = Assert.IsType<AssemblyPart>(part);
+            Assert.Equal(assembly, assemblyPart.Assembly);
+        }
+
+        [Fact]
+        public void ConfigureApplicationParts_InvokesSetupAction()
+        {
+            // Arrange
+            var builder = new MvcCoreBuilder(
+                Mock.Of<IServiceCollection>(),
+                new ApplicationPartManager());
+
+            var part = new TestApplicationPart();
+
+            // Act
+            var result = builder.ConfigureApplicationPartManager(manager =>
+            {
+                manager.ApplicationParts.Add(part);
+            });
+
+            // Assert
+            Assert.Same(result, builder);
+            Assert.Equal(new ApplicationPart[] { part }, builder.PartManager.ApplicationParts.ToArray());
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs
new file mode 100644
index 0000000000..237eb47046
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs
@@ -0,0 +1,352 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class MvcCoreServiceCollectionExtensionsTest
+    {
+        // Some MVC services can be registered multiple times, for example, 'IConfigureOptions<MvcOptions>' can
+        // be registered by calling 'ConfigureMvc(...)' before the call to 'AddMvc()' in which case the options
+        // configuration is run in the order they were registered.
+        //
+        // For these kind of multi registration service types, we want to make sure that MVC will still add its
+        // services if the implementation type is different.
+        [Fact]
+        public void MultiRegistrationServiceTypes_AreRegistered_MultipleTimes()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Register a mock implementation of each service, AddMvcServices should add another implementation.
+            foreach (var serviceType in MutliRegistrationServiceTypes)
+            {
+                var mockType = typeof(Mock<>).MakeGenericType(serviceType.Key);
+                services.Add(ServiceDescriptor.Transient(serviceType.Key, mockType));
+            }
+
+            // Act
+            MvcCoreServiceCollectionExtensions.AddMvcCoreServices(services);
+
+            // Assert
+            foreach (var serviceType in MutliRegistrationServiceTypes)
+            {
+                AssertServiceCountEquals(services, serviceType.Key, serviceType.Value.Length + 1);
+
+                foreach (var implementationType in serviceType.Value)
+                {
+                    AssertContainsSingle(services, serviceType.Key, implementationType);
+                }
+            }
+        }
+
+        [Fact]
+        public void SingleRegistrationServiceTypes_AreNotRegistered_MultipleTimes()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Register a mock implementation of each service, AddMvcServices should not replace it.
+            foreach (var serviceType in SingleRegistrationServiceTypes)
+            {
+                var mockType = typeof(Mock<>).MakeGenericType(serviceType);
+                services.Add(ServiceDescriptor.Transient(serviceType, mockType));
+            }
+
+            // Act
+            MvcCoreServiceCollectionExtensions.AddMvcCoreServices(services);
+
+            // Assert
+            foreach (var singleRegistrationType in SingleRegistrationServiceTypes)
+            {
+                AssertServiceCountEquals(services, singleRegistrationType, 1);
+            }
+        }
+
+        [Fact]
+        public void AddMvcServicesTwice_DoesNotAddDuplicates()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            MvcCoreServiceCollectionExtensions.AddMvcCoreServices(services);
+            MvcCoreServiceCollectionExtensions.AddMvcCoreServices(services);
+
+            // Assert
+            var singleRegistrationServiceTypes = SingleRegistrationServiceTypes;
+            foreach (var service in services)
+            {
+                if (singleRegistrationServiceTypes.Contains(service.ServiceType))
+                {
+                    // 'single-registration' services should only have one implementation registered.
+                    AssertServiceCountEquals(services, service.ServiceType, 1);
+                }
+                else
+                {
+                    // 'multi-registration' services should only have one *instance* of each implementation registered.
+                    AssertContainsSingle(services, service.ServiceType, service.ImplementationType);
+                }
+            }
+        }
+
+        [Fact]
+        public void AddMvcCore_UsesOriginalPartManager()
+        {
+            // Arrange
+            var manager = new ApplicationPartManager();
+            var services = new ServiceCollection();
+            services.AddSingleton(manager);
+
+            // Act
+            var builder = services.AddMvcCore();
+
+            // Assert
+            // SingleRegistrationServiceTypes_AreNotRegistered_MultipleTimes already checks that no other
+            // ApplicationPartManager (but manager) is registered.
+            Assert.Same(manager, builder.PartManager);
+            Assert.Contains(manager.FeatureProviders, provider => provider is ControllerFeatureProvider);
+        }
+
+        // Regression test for aspnet/Mvc#5554.
+        [Fact]
+        public void AddMvcCore_UsesLastPartManager()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var mockManager = new Mock<ApplicationPartManager>(MockBehavior.Strict);
+            services.AddSingleton(mockManager.Object);
+
+            var manager = new ApplicationPartManager();
+            services.AddSingleton(manager);
+
+            // Act
+            var builder = services.AddMvcCore();
+
+            // Assert
+            Assert.Same(manager, builder.PartManager);
+            Assert.Contains(manager.FeatureProviders, provider => provider is ControllerFeatureProvider);
+        }
+
+        [Fact]
+        public void AddMvcCore_UsesOriginalHostingEnvironment()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var environment = new Mock<IHostingEnvironment>(MockBehavior.Strict);
+            environment.SetupGet(e => e.ApplicationName).Returns((string)null).Verifiable();
+            services.AddSingleton<IHostingEnvironment>(environment.Object);
+
+            // Act
+            var builder = services.AddMvcCore();
+
+            // Assert
+            Assert.NotNull(builder.PartManager);
+            Assert.Empty(builder.PartManager.ApplicationParts);
+            Assert.Contains(builder.PartManager.FeatureProviders, provider => provider is ControllerFeatureProvider);
+
+            environment.VerifyAll();
+        }
+
+        // Second regression test for aspnet/Mvc#5554.
+        [Fact]
+        public void AddMvcCore_UsesLastHostingEnvironment()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var environment = new Mock<IHostingEnvironment>(MockBehavior.Strict);
+            services.AddSingleton<IHostingEnvironment>(environment.Object);
+
+            environment = new Mock<IHostingEnvironment>(MockBehavior.Strict);
+            environment.SetupGet(e => e.ApplicationName).Returns((string)null).Verifiable();
+            services.AddSingleton<IHostingEnvironment>(environment.Object);
+
+            // Act
+            var builder = services.AddMvcCore();
+
+            // Assert
+            Assert.NotNull(builder.PartManager);
+            Assert.Empty(builder.PartManager.ApplicationParts);
+            Assert.Contains(builder.PartManager.FeatureProviders, provider => provider is ControllerFeatureProvider);
+
+            environment.VerifyAll();
+        }
+
+        [Fact]
+        public void AddMvcCore_GetsPartsForApplication()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var environment = new Mock<IHostingEnvironment>(MockBehavior.Strict);
+            var assemblyName = typeof(MvcCoreServiceCollectionExtensionsTest).GetTypeInfo().Assembly.GetName();
+            var applicationName = assemblyName.FullName;
+            environment.SetupGet(e => e.ApplicationName).Returns(applicationName).Verifiable();
+            services.AddSingleton<IHostingEnvironment>(environment.Object);
+
+            // Act
+            var builder = services.AddMvcCore();
+
+            // Assert
+            Assert.NotNull(builder.PartManager);
+            Assert.Contains(
+                builder.PartManager.ApplicationParts,
+                part => string.Equals(assemblyName.Name, part.Name, StringComparison.Ordinal));
+            Assert.Contains(builder.PartManager.FeatureProviders, provider => provider is ControllerFeatureProvider);
+
+            environment.VerifyAll();
+        }
+
+        private IEnumerable<Type> SingleRegistrationServiceTypes
+        {
+            get
+            {
+                var services = new ServiceCollection();
+                MvcCoreServiceCollectionExtensions.AddMvcCoreServices(services);
+
+                var multiRegistrationServiceTypes = MutliRegistrationServiceTypes;
+                return services
+                    .Where(sd => !multiRegistrationServiceTypes.Keys.Contains(sd.ServiceType))
+                    .Select(sd => sd.ServiceType);
+            }
+        }
+
+        private Dictionary<Type, Type[]> MutliRegistrationServiceTypes
+        {
+            get
+            {
+                return new Dictionary<Type, Type[]>()
+                {
+                    {
+                        typeof(IConfigureOptions<MvcOptions>),
+                        new Type[]
+                        {
+                            typeof(MvcCoreMvcOptionsSetup),
+                        }
+                    },
+                    {
+                        typeof(IPostConfigureOptions<MvcOptions>),
+                        new Type[]
+                        {
+                            typeof(MvcOptionsConfigureCompatibilityOptions),
+                        }
+                    },
+                    {
+                        typeof(IConfigureOptions<RouteOptions>),
+                        new Type[]
+                        {
+                            typeof(MvcCoreRouteOptionsSetup),
+                        }
+                    },
+                    {
+                        typeof(IConfigureOptions<ApiBehaviorOptions>),
+                        new Type[]
+                        {
+                            typeof(ApiBehaviorOptionsSetup),
+                        }
+                    },
+                    {
+                        typeof(IActionConstraintProvider),
+                        new Type[]
+                        {
+                            typeof(DefaultActionConstraintProvider),
+                        }
+                    },
+                    {
+                        typeof(IActionDescriptorProvider),
+                        new Type[]
+                        {
+                            typeof(ControllerActionDescriptorProvider),
+                        }
+                    },
+                    {
+                        typeof(IActionInvokerProvider),
+                        new Type[]
+                        {
+                            typeof(ControllerActionInvokerProvider),
+                        }
+                    },
+                    {
+                        typeof(IFilterProvider),
+                        new Type[]
+                        {
+                            typeof(DefaultFilterProvider),
+                        }
+                    },
+                    {
+                        typeof(IControllerPropertyActivator),
+                        new Type[]
+                        {
+                            typeof(DefaultControllerPropertyActivator),
+                        }
+                    },
+                    {
+                        typeof(IApplicationModelProvider),
+                        new Type[]
+                        {
+                            typeof(DefaultApplicationModelProvider),
+                            typeof(ApiBehaviorApplicationModelProvider),
+                        }
+                    },
+                };
+            }
+        }
+
+        private void AssertServiceCountEquals(
+            IServiceCollection services,
+            Type serviceType,
+            int expectedServiceRegistrationCount)
+        {
+            var serviceDescriptors = services.Where(serviceDescriptor => serviceDescriptor.ServiceType == serviceType);
+            var actual = serviceDescriptors.Count();
+
+            Assert.True(
+                (expectedServiceRegistrationCount == actual),
+                $"Expected service type '{serviceType}' to be registered {expectedServiceRegistrationCount}" +
+                $" time(s) but was actually registered {actual} time(s).");
+        }
+
+        private void AssertContainsSingle(
+            IServiceCollection services,
+            Type serviceType,
+            Type implementationType)
+        {
+            var matches = services
+                .Where(sd =>
+                    sd.ServiceType == serviceType &&
+                    sd.ImplementationType == implementationType)
+                .ToArray();
+
+            if (matches.Length == 0)
+            {
+                Assert.True(
+                    false,
+                    $"Could not find an instance of {implementationType} registered as {serviceType}");
+            }
+            else if (matches.Length > 1)
+            {
+                Assert.True(
+                    false,
+                    $"Found multiple instances of {implementationType} registered as {serviceType}");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/EmptyResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/EmptyResultTests.cs
new file mode 100644
index 0000000000..74d1e40bb6
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/EmptyResultTests.cs
@@ -0,0 +1,30 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Routing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class EmptyResultTests
+    {
+        [Fact]
+        public void EmptyResult_ExecuteResult_IsANoOp()
+        {
+            // Arrange
+            var emptyResult = new EmptyResult();
+
+            var httpContext = new Mock<HttpContext>(MockBehavior.Strict);
+            var routeData = new RouteData();
+            var actionDescriptor = new ActionDescriptor();
+
+            var context = new ActionContext(httpContext.Object, routeData, actionDescriptor);
+
+            // Act & Assert (does not throw)
+            emptyResult.ExecuteResult(context);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FileContentResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FileContentResultTest.cs
new file mode 100644
index 0000000000..e2d0dd087d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FileContentResultTest.cs
@@ -0,0 +1,495 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Net.Http.Headers;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class FileContentResultTest
+    {
+        [Fact]
+        public void Constructor_SetsFileContents()
+        {
+            // Arrange
+            var fileContents = new byte[0];
+
+            // Act
+            var result = new FileContentResult(fileContents, "text/plain");
+
+            // Assert
+            Assert.Same(fileContents, result.FileContents);
+        }
+
+        [Fact]
+        public void Constructor_SetsContentTypeAndParameters()
+        {
+            // Arrange
+            var fileContents = new byte[0];
+            var contentType = "text/plain; charset=us-ascii; p1=p1-value";
+            var expectedMediaType = contentType;
+
+            // Act
+            var result = new FileContentResult(fileContents, contentType);
+
+            // Assert
+            Assert.Same(fileContents, result.FileContents);
+            MediaTypeAssert.Equal(expectedMediaType, result.ContentType);
+        }
+
+        [Fact]
+        public void Constructor_SetsLastModifiedAndEtag()
+        {
+            // Arrange
+            var fileContents = new byte[0];
+            var contentType = "text/plain";
+            var expectedMediaType = contentType;
+            var lastModified = new DateTimeOffset();
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+
+            // Act
+            var result = new FileContentResult(fileContents, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag
+            };
+
+            // Assert
+            Assert.Equal(lastModified, result.LastModified);
+            Assert.Equal(entityTag, result.EntityTag);
+            MediaTypeAssert.Equal(expectedMediaType, result.ContentType);
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_CopiesBuffer_ToOutputStream()
+        {
+            // Arrange
+            var buffer = new byte[] { 1, 2, 3, 4, 5 };
+
+            var httpContext = GetHttpContext();
+
+            var outStream = new MemoryStream();
+            httpContext.Response.Body = outStream;
+
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            var result = new FileContentResult(buffer, "text/plain");
+
+            // Act
+            await result.ExecuteResultAsync(context);
+
+            // Assert
+            Assert.Equal(buffer, outStream.ToArray());
+        }
+
+        [Theory]
+        [InlineData(0, 4, "Hello", 5)]
+        [InlineData(6, 10, "World", 5)]
+        [InlineData(null, 5, "World", 5)]
+        [InlineData(6, null, "World", 5)]
+        public async Task WriteFileAsync_PreconditionStateShouldProcess_WritesRangeRequested(long? start, long? end, string expectedString, long contentLength)
+        {
+            // Arrange
+            var contentType = "text/plain";
+            var lastModified = new DateTimeOffset();
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+            var byteArray = Encoding.ASCII.GetBytes("Hello World");
+
+            var result = new FileContentResult(byteArray, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                EnableRangeProcessing = true,
+            };
+
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.Range = new RangeHeaderValue(start, end);
+            requestHeaders.IfMatch = new[]
+            {
+                new EntityTagHeaderValue("\"Etag\""),
+            };
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            start = start ?? 11 - end;
+            end = start + contentLength - 1;
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(lastModified.ToString("R"), httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal(entityTag.ToString(), httpResponse.Headers[HeaderNames.ETag]);
+            Assert.Equal(StatusCodes.Status206PartialContent, httpResponse.StatusCode);
+            Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]);
+            var contentRange = new ContentRangeHeaderValue(start.Value, end.Value, byteArray.Length);
+            Assert.Equal(contentRange.ToString(), httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.Equal(contentLength, httpResponse.ContentLength);
+            Assert.Equal(expectedString, body);
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_IfRangeHeaderValid_WritesRangeRequest()
+        {
+            // Arrange
+            var contentType = "text/plain";
+            var lastModified = DateTimeOffset.MinValue;
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+            var byteArray = Encoding.ASCII.GetBytes("Hello World");
+
+            var result = new FileContentResult(byteArray, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                EnableRangeProcessing = true,
+            };
+
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfMatch = new[]
+            {
+                new EntityTagHeaderValue("\"Etag\""),
+            };
+            requestHeaders.Range = new RangeHeaderValue(0, 4);
+            requestHeaders.IfRange = new RangeConditionHeaderValue(DateTimeOffset.MinValue);
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(lastModified.ToString("R"), httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal(entityTag.ToString(), httpResponse.Headers[HeaderNames.ETag]);
+
+            if (result.EnableRangeProcessing)
+            {
+                Assert.Equal(StatusCodes.Status206PartialContent, httpResponse.StatusCode);
+                Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]);
+                var contentRange = new ContentRangeHeaderValue(0, 4, byteArray.Length);
+                Assert.Equal(contentRange.ToString(), httpResponse.Headers[HeaderNames.ContentRange]);
+                Assert.Equal(5, httpResponse.ContentLength);
+                Assert.Equal("Hello", body);
+            }
+            else
+            {
+                Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
+                Assert.Equal(11, httpResponse.ContentLength);
+                Assert.Equal("Hello World", body);
+            }
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_RangeProcessingNotEnabled_RangeRequestIgnored()
+        {
+            // Arrange
+            var contentType = "text/plain";
+            var lastModified = DateTimeOffset.MinValue.AddDays(1);
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+            var byteArray = Encoding.ASCII.GetBytes("Hello World");
+
+            var result = new FileContentResult(byteArray, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag
+            };
+
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfMatch = new[]
+            {
+                new EntityTagHeaderValue("\"Etag\""),
+            };
+            requestHeaders.Range = new RangeHeaderValue(0, 4);
+            requestHeaders.IfRange = new RangeConditionHeaderValue(new EntityTagHeaderValue("\"Etag\""));
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
+            Assert.Equal(lastModified.ToString("R"), httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal(entityTag.ToString(), httpResponse.Headers[HeaderNames.ETag]);
+            Assert.Equal("Hello World", body);
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_IfRangeHeaderInvalid_RangeRequestIgnored()
+        {
+            // Arrange
+            var contentType = "text/plain";
+            var lastModified = DateTimeOffset.MinValue.AddDays(1);
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+            var byteArray = Encoding.ASCII.GetBytes("Hello World");
+
+            var result = new FileContentResult(byteArray, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                EnableRangeProcessing = true,
+            };
+
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfMatch = new[]
+            {
+                new EntityTagHeaderValue("\"Etag\""),
+            };
+            requestHeaders.Range = new RangeHeaderValue(0, 4);
+            requestHeaders.IfRange = new RangeConditionHeaderValue(new EntityTagHeaderValue("\"NotEtag\""));
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
+            Assert.Equal(lastModified.ToString("R"), httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal(entityTag.ToString(), httpResponse.Headers[HeaderNames.ETag]);
+            Assert.Equal("Hello World", body);
+        }
+
+        [Theory]
+        [InlineData("0-5")]
+        [InlineData("bytes = ")]
+        [InlineData("bytes = 1-4, 5-11")]
+        public async Task WriteFileAsync_PreconditionStateUnspecified_RangeRequestIgnored(string rangeString)
+        {
+            // Arrange
+            var contentType = "text/plain";
+            var lastModified = new DateTimeOffset();
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+            var byteArray = Encoding.ASCII.GetBytes("Hello World");
+
+            var result = new FileContentResult(byteArray, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                EnableRangeProcessing = true,
+            };
+
+            var httpContext = GetHttpContext();
+            httpContext.Request.Headers[HeaderNames.Range] = rangeString;
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
+            Assert.Equal(lastModified.ToString("R"), httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal(entityTag.ToString(), httpResponse.Headers[HeaderNames.ETag]);
+            Assert.Equal("Hello World", body);
+        }
+
+        [Theory]
+        [InlineData("bytes = 12-13")]
+        [InlineData("bytes = -0")]
+        public async Task WriteFileAsync_PreconditionStateUnspecified_RangeRequestedNotSatisfiable(string rangeString)
+        {
+            // Arrange
+            var contentType = "text/plain";
+            var lastModified = new DateTimeOffset();
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+            var byteArray = Encoding.ASCII.GetBytes("Hello World");
+
+            var result = new FileContentResult(byteArray, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                EnableRangeProcessing = true,
+            };
+
+            var httpContext = GetHttpContext();
+            httpContext.Request.Headers[HeaderNames.Range] = rangeString;
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            var contentRange = new ContentRangeHeaderValue(byteArray.Length);
+            Assert.Equal(lastModified.ToString("R"), httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal(entityTag.ToString(), httpResponse.Headers[HeaderNames.ETag]);
+            Assert.Equal(StatusCodes.Status416RangeNotSatisfiable, httpResponse.StatusCode);
+            Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]);
+            Assert.Equal(contentRange.ToString(), httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.Empty(body);
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_PreconditionFailed_RangeRequestedIgnored()
+        {
+            // Arrange
+            var contentType = "text/plain";
+            var lastModified = new DateTimeOffset();
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+            var byteArray = Encoding.ASCII.GetBytes("Hello World");
+
+            var result = new FileContentResult(byteArray, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                EnableRangeProcessing = true,
+            };
+
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfMatch = new[]
+            {
+                new EntityTagHeaderValue("\"NotEtag\""),
+            };
+            httpContext.Request.Headers[HeaderNames.Range] = "bytes = 0-6";
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(StatusCodes.Status412PreconditionFailed, httpResponse.StatusCode);
+            Assert.Null(httpResponse.ContentLength);
+            Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Empty(body);
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_NotModified_RangeRequestedIgnored()
+        {
+            // Arrange       
+            var contentType = "text/plain";
+            var lastModified = new DateTimeOffset();
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+            var byteArray = Encoding.ASCII.GetBytes("Hello World");
+
+            var result = new FileContentResult(byteArray, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                EnableRangeProcessing = true,
+            };
+
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfNoneMatch = new[]
+            {
+                new EntityTagHeaderValue("\"Etag\""),
+            };
+            httpContext.Request.Headers[HeaderNames.Range] = "bytes = 0-6";
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(StatusCodes.Status304NotModified, httpResponse.StatusCode);
+            Assert.Null(httpResponse.ContentLength);
+            Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Empty(body);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_SetsSuppliedContentTypeAndEncoding()
+        {
+            // Arrange
+            var expectedContentType = "text/foo; charset=us-ascii";
+            var buffer = new byte[] { 1, 2, 3, 4, 5 };
+
+            var httpContext = GetHttpContext();
+
+            var outStream = new MemoryStream();
+            httpContext.Response.Body = outStream;
+
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            var result = new FileContentResult(buffer, expectedContentType);
+
+            // Act
+            await result.ExecuteResultAsync(context);
+
+            // Assert
+            Assert.Equal(buffer, outStream.ToArray());
+            Assert.Equal(expectedContentType, httpContext.Response.ContentType);
+        }
+
+        private static IServiceCollection CreateServices()
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<IActionResultExecutor<FileContentResult>, FileContentResultExecutor>();
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+
+            return services;
+        }
+
+        private static HttpContext GetHttpContext()
+        {
+            var services = CreateServices();
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = services.BuildServiceProvider();
+
+            return httpContext;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FileResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FileResultTest.cs
new file mode 100644
index 0000000000..da6808d055
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FileResultTest.cs
@@ -0,0 +1,541 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Net.Http.Headers;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class FileResultTest
+    {
+        [Fact]
+        public void Constructor_SetsContentType()
+        {
+            // Act
+            var result = new EmptyFileResult("text/plain");
+
+            // Assert
+            Assert.Equal("text/plain", result.ContentType.ToString());
+        }
+
+        [ConditionalFact]
+        [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "Fails due to dotnet/standard#567")]
+        public async Task ContentDispositionHeader_IsEncodedCorrectly()
+        {
+            // See comment in FileResult.cs detailing how the FileDownloadName should be encoded.
+
+            // Arrange
+            var httpContext = GetHttpContext();
+            var actionContext = CreateActionContext(httpContext);
+
+            var result = new EmptyFileResult("application/my-type")
+            {
+                FileDownloadName = @"some\file"
+            };
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.True(result.WasWriteFileCalled);
+
+            Assert.Equal("application/my-type", httpContext.Response.Headers["Content-Type"]);
+            Assert.Equal(@"attachment; filename=""some\\file""; filename*=UTF-8''some%5Cfile", httpContext.Response.Headers["Content-Disposition"]);
+        }
+
+        [ConditionalFact]
+        [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "Fails due to dotnet/standard#567")]
+        public async Task ContentDispositionHeader_IsEncodedCorrectly_ForUnicodeCharacters()
+        {
+            // Arrange
+            var httpContext = GetHttpContext();
+            var actionContext = CreateActionContext(httpContext);
+
+            var result = new EmptyFileResult("application/my-type")
+            {
+                FileDownloadName = "ABCXYZabcxyz012789!@#$%^&*()-=_+.:~Δ"
+            };
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.True(result.WasWriteFileCalled);
+            Assert.Equal("application/my-type", httpContext.Response.Headers["Content-Type"]);
+            Assert.Equal(@"attachment; filename=""ABCXYZabcxyz012789!@#$%^&*()-=_+.:~_""; filename*=UTF-8''ABCXYZabcxyz012789!%40#$%25^&%2A%28%29-%3D_+.%3A~%CE%94",
+                httpContext.Response.Headers["Content-Disposition"]);
+        }
+
+        [ConditionalFact]
+        [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "Fails due to dotnet/standard#567")]
+        public async Task ExecuteResultAsync_DoesNotSetContentDisposition_IfNotSpecified()
+        {
+            // Arrange
+            var provider = new ServiceCollection()
+                .AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance)
+                .AddSingleton<EmptyFileResultExecutor>()
+                .BuildServiceProvider();
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = provider;
+
+            var actionContext = CreateActionContext(httpContext);
+
+            var result = new EmptyFileResult("application/my-type");
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.True(result.WasWriteFileCalled);
+            Assert.Equal("application/my-type", httpContext.Response.ContentType);
+            Assert.Equal(Stream.Null, httpContext.Response.Body);
+        }
+
+        [ConditionalFact]
+        [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "Fails due to dotnet/standard#567")]
+        public async Task ExecuteResultAsync_SetsContentDisposition_IfSpecified()
+        {
+            // Arrange
+            var httpContext = GetHttpContext();
+            var actionContext = CreateActionContext(httpContext);
+
+            var result = new EmptyFileResult("application/my-type")
+            {
+                FileDownloadName = "filename.ext"
+            };
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.True(result.WasWriteFileCalled);
+            Assert.Equal("application/my-type", httpContext.Response.ContentType);
+            Assert.Equal("attachment; filename=filename.ext; filename*=UTF-8''filename.ext", httpContext.Response.Headers["Content-Disposition"]);
+        }
+
+        [ConditionalFact]
+        [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "Fails due to dotnet/standard#567")]
+        public async Task ExecuteResultAsync_ThrowsException_IfCannotResolveLoggerFactory()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = new ServiceCollection().BuildServiceProvider();
+            var actionContext = CreateActionContext(httpContext);
+            var result = new EmptyFileResult("application/my-type");
+
+            // Act & Assert
+            await Assert.ThrowsAsync<InvalidOperationException>(() => result.ExecuteResultAsync(actionContext));
+        }
+
+        public static TheoryData<string, string> ContentDispositionData
+        {
+            get
+            {
+                return new TheoryData<string, string>
+                {
+                    // Non quoted values
+                    { "09aAzZ", "attachment; filename=09aAzZ; filename*=UTF-8''09aAzZ" },
+                    { "a.b", "attachment; filename=a.b; filename*=UTF-8''a.b" },
+                    { "#", "attachment; filename=#; filename*=UTF-8''#" },
+                    { "-", "attachment; filename=-; filename*=UTF-8''-" },
+                    { "_", "attachment; filename=_; filename*=UTF-8''_" },
+                    { "~", "attachment; filename=~; filename*=UTF-8''~" },
+                    { "$", "attachment; filename=$; filename*=UTF-8''$" },
+                    { "&", "attachment; filename=&; filename*=UTF-8''&" },
+                    { "+", "attachment; filename=+; filename*=UTF-8''+" },
+                    { "!", "attachment; filename=!; filename*=UTF-8''!" },
+                    { "^", "attachment; filename=^; filename*=UTF-8''^" },
+                    { "`", "attachment; filename=`; filename*=UTF-8''`" },
+                    { "|", "attachment; filename=|; filename*=UTF-8''|" },
+
+                    // Values that need to be quoted
+                    { ": :", "attachment; filename=\": :\"; filename*=UTF-8''%3A%20%3A" },
+                    { "(", "attachment; filename=\"(\"; filename*=UTF-8''%28" },
+                    { ")", "attachment; filename=\")\"; filename*=UTF-8''%29" },
+                    { "<", "attachment; filename=\"<\"; filename*=UTF-8''%3C" },
+                    { ">", "attachment; filename=\">\"; filename*=UTF-8''%3E" },
+                    { "@", "attachment; filename=\"@\"; filename*=UTF-8''%40" },
+                    { ",", "attachment; filename=\",\"; filename*=UTF-8''%2C" },
+                    { ";", "attachment; filename=\";\"; filename*=UTF-8''%3B" },
+                    { ":", "attachment; filename=\":\"; filename*=UTF-8''%3A" },
+                    { "/", "attachment; filename=\"/\"; filename*=UTF-8''%2F" },
+                    { "[", "attachment; filename=\"[\"; filename*=UTF-8''%5B" },
+                    { "]", "attachment; filename=\"]\"; filename*=UTF-8''%5D" },
+                    { "?", "attachment; filename=\"?\"; filename*=UTF-8''%3F" },
+                    { "=", "attachment; filename=\"=\"; filename*=UTF-8''%3D" },
+                    { "{", "attachment; filename=\"{\"; filename*=UTF-8''%7B" },
+                    { "}", "attachment; filename=\"}\"; filename*=UTF-8''%7D" },
+                    { " ", "attachment; filename=\" \"; filename*=UTF-8''%20" },
+                    { "a\tb", "attachment; filename=\"a\tb\"; filename*=UTF-8''a%09b" },
+                    { "a b", "attachment; filename=\"a b\"; filename*=UTF-8''a%20b" },
+
+                    // Values that need to be escaped
+                    { "\"", "attachment; filename=\"\\\"\"; filename*=UTF-8''%22" },
+                    { "\\", "attachment; filename=\"\\\\\"; filename*=UTF-8''%5C" },
+
+                    // Values that need to be specially encoded (Base64, see rfc2047)
+                    { "a\nb", "attachment; filename=\"a\nb\"; filename*=UTF-8''a%0Ab" },
+
+                    // Values with non unicode characters
+                    { "résumé.txt", "attachment; filename=r_sum_.txt; filename*=UTF-8''r%C3%A9sum%C3%A9.txt" },
+                    { "Δ", "attachment; filename=_; filename*=UTF-8''%CE%94" },
+                    { "Δ\t", "attachment; filename=\"_\t\"; filename*=UTF-8''%CE%94%09" },
+                    { "ABCXYZabcxyz012789!@#$%^&*()-=_+.:~Δ", @"attachment; filename=""ABCXYZabcxyz012789!@#$%^&*()-=_+.:~_""; filename*=UTF-8''ABCXYZabcxyz012789!%40#$%25^&%2A%28%29-%3D_+.%3A~%CE%94" },
+                };
+            }
+        }
+
+        public static TheoryData<string, string> ContentDispositionControlCharactersData
+        {
+            get
+            {
+                var data = new TheoryData<string, string>();
+                for (var i = 0; i < 32; i++)
+                {
+                    if (i == 10)
+                    {
+                        // skip \n as it has a special encoding
+                        continue;
+                    }
+
+                    data.Add(char.ConvertFromUtf32(i), "attachment; filename=\"" + char.ConvertFromUtf32(i) + "\"; filename*=UTF-8''%" + i.ToString("X2"));
+                }
+
+                data.Add(char.ConvertFromUtf32(127), "attachment; filename=\"" + char.ConvertFromUtf32(127) + "\"; filename*=UTF-8''%7F");
+
+                return data;
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ContentDispositionData))]
+        [MemberData(nameof(ContentDispositionControlCharactersData))]
+        public void GetHeaderValue_Produces_Correct_ContentDisposition(string input, string expectedOutput)
+        {
+            // Arrange & Act
+            var cd = new ContentDispositionHeaderValue("attachment");
+            cd.SetHttpFileName(input);
+            var actual = cd.ToString();
+
+            // Assert
+            Assert.Equal(expectedOutput, actual);
+        }
+
+        [ConditionalFact]
+        [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "Fails due to dotnet/standard#567")]
+        public async Task SetsAcceptRangeHeader()
+        {
+            // Arrange
+            var httpContext = GetHttpContext();
+            var actionContext = CreateActionContext(httpContext);
+
+            var result = new EmptyFileResult("application/my-type");
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Equal("bytes", httpContext.Response.Headers[HeaderNames.AcceptRanges]);
+        }
+
+        [Theory]
+        [InlineData("\"Etag\"", "\"NotEtag\"", true, "\"Etag\"")]
+        [InlineData("\"Etag\"", "\"NotEtag\"", false, "\"Etag\"")]
+        [InlineData("\"Etag\"", null, false, null)]
+        [InlineData(null, "\"NotEtag\"", true, "\"Etag\"")]
+        [InlineData(null, "\"NotEtag\"", false, "\"Etag\"")]
+        public void GetPreconditionState_ShouldProcess(string ifMatch, string ifNoneMatch, bool isWeak, string ifRange)
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Method = HttpMethods.Get;
+            var httpRequestHeaders = httpContext.Request.GetTypedHeaders();
+            var lastModified = DateTimeOffset.MinValue;
+            lastModified = new DateTimeOffset(lastModified.Year, lastModified.Month, lastModified.Day, lastModified.Hour, lastModified.Minute, lastModified.Second, TimeSpan.FromSeconds(0));
+            var etag = new EntityTagHeaderValue("\"Etag\"");
+            httpRequestHeaders.IfMatch = ifMatch == null ? null : new[]
+            {
+                new EntityTagHeaderValue(ifMatch),
+            };
+
+            httpRequestHeaders.IfNoneMatch = ifNoneMatch == null ? null : new[]
+            {
+                new EntityTagHeaderValue(ifNoneMatch, isWeak),
+            };
+            httpRequestHeaders.IfRange = ifRange == null ? null : new RangeConditionHeaderValue(ifRange);
+            httpRequestHeaders.IfUnmodifiedSince = lastModified;
+            httpRequestHeaders.IfModifiedSince = DateTimeOffset.MinValue.AddDays(1);
+            actionContext.HttpContext = httpContext;
+            var fileResult = (new Mock<FileResultExecutorBase>(NullLogger.Instance)).Object;
+
+            // Act
+            var state = fileResult.GetPreconditionState(
+                httpRequestHeaders,
+                lastModified,
+                etag);
+
+            // Assert
+            Assert.Equal(FileResultExecutorBase.PreconditionState.ShouldProcess, state);
+        }
+
+        [Theory]
+        [InlineData("\"NotEtag\"", null, true)]
+        [InlineData("\"NotEtag\"", null, false)]
+        [InlineData("\"Etag\"", "\"Etag\"", true)]
+        [InlineData("\"Etag\"", "\"Etag\"", false)]
+        [InlineData(null, null, false)]
+        public void GetPreconditionState_ShouldNotProcess_PreconditionFailed(string ifMatch, string ifNoneMatch, bool isWeak)
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Method = HttpMethods.Delete;
+            var httpRequestHeaders = httpContext.Request.GetTypedHeaders();
+            var lastModified = DateTimeOffset.MinValue.AddDays(1);
+            var etag = new EntityTagHeaderValue("\"Etag\"");
+            httpRequestHeaders.IfMatch = ifMatch == null ? null : new[]
+            {
+                new EntityTagHeaderValue(ifMatch),
+            };
+
+            httpRequestHeaders.IfNoneMatch = ifNoneMatch == null ? null : new[]
+            {
+                new EntityTagHeaderValue(ifNoneMatch, isWeak),
+            };
+            httpRequestHeaders.IfUnmodifiedSince = DateTimeOffset.MinValue;
+            httpRequestHeaders.IfModifiedSince = DateTimeOffset.MinValue.AddDays(2);
+            actionContext.HttpContext = httpContext;
+            var fileResult = (new Mock<FileResultExecutorBase>(NullLogger.Instance)).Object;
+
+            // Act
+            var state = fileResult.GetPreconditionState(
+                httpRequestHeaders,
+                lastModified,
+                etag);
+
+            // Assert
+            Assert.Equal(FileResultExecutorBase.PreconditionState.PreconditionFailed, state);
+        }
+
+        [Theory]
+        [InlineData(null, "\"Etag\"", true)]
+        [InlineData(null, "\"Etag\"", false)]
+        [InlineData(null, null, false)]
+        public void GetPreconditionState_ShouldNotProcess_NotModified(string ifMatch, string ifNoneMatch, bool isWeak)
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Method = HttpMethods.Get;
+            var httpRequestHeaders = httpContext.Request.GetTypedHeaders();
+            var lastModified = DateTimeOffset.MinValue;
+            lastModified = new DateTimeOffset(lastModified.Year, lastModified.Month, lastModified.Day, lastModified.Hour, lastModified.Minute, lastModified.Second, TimeSpan.FromSeconds(0));
+            var etag = new EntityTagHeaderValue("\"Etag\"");
+            httpRequestHeaders.IfMatch = ifMatch == null ? null : new[]
+            {
+                new EntityTagHeaderValue(ifMatch),
+            };
+
+            httpRequestHeaders.IfNoneMatch = ifNoneMatch == null ? null : new[]
+            {
+                new EntityTagHeaderValue(ifNoneMatch, isWeak),
+            };
+            httpRequestHeaders.IfModifiedSince = lastModified;
+            actionContext.HttpContext = httpContext;
+            var fileResult = (new Mock<FileResultExecutorBase>(NullLogger.Instance)).Object;
+
+            // Act
+            var state = fileResult.GetPreconditionState(
+                httpRequestHeaders,
+                lastModified,
+                etag);
+
+            // Assert
+            Assert.Equal(FileResultExecutorBase.PreconditionState.NotModified, state);
+        }
+
+        [Theory]
+        [InlineData("\"NotEtag\"", false)]
+        [InlineData("\"Etag\"", true)]
+        public void IfRangeValid_IgnoreRangeRequest(string ifRangeString, bool expected)
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Method = HttpMethods.Get;
+            var httpRequestHeaders = httpContext.Request.GetTypedHeaders();
+            var lastModified = DateTimeOffset.MinValue;
+            lastModified = new DateTimeOffset(lastModified.Year, lastModified.Month, lastModified.Day, lastModified.Hour, lastModified.Minute, lastModified.Second, TimeSpan.FromSeconds(0));
+            var etag = new EntityTagHeaderValue("\"Etag\"");
+            httpRequestHeaders.IfRange = new RangeConditionHeaderValue(ifRangeString);
+            httpRequestHeaders.IfModifiedSince = lastModified;
+            actionContext.HttpContext = httpContext;
+            var fileResult = (new Mock<FileResultExecutorBase>(NullLogger.Instance)).Object;
+
+            // Act
+            var ifRangeIsValid = fileResult.IfRangeValid(
+                httpRequestHeaders,
+                lastModified,
+                etag);
+
+            // Assert
+            Assert.Equal(expected, ifRangeIsValid);
+        }
+
+        public static TheoryData<DateTimeOffset, int> LastModifiedDateData
+        {
+            get
+            {
+                return new TheoryData<DateTimeOffset, int>()
+                {
+                    { new DateTimeOffset(2018, 4, 9, 11, 23, 22, TimeSpan.Zero), 200 },
+                    { new DateTimeOffset(2018, 4, 9, 11, 24, 21, TimeSpan.Zero), 200 },
+                    { new DateTimeOffset(2018, 4, 9, 11, 24, 22, TimeSpan.Zero), 304 },
+                    { new DateTimeOffset(2018, 4, 9, 11, 24, 23, TimeSpan.Zero), 304 },
+                    { new DateTimeOffset(2018, 4, 9, 11, 25, 22, TimeSpan.Zero), 304 },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(LastModifiedDateData))]
+        public async Task IfModifiedSinceComparison_OnlyUsesWholeSeconds(
+            DateTimeOffset ifModifiedSince,
+            int expectedStatusCode)
+        {
+            // Arrange
+            var httpContext = GetHttpContext();
+            httpContext.Request.Headers[HeaderNames.IfModifiedSince] = HeaderUtilities.FormatDate(ifModifiedSince);
+            var actionContext = CreateActionContext(httpContext);
+            // Represents 4/9/2018 11:24:22 AM +00:00
+            // Ticks rounded down to seconds: 636588698620000000
+            var ticks = 636588698625969382;
+            var result = new EmptyFileResult("application/test")
+            {
+                LastModified = new DateTimeOffset(ticks, TimeSpan.Zero)
+            };
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Equal(expectedStatusCode, httpContext.Response.StatusCode);
+        }
+
+        public static TheoryData<DateTimeOffset, int> IfUnmodifiedSinceDateData
+        {
+            get
+            {
+                return new TheoryData<DateTimeOffset, int>()
+                {
+                    { new DateTimeOffset(2018, 4, 9, 11, 23, 22, TimeSpan.Zero), 412 },
+                    { new DateTimeOffset(2018, 4, 9, 11, 24, 21, TimeSpan.Zero), 412 },
+                    { new DateTimeOffset(2018, 4, 9, 11, 24, 22, TimeSpan.Zero), 200 },
+                    { new DateTimeOffset(2018, 4, 9, 11, 24, 23, TimeSpan.Zero), 200 },
+                    { new DateTimeOffset(2018, 4, 9, 11, 25, 22, TimeSpan.Zero), 200 },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(IfUnmodifiedSinceDateData))]
+        public async Task IfUnmodifiedSinceComparison_OnlyUsesWholeSeconds(DateTimeOffset ifUnmodifiedSince, int expectedStatusCode)
+        {
+            // Arrange
+            var httpContext = GetHttpContext();
+            httpContext.Request.Headers[HeaderNames.IfUnmodifiedSince] = HeaderUtilities.FormatDate(ifUnmodifiedSince);
+            var actionContext = CreateActionContext(httpContext);
+            // Represents 4/9/2018 11:24:22 AM +00:00
+            // Ticks rounded down to seconds: 636588698620000000
+            var ticks = 636588698625969382;
+            var result = new EmptyFileResult("application/test")
+            {
+                LastModified = new DateTimeOffset(ticks, TimeSpan.Zero)
+            };
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Equal(expectedStatusCode, httpContext.Response.StatusCode);
+        }
+
+        private static IServiceCollection CreateServices()
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<EmptyFileResultExecutor>();
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+            return services;
+        }
+
+        private static HttpContext GetHttpContext()
+        {
+            var services = CreateServices();
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = services.BuildServiceProvider();
+
+            return httpContext;
+        }
+
+        private static ActionContext CreateActionContext(HttpContext context)
+        {
+            return new ActionContext(context, new RouteData(), new ActionDescriptor());
+        }
+
+        private class EmptyFileResult : FileResult
+        {
+            public bool WasWriteFileCalled;
+
+            public EmptyFileResult()
+                : base("application/octet")
+            {
+            }
+
+            public EmptyFileResult(string contentType)
+                : base(contentType)
+            {
+            }
+
+            public override Task ExecuteResultAsync(ActionContext context)
+            {
+                var executor = context.HttpContext.RequestServices.GetRequiredService<EmptyFileResultExecutor>();
+                return executor.ExecuteAsync(context, this);
+            }
+        }
+
+        private class EmptyFileResultExecutor : FileResultExecutorBase
+        {
+            public EmptyFileResultExecutor(ILoggerFactory loggerFactory)
+                : base(CreateLogger<EmptyFileResultExecutor>(loggerFactory))
+            {
+            }
+
+            public Task ExecuteAsync(ActionContext context, EmptyFileResult result)
+            {
+                SetHeadersAndLog(
+                    context,
+                    result,
+                    fileLength: 0L,
+                    enableRangeProcessing: true,
+                    lastModified: result.LastModified);
+                result.WasWriteFileCalled = true;
+                return Task.FromResult(0);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FileStreamResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FileStreamResultTest.cs
new file mode 100644
index 0000000000..081eaf7b81
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FileStreamResultTest.cs
@@ -0,0 +1,627 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Net.Http.Headers;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class FileStreamResultTest
+    {
+        [Fact]
+        public void Constructor_SetsFileName()
+        {
+            // Arrange
+            var stream = Stream.Null;
+
+            // Act
+            var result = new FileStreamResult(stream, "text/plain");
+
+            // Assert
+            Assert.Equal(stream, result.FileStream);
+        }
+
+        [Fact]
+        public void Constructor_SetsContentTypeAndParameters()
+        {
+            // Arrange
+            var stream = Stream.Null;
+            var contentType = "text/plain; charset=us-ascii; p1=p1-value";
+            var expectedMediaType = contentType;
+
+            // Act
+            var result = new FileStreamResult(stream, contentType);
+
+            // Assert
+            Assert.Equal(stream, result.FileStream);
+            MediaTypeAssert.Equal(expectedMediaType, result.ContentType);
+        }
+
+        [Fact]
+        public void Constructor_SetsLastModifiedAndEtag()
+        {
+            // Arrange
+            var stream = Stream.Null;
+            var contentType = "text/plain";
+            var expectedMediaType = contentType;
+            var lastModified = new DateTimeOffset();
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+
+            // Act
+            var result = new FileStreamResult(stream, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+            };
+
+            // Assert
+            Assert.Equal(lastModified, result.LastModified);
+            Assert.Equal(entityTag, result.EntityTag);
+            MediaTypeAssert.Equal(expectedMediaType, result.ContentType);
+        }
+
+        [Theory]
+        [InlineData(0, 4, "Hello", 5)]
+        [InlineData(6, 10, "World", 5)]
+        [InlineData(null, 5, "World", 5)]
+        [InlineData(6, null, "World", 5)]
+        public async Task WriteFileAsync_PreconditionStateShouldProcess_WritesRangeRequested(long? start, long? end, string expectedString, long contentLength)
+        {
+            // Arrange
+            var contentType = "text/plain";
+            var lastModified = new DateTimeOffset();
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+            var byteArray = Encoding.ASCII.GetBytes("Hello World");
+            var readStream = new MemoryStream(byteArray);
+            readStream.SetLength(11);
+
+            var result = new FileStreamResult(readStream, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                EnableRangeProcessing = true,
+            };
+
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.Range = new RangeHeaderValue(start, end);
+            requestHeaders.IfMatch = new[]
+            {
+                new EntityTagHeaderValue("\"Etag\""),
+            };
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            start = start ?? 11 - end;
+            end = start + contentLength - 1;
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            var contentRange = new ContentRangeHeaderValue(start.Value, end.Value, byteArray.Length);
+            Assert.Equal(lastModified.ToString("R"), httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal(entityTag.ToString(), httpResponse.Headers[HeaderNames.ETag]);
+            Assert.Equal(StatusCodes.Status206PartialContent, httpResponse.StatusCode);
+            Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]);
+            Assert.Equal(contentRange.ToString(), httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.Equal(contentLength, httpResponse.ContentLength);
+            Assert.Equal(expectedString, body);
+            Assert.False(readStream.CanSeek);
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_IfRangeHeaderValid_WritesRequestedRange()
+        {
+            // Arrange
+            var contentType = "text/plain";
+            var lastModified = DateTimeOffset.MinValue;
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+            var byteArray = Encoding.ASCII.GetBytes("Hello World");
+            var readStream = new MemoryStream(byteArray);
+            readStream.SetLength(11);
+
+            var result = new FileStreamResult(readStream, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                EnableRangeProcessing = true,
+            };
+
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfMatch = new[]
+            {
+                new EntityTagHeaderValue("\"Etag\""),
+            };
+            requestHeaders.Range = new RangeHeaderValue(0, 4);
+            requestHeaders.IfRange = new RangeConditionHeaderValue(new EntityTagHeaderValue("\"Etag\""));
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(lastModified.ToString("R"), httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal(entityTag.ToString(), httpResponse.Headers[HeaderNames.ETag]);
+            var contentRange = new ContentRangeHeaderValue(0, 4, byteArray.Length);
+            Assert.Equal(StatusCodes.Status206PartialContent, httpResponse.StatusCode);
+            Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]);
+            Assert.Equal(contentRange.ToString(), httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.Equal(5, httpResponse.ContentLength);
+            Assert.Equal("Hello", body);
+            Assert.False(readStream.CanSeek);
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_RangeProcessingNotEnabled_RangeRequestedIgnored()
+        {
+            // Arrange
+            var contentType = "text/plain";
+            var lastModified = DateTimeOffset.MinValue;
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+            var byteArray = Encoding.ASCII.GetBytes("Hello World");
+            var readStream = new MemoryStream(byteArray);
+            readStream.SetLength(11);
+
+            var result = new FileStreamResult(readStream, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+            };
+
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfMatch = new[]
+            {
+                new EntityTagHeaderValue("\"Etag\""),
+            };
+            requestHeaders.Range = new RangeHeaderValue(0, 4);
+            requestHeaders.IfRange = new RangeConditionHeaderValue(DateTimeOffset.MinValue);
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
+            Assert.Equal(lastModified.ToString("R"), httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal(entityTag.ToString(), httpResponse.Headers[HeaderNames.ETag]);
+            Assert.Equal("Hello World", body);
+            Assert.False(readStream.CanSeek);
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_IfRangeHeaderInvalid_RangeRequestedIgnored()
+        {
+            // Arrange
+            var contentType = "text/plain";
+            var lastModified = DateTimeOffset.MinValue.AddDays(1);
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+            var byteArray = Encoding.ASCII.GetBytes("Hello World");
+            var readStream = new MemoryStream(byteArray);
+            readStream.SetLength(11);
+
+            var result = new FileStreamResult(readStream, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                EnableRangeProcessing = true,
+            };
+
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfMatch = new[]
+            {
+                new EntityTagHeaderValue("\"Etag\""),
+            };
+            requestHeaders.Range = new RangeHeaderValue(0, 4);
+            requestHeaders.IfRange = new RangeConditionHeaderValue(DateTimeOffset.MinValue);
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
+            Assert.Equal(lastModified.ToString("R"), httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal(entityTag.ToString(), httpResponse.Headers[HeaderNames.ETag]);
+            Assert.Equal("Hello World", body);
+            Assert.False(readStream.CanSeek);
+        }
+
+        [Theory]
+        [InlineData("0-5")]
+        [InlineData("bytes = ")]
+        [InlineData("bytes = 1-4, 5-11")]
+        public async Task WriteFileAsync_PreconditionStateUnspecified_RangeRequestIgnored(string rangeString)
+        {
+            // Arrange            
+            var contentType = "text/plain";
+            var lastModified = new DateTimeOffset();
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+            var byteArray = Encoding.ASCII.GetBytes("Hello World");
+            var readStream = new MemoryStream(byteArray);
+
+            var result = new FileStreamResult(readStream, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                EnableRangeProcessing = true,
+            };
+
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            httpContext.Request.Headers[HeaderNames.Range] = rangeString;
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
+            Assert.Equal(lastModified.ToString("R"), httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal(entityTag.ToString(), httpResponse.Headers[HeaderNames.ETag]);
+            Assert.Equal("Hello World", body);
+            Assert.False(readStream.CanSeek);
+        }
+
+        [Theory]
+        [InlineData("bytes = 12-13")]
+        [InlineData("bytes = -0")]
+        public async Task WriteFileAsync_PreconditionStateUnspecified_RangeRequestedNotSatisfiable(string rangeString)
+        {
+            // Arrange            
+            var contentType = "text/plain";
+            var lastModified = new DateTimeOffset();
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+            var byteArray = Encoding.ASCII.GetBytes("Hello World");
+            var readStream = new MemoryStream(byteArray);
+
+            var result = new FileStreamResult(readStream, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                EnableRangeProcessing = true,
+            };
+
+            var httpContext = GetHttpContext();
+            httpContext.Request.Headers[HeaderNames.Range] = rangeString;
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            var contentRange = new ContentRangeHeaderValue(byteArray.Length);
+            Assert.Equal(lastModified.ToString("R"), httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal(entityTag.ToString(), httpResponse.Headers[HeaderNames.ETag]);
+            Assert.Equal(StatusCodes.Status416RangeNotSatisfiable, httpResponse.StatusCode);
+            Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]);
+            Assert.Equal(contentRange.ToString(), httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.Equal(11, httpResponse.ContentLength);
+            Assert.Empty(body);
+            Assert.False(readStream.CanSeek);
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_RangeRequested_PreconditionFailed()
+        {
+            // Arrange
+            var contentType = "text/plain";
+            var lastModified = new DateTimeOffset();
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+            var byteArray = Encoding.ASCII.GetBytes("Hello World");
+            var readStream = new MemoryStream(byteArray);
+
+            var result = new FileStreamResult(readStream, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                EnableRangeProcessing = true,
+            };
+
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfMatch = new[]
+            {
+                new EntityTagHeaderValue("\"NotEtag\""),
+            };
+            httpContext.Request.Headers[HeaderNames.Range] = "bytes = 0-6";
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(StatusCodes.Status412PreconditionFailed, httpResponse.StatusCode);
+            Assert.Null(httpResponse.ContentLength);
+            Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Empty(body);
+            Assert.False(readStream.CanSeek);
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_NotModified_RangeRequestedIgnored()
+        {
+            // Arrange       
+            var contentType = "text/plain";
+            var lastModified = new DateTimeOffset();
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+            var byteArray = Encoding.ASCII.GetBytes("Hello World");
+            var readStream = new MemoryStream(byteArray);
+
+            var result = new FileStreamResult(readStream, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                EnableRangeProcessing = true,
+            };
+
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfNoneMatch = new[]
+            {
+                new EntityTagHeaderValue("\"Etag\""),
+            };
+            httpContext.Request.Headers[HeaderNames.Range] = "bytes = 0-6";
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(StatusCodes.Status304NotModified, httpResponse.StatusCode);
+            Assert.Null(httpResponse.ContentLength);
+            Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Empty(body);
+            Assert.False(readStream.CanSeek);
+        }
+
+        [Theory]
+        [InlineData(0)]
+        [InlineData(null)]
+        public async Task WriteFileAsync_RangeRequested_FileLengthZeroOrNull(long? fileLength)
+        {
+            // Arrange
+            var contentType = "text/plain";
+            var lastModified = new DateTimeOffset();
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+            var byteArray = Encoding.ASCII.GetBytes("");
+            var readStream = new MemoryStream(byteArray);
+            fileLength = fileLength ?? 0L;
+            readStream.SetLength(fileLength.Value);
+            var result = new FileStreamResult(readStream, contentType)
+            {
+                LastModified = lastModified,
+                EntityTag = entityTag,
+                EnableRangeProcessing = true,
+            };
+
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.Range = new RangeHeaderValue(0, 5);
+            requestHeaders.IfMatch = new[]
+            {
+                new EntityTagHeaderValue("\"Etag\""),
+            };
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(lastModified.ToString("R"), httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal(entityTag.ToString(), httpResponse.Headers[HeaderNames.ETag]);
+            var contentRange = new ContentRangeHeaderValue(byteArray.Length);
+            Assert.Equal(StatusCodes.Status416RangeNotSatisfiable, httpResponse.StatusCode);
+            Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]);
+            Assert.Equal(contentRange.ToString(), httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.Empty(body);
+            Assert.False(readStream.CanSeek);
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_WritesResponse_InChunksOfFourKilobytes()
+        {
+            // Arrange
+            var mockReadStream = new Mock<Stream>();
+            mockReadStream.SetupSequence(s => s.ReadAsync(It.IsAny<byte[]>(), 0, 0x1000, CancellationToken.None))
+                .Returns(Task.FromResult(0x1000))
+                .Returns(Task.FromResult(0x500))
+                .Returns(Task.FromResult(0));
+
+            var mockBodyStream = new Mock<Stream>();
+            mockBodyStream
+                .Setup(s => s.WriteAsync(It.IsAny<byte[]>(), 0, 0x1000, CancellationToken.None))
+                .Returns(Task.FromResult(0));
+
+            mockBodyStream
+                .Setup(s => s.WriteAsync(It.IsAny<byte[]>(), 0, 0x500, CancellationToken.None))
+                .Returns(Task.FromResult(0));
+
+            var result = new FileStreamResult(mockReadStream.Object, "text/plain");
+
+            var httpContext = GetHttpContext();
+            httpContext.Response.Body = mockBodyStream.Object;
+
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            mockReadStream.Verify();
+            mockBodyStream.Verify();
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_CopiesProvidedStream_ToOutputStream()
+        {
+            // Arrange
+            // Generate an array of bytes with a predictable pattern
+            // 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, A, B, C, D, E, F, 10, 11, 12, 13
+            var originalBytes = Enumerable.Range(0, 0x1234)
+                .Select(b => (byte)(b % 20)).ToArray();
+
+            var originalStream = new MemoryStream(originalBytes);
+
+            var httpContext = GetHttpContext();
+            var outStream = new MemoryStream();
+            httpContext.Response.Body = outStream;
+
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            var result = new FileStreamResult(originalStream, "text/plain");
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var outBytes = outStream.ToArray();
+            Assert.True(originalBytes.SequenceEqual(outBytes));
+            Assert.False(originalStream.CanSeek);
+        }
+
+        [Fact]
+        public async Task SetsSuppliedContentTypeAndEncoding()
+        {
+            // Arrange
+            var expectedContentType = "text/foo; charset=us-ascii";
+            // Generate an array of bytes with a predictable pattern
+            // 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, A, B, C, D, E, F, 10, 11, 12, 13
+            var originalBytes = Enumerable.Range(0, 0x1234)
+                .Select(b => (byte)(b % 20)).ToArray();
+
+            var originalStream = new MemoryStream(originalBytes);
+
+            var httpContext = GetHttpContext();
+            var outStream = new MemoryStream();
+            httpContext.Response.Body = outStream;
+
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            var result = new FileStreamResult(originalStream, expectedContentType);
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var outBytes = outStream.ToArray();
+            Assert.True(originalBytes.SequenceEqual(outBytes));
+            Assert.Equal(expectedContentType, httpContext.Response.ContentType);
+            Assert.False(originalStream.CanSeek);
+        }
+
+        [Fact]
+        public async Task HeadRequest_DoesNotWriteToBody_AndClosesReadStream()
+        {
+            // Arrange
+            var readStream = new MemoryStream(Encoding.UTF8.GetBytes("Hello, World!"));
+
+            var httpContext = GetHttpContext();
+            httpContext.Request.Method = "HEAD";
+            var outStream = new MemoryStream();
+            httpContext.Response.Body = outStream;
+
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            var result = new FileStreamResult(readStream, "text/plain");
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.False(readStream.CanSeek);
+            Assert.Equal(200, httpContext.Response.StatusCode);
+            Assert.Equal(0, httpContext.Response.Body.Length);
+        }
+
+        private static IServiceCollection CreateServices()
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<IActionResultExecutor<FileStreamResult>, FileStreamResultExecutor>();
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+            return services;
+        }
+
+        private static HttpContext GetHttpContext()
+        {
+            var services = CreateServices();
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = services.BuildServiceProvider();
+            return httpContext;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs
new file mode 100644
index 0000000000..575606c785
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs
@@ -0,0 +1,42 @@
+// 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.
+
+using System.Threading.Tasks;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    public class ActionFilterAttributeTests
+    {
+        [Fact]
+        public async Task ActionFilterAttribute_ActionFilter_SettingResult_ShortCircuits()
+        {
+            await CommonFilterTest.ActionFilter_SettingResult_ShortCircuits(new Mock<ActionFilterAttribute>());
+        }
+
+        [Fact]
+        public async Task ActionAttributeFilter_ActionFilter_Calls_OnActionExecuted()
+        {
+            await CommonFilterTest.ActionFilter_Calls_OnActionExecuted(new Mock<ActionFilterAttribute>());
+        }
+
+        [Fact]
+        public async Task ActionAttributeFilter_ResultFilter_Calls_OnResultExecuted()
+        {
+            await CommonFilterTest.ResultFilter_Calls_OnResultExecuted(new Mock<ActionFilterAttribute>());
+        }
+
+        [Fact]
+        public async Task ActionFilterAttribute_ResultFilter_SettingResult_DoesNotShortCircuit()
+        {
+            await CommonFilterTest.ResultFilter_SettingResult_DoesNotShortCircuit(new Mock<ActionFilterAttribute>());
+        }
+
+        [Fact]
+        public async Task ActionFilterAttribute_ResultFilter_SettingCancel_ShortCircuits()
+        {
+            await CommonFilterTest.ResultFilter_SettingCancel_ShortCircuits(new Mock<ActionFilterAttribute>());
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/FilterCollectionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/FilterCollectionTest.cs
new file mode 100644
index 0000000000..971e43eebf
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/FilterCollectionTest.cs
@@ -0,0 +1,166 @@
+// 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.
+
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    public class FilterCollectionTest
+    {
+        [Fact]
+        public void Add_UsesTypeFilterAttribute()
+        {
+            // Arrange
+            var collection = new FilterCollection();
+
+            // Act
+            var added = collection.Add(typeof(MyFilter));
+
+            // Assert
+            var typeFilter = Assert.IsType<TypeFilterAttribute>(added);
+            Assert.Equal(typeof(MyFilter), typeFilter.ImplementationType);
+            Assert.Same(typeFilter, Assert.Single(collection));
+        }
+
+        [Fact]
+        public void GenericAdd_UsesTypeFilterAttribute()
+        {
+            // Arrange
+            var collection = new FilterCollection();
+
+            // Act
+            var added = collection.Add<MyFilter>();
+
+            // Assert
+            var typeFilter = Assert.IsType<TypeFilterAttribute>(added);
+            Assert.Equal(typeof(MyFilter), typeFilter.ImplementationType);
+            Assert.Same(typeFilter, Assert.Single(collection));
+        }
+
+        [Fact]
+        public void Add_WithOrder_SetsOrder()
+        {
+            // Arrange
+            var collection = new FilterCollection();
+
+            // Act
+            var added = collection.Add(typeof(MyFilter), 17);
+
+            // Assert
+            Assert.Equal(17, Assert.IsAssignableFrom<IOrderedFilter>(added).Order);
+        }
+
+        [Fact]
+        public void GenericAdd_WithOrder_SetsOrder()
+        {
+            // Arrange
+            var collection = new FilterCollection();
+
+            // Act
+            var added = collection.Add<MyFilter>(17);
+
+            // Assert
+            Assert.Equal(17, Assert.IsAssignableFrom<IOrderedFilter>(added).Order);
+        }
+
+        [Fact]
+        public void Add_ThrowsOnNonIFilter()
+        {
+            // Arrange
+            var collection = new FilterCollection();
+
+            var expectedMessage = $"The type '{typeof(NonFilter).FullName}' must derive from " + $"'{typeof(IFilterMetadata).FullName}'.";
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => collection.Add(typeof(NonFilter)),
+                "filterType",
+                expectedMessage);
+        }
+
+        [Fact]
+        public void AddService_UsesServiceFilterAttribute()
+        {
+            // Arrange
+            var collection = new FilterCollection();
+
+            // Act
+            var added = collection.AddService(typeof(MyFilter));
+
+            // Assert
+            var serviceFilter = Assert.IsType<ServiceFilterAttribute>(added);
+            Assert.Equal(typeof(MyFilter), serviceFilter.ServiceType);
+            Assert.Same(serviceFilter, Assert.Single(collection));
+        }
+
+        [Fact]
+        public void GenericAddService_UsesServiceFilterAttribute()
+        {
+            // Arrange
+            var collection = new FilterCollection();
+
+            // Act
+            var added = collection.AddService<MyFilter>();
+
+            // Assert
+            var serviceFilter = Assert.IsType<ServiceFilterAttribute>(added);
+            Assert.Equal(typeof(MyFilter), serviceFilter.ServiceType);
+            Assert.Same(serviceFilter, Assert.Single(collection));
+        }
+
+        [Fact]
+        public void AddService_SetsOrder()
+        {
+            // Arrange
+            var collection = new FilterCollection();
+
+            // Act
+            var added = collection.AddService(typeof(MyFilter), 17);
+
+            // Assert
+            Assert.Equal(17, Assert.IsAssignableFrom<IOrderedFilter>(added).Order);
+        }
+
+        [Fact]
+        public void GenericAddService_SetsOrder()
+        {
+            // Arrange
+            var collection = new FilterCollection();
+
+            // Act
+            var added = collection.AddService<MyFilter>(17);
+
+            // Assert
+            Assert.Equal(17, Assert.IsAssignableFrom<IOrderedFilter>(added).Order);
+        }
+
+        [Fact]
+        public void AddService_ThrowsOnNonIFilter()
+        {
+            // Arrange
+            var collection = new FilterCollection();
+
+            var expectedMessage = $"The type '{typeof(NonFilter).FullName}' must derive from '{typeof(IFilterMetadata).FullName}'.";
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => { collection.AddService(typeof(NonFilter)); },
+                "filterType",
+                expectedMessage);
+        }
+
+        private class MyFilter : IFilterMetadata, IOrderedFilter
+        {
+            public int Order
+            {
+                get;
+                set;
+            }
+        }
+
+        private class NonFilter
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterAttributeTest.cs
new file mode 100644
index 0000000000..bedfd14f4a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterAttributeTest.cs
@@ -0,0 +1,63 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class MiddlewareFilterAttributeTest
+    {
+        [Fact]
+        public void CreatesMiddlewareFilter_WithConfiguredPipeline()
+        {
+            // Arrange
+            var middlewareFilterAttribute = new MiddlewareFilterAttribute(typeof(Pipeline1));
+            var services = new ServiceCollection();
+            services.AddSingleton(new MiddlewareFilterBuilder(new MiddlewareFilterConfigurationProvider()));
+            var serviceProvider = services.BuildServiceProvider();
+            var filterBuilderService = serviceProvider.GetRequiredService<MiddlewareFilterBuilder>();
+            filterBuilderService.ApplicationBuilder = new ApplicationBuilder(serviceProvider);
+            var configureCallCount = 0;
+            Pipeline1.ConfigurePipeline = (ab) =>
+            {
+                configureCallCount++;
+                ab.Use((httpCtxt, next) =>
+                {
+                    return next();
+                });
+            };
+
+            // Act
+            var filter = middlewareFilterAttribute.CreateInstance(serviceProvider);
+
+            // Assert
+            var middlewareFilter = Assert.IsType<MiddlewareFilter>(filter);
+            Assert.NotNull(middlewareFilter);
+            Assert.Equal(1, configureCallCount);
+        }
+
+        private class Pipeline1
+        {
+            public static Action<IApplicationBuilder> ConfigurePipeline { get; set; }
+
+            public void Configure(IApplicationBuilder appBuilder)
+            {
+                ConfigurePipeline(appBuilder);
+            }
+        }
+
+        private class Pipeline2
+        {
+            public static Action<IApplicationBuilder> ConfigurePipeline { get; set; }
+
+            public void Configure(IApplicationBuilder appBuilder)
+            {
+                ConfigurePipeline(appBuilder);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ResultFilterAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ResultFilterAttributeTest.cs
new file mode 100644
index 0000000000..bfec55fb06
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ResultFilterAttributeTest.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using System.Threading.Tasks;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    // These tests share code with the ActionFilterAttribute tests because the IAsyncResultFilter
+    // implementations need to behave the same way.
+    public class ResultFilterAttributeTest
+    {
+        [Fact]
+        public async Task ResultFilterAttribute_ResultFilter_Calls_OnResultExecuted()
+        {
+            await CommonFilterTest.ResultFilter_Calls_OnResultExecuted(
+                new Mock<ResultFilterAttribute>());
+        }
+
+        [Fact]
+        public async Task ResultFilterAttribute_ResultFilter_SettingResult_DoesNotShortCircuit()
+        {
+            await CommonFilterTest.ResultFilter_SettingResult_DoesNotShortCircuit(
+                new Mock<ResultFilterAttribute>());
+        }
+
+        [Fact]
+        public async Task ResultFilterAttribute_ResultFilter_SettingCancel_ShortCircuits()
+        {
+            await CommonFilterTest.ResultFilter_SettingCancel_ShortCircuits(
+                new Mock<ResultFilterAttribute>());
+        }
+    }
+}
+
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FlushReportingStream.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FlushReportingStream.cs
new file mode 100644
index 0000000000..65f2af8e38
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FlushReportingStream.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using System.IO;
+using System.Threading;
+using Moq;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public static class FlushReportingStream
+    {
+        public static Stream GetThrowingStream()
+        {
+            var mock = new Mock<Stream>();
+            mock.Verify(m => m.Flush(), Times.Never());
+            mock.Verify(m => m.FlushAsync(It.IsAny<CancellationToken>()), Times.Never());
+
+            return mock.Object;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ForbidResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ForbidResultTest.cs
new file mode 100644
index 0000000000..0e94026c38
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ForbidResultTest.cs
@@ -0,0 +1,150 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class ForbidResultTest
+    {
+        [Fact]
+        public async Task ExecuteResultAsync_InvokesForbidAsyncOnAuthenticationService()
+        {
+            // Arrange
+            var httpContext = new Mock<HttpContext>();
+            var auth = new Mock<IAuthenticationService>();
+            auth
+                .Setup(c => c.ForbidAsync(httpContext.Object, "", null))
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+            httpContext.Setup(c => c.RequestServices).Returns(CreateServices(auth.Object));
+            var result = new ForbidResult("", null);
+            var routeData = new RouteData();
+
+            var actionContext = new ActionContext(
+                httpContext.Object,
+                routeData,
+                new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            auth.Verify();
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_InvokesForbidAsyncOnAllConfiguredSchemes()
+        {
+            // Arrange
+            var httpContext = new Mock<HttpContext>();
+            var authProperties = new AuthenticationProperties();
+            var auth = new Mock<IAuthenticationService>();
+            auth
+                .Setup(c => c.ForbidAsync(httpContext.Object, "Scheme1", authProperties))
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+            auth
+                .Setup(c => c.ForbidAsync(httpContext.Object, "Scheme2", authProperties))
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+            httpContext.Setup(c => c.RequestServices).Returns(CreateServices(auth.Object));
+            var result = new ForbidResult(new[] { "Scheme1", "Scheme2" }, authProperties);
+            var routeData = new RouteData();
+
+            var actionContext = new ActionContext(
+                httpContext.Object,
+                routeData,
+                new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            auth.Verify();
+        }
+
+        public static TheoryData ExecuteResultAsync_InvokesForbidAsyncWithAuthPropertiesData =>
+            new TheoryData<AuthenticationProperties>
+            {
+                null,
+                new AuthenticationProperties()
+            };
+
+        [Theory]
+        [MemberData(nameof(ExecuteResultAsync_InvokesForbidAsyncWithAuthPropertiesData))]
+        public async Task ExecuteResultAsync_InvokesForbidAsyncWithAuthProperties(AuthenticationProperties expected)
+        {
+            // Arrange
+            var httpContext = new Mock<HttpContext>();
+            var auth = new Mock<IAuthenticationService>();
+            auth
+                .Setup(c => c.ForbidAsync(httpContext.Object, null, expected))
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+            httpContext.Setup(c => c.RequestServices).Returns(CreateServices(auth.Object));
+            var result = new ForbidResult(expected);
+            var routeData = new RouteData();
+
+            var actionContext = new ActionContext(
+                httpContext.Object,
+                routeData,
+                new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            auth.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(ExecuteResultAsync_InvokesForbidAsyncWithAuthPropertiesData))]
+        public async Task ExecuteResultAsync_InvokesForbidAsyncWithAuthProperties_WhenAuthenticationSchemesIsEmpty(
+            AuthenticationProperties expected)
+        {
+            // Arrange
+            var httpContext = new Mock<HttpContext>();
+            var auth = new Mock<IAuthenticationService>();
+            auth
+                .Setup(c => c.ForbidAsync(httpContext.Object, null, expected))
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+            httpContext.Setup(c => c.RequestServices).Returns(CreateServices(auth.Object));
+            var result = new ForbidResult(expected)
+            {
+                AuthenticationSchemes = new string[0]
+            };
+            var routeData = new RouteData();
+
+            var actionContext = new ActionContext(
+                httpContext.Object,
+                routeData,
+                new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            auth.Verify();
+        }
+
+        private static IServiceProvider CreateServices(IAuthenticationService auth)
+        {
+            return new ServiceCollection()
+                .AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance)
+                .AddSingleton(auth)
+                .BuildServiceProvider();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatFilterTest.cs
new file mode 100644
index 0000000000..b33698b52a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatFilterTest.cs
@@ -0,0 +1,468 @@
+// 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.
+
+using System.Buffers;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+using Microsoft.Net.Http.Headers;
+using Moq;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    public class FormatFilterTests
+    {
+        public enum FormatSource
+        {
+            RouteData,
+            QueryData,
+            RouteAndQueryData
+        }
+
+        [Theory]
+        [InlineData("json", FormatSource.RouteData, "application/json")]
+        [InlineData("json", FormatSource.QueryData, "application/json")]
+        [InlineData("json", FormatSource.RouteAndQueryData, "application/json")]
+        public void FormatFilter_ContextContainsFormat_DefaultFormat(
+            string format,
+            FormatSource place,
+            string contentType)
+        {
+            // Arrange
+            var mediaType = new StringSegment("application/json");
+            var mockObjects = new MockObjects(format, place);
+
+            var resultExecutingContext = mockObjects.CreateResultExecutingContext();
+            var resourceExecutingContext = mockObjects.CreateResourceExecutingContext(new IFilterMetadata[] { });
+
+            var filter = new FormatFilter(mockObjects.OptionsManager, NullLoggerFactory.Instance);
+
+            // Act
+            filter.OnResourceExecuting(resourceExecutingContext);
+
+            // Assert
+            Assert.Null(resourceExecutingContext.Result);
+
+            // Act
+            filter.OnResultExecuting(resultExecutingContext);
+
+            // Assert
+            var objectResult = Assert.IsType<ObjectResult>(resultExecutingContext.Result);
+            Assert.Single(objectResult.ContentTypes);
+            MediaTypeAssert.Equal(mediaType, objectResult.ContentTypes[0]);
+        }
+
+        [Fact]
+        public void FormatFilter_ContextContainsFormat_InRouteAndQueryData()
+        {
+            // If the format is present in both route and query data, the one in route data wins
+
+            // Arrange
+            var mediaType = new StringSegment("application/json");
+            var mockObjects = new MockObjects("json", FormatSource.RouteData);
+            var httpContext = new Mock<HttpContext>();
+            httpContext.Setup(c => c.Response).Returns(new Mock<HttpResponse>().Object);
+
+            // Query contains xml
+            httpContext.Setup(c => c.Request.Query.ContainsKey("format")).Returns(true);
+            httpContext.Setup(c => c.Request.Query["format"]).Returns("xml");
+
+            // Routedata contains json
+            var data = new RouteData();
+            data.Values.Add("format", "json");
+
+            var ac = new ActionContext(httpContext.Object, data, new ActionDescriptor());
+
+            var resultExecutingContext = new ResultExecutingContext(
+                ac,
+                new IFilterMetadata[] { },
+                new ObjectResult("Hello!"),
+                controller: new object());
+
+            var resourceExecutingContext = new ResourceExecutingContext(
+                ac,
+                new IFilterMetadata[] { },
+                new List<IValueProviderFactory>());
+
+            var filter = new FormatFilter(mockObjects.OptionsManager, NullLoggerFactory.Instance);
+
+            // Act
+            filter.OnResourceExecuting(resourceExecutingContext);
+            filter.OnResultExecuting(resultExecutingContext);
+
+            // Assert
+            var objectResult = Assert.IsType<ObjectResult>(resultExecutingContext.Result);
+            Assert.Single(objectResult.ContentTypes);
+            MediaTypeAssert.Equal(mediaType, objectResult.ContentTypes[0]);
+        }
+
+        [Theory]
+        [InlineData("foo", FormatSource.RouteData, "application/foo")]
+        [InlineData("foo", FormatSource.QueryData, "application/foo")]
+        [InlineData("foo", FormatSource.RouteAndQueryData, "application/foo")]
+        public void FormatFilter_ContextContainsFormat_Custom(
+            string format,
+            FormatSource place,
+            string contentType)
+        {
+            // Arrange
+            var mediaType = new StringSegment(contentType);
+
+            var mockObjects = new MockObjects(format, place);
+            var resultExecutingContext = mockObjects.CreateResultExecutingContext();
+            var resourceExecutingContext = mockObjects.CreateResourceExecutingContext(new IFilterMetadata[] { });
+
+            mockObjects.MvcOptions.FormatterMappings.SetMediaTypeMappingForFormat(
+                format,
+                MediaTypeHeaderValue.Parse(contentType));
+
+            var filter = new FormatFilter(mockObjects.OptionsManager, NullLoggerFactory.Instance);
+
+            // Act
+            filter.OnResourceExecuting(resourceExecutingContext);
+            filter.OnResultExecuting(resultExecutingContext);
+
+            // Assert
+            var objectResult = Assert.IsType<ObjectResult>(resultExecutingContext.Result);
+            Assert.Single(objectResult.ContentTypes);
+            MediaTypeAssert.Equal(mediaType, objectResult.ContentTypes[0]);
+        }
+
+        [Theory]
+        [InlineData("foo", FormatSource.RouteData)]
+        [InlineData("foo", FormatSource.QueryData)]
+        public void FormatFilter_ContextContainsNonExistingFormat(
+            string format,
+            FormatSource place)
+        {
+            // Arrange
+            var mockObjects = new MockObjects(format, place);
+            var resourceExecutingContext = mockObjects.CreateResourceExecutingContext(new IFilterMetadata[] { });
+
+            var filter = new FormatFilter(mockObjects.OptionsManager, NullLoggerFactory.Instance);
+
+            // Act
+            filter.OnResourceExecuting(resourceExecutingContext);
+
+            // Assert
+            var actionResult = resourceExecutingContext.Result;
+            Assert.IsType<NotFoundResult>(actionResult);
+        }
+
+        [Fact]
+        public void FormatFilter_ContextDoesntContainFormat()
+        {
+            // Arrange
+            var mockObjects = new MockObjects();
+            var resourceExecutingContext = mockObjects.CreateResourceExecutingContext(new IFilterMetadata[] { });
+
+            var filter = new FormatFilter(mockObjects.OptionsManager, NullLoggerFactory.Instance);
+
+            // Act
+            filter.OnResourceExecuting(resourceExecutingContext);
+
+            // Assert
+            Assert.Null(resourceExecutingContext.Result);
+        }
+
+        [Theory]
+        [InlineData("json", FormatSource.RouteData, "application/json")]
+        [InlineData("json", FormatSource.QueryData, "application/json")]
+        public void FormatFilter_ContextContainsFormat_ContainsProducesFilter_Matching(
+            string format,
+            FormatSource place,
+            string contentType)
+        {
+            // Arrange
+            var produces = new ProducesAttribute(contentType, new string[] { "application/foo", "text/bar" });
+            var mockObjects = new MockObjects(format, place);
+            var resourceExecutingContext = mockObjects.CreateResourceExecutingContext(new IFilterMetadata[] { produces });
+
+            var filter = new FormatFilter(mockObjects.OptionsManager, NullLoggerFactory.Instance);
+
+            // Act
+            filter.OnResourceExecuting(resourceExecutingContext);
+
+            // Assert
+            Assert.Null(resourceExecutingContext.Result);
+        }
+
+        [Fact]
+        public void FormatFilter_LessSpecificThan_Produces()
+        {
+            // Arrange
+            var produces = new ProducesAttribute("application/xml;version=1", new string[] { });
+            var mockObjects = new MockObjects("xml", FormatSource.RouteData);
+            var resourceExecutingContext = mockObjects.CreateResourceExecutingContext(new IFilterMetadata[] { produces });
+
+            mockObjects.MvcOptions.FormatterMappings.SetMediaTypeMappingForFormat(
+                "xml",
+                MediaTypeHeaderValue.Parse("application/xml"));
+
+            var filter = new FormatFilter(mockObjects.OptionsManager, NullLoggerFactory.Instance);
+
+            // Act
+            filter.OnResourceExecuting(resourceExecutingContext);
+
+            // Assert
+            Assert.Null(resourceExecutingContext.Result);
+        }
+
+        [Fact]
+        public void FormatFilter_MoreSpecificThan_Produces()
+        {
+            // Arrange
+            var produces = new ProducesAttribute("application/xml", new string[] { });
+            var mockObjects = new MockObjects("xml", FormatSource.RouteData);
+            var resourceExecutingContext = mockObjects.CreateResourceExecutingContext(new IFilterMetadata[] { produces });
+
+            mockObjects.MvcOptions.FormatterMappings.SetMediaTypeMappingForFormat(
+                "xml",
+                MediaTypeHeaderValue.Parse("application/xml;version=1"));
+
+            var filter = new FormatFilter(mockObjects.OptionsManager, NullLoggerFactory.Instance);
+
+            // Act
+            filter.OnResourceExecuting(resourceExecutingContext);
+
+            // Assert
+            var actionResult = resourceExecutingContext.Result;
+            Assert.IsType<NotFoundResult>(actionResult);
+        }
+
+        [Theory]
+        [InlineData("json", FormatSource.RouteData)]
+        [InlineData("json", FormatSource.QueryData)]
+        public void FormatFilter_ContextContainsFormat_ContainsProducesFilter_Conflicting(
+            string format,
+            FormatSource place)
+        {
+            // Arrange
+            var produces = new ProducesAttribute("application/xml", new string[] { "application/foo", "text/bar" });
+            var mockObjects = new MockObjects(format, place);
+            var resourceExecutingContext = mockObjects.CreateResourceExecutingContext(new IFilterMetadata[] { produces });
+
+            mockObjects.MvcOptions.FormatterMappings.SetMediaTypeMappingForFormat(
+                "xml",
+                MediaTypeHeaderValue.Parse("application/xml"));
+
+            var filter = new FormatFilter(mockObjects.OptionsManager, NullLoggerFactory.Instance);
+
+            // Act
+            filter.OnResourceExecuting(resourceExecutingContext);
+
+            // Assert
+            var result = Assert.IsType<NotFoundResult>(resourceExecutingContext.Result);
+        }
+
+        [Theory]
+        [InlineData("", FormatSource.RouteData)]
+        [InlineData(null, FormatSource.QueryData)]
+        public void FormatFilter_ContextContainsFormat_Invalid(
+            string format,
+            FormatSource place)
+        {
+            // Arrange
+            var mockObjects = new MockObjects(format, place);
+            var resourceExecutingContext = mockObjects.CreateResourceExecutingContext(new IFilterMetadata[] { });
+            var filter = new FormatFilter(mockObjects.OptionsManager, NullLoggerFactory.Instance);
+
+            // Act
+            filter.OnResourceExecuting(resourceExecutingContext);
+
+            // Assert
+            Assert.Null(resourceExecutingContext.Result);
+        }
+
+        [Theory]
+        [InlineData("json", FormatSource.RouteData, "json")]
+        [InlineData("json", FormatSource.QueryData, "json")]
+        [InlineData("", FormatSource.RouteAndQueryData, null)]
+        [InlineData(null, FormatSource.RouteAndQueryData, null)]
+        public void FormatFilter_GetFormat(
+            string input,
+            FormatSource place,
+            string expected)
+        {
+            // Arrange
+            var mockObjects = new MockObjects(input, place);
+            var context = mockObjects.CreateResultExecutingContext();
+            var filterAttribute = new FormatFilterAttribute();
+            var filter = new FormatFilter(mockObjects.OptionsManager, NullLoggerFactory.Instance);
+
+            // Act
+            var format = filter.GetFormat(context);
+
+            // Assert
+            Assert.Equal(expected, filter.GetFormat(context));
+        }
+
+        [Fact]
+        public void FormatFilter_ExplicitContentType_SetOnObjectResult_TakesPrecedence()
+        {
+            // Arrange
+            var mediaType = new StringSegment("application/foo");
+            var mockObjects = new MockObjects("json", FormatSource.QueryData);
+            var httpContext = new Mock<HttpContext>();
+            httpContext.Setup(c => c.Response).Returns(new Mock<HttpResponse>().Object);
+            httpContext.Setup(c => c.Request.Query["format"]).Returns("json");
+            var actionContext = new ActionContext(httpContext.Object, new RouteData(), new ActionDescriptor());
+            var objectResult = new ObjectResult("Hello!");
+            objectResult.ContentTypes.Add(new MediaTypeHeaderValue("application/foo"));
+            var resultExecutingContext = new ResultExecutingContext(
+                actionContext,
+                new IFilterMetadata[] { },
+                objectResult,
+                controller: new object());
+
+            var resourceExecutingContext = new ResourceExecutingContext(
+                actionContext,
+                new IFilterMetadata[] { },
+                new List<IValueProviderFactory>());
+
+            var filter = new FormatFilter(mockObjects.OptionsManager, NullLoggerFactory.Instance);
+
+            // Act
+            filter.OnResourceExecuting(resourceExecutingContext);
+            filter.OnResultExecuting(resultExecutingContext);
+
+            // Assert
+            var result = Assert.IsType<ObjectResult>(resultExecutingContext.Result);
+            Assert.Single(result.ContentTypes);
+            MediaTypeAssert.Equal(mediaType, result.ContentTypes[0]);
+        }
+
+        [Fact]
+        public void FormatFilter_ExplicitContentType_SetOnResponse_TakesPrecedence()
+        {
+            // Arrange
+            var mediaType = MediaTypeHeaderValue.Parse("application/foo");
+            var mockObjects = new MockObjects("json", FormatSource.QueryData);
+            var response = new Mock<HttpResponse>();
+            response.Setup(r => r.ContentType).Returns("application/foo");
+            var httpContext = new Mock<HttpContext>();
+            httpContext.Setup(c => c.Response).Returns(response.Object);
+            httpContext.Setup(c => c.Request.Query["format"]).Returns("json");
+            var actionContext = new ActionContext(httpContext.Object, new RouteData(), new ActionDescriptor());
+            var resultExecutingContext = new ResultExecutingContext(
+                actionContext,
+                new IFilterMetadata[] { },
+                new ObjectResult("Hello!"),
+                controller: new object());
+
+            var resourceExecutingContext = new ResourceExecutingContext(
+                actionContext,
+                new IFilterMetadata[] { },
+                new List<IValueProviderFactory>());
+
+            var filter = new FormatFilter(mockObjects.OptionsManager, NullLoggerFactory.Instance);
+
+            // Act
+            filter.OnResourceExecuting(resourceExecutingContext);
+            filter.OnResultExecuting(resultExecutingContext);
+
+            // Assert
+            var result = Assert.IsType<ObjectResult>(resultExecutingContext.Result);
+            Assert.Empty(result.ContentTypes);
+        }
+
+        private class MockObjects
+        {
+            public MvcOptions MvcOptions { get; private set; }
+            public HttpContext MockHttpContext { get; private set; }
+            public ActionContext MockActionContext { get; private set; }
+
+            public IOptions<MvcOptions> OptionsManager { get; private set; }
+
+            public MockObjects(string format = null, FormatSource? place = null)
+            {
+                var httpContext = new Mock<HttpContext>();
+                httpContext.Setup(c => c.Request.Query.ContainsKey("format")).Returns(false);
+                httpContext.Setup(c => c.Response).Returns(new Mock<HttpResponse>().Object);
+                MockHttpContext = httpContext.Object;
+
+                Initialize(httpContext, format, place);
+            }
+
+            public ResourceExecutingContext CreateResourceExecutingContext(IFilterMetadata[] filters)
+            {
+                var context = new ResourceExecutingContext(
+                    MockActionContext,
+                    filters,
+                    new List<IValueProviderFactory>());
+                return context;
+            }
+
+            public ResultExecutingContext CreateResultExecutingContext()
+            {
+                return new ResultExecutingContext(
+                    MockActionContext,
+                    new IFilterMetadata[] { },
+                    new ObjectResult("Some Value"),
+                    controller: new object());
+            }
+
+            private ActionContext CreateMockActionContext(
+                Mock<HttpContext> httpContext,
+                string format,
+                FormatSource? place)
+            {
+                var data = new RouteData();
+
+                if (place == FormatSource.RouteData || place == FormatSource.RouteAndQueryData)
+                {
+                    data.Values.Add("format", format);
+                    httpContext.Setup(c => c.Request.Query.ContainsKey("format")).Returns(false);
+                }
+
+                if (place == FormatSource.QueryData || place == FormatSource.RouteAndQueryData)
+                {
+                    httpContext.Setup(c => c.Request.Query.ContainsKey("format")).Returns(true);
+                    httpContext.Setup(c => c.Request.Query["format"]).Returns(format);
+                }
+                else if (place == null && format == null)
+                {
+                    httpContext.Setup(c => c.Request.Query.ContainsKey("format")).Returns(false);
+                }
+
+                return new ActionContext(httpContext.Object, data, new ActionDescriptor());
+            }
+
+            private void Initialize(
+                Mock<HttpContext> httpContext,
+                string format = null,
+                FormatSource? place = null)
+            {
+                OptionsManager = Options.Create(new MvcOptions());
+
+                // Setup options on mock service provider
+                MvcOptions = OptionsManager.Value;
+
+                // Set up default output formatters.
+                MvcOptions.OutputFormatters.Add(new HttpNoContentOutputFormatter());
+                MvcOptions.OutputFormatters.Add(new StringOutputFormatter());
+                MvcOptions.OutputFormatters.Add(new JsonOutputFormatter(
+                    new JsonSerializerSettings(),
+                    ArrayPool<char>.Shared));
+
+                // Set up default mapping for json extensions to content type
+                MvcOptions.FormatterMappings.SetMediaTypeMappingForFormat(
+                    "json",
+                    MediaTypeHeaderValue.Parse("application/json"));
+
+                // Setup MVC services on mock service provider
+                MockActionContext = CreateMockActionContext(httpContext, format, place);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatterCollectionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatterCollectionTest.cs
new file mode 100644
index 0000000000..81b532a3ad
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatterCollectionTest.cs
@@ -0,0 +1,67 @@
+// 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.
+
+using System;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    public class FormatterCollectionTest
+    {
+        [Fact]
+        public void NonGenericRemoveType_RemovesAllOfType()
+        {
+            // Arrange
+            var collection = new FormatterCollection<IOutputFormatter>
+            {
+                new TestOutputFormatter(),
+                new AnotherTestOutputFormatter(),
+                new TestOutputFormatter()
+            };
+
+            // Act
+            collection.RemoveType(typeof(TestOutputFormatter));
+
+            // Assert
+            var formatter = Assert.Single(collection);
+            Assert.IsType<AnotherTestOutputFormatter>(formatter);
+        }
+
+        [Fact]
+        public void RemoveType_RemovesAllOfType()
+        {
+            // Arrange
+            var collection = new FormatterCollection<IOutputFormatter>
+            {
+                new TestOutputFormatter(),
+                new AnotherTestOutputFormatter(),
+                new TestOutputFormatter()
+            };
+
+            // Act
+            collection.RemoveType<TestOutputFormatter>();
+
+            // Assert
+            var formatter = Assert.Single(collection);
+            Assert.IsType<AnotherTestOutputFormatter>(formatter);
+        }
+
+        private class TestOutputFormatter : TextOutputFormatter
+        {
+            public override Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class AnotherTestOutputFormatter : TextOutputFormatter
+        {
+            public override Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatterMappingsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatterMappingsTest.cs
new file mode 100644
index 0000000000..d5428abc3f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatterMappingsTest.cs
@@ -0,0 +1,129 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Net.Http.Headers;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    public class FormatterMappingsTest
+    {
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void FormatterMappings_GetMediaTypeMappingForFormat_ThrowsForInvalidFormats(string format)
+        {
+            // Arrange
+            var options = new FormatterMappings();
+
+            // Act & Assert
+            Assert.Throws<ArgumentException>("format", () => options.GetMediaTypeMappingForFormat(format));
+        }
+
+        [Theory]
+        [InlineData(".xml", "application/xml", "xml")]
+        [InlineData("json", "application/json", "JSON")]
+        [InlineData(".foo", "text/foo", "Foo")]
+        [InlineData(".Json", "application/json", "json")]
+        [InlineData("FOo", "text/foo", "FOO")]
+        public void FormatterMappings_SetFormatMapping_DiffSetGetFormat(string setFormat, string contentType, string getFormat)
+        {
+            // Arrange
+            var options = new FormatterMappings();
+            options.SetMediaTypeMappingForFormat(setFormat, MediaTypeHeaderValue.Parse(contentType));
+
+            // Act 
+            var returnMediaType = options.GetMediaTypeMappingForFormat(getFormat);
+
+            // Assert
+            MediaTypeAssert.Equal(contentType, returnMediaType);
+        }
+
+        [Fact]
+        public void FormatterMappings_Invalid_Period()
+        {
+            // Arrange
+            var options = new FormatterMappings();
+            var format = ".";
+            var expected = $"The format provided is invalid '{format}'. A format must be a non-empty file-" +
+                "extension, optionally prefixed with a '.' character.";
+
+            // Act and assert
+            ExceptionAssert.ThrowsArgument(
+                () => options.SetMediaTypeMappingForFormat(
+                    format,
+                    MediaTypeHeaderValue.Parse("application/xml")),
+                "format",
+                expected);
+        }
+
+        [Fact]
+        public void FormatterMappings_SetFormatMapping_FormatEmpty()
+        {
+            // Arrange
+            var options = new FormatterMappings();
+            var format = "";
+
+            // Act and Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => options.SetMediaTypeMappingForFormat(
+                    format,
+                    MediaTypeHeaderValue.Parse("application/xml")),
+                "format");
+        }
+
+        [Theory]
+        [InlineData("application/*")]
+        [InlineData("*/json")]
+        [InlineData("*/*")]
+        public void FormatterMappings_Wildcardformat(string format)
+        {
+            // Arrange
+            var options = new FormatterMappings();
+            var expected = $@"The media type ""{format}"" is not valid. MediaTypes containing wildcards (*) " +
+                "are not allowed in formatter mappings.";
+
+            // Act and assert
+            ExceptionAssert.ThrowsArgument(
+                () => options.SetMediaTypeMappingForFormat(
+                    "star",
+                    MediaTypeHeaderValue.Parse(format)),
+                "contentType",
+                expected);
+        }
+
+        [Theory]
+        [InlineData(".xml", true)]
+        [InlineData("json", true)]
+        [InlineData(".foo", true)]
+        [InlineData(".Json", true)]
+        [InlineData("FOo", true)]
+        [InlineData("bar", true)]
+        [InlineData("baz", false)]
+        [InlineData(".baz", false)]
+        [InlineData("BAZ", false)]
+        public void FormatterMappings_ClearFormatMapping(string format, bool expected)
+        {
+            // Arrange
+            var options = new FormatterMappings();
+            var mediaType = MediaTypeHeaderValue.Parse("application/xml");
+            options.SetMediaTypeMappingForFormat("xml", mediaType);
+            mediaType = MediaTypeHeaderValue.Parse("application/json");
+            options.SetMediaTypeMappingForFormat("json", mediaType);
+            mediaType = MediaTypeHeaderValue.Parse("application/foo");
+            options.SetMediaTypeMappingForFormat("foo", mediaType);
+            mediaType = MediaTypeHeaderValue.Parse("application/bar");
+            options.SetMediaTypeMappingForFormat("bar", mediaType);
+
+            // Act 
+            var cleared = options.ClearMediaTypeMappingForFormat(format);
+
+            // Assert
+            Assert.Equal(expected, cleared);
+            Assert.Null(options.GetMediaTypeMappingForFormat(format));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/InputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/InputFormatterTest.cs
new file mode 100644
index 0000000000..2ad5752053
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/InputFormatterTest.cs
@@ -0,0 +1,461 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Net.Http.Headers;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    public class InputFormatterTest
+    {
+        private class CatchAllFormatter : TestFormatter
+        {
+            public CatchAllFormatter()
+            {
+                SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("*/*"));
+            }
+        }
+
+        [Theory]
+        [InlineData("application/mathml-content+xml")]
+        [InlineData("application/mathml-presentation+xml")]
+        [InlineData("application/mathml+xml; undefined=ignored")]
+        [InlineData("application/octet-stream; padding=3")]
+        [InlineData("application/xml")]
+        [InlineData("application/xml-dtd; undefined=ignored")]
+        [InlineData("multipart/mixed; boundary=gc0p4Jq0M2Yt08j34c0p")]
+        [InlineData("multipart/mixed; boundary=gc0p4Jq0M2Yt08j34c0p; undefined=ignored")]
+        [InlineData("text/html")]
+        public void CatchAll_CanRead_ReturnsTrueForSupportedMediaTypes(string requestContentType)
+        {
+            // Arrange
+            var formatter = new CatchAllFormatter();
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.ContentType = requestContentType;
+
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForType(typeof(void));
+            var context = new InputFormatterContext(
+                httpContext,
+                modelName: string.Empty,
+                modelState: new ModelStateDictionary(),
+                metadata: metadata,
+                readerFactory: new TestHttpRequestStreamReaderFactory().CreateReader);
+
+            // Act
+            var result = formatter.CanRead(context);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        private class MultipartFormatter : TestFormatter
+        {
+            public MultipartFormatter()
+            {
+                SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("multipart/*"));
+            }
+        }
+
+        [Theory]
+        [InlineData("multipart/mixed; boundary=gc0p4Jq0M2Yt08j34c0p")]
+        [InlineData("multipart/mixed; boundary=gc0p4Jq0M2Yt08j34c0p; undefined=ignored")]
+        public void MultipartFormatter_CanRead_ReturnsTrueForSupportedMediaTypes(string requestContentType)
+        {
+            // Arrange
+            var formatter = new MultipartFormatter();
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.ContentType = requestContentType;
+
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForType(typeof(void));
+            var context = new InputFormatterContext(
+                httpContext,
+                modelName: string.Empty,
+                modelState: new ModelStateDictionary(),
+                metadata: metadata,
+                readerFactory: new TestHttpRequestStreamReaderFactory().CreateReader);
+
+            // Act
+            var result = formatter.CanRead(context);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData("application/mathml-content+xml")]
+        [InlineData("application/mathml-presentation+xml")]
+        [InlineData("application/mathml+xml; undefined=ignored")]
+        [InlineData("application/octet-stream; padding=3")]
+        [InlineData("application/xml")]
+        [InlineData("application/xml-dtd; undefined=ignored")]
+        [InlineData("text/html")]
+        public void MultipartFormatter_CanRead_ReturnsFalseForUnsupportedMediaTypes(string requestContentType)
+        {
+            // Arrange
+            var formatter = new MultipartFormatter();
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.ContentType = requestContentType;
+
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForType(typeof(void));
+            var context = new InputFormatterContext(
+                httpContext,
+                modelName: string.Empty,
+                modelState: new ModelStateDictionary(),
+                metadata: metadata,
+                readerFactory: new TestHttpRequestStreamReaderFactory().CreateReader);
+
+            // Act
+            var result = formatter.CanRead(context);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        private class MultipartMixedFormatter : TestFormatter
+        {
+            public MultipartMixedFormatter()
+            {
+                SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("multipart/mixed"));
+            }
+        }
+
+        [Theory]
+        [InlineData("multipart/mixed; boundary=gc0p4Jq0M2Yt08j34c0p")]
+        [InlineData("multipart/mixed; boundary=gc0p4Jq0M2Yt08j34c0p; undefined=ignored")]
+        public void MultipartMixedFormatter_CanRead_ReturnsTrueForSupportedMediaTypes(string requestContentType)
+        {
+            // Arrange
+            var formatter = new MultipartMixedFormatter();
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.ContentType = requestContentType;
+
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForType(typeof(void));
+            var context = new InputFormatterContext(
+                httpContext,
+                modelName: string.Empty,
+                modelState: new ModelStateDictionary(),
+                metadata: metadata,
+                readerFactory: new TestHttpRequestStreamReaderFactory().CreateReader);
+
+            // Act
+            var result = formatter.CanRead(context);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData("application/mathml-content+xml")]
+        [InlineData("application/mathml-presentation+xml")]
+        [InlineData("application/mathml+xml; undefined=ignored")]
+        [InlineData("application/octet-stream; padding=3")]
+        [InlineData("application/xml")]
+        [InlineData("application/xml-dtd; undefined=ignored")]
+        [InlineData("text/html")]
+        public void MultipartMixedFormatter_CanRead_ReturnsFalseForUnsupportedMediaTypes(string requestContentType)
+        {
+            // Arrange
+            var formatter = new MultipartMixedFormatter();
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.ContentType = requestContentType;
+
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForType(typeof(void));
+            var context = new InputFormatterContext(
+                httpContext,
+                modelName: string.Empty,
+                modelState: new ModelStateDictionary(),
+                metadata: metadata,
+                readerFactory: new TestHttpRequestStreamReaderFactory().CreateReader);
+
+            // Act
+            var result = formatter.CanRead(context);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        private class MathMLFormatter : TestFormatter
+        {
+            public MathMLFormatter()
+            {
+                SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/mathml-content+xml"));
+                SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/mathml-presentation+xml"));
+                SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/mathml+xml"));
+            }
+        }
+
+        [Theory]
+        [InlineData("application/mathml-content+xml")]
+        [InlineData("application/mathml-presentation+xml")]
+        [InlineData("application/mathml+xml; undefined=ignored")]
+        public void MathMLFormatter_CanRead_ReturnsTrueForSupportedMediaTypes(string requestContentType)
+        {
+            // Arrange
+            var formatter = new MathMLFormatter();
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.ContentType = requestContentType;
+
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForType(typeof(void));
+            var context = new InputFormatterContext(
+                httpContext,
+                modelName: string.Empty,
+                modelState: new ModelStateDictionary(),
+                metadata: metadata,
+                readerFactory: new TestHttpRequestStreamReaderFactory().CreateReader);
+
+            // Act
+            var result = formatter.CanRead(context);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData("application/octet-stream; padding=3")]
+        [InlineData("application/xml")]
+        [InlineData("application/xml-dtd; undefined=ignored")]
+        [InlineData("multipart/mixed; boundary=gc0p4Jq0M2Yt08j34c0p")]
+        [InlineData("multipart/mixed; boundary=gc0p4Jq0M2Yt08j34c0p; undefined=ignored")]
+        [InlineData("text/html")]
+        public void MathMLFormatter_CanRead_ReturnsFalseForUnsupportedMediaTypes(string requestContentType)
+        {
+            // Arrange
+            var formatter = new MathMLFormatter();
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.ContentType = requestContentType;
+
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForType(typeof(void));
+            var context = new InputFormatterContext(
+                httpContext,
+                modelName: string.Empty,
+                modelState: new ModelStateDictionary(),
+                metadata: metadata,
+                readerFactory: new TestHttpRequestStreamReaderFactory().CreateReader);
+
+            // Act
+            var result = formatter.CanRead(context);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        // IsSubsetOf does not follow XML media type conventions. This formatter does not support "application/*+xml".
+        private class XmlFormatter : TestFormatter
+        {
+            public XmlFormatter()
+            {
+                SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/xml"));
+                SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("text/xml"));
+            }
+        }
+
+        [Theory]
+        [InlineData("application/xml")]
+        public void XMLFormatter_CanRead_ReturnsTrueForSupportedMediaTypes(string requestContentType)
+        {
+            // Arrange
+            var formatter = new XmlFormatter();
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.ContentType = requestContentType;
+
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForType(typeof(void));
+            var context = new InputFormatterContext(
+                httpContext,
+                modelName: string.Empty,
+                modelState: new ModelStateDictionary(),
+                metadata: metadata,
+                readerFactory: new TestHttpRequestStreamReaderFactory().CreateReader);
+
+            // Act
+            var result = formatter.CanRead(context);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData("application/mathml-content+xml")]
+        [InlineData("application/mathml-presentation+xml")]
+        [InlineData("application/mathml+xml; undefined=ignored")]
+        [InlineData("application/octet-stream; padding=3")]
+        [InlineData("application/xml-dtd; undefined=ignored")]
+        [InlineData("multipart/mixed; boundary=gc0p4Jq0M2Yt08j34c0p")]
+        [InlineData("multipart/mixed; boundary=gc0p4Jq0M2Yt08j34c0p; undefined=ignored")]
+        [InlineData("text/html")]
+        public void XMLFormatter_CanRead_ReturnsFalseForUnsupportedMediaTypes(string requestContentType)
+        {
+            // Arrange
+            var formatter = new XmlFormatter();
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.ContentType = requestContentType;
+
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForType(typeof(void));
+            var context = new InputFormatterContext(
+                httpContext,
+                modelName: string.Empty,
+                modelState: new ModelStateDictionary(),
+                metadata: metadata,
+                readerFactory: new TestHttpRequestStreamReaderFactory().CreateReader);
+
+            // Act
+            var result = formatter.CanRead(context);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void GetSupportedContentTypes_UnsupportedObjectType_ReturnsNull()
+        {
+            // Arrange
+            var formatter = new TestFormatter();
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("text/xml"));
+            formatter.SupportedTypes.Add(typeof(string));
+
+            // Act
+            var results = formatter.GetSupportedContentTypes(contentType: null, objectType: typeof(int));
+
+            // Assert
+            Assert.Null(results);
+        }
+
+        [Fact]
+        public void GetSupportedContentTypes_SupportedObjectType_ReturnsContentTypes()
+        {
+            // Arrange
+            var formatter = new TestFormatter();
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("text/xml"));
+            formatter.SupportedTypes.Add(typeof(string));
+
+            // Act
+            var results = formatter.GetSupportedContentTypes(contentType: null, objectType: typeof(string));
+
+            // Assert
+            Assert.Collection(results, c => Assert.Equal("text/xml", c));
+        }
+
+        [Fact]
+        public void GetSupportedContentTypes_NullContentType_ReturnsAllContentTypes()
+        {
+            // Arrange
+            var formatter = new TestFormatter();
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/xml"));
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("text/xml"));
+
+            // Act
+            var results = formatter.GetSupportedContentTypes(contentType: null, objectType: typeof(string));
+
+            // Assert
+            Assert.Collection(
+                results.OrderBy(c => c.ToString()),
+                c => Assert.Equal("application/xml", c),
+                c => Assert.Equal("text/xml", c));
+        }
+
+        [Fact]
+        public void GetSupportedContentTypes_NonNullContentType_FiltersContentTypes()
+        {
+            // Arrange
+            var formatter = new TestFormatter();
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/xml"));
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("text/xml"));
+
+            // Act
+            var results = formatter.GetSupportedContentTypes("text/*", typeof(string));
+
+            // Assert
+            Assert.Collection(results, c => Assert.Equal("text/xml", c));
+        }
+
+        [Fact]
+        public void CanRead_ThrowsInvalidOperationException_IfMediaTypesListIsEmpty()
+        {
+            // Arrange
+            var formatter = new BadConfigurationFormatter();
+            var context = new InputFormatterContext(
+                new DefaultHttpContext(),
+                string.Empty,
+                new ModelStateDictionary(),
+                new EmptyModelMetadataProvider().GetMetadataForType(typeof(object)),
+                (s, e) => new StreamReader(s, e));
+
+            // Act & Assert
+            Assert.Throws<InvalidOperationException>(() => formatter.CanRead(context));
+        }
+
+        [Fact]
+        public void GetSupportedContentTypes_ThrowsInvalidOperationException_IfMediaTypesListIsEmpty()
+        {
+            // Arrange
+            var formatter = new BadConfigurationFormatter();
+
+            // Act & Assert
+            Assert.Throws<InvalidOperationException>(
+                () => formatter.GetSupportedContentTypes("application/json", typeof(object)));
+        }
+
+        [Theory]
+        [InlineData(true, true)]
+        [InlineData(false, false)]
+        public async Task ReadAsync_WithEmptyRequest_ReturnsNoValueResultWhenExpected(bool allowEmptyInputValue, bool expectedIsModelSet)
+        {
+            // Arrange
+            var formatter = new TestFormatter();
+            var context = new InputFormatterContext(
+                new DefaultHttpContext(),
+                string.Empty,
+                new ModelStateDictionary(),
+                new EmptyModelMetadataProvider().GetMetadataForType(typeof(object)),
+                (s, e) => new StreamReader(s, e),
+                allowEmptyInputValue);
+            context.HttpContext.Request.ContentLength = 0;
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.False(result.HasError);
+            Assert.Null(result.Model);
+            Assert.Equal(expectedIsModelSet, result.IsModelSet);
+        }
+
+        private class BadConfigurationFormatter : InputFormatter
+        {
+            public override Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class TestFormatter : InputFormatter
+        {
+            public IList<Type> SupportedTypes { get; } = new List<Type>();
+
+            protected override bool CanReadType(Type type)
+            {
+                return SupportedTypes.Count == 0 ? true : SupportedTypes.Contains(type);
+            }
+
+            public override Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/MediaTypeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/MediaTypeTest.cs
new file mode 100644
index 0000000000..28591cf017
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/MediaTypeTest.cs
@@ -0,0 +1,369 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    public class MediaTypeTest
+    {
+        [Theory]
+        [InlineData("application/json")]
+        [InlineData("application /json")]
+        [InlineData(" application / json ")]
+        public void Constructor_CanParseParameterlessSuffixlessMediaTypes(string mediaType)
+        {
+            // Arrange & Act
+            var result = new MediaType(mediaType, 0, mediaType.Length);
+
+            // Assert
+            Assert.Equal(new StringSegment("application"), result.Type);
+            Assert.Equal(new StringSegment("json"), result.SubType);
+        }
+
+        public static IEnumerable<object[]> MediaTypesWithSuffixes
+        {
+            get
+            {
+                return new List<string[]>
+                {
+                    // See https://tools.ietf.org/html/rfc6838#section-4.2 for allowed names spec
+                    new[] { "application/json", "json", null },
+                    new[] { "application/json+", "json", "" },
+                    new[] { "application/+json", "", "json" },
+                    new[] { "application/entitytype+json", "entitytype", "json" },
+                    new[] { "  application /  vnd.com-pany.some+entity!.v2+js.#$&^_n  ; q=\"0.3+1\"", "vnd.com-pany.some+entity!.v2", "js.#$&^_n" },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(MediaTypesWithSuffixes))]
+        public void Constructor_CanParseSuffixedMediaTypes(
+            string mediaType,
+            string expectedSubTypeWithoutSuffix,
+            string expectedSubtypeSuffix)
+        {
+            // Arrange & Act
+            var result = new MediaType(mediaType);
+
+            // Assert
+            Assert.Equal(new StringSegment(expectedSubTypeWithoutSuffix), result.SubTypeWithoutSuffix);
+            Assert.Equal(new StringSegment(expectedSubtypeSuffix), result.SubTypeSuffix);
+        }
+
+        public static TheoryData<string> MediaTypesWithParameters
+        {
+            get
+            {
+                return new TheoryData<string>
+                {
+                    "application/json+bson;format=pretty;charset=utf-8;q=0.8",
+                    "application/json+bson;format=pretty;charset=\"utf-8\";q=0.8",
+                    "application/json+bson;format=pretty;charset=utf-8; q=0.8 ",
+                    "application/json+bson;format=pretty;charset=utf-8 ; q=0.8 ",
+                    "application/json+bson;format=pretty; charset=utf-8 ; q=0.8 ",
+                    "application/json+bson;format=pretty ; charset=utf-8 ; q=0.8 ",
+                    "application/json+bson; format=pretty ; charset=utf-8 ; q=0.8 ",
+                    "application/json+bson; format=pretty ; charset=utf-8 ; q=  0.8 ",
+                    "application/json+bson; format=pretty ; charset=utf-8 ; q  =  0.8 ",
+                    " application /  json+bson; format =  pretty ; charset = utf-8 ; q  =  0.8 ",
+                    " application /  json+bson; format =  \"pretty\" ; charset = \"utf-8\" ; q  =  \"0.8\" ",
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(MediaTypesWithParameters))]
+        public void Constructor_CanParseMediaTypesWithParameters(string mediaType)
+        {
+            // Arrange & Act
+            var result = new MediaType(mediaType, 0, mediaType.Length);
+
+            // Assert
+            Assert.Equal(new StringSegment("application"), result.Type);
+            Assert.Equal(new StringSegment("json+bson"), result.SubType);
+            Assert.Equal(new StringSegment("json"), result.SubTypeWithoutSuffix);
+            Assert.Equal(new StringSegment("bson"), result.SubTypeSuffix);
+            Assert.Equal(new StringSegment("pretty"), result.GetParameter("format"));
+            Assert.Equal(new StringSegment("0.8"), result.GetParameter("q"));
+            Assert.Equal(new StringSegment("utf-8"), result.GetParameter("charset"));
+        }
+
+        [Fact]
+        public void Constructor_NullLength_IgnoresLength()
+        {
+            // Arrange & Act
+            var result = new MediaType("mediaType", 1, length: null);
+
+            // Assert
+            Assert.Equal(new StringSegment("ediaType"), result.Type);
+        }
+
+        [Fact]
+        public void Constructor_NullMediaType_Throws()
+        {
+            // Arrange, Act and Assert
+            Assert.Throws<ArgumentNullException>("mediaType", () => new MediaType(null, 0, 2));
+        }
+
+        [Theory]
+        [InlineData(-1)]
+        [InlineData(7)]
+        public void Constructor_NegativeOffset_Throws(int offset)
+        {
+            // Arrange, Act and Assert
+            Assert.Throws<ArgumentOutOfRangeException>("offset", () => new MediaType("media", offset, 5));
+        }
+
+        [Fact]
+        public void Constructor_NegativeLength_Throws()
+        {
+            // Arrange, Act and Assert
+            Assert.Throws<ArgumentOutOfRangeException>("length", () => new MediaType("media", 0, -1));
+        }
+
+        [Fact]
+        public void Constructor_OffsetOrLengthOutOfBounds_Throws()
+        {
+            // Arrange, Act and Assert
+            Assert.Throws<ArgumentException>(() => new MediaType("lengthof9", 5, 5));
+        }
+
+        [Theory]
+        [MemberData(nameof(MediaTypesWithParameters))]
+        public void ReplaceEncoding_ReturnsExpectedMediaType(string mediaType)
+        {
+            // Arrange
+            var encoding = Encoding.GetEncoding("iso-8859-1");
+            var expectedMediaType = mediaType.Replace("utf-8", "iso-8859-1");
+
+            // Act
+            var result = MediaType.ReplaceEncoding(mediaType, encoding);
+
+            // Assert
+            Assert.Equal(expectedMediaType, result);
+        }
+
+        [Theory]
+        [InlineData("application/json;charset=utf-8")]
+        [InlineData("application/json;format=indent;q=0.8;charset=utf-8")]
+        [InlineData("application/json;format=indent;charset=utf-8;q=0.8")]
+        [InlineData("application/json;charset=utf-8;format=indent;q=0.8")]
+        public void GetParameter_ReturnsParameter_IfParameterIsInMediaType(string mediaType)
+        {
+            // Arrange
+            var expectedParameter = new StringSegment("utf-8");
+            var parsedMediaType = new MediaType(mediaType, 0, mediaType.Length);
+
+            // Act
+            var result = parsedMediaType.GetParameter("charset");
+
+            // Assert
+            Assert.Equal(expectedParameter, result);
+        }
+
+        [Fact]
+        public void GetParameter_ReturnsNull_IfParameterIsNotInMediaType()
+        {
+            var mediaType = "application/json;charset=utf-8;format=indent;q=0.8";
+
+            var parsedMediaType = new MediaType(mediaType, 0, mediaType.Length);
+
+            // Act
+            var result = parsedMediaType.GetParameter("other");
+
+            // Assert
+            Assert.False(result.HasValue);
+        }
+
+        [Fact]
+        public void GetParameter_IsCaseInsensitive()
+        {
+            // Arrange
+            var mediaType = "application/json;charset=utf-8";
+            var expectedParameter = new StringSegment("utf-8");
+
+            var parsedMediaType = new MediaType(mediaType);
+
+            // Act
+            var result = parsedMediaType.GetParameter("CHARSET");
+
+            // Assert
+            Assert.Equal(expectedParameter, result);
+        }
+
+        [Theory]
+        [InlineData("application/json", "application/json")]
+        [InlineData("application/json", "application/json;charset=utf-8")]
+        [InlineData("application/json;q=0.8", "application/json;q=0.9")]
+        [InlineData("application/json;q=0.8;charset=utf-7", "application/json;charset=utf-8;q=0.9")]
+        [InlineData("application/json", "application/json;format=indent;charset=utf-8")]
+        [InlineData("application/json;format=indent;charset=utf-8", "application/json;format=indent;charset=utf-8")]
+        [InlineData("application/json;charset=utf-8;format=indent", "application/json;format=indent;charset=utf-8")]
+        [InlineData("application/*", "application/json")]
+        [InlineData("application/*", "application/entitytype+json;v=2")]
+        [InlineData("application/*;v=2", "application/entitytype+json;v=2")]
+        [InlineData("application/json;*", "application/json;v=2")]
+        [InlineData("application/json;v=2;*", "application/json;v=2;charset=utf-8")]
+        [InlineData("*/*", "application/json")]
+        [InlineData("application/entity+json", "application/entity+json")]
+        [InlineData("application/*+json", "application/entity+json")]
+        [InlineData("application/*", "application/entity+json")]
+        public void IsSubsetOf_ReturnsTrueWhenExpected(string set, string subset)
+        {
+            // Arrange
+            var setMediaType = new MediaType(set);
+            var subSetMediaType = new MediaType(subset);
+
+            // Act
+            var result = subSetMediaType.IsSubsetOf(setMediaType);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData("application/json;charset=utf-8", "application/json")]
+        [InlineData("application/json;format=indent;charset=utf-8", "application/json")]
+        [InlineData("application/json;format=indent;charset=utf-8", "application/json;charset=utf-8")]
+        [InlineData("application/*", "text/json")]
+        [InlineData("application/*;v=2", "application/json")]
+        [InlineData("application/*;v=2", "application/json;v=1")]
+        [InlineData("application/json;v=2;*", "application/json;v=1")]
+        [InlineData("application/entity+json", "application/entity+txt")]
+        [InlineData("application/entity+json", "application/entity.v2+json")]
+        [InlineData("application/*+json", "application/entity+txt")]
+        [InlineData("application/entity+*", "application/entity.v2+json")]
+        [InlineData("application/*+*", "application/json")]
+        [InlineData("application/entity+*", "application/entity+json")] // We don't allow suffixes to be wildcards
+        [InlineData("application/*+*", "application/entity+json")] // We don't allow suffixes to be wildcards
+        public void IsSubsetOf_ReturnsFalseWhenExpected(string set, string subset)
+        {
+            // Arrange
+            var setMediaType = new MediaType(set);
+            var subSetMediaType = new MediaType(subset);
+
+            // Act
+            var result = subSetMediaType.IsSubsetOf(setMediaType);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void MatchesAllTypes_ReturnsTrueWhenExpected()
+        {
+            // Arrange
+            var mediaType = new MediaType("*/*");
+
+            // Act
+            var result = mediaType.MatchesAllTypes;
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData("text/*")]
+        [InlineData("text/plain")]
+        public void MatchesAllTypes_ReturnsFalseWhenExpected(string value)
+        {
+            // Arrange
+            var mediaType = new MediaType(value);
+
+            // Act
+            var result = mediaType.MatchesAllTypes;
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData("*/*")]
+        [InlineData("text/*")]
+        public void MatchesAllSubtypes_ReturnsTrueWhenExpected(string value)
+        {
+            // Arrange
+            var mediaType = new MediaType(value);
+
+            // Act
+            var result = mediaType.MatchesAllSubTypes;
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void MatchesAllSubtypes_ReturnsFalseWhenExpected()
+        {
+            // Arrange
+            var mediaType = new MediaType("text/plain");
+
+            // Act
+            var result = mediaType.MatchesAllSubTypes;
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData("*/*", true)]
+        [InlineData("text/*", true)]
+        [InlineData("text/*+suffix", true)]
+        [InlineData("text/*+", true)]
+        [InlineData("text/*+*", true)]
+        [InlineData("text/json+suffix", false)]
+        [InlineData("*/json+*", false)]
+        public void MatchesAllSubTypesWithoutSuffix_ReturnsExpectedResult(string value, bool expectedReturnValue)
+        {
+            // Arrange
+            var mediaType = new MediaType(value);
+
+            // Act
+            var result = mediaType.MatchesAllSubTypesWithoutSuffix;
+
+            // Assert
+            Assert.Equal(expectedReturnValue, result);
+        }
+
+        [Theory]
+        [InlineData("*/*", true)]
+        [InlineData("text/*", true)]
+        [InlineData("text/entity+*", false)] // We don't support wildcards on suffixes
+        [InlineData("text/*+json", true)]
+        [InlineData("text/entity+json;*", true)]
+        [InlineData("text/entity+json;v=3;*", true)]
+        [InlineData("text/entity+json;v=3;q=0.8", false)]
+        [InlineData("text/json", false)]
+        [InlineData("text/json;param=*", false)] // * is the literal value of the param
+        public void HasWildcard_ReturnsTrueWhenExpected(string value, bool expectedReturnValue)
+        {
+            // Arrange
+            var mediaType = new MediaType(value);
+
+            // Act
+            var result = mediaType.HasWildcard;
+
+            // Assert
+            Assert.Equal(expectedReturnValue, result);
+        }
+
+        [Theory]
+        [MemberData(nameof(MediaTypesWithParameters))]
+        [InlineData("application/json;format=pretty;q=0.9;charset=utf-8;q=0.8")]
+        [InlineData("application/json;format=pretty;q=0.9;charset=utf-8;q=0.8;version=3")]
+        public void CreateMediaTypeSegmentWithQuality_FindsQValue(string value)
+        {
+            // Arrange & Act
+            var mediaTypeSegment = MediaType.CreateMediaTypeSegmentWithQuality(value, start: 0);
+
+            // Assert
+            Assert.Equal(0.8d, mediaTypeSegment.Quality);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/NoContentFormatterTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/NoContentFormatterTests.cs
new file mode 100644
index 0000000000..408806e727
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/NoContentFormatterTests.cs
@@ -0,0 +1,159 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    public class NoContentFormatterTests
+    {
+        public static IEnumerable<object[]> OutputFormatterContextValues_CanWriteType
+        {
+            get
+            {
+                // object value, bool useDeclaredTypeAsString, bool expectedCanwriteResult, bool useNonNullContentType
+                yield return new object[] { "valid value", true, false, true };
+                yield return new object[] { "valid value", false, false, true };
+                yield return new object[] { "", false, false, true };
+                yield return new object[] { "", true, false, true };
+                yield return new object[] { null, true, true, true };
+                yield return new object[] { null, false, true, true };
+                yield return new object[] { null, false, true, false };
+                yield return new object[] { new object(), false, false, true };
+                yield return new object[] { 1232, false, false, true };
+                yield return new object[] { 1232, false, false, false };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(OutputFormatterContextValues_CanWriteType))]
+        public void CanWriteResult_ByDefault_ReturnsTrue_IfTheValueIsNull(
+            object value,
+            bool declaredTypeAsString,
+            bool expected,
+            bool useNonNullContentType)
+        {
+            // Arrange
+            var type = declaredTypeAsString ? typeof(string) : typeof(object);
+            var contentType = useNonNullContentType ? new StringSegment("text/plain") : new StringSegment();
+
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                type,
+                value)
+            {
+                ContentType = contentType,
+            };
+
+            var formatter = new HttpNoContentOutputFormatter();
+
+            // Act
+            var result = formatter.CanWriteResult(context);
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Theory]
+        [InlineData(typeof(void))]
+        [InlineData(typeof(Task))]
+        public void CanWriteResult_ReturnsTrue_IfReturnTypeIsVoidOrTask(Type declaredType)
+        {
+            // Arrange
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                declaredType,
+                "Something non null.")
+            {
+                ContentType = new StringSegment("text/plain"),
+            };
+
+            var formatter = new HttpNoContentOutputFormatter();
+
+            // Act
+            var result = formatter.CanWriteResult(context);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData(null, true, true)]
+        [InlineData(null, false, false)]
+        [InlineData("some value", true, false)]
+        public void CanWriteResult_ReturnsTrue_IfReturnValueIsNullAndTreatNullValueAsNoContentIsNotSet(
+            string value,
+            bool treatNullValueAsNoContent,
+            bool expected)
+        {
+            // Arrange
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                typeof(string),
+                value)
+            {
+                ContentType = new StringSegment("text/plain"),
+            };
+
+            var formatter = new HttpNoContentOutputFormatter()
+            {
+                TreatNullValueAsNoContent = treatNullValueAsNoContent
+            };
+
+            // Act
+            var result = formatter.CanWriteResult(context);
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Fact]
+        public async Task WriteAsync_WritesTheStatusCode204()
+        {
+            // Arrange
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                typeof(string),
+                @object: null);
+
+            var formatter = new HttpNoContentOutputFormatter();
+
+            // Act
+            await formatter.WriteAsync(context);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status204NoContent, context.HttpContext.Response.StatusCode);
+        }
+
+        [Fact]
+        public async Task WriteAsync_ContextStatusCodeSet_WritesSameStatusCode()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.Response.StatusCode = StatusCodes.Status201Created;
+
+            var context = new OutputFormatterWriteContext(
+                httpContext,
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                typeof(string),
+                @object: null);
+
+            var formatter = new HttpNoContentOutputFormatter();
+
+            // Act
+            await formatter.WriteAsync(context);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status201Created, httpContext.Response.StatusCode);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/OutputFormatterTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/OutputFormatterTests.cs
new file mode 100644
index 0000000000..3c2e9b80a9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/OutputFormatterTests.cs
@@ -0,0 +1,249 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
+using Microsoft.Net.Http.Headers;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    public class OutputFormatterTests
+    {
+        [Fact]
+        public void CanWriteResult_ForNullContentType_UsesFirstEntryInSupportedContentTypes()
+        {
+            // Arrange
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                objectType: null,
+                @object: null);
+
+            var formatter = new TestOutputFormatter();
+
+            // Act
+            var result = formatter.CanWriteResult(context);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal(formatter.SupportedMediaTypes[0].ToString(), context.ContentType.ToString());
+        }
+
+        [Fact]
+        public void GetSupportedContentTypes_ReturnsNull_ForUnsupportedType()
+        {
+            // Arrange
+            var formatter = new TypeSpecificFormatter();
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/json"));
+            formatter.SupportedTypes.Add(typeof(int));
+
+            // Act
+            var contentTypes = formatter.GetSupportedContentTypes(
+                contentType: null,
+                objectType: typeof(string));
+
+            // Assert
+            Assert.Null(contentTypes);
+        }
+
+        [Fact]
+        public void CanWrite_ReturnsFalse_ForUnsupportedType()
+        {
+            // Arrange
+            var formatter = new TypeSpecificFormatter();
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/json"));
+            formatter.SupportedTypes.Add(typeof(int));
+
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                typeof(string),
+                "Hello, world!")
+            {
+                ContentType = new StringSegment(formatter.SupportedMediaTypes[0].ToString()),
+            };
+
+            // Act
+            var result = formatter.CanWriteResult(context);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData(true, true)]
+        [InlineData(false, false)]
+        public void CanWriteResult_MatchesWildcardsOnlyWhenContentTypeProvidedByServer(
+            bool contentTypeProvidedByServer, bool shouldMatchWildcards)
+        {
+            // Arrange
+            var formatter = new TypeSpecificFormatter();
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/*+xml"));
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/*+json"));
+            formatter.SupportedTypes.Add(typeof(string));
+
+            var requestedContentType = "application/vnd.test.entity+json;v=2";
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                typeof(string),
+                "Hello, world!")
+            {
+                ContentType = new StringSegment(requestedContentType),
+                ContentTypeIsServerDefined = contentTypeProvidedByServer,
+            };
+
+            // Act
+            var result = formatter.CanWriteResult(context);
+
+            // Assert
+            Assert.Equal(shouldMatchWildcards, result);
+            Assert.Equal(requestedContentType, context.ContentType.ToString());
+        }
+
+        [Fact]
+        public void GetSupportedContentTypes_ReturnsAllNonWildcardContentTypes_WithContentTypeNull()
+        {
+            // Arrange
+            var formatter = new TestOutputFormatter();
+            formatter.SupportedMediaTypes.Clear();
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/json"));
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("*/*"));
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("text/*"));
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("text/plain;*"));
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/xml"));
+
+            // Act
+            var contentTypes = formatter.GetSupportedContentTypes(
+                contentType: null,
+                objectType: typeof(string));
+
+            // Assert
+            Assert.Equal(2, contentTypes.Count);
+            Assert.Single(contentTypes, ct => ct.ToString() == "application/json");
+            Assert.Single(contentTypes, ct => ct.ToString() == "application/xml");
+        }
+
+        [Fact]
+        public void GetSupportedContentTypes_ReturnsMoreSpecificMatchingContentTypes_WithContentType()
+        {
+            // Arrange
+            var formatter = new TestOutputFormatter();
+
+            formatter.SupportedMediaTypes.Clear();
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/json"));
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("text/xml"));
+
+            // Act
+            var contentTypes = formatter.GetSupportedContentTypes(
+                "application/*",
+                typeof(int));
+
+            // Assert
+            var contentType = Assert.Single(contentTypes);
+            Assert.Equal("application/json", contentType.ToString());
+        }
+
+        [Fact]
+        public void GetSupportedContentTypes_ReturnsMatchingWildcardContentTypes_WithContentType()
+        {
+            // Arrange
+            var formatter = new TestOutputFormatter();
+
+            formatter.SupportedMediaTypes.Clear();
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/json"));
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/*+json"));
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("text/xml"));
+
+            // Act
+            var contentTypes = formatter.GetSupportedContentTypes(
+                "application/vnd.test+json;v=2",
+                typeof(int));
+
+            // Assert
+            var contentType = Assert.Single(contentTypes);
+            Assert.Equal("application/vnd.test+json;v=2", contentType.ToString());
+        }
+
+        [Fact]
+        public void GetSupportedContentTypes_ReturnsMatchingContentTypes_NoMatches()
+        {
+            // Arrange
+            var formatter = new TestOutputFormatter();
+
+            formatter.SupportedMediaTypes.Clear();
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/*+xml"));
+            formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("text/xml"));
+
+            // Act
+            var contentTypes = formatter.GetSupportedContentTypes(
+                "application/vnd.test+bson",
+                typeof(int));
+
+            // Assert
+            Assert.Null(contentTypes);
+        }
+
+        private class TypeSpecificFormatter : OutputFormatter
+        {
+            public List<Type> SupportedTypes { get; } = new List<Type>();
+
+            protected override bool CanWriteType(Type type)
+            {
+                return SupportedTypes.Contains(type);
+            }
+
+            public override Task WriteResponseBodyAsync(OutputFormatterWriteContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        [Fact]
+        public void CanWrite_ThrowsInvalidOperationException_IfMediaTypesListIsEmpty()
+        {
+            // Arrange
+            var formatter = new TestOutputFormatter();
+            formatter.SupportedMediaTypes.Clear();
+
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                (s, e) => new StreamWriter(s, e),
+                typeof(object),
+                new object());
+
+            // Act & Assert
+            Assert.Throws<InvalidOperationException>(() => formatter.CanWriteResult(context));
+        }
+
+        [Fact]
+        public void GetSupportedContentTypes_ThrowsInvalidOperationException_IfMediaTypesListIsEmpty()
+        {
+            // Arrange
+            var formatter = new TestOutputFormatter();
+            formatter.SupportedMediaTypes.Clear();
+
+            // Act & Assert
+            Assert.Throws<InvalidOperationException>(
+                () => formatter.GetSupportedContentTypes("application/json", typeof(object)));
+        }
+
+        private class TestOutputFormatter : OutputFormatter
+        {
+            public TestOutputFormatter()
+            {
+                SupportedMediaTypes.Add("application/acceptCharset");
+            }
+
+            public override Task WriteResponseBodyAsync(OutputFormatterWriteContext context)
+            {
+                return Task.FromResult(true);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/StreamOutputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/StreamOutputFormatterTest.cs
new file mode 100644
index 0000000000..76fef9e1a2
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/StreamOutputFormatterTest.cs
@@ -0,0 +1,92 @@
+// 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.
+
+using System;
+using System.IO;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    public class StreamOutputFormatterTest
+    {
+        [Theory]
+        [InlineData(typeof(Stream), "text/plain")]
+        [InlineData(typeof(Stream), null)]
+        public void CanWriteResult_ReturnsTrue_ForStreams(Type type, string contentType)
+        {
+            // Arrange
+            var formatter = new StreamOutputFormatter();
+            var contentTypeHeader = new StringSegment(contentType);
+
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                type,
+                new MemoryStream())
+            {
+                ContentType = contentTypeHeader,
+            };
+
+            // Act
+            var canWrite = formatter.CanWriteResult(context);
+
+            // Assert
+            Assert.True(canWrite);
+        }
+
+        [Theory]
+        [InlineData(typeof(SimplePOCO), "text/plain")]
+        [InlineData(typeof(SimplePOCO), null)]
+        public void CanWriteResult_OnlyActsOnStreams_IgnoringContentType(Type type, string contentType)
+        {
+            // Arrange
+            var formatter = new StreamOutputFormatter();
+            var contentTypeHeader = contentType == null ? new StringSegment() : new StringSegment(contentType);
+
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                type,
+                new SimplePOCO())
+            {
+                ContentType = contentTypeHeader,
+            };
+
+            // Act
+            var canWrite = formatter.CanWriteResult(context);
+
+            // Assert
+            Assert.False(canWrite);
+        }
+
+        [Theory]
+        [InlineData(typeof(object))]
+        [InlineData(typeof(SimplePOCO))]
+        [InlineData(null)]
+        public void CanWriteResult_OnlyActsOnStreams(Type type)
+        {
+            // Arrange
+            var formatter = new StreamOutputFormatter();
+            var @object = type != null ? Activator.CreateInstance(type) : null;
+
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                type,
+                @object);
+
+            // Act
+            var result = formatter.CanWriteResult(context);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        private class SimplePOCO
+        {
+            public int Id { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/StringOutputFormatterTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/StringOutputFormatterTests.cs
new file mode 100644
index 0000000000..9069aa06f6
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/StringOutputFormatterTests.cs
@@ -0,0 +1,159 @@
+// 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.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    public class StringOutputFormatterTests
+    {
+        public static IEnumerable<object[]> CanWriteStringsData
+        {
+            get
+            {
+                // object value, bool useDeclaredTypeAsString
+                yield return new object[] { "declared and runtime type are same", true };
+                yield return new object[] { "declared and runtime type are different", false };
+                yield return new object[] { null, true };
+            }
+        }
+
+        public static TheoryData<object> CannotWriteNonStringsData
+        {
+            get
+            {
+                return new TheoryData<object>()
+                {
+                    null,
+                    new object()
+                };
+            }
+        }
+
+        [Theory]
+        [InlineData("application/json")]
+        [InlineData("application/xml")]
+        public void CannotWriteUnsupportedMediaType(string contentType)
+        {
+            // Arrange
+            var formatter = new StringOutputFormatter();
+            var expectedContentType = new StringSegment(contentType);
+
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                typeof(string),
+                "Thisisastring");
+            context.ContentType = new StringSegment(contentType);
+
+            // Act
+            var result = formatter.CanWriteResult(context);
+
+            // Assert
+            Assert.False(result);
+            Assert.Equal(expectedContentType, context.ContentType);
+        }
+
+        [Fact]
+        public void CanWriteResult_DefaultContentType()
+        {
+            // Arrange
+            var formatter = new StringOutputFormatter();
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                typeof(string),
+                "Thisisastring");
+
+            // Act
+            var result = formatter.CanWriteResult(context);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal(new StringSegment("text/plain"), context.ContentType);
+        }
+
+        [Theory]
+        [MemberData(nameof(CanWriteStringsData))]
+        public void CanWriteStrings(
+            object value,
+            bool useDeclaredTypeAsString)
+        {
+            // Arrange
+            var expectedContentType = new StringSegment("text/plain");
+
+            var formatter = new StringOutputFormatter();
+            var type = useDeclaredTypeAsString ? typeof(string) : typeof(object);
+
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                type,
+                value);
+            context.ContentType = new StringSegment("text/plain");
+
+            // Act
+            var result = formatter.CanWriteResult(context);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal(expectedContentType, context.ContentType);
+        }
+
+        [Theory]
+        [MemberData(nameof(CannotWriteNonStringsData))]
+        public void CannotWriteNonStrings(object value)
+        {
+            // Arrange
+            var expectedContentType = new StringSegment("text/plain");
+            var formatter = new StringOutputFormatter();
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                typeof(object),
+                value);
+            context.ContentType = new StringSegment("text/plain");
+
+            // Act
+            var result = formatter.CanWriteResult(context);
+
+            // Assert
+            Assert.False(result);
+            Assert.Equal(expectedContentType, context.ContentType);
+        }
+
+        [Fact]
+        public async Task WriteAsync_DoesNotWriteNullStrings()
+        {
+            // Arrange
+            Encoding encoding = Encoding.UTF8;
+            var memoryStream = new MemoryStream();
+            var response = new Mock<HttpResponse>();
+            response.SetupProperty(o => o.ContentLength);
+            response.SetupGet(r => r.Body).Returns(memoryStream);
+            var httpContext = new Mock<HttpContext>();
+            httpContext.Setup(o => o.Response).Returns(response.Object);
+
+            var formatter = new StringOutputFormatter();
+            var context = new OutputFormatterWriteContext(
+                httpContext.Object,
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                typeof(string),
+                @object: null);
+
+            // Act
+            await formatter.WriteResponseBodyAsync(context, encoding);
+
+            // Assert
+            Assert.Equal(0, memoryStream.Length);
+            response.VerifySet(r => r.ContentLength = It.IsAny<long?>(), Times.Never());
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/TextInputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/TextInputFormatterTest.cs
new file mode 100644
index 0000000000..5191a25c33
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/TextInputFormatterTest.cs
@@ -0,0 +1,237 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    public class TextInputFormatterTest
+    {
+        [Fact]
+        public async Task ReadAsync_ReturnsFailure_IfItCanNotUnderstandTheContentTypeEncoding()
+        {
+            // Arrange
+            var formatter = new TestFormatter();
+            formatter.SupportedEncodings.Add(Encoding.ASCII);
+
+            var context = new InputFormatterContext(
+                new DefaultHttpContext(),
+                "something",
+                new ModelStateDictionary(),
+                new EmptyModelMetadataProvider().GetMetadataForType(typeof(object)),
+                (stream, encoding) => new StreamReader(stream, encoding));
+
+            context.HttpContext.Request.ContentType = "application/json;charset=utf-8";
+            context.HttpContext.Request.ContentLength = 1;
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.True(result.HasError);
+            Assert.True(context.ModelState.ContainsKey("something"));
+            Assert.Single(context.ModelState["something"].Errors);
+
+            var error = context.ModelState["something"].Errors[0];
+            Assert.IsType<UnsupportedContentTypeException>(error.Exception);
+        }
+
+        [Fact]
+        public void SelectCharacterEncoding_ThrowsInvalidOperationException_IfItDoesNotHaveAValidEncoding()
+        {
+            // Arrange
+            var formatter = new TestFormatter();
+
+            var context = new InputFormatterContext(
+                new DefaultHttpContext(),
+                "something",
+                new ModelStateDictionary(),
+                new EmptyModelMetadataProvider().GetMetadataForType(typeof(object)),
+                (stream, encoding) => new StreamReader(stream, encoding));
+
+            context.HttpContext.Request.ContentLength = 1;
+
+            // Act & Assert
+            Assert.Throws<InvalidOperationException>(() => formatter.TestSelectCharacterEncoding(context));
+        }
+
+        [Theory]
+        [InlineData("utf-8")]
+        [InlineData("invalid")]
+        public void SelectCharacterEncoding_ReturnsNull_IfItCanNotUnderstandContentTypeEncoding(string charset)
+        {
+            // Arrange
+            var formatter = new TestFormatter();
+            formatter.SupportedEncodings.Add(Encoding.UTF32);
+
+            var context = new InputFormatterContext(
+                new DefaultHttpContext(),
+                "something",
+                new ModelStateDictionary(),
+                new EmptyModelMetadataProvider().GetMetadataForType(typeof(object)),
+                (stream, encoding) => new StreamReader(stream, encoding));
+
+            context.HttpContext.Request.ContentType = "application/json;charset=" + charset;
+
+            // Act
+            var result = formatter.TestSelectCharacterEncoding(context);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void SelectCharacterEncoding_ReturnsContentTypeEncoding_IfItCanUnderstandIt()
+        {
+            // Arrange
+            var formatter = new TestFormatter();
+            formatter.SupportedEncodings.Add(Encoding.UTF32);
+            formatter.SupportedEncodings.Add(Encoding.UTF8);
+
+            var context = new InputFormatterContext(
+                new DefaultHttpContext(),
+                "something",
+                new ModelStateDictionary(),
+                new EmptyModelMetadataProvider().GetMetadataForType(typeof(object)),
+                (stream, encoding) => new StreamReader(stream, encoding));
+
+            context.HttpContext.Request.ContentType = "application/json;charset=utf-8";
+
+            // Act
+            var result = formatter.TestSelectCharacterEncoding(context);
+
+            // Assert
+            Assert.Equal(Encoding.UTF8, result);
+        }
+
+        [Theory]
+        [InlineData("unicode-1-1-utf-8")]
+        [InlineData("unicode-2-0-utf-8")]
+        public void SelectCharacterEncoding_ReturnsUTF8Encoding_IfContentTypeIsAnAlias(string charset)
+        {
+            // Arrange
+            var formatter = new TestFormatter();
+            formatter.SupportedEncodings.Add(Encoding.UTF32);
+            formatter.SupportedEncodings.Add(Encoding.UTF8);
+
+            var context = new InputFormatterContext(
+                new DefaultHttpContext(),
+                "something",
+                new ModelStateDictionary(),
+                new EmptyModelMetadataProvider().GetMetadataForType(typeof(object)),
+                (stream, encoding) => new StreamReader(stream, encoding));
+
+            context.HttpContext.Request.ContentType = "application/json;charset=" + charset;
+
+            // Act
+            var result = formatter.TestSelectCharacterEncoding(context);
+
+            // Assert
+            Assert.Equal(Encoding.UTF8, result);
+        }
+
+        [Theory]
+        [InlineData("ANSI_X3.4-1968")]
+        [InlineData("ANSI_X3.4-1986")]
+        [InlineData("ascii")]
+        [InlineData("cp367")]
+        [InlineData("csASCII")]
+        [InlineData("IBM367")]
+        [InlineData("iso-ir-6")]
+        [InlineData("ISO646-US")]
+        [InlineData("ISO_646.irv:1991")]
+        [InlineData("us")]
+        public void SelectCharacterEncoding_ReturnsAsciiEncoding_IfContentTypeIsAnAlias(string charset)
+        {
+            // Arrange
+            var formatter = new TestFormatter();
+            formatter.SupportedEncodings.Add(Encoding.UTF32);
+            formatter.SupportedEncodings.Add(Encoding.ASCII);
+
+            var context = new InputFormatterContext(
+                new DefaultHttpContext(),
+                "something",
+                new ModelStateDictionary(),
+                new EmptyModelMetadataProvider().GetMetadataForType(typeof(object)),
+                (stream, encoding) => new StreamReader(stream, encoding));
+
+            context.HttpContext.Request.ContentType = "application/json;charset=\"" + charset + "\"";
+
+            // Act
+            var result = formatter.TestSelectCharacterEncoding(context);
+
+            // Assert
+            Assert.Equal(Encoding.ASCII, result);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData("(garbage)")]
+        [InlineData("(garbage); charset=utf-32")]
+        [InlineData("text/(garbage)")]
+        [InlineData("text/(garbage); charset=utf-32")]
+        [InlineData("application/json")]
+        [InlineData("application/json; charset")]
+        [InlineData("application/json; charset=(garbage)")]
+        [InlineData("application/json; version=(garbage); charset=utf-32")]
+        public void SelectCharacterEncoding_ReturnsFirstEncoding_IfContentTypeIsMissingInvalidOrDoesNotHaveEncoding(
+            string contentType)
+        {
+            // Arrange
+            var formatter = new TestFormatter();
+            formatter.SupportedEncodings.Add(Encoding.UTF8);
+            formatter.SupportedEncodings.Add(Encoding.UTF32);
+
+            var context = new InputFormatterContext(
+                new DefaultHttpContext(),
+                "something",
+                new ModelStateDictionary(),
+                new EmptyModelMetadataProvider().GetMetadataForType(typeof(object)),
+                (stream, encoding) => new StreamReader(stream, encoding));
+
+            context.HttpContext.Request.ContentType = contentType;
+
+            // Act
+            var result = formatter.TestSelectCharacterEncoding(context);
+
+            // Assert
+            Assert.Equal(Encoding.UTF8, result);
+        }
+
+        private class TestFormatter : TextInputFormatter
+        {
+            private readonly object _object;
+
+            public TestFormatter() : this(null) { }
+
+            public TestFormatter(object @object)
+            {
+                _object = @object;
+            }
+
+            public IList<Type> SupportedTypes { get; } = new List<Type>();
+
+            protected override bool CanReadType(Type type)
+            {
+                return SupportedTypes.Count == 0 ? true : SupportedTypes.Contains(type);
+            }
+
+            public override Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterContext context, Encoding encoding)
+            {
+                return InputFormatterResult.SuccessAsync(_object);
+            }
+
+            public Encoding TestSelectCharacterEncoding(InputFormatterContext context)
+            {
+                return SelectCharacterEncoding(context);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/TextOutputFormatterTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/TextOutputFormatterTests.cs
new file mode 100644
index 0000000000..53420ac38d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/TextOutputFormatterTests.cs
@@ -0,0 +1,293 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
+using Microsoft.Net.Http.Headers;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    public class TextOutputFormatterTests
+    {
+        public static IEnumerable<object[]> SelectResponseCharacterEncodingData
+        {
+            get
+            {
+                // string acceptEncodings, string requestEncoding, string[] supportedEncodings, string expectedEncoding
+                yield return new object[] { "", new string[] { "utf-8", "utf-16" }, "utf-8" };
+
+                yield return new object[] { "utf-8", new string[] { "utf-8", "utf-16" }, "utf-8" };
+                yield return new object[] { "utf-16", new string[] { "utf-8", "utf-16" }, "utf-16" };
+                yield return new object[] { "utf-16; q=0.5", new string[] { "utf-8", "utf-16" }, "utf-16" };
+
+                yield return new object[] { "utf-8; q=0.0", new string[] { "utf-8", "utf-16" }, "utf-8" };
+                yield return new object[] { "utf-8; q=0.0, utf-16; q=0.0", new string[] { "utf-8", "utf-16" }, "utf-8" };
+
+                yield return new object[] { "*; q=0.0", new string[] { "utf-8", "utf-16" }, "utf-8" };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(SelectResponseCharacterEncodingData))]
+        public void SelectResponseCharacterEncoding_SelectsEncoding(
+            string acceptCharsetHeaders,
+            string[] supportedEncodings,
+            string expectedEncoding)
+        {
+            // Arrange
+            var httpContext = new Mock<HttpContext>();
+            var httpRequest = new DefaultHttpContext().Request;
+            httpRequest.Headers[HeaderNames.AcceptCharset] = acceptCharsetHeaders;
+            httpRequest.Headers[HeaderNames.Accept] = "application/acceptCharset";
+            httpContext.SetupGet(o => o.Request).Returns(httpRequest);
+
+            var formatter = new TestOutputFormatter();
+            foreach (string supportedEncoding in supportedEncodings)
+            {
+                formatter.SupportedEncodings.Add(Encoding.GetEncoding(supportedEncoding));
+            }
+
+            var context = new OutputFormatterWriteContext(
+                httpContext.Object,
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                typeof(string),
+                "someValue")
+            {
+                ContentType = new StringSegment(httpRequest.Headers[HeaderNames.Accept]),
+            };
+
+            // Act
+            var actualEncoding = formatter.SelectCharacterEncoding(context);
+
+            // Assert
+            Assert.Equal(Encoding.GetEncoding(expectedEncoding), actualEncoding);
+        }
+
+        [Theory]
+        [InlineData("application/json; charset=utf-16", "application/json; charset=utf-32")]
+        [InlineData("application/json; charset=utf-16; format=indent", "application/json; charset=utf-32; format=indent")]
+        public void WriteResponse_OverridesCharset_IfDifferentFromContentTypeCharset(
+            string contentType,
+            string expectedContentType)
+        {
+            // Arrange
+            var formatter = new OverrideEncodingFormatter(Encoding.UTF32);
+
+            var formatterContext = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                objectType: null,
+                @object: null)
+            {
+                ContentType = new StringSegment(contentType),
+            };
+
+            // Act
+            formatter.WriteAsync(formatterContext);
+
+            // Assert
+            Assert.Equal(new StringSegment(expectedContentType), formatterContext.ContentType);
+        }
+
+        [Fact]
+        public void WriteResponse_GetMediaTypeWithCharsetReturnsMediaTypeFromCache_IfEncodingIsUtf8()
+        {
+            // Arrange
+            var formatter = new TestOutputFormatter();
+
+            var formatterContext = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                objectType: null,
+                @object: null)
+            {
+                ContentType = new StringSegment("application/json"),
+            };
+
+            formatter.SupportedMediaTypes.Add("application/json");
+            formatter.SupportedEncodings.Add(Encoding.UTF8);
+
+            // Act
+            formatter.WriteAsync(formatterContext);
+            var firstContentType = formatterContext.ContentType;
+
+            formatterContext.ContentType = new StringSegment("application/json");
+
+            formatter.WriteAsync(formatterContext);
+            var secondContentType = formatterContext.ContentType;
+
+            // Assert
+            Assert.Same(firstContentType.Buffer, secondContentType.Buffer);
+        }
+
+        [Fact]
+        public void WriteResponse_GetMediaTypeWithCharsetReplacesCharset_IfDifferentThanEncoding()
+        {
+            // Arrange
+            var formatter = new TestOutputFormatter();
+
+            var formatterContext = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                objectType: null,
+                @object: null)
+            {
+                ContentType = new StringSegment("application/json; charset=utf-7"),
+            };
+
+            formatter.SupportedMediaTypes.Add("application/json");
+            formatter.SupportedEncodings.Add(Encoding.UTF8);
+
+            // Act
+            formatter.WriteAsync(formatterContext);
+
+            // Assert
+            Assert.Equal(new StringSegment("application/json; charset=utf-8"), formatterContext.ContentType);
+        }
+
+        [Fact]
+        public void WriteResponse_GetMediaTypeWithCharsetReturnsSameString_IfCharsetEqualToEncoding()
+        {
+            // Arrange
+            var formatter = new TestOutputFormatter();
+
+            var contentType = "application/json; charset=utf-16";
+            var formatterContext = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                objectType: null,
+                @object: null)
+            {
+                ContentType = new StringSegment(contentType),
+            };
+
+            formatter.SupportedMediaTypes.Add("application/json");
+            formatter.SupportedEncodings.Add(Encoding.Unicode);
+
+            // Act
+            formatter.WriteAsync(formatterContext);
+
+            // Assert
+            Assert.Same(contentType, formatterContext.ContentType.Buffer);
+        }
+
+        [Fact]
+        public void WriteResponseContentHeaders_NoSupportedEncodings_NoEncodingIsSet()
+        {
+            // Arrange
+            var formatter = new TestOutputFormatter();
+
+            var testContentType = new StringSegment("text/json");
+
+            formatter.SupportedEncodings.Clear();
+            formatter.SupportedMediaTypes.Clear();
+            formatter.SupportedMediaTypes.Add(new MediaTypeHeaderValue("text/json"));
+
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                objectType: null,
+                @object: null)
+            {
+                ContentType = testContentType,
+            };
+
+            // Act
+            formatter.WriteResponseHeaders(context);
+
+            // Assert
+            Assert.Null(MediaTypeHeaderValue.Parse(context.ContentType.Value).Encoding);
+            Assert.Equal(testContentType, context.ContentType);
+
+            // If we had set an encoding, it would be part of the content type header
+            Assert.Equal(MediaTypeHeaderValue.Parse(testContentType.Value), context.HttpContext.Response.GetTypedHeaders().ContentType);
+        }
+
+        [Fact]
+        public async Task WriteAsync_ReturnsNotAcceptable_IfSelectCharacterEncodingReturnsNull()
+        {
+            // Arrange
+            var formatter = new OverrideEncodingFormatter(encoding: null);
+
+            var testContentType = new StringSegment("text/json");
+            formatter.SupportedMediaTypes.Add(new MediaTypeHeaderValue("text/json"));
+
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                objectType: null,
+                @object: null)
+            {
+                ContentType = testContentType,
+            };
+
+            // Act
+            await formatter.WriteAsync(context);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status406NotAcceptable, context.HttpContext.Response.StatusCode);
+        }
+
+        [Fact]
+        public void GetAcceptCharsetHeaderValues_ReadsHeaderAndParsesValues()
+        {
+            // Arrange
+            const string expectedValue = "expected";
+
+            var formatter = new OverrideEncodingFormatter(encoding: null);
+            var context = new DefaultHttpContext();
+            context.Request.Headers[HeaderNames.AcceptCharset] = expectedValue;
+
+            var writerContext = new OutputFormatterWriteContext(
+                context,
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                objectType: null,
+                @object: null);
+
+            // Act
+            var result = TextOutputFormatter.GetAcceptCharsetHeaderValues(writerContext);
+
+            //Assert
+            Assert.Equal(expectedValue, Assert.Single(result).Value.Value);
+        }
+
+        private class TestOutputFormatter : TextOutputFormatter
+        {
+            public TestOutputFormatter()
+            {
+                SupportedMediaTypes.Add("application/acceptCharset");
+            }
+
+            public override Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
+            {
+                return Task.FromResult(true);
+            }
+        }
+
+        private class OverrideEncodingFormatter : TextOutputFormatter
+        {
+            private readonly Encoding _encoding;
+
+            public OverrideEncodingFormatter(Encoding encoding)
+            {
+                _encoding = encoding;
+            }
+
+            public override Encoding SelectCharacterEncoding(OutputFormatterWriteContext context)
+            {
+                return _encoding;
+            }
+
+            public override Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
+            {
+                return Task.FromResult(true);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs
new file mode 100644
index 0000000000..6168694207
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs
@@ -0,0 +1,88 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class HttpNotFoundObjectResultTest
+    {
+        [Fact]
+        public void HttpNotFoundObjectResult_InitializesStatusCode()
+        {
+            // Arrange & act
+            var notFound = new NotFoundObjectResult(null);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status404NotFound, notFound.StatusCode);
+        }
+
+        [Fact]
+        public void HttpNotFoundObjectResult_InitializesStatusCodeAndResponseContent()
+        {
+            // Arrange & act
+            var notFound = new NotFoundObjectResult("Test Content");
+
+            // Assert
+            Assert.Equal(StatusCodes.Status404NotFound, notFound.StatusCode);
+            Assert.Equal("Test Content", notFound.Value);
+        }
+
+        [Fact]
+        public async Task HttpNotFoundObjectResult_ExecuteSuccessful()
+        {
+            // Arrange
+            var httpContext = GetHttpContext();
+            var actionContext = new ActionContext()
+            {
+                HttpContext = httpContext,
+            };
+
+            var result = new NotFoundObjectResult("Test Content");
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status404NotFound, httpContext.Response.StatusCode);
+        }
+
+        private static HttpContext GetHttpContext()
+        {
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.PathBase = new PathString("");
+            httpContext.Response.Body = new MemoryStream();
+            httpContext.RequestServices = CreateServices();
+            return httpContext;
+        }
+
+        private static IServiceProvider CreateServices()
+        {
+            var options = Options.Create(new MvcOptions());
+            options.Value.OutputFormatters.Add(new StringOutputFormatter());
+            options.Value.OutputFormatters.Add(new JsonOutputFormatter(
+                new JsonSerializerSettings(),
+                ArrayPool<char>.Shared));
+
+            var services = new ServiceCollection();
+            services.AddSingleton<IActionResultExecutor<ObjectResult>>(new ObjectResultExecutor(
+                new DefaultOutputFormatterSelector(options, NullLoggerFactory.Instance),
+                new TestHttpResponseStreamWriterFactory(),
+                NullLoggerFactory.Instance));
+
+            return services.BuildServiceProvider();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundResultTests.cs
new file mode 100644
index 0000000000..a70c66e334
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundResultTests.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class HttpNotFoundResultTests
+    {
+        [Fact]
+        public void HttpNotFoundResult_InitializesStatusCode()
+        {
+            // Arrange & act
+            var notFound = new NotFoundResult();
+
+            // Assert
+            Assert.Equal(StatusCodes.Status404NotFound, notFound.StatusCode);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkObjectResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkObjectResultTest.cs
new file mode 100644
index 0000000000..db4d71f11f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkObjectResultTest.cs
@@ -0,0 +1,96 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class HttpOkObjectResultTest
+    {
+        public static TheoryData<object> ValuesData
+        {
+            get
+            {
+                return new TheoryData<object>
+                {
+                    null,
+                    "Test string",
+                    new Person
+                    {
+                        Id = 274,
+                        Name = "George",
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ValuesData))]
+        public void HttpOkObjectResult_InitializesStatusCodeAndValue(object value)
+        {
+            // Arrange & Act
+            var result = new OkObjectResult(value);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status200OK, result.StatusCode);
+            Assert.Same(value, result.Value);
+        }
+
+        [Theory]
+        [MemberData(nameof(ValuesData))]
+        public async Task HttpOkObjectResult_SetsStatusCode(object value)
+        {
+            // Arrange
+            var result = new OkObjectResult(value);
+
+            var httpContext = new DefaultHttpContext
+            {
+                RequestServices = CreateServices(),
+            };
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status200OK, httpContext.Response.StatusCode);
+        }
+
+        private static IServiceProvider CreateServices()
+        {
+            var options = Options.Create(new MvcOptions());
+            options.Value.OutputFormatters.Add(new StringOutputFormatter());
+            options.Value.OutputFormatters.Add(new JsonOutputFormatter(
+                new JsonSerializerSettings(),
+                ArrayPool<char>.Shared));
+
+            var services = new ServiceCollection();
+            services.AddSingleton<IActionResultExecutor<ObjectResult>>(new ObjectResultExecutor(
+                new DefaultOutputFormatterSelector(options, NullLoggerFactory.Instance),
+                new TestHttpResponseStreamWriterFactory(),
+                NullLoggerFactory.Instance));
+
+            return services.BuildServiceProvider();
+        }
+
+        private class Person
+        {
+            public int Id { get; set; }
+
+            public string Name { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkResultTest.cs
new file mode 100644
index 0000000000..be9a2c7af6
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkResultTest.cs
@@ -0,0 +1,51 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class HttpOkResultTest
+    {
+        [Fact]
+        public void HttpOkResult_InitializesStatusCode()
+        {
+            // Arrange & Act
+            var result = new OkResult();
+
+            // Assert
+            Assert.Equal(StatusCodes.Status200OK, result.StatusCode);
+        }
+
+        [Fact]
+        public async Task HttpOkResult_SetsStatusCode()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = CreateServices().BuildServiceProvider();
+
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var result = new OkResult();
+
+            // Act
+            await result.ExecuteResultAsync(context);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status200OK, context.HttpContext.Response.StatusCode);
+        }
+
+        private static IServiceCollection CreateServices()
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+            return services;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpStatusCodeResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpStatusCodeResultTests.cs
new file mode 100644
index 0000000000..e69fabaf5e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpStatusCodeResultTests.cs
@@ -0,0 +1,52 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class HttpStatusCodeResultTests
+    {
+        [Fact]
+        public void HttpStatusCodeResult_ExecuteResultSetsResponseStatusCode()
+        {
+            // Arrange
+            var result = new StatusCodeResult(StatusCodes.Status404NotFound);
+
+            var httpContext = GetHttpContext();
+            var routeData = new RouteData();
+            var actionDescriptor = new ActionDescriptor();
+
+            var context = new ActionContext(httpContext, routeData, actionDescriptor);
+
+            // Act
+            result.ExecuteResult(context);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status404NotFound, httpContext.Response.StatusCode);
+        }
+
+        private static IServiceCollection CreateServices()
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+            return services;
+        }
+
+        private static HttpContext GetHttpContext()
+        {
+            var services = CreateServices();
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = services.BuildServiceProvider();
+
+            return httpContext;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpUnauthorizedResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpUnauthorizedResultTests.cs
new file mode 100644
index 0000000000..2f51646fac
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpUnauthorizedResultTests.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class HttpUnauthorizedResultTests
+    {
+        [Fact]
+        public void HttpUnauthorizedResult_InitializesStatusCode()
+        {
+            // Arrange & act
+            var result = new UnauthorizedResult();
+
+            // Assert
+            Assert.Equal(StatusCodes.Status401Unauthorized, result.StatusCode);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/CompatibilitySwitchTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/CompatibilitySwitchTest.cs
new file mode 100644
index 0000000000..119113f668
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/CompatibilitySwitchTest.cs
@@ -0,0 +1,60 @@
+// 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.
+
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    public class CompatibilitySwitchTest
+    {
+        [Fact]
+        public void Constructor_WithName_IsValueSetIsFalse()
+        {
+            // Arrange & Act
+            var @switch = new CompatibilitySwitch<bool>("TestProperty");
+
+            // Assert
+            Assert.False(@switch.Value);
+            Assert.False(@switch.IsValueSet);
+        }
+
+        [Fact]
+        public void Constructor_WithNameAndInitalValue_IsValueSetIsFalse()
+        {
+            // Arrange & Act
+            var @switch = new CompatibilitySwitch<bool>("TestProperty", initialValue: true);
+
+            // Assert
+            Assert.True(@switch.Value);
+            Assert.False(@switch.IsValueSet);
+        }
+
+        [Fact]
+        public void ValueNonInterface_SettingValue_SetsIsValueSetToTrue()
+        {
+            // Arrange
+            var @switch = new CompatibilitySwitch<bool>("TestProperty");
+
+            // Act
+            @switch.Value = false; // You don't need to actually change the value, just caling the setting works
+
+            // Assert
+            Assert.False(@switch.Value);
+            Assert.True(@switch.IsValueSet);
+        }
+
+        [Fact]
+        public void ValueInterface_SettingValue_SetsIsValueSetToTrue()
+        {
+            // Arrange
+            var @switch = new CompatibilitySwitch<bool>("TestProperty");
+
+            // Act
+            ((ICompatibilitySwitch)@switch).Value = true;
+
+            // Assert
+            Assert.True(@switch.Value);
+            Assert.True(@switch.IsValueSet);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ConfigureCompatibilityOptionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ConfigureCompatibilityOptionsTest.cs
new file mode 100644
index 0000000000..a666303be8
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ConfigureCompatibilityOptionsTest.cs
@@ -0,0 +1,117 @@
+// 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.
+
+using System.Collections;
+using System.Collections.Generic;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    public class ConfigureCompatibilityOptionsTest
+    {
+        [Fact]
+        public void PostConfigure_NoValueForProperty_DoesNothing()
+        {
+            // Arrange
+            var configure = Create(CompatibilityVersion.Version_2_0, new Dictionary<string, object>());
+
+            var options = new TestOptions();
+
+            // Act
+            configure.PostConfigure(Options.DefaultName, options);
+
+            // Assert
+            Assert.False(options.TestProperty);
+        }
+
+        [Fact]
+        public void PostConfigure_ValueIsSet_DoesNothing()
+        {
+            // Arrange
+            var configure = Create(CompatibilityVersion.Version_2_0, new Dictionary<string, object>()
+            {
+                { nameof(TestOptions.TestProperty), true },
+            });
+
+            var options = new TestOptions()
+            {
+                TestProperty = false,
+            };
+
+            // Act
+            configure.PostConfigure(Options.DefaultName, options);
+
+            // Assert
+            Assert.False(options.TestProperty);
+        }
+
+        [Fact]
+        public void PostConfigure_ValueNotSet_SetsValue()
+        {
+            // Arrange
+            var configure = Create(CompatibilityVersion.Version_2_0, new Dictionary<string, object>()
+            {
+                { nameof(TestOptions.TestProperty), true },
+            });
+
+            var options = new TestOptions();
+
+            // Act
+            configure.PostConfigure(Options.DefaultName, options);
+
+            // Assert
+            Assert.True(options.TestProperty);
+        }
+
+        private static ConfigureCompatibilityOptions<TestOptions> Create(
+            CompatibilityVersion version, 
+            IReadOnlyDictionary<string, object> defaultValues)
+        {
+            var compatibilityOptions = Options.Create(new MvcCompatibilityOptions() { CompatibilityVersion = version });
+            return new TestConfigure(NullLoggerFactory.Instance, compatibilityOptions, defaultValues);
+        }
+
+        private class TestOptions : IEnumerable<ICompatibilitySwitch>
+        {
+            private readonly CompatibilitySwitch<bool> _testProperty;
+
+            private readonly ICompatibilitySwitch[] _switches;
+
+            public TestOptions()
+            {
+                _testProperty = new CompatibilitySwitch<bool>(nameof(TestProperty));
+                _switches = new ICompatibilitySwitch[] { _testProperty };
+            }
+
+            public bool TestProperty
+            {
+                get => _testProperty.Value;
+                set => _testProperty.Value = value;
+            }
+
+            public IEnumerator<ICompatibilitySwitch> GetEnumerator()
+            {
+                return ((IEnumerable<ICompatibilitySwitch>)_switches).GetEnumerator();
+            }
+
+            IEnumerator IEnumerable.GetEnumerator() => _switches.GetEnumerator();
+        }
+
+        private class TestConfigure : ConfigureCompatibilityOptions<TestOptions>
+        {
+            public TestConfigure(
+                ILoggerFactory loggerFactory,
+                IOptions<MvcCompatibilityOptions> compatibilityOptions,
+                IReadOnlyDictionary<string, object> defaultValues) 
+                : base(loggerFactory, compatibilityOptions)
+            {
+                DefaultValues = defaultValues;
+            }
+
+            protected override IReadOnlyDictionary<string, object> DefaultValues { get; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/DefaultOutputFormatterSelectorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/DefaultOutputFormatterSelectorTest.cs
new file mode 100644
index 0000000000..64310b8fd6
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/DefaultOutputFormatterSelectorTest.cs
@@ -0,0 +1,459 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+using Microsoft.Net.Http.Headers;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    public class DefaultObjectResultExecutorTest
+    {
+        [Fact]
+        public void SelectFormatter_UsesPassedInFormatters_IgnoresOptionsFormatters()
+        {
+            // Arrange
+            var formatters = new List<IOutputFormatter>
+            {
+                new TestXmlOutputFormatter(),
+                new TestJsonOutputFormatter(), // This will be chosen based on the content type
+            };
+            var selector = CreateSelector(new IOutputFormatter[] { });
+
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                objectType: null,
+                @object: null);
+
+            context.HttpContext.Request.Headers[HeaderNames.Accept] = "application/xml"; // This will not be used
+
+            // Act
+            var formatter = selector.SelectFormatter(
+                context,
+                formatters,
+                new MediaTypeCollection { "application/json" });
+
+            // Assert
+            Assert.Same(formatters[1], formatter);
+            Assert.Equal(new StringSegment("application/json"), context.ContentType);
+        }
+
+        [Fact]
+        public void SelectFormatter_WithOneProvidedContentType_IgnoresAcceptHeader()
+        {
+            // Arrange
+            var formatters = new List<IOutputFormatter>
+            {
+                new TestXmlOutputFormatter(),
+                new TestJsonOutputFormatter(), // This will be chosen based on the content type
+            };
+            var selector = CreateSelector(formatters);
+
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                objectType: null,
+                @object: null);
+
+            context.HttpContext.Request.Headers[HeaderNames.Accept] = "application/xml"; // This will not be used
+
+            // Act
+            var formatter = selector.SelectFormatter(
+                context,
+                Array.Empty<IOutputFormatter>(),
+                new MediaTypeCollection { "application/json" });
+
+            // Assert
+            Assert.Same(formatters[1], formatter);
+            Assert.Equal(new StringSegment("application/json"), context.ContentType);
+        }
+
+        [Fact]
+        public void SelectFormatter_WithOneProvidedContentType_NoFallback()
+        {
+            // Arrange
+            var formatters = new List<IOutputFormatter>
+            {
+                new TestXmlOutputFormatter(),
+            };
+            var selector = CreateSelector(formatters);
+
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                objectType: null,
+                @object: null);
+
+            context.HttpContext.Request.Headers[HeaderNames.Accept] = "application/xml"; // This will not be used
+
+            // Act
+            var formatter = selector.SelectFormatter(
+                context,
+                Array.Empty<IOutputFormatter>(),
+                new MediaTypeCollection { "application/json" });
+
+            // Assert
+            Assert.Null(formatter);
+        }
+
+        // ObjectResult.ContentTypes, Accept header, expected content type
+        public static TheoryData<MediaTypeCollection, string, string> ContentTypes
+        {
+            get
+            {
+                var contentTypes = new MediaTypeCollection
+                {
+                    "text/plain",
+                    "text/xml",
+                    "application/json",
+                };
+
+                return new TheoryData<MediaTypeCollection, string, string>()
+                {
+                    // Empty accept header, should select based on ObjectResult.ContentTypes.
+                    { contentTypes, "", "application/json" },
+
+                    // null accept header, should select based on ObjectResult.ContentTypes.
+                    { contentTypes, null, "application/json" },
+
+                    // The accept header does not match anything in ObjectResult.ContentTypes.
+                    // The first formatter that can write the result gets to choose the content type.
+                    { contentTypes, "text/custom", "application/json" },
+
+                    // Accept header matches ObjectResult.ContentTypes, but no formatter supports the accept header.
+                    // The first formatter that can write the result gets to choose the content type.
+                    { contentTypes, "text/xml", "application/json" },
+
+                    // Filters out Accept headers with 0 quality and selects the one with highest quality.
+                    {
+                        contentTypes,
+                        "text/plain;q=0.3, text/json;q=0, text/cusotm;q=0.0, application/json;q=0.4",
+                        "application/json"
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ContentTypes))]
+        public void SelectFormatter_WithMultipleProvidedContentTypes_DoesConneg(
+            MediaTypeCollection contentTypes,
+            string acceptHeader,
+            string expectedContentType)
+        {
+            // Arrange
+            var formatters = new List<IOutputFormatter>
+            {
+                new CannotWriteFormatter(),
+                new TestJsonOutputFormatter(),
+            };
+            var selector = CreateSelector(formatters);
+
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                objectType: null,
+                @object: null);
+
+            context.HttpContext.Request.Headers[HeaderNames.Accept] = acceptHeader;
+
+            // Act
+            var formatter = selector.SelectFormatter(
+                context,
+                Array.Empty<IOutputFormatter>(),
+                contentTypes);
+
+            // Assert
+            Assert.Same(formatters[1], formatter);
+            Assert.Equal(new StringSegment(expectedContentType), context.ContentType);
+        }
+
+        [Fact]
+        public void SelectFormatter_NoProvidedContentTypesAndNoAcceptHeader_ChoosesFirstFormatterThatCanWrite()
+        {
+            // Arrange
+            var formatters = new List<IOutputFormatter>
+            {
+                new CannotWriteFormatter(),
+                new TestJsonOutputFormatter(),
+                new TestXmlOutputFormatter(),
+            };
+            var selector = CreateSelector(formatters);
+
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                objectType: null,
+                @object: null);
+
+            // Act
+            var formatter = selector.SelectFormatter(
+                context,
+                Array.Empty<IOutputFormatter>(),
+                new MediaTypeCollection());
+
+            // Assert
+            Assert.Same(formatters[1], formatter);
+            Assert.Equal(new StringSegment("application/json"), context.ContentType);
+        }
+
+        [Fact]
+        public void SelectFormatter_WithAcceptHeader_UsesFallback()
+        {
+            // Arrange
+            var formatters = new List<IOutputFormatter>
+            {
+                new TestXmlOutputFormatter(),
+                new TestJsonOutputFormatter(),
+            };
+            var selector = CreateSelector(formatters);
+
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                objectType: null,
+                @object: null);
+
+            context.HttpContext.Request.Headers[HeaderNames.Accept] = "text/custom,application/custom";
+
+            // Act
+            var formatter = selector.SelectFormatter(
+                context,
+                Array.Empty<IOutputFormatter>(),
+                new MediaTypeCollection());
+
+            // Assert
+            Assert.Same(formatters[0], formatter);
+            Assert.Equal(new StringSegment("application/xml"), context.ContentType);
+        }
+
+        [Fact]
+        public void SelectFormatter_WithAcceptHeaderAndReturnHttpNotAcceptable_DoesNotUseFallback()
+        {
+            // Arrange
+            var options = new MvcOptions()
+            {
+                ReturnHttpNotAcceptable = true,
+                OutputFormatters =
+                {
+                    new TestXmlOutputFormatter(),
+                    new TestJsonOutputFormatter(),
+                },
+            };
+
+            var selector = CreateSelector(options);
+
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                objectType: null,
+                @object: null);
+
+            context.HttpContext.Request.Headers[HeaderNames.Accept] = "text/custom,application/custom";
+
+            // Act
+            var formatter = selector.SelectFormatter(
+                context,
+                Array.Empty<IOutputFormatter>(),
+                new MediaTypeCollection());
+
+            // Assert
+            Assert.Null(formatter);
+        }
+
+        [Fact]
+        public void SelectFormatter_WithAcceptHeaderOnly_SetsContentTypeIsServerDefinedToFalse()
+        {
+            // Arrange
+            var formatters = new List<IOutputFormatter>
+            {
+                new ServerContentTypeOnlyFormatter()
+            };
+
+            var selector = CreateSelector(formatters);
+
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                objectType: null,
+                @object: null);
+
+            context.HttpContext.Request.Headers[HeaderNames.Accept] = "text/custom";
+
+            // Act
+            var formatter = selector.SelectFormatter(
+                context,
+                Array.Empty<IOutputFormatter>(),
+                new MediaTypeCollection());
+
+            // Assert
+            Assert.Null(formatter);
+        }
+
+        [Fact]
+        public void SelectFormatter_WithAcceptHeaderAndContentTypes_SetsContentTypeIsServerDefinedWhenExpected()
+        {
+            // Arrange
+            var formatters = new List<IOutputFormatter>
+            {
+                new ServerContentTypeOnlyFormatter()
+            };
+
+            var selector = CreateSelector(formatters);
+
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                objectType: null,
+                @object: null);
+
+            context.HttpContext.Request.Headers[HeaderNames.Accept] = "text/custom, text/custom2";
+
+            var serverDefinedContentTypes = new MediaTypeCollection();
+            serverDefinedContentTypes.Add("text/other");
+            serverDefinedContentTypes.Add("text/custom2");
+
+            // Act
+            var formatter = selector.SelectFormatter(
+                context,
+                Array.Empty<IOutputFormatter>(),
+                serverDefinedContentTypes);
+
+            // Assert
+            Assert.Same(formatters[0], formatter);
+            Assert.Equal(new StringSegment("text/custom2"), context.ContentType);
+        }
+
+        [Fact]
+        public void SelectFormatter_WithContentTypesOnly_SetsContentTypeIsServerDefinedToTrue()
+        {
+            // Arrange
+            var formatters = new List<IOutputFormatter>
+            {
+                new ServerContentTypeOnlyFormatter()
+            };
+
+            var selector = CreateSelector(formatters);
+
+            var context = new OutputFormatterWriteContext(
+                new DefaultHttpContext(),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                objectType: null,
+                @object: null);
+
+            var serverDefinedContentTypes = new MediaTypeCollection();
+            serverDefinedContentTypes.Add("text/custom");
+
+            // Act
+            var formatter = selector.SelectFormatter(
+                context,
+                Array.Empty<IOutputFormatter>(),
+                serverDefinedContentTypes);
+
+            // Assert
+            Assert.Same(formatters[0], formatter);
+            Assert.Equal(new StringSegment("text/custom"), context.ContentType);
+        }
+
+        private static DefaultOutputFormatterSelector CreateSelector(IEnumerable<IOutputFormatter> formatters)
+        {
+            var options = new MvcOptions();
+            foreach (var formatter in formatters)
+            {
+                options.OutputFormatters.Add(formatter);
+            }
+
+            return CreateSelector(options);
+        }
+
+        private static DefaultOutputFormatterSelector CreateSelector(MvcOptions options)
+        {
+            return new DefaultOutputFormatterSelector(Options.Create(options), NullLoggerFactory.Instance);
+        }
+
+        private class CannotWriteFormatter : IOutputFormatter
+        {
+            public virtual bool CanWriteResult(OutputFormatterCanWriteContext context)
+            {
+                return false;
+            }
+
+            public virtual Task WriteAsync(OutputFormatterWriteContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class TestJsonOutputFormatter : TextOutputFormatter
+        {
+            public TestJsonOutputFormatter()
+            {
+                SupportedMediaTypes.Add(new MediaTypeHeaderValue("application/json"));
+                SupportedMediaTypes.Add(new MediaTypeHeaderValue("text/json"));
+
+                SupportedEncodings.Add(Encoding.UTF8);
+            }
+
+            public override Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
+            {
+                return Task.FromResult(0);
+            }
+        }
+
+        private class TestXmlOutputFormatter : TextOutputFormatter
+        {
+            public TestXmlOutputFormatter()
+            {
+                SupportedMediaTypes.Add(new MediaTypeHeaderValue("application/xml"));
+                SupportedMediaTypes.Add(new MediaTypeHeaderValue("text/xml"));
+
+                SupportedEncodings.Add(Encoding.UTF8);
+            }
+
+            public override Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
+            {
+                return Task.FromResult(0);
+            }
+        }
+
+        private class TestStringOutputFormatter : TextOutputFormatter
+        {
+            public TestStringOutputFormatter()
+            {
+                SupportedMediaTypes.Add(new MediaTypeHeaderValue("text/plain"));
+
+                SupportedEncodings.Add(Encoding.UTF8);
+            }
+
+            public override Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
+            {
+                return Task.FromResult(0);
+            }
+        }
+
+        private class ServerContentTypeOnlyFormatter : OutputFormatter
+        {
+            public override bool CanWriteResult(OutputFormatterCanWriteContext context)
+            {
+                // This test formatter matches if and only if the content type is specified
+                // as "server defined". This lets tests identify what value the ObjectResultExecutor
+                // passed for that flag.
+                return context.ContentTypeIsServerDefined;
+            }
+
+            public override Task WriteResponseBodyAsync(OutputFormatterWriteContext context)
+            {
+                return Task.FromResult(0);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ModelStateInvalidFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ModelStateInvalidFilterTest.cs
new file mode 100644
index 0000000000..fb5c0111c1
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ModelStateInvalidFilterTest.cs
@@ -0,0 +1,84 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Logging.Abstractions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    public class ModelStateInvalidFilterTest
+    {
+        [Fact]
+        public void OnActionExecuting_NoOpsIfResultIsAlreadySet()
+        {
+            // Arrange
+            var options = new ApiBehaviorOptions
+            {
+                InvalidModelStateResponseFactory = _ => new BadRequestResult(),
+            };
+            var filter = new ModelStateInvalidFilter(options, NullLogger.Instance);
+            var context = GetActionExecutingContext();
+            var expected = new OkResult();
+            context.Result = expected;
+
+            // Act
+            filter.OnActionExecuting(context);
+
+            // Assert
+            Assert.Same(expected, context.Result);
+        }
+
+        [Fact]
+        public void OnActionExecuting_NoOpsIfModelStateIsValid()
+        {
+            // Arrange
+            var options = new ApiBehaviorOptions
+            {
+                InvalidModelStateResponseFactory = _ => new BadRequestResult(),
+            };
+            var filter = new ModelStateInvalidFilter(options, NullLogger.Instance);
+            var context = GetActionExecutingContext();
+
+            // Act
+            filter.OnActionExecuting(context);
+
+            // Assert
+            Assert.Null(context.Result);
+        }
+
+        [Fact]
+        public void OnActionExecuting_InvokesResponseFactoryIfModelStateIsInvalid()
+        {
+            // Arrange
+            var expected = new BadRequestResult();
+            var options = new ApiBehaviorOptions
+            {
+                InvalidModelStateResponseFactory = _ => expected,
+            };
+            var filter = new ModelStateInvalidFilter(options, NullLogger.Instance);
+            var context = GetActionExecutingContext();
+            context.ModelState.AddModelError("some-key", "some-error");
+
+            // Act
+            filter.OnActionExecuting(context);
+
+            // Assert
+            Assert.Same(expected, context.Result);
+        }
+
+        private static ActionExecutingContext GetActionExecutingContext()
+        {
+            return new ActionExecutingContext(
+                new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor()),
+                Array.Empty<IFilterMetadata>(),
+                new Dictionary<string, object>(),
+                new object());
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/MvcRouteHandlerTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/MvcRouteHandlerTests.cs
new file mode 100644
index 0000000000..0efa991841
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/MvcRouteHandlerTests.cs
@@ -0,0 +1,131 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Logging.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    public class MvcRouteHandlerTests
+    {
+        [Fact]
+        public async Task RouteAsync_FailOnNoAction_LogsCorrectValues()
+        {
+            // Arrange
+            var sink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
+
+            var mockActionSelector = new Mock<IActionSelector>();
+            mockActionSelector
+                .Setup(a => a.SelectCandidates(It.IsAny<RouteContext>()))
+                .Returns(new ActionDescriptor[0]);
+
+            var context = CreateRouteContext();
+            context.RouteData.Values.Add("controller", "Home");
+            context.RouteData.Values.Add("action", "Index");
+
+            var handler = CreateMvcRouteHandler(
+                actionSelector: mockActionSelector.Object,
+                loggerFactory: loggerFactory);
+
+            var expectedMessage = "No actions matched the current request. Route values: controller=Home, action=Index";
+
+            // Act
+            await handler.RouteAsync(context);
+
+            // Assert
+            Assert.Empty(sink.Scopes);
+            var write = Assert.Single(sink.Writes);
+            Assert.Equal(expectedMessage, write.State?.ToString());
+        }
+
+        private MvcRouteHandler CreateMvcRouteHandler(
+            ActionDescriptor actionDescriptor = null,
+            IActionSelector actionSelector = null,
+            IActionInvokerFactory invokerFactory = null,
+            ILoggerFactory loggerFactory = null,
+            object diagnosticListener = null)
+        {
+            var actionContextAccessor = new ActionContextAccessor();
+
+            if (actionDescriptor == null)
+            {
+                var mockAction = new Mock<ActionDescriptor>();
+                actionDescriptor = mockAction.Object;
+            }
+
+            if (actionSelector == null)
+            {
+                var mockActionSelector = new Mock<IActionSelector>();
+                mockActionSelector
+                    .Setup(a => a.SelectCandidates(It.IsAny<RouteContext>()))
+                    .Returns(new ActionDescriptor[] { actionDescriptor });
+
+                mockActionSelector
+                    .Setup(a => a.SelectBestCandidate(It.IsAny<RouteContext>(), It.IsAny<IReadOnlyList<ActionDescriptor>>()))
+                    .Returns(actionDescriptor);
+                actionSelector = mockActionSelector.Object;
+            }
+
+            if (loggerFactory == null)
+            {
+                loggerFactory = NullLoggerFactory.Instance;
+            }
+
+            var diagnosticSource = new DiagnosticListener("Microsoft.AspNetCore");
+            if (diagnosticListener != null)
+            {
+                diagnosticSource.SubscribeWithAdapter(diagnosticListener);
+            }
+
+            if (invokerFactory == null)
+            {
+                var mockInvoker = new Mock<IActionInvoker>();
+                mockInvoker.Setup(i => i.InvokeAsync())
+                    .Returns(Task.FromResult(true));
+
+                var mockInvokerFactory = new Mock<IActionInvokerFactory>();
+                mockInvokerFactory.Setup(f => f.CreateInvoker(It.IsAny<ActionContext>()))
+                    .Returns(mockInvoker.Object);
+
+                invokerFactory = mockInvokerFactory.Object;
+            }
+
+            return new MvcRouteHandler(
+                invokerFactory,
+                actionSelector,
+                diagnosticSource,
+                loggerFactory,
+                actionContextAccessor);
+        }
+
+        private RouteContext CreateRouteContext()
+        {
+            var routingFeature = new RoutingFeature();
+
+            var httpContext = new Mock<HttpContext>();
+            httpContext
+                .Setup(h => h.Features[typeof(IRoutingFeature)])
+                .Returns(routingFeature);
+
+            var routeContext = new RouteContext(httpContext.Object);
+            routingFeature.RouteData = routeContext.RouteData;
+            return routeContext;
+        }
+
+        private class RoutingFeature : IRoutingFeature
+        {
+            public RouteData RouteData { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ObjectResultExecutorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ObjectResultExecutorTest.cs
new file mode 100644
index 0000000000..2cf6981202
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ObjectResultExecutorTest.cs
@@ -0,0 +1,374 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+using Microsoft.Net.Http.Headers;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    public class ObjectResultExecutorTest
+    {
+        // For this test case probably the most common use case is when there is a format mapping based
+        // content type selected but the developer had set the content type on the Response.ContentType
+        [Fact]
+        public async Task ExecuteAsync_ContentTypeProvidedFromResponseAndObjectResult_UsesResponseContentType()
+        {
+            // Arrange
+            var executor = CreateExecutor();
+
+            var httpContext = new DefaultHttpContext();
+            var actionContext = new ActionContext() { HttpContext = httpContext };
+            httpContext.Request.Headers[HeaderNames.Accept] = "application/xml"; // This will not be used
+            httpContext.Response.ContentType = "text/plain";
+
+            var result = new ObjectResult("input");
+            result.Formatters.Add(new TestXmlOutputFormatter());
+            result.Formatters.Add(new TestJsonOutputFormatter());
+            result.Formatters.Add(new TestStringOutputFormatter()); // This will be chosen based on the content type
+
+            // Act
+            await executor.ExecuteAsync(actionContext, result);
+
+            // Assert
+            MediaTypeAssert.Equal("text/plain; charset=utf-8", httpContext.Response.ContentType);
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_WithOneProvidedContentType_FromResponseContentType_IgnoresAcceptHeader()
+        {
+            // Arrange
+            var executor = CreateExecutor();
+
+            var httpContext = new DefaultHttpContext();
+            var actionContext = new ActionContext() { HttpContext = httpContext };
+            httpContext.Request.Headers[HeaderNames.Accept] = "application/xml"; // This will not be used
+            httpContext.Response.ContentType = "application/json";
+
+            var result = new ObjectResult("input");
+            result.Formatters.Add(new TestXmlOutputFormatter());
+            result.Formatters.Add(new TestJsonOutputFormatter()); // This will be chosen based on the content type
+
+            // Act
+            await executor.ExecuteAsync(actionContext, result);
+
+            // Assert
+            Assert.Equal("application/json; charset=utf-8", httpContext.Response.ContentType);
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_WithOneProvidedContentType_FromResponseContentType_NoFallback()
+        {
+            // Arrange
+            var executor = CreateExecutor();
+
+            var httpContext = new DefaultHttpContext();
+            var actionContext = new ActionContext() { HttpContext = httpContext };
+            httpContext.Request.Headers[HeaderNames.Accept] = "application/xml"; // This will not be used
+            httpContext.Response.ContentType = "application/json";
+
+            var result = new ObjectResult("input");
+            result.Formatters.Add(new TestXmlOutputFormatter());
+
+            // Act
+            await executor.ExecuteAsync(actionContext, result);
+
+            // Assert
+            Assert.Equal(406, httpContext.Response.StatusCode);
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_NoFormatterFound_Returns406()
+        {
+            // Arrange
+            var executor = CreateExecutor();
+
+            var actionContext = new ActionContext()
+            {
+                HttpContext = new DefaultHttpContext(),
+            };
+
+            var result = new ObjectResult("input");
+
+            // This formatter won't write anything
+            result.Formatters = new FormatterCollection<IOutputFormatter>
+            {
+                new CannotWriteFormatter(),
+            };
+
+            // Act
+            await executor.ExecuteAsync(actionContext, result);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status406NotAcceptable, actionContext.HttpContext.Response.StatusCode);
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_FallsBackOnFormattersInOptions()
+        {
+            // Arrange
+            var options = Options.Create(new MvcOptions());
+            options.Value.OutputFormatters.Add(new TestJsonOutputFormatter());
+
+            var executor = CreateExecutor(options: options);
+
+            var actionContext = new ActionContext()
+            {
+                HttpContext = GetHttpContext(),
+            };
+
+            var result = new ObjectResult("someValue");
+
+            // Act
+            await executor.ExecuteAsync(actionContext, result);
+
+            // Assert
+            Assert.Equal(
+                "application/json; charset=utf-8",
+                actionContext.HttpContext.Response.Headers[HeaderNames.ContentType]);
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_ThrowsWithNoFormatters()
+        {
+            // Arrange
+            var expected = $"'{typeof(MvcOptions).FullName}.{nameof(MvcOptions.OutputFormatters)}' must not be " +
+                $"empty. At least one '{typeof(IOutputFormatter).FullName}' is required to format a response.";
+            var executor = CreateExecutor();
+            var actionContext = new ActionContext
+            {
+                HttpContext = GetHttpContext(),
+            };
+            var result = new ObjectResult("some value");
+
+            // Act & Assert
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => executor.ExecuteAsync(actionContext, result));
+            Assert.Equal(expected, exception.Message);
+        }
+
+        [Theory]
+        [InlineData(new[] { "application/*" }, "application/*")]
+        [InlineData(new[] { "application/xml", "application/*", "application/json" }, "application/*")]
+        [InlineData(new[] { "application/*", "application/json" }, "application/*")]
+        [InlineData(new[] { "*/*" }, "*/*")]
+        [InlineData(new[] { "application/xml", "*/*", "application/json" }, "*/*")]
+        [InlineData(new[] { "*/*", "application/json" }, "*/*")]
+        [InlineData(new[] { "application/json", "application/*+json" }, "application/*+json")]
+        [InlineData(new[] { "application/entiy+json;*", "application/json" }, "application/entiy+json;*")]
+        public async Task ExecuteAsync_MatchAllContentType_Throws(string[] contentTypes, string invalidContentType)
+        {
+            // Arrange
+            var result = new ObjectResult("input");
+
+            var mediaTypes = new MediaTypeCollection();
+            foreach (var contentType in contentTypes)
+            {
+                mediaTypes.Add(contentType);
+            }
+
+            result.ContentTypes = mediaTypes;
+
+            var executor = CreateExecutor();
+
+            var actionContext = new ActionContext() { HttpContext = new DefaultHttpContext() };
+
+            // Act & Assert
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => executor.ExecuteAsync(actionContext, result));
+
+            var expectedMessage = string.Format("The content-type '{0}' added in the 'ContentTypes' property is " +
+              "invalid. Media types which match all types or match all subtypes are not supported.",
+              invalidContentType);
+            Assert.Equal(expectedMessage, exception.Message);
+        }
+
+        [Theory]
+        // Chrome & Opera
+        [InlineData("text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8", "application/json; charset=utf-8")]
+        // IE
+        [InlineData("text/html,application/xhtml+xml,*/*", "application/json; charset=utf-8")]
+        // Firefox & Safari
+        [InlineData("text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", "application/json; charset=utf-8")]
+        // Misc
+        [InlineData("*/*", @"application/json; charset=utf-8")]
+        [InlineData("text/html,*/*;q=0.8,application/xml;q=0.9", "application/json; charset=utf-8")]
+        public async Task ExecuteAsync_SelectDefaultFormatter_OnAllMediaRangeAcceptHeaderMediaType(
+            string acceptHeader,
+            string expectedContentType)
+        {
+            // Arrange
+            var options = Options.Create(new MvcOptions());
+            options.Value.RespectBrowserAcceptHeader = false;
+
+            var executor = CreateExecutor(options: options);
+
+            var result = new ObjectResult("input");
+            result.Formatters.Add(new TestJsonOutputFormatter());
+            result.Formatters.Add(new TestXmlOutputFormatter());
+
+            var actionContext = new ActionContext()
+            {
+                HttpContext = GetHttpContext(),
+            };
+            actionContext.HttpContext.Request.Headers[HeaderNames.Accept] = acceptHeader;
+
+            // Act
+            await executor.ExecuteAsync(actionContext, result);
+
+            // Assert
+            Assert.Equal(expectedContentType, actionContext.HttpContext.Response.Headers[HeaderNames.ContentType]);
+        }
+
+        [Theory]
+        // Chrome & Opera
+        [InlineData("text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8", "application/xml; charset=utf-8")]
+        // IE
+        [InlineData("text/html,application/xhtml+xml,*/*", "application/json; charset=utf-8")]
+        // Firefox & Safari
+        [InlineData("text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", "application/xml; charset=utf-8")]
+        // Misc
+        [InlineData("*/*", @"application/json; charset=utf-8")]
+        [InlineData("text/html,*/*;q=0.8,application/xml;q=0.9", "application/xml; charset=utf-8")]
+        public async Task ObjectResult_PerformsContentNegotiation_OnAllMediaRangeAcceptHeaderMediaType(
+            string acceptHeader,
+            string expectedContentType)
+        {
+            // Arrange
+            var options = Options.Create(new MvcOptions());
+            options.Value.RespectBrowserAcceptHeader = true;
+
+            var executor = CreateExecutor(options: options);
+
+            var result = new ObjectResult("input");
+            result.Formatters.Add(new TestJsonOutputFormatter());
+            result.Formatters.Add(new TestXmlOutputFormatter());
+
+            var actionContext = new ActionContext()
+            {
+                HttpContext = GetHttpContext(),
+            };
+            actionContext.HttpContext.Request.Headers[HeaderNames.Accept] = acceptHeader;
+
+            // Act
+            await executor.ExecuteAsync(actionContext, result);
+
+            // Assert
+            var responseContentType = actionContext.HttpContext.Response.Headers[HeaderNames.ContentType];
+            MediaTypeAssert.Equal(expectedContentType, responseContentType);
+        }
+
+        private static IServiceCollection CreateServices()
+        {
+            var services = new ServiceCollection();
+
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+
+            return services;
+        }
+
+        private static HttpContext GetHttpContext()
+        {
+            var services = CreateServices();
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = services.BuildServiceProvider();
+
+            return httpContext;
+        }
+
+        private static ObjectResultExecutor CreateExecutor(IOptions<MvcOptions> options = null)
+        {
+            var selector = new DefaultOutputFormatterSelector(options ?? Options.Create<MvcOptions>(new MvcOptions()), NullLoggerFactory.Instance);
+            return new ObjectResultExecutor(selector, new TestHttpResponseStreamWriterFactory(), NullLoggerFactory.Instance);
+        }
+
+        private class CannotWriteFormatter : IOutputFormatter
+        {
+            public virtual bool CanWriteResult(OutputFormatterCanWriteContext context)
+            {
+                return false;
+            }
+
+            public virtual Task WriteAsync(OutputFormatterWriteContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class TestJsonOutputFormatter : TextOutputFormatter
+        {
+            public TestJsonOutputFormatter()
+            {
+                SupportedMediaTypes.Add(new MediaTypeHeaderValue("application/json"));
+                SupportedMediaTypes.Add(new MediaTypeHeaderValue("text/json"));
+
+                SupportedEncodings.Add(Encoding.UTF8);
+            }
+
+            public override Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
+            {
+                return Task.FromResult(0);
+            }
+        }
+
+        private class TestXmlOutputFormatter : TextOutputFormatter
+        {
+            public TestXmlOutputFormatter()
+            {
+                SupportedMediaTypes.Add(new MediaTypeHeaderValue("application/xml"));
+                SupportedMediaTypes.Add(new MediaTypeHeaderValue("text/xml"));
+
+                SupportedEncodings.Add(Encoding.UTF8);
+            }
+
+            public override Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
+            {
+                return Task.FromResult(0);
+            }
+        }
+
+        private class TestStringOutputFormatter : TextOutputFormatter
+        {
+            public TestStringOutputFormatter()
+            {
+                SupportedMediaTypes.Add(new MediaTypeHeaderValue("text/plain"));
+
+                SupportedEncodings.Add(Encoding.UTF8);
+            }
+
+            public override Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
+            {
+                return Task.FromResult(0);
+            }
+        }
+
+        private class ServerContentTypeOnlyFormatter : OutputFormatter
+        {
+            public override bool CanWriteResult(OutputFormatterCanWriteContext context)
+            {
+                // This test formatter matches if and only if the content type is specified
+                // as "server defined". This lets tests identify what value the ObjectResultExecutor
+                // passed for that flag.
+                return context.ContentTypeIsServerDefined;
+            }
+
+            public override Task WriteResponseBodyAsync(OutputFormatterWriteContext context)
+            {
+                return Task.FromResult(0);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AcceptHeaderParserTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AcceptHeaderParserTest.cs
new file mode 100644
index 0000000000..9953e32ec2
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AcceptHeaderParserTest.cs
@@ -0,0 +1,240 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Internal
+{
+    public class AcceptHeaderParserTest
+    {
+        [Fact]
+        public void ParseAcceptHeader_ParsesSimpleHeader()
+        {
+            // Arrange
+            var header = "application/json";
+            var expected = new List<MediaTypeSegmentWithQuality>
+            {
+                new MediaTypeSegmentWithQuality(new StringSegment("application/json"),1.0)
+            };
+
+            // Act
+            var parsed = AcceptHeaderParser.ParseAcceptHeader(new List<string> { header });
+
+            // Assert
+            Assert.Equal(expected, parsed);
+        }
+
+        [Fact]
+        public void ParseAcceptHeader_ParsesSimpleHeaderWithMultipleValues()
+        {
+            // Arrange
+            var header = "application/json, application/xml;q=0.8";
+            var expected = new List<MediaTypeSegmentWithQuality>
+            {
+                new MediaTypeSegmentWithQuality(new StringSegment("application/json"),1.0),
+                new MediaTypeSegmentWithQuality(new StringSegment("application/xml;q=0.8"),0.8)
+            };
+
+            // Act
+            var parsed = AcceptHeaderParser.ParseAcceptHeader(new List<string> { header });
+
+            // Assert
+            Assert.Equal(expected, parsed);
+            foreach (var mediaType in parsed)
+            {
+                Assert.Same(header, mediaType.MediaType.Buffer);
+            }
+        }
+
+        [Fact]
+        public void ParseAcceptHeader_ParsesSimpleHeaderWithMultipleValues_InvalidFormat()
+        {
+            // Arrange
+            var header = "application/json, application/xml,;q=0.8";
+            var expectedMediaTypes = new List<MediaTypeSegmentWithQuality>
+            {
+                new MediaTypeSegmentWithQuality(new StringSegment("application/json"),1.0),
+                new MediaTypeSegmentWithQuality(new StringSegment("application/xml"),1.0),
+            };
+
+            // Act
+            var mediaTypes = AcceptHeaderParser.ParseAcceptHeader(new List<string> { header });
+
+            // Assert
+            Assert.Equal(expectedMediaTypes, mediaTypes);
+        }
+
+        public static TheoryData<string[], string[]> ParseAcceptHeaderWithInvalidMediaTypesData =>
+            new TheoryData<string[], string[]>
+            {
+                { new [] { ";q=0.9" }, new string[] { } },
+                { new [] { "/" }, new string[] { } },
+                { new [] { "*/" }, new string[] { } },
+                { new [] { "/*" }, new string[] { } },
+                { new [] { "/;q=0.9" }, new string[] { } },
+                { new [] { "*/;q=0.9" }, new string[] { } },
+                { new [] { "/*;q=0.9" }, new string[] { } },
+                { new [] { "/;q=0.9,text/html" }, new string[] { "text/html" } },
+                { new [] { "*/;q=0.9,text/html" }, new string[] { "text/html" } },
+                { new [] { "/*;q=0.9,text/html" }, new string[] { "text/html" } },
+                { new [] { "img/png,/;q=0.9,text/html" }, new string[] { "img/png", "text/html" } },
+                { new [] { "img/png,*/;q=0.9,text/html" }, new string[] { "img/png", "text/html" } },
+                { new [] { "img/png,/*;q=0.9,text/html" }, new string[] { "img/png", "text/html" } },
+                { new [] { "img/png, /;q=0.9" }, new string[] { "img/png", } },
+                { new [] { "img/png, */;q=0.9" }, new string[] { "img/png", } },
+                { new [] { "img/png;q=1.0, /*;q=0.9" }, new string[] { "img/png;q=1.0", } },
+            };
+
+        [Theory]
+        [MemberData(nameof(ParseAcceptHeaderWithInvalidMediaTypesData))]
+        public void ParseAcceptHeader_GracefullyRecoversFromInvalidMediaTypeValues_AndReturnsValidMediaTypes(
+            string[] acceptHeader,
+            string[] expected)
+        {
+            // Arrange
+            var expectedMediaTypes = expected.Select(e => new MediaTypeSegmentWithQuality(new StringSegment(e), 1.0)).ToList();
+
+            // Act
+            var parsed = AcceptHeaderParser.ParseAcceptHeader(acceptHeader);
+
+            // Assert
+            Assert.Equal(expectedMediaTypes, parsed);
+        }
+
+        [Fact]
+        public void ParseAcceptHeader_ParsesMultipleHeaderValues()
+        {
+            // Arrange
+            var expected = new List<MediaTypeSegmentWithQuality>
+            {
+                new MediaTypeSegmentWithQuality(new StringSegment("application/json"), 1.0),
+                new MediaTypeSegmentWithQuality(new StringSegment("application/xml;q=0.8"), 0.8)
+            };
+
+            // Act
+            var parsed = AcceptHeaderParser.ParseAcceptHeader(
+                new List<string> { "application/json", "", "application/xml;q=0.8" });
+
+            // Assert
+            Assert.Equal(expected, parsed);
+        }
+
+        // The text "*/*Content-Type" parses as a valid media type value. However it's followed
+        // by ':' instead of whitespace or a delimiter, which means that it's actually invalid.
+        [Fact]
+        public void ParseAcceptHeader_ValidMediaType_FollowedByNondelimiter()
+        {
+            // Arrange
+            var expected = new MediaTypeSegmentWithQuality[0];
+
+            var input = "*/*Content-Type:application/json";
+
+            // Act
+            var parsed = AcceptHeaderParser.ParseAcceptHeader(new List<string>() { input });
+
+            // Assert
+            Assert.Equal(expected, parsed);
+        }
+
+        [Fact]
+        public void ParseAcceptHeader_ValidMediaType_FollowedBySemicolon()
+        {
+            // Arrange
+            var expected = new MediaTypeSegmentWithQuality[0];
+
+            var input = "*/*Content-Type;application/json";
+
+            // Act
+            var parsed = AcceptHeaderParser.ParseAcceptHeader(new List<string>() { input });
+
+            // Assert
+            Assert.Equal(expected, parsed);
+        }
+
+        [Fact]
+        public void ParseAcceptHeader_ValidMediaType_FollowedByComma()
+        {
+            // Arrange
+            var expected = new MediaTypeSegmentWithQuality[]
+            {
+                new MediaTypeSegmentWithQuality(new StringSegment("*/*Content-Type"), 1.0),
+                new MediaTypeSegmentWithQuality(new StringSegment("application/json"), 1.0),
+            };
+
+            var input = "*/*Content-Type,application/json";
+
+            // Act
+            var parsed = AcceptHeaderParser.ParseAcceptHeader(new List<string>() { input });
+
+            // Assert
+            Assert.Equal(expected, parsed);
+        }
+
+        [Fact]
+        public void ParseAcceptHeader_ValidMediaType_FollowedByWhitespace()
+        {
+            // Arrange
+            var expected = new MediaTypeSegmentWithQuality[]
+            {
+                new MediaTypeSegmentWithQuality(new StringSegment("application/json"), 1.0),
+            };
+
+            var input = "*/*Content-Type application/json";
+
+            // Act
+            var parsed = AcceptHeaderParser.ParseAcceptHeader(new List<string>() { input });
+
+            // Assert
+            Assert.Equal(expected, parsed);
+        }
+
+        [Fact]
+        public void ParseAcceptHeader_InvalidTokenAtStart()
+        {
+            // Arrange
+            var expected = new MediaTypeSegmentWithQuality[0];
+
+            var input = ":;:";
+
+            // Act
+            var parsed = AcceptHeaderParser.ParseAcceptHeader(new List<string>() { input });
+
+            // Assert
+            Assert.Equal(expected, parsed);
+        }
+
+        [Fact]
+        public void ParseAcceptHeader_DelimiterAtStart()
+        {
+            // Arrange
+            var expected = new MediaTypeSegmentWithQuality[0];
+
+            var input = ",;:";
+
+            // Act
+            var parsed = AcceptHeaderParser.ParseAcceptHeader(new List<string>() { input });
+
+            // Assert
+            Assert.Equal(expected, parsed);
+        }
+
+        [Fact]
+        public void ParseAcceptHeader_InvalidTokenAtEnd()
+        {
+            // Arrange
+            var expected = new MediaTypeSegmentWithQuality[0];
+
+            var input = "*/*:";
+
+            // Act
+            var parsed = AcceptHeaderParser.ParseAcceptHeader(new List<string>() { input });
+
+            // Assert
+            Assert.Equal(expected, parsed);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionConstraintCacheTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionConstraintCacheTest.cs
new file mode 100644
index 0000000000..0187f81666
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionConstraintCacheTest.cs
@@ -0,0 +1,168 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ActionConstraintCacheTest
+    {
+        [Fact]
+        public void GetActionConstraints_CachesAllActionConstraints()
+        {
+            // Arrange
+            var services = CreateServices();
+            var cache = CreateCache(new DefaultActionConstraintProvider());
+
+            var action = new ControllerActionDescriptor()
+            {
+                ActionConstraints = new[]
+                {
+                    new TestActionConstraint(),
+                    new TestActionConstraint()
+                },
+            };
+            var context = new DefaultHttpContext();
+
+            // Act - 1
+            var actionConstraints1 = cache.GetActionConstraints(context, action);
+
+            // Assert - 1
+            Assert.Collection(
+                actionConstraints1,
+                a => Assert.Same(action.ActionConstraints[0], a), // Copied by provider
+                a => Assert.Same(action.ActionConstraints[1], a)); // Copied by provider
+
+            // Act - 2
+            var actionConstraints2 = cache.GetActionConstraints(context, action);
+
+            Assert.Same(actionConstraints1, actionConstraints2);
+
+            Assert.Collection(
+                actionConstraints2,
+                a => Assert.Same(actionConstraints1[0], a), // Cached
+                a => Assert.Same(actionConstraints1[1], a)); // Cached
+        }
+
+        [Fact]
+        public void GetActionConstraints_CachesActionConstraintFromFactory()
+        {
+            // Arrange
+            var services = CreateServices();
+            var cache = CreateCache(new DefaultActionConstraintProvider());
+
+            var action = new ControllerActionDescriptor()
+            {
+                ActionConstraints = new[]
+                {
+                    new TestActionConstraintFactory() { IsReusable = true },
+                    new TestActionConstraint() as IActionConstraintMetadata
+                },
+            };
+            var context = new DefaultHttpContext();
+
+            // Act - 1
+            var actionConstraints1 = cache.GetActionConstraints(context, action);
+
+            // Assert - 1
+            Assert.Collection(
+                actionConstraints1,
+                a => Assert.NotSame(action.ActionConstraints[0], a), // Created by factory
+                a => Assert.Same(action.ActionConstraints[1], a)); // Copied by provider
+
+            // Act - 2
+            var actionConstraints2 = cache.GetActionConstraints(context, action);
+
+            Assert.Same(actionConstraints1, actionConstraints2);
+
+            Assert.Collection(
+                actionConstraints2,
+                a => Assert.Same(actionConstraints1[0], a), // Cached
+                a => Assert.Same(actionConstraints1[1], a)); // Cached
+        }
+
+        [Fact]
+        public void GetActionConstraints_DoesNotCacheActionConstraintsWithIsReusableFalse()
+        {
+            // Arrange
+            var services = CreateServices();
+            var cache = CreateCache(new DefaultActionConstraintProvider());
+
+            var action = new ControllerActionDescriptor()
+            {
+                ActionConstraints = new[]
+                {
+                    new TestActionConstraintFactory() { IsReusable = false },
+                    new TestActionConstraint() as IActionConstraintMetadata
+                },
+            };
+            var context = new DefaultHttpContext();
+
+            // Act - 1
+            var actionConstraints1 = cache.GetActionConstraints(context, action);
+
+            // Assert - 1
+            Assert.Collection(
+                actionConstraints1,
+                a => Assert.NotSame(action.ActionConstraints[0], a), // Created by factory
+                a => Assert.Same(action.ActionConstraints[1], a)); // Copied by provider
+
+            // Act - 2
+            var actionConstraints2 = cache.GetActionConstraints(context, action);
+
+            Assert.NotSame(actionConstraints1, actionConstraints2);
+
+            Assert.Collection(
+                actionConstraints2,
+                a => Assert.NotSame(actionConstraints1[0], a), // Created by factory (again)
+                a => Assert.Same(actionConstraints1[1], a)); // Cached
+        }
+
+        private class TestActionConstraint : IActionConstraint
+        {
+            public int Order
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public bool Accept(ActionConstraintContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class TestActionConstraintFactory : IActionConstraintFactory
+        {
+            public bool IsReusable { get; set; }
+
+            public IActionConstraint CreateInstance(IServiceProvider serviceProvider)
+            {
+                return new TestActionConstraint();
+            }
+        }
+
+        private static IServiceProvider CreateServices()
+        {
+            return new ServiceCollection().BuildServiceProvider();
+        }
+
+        private static ActionConstraintCache CreateCache(params IActionConstraintProvider[] providers)
+        {
+            var descriptorProvider = new ActionDescriptorCollectionProvider(
+                Enumerable.Empty<IActionDescriptorProvider>(),
+                Enumerable.Empty<IActionDescriptorChangeProvider>());
+            return new ActionConstraintCache(descriptorProvider, providers);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionDescriptorCollectionProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionDescriptorCollectionProviderTest.cs
new file mode 100644
index 0000000000..0c599b47c6
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionDescriptorCollectionProviderTest.cs
@@ -0,0 +1,206 @@
+// 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.
+
+using System.Linq;
+using System.Threading;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.Extensions.Primitives;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ActionDescriptorCollectionProviderTest
+    {
+        [Fact]
+        public void ActionDescriptors_ReadsDescriptorsFromActionDescriptorProviders()
+        {
+            // Arrange
+            var expected1 = new ActionDescriptor();
+            var actionDescriptorProvider1 = GetActionDescriptorProvider(expected1);
+
+            var expected2 = new ActionDescriptor();
+            var expected3 = new ActionDescriptor();
+            var actionDescriptorProvider2 = GetActionDescriptorProvider(expected2, expected3);
+
+            var actionDescriptorCollectionProvider = new ActionDescriptorCollectionProvider(
+                new[] { actionDescriptorProvider1, actionDescriptorProvider2 },
+                Enumerable.Empty<IActionDescriptorChangeProvider>());
+
+            // Act
+            var collection = actionDescriptorCollectionProvider.ActionDescriptors;
+
+            // Assert
+            Assert.Equal(0, collection.Version);
+            Assert.Collection(
+                collection.Items,
+                descriptor => Assert.Same(expected1, descriptor),
+                descriptor => Assert.Same(expected2, descriptor),
+                descriptor => Assert.Same(expected3, descriptor));
+        }
+
+        [Fact]
+        public void ActionDescriptors_CachesValuesByDefault()
+        {
+            // Arrange
+            var actionDescriptorProvider = GetActionDescriptorProvider(new ActionDescriptor());
+
+            var actionDescriptorCollectionProvider = new ActionDescriptorCollectionProvider(
+                new[] { actionDescriptorProvider },
+                Enumerable.Empty<IActionDescriptorChangeProvider>());
+
+            // Act - 1
+            var collection1 = actionDescriptorCollectionProvider.ActionDescriptors;
+
+            // Assert - 1
+            Assert.Equal(0, collection1.Version);
+
+            // Act - 2
+            var collection2 = actionDescriptorCollectionProvider.ActionDescriptors;
+
+            // Assert - 2
+            Assert.Same(collection1, collection2);
+            Mock.Get(actionDescriptorProvider)
+                .Verify(v => v.OnProvidersExecuting(It.IsAny<ActionDescriptorProviderContext>()), Times.Once());
+        }
+
+        [Fact]
+        public void ActionDescriptors_UpdateWhenChangeTokenProviderChanges()
+        {
+            // Arrange
+            var actionDescriptorProvider = new Mock<IActionDescriptorProvider>();
+            var expected1 = new ActionDescriptor();
+            var expected2 = new ActionDescriptor();
+
+            var invocations = 0;
+            actionDescriptorProvider
+                .Setup(p => p.OnProvidersExecuting(It.IsAny<ActionDescriptorProviderContext>()))
+                .Callback((ActionDescriptorProviderContext context) =>
+                {
+                    if (invocations == 0)
+                    {
+                        context.Results.Add(expected1);
+                    }
+                    else
+                    {
+                        context.Results.Add(expected2);
+                    }
+
+                    invocations++;
+                });
+            var changeProvider = new TestChangeProvider();
+            var actionDescriptorCollectionProvider = new ActionDescriptorCollectionProvider(
+                new[] { actionDescriptorProvider.Object },
+                new[] { changeProvider });
+
+            // Act - 1
+            var collection1 = actionDescriptorCollectionProvider.ActionDescriptors;
+
+            // Assert - 1
+            Assert.Equal(0, collection1.Version);
+            Assert.Collection(collection1.Items,
+                item => Assert.Same(expected1, item));
+
+            // Act - 2
+            changeProvider.TokenSource.Cancel();
+            var collection2 = actionDescriptorCollectionProvider.ActionDescriptors;
+
+            // Assert - 2
+            Assert.NotSame(collection1, collection2);
+            Assert.Equal(1, collection2.Version);
+            Assert.Collection(collection2.Items,
+                item => Assert.Same(expected2, item));
+        }
+
+        [Fact]
+        public void ActionDescriptors_SubscribesToNewChangeNotificationsAfterInvalidating()
+        {
+            // Arrange
+            var actionDescriptorProvider = new Mock<IActionDescriptorProvider>();
+            var expected1 = new ActionDescriptor();
+            var expected2 = new ActionDescriptor();
+            var expected3 = new ActionDescriptor();
+
+            var invocations = 0;
+            actionDescriptorProvider
+                .Setup(p => p.OnProvidersExecuting(It.IsAny<ActionDescriptorProviderContext>()))
+                .Callback((ActionDescriptorProviderContext context) =>
+                {
+                    if (invocations == 0)
+                    {
+                        context.Results.Add(expected1);
+                    }
+                    else if (invocations == 1)
+                    {
+                        context.Results.Add(expected2);
+                    }
+                    else
+                    {
+                        context.Results.Add(expected3);
+                    }
+
+                    invocations++;
+                });
+            var changeProvider = new TestChangeProvider();
+            var actionDescriptorCollectionProvider = new ActionDescriptorCollectionProvider(
+                new[] { actionDescriptorProvider.Object },
+                new[] { changeProvider });
+
+            // Act - 1
+            var collection1 = actionDescriptorCollectionProvider.ActionDescriptors;
+
+            // Assert - 1
+            Assert.Equal(0, collection1.Version);
+            Assert.Collection(collection1.Items,
+                item => Assert.Same(expected1, item));
+
+            // Act - 2
+            changeProvider.TokenSource.Cancel();
+            var collection2 = actionDescriptorCollectionProvider.ActionDescriptors;
+
+            // Assert - 2
+            Assert.NotSame(collection1, collection2);
+            Assert.Equal(1, collection2.Version);
+            Assert.Collection(collection2.Items,
+                item => Assert.Same(expected2, item));
+
+            // Act - 3
+            changeProvider.TokenSource.Cancel();
+            var collection3 = actionDescriptorCollectionProvider.ActionDescriptors;
+
+            // Assert - 3
+            Assert.NotSame(collection2, collection3);
+            Assert.Equal(2, collection3.Version);
+            Assert.Collection(collection3.Items,
+                item => Assert.Same(expected3, item));
+        }
+
+        private static IActionDescriptorProvider GetActionDescriptorProvider(params ActionDescriptor[] values)
+        {
+            var actionDescriptorProvider = new Mock<IActionDescriptorProvider>();
+            actionDescriptorProvider
+                .Setup(p => p.OnProvidersExecuting(It.IsAny<ActionDescriptorProviderContext>()))
+                .Callback((ActionDescriptorProviderContext context) =>
+                {
+                    foreach (var value in values)
+                    {
+                        context.Results.Add(value);
+                    }
+                });
+
+            return actionDescriptorProvider.Object;
+        }
+
+        private class TestChangeProvider : IActionDescriptorChangeProvider
+        {
+            public CancellationTokenSource TokenSource { get; private set; }
+
+            public IChangeToken GetChangeToken()
+            {
+                TokenSource = new CancellationTokenSource();
+                return new CancellationChangeToken(TokenSource.Token);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionMethodExecutorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionMethodExecutorTest.cs
new file mode 100644
index 0000000000..6cd343dcd6
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionMethodExecutorTest.cs
@@ -0,0 +1,334 @@
+// 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.
+
+using System;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Internal;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Core.Internal
+{
+    public class ActionMethodExecutorTest
+    {
+        [Fact]
+        public void ActionMethodExecutor_ExecutesVoidActions()
+        {
+            // Arrange
+            var mapper = new ActionResultTypeMapper();
+            var controller = new TestController();
+            var objectMethodExecutor = GetExecutor(nameof(TestController.VoidAction));
+            var actionMethodExecutor = ActionMethodExecutor.GetExecutor(objectMethodExecutor);
+
+            // Act
+            var valueTask = actionMethodExecutor.Execute(mapper, objectMethodExecutor, controller, Array.Empty<object>());
+
+            // Assert
+            Assert.True(controller.Executed);
+            Assert.IsType<EmptyResult>(valueTask.Result);
+        }
+
+        [Fact]
+        public void ActionMethodExecutor_ExecutesActionsReturningIActionResult()
+        {
+            // Arrange
+            var mapper = new ActionResultTypeMapper();
+            var controller = new TestController();
+            var objectMethodExecutor = GetExecutor(nameof(TestController.ReturnIActionResult));
+            var actionMethodExecutor = ActionMethodExecutor.GetExecutor(objectMethodExecutor);
+
+            // Act
+            var valueTask = actionMethodExecutor.Execute(mapper, objectMethodExecutor, controller, Array.Empty<object>());
+
+            // Assert
+            Assert.True(valueTask.IsCompleted);
+            Assert.IsType<ContentResult>(valueTask.Result);
+        }
+
+        [Fact]
+        public void ActionMethodExecutor_ExecutesActionsReturningSubTypeOfActionResult()
+        {
+            // Arrange
+            var mapper = new ActionResultTypeMapper();
+            var controller = new TestController();
+            var objectMethodExecutor = GetExecutor(nameof(TestController.ReturnsIActionResultSubType));
+            var actionMethodExecutor = ActionMethodExecutor.GetExecutor(objectMethodExecutor);
+
+            // Act
+            var valueTask = actionMethodExecutor.Execute(mapper, objectMethodExecutor, controller, Array.Empty<object>());
+
+            // Assert
+            Assert.IsType<PartialViewResult>(valueTask.Result);
+        }
+
+        [Fact]
+        public void ActionMethodExecutor_ExecutesActionsReturningActionResultOfT()
+        {
+            // Arrange
+            var mapper = new ActionResultTypeMapper();
+            var controller = new TestController();
+            var objectMethodExecutor = GetExecutor(nameof(TestController.ReturnsActionResultOfT));
+            var actionMethodExecutor = ActionMethodExecutor.GetExecutor(objectMethodExecutor);
+
+            // Act
+            var valueTask = actionMethodExecutor.Execute(mapper, objectMethodExecutor, controller, Array.Empty<object>());
+
+            // Assert
+            var result = Assert.IsType<ObjectResult>(valueTask.Result);
+            Assert.NotNull(result.Value);
+            Assert.IsType<TestModel>(result.Value);
+            Assert.Equal(typeof(TestModel), result.DeclaredType);
+        }
+
+        [Fact]
+        public void ActionMethodExecutor_ExecutesActionsReturningModelAsModel()
+        {
+            // Arrange
+            var mapper = new ActionResultTypeMapper();
+            var controller = new TestController();
+            var objectMethodExecutor = GetExecutor(nameof(TestController.ReturnsModelAsModel));
+            var actionMethodExecutor = ActionMethodExecutor.GetExecutor(objectMethodExecutor);
+
+            // Act
+            var valueTask = actionMethodExecutor.Execute(mapper, objectMethodExecutor, controller, Array.Empty<object>());
+
+            // Assert
+            var result = Assert.IsType<ObjectResult>(valueTask.Result);
+            Assert.NotNull(result.Value);
+            Assert.IsType<TestModel>(result.Value);
+            Assert.Equal(typeof(TestModel), result.DeclaredType);
+        }
+
+        [Fact]
+        public void ActionMethodExecutor_ExecutesActionsReturningModelAsObject()
+        {
+            // Arrange
+            var mapper = new ActionResultTypeMapper();
+            var controller = new TestController();
+            var objectMethodExecutor = GetExecutor(nameof(TestController.ReturnModelAsObject));
+            var actionMethodExecutor = ActionMethodExecutor.GetExecutor(objectMethodExecutor);
+
+            // Act
+            var valueTask = actionMethodExecutor.Execute(mapper, objectMethodExecutor, controller, Array.Empty<object>());
+
+            // Assert
+            var result = Assert.IsType<ObjectResult>(valueTask.Result);
+            Assert.NotNull(result.Value);
+            Assert.IsType<TestModel>(result.Value);
+            Assert.Equal(typeof(object), result.DeclaredType);
+        }
+
+        [Fact]
+        public void ActionMethodExecutor_ExecutesActionsReturningActionResultAsObject()
+        {
+            // Arrange
+            var mapper = new ActionResultTypeMapper();
+            var controller = new TestController();
+            var objectMethodExecutor = GetExecutor(nameof(TestController.ReturnsIActionResultSubType));
+            var actionMethodExecutor = ActionMethodExecutor.GetExecutor(objectMethodExecutor);
+
+            // Act
+            var valueTask = actionMethodExecutor.Execute(mapper, objectMethodExecutor, controller, Array.Empty<object>());
+
+            // Assert
+            Assert.IsType<PartialViewResult>(valueTask.Result);
+        }
+
+        [Fact]
+        public void ActionMethodExecutor_ExecutesActionsReturnTask()
+        {
+            // Arrange
+            var mapper = new ActionResultTypeMapper();
+            var controller = new TestController();
+            var objectMethodExecutor = GetExecutor(nameof(TestController.ReturnsTask));
+            var actionMethodExecutor = ActionMethodExecutor.GetExecutor(objectMethodExecutor);
+
+            // Act
+            var valueTask = actionMethodExecutor.Execute(mapper, objectMethodExecutor, controller, Array.Empty<object>());
+
+            // Assert
+            Assert.True(controller.Executed);
+            Assert.IsType<EmptyResult>(valueTask.Result);
+        }
+
+        [Fact]
+        public void ActionMethodExecutorExecutesActionsAsynchronouslyReturningIActionResult()
+        {
+            // Arrange
+            var mapper = new ActionResultTypeMapper();
+            var controller = new TestController();
+            var objectMethodExecutor = GetExecutor(nameof(TestController.ReturnIActionResultAsync));
+            var actionMethodExecutor = ActionMethodExecutor.GetExecutor(objectMethodExecutor);
+
+            // Act
+            var valueTask = actionMethodExecutor.Execute(mapper, objectMethodExecutor, controller, Array.Empty<object>());
+
+            // Assert
+            Assert.IsType<ViewResult>(valueTask.Result);
+        }
+
+        [Fact]
+        public async Task ActionMethodExecutor_ExecutesActionsAsynchronouslyReturningActionResultSubType()
+        {
+            // Arrange
+            var mapper = new ActionResultTypeMapper();
+            var controller = new TestController();
+            var objectMethodExecutor = GetExecutor(nameof(TestController.ReturnIActionResultAsync));
+            var actionMethodExecutor = ActionMethodExecutor.GetExecutor(objectMethodExecutor);
+
+            // Act
+            var valueTask = actionMethodExecutor.Execute(mapper, objectMethodExecutor, controller, Array.Empty<object>());
+
+            // Assert
+            await valueTask;
+            Assert.IsType<ViewResult>(valueTask.Result);
+        }
+
+        [Fact]
+        public void ActionMethodExecutor_ExecutesActionsAsynchronouslyReturningModel()
+        {
+            // Arrange
+            var mapper = new ActionResultTypeMapper();
+            var controller = new TestController();
+            var objectMethodExecutor = GetExecutor(nameof(TestController.ReturnsModelAsModelAsync));
+            var actionMethodExecutor = ActionMethodExecutor.GetExecutor(objectMethodExecutor);
+
+            // Act
+            var valueTask = actionMethodExecutor.Execute(mapper, objectMethodExecutor, controller, Array.Empty<object>());
+
+            // Assert
+            var result = Assert.IsType<ObjectResult>(valueTask.Result);
+            Assert.NotNull(result.Value);
+            Assert.IsType<TestModel>(result.Value);
+            Assert.Equal(typeof(TestModel), result.DeclaredType);
+        }
+
+        [Fact]
+        public void ActionMethodExecutor_ExecutesActionsAsynchronouslyReturningModelAsObject()
+        {
+            // Arrange
+            var mapper = new ActionResultTypeMapper();
+            var controller = new TestController();
+            var objectMethodExecutor = GetExecutor(nameof(TestController.ReturnsModelAsObjectAsync));
+            var actionMethodExecutor = ActionMethodExecutor.GetExecutor(objectMethodExecutor);
+
+            // Act
+            var valueTask = actionMethodExecutor.Execute(mapper, objectMethodExecutor, controller, Array.Empty<object>());
+
+            // Assert
+            var result = Assert.IsType<ObjectResult>(valueTask.Result);
+            Assert.NotNull(result.Value);
+            Assert.IsType<TestModel>(result.Value);
+            Assert.Equal(typeof(object), result.DeclaredType);
+        }
+
+        [Fact]
+        public void ActionMethodExecutor_ExecutesActionsAsynchronouslyReturningIActionResultAsObject()
+        {
+            // Arrange
+            var mapper = new ActionResultTypeMapper();
+            var controller = new TestController();
+            var objectMethodExecutor = GetExecutor(nameof(TestController.ReturnIActionResultAsObjectAsync));
+            var actionMethodExecutor = ActionMethodExecutor.GetExecutor(objectMethodExecutor);
+
+            // Act
+            var valueTask = actionMethodExecutor.Execute(mapper, objectMethodExecutor, controller, Array.Empty<object>());
+
+            // Assert
+            Assert.IsType<OkResult>(valueTask.Result);
+        }
+
+        [Fact]
+        public void ActionMethodExecutor_ExecutesActionsAsynchronouslyReturningActionResultOfT()
+        {
+            // Arrange
+            var mapper = new ActionResultTypeMapper();
+            var controller = new TestController();
+            var objectMethodExecutor = GetExecutor(nameof(TestController.ReturnActionResultOFTAsync));
+            var actionMethodExecutor = ActionMethodExecutor.GetExecutor(objectMethodExecutor);
+
+            // Act
+            var valueTask = actionMethodExecutor.Execute(mapper, objectMethodExecutor, controller, Array.Empty<object>());
+
+            // Assert
+            var result = Assert.IsType<ObjectResult>(valueTask.Result);
+            Assert.NotNull(result.Value);
+            Assert.IsType<TestModel>(result.Value);
+            Assert.Equal(typeof(TestModel), result.DeclaredType);
+        }
+
+        [Fact]
+        public void ActionMethodExecutor_ThrowsIfIConvertFromIActionResult_ReturnsNull()
+        {
+            // Arrange
+            var mapper = new ActionResultTypeMapper();
+            var controller = new TestController();
+            var objectMethodExecutor = GetExecutor(nameof(TestController.ReturnsCustomConvertibleFromIActionResult));
+            var actionMethodExecutor = ActionMethodExecutor.GetExecutor(objectMethodExecutor);
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(
+                () => actionMethodExecutor.Execute(mapper, objectMethodExecutor, controller, Array.Empty<object>()));
+
+            Assert.Equal($"Cannot return null from an action method with a return type of '{typeof(CustomConvertibleFromAction)}'.", ex.Message);
+        }
+
+        private static ObjectMethodExecutor GetExecutor(string methodName)
+        {
+            var type = typeof(TestController);
+            var methodInfo = type.GetMethod(methodName, BindingFlags.Public | BindingFlags.Instance);
+            Assert.NotNull(methodInfo);
+            return ObjectMethodExecutor.Create(methodInfo, type.GetTypeInfo());
+        }
+
+        private class TestController
+        {
+            public bool Executed { get; set; }
+
+            public void VoidAction() => Executed = true;
+
+            public IActionResult ReturnIActionResult() => new ContentResult();
+
+            public PartialViewResult ReturnsIActionResultSubType() => new PartialViewResult();
+
+            public ActionResult<TestModel> ReturnsActionResultOfT() => new ActionResult<TestModel>(new TestModel());
+
+            public CustomConvertibleFromAction ReturnsCustomConvertibleFromIActionResult() => new CustomConvertibleFromAction();
+
+            public TestModel ReturnsModelAsModel() => new TestModel();
+
+            public object ReturnModelAsObject() => new TestModel();
+
+            public object ReturnIActionResultAsObject() => new RedirectResult("/foo");
+
+            public Task ReturnsTask()
+            {
+                Executed = true;
+                return Task.CompletedTask;
+            }
+
+            public Task<IActionResult> ReturnIActionResultAsync() => Task.FromResult((IActionResult)new ViewResult());
+
+            public Task<ViewResult> ReturnsIActionResultSubTypeAsync() => Task.FromResult(new ViewResult());
+
+            public Task<TestModel> ReturnsModelAsModelAsync() => Task.FromResult(new TestModel());
+
+            public Task<object> ReturnsModelAsObjectAsync() => Task.FromResult((object)new TestModel());
+
+            public Task<object> ReturnIActionResultAsObjectAsync() => Task.FromResult((object)new OkResult());
+
+            public Task<ActionResult<TestModel>> ReturnActionResultOFTAsync() => Task.FromResult(new ActionResult<TestModel>(new TestModel()));
+        }
+
+        private class TestModel
+        {
+        }
+
+        private class CustomConvertibleFromAction : IConvertToActionResult
+        {
+            public IActionResult Convert() => null;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionResultTypeMapperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionResultTypeMapperTest.cs
new file mode 100644
index 0000000000..3b4d3a0f4d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionResultTypeMapperTest.cs
@@ -0,0 +1,75 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ActionResultTypeMapperTest
+    {
+        [Fact]
+        public void Convert_WithIConvertToActionResult_DelegatesToInterface()
+        {
+            // Arrange
+            var mapper = new ActionResultTypeMapper();
+
+            var expected = new EmptyResult();
+            var returnValue = Mock.Of<IConvertToActionResult>(r => r.Convert() == expected);
+
+            // Act
+            var result = mapper.Convert(returnValue, typeof(string));
+
+            // Assert
+            Assert.Same(expected, result);
+        }
+
+        [Fact]
+        public void Convert_WithRegularType_CreatesObjectResult()
+        {
+            // Arrange
+            var mapper = new ActionResultTypeMapper();
+
+            var returnValue = "hello";
+
+            // Act
+            var result = mapper.Convert(returnValue, typeof(string));
+
+            // Assert
+            var objectResult = Assert.IsType<ObjectResult>(result);
+            Assert.Same(returnValue, objectResult.Value);
+            Assert.Equal(typeof(string), objectResult.DeclaredType);
+        }
+
+        [Fact]
+        public void GetResultDataType_WithActionResultOfT_UnwrapsType()
+        {
+            // Arrange
+            var mapper = new ActionResultTypeMapper();
+
+            var returnType = typeof(ActionResult<string>);
+
+            // Act
+            var result = mapper.GetResultDataType(returnType);
+
+            // Assert
+            Assert.Equal(typeof(string), result);
+        }
+
+        [Fact]
+        public void GetResultDataType_WithRegularType_ReturnsType()
+        {
+            // Arrange
+            var mapper = new ActionResultTypeMapper();
+
+            var returnType = typeof(string);
+
+            // Act
+            var result = mapper.GetResultDataType(returnType);
+
+            // Assert
+            Assert.Equal(typeof(string), result);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionSelectorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionSelectorTest.cs
new file mode 100644
index 0000000000..6db71801b5
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ActionSelectorTest.cs
@@ -0,0 +1,1206 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Logging.Testing;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    public class ActionSelectorTest
+    {
+        [Fact]
+        public void SelectCandidates_SingleMatch()
+        {
+            var actions = new ActionDescriptor[]
+            {
+                new ActionDescriptor()
+                {
+                    DisplayName = "A1",
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Home" },
+                        { "action", "Index" }
+                    },
+                },
+                new ActionDescriptor()
+                {
+                    DisplayName = "A2",
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Home" },
+                        { "action", "About" }
+                    },
+                },
+            };
+
+            var selector = CreateSelector(actions);
+
+            var routeContext = CreateRouteContext("GET");
+            routeContext.RouteData.Values.Add("controller", "Home");
+            routeContext.RouteData.Values.Add("action", "Index");
+
+            // Act
+            var candidates = selector.SelectCandidates(routeContext);
+
+            // Assert
+            Assert.Collection(candidates, (a) => Assert.Same(actions[0], a));
+        }
+
+        [Fact]
+        public void SelectCandidates_MultipleMatches()
+        {
+            var actions = new ActionDescriptor[]
+            {
+                new ActionDescriptor()
+                {
+                    DisplayName = "A1",
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Home" },
+                        { "action", "Index" }
+                    },
+                },
+                new ActionDescriptor()
+                {
+                    DisplayName = "A2",
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Home" },
+                        { "action", "Index" }
+                    },
+                },
+            };
+
+            var selector = CreateSelector(actions);
+
+            var routeContext = CreateRouteContext("GET");
+            routeContext.RouteData.Values.Add("controller", "Home");
+            routeContext.RouteData.Values.Add("action", "Index");
+
+            // Act
+            var candidates = selector.SelectCandidates(routeContext);
+
+            // Assert
+            Assert.Equal(actions.ToArray(), candidates.ToArray());
+        }
+
+        [Fact]
+        public void SelectCandidates_NoMatch()
+        {
+            var actions = new ActionDescriptor[]
+            {
+                new ActionDescriptor()
+                {
+                    DisplayName = "A1",
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Home" },
+                        { "action", "Index" }
+                    },
+                },
+                new ActionDescriptor()
+                {
+                    DisplayName = "A2",
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Home" },
+                        { "action", "About" }
+                    },
+                },
+            };
+
+            var selector = CreateSelector(actions);
+
+            var routeContext = CreateRouteContext("GET");
+            routeContext.RouteData.Values.Add("controller", "Foo");
+            routeContext.RouteData.Values.Add("action", "Index");
+
+            // Act
+            var candidates = selector.SelectCandidates(routeContext);
+
+            // Assert
+            Assert.Empty(candidates);
+        }
+
+        [Fact]
+        public void SelectCandidates_NoMatch_ExcludesAttributeRoutedActions()
+        {
+            var actions = new ActionDescriptor[]
+            {
+                new ActionDescriptor()
+                {
+                    DisplayName = "A1",
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Home" },
+                        { "action", "Index" }
+                    },
+                    AttributeRouteInfo = new AttributeRouteInfo()
+                    {
+                        Template = "/Home",
+                    }
+                },
+            };
+
+            var selector = CreateSelector(actions);
+
+            var routeContext = CreateRouteContext("GET");
+            routeContext.RouteData.Values.Add("controller", "Home");
+            routeContext.RouteData.Values.Add("action", "Index");
+
+            // Act
+            var candidates = selector.SelectCandidates(routeContext);
+
+            // Assert
+            Assert.Empty(candidates);
+        }
+
+        // In this context `CaseSensitiveMatch` means that the input route values exactly match one of the action
+        // descriptor's route values in terms of casing. This is important because we optimize for this case
+        // in the implementation.
+        [Fact]
+        public void SelectCandidates_Match_CaseSensitiveMatch_IncludesAllCaseInsensitiveMatches()
+        {
+            var actions = new ActionDescriptor[]
+            {
+                new ActionDescriptor()
+                {
+                    DisplayName = "A1",
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Home" },
+                        { "action", "Index" }
+                    },
+                },
+                new ActionDescriptor()
+                {
+                    DisplayName = "A2",
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "home" },
+                        { "action", "Index" }
+                    },
+                },
+                new ActionDescriptor() // This won't match the request
+                {
+                    DisplayName = "A3",
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Home" },
+                        { "action", "About" }
+                    },
+                },
+            };
+
+            var expected = actions.Take(2).ToArray();
+
+            var selector = CreateSelector(actions);
+
+            var routeContext = CreateRouteContext("GET");
+            routeContext.RouteData.Values.Add("controller", "Home");
+            routeContext.RouteData.Values.Add("action", "Index");
+
+            // Act
+            var candidates = selector.SelectCandidates(routeContext);
+
+            // Assert
+            Assert.Equal(expected, candidates);
+        }
+
+        // In this context `CaseInsensitiveMatch` means that the input route values do not match any action
+        // descriptor's route values in terms of casing. This is important because we optimize for the case
+        // where the casing matches - the non-matching-casing path is handled a bit differently.
+        [Fact]
+        public void SelectCandidates_Match_CaseInsensitiveMatch_IncludesAllCaseInsensitiveMatches()
+        {
+            var actions = new ActionDescriptor[]
+            {
+                new ActionDescriptor()
+                {
+                    DisplayName = "A1",
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Home" },
+                        { "action", "Index" }
+                    },
+                },
+                new ActionDescriptor()
+                {
+                    DisplayName = "A2",
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "home" },
+                        { "action", "Index" }
+                    },
+                },
+                new ActionDescriptor() // This won't match the request
+                {
+                    DisplayName = "A3",
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Home" },
+                        { "action", "About" }
+                    },
+                },
+            };
+
+            var expected = actions.Take(2).ToArray();
+
+            var selector = CreateSelector(actions);
+
+            var routeContext = CreateRouteContext("GET");
+            routeContext.RouteData.Values.Add("controller", "HOME");
+            routeContext.RouteData.Values.Add("action", "iNDex");
+
+            // Act
+            var candidates = selector.SelectCandidates(routeContext);
+
+            // Assert
+            Assert.Equal(expected, candidates);
+        }
+
+        [Fact]
+        public void SelectCandidates_Match_CaseSensitiveMatch_MatchesOnEmptyString()
+        {
+            var actions = new ActionDescriptor[]
+            {
+                new ActionDescriptor()
+                {
+                    DisplayName = "A1",
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "area", null },
+                        { "controller", "Home" },
+                        { "action", "Index" }
+                    },
+                }
+            };
+
+            var selector = CreateSelector(actions);
+
+            var routeContext = CreateRouteContext("GET");
+            // Example: In conventional route, one could set non-inline defaults
+            // new { area = "", controller = "Home", action = "Index" }
+            routeContext.RouteData.Values.Add("area", "");
+            routeContext.RouteData.Values.Add("controller", "Home");
+            routeContext.RouteData.Values.Add("action", "Index");
+
+            // Act
+            var candidates = selector.SelectCandidates(routeContext);
+
+            // Assert
+            var action = Assert.Single(candidates);
+            Assert.Same(actions[0], action);
+        }
+
+        [Fact]
+        public void SelectCandidates_Match_CaseInsensitiveMatch_MatchesOnEmptyString()
+        {
+            var actions = new ActionDescriptor[]
+            {
+                new ActionDescriptor()
+                {
+                    DisplayName = "A1",
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "area", null },
+                        { "controller", "Home" },
+                        { "action", "Index" }
+                    },
+                }
+            };
+
+            var selector = CreateSelector(actions);
+
+            var routeContext = CreateRouteContext("GET");
+            // Example: In conventional route, one could set non-inline defaults
+            // new { area = "", controller = "Home", action = "Index" }
+            routeContext.RouteData.Values.Add("area", "");
+            routeContext.RouteData.Values.Add("controller", "HoMe");
+            routeContext.RouteData.Values.Add("action", "InDeX");
+
+            // Act
+            var candidates = selector.SelectCandidates(routeContext);
+
+            // Assert
+            var action = Assert.Single(candidates);
+            Assert.Same(actions[0], action);
+        }
+
+        [Fact]
+        public void SelectCandidates_Match_MatchesOnNull()
+        {
+            var actions = new ActionDescriptor[]
+            {
+                new ActionDescriptor()
+                {
+                    DisplayName = "A1",
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "area", null },
+                        { "controller", "Home" },
+                        { "action", "Index" }
+                    },
+                }
+            };
+
+            var selector = CreateSelector(actions);
+
+            var routeContext = CreateRouteContext("GET");
+            // Example: In conventional route, one could set non-inline defaults
+            // new { area = (string)null, controller = "Foo", action = "Index" }
+            routeContext.RouteData.Values.Add("area", null);
+            routeContext.RouteData.Values.Add("controller", "Home");
+            routeContext.RouteData.Values.Add("action", "Index");
+
+            // Act
+            var candidates = selector.SelectCandidates(routeContext);
+
+            // Assert
+            var action = Assert.Single(candidates);
+            Assert.Same(actions[0], action);
+        }
+
+        [Fact]
+        public void SelectCandidates_Match_ActionDescriptorWithEmptyRouteValues_MatchesOnEmptyString()
+        {
+            var actions = new ActionDescriptor[]
+            {
+                new ActionDescriptor()
+                {
+                    DisplayName = "A1",
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "foo", "" },
+                        { "controller", "Home" },
+                        { "action", "Index" }
+                    },
+                }
+            };
+
+            var selector = CreateSelector(actions);
+
+            var routeContext = CreateRouteContext("GET");
+            // Example: In conventional route, one could set non-inline defaults
+            // new { area = (string)null, controller = "Home", action = "Index" }
+            routeContext.RouteData.Values.Add("foo", "");
+            routeContext.RouteData.Values.Add("controller", "Home");
+            routeContext.RouteData.Values.Add("action", "Index");
+
+            // Act
+            var candidates = selector.SelectCandidates(routeContext);
+
+            // Assert
+            var action = Assert.Single(candidates);
+            Assert.Same(actions[0], action);
+        }
+
+        [Fact]
+        public void SelectCandidates_Match_ActionDescriptorWithEmptyRouteValues_MatchesOnNull()
+        {
+            var actions = new ActionDescriptor[]
+            {
+                new ActionDescriptor()
+                {
+                    DisplayName = "A1",
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "foo", "" },
+                        { "controller", "Home" },
+                        { "action", "Index" }
+                    },
+                }
+            };
+
+            var selector = CreateSelector(actions);
+
+            var routeContext = CreateRouteContext("GET");
+            // Example: In conventional route, one could set non-inline defaults
+            // new { area = (string)null, controller = "Home", action = "Index" }
+            routeContext.RouteData.Values.Add("foo", null);
+            routeContext.RouteData.Values.Add("controller", "Home");
+            routeContext.RouteData.Values.Add("action", "Index");
+
+            // Act
+            var candidates = selector.SelectCandidates(routeContext);
+
+            // Assert
+            var action = Assert.Single(candidates);
+            Assert.Same(actions[0], action);
+        }
+
+        [Fact]
+        public void SelectBestCandidate_AmbiguousActions_LogIsCorrect()
+        {
+            // Arrange
+            var sink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
+
+            var actions = new ActionDescriptor[]
+            {
+                new ActionDescriptor() { DisplayName = "A1" },
+                new ActionDescriptor() { DisplayName = "A2" },
+            };
+            var selector = CreateSelector(actions, loggerFactory);
+
+            var routeContext = CreateRouteContext("POST");
+            var actionNames = string.Join(Environment.NewLine, actions.Select(action => action.DisplayName));
+            var expectedMessage = "Request matched multiple actions resulting in " +
+                $"ambiguity. Matching actions: {actionNames}";
+
+            // Act
+            Assert.Throws<AmbiguousActionException>(() => { selector.SelectBestCandidate(routeContext, actions); });
+
+            // Assert
+            Assert.Empty(sink.Scopes);
+            var write = Assert.Single(sink.Writes);
+            Assert.Equal(expectedMessage, write.State?.ToString());
+        }
+
+        [Fact]
+        public void SelectBestCandidate_PrefersActionWithConstraints()
+        {
+            // Arrange
+            var actionWithConstraints = new ActionDescriptor()
+            {
+                ActionConstraints = new List<IActionConstraintMetadata>()
+                {
+                    new HttpMethodActionConstraint(new string[] { "POST" }),
+                },
+                Parameters = new List<ParameterDescriptor>(),
+            };
+
+            var actionWithoutConstraints = new ActionDescriptor()
+            {
+                Parameters = new List<ParameterDescriptor>(),
+            };
+
+            var actions = new ActionDescriptor[] { actionWithConstraints, actionWithoutConstraints };
+
+            var selector = CreateSelector(actions);
+            var context = CreateRouteContext("POST");
+
+            // Act
+            var action = selector.SelectBestCandidate(context, actions);
+
+            // Assert
+            Assert.Same(action, actionWithConstraints);
+        }
+
+        [Fact]
+        public void SelectBestCandidate_ConstraintsRejectAll()
+        {
+            // Arrange
+            var action1 = new ActionDescriptor()
+            {
+                ActionConstraints = new List<IActionConstraintMetadata>()
+                {
+                    new BooleanConstraint() { Pass = false, },
+                },
+            };
+
+            var action2 = new ActionDescriptor()
+            {
+                ActionConstraints = new List<IActionConstraintMetadata>()
+                {
+                    new BooleanConstraint() { Pass = false, },
+                },
+            };
+
+            var actions = new ActionDescriptor[] { action1, action2 };
+
+            var selector = CreateSelector(actions);
+            var context = CreateRouteContext("POST");
+
+            // Act
+            var action = selector.SelectBestCandidate(context, actions);
+
+            // Assert
+            Assert.Null(action);
+        }
+
+        [Fact]
+        public void SelectBestCandidate_ConstraintsRejectAll_DifferentStages()
+        {
+            // Arrange
+            var action1 = new ActionDescriptor()
+            {
+                ActionConstraints = new List<IActionConstraintMetadata>()
+                {
+                    new BooleanConstraint() { Pass = false, Order = 0 },
+                    new BooleanConstraint() { Pass = true, Order = 1 },
+                },
+            };
+
+            var action2 = new ActionDescriptor()
+            {
+                ActionConstraints = new List<IActionConstraintMetadata>()
+                {
+                    new BooleanConstraint() { Pass = true, Order = 0 },
+                    new BooleanConstraint() { Pass = false, Order = 1 },
+                },
+            };
+
+            var actions = new ActionDescriptor[] { action1, action2 };
+
+            var selector = CreateSelector(actions);
+            var context = CreateRouteContext("POST");
+
+            // Act
+            var action = selector.SelectBestCandidate(context, actions);
+
+            // Assert
+            Assert.Null(action);
+        }
+
+        [Fact]
+        public void SelectBestCandidate_ActionConstraintFactory()
+        {
+            // Arrange
+            var actionWithConstraints = new ActionDescriptor()
+            {
+                ActionConstraints = new List<IActionConstraintMetadata>()
+                {
+                    new ConstraintFactory()
+                    {
+                        Constraint = new BooleanConstraint() { Pass = true },
+                    },
+                }
+            };
+
+            var actionWithoutConstraints = new ActionDescriptor()
+            {
+                Parameters = new List<ParameterDescriptor>(),
+            };
+
+            var actions = new ActionDescriptor[] { actionWithConstraints, actionWithoutConstraints };
+
+            var selector = CreateSelector(actions);
+            var context = CreateRouteContext("POST");
+
+            // Act
+            var action = selector.SelectBestCandidate(context, actions);
+
+            // Assert
+            Assert.Same(action, actionWithConstraints);
+        }
+
+        [Fact]
+        public void SelectBestCandidate_ActionConstraintFactory_ReturnsNull()
+        {
+            // Arrange
+            var nullConstraint = new ActionDescriptor()
+            {
+                ActionConstraints = new List<IActionConstraintMetadata>()
+                {
+                    new ConstraintFactory()
+                    {
+                    },
+                }
+            };
+
+            var actions = new ActionDescriptor[] { nullConstraint };
+
+            var selector = CreateSelector(actions);
+            var context = CreateRouteContext("POST");
+
+            // Act
+            var action = selector.SelectBestCandidate(context, actions);
+
+            // Assert
+            Assert.Same(action, nullConstraint);
+        }
+
+        // There's a custom constraint provider registered that only understands BooleanConstraintMarker
+        [Fact]
+        public void SelectBestCandidate_CustomProvider()
+        {
+            // Arrange
+            var actionWithConstraints = new ActionDescriptor()
+            {
+                ActionConstraints = new List<IActionConstraintMetadata>()
+                {
+                    new BooleanConstraintMarker() { Pass = true },
+                }
+            };
+
+            var actionWithoutConstraints = new ActionDescriptor()
+            {
+                Parameters = new List<ParameterDescriptor>(),
+            };
+
+            var actions = new ActionDescriptor[] { actionWithConstraints, actionWithoutConstraints, };
+
+            var selector = CreateSelector(actions);
+            var context = CreateRouteContext("POST");
+
+            // Act
+            var action = selector.SelectBestCandidate(context, actions);
+
+            // Assert
+            Assert.Same(action, actionWithConstraints);
+        }
+
+        // Due to ordering of stages, the first action will be better.
+        [Fact]
+        public void SelectBestCandidate_ConstraintsInOrder()
+        {
+            // Arrange
+            var best = new ActionDescriptor()
+            {
+                ActionConstraints = new List<IActionConstraintMetadata>()
+                {
+                    new BooleanConstraint() { Pass = true, Order = 0, },
+                },
+            };
+
+            var worst = new ActionDescriptor()
+            {
+                ActionConstraints = new List<IActionConstraintMetadata>()
+                {
+                    new BooleanConstraint() { Pass = true, Order = 1, },
+                },
+            };
+
+            var actions = new ActionDescriptor[] { best, worst };
+
+            var selector = CreateSelector(actions);
+            var context = CreateRouteContext("POST");
+
+            // Act
+            var action = selector.SelectBestCandidate(context, actions);
+
+            // Assert
+            Assert.Same(action, best);
+        }
+
+        // Due to ordering of stages, the first action will be better.
+        [Fact]
+        public void SelectBestCandidate_ConstraintsInOrder_MultipleStages()
+        {
+            // Arrange
+            var best = new ActionDescriptor()
+            {
+                ActionConstraints = new List<IActionConstraintMetadata>()
+                {
+                    new BooleanConstraint() { Pass = true, Order = 0, },
+                    new BooleanConstraint() { Pass = true, Order = 1, },
+                    new BooleanConstraint() { Pass = true, Order = 2, },
+                },
+            };
+
+            var worst = new ActionDescriptor()
+            {
+                ActionConstraints = new List<IActionConstraintMetadata>()
+                {
+                    new BooleanConstraint() { Pass = true, Order = 0, },
+                    new BooleanConstraint() { Pass = true, Order = 1, },
+                    new BooleanConstraint() { Pass = true, Order = 3, },
+                },
+            };
+
+            var actions = new ActionDescriptor[] { best, worst };
+
+            var selector = CreateSelector(actions);
+            var context = CreateRouteContext("POST");
+
+            // Act
+            var action = selector.SelectBestCandidate(context, actions);
+
+            // Assert
+            Assert.Same(action, best);
+        }
+
+        [Fact]
+        public void SelectBestCandidate_Fallback_ToActionWithoutConstraints()
+        {
+            // Arrange
+            var nomatch1 = new ActionDescriptor()
+            {
+                ActionConstraints = new List<IActionConstraintMetadata>()
+                {
+                    new BooleanConstraint() { Pass = true, Order = 0, },
+                    new BooleanConstraint() { Pass = true, Order = 1, },
+                    new BooleanConstraint() { Pass = false, Order = 2, },
+                },
+            };
+
+            var nomatch2 = new ActionDescriptor()
+            {
+                ActionConstraints = new List<IActionConstraintMetadata>()
+                {
+                    new BooleanConstraint() { Pass = true, Order = 0, },
+                    new BooleanConstraint() { Pass = true, Order = 1, },
+                    new BooleanConstraint() { Pass = false, Order = 3, },
+                },
+            };
+
+            var best = new ActionDescriptor();
+
+            var actions = new ActionDescriptor[] { best, nomatch1, nomatch2 };
+
+            var selector = CreateSelector(actions);
+            var context = CreateRouteContext("POST");
+
+            // Act
+            var action = selector.SelectBestCandidate(context, actions);
+
+            // Assert
+            Assert.Same(action, best);
+        }
+
+        [Fact]
+        public void SelectBestCandidate_Ambiguous()
+        {
+            // Arrange
+            var expectedMessage =
+                "Multiple actions matched. " +
+                "The following actions matched route data and had all constraints satisfied:" + Environment.NewLine +
+                Environment.NewLine +
+                "Ambiguous1" + Environment.NewLine +
+                "Ambiguous2";
+
+            var actions = new ActionDescriptor[]
+            {
+                CreateAction(area: null, controller: "Store", action: "Buy"),
+                CreateAction(area: null, controller: "Store", action: "Buy"),
+            };
+
+            actions[0].DisplayName = "Ambiguous1";
+            actions[1].DisplayName = "Ambiguous2";
+
+            var selector = CreateSelector(actions);
+            var context = CreateRouteContext("GET");
+
+            context.RouteData.Values.Add("controller", "Store");
+            context.RouteData.Values.Add("action", "Buy");
+
+            // Act
+            var ex = Assert.Throws<AmbiguousActionException>(() =>
+            {
+                selector.SelectBestCandidate(context, actions);
+            });
+
+            // Assert
+            Assert.Equal(expectedMessage, ex.Message);
+        }
+
+        [Theory]
+        [InlineData("GET")]
+        [InlineData("PUT")]
+        [InlineData("POST")]
+        [InlineData("DELETE")]
+        [InlineData("PATCH")]
+        public void HttpMethodAttribute_ActionWithMultipleHttpMethodAttributeViaAcceptVerbs_ORsMultipleHttpMethods(string verb)
+        {
+            // Arrange
+            var routeContext = new RouteContext(GetHttpContext(verb));
+            routeContext.RouteData.Values.Add("controller", "HttpMethodAttributeTests_RestOnly");
+            routeContext.RouteData.Values.Add("action", "Patch");
+
+            // Act
+            var result = InvokeActionSelector(routeContext);
+
+            // Assert
+            Assert.Equal("Patch", result.ActionName);
+        }
+
+        [Theory]
+        [InlineData("GET")]
+        [InlineData("PUT")]
+        [InlineData("POST")]
+        [InlineData("DELETE")]
+        [InlineData("PATCH")]
+        [InlineData("HEAD")]
+        public void HttpMethodAttribute_ActionWithMultipleHttpMethodAttributes_ORsMultipleHttpMethods(string verb)
+        {
+            // Arrange
+            var routeContext = new RouteContext(GetHttpContext(verb));
+            routeContext.RouteData.Values.Add("controller", "HttpMethodAttributeTests_RestOnly");
+            routeContext.RouteData.Values.Add("action", "Put");
+
+            // Act
+            var result = InvokeActionSelector(routeContext);
+
+            // Assert
+            Assert.Equal("Put", result.ActionName);
+        }
+
+        [Theory]
+        [InlineData("GET")]
+        [InlineData("PUT")]
+        public void HttpMethodAttribute_ActionDecoratedWithHttpMethodAttribute_OverridesConvention(string verb)
+        {
+            // Arrange
+            // Note no action name is passed, hence should return a null action descriptor.
+            var routeContext = new RouteContext(GetHttpContext(verb));
+            routeContext.RouteData.Values.Add("controller", "HttpMethodAttributeTests_RestOnly");
+
+            // Act
+            var result = InvokeActionSelector(routeContext);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Theory]
+        [InlineData("Put")]
+        [InlineData("RPCMethod")]
+        [InlineData("RPCMethodWithHttpGet")]
+        public void NonActionAttribute_ActionNotReachable(string actionName)
+        {
+            // Arrange
+            var actionDescriptorProvider = GetActionDescriptorProvider();
+
+            // Act
+            var result = actionDescriptorProvider
+                .GetDescriptors()
+                .FirstOrDefault(x => x.ControllerName == "NonAction" && x.ActionName == actionName);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Theory]
+        [InlineData("GET")]
+        [InlineData("PUT")]
+        [InlineData("POST")]
+        [InlineData("DELETE")]
+        [InlineData("PATCH")]
+        public void ActionNameAttribute_ActionGetsExposedViaActionName_UnreachableByConvention(string verb)
+        {
+            // Arrange
+            var routeContext = new RouteContext(GetHttpContext(verb));
+            routeContext.RouteData.Values.Add("controller", "ActionName");
+            routeContext.RouteData.Values.Add("action", "RPCMethodWithHttpGet");
+
+            // Act
+            var result = InvokeActionSelector(routeContext);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Theory]
+        [InlineData("GET", "CustomActionName_Verb")]
+        [InlineData("PUT", "CustomActionName_Verb")]
+        [InlineData("POST", "CustomActionName_Verb")]
+        [InlineData("DELETE", "CustomActionName_Verb")]
+        [InlineData("PATCH", "CustomActionName_Verb")]
+        [InlineData("GET", "CustomActionName_DefaultMethod")]
+        [InlineData("PUT", "CustomActionName_DefaultMethod")]
+        [InlineData("POST", "CustomActionName_DefaultMethod")]
+        [InlineData("DELETE", "CustomActionName_DefaultMethod")]
+        [InlineData("PATCH", "CustomActionName_DefaultMethod")]
+        [InlineData("GET", "CustomActionName_RpcMethod")]
+        [InlineData("PUT", "CustomActionName_RpcMethod")]
+        [InlineData("POST", "CustomActionName_RpcMethod")]
+        [InlineData("DELETE", "CustomActionName_RpcMethod")]
+        [InlineData("PATCH", "CustomActionName_RpcMethod")]
+        public void ActionNameAttribute_DifferentActionName_UsesActionNameFromActionNameAttribute(string verb, string actionName)
+        {
+            // Arrange
+            var routeContext = new RouteContext(GetHttpContext(verb));
+            routeContext.RouteData.Values.Add("controller", "ActionName");
+            routeContext.RouteData.Values.Add("action", actionName);
+
+            // Act
+            var result = InvokeActionSelector(routeContext);
+
+            // Assert
+            Assert.Equal(actionName, result.ActionName);
+        }
+
+        private ControllerActionDescriptor InvokeActionSelector(RouteContext context)
+        {
+            var actionDescriptorProvider = GetActionDescriptorProvider();
+            var actionDescriptorCollectionProvider = new ActionDescriptorCollectionProvider(
+                new[] { actionDescriptorProvider },
+                Enumerable.Empty<IActionDescriptorChangeProvider>());
+
+            var actionConstraintProviders = new[]
+            {
+                new DefaultActionConstraintProvider(),
+            };
+
+            var actionSelector = new ActionSelector(
+                actionDescriptorCollectionProvider,
+                GetActionConstraintCache(actionConstraintProviders),
+                NullLoggerFactory.Instance);
+
+            var candidates = actionSelector.SelectCandidates(context);
+            return (ControllerActionDescriptor)actionSelector.SelectBestCandidate(context, candidates);
+        }
+
+        private ControllerActionDescriptorProvider GetActionDescriptorProvider()
+        {
+            var controllerTypes = typeof(ActionSelectorTest)
+                .GetNestedTypes(BindingFlags.NonPublic)
+                .Select(t => t.GetTypeInfo())
+                .ToList();
+
+            var options = Options.Create(new MvcOptions());
+
+            var manager = GetApplicationManager(controllerTypes);
+
+            var modelProvider = new DefaultApplicationModelProvider(options, TestModelMetadataProvider.CreateDefaultProvider());
+
+            var provider = new ControllerActionDescriptorProvider(
+                manager,
+                new[] { modelProvider },
+                options);
+
+            return provider;
+        }
+
+        private static ApplicationPartManager GetApplicationManager(List<TypeInfo> controllerTypes)
+        {
+            var manager = new ApplicationPartManager();
+            manager.ApplicationParts.Add(new TestApplicationPart(controllerTypes));
+            manager.FeatureProviders.Add(new TestFeatureProvider());
+            return manager;
+        }
+
+        private static HttpContext GetHttpContext(string httpMethod)
+        {
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Method = httpMethod;
+            return httpContext;
+        }
+
+        private static ActionDescriptor[] GetActions()
+        {
+            return new ActionDescriptor[]
+            {
+                // Like a typical RPC controller
+                CreateAction(area: null, controller: "Home", action: "Index"),
+                CreateAction(area: null, controller: "Home", action: "Edit"),
+
+                // Like a typical REST controller
+                CreateAction(area: null, controller: "Product", action: null),
+                CreateAction(area: null, controller: "Product", action: null),
+
+                // RPC controller in an area with the same name as home
+                CreateAction(area: "Admin", controller: "Home", action: "Index"),
+                CreateAction(area: "Admin", controller: "Home", action: "Diagnostics"),
+            };
+        }
+
+        private static IEnumerable<ActionDescriptor> GetActions(
+            IEnumerable<ActionDescriptor> actions,
+            string area,
+            string controller,
+            string action)
+        {
+            var comparer = new RouteValueEqualityComparer();
+
+            return
+                actions
+                .Where(a => a.RouteValues.Any(kvp => kvp.Key == "area" && comparer.Equals(kvp.Value, area)))
+                .Where(a => a.RouteValues.Any(kvp => kvp.Key == "controller" && comparer.Equals(kvp.Value, controller)))
+                .Where(a => a.RouteValues.Any(kvp => kvp.Key == "action" && comparer.Equals(kvp.Value, action)));
+        }
+
+        private static ActionSelector CreateSelector(IReadOnlyList<ActionDescriptor> actions, ILoggerFactory loggerFactory = null)
+        {
+            loggerFactory = loggerFactory ?? NullLoggerFactory.Instance;
+
+            var actionProvider = new Mock<IActionDescriptorCollectionProvider>(MockBehavior.Strict);
+
+            actionProvider
+                .Setup(p => p.ActionDescriptors)
+                .Returns(new ActionDescriptorCollection(actions, 0));
+
+            var actionConstraintProviders = new IActionConstraintProvider[] {
+                    new DefaultActionConstraintProvider(),
+                    new BooleanConstraintProvider(),
+                };
+
+            return new ActionSelector(
+                actionProvider.Object,
+                GetActionConstraintCache(actionConstraintProviders),
+                loggerFactory);
+        }
+
+        private static VirtualPathContext CreateContext(object routeValues)
+        {
+            return CreateContext(routeValues, ambientValues: null);
+        }
+
+        private static VirtualPathContext CreateContext(object routeValues, object ambientValues)
+        {
+            return new VirtualPathContext(
+                new Mock<HttpContext>(MockBehavior.Strict).Object,
+                new RouteValueDictionary(ambientValues),
+                new RouteValueDictionary(routeValues));
+        }
+
+        private static RouteContext CreateRouteContext(string httpMethod)
+        {
+            var routeData = new RouteData();
+            routeData.Routers.Add(new Mock<IRouter>(MockBehavior.Strict).Object);
+
+            var serviceProvider = new ServiceCollection().BuildServiceProvider();
+
+            var httpContext = new Mock<HttpContext>(MockBehavior.Strict);
+
+            var request = new Mock<HttpRequest>(MockBehavior.Strict);
+            request.SetupGet(r => r.Method).Returns(httpMethod);
+            request.SetupGet(r => r.Path).Returns(new PathString());
+            request.SetupGet(r => r.Headers).Returns(new HeaderDictionary());
+            httpContext.SetupGet(c => c.Request).Returns(request.Object);
+            httpContext.SetupGet(c => c.RequestServices).Returns(serviceProvider);
+
+            return new RouteContext(httpContext.Object)
+            {
+                RouteData = routeData,
+            };
+        }
+
+        private static ActionDescriptor CreateAction(string area, string controller, string action)
+        {
+            var actionDescriptor = new ControllerActionDescriptor()
+            {
+                ActionName = string.Format("Area: {0}, Controller: {1}, Action: {2}", area, controller, action),
+                Parameters = new List<ParameterDescriptor>(),
+            };
+
+            actionDescriptor.RouteValues.Add("area", area);
+            actionDescriptor.RouteValues.Add("controller", controller);
+            actionDescriptor.RouteValues.Add("action", action);
+
+            return actionDescriptor;
+        }
+
+        private static ActionConstraintCache GetActionConstraintCache(IActionConstraintProvider[] actionConstraintProviders = null)
+        {
+            var descriptorProvider = new ActionDescriptorCollectionProvider(
+                Enumerable.Empty<IActionDescriptorProvider>(),
+                Enumerable.Empty<IActionDescriptorChangeProvider>());
+            return new ActionConstraintCache(descriptorProvider, actionConstraintProviders.AsEnumerable() ?? new List<IActionConstraintProvider>());
+        }
+
+        private class BooleanConstraint : IActionConstraint
+        {
+            public bool Pass { get; set; }
+
+            public int Order { get; set; }
+
+            public bool Accept(ActionConstraintContext context)
+            {
+                return Pass;
+            }
+        }
+
+        private class ConstraintFactory : IActionConstraintFactory
+        {
+            public IActionConstraint Constraint { get; set; }
+
+            public bool IsReusable => true;
+
+            public IActionConstraint CreateInstance(IServiceProvider services)
+            {
+                return Constraint;
+            }
+        }
+
+        private class BooleanConstraintMarker : IActionConstraintMetadata
+        {
+            public bool Pass { get; set; }
+        }
+
+        private class BooleanConstraintProvider : IActionConstraintProvider
+        {
+            public int Order { get; set; }
+
+            public void OnProvidersExecuting(ActionConstraintProviderContext context)
+            {
+                foreach (var item in context.Results)
+                {
+                    if (item.Metadata is BooleanConstraintMarker marker)
+                    {
+                        Assert.Null(item.Constraint);
+                        item.Constraint = new BooleanConstraint() { Pass = marker.Pass };
+                    }
+                }
+            }
+
+            public void OnProvidersExecuted(ActionConstraintProviderContext context)
+            {
+            }
+        }
+
+        private class NonActionController
+        {
+            [NonAction]
+            public void Put()
+            {
+            }
+
+            [NonAction]
+            public void RPCMethod()
+            {
+            }
+
+            [NonAction]
+            [HttpGet]
+            public void RPCMethodWithHttpGet()
+            {
+            }
+        }
+
+        private class ActionNameController
+        {
+            [ActionName("CustomActionName_Verb")]
+            public void Put()
+            {
+            }
+
+            [ActionName("CustomActionName_DefaultMethod")]
+            public void Index()
+            {
+            }
+
+            [ActionName("CustomActionName_RpcMethod")]
+            public void RPCMethodWithHttpGet()
+            {
+            }
+        }
+
+        private class HttpMethodAttributeTests_RestOnlyController
+        {
+            [HttpGet]
+            [HttpPut]
+            [HttpPost]
+            [HttpDelete]
+            [HttpPatch]
+            [HttpHead]
+            public void Put()
+            {
+            }
+
+            [AcceptVerbs("PUT", "post", "GET", "delete", "pATcH")]
+            public void Patch()
+            {
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ApiBehaviorApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ApiBehaviorApplicationModelProviderTest.cs
new file mode 100644
index 0000000000..5b4b210d1a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ApiBehaviorApplicationModelProviderTest.cs
@@ -0,0 +1,1269 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ApiBehaviorApplicationModelProviderTest
+    {
+        [Fact]
+        public void OnProvidersExecuting_AddsModelStateInvalidFilter_IfTypeIsAnnotatedWithAttribute()
+        {
+            // Arrange
+            var context = GetContext(typeof(TestApiController));
+            var provider = GetProvider();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var actionModel = Assert.Single(Assert.Single(context.Result.Controllers).Actions);
+            Assert.IsType<ModelStateInvalidFilter>(actionModel.Filters.Last());
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_DoesNotAddModelStateInvalidFilterToController_IfFeatureIsDisabledViaOptions()
+        {
+            // Arrange
+            var context = GetContext(typeof(TestApiController));
+            var options = new ApiBehaviorOptions
+            {
+                SuppressModelStateInvalidFilter = true,
+            };
+
+            var provider = GetProvider(options);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controllerModel = Assert.Single(context.Result.Controllers);
+            Assert.DoesNotContain(typeof(ModelStateInvalidFilter), controllerModel.Filters.Select(f => f.GetType()));
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_AddsModelStateInvalidFilter_IfActionIsAnnotatedWithAttribute()
+        {
+            // Arrange
+            var context = GetContext(typeof(SimpleController));
+            var provider = GetProvider();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                Assert.Single(context.Result.Controllers).Actions.OrderBy(a => a.ActionName),
+                action =>
+                {
+                    Assert.Contains(typeof(ModelStateInvalidFilter), action.Filters.Select(f => f.GetType()));
+                },
+                action =>
+                {
+                    Assert.DoesNotContain(typeof(ModelStateInvalidFilter), action.Filters.Select(f => f.GetType()));
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_SkipsAddingFilterToActionIfFeatureIsDisabledUsingOptions()
+        {
+            // Arrange
+            var context = GetContext(typeof(SimpleController));
+            var options = new ApiBehaviorOptions
+            {
+                SuppressModelStateInvalidFilter = true,
+            };
+
+            var provider = GetProvider(options);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                Assert.Single(context.Result.Controllers).Actions.OrderBy(a => a.ActionName),
+                action =>
+                {
+                    Assert.DoesNotContain(typeof(ModelStateInvalidFilter), action.Filters.Select(f => f.GetType()));
+                },
+                action =>
+                {
+                    Assert.DoesNotContain(typeof(ModelStateInvalidFilter), action.Filters.Select(f => f.GetType()));
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_MakesControllerVisibleInApiExplorer_IfItIsAnnotatedWithAttribute()
+        {
+            // Arrange
+            var context = GetContext(typeof(TestApiController));
+            var options = new ApiBehaviorOptions
+            {
+                SuppressModelStateInvalidFilter = true,
+            };
+
+            var provider = GetProvider(options);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            Assert.True(controller.ApiExplorer.IsVisible);
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_DoesNotModifyVisibilityInApiExplorer_IfValueIsAlreadySet()
+        {
+            // Arrange
+            var context = GetContext(typeof(TestApiController));
+            context.Result.Controllers[0].ApiExplorer.IsVisible = false;
+            var options = new ApiBehaviorOptions
+            {
+                SuppressModelStateInvalidFilter = true,
+            };
+
+            var provider = GetProvider(options);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            Assert.False(controller.ApiExplorer.IsVisible);
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_ThrowsIfControllerWithAttribute_HasActionsWithoutAttributeRouting()
+        {
+            // Arrange
+            var actionName = $"{typeof(ActionsWithoutAttributeRouting).FullName}.{nameof(ActionsWithoutAttributeRouting.Index)} ({typeof(ActionsWithoutAttributeRouting).Assembly.GetName().Name})";
+            var expected = $"Action '{actionName}' does not have an attribute route. Action methods on controllers annotated with ApiControllerAttribute must be attribute routed.";
+            var context = GetContext(typeof(ActionsWithoutAttributeRouting));
+            var provider = GetProvider();
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => provider.OnProvidersExecuting(context));
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public void InferBindingSourceForParameter_ReturnsPath_IfParameterNameExistsInRouteAsSimpleToken()
+        {
+            // Arrange
+            var actionName = nameof(ParameterBindingController.SimpleRouteToken);
+            var parameter = GetParameterModel(typeof(ParameterBindingController), actionName);
+            var provider = GetProvider();
+
+            // Act
+            var result = provider.InferBindingSourceForParameter(parameter);
+
+            // Assert
+            Assert.Same(BindingSource.Path, result);
+        }
+
+        [Fact]
+        public void InferBindingSourceForParameter_ReturnsPath_IfParameterNameExistsInRouteAsOptionalToken()
+        {
+            // Arrange
+            var actionName = nameof(ParameterBindingController.OptionalRouteToken);
+            var parameter = GetParameterModel(typeof(ParameterBindingController), actionName);
+            var provider = GetProvider();
+
+            // Act
+            var result = provider.InferBindingSourceForParameter(parameter);
+
+            // Assert
+            Assert.Same(BindingSource.Path, result);
+        }
+
+        [Fact]
+        public void InferBindingSourceForParameter_ReturnsPath_IfParameterNameExistsInRouteAsConstrainedToken()
+        {
+            // Arrange
+            var actionName = nameof(ParameterBindingController.ConstrainedRouteToken);
+            var parameter = GetParameterModel(typeof(ParameterBindingController), actionName);
+            var provider = GetProvider();
+
+            // Act
+            var result = provider.InferBindingSourceForParameter(parameter);
+
+            // Assert
+            Assert.Same(BindingSource.Path, result);
+        }
+
+        [Fact]
+        public void InferBindingSourceForParameter_ReturnsPath_IfParameterNameExistsInAbsoluteRoute()
+        {
+            // Arrange
+            var actionName = nameof(ParameterBindingController.AbsoluteRoute);
+            var parameter = GetParameterModel(typeof(ParameterBindingController), actionName);
+            var provider = GetProvider();
+
+            // Act
+            var result = provider.InferBindingSourceForParameter(parameter);
+
+            // Assert
+            Assert.Same(BindingSource.Path, result);
+        }
+
+        [Fact]
+        public void InferBindingSourceForParameter_ReturnsPath_IfParameterAppearsInAnyRoutes_MulitpleRoutes()
+        {
+            // Arrange
+            var actionName = nameof(ParameterBindingController.ParameterInMultipleRoutes);
+            var parameter = GetParameterModel(typeof(ParameterBindingController), actionName);
+            var provider = GetProvider();
+
+            // Act
+            var result = provider.InferBindingSourceForParameter(parameter);
+
+            // Assert
+            Assert.Same(BindingSource.Path, result);
+        }
+
+        [Fact]
+        public void InferBindingSourceForParameter_ReturnsPath_IfParameterAppearsInAnyRoute()
+        {
+            // Arrange
+            var actionName = nameof(ParameterBindingController.ParameterNotInAllRoutes);
+            var parameter = GetParameterModel(typeof(ParameterBindingController), actionName);
+            var provider = GetProvider();
+
+            // Act
+            var result = provider.InferBindingSourceForParameter(parameter);
+
+            // Assert
+            Assert.Same(BindingSource.Path, result);
+        }
+
+        [Fact]
+        public void InferBindingSourceForParameter_ReturnsPath_IfParameterAppearsInControllerRoute()
+        {
+            // Arrange
+            var actionName = nameof(ParameterInController.ActionWithoutRoute);
+            var parameter = GetParameterModel(typeof(ParameterInController), actionName);
+            var provider = GetProvider();
+
+            // Act
+            var result = provider.InferBindingSourceForParameter(parameter);
+
+            // Assert
+            Assert.Same(BindingSource.Path, result);
+        }
+
+        [Fact]
+        public void InferBindingSourceForParameter_ReturnsPath_IfParameterAppearsInControllerRoute_AndActionHasRoute()
+        {
+            // Arrange
+            var actionName = nameof(ParameterInController.ActionWithRoute);
+            var parameter = GetParameterModel(typeof(ParameterInController), actionName);
+            var provider = GetProvider();
+
+            // Act
+            var result = provider.InferBindingSourceForParameter(parameter);
+
+            // Assert
+            Assert.Same(BindingSource.Path, result);
+        }
+
+        [Fact]
+        public void InferBindingSourceForParameter_ReturnsPath_IfParameterAppearsInAllActionRoutes()
+        {
+            // Arrange
+            var actionName = nameof(ParameterInController.MultipleRoute);
+            var parameter = GetParameterModel(typeof(ParameterInController), actionName);
+            var provider = GetProvider();
+
+            // Act
+            var result = provider.InferBindingSourceForParameter(parameter);
+
+            // Assert
+            Assert.Same(BindingSource.Path, result);
+        }
+
+        [Fact]
+        public void InferBindingSourceForParameter_DoesNotReturnPath_IfActionRouteOverridesControllerRoute()
+        {
+            // Arrange
+            var actionName = nameof(ParameterInController.AbsoluteRoute);
+            var parameter = GetParameterModel(typeof(ParameterInController), actionName);
+            var provider = GetProvider();
+
+            // Act
+            var result = provider.InferBindingSourceForParameter(parameter);
+
+            // Assert
+            Assert.Same(BindingSource.Query, result);
+        }
+
+        [Fact]
+        public void InferBindingSourceForParameter_ReturnsPath_IfParameterPresentInNonOverriddenControllerRoute()
+        {
+            // Arrange
+            var actionName = nameof(ParameterInController.MultipleRouteWithOverride);
+            var parameter = GetParameterModel(typeof(ParameterInController), actionName);
+            var provider = GetProvider();
+
+            // Act
+            var result = provider.InferBindingSourceForParameter(parameter);
+
+            // Assert
+            Assert.Same(BindingSource.Path, result);
+        }
+
+        [Fact]
+        public void InferBindingSourceForParameter_ReturnsPath_IfParameterExistsInRoute_OnControllersWithoutSelectors()
+        {
+            // Arrange
+            var actionName = nameof(ParameterBindingNoRoutesOnController.SimpleRoute);
+            var parameter = GetParameterModel(typeof(ParameterBindingNoRoutesOnController), actionName);
+            var provider = GetProvider();
+
+            // Act
+            var result = provider.InferBindingSourceForParameter(parameter);
+
+            // Assert
+            Assert.Same(BindingSource.Path, result);
+        }
+
+        [Fact]
+        public void InferBindingSourceForParameter_ReturnsPath_IfParameterExistsInAllRoutes_OnControllersWithoutSelectors()
+        {
+            // Arrange
+            var actionName = nameof(ParameterBindingNoRoutesOnController.ParameterInMultipleRoutes);
+            var parameter = GetParameterModel(typeof(ParameterBindingNoRoutesOnController), actionName);
+            var provider = GetProvider();
+
+            // Act
+            var result = provider.InferBindingSourceForParameter(parameter);
+
+            // Assert
+            Assert.Same(BindingSource.Path, result);
+        }
+
+        [Fact]
+        public void InferBindingSourceForParameter_DoesNotReturnPath_IfNeitherActionNorControllerHasTemplate()
+        {
+            // Arrange
+            var actionName = nameof(ParameterBindingNoRoutesOnController.NoRouteTemplate);
+            var parameter = GetParameterModel(typeof(ParameterBindingNoRoutesOnController), actionName);
+            var provider = GetProvider();
+
+            // Act
+            var result = provider.InferBindingSourceForParameter(parameter);
+
+            // Assert
+            Assert.Same(BindingSource.Query, result);
+        }
+
+        [Fact]
+        public void InferBindingSourceForParameter_ReturnsBodyForComplexTypes()
+        {
+            // Arrange
+            var actionName = nameof(ParameterBindingController.ComplexTypeModel);
+            var parameter = GetParameterModel(typeof(ParameterBindingController), actionName);
+            var provider = GetProvider();
+
+            // Act
+            var result = provider.InferBindingSourceForParameter(parameter);
+
+            // Assert
+            Assert.Same(BindingSource.Body, result);
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_DoesNotInferBindingSourceForParametersWithBindingInfo()
+        {
+            // Arrange
+            var actionName = nameof(ParameterWithBindingInfo.Action);
+            var provider = GetProvider();
+            var context = GetContext(typeof(ParameterWithBindingInfo));
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controllerModel = Assert.Single(context.Result.Controllers);
+            var actionModel = Assert.Single(controllerModel.Actions, a => a.ActionName == actionName);
+            var parameterModel = Assert.Single(actionModel.Parameters);
+            Assert.NotNull(parameterModel.BindingInfo);
+            Assert.Same(BindingSource.Custom, parameterModel.BindingInfo.BindingSource);
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_Throws_IfMultipleParametersAreInferredAsBodyBound()
+        {
+            // Arrange
+            var expected =
+$@"Action '{typeof(ControllerWithMultipleInferredFromBodyParameters).FullName}.{nameof(ControllerWithMultipleInferredFromBodyParameters.Action)} ({typeof(ControllerWithMultipleInferredFromBodyParameters).Assembly.GetName().Name})' " +
+"has more than one parameter that was specified or inferred as bound from request body. Only one parameter per action may be bound from body. Inspect the following parameters, and use 'FromQueryAttribute' to specify bound from query, 'FromRouteAttribute' to specify bound from route, and 'FromBodyAttribute' for parameters to be bound from body:" +
+Environment.NewLine + "TestModel a" +
+Environment.NewLine + "Car b";
+
+            var context = GetContext(typeof(ControllerWithMultipleInferredFromBodyParameters));
+            var provider = GetProvider();
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => provider.OnProvidersExecuting(context));
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_Throws_IfMultipleParametersAreInferredOrSpecifiedAsBodyBound()
+        {
+            // Arrange
+            var expected =
+$@"Action '{typeof(ControllerWithMultipleInferredOrSpecifiedFromBodyParameters).FullName}.{nameof(ControllerWithMultipleInferredOrSpecifiedFromBodyParameters.Action)} ({typeof(ControllerWithMultipleInferredOrSpecifiedFromBodyParameters).Assembly.GetName().Name})' " +
+"has more than one parameter that was specified or inferred as bound from request body. Only one parameter per action may be bound from body. Inspect the following parameters, and use 'FromQueryAttribute' to specify bound from query, 'FromRouteAttribute' to specify bound from route, and 'FromBodyAttribute' for parameters to be bound from body:" +
+Environment.NewLine + "TestModel a" +
+Environment.NewLine + "int b";
+
+            var context = GetContext(typeof(ControllerWithMultipleInferredOrSpecifiedFromBodyParameters));
+            var provider = GetProvider();
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => provider.OnProvidersExecuting(context));
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_Throws_IfMultipleParametersAreFromBody()
+        {
+            // Arrange
+            var expected =
+$@"Action '{typeof(ControllerWithMultipleFromBodyParameters).FullName}.{nameof(ControllerWithMultipleFromBodyParameters.Action)} ({typeof(ControllerWithMultipleFromBodyParameters).Assembly.GetName().Name})' " +
+"has more than one parameter that was specified or inferred as bound from request body. Only one parameter per action may be bound from body. Inspect the following parameters, and use 'FromQueryAttribute' to specify bound from query, 'FromRouteAttribute' to specify bound from route, and 'FromBodyAttribute' for parameters to be bound from body:" +
+Environment.NewLine + "decimal a" +
+Environment.NewLine + "int b";
+
+            var context = GetContext(typeof(ControllerWithMultipleFromBodyParameters));
+            var provider = GetProvider();
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => provider.OnProvidersExecuting(context));
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_PreservesBindingInfo_WhenInferringFor_ParameterWithModelBinder_AndExplicitName()
+        {
+            // Arrange
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var actionName = nameof(ModelBinderOnParameterController.ModelBinderAttributeWithExplicitModelName);
+            var context = GetContext(typeof(ModelBinderOnParameterController), modelMetadataProvider);
+            var provider = GetProvider();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controller.Actions, a => a.ActionName == actionName);
+            var parameter = Assert.Single(action.Parameters);
+
+            var bindingInfo = parameter.BindingInfo;
+            Assert.NotNull(bindingInfo);
+            Assert.Same(BindingSource.Query, bindingInfo.BindingSource);
+            Assert.Equal("top", bindingInfo.BinderModelName);
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_PreservesBindingInfo_WhenInferringFor_ParameterWithModelBinderType()
+        {
+            // Arrange
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var actionName = nameof(ModelBinderOnParameterController.ModelBinderType);
+            var context = GetContext(typeof(ModelBinderOnParameterController), modelMetadataProvider);
+            var provider = GetProvider();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controller.Actions, a => a.ActionName == actionName);
+            var parameter = Assert.Single(action.Parameters);
+
+            var bindingInfo = parameter.BindingInfo;
+            Assert.NotNull(bindingInfo);
+            Assert.Same(BindingSource.Custom, bindingInfo.BindingSource);
+            Assert.Null(bindingInfo.BinderModelName);
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_PreservesBindingInfo_WhenInferringFor_ParameterWithModelBinderType_AndExplicitModelName()
+        {
+            // Arrange
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var actionName = nameof(ModelBinderOnParameterController.ModelBinderTypeWithExplicitModelName);
+            var context = GetContext(typeof(ModelBinderOnParameterController), modelMetadataProvider);
+            var provider = GetProvider();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controller.Actions, a => a.ActionName == actionName);
+            var parameter = Assert.Single(action.Parameters);
+
+            var bindingInfo = parameter.BindingInfo;
+            Assert.NotNull(bindingInfo);
+            Assert.Same(BindingSource.Custom, bindingInfo.BindingSource);
+            Assert.Equal("foo", bindingInfo.BinderModelName);
+        }
+
+        [Fact]
+        public void PreservesBindingSourceInference_ForFromQueryParameter_WithDefaultName()
+        {
+            // Arrange
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var actionName = nameof(ParameterBindingController.FromQuery);
+            var context = GetContext(typeof(ParameterBindingController), modelMetadataProvider);
+            var provider = GetProvider();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controller.Actions, a => a.ActionName == actionName);
+            var parameter = Assert.Single(action.Parameters);
+
+            var bindingInfo = parameter.BindingInfo;
+            Assert.NotNull(bindingInfo);
+            Assert.Same(BindingSource.Query, bindingInfo.BindingSource);
+            Assert.Null(bindingInfo.BinderModelName);
+        }
+
+        [Fact]
+        public void PreservesBindingSourceInference_ForFromQueryParameter_WithCustomName()
+        {
+            // Arrange
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var actionName = nameof(ParameterBindingController.FromQueryWithCustomName);
+            var context = GetContext(typeof(ParameterBindingController), modelMetadataProvider);
+            var provider = GetProvider();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controller.Actions, a => a.ActionName == actionName);
+            var parameter = Assert.Single(action.Parameters);
+
+            var bindingInfo = parameter.BindingInfo;
+            Assert.NotNull(bindingInfo);
+            Assert.Same(BindingSource.Query, bindingInfo.BindingSource);
+            Assert.Equal("top", bindingInfo.BinderModelName);
+        }
+
+        [Fact]
+        public void PreservesBindingSourceInference_ForFromQueryParameterOnComplexType_WithDefaultName()
+        {
+            // Arrange
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var actionName = nameof(ParameterBindingController.FromQueryOnComplexType);
+            var context = GetContext(typeof(ParameterBindingController), modelMetadataProvider);
+            var provider = GetProvider();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controller.Actions, a => a.ActionName == actionName);
+            var parameter = Assert.Single(action.Parameters);
+
+            var bindingInfo = parameter.BindingInfo;
+            Assert.NotNull(bindingInfo);
+            Assert.Same(BindingSource.Query, bindingInfo.BindingSource);
+            Assert.Equal(string.Empty, bindingInfo.BinderModelName);
+        }
+
+        [Fact]
+        public void PreservesBindingSourceInference_ForFromQueryParameterOnComplexType_WithCustomName()
+        {
+            // Arrange
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var actionName = nameof(ParameterBindingController.FromQueryOnComplexTypeWithCustomName);
+            var context = GetContext(typeof(ParameterBindingController), modelMetadataProvider);
+            var provider = GetProvider();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controller.Actions, a => a.ActionName == actionName);
+            var parameter = Assert.Single(action.Parameters);
+
+            var bindingInfo = parameter.BindingInfo;
+            Assert.NotNull(bindingInfo);
+            Assert.Same(BindingSource.Query, bindingInfo.BindingSource);
+            Assert.Equal("gps", bindingInfo.BinderModelName);
+        }
+
+        [Fact]
+        public void PreservesBindingSourceInference_ForFromQueryParameterOnCollectionType()
+        {
+            // Arrange
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var actionName = nameof(ParameterBindingController.FromQueryOnCollectionType);
+            var context = GetContext(typeof(ParameterBindingController), modelMetadataProvider);
+            var provider = GetProvider();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controller.Actions, a => a.ActionName == actionName);
+            var parameter = Assert.Single(action.Parameters);
+
+            var bindingInfo = parameter.BindingInfo;
+            Assert.NotNull(bindingInfo);
+            Assert.Same(BindingSource.Query, bindingInfo.BindingSource);
+            Assert.Null(bindingInfo.BinderModelName);
+        }
+
+        [Fact]
+        public void PreservesBindingSourceInference_ForFromQueryOnArrayType()
+        {
+            // Arrange
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var actionName = nameof(ParameterBindingController.FromQueryOnArrayType);
+            var context = GetContext(typeof(ParameterBindingController), modelMetadataProvider);
+            var provider = GetProvider();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controller.Actions, a => a.ActionName == actionName);
+            var parameter = Assert.Single(action.Parameters);
+
+            var bindingInfo = parameter.BindingInfo;
+            Assert.NotNull(bindingInfo);
+            Assert.Same(BindingSource.Query, bindingInfo.BindingSource);
+            Assert.Null(bindingInfo.BinderModelName);
+        }
+
+        [Fact]
+        public void PreservesBindingSourceInference_FromQueryOnArrayTypeWithCustomName()
+        {
+            // Arrange
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var actionName = nameof(ParameterBindingController.FromQueryOnArrayTypeWithCustomName);
+            var context = GetContext(typeof(ParameterBindingController), modelMetadataProvider);
+            var provider = GetProvider();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controller.Actions, a => a.ActionName == actionName);
+            var parameter = Assert.Single(action.Parameters);
+
+            var bindingInfo = parameter.BindingInfo;
+            Assert.NotNull(bindingInfo);
+            Assert.Same(BindingSource.Query, bindingInfo.BindingSource);
+            Assert.Equal("ids", bindingInfo.BinderModelName);
+        }
+
+        [Fact]
+        public void PreservesBindingSourceInference_ForFromRouteParameter_WithDefaultName()
+        {
+            // Arrange
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var actionName = nameof(ParameterBindingController.FromRoute);
+            var context = GetContext(typeof(ParameterBindingController), modelMetadataProvider);
+            var provider = GetProvider();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controller.Actions, a => a.ActionName == actionName);
+            var parameter = Assert.Single(action.Parameters);
+
+            var bindingInfo = parameter.BindingInfo;
+            Assert.NotNull(bindingInfo);
+            Assert.Same(BindingSource.Path, bindingInfo.BindingSource);
+            Assert.Null(bindingInfo.BinderModelName);
+        }
+
+        [Fact]
+        public void PreservesBindingSourceInference_ForFromRouteParameter_WithCustomName()
+        {
+            // Arrange
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var actionName = nameof(ParameterBindingController.FromRouteWithCustomName);
+            var context = GetContext(typeof(ParameterBindingController), modelMetadataProvider);
+            var provider = GetProvider();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controller.Actions, a => a.ActionName == actionName);
+            var parameter = Assert.Single(action.Parameters);
+
+            var bindingInfo = parameter.BindingInfo;
+            Assert.NotNull(bindingInfo);
+            Assert.Same(BindingSource.Path, bindingInfo.BindingSource);
+            Assert.Equal("top", bindingInfo.BinderModelName);
+        }
+
+        [Fact]
+        public void PreservesBindingSourceInference_ForFromRouteParameterOnComplexType_WithDefaultName()
+        {
+            // Arrange
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var actionName = nameof(ParameterBindingController.FromRouteOnComplexType);
+            var context = GetContext(typeof(ParameterBindingController), modelMetadataProvider);
+            var provider = GetProvider();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controller.Actions, a => a.ActionName == actionName);
+            var parameter = Assert.Single(action.Parameters);
+
+            var bindingInfo = parameter.BindingInfo;
+            Assert.NotNull(bindingInfo);
+            Assert.Same(BindingSource.Path, bindingInfo.BindingSource);
+            Assert.Equal(string.Empty, bindingInfo.BinderModelName);
+        }
+
+        [Fact]
+        public void PreservesBindingSourceInference_ForFromRouteParameterOnComplexType_WithCustomName()
+        {
+            // Arrange
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var actionName = nameof(ParameterBindingController.FromRouteOnComplexTypeWithCustomName);
+            var context = GetContext(typeof(ParameterBindingController), modelMetadataProvider);
+            var provider = GetProvider();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controller.Actions, a => a.ActionName == actionName);
+            var parameter = Assert.Single(action.Parameters);
+
+            var bindingInfo = parameter.BindingInfo;
+            Assert.NotNull(bindingInfo);
+            Assert.Same(BindingSource.Path, bindingInfo.BindingSource);
+            Assert.Equal("gps", bindingInfo.BinderModelName);
+        }
+
+        [Fact]
+        public void PreservesBindingSourceInference_ForParameterWithRequestPredicateAndPropertyFilterProvider()
+        {
+            // Arrange
+            var expectedPredicate = CustomRequestPredicateAndPropertyFilterProviderAttribute.RequestPredicateStatic;
+            var expectedPropertyFilter = CustomRequestPredicateAndPropertyFilterProviderAttribute.PropertyFilterStatic;
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var actionName = nameof(ParameterBindingController.ParameterWithRequestPredicateProvider);
+            var context = GetContext(typeof(ParameterBindingController), modelMetadataProvider);
+            var provider = GetProvider();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controller.Actions, a => a.ActionName == actionName);
+            var parameter = Assert.Single(action.Parameters);
+
+            var bindingInfo = parameter.BindingInfo;
+            Assert.NotNull(bindingInfo);
+            Assert.Same(BindingSource.Query, bindingInfo.BindingSource);
+            Assert.Same(expectedPredicate, bindingInfo.RequestPredicate);
+            Assert.Same(expectedPropertyFilter, bindingInfo.PropertyFilterProvider.PropertyFilter);
+            Assert.Null(bindingInfo.BinderModelName);
+        }
+
+        [Fact]
+        public void InferParameterBindingSources_SetsCorrectBindingSourceForComplexTypesWithCancellationToken()
+        {
+            // Arrange
+            var actionName = nameof(ParameterBindingController.ComplexTypeModelWithCancellationToken);
+
+            // Use the default set of ModelMetadataProviders so we get metadata details for CancellationToken. 
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var context = GetContext(typeof(ParameterBindingController), modelMetadataProvider);
+            var controllerModel = Assert.Single(context.Result.Controllers);
+            var actionModel = Assert.Single(controllerModel.Actions, m => m.ActionName == actionName);
+
+            var provider = GetProvider();
+
+            // Act
+            provider.InferParameterBindingSources(actionModel);
+
+            // Assert
+            var model = GetParameterModel<TestModel>(actionModel);
+            Assert.Same(BindingSource.Body, model.BindingInfo.BindingSource);
+
+            var cancellationToken = GetParameterModel<CancellationToken>(actionModel);
+            Assert.Same(BindingSource.Special, cancellationToken.BindingInfo.BindingSource);
+        }
+
+        [Fact]
+        public void InferBindingSourceForParameter_ReturnsBodyForSimpleTypes()
+        {
+            // Arrange
+            var actionName = nameof(ParameterBindingController.SimpleTypeModel);
+            var parameter = GetParameterModel(typeof(ParameterBindingController), actionName);
+            var provider = GetProvider();
+
+            // Act
+            var result = provider.InferBindingSourceForParameter(parameter);
+
+            // Assert
+            Assert.Same(BindingSource.Query, result);
+        }
+
+        [Fact]
+        public void InferBoundPropertyModelPrefixes_SetsModelPrefix_ForComplexTypeFromValueProvider()
+        {
+            // Arrange
+            var controller = GetControllerModel(typeof(ControllerWithBoundProperty));
+
+            var provider = GetProvider();
+
+            // Act
+            provider.InferBoundPropertyModelPrefixes(controller);
+
+            // Assert
+            var property = Assert.Single(controller.ControllerProperties);
+            Assert.Equal(string.Empty, property.BindingInfo.BinderModelName);
+        }
+
+        [Fact]
+        public void InferBoundPropertyModelPrefixes_SetsModelPrefix_ForCollectionTypeFromValueProvider()
+        {
+            // Arrange
+            var controller = GetControllerModel(typeof(ControllerWithBoundCollectionProperty));
+
+            var provider = GetProvider();
+
+            // Act
+            provider.InferBoundPropertyModelPrefixes(controller);
+
+            // Assert
+            var property = Assert.Single(controller.ControllerProperties);
+            Assert.Null(property.BindingInfo.BinderModelName);
+        }
+
+        [Fact]
+        public void InferParameterModelPrefixes_SetsModelPrefix_ForComplexTypeFromValueProvider()
+        {
+            // Arrange
+            var action = GetActionModel(typeof(ControllerWithBoundProperty), nameof(ControllerWithBoundProperty.SomeAction));
+
+            var provider = GetProvider();
+
+            // Act
+            provider.InferParameterModelPrefixes(action);
+
+            // Assert
+            var parameter = Assert.Single(action.Parameters);
+            Assert.Equal(string.Empty, parameter.BindingInfo.BinderModelName);
+        }
+
+        [Fact]
+        public void AddMultipartFormDataConsumesAttribute_NoOpsIfBehaviorIsDisabled()
+        {
+            // Arrange
+            var actionName = nameof(ParameterBindingController.FromFormParameter);
+            var action = GetActionModel(typeof(ParameterBindingController), actionName);
+            var options = new ApiBehaviorOptions
+            {
+                SuppressConsumesConstraintForFormFileParameters = true,
+                InvalidModelStateResponseFactory = _ => null,
+            };
+            var provider = GetProvider(options);
+
+            // Act
+            provider.AddMultipartFormDataConsumesAttribute(action);
+
+            // Assert
+            Assert.Empty(action.Filters);
+        }
+
+        [Fact]
+        public void AddMultipartFormDataConsumesAttribute_NoOpsIfConsumesConstraintIsAlreadyPresent()
+        {
+            // Arrange
+            var actionName = nameof(ParameterBindingController.ActionWithConsumesAttribute);
+            var action = GetActionModel(typeof(ParameterBindingController), actionName);
+            var options = new ApiBehaviorOptions
+            {
+                SuppressConsumesConstraintForFormFileParameters = true,
+                InvalidModelStateResponseFactory = _ => null,
+            };
+            var provider = GetProvider(options);
+
+            // Act
+            provider.AddMultipartFormDataConsumesAttribute(action);
+
+            // Assert
+            var attribute = Assert.Single(action.Filters);
+            var consumesAttribute = Assert.IsType<ConsumesAttribute>(attribute);
+            Assert.Equal("application/json", Assert.Single(consumesAttribute.ContentTypes));
+        }
+
+        [Fact]
+        public void AddMultipartFormDataConsumesAttribute_AddsConsumesAttribute_WhenActionHasFromFormFileParameter()
+        {
+            // Arrange
+            var actionName = nameof(ParameterBindingController.FormFileParameter);
+            var action = GetActionModel(typeof(ParameterBindingController), actionName);
+            action.Parameters[0].BindingInfo = new BindingInfo
+            {
+                BindingSource = BindingSource.FormFile,
+            };
+            var provider = GetProvider();
+
+            // Act
+            provider.AddMultipartFormDataConsumesAttribute(action);
+
+            // Assert
+            var attribute = Assert.Single(action.Filters);
+            var consumesAttribute = Assert.IsType<ConsumesAttribute>(attribute);
+            Assert.Equal("multipart/form-data", Assert.Single(consumesAttribute.ContentTypes));
+        }
+
+        private static ApiBehaviorApplicationModelProvider GetProvider(
+            ApiBehaviorOptions options = null,
+            IModelMetadataProvider modelMetadataProvider = null)
+        {
+            options = options ?? new ApiBehaviorOptions
+            {
+                InvalidModelStateResponseFactory = _ => null,
+            };
+            var optionsAccessor = Options.Create(options);
+
+            var loggerFactory = NullLoggerFactory.Instance;
+            modelMetadataProvider = modelMetadataProvider ?? new EmptyModelMetadataProvider();
+            return new ApiBehaviorApplicationModelProvider(optionsAccessor, modelMetadataProvider, loggerFactory);
+        }
+
+        private static ApplicationModelProviderContext GetContext(
+            Type type,
+            IModelMetadataProvider modelMetadataProvider = null)
+        {
+            var context = new ApplicationModelProviderContext(new[] { type.GetTypeInfo() });
+            var mvcOptions = Options.Create(new MvcOptions { AllowValidatingTopLevelNodes = true });
+            modelMetadataProvider = modelMetadataProvider ?? new EmptyModelMetadataProvider();
+            var provider = new DefaultApplicationModelProvider(mvcOptions, modelMetadataProvider);
+            provider.OnProvidersExecuting(context);
+
+            return context;
+        }
+
+        private static ControllerModel GetControllerModel(Type controllerType)
+        {
+            var context = GetContext(controllerType);
+            return Assert.Single(context.Result.Controllers);
+        }
+
+        private static ActionModel GetActionModel(Type controllerType, string actionName)
+        {
+            var context = GetContext(controllerType);
+            var controller = Assert.Single(context.Result.Controllers);
+            return Assert.Single(controller.Actions, m => m.ActionName == actionName);
+        }
+
+        private static ParameterModel GetParameterModel(Type controllerType, string actionName)
+        {
+            var action = GetActionModel(controllerType, actionName);
+            return Assert.Single(action.Parameters);
+        }
+
+        private static ParameterModel GetParameterModel<T>(ActionModel action)
+        {
+            return Assert.Single(action.Parameters.Where(x => typeof(T).IsAssignableFrom(x.ParameterType)));
+        }
+
+        [ApiController]
+        [Route("TestApi")]
+        private class TestApiController : Controller
+        {
+            [HttpGet]
+            public IActionResult TestAction() => null;
+        }
+
+        private class SimpleController : Controller
+        {
+            public IActionResult ActionWithoutFilter() => null;
+
+            [TestApiBehavior]
+            [HttpGet("/Simple/ActionWithFilter")]
+            public IActionResult ActionWithFilter() => null;
+        }
+
+        [ApiController]
+        private class ActionsWithoutAttributeRouting
+        {
+            public IActionResult Index() => null;
+        }
+
+        [AttributeUsage(AttributeTargets.Method)]
+        private class TestApiBehavior : Attribute, IApiBehaviorMetadata
+        {
+        }
+
+        [ApiController]
+        [Route("[controller]/[action]")]
+        private class ParameterBindingController
+        {
+            [HttpGet("{parameter}")]
+            public IActionResult ActionWithBoundParameter([FromBody] object parameter) => null;
+
+            [HttpGet("{id}")]
+            public IActionResult SimpleRouteToken(int id) => null;
+
+            [HttpPost("optional/{id?}")]
+            public IActionResult OptionalRouteToken(int id) => null;
+
+            [HttpDelete("delete-by-status/{status:int?}")]
+            public IActionResult ConstrainedRouteToken(object status) => null;
+
+            [HttpPut("/absolute-route/{status:int}")]
+            public IActionResult AbsoluteRoute(object status) => null;
+
+            [HttpPost("multiple/{id}")]
+            [HttpPut("multiple/{id}")]
+            public IActionResult ParameterInMultipleRoutes(int id) => null;
+
+            [HttpPatch("patchroute")]
+            [HttpPost("multiple/{id}")]
+            [HttpPut("multiple/{id}")]
+            public IActionResult ParameterNotInAllRoutes(int id) => null;
+
+            [HttpPut("put-action/{id}")]
+            public IActionResult ComplexTypeModel(TestModel model) => null;
+
+            [HttpPut("put-action/{id}")]
+            public IActionResult SimpleTypeModel(ConvertibleFromString model) => null;
+
+            [HttpPost("form-file")]
+            public IActionResult FormFileParameter(IFormFile formFile) => null;
+
+            [HttpPost("form-file-collection")]
+            public IActionResult FormFileCollectionParameter(IFormFileCollection formFiles) => null;
+
+            [HttpPost("form-file-sequence")]
+            public IActionResult FormFileSequenceParameter(IFormFile[] formFiles) => null;
+
+            [HttpPost]
+            public IActionResult FromFormParameter([FromForm] string parameter) => null;
+
+            [HttpPost]
+            [Consumes("application/json")]
+            public IActionResult ActionWithConsumesAttribute([FromForm] string parameter) => null;
+
+            [HttpPut("cancellation")]
+            public IActionResult ComplexTypeModelWithCancellationToken(TestModel model, CancellationToken cancellationToken) => null;
+
+            [HttpGet("parameter-with-model-binder-attribute")]
+            public IActionResult ModelBinderAttribute([ModelBinder(Name = "top")] int value) => null;
+
+            [HttpGet("parameter-with-fromquery")]
+            public IActionResult FromQuery([FromQuery] int value) => null;
+
+            [HttpGet("parameter-with-fromquery-and-customname")]
+            public IActionResult FromQueryWithCustomName([FromQuery(Name = "top")] int value) => null;
+
+            [HttpGet("parameter-with-fromquery-on-complextype")]
+            public IActionResult FromQueryOnComplexType([FromQuery] GpsCoordinates gpsCoordinates) => null;
+
+            [HttpGet("parameter-with-fromquery-on-complextype-and-customname")]
+            public IActionResult FromQueryOnComplexTypeWithCustomName([FromQuery(Name = "gps")] GpsCoordinates gpsCoordinates) => null;
+
+            [HttpGet("parameter-with-fromquery-on-collection-type")]
+            public IActionResult FromQueryOnCollectionType([FromQuery] ICollection<int> value) => null;
+
+            [HttpGet("parameter-with-fromquery-on-array-type")]
+            public IActionResult FromQueryOnArrayType([FromQuery] int[] value) => null;
+
+            [HttpGet("parameter-with-fromquery-on-array-type-customname")]
+            public IActionResult FromQueryOnArrayTypeWithCustomName([FromQuery(Name = "ids")] int[] value) => null;
+
+            [HttpGet("parameter-with-fromroute")]
+            public IActionResult FromRoute([FromRoute] int value) => null;
+
+            [HttpGet("parameter-with-fromroute-and-customname")]
+            public IActionResult FromRouteWithCustomName([FromRoute(Name = "top")] int value) => null;
+
+            [HttpGet("parameter-with-fromroute-on-complextype")]
+            public IActionResult FromRouteOnComplexType([FromRoute] GpsCoordinates gpsCoordinates) => null;
+
+            [HttpGet("parameter-with-fromroute-on-complextype-and-customname")]
+            public IActionResult FromRouteOnComplexTypeWithCustomName([FromRoute(Name = "gps")] GpsCoordinates gpsCoordinates) => null;
+
+            [HttpGet]
+            public IActionResult ParameterWithRequestPredicateProvider([CustomRequestPredicateAndPropertyFilterProvider] int value) => null;
+        }
+
+        private class CustomRequestPredicateAndPropertyFilterProviderAttribute : Attribute, IRequestPredicateProvider, IPropertyFilterProvider
+        {
+            public static Func<ActionContext, bool> RequestPredicateStatic => (c) => true;
+            public static Func<ModelMetadata, bool> PropertyFilterStatic => (c) => true;
+
+            public Func<ActionContext, bool> RequestPredicate => RequestPredicateStatic;
+
+            public Func<ModelMetadata, bool> PropertyFilter => PropertyFilterStatic;
+        }
+
+        [ApiController]
+        [Route("[controller]/[action]")]
+        private class ModelBinderOnParameterController
+        {
+            [HttpGet]
+            public IActionResult ModelBinderAttributeWithExplicitModelName([ModelBinder(Name = "top")] int value) => null;
+
+            [HttpGet]
+            public IActionResult ModelBinderType([ModelBinder(typeof(TestModelBinder))] string name) => null;
+
+            [HttpGet]
+            public IActionResult ModelBinderTypeWithExplicitModelName([ModelBinder(typeof(TestModelBinder), Name = "foo")] string name) => null;
+        }
+
+        [ApiController]
+        [Route("/route1/[controller]/[action]/{id}")]
+        [Route("/route2/[controller]/[action]/{id?}")]
+        private class ParameterInController
+        {
+            [HttpGet]
+            public IActionResult ActionWithoutRoute(int id) => null;
+
+            [HttpGet("stuff/{status}")]
+            public IActionResult ActionWithRoute(int id) => null;
+
+            [HttpGet("/absolute-route")]
+            public IActionResult AbsoluteRoute(int id) => null;
+
+            [HttpPut]
+            [HttpPost("stuff/{status}")]
+            public IActionResult MultipleRoute(int id) => null;
+
+            [HttpPut]
+            [HttpPost("~/stuff/{status}")]
+            public IActionResult MultipleRouteWithOverride(int id) => null;
+        }
+
+        [ApiController]
+        private class ParameterBindingNoRoutesOnController
+        {
+            [HttpGet("{parameter}")]
+            public IActionResult SimpleRoute(int parameter) => null;
+
+            [HttpGet]
+            public IActionResult NoRouteTemplate(int id) => null;
+
+            [HttpPost("multiple/{id}")]
+            [HttpPut("multiple/{id}")]
+            public IActionResult ParameterInMultipleRoutes(int id) => null;
+        }
+
+        private class TestModel { }
+
+        [TypeConverter(typeof(ConvertibleFromStringConverter))]
+        private class ConvertibleFromString { }
+
+        private class ConvertibleFromStringConverter : TypeConverter
+        {
+            public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+                => sourceType == typeof(string);
+        }
+
+        [ApiController]
+        private class ControllerWithBoundProperty
+        {
+            [FromQuery]
+            public TestModel TestProperty { get; set; }
+
+            public IActionResult SomeAction([FromQuery] TestModel test) => null;
+        }
+
+        [ApiController]
+        private class ControllerWithBoundCollectionProperty
+        {
+            [FromQuery]
+            public List<int> TestProperty { get; set; }
+
+            public IActionResult SomeAction([FromQuery] List<int> test) => null;
+        }
+
+        private class Car { }
+
+        [ApiController]
+        private class ControllerWithMultipleInferredFromBodyParameters
+        {
+            [HttpGet("test")]
+            public IActionResult Action(TestModel a, Car b) => null;
+        }
+
+        [ApiController]
+        private class ControllerWithMultipleInferredOrSpecifiedFromBodyParameters
+        {
+            [HttpGet("test")]
+            public IActionResult Action(TestModel a, [FromBody] int b) => null;
+        }
+
+        [ApiController]
+        private class ControllerWithMultipleFromBodyParameters
+        {
+            [HttpGet("test")]
+            public IActionResult Action([FromBody] decimal a, [FromBody] int b) => null;
+        }
+
+        [ApiController]
+        private class ParameterWithBindingInfo
+        {
+            [HttpGet("test")]
+            public IActionResult Action([ModelBinder(typeof(object))] Car car) => null;
+        }
+
+        private class GpsCoordinates
+        {
+            public long Latitude { get; set; }
+            public long Longitude { get; set; }
+        }
+
+        private class TestModelBinder : IModelBinder
+        {
+            public Task BindModelAsync(ModelBindingContext bindingContext)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRouteTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRouteTest.cs
new file mode 100644
index 0000000000..a11448fe7e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRouteTest.cs
@@ -0,0 +1,841 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Routing.Template;
+using Microsoft.AspNetCore.Routing.Tree;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.ObjectPool;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class AttributeRouteTest
+    {
+        private static readonly RequestDelegate NullHandler = (c) => Task.FromResult(0);
+
+        // This test verifies that AttributeRoute can respond to changes in the AD collection. It does this
+        // by running a successful request, then removing that action and verifying the next route isn't
+        // successful.
+        [Fact]
+        public async Task AttributeRoute_UsesUpdatedActionDescriptors()
+        {
+            // Arrange
+            ActionDescriptor selected = null;
+
+            var actions = new List<ActionDescriptor>()
+            {
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo()
+                    {
+                        Template = "api/Blog/{key1}"
+                    },
+                },
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo()
+                    {
+                        Template = "api/Store/Buy/{key2}"
+                    },
+                },
+            };
+
+
+            Func<ActionDescriptor[], IRouter> handlerFactory = (_) =>
+            {
+                var handler = new Mock<IRouter>();
+                handler
+                    .Setup(r => r.RouteAsync(It.IsAny<RouteContext>()))
+                    .Returns<RouteContext>(routeContext =>
+                    {
+                        if (routeContext.RouteData.Values.ContainsKey("key1"))
+                        {
+                            selected = actions[0];
+                        }
+                        else if (routeContext.RouteData.Values.ContainsKey("key2"))
+                        {
+                            selected = actions[1];
+                        }
+
+                        routeContext.Handler = (c) => Task.CompletedTask;
+
+                        return Task.CompletedTask;
+
+                    });
+                return handler.Object;
+            };
+
+            var actionDescriptorProvider = CreateActionDescriptorProvider(actions);
+            var route = CreateRoute(handlerFactory, actionDescriptorProvider.Object);
+
+            var requestServices = new Mock<IServiceProvider>(MockBehavior.Strict);
+            requestServices
+                .Setup(s => s.GetService(typeof(ILoggerFactory)))
+                .Returns(NullLoggerFactory.Instance);
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Path = new PathString("/api/Store/Buy/5");
+            httpContext.RequestServices = requestServices.Object;
+
+            var context = new RouteContext(httpContext);
+
+            // Act 1
+            await route.RouteAsync(context);
+
+            // Assert 1
+            Assert.NotNull(context.Handler);
+            Assert.Equal("5", context.RouteData.Values["key2"]);
+            Assert.Same(actions[1], selected);
+
+            // Arrange 2 - remove the action and update the collection
+            selected = null;
+            actions.RemoveAt(1);
+            actionDescriptorProvider
+                .SetupGet(ad => ad.ActionDescriptors)
+                .Returns(new ActionDescriptorCollection(actions, version: 2));
+
+            context = new RouteContext(httpContext);
+
+            // Act 2
+            await route.RouteAsync(context);
+
+            // Assert 2
+            Assert.Null(context.Handler);
+            Assert.Empty(context.RouteData.Values);
+            Assert.Null(selected);
+        }
+
+        [Fact]
+        public void AttributeRoute_GetEntries_CreatesOutboundEntry()
+        {
+            // Arrange
+            var actions = new List<ActionDescriptor>()
+            {
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo()
+                    {
+                        Template = "api/Blog/{id}",
+                        Name = "BLOG_INDEX",
+                        Order = 17,
+                    },
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Blog" },
+                        { "action", "Index" },
+                    },
+                },
+            };
+
+            var builder = CreateBuilder();
+            var actionDescriptorProvider = CreateActionDescriptorProvider(actions);
+            var route = CreateRoute(CreateHandler().Object, actionDescriptorProvider.Object);
+
+            // Act
+            route.AddEntries(builder, actionDescriptorProvider.Object.ActionDescriptors);
+
+            // Assert
+            Assert.Collection(
+                builder.OutboundEntries,
+                e =>
+                {
+                    Assert.Empty(e.Constraints);
+                    Assert.Empty(e.Defaults);
+                    Assert.Equal(RoutePrecedence.ComputeOutbound(e.RouteTemplate), e.Precedence);
+                    Assert.Equal("BLOG_INDEX", e.RouteName);
+                    Assert.Equal(17, e.Order);
+                    Assert.Equal(ToRouteValueDictionary(actions[0].RouteValues), e.RequiredLinkValues);
+                    Assert.Equal("api/Blog/{id}", e.RouteTemplate.TemplateText);
+                });
+        }
+
+        [Fact]
+        public void AttributeRoute_GetEntries_CreatesOutboundEntry_WithConstraint()
+        {
+            // Arrange
+            var actions = new List<ActionDescriptor>()
+            {
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo()
+                    {
+                        Template = "api/Blog/{id:int}",
+                        Name = "BLOG_INDEX",
+                        Order = 17,
+                    },
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Blog" },
+                        { "action", "Index" },
+                    },
+                },
+            };
+
+            var builder = CreateBuilder();
+            var actionDescriptorProvider = CreateActionDescriptorProvider(actions);
+            var route = CreateRoute(CreateHandler().Object, actionDescriptorProvider.Object);
+
+            // Act
+            route.AddEntries(builder, actionDescriptorProvider.Object.ActionDescriptors);
+
+            // Assert
+            Assert.Collection(
+                builder.OutboundEntries,
+                e =>
+                {
+                    Assert.Single(e.Constraints, kvp => kvp.Key == "id");
+                    Assert.Empty(e.Defaults);
+                    Assert.Equal(RoutePrecedence.ComputeOutbound(e.RouteTemplate), e.Precedence);
+                    Assert.Equal("BLOG_INDEX", e.RouteName);
+                    Assert.Equal(17, e.Order);
+                    Assert.Equal(ToRouteValueDictionary(actions[0].RouteValues), e.RequiredLinkValues);
+                    Assert.Equal("api/Blog/{id:int}", e.RouteTemplate.TemplateText);
+                });
+        }
+
+        [Fact]
+        public void AttributeRoute_GetEntries_CreatesOutboundEntry_WithDefault()
+        {
+            // Arrange
+            var actions = new List<ActionDescriptor>()
+            {
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo()
+                    {
+                        Template = "api/Blog/{*slug=hello}",
+                        Name = "BLOG_INDEX",
+                        Order = 17,
+                    },
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Blog" },
+                        { "action", "Index" },
+                    },
+                },
+            };
+
+            var builder = CreateBuilder();
+            var actionDescriptorProvider = CreateActionDescriptorProvider(actions);
+            var route = CreateRoute(CreateHandler().Object, actionDescriptorProvider.Object);
+
+            // Act
+            route.AddEntries(builder, actionDescriptorProvider.Object.ActionDescriptors);
+
+            // Assert
+            Assert.Collection(
+                builder.OutboundEntries,
+                e =>
+                {
+                    Assert.Empty(e.Constraints);
+                    Assert.Equal(new RouteValueDictionary(new { slug = "hello" }), e.Defaults);
+                    Assert.Equal(RoutePrecedence.ComputeOutbound(e.RouteTemplate), e.Precedence);
+                    Assert.Equal("BLOG_INDEX", e.RouteName);
+                    Assert.Equal(17, e.Order);
+                    Assert.Equal(ToRouteValueDictionary(actions[0].RouteValues), e.RequiredLinkValues);
+                    Assert.Equal("api/Blog/{*slug=hello}", e.RouteTemplate.TemplateText);
+                });
+        }
+
+        // These actions seem like duplicates, but this is a real case that can happen where two different
+        // actions define the same route info. Link generation happens based on the action name + controller
+        // name.
+        [Fact]
+        public void AttributeRoute_GetEntries_CreatesOutboundEntry_ForEachAction()
+        {
+            // Arrange
+            var actions = new List<ActionDescriptor>()
+            {
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo()
+                    {
+                        Template = "api/Blog/{id}",
+                        Name = "BLOG_INDEX",
+                        Order = 17,
+                    },
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Blog" },
+                        { "action", "Index" },
+                    },
+                },
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo()
+                    {
+                        Template = "api/Blog/{id}",
+                        Name = "BLOG_INDEX",
+                        Order = 17,
+                    },
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Blog" },
+                        { "action", "Index2" },
+                    },
+                },
+            };
+
+            var builder = CreateBuilder();
+            var actionDescriptorProvider = CreateActionDescriptorProvider(actions);
+            var route = CreateRoute(CreateHandler().Object, actionDescriptorProvider.Object);
+
+            // Act
+            route.AddEntries(builder, actionDescriptorProvider.Object.ActionDescriptors);
+
+            // Assert
+            Assert.Collection(
+                builder.OutboundEntries,
+                e =>
+                {
+                    Assert.Empty(e.Constraints);
+                    Assert.Empty(e.Defaults);
+                    Assert.Equal(RoutePrecedence.ComputeOutbound(e.RouteTemplate), e.Precedence);
+                    Assert.Equal("BLOG_INDEX", e.RouteName);
+                    Assert.Equal(17, e.Order);
+                    Assert.Equal(ToRouteValueDictionary(actions[0].RouteValues), e.RequiredLinkValues);
+                    Assert.Equal("api/Blog/{id}", e.RouteTemplate.TemplateText);
+                },
+                e =>
+                {
+                    Assert.Empty(e.Constraints);
+                    Assert.Empty(e.Defaults);
+                    Assert.Equal(RoutePrecedence.ComputeOutbound(e.RouteTemplate), e.Precedence);
+                    Assert.Equal("BLOG_INDEX", e.RouteName);
+                    Assert.Equal(17, e.Order);
+                    Assert.Equal(ToRouteValueDictionary(actions[1].RouteValues), e.RequiredLinkValues);
+                    Assert.Equal("api/Blog/{id}", e.RouteTemplate.TemplateText);
+                });
+        }
+
+        [Fact]
+        public void AttributeRoute_GetEntries_CreatesInboundEntry()
+        {
+            // Arrange
+            var actions = new List<ActionDescriptor>()
+            {
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo()
+                    {
+                        Template = "api/Blog/{id}",
+                        Name = "BLOG_INDEX",
+                        Order = 17,
+                    },
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Blog" },
+                        { "action", "Index" },
+                    },
+                },
+            };
+
+            var builder = CreateBuilder();
+            var actionDescriptorProvider = CreateActionDescriptorProvider(actions);
+            var route = CreateRoute(CreateHandler().Object, actionDescriptorProvider.Object);
+
+            // Act
+            route.AddEntries(builder, actionDescriptorProvider.Object.ActionDescriptors);
+
+            // Assert
+            Assert.Collection(
+                builder.InboundEntries,
+                e =>
+                {
+                    Assert.Empty(e.Constraints);
+                    Assert.Equal(17, e.Order);
+                    Assert.Equal(RoutePrecedence.ComputeInbound(e.RouteTemplate), e.Precedence);
+                    Assert.Equal("BLOG_INDEX", e.RouteName);
+                    Assert.Equal("api/Blog/{id}", e.RouteTemplate.TemplateText);
+                    Assert.Empty(e.Defaults);
+                });
+        }
+
+        [Fact]
+        public void AttributeRoute_GetEntries_CreatesInboundEntry_WithConstraint()
+        {
+            // Arrange
+            var actions = new List<ActionDescriptor>()
+            {
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo()
+                    {
+                        Template = "api/Blog/{id:int}",
+                        Name = "BLOG_INDEX",
+                        Order = 17,
+                    },
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Blog" },
+                        { "action", "Index" },
+                    },
+                },
+            };
+
+            var builder = CreateBuilder();
+            var actionDescriptorProvider = CreateActionDescriptorProvider(actions);
+            var route = CreateRoute(CreateHandler().Object, actionDescriptorProvider.Object);
+
+            // Act
+            route.AddEntries(builder, actionDescriptorProvider.Object.ActionDescriptors);
+
+            // Assert
+            Assert.Collection(
+                builder.InboundEntries,
+                e =>
+                {
+                    Assert.Single(e.Constraints, kvp => kvp.Key == "id");
+                    Assert.Equal(17, e.Order);
+                    Assert.Equal(RoutePrecedence.ComputeInbound(e.RouteTemplate), e.Precedence);
+                    Assert.Equal("BLOG_INDEX", e.RouteName);
+                    Assert.Equal("api/Blog/{id:int}", e.RouteTemplate.TemplateText);
+                    Assert.Empty(e.Defaults);
+                });
+        }
+
+        [Fact]
+        public void AttributeRoute_GetEntries_CreatesInboundEntry_WithDefault()
+        {
+            // Arrange
+            var actions = new List<ActionDescriptor>()
+            {
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo()
+                    {
+                        Template = "api/Blog/{*slug=hello}",
+                        Name = "BLOG_INDEX",
+                        Order = 17,
+                    },
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Blog" },
+                        { "action", "Index" },
+                    },
+                },
+            };
+
+            var builder = CreateBuilder();
+            var actionDescriptorProvider = CreateActionDescriptorProvider(actions);
+            var route = CreateRoute(CreateHandler().Object, actionDescriptorProvider.Object);
+
+            // Act
+            route.AddEntries(builder, actionDescriptorProvider.Object.ActionDescriptors);
+
+            // Assert
+            Assert.Collection(
+                builder.InboundEntries,
+                e =>
+                {
+                    Assert.Empty(e.Constraints);
+                    Assert.Equal(17, e.Order);
+                    Assert.Equal(RoutePrecedence.ComputeInbound(e.RouteTemplate), e.Precedence);
+                    Assert.Equal("BLOG_INDEX", e.RouteName);
+                    Assert.Equal("api/Blog/{*slug=hello}", e.RouteTemplate.TemplateText);
+                    Assert.Collection(
+                        e.Defaults.OrderBy(kvp => kvp.Key),
+                        kvp => Assert.Equal(new KeyValuePair<string, object>("slug", "hello"), kvp));
+                });
+        }
+
+        // These actions seem like duplicates, but this is a real case that can happen where two different
+        // actions define the same route info. Link generation happens based on the action name + controller
+        // name.
+        [Fact]
+        public void AttributeRoute_GetEntries_CreatesInboundEntry_CombinesLikeActions()
+        {
+            // Arrange
+            var actions = new List<ActionDescriptor>()
+            {
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo()
+                    {
+                        Template = "api/Blog/{id}",
+                        Name = "BLOG_INDEX",
+                        Order = 17,
+                    },
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Blog" },
+                        { "action", "Index" },
+                    },
+                },
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo()
+                    {
+                        Template = "api/Blog/{id}",
+                        Name = "BLOG_INDEX",
+                        Order = 17,
+                    },
+                    RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                        { "controller", "Blog" },
+                        { "action", "Index2" },
+                    },
+                },
+            };
+
+            var builder = CreateBuilder();
+            var actionDescriptorProvider = CreateActionDescriptorProvider(actions);
+            var route = CreateRoute(CreateHandler().Object, actionDescriptorProvider.Object);
+
+            // Act
+            route.AddEntries(builder, actionDescriptorProvider.Object.ActionDescriptors);
+
+            // Assert
+            Assert.Collection(
+                builder.InboundEntries,
+                e =>
+                {
+                    Assert.Empty(e.Constraints);
+                    Assert.Equal(17, e.Order);
+                    Assert.Equal(RoutePrecedence.ComputeInbound(e.RouteTemplate), e.Precedence);
+                    Assert.Equal("BLOG_INDEX", e.RouteName);
+                    Assert.Equal("api/Blog/{id}", e.RouteTemplate.TemplateText);
+                    Assert.Empty(e.Defaults);
+                });
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData("GetBlogById")]
+        public void AttributeRoute_ThrowsRouteCreationException_ForConstraintsNotTakingArguments(string routeName)
+        {
+            // Arrange
+            var routeTemplate = "api/Blog/{id:int(10)}";
+            var actions = new List<ActionDescriptor>()
+            {
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo()
+                    {
+                        Template = routeTemplate,
+                        Name = routeName
+                    }
+                },
+            };
+            var expectedErrorMessage = "An error occurred while adding a route to the route builder. " +
+                        $"Route name '{routeName}' and template '{routeTemplate}'.";
+
+            var builder = CreateBuilder();
+            var actionDescriptorProvider = CreateActionDescriptorProvider(actions);
+            var route = CreateRoute(CreateHandler().Object, actionDescriptorProvider.Object);
+
+            // Act & Assert
+            var exception = Assert.Throws<RouteCreationException>(() =>
+            {
+                route.AddEntries(builder, actionDescriptorProvider.Object.ActionDescriptors);
+            });
+            Assert.Equal(expectedErrorMessage, exception.Message);
+            Assert.IsType<RouteCreationException>(exception.InnerException);
+        }
+
+        [Fact]
+        public void GetEntries_DoesNotCreateOutboundEntriesForAttributesWithSuppressForLinkGenerationSetToTrue()
+        {
+            // Arrange
+            var actions = new List<ActionDescriptor>()
+            {
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo
+                    {
+                        Template = "blog/get/{id}",
+                        Name = "BLOG_LINK1",
+                        SuppressLinkGeneration = true,
+                    },
+                },
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo
+                    {
+                        Template = "blog/{snake-cased-name}",
+                        Name = "BLOG_INDEX2",
+                    },
+                },
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo
+                    {
+                        Template = "blog/",
+                        Name = "BLOG_HOME",
+                        SuppressPathMatching = true,
+                    },
+                },
+            };
+
+            var builder = CreateBuilder();
+            var actionDescriptorProvider = CreateActionDescriptorProvider(actions);
+            var route = CreateRoute(CreateHandler().Object, actionDescriptorProvider.Object);
+
+            // Act
+            route.AddEntries(builder, actionDescriptorProvider.Object.ActionDescriptors);
+
+            // Assert
+            Assert.Collection(
+                builder.OutboundEntries,
+                e =>
+                {
+                    Assert.Equal("BLOG_INDEX2", e.RouteName);
+                    Assert.Equal("blog/{snake-cased-name}", e.RouteTemplate.TemplateText);
+                },
+                e =>
+                {
+                    Assert.Equal("BLOG_HOME", e.RouteName);
+                    Assert.Equal("blog/", e.RouteTemplate.TemplateText);
+                });
+        }
+
+        [Fact]
+        public void GetEntries_DoesNotCreateOutboundEntriesForAttributesWithSuppressForLinkGenerationSetToTrue_WhenMultipleAttributesHaveTheSameTemplate()
+        {
+            // Arrange
+            var actions = new List<ActionDescriptor>()
+            {
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo
+                    {
+                        Template = "blog/get/{id}",
+                        Name = "BLOG_LINK1",
+                        SuppressLinkGeneration = true,
+                    },
+                },
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo
+                    {
+                        Template = "blog/get/{id}",
+                        Name = "BLOG_LINK2",
+                    },
+                },
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo
+                    {
+                        Template = "blog/",
+                        Name = "BLOG_HOME",
+                        SuppressPathMatching = true,
+                    },
+                },
+            };
+
+            var builder = CreateBuilder();
+            var actionDescriptorProvider = CreateActionDescriptorProvider(actions);
+            var route = CreateRoute(CreateHandler().Object, actionDescriptorProvider.Object);
+
+            // Act
+            route.AddEntries(builder, actionDescriptorProvider.Object.ActionDescriptors);
+
+            // Assert
+            Assert.Collection(
+                builder.OutboundEntries,
+                e =>
+                {
+                    Assert.Equal("BLOG_LINK2", e.RouteName);
+                    Assert.Equal("blog/get/{id}", e.RouteTemplate.TemplateText);
+                },
+                e =>
+                {
+                    Assert.Equal("BLOG_HOME", e.RouteName);
+                    Assert.Equal("blog/", e.RouteTemplate.TemplateText);
+                });
+        }
+
+
+        [Fact]
+        public void GetEntries_DoesNotCreateInboundEntriesForAttributesWithSuppressForPathMatchingSetToTrue()
+        {
+            // Arrange
+            var actions = new List<ActionDescriptor>()
+            {
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo
+                    {
+                        Template = "blog/get/{id}",
+                        Name = "BLOG_LINK1",
+                        SuppressLinkGeneration = true,
+                    },
+                },
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo
+                    {
+                        Template = "blog/{snake-cased-name}",
+                        Name = "BLOG_LINK2",
+                    },
+                },
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo
+                    {
+                        Template = "blog/",
+                        Name = "BLOG_HOME",
+                        SuppressPathMatching = true,
+                    },
+                },
+            };
+
+            var builder = CreateBuilder();
+            var actionDescriptorProvider = CreateActionDescriptorProvider(actions);
+            var route = CreateRoute(CreateHandler().Object, actionDescriptorProvider.Object);
+
+            // Act
+            route.AddEntries(builder, actionDescriptorProvider.Object.ActionDescriptors);
+
+            // Assert
+            Assert.Collection(
+                builder.InboundEntries,
+                e =>
+                {
+                    Assert.Equal("BLOG_LINK1", e.RouteName);
+                    Assert.Equal("blog/get/{id}", e.RouteTemplate.TemplateText);
+                },
+                e =>
+                {
+                    Assert.Equal("BLOG_LINK2", e.RouteName);
+                    Assert.Equal("blog/{snake-cased-name}", e.RouteTemplate.TemplateText);
+                });
+        }
+
+        [Fact]
+        public void GetEntries_DoesNotCreateInboundEntriesForAttributesWithSuppressForPathMatchingSetToTrue_WhenMultipleAttributesHaveTheSameTemplate()
+        {
+            // Arrange
+            var actions = new List<ActionDescriptor>()
+            {
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo
+                    {
+                        Template = "blog/get/{id}",
+                        Name = "BLOG_LINK1",
+                        SuppressPathMatching = true,
+                    },
+                },
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo
+                    {
+                        Template = "blog/get/{id}",
+                        Name = "BLOG_LINK2",
+                    },
+                },
+                new ActionDescriptor()
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo
+                    {
+                        Template = "blog/",
+                        Name = "BLOG_HOME",
+                        SuppressLinkGeneration = true,
+                    },
+                },
+            };
+
+            var builder = CreateBuilder();
+            var actionDescriptorProvider = CreateActionDescriptorProvider(actions);
+            var route = CreateRoute(CreateHandler().Object, actionDescriptorProvider.Object);
+
+            // Act
+            route.AddEntries(builder, actionDescriptorProvider.Object.ActionDescriptors);
+
+            // Assert
+            Assert.Collection(
+                builder.InboundEntries,
+                e =>
+                {
+                    Assert.Equal("BLOG_LINK2", e.RouteName);
+                    Assert.Equal("blog/get/{id}", e.RouteTemplate.TemplateText);
+                },
+                e =>
+                {
+                    Assert.Equal("BLOG_HOME", e.RouteName);
+                    Assert.Equal("blog/", e.RouteTemplate.TemplateText);
+                });
+        }
+
+        private static TreeRouteBuilder CreateBuilder()
+        {
+            var services = new ServiceCollection()
+                .AddSingleton<ObjectPoolProvider, DefaultObjectPoolProvider>()
+                .AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance)
+                .AddLogging()
+                .AddRouting()
+                .AddOptions()
+                .BuildServiceProvider();
+            return services.GetRequiredService<TreeRouteBuilder>();
+        }
+
+        private static Mock<IRouter> CreateHandler()
+        {
+            var handler = new Mock<IRouter>(MockBehavior.Strict);
+            handler
+                .Setup(h => h.RouteAsync(It.IsAny<RouteContext>()))
+                .Callback<RouteContext>(c => c.Handler = NullHandler)
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+            return handler;
+        }
+
+        private static Mock<IActionDescriptorCollectionProvider> CreateActionDescriptorProvider(
+            IReadOnlyList<ActionDescriptor> actions)
+        {
+            var actionDescriptorProvider = new Mock<IActionDescriptorCollectionProvider>(MockBehavior.Strict);
+            actionDescriptorProvider
+                .SetupGet(ad => ad.ActionDescriptors)
+                .Returns(new ActionDescriptorCollection(actions, version: 1));
+
+            return actionDescriptorProvider;
+        }
+
+        private static AttributeRoute CreateRoute(
+            IRouter handler,
+            IActionDescriptorCollectionProvider actionDescriptorProvider)
+        {
+            return CreateRoute((_) => handler, actionDescriptorProvider);
+        }
+
+        private static AttributeRoute CreateRoute(
+            Func<ActionDescriptor[], IRouter> handlerFactory,
+            IActionDescriptorCollectionProvider actionDescriptorProvider)
+        {
+            var services = new ServiceCollection()
+                .AddSingleton<ObjectPoolProvider, DefaultObjectPoolProvider>()
+                .AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance)
+                .AddLogging()
+                .AddRouting()
+                .AddOptions()
+                .BuildServiceProvider();
+            return new AttributeRoute(actionDescriptorProvider, services, handlerFactory);
+        }
+
+        // Needed because new RouteValueDictionary(values) would give us all the properties of
+        // the Dictionary class.
+        private static RouteValueDictionary ToRouteValueDictionary(IDictionary<string, string> values)
+        {
+            var result = new RouteValueDictionary();
+            foreach (var kvp in values)
+            {
+                result.Add(kvp.Key, kvp.Value);
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRoutingTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRoutingTest.cs
new file mode 100644
index 0000000000..c9d281b80d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRoutingTest.cs
@@ -0,0 +1,201 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.ObjectPool;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class AttributeRoutingTest
+    {
+        [Fact]
+        [ReplaceCulture]
+        public async Task AttributeRouting_SyntaxErrorInTemplate()
+        {
+            // Arrange
+            var value = "a/dkfk";
+            var action = CreateAction("InvalidTemplate", "{" + value + "}");
+
+            var expectedMessage =
+                "The following errors occurred with attribute routing information:" + Environment.NewLine +
+                Environment.NewLine +
+                "For action: 'InvalidTemplate'" + Environment.NewLine +
+                "Error: The route parameter name 'a/dkfk' is invalid. Route parameter names must be non-empty and " +
+                "cannot contain these characters: '{', '}', '/'. The '?' character marks a parameter as optional, " +
+                "and can occur only at the end of the parameter. The '*' character marks a parameter as catch-all, " +
+                "and can occur only at the start of the parameter." + Environment.NewLine +
+                "Parameter name: routeTemplate";
+
+            var services = CreateServices(action);
+
+            var route = AttributeRouting.CreateAttributeMegaRoute(services);
+            var routeContext = new RouteContext(new DefaultHttpContext());
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<RouteCreationException>(() => route.RouteAsync(routeContext));
+
+            Assert.Equal(expectedMessage, ex.Message);
+        }
+
+        [Fact]
+        public async Task AttributeRouting_DisallowedParameter()
+        {
+            // Arrange
+            var action = CreateAction("DisallowedParameter", "{foo}/{action}");
+            action.RouteValues.Add("foo", "bleh");
+
+            var expectedMessage =
+                "The following errors occurred with attribute routing information:" + Environment.NewLine +
+                Environment.NewLine +
+                "For action: 'DisallowedParameter'" + Environment.NewLine +
+                "Error: The attribute route '{foo}/{action}' cannot contain a parameter named '{foo}'. " +
+                "Use '[foo]' in the route template to insert the value 'bleh'.";
+
+            var services = CreateServices(action);
+
+            var route = AttributeRouting.CreateAttributeMegaRoute(services);
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<RouteCreationException>(async () =>
+            {
+                await route.RouteAsync(new RouteContext(new DefaultHttpContext()));
+            });
+
+            Assert.Equal(expectedMessage, ex.Message);
+        }
+
+        [Fact]
+        public async Task AttributeRouting_MultipleErrors()
+        {
+            // Arrange
+            var action1 = CreateAction("DisallowedParameter1", "{foo}/{action}");
+            action1.RouteValues.Add("foo", "bleh");
+
+            var action2 = CreateAction("DisallowedParameter2", "cool/{action}");
+            action2.RouteValues.Add("action", "hey");
+
+            var expectedMessage =
+                "The following errors occurred with attribute routing information:" + Environment.NewLine +
+                Environment.NewLine +
+                "For action: 'DisallowedParameter1'" + Environment.NewLine +
+                "Error: The attribute route '{foo}/{action}' cannot contain a parameter named '{foo}'. " +
+                "Use '[foo]' in the route template to insert the value 'bleh'." + Environment.NewLine +
+                Environment.NewLine +
+                "For action: 'DisallowedParameter2'" + Environment.NewLine +
+                "Error: The attribute route 'cool/{action}' cannot contain a parameter named '{action}'. " +
+                "Use '[action]' in the route template to insert the value 'hey'.";
+
+            var services = CreateServices(action1, action2);
+
+            var route = AttributeRouting.CreateAttributeMegaRoute(services);
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<RouteCreationException>(async () =>
+            {
+                await route.RouteAsync(new RouteContext(new DefaultHttpContext()));
+            });
+
+            Assert.Equal(expectedMessage, ex.Message);
+        }
+
+        [Fact]
+        public async Task AttributeRouting_WithControllerActionDescriptor()
+        {
+            // Arrange
+            var controllerType = typeof(HomeController);
+            var actionMethod = controllerType.GetMethod("Index");
+
+            var action = new ControllerActionDescriptor();
+            action.DisplayName = "Microsoft.AspNetCore.Mvc.Routing.AttributeRoutingTest+HomeController.Index";
+            action.MethodInfo = actionMethod;
+            action.RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "controller", "Home" },
+                { "action", "Index" },
+            };
+            action.AttributeRouteInfo = new AttributeRouteInfo();
+            action.AttributeRouteInfo.Template = "{controller}/{action}";
+
+            var expectedMessage =
+                "The following errors occurred with attribute routing information:" + Environment.NewLine +
+                Environment.NewLine +
+                "For action: 'Microsoft.AspNetCore.Mvc.Routing.AttributeRoutingTest+HomeController.Index'" + Environment.NewLine +
+                "Error: The attribute route '{controller}/{action}' cannot contain a parameter named '{controller}'. " +
+                "Use '[controller]' in the route template to insert the value 'Home'.";
+
+            var services = CreateServices(action);
+
+            var route = AttributeRouting.CreateAttributeMegaRoute(services);
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<RouteCreationException>(async () =>
+            {
+                await route.RouteAsync(new RouteContext(new DefaultHttpContext()));
+            });
+
+            Assert.Equal(expectedMessage, ex.Message);
+        }
+
+        private static ActionDescriptor CreateAction(string displayName, string template)
+        {
+            return new DisplayNameActionDescriptor()
+            {
+                DisplayName = displayName,
+                RouteValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase),
+                AttributeRouteInfo = new AttributeRouteInfo { Template = template },
+            };
+        }
+
+        private static IServiceProvider CreateServices(params ActionDescriptor[] actions)
+        {
+            var collection = new ActionDescriptorCollection(actions, version: 0);
+
+            var actionDescriptorProvider = new Mock<IActionDescriptorCollectionProvider>();
+            actionDescriptorProvider
+                .Setup(a => a.ActionDescriptors)
+                .Returns(collection);
+
+            var routeOptions = new Mock<IOptions<RouteOptions>>();
+            routeOptions
+                .SetupGet(o => o.Value)
+                .Returns(new RouteOptions());
+
+            var services = new ServiceCollection()
+                .AddSingleton<IInlineConstraintResolver>(new DefaultInlineConstraintResolver(routeOptions.Object))
+                .AddSingleton<ObjectPoolProvider, DefaultObjectPoolProvider>();
+
+            services.AddSingleton<ObjectPoolProvider, DefaultObjectPoolProvider>();
+            services.AddRouting();
+            services.AddOptions();
+            services.AddLogging();
+
+            return services.AddSingleton(actionDescriptorProvider.Object)
+                .AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance)
+                .BuildServiceProvider();
+        }
+
+        private class DisplayNameActionDescriptor : ActionDescriptor
+        {
+        }
+
+        private class HomeController
+        {
+            public void Index() { }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AuthorizationApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AuthorizationApplicationModelProviderTest.cs
new file mode 100644
index 0000000000..5015aaa56a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AuthorizationApplicationModelProviderTest.cs
@@ -0,0 +1,215 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Authorization;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class AuthorizationApplicationModelProviderTest
+    {
+        [Fact]
+        public void CreateControllerModel_AuthorizeAttributeAddsAuthorizeFilter()
+        {
+            // Arrange
+            var provider = new AuthorizationApplicationModelProvider(new DefaultAuthorizationPolicyProvider(Options.Create(new AuthorizationOptions())));
+            var controllerType = typeof(AccountController);
+            var context = CreateProviderContext(controllerType);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            Assert.Single(controller.Filters, f => f is AuthorizeFilter);
+        }
+
+        [Fact]
+        public void BuildActionModels_BaseAuthorizeFiltersAreStillValidWhenOverriden()
+        {
+            // Arrange
+            var options = Options.Create(new AuthorizationOptions());
+            options.Value.AddPolicy("Base", policy => policy.RequireClaim("Basic").RequireClaim("Basic2"));
+            options.Value.AddPolicy("Derived", policy => policy.RequireClaim("Derived"));
+
+            var provider = new AuthorizationApplicationModelProvider(new DefaultAuthorizationPolicyProvider(options));
+            var context = CreateProviderContext(typeof(DerivedController));
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controller.Actions);
+            Assert.Equal("Authorize", action.ActionName);
+
+            var attributeRoutes = action.Selectors.Where(sm => sm.AttributeRouteModel != null);
+            Assert.Empty(attributeRoutes);
+            var authorizeFilters = action.Filters.OfType<AuthorizeFilter>();
+            Assert.Single(authorizeFilters);
+
+            Assert.NotNull(authorizeFilters.First().Policy);
+            Assert.Equal(3, authorizeFilters.First().Policy.Requirements.Count()); // Basic + Basic2 + Derived authorize
+        }
+
+        [Fact]
+        public void CreateControllerModelAndActionModel_AllowAnonymousAttributeAddsAllowAnonymousFilter()
+        {
+            // Arrange
+            var provider = new AuthorizationApplicationModelProvider(new DefaultAuthorizationPolicyProvider(Options.Create(new AuthorizationOptions())));
+            var context = CreateProviderContext(typeof(AnonymousController));
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            Assert.Single(controller.Filters, f => f is AllowAnonymousFilter);
+            var action = Assert.Single(controller.Actions);
+            Assert.Single(action.Filters, f => f is AllowAnonymousFilter);
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_DefaultPolicyProvider_NoAuthorizationData_NoFilterCreated()
+        {
+            // Arrange
+            var requirements = new IAuthorizationRequirement[]
+            {
+                new AssertionRequirement((con) => { return true; })
+            };
+            var authorizationPolicy = new AuthorizationPolicy(requirements, new string[] { "dingos" });
+            var authOptions = Options.Create(new AuthorizationOptions());
+            authOptions.Value.AddPolicy("Base", authorizationPolicy);
+            var policyProvider = new DefaultAuthorizationPolicyProvider(authOptions);
+
+            var provider = new AuthorizationApplicationModelProvider(policyProvider);
+            var context = CreateProviderContext(typeof(BaseController));
+
+            // Act
+            var action = GetBaseControllerActionModel(provider);
+
+            // Assert
+            var authorizationFilter = Assert.IsType<AuthorizeFilter>(Assert.Single(action.Filters));
+            Assert.NotNull(authorizationFilter.Policy);
+            Assert.Null(authorizationFilter.AuthorizeData);
+            Assert.Null(authorizationFilter.PolicyProvider);
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_NonDefaultPolicyProvider_HasNoPolicy_HasPolicyProviderAndAuthorizeData()
+        {
+            // Arrange
+            var requirements = new IAuthorizationRequirement[]
+            {
+                new AssertionRequirement((con) => { return true; })
+            };
+            var authorizationPolicy = new AuthorizationPolicy(requirements, new string[] { "dingos" });
+            var authorizationPolicyProviderMock = new Mock<IAuthorizationPolicyProvider>();
+            authorizationPolicyProviderMock
+                .Setup(s => s.GetPolicyAsync(It.IsAny<string>()))
+                .Returns(Task.FromResult(authorizationPolicy))
+                .Verifiable();
+
+            var provider = new AuthorizationApplicationModelProvider(authorizationPolicyProviderMock.Object);
+
+            // Act
+            var action = GetBaseControllerActionModel(provider);
+
+            // Assert
+            var actionFilter = Assert.IsType<AuthorizeFilter>(Assert.Single(action.Filters));
+            Assert.Null(actionFilter.Policy);
+            Assert.NotNull(actionFilter.AuthorizeData);
+            Assert.NotNull(actionFilter.PolicyProvider);
+        }
+
+        [Fact]
+        public void CreateControllerModelAndActionModel_NoAuthNoFilter()
+        {
+            // Arrange
+            var provider = new AuthorizationApplicationModelProvider(
+                new DefaultAuthorizationPolicyProvider(
+                    Options.Create(new AuthorizationOptions())
+                ));
+            var context = CreateProviderContext(typeof(NoAuthController));
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            Assert.Empty(controller.Filters);
+            var action = Assert.Single(controller.Actions);
+            Assert.Empty(action.Filters);
+        }
+
+        private ActionModel GetBaseControllerActionModel(AuthorizationApplicationModelProvider authorizationApplicationModelProvider)
+        {
+            var context = CreateProviderContext(typeof(BaseController));
+
+            authorizationApplicationModelProvider.OnProvidersExecuting(context);
+
+            var controller = Assert.Single(context.Result.Controllers);
+            Assert.Empty(controller.Filters);
+            var action = Assert.Single(controller.Actions);
+
+            return action;
+        }
+
+        private static ApplicationModelProviderContext CreateProviderContext(Type controllerType)
+        {
+            var defaultProvider = new DefaultApplicationModelProvider(
+                Options.Create(new MvcOptions()),
+                TestModelMetadataProvider.CreateDefaultProvider());
+
+            var context = new ApplicationModelProviderContext(new[] { controllerType.GetTypeInfo() });
+            defaultProvider.OnProvidersExecuting(context);
+            return context;
+        }
+
+        private class BaseController
+        {
+            [Authorize(Policy = "Base")]
+            public virtual void Authorize()
+            {
+            }
+        }
+
+        private class DerivedController : BaseController
+        {
+            [Authorize(Policy = "Derived")]
+            public override void Authorize()
+            {
+            }
+        }
+
+        [Authorize]
+        public class AccountController
+        {
+        }
+
+        public class NoAuthController
+        {
+            public void NoAuthAction()
+            { }
+        }
+
+        [AllowAnonymous]
+        public class AnonymousController
+        {
+            [AllowAnonymous]
+            public void SomeAction()
+            {
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ClientValidatorCacheTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ClientValidatorCacheTest.cs
new file mode 100644
index 0000000000..642eb82ea0
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ClientValidatorCacheTest.cs
@@ -0,0 +1,107 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ClientValidatorCacheTest
+    {
+        [Fact]
+        public void GetValidators_CachesAllValidators()
+        {
+            // Arrange
+            var cache = new ClientValidatorCache();
+            var metadata = new TestModelMetadataProvider().GetMetadataForProperty(typeof(TypeWithProperty), "Property1");
+            var validatorProvider = TestClientModelValidatorProvider.CreateDefaultProvider();
+
+            // Act - 1
+            var validators1 = cache.GetValidators(metadata, validatorProvider);
+
+            // Assert - 1
+            var attribute1 = Assert.Single(validators1.OfType<RequiredAttributeAdapter>()).Attribute;
+            var attribute2 = Assert.Single(validators1.OfType<StringLengthAttributeAdapter>()).Attribute;
+            Assert.Contains(attribute1, metadata.ValidatorMetadata); // Copied by provider
+            Assert.Contains(attribute2, metadata.ValidatorMetadata); // Copied by provider
+
+            // Act - 2
+            var validators2 = cache.GetValidators(metadata, validatorProvider);
+
+            // Assert - 2
+            Assert.Same(validators1, validators2);
+
+            Assert.Contains(validators1[0], validators2); // Cached
+            Assert.Contains(validators1[1], validators2); // Cached
+        }
+
+        [Fact]
+        public void GetValidators_DoesNotCacheValidatorsWithIsReusableFalse()
+        {
+            // Arrange
+            var cache = new ClientValidatorCache();
+            var metadata = new TestModelMetadataProvider().GetMetadataForProperty(typeof(TypeWithProperty), "Property1");
+            var validatorProvider = new ProviderWithNonReusableValidators();
+
+            // Act - 1
+            var validators1 = cache.GetValidators(metadata, validatorProvider);
+
+            // Assert - 1
+            var validator1 = Assert.Single(validators1.OfType<RequiredAttributeAdapter>());
+            var validator2 = Assert.Single(validators1.OfType<StringLengthAttributeAdapter>());
+            Assert.Contains(validator1.Attribute, metadata.ValidatorMetadata); // Copied by provider
+            Assert.Contains(validator2.Attribute, metadata.ValidatorMetadata); // Copied by provider
+
+            // Act - 2
+            var validators2 = cache.GetValidators(metadata, validatorProvider);
+
+            // Assert - 2
+            Assert.NotSame(validators1, validators2);
+
+            Assert.Same(validator1, Assert.Single(validators2.OfType<RequiredAttributeAdapter>())); // cached
+            Assert.NotSame(validator2, Assert.Single(validators2.OfType<StringLengthAttributeAdapter>())); // not cached
+        }
+
+        private class TypeWithProperty
+        {
+            [Required]
+            [StringLength(10)]
+            public string Property1 { get; set; }
+        }
+
+        private class ProviderWithNonReusableValidators : IClientModelValidatorProvider
+        {
+            public void CreateValidators(ClientValidatorProviderContext context)
+            {
+                for (var i = 0; i < context.Results.Count; i++)
+                {
+                    var validatorItem = context.Results[i];
+                    if (validatorItem.Validator != null)
+                    {
+                        continue;
+                    }
+
+                    var attribute = validatorItem.ValidatorMetadata as ValidationAttribute;
+                    if (attribute == null)
+                    {
+                        continue;
+                    }
+
+                    var validationAdapterProvider = new ValidationAttributeAdapterProvider();
+
+                    validatorItem.Validator = validationAdapterProvider.GetAttributeAdapter(attribute, stringLocalizer: null);
+
+                    if (attribute is RequiredAttribute)
+                    {
+                        validatorItem.IsReusable = true;
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionDescriptorBuilderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionDescriptorBuilderTest.cs
new file mode 100644
index 0000000000..17e5325d91
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionDescriptorBuilderTest.cs
@@ -0,0 +1,151 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ControllerActionDescriptorBuilderTest
+    {
+        [Fact]
+        public void Build_WithControllerPropertiesSet_AddsPropertiesWithBinderMetadataSet()
+        {
+            // Arrange
+            var applicationModel = new ApplicationModel();
+            var controller = new ControllerModel(
+                typeof(TestController).GetTypeInfo(),
+                new List<object>() { });
+
+            var propertyInfo = controller.ControllerType.AsType().GetProperty("BoundProperty");
+            controller.ControllerProperties.Add(
+                new PropertyModel(
+                    propertyInfo,
+                    new List<object>() { })
+                {
+                    BindingInfo = BindingInfo.GetBindingInfo(new object[] { new FromQueryAttribute() }),
+                    PropertyName = "BoundProperty"
+                });
+
+            controller.ControllerProperties.Add(
+               new PropertyModel(
+                   controller.ControllerType.AsType().GetProperty("UnboundProperty"),
+                   new List<object>() { }));
+
+            controller.Application = applicationModel;
+            applicationModel.Controllers.Add(controller);
+
+            var methodInfo = typeof(TestController).GetMethod(nameof(TestController.SomeAction));
+            var actionModel = new ActionModel(methodInfo, new List<object>() { });
+            actionModel.Selectors.Add(new SelectorModel());
+            actionModel.Controller = controller;
+            controller.Actions.Add(actionModel);
+
+            // Act
+            var descriptors = ControllerActionDescriptorBuilder.Build(applicationModel);
+
+            // Assert
+            var controllerDescriptor = Assert.Single(descriptors);
+
+            var parameter = Assert.Single(controllerDescriptor.BoundProperties);
+            var property = Assert.IsType<ControllerBoundPropertyDescriptor>(parameter);
+            Assert.Equal("BoundProperty", property.Name);
+            Assert.Equal(propertyInfo, property.PropertyInfo);
+            Assert.Equal(typeof(string), property.ParameterType);
+            Assert.Equal(BindingSource.Query, property.BindingInfo.BindingSource);
+        }
+
+        [Fact]
+        public void Build_WithPropertiesSet_FromApplicationModel()
+        {
+            // Arrange
+            var applicationModel = new ApplicationModel();
+            applicationModel.Properties["test"] = "application";
+
+            var controller = new ControllerModel(typeof(TestController).GetTypeInfo(),
+                                                 new List<object>() { });
+            controller.Application = applicationModel;
+            applicationModel.Controllers.Add(controller);
+
+            var methodInfo = typeof(TestController).GetMethod(nameof(TestController.SomeAction));
+            var actionModel = new ActionModel(methodInfo, new List<object>() { });
+            actionModel.Selectors.Add(new SelectorModel());
+            actionModel.Controller = controller;
+            controller.Actions.Add(actionModel);
+
+            // Act
+            var descriptors = ControllerActionDescriptorBuilder.Build(applicationModel);
+
+            // Assert
+            Assert.Equal("application", descriptors.Single().Properties["test"]);
+        }
+
+        [Fact]
+        public void Build_WithPropertiesSet_ControllerOverwritesApplicationModel()
+        {
+            // Arrange
+            var applicationModel = new ApplicationModel();
+            applicationModel.Properties["test"] = "application";
+
+            var controller = new ControllerModel(typeof(TestController).GetTypeInfo(),
+                                                 new List<object>() { });
+            controller.Application = applicationModel;
+            controller.Properties["test"] = "controller";
+            applicationModel.Controllers.Add(controller);
+
+            var methodInfo = typeof(TestController).GetMethod(nameof(TestController.SomeAction));
+            var actionModel = new ActionModel(methodInfo, new List<object>() { });
+            actionModel.Selectors.Add(new SelectorModel());
+            actionModel.Controller = controller;
+            controller.Actions.Add(actionModel);
+
+            // Act
+            var descriptors = ControllerActionDescriptorBuilder.Build(applicationModel);
+
+            // Assert
+            Assert.Equal("controller", descriptors.Single().Properties["test"]);
+        }
+
+        [Fact]
+        public void Build_WithPropertiesSet_ActionOverwritesApplicationAndControllerModel()
+        {
+            // Arrange
+            var applicationModel = new ApplicationModel();
+            applicationModel.Properties["test"] = "application";
+
+            var controller = new ControllerModel(typeof(TestController).GetTypeInfo(),
+                                                 new List<object>() { });
+            controller.Application = applicationModel;
+            controller.Properties["test"] = "controller";
+            applicationModel.Controllers.Add(controller);
+
+            var methodInfo = typeof(TestController).GetMethod(nameof(TestController.SomeAction));
+            var actionModel = new ActionModel(methodInfo, new List<object>() { });
+            actionModel.Selectors.Add(new SelectorModel());
+            actionModel.Controller = controller;
+            actionModel.Properties["test"] = "action";
+            controller.Actions.Add(actionModel);
+
+            // Act
+            var descriptors = ControllerActionDescriptorBuilder.Build(applicationModel);
+
+            // Assert
+            Assert.Equal("action", descriptors.Single().Properties["test"]);
+        }
+
+        private class TestController
+        {
+            [FromQuery]
+            public string BoundProperty { get; set; }
+
+            public string UnboundProperty { get; set; }
+
+            public void SomeAction() { }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionDescriptorProviderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionDescriptorProviderTests.cs
new file mode 100644
index 0000000000..0afae5ae78
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionDescriptorProviderTests.cs
@@ -0,0 +1,2035 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ControllerActionDescriptorProviderTests
+    {
+        [Fact]
+        public void GetDescriptors_GetsDescriptorsOnlyForValidActions()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(PersonController).GetTypeInfo());
+
+            // Act
+            var descriptors = provider.GetDescriptors();
+            var actionNames = descriptors.Select(ad => ad.ActionName);
+
+            // Assert
+            Assert.Equal(new[] { "GetPerson", "ShowPeople", }, actionNames);
+        }
+
+        [Fact]
+        public void GetDescriptors_DisplayNameIncludesAssemblyName()
+        {
+            // Arrange
+            var controllerTypeInfo = typeof(PersonController).GetTypeInfo();
+            var provider = GetProvider(controllerTypeInfo);
+
+            // Act
+            var descriptors = provider.GetDescriptors();
+            var descriptor = descriptors.Single(ad => ad.ActionName == nameof(PersonController.GetPerson));
+
+            // Assert
+            Assert.Equal($"{controllerTypeInfo.FullName}.{nameof(PersonController.GetPerson)} ({controllerTypeInfo.Assembly.GetName().Name})", descriptor.DisplayName);
+        }
+
+        [Fact]
+        public void GetDescriptors_IncludesFilters()
+        {
+            // Arrange
+            var globalFilter = new MyFilterAttribute(1);
+            var provider = GetProvider(typeof(FiltersController).GetTypeInfo(), new IFilterMetadata[]
+            {
+                globalFilter,
+            });
+
+            // Act
+            var descriptors = provider.GetDescriptors();
+            var descriptor = Assert.Single(descriptors);
+
+            // Assert
+            Assert.Equal(3, descriptor.FilterDescriptors.Count);
+
+            var filter1 = descriptor.FilterDescriptors[0];
+            Assert.Same(globalFilter, filter1.Filter);
+            Assert.Equal(FilterScope.Global, filter1.Scope);
+
+            var filter2 = descriptor.FilterDescriptors[1];
+            Assert.Equal(2, Assert.IsType<MyFilterAttribute>(filter2.Filter).Value);
+            Assert.Equal(FilterScope.Controller, filter2.Scope);
+
+            var filter3 = descriptor.FilterDescriptors[2];
+            Assert.Equal(3, Assert.IsType<MyFilterAttribute>(filter3.Filter).Value);
+            Assert.Equal(FilterScope.Action, filter3.Scope);
+        }
+
+        [Fact]
+        public void GetDescriptors_AddsHttpMethodConstraints_ForConventionallyRoutedActions()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(HttpMethodController).GetTypeInfo());
+
+            // Act
+            var descriptors = provider.GetDescriptors();
+            var descriptor = Assert.Single(descriptors);
+
+            // Assert
+            Assert.Equal("OnlyPost", descriptor.ActionName);
+
+            var constraint = Assert.IsType<HttpMethodActionConstraint>(Assert.Single(descriptor.ActionConstraints));
+            Assert.Equal(new string[] { "POST" }, constraint.HttpMethods);
+        }
+
+        [Fact]
+        public void GetDescriptors_HttpMethodConstraint_RouteOnController()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(AttributeRoutedHttpMethodController).GetTypeInfo());
+
+            // Act
+            var descriptors = provider.GetDescriptors();
+            var descriptor = Assert.Single(descriptors);
+
+            // Assert
+            Assert.Equal("Items", descriptor.AttributeRouteInfo.Template);
+
+            var constraint = Assert.IsType<HttpMethodActionConstraint>(Assert.Single(descriptor.ActionConstraints));
+            Assert.Equal(new string[] { "PUT", "PATCH" }, constraint.HttpMethods);
+        }
+
+        [Fact]
+        public void GetDescriptors_AddsParameters_ToActionDescriptor()
+        {
+            // Arrange & Act
+            var descriptors = GetDescriptors(
+                typeof(ActionParametersController).GetTypeInfo());
+
+            // Assert
+            var main = Assert.Single(descriptors.Cast<ControllerActionDescriptor>(),
+                d => d.ActionName.Equals(nameof(ActionParametersController.RequiredInt)));
+
+            Assert.NotNull(main.Parameters);
+            var id = Assert.Single(main.Parameters);
+
+            Assert.Equal("id", id.Name);
+            Assert.Null(id.BindingInfo?.BindingSource);
+            Assert.Equal(typeof(int), id.ParameterType);
+        }
+
+        [Fact]
+        public void GetDescriptors_AddsMultipleParameters_ToActionDescriptor()
+        {
+            // Arrange & Act
+            var descriptors = GetDescriptors(
+                typeof(ActionParametersController).GetTypeInfo());
+
+            // Assert
+            var main = Assert.Single(descriptors.Cast<ControllerActionDescriptor>(),
+                d => d.ActionName.Equals(nameof(ActionParametersController.MultipleParameters)));
+
+            Assert.NotNull(main.Parameters);
+            var id = Assert.Single(main.Parameters, p => p.Name == "id");
+
+            Assert.Equal("id", id.Name);
+            Assert.Null(id.BindingInfo?.BindingSource);
+            Assert.Equal(typeof(int), id.ParameterType);
+
+            var entity = Assert.Single(main.Parameters, p => p.Name == "entity");
+
+            Assert.Equal("entity", entity.Name);
+            Assert.Equal(entity.BindingInfo.BindingSource, BindingSource.Body);
+            Assert.Equal(typeof(TestActionParameter), entity.ParameterType);
+        }
+
+        [Fact]
+        public void GetDescriptors_AddsMultipleParametersWithDifferentCasing_ToActionDescriptor()
+        {
+            // Arrange & Act
+            var descriptors = GetDescriptors(
+                typeof(ActionParametersController).GetTypeInfo());
+
+            // Assert
+            var main = Assert.Single(descriptors.Cast<ControllerActionDescriptor>(),
+                d => d.ActionName.Equals(nameof(ActionParametersController.DifferentCasing)));
+
+            Assert.NotNull(main.Parameters);
+            var id = Assert.Single(main.Parameters, p => p.Name == "id");
+
+            Assert.Equal("id", id.Name);
+            Assert.Null(id.BindingInfo?.BindingSource);
+            Assert.Equal(typeof(int), id.ParameterType);
+
+            var upperCaseId = Assert.Single(main.Parameters, p => p.Name == "ID");
+
+            Assert.Equal("ID", upperCaseId.Name);
+            Assert.Null(upperCaseId.BindingInfo?.BindingSource);
+            Assert.Equal(typeof(int), upperCaseId.ParameterType);
+
+            var pascalCaseId = Assert.Single(main.Parameters, p => p.Name == "Id");
+
+            Assert.Equal("Id", pascalCaseId.Name);
+            Assert.Null(id.BindingInfo?.BindingSource);
+            Assert.Equal(typeof(int), pascalCaseId.ParameterType);
+        }
+
+        [Fact]
+        public void GetDescriptors_AddsParameters_DetectsFromBodyParameters()
+        {
+            // Arrange & Act
+            var actionName = nameof(ActionParametersController.FromBodyParameter);
+
+            var descriptors = GetDescriptors(
+                typeof(ActionParametersController).GetTypeInfo());
+
+            // Assert
+            var fromBody = Assert.Single(descriptors.Cast<ControllerActionDescriptor>(),
+                d => d.ActionName.Equals(actionName));
+
+            Assert.NotNull(fromBody.Parameters);
+            var entity = Assert.Single(fromBody.Parameters);
+
+            Assert.Equal("entity", entity.Name);
+            Assert.Equal(entity.BindingInfo.BindingSource, BindingSource.Body);
+            Assert.Equal(typeof(TestActionParameter), entity.ParameterType);
+        }
+
+        [Fact]
+        public void GetDescriptors_AddsParameters_DoesNotDetectParameterFromBody_IfNoFromBodyAttribute()
+        {
+            // Arrange & Act
+            var actionName = nameof(ActionParametersController.NotFromBodyParameter);
+
+            var descriptors = GetDescriptors(
+                typeof(ActionParametersController).GetTypeInfo());
+
+            // Assert
+            var notFromBody = Assert.Single(descriptors.Cast<ControllerActionDescriptor>(),
+                d => d.ActionName.Equals(actionName));
+
+            Assert.NotNull(notFromBody.Parameters);
+            var entity = Assert.Single(notFromBody.Parameters);
+
+            Assert.Equal("entity", entity.Name);
+            Assert.Null(entity.BindingInfo?.BindingSource);
+            Assert.Equal(typeof(TestActionParameter), entity.ParameterType);
+        }
+
+        [Fact]
+        public void GetDescriptors_AddsControllerAndActionConstraints_ToConventionallyRoutedActions()
+        {
+            // Arrange & Act
+            var descriptors = GetDescriptors(
+                typeof(ConventionallyRoutedController).GetTypeInfo());
+
+            // Assert
+            var action = Assert.Single(descriptors);
+
+            Assert.NotNull(action.RouteValues);
+
+            var controller = Assert.Single(action.RouteValues, kvp => kvp.Key.Equals("controller"));
+            Assert.Equal("ConventionallyRouted", controller.Value);
+
+            var actionConstraint = Assert.Single(action.RouteValues, kvp => kvp.Key.Equals("action"));
+            Assert.Equal(nameof(ConventionallyRoutedController.ConventionalAction), actionConstraint.Value);
+        }
+
+        [Fact]
+        public void GetDescriptors_AddsControllerAndActionDefaults_ToAttributeRoutedActions()
+        {
+            // Arrange & Act
+            var descriptors = GetDescriptors(
+                typeof(AttributeRoutedController).GetTypeInfo());
+
+            // Assert
+            var action = Assert.Single(descriptors);
+
+            var controller = Assert.Single(action.RouteValues, kvp => kvp.Key.Equals("controller"));
+            Assert.Equal("AttributeRouted", controller.Value);
+
+            var actionConstraint = Assert.Single(action.RouteValues, kvp => kvp.Key.Equals("action"));
+            Assert.Equal(nameof(AttributeRoutedController.AttributeRoutedAction), actionConstraint.Value);
+        }
+
+        [Fact]
+        public void GetDescriptors_WithRouteValueAttribute()
+        {
+            // Arrange & Act
+            var descriptors = GetDescriptors(
+                typeof(HttpMethodController).GetTypeInfo(),
+                typeof(RouteValueController).GetTypeInfo()).ToArray();
+
+            var descriptorWithoutValue = Assert.Single(
+                descriptors,
+                ad => !ad.RouteValues.ContainsKey("key"));
+
+            var descriptorWithValue = Assert.Single(
+                descriptors,
+                ad => ad.RouteValues.ContainsKey("key"));
+
+            // Assert
+            Assert.Equal(2, descriptors.Length);
+
+            Assert.Equal(3, descriptorWithValue.RouteValues.Count);
+            Assert.Single(
+                descriptorWithValue.RouteValues,
+                c =>
+                    c.Key == "controller" &&
+                    c.Value == "RouteValue");
+            Assert.Single(
+                descriptorWithValue.RouteValues,
+                c =>
+                    c.Key == "action" &&
+                    c.Value == "Edit");
+            Assert.Single(
+                descriptorWithValue.RouteValues,
+                c =>
+                    c.Key == "key" &&
+                    c.Value == "value");
+
+            Assert.Equal(2, descriptorWithoutValue.RouteValues.Count);
+            Assert.Single(
+                descriptorWithoutValue.RouteValues,
+                c =>
+                    c.Key == "controller" &&
+                    c.Value == "HttpMethod");
+            Assert.Single(
+                descriptorWithoutValue.RouteValues,
+                c =>
+                    c.Key == "action" &&
+                    c.Value == "OnlyPost");
+        }
+
+        [Fact]
+        public void BuildModel_IncludesGlobalFilters()
+        {
+            // Arrange
+            var filter = new MyFilterAttribute(1);
+            var provider = GetProvider(typeof(PersonController).GetTypeInfo(), new IFilterMetadata[]
+            {
+                filter,
+            });
+
+            // Act
+            var model = provider.BuildModel();
+
+            // Assert
+            var filters = model.Filters;
+            Assert.Same(filter, Assert.Single(filters));
+        }
+
+        [Fact]
+        public void BuildModel_CreatesControllerModels_ForAllControllers()
+        {
+            // Arrange
+            var provider = GetProvider(
+                typeof(ConventionallyRoutedController).GetTypeInfo(),
+                typeof(AttributeRoutedController).GetTypeInfo(),
+                typeof(EmptyController).GetTypeInfo(),
+                typeof(NonActionAttributeController).GetTypeInfo());
+
+            // Act
+            var model = provider.BuildModel();
+
+            // Assert
+            Assert.NotNull(model);
+            Assert.Equal(4, model.Controllers.Count);
+
+            var conventional = Assert.Single(model.Controllers,
+                c => c.ControllerName == "ConventionallyRouted");
+            Assert.Empty(conventional.Selectors.Where(sm => sm.AttributeRouteModel != null));
+            Assert.Single(conventional.Actions);
+
+            var attributeRouted = Assert.Single(model.Controllers,
+                c => c.ControllerName == "AttributeRouted");
+            Assert.Single(attributeRouted.Actions);
+            Assert.Single(attributeRouted.Selectors.Where(sm => sm.AttributeRouteModel != null));
+
+            var empty = Assert.Single(model.Controllers,
+                c => c.ControllerName == "Empty");
+            Assert.Empty(empty.Actions);
+
+            var nonAction = Assert.Single(model.Controllers,
+                c => c.ControllerName == "NonActionAttribute");
+            Assert.Empty(nonAction.Actions);
+        }
+
+        [Fact]
+        public void BuildModel_CreatesControllerActionDescriptors_ForValidActions()
+        {
+            // Arrange
+            var provider = GetProvider(
+                typeof(PersonController).GetTypeInfo());
+
+            // Act
+            var model = provider.BuildModel();
+
+            // Assert
+            var controller = Assert.Single(model.Controllers);
+
+            Assert.Equal(2, controller.Actions.Count);
+
+            var getPerson = Assert.Single(controller.Actions, a => a.ActionName == "GetPerson");
+            Assert.Empty(getPerson.Selectors[0].ActionConstraints.OfType<HttpMethodActionConstraint>());
+
+            var showPeople = Assert.Single(controller.Actions, a => a.ActionName == "ShowPeople");
+            Assert.Empty(showPeople.Selectors[0].ActionConstraints.OfType<HttpMethodActionConstraint>());
+        }
+
+        [Fact]
+        public void AttributeRouting_TokenReplacement_IsAfterReflectedModel()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(TokenReplacementController).GetTypeInfo());
+
+            // Act
+            var model = provider.BuildModel();
+
+            // Assert
+            var controller = Assert.Single(model.Controllers);
+
+            var selectorModel = Assert.Single(controller.Selectors.Where(sm => sm.AttributeRouteModel != null));
+            Assert.Equal("api/Token/[key]/[controller]", selectorModel.AttributeRouteModel.Template);
+
+            var action = Assert.Single(controller.Actions);
+            var actionSelectorModel = Assert.Single(action.Selectors.Where(sm => sm.AttributeRouteModel != null));
+            Assert.Equal("stub/[action]", actionSelectorModel.AttributeRouteModel.Template);
+        }
+
+        [Fact]
+        public void AttributeRouting_TokenReplacement_InActionDescriptor()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(TokenReplacementController).GetTypeInfo());
+
+            // Act
+            var actions = provider.GetDescriptors();
+
+            // Assert
+            var action = Assert.Single(actions);
+            Assert.Equal("api/Token/value/TokenReplacement/stub/ThisIsAnAction", action.AttributeRouteInfo.Template);
+        }
+
+        [Fact]
+        public void AttributeRouting_TokenReplacement_ThrowsWithMultipleMessages()
+        {
+            // Arrange
+            var controllerTypeInfo = typeof(MultipleErrorsController).GetTypeInfo();
+            var assemblyName = controllerTypeInfo.Assembly.GetName().Name;
+            var provider = GetProvider(controllerTypeInfo);
+
+            var expectedMessage =
+                "The following errors occurred with attribute routing information:" + Environment.NewLine +
+                Environment.NewLine +
+                "Error 1:" + Environment.NewLine +
+                $"For action: '{controllerTypeInfo.FullName}.Unknown ({assemblyName})'" + Environment.NewLine +
+                "Error: While processing template 'stub/[action]/[unknown]', a replacement value for the token 'unknown' " +
+                "could not be found. Available tokens: 'action, controller'. To use a '[' or ']' as a literal string in" +
+                " a route or within a constraint, use '[[' or ']]' instead." + Environment.NewLine +
+                Environment.NewLine +
+                "Error 2:" + Environment.NewLine +
+                $"For action: '{controllerTypeInfo.FullName}.Invalid ({assemblyName})'" + Environment.NewLine +
+                "Error: The route template '[invalid/syntax' has invalid syntax. A replacement token is not closed.";
+
+            // Act
+            var ex = Assert.Throws<InvalidOperationException>(() => { provider.GetDescriptors(); });
+
+            // Assert
+            VerifyMultiLineError(expectedMessage, ex.Message, unorderedStart: 2, unorderedLineCount: 6);
+        }
+
+        [Fact]
+        public void AttributeRouting_CreatesOneActionDescriptor_PerControllerAndActionRouteCombination()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(MultiRouteAttributesController).GetTypeInfo());
+
+            // Act
+            var descriptors = provider.GetDescriptors();
+
+            // Assert
+            var actions = descriptors.Where(d => d.ActionName == "MultipleHttpGet");
+            Assert.Equal(4, actions.Count());
+
+            foreach (var action in actions)
+            {
+                Assert.Equal("MultipleHttpGet", action.ActionName);
+                Assert.Equal("MultiRouteAttributes", action.ControllerName);
+            }
+
+            Assert.Single(actions, a => a.AttributeRouteInfo.Template.Equals("v1/List"));
+            Assert.Single(actions, a => a.AttributeRouteInfo.Template.Equals("v1/All"));
+            Assert.Single(actions, a => a.AttributeRouteInfo.Template.Equals("v2/List"));
+            Assert.Single(actions, a => a.AttributeRouteInfo.Template.Equals("v2/All"));
+        }
+
+        [Fact]
+        public void AttributeRouting_AcceptVerbsOnAction_CreatesActionPerControllerAttributeRouteCombination()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(MultiRouteAttributesController).GetTypeInfo());
+
+            // Act
+            var descriptors = provider.GetDescriptors();
+
+            // Assert
+            var actions = descriptors.Where(d => d.ActionName == nameof(MultiRouteAttributesController.AcceptVerbs));
+            Assert.Equal(2, actions.Count());
+
+            foreach (var action in actions)
+            {
+                Assert.Equal("MultiRouteAttributes", action.ControllerName);
+
+                Assert.NotNull(action.ActionConstraints);
+                var methodConstraint = Assert.IsType<HttpMethodActionConstraint>(Assert.Single(action.ActionConstraints));
+
+                Assert.NotNull(methodConstraint.HttpMethods);
+                Assert.Equal(new[] { "POST" }, methodConstraint.HttpMethods);
+            }
+
+            Assert.Single(actions, a => a.AttributeRouteInfo.Template.Equals("v1/List"));
+            Assert.Single(actions, a => a.AttributeRouteInfo.Template.Equals("v2/List"));
+        }
+
+        [Fact]
+        public void AttributeRouting_AcceptVerbsOnActionWithOverrideTemplate_CreatesSingleAttributeRoutedAction()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(MultiRouteAttributesController).GetTypeInfo());
+
+            // Act
+            var descriptors = provider.GetDescriptors();
+
+            // Assert
+            var action = Assert.Single(descriptors, d => d.ActionName == "AcceptVerbsOverride");
+
+            Assert.Equal("MultiRouteAttributes", action.ControllerName);
+
+            Assert.NotNull(action.ActionConstraints);
+            var methodConstraint = Assert.IsType<HttpMethodActionConstraint>(Assert.Single(action.ActionConstraints));
+
+            Assert.NotNull(methodConstraint.HttpMethods);
+            Assert.Equal(new[] { "PUT" }, methodConstraint.HttpMethods);
+
+            Assert.NotNull(action.AttributeRouteInfo);
+            Assert.Equal("Override", action.AttributeRouteInfo.Template);
+        }
+
+        [Fact]
+        public void AttributeRouting_AcceptVerbsOnAction_WithoutTemplate_MergesVerb()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(MultiRouteAttributesController).GetTypeInfo());
+
+            // Act
+            var descriptors = provider.GetDescriptors();
+
+            // Assert
+            var actions = descriptors.Where(d => d.ActionName == "AcceptVerbsRouteAttributeAndHttpPut");
+            Assert.Equal(4, actions.Count());
+
+            foreach (var action in actions)
+            {
+                Assert.Equal("MultiRouteAttributes", action.ControllerName);
+
+                Assert.NotNull(action.AttributeRouteInfo);
+                Assert.NotNull(action.AttributeRouteInfo.Template);
+            }
+
+            var constrainedActions = actions.Where(a => a.ActionConstraints != null);
+            Assert.Equal(4, constrainedActions.Count());
+
+            // Actions generated by PutAttribute
+            var putActions = constrainedActions.Where(
+                a => a.ActionConstraints.OfType<HttpMethodActionConstraint>().Single().HttpMethods.Single() == "PUT");
+            Assert.Equal(2, putActions.Count());
+            Assert.Single(putActions, a => a.AttributeRouteInfo.Template.Equals("v1/All"));
+            Assert.Single(putActions, a => a.AttributeRouteInfo.Template.Equals("v2/All"));
+
+            // Actions generated by RouteAttribute
+            var routeActions = actions.Where(
+                a => a.ActionConstraints.OfType<HttpMethodActionConstraint>().Single().HttpMethods.Single() == "POST");
+            Assert.Equal(2, routeActions.Count());
+            Assert.Single(routeActions, a => a.AttributeRouteInfo.Template.Equals("v1/List"));
+            Assert.Single(routeActions, a => a.AttributeRouteInfo.Template.Equals("v2/List"));
+        }
+
+        [Fact]
+        public void AttributeRouting_AcceptVerbsOnAction_WithTemplate_DoesNotMergeVerb()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(MultiRouteAttributesController).GetTypeInfo());
+
+            // Act
+            var descriptors = provider.GetDescriptors();
+
+            // Assert
+            var actions = descriptors.Where(d => d.ActionName == "AcceptVerbsRouteAttributeWithTemplateAndHttpPut");
+            Assert.Equal(6, actions.Count());
+
+            foreach (var action in actions)
+            {
+                Assert.Equal("MultiRouteAttributes", action.ControllerName);
+
+                Assert.NotNull(action.AttributeRouteInfo);
+                Assert.NotNull(action.AttributeRouteInfo.Template);
+            }
+
+            var constrainedActions = actions.Where(a => a.ActionConstraints != null);
+            Assert.Equal(4, constrainedActions.Count());
+
+            // Actions generated by AcceptVerbs
+            var postActions = constrainedActions.Where(
+                a => a.ActionConstraints.OfType<HttpMethodActionConstraint>().Single().HttpMethods.Single() == "POST");
+            Assert.Equal(2, postActions.Count());
+            Assert.Single(postActions, a => a.AttributeRouteInfo.Template.Equals("v1"));
+            Assert.Single(postActions, a => a.AttributeRouteInfo.Template.Equals("v2"));
+
+            // Actions generated by PutAttribute
+            var putActions = constrainedActions.Where(
+                a => a.ActionConstraints.OfType<HttpMethodActionConstraint>().Single().HttpMethods.Single() == "PUT");
+            Assert.Equal(2, putActions.Count());
+            Assert.Single(putActions, a => a.AttributeRouteInfo.Template.Equals("v1/All"));
+            Assert.Single(putActions, a => a.AttributeRouteInfo.Template.Equals("v2/All"));
+
+            // Actions generated by RouteAttribute
+            var unconstrainedActions = actions.Where(a => a.ActionConstraints == null);
+            Assert.Equal(2, unconstrainedActions.Count());
+            Assert.Single(unconstrainedActions, a => a.AttributeRouteInfo.Template.Equals("v1/List"));
+            Assert.Single(unconstrainedActions, a => a.AttributeRouteInfo.Template.Equals("v2/List"));
+        }
+
+        [Fact]
+        public void AttributeRouting_AllowsDuplicateAttributeRoutedActions_WithTheSameTemplateAndSameHttpMethodsOnDifferentActions()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(NonDuplicatedAttributeRouteController).GetTypeInfo());
+            var firstActionName = nameof(NonDuplicatedAttributeRouteController.ControllerAndAction);
+            var secondActionName = nameof(NonDuplicatedAttributeRouteController.OverrideOnAction);
+
+            // Act
+            var actions = provider.GetDescriptors();
+
+            // Assert
+            var controllerAndAction = Assert.Single(actions, a => a.ActionName.Equals(firstActionName));
+            Assert.NotNull(controllerAndAction.AttributeRouteInfo);
+
+            var controllerActionAndOverride = Assert.Single(actions, a => a.ActionName.Equals(secondActionName));
+            Assert.NotNull(controllerActionAndOverride.AttributeRouteInfo);
+
+            Assert.Equal(
+                controllerAndAction.AttributeRouteInfo.Template,
+                controllerActionAndOverride.AttributeRouteInfo.Template,
+                StringComparer.OrdinalIgnoreCase);
+        }
+
+        [Fact]
+        public void AttributeRouting_AllowsDuplicateAttributeRoutedActions_WithTheSameTemplateAndDifferentHttpMethodsOnTheSameAction()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(NonDuplicatedAttributeRouteController).GetTypeInfo());
+            var actionName = nameof(NonDuplicatedAttributeRouteController.DifferentHttpMethods);
+
+            // Act
+            var descriptors = provider.GetDescriptors();
+
+            // Assert
+            var actions = descriptors.Where(d => d.ActionName.Equals(actionName));
+            Assert.Equal(5, actions.Count());
+
+            foreach (var method in new[] { "GET", "POST", "PUT", "PATCH", "DELETE" })
+            {
+                var action = Assert.Single(
+                    actions,
+                    a => a.ActionConstraints
+                        .OfType<HttpMethodActionConstraint>()
+                        .SelectMany(c => c.HttpMethods)
+                        .Contains(method));
+
+                Assert.NotNull(action.AttributeRouteInfo);
+                Assert.Equal("Products/list", action.AttributeRouteInfo.Template);
+            }
+        }
+
+        [Fact]
+        public void AttributeRouting_ThrowsIfAttributeRoutedAndNonAttributedActions_OnTheSameMethod()
+        {
+            // Arrange
+            var controllerTypeInfo = typeof(AttributeAndNonAttributeRoutedActionsOnSameMethodController).GetTypeInfo();
+            var assemblyName = controllerTypeInfo.Assembly.GetName().Name;
+
+            var expectedMessage =
+                "The following errors occurred with attribute routing information:" + Environment.NewLine +
+                Environment.NewLine +
+                "Error 1:" + Environment.NewLine +
+                $"A method '{controllerTypeInfo.FullName}.Method ({assemblyName})'" +
+                " must not define attribute routed actions and non attribute routed actions at the same time:" + Environment.NewLine +
+                $"Action: '{controllerTypeInfo.FullName}.Method ({assemblyName})' " +
+                "- Route Template: 'AttributeRouted' - " +
+                "HTTP Verbs: 'GET'" + Environment.NewLine +
+                $"Action: '{controllerTypeInfo.FullName}.Method ({assemblyName})' - " +
+                "Route Template: '(none)' - HTTP Verbs: 'DELETE, PATCH, POST, PUT'" + Environment.NewLine +
+                Environment.NewLine +
+                "Use 'AcceptVerbsAttribute' to create a single route that allows multiple HTTP verbs and defines a " +
+                "route, or set a route template in all attributes that constrain HTTP verbs.";
+
+            var provider = GetProvider(controllerTypeInfo);
+
+            // Act
+            var exception = Assert.Throws<InvalidOperationException>(() => provider.GetDescriptors());
+
+            // Assert
+            VerifyMultiLineError(expectedMessage, exception.Message, unorderedStart: 1, unorderedLineCount: 2);
+        }
+
+        // Verify that the expected exception and error message is thrown even when the user builds the model
+        // incorrectly.
+        [Fact]
+        public void AttributeRouting_ThrowsIfAttributeRoutedAndNonAttributedActions_OnTheSameMethod_UsingCustomConvention()
+        {
+            // Arrange
+            var controllerTypeInfo = typeof(UserController).GetTypeInfo();
+            var manager = GetApplicationManager(new[] { controllerTypeInfo });
+            var options = Options.Create(new MvcOptions());
+            options.Value.Conventions.Add(new TestRoutingConvention());
+            var modelProvider = new DefaultApplicationModelProvider(options, TestModelMetadataProvider.CreateDefaultProvider());
+            var provider = new ControllerActionDescriptorProvider(
+                manager,
+                new[] { modelProvider },
+                options);
+            var assemblyName = controllerTypeInfo.Assembly.GetName().Name;
+            var expectedMessage =
+                "The following errors occurred with attribute routing information:"
+                + Environment.NewLine
+                + Environment.NewLine
+                + "Error 1:"
+                + Environment.NewLine
+                + $"A method '{controllerTypeInfo.FullName}.GetUser ({assemblyName})'" +
+                " must not define attribute routed actions and non attribute routed actions at the same time:"
+                + Environment.NewLine +
+                $"Action: '{controllerTypeInfo.FullName}.GetUser ({assemblyName})' " +
+                "- Route Template: '(none)' - " +
+                "HTTP Verbs: ''"
+                + Environment.NewLine
+                + $"Action: '{controllerTypeInfo.FullName}.GetUser ({assemblyName})' " +
+                "- Route Template: 'Microsoft/AspNetCore/Mvc/Internal/User/GetUser/{id?}' - " +
+                "HTTP Verbs: ''" + Environment.NewLine +
+                Environment.NewLine +
+                "Use 'AcceptVerbsAttribute' to create a single route that allows multiple HTTP verbs and defines a " +
+                "route, or set a route template in all attributes that constrain HTTP verbs.";
+
+            // Act
+            var exception = Assert.Throws<InvalidOperationException>(() => provider.GetDescriptors());
+
+            // Assert
+            VerifyMultiLineError(expectedMessage, exception.Message, unorderedStart: 1, unorderedLineCount: 2);
+        }
+
+        [Fact]
+        public void AttributeRouting_RouteOnControllerAndAction_CreatesActionDescriptorWithoutHttpConstraints()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(OnlyRouteController).GetTypeInfo());
+
+            // Act
+            var actions = provider.GetDescriptors();
+
+            // Assert
+            var action = Assert.Single(actions);
+
+            Assert.Equal("Action", action.ActionName);
+            Assert.Equal("OnlyRoute", action.ControllerName);
+
+            Assert.NotNull(action.AttributeRouteInfo);
+            Assert.Equal("Products/Index", action.AttributeRouteInfo.Template);
+
+            Assert.Null(action.ActionConstraints);
+        }
+
+        [Fact]
+        public void AttributeRouting_Name_ThrowsIfMultipleActions_WithDifferentTemplatesHaveTheSameName()
+        {
+            // Arrange
+            var sameNameType = typeof(SameNameDifferentTemplatesController).GetTypeInfo();
+            var provider = GetProvider(sameNameType);
+
+            var assemblyName = sameNameType.Assembly.GetName().Name;
+            var expectedMessage =
+                "The following errors occurred with attribute routing information:"
+                + Environment.NewLine + Environment.NewLine +
+                "Error 1:" + Environment.NewLine +
+                "Attribute routes with the same name 'Products' must have the same template:"
+                + Environment.NewLine +
+                $"Action: '{sameNameType.FullName}.Get ({assemblyName})' - Template: 'Products'"
+                + Environment.NewLine +
+                $"Action: '{sameNameType.FullName}.Get ({assemblyName})' - Template: 'Products/{{id}}'"
+                + Environment.NewLine +
+                $"Action: '{sameNameType.FullName}.Put ({assemblyName})' - Template: 'Products/{{id}}'"
+                + Environment.NewLine +
+                $"Action: '{sameNameType.FullName}.Post ({assemblyName})' - Template: 'Products'"
+                + Environment.NewLine +
+                $"Action: '{sameNameType.FullName}.Delete ({assemblyName})' - Template: 'Products/{{id}}'"
+                + Environment.NewLine + Environment.NewLine +
+                "Error 2:" + Environment.NewLine +
+                "Attribute routes with the same name 'Items' must have the same template:"
+                + Environment.NewLine +
+                $"Action: '{sameNameType.FullName}.GetItems ({assemblyName})' - Template: 'Items/{{id}}'"
+                + Environment.NewLine +
+                $"Action: '{sameNameType.FullName}.PostItems ({assemblyName})' - Template: 'Items'"
+                + Environment.NewLine +
+                $"Action: '{sameNameType.FullName}.PutItems ({assemblyName})' - Template: 'Items/{{id}}'"
+                + Environment.NewLine +
+                $"Action: '{sameNameType.FullName}.DeleteItems ({assemblyName})' - Template: 'Items/{{id}}'"
+                + Environment.NewLine +
+                $"Action: '{sameNameType.FullName}.PatchItems ({assemblyName})' - Template: 'Items'";
+
+            // Act
+            var ex = Assert.Throws<InvalidOperationException>(() => { provider.GetDescriptors(); });
+
+            // Assert
+            Assert.Equal(expectedMessage, ex.Message);
+        }
+
+        [Fact]
+        public void AttributeRouting_Name_AllowsMultipleAttributeRoutesInDifferentActions_WithTheSameNameAndTemplate()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(DifferentCasingsAttributeRouteNamesController).GetTypeInfo());
+
+            // Act
+            var descriptors = provider.GetDescriptors();
+
+            // Assert
+            foreach (var descriptor in descriptors)
+            {
+                Assert.NotNull(descriptor.AttributeRouteInfo);
+                Assert.Equal("{id}", descriptor.AttributeRouteInfo.Template, StringComparer.OrdinalIgnoreCase);
+                Assert.Equal("Products", descriptor.AttributeRouteInfo.Name, StringComparer.OrdinalIgnoreCase);
+            }
+        }
+
+        [Fact]
+        public void AttributeRouting_RouteNameTokenReplace_AllowsMultipleActions_WithSameRouteNameTemplate()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(ActionRouteNameTemplatesController).GetTypeInfo());
+            var editActionName = nameof(ActionRouteNameTemplatesController.Edit);
+            var getActionName = nameof(ActionRouteNameTemplatesController.Get);
+
+            // Act
+            var actions = provider.GetDescriptors();
+
+            // Assert
+            var getActions = actions.Where(a => a.ActionName.Equals(getActionName));
+            Assert.Equal(2, getActions.Count());
+
+            foreach (var getAction in getActions)
+            {
+                Assert.NotNull(getAction.AttributeRouteInfo);
+                Assert.Equal("Products/Get", getAction.AttributeRouteInfo.Template, StringComparer.OrdinalIgnoreCase);
+                Assert.Equal("Products_Get", getAction.AttributeRouteInfo.Name, StringComparer.OrdinalIgnoreCase);
+            }
+
+            var editAction = Assert.Single(actions, a => a.ActionName.Equals(editActionName));
+            Assert.NotNull(editAction.AttributeRouteInfo);
+            Assert.Equal("Products/Edit", editAction.AttributeRouteInfo.Template, StringComparer.OrdinalIgnoreCase);
+            Assert.Equal("Products_Edit", editAction.AttributeRouteInfo.Name, StringComparer.OrdinalIgnoreCase);
+        }
+
+        [Fact]
+        public void AttributeRouting_RouteNameTokenReplace_AreaControllerActionTokensInRoute()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(ControllerActionRouteNameTemplatesController).GetTypeInfo());
+            var editActionName = nameof(ControllerActionRouteNameTemplatesController.Edit);
+            var getActionName = nameof(ControllerActionRouteNameTemplatesController.Get);
+
+            // Act
+            var actions = provider.GetDescriptors();
+
+            // Assert
+            var getActions = actions.Where(a => a.ActionName.Equals(getActionName));
+            Assert.Equal(2, getActions.Count());
+
+            foreach (var getAction in getActions)
+            {
+                Assert.NotNull(getAction.AttributeRouteInfo);
+                Assert.Equal(
+                    "ControllerActionRouteNameTemplates/Get",
+                    getAction.AttributeRouteInfo.Template, StringComparer.OrdinalIgnoreCase);
+                Assert.Equal(
+                    "Products_ControllerActionRouteNameTemplates_Get",
+                    getAction.AttributeRouteInfo.Name, StringComparer.OrdinalIgnoreCase);
+            }
+
+            var editAction = Assert.Single(actions, a => a.ActionName.Equals(editActionName));
+            Assert.NotNull(editAction.AttributeRouteInfo);
+            Assert.Equal(
+                "ControllerActionRouteNameTemplates/Edit",
+                editAction.AttributeRouteInfo.Template, StringComparer.OrdinalIgnoreCase);
+            Assert.Equal(
+                "Products_ControllerActionRouteNameTemplates_Edit",
+                editAction.AttributeRouteInfo.Name, StringComparer.OrdinalIgnoreCase);
+        }
+
+        [Fact]
+        public void AttributeRouting_RouteNameTokenReplace_InvalidToken()
+        {
+            // Arrange
+            var controllerTypeInfo = typeof(RouteNameIncorrectTokenController).GetTypeInfo();
+            var assemblyName = controllerTypeInfo.Assembly.GetName().Name;
+
+            var provider = GetProvider(controllerTypeInfo);
+
+            var expectedMessage =
+                "The following errors occurred with attribute routing information:" + Environment.NewLine +
+                Environment.NewLine +
+                "Error 1:" + Environment.NewLine +
+                $"For action: '{controllerTypeInfo.FullName}.Get ({assemblyName})'" + Environment.NewLine +
+                "Error: While processing template 'Products_[unknown]', a replacement value for the token 'unknown' " +
+                "could not be found. Available tokens: 'action, controller'. To use a '[' or ']' as a literal string" +
+                " in a route or within a constraint, use '[[' or ']]' instead.";
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => { provider.GetDescriptors(); });
+            Assert.Equal(expectedMessage, ex.Message);
+        }
+
+        [Fact]
+        public void AttributeRouting_AddsDefaultRouteValues_ForAttributeRoutedActions()
+        {
+            // Arrange
+            var provider = GetProvider(
+                typeof(ConventionalAndAttributeRoutedActionsWithAreaController).GetTypeInfo(),
+                typeof(ConstrainedController).GetTypeInfo());
+
+            // Act
+            var actionDescriptors = provider.GetDescriptors();
+
+            // Assert
+            Assert.NotNull(actionDescriptors);
+            Assert.Equal(4, actionDescriptors.Count());
+
+            var indexAction = Assert.Single(actionDescriptors, ad => ad.ActionName.Equals("Index"));
+
+            Assert.Equal(3, indexAction.RouteValues.Count);
+
+            var controllerDefault = Assert.Single(indexAction.RouteValues, rd => rd.Key.Equals("controller", StringComparison.OrdinalIgnoreCase));
+            Assert.Equal("ConventionalAndAttributeRoutedActionsWithArea", controllerDefault.Value);
+
+            var actionDefault = Assert.Single(indexAction.RouteValues, rd => rd.Key.Equals("action", StringComparison.OrdinalIgnoreCase));
+            Assert.Equal("Index", actionDefault.Value);
+
+            var areaDefault = Assert.Single(indexAction.RouteValues, rd => rd.Key.Equals("area", StringComparison.OrdinalIgnoreCase));
+            Assert.Equal("Home", areaDefault.Value);
+        }
+
+        [Fact]
+        public void AttributeRouting_TokenReplacement_CaseInsensitive()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(CaseInsensitiveController).GetTypeInfo());
+
+            // Act
+            var actions = provider.GetDescriptors();
+
+            // Assert
+            var action = Assert.Single(actions);
+            Assert.Equal("stub/ThisIsAnAction", action.AttributeRouteInfo.Template);
+        }
+
+        // Parameters are validated later. This action uses the forbidden {action} and {controller}
+        [Fact]
+        public void AttributeRouting_DoesNotValidateParameters()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(InvalidParametersController).GetTypeInfo());
+
+            // Act
+            var actions = provider.GetDescriptors();
+
+            // Assert
+            var action = Assert.Single(actions);
+            Assert.Equal("stub/{controller}/{action}", action.AttributeRouteInfo.Template);
+        }
+
+        [Fact]
+        public void ApiExplorer_SetsExtensionData_WhenVisible()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(ApiExplorerVisibleController).GetTypeInfo());
+
+            // Act
+            var actions = provider.GetDescriptors();
+
+            // Assert
+            var action = Assert.Single(actions);
+            Assert.NotNull(action.GetProperty<ApiDescriptionActionData>());
+        }
+
+        [Fact]
+        public void ApiExplorer_SetsExtensionData_WhenVisible_CanOverrideControllerOnAction()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(ApiExplorerVisibilityOverrideController).GetTypeInfo());
+
+            // Act
+            var actions = provider.GetDescriptors();
+
+            // Assert
+            Assert.Equal(2, actions.Count());
+
+            var action = Assert.Single(actions, a => a.ActionName == "Edit");
+            Assert.NotNull(action.GetProperty<ApiDescriptionActionData>());
+
+            action = Assert.Single(actions, a => a.ActionName == "Create");
+            Assert.Null(action.GetProperty<ApiDescriptionActionData>());
+        }
+
+        [Theory]
+        [InlineData(typeof(ApiExplorerNotVisibleController))]
+        [InlineData(typeof(ApiExplorerExplicitlyNotVisibleController))]
+        [InlineData(typeof(ApiExplorerExplicitlyNotVisibleOnActionController))]
+        public void ApiExplorer_DoesNotSetExtensionData_WhenNotVisible(Type controllerType)
+        {
+            // Arrange
+            var provider = GetProvider(controllerType.GetTypeInfo());
+
+            // Act
+            var actions = provider.GetDescriptors();
+
+            // Assert
+            var action = Assert.Single(actions);
+            Assert.Null(action.GetProperty<ApiDescriptionActionData>());
+        }
+
+        [Fact]
+        public void ApiExplorer_SetsName_DefaultToNull()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(ApiExplorerNoNameController).GetTypeInfo());
+
+            // Act
+            var actions = provider.GetDescriptors();
+
+            // Assert
+
+            var action = Assert.Single(actions);
+            Assert.Null(action.GetProperty<ApiDescriptionActionData>().GroupName);
+        }
+
+        [Fact]
+        public void ApiExplorer_SetsName_OnController()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(ApiExplorerNameOnControllerController).GetTypeInfo());
+
+            // Act
+            var actions = provider.GetDescriptors();
+
+            // Assert
+
+            var action = Assert.Single(actions);
+            Assert.Equal("Store", action.GetProperty<ApiDescriptionActionData>().GroupName);
+        }
+
+        [Fact]
+        public void ApiExplorer_SetsName_OnAction()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(ApiExplorerNameOnActionController).GetTypeInfo());
+
+            // Act
+            var actions = provider.GetDescriptors();
+
+            // Assert
+            var action = Assert.Single(actions);
+            Assert.Equal("Blog", action.GetProperty<ApiDescriptionActionData>().GroupName);
+        }
+
+        [Fact]
+        public void ApiExplorer_SetsName_CanOverrideControllerOnAction()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(ApiExplorerNameOverrideController).GetTypeInfo());
+
+            // Act
+            var actions = provider.GetDescriptors();
+
+            // Assert
+            Assert.Equal(2, actions.Count());
+
+            var action = Assert.Single(actions, a => a.ActionName == "Edit");
+            Assert.Equal("Blog", action.GetProperty<ApiDescriptionActionData>().GroupName);
+
+            action = Assert.Single(actions, a => a.ActionName == "Create");
+            Assert.Equal("Store", action.GetProperty<ApiDescriptionActionData>().GroupName);
+        }
+
+        [Fact]
+        public void ApiExplorer_IsVisibleOnApplication_CanOverrideOnController()
+        {
+            // Arrange
+            var convention = new ApiExplorerIsVisibleConvention(isVisible: true);
+            var provider = GetProvider(typeof(ApiExplorerExplicitlyNotVisibleController).GetTypeInfo(), convention);
+
+            // Act
+            var actions = provider.GetDescriptors();
+
+            // Assert
+            var action = Assert.Single(actions);
+            Assert.Null(action.GetProperty<ApiDescriptionActionData>());
+        }
+
+        [Fact]
+        public void ApiExplorer_IsVisibleOnApplication_CanOverrideOnAction()
+        {
+            // Arrange
+            var convention = new ApiExplorerIsVisibleConvention(isVisible: true);
+            var provider = GetProvider(
+                typeof(ApiExplorerExplicitlyNotVisibleOnActionController).GetTypeInfo(),
+                convention);
+
+            // Act
+            var actions = provider.GetDescriptors();
+
+            // Assert
+            var action = Assert.Single(actions);
+            Assert.Null(action.GetProperty<ApiDescriptionActionData>());
+        }
+
+        [Theory]
+        [InlineData("A", typeof(ApiExplorerEnabledConventionalRoutedController))]
+        [InlineData("A", typeof(ApiExplorerEnabledActionConventionalRoutedController))]
+        public void ApiExplorer_ThrowsForContentionalRouting(string actionName, Type type)
+        {
+            // Arrange
+            var assemblyName = type.GetTypeInfo().Assembly.GetName().Name;
+            var expected = $"The action '{type.FullName}.{actionName} ({assemblyName})' has ApiExplorer enabled, but is using conventional routing. " +
+                "Only actions which use attribute routing support ApiExplorer.";
+
+            var provider = GetProvider(type.GetTypeInfo());
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => provider.GetDescriptors());
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public void ApiExplorer_SkipsConventionalRoutedController_WhenConfiguredOnApplication()
+        {
+            // Arrange
+            var convention = new ApiExplorerIsVisibleConvention(isVisible: true);
+            var provider = GetProvider(
+                typeof(ConventionallyRoutedController).GetTypeInfo(),
+                convention);
+
+            // Act
+            var actions = provider.GetDescriptors();
+
+            // Assert
+            var action = Assert.Single(actions);
+            Assert.Null(action.GetProperty<ApiDescriptionActionData>());
+        }
+
+        // Verifies the sequence of conventions running
+        [Fact]
+        public void ApplyConventions_RunsInOrderOfDecreasingScope()
+        {
+            // Arrange
+            var sequence = 0;
+
+            var applicationConvention = new Mock<IApplicationModelConvention>();
+            applicationConvention
+                .Setup(c => c.Apply(It.IsAny<ApplicationModel>()))
+                .Callback(() => { Assert.Equal(0, sequence++); });
+
+            var controllerConvention = new Mock<IControllerModelConvention>();
+            controllerConvention
+                .Setup(c => c.Apply(It.IsAny<ControllerModel>()))
+                .Callback(() => { Assert.Equal(1, sequence++); });
+
+            var actionConvention = new Mock<IActionModelConvention>();
+            actionConvention
+                .Setup(c => c.Apply(It.IsAny<ActionModel>()))
+                .Callback(() => { Assert.Equal(2, sequence++); });
+
+            var parameterConvention = new Mock<IParameterModelConvention>();
+            parameterConvention
+                .Setup(c => c.Apply(It.IsAny<ParameterModel>()))
+                .Callback(() => { Assert.Equal(3, sequence++); });
+
+            var options = Options.Create(new MvcOptions());
+            options.Value.Conventions.Add(applicationConvention.Object);
+
+            var applicationModel = new ApplicationModel();
+
+            var controller = new ControllerModel(typeof(ConventionsController).GetTypeInfo(),
+                                                 new List<object>() { controllerConvention.Object });
+            controller.Application = applicationModel;
+            applicationModel.Controllers.Add(controller);
+
+            var methodInfo = typeof(ConventionsController).GetMethod("Create");
+            var actionModel = new ActionModel(methodInfo, new List<object>() { actionConvention.Object });
+            actionModel.Controller = controller;
+            controller.Actions.Add(actionModel);
+
+            var parameterInfo = actionModel.ActionMethod.GetParameters().Single();
+            var parameterModel = new ParameterModel(parameterInfo,
+                                           new List<object>() { parameterConvention.Object });
+            parameterModel.Action = actionModel;
+            actionModel.Parameters.Add(parameterModel);
+
+            // Act
+            ApplicationModelConventions.ApplyConventions(applicationModel, options.Value.Conventions);
+
+            // Assert
+            Assert.Equal(4, sequence);
+        }
+
+        [Fact]
+        public void BuildModel_SplitsConstraintsBasedOnRoute()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(MultipleRouteProviderOnActionController).GetTypeInfo());
+
+            // Act
+            var model = provider.BuildModel();
+
+            // Assert
+            var controllerModel = Assert.Single(model.Controllers);
+            var actionModel = Assert.Single(controllerModel.Actions);
+            Assert.Equal(3, actionModel.Attributes.Count);
+            Assert.Equal(2, actionModel.Attributes.OfType<RouteAndConstraintAttribute>().Count());
+            Assert.Single(actionModel.Attributes.OfType<ConstraintAttribute>());
+            Assert.Equal(2, actionModel.Selectors.Count);
+
+            var selectorModel = Assert.Single(
+                actionModel.Selectors.Where(sm => sm.AttributeRouteModel?.Template == "R1"));
+
+            Assert.Equal(2, selectorModel.ActionConstraints.Count);
+            Assert.Single(selectorModel.ActionConstraints.OfType<RouteAndConstraintAttribute>());
+            Assert.Single(selectorModel.ActionConstraints.OfType<ConstraintAttribute>());
+
+            selectorModel = Assert.Single(
+                actionModel.Selectors.Where(sm => sm.AttributeRouteModel?.Template == "R2"));
+
+            Assert.Equal(2, selectorModel.ActionConstraints.Count);
+            Assert.Single(selectorModel.ActionConstraints.OfType<RouteAndConstraintAttribute>());
+            Assert.Single(selectorModel.ActionConstraints.OfType<ConstraintAttribute>());
+        }
+
+        [Fact]
+        public void GetDescriptors_SplitsConstraintsBasedOnRoute()
+        {
+            // Arrange
+            var provider = GetProvider(typeof(MultipleRouteProviderOnActionController).GetTypeInfo());
+
+            // Act
+            var actions = provider.GetDescriptors();
+
+            // Assert
+            Assert.Equal(2, actions.Count());
+
+            var action = Assert.Single(actions, a => a.AttributeRouteInfo.Template == "R1");
+
+            Assert.Equal(2, action.ActionConstraints.Count);
+            Assert.Single(action.ActionConstraints, a => a is RouteAndConstraintAttribute);
+            Assert.Single(action.ActionConstraints, a => a is ConstraintAttribute);
+
+            action = Assert.Single(actions, a => a.AttributeRouteInfo.Template == "R2");
+
+            Assert.Equal(2, action.ActionConstraints.Count);
+            Assert.Single(action.ActionConstraints, a => a is RouteAndConstraintAttribute);
+            Assert.Single(action.ActionConstraints, a => a is ConstraintAttribute);
+        }
+
+        [Fact]
+        public void GetDescriptors_SplitsConstraintsBasedOnControllerRoute()
+        {
+            // Arrange
+            var actionName = nameof(MultipleRouteProviderOnActionAndControllerController.Edit);
+            var provider = GetProvider(typeof(MultipleRouteProviderOnActionAndControllerController).GetTypeInfo());
+
+            // Act
+            var actions = provider.GetDescriptors().Where(a => a.ActionName == actionName);
+
+            // Assert
+            Assert.Equal(2, actions.Count());
+
+            var action = Assert.Single(actions, a => a.AttributeRouteInfo.Template == "C1/A1");
+            Assert.Equal(3, action.ActionConstraints.Count);
+            Assert.Single(action.ActionConstraints, a => (a as RouteAndConstraintAttribute)?.Template == "C1");
+            Assert.Single(action.ActionConstraints, a => (a as RouteAndConstraintAttribute)?.Template == "A1");
+            Assert.Single(action.ActionConstraints, a => a is ConstraintAttribute);
+
+            action = Assert.Single(actions, a => a.AttributeRouteInfo.Template == "C2/A1");
+            Assert.Equal(3, action.ActionConstraints.Count);
+            Assert.Single(action.ActionConstraints, a => (a as RouteAndConstraintAttribute)?.Template == "C2");
+            Assert.Single(action.ActionConstraints, a => (a as RouteAndConstraintAttribute)?.Template == "A1");
+            Assert.Single(action.ActionConstraints, a => a is ConstraintAttribute);
+        }
+
+        [Fact]
+        public void GetDescriptors_SplitsConstraintsBasedOnControllerRoute_MultipleRoutesOnAction()
+        {
+            // Arrange
+            var actionName = nameof(MultipleRouteProviderOnActionAndControllerController.Delete);
+
+            var provider = GetProvider(typeof(MultipleRouteProviderOnActionAndControllerController).GetTypeInfo());
+
+            // Act
+            var actions = provider.GetDescriptors().Where(a => a.ActionName == actionName);
+
+            // Assert
+            Assert.Equal(4, actions.Count());
+
+            var action = Assert.Single(actions, a => a.AttributeRouteInfo.Template == "C1/A3");
+            Assert.Equal(3, action.ActionConstraints.Count);
+            Assert.Single(action.ActionConstraints, a => (a as RouteAndConstraintAttribute)?.Template == "C1");
+            Assert.Single(action.ActionConstraints, a => (a as RouteAndConstraintAttribute)?.Template == "A3");
+            Assert.Single(action.ActionConstraints, a => a is ConstraintAttribute);
+
+            action = Assert.Single(actions, a => a.AttributeRouteInfo.Template == "C2/A3");
+            Assert.Equal(3, action.ActionConstraints.Count);
+            Assert.Single(action.ActionConstraints, a => (a as RouteAndConstraintAttribute)?.Template == "C2");
+            Assert.Single(action.ActionConstraints, a => (a as RouteAndConstraintAttribute)?.Template == "A3");
+            Assert.Single(action.ActionConstraints, a => a is ConstraintAttribute);
+
+            action = Assert.Single(actions, a => a.AttributeRouteInfo.Template == "C1/A4");
+            Assert.Equal(3, action.ActionConstraints.Count);
+            Assert.Single(action.ActionConstraints, a => (a as RouteAndConstraintAttribute)?.Template == "C1");
+            Assert.Single(action.ActionConstraints, a => (a as RouteAndConstraintAttribute)?.Template == "A4");
+            Assert.Single(action.ActionConstraints, a => a is ConstraintAttribute);
+
+            action = Assert.Single(actions, a => a.AttributeRouteInfo.Template == "C2/A4");
+            Assert.Equal(3, action.ActionConstraints.Count);
+            Assert.Single(action.ActionConstraints, a => (a as RouteAndConstraintAttribute)?.Template == "C2");
+            Assert.Single(action.ActionConstraints, a => (a as RouteAndConstraintAttribute)?.Template == "A4");
+            Assert.Single(action.ActionConstraints, a => a is ConstraintAttribute);
+        }
+
+        // This method overrides the route from the controller, and so doesn't inherit its metadata.
+        [Fact]
+        public void GetDescriptors_SplitsConstraintsBasedOnControllerRoute_Override()
+        {
+            // Arrange
+            var actionName = nameof(MultipleRouteProviderOnActionAndControllerController.Create);
+            var provider = GetProvider(typeof(MultipleRouteProviderOnActionAndControllerController).GetTypeInfo());
+
+            // Act
+            var actions = provider.GetDescriptors().Where(a => a.ActionName == actionName);
+
+            // Assert
+            Assert.Single(actions);
+
+            var action = Assert.Single(actions, a => a.AttributeRouteInfo.Template == "A2");
+            Assert.Equal(2, action.ActionConstraints.Count);
+            Assert.Single(action.ActionConstraints, a => (a as RouteAndConstraintAttribute)?.Template == "~/A2");
+            Assert.Single(action.ActionConstraints, a => a is ConstraintAttribute);
+        }
+
+        [Fact]
+        public void OnProviderExecuted_AddsGlobalRouteValues()
+        {
+            // Arrange
+            var context = new ActionDescriptorProviderContext();
+            context.Results.Add(new ActionDescriptor()
+            {
+                RouteValues = new Dictionary<string, string>()
+                {
+                    { "controller", "Home" },
+                    { "action", "Index" },
+                }
+            });
+            context.Results.Add(new ActionDescriptor()
+            {
+                RouteValues = new Dictionary<string, string>()
+                {
+                    { "page", "/Some/Page" }
+                }
+            });
+
+            var provider = GetProvider();
+
+            // Act
+            provider.OnProvidersExecuted(context);
+
+            // Assert
+            Assert.True(context.Results[0].RouteValues.ContainsKey("page"));
+            Assert.Null(context.Results[0].RouteValues["page"]);
+
+            Assert.True(context.Results[1].RouteValues.ContainsKey("controller"));
+            Assert.Null(context.Results[1].RouteValues["controller"]);
+            Assert.True(context.Results[1].RouteValues.ContainsKey("action"));
+            Assert.Null(context.Results[1].RouteValues["action"]);
+        }
+
+        private ControllerActionDescriptorProvider GetProvider(
+            TypeInfo controllerTypeInfo,
+            IEnumerable<IFilterMetadata> filters = null)
+        {
+            var options = Options.Create(new MvcOptions());
+            if (filters != null)
+            {
+                foreach (var filter in filters)
+                {
+                    options.Value.Filters.Add(filter);
+                }
+            }
+
+            var manager = GetApplicationManager(new[] { controllerTypeInfo });
+
+            var modelProvider = new DefaultApplicationModelProvider(options, TestModelMetadataProvider.CreateDefaultProvider());
+
+            var provider = new ControllerActionDescriptorProvider(
+                manager,
+                new[] { modelProvider },
+                options);
+
+            return provider;
+        }
+
+        private ControllerActionDescriptorProvider GetProvider(
+            params TypeInfo[] controllerTypeInfos)
+        {
+            var options = Options.Create(new MvcOptions());
+
+            var manager = GetApplicationManager(controllerTypeInfos);
+            var modelProvider = new DefaultApplicationModelProvider(options, TestModelMetadataProvider.CreateDefaultProvider());
+
+            var provider = new ControllerActionDescriptorProvider(
+                manager,
+                new[] { modelProvider },
+                options);
+
+            return provider;
+        }
+
+        private ControllerActionDescriptorProvider GetProvider(
+            TypeInfo controllerTypeInfo,
+            IApplicationModelConvention convention)
+        {
+            var options = Options.Create(new MvcOptions());
+            options.Value.Conventions.Add(convention);
+
+            var manager = GetApplicationManager(new[] { controllerTypeInfo });
+
+            var modelProvider = new DefaultApplicationModelProvider(options, TestModelMetadataProvider.CreateDefaultProvider());
+
+            var provider = new ControllerActionDescriptorProvider(
+                manager,
+                new[] { modelProvider },
+                options);
+
+            return provider;
+        }
+
+        private static ApplicationPartManager GetApplicationManager(IEnumerable<TypeInfo> controllerTypes)
+        {
+            var manager = new ApplicationPartManager();
+            manager.ApplicationParts.Add(new TestApplicationPart(controllerTypes));
+            manager.FeatureProviders.Add(new TestFeatureProvider());
+            return manager;
+        }
+
+        private IEnumerable<ActionDescriptor> GetDescriptors(params TypeInfo[] controllerTypeInfos)
+        {
+            var provider = GetProvider(controllerTypeInfos);
+            return provider.GetDescriptors();
+        }
+
+        private static void VerifyMultiLineError(
+            string expectedMessage,
+            string actualMessage,
+            int unorderedStart,
+            int unorderedLineCount)
+        {
+            var expectedLines = expectedMessage
+                .Split(new[] { Environment.NewLine }, StringSplitOptions.None)
+                .ToArray();
+
+            var actualLines = actualMessage
+                .Split(new[] { Environment.NewLine }, StringSplitOptions.None)
+                .ToArray();
+
+            for (var i = 0; i < unorderedStart; i++)
+            {
+                Assert.Equal(expectedLines[i], actualLines[i]);
+            }
+
+            var orderedExpectedLines = expectedLines
+                .Skip(unorderedStart)
+                .Take(unorderedLineCount)
+                .OrderBy(l => l, StringComparer.Ordinal)
+                .ToArray();
+
+            var orderedActualLines = actualLines
+                .Skip(unorderedStart)
+                .Take(unorderedLineCount)
+                .OrderBy(l => l, StringComparer.Ordinal)
+                .ToArray();
+
+            for (var i = 0; i < unorderedLineCount; i++)
+            {
+                Assert.Equal(orderedExpectedLines[i], orderedActualLines[i]);
+            }
+
+            for (var i = unorderedStart + unorderedLineCount; i < expectedLines.Length; i++)
+            {
+                Assert.Equal(expectedLines[i], actualLines[i]);
+            }
+
+            Assert.Equal(expectedLines.Length, actualLines.Length);
+        }
+
+        private class HttpMethodController
+        {
+            [HttpPost]
+            public void OnlyPost()
+            {
+            }
+        }
+
+        [Route("Items")]
+        private class AttributeRoutedHttpMethodController
+        {
+            [CustomHttpMethodConstraint("PUT", "PATCH")]
+            public void PutOrPatch() { }
+        }
+
+        private class PersonController
+        {
+            public void GetPerson()
+            { }
+
+            [ActionName("ShowPeople")]
+            public void ListPeople()
+            { }
+
+            [NonAction]
+            public void NotAnAction()
+            { }
+        }
+
+        private class MyRouteValueAttribute : RouteValueAttribute
+        {
+            public MyRouteValueAttribute()
+                : base("key", "value")
+            {
+            }
+        }
+
+        private class MySecondRouteValueAttribute : RouteValueAttribute
+        {
+            public MySecondRouteValueAttribute()
+                : base("second", "value")
+            {
+            }
+        }
+
+        [MyRouteValue]
+        private class RouteValueController
+        {
+            public void Edit()
+            {
+            }
+        }
+
+        private class MyFilterAttribute : Attribute, IFilterMetadata
+        {
+            public MyFilterAttribute(int value)
+            {
+                Value = value;
+            }
+
+            public int Value { get; private set; }
+        }
+
+        [MyFilter(2)]
+        private class FiltersController
+        {
+            [MyFilter(3)]
+            public void FilterAction()
+            {
+            }
+        }
+
+        [Route("api/Token/[key]/[controller]")]
+        [MyRouteValue]
+        private class TokenReplacementController
+        {
+            [HttpGet("stub/[action]")]
+            public void ThisIsAnAction() { }
+        }
+
+        private class CaseInsensitiveController
+        {
+            [HttpGet("stub/[ActIon]")]
+            public void ThisIsAnAction() { }
+        }
+
+        private class MultipleErrorsController
+        {
+            [HttpGet("stub/[action]/[unknown]")]
+            public void Unknown() { }
+
+            [HttpGet("[invalid/syntax")]
+            public void Invalid() { }
+        }
+
+        private class InvalidParametersController
+        {
+            [HttpGet("stub/{controller}/{action}")]
+            public void Action1() { }
+        }
+
+        private class SameGroupIdController
+        {
+            [HttpGet("stub/[action]")]
+            public void Action1() { }
+
+            [HttpGet("stub/Action1")]
+            public void Action2() { }
+        }
+
+        [Area("Home")]
+        private class ConventionalAndAttributeRoutedActionsWithAreaController
+        {
+            [HttpGet("Index")]
+            public void Index() { }
+
+            [HttpGet("Edit")]
+            public void Edit() { }
+
+            public void AnotherNonAttributedAction() { }
+        }
+
+        [Route("Products", Name = "Products")]
+        private class SameNameDifferentTemplatesController
+        {
+            [HttpGet]
+            public void Get() { }
+
+            [HttpGet("{id}", Name = "Products")]
+            public void Get(int id) { }
+
+            [HttpPut("{id}", Name = "Products")]
+            public void Put(int id) { }
+
+            [HttpPost]
+            public void Post() { }
+
+            [HttpDelete("{id}", Name = "Products")]
+            public void Delete(int id) { }
+
+            [HttpGet("/Items/{id}", Name = "Items")]
+            public void GetItems(int id) { }
+
+            [HttpPost("/Items", Name = "Items")]
+            public void PostItems() { }
+
+            [HttpPut("/Items/{id}", Name = "Items")]
+            public void PutItems(int id) { }
+
+            [HttpDelete("/Items/{id}", Name = "Items")]
+            public void DeleteItems(int id) { }
+
+            [HttpPatch("/Items", Name = "Items")]
+            public void PatchItems() { }
+        }
+
+        [Route("Products/[action]", Name = "Products_[action]")]
+        private class ActionRouteNameTemplatesController
+        {
+            [HttpGet]
+            public void Get() { }
+
+            [HttpPost]
+            public void Get(int id) { }
+
+            public void Edit() { }
+        }
+
+        [Area("Products")]
+        [Route("[controller]/[action]", Name = "[area]_[controller]_[action]")]
+        private class ControllerActionRouteNameTemplatesController
+        {
+            [HttpGet]
+            public void Get() { }
+
+            [HttpPost]
+            public void Get(int id) { }
+
+            public void Edit() { }
+        }
+
+        [Route("Products/[action]", Name = "Products_[unknown]")]
+        private class RouteNameIncorrectTokenController
+        {
+            public void Get() { }
+        }
+
+        private class DifferentCasingsAttributeRouteNamesController
+        {
+            [HttpGet("{id}", Name = "Products")]
+            public void Get() { }
+
+            [HttpGet("{ID}", Name = "Products")]
+            public void Get(int id) { }
+
+            [HttpPut("{id}", Name = "PRODUCTS")]
+            public void Put(int id) { }
+
+            [HttpDelete("{ID}", Order = 1, Name = "PRODUCTS")]
+            public void Delete(int id) { }
+        }
+
+        [Route("v1")]
+        [Route("v2")]
+        public class MultiRouteAttributesController
+        {
+            [HttpGet("List")]
+            [HttpGet("All")]
+            public void MultipleHttpGet() { }
+
+            [AcceptVerbs("POST", Route = "List")]
+            public void AcceptVerbs() { }
+
+            [AcceptVerbs("PUT", Route = "/Override")]
+            public void AcceptVerbsOverride() { }
+
+            [AcceptVerbs("POST")]
+            [Route("List")]
+            [HttpPut("All")]
+            public void AcceptVerbsRouteAttributeAndHttpPut() { }
+
+            [AcceptVerbs("POST", Route = "")]
+            [Route("List")]
+            [HttpPut("All")]
+            public void AcceptVerbsRouteAttributeWithTemplateAndHttpPut() { }
+        }
+
+        [Route("Products")]
+        public class OnlyRouteController
+        {
+            [Route("Index")]
+            public void Action() { }
+        }
+
+        public class AttributeAndNonAttributeRoutedActionsOnSameMethodController
+        {
+            [HttpGet("AttributeRouted")]
+            [HttpPost]
+            [AcceptVerbs("PUT", "PATCH")]
+            [CustomHttpMethodConstraint("DELETE")]
+            public void Method() { }
+        }
+
+        [Route("Product")]
+        [Route("/Product")]
+        [Route("/product")]
+        public class DuplicatedAttributeRouteController
+        {
+            [HttpGet("/List")]
+            [HttpGet("/List")]
+            public void Action() { }
+
+            public void Controller() { }
+
+            [HttpPut("list")]
+            [PutOrPatch("list")]
+            public void CommonHttpMethod() { }
+        }
+
+        [Route("Products")]
+        public class NonDuplicatedAttributeRouteController
+        {
+            [HttpGet("list")]
+            public void ControllerAndAction() { }
+
+            [HttpGet("/PRODUCTS/LIST")]
+            public void OverrideOnAction() { }
+
+            [HttpGet("list")]
+            [HttpPost("list")]
+            [HttpPut("list")]
+            [HttpPatch("list")]
+            [HttpDelete("list")]
+            public void DifferentHttpMethods() { }
+        }
+
+        [MyRouteValue]
+        [MySecondRouteValue]
+        private class ConstrainedController
+        {
+            public void ConstrainedNonAttributedAction() { }
+        }
+
+        private class ActionParametersController
+        {
+            public void RequiredInt(int id) { }
+
+            public void FromBodyParameter([FromBody] TestActionParameter entity) { }
+
+            public void NotFromBodyParameter(TestActionParameter entity) { }
+
+            public void MultipleParameters(int id, [FromBody] TestActionParameter entity) { }
+
+            public void DifferentCasing(int id, int ID, int Id) { }
+        }
+
+        private class ConventionallyRoutedController
+        {
+            public void ConventionalAction() { }
+        }
+
+        [Route("api")]
+        private class AttributeRoutedController
+        {
+            [HttpGet("AttributeRoute")]
+            public void AttributeRoutedAction() { }
+        }
+
+        private class EmptyController
+        {
+        }
+
+        private class NonActionAttributeController
+        {
+            [NonAction]
+            public void Action() { }
+        }
+
+        private class CustomHttpMethodConstraintAttribute : Attribute, IActionHttpMethodProvider
+        {
+            private readonly string[] _methods;
+
+            public CustomHttpMethodConstraintAttribute(params string[] methods)
+            {
+                _methods = methods;
+            }
+
+            public IEnumerable<string> HttpMethods
+            {
+                get
+                {
+                    return _methods;
+                }
+            }
+        }
+
+        private class PutOrPatchAttribute : HttpMethodAttribute
+        {
+            private static readonly string[] _httpMethods = new string[] { "PUT", "PATCH" };
+
+            public PutOrPatchAttribute(string template)
+                : base(_httpMethods, template)
+            {
+            }
+        }
+
+        private class TestActionParameter
+        {
+            public int Id { get; set; }
+            public int Name { get; set; }
+        }
+
+        [Route("AttributeRouting/IsRequired/ForApiExplorer")]
+        private class ApiExplorerNotVisibleController
+        {
+            public void Edit() { }
+        }
+
+        [Route("AttributeRouting/IsRequired/ForApiExplorer")]
+        [ApiExplorerSettings()]
+        private class ApiExplorerVisibleController
+        {
+            public void Edit() { }
+        }
+
+        [Route("AttributeRouting/IsRequired/ForApiExplorer")]
+        [ApiExplorerSettings(IgnoreApi = true)]
+        private class ApiExplorerExplicitlyNotVisibleController
+        {
+            public void Edit() { }
+        }
+
+        [Route("AttributeRouting/IsRequired/ForApiExplorer")]
+        private class ApiExplorerExplicitlyNotVisibleOnActionController
+        {
+            [ApiExplorerSettings(IgnoreApi = true)]
+            public void Edit() { }
+        }
+
+        [Route("AttributeRouting/IsRequired/ForApiExplorer")]
+        [ApiExplorerSettings(IgnoreApi = true)]
+        private class ApiExplorerVisibilityOverrideController
+        {
+            [ApiExplorerSettings(IgnoreApi = false)]
+            public void Edit() { }
+
+            public void Create() { }
+        }
+
+        [Route("AttributeRouting/IsRequired/ForApiExplorer")]
+        [ApiExplorerSettings(GroupName = "Store")]
+        private class ApiExplorerNameOnControllerController
+        {
+            public void Edit() { }
+        }
+
+        [Route("AttributeRouting/IsRequired/ForApiExplorer")]
+        private class ApiExplorerNameOnActionController
+        {
+            [ApiExplorerSettings(GroupName = "Blog")]
+            public void Edit() { }
+        }
+
+        [Route("AttributeRouting/IsRequired/ForApiExplorer")]
+        [ApiExplorerSettings()]
+        private class ApiExplorerNoNameController
+        {
+            public void Edit() { }
+        }
+
+        [Route("AttributeRouting/IsRequired/ForApiExplorer")]
+        [ApiExplorerSettings(GroupName = "Store")]
+        private class ApiExplorerNameOverrideController
+        {
+            [ApiExplorerSettings(GroupName = "Blog")]
+            public void Edit() { }
+
+            public void Create() { }
+        }
+
+        private class ConventionsController
+        {
+            public void Create(int productId) { }
+        }
+
+        private class MultipleRouteProviderOnActionController
+        {
+            [Constraint]
+            [RouteAndConstraint("R1")]
+            [RouteAndConstraint("R2")]
+            public void Edit() { }
+        }
+
+        [Constraint]
+        [RouteAndConstraint("C1")]
+        [RouteAndConstraint("C2")]
+        private class MultipleRouteProviderOnActionAndControllerController
+        {
+            [RouteAndConstraint("A1")]
+            public void Edit() { }
+
+            [RouteAndConstraint("~/A2")]
+            public void Create() { }
+
+            [RouteAndConstraint("A3")]
+            [RouteAndConstraint("A4")]
+            public void Delete() { }
+        }
+
+        [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = true)]
+        private class RouteAndConstraintAttribute : Attribute, IActionConstraintMetadata, IRouteTemplateProvider
+        {
+            public RouteAndConstraintAttribute(string template)
+            {
+                Template = template;
+            }
+
+            public string Name { get; set; }
+
+            public int? Order { get; set; }
+
+            public string Template { get; private set; }
+        }
+
+        [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = true)]
+        private class ConstraintAttribute : Attribute, IActionConstraintMetadata
+        {
+        }
+
+        [ApiExplorerSettings(GroupName = "Default")]
+        private class ApiExplorerEnabledConventionalRoutedController
+        {
+            public void A()
+            {
+            }
+        }
+
+        [ApiExplorerSettings(IgnoreApi = true)]
+        private class ApiExplorerEnabledActionConventionalRoutedController
+        {
+            [ApiExplorerSettings(GroupName = "Default")]
+            public void A()
+            {
+            }
+        }
+
+        private class ApiExplorerIsVisibleConvention : IApplicationModelConvention
+        {
+            private bool _isVisible;
+
+            public ApiExplorerIsVisibleConvention(bool isVisible)
+            {
+                _isVisible = isVisible;
+            }
+
+            public void Apply(ApplicationModel application)
+            {
+                application.ApiExplorer.IsVisible = _isVisible;
+            }
+        }
+
+        private class TestRoutingConvention : IApplicationModelConvention
+        {
+            public void Apply(ApplicationModel application)
+            {
+                foreach (var controller in application.Controllers)
+                {
+                    var hasAttributeRouteModels = controller.Selectors
+                        .Any(selector => selector.AttributeRouteModel != null);
+                    if (!hasAttributeRouteModels)
+                    {
+                        var template = controller.ControllerType.Namespace.Replace('.', '/')
+                            + "/[controller]/[action]/{id?}";
+                        var attributeRouteModel = new AttributeRouteModel()
+                        {
+                            Template = template
+                        };
+
+                        controller.Selectors.Add(new SelectorModel { AttributeRouteModel = attributeRouteModel });
+                    }
+                }
+            }
+        }
+
+        private class UserController : Controller
+        {
+            public string GetUser(int id)
+            {
+                return string.Format("User {0} retrieved successfully", id);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerCacheTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerCacheTest.cs
new file mode 100644
index 0000000000..19b1b3b171
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerCacheTest.cs
@@ -0,0 +1,142 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ControllerActionInvokerCacheTest
+    {
+        [ConditionalFact]
+        [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "Fails due to dotnet/standard#567")]
+        public void GetControllerActionMethodExecutor_CachesFilters()
+        {
+            // Arrange
+            var filter = new TestFilter();
+            var controllerContext = CreateControllerContext(new[]
+                {
+                    new FilterDescriptor(filter, FilterScope.Action)
+                });
+            var controllerActionInvokerCache = CreateControllerActionInvokerCache(
+                controllerContext,
+                new[] { new DefaultFilterProvider() });
+
+            // Act
+            var cacheEntry1 = controllerActionInvokerCache.GetCachedResult(controllerContext);
+            var cacheEntry2 = controllerActionInvokerCache.GetCachedResult(controllerContext);
+
+            // Assert
+            Assert.Equal(cacheEntry1.filters, cacheEntry2.filters);
+        }
+
+        [ConditionalFact]
+        [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "Fails due to dotnet/standard#567")]
+        public void GetControllerActionMethodExecutor_CachesEntry()
+        {
+            // Arrange
+            var filter = new TestFilter();
+            var controllerContext = CreateControllerContext(new[]
+                {
+                    new FilterDescriptor(filter, FilterScope.Action)
+                });
+            var controllerActionInvokerCache = CreateControllerActionInvokerCache(
+                controllerContext,
+                new[] { new DefaultFilterProvider() });
+
+            // Act
+            var cacheEntry1 = controllerActionInvokerCache.GetCachedResult(controllerContext);
+            var cacheEntry2 = controllerActionInvokerCache.GetCachedResult(controllerContext);
+
+            // Assert
+            Assert.Same(cacheEntry1.cacheEntry, cacheEntry2.cacheEntry);
+        }
+
+        private class TestFilter : IFilterMetadata
+        {
+            public TestFilter()
+            {
+            }
+
+            public TestFilter(string data)
+            {
+                Data = data;
+            }
+
+            public string Data { get; }
+        }
+
+        private class TestController
+        {
+            public void Index()
+            {
+            }
+        }
+
+        private class CustomActionDescriptorCollectionProvider : IActionDescriptorCollectionProvider
+        {
+            public CustomActionDescriptorCollectionProvider(ControllerActionDescriptor[] actionDescriptors)
+            {
+                ActionDescriptors = new ActionDescriptorCollection(actionDescriptors, version: 1);
+            }
+
+            public ActionDescriptorCollection ActionDescriptors { get; }
+        }
+
+        private static ControllerActionInvokerCache CreateControllerActionInvokerCache(
+            ControllerContext controllerContext,
+            IFilterProvider[] filterProviders)
+        {
+            var descriptorProvider = new CustomActionDescriptorCollectionProvider(
+                new[] { controllerContext.ActionDescriptor });
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelBinderFactory = TestModelBinderFactory.CreateDefault();
+            var mvcOptions = Options.Create(new MvcOptions
+            {
+                AllowValidatingTopLevelNodes = true,
+            });
+
+            return new ControllerActionInvokerCache(
+                descriptorProvider,
+                new ParameterBinder(
+                    modelMetadataProvider,
+                    modelBinderFactory,
+                    Mock.Of<IObjectModelValidator>(),
+                    mvcOptions,
+                    NullLoggerFactory.Instance),
+                modelBinderFactory,
+                modelMetadataProvider,
+                filterProviders,
+                Mock.Of<IControllerFactoryProvider>(),
+                mvcOptions);
+        }
+
+        private static ControllerContext CreateControllerContext(FilterDescriptor[] filterDescriptors)
+        {
+            var actionDescriptor = new ControllerActionDescriptor()
+            {
+                FilterDescriptors = filterDescriptors,
+                MethodInfo = typeof(TestController).GetMethod(nameof(TestController.Index)),
+                ControllerTypeInfo = typeof(TestController).GetTypeInfo(),
+                Parameters = new List<ParameterDescriptor>(),
+                BoundProperties = new List<ParameterDescriptor>(),
+            };
+
+            var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), actionDescriptor);
+            return new ControllerContext(actionContext);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerTest.cs
new file mode 100644
index 0000000000..9d5c551ce1
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerTest.cs
@@ -0,0 +1,1836 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Logging.Testing;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ControllerActionInvokerTest : CommonResourceInvokerTest
+    {
+        #region Diagnostics
+
+        [Fact]
+        public async Task Invoke_WritesDiagnostic_ActionSelected()
+        {
+            // Arrange
+            var actionDescriptor = new ControllerActionDescriptor()
+            {
+                FilterDescriptors = new List<FilterDescriptor>(),
+                Parameters = new List<ParameterDescriptor>(),
+                BoundProperties = new List<ParameterDescriptor>(),
+            };
+
+            actionDescriptor.MethodInfo = typeof(TestController).GetMethod(nameof(TestController.ActionMethod));
+            actionDescriptor.ControllerTypeInfo = typeof(TestController).GetTypeInfo();
+
+            var listener = new TestDiagnosticListener();
+
+            var routeData = new RouteData();
+            routeData.Values.Add("tag", "value");
+
+            var filter = Mock.Of<IFilterMetadata>();
+            var invoker = CreateInvoker(
+                new[] { filter },
+                actionDescriptor,
+                controller: new TestController(),
+                diagnosticListener: listener,
+                routeData: routeData);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.NotNull(listener.BeforeAction?.ActionDescriptor);
+            Assert.NotNull(listener.BeforeAction?.HttpContext);
+
+            var routeValues = listener.BeforeAction?.RouteData?.Values;
+            Assert.NotNull(routeValues);
+
+            Assert.Equal(1, routeValues.Count);
+            Assert.Contains(routeValues, kvp => kvp.Key == "tag" && string.Equals(kvp.Value, "value"));
+        }
+
+        [Fact]
+        public async Task Invoke_WritesDiagnostic_ActionInvoked()
+        {
+            // Arrange
+            var actionDescriptor = new ControllerActionDescriptor()
+            {
+                FilterDescriptors = new List<FilterDescriptor>(),
+                Parameters = new List<ParameterDescriptor>(),
+                BoundProperties = new List<ParameterDescriptor>(),
+            };
+
+            actionDescriptor.MethodInfo = typeof(TestController).GetMethod(nameof(TestController.ActionMethod));
+            actionDescriptor.ControllerTypeInfo = typeof(TestController).GetTypeInfo();
+
+            var listener = new TestDiagnosticListener();
+
+            var filter = Mock.Of<IFilterMetadata>();
+            var invoker = CreateInvoker(
+                new[] { filter },
+                actionDescriptor,
+                controller: new TestController(),
+                diagnosticListener: listener);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.NotNull(listener.AfterAction?.ActionDescriptor);
+            Assert.NotNull(listener.AfterAction?.HttpContext);
+        }
+
+        #endregion
+
+        #region Controller Context
+
+        [Fact]
+        public async Task AddingValueProviderFactory_AtResourceFilter_IsAvailableInControllerContext()
+        {
+            // Arrange
+            var valueProviderFactory2 = Mock.Of<IValueProviderFactory>();
+            var resourceFilter = new Mock<IResourceFilter>();
+            resourceFilter
+                .Setup(f => f.OnResourceExecuting(It.IsAny<ResourceExecutingContext>()))
+                .Callback<ResourceExecutingContext>((resourceExecutingContext) =>
+                {
+                    resourceExecutingContext.ValueProviderFactories.Add(valueProviderFactory2);
+                });
+            var valueProviderFactory1 = Mock.Of<IValueProviderFactory>();
+            var valueProviderFactories = new List<IValueProviderFactory>();
+            valueProviderFactories.Add(valueProviderFactory1);
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[] { resourceFilter.Object }, valueProviderFactories: valueProviderFactories);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var controllerContext = Assert.IsType<ControllerActionInvoker>(invoker).ControllerContext;
+            Assert.NotNull(controllerContext);
+            Assert.Equal(2, controllerContext.ValueProviderFactories.Count);
+            Assert.Same(valueProviderFactory1, controllerContext.ValueProviderFactories[0]);
+            Assert.Same(valueProviderFactory2, controllerContext.ValueProviderFactories[1]);
+        }
+
+        [Fact]
+        public async Task DeletingValueProviderFactory_AtResourceFilter_IsNotAvailableInControllerContext()
+        {
+            // Arrange
+            var resourceFilter = new Mock<IResourceFilter>();
+            resourceFilter
+                .Setup(f => f.OnResourceExecuting(It.IsAny<ResourceExecutingContext>()))
+                .Callback<ResourceExecutingContext>((resourceExecutingContext) =>
+                {
+                    resourceExecutingContext.ValueProviderFactories.RemoveAt(0);
+                });
+
+            var valueProviderFactory1 = Mock.Of<IValueProviderFactory>();
+            var valueProviderFactory2 = Mock.Of<IValueProviderFactory>();
+            var valueProviderFactories = new List<IValueProviderFactory>();
+            valueProviderFactories.Add(valueProviderFactory1);
+            valueProviderFactories.Add(valueProviderFactory2);
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[] { resourceFilter.Object }, valueProviderFactories: valueProviderFactories);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var controllerContext = Assert.IsType<ControllerActionInvoker>(invoker).ControllerContext;
+            Assert.NotNull(controllerContext);
+            Assert.Equal(1, controllerContext.ValueProviderFactories.Count);
+            Assert.Same(valueProviderFactory2, controllerContext.ValueProviderFactories[0]);
+        }
+
+        #endregion
+
+        #region Action Filters
+
+        [Fact]
+        public async Task InvokeAction_InvokesActionFilter()
+        {
+            // Arrange
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(filter.Object, result: Result);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter.Verify(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>()), Times.Once());
+            filter.Verify(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()), Times.Once());
+
+            Assert.Same(Result, result);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncActionFilter()
+        {
+            // Arrange
+            IActionResult result = null;
+
+            var filter = new Mock<IAsyncActionFilter>(MockBehavior.Strict);
+            filter
+                .Setup(f => f.OnActionExecutionAsync(It.IsAny<ActionExecutingContext>(), It.IsAny<ActionExecutionDelegate>()))
+                .Returns<ActionExecutingContext, ActionExecutionDelegate>(async (context, next) =>
+                {
+                    var resultContext = await next();
+                    result = resultContext.Result;
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(filter.Object, result: Result);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter.Verify(
+                f => f.OnActionExecutionAsync(It.IsAny<ActionExecutingContext>(), It.IsAny<ActionExecutionDelegate>()),
+                Times.Once());
+
+            Assert.Same(Result, result);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesActionFilter_ShortCircuit()
+        {
+            // Arrange
+            var result = new Mock<IActionResult>(MockBehavior.Strict);
+            result
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Returns(Task.FromResult(true))
+                .Verifiable();
+
+            ActionExecutedContext context = null;
+
+            var actionFilter1 = new Mock<IActionFilter>(MockBehavior.Strict);
+            actionFilter1.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            actionFilter1
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => context = c)
+                .Verifiable();
+
+            var actionFilter2 = new Mock<IActionFilter>(MockBehavior.Strict);
+            actionFilter2
+                .Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>()))
+                .Callback<ActionExecutingContext>(c => c.Result = result.Object)
+                .Verifiable();
+
+            var actionFilter3 = new Mock<IActionFilter>(MockBehavior.Strict);
+
+            var resultFilter = new Mock<IResultFilter>(MockBehavior.Strict);
+            resultFilter.Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>())).Verifiable();
+            resultFilter.Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>())).Verifiable();
+
+            var invoker = CreateInvoker(new IFilterMetadata[]
+            {
+                actionFilter1.Object,
+                actionFilter2.Object,
+                actionFilter3.Object,
+                resultFilter.Object,
+            });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            result.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+            actionFilter1.Verify(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>()), Times.Once());
+            actionFilter1.Verify(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()), Times.Once());
+
+            actionFilter2.Verify(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>()), Times.Once());
+            actionFilter2.Verify(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()), Times.Never());
+
+            resultFilter.Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+            resultFilter.Verify(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()), Times.Once());
+
+            Assert.True(context.Canceled);
+            Assert.Same(context.Result, result.Object);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncActionFilter_ShortCircuit_WithResult()
+        {
+            // Arrange
+            var result = new Mock<IActionResult>(MockBehavior.Strict);
+            result
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Returns(Task.FromResult(true))
+                .Verifiable();
+
+            ActionExecutedContext context = null;
+
+            var actionFilter1 = new Mock<IActionFilter>(MockBehavior.Strict);
+            actionFilter1.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            actionFilter1
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => context = c)
+                .Verifiable();
+
+            var actionFilter2 = new Mock<IAsyncActionFilter>(MockBehavior.Strict);
+            actionFilter2
+                .Setup(f => f.OnActionExecutionAsync(It.IsAny<ActionExecutingContext>(), It.IsAny<ActionExecutionDelegate>()))
+                .Returns<ActionExecutingContext, ActionExecutionDelegate>((c, next) =>
+                {
+                    // Notice we're not calling next
+                    c.Result = result.Object;
+                    return Task.FromResult(true);
+                })
+                .Verifiable();
+
+            var actionFilter3 = new Mock<IActionFilter>(MockBehavior.Strict);
+
+            var resultFilter1 = new Mock<IResultFilter>(MockBehavior.Strict);
+            resultFilter1.Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>())).Verifiable();
+            resultFilter1.Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>())).Verifiable();
+            var resultFilter2 = new Mock<IResultFilter>(MockBehavior.Strict);
+            resultFilter2.Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>())).Verifiable();
+            resultFilter2.Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>())).Verifiable();
+
+            var invoker = CreateInvoker(new IFilterMetadata[]
+            {
+                actionFilter1.Object,
+                actionFilter2.Object,
+                actionFilter3.Object,
+                resultFilter1.Object,
+                resultFilter2.Object,
+            });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            result.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+            actionFilter1.Verify(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>()), Times.Once());
+            actionFilter1.Verify(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()), Times.Once());
+
+            actionFilter2.Verify(
+                f => f.OnActionExecutionAsync(It.IsAny<ActionExecutingContext>(), It.IsAny<ActionExecutionDelegate>()),
+                Times.Once());
+
+            resultFilter1.Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+            resultFilter1.Verify(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()), Times.Once());
+            resultFilter2.Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+            resultFilter2.Verify(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()), Times.Once());
+
+            Assert.True(context.Canceled);
+            Assert.Same(context.Result, result.Object);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncActionFilter_ShortCircuit_WithoutResult()
+        {
+            // Arrange
+            ActionExecutedContext context = null;
+
+            var actionFilter1 = new Mock<IActionFilter>(MockBehavior.Strict);
+            actionFilter1.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            actionFilter1
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => context = c)
+                .Verifiable();
+
+            var actionFilter2 = new Mock<IAsyncActionFilter>(MockBehavior.Strict);
+            actionFilter2
+                .Setup(f => f.OnActionExecutionAsync(It.IsAny<ActionExecutingContext>(), It.IsAny<ActionExecutionDelegate>()))
+                .Returns<ActionExecutingContext, ActionExecutionDelegate>((c, next) =>
+                {
+                    // Notice we're not calling next
+                    return Task.FromResult(true);
+                })
+                .Verifiable();
+
+            var actionFilter3 = new Mock<IActionFilter>(MockBehavior.Strict);
+
+            var resultFilter = new Mock<IResultFilter>(MockBehavior.Strict);
+            resultFilter.Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>())).Verifiable();
+            resultFilter.Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>())).Verifiable();
+
+            var invoker = CreateInvoker(new IFilterMetadata[]
+            {
+                actionFilter1.Object,
+                actionFilter2.Object,
+                actionFilter3.Object,
+                resultFilter.Object,
+            });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            actionFilter1.Verify(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>()), Times.Once());
+            actionFilter1.Verify(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()), Times.Once());
+
+            actionFilter2.Verify(
+                f => f.OnActionExecutionAsync(It.IsAny<ActionExecutingContext>(), It.IsAny<ActionExecutionDelegate>()),
+                Times.Once());
+
+            resultFilter.Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+            resultFilter.Verify(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()), Times.Once());
+
+            Assert.True(context.Canceled);
+            Assert.Null(context.Result);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncActionFilter_ShortCircuit_WithResult_CallNext()
+        {
+            // Arrange
+            var actionFilter = new Mock<IAsyncActionFilter>(MockBehavior.Strict);
+            actionFilter
+                .Setup(f => f.OnActionExecutionAsync(It.IsAny<ActionExecutingContext>(), It.IsAny<ActionExecutionDelegate>()))
+                .Returns<ActionExecutingContext, ActionExecutionDelegate>(async (c, next) =>
+                {
+                    c.Result = new EmptyResult();
+                    await next();
+                })
+                .Verifiable();
+
+            var message =
+                "If an IAsyncActionFilter provides a result value by setting the Result property of " +
+                "ActionExecutingContext to a non-null value, then it cannot call the next filter by invoking " +
+                "ActionExecutionDelegate.";
+
+            var invoker = CreateInvoker(actionFilter.Object);
+
+            // Act & Assert
+            await ExceptionAssert.ThrowsAsync<InvalidOperationException>(
+                async () => await invoker.InvokeAsync(),
+                message);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesActionFilter_WithExceptionThrownByAction()
+        {
+            // Arrange
+            ActionExecutedContext context = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c =>
+                {
+                    context = c;
+
+                    // Handle the exception so the test doesn't throw.
+                    Assert.False(c.ExceptionHandled);
+                    c.ExceptionHandled = true;
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(filter.Object, exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter.Verify(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>()), Times.Once());
+            filter.Verify(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()), Times.Once());
+
+            Assert.Same(Exception, context.Exception);
+            Assert.Null(context.Result);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesActionFilter_WithExceptionThrownByActionFilter()
+        {
+            // Arrange
+            var exception = new DataMisalignedException();
+            ActionExecutedContext context = null;
+
+            var filter1 = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter1.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter1
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c =>
+                {
+                    context = c;
+
+                    // Handle the exception so the test doesn't throw.
+                    Assert.False(c.ExceptionHandled);
+                    c.ExceptionHandled = true;
+                })
+                .Verifiable();
+
+            var filter2 = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter2
+                .Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>()))
+                .Callback<ActionExecutingContext>(c => { throw exception; })
+                .Verifiable();
+
+            var invoker = CreateInvoker(new[] { filter1.Object, filter2.Object });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter1.Verify(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>()), Times.Once());
+            filter1.Verify(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()), Times.Once());
+
+            filter2.Verify(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>()), Times.Once());
+            filter2.Verify(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()), Times.Never());
+
+            Assert.Same(exception, context.Exception);
+            Assert.Null(context.Result);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncActionFilter_WithExceptionThrownByActionFilter()
+        {
+            // Arrange
+            var exception = new DataMisalignedException();
+            ActionExecutedContext context = null;
+
+            var filter1 = new Mock<IAsyncActionFilter>(MockBehavior.Strict);
+            filter1
+                .Setup(f => f.OnActionExecutionAsync(It.IsAny<ActionExecutingContext>(), It.IsAny<ActionExecutionDelegate>()))
+                .Returns<ActionExecutingContext, ActionExecutionDelegate>(async (c, next) =>
+                {
+                    context = await next();
+
+                    // Handle the exception so the test doesn't throw.
+                    Assert.False(context.ExceptionHandled);
+                    context.ExceptionHandled = true;
+                })
+                .Verifiable();
+
+            var filter2 = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter2.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter2
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => { throw exception; })
+                .Verifiable();
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { filter1.Object, filter2.Object });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter1.Verify(
+                f => f.OnActionExecutionAsync(It.IsAny<ActionExecutingContext>(), It.IsAny<ActionExecutionDelegate>()),
+                Times.Once());
+
+            filter2.Verify(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>()), Times.Once());
+
+            Assert.Same(exception, context.Exception);
+            Assert.Null(context.Result);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesActionFilter_HandleException()
+        {
+            // Arrange
+            var result = new Mock<IActionResult>(MockBehavior.Strict);
+            result
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Returns<ActionContext>((context) => Task.FromResult(true))
+                .Verifiable();
+
+            var actionFilter = new Mock<IActionFilter>(MockBehavior.Strict);
+            actionFilter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            actionFilter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c =>
+                {
+                    // Handle the exception so the test doesn't throw.
+                    Assert.False(c.ExceptionHandled);
+                    c.ExceptionHandled = true;
+
+                    c.Result = result.Object;
+                })
+                .Verifiable();
+
+            var resultFilter = new Mock<IResultFilter>(MockBehavior.Strict);
+            resultFilter.Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>())).Verifiable();
+            resultFilter.Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>())).Verifiable();
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[] { actionFilter.Object, resultFilter.Object },
+                exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            actionFilter.Verify(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>()), Times.Once());
+            actionFilter.Verify(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()), Times.Once());
+
+            resultFilter.Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+            resultFilter.Verify(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()), Times.Once());
+
+            result.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResourceFilter_WithActionResult_FromActionFilter()
+        {
+            // Arrange
+            var expected = Mock.Of<IActionResult>();
+
+            ResourceExecutedContext context = null;
+            var resourceFilter = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    context = await next();
+                })
+                .Verifiable();
+
+            var actionFilter = new Mock<IActionFilter>(MockBehavior.Strict);
+            actionFilter
+                .Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>()))
+                .Callback<ActionExecutingContext>((c) =>
+                {
+                    c.Result = expected;
+                });
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { resourceFilter.Object, actionFilter.Object });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.Same(expected, context.Result);
+
+            resourceFilter.Verify(
+                f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResourceFilter_HandleException_FromActionFilter()
+        {
+            // Arrange
+            var expected = new DataMisalignedException();
+
+            ResourceExecutedContext context = null;
+            var resourceFilter = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    context = await next();
+                    context.ExceptionHandled = true;
+                })
+                .Verifiable();
+
+            var actionFilter = new Mock<IActionFilter>(MockBehavior.Strict);
+            actionFilter
+                .Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>()))
+                .Callback<ActionExecutingContext>((c) =>
+                {
+                    throw expected;
+                });
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { resourceFilter.Object, actionFilter.Object });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.Same(expected, context.Exception);
+            Assert.Same(expected, context.ExceptionDispatchInfo.SourceException);
+
+            resourceFilter.Verify(
+                f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResourceFilter_HandlesException_FromExceptionFilter()
+        {
+            // Arrange
+            var expected = new DataMisalignedException();
+
+            ResourceExecutedContext context = null;
+            var resourceFilter = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    context = await next();
+                    context.ExceptionHandled = true;
+                })
+                .Verifiable();
+
+            var exceptionFilter = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            exceptionFilter
+                .Setup(f => f.OnException(It.IsAny<ExceptionContext>()))
+                .Callback<ExceptionContext>((c) =>
+                {
+                    throw expected;
+                });
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { resourceFilter.Object, exceptionFilter.Object }, exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.Same(expected, context.Exception);
+            Assert.Same(expected, context.ExceptionDispatchInfo.SourceException);
+
+            resourceFilter.Verify(
+                f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_ExceptionBubbling_AsyncActionFilter_To_ResourceFilter()
+        {
+            // Arrange
+            var resourceFilter = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    var context = await next();
+                    Assert.Same(Exception, context.Exception);
+                    context.ExceptionHandled = true;
+                });
+
+            var actionFilter1 = new Mock<IAsyncActionFilter>(MockBehavior.Strict);
+            actionFilter1
+                .Setup(f => f.OnActionExecutionAsync(It.IsAny<ActionExecutingContext>(), It.IsAny<ActionExecutionDelegate>()))
+                .Returns<ActionExecutingContext, ActionExecutionDelegate>(async (c, next) =>
+                {
+                    await next();
+                });
+
+            var actionFilter2 = new Mock<IAsyncActionFilter>(MockBehavior.Strict);
+            actionFilter2
+                .Setup(f => f.OnActionExecutionAsync(It.IsAny<ActionExecutingContext>(), It.IsAny<ActionExecutionDelegate>()))
+                .Returns<ActionExecutingContext, ActionExecutionDelegate>(async (c, next) =>
+                {
+                    await next();
+                });
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[]
+                {
+                    resourceFilter.Object,
+                    actionFilter1.Object,
+                    actionFilter2.Object,
+                },
+                // The action won't run
+                exception: Exception);
+
+            // Act & Assert
+            await invoker.InvokeAsync();
+        }
+
+        #endregion
+
+        #region Action Method Signatures
+
+        [Fact]
+        public async Task InvokeAction_AsyncAction_TaskReturnType()
+        {
+            // Arrange
+            var inputParam1 = 1;
+            var inputParam2 = "Second Parameter";
+            var actionParameters = new Dictionary<string, object> { { "i", inputParam1 }, { "s", inputParam2 } };
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(new[] { filter.Object }, nameof(TestController.TaskAction), actionParameters);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.IsType<EmptyResult>(result);
+        }
+
+        [Fact]
+        public async Task InvokeAction_AsyncAction_TaskOfValueReturnType()
+        {
+            // Arrange
+            var inputParam1 = 1;
+            var inputParam2 = "Second Parameter";
+            var actionParameters = new Dictionary<string, object> { { "i", inputParam1 }, { "s", inputParam2 } };
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(new[] { filter.Object }, nameof(TestController.TaskValueTypeAction), actionParameters);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var contentResult = Assert.IsType<ObjectResult>(result);
+            Assert.Equal(inputParam1, contentResult.Value);
+        }
+
+        [Fact]
+        public async Task InvokeAction_AsyncAction_WithAsyncKeywordThrows()
+        {
+            // Arrange
+            var inputParam1 = 1;
+            var inputParam2 = "Second Parameter";
+            var actionParameters = new Dictionary<string, object> { { "i", inputParam1 }, { "s", inputParam2 } };
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(new[] { filter.Object }, nameof(TestController.TaskActionWithException), actionParameters);
+
+            // Act and Assert
+            await Assert.ThrowsAsync<NotImplementedException>(
+                    () => invoker.InvokeAsync());
+        }
+
+        [Fact]
+        public async Task InvokeAction_AsyncAction_WithoutAsyncThrows()
+        {
+            // Arrange
+            var inputParam1 = 1;
+            var inputParam2 = "Second Parameter";
+            var actionParameters = new Dictionary<string, object> { { "i", inputParam1 }, { "s", inputParam2 } };
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(new[] { filter.Object }, nameof(TestController.TaskActionWithExceptionWithoutAsync), actionParameters);
+
+            // Act and Assert
+            await Assert.ThrowsAsync<NotImplementedException>(
+                    () => invoker.InvokeAsync());
+        }
+
+        [Fact]
+        public async Task InvokeAction_AsyncAction_WithExceptionsAfterAwait()
+        {
+            // Arrange
+            var inputParam1 = 1;
+            var inputParam2 = "Second Parameter";
+            var actionParameters = new Dictionary<string, object> { { "i", inputParam1 }, { "s", inputParam2 } };
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(new[] { filter.Object }, nameof(TestController.TaskActionThrowAfterAwait), actionParameters);
+            var expectedException = "Argument Exception";
+
+            // Act and Assert
+            var ex = await Assert.ThrowsAsync<ArgumentException>(
+                () => invoker.InvokeAsync());
+            Assert.Equal(expectedException, ex.Message);
+        }
+
+        [Fact]
+        public async Task InvokeAction_SyncAction()
+        {
+            // Arrange
+            var inputString = "hello";
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(new[] { filter.Object }, nameof(TestController.Echo), new Dictionary<string, object>() { { "input", inputString } });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var contentResult = Assert.IsType<ObjectResult>(result);
+            Assert.Equal(inputString, contentResult.Value);
+        }
+
+        [Fact]
+        public async Task InvokeAction_SyncAction_WithException()
+        {
+            // Arrange
+            var inputString = "hello";
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(
+                new[] { filter.Object },
+                nameof(TestController.EchoWithException),
+                new Dictionary<string, object>() { { "input", inputString } });
+
+            // Act & Assert
+            await Assert.ThrowsAsync<NotImplementedException>(
+                () => invoker.InvokeAsync());
+        }
+
+        [Fact]
+        public async Task InvokeAction_SyncMethod_WithArgumentDictionary_DefaultValueAttributeUsed()
+        {
+            // Arrange
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(
+                new[] { filter.Object },
+                nameof(TestController.EchoWithDefaultValue),
+                new Dictionary<string, object>());
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var contentResult = Assert.IsType<ObjectResult>(result);
+            Assert.Equal("hello", contentResult.Value);
+        }
+
+        [Fact]
+        public async Task InvokeAction_SyncMethod_WithArgumentArray_DefaultValueAttributeIgnored()
+        {
+            // Arrange
+            var inputString = "test";
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(
+                new[] { filter.Object },
+                nameof(TestController.EchoWithDefaultValue),
+                new Dictionary<string, object>() { { "input", inputString } });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var contentResult = Assert.IsType<ObjectResult>(result);
+            Assert.Equal(inputString, contentResult.Value);
+        }
+
+        [Fact]
+        public async Task InvokeAction_SyncMethod_WithArgumentDictionary_DefaultParameterValueUsed()
+        {
+            // Arrange
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(
+                new[] { filter.Object },
+                nameof(TestController.EchoWithDefaultValueAndAttribute),
+                new Dictionary<string, object>());
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var contentResult = Assert.IsType<ObjectResult>(result);
+            Assert.Equal("world", contentResult.Value);
+        }
+
+        [Fact]
+        public async Task InvokeAction_SyncMethod_WithArgumentDictionary_AnyValue_HasPrecedenceOverDefaults()
+        {
+            // Arrange
+            var inputString = "test";
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(
+                new[] { filter.Object },
+                nameof(TestController.EchoWithDefaultValueAndAttribute),
+                new Dictionary<string, object>() { { "input", inputString } });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var contentResult = Assert.IsType<ObjectResult>(result);
+            Assert.Equal(inputString, contentResult.Value);
+        }
+
+        [Fact]
+        public async Task InvokeAction_AsyncAction_WithCustomTaskReturnType()
+        {
+            // Arrange
+            var inputParam1 = 1;
+            var inputParam2 = "Second Parameter";
+            var actionParameters = new Dictionary<string, object> { { "i", inputParam1 }, { "s", inputParam2 } };
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(
+                new[] { filter.Object },
+                nameof(TestController.TaskActionWithCustomTaskReturnType),
+                actionParameters);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.IsType<EmptyResult>(result);
+        }
+
+        [Fact]
+        public async Task InvokeAction_AsyncAction_WithCustomTaskOfTReturnType()
+        {
+            // Arrange
+            var inputParam1 = 1;
+            var inputParam2 = "Second Parameter";
+            var actionParameters = new Dictionary<string, object> { { "i", inputParam1 }, { "s", inputParam2 } };
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(
+                new[] { filter.Object },
+                nameof(TestController.TaskActionWithCustomTaskOfTReturnType),
+                actionParameters);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.IsType<ObjectResult>(result);
+            Assert.IsType<int>(((ObjectResult)result).Value);
+            Assert.Equal(1, ((ObjectResult)result).Value);
+        }
+
+        [Fact]
+        public async Task InvokeAction_AsyncAction_ReturningUnwrappedTask()
+        {
+            // Arrange
+            var inputParam1 = 1;
+            var inputParam2 = "Second Parameter";
+            var actionParameters = new Dictionary<string, object> { { "i", inputParam1 }, { "s", inputParam2 } };
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(new[] { filter.Object }, nameof(TestController.UnwrappedTask), actionParameters);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.IsType<EmptyResult>(result);
+        }
+
+        [Fact]
+        public async Task InvokeAction_AsyncActionWithTaskOfObjectReturnType_AndReturningTaskOfActionResult()
+        {
+            // Arrange
+            var actionParameters = new Dictionary<string, object> { ["value"] = 3 };
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result);
+
+            var invoker = CreateInvoker(
+                new[] { filter.Object },
+                nameof(TestController.AsyncActionMethodReturningActionResultWithTaskOfObjectAsReturnType),
+                actionParameters);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var testResult = Assert.IsType<TestActionResult>(result);
+            Assert.Equal(3, testResult.Value);
+        }
+
+        [Fact]
+        public async Task InvokeAction_ActionWithObjectReturnType_AndReturningActionResult()
+        {
+            // Arrange
+            var actionParameters = new Dictionary<string, object> { ["value"] = 3 };
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result);
+
+            var invoker = CreateInvoker(
+                new[] { filter.Object },
+                nameof(TestController.ActionMethodReturningActionResultWithObjectAsReturnType),
+                actionParameters);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var testResult = Assert.IsType<TestActionResult>(result);
+            Assert.Equal(3, testResult.Value);
+        }
+
+        [Fact]
+        public async Task InvokeAction_AsyncMethod_ParametersInRandomOrder()
+        {
+            //Arrange
+            var inputParam1 = 1;
+            var inputParam2 = "Second Parameter";
+
+            // Note that the order of parameters is reversed
+            var actionParameters = new Dictionary<string, object> { { "s", inputParam2 }, { "i", inputParam1 } };
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(
+                new[] { filter.Object },
+                nameof(TestController.TaskValueTypeAction),
+                actionParameters);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var contentResult = Assert.IsType<ObjectResult>(result);
+            Assert.Equal(inputParam1, contentResult.Value);
+        }
+
+        [Theory]
+        [InlineData(nameof(TestController.AsynActionMethodWithTestActionResult))]
+        [InlineData(nameof(TestController.ActionMethodWithTestActionResult))]
+        public async Task InvokeAction_ReturnTypeAsIActionResult_ReturnsExpected(string methodName)
+        {
+            //Arrange
+            var inputParam = 1;
+            var actionParameters = new Dictionary<string, object> { { "value", inputParam } };
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(
+                new[] { filter.Object },
+                methodName,
+                actionParameters);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var contentResult = Assert.IsType<TestActionResult>(result);
+            Assert.Equal(inputParam, contentResult.Value);
+        }
+
+        [Fact]
+        public async Task InvokeAction_AsyncMethod_InvalidParameterValueThrows()
+        {
+            //Arrange
+            var inputParam2 = "Second Parameter";
+
+            var actionParameters = new Dictionary<string, object> { { "i", "Some Invalid Value" }, { "s", inputParam2 } };
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(
+                new[] { filter.Object },
+                nameof(TestController.TaskValueTypeAction),
+                actionParameters);
+
+            // Act & Assert
+            await Assert.ThrowsAsync<InvalidCastException>(
+                () => invoker.InvokeAsync());
+        }
+
+        [Theory]
+        [InlineData(nameof(TestController.ActionMethodWithNullActionResult), typeof(IActionResult))]
+        [InlineData(nameof(TestController.TestActionMethodWithNullActionResult), typeof(TestActionResult))]
+        [InlineData(nameof(TestController.AsyncActionMethodWithNullActionResult), typeof(IActionResult))]
+        [InlineData(nameof(TestController.AsyncActionMethodWithNullTestActionResult), typeof(TestActionResult))]
+        [ReplaceCulture]
+        public async Task InvokeAction_WithNullActionResultThrows(string methodName, Type resultType)
+        {
+            // Arrange
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(
+                new[] { filter.Object },
+                methodName,
+                new Dictionary<string, object>());
+
+            // Act & Assert
+            await ExceptionAssert.ThrowsAsync<InvalidOperationException>(
+                () => invoker.InvokeAsync(),
+                $"Cannot return null from an action method with a return type of '{resultType}'.");
+        }
+
+        [Fact]
+        public async Task Invoke_UsesDefaultValuesIfNotBound()
+        {
+            // Arrange
+            var actionDescriptor = new ControllerActionDescriptor
+            {
+                ControllerTypeInfo = typeof(TestController).GetTypeInfo(),
+                BoundProperties = new List<ParameterDescriptor>(),
+                MethodInfo = typeof(TestController).GetTypeInfo()
+                    .DeclaredMethods
+                    .First(m => m.Name.Equals("ActionMethodWithDefaultValues", StringComparison.Ordinal)),
+
+                Parameters = new List<ParameterDescriptor>
+                {
+                    new ParameterDescriptor
+                    {
+                        Name = "value",
+                        ParameterType = typeof(int),
+                        BindingInfo = new BindingInfo(),
+                    }
+                },
+                FilterDescriptors = new List<FilterDescriptor>()
+            };
+
+            var context = new Mock<HttpContext>();
+            context.SetupGet(c => c.Items)
+                .Returns(new Dictionary<object, object>());
+            context.Setup(c => c.RequestServices.GetService(typeof(ILoggerFactory)))
+                .Returns(new NullLoggerFactory());
+
+            var actionContext = new ActionContext(context.Object, new RouteData(), actionDescriptor);
+
+            var controllerContext = new ControllerContext(actionContext)
+            {
+                ValueProviderFactories = new IValueProviderFactory[0]
+            };
+            controllerContext.ModelState.MaxAllowedErrors = 200;
+            var objectMethodExecutor = ObjectMethodExecutor.Create(
+                actionDescriptor.MethodInfo,
+                actionDescriptor.ControllerTypeInfo,
+                ParameterDefaultValues.GetParameterDefaultValues(actionDescriptor.MethodInfo));
+
+            var controllerMethodExecutor = ActionMethodExecutor.GetExecutor(objectMethodExecutor);
+
+            var cacheEntry = new ControllerActionInvokerCacheEntry(
+                new FilterItem[0],
+                _ => new TestController(),
+                (_, __) => { },
+                (_, __, ___) => Task.CompletedTask,
+                objectMethodExecutor,
+                controllerMethodExecutor);
+
+            var invoker = new ControllerActionInvoker(
+                new NullLoggerFactory().CreateLogger<ControllerActionInvoker>(),
+                new DiagnosticListener("Microsoft.AspNetCore"),
+                new ActionResultTypeMapper(),
+                controllerContext,
+                cacheEntry,
+                new IFilterMetadata[0]);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.Equal(5, context.Object.Items["Result"]);
+        }
+
+        [Fact]
+        public async Task InvokeAction_ConvertibleToActionResult()
+        {
+            // Arrange
+            var inputParam = 12;
+            var actionParameters = new Dictionary<string, object> { { "input", inputParam }, };
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(new[] { filter.Object }, nameof(TestController.ActionReturningConvertibleToActionResult), actionParameters);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var testActionResult = Assert.IsType<TestActionResult>(result);
+            Assert.Equal(inputParam, testActionResult.Value);
+        }
+
+        [Fact]
+        public async Task InvokeAction_AsyncAction_ConvertibleToActionResult()
+        {
+            // Arrange
+            var inputParam = 13;
+            var actionParameters = new Dictionary<string, object> { { "input", inputParam }, };
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(new[] { filter.Object }, nameof(TestController.ActionReturningConvertibleToActionResultAsync), actionParameters);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var testActionResult = Assert.IsType<TestActionResult>(result);
+            Assert.Equal(inputParam, testActionResult.Value);
+        }
+
+        [Fact]
+        public async Task InvokeAction_ConvertibleToActionResult_AsObject()
+        {
+            // Arrange
+            var actionParameters = new Dictionary<string, object>();
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(new[] { filter.Object }, nameof(TestController.ActionReturningConvertibleAsObject), actionParameters);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.IsType<TestActionResult>(result);
+        }
+
+        [Fact]
+        public async Task InvokeAction_ConvertibleToActionResult_ReturningNull_Throws()
+        {
+            // Arrange
+            var expectedMessage = @"Cannot return null from an action method with a return type of 'Microsoft.AspNetCore.Mvc.Infrastructure.IConvertToActionResult'.";
+            var actionParameters = new Dictionary<string, object>();
+            IActionResult result = null;
+
+            var filter = new Mock<IActionFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Callback<ActionExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(new[] { filter.Object }, nameof(TestController.ConvertibleToActionResultReturningNull), actionParameters);
+
+            // Act & Assert
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => invoker.InvokeAsync());
+            Assert.Equal(expectedMessage, exception.Message);
+        }
+
+        #endregion
+
+        protected override ResourceInvoker CreateInvoker(
+            IFilterMetadata[] filters,
+            Exception exception = null,
+            IActionResult result = null,
+            IList<IValueProviderFactory> valueProviderFactories = null)
+        {
+            var actionDescriptor = new ControllerActionDescriptor()
+            {
+                ControllerTypeInfo = typeof(TestController).GetTypeInfo(),
+                FilterDescriptors = new List<FilterDescriptor>(),
+                Parameters = new List<ParameterDescriptor>(),
+                BoundProperties = new List<ParameterDescriptor>(),
+            };
+
+            if (result == Result)
+            {
+                actionDescriptor.MethodInfo = typeof(TestController).GetMethod(nameof(TestController.ActionMethod));
+            }
+            else if (result != null)
+            {
+                throw new InvalidOperationException($"Unexpected action result {result}.");
+            }
+            else if (exception == Exception)
+            {
+                actionDescriptor.MethodInfo = typeof(TestController).GetMethod(nameof(TestController.ThrowingActionMethod));
+            }
+            else if (exception != null)
+            {
+                throw new InvalidOperationException($"Unexpected exception {exception}.");
+            }
+            else
+            {
+                actionDescriptor.MethodInfo = typeof(TestController).GetMethod(nameof(TestController.ActionMethod));
+            }
+
+            return CreateInvoker(
+                filters,
+                actionDescriptor,
+                new TestController(),
+                valueProviderFactories: valueProviderFactories);
+        }
+
+        // Used by tests which directly test different types of signatures for controller methods.
+        private ControllerActionInvoker CreateInvoker(
+            IFilterMetadata[] filters,
+            string methodName,
+            IDictionary<string, object> arguments)
+        {
+            var actionDescriptor = new ControllerActionDescriptor()
+            {
+                ControllerTypeInfo = typeof(TestController).GetTypeInfo(),
+                FilterDescriptors = new List<FilterDescriptor>(),
+                Parameters = new List<ParameterDescriptor>(),
+                BoundProperties = new List<ParameterDescriptor>(),
+            };
+
+            var method = typeof(TestController).GetTypeInfo().GetMethod(methodName);
+            Assert.NotNull(method);
+            actionDescriptor.MethodInfo = method;
+
+            foreach (var kvp in arguments)
+            {
+                actionDescriptor.Parameters.Add(new ControllerParameterDescriptor()
+                {
+                    Name = kvp.Key,
+                    ParameterInfo = method.GetParameters().Where(p => p.Name == kvp.Key).Single(),
+                });
+            }
+
+            return CreateInvoker(filters, actionDescriptor, new TestController(), arguments);
+        }
+
+        private ControllerActionInvoker CreateInvoker(
+            IFilterMetadata[] filters,
+            ControllerActionDescriptor actionDescriptor,
+            object controller,
+            IDictionary<string, object> arguments = null,
+            IList<IValueProviderFactory> valueProviderFactories = null,
+            RouteData routeData = null,
+            ILogger logger = null,
+            object diagnosticListener = null)
+        {
+            Assert.NotNull(actionDescriptor.MethodInfo);
+
+            if (arguments == null)
+            {
+                arguments = new Dictionary<string, object>();
+            }
+
+            if (valueProviderFactories == null)
+            {
+                valueProviderFactories = new List<IValueProviderFactory>();
+            }
+
+            if (routeData == null)
+            {
+                routeData = new RouteData();
+            }
+
+            if (logger == null)
+            {
+                logger = new NullLoggerFactory().CreateLogger<ControllerActionInvoker>();
+            }
+
+            var httpContext = new DefaultHttpContext();
+
+            var options = Options.Create(new MvcOptions());
+
+            var services = new ServiceCollection();
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+            services.AddSingleton<IOptions<MvcOptions>>(options);
+            services.AddSingleton<IActionResultExecutor<ObjectResult>>(new ObjectResultExecutor(
+                new DefaultOutputFormatterSelector(options, NullLoggerFactory.Instance),
+                new TestHttpResponseStreamWriterFactory(),
+                NullLoggerFactory.Instance));
+
+            httpContext.Response.Body = new MemoryStream();
+            httpContext.RequestServices = services.BuildServiceProvider();
+
+            var formatter = new Mock<IOutputFormatter>();
+            formatter
+                .Setup(f => f.CanWriteResult(It.IsAny<OutputFormatterCanWriteContext>()))
+                .Returns(true);
+
+            formatter
+                .Setup(f => f.WriteAsync(It.IsAny<OutputFormatterWriteContext>()))
+                .Returns<OutputFormatterWriteContext>(async c =>
+                {
+                    await c.HttpContext.Response.WriteAsync(c.Object.ToString());
+                });
+
+            options.Value.OutputFormatters.Add(formatter.Object);
+
+            var diagnosticSource = new DiagnosticListener("Microsoft.AspNetCore");
+            if (diagnosticListener != null)
+            {
+                diagnosticSource.SubscribeWithAdapter(diagnosticListener);
+            }
+
+            var objectMethodExecutor = ObjectMethodExecutor.Create(
+                actionDescriptor.MethodInfo,
+                actionDescriptor.ControllerTypeInfo,
+                ParameterDefaultValues.GetParameterDefaultValues(actionDescriptor.MethodInfo));
+
+            var actionMethodExecutor = ActionMethodExecutor.GetExecutor(objectMethodExecutor);
+
+            var cacheEntry = new ControllerActionInvokerCacheEntry(
+                new FilterItem[0],
+                (c) => controller,
+                null,
+                (_, __, args) =>
+                {
+                    foreach (var item in arguments)
+                    {
+                        args[item.Key] = item.Value;
+                    }
+
+                    return Task.CompletedTask;
+                },
+                objectMethodExecutor,
+                actionMethodExecutor);
+
+            var actionContext = new ActionContext(httpContext, routeData, actionDescriptor);
+            var controllerContext = new ControllerContext(actionContext)
+            {
+                ValueProviderFactories = valueProviderFactories,
+            };
+
+            var invoker = new ControllerActionInvoker(
+                logger,
+                diagnosticSource,
+                new ActionResultTypeMapper(),
+                controllerContext,
+                cacheEntry,
+                filters);
+            return invoker;
+        }
+
+        public sealed class TestController
+        {
+            public IActionResult ActionMethod()
+            {
+                return Result;
+            }
+
+            public ObjectResult ThrowingActionMethod()
+            {
+                throw Exception;
+            }
+
+            public IActionResult ActionMethodWithDefaultValues(int value = 5)
+            {
+                return new TestActionResult { Value = value };
+            }
+
+            public TestActionResult ActionMethodWithTestActionResult(int value)
+            {
+                return new TestActionResult { Value = value };
+            }
+
+            public async Task<TestActionResult> AsynActionMethodWithTestActionResult(int value)
+            {
+                return await Task.FromResult<TestActionResult>(new TestActionResult { Value = value });
+            }
+
+            public IActionResult ActionMethodWithNullActionResult()
+            {
+                return null;
+            }
+
+            public object ActionMethodReturningActionResultWithObjectAsReturnType(int value = 5)
+            {
+                return new TestActionResult { Value = value };
+            }
+
+            public async Task<object> AsyncActionMethodReturningActionResultWithTaskOfObjectAsReturnType(int value = 5)
+            {
+                return await Task.FromResult(new TestActionResult { Value = value });
+            }
+
+            public TestActionResult TestActionMethodWithNullActionResult()
+            {
+                return null;
+            }
+
+            public async Task<IActionResult> AsyncActionMethodWithNullActionResult()
+            {
+                return await Task.FromResult<IActionResult>(null);
+            }
+
+            public async Task<TestActionResult> AsyncActionMethodWithNullTestActionResult()
+            {
+                return await Task.FromResult<TestActionResult>(null);
+            }
+#pragma warning disable 1998
+            public async Task TaskAction(int i, string s)
+            {
+                return;
+            }
+#pragma warning restore 1998
+
+#pragma warning disable 1998
+            public async Task<int> TaskValueTypeAction(int i, string s)
+            {
+                return i;
+            }
+#pragma warning restore 1998
+
+#pragma warning disable 1998
+            public async Task<Task<int>> TaskOfTaskAction(int i, string s)
+            {
+                return TaskValueTypeAction(i, s);
+            }
+#pragma warning restore 1998
+
+            public Task<int> TaskValueTypeActionWithoutAsync(int i, string s)
+            {
+                return TaskValueTypeAction(i, s);
+            }
+
+#pragma warning disable 1998
+            public async Task<int> TaskActionWithException(int i, string s)
+            {
+                throw new NotImplementedException("Not Implemented Exception");
+            }
+#pragma warning restore 1998
+
+            public Task<int> TaskActionWithExceptionWithoutAsync(int i, string s)
+            {
+                throw new NotImplementedException("Not Implemented Exception");
+            }
+
+            public async Task<int> TaskActionThrowAfterAwait(int i, string s)
+            {
+                await Task.Delay(500);
+                throw new ArgumentException("Argument Exception");
+            }
+
+            public TaskDerivedType TaskActionWithCustomTaskReturnType(int i, string s)
+            {
+                var task = new TaskDerivedType();
+                task.Start();
+                return task;
+            }
+
+            public TaskOfTDerivedType<int> TaskActionWithCustomTaskOfTReturnType(int i, string s)
+            {
+                var task = new TaskOfTDerivedType<int>(1);
+                task.Start();
+                return task;
+            }
+
+            /// <summary>
+            /// Returns a <see cref="Task{TResult}"/> instead of a <see cref="Task"/>.
+            /// </summary>
+            public Task UnwrappedTask(int i, string s)
+            {
+                return Task.Factory.StartNew(async () => await Task.Factory.StartNew(() => i));
+            }
+
+            public string Echo(string input)
+            {
+                return input;
+            }
+
+            public string EchoWithException(string input)
+            {
+                throw new NotImplementedException();
+            }
+
+            public string EchoWithDefaultValue([DefaultValue("hello")] string input)
+            {
+                return input;
+            }
+
+            public string EchoWithDefaultValueAndAttribute([DefaultValue("hello")] string input = "world")
+            {
+                return input;
+            }
+
+            public ConvertibleToActionResult ActionReturningConvertibleToActionResult(int input)
+                => new ConvertibleToActionResult { Value = input };
+
+            public Task<ConvertibleToActionResult> ActionReturningConvertibleToActionResultAsync(int input)
+                => Task.FromResult(new ConvertibleToActionResult { Value = input });
+
+            public object ActionReturningConvertibleAsObject() => new ConvertibleToActionResult();
+
+            public IConvertToActionResult ConvertibleToActionResultReturningNull()
+            {
+                var mock = new Mock<IConvertToActionResult>();
+                mock.Setup(m => m.Convert()).Returns((IActionResult)null);
+
+                return mock.Object;
+            }
+
+            public class TaskDerivedType : Task
+            {
+                public TaskDerivedType()
+                    : base(() => Console.WriteLine("In The Constructor"))
+                {
+                }
+            }
+
+            public class TaskOfTDerivedType<T> : Task<T>
+            {
+                public TaskOfTDerivedType(T input)
+                    : base(() => input)
+                {
+                }
+            }
+        }
+
+        public sealed class TestActionResult : IActionResult
+        {
+            public int Value { get; set; }
+
+            public Task ExecuteResultAsync(ActionContext context)
+            {
+                context.HttpContext.Items["Result"] = Value;
+                return Task.FromResult(0);
+            }
+        }
+
+        private static ObjectMethodExecutor CreateExecutor(ControllerActionDescriptor actionDescriptor)
+        {
+            return ObjectMethodExecutor.Create(
+                actionDescriptor.MethodInfo,
+                actionDescriptor.ControllerTypeInfo,
+                ParameterDefaultValues.GetParameterDefaultValues(actionDescriptor.MethodInfo));
+        }
+
+        public class ConvertibleToActionResult : IConvertToActionResult
+        {
+            public int Value { get; set; }
+
+            public IActionResult Convert() => new TestActionResult { Value = Value };
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerBinderDelegateProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerBinderDelegateProviderTest.cs
new file mode 100644
index 0000000000..6b9b9041db
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerBinderDelegateProviderTest.cs
@@ -0,0 +1,1575 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ControllerBinderDelegateProviderTest
+    {
+        private static readonly MvcOptions _options = new MvcOptions
+        {
+            AllowValidatingTopLevelNodes = true,
+        };
+        private static readonly IOptions<MvcOptions> _optionsAccessor = Options.Create(_options);
+
+        [Fact]
+        public async Task CreateBinderDelegate_Delegate_DoesNotAddActionArgumentsOrCallBinderOrValidator_IfBindingIsNotAllowed_OnParameter()
+        {
+            // Arrange
+            var actionDescriptor = GetActionDescriptor();
+            actionDescriptor.Parameters.Add(
+                new ControllerParameterDescriptor
+                {
+                    Name = "foo",
+                    ParameterType = typeof(object),
+                    BindingInfo = new BindingInfo(),
+                    ParameterInfo = ParameterInfos.BindNeverParameterInfo
+                });
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+
+            var binder = new Mock<IModelBinder>();
+            binder
+                .Setup(b => b.BindModelAsync(It.IsAny<DefaultModelBindingContext>()))
+                .Verifiable();
+
+            var mockValidator = new Mock<IModelValidator>(MockBehavior.Strict);
+            mockValidator.Setup(o => o.Validate(It.IsAny<ModelValidationContext>()));
+
+            var factory = GetModelBinderFactory(binder.Object);
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var controller = new TestController();
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                factory,
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new[] { GetModelValidatorProvider(mockValidator.Object) }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder,
+                factory,
+                TestModelMetadataProvider.CreateDefaultProvider(),
+                actionDescriptor,
+                _options);
+
+            await binderDelegate(controllerContext, controller, arguments);
+
+            // Assert
+            Assert.Empty(arguments);
+            binder
+                .Verify(o => o.BindModelAsync(
+                    It.IsAny<DefaultModelBindingContext>()),
+                Times.Never());
+            mockValidator
+                .Verify(o => o.Validate(
+                    It.IsAny<ModelValidationContext>()),
+                Times.Never());
+        }
+
+        [Fact]
+        public async Task CreateBinderDelegate_Delegate_DoesNotAddActionArgumentsOrCallBinderOrValidator_IfBindingIsNotAllowed_OnProperty()
+        {
+            // Arrange
+            var actionDescriptor = GetActionDescriptor();
+            actionDescriptor.BoundProperties.Add(
+                new ParameterDescriptor
+                {
+                    Name = nameof(TestController.RequiredButBindNeverProperty),
+                    ParameterType = typeof(object)
+                });
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+
+            var binder = new Mock<IModelBinder>();
+            binder
+                .Setup(b => b.BindModelAsync(It.IsAny<DefaultModelBindingContext>()))
+                .Verifiable();
+
+            var mockValidator = new Mock<IModelValidator>(MockBehavior.Strict);
+            mockValidator.Setup(o => o.Validate(It.IsAny<ModelValidationContext>()));
+            var factory = GetModelBinderFactory(binder.Object);
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var controller = new TestController();
+
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                factory,
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new[] { GetModelValidatorProvider(mockValidator.Object) }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder,
+                factory,
+                TestModelMetadataProvider.CreateDefaultProvider(),
+                actionDescriptor,
+                _options);
+
+            await binderDelegate(controllerContext, controller, arguments);
+
+            // Assert
+            Assert.Empty(arguments);
+            binder
+                .Verify(o => o.BindModelAsync(
+                    It.IsAny<DefaultModelBindingContext>()),
+                Times.Never());
+            mockValidator
+                .Verify(o => o.Validate(
+                    It.IsAny<ModelValidationContext>()),
+                Times.Never());
+        }
+
+        [Fact]
+        public async Task CreateBinderDelegate_Delegate_DoesNotAddActionArguments_IfBinderReturnsNull()
+        {
+            // Arrange
+            var actionDescriptor = GetActionDescriptor();
+            actionDescriptor.Parameters.Add(
+                new ParameterDescriptor
+                {
+                    Name = "foo",
+                    ParameterType = typeof(object),
+                    BindingInfo = new BindingInfo(),
+                });
+
+            var binder = new Mock<IModelBinder>();
+            binder
+                .Setup(b => b.BindModelAsync(It.IsAny<DefaultModelBindingContext>()))
+                .Returns(Task.CompletedTask);
+
+            var factory = GetModelBinderFactory(binder.Object);
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                factory,
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new IModelValidatorProvider[] { }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+            var controller = new TestController();
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder,
+                factory,
+                modelMetadataProvider,
+                actionDescriptor,
+                _options);
+
+            await binderDelegate(controllerContext, controller, arguments);
+
+            // Assert
+            Assert.Empty(arguments);
+        }
+
+        [Fact]
+        public async Task CreateBinderDelegate_Delegate_DoesNotAddActionArguments_IfBinderDoesNotSetModel()
+        {
+            // Arrange
+            var actionDescriptor = GetActionDescriptor();
+            actionDescriptor.Parameters.Add(
+                new ParameterDescriptor
+                {
+                    Name = "foo",
+                    ParameterType = typeof(object),
+                    BindingInfo = new BindingInfo(),
+                });
+
+            var binder = new Mock<IModelBinder>();
+            binder
+                .Setup(b => b.BindModelAsync(It.IsAny<DefaultModelBindingContext>()))
+                .Returns(Task.CompletedTask);
+
+            var factory = GetModelBinderFactory(binder.Object);
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                factory,
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new IModelValidatorProvider[] { }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+            var controller = new TestController();
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder,
+                factory,
+                modelMetadataProvider,
+                actionDescriptor,
+                _options);
+
+            await binderDelegate(controllerContext, controller, arguments);
+
+            // Assert
+            Assert.Empty(arguments);
+        }
+
+        [Fact]
+        public async Task CreateBinderDelegate_Delegate_AddsActionArguments_IfBinderReturnsNotNull()
+        {
+            // Arrange
+            var actionDescriptor = GetActionDescriptor();
+            actionDescriptor.Parameters.Add(
+                new ParameterDescriptor
+                {
+                    Name = "foo",
+                    ParameterType = typeof(string),
+                    BindingInfo = new BindingInfo(),
+                });
+
+            var value = "Hello world";
+            var metadataProvider = new EmptyModelMetadataProvider();
+
+            var binder = new Mock<IModelBinder>();
+            binder
+                .Setup(b => b.BindModelAsync(It.IsAny<DefaultModelBindingContext>()))
+                .Callback((ModelBindingContext context) =>
+                {
+                    context.ModelMetadata = metadataProvider.GetMetadataForType(typeof(string));
+                    context.Result = ModelBindingResult.Success(value);
+                })
+                .Returns(Task.CompletedTask);
+
+            var factory = GetModelBinderFactory(binder.Object);
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                factory,
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new IModelValidatorProvider[] { }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+            var controller = new TestController();
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder,
+                factory,
+                modelMetadataProvider,
+                actionDescriptor,
+                _options);
+
+            await binderDelegate(controllerContext, controller, arguments);
+
+            // Assert
+            Assert.Single(arguments);
+            Assert.Equal(value, arguments["foo"]);
+        }
+
+        [Fact]
+        public async Task CreateBinderDelegate_Delegate_GetsMetadataFromParameter()
+        {
+            // Arrange
+            var actionDescriptor = GetActionDescriptor();
+            actionDescriptor.Parameters.Add(
+                new ControllerParameterDescriptor
+                {
+                    Name = "foo",
+                    ParameterType = typeof(object),
+                    ParameterInfo = ParameterInfos.NoAttributesParameterInfo
+                });
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+
+            var mockBinder = new Mock<IModelBinder>();
+            var factory = GetModelBinderFactory(mockBinder.Object);
+
+            var controller = new TestController();
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+
+            var modelMetadata = new Mock<FakeModelMetadata>();
+            modelMetadata.Setup(m => m.IsBindingAllowed).Returns(true);
+            var mockMetadataProvider = new Mock<DefaultModelMetadataProvider>(
+                Mock.Of<ICompositeMetadataDetailsProvider>());
+            mockMetadataProvider
+                .Setup(p => p.GetMetadataForParameter(ParameterInfos.NoAttributesParameterInfo))
+                .Returns(modelMetadata.Object);
+
+            var parameterBinder = new ParameterBinder(
+                mockMetadataProvider.Object,
+                factory,
+                new DefaultObjectValidator(
+                    mockMetadataProvider.Object,
+                    new IModelValidatorProvider[] { }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder,
+                factory,
+                mockMetadataProvider.Object,
+                actionDescriptor,
+                _options);
+
+            await binderDelegate(controllerContext, controller, arguments);
+
+            // Assert
+            mockBinder
+                .Verify(o => o.BindModelAsync(
+                    It.Is<ModelBindingContext>(context => context.ModelMetadata == modelMetadata.Object)),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task CreateBinderDelegate_Delegate_GetsMetadataFromType_IsMetadataProviderIsNotDefaultMetadataProvider()
+        {
+            // Arrange
+            var actionDescriptor = GetActionDescriptor();
+            actionDescriptor.Parameters.Add(
+                new ControllerParameterDescriptor
+                {
+                    Name = "foo",
+                    ParameterType = typeof(Person)
+                });
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+
+            var mockBinder = new Mock<IModelBinder>();
+            var factory = GetModelBinderFactory(mockBinder.Object);
+
+            var controller = new TestController();
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+
+            var modelMetadata = new Mock<FakeModelMetadata>();
+            modelMetadata.Setup(m => m.IsBindingAllowed).Returns(true);
+            var mockMetadataProvider = new Mock<IModelMetadataProvider>();
+            mockMetadataProvider
+                .Setup(p => p.GetMetadataForType(typeof(Person)))
+                .Returns(modelMetadata.Object);
+
+            var parameterBinder = new ParameterBinder(
+                mockMetadataProvider.Object,
+                factory,
+                new DefaultObjectValidator(
+                    mockMetadataProvider.Object,
+                    new IModelValidatorProvider[] { }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder,
+                factory,
+                mockMetadataProvider.Object,
+                actionDescriptor,
+                _options);
+
+            await binderDelegate(controllerContext, controller, arguments);
+
+            // Assert
+            mockBinder
+                .Verify(o => o.BindModelAsync(
+                    It.Is<ModelBindingContext>(context => context.ModelMetadata == modelMetadata.Object)),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task CreateBinderDelegate_Delegate_CallsValidator_IfModelBinderSucceeds()
+        {
+            // Arrange
+            var actionDescriptor = GetActionDescriptor();
+            actionDescriptor.Parameters.Add(
+                new ControllerParameterDescriptor
+                {
+                    Name = "foo",
+                    ParameterType = typeof(object),
+                    ParameterInfo = ParameterInfos.CustomValidationParameterInfo
+                });
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+
+            var factory = GetModelBinderFactory("Hello");
+
+            var mockValidator = new Mock<IModelValidator>();
+            mockValidator
+                .Setup(o => o.Validate(It.IsAny<ModelValidationContext>()))
+                .Returns(new[] { new ModelValidationResult("memberName", "some message") });
+
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                factory,
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new[] { GetModelValidatorProvider(mockValidator.Object) }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+            var controller = new TestController();
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder,
+                factory,
+                modelMetadataProvider,
+                actionDescriptor,
+                _options);
+
+            await binderDelegate(controllerContext, controller, arguments);
+
+            // Assert
+            mockValidator.Verify(o => o.Validate(It.IsAny<ModelValidationContext>()), Times.Once());
+
+            Assert.False(controllerContext.ModelState.IsValid);
+            Assert.Equal(
+                "some message",
+                controllerContext.ModelState["memberName"].Errors.Single().ErrorMessage);
+        }
+
+        [Fact]
+        public async Task CreateBinderDelegate_Delegate_DoesNotCallValidator_IfNotValidatingTopLevelNodes()
+        {
+            // Arrange
+            var actionDescriptor = GetActionDescriptor();
+            actionDescriptor.Parameters.Add(
+                new ControllerParameterDescriptor
+                {
+                    Name = "foo",
+                    ParameterType = typeof(object),
+                    ParameterInfo = ParameterInfos.CustomValidationParameterInfo
+                });
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+            var factory = GetModelBinderFactory("Hello");
+
+            var mockValidator = new Mock<IModelValidator>();
+            mockValidator
+                .Setup(o => o.Validate(It.IsAny<ModelValidationContext>()))
+                .Returns(new[] { new ModelValidationResult("memberName", "some message") });
+
+            // Do not set AllowValidatingTopLevelNodes.
+            var mvcOptions = new MvcOptions();
+
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                factory,
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new[] { GetModelValidatorProvider(mockValidator.Object) }),
+                Options.Create(mvcOptions),
+                NullLoggerFactory.Instance);
+            var controller = new TestController();
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder,
+                factory,
+                modelMetadataProvider,
+                actionDescriptor,
+                mvcOptions);
+
+            await binderDelegate(controllerContext, controller, arguments);
+
+            // Assert
+            Assert.True(controllerContext.ModelState.IsValid);
+            mockValidator.Verify(o => o.Validate(It.IsAny<ModelValidationContext>()), Times.Never());
+        }
+
+        [Fact]
+        public async Task CreateBinderDelegate_Delegate_DoesNotCallValidator_IfModelBinderFails()
+        {
+            // Arrange
+            var actionDescriptor = GetActionDescriptor();
+            actionDescriptor.Parameters.Add(
+                new ParameterDescriptor
+                {
+                    Name = "foo",
+                    ParameterType = typeof(object),
+                    BindingInfo = new BindingInfo(),
+                });
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+
+            var binder = new Mock<IModelBinder>();
+            binder
+                .Setup(b => b.BindModelAsync(It.IsAny<DefaultModelBindingContext>()))
+                .Returns(Task.CompletedTask);
+
+            var mockValidator = new Mock<IModelValidator>(MockBehavior.Strict);
+            mockValidator.Setup(o => o.Validate(It.IsAny<ModelValidationContext>()));
+            var factory = GetModelBinderFactory(binder.Object);
+            var controller = new TestController();
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                factory,
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new IModelValidatorProvider[] { }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder,
+                factory,
+                modelMetadataProvider,
+                actionDescriptor,
+                _options);
+
+            await binderDelegate(controllerContext, controller, arguments);
+
+            // Assert
+            mockValidator
+                .Verify(o => o.Validate(
+                    It.IsAny<ModelValidationContext>()),
+                Times.Never());
+        }
+
+        [Fact]
+        public async Task CreateBinderDelegate_Delegate_CallsValidator_ForControllerProperties_IfModelBinderSucceeds()
+        {
+            // Arrange
+            var actionDescriptor = GetActionDescriptor();
+            actionDescriptor.BoundProperties.Add(
+                new ParameterDescriptor
+                {
+                    Name = nameof(TestController.ValidatedProperty),
+                    ParameterType = typeof(string),
+                });
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+            var controller = new TestController();
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+
+            var mockValidator = new Mock<IModelValidator>(MockBehavior.Strict);
+            mockValidator
+                .Setup(o => o.Validate(It.IsAny<ModelValidationContext>()))
+                .Returns(new[] { new ModelValidationResult("memberName", "some message") });
+
+            var factory = GetModelBinderFactory("Hello");
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                factory,
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new[] { GetModelValidatorProvider(mockValidator.Object) }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder,
+                factory,
+                modelMetadataProvider,
+                actionDescriptor,
+                _options);
+
+            await binderDelegate(controllerContext, controller, arguments);
+
+            // Assert
+            mockValidator.Verify(o => o.Validate(It.IsAny<ModelValidationContext>()), Times.Once());
+            Assert.False(controllerContext.ModelState.IsValid);
+            Assert.Equal(
+                "some message",
+                controllerContext.ModelState["memberName"].Errors.Single().ErrorMessage);
+        }
+
+        [Fact]
+        public async Task DoesNotValidate_ForControllerProperties_IfObjectValidatorDoesNotInheritFromBase()
+        {
+            // Arrange
+            var actionDescriptor = GetActionDescriptor();
+            actionDescriptor.BoundProperties.Add(
+                new ParameterDescriptor
+                {
+                    Name = nameof(TestController.ValidatedProperty),
+                    ParameterType = typeof(string),
+                });
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+            var controller = new TestController();
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+
+            var factory = GetModelBinderFactory("Hello");
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var mockValidator = new Mock<IObjectModelValidator>(MockBehavior.Strict);
+            mockValidator
+                .Setup(o => o.Validate(
+                    It.IsAny<ActionContext>(),
+                    It.IsAny<ValidationStateDictionary>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>()));
+
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                factory,
+                mockValidator.Object,
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder,
+                factory,
+                modelMetadataProvider,
+                actionDescriptor,
+                _options);
+
+            await binderDelegate(controllerContext, controller, arguments);
+
+            // Assert
+            Assert.True(controllerContext.ModelState.IsValid);
+        }
+
+        [Fact]
+        public async Task CreateBinderDelegate_Delegate_DoesNotCallValidator_ForControllerProperties_IfModelBinderFails()
+        {
+            // Arrange
+            var actionDescriptor = GetActionDescriptor();
+            actionDescriptor.BoundProperties.Add(
+                new ParameterDescriptor
+                {
+                    Name = nameof(TestController.StringProperty),
+                    ParameterType = typeof(string),
+                });
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+            var controller = new TestController();
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+
+            var binder = new Mock<IModelBinder>();
+            binder
+                .Setup(b => b.BindModelAsync(It.IsAny<DefaultModelBindingContext>()))
+                .Returns(Task.CompletedTask);
+
+            var mockValidator = new Mock<IModelValidator>(MockBehavior.Strict);
+            mockValidator.Setup(o => o.Validate(It.IsAny<ModelValidationContext>()));
+            var factory = GetModelBinderFactory(binder.Object);
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                factory,
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new[] { GetModelValidatorProvider(mockValidator.Object) }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder,
+                factory,
+                modelMetadataProvider,
+                actionDescriptor,
+                _options);
+
+            await binderDelegate(controllerContext, controller, arguments);
+
+            // Assert
+            mockValidator
+                .Verify(o => o.Validate(
+                    It.IsAny<ModelValidationContext>()),
+                Times.Never());
+        }
+
+        [Fact]
+        public async Task CreateBinderDelegate_Delegate_SetsControllerProperties_ForReferenceTypes()
+        {
+            // Arrange
+            var actionDescriptor = GetActionDescriptor();
+            actionDescriptor.BoundProperties.Add(
+                new ParameterDescriptor
+                {
+                    Name = nameof(TestController.StringProperty),
+                    BindingInfo = new BindingInfo(),
+                    ParameterType = typeof(string)
+                });
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+            var controller = new TestController();
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+
+            var factory = GetModelBinderFactory("Hello");
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                factory,
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new IModelValidatorProvider[] { }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder,
+                factory,
+                modelMetadataProvider,
+                actionDescriptor,
+                _options);
+
+            await binderDelegate(controllerContext, controller, arguments);
+
+            // Assert
+            Assert.Equal("Hello", controller.StringProperty);
+            Assert.Equal(new List<string> { "goodbye" }, controller.CollectionProperty);
+            Assert.Null(controller.UntouchedProperty);
+        }
+
+        [Fact]
+        public async Task CreateBinderDelegate_Delegate_AddsToCollectionControllerProperties()
+        {
+            // Arrange
+            var actionDescriptor = GetActionDescriptor();
+            actionDescriptor.BoundProperties.Add(
+                new ParameterDescriptor
+                {
+                    Name = nameof(TestController.CollectionProperty),
+                    BindingInfo = new BindingInfo(),
+                    ParameterType = typeof(ICollection<string>),
+                });
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+            var controller = new TestController();
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+
+            var expected = new List<string> { "Hello", "World", "!!" };
+            var factory = GetModelBinderFactory(expected);
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                factory,
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new IModelValidatorProvider[] { }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder,
+                factory,
+                modelMetadataProvider,
+                actionDescriptor,
+                _options);
+
+            await binderDelegate(controllerContext, controller, arguments);
+
+            // Assert
+            Assert.Equal(expected, controller.CollectionProperty);
+            Assert.Null(controller.StringProperty);
+            Assert.Null(controller.UntouchedProperty);
+        }
+
+        [Fact]
+        public async Task CreateBinderDelegate_Delegate_DoesNotSetNullValues_ForNonNullableProperties()
+        {
+            // Arrange
+            var actionDescriptor = GetActionDescriptor();
+            actionDescriptor.BoundProperties.Add(
+                new ParameterDescriptor
+                {
+                    Name = nameof(TestController.NonNullableProperty),
+                    BindingInfo = new BindingInfo() { BindingSource = BindingSource.Custom },
+                    ParameterType = typeof(int)
+                });
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+            var controller = new TestController();
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+
+            var binder = new StubModelBinder(ModelBindingResult.Success(model: null));
+            var factory = GetModelBinderFactory(binder);
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                factory,
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new IModelValidatorProvider[] { }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Some non default value.
+            controller.NonNullableProperty = -1;
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder,
+                factory,
+                modelMetadataProvider,
+                actionDescriptor,
+                _options);
+
+            await binderDelegate(controllerContext, controller, arguments);
+
+            // Assert
+            Assert.Equal(-1, controller.NonNullableProperty);
+        }
+
+        [Fact]
+        public async Task CreateBinderDelegate_Delegate_SetsNullValues_ForNullableProperties()
+        {
+            // Arrange
+            var actionDescriptor = GetActionDescriptor();
+            actionDescriptor.BoundProperties.Add(
+                new ParameterDescriptor
+                {
+                    Name = "NullableProperty",
+                    BindingInfo = new BindingInfo() { BindingSource = BindingSource.Custom },
+                    ParameterType = typeof(int?)
+                });
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+            var controller = new TestController();
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+
+            var binder = new StubModelBinder(ModelBindingResult.Success(model: null));
+            var factory = GetModelBinderFactory(binder);
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                factory,
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new IModelValidatorProvider[] { }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Some non default value.
+            controller.NullableProperty = -1;
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder,
+                factory,
+                modelMetadataProvider,
+                actionDescriptor,
+                _options);
+
+            await binderDelegate(controllerContext, controller, arguments);
+
+            // Assert
+            Assert.Null(controller.NullableProperty);
+        }
+
+        [Fact]
+        public async Task CreateBinderDelegate_Delegate_SupportsRequestPredicate_ForPropertiesAndParameters_NotBound()
+        {
+            // Arrange
+            var actionDescriptor = GetActionDescriptor();
+
+            actionDescriptor.Parameters.Add(new ParameterDescriptor
+            {
+                Name = "test-parameter",
+                BindingInfo = new BindingInfo()
+                {
+                    BindingSource = BindingSource.Custom,
+
+                    // Simulates [BindProperty] on a parameter
+                    RequestPredicate = ((IRequestPredicateProvider)new BindPropertyAttribute()).RequestPredicate,
+                },
+                ParameterType = typeof(string)
+            });
+
+            actionDescriptor.BoundProperties.Add(new ParameterDescriptor
+            {
+                Name = nameof(TestController.NullableProperty),
+                BindingInfo = new BindingInfo()
+                {
+                    BindingSource = BindingSource.Custom,
+
+                    // Simulates [BindProperty] on a property
+                    RequestPredicate = ((IRequestPredicateProvider)new BindPropertyAttribute()).RequestPredicate,
+                },
+                ParameterType = typeof(string)
+            });
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+            controllerContext.HttpContext.Request.Method = "GET";
+
+            var controller = new TestController();
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+
+            var binder = new StubModelBinder(ModelBindingResult.Success(model: null));
+            var factory = GetModelBinderFactory(binder);
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                factory,
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new IModelValidatorProvider[] { }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Some non default value.
+            controller.NullableProperty = -1;
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder,
+                factory,
+                modelMetadataProvider,
+                actionDescriptor,
+                _options);
+
+            await binderDelegate(controllerContext, controller, arguments);
+
+            // Assert
+            Assert.Equal(-1, controller.NullableProperty);
+            Assert.DoesNotContain("test-parameter", arguments.Keys);
+        }
+
+        [Fact]
+        public async Task CreateBinderDelegate_Delegate_SupportsRequestPredicate_ForPropertiesAndParameters_Bound()
+        {
+            // Arrange
+            var actionDescriptor = GetActionDescriptor();
+
+            actionDescriptor.Parameters.Add(new ParameterDescriptor
+            {
+                Name = "test-parameter",
+                BindingInfo = new BindingInfo()
+                {
+                    BindingSource = BindingSource.Custom,
+
+                    // Simulates [BindProperty] on a parameter
+                    RequestPredicate = ((IRequestPredicateProvider)new BindPropertyAttribute()).RequestPredicate,
+                },
+                ParameterType = typeof(string)
+            });
+
+            actionDescriptor.BoundProperties.Add(new ParameterDescriptor
+            {
+                Name = nameof(TestController.NullableProperty),
+                BindingInfo = new BindingInfo()
+                {
+                    BindingSource = BindingSource.Custom,
+
+                    // Simulates [BindProperty] on a property
+                    RequestPredicate = ((IRequestPredicateProvider)new BindPropertyAttribute()).RequestPredicate,
+                },
+                ParameterType = typeof(string)
+            });
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+            controllerContext.HttpContext.Request.Method = "POST";
+
+            var controller = new TestController();
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+
+            var binder = new StubModelBinder(ModelBindingResult.Success(model: null));
+            var factory = GetModelBinderFactory(binder);
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                factory,
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new IModelValidatorProvider[] { }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Some non default value.
+            controller.NullableProperty = -1;
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder,
+                factory,
+                modelMetadataProvider,
+                actionDescriptor,
+                _options);
+
+            await binderDelegate(controllerContext, controller, arguments);
+
+            // Assert
+            Assert.Null(controller.NullableProperty);
+            Assert.Contains("test-parameter", arguments.Keys);
+            Assert.Null(arguments["test-parameter"]);
+        }
+
+        // property name, property type, property accessor, input value, expected value
+        public static TheoryData<string, Type, Func<object, object>, object, object> SkippedPropertyData
+        {
+            get
+            {
+                return new TheoryData<string, Type, Func<object, object>, object, object>
+                {
+                    {
+                        nameof(TestController.ArrayProperty),
+                        typeof(string[]),
+                        controller => ((TestController)controller).ArrayProperty,
+                        new string[] { "hello", "world" },
+                        new string[] { "goodbye" }
+                    },
+                    {
+                        nameof(TestController.CollectionProperty),
+                        typeof(ICollection<string>),
+                        controller => ((TestController)controller).CollectionProperty,
+                        null,
+                        new List<string> { "goodbye" }
+                    },
+                    {
+                        nameof(TestController.NonCollectionProperty),
+                        typeof(Person),
+                        controller => ((TestController)controller).NonCollectionProperty,
+                        new Person { Name = "Fred" },
+                        new Person { Name = "Ginger" }
+                    },
+                    {
+                        nameof(TestController.NullCollectionProperty),
+                        typeof(ICollection<string>),
+                        controller => ((TestController)controller).NullCollectionProperty,
+                        new List<string> { "hello", "world" },
+                        null
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(SkippedPropertyData))]
+        public async Task CreateBinderDelegate_Delegate_SkipsReadOnlyControllerProperties(
+            string propertyName,
+            Type propertyType,
+            Func<object, object> propertyAccessor,
+            object inputValue,
+            object expectedValue)
+        {
+            // Arrange
+            var actionDescriptor = GetActionDescriptor();
+            actionDescriptor.BoundProperties.Add(
+                new ParameterDescriptor
+                {
+                    Name = propertyName,
+                    BindingInfo = new BindingInfo(),
+                    ParameterType = propertyType,
+                });
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+            var controller = new TestController();
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+
+            var factory = GetModelBinderFactory(inputValue);
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                factory,
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new IModelValidatorProvider[] { }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder,
+                factory,
+                modelMetadataProvider,
+                actionDescriptor,
+                _options);
+
+            await binderDelegate(controllerContext, controller, arguments);
+
+            // Assert
+            Assert.Equal(expectedValue, propertyAccessor(controller));
+            Assert.Null(controller.StringProperty);
+            Assert.Null(controller.UntouchedProperty);
+        }
+
+        [Fact]
+        public async Task CreateBinderDelegate_Delegate_SetsMultipleControllerProperties()
+        {
+            // Arrange
+            var boundPropertyTypes = new Dictionary<string, Type>
+            {
+                { nameof(TestController.ArrayProperty), typeof(string[]) },                // Skipped
+                { nameof(TestController.CollectionProperty), typeof(List<string>) },
+                { nameof(TestController.NonCollectionProperty), typeof(Person) },          // Skipped
+                { nameof(TestController.NullCollectionProperty), typeof(List<string>) },   // Skipped
+                { nameof(TestController.StringProperty), typeof(string) },
+            };
+            var inputPropertyValues = new Dictionary<string, object>
+            {
+                { nameof(TestController.ArrayProperty), new string[] { "hello", "world" } },
+                { nameof(TestController.CollectionProperty), new List<string> { "hello", "world" } },
+                { nameof(TestController.NonCollectionProperty), new Person { Name = "Fred" } },
+                { nameof(TestController.NullCollectionProperty), new List<string> { "hello", "world" } },
+                { nameof(TestController.StringProperty), "Hello" },
+            };
+
+            var actionDescriptor = GetActionDescriptor();
+            foreach (var keyValuePair in boundPropertyTypes)
+            {
+                actionDescriptor.BoundProperties.Add(
+                    new ParameterDescriptor
+                    {
+                        Name = keyValuePair.Key,
+                        BindingInfo = new BindingInfo(),
+                        ParameterType = keyValuePair.Value,
+                    });
+            }
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+            var controller = new TestController();
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+
+            var binder = new StubModelBinder(bindingContext =>
+            {
+                // BindingContext.ModelName will be string.Empty here. This is a 'fallback to empty prefix'
+                // because the value providers have no data.
+                if (inputPropertyValues.TryGetValue(bindingContext.FieldName, out var model))
+                {
+                    bindingContext.Result = ModelBindingResult.Success(model);
+                }
+                else
+                {
+                    bindingContext.Result = ModelBindingResult.Failed();
+                }
+            });
+
+            var factory = GetModelBinderFactory(binder);
+            controllerContext.ValueProviderFactories.Add(new SimpleValueProviderFactory());
+
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                factory,
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new IModelValidatorProvider[] { }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder,
+                factory,
+                modelMetadataProvider,
+                actionDescriptor,
+                _options);
+
+            await binderDelegate(controllerContext, controller, arguments);
+
+            // Assert
+            Assert.Equal(new string[] { "goodbye" }, controller.ArrayProperty);                 // Skipped
+            Assert.Equal(new List<string> { "hello", "world" }, controller.CollectionProperty);
+            Assert.Equal(new Person { Name = "Ginger" }, controller.NonCollectionProperty);     // Skipped
+            Assert.Null(controller.NullCollectionProperty);                                     // Skipped
+            Assert.Null(controller.UntouchedProperty);                                          // Not bound
+            Assert.Equal("Hello", controller.StringProperty);
+        }
+
+        private class TransferInfo
+        {
+            [Range(25, 50)]
+            public int AccountId { get; set; }
+
+            public double Amount { get; set; }
+        }
+
+        public static TheoryData<List<ParameterDescriptor>> MultipleActionParametersAndValidationData
+        {
+            get
+            {
+                return new TheoryData<List<ParameterDescriptor>>
+                {
+                    // Irrespective of the order in which the parameters are defined on the action,
+                    // the validation on the TransferInfo's AccountId should occur.
+                    // Here 'accountId' parameter is bound by the prefix 'accountId' while the 'transferInfo'
+                    // property is bound using the empty prefix and the 'TransferInfo' property names.
+                    new List<ParameterDescriptor>()
+                    {
+                        new ParameterDescriptor()
+                        {
+                            Name = "accountId",
+                            ParameterType = typeof(int)
+                        },
+                        new ParameterDescriptor()
+                        {
+                            Name = "transferInfo",
+                            ParameterType = typeof(TransferInfo),
+                            BindingInfo = new BindingInfo()
+                            {
+                                BindingSource = BindingSource.Body
+                            }
+                        }
+                    },
+                    new List<ParameterDescriptor>()
+                    {
+                        new ParameterDescriptor()
+                        {
+                            Name = "transferInfo",
+                            ParameterType = typeof(TransferInfo),
+                            BindingInfo = new BindingInfo()
+                            {
+                                BindingSource = BindingSource.Body
+                            }
+                        },
+                        new ParameterDescriptor()
+                        {
+                            Name = "accountId",
+                            ParameterType = typeof(int)
+                        }
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(MultipleActionParametersAndValidationData))]
+        public async Task MultipleActionParameter_ValidModelState(List<ParameterDescriptor> parameters)
+        {
+            // Since validation attribute is only present on the FromBody model's property(TransferInfo's AccountId),
+            // validation should not trigger for the parameter which is bound from Uri.
+
+            // Arrange
+            var actionDescriptor = new ControllerActionDescriptor()
+            {
+                BoundProperties = new List<ParameterDescriptor>(),
+                Parameters = parameters
+            };
+            var modelMetadataProvider = new EmptyModelMetadataProvider();
+            var modelBinderProvider = new BodyModelBinderProvider(new[] { Mock.Of<IInputFormatter>() }, Mock.Of<IHttpRequestStreamReaderFactory>());
+            var factory = TestModelBinderFactory.CreateDefault(modelBinderProvider);
+            var modelValidatorProvider = new Mock<IModelValidatorProvider>(MockBehavior.Strict).Object;
+            var parameterBinder = new Mock<ParameterBinder>(
+                new EmptyModelMetadataProvider(),
+                factory,
+                new DefaultObjectValidator(modelMetadataProvider, new[] { modelValidatorProvider }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+            parameterBinder.Setup(p => p.BindModelAsync(
+                It.IsAny<ActionContext>(),
+                It.IsAny<IModelBinder>(),
+                It.IsAny<IValueProvider>(),
+                It.IsAny<ParameterDescriptor>(),
+                It.IsAny<ModelMetadata>(),
+                null))
+                .Returns((ActionContext context, IModelBinder modelBinder, IValueProvider valueProvider, ParameterDescriptor descriptor, ModelMetadata metadata, object v) =>
+                {
+                    ModelBindingResult result;
+                    if (descriptor.Name == "accountId")
+                    {
+                        result = ModelBindingResult.Success(10);
+                    }
+                    else if (descriptor.Name == "transferInfo")
+                    {
+                        result = ModelBindingResult.Success(new TransferInfo
+                        {
+                            AccountId = 40,
+                            Amount = 250.0
+                        });
+                    }
+                    else
+                    {
+                        result = ModelBindingResult.Failed();
+                    }
+
+                    return Task.FromResult(result);
+                });
+
+            var controllerContext = GetControllerContext(actionDescriptor);
+
+            var arguments = new Dictionary<string, object>(StringComparer.Ordinal);
+            var modelState = controllerContext.ModelState;
+
+            // Act
+            var binderDelegate = ControllerBinderDelegateProvider.CreateBinderDelegate(
+                parameterBinder.Object,
+                factory,
+                TestModelMetadataProvider.CreateDefaultProvider(),
+                actionDescriptor,
+                _options);
+
+            await binderDelegate(controllerContext, new TestController(), arguments);
+
+            // Assert
+            Assert.True(modelState.IsValid);
+            Assert.True(arguments.TryGetValue("accountId", out var value));
+            var accountId = Assert.IsType<int>(value);
+            Assert.Equal(10, accountId);
+            Assert.True(arguments.TryGetValue("transferInfo", out value));
+            var transferInfo = Assert.IsType<TransferInfo>(value);
+            Assert.NotNull(transferInfo);
+            Assert.Equal(40, transferInfo.AccountId);
+            Assert.Equal(250.0, transferInfo.Amount);
+        }
+
+        private static ControllerContext GetControllerContext(ControllerActionDescriptor descriptor = null)
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+
+            var context = new ControllerContext()
+            {
+                ActionDescriptor = descriptor ?? GetActionDescriptor(),
+                HttpContext = new DefaultHttpContext()
+                {
+                    RequestServices = services.BuildServiceProvider()
+                },
+                RouteData = new RouteData(),
+            };
+
+            context.ValueProviderFactories.Add(new SimpleValueProviderFactory());
+            return context;
+        }
+
+        private static ControllerActionDescriptor GetActionDescriptor()
+        {
+            Func<object, int> method = foo => 1;
+            return new ControllerActionDescriptor
+            {
+                MethodInfo = method.GetMethodInfo(),
+                ControllerTypeInfo = typeof(TestController).GetTypeInfo(),
+                BoundProperties = new List<ParameterDescriptor>(),
+                Parameters = new List<ParameterDescriptor>()
+            };
+        }
+
+        private static IModelValidatorProvider GetModelValidatorProvider(IModelValidator validator = null)
+        {
+            if (validator == null)
+            {
+                validator = Mock.Of<IModelValidator>();
+            }
+
+            var validatorProvider = new Mock<IModelValidatorProvider>();
+            validatorProvider
+                .Setup(p => p.CreateValidators(It.IsAny<ModelValidatorProviderContext>()))
+                .Callback<ModelValidatorProviderContext>(context =>
+                {
+                    foreach (var result in context.Results)
+                    {
+                        result.Validator = validator;
+                        result.IsReusable = true;
+                    }
+                });
+            return validatorProvider.Object;
+        }
+
+        private static ModelBinderFactory GetModelBinderFactory(object model = null)
+        {
+            var binder = new Mock<IModelBinder>();
+            binder
+                .Setup(b => b.BindModelAsync(It.IsAny<DefaultModelBindingContext>()))
+                .Returns<DefaultModelBindingContext>(mbc =>
+                {
+                    mbc.Result = ModelBindingResult.Success(model);
+                    return Task.CompletedTask;
+                });
+
+            return GetModelBinderFactory(binder.Object);
+        }
+
+        private static ModelBinderFactory GetModelBinderFactory(IModelBinder binder)
+        {
+            var provider = new Mock<IModelBinderProvider>();
+            provider
+                .Setup(p => p.GetBinder(It.IsAny<ModelBinderProviderContext>()))
+                .Returns(binder);
+
+            return TestModelBinderFactory.Create(provider.Object);
+        }
+
+        private static ParameterBinder GetParameterBinder(
+            IModelBinderFactory factory = null,
+            IObjectModelValidator validator = null,
+            IModelMetadataProvider modelMetadataProvider = null,
+            IModelValidatorProvider modelValidatorProvider = null)
+        {
+            if (validator == null)
+            {
+                validator = CreateObjectValidator();
+            }
+
+            if (factory == null)
+            {
+                factory = TestModelBinderFactory.CreateDefault();
+            }
+
+            if (modelValidatorProvider == null)
+            {
+                modelValidatorProvider = Mock.Of<IModelValidatorProvider>();
+            }
+
+            var metadataProvider = modelMetadataProvider ?? TestModelMetadataProvider.CreateDefaultProvider();
+            var objectModelValidator = new DefaultObjectValidator(
+                metadataProvider,
+                new[] { modelValidatorProvider });
+
+            return new ParameterBinder(
+                metadataProvider,
+                factory,
+                objectModelValidator,
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+        }
+
+        private static IObjectModelValidator CreateObjectValidator()
+        {
+            var mockValidator = new Mock<IObjectModelValidator>(MockBehavior.Strict);
+            mockValidator
+                .Setup(o => o.Validate(
+                    It.IsAny<ActionContext>(),
+                    It.IsAny<ValidationStateDictionary>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>()));
+            return mockValidator.Object;
+        }
+
+        // No need for bind-related attributes on properties in this controller class. Properties are added directly
+        // to the BoundProperties collection, bypassing usual requirements.
+        private class TestController
+        {
+            public string UntouchedProperty { get; set; }
+
+            public string[] ArrayProperty { get; } = new string[] { "goodbye" };
+
+            public ICollection<string> CollectionProperty { get; } = new List<string> { "goodbye" };
+
+            public Person NonCollectionProperty { get; } = new Person { Name = "Ginger" };
+
+            public ICollection<string> NullCollectionProperty { get; private set; }
+
+            public string StringProperty { get; set; }
+
+            public int NonNullableProperty { get; set; }
+
+            public int? NullableProperty { get; set; }
+
+            [CustomValidation("Test message")] public string ValidatedProperty { get; set; }
+
+            // Despite being "required", the BindNever means this property won't be involved
+            // in binding, so no validation will be performed
+            [Required, BindNever] public string RequiredButBindNeverProperty { get; set; }
+        }
+
+        private class Person : IEquatable<Person>, IEquatable<object>
+        {
+            public string Name { get; set; }
+
+            public bool Equals(Person other)
+            {
+                return other != null && string.Equals(Name, other.Name, StringComparison.Ordinal);
+            }
+
+            bool IEquatable<object>.Equals(object obj)
+            {
+                return Equals(obj as Person);
+            }
+        }
+
+        private class CustomBindingSourceAttribute : Attribute, IBindingSourceMetadata
+        {
+            public BindingSource BindingSource { get { return BindingSource.Custom; } }
+        }
+
+        private class ValueProviderMetadataAttribute : Attribute, IBindingSourceMetadata
+        {
+            public BindingSource BindingSource { get { return BindingSource.Query; } }
+        }
+
+        private class CustomValidationAttribute : Attribute, IModelValidator
+        {
+            public string Message { get; }
+
+            public CustomValidationAttribute(string message)
+            {
+                Message = message;
+            }
+
+            public IEnumerable<ModelValidationResult> Validate(ModelValidationContext context)
+            {
+                yield return new ModelValidationResult(context.ModelMetadata.BinderModelName, Message);
+            }
+        }
+
+        private class ParameterInfos
+        {
+            public void Method(
+                object param1,
+                [BindNever] object param2,
+                [CustomValidation("some message")] string param3)
+            {
+            }
+
+            public static ParameterInfo NoAttributesParameterInfo
+                = typeof(ParameterInfos)
+                    .GetMethod(nameof(ParameterInfos.Method))
+                    .GetParameters()[0];
+
+            public static ParameterInfo BindNeverParameterInfo
+                = typeof(ParameterInfos)
+                    .GetMethod(nameof(ParameterInfos.Method))
+                    .GetParameters()[1];
+
+            public static ParameterInfo CustomValidationParameterInfo
+                = typeof(ParameterInfos)
+                    .GetMethod(nameof(ParameterInfos.Method))
+                    .GetParameters()[2];
+        }
+
+        public abstract class FakeModelMetadata : ModelMetadata
+        {
+            public FakeModelMetadata()
+                : base(ModelMetadataIdentity.ForType(typeof(string)))
+            {
+            }
+        }
+
+        private class TestObjectModelValidator : IObjectModelValidator
+        {
+            public void Validate(
+                ActionContext actionContext,
+                ValidationStateDictionary validationState,
+                string prefix,
+                object model)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultApplicationModelProviderTest.cs
new file mode 100644
index 0000000000..c7f548efa8
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultApplicationModelProviderTest.cs
@@ -0,0 +1,1698 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class DefaultApplicationModelProviderTest
+    {
+        private readonly TestApplicationModelProvider Provider = new TestApplicationModelProvider();
+
+        [Fact]
+        public void CreateControllerModel_DerivedFromControllerClass_HasFilter()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(StoreController).GetTypeInfo();
+
+            // Act
+            var model = builder.CreateControllerModel(typeInfo);
+
+            // Assert
+            var filter = Assert.Single(model.Filters);
+            Assert.IsType<ControllerActionFilter>(filter);
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_AddsControllerProperties()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(ModelBinderController).GetTypeInfo();
+
+            var context = new ApplicationModelProviderContext(new[] { typeInfo });
+
+            // Act
+            builder.OnProvidersExecuting(context);
+
+            // Assert
+            var controllerModel = Assert.Single(context.Result.Controllers);
+            Assert.Collection(
+                controllerModel.ControllerProperties.OrderBy(p => p.PropertyName),
+                property =>
+                {
+                    Assert.Equal(nameof(ModelBinderController.Bound), property.PropertyName);
+                    Assert.Equal(BindingSource.Query, property.BindingInfo.BindingSource);
+                    Assert.Same(controllerModel, property.Controller);
+
+                    var attribute = Assert.Single(property.Attributes);
+                    Assert.IsType<FromQueryAttribute>(attribute);
+                },
+                property =>
+                {
+                    Assert.Equal(nameof(ModelBinderController.FormFile), property.PropertyName);
+                    Assert.Equal(BindingSource.FormFile, property.BindingInfo.BindingSource);
+                    Assert.Same(controllerModel, property.Controller);
+
+                    Assert.Empty(property.Attributes);
+                },
+                property =>
+                {
+                    Assert.Equal(nameof(ModelBinderController.Unbound), property.PropertyName);
+                    Assert.Null(property.BindingInfo);
+                    Assert.Same(controllerModel, property.Controller);
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_ReadsBindingSourceForPropertiesFromModelMetadata()
+        {
+            // Arrange
+            var detailsProvider = new BindingSourceMetadataProvider(typeof(string), BindingSource.Services);
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider(new[] { detailsProvider });
+            var typeInfo = typeof(ModelBinderController).GetTypeInfo();
+            var provider = new TestApplicationModelProvider(Options.Create(new MvcOptions()), modelMetadataProvider);
+
+            var context = new ApplicationModelProviderContext(new[] { typeInfo });
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controllerModel = Assert.Single(context.Result.Controllers);
+            Assert.Collection(
+                controllerModel.ControllerProperties.OrderBy(p => p.PropertyName),
+                property =>
+                {
+                    Assert.Equal(nameof(ModelBinderController.Bound), property.PropertyName);
+                    Assert.Equal(BindingSource.Query, property.BindingInfo.BindingSource);
+                    Assert.Same(controllerModel, property.Controller);
+
+                    var attribute = Assert.Single(property.Attributes);
+                    Assert.IsType<FromQueryAttribute>(attribute);
+                },
+                property =>
+                {
+                    Assert.Equal(nameof(ModelBinderController.FormFile), property.PropertyName);
+                    Assert.Equal(BindingSource.FormFile, property.BindingInfo.BindingSource);
+                    Assert.Same(controllerModel, property.Controller);
+
+                    Assert.Empty(property.Attributes);
+                },
+                property =>
+                {
+                    Assert.Equal(nameof(ModelBinderController.Unbound), property.PropertyName);
+                    Assert.Equal(BindingSource.Services, property.BindingInfo.BindingSource);
+                    Assert.Same(controllerModel, property.Controller);
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_AddsBindingSources_ForActionParameters()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(ModelBinderController).GetTypeInfo();
+
+            var context = new ApplicationModelProviderContext(new[] { typeInfo });
+
+            // Act
+            builder.OnProvidersExecuting(context);
+
+            // Assert
+            var controllerModel = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controllerModel.Actions, a => a.ActionMethod.Name == nameof(ModelBinderController.PostAction));
+            Assert.Collection(
+                action.Parameters,
+                parameter =>
+                {
+                    Assert.Equal("fromQuery", parameter.ParameterName);
+                    Assert.Equal(BindingSource.Query, parameter.BindingInfo.BindingSource);
+                    Assert.Same(action, parameter.Action);
+
+                    var attribute = Assert.Single(parameter.Attributes);
+                    Assert.IsType<FromQueryAttribute>(attribute);
+                },
+                parameter =>
+                {
+                    Assert.Equal("formFileCollection", parameter.ParameterName);
+                    Assert.Equal(BindingSource.FormFile, parameter.BindingInfo.BindingSource);
+                    Assert.Same(action, parameter.Action);
+
+                    Assert.Empty(parameter.Attributes);
+                },
+                parameter =>
+                {
+                    Assert.Equal("unbound", parameter.ParameterName);
+                    Assert.Null(parameter.BindingInfo);
+                    Assert.Same(action, parameter.Action);
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_AddsBindingSources_ForActionParameters_WithLegacyValidationBehavior()
+        {
+            // Arrange
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var options = Options.Create(new MvcOptions { AllowValidatingTopLevelNodes = false });
+            var builder = new TestApplicationModelProvider(options, modelMetadataProvider);
+            var typeInfo = typeof(ModelBinderController).GetTypeInfo();
+
+            var context = new ApplicationModelProviderContext(new[] { typeInfo });
+
+            // Act
+            builder.OnProvidersExecuting(context);
+
+            // Assert
+            var controllerModel = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controllerModel.Actions, a => a.ActionMethod.Name == nameof(ModelBinderController.PostAction));
+            Assert.Collection(
+                action.Parameters,
+                parameter =>
+                {
+                    Assert.Equal("fromQuery", parameter.ParameterName);
+                    Assert.Equal(BindingSource.Query, parameter.BindingInfo.BindingSource);
+                    Assert.Same(action, parameter.Action);
+
+                    var attribute = Assert.Single(parameter.Attributes);
+                    Assert.IsType<FromQueryAttribute>(attribute);
+                },
+                parameter =>
+                {
+                    Assert.Equal("formFileCollection", parameter.ParameterName);
+                    // BindingSource for IFormFileCollection comes from ModelMetadata which we are not using here.
+                    Assert.Null(parameter.BindingInfo);
+                    Assert.Same(action, parameter.Action);
+
+                    Assert.Empty(parameter.Attributes);
+                },
+                parameter =>
+                {
+                    Assert.Equal("unbound", parameter.ParameterName);
+                    Assert.Null(parameter.BindingInfo);
+                    Assert.Same(action, parameter.Action);
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_AddsBindingSources_ForActionParameters_ReadFromModelMetadata()
+        {
+            // Arrange
+            var options = new MvcOptions { AllowValidatingTopLevelNodes = true };
+            var detailsProvider = new BindingSourceMetadataProvider(typeof(Guid), BindingSource.Special);
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider(new[] { detailsProvider });
+
+            var provider = new TestApplicationModelProvider(Options.Create(options), modelMetadataProvider);
+            var typeInfo = typeof(ModelBinderController).GetTypeInfo();
+
+            var context = new ApplicationModelProviderContext(new[] { typeInfo });
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controllerModel = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controllerModel.Actions, a => a.ActionName == nameof(ModelBinderController.PostAction1));
+            Assert.Collection(
+                action.Parameters,
+                parameter =>
+                {
+                    Assert.Equal("guid", parameter.ParameterName);
+                    Assert.Equal(BindingSource.Special, parameter.BindingInfo.BindingSource);
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_UsesBindingSourceSpecifiedOnParameter()
+        {
+            // Arrange
+            var options = new MvcOptions();
+            var detailsProvider = new BindingSourceMetadataProvider(typeof(Guid), BindingSource.Special);
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider(new[] { detailsProvider });
+
+            var provider = new TestApplicationModelProvider(Options.Create(options), modelMetadataProvider);
+            var typeInfo = typeof(ModelBinderController).GetTypeInfo();
+
+            var context = new ApplicationModelProviderContext(new[] { typeInfo });
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controllerModel = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controllerModel.Actions, a => a.ActionName == nameof(ModelBinderController.PostAction2));
+            Assert.Collection(
+                action.Parameters,
+                parameter =>
+                {
+                    Assert.Equal("fromQuery", parameter.ParameterName);
+                    Assert.Equal(BindingSource.Query, parameter.BindingInfo.BindingSource);
+                });
+        }
+
+        // This class has a filter attribute, but doesn't implement any filter interfaces,
+        // so ControllerFilter is not present.
+        [Fact]
+        public void CreateControllerModel_ClassWithoutFilterInterfaces_HasNoControllerFilter()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(NoFiltersController).GetTypeInfo();
+
+            // Act
+            var model = builder.CreateControllerModel(typeInfo);
+
+            // Assert
+            var filter = Assert.Single(model.Filters);
+            Assert.IsType<MyFilterAttribute>(filter);
+        }
+
+        [Fact]
+        public void CreateControllerModel_ClassWithFilterInterfaces_HasFilter()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(SomeFiltersController).GetTypeInfo();
+
+            // Act
+            var model = builder.CreateControllerModel(typeInfo);
+
+            // Assert
+            Assert.Single(model.Filters, f => f is ControllerActionFilter);
+            Assert.Single(model.Filters, f => f is ControllerResultFilter);
+        }
+
+        [Fact]
+        public void CreateControllerModel_ClassWithFilterInterfaces_UnsupportedType()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(UnsupportedFiltersController).GetTypeInfo();
+
+            // Act
+            var model = builder.CreateControllerModel(typeInfo);
+
+            // Assert
+            Assert.Empty(model.Filters);
+        }
+
+        [Fact]
+        public void CreateControllerModel_ClassWithInheritedRoutes()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(DerivedClassInheritingRoutesController).GetTypeInfo();
+
+            // Act
+            var model = builder.CreateControllerModel(typeInfo);
+
+            // Assert
+            var attributeRoutes = GetAttributeRoutes(model.Selectors);
+            Assert.Equal(2, attributeRoutes.Count);
+            Assert.Equal(2, model.Attributes.Count);
+
+            var route = Assert.Single(attributeRoutes, r => r.Template == "A");
+            Assert.Contains(route.Attribute, model.Attributes);
+
+            route = Assert.Single(attributeRoutes, r => r.Template == "B");
+            Assert.Contains(route.Attribute, model.Attributes);
+        }
+
+        [Fact]
+        public void CreateControllerModel_ClassWithHiddenInheritedRoutes()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(DerivedClassHidingRoutesController).GetTypeInfo();
+
+            // Act
+            var model = builder.CreateControllerModel(typeInfo);
+
+            // Assert
+            var attributeRoutes = GetAttributeRoutes(model.Selectors);
+            Assert.Equal(2, attributeRoutes.Count);
+            Assert.Equal(2, model.Attributes.Count);
+
+            var route = Assert.Single(attributeRoutes, r => r.Template == "C");
+            Assert.Contains(route.Attribute, model.Attributes);
+
+            route = Assert.Single(attributeRoutes, r => r.Template == "D");
+            Assert.Contains(route.Attribute, model.Attributes);
+        }
+
+        [Theory]
+        [InlineData("GetFromDerived", true)]
+        [InlineData("NewMethod", true)] // "NewMethod" is a public method declared with keyword "new".
+        [InlineData("GetFromBase", true)]
+        public void IsAction_WithInheritedMethods(string methodName, bool expected)
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var method = typeof(DerivedController).GetMethod(methodName);
+            Assert.NotNull(method);
+
+            // Act
+            var isValid = builder.IsAction(typeof(DerivedController).GetTypeInfo(), method);
+
+            // Assert
+            Assert.Equal(expected, isValid);
+        }
+
+        [Fact]
+        public void IsAction_OverridenMethodControllerClass()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var method = typeof(BaseController).GetMethod(nameof(BaseController.Redirect));
+            Assert.NotNull(method);
+
+            // Act
+            var isValid = builder.IsAction(typeof(BaseController).GetTypeInfo(), method);
+
+            // Assert
+            Assert.False(isValid);
+        }
+
+        [Fact]
+        public void IsAction_PrivateMethod_FromUserDefinedController()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var method = typeof(DerivedController).GetMethod(
+                "PrivateMethod",
+                BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
+            Assert.NotNull(method);
+
+            // Act
+            var isValid = builder.IsAction(typeof(DerivedController).GetTypeInfo(), method);
+
+            // Assert
+            Assert.False(isValid);
+        }
+
+        [Fact]
+        public void IsAction_OperatorOverloadingMethod_FromOperatorOverloadingController()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var method = typeof(OperatorOverloadingController).GetMethod("op_Addition");
+            Assert.NotNull(method);
+            Assert.True(method.IsSpecialName);
+
+            // Act
+            var isValid = builder.IsAction(typeof(OperatorOverloadingController).GetTypeInfo(), method);
+
+            // Assert
+            Assert.False(isValid);
+        }
+
+        [Fact]
+        public void IsAction_GenericMethod_FromUserDefinedController()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var method = typeof(DerivedController).GetMethod("GenericMethod");
+            Assert.NotNull(method);
+
+            // Act
+            var isValid = builder.IsAction(typeof(DerivedController).GetTypeInfo(), method);
+
+            // Assert
+            Assert.False(isValid);
+        }
+
+        [Fact]
+        public void IsAction_OverridenNonActionMethod()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var method = typeof(DerivedController).GetMethod("OverridenNonActionMethod");
+            Assert.NotNull(method);
+
+            // Act
+            var isValid = builder.IsAction(typeof(DerivedController).GetTypeInfo(), method);
+
+            // Assert
+            Assert.False(isValid);
+        }
+
+        [Theory]
+        [InlineData("Equals")]
+        [InlineData("GetHashCode")]
+        [InlineData("MemberwiseClone")]
+        [InlineData("ToString")]
+        public void IsAction_OverriddenMethodsFromObjectClass(string methodName)
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var method = typeof(DerivedController).GetMethod(
+                methodName,
+                BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
+            Assert.NotNull(method);
+
+            // Act
+            var isValid = builder.IsAction(typeof(DerivedController).GetTypeInfo(), method);
+
+            // Assert
+            Assert.False(isValid);
+        }
+
+        [Fact]
+        public void IsAction_DerivedControllerIDisposableDisposeMethod()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(DerivedController).GetTypeInfo();
+            var methodInfo =
+                typeInfo.GetRuntimeInterfaceMap(typeof(IDisposable)).TargetMethods[0];
+            var method = typeInfo.AsType().GetMethods().SingleOrDefault(m => (m == methodInfo));
+            Assert.NotNull(method);
+
+            // Act
+            var isValid = builder.IsAction(typeInfo, method);
+
+            // Assert
+            Assert.False(isValid);
+        }
+
+        [Fact]
+        public void IsAction_DerivedControllerDisposeMethod()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(DerivedController).GetTypeInfo();
+            var methodInfo =
+                typeInfo.GetRuntimeInterfaceMap(typeof(IDisposable)).TargetMethods[0];
+            var methods = typeInfo.AsType().GetMethods().Where(m => m.Name.Equals("Dispose") && m != methodInfo);
+
+            Assert.NotEmpty(methods);
+
+            foreach (var method in methods)
+            {
+                // Act
+                var isValid = builder.IsAction(typeInfo, method);
+
+                // Assert
+                Assert.True(isValid);
+            }
+        }
+
+        [Fact]
+        public void IsAction_OverriddenDisposeMethod()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(DerivedOverriddenDisposeController).GetTypeInfo();
+            var method = typeInfo.GetDeclaredMethods("Dispose").SingleOrDefault();
+            Assert.NotNull(method);
+
+            // Act
+            var isValid = builder.IsAction(typeInfo, method);
+
+            // Assert
+            Assert.False(isValid);
+        }
+
+        [Fact]
+        public void IsAction_NewDisposeMethod()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(DerivedNewDisposeController).GetTypeInfo();
+            var method = typeInfo.GetDeclaredMethods("Dispose").SingleOrDefault();
+            Assert.NotNull(method);
+
+            // Act
+            var isValid = builder.IsAction(typeInfo, method);
+
+            // Assert
+            Assert.True(isValid);
+        }
+
+        [Fact]
+        public void IsAction_PocoControllerIDisposableDisposeMethod()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(IDisposablePocoController).GetTypeInfo();
+            var methodInfo =
+                typeInfo.GetRuntimeInterfaceMap(typeof(IDisposable)).TargetMethods[0];
+            var method = typeInfo.AsType().GetMethods().SingleOrDefault(m => (m == methodInfo));
+            Assert.NotNull(method);
+
+            // Act
+            var isValid = builder.IsAction(typeInfo, method);
+
+            // Assert
+            Assert.False(isValid);
+        }
+
+        [Fact]
+        public void IsAction_PocoControllerDisposeMethod()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(IDisposablePocoController).GetTypeInfo();
+            var methodInfo =
+                typeInfo.GetRuntimeInterfaceMap(typeof(IDisposable)).TargetMethods[0];
+            var methods = typeInfo.AsType().GetMethods().Where(m => m.Name.Equals("Dispose") && m != methodInfo);
+
+            Assert.NotEmpty(methods);
+
+            foreach (var method in methods)
+            {
+                // Act
+                var isValid = builder.IsAction(typeInfo, method);
+
+                // Assert
+                Assert.True(isValid);
+            }
+        }
+
+        [Fact]
+        public void IsAction_SimplePocoControllerDisposeMethod()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(SimplePocoController).GetTypeInfo();
+            var methods = typeInfo.AsType().GetMethods().Where(m => m.Name.Equals("Dispose"));
+
+            Assert.NotEmpty(methods);
+
+            foreach (var method in methods)
+            {
+                // Act
+                var isValid = builder.IsAction(typeInfo, method);
+
+                // Assert
+                Assert.True(isValid);
+            }
+        }
+
+        [Theory]
+        [InlineData("StaticMethod")]
+        [InlineData("ProtectedStaticMethod")]
+        [InlineData("PrivateStaticMethod")]
+        public void IsAction_StaticMethods(string methodName)
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var method = typeof(DerivedController).GetMethod(
+                methodName,
+                BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
+            Assert.NotNull(method);
+
+            // Act
+            var isValid = builder.IsAction(typeof(DerivedController).GetTypeInfo(), method);
+
+            // Assert
+            Assert.False(isValid);
+        }
+
+        [Fact]
+        public void CreateActionModel_ConventionallyRoutedAction_WithoutHttpConstraints()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(ConventionallyRoutedController).GetTypeInfo();
+            var actionName = nameof(ConventionallyRoutedController.Edit);
+
+            // Act
+            var action = builder.CreateActionModel(typeInfo, typeInfo.AsType().GetMethod(actionName));
+
+            // Assert
+            Assert.NotNull(action);
+            Assert.Equal(actionName, action.ActionName);
+            Assert.Empty(action.Attributes);
+            Assert.Single(action.Selectors);
+            Assert.Empty(action.Selectors[0].ActionConstraints.OfType<HttpMethodActionConstraint>());
+            Assert.Empty(GetAttributeRoutes(action.Selectors));
+        }
+
+        [Fact]
+        public void CreateActionModel_ConventionallyRoutedAction_WithHttpConstraints()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(ConventionallyRoutedController).GetTypeInfo();
+            var actionName = nameof(ConventionallyRoutedController.Update);
+
+            // Act
+            var action = builder.CreateActionModel(typeInfo, typeInfo.AsType().GetMethod(actionName));
+
+            // Assert
+            Assert.NotNull(action);
+            Assert.Single(action.Selectors);
+            var methodConstraint = Assert.Single(
+                action.Selectors[0].ActionConstraints.OfType<HttpMethodActionConstraint>());
+            Assert.Contains("PUT", methodConstraint.HttpMethods);
+            Assert.Contains("PATCH", methodConstraint.HttpMethods);
+
+            Assert.Equal(actionName, action.ActionName);
+            Assert.Empty(GetAttributeRoutes(action.Selectors));
+            Assert.IsType<CustomHttpMethodsAttribute>(Assert.Single(action.Attributes));
+        }
+
+        [Fact]
+        public void CreateActionModel_ConventionallyRoutedActionWithHttpConstraints_AndInvalidRouteTemplateProvider()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(ConventionallyRoutedController).GetTypeInfo();
+            var actionName = nameof(ConventionallyRoutedController.Delete);
+
+            // Act
+            var action = builder.CreateActionModel(typeInfo, typeInfo.AsType().GetMethod(actionName));
+
+            // Assert
+            Assert.NotNull(action);
+            Assert.Single(action.Selectors);
+            var methodConstraint = Assert.Single(
+                action.Selectors[0].ActionConstraints.OfType<HttpMethodActionConstraint>());
+            Assert.Contains("DELETE", methodConstraint.HttpMethods);
+            Assert.Contains("HEAD", methodConstraint.HttpMethods);
+
+            Assert.Equal(actionName, action.ActionName);
+            Assert.Empty(GetAttributeRoutes(action.Selectors));
+            Assert.Single(action.Attributes.OfType<HttpDeleteAttribute>());
+            Assert.Single(action.Attributes.OfType<HttpHeadAttribute>());
+        }
+
+        [Fact]
+        public void CreateActionModel_ConventionallyRoutedAction_WithMultipleHttpConstraints()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(ConventionallyRoutedController).GetTypeInfo();
+            var actionName = nameof(ConventionallyRoutedController.Details);
+
+            // Act
+            var action = builder.CreateActionModel(typeInfo, typeInfo.AsType().GetMethod(actionName));
+
+            // Assert
+            Assert.NotNull(action);
+            Assert.Single(action.Selectors);
+            var methodConstraint = Assert.Single(
+                action.Selectors[0].ActionConstraints.OfType<HttpMethodActionConstraint>());
+            Assert.Contains("GET", methodConstraint.HttpMethods);
+            Assert.Contains("POST", methodConstraint.HttpMethods);
+            Assert.Contains("HEAD", methodConstraint.HttpMethods);
+            Assert.Equal(actionName, action.ActionName);
+            Assert.Empty(GetAttributeRoutes(action.Selectors));
+        }
+
+        [Fact]
+        public void CreateActionModel_ConventionallyRoutedAction_WithMultipleOverlappingHttpConstraints()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(ConventionallyRoutedController).GetTypeInfo();
+            var actionName = nameof(ConventionallyRoutedController.List);
+
+            // Act
+            var action = builder.CreateActionModel(typeInfo, typeInfo.AsType().GetMethod(actionName));
+
+            // Assert
+            Assert.NotNull(action);
+            Assert.Single(action.Selectors);
+            var methodConstraint = Assert.Single(
+                action.Selectors[0].ActionConstraints.OfType<HttpMethodActionConstraint>());
+            Assert.Contains("GET", methodConstraint.HttpMethods);
+            Assert.Contains("PUT", methodConstraint.HttpMethods);
+            Assert.Contains("POST", methodConstraint.HttpMethods);
+            Assert.Equal(actionName, action.ActionName);
+            Assert.Empty(GetAttributeRoutes(action.Selectors));
+        }
+
+        [Fact]
+        public void CreateActionModel_AttributeRouteOnAction()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(NoRouteAttributeOnControllerController).GetTypeInfo();
+            var actionName = nameof(NoRouteAttributeOnControllerController.Edit);
+
+            // Act
+            var action = builder.CreateActionModel(typeInfo, typeInfo.AsType().GetMethod(actionName));
+
+            // Assert
+            Assert.NotNull(action);
+            Assert.Single(action.Selectors);
+            var methodConstraint = Assert.Single(
+                action.Selectors[0].ActionConstraints.OfType<HttpMethodActionConstraint>());
+
+            Assert.Equal(actionName, action.ActionName);
+
+            var httpMethod = Assert.Single(methodConstraint.HttpMethods);
+            Assert.Equal("HEAD", httpMethod);
+
+            var attributeRoute = Assert.Single(GetAttributeRoutes(action.Selectors));
+            Assert.Equal("Change", attributeRoute.Template);
+
+            Assert.IsType<HttpHeadAttribute>(Assert.Single(action.Attributes));
+        }
+
+        [Fact]
+        public void CreateActionModel_AttributeRouteOnAction_RouteAttribute()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(NoRouteAttributeOnControllerController).GetTypeInfo();
+            var actionName = nameof(NoRouteAttributeOnControllerController.Update);
+
+            // Act
+            var action = builder.CreateActionModel(typeInfo, typeInfo.AsType().GetMethod(actionName));
+
+            // Assert
+            Assert.NotNull(action);
+            Assert.Single(action.Selectors);
+            Assert.Empty(action.Selectors[0].ActionConstraints);
+
+            Assert.Equal(actionName, action.ActionName);
+
+            var attributeRoute = Assert.Single(GetAttributeRoutes(action.Selectors));
+            Assert.Equal("Update", attributeRoute.Template);
+
+            Assert.IsType<RouteAttribute>(Assert.Single(action.Attributes));
+        }
+
+        [Fact]
+        public void CreateActionModel_AttributeRouteOnAction_AcceptVerbsAttributeWithTemplate()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(NoRouteAttributeOnControllerController).GetTypeInfo();
+            var actionName = nameof(NoRouteAttributeOnControllerController.List);
+
+            // Act
+            var action = builder.CreateActionModel(typeInfo, typeInfo.AsType().GetMethod(actionName));
+
+            // Assert
+            Assert.NotNull(action);
+            Assert.Single(action.Selectors);
+            var methodConstraint = Assert.Single(
+                action.Selectors[0].ActionConstraints.OfType<HttpMethodActionConstraint>());
+
+            Assert.Equal(actionName, action.ActionName);
+
+            Assert.Equal(
+                new[] { "GET", "HEAD" },
+                methodConstraint.HttpMethods.OrderBy(m => m, StringComparer.Ordinal));
+
+            var attributeRoute = Assert.Single(GetAttributeRoutes(action.Selectors));
+            Assert.Equal("ListAll", attributeRoute.Template);
+
+            Assert.IsType<AcceptVerbsAttribute>(Assert.Single(action.Attributes));
+        }
+
+        [Fact]
+        public void CreateActionModel_AttributeRouteOnAction_CreatesOneActionInforPerRouteTemplate()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(NoRouteAttributeOnControllerController).GetTypeInfo();
+            var actionName = nameof(NoRouteAttributeOnControllerController.Index);
+
+            // Act
+            var action = builder.CreateActionModel(typeInfo, typeInfo.AsType().GetMethod(actionName));
+
+            // Assert
+            Assert.NotNull(action);
+            Assert.Equal(actionName, action.ActionName);
+            Assert.NotNull(action.Attributes);
+            Assert.Equal(2, action.Attributes.Count);
+            Assert.Single(action.Attributes.OfType<HttpGetAttribute>());
+            Assert.Single(action.Attributes.OfType<HttpPostAttribute>());
+            Assert.Equal(2, action.Selectors.Count);
+
+            foreach (var actionSelectorModel in action.Selectors)
+            {
+                Assert.NotNull(actionSelectorModel.AttributeRouteModel);
+            }
+
+            var selectorModel = Assert.Single(action.Selectors, ai => ai.AttributeRouteModel?.Template == "List");
+            var methodConstraint = Assert.Single(selectorModel.ActionConstraints.OfType<HttpMethodActionConstraint>());
+            var listMethod = Assert.Single(methodConstraint.HttpMethods);
+            Assert.Equal("POST", listMethod);
+
+            var all = Assert.Single(action.Selectors, ai => ai.AttributeRouteModel?.Template == "All");
+            methodConstraint = Assert.Single(all.ActionConstraints.OfType<HttpMethodActionConstraint>());
+            var allMethod = Assert.Single(methodConstraint.HttpMethods);
+            Assert.Equal("GET", allMethod);
+        }
+
+        [Fact]
+        public void CreateActionModel_NoRouteOnController_AllowsConventionallyRoutedActions_OnTheSameController()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(NoRouteAttributeOnControllerController).GetTypeInfo();
+            var actionName = nameof(NoRouteAttributeOnControllerController.Remove);
+
+            // Act
+            var action = builder.CreateActionModel(typeInfo, typeInfo.AsType().GetMethod(actionName));
+
+            // Assert
+            Assert.NotNull(action);
+
+            Assert.Equal(actionName, action.ActionName);
+            Assert.Empty(action.Attributes);
+            Assert.Single(action.Selectors);
+            Assert.Empty(action.Selectors[0].ActionConstraints);
+            Assert.Null(action.Selectors[0].AttributeRouteModel);
+        }
+
+        [Theory]
+        [InlineData(typeof(SingleRouteAttributeController))]
+        [InlineData(typeof(MultipleRouteAttributeController))]
+        public void CreateActionModel_RouteAttributeOnController_CreatesAttributeRoute_ForNonAttributedActions(Type controller)
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = controller.GetTypeInfo();
+
+            // Act
+            var action = builder.CreateActionModel(typeInfo, typeInfo.AsType().GetMethod("Delete"));
+
+            // Assert
+            Assert.NotNull(action);
+
+            Assert.Equal("Delete", action.ActionName);
+
+            Assert.Single(action.Selectors);
+            Assert.Empty(action.Selectors[0].ActionConstraints);
+            Assert.Empty(GetAttributeRoutes(action.Selectors));
+            Assert.Empty(action.Attributes);
+        }
+
+        [Theory]
+        [InlineData(typeof(SingleRouteAttributeController))]
+        [InlineData(typeof(MultipleRouteAttributeController))]
+        public void CreateActionModel_RouteOnController_CreatesOneActionInforPerRouteTemplateOnAction(Type controller)
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = controller.GetTypeInfo();
+
+            // Act
+            var action = builder.CreateActionModel(typeInfo, typeInfo.AsType().GetMethod("Index"));
+
+            // Assert
+            Assert.NotNull(action.Attributes);
+            Assert.Equal(2, action.Attributes.Count);
+            Assert.Equal(2, action.Selectors.Count);
+            Assert.Equal("Index", action.ActionName);
+
+            foreach (var selectorModel in action.Selectors)
+            {
+                var methodConstraint = Assert.Single(selectorModel.ActionConstraints.OfType<HttpMethodActionConstraint>());
+                var httpMethod = Assert.Single(methodConstraint.HttpMethods);
+                Assert.Equal("GET", httpMethod);
+
+                Assert.NotNull(selectorModel.AttributeRouteModel.Template);
+            }
+
+            Assert.Single(action.Selectors, ai => ai.AttributeRouteModel.Template.Equals("List"));
+            Assert.Single(action.Selectors, ai => ai.AttributeRouteModel.Template.Equals("All"));
+        }
+
+        [Fact]
+        public void CreateActionModel_MixedHttpVerbsAndRoutes_EmptyVerbWithRoute()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(MixedHttpVerbsAndRouteAttributeController).GetTypeInfo();
+            var actionName = nameof(MixedHttpVerbsAndRouteAttributeController.VerbAndRoute);
+
+            // Act
+            var action = builder.CreateActionModel(typeInfo, typeInfo.AsType().GetMethod(actionName));
+
+            // Assert
+            Assert.NotNull(action);
+            Assert.Single(action.Selectors);
+            var methodConstraint = Assert.Single(
+                action.Selectors[0].ActionConstraints.OfType<HttpMethodActionConstraint>());
+            Assert.Equal<string>(new string[] { "GET" }, methodConstraint.HttpMethods);
+            var attributeRoute = Assert.Single(GetAttributeRoutes(action.Selectors));
+            Assert.Equal("Products", attributeRoute.Template);
+        }
+
+        [Fact]
+        public void CreateActionModel_MixedHttpVerbsAndRoutes_MultipleEmptyVerbsWithMultipleRoutes()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(MixedHttpVerbsAndRouteAttributeController).GetTypeInfo();
+            var actionName = nameof(MixedHttpVerbsAndRouteAttributeController.MultipleVerbsAndRoutes);
+
+            // Act
+            var actions = builder.CreateActionModel(typeInfo, typeInfo.AsType().GetMethod(actionName));
+
+            // Assert
+            Assert.Equal(2, actions.Selectors.Count);
+
+            // OrderBy is used because the order of the results may very depending on the platform / client.
+            var selectorModel = Assert.Single(actions.Selectors, a => a.AttributeRouteModel.Template == "Products");
+            var methodConstraint = Assert.Single(selectorModel.ActionConstraints.OfType<HttpMethodActionConstraint>());
+            Assert.Equal(new[] { "GET", "POST" }, methodConstraint.HttpMethods.OrderBy(key => key, StringComparer.Ordinal));
+
+            selectorModel = Assert.Single(actions.Selectors, a => a.AttributeRouteModel.Template == "v2/Products");
+            methodConstraint = Assert.Single(selectorModel.ActionConstraints.OfType<HttpMethodActionConstraint>());
+            Assert.Equal(new[] { "GET", "POST" }, methodConstraint.HttpMethods.OrderBy(key => key, StringComparer.Ordinal));
+        }
+
+        [Fact]
+        public void CreateActionModel_MixedHttpVerbsAndRoutes_MultipleEmptyAndNonEmptyVerbsWithMultipleRoutes()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(MixedHttpVerbsAndRouteAttributeController).GetTypeInfo();
+            var actionName = nameof(MixedHttpVerbsAndRouteAttributeController.MultipleVerbsWithAnyWithoutTemplateAndRoutes);
+
+            // Act
+            var action = builder.CreateActionModel(typeInfo, typeInfo.AsType().GetMethod(actionName));
+
+            // Assert
+            Assert.Equal(3, action.Selectors.Count);
+
+            var selectorModel = Assert.Single(action.Selectors, s => s.AttributeRouteModel.Template == "Products");
+            var methodConstraint = Assert.Single(selectorModel.ActionConstraints.OfType<HttpMethodActionConstraint>());
+            Assert.Equal<string>(new string[] { "GET" }, methodConstraint.HttpMethods);
+
+            selectorModel = Assert.Single(action.Selectors, s => s.AttributeRouteModel.Template == "v2/Products");
+            methodConstraint = Assert.Single(selectorModel.ActionConstraints.OfType<HttpMethodActionConstraint>());
+            Assert.Equal<string>(new string[] { "GET" }, methodConstraint.HttpMethods);
+
+            selectorModel = Assert.Single(action.Selectors, s => s.AttributeRouteModel.Template == "Products/Buy");
+            methodConstraint = Assert.Single(selectorModel.ActionConstraints.OfType<HttpMethodActionConstraint>());
+            Assert.Equal<string>(new string[] { "POST" }, methodConstraint.HttpMethods);
+        }
+
+        [Fact]
+        public void CreateActionModel_MixedHttpVerbsAndRoutes_WithRouteOnController()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(RouteAttributeOnController).GetTypeInfo();
+            var actionName = nameof(RouteAttributeOnController.Get);
+
+            // Act
+            var action = builder.CreateActionModel(typeInfo, typeInfo.AsType().GetMethod(actionName));
+
+            // Assert
+            Assert.Equal(2, action.Selectors.Count);
+
+            var selectorModel = Assert.Single(action.Selectors, s => s.AttributeRouteModel == null);
+            var methodConstraint = Assert.Single(selectorModel.ActionConstraints.OfType<HttpMethodActionConstraint>());
+            Assert.Equal(new string[] { "GET" }, methodConstraint.HttpMethods);
+
+            selectorModel = Assert.Single(action.Selectors, s => s.AttributeRouteModel?.Template == "id/{id?}");
+            methodConstraint = Assert.Single(selectorModel.ActionConstraints.OfType<HttpMethodActionConstraint>());
+            Assert.Equal(new string[] { "GET" }, methodConstraint.HttpMethods);
+        }
+
+        [Fact]
+        public void CreateActionModel_MixedHttpVerbsAndRoutes_MultipleEmptyAndNonEmptyVerbs()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(MixedHttpVerbsAndRouteAttributeController).GetTypeInfo();
+            var actionName = nameof(MixedHttpVerbsAndRouteAttributeController.Invalid);
+
+            // Act
+            var action = builder.CreateActionModel(typeInfo, typeInfo.AsType().GetMethod(actionName));
+
+            // Assert
+            Assert.NotNull(action);
+            Assert.Equal(2, action.Selectors.Count);
+
+            var selectorModel = Assert.Single(action.Selectors, s => s.AttributeRouteModel?.Template == "Products");
+            var methodConstraint = Assert.Single(selectorModel.ActionConstraints.OfType<HttpMethodActionConstraint>());
+            Assert.Equal<string>(new string[] { "POST" }, methodConstraint.HttpMethods);
+
+            selectorModel = Assert.Single(action.Selectors, s => s.AttributeRouteModel?.Template == null);
+            methodConstraint = Assert.Single(selectorModel.ActionConstraints.OfType<HttpMethodActionConstraint>());
+            Assert.Equal<string>(new string[] { "GET" }, methodConstraint.HttpMethods);
+        }
+
+        [Fact]
+        public void CreateActionModel_InheritedAttributeRoutes()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(DerivedClassInheritsAttributeRoutesController).GetTypeInfo();
+            var actionName = nameof(DerivedClassInheritsAttributeRoutesController.Edit);
+
+            // Act
+            var actions = builder.CreateActionModel(typeInfo, typeInfo.AsType().GetMethod(actionName));
+
+            // Assert
+            Assert.Equal(2, actions.Attributes.Count);
+            Assert.Equal(2, actions.Selectors.Count);
+
+            var selectorModel = Assert.Single(actions.Selectors, a => a.AttributeRouteModel?.Template == "A");
+            Assert.Contains(selectorModel.AttributeRouteModel.Attribute, actions.Attributes);
+
+            selectorModel = Assert.Single(actions.Selectors, a => a.AttributeRouteModel?.Template == "B");
+            Assert.Contains(selectorModel.AttributeRouteModel.Attribute, actions.Attributes);
+        }
+
+        [Fact]
+        public void CreateActionModel_InheritedAttributeRoutesOverridden()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(DerivedClassOverridesAttributeRoutesController).GetTypeInfo();
+            var actionName = nameof(DerivedClassOverridesAttributeRoutesController.Edit);
+
+            // Act
+            var action = builder.CreateActionModel(typeInfo, typeInfo.AsType().GetMethod(actionName));
+
+            // Assert
+            Assert.Equal(4, action.Attributes.Count);
+            Assert.Equal(2, action.Selectors.Count);
+
+            var selectorModel = Assert.Single(action.Selectors, a => a.AttributeRouteModel?.Template == "C");
+            Assert.Contains(selectorModel.AttributeRouteModel.Attribute, action.Attributes);
+
+            selectorModel = Assert.Single(action.Selectors, a => a.AttributeRouteModel?.Template == "D");
+            Assert.Contains(selectorModel.AttributeRouteModel.Attribute, action.Attributes);
+        }
+
+        [Fact]
+        public void ControllerDispose_ExplicitlyImplemented_IDisposableMethods_AreTreatedAs_NonActions()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(DerivedFromControllerAndExplicitIDisposableImplementationController).GetTypeInfo();
+            var context = new ApplicationModelProviderContext(new[] { typeInfo });
+
+            // Act
+            builder.OnProvidersExecuting(context);
+
+            // Assert
+            var model = Assert.Single(context.Result.Controllers);
+            Assert.Empty(model.Actions);
+        }
+
+        [Fact]
+        public void ControllerDispose_MethodsNamedDispose_AreTreatedAsActions()
+        {
+            // Arrange
+            var builder = new TestApplicationModelProvider();
+            var typeInfo = typeof(DerivedFromControllerAndHidesBaseDisposeMethodController).GetTypeInfo();
+            var context = new ApplicationModelProviderContext(new[] { typeInfo });
+
+            // Act
+            builder.OnProvidersExecuting(context);
+
+            // Assert
+            var model = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(model.Actions);
+
+            // Make sure that the Dispose method is from the derived controller and not the base 'Controller' type
+            Assert.Equal(typeInfo, action.ActionMethod.DeclaringType.GetTypeInfo());
+        }
+
+        [BindProperties]
+        public class BindPropertyController
+        {
+            public string Property { get; set; }
+
+            [ModelBinder(typeof(object))]
+            public string BinderType { get; set; }
+
+            [FromRoute]
+            public string BinderSource { get; set; }
+        }
+
+        [Fact]
+        public void CreatePropertyModel_AddsBindingInfoToProperty_IfDeclaringTypeHasBindPropertiesAttribute()
+        {
+            // Arrange
+            var propertyInfo = typeof(BindPropertyController).GetProperty(nameof(BindPropertyController.Property));
+
+            // Act
+            var property = Provider.CreatePropertyModel(propertyInfo);
+
+            // Assert
+            var bindingInfo = property.BindingInfo;
+            Assert.NotNull(bindingInfo);
+            Assert.Null(bindingInfo.BinderModelName);
+            Assert.Null(bindingInfo.BinderType);
+            Assert.Null(bindingInfo.BindingSource);
+            Assert.Null(bindingInfo.PropertyFilterProvider);
+            Assert.NotNull(bindingInfo.RequestPredicate);
+        }
+
+        [Fact]
+        public void CreatePropertyModel_DoesNotSetBindingInfo_IfPropertySpecifiesBinderType()
+        {
+            // Arrange
+            var propertyInfo = typeof(BindPropertyController).GetProperty(nameof(BindPropertyController.BinderType));
+
+            // Act
+            var property = Provider.CreatePropertyModel(propertyInfo);
+
+            // Assert
+            var bindingInfo = property.BindingInfo;
+            Assert.Same(typeof(object), bindingInfo.BinderType);
+        }
+
+        [Fact]
+        public void CreatePropertyModel_DoesNotSetBindingInfo_IfPropertySpecifiesBinderSource()
+        {
+            // Arrange
+            var propertyInfo = typeof(BindPropertyController).GetProperty(nameof(BindPropertyController.BinderSource));
+
+            // Act
+            var property = Provider.CreatePropertyModel(propertyInfo);
+
+            // Assert
+            var bindingInfo = property.BindingInfo;
+            Assert.Null(bindingInfo.BinderType);
+            Assert.Same(BindingSource.Path, property.BindingInfo.BindingSource);
+        }
+
+
+        public class DerivedFromBindPropertyController : BindPropertyController
+        {
+            public string DerivedProperty { get; set; }
+        }
+
+        [Fact]
+        public void CreatePropertyModel_AppliesBindPropertyAttributeDeclaredOnBaseType()
+        {
+            // Arrange
+            var propertyInfo = typeof(DerivedFromBindPropertyController).GetProperty(nameof(DerivedFromBindPropertyController.DerivedProperty));
+
+            // Act
+            var property = Provider.CreatePropertyModel(propertyInfo);
+
+            // Assert
+            Assert.NotNull(property.BindingInfo);
+        }
+
+        [BindProperties]
+        public class UserController : ControllerBase
+        {
+            public string DerivedProperty { get; set; }
+        }
+
+        [Fact]
+        public void CreatePropertyModel_DoesNotApplyBindingInfoToPropertiesOnBaseType()
+        {
+            // This test ensures that applying BindPropertyAttribute on a user defined type does not cause properties on
+            // Controller \ ControllerBase to be treated as model bound.
+            // Arrange
+            var derivedPropertyInfo = typeof(UserController).GetProperty(nameof(UserController.DerivedProperty));
+            var basePropertyInfo = typeof(UserController).GetProperty(nameof(ControllerBase.ControllerContext));
+
+            // Act
+            var derivedProperty = Provider.CreatePropertyModel(derivedPropertyInfo);
+            var baseProperty = Provider.CreatePropertyModel(basePropertyInfo);
+
+            // Assert
+            Assert.NotNull(derivedProperty.BindingInfo);
+            Assert.Null(baseProperty.BindingInfo);
+        }
+
+        private IList<AttributeRouteModel> GetAttributeRoutes(IList<SelectorModel> selectors)
+        {
+            return selectors
+                .Where(sm => sm.AttributeRouteModel != null)
+                .Select(sm => sm.AttributeRouteModel)
+                .ToList();
+        }
+
+        private class DerivedFromControllerAndExplicitIDisposableImplementationController
+            : Mvc.Controller, IDisposable
+        {
+            void IDisposable.Dispose()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class DerivedFromControllerAndHidesBaseDisposeMethodController : Mvc.Controller
+        {
+            public new void Dispose()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class BaseClassWithAttributeRoutesController
+        {
+            [Route("A")]
+            [Route("B")]
+            public virtual void Edit()
+            {
+            }
+        }
+
+        private class DerivedClassInheritsAttributeRoutesController : BaseClassWithAttributeRoutesController
+        {
+            public override void Edit()
+            {
+            }
+        }
+
+        private class DerivedClassOverridesAttributeRoutesController : BaseClassWithAttributeRoutesController
+        {
+            [Route("C")]
+            [Route("D")]
+            public override void Edit()
+            {
+            }
+        }
+
+        private class Controller : IDisposable
+        {
+            public void Dispose()
+            {
+                throw new NotImplementedException();
+            }
+
+            [NonAction]
+            public virtual IActionResult Redirect(string url)
+            {
+                return null;
+            }
+        }
+
+        private class BaseController : Controller
+        {
+            public void GetFromBase() // Valid action method.
+            {
+            }
+
+            [NonAction]
+            public virtual void OverridenNonActionMethod()
+            {
+            }
+
+            [NonAction]
+            public virtual void NewMethod()
+            {
+            }
+
+            public override IActionResult Redirect(string url)
+            {
+                return base.Redirect(url + "#RedirectOverride");
+            }
+        }
+
+        private class DerivedController : BaseController
+        {
+            public void GetFromDerived() // Valid action method.
+            {
+            }
+
+            [HttpGet]
+            public override void OverridenNonActionMethod()
+            {
+            }
+
+            public new void NewMethod() // Valid action method.
+            {
+            }
+
+            public void GenericMethod<T>()
+            {
+            }
+
+            private void PrivateMethod()
+            {
+            }
+
+            public static void StaticMethod()
+            {
+            }
+
+            protected static void ProtectedStaticMethod()
+            {
+            }
+
+            private static void PrivateStaticMethod()
+            {
+            }
+
+            public string Dispose(string s)
+            {
+                return s;
+            }
+
+            public new void Dispose()
+            {
+            }
+        }
+
+        private class IDisposablePocoController : IDisposable
+        {
+            public string Index()
+            {
+                return "Hello world";
+            }
+
+            public void Dispose()
+            {
+                Dispose(disposing: true);
+                GC.SuppressFinalize(this);
+            }
+
+            protected virtual void Dispose(bool disposing)
+            {
+            }
+            public string Dispose(string s)
+            {
+                return s;
+            }
+        }
+
+        private class BaseClass : IDisposable
+        {
+            public virtual void Dispose()
+            {
+                Dispose(disposing: true);
+                GC.SuppressFinalize(this);
+            }
+            protected virtual void Dispose(bool disposing)
+            {
+            }
+        }
+        private class DerivedOverriddenDisposeController : BaseClass
+        {
+            public override void Dispose()
+            {
+                base.Dispose();
+            }
+        }
+
+        private class DerivedNewDisposeController : BaseClass
+        {
+            public new void Dispose()
+            {
+                base.Dispose();
+            }
+        }
+
+        private class SimplePocoController
+        {
+            public string Index()
+            {
+                return "Hello world";
+            }
+
+            public void Dispose()
+            {
+            }
+
+            public void Dispose(string s)
+            {
+            }
+        }
+
+        private class OperatorOverloadingController : Controller
+        {
+            public static OperatorOverloadingController operator +(
+                OperatorOverloadingController c1,
+                OperatorOverloadingController c2)
+            {
+                return new OperatorOverloadingController();
+            }
+        }
+
+        private class NoRouteAttributeOnControllerController : Controller
+        {
+            [HttpGet("All")]
+            [HttpPost("List")]
+            public void Index() { }
+
+            [HttpHead("Change")]
+            public void Edit() { }
+
+            public void Remove() { }
+
+            [Route("Update")]
+            public void Update() { }
+
+            [AcceptVerbs("GET", "HEAD", Route = "ListAll")]
+            public void List() { }
+        }
+
+        [Route("Products")]
+        private class SingleRouteAttributeController : Controller
+        {
+            [HttpGet("All")]
+            [HttpGet("List")]
+            public void Index() { }
+
+            public void Delete() { }
+        }
+
+        [Route("Products")]
+        [Route("Items")]
+        private class MultipleRouteAttributeController : Controller
+        {
+            [HttpGet("All")]
+            [HttpGet("List")]
+            public void Index() { }
+
+            public void Delete() { }
+        }
+
+        private class MixedHttpVerbsAndRouteAttributeController : Controller
+        {
+            // Should produce a single action constrained to GET
+            [HttpGet]
+            [Route("Products")]
+            public void VerbAndRoute() { }
+
+            // Should produce two actions constrained to GET,POST
+            [HttpGet]
+            [HttpPost]
+            [Route("Products")]
+            [Route("v2/Products")]
+            public void MultipleVerbsAndRoutes() { }
+
+            // Produces:
+            //
+            // Products - GET
+            // v2/Products - GET
+            // Products/Buy - POST
+            [HttpGet]
+            [Route("Products")]
+            [Route("v2/Products")]
+            [HttpPost("Products/Buy")]
+            public void MultipleVerbsWithAnyWithoutTemplateAndRoutes() { }
+
+            // Produces:
+            //
+            // (no route) - GET
+            // Products - POST
+            //
+            // This is invalid, and will throw during the ADP construction phase.
+            [HttpGet]
+            [HttpPost("Products")]
+            public void Invalid() { }
+        }
+
+        [Route("api/[controller]")]
+        private class RouteAttributeOnController : Controller
+        {
+            [HttpGet]
+            [HttpGet("id/{id?}")]
+            public object Get(short? id)
+            {
+                return null;
+            }
+
+            [HttpDelete("{id}")]
+            public object Delete(int id)
+            {
+                return null;
+            }
+        }
+
+        // Here the constraints on the methods are acting as an IActionHttpMethodProvider and
+        // not as an IRouteTemplateProvider given that there is no RouteAttribute
+        // on the controller and the template for all the constraints on a method is null.
+        private class ConventionallyRoutedController : Controller
+        {
+            public void Edit() { }
+
+            [CustomHttpMethods("PUT", "PATCH")]
+            public void Update() { }
+
+            [HttpHead]
+            [HttpDelete]
+            public void Delete() { }
+
+            [HttpPost]
+            [HttpGet]
+            [HttpHead]
+            public void Details() { }
+
+            [HttpGet]
+            [HttpPut]
+            [AcceptVerbs("GET", "POST")]
+            public void List() { }
+        }
+
+        private class CustomHttpMethodsAttribute : Attribute, IActionHttpMethodProvider
+        {
+            private readonly string[] _methods;
+
+            public CustomHttpMethodsAttribute(params string[] methods)
+            {
+                _methods = methods;
+            }
+
+            public IEnumerable<string> HttpMethods => _methods;
+        }
+
+        [Route("A")]
+        [Route("B")]
+        private class BaseClassWithRoutesController
+        {
+        }
+
+        private class DerivedClassInheritingRoutesController : BaseClassWithRoutesController
+        {
+        }
+
+        [Route("C")]
+        [Route("D")]
+        private class DerivedClassHidingRoutesController : BaseClassWithRoutesController
+        {
+        }
+
+        private class StoreController : Controller, IActionFilter
+        {
+            public void OnActionExecuted(ActionExecutedContext context)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void OnActionExecuting(ActionExecutingContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class MyFilterAttribute : Attribute, IFilterMetadata
+        {
+        }
+
+        [MyFilter]
+        public class NoFiltersController
+        {
+        }
+
+        public class ModelBinderController
+        {
+            [FromQuery]
+            public string Bound { get; set; }
+
+            public string Unbound { get; set; }
+
+            public IFormFile FormFile { get; set; }
+
+            public IActionResult PostAction([FromQuery] string fromQuery, IFormFileCollection formFileCollection, string unbound) => null;
+
+            public IActionResult PostAction1(Guid guid) => null;
+
+            public IActionResult PostAction2([FromQuery] Guid fromQuery) => null;
+        }
+
+        public class SomeFiltersController : IAsyncActionFilter, IResultFilter
+        {
+            public Task OnActionExecutionAsync(
+                ActionExecutingContext context,
+                ActionExecutionDelegate next)
+            {
+                return null;
+            }
+
+            public void OnResultExecuted(ResultExecutedContext context)
+            {
+            }
+
+            public void OnResultExecuting(ResultExecutingContext context)
+            {
+            }
+        }
+
+        private class UnsupportedFiltersController : IExceptionFilter, IAuthorizationFilter, IAsyncResourceFilter
+        {
+            public void OnAuthorization(AuthorizationFilterContext context)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void OnException(ExceptionContext context)
+            {
+                throw new NotImplementedException();
+            }
+
+            public Task OnResourceExecutionAsync(ResourceExecutingContext context, ResourceExecutionDelegate next)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class TestApplicationModelProvider : DefaultApplicationModelProvider
+        {
+            public TestApplicationModelProvider()
+                : this(Options.Create(new MvcOptions { AllowValidatingTopLevelNodes = true }), TestModelMetadataProvider.CreateDefaultProvider())
+            {
+            }
+
+            public TestApplicationModelProvider(
+                IOptions<MvcOptions> options,
+                IModelMetadataProvider modelMetadataProvider)
+                : base(options, modelMetadataProvider)
+            {
+            }
+
+            public new ControllerModel CreateControllerModel(TypeInfo typeInfo)
+            {
+                return base.CreateControllerModel(typeInfo);
+            }
+
+            public new ActionModel CreateActionModel(TypeInfo typeInfo, MethodInfo methodInfo)
+            {
+                return base.CreateActionModel(typeInfo, methodInfo);
+            }
+
+            public new PropertyModel CreatePropertyModel(PropertyInfo propertyInfo)
+            {
+                return base.CreatePropertyModel(propertyInfo);
+            }
+
+            public new bool IsAction(TypeInfo typeInfo, MethodInfo methodInfo)
+            {
+                return base.IsAction(typeInfo, methodInfo);
+            }
+
+            public new ParameterModel CreateParameterModel(ParameterInfo parameterInfo)
+            {
+                return base.CreateParameterModel(parameterInfo);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultBindingMetadataProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultBindingMetadataProviderTest.cs
new file mode 100644
index 0000000000..7464e6203a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultBindingMetadataProviderTest.cs
@@ -0,0 +1,709 @@
+// 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.
+
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class DefaultModelMetadataBindingDetailsProviderTest
+    {
+        [Fact]
+        public void CreateBindingDetails_FindsBinderTypeProvider()
+        {
+            // Arrange
+            var attributes = new object[]
+            {
+                new ModelBinderAttribute() { BinderType = typeof(HeaderModelBinder) },
+                new ModelBinderAttribute() { BinderType = typeof(ArrayModelBinder<string>) },
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForType(typeof(string)),
+                new ModelAttributes(attributes, null, null));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.Equal(typeof(HeaderModelBinder), context.BindingMetadata.BinderType);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_FindsBinderTypeProvider_IfNullFallsBack()
+        {
+            // Arrange
+            var attributes = new object[]
+            {
+                new ModelBinderAttribute(),
+                new ModelBinderAttribute() { BinderType = typeof(HeaderModelBinder) },
+                new ModelBinderAttribute() { BinderType = typeof(ArrayModelBinder<string>) },
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForType(typeof(string)),
+                new ModelAttributes(attributes, null, null));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.Equal(typeof(HeaderModelBinder), context.BindingMetadata.BinderType);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_FindsModelName()
+        {
+            // Arrange
+            var attributes = new object[]
+            {
+                new ModelBinderAttribute() { Name = "Product" },
+                new ModelBinderAttribute() { Name = "Order" },
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForType(typeof(string)),
+                new ModelAttributes(attributes, null, null));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.Equal("Product", context.BindingMetadata.BinderModelName);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_FindsModelName_IfNullFallsBack()
+        {
+            // Arrange
+            var attributes = new object[]
+            {
+                new ModelBinderAttribute(),
+                new ModelBinderAttribute() { Name = "Product" },
+                new ModelBinderAttribute() { Name = "Order" },
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForType(typeof(string)),
+                new ModelAttributes(attributes, null, null));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.Equal("Product", context.BindingMetadata.BinderModelName);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_FindsBindingSource()
+        {
+            // Arrange
+            var attributes = new object[]
+            {
+                new BindingSourceModelBinderAttribute(BindingSource.Body),
+                new BindingSourceModelBinderAttribute(BindingSource.Query),
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForType(typeof(string)),
+                new ModelAttributes(attributes, null, null));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.Equal(BindingSource.Body, context.BindingMetadata.BindingSource);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_FindsBindingSource_IfNullFallsBack()
+        {
+            // Arrange
+            var attributes = new object[]
+            {
+                new ModelBinderAttribute(),
+                new BindingSourceModelBinderAttribute(BindingSource.Body),
+                new BindingSourceModelBinderAttribute(BindingSource.Query),
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForType(typeof(string)),
+                new ModelAttributes(attributes, null, null));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.Equal(BindingSource.Body, context.BindingMetadata.BindingSource);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_FindsBindingBehaviorNever_OnProperty()
+        {
+            // Arrange
+            var propertyAttributes = new object[]
+            {
+                new BindingBehaviorAttribute(BindingBehavior.Never),
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForProperty(typeof(int), "Length", typeof(string)),
+                new ModelAttributes(new object[0], propertyAttributes, null));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.False(context.BindingMetadata.IsBindingAllowed);
+            Assert.False(context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_FindsBindNever_OnProperty()
+        {
+            // Arrange
+            var propertyAttributes = new object[]
+            {
+                new BindNeverAttribute(),
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForProperty(typeof(int), "Length", typeof(string)),
+                new ModelAttributes(new object[0], propertyAttributes, null));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.False(context.BindingMetadata.IsBindingAllowed);
+            Assert.False(context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_FindsBindingBehaviorOptional_OnProperty()
+        {
+            // Arrange
+            var propertyAttributes = new object[]
+            {
+                new BindingBehaviorAttribute(BindingBehavior.Optional),
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForProperty(typeof(int), "Length", typeof(string)),
+                new ModelAttributes(new object[0], propertyAttributes, null));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.True(context.BindingMetadata.IsBindingAllowed);
+            Assert.False(context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_FindsBindingBehaviorRequired_OnProperty()
+        {
+            // Arrange
+            var propertyAttributes = new object[]
+            {
+                new BindingBehaviorAttribute(BindingBehavior.Required),
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForProperty(typeof(int), "Length", typeof(string)),
+                new ModelAttributes(new object[0], propertyAttributes, null));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.True(context.BindingMetadata.IsBindingAllowed);
+            Assert.True(context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_FindsBindRequired_OnProperty()
+        {
+            // Arrange
+            var propertyAttributes = new object[]
+            {
+                new BindRequiredAttribute(),
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForProperty(typeof(int), "Length", typeof(string)),
+                new ModelAttributes(new object[0], propertyAttributes, null));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.True(context.BindingMetadata.IsBindingAllowed);
+            Assert.True(context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_FindsBindingBehaviorNever_OnParameter()
+        {
+            // Arrange
+            var parameterAttributes = new object[]
+            {
+                new BindingBehaviorAttribute(BindingBehavior.Never),
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForParameter(ParameterInfos.SampleParameterInfo),
+                new ModelAttributes(Array.Empty<object>(), null, parameterAttributes));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.False(context.BindingMetadata.IsBindingAllowed);
+            Assert.False(context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_FindsBindNever_OnParameter()
+        {
+            // Arrange
+            var parameterAttributes = new object[]
+            {
+                new BindNeverAttribute(),
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForParameter(ParameterInfos.SampleParameterInfo),
+                new ModelAttributes(Array.Empty<object>(), null, parameterAttributes));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.False(context.BindingMetadata.IsBindingAllowed);
+            Assert.False(context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_FindsBindingBehaviorOptional_OnParameter()
+        {
+            // Arrange
+            var parameterAttributes = new object[]
+            {
+                new BindingBehaviorAttribute(BindingBehavior.Optional),
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForParameter(ParameterInfos.SampleParameterInfo),
+                new ModelAttributes(Array.Empty<object>(), null, parameterAttributes));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.True(context.BindingMetadata.IsBindingAllowed);
+            Assert.False(context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_FindsBindingBehaviorRequired_OnParameter()
+        {
+            // Arrange
+            var parameterAttributes = new object[]
+            {
+                new BindingBehaviorAttribute(BindingBehavior.Required),
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForParameter(ParameterInfos.SampleParameterInfo),
+                new ModelAttributes(Array.Empty<object>(), null, parameterAttributes));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.True(context.BindingMetadata.IsBindingAllowed);
+            Assert.True(context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_FindsBindRequired_OnParameter()
+        {
+            // Arrange
+            var parameterAttributes = new object[]
+            {
+                new BindRequiredAttribute(),
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForParameter(ParameterInfos.SampleParameterInfo),
+                new ModelAttributes(Array.Empty<object>(), null, parameterAttributes));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.True(context.BindingMetadata.IsBindingAllowed);
+            Assert.True(context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_FindsCustomAttributes_OnParameter()
+        {
+            // Arrange
+            var parameterAttributes = new object[]
+            {
+                new CustomAttribute { Identifier = "Instance1" },
+                new CustomAttribute { Identifier = "Instance2" }
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForParameter(ParameterInfos.SampleParameterInfo),
+                new ModelAttributes(Array.Empty<object>(), null, parameterAttributes));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.Collection(context.Attributes,
+                a => Assert.Equal("Instance1", ((CustomAttribute)a).Identifier),
+                a => Assert.Equal("Instance2", ((CustomAttribute)a).Identifier));
+            Assert.Equal(2, context.ParameterAttributes.Count);
+        }
+
+        // These attributes have conflicting behavior - the 'required' behavior should be used because
+        // of ordering.
+        [Fact]
+        public void CreateBindingDetails_UsesFirstAttribute()
+        {
+            // Arrange
+            var propertyAttributes = new object[]
+            {
+                new BindingBehaviorAttribute(BindingBehavior.Required),
+                new BindNeverAttribute(),
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForProperty(typeof(int), "Length", typeof(string)),
+                new ModelAttributes(new object[0], propertyAttributes, null));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.True(context.BindingMetadata.IsBindingAllowed);
+            Assert.True(context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_FindsBindRequired_OnContainerClass()
+        {
+            // Arrange
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForProperty(typeof(string), "Property", typeof(BindRequiredOnClass)),
+                new ModelAttributes(new object[0], new object[0], null));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.True(context.BindingMetadata.IsBindingAllowed);
+            Assert.True(context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_FindsBindNever_OnContainerClass()
+        {
+            // Arrange
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForProperty(typeof(string), "Property", typeof(BindNeverOnClass)),
+                new ModelAttributes(new object[0], new object[0], null));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.False(context.BindingMetadata.IsBindingAllowed);
+            Assert.False(context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_FindsBindNever_OnBaseClass()
+        {
+            // Arrange
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForProperty(typeof(string), "Property", typeof(InheritedBindNeverOnClass)),
+                new ModelAttributes(new object[0], new object[0], null));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.False(context.BindingMetadata.IsBindingAllowed);
+            Assert.False(context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_OverrideBehaviorOnClass_OverrideWithOptional()
+        {
+            // Arrange
+            var propertyAttributes = new object[]
+            {
+                new BindingBehaviorAttribute(BindingBehavior.Optional)
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForProperty(typeof(string), "Property", typeof(BindNeverOnClass)),
+                new ModelAttributes(new object[0], propertyAttributes, null));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.True(context.BindingMetadata.IsBindingAllowed);
+            Assert.False(context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_OverrideBehaviorOnClass_OverrideWithRequired()
+        {
+            // Arrange
+            var propertyAttributes = new object[]
+            {
+                new BindRequiredAttribute()
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForProperty(typeof(string), "Property", typeof(BindNeverOnClass)),
+                new ModelAttributes(new object[0], propertyAttributes, null));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.True(context.BindingMetadata.IsBindingAllowed);
+            Assert.True(context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_OverrideInheritedBehaviorOnClass_OverrideWithRequired()
+        {
+            // Arrange
+            var propertyAttributes = new object[]
+            {
+                new BindRequiredAttribute()
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForProperty(typeof(string), "Property", typeof(InheritedBindNeverOnClass)),
+                new ModelAttributes(new object[0], propertyAttributes, null));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.True(context.BindingMetadata.IsBindingAllowed);
+            Assert.True(context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void CreateBindingDetails_OverrideBehaviorOnClass_OverrideWithNever()
+        {
+            // Arrange
+            var propertyAttributes = new object[]
+            {
+                new BindNeverAttribute(),
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForProperty(typeof(string), "Property", typeof(BindRequiredOnClass)),
+                new ModelAttributes(new object[0], propertyAttributes, null));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.False(context.BindingMetadata.IsBindingAllowed);
+            Assert.False(context.BindingMetadata.IsBindingRequired);
+        }
+
+        // This overrides an inherited class-level attribute with a different class-level attribute.
+        [Fact]
+        public void CreateBindingDetails_OverrideBehaviorOnBaseClass_OverrideWithRequired_OnClass()
+        {
+            // Arrange
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForProperty(typeof(string), "Property", typeof(BindRequiredOverridesInheritedBindNever)),
+                new ModelAttributes(new object[0], new object[0], null));
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.True(context.BindingMetadata.IsBindingAllowed);
+            Assert.True(context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void CreateBindingDetails_BindingBehaviorLeftAlone_ForTypeMetadata(bool initialValue)
+        {
+            // Arrange
+            var attributes = new object[]
+            {
+                new BindingBehaviorAttribute(BindingBehavior.Required),
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForType(typeof(string)),
+                new ModelAttributes(attributes, null, null));
+
+            // These values shouldn't be changed since this is a Type-Metadata
+            context.BindingMetadata.IsBindingAllowed = initialValue;
+            context.BindingMetadata.IsBindingRequired = initialValue;
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.Equal(initialValue, context.BindingMetadata.IsBindingAllowed);
+            Assert.Equal(initialValue, context.BindingMetadata.IsBindingRequired);
+        }
+
+        // Unlike most model metadata settings, BindingBehavior can be specified on the *container type*
+        // but not on the property type.
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void CreateBindingDetails_BindingBehaviorLeftAlone_ForAttributeOnPropertyType(bool initialValue)
+        {
+            // Arrange
+            var typeAttributes = new object[]
+            {
+                new BindingBehaviorAttribute(BindingBehavior.Required),
+            };
+
+            var context = new BindingMetadataProviderContext(
+                ModelMetadataIdentity.ForProperty(typeof(int), "Length", typeof(string)),
+                new ModelAttributes(typeAttributes, new object[0], null));
+
+            // These values shouldn't be changed since this is a Type-Metadata
+            context.BindingMetadata.IsBindingAllowed = initialValue;
+            context.BindingMetadata.IsBindingRequired = initialValue;
+
+            var provider = new DefaultBindingMetadataProvider();
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.Equal(initialValue, context.BindingMetadata.IsBindingAllowed);
+            Assert.Equal(initialValue, context.BindingMetadata.IsBindingRequired);
+        }
+
+        [BindNever]
+        private class BindNeverOnClass
+        {
+            public string Property { get; set; }
+        }
+
+        private class InheritedBindNeverOnClass : BindNeverOnClass
+        {
+        }
+
+        [BindRequired]
+        private class BindRequiredOnClass
+        {
+            public string Property { get; set; }
+        }
+
+        [BindRequired]
+        private class BindRequiredOverridesInheritedBindNever : BindNeverOnClass
+        {
+        }
+
+        private class BindingSourceModelBinderAttribute : ModelBinderAttribute
+        {
+            public BindingSourceModelBinderAttribute(BindingSource bindingSource)
+            {
+                BindingSource = bindingSource;
+            }
+        }
+
+        private class ParameterInfos
+        {
+            public void Method(object param1)
+            {
+            }
+
+            public static ParameterInfo SampleParameterInfo
+                = typeof(ParameterInfos)
+                    .GetMethod(nameof(ParameterInfos.Method))
+                    .GetParameters()[0];
+        }
+        
+        private class CustomAttribute : Attribute
+        {
+            public string Identifier { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultCollectionValidationStrategyTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultCollectionValidationStrategyTest.cs
new file mode 100644
index 0000000000..70a6fb110d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultCollectionValidationStrategyTest.cs
@@ -0,0 +1,158 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class DefaultCollectionValidationStrategyTest
+    {
+        [Fact]
+        public void EnumerateElements()
+        {
+            // Arrange
+            var model = new List<int>() { 2, 3, 5 };
+
+            var metadata = TestModelMetadataProvider.CreateDefaultProvider().GetMetadataForType(typeof(List<int>));
+            var strategy = DefaultCollectionValidationStrategy.Instance;
+
+            // Act
+            var enumerator = strategy.GetChildren(metadata, "prefix", model);
+
+            // Assert
+            Assert.Collection(
+                BufferEntries(enumerator).OrderBy(e => e.Key),
+                e => 
+                {
+                    Assert.Equal("prefix[0]", e.Key);
+                    Assert.Equal(2, e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                },
+                e =>
+                {
+                    Assert.Equal("prefix[1]", e.Key);
+                    Assert.Equal(3, e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                },
+                e =>
+                {
+                    Assert.Equal("prefix[2]", e.Key);
+                    Assert.Equal(5, e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                });
+        }
+
+        [Fact]
+        public void EnumerateElements_Dictionary()
+        {
+            // Arrange
+            var model = new Dictionary<int, string>()
+            {
+                { 2, "two" },
+                { 3, "three" },
+                { 5, "five" },
+            };
+
+            var metadata = TestModelMetadataProvider.CreateDefaultProvider().GetMetadataForType(typeof(List<int>));
+            var strategy = DefaultCollectionValidationStrategy.Instance;
+
+            // Act
+            var enumerator = strategy.GetChildren(metadata, "prefix", model);
+
+            // Assert
+            Assert.Collection(
+                BufferEntries(enumerator).OrderBy(e => e.Key),
+                e =>
+                {
+                    Assert.Equal("prefix[0]", e.Key);
+                    Assert.Equal(new KeyValuePair<int, string>(2, "two"), e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                },
+                e =>
+                {
+                    Assert.Equal("prefix[1]", e.Key);
+                    Assert.Equal(new KeyValuePair<int, string>(3, "three"), e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                },
+                e =>
+                {
+                    Assert.Equal("prefix[2]", e.Key);
+                    Assert.Equal(new KeyValuePair<int, string>(5, "five"), e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                });
+        }
+
+        [Fact]
+        public void EnumerateElements_TwoEnumerableImplemenations()
+        {
+            // Arrange
+            var model = new TwiceEnumerable(new int[] { 2, 3, 5 });
+
+            var metadata = TestModelMetadataProvider.CreateDefaultProvider().GetMetadataForType(typeof(TwiceEnumerable));
+            var strategy = DefaultCollectionValidationStrategy.Instance;
+
+            // Act
+            var enumerator = strategy.GetChildren(metadata, "prefix", model);
+
+            // Assert
+            Assert.Collection(
+                BufferEntries(enumerator).OrderBy(e => e.Key),
+                e =>
+                {
+                    Assert.Equal("prefix[0]", e.Key);
+                    Assert.Equal(2, e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                },
+                e =>
+                {
+                    Assert.Equal("prefix[1]", e.Key);
+                    Assert.Equal(3, e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                },
+                e =>
+                {
+                    Assert.Equal("prefix[2]", e.Key);
+                    Assert.Equal(5, e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                });
+        }
+
+        // 'int' is chosen by validation because it's declared on the more derived type.
+        private class TwiceEnumerable : List<string>, IEnumerable<int>
+        {
+            private readonly IEnumerable<int> _enumerable;
+
+            public TwiceEnumerable(IEnumerable<int> enumerable)
+            {
+                _enumerable = enumerable;
+            }
+
+            IEnumerator<int> IEnumerable<int>.GetEnumerator()
+            {
+                return _enumerable.GetEnumerator();
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                throw new InvalidOperationException();
+            }
+        }
+
+        private List<ValidationEntry> BufferEntries(IEnumerator<ValidationEntry> enumerator)
+        {
+            var entries = new List<ValidationEntry>();
+            while (enumerator.MoveNext())
+            {
+                entries.Add(enumerator.Current);
+            }
+
+            return entries;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultComplexObjectValidationStrategyTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultComplexObjectValidationStrategyTest.cs
new file mode 100644
index 0000000000..9ed691d26d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultComplexObjectValidationStrategyTest.cs
@@ -0,0 +1,160 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class DefaultComplexObjectValidationStrategyTest
+    {
+        [Fact]
+        public void GetChildren_ReturnsExpectedElements()
+        {
+            // Arrange
+            var model = new Person()
+            {
+                Age = 23,
+                Id = 1,
+                Name = "Joey",
+            };
+
+            var metadata = TestModelMetadataProvider.CreateDefaultProvider().GetMetadataForType(typeof(Person));
+            var strategy = DefaultComplexObjectValidationStrategy.Instance;
+
+            // Act
+            var enumerator = strategy.GetChildren(metadata, "prefix", model);
+
+            // Assert
+            Assert.Collection(
+                BufferEntries(enumerator).OrderBy(e => e.Key),
+                entry =>
+                {
+                    Assert.Equal("prefix.Age", entry.Key);
+                    Assert.Equal(23, entry.Model);
+                    Assert.Same(metadata.Properties["Age"], entry.Metadata);
+                },
+                entry =>
+                {
+                    Assert.Equal("prefix.Id", entry.Key);
+                    Assert.Equal(1, entry.Model);
+                    Assert.Same(metadata.Properties["Id"], entry.Metadata);
+                },
+                entry =>
+                {
+                    Assert.Equal("prefix.Name", entry.Key);
+                    Assert.Equal("Joey", entry.Model);
+                    Assert.Same(metadata.Properties["Name"], entry.Metadata);
+                });
+        }
+
+        [Fact]
+        public void GetChildren_SetsModelNull_IfContainerNull()
+        {
+            // Arrange
+            Person model = null;
+            var metadata = TestModelMetadataProvider.CreateDefaultProvider().GetMetadataForType(typeof(Person));
+            var strategy = DefaultComplexObjectValidationStrategy.Instance;
+
+            // Act
+            var enumerator = strategy.GetChildren(metadata, "prefix", model);
+
+            // Assert
+            Assert.Collection(
+                BufferEntries(enumerator).OrderBy(e => e.Key),
+                entry =>
+                {
+                    Assert.Equal("prefix.Age", entry.Key);
+                    Assert.Null(entry.Model);
+                    Assert.Same(metadata.Properties["Age"], entry.Metadata);
+                },
+                entry =>
+                {
+                    Assert.Equal("prefix.Id", entry.Key);
+                    Assert.Null(entry.Model);
+                    Assert.Same(metadata.Properties["Id"], entry.Metadata);
+                },
+                entry =>
+                {
+                    Assert.Equal("prefix.Name", entry.Key);
+                    Assert.Null(entry.Model);
+                    Assert.Same(metadata.Properties["Name"], entry.Metadata);
+                });
+        }
+
+        [Fact]
+        public void GetChildren_LazyLoadsModel()
+        {
+            // Arrange
+            var model = new LazyPerson(input: null);
+            var metadata = TestModelMetadataProvider.CreateDefaultProvider().GetMetadataForType(typeof(LazyPerson));
+            var strategy = DefaultComplexObjectValidationStrategy.Instance;
+
+            // Act
+            var enumerator = strategy.GetChildren(metadata, "prefix", model);
+
+            // Assert
+            // Note: NREs are not thrown until the Model property is accessed.
+            Assert.Collection(
+                BufferEntries(enumerator).OrderBy(e => e.Key),
+                entry =>
+                {
+                    Assert.Equal("prefix.Age", entry.Key);
+                    Assert.Equal(23, entry.Model);
+                    Assert.Same(metadata.Properties["Age"], entry.Metadata);
+                },
+                entry =>
+                {
+                    Assert.Equal("prefix.Id", entry.Key);
+                    Assert.Throws<NullReferenceException>(() => entry.Model);
+                    Assert.Same(metadata.Properties["Id"], entry.Metadata);
+                },
+                entry =>
+                {
+                    Assert.Equal("prefix.Name", entry.Key);
+                    Assert.Throws<NullReferenceException>(() => entry.Model);
+                    Assert.Same(metadata.Properties["Name"], entry.Metadata);
+                });
+        }
+
+        private List<ValidationEntry> BufferEntries(IEnumerator<ValidationEntry> enumerator)
+        {
+            var entries = new List<ValidationEntry>();
+            while (enumerator.MoveNext())
+            {
+                entries.Add(enumerator.Current);
+            }
+
+            return entries;
+        }
+
+        private class Person
+        {
+            public int Id { get; set; }
+
+            public int Age { get; set; }
+
+            public string Name { get; set; }
+        }
+
+        private class LazyPerson
+        {
+            private string _string;
+
+            public LazyPerson(string input)
+            {
+                _string = input;
+            }
+
+            public int Id => _string.Length;
+
+            public int Age => 23;
+
+            public string Name => _string.Substring(3, 5);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultModelValidatorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultModelValidatorProviderTest.cs
new file mode 100644
index 0000000000..680d46ff30
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultModelValidatorProviderTest.cs
@@ -0,0 +1,222 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    // Integration tests for the default configuration of ModelMetadata and Validation providers
+    public class DefaultModelValidatorProviderTest
+    {
+        [Fact]
+        public void CreateValidators_ForIValidatableObject()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var validatorProvider = TestModelValidatorProvider.CreateDefaultProvider();
+
+            var metadata = metadataProvider.GetMetadataForType(typeof(ValidatableObject));
+            var context = new ModelValidatorProviderContext(metadata, GetValidatorItems(metadata));
+
+            // Act
+            validatorProvider.CreateValidators(context);
+
+            // Assert
+            var validatorItems = context.Results;
+
+            var validatorItem = Assert.Single(validatorItems);
+            Assert.IsType<ValidatableObjectAdapter>(validatorItem.Validator);
+        }
+
+        [Fact]
+        public void CreateValidators_ModelValidatorAttributeOnClass()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var validatorProvider = TestModelValidatorProvider.CreateDefaultProvider();
+
+            var metadata = metadataProvider.GetMetadataForType(typeof(ModelValidatorAttributeOnClass));
+            var context = new ModelValidatorProviderContext(metadata, GetValidatorItems(metadata));
+
+            // Act
+            validatorProvider.CreateValidators(context);
+
+            // Assert
+            var validatorItems = context.Results;
+
+            var validator = Assert.IsType<CustomModelValidatorAttribute>(Assert.Single(validatorItems).Validator);
+            Assert.Equal("Class", validator.Tag);
+        }
+
+        [Fact]
+        public void CreateValidators_ModelValidatorAttributeOnProperty()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var validatorProvider = TestModelValidatorProvider.CreateDefaultProvider();
+
+            var metadata = metadataProvider.GetMetadataForProperty(
+                typeof(ModelValidatorAttributeOnProperty),
+                nameof(ModelValidatorAttributeOnProperty.Property));
+            var context = new ModelValidatorProviderContext(metadata, GetValidatorItems(metadata));
+
+            // Act
+            validatorProvider.CreateValidators(context);
+
+            // Assert
+            var validatorItems = context.Results;
+
+            var validator = Assert.IsType<CustomModelValidatorAttribute>(Assert.Single(validatorItems).Validator);
+            Assert.Equal("Property", validator.Tag);
+        }
+
+        [Fact]
+        public void CreateValidators_ModelValidatorAttributeOnPropertyAndClass()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var validatorProvider = TestModelValidatorProvider.CreateDefaultProvider();
+
+            var metadata = metadataProvider.GetMetadataForProperty(
+                typeof(ModelValidatorAttributeOnPropertyAndClass),
+                nameof(ModelValidatorAttributeOnPropertyAndClass.Property));
+            var context = new ModelValidatorProviderContext(metadata, GetValidatorItems(metadata));
+
+            // Act
+            validatorProvider.CreateValidators(context);
+
+            // Assert
+            var validatorItems = context.Results;
+
+            Assert.Equal(2, validatorItems.Count);
+            Assert.Single(validatorItems, v => Assert.IsType<CustomModelValidatorAttribute>(v.Validator).Tag == "Class");
+            Assert.Single(validatorItems, v => Assert.IsType<CustomModelValidatorAttribute>(v.Validator).Tag == "Property");
+        }
+
+        [Fact]
+        public void CreateValidators_FromModelMetadataType_SingleValidator()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var validatorProvider = TestModelValidatorProvider.CreateDefaultProvider();
+
+            var metadata = metadataProvider.GetMetadataForProperty(
+                typeof(ProductViewModel),
+                nameof(ProductViewModel.Id));
+            var context = new ModelValidatorProviderContext(metadata, GetValidatorItems(metadata));
+
+            // Act
+            validatorProvider.CreateValidators(context);
+
+            // Assert
+            var validatorItems = context.Results;
+
+            var adapter = Assert.IsType<DataAnnotationsModelValidator>(Assert.Single(validatorItems).Validator);
+            Assert.IsType<RangeAttribute>(adapter.Attribute);
+        }
+
+        [Fact]
+        public void CreateValidators_FromModelMetadataType_MergedValidators()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var validatorProvider = TestModelValidatorProvider.CreateDefaultProvider();
+
+            var metadata = metadataProvider.GetMetadataForProperty(
+                typeof(ProductViewModel),
+                nameof(ProductViewModel.Name));
+            var context = new ModelValidatorProviderContext(metadata, GetValidatorItems(metadata));
+
+            // Act
+            validatorProvider.CreateValidators(context);
+
+            // Assert
+            var validatorItems = context.Results;
+
+            Assert.Equal(2, validatorItems.Count);
+            Assert.Single(validatorItems, v => ((DataAnnotationsModelValidator)v.Validator).Attribute is RegularExpressionAttribute);
+            Assert.Single(validatorItems, v => ((DataAnnotationsModelValidator)v.Validator).Attribute is StringLengthAttribute);
+        }
+
+        private static IList<ValidatorItem> GetValidatorItems(ModelMetadata metadata)
+        {
+            return metadata.ValidatorMetadata.Select(v => new ValidatorItem(v)).ToList();
+        }
+
+        private class ValidatableObject : IValidatableObject
+        {
+            public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+            {
+                return null;
+            }
+        }
+
+        [CustomModelValidator(Tag = "Class")]
+        private class ModelValidatorAttributeOnClass
+        {
+        }
+
+        private class ModelValidatorAttributeOnProperty
+        {
+            [CustomModelValidator(Tag = "Property")]
+            public string Property { get; set; }
+        }
+
+        private class ModelValidatorAttributeOnPropertyAndClass
+        {
+            [CustomModelValidator(Tag = "Property")]
+            public ModelValidatorAttributeOnClass Property { get; set; }
+        }
+
+        private class CustomModelValidatorAttribute : Attribute, IModelValidator
+        {
+            public string Tag { get; set; }
+
+            public IEnumerable<ModelValidationResult> Validate(ModelValidationContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class RangeAttributeOnProperty
+        {
+            [Range(0, 10)]
+            public int Property { get; set; }
+        }
+
+        private class CustomValidationAttribute : ValidationAttribute
+        {
+        }
+
+        private class CustomValidationAttributeOnProperty
+        {
+            [CustomValidation]
+            public int Property { get; set; }
+        }
+
+        private class ProductEntity
+        {
+            [Range(0, 10)]
+            public int Id { get; set; }
+
+            [RegularExpression(".*")]
+            public string Name { get; set; }
+        }
+
+        [ModelMetadataType(typeof(ProductEntity))]
+        private class ProductViewModel
+        {
+            public int Id { get; set; }
+
+            [StringLength(4)]
+            public string Name { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultObjectValidatorTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultObjectValidatorTests.cs
new file mode 100644
index 0000000000..5371633029
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultObjectValidatorTests.cs
@@ -0,0 +1,1383 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class DefaultObjectValidatorTests
+    {
+        private IModelMetadataProvider MetadataProvider { get; } = TestModelMetadataProvider.CreateDefaultProvider();
+
+        [Fact]
+        public void Validate_SimpleValueType_Valid_WithPrefix()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = (object)15;
+
+            modelState.SetModelValue("parameter", "15", "15");
+            validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
+
+            // Act
+            validator.Validate(actionContext, validationState, "parameter", model);
+
+            // Assert
+            AssertKeysEqual(modelState, "parameter");
+
+            var entry = modelState["parameter"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        public void Validate_SimpleReferenceType_Valid_WithPrefix()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = (object)"test";
+
+            modelState.SetModelValue("parameter", "test", "test");
+            validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
+
+            // Act
+            validator.Validate(actionContext, validationState, "parameter", model);
+
+            // Assert
+            Assert.True(modelState.IsValid);
+            AssertKeysEqual(modelState, "parameter");
+
+            var entry = modelState["parameter"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        public void Validate_SimpleType_MaxErrorsReached()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = (object)"test";
+
+            modelState.MaxAllowedErrors = 1;
+            modelState.AddModelError("other.Model", "error");
+            modelState.SetModelValue("parameter", "test", "test");
+            validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
+
+            // Act
+            validator.Validate(actionContext, validationState, "parameter", model);
+
+            // Assert
+            Assert.False(modelState.IsValid);
+            AssertKeysEqual(modelState, string.Empty, "parameter");
+
+            var entry = modelState["parameter"];
+            Assert.Equal(ModelValidationState.Skipped, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        public void Validate_SimpleType_SuppressValidation()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = (object)"test";
+
+            modelState.SetModelValue("parameter", "test", "test");
+            validationState.Add(model, new ValidationStateEntry() { Key = "parameter", SuppressValidation = true });
+
+            // Act
+            validator.Validate(actionContext, validationState, "parameter", model);
+
+            // Assert
+            Assert.True(modelState.IsValid);
+            AssertKeysEqual(modelState, "parameter");
+
+            var entry = modelState["parameter"];
+            Assert.Equal(ModelValidationState.Skipped, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+        }
+
+
+        [Fact]
+        public void Validate_ComplexValueType_Valid()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = (object)new ValueType() { Reference = "ref", Value = 256 };
+
+            modelState.SetModelValue("parameter.Reference", "ref", "ref");
+            modelState.SetModelValue("parameter.Value", "256", "256");
+            validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
+
+            // Act
+            validator.Validate(actionContext, validationState, "parameter", model);
+
+            // Assert
+            Assert.True(modelState.IsValid);
+            AssertKeysEqual(modelState, "parameter.Reference", "parameter.Value");
+
+            var entry = modelState["parameter.Reference"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+
+            entry = modelState["parameter.Value"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        public void Validate_ComplexReferenceType_Valid()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = (object)new ReferenceType() { Reference = "ref", Value = 256 };
+
+            modelState.SetModelValue("parameter.Reference", "ref", "ref");
+            modelState.SetModelValue("parameter.Value", "256", "256");
+            validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
+
+            // Act
+            validator.Validate(actionContext, validationState, "parameter", model);
+
+            // Assert
+            Assert.True(modelState.IsValid);
+            AssertKeysEqual(modelState, "parameter.Reference", "parameter.Value");
+
+            var entry = modelState["parameter.Reference"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+
+            entry = modelState["parameter.Value"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        public void Validate_ComplexReferenceType_Invalid()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = (object)new Person();
+
+            validationState.Add(model, new ValidationStateEntry() { Key = string.Empty });
+
+            // Act
+            validator.Validate(actionContext, validationState, string.Empty, model);
+
+            // Assert
+            Assert.False(modelState.IsValid);
+            AssertKeysEqual(modelState, "Name", "Profession");
+
+            var entry = modelState["Name"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            var error = Assert.Single(entry.Errors);
+            Assert.Equal(ValidationAttributeUtil.GetRequiredErrorMessage("Name"), error.ErrorMessage);
+
+            entry = modelState["Profession"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            error = Assert.Single(entry.Errors);
+            Assert.Equal(ValidationAttributeUtil.GetRequiredErrorMessage("Profession"), error.ErrorMessage);
+        }
+
+        [Fact]
+        public void Validate_ComplexType_SuppressValidation()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = new Person2()
+            {
+                Name = "Billy",
+                Address = new Address { Street = "GreaterThan5Characters" }
+            };
+
+            modelState.SetModelValue("person.Name", "Billy", "Billy");
+            modelState.SetModelValue("person.Address.Street", "GreaterThan5Characters", "GreaterThan5Characters");
+            validationState.Add(model, new ValidationStateEntry() { Key = "person" });
+            validationState.Add(model.Address, new ValidationStateEntry()
+            {
+                Key = "person.Address",
+                SuppressValidation = true
+            });
+
+            // Act
+            validator.Validate(actionContext, validationState, "person", model);
+
+            // Assert
+            Assert.True(modelState.IsValid);
+            AssertKeysEqual(modelState, "person.Name", "person.Address.Street");
+
+            var entry = modelState["person.Name"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+
+            entry = modelState["person.Address.Street"];
+            Assert.Equal(ModelValidationState.Skipped, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void Validate_ComplexReferenceType_Invalid_MultipleErrorsOnProperty()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = (object)new Address() { Street = "Microsoft Way" };
+
+            modelState.SetModelValue("parameter.Street", "Microsoft Way", "Microsoft Way");
+            validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
+
+            // Act
+            validator.Validate(actionContext, validationState, "parameter", model);
+
+            // Assert
+            Assert.False(modelState.IsValid);
+            AssertKeysEqual(modelState, "parameter.Street");
+
+            var entry = modelState["parameter.Street"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+
+            Assert.Equal(2, entry.Errors.Count);
+            var errorMessages = entry.Errors.Select(e => e.ErrorMessage);
+            Assert.Contains(ValidationAttributeUtil.GetStringLengthErrorMessage(null, 5, "Street"), errorMessages);
+            Assert.Contains(ValidationAttributeUtil.GetRegExErrorMessage("hehehe", "Street"), errorMessages);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void Validate_ComplexReferenceType_Invalid_MultipleErrorsOnProperty_EmptyPrefix()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = (object)new Address() { Street = "Microsoft Way" };
+
+            modelState.SetModelValue("Street", "Microsoft Way", "Microsoft Way");
+            validationState.Add(model, new ValidationStateEntry() { Key = string.Empty });
+
+            // Act
+            validator.Validate(actionContext, validationState, string.Empty, model);
+
+            // Assert
+            Assert.False(modelState.IsValid);
+            AssertKeysEqual(modelState, "Street");
+
+            var entry = modelState["Street"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+
+            Assert.Equal(2, entry.Errors.Count);
+            var errorMessages = entry.Errors.Select(e => e.ErrorMessage);
+            Assert.Contains(ValidationAttributeUtil.GetStringLengthErrorMessage(null, 5, "Street"), errorMessages);
+            Assert.Contains(ValidationAttributeUtil.GetRegExErrorMessage("hehehe", "Street"), errorMessages);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void Validate_NestedComplexReferenceType_Invalid()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = (object)new Person() { Name = "Rick", Friend = new Person() };
+
+            modelState.SetModelValue("Name", "Rick", "Rick");
+            validationState.Add(model, new ValidationStateEntry() { Key = string.Empty });
+
+            // Act
+            validator.Validate(actionContext, validationState, string.Empty, model);
+
+            // Assert
+            Assert.False(modelState.IsValid);
+            AssertKeysEqual(modelState, "Name", "Profession", "Friend.Name", "Friend.Profession");
+
+            var entry = modelState["Name"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+
+            entry = modelState["Profession"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            var error = Assert.Single(entry.Errors);
+            Assert.Equal(ValidationAttributeUtil.GetRequiredErrorMessage("Profession"), error.ErrorMessage);
+
+            entry = modelState["Friend.Name"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            error = Assert.Single(entry.Errors);
+            Assert.Equal(ValidationAttributeUtil.GetRequiredErrorMessage("Name"), error.ErrorMessage);
+
+            entry = modelState["Friend.Profession"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            error = Assert.Single(entry.Errors);
+            Assert.Equal(ValidationAttributeUtil.GetRequiredErrorMessage("Profession"), error.ErrorMessage);
+        }
+
+        [Fact]
+        public void Validate_ComplexType_MultipleInvalidProperties()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var model = new InvalidProperties();
+            var validationState = new ValidationStateDictionary
+            {
+                { model, new ValidationStateEntry() },
+            };
+
+            var validator = CreateValidator();
+
+            // Act
+            validator.Validate(actionContext, validationState, prefix: null, model: model);
+
+            // Assert
+            Assert.Collection(
+                modelState,
+                state =>
+                {
+                    Assert.Equal("FirstName", state.Key);
+                    var error = Assert.Single(state.Value.Errors);
+                    Assert.Equal("User object lacks some data.", error.ErrorMessage);
+                },
+                state =>
+                {
+                    Assert.Equal("Address.City", state.Key);
+                    var error = Assert.Single(state.Value.Errors);
+                    Assert.Equal("User object lacks some data.", error.ErrorMessage);
+                });
+        }
+
+        [Fact]
+        public void Validate_ComplexType_MultipleInvalidProperties_WithPrefix()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var model = new InvalidProperties();
+            var validationState = new ValidationStateDictionary
+            {
+                { model, new ValidationStateEntry { Key = "invalidProperties" } },
+            };
+
+            var validator = CreateValidator();
+
+            // Act
+            validator.Validate(actionContext, validationState, prefix: "invalidProperties", model: model);
+
+            // Assert
+            Assert.Collection(
+                modelState,
+                state =>
+                {
+                    Assert.Equal("invalidProperties.FirstName", state.Key);
+                    var error = Assert.Single(state.Value.Errors);
+                    Assert.Equal("User object lacks some data.", error.ErrorMessage);
+                },
+                state =>
+                {
+                    Assert.Equal("invalidProperties.Address.City", state.Key);
+                    var error = Assert.Single(state.Value.Errors);
+                    Assert.Equal("User object lacks some data.", error.ErrorMessage);
+                });
+        }
+
+        // IValidatableObject is significant because the validators are on the object
+        // itself, not just the properties.
+        [Fact]
+        [ReplaceCulture]
+        public void Validate_ComplexType_IValidatableObject_Invalid()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = (object)new ValidatableModel();
+
+            modelState.SetModelValue("parameter", "model", "model");
+
+            validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
+
+            // Act
+            validator.Validate(actionContext, validationState, "parameter", model);
+
+            // Assert
+            Assert.False(modelState.IsValid);
+            AssertKeysEqual(modelState, "parameter", "parameter.Property1", "parameter.Property2", "parameter.Property3");
+
+            var entry = modelState["parameter"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            var error = Assert.Single(entry.Errors);
+            Assert.Equal("Error1 about '' (display: 'ValidatableModel').", error.ErrorMessage);
+
+            entry = modelState["parameter.Property1"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            error = Assert.Single(entry.Errors);
+            Assert.Equal("Error2", error.ErrorMessage);
+
+            entry = modelState["parameter.Property2"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            error = Assert.Single(entry.Errors);
+            Assert.Equal("Error3", error.ErrorMessage);
+
+            entry = modelState["parameter.Property3"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            error = Assert.Single(entry.Errors);
+            Assert.Equal("Error3", error.ErrorMessage);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void Validate_NestedComplexType_IValidatableObject_Invalid()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = (object)new ValidatableModelContainer
+            {
+                ValidatableModelProperty = new ValidatableModel(),
+            };
+
+            modelState.SetModelValue("parameter", "model", "model");
+            validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
+
+            // Act
+            validator.Validate(actionContext, validationState, "parameter", model);
+
+            // Assert
+            Assert.False(modelState.IsValid);
+            Assert.Collection(
+                modelState,
+                entry =>
+                {
+                    Assert.Equal("parameter", entry.Key);
+                    Assert.Equal(ModelValidationState.Unvalidated, entry.Value.ValidationState);
+                    Assert.Empty(entry.Value.Errors);
+                },
+                entry =>
+                {
+                    Assert.Equal("parameter.ValidatableModelProperty", entry.Key);
+                    Assert.Equal(ModelValidationState.Invalid, entry.Value.ValidationState);
+                    var error = Assert.Single(entry.Value.Errors);
+                    Assert.Equal(
+                        "Error1 about 'ValidatableModelProperty' (display: 'Never valid').",
+                        error.ErrorMessage);
+                },
+                entry =>
+                {
+                    Assert.Equal("parameter.ValidatableModelProperty.Property1", entry.Key);
+                    Assert.Equal(ModelValidationState.Invalid, entry.Value.ValidationState);
+                    var error = Assert.Single(entry.Value.Errors);
+                    Assert.Equal("Error2", error.ErrorMessage);
+                },
+                entry =>
+                {
+                    Assert.Equal("parameter.ValidatableModelProperty.Property2", entry.Key);
+                    Assert.Equal(ModelValidationState.Invalid, entry.Value.ValidationState);
+                    var error = Assert.Single(entry.Value.Errors);
+                    Assert.Equal("Error3", error.ErrorMessage);
+                },
+                entry =>
+                {
+                    Assert.Equal("parameter.ValidatableModelProperty.Property3", entry.Key);
+                    Assert.Equal(ModelValidationState.Invalid, entry.Value.ValidationState);
+                    var error = Assert.Single(entry.Value.Errors);
+                    Assert.Equal("Error3", error.ErrorMessage);
+                });
+        }
+
+        [ConditionalFact]
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public void Validate_ComplexType_IValidatableObject_CanUseRequestServices()
+        {
+            // Arrange
+            var service = new Mock<IExampleService>();
+            service.Setup(x => x.DoSomething()).Verifiable();
+
+            var provider = new ServiceCollection().AddSingleton(service.Object).BuildServiceProvider();
+
+            var httpContext = new Mock<HttpContext>();
+            httpContext.SetupGet(x => x.RequestServices).Returns(provider);
+
+            var actionContext = new ActionContext { HttpContext = httpContext.Object };
+
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = new Mock<IValidatableObject>();
+            model
+                .Setup(x => x.Validate(It.IsAny<ValidationContext>()))
+                .Callback((ValidationContext context) =>
+                {
+                    var receivedService = context.GetService<IExampleService>();
+                    Assert.Equal(service.Object, receivedService);
+                    receivedService.DoSomething();
+                })
+                .Returns(new List<ValidationResult>());
+
+            // Act
+            validator.Validate(actionContext, validationState, prefix: null, model: model.Object);
+
+            // Assert
+            service.Verify();
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void Validate_ComplexType_FieldsAreIgnored_Valid()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = (object)new VariableTest() { test = 5 };
+
+            modelState.SetModelValue("parameter", "5", "5");
+            validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
+
+            // Act
+            validator.Validate(actionContext, validationState, "parameter", model);
+
+            // Assert
+            Assert.True(modelState.IsValid);
+            Assert.Single(modelState);
+
+            var entry = modelState["parameter"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void Validate_ComplexType_SecondLevelCyclesNotFollowed_Invalid()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var person = new Person() { Name = "Billy" };
+            person.Family = new Family { Members = new List<Person> { person } };
+
+            var model = (object)person;
+
+            modelState.SetModelValue("parameter.Name", "Billy", "Billy");
+            validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
+
+            // Act
+            validator.Validate(actionContext, validationState, "parameter", model);
+
+            // Assert
+            Assert.False(modelState.IsValid);
+            AssertKeysEqual(modelState, "parameter.Name", "parameter.Profession");
+
+            var entry = modelState["parameter.Name"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+
+            entry = modelState["parameter.Profession"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            var error = Assert.Single(entry.Errors);
+            Assert.Equal(error.ErrorMessage, ValidationAttributeUtil.GetRequiredErrorMessage("Profession"));
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void Validate_ComplexType_CyclesNotFollowed_Invalid()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var person = new Person() { Name = "Billy" };
+            person.Friend = person;
+
+            var model = (object)person;
+
+            modelState.SetModelValue("parameter.Name", "Billy", "Billy");
+            validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
+
+            // Act
+            validator.Validate(actionContext, validationState, "parameter", model);
+
+            // Assert
+            Assert.False(modelState.IsValid);
+            AssertKeysEqual(modelState, "parameter.Name", "parameter.Profession");
+
+            var entry = modelState["parameter.Name"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+
+            entry = modelState["parameter.Profession"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            var error = Assert.Single(entry.Errors);
+            Assert.Equal(error.ErrorMessage, ValidationAttributeUtil.GetRequiredErrorMessage("Profession"));
+        }
+
+        [Fact]
+        public void Validate_ComplexType_ShortCircuit_WhenMaxErrorCountIsSet()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator(typeof(string));
+
+            var model = new User()
+            {
+                Password = "password-val",
+                ConfirmPassword = "not-password-val"
+            };
+
+            modelState.MaxAllowedErrors = 2;
+            modelState.AddModelError("key1", "error1");
+            modelState.SetModelValue("user.Password", "password-val", "password-val");
+            modelState.SetModelValue("user.ConfirmPassword", "not-password-val", "not-password-val");
+
+            validationState.Add(model, new ValidationStateEntry() { Key = "user", });
+
+            // Act
+            validator.Validate(actionContext, validationState, "user", model);
+
+            // Assert
+            Assert.False(modelState.IsValid);
+            AssertKeysEqual(modelState, string.Empty, "key1", "user.ConfirmPassword", "user.Password");
+
+            var entry = modelState[string.Empty];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            var error = Assert.Single(entry.Errors);
+            Assert.IsType<TooManyModelErrorsException>(error.Exception);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void Validate_CollectionType_ArrayOfSimpleType_Valid_DefaultKeyPattern()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = (object)new int[] { 5, 17 };
+
+            modelState.SetModelValue("parameter[0]", "5", "17");
+            modelState.SetModelValue("parameter[1]", "17", "5");
+            validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
+
+            // Act
+            validator.Validate(actionContext, validationState, "parameter", model);
+
+            // Assert
+            Assert.True(modelState.IsValid);
+            AssertKeysEqual(modelState, "parameter[0]", "parameter[1]");
+
+            var entry = modelState["parameter[0]"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+
+            entry = modelState["parameter[0]"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void Validate_CollectionType_ArrayOfComplexType_Invalid()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = (object)new Person[] { new Person(), new Person() };
+
+            validationState.Add(model, new ValidationStateEntry() { Key = string.Empty });
+
+            // Act
+            validator.Validate(actionContext, validationState, string.Empty, model);
+
+            // Assert
+            Assert.False(modelState.IsValid);
+            AssertKeysEqual(modelState, "[0].Name", "[0].Profession", "[1].Name", "[1].Profession");
+
+            var entry = modelState["[0].Name"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            var error = Assert.Single(entry.Errors);
+            Assert.Equal(ValidationAttributeUtil.GetRequiredErrorMessage("Name"), error.ErrorMessage);
+
+            entry = modelState["[0].Profession"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            error = Assert.Single(entry.Errors);
+            Assert.Equal(ValidationAttributeUtil.GetRequiredErrorMessage("Profession"), error.ErrorMessage);
+
+            entry = modelState["[1].Name"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            error = Assert.Single(entry.Errors);
+            Assert.Equal(ValidationAttributeUtil.GetRequiredErrorMessage("Name"), error.ErrorMessage);
+
+            entry = modelState["[1].Profession"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            error = Assert.Single(entry.Errors);
+            Assert.Equal(ValidationAttributeUtil.GetRequiredErrorMessage("Profession"), error.ErrorMessage);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void Validate_CollectionType_ListOfComplexType_Invalid()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = (object)new List<Person> { new Person(), new Person() };
+
+            validationState.Add(model, new ValidationStateEntry() { Key = string.Empty });
+
+            // Act
+            validator.Validate(actionContext, validationState, string.Empty, model);
+
+            // Assert
+            Assert.False(modelState.IsValid);
+            AssertKeysEqual(modelState, "[0].Name", "[0].Profession", "[1].Name", "[1].Profession");
+
+            var entry = modelState["[0].Name"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            var error = Assert.Single(entry.Errors);
+            Assert.Equal(ValidationAttributeUtil.GetRequiredErrorMessage("Name"), error.ErrorMessage);
+
+            entry = modelState["[0].Profession"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            error = Assert.Single(entry.Errors);
+            Assert.Equal(ValidationAttributeUtil.GetRequiredErrorMessage("Profession"), error.ErrorMessage);
+
+            entry = modelState["[1].Name"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            error = Assert.Single(entry.Errors);
+            Assert.Equal(ValidationAttributeUtil.GetRequiredErrorMessage("Name"), error.ErrorMessage);
+
+            entry = modelState["[1].Profession"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            error = Assert.Single(entry.Errors);
+            Assert.Equal(ValidationAttributeUtil.GetRequiredErrorMessage("Profession"), error.ErrorMessage);
+        }
+
+        public static TheoryData<object, Type> ValidCollectionData
+        {
+            get
+            {
+                return new TheoryData<object, Type>()
+                {
+                    { new int[] { 1, 2, 3 }, typeof(int[]) },
+                    { new string[] { "Foo", "Bar", "Baz" }, typeof(string[]) },
+                    { new List<string> { "Foo", "Bar", "Baz" }, typeof(IList<string>)},
+                    { new HashSet<string> { "Foo", "Bar", "Baz" }, typeof(string[]) },
+                    {
+                        new List<DateTime>
+                        {
+                            DateTime.Parse("1/1/14"),
+                            DateTime.Parse("2/1/14"),
+                            DateTime.Parse("3/1/14"),
+                        },
+                        typeof(ICollection<DateTime>)
+                    },
+                    {
+                        new HashSet<Uri>
+                        {
+                            new Uri("http://example.com/1"),
+                            new Uri("http://example.com/2"),
+                            new Uri("http://example.com/3"),
+                        },
+                        typeof(HashSet<Uri>)
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidCollectionData))]
+        public void Validate_IndexedCollectionTypes_Valid(object model, Type type)
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            modelState.SetModelValue("items[0]", "value1", "value1");
+            modelState.SetModelValue("items[1]", "value2", "value2");
+            modelState.SetModelValue("items[2]", "value3", "value3");
+            validationState.Add(model, new ValidationStateEntry()
+            {
+                Key = "items",
+
+                // Force the validator to treat it as the specified type.
+                Metadata = MetadataProvider.GetMetadataForType(type),
+            });
+
+            // Act
+            validator.Validate(actionContext, validationState, "items", model);
+
+            // Assert
+            Assert.True(modelState.IsValid);
+            AssertKeysEqual(modelState, "items[0]", "items[1]", "items[2]");
+
+            var entry = modelState["items[0]"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+
+            entry = modelState["items[1]"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+
+            entry = modelState["items[2]"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        public void Validate_CollectionType_MultipleInvalidItems()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var model = new InvalidItemsContainer();
+            var validationState = new ValidationStateDictionary
+            {
+                { model, new ValidationStateEntry() },
+            };
+
+            var validator = CreateValidator();
+
+            // Act
+            validator.Validate(actionContext, validationState, prefix: null, model: model);
+
+            // Assert
+            Assert.Collection(
+                modelState,
+                state =>
+                {
+                    Assert.Equal("Items[0]", state.Key);
+                    var error = Assert.Single(state.Value.Errors);
+                    Assert.Equal("Collection contains duplicate value 'Joe'.", error.ErrorMessage);
+                },
+                state =>
+                {
+                    Assert.Equal("Items[2]", state.Key);
+                    var error = Assert.Single(state.Value.Errors);
+                    Assert.Equal("Collection contains duplicate value 'Joe'.", error.ErrorMessage);
+                });
+        }
+
+        [Fact]
+        public void Validate_CollectionType_DictionaryOfSimpleType_Invalid()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = new Dictionary<string, string>()
+            {
+                { "FooKey", "FooValue" },
+                { "BarKey", "BarValue" }
+            };
+
+            modelState.SetModelValue("items[0].Key", "key0", "key0");
+            modelState.SetModelValue("items[0].Value", "value0", "value0");
+            modelState.SetModelValue("items[1].Key", "key1", "key1");
+            modelState.SetModelValue("items[1].Value", "value1", "value1");
+            validationState.Add(model, new ValidationStateEntry() { Key = "items" });
+
+            // Act
+            validator.Validate(actionContext, validationState, "items", model);
+
+            // Assert
+            Assert.True(modelState.IsValid);
+            AssertKeysEqual(modelState, "items[0].Key", "items[0].Value", "items[1].Key", "items[1].Value");
+
+            var entry = modelState["items[0].Key"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+
+            entry = modelState["items[0].Value"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+
+            entry = modelState["items[1].Key"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+
+            entry = modelState["items[1].Value"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void Validate_CollectionType_DictionaryOfComplexType_Invalid()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = (object)new Dictionary<string, Person> { { "Joe", new Person() }, { "Mark", new Person() } };
+
+            modelState.SetModelValue("[0].Key", "Joe", "Joe");
+            modelState.SetModelValue("[1].Key", "Mark", "Mark");
+            validationState.Add(model, new ValidationStateEntry() { Key = string.Empty });
+
+            // Act
+            validator.Validate(actionContext, validationState, string.Empty, model);
+
+            // Assert
+            Assert.False(modelState.IsValid);
+            AssertKeysEqual(
+                modelState,
+                "[0].Key",
+                "[0].Value.Name",
+                "[0].Value.Profession",
+                "[1].Key",
+                "[1].Value.Name",
+                "[1].Value.Profession");
+
+            var entry = modelState["[0].Key"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+
+            entry = modelState["[1].Key"];
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+
+            entry = modelState["[0].Value.Name"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            var error = Assert.Single(entry.Errors);
+            Assert.Equal(error.ErrorMessage, ValidationAttributeUtil.GetRequiredErrorMessage("Name"));
+
+            entry = modelState["[0].Value.Profession"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            error = Assert.Single(entry.Errors);
+            Assert.Equal(error.ErrorMessage, ValidationAttributeUtil.GetRequiredErrorMessage("Profession"));
+
+            entry = modelState["[1].Value.Name"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            error = Assert.Single(entry.Errors);
+            Assert.Equal(error.ErrorMessage, ValidationAttributeUtil.GetRequiredErrorMessage("Name"));
+
+            entry = modelState["[1].Value.Profession"];
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            error = Assert.Single(entry.Errors);
+            Assert.Equal(error.ErrorMessage, ValidationAttributeUtil.GetRequiredErrorMessage("Profession"));
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void Validate_DoesntCatchExceptions_FromPropertyAccessors()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = new ThrowingProperty();
+
+            // Act & Assert
+            Assert.Throws<InvalidTimeZoneException>(
+                () =>
+                {
+                    validator.Validate(actionContext, validationState, string.Empty, model);
+                });
+        }
+
+        // We use the reference equality comparer for breaking cycles
+        [Fact]
+        public void Validate_DoesNotUseOverridden_GetHashCodeOrEquals()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator();
+
+            var model = new TypeThatOverridesEquals[]
+            {
+                new TypeThatOverridesEquals { Funny = "hehe" },
+                new TypeThatOverridesEquals { Funny = "hehe" }
+            };
+
+            // Act & Assert (does not throw)
+            validator.Validate(actionContext, validationState, string.Empty, model);
+        }
+
+        [Fact]
+        public void Validate_ForExcludedComplexType_PropertiesMarkedAsSkipped()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator(typeof(User));
+
+            var model = new User()
+            {
+                Password = "password-val",
+                ConfirmPassword = "not-password-val"
+            };
+
+            // Note that user.ConfirmPassword has no entry in modelstate - we should not
+            // create one just to mark it as skipped.
+            modelState.SetModelValue("user.Password", "password-val", "password-val");
+            validationState.Add(model, new ValidationStateEntry() { Key = "user", });
+
+            // Act
+            validator.Validate(actionContext, validationState, "user", model);
+
+            // Assert
+            Assert.Equal(ModelValidationState.Valid, modelState.ValidationState);
+            AssertKeysEqual(modelState, "user.Password");
+
+            var entry = modelState["user.Password"];
+            Assert.Equal(ModelValidationState.Skipped, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        public void Validate_ForExcludedCollectionType_PropertiesMarkedAsSkipped()
+        {
+            // Arrange
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            var validationState = new ValidationStateDictionary();
+
+            var validator = CreateValidator(typeof(List<string>));
+
+            var model = new List<string>()
+            {
+                "15",
+            };
+
+            modelState.SetModelValue("userIds[0]", "15", "15");
+            validationState.Add(model, new ValidationStateEntry() { Key = "userIds", });
+
+            // Act
+            validator.Validate(actionContext, validationState, "userIds", model);
+
+            // Assert
+            Assert.Equal(ModelValidationState.Valid, modelState.ValidationState);
+            AssertKeysEqual(modelState, "userIds[0]");
+
+            var entry = modelState["userIds[0]"];
+            Assert.Equal(ModelValidationState.Skipped, entry.ValidationState);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        public void Validate_SuppressesValidation_ForExcludedType_Stream()
+        {
+            // Arrange
+            var options = new MvcOptions();
+            var optionsSetup = new MvcCoreMvcOptionsSetup(Mock.Of<IHttpRequestStreamReaderFactory>());
+            optionsSetup.Configure(options);
+            var validator = CreateValidator(providers: options.ModelMetadataDetailsProviders.ToArray());
+            var model = new MemoryStream(Encoding.UTF8.GetBytes("Hello!"));
+            var actionContext = new ActionContext();
+            var modelState = actionContext.ModelState;
+            modelState.SetModelValue("parameter", rawValue: null, attemptedValue: null);
+            var validationState = new ValidationStateDictionary
+            {
+                { model, new ValidationStateEntry() { Key = "parameter" } }
+            };
+
+            // Act
+            validator.Validate(actionContext, validationState, "parameter", model);
+
+            // Assert
+            Assert.True(modelState.IsValid);
+            var entry = Assert.Single(modelState);
+            Assert.Equal(ModelValidationState.Valid, entry.Value.ValidationState);
+            Assert.Empty(entry.Value.Errors);
+        }
+
+        private static DefaultObjectValidator CreateValidator(Type excludedType)
+        {
+            var excludeFilters = new List<SuppressChildValidationMetadataProvider>();
+            if (excludedType != null)
+            {
+                excludeFilters.Add(new SuppressChildValidationMetadataProvider(excludedType));
+            }
+
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider(excludeFilters.ToArray());
+            var validatorProviders = TestModelValidatorProvider.CreateDefaultProvider().ValidatorProviders;
+            return new DefaultObjectValidator(metadataProvider, validatorProviders);
+        }
+
+        private static DefaultObjectValidator CreateValidator(params IMetadataDetailsProvider[] providers)
+        {
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider(providers);
+            var validatorProviders = TestModelValidatorProvider.CreateDefaultProvider().ValidatorProviders;
+            return new DefaultObjectValidator(metadataProvider, validatorProviders);
+        }
+
+        private static void AssertKeysEqual(ModelStateDictionary modelState, params string[] keys)
+        {
+            Assert.Equal<string>(keys.OrderBy(k => k).ToArray(), modelState.Keys.OrderBy(k => k).ToArray());
+        }
+
+        private class ThrowingProperty
+        {
+            public string WatchOut
+            {
+                get
+                {
+                    throw new InvalidTimeZoneException();
+                }
+            }
+        }
+
+        private class Person
+        {
+            [Required, StringLength(10)]
+            public string Name { get; set; }
+
+            [Required]
+            public string Profession { get; set; }
+
+            public Person Friend { get; set; }
+
+            public Family Family { get; set; }
+        }
+
+        private class Family
+        {
+            public List<Person> Members { get; set; }
+        }
+
+        private class Person2
+        {
+            public string Name { get; set; }
+            public Address Address { get; set; }
+        }
+
+        private class Address
+        {
+            [StringLength(5)]
+            [RegularExpression("hehehe")]
+            public string Street { get; set; }
+        }
+
+        private struct ValueType
+        {
+            public int Value { get; set; }
+            public string Reference { get; set; }
+        }
+
+        private class ReferenceType
+        {
+            public int Value { get; set; }
+            public string Reference { get; set; }
+        }
+
+        private class ValidatableModel : IValidatableObject
+        {
+            public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+            {
+                yield return new ValidationResult(
+                    $"Error1 about '{validationContext.MemberName}' (display: '{validationContext.DisplayName}').",
+                    new string[] { });
+                yield return new ValidationResult("Error2", new[] { "Property1" });
+                yield return new ValidationResult("Error3", new[] { "Property2", "Property3" });
+            }
+        }
+
+        private class ValidatableModelContainer
+        {
+            [Display(Name = "Never valid")]
+            public ValidatableModel ValidatableModelProperty { get; set; }
+        }
+
+        private class TypeThatOverridesEquals
+        {
+            [StringLength(2)]
+            public string Funny { get; set; }
+
+            public override bool Equals(object obj)
+            {
+                throw new InvalidOperationException();
+            }
+
+            public override int GetHashCode()
+            {
+                throw new InvalidOperationException();
+            }
+        }
+
+        private class VariableTest
+        {
+            [Range(15, 25)]
+            public int test;
+        }
+
+        private class User : IValidatableObject
+        {
+            public string Password { get; set; }
+
+            [Compare("Password")]
+            public string ConfirmPassword { get; set; }
+
+            public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+            {
+                if (Password == "password")
+                {
+                    yield return new ValidationResult("Password does not meet complexity requirements.");
+                }
+            }
+        }
+
+        public interface IExampleService
+        {
+            void DoSomething();
+        }
+
+        // Custom validation attribute that returns multiple entries in ValidationResult.MemberNames and those member
+        // names are indexers. An example scenario is an attribute that confirms all entries in a list are unique.
+        private class InvalidItemsAttribute : ValidationAttribute
+        {
+            protected override ValidationResult IsValid(object value, ValidationContext validationContext)
+            {
+                return new ValidationResult(
+                    "Collection contains duplicate value 'Joe'.",
+                    new[] { "[0]", "[2]" });
+            }
+        }
+
+        private class InvalidItemsContainer
+        {
+            [InvalidItems]
+            public List<string> Items { get; set; } = new List<string> { "Joe", "Fred", "Joe", "Herman" };
+        }
+
+        // Custom validation attribute that returns multiple entries in ValidationResult.MemberNames. An example
+        // scenario is an attribute that confirms all properties in a complex type are non-empty.
+        private class InvalidPropertiesAttribute : ValidationAttribute
+        {
+            protected override ValidationResult IsValid(object value, ValidationContext validationContext)
+            {
+                return new ValidationResult(
+                    "User object lacks some data.",
+                    new[] { "FirstName", "Address.City" });
+            }
+        }
+
+        [InvalidProperties]
+        private class InvalidProperties
+        {
+            public string FirstName { get; set; }
+
+            public string LastName { get; set; } = "IsSet";
+
+            public InvalidAddress Address { get; set; }
+        }
+
+        private class InvalidAddress
+        {
+            public string City { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DisableRequestSizeLimitFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DisableRequestSizeLimitFilterTest.cs
new file mode 100644
index 0000000000..4340460963
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DisableRequestSizeLimitFilterTest.cs
@@ -0,0 +1,150 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Logging.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class DisableRequestSizeLimitFilterTest
+    {
+        [Fact]
+        public void SetsMaxRequestBodySizeToNull()
+        {
+            // Arrange
+            var disableRequestSizeLimitResourceFilter = new DisableRequestSizeLimitFilter(NullLoggerFactory.Instance);
+            var authorizationFilterContext = CreateauthorizationFilterContext(new IFilterMetadata[] { disableRequestSizeLimitResourceFilter });
+
+            var httpMaxRequestBodySize = new TestHttpMaxRequestBodySizeFeature();
+            authorizationFilterContext.HttpContext.Features.Set<IHttpMaxRequestBodySizeFeature>(httpMaxRequestBodySize);
+
+            // Act
+            disableRequestSizeLimitResourceFilter.OnAuthorization(authorizationFilterContext);
+
+            // Assert
+            Assert.Null(httpMaxRequestBodySize.MaxRequestBodySize);
+        }
+
+        [Fact]
+        public void SkipsWhenOverridden()
+        {
+            // Arrange
+            var disableRequestSizeLimitResourceFilter = new DisableRequestSizeLimitFilter(NullLoggerFactory.Instance);
+            var disableRequestSizeLimitResourceFilterFinal = new DisableRequestSizeLimitFilter(NullLoggerFactory.Instance);
+            var authorizationFilterContext = CreateauthorizationFilterContext(
+                new IFilterMetadata[] { disableRequestSizeLimitResourceFilter, disableRequestSizeLimitResourceFilterFinal });
+
+            var httpMaxRequestBodySize = new TestHttpMaxRequestBodySizeFeature();
+            authorizationFilterContext.HttpContext.Features.Set<IHttpMaxRequestBodySizeFeature>(httpMaxRequestBodySize);
+
+            // Act
+            disableRequestSizeLimitResourceFilter.OnAuthorization(authorizationFilterContext);
+            disableRequestSizeLimitResourceFilterFinal.OnAuthorization(authorizationFilterContext);
+
+            // Assert
+            Assert.Null(httpMaxRequestBodySize.MaxRequestBodySize);
+            Assert.Equal(1, httpMaxRequestBodySize.Count);
+        }
+
+        [Fact]
+        public void LogsFeatureNotFound()
+        {
+            // Arrange
+            var sink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
+
+            var disableRequestSizeLimitResourceFilter = new DisableRequestSizeLimitFilter(loggerFactory);
+            var authorizationFilterContext = CreateauthorizationFilterContext(new IFilterMetadata[] { disableRequestSizeLimitResourceFilter });
+
+            // Act
+            disableRequestSizeLimitResourceFilter.OnAuthorization(authorizationFilterContext);
+
+            // Assert
+            var write = Assert.Single(sink.Writes);
+            Assert.Equal($"A request body size limit could not be applied. This server does not support the IHttpRequestBodySizeFeature.",
+                write.State.ToString());
+        }
+
+        [Fact]
+        public void LogsFeatureIsReadOnly()
+        {
+            // Arrange
+            var sink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
+
+            var disableRequestSizeLimitResourceFilter = new DisableRequestSizeLimitFilter(loggerFactory);
+            var authorizationFilterContext = CreateauthorizationFilterContext(new IFilterMetadata[] { disableRequestSizeLimitResourceFilter });
+
+            var httpMaxRequestBodySize = new TestHttpMaxRequestBodySizeFeature();
+            httpMaxRequestBodySize.IsReadOnly = true;
+            authorizationFilterContext.HttpContext.Features.Set<IHttpMaxRequestBodySizeFeature>(httpMaxRequestBodySize);
+
+            // Act
+            disableRequestSizeLimitResourceFilter.OnAuthorization(authorizationFilterContext);
+
+            // Assert
+            var write = Assert.Single(sink.Writes);
+            Assert.Equal($"A request body size limit could not be applied. The IHttpRequestBodySizeFeature for the server is read-only.", write.State.ToString());
+        }
+
+        [Fact]
+        public void LogsMaxRequestBodySizeSetToNull()
+        {
+            // Arrange
+            var sink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
+
+            var disableRequestSizeLimitResourceFilter = new DisableRequestSizeLimitFilter(loggerFactory);
+            var authorizationFilterContext = CreateauthorizationFilterContext(new IFilterMetadata[] { disableRequestSizeLimitResourceFilter });
+
+            var httpMaxRequestBodySize = new TestHttpMaxRequestBodySizeFeature();
+            authorizationFilterContext.HttpContext.Features.Set<IHttpMaxRequestBodySizeFeature>(httpMaxRequestBodySize);
+
+            // Act
+            disableRequestSizeLimitResourceFilter.OnAuthorization(authorizationFilterContext);
+
+            // Assert
+            var write = Assert.Single(sink.Writes);
+            Assert.Equal($"The request body size limit has been disabled.", write.State.ToString());
+        }
+
+        private static AuthorizationFilterContext CreateauthorizationFilterContext(IFilterMetadata[] filters)
+        {
+            return new AuthorizationFilterContext(CreateActionContext(), filters);
+        }
+
+        private static ActionContext CreateActionContext()
+        {
+            return new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+        }
+
+        private class TestHttpMaxRequestBodySizeFeature : IHttpMaxRequestBodySizeFeature
+        {
+            private long? _maxRequestBodySize;
+
+            public bool IsReadOnly { get; set; }
+
+            public long? MaxRequestBodySize
+            {
+                get
+                {
+                    return _maxRequestBodySize;
+                }
+                set
+                {
+                    _maxRequestBodySize = value;
+                    Count++;
+                }
+            }
+
+            public int Count { get; set; }
+        }
+    }
+}
+
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ElementalValueProviderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ElementalValueProviderTests.cs
new file mode 100644
index 0000000000..9b069dae76
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ElementalValueProviderTests.cs
@@ -0,0 +1,90 @@
+// 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.
+
+using System;
+using System.Globalization;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ElementalValueProviderTest
+    {
+        [Theory]
+        [InlineData("MyProperty", "MyProperty")]
+        [InlineData("MyProperty.SubProperty", "MyProperty")]
+        [InlineData("MyProperty[0]", "MyProperty")]
+        public void ContainsPrefix_ReturnsTrue_IfElementNameStartsWithPrefix(
+            string elementName, 
+            string prefix)
+        {
+            // Arrange
+            var culture = new CultureInfo("en-US");
+            var elementalValueProvider = new ElementalValueProvider(
+                elementName,
+                "hi",
+                culture);
+
+            // Act
+            var containsPrefix = elementalValueProvider.ContainsPrefix(prefix);
+
+            // Assert
+            Assert.True(containsPrefix);
+        }
+
+        [Theory]
+        [InlineData("MyProperty", "MyProperty1")]
+        [InlineData("MyPropertyTest", "MyProperty")]
+        [InlineData("Random", "MyProperty")]
+        public void ContainsPrefix_ReturnsFalse_IfElementCannotSpecifyValuesForPrefix(
+            string elementName, 
+            string prefix)
+        {
+            // Arrange
+            var culture = new CultureInfo("en-US");
+            var elementalValueProvider = new ElementalValueProvider(
+                elementName,
+                "hi",
+                culture);
+
+            // Act
+            var containsPrefix = elementalValueProvider.ContainsPrefix(prefix);
+
+            // Assert
+            Assert.False(containsPrefix);
+        }
+
+        [Fact]
+        public void GetValue_NameDoesNotMatch_ReturnsEmptyResult()
+        {
+            // Arrange
+            var culture = new CultureInfo("fr-FR");
+            var valueProvider = new ElementalValueProvider("foo", "hi", culture);
+
+            // Act
+            var result = valueProvider.GetValue("bar");
+
+            // Assert
+            Assert.Equal(ValueProviderResult.None, result);
+        }
+
+        [Theory]
+        [InlineData("foo")]
+        [InlineData("FOO")]
+        [InlineData("FoO")]
+        public void GetValue_NameMatches_ReturnsValueProviderResult(string name)
+        {
+            // Arrange
+            var culture = new CultureInfo("fr-FR");
+            var valueProvider = new ElementalValueProvider("foo", "hi", culture);
+
+            // Act
+            var result =  valueProvider.GetValue(name);
+
+            // Assert
+            Assert.Equal("hi", (string)result);
+            Assert.Equal(culture, result.Culture);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ExplicitIndexCollectionValidationStrategyTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ExplicitIndexCollectionValidationStrategyTest.cs
new file mode 100644
index 0000000000..deeb9f74ae
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ExplicitIndexCollectionValidationStrategyTest.cs
@@ -0,0 +1,219 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Xunit;
+
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ExplicitIndexCollectionValidationStrategyTest
+    {
+        [Fact]
+        public void EnumerateElements_List()
+        {
+            // Arrange
+            var model = new List<int>() { 2, 3, 5 };
+
+            var metadata = TestModelMetadataProvider.CreateDefaultProvider().GetMetadataForType(typeof(List<int>));
+            var strategy = new ExplicitIndexCollectionValidationStrategy(new string[] { "zero", "one", "two" });
+
+            // Act
+            var enumerator = strategy.GetChildren(metadata, "prefix", model);
+
+            // Assert
+            Assert.Collection(
+                BufferEntries(enumerator).OrderBy(e => e.Key),
+                e =>
+                {
+                    Assert.Equal("prefix[one]", e.Key);
+                    Assert.Equal(3, e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                },
+                e =>
+                {
+                    Assert.Equal("prefix[two]", e.Key);
+                    Assert.Equal(5, e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                },
+                e =>
+                {
+                    Assert.Equal("prefix[zero]", e.Key);
+                    Assert.Equal(2, e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                });
+        }
+
+        [Fact]
+        public void EnumerateElements_Dictionary()
+        {
+            // Arrange
+            var model = new Dictionary<int, string>()
+            {
+                { 2, "two" },
+                { 3, "three" },
+                { 5, "five" },
+            };
+
+            var metadata = TestModelMetadataProvider.CreateDefaultProvider().GetMetadataForType(typeof(List<int>));
+            var strategy = new ExplicitIndexCollectionValidationStrategy(new string[] { "zero", "one", "two" });
+
+            // Act
+            var enumerator = strategy.GetChildren(metadata, "prefix", model);
+
+            // Assert
+            Assert.Collection(
+                BufferEntries(enumerator).OrderBy(e => e.Key),
+                e =>
+                {
+                    Assert.Equal("prefix[one]", e.Key);
+                    Assert.Equal(new KeyValuePair<int, string>(3, "three"), e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                },
+                e =>
+                {
+                    Assert.Equal("prefix[two]", e.Key);
+                    Assert.Equal(new KeyValuePair<int, string>(5, "five"), e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                },
+                e =>
+                {
+                    Assert.Equal("prefix[zero]", e.Key);
+                    Assert.Equal(new KeyValuePair<int, string>(2, "two"), e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                });
+        }
+
+        [Fact]
+        public void EnumerateElements_TwoEnumerableImplemenations()
+        {
+            // Arrange
+            var model = new TwiceEnumerable(new int[] { 2, 3, 5 });
+
+            var metadata = TestModelMetadataProvider.CreateDefaultProvider().GetMetadataForType(typeof(TwiceEnumerable));
+            var strategy = new ExplicitIndexCollectionValidationStrategy(new string[] { "zero", "one", "two" });
+
+            // Act
+            var enumerator = strategy.GetChildren(metadata, "prefix", model);
+
+            // Assert
+            Assert.Collection(
+                BufferEntries(enumerator).OrderBy(e => e.Key),
+                e =>
+                {
+                    Assert.Equal("prefix[one]", e.Key);
+                    Assert.Equal(3, e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                },
+                e =>
+                {
+                    Assert.Equal("prefix[two]", e.Key);
+                    Assert.Equal(5, e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                },
+                e =>
+                {
+                    Assert.Equal("prefix[zero]", e.Key);
+                    Assert.Equal(2, e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                });
+        }
+
+        [Fact]
+        public void EnumerateElements_RunOutOfIndices()
+        {
+            // Arrange
+            var model = new List<int>() { 2, 3, 5 };
+
+            var metadata = TestModelMetadataProvider.CreateDefaultProvider().GetMetadataForType(typeof(List<int>));
+
+            var strategy = new ExplicitIndexCollectionValidationStrategy(new string[] { "zero", "one", });
+
+            // Act
+            var enumerator = strategy.GetChildren(metadata, "prefix", model);
+
+            // Assert
+            Assert.Collection(
+                BufferEntries(enumerator).OrderBy(e => e.Key),
+                e =>
+                {
+                    Assert.Equal("prefix[one]", e.Key);
+                    Assert.Equal(3, e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                },
+                e =>
+                {
+                    Assert.Equal("prefix[zero]", e.Key);
+                    Assert.Equal(2, e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                });
+        }
+
+        [Fact]
+        public void EnumerateElements_RunOutOfElements()
+        {
+            // Arrange
+            var model = new List<int>() { 2, 3, };
+
+            var metadata = TestModelMetadataProvider.CreateDefaultProvider().GetMetadataForType(typeof(List<int>));
+
+            var strategy = new ExplicitIndexCollectionValidationStrategy(new string[] { "zero", "one", "two" });
+
+            // Act
+            var enumerator = strategy.GetChildren(metadata, "prefix", model);
+
+            // Assert
+            Assert.Collection(
+                BufferEntries(enumerator).OrderBy(e => e.Key),
+                e =>
+                {
+                    Assert.Equal("prefix[one]", e.Key);
+                    Assert.Equal(3, e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                },
+                e =>
+                {
+                    Assert.Equal("prefix[zero]", e.Key);
+                    Assert.Equal(2, e.Model);
+                    Assert.Same(metadata.ElementMetadata, e.Metadata);
+                });
+        }
+
+        // 'int' is chosen by validation because it's declared on the more derived type.
+        private class TwiceEnumerable : List<string>, IEnumerable<int>
+        {
+            private readonly IEnumerable<int> _enumerable;
+
+            public TwiceEnumerable(IEnumerable<int> enumerable)
+            {
+                _enumerable = enumerable;
+            }
+
+            IEnumerator<int> IEnumerable<int>.GetEnumerator()
+            {
+                return _enumerable.GetEnumerator();
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                throw new InvalidOperationException();
+            }
+        }
+
+        private List<ValidationEntry> BufferEntries(IEnumerator<ValidationEntry> enumerator)
+        {
+            var entries = new List<ValidationEntry>();
+            while (enumerator.MoveNext())
+            {
+                entries.Add(enumerator.Current);
+            }
+
+            return entries;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/FilterFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/FilterFactoryTest.cs
new file mode 100644
index 0000000000..d382bd386e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/FilterFactoryTest.cs
@@ -0,0 +1,340 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class FilterFactoryTest
+    {
+        [Fact]
+        public void GetAllFilters_ReturnsNoFilters_IfNoFiltersAreSpecified()
+        {
+            // Arrange
+            var filterProviders = new IFilterProvider[0];
+            var actionContext = CreateActionContext(new FilterDescriptor[0]);
+
+            // Act
+            var filterResult = FilterFactory.GetAllFilters(filterProviders, actionContext);
+
+            // Assert
+            Assert.Empty(filterResult.CacheableFilters);
+            Assert.Empty(filterResult.Filters);
+        }
+
+        [Fact]
+        public void GetAllFilters_ReturnsNoFilters_IfAllFiltersAreRemoved()
+        {
+            // Arrange
+            var filterProvider = new TestFilterProvider(
+                context => context.Results.Clear(),
+                content => { });
+            var filter = new FilterDescriptor(new TypeFilterAttribute(typeof(object)), FilterScope.Global);
+            var actionContext = CreateActionContext(new[] { filter });
+
+            // Act
+            var filterResult = FilterFactory.GetAllFilters(
+                new[] { filterProvider },
+                actionContext);
+
+            // Assert
+            Assert.Collection(filterResult.CacheableFilters,
+                f =>
+                {
+                    Assert.Null(f.Filter);
+                    Assert.False(f.IsReusable);
+                });
+            Assert.Empty(filterResult.Filters);
+        }
+
+        [Fact]
+        public void GetAllFilters_CachesAllFilters()
+        {
+            // Arrange
+            var staticFilter1 = new TestFilter();
+            var staticFilter2 = new TestFilter();
+            var actionContext = CreateActionContext(new[]
+                {
+                    new FilterDescriptor(staticFilter1, FilterScope.Action),
+                    new FilterDescriptor(staticFilter2, FilterScope.Action),
+                });
+            var filterProviders = new[] { new DefaultFilterProvider() };
+
+
+            // Act - 1
+            var filterResult = FilterFactory.GetAllFilters(filterProviders, actionContext);
+            var request1Filters = filterResult.Filters;
+
+            // Assert - 1
+            Assert.Collection(
+                request1Filters,
+                f => Assert.Same(staticFilter1, f),
+                f => Assert.Same(staticFilter2, f));
+
+            // Act - 2
+            var request2Filters = FilterFactory.CreateUncachedFilters(
+                filterProviders,
+                actionContext,
+                filterResult.CacheableFilters);
+
+            // Assert - 2
+            Assert.Collection(
+                request2Filters,
+                f => Assert.Same(staticFilter1, f),
+                f => Assert.Same(staticFilter2, f));
+        }
+
+        [Fact]
+        public void GetAllFilters_OrdersFilters()
+        {
+            // Arrange
+            var filter1 = new TestOrderedFilter { Order = 1000 };
+            var filter2 = new TestFilter();
+            var filter3 = new TestOrderedFilter { Order = 10 };
+            var actionContext = CreateActionContext(new[]
+            {
+                new FilterDescriptor(filter1, FilterScope.Action),
+                new FilterDescriptor(filter2, FilterScope.Action),
+                new FilterDescriptor(filter3, FilterScope.Action),
+            });
+            var filterProviders = new[] { new DefaultFilterProvider() };
+
+            // Act
+            var filterResult = FilterFactory.GetAllFilters(filterProviders, actionContext);
+
+            // Assert
+            Assert.Collection(
+                filterResult.Filters,
+                f => Assert.Same(filter2, f),
+                f => Assert.Same(filter3, f),
+                f => Assert.Same(filter1, f));
+        }
+
+        [Fact]
+        public void GetAllFilters_CachesFilterOrder()
+        {
+            // Arrange
+            var filter1 = new TestOrderedFilter { Order = 1000 };
+            var filter2 = new TestFilter();
+            var filter3 = new TestOrderedFilter { Order = 10 };
+            var actionContext = CreateActionContext(new[]
+            {
+                new FilterDescriptor(filter1, FilterScope.Action),
+                new FilterDescriptor(filter2, FilterScope.Action),
+                new FilterDescriptor(filter3, FilterScope.Action),
+            });
+            var filterProviders = new[] { new DefaultFilterProvider() };
+
+            // Act
+            var filterResult = FilterFactory.GetAllFilters(filterProviders, actionContext);
+            var requestFilters = FilterFactory.CreateUncachedFilters(
+                filterProviders,
+                actionContext,
+                filterResult.CacheableFilters);
+
+            // Assert
+            Assert.Collection(
+                requestFilters,
+                f => Assert.Same(filter2, f),
+                f => Assert.Same(filter3, f),
+                f => Assert.Same(filter1, f));
+        }
+
+        [Fact]
+        public void GetAllFilters_CachesFilterFromFactory()
+        {
+            // Arrange
+            var staticFilter = new TestFilter();
+            var actionContext = CreateActionContext(new[]
+                {
+                    new FilterDescriptor(new TestFilterFactory() { IsReusable = true }, FilterScope.Action),
+                    new FilterDescriptor(staticFilter, FilterScope.Action),
+                });
+            var filterProviders = new[] { new DefaultFilterProvider() };
+            var filterDescriptors = actionContext.ActionDescriptor.FilterDescriptors;
+
+            // Act & Assert
+            var filterResult = FilterFactory.GetAllFilters(filterProviders, actionContext);
+
+            var filters = filterResult.Filters;
+            Assert.Equal(2, filters.Length);
+            var cachedFactoryCreatedFilter = Assert.IsType<TestFilter>(filters[0]); // Created by factory
+            Assert.Same(staticFilter, filters[1]); // Cached and the same statically created filter instance
+
+            for (var i = 0; i < 5; i++)
+            {
+                filters = FilterFactory.CreateUncachedFilters(filterProviders, actionContext, filterResult.CacheableFilters);
+
+                var currentFactoryCreatedFilter = filters[0];
+                Assert.Same(currentFactoryCreatedFilter, cachedFactoryCreatedFilter); // Cached
+                Assert.Same(staticFilter, filters[1]); // Cached
+            }
+        }
+
+        [Fact]
+        public void GetAllFilters_DoesNotCacheFiltersWithIsReusableFalse()
+        {
+            // Arrange
+            var staticFilter = new TestFilter();
+            var actionContext = CreateActionContext(new[]
+                {
+                    new FilterDescriptor(new TestFilterFactory() { IsReusable = false }, FilterScope.Action),
+                    new FilterDescriptor(staticFilter, FilterScope.Action),
+                });
+            var filterProviders = new[] { new DefaultFilterProvider() };
+            var filterDescriptors = actionContext.ActionDescriptor.FilterDescriptors;
+
+            // Act & Assert
+            var filterResult = FilterFactory.GetAllFilters(filterProviders, actionContext);
+            var filters = filterResult.Filters;
+            IFilterMetadata previousFactoryCreatedFilter = null;
+            for (var i = 0; i < 5; i++)
+            {
+                filters = FilterFactory.CreateUncachedFilters(filterProviders, actionContext, filterResult.CacheableFilters);
+
+                var currentFactoryCreatedFilter = filters[0];
+                Assert.NotSame(currentFactoryCreatedFilter, previousFactoryCreatedFilter); // Never Cached
+                Assert.Same(staticFilter, filters[1]); // Cached
+
+                previousFactoryCreatedFilter = currentFactoryCreatedFilter;
+            }
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void GetAllFilters_FiltersAddedByFilterProviders_AreNeverCached(bool reusable)
+        {
+            // Arrange
+            var customFilterProvider = new TestFilterProvider(
+                    providerExecuting: (providerContext) =>
+                    {
+                        var filter = new TestFilter(providerContext.ActionContext.HttpContext.Items["name"] as string);
+                        providerContext.Results.Add(
+                            new FilterItem(new FilterDescriptor(filter, FilterScope.Global), filter)
+                            {
+                                IsReusable = reusable
+                            });
+                    },
+                    providerExecuted: null);
+            var staticFilter = new TestFilter();
+            var actionContext = CreateActionContext(new[]
+                {
+                    new FilterDescriptor(new TestFilterFactory() { IsReusable = false }, FilterScope.Action),
+                    new FilterDescriptor(staticFilter, FilterScope.Action),
+                });
+            var filterProviders = new IFilterProvider[] { new DefaultFilterProvider(), customFilterProvider };
+            var filterDescriptors = actionContext.ActionDescriptor.FilterDescriptors;
+
+            // Act - 1
+            actionContext.HttpContext.Items["name"] = "foo";
+            var filterResult = FilterFactory.GetAllFilters(filterProviders, actionContext);
+            var filters = filterResult.Filters;
+
+            // Assert - 1
+            Assert.Equal(3, filters.Length);
+            var request1Filter1 = Assert.IsType<TestFilter>(filters[0]); // Created by factory
+            Assert.Same(staticFilter, filters[1]); // Cached and the same statically created filter instance
+            var request1Filter3 = Assert.IsType<TestFilter>(filters[2]); // Created by custom filter provider
+            Assert.Equal("foo", request1Filter3.Data);
+
+            // Act - 2
+            actionContext.HttpContext.Items["name"] = "bar";
+            filters = FilterFactory.CreateUncachedFilters(filterProviders, actionContext, filterResult.CacheableFilters);
+
+            // Assert -2
+            Assert.Equal(3, filters.Length);
+            var request2Filter1 = Assert.IsType<TestFilter>(filters[0]);
+            Assert.NotSame(request1Filter1, request2Filter1); // Created by factory
+            Assert.Same(staticFilter, filters[1]);   // Cached and the same statically created filter instance
+            var request2Filter3 = Assert.IsType<TestFilter>(filters[2]);
+            Assert.NotSame(request1Filter3, request2Filter3); // Created by custom filter provider again
+            Assert.Equal("bar", request2Filter3.Data);
+        }
+
+        private class TestFilter : IFilterMetadata
+        {
+            public TestFilter()
+            {
+            }
+
+            public TestFilter(string data)
+            {
+                Data = data;
+            }
+
+            public string Data { get; }
+        }
+
+        private class TestFilterFactory : IFilterFactory
+        {
+            private TestFilter testFilter;
+
+            public bool IsReusable { get; set; }
+
+            public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
+            {
+                if (IsReusable)
+                {
+                    if (testFilter == null)
+                    {
+                        testFilter = new TestFilter();
+                    }
+                    return testFilter;
+                }
+                else
+                {
+                    return new TestFilter();
+                }
+            }
+        }
+
+        private class TestFilterProvider : IFilterProvider
+        {
+            private readonly Action<FilterProviderContext> _providerExecuting;
+            private readonly Action<FilterProviderContext> _providerExecuted;
+
+            public TestFilterProvider(
+                Action<FilterProviderContext> providerExecuting,
+                Action<FilterProviderContext> providerExecuted,
+                int order = 0)
+            {
+                _providerExecuting = providerExecuting;
+                _providerExecuted = providerExecuted;
+                Order = order;
+            }
+
+            public int Order { get; }
+
+            public void OnProvidersExecuting(FilterProviderContext context)
+            {
+                _providerExecuting?.Invoke(context);
+            }
+
+            public void OnProvidersExecuted(FilterProviderContext context)
+            {
+                _providerExecuted?.Invoke(context);
+            }
+        }
+
+        private class TestOrderedFilter : IFilterMetadata, IOrderedFilter
+        {
+            public int Order { get; set; }
+        }
+
+        private static ActionContext CreateActionContext(FilterDescriptor[] filterDescriptors)
+        {
+            var actionDescriptor = new ActionDescriptor
+            {
+                FilterDescriptors = filterDescriptors,
+            };
+
+            return new ActionContext(new DefaultHttpContext(), new RouteData(), actionDescriptor);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/FilterProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/FilterProviderTest.cs
new file mode 100644
index 0000000000..5d9876a3c4
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/FilterProviderTest.cs
@@ -0,0 +1,158 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class DefaultFilterProviderTest
+    {
+        [Fact]
+        public void DefaultFilterProvider_UsesFilter_WhenItsNotIFilterFactory()
+        {
+            // Arrange
+            var filter = Mock.Of<IFilterMetadata>();
+
+            var context = CreateFilterContext(new List<FilterItem>()
+            {
+                new FilterItem(new FilterDescriptor(filter, FilterScope.Global)),
+            });
+
+            var provider = CreateProvider();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+            provider.OnProvidersExecuted(context);
+
+            var results = context.Results;
+
+            // Assert
+            var item = Assert.Single(results);
+            Assert.Same(filter, item.Filter);
+            Assert.Same(filter, item.Descriptor.Filter);
+            Assert.Equal(0, item.Descriptor.Order);
+        }
+
+        [Fact]
+        public void DefaultFilterProvider_UsesFilterFactory()
+        {
+            // Arrange
+            var filter = Mock.Of<IFilterMetadata>();
+
+            var filterFactory = new Mock<IFilterFactory>();
+            filterFactory
+                .Setup(ff => ff.CreateInstance(It.IsAny<IServiceProvider>()))
+                .Returns(filter);
+
+            var context = CreateFilterContext(new List<FilterItem>()
+            {
+                new FilterItem(new FilterDescriptor(filterFactory.Object, FilterScope.Global)),
+            });
+
+            var provider = CreateProvider();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+            provider.OnProvidersExecuted(context);
+
+            var results = context.Results;
+
+            // Assert
+            var item = Assert.Single(results);
+            Assert.Same(filter, item.Filter);
+            Assert.Same(filterFactory.Object, item.Descriptor.Filter);
+            Assert.Equal(0, item.Descriptor.Order);
+        }
+
+        [Fact]
+        public void DefaultFilterProvider_UsesFilterFactory_WithOrder()
+        {
+            // Arrange
+            var filter = Mock.Of<IFilterMetadata>();
+
+            var filterFactory = new Mock<IFilterFactory>();
+            filterFactory
+                .Setup(ff => ff.CreateInstance(It.IsAny<IServiceProvider>()))
+                .Returns(filter);
+
+            filterFactory.As<IOrderedFilter>().SetupGet(ff => ff.Order).Returns(17);
+
+            var context = CreateFilterContext(new List<FilterItem>()
+            {
+                new FilterItem(new FilterDescriptor(filterFactory.Object, FilterScope.Global)),
+            });
+
+            var provider = CreateProvider();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+            provider.OnProvidersExecuted(context);
+            var results = context.Results;
+
+            // Assert
+            var item = Assert.Single(results);
+            Assert.Same(filter, item.Filter);
+            Assert.Same(filterFactory.Object, item.Descriptor.Filter);
+            Assert.Equal(17, item.Descriptor.Order);
+        }
+
+        [Fact]
+        public void DefaultFilterProvider_UsesFilterFactory_WithIFilterContainer()
+        {
+            // Arrange
+            var filter = new Mock<IFilterContainer>();
+            filter.SetupAllProperties();
+
+            var filterFactory = new Mock<IFilterFactory>();
+            filterFactory
+                .Setup(ff => ff.CreateInstance(It.IsAny<IServiceProvider>()))
+                .Returns(filter.As<IFilterMetadata>().Object);
+
+            var context = CreateFilterContext(new List<FilterItem>()
+            {
+                new FilterItem(new FilterDescriptor(filterFactory.Object, FilterScope.Global)),
+            });
+
+            var provider = CreateProvider();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+            provider.OnProvidersExecuted(context);
+            var results = context.Results;
+
+            // Assert
+            var item = Assert.Single(results);
+            Assert.Same(filter.Object, item.Filter);
+            Assert.Same(filterFactory.Object, ((IFilterContainer)item.Filter).FilterDefinition);
+            Assert.Same(filterFactory.Object, item.Descriptor.Filter);
+            Assert.Equal(0, item.Descriptor.Order);
+        }
+
+        private DefaultFilterProvider CreateProvider()
+        {
+            return new DefaultFilterProvider();
+        }
+
+        private FilterProviderContext CreateFilterContext(List<FilterItem> items)
+        {
+            var actionContext = CreateActionContext();
+            actionContext.ActionDescriptor.FilterDescriptors = new List<FilterDescriptor>(
+                items.Select(item => item.Descriptor));
+
+            return new FilterProviderContext(actionContext, items);
+        }
+
+        private ActionContext CreateActionContext()
+        {
+            return new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/HttpMethodActionConstraintTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/HttpMethodActionConstraintTest.cs
new file mode 100644
index 0000000000..bb6354fe4c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/HttpMethodActionConstraintTest.cs
@@ -0,0 +1,89 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class HttpMethodActionConstraintTest
+    {
+        public static TheoryData AcceptCaseInsensitiveData =
+            new TheoryData<IEnumerable<string>, string>
+            {
+                { new string[] { "get", "Get", "GET", "GEt"}, "gEt" },
+                { new string[] { "POST", "PoSt", "GEt"}, "GET" },
+                { new string[] { "get" }, "get" },
+                { new string[] { "post" }, "POST" },
+                { new string[] { "gEt" }, "get" },
+                { new string[] { "get", "PoST" }, "pOSt" }
+            };
+
+        [Theory]
+        [MemberData(nameof(AcceptCaseInsensitiveData))]
+        public void HttpMethodActionConstraint_IgnoresPreflightRequests(IEnumerable<string> httpMethods, string accessControlMethod)
+        {
+            // Arrange
+            var constraint = new HttpMethodActionConstraint(httpMethods);
+            var context = CreateActionConstraintContext(constraint);
+            context.RouteContext = CreateRouteContext("oPtIoNs", accessControlMethod);
+
+            // Act
+            var result = constraint.Accept(context);
+
+            // Assert
+            Assert.False(result, "Request should have been rejected.");
+        }
+
+        [Theory]
+        [MemberData(nameof(AcceptCaseInsensitiveData))]
+        public void HttpMethodActionConstraint_Accept_CaseInsensitive(IEnumerable<string> httpMethods, string expectedMethod)
+        {
+            // Arrange
+            var constraint = new HttpMethodActionConstraint(httpMethods);
+            var context = CreateActionConstraintContext(constraint);
+            context.RouteContext = CreateRouteContext(expectedMethod);
+
+            // Act
+            var result = constraint.Accept(context);
+
+            // Assert
+            Assert.True(result, "Request should have been accepted.");
+        }
+
+        private static ActionConstraintContext CreateActionConstraintContext(HttpMethodActionConstraint constraint)
+        {
+            var context = new ActionConstraintContext();
+
+            var actionSelectorCandidate = new ActionSelectorCandidate(new ActionDescriptor(), new List<IActionConstraint> { constraint });
+
+            context.Candidates = new List<ActionSelectorCandidate> { actionSelectorCandidate };
+            context.CurrentCandidate = context.Candidates[0];
+
+            return context;
+        }
+
+        private static RouteContext CreateRouteContext(string requestedMethod, string accessControlMethod = null)
+        {
+            var httpContext = new DefaultHttpContext();
+
+            httpContext.Request.Method = requestedMethod;
+
+            if (accessControlMethod != null)
+            {
+                httpContext.Request.Headers.Add("Origin", StringValues.Empty);
+                httpContext.Request.Headers.Add("Access-Control-Request-Method", accessControlMethod);
+            }
+
+            var routeContext = new RouteContext(httpContext);
+            routeContext.RouteData = new RouteData();
+
+            return routeContext;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MiddlewareFilterBuilderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MiddlewareFilterBuilderTest.cs
new file mode 100644
index 0000000000..c9c30d2f85
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MiddlewareFilterBuilderTest.cs
@@ -0,0 +1,308 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.ExceptionServices;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder.Internal;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class MiddlewareFilterBuilderTest
+    {
+        [Fact]
+        public void GetPipeline_CallsInto_Configure()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var appBuilder = new ApplicationBuilder(services.BuildServiceProvider());
+            var pipelineBuilderService = new MiddlewareFilterBuilder(new MiddlewareFilterConfigurationProvider())
+            {
+                ApplicationBuilder = appBuilder,
+            };
+
+            var configureCount = 0;
+            Pipeline1.ConfigurePipeline = _ =>
+            {
+                configureCount++;
+            };
+
+            // Act
+            var pipeline = pipelineBuilderService.GetPipeline(typeof(Pipeline1));
+
+            // Assert
+            Assert.NotNull(pipeline);
+            Assert.Equal(1, configureCount);
+        }
+
+        [Fact]
+        public void GetPipeline_CallsIntoConfigure_OnlyOnce_ForTheSamePipelineType()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var appBuilder = new ApplicationBuilder(services.BuildServiceProvider());
+            var pipelineBuilderService = new MiddlewareFilterBuilder(new MiddlewareFilterConfigurationProvider())
+            {
+                ApplicationBuilder = appBuilder,
+            };
+
+            var configureCount = 0;
+            Pipeline1.ConfigurePipeline = _ =>
+            {
+                configureCount++;
+            };
+
+            // Act
+            var pipeline1 = pipelineBuilderService.GetPipeline(typeof(Pipeline1));
+
+            // Assert
+            Assert.NotNull(pipeline1);
+            Assert.Equal(1, configureCount);
+
+            // Act
+            var pipeline2 = pipelineBuilderService.GetPipeline(typeof(Pipeline1));
+
+            // Assert
+            Assert.NotNull(pipeline2);
+            Assert.Same(pipeline1, pipeline2);
+            Assert.Equal(1, configureCount);
+        }
+
+        [Fact]
+        public async Task EndMiddleware_ThrowsException_WhenMiddleFeature_NotAvailable()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var appBuilder = new ApplicationBuilder(services.BuildServiceProvider());
+            var pipelineBuilderService = new MiddlewareFilterBuilder(new MiddlewareFilterConfigurationProvider())
+            {
+                ApplicationBuilder = appBuilder,
+            };
+
+            var httpContext = new DefaultHttpContext();
+            Pipeline1.ConfigurePipeline = ab =>
+            {
+                ab.Use((_, next) =>
+                {
+                    return next();
+                });
+            };
+
+            // Act
+            var pipeline = pipelineBuilderService.GetPipeline(typeof(Pipeline1));
+
+            // Assert
+            Assert.NotNull(pipeline);
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => pipeline(httpContext));
+            Assert.Equal("Could not find 'IMiddlewareFilterFeature' in the feature list.", exception.Message);
+        }
+
+        [Fact]
+        public async Task EndMiddleware_DoesNotThrow_IfExceptionHandled()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var appBuilder = new ApplicationBuilder(services.BuildServiceProvider());
+            var pipelineBuilderService = new MiddlewareFilterBuilder(new MiddlewareFilterConfigurationProvider())
+            {
+                ApplicationBuilder = appBuilder,
+            };
+
+            Pipeline1.ConfigurePipeline = ab =>
+            {
+                ab.Use((_, next) =>
+                {
+                    return next();
+                });
+            };
+
+            var middlewareFilterFeature = new MiddlewareFilterFeature
+            {
+                ResourceExecutionDelegate = () =>
+                {
+                    var actionContext = new ActionContext(
+                        new DefaultHttpContext(),
+                        new RouteData(),
+                        new ActionDescriptor(),
+                        new ModelStateDictionary());
+                    var context = new ResourceExecutedContext(actionContext, new List<IFilterMetadata>())
+                    {
+                        Exception = new InvalidOperationException("Error!!!"),
+                        ExceptionHandled = true,
+                    };
+
+                    return Task.FromResult(context);
+                },
+            };
+
+            var features = new FeatureCollection();
+            features.Set<IMiddlewareFilterFeature>(middlewareFilterFeature);
+            var httpContext = new DefaultHttpContext(features);
+
+            // Act
+            var pipeline = pipelineBuilderService.GetPipeline(typeof(Pipeline1));
+
+            // Assert
+            Assert.NotNull(pipeline);
+
+            // Does not throw.
+            await pipeline(httpContext);
+        }
+
+        [Fact]
+        public async Task EndMiddleware_PropagatesBackException_ToEarlierMiddleware()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var appBuilder = new ApplicationBuilder(services.BuildServiceProvider());
+            var pipelineBuilderService = new MiddlewareFilterBuilder(new MiddlewareFilterConfigurationProvider())
+            {
+                ApplicationBuilder = appBuilder,
+            };
+
+            Pipeline1.ConfigurePipeline = ab =>
+            {
+                ab.Use((_, next) =>
+                {
+                    return next();
+                });
+            };
+
+            var middlewareFilterFeature = new MiddlewareFilterFeature
+            {
+                ResourceExecutionDelegate = () =>
+                {
+                    Exception thrownException;
+                    try
+                    {
+                        // Create a small stack trace.
+                        throw new InvalidOperationException("Error!!!");
+                    }
+                    catch (Exception ex)
+                    {
+                        thrownException = ex;
+                    }
+
+                    var actionContext = new ActionContext(
+                        new DefaultHttpContext(),
+                        new RouteData(),
+                        new ActionDescriptor(),
+                        new ModelStateDictionary());
+                    var context = new ResourceExecutedContext(actionContext, new List<IFilterMetadata>())
+                    {
+                        Exception = thrownException,
+                    };
+
+                    return Task.FromResult(context);
+                },
+            };
+
+            var features = new FeatureCollection();
+            features.Set<IMiddlewareFilterFeature>(middlewareFilterFeature);
+            var httpContext = new DefaultHttpContext(features);
+
+            // Act
+            var pipeline = pipelineBuilderService.GetPipeline(typeof(Pipeline1));
+
+            // Assert
+            Assert.NotNull(pipeline);
+
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => pipeline(httpContext));
+            Assert.Null(exception.InnerException);
+            Assert.Equal("Error!!!", exception.Message);
+
+            var stack = exception.StackTrace;
+            Assert.Contains(typeof(MiddlewareFilterBuilder).FullName, stack);
+            Assert.DoesNotContain(typeof(MiddlewareFilterBuilderTest).FullName, stack);
+            Assert.DoesNotContain(nameof(EndMiddleware_PropagatesBackException_ToEarlierMiddleware), stack);
+        }
+
+        [Fact]
+        public async Task EndMiddleware_PropagatesFullExceptionInfo_ToEarlierMiddleware()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var appBuilder = new ApplicationBuilder(services.BuildServiceProvider());
+            var pipelineBuilderService = new MiddlewareFilterBuilder(new MiddlewareFilterConfigurationProvider())
+            {
+                ApplicationBuilder = appBuilder,
+            };
+
+            Pipeline1.ConfigurePipeline = ab =>
+            {
+                ab.Use((_, next) =>
+                {
+                    return next();
+                });
+            };
+
+            var middlewareFilterFeature = new MiddlewareFilterFeature
+            {
+                ResourceExecutionDelegate = () =>
+                {
+                    ExceptionDispatchInfo exceptionInfo;
+                    try
+                    {
+                        // Create a small stack trace.
+                        throw new InvalidOperationException("Error!!!");
+                    }
+                    catch (Exception ex)
+                    {
+                        exceptionInfo = ExceptionDispatchInfo.Capture(ex);
+                    }
+
+                    var actionContext = new ActionContext(
+                        new DefaultHttpContext(),
+                        new RouteData(),
+                        new ActionDescriptor(),
+                        new ModelStateDictionary());
+                    var context = new ResourceExecutedContext(actionContext, new List<IFilterMetadata>())
+                    {
+                        ExceptionDispatchInfo = exceptionInfo,
+                    };
+
+                    return Task.FromResult(context);
+                },
+            };
+
+            var features = new FeatureCollection();
+            features.Set<IMiddlewareFilterFeature>(middlewareFilterFeature);
+            var httpContext = new DefaultHttpContext(features);
+
+            // Act
+            var pipeline = pipelineBuilderService.GetPipeline(typeof(Pipeline1));
+
+            // Assert
+            Assert.NotNull(pipeline);
+
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => pipeline(httpContext));
+            Assert.Null(exception.InnerException);
+            Assert.Equal("Error!!!", exception.Message);
+
+            var stack = exception.StackTrace;
+            Assert.Contains(typeof(MiddlewareFilterBuilder).FullName, stack);
+            Assert.Contains(typeof(MiddlewareFilterBuilderTest).FullName, stack);
+            Assert.Contains(nameof(EndMiddleware_PropagatesFullExceptionInfo_ToEarlierMiddleware), stack);
+        }
+
+        private class Pipeline1
+        {
+            public static Action<IApplicationBuilder> ConfigurePipeline { get; set; }
+
+            public void Configure(IApplicationBuilder appBuilder)
+            {
+                ConfigurePipeline(appBuilder);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MiddlewareFilterConfigurationProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MiddlewareFilterConfigurationProviderTest.cs
new file mode 100644
index 0000000000..694606d8ce
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MiddlewareFilterConfigurationProviderTest.cs
@@ -0,0 +1,205 @@
+// 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.
+
+using System;
+using Castle.Core.Logging;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class MiddlewareFilterConfigurationProviderTest
+    {
+        [Theory]
+        [InlineData(typeof(AbstractType))]
+        [InlineData(typeof(NoParameterlessConstructor))]
+        [InlineData(typeof(IDisposable))]
+        public void CreateConfigureDelegate_ThrowsIfTypeCannotBeInstantiated(Type configurationType)
+        {
+            // Arrange
+            var provider = new MiddlewareFilterConfigurationProvider();
+
+            // Act
+            var exception = Assert.Throws<InvalidOperationException>(() => provider.CreateConfigureDelegate(configurationType));
+
+            // Assert
+            Assert.Equal($"Unable to create an instance of type '{configurationType}'. The type specified in configurationType must not be abstract and must have a parameterless constructor.", exception.Message);
+        }
+
+        [Fact]
+        public void ValidConfigure_DoesNotThrow()
+        {
+            // Arrange
+            var provider = new MiddlewareFilterConfigurationProvider();
+
+            // Act
+            var configureDelegate = provider.CreateConfigureDelegate(typeof(ValidConfigure_WithNoEnvironment));
+
+            // Assert
+            Assert.NotNull(configureDelegate);
+        }
+
+        [Fact]
+        public void ValidConfigure_AndAdditionalServices_DoesNotThrow()
+        {
+            // Arrange
+            var loggerFactory = Mock.Of<ILoggerFactory>();
+            var services = new ServiceCollection();
+            services.AddSingleton(loggerFactory);
+            services.AddSingleton(Mock.Of<IHostingEnvironment>());
+            var applicationBuilder = GetApplicationBuilder(services);
+            var provider = new MiddlewareFilterConfigurationProvider();
+
+            // Act
+            var configureDelegate = provider.CreateConfigureDelegate(typeof(ValidConfigure_WithNoEnvironment_AdditionalServices));
+
+            // Assert
+            Assert.NotNull(configureDelegate);
+        }
+
+        [Fact]
+        public void InvalidType_NoConfigure_Throws()
+        {
+            // Arrange
+            var type = typeof(InvalidType_NoConfigure);
+            var provider = new MiddlewareFilterConfigurationProvider();
+            var expected = $"A public method named 'Configure' could not be found in the '{type.FullName}' type.";
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() =>
+            {
+                provider.CreateConfigureDelegate(type);
+            });
+            Assert.Equal(expected, exception.Message);
+        }
+
+        [Fact]
+        public void InvalidType_NoPublicConfigure_Throws()
+        {
+            // Arrange
+            var type = typeof(InvalidType_NoPublic_Configure);
+            var provider = new MiddlewareFilterConfigurationProvider();
+            var expected = $"A public method named 'Configure' could not be found in the '{type.FullName}' type.";
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() =>
+            {
+                provider.CreateConfigureDelegate(type);
+            });
+            Assert.Equal(expected, exception.Message);
+        }
+
+        private IApplicationBuilder GetApplicationBuilder(ServiceCollection services = null)
+        {
+            if (services == null)
+            {
+                services = new ServiceCollection();
+            }
+            var serviceProvider = services.BuildServiceProvider();
+
+            var applicationBuilder = new Mock<IApplicationBuilder>();
+            applicationBuilder
+                .SetupGet(a => a.ApplicationServices)
+                .Returns(serviceProvider);
+
+            return applicationBuilder.Object;
+        }
+
+        private class ValidConfigure_WithNoEnvironment
+        {
+            public void Configure(IApplicationBuilder appBuilder) { }
+        }
+
+        private class ValidConfigure_WithNoEnvironment_AdditionalServices
+        {
+            public void Configure(
+                IApplicationBuilder appBuilder,
+                IHostingEnvironment hostingEnvironment,
+                ILoggerFactory loggerFactory)
+            {
+                if (hostingEnvironment == null)
+                {
+                    throw new ArgumentNullException(nameof(hostingEnvironment));
+                }
+                if (loggerFactory == null)
+                {
+                    throw new ArgumentNullException(nameof(loggerFactory));
+                }
+            }
+        }
+
+        private class ValidConfigure_WithEnvironment
+        {
+            public void ConfigureProduction(IApplicationBuilder appBuilder) { }
+        }
+
+        private class ValidConfigure_WithEnvironment_AdditionalServices
+        {
+            public void ConfigureProduction(
+                IApplicationBuilder appBuilder,
+                IHostingEnvironment hostingEnvironment,
+                ILoggerFactory loggerFactory)
+            {
+                if (hostingEnvironment == null)
+                {
+                    throw new ArgumentNullException(nameof(hostingEnvironment));
+                }
+                if (loggerFactory == null)
+                {
+                    throw new ArgumentNullException(nameof(loggerFactory));
+                }
+            }
+        }
+
+        private class MultipleConfigureWithEnvironments
+        {
+            public void ConfigureDevelopment(IApplicationBuilder appBuilder)
+            {
+
+            }
+
+            public void ConfigureProduction(IApplicationBuilder appBuilder)
+            {
+
+            }
+        }
+
+        private class InvalidConfigure_NoParameters
+        {
+            public void Configure()
+            {
+
+            }
+        }
+
+        private class InvalidType_NoConfigure
+        {
+            public void Foo(IApplicationBuilder appBuilder)
+            {
+
+            }
+        }
+
+        private class InvalidType_NoPublic_Configure
+        {
+            private void Configure(IApplicationBuilder appBuilder)
+            {
+
+            }
+        }
+
+        private abstract class AbstractType
+        {
+        }
+
+        private class NoParameterlessConstructor
+        {
+            public NoParameterlessConstructor(object a)
+            {
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MiddlewareFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MiddlewareFilterTest.cs
new file mode 100644
index 0000000000..e9c770e27a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MiddlewareFilterTest.cs
@@ -0,0 +1,548 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder.Internal;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class MiddlewareFilterTest
+    {
+        private readonly TestController _controller = new TestController();
+
+        [Fact]
+        public async Task MiddlewareFilter_SetsMiddlewareFilterFeature_OnExecution()
+        {
+            // Arrange
+            Task requestDelegate(HttpContext context) => Task.FromResult(true);
+            var middlwareFilter = new MiddlewareFilter(requestDelegate);
+            var httpContext = new DefaultHttpContext();
+            var resourceExecutingContext = GetResourceExecutingContext(httpContext);
+            var resourceExecutionDelegate = GetResourceExecutionDelegate(httpContext);
+
+            // Act
+            await middlwareFilter.OnResourceExecutionAsync(resourceExecutingContext, resourceExecutionDelegate);
+
+            // Assert
+            var feature = resourceExecutingContext.HttpContext.Features.Get<IMiddlewareFilterFeature>();
+            Assert.NotNull(feature);
+            Assert.Same(resourceExecutingContext, feature.ResourceExecutingContext);
+            Assert.Same(resourceExecutionDelegate, feature.ResourceExecutionDelegate);
+        }
+
+        [Fact]
+        public async Task OnMiddlewareShortCircuit_DoesNotExecute_RestOfFilterPipeline()
+        {
+            // Arrange
+            var expectedHeader = "h1";
+            Pipeline1.ConfigurePipeline = (appBuilder) =>
+            {
+                appBuilder.Use((httpContext, next) =>
+                {
+                    httpContext.Response.Headers.Add(expectedHeader, "");
+                    return Task.FromResult(true); // short circuit the request
+                });
+            };
+            var resourceFilter1 = new TestResourceFilter(TestResourceFilterAction.Passthrough);
+            var middlewareResourceFilter = new MiddlewareFilter(GetMiddlewarePipeline(typeof(Pipeline1)));
+            var exceptionThrowingResourceFilter = new TestResourceFilter(TestResourceFilterAction.ThrowException);
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[]
+                {
+                    resourceFilter1,
+                    middlewareResourceFilter,
+                    exceptionThrowingResourceFilter,
+                },
+                actionThrows: true); // The action won't run
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var resourceExecutedContext = resourceFilter1.ResourceExecutedContext;
+            Assert.True(resourceExecutedContext.HttpContext.Response.Headers.ContainsKey(expectedHeader));
+            Assert.True(resourceExecutedContext.Canceled);
+            Assert.False(invoker.ControllerFactory.CreateCalled);
+        }
+
+        // Example: Middleware filters are applied at Global, Controller & Action level
+        [Fact]
+        public async Task Multiple_MiddlewareFilters_ConcatsTheMiddlewarePipelines()
+        {
+            // Arrange
+            var expectedHeader = "h1";
+            var expectedHeaderValue = "pipeline1-pipeline2";
+            Pipeline1.ConfigurePipeline = (appBuilder) =>
+            {
+                appBuilder.Use((httpContext, next) =>
+                {
+                    httpContext.Response.Headers["h1"] = "pipeline1";
+                    return next();
+                });
+            };
+            Pipeline2.ConfigurePipeline = (appBuilder) =>
+            {
+                appBuilder.Use((httpContext, next) =>
+                {
+                    httpContext.Response.Headers["h1"] = httpContext.Response.Headers["h1"] + "-pipeline2";
+                    return Task.FromResult(true); // short circuits the request
+                });
+            };
+            var resourceFilter1 = new TestResourceFilter(TestResourceFilterAction.Passthrough);
+            var middlewareResourceFilter1 = new MiddlewareFilter(GetMiddlewarePipeline(typeof(Pipeline1)));
+            var middlewareResourceFilter2 = new MiddlewareFilter(GetMiddlewarePipeline(typeof(Pipeline2)));
+            var exceptionThrowingResourceFilter = new TestResourceFilter(TestResourceFilterAction.ThrowException);
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[]
+                {
+                    resourceFilter1,                    // This filter will pass through
+                    middlewareResourceFilter1,          // This filter will pass through
+                    middlewareResourceFilter2,          // This filter will short circuit
+                    exceptionThrowingResourceFilter,    // This shouldn't run
+                },
+                actionThrows: true); // The action won't run
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var resourceExecutedContext = resourceFilter1.ResourceExecutedContext;
+            var response = resourceExecutedContext.HttpContext.Response;
+            Assert.True(response.Headers.ContainsKey(expectedHeader));
+            Assert.Equal(expectedHeaderValue, response.Headers[expectedHeader]);
+            Assert.True(resourceExecutedContext.Canceled);
+            Assert.False(invoker.ControllerFactory.CreateCalled);
+        }
+
+        [Fact]
+        public async Task UnhandledException_InMiddleware_PropagatesBackToInvoker()
+        {
+            // Arrange
+            var expectedMessage = "Error!!!";
+            Pipeline1.ConfigurePipeline = (appBuilder) =>
+            {
+                appBuilder.Use((httpContext, next) =>
+                {
+                    throw new InvalidOperationException(expectedMessage);
+                });
+            };
+            var resourceFilter1 = new TestResourceFilter(TestResourceFilterAction.Passthrough);
+            var middlewareResourceFilter = new MiddlewareFilter(GetMiddlewarePipeline(typeof(Pipeline1)));
+            var exceptionThrowingResourceFilter = new TestResourceFilter(TestResourceFilterAction.ThrowException);
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[]
+                {
+                    resourceFilter1,
+                    middlewareResourceFilter,
+                    exceptionThrowingResourceFilter, // This shouldn't run
+                },
+                actionThrows: true); // The action won't run
+
+            // Act
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(async () => await invoker.InvokeAsync());
+
+            // Assert
+            Assert.Equal(expectedMessage, exception.Message);
+        }
+
+        [Fact]
+        public async Task ExceptionThrownInMiddleware_CanBeHandled_ByEarlierMiddleware()
+        {
+            // Arrange
+            var expectedMessage = "Error!!!";
+            Pipeline1.ConfigurePipeline = (appBuilder) =>
+            {
+                appBuilder.Use(async (httpContext, next) =>
+                {
+                    try
+                    {
+                        await next();
+                    }
+                    catch
+                    {
+                        httpContext.Response.StatusCode = 500;
+                        httpContext.Response.Headers.Add("Error", "Error!!!!");
+                    }
+                });
+            };
+            Pipeline2.ConfigurePipeline = (appBuilder) =>
+            {
+                appBuilder.Use((httpContext, next) =>
+                {
+                    throw new InvalidOperationException(expectedMessage);
+                });
+            };
+            var resourceFilter1 = new TestResourceFilter(TestResourceFilterAction.Passthrough);
+            var middlewareResourceFilter1 = new MiddlewareFilter(GetMiddlewarePipeline(typeof(Pipeline1)));
+            var middlewareResourceFilter2 = new MiddlewareFilter(GetMiddlewarePipeline(typeof(Pipeline2)));
+            var exceptionThrowingResourceFilter = new TestResourceFilter(TestResourceFilterAction.ThrowException);
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[]
+                {
+                    resourceFilter1,
+                    middlewareResourceFilter1,
+                    middlewareResourceFilter2,
+                    exceptionThrowingResourceFilter, // This shouldn't run
+                },
+                actionThrows: true); // The action won't run
+
+            // Act
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(async () => await invoker.InvokeAsync());
+
+            // Assert
+            var resourceExecutedContext = resourceFilter1.ResourceExecutedContext;
+            var response = resourceExecutedContext.HttpContext.Response;
+            Assert.Equal(500, response.StatusCode);
+            Assert.True(response.Headers.ContainsKey("Error"));
+            Assert.False(invoker.ControllerFactory.CreateCalled);
+        }
+
+        private ResourceExecutingContext GetResourceExecutingContext(HttpContext httpContext)
+        {
+            return new ResourceExecutingContext(
+                new ActionContext(httpContext, new RouteData(), new ActionDescriptor(), new ModelStateDictionary()),
+                new List<IFilterMetadata>(),
+                new List<IValueProviderFactory>());
+        }
+
+        private ResourceExecutionDelegate GetResourceExecutionDelegate(HttpContext httpContext)
+        {
+            return new ResourceExecutionDelegate(
+                () => Task.FromResult(new ResourceExecutedContext(new ActionContext(), new List<IFilterMetadata>())));
+        }
+
+        private TestControllerActionInvoker CreateInvoker(
+            IFilterMetadata[] filters,
+            bool actionThrows = false)
+        {
+            var actionDescriptor = new ControllerActionDescriptor()
+            {
+                FilterDescriptors = new List<FilterDescriptor>(),
+                Parameters = new List<ParameterDescriptor>(),
+            };
+
+            if (actionThrows)
+            {
+                actionDescriptor.MethodInfo = typeof(ControllerActionInvokerTest.TestController).GetMethod(
+                    nameof(ControllerActionInvokerTest.TestController.ThrowingActionMethod));
+            }
+            else
+            {
+                actionDescriptor.MethodInfo = typeof(ControllerActionInvokerTest.TestController).GetMethod(
+                    nameof(ControllerActionInvokerTest.TestController.ActionMethod));
+            }
+            actionDescriptor.ControllerTypeInfo = typeof(ControllerActionInvokerTest.TestController).GetTypeInfo();
+
+            return CreateInvoker(filters, actionDescriptor, _controller);
+        }
+
+        private TestControllerActionInvoker CreateInvoker(
+            IFilterMetadata[] filters,
+            ControllerActionDescriptor actionDescriptor,
+            object controller)
+        {
+            var httpContext = GetHttpContext();
+            httpContext.Response.Body = new MemoryStream();
+
+            var options = new MvcOptions();
+            var optionsAccessor = new Mock<IOptions<MvcOptions>>();
+            optionsAccessor
+                .SetupGet(o => o.Value)
+                .Returns(options);
+
+            var actionContext = new ActionContext(httpContext, new RouteData(), actionDescriptor);
+
+            var diagnosticSource = new DiagnosticListener("Microsoft.AspNetCore");
+            diagnosticSource.SubscribeWithAdapter(new TestDiagnosticListener());
+
+            var invoker = new TestControllerActionInvoker(
+                filters,
+                new MockControllerFactory(controller ?? this),
+                new NullLoggerFactory().CreateLogger<ControllerActionInvoker>(),
+                diagnosticSource,
+                new ActionResultTypeMapper(),
+                actionContext,
+                new List<IValueProviderFactory>(),
+                maxAllowedErrorsInModelState: 200);
+            return invoker;
+        }
+
+        private class Pipeline1
+        {
+            public static Action<IApplicationBuilder> ConfigurePipeline { get; set; }
+
+            public void Configure(IApplicationBuilder appBuilder)
+            {
+                ConfigurePipeline(appBuilder);
+            }
+        }
+
+        private class Pipeline2
+        {
+            public static Action<IApplicationBuilder> ConfigurePipeline { get; set; }
+
+            public void Configure(IApplicationBuilder appBuilder)
+            {
+                ConfigurePipeline(appBuilder);
+            }
+        }
+
+        private static HttpContext GetHttpContext()
+        {
+            var services = CreateServices();
+
+            var httpContext = new DefaultHttpContext
+            {
+                RequestServices = services.BuildServiceProvider()
+            };
+
+            return httpContext;
+        }
+
+        private RequestDelegate GetMiddlewarePipeline(Type middlewarePipelineProviderType)
+        {
+            var applicationServices = new ServiceCollection();
+            var applicationBuilder = new ApplicationBuilder(applicationServices.BuildServiceProvider());
+            var middlewareFilterBuilderService = new MiddlewareFilterBuilder(
+                new MiddlewareFilterConfigurationProvider())
+            {
+                ApplicationBuilder = applicationBuilder
+            };
+
+            return middlewareFilterBuilderService.GetPipeline(middlewarePipelineProviderType);
+        }
+
+        private static IServiceCollection CreateServices()
+        {
+            var services = new ServiceCollection();
+
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+            return services;
+        }
+
+        private class MockControllerFactory
+        {
+            private object _controller;
+
+            public MockControllerFactory(object controller)
+            {
+                _controller = controller;
+            }
+
+            public bool CreateCalled { get; private set; }
+
+            public bool ReleaseCalled { get; private set; }
+
+            public ControllerContext ControllerContext { get; private set; }
+
+            public object CreateController(ControllerContext context)
+            {
+                ControllerContext = context;
+                CreateCalled = true;
+                return _controller;
+            }
+
+            public void ReleaseController(ControllerContext context, object controller)
+            {
+                Assert.NotNull(controller);
+                Assert.Same(_controller, controller);
+                ReleaseCalled = true;
+            }
+
+            public void Verify()
+            {
+                if (CreateCalled && !ReleaseCalled)
+                {
+                    Assert.False(true, "ReleaseController should have been called.");
+                }
+            }
+        }
+
+        private class TestControllerActionInvoker : ControllerActionInvoker
+        {
+            public TestControllerActionInvoker(
+                IFilterMetadata[] filters,
+                MockControllerFactory controllerFactory,
+                ILogger logger,
+                DiagnosticSource diagnosticSource,
+                IActionResultTypeMapper mapper,
+                ActionContext actionContext,
+                IReadOnlyList<IValueProviderFactory> valueProviderFactories,
+                int maxAllowedErrorsInModelState)
+                : base(
+                      logger,
+                      diagnosticSource,
+                      mapper,
+                      CreatControllerContext(actionContext, valueProviderFactories, maxAllowedErrorsInModelState),
+                      CreateCacheEntry((ControllerActionDescriptor)actionContext.ActionDescriptor, controllerFactory),
+                      filters)
+            {
+                ControllerFactory = controllerFactory;
+            }
+
+            public MockControllerFactory ControllerFactory { get; }
+
+            public async override Task InvokeAsync()
+            {
+                await base.InvokeAsync();
+
+                // Make sure that the controller was disposed in every test that creates ones.
+                ControllerFactory.Verify();
+            }
+
+            private static ObjectMethodExecutor CreateExecutor(ControllerActionDescriptor actionDescriptor)
+            {
+                return ObjectMethodExecutor.Create(actionDescriptor.MethodInfo, actionDescriptor.ControllerTypeInfo);
+            }
+
+            private static ControllerContext CreatControllerContext(
+                ActionContext actionContext,
+                IReadOnlyList<IValueProviderFactory> valueProviderFactories,
+                int maxAllowedErrorsInModelState)
+            {
+                var controllerContext = new ControllerContext(actionContext)
+                {
+                    ValueProviderFactories = valueProviderFactories.ToList()
+                };
+                controllerContext.ModelState.MaxAllowedErrors = maxAllowedErrorsInModelState;
+
+                return controllerContext;
+            }
+
+            private static ControllerActionInvokerCacheEntry CreateCacheEntry(
+                ControllerActionDescriptor actionDescriptor,
+                MockControllerFactory controllerFactory)
+            {
+                var objectMethodExecutor = CreateExecutor(actionDescriptor);
+                return new ControllerActionInvokerCacheEntry(
+                    new FilterItem[0],
+                    controllerFactory.CreateController,
+                    controllerFactory.ReleaseController,
+                    null,
+                    objectMethodExecutor,
+                    ActionMethodExecutor.GetExecutor(objectMethodExecutor));
+            }
+        }
+
+        private class TestParameterBinder : ParameterBinder
+        {
+            private readonly IDictionary<string, object> _actionParameters;
+
+            public TestParameterBinder(IDictionary<string, object> actionParameters)
+                : base(
+                    new EmptyModelMetadataProvider(),
+                    TestModelBinderFactory.CreateDefault(),
+                    Mock.Of<IObjectModelValidator>(),
+                    Options.Create(new MvcOptions
+                    {
+                        AllowValidatingTopLevelNodes = true,
+                    }),
+                    NullLoggerFactory.Instance)
+            {
+                _actionParameters = actionParameters;
+            }
+
+            public override Task<ModelBindingResult> BindModelAsync(
+                ActionContext actionContext,
+                IValueProvider valueProvider,
+                ParameterDescriptor parameter,
+                object value)
+            {
+                if (_actionParameters.TryGetValue(parameter.Name, out var result))
+                {
+                    return Task.FromResult(ModelBindingResult.Success(result));
+                }
+
+                return Task.FromResult(ModelBindingResult.Failed());
+            }
+
+            public Task BindArgumentsAsync(
+                ControllerContext controllerContext,
+                object controller,
+                IDictionary<string, object> arguments)
+            {
+                foreach (var entry in _actionParameters)
+                {
+                    arguments.Add(entry.Key, entry.Value);
+                }
+
+                return Task.CompletedTask;
+            }
+        }
+
+        private sealed class TestController
+        {
+        }
+
+
+        private enum TestResourceFilterAction
+        {
+            ShortCircuit,
+            ThrowException,
+            Passthrough
+        }
+
+        private class TestResourceFilter : IAsyncResourceFilter
+        {
+            private readonly TestResourceFilterAction _action;
+            public TestResourceFilter(TestResourceFilterAction action)
+            {
+                _action = action;
+            }
+
+            public ResourceExecutedContext ResourceExecutedContext { get; private set; }
+
+            public async Task OnResourceExecutionAsync(ResourceExecutingContext context, ResourceExecutionDelegate next)
+            {
+                if (_action == TestResourceFilterAction.ThrowException)
+                {
+                    throw new NotImplementedException("This filter should not have been run!");
+
+                }
+                else if (_action == TestResourceFilterAction.Passthrough)
+                {
+                    ResourceExecutedContext = await next();
+                }
+                else
+                {
+                    context.Result = new TestActionResult();
+                }
+            }
+        }
+
+        public class TestActionResult : IActionResult
+        {
+            public Task ExecuteResultAsync(ActionContext context)
+            {
+                context.HttpContext.Response.StatusCode = 200;
+                return context.HttpContext.Response.WriteAsync("Shortcircuited");
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MvcCoreLoggerExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MvcCoreLoggerExtensionsTest.cs
new file mode 100644
index 0000000000..8835d2da8e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MvcCoreLoggerExtensionsTest.cs
@@ -0,0 +1,295 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Logging.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class MvcCoreLoggerExtensionsTest
+    {
+        [Fact]
+        public void LogsFilters_OnlyWhenLogger_IsEnabled()
+        {
+            // Arrange
+            var authFilter = Mock.Of<IAuthorizationFilter>();
+            var asyncAuthFilter = Mock.Of<IAsyncAuthorizationFilter>();
+            var actionFilter = Mock.Of<IActionFilter>();
+            var asyncActionFilter = Mock.Of<IAsyncActionFilter>();
+            var exceptionFilter = Mock.Of<IExceptionFilter>();
+            var asyncExceptionFilter = Mock.Of<IAsyncExceptionFilter>();
+            var resultFilter = Mock.Of<IResultFilter>();
+            var asyncResultFilter = Mock.Of<IAsyncResultFilter>();
+            var resourceFilter = Mock.Of<IResourceFilter>();
+            var asyncResourceFilter = Mock.Of<IAsyncResourceFilter>();
+            var filters = new IFilterMetadata[]
+            {
+                actionFilter,
+                asyncActionFilter,
+                authFilter,
+                asyncAuthFilter,
+                exceptionFilter,
+                asyncExceptionFilter,
+                resultFilter,
+                asyncResultFilter,
+                resourceFilter,
+                asyncResourceFilter
+            };
+            var testSink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(testSink, enabled: false);
+            var logger = loggerFactory.CreateLogger("test");
+
+            // Act
+            logger.AuthorizationFiltersExecutionPlan(filters);
+            logger.ResourceFiltersExecutionPlan(filters);
+            logger.ActionFiltersExecutionPlan(filters);
+            logger.ExceptionFiltersExecutionPlan(filters);
+            logger.ResultFiltersExecutionPlan(filters);
+
+            // Assert
+            Assert.Empty(testSink.Writes);
+        }
+
+        [Fact]
+        public void LogsListOfAuthorizationFilters()
+        {
+            // Arrange
+            var authFilter = Mock.Of<IAuthorizationFilter>();
+            var asyncAuthFilter = Mock.Of<IAsyncAuthorizationFilter>();
+            var orderedAuthFilterMock = new Mock<IOrderedAuthorizeFilter>();
+            orderedAuthFilterMock.SetupGet(f => f.Order).Returns(-100);
+            var orderedAuthFilter = orderedAuthFilterMock.Object;
+            var actionFilter = Mock.Of<IActionFilter>();
+            var asyncActionFilter = Mock.Of<IAsyncActionFilter>();
+            var exceptionFilter = Mock.Of<IExceptionFilter>();
+            var asyncExceptionFilter = Mock.Of<IAsyncExceptionFilter>();
+            var resultFilter = Mock.Of<IResultFilter>();
+            var asyncResultFilter = Mock.Of<IAsyncResultFilter>();
+            var resourceFilter = Mock.Of<IResourceFilter>();
+            var asyncResourceFilter = Mock.Of<IAsyncResourceFilter>();
+            var filters = new IFilterMetadata[]
+            {
+                actionFilter,
+                asyncActionFilter,
+                authFilter,
+                asyncAuthFilter,
+                orderedAuthFilter,
+                exceptionFilter,
+                asyncExceptionFilter,
+                resultFilter,
+                asyncResultFilter,
+                resourceFilter,
+                asyncResourceFilter
+            };
+            var testSink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(testSink, enabled: true);
+            var logger = loggerFactory.CreateLogger("test");
+
+            // Act
+            logger.AuthorizationFiltersExecutionPlan(filters);
+
+            // Assert
+            var write = Assert.Single(testSink.Writes);
+            Assert.Equal(
+                "Execution plan of authorization filters (in the following order): " +
+                $"{authFilter.GetType()}, {asyncAuthFilter.GetType()}, {orderedAuthFilter.GetType()} (Order: -100)",
+                write.State.ToString());
+        }
+
+        [Fact]
+        public void LogsListOfResourceFilters()
+        {
+            // Arrange
+            var authFilter = Mock.Of<IAuthorizationFilter>();
+            var asyncAuthFilter = Mock.Of<IAsyncAuthorizationFilter>();
+            var actionFilter = Mock.Of<IActionFilter>();
+            var asyncActionFilter = Mock.Of<IAsyncActionFilter>();
+            var exceptionFilter = Mock.Of<IExceptionFilter>();
+            var asyncExceptionFilter = Mock.Of<IAsyncExceptionFilter>();
+            var resultFilter = Mock.Of<IResultFilter>();
+            var asyncResultFilter = Mock.Of<IAsyncResultFilter>();
+            var resourceFilter = Mock.Of<IResourceFilter>();
+            var asyncResourceFilter = Mock.Of<IAsyncResourceFilter>();
+            var orderedresourceFilterMock = new Mock<IOrderedResourceFilter>();
+            orderedresourceFilterMock.SetupGet(f => f.Order).Returns(-100);
+            var orderedResourceFilter = orderedresourceFilterMock.Object;
+            var filters = new IFilterMetadata[]
+            {
+                actionFilter,
+                asyncActionFilter,
+                authFilter,
+                asyncAuthFilter,
+                exceptionFilter,
+                asyncExceptionFilter,
+                resultFilter,
+                asyncResultFilter,
+                resourceFilter,
+                asyncResourceFilter,
+                orderedResourceFilter,
+            };
+            var testSink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(testSink, enabled: true);
+            var logger = loggerFactory.CreateLogger("test");
+
+            // Act
+            logger.ResourceFiltersExecutionPlan(filters);
+
+            // Assert
+            var write = Assert.Single(testSink.Writes);
+            Assert.Equal(
+                "Execution plan of resource filters (in the following order): " +
+                $"{resourceFilter.GetType()}, {asyncResourceFilter.GetType()}, {orderedResourceFilter.GetType()} (Order: -100)",
+                write.State.ToString());
+        }
+
+        [Fact]
+        public void LogsListOfActionFilters()
+        {
+            // Arrange
+            var authFilter = Mock.Of<IAuthorizationFilter>();
+            var asyncAuthFilter = Mock.Of<IAsyncAuthorizationFilter>();
+            var actionFilter = Mock.Of<IActionFilter>();
+            var asyncActionFilter = Mock.Of<IAsyncActionFilter>();
+            var orderedActionFilterMock = new Mock<IOrderedActionFilter>();
+            orderedActionFilterMock.SetupGet(f => f.Order).Returns(-100);
+            var orderedActionFilter = orderedActionFilterMock.Object;
+            var exceptionFilter = Mock.Of<IExceptionFilter>();
+            var asyncExceptionFilter = Mock.Of<IAsyncExceptionFilter>();
+            var resultFilter = Mock.Of<IResultFilter>();
+            var asyncResultFilter = Mock.Of<IAsyncResultFilter>();
+            var resourceFilter = Mock.Of<IResourceFilter>();
+            var asyncResourceFilter = Mock.Of<IAsyncResourceFilter>();
+            var filters = new IFilterMetadata[]
+            {
+                actionFilter,
+                asyncActionFilter,
+                orderedActionFilter,
+                authFilter,
+                asyncAuthFilter,
+                exceptionFilter,
+                asyncExceptionFilter,
+                resultFilter,
+                asyncResultFilter,
+                resourceFilter,
+                asyncResourceFilter,
+            };
+            var testSink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(testSink, enabled: true);
+            var logger = loggerFactory.CreateLogger("test");
+
+            // Act
+            logger.ActionFiltersExecutionPlan(filters);
+
+            // Assert
+            var write = Assert.Single(testSink.Writes);
+            Assert.Equal(
+                "Execution plan of action filters (in the following order): " +
+                $"{actionFilter.GetType()}, {asyncActionFilter.GetType()}, {orderedActionFilter.GetType()} (Order: -100)",
+                write.State.ToString());
+        }
+
+        [Fact]
+        public void LogsListOfExceptionFilters()
+        {
+            // Arrange
+            var authFilter = Mock.Of<IAuthorizationFilter>();
+            var asyncAuthFilter = Mock.Of<IAsyncAuthorizationFilter>();
+            var actionFilter = Mock.Of<IActionFilter>();
+            var asyncActionFilter = Mock.Of<IAsyncActionFilter>();
+            var exceptionFilter = Mock.Of<IExceptionFilter>();
+            var asyncExceptionFilter = Mock.Of<IAsyncExceptionFilter>();
+            var orderedExceptionFilterMock = new Mock<IOrderedExceptionFilter>();
+            orderedExceptionFilterMock.SetupGet(f => f.Order).Returns(-100);
+            var orderedExceptionFilter = orderedExceptionFilterMock.Object;
+            var resultFilter = Mock.Of<IResultFilter>();
+            var asyncResultFilter = Mock.Of<IAsyncResultFilter>();
+            var resourceFilter = Mock.Of<IResourceFilter>();
+            var asyncResourceFilter = Mock.Of<IAsyncResourceFilter>();
+            var filters = new IFilterMetadata[]
+            {
+                actionFilter,
+                asyncActionFilter,
+                authFilter,
+                asyncAuthFilter,
+                exceptionFilter,
+                asyncExceptionFilter,
+                orderedExceptionFilter,
+                resultFilter,
+                asyncResultFilter,
+                resourceFilter,
+                asyncResourceFilter,
+            };
+            var testSink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(testSink, enabled: true);
+            var logger = loggerFactory.CreateLogger("test");
+
+            // Act
+            logger.ExceptionFiltersExecutionPlan(filters);
+
+            // Assert
+            var write = Assert.Single(testSink.Writes);
+            Assert.Equal(
+                "Execution plan of exception filters (in the following order): " +
+                $"{exceptionFilter.GetType()}, {asyncExceptionFilter.GetType()}, {orderedExceptionFilter.GetType()} (Order: -100)",
+                write.State.ToString());
+        }
+
+        [Fact]
+        public void LogsListOfResultFilters()
+        {
+            // Arrange
+            var authFilter = Mock.Of<IAuthorizationFilter>();
+            var asyncAuthFilter = Mock.Of<IAsyncAuthorizationFilter>();
+            var actionFilter = Mock.Of<IActionFilter>();
+            var asyncActionFilter = Mock.Of<IAsyncActionFilter>();
+            var exceptionFilter = Mock.Of<IExceptionFilter>();
+            var asyncExceptionFilter = Mock.Of<IAsyncExceptionFilter>();
+            var orderedResultFilterMock = new Mock<IOrderedResultFilter>();
+            orderedResultFilterMock.SetupGet(f => f.Order).Returns(-100);
+            var orderedResultFilter = orderedResultFilterMock.Object;
+            var resultFilter = Mock.Of<IResultFilter>();
+            var asyncResultFilter = Mock.Of<IAsyncResultFilter>();
+            var resourceFilter = Mock.Of<IResourceFilter>();
+            var asyncResourceFilter = Mock.Of<IAsyncResourceFilter>();
+            var filters = new IFilterMetadata[]
+            {
+                actionFilter,
+                asyncActionFilter,
+                authFilter,
+                asyncAuthFilter,
+                exceptionFilter,
+                asyncExceptionFilter,
+                resultFilter,
+                asyncResultFilter,
+                orderedResultFilter,
+                resourceFilter,
+                asyncResourceFilter,
+            };
+            var testSink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(testSink, enabled: true);
+            var logger = loggerFactory.CreateLogger("test");
+
+            // Act
+            logger.ResultFiltersExecutionPlan(filters);
+
+            // Assert
+            var write = Assert.Single(testSink.Writes);
+            Assert.Equal(
+                "Execution plan of result filters (in the following order): " +
+                $"{resultFilter.GetType()}, {asyncResultFilter.GetType()}, {orderedResultFilter.GetType()} (Order: -100)",
+                write.State.ToString());
+        }
+
+        public interface IOrderedAuthorizeFilter : IAuthorizationFilter, IAsyncAuthorizationFilter, IOrderedFilter { }
+
+        public interface IOrderedResourceFilter : IResourceFilter, IAsyncResourceFilter, IOrderedFilter { }
+
+        public interface IOrderedActionFilter : IActionFilter, IAsyncActionFilter, IOrderedFilter { }
+
+        public interface IOrderedExceptionFilter : IExceptionFilter, IAsyncExceptionFilter, IOrderedFilter { }
+
+        public interface IOrderedResultFilter : IResultFilter, IAsyncResultFilter, IOrderedFilter { }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ParameterDefaultValuesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ParameterDefaultValuesTest.cs
new file mode 100644
index 0000000000..0b9b2f7880
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ParameterDefaultValuesTest.cs
@@ -0,0 +1,85 @@
+// 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.
+
+using System;
+using System.ComponentModel;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ParameterDefaultValuesTest
+    {
+        [Theory]
+        [InlineData("DefaultAttributes", new object[] { "hello", true, 10 })]
+        [InlineData("DefaultValues", new object[] { "hello", true, 20 })]
+        [InlineData("DefaultValuesAndAttributes", new object[] { "hello", 20 })]
+        [InlineData("NoDefaultAttributesAndValues", new object[] { null, 0, false, null })]
+        public void GetParameterDefaultValues_ReturnsExpectedValues(string methodName, object[] expectedValues)
+        {
+            // Arrange
+            var methodInfo = typeof(TestObject).GetMethod(methodName);
+
+            // Act
+            var actualValues = ParameterDefaultValues.GetParameterDefaultValues(methodInfo);
+
+            // Assert
+            Assert.Equal(expectedValues, actualValues);
+        }
+
+        [Fact]
+        public void GetParameterDefaultValues_ReturnsExpectedValues_ForStructTypes()
+        {
+            // Arrange
+            var methodInfo = typeof(TestObject).GetMethod("DefaultValuesOfStructTypes");
+
+            // Act
+            var actualValues = ParameterDefaultValues.GetParameterDefaultValues(methodInfo);
+
+            // Assert
+            Assert.Equal(
+                new object[] { default(Guid), default(TimeSpan), default(DateTime), default(DateTimeOffset) },
+                actualValues);
+        }
+
+        private class TestObject
+        {
+            public void DefaultAttributes(
+                [DefaultValue("hello")] string input1,
+                [DefaultValue(true)] bool input2,
+                [DefaultValue(10)] int input3)
+            {
+            }
+
+            public void DefaultValues(
+                string input1 = "hello",
+                bool input2 = true,
+                int input3 = 20)
+            {
+            }
+
+            public void DefaultValuesAndAttributes(
+                [DefaultValue("Hi")] string input1 = "hello",
+                [DefaultValue(10)] int input3 = 20)
+            {
+            }
+
+            public void NoDefaultAttributesAndValues(
+                string input1,
+                int input2,
+                bool input3,
+                TestObject input4)
+            {
+            }
+
+            // Note that default value for DateTime currently throws a FormatException
+            // https://github.com/dotnet/corefx/issues/12338
+            public void DefaultValuesOfStructTypes(
+                Guid guid = default(Guid),
+                TimeSpan timeSpan = default(TimeSpan),
+                DateTime dateTime = default(DateTime),
+                DateTimeOffset dateTimeOffset = default(DateTimeOffset))
+            {
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/PrefixContainerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/PrefixContainerTest.cs
new file mode 100644
index 0000000000..91d925bdab
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/PrefixContainerTest.cs
@@ -0,0 +1,300 @@
+// 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.
+
+using System;
+using System.Linq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class PrefixContainerTest
+    {
+        [Fact]
+        public void ContainsPrefix_EmptyCollection_EmptyString_False()
+        {
+            // Arrange
+            var keys = new string[] { };
+            var container = new PrefixContainer(keys);
+
+            // Act
+            var result = container.ContainsPrefix(string.Empty);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void ContainsPrefix_HasEntries_EmptyString_True()
+        {
+            // Arrange
+            var keys = new string[] { "some.prefix" };
+            var container = new PrefixContainer(keys);
+
+            // Act
+            var result = container.ContainsPrefix(string.Empty);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData("a")]
+        [InlineData("abc")]
+        [InlineData("bc")]
+        [InlineData("d")]
+        public void ContainsPrefix_ReturnsTrue_IfTheContainerHasAnExactMatch(string prefix)
+        {
+            // Arrange
+            var keys = new string[] { "bc", "a", "abc", "d" };
+            var container = new PrefixContainer(keys);
+
+            // Act
+            var result = container.ContainsPrefix(prefix);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData("a")]
+        [InlineData("b")]
+        [InlineData("c")]
+        [InlineData("d")]
+        public void ContainsPrefix_HasEntries_NoMatch(string prefix)
+        {
+            // Arrange
+            var keys = new string[] { "ax", "bx", "cx", "dx" };
+            var container = new PrefixContainer(keys);
+
+            // Act
+            var result = container.ContainsPrefix(prefix);
+
+            // Assert
+            Assert.False(result);
+        }
+
+
+        [Theory]
+        [InlineData("a")]
+        [InlineData("b")]
+        [InlineData("b.xy")]
+        [InlineData("c")]
+        [InlineData("c.x")]
+        [InlineData("c.x.y")]
+        [InlineData("d")]
+        [InlineData("d.x")]
+        [InlineData("d.x.z")]
+        public void ContainsPrefix_HasEntries_PrefixMatch_WithDot(string prefix)
+        {
+            // Arrange
+            var keys = new string[] { "a.x", "b.xy", "c.x.y", "d.x.z[0]" };
+            var container = new PrefixContainer(keys);
+
+            // Act
+            var result = container.ContainsPrefix(prefix);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData("ab")]
+        [InlineData("a.b.c")]
+        [InlineData("a.b[1]")]
+        [InlineData("a.b0")]
+        public void ContainsPrefix_ReturnsFalse_IfPrefixDoesNotMatch(string prefix)
+        {
+            // Arrange
+            var keys = new string[] { "a.b", "a.bc", "a.b[c]", "a.b[0]" };
+            var container = new PrefixContainer(keys);
+
+            // Act
+            var result = container.ContainsPrefix(prefix);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData("a")]
+        [InlineData("a[x]")]
+        [InlineData("d[x]")]
+        [InlineData("d[x].y")]
+        [InlineData("e")]
+        [InlineData("e.a.b")]
+        [InlineData("e.a.b[foo]")]
+        [InlineData("e.a.b[foo].bar")]
+        public void ContainsPrefix_HasEntries_PrefixMatch_WithSquareBrace(string prefix)
+        {
+            // Arrange
+            var keys = new string[] { "a[x]", "d[x].y", "e.a.b[foo].bar" };
+            var container = new PrefixContainer(keys);
+
+            // Act
+            var result = container.ContainsPrefix(prefix);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData(1)]
+        [InlineData(2)]
+        [InlineData(3)]
+        [InlineData(4)]
+        [InlineData(5)]
+        public void ContainsPrefix_HasEntries_PartialAndPrefixMatch_WithDot(int partialMatches)
+        {
+            // Arrange
+            var keys = new string[partialMatches + 1];
+            for (var i = 0; i < partialMatches; i++)
+            {
+                keys[i] = $"aa[{i}]";
+            }
+            keys[partialMatches] = "a.b"; // Sorted before all "aa" keys.
+            var container = new PrefixContainer(keys);
+
+            // Act
+            var result = container.ContainsPrefix("a");
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData(1)]
+        [InlineData(2)]
+        [InlineData(3)]
+        [InlineData(4)]
+        [InlineData(5)]
+        public void ContainsPrefix_HasEntries_PartialAndPrefixMatch_WithSquareBrace(int partialMatches)
+        {
+            // Arrange
+            var keys = new string[partialMatches + 1];
+            for (var i = 0; i < partialMatches; i++)
+            {
+                keys[i] = $"aa[{i}]";
+            }
+            keys[partialMatches] = "a[0]"; // Sorted after all "aa" keys.
+            var container = new PrefixContainer(keys);
+
+            // Act
+            var result = container.ContainsPrefix("a");
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData("foo")]
+        public void GetKeysFromPrefix_ReturnsEmptySequenceWhenContainerIsEmpty(string prefix)
+        {
+            // Arrange
+            var keys = new string[0];
+            var container = new PrefixContainer(keys);
+
+            // Act
+            var result = container.GetKeysFromPrefix(prefix);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public void GetKeysFromPrefix_ReturnsUniqueTopLevelEntries_WhenPrefixIsEmpty()
+        {
+            // Arrange
+            var keys = new[] { "[0].name", "[0].address.street", "[item1].name", "[item1].age", "foo", "foo.bar" };
+            var container = new PrefixContainer(keys);
+
+            // Act
+            var result = container.GetKeysFromPrefix(prefix: string.Empty);
+
+            // Assert
+            Assert.Collection(result.OrderBy(k => k.Key, StringComparer.OrdinalIgnoreCase),
+                item =>
+                {
+                    Assert.Equal("0", item.Key);
+                    Assert.Equal("[0]", item.Value);
+                },
+                item =>
+                {
+                    Assert.Equal("foo", item.Key);
+                    Assert.Equal("foo", item.Value);
+                },
+                item =>
+                {
+                    Assert.Equal("item1", item.Key);
+                    Assert.Equal("[item1]", item.Value);
+                });
+        }
+
+        [Fact]
+        public void GetKeysFromPrefix_ReturnsEmptyDictionaryWhenNoKeysStartWithPrefix()
+        {
+            // Arrange
+            var keys = new[] { "foo[0].name", "foo.age", "[1].name", "[item].age" };
+            var container = new PrefixContainer(keys);
+
+            // Act
+            var result = container.GetKeysFromPrefix("baz");
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public void GetKeysFromPrefix_ReturnsSubKeysThatStartWithPrefix()
+        {
+            // Arrange
+            var keys = new[] { "foo[0].name", "foo.age", "foo[1].name", "food[item].spice" };
+            var container = new PrefixContainer(keys);
+
+            // Act
+            var result = container.GetKeysFromPrefix("foo");
+
+            // Assert
+            Assert.Collection(result.OrderBy(k => k.Key, StringComparer.OrdinalIgnoreCase),
+                item =>
+                {
+                    Assert.Equal("0", item.Key);
+                    Assert.Equal("foo[0]", item.Value);
+                },
+                item =>
+                {
+                    Assert.Equal("1", item.Key);
+                    Assert.Equal("foo[1]", item.Value);
+                },
+                item =>
+                {
+                    Assert.Equal("age", item.Key);
+                    Assert.Equal("foo.age", item.Value);
+                });
+        }
+
+        [Fact]
+        public void GetKeysFromPrefix_ReturnsSubKeysThatStartWithPrefix_ForNestedSubKeys()
+        {
+            // Arrange
+            var keys = new[] { "person[0].address[0].street", "person[0].address[1].street", "person[0].address[1].zip" };
+            var container = new PrefixContainer(keys);
+
+            // Act
+            var result = container.GetKeysFromPrefix("person[0].address");
+
+            // Assert
+            Assert.Collection(result.OrderBy(k => k.Key, StringComparer.OrdinalIgnoreCase),
+                item =>
+                {
+                    Assert.Equal("0", item.Key);
+                    Assert.Equal("person[0].address[0]", item.Value);
+                },
+                item =>
+                {
+                    Assert.Equal("1", item.Key);
+                    Assert.Equal("person[0].address[1]", item.Value);
+                });
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ReferenceEqualityComparerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ReferenceEqualityComparerTest.cs
new file mode 100644
index 0000000000..956e34ad4c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ReferenceEqualityComparerTest.cs
@@ -0,0 +1,80 @@
+// 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.
+
+using System;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ReferenceEqualityComparerTest
+    {
+        [Fact]
+        public void Equals_ReturnsTrue_ForSameObject()
+        {
+            var o = new object();
+            Assert.True(ReferenceEqualityComparer.Instance.Equals(o, o));
+        }
+
+        [Fact]
+        public void Equals_ReturnsFalse_ForDifferentObject()
+        {
+            var o1 = new object();
+            var o2 = new object();
+
+            Assert.False(ReferenceEqualityComparer.Instance.Equals(o1, o2));
+        }
+
+        [Fact]
+        public void Equals_DoesntCall_OverriddenEqualsOnTheType()
+        {
+            var t1 = new TypeThatOverridesEquals();
+            var t2 = new TypeThatOverridesEquals();
+
+            // Act & Assert (does not throw)
+            ReferenceEqualityComparer.Instance.Equals(t1, t2);
+        }
+
+        [Fact]
+        public void Equals_ReturnsFalse_ValueType()
+        {
+            Assert.False(ReferenceEqualityComparer.Instance.Equals(42, 42));
+        }
+
+        [Fact]
+        public void Equals_NullEqualsNull()
+        {
+            var comparer = ReferenceEqualityComparer.Instance;
+            Assert.True(comparer.Equals(null, null));
+        }
+
+        [Fact]
+        public void GetHashCode_ReturnsSameValueForSameObject()
+        {
+            var o = new object();
+            var comparer = ReferenceEqualityComparer.Instance;
+            Assert.Equal(comparer.GetHashCode(o), comparer.GetHashCode(o));
+        }
+
+        [Fact]
+        public void GetHashCode_DoesNotThrowForNull()
+        {
+            var comparer = ReferenceEqualityComparer.Instance;
+
+            // Act & Assert (does not throw)
+            comparer.GetHashCode(null);
+        }
+
+        private class TypeThatOverridesEquals
+        {
+            public override bool Equals(object obj)
+            {
+                throw new InvalidOperationException();
+            }
+
+            public override int GetHashCode()
+            {
+                throw new InvalidOperationException();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/RequestFormLimitsFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/RequestFormLimitsFilterTest.cs
new file mode 100644
index 0000000000..a36dd060e4
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/RequestFormLimitsFilterTest.cs
@@ -0,0 +1,142 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Logging.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class RequestFormLimitsFilterTest
+    {
+        [Fact]
+        public void SetsRequestFormFeature_WhenFeatureIsNotPresent()
+        {
+            // Arrange
+            var requestFormLimitsFilter = new RequestFormLimitsFilter(NullLoggerFactory.Instance);
+            requestFormLimitsFilter.FormOptions = new FormOptions();
+            var authorizationFilterContext = CreateauthorizationFilterContext(
+                new IFilterMetadata[] { requestFormLimitsFilter });
+            // Set to null explicitly as we want to make sure the filter adds one
+            authorizationFilterContext.HttpContext.Features.Set<IFormFeature>(null);
+
+            // Act
+            requestFormLimitsFilter.OnAuthorization(authorizationFilterContext);
+
+            // Assert
+            var formFeature = authorizationFilterContext.HttpContext.Features.Get<IFormFeature>();
+            Assert.IsType<FormFeature>(formFeature);
+        }
+
+        [Fact]
+        public void SetsRequestFormFeature_WhenFeatureIsPresent_ButFormIsNull()
+        {
+            // Arrange
+            var requestFormLimitsFilter = new RequestFormLimitsFilter(NullLoggerFactory.Instance);
+            requestFormLimitsFilter.FormOptions = new FormOptions();
+            var authorizationFilterContext = CreateauthorizationFilterContext(
+                new IFilterMetadata[] { requestFormLimitsFilter });
+            var oldFormFeature = new FormFeature(authorizationFilterContext.HttpContext.Request);
+            // Set to null explicitly as we want to make sure the filter adds one
+            authorizationFilterContext.HttpContext.Features.Set<IFormFeature>(oldFormFeature);
+
+            // Act
+            requestFormLimitsFilter.OnAuthorization(authorizationFilterContext);
+
+            // Assert
+            var actualFormFeature = authorizationFilterContext.HttpContext.Features.Get<IFormFeature>();
+            Assert.NotSame(oldFormFeature, actualFormFeature);
+        }
+
+        [Fact]
+        public void LogsCannotApplyRequestFormLimits()
+        {
+            // Arrange
+            var sink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
+
+            var requestFormLimitsFilter = new RequestFormLimitsFilter(loggerFactory);
+            requestFormLimitsFilter.FormOptions = new FormOptions();
+            var authorizationFilterContext = CreateauthorizationFilterContext(
+                new IFilterMetadata[] { requestFormLimitsFilter });
+            authorizationFilterContext.HttpContext.Request.Form = new FormCollection(null);
+
+            // Act
+            requestFormLimitsFilter.OnAuthorization(authorizationFilterContext);
+
+            // Assert
+            var write = Assert.Single(sink.Writes);
+            Assert.Equal(LogLevel.Warning, write.LogLevel);
+            Assert.Equal(
+                "Unable to apply configured form options since the request form has already been read.",
+                write.State.ToString());
+        }
+
+        [Fact]
+        public void LogsAppliedRequestFormLimits_WhenFormFeatureIsNull()
+        {
+            // Arrange
+            var sink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
+
+            var requestFormLimitsFilter = new RequestFormLimitsFilter(loggerFactory);
+            requestFormLimitsFilter.FormOptions = new FormOptions();
+            var authorizationFilterContext = CreateauthorizationFilterContext(
+                new IFilterMetadata[] { requestFormLimitsFilter });
+            // Set to null explicitly as we want to make sure the filter adds one
+            authorizationFilterContext.HttpContext.Features.Set<IFormFeature>(null);
+
+            // Act
+            requestFormLimitsFilter.OnAuthorization(authorizationFilterContext);
+
+            // Assert
+            var write = Assert.Single(sink.Writes);
+            Assert.Equal(LogLevel.Debug, write.LogLevel);
+            Assert.Equal(
+                "Applied the configured form options on the current request.",
+                write.State.ToString());
+        }
+
+        [Fact]
+        public void LogsAppliedRequestFormLimits_WhenFormFeatureIsPresent_ButFormIsNull()
+        {
+            // Arrange
+            var sink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
+
+            var requestFormLimitsFilter = new RequestFormLimitsFilter(loggerFactory);
+            requestFormLimitsFilter.FormOptions = new FormOptions();
+            var authorizationFilterContext = CreateauthorizationFilterContext(
+                new IFilterMetadata[] { requestFormLimitsFilter });
+            // Set to null explicitly as we want to make sure the filter adds one
+            authorizationFilterContext.HttpContext.Features.Set<IFormFeature>(
+                new FormFeature(authorizationFilterContext.HttpContext.Request));
+
+            // Act
+            requestFormLimitsFilter.OnAuthorization(authorizationFilterContext);
+
+            // Assert
+            var write = Assert.Single(sink.Writes);
+            Assert.Equal(LogLevel.Debug, write.LogLevel);
+            Assert.Equal(
+                "Applied the configured form options on the current request.",
+                write.State.ToString());
+        }
+
+        private static AuthorizationFilterContext CreateauthorizationFilterContext(IFilterMetadata[] filters)
+        {
+            return new AuthorizationFilterContext(CreateActionContext(), filters);
+        }
+
+        private static ActionContext CreateActionContext()
+        {
+            return new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/RequestSizeLimitFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/RequestSizeLimitFilterTest.cs
new file mode 100644
index 0000000000..82c040508d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/RequestSizeLimitFilterTest.cs
@@ -0,0 +1,155 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Logging.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class RequestSizeLimitFilterTest
+    {
+        [Fact]
+        public void SetsMaxRequestBodySize()
+        {
+            // Arrange
+            var requestSizeLimitResourceFilter = new RequestSizeLimitFilter(NullLoggerFactory.Instance);
+            requestSizeLimitResourceFilter.Bytes = 12345;
+            var authorizationFilterContext = CreateauthorizationFilterContext(new IFilterMetadata[] { requestSizeLimitResourceFilter });
+
+            var httpMaxRequestBodySize = new TestHttpMaxRequestBodySizeFeature();
+            authorizationFilterContext.HttpContext.Features.Set<IHttpMaxRequestBodySizeFeature>(httpMaxRequestBodySize);
+
+            // Act
+            requestSizeLimitResourceFilter.OnAuthorization(authorizationFilterContext);
+
+            // Assert
+            Assert.Equal(12345, httpMaxRequestBodySize.MaxRequestBodySize);
+        }
+
+        [Fact]
+        public void SkipsWhenOverridden()
+        {
+            // Arrange
+            var requestSizeLimitResourceFilter = new RequestSizeLimitFilter(NullLoggerFactory.Instance);
+            requestSizeLimitResourceFilter.Bytes = 12345;
+            var requestSizeLimitResourceFilterFinal = new RequestSizeLimitFilter(NullLoggerFactory.Instance);
+            requestSizeLimitResourceFilterFinal.Bytes = 0;
+            var authorizationFilterContext = CreateauthorizationFilterContext(
+                new IFilterMetadata[] { requestSizeLimitResourceFilter, requestSizeLimitResourceFilterFinal });
+
+            var httpMaxRequestBodySize = new TestHttpMaxRequestBodySizeFeature();
+            authorizationFilterContext.HttpContext.Features.Set<IHttpMaxRequestBodySizeFeature>(httpMaxRequestBodySize);
+
+            // Act
+            requestSizeLimitResourceFilter.OnAuthorization(authorizationFilterContext);
+            requestSizeLimitResourceFilterFinal.OnAuthorization(authorizationFilterContext);
+
+            // Assert
+            Assert.Equal(0, httpMaxRequestBodySize.MaxRequestBodySize);
+            Assert.Equal(1, httpMaxRequestBodySize.Count);
+        }
+
+        [Fact]
+        public void LogsFeatureNotFound()
+        {
+            // Arrange
+            var sink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
+
+            var requestSizeLimitResourceFilter = new RequestSizeLimitFilter(loggerFactory);
+            requestSizeLimitResourceFilter.Bytes = 12345;
+            var authorizationFilterContext = CreateauthorizationFilterContext(new IFilterMetadata[] { requestSizeLimitResourceFilter });
+
+            // Act
+            requestSizeLimitResourceFilter.OnAuthorization(authorizationFilterContext);
+
+            // Assert
+            var write = Assert.Single(sink.Writes);
+            Assert.Equal($"A request body size limit could not be applied. This server does not support the IHttpRequestBodySizeFeature.",
+                write.State.ToString());
+        }
+
+        [Fact]
+        public void LogsFeatureIsReadOnly()
+        {
+            // Arrange
+            var sink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
+
+            var requestSizeLimitResourceFilter = new RequestSizeLimitFilter(loggerFactory);
+            requestSizeLimitResourceFilter.Bytes = 12345;
+            var authorizationFilterContext = CreateauthorizationFilterContext(new IFilterMetadata[] { requestSizeLimitResourceFilter });
+
+            var httpMaxRequestBodySize = new TestHttpMaxRequestBodySizeFeature();
+            httpMaxRequestBodySize.IsReadOnly = true;
+            authorizationFilterContext.HttpContext.Features.Set<IHttpMaxRequestBodySizeFeature>(httpMaxRequestBodySize);
+
+            // Act
+            requestSizeLimitResourceFilter.OnAuthorization(authorizationFilterContext);
+
+            // Assert
+            var write = Assert.Single(sink.Writes);
+            Assert.Equal($"A request body size limit could not be applied. The IHttpRequestBodySizeFeature for the server is read-only.", write.State.ToString());
+        }
+
+        [Fact]
+        public void LogsMaxRequestBodySizeSet()
+        {
+            // Arrange
+            var sink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
+
+            var requestSizeLimitResourceFilter = new RequestSizeLimitFilter(loggerFactory);
+            requestSizeLimitResourceFilter.Bytes = 12345;
+            var authorizationFilterContext = CreateauthorizationFilterContext(new IFilterMetadata[] { requestSizeLimitResourceFilter });
+
+            var httpMaxRequestBodySize = new TestHttpMaxRequestBodySizeFeature();
+            authorizationFilterContext.HttpContext.Features.Set<IHttpMaxRequestBodySizeFeature>(httpMaxRequestBodySize);
+
+            // Act
+            requestSizeLimitResourceFilter.OnAuthorization(authorizationFilterContext);
+
+            // Assert
+            var write = Assert.Single(sink.Writes);
+            Assert.Equal($"The maximum request body size has been set to 12345.", write.State.ToString());
+        }
+
+        private static AuthorizationFilterContext CreateauthorizationFilterContext(IFilterMetadata[] filters)
+        {
+            return new AuthorizationFilterContext(CreateActionContext(), filters);
+        }
+
+        private static ActionContext CreateActionContext()
+        {
+            return new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+        }
+
+        private class TestHttpMaxRequestBodySizeFeature : IHttpMaxRequestBodySizeFeature
+        {
+            private long? _maxRequestBodySize;
+
+            public bool IsReadOnly { get; set; }
+
+            public long? MaxRequestBodySize
+            {
+                get
+                {
+                    return _maxRequestBodySize;
+                }
+                set
+                {
+                    _maxRequestBodySize = value;
+                    Count++;
+                }
+            }
+
+            public int Count { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ResponseCacheFilterExecutorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ResponseCacheFilterExecutorTest.cs
new file mode 100644
index 0000000000..93969159db
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ResponseCacheFilterExecutorTest.cs
@@ -0,0 +1,538 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.ResponseCaching;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Net.Http.Headers;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ResponseCacheFilterExecutorTest
+    {
+        [Fact]
+        public void Execute_DoesNotThrow_WhenNoStoreIsTrue()
+        {
+            // Arrange
+            var executor = new ResponseCacheFilterExecutor(
+                new CacheProfile
+                {
+                    NoStore = true,
+                    Duration = null
+                });
+            var context = GetActionExecutingContext();
+
+            // Act
+            executor.Execute(context);
+
+            // Assert
+            Assert.Equal("no-store", context.HttpContext.Response.Headers["Cache-control"]);
+        }
+
+        [Fact]
+        public void Execute_DoesNotThrowIfDurationIsNotSet_WhenNoStoreIsFalse()
+        {
+            // Arrange, Act
+            var executor = new ResponseCacheFilterExecutor(
+                new CacheProfile
+                {
+                    Duration = null
+                });
+
+            // Assert
+            Assert.NotNull(executor);
+        }
+
+        [Fact]
+        public void Execute_ThrowsIfDurationIsNotSet_WhenNoStoreIsFalse()
+        {
+            // Arrange
+            var executor = new ResponseCacheFilterExecutor(
+                new CacheProfile()
+                {
+                    Duration = null
+                });
+
+            var context = GetActionExecutingContext();
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => executor.Execute(context));
+            Assert.Equal("If the 'NoStore' property is not set to true, 'Duration' property must be specified.",
+                ex.Message);
+        }
+
+        public static TheoryData<CacheProfile, string> CacheControlData
+        {
+            get
+            {
+                return new TheoryData<CacheProfile, string>
+                {
+                    {
+                        new CacheProfile
+                        {
+                            Duration = 0,
+                            Location = ResponseCacheLocation.Any,
+                            NoStore = true,
+                            VaryByHeader = null
+                        },
+                        "no-store"
+                    },
+                    // If no-store is set, then location is ignored.
+                    {
+                        new CacheProfile
+                        {
+                            Duration = 0,
+                            Location = ResponseCacheLocation.Client,
+                            NoStore = true,
+                            VaryByHeader = null
+                        },
+                        "no-store"
+                    },
+                    {
+                        new CacheProfile
+                        {
+                            Duration = 0,
+                            Location = ResponseCacheLocation.Any,
+                            NoStore = true,
+                            VaryByHeader = null
+                        },
+                        "no-store"
+                    },
+                    // If no-store is set, then duration is ignored.
+                    {
+                        new CacheProfile
+                        {
+                            Duration = 100,
+                            Location = ResponseCacheLocation.Any,
+                            NoStore = true,
+                            VaryByHeader = null
+                        },
+                        "no-store"
+                    },
+                    {
+                        new CacheProfile
+                        {
+                            Duration = 10,
+                            Location = ResponseCacheLocation.Client,
+                            NoStore = false,
+                            VaryByHeader = null
+                        },
+                        "private,max-age=10"
+                    },
+                    {
+                        new CacheProfile
+                        {
+                            Duration = 10,
+                            Location = ResponseCacheLocation.Any,
+                            NoStore = false,
+                            VaryByHeader = null
+                        },
+                        "public,max-age=10"
+                    },
+                    {
+                        new CacheProfile
+                        {
+                            Duration = 10,
+                            Location = ResponseCacheLocation.None,
+                            NoStore = false,
+                            VaryByHeader = null
+                        },
+                        "no-cache,max-age=10"
+                    },
+                    {
+                        new CacheProfile
+                        {
+                            Duration = 31536000,
+                            Location = ResponseCacheLocation.Any,
+                            NoStore = false,
+                            VaryByHeader = null
+                        },
+                        "public,max-age=31536000"
+                    },
+                    {
+                        new CacheProfile
+                        {
+                            Duration = 20,
+                            Location = ResponseCacheLocation.Any,
+                            NoStore = false,
+                            VaryByHeader = null
+                        },
+                        "public,max-age=20"
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(CacheControlData))]
+        public void Execute_CanSetCacheControlHeaders(CacheProfile cacheProfile, string output)
+        {
+            // Arrange
+            var executor = new ResponseCacheFilterExecutor(cacheProfile);
+            var context = GetActionExecutingContext();
+
+            // Act
+            executor.Execute(context);
+
+            // Assert
+            Assert.Equal(output, context.HttpContext.Response.Headers["Cache-control"]);
+        }
+
+        public static TheoryData<CacheProfile, string> NoStoreData
+        {
+            get
+            {
+                return new TheoryData<CacheProfile, string>
+                {
+                    // If no-store is set, then location is ignored.
+                    {
+                        new CacheProfile
+                        {
+                            Duration = 0,
+                            Location = ResponseCacheLocation.Client,
+                            NoStore = true,
+                            VaryByHeader = null
+                        },
+                        "no-store"
+                    },
+                    {
+                        new CacheProfile
+                        {
+                            Duration = 0,
+                            Location = ResponseCacheLocation.Any,
+                            NoStore = true,
+                            VaryByHeader = null
+                        },
+                        "no-store"
+                    },
+                    // If no-store is set, then duration is ignored.
+                    {
+                        new CacheProfile
+                        {
+                            Duration = 100,
+                            Location = ResponseCacheLocation.Any,
+                            NoStore = true,
+                            VaryByHeader = null
+                        },
+                        "no-store"
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(NoStoreData))]
+        public void Execute_DoesNotSetLocationOrDuration_IfNoStoreIsSet(CacheProfile cacheProfile, string output)
+        {
+            // Arrange
+            var executor = new ResponseCacheFilterExecutor(cacheProfile);
+            var context = GetActionExecutingContext();
+
+            // Act
+            executor.Execute(context);
+
+            // Assert
+            Assert.Equal(output, context.HttpContext.Response.Headers["Cache-control"]);
+        }
+
+        public static TheoryData<CacheProfile, string, string> VaryByHeaderData
+        {
+            get
+            {
+                return new TheoryData<CacheProfile, string, string>
+                {
+                    {
+                        new CacheProfile
+                        {
+                            Duration = 10,
+                            Location = ResponseCacheLocation.Any,
+                            NoStore = false,
+                            VaryByHeader = "Accept"
+                        },
+                        "Accept",
+                        "public,max-age=10"
+                    },
+                    {
+                        new CacheProfile
+                        {
+                            Duration = 0,
+                            Location = ResponseCacheLocation.Any,
+                            NoStore = true,
+                            VaryByHeader = "Accept"
+                        },
+                        "Accept",
+                        "no-store"
+                    },
+                    {
+                        new CacheProfile
+                        {
+                            Duration = 10,
+                            Location = ResponseCacheLocation.Client,
+                            NoStore = false,
+                            VaryByHeader = "Accept"
+                        },
+                        "Accept",
+                        "private,max-age=10"
+                    },
+                    {
+                        new CacheProfile
+                        {
+                            Duration = 10,
+                            Location = ResponseCacheLocation.Client,
+                            NoStore = false,
+                            VaryByHeader = "Test"
+                        },
+                        "Test",
+                        "private,max-age=10"
+                    },
+                    {
+                        new CacheProfile
+                        {
+                            Duration = 31536000,
+                            Location = ResponseCacheLocation.Any,
+                            NoStore = false,
+                            VaryByHeader = "Test"
+                        },
+                        "Test",
+                        "public,max-age=31536000"
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(VaryByHeaderData))]
+        public void ResponseCacheCanSetVaryByHeader(CacheProfile cacheProfile, string varyOutput, string cacheControlOutput)
+        {
+            // Arrange
+            var executor = new ResponseCacheFilterExecutor(cacheProfile);
+            var context = GetActionExecutingContext();
+
+            // Act
+            executor.Execute(context);
+
+            // Assert
+            Assert.Equal(varyOutput, context.HttpContext.Response.Headers["Vary"]);
+            Assert.Equal(cacheControlOutput, context.HttpContext.Response.Headers["Cache-control"]);
+        }
+
+        public static TheoryData<CacheProfile, string[], string> VaryByQueryKeyData
+        {
+            get
+            {
+                return new TheoryData<CacheProfile, string[], string>
+                {
+                    {
+                        new CacheProfile
+                        {
+                            Duration = 10,
+                            Location = ResponseCacheLocation.Any,
+                            NoStore = false,
+                            VaryByQueryKeys = new[] { "Accept" }
+                        },
+                        new[] { "Accept" },
+                        "public,max-age=10"
+                    },
+                    {
+                        new CacheProfile
+                        {
+                            Duration = 0,
+                            Location = ResponseCacheLocation.Any,
+                            NoStore = true,
+                            VaryByQueryKeys = new[] { "Accept" }
+                        },
+                        new[] { "Accept" },
+                        "no-store"
+                    },
+                    {
+                        new CacheProfile
+                        {
+                            Duration = 10,
+                            Location = ResponseCacheLocation.Client,
+                            NoStore = false,
+                            VaryByQueryKeys = new[] { "Accept" }
+                        },
+                        new[] { "Accept" },
+                        "private,max-age=10"
+                    },
+                    {
+                        new CacheProfile
+                        {
+                            Duration = 10,
+                            Location = ResponseCacheLocation.Client,
+                            NoStore = false,
+                            VaryByQueryKeys = new[] { "Accept", "Test" }
+                        },
+                        new[] { "Accept", "Test" },
+                        "private,max-age=10"
+                    },
+                    {
+
+                        new CacheProfile
+                        {
+                            Duration = 31536000,
+                            Location = ResponseCacheLocation.Any,
+                            NoStore = false,
+                            VaryByQueryKeys = new[] { "Accept", "Test" }
+                        },
+                        new[] { "Accept", "Test" },
+                        "public,max-age=31536000"
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(VaryByQueryKeyData))]
+        public void ResponseCacheCanSetVaryByQueryKeys(CacheProfile cacheProfile, string[] varyOutput, string cacheControlOutput)
+        {
+            // Arrange
+            var executor = new ResponseCacheFilterExecutor(cacheProfile);
+            var context = GetActionExecutingContext();
+            context.HttpContext.Features.Set<IResponseCachingFeature>(new ResponseCachingFeature());
+
+            // Acts
+            executor.Execute(context);
+
+            // Assert
+            Assert.Equal(varyOutput, context.HttpContext.Features.Get<IResponseCachingFeature>().VaryByQueryKeys);
+            Assert.Equal(cacheControlOutput, context.HttpContext.Response.Headers[HeaderNames.CacheControl]);
+        }
+
+        [Fact]
+        public void NonEmptyVaryByQueryKeys_WithoutConfiguringMiddleware_Throws()
+        {
+            // Arrange
+            var executor = new ResponseCacheFilterExecutor(
+                new CacheProfile
+                {
+                    Duration = 0,
+                    Location = ResponseCacheLocation.None,
+                    NoStore = true,
+                    VaryByHeader = null,
+                    VaryByQueryKeys = new[] { "Test" }
+                });
+            var context = GetActionExecutingContext();
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => executor.Execute(context));
+            Assert.Equal("'VaryByQueryKeys' requires the response cache middleware.", exception.Message);
+        }
+
+        [Fact]
+        public void SetsPragmaOnNoCache()
+        {
+            // Arrange
+            var executor = new ResponseCacheFilterExecutor(
+                new CacheProfile
+                {
+                    Duration = 0,
+                    Location = ResponseCacheLocation.None,
+                    NoStore = true,
+                    VaryByHeader = null
+                });
+            var context = GetActionExecutingContext();
+
+            // Act
+            executor.Execute(context);
+
+            // Assert
+            Assert.Equal("no-store,no-cache", context.HttpContext.Response.Headers["Cache-control"]);
+            Assert.Equal("no-cache", context.HttpContext.Response.Headers["Pragma"]);
+        }
+
+        [Fact]
+        public void FilterDurationProperty_OverridesCachePolicySetting()
+        {
+            // Arrange
+            var executor = new ResponseCacheFilterExecutor(
+                new CacheProfile
+                {
+                    Duration = 10
+                });
+            executor.Duration = 20;
+            var context = GetActionExecutingContext();
+
+            // Act
+            executor.Execute(context);
+
+            // Assert
+            Assert.Equal("public,max-age=20", context.HttpContext.Response.Headers["Cache-control"]);
+        }
+
+        [Fact]
+        public void FilterLocationProperty_OverridesCachePolicySetting()
+        {
+            // Arrange
+            var executor = new ResponseCacheFilterExecutor(
+                new CacheProfile
+                {
+                    Duration = 10,
+                    Location = ResponseCacheLocation.None
+                });
+            executor.Location = ResponseCacheLocation.Client;
+            var context = GetActionExecutingContext();
+
+            // Act
+            executor.Execute(context);
+
+            // Assert
+            Assert.Equal("private,max-age=10", context.HttpContext.Response.Headers["Cache-control"]);
+        }
+
+        [Fact]
+        public void FilterNoStoreProperty_OverridesCachePolicySetting()
+        {
+            // Arrange
+            var executor = new ResponseCacheFilterExecutor(
+                new CacheProfile
+                {
+                    NoStore = true
+                });
+            executor.NoStore = false;
+            executor.Duration = 10;
+            var context = GetActionExecutingContext();
+
+            // Act
+            executor.Execute(context);
+
+            // Assert
+            Assert.Equal("public,max-age=10", context.HttpContext.Response.Headers["Cache-control"]);
+        }
+
+        [Fact]
+        public void FilterVaryByProperty_OverridesCachePolicySetting()
+        {
+            // Arrange
+            var executor = new ResponseCacheFilterExecutor(
+                new CacheProfile
+                {
+                    NoStore = true,
+                    VaryByHeader = "Accept"
+                });
+            executor.VaryByHeader = "Test";
+            var context = GetActionExecutingContext();
+
+            // Act
+            executor.Execute(context);
+
+            // Assert
+            Assert.Equal("Test", context.HttpContext.Response.Headers["Vary"]);
+        }
+
+        private ActionExecutingContext GetActionExecutingContext(List<IFilterMetadata> filters = null)
+        {
+            return new ActionExecutingContext(
+                new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor()),
+                filters ?? new List<IFilterMetadata>(),
+                new Dictionary<string, object>(),
+                new object());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ResponseContentTypeHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ResponseContentTypeHelperTest.cs
new file mode 100644
index 0000000000..9e1e31edec
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ResponseContentTypeHelperTest.cs
@@ -0,0 +1,145 @@
+// 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.
+
+using System.Text;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.Net.Http.Headers;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ResponseContentTypeHelperTest
+    {
+        public static TheoryData<MediaTypeHeaderValue, string, string> ResponseContentTypeData
+        {
+            get
+            {
+                // contentType, responseContentType, expectedContentType
+                return new TheoryData<MediaTypeHeaderValue, string, string>
+                {
+                    // No explicit content type is provided, fall-back to the default content type
+                    {
+                        null,
+                        null,
+                        "text/default; p1=p1-value; charset=utf-8"
+                    },
+
+                    // Content type is set explicitly without encoding on action result. No charset parameter added in
+                    // expected content type
+                    {
+                        new MediaTypeHeaderValue("text/foo"),
+                        null,
+                        "text/foo"
+                    },
+
+                    // Content type is set explicitly with encoding on action result. Expected content type
+                    // has the charset
+                    {
+                        MediaTypeHeaderValue.Parse("text/foo; charset=us-ascii"),
+                        null,
+                        "text/foo; charset=us-ascii"
+                    },
+
+                    // Content type is set explicitly without encoding and additional parameters on action result
+                    // Expected content type has the additional parameters but with no charset.
+                    {
+                        MediaTypeHeaderValue.Parse("text/foo; p1=p1-value"),
+                        null,
+                        "text/foo; p1=p1-value"
+                    },
+
+                    // Content type is set explicitly with encoding and additional parameters on action result
+                    // Expected content type has the additional parameters and the charset.
+                    {
+                        MediaTypeHeaderValue.Parse("text/foo; p1=p1-value; charset=us-ascii"),
+                        null,
+                        "text/foo; p1=p1-value; charset=us-ascii"
+                    },
+
+                    // Content type is set explicitly without encoding on http response.
+                    // No charset parameter added in expected content type
+                    {
+                        null,
+                        "text/bar",
+                        "text/bar"
+                    },
+
+                    // Content type is set explicitly without encoding and additional parameters on http response
+                    // No charset parameter added in expected content type
+                    {
+                        null,
+                        "text/bar; p1=p1-value",
+                        "text/bar; p1=p1-value"
+                    },
+
+                    // Content type is set explicitly with encoding and additional parameters on http response
+                    // Expected content type has charset and additional parameters
+                    {
+                        null,
+                        "text/bar; p1=p1-value; charset=us-ascii",
+                        "text/bar; p1=p1-value; charset=us-ascii"
+                    },
+
+                    // Content type set on action result takes precedence over the content type set on http response
+                    {
+                        MediaTypeHeaderValue.Parse("text/foo; charset=us-ascii"),
+                        "text/bar",
+                        "text/foo; charset=us-ascii"
+                    },
+                    {
+                        MediaTypeHeaderValue.Parse("text/foo; charset=us-ascii"),
+                        "text/bar; charset=utf-8",
+                        "text/foo; charset=us-ascii"
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ResponseContentTypeData))]
+        public void GetsExpectedContentTypeAndEncoding(
+            MediaTypeHeaderValue contentType,
+            string responseContentType,
+            string expectedContentType)
+        {
+            // Arrange
+            var defaultContentType = "text/default; p1=p1-value; charset=utf-8";
+
+            // Act
+            string resolvedContentType = null;
+            Encoding resolvedContentTypeEncoding = null;
+            ResponseContentTypeHelper.ResolveContentTypeAndEncoding(
+                contentType?.ToString(),
+                responseContentType,
+                defaultContentType,
+                out resolvedContentType,
+                out resolvedContentTypeEncoding);
+
+            // Assert
+            Assert.Equal(expectedContentType, resolvedContentType);
+        }
+
+        [Fact]
+        public void DoesNotThrowException_OnInvalidResponseContentType()
+        {
+            // Arrange
+            var expectedContentType = "invalid-content-type";
+            var defaultContentType = "text/plain; charset=utf-8";
+
+            // Act
+            string resolvedContentType = null;
+            Encoding resolvedContentTypeEncoding = null;
+            ResponseContentTypeHelper.ResolveContentTypeAndEncoding(
+                null,
+                expectedContentType,
+                defaultContentType,
+                out resolvedContentType,
+                out resolvedContentTypeEncoding);
+
+            // Assert
+            Assert.Equal(expectedContentType, resolvedContentType);
+            Assert.Equal(Encoding.UTF8, resolvedContentTypeEncoding);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ShortFormDictionaryValidationStrategyTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ShortFormDictionaryValidationStrategyTest.cs
new file mode 100644
index 0000000000..9ef857f0a1
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ShortFormDictionaryValidationStrategyTest.cs
@@ -0,0 +1,155 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ShortFormDictionaryValidationStrategyTest
+    {
+        [Fact]
+        public void EnumerateElements()
+        {
+            // Arrange
+            var model = new Dictionary<int, string>()
+            {
+                { 2, "two" },
+                { 3, "three" },
+                { 5, "five" },
+            };
+
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = metadataProvider.GetMetadataForType(typeof(List<int>));
+            var valueMetadata = metadataProvider.GetMetadataForType(typeof(string));
+            var strategy = new ShortFormDictionaryValidationStrategy<int, string>(new Dictionary<string, int>()
+            {
+                { "prefix[2]", 2 },
+                { "prefix[3]", 3 },
+                { "prefix[5]", 5 },
+            },
+            valueMetadata);
+
+            // Act
+            var enumerator = strategy.GetChildren(metadata, "ignored prefix", model);
+
+            // Assert
+            Assert.Collection(
+                BufferEntries(enumerator).OrderBy(e => e.Key),
+                e =>
+                {
+                    Assert.Equal("prefix[2]", e.Key);
+                    Assert.Equal("two", e.Model);
+                    Assert.Same(valueMetadata, e.Metadata);
+                },
+                e =>
+                {
+                    Assert.Equal("prefix[3]", e.Key);
+                    Assert.Equal("three", e.Model);
+                    Assert.Same(valueMetadata, e.Metadata);
+                },
+                e =>
+                {
+                    Assert.Equal("prefix[5]", e.Key);
+                    Assert.Equal("five", e.Model);
+                    Assert.Same(valueMetadata, e.Metadata);
+                });
+        }
+
+        [Fact]
+        public void EnumerateElements_RunOutOfIndices()
+        {
+            // Arrange
+            var model = new Dictionary<int, string>()
+            {
+                { 2, "two" },
+                { 3, "three" },
+                { 5, "five" },
+            };
+
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = metadataProvider.GetMetadataForType(typeof(List<int>));
+            var valueMetadata = metadataProvider.GetMetadataForType(typeof(string));
+            var strategy = new ShortFormDictionaryValidationStrategy<int, string>(new Dictionary<string, int>()
+            {
+                { "prefix[2]", 2 },
+                { "prefix[3]", 3 },
+            },
+            valueMetadata);
+
+            // Act
+            var enumerator = strategy.GetChildren(metadata, "ignored prefix", model);
+
+            // Assert
+            Assert.Collection(
+                BufferEntries(enumerator).OrderBy(e => e.Key),
+                e =>
+                {
+                    Assert.Equal("prefix[2]", e.Key);
+                    Assert.Equal("two", e.Model);
+                    Assert.Same(valueMetadata, e.Metadata);
+                },
+                e =>
+                {
+                    Assert.Equal("prefix[3]", e.Key);
+                    Assert.Equal("three", e.Model);
+                    Assert.Same(valueMetadata, e.Metadata);
+                });
+        }
+
+        [Fact]
+        public void EnumerateElements_RunOutOfElements()
+        {
+            // Arrange
+            var model = new Dictionary<int, string>()
+            {
+                { 2, "two" },
+                { 3, "three" },
+            };
+
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = metadataProvider.GetMetadataForType(typeof(List<int>));
+            var valueMetadata = metadataProvider.GetMetadataForType(typeof(string));
+            var strategy = new ShortFormDictionaryValidationStrategy<int, string>(new Dictionary<string, int>()
+            {
+                { "prefix[2]", 2 },
+                { "prefix[3]", 3 },
+                { "prefix[5]", 5 },
+            },
+            valueMetadata);
+
+            // Act
+            var enumerator = strategy.GetChildren(metadata, "ignored prefix", model);
+
+            // Assert
+            Assert.Collection(
+                BufferEntries(enumerator).OrderBy(e => e.Key),
+                e =>
+                {
+                    Assert.Equal("prefix[2]", e.Key);
+                    Assert.Equal("two", e.Model);
+                    Assert.Same(valueMetadata, e.Metadata);
+                },
+                e =>
+                {
+                    Assert.Equal("prefix[3]", e.Key);
+                    Assert.Equal("three", e.Model);
+                    Assert.Same(valueMetadata, e.Metadata);
+                });
+        }
+
+        private List<ValidationEntry> BufferEntries(IEnumerator<ValidationEntry> enumerator)
+        {
+            var entries = new List<ValidationEntry>();
+            while (enumerator.MoveNext())
+            {
+                entries.Add(enumerator.Current);
+            }
+
+            return entries;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ValidatorCacheTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ValidatorCacheTest.cs
new file mode 100644
index 0000000000..57bf369b9b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ValidatorCacheTest.cs
@@ -0,0 +1,112 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ValidatorCacheTest
+    {
+        [Fact]
+        public void GetValidators_CachesAllValidators()
+        {
+            // Arrange
+            var cache = new ValidatorCache();
+            var metadata = new TestModelMetadataProvider().GetMetadataForProperty(typeof(TypeWithProperty), "Property1");
+            var validatorProvider = TestModelValidatorProvider.CreateDefaultProvider();
+
+            // Act - 1
+            var validators1 = cache.GetValidators(metadata, validatorProvider);
+
+            // Assert - 1
+            var attribute1 = Assert.IsType<DataAnnotationsModelValidator>(validators1[0]).Attribute;
+            var attribute2 = Assert.IsType<DataAnnotationsModelValidator>(validators1[1]).Attribute;
+            Assert.Contains(attribute1, metadata.ValidatorMetadata); // Copied by provider
+            Assert.Contains(attribute2, metadata.ValidatorMetadata); // Copied by provider
+
+            // Act - 2
+            var validators2 = cache.GetValidators(metadata, validatorProvider);
+
+            // Assert - 2
+            Assert.Same(validators1, validators2);
+
+            Assert.Contains(validators1[0], validators2); // Cached
+            Assert.Contains(validators1[1], validators2); // Cached
+        }
+
+        [Fact]
+        public void GetValidators_DoesNotCacheValidatorsWithIsReusableFalse()
+        {
+            // Arrange
+            var cache = new ValidatorCache();
+            var metadata = new TestModelMetadataProvider().GetMetadataForProperty(typeof(TypeWithProperty), "Property1");
+            var validatorProvider = new ProviderWithNonReusableValidators();
+
+            // Act - 1
+            var validators1 = cache.GetValidators(metadata, validatorProvider);
+
+            // Assert - 1
+            var validator1 = Assert.IsType<DataAnnotationsModelValidator>(validators1[0]);
+            var validator2 = Assert.IsType<DataAnnotationsModelValidator>(validators1[1]);
+            Assert.Contains(validator1.Attribute, metadata.ValidatorMetadata); // Copied by provider
+            Assert.Contains(validator2.Attribute, metadata.ValidatorMetadata); // Copied by provider
+
+            // Act - 2
+            var validators2 = cache.GetValidators(metadata, validatorProvider);
+
+            // Assert - 2
+            Assert.NotSame(validators1, validators2);
+
+            var requiredValidator = Assert.Single(validators2.Where(v => (v as DataAnnotationsModelValidator).Attribute is RequiredAttribute));
+            Assert.Contains(requiredValidator, validators1); // cached
+            var stringLengthValidator = Assert.Single(validators2.Where(v => (v as DataAnnotationsModelValidator).Attribute is StringLengthAttribute));
+            Assert.DoesNotContain(stringLengthValidator, validators1); // not cached
+        }
+
+        private class TypeWithProperty
+        {
+            [Required]
+            [StringLength(10)]
+            public string Property1 { get; set; }
+        }
+
+        private class ProviderWithNonReusableValidators : IModelValidatorProvider
+        {
+            public void CreateValidators(ModelValidatorProviderContext context)
+            {
+                for (var i = 0; i < context.Results.Count; i++)
+                {
+                    var validatorItem = context.Results[i];
+                    if (validatorItem.Validator != null)
+                    {
+                        continue;
+                    }
+
+                    var attribute = validatorItem.ValidatorMetadata as ValidationAttribute;
+                    if (attribute == null)
+                    {
+                        continue;
+                    }
+
+                    var validator = new DataAnnotationsModelValidator(
+                        new ValidationAttributeAdapterProvider(),
+                        attribute,
+                        stringLocalizer: null);
+
+                    validatorItem.Validator = validator;
+
+                    if (attribute is RequiredAttribute)
+                    {
+                        validatorItem.IsReusable = true;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ViewEnginePathTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ViewEnginePathTest.cs
new file mode 100644
index 0000000000..e76e274b82
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ViewEnginePathTest.cs
@@ -0,0 +1,52 @@
+// 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.
+
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class ViewEnginePathTest
+    {
+        [Theory]
+        [InlineData("Views/../Home/Index.cshtml", "/Home/Index.cshtml")]
+        [InlineData("/Views/Home/../Shared/Partial.cshtml", "/Views/Shared/Partial.cshtml")]
+        [InlineData("/Views/Shared/./Partial.cshtml", "/Views/Shared/Partial.cshtml")]
+        [InlineData("//Views/Index.cshtml", "/Views/Index.cshtml")]
+        public void ResolvePath_ResolvesPathTraversals(string input, string expected)
+        {
+            // Arrange & Act
+            var result = ViewEnginePath.ResolvePath(input);
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Theory]
+        [InlineData("../Index.cshtml")]
+        [InlineData("Views/../../Index.cshtml")]
+        [InlineData("Views/../Shared/../../Index.cshtml")]
+        public void ResolvePath_DoesNotTraversePastApplicationRoot(string input)
+        {
+            // Arrange
+            var result = ViewEnginePath.ResolvePath(input);
+
+            // Assert
+            Assert.Same(input, result);
+        }
+
+        [Theory]
+        [InlineData("/Views/Index.cshtml")]
+        [InlineData(@"/Views\Index.cshtml")]
+        [InlineData("Index..cshtml")]
+        [InlineData("/directory.with.periods/sub-dir/index.cshtml")]
+        [InlineData("file.with.periods.cshtml")]
+        public void ResolvePath_DoesNotModifyPathsWithoutTraversals(string input)
+        {
+            // Arrange & Act
+            var result = ViewEnginePath.ResolvePath(input);
+
+            // Assert
+            Assert.Same(input, result);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/LocalRedirectResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/LocalRedirectResultTest.cs
new file mode 100644
index 0000000000..ebbbac82a7
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/LocalRedirectResultTest.cs
@@ -0,0 +1,182 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class LocalRedirectResultTest
+    {
+        [Fact]
+        public void Constructor_WithParameterUrl_SetsResultUrlAndNotPermanentOrPreserveMethod()
+        {
+            // Arrange
+            var url = "/test/url";
+
+            // Act
+            var result = new LocalRedirectResult(url);
+
+            // Assert
+            Assert.False(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void Constructor_WithParameterUrlAndPermanent_SetsResultUrlAndPermanentNotPreserveMethod()
+        {
+            // Arrange
+            var url = "/test/url";
+
+            // Act
+            var result = new LocalRedirectResult(url, permanent: true);
+
+            // Assert
+            Assert.False(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void Constructor_WithParameterUrlAndPermanent_SetsResultUrlPermanentAndPreserveMethod()
+        {
+            // Arrange
+            var url = "/test/url";
+
+            // Act
+            var result = new LocalRedirectResult(url, permanent: true, preserveMethod: true);
+
+            // Assert
+            Assert.True(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public async Task Execute_ReturnsExpectedValues()
+        {
+            // Arrange
+            var appRoot = "/";
+            var contentPath = "~/Home/About";
+            var expectedPath = "/Home/About";
+            var httpResponse = new Mock<HttpResponse>();
+            httpResponse.Setup(o => o.Redirect(expectedPath, false))
+                        .Verifiable();
+
+            var httpContext = GetHttpContext(appRoot, contentPath, expectedPath, httpResponse.Object);
+            var actionContext = GetActionContext(httpContext);
+            var result = new LocalRedirectResult(contentPath);
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            httpResponse.Verify();
+        }
+
+        [Theory]
+        [InlineData("", "//", "/test")]
+        [InlineData("", "/\\", "/test")]
+        [InlineData("", "//foo", "/test")]
+        [InlineData("", "/\\foo", "/test")]
+        [InlineData("", "Home/About", "/Home/About")]
+        [InlineData("/myapproot", "http://www.example.com", "/test")]
+        public async Task Execute_Throws_ForNonLocalUrl(
+            string appRoot,
+            string contentPath,
+            string expectedPath)
+        {
+            // Arrange
+            var httpResponse = new Mock<HttpResponse>();
+            httpResponse.Setup(o => o.Redirect(expectedPath, false))
+                        .Verifiable();
+
+            var httpContext = GetHttpContext(appRoot, contentPath, expectedPath, httpResponse.Object);
+            var actionContext = GetActionContext(httpContext);
+            var result = new LocalRedirectResult(contentPath);
+
+            // Act & Assert
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => result.ExecuteResultAsync(actionContext));
+            Assert.Equal(
+                "The supplied URL is not local. A URL with an absolute path is considered local if it does not " +
+                "have a host/authority part. URLs using virtual paths ('~/') are also local.",
+                exception.Message);
+        }
+
+        [Theory]
+        [InlineData("", "~//", "//")]
+        [InlineData("", "~/\\", "/\\")]
+        [InlineData("", "~//foo", "//foo")]
+        [InlineData("", "~/\\foo", "/\\foo")]
+        public async Task Execute_Throws_ForNonLocalUrlTilde(
+            string appRoot,
+            string contentPath,
+            string expectedPath)
+        {
+            // Arrange
+            var httpResponse = new Mock<HttpResponse>();
+            httpResponse.Setup(o => o.Redirect(expectedPath, false))
+                        .Verifiable();
+
+            var httpContext = GetHttpContext(appRoot, contentPath, expectedPath, httpResponse.Object);
+            var actionContext = GetActionContext(httpContext);
+            var result = new LocalRedirectResult(contentPath);
+
+            // Act & Assert
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => result.ExecuteResultAsync(actionContext));
+            Assert.Equal(
+                "The supplied URL is not local. A URL with an absolute path is considered local if it does not " +
+                "have a host/authority part. URLs using virtual paths ('~/') are also local.",
+                exception.Message);
+        }
+
+        private static ActionContext GetActionContext(HttpContext httpContext)
+        {
+            var routeData = new RouteData();
+            routeData.Routers.Add(new Mock<IRouter>().Object);
+
+            return new ActionContext(httpContext, routeData, new ActionDescriptor());
+        }
+
+        private static IServiceProvider GetServiceProvider()
+        {
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddSingleton<IActionResultExecutor<LocalRedirectResult>, LocalRedirectResultExecutor>();
+            serviceCollection.AddSingleton<IUrlHelperFactory, UrlHelperFactory>();
+            serviceCollection.AddTransient<ILoggerFactory, LoggerFactory>();
+            return serviceCollection.BuildServiceProvider();
+        }
+
+        private static HttpContext GetHttpContext(
+            string appRoot,
+            string contentPath,
+            string expectedPath,
+            HttpResponse response)
+        {
+            var httpContext = new Mock<HttpContext>();
+            var serviceProvider = GetServiceProvider();
+
+            httpContext.Setup(o => o.Response)
+                       .Returns(response);
+            httpContext.SetupGet(o => o.RequestServices)
+                       .Returns(serviceProvider);
+            httpContext.SetupGet(o => o.Items)
+                       .Returns(new ItemsDictionary());
+            httpContext.Setup(o => o.Request.PathBase)
+                       .Returns(new PathString(appRoot));
+
+            return httpContext.Object;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/MediaTypeCollectionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/MediaTypeCollectionTest.cs
new file mode 100644
index 0000000000..5745821a79
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/MediaTypeCollectionTest.cs
@@ -0,0 +1,60 @@
+// 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.
+
+using Microsoft.Net.Http.Headers;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    public class MediaTypeCollectionTest
+    {
+        [Fact]
+        public void Add_MediaTypeHeaderValue_AddsTheStringSegmentRepresentationOfTheMediaType()
+        {
+            // Arrange
+            var mediaTypeHeaderValue = MediaTypeHeaderValue.Parse("application/json;charset=utf-16");
+            var collection = new MediaTypeCollection();
+
+            // Act
+            collection.Add(mediaTypeHeaderValue);
+
+            // Assert
+            Assert.Contains("application/json; charset=utf-16", collection);
+        }
+
+        [Fact]
+        public void Insert_MediaTypeHeaderValue_AddsTheStringSegmentRepresentationOfTheMediaTypeOnTheGivenIndex()
+        {
+            // Arrange
+            var mediaTypeHeaderValue = MediaTypeHeaderValue.Parse("application/json;charset=utf-16");
+            var collection = new MediaTypeCollection
+            {
+                MediaTypeHeaderValue.Parse("text/plain"),
+                MediaTypeHeaderValue.Parse("text/xml")
+            };
+
+            // Act
+            collection.Insert(1, mediaTypeHeaderValue);
+
+            // Assert
+            Assert.Equal(1, collection.IndexOf("application/json; charset=utf-16"));
+        }
+
+        [Fact]
+        public void Remove_MediaTypeHeaderValue_RemovesTheStringSegmentRepresentationOfTheMediaType()
+        {
+            // Arrange
+            var collection = new MediaTypeCollection
+            {
+                MediaTypeHeaderValue.Parse("text/plain"),
+                MediaTypeHeaderValue.Parse("text/xml")
+            };
+
+            // Act
+            collection.Remove(MediaTypeHeaderValue.Parse("text/xml"));
+
+            // Assert
+            Assert.DoesNotContain("text/xml", collection);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj
new file mode 100644
index 0000000000..25368d8cc0
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(MicrosoftAspNetCoreHttpPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.ResponseCaching" Version="$(MicrosoftAspNetCoreResponseCachingPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ArrayModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ArrayModelBinderProviderTest.cs
new file mode 100644
index 0000000000..83a96daa9a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ArrayModelBinderProviderTest.cs
@@ -0,0 +1,92 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class ArrayModelBinderProviderTest
+    {
+        [Theory]
+        [InlineData(typeof(object))]
+        [InlineData(typeof(TestClass))]
+        [InlineData(typeof(IList<int>))]
+        public void Create_ForNonArrayTypes_ReturnsNull(Type modelType)
+        {
+            // Arrange
+            var provider = new ArrayModelBinderProvider();
+            var context = new TestModelBinderProviderContext(modelType);
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Theory]
+        [InlineData(typeof(byte[]))]
+        [InlineData(typeof(string[]))]
+        [InlineData(typeof(TestClass[]))]
+        [InlineData(typeof(DateTime?[]))]
+        public void Create_ForArrayTypes_ReturnsBinder(Type modelType)
+        {
+            // Arrange
+            var provider = new ArrayModelBinderProvider();
+            var context = new TestModelBinderProviderContext(modelType);
+            context.OnCreatingBinder((m) =>
+            {
+                // Expect to be called with the element type to create a binder for elements.
+                Assert.Equal(modelType.GetElementType(), m.ModelType);
+                return Mock.Of<IModelBinder>();
+            });
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.IsType(typeof(ArrayModelBinder<>).MakeGenericType(modelType.GetElementType()), result);
+        }
+
+        [Fact]
+        public void Create_ForModelMetadataReadOnly_ReturnsNull()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider.ForProperty(
+                typeof(ModelWithIntArrayProperty),
+                nameof(ModelWithIntArrayProperty.ArrayProperty)).BindingDetails(bd => bd.IsReadOnly = true);
+
+            var modelMetadata = metadataProvider.GetMetadataForProperty(
+                typeof(ModelWithIntArrayProperty),
+                nameof(ModelWithIntArrayProperty.ArrayProperty));
+
+            var provider = new ArrayModelBinderProvider();
+            var context = new TestModelBinderProviderContext(typeof(int[]));
+            context.OnCreatingBinder((m) =>
+            {
+                // Expect to be called with the element type to create a binder for elements.
+                Assert.Equal(typeof(int), m.ModelType);
+                return Mock.Of<IModelBinder>();
+            });
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.IsType<ArrayModelBinder<int>>(result);
+        }
+
+        private class TestClass
+        {
+        }
+
+        private class ModelWithIntArrayProperty
+        {
+            public int[] ArrayProperty { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ArrayModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ArrayModelBinderTest.cs
new file mode 100644
index 0000000000..8c3a372f06
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ArrayModelBinderTest.cs
@@ -0,0 +1,213 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Internal;
+using Microsoft.Extensions.Logging.Abstractions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class ArrayModelBinderTest
+    {
+        [Fact]
+        public async Task BindModelAsync_ValueProviderContainPrefix_Succeeds()
+        {
+            // Arrange
+            var valueProvider = new SimpleValueProvider
+            {
+                { "someName[0]", "42" },
+                { "someName[1]", "84" },
+            };
+
+            var bindingContext = GetBindingContext(valueProvider);
+            var metadataProvider = new TestModelMetadataProvider();
+            bindingContext.ModelMetadata = metadataProvider.GetMetadataForProperty(
+                typeof(ModelWithIntArrayProperty),
+                nameof(ModelWithIntArrayProperty.ArrayProperty));
+
+            var binder = new ArrayModelBinder<int>(
+                new SimpleTypeModelBinder(typeof(int), NullLoggerFactory.Instance),
+                NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+
+            var array = Assert.IsType<int[]>(bindingContext.Result.Model);
+            Assert.Equal(new[] { 42, 84 }, array);
+        }
+
+        [Fact]
+        public async Task ArrayModelBinder_CreatesEmptyCollection_IfIsTopLevelObject()
+        {
+            // Arrange
+            var binder = new ArrayModelBinder<string>(
+                new SimpleTypeModelBinder(typeof(string), NullLoggerFactory.Instance),
+                NullLoggerFactory.Instance);
+
+            var bindingContext = CreateContext();
+            bindingContext.IsTopLevelObject = true;
+
+            // Lack of prefix and non-empty model name both ignored.
+            bindingContext.ModelName = "modelName";
+
+            var metadataProvider = new TestModelMetadataProvider();
+            bindingContext.ModelMetadata = metadataProvider.GetMetadataForType(typeof(string[]));
+
+            bindingContext.ValueProvider = new TestValueProvider(new Dictionary<string, object>());
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.Empty(Assert.IsType<string[]>(bindingContext.Result.Model));
+            Assert.True(bindingContext.Result.IsModelSet);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData("param")]
+        public async Task ArrayModelBinder_DoesNotCreateCollection_IfNotIsTopLevelObject(string prefix)
+        {
+            // Arrange
+            var binder = new ArrayModelBinder<string>(
+                new SimpleTypeModelBinder(typeof(string), NullLoggerFactory.Instance),
+                NullLoggerFactory.Instance);
+
+            var bindingContext = CreateContext();
+            bindingContext.ModelName = ModelNames.CreatePropertyModelName(prefix, "ArrayProperty");
+
+            var metadataProvider = new TestModelMetadataProvider();
+            bindingContext.ModelMetadata = metadataProvider.GetMetadataForProperty(
+                typeof(ModelWithArrayProperty),
+                nameof(ModelWithArrayProperty.ArrayProperty));
+
+            bindingContext.ValueProvider = new TestValueProvider(new Dictionary<string, object>());
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+        }
+
+        public static TheoryData<int[]> ArrayModelData
+        {
+            get
+            {
+                return new TheoryData<int[]>
+                {
+                    new int[0],
+                    new [] { 357 },
+                    new [] { 357, 357 },
+                };
+            }
+        }
+
+        // Here "fails silently" means the call does not update the array but also does not throw or set an error.
+        [Theory]
+        [MemberData(nameof(ArrayModelData))]
+        public async Task BindModelAsync_ModelMetadataNotReadOnly_ModelNonNull_FailsSilently(int[] model)
+        {
+            // Arrange
+            var arrayLength = model.Length;
+            var valueProvider = new SimpleValueProvider
+            {
+                { "someName[0]", "42" },
+                { "someName[1]", "84" },
+            };
+
+            var bindingContext = GetBindingContext(valueProvider);
+            bindingContext.Model = model;
+
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider.ForProperty(
+                typeof(ModelWithIntArrayProperty),
+                nameof(ModelWithIntArrayProperty.ArrayProperty)).BindingDetails(bd => bd.IsReadOnly = false);
+            bindingContext.ModelMetadata = metadataProvider.GetMetadataForProperty(
+                typeof(ModelWithIntArrayProperty),
+                nameof(ModelWithIntArrayProperty.ArrayProperty));
+
+            var binder = new ArrayModelBinder<int>(
+                new SimpleTypeModelBinder(typeof(int), NullLoggerFactory.Instance),
+                NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Same(model, bindingContext.Result.Model);
+
+            for (var i = 0; i < arrayLength; i++)
+            {
+                // Array should be unchanged.
+                Assert.Equal(357, model[i]);
+            }
+        }
+
+        private static IModelBinder CreateIntBinder()
+        {
+            return new StubModelBinder(context =>
+            {
+                var value = context.ValueProvider.GetValue(context.ModelName);
+                if (value != ValueProviderResult.None)
+                {
+                    object valueToConvert = null;
+                    if (value.Values.Count == 1)
+                    {
+                        valueToConvert = value.Values[0];
+                    }
+                    else if (value.Values.Count > 1)
+                    {
+                        valueToConvert = value.Values.ToArray();
+                    }
+
+                    var model = ModelBindingHelper.ConvertTo(valueToConvert, context.ModelType, value.Culture);
+                    return ModelBindingResult.Success(model);
+                }
+                return ModelBindingResult.Failed();
+            });
+        }
+
+        private static DefaultModelBindingContext GetBindingContext(IValueProvider valueProvider)
+        {
+            var bindingContext = new DefaultModelBindingContext()
+            {
+                ModelName = "someName",
+                ModelState = new ModelStateDictionary(),
+                ValueProvider = valueProvider,
+            };
+            return bindingContext;
+        }
+
+        private static DefaultModelBindingContext CreateContext()
+        {
+            var modelBindingContext = new DefaultModelBindingContext()
+            {
+                ActionContext = new ActionContext()
+                {
+                    HttpContext = new DefaultHttpContext(),
+                },
+            };
+
+            return modelBindingContext;
+        }
+
+        private class ModelWithArrayProperty
+        {
+            public string[] ArrayProperty { get; set; }
+        }
+
+        private class ModelWithIntArrayProperty
+        {
+            public int[] ArrayProperty { get; set; }
+        }
+    }
+}
+
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BinderTypeModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BinderTypeModelBinderProviderTest.cs
new file mode 100644
index 0000000000..98c72b2918
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BinderTypeModelBinderProviderTest.cs
@@ -0,0 +1,58 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class BinderTypeModelBinderProviderTest
+    {
+        [Fact]
+        public void Create_WhenBinderTypeIsNull_ReturnsNull()
+        {
+            // Arrange
+            var provider = new BinderTypeModelBinderProvider();
+
+            var context = new TestModelBinderProviderContext(typeof(Person));
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void Create_WhenBinderTypeIsSet_ReturnsBinder()
+        {
+            // Arrange
+            var provider = new BinderTypeModelBinderProvider();
+
+            var context = new TestModelBinderProviderContext(typeof(Person));
+            context.BindingInfo.BinderType = typeof(NullModelBinder);
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.IsType<BinderTypeModelBinder>(result);
+        }
+
+        private class Person
+        {
+            public string Name { get; set; }
+
+            public int Age { get; set; }
+        }
+
+        private class NullModelBinder : IModelBinder
+        {
+            public Task BindModelAsync(ModelBindingContext bindingContext)
+            {
+                return Task.FromResult(0);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BinderTypeModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BinderTypeModelBinderTest.cs
new file mode 100644
index 0000000000..2dee3bbf02
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BinderTypeModelBinderTest.cs
@@ -0,0 +1,123 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class BinderTypeModelBinderTest
+    {
+        [Fact]
+        public async Task BindModel_ReturnsFailedResult_EvenIfSelectedBinderReturnsNull()
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(typeof(Person), binderType: typeof(NullModelBinder));
+
+            var binder = new BinderTypeModelBinder(typeof(NullModelBinder));
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+        }
+
+        [Fact]
+        public async Task BindModel_CallsBindAsync_OnProvidedModelBinder()
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(typeof(Person), binderType: typeof(NotNullModelBinder));
+
+            var model = new Person();
+            var serviceProvider = new ServiceCollection()
+                .AddSingleton<IModelBinder, NullModelBinder>()
+                .BuildServiceProvider();
+
+            bindingContext.HttpContext.RequestServices = serviceProvider;
+
+            var binder = new BinderTypeModelBinder(typeof(NotNullModelBinder));
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            var person = (Person)bindingContext.Result.Model;
+            Assert.Equal(model.Age, person.Age);
+            Assert.Equal(model.Name, person.Name);
+        }
+
+        [Fact]
+        public void BindModel_ForNonModelBinder_Throws()
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(typeof(Person), binderType: typeof(Person));
+
+            var expected = $"The type '{typeof(Person).FullName}' must implement " +
+                $"'{typeof(IModelBinder).FullName}' to be used as a model binder.";
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => new BinderTypeModelBinder(typeof(Person)),
+                "binderType",
+                expected);
+        }
+
+        private static DefaultModelBindingContext GetBindingContext(Type modelType, Type binderType = null)
+        {
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider.ForType(modelType).BindingDetails(bd => bd.BinderType = binderType);
+
+            var bindingContext = new DefaultModelBindingContext
+            {
+                ActionContext = new ActionContext()
+                {
+                    HttpContext = new DefaultHttpContext(),
+                },
+                ModelMetadata = metadataProvider.GetMetadataForType(modelType),
+                ModelName = "someName",
+                ValueProvider = Mock.Of<IValueProvider>(),
+                ModelState = new ModelStateDictionary(),
+            };
+
+            return bindingContext;
+        }
+
+        private class Person
+        {
+            public string Name { get; set; }
+
+            public int Age { get; set; }
+        }
+
+        private class NullModelBinder : IModelBinder
+        {
+            public Task BindModelAsync(ModelBindingContext bindingContext)
+            {
+                return Task.FromResult(0);
+            }
+        }
+
+        private class NotNullModelBinder : IModelBinder
+        {
+            private readonly object _model;
+
+            public NotNullModelBinder()
+            {
+                _model = new Person();
+            }
+
+            public Task BindModelAsync(ModelBindingContext bindingContext)
+            {
+                bindingContext.Result = ModelBindingResult.Success(_model);
+                return Task.CompletedTask;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderProviderTest.cs
new file mode 100644
index 0000000000..22a6d69a66
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderProviderTest.cs
@@ -0,0 +1,119 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.Extensions.Logging.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class BodyModelBinderProviderTest
+    {
+        public static TheoryData<BindingSource> NonBodyBindingSources
+        {
+            get
+            {
+                return new TheoryData<BindingSource>()
+                {
+                    BindingSource.Header,
+                    BindingSource.Form,
+                    null,
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(NonBodyBindingSources))]
+        public void GetBinder_WhenBindingSourceIsNotFromBody_ReturnsNull(BindingSource source)
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            var context = new TestModelBinderProviderContext(typeof(Person));
+            context.BindingInfo.BindingSource = source;
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void GetBinder_WhenNoInputFormatters_Throws()
+        {
+            // Arrange
+            var expected = $"'{typeof(MvcOptions).FullName}.{nameof(MvcOptions.InputFormatters)}' must not be empty. " +
+                $"At least one '{typeof(IInputFormatter).FullName}' is required to bind from the body.";
+            var provider = CreateProvider();
+            var context = new TestModelBinderProviderContext(typeof(Person));
+            context.BindingInfo.BindingSource = BindingSource.Body;
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => provider.GetBinder(context));
+            Assert.Equal(expected, exception.Message);
+        }
+
+        [Fact]
+        public void GetBinder_WhenBindingSourceIsFromBody_ReturnsBinder()
+        {
+            // Arrange
+            var provider = CreateProvider(new TestInputFormatter());
+            var context = new TestModelBinderProviderContext(typeof(Person));
+            context.BindingInfo.BindingSource = BindingSource.Body;
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.IsType<BodyModelBinder>(result);
+        }
+
+        [Fact]
+        public void GetBinder_DoesNotThrowNullReferenceException()
+        {
+            // Arrange
+            var context = new TestModelBinderProviderContext(typeof(Person));
+            context.BindingInfo.BindingSource = BindingSource.Body;
+            var formatter = new TestInputFormatter();
+            var formatterList = new List<IInputFormatter> { formatter };
+            var provider = new BodyModelBinderProvider(formatterList, new TestHttpRequestStreamReaderFactory());
+
+            // Act & Assert (does not throw)
+            provider.GetBinder(context);
+        }
+
+        private static BodyModelBinderProvider CreateProvider(params IInputFormatter[] formatters)
+        {
+            var sink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
+            return new BodyModelBinderProvider(
+                new List<IInputFormatter>(formatters),
+                new TestHttpRequestStreamReaderFactory(),
+                loggerFactory);
+        }
+
+        private class Person
+        {
+            public string Name { get; set; }
+
+            public int Age { get; set; }
+        }
+
+        private class TestInputFormatter : IInputFormatter
+        {
+            public bool CanRead(InputFormatterContext context)
+            {
+                throw new NotImplementedException();
+            }
+
+            public Task<InputFormatterResult> ReadAsync(InputFormatterContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderTests.cs
new file mode 100644
index 0000000000..21a66b0a40
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderTests.cs
@@ -0,0 +1,955 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Logging.Testing;
+using Microsoft.Extensions.ObjectPool;
+using Microsoft.Net.Http.Headers;
+using Moq;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class BodyModelBinderTests
+    {
+        [Fact]
+        public async Task BindModel_CallsSelectedInputFormatterOnce()
+        {
+            // Arrange
+            var mockInputFormatter = new Mock<IInputFormatter>();
+            mockInputFormatter.Setup(f => f.CanRead(It.IsAny<InputFormatterContext>()))
+                .Returns(true)
+                .Verifiable();
+            mockInputFormatter.Setup(o => o.ReadAsync(It.IsAny<InputFormatterContext>()))
+                              .Returns(InputFormatterResult.SuccessAsync(new Person()))
+                              .Verifiable();
+            var inputFormatter = mockInputFormatter.Object;
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<Person>().BindingDetails(d => d.BindingSource = BindingSource.Body);
+
+            var bindingContext = GetBindingContext(
+                typeof(Person),
+                metadataProvider: provider);
+
+            var binder = CreateBinder(new[] { inputFormatter });
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            mockInputFormatter.Verify(v => v.CanRead(It.IsAny<InputFormatterContext>()), Times.Once);
+            mockInputFormatter.Verify(v => v.ReadAsync(It.IsAny<InputFormatterContext>()), Times.Once);
+            Assert.True(bindingContext.Result.IsModelSet);
+        }
+
+        [Fact]
+        public async Task BindModel_NoInputFormatterFound_SetsModelStateError()
+        {
+            // Arrange
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<Person>().BindingDetails(d => d.BindingSource = BindingSource.Body);
+
+            var bindingContext = GetBindingContext(typeof(Person), metadataProvider: provider);
+
+            var binder = CreateBinder(new List<IInputFormatter>());
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+
+            // Key is the empty string because this was a top-level binding.
+            var entry = Assert.Single(bindingContext.ModelState);
+            Assert.Equal(string.Empty, entry.Key);
+            Assert.Single(entry.Value.Errors);
+        }
+
+        [Fact]
+        public async Task BindModel_NoInputFormatterFound_SetsModelStateError_RespectsBinderModelName()
+        {
+            // Arrange
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<Person>().BindingDetails(d => d.BindingSource = BindingSource.Body);
+
+            var bindingContext = GetBindingContext(typeof(Person), metadataProvider: provider);
+            bindingContext.BinderModelName = "custom";
+
+            var binder = CreateBinder(new List<IInputFormatter>());
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+
+            // Key is the bindermodelname because this was a top-level binding.
+            var entry = Assert.Single(bindingContext.ModelState);
+            Assert.Equal("custom", entry.Key);
+            Assert.Single(entry.Value.Errors);
+        }
+
+        [Fact]
+        public async Task BindModel_IsGreedy()
+        {
+            // Arrange
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<Person>().BindingDetails(d => d.BindingSource = BindingSource.Body);
+
+            var bindingContext = GetBindingContext(typeof(Person), metadataProvider: provider);
+
+            var binder = CreateBinder(new List<IInputFormatter>());
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+        }
+
+        [Fact]
+        public async Task BindModel_NoValueResult_SetsModelStateError()
+        {
+            // Arrange
+            var mockInputFormatter = new Mock<IInputFormatter>();
+            mockInputFormatter.Setup(f => f.CanRead(It.IsAny<InputFormatterContext>()))
+                .Returns(true);
+            mockInputFormatter.Setup(o => o.ReadAsync(It.IsAny<InputFormatterContext>()))
+                .Returns(InputFormatterResult.NoValueAsync());
+            var inputFormatter = mockInputFormatter.Object;
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<Person>().BindingDetails(d =>
+            {
+                d.BindingSource = BindingSource.Body;
+                d.ModelBindingMessageProvider.SetMissingRequestBodyRequiredValueAccessor(
+                    () => "Customized error message");
+            });
+
+            var bindingContext = GetBindingContext(
+                typeof(Person),
+                metadataProvider: provider);
+            bindingContext.BinderModelName = "custom";
+
+            var binder = CreateBinder(new[] { inputFormatter });
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.Null(bindingContext.Result.Model);
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.False(bindingContext.ModelState.IsValid);
+
+            // Key is the bindermodelname because this was a top-level binding.
+            var entry = Assert.Single(bindingContext.ModelState);
+            Assert.Equal("custom", entry.Key);
+            Assert.Equal("Customized error message", entry.Value.Errors.Single().ErrorMessage);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task BindModel_PassesAllowEmptyInputOptionViaContext(bool treatEmptyInputAsDefaultValueOption)
+        {
+            // Arrange
+            var mockInputFormatter = new Mock<IInputFormatter>();
+            mockInputFormatter.Setup(f => f.CanRead(It.IsAny<InputFormatterContext>()))
+                .Returns(true);
+            mockInputFormatter.Setup(o => o.ReadAsync(It.IsAny<InputFormatterContext>()))
+                .Returns(InputFormatterResult.NoValueAsync())
+                .Verifiable();
+            var inputFormatter = mockInputFormatter.Object;
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<Person>().BindingDetails(d => d.BindingSource = BindingSource.Body);
+
+            var bindingContext = GetBindingContext(
+                typeof(Person),
+                metadataProvider: provider);
+            bindingContext.BinderModelName = "custom";
+
+            var binder = CreateBinder(new[] { inputFormatter }, treatEmptyInputAsDefaultValueOption);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            mockInputFormatter.Verify(formatter => formatter.ReadAsync(
+                It.Is<InputFormatterContext>(ctx => ctx.TreatEmptyInputAsDefaultValue == treatEmptyInputAsDefaultValueOption)),
+                Times.Once);
+        }
+
+        // Throwing InputFormatterException
+        [Theory]
+        [InlineData(InputFormatterExceptionPolicy.AllExceptions)]
+        [InlineData(InputFormatterExceptionPolicy.MalformedInputExceptions)]
+        public async Task BindModel_CustomFormatter_ThrowingInputFormatterException_AddsErrorToModelState(
+            InputFormatterExceptionPolicy inputFormatterExceptionPolicy)
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Body = new MemoryStream(Encoding.UTF8.GetBytes("Bad data!"));
+            httpContext.Request.ContentType = "text/xyz";
+
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider.ForType<Person>().BindingDetails(d => d.BindingSource = BindingSource.Body);
+
+            var expectedFormatException = new FormatException("bad format!");
+            var bindingContext = GetBindingContext(typeof(Person), httpContext, metadataProvider);
+            var formatter = new XyzFormatter((inputFormatterContext, encoding) =>
+            {
+                throw new InputFormatterException("Bad input!!", expectedFormatException);
+            });
+            var binder = CreateBinder(
+                new[] { formatter },
+                new MvcOptions()
+                {
+                    InputFormatterExceptionPolicy = inputFormatterExceptionPolicy
+                });
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+
+            // Key is the empty string because this was a top-level binding.
+            var entry = Assert.Single(bindingContext.ModelState);
+            Assert.Equal(string.Empty, entry.Key);
+            var errorMessage = Assert.Single(entry.Value.Errors).ErrorMessage;
+            Assert.Equal("Bad input!!", errorMessage);
+            Assert.Null(entry.Value.Errors[0].Exception);
+        }
+
+        public static TheoryData<IInputFormatter, InputFormatterExceptionPolicy> BuiltInFormattersThrowingInputFormatterException
+        {
+            get
+            {
+                return new TheoryData<IInputFormatter, InputFormatterExceptionPolicy>()
+                {
+                    { new XmlSerializerInputFormatter(new MvcOptions()), InputFormatterExceptionPolicy.AllExceptions },
+                    { new XmlSerializerInputFormatter(new MvcOptions()), InputFormatterExceptionPolicy.MalformedInputExceptions },
+                    { new XmlDataContractSerializerInputFormatter(new MvcOptions()), InputFormatterExceptionPolicy.AllExceptions },
+                    { new XmlDataContractSerializerInputFormatter(new MvcOptions()), InputFormatterExceptionPolicy.MalformedInputExceptions },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(BuiltInFormattersThrowingInputFormatterException))]
+        public async Task BindModel_BuiltInXmlInputFormatters_ThrowingInputFormatterException_AddsErrorToModelState(
+            IInputFormatter formatter,
+            InputFormatterExceptionPolicy inputFormatterExceptionPolicy)
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Body = new MemoryStream(Encoding.UTF8.GetBytes("Bad data!"));
+            httpContext.Request.ContentType = "application/xml";
+
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider.ForType<Person>().BindingDetails(d => d.BindingSource = BindingSource.Body);
+
+            var bindingContext = GetBindingContext(typeof(Person), httpContext, metadataProvider);
+            var binder = CreateBinder(new[] { formatter }, new MvcOptions()
+            {
+                InputFormatterExceptionPolicy = inputFormatterExceptionPolicy
+            });
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+
+            // Key is the empty string because this was a top-level binding.
+            var entry = Assert.Single(bindingContext.ModelState);
+            Assert.Equal(string.Empty, entry.Key);
+            var errorMessage = Assert.Single(entry.Value.Errors).ErrorMessage;
+            Assert.Equal("An error occurred while deserializing input data.", errorMessage);
+            Assert.Null(entry.Value.Errors[0].Exception);
+        }
+
+        [Theory]
+        [InlineData(InputFormatterExceptionPolicy.AllExceptions)]
+        [InlineData(InputFormatterExceptionPolicy.MalformedInputExceptions)]
+        public async Task BindModel_BuiltInJsonInputFormatter_ThrowingInputFormatterException_AddsErrorToModelState(
+            InputFormatterExceptionPolicy inputFormatterExceptionPolicy)
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Body = new MemoryStream(Encoding.UTF8.GetBytes("Bad data!"));
+            httpContext.Request.ContentType = "application/json";
+
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider.ForType<Person>().BindingDetails(d => d.BindingSource = BindingSource.Body);
+
+            var bindingContext = GetBindingContext(typeof(Person), httpContext, metadataProvider);
+            var binder = CreateBinder(
+                new[] { new TestableJsonInputFormatter(throwNonInputFormatterException: false) },
+                new MvcOptions()
+                {
+                    InputFormatterExceptionPolicy = inputFormatterExceptionPolicy
+                });
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+
+            // Key is the empty string because this was a top-level binding.
+            var entry = Assert.Single(bindingContext.ModelState);
+            Assert.Equal(string.Empty, entry.Key);
+            Assert.NotEmpty(entry.Value.Errors[0].ErrorMessage);
+        }
+
+        public static TheoryData<IInputFormatter, InputFormatterExceptionPolicy> DerivedFormattersThrowingInputFormatterException
+        {
+            get
+            {
+                return new TheoryData<IInputFormatter, InputFormatterExceptionPolicy>()
+                {
+                    { new DerivedXmlSerializerInputFormatter(throwNonInputFormatterException: false), InputFormatterExceptionPolicy.AllExceptions },
+                    { new DerivedXmlSerializerInputFormatter(throwNonInputFormatterException: false), InputFormatterExceptionPolicy.MalformedInputExceptions },
+                    { new DerivedXmlDataContractSerializerInputFormatter(throwNonInputFormatterException: false), InputFormatterExceptionPolicy.AllExceptions },
+                    { new DerivedXmlDataContractSerializerInputFormatter(throwNonInputFormatterException: false), InputFormatterExceptionPolicy.MalformedInputExceptions },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(DerivedFormattersThrowingInputFormatterException))]
+        public async Task BindModel_DerivedXmlInputFormatters_AddsErrorToModelState_(
+            IInputFormatter formatter,
+            InputFormatterExceptionPolicy inputFormatterExceptionPolicy)
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Body = new MemoryStream(Encoding.UTF8.GetBytes("Bad data!"));
+            httpContext.Request.ContentType = "application/xml";
+
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider.ForType<Person>().BindingDetails(d => d.BindingSource = BindingSource.Body);
+
+            var bindingContext = GetBindingContext(typeof(Person), httpContext, metadataProvider);
+            var binder = CreateBinder(new[] { formatter }, new MvcOptions()
+            {
+                InputFormatterExceptionPolicy = inputFormatterExceptionPolicy
+            });
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+
+            // Key is the empty string because this was a top-level binding.
+            var entry = Assert.Single(bindingContext.ModelState);
+            Assert.Equal(string.Empty, entry.Key);
+            var errorMessage = Assert.Single(entry.Value.Errors).ErrorMessage;
+            Assert.Equal("An error occurred while deserializing input data.", errorMessage);
+            Assert.Null(entry.Value.Errors[0].Exception);
+        }
+
+        [Theory]
+        [InlineData(InputFormatterExceptionPolicy.AllExceptions)]
+        [InlineData(InputFormatterExceptionPolicy.MalformedInputExceptions)]
+        public async Task BindModel_DerivedJsonInputFormatter_AddsErrorToModelState(
+            InputFormatterExceptionPolicy inputFormatterExceptionPolicy)
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Body = new MemoryStream(Encoding.UTF8.GetBytes("Bad data!"));
+            httpContext.Request.ContentType = "application/json";
+
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider.ForType<Person>().BindingDetails(d => d.BindingSource = BindingSource.Body);
+
+            var bindingContext = GetBindingContext(typeof(Person), httpContext, metadataProvider);
+            var binder = CreateBinder(
+                new[] { new DerivedJsonInputFormatter(throwNonInputFormatterException: false) },
+                new MvcOptions()
+                {
+                    InputFormatterExceptionPolicy = inputFormatterExceptionPolicy
+                });
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+
+            // Key is the empty string because this was a top-level binding.
+            var entry = Assert.Single(bindingContext.ModelState);
+            Assert.Equal(string.Empty, entry.Key);
+            Assert.NotEmpty(entry.Value.Errors[0].ErrorMessage);
+            Assert.Null(entry.Value.Errors[0].Exception);
+        }
+
+        // Throwing Non-InputFormatterException
+        public static TheoryData<IInputFormatter, string, InputFormatterExceptionPolicy> BuiltInFormattersThrowingNonInputFormatterException
+        {
+            get
+            {
+                return new TheoryData<IInputFormatter, string, InputFormatterExceptionPolicy>()
+                {
+                    { new TestableXmlSerializerInputFormatter(throwNonInputFormatterException: true), "text/xml", InputFormatterExceptionPolicy.AllExceptions },
+                    { new TestableXmlSerializerInputFormatter(throwNonInputFormatterException: true), "text/xml", InputFormatterExceptionPolicy.MalformedInputExceptions },
+                    { new TestableXmlDataContractSerializerInputFormatter(throwNonInputFormatterException: true), "text/xml", InputFormatterExceptionPolicy.AllExceptions },
+                    { new TestableXmlDataContractSerializerInputFormatter(throwNonInputFormatterException: true), "text/xml", InputFormatterExceptionPolicy.MalformedInputExceptions },
+                    { new TestableJsonInputFormatter(throwNonInputFormatterException: true), "text/json", InputFormatterExceptionPolicy.AllExceptions },
+                    { new TestableJsonInputFormatter(throwNonInputFormatterException: true), "text/json", InputFormatterExceptionPolicy.MalformedInputExceptions },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(BuiltInFormattersThrowingNonInputFormatterException))]
+        public async Task BindModel_BuiltInInputFormatters_ThrowingNonInputFormatterException_Throws(
+            IInputFormatter formatter,
+            string contentType,
+            InputFormatterExceptionPolicy inputFormatterExceptionPolicy)
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Body = new MemoryStream(Encoding.UTF8.GetBytes("valid data!"));
+            httpContext.Request.ContentType = contentType;
+
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider.ForType<Person>().BindingDetails(d => d.BindingSource = BindingSource.Body);
+
+            var bindingContext = GetBindingContext(typeof(Person), httpContext, metadataProvider);
+            var binder = CreateBinder(new[] { formatter }, new MvcOptions()
+            {
+                InputFormatterExceptionPolicy = inputFormatterExceptionPolicy
+            });
+
+            // Act & Assert
+            var exception = await Assert.ThrowsAsync<IOException>(() => binder.BindModelAsync(bindingContext));
+            Assert.Equal("Unable to read input stream!!", exception.Message);
+        }
+
+        public static TheoryData<IInputFormatter, string, InputFormatterExceptionPolicy> DerivedInputFormattersThrowingNonInputFormatterException
+        {
+            get
+            {
+                return new TheoryData<IInputFormatter, string, InputFormatterExceptionPolicy>()
+                {
+                    { new DerivedXmlSerializerInputFormatter(throwNonInputFormatterException: true), "text/xml", InputFormatterExceptionPolicy.AllExceptions },
+                    { new DerivedXmlSerializerInputFormatter(throwNonInputFormatterException: true), "text/xml", InputFormatterExceptionPolicy.MalformedInputExceptions },
+                    { new DerivedXmlDataContractSerializerInputFormatter(throwNonInputFormatterException: true), "text/xml", InputFormatterExceptionPolicy.AllExceptions },
+                    { new DerivedXmlDataContractSerializerInputFormatter(throwNonInputFormatterException: true), "text/xml", InputFormatterExceptionPolicy.MalformedInputExceptions },
+                    { new DerivedJsonInputFormatter(throwNonInputFormatterException: true), "text/json", InputFormatterExceptionPolicy.AllExceptions },
+                    { new DerivedJsonInputFormatter(throwNonInputFormatterException: true), "text/json", InputFormatterExceptionPolicy.MalformedInputExceptions },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(DerivedInputFormattersThrowingNonInputFormatterException))]
+        public async Task BindModel_DerivedXmlInputFormatters_ThrowingNonInputFormatingException_AddsErrorToModelState(
+            IInputFormatter formatter,
+            string contentType,
+            InputFormatterExceptionPolicy inputFormatterExceptionPolicy)
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Body = new MemoryStream(Encoding.UTF8.GetBytes("valid data!"));
+            httpContext.Request.ContentType = contentType;
+
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider.ForType<Person>().BindingDetails(d => d.BindingSource = BindingSource.Body);
+
+            var bindingContext = GetBindingContext(typeof(Person), httpContext, metadataProvider);
+            var binder = CreateBinder(new[] { formatter }, new MvcOptions()
+            {
+                InputFormatterExceptionPolicy = inputFormatterExceptionPolicy
+            });
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+
+            // Key is the empty string because this was a top-level binding.
+            var entry = Assert.Single(bindingContext.ModelState);
+            Assert.Equal(string.Empty, entry.Key);
+            var errorMessage = Assert.Single(entry.Value.Errors).Exception.Message;
+            Assert.Equal("Unable to read input stream!!", errorMessage);
+            Assert.IsType<IOException>(entry.Value.Errors[0].Exception);
+        }
+
+        [Fact]
+        public async Task BindModel_CustomFormatter_ThrowingNonInputFormatterException_Throws()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Body = new MemoryStream(Encoding.UTF8.GetBytes("valid data"));
+            httpContext.Request.ContentType = "text/xyz";
+
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider.ForType<Person>().BindingDetails(d => d.BindingSource = BindingSource.Body);
+
+            var bindingContext = GetBindingContext(typeof(Person), httpContext, metadataProvider);
+            var formatter = new XyzFormatter((inputFormatterContext, encoding) =>
+            {
+                throw new IOException("Unable to read input stream!!");
+            });
+            var binder = CreateBinder(
+                new[] { formatter },
+                new MvcOptions()
+                {
+                    InputFormatterExceptionPolicy = InputFormatterExceptionPolicy.MalformedInputExceptions
+                });
+
+            // Act
+            var exception = await Assert.ThrowsAsync<IOException>(
+                () => binder.BindModelAsync(bindingContext));
+            Assert.Equal("Unable to read input stream!!", exception.Message);
+        }
+
+        [Fact]
+        public async Task BindModel_CustomFormatter_ThrowingNonInputFormatterException_AddsErrorToModelState()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Body = new MemoryStream(Encoding.UTF8.GetBytes("Bad data!"));
+            httpContext.Request.ContentType = "text/xyz";
+
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider.ForType<Person>().BindingDetails(d => d.BindingSource = BindingSource.Body);
+
+            var bindingContext = GetBindingContext(typeof(Person), httpContext, metadataProvider);
+            var formatter = new XyzFormatter((inputFormatterContext, encoding) =>
+            {
+                throw new IOException("Unable to read input stream!!");
+            });
+            var binder = CreateBinder(
+                new[] { formatter },
+                new MvcOptions()
+                {
+                    InputFormatterExceptionPolicy = InputFormatterExceptionPolicy.AllExceptions
+                });
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+
+            // Key is the empty string because this was a top-level binding.
+            var entry = Assert.Single(bindingContext.ModelState);
+            Assert.Equal(string.Empty, entry.Key);
+            var errorMessage = Assert.Single(entry.Value.Errors).Exception.Message;
+            Assert.Equal("Unable to read input stream!!", errorMessage);
+            Assert.IsType<IOException>(entry.Value.Errors[0].Exception);
+        }
+
+        [Fact]
+        public async Task NullFormatterError_AddedToModelState()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.ContentType = "text/xyz";
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<Person>().BindingDetails(d => d.BindingSource = BindingSource.Body);
+
+            var bindingContext = GetBindingContext(
+                typeof(Person),
+                httpContext: httpContext,
+                metadataProvider: provider);
+
+            var binder = CreateBinder(new List<IInputFormatter>());
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+
+            // Key is the empty string because this was a top-level binding.
+            var entry = Assert.Single(bindingContext.ModelState);
+            Assert.Equal(string.Empty, entry.Key);
+            var errorMessage = Assert.Single(entry.Value.Errors).Exception.Message;
+            Assert.Equal("Unsupported content type 'text/xyz'.", errorMessage);
+        }
+
+        [Fact]
+        public async Task BindModelCoreAsync_UsesFirstFormatterWhichCanRead()
+        {
+            // Arrange
+            var canReadFormatter1 = new TestInputFormatter(canRead: true);
+            var canReadFormatter2 = new TestInputFormatter(canRead: true);
+            var inputFormatters = new List<IInputFormatter>()
+            {
+                new TestInputFormatter(canRead: false),
+                new TestInputFormatter(canRead: false),
+                canReadFormatter1,
+                canReadFormatter2
+            };
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<Person>().BindingDetails(d => d.BindingSource = BindingSource.Body);
+            var bindingContext = GetBindingContext(typeof(Person), metadataProvider: provider);
+            var binder = CreateBinder(inputFormatters);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Same(canReadFormatter1, bindingContext.Result.Model);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_LogsFormatterRejectionAndSelection()
+        {
+            // Arrange
+            var sink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
+            var inputFormatters = new List<IInputFormatter>()
+            {
+                new TestInputFormatter(canRead: false),
+                new TestInputFormatter(canRead: true),
+            };
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<Person>().BindingDetails(d => d.BindingSource = BindingSource.Body);
+            var bindingContext = GetBindingContext(typeof(Person), metadataProvider: provider);
+            bindingContext.HttpContext.Request.ContentType = "application/json";
+            var binder = new BodyModelBinder(inputFormatters, new TestHttpRequestStreamReaderFactory(), loggerFactory);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            var writeList = sink.Writes.ToList();
+
+            // Assert
+            Assert.Equal($"Attempting to bind model of type '{typeof(Person)}' using the name 'someName' in request data ...", writeList[0].State.ToString());
+            Assert.Equal($"Rejected input formatter '{typeof(TestInputFormatter)}' for content type 'application/json'.", writeList[1].State.ToString());
+            Assert.Equal($"Selected input formatter '{typeof(TestInputFormatter)}' for content type 'application/json'.", writeList[2].State.ToString());
+        }
+
+        [Fact]
+        public async Task BindModelAsync_LogsNoFormatterSelectedAndRemoveFromBodyAttribute()
+        {
+            // Arrange
+            var sink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
+            var inputFormatters = new List<IInputFormatter>()
+            {
+                new TestInputFormatter(canRead: false),
+                new TestInputFormatter(canRead: false),
+            };
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<Person>().BindingDetails(d => d.BindingSource = BindingSource.Body);
+            var bindingContext = GetBindingContext(typeof(Person), metadataProvider: provider);
+            bindingContext.HttpContext.Request.ContentType = "multipart/form-data";
+            bindingContext.BinderModelName = bindingContext.ModelName;
+            var binder = new BodyModelBinder(inputFormatters, new TestHttpRequestStreamReaderFactory(), loggerFactory);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.Collection(
+                sink.Writes,
+                write => Assert.Equal(
+                    $"Attempting to bind model of type '{typeof(Person)}' using the name 'someName' in request data ...", write.State.ToString()),
+                write => Assert.Equal(
+                    $"Rejected input formatter '{typeof(TestInputFormatter)}' for content type 'multipart/form-data'.", write.State.ToString()),
+                write => Assert.Equal(
+                    $"Rejected input formatter '{typeof(TestInputFormatter)}' for content type 'multipart/form-data'.", write.State.ToString()),
+                write => Assert.Equal(
+                    "No input formatter was found to support the content type 'multipart/form-data' for use with the [FromBody] attribute.", write.State.ToString()),
+                write => Assert.Equal(
+                    $"To use model binding, remove the [FromBody] attribute from the property or parameter named '{bindingContext.ModelName}' with model type '{bindingContext.ModelType}'.", write.State.ToString()),
+                write => Assert.Equal(
+                    $"Done attempting to bind model of type '{typeof(Person)}' using the name 'someName'.", write.State.ToString()));
+        }
+
+        [Fact]
+        public async Task BindModelAsync_DoesNotThrowNullReferenceException()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<Person>().BindingDetails(d => d.BindingSource = BindingSource.Body);
+            var bindingContext = GetBindingContext(
+                typeof(Person),
+                httpContext: httpContext,
+                metadataProvider: provider);
+            var binder = new BodyModelBinder(new List<IInputFormatter>(), new TestHttpRequestStreamReaderFactory());
+
+            // Act & Assert (does not throw)
+            await binder.BindModelAsync(bindingContext);
+        }
+
+        private static DefaultModelBindingContext GetBindingContext(
+            Type modelType,
+            HttpContext httpContext = null,
+            IModelMetadataProvider metadataProvider = null)
+        {
+            if (httpContext == null)
+            {
+                httpContext = new DefaultHttpContext();
+            }
+
+            if (metadataProvider == null)
+            {
+                metadataProvider = new EmptyModelMetadataProvider();
+            }
+
+            var bindingContext = new DefaultModelBindingContext
+            {
+                ActionContext = new ActionContext()
+                {
+                    HttpContext = httpContext,
+                },
+                FieldName = "someField",
+                IsTopLevelObject = true,
+                ModelMetadata = metadataProvider.GetMetadataForType(modelType),
+                ModelName = "someName",
+                ValueProvider = Mock.Of<IValueProvider>(),
+                ModelState = new ModelStateDictionary(),
+                BindingSource = BindingSource.Body,
+            };
+
+            return bindingContext;
+        }
+
+        private static BodyModelBinder CreateBinder(IList<IInputFormatter> formatters, bool treatEmptyInputAsDefaultValueOption = false)
+        {
+            var options = new MvcOptions { AllowEmptyInputInBodyModelBinding = treatEmptyInputAsDefaultValueOption };
+            return CreateBinder(formatters, options);
+        }
+
+        private static BodyModelBinder CreateBinder(IList<IInputFormatter> formatters, MvcOptions mvcOptions)
+        {
+            var sink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
+            return new BodyModelBinder(formatters, new TestHttpRequestStreamReaderFactory(), loggerFactory, mvcOptions);
+        }
+
+        private class XyzFormatter : TextInputFormatter
+        {
+            private readonly Func<InputFormatterContext, Encoding, Task<InputFormatterResult>> _readRequestBodyAsync;
+
+            public XyzFormatter(Func<InputFormatterContext, Encoding, Task<InputFormatterResult>> readRequestBodyAsync)
+            {
+                SupportedMediaTypes.Add(new MediaTypeHeaderValue("text/xyz"));
+                SupportedEncodings.Add(Encoding.UTF8);
+                _readRequestBodyAsync = readRequestBodyAsync;
+            }
+
+            protected override bool CanReadType(Type type)
+            {
+                return true;
+            }
+
+            public override Task<InputFormatterResult> ReadRequestBodyAsync(
+                InputFormatterContext context,
+                Encoding effectiveEncoding)
+            {
+                return _readRequestBodyAsync(context, effectiveEncoding);
+            }
+        }
+
+        private class TestInputFormatter : IInputFormatter
+        {
+            private readonly bool _canRead;
+
+            public TestInputFormatter(bool canRead)
+            {
+                _canRead = canRead;
+            }
+
+            public bool CanRead(InputFormatterContext context)
+            {
+                return _canRead;
+            }
+
+            public Task<InputFormatterResult> ReadAsync(InputFormatterContext context)
+            {
+                return InputFormatterResult.SuccessAsync(this);
+            }
+        }
+
+        private class TestableJsonInputFormatter : JsonInputFormatter
+        {
+            private readonly bool _throwNonInputFormatterException;
+
+            public TestableJsonInputFormatter(bool throwNonInputFormatterException)
+                : base(GetLogger(), new JsonSerializerSettings(), ArrayPool<char>.Shared, new DefaultObjectPoolProvider(), new MvcOptions(), new MvcJsonOptions()
+                {
+                    // The tests that use this class rely on the 2.1 behavior of this formatter.
+                    AllowInputFormatterExceptionMessages = true,
+                })
+            {
+                _throwNonInputFormatterException = throwNonInputFormatterException;
+            }
+
+            public override InputFormatterExceptionPolicy ExceptionPolicy => InputFormatterExceptionPolicy.MalformedInputExceptions;
+
+            public override Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterContext context, Encoding encoding)
+            {
+                if (_throwNonInputFormatterException)
+                {
+                    throw new IOException("Unable to read input stream!!");
+                }
+                return base.ReadRequestBodyAsync(context, encoding);
+            }
+        }
+
+        private class TestableXmlSerializerInputFormatter : XmlSerializerInputFormatter
+        {
+            private bool _throwNonInputFormatterException;
+
+            public TestableXmlSerializerInputFormatter(bool throwNonInputFormatterException)
+                : base(new MvcOptions())
+            {
+                _throwNonInputFormatterException = throwNonInputFormatterException;
+            }
+
+            public override InputFormatterExceptionPolicy ExceptionPolicy => InputFormatterExceptionPolicy.MalformedInputExceptions;
+
+            public override Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterContext context, Encoding encoding)
+            {
+                if (_throwNonInputFormatterException)
+                {
+                    throw new IOException("Unable to read input stream!!");
+                }
+                return base.ReadRequestBodyAsync(context, encoding);
+            }
+        }
+
+        private class TestableXmlDataContractSerializerInputFormatter : XmlDataContractSerializerInputFormatter
+        {
+            private bool _throwNonInputFormatterException;
+
+            public TestableXmlDataContractSerializerInputFormatter(bool throwNonInputFormatterException)
+                : base(new MvcOptions())
+            {
+                _throwNonInputFormatterException = throwNonInputFormatterException;
+            }
+
+            public override InputFormatterExceptionPolicy ExceptionPolicy => InputFormatterExceptionPolicy.MalformedInputExceptions;
+
+            public override Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterContext context, Encoding encoding)
+            {
+                if (_throwNonInputFormatterException)
+                {
+                    throw new IOException("Unable to read input stream!!");
+                }
+                return base.ReadRequestBodyAsync(context, encoding);
+            }
+        }
+
+        private class DerivedJsonInputFormatter : JsonInputFormatter
+        {
+            private readonly bool _throwNonInputFormatterException;
+
+            public DerivedJsonInputFormatter(bool throwNonInputFormatterException)
+                : base(GetLogger(), new JsonSerializerSettings(), ArrayPool<char>.Shared, new DefaultObjectPoolProvider(), new MvcOptions(), new MvcJsonOptions()
+                {
+                    // The tests that use this class rely on the 2.1 behavior of this formatter.
+                    AllowInputFormatterExceptionMessages = true,
+                })
+            {
+                _throwNonInputFormatterException = throwNonInputFormatterException;
+            }
+
+            public override InputFormatterExceptionPolicy ExceptionPolicy => InputFormatterExceptionPolicy.AllExceptions;
+
+            public override Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterContext context, Encoding encoding)
+            {
+                if (_throwNonInputFormatterException)
+                {
+                    throw new IOException("Unable to read input stream!!");
+                }
+                return base.ReadRequestBodyAsync(context, encoding);
+            }
+        }
+
+        private class DerivedXmlSerializerInputFormatter : XmlSerializerInputFormatter
+        {
+            private bool _throwNonInputFormatterException;
+
+            public DerivedXmlSerializerInputFormatter(bool throwNonInputFormatterException)
+                : base(new MvcOptions())
+            {
+                _throwNonInputFormatterException = throwNonInputFormatterException;
+            }
+
+            public override InputFormatterExceptionPolicy ExceptionPolicy => InputFormatterExceptionPolicy.AllExceptions;
+
+            public override Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterContext context, Encoding encoding)
+            {
+                if (_throwNonInputFormatterException)
+                {
+                    throw new IOException("Unable to read input stream!!");
+                }
+                return base.ReadRequestBodyAsync(context, encoding);
+            }
+        }
+
+        private class DerivedXmlDataContractSerializerInputFormatter : XmlDataContractSerializerInputFormatter
+        {
+            private bool _throwNonInputFormatterException;
+
+            public DerivedXmlDataContractSerializerInputFormatter(bool throwNonInputFormatterException)
+                : base(new MvcOptions())
+            {
+                _throwNonInputFormatterException = throwNonInputFormatterException;
+            }
+
+            public override InputFormatterExceptionPolicy ExceptionPolicy => InputFormatterExceptionPolicy.AllExceptions;
+
+            public override Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterContext context, Encoding encoding)
+            {
+                if (_throwNonInputFormatterException)
+                {
+                    throw new IOException("Unable to read input stream!!");
+                }
+                return base.ReadRequestBodyAsync(context, encoding);
+            }
+        }
+
+        private static ILogger GetLogger()
+        {
+            return NullLogger.Instance;
+        }
+
+        // 'public' as XmlSerializer does not like non-public types
+        public class Person
+        {
+            public string Name { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ByteArrayModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ByteArrayModelBinderProviderTest.cs
new file mode 100644
index 0000000000..e7694592ae
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ByteArrayModelBinderProviderTest.cs
@@ -0,0 +1,48 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class ByteArrayModelBinderProviderTest
+    {
+        [Theory]
+        [InlineData(typeof(object))]
+        [InlineData(typeof(TestClass))]
+        [InlineData(typeof(IList<byte>))]
+        [InlineData(typeof(int[]))]
+        public void Create_ForNonByteArrayTypes_ReturnsNull(Type modelType)
+        {
+            // Arrange
+            var provider = new ByteArrayModelBinderProvider();
+            var context = new TestModelBinderProviderContext(modelType);
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void Create_ForByteArray_ReturnsBinder()
+        {
+            // Arrange
+            var provider = new ByteArrayModelBinderProvider();
+            var context = new TestModelBinderProviderContext(typeof(byte[]));
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.IsType<ByteArrayModelBinder>(result);
+        }
+
+        private class TestClass
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ByteArrayModelBinderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ByteArrayModelBinderTests.cs
new file mode 100644
index 0000000000..4679658416
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ByteArrayModelBinderTests.cs
@@ -0,0 +1,119 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging.Abstractions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class ByteArrayModelBinderTests
+    {
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public async Task BindModelSetsModelToNullOnNullOrEmptyString(string value)
+        {
+            // Arrange
+            var valueProvider = new SimpleValueProvider()
+            {
+                { "foo", value }
+            };
+
+            var bindingContext = GetBindingContext(valueProvider, typeof(byte[]));
+            var binder = new ByteArrayModelBinder(NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+
+            var modelState = Assert.Single(bindingContext.ModelState);
+            Assert.Equal("foo", modelState.Key);
+            Assert.Equal(string.Empty, modelState.Value.RawValue);
+        }
+
+        [Fact]
+        public async Task BindModel()
+        {
+            // Arrange
+            var valueProvider = new SimpleValueProvider()
+            {
+                { "foo", "Fys1" }
+            };
+
+            var bindingContext = GetBindingContext(valueProvider, typeof(byte[]));
+            var binder = new ByteArrayModelBinder(NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            var bytes = Assert.IsType<byte[]>(bindingContext.Result.Model);
+            Assert.Equal(new byte[] { 23, 43, 53 }, bytes);
+        }
+
+        [Fact]
+        public async Task BindModelAddsModelErrorsOnInvalidCharacters()
+        {
+            // Arrange
+            var expected = "The value '\"Fys1\"' is not valid.";
+
+            var valueProvider = new SimpleValueProvider()
+            {
+                { "foo", "\"Fys1\"" }
+            };
+
+            var bindingContext = GetBindingContext(valueProvider, typeof(byte[]));
+            var binder = new ByteArrayModelBinder(NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.False(bindingContext.ModelState.IsValid);
+            var error = Assert.Single(bindingContext.ModelState["foo"].Errors);
+            Assert.Equal(expected, error.ErrorMessage);
+        }
+
+        [Fact]
+        public async Task BindModel_ReturnsWithIsModelSetFalse_WhenValueNotFound()
+        {
+            // Arrange
+            var valueProvider = new SimpleValueProvider()
+            {
+                { "someName", "" }
+            };
+
+            var bindingContext = GetBindingContext(valueProvider, typeof(byte[]));
+            var binder = new ByteArrayModelBinder(NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+
+            Assert.Empty(bindingContext.ModelState); // No submitted data for "foo".
+        }
+
+        private static DefaultModelBindingContext GetBindingContext(IValueProvider valueProvider, Type modelType)
+        {
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var bindingContext = new DefaultModelBindingContext
+            {
+                ModelMetadata = metadataProvider.GetMetadataForType(modelType),
+                ModelName = "foo",
+                ModelState = new ModelStateDictionary(),
+                ValueProvider = valueProvider,
+            };
+            return bindingContext;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CancellationTokenModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CancellationTokenModelBinderProviderTest.cs
new file mode 100644
index 0000000000..676485a8ae
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CancellationTokenModelBinderProviderTest.cs
@@ -0,0 +1,49 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class CancellationTokenModelBinderProviderTest
+    {
+        [Theory]
+        [InlineData(typeof(object))]
+        [InlineData(typeof(TestClass))]
+        [InlineData(typeof(IList<int>))]
+        [InlineData(typeof(int[]))]
+        public void Create_ForNonCancellationTokenTypes_ReturnsNull(Type modelType)
+        {
+            // Arrange
+            var provider = new CancellationTokenModelBinderProvider();
+            var context = new TestModelBinderProviderContext(modelType);
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void Create_ForCancellationToken_ReturnsBinder()
+        {
+            // Arrange
+            var provider = new CancellationTokenModelBinderProvider();
+            var context = new TestModelBinderProviderContext(typeof(CancellationToken));
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.IsType<CancellationTokenModelBinder>(result);
+        }
+
+        private class TestClass
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CancellationTokenModelBinderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CancellationTokenModelBinderTests.cs
new file mode 100644
index 0000000000..93a21b60b7
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CancellationTokenModelBinderTests.cs
@@ -0,0 +1,48 @@
+// 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.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class CancellationTokenModelBinderTests
+    {
+        [Fact]
+        public async Task CancellationTokenModelBinder_ReturnsNonEmptyResult_ForCancellationTokenType()
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(typeof(CancellationToken));
+            var binder = new CancellationTokenModelBinder();
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Equal(bindingContext.HttpContext.RequestAborted, bindingContext.Result.Model);
+        }
+
+        private static DefaultModelBindingContext GetBindingContext(Type modelType)
+        {
+            var metadataProvider = new EmptyModelMetadataProvider();
+            DefaultModelBindingContext bindingContext = new DefaultModelBindingContext
+            {
+                ActionContext = new ActionContext()
+                {
+                    HttpContext = new DefaultHttpContext(),
+                },
+                ModelMetadata = metadataProvider.GetMetadataForType(modelType),
+                ModelName = "someName",
+                ValueProvider = new SimpleValueProvider(),
+                ValidationState = new ValidationStateDictionary(),
+            };
+
+            return bindingContext;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CollectionModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CollectionModelBinderProviderTest.cs
new file mode 100644
index 0000000000..d0cd6091bb
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CollectionModelBinderProviderTest.cs
@@ -0,0 +1,76 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class CollectionModelBinderProviderTest
+    {
+        [Theory]
+        [InlineData(typeof(object))]
+        [InlineData(typeof(int))]
+        [InlineData(typeof(Person))]
+        [InlineData(typeof(int[]))]
+        public void Create_ForNonSupportedTypes_ReturnsNull(Type modelType)
+        {
+            // Arrange
+            var provider = new CollectionModelBinderProvider();
+
+            var context = new TestModelBinderProviderContext(modelType);
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Theory]
+
+        // These aren't ICollection<> - we can handle them by creating a List<>
+        [InlineData(typeof(IEnumerable<int>))]
+        [InlineData(typeof(IReadOnlyCollection<int>))]
+        [InlineData(typeof(IReadOnlyList<int>))]
+
+        // These are ICollection<> - we can handle them by adding items to the existing collection or
+        // creating a new one.
+        [InlineData(typeof(ICollection<int>))]
+        [InlineData(typeof(IList<int>))]
+        [InlineData(typeof(List<int>))]
+        [InlineData(typeof(Collection<int>))]
+        public void Create_ForSupportedTypes_ReturnsBinder(Type modelType)
+        {
+            // Arrange
+            var provider = new CollectionModelBinderProvider();
+
+            var context = new TestModelBinderProviderContext(modelType);
+
+            Type elementType = null;
+            context.OnCreatingBinder(m =>
+            {
+                Assert.Equal(typeof(int), m.ModelType);
+                elementType = m.ModelType;
+                return Mock.Of<IModelBinder>();
+            });
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.NotNull(elementType);
+            Assert.IsType<CollectionModelBinder<int>>(result);
+        }
+
+        private class Person
+        {
+            public string Name { get; set; }
+
+            public int Age { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CollectionModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CollectionModelBinderTest.cs
new file mode 100644
index 0000000000..b34cd09da5
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CollectionModelBinderTest.cs
@@ -0,0 +1,443 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Logging.Abstractions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class CollectionModelBinderTest
+    {
+        [Fact]
+        public async Task BindComplexCollectionFromIndexes_FiniteIndexes()
+        {
+            // Arrange
+            var valueProvider = new SimpleValueProvider
+            {
+                { "someName[foo]", "42" },
+                { "someName[baz]", "200" }
+            };
+            var bindingContext = GetModelBindingContext(valueProvider);
+            var binder = new CollectionModelBinder<int>(CreateIntBinder(), NullLoggerFactory.Instance);
+
+            // Act
+            var collectionResult = await binder.BindComplexCollectionFromIndexes(
+                bindingContext,
+                new[] { "foo", "bar", "baz" });
+
+            // Assert
+            Assert.Equal(new[] { 42, 0, 200 }, collectionResult.Model.ToArray());
+
+            // This requires a non-default IValidationStrategy
+            var strategy = Assert.IsType<ExplicitIndexCollectionValidationStrategy>(collectionResult.ValidationStrategy);
+            Assert.Equal(new[] { "foo", "bar", "baz" }, strategy.ElementKeys);
+        }
+
+        [Fact]
+        public async Task BindComplexCollectionFromIndexes_InfiniteIndexes()
+        {
+            // Arrange
+            var valueProvider = new SimpleValueProvider
+            {
+                { "someName[0]", "42" },
+                { "someName[1]", "100" },
+                { "someName[3]", "400" }
+            };
+            var bindingContext = GetModelBindingContext(valueProvider);
+            var binder = new CollectionModelBinder<int>(CreateIntBinder(), NullLoggerFactory.Instance);
+
+            // Act
+            var boundCollection = await binder.BindComplexCollectionFromIndexes(bindingContext, indexNames: null);
+
+            // Assert
+            Assert.Equal(new[] { 42, 100 }, boundCollection.Model.ToArray());
+
+            // This uses the default IValidationStrategy
+            Assert.DoesNotContain(boundCollection, bindingContext.ValidationState.Keys);
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public async Task BindModel_ComplexCollection_Succeeds(bool isReadOnly)
+        {
+            // Arrange
+            var valueProvider = new SimpleValueProvider
+            {
+                { "someName.index", new[] { "foo", "bar", "baz" } },
+                { "someName[foo]", "42" },
+                { "someName[bar]", "100" },
+                { "someName[baz]", "200" }
+            };
+            var bindingContext = GetModelBindingContext(valueProvider, isReadOnly);
+            var modelState = bindingContext.ModelState;
+            var binder = new CollectionModelBinder<int>(CreateIntBinder(), NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+
+            var list = Assert.IsAssignableFrom<IList<int>>(bindingContext.Result.Model);
+            Assert.Equal(new[] { 42, 100, 200 }, list.ToArray());
+
+            Assert.True(modelState.IsValid);
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public async Task BindModel_ComplexCollection_BindingContextModelNonNull_Succeeds(bool isReadOnly)
+        {
+            // Arrange
+            var valueProvider = new SimpleValueProvider
+            {
+                { "someName.index", new[] { "foo", "bar", "baz" } },
+                { "someName[foo]", "42" },
+                { "someName[bar]", "100" },
+                { "someName[baz]", "200" }
+            };
+            var bindingContext = GetModelBindingContext(valueProvider, isReadOnly);
+            var modelState = bindingContext.ModelState;
+            var list = new List<int>();
+            bindingContext.Model = list;
+            var binder = new CollectionModelBinder<int>(CreateIntBinder(), NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+
+            Assert.Same(list, bindingContext.Result.Model);
+            Assert.Equal(new[] { 42, 100, 200 }, list.ToArray());
+
+            Assert.True(modelState.IsValid);
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public async Task BindModel_SimpleCollection_Succeeds(bool isReadOnly)
+        {
+            // Arrange
+            var valueProvider = new SimpleValueProvider
+            {
+                { "someName", new[] { "42", "100", "200" } }
+            };
+            var bindingContext = GetModelBindingContext(valueProvider, isReadOnly);
+            var modelState = bindingContext.ModelState;
+            var binder = new CollectionModelBinder<int>(CreateIntBinder(), NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+
+            var list = Assert.IsAssignableFrom<IList<int>>(bindingContext.Result.Model);
+            Assert.Equal(new[] { 42, 100, 200 }, list.ToArray());
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public async Task BindModel_SimpleCollection_BindingContextModelNonNull_Succeeds(bool isReadOnly)
+        {
+            // Arrange
+            var valueProvider = new SimpleValueProvider
+            {
+                { "someName", new[] { "42", "100", "200" } }
+            };
+            var bindingContext = GetModelBindingContext(valueProvider, isReadOnly);
+            var modelState = bindingContext.ModelState;
+            var list = new List<int>();
+            bindingContext.Model = list;
+            var binder = new CollectionModelBinder<int>(CreateIntBinder(), NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+
+            Assert.Same(list, bindingContext.Result.Model);
+            Assert.Equal(new[] { 42, 100, 200 }, list.ToArray());
+        }
+
+        [Fact]
+        public async Task BindModelAsync_SimpleCollectionWithNullValue_Succeeds()
+        {
+            // Arrange
+            var binder = new CollectionModelBinder<int>(CreateIntBinder(), NullLoggerFactory.Instance);
+            var valueProvider = new SimpleValueProvider
+            {
+                { "someName", null },
+            };
+            var bindingContext = GetModelBindingContext(valueProvider, isReadOnly: false);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+
+            var model = Assert.IsType<List<int>>(bindingContext.Result.Model);
+            Assert.Empty(model);
+        }
+
+        [Fact]
+        public async Task BindSimpleCollection_RawValueIsEmptyCollection_ReturnsEmptyList()
+        {
+            // Arrange
+            var binder = new CollectionModelBinder<int>(CreateIntBinder(), NullLoggerFactory.Instance);
+            var context = GetModelBindingContext(new SimpleValueProvider());
+
+            // Act
+            var boundCollection = await binder.BindSimpleCollection(context, new ValueProviderResult(new string[0]));
+
+            // Assert
+            Assert.NotNull(boundCollection.Model);
+            Assert.Empty(boundCollection.Model);
+        }
+
+        [Fact]
+        public async Task CollectionModelBinder_CreatesEmptyCollection_IfIsTopLevelObject()
+        {
+            // Arrange
+            var binder = new CollectionModelBinder<string>(
+                new StubModelBinder(result: ModelBindingResult.Failed()),
+                NullLoggerFactory.Instance);
+
+            var bindingContext = CreateContext();
+            bindingContext.IsTopLevelObject = true;
+
+            // Lack of prefix and non-empty model name both ignored.
+            bindingContext.ModelName = "modelName";
+
+            var metadataProvider = new TestModelMetadataProvider();
+            bindingContext.ModelMetadata = metadataProvider.GetMetadataForType(typeof(List<string>));
+
+            bindingContext.ValueProvider = new TestValueProvider(new Dictionary<string, object>());
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.Empty(Assert.IsType<List<string>>(bindingContext.Result.Model));
+            Assert.True(bindingContext.Result.IsModelSet);
+        }
+
+        // Setup like CollectionModelBinder_CreatesEmptyCollection_IfIsTopLevelObject  except
+        // Model already has a value.
+        [Fact]
+        public async Task CollectionModelBinder_DoesNotCreateEmptyCollection_IfModelNonNull()
+        {
+            // Arrange
+            var binder = new CollectionModelBinder<string>(
+                new StubModelBinder(result: ModelBindingResult.Failed()),
+                NullLoggerFactory.Instance);
+
+            var bindingContext = CreateContext();
+            bindingContext.IsTopLevelObject = true;
+
+            var list = new List<string>();
+            bindingContext.Model = list;
+
+            // Lack of prefix and non-empty model name both ignored.
+            bindingContext.ModelName = "modelName";
+
+            var metadataProvider = new TestModelMetadataProvider();
+            bindingContext.ModelMetadata = metadataProvider.GetMetadataForType(typeof(List<string>));
+
+            bindingContext.ValueProvider = new TestValueProvider(new Dictionary<string, object>());
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.Same(list, bindingContext.Result.Model);
+            Assert.Empty(list);
+            Assert.True(bindingContext.Result.IsModelSet);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData("param")]
+        public async Task CollectionModelBinder_DoesNotCreateCollection_IfNotIsTopLevelObject(string prefix)
+        {
+            // Arrange
+            var binder = new CollectionModelBinder<string>(
+                new StubModelBinder(result: ModelBindingResult.Failed()),
+                NullLoggerFactory.Instance);
+
+            var bindingContext = CreateContext();
+            bindingContext.ModelName = ModelNames.CreatePropertyModelName(prefix, "ListProperty");
+
+            var metadataProvider = new TestModelMetadataProvider();
+            bindingContext.ModelMetadata = metadataProvider.GetMetadataForProperty(
+                typeof(ModelWithListProperty),
+                nameof(ModelWithListProperty.ListProperty));
+
+            bindingContext.ValueProvider = new TestValueProvider(new Dictionary<string, object>());
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+        }
+
+        // Model type -> can create instance.
+        public static TheoryData<Type, bool> CanCreateInstanceData
+        {
+            get
+            {
+                return new TheoryData<Type, bool>
+                {
+                    { typeof(IEnumerable<int>), true },
+                    { typeof(ICollection<int>), true },
+                    { typeof(IList<int>), true },
+                    { typeof(List<int>), true },
+                    { typeof(LinkedList<int>), true },
+                    { typeof(ISet<int>), false },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(CanCreateInstanceData))]
+        public void CanCreateInstance_ReturnsExpectedValue(Type modelType, bool expectedResult)
+        {
+            // Arrange
+            var binder = new CollectionModelBinder<int>(CreateIntBinder(), NullLoggerFactory.Instance);
+
+            // Act
+            var result = binder.CanCreateInstance(modelType);
+
+            // Assert
+            Assert.Equal(expectedResult, result);
+        }
+
+        [Fact]
+        public async Task BindSimpleCollection_SubBindingSucceeds()
+        {
+            // Arrange
+            var culture = new CultureInfo("fr-FR");
+            var bindingContext = GetModelBindingContext(new SimpleValueProvider());
+
+            var elementBinder = new StubModelBinder(mbc =>
+            {
+                Assert.Equal("someName", mbc.ModelName);
+                mbc.Result = ModelBindingResult.Success(42);
+            });
+
+            var modelBinder = new CollectionModelBinder<int>(elementBinder, NullLoggerFactory.Instance);
+
+            // Act
+            var boundCollection = await modelBinder.BindSimpleCollection(
+                bindingContext,
+                new ValueProviderResult(new string[] { "0" }));
+
+            // Assert
+            Assert.Equal(new[] { 42 }, boundCollection.Model.ToArray());
+        }
+
+        private static DefaultModelBindingContext GetModelBindingContext(
+            IValueProvider valueProvider,
+            bool isReadOnly = false)
+        {
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider
+                .ForProperty<ModelWithIListProperty>(nameof(ModelWithIListProperty.ListProperty))
+                .BindingDetails(bd => bd.IsReadOnly = isReadOnly);
+            var metadata = metadataProvider.GetMetadataForProperty(
+                typeof(ModelWithIListProperty),
+                nameof(ModelWithIListProperty.ListProperty));
+
+            var bindingContext = new DefaultModelBindingContext
+            {
+                ModelMetadata = metadata,
+                ModelName = "someName",
+                ModelState = new ModelStateDictionary(),
+                ValueProvider = valueProvider,
+                ValidationState = new ValidationStateDictionary(),
+                FieldName = "testfieldname",
+            };
+
+            return bindingContext;
+        }
+
+        private static IModelBinder CreateIntBinder()
+        {
+            return new StubModelBinder(context =>
+            {
+                var value = context.ValueProvider.GetValue(context.ModelName);
+                if (value == ValueProviderResult.None)
+                {
+                    return ModelBindingResult.Failed();
+                }
+
+                object valueToConvert = null;
+                if (value.Values.Count == 1)
+                {
+                    valueToConvert = value.Values[0];
+                }
+                else if (value.Values.Count > 1)
+                {
+                    valueToConvert = value.Values.ToArray();
+                }
+
+                var model = ModelBindingHelper.ConvertTo(valueToConvert, context.ModelType, value.Culture);
+                if (model == null)
+                {
+                    return ModelBindingResult.Failed();
+                }
+                else
+                {
+                    return ModelBindingResult.Success(model);
+                }
+            });
+        }
+
+        private static DefaultModelBindingContext CreateContext()
+        {
+            var modelBindingContext = new DefaultModelBindingContext()
+            {
+                ActionContext = new ActionContext()
+                {
+                    HttpContext = new DefaultHttpContext(),
+                },
+            };
+
+            return modelBindingContext;
+        }
+
+        private class ModelWithListProperty
+        {
+            public List<string> ListProperty { get; set; }
+        }
+
+        private class ModelWithIListProperty
+        {
+            public IList<int> ListProperty { get; set; }
+        }
+
+        private class ModelWithSimpleProperties
+        {
+            public int Id { get; set; }
+
+            public string Name { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderProviderTest.cs
new file mode 100644
index 0000000000..9dc044f814
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderProviderTest.cs
@@ -0,0 +1,65 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class ComplexTypeModelBinderProviderTest
+    {
+        [Theory]
+        [InlineData(typeof(string))]
+        [InlineData(typeof(int))]
+        [InlineData(typeof(List<int>))]
+        public void Create_ForNonComplexType_ReturnsNull(Type modelType)
+        {
+            // Arrange
+            var provider = new ComplexTypeModelBinderProvider();
+
+            var context = new TestModelBinderProviderContext(modelType);
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void Create_ForSupportedTypes_ReturnsBinder()
+        {
+            // Arrange
+            var provider = new ComplexTypeModelBinderProvider();
+
+            var context = new TestModelBinderProviderContext(typeof(Person));
+            context.OnCreatingBinder(m =>
+            {
+                if (m.ModelType == typeof(int) || m.ModelType == typeof(string))
+                {
+                    return Mock.Of<IModelBinder>();
+                }
+                else
+                {
+                    Assert.False(true, "Not the right model type");
+                    return null;
+                }
+            });
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.IsType<ComplexTypeModelBinder>(result);
+        }
+
+        private class Person
+        {
+            public string Name { get; set; }
+
+            public int Age { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderTest.cs
new file mode 100644
index 0000000000..c76eb27c0a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderTest.cs
@@ -0,0 +1,1461 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class ComplexTypeModelBinderTest
+    {
+        private static readonly IModelMetadataProvider _metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+        [Theory]
+        [InlineData(true, true)]
+        [InlineData(false, false)]
+        public void CanCreateModel_ReturnsTrue_IfIsTopLevelObject(
+            bool isTopLevelObject,
+            bool expectedCanCreate)
+        {
+            var bindingContext = CreateContext(GetMetadataForType(typeof(Person)));
+            bindingContext.IsTopLevelObject = isTopLevelObject;
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            var canCreate = binder.CanCreateModel(bindingContext);
+
+            // Assert
+            Assert.Equal(expectedCanCreate, canCreate);
+        }
+
+        [Fact]
+        public void CanCreateModel_ReturnsFalse_IfNotIsTopLevelObjectAndModelIsMarkedWithBinderMetadata()
+        {
+            var modelMetadata = GetMetadataForProperty(typeof(Document), nameof(Document.SubDocument));
+
+            var bindingContext = CreateContext(modelMetadata);
+            bindingContext.IsTopLevelObject = false;
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            var canCreate = binder.CanCreateModel(bindingContext);
+
+            // Assert
+            Assert.False(canCreate);
+        }
+
+        [Fact]
+        public void CanCreateModel_ReturnsTrue_IfIsTopLevelObjectAndModelIsMarkedWithBinderMetadata()
+        {
+            var bindingContext = CreateContext(GetMetadataForType(typeof(Document)));
+            bindingContext.IsTopLevelObject = true;
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            var canCreate = binder.CanCreateModel(bindingContext);
+
+            // Assert
+            Assert.True(canCreate);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void CanCreateModel_CreatesModel_WithAllGreedyProperties(bool isTopLevelObject)
+        {
+            var bindingContext = CreateContext(GetMetadataForType(typeof(HasAllGreedyProperties)));
+            bindingContext.IsTopLevelObject = isTopLevelObject;
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            var canCreate = binder.CanCreateModel(bindingContext);
+
+            // Assert
+            Assert.True(canCreate);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void CanCreateModel_ReturnsTrue_IfNotIsTopLevelObject_BasedOnValueAvailability(
+            bool valueAvailable)
+        {
+            // Arrange
+            var valueProvider = new Mock<IValueProvider>(MockBehavior.Strict);
+            valueProvider
+                .Setup(provider => provider.ContainsPrefix("SimpleContainer.Simple.Name"))
+                .Returns(valueAvailable);
+
+            var modelMetadata = GetMetadataForProperty(typeof(SimpleContainer), nameof(SimpleContainer.Simple));
+            var bindingContext = CreateContext(modelMetadata);
+            bindingContext.IsTopLevelObject = false;
+            bindingContext.ModelName = "SimpleContainer.Simple";
+            bindingContext.ValueProvider = valueProvider.Object;
+            bindingContext.OriginalValueProvider = valueProvider.Object;
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            var canCreate = binder.CanCreateModel(bindingContext);
+
+            // Assert
+            // Result matches whether first Simple property can bind.
+            Assert.Equal(valueAvailable, canCreate);
+        }
+
+        [Fact]
+        public void CanCreateModel_ReturnsFalse_IfNotIsTopLevelObjectAndModelHasNoProperties()
+        {
+            // Arrange
+            var bindingContext = CreateContext(GetMetadataForType(typeof(PersonWithNoProperties)));
+            bindingContext.IsTopLevelObject = false;
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            var canCreate = binder.CanCreateModel(bindingContext);
+
+            // Assert
+            Assert.False(canCreate);
+        }
+
+        [Fact]
+        public void CanCreateModel_ReturnsTrue_IfIsTopLevelObjectAndModelHasNoProperties()
+        {
+            // Arrange
+            var bindingContext = CreateContext(GetMetadataForType(typeof(PersonWithNoProperties)));
+            bindingContext.IsTopLevelObject = true;
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            var canCreate = binder.CanCreateModel(bindingContext);
+
+            // Assert
+            Assert.True(canCreate);
+        }
+
+        [Theory]
+        [InlineData(typeof(TypeWithNoBinderMetadata), false)]
+        [InlineData(typeof(TypeWithNoBinderMetadata), true)]
+        [InlineData(typeof(TypeWithAtLeastOnePropertyMarkedUsingValueBinderMetadata), false)]
+        [InlineData(typeof(TypeWithAtLeastOnePropertyMarkedUsingValueBinderMetadata), true)]
+        [InlineData(typeof(TypeWithUnmarkedAndBinderMetadataMarkedProperties), false)]
+        [InlineData(typeof(TypeWithUnmarkedAndBinderMetadataMarkedProperties), true)]
+        public void CanCreateModel_CreatesModelForValueProviderBasedBinderMetadatas_IfAValueProviderProvidesValue(
+            Type modelType,
+            bool valueProviderProvidesValue)
+        {
+            var valueProvider = new Mock<IValueProvider>();
+            valueProvider
+                .Setup(o => o.ContainsPrefix(It.IsAny<string>()))
+                .Returns(valueProviderProvidesValue);
+
+            var bindingContext = CreateContext(GetMetadataForType(modelType));
+            bindingContext.IsTopLevelObject = false;
+            bindingContext.ValueProvider = valueProvider.Object;
+            bindingContext.OriginalValueProvider = valueProvider.Object;
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            var canCreate = binder.CanCreateModel(bindingContext);
+
+            // Assert
+            Assert.Equal(valueProviderProvidesValue, canCreate);
+        }
+
+        [Theory]
+        [InlineData(typeof(TypeWithAtLeastOnePropertyMarkedUsingValueBinderMetadata), false)]
+        [InlineData(typeof(TypeWithAtLeastOnePropertyMarkedUsingValueBinderMetadata), true)]
+        public void CanCreateModel_ForExplicitValueProviderMetadata_UsesOriginalValueProvider(
+            Type modelType,
+            bool originalValueProviderProvidesValue)
+        {
+            var valueProvider = new Mock<IValueProvider>();
+            valueProvider
+                .Setup(o => o.ContainsPrefix(It.IsAny<string>()))
+                .Returns(false);
+
+            var originalValueProvider = new Mock<IBindingSourceValueProvider>();
+            originalValueProvider
+                .Setup(o => o.ContainsPrefix(It.IsAny<string>()))
+                .Returns(originalValueProviderProvidesValue);
+
+            originalValueProvider
+                .Setup(o => o.Filter(It.IsAny<BindingSource>()))
+                .Returns<BindingSource>(source => source == BindingSource.Query ? originalValueProvider.Object : null);
+
+            var bindingContext = CreateContext(GetMetadataForType(modelType));
+            bindingContext.IsTopLevelObject = false;
+            bindingContext.ValueProvider = valueProvider.Object;
+            bindingContext.OriginalValueProvider = originalValueProvider.Object;
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            var canCreate = binder.CanCreateModel(bindingContext);
+
+            // Assert
+            Assert.Equal(originalValueProviderProvidesValue, canCreate);
+        }
+
+        [Theory]
+        [InlineData(typeof(TypeWithUnmarkedAndBinderMetadataMarkedProperties), false)]
+        [InlineData(typeof(TypeWithUnmarkedAndBinderMetadataMarkedProperties), true)]
+        [InlineData(typeof(TypeWithNoBinderMetadata), false)]
+        [InlineData(typeof(TypeWithNoBinderMetadata), true)]
+        public void CanCreateModel_UnmarkedProperties_UsesCurrentValueProvider(
+            Type modelType,
+            bool valueProviderProvidesValue)
+        {
+            var valueProvider = new Mock<IValueProvider>();
+            valueProvider
+                .Setup(o => o.ContainsPrefix(It.IsAny<string>()))
+                .Returns(valueProviderProvidesValue);
+
+            var originalValueProvider = new Mock<IValueProvider>();
+            originalValueProvider
+                .Setup(o => o.ContainsPrefix(It.IsAny<string>()))
+                .Returns(false);
+
+            var bindingContext = CreateContext(GetMetadataForType(modelType));
+            bindingContext.IsTopLevelObject = false;
+            bindingContext.ValueProvider = valueProvider.Object;
+            bindingContext.OriginalValueProvider = originalValueProvider.Object;
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            var canCreate = binder.CanCreateModel(bindingContext);
+
+            // Assert
+            Assert.Equal(valueProviderProvidesValue, canCreate);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_CreatesModel_IfIsTopLevelObject()
+        {
+            // Arrange
+            var mockValueProvider = new Mock<IValueProvider>();
+            mockValueProvider
+                .Setup(o => o.ContainsPrefix(It.IsAny<string>()))
+                .Returns(false);
+
+            // Mock binder fails to bind all properties.
+            var mockBinder = new StubModelBinder();
+
+            var bindingContext = new DefaultModelBindingContext
+            {
+                IsTopLevelObject = true,
+                ModelMetadata = GetMetadataForType(typeof(Person)),
+                ModelName = string.Empty,
+                ValueProvider = mockValueProvider.Object,
+                ModelState = new ModelStateDictionary(),
+            };
+
+            var model = new Person();
+
+            var testableBinder = new Mock<TestableComplexTypeModelBinder> { CallBase = true };
+            testableBinder
+                .Setup(o => o.CreateModelPublic(bindingContext))
+                .Returns(model)
+                .Verifiable();
+            testableBinder
+                .Setup(o => o.CanBindPropertyPublic(bindingContext, It.IsAny<ModelMetadata>()))
+                .Returns(false);
+
+            // Act
+            await testableBinder.Object.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            var returnedPerson = Assert.IsType<Person>(bindingContext.Result.Model);
+            Assert.Same(model, returnedPerson);
+            testableBinder.Verify();
+        }
+
+        [Theory]
+        [InlineData(nameof(MyModelTestingCanUpdateProperty.ReadOnlyInt), false)]    // read-only value type
+        [InlineData(nameof(MyModelTestingCanUpdateProperty.ReadOnlyObject), true)]
+        [InlineData(nameof(MyModelTestingCanUpdateProperty.ReadOnlySimple), true)]
+        [InlineData(nameof(MyModelTestingCanUpdateProperty.ReadOnlyString), false)]
+        [InlineData(nameof(MyModelTestingCanUpdateProperty.ReadWriteString), true)]
+        public void CanUpdateProperty_ReturnsExpectedValue(string propertyName, bool expected)
+        {
+            // Arrange
+
+            var propertyMetadata = GetMetadataForProperty(typeof(MyModelTestingCanUpdateProperty), propertyName);
+
+            // Act
+            var canUpdate = ComplexTypeModelBinder.CanUpdatePropertyInternal(propertyMetadata);
+
+            // Assert
+            Assert.Equal(expected, canUpdate);
+        }
+
+        [Theory]
+        [InlineData(nameof(CollectionContainer.ReadOnlyArray), false)]
+        [InlineData(nameof(CollectionContainer.ReadOnlyDictionary), true)]
+        [InlineData(nameof(CollectionContainer.ReadOnlyList), true)]
+        [InlineData(nameof(CollectionContainer.SettableArray), true)]
+        [InlineData(nameof(CollectionContainer.SettableDictionary), true)]
+        [InlineData(nameof(CollectionContainer.SettableList), true)]
+        public void CanUpdateProperty_CollectionProperty_FalseOnlyForArray(string propertyName, bool expected)
+        {
+            // Arrange
+            var metadataProvider = _metadataProvider;
+            var metadata = metadataProvider.GetMetadataForProperty(typeof(CollectionContainer), propertyName);
+
+            // Act
+            var canUpdate = ComplexTypeModelBinder.CanUpdatePropertyInternal(metadata);
+
+            // Assert
+            Assert.Equal(expected, canUpdate);
+        }
+
+        [Fact]
+        public void CreateModel_InstantiatesInstanceOfMetadataType()
+        {
+            // Arrange
+            var bindingContext = new DefaultModelBindingContext
+            {
+                ModelMetadata = GetMetadataForType(typeof(Person))
+            };
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            var model = binder.CreateModelPublic(bindingContext);
+
+            // Assert
+            Assert.IsType<Person>(model);
+        }
+
+        [Fact]
+        public void CreateModel_ForStructModelType_AsTopLevelObject_ThrowsException()
+        {
+            // Arrange
+            var bindingContext = new DefaultModelBindingContext
+            {
+                ModelMetadata = GetMetadataForType(typeof(PointStruct)),
+                IsTopLevelObject = true
+            };
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => binder.CreateModelPublic(bindingContext));
+            Assert.Equal(
+                string.Format(
+                    "Could not create an instance of type '{0}'. Model bound complex types must not be abstract or " +
+                    "value types and must have a parameterless constructor.",
+                    typeof(PointStruct).FullName),
+                exception.Message);
+        }
+
+        [Fact]
+        public void CreateModel_ForClassWithNoParameterlessConstructor_AsElement_ThrowsException()
+        {
+            // Arrange
+            var expectedMessage = "Could not create an instance of type " +
+                $"'{typeof(ClassWithNoParameterlessConstructor)}'. Model bound complex types must not be abstract " +
+                "or value types and must have a parameterless constructor.";
+            var metadata = GetMetadataForType(typeof(ClassWithNoParameterlessConstructor));
+            var bindingContext = new DefaultModelBindingContext
+            {
+                ModelMetadata = metadata,
+            };
+            var binder = CreateBinder(metadata);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => binder.CreateModelPublic(bindingContext));
+            Assert.Equal(expectedMessage, exception.Message);
+        }
+
+        [Fact]
+        public void CreateModel_ForStructModelType_AsProperty_ThrowsException()
+        {
+            // Arrange
+            var bindingContext = new DefaultModelBindingContext
+            {
+                ModelMetadata = GetMetadataForProperty(typeof(Location), nameof(Location.Point)),
+                ModelName = nameof(Location.Point),
+                IsTopLevelObject = false
+            };
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => binder.CreateModelPublic(bindingContext));
+            Assert.Equal(
+                string.Format(
+                    "Could not create an instance of type '{0}'. Model bound complex types must not be abstract or " +
+                    "value types and must have a parameterless constructor. Alternatively, set the '{1}' property to" +
+                    " a non-null value in the '{2}' constructor.",
+                    typeof(PointStruct).FullName,
+                    nameof(Location.Point),
+                    typeof(Location).FullName),
+                exception.Message);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_ModelIsNotNull_DoesNotCallCreateModel()
+        {
+            // Arrange
+            var bindingContext = CreateContext(GetMetadataForType(typeof(Person)), new Person());
+            var originalModel = bindingContext.Model;
+
+            var binder = new Mock<TestableComplexTypeModelBinder>() { CallBase = true };
+            binder
+                .Setup(b => b.CreateModelPublic(It.IsAny<ModelBindingContext>()))
+                .Verifiable();
+
+            // Act
+            await binder.Object.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.Same(originalModel, bindingContext.Model);
+            binder.Verify(o => o.CreateModelPublic(bindingContext), Times.Never());
+        }
+
+        [Fact]
+        public async Task BindModelAsync_ModelIsNull_CallsCreateModel()
+        {
+            // Arrange
+            var bindingContext = CreateContext(GetMetadataForType(typeof(Person)), model: null);
+
+            var testableBinder = new Mock<TestableComplexTypeModelBinder> { CallBase = true };
+            testableBinder
+                .Setup(o => o.CreateModelPublic(bindingContext))
+                .Returns(new Person())
+                .Verifiable();
+
+            // Act
+            await testableBinder.Object.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.NotNull(bindingContext.Model);
+            Assert.IsType<Person>(bindingContext.Model);
+            testableBinder.Verify();
+        }
+
+        [Theory]
+        [InlineData(nameof(PersonWithBindExclusion.FirstName))]
+        [InlineData(nameof(PersonWithBindExclusion.LastName))]
+        public void CanBindProperty_GetSetProperty(string property)
+        {
+            // Arrange
+            var metadata = GetMetadataForProperty(typeof(PersonWithBindExclusion), property);
+            var bindingContext = new DefaultModelBindingContext()
+            {
+                ActionContext = new ActionContext()
+                {
+                    HttpContext = new DefaultHttpContext()
+                    {
+                        RequestServices = new ServiceCollection().BuildServiceProvider(),
+                    },
+                },
+                ModelMetadata = GetMetadataForType(typeof(PersonWithBindExclusion)),
+            };
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            var result = binder.CanBindPropertyPublic(bindingContext, metadata);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData(nameof(PersonWithBindExclusion.NonUpdateableProperty))]
+        public void CanBindProperty_GetOnlyProperty_WithBindNever(string property)
+        {
+            // Arrange
+            var metadata = GetMetadataForProperty(typeof(PersonWithBindExclusion), property);
+            var bindingContext = new DefaultModelBindingContext()
+            {
+                ActionContext = new ActionContext()
+                {
+                    HttpContext = new DefaultHttpContext()
+                    {
+                        RequestServices = new ServiceCollection().BuildServiceProvider(),
+                    },
+                },
+                ModelMetadata = GetMetadataForType(typeof(PersonWithBindExclusion)),
+            };
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            var result = binder.CanBindPropertyPublic(bindingContext, metadata);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData(nameof(PersonWithBindExclusion.DateOfBirth))]
+        [InlineData(nameof(PersonWithBindExclusion.DateOfDeath))]
+        public void CanBindProperty_GetSetProperty_WithBindNever(string property)
+        {
+            // Arrange
+            var metadata = GetMetadataForProperty(typeof(PersonWithBindExclusion), property);
+            var bindingContext = new DefaultModelBindingContext()
+            {
+                ActionContext = new ActionContext()
+                {
+                    HttpContext = new DefaultHttpContext(),
+                },
+                ModelMetadata = GetMetadataForType(typeof(PersonWithBindExclusion)),
+            };
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            var result = binder.CanBindPropertyPublic(bindingContext, metadata);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData(nameof(TypeWithIncludedPropertiesUsingBindAttribute.IncludedExplicitly1), true)]
+        [InlineData(nameof(TypeWithIncludedPropertiesUsingBindAttribute.IncludedExplicitly2), true)]
+        [InlineData(nameof(TypeWithIncludedPropertiesUsingBindAttribute.ExcludedByDefault1), false)]
+        [InlineData(nameof(TypeWithIncludedPropertiesUsingBindAttribute.ExcludedByDefault2), false)]
+        public void CanBindProperty_WithBindInclude(string property, bool expected)
+        {
+            // Arrange
+            var metadata = GetMetadataForProperty(typeof(TypeWithIncludedPropertiesUsingBindAttribute), property);
+            var bindingContext = new DefaultModelBindingContext()
+            {
+                ActionContext = new ActionContext()
+                {
+                    HttpContext = new DefaultHttpContext()
+                },
+                ModelMetadata = GetMetadataForType(typeof(TypeWithIncludedPropertiesUsingBindAttribute)),
+            };
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            var result = binder.CanBindPropertyPublic(bindingContext, metadata);
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Theory]
+        [InlineData(nameof(ModelWithMixedBindingBehaviors.Required), true)]
+        [InlineData(nameof(ModelWithMixedBindingBehaviors.Optional), true)]
+        [InlineData(nameof(ModelWithMixedBindingBehaviors.Never), false)]
+        public void CanBindProperty_BindingAttributes_OverridingBehavior(string property, bool expected)
+        {
+            // Arrange
+            var metadata = GetMetadataForProperty(typeof(ModelWithMixedBindingBehaviors), property);
+            var bindingContext = new DefaultModelBindingContext()
+            {
+                ActionContext = new ActionContext()
+                {
+                    HttpContext = new DefaultHttpContext(),
+                },
+                ModelMetadata = GetMetadataForType(typeof(ModelWithMixedBindingBehaviors)),
+            };
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            var result = binder.CanBindPropertyPublic(bindingContext, metadata);
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public async Task BindModelAsync_BindRequiredFieldMissing_RaisesModelError()
+        {
+            // Arrange
+            var model = new ModelWithBindRequired
+            {
+                Name = "original value",
+                Age = -20
+            };
+
+            var property = GetMetadataForProperty(model.GetType(), nameof(ModelWithBindRequired.Age));
+
+            var bindingContext = CreateContext(GetMetadataForType(model.GetType()), model);
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+            binder.Results[property] = ModelBindingResult.Failed();
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            var modelStateDictionary = bindingContext.ModelState;
+            Assert.False(modelStateDictionary.IsValid);
+            Assert.Single(modelStateDictionary);
+
+            // Check Age error.
+            Assert.True(modelStateDictionary.TryGetValue("theModel.Age", out var entry));
+            var modelError = Assert.Single(entry.Errors);
+            Assert.Null(modelError.Exception);
+            Assert.NotNull(modelError.ErrorMessage);
+            Assert.Equal("A value for the 'Age' property was not provided.", modelError.ErrorMessage);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public async Task BindModelAsync_DataMemberIsRequiredFieldMissing_RaisesModelError()
+        {
+            // Arrange
+            var model = new ModelWithDataMemberIsRequired
+            {
+                Name = "original value",
+                Age = -20
+            };
+
+            var bindingContext = CreateContext(GetMetadataForType(model.GetType()), model);
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            var property = GetMetadataForProperty(model.GetType(), nameof(ModelWithDataMemberIsRequired.Age));
+            binder.Results[property] = ModelBindingResult.Failed();
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            var modelStateDictionary = bindingContext.ModelState;
+            Assert.False(modelStateDictionary.IsValid);
+            Assert.Single(modelStateDictionary);
+
+            // Check Age error.
+            Assert.True(modelStateDictionary.TryGetValue("theModel.Age", out var entry));
+            var modelError = Assert.Single(entry.Errors);
+            Assert.Null(modelError.Exception);
+            Assert.NotNull(modelError.ErrorMessage);
+            Assert.Equal("A value for the 'Age' property was not provided.", modelError.ErrorMessage);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public async Task BindModelAsync_ValueTypePropertyWithBindRequired_SetToNull_CapturesException()
+        {
+            // Arrange
+            var model = new ModelWithBindRequired
+            {
+                Name = "original value",
+                Age = -20
+            };
+
+            var bindingContext = CreateContext(GetMetadataForType(model.GetType()), model);
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Attempt to set non-Nullable property to null. BindRequiredAttribute should not be relevant in this
+            // case because the property did have a result.
+            var property = GetMetadataForProperty(model.GetType(), nameof(ModelWithBindRequired.Age));
+            binder.Results[property] = ModelBindingResult.Success(model: null);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            var modelStateDictionary = bindingContext.ModelState;
+            Assert.False(modelStateDictionary.IsValid);
+            Assert.Single(modelStateDictionary);
+
+            // Check Age error.
+            Assert.True(modelStateDictionary.TryGetValue("theModel.Age", out var entry));
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+
+            var modelError = Assert.Single(entry.Errors);
+            Assert.Equal(string.Empty, modelError.ErrorMessage);
+            Assert.IsType<NullReferenceException>(modelError.Exception);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_ValueTypeProperty_WithBindingOptional_NoValueSet_NoError()
+        {
+            // Arrange
+            var model = new BindingOptionalProperty();
+            var bindingContext = CreateContext(GetMetadataForType(model.GetType()), model);
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            var property = GetMetadataForProperty(model.GetType(), nameof(BindingOptionalProperty.ValueTypeRequired));
+            binder.Results[property] = ModelBindingResult.Failed();
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            var modelStateDictionary = bindingContext.ModelState;
+            Assert.True(modelStateDictionary.IsValid);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_NullableValueTypeProperty_NoValueSet_NoError()
+        {
+            // Arrange
+            var model = new NullableValueTypeProperty();
+            var bindingContext = CreateContext(GetMetadataForType(model.GetType()), model);
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            var property = GetMetadataForProperty(model.GetType(), nameof(NullableValueTypeProperty.NullableValueType));
+            binder.Results[property] = ModelBindingResult.Failed();
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            var modelStateDictionary = bindingContext.ModelState;
+            Assert.True(modelStateDictionary.IsValid);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_ValueTypeProperty_NoValue_NoError()
+        {
+            // Arrange
+            var model = new Person();
+            var containerMetadata = GetMetadataForType(model.GetType());
+
+            var bindingContext = CreateContext(containerMetadata, model);
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            var property = GetMetadataForProperty(model.GetType(), nameof(Person.ValueTypeRequired));
+            binder.Results[property] = ModelBindingResult.Failed();
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.ModelState.IsValid);
+            Assert.Equal(0, model.ValueTypeRequired);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_ProvideRequiredField_Success()
+        {
+            // Arrange
+            var model = new Person();
+            var containerMetadata = GetMetadataForType(model.GetType());
+
+            var bindingContext = CreateContext(containerMetadata, model);
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            var property = GetMetadataForProperty(model.GetType(), nameof(Person.ValueTypeRequired));
+            binder.Results[property] = ModelBindingResult.Success(model: 57);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.ModelState.IsValid);
+            Assert.Equal(57, model.ValueTypeRequired);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_Success()
+        {
+            // Arrange
+            var dob = new DateTime(2001, 1, 1);
+            var model = new PersonWithBindExclusion
+            {
+                DateOfBirth = dob
+            };
+
+            var containerMetadata = GetMetadataForType(model.GetType());
+
+            var bindingContext = CreateContext(containerMetadata, model);
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            foreach (var property in containerMetadata.Properties)
+            {
+                binder.Results[property] = ModelBindingResult.Failed();
+            }
+
+            var firstNameProperty = containerMetadata.Properties[nameof(model.FirstName)];
+            binder.Results[firstNameProperty] = ModelBindingResult.Success("John");
+
+            var lastNameProperty = containerMetadata.Properties[nameof(model.LastName)];
+            binder.Results[lastNameProperty] = ModelBindingResult.Success("Doe");
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.Equal("John", model.FirstName);
+            Assert.Equal("Doe", model.LastName);
+            Assert.Equal(dob, model.DateOfBirth);
+            Assert.True(bindingContext.ModelState.IsValid);
+        }
+
+        [Fact]
+        public void SetProperty_PropertyHasDefaultValue_DefaultValueAttributeDoesNothing()
+        {
+            // Arrange
+            var model = new Person();
+            var bindingContext = CreateContext(GetMetadataForType(model.GetType()), model);
+
+            var metadata = GetMetadataForType(typeof(Person));
+            var propertyMetadata = metadata.Properties[nameof(model.PropertyWithDefaultValue)];
+
+            var result = ModelBindingResult.Failed();
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            binder.SetPropertyPublic(bindingContext, "foo", propertyMetadata, result);
+
+            // Assert
+            var person = Assert.IsType<Person>(bindingContext.Model);
+            Assert.Equal(0m, person.PropertyWithDefaultValue);
+            Assert.True(bindingContext.ModelState.IsValid);
+        }
+
+        [Fact]
+        public void SetProperty_PropertyIsPreinitialized_NoValue_DoesNothing()
+        {
+            // Arrange
+            var model = new Person();
+            var bindingContext = CreateContext(GetMetadataForType(model.GetType()), model);
+
+            var metadata = GetMetadataForType(typeof(Person));
+            var propertyMetadata = metadata.Properties[nameof(model.PropertyWithInitializedValue)];
+
+            // The null model value won't be used because IsModelBound = false.
+            var result = ModelBindingResult.Failed();
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            binder.SetPropertyPublic(bindingContext, "foo", propertyMetadata, result);
+
+            // Assert
+            var person = Assert.IsType<Person>(bindingContext.Model);
+            Assert.Equal("preinitialized", person.PropertyWithInitializedValue);
+            Assert.True(bindingContext.ModelState.IsValid);
+        }
+
+        [Fact]
+        public void SetProperty_PropertyIsPreinitialized_DefaultValueAttributeDoesNothing()
+        {
+            // Arrange
+            var model = new Person();
+            var bindingContext = CreateContext(GetMetadataForType(model.GetType()), model);
+
+            var metadata = GetMetadataForType(typeof(Person));
+            var propertyMetadata = metadata.Properties[nameof(model.PropertyWithInitializedValueAndDefault)];
+
+            // The null model value won't be used because IsModelBound = false.
+            var result = ModelBindingResult.Failed();
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            binder.SetPropertyPublic(bindingContext, "foo", propertyMetadata, result);
+
+            // Assert
+            var person = Assert.IsType<Person>(bindingContext.Model);
+            Assert.Equal("preinitialized", person.PropertyWithInitializedValueAndDefault);
+            Assert.True(bindingContext.ModelState.IsValid);
+        }
+
+        [Fact]
+        public void SetProperty_PropertyIsReadOnly_DoesNothing()
+        {
+            // Arrange
+            var model = new Person();
+            var bindingContext = CreateContext(GetMetadataForType(model.GetType()), model);
+
+            var metadata = GetMetadataForType(typeof(Person));
+            var propertyMetadata = metadata.Properties[nameof(model.NonUpdateableProperty)];
+
+            var result = ModelBindingResult.Failed();
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            binder.SetPropertyPublic(bindingContext, "foo", propertyMetadata, result);
+
+            // Assert
+            // If didn't throw, success!
+        }
+
+        // Property name, property accessor
+        public static TheoryData<string, Func<object, object>> MyCanUpdateButCannotSetPropertyData
+        {
+            get
+            {
+                return new TheoryData<string, Func<object, object>>
+                {
+                    {
+                        nameof(MyModelTestingCanUpdateProperty.ReadOnlyObject),
+                        model => ((Simple)((MyModelTestingCanUpdateProperty)model).ReadOnlyObject).Name
+                    },
+                    {
+                        nameof(MyModelTestingCanUpdateProperty.ReadOnlySimple),
+                        model => ((MyModelTestingCanUpdateProperty)model).ReadOnlySimple.Name
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(MyCanUpdateButCannotSetPropertyData))]
+        public void SetProperty_ValueProvidedAndCanUpdatePropertyTrue_DoesNothing(
+            string propertyName,
+            Func<object, object> propertyAccessor)
+        {
+            // Arrange
+            var model = new MyModelTestingCanUpdateProperty();
+            var type = model.GetType();
+            var bindingContext = CreateContext(GetMetadataForType(type), model);
+            var modelState = bindingContext.ModelState;
+            var metadata = GetMetadataForType(type);
+
+            var propertyMetadata = bindingContext.ModelMetadata.Properties[propertyName];
+            var result = ModelBindingResult.Success(new Simple { Name = "Hanna" });
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            binder.SetPropertyPublic(bindingContext, propertyName, propertyMetadata, result);
+
+            // Assert
+            Assert.Equal("Joe", propertyAccessor(model));
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+
+        [Fact]
+        public void SetProperty_ReadOnlyProperty_IsNoOp()
+        {
+            // Arrange
+            var model = new CollectionContainer();
+            var originalCollection = model.ReadOnlyList;
+
+            var modelMetadata = GetMetadataForType(model.GetType());
+            var propertyMetadata = GetMetadataForProperty(model.GetType(), nameof(CollectionContainer.ReadOnlyList));
+
+            var bindingContext = CreateContext(modelMetadata, model);
+            var result = ModelBindingResult.Success(new List<string>() { "hi" });
+
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            binder.SetPropertyPublic(bindingContext, propertyMetadata.PropertyName, propertyMetadata, result);
+
+            // Assert
+            Assert.Same(originalCollection, model.ReadOnlyList);
+            Assert.Empty(model.ReadOnlyList);
+        }
+
+        [Fact]
+        public void SetProperty_PropertyIsSettable_CallsSetter()
+        {
+            // Arrange
+            var model = new Person();
+            var bindingContext = CreateContext(GetMetadataForType(model.GetType()), model);
+
+            var metadata = GetMetadataForType(typeof(Person));
+            var propertyMetadata = bindingContext.ModelMetadata.Properties[nameof(model.DateOfBirth)];
+
+            var result = ModelBindingResult.Success(new DateTime(2001, 1, 1));
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            binder.SetPropertyPublic(bindingContext, "foo", propertyMetadata, result);
+
+            // Assert
+            Assert.True(bindingContext.ModelState.IsValid);
+            Assert.Equal(new DateTime(2001, 1, 1), model.DateOfBirth);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void SetProperty_PropertyIsSettable_SetterThrows_RecordsError()
+        {
+            // Arrange
+            var model = new Person
+            {
+                DateOfBirth = new DateTime(1900, 1, 1)
+            };
+
+            var bindingContext = CreateContext(GetMetadataForType(model.GetType()), model);
+
+            var metadata = GetMetadataForType(typeof(Person));
+            var propertyMetadata = bindingContext.ModelMetadata.Properties[nameof(model.DateOfDeath)];
+
+            var result = ModelBindingResult.Success(new DateTime(1800, 1, 1));
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            binder.SetPropertyPublic(bindingContext, "foo", propertyMetadata, result);
+
+            // Assert
+            Assert.Equal("Date of death can't be before date of birth." + Environment.NewLine
+                       + "Parameter name: value",
+                         bindingContext.ModelState["foo"].Errors[0].Exception.Message);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void SetProperty_PropertySetterThrows_CapturesException()
+        {
+            // Arrange
+            var model = new ModelWhosePropertySetterThrows();
+            var bindingContext = CreateContext(GetMetadataForType(model.GetType()), model);
+            bindingContext.ModelName = "foo";
+
+            var metadata = GetMetadataForType(typeof(ModelWhosePropertySetterThrows));
+            var propertyMetadata = bindingContext.ModelMetadata.Properties[nameof(model.NameNoAttribute)];
+
+            var result = ModelBindingResult.Success(model: null);
+            var binder = CreateBinder(bindingContext.ModelMetadata);
+
+            // Act
+            binder.SetPropertyPublic(bindingContext, "foo.NameNoAttribute", propertyMetadata, result);
+
+            // Assert
+            Assert.False(bindingContext.ModelState.IsValid);
+            Assert.Single(bindingContext.ModelState["foo.NameNoAttribute"].Errors);
+            Assert.Equal("This is a different exception." + Environment.NewLine
+                       + "Parameter name: value",
+                         bindingContext.ModelState["foo.NameNoAttribute"].Errors[0].Exception.Message);
+        }
+
+        private static TestableComplexTypeModelBinder CreateBinder(ModelMetadata metadata)
+        {
+            var options = Options.Create(new MvcOptions());
+            var setup = new MvcCoreMvcOptionsSetup(new TestHttpRequestStreamReaderFactory());
+            setup.Configure(options.Value);
+
+            var lastIndex = options.Value.ModelBinderProviders.Count - 1;
+            Assert.IsType<ComplexTypeModelBinderProvider>(options.Value.ModelBinderProviders[lastIndex]);
+            options.Value.ModelBinderProviders.RemoveAt(lastIndex);
+            options.Value.ModelBinderProviders.Add(new TestableComplexTypeModelBinderProvider());
+
+            var factory = TestModelBinderFactory.Create(options.Value.ModelBinderProviders.ToArray());
+            return (TestableComplexTypeModelBinder)factory.CreateBinder(new ModelBinderFactoryContext()
+            {
+                Metadata = metadata,
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = metadata.BinderModelName,
+                    BinderType = metadata.BinderType,
+                    BindingSource = metadata.BindingSource,
+                    PropertyFilterProvider = metadata.PropertyFilterProvider,
+                },
+            });
+        }
+
+        private static DefaultModelBindingContext CreateContext(ModelMetadata metadata, object model = null)
+        {
+            var valueProvider = new TestValueProvider(new Dictionary<string, object>());
+            return new DefaultModelBindingContext()
+            {
+                BinderModelName = metadata.BinderModelName,
+                BindingSource = metadata.BindingSource,
+                IsTopLevelObject = true,
+                Model = model,
+                ModelMetadata = metadata,
+                ModelName = "theModel",
+                ModelState = new ModelStateDictionary(),
+                ValueProvider = valueProvider,
+            };
+        }
+
+        private static ModelMetadata GetMetadataForType(Type type)
+        {
+            return _metadataProvider.GetMetadataForType(type);
+        }
+
+        private static ModelMetadata GetMetadataForProperty(Type type, string propertyName)
+        {
+            return _metadataProvider.GetMetadataForProperty(type, propertyName);
+        }
+
+        private class Location
+        {
+            public PointStruct Point { get; set; }
+        }
+
+        private struct PointStruct
+        {
+            public PointStruct(double x, double y)
+            {
+                X = x;
+                Y = y;
+            }
+            public double X { get; }
+            public double Y { get; }
+        }
+
+        private class ClassWithNoParameterlessConstructor
+        {
+            public ClassWithNoParameterlessConstructor(string name)
+            {
+                Name = name;
+            }
+
+            public string Name { get; set; }
+        }
+
+        private class BindingOptionalProperty
+        {
+            [BindingBehavior(BindingBehavior.Optional)]
+            public int ValueTypeRequired { get; set; }
+        }
+
+        private class NullableValueTypeProperty
+        {
+            [BindingBehavior(BindingBehavior.Optional)]
+            public int? NullableValueType { get; set; }
+        }
+
+        private class Person
+        {
+            private DateTime? _dateOfDeath;
+
+            [BindingBehavior(BindingBehavior.Optional)]
+            public DateTime DateOfBirth { get; set; }
+
+            public DateTime? DateOfDeath
+            {
+                get { return _dateOfDeath; }
+                set
+                {
+                    if (value < DateOfBirth)
+                    {
+                        throw new ArgumentOutOfRangeException(nameof(value), "Date of death can't be before date of birth.");
+                    }
+                    _dateOfDeath = value;
+                }
+            }
+
+            [Required(ErrorMessage = "Sample message")]
+            public int ValueTypeRequired { get; set; }
+
+            public string FirstName { get; set; }
+            public string LastName { get; set; }
+            public string NonUpdateableProperty { get; private set; }
+
+            [BindingBehavior(BindingBehavior.Optional)]
+            [DefaultValue(typeof(decimal), "123.456")]
+            public decimal PropertyWithDefaultValue { get; set; }
+
+            public string PropertyWithInitializedValue { get; set; } = "preinitialized";
+
+            [DefaultValue("default")]
+            public string PropertyWithInitializedValueAndDefault { get; set; } = "preinitialized";
+        }
+
+        private class PersonWithNoProperties
+        {
+            public string name = null;
+        }
+
+        private class PersonWithBindExclusion
+        {
+            [BindNever]
+            public DateTime DateOfBirth { get; set; }
+
+            [BindNever]
+            public DateTime? DateOfDeath { get; set; }
+
+            public string FirstName { get; set; }
+            public string LastName { get; set; }
+            public string NonUpdateableProperty { get; private set; }
+        }
+
+        private class ModelWithBindRequired
+        {
+            public string Name { get; set; }
+
+            [BindRequired]
+            public int Age { get; set; }
+        }
+
+        [DataContract]
+        private class ModelWithDataMemberIsRequired
+        {
+            public string Name { get; set; }
+
+            [DataMember(IsRequired = true)]
+            public int Age { get; set; }
+        }
+
+        [BindRequired]
+        private class ModelWithMixedBindingBehaviors
+        {
+            public string Required { get; set; }
+
+            [BindNever]
+            public string Never { get; set; }
+
+            [BindingBehavior(BindingBehavior.Optional)]
+            public string Optional { get; set; }
+        }
+
+        private sealed class MyModelTestingCanUpdateProperty
+        {
+            public int ReadOnlyInt { get; private set; }
+            public string ReadOnlyString { get; private set; }
+            public object ReadOnlyObject { get; } = new Simple { Name = "Joe" };
+            public string ReadWriteString { get; set; }
+            public Simple ReadOnlySimple { get; } = new Simple { Name = "Joe" };
+        }
+
+        private sealed class ModelWhosePropertySetterThrows
+        {
+            [Required(ErrorMessage = "This message comes from the [Required] attribute.")]
+            public string Name
+            {
+                get { return null; }
+                set { throw new ArgumentException("This is an exception.", "value"); }
+            }
+
+            public string NameNoAttribute
+            {
+                get { return null; }
+                set { throw new ArgumentException("This is a different exception.", "value"); }
+            }
+        }
+
+        private class TypeWithNoBinderMetadata
+        {
+            public int UnMarkedProperty { get; set; }
+        }
+
+        private class HasAllGreedyProperties
+        {
+            [NonValueBinderMetadata]
+            public string MarkedWithABinderMetadata { get; set; }
+        }
+
+        // Not a Metadata poco because there is a property with value binder Metadata.
+        private class TypeWithAtLeastOnePropertyMarkedUsingValueBinderMetadata
+        {
+            [NonValueBinderMetadata]
+            public string MarkedWithABinderMetadata { get; set; }
+
+            [ValueBinderMetadata]
+            public string MarkedWithAValueBinderMetadata { get; set; }
+        }
+
+        // not a Metadata poco because there is an unmarked property.
+        private class TypeWithUnmarkedAndBinderMetadataMarkedProperties
+        {
+            public int UnmarkedProperty { get; set; }
+
+            [NonValueBinderMetadata]
+            public string MarkedWithABinderMetadata { get; set; }
+        }
+
+        [Bind(new[] { nameof(IncludedExplicitly1), nameof(IncludedExplicitly2) })]
+        private class TypeWithIncludedPropertiesUsingBindAttribute
+        {
+            public int ExcludedByDefault1 { get; set; }
+
+            public int ExcludedByDefault2 { get; set; }
+
+            public int IncludedExplicitly1 { get; set; }
+
+            public int IncludedExplicitly2 { get; set; }
+        }
+
+        private class Document
+        {
+            [NonValueBinderMetadata]
+            public string Version { get; set; }
+
+            [NonValueBinderMetadata]
+            public Document SubDocument { get; set; }
+        }
+
+        private class NonValueBinderMetadataAttribute : Attribute, IBindingSourceMetadata
+        {
+            public BindingSource BindingSource
+            {
+                get { return new BindingSource("Special", string.Empty, isGreedy: true, isFromRequest: true); }
+            }
+        }
+
+        private class ValueBinderMetadataAttribute : Attribute, IBindingSourceMetadata
+        {
+            public BindingSource BindingSource { get { return BindingSource.Query; } }
+        }
+
+        private class ExcludedProvider : IPropertyFilterProvider
+        {
+            public Func<ModelMetadata, bool> PropertyFilter
+            {
+                get
+                {
+                    return (m) =>
+                       !string.Equals("Excluded1", m.PropertyName, StringComparison.OrdinalIgnoreCase) &&
+                       !string.Equals("Excluded2", m.PropertyName, StringComparison.OrdinalIgnoreCase);
+                }
+            }
+        }
+
+        private class SimpleContainer
+        {
+            public Simple Simple { get; set; }
+        }
+
+        private class Simple
+        {
+            public string Name { get; set; }
+        }
+
+        private class CollectionContainer
+        {
+            public int[] ReadOnlyArray { get; } = new int[4];
+
+            // Read-only collections get added values.
+            public IDictionary<int, string> ReadOnlyDictionary { get; } = new Dictionary<int, string>();
+
+            public IList<int> ReadOnlyList { get; } = new List<int>();
+
+            // Settable values are overwritten.
+            public int[] SettableArray { get; set; } = new int[] { 0, 1 };
+
+            public IDictionary<int, string> SettableDictionary { get; set; } = new Dictionary<int, string>
+            {
+                { 0, "zero" },
+                { 25, "twenty-five" },
+            };
+
+            public IList<int> SettableList { get; set; } = new List<int> { 3, 9, 0 };
+        }
+
+        private class TestableComplexTypeModelBinderProvider : IModelBinderProvider
+        {
+            public IModelBinder GetBinder(ModelBinderProviderContext context)
+            {
+                if (context.Metadata.IsComplexType)
+                {
+                    var propertyBinders = new Dictionary<ModelMetadata, IModelBinder>();
+                    foreach (var property in context.Metadata.Properties)
+                    {
+                        propertyBinders.Add(property, context.CreateBinder(property));
+                    }
+
+                    return new TestableComplexTypeModelBinder(propertyBinders);
+                }
+
+                return null;
+            }
+        }
+
+        // Provides the ability to easily mock + call each of these APIs
+        public class TestableComplexTypeModelBinder : ComplexTypeModelBinder
+        {
+            public TestableComplexTypeModelBinder()
+                : this(new Dictionary<ModelMetadata, IModelBinder>())
+            {
+            }
+
+            public TestableComplexTypeModelBinder(IDictionary<ModelMetadata, IModelBinder> propertyBinders)
+                : base(propertyBinders, NullLoggerFactory.Instance)
+            {
+                Results = new Dictionary<ModelMetadata, ModelBindingResult>();
+            }
+
+            public Dictionary<ModelMetadata, ModelBindingResult> Results { get; }
+
+            public virtual Task BindPropertyPublic(ModelBindingContext bindingContext)
+            {
+                if (Results.Count == 0)
+                {
+                    return base.BindModelAsync(bindingContext);
+                }
+
+                if (Results.TryGetValue(bindingContext.ModelMetadata, out var result))
+                {
+                    bindingContext.Result = result;
+                }
+
+                return Task.CompletedTask;
+            }
+
+            protected override Task BindProperty(ModelBindingContext bindingContext)
+            {
+                return BindPropertyPublic(bindingContext);
+            }
+
+            public virtual bool CanBindPropertyPublic(
+                ModelBindingContext bindingContext,
+                ModelMetadata propertyMetadata)
+            {
+                if (Results.Count == 0)
+                {
+                    return base.CanBindProperty(bindingContext, propertyMetadata);
+                }
+
+                // If this is being used to test binding, then only attempt to bind properties
+                // we have results for.
+                return Results.ContainsKey(propertyMetadata);
+            }
+
+            protected override bool CanBindProperty(
+                ModelBindingContext bindingContext,
+                ModelMetadata propertyMetadata)
+            {
+                return CanBindPropertyPublic(bindingContext, propertyMetadata);
+            }
+
+            public virtual object CreateModelPublic(ModelBindingContext bindingContext)
+            {
+                return base.CreateModel(bindingContext);
+            }
+
+            protected override object CreateModel(ModelBindingContext bindingContext)
+            {
+                return CreateModelPublic(bindingContext);
+            }
+
+            public virtual void SetPropertyPublic(
+                ModelBindingContext bindingContext,
+                string modelName,
+                ModelMetadata propertyMetadata,
+                ModelBindingResult result)
+            {
+                base.SetProperty(bindingContext, modelName, propertyMetadata, result);
+            }
+
+            protected override void SetProperty(
+                ModelBindingContext bindingContext,
+                string modelName,
+                ModelMetadata propertyMetadata,
+                ModelBindingResult result)
+            {
+                SetPropertyPublic(bindingContext, modelName, propertyMetadata, result);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DecimalModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DecimalModelBinderTest.cs
new file mode 100644
index 0000000000..21ec379c4a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DecimalModelBinderTest.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using System.Globalization;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class DecimalModelBinderTest : FloatingPointTypeModelBinderTest<decimal>
+    {
+        protected override decimal Twelve => 12M;
+
+        protected override decimal TwelvePointFive => 12.5M;
+
+        protected override decimal ThirtyTwoThousand => 32_000M;
+
+        protected override decimal ThirtyTwoThousandPointOne => 32_000.1M;
+
+        protected override IModelBinder GetBinder(NumberStyles numberStyles)
+        {
+            return new DecimalModelBinder(numberStyles, NullLoggerFactory.Instance);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DictionaryModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DictionaryModelBinderProviderTest.cs
new file mode 100644
index 0000000000..d60c3b2628
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DictionaryModelBinderProviderTest.cs
@@ -0,0 +1,70 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class DictionaryModelBinderProviderTest
+    {
+        [Theory]
+        [InlineData(typeof(Person))]
+        [InlineData(typeof(string))]
+        [InlineData(typeof(IEnumerable<KeyValuePair<string, int>>))]
+        [InlineData(typeof(ICollection<string>))]
+        public void Create_ForNonDictionaryType_ReturnsNull(Type modelType)
+        {
+            // Arrange
+            var provider = new DictionaryModelBinderProvider();
+
+            var context = new TestModelBinderProviderContext(modelType);
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Theory]
+        [InlineData(typeof(IDictionary<string, int>))]
+        [InlineData(typeof(Dictionary<string, int>))]
+        public void Create_ForDictionaryType_ReturnsBinder(Type modelType)
+        {
+            // Arrange
+            var provider = new DictionaryModelBinderProvider();
+
+            var context = new TestModelBinderProviderContext(modelType);
+            context.OnCreatingBinder(m =>
+            {
+                if (m.ModelType == typeof(KeyValuePair<string, int>) ||
+                    m.ModelType == typeof(int) ||
+                    m.ModelType == typeof(string))
+                {
+                    return Mock.Of<IModelBinder>();
+                }
+                else
+                {
+                    Assert.False(true, "Not the right model type");
+                    return null;
+                }
+            });
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.IsType<DictionaryModelBinder<string, int>>(result);
+        }
+
+        private class Person
+        {
+            public string Name { get; set; }
+
+            public int Age { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DictionaryModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DictionaryModelBinderTest.cs
new file mode 100644
index 0000000000..2beb2a33f9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DictionaryModelBinderTest.cs
@@ -0,0 +1,552 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class DictionaryModelBinderTest
+    {
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public async Task BindModel_Succeeds(bool isReadOnly)
+        {
+            // Arrange
+            var values = new Dictionary<string, string>()
+            {
+                { "someName[0].Key", "42" },
+                { "someName[0].Value", "forty-two" },
+                { "someName[1].Key", "84" },
+                { "someName[1].Value", "eighty-four" },
+            };
+
+            // Value Provider
+
+            var bindingContext = GetModelBindingContext(isReadOnly, values);
+            bindingContext.ValueProvider = CreateEnumerableValueProvider("{0}", values);
+
+            var binder = new DictionaryModelBinder<int, string>(
+                new SimpleTypeModelBinder(typeof(int), NullLoggerFactory.Instance),
+                new SimpleTypeModelBinder(typeof(string), NullLoggerFactory.Instance),
+                NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+
+            var dictionary = Assert.IsAssignableFrom<IDictionary<int, string>>(bindingContext.Result.Model);
+            Assert.NotNull(dictionary);
+            Assert.Equal(2, dictionary.Count);
+            Assert.Equal("forty-two", dictionary[42]);
+            Assert.Equal("eighty-four", dictionary[84]);
+
+            // This uses the default IValidationStrategy
+            Assert.DoesNotContain(bindingContext.Result.Model, bindingContext.ValidationState.Keys);
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public async Task BindModel_WithExistingModel_Succeeds(bool isReadOnly)
+        {
+            // Arrange
+            var values = new Dictionary<string, string>()
+            {
+                { "someName[0].Key", "42" },
+                { "someName[0].Value", "forty-two" },
+                { "someName[1].Key", "84" },
+                { "someName[1].Value", "eighty-four" },
+            };
+
+            var bindingContext = GetModelBindingContext(isReadOnly, values);
+            bindingContext.ValueProvider = CreateEnumerableValueProvider("{0}", values);
+
+            var dictionary = new Dictionary<int, string>();
+            bindingContext.Model = dictionary;
+
+            var binder = new DictionaryModelBinder<int, string>(
+                new SimpleTypeModelBinder(typeof(int), NullLoggerFactory.Instance),
+                new SimpleTypeModelBinder(typeof(string), NullLoggerFactory.Instance),
+                NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+
+            Assert.Same(dictionary, bindingContext.Result.Model);
+            Assert.NotNull(dictionary);
+            Assert.Equal(2, dictionary.Count);
+            Assert.Equal("forty-two", dictionary[42]);
+            Assert.Equal("eighty-four", dictionary[84]);
+
+            // This uses the default IValidationStrategy
+            Assert.DoesNotContain(bindingContext.Result.Model, bindingContext.ValidationState.Keys);
+        }
+
+        // modelName, keyFormat, dictionary
+        public static TheoryData<string, string, IDictionary<string, string>> StringToStringData
+        {
+            get
+            {
+                var dictionaryWithOne = new Dictionary<string, string>(StringComparer.Ordinal)
+                {
+                    { "one", "one" },
+                };
+                var dictionaryWithThree = new Dictionary<string, string>(StringComparer.Ordinal)
+                {
+                    { "one", "one" },
+                    { "two", "two" },
+                    { "three", "three" },
+                };
+
+                return new TheoryData<string, string, IDictionary<string, string>>
+                {
+                    { string.Empty, "[{0}]", dictionaryWithOne },
+                    { string.Empty, "[{0}]", dictionaryWithThree },
+                    { "prefix", "prefix[{0}]", dictionaryWithOne },
+                    { "prefix", "prefix[{0}]", dictionaryWithThree },
+                    { "prefix.property", "prefix.property[{0}]", dictionaryWithOne },
+                    { "prefix.property", "prefix.property[{0}]", dictionaryWithThree },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(StringToStringData))]
+        public async Task BindModel_FallsBackToBindingValues(
+            string modelName,
+            string keyFormat,
+            IDictionary<string, string> dictionary)
+        {
+            // Arrange
+            var binder = new DictionaryModelBinder<string, string>(
+                new SimpleTypeModelBinder(typeof(string), NullLoggerFactory.Instance),
+                new SimpleTypeModelBinder(typeof(string), NullLoggerFactory.Instance),
+                NullLoggerFactory.Instance);
+
+            var bindingContext = CreateContext();
+            bindingContext.ModelName = modelName;
+            bindingContext.ValueProvider = CreateEnumerableValueProvider(keyFormat, dictionary);
+            bindingContext.FieldName = modelName;
+
+            var metadataProvider = new TestModelMetadataProvider();
+            bindingContext.ModelMetadata = metadataProvider.GetMetadataForProperty(
+                typeof(ModelWithDictionaryProperties),
+                nameof(ModelWithDictionaryProperties.DictionaryProperty));
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+
+            var resultDictionary = Assert.IsAssignableFrom<IDictionary<string, string>>(bindingContext.Result.Model);
+            Assert.Equal(dictionary, resultDictionary);
+        }
+
+        // Similar to one BindModel_FallsBackToBindingValues case but without an IEnumerableValueProvider.
+        [Fact]
+        public async Task BindModel_DoesNotFallBack_WithoutEnumerableValueProvider()
+        {
+            // Arrange
+            var dictionary = new Dictionary<string, string>(StringComparer.Ordinal)
+            {
+                { "one", "one" },
+                { "two", "two" },
+                { "three", "three" },
+            };
+
+            var binder = new DictionaryModelBinder<string, string>(
+                new SimpleTypeModelBinder(typeof(string), NullLoggerFactory.Instance),
+                new SimpleTypeModelBinder(typeof(string), NullLoggerFactory.Instance),
+                NullLoggerFactory.Instance);
+
+            var bindingContext = CreateContext();
+            bindingContext.ModelName = "prefix";
+            bindingContext.ValueProvider = CreateTestValueProvider("prefix[{0}]", dictionary);
+            bindingContext.FieldName = bindingContext.ModelName;
+
+            var metadataProvider = new TestModelMetadataProvider();
+            bindingContext.ModelMetadata = metadataProvider.GetMetadataForProperty(
+                typeof(ModelWithDictionaryProperties),
+                nameof(ModelWithDictionaryProperties.DictionaryProperty));
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+
+            var resultDictionary = Assert.IsAssignableFrom<IDictionary<string, string>>(bindingContext.Result.Model);
+            Assert.Empty(resultDictionary);
+        }
+
+        public static TheoryData<IDictionary<long, int>> LongToIntData
+        {
+            get
+            {
+                var dictionaryWithOne = new Dictionary<long, int>
+                {
+                    { 0L, 0 },
+                };
+                var dictionaryWithThree = new Dictionary<long, int>
+                {
+                    { -1L, -1 },
+                    { long.MaxValue, int.MaxValue },
+                    { long.MinValue, int.MinValue },
+                };
+
+                return new TheoryData<IDictionary<long, int>> { dictionaryWithOne, dictionaryWithThree };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(LongToIntData))]
+        public async Task BindModel_FallsBackToBindingValues_WithValueTypes(IDictionary<long, int> dictionary)
+        {
+            // Arrange
+            var stringDictionary = dictionary.ToDictionary(kvp => kvp.Key.ToString(), kvp => kvp.Value.ToString());
+
+            var binder = new DictionaryModelBinder<long, int>(
+                new SimpleTypeModelBinder(typeof(long), NullLoggerFactory.Instance),
+                new SimpleTypeModelBinder(typeof(int), NullLoggerFactory.Instance),
+                NullLoggerFactory.Instance);
+
+            var bindingContext = CreateContext();
+            bindingContext.ModelName = "prefix";
+            bindingContext.ValueProvider = CreateEnumerableValueProvider("prefix[{0}]", stringDictionary);
+            bindingContext.FieldName = bindingContext.ModelName;
+
+            var metadataProvider = new TestModelMetadataProvider();
+            bindingContext.ModelMetadata = metadataProvider.GetMetadataForProperty(
+                typeof(ModelWithDictionaryProperties),
+                nameof(ModelWithDictionaryProperties.DictionaryWithValueTypesProperty));
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+
+            var resultDictionary = Assert.IsAssignableFrom<IDictionary<long, int>>(bindingContext.Result.Model);
+            Assert.Equal(dictionary, resultDictionary);
+        }
+
+        [Fact]
+        public async Task BindModel_FallsBackToBindingValues_WithComplexValues()
+        {
+            // Arrange
+            var dictionary = new Dictionary<int, ModelWithProperties>
+            {
+                { 23, new ModelWithProperties { Id = 43, Name = "Wilma" } },
+                { 27, new ModelWithProperties { Id = 98, Name = "Fred" } },
+            };
+            var stringDictionary = new Dictionary<string, string>
+            {
+                { "prefix[23].Id", "43" },
+                { "prefix[23].Name", "Wilma" },
+                { "prefix[27].Id", "98" },
+                { "prefix[27].Name", "Fred" },
+            };
+
+            var bindingContext = CreateContext();
+            bindingContext.ModelName = "prefix";
+            bindingContext.ValueProvider = CreateEnumerableValueProvider("{0}", stringDictionary);
+            bindingContext.FieldName = bindingContext.ModelName;
+
+            var metadataProvider = new TestModelMetadataProvider();
+            bindingContext.ModelMetadata = metadataProvider.GetMetadataForProperty(
+                typeof(ModelWithDictionaryProperties),
+                nameof(ModelWithDictionaryProperties.DictionaryWithComplexValuesProperty));
+
+            var valueMetadata = metadataProvider.GetMetadataForType(typeof(ModelWithProperties));
+
+            var binder = new DictionaryModelBinder<int, ModelWithProperties>(
+                new SimpleTypeModelBinder(typeof(int), NullLoggerFactory.Instance),
+                new ComplexTypeModelBinder(new Dictionary<ModelMetadata, IModelBinder>()
+                {
+                    { valueMetadata.Properties["Id"], new SimpleTypeModelBinder(typeof(int), NullLoggerFactory.Instance) },
+                    { valueMetadata.Properties["Name"], new SimpleTypeModelBinder(typeof(string), NullLoggerFactory.Instance) },
+                },
+                NullLoggerFactory.Instance),
+                NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+
+            var resultDictionary = Assert.IsAssignableFrom<IDictionary<int, ModelWithProperties>>(bindingContext.Result.Model);
+            Assert.Equal(dictionary, resultDictionary);
+
+            // This requires a non-default IValidationStrategy
+            Assert.Contains(bindingContext.Result.Model, bindingContext.ValidationState.Keys);
+            var entry = bindingContext.ValidationState[bindingContext.Result.Model];
+            var strategy = Assert.IsType<ShortFormDictionaryValidationStrategy<int, ModelWithProperties>>(entry.Strategy);
+            Assert.Equal(
+                new KeyValuePair<string, int>[]
+                {
+                    new KeyValuePair<string, int>("prefix[23]", 23),
+                    new KeyValuePair<string, int>("prefix[27]", 27),
+                }.OrderBy(kvp => kvp.Key),
+                strategy.KeyMappings.OrderBy(kvp => kvp.Key));
+        }
+
+        [Theory]
+        [MemberData(nameof(StringToStringData))]
+        public async Task BindModel_FallsBackToBindingValues_WithCustomDictionary(
+            string modelName,
+            string keyFormat,
+            IDictionary<string, string> dictionary)
+        {
+            // Arrange
+            var expectedDictionary = new SortedDictionary<string, string>(dictionary);
+            var binder = new DictionaryModelBinder<string, string>(
+                new SimpleTypeModelBinder(typeof(string), NullLoggerFactory.Instance),
+                new SimpleTypeModelBinder(typeof(string), NullLoggerFactory.Instance),
+                NullLoggerFactory.Instance);
+
+            var bindingContext = CreateContext();
+            bindingContext.ModelName = modelName;
+
+            bindingContext.ValueProvider = CreateEnumerableValueProvider(keyFormat, dictionary);
+            bindingContext.FieldName = bindingContext.ModelName;
+
+            var metadataProvider = new TestModelMetadataProvider();
+            bindingContext.ModelMetadata = metadataProvider.GetMetadataForProperty(
+                typeof(ModelWithDictionaryProperties),
+                nameof(ModelWithDictionaryProperties.CustomDictionaryProperty));
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+
+            var resultDictionary = Assert.IsAssignableFrom<SortedDictionary<string, string>>(bindingContext.Result.Model);
+            Assert.Equal(expectedDictionary, resultDictionary);
+        }
+
+        [Fact]
+        public async Task DictionaryModelBinder_CreatesEmptyCollection_IfIsTopLevelObject()
+        {
+            // Arrange
+            var binder = new DictionaryModelBinder<string, string>(
+                new SimpleTypeModelBinder(typeof(string), NullLoggerFactory.Instance),
+                new SimpleTypeModelBinder(typeof(string), NullLoggerFactory.Instance),
+                NullLoggerFactory.Instance);
+
+            var bindingContext = CreateContext();
+            bindingContext.IsTopLevelObject = true;
+
+            // Lack of prefix and non-empty model name both ignored.
+            bindingContext.ModelName = "modelName";
+
+            var metadataProvider = new TestModelMetadataProvider();
+            bindingContext.ModelMetadata = metadataProvider.GetMetadataForType(typeof(Dictionary<string, string>));
+
+            bindingContext.ValueProvider = new TestValueProvider(new Dictionary<string, object>());
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.Empty(Assert.IsType<Dictionary<string, string>>(bindingContext.Result.Model));
+            Assert.True(bindingContext.Result.IsModelSet);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData("param")]
+        public async Task DictionaryModelBinder_DoesNotCreateCollection_IfNotIsTopLevelObject(string prefix)
+        {
+            // Arrange
+            var binder = new DictionaryModelBinder<int, int>(
+                new SimpleTypeModelBinder(typeof(int), NullLoggerFactory.Instance),
+                new SimpleTypeModelBinder(typeof(int), NullLoggerFactory.Instance),
+                NullLoggerFactory.Instance);
+
+            var bindingContext = CreateContext();
+            bindingContext.ModelName = ModelNames.CreatePropertyModelName(prefix, "ListProperty");
+
+            var metadataProvider = new TestModelMetadataProvider();
+            bindingContext.ModelMetadata = metadataProvider.GetMetadataForProperty(
+                typeof(ModelWithDictionaryProperties),
+                nameof(ModelWithDictionaryProperties.DictionaryProperty));
+
+            bindingContext.ValueProvider = new TestValueProvider(new Dictionary<string, object>());
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+        }
+
+        // Model type -> can create instance.
+        public static TheoryData<Type, bool> CanCreateInstanceData
+        {
+            get
+            {
+                return new TheoryData<Type, bool>
+                {
+                    { typeof(IEnumerable<KeyValuePair<int, int>>), true },
+                    { typeof(ICollection<KeyValuePair<int, int>>), true },
+                    { typeof(IDictionary<int, int>), true },
+                    { typeof(Dictionary<int, int>), true },
+                    { typeof(SortedDictionary<int, int>), true },
+                    { typeof(IList<KeyValuePair<int, int>>), true },
+                    { typeof(ISet<KeyValuePair<int, int>>), false },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(CanCreateInstanceData))]
+        public void CanCreateInstance_ReturnsExpectedValue(Type modelType, bool expectedResult)
+        {
+            // Arrange
+            var binder = new DictionaryModelBinder<int, int>(
+                new SimpleTypeModelBinder(typeof(int), NullLoggerFactory.Instance),
+                new SimpleTypeModelBinder(typeof(int), NullLoggerFactory.Instance),
+                NullLoggerFactory.Instance);
+
+            // Act
+            var result = binder.CanCreateInstance(modelType);
+
+            // Assert
+            Assert.Equal(expectedResult, result);
+        }
+
+        private static DefaultModelBindingContext CreateContext()
+        {
+            var modelBindingContext = new DefaultModelBindingContext()
+            {
+                ActionContext = new ActionContext()
+                {
+                    HttpContext = new DefaultHttpContext(),
+                },
+                ModelState = new ModelStateDictionary(),
+                ValidationState = new ValidationStateDictionary(),
+            };
+
+            return modelBindingContext;
+        }
+
+        private static IValueProvider CreateEnumerableValueProvider(
+            string keyFormat,
+            IDictionary<string, string> dictionary)
+        {
+            // Convert to an IDictionary<string, StringValues> then wrap it up.
+            var backingStore = dictionary.ToDictionary(
+                kvp => string.Format(keyFormat, kvp.Key),
+                kvp => (StringValues)kvp.Value);
+
+            var formCollection = new FormCollection(backingStore);
+
+            return new FormValueProvider(
+                BindingSource.Form,
+                formCollection,
+                CultureInfo.InvariantCulture);
+        }
+
+        // Like CreateEnumerableValueProvider except returned instance does not implement IEnumerableValueProvider.
+        private static IValueProvider CreateTestValueProvider(string keyFormat, IDictionary<string, string> dictionary)
+        {
+            // Convert to an IDictionary<string, object> then wrap it up.
+            var backingStore = dictionary.ToDictionary(
+                kvp => string.Format(keyFormat, kvp.Key),
+                kvp => (object)kvp.Value);
+
+            return new TestValueProvider(BindingSource.Form, backingStore);
+        }
+
+        private static DefaultModelBindingContext GetModelBindingContext(
+            bool isReadOnly,
+            IDictionary<string, string> values = null)
+        {
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider
+                .ForProperty<ModelWithIDictionaryProperty>(nameof(ModelWithIDictionaryProperty.DictionaryProperty))
+                .BindingDetails(bd => bd.IsReadOnly = isReadOnly);
+            var metadata = metadataProvider.GetMetadataForProperty(
+                typeof(ModelWithIDictionaryProperty),
+                nameof(ModelWithIDictionaryProperty.DictionaryProperty));
+
+            var valueProvider = new SimpleValueProvider();
+            foreach (var kvp in values)
+            {
+                valueProvider.Add(kvp.Key, string.Empty);
+            }
+
+            var bindingContext = new DefaultModelBindingContext
+            {
+                ModelMetadata = metadata,
+                ModelName = "someName",
+                ModelState = new ModelStateDictionary(),
+                ValueProvider = valueProvider,
+                ValidationState = new ValidationStateDictionary(),
+            };
+
+            return bindingContext;
+        }
+
+        private class ModelWithIDictionaryProperty
+        {
+            public IDictionary<int, string> DictionaryProperty { get; set; }
+        }
+
+        private class ModelWithDictionaryProperties
+        {
+            // A Dictionary<string, string> instance cannot be assigned to this property.
+            public SortedDictionary<string, string> CustomDictionaryProperty { get; set; }
+
+            public Dictionary<string, string> DictionaryProperty { get; set; }
+
+            public Dictionary<int, ModelWithProperties> DictionaryWithComplexValuesProperty { get; set; }
+
+            public Dictionary<long, int> DictionaryWithValueTypesProperty { get; set; }
+        }
+
+        private class ModelWithProperties
+        {
+            public int Id { get; set; }
+
+            public string Name { get; set; }
+
+            public override bool Equals(object obj)
+            {
+                return obj is ModelWithProperties other &&
+                    Id == other.Id &&
+                    string.Equals(Name, other.Name, StringComparison.Ordinal);
+            }
+
+            public override int GetHashCode()
+            {
+                var nameCode = Name == null ? 0 : Name.GetHashCode();
+                return nameCode ^ Id.GetHashCode();
+            }
+
+            public override string ToString()
+            {
+                return $"{{{ Id }, '{ Name }'}}";
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DoubleModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DoubleModelBinderTest.cs
new file mode 100644
index 0000000000..4d028ff8b4
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DoubleModelBinderTest.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using System.Globalization;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class DoubleModelBinderTest : FloatingPointTypeModelBinderTest<double>
+    {
+        protected override double Twelve => 12.0;
+
+        protected override double TwelvePointFive => 12.5;
+
+        protected override double ThirtyTwoThousand => 32_000.0;
+
+        protected override double ThirtyTwoThousandPointOne => 32_000.1;
+
+        protected override IModelBinder GetBinder(NumberStyles numberStyles)
+        {
+            return new DoubleModelBinder(numberStyles, NullLoggerFactory.Instance);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/EnumTypeModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/EnumTypeModelBinderProviderTest.cs
new file mode 100644
index 0000000000..017f9a4e48
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/EnumTypeModelBinderProviderTest.cs
@@ -0,0 +1,76 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class EnumTypeModelBinderProviderTest
+    {
+        [Theory]
+        [InlineData(typeof(CarType))]
+        [InlineData(typeof(CarType?))]
+        public void ReturnsBinder_ForEnumType(Type modelType)
+        {
+            // Arrange
+            var provider = new EnumTypeModelBinderProvider(new MvcOptions());
+            var context = new TestModelBinderProviderContext(modelType);
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.IsType<EnumTypeModelBinder>(result);
+        }
+
+        [Theory]
+        [InlineData(typeof(CarOptions))]
+        [InlineData(typeof(CarOptions?))]
+        public void ReturnsBinder_ForFlagsEnumType(Type modelType)
+        {
+            // Arrange
+            var provider = new EnumTypeModelBinderProvider(new MvcOptions());
+            var context = new TestModelBinderProviderContext(modelType);
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.IsType<EnumTypeModelBinder>(result);
+        }
+
+        [Theory]
+        [InlineData(typeof(string))]
+        [InlineData(typeof(int))]
+        [InlineData(typeof(int?))]
+        public void DoesNotReturnBinder_ForNonEnumTypes(Type modelType)
+        {
+            // Arrange
+            var provider = new EnumTypeModelBinderProvider(new MvcOptions());
+            var context = new TestModelBinderProviderContext(modelType);
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        enum CarType
+        {
+            Sedan,
+            Coupe
+        }
+
+        [Flags]
+        public enum CarOptions
+        {
+            SunRoof = 0x01,
+            Spoiler = 0x02,
+            FogLights = 0x04,
+            TintedWindows = 0x08,
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/EnumTypeModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/EnumTypeModelBinderTest.cs
new file mode 100644
index 0000000000..e7c4a2bf2b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/EnumTypeModelBinderTest.cs
@@ -0,0 +1,319 @@
+// 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.
+
+using System;
+using System.ComponentModel;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class EnumTypeModelBinderTest
+    {
+        [Theory]
+        [InlineData(true, typeof(IntEnum?))]
+        [InlineData(true, typeof(FlagsEnum?))]
+        [InlineData(false, typeof(IntEnum?))]
+        [InlineData(false, typeof(FlagsEnum?))]
+        public async Task BindModel_SetsModel_ForEmptyValue_AndNullableEnumTypes(
+            bool suppressBindingUndefinedValueToEnumType,
+            Type modelType)
+        {
+            // Arrange
+            var binderInfo = GetBinderAndContext(
+                modelType,
+                suppressBindingUndefinedValueToEnumType,
+                valueProviderValue: "");
+            var bindingContext = binderInfo.Item1;
+            var binder = binderInfo.Item2;
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+        }
+
+        [Theory]
+        [InlineData(true, typeof(IntEnum))]
+        [InlineData(true, typeof(FlagsEnum))]
+        [InlineData(false, typeof(IntEnum))]
+        [InlineData(false, typeof(FlagsEnum))]
+        public async Task BindModel_AddsErrorToModelState_ForEmptyValue_AndNonNullableEnumTypes(
+            bool suprressBindingUndefinedValueToEnumType,
+            Type modelType)
+        {
+            // Arrange
+            var message = "The value '' is invalid.";
+            var binderInfo = GetBinderAndContext(
+                modelType,
+                suprressBindingUndefinedValueToEnumType,
+                valueProviderValue: "");
+            var bindingContext = binderInfo.Item1;
+            var binder = binderInfo.Item2;
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+            Assert.False(bindingContext.ModelState.IsValid);
+            var error = Assert.Single(bindingContext.ModelState["theModelName"].Errors);
+            Assert.Equal(message, error.ErrorMessage);
+        }
+
+        [Theory]
+        [InlineData(true, "Value1")]
+        [InlineData(true, "1")]
+        [InlineData(false, "Value1")]
+        [InlineData(false, "1")]
+        public async Task BindModel_BindsEnumModels_ForValuesInArray(
+            bool suppressBindingUndefinedValueToEnumType,
+            string enumValue)
+        {
+            // Arrange
+            var modelType = typeof(IntEnum);
+            var binderInfo = GetBinderAndContext(
+                modelType,
+                suppressBindingUndefinedValueToEnumType,
+                valueProviderValue: new object[] { enumValue });
+            var bindingContext = binderInfo.Item1;
+            var binder = binderInfo.Item2;
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            var boundModel = Assert.IsType<IntEnum>(bindingContext.Result.Model);
+            Assert.Equal(IntEnum.Value1, boundModel);
+        }
+
+        [Theory]
+        [InlineData("1", true)]
+        [InlineData("8, 1", true)]
+        [InlineData("Value2, Value8", true)]
+        [InlineData("value8,value4,value2,value1", true)]
+        [InlineData("1", false)]
+        [InlineData("8, 1", false)]
+        [InlineData("Value2, Value8", false)]
+        [InlineData("value8,value4,value2,value1", false)]
+        public async Task BindModel_BindsTo_NonNullableFlagsEnumType(string flagsEnumValue, bool suppressBindingUndefinedValueToEnumType)
+        {
+            // Arrange
+            var modelType = typeof(FlagsEnum);
+            var enumConverter = TypeDescriptor.GetConverter(modelType);
+            var expected = enumConverter.ConvertFrom(flagsEnumValue).ToString();
+            var binderInfo = GetBinderAndContext(
+                modelType,
+                suppressBindingUndefinedValueToEnumType,
+                valueProviderValue: new object[] { flagsEnumValue });
+            var bindingContext = binderInfo.Item1;
+            var binder = binderInfo.Item2;
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            var boundModel = Assert.IsType<FlagsEnum>(bindingContext.Result.Model);
+            Assert.Equal(expected, boundModel.ToString());
+        }
+
+        [Theory]
+        [InlineData("1", true)]
+        [InlineData("8, 1", true)]
+        [InlineData("Value2, Value8", true)]
+        [InlineData("value8,value4,value2,value1", true)]
+        [InlineData("1", false)]
+        [InlineData("8, 1", false)]
+        [InlineData("Value2, Value8", false)]
+        [InlineData("value8,value4,value2,value1", false)]
+        public async Task BindModel_BindsTo_NullableFlagsEnumType(string flagsEnumValue, bool suppressBindingUndefinedValueToEnumType)
+        {
+            // Arrange
+            var modelType = typeof(FlagsEnum?);
+            var enumConverter = TypeDescriptor.GetConverter(GetUnderlyingType(modelType));
+            var expected = enumConverter.ConvertFrom(flagsEnumValue).ToString();
+            var binderInfo = GetBinderAndContext(
+                modelType,
+                suppressBindingUndefinedValueToEnumType,
+                valueProviderValue: new object[] { flagsEnumValue });
+            var bindingContext = binderInfo.Item1;
+            var binder = binderInfo.Item2;
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            var boundModel = Assert.IsType<FlagsEnum>(bindingContext.Result.Model);
+            Assert.Equal(expected, boundModel.ToString());
+        }
+
+        [Theory]
+        [InlineData(typeof(FlagsEnum), "Value10")]
+        [InlineData(typeof(FlagsEnum), "Value1, Value10")]
+        [InlineData(typeof(FlagsEnum), "value10, value1")]
+        [InlineData(typeof(FlagsEnum?), "Value10")]
+        [InlineData(typeof(FlagsEnum?), "Value1, Value10")]
+        [InlineData(typeof(FlagsEnum?), "value10, value1")]
+        public async Task BindModel_AddsErrorToModelState_ForInvalidEnumValues_IsNotValidMessage(Type modelType, string suppliedValue)
+        {
+            // Arrange
+            var message = $"The value '{suppliedValue}' is not valid.";
+            var binderInfo = GetBinderAndContext(
+                modelType,
+                suppressBindingUndefinedValueToEnumType: false,
+                valueProviderValue: new object[] { suppliedValue });
+            var bindingContext = binderInfo.Item1;
+            var binder = binderInfo.Item2;
+
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+            Assert.False(bindingContext.ModelState.IsValid);
+            var error = Assert.Single(bindingContext.ModelState["theModelName"].Errors);
+            Assert.Equal(message, error.ErrorMessage);
+        }
+
+        [Theory]
+        [InlineData(typeof(IntEnum), "")]
+        [InlineData(typeof(IntEnum), "3")]
+        [InlineData(typeof(FlagsEnum), "19")]
+        [InlineData(typeof(FlagsEnum), "0")]
+        [InlineData(typeof(FlagsEnum), "1, 16")]
+        // These two values look like big integers but are treated as two separate enum values that are
+        // or'd together.
+        [InlineData(typeof(FlagsEnum), "32,015")]
+        [InlineData(typeof(FlagsEnum), "32,128")]
+        [InlineData(typeof(IntEnum?), "3")]
+        [InlineData(typeof(FlagsEnum?), "19")]
+        [InlineData(typeof(FlagsEnum?), "0")]
+        [InlineData(typeof(FlagsEnum?), "1, 16")]
+        // These two values look like big integers but are treated as two separate enum values that are
+        // or'd together.
+        [InlineData(typeof(FlagsEnum?), "32,015")]
+        [InlineData(typeof(FlagsEnum?), "32,128")]
+        public async Task BindModel_AddsErrorToModelState_ForInvalidEnumValues(Type modelType, string suppliedValue)
+        {
+            // Arrange
+            var message = $"The value '{suppliedValue}' is invalid.";
+            var binderInfo = GetBinderAndContext(
+                modelType,
+                suppressBindingUndefinedValueToEnumType: true,
+                valueProviderValue: new object[] { suppliedValue });
+            var bindingContext = binderInfo.Item1;
+            var binder = binderInfo.Item2;
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+            Assert.False(bindingContext.ModelState.IsValid);
+            var error = Assert.Single(bindingContext.ModelState["theModelName"].Errors);
+            Assert.Equal(message, error.ErrorMessage);
+        }
+
+        [Theory]
+        [InlineData(typeof(IntEnum), "3", 3)]
+        [InlineData(typeof(FlagsEnum), "19", 19)]
+        [InlineData(typeof(FlagsEnum), "0", 0)]
+        [InlineData(typeof(FlagsEnum), "1, 16", 17)]
+        // These two values look like big integers but are treated as two separate enum values that are
+        // or'd together.
+        [InlineData(typeof(FlagsEnum), "32,015", 47)]
+        [InlineData(typeof(FlagsEnum), "32,128", 160)]
+        [InlineData(typeof(IntEnum?), "3", 3)]
+        [InlineData(typeof(FlagsEnum?), "19", 19)]
+        [InlineData(typeof(FlagsEnum?), "0", 0)]
+        [InlineData(typeof(FlagsEnum?), "1, 16", 17)]
+        // These two values look like big integers but are treated as two separate enum values that are
+        // or'd together.
+        [InlineData(typeof(FlagsEnum?), "32,015", 47)]
+        [InlineData(typeof(FlagsEnum?), "32,128", 160)]
+        public async Task BindModel_AllowsBindingUndefinedValues_ToEnumTypes(
+            Type modelType,
+            string suppliedValue,
+            long expected)
+        {
+            // Arrange
+            var binderProviderContext = new TestModelBinderProviderContext(modelType);
+            var binderInfo = GetBinderAndContext(
+                modelType,
+                suppressBindingUndefinedValueToEnumType: false,
+                valueProviderValue: new object[] { suppliedValue });
+            var bindingContext = binderInfo.Item1;
+            var binder = binderInfo.Item2;
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.IsType(GetUnderlyingType(modelType), bindingContext.Result.Model);
+            Assert.Equal(expected, Convert.ToInt64(bindingContext.Result.Model));
+        }
+
+        private static (DefaultModelBindingContext, IModelBinder) GetBinderAndContext(
+            Type modelType,
+            bool suppressBindingUndefinedValueToEnumType,
+            object valueProviderValue)
+        {
+            var binderProviderContext = new TestModelBinderProviderContext(modelType);
+            var modelName = "theModelName";
+            var bindingContext = new DefaultModelBindingContext
+            {
+                ModelMetadata = binderProviderContext.Metadata,
+                ModelName = modelName,
+                ModelState = new ModelStateDictionary(),
+                ValueProvider = new SimpleValueProvider()
+                {
+                    { modelName, valueProviderValue }
+                }
+            };
+            var binderProvider = new EnumTypeModelBinderProvider(new MvcOptions
+            {
+                SuppressBindingUndefinedValueToEnumType = suppressBindingUndefinedValueToEnumType
+            });
+            var binder = binderProvider.GetBinder(binderProviderContext);
+            return (bindingContext, binder);
+        }
+
+        private static Type GetUnderlyingType(Type modelType)
+        {
+            var underlyingType = Nullable.GetUnderlyingType(modelType);
+            if (underlyingType != null)
+            {
+                return underlyingType;
+            }
+            return modelType;
+        }
+
+        [Flags]
+        private enum FlagsEnum
+        {
+            Value1 = 1,
+            Value2 = 2,
+            Value4 = 4,
+            Value8 = 8,
+        }
+
+        private enum IntEnum
+        {
+            Value0 = 0,
+            Value1 = 1,
+            Value2 = 2,
+            MaxValue = int.MaxValue
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatModelBinderTest.cs
new file mode 100644
index 0000000000..2679473092
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatModelBinderTest.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using System.Globalization;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class FloatModelBinderTest : FloatingPointTypeModelBinderTest<float>
+    {
+        protected override float Twelve => 12.0F;
+
+        protected override float TwelvePointFive => 12.5F;
+
+        protected override float ThirtyTwoThousand => 32_000.0F;
+
+        protected override float ThirtyTwoThousandPointOne => 32_000.1F;
+
+        protected override IModelBinder GetBinder(NumberStyles numberStyles)
+        {
+            return new FloatModelBinder(numberStyles, NullLoggerFactory.Instance);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatingPointTypeModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatingPointTypeModelBinderProviderTest.cs
new file mode 100644
index 0000000000..7da624a7ed
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatingPointTypeModelBinderProviderTest.cs
@@ -0,0 +1,103 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class FloatingPointTypeModelBinderProviderTest
+    {
+        [Theory]
+        [InlineData(typeof(object))]
+        [InlineData(typeof(Calendar))]
+        [InlineData(typeof(TestClass))]
+        [InlineData(typeof(List<int>))]
+        public void Create_ForCollectionOrComplexTypes_ReturnsNull(Type modelType)
+        {
+            // Arrange
+            var provider = new FloatingPointTypeModelBinderProvider();
+            var context = new TestModelBinderProviderContext(modelType);
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Theory]
+        [InlineData(typeof(int))]
+        [InlineData(typeof(int?))]
+        [InlineData(typeof(char))]
+        [InlineData(typeof(string))]
+        [InlineData(typeof(DateTime))]
+        [InlineData(typeof(DateTime?))]
+        public void Create_ForUnsupportedSimpleTypes_ReturnsNull(Type modelType)
+        {
+            // Arrange
+            var provider = new FloatingPointTypeModelBinderProvider();
+            var context = new TestModelBinderProviderContext(modelType);
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Theory]
+        [InlineData(typeof(decimal))]
+        [InlineData(typeof(decimal?))]
+        public void Create_ForDecimalTypes_ReturnsBinder(Type modelType)
+        {
+            // Arrange
+            var provider = new FloatingPointTypeModelBinderProvider();
+            var context = new TestModelBinderProviderContext(modelType);
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.IsType<DecimalModelBinder>(result);
+        }
+
+        [Theory]
+        [InlineData(typeof(double))]
+        [InlineData(typeof(double?))]
+        public void Create_ForDoubleTypes_ReturnsBinder(Type modelType)
+        {
+            // Arrange
+            var provider = new FloatingPointTypeModelBinderProvider();
+            var context = new TestModelBinderProviderContext(modelType);
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.IsType<DoubleModelBinder>(result);
+        }
+
+        [Theory]
+        [InlineData(typeof(float))]
+        [InlineData(typeof(float?))]
+        public void Create_ForFloatTypes_ReturnsBinder(Type modelType)
+        {
+            // Arrange
+            var provider = new FloatingPointTypeModelBinderProvider();
+            var context = new TestModelBinderProviderContext(modelType);
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.IsType<FloatModelBinder>(result);
+        }
+
+        private class TestClass
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs
new file mode 100644
index 0000000000..fbcb7e5893
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs
@@ -0,0 +1,387 @@
+// 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.
+
+using System;
+using System.Globalization;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public abstract class FloatingPointTypeModelBinderTest<TFloatingPoint> where TFloatingPoint: struct
+    {
+        public static TheoryData<Type> ConvertableTypeData
+        {
+            get
+            {
+                return new TheoryData<Type>
+                {
+                    typeof(TFloatingPoint),
+                    typeof(TFloatingPoint?),
+                };
+            }
+        }
+
+        protected abstract TFloatingPoint Twelve { get; }
+
+        protected abstract TFloatingPoint TwelvePointFive { get; }
+
+        protected abstract TFloatingPoint ThirtyTwoThousand { get; }
+
+        protected abstract TFloatingPoint ThirtyTwoThousandPointOne { get; }
+
+        [Theory]
+        [MemberData(nameof(ConvertableTypeData))]
+        public async Task BindModel_ReturnsFailure_IfAttemptedValueCannotBeParsed(Type destinationType)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(destinationType);
+            bindingContext.ValueProvider = new SimpleValueProvider
+            {
+                { "theModelName", "some-value" }
+            };
+            var binder = GetBinder();
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+        }
+
+        [Theory]
+        [MemberData(nameof(ConvertableTypeData))]
+        public async Task BindModel_CreatesError_IfAttemptedValueCannotBeParsed(Type destinationType)
+        {
+            // Arrange
+            var message = "The value 'not a number' is not valid.";
+            var bindingContext = GetBindingContext(destinationType);
+            bindingContext.ValueProvider = new SimpleValueProvider
+            {
+                { "theModelName", "not a number" },
+            };
+            var binder = GetBinder();
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+            Assert.False(bindingContext.ModelState.IsValid);
+
+            var error = Assert.Single(bindingContext.ModelState["theModelName"].Errors);
+            Assert.Equal(message, error.ErrorMessage);
+        }
+
+        [Theory]
+        [MemberData(nameof(ConvertableTypeData))]
+        public async Task BindModel_CreatesError_IfAttemptedValueCannotBeCompletelyParsed(Type destinationType)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(destinationType);
+            bindingContext.ValueProvider = new SimpleValueProvider(new CultureInfo("en-GB"))
+            {
+                { "theModelName", "12_5" }
+            };
+            var binder = GetBinder();
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+
+            var error = Assert.Single(bindingContext.ModelState["theModelName"].Errors);
+            Assert.Equal("The value '12_5' is not valid.", error.ErrorMessage, StringComparer.Ordinal);
+            Assert.Null(error.Exception);
+        }
+
+        [Theory]
+        [MemberData(nameof(ConvertableTypeData))]
+        public async Task BindModel_CreatesError_IfAttemptedValueContainsDisallowedWhitespace(Type destinationType)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(destinationType);
+            bindingContext.ValueProvider = new SimpleValueProvider(new CultureInfo("en-GB"))
+            {
+                { "theModelName", " 12" }
+            };
+            var binder = GetBinder(NumberStyles.Float & ~NumberStyles.AllowLeadingWhite);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+
+            var error = Assert.Single(bindingContext.ModelState["theModelName"].Errors);
+            Assert.Equal("The value ' 12' is not valid.", error.ErrorMessage, StringComparer.Ordinal);
+            Assert.Null(error.Exception);
+        }
+
+        [Theory]
+        [MemberData(nameof(ConvertableTypeData))]
+        public async Task BindModel_CreatesError_IfAttemptedValueContainsDisallowedDecimal(Type destinationType)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(destinationType);
+            bindingContext.ValueProvider = new SimpleValueProvider(new CultureInfo("en-GB"))
+            {
+                { "theModelName", "12.5" }
+            };
+            var binder = GetBinder(NumberStyles.Float & ~NumberStyles.AllowDecimalPoint);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+
+            var error = Assert.Single(bindingContext.ModelState["theModelName"].Errors);
+            Assert.Equal("The value '12.5' is not valid.", error.ErrorMessage, StringComparer.Ordinal);
+            Assert.Null(error.Exception);
+        }
+
+        [Theory]
+        [MemberData(nameof(ConvertableTypeData))]
+        public async Task BindModel_CreatesError_IfAttemptedValueContainsDisallowedThousandsSeparator(Type destinationType)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(destinationType);
+            bindingContext.ValueProvider = new SimpleValueProvider(new CultureInfo("en-GB"))
+            {
+                { "theModelName", "32,000" }
+            };
+            var binder = GetBinder(NumberStyles.Float);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+
+            var error = Assert.Single(bindingContext.ModelState["theModelName"].Errors);
+            Assert.Equal("The value '32,000' is not valid.", error.ErrorMessage, StringComparer.Ordinal);
+            Assert.Null(error.Exception);
+        }
+
+        [Theory]
+        [MemberData(nameof(ConvertableTypeData))]
+        public async Task BindModel_ReturnsFailed_IfValueProviderEmpty(Type destinationType)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(destinationType);
+            var binder = GetBinder();
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.Equal(ModelBindingResult.Failed(), bindingContext.Result);
+            Assert.Empty(bindingContext.ModelState);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(" \t \r\n ")]
+        public async Task BindModel_CreatesError_IfTrimmedAttemptedValueIsEmpty_NonNullableDestination(string value)
+        {
+            // Arrange
+            var message = $"The value '{value}' is invalid.";
+            var bindingContext = GetBindingContext(typeof(TFloatingPoint));
+            bindingContext.ValueProvider = new SimpleValueProvider
+            {
+                { "theModelName", value },
+            };
+            var binder = GetBinder();
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+
+            var error = Assert.Single(bindingContext.ModelState["theModelName"].Errors);
+            Assert.Equal(message, error.ErrorMessage, StringComparer.Ordinal);
+            Assert.Null(error.Exception);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(" \t \r\n ")]
+        public async Task BindModel_ReturnsNull_IfTrimmedAttemptedValueIsEmpty_NullableDestination(string value)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(typeof(TFloatingPoint?));
+            bindingContext.ValueProvider = new SimpleValueProvider
+            {
+                { "theModelName", value }
+            };
+            var binder = GetBinder();
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.Null(bindingContext.Result.Model);
+            var entry = Assert.Single(bindingContext.ModelState);
+            Assert.Equal("theModelName", entry.Key);
+        }
+
+        [Theory]
+        [MemberData(nameof(ConvertableTypeData))]
+        public async Task BindModel_ReturnsModel_IfAttemptedValueIsValid_Twelve(Type destinationType)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(destinationType);
+            bindingContext.ValueProvider = new SimpleValueProvider
+            {
+                { "theModelName", "12" }
+            };
+            var binder = GetBinder();
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Equal(Twelve, bindingContext.Result.Model);
+            Assert.True(bindingContext.ModelState.ContainsKey("theModelName"));
+        }
+
+        [Theory]
+        [MemberData(nameof(ConvertableTypeData))]
+        [ReplaceCulture("en-GB", "en-GB")]
+        public async Task BindModel_ReturnsModel_IfAttemptedValueIsValid_TwelvePointFive(Type destinationType)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(destinationType);
+            bindingContext.ValueProvider = new SimpleValueProvider
+            {
+                { "theModelName", "12.5" }
+            };
+            var binder = GetBinder();
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Equal(TwelvePointFive, bindingContext.Result.Model);
+            Assert.True(bindingContext.ModelState.ContainsKey("theModelName"));
+        }
+
+        [Theory]
+        [MemberData(nameof(ConvertableTypeData))]
+        public async Task BindModel_ReturnsModel_IfAttemptedValueIsValid_FrenchTwelvePointFive(Type destinationType)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(destinationType);
+            bindingContext.ValueProvider = new SimpleValueProvider(new CultureInfo("fr-FR"))
+            {
+                { "theModelName", "12,5" }
+            };
+            var binder = GetBinder();
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Equal(TwelvePointFive, bindingContext.Result.Model);
+            Assert.True(bindingContext.ModelState.ContainsKey("theModelName"));
+        }
+
+        [Theory]
+        [MemberData(nameof(ConvertableTypeData))]
+        public async Task BindModel_ReturnsModel_IfAttemptedValueIsValid_ThirtyTwoThousand(Type destinationType)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(destinationType);
+            bindingContext.ValueProvider = new SimpleValueProvider(new CultureInfo("en-GB"))
+            {
+                { "theModelName", "32,000" }
+            };
+            var binder = GetBinder();
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Equal(ThirtyTwoThousand, bindingContext.Result.Model);
+            Assert.True(bindingContext.ModelState.ContainsKey("theModelName"));
+        }
+
+        [Theory]
+        [MemberData(nameof(ConvertableTypeData))]
+        public async Task BindModel_ReturnsModel_IfAttemptedValueIsValid_ThirtyTwoThousandPointOne(Type destinationType)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(destinationType);
+            bindingContext.ValueProvider = new SimpleValueProvider(new CultureInfo("en-GB"))
+            {
+                { "theModelName", "32,000.1" }
+            };
+            var binder = GetBinder();
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Equal(ThirtyTwoThousandPointOne, bindingContext.Result.Model);
+            Assert.True(bindingContext.ModelState.ContainsKey("theModelName"));
+        }
+
+        [Theory]
+        [MemberData(nameof(ConvertableTypeData))]
+        public async Task BindModel_ReturnsModel_IfAttemptedValueIsValid_FrenchThirtyTwoThousandPointOne(Type destinationType)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(destinationType);
+            bindingContext.ValueProvider = new SimpleValueProvider(new CultureInfo("fr-FR"))
+            {
+                { "theModelName", "32 000,1" }
+            };
+            var binder = GetBinder();
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Equal(ThirtyTwoThousandPointOne, bindingContext.Result.Model);
+            Assert.True(bindingContext.ModelState.ContainsKey("theModelName"));
+        }
+
+        protected abstract IModelBinder GetBinder(NumberStyles numberStyles);
+
+        private IModelBinder GetBinder()
+        {
+            return GetBinder(FloatingPointTypeModelBinderProvider.SupportedStyles);
+        }
+
+        private static DefaultModelBindingContext GetBindingContext(Type modelType)
+        {
+            return new DefaultModelBindingContext
+            {
+                ModelMetadata = new EmptyModelMetadataProvider().GetMetadataForType(modelType),
+                ModelName = "theModelName",
+                ModelState = new ModelStateDictionary(),
+                ValueProvider = new SimpleValueProvider() // empty
+            };
+        }
+
+        private sealed class TestClass
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormCollectionModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormCollectionModelBinderProviderTest.cs
new file mode 100644
index 0000000000..8562af3410
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormCollectionModelBinderProviderTest.cs
@@ -0,0 +1,70 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class FormCollectionModelBinderProviderTest
+    {
+        [Theory]
+        [InlineData(typeof(FormCollection))]
+        [InlineData(typeof(DerviedFormCollection))]
+        public void Create_ThrowsException_ForFormCollectionModelType(Type modelType)
+        {
+            // Arrange
+            var provider = new FormCollectionModelBinderProvider();
+            var context = new TestModelBinderProviderContext(modelType);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => provider.GetBinder(context));
+
+            Assert.Equal(
+                $"The '{typeof(FormCollectionModelBinder).FullName}' cannot bind to a model of type '{modelType.FullName}'. Change the model type to '{typeof(IFormCollection).FullName}' instead.",
+                exception.Message);
+        }
+
+        [Theory]
+        [InlineData(typeof(TestClass))]
+        [InlineData(typeof(IList<int>))]
+        [InlineData(typeof(int[]))]
+        public void Create_ForNonFormCollectionTypes_ReturnsNull(Type modelType)
+        {
+            // Arrange
+            var provider = new FormCollectionModelBinderProvider();
+            var context = new TestModelBinderProviderContext(modelType);
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void Create_ForFormCollectionToken_ReturnsBinder()
+        {
+            // Arrange
+            var provider = new FormCollectionModelBinderProvider();
+            var context = new TestModelBinderProviderContext(typeof(IFormCollection));
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.IsType<FormCollectionModelBinder>(result);
+        }
+
+        private class TestClass
+        {
+        }
+
+        private class DerviedFormCollection : FormCollection
+        {
+            public DerviedFormCollection() : base(fields: null, files: null) { }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormCollectionModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormCollectionModelBinderTest.cs
new file mode 100644
index 0000000000..ad8eca9bc3
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormCollectionModelBinderTest.cs
@@ -0,0 +1,88 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Primitives;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class FormCollectionModelBinderTest
+    {
+        [Fact]
+        public async Task FormCollectionModelBinder_ValidType_BindSuccessful()
+        {
+            // Arrange
+            var formCollection = new FormCollection(new Dictionary<string, StringValues>
+            {
+                { "field1", "value1" },
+                { "field2", "value2" }
+            });
+            var httpContext = GetMockHttpContext(formCollection);
+            var bindingContext = GetBindingContext(typeof(IFormCollection), httpContext);
+            var binder = new FormCollectionModelBinder(NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Empty(bindingContext.ValidationState);
+
+            var form = Assert.IsAssignableFrom<IFormCollection>(bindingContext.Result.Model);
+            Assert.Equal(2, form.Count);
+            Assert.Equal("value1", form["field1"]);
+            Assert.Equal("value2", form["field2"]);
+        }
+
+        [Fact]
+        public async Task FormCollectionModelBinder_NoForm_BindSuccessful_ReturnsEmptyFormCollection()
+        {
+            // Arrange
+            var httpContext = GetMockHttpContext(null, hasForm: false);
+            var bindingContext = GetBindingContext(typeof(IFormCollection), httpContext);
+            var binder = new FormCollectionModelBinder(NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            var form = Assert.IsAssignableFrom<IFormCollection>(bindingContext.Result.Model);
+            Assert.Empty(form);
+        }
+
+        private static HttpContext GetMockHttpContext(IFormCollection formCollection, bool hasForm = true)
+        {
+            var httpContext = new Mock<HttpContext>();
+            httpContext.Setup(h => h.Request.ReadFormAsync(It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(formCollection));
+            httpContext.Setup(h => h.Request.HasFormContentType).Returns(hasForm);
+            return httpContext.Object;
+        }
+
+        private static DefaultModelBindingContext GetBindingContext(Type modelType, HttpContext httpContext)
+        {
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var bindingContext = new DefaultModelBindingContext
+            {
+                ActionContext = new ActionContext()
+                {
+                    HttpContext = httpContext,
+                },
+                ModelMetadata = metadataProvider.GetMetadataForType(modelType),
+                ModelName = "file",
+                ValidationState = new ValidationStateDictionary(),
+            };
+
+            return bindingContext;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormFileModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormFileModelBinderProviderTest.cs
new file mode 100644
index 0000000000..7c726c129b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormFileModelBinderProviderTest.cs
@@ -0,0 +1,55 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using Microsoft.AspNetCore.Http;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class FormFileModelBinderProviderTest
+    {
+        [Theory]
+        [InlineData(typeof(object))]
+        [InlineData(typeof(IFormCollection))]
+        [InlineData(typeof(TestClass))]
+        [InlineData(typeof(IList<int>))]
+        public void Create_ForUnsupportedTypes_ReturnsNull(Type modelType)
+        {
+            // Arrange
+            var provider = new FormFileModelBinderProvider();
+            var context = new TestModelBinderProviderContext(modelType);
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Theory]
+        [InlineData(typeof(IFormFile))]
+        [InlineData(typeof(IFormFile[]))]
+        [InlineData(typeof(IFormFileCollection))]
+        [InlineData(typeof(IEnumerable<IFormFile>))]
+        [InlineData(typeof(Collection<IFormFile>))]
+        public void Create_ForSupportedTypes_ReturnsBinder(Type modelType)
+        {
+            // Arrange
+            var provider = new FormFileModelBinderProvider();
+            var context = new TestModelBinderProviderContext(modelType);
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.IsType<FormFileModelBinder>(result);
+        }
+
+        private class TestClass
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormFileModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormFileModelBinderTest.cs
new file mode 100644
index 0000000000..d738cdc6ff
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormFileModelBinderTest.cs
@@ -0,0 +1,327 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class FormFileModelBinderTest
+    {
+        [Fact]
+        public async Task FormFileModelBinder_SingleFile_BindSuccessful()
+        {
+            // Arrange
+            var formFiles = new FormFileCollection();
+            formFiles.Add(GetMockFormFile("file", "file1.txt"));
+            var httpContext = GetMockHttpContext(GetMockFormCollection(formFiles));
+            var bindingContext = GetBindingContext(typeof(IEnumerable<IFormFile>), httpContext);
+            var binder = new FormFileModelBinder(NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+
+            var entry = bindingContext.ValidationState[bindingContext.Result.Model];
+            Assert.False(entry.SuppressValidation);
+            Assert.Equal("file", entry.Key);
+            Assert.Null(entry.Metadata);
+        }
+
+        [Fact]
+        public async Task FormFileModelBinder_ExpectMultipleFiles_BindSuccessful()
+        {
+            // Arrange
+            var formFiles = GetTwoFiles();
+            var httpContext = GetMockHttpContext(GetMockFormCollection(formFiles));
+            var bindingContext = GetBindingContext(typeof(IEnumerable<IFormFile>), httpContext);
+            var binder = new FormFileModelBinder(NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+
+            var entry = bindingContext.ValidationState[bindingContext.Result.Model];
+            Assert.False(entry.SuppressValidation);
+            Assert.Equal("file", entry.Key);
+            Assert.Null(entry.Metadata);
+
+            var files = Assert.IsAssignableFrom<IList<IFormFile>>(bindingContext.Result.Model);
+            Assert.Equal(2, files.Count);
+        }
+
+        [Theory]
+        [InlineData(typeof(IFormFile[]))]
+        [InlineData(typeof(ICollection<IFormFile>))]
+        [InlineData(typeof(IList<IFormFile>))]
+        [InlineData(typeof(IFormFileCollection))]
+        [InlineData(typeof(List<IFormFile>))]
+        [InlineData(typeof(LinkedList<IFormFile>))]
+        [InlineData(typeof(FileList))]
+        [InlineData(typeof(FormFileCollection))]
+        public async Task FormFileModelBinder_BindsFiles_ForCollectionsItCanCreate(Type destinationType)
+        {
+            // Arrange
+            var binder = new FormFileModelBinder(NullLoggerFactory.Instance);
+            var formFiles = GetTwoFiles();
+            var httpContext = GetMockHttpContext(GetMockFormCollection(formFiles));
+            var bindingContext = GetBindingContext(destinationType, httpContext);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.IsAssignableFrom(destinationType, bindingContext.Result.Model);
+            Assert.Equal(formFiles, bindingContext.Result.Model as IEnumerable<IFormFile>);
+        }
+
+        [Fact]
+        public async Task FormFileModelBinder_ExpectSingleFile_BindFirstFile()
+        {
+            // Arrange
+            var formFiles = GetTwoFiles();
+            var httpContext = GetMockHttpContext(GetMockFormCollection(formFiles));
+            var bindingContext = GetBindingContext(typeof(IFormFile), httpContext);
+            var binder = new FormFileModelBinder(NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            var file = Assert.IsAssignableFrom<IFormFile>(bindingContext.Result.Model);
+            Assert.Equal("file1.txt", file.FileName);
+        }
+
+        [Fact]
+        public async Task FormFileModelBinder_ReturnsFailedResult_WhenNoFilePosted()
+        {
+            // Arrange
+            var formFiles = new FormFileCollection();
+            var httpContext = GetMockHttpContext(GetMockFormCollection(formFiles));
+            var bindingContext = GetBindingContext(typeof(IFormFile), httpContext);
+            var binder = new FormFileModelBinder(NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+        }
+
+        [Fact]
+        public async Task FormFileModelBinder_ReturnsFailedResult_WhenNamesDoNotMatch()
+        {
+            // Arrange
+            var formFiles = new FormFileCollection();
+            formFiles.Add(GetMockFormFile("different name", "file1.txt"));
+            var httpContext = GetMockHttpContext(GetMockFormCollection(formFiles));
+            var bindingContext = GetBindingContext(typeof(IFormFile), httpContext);
+            var binder = new FormFileModelBinder(NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+        }
+
+        [Theory]
+        [InlineData(true, "FieldName")]
+        [InlineData(false, "ModelName")]
+        public async Task FormFileModelBinder_UsesFieldNameForTopLevelObject(bool isTopLevel, string expected)
+        {
+            // Arrange
+            var formFiles = new FormFileCollection();
+            formFiles.Add(GetMockFormFile("FieldName", "file1.txt"));
+            formFiles.Add(GetMockFormFile("ModelName", "file1.txt"));
+            var httpContext = GetMockHttpContext(GetMockFormCollection(formFiles));
+
+            var bindingContext = GetBindingContext(typeof(IFormFile), httpContext);
+            bindingContext.IsTopLevelObject = isTopLevel;
+            bindingContext.FieldName = "FieldName";
+            bindingContext.ModelName = "ModelName";
+
+            var binder = new FormFileModelBinder(NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            var file = Assert.IsAssignableFrom<IFormFile>(bindingContext.Result.Model);
+
+            Assert.Equal(expected, file.Name);
+        }
+
+        [Fact]
+        public async Task FormFileModelBinder_ReturnsFailedResult_WithEmptyContentDisposition()
+        {
+            // Arrange
+            var formFiles = new FormFileCollection();
+            formFiles.Add(new Mock<IFormFile>().Object);
+            var httpContext = GetMockHttpContext(GetMockFormCollection(formFiles));
+            var bindingContext = GetBindingContext(typeof(IFormFile), httpContext);
+            var binder = new FormFileModelBinder(NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+        }
+
+        [Fact]
+        public async Task FormFileModelBinder_ReturnsFailedResult_WithNoFileNameAndZeroLength()
+        {
+            // Arrange
+            var formFiles = new FormFileCollection();
+            formFiles.Add(GetMockFormFile("file", ""));
+            var httpContext = GetMockHttpContext(GetMockFormCollection(formFiles));
+            var bindingContext = GetBindingContext(typeof(IFormFile), httpContext);
+            var binder = new FormFileModelBinder(NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+        }
+
+        [Fact]
+        public async Task FormFileModelBinder_ReturnsResult_ForReadOnlyDestination()
+        {
+            // Arrange
+            var binder = new FormFileModelBinder(NullLoggerFactory.Instance);
+            var formFiles = GetTwoFiles();
+            var httpContext = GetMockHttpContext(GetMockFormCollection(formFiles));
+            var bindingContext = GetBindingContextForReadOnlyArray(httpContext);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.NotNull(bindingContext.Result.Model);
+        }
+
+        [Fact]
+        public async Task FormFileModelBinder_ReturnsFailedResult_ForCollectionsItCannotCreate()
+        {
+            // Arrange
+            var binder = new FormFileModelBinder(NullLoggerFactory.Instance);
+            var formFiles = GetTwoFiles();
+            var httpContext = GetMockHttpContext(GetMockFormCollection(formFiles));
+            var bindingContext = GetBindingContext(typeof(ISet<IFormFile>), httpContext);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+        }
+
+        private static DefaultModelBindingContext GetBindingContextForReadOnlyArray(HttpContext httpContext)
+        {
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider
+                .ForProperty<ModelWithReadOnlyArray>(nameof(ModelWithReadOnlyArray.ArrayProperty))
+                .BindingDetails(bd => bd.BindingSource = BindingSource.Header);
+            var metadata = metadataProvider.GetMetadataForProperty(
+                typeof(ModelWithReadOnlyArray),
+                nameof(ModelWithReadOnlyArray.ArrayProperty));
+
+            return GetBindingContext(metadata, httpContext);
+        }
+
+        private static DefaultModelBindingContext GetBindingContext(Type modelType, HttpContext httpContext)
+        {
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var metadata = metadataProvider.GetMetadataForType(modelType);
+
+            return GetBindingContext(metadata, httpContext);
+        }
+
+        private static DefaultModelBindingContext GetBindingContext(
+            ModelMetadata metadata,
+            HttpContext httpContext)
+        {
+            var bindingContext = new DefaultModelBindingContext
+            {
+                ActionContext = new ActionContext()
+                {
+                    HttpContext = httpContext,
+                },
+                ModelMetadata = metadata,
+                ModelName = "file",
+                ModelState = new ModelStateDictionary(),
+                ValidationState = new ValidationStateDictionary(),
+            };
+
+            return bindingContext;
+        }
+
+        private static HttpContext GetMockHttpContext(IFormCollection formCollection)
+        {
+            var httpContext = new Mock<HttpContext>();
+            httpContext.Setup(h => h.Request.ReadFormAsync(It.IsAny<CancellationToken>()))
+                .Returns(Task.FromResult(formCollection));
+            httpContext.Setup(h => h.Request.HasFormContentType).Returns(true);
+            return httpContext.Object;
+        }
+
+        private static FormFileCollection GetTwoFiles()
+        {
+            var formFiles = new FormFileCollection
+            {
+                GetMockFormFile("file", "file1.txt"),
+                GetMockFormFile("file", "file2.txt"),
+            };
+
+            return formFiles;
+        }
+
+        private static IFormCollection GetMockFormCollection(FormFileCollection formFiles)
+        {
+            var formCollection = new Mock<IFormCollection>();
+            formCollection.Setup(f => f.Files).Returns(formFiles);
+            return formCollection.Object;
+        }
+
+        private static IFormFile GetMockFormFile(string modelName, string filename)
+        {
+            var formFile = new Mock<IFormFile>();
+            formFile.Setup(f => f.Name).Returns(modelName);
+            formFile.Setup(f => f.FileName).Returns(filename);
+
+            return formFile.Object;
+        }
+
+        private class ModelWithReadOnlyArray
+        {
+            public IFormFile[] ArrayProperty { get; }
+        }
+
+        private class FileList : List<IFormFile>
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/HeaderModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/HeaderModelBinderProviderTest.cs
new file mode 100644
index 0000000000..ac60c4b0cd
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/HeaderModelBinderProviderTest.cs
@@ -0,0 +1,276 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class HeaderModelBinderProviderTest
+    {
+        [Theory]
+        [InlineData(typeof(string))]
+        [InlineData(typeof(string[]))]
+        [InlineData(typeof(List<string>))]
+        public void Create_WhenBindingSourceIsFromHeader_ReturnsBinder_ForStringTypes_And_CompatVersion_2_0(
+            Type modelType)
+        {
+            // Arrange
+            var provider = new HeaderModelBinderProvider();
+            var testBinder = Mock.Of<IModelBinder>();
+            var context = GetTestModelBinderProviderContext(
+                modelType,
+                allowBindingHeaderValuesToNonStringModelTypes: false);
+            context.BindingInfo.BindingSource = BindingSource.Header;
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.IsType<HeaderModelBinder>(result);
+        }
+
+        [Theory]
+        [InlineData(typeof(int))]
+        [InlineData(typeof(int?))]
+        [InlineData(typeof(IEnumerable<int>))]
+        [InlineData(typeof(double))]
+        [InlineData(typeof(double?))]
+        [InlineData(typeof(IEnumerable<double>))]
+        [InlineData(typeof(CarEnumType))]
+        [InlineData(typeof(CarEnumType?))]
+        [InlineData(typeof(IEnumerable<CarEnumType>))]
+        public void Create_WhenBindingSourceIsFromHeader_ReturnsNull_ForNonStringTypes_And_CompatVersion_2_0(
+            Type modelType)
+        {
+            // Arrange
+            var provider = new HeaderModelBinderProvider();
+            var context = GetTestModelBinderProviderContext(
+                modelType,
+                allowBindingHeaderValuesToNonStringModelTypes: false);
+            context.BindingInfo.BindingSource = BindingSource.Header;
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        public static TheoryData<BindingSource> NonHeaderBindingSources
+        {
+            get
+            {
+                return new TheoryData<BindingSource>()
+                {
+                    BindingSource.Body,
+                    BindingSource.Form,
+                    null,
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(NonHeaderBindingSources))]
+        public void Create_WhenBindingSourceIsNotFromHeader_ReturnsNull(BindingSource source)
+        {
+            // Arrange
+            var provider = new HeaderModelBinderProvider();
+            var testBinder = Mock.Of<IModelBinder>();
+            var context = GetTestModelBinderProviderContext(typeof(string));
+            context.OnCreatingBinder(modelMetadata => testBinder);
+            context.BindingInfo.BindingSource = source;
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Theory]
+        [InlineData(typeof(string))]
+        [InlineData(typeof(bool))]
+        [InlineData(typeof(int))]
+        [InlineData(typeof(DateTime))]
+        [InlineData(typeof(double))]
+        [InlineData(typeof(CarEnumType))]
+        public void Create_WhenBindingSourceIsFromHeader_ReturnsBinder_ForSimpleTypes(Type modelType)
+        {
+            // Arrange
+            var provider = new HeaderModelBinderProvider();
+            var testBinder = Mock.Of<IModelBinder>();
+            var context = GetTestModelBinderProviderContext(modelType);
+            context.OnCreatingBinder(modelMetadata => testBinder);
+            context.BindingInfo.BindingSource = BindingSource.Header;
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            var headerModelBinder = Assert.IsType<HeaderModelBinder>(result);
+            Assert.Same(testBinder, headerModelBinder.InnerModelBinder);
+        }
+
+        [Theory]
+        [InlineData(typeof(bool?))]
+        [InlineData(typeof(int?))]
+        [InlineData(typeof(DateTime?))]
+        [InlineData(typeof(double?))]
+        [InlineData(typeof(CarEnumType?))]
+        public void Create_WhenBindingSourceIsFromHeader_ReturnsBinder_ForNullableSimpleTypes(Type modelType)
+        {
+            // Arrange
+            var provider = new HeaderModelBinderProvider();
+            var testBinder = Mock.Of<IModelBinder>();
+            var context = GetTestModelBinderProviderContext(modelType);
+            context.OnCreatingBinder(modelMetadata => testBinder);
+            context.BindingInfo.BindingSource = BindingSource.Header;
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            var headerModelBinder = Assert.IsType<HeaderModelBinder>(result);
+            Assert.Same(testBinder, headerModelBinder.InnerModelBinder);
+        }
+
+        [Theory]
+        [InlineData(typeof(string[]))]
+        [InlineData(typeof(IEnumerable<bool>))]
+        [InlineData(typeof(List<byte>))]
+        [InlineData(typeof(Collection<short>))]
+        [InlineData(typeof(float[]))]
+        [InlineData(typeof(IEnumerable<decimal>))]
+        [InlineData(typeof(List<double>))]
+        [InlineData(typeof(ICollection<CarEnumType>))]
+        public void Create_WhenBindingSourceIsFromHeader_ReturnsBinder_ForCollectionOfSimpleTypes(Type modelType)
+        {
+            // Arrange
+            var provider = new HeaderModelBinderProvider();
+            var testBinder = Mock.Of<IModelBinder>();
+            var context = GetTestModelBinderProviderContext(modelType);
+            context.OnCreatingBinder(modelMetadata => testBinder);
+            context.BindingInfo.BindingSource = BindingSource.Header;
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            var headerModelBinder = Assert.IsType<HeaderModelBinder>(result);
+            Assert.Same(testBinder, headerModelBinder.InnerModelBinder);
+        }
+
+        [Theory]
+        [InlineData(typeof(CustomerStruct))]
+        [InlineData(typeof(IEnumerable<CustomerStruct>))]
+        [InlineData(typeof(Person))]
+        [InlineData(typeof(IEnumerable<Person>))]
+        public void Create_WhenBindingSourceIsFromHeader_ReturnsNull_ForNonSimpleModelType(Type modelType)
+        {
+            // Arrange
+            var provider = new HeaderModelBinderProvider();
+            var testBinder = Mock.Of<IModelBinder>();
+            var context = GetTestModelBinderProviderContext(modelType);
+            context.OnCreatingBinder(modelMetadata => testBinder);
+            context.BindingInfo.BindingSource = BindingSource.Header;
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Theory]
+        [InlineData(typeof(ProductWithTypeConverter))]
+        [InlineData(typeof(IEnumerable<ProductWithTypeConverter>))]
+        [InlineData(typeof(CustomerStructWithTypeConverter))]
+        [InlineData(typeof(IEnumerable<CustomerStructWithTypeConverter>))]
+        public void Create_WhenBindingSourceIsFromHeader_ReturnsBinder_ForNonSimpleModelType_HavingTypeConverter(
+            Type modelType)
+        {
+            // Arrange
+            var provider = new HeaderModelBinderProvider();
+            var testBinder = Mock.Of<IModelBinder>();
+            var context = GetTestModelBinderProviderContext(modelType);
+            context.OnCreatingBinder(modelMetadata => testBinder);
+            context.BindingInfo.BindingSource = BindingSource.Header;
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            var headerModelBinder = Assert.IsType<HeaderModelBinder>(result);
+            Assert.Same(testBinder, headerModelBinder.InnerModelBinder);
+        }
+
+        [Fact]
+        public void Create_WhenBindingSourceIsFromHeader_NoInnerBinderAvailable_ReturnsNull()
+        {
+            // Arrange
+            var provider = new HeaderModelBinderProvider();
+            var context = GetTestModelBinderProviderContext(typeof(string));
+            context.OnCreatingBinder(modelMetadata => null);
+            context.BindingInfo.BindingSource = BindingSource.Header;
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        private TestModelBinderProviderContext GetTestModelBinderProviderContext(
+            Type modelType,
+            bool allowBindingHeaderValuesToNonStringModelTypes = true)
+        {
+            var context = new TestModelBinderProviderContext(modelType);
+            var options = context.Services.GetRequiredService<IOptions<MvcOptions>>().Value;
+            options.AllowBindingHeaderValuesToNonStringModelTypes = allowBindingHeaderValuesToNonStringModelTypes;
+            return context;
+        }
+
+        private enum CarEnumType
+        {
+            Sedan,
+            Coupe
+        }
+
+        private struct CustomerStruct
+        {
+            public string Name { get; set; }
+        }
+
+        [TypeConverter(typeof(CanConvertFromStringConverter))]
+        private struct CustomerStructWithTypeConverter
+        {
+            public string Name { get; set; }
+        }
+
+        private class Person
+        {
+            public string Name { get; set; }
+        }
+
+        [TypeConverter(typeof(CanConvertFromStringConverter))]
+        private class ProductWithTypeConverter
+        {
+            public string Name { get; set; }
+        }
+
+        private class CanConvertFromStringConverter : TypeConverter
+        {
+            public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+            {
+                return sourceType == typeof(string);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/HeaderModelBinderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/HeaderModelBinderTests.cs
new file mode 100644
index 0000000000..2b750fd67f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/HeaderModelBinderTests.cs
@@ -0,0 +1,456 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class HeaderModelBinderTests
+    {
+        public static TheoryData<HeaderModelBinder> HeaderModelBinderWithoutInnerBinderData
+        {
+            get
+            {
+                var data = new TheoryData<HeaderModelBinder>();
+#pragma warning disable CS0618
+                data.Add(new HeaderModelBinder());
+#pragma warning restore CS0618
+                data.Add(new HeaderModelBinder(NullLoggerFactory.Instance));
+                return data;
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(HeaderModelBinderWithoutInnerBinderData))]
+        public async Task HeaderBinder_BindsHeaders_ToStringCollection_WithoutInnerModelBinder(
+            HeaderModelBinder binder)
+        {
+            // Arrange
+            var type = typeof(string[]);
+            var header = "Accept";
+            var headerValue = "application/json,text/json";
+
+            var bindingContext = CreateContext(type);
+
+            bindingContext.FieldName = header;
+            bindingContext.HttpContext.Request.Headers.Add(header, new[] { headerValue });
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Equal(headerValue.Split(','), bindingContext.Result.Model);
+        }
+
+        [Theory]
+        [MemberData(nameof(HeaderModelBinderWithoutInnerBinderData))]
+        public async Task HeaderBinder_BindsHeaders_ToStringType_WithoutInnerModelBinder(HeaderModelBinder binder)
+        {
+            // Arrange
+            var type = typeof(string);
+            var header = "User-Agent";
+            var headerValue = "UnitTest";
+            var bindingContext = CreateContext(type);
+
+            bindingContext.FieldName = header;
+            bindingContext.HttpContext.Request.Headers.Add(header, new[] { headerValue });
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Equal(headerValue, bindingContext.Result.Model);
+        }
+
+        [Theory]
+        [InlineData(typeof(IEnumerable<string>))]
+        [InlineData(typeof(ICollection<string>))]
+        [InlineData(typeof(IList<string>))]
+        [InlineData(typeof(List<string>))]
+        [InlineData(typeof(LinkedList<string>))]
+        [InlineData(typeof(StringList))]
+        public async Task HeaderBinder_BindsHeaders_ForCollectionsItCanCreate_WithoutInnerModelBinder(
+            Type destinationType)
+        {
+            // Arrange
+            var header = "Accept";
+            var headerValue = "application/json,text/json";
+#pragma warning disable CS0618
+            var binder = new HeaderModelBinder();
+#pragma warning restore CS0618
+            var bindingContext = CreateContext(destinationType);
+
+            bindingContext.FieldName = header;
+            bindingContext.HttpContext.Request.Headers.Add(header, new[] { headerValue });
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.IsAssignableFrom(destinationType, bindingContext.Result.Model);
+            Assert.Equal(headerValue.Split(','), bindingContext.Result.Model as IEnumerable<string>);
+        }
+
+        [Fact]
+        public async Task HeaderBinder_BindsHeaders_ToStringCollection()
+        {
+            // Arrange
+            var type = typeof(string[]);
+            var headerValue = "application/json,text/json";
+            var bindingContext = CreateContext(type);
+            var binder = CreateBinder(bindingContext);
+            bindingContext.HttpContext.Request.Headers.Add("Header", new[] { headerValue });
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Equal(headerValue.Split(','), bindingContext.Result.Model);
+        }
+
+        public static TheoryData<string, Type, object> BinderHeaderToSimpleTypesData
+        {
+            get
+            {
+                var guid = new Guid("3916A5B1-5FE4-4E09-9812-5CDC127FA5B1");
+
+                return new TheoryData<string, Type, object>()
+                {
+                    { "10", typeof(int), 10 },
+                    { "10.50", typeof(double), 10.50 },
+                    { "10.50", typeof(IEnumerable<double>), new List<double>() { 10.50 } },
+                    { "Sedan", typeof(CarType), CarType.Sedan },
+                    { "", typeof(CarType?), null },
+                    { "", typeof(string[]), Array.Empty<string>() },
+                    { null, typeof(string[]), Array.Empty<string>() },
+                    { "", typeof(IEnumerable<string>), new List<string>() },
+                    { null, typeof(IEnumerable<string>), new List<string>() },
+                    { guid.ToString(), typeof(Guid), guid },
+                    { "foo", typeof(string), "foo" },
+                    { "foo, bar", typeof(string), "foo, bar" },
+                    { "foo, bar", typeof(string[]), new[]{ "foo", "bar" } },
+                    { "foo, \"bar\"", typeof(string[]), new[]{ "foo", "bar" } },
+                    { "\"foo,bar\"", typeof(string[]), new[]{ "foo,bar" } }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(BinderHeaderToSimpleTypesData))]
+        public async Task HeaderBinder_BindsHeaders_ToSimpleTypes(
+            string headerValue,
+            Type modelType,
+            object expectedModel)
+        {
+            // Arrange
+            var bindingContext = CreateContext(modelType);
+            var binder = CreateBinder(bindingContext);
+
+            if (headerValue != null)
+            {
+                bindingContext.HttpContext.Request.Headers.Add("Header", headerValue);
+            }
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Equal(expectedModel, bindingContext.Result.Model);
+        }
+
+        [Theory]
+        [InlineData(typeof(CarType?), null)]
+        [InlineData(typeof(int?), null)]
+        public async Task HeaderBinder_DoesNotSetModel_ForHeaderNotPresentOnRequest(
+            Type modelType,
+            object expectedModel)
+        {
+            // Arrange
+            var bindingContext = CreateContext(modelType);
+            var binder = CreateBinder(bindingContext);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+        }
+
+        [Theory]
+        [InlineData(typeof(string[]), null)]
+        [InlineData(typeof(IEnumerable<string>), null)]
+        public async Task HeaderBinder_DoesNotCreateEmptyCollection_ForNonTopLevelObjects(
+            Type modelType,
+            object expectedModel)
+        {
+            // Arrange
+            var bindingContext = CreateContext(modelType);
+            bindingContext.IsTopLevelObject = false;
+            var binder = CreateBinder(bindingContext);
+            // No header on the request that the header value provider is looking for
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+        }
+
+        [Theory]
+        [InlineData(typeof(IEnumerable<string>))]
+        [InlineData(typeof(ICollection<string>))]
+        [InlineData(typeof(IList<string>))]
+        [InlineData(typeof(List<string>))]
+        [InlineData(typeof(LinkedList<string>))]
+        [InlineData(typeof(StringList))]
+        public async Task HeaderBinder_BindsHeaders_ForCollectionsItCanCreate(Type destinationType)
+        {
+            // Arrange
+            var headerValue = "application/json,text/json";
+            var bindingContext = CreateContext(destinationType);
+            var binder = CreateBinder(bindingContext);
+            bindingContext.HttpContext.Request.Headers.Add("Header", new[] { headerValue });
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.IsAssignableFrom(destinationType, bindingContext.Result.Model);
+            Assert.Equal(headerValue.Split(','), bindingContext.Result.Model as IEnumerable<string>);
+        }
+
+        [Fact]
+        public async Task HeaderBinder_ReturnsResult_ForReadOnlyDestination()
+        {
+            // Arrange
+            var bindingContext = CreateContext(GetMetadataForReadOnlyArray());
+            var binder = CreateBinder(bindingContext);
+            bindingContext.HttpContext.Request.Headers.Add("Header", "application/json,text/json");
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.NotNull(bindingContext.Result.Model);
+        }
+
+        [Fact]
+        public async Task HeaderBinder_ResetsTheBindingScope_GivingOriginalValueProvider()
+        {
+            // Arrange
+            var expectedValueProvider = Mock.Of<IValueProvider>();
+            var bindingContext = CreateContext(GetMetadataForType(typeof(string)), expectedValueProvider);
+            var binder = CreateBinder(bindingContext);
+            bindingContext.HttpContext.Request.Headers.Add("Header", "application/json,text/json");
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Equal("application/json,text/json", bindingContext.Result.Model);
+            Assert.Same(expectedValueProvider, bindingContext.ValueProvider);
+        }
+
+        [Fact]
+        public async Task HeaderBinder_UsesValues_OnlyFromHeaderValueProvider()
+        {
+            // Arrange
+            var testValueProvider = new Mock<IValueProvider>();
+            testValueProvider
+                .Setup(vp => vp.ContainsPrefix(It.IsAny<string>()))
+                .Returns(true);
+            testValueProvider
+                .Setup(vp => vp.GetValue(It.IsAny<string>()))
+                .Returns(new ValueProviderResult(new StringValues("foo,bar")));
+            var bindingContext = CreateContext(GetMetadataForType(typeof(string)), testValueProvider.Object);
+            var binder = CreateBinder(bindingContext);
+            bindingContext.HttpContext.Request.Headers.Add("Header", "application/json,text/json");
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Equal("application/json,text/json", bindingContext.Result.Model);
+            Assert.Same(testValueProvider.Object, bindingContext.ValueProvider);
+        }
+
+        [Theory]
+        [InlineData(typeof(int), "not-an-integer")]
+        [InlineData(typeof(double), "not-an-double")]
+        [InlineData(typeof(CarType?), "boo")]
+        public async Task HeaderBinder_BindModelAsync_AddsErrorToModelState_OnInvalidInput(
+            Type modelType,
+            string headerValue)
+        {
+            // Arrange
+            var bindingContext = CreateContext(modelType);
+            var binder = CreateBinder(bindingContext);
+            bindingContext.HttpContext.Request.Headers.Add("Header", headerValue);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            var entry = bindingContext.ModelState["someprefix.Header"];
+            Assert.NotNull(entry);
+            var error = Assert.Single(entry.Errors);
+            Assert.Equal($"The value '{headerValue}' is not valid.", error.ErrorMessage);
+        }
+
+        [Theory]
+        [InlineData(typeof(int[]), "a, b")]
+        [InlineData(typeof(IEnumerable<double>), "a, b")]
+        [InlineData(typeof(ICollection<CarType>), "a, b")]
+        public async Task HeaderBinder_BindModelAsync_AddsErrorToModelState_OnInvalid_CollectionInput(
+            Type modelType,
+            string headerValue)
+        {
+            // Arrange
+            var headerValues = headerValue.Split(',').Select(s => s.Trim()).ToArray();
+            var bindingContext = CreateContext(modelType);
+            var binder = CreateBinder(bindingContext);
+            bindingContext.HttpContext.Request.Headers.Add("Header", headerValue);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            var entry = bindingContext.ModelState["someprefix.Header"];
+            Assert.NotNull(entry);
+            Assert.Equal(2, entry.Errors.Count);
+            Assert.Equal($"The value '{headerValues[0]}' is not valid.", entry.Errors[0].ErrorMessage);
+            Assert.Equal($"The value '{headerValues[1]}' is not valid.", entry.Errors[1].ErrorMessage);
+        }
+
+        private static DefaultModelBindingContext CreateContext(
+            Type modelType,
+            bool allowBindingHeaderValuesToNonStringModelTypes = true)
+        {
+            return CreateContext(
+                metadata: GetMetadataForType(modelType),
+                valueProvider: null,
+                allowBindingHeaderValuesToNonStringModelTypes: allowBindingHeaderValuesToNonStringModelTypes);
+        }
+
+        private static DefaultModelBindingContext CreateContext(
+            ModelMetadata metadata,
+            IValueProvider valueProvider = null,
+            bool allowBindingHeaderValuesToNonStringModelTypes = true)
+        {
+            if (valueProvider == null)
+            {
+                valueProvider = Mock.Of<IValueProvider>();
+            }
+
+            var options = new MvcOptions()
+            {
+                AllowBindingHeaderValuesToNonStringModelTypes = allowBindingHeaderValuesToNonStringModelTypes
+            };
+            var setup = new MvcCoreMvcOptionsSetup(new TestHttpRequestStreamReaderFactory());
+            setup.Configure(options);
+
+            var services = new ServiceCollection();
+            services.AddSingleton<ILoggerFactory, NullLoggerFactory>();
+            services.AddSingleton(Options.Create(options));
+            var serviceProvider = services.BuildServiceProvider();
+
+            var headerName = "Header";
+
+            return new DefaultModelBindingContext()
+            {
+                IsTopLevelObject = true,
+                ModelMetadata = metadata,
+                BinderModelName = metadata.BinderModelName,
+                BindingSource = metadata.BindingSource,
+
+                // HeaderModelBinder must always use the field name when getting the values from header value provider
+                // but add keys into ModelState using the ModelName. This is for back compat reasons.
+                ModelName = $"somePrefix.{headerName}",
+                FieldName = headerName,
+
+                ValueProvider = valueProvider,
+                ModelState = new ModelStateDictionary(),
+                ActionContext = new ActionContext()
+                {
+                    HttpContext = new DefaultHttpContext()
+                    {
+                        RequestServices = serviceProvider
+                    }
+                },
+            };
+        }
+
+        private static IModelBinder CreateBinder(DefaultModelBindingContext bindingContext)
+        {
+            var factory = TestModelBinderFactory.Create(bindingContext.HttpContext.RequestServices);
+            var metadata = bindingContext.ModelMetadata;
+            return factory.CreateBinder(new ModelBinderFactoryContext()
+            {
+                Metadata = metadata,
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = metadata.BinderModelName,
+                    BinderType = metadata.BinderType,
+                    BindingSource = metadata.BindingSource,
+                    PropertyFilterProvider = metadata.PropertyFilterProvider,
+                },
+            });
+        }
+
+        private static ModelMetadata GetMetadataForType(Type modelType)
+        {
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider.ForType(modelType).BindingDetails(d => d.BindingSource = BindingSource.Header);
+            return metadataProvider.GetMetadataForType(modelType);
+        }
+
+        private static ModelMetadata GetMetadataForReadOnlyArray()
+        {
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider
+                .ForProperty<ModelWithReadOnlyArray>(nameof(ModelWithReadOnlyArray.ArrayProperty))
+                .BindingDetails(bd => bd.BindingSource = BindingSource.Header);
+            return metadataProvider.GetMetadataForProperty(
+                typeof(ModelWithReadOnlyArray),
+                nameof(ModelWithReadOnlyArray.ArrayProperty));
+        }
+
+        private class ModelWithReadOnlyArray
+        {
+            public string[] ArrayProperty { get; }
+        }
+
+        private class StringList : List<string>
+        {
+        }
+
+        private enum CarType
+        {
+            Sedan,
+            Coupe
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/KeyValuePairModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/KeyValuePairModelBinderProviderTest.cs
new file mode 100644
index 0000000000..8f4587301e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/KeyValuePairModelBinderProviderTest.cs
@@ -0,0 +1,66 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class KeyValuePairModelBinderProviderTest
+    {
+        [Theory]
+        [InlineData(typeof(object))]
+        [InlineData(typeof(Person))]
+        [InlineData(typeof(KeyValuePair<string, int>?))]
+        [InlineData(typeof(KeyValuePair<string, int>[]))]
+        public void Create_ForNonKeyValuePair_ReturnsNull(Type modelType)
+        {
+            // Arrange
+            var provider = new KeyValuePairModelBinderProvider();
+
+            var context = new TestModelBinderProviderContext(modelType);
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void Create_ForKeyValuePair_ReturnsBinder()
+        {
+            // Arrange
+            var provider = new KeyValuePairModelBinderProvider();
+
+            var context = new TestModelBinderProviderContext(typeof(KeyValuePair<string, int>));
+            context.OnCreatingBinder(m =>
+            {
+                if (m.ModelType == typeof(string) || m.ModelType == typeof(int))
+                {
+                    return Mock.Of<IModelBinder>();
+                }
+                else
+                {
+                    Assert.False(true, "Not the right model type");
+                    return null;
+                }
+            });
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.IsType<KeyValuePairModelBinder<string, int>>(result);
+        }
+
+        private class Person
+        {
+            public string Name { get; set; }
+
+            public int Age { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/KeyValuePairModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/KeyValuePairModelBinderTest.cs
new file mode 100644
index 0000000000..55fa61e919
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/KeyValuePairModelBinderTest.cs
@@ -0,0 +1,264 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging.Abstractions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class KeyValuePairModelBinderTest
+    {
+        [Fact]
+        public async Task BindModel_MissingKey_ReturnsResult_AndAddsModelValidationError()
+        {
+            // Arrange
+            var valueProvider = new SimpleValueProvider();
+
+            // Create string binder to create the value but not the key.
+            var bindingContext = GetBindingContext(valueProvider, typeof(KeyValuePair<int, string>));
+            var binder = new KeyValuePairModelBinder<int, string>(
+                CreateIntBinder(false),
+                CreateStringBinder(),
+                NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+            Assert.False(bindingContext.ModelState.IsValid);
+            Assert.Equal("someName", bindingContext.ModelName);
+            var error = Assert.Single(bindingContext.ModelState["someName.Key"].Errors);
+            Assert.Equal("A value is required.", error.ErrorMessage);
+        }
+
+        [Fact]
+        public async Task BindModel_MissingValue_ReturnsResult_AndAddsModelValidationError()
+        {
+            // Arrange
+            var valueProvider = new SimpleValueProvider();
+
+            // Create int binder to create the value but not the key.
+            var bindingContext = GetBindingContext(valueProvider, typeof(KeyValuePair<int, string>));
+            var binder = new KeyValuePairModelBinder<int, string>(
+                CreateIntBinder(),
+                CreateStringBinder(false),
+                NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.Null(bindingContext.Result.Model);
+            Assert.False(bindingContext.ModelState.IsValid);
+            Assert.Equal("someName", bindingContext.ModelName);
+            var state = bindingContext.ModelState["someName.Value"];
+            Assert.NotNull(state);
+            var error = Assert.Single(state.Errors);
+            Assert.Equal("A value is required.", error.ErrorMessage);
+        }
+
+        [Fact]
+        public async Task BindModel_MissingKeyAndMissingValue_DoNotAddModelStateError()
+        {
+            // Arrange
+            var valueProvider = new SimpleValueProvider();
+
+            // Create int binder to create the value but not the key.
+            var bindingContext = GetBindingContext(valueProvider, typeof(KeyValuePair<int, string>));
+            var binder = new KeyValuePairModelBinder<int, string>(
+                CreateIntBinder(false),
+                CreateStringBinder(false),
+                NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.True(bindingContext.ModelState.IsValid);
+            Assert.Equal(0, bindingContext.ModelState.ErrorCount);
+        }
+
+        [Fact]
+        public async Task BindModel_SubBindingSucceeds()
+        {
+            // Arrange
+            var valueProvider = new SimpleValueProvider();
+
+            var bindingContext = GetBindingContext(valueProvider, typeof(KeyValuePair<int, string>));
+            var binder = new KeyValuePairModelBinder<int, string>(
+                CreateIntBinder(),
+                CreateStringBinder(),
+                NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Equal(new KeyValuePair<int, string>(42, "some-value"), bindingContext.Result.Model);
+        }
+
+        [Theory]
+        [InlineData(null, false)]
+        [InlineData(null, true)]
+        [InlineData(42, true)]
+        public async Task TryBindStrongModel_InnerBinderReturnsAResult_ReturnsInnerBinderResult(
+            object model,
+            bool isSuccess)
+        {
+            // Arrange
+            ModelBindingResult innerResult;
+            if (isSuccess)
+            {
+                innerResult = ModelBindingResult.Success(model);
+            }
+            else
+            {
+                innerResult = ModelBindingResult.Failed();
+            }
+
+            var innerBinder = new StubModelBinder(context =>
+            {
+                Assert.Equal("someName.Key", context.ModelName);
+                return innerResult;
+            });
+
+            var valueProvider = new SimpleValueProvider();
+
+            var bindingContext = GetBindingContext(valueProvider, typeof(KeyValuePair<int, string>));
+            var binder = new KeyValuePairModelBinder<int, string>(innerBinder, innerBinder, NullLoggerFactory.Instance);
+
+            // Act
+            var result = await binder.TryBindStrongModel<int>(bindingContext, innerBinder, "Key", "someName.Key");
+
+            // Assert
+            Assert.Equal(innerResult, result);
+            Assert.Empty(bindingContext.ModelState);
+        }
+
+        [Fact]
+        public async Task KeyValuePairModelBinder_CreatesEmptyCollection_IfIsTopLevelObject()
+        {
+            // Arrange
+            var binder = new KeyValuePairModelBinder<string, string>(
+                new SimpleTypeModelBinder(typeof(string), NullLoggerFactory.Instance),
+                new SimpleTypeModelBinder(typeof(string), NullLoggerFactory.Instance),
+                NullLoggerFactory.Instance);
+
+            var bindingContext = CreateContext();
+            bindingContext.IsTopLevelObject = true;
+
+            // Lack of prefix and non-empty model name both ignored.
+            bindingContext.ModelName = "modelName";
+
+            var metadataProvider = new TestModelMetadataProvider();
+            bindingContext.ModelMetadata = metadataProvider.GetMetadataForType(typeof(KeyValuePair<string, string>));
+
+            bindingContext.ValueProvider = new TestValueProvider(new Dictionary<string, object>());
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            var model = Assert.IsType<KeyValuePair<string, string>>(bindingContext.Result.Model);
+            Assert.Equal(default(KeyValuePair<string, string>), model);
+            Assert.True(bindingContext.Result.IsModelSet);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData("param")]
+        public async Task KeyValuePairModelBinder_DoesNotCreateCollection_IfNotIsTopLevelObject(string prefix)
+        {
+            // Arrange
+            var binder = new KeyValuePairModelBinder<string, string>(
+                new SimpleTypeModelBinder(typeof(string), NullLoggerFactory.Instance),
+                new SimpleTypeModelBinder(typeof(string), NullLoggerFactory.Instance),
+                NullLoggerFactory.Instance);
+
+            var bindingContext = CreateContext();
+            bindingContext.ModelName = ModelNames.CreatePropertyModelName(prefix, "KeyValuePairProperty");
+
+            var metadataProvider = new TestModelMetadataProvider();
+            bindingContext.ModelMetadata = metadataProvider.GetMetadataForProperty(
+                typeof(ModelWithKeyValuePairProperty),
+                nameof(ModelWithKeyValuePairProperty.KeyValuePairProperty));
+
+            bindingContext.ValueProvider = new TestValueProvider(new Dictionary<string, object>());
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+        }
+
+        private static DefaultModelBindingContext CreateContext()
+        {
+            var modelBindingContext = new DefaultModelBindingContext()
+            {
+                ActionContext = new ActionContext()
+                {
+                    HttpContext = new DefaultHttpContext(),
+                },
+                ModelState = new ModelStateDictionary(),
+            };
+
+            return modelBindingContext;
+        }
+
+        private static DefaultModelBindingContext GetBindingContext(
+            IValueProvider valueProvider,
+            Type keyValuePairType)
+        {
+            var metadataProvider = new TestModelMetadataProvider();
+            var bindingContext = new DefaultModelBindingContext
+            {
+                ModelMetadata = metadataProvider.GetMetadataForType(keyValuePairType),
+                ModelName = "someName",
+                ModelState = new ModelStateDictionary(),
+                ValueProvider = valueProvider,
+            };
+            return bindingContext;
+        }
+
+        private static IModelBinder CreateIntBinder(bool success = true)
+        {
+            var mockIntBinder = new StubModelBinder(mbc =>
+            {
+                if (mbc.ModelType == typeof(int) && success)
+                {
+                    var model = 42;
+                    return ModelBindingResult.Success(model);
+                }
+                return ModelBindingResult.Failed();
+            });
+            return mockIntBinder;
+        }
+
+        private static IModelBinder CreateStringBinder(bool success = true)
+        {
+            return new StubModelBinder(mbc =>
+            {
+                if (mbc.ModelType == typeof(string) && success)
+                {
+                    var model = "some-value";
+                    return ModelBindingResult.Success(model);
+                }
+                return ModelBindingResult.Failed();
+            });
+        }
+
+        private class ModelWithKeyValuePairProperty
+        {
+            public KeyValuePair<string, string> KeyValuePairProperty { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ServicesModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ServicesModelBinderProviderTest.cs
new file mode 100644
index 0000000000..e3a46b57bf
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ServicesModelBinderProviderTest.cs
@@ -0,0 +1,60 @@
+// 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.
+
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class ServicesModelBinderProviderTest
+    {
+        public static TheoryData<BindingSource> NonServicesBindingSources
+        {
+            get
+            {
+                return new TheoryData<BindingSource>()
+                {
+                    BindingSource.Header,
+                    BindingSource.Form,
+                    null,
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(NonServicesBindingSources))]
+        public void Create_WhenBindingSourceIsNotFromServices_ReturnsNull(BindingSource source)
+        {
+            // Arrange
+            var provider = new ServicesModelBinderProvider();
+
+            var context = new TestModelBinderProviderContext(typeof(IPersonService));
+            context.BindingInfo.BindingSource = source;
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void Create_WhenBindingSourceIsFromServices_ReturnsBinder()
+        {
+            // Arrange
+            var provider = new ServicesModelBinderProvider();
+
+            var context = new TestModelBinderProviderContext(typeof(IPersonService));
+            context.BindingInfo.BindingSource = BindingSource.Services;
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.IsType<ServicesModelBinder>(result);
+        }
+
+        private class IPersonService
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ServicesModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ServicesModelBinderTest.cs
new file mode 100644
index 0000000000..f3a3e7578a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ServicesModelBinderTest.cs
@@ -0,0 +1,74 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class ServicesModelBinderTest
+    {
+        [Fact]
+        public async Task ServiceModelBinder_BindsService()
+        {
+            // Arrange
+            var type = typeof(IService);
+
+            var binder = new ServicesModelBinder();
+            var bindingContext = GetBindingContext(type);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+
+            var entry = bindingContext.ValidationState[bindingContext.Result.Model];
+            Assert.True(entry.SuppressValidation);
+            Assert.Null(entry.Key);
+            Assert.Null(entry.Metadata);
+        }
+
+        private static DefaultModelBindingContext GetBindingContext(Type modelType)
+        {
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider.ForType(modelType).BindingDetails(d => d.BindingSource = BindingSource.Services);
+            var modelMetadata = metadataProvider.GetMetadataForType(modelType);
+
+            var services = new ServiceCollection();
+            services.AddSingleton<IService>(new Service());
+
+            var bindingContext = new DefaultModelBindingContext
+            {
+                ActionContext = new ActionContext()
+                {
+                    HttpContext = new DefaultHttpContext()
+                    {
+                        RequestServices = services.BuildServiceProvider(),
+                    }
+                },
+                ModelMetadata = modelMetadata,
+                ModelName = "modelName",
+                FieldName = "modelName",
+                ModelState = new ModelStateDictionary(),
+                BinderModelName = modelMetadata.BinderModelName,
+                BindingSource = modelMetadata.BindingSource,
+                ValidationState = new ValidationStateDictionary(),
+            };
+
+            return bindingContext;
+        }
+
+        private interface IService
+        {
+        }
+
+        private class Service : IService
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/SimpleTypeModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/SimpleTypeModelBinderProviderTest.cs
new file mode 100644
index 0000000000..8c7329c6e5
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/SimpleTypeModelBinderProviderTest.cs
@@ -0,0 +1,53 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class SimpleTypeModelBinderProviderTest
+    {
+        [Theory]
+        [InlineData(typeof(object))]
+        [InlineData(typeof(Calendar))]
+        [InlineData(typeof(TestClass))]
+        [InlineData(typeof(List<int>))]
+        public void Create_ForCollectionOrComplexTypes_ReturnsNull(Type modelType)
+        {
+            // Arrange
+            var provider = new SimpleTypeModelBinderProvider();
+            var context = new TestModelBinderProviderContext(modelType);
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Theory]
+        [InlineData(typeof(int))]
+        [InlineData(typeof(string))]
+        [InlineData(typeof(DateTime))]
+        [InlineData(typeof(DateTime?))]
+        public void Create_ForSimpleTypes_ReturnsBinder(Type modelType)
+        {
+            // Arrange
+            var provider = new SimpleTypeModelBinderProvider();
+            var context = new TestModelBinderProviderContext(modelType);
+
+            // Act
+            var result = provider.GetBinder(context);
+
+            // Assert
+            Assert.IsType<SimpleTypeModelBinder>(result);
+        }
+
+        private class TestClass
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/SimpleTypeModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/SimpleTypeModelBinderTest.cs
new file mode 100644
index 0000000000..30623f3c72
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/SimpleTypeModelBinderTest.cs
@@ -0,0 +1,532 @@
+// 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.
+
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Logging.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
+{
+    public class SimpleTypeModelBinderTest
+    {
+        [Theory]
+        [InlineData(null)]
+        [InlineData("value")]
+        [InlineData("intermediate   whitespace")]
+        [InlineData("\t untrimmed whitespace \t\r\n")]
+        public async Task BindModelAsync_ReturnsProvidedString(string value)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(typeof(string));
+            bindingContext.ValueProvider = new SimpleValueProvider
+            {
+                { "theModelName", value }
+            };
+
+            var binder = new SimpleTypeModelBinder(typeof(string), NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.Same(value, bindingContext.Result.Model);
+            Assert.True(bindingContext.ModelState.ContainsKey("theModelName"));
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(" \t \r\n ")]
+        public async Task BindModel_ReturnsProvidedWhitespaceString_WhenNotConvertEmptyStringToNull(string value)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(typeof(string));
+            bindingContext.ValueProvider = new SimpleValueProvider
+            {
+                { "theModelName", value }
+            };
+
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider
+                .ForType(typeof(string))
+                .DisplayDetails(d => d.ConvertEmptyStringToNull = false);
+            bindingContext.ModelMetadata = metadataProvider.GetMetadataForType(typeof(string));
+
+            var binder = new SimpleTypeModelBinder(typeof(string), NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.Same(value, bindingContext.Result.Model);
+            Assert.True(bindingContext.ModelState.ContainsKey("theModelName"));
+        }
+
+        public static TheoryData<Type> ConvertableTypeData
+        {
+            get
+            {
+                var data = new TheoryData<Type>
+                {
+                    typeof(byte),
+                    typeof(short),
+                    typeof(int),
+                    typeof(long),
+                    typeof(Guid),
+                    typeof(double),
+                    typeof(DayOfWeek),
+                };
+
+                // DateTimeOffset doesn't have a TypeConverter in Mono.
+                if (!TestPlatformHelper.IsMono)
+                {
+                    data.Add(typeof(DateTimeOffset));
+                }
+
+                return data;
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ConvertableTypeData))]
+        public async Task BindModel_ReturnsFailure_IfTypeCanBeConverted_AndConversionFails(Type destinationType)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(destinationType);
+            bindingContext.ValueProvider = new SimpleValueProvider
+            {
+                { "theModelName", "some-value" }
+            };
+
+            var binder = new SimpleTypeModelBinder(destinationType, NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+        }
+
+        [Theory]
+        [MemberData(nameof(ConvertableTypeData))]
+        public async Task BindModel_CreatesError_WhenTypeConversionIsNull(Type destinationType)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(destinationType);
+            bindingContext.ValueProvider = new SimpleValueProvider
+            {
+                { "theModelName", string.Empty }
+            };
+            var binder = new SimpleTypeModelBinder(destinationType, NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+
+            var error = Assert.Single(bindingContext.ModelState["theModelName"].Errors);
+            Assert.Equal("The value '' is invalid.", error.ErrorMessage, StringComparer.Ordinal);
+            Assert.Null(error.Exception);
+        }
+
+        [Fact]
+        public async Task BindModel_Error_FormatExceptionsTurnedIntoStringsInModelState()
+        {
+            // Arrange
+            var message = "The value 'not an integer' is not valid.";
+            var bindingContext = GetBindingContext(typeof(int));
+            bindingContext.ValueProvider = new SimpleValueProvider
+            {
+                { "theModelName", "not an integer" }
+            };
+
+            var binder = new SimpleTypeModelBinder(typeof(int), NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+            Assert.False(bindingContext.ModelState.IsValid);
+            var error = Assert.Single(bindingContext.ModelState["theModelName"].Errors);
+            Assert.Equal(message, error.ErrorMessage);
+        }
+
+        public static TheoryData<ModelMetadata> IntegerModelMetadataDataSet
+        {
+            get
+            {
+                var metadataProvider = new EmptyModelMetadataProvider();
+                var method = typeof(MetadataClass).GetMethod(nameof(MetadataClass.IsLovely));
+                var parameter = method.GetParameters()[0]; // IsLovely(int parameter)
+
+                return new TheoryData<ModelMetadata>
+                {
+                    metadataProvider.GetMetadataForParameter(parameter),
+                    metadataProvider.GetMetadataForProperty(typeof(MetadataClass), nameof(MetadataClass.Property)),
+                    metadataProvider.GetMetadataForType(typeof(int)),
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegerModelMetadataDataSet))]
+        public async Task BindModel_EmptyValueProviderResult_ReturnsFailedAndLogsSuccessfully(ModelMetadata metadata)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(typeof(int));
+            bindingContext.ModelMetadata = metadata;
+
+            var sink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
+            var binder = new SimpleTypeModelBinder(typeof(int), loggerFactory);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.Equal(ModelBindingResult.Failed(), bindingContext.Result);
+            Assert.Empty(bindingContext.ModelState);
+            Assert.Equal(2, sink.Writes.Count());
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(" \t \r\n ")]
+        public async Task BindModel_ReturnsNull_IfTrimmedValueIsEmptyString(object value)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(typeof(string));
+            bindingContext.ValueProvider = new SimpleValueProvider
+            {
+                { "theModelName", value }
+            };
+
+            var binder = new SimpleTypeModelBinder(typeof(string), NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.Null(bindingContext.Result.Model);
+            Assert.True(bindingContext.ModelState.ContainsKey("theModelName"));
+        }
+
+        [Fact]
+        public async Task BindModel_NullableIntegerValueProviderResult_ReturnsModel()
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(typeof(int?));
+            bindingContext.ValueProvider = new SimpleValueProvider
+            {
+                { "theModelName", "12" }
+            };
+
+            var binder = new SimpleTypeModelBinder(typeof(int?), NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Equal(12, bindingContext.Result.Model);
+            Assert.True(bindingContext.ModelState.ContainsKey("theModelName"));
+        }
+
+        [Fact]
+        public async Task BindModel_NullableDoubleValueProviderResult_ReturnsModel()
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(typeof(double?));
+            bindingContext.ValueProvider = new SimpleValueProvider
+            {
+                { "theModelName", "12.5" }
+            };
+
+            var binder = new SimpleTypeModelBinder(typeof(double?), NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Equal(12.5, bindingContext.Result.Model);
+            Assert.True(bindingContext.ModelState.ContainsKey("theModelName"));
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegerModelMetadataDataSet))]
+        public async Task BindModel_ValidValueProviderResult_ReturnsModelAndLogsSuccessfully(ModelMetadata metadata)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(typeof(int));
+            bindingContext.ModelMetadata = metadata;
+            bindingContext.ValueProvider = new SimpleValueProvider
+            {
+                { "theModelName", "42" }
+            };
+
+            var sink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
+            var binder = new SimpleTypeModelBinder(typeof(int), loggerFactory);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Equal(42, bindingContext.Result.Model);
+            Assert.True(bindingContext.ModelState.ContainsKey("theModelName"));
+            Assert.Equal(2, sink.Writes.Count());
+        }
+
+        public static TheoryData<Type> BiggerNumericTypes
+        {
+            get
+            {
+                // Data set does not include bool, byte, sbyte, or char because they do not need thousands separators.
+                return new TheoryData<Type>
+                {
+                    typeof(decimal),
+                    typeof(double),
+                    typeof(float),
+                    typeof(int),
+                    typeof(long),
+                    typeof(short),
+                    typeof(uint),
+                    typeof(ulong),
+                    typeof(ushort),
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(BiggerNumericTypes))]
+        public async Task BindModel_ThousandsSeparators_LeadToErrors(Type type)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(type);
+            bindingContext.ValueProvider = new SimpleValueProvider(new CultureInfo("en-GB"))
+            {
+                { "theModelName", "32,000" }
+            };
+
+            var binder = new SimpleTypeModelBinder(type, NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+
+            var entry = Assert.Single(bindingContext.ModelState);
+            Assert.Equal("theModelName", entry.Key);
+            Assert.Equal("32,000", entry.Value.AttemptedValue);
+            Assert.Equal(ModelValidationState.Invalid, entry.Value.ValidationState);
+
+            var error = Assert.Single(entry.Value.Errors);
+            Assert.Equal("The value '32,000' is not valid.", error.ErrorMessage);
+            Assert.Null(error.Exception);
+        }
+
+        [Fact]
+        public async Task BindModel_ValidValueProviderResultWithProvidedCulture_ReturnsModel()
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(typeof(decimal));
+            bindingContext.ValueProvider = new SimpleValueProvider(new CultureInfo("fr-FR"))
+            {
+                { "theModelName", "12,5" }
+            };
+
+            var binder = new SimpleTypeModelBinder(typeof(decimal), NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            Assert.Equal(12.5M, bindingContext.Result.Model);
+            Assert.True(bindingContext.ModelState.ContainsKey("theModelName"));
+        }
+
+        [Fact]
+        public async Task BindModel_CreatesErrorForFormatException_ValueProviderResultWithInvalidCulture()
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(typeof(decimal));
+            bindingContext.ValueProvider = new SimpleValueProvider(new CultureInfo("en-GB"))
+            {
+                { "theModelName", "12,5" }
+            };
+
+            var binder = new SimpleTypeModelBinder(typeof(decimal), NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.Null(bindingContext.Result.Model);
+
+            var error = Assert.Single(bindingContext.ModelState["theModelName"].Errors);
+            Assert.Equal("The value '12,5' is not valid.", error.ErrorMessage, StringComparer.Ordinal);
+            Assert.Null(error.Exception);
+        }
+
+        [Fact]
+        public async Task BindModel_BindsEnumModels_IfArrayElementIsStringKey()
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(typeof(IntEnum));
+            bindingContext.ValueProvider = new SimpleValueProvider
+            {
+                { "theModelName", new object[] { "Value1" } }
+            };
+
+            var binder = new SimpleTypeModelBinder(typeof(IntEnum), NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            var boundModel = Assert.IsType<IntEnum>(bindingContext.Result.Model);
+            Assert.Equal(IntEnum.Value1, boundModel);
+        }
+
+        [Fact]
+        public async Task BindModel_BindsEnumModels_IfArrayElementIsStringValue()
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(typeof(IntEnum));
+            bindingContext.ValueProvider = new SimpleValueProvider
+            {
+                { "theModelName", new object[] { "1" } }
+            };
+
+            var binder = new SimpleTypeModelBinder(typeof(IntEnum), NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            var boundModel = Assert.IsType<IntEnum>(bindingContext.Result.Model);
+            Assert.Equal(IntEnum.Value1, boundModel);
+        }
+
+        public static TheoryData<string, int> EnumValues
+        {
+            get
+            {
+                return new TheoryData<string, int>
+                {
+                    { "0", 0 },
+                    { "1", 1 },
+                    { "13", 13 },
+                    { "Value1", 1 },
+                    { "Value1, Value2", 3 },
+                    // These two values look like big integers but are treated as two separate enum values that are
+                    // or'd together.
+                    { "32,015", 47 },
+                    { "32,128", 160 },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(EnumValues))]
+        public async Task BindModel_BindsIntEnumModels(string flagsEnumValue, int expected)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(typeof(IntEnum));
+            bindingContext.ValueProvider = new SimpleValueProvider
+            {
+                { "theModelName", flagsEnumValue }
+            };
+
+            var binder = new SimpleTypeModelBinder(typeof(IntEnum), NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            var boundModel = Assert.IsType<IntEnum>(bindingContext.Result.Model);
+            Assert.Equal((IntEnum)expected, boundModel);
+        }
+
+        [Theory]
+        [MemberData(nameof(EnumValues))]
+        [InlineData("Value8, Value4", 12)]
+        public async Task BindModel_BindsFlagsEnumModels(string flagsEnumValue, int expected)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(typeof(FlagsEnum));
+            bindingContext.ValueProvider = new SimpleValueProvider
+            {
+                { "theModelName", flagsEnumValue }
+            };
+
+            var binder = new SimpleTypeModelBinder(typeof(FlagsEnum), NullLoggerFactory.Instance);
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            Assert.True(bindingContext.Result.IsModelSet);
+            var boundModel = Assert.IsType<FlagsEnum>(bindingContext.Result.Model);
+            Assert.Equal((FlagsEnum)expected, boundModel);
+        }
+
+        private static DefaultModelBindingContext GetBindingContext(Type modelType)
+        {
+            return new DefaultModelBindingContext
+            {
+                ModelMetadata = new EmptyModelMetadataProvider().GetMetadataForType(modelType),
+                ModelName = "theModelName",
+                ModelState = new ModelStateDictionary(),
+                ValueProvider = new SimpleValueProvider() // empty
+            };
+        }
+
+        private sealed class TestClass
+        {
+        }
+
+        [Flags]
+        private enum FlagsEnum
+        {
+            Value1 = 1,
+            Value2 = 2,
+            Value4 = 4,
+            Value8 = 8,
+        }
+
+        private enum IntEnum
+        {
+            Value0 = 0,
+            Value1 = 1,
+            Value2 = 2,
+            MaxValue = int.MaxValue
+        }
+
+        private class MetadataClass
+        {
+            public int Property { get; set; }
+
+            public bool IsLovely(int parameter)
+            {
+                return true;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/BindingSourceValueProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/BindingSourceValueProviderTest.cs
new file mode 100644
index 0000000000..ea699e183a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/BindingSourceValueProviderTest.cs
@@ -0,0 +1,95 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class BindingSourceValueProviderTest
+    {
+        [Fact]
+        public void BindingSourceValueProvider_ThrowsOnNonGreedySource()
+        {
+            // Arrange
+            var expected =
+                "The provided binding source 'Test Source' is a greedy data source. " +
+                $"'{nameof(BindingSourceValueProvider)}' does not support greedy data sources.";
+
+            var bindingSource = new BindingSource(
+                "Test",
+                displayName: "Test Source",
+                isGreedy: true,
+                isFromRequest: true);
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => new TestableBindingSourceValueProvider(bindingSource),
+                "bindingSource",
+                expected);
+        }
+
+        [Fact]
+        public void BindingSourceValueProvider_ThrowsOnCompositeSource()
+        {
+            // Arrange
+            var expected = $"The provided binding source 'Test Source' is a composite. '{nameof(BindingSourceValueProvider)}' " +
+                "requires that the source must represent a single type of input.";
+
+            var bindingSource = CompositeBindingSource.Create(
+                bindingSources: new BindingSource[] { BindingSource.Query, BindingSource.Form },
+                displayName: "Test Source");
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => new TestableBindingSourceValueProvider(bindingSource),
+                "bindingSource",
+                expected);
+        }
+
+        [Fact]
+        public void BindingSourceValueProvider_ReturnsNull_WithNonMatchingSource()
+        {
+            // Arrange
+            var valueProvider = new TestableBindingSourceValueProvider(BindingSource.Query);
+
+            // Act 
+            var result = valueProvider.Filter(BindingSource.Body);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void BindingSourceValueProvider_ReturnsSelf_WithMatchingSource()
+        {
+            // Arrange
+            var valueProvider = new TestableBindingSourceValueProvider(BindingSource.Query);
+
+            // Act 
+            var result = valueProvider.Filter(BindingSource.Query);
+
+            // Assert
+            Assert.Same(valueProvider, result);
+        }
+
+        private class TestableBindingSourceValueProvider : BindingSourceValueProvider
+        {
+            public TestableBindingSourceValueProvider(BindingSource source)
+                : base(source)
+            {
+            }
+
+            public override bool ContainsPrefix(string prefix)
+            {
+                throw new NotImplementedException();
+            }
+
+            public override ValueProviderResult GetValue(string key)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/CompositeValueProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/CompositeValueProviderTest.cs
new file mode 100644
index 0000000000..0da5681ef6
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/CompositeValueProviderTest.cs
@@ -0,0 +1,268 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Primitives;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class CompositeValueProviderTest : EnumerableValueProviderTest
+    {
+        [Fact]
+        public override void FilterInclude()
+        {
+            // Arrange
+            var provider = GetBindingSourceValueProvider(BindingSource.Query, BackingStore, culture: null);
+            var originalProviders = ((CompositeValueProvider)provider).ToArray();
+            var bindingSource = new BindingSource(
+                BindingSource.Query.Id,
+                displayName: null,
+                isGreedy: true,
+                isFromRequest: true);
+
+            // Act
+            var result = provider.Filter(bindingSource);
+
+            // Assert (does not change inner providers)
+            var newProvider = Assert.IsType<CompositeValueProvider>(result);
+            Assert.Equal(originalProviders, newProvider, ReferenceEqualityComparer.Instance);
+        }
+
+        protected override IEnumerableValueProvider GetEnumerableValueProvider(
+            BindingSource bindingSource,
+            Dictionary<string, StringValues> values,
+            CultureInfo culture)
+        {
+            var emptyValueProvider =
+                new JQueryFormValueProvider(bindingSource, new Dictionary<string, StringValues>(), culture);
+            var valueProvider = new JQueryFormValueProvider(bindingSource, values, culture);
+
+            return new CompositeValueProvider() { emptyValueProvider, valueProvider };
+        }
+
+        [Fact]
+        public void GetKeysFromPrefixAsync_ReturnsResultFromFirstValueProviderThatReturnsValues()
+        {
+            // Arrange
+            var provider1 = Mock.Of<IValueProvider>();
+            var dictionary = new Dictionary<string, string>(StringComparer.Ordinal)
+            {
+                { "prefix-test", "some-value" },
+            };
+            var provider2 = new Mock<IEnumerableValueProvider>();
+            provider2.Setup(p => p.GetKeysFromPrefix("prefix"))
+                     .Returns(dictionary)
+                     .Verifiable();
+            var provider = new CompositeValueProvider() { provider1, provider2.Object };
+
+            // Act
+            var values = provider.GetKeysFromPrefix("prefix");
+
+            // Assert
+            var result = Assert.Single(values);
+            Assert.Equal("prefix-test", result.Key);
+            Assert.Equal("some-value", result.Value);
+            provider2.Verify();
+        }
+
+        [Fact]
+        public void GetKeysFromPrefixAsync_ReturnsEmptyDictionaryIfNoValueProviderReturnsValues()
+        {
+            // Arrange
+            var provider1 = Mock.Of<IValueProvider>();
+            var provider2 = Mock.Of<IValueProvider>();
+            var provider = new CompositeValueProvider() { provider1, provider2 };
+
+            // Act
+            var values = provider.GetKeysFromPrefix("prefix");
+
+            // Assert
+            Assert.Empty(values);
+        }
+
+        public static IEnumerable<object[]> BinderMetadata
+        {
+            get
+            {
+                yield return new object[] { new TestValueProviderMetadata() };
+                yield return new object[] { new DerivedValueProviderMetadata() };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(BinderMetadata))]
+        public void FilterReturnsItself_ForAnyClassRegisteredAsGenericParam(IBindingSourceMetadata metadata)
+        {
+            // Arrange
+            var values = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+
+            var valueProvider1 = GetMockValueProvider("Test");
+            var valueProvider2 = GetMockValueProvider("Unrelated");
+
+            var provider = new CompositeValueProvider() { valueProvider1.Object, valueProvider2.Object };
+
+            // Act
+            var result = provider.Filter(metadata.BindingSource);
+
+            // Assert
+            var valueProvider = Assert.IsType<CompositeValueProvider>(result);
+            var filteredProvider = Assert.Single(valueProvider);
+
+            // should not be unrelated metadata.
+            Assert.Same(valueProvider1.Object, filteredProvider);
+        }
+
+        public static TheoryData<CompositeValueProvider> Filter_ReturnsProviderData
+        {
+            get
+            {
+                // None filter themselves out.
+                var noneRewrite = new[]
+                {
+                    GetValueProvider(rewritesKeys: false),
+                    GetValueProvider(rewritesKeys: false),
+                };
+                // None implement IKeyRewriterValueProvider.
+                var noneImplement = new[] { GetMockValueProvider("One").Object, GetMockValueProvider("Two").Object };
+
+                return new TheoryData<CompositeValueProvider>
+                {
+                    // Starts empty
+                    new CompositeValueProvider(),
+
+                    new CompositeValueProvider(noneRewrite),
+                    new CompositeValueProvider(noneImplement),
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(Filter_ReturnsProviderData))]
+        public void Filter_ReturnsProvider(CompositeValueProvider provider)
+        {
+            // Arrange
+            var originalProviders = provider.ToArray();
+
+            // Act
+            var result = provider.Filter();
+
+            // Assert (does not change inner providers)
+            var newProvider = Assert.IsType<CompositeValueProvider>(result);
+            Assert.Equal(originalProviders, newProvider, ReferenceEqualityComparer.Instance);
+        }
+
+        [Fact]
+        public void Filter_ReturnsNull()
+        {
+            // Arrange
+            var allRewrite = new[] { GetValueProvider(rewritesKeys: true), GetValueProvider(rewritesKeys: true) };
+            var provider = new CompositeValueProvider(allRewrite);
+
+            // Act
+            var result = provider.Filter();
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void Filter_RemovesThoseThatRewrite()
+        {
+            // Arrange
+            var doesNotRewrite1 = GetValueProvider(rewritesKeys: false);
+            var doesNotRewrite2 = GetValueProvider(rewritesKeys: false);
+            var doesNotImplement1 = GetMockValueProvider("One").Object;
+            var doesNotImplement2 = GetMockValueProvider("Two").Object;
+            var rewrites1 = GetValueProvider(rewritesKeys: true);
+            var rewrites2 = GetValueProvider(rewritesKeys: true);
+            var providers = new IValueProvider[]
+            {
+                doesNotRewrite1,
+                doesNotImplement1,
+                rewrites1,
+                doesNotRewrite2,
+                doesNotImplement2,
+                rewrites2,
+            };
+            var expectedProviders = new IValueProvider[]
+            {
+                doesNotRewrite1,
+                doesNotImplement1,
+                doesNotRewrite2,
+                doesNotImplement2,
+            };
+
+            var provider = new CompositeValueProvider(providers);
+
+            // Act
+            var result = provider.Filter();
+
+            // Assert
+            Assert.NotSame(provider, result);
+            var newProvider = Assert.IsType<CompositeValueProvider>(result);
+            Assert.Equal(expectedProviders, newProvider, ReferenceEqualityComparer.Instance);
+        }
+
+        private static IKeyRewriterValueProvider GetValueProvider(bool rewritesKeys)
+        {
+            var valueProvider = new Mock<IKeyRewriterValueProvider>(MockBehavior.Strict);
+            if (rewritesKeys)
+            {
+                valueProvider.Setup(vp => vp.Filter()).Returns<IValueProvider>(null);
+            }
+            else
+            {
+                valueProvider.Setup(vp => vp.Filter()).Returns(valueProvider.Object);
+            }
+
+            return valueProvider.Object;
+        }
+
+        private static Mock<IBindingSourceValueProvider> GetMockValueProvider(string bindingSourceId)
+        {
+            var valueProvider = new Mock<IBindingSourceValueProvider>(MockBehavior.Strict);
+
+            valueProvider
+                .Setup(o => o.Filter(It.Is<BindingSource>(s => s.Id == bindingSourceId)))
+                .Returns(valueProvider.Object);
+
+            valueProvider
+                .Setup(o => o.Filter(It.Is<BindingSource>(s => s.Id != bindingSourceId)))
+                .Returns((IBindingSourceValueProvider)null);
+
+            return valueProvider;
+        }
+
+        private class TestValueProviderMetadata : IBindingSourceMetadata
+        {
+            public BindingSource BindingSource
+            {
+                get
+                {
+                    return new BindingSource("Test", displayName: null, isGreedy: true, isFromRequest: true);
+                }
+            }
+        }
+
+        private class DerivedValueProviderMetadata : TestValueProviderMetadata
+        {
+        }
+
+        private class UnrelatedValueBinderMetadata : IBindingSourceMetadata
+        {
+            public BindingSource BindingSource
+            {
+                get
+                {
+                    return new BindingSource("Unrelated", displayName: null, isGreedy: true, isFromRequest: true);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/DefaultModelBindingContextTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/DefaultModelBindingContextTest.cs
new file mode 100644
index 0000000000..642082eb67
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/DefaultModelBindingContextTest.cs
@@ -0,0 +1,204 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class DefaultModelBindingContextTest
+    {
+        [Fact]
+        public void EnterNestedScope_CopiesProperties()
+        {
+            // Arrange
+            var bindingContext = new DefaultModelBindingContext
+            {
+                Model = new object(),
+                ModelMetadata = new TestModelMetadataProvider().GetMetadataForType(typeof(object)),
+                ModelName = "theName",
+                ValueProvider = new SimpleValueProvider(),
+                ModelState = new ModelStateDictionary(),
+            };
+
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider.ForType<object>().BindingDetails(d =>
+            {
+                d.BindingSource = BindingSource.Custom;
+                d.BinderType = typeof(TestModelBinder);
+                d.BinderModelName = "custom";
+            });
+
+            var newModelMetadata = metadataProvider.GetMetadataForType(typeof(object));
+
+            // Act
+            var originalBinderModelName = bindingContext.BinderModelName;
+            var originalBindingSource = bindingContext.BindingSource;
+            var originalValueProvider = bindingContext.ValueProvider;
+
+            var disposable = bindingContext.EnterNestedScope(
+                modelMetadata: newModelMetadata,
+                fieldName: "fieldName",
+                modelName: "modelprefix.fieldName",
+                model: null);
+
+            // Assert
+            Assert.Same(newModelMetadata.BinderModelName, bindingContext.BinderModelName);
+            Assert.Same(newModelMetadata.BindingSource, bindingContext.BindingSource);
+            Assert.Equal("fieldName", bindingContext.FieldName);
+            Assert.False(bindingContext.IsTopLevelObject);
+            Assert.Null(bindingContext.Model);
+            Assert.Same(newModelMetadata, bindingContext.ModelMetadata);
+            Assert.Equal("modelprefix.fieldName", bindingContext.ModelName);
+            Assert.Same(originalValueProvider, bindingContext.ValueProvider);
+
+            disposable.Dispose();
+        }
+
+        [Fact]
+        public void CreateBindingContext_FiltersValueProviders_ForValueProviderSource()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+
+            var original = CreateDefaultValueProvider();
+
+            // Act
+            var context = DefaultModelBindingContext.CreateBindingContext(
+                GetActionContext(),
+                original,
+                metadataProvider.GetMetadataForType(typeof(object)),
+                new BindingInfo() { BindingSource = BindingSource.Query },
+                "model");
+
+            // Assert
+            Assert.Collection(
+                Assert.IsType<CompositeValueProvider>(context.ValueProvider),
+                vp => Assert.Same(original[1], vp));
+        }
+
+        [Fact]
+        public void EnterNestedScope_FiltersValueProviders_ForValueProviderSource()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider
+                .ForProperty(typeof(string), nameof(string.Length))
+                .BindingDetails(b => b.BindingSource = BindingSource.Query);
+
+            var original = CreateDefaultValueProvider();
+            var context = DefaultModelBindingContext.CreateBindingContext(
+                GetActionContext(),
+                original,
+                metadataProvider.GetMetadataForType(typeof(string)),
+                new BindingInfo(),
+                "model");
+
+            var propertyMetadata = metadataProvider.GetMetadataForProperty(typeof(string), nameof(string.Length));
+
+            // Act
+            context.EnterNestedScope(propertyMetadata, "Length", "Length", model: null);
+
+            // Assert
+            Assert.Collection(
+                Assert.IsType<CompositeValueProvider>(context.ValueProvider),
+                vp => Assert.Same(original[1], vp));
+        }
+
+        [Fact]
+        public void EnterNestedScope_FiltersValueProviders_BasedOnTopLevelValueProviders()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider
+                .ForProperty(typeof(string), nameof(string.Length))
+                .BindingDetails(b => b.BindingSource = BindingSource.Form);
+
+            var original = CreateDefaultValueProvider();
+
+            var context = DefaultModelBindingContext.CreateBindingContext(
+                GetActionContext(),
+                original,
+                metadataProvider.GetMetadataForType(typeof(string)),
+                new BindingInfo() { BindingSource = BindingSource.Query },
+                "model");
+
+            var propertyMetadata = metadataProvider.GetMetadataForProperty(typeof(string), nameof(string.Length));
+
+            // Act
+            context.EnterNestedScope(propertyMetadata, "Length", "Length", model: null);
+
+            // Assert
+            Assert.Collection(
+                Assert.IsType<CompositeValueProvider>(context.ValueProvider),
+                vp => Assert.Same(original[2], vp));
+        }
+
+        [Fact]
+        public void ModelTypeAreFedFromModelMetadata()
+        {
+            // Act
+            var bindingContext = new DefaultModelBindingContext
+            {
+                ModelMetadata = new EmptyModelMetadataProvider().GetMetadataForType(typeof(int))
+            };
+
+            // Assert
+            Assert.Equal(typeof(int), bindingContext.ModelType);
+        }
+
+        private static ActionContext GetActionContext()
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+
+            return new ActionContext()
+            {
+                HttpContext = new DefaultHttpContext()
+                {
+                    RequestServices = services.BuildServiceProvider()
+                }
+            };
+        }
+
+        private static CompositeValueProvider CreateDefaultValueProvider()
+        {
+            var result = new CompositeValueProvider();
+            result.Add(new RouteValueProvider(BindingSource.Path, new RouteValueDictionary()));
+            result.Add(new QueryStringValueProvider(
+                BindingSource.Query,
+                new QueryCollection(),
+                CultureInfo.InvariantCulture));
+            result.Add(new FormValueProvider(
+                BindingSource.Form,
+                new FormCollection(new Dictionary<string, StringValues>()),
+                CultureInfo.CurrentCulture));
+            return result;
+        }
+
+        private class TestModelBinder : IModelBinder
+        {
+            public Task BindModelAsync(ModelBindingContext bindingContext)
+            {
+                if (bindingContext == null)
+                {
+                    throw new ArgumentNullException(nameof(bindingContext));
+                }
+                Debug.Assert(bindingContext.Result == null);
+
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/EnumerableValueProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/EnumerableValueProviderTest.cs
new file mode 100644
index 0000000000..19c3d37407
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/EnumerableValueProviderTest.cs
@@ -0,0 +1,295 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public abstract class EnumerableValueProviderTest
+    {
+        protected static Dictionary<string, StringValues> BackingStore { get; } = new Dictionary<string, StringValues>
+        {
+            { "some", new[] { "someValue1", "someValue2" } },
+            { "null_value", StringValues.Empty },
+            { "prefix.name", new[] { "someOtherValue" } },
+            { "prefix.null_value", StringValues.Empty },
+            { "prefix.property1.property", StringValues.Empty },
+            { "prefix.property2[index]", StringValues.Empty },
+            { "prefix[index1]", StringValues.Empty },
+            { "prefix[index1].property1", StringValues.Empty },
+            { "prefix[index1].property2", StringValues.Empty },
+            { "prefix[index2].property", StringValues.Empty },
+            { "[index]", StringValues.Empty },
+            { "[index].property", StringValues.Empty },
+            { "[index][anotherIndex]", StringValues.Empty },
+        };
+
+        [Fact]
+        public void ContainsPrefix_WithEmptyCollection_ReturnsFalseForEmptyPrefix()
+        {
+            // Arrange
+            var backingStore = new Dictionary<string, StringValues>();
+            var valueProvider = GetEnumerableValueProvider(BindingSource.Query, backingStore, culture: null);
+
+            // Act
+            var result = valueProvider.ContainsPrefix(string.Empty);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void ContainsPrefix_WithNonEmptyCollection_ReturnsTrueForEmptyPrefix()
+        {
+            // Arrange
+            var valueProvider = GetEnumerableValueProvider(BindingSource.Query, BackingStore, culture: null);
+
+            // Act
+            var result = valueProvider.ContainsPrefix(string.Empty);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData("some")]
+        [InlineData("prefix")]
+        [InlineData("prefix.name")]
+        [InlineData("[index]")]
+        [InlineData("prefix[index1]")]
+        public void ContainsPrefix_WithNonEmptyCollection_ReturnsTrueForKnownPrefixes(string prefix)
+        {
+            // Arrange
+            var valueProvider = GetEnumerableValueProvider(BindingSource.Query, BackingStore, culture: null);
+
+            // Act & Assert
+            Assert.True(valueProvider.ContainsPrefix(prefix));
+        }
+
+        [Fact]
+        public void ContainsPrefix_WithNonEmptyCollection_ReturnsFalseForUnknownPrefix()
+        {
+            // Arrange
+            var valueProvider = GetEnumerableValueProvider(BindingSource.Query, BackingStore, culture: null);
+
+            // Act
+            var result = valueProvider.ContainsPrefix("biff");
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void GetKeysFromPrefix_EmptyPrefix_ReturnsAllPrefixes()
+        {
+            // Arrange
+            var expected = new Dictionary<string, string>
+            {
+                { "index", "[index]" },
+                { "null_value", "null_value" },
+                { "prefix", "prefix" },
+                { "some", "some" },
+            };
+            var valueProvider = GetEnumerableValueProvider(BindingSource.Query, BackingStore, culture: null);
+
+            // Act
+            var result = valueProvider.GetKeysFromPrefix(string.Empty);
+
+            // Assert
+            Assert.Equal(expected, result.OrderBy(kvp => kvp.Key));
+        }
+
+        [Fact]
+        public void GetKeysFromPrefix_UnknownPrefix_ReturnsEmptyDictionary()
+        {
+            // Arrange
+            var valueProvider = GetEnumerableValueProvider(BindingSource.Query, BackingStore, culture: null);
+
+            // Act
+            var result = valueProvider.GetKeysFromPrefix("abc");
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public void GetKeysFromPrefix_KnownPrefix_ReturnsMatchingItems()
+        {
+            // Arrange
+            var expected = new Dictionary<string, string>
+            {
+                { "name", "prefix.name" },
+                { "null_value", "prefix.null_value" },
+                { "property1", "prefix.property1" },
+                { "property2", "prefix.property2" },
+                { "index1", "prefix[index1]" },
+                { "index2", "prefix[index2]" },
+            };
+            var valueProvider = GetEnumerableValueProvider(BindingSource.Query, BackingStore, culture: null);
+
+            // Act
+            var result = valueProvider.GetKeysFromPrefix("prefix");
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Fact]
+        public void GetKeysFromPrefix_IndexPrefix_ReturnsMatchingItems()
+        {
+            // Arrange
+            var expected = new Dictionary<string, string>
+            {
+                { "property", "[index].property" },
+                { "anotherIndex", "[index][anotherIndex]" }
+            };
+            var valueProvider = GetEnumerableValueProvider(BindingSource.Query, BackingStore, culture: null);
+
+            // Act
+            var result = valueProvider.GetKeysFromPrefix("[index]");
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Fact]
+        public void GetValue_SingleValue()
+        {
+            // Arrange
+            var culture = new CultureInfo("fr-FR");
+            var valueProvider = GetEnumerableValueProvider(BindingSource.Query, BackingStore, culture);
+
+            // Act
+            var result = valueProvider.GetValue("prefix.name");
+
+            // Assert
+            Assert.Equal("someOtherValue", (string)result);
+            Assert.Equal(culture, result.Culture);
+        }
+
+        [Fact]
+        public void GetValue_MultiValue()
+        {
+            // Arrange
+            var culture = new CultureInfo("fr-FR");
+            var valueProvider = GetEnumerableValueProvider(BindingSource.Query, BackingStore, culture);
+
+            // Act
+            var result = valueProvider.GetValue("some");
+
+            // Assert
+            Assert.Equal(new[] { "someValue1", "someValue2" }, result.Values);
+            Assert.Equal("someValue1,someValue2", (string)result);
+            Assert.Equal(culture, result.Culture);
+        }
+
+        [Theory]
+        [InlineData("null_value")]
+        [InlineData("prefix.null_value")]
+        public void GetValue_NullValue(string key)
+        {
+            // Arrange
+            var culture = new CultureInfo("fr-FR");
+            var valueProvider = GetEnumerableValueProvider(BindingSource.Query, BackingStore, culture);
+
+            // Act
+            var result = valueProvider.GetValue(key);
+
+            // Assert
+            Assert.Equal(ValueProviderResult.None, result);
+        }
+
+        [Fact]
+        public void GetValue_NullMultipleValue()
+        {
+            // Arrange
+            var backingStore = new Dictionary<string, StringValues>
+            {
+                { "key", new string[] { null, null, "value" } },
+            };
+            var culture = new CultureInfo("fr-FR");
+            var valueProvider = GetEnumerableValueProvider(BindingSource.Query, backingStore, culture);
+
+            // Act
+            var result = valueProvider.GetValue("key");
+
+            // Assert
+            Assert.Equal(new[] { null, null, "value" }, result.Values);
+            Assert.Equal(",,value", (string)result);
+        }
+
+        [Fact]
+        public void GetValue_ReturnsNullIfKeyNotFound()
+        {
+            // Arrange
+            var valueProvider = GetEnumerableValueProvider(BindingSource.Query, BackingStore, culture: null);
+
+            // Act
+            var result = valueProvider.GetValue("prefix");
+
+            // Assert
+            Assert.Equal(ValueProviderResult.None, result);
+        }
+
+        [Fact]
+        public virtual void FilterInclude()
+        {
+            // Arrange
+            var provider = GetBindingSourceValueProvider(BindingSource.Query, BackingStore, culture: null);
+
+            var bindingSource = new BindingSource(
+                BindingSource.Query.Id,
+                displayName: null,
+                isGreedy: true,
+                isFromRequest: true);
+
+            // Act
+            var result = provider.Filter(bindingSource);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Same(result, provider);
+        }
+
+        [Fact]
+        public void FilterExclude()
+        {
+            // Arrange
+            var provider = GetBindingSourceValueProvider(BindingSource.Query, BackingStore, culture: null);
+
+            var bindingSource = new BindingSource(
+                "Test",
+                displayName: null,
+                isGreedy: true,
+                isFromRequest: true);
+
+            // Act
+            var result = provider.Filter(bindingSource);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        protected IBindingSourceValueProvider GetBindingSourceValueProvider(
+            BindingSource bindingSource,
+            Dictionary<string, StringValues> values,
+            CultureInfo culture)
+        {
+            var provider = GetEnumerableValueProvider(bindingSource, values, culture) as IBindingSourceValueProvider;
+
+            // All IEnumerableValueProvider implementations also implement IBindingSourceValueProvider.
+            Assert.NotNull(provider);
+
+            return provider;
+        }
+
+        protected abstract IEnumerableValueProvider GetEnumerableValueProvider(
+            BindingSource bindingSource,
+            Dictionary<string, StringValues> values,
+            CultureInfo culture);
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/FormValueProviderFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/FormValueProviderFactoryTest.cs
new file mode 100644
index 0000000000..09aff4b206
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/FormValueProviderFactoryTest.cs
@@ -0,0 +1,65 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Globalization;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Test
+{
+    public class FormValueProviderFactoryTest
+    {
+        [Fact]
+        public async Task GetValueProviderAsync_ReturnsNull_WhenContentTypeIsNotFormUrlEncoded()
+        {
+            // Arrange
+            var context = CreateContext("some-content-type");
+            var factory = new FormValueProviderFactory();
+
+            // Act
+            await factory.CreateValueProviderAsync(context);
+
+            // Assert
+            Assert.Empty(context.ValueProviders);
+        }
+
+        [Theory]
+        [InlineData("application/x-www-form-urlencoded")]
+        [InlineData("application/x-www-form-urlencoded;charset=utf-8")]
+        [InlineData("multipart/form-data; boundary=----WebKitFormBoundarymx2fSWqWSd0OxQqq")]
+        [InlineData("multipart/form-data; boundary=----WebKitFormBoundarymx2fSWqWSd0OxQqq; charset=utf-8")]
+        public async Task GetValueProviderAsync_ReturnsValueProvider_WithCurrentCulture(string contentType)
+        {
+            // Arrange
+            var context = CreateContext(contentType);
+            var factory = new FormValueProviderFactory();
+
+            // Act
+            await factory.CreateValueProviderAsync(context);
+
+            // Assert
+            var valueProvider = Assert.IsType<FormValueProvider>(Assert.Single(context.ValueProviders));
+            Assert.Equal(CultureInfo.CurrentCulture, valueProvider.Culture);
+        }
+
+        private static ValueProviderFactoryContext CreateContext(string contentType)
+        {
+            var context = new DefaultHttpContext();
+            context.Request.ContentType = contentType;
+
+            if (context.Request.HasFormContentType)
+            {
+                context.Request.Form = new FormCollection(new Dictionary<string, StringValues>());
+            }
+
+            var actionContext = new ActionContext(context, new RouteData(), new ActionDescriptor());
+
+            return new ValueProviderFactoryContext(actionContext);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/FormValueProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/FormValueProviderTest.cs
new file mode 100644
index 0000000000..adc38cadcb
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/FormValueProviderTest.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Globalization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class FormValueProviderTest : EnumerableValueProviderTest
+    {
+        protected override IEnumerableValueProvider GetEnumerableValueProvider(
+            BindingSource bindingSource,
+            Dictionary<string, StringValues> values,
+            CultureInfo culture)
+        {
+            var backingStore = new FormCollection(values);
+            return new FormValueProvider(bindingSource, backingStore, culture);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Internal/ValidationStackTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Internal/ValidationStackTest.cs
new file mode 100644
index 0000000000..b68337cea8
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Internal/ValidationStackTest.cs
@@ -0,0 +1,128 @@
+// 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.
+
+using System.Collections.Generic;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Internal
+{
+    public class ValidationStackTest
+    {
+        [Theory]
+        [InlineData(0)]
+        [InlineData(5)]
+        [InlineData(ValidationStack.CutOff + 1)]
+        public void Push_ReturnsFalseIfValueAlreadyExists(int preloadCount)
+        {
+            // Arrange
+            var validationStack = new TestValidationStack();
+            var model = "This is a value";
+
+            PreLoad(preloadCount, validationStack);
+
+            // Act & Assert
+            Assert.True(validationStack.Push(model));
+            Assert.False(validationStack.Push(model));
+        }
+
+        [Theory]
+        [InlineData(0)]
+        [InlineData(5)]
+        [InlineData(ValidationStack.CutOff + 1)]
+        public void Pop_RemovesValueFromTheStack(int preloadCount)
+        {
+            // Arrange
+            var validationStack = new TestValidationStack();
+            var model = "This is a value";
+
+            PreLoad(preloadCount, validationStack);
+
+            // Act
+            validationStack.Push(model);
+            validationStack.Pop(model);
+
+            // Assert
+            Assert.False(validationStack.Contains(model));
+        }
+
+        [Theory]
+        [InlineData(0)]
+        [InlineData(5)]
+        [InlineData(ValidationStack.CutOff + 1)]
+        public void Pop_DoesNotThrowIfValueIsNull(int preloadCount)
+        {
+            // Arrange
+            var validationStack = new TestValidationStack();
+
+            PreLoad(preloadCount, validationStack);
+
+            // Act & Assert
+            // Popping null when it's not there must not throw
+            validationStack.Pop(null);
+        }
+
+        [Fact]
+        public void PushingMoreThanCutOffElements_SwitchesToHashSet()
+        {
+            // Arrange
+            var size = ValidationStack.CutOff + 1;
+
+            var validationStack = new TestValidationStack();
+            var models = new List<Model>();
+            for (var i = 0; i < size; i++)
+            {
+                models.Add(new Model { Position = i });
+            }
+
+            // Act & Assert
+            foreach (var model in models)
+            {
+                validationStack.Push(model);
+            }
+
+            Assert.Equal(size, validationStack.Count);
+
+            models.Reverse();
+            foreach (var model in models)
+            {
+                validationStack.Pop(model);
+            }
+
+            Assert.Equal(0, validationStack.Count);
+            Assert.True(validationStack.UsingHashSet());
+        }
+
+        private void PreLoad(int preloadCount, ValidationStack stack)
+        {
+            for (var i = 0; i < preloadCount; i++)
+            {
+                stack.Push(i);
+            }
+        }
+
+        private class Model
+        {
+            public int Position { get; set; }
+        }
+
+        private class TestValidationStack : ValidationStack
+        {
+            public bool Contains(object model)
+            {
+                if (HashSet != null)
+                {
+                    return HashSet.Contains(model);
+                }
+                else
+                {
+                    return List.Contains(model);
+                }
+            }
+
+            public bool UsingHashSet()
+            {
+                return HashSet != null;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryFormValueProviderFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryFormValueProviderFactoryTest.cs
new file mode 100644
index 0000000000..d940134a8d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryFormValueProviderFactoryTest.cs
@@ -0,0 +1,150 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Globalization;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Test
+{
+    public class JQueryFormValueProviderFactoryTest
+    {
+        private static readonly Dictionary<string, StringValues> _backingStore = new Dictionary<string, StringValues>
+        {
+            { "[]", new[] { "found" } },
+            { "[]property1", new[] { "found" } },
+            { "property2[]", new[] { "found" } },
+            { "[]property3[]", new[] { "found" } },
+            { "property[]Value", new[] { "found" } },
+            { "[10]", new[] { "found" } },
+            { "[11]property", new[] { "found" } },
+            { "property4[10]", new[] { "found" } },
+            { "[12]property[][13]", new[] { "found" } },
+            { "[14][]property1[15]property2", new[] { "found" } },
+            { "prefix[11]property1", new[] { "found" } },
+            { "prefix[12][][property2]", new[] { "found" } },
+            { "prefix[property1][13]", new[] { "found" } },
+            { "prefix[14][][15]", new[] { "found" } },
+            { "[property5][]", new[] { "found" } },
+            { "[][property6]Value", new[] { "found" } },
+            { "prefix[property2]", new[] { "found" } },
+            { "prefix[][property]Value", new[] { "found" } },
+            { "[property7][property8]", new[] { "found" } },
+            { "[property9][][property10]Value", new[] { "found" } },
+        };
+
+        [Fact]
+        public async Task GetValueProvider_ReturnsNull_WhenContentTypeIsNotFormUrlEncoded()
+        {
+            // Arrange
+            var context = CreateContext("some-content-type", formValues: null);
+            var factory = new JQueryFormValueProviderFactory();
+
+            // Act
+            await factory.CreateValueProviderAsync(context);
+
+            // Assert
+            Assert.Empty(context.ValueProviders);
+        }
+
+        [Theory]
+        [InlineData("application/x-www-form-urlencoded")]
+        [InlineData("application/x-www-form-urlencoded;charset=utf-8")]
+        [InlineData("multipart/form-data; boundary=----WebKitFormBoundarymx2fSWqWSd0OxQqq")]
+        [InlineData("multipart/form-data; boundary=----WebKitFormBoundarymx2fSWqWSd0OxQqq; charset=utf-8")]
+        public async Task CreateValueProviderAsync_ReturnsValueProvider_WithCurrentCulture(string contentType)
+        {
+            // Arrange
+            var context = CreateContext(contentType, formValues: null);
+            var factory = new JQueryFormValueProviderFactory();
+
+            // Act
+            await factory.CreateValueProviderAsync(context);
+
+            // Assert
+            var valueProvider = Assert.IsType<JQueryFormValueProvider>(Assert.Single(context.ValueProviders));
+            Assert.Equal(CultureInfo.CurrentCulture, valueProvider.Culture);
+        }
+
+        public static TheoryData<string> SuccessDataSet
+        {
+            get
+            {
+                return new TheoryData<string>
+                {
+                    string.Empty,
+                    "property1",
+                    "property2",
+                    "property3",
+                    "propertyValue",
+                    "[10]",
+                    "[11]property",
+                    "property4[10]",
+                    "[12]property[13]",
+                    "[14]property1[15]property2",
+                    "prefix.property1[13]",
+                    "prefix[14][15]",
+                    "property5",
+                    "property6Value",
+                    "prefix.property2",
+                    "prefix.propertyValue",
+                    "property7.property8",
+                    "property9.property10Value",
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(SuccessDataSet))]
+        public async Task GetValueProvider_ReturnsValueProvider_ContainingExpectedKeys(string key)
+        {
+            // Arrange
+            var context = CreateContext("application/x-www-form-urlencoded", formValues: _backingStore);
+            var factory = new JQueryFormValueProviderFactory();
+
+            // Act
+            await factory.CreateValueProviderAsync(context);
+
+            // Assert
+            var valueProvider = Assert.Single(context.ValueProviders);
+            var result = valueProvider.GetValue(key);
+            Assert.Equal("found", (string)result);
+        }
+
+        [Fact]
+        public async Task CreatesValueProvider_WithCurrentCulture()
+        {
+            // Arrange
+            var context = CreateContext("application/x-www-form-urlencoded", formValues: _backingStore);
+            var factory = new JQueryFormValueProviderFactory();
+
+            // Act
+            await factory.CreateValueProviderAsync(context);
+
+            // Assert
+            var valueProvider = Assert.Single(context.ValueProviders);
+            var jqueryFormValueProvider = Assert.IsType<JQueryFormValueProvider>(valueProvider);
+            Assert.Equal(CultureInfo.CurrentCulture, jqueryFormValueProvider.Culture);
+        }
+
+        private static ValueProviderFactoryContext CreateContext(string contentType, Dictionary<string, StringValues> formValues)
+        {
+            var context = new DefaultHttpContext();
+            context.Request.ContentType = contentType;
+
+            if (context.Request.HasFormContentType)
+            {
+                context.Request.Form = new FormCollection(formValues ?? new Dictionary<string, StringValues>());
+            }
+
+            var actionContext = new ActionContext(context, new RouteData(), new ActionDescriptor());
+
+            return new ValueProviderFactoryContext(actionContext);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryFormValueProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryFormValueProviderTest.cs
new file mode 100644
index 0000000000..608180ac3b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryFormValueProviderTest.cs
@@ -0,0 +1,35 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Globalization;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class JQueryFormValueProviderTest : EnumerableValueProviderTest
+    {
+        protected override IEnumerableValueProvider GetEnumerableValueProvider(
+            BindingSource bindingSource,
+            Dictionary<string, StringValues> values,
+            CultureInfo culture)
+        {
+            return new JQueryFormValueProvider(bindingSource, values, culture);
+        }
+
+        [Fact]
+        public void Filter_ExcludesItself()
+        {
+            // Arrange
+            var dictionary = new Dictionary<string, StringValues>();
+            var provider = new JQueryFormValueProvider(BindingSource.Form, dictionary, CultureInfo.CurrentCulture);
+
+            // Act
+            var result = provider.Filter();
+
+            // Assert
+            Assert.Null(result);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryQueryStringValueProviderFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryQueryStringValueProviderFactoryTest.cs
new file mode 100644
index 0000000000..fe6a060d92
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryQueryStringValueProviderFactoryTest.cs
@@ -0,0 +1,127 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Globalization;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Test
+{
+    public class JQueryQueryStringValueProviderFactoryTest
+    {
+        private static readonly Dictionary<string, StringValues> _backingStore = new Dictionary<string, StringValues>
+        {
+            { "[]", new[] { "found" } },
+            { "[]property1", new[] { "found" } },
+            { "property2[]", new[] { "found" } },
+            { "[]property3[]", new[] { "found" } },
+            { "property[]Value", new[] { "found" } },
+            { "[10]", new[] { "found" } },
+            { "[11]property", new[] { "found" } },
+            { "property4[10]", new[] { "found" } },
+            { "[12]property[][13]", new[] { "found" } },
+            { "[14][]property1[15]property2", new[] { "found" } },
+            { "prefix[11]property1", new[] { "found" } },
+            { "prefix[12][][property2]", new[] { "found" } },
+            { "prefix[property1][13]", new[] { "found" } },
+            { "prefix[14][][15]", new[] { "found" } },
+            { "[property5][]", new[] { "found" } },
+            { "[][property6]Value", new[] { "found" } },
+            { "prefix[property2]", new[] { "found" } },
+            { "prefix[][property]Value", new[] { "found" } },
+            { "[property7][property8]", new[] { "found" } },
+            { "[property9][][property10]Value", new[] { "found" } },
+        };
+
+        public static TheoryData<string> SuccessDataSet
+        {
+            get
+            {
+                return new TheoryData<string>
+                {
+                    string.Empty,
+                    "property1",
+                    "property2",
+                    "property3",
+                    "propertyValue",
+                    "[10]",
+                    "[11]property",
+                    "property4[10]",
+                    "[12]property[13]",
+                    "[14]property1[15]property2",
+                    "prefix.property1[13]",
+                    "prefix[14][15]",
+                    "property5",
+                    "property6Value",
+                    "prefix.property2",
+                    "prefix.propertyValue",
+                    "property7.property8",
+                    "property9.property10Value",
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(SuccessDataSet))]
+        public async Task GetValueProvider_ReturnsValueProvider_ContainingExpectedKeys(string key)
+        {
+            // Arrange
+            var context = CreateContext(_backingStore);
+            var factory = new JQueryQueryStringValueProviderFactory();
+
+            // Act
+            await factory.CreateValueProviderAsync(context);
+
+            // Assert
+            var valueProvider = Assert.Single(context.ValueProviders);
+            var result = valueProvider.GetValue(key);
+            Assert.Equal("found", (string)result);
+        }
+
+        [Fact]
+        public async Task DoesNotCreateValueProvider_WhenQueryIsEmpty()
+        {
+            // Arrange
+            var context = CreateContext(new Dictionary<string, StringValues>());
+            var factory = new JQueryQueryStringValueProviderFactory();
+
+            // Act
+            await factory.CreateValueProviderAsync(context);
+
+            // Assert
+            Assert.Empty(context.ValueProviders);
+        }
+
+        [Fact]
+        public async Task CreatesValueProvider_WithInvariantCulture()
+        {
+            // Arrange
+            var context = CreateContext(_backingStore);
+            var factory = new JQueryQueryStringValueProviderFactory();
+
+            // Act
+            await factory.CreateValueProviderAsync(context);
+
+            // Assert
+            var valueProvider = Assert.Single(context.ValueProviders);
+            var jqueryQueryStringValueProvider = Assert.IsType<JQueryQueryStringValueProvider>(valueProvider);
+            Assert.Equal(CultureInfo.InvariantCulture, jqueryQueryStringValueProvider.Culture);
+        }
+
+        private static ValueProviderFactoryContext CreateContext(Dictionary<string, StringValues> queryStringValues)
+        {
+            var context = new DefaultHttpContext();
+
+            context.Request.Query = new QueryCollection(queryStringValues);
+
+            var actionContext = new ActionContext(context, new RouteData(), new ActionDescriptor());
+            return new ValueProviderFactoryContext(actionContext);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryQueryStringValueProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryQueryStringValueProviderTest.cs
new file mode 100644
index 0000000000..830ceac1ab
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryQueryStringValueProviderTest.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Globalization;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class JQueryQueryStringValueProviderTest : EnumerableValueProviderTest
+    {
+        protected override IEnumerableValueProvider GetEnumerableValueProvider(
+            BindingSource bindingSource,
+            Dictionary<string, StringValues> values,
+            CultureInfo culture)
+        {
+            return new JQueryQueryStringValueProvider(bindingSource, values, culture);
+        }
+
+        [Fact]
+        public void Filter_ExcludesItself()
+        {
+            // Arrange
+            var dictionary = new Dictionary<string, StringValues>();
+            var provider = new JQueryQueryStringValueProvider(
+                BindingSource.Form,
+                dictionary,
+                CultureInfo.CurrentCulture);
+
+            // Act
+            var result = provider.Filter();
+
+            // Assert
+            Assert.Null(result);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/BindingSourceMetadataProviderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/BindingSourceMetadataProviderTests.cs
new file mode 100644
index 0000000000..5cf12bb5f0
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/BindingSourceMetadataProviderTests.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    public class BindingSourceMetadataProviderTests
+    {
+        [Fact]
+        public void CreateBindingMetadata_ForMatchingType_SetsBindingSource()
+        {
+            // Arrange
+            var provider = new BindingSourceMetadataProvider(typeof(Test), BindingSource.Special);
+
+            var key = ModelMetadataIdentity.ForType(typeof(Test));
+
+            var context = new BindingMetadataProviderContext(key, new ModelAttributes(new object[0], new object[0], null));
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.Equal(BindingSource.Special, context.BindingMetadata.BindingSource);
+        }
+
+        private class Test
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/BindingSourceTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/BindingSourceTest.cs
new file mode 100644
index 0000000000..8e2367c121
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/BindingSourceTest.cs
@@ -0,0 +1,49 @@
+// 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.
+
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class BindingSourceTest
+    {
+        [Fact]
+        public void BindingSource_CanAcceptDataFrom_ThrowsOnComposite()
+        {
+            // Arrange
+            var expected = "The provided binding source 'Test Source' is a composite. " +
+                $"'{nameof(BindingSource.CanAcceptDataFrom)}' requires that the source must represent a single type of input.";
+
+            var bindingSource = CompositeBindingSource.Create(
+                bindingSources: new BindingSource[] { BindingSource.Query, BindingSource.Form },
+                displayName: "Test Source");
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => BindingSource.Query.CanAcceptDataFrom(bindingSource),
+                "bindingSource",
+                expected);
+        }
+
+        [Fact]
+        public void BindingSource_CanAcceptDataFrom_Match()
+        {
+            // Act
+            var result = BindingSource.Query.CanAcceptDataFrom(BindingSource.Query);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void BindingSource_CanAcceptDataFrom_NoMatch()
+        {
+            // Act
+            var result = BindingSource.Query.CanAcceptDataFrom(BindingSource.Path);
+
+            // Assert
+            Assert.False(result);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/CompositeBindingSourceTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/CompositeBindingSourceTest.cs
new file mode 100644
index 0000000000..b5ee0c57ea
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/CompositeBindingSourceTest.cs
@@ -0,0 +1,64 @@
+// 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.
+
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class CompositeBindingSourceTest
+    {
+        [Fact]
+        public void CompositeBindingSourceTest_CanAcceptDataFrom_ThrowsOnComposite()
+        {
+            // Arrange
+            var composite1 = CompositeBindingSource.Create(
+                bindingSources: new BindingSource[] { BindingSource.Query, BindingSource.Form },
+                displayName: "Test Source1");
+
+            var composite2 = CompositeBindingSource.Create(
+              bindingSources: new BindingSource[] { BindingSource.Query, BindingSource.Form },
+              displayName: "Test Source2");
+
+            var expected = "The provided binding source 'Test Source2' is a composite. " +
+                $"'{nameof(composite1.CanAcceptDataFrom)}' requires that the source must represent a single type of input.";
+
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => composite1.CanAcceptDataFrom(composite2),
+                "bindingSource",
+                expected);
+        }
+
+        [Fact]
+        public void CompositeBindingSourceTest_CanAcceptDataFrom_Match()
+        {
+            // Arrange
+            var composite = CompositeBindingSource.Create(
+                bindingSources: new BindingSource[] { BindingSource.Query, BindingSource.Form },
+                displayName: "Test Source1");
+
+            // Act
+            var result = composite.CanAcceptDataFrom(BindingSource.Query);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void CompositeBindingSourceTest_CanAcceptDataFrom_NoMatch()
+        {
+            // Arrange
+            var composite = CompositeBindingSource.Create(
+                bindingSources: new BindingSource[] { BindingSource.Query, BindingSource.Form },
+                displayName: "Test Source1");
+
+            // Act
+            var result = composite.CanAcceptDataFrom(BindingSource.Path);
+
+            // Assert
+            Assert.False(result);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultModelMetadataProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultModelMetadataProviderTest.cs
new file mode 100644
index 0000000000..8994835817
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultModelMetadataProviderTest.cs
@@ -0,0 +1,506 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Reflection;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    public class DefaultModelMetadataProviderTest
+    {
+        [Fact]
+        public void GetMetadataForType_IncludesAttributes()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var metadata = provider.GetMetadataForType(typeof(ModelType));
+
+            // Assert
+            var defaultMetadata = Assert.IsType<DefaultModelMetadata>(metadata);
+
+            var attribute = Assert.IsType<ModelAttribute>(Assert.Single(defaultMetadata.Attributes.Attributes));
+            Assert.Equal("OnType", attribute.Value);
+        }
+
+        [Fact]
+        public void GetMetadataForType_Cached()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var metadata1 = Assert.IsType<DefaultModelMetadata>(provider.GetMetadataForType(typeof(ModelType)));
+            var metadata2 = Assert.IsType<DefaultModelMetadata>(provider.GetMetadataForType(typeof(ModelType)));
+
+            // Assert
+            Assert.Same(metadata1, metadata2);
+            Assert.Same(metadata1.Attributes, metadata2.Attributes);
+            Assert.Same(metadata1.BindingMetadata, metadata2.BindingMetadata);
+            Assert.Same(metadata1.DisplayMetadata, metadata2.DisplayMetadata);
+            Assert.Same(metadata1.ValidationMetadata, metadata2.ValidationMetadata);
+        }
+
+        [Fact]
+        public void GetMetadataForObjectType_Cached()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var metadata1 = provider.GetMetadataForType(typeof(object));
+            var metadata2 = provider.GetMetadataForType(typeof(object));
+
+            // Assert
+            Assert.Same(metadata1, metadata2);
+        }
+
+        [Fact]
+        public void GetMetadataForProperties_IncludesContainerMetadataForAllProperties()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var modelType = typeof(ModelType);
+
+            // Act
+            var metadata = provider.GetMetadataForProperties(modelType).ToArray();
+
+            // Assert
+            Assert.Collection(
+                metadata,
+                (propertyMetadata) =>
+                {
+                    Assert.Equal("Property1", propertyMetadata.PropertyName);
+                    Assert.NotNull(propertyMetadata.ContainerMetadata);
+                    Assert.Equal(modelType, propertyMetadata.ContainerMetadata.ModelType);
+                },
+                (propertyMetadata) =>
+                {
+                    Assert.Equal("Property2", propertyMetadata.PropertyName);
+                    Assert.NotNull(propertyMetadata.ContainerMetadata);
+                    Assert.Equal(modelType, propertyMetadata.ContainerMetadata.ModelType);
+                });
+        }
+
+        [Fact]
+        public void GetMetadataForProperties_IncludesAllProperties()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var metadata = provider.GetMetadataForProperties(typeof(ModelType)).ToArray();
+
+            // Assert
+            Assert.Equal(2, metadata.Length);
+            Assert.Single(metadata, m => m.PropertyName == "Property1");
+            Assert.Single(metadata, m => m.PropertyName == "Property2");
+        }
+
+        [Fact]
+        public void GetMetadataForProperties_IncludesAllProperties_ExceptIndexer()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var metadata = provider.GetMetadataForProperties(typeof(ModelTypeWithIndexer)).ToArray();
+
+            // Assert
+            Assert.Single(metadata);
+            Assert.Single(metadata, m => m.PropertyName == "Property1");
+        }
+
+        [Fact]
+        public void GetMetadataForProperties_Cached()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var properties1 = provider.GetMetadataForProperties(typeof(ModelType)).Cast<DefaultModelMetadata>().ToArray();
+            var properties2 = provider.GetMetadataForProperties(typeof(ModelType)).Cast<DefaultModelMetadata>().ToArray();
+
+            // Assert
+            Assert.Equal(properties1.Length, properties2.Length);
+            for (var i = 0; i < properties1.Length; i++)
+            {
+                Assert.Same(properties1[i], properties2[i]);
+                Assert.Same(properties1[i].Attributes, properties2[i].Attributes);
+                Assert.Same(properties1[i].BindingMetadata, properties2[i].BindingMetadata);
+                Assert.Same(properties1[i].DisplayMetadata, properties2[i].DisplayMetadata);
+                Assert.Same(properties1[i].ValidationMetadata, properties2[i].ValidationMetadata);
+            }
+        }
+
+        [Fact]
+        public void GetMetadataForType_PropertiesCollection_Cached()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var metadata1 = Assert.IsType<DefaultModelMetadata>(provider.GetMetadataForType(typeof(ModelType)));
+            var metadata2 = Assert.IsType<DefaultModelMetadata>(provider.GetMetadataForType(typeof(ModelType)));
+
+            // Assert
+            Assert.Same(metadata1.Properties, metadata2.Properties);
+        }
+
+        [Fact]
+        public void GetMetadataForProperties_IncludesMergedAttributes()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var metadata = provider.GetMetadataForProperties(typeof(ModelType)).First();
+
+            // Assert
+            var defaultMetadata = Assert.IsType<DefaultModelMetadata>(metadata);
+
+            var attributes = defaultMetadata.Attributes.Attributes.ToArray();
+            Assert.Equal("OnProperty", Assert.IsType<ModelAttribute>(attributes[0]).Value);
+            Assert.Equal("OnPropertyType", Assert.IsType<ModelAttribute>(attributes[1]).Value);
+        }
+
+        [Fact]
+        public void GetMetadataForProperties_ExcludesHiddenProperties()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var metadata = provider.GetMetadataForProperties(typeof(DerivedModelWithHiding));
+
+            // Assert
+            var propertyMetadata = Assert.Single(metadata);
+            Assert.Equal(typeof(string), propertyMetadata.ModelType);
+        }
+
+        [Fact]
+        public void GetMetadataForProperties_PropertyGetter_IsNullSafe()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var metadata = provider.GetMetadataForProperties(typeof(ModelType));
+
+            // Assert
+            foreach (var property in metadata)
+            {
+                Assert.NotNull(property.PropertyGetter);
+                Assert.Null(property.PropertyGetter(null));
+            }
+        }
+
+        [Fact]
+        public void GetMetadataForParameter_SuppliesEmptyAttributes_WhenParameterHasNoAttributes()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var parameters = typeof(ModelType)
+                .GetMethod(nameof(ModelType.Method1))
+                .GetParameters();
+
+            // Act
+            var metadata = provider.GetMetadataForParameter(parameters[0]);
+
+            // Assert
+            var defaultMetadata = Assert.IsType<DefaultModelMetadata>(metadata);
+
+            // Not exactly "no attributes" due to SerializableAttribute on object.
+            Assert.IsType<SerializableAttribute>(Assert.Single(defaultMetadata.Attributes.Attributes));
+        }
+
+        [Fact]
+        public void GetMetadataForParameter_SuppliesAttributes_WhenParamHasAttributes()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var parameters = typeof(ModelType)
+                .GetMethod(nameof(ModelType.Method1))
+                .GetParameters();
+
+            // Act
+            var metadata = provider.GetMetadataForParameter(parameters[1]);
+
+            // Assert
+            var defaultMetadata = Assert.IsType<DefaultModelMetadata>(metadata);
+            Assert.Collection(
+                // Take(2) to ignore SerializableAttribute on object.
+                defaultMetadata.Attributes.Attributes.Take(2),
+                attribute =>
+                {
+                    var modelAttribute = Assert.IsType<ModelAttribute>(attribute);
+                    Assert.Equal("ParamAttrib1", modelAttribute.Value);
+                },
+                attribute =>
+                {
+                    var modelAttribute = Assert.IsType<ModelAttribute>(attribute);
+                    Assert.Equal("ParamAttrib2", modelAttribute.Value);
+                });
+        }
+
+        [Fact]
+        public void GetMetadataForParameter_Cached()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var parameter = typeof(ModelType)
+                .GetMethod(nameof(ModelType.Method1))
+                .GetParameters()[1];
+
+            // Act
+            var metadata1 = provider.GetMetadataForParameter(parameter);
+            var metadata2 = provider.GetMetadataForParameter(parameter);
+
+            // Assert
+            Assert.Same(metadata1, metadata2);
+        }
+
+        [Fact]
+        public void GetMetadataForParameter_WithModelType_ReturnsCombinedModelMetadata()
+        {
+            // Arrange
+            var parameter = GetType()
+                .GetMethod(nameof(GetMetadataForParameterTestMethod), BindingFlags.NonPublic | BindingFlags.Instance)
+                .GetParameters()[0];
+            var provider = CreateProvider();
+
+            // Act
+            var metadata = provider.GetMetadataForParameter(parameter, typeof(DerivedModelType));
+
+            // Assert
+            Assert.Equal(ModelMetadataKind.Parameter, metadata.MetadataKind);
+            Assert.Equal(typeof(DerivedModelType), metadata.ModelType);
+
+            var defaultModelMetadata = Assert.IsType<DefaultModelMetadata>(metadata);
+
+            Assert.Collection(
+                defaultModelMetadata.Attributes.Attributes,
+                a => Assert.Equal("OnParameter", Assert.IsType<ModelAttribute>(a).Value),
+                a => Assert.Equal("OnDerivedType", Assert.IsType<ModelAttribute>(a).Value),
+                a => Assert.Equal("OnType", Assert.IsType<ModelAttribute>(a).Value));
+
+            Assert.Collection(
+                metadata.Properties.OrderBy(p => p.Name),
+                p =>
+                {
+                    Assert.Equal(nameof(DerivedModelType.DerivedProperty), p.Name);
+
+                    var defaultPropertyMetadata = Assert.IsType<DefaultModelMetadata>(p);
+                    Assert.Collection(
+                        defaultPropertyMetadata.Attributes.Attributes.OfType<ModelAttribute>(),
+                        a => Assert.Equal("OnDerivedProperty", Assert.IsType<ModelAttribute>(a).Value));
+                },
+                p =>
+                {
+                    Assert.Equal(nameof(DerivedModelType.Property1), p.Name);
+
+                    var defaultPropertyMetadata = Assert.IsType<DefaultModelMetadata>(p);
+                    Assert.Collection(
+                        defaultPropertyMetadata.Attributes.Attributes.OfType<ModelAttribute>(),
+                        a => Assert.Equal("OnProperty", Assert.IsType<ModelAttribute>(a).Value),
+                        a => Assert.Equal("OnPropertyType", Assert.IsType<ModelAttribute>(a).Value));
+                },
+                p =>
+                {
+                    Assert.Equal(nameof(DerivedModelType.Property2), p.Name);
+                });
+        }
+
+        [Fact]
+        public void GetMetadataForParameter_WithModelType_CachesResults()
+        {
+            // Arrange
+            var parameter = GetType()
+                .GetMethod(nameof(GetMetadataForParameterTestMethod), BindingFlags.NonPublic | BindingFlags.Instance)
+                .GetParameters()[0];
+            var provider = CreateProvider();
+
+            // Act
+            var metadata1 = provider.GetMetadataForParameter(parameter, typeof(DerivedModelType));
+            var metadata2 = provider.GetMetadataForParameter(parameter, typeof(DerivedModelType));
+
+            // Assert
+            Assert.Same(metadata1, metadata2);
+        }
+
+        [Fact]
+        public void GetMetadataForParameter_WithModelType_VariesByModelType()
+        {
+            // Arrange
+            var parameter = GetType()
+                .GetMethod(nameof(GetMetadataForParameterTestMethod), BindingFlags.NonPublic | BindingFlags.Instance)
+                .GetParameters()[0];
+            var provider = CreateProvider();
+
+            // Act
+            var metadata1 = provider.GetMetadataForParameter(parameter, typeof(DerivedModelType));
+            var metadata2 = provider.GetMetadataForParameter(parameter, typeof(object));
+
+            // Assert
+            Assert.NotSame(metadata1, metadata2);
+        }
+
+        [Fact]
+        public void GetMetadataForProperty_WithModelType_ReturnsCombinedModelMetadata()
+        {
+            // Arrange
+            var property = typeof(TestContainer)
+                .GetProperty(nameof(TestContainer.ModelProperty));
+            var provider = CreateProvider();
+
+            // Act
+            var metadata = provider.GetMetadataForProperty(property, typeof(DerivedModelType));
+
+            // Assert
+            Assert.Equal(ModelMetadataKind.Property, metadata.MetadataKind);
+            Assert.Equal(typeof(DerivedModelType), metadata.ModelType);
+
+            var defaultModelMetadata = Assert.IsType<DefaultModelMetadata>(metadata);
+
+            Assert.Collection(
+                defaultModelMetadata.Attributes.Attributes,
+                a => Assert.Equal("OnProperty", Assert.IsType<ModelAttribute>(a).Value),
+                a => Assert.Equal("OnDerivedType", Assert.IsType<ModelAttribute>(a).Value),
+                a => Assert.Equal("OnType", Assert.IsType<ModelAttribute>(a).Value));
+
+            Assert.Collection(
+                metadata.Properties.OrderBy(p => p.Name),
+                p =>
+                {
+                    Assert.Equal(nameof(DerivedModelType.DerivedProperty), p.Name);
+
+                    var defaultPropertyMetadata = Assert.IsType<DefaultModelMetadata>(p);
+                    Assert.Collection(
+                        defaultPropertyMetadata.Attributes.Attributes.OfType<ModelAttribute>(),
+                        a => Assert.Equal("OnDerivedProperty", Assert.IsType<ModelAttribute>(a).Value));
+                },
+                p =>
+                {
+                    Assert.Equal(nameof(DerivedModelType.Property1), p.Name);
+
+                    var defaultPropertyMetadata = Assert.IsType<DefaultModelMetadata>(p);
+                    Assert.Collection(
+                        defaultPropertyMetadata.Attributes.Attributes.OfType<ModelAttribute>(),
+                        a => Assert.Equal("OnProperty", Assert.IsType<ModelAttribute>(a).Value),
+                        a => Assert.Equal("OnPropertyType", Assert.IsType<ModelAttribute>(a).Value));
+                },
+                p =>
+                {
+                    Assert.Equal(nameof(DerivedModelType.Property2), p.Name);
+                });
+        }
+
+        [Fact]
+        public void GetMetadataForProperty_WithModelType_CachesResults()
+        {
+            // Arrange
+            var property = typeof(TestContainer)
+                .GetProperty(nameof(TestContainer.ModelProperty));
+            var provider = CreateProvider();
+
+            // Act
+            var metadata1 = provider.GetMetadataForProperty(property, typeof(DerivedModelType));
+            var metadata2 = provider.GetMetadataForProperty(property, typeof(DerivedModelType));
+
+            // Assert
+            Assert.Same(metadata1, metadata2);
+        }
+
+        [Fact]
+        public void GetMetadataForProperty_WithModelType_VariesByModelType()
+        {
+            // Arrange
+            var property = typeof(TestContainer)
+                .GetProperty(nameof(TestContainer.ModelProperty));
+            var provider = CreateProvider();
+
+            // Act
+            var metadata1 = provider.GetMetadataForProperty(property, typeof(DerivedModelType));
+            var metadata2 = provider.GetMetadataForProperty(property, typeof(object));
+
+            // Assert
+            Assert.NotSame(metadata1, metadata2);
+        }
+
+        private static DefaultModelMetadataProvider CreateProvider()
+        {
+            return new DefaultModelMetadataProvider(
+                new EmptyCompositeMetadataDetailsProvider(),
+                Options.Create(new MvcOptions()));
+        }
+
+        [Model("OnType")]
+        private class ModelType
+        {
+            [Model("OnProperty")]
+            public PropertyType Property1 { get; } = new PropertyType();
+
+            public PropertyType Property2 { get; set; }
+
+            public void Method1(
+                object paramWithNoAttributes,
+                [Model("ParamAttrib1"), Model("ParamAttrib2")] object paramWithTwoAttributes)
+            {
+            }
+        }
+
+        [Model("OnPropertyType")]
+        private class PropertyType
+        {
+        }
+
+        [AttributeUsage(AttributeTargets.All, AllowMultiple = true)]
+        private class ModelAttribute : Attribute
+        {
+            public ModelAttribute(string value)
+            {
+                Value = value;
+            }
+
+            public string Value { get; }
+        }
+
+        private class ModelTypeWithIndexer
+        {
+            public PropertyType this[string key] => null;
+
+            public PropertyType Property1 { get; set; }
+        }
+
+        private void GetMetadataForParameterTestMethod([Model("OnParameter")] ModelType parameter)
+        {
+        }
+
+        private class BaseModelWithHiding
+        {
+            public int Property { get; set; }
+        }
+
+        private class DerivedModelWithHiding : BaseModelWithHiding
+        {
+            public new string Property { get; set; }
+        }
+
+        [Model("OnDerivedType")]
+        private class DerivedModelType : ModelType
+        {
+            [Model("OnDerivedProperty")]
+            public string DerivedProperty { get; set; }
+        }
+
+        private class TestContainer
+        {
+            [Model("OnProperty")]
+            public ModelType ModelProperty { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultModelMetadataTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultModelMetadataTest.cs
new file mode 100644
index 0000000000..6f3eb0830f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultModelMetadataTest.cs
@@ -0,0 +1,925 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Xml;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    public class DefaultModelMetadataTest
+    {
+        [Fact]
+        public void DefaultValues()
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var detailsProvider = new DefaultCompositeMetadataDetailsProvider(
+                Enumerable.Empty<IMetadataDetailsProvider>());
+
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null));
+
+            // Act
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            // Assert
+            Assert.NotNull(metadata.AdditionalValues);
+            Assert.Empty(metadata.AdditionalValues);
+            Assert.Equal(typeof(string), metadata.ModelType);
+
+            Assert.True(metadata.ConvertEmptyStringToNull);
+            Assert.False(metadata.HasNonDefaultEditFormat);
+            Assert.False(metadata.HideSurroundingHtml);
+            Assert.True(metadata.HtmlEncode);
+            Assert.True(metadata.IsBindingAllowed);
+            Assert.False(metadata.IsBindingRequired);
+            Assert.False(metadata.IsCollectionType);
+            Assert.False(metadata.IsComplexType);
+            Assert.False(metadata.IsEnumerableType);
+            Assert.False(metadata.IsEnum);
+            Assert.False(metadata.IsFlagsEnum);
+            Assert.False(metadata.IsNullableValueType);
+            Assert.False(metadata.IsReadOnly);
+            Assert.False(metadata.IsRequired); // Defaults to false for reference types
+            Assert.True(metadata.ShowForDisplay);
+            Assert.True(metadata.ShowForEdit);
+            Assert.False(metadata.ValidateChildren); // Defaults to true for complex and enumerable types.
+
+            Assert.Null(metadata.DataTypeName);
+            Assert.Null(metadata.Description);
+            Assert.Null(metadata.DisplayFormatString);
+            Assert.Null(metadata.DisplayName);
+            Assert.Null(metadata.EditFormatString);
+            Assert.Null(metadata.ElementMetadata);
+            Assert.Null(metadata.EnumGroupedDisplayNamesAndValues);
+            Assert.Null(metadata.EnumNamesAndValues);
+            Assert.Null(metadata.NullDisplayText);
+            Assert.Null(metadata.PropertyValidationFilter);
+            Assert.Null(metadata.SimpleDisplayProperty);
+            Assert.Null(metadata.Placeholder);
+            Assert.Null(metadata.TemplateHint);
+
+            Assert.Equal(10000, ModelMetadata.DefaultOrder);
+            Assert.Equal(ModelMetadata.DefaultOrder, metadata.Order);
+
+            Assert.Null(metadata.BinderModelName);
+            Assert.Null(metadata.BinderType);
+            Assert.Null(metadata.BindingSource);
+            Assert.Null(metadata.PropertyFilterProvider);
+        }
+
+        [Fact]
+        public void CreateMetadataForType()
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var detailsProvider = new DefaultCompositeMetadataDetailsProvider(
+                Enumerable.Empty<IMetadataDetailsProvider>());
+
+            var key = ModelMetadataIdentity.ForType(typeof(Exception));
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null));
+
+            // Act
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            // Assert
+            Assert.Equal(typeof(Exception), metadata.ModelType);
+            Assert.Null(metadata.PropertyName);
+            Assert.Null(metadata.ContainerType);
+        }
+
+        [Fact]
+        public void CreateMetadataForProperty()
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+
+            var key = ModelMetadataIdentity.ForProperty(typeof(string), "Message", typeof(Exception));
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], new object[0], null));
+
+            // Act
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            // Assert
+            Assert.Equal(typeof(string), metadata.ModelType);
+            Assert.Equal("Message", metadata.PropertyName);
+            Assert.Equal(typeof(Exception), metadata.ContainerType);
+        }
+
+        [Fact]
+        public void DisplayFormatString_DoesNotCacheInitialDelegateValue()
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+
+            var key = ModelMetadataIdentity.ForProperty(
+                typeof(string),
+                nameof(TypeWithProperties.PublicGetPublicSetProperty),
+                typeof(TypeWithProperties));
+
+            var attributes = new ModelAttributes(Array.Empty<object>(), Array.Empty<object>(), null);
+            var displayFormat = "initial format";
+            var cache = new DefaultMetadataDetails(key, attributes)
+            {
+                DisplayMetadata = new DisplayMetadata
+                {
+                    DisplayFormatStringProvider = () => displayFormat,
+                },
+            };
+
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            foreach (var newFormat in new[] { "one", "two", "three" })
+            {
+                // Arrange n
+                displayFormat = newFormat;
+
+                // Act n
+                var result = metadata.DisplayFormatString;
+
+                // Assert n
+                Assert.Equal(newFormat, result);
+            }
+        }
+
+        [Fact]
+        public void EditFormatString_DoesNotCacheInitialDelegateValue()
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+
+            var key = ModelMetadataIdentity.ForProperty(
+                typeof(string),
+                nameof(TypeWithProperties.PublicGetPublicSetProperty),
+                typeof(TypeWithProperties));
+
+            var attributes = new ModelAttributes(Array.Empty<object>(), Array.Empty<object>(), null);
+            var editFormat = "initial format";
+            var cache = new DefaultMetadataDetails(key, attributes)
+            {
+                DisplayMetadata = new DisplayMetadata
+                {
+                    EditFormatStringProvider = () => editFormat,
+                },
+            };
+
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            foreach (var newFormat in new[] { "one", "two", "three" })
+            {
+                // Arrange n
+                editFormat = newFormat;
+
+                // Act n
+                var result = metadata.EditFormatString;
+
+                // Assert n
+                Assert.Equal(newFormat, result);
+            }
+        }
+
+        [Fact]
+        public void NullDisplayText_DoesNotCacheInitialDelegateValue()
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+
+            var key = ModelMetadataIdentity.ForProperty(
+                typeof(string),
+                nameof(TypeWithProperties.PublicGetPublicSetProperty),
+                typeof(TypeWithProperties));
+
+            var attributes = new ModelAttributes(Array.Empty<object>(), Array.Empty<object>(), null);
+            var nullDisplay = "initial display text";
+            var cache = new DefaultMetadataDetails(key, attributes)
+            {
+                DisplayMetadata = new DisplayMetadata
+                {
+                    NullDisplayTextProvider = () => nullDisplay,
+                },
+            };
+
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            foreach (var newDisplay in new[] { "one", "two", "three" })
+            {
+                // Arrange n
+                nullDisplay = newDisplay;
+
+                // Act n
+                var result = metadata.NullDisplayText;
+
+                // Assert n
+                Assert.Equal(newDisplay, result);
+            }
+        }
+
+        [Theory]
+        [InlineData(typeof(object))]
+        [InlineData(typeof(int))]
+        [InlineData(typeof(NonCollectionType))]
+        [InlineData(typeof(string))]
+        public void ElementMetadata_ReturnsNull_ForNonCollections(Type modelType)
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+
+            var key = ModelMetadataIdentity.ForType(modelType);
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null));
+
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            // Act
+            var elementMetadata = metadata.ElementMetadata;
+
+            // Assert
+            Assert.Null(elementMetadata);
+        }
+
+        [Theory]
+        [InlineData(typeof(int[]), typeof(int))]
+        [InlineData(typeof(List<string>), typeof(string))]
+        [InlineData(typeof(DerivedList), typeof(int))]
+        [InlineData(typeof(IEnumerable), typeof(object))]
+        [InlineData(typeof(IEnumerable<string>), typeof(string))]
+        [InlineData(typeof(Collection<int>), typeof(int))]
+        [InlineData(typeof(Dictionary<object, object>), typeof(KeyValuePair<object, object>))]
+        [InlineData(typeof(DerivedDictionary), typeof(KeyValuePair<string, int>))]
+        public void ElementMetadata_ReturnsExpectedMetadata(Type modelType, Type elementType)
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+
+            var key = ModelMetadataIdentity.ForType(modelType);
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null));
+
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            // Act
+            var elementMetadata = metadata.ElementMetadata;
+
+            // Assert
+            Assert.NotNull(elementMetadata);
+            Assert.Equal(elementType, elementMetadata.ModelType);
+        }
+
+        private class NonCollectionType
+        {
+        }
+
+        private class DerivedList : List<int>
+        {
+        }
+
+        private class DerivedDictionary : Dictionary<string, int>
+        {
+        }
+
+        [Theory]
+        [InlineData(typeof(string))]
+        [InlineData(typeof(int))]
+        public void IsBindingAllowed_ReturnsTrue_ForTypes(Type modelType)
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+
+            var key = ModelMetadataIdentity.ForType(modelType);
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null))
+            {
+                BindingMetadata = new BindingMetadata()
+                {
+                    IsBindingAllowed = false, // Will be ignored.
+                },
+            };
+
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            // Act
+            var isBindingAllowed = metadata.IsBindingAllowed;
+
+            // Assert
+            Assert.True(isBindingAllowed);
+        }
+
+        [Theory]
+        [InlineData(typeof(string))]
+        [InlineData(typeof(int))]
+        public void IsBindingRequired_ReturnsFalse_ForTypes(Type modelType)
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+
+            var key = ModelMetadataIdentity.ForType(modelType);
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null))
+            {
+                BindingMetadata = new BindingMetadata()
+                {
+                    IsBindingRequired = true, // Will be ignored.
+                },
+            };
+
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            // Act
+            var isBindingRequired = metadata.IsBindingRequired;
+
+            // Assert
+            Assert.False(isBindingRequired);
+        }
+
+        [Theory]
+        [InlineData(typeof(string))]
+        [InlineData(typeof(IDisposable))]
+        [InlineData(typeof(Nullable<int>))]
+        public void IsRequired_ReturnsFalse_ForNullableTypes(Type modelType)
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+
+            var key = ModelMetadataIdentity.ForType(modelType);
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null));
+
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            // Act
+            var isRequired = metadata.IsRequired;
+
+            // Assert
+            Assert.False(isRequired);
+        }
+
+        [Theory]
+        [InlineData(typeof(int))]
+        [InlineData(typeof(DayOfWeek))]
+        public void IsRequired_ReturnsTrue_ForNonNullableTypes(Type modelType)
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+
+            var key = ModelMetadataIdentity.ForType(modelType);
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null));
+
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            // Act
+            var isRequired = metadata.IsRequired;
+
+            // Assert
+            Assert.True(isRequired);
+        }
+
+        [Fact]
+        public void PropertiesProperty_CallsProvider()
+        {
+            // Arrange
+            var provider = new Mock<IModelMetadataProvider>(MockBehavior.Strict);
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+
+            var expectedProperties = new DefaultModelMetadata[]
+            {
+                new DefaultModelMetadata(
+                    provider.Object,
+                    detailsProvider,
+                    new DefaultMetadataDetails(
+                        ModelMetadataIdentity.ForProperty(typeof(int), "Prop1", typeof(string)),
+                        attributes: new ModelAttributes(new object[0], new object[0], null))),
+                new DefaultModelMetadata(
+                    provider.Object,
+                    detailsProvider,
+                    new DefaultMetadataDetails(
+                        ModelMetadataIdentity.ForProperty(typeof(int), "Prop2", typeof(string)),
+                        attributes: new ModelAttributes(new object[0], new object[0], null))),
+            };
+
+            provider
+                .Setup(p => p.GetMetadataForProperties(typeof(string)))
+                .Returns(expectedProperties);
+
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null));
+
+            var metadata = new DefaultModelMetadata(provider.Object, detailsProvider, cache);
+
+            // Act
+            var properties = metadata.Properties;
+
+            // Assert
+            Assert.Equal(expectedProperties.Length, properties.Count);
+
+            for (var i = 0; i < expectedProperties.Length; i++)
+            {
+                Assert.Same(expectedProperties[i], properties[i]);
+            }
+        }
+
+        // Input (original) property names and expected (ordered) property names.
+        public static TheoryData<IEnumerable<string>, IEnumerable<string>> PropertyNamesTheoryData
+        {
+            get
+            {
+                // ModelMetadata does not reorder properties the provider returns without an Order override.
+                return new TheoryData<IEnumerable<string>, IEnumerable<string>>
+                {
+                    {
+                        new List<string> { "Property1", "Property2", "Property3", "Property4", },
+                        new List<string> { "Property1", "Property2", "Property3", "Property4", }
+                    },
+                    {
+                        new List<string> { "Property4", "Property3", "Property2", "Property1", },
+                        new List<string> { "Property4", "Property3", "Property2", "Property1", }
+                    },
+                    {
+                        new List<string> { "Delta", "Bravo", "Charlie", "Alpha", },
+                        new List<string> { "Delta", "Bravo", "Charlie", "Alpha", }
+                    },
+                    {
+                        new List<string> { "John", "Jonathan", "Jon", "Joan", },
+                        new List<string> { "John", "Jonathan", "Jon", "Joan", }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(PropertyNamesTheoryData))]
+        public void PropertiesProperty_WithDefaultOrder_OrdersPropertyNamesAsProvided(
+            IEnumerable<string> originalNames,
+            IEnumerable<string> expectedNames)
+        {
+            // Arrange
+            var provider = new Mock<IModelMetadataProvider>(MockBehavior.Strict);
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+
+            var expectedProperties = new List<DefaultModelMetadata>();
+            foreach (var originalName in originalNames)
+            {
+                expectedProperties.Add(new DefaultModelMetadata(
+                    provider.Object,
+                    detailsProvider,
+                    new DefaultMetadataDetails(
+                        ModelMetadataIdentity.ForProperty(typeof(int), originalName, typeof(string)),
+                        attributes: new ModelAttributes(new object[0], new object[0], null))));
+            }
+
+            provider
+                .Setup(p => p.GetMetadataForProperties(typeof(string)))
+                .Returns(expectedProperties);
+
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null));
+
+            var metadata = new DefaultModelMetadata(provider.Object, detailsProvider, cache);
+
+            // Act
+            var properties = metadata.Properties;
+
+            // Assert
+            Assert.Equal(expectedNames.Count(), properties.Count);
+            Assert.Equal(expectedNames.ToArray(), properties.Select(p => p.PropertyName).ToArray());
+        }
+
+        // Input (original) property names, Order values, and expected (ordered) property names.
+        public static TheoryData<IEnumerable<KeyValuePair<string, int>>, IEnumerable<string>>
+            PropertyNamesAndOrdersTheoryData
+        {
+            get
+            {
+                return new TheoryData<IEnumerable<KeyValuePair<string, int>>, IEnumerable<string>>
+                {
+                    {
+                        new List<KeyValuePair<string, int>>
+                        {
+                            new KeyValuePair<string, int>("Property1", 23),
+                            new KeyValuePair<string, int>("Property2", 23),
+                            new KeyValuePair<string, int>("Property3", 23),
+                            new KeyValuePair<string, int>("Property4", 23),
+                        },
+                        new List<string> { "Property1", "Property2", "Property3", "Property4", }
+                    },
+                    // Same order if already ordered using Order.
+                    {
+                        new List<KeyValuePair<string, int>>
+                        {
+                            new KeyValuePair<string, int>("Property4", 23),
+                            new KeyValuePair<string, int>("Property3", 24),
+                            new KeyValuePair<string, int>("Property2", 25),
+                            new KeyValuePair<string, int>("Property1", 26),
+                        },
+                        new List<string> { "Property4", "Property3", "Property2", "Property1", }
+                    },
+                    // Rest of the orderings get updated within ModelMetadata.
+                    {
+                        new List<KeyValuePair<string, int>>
+                        {
+                            new KeyValuePair<string, int>("Property1", 26),
+                            new KeyValuePair<string, int>("Property2", 25),
+                            new KeyValuePair<string, int>("Property3", 24),
+                            new KeyValuePair<string, int>("Property4", 23),
+                        },
+                        new List<string> { "Property4", "Property3", "Property2", "Property1", }
+                    },
+                    {
+                        new List<KeyValuePair<string, int>>
+                        {
+                            new KeyValuePair<string, int>("Alpha", 26),
+                            new KeyValuePair<string, int>("Bravo", 24),
+                            new KeyValuePair<string, int>("Charlie", 23),
+                            new KeyValuePair<string, int>("Delta", 25),
+                        },
+                        new List<string> { "Charlie", "Bravo", "Delta", "Alpha", }
+                    },
+                    // Jonathan and Jon will not be reordered.
+                    {
+                        new List<KeyValuePair<string, int>>
+                        {
+                            new KeyValuePair<string, int>("Joan", 1),
+                            new KeyValuePair<string, int>("Jonathan", 0),
+                            new KeyValuePair<string, int>("Jon", 0),
+                            new KeyValuePair<string, int>("John", -1),
+                        },
+                        new List<string> { "John", "Jonathan", "Jon", "Joan", }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(PropertyNamesAndOrdersTheoryData))]
+        public void PropertiesProperty_OrdersPropertyNamesUsingOrder_ThenAsProvided(
+            IEnumerable<KeyValuePair<string, int>> originalNamesAndOrders,
+            IEnumerable<string> expectedNames)
+        {
+            // Arrange
+            var provider = new Mock<IModelMetadataProvider>(MockBehavior.Strict);
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+
+            var expectedProperties = new List<DefaultModelMetadata>();
+            foreach (var kvp in originalNamesAndOrders)
+            {
+                var propertyCache = new DefaultMetadataDetails(
+                        ModelMetadataIdentity.ForProperty(typeof(int), kvp.Key, typeof(string)),
+                        attributes: new ModelAttributes(new object[0], new object[0], null))
+                {
+                    DisplayMetadata = new DisplayMetadata(),
+                };
+
+                propertyCache.DisplayMetadata.Order = kvp.Value;
+
+                expectedProperties.Add(new DefaultModelMetadata(
+                    provider.Object,
+                    detailsProvider,
+                    propertyCache));
+            }
+
+            provider
+                .Setup(p => p.GetMetadataForProperties(typeof(string)))
+                .Returns(expectedProperties);
+
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null));
+
+            var metadata = new DefaultModelMetadata(provider.Object, detailsProvider, cache);
+
+            // Act
+            var properties = metadata.Properties;
+
+            // Assert
+            Assert.Equal(expectedNames.Count(), properties.Count);
+            Assert.Equal(expectedNames.ToArray(), properties.Select(p => p.PropertyName).ToArray());
+        }
+
+        [Fact]
+        public void PropertiesSetOnce()
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null));
+
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            // Act
+            var firstPropertiesEvaluation = metadata.Properties;
+            var secondPropertiesEvaluation = metadata.Properties;
+
+            // Assert
+            // Same IEnumerable<ModelMetadata> object.
+            Assert.Same(firstPropertiesEvaluation, secondPropertiesEvaluation);
+        }
+
+        [Fact]
+        public void PropertiesEnumerationEvaluatedOnce()
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null));
+
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            // Act
+            var firstPropertiesEvaluation = metadata.Properties.ToList();
+            var secondPropertiesEvaluation = metadata.Properties.ToList();
+
+            // Assert
+            // Identical ModelMetadata objects every time we run through the Properties collection.
+            Assert.Equal(firstPropertiesEvaluation, secondPropertiesEvaluation);
+        }
+
+        [Fact]
+        public void IsReadOnly_ReturnsFalse_ForType()
+        {
+            // Arrange
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+            var provider = new DefaultModelMetadataProvider(detailsProvider);
+
+            var key = ModelMetadataIdentity.ForType(typeof(int[]));
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null))
+            {
+                BindingMetadata = new BindingMetadata()
+                {
+                    IsReadOnly = true, // Will be ignored.
+                },
+            };
+
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            // Act
+            var isReadOnly = metadata.IsReadOnly;
+
+            // Assert
+            Assert.False(isReadOnly);
+        }
+
+        [Fact]
+        public void IsReadOnly_ReturnsTrue_ForPrivateSetProperty()
+        {
+            // Arrange
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+            var provider = new DefaultModelMetadataProvider(detailsProvider);
+
+            var key = ModelMetadataIdentity.ForType(typeof(TypeWithProperties));
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null));
+
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            // Act
+            var isReadOnly = metadata.Properties["PublicGetPrivateSetProperty"].IsReadOnly;
+
+            // Assert
+            Assert.True(isReadOnly);
+        }
+
+        [Fact]
+        public void IsReadOnly_ReturnsTrue_ForProtectedSetProperty()
+        {
+            // Arrange
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+            var provider = new DefaultModelMetadataProvider(detailsProvider);
+
+            var key = ModelMetadataIdentity.ForType(typeof(TypeWithProperties));
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null));
+
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            // Act
+            var isReadOnly = metadata.Properties["PublicGetProtectedSetProperty"].IsReadOnly;
+
+            // Assert
+            Assert.True(isReadOnly);
+        }
+
+        [Fact]
+        public void IsReadOnly_ReturnsFalse_ForPublicSetProperty()
+        {
+            // Arrange
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+            var provider = new DefaultModelMetadataProvider(detailsProvider);
+
+            var key = ModelMetadataIdentity.ForType(typeof(TypeWithProperties));
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null));
+
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            // Act
+            var isReadOnly = metadata.Properties["PublicGetPublicSetProperty"].IsReadOnly;
+
+            // Assert
+            Assert.False(isReadOnly);
+        }
+
+        [Theory]
+        [InlineData(typeof(int))] // Primitive
+        [InlineData(typeof(int?))] // Nullable
+        [InlineData(typeof(Guid))] // TypeConverter
+        [InlineData(typeof(Guid?))] // Nullable + TypeConverter
+        [InlineData(typeof(string))]
+        public void ValidateChildren_SimpleTypes(Type modelType)
+        {
+            // Arrange
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+            var provider = new DefaultModelMetadataProvider(detailsProvider);
+
+            var key = ModelMetadataIdentity.ForType(modelType);
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null));
+
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            // Act
+            var validateChildren = metadata.ValidateChildren;
+
+            // Assert
+            Assert.False(validateChildren);
+        }
+
+        [Theory]
+        [InlineData(typeof(int[]))]
+        [InlineData(typeof(List<decimal>))]
+        [InlineData(typeof(IEnumerable))]
+        [InlineData(typeof(Dictionary<string, string>))]
+        [InlineData(typeof(KeyValuePair<string, string>))]
+        [InlineData(typeof(KeyValuePair<string, string>?))]
+        [InlineData(typeof(TypeWithProperties))]
+        [InlineData(typeof(List<TypeWithProperties>))]
+        public void ValidateChildren_ComplexAndEnumerableTypes(Type modelType)
+        {
+            // Arrange
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+            var provider = new DefaultModelMetadataProvider(detailsProvider);
+
+            var key = ModelMetadataIdentity.ForType(modelType);
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null));
+
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            // Act
+            var validateChildren = metadata.ValidateChildren;
+
+            // Assert
+            Assert.True(validateChildren);
+        }
+
+        public static TheoryData<IPropertyValidationFilter> ValidationFilterData
+        {
+            get
+            {
+                return new TheoryData<IPropertyValidationFilter>
+                {
+                    null,
+                    new ValidateNeverAttribute(),
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidationFilterData))]
+        public void PropertyValidationFilter_ReflectsFilter_FromValidationMetadata(IPropertyValidationFilter value)
+        {
+            // Arrange
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+            var provider = new DefaultModelMetadataProvider(detailsProvider);
+
+            var key = ModelMetadataIdentity.ForType(typeof(int));
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null))
+            {
+                ValidationMetadata = new ValidationMetadata
+                {
+                    PropertyValidationFilter = value,
+                },
+            };
+
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            // Act
+            var validationFilter = metadata.PropertyValidationFilter;
+
+            // Assert
+            Assert.Same(value, validationFilter);
+        }
+
+        [Fact]
+        public void ValidateChildren_OverrideTrue()
+        {
+            // Arrange
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+            var provider = new DefaultModelMetadataProvider(detailsProvider);
+
+            var key = ModelMetadataIdentity.ForType(typeof(int));
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null))
+            {
+                ValidationMetadata = new ValidationMetadata()
+                {
+                    ValidateChildren = true,
+                },
+            };
+
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            // Act
+            var validateChildren = metadata.ValidateChildren;
+
+            // Assert
+            Assert.True(validateChildren);
+        }
+
+        [Fact]
+        public void ValidateChildren_OverrideFalse()
+        {
+            // Arrange
+            var detailsProvider = new EmptyCompositeMetadataDetailsProvider();
+            var provider = new DefaultModelMetadataProvider(detailsProvider);
+
+            var key = ModelMetadataIdentity.ForType(typeof(XmlDocument));
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null))
+            {
+                ValidationMetadata = new ValidationMetadata()
+                {
+                    ValidateChildren = false,
+                },
+            };
+
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+
+            // Act
+            var validateChildren = metadata.ValidateChildren;
+
+            // Assert
+            Assert.False(validateChildren);
+        }
+
+        [Fact]
+        public void GetMetadataForType_CallsProvider()
+        {
+            // Arrange
+            var detailsProvider = new Mock<ICompositeMetadataDetailsProvider>();
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null));
+            var metadataProvider = new Mock<IModelMetadataProvider>();
+            metadataProvider
+                .Setup(mp => mp.GetMetadataForType(typeof(string)))
+                .Verifiable();
+            var metadata1 = new DefaultModelMetadata(metadataProvider.Object, detailsProvider.Object, cache);
+
+            // Act
+            var metadata2 = metadata1.GetMetadataForType(typeof(string));
+
+            // Assert
+            metadataProvider.VerifyAll();
+        }
+
+        [Fact]
+        public void GetMetadataForProperties_CallsProvider()
+        {
+            // Arrange
+            var detailsProvider = new Mock<ICompositeMetadataDetailsProvider>();
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0], null, null));
+            var metadataProvider = new Mock<IModelMetadataProvider>();
+            metadataProvider
+                .Setup(mp => mp.GetMetadataForProperties(typeof(Exception)))
+                .Verifiable();
+            var metadata1 = new DefaultModelMetadata(metadataProvider.Object, detailsProvider.Object, cache);
+
+            // Act
+            var metadata2 = metadata1.GetMetadataForProperties(typeof(Exception));
+
+            // Assert
+            metadataProvider.VerifyAll();
+        }
+
+        private void ActionMethod(string input)
+        {
+        }
+
+        private class TypeWithProperties
+        {
+            public string PublicGetPrivateSetProperty { get; private set; }
+
+            public int PublicGetProtectedSetProperty { get; protected set; }
+
+            public int PublicGetPublicSetProperty { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultValidationMetadataProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultValidationMetadataProviderTest.cs
new file mode 100644
index 0000000000..d7299a1a3b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultValidationMetadataProviderTest.cs
@@ -0,0 +1,210 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    public class DefaultValidationMetadataProviderTest
+    {
+        [Fact]
+        public void PropertyValidationFilter_ShouldValidateEntry_False_IfPropertyHasValidateNever()
+        {
+            // Arrange
+            var provider = new DefaultValidationMetadataProvider();
+
+            var attributes = new Attribute[] { new ValidateNeverAttribute() };
+            var key = ModelMetadataIdentity.ForProperty(typeof(int), "Length", typeof(string));
+            var context = new ValidationMetadataProviderContext(key, new ModelAttributes(new object[0], attributes, null));
+
+            // Act
+            provider.CreateValidationMetadata(context);
+
+            // Assert
+            Assert.NotNull(context.ValidationMetadata.PropertyValidationFilter);
+            Assert.False(context.ValidationMetadata.PropertyValidationFilter.ShouldValidateEntry(
+                new ValidationEntry(),
+                new ValidationEntry()));
+        }
+
+        [Fact]
+        public void PropertyValidationFilter_Null_IfPropertyHasValidateNeverOnItsType()
+        {
+            // Arrange
+            var provider = new DefaultValidationMetadataProvider();
+
+            var attributes = new Attribute[] { new ValidateNeverAttribute() };
+            var key = ModelMetadataIdentity.ForProperty(typeof(int), "Length", typeof(string));
+            var context = new ValidationMetadataProviderContext(key, new ModelAttributes(attributes, new object[0], null));
+
+            // Act
+            provider.CreateValidationMetadata(context);
+
+            // Assert
+            Assert.Null(context.ValidationMetadata.PropertyValidationFilter);
+        }
+
+        [Fact]
+        public void PropertyValidationFilter_Null_ForType()
+        {
+            // Arrange
+            var provider = new DefaultValidationMetadataProvider();
+
+            var attributes = new Attribute[] { new ValidateNeverAttribute() };
+            var key = ModelMetadataIdentity.ForType(typeof(ValidateNeverClass));
+            var context = new ValidationMetadataProviderContext(key, new ModelAttributes(attributes, null, null));
+
+            // Act
+            provider.CreateValidationMetadata(context);
+
+            // Assert
+            Assert.Null(context.ValidationMetadata.PropertyValidationFilter);
+        }
+
+        [Fact]
+        public void PropertyValidationFilter_ShouldValidateEntry_False_IfContainingTypeHasValidateNever()
+        {
+            // Arrange
+            var provider = new DefaultValidationMetadataProvider();
+
+            var key = ModelMetadataIdentity.ForProperty(
+                typeof(string),
+                nameof(ValidateNeverClass.ClassName),
+                typeof(ValidateNeverClass));
+            var context = new ValidationMetadataProviderContext(key, new ModelAttributes(new object[0], new object[0], null));
+
+            // Act
+            provider.CreateValidationMetadata(context);
+
+            // Assert
+            Assert.NotNull(context.ValidationMetadata.PropertyValidationFilter);
+            Assert.False(context.ValidationMetadata.PropertyValidationFilter.ShouldValidateEntry(
+                new ValidationEntry(),
+                new ValidationEntry()));
+        }
+
+        [Fact]
+        public void PropertyValidationFilter_ShouldValidateEntry_False_IfContainingTypeInheritsValidateNever()
+        {
+            // Arrange
+            var provider = new DefaultValidationMetadataProvider();
+
+            var key = ModelMetadataIdentity.ForProperty(
+                typeof(string),
+                nameof(ValidateNeverSubclass.SubclassName),
+                typeof(ValidateNeverSubclass));
+            var context = new ValidationMetadataProviderContext(key, new ModelAttributes(new object[0], new object[0], null));
+
+            // Act
+            provider.CreateValidationMetadata(context);
+
+            // Assert
+            Assert.NotNull(context.ValidationMetadata.PropertyValidationFilter);
+            Assert.False(context.ValidationMetadata.PropertyValidationFilter.ShouldValidateEntry(
+                new ValidationEntry(),
+                new ValidationEntry()));
+        }
+
+        [Fact]
+        public void GetValidationDetails_MarkedWithClientValidator_ReturnsValidator()
+        {
+            // Arrange
+            var provider = new DefaultValidationMetadataProvider();
+
+            var attribute = new TestClientModelValidationAttribute();
+            var attributes = new Attribute[] { attribute };
+            var key = ModelMetadataIdentity.ForProperty(typeof(int), "Length", typeof(string));
+            var context = new ValidationMetadataProviderContext(key, new ModelAttributes(new object[0], attributes, null));
+
+            // Act
+            provider.CreateValidationMetadata(context);
+
+            // Assert
+            var validatorMetadata = Assert.Single(context.ValidationMetadata.ValidatorMetadata);
+            Assert.Same(attribute, validatorMetadata);
+        }
+
+        [Fact]
+        public void GetValidationDetails_MarkedWithModelValidator_ReturnsValidator()
+        {
+            // Arrange
+            var provider = new DefaultValidationMetadataProvider();
+
+            var attribute = new TestModelValidationAttribute();
+            var attributes = new Attribute[] { attribute };
+            var key = ModelMetadataIdentity.ForProperty(typeof(int), "Length", typeof(string));
+            var context = new ValidationMetadataProviderContext(key, new ModelAttributes(new object[0], attributes, null));
+
+            // Act
+            provider.CreateValidationMetadata(context);
+
+            // Assert
+            var validatorMetadata = Assert.Single(context.ValidationMetadata.ValidatorMetadata);
+            Assert.Same(attribute, validatorMetadata);
+        }
+
+        [Fact]
+        public void GetValidationDetails_Validator_AlreadyInContext_Ignores()
+        {
+            // Arrange
+            var provider = new DefaultValidationMetadataProvider();
+
+            var attribute = new TestValidationAttribute();
+            var attributes = new Attribute[] { attribute };
+            var key = ModelMetadataIdentity.ForProperty(typeof(int), "Length", typeof(string));
+            var context = new ValidationMetadataProviderContext(key, new ModelAttributes(new object[0], attributes, null));
+            context.ValidationMetadata.ValidatorMetadata.Add(attribute);
+
+            // Act
+            provider.CreateValidationMetadata(context);
+
+            // Assert
+            var validatorMetadata = Assert.Single(context.ValidationMetadata.ValidatorMetadata);
+            Assert.Same(attribute, validatorMetadata);
+        }
+
+        [ValidateNever]
+        private class ValidateNeverClass
+        {
+            public string ClassName { get; set; }
+        }
+
+        private class ValidateNeverSubclass : ValidateNeverClass
+        {
+            public string SubclassName { get; set; }
+        }
+
+        private class TestModelValidationAttribute : Attribute, IModelValidator
+        {
+            public IEnumerable<ModelValidationResult> Validate(ModelValidationContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class TestClientModelValidationAttribute : Attribute, IClientModelValidator
+        {
+            public void AddValidation(ClientModelValidationContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class TestValidationAttribute : Attribute, IModelValidator, IClientModelValidator
+        {
+            public void AddValidation(ClientModelValidationContext context)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IEnumerable<ModelValidationResult> Validate(ModelValidationContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DisplayMetadataTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DisplayMetadataTest.cs
new file mode 100644
index 0000000000..b576b3ede9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DisplayMetadataTest.cs
@@ -0,0 +1,178 @@
+// 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.
+
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    public class DisplayMetadataTest
+    {
+        [Fact]
+        public void DisplayFormatString_AffectsBothDisplayFormatProperties()
+        {
+            // Arrange
+            var displayMetadata = new DisplayMetadata();
+
+            // Act
+            displayMetadata.DisplayFormatString = "expected string";
+
+            // Assert
+            Assert.Equal("expected string", displayMetadata.DisplayFormatString);
+            Assert.Equal("expected string", displayMetadata.DisplayFormatStringProvider());
+        }
+
+        [Fact]
+        public void DisplayFormatStringProvider_AffectsBothDisplayFormatProperties()
+        {
+            // Arrange
+            var displayMetadata = new DisplayMetadata();
+
+            // Act
+            displayMetadata.DisplayFormatStringProvider = () => "expected string";
+
+            // Assert
+            Assert.Equal("expected string", displayMetadata.DisplayFormatString);
+            Assert.Equal("expected string", displayMetadata.DisplayFormatStringProvider());
+        }
+
+        [Fact]
+        public void DisplayFormatString_LastSettingWins()
+        {
+            // Arrange
+            var displayMetadata = new DisplayMetadata();
+
+            // Act 1
+            displayMetadata.DisplayFormatString = "first string";
+
+            // Assert 1
+            Assert.Equal("first string", displayMetadata.DisplayFormatString);
+            Assert.Equal("first string", displayMetadata.DisplayFormatStringProvider());
+
+            // Act 2
+            displayMetadata.DisplayFormatStringProvider = () => "second string";
+
+            // Assert 2
+            Assert.Equal("second string", displayMetadata.DisplayFormatString);
+            Assert.Equal("second string", displayMetadata.DisplayFormatStringProvider());
+
+            // Act 3
+            displayMetadata.DisplayFormatString = "third string";
+
+            // Assert 3
+            Assert.Equal("third string", displayMetadata.DisplayFormatString);
+            Assert.Equal("third string", displayMetadata.DisplayFormatStringProvider());
+        }
+
+        [Fact]
+        public void EditFormatString_AffectsBothEditFormatProperties()
+        {
+            // Arrange
+            var displayMetadata = new DisplayMetadata();
+
+            // Act
+            displayMetadata.EditFormatString = "expected string";
+
+            // Assert
+            Assert.Equal("expected string", displayMetadata.EditFormatString);
+            Assert.Equal("expected string", displayMetadata.EditFormatStringProvider());
+        }
+
+        [Fact]
+        public void EditFormatStringProvider_AffectsBothEditFormatProperties()
+        {
+            // Arrange
+            var displayMetadata = new DisplayMetadata();
+
+            // Act
+            displayMetadata.EditFormatStringProvider = () => "expected string";
+
+            // Assert
+            Assert.Equal("expected string", displayMetadata.EditFormatString);
+            Assert.Equal("expected string", displayMetadata.EditFormatStringProvider());
+        }
+
+        [Fact]
+        public void EditFormatString_LastSettingWins()
+        {
+            // Arrange
+            var displayMetadata = new DisplayMetadata();
+
+            // Act 1
+            displayMetadata.EditFormatString = "first string";
+
+            // Assert 1
+            Assert.Equal("first string", displayMetadata.EditFormatString);
+            Assert.Equal("first string", displayMetadata.EditFormatStringProvider());
+
+            // Act 2
+            displayMetadata.EditFormatStringProvider = () => "second string";
+
+            // Assert 2
+            Assert.Equal("second string", displayMetadata.EditFormatString);
+            Assert.Equal("second string", displayMetadata.EditFormatStringProvider());
+
+            // Act 3
+            displayMetadata.EditFormatString = "third string";
+
+            // Assert 3
+            Assert.Equal("third string", displayMetadata.EditFormatString);
+            Assert.Equal("third string", displayMetadata.EditFormatStringProvider());
+        }
+
+        [Fact]
+        public void NullDisplayText_AffectsBothNullDisplayProperties()
+        {
+            // Arrange
+            var displayMetadata = new DisplayMetadata();
+
+            // Act
+            displayMetadata.NullDisplayText = "expected string";
+
+            // Assert
+            Assert.Equal("expected string", displayMetadata.NullDisplayText);
+            Assert.Equal("expected string", displayMetadata.NullDisplayTextProvider());
+        }
+
+        [Fact]
+        public void NullDisplayTextProvider_AffectsBothNullDisplayProperties()
+        {
+            // Arrange
+            var displayMetadata = new DisplayMetadata();
+
+            // Act
+            displayMetadata.NullDisplayTextProvider = () => "expected string";
+
+            // Assert
+            Assert.Equal("expected string", displayMetadata.NullDisplayText);
+            Assert.Equal("expected string", displayMetadata.NullDisplayTextProvider());
+        }
+
+        [Fact]
+        public void NullDisplayText_LastSettingWins()
+        {
+            // Arrange
+            var displayMetadata = new DisplayMetadata();
+
+            // Act 1
+            displayMetadata.NullDisplayText = "first string";
+
+            // Assert 1
+            Assert.Equal("first string", displayMetadata.NullDisplayText);
+            Assert.Equal("first string", displayMetadata.NullDisplayTextProvider());
+
+            // Act 2
+            displayMetadata.NullDisplayTextProvider = () => "second string";
+
+            // Assert 2
+            Assert.Equal("second string", displayMetadata.NullDisplayText);
+            Assert.Equal("second string", displayMetadata.NullDisplayTextProvider());
+
+            // Act 3
+            displayMetadata.NullDisplayText = "third string";
+
+            // Assert 3
+            Assert.Equal("third string", displayMetadata.NullDisplayText);
+            Assert.Equal("third string", displayMetadata.NullDisplayTextProvider());
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/EmptyCompositeMetadataDetailsProvider.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/EmptyCompositeMetadataDetailsProvider.cs
new file mode 100644
index 0000000000..394a55c6fa
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/EmptyCompositeMetadataDetailsProvider.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    public class EmptyCompositeMetadataDetailsProvider : DefaultCompositeMetadataDetailsProvider
+    {
+        public EmptyCompositeMetadataDetailsProvider()
+            : base(new IMetadataDetailsProvider[0])
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ExcludeBindingMetadataProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ExcludeBindingMetadataProviderTest.cs
new file mode 100644
index 0000000000..8d2e6d10f3
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ExcludeBindingMetadataProviderTest.cs
@@ -0,0 +1,63 @@
+// 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.
+
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    public class ExcludeBindingMetadataProviderTest
+    {
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void IsBindingAllowed_LeftAlone_WhenTypeDoesntMatch(bool initialValue)
+        {
+            // Arrange
+            var provider = new ExcludeBindingMetadataProvider(typeof(string));
+
+            var key = ModelMetadataIdentity.ForProperty(
+                typeof(int),
+                nameof(Person.Age),
+                typeof(Person));
+
+            var context = new BindingMetadataProviderContext(key, new ModelAttributes(new object[0], new object[0], null));
+
+            context.BindingMetadata.IsBindingAllowed = initialValue;
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.Equal(initialValue, context.BindingMetadata.IsBindingAllowed);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void IsBindingAllowed_IsFalse_WhenTypeMatches(bool initialValue)
+        {
+            // Arrange
+            var provider = new ExcludeBindingMetadataProvider(typeof(int));
+
+            var key = ModelMetadataIdentity.ForProperty(
+                typeof(int),
+                nameof(Person.Age),
+                typeof(Person));
+
+            var context = new BindingMetadataProviderContext(key, new ModelAttributes(new object[0], new object[0], null));
+
+            context.BindingMetadata.IsBindingAllowed = initialValue;
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.False(context.BindingMetadata.IsBindingAllowed);
+        }
+
+        private class Person
+        {
+            public int Age { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/MetadataDetailsProviderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/MetadataDetailsProviderExtensionsTest.cs
new file mode 100644
index 0000000000..5a5254d004
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/MetadataDetailsProviderExtensionsTest.cs
@@ -0,0 +1,57 @@
+// 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.
+
+using System.Collections.Generic;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+{
+    public class MetadataDetailsProviderExtensionsTest
+    {
+        [Fact]
+        public void RemoveType_RemovesAllOfType()
+        {
+            // Arrange
+            var list = new List<IMetadataDetailsProvider>
+            {
+                new FooMetadataDetailsProvider(),
+                new BarMetadataDetailsProvider(),
+                new FooMetadataDetailsProvider()
+            };
+
+            // Act
+            list.RemoveType(typeof(FooMetadataDetailsProvider));
+
+            // Assert
+            var provider = Assert.Single(list);
+            Assert.IsType<BarMetadataDetailsProvider>(provider);
+        }
+
+        [Fact]
+        public void GenericRemoveType_RemovesAllOfType()
+        {
+            // Arrange
+            var list = new List<IMetadataDetailsProvider>
+            {
+                new FooMetadataDetailsProvider(),
+                new BarMetadataDetailsProvider(),
+                new FooMetadataDetailsProvider()
+            };
+
+            // Act
+            list.RemoveType<FooMetadataDetailsProvider>();
+
+            // Assert
+            var provider = Assert.Single(list);
+            Assert.IsType<BarMetadataDetailsProvider>(provider);
+        }
+
+        private class FooMetadataDetailsProvider : IMetadataDetailsProvider
+        {
+        }
+
+        private class BarMetadataDetailsProvider : IMetadataDetailsProvider
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelAttributesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelAttributesTest.cs
new file mode 100644
index 0000000000..3174e0110d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelAttributesTest.cs
@@ -0,0 +1,406 @@
+// 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.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Reflection;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class ModelAttributesTest
+    {
+        [Fact]
+        public void GetAttributesForBaseProperty_IncludesMetadataAttributes()
+        {
+            // Arrange
+            var modelType = typeof(BaseViewModel);
+            var property = modelType.GetRuntimeProperties().FirstOrDefault(p => p.Name == nameof(BaseModel.BaseProperty));
+
+            // Act
+            var attributes = ModelAttributes.GetAttributesForProperty(modelType, property);
+
+            // Assert
+            Assert.Single(attributes.Attributes.OfType<RequiredAttribute>());
+            Assert.Single(attributes.Attributes.OfType<StringLengthAttribute>());
+
+            Assert.Single(attributes.PropertyAttributes.OfType<RequiredAttribute>());
+            Assert.Single(attributes.PropertyAttributes.OfType<StringLengthAttribute>());
+        }
+
+        [Fact]
+        public void GetAttributesForTestProperty_ModelOverridesMetadataAttributes()
+        {
+            // Arrange
+            var modelType = typeof(BaseViewModel);
+            var property = modelType.GetRuntimeProperties().FirstOrDefault(p => p.Name == nameof(BaseModel.TestProperty));
+
+            // Act
+            var attributes = ModelAttributes.GetAttributesForProperty(modelType, property);
+
+            // Assert
+            var rangeAttributes = attributes.Attributes.OfType<RangeAttribute>().ToArray();
+            Assert.NotNull(rangeAttributes[0]);
+            Assert.Equal(0, (int)rangeAttributes[0].Minimum);
+            Assert.Equal(10, (int)rangeAttributes[0].Maximum);
+            Assert.NotNull(rangeAttributes[1]);
+            Assert.Equal(10, (int)rangeAttributes[1].Minimum);
+            Assert.Equal(100, (int)rangeAttributes[1].Maximum);
+            Assert.Single(attributes.Attributes.OfType<FromHeaderAttribute>());
+
+            rangeAttributes = attributes.PropertyAttributes.OfType<RangeAttribute>().ToArray();
+            Assert.NotNull(rangeAttributes[0]);
+            Assert.Equal(0, (int)rangeAttributes[0].Minimum);
+            Assert.Equal(10, (int)rangeAttributes[0].Maximum);
+            Assert.NotNull(rangeAttributes[1]);
+            Assert.Equal(10, (int)rangeAttributes[1].Minimum);
+            Assert.Equal(100, (int)rangeAttributes[1].Maximum);
+            Assert.Single(attributes.PropertyAttributes.OfType<FromHeaderAttribute>());
+        }
+
+        [Fact]
+        public void GetAttributesForBasePropertyFromDerivedModel_IncludesMetadataAttributes()
+        {
+            // Arrange
+            var modelType = typeof(DerivedViewModel);
+            var property = modelType.GetRuntimeProperties().FirstOrDefault(p => p.Name == nameof(BaseModel.BaseProperty));
+
+            // Act
+            var attributes = ModelAttributes.GetAttributesForProperty(modelType, property);
+
+            // Assert
+            Assert.Single(attributes.Attributes.OfType<RequiredAttribute>());
+            Assert.Single(attributes.Attributes.OfType<StringLengthAttribute>());
+
+            Assert.Single(attributes.PropertyAttributes.OfType<RequiredAttribute>());
+            Assert.Single(attributes.PropertyAttributes.OfType<StringLengthAttribute>());
+        }
+
+        [Fact]
+        public void GetAttributesForTestPropertyFromDerived_IncludesMetadataAttributes()
+        {
+            // Arrange
+            var modelType = typeof(DerivedViewModel);
+            var property = modelType.GetRuntimeProperties().FirstOrDefault(p => p.Name == nameof(BaseModel.TestProperty));
+
+            // Act
+            var attributes = ModelAttributes.GetAttributesForProperty(modelType, property);
+
+            // Assert
+            Assert.Single(attributes.Attributes.OfType<RequiredAttribute>());
+            Assert.Single(attributes.Attributes.OfType<StringLengthAttribute>());
+            Assert.DoesNotContain(typeof(RangeAttribute), attributes.Attributes);
+
+            Assert.Single(attributes.PropertyAttributes.OfType<RequiredAttribute>());
+            Assert.Single(attributes.PropertyAttributes.OfType<StringLengthAttribute>());
+            Assert.DoesNotContain(typeof(RangeAttribute), attributes.PropertyAttributes);
+        }
+
+        [Fact]
+        public void GetAttributesForVirtualPropertyFromDerived_IncludesMetadataAttributes()
+        {
+            // Arrange
+            var modelType = typeof(DerivedViewModel);
+            var property = modelType.GetRuntimeProperties().FirstOrDefault(p => p.Name == nameof(BaseModel.VirtualProperty));
+
+            // Act
+            var attributes = ModelAttributes.GetAttributesForProperty(modelType, property);
+
+            // Assert
+            Assert.Single(attributes.Attributes.OfType<RequiredAttribute>());
+            Assert.Single(attributes.Attributes.OfType<RangeAttribute>());
+
+            Assert.Single(attributes.PropertyAttributes.OfType<RequiredAttribute>());
+            Assert.Single(attributes.PropertyAttributes.OfType<RangeAttribute>());
+        }
+
+        [Fact]
+        public void GetFromServiceAttributeFromBase_IncludesMetadataAttributes()
+        {
+            // Arrange
+            var modelType = typeof(DerivedViewModel);
+            var property = modelType.GetRuntimeProperties().FirstOrDefault(p => p.Name == nameof(BaseModel.RouteValue));
+
+            // Act
+            var attributes = ModelAttributes.GetAttributesForProperty(modelType, property);
+
+            // Assert
+            Assert.Single(attributes.Attributes.OfType<RequiredAttribute>());
+            Assert.Single(attributes.Attributes.OfType<FromRouteAttribute>());
+
+            Assert.Single(attributes.PropertyAttributes.OfType<RequiredAttribute>());
+            Assert.Single(attributes.PropertyAttributes.OfType<FromRouteAttribute>());
+        }
+
+        [Fact]
+        public void GetAttributesForType_IncludesMetadataAttributes()
+        {
+            // Arrange & Act
+            var attributes = ModelAttributes.GetAttributesForType(typeof(BaseViewModel));
+
+            // Assert
+            Assert.Single(attributes.Attributes.OfType<ClassValidator>());
+
+            Assert.Single(attributes.TypeAttributes.OfType<ClassValidator>());
+        }
+
+        [Fact]
+        public void GetAttributesForType_PropertyAttributes_IsNull()
+        {
+            // Arrange & Act
+            var attributes = ModelAttributes.GetAttributesForType(typeof(BaseViewModel));
+
+            // Assert
+            Assert.Null(attributes.PropertyAttributes);
+        }
+
+        [Fact]
+        public void GetAttributesForProperty_MergedAttributes()
+        {
+            // Arrange
+            var property = typeof(MergedAttributes).GetRuntimeProperty(nameof(MergedAttributes.Property));
+
+            // Act
+            var attributes = ModelAttributes.GetAttributesForProperty(typeof(MergedAttributes), property);
+
+            // Assert
+            Assert.Equal(3, attributes.Attributes.Count);
+            Assert.IsType<RequiredAttribute>(attributes.Attributes[0]);
+            Assert.IsType<RangeAttribute>(attributes.Attributes[1]);
+            Assert.IsType<ClassValidator>(attributes.Attributes[2]);
+
+            Assert.Equal(2, attributes.PropertyAttributes.Count);
+            Assert.IsType<RequiredAttribute>(attributes.PropertyAttributes[0]);
+            Assert.IsType<RangeAttribute>(attributes.PropertyAttributes[1]);
+
+            var attribute = Assert.Single(attributes.TypeAttributes);
+            Assert.IsType<ClassValidator>(attribute);
+        }
+
+        [Fact]
+        public void GetAttributesForParameter_NoAttributes()
+        {
+            // Arrange & Act
+            var attributes = ModelAttributes.GetAttributesForParameter(
+                typeof(MethodWithParamAttributesType)
+                    .GetMethod(nameof(MethodWithParamAttributesType.Method))
+                    .GetParameters()[0]);
+
+            // Assert
+            // Not exactly "no attributes" due to SerializableAttribute on object.
+            Assert.IsType<SerializableAttribute>(Assert.Single(attributes.Attributes));
+            Assert.Empty(attributes.ParameterAttributes);
+            Assert.Null(attributes.PropertyAttributes);
+            Assert.Equal(attributes.Attributes, attributes.TypeAttributes);
+        }
+
+        [Fact]
+        public void GetAttributesForParameter_SomeAttributes()
+        {
+            // Arrange & Act
+            var attributes = ModelAttributes.GetAttributesForParameter(
+                typeof(MethodWithParamAttributesType)
+                    .GetMethod(nameof(MethodWithParamAttributesType.Method))
+                    .GetParameters()[1]);
+
+            // Assert
+            Assert.Collection(
+                // Take(2) to ignore ComVisibleAttribute, SerializableAttribute, ... on int.
+                attributes.Attributes.Take(2),
+                attribute => Assert.IsType<RequiredAttribute>(attribute),
+                attribute => Assert.IsType<RangeAttribute>(attribute));
+            Assert.Collection(
+                attributes.ParameterAttributes,
+                attribute => Assert.IsType<RequiredAttribute>(attribute),
+                attribute => Assert.IsType<RangeAttribute>(attribute));
+            Assert.Null(attributes.PropertyAttributes);
+            Assert.Collection(
+                // Take(1) because the attribute or attributes after SerializableAttribute are framework-specific.
+                attributes.TypeAttributes.Take(1),
+                attribute => Assert.IsType<SerializableAttribute>(attribute));
+        }
+
+        [Fact]
+        public void GetAttributesForParameter_IncludesTypeAttributes()
+        {
+            // Arrange
+            var parameters = typeof(MethodWithParamAttributesType)
+                .GetMethod(nameof(MethodWithParamAttributesType.Method))
+                .GetParameters();
+
+            // Act
+            var attributes = ModelAttributes.GetAttributesForParameter(parameters[2]);
+
+            // Assert
+            Assert.Collection(attributes.Attributes,
+                attribute => Assert.IsType<BindRequiredAttribute>(attribute),
+                attribute => Assert.IsType<ClassValidator>(attribute));
+            Assert.IsType<BindRequiredAttribute>(Assert.Single(attributes.ParameterAttributes));
+            Assert.Null(attributes.PropertyAttributes);
+            Assert.IsType<ClassValidator>(Assert.Single(attributes.TypeAttributes));
+        }
+
+        [Fact]
+        public void GetAttributesForParameter_WithModelType_IncludesTypeAttributes()
+        {
+            // Arrange
+            var parameters = typeof(MethodWithParamAttributesType)
+                .GetMethod(nameof(MethodWithParamAttributesType.Method))
+                .GetParameters();
+
+            // Act
+            var attributes = ModelAttributes.GetAttributesForParameter(parameters[2], typeof(DerivedModelWithAttributes));
+
+            // Assert
+            Assert.Collection(
+                attributes.Attributes,
+                attribute => Assert.IsType<BindRequiredAttribute>(attribute),
+                attribute => Assert.IsType<ModelBinderAttribute>(attribute),
+                attribute => Assert.IsType<ClassValidator>(attribute));
+            Assert.IsType<BindRequiredAttribute>(Assert.Single(attributes.ParameterAttributes));
+            Assert.Null(attributes.PropertyAttributes);
+            Assert.Collection(
+                attributes.TypeAttributes,
+                attribute => Assert.IsType<ModelBinderAttribute>(attribute),
+                attribute => Assert.IsType<ClassValidator>(attribute));
+        }
+
+        [Fact]
+        public void GetAttributesForProperty_WithModelType_IncludesTypeAttributes()
+        {
+            // Arrange
+            var property = typeof(MergedAttributes)
+                .GetProperty(nameof(MergedAttributes.BaseModel));
+
+            // Act
+            var attributes = ModelAttributes.GetAttributesForProperty(typeof(MergedAttributes), property, typeof(DerivedModelWithAttributes));
+
+            // Assert
+            Assert.Collection(
+                attributes.Attributes,
+                attribute => Assert.IsType<BindRequiredAttribute>(attribute),
+                attribute => Assert.IsType<ModelBinderAttribute>(attribute),
+                attribute => Assert.IsType<ClassValidator>(attribute));
+            Assert.IsType<BindRequiredAttribute>(Assert.Single(attributes.PropertyAttributes));
+            Assert.Null(attributes.ParameterAttributes);
+            Assert.Collection(
+                attributes.TypeAttributes,
+                attribute => Assert.IsType<ModelBinderAttribute>(attribute),
+                attribute => Assert.IsType<ClassValidator>(attribute));
+        }
+
+        [ClassValidator]
+        private class BaseModel
+        {
+            [StringLength(10)]
+            public string BaseProperty { get; set; }
+
+            [Range(10,100)]
+            [FromHeader]
+            public string TestProperty { get; set; }
+
+            [Required]
+            public virtual int VirtualProperty { get; set; }
+
+            [FromRoute]
+            public string RouteValue { get; set; }
+        }
+
+        private class DerivedModel : BaseModel
+        {
+            [Required]
+            public string DerivedProperty { get; set; }
+
+            [Required]
+            public new string TestProperty { get; set; }
+
+            [Range(10,100)]
+            public override int VirtualProperty { get; set; }
+
+        }
+
+        [ModelBinder(Name = "Custom")]
+        private class DerivedModelWithAttributes : BaseModel
+        {
+        }
+
+        [ModelMetadataType(typeof(BaseModel))]
+        private class BaseViewModel
+        {
+            [Range(0,10)]
+            public string TestProperty { get; set; }
+
+            [Required]
+            public string BaseProperty { get; set; }
+
+            [Required]
+            public string RouteValue { get; set; }
+        }
+
+        [ModelMetadataType(typeof(DerivedModel))]
+        private class DerivedViewModel : BaseViewModel
+        {
+            [StringLength(2)]
+            public new string TestProperty { get; set; }
+
+            public int VirtualProperty { get; set; }
+
+        }
+
+        public interface ICalculator
+        {
+            int Operation(char @operator, int left, int right);
+        }
+
+        private class ClassValidator : ValidationAttribute
+        {
+            public override bool IsValid(object value)
+            {
+                return true;
+            }
+        }
+
+        [ModelMetadataType(typeof(MergedAttributesMetadata))]
+        private class MergedAttributes
+        {
+            [Required]
+            public PropertyType Property { get; set; }
+
+            [BindRequired]
+            public BaseModel BaseModel { get; set; }
+        }
+
+        private class MergedAttributesMetadata
+        {
+            [Range(0, 10)]
+            public MetadataPropertyType Property { get; set; }
+        }
+
+        [ClassValidator]
+        private class PropertyType
+        {
+        }
+
+        [Bind]
+        private class MetadataPropertyType
+        {
+        }
+
+        [IrrelevantAttribute] // We verify this is ignored
+        private class MethodWithParamAttributesType
+        {
+            [IrrelevantAttribute] // We verify this is ignored
+            public void Method(
+                object noAttributes,
+                [Required, Range(1, 100)] int validationAttributes,
+                [BindRequired] BaseModel mergedAttributes)
+            {
+            }
+        }
+
+        private class IrrelevantAttribute : Attribute
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelBinderAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelBinderAttributeTest.cs
new file mode 100644
index 0000000000..34fafaec5a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelBinderAttributeTest.cs
@@ -0,0 +1,57 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class ModelBinderAttributeTest
+    {
+        [Fact]
+        public void NoBinderType_NoBindingSource()
+        {
+            // Arrange
+            var attribute = new ModelBinderAttribute();
+
+            // Act
+            var source = attribute.BindingSource;
+
+            // Assert
+            Assert.Null(source);
+        }
+
+        [Fact]
+        public void BinderType_DefaultCustomBindingSource()
+        {
+            // Arrange
+            var attribute = new ModelBinderAttribute();
+            attribute.BinderType = typeof(ByteArrayModelBinder);
+
+            // Act
+            var source = attribute.BindingSource;
+
+            // Assert
+            Assert.Equal(BindingSource.Custom, source);
+        }
+
+        [Fact]
+        public void BinderType_SettingBindingSource_OverridesDefaultCustomBindingSource()
+        {
+            // Arrange
+            var attribute = new FromQueryModelBinderAttribute();
+            attribute.BinderType = typeof(ByteArrayModelBinder);
+
+            // Act
+            var source = attribute.BindingSource;
+
+            // Assert
+            Assert.Equal(BindingSource.Query, source);
+        }
+
+        private class FromQueryModelBinderAttribute : ModelBinderAttribute
+        {
+            public override BindingSource BindingSource => BindingSource.Query;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelMetadataProviderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelMetadataProviderExtensionsTest.cs
new file mode 100644
index 0000000000..101a2433dd
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelMetadataProviderExtensionsTest.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class ModelMetadataProviderExtensionsTest
+    {
+        [Fact]
+        public void GetMetadataForPropertyInvalidPropertyNameThrows()
+        {
+            // Arrange
+            var provider = (IModelMetadataProvider)new EmptyModelMetadataProvider();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => provider.GetMetadataForProperty(typeof(object), propertyName: "BadPropertyName"),
+                "propertyName",
+                "The property System.Object.BadPropertyName could not be found.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBinderFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBinderFactoryTest.cs
new file mode 100644
index 0000000000..58a2d9a841
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBinderFactoryTest.cs
@@ -0,0 +1,686 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class ModelBinderFactoryTest
+    {
+        [Fact]
+        public void CreateBinder_Throws_WhenNoProviders()
+        {
+            // Arrange
+            var expected = $"'{typeof(MvcOptions).FullName}.{nameof(MvcOptions.ModelBinderProviders)}' must not be " +
+                $"empty. At least one '{typeof(IModelBinderProvider).FullName}' is required to model bind.";
+            var metadataProvider = new TestModelMetadataProvider();
+            var options = Options.Create(new MvcOptions());
+            var factory = new ModelBinderFactory(
+                metadataProvider,
+                options,
+                GetServices());
+            var context = new ModelBinderFactoryContext()
+            {
+                Metadata = metadataProvider.GetMetadataForType(typeof(string)),
+            };
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => factory.CreateBinder(context));
+            Assert.Equal(expected, exception.Message);
+        }
+
+        [Fact]
+        public void CreateBinder_Throws_WhenBinderNotCreated()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            var options = Options.Create(new MvcOptions());
+            options.Value.ModelBinderProviders.Add(new TestModelBinderProvider(_ => null));
+
+            var factory = new ModelBinderFactory(
+                metadataProvider,
+                options,
+                GetServices());
+            var context = new ModelBinderFactoryContext()
+            {
+                Metadata = metadataProvider.GetMetadataForType(typeof(string)),
+            };
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => factory.CreateBinder(context));
+            Assert.Equal(
+                $"Could not create a model binder for model object of type '{typeof(string).FullName}'.",
+                exception.Message);
+        }
+
+        [Fact]
+        public void CreateBinder_CreatesNoOpBinder_WhenPropertyDoesntHaveABinder()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+
+            // There isn't a provider that can handle WidgetId.
+            var options = Options.Create(new MvcOptions());
+            options.Value.ModelBinderProviders.Add(new TestModelBinderProvider(c =>
+            {
+                if (c.Metadata.ModelType == typeof(Widget))
+                {
+                    Assert.NotNull(c.CreateBinder(c.Metadata.Properties[nameof(Widget.Id)]));
+                    return Mock.Of<IModelBinder>();
+                }
+
+                return null;
+            }));
+
+            var factory = new ModelBinderFactory(
+                metadataProvider,
+                options,
+                GetServices());
+
+            var context = new ModelBinderFactoryContext()
+            {
+                Metadata = metadataProvider.GetMetadataForType(typeof(Widget)),
+            };
+
+            // Act
+            var result = factory.CreateBinder(context);
+
+            // Assert
+            Assert.NotNull(result);
+        }
+
+        [Fact]
+        public void CreateBinder_CreatesNoOpBinder_WhenPropertyBindingIsNotAllowed()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider
+                .ForProperty<Widget>(nameof(Widget.Id))
+                .BindingDetails(m => m.IsBindingAllowed = false);
+
+            var modelBinder = new ByteArrayModelBinder(NullLoggerFactory.Instance);
+
+            var options = Options.Create(new MvcOptions());
+            options.Value.ModelBinderProviders.Add(new TestModelBinderProvider(c =>
+            {
+                if (c.Metadata.ModelType == typeof(WidgetId))
+                {
+                    return modelBinder;
+                }
+
+                return null;
+            }));
+
+            var factory = new ModelBinderFactory(
+                metadataProvider,
+                options,
+                GetServices());
+
+            var context = new ModelBinderFactoryContext()
+            {
+                Metadata = metadataProvider.GetMetadataForProperty(typeof(Widget), nameof(Widget.Id)),
+            };
+
+            // Act
+            var result = factory.CreateBinder(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.IsType<NoOpBinder>(result);
+        }
+
+        [Fact]
+        public void CreateBinder_NestedProperties()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+
+            var options = Options.Create(new MvcOptions());
+            options.Value.ModelBinderProviders.Add(new TestModelBinderProvider(c =>
+            {
+                if (c.Metadata.ModelType == typeof(Widget))
+                {
+                    Assert.NotNull(c.CreateBinder(c.Metadata.Properties[nameof(Widget.Id)]));
+                    return Mock.Of<IModelBinder>();
+                }
+                else if (c.Metadata.ModelType == typeof(WidgetId))
+                {
+                    return Mock.Of<IModelBinder>();
+                }
+
+                return null;
+            }));
+
+            var factory = new ModelBinderFactory(
+                metadataProvider,
+                options,
+                GetServices());
+
+            var context = new ModelBinderFactoryContext()
+            {
+                Metadata = metadataProvider.GetMetadataForType(typeof(Widget)),
+            };
+
+            // Act
+            var result = factory.CreateBinder(context);
+
+            // Assert
+            Assert.NotNull(result);
+        }
+
+        [Fact]
+        public void CreateBinder_BreaksCycles()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+
+            var callCount = 0;
+
+            var options = Options.Create(new MvcOptions());
+            options.Value.ModelBinderProviders.Add(new TestModelBinderProvider(c =>
+            {
+                var currentCallCount = ++callCount;
+                Assert.Equal(typeof(Employee), c.Metadata.ModelType);
+                var binder = c.CreateBinder(c.Metadata.Properties[nameof(Employee.Manager)]);
+
+                if (currentCallCount == 2)
+                {
+                    Assert.IsType<PlaceholderBinder>(binder);
+                }
+
+                return Mock.Of<IModelBinder>();
+            }));
+
+            var factory = new ModelBinderFactory(
+                metadataProvider,
+                options,
+                GetServices());
+
+            var context = new ModelBinderFactoryContext()
+            {
+                Metadata = metadataProvider.GetMetadataForType(typeof(Employee)),
+            };
+
+            // Act
+            var result = factory.CreateBinder(context);
+
+            // Assert
+            Assert.NotNull(result);
+        }
+
+        [Fact]
+        public void CreateBinder_DoesNotCache_WhenTokenIsNull()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+
+            var options = Options.Create(new MvcOptions());
+            options.Value.ModelBinderProviders.Add(new TestModelBinderProvider(c =>
+            {
+                Assert.Equal(typeof(Employee), c.Metadata.ModelType);
+                return Mock.Of<IModelBinder>();
+            }));
+
+            var factory = new ModelBinderFactory(
+                metadataProvider,
+                options,
+                GetServices());
+
+            var context = new ModelBinderFactoryContext()
+            {
+                Metadata = metadataProvider.GetMetadataForType(typeof(Employee)),
+            };
+
+            // Act
+            var result1 = factory.CreateBinder(context);
+            var result2 = factory.CreateBinder(context);
+
+            // Assert
+            Assert.NotSame(result1, result2);
+        }
+
+        [Fact]
+        public void CreateBinder_Caches_WhenTokenIsNotNull()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+
+            var options = Options.Create(new MvcOptions());
+            options.Value.ModelBinderProviders.Add(new TestModelBinderProvider(c =>
+            {
+                Assert.Equal(typeof(Employee), c.Metadata.ModelType);
+                return Mock.Of<IModelBinder>();
+            }));
+
+            var factory = new ModelBinderFactory(
+                metadataProvider,
+                options,
+                GetServices());
+
+            var context = new ModelBinderFactoryContext()
+            {
+                Metadata = metadataProvider.GetMetadataForType(typeof(Employee)),
+                CacheToken = new object(),
+            };
+
+            // Act
+            var result1 = factory.CreateBinder(context);
+            var result2 = factory.CreateBinder(context);
+
+            // Assert
+            Assert.Same(result1, result2);
+        }
+
+        public static TheoryData BindingInfoData
+        {
+            get
+            {
+                var propertyFilterProvider = Mock.Of<IPropertyFilterProvider>();
+
+                var emptyBindingInfo = new BindingInfo();
+                var halfBindingInfo = new BindingInfo
+                {
+                    BinderModelName = "expected name",
+                    BinderType = typeof(Widget),
+                };
+                var fullBindingInfo = new BindingInfo
+                {
+                    BinderModelName = "expected name",
+                    BinderType = typeof(Widget),
+                    BindingSource = BindingSource.Services,
+                    PropertyFilterProvider = propertyFilterProvider,
+                };
+
+                var emptyBindingMetadata = new BindingMetadata();
+                var differentBindingMetadata = new BindingMetadata
+                {
+                    BinderModelName = "not the expected name",
+                    BinderType = typeof(WidgetId),
+                    BindingSource = BindingSource.ModelBinding,
+                    PropertyFilterProvider = Mock.Of<IPropertyFilterProvider>(),
+                };
+                var secondHalfBindingMetadata = new BindingMetadata
+                {
+                    BindingSource = BindingSource.Services,
+                    PropertyFilterProvider = propertyFilterProvider,
+                };
+                var fullBindingMetadata = new BindingMetadata
+                {
+                    BinderModelName = "expected name",
+                    BinderType = typeof(Widget),
+                    BindingSource = BindingSource.Services,
+                    PropertyFilterProvider = propertyFilterProvider,
+                };
+
+                // parameterBindingInfo, bindingMetadata, expectedInfo
+                return new TheoryData<BindingInfo, BindingMetadata, BindingInfo>
+                {
+                    { emptyBindingInfo, emptyBindingMetadata, emptyBindingInfo },
+                    { fullBindingInfo, emptyBindingMetadata, fullBindingInfo },
+                    { emptyBindingInfo, fullBindingMetadata, fullBindingInfo },
+                    // Resulting BindingInfo combines two inputs
+                    { halfBindingInfo, secondHalfBindingMetadata, fullBindingInfo },
+                    // Parameter information has precedence over type metadata
+                    { fullBindingInfo, differentBindingMetadata, fullBindingInfo },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(BindingInfoData))]
+        public void CreateBinder_PassesExpectedBindingInfo(
+            BindingInfo parameterBindingInfo,
+            BindingMetadata bindingMetadata,
+            BindingInfo expectedInfo)
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider.ForType<Employee>().BindingDetails(binding =>
+            {
+                binding.BinderModelName = bindingMetadata.BinderModelName;
+                binding.BinderType = bindingMetadata.BinderType;
+                binding.BindingSource = bindingMetadata.BindingSource;
+                if (bindingMetadata.PropertyFilterProvider != null)
+                {
+                    binding.PropertyFilterProvider = bindingMetadata.PropertyFilterProvider;
+                }
+            });
+
+            var modelBinder = Mock.Of<IModelBinder>();
+            var modelBinderProvider = new TestModelBinderProvider(context =>
+            {
+                Assert.Equal(typeof(Employee), context.Metadata.ModelType);
+
+                Assert.NotNull(context.BindingInfo);
+                Assert.Equal(expectedInfo.BinderModelName, context.BindingInfo.BinderModelName, StringComparer.Ordinal);
+                Assert.Equal(expectedInfo.BinderType, context.BindingInfo.BinderType);
+                Assert.Equal(expectedInfo.BindingSource, context.BindingInfo.BindingSource);
+                Assert.Same(expectedInfo.PropertyFilterProvider, context.BindingInfo.PropertyFilterProvider);
+
+                return modelBinder;
+            });
+
+            var options = Options.Create(new MvcOptions());
+            options.Value.ModelBinderProviders.Insert(0, modelBinderProvider);
+
+            var factory = new ModelBinderFactory(
+                metadataProvider,
+                options,
+                GetServices());
+            var factoryContext = new ModelBinderFactoryContext
+            {
+                BindingInfo = parameterBindingInfo,
+                Metadata = metadataProvider.GetMetadataForType(typeof(Employee)),
+            };
+
+            // Act & Assert
+            var result = factory.CreateBinder(factoryContext);
+
+            // Confirm our IModelBinderProvider was called.
+            Assert.Same(modelBinder, result);
+        }
+
+        [Fact]
+        public void CreateBinder_Caches_NonRootNodes()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+
+            var options = Options.Create(new MvcOptions());
+
+            IModelBinder inner = null;
+
+            var widgetProvider = new TestModelBinderProvider(c =>
+            {
+                if (c.Metadata.ModelType == typeof(Widget))
+                {
+                    var binder = c.CreateBinder(c.Metadata.Properties[nameof(Widget.Id)]);
+                    if (inner == null)
+                    {
+                        inner = binder;
+                    }
+                    else
+                    {
+                        Assert.Same(inner, binder);
+                    }
+
+                    return Mock.Of<IModelBinder>();
+                }
+
+                return null;
+            });
+
+            var widgetIdProvider = new TestModelBinderProvider(c =>
+            {
+                Assert.Equal(typeof(WidgetId), c.Metadata.ModelType);
+                return Mock.Of<IModelBinder>();
+            });
+
+            options.Value.ModelBinderProviders.Add(widgetProvider);
+            options.Value.ModelBinderProviders.Add(widgetIdProvider);
+
+            var factory = new ModelBinderFactory(
+                metadataProvider,
+                options,
+                GetServices());
+
+            var context = new ModelBinderFactoryContext()
+            {
+                Metadata = metadataProvider.GetMetadataForType(typeof(Widget)),
+                CacheToken = null, // We want the outermost provider to run twice.
+            };
+
+            // Act
+            var result1 = factory.CreateBinder(context);
+            var result2 = factory.CreateBinder(context);
+
+            // Assert
+            Assert.NotSame(result1, result2);
+
+            Assert.Equal(2, widgetProvider.SuccessCount);
+            Assert.Equal(1, widgetIdProvider.SuccessCount);
+        }
+
+        [Fact]
+        public void CreateBinder_Caches_NonRootNodes_WhenNonRootNodeReturnsNull()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+
+            var options = Options.Create(new MvcOptions());
+
+            IModelBinder inner = null;
+
+            var widgetProvider = new TestModelBinderProvider(c =>
+            {
+                if (c.Metadata.ModelType == typeof(Widget))
+                {
+                    var binder = c.CreateBinder(c.Metadata.Properties[nameof(Widget.Id)]);
+                    Assert.IsType<NoOpBinder>(binder);
+                    if (inner == null)
+                    {
+                        inner = binder;
+                    }
+                    else
+                    {
+                        Assert.Same(inner, binder);
+                    }
+
+                    return Mock.Of<IModelBinder>();
+                }
+
+                return null;
+            });
+
+            var widgetIdProvider = new TestModelBinderProvider(c =>
+            {
+                Assert.Equal(typeof(WidgetId), c.Metadata.ModelType);
+                return null;
+            });
+
+            options.Value.ModelBinderProviders.Add(widgetProvider);
+            options.Value.ModelBinderProviders.Add(widgetIdProvider);
+
+            var factory = new ModelBinderFactory(
+                metadataProvider,
+                options,
+                GetServices());
+
+            var context = new ModelBinderFactoryContext()
+            {
+                Metadata = metadataProvider.GetMetadataForType(typeof(Widget)),
+                CacheToken = null, // We want the outermost provider to run twice.
+            };
+
+            // Act
+            var result1 = factory.CreateBinder(context);
+            var result2 = factory.CreateBinder(context);
+
+            // Assert
+            Assert.NotSame(result1, result2);
+
+            Assert.Equal(2, widgetProvider.SuccessCount);
+            Assert.Equal(0, widgetIdProvider.SuccessCount);
+        }
+
+        // The fact that we use the ModelMetadata as the token is important for caching
+        // and sharing with TryUpdateModel.
+        [Fact]
+        public void CreateBinder_Caches_NonRootNodes_UsesModelMetadataAsToken()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+
+            var options = Options.Create(new MvcOptions());
+
+            IModelBinder inner = null;
+
+            var widgetProvider = new TestModelBinderProvider(c =>
+            {
+                if (c.Metadata.ModelType == typeof(Widget))
+                {
+                    inner = c.CreateBinder(c.Metadata.Properties[nameof(Widget.Id)]);
+                    return Mock.Of<IModelBinder>();
+                }
+
+                return null;
+            });
+
+            var widgetIdProvider = new TestModelBinderProvider(c =>
+            {
+                Assert.Equal(typeof(WidgetId), c.Metadata.ModelType);
+                return Mock.Of<IModelBinder>();
+            });
+
+            options.Value.ModelBinderProviders.Add(widgetProvider);
+            options.Value.ModelBinderProviders.Add(widgetIdProvider);
+
+            var factory = new ModelBinderFactory(
+                metadataProvider,
+                options,
+                GetServices());
+
+            var context = new ModelBinderFactoryContext()
+            {
+                Metadata = metadataProvider.GetMetadataForType(typeof(Widget)),
+                CacheToken = null,
+            };
+
+            // Act 1
+            var result1 = factory.CreateBinder(context);
+
+            context.Metadata = context.Metadata.Properties[nameof(Widget.Id)];
+            context.CacheToken = context.Metadata;
+
+            // Act 2
+            var result2 = factory.CreateBinder(context);
+
+            // Assert
+            Assert.Same(inner, result2);
+            Assert.Equal(1, widgetProvider.SuccessCount);
+            Assert.Equal(1, widgetIdProvider.SuccessCount);
+        }
+
+        // This is a really weird case, but I wanted to make sure it's covered so it doesn't
+        // blow up in weird ways.
+        //
+        // If a binder provider tries to recursively create itself, but then returns null, we've
+        // already returned and possibly cached the PlaceholderBinder instance, we want to make sure that
+        // instance won't nullref.
+        [Fact]
+        public void CreateBinder_Caches_NonRootNodes_FixesUpPlaceholderBinder()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+
+            var options = Options.Create(new MvcOptions());
+
+            IModelBinder inner = null;
+            IModelBinder innerInner = null;
+
+            var widgetProvider = new TestModelBinderProvider(c =>
+            {
+                if (c.Metadata.ModelType == typeof(Widget))
+                {
+                    inner = c.CreateBinder(c.Metadata.Properties[nameof(Widget.Id)]);
+                    return Mock.Of<IModelBinder>();
+                }
+
+                return null;
+            });
+
+            var widgetIdProvider = new TestModelBinderProvider(c =>
+            {
+                Assert.Equal(typeof(WidgetId), c.Metadata.ModelType);
+                innerInner = c.CreateBinder(c.Metadata);
+                return null;
+            });
+
+            options.Value.ModelBinderProviders.Add(widgetProvider);
+            options.Value.ModelBinderProviders.Add(widgetIdProvider);
+
+            var factory = new ModelBinderFactory(
+                metadataProvider,
+                options,
+                GetServices());
+
+            var context = new ModelBinderFactoryContext()
+            {
+                Metadata = metadataProvider.GetMetadataForType(typeof(Widget)),
+                CacheToken = null,
+            };
+
+            // Act 1
+            var result1 = factory.CreateBinder(context);
+
+            context.Metadata = context.Metadata.Properties[nameof(Widget.Id)];
+            context.CacheToken = context.Metadata;
+
+            // Act 2
+            var result2 = factory.CreateBinder(context);
+
+            // Assert
+            Assert.Same(inner, result2);
+            Assert.NotSame(inner, innerInner);
+
+            var placeholder = Assert.IsType<PlaceholderBinder>(innerInner);
+            Assert.IsType<NoOpBinder>(placeholder.Inner);
+
+            Assert.Equal(1, widgetProvider.SuccessCount);
+            Assert.Equal(0, widgetIdProvider.SuccessCount);
+        }
+
+        private IServiceProvider GetServices()
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+            return services.BuildServiceProvider();
+        }
+
+        private class Widget
+        {
+            public WidgetId Id { get; set; }
+        }
+
+        private class WidgetId
+        {
+        }
+
+        private class Employee
+        {
+            public Employee Manager { get; set; }
+        }
+
+        private class TestModelBinderProvider : IModelBinderProvider
+        {
+            private readonly Func<ModelBinderProviderContext, IModelBinder> _factory;
+
+            public TestModelBinderProvider(Func<ModelBinderProviderContext, IModelBinder> factory)
+            {
+                _factory = factory;
+            }
+
+            public int SuccessCount { get; private set; }
+
+            public IModelBinder GetBinder(ModelBinderProviderContext context)
+            {
+                var binder = _factory(context);
+                if (binder != null)
+                {
+                    SuccessCount++;
+                }
+
+                return binder;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBinderProviderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBinderProviderExtensionsTest.cs
new file mode 100644
index 0000000000..24f8310a41
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBinderProviderExtensionsTest.cs
@@ -0,0 +1,66 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class ModelBinderProviderExtensionsTest
+    {
+        [Fact]
+        public void RemoveType_RemovesAllOfType()
+        {
+            // Arrange
+            var list = new List<IModelBinderProvider>
+            {
+                new FooModelBinderProvider(),
+                new BarModelBinderProvider(),
+                new FooModelBinderProvider()
+            };
+
+            // Act
+            list.RemoveType(typeof(FooModelBinderProvider));
+
+            // Assert
+            var provider = Assert.Single(list);
+            Assert.IsType<BarModelBinderProvider>(provider);
+        }
+
+        [Fact]
+        public void GenericRemoveType_RemovesAllOfType()
+        {
+            // Arrange
+            var list = new List<IModelBinderProvider>
+            {
+                new FooModelBinderProvider(),
+                new BarModelBinderProvider(),
+                new FooModelBinderProvider()
+            };
+
+            // Act
+            list.RemoveType<FooModelBinderProvider>();
+
+            // Assert
+            var provider = Assert.Single(list);
+            Assert.IsType<BarModelBinderProvider>(provider);
+        }
+
+        private class FooModelBinderProvider : IModelBinderProvider
+        {
+            public IModelBinder GetBinder(ModelBinderProviderContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class BarModelBinderProvider : IModelBinderProvider
+        {
+            public IModelBinder GetBinder(ModelBinderProviderContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBindingHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBindingHelperTest.cs
new file mode 100644
index 0000000000..062b5fddce
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBindingHelperTest.cs
@@ -0,0 +1,1621 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class ModelBindingHelperTest
+    {
+        [Fact]
+        public async Task TryUpdateModel_ReturnsFalse_IfBinderIsUnsuccessful()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var binder = new StubModelBinder(ModelBindingResult.Failed());
+            var model = new MyModel();
+
+            // Act
+            var result = await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                string.Empty,
+                GetActionContext(),
+                metadataProvider,
+                GetModelBinderFactory(binder),
+                Mock.Of<IValueProvider>(),
+                new Mock<IObjectModelValidator>(MockBehavior.Strict).Object);
+
+            // Assert
+            Assert.False(result);
+            Assert.Null(model.MyProperty);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_ReturnsFalse_IfModelValidationFails()
+        {
+            // Arrange
+            var binderProviders = new IModelBinderProvider[]
+            {
+                new SimpleTypeModelBinderProvider(),
+                new ComplexTypeModelBinderProvider(),
+            };
+
+            var validator = new DataAnnotationsModelValidatorProvider(
+                new ValidationAttributeAdapterProvider(),
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+            var model = new MyModel();
+
+            var values = new Dictionary<string, object>
+            {
+                { "", null }
+            };
+            var valueProvider = new TestValueProvider(values);
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+            var actionContext = GetActionContext();
+            var modelState = actionContext.ModelState;
+
+            // Act
+            var result = await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                "",
+                actionContext,
+                metadataProvider,
+                GetModelBinderFactory(binderProviders),
+                valueProvider,
+                new DefaultObjectValidator(metadataProvider, new[] { validator }));
+
+            // Assert
+            Assert.False(result);
+            var error = Assert.Single(modelState["MyProperty"].Errors);
+            Assert.Equal(ValidationAttributeUtil.GetRequiredErrorMessage("MyProperty"), error.ErrorMessage);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_ReturnsTrue_IfModelBindsAndValidatesSuccessfully()
+        {
+            // Arrange
+            var binderProviders = new IModelBinderProvider[]
+            {
+                new SimpleTypeModelBinderProvider(),
+                new ComplexTypeModelBinderProvider(),
+            };
+
+            var validator = new DataAnnotationsModelValidatorProvider(
+                new ValidationAttributeAdapterProvider(),
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+            var model = new MyModel { MyProperty = "Old-Value" };
+
+            var values = new Dictionary<string, object>
+            {
+                { "", null },
+                { "MyProperty", "MyPropertyValue" }
+            };
+            var valueProvider = new TestValueProvider(values);
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+            // Act
+            var result = await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                "",
+                GetActionContext(),
+                metadataProvider,
+                GetModelBinderFactory(binderProviders),
+                valueProvider,
+                new DefaultObjectValidator(metadataProvider, new[] { validator }));
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal("MyPropertyValue", model.MyProperty);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_UsingPropertyFilterOverload_ReturnsFalse_IfBinderIsUnsuccessful()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var binder = new StubModelBinder(ModelBindingResult.Failed());
+            var model = new MyModel();
+            Func<ModelMetadata, bool> propertyFilter = (m) => true;
+
+            // Act
+            var result = await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                string.Empty,
+                GetActionContext(),
+                metadataProvider,
+                GetModelBinderFactory(binder),
+                Mock.Of<IValueProvider>(),
+                new Mock<IObjectModelValidator>(MockBehavior.Strict).Object,
+                propertyFilter);
+
+            // Assert
+            Assert.False(result);
+            Assert.Null(model.MyProperty);
+            Assert.Null(model.IncludedProperty);
+            Assert.Null(model.ExcludedProperty);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_UsingPropertyFilterOverload_ReturnsTrue_ModelBindsAndValidatesSuccessfully()
+        {
+            // Arrange
+            var binderProviders = new IModelBinderProvider[]
+            {
+                new SimpleTypeModelBinderProvider(),
+                new ComplexTypeModelBinderProvider(),
+            };
+
+            var validator = new DataAnnotationsModelValidatorProvider(
+                new ValidationAttributeAdapterProvider(),
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+            var model = new MyModel
+            {
+                MyProperty = "Old-Value",
+                IncludedProperty = "Old-IncludedPropertyValue",
+                ExcludedProperty = "Old-ExcludedPropertyValue"
+            };
+
+            var values = new Dictionary<string, object>
+            {
+                { "", null },
+                { "MyProperty", "MyPropertyValue" },
+                { "IncludedProperty", "IncludedPropertyValue" },
+                { "ExcludedProperty", "ExcludedPropertyValue" }
+            };
+
+            Func<ModelMetadata, bool> propertyFilter = (m) =>
+                string.Equals(m.PropertyName, "IncludedProperty", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(m.PropertyName, "MyProperty", StringComparison.OrdinalIgnoreCase);
+
+            var valueProvider = new TestValueProvider(values);
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+            // Act
+            var result = await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                "",
+                GetActionContext(),
+                metadataProvider,
+                GetModelBinderFactory(binderProviders),
+                valueProvider,
+                new DefaultObjectValidator(metadataProvider, new[] { validator }),
+                propertyFilter);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal("MyPropertyValue", model.MyProperty);
+            Assert.Equal("IncludedPropertyValue", model.IncludedProperty);
+            Assert.Equal("Old-ExcludedPropertyValue", model.ExcludedProperty);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_UsingIncludeExpressionOverload_ReturnsFalse_IfBinderIsUnsuccessful()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var binder = new StubModelBinder(ModelBindingResult.Failed());
+            var model = new MyModel();
+
+            // Act
+            var result = await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                string.Empty,
+                GetActionContext(),
+                metadataProvider,
+                GetModelBinderFactory(binder),
+                Mock.Of<IValueProvider>(),
+                new Mock<IObjectModelValidator>(MockBehavior.Strict).Object,
+                m => m.IncludedProperty);
+
+            // Assert
+            Assert.False(result);
+            Assert.Null(model.MyProperty);
+            Assert.Null(model.IncludedProperty);
+            Assert.Null(model.ExcludedProperty);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_UsingIncludeExpressionOverload_ReturnsTrue_ModelBindsAndValidatesSuccessfully()
+        {
+            // Arrange
+            var binderProviders = new IModelBinderProvider[]
+            {
+                new SimpleTypeModelBinderProvider(),
+                new ComplexTypeModelBinderProvider(),
+            };
+
+            var validator = new DataAnnotationsModelValidatorProvider(
+                new ValidationAttributeAdapterProvider(),
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+            var model = new MyModel
+            {
+                MyProperty = "Old-Value",
+                IncludedProperty = "Old-IncludedPropertyValue",
+                ExcludedProperty = "Old-ExcludedPropertyValue"
+            };
+
+            var values = new Dictionary<string, object>
+            {
+                { "", null },
+                { "MyProperty", "MyPropertyValue" },
+                { "IncludedProperty", "IncludedPropertyValue" },
+                { "ExcludedProperty", "ExcludedPropertyValue" }
+            };
+
+            var valueProvider = new TestValueProvider(values);
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+            // Act
+            var result = await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                "",
+                GetActionContext(),
+                TestModelMetadataProvider.CreateDefaultProvider(),
+                GetModelBinderFactory(binderProviders),
+                valueProvider,
+                new DefaultObjectValidator(metadataProvider, new[] { validator }),
+                m => m.IncludedProperty,
+                m => m.MyProperty);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal("MyPropertyValue", model.MyProperty);
+            Assert.Equal("IncludedPropertyValue", model.IncludedProperty);
+            Assert.Equal("Old-ExcludedPropertyValue", model.ExcludedProperty);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_UsingDefaultIncludeOverload_IncludesAllProperties()
+        {
+            // Arrange
+            var binderProviders = new IModelBinderProvider[]
+            {
+                new SimpleTypeModelBinderProvider(),
+                new ComplexTypeModelBinderProvider(),
+            };
+
+            var validator = new DataAnnotationsModelValidatorProvider(
+                new ValidationAttributeAdapterProvider(),
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+            var model = new MyModel
+            {
+                MyProperty = "Old-Value",
+                IncludedProperty = "Old-IncludedPropertyValue",
+                ExcludedProperty = "Old-ExcludedPropertyValue"
+            };
+
+            var values = new Dictionary<string, object>
+            {
+                { "", null },
+                { "MyProperty", "MyPropertyValue" },
+                { "IncludedProperty", "IncludedPropertyValue" },
+                { "ExcludedProperty", "ExcludedPropertyValue" }
+            };
+
+            var valueProvider = new TestValueProvider(values);
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+            // Act
+            var result = await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                "",
+                GetActionContext(),
+                metadataProvider,
+                GetModelBinderFactory(binderProviders),
+                valueProvider,
+                new DefaultObjectValidator(metadataProvider, new[] { validator }));
+
+            // Assert
+            // Includes everything.
+            Assert.True(result);
+            Assert.Equal("MyPropertyValue", model.MyProperty);
+            Assert.Equal("IncludedPropertyValue", model.IncludedProperty);
+            Assert.Equal("ExcludedPropertyValue", model.ExcludedProperty);
+        }
+
+        [Fact]
+        public void GetPropertyName_PropertyMemberAccessReturnsPropertyName()
+        {
+            // Arrange
+            Expression<Func<User, object>> expression = m => m.Address;
+
+            // Act
+            var propertyName = ModelBindingHelper.GetPropertyName(expression.Body);
+
+            // Assert
+            Assert.Equal(nameof(User.Address), propertyName);
+        }
+
+        [Fact]
+        public void GetPropertyName_ChainedExpression_Throws()
+        {
+            // Arrange
+            Expression<Func<User, object>> expression = m => m.Address.Street;
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() =>
+                        ModelBindingHelper.GetPropertyName(expression.Body));
+
+            Assert.Equal(string.Format("The passed expression of expression node type '{0}' is invalid." +
+                                       " Only simple member access expressions for model properties are supported.",
+                                        expression.Body.NodeType),
+                         ex.Message);
+        }
+
+        public static IEnumerable<object[]> InvalidExpressionDataSet
+        {
+            get
+            {
+                Expression<Func<User, object>> expression = m => new Func<User>(() => m);
+                yield return new object[] { expression }; // lambda expression.
+
+                expression = m => m.Save();
+                yield return new object[] { expression }; // method call expression.
+
+                expression = m => m.Friends[0]; // ArrayIndex expression.
+                yield return new object[] { expression };
+
+                expression = m => m.Colleagues[0]; // Indexer expression.
+                yield return new object[] { expression };
+
+                expression = m => m; // Parameter expression.
+                yield return new object[] { expression };
+
+                object someVariable = "something";
+                expression = m => someVariable; // Variable accessor.
+                yield return new object[] { expression };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(InvalidExpressionDataSet))]
+        public void GetPropertyName_ExpressionsOtherThanMemberAccess_Throws(Expression<Func<User, object>> expression)
+        {
+            // Arrange Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() =>
+                ModelBindingHelper.GetPropertyName(expression.Body));
+
+            Assert.Equal(
+                $"The passed expression of expression node type '{expression.Body.NodeType}' is invalid." +
+                " Only simple member access expressions for model properties are supported.",
+                ex.Message);
+        }
+
+        [Fact]
+        public void GetPropertyName_NonParameterBasedExpression_Throws()
+        {
+            // Arrange
+            var someUser = new User();
+
+            // PropertyAccessor with a property name invalid as it originates from a variable accessor.
+            Expression<Func<User, object>> expression = m => someUser.Address;
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() =>
+                ModelBindingHelper.GetPropertyName(expression.Body));
+
+            Assert.Equal(
+                $"The passed expression of expression node type '{expression.Body.NodeType}' is invalid." +
+                " Only simple member access expressions for model properties are supported.",
+                ex.Message);
+        }
+
+        [Fact]
+        public void GetPropertyName_TopLevelCollectionIndexer_Throws()
+        {
+            // Arrange
+            Expression<Func<List<User>, object>> expression = m => m[0];
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() =>
+                ModelBindingHelper.GetPropertyName(expression.Body));
+
+            Assert.Equal(
+                $"The passed expression of expression node type '{expression.Body.NodeType}' is invalid." +
+                " Only simple member access expressions for model properties are supported.",
+                ex.Message);
+        }
+
+        [Fact]
+        public void GetPropertyName_FieldExpression_Throws()
+        {
+            // Arrange
+            Expression<Func<User, object>> expression = m => m._userId;
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() =>
+                ModelBindingHelper.GetPropertyName(expression.Body));
+
+            Assert.Equal(
+                $"The passed expression of expression node type '{expression.Body.NodeType}' is invalid." +
+                " Only simple member access expressions for model properties are supported.",
+                ex.Message);
+        }
+
+        [Fact]
+        public async Task TryUpdateModelNonGeneric_PropertyFilterOverload_ReturnsFalse_IfBinderIsUnsuccessful()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var binder = new StubModelBinder(ModelBindingResult.Failed());
+            var model = new MyModel();
+            Func<ModelMetadata, bool> propertyFilter = (m) => true;
+
+            // Act
+            var result = await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                model.GetType(),
+                prefix: "",
+                actionContext: GetActionContext(),
+                metadataProvider: metadataProvider,
+                modelBinderFactory: GetModelBinderFactory(binder),
+                valueProvider: Mock.Of<IValueProvider>(),
+                objectModelValidator: new Mock<IObjectModelValidator>(MockBehavior.Strict).Object,
+                propertyFilter: propertyFilter);
+
+            // Assert
+            Assert.False(result);
+            Assert.Null(model.MyProperty);
+            Assert.Null(model.IncludedProperty);
+            Assert.Null(model.ExcludedProperty);
+        }
+
+        [Fact]
+        public async Task TryUpdateModelNonGeneric_PropertyFilterOverload_ReturnsTrue_ModelBindsAndValidatesSuccessfully()
+        {
+            // Arrange
+            var binderProviders = new IModelBinderProvider[]
+            {
+                new SimpleTypeModelBinderProvider(),
+                new ComplexTypeModelBinderProvider(),
+            };
+
+            var validator = new DataAnnotationsModelValidatorProvider(
+                new ValidationAttributeAdapterProvider(),
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+            var model = new MyModel
+            {
+                MyProperty = "Old-Value",
+                IncludedProperty = "Old-IncludedPropertyValue",
+                ExcludedProperty = "Old-ExcludedPropertyValue"
+            };
+
+            var values = new Dictionary<string, object>
+            {
+                { "", null },
+                { "MyProperty", "MyPropertyValue" },
+                { "IncludedProperty", "IncludedPropertyValue" },
+                { "ExcludedProperty", "ExcludedPropertyValue" }
+            };
+
+            Func<ModelMetadata, bool> propertyFilter = (m) =>
+                string.Equals(m.PropertyName, "IncludedProperty", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(m.PropertyName, "MyProperty", StringComparison.OrdinalIgnoreCase);
+
+            var valueProvider = new TestValueProvider(values);
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+            // Act
+            var result = await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                model.GetType(),
+                "",
+                GetActionContext(),
+                metadataProvider,
+                GetModelBinderFactory(binderProviders),
+                valueProvider,
+                new DefaultObjectValidator(metadataProvider, new[] { validator }),
+                propertyFilter);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal("MyPropertyValue", model.MyProperty);
+            Assert.Equal("IncludedPropertyValue", model.IncludedProperty);
+            Assert.Equal("Old-ExcludedPropertyValue", model.ExcludedProperty);
+        }
+
+        [Fact]
+        public async Task TryUpdateModelNonGeneric_ModelTypeOverload_ReturnsFalse_IfBinderIsUnsuccessful()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var binder = new StubModelBinder(ModelBindingResult.Failed());
+
+            var model = new MyModel();
+
+            // Act
+            var result = await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                modelType: model.GetType(),
+                prefix: "",
+                actionContext: GetActionContext(),
+                metadataProvider: metadataProvider,
+                modelBinderFactory: GetModelBinderFactory(binder.Object),
+                valueProvider: Mock.Of<IValueProvider>(),
+                objectModelValidator: new Mock<IObjectModelValidator>(MockBehavior.Strict).Object);
+
+            // Assert
+            Assert.False(result);
+            Assert.Null(model.MyProperty);
+        }
+
+        [Fact]
+        public async Task TryUpdateModelNonGeneric_ModelTypeOverload_ReturnsTrue_IfModelBindsAndValidatesSuccessfully()
+        {
+            // Arrange
+            var binderProviders = new IModelBinderProvider[]
+            {
+                new SimpleTypeModelBinderProvider(),
+                new ComplexTypeModelBinderProvider(),
+            };
+
+            var validator = new DataAnnotationsModelValidatorProvider(
+                new ValidationAttributeAdapterProvider(),
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+            var model = new MyModel { MyProperty = "Old-Value" };
+
+            var values = new Dictionary<string, object>
+            {
+                { "", null },
+                { "MyProperty", "MyPropertyValue" }
+            };
+            var valueProvider = new TestValueProvider(values);
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+            // Act
+            var result = await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                model.GetType(),
+                "",
+                GetActionContext(),
+                metadataProvider,
+                GetModelBinderFactory(binderProviders),
+                valueProvider,
+                new DefaultObjectValidator(metadataProvider, new[] { validator }));
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal("MyPropertyValue", model.MyProperty);
+        }
+
+        [Fact]
+        public async Task TryUpdataModel_ModelTypeDifferentFromModel_Throws()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+
+            var binder = new StubModelBinder();
+            var model = new MyModel();
+            Func<ModelMetadata, bool> propertyFilter = (m) => true;
+
+            var modelName = model.GetType().FullName;
+            var userName = typeof(User).FullName;
+            var expectedMessage = $"The model's runtime type '{modelName}' is not assignable to the type '{userName}'.";
+
+            // Act & Assert
+            var exception = await ExceptionAssert.ThrowsArgumentAsync(
+                () => ModelBindingHelper.TryUpdateModelAsync(
+                    model,
+                    typeof(User),
+                    "",
+                    GetActionContext(),
+                    metadataProvider,
+                    GetModelBinderFactory(binder.Object),
+                    Mock.Of<IValueProvider>(),
+                    new Mock<IObjectModelValidator>(MockBehavior.Strict).Object,
+                    propertyFilter),
+                "modelType",
+                expectedMessage);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        public void ClearValidationState_ForComplexTypeModel_EmptyModelKey(string modelKey)
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var modelMetadata = metadataProvider.GetMetadataForType(typeof(Product));
+
+            var dictionary = new ModelStateDictionary();
+            dictionary.AddModelError("Name", "MyProperty invalid.");
+            dictionary.AddModelError("Id", "Id invalid.");
+            dictionary.AddModelError("Id", "Id is required.");
+            dictionary.MarkFieldValid("Category");
+            dictionary.AddModelError("Unrelated", "Unrelated is required.");
+
+            // Act
+            ModelBindingHelper.ClearValidationStateForModel(modelMetadata, dictionary, modelKey);
+
+            // Assert
+            Assert.Empty(dictionary["Name"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["Name"].ValidationState);
+            Assert.Empty(dictionary["Id"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["Id"].ValidationState);
+            Assert.Empty(dictionary["Category"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["Category"].ValidationState);
+
+            Assert.Single(dictionary["Unrelated"].Errors);
+            Assert.Equal(ModelValidationState.Invalid, dictionary["Unrelated"].ValidationState);
+        }
+
+        // Not a wholly realistic scenario, but testing it regardless.
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        public void ClearValidationState_ForSimpleTypeModel_EmptyModelKey(string modelKey)
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var modelMetadata = metadataProvider.GetMetadataForType(typeof(string));
+
+            var dictionary = new ModelStateDictionary();
+            dictionary.AddModelError(string.Empty, "MyProperty invalid.");
+            dictionary.AddModelError("Unrelated", "Unrelated is required.");
+
+            // Act
+            ModelBindingHelper.ClearValidationStateForModel(modelMetadata, dictionary, modelKey);
+
+            // Assert
+            Assert.Empty(dictionary[string.Empty].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary[string.Empty].ValidationState);
+
+            Assert.Single(dictionary["Unrelated"].Errors);
+            Assert.Equal(ModelValidationState.Invalid, dictionary["Unrelated"].ValidationState);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        public void ClearValidationState_ForCollectionsModel_EmptyModelKey(string modelKey)
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var modelMetadata = metadataProvider.GetMetadataForType(typeof(List<Product>));
+
+            var dictionary = new ModelStateDictionary();
+            dictionary.AddModelError("[0].Name", "Name invalid.");
+            dictionary.AddModelError("[0].Id", "Id invalid.");
+            dictionary.AddModelError("[0].Id", "Id required.");
+            dictionary.MarkFieldValid("[0].Category");
+
+            dictionary.MarkFieldValid("[1].Name");
+            dictionary.MarkFieldValid("[1].Id");
+            dictionary.AddModelError("[1].Category", "Category invalid.");
+            dictionary.AddModelError("Unrelated", "Unrelated is required.");
+
+            // Act
+            ModelBindingHelper.ClearValidationStateForModel(modelMetadata, dictionary, modelKey);
+
+            // Assert
+            Assert.Empty(dictionary["[0].Name"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["[0].Name"].ValidationState);
+            Assert.Empty(dictionary["[0].Id"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["[0].Id"].ValidationState);
+            Assert.Empty(dictionary["[0].Category"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["[0].Category"].ValidationState);
+            Assert.Empty(dictionary["[1].Name"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["[1].Name"].ValidationState);
+            Assert.Empty(dictionary["[1].Id"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["[1].Id"].ValidationState);
+            Assert.Empty(dictionary["[1].Category"].Errors);
+            Assert.Equal(ModelValidationState.Unvalidated, dictionary["[1].Category"].ValidationState);
+
+            Assert.Single(dictionary["Unrelated"].Errors);
+            Assert.Equal(ModelValidationState.Invalid, dictionary["Unrelated"].ValidationState);
+        }
+
+        [Theory]
+        [InlineData("product")]
+        [InlineData("product.Name")]
+        [InlineData("product.Order[0].Name")]
+        [InlineData("product.Order[0].Address.Street")]
+        [InlineData("product.Category.Name")]
+        [InlineData("product.Order")]
+        public void ClearValidationState_ForComplexModel_NonEmptyModelKey(string prefix)
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var modelMetadata = metadataProvider.GetMetadataForType(typeof(Product));
+
+            var dictionary = new ModelStateDictionary();
+            dictionary.AddModelError("product.Name", "Name invalid.");
+            dictionary.AddModelError("product.Id", "Id invalid.");
+            dictionary.AddModelError("product.Id", "Id required.");
+            dictionary.MarkFieldValid("product.Category");
+            dictionary.MarkFieldValid("product.Category.Name");
+            dictionary.AddModelError("product.Order[0].Name", "Order name invalid.");
+            dictionary.AddModelError("product.Order[0].Address.Street", "Street invalid.");
+            dictionary.MarkFieldValid("product.Order[1].Name");
+            dictionary.AddModelError("product.Order[0]", "Order invalid.");
+
+            // Act
+            ModelBindingHelper.ClearValidationStateForModel(modelMetadata, dictionary, prefix);
+
+            // Assert
+            foreach (var entry in dictionary.Keys)
+            {
+                if (entry.StartsWith(prefix))
+                {
+                    Assert.Empty(dictionary[entry].Errors);
+                    Assert.Equal(ModelValidationState.Unvalidated, dictionary[entry].ValidationState);
+                }
+            }
+        }
+
+        public static ModelBinderFactory GetModelBinderFactory(IModelBinder binder)
+        {
+            var binderProvider = new Mock<IModelBinderProvider>();
+            binderProvider
+                .Setup(p => p.GetBinder(It.IsAny<ModelBinderProviderContext>()))
+                .Returns(binder);
+
+            return TestModelBinderFactory.Create(binderProvider.Object);
+        }
+
+        private static ModelBinderFactory GetModelBinderFactory(params IModelBinderProvider[] providers)
+        {
+            return TestModelBinderFactory.CreateDefault(providers);
+        }
+
+        public class User
+        {
+            public string _userId;
+
+            public Address Address { get; set; }
+
+            public User[] Friends { get; set; }
+
+            public List<User> Colleagues { get; set; }
+
+            public bool IsReadOnly
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public User Save()
+            {
+                return this;
+            }
+        }
+
+        public class Address
+        {
+            public string Street { get; set; }
+        }
+
+        private class MyModel
+        {
+            [Required]
+            public string MyProperty { get; set; }
+
+            public string IncludedProperty { get; set; }
+
+            public string ExcludedProperty { get; set; }
+        }
+
+        private class Product
+        {
+            public string Name { get; set; }
+            public int Id { get; set; }
+            public Category Category { get; set; }
+            public List<Order> Orders { get; set; }
+        }
+
+        public class Category
+        {
+            public string Name { get; set; }
+        }
+
+        public class Order
+        {
+            public string Name { get; set; }
+            public Address Address { get; set; }
+        }
+
+        [Fact]
+        public void ConvertTo_ReturnsNullForReferenceTypes_WhenValueIsNull()
+        {
+            var convertedValue = ModelBindingHelper.ConvertTo(value: null, type: typeof(string), culture: null);
+            Assert.Null(convertedValue);
+        }
+
+        [Fact]
+        public void ConvertTo_ReturnsDefaultForValueTypes_WhenValueIsNull()
+        {
+            var convertedValue = ModelBindingHelper.ConvertTo(value: null, type: typeof(int), culture: null);
+            Assert.Equal(0, convertedValue);
+        }
+
+        [Fact]
+        public void ConvertToCanConvertArraysToSingleElements()
+        {
+            // Arrange
+            var value = new int[] { 1, 20, 42 };
+
+            // Act
+            var converted = ModelBindingHelper.ConvertTo(value, typeof(string), culture: null);
+
+            // Assert
+            Assert.Equal("1", converted);
+        }
+
+        [Fact]
+        public void ConvertToCanConvertSingleElementsToArrays()
+        {
+            // Arrange
+            var value = 42;
+
+            // Act
+            var converted = ModelBindingHelper.ConvertTo<string[]>(value, culture: null);
+
+            // Assert
+            Assert.NotNull(converted);
+            var result = Assert.Single(converted);
+            Assert.Equal("42", result);
+        }
+
+        [Fact]
+        public void ConvertToCanConvertSingleElementsToSingleElements()
+        {
+            // Arrange
+
+            // Act
+            var converted = ModelBindingHelper.ConvertTo<string>(42, culture: null);
+
+            // Assert
+            Assert.NotNull(converted);
+            Assert.Equal("42", converted);
+        }
+
+        [Fact]
+        public void ConvertingNullStringToNullableIntReturnsNull()
+        {
+            // Arrange
+
+            // Act
+            var returned = ModelBindingHelper.ConvertTo<int?>(value: null, culture: null);
+
+            // Assert
+            Assert.Null(returned);
+        }
+
+        [Fact]
+        public void ConvertingWhiteSpaceStringToNullableIntReturnsNull()
+        {
+            // Arrange
+            var original = " ";
+
+            // Act
+            var returned = ModelBindingHelper.ConvertTo<int?>(original, culture: null);
+
+            // Assert
+            Assert.Null(returned);
+        }
+
+        [Fact]
+        public void ConvertToReturnsNullIfArrayElementValueIsNull()
+        {
+            // Arrange
+
+            // Act
+            var outValue = ModelBindingHelper.ConvertTo(new string[] { null }, typeof(int), culture: null);
+
+            // Assert
+            Assert.Null(outValue);
+        }
+
+        [Fact]
+        public void ConvertToReturnsNullIfTryingToConvertEmptyArrayToSingleElement()
+        {
+            // Arrange
+
+            // Act
+            var outValue = ModelBindingHelper.ConvertTo(new int[0], typeof(int), culture: null);
+
+            // Assert
+            Assert.Null(outValue);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(" \t \r\n ")]
+        public void ConvertToReturnsNullIfTrimmedValueIsEmptyString(object value)
+        {
+            // Arrange
+            // Act
+            var outValue = ModelBindingHelper.ConvertTo(value, typeof(int), culture: null);
+
+            // Assert
+            Assert.Null(outValue);
+        }
+
+        [Fact]
+        public void ConvertToReturnsNull_IfConvertingNullToArrayType()
+        {
+            // Arrange
+
+            // Act
+            var outValue = ModelBindingHelper.ConvertTo(value: null, type: typeof(int[]), culture: null);
+
+            // Assert
+            Assert.Null(outValue);
+        }
+
+        [Fact]
+        public void ConvertToReturnsValueIfArrayElementIsIntegerAndDestinationTypeIsEnum()
+        {
+            // Arrange
+
+            // Act
+            var outValue = ModelBindingHelper.ConvertTo(new object[] { 1 }, typeof(IntEnum), culture: null);
+
+            // Assert
+            Assert.Equal(IntEnum.Value1, outValue);
+        }
+
+        [Theory]
+        [InlineData(1, typeof(IntEnum), IntEnum.Value1)]
+        [InlineData(1L, typeof(LongEnum), LongEnum.Value1)]
+        [InlineData(long.MaxValue, typeof(LongEnum), LongEnum.MaxValue)]
+        [InlineData(1U, typeof(UnsignedIntEnum), UnsignedIntEnum.Value1)]
+        [InlineData(1UL, typeof(IntEnum), IntEnum.Value1)]
+        [InlineData((byte)1, typeof(ByteEnum), ByteEnum.Value1)]
+        [InlineData(byte.MaxValue, typeof(ByteEnum), ByteEnum.MaxValue)]
+        [InlineData((sbyte)1, typeof(ByteEnum), ByteEnum.Value1)]
+        [InlineData((short)1, typeof(IntEnum), IntEnum.Value1)]
+        [InlineData((ushort)1, typeof(IntEnum), IntEnum.Value1)]
+        [InlineData(int.MaxValue, typeof(IntEnum?), IntEnum.MaxValue)]
+        [InlineData(null, typeof(IntEnum?), null)]
+        [InlineData(1L, typeof(LongEnum?), LongEnum.Value1)]
+        [InlineData(null, typeof(LongEnum?), null)]
+        [InlineData(uint.MaxValue, typeof(UnsignedIntEnum?), UnsignedIntEnum.MaxValue)]
+        [InlineData((byte)1, typeof(ByteEnum?), ByteEnum.Value1)]
+        [InlineData(null, typeof(ByteEnum?), null)]
+        [InlineData((ushort)1, typeof(LongEnum?), LongEnum.Value1)]
+        public void ConvertToReturnsValueIfArrayElementIsAnyIntegerTypeAndDestinationTypeIsEnum(
+            object input,
+            Type enumType,
+            object expected)
+        {
+            // Arrange
+
+            // Act
+            var outValue = ModelBindingHelper.ConvertTo(new object[] { input }, enumType, culture: null);
+
+            // Assert
+            Assert.Equal(expected, outValue);
+        }
+
+        [Fact]
+        public void ConvertToReturnsValueIfArrayElementIsStringValueAndDestinationTypeIsEnum()
+        {
+            // Arrange
+
+            // Act
+            var outValue = ModelBindingHelper.ConvertTo(new object[] { "1" }, typeof(IntEnum), culture: null);
+
+            // Assert
+            Assert.Equal(IntEnum.Value1, outValue);
+        }
+
+        [Fact]
+        public void ConvertToReturnsValueIfArrayElementIsStringKeyAndDestinationTypeIsEnum()
+        {
+            // Arrange
+
+            // Act
+            var outValue = ModelBindingHelper.ConvertTo(new object[] { "Value1" }, typeof(IntEnum), culture: null);
+
+            // Assert
+            Assert.Equal(IntEnum.Value1, outValue);
+        }
+
+        [Fact]
+        public void ConvertToReturnsValueIfElementIsStringAndDestinationIsNullableInteger()
+        {
+            // Arrange
+
+            // Act
+            var outValue = ModelBindingHelper.ConvertTo("12", typeof(int?), culture: null);
+
+            // Assert
+            Assert.Equal(12, outValue);
+        }
+
+        [Fact]
+        public void ConvertToReturnsValueIfElementIsStringAndDestinationIsNullableDouble()
+        {
+            // Arrange
+
+            // Act
+            var outValue = ModelBindingHelper.ConvertTo("12.5", typeof(double?), culture: null);
+
+            // Assert
+            Assert.Equal(12.5, outValue);
+        }
+
+        [Fact]
+        public void ConvertToReturnsValueIfElementIsDecimalAndDestinationIsNullableInteger()
+        {
+            // Arrange
+
+            // Act
+            var outValue = ModelBindingHelper.ConvertTo(12M, typeof(int?), culture: null);
+
+            // Assert
+            Assert.Equal(12, outValue);
+        }
+
+        [Fact]
+        public void ConvertToReturnsValueIfElementIsDecimalAndDestinationIsNullableDouble()
+        {
+            // Arrange
+
+            // Act
+            var outValue = ModelBindingHelper.ConvertTo(12.5M, typeof(double?), culture: null);
+
+            // Assert
+            Assert.Equal(12.5, outValue);
+        }
+
+        [Fact]
+        public void ConvertToReturnsValueIfElementIsDecimalDoubleAndDestinationIsNullableInteger()
+        {
+            // Arrange
+
+            // Act
+            var outValue = ModelBindingHelper.ConvertTo(12M, typeof(int?), culture: null);
+
+            // Assert
+            Assert.Equal(12, outValue);
+        }
+
+        [Fact]
+        public void ConvertToReturnsValueIfElementIsDecimalDoubleAndDestinationIsNullableLong()
+        {
+            // Arrange
+
+            // Act
+            var outValue = ModelBindingHelper.ConvertTo(12M, typeof(long?), culture: null);
+
+            // Assert
+            Assert.Equal(12L, outValue);
+        }
+
+        [Fact]
+        public void ConvertToReturnsValueIfArrayElementInstanceOfDestinationType()
+        {
+            // Arrange
+
+            // Act
+            var outValue = ModelBindingHelper.ConvertTo(new object[] { "some string" }, typeof(string), culture: null);
+
+            // Assert
+            Assert.Equal("some string", outValue);
+        }
+
+        [Theory]
+        [InlineData(new object[] { new object[] { 1, 0 } })]
+        [InlineData(new object[] { new[] { "Value1", "Value0" } })]
+        [InlineData(new object[] { new[] { "Value1", "value0" } })]
+        public void ConvertTo_ConvertsEnumArrays(object value)
+        {
+            // Arrange
+
+            // Act
+            var outValue = ModelBindingHelper.ConvertTo(value, typeof(IntEnum[]), culture: null);
+
+            // Assert
+            var result = Assert.IsType<IntEnum[]>(outValue);
+            Assert.Equal(2, result.Length);
+            Assert.Equal(IntEnum.Value1, result[0]);
+            Assert.Equal(IntEnum.Value0, result[1]);
+        }
+
+        [Theory]
+        [InlineData(new object[] { new object[] { 1, 2 }, new[] { FlagsEnum.Value1, FlagsEnum.Value2 } })]
+        [InlineData(new object[] { new[] { "Value1", "Value2" }, new[] { FlagsEnum.Value1, FlagsEnum.Value2 } })]
+        [InlineData(new object[] { new object[] { 5, 2 }, new[] { FlagsEnum.Value1 | FlagsEnum.Value4, FlagsEnum.Value2 } })]
+        public void ConvertTo_ConvertsFlagsEnumArrays(object value, FlagsEnum[] expected)
+        {
+            // Arrange
+
+            // Act
+            var outValue = ModelBindingHelper.ConvertTo(value, typeof(FlagsEnum[]), culture: null);
+
+            // Assert
+            var result = Assert.IsType<FlagsEnum[]>(outValue);
+            Assert.Equal(2, result.Length);
+            Assert.Equal(expected[0], result[0]);
+            Assert.Equal(expected[1], result[1]);
+        }
+
+        [Fact]
+        public void ConvertToReturnsValueIfInstanceOfDestinationType()
+        {
+            // Arrange
+            var original = new[] { "some string" };
+
+            // Act
+            var outValue = ModelBindingHelper.ConvertTo(original, typeof(string[]), culture: null);
+
+            // Assert
+            Assert.Same(original, outValue);
+        }
+
+        [Theory]
+        [InlineData(typeof(int))]
+        [InlineData(typeof(double?))]
+        [InlineData(typeof(IntEnum?))]
+        public void ConvertToThrowsIfConverterThrows(Type destinationType)
+        {
+            // Arrange
+
+            // Act & Assert
+            var ex = Assert.Throws<FormatException>(
+                () => ModelBindingHelper.ConvertTo("this-is-not-a-valid-value", destinationType, culture: null));
+        }
+
+        [Fact]
+        public void ConvertToUsesProvidedCulture()
+        {
+            // Arrange
+
+            // Act
+            var cultureResult = ModelBindingHelper.ConvertTo("12,5", typeof(decimal), new CultureInfo("fr-FR"));
+
+            // Assert
+            Assert.Equal(12.5M, cultureResult);
+            Assert.Throws<FormatException>(
+                () => ModelBindingHelper.ConvertTo("12,5", typeof(decimal), new CultureInfo("en-GB")));
+        }
+
+        [Theory]
+        [MemberData(nameof(IntrinsicConversionData))]
+        public void ConvertToCanConvertIntrinsics<T>(object initialValue, T expectedValue)
+        {
+            // Arrange
+
+            // Act & Assert
+            Assert.Equal(expectedValue, ModelBindingHelper.ConvertTo(initialValue, typeof(T), culture: null));
+        }
+
+        public static IEnumerable<object[]> IntrinsicConversionData
+        {
+            get
+            {
+                yield return new object[] { 42, 42L };
+                yield return new object[] { 42, (short)42 };
+                yield return new object[] { 42, (float)42.0 };
+                yield return new object[] { 42, (double)42.0 };
+                yield return new object[] { 42M, 42 };
+                yield return new object[] { 42L, 42 };
+                yield return new object[] { 42, (byte)42 };
+                yield return new object[] { (short)42, 42 };
+                yield return new object[] { (float)42.0, 42 };
+                yield return new object[] { (double)42.0, 42 };
+                yield return new object[] { (byte)42, 42 };
+                yield return new object[] { "2008-01-01", new DateTime(2008, 01, 01) };
+                yield return new object[] { "00:00:20", TimeSpan.FromSeconds(20) };
+                yield return new object[]
+                {
+                    "c6687d3a-51f9-4159-8771-a66d2b7d7038",
+                    Guid.Parse("c6687d3a-51f9-4159-8771-a66d2b7d7038")
+                };
+            }
+        }
+
+        // None of the types here have converters from MyClassWithoutConverter.
+        [Theory]
+        [InlineData(typeof(TimeSpan))]
+        [InlineData(typeof(DateTime))]
+        [InlineData(typeof(DateTimeOffset))]
+        [InlineData(typeof(Guid))]
+        [InlineData(typeof(IntEnum))]
+        public void ConvertTo_Throws_IfValueIsNotConvertible(Type destinationType)
+        {
+            // Arrange
+            var expectedMessage = $"The parameter conversion from type '{typeof(MyClassWithoutConverter)}' to type " +
+                $"'{destinationType}' failed because no type converter can convert between these types.";
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(
+                () => ModelBindingHelper.ConvertTo(new MyClassWithoutConverter(), destinationType, culture: null));
+            Assert.Equal(expectedMessage, ex.Message);
+        }
+
+        // String does not have a converter to MyClassWithoutConverter.
+        [Fact]
+        public void ConvertTo_Throws_IfDestinationTypeIsNotConvertible()
+        {
+            // Arrange
+            var value = "Hello world";
+            var destinationType = typeof(MyClassWithoutConverter);
+            var expectedMessage = $"The parameter conversion from type '{value.GetType()}' to type " +
+                $"'{typeof(MyClassWithoutConverter)}' failed because no type converter can convert between these types.";
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(
+                () => ModelBindingHelper.ConvertTo(value, destinationType, culture: null));
+            Assert.Equal(expectedMessage, ex.Message);
+        }
+
+        // Happens very rarely in practice since conversion is almost-always from strings or string arrays.
+        [Theory]
+        [InlineData(typeof(MyClassWithoutConverter))]
+        [InlineData(typeof(MySubClassWithoutConverter))]
+        public void ConvertTo_ReturnsValue_IfCompatible(Type destinationType)
+        {
+            // Arrange
+            var value = new MySubClassWithoutConverter();
+
+            // Act
+            var result = ModelBindingHelper.ConvertTo(value, destinationType, culture: null);
+
+            // Assert
+            Assert.Same(value, result);
+        }
+
+        [Theory]
+        [InlineData(typeof(MyClassWithoutConverter[]))]
+        [InlineData(typeof(MySubClassWithoutConverter[]))]
+        public void ConvertTo_ReusesArrayElements_IfCompatible(Type destinationType)
+        {
+            // Arrange
+            var value = new MyClassWithoutConverter[]
+            {
+                new MySubClassWithoutConverter(),
+                new MySubClassWithoutConverter(),
+                new MySubClassWithoutConverter(),
+            };
+
+            // Act
+            var result = ModelBindingHelper.ConvertTo(value, destinationType, culture: null);
+
+            // Assert
+            Assert.IsType(destinationType, result);
+            Assert.Collection(
+                result as IEnumerable<MyClassWithoutConverter>,
+                element => { Assert.Same(value[0], element); },
+                element => { Assert.Same(value[1], element); },
+                element => { Assert.Same(value[2], element); });
+        }
+
+        [Theory]
+        [InlineData(new object[] { 2, FlagsEnum.Value2 })]
+        [InlineData(new object[] { 5, FlagsEnum.Value1 | FlagsEnum.Value4 })]
+        [InlineData(new object[] { 15, FlagsEnum.Value1 | FlagsEnum.Value2 | FlagsEnum.Value4 | FlagsEnum.Value8 })]
+        [InlineData(new object[] { 16, (FlagsEnum)16 })]
+        [InlineData(new object[] { 0, (FlagsEnum)0 })]
+        [InlineData(new object[] { null, (FlagsEnum)0 })]
+        [InlineData(new object[] { "Value1,Value2", (FlagsEnum)3 })]
+        [InlineData(new object[] { "Value1,Value2,value4, value8", (FlagsEnum)15 })]
+        public void ConvertTo_ConvertsEnumFlags(object value, object expected)
+        {
+            // Arrange
+
+            // Act
+            var outValue = ModelBindingHelper.ConvertTo<FlagsEnum>(value, culture: null);
+
+            // Assert
+            Assert.Equal(expected, outValue);
+        }
+
+        [Theory]
+        [InlineData(typeof(int))]
+        [InlineData(typeof(int[]))]
+        [InlineData(typeof(IEnumerable<int>))]
+        [InlineData(typeof(IReadOnlyCollection<int>))]
+        [InlineData(typeof(IReadOnlyList<int>))]
+        [InlineData(typeof(ICollection<int>))]
+        [InlineData(typeof(IList<int>))]
+        [InlineData(typeof(List<int>))]
+        [InlineData(typeof(Collection<int>))]
+        [InlineData(typeof(IntList))]
+        [InlineData(typeof(LinkedList<int>))]
+        public void CanGetCompatibleCollection_ReturnsTrue(Type destinationType)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(destinationType);
+
+            // Act
+            var result = ModelBindingHelper.CanGetCompatibleCollection<int>(bindingContext);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData(typeof(int))]
+        [InlineData(typeof(int[]))]
+        [InlineData(typeof(IEnumerable<int>))]
+        [InlineData(typeof(IReadOnlyCollection<int>))]
+        [InlineData(typeof(IReadOnlyList<int>))]
+        [InlineData(typeof(ICollection<int>))]
+        [InlineData(typeof(IList<int>))]
+        [InlineData(typeof(List<int>))]
+        public void GetCompatibleCollection_ReturnsList(Type destinationType)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(destinationType);
+
+            // Act
+            var result = ModelBindingHelper.GetCompatibleCollection<int>(bindingContext);
+
+            // Assert
+            Assert.IsType<List<int>>(result);
+        }
+
+        [Theory]
+        [InlineData(typeof(Collection<int>))]
+        [InlineData(typeof(IntList))]
+        [InlineData(typeof(LinkedList<int>))]
+        public void GetCompatibleCollection_ActivatesCollection(Type destinationType)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(destinationType);
+
+            // Act
+            var result = ModelBindingHelper.GetCompatibleCollection<int>(bindingContext);
+
+            // Assert
+            Assert.IsType(destinationType, result);
+        }
+
+        [Fact]
+        public void GetCompatibleCollection_SetsCapacity()
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(typeof(IList<int>));
+
+            // Act
+            var result = ModelBindingHelper.GetCompatibleCollection<int>(bindingContext, capacity: 23);
+
+            // Assert
+            var list = Assert.IsType<List<int>>(result);
+            Assert.Equal(23, list.Capacity);
+        }
+
+        [Theory]
+        [InlineData(nameof(ModelWithReadOnlyAndSpecialCaseProperties.ArrayProperty))]
+        [InlineData(nameof(ModelWithReadOnlyAndSpecialCaseProperties.ArrayPropertyWithValue))]
+        [InlineData(nameof(ModelWithReadOnlyAndSpecialCaseProperties.EnumerableProperty))]
+        [InlineData(nameof(ModelWithReadOnlyAndSpecialCaseProperties.EnumerablePropertyWithArrayValue))]
+        [InlineData(nameof(ModelWithReadOnlyAndSpecialCaseProperties.ListProperty))]
+        [InlineData(nameof(ModelWithReadOnlyAndSpecialCaseProperties.ScalarProperty))]
+        [InlineData(nameof(ModelWithReadOnlyAndSpecialCaseProperties.ScalarPropertyWithValue))]
+        public void CanGetCompatibleCollection_ReturnsTrue_IfReadOnly(string propertyName)
+        {
+            // Arrange
+            var bindingContext = GetBindingContextForProperty(propertyName);
+
+            // Act
+            var result = ModelBindingHelper.CanGetCompatibleCollection<int>(bindingContext);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData(nameof(ModelWithReadOnlyAndSpecialCaseProperties.EnumerablePropertyWithArrayValueAndSetter))]
+        [InlineData(nameof(ModelWithReadOnlyAndSpecialCaseProperties.EnumerablePropertyWithListValue))]
+        [InlineData(nameof(ModelWithReadOnlyAndSpecialCaseProperties.ListPropertyWithValue))]
+        public void CanGetCompatibleCollection_ReturnsTrue_IfCollection(string propertyName)
+        {
+            // Arrange
+            var bindingContext = GetBindingContextForProperty(propertyName);
+
+            // Act
+            var result = ModelBindingHelper.CanGetCompatibleCollection<int>(bindingContext);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData(nameof(ModelWithReadOnlyAndSpecialCaseProperties.EnumerablePropertyWithListValue))]
+        [InlineData(nameof(ModelWithReadOnlyAndSpecialCaseProperties.ListPropertyWithValue))]
+        public void GetCompatibleCollection_ReturnsExistingCollection(string propertyName)
+        {
+            // Arrange
+            var bindingContext = GetBindingContextForProperty(propertyName);
+
+            // Act
+            var result = ModelBindingHelper.GetCompatibleCollection<int>(bindingContext);
+
+            // Assert
+            Assert.Same(bindingContext.Model, result);
+            var list = Assert.IsType<List<int>>(result);
+            Assert.Empty(list);
+        }
+
+        [Fact]
+        public void CanGetCompatibleCollection_ReturnsNewCollection()
+        {
+            // Arrange
+            var bindingContext = GetBindingContextForProperty(
+                nameof(ModelWithReadOnlyAndSpecialCaseProperties.EnumerablePropertyWithArrayValueAndSetter));
+
+            // Act
+            var result = ModelBindingHelper.GetCompatibleCollection<int>(bindingContext);
+
+            // Assert
+            Assert.NotSame(bindingContext.Model, result);
+            var list = Assert.IsType<List<int>>(result);
+            Assert.Empty(list);
+        }
+
+        [Theory]
+        [InlineData(typeof(Collection<string>))]
+        [InlineData(typeof(List<long>))]
+        [InlineData(typeof(MyModel))]
+        [InlineData(typeof(AbstractIntList))]
+        [InlineData(typeof(ISet<int>))]
+        public void CanGetCompatibleCollection_ReturnsFalse(Type destinationType)
+        {
+            // Arrange
+            var bindingContext = GetBindingContext(destinationType);
+
+            // Act
+            var result = ModelBindingHelper.CanGetCompatibleCollection<int>(bindingContext);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        private static ActionContext GetActionContext()
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+
+            return new ActionContext()
+            {
+                HttpContext = new DefaultHttpContext()
+                {
+                    RequestServices = services.BuildServiceProvider()
+                }
+            };
+        }
+
+        private static DefaultModelBindingContext GetBindingContextForProperty(string propertyName)
+        {
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelMetadata = metadataProvider.GetMetadataForProperty(
+                typeof(ModelWithReadOnlyAndSpecialCaseProperties),
+                propertyName);
+            var bindingContext = GetBindingContext(modelMetadata);
+
+            var container = new ModelWithReadOnlyAndSpecialCaseProperties();
+            bindingContext.Model = modelMetadata.PropertyGetter(container);
+
+            return bindingContext;
+        }
+
+        private static DefaultModelBindingContext GetBindingContext(Type modelType)
+        {
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var metadata = metadataProvider.GetMetadataForType(modelType);
+
+            return GetBindingContext(metadata);
+        }
+
+        private static DefaultModelBindingContext GetBindingContext(ModelMetadata metadata)
+        {
+            var bindingContext = new DefaultModelBindingContext
+            {
+                ModelMetadata = metadata,
+            };
+
+            return bindingContext;
+        }
+
+        private class ModelWithReadOnlyAndSpecialCaseProperties
+        {
+            public int[] ArrayProperty { get; }
+
+            public int[] ArrayPropertyWithValue { get; } = new int[4];
+
+            public IEnumerable<int> EnumerableProperty { get; }
+
+            public IEnumerable<int> EnumerablePropertyWithArrayValue { get; } = new int[4];
+
+            // Special case: Value cannot be used but property can be set.
+            public IEnumerable<int> EnumerablePropertyWithArrayValueAndSetter { get; set; } = new int[4];
+
+            public IEnumerable<int> EnumerablePropertyWithListValue { get; } = new List<int> { 23 };
+
+            public List<int> ListProperty { get; }
+
+            public List<int> ListPropertyWithValue { get; } = new List<int> { 23 };
+
+            public int ScalarProperty { get; }
+
+            public int ScalarPropertyWithValue { get; } = 23;
+        }
+
+        private class MyClassWithoutConverter
+        {
+        }
+
+        private class MySubClassWithoutConverter : MyClassWithoutConverter
+        {
+        }
+
+        private abstract class AbstractIntList : List<int>
+        {
+        }
+
+        private class IntList : List<int>
+        {
+        }
+
+        private enum IntEnum
+        {
+            Value0 = 0,
+            Value1 = 1,
+            MaxValue = int.MaxValue
+        }
+
+        private enum LongEnum : long
+        {
+            Value0 = 0L,
+            Value1 = 1L,
+            MaxValue = long.MaxValue
+        }
+
+        private enum UnsignedIntEnum : uint
+        {
+            Value0 = 0U,
+            Value1 = 1U,
+            MaxValue = uint.MaxValue
+        }
+
+        private enum ByteEnum : byte
+        {
+            Value0 = 0,
+            Value1 = 1,
+            MaxValue = byte.MaxValue
+        }
+
+        [Flags]
+        public enum FlagsEnum
+        {
+            Value1 = 1,
+            Value2 = 2,
+            Value4 = 4,
+            Value8 = 8
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBindingResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBindingResultTest.cs
new file mode 100644
index 0000000000..9fa90d53dc
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBindingResultTest.cs
@@ -0,0 +1,35 @@
+// 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.
+
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Test
+{
+    public class ModelBindingResultTest
+    {
+        [Fact]
+        public void Success_SetsProperties()
+        {
+            // Arrange
+            var model = "some model";
+
+            // Act
+            var result = ModelBindingResult.Success(model);
+
+            // Assert
+            Assert.True(result.IsModelSet);
+            Assert.Same(model, result.Model);
+        }
+        
+        [Fact]
+        public void Failed_SetsProperties()
+        {
+            // Arrange & Act
+            var result = ModelBindingResult.Failed();
+
+            // Assert
+            Assert.False(result.IsModelSet);
+            Assert.Null(result.Model);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ParameterBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ParameterBinderTest.cs
new file mode 100644
index 0000000000..7a605c4640
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ParameterBinderTest.cs
@@ -0,0 +1,915 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Logging.Testing;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class ParameterBinderTest
+    {
+        private static readonly IOptions<MvcOptions> _optionsAccessor = Options.Create(new MvcOptions
+        {
+            AllowValidatingTopLevelNodes = true,
+        });
+
+        public static TheoryData BindModelAsyncData
+        {
+            get
+            {
+                var emptyBindingInfo = new BindingInfo();
+                var bindingInfoWithName = new BindingInfo
+                {
+                    BinderModelName = "bindingInfoName",
+                    BinderType = typeof(Person),
+                };
+
+                // parameterBindingInfo, metadataBinderModelName, parameterName, expectedBinderModelName
+                return new TheoryData<BindingInfo, string, string, string>
+                {
+                    // If the parameter name is not a prefix match, it is ignored. But name is required to create a
+                    // ModelBindingContext.
+                    { null, null, "parameterName", string.Empty },
+                    { emptyBindingInfo, null, "parameterName", string.Empty },
+                    { bindingInfoWithName, null, "parameterName", "bindingInfoName" },
+                    { null, "modelBinderName", "parameterName", "modelBinderName" },
+                    { null, null, "parameterName", string.Empty },
+                    // Parameter's BindingInfo has highest precedence
+                    { bindingInfoWithName, "modelBinderName", "parameterName", "bindingInfoName" },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(BindModelAsyncData))]
+        public async Task BindModelAsync_PassesExpectedBindingInfoAndMetadata_IfPrefixDoesNotMatch(
+            BindingInfo parameterBindingInfo,
+            string metadataBinderModelName,
+            string parameterName,
+            string expectedModelName)
+        {
+            // Arrange
+            var binderExecuted = false;
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider.ForType<Person>().BindingDetails(binding =>
+            {
+                binding.BinderModelName = metadataBinderModelName;
+            });
+
+            var metadata = metadataProvider.GetMetadataForType(typeof(Person));
+            var modelBinder = new Mock<IModelBinder>();
+            modelBinder
+                .Setup(b => b.BindModelAsync(It.IsAny<ModelBindingContext>()))
+                .Callback((ModelBindingContext context) =>
+                {
+                    Assert.Equal(expectedModelName, context.ModelName, StringComparer.Ordinal);
+                })
+                .Returns(Task.CompletedTask);
+
+            var parameterDescriptor = new ParameterDescriptor
+            {
+                BindingInfo = parameterBindingInfo,
+                Name = parameterName,
+                ParameterType = typeof(Person),
+            };
+
+            var factory = new Mock<IModelBinderFactory>(MockBehavior.Strict);
+            factory
+                .Setup(f => f.CreateBinder(It.IsAny<ModelBinderFactoryContext>()))
+                .Callback((ModelBinderFactoryContext context) =>
+                {
+                    binderExecuted = true;
+                    // Confirm expected data is passed through to ModelBindingFactory.
+                    Assert.Same(parameterDescriptor.BindingInfo, context.BindingInfo);
+                    Assert.Same(parameterDescriptor, context.CacheToken);
+                    Assert.Equal(metadata, context.Metadata);
+                })
+                .Returns(modelBinder.Object);
+
+            var parameterBinder = new ParameterBinder(
+                metadataProvider,
+                factory.Object,
+                Mock.Of<IObjectModelValidator>(),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            var controllerContext = GetControllerContext();
+
+            // Act & Assert
+            await parameterBinder.BindModelAsync(controllerContext, new SimpleValueProvider(), parameterDescriptor);
+            Assert.True(binderExecuted);
+
+        }
+
+        [Fact]
+        public async Task BindModelAsync_PassesExpectedBindingInfoAndMetadata_IfPrefixMatches()
+        {
+            // Arrange
+            var expectedModelName = "expectedName";
+            var binderExecuted = false;
+
+            var metadataProvider = new TestModelMetadataProvider();
+            var metadata = metadataProvider.GetMetadataForType(typeof(Person));
+            var modelBinder = new Mock<IModelBinder>();
+            modelBinder
+                .Setup(b => b.BindModelAsync(It.IsAny<ModelBindingContext>()))
+                .Callback((ModelBindingContext context) =>
+                {
+                    Assert.Equal(expectedModelName, context.ModelName, StringComparer.Ordinal);
+                })
+                .Returns(Task.CompletedTask);
+
+            var parameterDescriptor = new ParameterDescriptor
+            {
+                Name = expectedModelName,
+                ParameterType = typeof(Person),
+            };
+
+            var factory = new Mock<IModelBinderFactory>(MockBehavior.Strict);
+            factory
+                .Setup(f => f.CreateBinder(It.IsAny<ModelBinderFactoryContext>()))
+                .Callback((ModelBinderFactoryContext context) =>
+                {
+                    binderExecuted = true;
+                    // Confirm expected data is passed through to ModelBindingFactory.
+                    Assert.Null(context.BindingInfo);
+                    Assert.Same(parameterDescriptor, context.CacheToken);
+                    Assert.Equal(metadata, context.Metadata);
+                })
+                .Returns(modelBinder.Object);
+
+            var argumentBinder = new ParameterBinder(
+                metadataProvider,
+                factory.Object,
+                Mock.Of<IObjectModelValidator>(),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            var valueProvider = new SimpleValueProvider
+            {
+                { expectedModelName, new object() },
+            };
+            var valueProviderFactory = new SimpleValueProviderFactory(valueProvider);
+
+            var controllerContext = GetControllerContext();
+
+            // Act & Assert
+            await argumentBinder.BindModelAsync(controllerContext, valueProvider, parameterDescriptor);
+            Assert.True(binderExecuted);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_EnforcesTopLevelBindRequired()
+        {
+            // Arrange
+            var actionContext = GetControllerContext();
+
+            var mockModelMetadata = CreateMockModelMetadata();
+            mockModelMetadata.Setup(o => o.IsBindingRequired).Returns(true);
+            mockModelMetadata.Setup(o => o.DisplayName).Returns("Ignored Display Name"); // Bind attribute errors are phrased in terms of the model name, not display name
+
+            var parameterBinder = CreateParameterBinder(mockModelMetadata.Object);
+            var modelBindingResult = ModelBindingResult.Failed();
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(
+                actionContext,
+                CreateMockModelBinder(modelBindingResult),
+                CreateMockValueProvider(),
+                new ParameterDescriptor { Name = "myParam", ParameterType = typeof(Person) },
+                mockModelMetadata.Object,
+                "ignoredvalue");
+
+            // Assert
+            Assert.False(actionContext.ModelState.IsValid);
+            Assert.Equal("myParam", actionContext.ModelState.Single().Key);
+            Assert.Equal(
+                new DefaultModelBindingMessageProvider().MissingBindRequiredValueAccessor("myParam"),
+                actionContext.ModelState.Single().Value.Errors.Single().ErrorMessage);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_DoesNotEnforceTopLevelBindRequired_IfNotValidatingTopLevelNodes()
+        {
+            // Arrange
+            var actionContext = GetControllerContext();
+
+            var mockModelMetadata = CreateMockModelMetadata();
+            mockModelMetadata.Setup(o => o.IsBindingRequired).Returns(true);
+
+            // Bind attribute errors are phrased in terms of the model name, not display name
+            mockModelMetadata.Setup(o => o.DisplayName).Returns("Ignored Display Name");
+
+            // Do not set AllowValidatingTopLevelNodes.
+            var optionsAccessor = Options.Create(new MvcOptions());
+            var parameterBinder = CreateParameterBinder(mockModelMetadata.Object, optionsAccessor: optionsAccessor);
+            var modelBindingResult = ModelBindingResult.Failed();
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(
+                actionContext,
+                CreateMockModelBinder(modelBindingResult),
+                CreateMockValueProvider(),
+                new ParameterDescriptor { Name = "myParam", ParameterType = typeof(Person) },
+                mockModelMetadata.Object,
+                "ignoredvalue");
+
+            // Assert
+            Assert.True(actionContext.ModelState.IsValid);
+            Assert.Empty(actionContext.ModelState);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_EnforcesTopLevelRequired()
+        {
+            // Arrange
+            var actionContext = GetControllerContext();
+            var mockModelMetadata = CreateMockModelMetadata();
+            mockModelMetadata.Setup(o => o.IsRequired).Returns(true);
+            mockModelMetadata.Setup(o => o.DisplayName).Returns("My Display Name");
+            mockModelMetadata.Setup(o => o.ValidatorMetadata).Returns(new[]
+            {
+                new RequiredAttribute()
+            });
+
+            var validator = new DataAnnotationsModelValidator(
+                new ValidationAttributeAdapterProvider(),
+                new RequiredAttribute(),
+                stringLocalizer: null);
+
+            var parameterBinder = CreateParameterBinder(mockModelMetadata.Object, validator);
+            var modelBindingResult = ModelBindingResult.Success(null);
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(
+                actionContext,
+                CreateMockModelBinder(modelBindingResult),
+                CreateMockValueProvider(),
+                new ParameterDescriptor { Name = "myParam", ParameterType = typeof(Person) },
+                mockModelMetadata.Object,
+                "ignoredvalue");
+
+            // Assert
+            Assert.False(actionContext.ModelState.IsValid);
+            Assert.Equal("myParam", actionContext.ModelState.Single().Key);
+            Assert.Equal(
+                new RequiredAttribute().FormatErrorMessage("My Display Name"),
+                actionContext.ModelState.Single().Value.Errors.Single().ErrorMessage);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_DoesNotEnforceTopLevelRequired_IfNotValidatingTopLevelNodes()
+        {
+            // Arrange
+            var actionContext = GetControllerContext();
+            var mockModelMetadata = CreateMockModelMetadata();
+            mockModelMetadata.Setup(o => o.IsRequired).Returns(true);
+            mockModelMetadata.Setup(o => o.DisplayName).Returns("My Display Name");
+            mockModelMetadata.Setup(o => o.ValidatorMetadata).Returns(new[]
+            {
+                new RequiredAttribute()
+            });
+
+            var validator = new DataAnnotationsModelValidator(
+                new ValidationAttributeAdapterProvider(),
+                new RequiredAttribute(),
+                stringLocalizer: null);
+
+            // Do not set AllowValidatingTopLevelNodes.
+            var optionsAccessor = Options.Create(new MvcOptions());
+            var parameterBinder = CreateParameterBinder(mockModelMetadata.Object, validator, optionsAccessor);
+            var modelBindingResult = ModelBindingResult.Success(null);
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(
+                actionContext,
+                CreateMockModelBinder(modelBindingResult),
+                CreateMockValueProvider(),
+                new ParameterDescriptor { Name = "myParam", ParameterType = typeof(Person) },
+                mockModelMetadata.Object,
+                "ignoredvalue");
+
+            // Assert
+            Assert.True(actionContext.ModelState.IsValid);
+            Assert.Empty(actionContext.ModelState);
+        }
+
+        public static TheoryData<RequiredAttribute, ParameterDescriptor, ModelMetadata> EnforcesTopLevelRequiredDataSet
+        {
+            get
+            {
+                var attribute = new RequiredAttribute();
+                var bindingInfo = new BindingInfo
+                {
+                    BinderModelName = string.Empty,
+                };
+                var parameterDescriptor = new ParameterDescriptor
+                {
+                    Name = string.Empty,
+                    BindingInfo = bindingInfo,
+                    ParameterType = typeof(Person),
+                };
+
+                var method = typeof(Person).GetMethod(nameof(Person.Equals), new[] { typeof(Person) });
+                var parameter = method.GetParameters()[0]; // Equals(Person other)
+                var controllerParameterDescriptor = new ControllerParameterDescriptor
+                {
+                    Name = string.Empty,
+                    BindingInfo = bindingInfo,
+                    ParameterInfo = parameter,
+                    ParameterType = typeof(Person),
+                };
+
+                var provider1 = new TestModelMetadataProvider();
+                provider1
+                    .ForParameter(parameter)
+                    .ValidationDetails(d =>
+                    {
+                        d.IsRequired = true;
+                        d.ValidatorMetadata.Add(attribute);
+                    });
+                provider1
+                    .ForProperty(typeof(Family), nameof(Family.Mom))
+                    .ValidationDetails(d =>
+                    {
+                        d.IsRequired = true;
+                        d.ValidatorMetadata.Add(attribute);
+                    });
+
+                var provider2 = new TestModelMetadataProvider();
+                provider2
+                    .ForType(typeof(Person))
+                    .ValidationDetails(d =>
+                    {
+                        d.IsRequired = true;
+                        d.ValidatorMetadata.Add(attribute);
+                    });
+
+                return new TheoryData<RequiredAttribute, ParameterDescriptor, ModelMetadata>
+                {
+                    { attribute, parameterDescriptor, provider1.GetMetadataForParameter(parameter) },
+                    { attribute, parameterDescriptor, provider1.GetMetadataForProperty(typeof(Family), nameof(Family.Mom)) },
+                    { attribute, parameterDescriptor, provider2.GetMetadataForType(typeof(Person)) },
+                    { attribute, controllerParameterDescriptor, provider2.GetMetadataForType(typeof(Person)) },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(EnforcesTopLevelRequiredDataSet))]
+        public async Task BindModelAsync_EnforcesTopLevelRequiredAndLogsSuccessfully_WithEmptyPrefix(
+            RequiredAttribute attribute,
+            ParameterDescriptor parameterDescriptor,
+            ModelMetadata metadata)
+        {
+            // Arrange
+            var expectedKey = string.Empty;
+            var expectedFieldName = metadata.Name ?? nameof(Person);
+
+            var actionContext = GetControllerContext();
+            var validator = new DataAnnotationsModelValidator(
+                new ValidationAttributeAdapterProvider(),
+                attribute,
+                stringLocalizer: null);
+
+            var sink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
+            var parameterBinder = CreateParameterBinder(metadata, validator, loggerFactory: loggerFactory);
+            var modelBindingResult = ModelBindingResult.Success(null);
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(
+                actionContext,
+                CreateMockModelBinder(modelBindingResult),
+                CreateMockValueProvider(),
+                parameterDescriptor,
+                metadata,
+                "ignoredvalue");
+
+            // Assert
+            Assert.False(actionContext.ModelState.IsValid);
+            var modelState = Assert.Single(actionContext.ModelState);
+            Assert.Equal(expectedKey, modelState.Key);
+            var error = Assert.Single(modelState.Value.Errors);
+            Assert.Equal(attribute.FormatErrorMessage(expectedFieldName), error.ErrorMessage);
+            Assert.Equal(4, sink.Writes.Count());
+        }
+
+        [Fact]
+        public async Task BindModelAsync_EnforcesTopLevelDataAnnotationsAttribute()
+        {
+            // Arrange
+            var actionContext = GetControllerContext();
+            var mockModelMetadata = CreateMockModelMetadata();
+            var validationAttribute = new RangeAttribute(1, 100);
+            mockModelMetadata.Setup(o => o.DisplayName).Returns("My Display Name");
+            mockModelMetadata.Setup(o => o.ValidatorMetadata).Returns(new[] {
+                validationAttribute
+            });
+
+            var validator = new DataAnnotationsModelValidator(
+                new ValidationAttributeAdapterProvider(),
+                validationAttribute,
+                stringLocalizer: null);
+
+            var parameterBinder = CreateParameterBinder(mockModelMetadata.Object, validator);
+            var modelBindingResult = ModelBindingResult.Success(123);
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(
+                actionContext,
+                CreateMockModelBinder(modelBindingResult),
+                CreateMockValueProvider(),
+                new ParameterDescriptor { Name = "myParam", ParameterType = typeof(Person) },
+                mockModelMetadata.Object,
+                50); // This value is ignored, because test explicitly set the ModelBindingResult
+
+            // Assert
+            Assert.False(actionContext.ModelState.IsValid);
+            Assert.Equal("myParam", actionContext.ModelState.Single().Key);
+            Assert.Equal(
+                validationAttribute.FormatErrorMessage("My Display Name"),
+                actionContext.ModelState.Single().Value.Errors.Single().ErrorMessage);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_SupportsIObjectModelValidatorForBackCompat()
+        {
+            // Arrange
+            var actionContext = GetControllerContext();
+
+            var mockValidator = new Mock<IObjectModelValidator>(MockBehavior.Strict);
+            mockValidator
+                .Setup(o => o.Validate(
+                    It.IsAny<ActionContext>(),
+                    It.IsAny<ValidationStateDictionary>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>()))
+                .Callback((ActionContext context, ValidationStateDictionary validationState, string prefix, object model) =>
+                {
+                    context.ModelState.AddModelError(prefix, "Test validation message");
+                });
+
+            var modelMetadata = CreateMockModelMetadata().Object;
+            var parameterBinder = CreateBackCompatParameterBinder(
+                modelMetadata,
+                mockValidator.Object);
+            var modelBindingResult = ModelBindingResult.Success(123);
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(
+                actionContext,
+                CreateMockModelBinder(modelBindingResult),
+                CreateMockValueProvider(),
+                new ParameterDescriptor { Name = "myParam", ParameterType = typeof(Person) },
+                modelMetadata,
+                "ignored");
+
+            // Assert
+            Assert.False(actionContext.ModelState.IsValid);
+            Assert.Equal("myParam", actionContext.ModelState.Single().Key);
+            Assert.Equal(
+                "Test validation message",
+                actionContext.ModelState.Single().Value.Errors.Single().ErrorMessage);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_ForParameter_UsesValidationFromActualModel_WhenDerivedModelIsSet()
+        {
+            // Arrange
+            var method = GetType().GetMethod(nameof(TestMethodWithoutAttributes), BindingFlags.NonPublic | BindingFlags.Instance);
+            var parameter = method.GetParameters()[0];
+            var parameterDescriptor = new ControllerParameterDescriptor
+            {
+                ParameterInfo = parameter,
+                Name = parameter.Name,
+            };
+
+            var actionContext = GetControllerContext();
+            var modelMetadataProvider = new TestModelMetadataProvider();
+
+            var model = new DerivedPerson();
+            var modelBindingResult = ModelBindingResult.Success(model);
+
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                Mock.Of<IModelBinderFactory>(),
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new[] { TestModelValidatorProvider.CreateDefaultProvider() }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            var modelMetadata = modelMetadataProvider.GetMetadataForParameter(parameter);
+            var modelBinder = CreateMockModelBinder(modelBindingResult);
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(
+                actionContext,
+                modelBinder,
+                CreateMockValueProvider(),
+                parameterDescriptor,
+                modelMetadata,
+                value: null);
+
+            // Assert
+            Assert.True(result.IsModelSet);
+            Assert.Same(model, result.Model);
+
+            Assert.False(actionContext.ModelState.IsValid);
+            Assert.Collection(
+                actionContext.ModelState,
+                kvp =>
+                {
+                    Assert.Equal($"{parameter.Name}.{nameof(DerivedPerson.DerivedProperty)}", kvp.Key);
+                    var error = Assert.Single(kvp.Value.Errors);
+                    Assert.Equal("The DerivedProperty field is required.", error.ErrorMessage);
+                });
+        }
+
+        [Fact]
+        public async Task BindModelAsync_ForParameter_UsesValidationFromParameter_WhenDerivedModelIsSet()
+        {
+            // Arrange
+            var method = GetType().GetMethod(nameof(TestMethodWithAttributes), BindingFlags.NonPublic | BindingFlags.Instance);
+            var parameter = method.GetParameters()[0];
+            var parameterDescriptor = new ControllerParameterDescriptor
+            {
+                ParameterInfo = parameter,
+                Name = parameter.Name,
+            };
+
+            var actionContext = GetControllerContext();
+            var modelMetadataProvider = new TestModelMetadataProvider();
+
+            var model = new DerivedPerson { DerivedProperty = "SomeValue" };
+            var modelBindingResult = ModelBindingResult.Success(model);
+
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                Mock.Of<IModelBinderFactory>(),
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new[] { TestModelValidatorProvider.CreateDefaultProvider() }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            var modelMetadata = modelMetadataProvider.GetMetadataForParameter(parameter);
+            var modelBinder = CreateMockModelBinder(modelBindingResult);
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(
+                actionContext,
+                modelBinder,
+                CreateMockValueProvider(),
+                parameterDescriptor,
+                modelMetadata,
+                value: null);
+
+            // Assert
+            Assert.True(result.IsModelSet);
+            Assert.Same(model, result.Model);
+
+            Assert.False(actionContext.ModelState.IsValid);
+            Assert.Collection(
+                actionContext.ModelState,
+                kvp =>
+                {
+                    Assert.Equal(parameter.Name, kvp.Key);
+                    var error = Assert.Single(kvp.Value.Errors);
+                    Assert.Equal("Always Invalid", error.ErrorMessage);
+                });
+        }
+
+        [Fact]
+        public async Task BindModelAsync_ForProperty_UsesValidationFromActualModel_WhenDerivedModelIsSet()
+        {
+            // Arrange
+            var property = typeof(TestController).GetProperty(nameof(TestController.Model));
+            var parameterDescriptor = new ControllerBoundPropertyDescriptor
+            {
+                PropertyInfo = property,
+                Name = property.Name,
+            };
+
+            var actionContext = GetControllerContext();
+            var modelMetadataProvider = new TestModelMetadataProvider();
+
+            var model = new DerivedModel();
+            var modelBindingResult = ModelBindingResult.Success(model);
+
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                Mock.Of<IModelBinderFactory>(),
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new[] { TestModelValidatorProvider.CreateDefaultProvider() }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            var modelMetadata = modelMetadataProvider.GetMetadataForProperty(property.DeclaringType, property.Name);
+            var modelBinder = CreateMockModelBinder(modelBindingResult);
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(
+                actionContext,
+                modelBinder,
+                CreateMockValueProvider(),
+                parameterDescriptor,
+                modelMetadata,
+                value: null);
+
+            // Assert
+            Assert.True(result.IsModelSet);
+            Assert.Same(model, result.Model);
+
+            Assert.False(actionContext.ModelState.IsValid);
+            Assert.Collection(
+                actionContext.ModelState,
+                kvp =>
+                {
+                    Assert.Equal($"{property.Name}.{nameof(DerivedPerson.DerivedProperty)}", kvp.Key);
+                    var error = Assert.Single(kvp.Value.Errors);
+                    Assert.Equal("The DerivedProperty field is required.", error.ErrorMessage);
+                });
+        }
+
+        [Fact]
+        public async Task BindModelAsync_ForProperty_UsesValidationOnProperty_WhenDerivedModelIsSet()
+        {
+            // Arrange
+            var property = typeof(TestControllerWithValidatedProperties).GetProperty(nameof(TestControllerWithValidatedProperties.Model));
+            var parameterDescriptor = new ControllerBoundPropertyDescriptor
+            {
+                PropertyInfo = property,
+                Name = property.Name,
+            };
+
+            var actionContext = GetControllerContext();
+            var modelMetadataProvider = new TestModelMetadataProvider();
+
+            var model = new DerivedModel { DerivedProperty = "some value" };
+            var modelBindingResult = ModelBindingResult.Success(model);
+
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                Mock.Of<IModelBinderFactory>(),
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new[] { TestModelValidatorProvider.CreateDefaultProvider() }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            var modelMetadata = modelMetadataProvider.GetMetadataForProperty(property.DeclaringType, property.Name);
+            var modelBinder = CreateMockModelBinder(modelBindingResult);
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(
+                actionContext,
+                modelBinder,
+                CreateMockValueProvider(),
+                parameterDescriptor,
+                modelMetadata,
+                value: null);
+
+            // Assert
+            Assert.True(result.IsModelSet);
+            Assert.Same(model, result.Model);
+
+            Assert.False(actionContext.ModelState.IsValid);
+            Assert.Collection(
+                actionContext.ModelState,
+                kvp =>
+                {
+                    Assert.Equal($"{property.Name}", kvp.Key);
+                    var error = Assert.Single(kvp.Value.Errors);
+                    Assert.Equal("Always Invalid", error.ErrorMessage);
+                });
+        }
+
+        private static ControllerContext GetControllerContext()
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+
+            return new ControllerContext()
+            {
+                HttpContext = new DefaultHttpContext()
+                {
+                    RequestServices = services.BuildServiceProvider()
+                }
+            };
+        }
+
+        private static Mock<FakeModelMetadata> CreateMockModelMetadata()
+        {
+            var mockModelMetadata = new Mock<FakeModelMetadata>();
+            mockModelMetadata
+                .Setup(o => o.ModelBindingMessageProvider)
+                .Returns(new DefaultModelBindingMessageProvider());
+            return mockModelMetadata;
+        }
+
+        private static IModelBinder CreateMockModelBinder(ModelBindingResult modelBinderResult)
+        {
+            var mockBinder = new Mock<IModelBinder>(MockBehavior.Strict);
+            mockBinder
+                .Setup(o => o.BindModelAsync(It.IsAny<ModelBindingContext>()))
+                .Returns<ModelBindingContext>(context =>
+                {
+                    context.Result = modelBinderResult;
+                    return Task.CompletedTask;
+                });
+            return mockBinder.Object;
+        }
+
+        private static ParameterBinder CreateParameterBinder(
+            ModelMetadata modelMetadata,
+            IModelValidator validator = null,
+            IOptions<MvcOptions> optionsAccessor = null,
+            ILoggerFactory loggerFactory = null)
+        {
+            var mockModelMetadataProvider = new Mock<IModelMetadataProvider>(MockBehavior.Strict);
+            mockModelMetadataProvider
+                .Setup(o => o.GetMetadataForType(typeof(Person)))
+                .Returns(modelMetadata);
+
+            var mockModelBinderFactory = new Mock<IModelBinderFactory>(MockBehavior.Strict);
+            optionsAccessor = optionsAccessor ?? _optionsAccessor;
+            return new ParameterBinder(
+                mockModelMetadataProvider.Object,
+                mockModelBinderFactory.Object,
+                new DefaultObjectValidator(
+                    mockModelMetadataProvider.Object,
+                    new[] { GetModelValidatorProvider(validator) }),
+                optionsAccessor,
+                loggerFactory ?? NullLoggerFactory.Instance);
+        }
+
+        private static IModelValidatorProvider GetModelValidatorProvider(IModelValidator validator = null)
+        {
+            if (validator == null)
+            {
+                validator = Mock.Of<IModelValidator>();
+            }
+
+            var validatorProvider = new Mock<IModelValidatorProvider>();
+            validatorProvider
+                .Setup(p => p.CreateValidators(It.IsAny<ModelValidatorProviderContext>()))
+                .Callback<ModelValidatorProviderContext>(context =>
+                {
+                    foreach (var result in context.Results)
+                    {
+                        result.Validator = validator;
+                        result.IsReusable = true;
+                    }
+                });
+            return validatorProvider.Object;
+        }
+
+        private static ParameterBinder CreateBackCompatParameterBinder(
+            ModelMetadata modelMetadata,
+            IObjectModelValidator validator)
+        {
+            var mockModelMetadataProvider = new Mock<IModelMetadataProvider>(MockBehavior.Strict);
+            mockModelMetadataProvider
+                .Setup(o => o.GetMetadataForType(typeof(Person)))
+                .Returns(modelMetadata);
+
+            var mockModelBinderFactory = new Mock<IModelBinderFactory>(MockBehavior.Strict);
+#pragma warning disable CS0618 // Type or member is obsolete
+            return new ParameterBinder(
+                mockModelMetadataProvider.Object,
+                mockModelBinderFactory.Object,
+                validator);
+#pragma warning restore CS0618 // Type or member is obsolete
+        }
+
+        private static IValueProvider CreateMockValueProvider()
+        {
+            var mockValueProvider = new Mock<IValueProvider>(MockBehavior.Strict);
+            mockValueProvider
+                .Setup(o => o.ContainsPrefix(It.IsAny<string>()))
+                .Returns(true);
+            return mockValueProvider.Object;
+        }
+
+        private static IModelValidatorProvider CreateMockValidatorProvider(IModelValidator validator = null)
+        {
+            var mockValidator = new Mock<IModelValidatorProvider>();
+            mockValidator
+                .Setup(o => o.CreateValidators(
+                    It.IsAny<ModelValidatorProviderContext>()))
+                .Callback<ModelValidatorProviderContext>(context =>
+                {
+                    if (validator != null)
+                    {
+                        foreach (var result in context.Results)
+                        {
+                            result.Validator = validator;
+                        }
+                    }
+                });
+            return mockValidator.Object;
+        }
+
+        private class Person : IEquatable<Person>, IEquatable<object>
+        {
+            public string Name { get; set; }
+
+            public bool Equals(Person other)
+            {
+                return other != null && string.Equals(Name, other.Name, StringComparison.Ordinal);
+            }
+
+            bool IEquatable<object>.Equals(object obj)
+            {
+                return Equals(obj as Person);
+            }
+        }
+
+        private class Family
+        {
+            public Person Dad { get; set; }
+
+            public Person Mom { get; set; }
+
+            public IList<Person> Kids { get; } = new List<Person>();
+        }
+
+        private class DerivedPerson : Person
+        {
+            [Required]
+            public string DerivedProperty { get; set; }
+        }
+
+        [Required]
+        private Person PersonProperty { get; set; }
+
+        public abstract class FakeModelMetadata : ModelMetadata
+        {
+            public FakeModelMetadata()
+                : base(ModelMetadataIdentity.ForType(typeof(string)))
+            {
+            }
+        }
+
+        private void TestMethodWithoutAttributes(Person person) { }
+
+        private void TestMethodWithAttributes([Required][AlwaysInvalid] Person person) { }
+
+        private class TestController
+        {
+            public BaseModel Model { get; set; }
+        }
+
+        private class TestControllerWithValidatedProperties
+        {
+            [AlwaysInvalid]
+            [Required]
+            public BaseModel Model { get; set; }
+        }
+
+        private class BaseModel
+        {
+        }
+
+        private class DerivedModel
+        {
+            [Required]
+            public string DerivedProperty { get; set; }
+        }
+
+        private class AlwaysInvalidAttribute : ValidationAttribute
+        {
+            public AlwaysInvalidAttribute()
+            {
+                ErrorMessage = "Always Invalid";
+            }
+
+            public override bool IsValid(object value)
+            {
+                return false;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/QueryStringValueProviderFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/QueryStringValueProviderFactoryTest.cs
new file mode 100644
index 0000000000..40dbfb0d3c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/QueryStringValueProviderFactoryTest.cs
@@ -0,0 +1,53 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Globalization;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Test
+{
+    public class QueryStringValueProviderFactoryTest
+    {
+        [Fact]
+        public async Task DoesNotCreateValueProvider_WhenQueryStringIsEmpty()
+        {
+            // Arrange
+            var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+            var factoryContext = new ValueProviderFactoryContext(actionContext);
+            var factory = new QueryStringValueProviderFactory();
+
+            // Act
+            await factory.CreateValueProviderAsync(factoryContext);
+
+            // Assert
+            Assert.Empty(factoryContext.ValueProviders);
+        }
+
+        [Fact]
+        public async Task GetValueProvider_ReturnsQueryStringValueProviderInstanceWithInvariantCulture()
+        {
+            // Arrange
+            var queryValues = new Dictionary<string, StringValues>();
+            queryValues.Add("foo", "bar");
+            var context = new DefaultHttpContext();
+            context.Request.Query = new QueryCollection(queryValues);
+            var actionContext = new ActionContext(context, new RouteData(), new ActionDescriptor());
+            var factoryContext = new ValueProviderFactoryContext(actionContext);
+            var factory = new QueryStringValueProviderFactory();
+
+            // Act
+            await factory.CreateValueProviderAsync(factoryContext);
+
+            // Assert
+            var valueProvider = Assert.IsType<QueryStringValueProvider>(Assert.Single(factoryContext.ValueProviders));
+            Assert.Equal(CultureInfo.InvariantCulture, valueProvider.Culture);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/QueryStringValueProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/QueryStringValueProviderTest.cs
new file mode 100644
index 0000000000..bab0e56679
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/QueryStringValueProviderTest.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Globalization;
+using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class QueryStringValueProviderTest : EnumerableValueProviderTest
+    {
+        protected override IEnumerableValueProvider GetEnumerableValueProvider(
+            BindingSource bindingSource,
+            Dictionary<string, StringValues> values,
+            CultureInfo culture)
+        {
+            var backingStore = new QueryCollection(values);
+            return new QueryStringValueProvider(bindingSource, backingStore, culture);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/RouteValueProviderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/RouteValueProviderTests.cs
new file mode 100644
index 0000000000..8c8c050ae2
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/RouteValueProviderTests.cs
@@ -0,0 +1,236 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using Microsoft.AspNetCore.Routing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class RouteValueProviderTests
+    {
+        [Fact]
+        public void GetValueProvider_ReturnsNull_WhenKeyIsNotFound()
+        {
+            // Arrange
+            var values = new RouteValueDictionary(new Dictionary<string, object>
+            {
+                { "test-key", "value" }
+            });
+            var provider = new RouteValueProvider(BindingSource.Query, values);
+
+            // Act
+            var result = provider.GetValue("not-test-key");
+
+            // Assert
+            Assert.Equal(ValueProviderResult.None, result);
+        }
+
+        [Fact]
+        public void GetValueProvider_ReturnsValue_IfKeyIsPresent()
+        {
+            // Arrange
+            var values = new RouteValueDictionary(new Dictionary<string, object>
+            {
+                { "test-key", "test-value" }
+            });
+            var provider = new RouteValueProvider(BindingSource.Query, values);
+
+            // Act
+            var result = provider.GetValue("test-key");
+
+            // Assert
+            Assert.Equal("test-value", (string)result);
+        }
+
+        [Fact]
+        public void ContainsPrefix_ReturnsNullValue_IfKeyIsPresent()
+        {
+            // Arrange
+            var values = new RouteValueDictionary(new Dictionary<string, object>
+            {
+                { "test-key", null }
+            });
+            var provider = new RouteValueProvider(BindingSource.Query, values);
+
+            // Act
+            var result = provider.GetValue("test-key");
+
+            // Assert
+            Assert.Equal(string.Empty, (string)result);
+        }
+
+        [Fact]
+        public void GetValue_ReturnsValue_WithDefaultCulture()
+        {
+            // Arrange
+            var values = new RouteValueDictionary(new Dictionary<string, object>
+            {
+                { "test-key", "test-value"}
+            });
+            var provider = new RouteValueProvider(BindingSource.Query, values);
+
+            // Act
+            var result = provider.GetValue("test-key");
+
+            // Assert
+            Assert.Equal(CultureInfo.InvariantCulture, result.Culture);
+        }
+
+        [Fact]
+        public void GetValue_ReturnsValue_WithCulture()
+        {
+            // Arrange
+            var values = new RouteValueDictionary(new Dictionary<string, object>
+            {
+                { "test-key", "test-value"}
+            });
+            var culture = new CultureInfo("fr-FR");
+            var provider = new RouteValueProvider(BindingSource.Query, values, culture);
+
+            // Act
+            var result = provider.GetValue("test-key");
+
+            // Assert
+            Assert.Equal(new CultureInfo("fr-FR"), result.Culture);
+        }
+
+        [Theory]
+        [InlineData("foo")]
+        [InlineData("bar")]
+        [InlineData("bar.baz")]
+        public void ContainsPrefix_ReturnsTrue_ForKnownPrefixes(string prefix)
+        {
+            // Arrange
+            var values = new RouteValueDictionary(new Dictionary<string, object>
+            {
+                { "foo", 1 },
+                { "bar.baz", 1 },
+            });
+
+            var valueProvider = new RouteValueProvider(BindingSource.Query, values);
+
+            // Act
+            var result = valueProvider.ContainsPrefix(prefix);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData("bar", "1")]
+        [InlineData("bar.baz", "2")]
+        public void GetValue_ReturnsCorrectValue_ForKnownKeys(string prefix, string expectedValue)
+        {
+            // Arrange
+            var values = new RouteValueDictionary(new Dictionary<string, object>
+            {
+                { "bar", 1 },
+                { "bar.baz", 2 },
+            });
+
+            var valueProvider = new RouteValueProvider(BindingSource.Query, values);
+
+            // Act
+            var result = valueProvider.GetValue(prefix);
+
+            // Assert
+            Assert.Equal(expectedValue, (string)result);
+        }
+
+        [Fact]
+        public void GetValue_DoesNotReturnAValue_ForAKeyPrefix()
+        {
+            // Arrange
+            var values = new RouteValueDictionary(new Dictionary<string, object>
+            {
+                { "bar.baz", 2 },
+            });
+
+            var valueProvider = new RouteValueProvider(BindingSource.Query, values);
+
+            // Act
+            var result = valueProvider.GetValue("bar");
+
+            // Assert
+            Assert.Equal(ValueProviderResult.None, result);
+        }
+
+        [Fact]
+        public void ContainsPrefix_ReturnsFalse_IfKeyIsNotPresent()
+        {
+            // Arrange
+            var values = new RouteValueDictionary(new Dictionary<string, object>
+            {
+                { "test-key", "test-value" }
+            });
+            var provider = new RouteValueProvider(BindingSource.Query, values);
+
+            // Act
+            var result = provider.ContainsPrefix("not-test-key");
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void ContainsPrefix_ReturnsTrue_IfKeyIsPresent()
+        {
+            // Arrange
+            var values = new RouteValueDictionary(new Dictionary<string, object>
+            {
+                { "test-key", "test-value" }
+            });
+            var provider = new RouteValueProvider(BindingSource.Query, values);
+
+            // Act
+            var result = provider.ContainsPrefix("test-key");
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void FilterInclude()
+        {
+            // Arrange
+            var values = new RouteValueDictionary();
+            var provider = new RouteValueProvider(BindingSource.Query, values);
+
+            var bindingSource = new BindingSource(
+                BindingSource.Query.Id,
+                displayName: null,
+                isGreedy: true,
+                isFromRequest: true);
+
+            // Act
+            var result = provider.Filter(bindingSource);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Same(result, provider);
+        }
+
+        [Fact]
+        public void FilterExclude()
+        {
+            // Arrange
+            var values = new RouteValueDictionary();
+            var provider = new RouteValueProvider(BindingSource.Query, values);
+
+            var bindingSource = new BindingSource(
+                "Test",
+                displayName: null,
+                isGreedy: true,
+                isFromRequest: true);
+
+            // Act
+            var result = provider.Filter(bindingSource);
+
+            // Assert
+            Assert.Null(result);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/StubModelBinder.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/StubModelBinder.cs
new file mode 100644
index 0000000000..790780b0e9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/StubModelBinder.cs
@@ -0,0 +1,74 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class StubModelBinder : IModelBinder
+    {
+        private readonly Func<ModelBindingContext, Task> _callback;
+
+        public StubModelBinder()
+        {
+            _callback = context => Task.CompletedTask;
+        }
+
+        public StubModelBinder(ModelBindingResult result)
+        {
+            _callback = context =>
+            {
+                context.Result = result;
+                return Task.CompletedTask;
+            };
+        }
+
+        public StubModelBinder(Action<ModelBindingContext> callback)
+        {
+            _callback = context =>
+            {
+                callback(context);
+                return Task.CompletedTask;
+            };
+        }
+
+        public StubModelBinder(Func<ModelBindingContext, ModelBindingResult> callback)
+        {
+            _callback = context =>
+            {
+                var result = callback.Invoke(context);
+                context.Result = result;
+                return Task.CompletedTask;
+            };
+        }
+
+        public StubModelBinder(Func<ModelBindingContext, Task<ModelBindingResult>> callback)
+        {
+            _callback = async context =>
+            {
+                var result = await callback.Invoke(context);
+                context.Result = result;
+            };
+        }
+
+        public int BindModelCount { get; set; }
+
+        public IModelBinder Object => this;
+
+        public virtual async Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            BindModelCount += 1;
+
+            if (bindingContext == null)
+            {
+                throw new ArgumentNullException(nameof(bindingContext));
+            }
+
+            Debug.Assert(bindingContext.Result == ModelBindingResult.Failed());
+            await _callback.Invoke(bindingContext);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/TestModelBinderProviderContext.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/TestModelBinderProviderContext.cs
new file mode 100644
index 0000000000..514e012c76
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/TestModelBinderProviderContext.cs
@@ -0,0 +1,88 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class TestModelBinderProviderContext : ModelBinderProviderContext
+    {
+        private BindingInfo _bindingInfo;
+
+        // Has to be internal because TestModelMetadataProvider is 'shared' code.
+        internal static readonly TestModelMetadataProvider CachedMetadataProvider = new TestModelMetadataProvider();
+
+        private readonly List<Func<ModelMetadata, IModelBinder>> _binderCreators =
+            new List<Func<ModelMetadata, IModelBinder>>();
+
+        public TestModelBinderProviderContext(Type modelType)
+            : this(modelType, bindingInfo: null)
+        {
+        }
+
+        public TestModelBinderProviderContext(Type modelType, BindingInfo bindingInfo)
+        {
+            Metadata = CachedMetadataProvider.GetMetadataForType(modelType);
+            MetadataProvider = CachedMetadataProvider;
+            _bindingInfo = bindingInfo ?? new BindingInfo
+            {
+                BinderModelName = Metadata.BinderModelName,
+                BinderType = Metadata.BinderType,
+                BindingSource = Metadata.BindingSource,
+                PropertyFilterProvider = Metadata.PropertyFilterProvider,
+            };
+            Services = GetServices();
+        }
+
+        public override BindingInfo BindingInfo => _bindingInfo;
+
+        public override ModelMetadata Metadata { get; }
+
+        public override IModelMetadataProvider MetadataProvider { get; }
+
+        public override IServiceProvider Services { get; }
+
+        public override IModelBinder CreateBinder(ModelMetadata metadata)
+        {
+            foreach (var creator in _binderCreators)
+            {
+                var result = creator(metadata);
+                if (result != null)
+                {
+                    return result;
+                }
+            }
+
+            return null;
+        }
+
+        public override IModelBinder CreateBinder(ModelMetadata metadata, BindingInfo bindingInfo)
+        {
+            _bindingInfo = bindingInfo;
+            return this.CreateBinder(metadata);
+        }
+
+        public void OnCreatingBinder(Func<ModelMetadata, IModelBinder> binderCreator)
+        {
+            _binderCreators.Add(binderCreator);
+        }
+
+        public void OnCreatingBinder(ModelMetadata metadata, Func<IModelBinder> binderCreator)
+        {
+            _binderCreators.Add((m) => m.Equals(metadata) ? binderCreator() : null);
+        }
+
+        private static IServiceProvider GetServices()
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<ILoggerFactory, NullLoggerFactory>();
+            services.AddSingleton(Options.Create(new MvcOptions()));
+            return services.BuildServiceProvider();
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/TestValueProvider.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/TestValueProvider.cs
new file mode 100644
index 0000000000..98091a6d47
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/TestValueProvider.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Routing;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class TestValueProvider : RouteValueProvider
+    {
+        public static readonly BindingSource TestBindingSource = new BindingSource(
+            id: "Test",
+            displayName: "Test",
+            isGreedy: false,
+            isFromRequest: true);
+
+        public TestValueProvider(IDictionary<string, object> values)
+            : base(TestBindingSource, new RouteValueDictionary(values))
+        {
+        }
+
+        public TestValueProvider(BindingSource bindingSource, IDictionary<string, object> values)
+            : base(bindingSource, new RouteValueDictionary(values))
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/UnsupportedContentTypeFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/UnsupportedContentTypeFilterTest.cs
new file mode 100644
index 0000000000..b31db70f37
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/UnsupportedContentTypeFilterTest.cs
@@ -0,0 +1,131 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class UnsupportedContentTypeFilterTest
+    {
+        [Fact]
+        public void OnActionExecuting_ChangesActionResult_IfUnsupportedContentTypeExceptionIsFoundOnModelState()
+        {
+            // Arrange
+            var context = new ActionExecutingContext(
+                new ActionContext
+                {
+                    HttpContext = new DefaultHttpContext(),
+                    RouteData = new RouteData(),
+                    ActionDescriptor = new ActionDescriptor()
+                },
+                new List<IFilterMetadata>(),
+                new Dictionary<string, object>(),
+                new object());
+
+            var modelMetadata = new EmptyModelMetadataProvider()
+                .GetMetadataForType(typeof(int));
+
+            context.ModelState.AddModelError(
+                "person.body",
+                new UnsupportedContentTypeException("error"),
+                modelMetadata);
+
+            var filter = new UnsupportedContentTypeFilter();
+
+            // Act
+            filter.OnActionExecuting(context);
+
+            // Assert
+            Assert.NotNull(context.Result);
+            var status = Assert.IsType<UnsupportedMediaTypeResult>(context.Result);
+        }
+
+        [Fact]
+        public void OnActionExecuting_DoesNotChangeActionResult_IfOtherErrorsAreFoundOnModelState()
+        {
+            // Arrange
+            var context = new ActionExecutingContext(
+                new ActionContext
+                {
+                    HttpContext = new DefaultHttpContext(),
+                    RouteData = new RouteData(),
+                    ActionDescriptor = new ActionDescriptor()
+                },
+                new List<IFilterMetadata>(),
+                new Dictionary<string, object>(),
+                new object());
+
+            context.ModelState.AddModelError("person.body", "Some error");
+
+            var filter = new UnsupportedContentTypeFilter();
+
+            // Act
+            filter.OnActionExecuting(context);
+
+            // Assert
+            Assert.Null(context.Result);
+        }
+
+        [Fact]
+        public void OnActionExecuting_DoesNotChangeActionResult_IfModelStateIsValid()
+        {
+            // Arrange
+            var context = new ActionExecutingContext(
+                new ActionContext
+                {
+                    HttpContext = new DefaultHttpContext(),
+                    RouteData = new RouteData(),
+                    ActionDescriptor = new ActionDescriptor()
+                },
+                new List<IFilterMetadata>(),
+                new Dictionary<string, object>(),
+                new object());
+
+            var filter = new UnsupportedContentTypeFilter();
+
+            // Act
+            filter.OnActionExecuting(context);
+
+            // Assert
+            Assert.Null(context.Result);
+        }
+
+        [Fact]
+        public void OnActionExecuting_DoesNotChangeActionResult_IfOtherExceptionsAreFoundOnModelState()
+        {
+            // Arrange
+            var context = new ActionExecutingContext(
+                new ActionContext
+                {
+                    HttpContext = new DefaultHttpContext(),
+                    RouteData = new RouteData(),
+                    ActionDescriptor = new ActionDescriptor()
+                },
+                new List<IFilterMetadata>(),
+                new Dictionary<string, object>(),
+                new object());
+
+            var modelMetadata = new EmptyModelMetadataProvider()
+                .GetMetadataForType(typeof(int));
+
+            context.ModelState.AddModelError(
+                "person.body",
+                new Exception("error"),
+                modelMetadata);
+
+            var filter = new UnsupportedContentTypeFilter();
+
+            // Act
+            filter.OnActionExecuting(context);
+
+            // Assert
+            Assert.Null(context.Result);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/CompositeModelValidatorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/CompositeModelValidatorProviderTest.cs
new file mode 100644
index 0000000000..ed0c1e8811
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/CompositeModelValidatorProviderTest.cs
@@ -0,0 +1,50 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    public class CompositeModelValidatorProviderTest
+    {
+        [Fact]
+        public void GetModelValidators_ReturnsValidatorsFromAllProviders()
+        {
+            // Arrange
+            var validatorMetadata = new object();
+            var validator1 = new ValidatorItem(validatorMetadata);
+            var validator2 = new ValidatorItem(validatorMetadata);
+            var validator3 = new ValidatorItem(validatorMetadata);
+
+            var provider1 = new Mock<IModelValidatorProvider>();
+            provider1.Setup(p => p.CreateValidators(It.IsAny<ModelValidatorProviderContext>()))
+                     .Callback<ModelValidatorProviderContext>(c =>
+                     {
+                         c.Results.Add(validator1);
+                         c.Results.Add(validator2);
+                     });
+
+            var provider2 = new Mock<IModelValidatorProvider>();
+            provider2.Setup(p => p.CreateValidators(It.IsAny<ModelValidatorProviderContext>()))
+                     .Callback<ModelValidatorProviderContext>(c =>
+                     {
+                         c.Results.Add(validator3);
+                     });
+
+            var compositeModelValidator = new CompositeModelValidatorProvider(new[] { provider1.Object, provider2.Object });
+            var modelMetadata = new EmptyModelMetadataProvider().GetMetadataForType(typeof(string));
+
+            // Act
+            var validatorProviderContext = new ModelValidatorProviderContext(modelMetadata, new List<ValidatorItem>());
+            compositeModelValidator.CreateValidators(validatorProviderContext);
+
+            // Assert
+            Assert.Equal(
+                new[] { validator1, validator2, validator3 },
+                validatorProviderContext.Results.ToArray());
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ModelValidatorProviderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ModelValidatorProviderExtensionsTest.cs
new file mode 100644
index 0000000000..69a067ad5d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ModelValidatorProviderExtensionsTest.cs
@@ -0,0 +1,66 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    public class ModelValidatorProviderExtensionsTest
+    {
+        [Fact]
+        public void RemoveType_RemovesAllOfType()
+        {
+            // Arrange
+            var list = new List<IModelValidatorProvider>
+            {
+                new FooModelValidatorProvider(),
+                new BarModelValidatorProvider(),
+                new FooModelValidatorProvider()
+            };
+
+            // Act
+            list.RemoveType(typeof(FooModelValidatorProvider));
+
+            // Assert
+            var provider = Assert.Single(list);
+            Assert.IsType<BarModelValidatorProvider>(provider);
+        }
+
+        [Fact]
+        public void GenericRemoveType_RemovesAllOfType()
+        {
+            // Arrange
+            var list = new List<IModelValidatorProvider>
+            {
+                new FooModelValidatorProvider(),
+                new BarModelValidatorProvider(),
+                new FooModelValidatorProvider()
+            };
+
+            // Act
+            list.RemoveType<FooModelValidatorProvider>();
+
+            // Assert
+            var provider = Assert.Single(list);
+            Assert.IsType<BarModelValidatorProvider>(provider);
+        }
+
+        private class FooModelValidatorProvider : IModelValidatorProvider
+        {
+            public void CreateValidators(ModelValidatorProviderContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class BarModelValidatorProvider : IModelValidatorProvider
+        {
+            public void CreateValidators(ModelValidatorProviderContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ValueProviderFactoryExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ValueProviderFactoryExtensionsTest.cs
new file mode 100644
index 0000000000..d55b1317e2
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ValueProviderFactoryExtensionsTest.cs
@@ -0,0 +1,67 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class ValueProviderFactoryExtensionsTest
+    {
+        [Fact]
+        public void RemoveType_RemovesAllOfType()
+        {
+            // Arrange
+            var list = new List<IValueProviderFactory>
+            {
+                new FooValueProviderFactory(),
+                new BarValueProviderFactory(),
+                new FooValueProviderFactory()
+            };
+
+            // Act
+            list.RemoveType(typeof(FooValueProviderFactory));
+
+            // Assert
+            var factory = Assert.Single(list);
+            Assert.IsType<BarValueProviderFactory>(factory);
+        }
+
+        [Fact]
+        public void GenericRemoveType_RemovesAllOfType()
+        {
+            // Arrange
+            var list = new List<IValueProviderFactory>
+            {
+                new FooValueProviderFactory(),
+                new BarValueProviderFactory(),
+                new FooValueProviderFactory()
+            };
+
+            // Act
+            list.RemoveType<FooValueProviderFactory>();
+
+            // Assert
+            var factory = Assert.Single(list);
+            Assert.IsType<BarValueProviderFactory>(factory);
+        }
+
+        private class FooValueProviderFactory : IValueProviderFactory
+        {
+            public Task CreateValueProviderAsync(ValueProviderFactoryContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class BarValueProviderFactory : IValueProviderFactory
+        {
+            public Task CreateValueProviderAsync(ValueProviderFactoryContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/MvcOptionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/MvcOptionsTest.cs
new file mode 100644
index 0000000000..88504b2129
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/MvcOptionsTest.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using System;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class MvcOptionsTest
+    {
+        [Fact]
+        public void MaxValidationError_ThrowsIfValueIsOutOfRange()
+        {
+            // Arrange
+            var options = new MvcOptions();
+
+            // Act & Assert
+            var ex = Assert.Throws<ArgumentOutOfRangeException>(() => options.MaxModelValidationErrors = -1);
+            Assert.Equal("value", ex.ParamName);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/NonDisposableStreamTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/NonDisposableStreamTest.cs
new file mode 100644
index 0000000000..0eb5d7014f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/NonDisposableStreamTest.cs
@@ -0,0 +1,86 @@
+// 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.
+
+using System.IO;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Internal
+{
+    public class NonDisposableStreamTest
+    {
+        [Fact]
+        public void InnerStreamIsOpenOnClose()
+        {
+            // Arrange
+            var innerStream = new MemoryStream();
+            var nonDisposableStream = new NonDisposableStream(innerStream);
+
+            // Act
+            nonDisposableStream.Close();
+
+            // Assert
+            Assert.True(innerStream.CanRead);
+        }
+
+        [Fact]
+        public void InnerStreamIsNotFlushedOnClose()
+        {
+            // Arrange
+            var stream = FlushReportingStream.GetThrowingStream();
+
+            var nonDisposableStream = new NonDisposableStream(stream);
+
+            // Act & Assert
+            nonDisposableStream.Close();
+        }
+
+        [Fact]
+        public void InnerStreamIsOpenOnDispose()
+        {
+            // Arrange
+            var innerStream = new MemoryStream();
+            var nonDisposableStream = new NonDisposableStream(innerStream);
+
+            // Act
+            nonDisposableStream.Dispose();
+
+            // Assert
+            Assert.True(innerStream.CanRead);
+        }
+
+        [Fact]
+        public void InnerStreamIsNotFlushedOnDispose()
+        {
+            var stream = FlushReportingStream.GetThrowingStream();
+            var nonDisposableStream = new NonDisposableStream(stream);
+
+            // Act & Assert
+            nonDisposableStream.Dispose();
+        }
+
+        [Fact]
+        public void InnerStreamIsNotFlushedOnFlush()
+        {
+            // Arrange
+            var stream = FlushReportingStream.GetThrowingStream();
+
+            var nonDisposableStream = new NonDisposableStream(stream);
+
+            // Act & Assert
+            nonDisposableStream.Flush();
+        }
+
+        [Fact]
+        public async Task InnerStreamIsNotFlushedOnFlushAsync()
+        {
+            // Arrange
+            var stream = FlushReportingStream.GetThrowingStream();
+
+            var nonDisposableStream = new NonDisposableStream(stream);
+
+            // Act & Assert
+            await nonDisposableStream.FlushAsync();
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ObjectResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ObjectResultTests.cs
new file mode 100644
index 0000000000..2c0e9ab003
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ObjectResultTests.cs
@@ -0,0 +1,89 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class ObjectResultTests
+    {
+        [Fact]
+        public void ObjectResult_Constructor()
+        {
+            // Arrange
+            var input = "testInput";
+
+            // Act
+            var result = new ObjectResult(input);
+
+            // Assert
+            Assert.Equal(input, result.Value);
+            Assert.Empty(result.ContentTypes);
+            Assert.Empty(result.Formatters);
+            Assert.Null(result.StatusCode);
+            Assert.Null(result.DeclaredType);
+        }
+
+        [Fact]
+        public async Task ObjectResult_ExecuteResultAsync_SetsStatusCode()
+        {
+            // Arrange
+            var result = new ObjectResult("Hello")
+            {
+                StatusCode = 404,
+                Formatters = new FormatterCollection<IOutputFormatter>()
+                {
+                    new NoOpOutputFormatter(),
+                },
+            };
+
+            var actionContext = new ActionContext()
+            {
+                HttpContext = new DefaultHttpContext()
+                {
+                    RequestServices = CreateServices(),
+                }
+            };
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Equal(404, actionContext.HttpContext.Response.StatusCode);
+        }
+
+        private static IServiceProvider CreateServices()
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<IActionResultExecutor<ObjectResult>>(new ObjectResultExecutor(
+                new DefaultOutputFormatterSelector(Options.Create(new MvcOptions()), NullLoggerFactory.Instance),
+                new TestHttpResponseStreamWriterFactory(),
+                NullLoggerFactory.Instance));
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+
+            return services.BuildServiceProvider();
+        }
+
+        private class NoOpOutputFormatter : IOutputFormatter
+        {
+            public bool CanWriteResult(OutputFormatterCanWriteContext context)
+            {
+                return true;
+            }
+
+            public Task WriteAsync(OutputFormatterWriteContext context)
+            {
+                return Task.FromResult(0);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/PhysicalFileResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/PhysicalFileResultTest.cs
new file mode 100644
index 0000000000..69dd1a4550
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/PhysicalFileResultTest.cs
@@ -0,0 +1,584 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Net.Http.Headers;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class PhysicalFileResultTest
+    {
+        [Fact]
+        public void Constructor_SetsFileName()
+        {
+            // Arrange
+            var path = Path.GetFullPath("helllo.txt");
+
+            // Act
+            var result = new TestPhysicalFileResult(path, "text/plain");
+
+            // Assert
+            Assert.Equal(path, result.FileName);
+        }
+
+        [Fact]
+        public void Constructor_SetsContentTypeAndParameters()
+        {
+            // Arrange
+            var path = Path.GetFullPath("helllo.txt");
+            var contentType = "text/plain; charset=us-ascii; p1=p1-value";
+            var expectedMediaType = contentType;
+
+            // Act
+            var result = new TestPhysicalFileResult(path, contentType);
+
+            // Assert
+            Assert.Equal(path, result.FileName);
+            MediaTypeAssert.Equal(expectedMediaType, result.ContentType);
+        }
+
+        [Theory]
+        [InlineData(0, 3, "File", 4)]
+        [InlineData(8, 13, "Result", 6)]
+        [InlineData(null, 5, "ts�", 5)]
+        [InlineData(8, null, "ResultTestFile contents�", 26)]
+        public async Task WriteFileAsync_WritesRangeRequested(long? start, long? end, string expectedString, long contentLength)
+        {
+            // Arrange
+            var path = Path.GetFullPath(Path.Combine("TestFiles", "FilePathResultTestFile.txt"));
+            var result = new TestPhysicalFileResult(path, "text/plain");
+            result.EnableRangeProcessing = true;
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfModifiedSince = DateTimeOffset.MinValue;
+            requestHeaders.Range = new RangeHeaderValue(start, end);
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            start = start ?? 34 - end;
+            end = start + contentLength - 1;
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            var contentRange = new ContentRangeHeaderValue(start.Value, end.Value, 34);
+            Assert.Equal(StatusCodes.Status206PartialContent, httpResponse.StatusCode);
+            Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]);
+            Assert.Equal(contentRange.ToString(), httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal(contentLength, httpResponse.ContentLength);
+            Assert.Equal(expectedString, body);
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_IfRangeHeaderValid_WritesRequestedRange()
+        {
+            // Arrange
+            var path = Path.GetFullPath(Path.Combine("TestFiles", "FilePathResultTestFile.txt"));
+            var result = new TestPhysicalFileResult(path, "text/plain");
+            var entityTag = result.EntityTag = new EntityTagHeaderValue("\"Etag\"");
+            result.EnableRangeProcessing = true;
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfModifiedSince = DateTimeOffset.MinValue;
+            requestHeaders.Range = new RangeHeaderValue(0, 3);
+            requestHeaders.IfRange = new RangeConditionHeaderValue(new EntityTagHeaderValue("\"Etag\""));
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(StatusCodes.Status206PartialContent, httpResponse.StatusCode);
+            Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]);
+            var contentRange = new ContentRangeHeaderValue(0, 3, 34);
+            Assert.Equal(contentRange.ToString(), httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal(entityTag.ToString(), httpResponse.Headers[HeaderNames.ETag]);
+            Assert.Equal(4, httpResponse.ContentLength);
+            Assert.Equal("File", body);
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_RangeProcessingNotEnabled_RangeRequestedIgnored()
+        {
+            // Arrange
+            var path = Path.GetFullPath(Path.Combine("TestFiles", "FilePathResultTestFile.txt"));
+            var result = new TestPhysicalFileResult(path, "text/plain");
+            var entityTag = result.EntityTag = new EntityTagHeaderValue("\"Etag\"");
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfModifiedSince = DateTimeOffset.MinValue;
+            requestHeaders.Range = new RangeHeaderValue(0, 3);
+            requestHeaders.IfRange = new RangeConditionHeaderValue(new EntityTagHeaderValue("\"Etag\""));
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
+            Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal("FilePathResultTestFile contents�", body);
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_IfRangeHeaderInvalid_RangeRequestedIgnored()
+        {
+            // Arrange
+            var path = Path.GetFullPath(Path.Combine("TestFiles", "FilePathResultTestFile.txt"));
+            var result = new TestPhysicalFileResult(path, "text/plain");
+            result.EnableRangeProcessing = true;
+            var entityTag = result.EntityTag = new EntityTagHeaderValue("\"Etag\"");
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfModifiedSince = DateTimeOffset.MinValue;
+            requestHeaders.Range = new RangeHeaderValue(0, 3);
+            requestHeaders.IfRange = new RangeConditionHeaderValue(new EntityTagHeaderValue("\"NotEtag\""));
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
+            Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal("FilePathResultTestFile contents�", body);
+        }
+
+        [Theory]
+        [InlineData("0-5")]
+        [InlineData("bytes = ")]
+        [InlineData("bytes = 1-4, 5-11")]
+        public async Task WriteFileAsync_RangeHeaderMalformed_RangeRequestIgnored(string rangeString)
+        {
+            // Arrange
+            var path = Path.GetFullPath(Path.Combine("TestFiles", "FilePathResultTestFile.txt"));
+            var result = new TestPhysicalFileResult(path, "text/plain");
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfModifiedSince = DateTimeOffset.MinValue;
+            httpContext.Request.Headers[HeaderNames.Range] = rangeString;
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
+            Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal("FilePathResultTestFile contents�", body);
+        }
+
+        [Theory]
+        [InlineData("bytes = 35-36")]
+        [InlineData("bytes = -0")]
+        public async Task WriteFileAsync_RangeRequestedNotSatisfiable(string rangeString)
+        {
+            // Arrange
+            var path = Path.GetFullPath(Path.Combine("TestFiles", "FilePathResultTestFile.txt"));
+            var result = new TestPhysicalFileResult(path, "text/plain");
+            result.EnableRangeProcessing = true;
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfModifiedSince = DateTimeOffset.MinValue;
+            httpContext.Request.Headers[HeaderNames.Range] = rangeString;
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            var contentRange = new ContentRangeHeaderValue(34);
+            Assert.Equal(StatusCodes.Status416RangeNotSatisfiable, httpResponse.StatusCode);
+            Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]);
+            Assert.Equal(contentRange.ToString(), httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Empty(body);
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_RangeRequested_PreconditionFailed()
+        {
+            // Arrange
+            var path = Path.GetFullPath(Path.Combine("TestFiles", "FilePathResultTestFile.txt"));
+            var result = new TestPhysicalFileResult(path, "text/plain");
+            result.EnableRangeProcessing = true;
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfUnmodifiedSince = DateTimeOffset.MinValue;
+            httpContext.Request.Headers[HeaderNames.Range] = "bytes = 0-6";
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(StatusCodes.Status412PreconditionFailed, httpResponse.StatusCode);
+            Assert.Null(httpResponse.ContentLength);
+            Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Empty(body);
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_RangeRequested_NotModified()
+        {
+            // Arrange
+            var path = Path.GetFullPath(Path.Combine("TestFiles", "FilePathResultTestFile.txt"));
+            var result = new TestPhysicalFileResult(path, "text/plain");
+            result.EnableRangeProcessing = true;
+            var httpContext = GetHttpContext();
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfModifiedSince = DateTimeOffset.MinValue.AddDays(1);
+            httpContext.Request.Headers[HeaderNames.Range] = "bytes = 0-6";
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(StatusCodes.Status304NotModified, httpResponse.StatusCode);
+            Assert.Null(httpResponse.ContentLength);
+            Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Empty(body);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_FallsbackToStreamCopy_IfNoIHttpSendFilePresent()
+        {
+            // Arrange
+            var path = Path.GetFullPath(Path.Combine("TestFiles", "FilePathResultTestFile.txt"));
+            var result = new TestPhysicalFileResult(path, "text/plain");
+            var httpContext = GetHttpContext();
+            httpContext.Response.Body = new MemoryStream();
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(context);
+            httpContext.Response.Body.Position = 0;
+
+            // Assert
+            Assert.NotNull(httpContext.Response.Body);
+            var contents = await new StreamReader(httpContext.Response.Body).ReadToEndAsync();
+            Assert.Equal("FilePathResultTestFile contents�", contents);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_CallsSendFileAsync_IfIHttpSendFilePresent()
+        {
+            // Arrange
+            var path = Path.GetFullPath(Path.Combine("TestFiles", "FilePathResultTestFile.txt"));
+            var result = new TestPhysicalFileResult(path, "text/plain");
+            var sendFileMock = new Mock<IHttpSendFileFeature>();
+            sendFileMock
+                .Setup(s => s.SendFileAsync(path, 0, null, CancellationToken.None))
+                .Returns(Task.FromResult<int>(0));
+
+            var httpContext = GetHttpContext();
+            httpContext.Features.Set(sendFileMock.Object);
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(context);
+
+            // Assert
+            sendFileMock.Verify();
+        }
+
+        [Theory]
+        [InlineData(0, 3, 4)]
+        [InlineData(8, 13, 6)]
+        [InlineData(null, 3, 3)]
+        [InlineData(8, null, 26)]
+        public async Task ExecuteResultAsync_CallsSendFileAsyncWithRequestedRange_IfIHttpSendFilePresent(long? start, long? end, long contentLength)
+        {
+            // Arrange
+            var path = Path.GetFullPath(Path.Combine("TestFiles", "FilePathResultTestFile.txt"));
+            var result = new TestPhysicalFileResult(path, "text/plain");
+            result.EnableRangeProcessing = true;
+            var sendFile = new TestSendFileFeature();
+            var httpContext = GetHttpContext();
+            httpContext.Features.Set<IHttpSendFileFeature>(sendFile);
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.Range = new RangeHeaderValue(start, end);
+            requestHeaders.IfUnmodifiedSince = DateTimeOffset.MinValue.AddDays(1);
+            httpContext.Request.Method = HttpMethods.Get;
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            start = start ?? 34 - end;
+            end = start + contentLength - 1;
+            var httpResponse = actionContext.HttpContext.Response;
+            Assert.Equal(Path.GetFullPath(Path.Combine("TestFiles", "FilePathResultTestFile.txt")), sendFile.Name);
+            Assert.Equal(start, sendFile.Offset);
+            Assert.Equal(contentLength, sendFile.Length);
+            Assert.Equal(CancellationToken.None, sendFile.Token);
+            var contentRange = new ContentRangeHeaderValue(start.Value, end.Value, 34);
+            Assert.Equal(StatusCodes.Status206PartialContent, httpResponse.StatusCode);
+            Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]);
+            Assert.Equal(contentRange.ToString(), httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal(contentLength, httpResponse.ContentLength);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_SetsSuppliedContentTypeAndEncoding()
+        {
+            // Arrange
+            var expectedContentType = "text/foo; charset=us-ascii";
+            var path = Path.GetFullPath(Path.Combine(".", "TestFiles", "FilePathResultTestFile_ASCII.txt"));
+            var result = new TestPhysicalFileResult(path, expectedContentType)
+            {
+                IsAscii = true
+            };
+            var httpContext = GetHttpContext();
+            var memoryStream = new MemoryStream();
+            httpContext.Response.Body = memoryStream;
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(context);
+
+            // Assert
+            var contents = Encoding.ASCII.GetString(memoryStream.ToArray());
+            Assert.Equal("FilePathResultTestFile contents ASCII encoded", contents);
+            Assert.Equal(expectedContentType, httpContext.Response.ContentType);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_WorksWithAbsolutePaths()
+        {
+            // Arrange
+            var path = Path.GetFullPath(Path.Combine(".", "TestFiles", "FilePathResultTestFile.txt"));
+            var result = new TestPhysicalFileResult(path, "text/plain");
+
+            var httpContext = GetHttpContext();
+            httpContext.Response.Body = new MemoryStream();
+
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(context);
+            httpContext.Response.Body.Position = 0;
+
+            // Assert
+            Assert.NotNull(httpContext.Response.Body);
+            var contents = await new StreamReader(httpContext.Response.Body).ReadToEndAsync();
+            Assert.Equal("FilePathResultTestFile contents�", contents);
+        }
+
+        [Theory]
+        [InlineData("FilePathResultTestFile.txt")]
+        [InlineData("./FilePathResultTestFile.txt")]
+        [InlineData(".\\FilePathResultTestFile.txt")]
+        [InlineData("~/FilePathResultTestFile.txt")]
+        [InlineData("..\\TestFiles/FilePathResultTestFile.txt")]
+        [InlineData("..\\TestFiles\\FilePathResultTestFile.txt")]
+        [InlineData("..\\TestFiles/SubFolder/SubFolderTestFile.txt")]
+        [InlineData("..\\TestFiles\\SubFolder\\SubFolderTestFile.txt")]
+        [InlineData("..\\TestFiles/SubFolder\\SubFolderTestFile.txt")]
+        [InlineData("..\\TestFiles\\SubFolder/SubFolderTestFile.txt")]
+        [InlineData("~/SubFolder/SubFolderTestFile.txt")]
+        [InlineData("~/SubFolder\\SubFolderTestFile.txt")]
+        public async Task ExecuteAsync_ThrowsNotSupported_ForNonRootedPaths(string path)
+        {
+            // Arrange
+            var result = new TestPhysicalFileResult(path, "text/plain");
+            var context = new ActionContext(GetHttpContext(), new RouteData(), new ActionDescriptor());
+            var expectedMessage = $"Path '{path}' was not rooted.";
+
+            // Act
+            var ex = await Assert.ThrowsAsync<NotSupportedException>(() => result.ExecuteResultAsync(context));
+
+            // Assert
+            Assert.Equal(expectedMessage, ex.Message);
+        }
+
+        [Theory]
+        [InlineData("/SubFolder/SubFolderTestFile.txt")]
+        [InlineData("\\SubFolder\\SubFolderTestFile.txt")]
+        [InlineData("/SubFolder\\SubFolderTestFile.txt")]
+        [InlineData("\\SubFolder/SubFolderTestFile.txt")]
+        [InlineData("./SubFolder/SubFolderTestFile.txt")]
+        [InlineData(".\\SubFolder\\SubFolderTestFile.txt")]
+        [InlineData("./SubFolder\\SubFolderTestFile.txt")]
+        [InlineData(".\\SubFolder/SubFolderTestFile.txt")]
+        public void ExecuteAsync_ThrowsDirectoryNotFound_IfItCanNotFindTheDirectory_ForRootPaths(string path)
+        {
+            // Arrange
+            var result = new TestPhysicalFileResult(path, "text/plain");
+            var context = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+
+            // Act & Assert
+            Assert.ThrowsAsync<DirectoryNotFoundException>(() => result.ExecuteResultAsync(context));
+        }
+
+        [Theory]
+        [InlineData("/FilePathResultTestFile.txt")]
+        [InlineData("\\FilePathResultTestFile.txt")]
+        public void ExecuteAsync_ThrowsFileNotFound_WhenFileDoesNotExist_ForRootPaths(string path)
+        {
+            // Arrange
+            var result = new TestPhysicalFileResult(path, "text/plain");
+            var context = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+
+            // Act & Assert
+            Assert.ThrowsAsync<FileNotFoundException>(() => result.ExecuteResultAsync(context));
+        }
+
+        private class TestPhysicalFileResult : PhysicalFileResult
+        {
+            public TestPhysicalFileResult(string filePath, string contentType)
+                : base(filePath, contentType)
+            {
+            }
+
+            public override Task ExecuteResultAsync(ActionContext context)
+            {
+                var executor = context.HttpContext.RequestServices.GetRequiredService<TestPhysicalFileResultExecutor>();
+                executor.IsAscii = IsAscii;
+                return executor.ExecuteAsync(context, this);
+            }
+
+            public bool IsAscii { get; set; } = false;
+        }
+
+        private class TestPhysicalFileResultExecutor : PhysicalFileResultExecutor
+        {
+            public TestPhysicalFileResultExecutor(ILoggerFactory loggerFactory)
+                : base(loggerFactory)
+            {
+            }
+
+            public bool IsAscii { get; set; } = false;
+
+            protected override Stream GetFileStream(string path)
+            {
+                if (IsAscii)
+                {
+                    return new MemoryStream(Encoding.ASCII.GetBytes("FilePathResultTestFile contents ASCII encoded"));
+                }
+                else
+                {
+                    return new MemoryStream(Encoding.UTF8.GetBytes("FilePathResultTestFile contents�"));
+                }
+            }
+
+            protected override FileMetadata GetFileInfo(string path)
+            {
+                var lastModified = DateTimeOffset.MinValue.AddDays(1);
+                return new FileMetadata
+                {
+                    Exists = true,
+                    Length = 34,
+                    LastModified = new DateTimeOffset(lastModified.Year, lastModified.Month, lastModified.Day, lastModified.Hour, lastModified.Minute, lastModified.Second, TimeSpan.FromSeconds(0))
+                };
+            }
+        }
+
+        private class TestSendFileFeature : IHttpSendFileFeature
+        {
+            public string Name { get; set; }
+            public long Offset { get; set; }
+            public long? Length { get; set; }
+            public CancellationToken Token { get; set; }
+
+            public Task SendFileAsync(string path, long offset, long? length, CancellationToken cancellation)
+            {
+                Name = path;
+                Offset = offset;
+                Length = length;
+                Token = cancellation;
+
+                return Task.FromResult(0);
+            }
+        }
+
+        private static IServiceCollection CreateServices()
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<TestPhysicalFileResultExecutor>();
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+            return services;
+        }
+
+        private static HttpContext GetHttpContext()
+        {
+            var services = CreateServices();
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = services.BuildServiceProvider();
+
+            return httpContext;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ProducesAttributeTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ProducesAttributeTests.cs
new file mode 100644
index 0000000000..49084a2c91
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ProducesAttributeTests.cs
@@ -0,0 +1,186 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Formatters.Internal;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Primitives;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Test
+{
+    public class ProducesAttributeTests
+    {
+        [Fact]
+        public void ProducesAttribute_SetsContentType()
+        {
+            // Arrange
+            var mediaType1 = new StringSegment("application/json");
+            var mediaType2 = new StringSegment("text/json;charset=utf-8");
+            var producesContentAttribute = new ProducesAttribute("application/json", "text/json;charset=utf-8");
+            var resultExecutingContext = CreateResultExecutingContext(new IFilterMetadata[] { producesContentAttribute });
+            var next = new ResultExecutionDelegate(
+                            () => Task.FromResult(CreateResultExecutedContext(resultExecutingContext)));
+
+            // Act
+            producesContentAttribute.OnResultExecuting(resultExecutingContext);
+
+            // Assert
+            var objectResult = resultExecutingContext.Result as ObjectResult;
+            Assert.Equal(2, objectResult.ContentTypes.Count);
+            MediaTypeAssert.Equal(mediaType1, objectResult.ContentTypes[0]);
+            MediaTypeAssert.Equal(mediaType2, objectResult.ContentTypes[1]);
+        }
+
+        [Fact]
+        public void ProducesContentAttribute_FormatFilterAttribute_NotActive()
+        {
+            // Arrange
+            var producesContentAttribute = new ProducesAttribute("application/xml");
+
+            var formatFilter = new Mock<IFormatFilter>();
+            formatFilter
+                .Setup(f => f.GetFormat(It.IsAny<ActionContext>()))
+                .Returns((string)null);
+
+            var filters = new IFilterMetadata[] { producesContentAttribute, formatFilter.Object };
+            var resultExecutingContext = CreateResultExecutingContext(filters);
+
+            var next = new ResultExecutionDelegate(
+                            () => Task.FromResult(CreateResultExecutedContext(resultExecutingContext)));
+
+            // Act
+            producesContentAttribute.OnResultExecuting(resultExecutingContext);
+
+            // Assert
+            var objectResult = Assert.IsType<ObjectResult>(resultExecutingContext.Result);
+            Assert.Single(objectResult.ContentTypes);
+        }
+
+        [Fact]
+        public void ProducesContentAttribute_FormatFilterAttribute_Active()
+        {
+            // Arrange
+            var producesContentAttribute = new ProducesAttribute("application/xml");
+
+            var formatFilter = new Mock<IFormatFilter>();
+            formatFilter
+                .Setup(f => f.GetFormat(It.IsAny<ActionContext>()))
+                .Returns("xml");
+
+            var filters = new IFilterMetadata[] { producesContentAttribute, formatFilter.Object };
+            var resultExecutingContext = CreateResultExecutingContext(filters);
+
+            var next = new ResultExecutionDelegate(
+                            () => Task.FromResult(CreateResultExecutedContext(resultExecutingContext)));
+
+            // Act
+            producesContentAttribute.OnResultExecuting(resultExecutingContext);
+
+            // Assert
+            var objectResult = Assert.IsType<ObjectResult>(resultExecutingContext.Result);
+            Assert.Empty(objectResult.ContentTypes);
+        }
+
+        [Theory]
+        [InlineData("", "")]
+        [InlineData("application/xml,, application/json", "")]
+        [InlineData(", application/json", "")]
+        [InlineData("invalid", "invalid")]
+        [InlineData("application/xml,invalid, application/json", "invalid")]
+        [InlineData("invalid, application/json", "invalid")]
+        public void ProducesAttribute_UnParsableContentType_Throws(string content, string invalidContentType)
+        {
+            // Act
+            var contentTypes = content.Split(',').Select(contentType => contentType.Trim()).ToArray();
+
+            // Assert
+            var ex = Assert.Throws<FormatException>(
+                       () => new ProducesAttribute(contentTypes[0], contentTypes.Skip(1).ToArray()));
+            Assert.Equal("The header contains invalid values at index 0: '" + (invalidContentType ?? "<null>") + "'",
+                         ex.Message);
+        }
+
+        [Theory]
+        [InlineData("application/*", "application/*")]
+        [InlineData("application/xml, application/*, application/json", "application/*")]
+        [InlineData("application/*, application/json", "application/*")]
+
+        [InlineData("*/*", "*/*")]
+        [InlineData("application/xml, */*, application/json", "*/*")]
+        [InlineData("*/*, application/json", "*/*")]
+        [InlineData("application/*+json", "application/*+json")]
+        [InlineData("application/json;v=1;*", "application/json;v=1;*")]
+        public void ProducesAttribute_InvalidContentType_Throws(string content, string invalidContentType)
+        {
+            // Act
+            var contentTypes = content.Split(',').Select(contentType => contentType.Trim()).ToArray();
+
+            // Assert
+            var ex = Assert.Throws<InvalidOperationException>(
+                       () => new ProducesAttribute(contentTypes[0], contentTypes.Skip(1).ToArray()));
+
+            Assert.Equal(
+                string.Format("The argument '{0}' is invalid. " +
+                              "Media types which match all types or match all subtypes are not supported.",
+                              invalidContentType),
+                ex.Message);
+        }
+
+        [Fact]
+        public void ProducesAttribute_WithTypeOnly_SetsTypeProperty()
+        {
+            // Arrange
+            var personType = typeof(Person);
+            var producesAttribute = new ProducesAttribute(personType);
+
+            // Act and Assert
+            Assert.NotNull(producesAttribute.Type);
+            Assert.Same(personType, producesAttribute.Type);
+        }
+
+        [Fact]
+        public void ProducesAttribute_WithTypeOnly_DoesNotSetContentTypes()
+        {
+            // Arrange
+            var producesAttribute = new ProducesAttribute(typeof(Person));
+
+            // Act and Assert
+            Assert.NotNull(producesAttribute.ContentTypes);
+            Assert.Empty(producesAttribute.ContentTypes);
+        }
+
+        private static ResultExecutedContext CreateResultExecutedContext(ResultExecutingContext context)
+        {
+            return new ResultExecutedContext(context, context.Filters, context.Result, context.Controller);
+        }
+
+        private static ResultExecutingContext CreateResultExecutingContext(IFilterMetadata[] filters)
+        {
+            return new ResultExecutingContext(
+                CreateActionContext(),
+                filters,
+                new ObjectResult("Some Value"),
+                controller: new object());
+        }
+
+        private static ActionContext CreateActionContext()
+        {
+            return new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+        }
+
+        private class Person
+        {
+            public int Id { get; set; }
+
+            public string Name { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Properties/AssemblyInfo.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..3337ebeac2
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// 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.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectResultTest.cs
new file mode 100644
index 0000000000..dc37c52ae7
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectResultTest.cs
@@ -0,0 +1,160 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class RedirectResultTest
+    {
+        [Fact]
+        public void RedirectResult_Constructor_WithParameterUrl_SetsResultUrlAndNotPermanentOrPreserveMethod()
+        {
+            // Arrange
+            var url = "/test/url";
+
+            // Act
+            var result = new RedirectResult(url);
+
+            // Assert
+            Assert.False(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void RedirectResult_Constructor_WithParameterUrlAndPermanent_SetsResultUrlAndPermanentNotPreserveMethod()
+        {
+            // Arrange
+            var url = "/test/url";
+
+            // Act
+            var result = new RedirectResult(url, permanent: true);
+
+            // Assert
+            Assert.False(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void RedirectResult_Constructor_WithParameterUrlPermanentAndPreservesMethod_SetsResultUrlPermanentAndPreservesMethod()
+        {
+            // Arrange
+            var url = "/test/url";
+
+            // Act
+            var result = new RedirectResult(url, permanent: true, preserveMethod: true);
+
+            // Assert
+            Assert.True(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Theory]
+        [InlineData("", "/Home/About", "/Home/About")]
+        [InlineData("/myapproot", "/test", "/test")]
+        public async Task Execute_ReturnsContentPath_WhenItDoesNotStartWithTilde(
+            string appRoot,
+            string contentPath,
+            string expectedPath)
+        {
+            // Arrange
+            var httpResponse = new Mock<HttpResponse>();
+            httpResponse.Setup(o => o.Redirect(expectedPath, false))
+                        .Verifiable();
+
+            var httpContext = GetHttpContext(appRoot, contentPath, expectedPath, httpResponse.Object);
+            var actionContext = GetActionContext(httpContext);
+            var result = new RedirectResult(contentPath);
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            // Verifying if Redirect was called with the specific Url and parameter flag.
+            httpResponse.Verify();
+        }
+
+        [Theory]
+        [InlineData(null, "~/Home/About", "/Home/About")]
+        [InlineData("/", "~/Home/About", "/Home/About")]
+        [InlineData("/", "~/", "/")]
+        [InlineData("", "~/Home/About", "/Home/About")]
+        [InlineData("/myapproot", "~/", "/myapproot/")]
+        public async Task Execute_ReturnsAppRelativePath_WhenItStartsWithTilde(
+            string appRoot,
+            string contentPath,
+            string expectedPath)
+        {
+            // Arrange
+            var httpResponse = new Mock<HttpResponse>();
+            httpResponse.Setup(o => o.Redirect(expectedPath, false))
+                        .Verifiable();
+
+            var httpContext = GetHttpContext(appRoot, contentPath, expectedPath, httpResponse.Object);
+            var actionContext = GetActionContext(httpContext);
+            var result = new RedirectResult(contentPath);
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            // Verifying if Redirect was called with the specific Url and parameter flag.
+            httpResponse.Verify();
+        }
+
+        private static ActionContext GetActionContext(HttpContext httpContext)
+        {
+            var routeData = new RouteData();
+            routeData.Routers.Add(new Mock<IRouter>().Object);
+
+            return new ActionContext(httpContext,
+                                    routeData,
+                                    new ActionDescriptor());
+        }
+
+        private static IServiceProvider GetServiceProvider()
+        {
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddSingleton<IActionResultExecutor<RedirectResult>, RedirectResultExecutor>();
+            serviceCollection.AddSingleton<IUrlHelperFactory, UrlHelperFactory>();
+            serviceCollection.AddTransient<ILoggerFactory, LoggerFactory>();
+            return serviceCollection.BuildServiceProvider();
+        }
+
+        private static HttpContext GetHttpContext(
+            string appRoot,
+            string contentPath,
+            string expectedPath,
+            HttpResponse response)
+        {
+            var httpContext = new Mock<HttpContext>();
+            var serviceProvider = GetServiceProvider();
+
+            httpContext.Setup(o => o.Response)
+                       .Returns(response);
+            httpContext.SetupGet(o => o.RequestServices)
+                       .Returns(serviceProvider);
+            httpContext.SetupGet(o => o.Items)
+                       .Returns(new ItemsDictionary());
+            httpContext.Setup(o => o.Request.PathBase)
+                       .Returns(new PathString(appRoot));
+
+            return httpContext.Object;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToActionResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToActionResultTest.cs
new file mode 100644
index 0000000000..28a5976c9b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToActionResultTest.cs
@@ -0,0 +1,160 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class RedirectToActionResultTest
+    {
+        [Fact]
+        public async Task RedirectToAction_Execute_PassesCorrectValuesToRedirect()
+        {
+            // Arrange
+            var expectedUrl = "SampleAction";
+            var expectedPermanentFlag = false;
+
+            var httpContext = new Mock<HttpContext>();
+            httpContext
+                .SetupGet(o => o.RequestServices)
+                .Returns(CreateServices().BuildServiceProvider());
+
+            var httpResponse = new Mock<HttpResponse>();
+            httpContext
+                .Setup(o => o.Response)
+                .Returns(httpResponse.Object);
+
+            var actionContext = new ActionContext(httpContext.Object, new RouteData(), new ActionDescriptor());
+
+            var urlHelper = GetMockUrlHelper(expectedUrl);
+            var result = new RedirectToActionResult("SampleAction", null, null)
+            {
+                UrlHelper = urlHelper,
+            };
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            // Verifying if Redirect was called with the specific Url and parameter flag.
+            // Thus we verify that the Url returned by UrlHelper is passed properly to
+            // Redirect method and that the method is called exactly once.
+            httpResponse.Verify(r => r.Redirect(expectedUrl, expectedPermanentFlag), Times.Exactly(1));
+        }
+
+        [Fact]
+        public async Task RedirectToAction_Execute_ThrowsOnNullUrl()
+        {
+            // Arrange
+            var httpContext = new Mock<HttpContext>();
+            httpContext
+                .Setup(o => o.Response)
+                .Returns(new Mock<HttpResponse>().Object);
+            httpContext
+                .SetupGet(o => o.RequestServices)
+                .Returns(CreateServices().BuildServiceProvider());
+
+            var actionContext = new ActionContext(httpContext.Object, new RouteData(), new ActionDescriptor());
+
+            var urlHelper = GetMockUrlHelper(returnValue: null);
+            var result = new RedirectToActionResult(null, null, null)
+            {
+                UrlHelper = urlHelper,
+            };
+
+            // Act & Assert
+            await ExceptionAssert.ThrowsAsync<InvalidOperationException>(
+                async () =>
+                {
+                    await result.ExecuteResultAsync(actionContext);
+                },
+                "No route matches the supplied values.");
+        }
+
+        [Fact]
+        public async Task RedirectToAction_Execute_WithFragment_PassesCorrectValuesToRedirect()
+        {
+            // Arrange
+            var expectedUrl = "/Home/SampleAction#test";
+            var expectedStatusCode = StatusCodes.Status302Found;
+
+            var httpContext = new DefaultHttpContext
+            {
+                RequestServices = CreateServices().BuildServiceProvider(),
+            };
+
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            var urlHelper = GetMockUrlHelper(expectedUrl);
+            var result = new RedirectToActionResult("SampleAction", "Home", null, false, "test")
+            {
+                UrlHelper = urlHelper,
+            };
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Equal(expectedStatusCode, httpContext.Response.StatusCode);
+            Assert.Equal(expectedUrl, httpContext.Response.Headers["Location"]);
+        }
+
+        [Fact]
+        public async Task RedirectToAction_Execute_WithFragment_PassesCorrectValuesToRedirect_WithPreserveMethod()
+        {
+            // Arrange
+            var expectedUrl = "/Home/SampleAction#test";
+            var expectedStatusCode = StatusCodes.Status307TemporaryRedirect;
+
+            var httpContext = new DefaultHttpContext
+            {
+                RequestServices = CreateServices().BuildServiceProvider(),
+            };
+
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            var urlHelper = GetMockUrlHelper(expectedUrl);
+            var result = new RedirectToActionResult("SampleAction", "Home", null, false, true, "test")
+            {
+                UrlHelper = urlHelper,
+            };
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Equal(expectedStatusCode, httpContext.Response.StatusCode);
+            Assert.Equal(expectedUrl, httpContext.Response.Headers["Location"]);
+        }
+
+        private static IUrlHelper GetMockUrlHelper(string returnValue)
+        {
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper.Setup(o => o.Action(It.IsAny<UrlActionContext>())).Returns(returnValue);
+
+            return urlHelper.Object;
+        }
+
+        private static IServiceCollection CreateServices()
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<IActionResultExecutor<RedirectToActionResult>, RedirectToActionResultExecutor>();
+            services.AddSingleton<IUrlHelperFactory, UrlHelperFactory>();
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+            return services;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToPageResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToPageResultTest.cs
new file mode 100644
index 0000000000..40026e2130
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToPageResultTest.cs
@@ -0,0 +1,324 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class RedirectToPageResultTest
+    {
+        [Fact]
+        public async Task ExecuteResultAsync_ThrowsOnNullUrl()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext
+            {
+                RequestServices = CreateServices(),
+            };
+
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            var urlHelper = GetUrlHelper(actionContext, returnValue: null);
+            var result = new RedirectToPageResult("/some-page", new Dictionary<string, object>())
+            {
+                UrlHelper = urlHelper,
+            };
+
+            // Act & Assert
+            await ExceptionAssert.ThrowsAsync<InvalidOperationException>(
+                () => result.ExecuteResultAsync(actionContext),
+                "No page named '/some-page' matches the supplied values.");
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public async Task ExecuteResultAsync_PassesCorrectValuesToRedirect(bool permanentRedirect)
+        {
+            // Arrange
+            var expectedUrl = "SampleAction";
+
+            var httpContext = new Mock<HttpContext>();
+            var httpResponse = new Mock<HttpResponse>();
+            httpContext.SetupGet(c => c.RequestServices)
+                .Returns(CreateServices());
+            httpContext.SetupGet(c => c.Response)
+                .Returns(httpResponse.Object);
+
+            var actionContext = new ActionContext(
+                httpContext.Object,
+                new RouteData(),
+                new ActionDescriptor());
+
+            var urlHelper = GetUrlHelper(actionContext, expectedUrl);
+            var result = new RedirectToPageResult("/MyPage", null, new { id = 10, test = "value" }, permanentRedirect)
+            {
+                UrlHelper = urlHelper,
+            };
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            httpResponse.Verify(r => r.Redirect(expectedUrl, permanentRedirect), Times.Exactly(1));
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_LocalRelativePaths()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext
+            {
+                RequestServices = CreateServices(),
+            };
+
+            var pageContext = new PageContext
+            {
+                HttpContext = httpContext,
+                RouteData = new RouteData(),
+                ActionDescriptor = new CompiledPageActionDescriptor(),
+            };
+
+            pageContext.RouteData.Values.Add("page", "/A/Redirecting/Page");
+
+            UrlRouteContext context = null;
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper.SetupGet(h => h.ActionContext).Returns(pageContext);
+            urlHelper.Setup(h => h.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Callback((UrlRouteContext c) => context = c)
+                .Returns("some-value");
+            var values = new { test = "test-value" };
+            var result = new RedirectToPageResult("./", "page-handler", values, true, "test-fragment")
+            {
+                UrlHelper = urlHelper.Object,
+                Protocol = "ftp",
+            };
+
+            // Act
+            await result.ExecuteResultAsync(pageContext);
+
+            // Assert
+            Assert.NotNull(context);
+            Assert.Null(context.RouteName);
+            Assert.Collection(Assert.IsType<RouteValueDictionary>(context.Values),
+                value =>
+                {
+                    Assert.Equal("test", value.Key);
+                    Assert.Equal("test-value", value.Value);
+                },
+                value =>
+                {
+                    Assert.Equal("page", value.Key);
+                    Assert.Equal("/A/Redirecting", value.Value);
+                },
+                value =>
+                {
+                    Assert.Equal("handler", value.Key);
+                    Assert.Equal("page-handler", value.Value);
+                });
+            Assert.Equal("ftp", context.Protocol);
+            Assert.Equal("test-fragment", context.Fragment);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_WithAllParameters()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext
+            {
+                RequestServices = CreateServices(),
+            };
+
+            var pageContext = new PageContext
+            {
+                HttpContext = httpContext,
+                RouteData = new RouteData(),
+            };
+
+            UrlRouteContext context = null;
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper.SetupGet(h => h.ActionContext).Returns(pageContext);
+            urlHelper.Setup(h => h.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Callback((UrlRouteContext c) => context = c)
+                .Returns("some-value");
+            var values = new { test = "test-value" };
+            var result = new RedirectToPageResult("/MyPage", "page-handler", values, true, "test-fragment")
+            {
+                UrlHelper = urlHelper.Object,
+                Protocol = "ftp",
+            };
+
+            // Act
+            await result.ExecuteResultAsync(pageContext);
+
+            // Assert
+            Assert.NotNull(context);
+            Assert.Null(context.RouteName);
+            Assert.Collection(Assert.IsType<RouteValueDictionary>(context.Values),
+                value =>
+                {
+                    Assert.Equal("test", value.Key);
+                    Assert.Equal("test-value", value.Value);
+                },
+                value =>
+                {
+                    Assert.Equal("page", value.Key);
+                    Assert.Equal("/MyPage", value.Value);
+                },
+                value =>
+                {
+                    Assert.Equal("handler", value.Key);
+                    Assert.Equal("page-handler", value.Value);
+                });
+            Assert.Equal("ftp", context.Protocol);
+            Assert.Equal("test-fragment", context.Fragment);
+        }
+
+        [Fact]
+        public async Task RedirectToPage_WithNullPage_UsesAmbientValue()
+        {
+            // Arrange
+            var expected = "path/to/this-page";
+            var httpContext = new Mock<HttpContext>();
+            var httpResponse = new Mock<HttpResponse>();
+            httpContext.SetupGet(c => c.Response)
+                .Returns(httpResponse.Object);
+            httpContext.SetupGet(c => c.RequestServices)
+                .Returns(CreateServices());
+            var routeData = new RouteData
+            {
+                Values =
+                {
+                    ["page"] = expected,
+                }
+            };
+
+            var actionContext = new ActionContext(
+                httpContext.Object,
+                routeData,
+                new ActionDescriptor());
+
+            UrlRouteContext context = null;
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper.Setup(h => h.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Callback((UrlRouteContext c) => context = c)
+                .Returns("some-value");
+            urlHelper.SetupGet(h => h.ActionContext)
+                .Returns(actionContext);
+            var pageName = (string)null;
+            var result = new RedirectToPageResult(pageName)
+            {
+                UrlHelper = urlHelper.Object,
+            };
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.NotNull(context);
+            Assert.Collection(Assert.IsType<RouteValueDictionary>(context.Values),
+               value =>
+               {
+                   Assert.Equal("page", value.Key);
+                   Assert.Equal(expected, value.Value);
+               });
+        }
+
+        [Fact]
+        public async Task RedirectToPage_DoesNotUseAmbientHandler()
+        {
+            // Arrange
+            var expected = "path/to/this-page";
+            var httpContext = new Mock<HttpContext>();
+            var httpResponse = new Mock<HttpResponse>();
+            httpContext.SetupGet(c => c.Response)
+                .Returns(httpResponse.Object);
+            httpContext.SetupGet(c => c.RequestServices)
+                .Returns(CreateServices());
+            var routeData = new RouteData
+            {
+                Values =
+                {
+                    ["page"] = expected,
+                    ["handler"] = "delete",
+                }
+            };
+
+            var actionContext = new ActionContext(
+                httpContext.Object,
+                routeData,
+                new ActionDescriptor());
+
+            UrlRouteContext context = null;
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper.Setup(h => h.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Callback((UrlRouteContext c) => context = c)
+                .Returns("some-value");
+            urlHelper.SetupGet(h => h.ActionContext)
+                .Returns(actionContext);
+            var pageName = (string)null;
+            var result = new RedirectToPageResult(pageName)
+            {
+                UrlHelper = urlHelper.Object,
+            };
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.NotNull(context);
+            Assert.Collection(Assert.IsType<RouteValueDictionary>(context.Values),
+               value =>
+               {
+                   Assert.Equal("page", value.Key);
+                   Assert.Equal(expected, value.Value);
+               },
+               value =>
+               {
+                   Assert.Equal("handler", value.Key);
+                   Assert.Null(value.Value);
+               });
+        }
+
+        private static IServiceProvider CreateServices(IUrlHelperFactory factory = null)
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<IActionResultExecutor<RedirectToPageResult>, RedirectToPageResultExecutor>();
+
+            if (factory != null)
+            {
+                services.AddSingleton(factory);
+            }
+            else
+            {
+                services.AddSingleton<IUrlHelperFactory, UrlHelperFactory>();
+            }
+
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+            return services.BuildServiceProvider();
+        }
+
+        private static IUrlHelper GetUrlHelper(ActionContext context, string returnValue)
+        {
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper.SetupGet(h => h.ActionContext).Returns(context);
+            urlHelper.Setup(o => o.RouteUrl(It.IsAny<UrlRouteContext>())).Returns(returnValue);
+            return urlHelper.Object;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToRouteResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToRouteResultTest.cs
new file mode 100644
index 0000000000..6b0de7b699
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToRouteResultTest.cs
@@ -0,0 +1,222 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class RedirectToRouteResultTest
+    {
+        [Theory]
+        [MemberData(nameof(RedirectToRouteData))]
+        public async Task RedirectToRoute_Execute_PassesCorrectValuesToRedirect(object values)
+        {
+            // Arrange
+            var expectedUrl = "SampleAction";
+            var expectedPermanentFlag = false;
+
+            var httpContext = new Mock<HttpContext>();
+            httpContext.SetupGet(o => o.RequestServices).Returns(CreateServices().BuildServiceProvider());
+
+            var httpResponse = new Mock<HttpResponse>();
+            httpContext.Setup(o => o.Response).Returns(httpResponse.Object);
+
+            var actionContext = new ActionContext(httpContext.Object,
+                                                  new RouteData(),
+                                                  new ActionDescriptor());
+
+            var urlHelper = GetMockUrlHelper(expectedUrl);
+            var result = new RedirectToRouteResult(null, PropertyHelper.ObjectToDictionary(values))
+            {
+                UrlHelper = urlHelper,
+            };
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            // Verifying if Redirect was called with the specific Url and parameter flag.
+            // Thus we verify that the Url returned by UrlHelper is passed properly to
+            // Redirect method and that the method is called exactly once.
+            httpResponse.Verify(r => r.Redirect(expectedUrl, expectedPermanentFlag), Times.Exactly(1));
+        }
+
+        [Fact]
+        public async Task RedirectToRoute_Execute_ThrowsOnNullUrl()
+        {
+            // Arrange
+            var httpContext = new Mock<HttpContext>();
+            httpContext
+                .Setup(o => o.Response)
+                .Returns(new Mock<HttpResponse>().Object);
+            httpContext
+                .SetupGet(o => o.RequestServices)
+                .Returns(CreateServices().BuildServiceProvider());
+
+            var actionContext = new ActionContext(httpContext.Object, new RouteData(), new ActionDescriptor());
+
+            var urlHelper = GetMockUrlHelper(returnValue: null);
+            var result = new RedirectToRouteResult(null, new Dictionary<string, object>())
+            {
+                UrlHelper = urlHelper,
+            };
+
+            // Act & Assert
+            await ExceptionAssert.ThrowsAsync<InvalidOperationException>(
+                async () =>
+                {
+                    await result.ExecuteResultAsync(actionContext);
+                },
+                "No route matches the supplied values.");
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_UsesRouteName_ToGenerateLocationHeader()
+        {
+            // Arrange
+            var routeName = "orders_api";
+            var locationUrl = "/api/orders/10";
+
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper
+                .Setup(uh => uh.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Returns(locationUrl)
+                .Verifiable();
+            var factory = new Mock<IUrlHelperFactory>();
+            factory
+                .Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>()))
+                .Returns(urlHelper.Object);
+
+            var httpContext = GetHttpContext(factory.Object);
+
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var result = new RedirectToRouteResult(routeName, new { id = 10 });
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            urlHelper.Verify(uh => uh.RouteUrl(
+                It.Is<UrlRouteContext>(routeContext => string.Equals(routeName, routeContext.RouteName))));
+            Assert.True(httpContext.Response.Headers.ContainsKey("Location"), "Location header not found");
+            Assert.Equal(locationUrl, httpContext.Response.Headers["Location"]);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_WithFragment_PassesCorrectValuesToRedirect()
+        {
+            // Arrange
+            var expectedUrl = "/SampleAction#test";
+            var expectedStatusCode = StatusCodes.Status301MovedPermanently;
+
+            var httpContext = GetHttpContext();
+
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            var urlHelper = GetMockUrlHelper(expectedUrl);
+            var result = new RedirectToRouteResult("Sample", null, true, "test")
+            {
+                UrlHelper = urlHelper,
+            };
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Equal(expectedStatusCode, httpContext.Response.StatusCode);
+            Assert.Equal(expectedUrl, httpContext.Response.Headers["Location"]);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_WithFragment_PassesCorrectValuesToRedirect_WithPreserveMethod()
+        {
+            // Arrange
+            var expectedUrl = "/SampleAction#test";
+            var expectedStatusCode = StatusCodes.Status308PermanentRedirect;
+
+            var httpContext = GetHttpContext();
+
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            var urlHelper = GetMockUrlHelper(expectedUrl);
+            var result = new RedirectToRouteResult("Sample", null, true, true, "test")
+            {
+                UrlHelper = urlHelper,
+            };
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Equal(expectedStatusCode, httpContext.Response.StatusCode);
+            Assert.Equal(expectedUrl, httpContext.Response.Headers["Location"]);
+        }
+
+        private static HttpContext GetHttpContext(IUrlHelperFactory factory = null)
+        {
+            var services = CreateServices(factory);
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = services.BuildServiceProvider();
+
+            return httpContext;
+        }
+
+        private static IServiceCollection CreateServices(IUrlHelperFactory factory = null)
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<IActionResultExecutor<RedirectToRouteResult>, RedirectToRouteResultExecutor>();
+
+            if (factory != null)
+            {
+                services.AddSingleton(factory);
+            }
+            else
+            {
+                services.AddSingleton<IUrlHelperFactory, UrlHelperFactory>();
+            }
+
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+            return services;
+        }
+
+        public static IEnumerable<object[]> RedirectToRouteData
+        {
+            get
+            {
+                yield return new object[] { null };
+                yield return
+                    new object[] {
+                        new Dictionary<string, string>() { { "hello", "world" } }
+                    };
+                yield return
+                    new object[] {
+                        new RouteValueDictionary(new Dictionary<string, string>() {
+                                                        { "test", "case" }, { "sample", "route" } })
+                    };
+            }
+        }
+
+        private static IUrlHelper GetMockUrlHelper(string returnValue)
+        {
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper.Setup(o => o.RouteUrl(It.IsAny<UrlRouteContext>())).Returns(returnValue);
+            return urlHelper.Object;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RequestFormLimitsAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RequestFormLimitsAttributeTest.cs
new file mode 100644
index 0000000000..8b8cbfa48d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RequestFormLimitsAttributeTest.cs
@@ -0,0 +1,91 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Http.Features;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class RequestFormLimitsAttributeTest
+    {
+        [Fact]
+        public void AllPublicProperties_OfFormOptions_AreExposed()
+        {
+            // Arrange
+            var formOptionsProperties = GetProperties(typeof(FormOptions));
+            var formLimitsAttributeProperties = GetProperties(typeof(RequestFormLimitsAttribute));
+
+            // Act & Assert
+            foreach (var property in formOptionsProperties)
+            {
+                var formLimiAttributeProperty = formLimitsAttributeProperties
+                    .Where(pi => property.Name == pi.Name && pi.PropertyType == property.PropertyType)
+                    .SingleOrDefault();
+                Assert.NotNull(formLimiAttributeProperty);
+            }
+        }
+
+        [Fact]
+        public void CreatesFormOptions_WithDefaults()
+        {
+            // Arrange
+            var formOptionsProperties = GetProperties(typeof(FormOptions));
+            var formLimitsAttributeProperties = GetProperties(typeof(RequestFormLimitsAttribute));
+            var formOptions = new FormOptions();
+
+            // Act
+            var requestFormLimitsAttribute = new RequestFormLimitsAttribute();
+
+            // Assert
+            foreach (var formOptionsProperty in formOptionsProperties)
+            {
+                var formLimitsAttributeProperty = formLimitsAttributeProperties
+                    .Where(pi => pi.Name == formOptionsProperty.Name && pi.PropertyType == formOptionsProperty.PropertyType)
+                    .SingleOrDefault();
+
+                Assert.Equal(
+                    formOptionsProperty.GetValue(formOptions),
+                    formLimitsAttributeProperty.GetValue(requestFormLimitsAttribute));
+            }
+        }
+
+        [Fact]
+        public void UpdatesFormOptions_WithOverridenValues()
+        {
+            // Arrange
+            var requestFormLimitsAttribute = new RequestFormLimitsAttribute();
+
+            // Act
+            requestFormLimitsAttribute.BufferBody = true;
+            requestFormLimitsAttribute.BufferBodyLengthLimit = 0;
+            requestFormLimitsAttribute.KeyLengthLimit = 0;
+            requestFormLimitsAttribute.MemoryBufferThreshold = 0;
+            requestFormLimitsAttribute.MultipartBodyLengthLimit = 0;
+            requestFormLimitsAttribute.MultipartBoundaryLengthLimit = 0;
+            requestFormLimitsAttribute.MultipartHeadersCountLimit = 0;
+            requestFormLimitsAttribute.MultipartHeadersLengthLimit = 0;
+            requestFormLimitsAttribute.ValueCountLimit = 0;
+            requestFormLimitsAttribute.ValueLengthLimit = 0;
+
+            // Assert
+            Assert.True(requestFormLimitsAttribute.FormOptions.BufferBody);
+            Assert.Equal(0, requestFormLimitsAttribute.FormOptions.BufferBodyLengthLimit);
+            Assert.Equal(0, requestFormLimitsAttribute.FormOptions.KeyLengthLimit);
+            Assert.Equal(0, requestFormLimitsAttribute.FormOptions.MemoryBufferThreshold);
+            Assert.Equal(0, requestFormLimitsAttribute.FormOptions.MultipartBodyLengthLimit);
+            Assert.Equal(0, requestFormLimitsAttribute.FormOptions.MultipartBoundaryLengthLimit);
+            Assert.Equal(0, requestFormLimitsAttribute.FormOptions.MultipartHeadersCountLimit);
+            Assert.Equal(0, requestFormLimitsAttribute.FormOptions.MultipartHeadersLengthLimit);
+            Assert.Equal(0, requestFormLimitsAttribute.FormOptions.ValueCountLimit);
+            Assert.Equal(0, requestFormLimitsAttribute.FormOptions.ValueLengthLimit);
+        }
+
+        private PropertyInfo[] GetProperties(Type type)
+        {
+            return type.GetProperties(BindingFlags.Public | BindingFlags.Instance);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RequireHttpsAttributeTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RequireHttpsAttributeTests.cs
new file mode 100644
index 0000000000..bac3672432
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RequireHttpsAttributeTests.cs
@@ -0,0 +1,247 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class RequireHttpsAttributeTests
+    {
+        [Fact]
+        public void OnAuthorization_AllowsTheRequestIfItIsHttps()
+        {
+            // Arrange
+            var requestContext = new DefaultHttpContext();
+            requestContext.Request.Scheme = "https";
+
+            var authContext = CreateAuthorizationContext(requestContext);
+            var attr = new RequireHttpsAttribute();
+
+            // Act
+            attr.OnAuthorization(authContext);
+
+            // Assert
+            Assert.Null(authContext.Result);
+        }
+
+        public static TheoryData<string, string, string, string, string> RedirectToHttpEndpointTestData
+        {
+            get
+            {
+                // host, pathbase, path, query, expectedRedirectUrl
+                return new TheoryData<string, string, string, string, string>
+                {
+                    { "localhost", null, null, null, "https://localhost" },
+                    { "localhost:5000", null, null, null, "https://localhost" },
+                    { "localhost", "/pathbase", null, null, "https://localhost/pathbase" },
+                    { "localhost", "/pathbase", "/path", null, "https://localhost/pathbase/path" },
+                    { "localhost", "/pathbase", "/path", "?foo=bar", "https://localhost/pathbase/path?foo=bar" },
+
+                    // Encode some special characters on the URL.
+                    { "localhost", "/path?base", null, null, "https://localhost/path%3Fbase" },
+                    { "localhost", null, "/pa?th", null, "https://localhost/pa%3Fth" },
+
+                    { "localhost", "/", null, "?foo=bar%2Fbaz", "https://localhost/?foo=bar%2Fbaz" },
+
+                    // URLs with punycode
+                    // 本地主機 is "localhost" in chinese traditional, "xn--tiq21tzznx7c" is the
+                    // punycode representation.
+                    { "本地主機", "/", null, null, "https://xn--tiq21tzznx7c/" },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectToHttpEndpointTestData))]
+        public void OnAuthorization_RedirectsToHttpsEndpoint_ForNonHttpsGetRequests(
+            string host,
+            string pathBase,
+            string path,
+            string queryString,
+            string expectedUrl)
+        {
+            // Arrange
+            var requestContext = new DefaultHttpContext();
+            requestContext.RequestServices = CreateServices();
+            requestContext.Request.Scheme = "http";
+            requestContext.Request.Method = "GET";
+            requestContext.Request.Host = HostString.FromUriComponent(host);
+
+            if (pathBase != null)
+            {
+                requestContext.Request.PathBase = new PathString(pathBase);
+            }
+
+            if (path != null)
+            {
+                requestContext.Request.Path = new PathString(path);
+            }
+
+            if (queryString != null)
+            {
+                requestContext.Request.QueryString = new QueryString(queryString);
+            }
+
+            var authContext = CreateAuthorizationContext(requestContext);
+            var attr = new RequireHttpsAttribute();
+
+            // Act
+            attr.OnAuthorization(authContext);
+
+            // Assert
+            Assert.NotNull(authContext.Result);
+            var result = Assert.IsType<RedirectResult>(authContext.Result);
+
+            Assert.False(result.Permanent);
+            Assert.Equal(expectedUrl, result.Url);
+        }
+
+        [Theory]
+        [InlineData("POST")]
+        [InlineData("PUT")]
+        [InlineData("PATCH")]
+        [InlineData("DELETE")]
+        public void OnAuthorization_SignalsBadRequestStatusCode_ForNonHttpsAndNonGetRequests(string method)
+        {
+            // Arrange
+            var requestContext = new DefaultHttpContext();
+            requestContext.RequestServices = CreateServices();
+            requestContext.Request.Scheme = "http";
+            requestContext.Request.Method = method;
+            var authContext = CreateAuthorizationContext(requestContext);
+            var attr = new RequireHttpsAttribute();
+
+            // Act
+            attr.OnAuthorization(authContext);
+
+            // Assert
+            Assert.NotNull(authContext.Result);
+            var result = Assert.IsType<StatusCodeResult>(authContext.Result);
+            Assert.Equal(StatusCodes.Status403Forbidden, result.StatusCode);
+        }
+
+        [Fact]
+        public void HandleNonHttpsRequestExtensibility()
+        {
+            // Arrange
+            var requestContext = new DefaultHttpContext();
+            requestContext.RequestServices = CreateServices();
+            requestContext.Request.Scheme = "http";
+
+            var authContext = CreateAuthorizationContext(requestContext);
+            var attr = new CustomRequireHttpsAttribute();
+
+            // Act
+            attr.OnAuthorization(authContext);
+
+            // Assert
+            var result = Assert.IsType<StatusCodeResult>(authContext.Result);
+            Assert.Equal(StatusCodes.Status404NotFound, result.StatusCode);
+        }
+
+        [Theory]
+        [InlineData("http://localhost", null, "https://localhost/")]
+        [InlineData("http://localhost:5000", null, "https://localhost/")]
+        [InlineData("http://[2001:db8:a0b:12f0::1]", null, "https://[2001:db8:a0b:12f0::1]/")]
+        [InlineData("http://[2001:db8:a0b:12f0::1]:5000", null, "https://[2001:db8:a0b:12f0::1]/")]
+        [InlineData("http://localhost:5000/path", null, "https://localhost/path")]
+        [InlineData("http://localhost:5000/path?foo=bar", null, "https://localhost/path?foo=bar")]
+        [InlineData("http://本地主機:5000", null, "https://xn--tiq21tzznx7c/")]
+        [InlineData("http://localhost", 44380, "https://localhost:44380/")]
+        [InlineData("http://localhost:5000", 44380, "https://localhost:44380/")]
+        [InlineData("http://[2001:db8:a0b:12f0::1]", 44380, "https://[2001:db8:a0b:12f0::1]:44380/")]
+        [InlineData("http://[2001:db8:a0b:12f0::1]:5000", 44380, "https://[2001:db8:a0b:12f0::1]:44380/")]
+        [InlineData("http://localhost:5000/path", 44380, "https://localhost:44380/path")]
+        [InlineData("http://localhost:5000/path?foo=bar", 44380, "https://localhost:44380/path?foo=bar")]
+        [InlineData("http://本地主機:5000", 44380, "https://xn--tiq21tzznx7c:44380/")]
+        public void OnAuthorization_RedirectsToHttpsEndpoint_ForCustomSslPort(
+            string url,
+            int? sslPort,
+            string expectedUrl)
+        {
+            // Arrange
+            var options = Options.Create(new MvcOptions());
+            var uri = new Uri(url);
+
+            var requestContext = new DefaultHttpContext();
+            requestContext.RequestServices = CreateServices(sslPort);
+            requestContext.Request.Scheme = "http";
+            requestContext.Request.Method = "GET";
+            requestContext.Request.Host = HostString.FromUriComponent(uri);
+            requestContext.Request.Path = PathString.FromUriComponent(uri);
+            requestContext.Request.QueryString = QueryString.FromUriComponent(uri);
+
+            var authContext = CreateAuthorizationContext(requestContext);
+            var attr = new RequireHttpsAttribute();
+
+            // Act
+            attr.OnAuthorization(authContext);
+
+            // Assert
+            Assert.NotNull(authContext.Result);
+            var result = Assert.IsType<RedirectResult>(authContext.Result);
+
+            Assert.Equal(expectedUrl, result.Url);
+        }
+
+        [Theory]
+        [InlineData(null, true)]
+        [InlineData(null, false)]
+        [InlineData(true, false)]
+        [InlineData(false, true)]
+        public void OnAuthorization_RedirectsToHttpsEndpoint_WithSpecifiedStatusCodeAndrequireHttpsPermanentOption(bool? permanent, bool requireHttpsPermanent)
+        {
+            var requestContext = new DefaultHttpContext();
+            requestContext.RequestServices = CreateServices(null, requireHttpsPermanent);
+            requestContext.Request.Scheme = "http";
+            requestContext.Request.Method = "GET";
+            
+            var authContext = CreateAuthorizationContext(requestContext);
+            var attr = new RequireHttpsAttribute();
+            if (permanent.HasValue)
+            {
+                attr.Permanent = permanent.Value; 
+            };
+
+            // Act
+            attr.OnAuthorization(authContext);
+
+            // Assert
+            var result = Assert.IsType<RedirectResult>(authContext.Result);
+            Assert.Equal(permanent ?? requireHttpsPermanent, result.Permanent);
+        }
+
+        private class CustomRequireHttpsAttribute : RequireHttpsAttribute
+        {
+            protected override void HandleNonHttpsRequest(AuthorizationFilterContext filterContext)
+            {
+                filterContext.Result = new StatusCodeResult(StatusCodes.Status404NotFound);
+            }
+        }
+
+        private static AuthorizationFilterContext CreateAuthorizationContext(HttpContext ctx)
+        {
+            var actionContext = new ActionContext(ctx, new RouteData(), new ActionDescriptor());
+            return new AuthorizationFilterContext(actionContext, new IFilterMetadata[0]);
+        }
+
+        private static IServiceProvider CreateServices(int? sslPort = null, bool requireHttpsPermanent = false)
+        {
+            var options = Options.Create(new MvcOptions());
+            options.Value.SslPort = sslPort;
+            options.Value.RequireHttpsPermanent = requireHttpsPermanent;
+
+            var services = new ServiceCollection();
+            services.AddSingleton<IOptions<MvcOptions>>(options);
+
+            return services.BuildServiceProvider();
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ResponseCacheAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ResponseCacheAttributeTest.cs
new file mode 100644
index 0000000000..c8d3921444
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ResponseCacheAttributeTest.cs
@@ -0,0 +1,367 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.ResponseCaching;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class ResponseCacheAttributeTest
+    {
+        [Theory]
+        [InlineData("Cache20Sec")]
+        // To verify case-insensitive lookup.
+        [InlineData("cache20sec")]
+        public void CreateInstance_SelectsTheAppropriateCacheProfile(string profileName)
+        {
+            // Arrange
+            var responseCache = new ResponseCacheAttribute()
+            {
+                CacheProfileName = profileName
+            };
+            var cacheProfiles = new Dictionary<string, CacheProfile>();
+            cacheProfiles.Add("Cache20Sec", new CacheProfile { NoStore = true });
+            cacheProfiles.Add("Test", new CacheProfile { Duration = 20 });
+
+            // Act
+            var createdFilter = responseCache.CreateInstance(GetServiceProvider(cacheProfiles));
+
+            // Assert
+            var responseCacheFilter = Assert.IsType<ResponseCacheFilter>(createdFilter);
+            Assert.True(responseCacheFilter.NoStore);
+        }
+
+        [Fact]
+        public void CreateInstance_ThrowsIfThereAreNoMatchingCacheProfiles()
+        {
+            // Arrange
+            var responseCache = new ResponseCacheAttribute()
+            {
+                CacheProfileName = "HelloWorld"
+            };
+            var cacheProfiles = new Dictionary<string, CacheProfile>();
+            cacheProfiles.Add("Cache20Sec", new CacheProfile { NoStore = true });
+            cacheProfiles.Add("Test", new CacheProfile { Duration = 20 });
+
+            // Act
+            var ex = Assert.Throws<InvalidOperationException>(
+                () => responseCache.CreateInstance(GetServiceProvider(cacheProfiles)));
+            Assert.Equal("The 'HelloWorld' cache profile is not defined.", ex.Message);
+        }
+
+        public static IEnumerable<object[]> OverrideData
+        {
+            get
+            {
+                // When there are no cache profiles then the passed in data is returned unchanged
+                yield return new object[] {
+                    new ResponseCacheAttribute()
+                    { Duration = 20, Location = ResponseCacheLocation.Any, NoStore = false, VaryByHeader = "Accept", VaryByQueryKeys = new[] { "QueryKey" } },
+                    null,
+                    new CacheProfile
+                    { Duration = 20, Location = ResponseCacheLocation.Any, NoStore = false, VaryByHeader = "Accept", VaryByQueryKeys = new[] { "QueryKey" } }
+                };
+
+                yield return new object[] {
+                    new ResponseCacheAttribute()
+                    { Duration = 0, Location = ResponseCacheLocation.None, NoStore = true, VaryByHeader = null, VaryByQueryKeys = null },
+                    null,
+                    new CacheProfile
+                    { Duration = 0, Location = ResponseCacheLocation.None, NoStore = true, VaryByHeader = null, VaryByQueryKeys = null }
+                };
+
+                // Everything gets overriden if attribute parameters are present,
+                // when a particular cache profile is chosen.
+                yield return new object[] {
+                    new ResponseCacheAttribute()
+                    {
+                        Duration = 20,
+                        Location = ResponseCacheLocation.Any,
+                        NoStore = false,
+                        VaryByHeader = "Accept",
+                        VaryByQueryKeys = new[] { "QueryKey" },
+                        CacheProfileName = "TestCacheProfile"
+                    },
+                    new Dictionary<string, CacheProfile> { { "TestCacheProfile", new CacheProfile
+                        {
+                            Duration = 10,
+                            Location = ResponseCacheLocation.Client,
+                            NoStore = true,
+                            VaryByHeader = "Test",
+                            VaryByQueryKeys = new[] { "ProfileQueryKey" }
+                        } } },
+                    new CacheProfile
+                    { Duration = 20, Location = ResponseCacheLocation.Any, NoStore = false, VaryByHeader = "Accept", VaryByQueryKeys = new[] { "QueryKey" } }
+                };
+
+                // Select parameters override the selected profile.
+                yield return new object[] {
+                    new ResponseCacheAttribute()
+                    {
+                        Duration = 534,
+                        CacheProfileName = "TestCacheProfile"
+                    },
+                    new Dictionary<string, CacheProfile>() { { "TestCacheProfile", new CacheProfile
+                        {
+                            Duration = 10,
+                            Location = ResponseCacheLocation.Client,
+                            NoStore = false,
+                            VaryByHeader = "Test",
+                            VaryByQueryKeys = new[] { "ProfileQueryKey" }
+                        } } },
+                    new CacheProfile
+                    { Duration = 534, Location = ResponseCacheLocation.Client, NoStore = false, VaryByHeader = "Test", VaryByQueryKeys = new[] { "ProfileQueryKey" } }
+                };
+
+                // Duration parameter gets added to the selected profile.
+                yield return new object[] {
+                    new ResponseCacheAttribute()
+                    {
+                        Duration = 534,
+                        CacheProfileName = "TestCacheProfile"
+                    },
+                    new Dictionary<string, CacheProfile>() { { "TestCacheProfile", new CacheProfile
+                        {
+                            Location = ResponseCacheLocation.Client,
+                            NoStore = false,
+                            VaryByHeader = "Test",
+                            VaryByQueryKeys = new[] { "ProfileQueryKey" }
+                        } } },
+                    new CacheProfile
+                    { Duration = 534, Location = ResponseCacheLocation.Client, NoStore = false, VaryByHeader = "Test", VaryByQueryKeys = new[] { "ProfileQueryKey" } }
+                };
+
+                // Default values gets added for parameters which are absent
+                yield return new object[] {
+                    new ResponseCacheAttribute()
+                    {
+                        Duration = 5234,
+                        CacheProfileName = "TestCacheProfile"
+                    },
+                    new Dictionary<string, CacheProfile>() { { "TestCacheProfile", new CacheProfile() } },
+                    new CacheProfile
+                    { Duration = 5234, Location = ResponseCacheLocation.Any, NoStore = false, VaryByHeader = null, VaryByQueryKeys = null }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(OverrideData))]
+        public void CreateInstance_HonorsOverrides(
+            ResponseCacheAttribute responseCache,
+            Dictionary<string, CacheProfile> cacheProfiles,
+            CacheProfile expectedProfile)
+        {
+            // Arrange & Act
+            var createdFilter = responseCache.CreateInstance(GetServiceProvider(cacheProfiles));
+
+            // Assert
+            var responseCacheFilter = Assert.IsType<ResponseCacheFilter>(createdFilter);
+            Assert.Equal(expectedProfile.Duration, responseCacheFilter.Duration);
+            Assert.Equal(expectedProfile.Location, responseCacheFilter.Location);
+            Assert.Equal(expectedProfile.NoStore, responseCacheFilter.NoStore);
+            Assert.Equal(expectedProfile.VaryByHeader, responseCacheFilter.VaryByHeader);
+            if (expectedProfile.VaryByQueryKeys == null)
+            {
+                Assert.Null(responseCacheFilter.VaryByQueryKeys);
+            }
+            else
+            {
+                Assert.Equal(expectedProfile.VaryByQueryKeys, responseCacheFilter.VaryByQueryKeys);
+            }
+        }
+
+        [Fact]
+        public void CreateInstance_DoesNotThrowWhenTheDurationIsNotSet_WithNoStoreFalse()
+        {
+            // Arrange
+            var responseCache = new ResponseCacheAttribute()
+            {
+                CacheProfileName = "Test"
+            };
+            var cacheProfiles = new Dictionary<string, CacheProfile>();
+            cacheProfiles.Add("Test", new CacheProfile { NoStore = false });
+
+            // Act
+            var filter = responseCache.CreateInstance(GetServiceProvider(cacheProfiles));
+
+            // Assert
+            Assert.NotNull(filter);
+        }
+
+        [Fact]
+        public void ResponseCache_SetsAllHeaders()
+        {
+            // Arrange
+            var varyByQueryKeys = new[] { "QueryKey" };
+            var responseCache = new ResponseCacheAttribute()
+            {
+                Duration = 100,
+                Location = ResponseCacheLocation.Any,
+                VaryByHeader = "Accept",
+                VaryByQueryKeys = varyByQueryKeys
+            };
+            var filter = (ResponseCacheFilter)responseCache.CreateInstance(GetServiceProvider(cacheProfiles: null));
+            var context = GetActionExecutingContext(filter);
+            context.HttpContext.Features.Set<IResponseCachingFeature>(new ResponseCachingFeature());
+
+            // Act
+            filter.OnActionExecuting(context);
+
+            // Assert
+            var response = context.HttpContext.Response;
+            StringValues values;
+            Assert.True(response.Headers.TryGetValue("Cache-Control", out values));
+            var data = Assert.Single(values);
+            AssertHeaderEquals("public, max-age=100", data);
+            Assert.True(response.Headers.TryGetValue("Vary", out values));
+            data = Assert.Single(values);
+            Assert.Equal("Accept", data);
+            Assert.Equal(varyByQueryKeys, context.HttpContext.Features.Get<IResponseCachingFeature>().VaryByQueryKeys);
+        }
+
+        public static TheoryData<ResponseCacheAttribute, string> CacheControlData
+        {
+            get
+            {
+                return new TheoryData<ResponseCacheAttribute, string>
+                {
+                    {
+                        new ResponseCacheAttribute() { Duration = 100, Location = ResponseCacheLocation.Any },
+                        "public, max-age=100"
+                    },
+                    {
+                         new ResponseCacheAttribute() { Duration = 100, Location = ResponseCacheLocation.Client },
+                        "max-age=100, private"
+                    },
+                    {
+                        new ResponseCacheAttribute() { NoStore = true, Duration = 0 },
+                        "no-store"
+                    },
+                    {
+                        new ResponseCacheAttribute()
+                    {
+                        NoStore = true,
+                        Duration = 0,
+                        Location = ResponseCacheLocation.None
+                    },
+                    "no-store, no-cache"
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(CacheControlData))]
+        public void ResponseCache_SetsDifferentCacheControlHeaders(
+            ResponseCacheAttribute responseCacheAttribute,
+            string expected)
+        {
+            // Arrange
+            var filter = (ResponseCacheFilter)responseCacheAttribute.CreateInstance(
+                GetServiceProvider(cacheProfiles: null));
+            var context = GetActionExecutingContext(filter);
+
+            // Act
+            filter.OnActionExecuting(context);
+
+            // Assert
+            StringValues values;
+            Assert.True(context.HttpContext.Response.Headers.TryGetValue("Cache-Control", out values));
+            var data = Assert.Single(values);
+            AssertHeaderEquals(expected, data);
+        }
+
+        [Fact]
+        public void SetsCacheControlPublicByDefault()
+        {
+            // Arrange
+            var responseCacheAttribute = new ResponseCacheAttribute() { Duration = 40 };
+            var filter = (ResponseCacheFilter)responseCacheAttribute.CreateInstance(
+                GetServiceProvider(cacheProfiles: null));
+            var context = GetActionExecutingContext(filter);
+
+            // Act
+            filter.OnActionExecuting(context);
+
+            // Assert
+            StringValues values;
+            Assert.True(context.HttpContext.Response.Headers.TryGetValue("Cache-Control", out values));
+            var data = Assert.Single(values);
+            AssertHeaderEquals("public, max-age=40", data);
+        }
+
+        [Fact]
+        public void ThrowsWhenDurationIsNotSet()
+        {
+            // Arrange
+            var responseCacheAttribute = new ResponseCacheAttribute()
+            {
+                VaryByHeader = "Accept"
+            };
+            var filter = (ResponseCacheFilter)responseCacheAttribute.CreateInstance(
+                GetServiceProvider(cacheProfiles: null));
+            var context = GetActionExecutingContext(filter);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() =>
+            {
+                filter.OnActionExecuting(context);
+            });
+            Assert.Equal(
+                "If the 'NoStore' property is not set to true, 'Duration' property must be specified.",
+                exception.Message);
+        }
+
+        private IServiceProvider GetServiceProvider(Dictionary<string, CacheProfile> cacheProfiles)
+        {
+            var serviceProvider = new Mock<IServiceProvider>();
+            var optionsAccessor = Options.Create(new MvcOptions());
+            if (cacheProfiles != null)
+            {
+                foreach (var p in cacheProfiles)
+                {
+                    optionsAccessor.Value.CacheProfiles.Add(p.Key, p.Value);
+                }
+            }
+
+            serviceProvider
+                .Setup(s => s.GetService(typeof(IOptions<MvcOptions>)))
+                .Returns(optionsAccessor);
+            serviceProvider
+                .Setup(s => s.GetService(typeof(ILoggerFactory)))
+                .Returns(Mock.Of<ILoggerFactory>());
+
+            return serviceProvider.Object;
+        }
+
+        private ActionExecutingContext GetActionExecutingContext(params IFilterMetadata[] filters)
+        {
+            return new ActionExecutingContext(
+                new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor()),
+                filters?.ToList() ?? new List<IFilterMetadata>(),
+                new Dictionary<string, object>(),
+                new object());
+        }
+
+        private void AssertHeaderEquals(string expected, string actual)
+        {
+            // OrderBy is used because the order of the results may vary depending on the platform / client.
+            Assert.Equal(
+                expected.Split(',').Select(p => p.Trim()).OrderBy(item => item, StringComparer.Ordinal),
+                actual.Split(',').Select(p => p.Trim()).OrderBy(item => item, StringComparer.Ordinal));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/HttpMethodProviderAttributesTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/HttpMethodProviderAttributesTests.cs
new file mode 100644
index 0000000000..b8b04b4460
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/HttpMethodProviderAttributesTests.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Routing
+{
+    public class HttpMethodProviderAttributesTests
+    {
+        [Theory]
+        [MemberData(nameof(HttpMethodProviderTestData))]
+        public void HttpMethodProviderAttributes_ReturnsCorrectHttpMethodSequence(
+            IActionHttpMethodProvider httpMethodProvider,
+            IEnumerable<string> expectedHttpMethods)
+        {
+            // Act & Assert
+            Assert.Equal(expectedHttpMethods, httpMethodProvider.HttpMethods);
+        }
+
+        public static TheoryData<IActionHttpMethodProvider, IEnumerable<string>> HttpMethodProviderTestData
+        {
+            get
+            {
+                var data = new TheoryData<IActionHttpMethodProvider, IEnumerable<string>>();
+                data.Add(new HttpGetAttribute(), new[] { "GET" });
+                data.Add(new HttpPostAttribute(), new[] { "POST" });
+                data.Add(new HttpPutAttribute(), new[] { "PUT" });
+                data.Add(new HttpPatchAttribute(), new[] { "PATCH" });
+                data.Add(new HttpDeleteAttribute(), new[] { "DELETE" });
+                data.Add(new HttpHeadAttribute(), new[] { "HEAD" });
+                data.Add(new HttpOptionsAttribute(), new[] { "OPTIONS" });
+                data.Add(new AcceptVerbsAttribute("MERGE", "OPTIONS"), new[] { "MERGE", "OPTIONS" });
+
+                return data;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/KnownRouteValueConstraintTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/KnownRouteValueConstraintTests.cs
new file mode 100644
index 0000000000..e6ee1638f6
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/KnownRouteValueConstraintTests.cs
@@ -0,0 +1,201 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Routing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Routing
+{
+    public class KnownRouteValueConstraintTests
+    {
+        private readonly IRouteConstraint _constraint = new KnownRouteValueConstraint();
+
+        [Theory]
+        [InlineData("area", RouteDirection.IncomingRequest)]
+        [InlineData("controller", RouteDirection.IncomingRequest)]
+        [InlineData("action", RouteDirection.IncomingRequest)]
+        [InlineData("randomKey", RouteDirection.IncomingRequest)]
+        [InlineData("area", RouteDirection.UrlGeneration)]
+        [InlineData("controller", RouteDirection.UrlGeneration)]
+        [InlineData("action", RouteDirection.UrlGeneration)]
+        [InlineData("randomKey", RouteDirection.UrlGeneration)]
+        public void RouteKey_DoesNotExist_MatchFails(string keyName, RouteDirection direction)
+        {
+            // Arrange
+            var values = new RouteValueDictionary();
+            var httpContext = GetHttpContext(new ActionDescriptor());
+            var route = Mock.Of<IRouter>();
+
+            // Act
+            var match = _constraint.Match(httpContext, route, keyName, values, direction);
+
+            // Assert
+            Assert.False(match);
+        }
+
+        [Theory]
+        [InlineData("area", RouteDirection.IncomingRequest)]
+        [InlineData("controller", RouteDirection.IncomingRequest)]
+        [InlineData("action", RouteDirection.IncomingRequest)]
+        [InlineData("randomKey", RouteDirection.IncomingRequest)]
+        [InlineData("area", RouteDirection.UrlGeneration)]
+        [InlineData("controller", RouteDirection.UrlGeneration)]
+        [InlineData("action", RouteDirection.UrlGeneration)]
+        [InlineData("randomKey", RouteDirection.UrlGeneration)]
+        public void RouteKey_Exists_MatchSucceeds(string keyName, RouteDirection direction)
+        {
+            // Arrange
+            var actionDescriptor = CreateActionDescriptor("testArea",
+                                                          "testController",
+                                                          "testAction");
+            actionDescriptor.RouteValues.Add("randomKey", "testRandom");
+            var httpContext = GetHttpContext(actionDescriptor);
+            var route = Mock.Of<IRouter>();
+            var values = new RouteValueDictionary()
+            {
+                { "area", "testArea" },
+                { "controller", "testController" },
+                { "action", "testAction" },
+                { "randomKey", "testRandom" }
+            };
+
+            // Act
+            var match = _constraint.Match(httpContext, route, keyName, values, direction);
+
+            // Assert
+            Assert.True(match);
+        }
+
+        [Theory]
+        [InlineData("area", RouteDirection.IncomingRequest)]
+        [InlineData("controller", RouteDirection.IncomingRequest)]
+        [InlineData("action", RouteDirection.IncomingRequest)]
+        [InlineData("randomKey", RouteDirection.IncomingRequest)]
+        [InlineData("area", RouteDirection.UrlGeneration)]
+        [InlineData("controller", RouteDirection.UrlGeneration)]
+        [InlineData("action", RouteDirection.UrlGeneration)]
+        [InlineData("randomKey", RouteDirection.UrlGeneration)]
+        public void RouteValue_DoesNotExists_MatchFails(string keyName, RouteDirection direction)
+        {
+            // Arrange
+            var actionDescriptor = CreateActionDescriptor(
+                "testArea",
+                "testController",
+                "testAction");
+            actionDescriptor.RouteValues.Add("randomKey", "testRandom");
+            var httpContext = GetHttpContext(actionDescriptor);
+            var route = Mock.Of<IRouter>();
+            var values = new RouteValueDictionary()
+            {
+                { "area", "invalidTestArea" },
+                { "controller", "invalidTestController" },
+                { "action", "invalidTestAction" },
+                { "randomKey", "invalidTestRandom" }
+            };
+
+            // Act
+            var match = _constraint.Match(httpContext, route, keyName, values, direction);
+
+            // Assert
+            Assert.False(match);
+        }
+
+        [Theory]
+        [InlineData(RouteDirection.IncomingRequest)]
+        [InlineData(RouteDirection.UrlGeneration)]
+        public void RouteValue_IsNotAString_MatchFails(RouteDirection direction)
+        {
+            var actionDescriptor = CreateActionDescriptor("testArea",
+                                                          controller: null,
+                                                          action: null);
+            var httpContext = GetHttpContext(actionDescriptor);
+            var route = Mock.Of<IRouter>();
+            var values = new RouteValueDictionary()
+            {
+                { "area", 12 },
+            };
+
+            // Act
+            var match = _constraint.Match(httpContext, route, "area", values, direction);
+
+            // Assert
+            Assert.False(match);
+        }
+
+        [Theory]
+        [InlineData(RouteDirection.IncomingRequest)]
+        [InlineData(RouteDirection.UrlGeneration)]
+        public void ActionDescriptorCollection_SettingNullValue_Throws(RouteDirection direction)
+        {
+            // Arrange
+            var actionDescriptorCollectionProvider = Mock.Of<IActionDescriptorCollectionProvider>();
+            var httpContext = new Mock<HttpContext>();
+            httpContext
+                .Setup(o => o.RequestServices.GetService(typeof(IActionDescriptorCollectionProvider)))
+                .Returns(actionDescriptorCollectionProvider);
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(
+                () => _constraint.Match(
+                    httpContext.Object,
+                    Mock.Of<IRouter>(),
+                    "area",
+                    new RouteValueDictionary { { "area", "area" } },
+                    direction));
+            var providerName = actionDescriptorCollectionProvider.GetType().FullName;
+            Assert.Equal(
+                $"The 'ActionDescriptors' property of '{providerName}' must not be null.",
+                ex.Message);
+        }
+
+        private static HttpContext GetHttpContext(ActionDescriptor actionDescriptor)
+        {
+            var actionProvider = new Mock<IActionDescriptorProvider>(MockBehavior.Strict);
+
+            actionProvider
+                .SetupGet(p => p.Order)
+                .Returns(-1000);
+
+            actionProvider
+                .Setup(p => p.OnProvidersExecuting(It.IsAny<ActionDescriptorProviderContext>()))
+                .Callback<ActionDescriptorProviderContext>(c => c.Results.Add(actionDescriptor));
+
+            actionProvider
+                .Setup(p => p.OnProvidersExecuted(It.IsAny<ActionDescriptorProviderContext>()))
+                .Verifiable();
+
+            var descriptorCollectionProvider = new ActionDescriptorCollectionProvider(
+                new[] { actionProvider.Object },
+                Enumerable.Empty<IActionDescriptorChangeProvider>());
+
+            var context = new Mock<HttpContext>();
+            context.Setup(o => o.RequestServices
+                .GetService(typeof(IActionDescriptorCollectionProvider)))
+                .Returns(descriptorCollectionProvider);
+            return context.Object;
+        }
+
+        private static ActionDescriptor CreateActionDescriptor(string area, string controller, string action)
+        {
+            var actionDescriptor = new ControllerActionDescriptor()
+            {
+                ActionName = string.Format("Area: {0}, Controller: {1}, Action: {2}", area, controller, action),
+            };
+
+            actionDescriptor.RouteValues.Add("area", area);
+            actionDescriptor.RouteValues.Add("controller", controller);
+            actionDescriptor.RouteValues.Add("action", action);
+
+            return actionDescriptor;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/RouteTemplateProviderAttributesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/RouteTemplateProviderAttributesTest.cs
new file mode 100644
index 0000000000..76be45cc8f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/RouteTemplateProviderAttributesTest.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Routing
+{
+    public class RouteTemplateProviderAttributesTest
+    {
+        [Theory]
+        [MemberData(nameof(RouteTemplateProvidersTestData))]
+        public void Order_Defaults_ToNull(IRouteTemplateProvider routeTemplateProvider)
+        {
+            // Act & Assert
+            Assert.Null(routeTemplateProvider.Order);
+        }
+
+        public static TheoryData<IRouteTemplateProvider> RouteTemplateProvidersTestData
+        {
+            get
+            {
+                var data = new TheoryData<IRouteTemplateProvider>();
+                data.Add(new HttpGetAttribute());
+                data.Add(new HttpPostAttribute());
+                data.Add(new HttpPutAttribute());
+                data.Add(new HttpPatchAttribute());
+                data.Add(new HttpDeleteAttribute());
+                data.Add(new HttpHeadAttribute());
+                data.Add(new HttpOptionsAttribute());
+                data.Add(new RouteAttribute(""));
+
+                return data;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperTest.cs
new file mode 100644
index 0000000000..b2754f56d3
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperTest.cs
@@ -0,0 +1,1811 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.ObjectPool;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Routing
+{
+    public class UrlHelperTest
+    {
+        [Theory]
+        [InlineData(null, null, null)]
+        [InlineData("/myapproot", null, null)]
+        [InlineData("", "/Home/About", "/Home/About")]
+        [InlineData("/myapproot", "/test", "/test")]
+        public void Content_ReturnsContentPath_WhenItDoesNotStartWithToken(
+            string appRoot,
+            string contentPath,
+            string expectedPath)
+        {
+            // Arrange
+            var httpContext = CreateHttpContext(CreateServices(), appRoot);
+            var actionContext = CreateActionContext(httpContext);
+            var urlHelper = CreateUrlHelper(actionContext);
+
+            // Act
+            var path = urlHelper.Content(contentPath);
+
+            // Assert
+            Assert.Equal(expectedPath, path);
+        }
+
+        [Theory]
+        [InlineData(null, "~/Home/About", "/Home/About")]
+        [InlineData("/", "~/Home/About", "/Home/About")]
+        [InlineData("/", "~/", "/")]
+        [InlineData("/myapproot", "~/", "/myapproot/")]
+        [InlineData("", "~/Home/About", "/Home/About")]
+        [InlineData("/", "~", "/")]
+        [InlineData("/myapproot", "~/Content/bootstrap.css", "/myapproot/Content/bootstrap.css")]
+        public void Content_ReturnsAppRelativePath_WhenItStartsWithToken(
+            string appRoot,
+            string contentPath,
+            string expectedPath)
+        {
+            // Arrange
+            var httpContext = CreateHttpContext(CreateServices(), appRoot);
+            var actionContext = CreateActionContext(httpContext);
+            var urlHelper = CreateUrlHelper(actionContext);
+
+            // Act
+            var path = urlHelper.Content(contentPath);
+
+            // Assert
+            Assert.Equal(expectedPath, path);
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        [InlineData(" ")]
+        public void IsLocalUrl_ReturnsFalseOnEmpty(string url)
+        {
+            // Arrange
+            var helper = CreateUrlHelper();
+
+            // Act
+            var result = helper.IsLocalUrl(url);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData("/foo.html")]
+        [InlineData("/www.example.com")]
+        [InlineData("/")]
+        public void IsLocalUrl_AcceptsRootedUrls(string url)
+        {
+            // Arrange
+            var helper = CreateUrlHelper();
+
+            // Act
+            var result = helper.IsLocalUrl(url);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData("~/")]
+        [InlineData("~/foo.html")]
+        public void IsLocalUrl_AcceptsApplicationRelativeUrls(string url)
+        {
+            // Arrange
+            var helper = CreateUrlHelper();
+
+            // Act
+            var result = helper.IsLocalUrl(url);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData("foo.html")]
+        [InlineData("../foo.html")]
+        [InlineData("fold/foo.html")]
+        public void IsLocalUrl_RejectsRelativeUrls(string url)
+        {
+            // Arrange
+            var helper = CreateUrlHelper();
+
+            // Act
+            var result = helper.IsLocalUrl(url);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData("http:/foo.html")]
+        [InlineData("hTtP:foo.html")]
+        [InlineData("http:/www.example.com")]
+        [InlineData("HtTpS:/www.example.com")]
+        public void IsLocalUrl_RejectValidButUnsafeRelativeUrls(string url)
+        {
+            // Arrange
+            var helper = CreateUrlHelper();
+
+            // Act
+            var result = helper.IsLocalUrl(url);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData("http://www.mysite.com/appDir/foo.html")]
+        [InlineData("http://WWW.MYSITE.COM")]
+        public void IsLocalUrl_RejectsUrlsOnTheSameHost(string url)
+        {
+            // Arrange
+            var helper = CreateUrlHelper("www.mysite.com");
+
+            // Act
+            var result = helper.IsLocalUrl(url);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData("http://localhost/foobar.html")]
+        [InlineData("http://127.0.0.1/foobar.html")]
+        public void IsLocalUrl_RejectsUrlsOnLocalHost(string url)
+        {
+            // Arrange
+            var helper = CreateUrlHelper("www.mysite.com");
+
+            // Act
+            var result = helper.IsLocalUrl(url);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData("https://www.mysite.com/")]
+        public void IsLocalUrl_RejectsUrlsOnTheSameHostButDifferentScheme(string url)
+        {
+            // Arrange
+            var helper = CreateUrlHelper("www.mysite.com");
+
+            // Act
+            var result = helper.IsLocalUrl(url);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData("http://www.example.com")]
+        [InlineData("https://www.example.com")]
+        [InlineData("hTtP://www.example.com")]
+        [InlineData("HtTpS://www.example.com")]
+        public void IsLocalUrl_RejectsUrlsOnDifferentHost(string url)
+        {
+            // Arrange
+            var helper = CreateUrlHelper("www.mysite.com");
+
+            // Act
+            var result = helper.IsLocalUrl(url);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData("http://///www.example.com/foo.html")]
+        [InlineData("https://///www.example.com/foo.html")]
+        [InlineData("HtTpS://///www.example.com/foo.html")]
+        [InlineData("http:///www.example.com/foo.html")]
+        [InlineData("http:////www.example.com/foo.html")]
+        public void IsLocalUrl_RejectsUrlsWithTooManySchemeSeparatorCharacters(string url)
+        {
+            // Arrange
+            var helper = CreateUrlHelper("www.mysite.com");
+
+            // Act
+            var result = helper.IsLocalUrl(url);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData("//www.example.com")]
+        [InlineData("//www.example.com?")]
+        [InlineData("//www.example.com:80")]
+        [InlineData("//www.example.com/foobar.html")]
+        [InlineData("///www.example.com")]
+        [InlineData("//////www.example.com")]
+        public void IsLocalUrl_RejectsUrlsWithMissingSchemeName(string url)
+        {
+            // Arrange
+            var helper = CreateUrlHelper("www.mysite.com");
+
+            // Act
+            var result = helper.IsLocalUrl(url);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData("http:\\\\www.example.com")]
+        [InlineData("http:\\\\www.example.com\\")]
+        [InlineData("/\\")]
+        [InlineData("/\\foo")]
+        public void IsLocalUrl_RejectsInvalidUrls(string url)
+        {
+            // Arrange
+            var helper = CreateUrlHelper("www.mysite.com");
+
+            // Act
+            var result = helper.IsLocalUrl(url);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData("~//www.example.com")]
+        [InlineData("~//www.example.com?")]
+        [InlineData("~//www.example.com:80")]
+        [InlineData("~//www.example.com/foobar.html")]
+        [InlineData("~///www.example.com")]
+        [InlineData("~//////www.example.com")]
+        public void IsLocalUrl_RejectsTokenUrlsWithMissingSchemeName(string url)
+        {
+            // Arrange
+            var helper = CreateUrlHelper("www.mysite.com");
+
+            // Act
+            var result = helper.IsLocalUrl(url);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Theory]
+        [InlineData("~/\\")]
+        [InlineData("~/\\foo")]
+        public void IsLocalUrl_RejectsInvalidTokenUrls(string url)
+        {
+            // Arrange
+            var helper = CreateUrlHelper("www.mysite.com");
+
+            // Act
+            var result = helper.IsLocalUrl(url);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void RouteUrlWithDictionary()
+        {
+            // Arrange
+            var services = CreateServices();
+            var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
+
+            // Act
+            var url = urlHelper.RouteUrl(
+                values: new RouteValueDictionary(
+                new
+                {
+                    Action = "newaction",
+                    Controller = "home2",
+                    id = "someid"
+                }));
+
+            // Assert
+            Assert.Equal("/app/home2/newaction/someid", url);
+        }
+
+        [Fact]
+        public void RouteUrlWithEmptyHostName()
+        {
+            // Arrange
+            var services = CreateServices();
+            var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
+
+            // Act
+            var url = urlHelper.RouteUrl(
+                routeName: "namedroute",
+                values: new RouteValueDictionary(
+                new
+                {
+                    Action = "newaction",
+                    Controller = "home2",
+                    id = "someid"
+                }),
+                protocol: "http",
+                host: string.Empty);
+
+            // Assert
+            Assert.Equal("http://localhost/app/named/home2/newaction/someid", url);
+        }
+
+        [Fact]
+        public void RouteUrlWithEmptyProtocol()
+        {
+            // Arrange
+            var services = CreateServices();
+            var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
+
+            // Act
+            var url = urlHelper.RouteUrl(
+                routeName: "namedroute",
+                values: new RouteValueDictionary(
+                new
+                {
+                    Action = "newaction",
+                    Controller = "home2",
+                    id = "someid"
+                }),
+                protocol: string.Empty,
+                host: "foo.bar.com");
+
+            // Assert
+            Assert.Equal("http://foo.bar.com/app/named/home2/newaction/someid", url);
+        }
+
+        [Fact]
+        public void RouteUrlWithNullProtocol()
+        {
+            // Arrange
+            var services = CreateServices();
+            var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
+
+            // Act
+            var url = urlHelper.RouteUrl(
+                routeName: "namedroute",
+                values: new RouteValueDictionary(
+                new
+                {
+                    Action = "newaction",
+                    Controller = "home2",
+                    id = "someid"
+                }),
+                protocol: null,
+                host: "foo.bar.com");
+
+            // Assert
+            Assert.Equal("http://foo.bar.com/app/named/home2/newaction/someid", url);
+        }
+
+        [Fact]
+        public void RouteUrlWithNullProtocolAndNullHostName()
+        {
+            // Arrange
+            var services = CreateServices();
+            var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
+
+            // Act
+            var url = urlHelper.RouteUrl(
+                routeName: "namedroute",
+                values: new RouteValueDictionary(
+                new
+                {
+                    Action = "newaction",
+                    Controller = "home2",
+                    id = "someid"
+                }),
+                protocol: null,
+                host: null);
+
+            // Assert
+            Assert.Equal("/app/named/home2/newaction/someid", url);
+        }
+
+        [Fact]
+        public void RouteUrlWithObjectProperties()
+        {
+            // Arrange
+            var services = CreateServices();
+            var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
+
+            // Act
+            var url = urlHelper.RouteUrl(new { Action = "newaction", Controller = "home2", id = "someid" });
+
+            // Assert
+            Assert.Equal("/app/home2/newaction/someid", url);
+        }
+
+        [Fact]
+        public void RouteUrlWithProtocol()
+        {
+            // Arrange
+            var services = CreateServices();
+            var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
+
+            // Act
+            var url = urlHelper.RouteUrl(
+                routeName: "namedroute",
+                values: new
+                {
+                    Action = "newaction",
+                    Controller = "home2",
+                    id = "someid"
+                },
+                protocol: "https");
+
+            // Assert
+            Assert.Equal("https://localhost/app/named/home2/newaction/someid", url);
+        }
+
+        [Fact]
+        public void RouteUrl_WithUnicodeHost_DoesNotPunyEncodeTheHost()
+        {
+            // Arrange
+            var services = CreateServices();
+            var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
+
+            // Act
+            var url = urlHelper.RouteUrl(
+                routeName: "namedroute",
+                values: new
+                {
+                    Action = "newaction",
+                    Controller = "home2",
+                    id = "someid"
+                },
+                protocol: "https",
+                host: "pingüino");
+
+            // Assert
+            Assert.Equal("https://pingüino/app/named/home2/newaction/someid", url);
+        }
+
+        [Fact]
+        public void RouteUrlWithRouteNameAndDefaults()
+        {
+            // Arrange
+            var services = CreateServices();
+            var routeCollection = GetRouter(services, "MyRouteName", "any/url");
+            var urlHelper = CreateUrlHelper("/app", routeCollection);
+
+            // Act
+            var url = urlHelper.RouteUrl("MyRouteName");
+
+            // Assert
+            Assert.Equal("/app/any/url", url);
+        }
+
+        [Fact]
+        public void RouteUrlWithRouteNameAndDictionary()
+        {
+            // Arrange
+            var services = CreateServices();
+            var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
+
+            // Act
+            var url = urlHelper.RouteUrl(
+                routeName: "namedroute",
+                values: new RouteValueDictionary(
+                new
+                {
+                    Action = "newaction",
+                    Controller = "home2",
+                    id = "someid"
+                }));
+
+            // Assert
+            Assert.Equal("/app/named/home2/newaction/someid", url);
+        }
+
+        [Fact]
+        public void RouteUrlWithRouteNameAndObjectProperties()
+        {
+            // Arrange
+            var services = CreateServices();
+            var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
+
+            // Act
+            var url = urlHelper.RouteUrl(
+                routeName: "namedroute",
+                values: new
+                {
+                    Action = "newaction",
+                    Controller = "home2",
+                    id = "someid"
+                });
+
+            // Assert
+            Assert.Equal("/app/named/home2/newaction/someid", url);
+        }
+
+        [Fact]
+        public void RouteUrlWithUrlRouteContext_ReturnsExpectedResult()
+        {
+            // Arrange
+            var services = CreateServices();
+            var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
+
+            var routeContext = new UrlRouteContext()
+            {
+                RouteName = "namedroute",
+                Values = new
+                {
+                    Action = "newaction",
+                    Controller = "home2",
+                    id = "someid"
+                },
+                Fragment = "somefragment",
+                Host = "remotetown",
+                Protocol = "ftp"
+            };
+
+            // Act
+            var url = urlHelper.RouteUrl(routeContext);
+
+            // Assert
+            Assert.Equal("ftp://remotetown/app/named/home2/newaction/someid#somefragment", url);
+        }
+
+        [Fact]
+        public void RouteUrlWithAllParameters_ReturnsExpectedResult()
+        {
+            // Arrange
+            var services = CreateServices();
+            var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
+
+            // Act
+            var url = urlHelper.RouteUrl(
+                routeName: "namedroute",
+                values: new
+                {
+                    Action = "newaction",
+                    Controller = "home2",
+                    id = "someid"
+                },
+                fragment: "somefragment",
+                host: "remotetown",
+                protocol: "https");
+
+            // Assert
+            Assert.Equal("https://remotetown/app/named/home2/newaction/someid#somefragment", url);
+        }
+
+        [Fact]
+        public void UrlAction_RouteValuesAsDictionary_CaseSensitive()
+        {
+            // Arrange
+            var services = CreateServices();
+            var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
+
+            // We're using a dictionary with a case-sensitive comparer and loading it with data
+            // using casings differently from the route. This should still successfully generate a link.
+            var dictionary = new Dictionary<string, object>();
+            var id = "suppliedid";
+            var isprint = "true";
+            dictionary["ID"] = id;
+            dictionary["isprint"] = isprint;
+
+            // Act
+            var url = urlHelper.Action(
+                action: "contact",
+                controller: "home",
+                values: dictionary);
+
+            // Assert
+            Assert.Equal(2, dictionary.Count);
+            Assert.Same(id, dictionary["ID"]);
+            Assert.Same(isprint, dictionary["isprint"]);
+            Assert.Equal("/app/home/contact/suppliedid?isprint=true", url);
+        }
+
+        [Fact]
+        public void UrlAction_WithUnicodeHost_DoesNotPunyEncodeTheHost()
+        {
+            // Arrange
+            var services = CreateServices();
+            var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
+
+            // Act
+            var url = urlHelper.Action(
+                action: "contact",
+                controller: "home",
+                values: null,
+                protocol: "http",
+                host: "pingüino");
+
+            // Assert
+            Assert.Equal("http://pingüino/app/home/contact", url);
+        }
+
+        [Fact]
+        public void UrlRouteUrl_RouteValuesAsDictionary_CaseSensitive()
+        {
+            // Arrange
+            var services = CreateServices();
+            var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
+
+            // We're using a dictionary with a case-sensitive comparer and loading it with data
+            // using casings differently from the route. This should still successfully generate a link.
+            var dict = new Dictionary<string, object>();
+            var action = "contact";
+            var controller = "home";
+            var id = "suppliedid";
+
+            dict["ACTION"] = action;
+            dict["Controller"] = controller;
+            dict["ID"] = id;
+
+            // Act
+            var url = urlHelper.RouteUrl(routeName: "namedroute", values: dict);
+
+            // Assert
+            Assert.Equal(3, dict.Count);
+            Assert.Same(action, dict["ACTION"]);
+            Assert.Same(controller, dict["Controller"]);
+            Assert.Same(id, dict["ID"]);
+            Assert.Equal("/app/named/home/contact/suppliedid", url);
+        }
+
+        [Fact]
+        public void UrlActionWithUrlActionContext_ReturnsExpectedResult()
+        {
+            // Arrange
+            var services = CreateServices();
+            var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
+
+            var actionContext = new UrlActionContext()
+            {
+                Action = "contact",
+                Controller = "home3",
+                Values = new { id = "idone" },
+                Protocol = "ftp",
+                Host = "remotelyhost",
+                Fragment = "somefragment"
+            };
+
+            // Act
+            var url = urlHelper.Action(actionContext);
+
+            // Assert
+            Assert.Equal("ftp://remotelyhost/app/home3/contact/idone#somefragment", url);
+        }
+
+        [Fact]
+        public void UrlActionWithAllParameters_ReturnsExpectedResult()
+        {
+            // Arrange
+            var services = CreateServices();
+            var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
+
+            // Act
+            var url = urlHelper.Action(
+                controller: "home3",
+                action: "contact",
+                values: null,
+                protocol: "https",
+                host: "remotelyhost",
+                fragment: "somefragment");
+
+            // Assert
+            Assert.Equal("https://remotelyhost/app/home3/contact#somefragment", url);
+        }
+
+        [Fact]
+        public void LinkWithAllParameters_ReturnsExpectedResult()
+        {
+            // Arrange
+            var services = CreateServices();
+            var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
+
+            // Act
+            var url = urlHelper.Link(
+                "namedroute",
+                new
+                {
+                    Action = "newaction",
+                    Controller = "home",
+                    id = "someid"
+                });
+
+            // Assert
+            Assert.Equal("http://localhost/app/named/home/newaction/someid", url);
+        }
+
+        [Fact]
+        public void LinkWithNullRouteName_ReturnsExpectedResult()
+        {
+            // Arrange
+            var services = CreateServices();
+            var urlHelper = CreateUrlHelperWithRouteCollection(services, "/app");
+
+            // Act
+            var url = urlHelper.Link(
+                null,
+                new
+                {
+                    Action = "newaction",
+                    Controller = "home",
+                    id = "someid"
+                });
+
+            // Assert
+            Assert.Equal("http://localhost/app/home/newaction/someid", url);
+        }
+
+        [Fact]
+        public void LinkWithDefaultsAndNullRouteValues_ReturnsExpectedResult()
+        {
+            // Arrange
+            var services = CreateServices();
+            var routeCollection = GetRouter(services, "MyRouteName", "any/url");
+            var urlHelper = CreateUrlHelper("/app", routeCollection);
+
+            // Act
+            var url = urlHelper.Link("MyRouteName", null);
+
+            // Assert
+            Assert.Equal("http://localhost/app/any/url", url);
+        }
+
+        [Fact]
+        public void LinkWithCustomHostAndProtocol_ReturnsExpectedResult()
+        {
+            // Arrange
+            var services = CreateServices();
+            var routeCollection = GetRouter(services, "MyRouteName", "any/url");
+            var urlHelper = CreateUrlHelper("myhost", "https", routeCollection);
+
+            // Act
+            var url = urlHelper.Link(
+                "namedroute",
+                new
+                {
+                    Action = "newaction",
+                    Controller = "home",
+                    id = "someid"
+                });
+
+            // Assert
+            Assert.Equal("https://myhost/named/home/newaction/someid", url);
+        }
+
+        // Regression test for aspnet/Mvc#2859
+        [Fact]
+        public void Action_RouteValueInvalidation_DoesNotAffectActionAndController()
+        {
+            // Arrange
+            var services = CreateServices();
+            var routeBuilder = CreateRouteBuilder(services);
+
+            routeBuilder.MapRoute(
+                "default",
+                "{first}/{controller}/{action}",
+                new { second = "default", controller = "default", action = "default" });
+
+            var actionContext = new ActionContext()
+            {
+                HttpContext = new DefaultHttpContext()
+                {
+                    RequestServices = services,
+                },
+            };
+
+            actionContext.RouteData = new RouteData();
+            actionContext.RouteData.Values.Add("first", "a");
+            actionContext.RouteData.Values.Add("controller", "Store");
+            actionContext.RouteData.Values.Add("action", "Buy");
+            actionContext.RouteData.Routers.Add(routeBuilder.Build());
+
+            var urlHelper = CreateUrlHelper(actionContext);
+
+            // Act
+            //
+            // In this test the 'first' route value has changed, meaning that *normally* the
+            // 'controller' value could not be used. However 'controller' and 'action' are treated
+            // specially by UrlHelper.
+            var url = urlHelper.Action("Checkout", new { first = "b" });
+
+            // Assert
+            Assert.NotNull(url);
+            Assert.Equal("/b/Store/Checkout", url);
+        }
+
+        // Regression test for aspnet/Mvc#2859
+        [Fact]
+        public void Action_RouteValueInvalidation_AffectsOtherRouteValues()
+        {
+            // Arrange
+            var services = CreateServices();
+            var routeBuilder = CreateRouteBuilder(services);
+
+            routeBuilder.MapRoute(
+                "default",
+                "{first}/{second}/{controller}/{action}",
+                new { second = "default", controller = "default", action = "default" });
+
+            var actionContext = new ActionContext()
+            {
+                HttpContext = new DefaultHttpContext()
+                {
+                    RequestServices = services,
+                },
+            };
+
+            actionContext.RouteData = new RouteData();
+            actionContext.RouteData.Values.Add("first", "a");
+            actionContext.RouteData.Values.Add("second", "x");
+            actionContext.RouteData.Values.Add("controller", "Store");
+            actionContext.RouteData.Values.Add("action", "Buy");
+            actionContext.RouteData.Routers.Add(routeBuilder.Build());
+
+            var urlHelper = CreateUrlHelper(actionContext);
+
+            // Act
+            //
+            // In this test the 'first' route value has changed, meaning that *normally* the
+            // 'controller' value could not be used. However 'controller' and 'action' are treated
+            // specially by UrlHelper.
+            //
+            // 'second' gets no special treatment, and picks up its default value instead.
+            var url = urlHelper.Action("Checkout", new { first = "b" });
+
+            // Assert
+            Assert.NotNull(url);
+            Assert.Equal("/b/default/Store/Checkout", url);
+        }
+
+        // Regression test for aspnet/Mvc#2859
+        [Fact]
+        public void Action_RouteValueInvalidation_DoesNotAffectActionAndController_ActionPassedInRouteValues()
+        {
+            // Arrange
+            var services = CreateServices();
+            var routeBuilder = CreateRouteBuilder(services);
+
+            routeBuilder.MapRoute(
+                "default",
+                "{first}/{controller}/{action}",
+                new { second = "default", controller = "default", action = "default" });
+
+            var actionContext = new ActionContext()
+            {
+                HttpContext = new DefaultHttpContext()
+                {
+                    RequestServices = services,
+                },
+            };
+
+            actionContext.RouteData = new RouteData();
+            actionContext.RouteData.Values.Add("first", "a");
+            actionContext.RouteData.Values.Add("controller", "Store");
+            actionContext.RouteData.Values.Add("action", "Buy");
+            actionContext.RouteData.Routers.Add(routeBuilder.Build());
+
+            var urlHelper = CreateUrlHelper(actionContext);
+
+            // Act
+            //
+            // In this test the 'first' route value has changed, meaning that *normally* the
+            // 'controller' value could not be used. However 'controller' and 'action' are treated
+            // specially by UrlHelper.
+            var url = urlHelper.Action(action: null, values: new { first = "b", action = "Checkout" });
+
+            // Assert
+            Assert.NotNull(url);
+            Assert.Equal("/b/Store/Checkout", url);
+        }
+
+        public static TheoryData GeneratePathFromRoute_HandlesLeadingAndTrailingSlashesData =>
+            new TheoryData<string, string, string>
+            {
+                {  null, "", "/" },
+                {  null, "/", "/"  },
+                {  null, "Hello", "/Hello" },
+                {  null, "/Hello", "/Hello" },
+                { "/", "", "/" },
+                { "/", "hello", "/hello" },
+                { "/", "/hello", "/hello" },
+                { "/hello", "", "/hello" },
+                { "/hello/", "", "/hello/" },
+                { "/hello", "/", "/hello/" },
+                { "/hello/", "world", "/hello/world" },
+                { "/hello/", "/world", "/hello/world" },
+                { "/hello/", "/world 123", "/hello/world 123" },
+                { "/hello/", "/world%20123", "/hello/world%20123" },
+            };
+
+        [Theory]
+        [MemberData(nameof(GeneratePathFromRoute_HandlesLeadingAndTrailingSlashesData))]
+        public void AppendPathAndFragment_HandlesLeadingAndTrailingSlashes(
+            string appBase,
+            string virtualPath,
+            string expected)
+        {
+            // Arrange
+            var router = Mock.Of<IRouter>();
+            var pathData = new VirtualPathData(router, virtualPath)
+            {
+                VirtualPath = virtualPath
+            };
+            var urlHelper = CreateUrlHelper(appBase, router);
+            var builder = new StringBuilder();
+
+            // Act
+            urlHelper.AppendPathAndFragment(builder, pathData, string.Empty);
+
+            // Assert
+            Assert.Equal(expected, builder.ToString());
+        }
+
+        [Theory]
+        [MemberData(nameof(GeneratePathFromRoute_HandlesLeadingAndTrailingSlashesData))]
+        public void AppendPathAndFragment_AppendsFragments(
+            string appBase,
+            string virtualPath,
+            string expected)
+        {
+            // Arrange
+            var fragmentValue = "fragment-value";
+            expected += $"#{fragmentValue}";
+            var router = Mock.Of<IRouter>();
+            var pathData = new VirtualPathData(router, virtualPath)
+            {
+                VirtualPath = virtualPath
+            };
+            var urlHelper = CreateUrlHelper(appBase, router);
+            var builder = new StringBuilder();
+
+            // Act
+            urlHelper.AppendPathAndFragment(builder, pathData, fragmentValue);
+
+            // Assert
+            Assert.Equal(expected, builder.ToString());
+        }
+
+        [Theory]
+        [InlineData(null, null, null, "/", null, "/")]
+        [InlineData(null, null, null, "/Hello", null, "/Hello")]
+        [InlineData(null, null, null, "Hello", null, "/Hello")]
+        [InlineData("/", null, null, "", null, "/")]
+        [InlineData("/hello/", null, null, "/world", null, "/hello/world")]
+        [InlineData("/hello/", "https", "myhost", "/world", "fragment-value", "https://myhost/hello/world#fragment-value")]
+        public void GenerateUrl_FastAndSlowPathsReturnsExpected(
+            string appBase,
+            string protocol,
+            string host,
+            string virtualPath,
+            string fragment,
+            string expected)
+        {
+            // Arrange
+            var router = Mock.Of<IRouter>();
+            var pathData = new VirtualPathData(router, virtualPath)
+            {
+                VirtualPath = virtualPath
+            };
+            var urlHelper = CreateUrlHelper(appBase, router);
+
+            // Act
+            var url = urlHelper.GenerateUrl(protocol, host, pathData, fragment);
+
+            // Assert
+            Assert.Equal(expected, url);
+        }
+
+        [Fact]
+        public void GetUrlHelper_ReturnsSameInstance_IfAlreadyPresent()
+        {
+            // Arrange
+            var expectedUrlHelper = CreateUrlHelper();
+            var httpContext = new Mock<HttpContext>();
+            var mockItems = new Dictionary<object, object>
+            {
+                { typeof(IUrlHelper), expectedUrlHelper }
+            };
+            httpContext.Setup(h => h.Items).Returns(mockItems);
+
+            var actionContext = CreateActionContext(httpContext.Object, Mock.Of<IRouter>());
+            var urlHelperFactory = new UrlHelperFactory();
+
+            // Act
+            var urlHelper = urlHelperFactory.GetUrlHelper(actionContext);
+
+            // Assert
+            Assert.Same(expectedUrlHelper, urlHelper);
+        }
+
+        [Fact]
+        public void GetUrlHelper_CreatesNewInstance_IfNotAlreadyPresent()
+        {
+            // Arrange
+            var httpContext = new Mock<HttpContext>();
+            httpContext.Setup(h => h.Items).Returns(new Dictionary<object, object>());
+
+            var actionContext = CreateActionContext(httpContext.Object, Mock.Of<IRouter>());
+            var urlHelperFactory = new UrlHelperFactory();
+
+            // Act
+            var urlHelper = urlHelperFactory.GetUrlHelper(actionContext);
+
+            // Assert
+            Assert.NotNull(urlHelper);
+            Assert.Same(urlHelper, actionContext.HttpContext.Items[typeof(IUrlHelper)] as IUrlHelper);
+        }
+
+        [Fact]
+        public void GetUrlHelper_CreatesNewInstance_IfExpectedTypeIsNotPresent()
+        {
+            // Arrange
+            var httpContext = new Mock<HttpContext>();
+            var mockItems = new Dictionary<object, object>
+            {
+                { typeof(IUrlHelper), null }
+            };
+            httpContext.Setup(h => h.Items).Returns(mockItems);
+
+            var actionContext = CreateActionContext(httpContext.Object, Mock.Of<IRouter>());
+            var urlHelperFactory = new UrlHelperFactory();
+
+            // Act
+            var urlHelper = urlHelperFactory.GetUrlHelper(actionContext);
+
+            // Assert
+            Assert.NotNull(urlHelper);
+            Assert.Same(urlHelper, actionContext.HttpContext.Items[typeof(IUrlHelper)] as IUrlHelper);
+        }
+
+        [Fact]
+        public void Page_WithName_Works()
+        {
+            // Arrange
+            UrlRouteContext actual = null;
+            var routeData = new RouteData
+            {
+                Values =
+                {
+                    { "page", "ambient-page" },
+                }
+            };
+            var actionContext = new ActionContext
+            {
+                RouteData = routeData,
+            };
+            var urlHelper = CreateMockUrlHelper(actionContext);
+            urlHelper.Setup(h => h.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Callback((UrlRouteContext context) => actual = context);
+
+            // Act
+            urlHelper.Object.Page("/TestPage");
+
+            // Assert
+            urlHelper.Verify();
+            Assert.NotNull(actual);
+            Assert.Null(actual.RouteName);
+            Assert.Collection(Assert.IsType<RouteValueDictionary>(actual.Values),
+                value =>
+                {
+                    Assert.Equal("page", value.Key);
+                    Assert.Equal("/TestPage", value.Value);
+                });
+            Assert.Null(actual.Host);
+            Assert.Null(actual.Protocol);
+            Assert.Null(actual.Fragment);
+        }
+
+        public static TheoryData Page_WithNameAndRouteValues_WorksData
+        {
+            get => new TheoryData<object>
+            {
+                { new { id = 10 } },
+                {
+                    new Dictionary<string, object>
+                    {
+                        ["id"] = 10,
+                    }
+                },
+                {
+                    new RouteValueDictionary
+                    {
+                        ["id"] = 10,
+                    }
+                },
+            };
+        }
+
+        [Theory]
+        [MemberData(nameof(Page_WithNameAndRouteValues_WorksData))]
+        public void Page_WithNameAndRouteValues_Works(object values)
+        {
+            // Arrange
+            UrlRouteContext actual = null;
+            var urlHelper = CreateMockUrlHelper();
+            urlHelper.Setup(h => h.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Callback((UrlRouteContext context) => actual = context);
+
+            // Act
+            urlHelper.Object.Page("/TestPage", values);
+
+            // Assert
+            urlHelper.Verify();
+            Assert.NotNull(actual);
+            Assert.Null(actual.RouteName);
+            Assert.Collection(Assert.IsType<RouteValueDictionary>(actual.Values),
+                value =>
+                {
+                    Assert.Equal("id", value.Key);
+                    Assert.Equal(10, value.Value);
+                },
+                value =>
+                {
+                    Assert.Equal("page", value.Key);
+                    Assert.Equal("/TestPage", value.Value);
+                });
+            Assert.Null(actual.Host);
+            Assert.Null(actual.Protocol);
+            Assert.Null(actual.Fragment);
+        }
+
+        [Fact]
+        public void Page_WithNameRouteValuesAndProtocol_Works()
+        {
+            // Arrange
+            UrlRouteContext actual = null;
+            var urlHelper = CreateMockUrlHelper();
+            urlHelper.Setup(h => h.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Callback((UrlRouteContext context) => actual = context);
+
+            // Act
+            urlHelper.Object.Page("/TestPage", pageHandler: null, values: new { id = 13 }, protocol: "https");
+
+            // Assert
+            urlHelper.Verify();
+            Assert.NotNull(actual);
+            Assert.Null(actual.RouteName);
+            Assert.Collection(Assert.IsType<RouteValueDictionary>(actual.Values),
+                value =>
+                {
+                    Assert.Equal("id", value.Key);
+                    Assert.Equal(13, value.Value);
+                },
+                value =>
+                {
+                    Assert.Equal("page", value.Key);
+                    Assert.Equal("/TestPage", value.Value);
+                });
+            Assert.Equal("https", actual.Protocol);
+            Assert.Null(actual.Host);
+            Assert.Null(actual.Fragment);
+        }
+
+        [Fact]
+        public void Page_WithNameRouteValuesProtocolAndHost_Works()
+        {
+            // Arrange
+            UrlRouteContext actual = null;
+            var urlHelper = CreateMockUrlHelper();
+            urlHelper.Setup(h => h.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Callback((UrlRouteContext context) => actual = context);
+
+            // Act
+            urlHelper.Object.Page("/TestPage", pageHandler: null, values: new { id = 13 }, protocol: "https", host: "mytesthost");
+
+            // Assert
+            urlHelper.Verify();
+            Assert.NotNull(actual);
+            Assert.Null(actual.RouteName);
+            Assert.Collection(Assert.IsType<RouteValueDictionary>(actual.Values),
+                value =>
+                {
+                    Assert.Equal("id", value.Key);
+                    Assert.Equal(13, value.Value);
+                },
+                value =>
+                {
+                    Assert.Equal("page", value.Key);
+                    Assert.Equal("/TestPage", value.Value);
+                });
+            Assert.Equal("https", actual.Protocol);
+            Assert.Equal("mytesthost", actual.Host);
+            Assert.Null(actual.Fragment);
+        }
+
+        [Fact]
+        public void Page_WithNameRouteValuesProtocolHostAndFragment_Works()
+        {
+            // Arrange
+            UrlRouteContext actual = null;
+            var urlHelper = CreateMockUrlHelper();
+            urlHelper.Setup(h => h.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Callback((UrlRouteContext context) => actual = context);
+
+            // Act
+            urlHelper.Object.Page("/TestPage", "test-handler", new { id = 13 }, "https", "mytesthost", "#toc");
+
+            // Assert
+            urlHelper.Verify();
+            Assert.NotNull(actual);
+            Assert.Null(actual.RouteName);
+            Assert.Collection(Assert.IsType<RouteValueDictionary>(actual.Values),
+                value =>
+                {
+                    Assert.Equal("id", value.Key);
+                    Assert.Equal(13, value.Value);
+                },
+                value =>
+                {
+                    Assert.Equal("page", value.Key);
+                    Assert.Equal("/TestPage", value.Value);
+                },
+                value =>
+                {
+                    Assert.Equal("handler", value.Key);
+                    Assert.Equal("test-handler", value.Value);
+                });
+            Assert.Equal("https", actual.Protocol);
+            Assert.Equal("mytesthost", actual.Host);
+            Assert.Equal("#toc", actual.Fragment);
+        }
+
+        [Fact]
+        public void Page_UsesAmbientRouteValue_WhenPageIsNull()
+        {
+            // Arrange
+            UrlRouteContext actual = null;
+            var routeData = new RouteData
+            {
+                Values =
+                {
+                    { "page", "ambient-page" },
+                }
+            };
+            var actionContext = new ActionContext
+            {
+                RouteData = routeData,
+            };
+
+            var urlHelper = CreateMockUrlHelper(actionContext);
+            urlHelper.Setup(h => h.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Callback((UrlRouteContext context) => actual = context);
+
+            // Act
+            string page = null;
+            urlHelper.Object.Page(page, new { id = 13 });
+
+            // Assert
+            urlHelper.Verify();
+            Assert.NotNull(actual);
+            Assert.Null(actual.RouteName);
+            Assert.Collection(Assert.IsType<RouteValueDictionary>(actual.Values),
+                value =>
+                {
+                    Assert.Equal("id", value.Key);
+                    Assert.Equal(13, value.Value);
+                },
+                value =>
+                {
+                    Assert.Equal("page", value.Key);
+                    Assert.Equal("ambient-page", value.Value);
+                });
+        }
+
+        [Fact]
+        public void Page_SetsHandlerToNull_IfValueIsNotSpecifiedInRouteValues()
+        {
+            // Arrange
+            UrlRouteContext actual = null;
+            var routeData = new RouteData
+            {
+                Values =
+                {
+                    { "page", "ambient-page" },
+                    { "handler", "ambient-handler" },
+                }
+            };
+            var actionContext = new ActionContext
+            {
+                RouteData = routeData,
+            };
+
+            var urlHelper = CreateMockUrlHelper(actionContext);
+            urlHelper.Setup(h => h.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Callback((UrlRouteContext context) => actual = context);
+
+            // Act
+            string page = null;
+            urlHelper.Object.Page(page, new { id = 13 });
+
+            // Assert
+            urlHelper.Verify();
+            Assert.NotNull(actual);
+            Assert.Null(actual.RouteName);
+            Assert.Collection(Assert.IsType<RouteValueDictionary>(actual.Values),
+                value =>
+                {
+                    Assert.Equal("id", value.Key);
+                    Assert.Equal(13, value.Value);
+                },
+                value =>
+                {
+                    Assert.Equal("page", value.Key);
+                    Assert.Equal("ambient-page", value.Value);
+                },
+                value =>
+                {
+                    Assert.Equal("handler", value.Key);
+                    Assert.Null(value.Value);
+                });
+        }
+
+        [Fact]
+        public void Page_UsesExplicitlySpecifiedHandlerValue()
+        {
+            // Arrange
+            UrlRouteContext actual = null;
+            var routeData = new RouteData
+            {
+                Values =
+                {
+                    { "page", "ambient-page" },
+                    { "handler", "ambient-handler" },
+                }
+            };
+            var actionContext = new ActionContext
+            {
+                RouteData = routeData,
+            };
+
+            var urlHelper = CreateMockUrlHelper(actionContext);
+            urlHelper.Setup(h => h.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Callback((UrlRouteContext context) => actual = context);
+
+            // Act
+            string page = null;
+            urlHelper.Object.Page(page, "exact-handler", new { handler = "route-value-handler" });
+
+            // Assert
+            urlHelper.Verify();
+            Assert.NotNull(actual);
+            Assert.Null(actual.RouteName);
+            Assert.Collection(Assert.IsType<RouteValueDictionary>(actual.Values),
+                value =>
+                {
+                    Assert.Equal("handler", value.Key);
+                    Assert.Equal("exact-handler", value.Value);
+                },
+                value =>
+                {
+                    Assert.Equal("page", value.Key);
+                    Assert.Equal("ambient-page", value.Value);
+                });
+        }
+
+        [Fact]
+        public void Page_UsesValueFromRouteValueIfPageHandlerIsNotExplicitySpecified()
+        {
+            // Arrange
+            UrlRouteContext actual = null;
+            var routeData = new RouteData
+            {
+                Values =
+                {
+                    { "page", "ambient-page" },
+                    { "handler", "ambient-handler" },
+                }
+            };
+            var actionContext = new ActionContext
+            {
+                RouteData = routeData,
+            };
+
+            var urlHelper = CreateMockUrlHelper(actionContext);
+            urlHelper.Setup(h => h.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Callback((UrlRouteContext context) => actual = context);
+
+            // Act
+            string page = null;
+            urlHelper.Object.Page(page, pageHandler: null, values: new { handler = "route-value-handler" });
+
+            // Assert
+            urlHelper.Verify();
+            Assert.NotNull(actual);
+            Assert.Null(actual.RouteName);
+            Assert.Collection(Assert.IsType<RouteValueDictionary>(actual.Values),
+                value =>
+                {
+                    Assert.Equal("handler", value.Key);
+                    Assert.Equal("route-value-handler", value.Value);
+                },
+                value =>
+                {
+                    Assert.Equal("page", value.Key);
+                    Assert.Equal("ambient-page", value.Value);
+                });
+        }
+
+        [Theory]
+        [InlineData("Sibling", "/Dir1/Dir2/Sibling")]
+        [InlineData("Dir3/Sibling", "/Dir1/Dir2/Dir3/Sibling")]
+        [InlineData("Dir4/Dir5/Index", "/Dir1/Dir2/Dir4/Dir5/Index")]
+        public void Page_CalculatesPathRelativeToViewEnginePath_WhenNotRooted(string pageName, string expected)
+        {
+            // Arrange
+            UrlRouteContext actual = null;
+            var routeData = new RouteData();
+            var actionContext = GetActionContextForPage("/Dir1/Dir2/About");
+
+            var urlHelper = CreateMockUrlHelper(actionContext);
+            urlHelper.Setup(h => h.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Callback((UrlRouteContext context) => actual = context);
+
+            // Act
+            urlHelper.Object.Page(pageName);
+
+            // Assert
+            urlHelper.Verify();
+            Assert.NotNull(actual);
+            Assert.Null(actual.RouteName);
+            Assert.Collection(Assert.IsType<RouteValueDictionary>(actual.Values),
+                value =>
+                {
+                    Assert.Equal("page", value.Key);
+                    Assert.Equal(expected, value.Value);
+                });
+        }
+
+        [Fact]
+        public void Page_CalculatesPathRelativeToViewEnginePath_ForIndexPagePaths()
+        {
+            // Arrange
+            var expected = "/Dir1/Dir2/Sibling";
+            UrlRouteContext actual = null;
+            var actionContext = GetActionContextForPage("/Dir1/Dir2/");
+
+            var urlHelper = CreateMockUrlHelper(actionContext);
+            urlHelper.Setup(h => h.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Callback((UrlRouteContext context) => actual = context);
+
+            // Act
+            urlHelper.Object.Page("Sibling");
+
+            // Assert
+            urlHelper.Verify();
+            Assert.NotNull(actual);
+            Assert.Null(actual.RouteName);
+            Assert.Collection(Assert.IsType<RouteValueDictionary>(actual.Values),
+                value =>
+                {
+                    Assert.Equal("page", value.Key);
+                    Assert.Equal(expected, value.Value);
+                });
+        }
+
+        [Fact]
+        public void Page_CalculatesPathRelativeToViewEnginePath_WhenNotRooted_ForPageAtRoot()
+        {
+            // Arrange
+            var expected = "/SiblingName";
+            UrlRouteContext actual = null;
+            var routeData = new RouteData();
+            var actionContext = new ActionContext
+            {
+                ActionDescriptor = new ActionDescriptor
+                {
+                    RouteValues = new Dictionary<string, string>
+                    {
+                        { "page", "/Home" },
+                    },
+                },
+                RouteData = new RouteData
+                {
+                    Values =
+                    {
+                        [ "page" ] = "/Home"
+                    },
+                },
+            };
+
+            var urlHelper = CreateMockUrlHelper(actionContext);
+            urlHelper.Setup(h => h.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Callback((UrlRouteContext context) => actual = context);
+
+            // Act
+            urlHelper.Object.Page("SiblingName");
+
+            // Assert
+            urlHelper.Verify();
+            Assert.NotNull(actual);
+            Assert.Null(actual.RouteName);
+            Assert.Collection(Assert.IsType<RouteValueDictionary>(actual.Values),
+                value =>
+                {
+                    Assert.Equal("page", value.Key);
+                    Assert.Equal(expected, value.Value);
+                });
+        }
+
+        [Fact]
+        public void Page_Throws_IfRouteValueDoesNotIncludePageKey()
+        {
+            // Arrange
+            var expected = "SiblingName";
+            UrlRouteContext actual = null;
+            var routeData = new RouteData();
+            var actionContext = new ActionContext
+            {
+                RouteData = new RouteData(),
+            };
+
+            var urlHelper = CreateMockUrlHelper(actionContext);
+            urlHelper.Setup(h => h.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Callback((UrlRouteContext context) => actual = context);
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => urlHelper.Object.Page(expected));
+            Assert.Equal($"The relative page path '{expected}' can only be used while executing a Razor Page. " +
+                "Specify a root relative path with a leading '/' to generate a URL outside of a Razor Page.", ex.Message);
+        }
+
+        [Fact]
+        public void Page_UsesAreaValueFromRouteValueIfSpecified()
+        {
+            // Arrange
+            UrlRouteContext actual = null;
+            var routeData = new RouteData
+            {
+                Values =
+                {
+                    { "page", "ambient-page" },
+                    { "area", "ambient-area" },
+                }
+            };
+            var actionContext = new ActionContext
+            {
+                RouteData = routeData,
+            };
+
+            var urlHelper = CreateMockUrlHelper(actionContext);
+            urlHelper.Setup(h => h.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Callback((UrlRouteContext context) => actual = context);
+
+            // Act
+            string page = null;
+            urlHelper.Object.Page(page, values: new { area = "specified-area" });
+
+            // Assert
+            urlHelper.Verify();
+            Assert.NotNull(actual);
+            Assert.Null(actual.RouteName);
+            Assert.Collection(Assert.IsType<RouteValueDictionary>(actual.Values).OrderBy(v => v.Key),
+                value =>
+                {
+                    Assert.Equal("area", value.Key);
+                    Assert.Equal("specified-area", value.Value);
+                },
+                value =>
+                {
+                    Assert.Equal("page", value.Key);
+                    Assert.Equal("ambient-page", value.Value);
+                });
+        }
+
+        private static Mock<IUrlHelper> CreateMockUrlHelper(ActionContext context = null)
+        {
+            if (context == null)
+            {
+                context = GetActionContextForPage("/Page");
+            }
+
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper.SetupGet(h => h.ActionContext)
+                .Returns(context);
+            return urlHelper;
+        }
+
+        private static HttpContext CreateHttpContext(
+            IServiceProvider services,
+            string appRoot)
+        {
+            var context = new DefaultHttpContext();
+            context.RequestServices = services;
+
+            context.Request.PathBase = new PathString(appRoot);
+            context.Request.Host = new HostString("localhost");
+
+            return context;
+        }
+
+        private static ActionContext CreateActionContext(HttpContext context)
+        {
+            return CreateActionContext(context, (new Mock<IRouter>()).Object);
+        }
+
+        private static ActionContext CreateActionContext(HttpContext context, IRouter router)
+        {
+            var routeData = new RouteData();
+            routeData.Routers.Add(router);
+
+            return new ActionContext(context, routeData, new ActionDescriptor());
+        }
+
+        private static UrlHelper CreateUrlHelper()
+        {
+            var services = CreateServices();
+            var context = CreateHttpContext(services, string.Empty);
+            var actionContext = CreateActionContext(context);
+
+            return new UrlHelper(actionContext);
+        }
+
+        private static UrlHelper CreateUrlHelper(ActionContext context)
+        {
+            return new UrlHelper(context);
+        }
+
+        private static UrlHelper CreateUrlHelper(string host)
+        {
+            var services = CreateServices();
+            var context = CreateHttpContext(services, string.Empty);
+            context.Request.Host = new HostString(host);
+
+            var actionContext = CreateActionContext(context);
+
+            return new UrlHelper(actionContext);
+        }
+
+        private static UrlHelper CreateUrlHelper(string host, string protocol, IRouter router)
+        {
+            var services = CreateServices();
+            var context = CreateHttpContext(services, string.Empty);
+            context.Request.Host = new HostString(host);
+            context.Request.Scheme = protocol;
+
+            var actionContext = CreateActionContext(context, router);
+
+            return new UrlHelper(actionContext);
+        }
+
+        private static TestUrlHelper CreateUrlHelper(string appBase, IRouter router)
+        {
+            var services = CreateServices();
+            var context = CreateHttpContext(services, appBase);
+            var actionContext = CreateActionContext(context, router);
+
+            return new TestUrlHelper(actionContext);
+        }
+
+        private static UrlHelper CreateUrlHelperWithRouteCollection(
+            IServiceProvider services,
+            string appPrefix)
+        {
+            var routeCollection = GetRouter(services);
+            return CreateUrlHelper(appPrefix, routeCollection);
+        }
+
+        private static IRouter GetRouter(IServiceProvider services)
+        {
+            return GetRouter(services, "mockRoute", "/mockTemplate");
+        }
+
+        private static IServiceProvider CreateServices()
+        {
+            var services = new ServiceCollection();
+            services.AddOptions();
+            services.AddLogging();
+            services.AddRouting();
+            services
+                .AddSingleton<ObjectPoolProvider, DefaultObjectPoolProvider>()
+                .AddSingleton<UrlEncoder>(UrlEncoder.Default);
+
+            return services.BuildServiceProvider();
+        }
+
+        private static IRouteBuilder CreateRouteBuilder(IServiceProvider services)
+        {
+            var app = new Mock<IApplicationBuilder>();
+            app
+                .SetupGet(a => a.ApplicationServices)
+                .Returns(services);
+
+            return new RouteBuilder(app.Object)
+            {
+                DefaultHandler = new PassThroughRouter(),
+            };
+        }
+
+        private static IRouter GetRouter(
+            IServiceProvider services,
+            string mockRouteName,
+            string mockTemplateValue)
+        {
+            var routeBuilder = CreateRouteBuilder(services);
+
+            var target = new Mock<IRouter>(MockBehavior.Strict);
+            target
+                .Setup(router => router.GetVirtualPath(It.IsAny<VirtualPathContext>()))
+                .Returns<VirtualPathContext>(context => null);
+            routeBuilder.DefaultHandler = target.Object;
+
+            routeBuilder.MapRoute(
+                string.Empty,
+                "{controller}/{action}/{id}",
+                new RouteValueDictionary(new { id = "defaultid" }));
+
+            routeBuilder.MapRoute(
+                "namedroute",
+                "named/{controller}/{action}/{id}",
+                new RouteValueDictionary(new { id = "defaultid" }));
+
+            var mockHttpRoute = new Mock<IRouter>();
+            mockHttpRoute
+                .Setup(mock => mock.GetVirtualPath(It.Is<VirtualPathContext>(c => string.Equals(c.RouteName, mockRouteName))))
+                .Returns(new VirtualPathData(mockHttpRoute.Object, mockTemplateValue));
+
+            routeBuilder.Routes.Add(mockHttpRoute.Object);
+            return routeBuilder.Build();
+        }
+
+        private static ActionContext GetActionContextForPage(string page)
+        {
+            return new ActionContext
+            {
+                ActionDescriptor = new ActionDescriptor
+                {
+                    RouteValues = new Dictionary<string, string>
+                    {
+                        { "page", page },
+                    },
+                },
+                RouteData = new RouteData
+                {
+                    Values =
+                    {
+                        [ "page" ] = page
+                    },
+                },
+            };
+        }
+
+        private class PassThroughRouter : IRouter
+        {
+            public VirtualPathData GetVirtualPath(VirtualPathContext context)
+            {
+                return null;
+            }
+
+            public Task RouteAsync(RouteContext context)
+            {
+                context.Handler = (c) => Task.FromResult(0);
+                return Task.FromResult(false);
+            }
+        }
+
+        private class TestUrlHelper : UrlHelper
+        {
+            public TestUrlHelper(ActionContext actionContext) :
+                base(actionContext)
+            {
+
+            }
+            public new string GenerateUrl(string protocol, string host, VirtualPathData pathData, string fragment)
+            {
+                return base.GenerateUrl(
+                    protocol,
+                    host,
+                    pathData,
+                    fragment);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/SerializableErrorTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/SerializableErrorTests.cs
new file mode 100644
index 0000000000..24a397b882
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/SerializableErrorTests.cs
@@ -0,0 +1,82 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class SerializableErrorTests
+    {
+        [Fact]
+        public void ConvertsModelState_To_Dictionary()
+        {
+            // Arrange
+            var modelState = new ModelStateDictionary();
+            modelState.AddModelError("key1", "Test Error 1");
+            modelState.AddModelError("key1", "Test Error 2");
+            modelState.AddModelError("key2", "Test Error 3");
+
+            // Act
+            var serializableError = new SerializableError(modelState);
+
+            // Assert
+            var arr = Assert.IsType<string[]>(serializableError["key1"]);
+            Assert.Equal("Test Error 1", arr[0]);
+            Assert.Equal("Test Error 2", arr[1]);
+            Assert.Equal("Test Error 3", (serializableError["key2"] as string[])[0]);
+        }
+
+        [Fact]
+        public void LookupIsCaseInsensitive()
+        {
+            // Arrange
+            var modelState = new ModelStateDictionary();
+            modelState.AddModelError("key1", "x");
+
+            // Act
+            var serializableError = new SerializableError(modelState);
+
+            // Assert
+            var arr = Assert.IsType<string[]>(serializableError["KEY1"]);
+            Assert.Equal("x", arr[0]);
+        }
+
+        [Fact]
+        public void ConvertsModelState_To_Dictionary_AddsDefaultValuesWhenErrorsAreAbsent()
+        {
+            // Arrange
+            var modelState = new ModelStateDictionary();
+            modelState.AddModelError("key1", "");
+
+            // Act
+            var serializableError = new SerializableError(modelState);
+
+            // Assert
+            var arr = Assert.IsType<string[]>(serializableError["key1"]);
+            Assert.Equal("The input was not valid.", arr[0]);
+        }
+
+        [Fact]
+        public void DoesNotThrowOnValidModelState()
+        {
+            // Arrange, Act & Assert (does not throw)
+            new SerializableError(new ModelStateDictionary());
+        }
+
+        [Fact]
+        public void DoesNotAddEntries_IfNoErrorsArePresent()
+        {
+            // Arrange
+            var modelState = new ModelStateDictionary();
+            modelState.SetModelValue("key1", "value1", "value1");
+            modelState.SetModelValue("key2", "value2", "value2");
+
+            // Act
+            var serializableError = new SerializableError(modelState);
+
+            // Assert
+            Assert.Empty(serializableError);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/SignInResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/SignInResultTest.cs
new file mode 100644
index 0000000000..1b3246ccb0
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/SignInResultTest.cs
@@ -0,0 +1,84 @@
+// 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.
+
+using System;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class SignInResultTest
+    {
+        [Fact]
+        public async Task ExecuteResultAsync_InvokesSignInAsyncOnAuthenticationManager()
+        {
+            // Arrange
+            var principal = new ClaimsPrincipal();
+            var httpContext = new Mock<HttpContext>();
+            var auth = new Mock<IAuthenticationService>();
+            auth
+                .Setup(c => c.SignInAsync(httpContext.Object, "", principal, null))
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+            httpContext.Setup(c => c.RequestServices).Returns(CreateServices(auth.Object));
+            var result = new SignInResult("", principal, null);
+            var routeData = new RouteData();
+
+            var actionContext = new ActionContext(
+                httpContext.Object,
+                routeData,
+                new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            auth.Verify();
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_InvokesSignInAsyncOnConfiguredScheme()
+        {
+            // Arrange
+            var principal = new ClaimsPrincipal();
+            var authProperties = new AuthenticationProperties();
+            var httpContext = new Mock<HttpContext>();
+            var auth = new Mock<IAuthenticationService>();
+            auth
+                .Setup(c => c.SignInAsync(httpContext.Object, "Scheme1", principal, authProperties))
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+            httpContext.Setup(c => c.RequestServices).Returns(CreateServices(auth.Object));
+            var result = new SignInResult("Scheme1", principal, authProperties);
+            var routeData = new RouteData();
+
+            var actionContext = new ActionContext(
+                httpContext.Object,
+                routeData,
+                new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            auth.Verify();
+        }
+
+        private static IServiceProvider CreateServices(IAuthenticationService auth)
+        {
+            return new ServiceCollection()
+                .AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance)
+                .AddSingleton(auth)
+                .BuildServiceProvider();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/SignOutResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/SignOutResultTest.cs
new file mode 100644
index 0000000000..fe690c6ef4
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/SignOutResultTest.cs
@@ -0,0 +1,111 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class SignOutResultTest
+    {
+        [Fact]
+        public async Task ExecuteResultAsync_NoArgsInvokesDefaultSignOut()
+        {
+            // Arrange
+            var httpContext = new Mock<HttpContext>();
+            var auth = new Mock<IAuthenticationService>();
+            auth
+                .Setup(c => c.SignOutAsync(httpContext.Object, null, null))
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+            httpContext.Setup(c => c.RequestServices).Returns(CreateServices(auth.Object));
+            var result = new SignOutResult();
+            var routeData = new RouteData();
+
+            var actionContext = new ActionContext(
+                httpContext.Object,
+                routeData,
+                new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            auth.Verify();
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_InvokesSignOutAsyncOnAuthenticationManager()
+        {
+            // Arrange
+            var httpContext = new Mock<HttpContext>();
+            var auth = new Mock<IAuthenticationService>();
+            auth
+                .Setup(c => c.SignOutAsync(httpContext.Object, "", null))
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+            httpContext.Setup(c => c.RequestServices).Returns(CreateServices(auth.Object));
+            var result = new SignOutResult("", null);
+            var routeData = new RouteData();
+
+            var actionContext = new ActionContext(
+                httpContext.Object,
+                routeData,
+                new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            auth.Verify();
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_InvokesSignOutAsyncOnAllConfiguredSchemes()
+        {
+            // Arrange
+            var authProperties = new AuthenticationProperties();
+            var httpContext = new Mock<HttpContext>();
+            var auth = new Mock<IAuthenticationService>();
+            auth
+                .Setup(c => c.SignOutAsync(httpContext.Object, "Scheme1", authProperties))
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+            auth
+                .Setup(c => c.SignOutAsync(httpContext.Object, "Scheme2", authProperties))
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+            httpContext.Setup(c => c.RequestServices).Returns(CreateServices(auth.Object));
+            var result = new SignOutResult(new[] { "Scheme1", "Scheme2" }, authProperties);
+            var routeData = new RouteData();
+
+            var actionContext = new ActionContext(
+                httpContext.Object,
+                routeData,
+                new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            auth.Verify();
+        }
+
+        private static IServiceProvider CreateServices(IAuthenticationService auth)
+        {
+            return new ServiceCollection()
+                .AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance)
+                .AddSingleton(auth)
+                .BuildServiceProvider();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/TestApplicationPart.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/TestApplicationPart.cs
new file mode 100644
index 0000000000..b8541d776b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/TestApplicationPart.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class TestApplicationPart : ApplicationPart, IApplicationPartTypeProvider
+    {
+        public TestApplicationPart()
+        {
+            Types = Enumerable.Empty<TypeInfo>();
+        }
+
+        public TestApplicationPart(params TypeInfo[] types)
+        {
+            Types = types;
+        }
+
+        public TestApplicationPart(IEnumerable<TypeInfo> types)
+        {
+            Types = types;
+        }
+
+        public TestApplicationPart(IEnumerable<Type> types)
+            :this(types.Select(t => t.GetTypeInfo()))
+        {
+        }
+
+        public TestApplicationPart(params Type[] types)
+            : this(types.Select(t => t.GetTypeInfo()))
+        {
+        }
+
+        public override string Name => "Test part";
+
+        public IEnumerable<TypeInfo> Types { get; }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/TestFeatureProvider.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/TestFeatureProvider.cs
new file mode 100644
index 0000000000..77c87709a4
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/TestFeatureProvider.cs
@@ -0,0 +1,35 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Controllers;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class TestFeatureProvider : IApplicationFeatureProvider<ControllerFeature>
+    {
+        private readonly Func<TypeInfo, bool> _filter;
+
+        public TestFeatureProvider()
+            : this(t => true)
+        {
+        }
+
+        public TestFeatureProvider(Func<TypeInfo, bool> filter)
+        {
+            _filter = filter;
+        }
+
+        public void PopulateFeature(IEnumerable<ApplicationPart> parts, ControllerFeature feature)
+        {
+            foreach (var type in parts.OfType<IApplicationPartTypeProvider>().SelectMany(t => t.Types).Where(_filter))
+            {
+                feature.Controllers.Add(type);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/UnprocessableEntityObjectResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/UnprocessableEntityObjectResultTests.cs
new file mode 100644
index 0000000000..7ab3fcfd9f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/UnprocessableEntityObjectResultTests.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class UnprocessableEntityObjectResultTests
+    {
+        [Fact]
+        public void UnprocessableEntityObjectResult_SetsStatusCodeAndValue()
+        {
+            // Arrange & Act
+            var obj = new object();
+            var result = new UnprocessableEntityObjectResult(obj);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status422UnprocessableEntity, result.StatusCode);
+            Assert.Equal(obj, result.Value);
+        }
+
+        [Fact]
+        public void UnprocessableEntityObjectResult_ModelState_SetsStatusCodeAndValue()
+        {
+            // Arrange & Act
+            var result = new UnprocessableEntityObjectResult(new ModelStateDictionary());
+
+            // Assert
+            Assert.Equal(StatusCodes.Status422UnprocessableEntity, result.StatusCode);
+            var errors = Assert.IsType<SerializableError>(result.Value);
+            Assert.Empty(errors);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/UnprocessableEntityResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/UnprocessableEntityResultTests.cs
new file mode 100644
index 0000000000..b54f474154
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/UnprocessableEntityResultTests.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class UnprocessableEntityResultTests
+    {
+        [Fact]
+        public void UnprocessableEntityResult_InitializesStatusCode()
+        {
+            // Arrange & act
+            var result = new UnprocessableEntityResult();
+
+            // Assert
+            Assert.Equal(StatusCodes.Status422UnprocessableEntity, result.StatusCode);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ValidationProblemDetailsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ValidationProblemDetailsTest.cs
new file mode 100644
index 0000000000..af4f0d9a34
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ValidationProblemDetailsTest.cs
@@ -0,0 +1,77 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class ValidationProblemDetailsTest
+    {
+        [Fact]
+        public void Constructor_SetsTitle()
+        {
+            // Arrange & Act
+            var problemDescription = new ValidationProblemDetails();
+
+            // Assert
+            Assert.Equal("One or more validation errors occurred.", problemDescription.Title);
+            Assert.Empty(problemDescription.Errors);
+        }
+
+        [Fact]
+        public void Constructor_SerializesErrorsFromModelStateDictionary()
+        {
+            // Arrange
+            var modelStateDictionary = new ModelStateDictionary();
+            modelStateDictionary.AddModelError("key1", "error1");
+            modelStateDictionary.SetModelValue("key2", new object(), "value");
+            modelStateDictionary.AddModelError("key3", "error2");
+            modelStateDictionary.AddModelError("key3", "error3");
+
+            // Act
+            var problemDescription = new ValidationProblemDetails(modelStateDictionary);
+
+            // Assert
+            Assert.Equal("One or more validation errors occurred.", problemDescription.Title);
+            Assert.Collection(
+                problemDescription.Errors,
+                item =>
+                {
+                    Assert.Equal("key1", item.Key);
+                    Assert.Equal(new[] { "error1" }, item.Value);
+                },
+                item =>
+                {
+                    Assert.Equal("key3", item.Key);
+                    Assert.Equal(new[] { "error2", "error3" }, item.Value);
+                });
+        }
+
+        [Fact]
+        public void Constructor_SerializesErrorsFromModelStateDictionary_AddsDefaultMessage()
+        {
+            // Arrange
+            var modelStateDictionary = new ModelStateDictionary();
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), nameof(string.Length));
+            modelStateDictionary.AddModelError("unsafeError",
+                new Exception("This message should not be returned to clients"),
+                metadata);
+
+            // Act
+            var problemDescription = new ValidationProblemDetails(modelStateDictionary);
+
+            // Assert
+            Assert.Equal("One or more validation errors occurred.", problemDescription.Title);
+            Assert.Collection(
+                problemDescription.Errors,
+                item =>
+                {
+                    Assert.Equal("unsafeError", item.Key);
+                    Assert.Equal(new[] { "The input was not valid." }, item.Value);
+                });
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/VirtualFileResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/VirtualFileResultTest.cs
new file mode 100644
index 0000000000..21a20fb637
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/VirtualFileResultTest.cs
@@ -0,0 +1,809 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Net.Http.Headers;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class VirtualFileResultTest
+    {
+        [Fact]
+        public void Constructor_SetsFileName()
+        {
+            // Arrange
+            var path = Path.GetFullPath("helllo.txt");
+
+            // Act
+            var result = new TestVirtualFileResult(path, "text/plain");
+
+            // Assert
+            Assert.Equal(path, result.FileName);
+        }
+
+        [Fact]
+        public void Constructor_SetsContentTypeAndParameters()
+        {
+            // Arrange
+            var path = Path.GetFullPath("helllo.txt");
+            var contentType = "text/plain; charset=us-ascii; p1=p1-value";
+            var expectedMediaType = contentType;
+
+            // Act
+            var result = new TestVirtualFileResult(path, contentType);
+
+            // Assert
+            Assert.Equal(path, result.FileName);
+            MediaTypeAssert.Equal(expectedMediaType, result.ContentType);
+        }
+
+        [Theory]
+        [InlineData(0, 3, "File", 4)]
+        [InlineData(8, 13, "Result", 6)]
+        [InlineData(null, 4, "ts¡", 4)]
+        [InlineData(8, null, "ResultTestFile contents¡", 25)]
+        public async Task WriteFileAsync_WritesRangeRequested(long? start, long? end, string expectedString, long contentLength)
+        {
+            // Arrange
+            var path = Path.GetFullPath("helllo.txt");
+            var contentType = "text/plain; charset=us-ascii; p1=p1-value";
+            var result = new TestVirtualFileResult(path, contentType);
+            result.EnableRangeProcessing = true;
+            var appEnvironment = new Mock<IHostingEnvironment>();
+            appEnvironment.Setup(app => app.WebRootFileProvider)
+                .Returns(GetFileProvider(path));
+
+            var httpContext = GetHttpContext();
+            httpContext.Response.Body = new MemoryStream();
+            httpContext.RequestServices = new ServiceCollection()
+                .AddSingleton(appEnvironment.Object)
+                .AddTransient<IActionResultExecutor<VirtualFileResult>, TestVirtualFileResultExecutor>()
+                .AddTransient<ILoggerFactory, LoggerFactory>()
+                .BuildServiceProvider();
+
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.Range = new RangeHeaderValue(start, end);
+            requestHeaders.IfUnmodifiedSince = DateTimeOffset.MinValue.AddDays(1);
+            httpContext.Request.Method = HttpMethods.Get;
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            start = start ?? 33 - end;
+            end = start + contentLength - 1;
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            var contentRange = new ContentRangeHeaderValue(start.Value, end.Value, 33);
+            Assert.Equal(StatusCodes.Status206PartialContent, httpResponse.StatusCode);
+            Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]);
+            Assert.Equal(contentRange.ToString(), httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal(contentLength, httpResponse.ContentLength);
+            Assert.Equal(expectedString, body);
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_IfRangeHeaderValid_WritesRequestedRange()
+        {
+            // Arrange
+            var path = Path.GetFullPath("helllo.txt");
+            var contentType = "text/plain; charset=us-ascii; p1=p1-value";
+            var result = new TestVirtualFileResult(path, contentType);
+            result.EnableRangeProcessing = true;
+            var appEnvironment = new Mock<IHostingEnvironment>();
+            appEnvironment.Setup(app => app.WebRootFileProvider)
+                .Returns(GetFileProvider(path));
+
+            var httpContext = GetHttpContext();
+            httpContext.Response.Body = new MemoryStream();
+            httpContext.RequestServices = new ServiceCollection()
+                .AddSingleton(appEnvironment.Object)
+                .AddTransient<IActionResultExecutor<VirtualFileResult>, TestVirtualFileResultExecutor>()
+                .AddTransient<ILoggerFactory, LoggerFactory>()
+                .BuildServiceProvider();
+
+            var entityTag = result.EntityTag = new EntityTagHeaderValue("\"Etag\"");
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfModifiedSince = DateTimeOffset.MinValue;
+            requestHeaders.Range = new RangeHeaderValue(0, 3);
+            requestHeaders.IfRange = new RangeConditionHeaderValue(new EntityTagHeaderValue("\"Etag\""));
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(StatusCodes.Status206PartialContent, httpResponse.StatusCode);
+            Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]);
+            var contentRange = new ContentRangeHeaderValue(0, 3, 33);
+            Assert.Equal(contentRange.ToString(), httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.Equal(entityTag.ToString(), httpResponse.Headers[HeaderNames.ETag]);
+            Assert.Equal(4, httpResponse.ContentLength);
+            Assert.Equal("File", body);
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_RangeProcessingNotEnabled_RangeRequestedIgnored()
+        {
+            // Arrange
+            var path = Path.GetFullPath("helllo.txt");
+            var contentType = "text/plain; charset=us-ascii; p1=p1-value";
+            var result = new TestVirtualFileResult(path, contentType);
+            var appEnvironment = new Mock<IHostingEnvironment>();
+            appEnvironment.Setup(app => app.WebRootFileProvider)
+                .Returns(GetFileProvider(path));
+
+            var httpContext = GetHttpContext();
+            httpContext.Response.Body = new MemoryStream();
+            httpContext.RequestServices = new ServiceCollection()
+                .AddSingleton(appEnvironment.Object)
+                .AddTransient<IActionResultExecutor<VirtualFileResult>, TestVirtualFileResultExecutor>()
+                .AddTransient<ILoggerFactory, LoggerFactory>()
+                .BuildServiceProvider();
+
+            var entityTag = result.EntityTag = new EntityTagHeaderValue("\"Etag\"");
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfModifiedSince = DateTimeOffset.MinValue;
+            requestHeaders.Range = new RangeHeaderValue(0, 3);
+            requestHeaders.IfRange = new RangeConditionHeaderValue(new EntityTagHeaderValue("\"Etag\""));
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
+            Assert.Equal(entityTag.ToString(), httpResponse.Headers[HeaderNames.ETag]);
+            Assert.Equal("FilePathResultTestFile contents¡", body);
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_IfRangeHeaderInvalid_RangeRequestedIgnored()
+        {
+            // Arrange
+            var path = Path.GetFullPath("helllo.txt");
+            var contentType = "text/plain; charset=us-ascii; p1=p1-value";
+            var result = new TestVirtualFileResult(path, contentType);
+            result.EnableRangeProcessing = true;
+            var appEnvironment = new Mock<IHostingEnvironment>();
+            appEnvironment.Setup(app => app.WebRootFileProvider)
+                .Returns(GetFileProvider(path));
+
+            var httpContext = GetHttpContext();
+            httpContext.Response.Body = new MemoryStream();
+            httpContext.RequestServices = new ServiceCollection()
+                .AddSingleton(appEnvironment.Object)
+                .AddTransient<IActionResultExecutor<VirtualFileResult>, TestVirtualFileResultExecutor>()
+                .AddTransient<ILoggerFactory, LoggerFactory>()
+                .BuildServiceProvider();
+
+            var entityTag = result.EntityTag = new EntityTagHeaderValue("\"Etag\"");
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfModifiedSince = DateTimeOffset.MinValue;
+            requestHeaders.Range = new RangeHeaderValue(0, 3);
+            requestHeaders.IfRange = new RangeConditionHeaderValue(new EntityTagHeaderValue("\"NotEtag\""));
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
+            Assert.Equal(entityTag.ToString(), httpResponse.Headers[HeaderNames.ETag]);
+            Assert.Equal("FilePathResultTestFile contents¡", body);
+        }
+
+        [Theory]
+        [InlineData("0-5")]
+        [InlineData("bytes = ")]
+        [InlineData("bytes = 1-4, 5-11")]
+        public async Task WriteFileAsync_RangeHeaderMalformed_RangeRequestIgnored(string rangeString)
+        {
+            // Arrange
+            var path = Path.GetFullPath("helllo.txt");
+            var contentType = "text/plain; charset=us-ascii; p1=p1-value";
+            var result = new TestVirtualFileResult(path, contentType);
+            result.EnableRangeProcessing = true;
+            var appEnvironment = new Mock<IHostingEnvironment>();
+            appEnvironment.Setup(app => app.WebRootFileProvider)
+                    .Returns(GetFileProvider(path));
+
+            var httpContext = GetHttpContext();
+            httpContext.Response.Body = new MemoryStream();
+            httpContext.RequestServices = new ServiceCollection()
+                    .AddSingleton(appEnvironment.Object)
+                    .AddTransient<IActionResultExecutor<VirtualFileResult>, TestVirtualFileResultExecutor>()
+                    .AddTransient<ILoggerFactory, LoggerFactory>()
+                    .BuildServiceProvider();
+
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            httpContext.Request.Headers[HeaderNames.Range] = rangeString;
+            requestHeaders.IfUnmodifiedSince = DateTimeOffset.MinValue.AddDays(1);
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(StatusCodes.Status200OK, httpResponse.StatusCode);
+            Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal("FilePathResultTestFile contents¡", body);
+        }
+
+        [Theory]
+        [InlineData("bytes = 35-36")]
+        [InlineData("bytes = -0")]
+        public async Task WriteFileAsync_RangeRequestedNotSatisfiable(string rangeString)
+        {
+            // Arrange
+            var path = Path.GetFullPath("helllo.txt");
+            var contentType = "text/plain; charset=us-ascii; p1=p1-value";
+            var result = new TestVirtualFileResult(path, contentType);
+            result.EnableRangeProcessing = true;
+            var appEnvironment = new Mock<IHostingEnvironment>();
+            appEnvironment.Setup(app => app.WebRootFileProvider)
+                    .Returns(GetFileProvider(path));
+
+            var httpContext = GetHttpContext();
+            httpContext.Response.Body = new MemoryStream();
+            httpContext.RequestServices = new ServiceCollection()
+                    .AddSingleton(appEnvironment.Object)
+                    .AddTransient<IActionResultExecutor<VirtualFileResult>, TestVirtualFileResultExecutor>()
+                    .AddTransient<ILoggerFactory, LoggerFactory>()
+                    .BuildServiceProvider();
+
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            httpContext.Request.Headers[HeaderNames.Range] = rangeString;
+            requestHeaders.IfUnmodifiedSince = DateTimeOffset.MinValue.AddDays(1);
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            var contentRange = new ContentRangeHeaderValue(33);
+            Assert.Equal(StatusCodes.Status416RangeNotSatisfiable, httpResponse.StatusCode);
+            Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]);
+            Assert.Equal(contentRange.ToString(), httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Empty(body);
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_RangeRequested_PreconditionFailed()
+        {
+            // Arrange
+            var path = Path.GetFullPath("helllo.txt");
+            var contentType = "text/plain; charset=us-ascii; p1=p1-value";
+            var result = new TestVirtualFileResult(path, contentType);
+            result.EnableRangeProcessing = true;
+            var appEnvironment = new Mock<IHostingEnvironment>();
+            appEnvironment.Setup(app => app.WebRootFileProvider)
+                .Returns(GetFileProvider(path));
+
+            var httpContext = GetHttpContext();
+            httpContext.Response.Body = new MemoryStream();
+            httpContext.RequestServices = new ServiceCollection()
+                .AddSingleton(appEnvironment.Object)
+                .AddTransient<IActionResultExecutor<VirtualFileResult>, TestVirtualFileResultExecutor>()
+                .AddTransient<ILoggerFactory, LoggerFactory>()
+                .BuildServiceProvider();
+
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfUnmodifiedSince = DateTimeOffset.MinValue;
+            httpContext.Request.Headers[HeaderNames.Range] = "bytes = 0-6";
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(StatusCodes.Status412PreconditionFailed, httpResponse.StatusCode);
+            Assert.Null(httpResponse.ContentLength);
+            Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Empty(body);
+        }
+
+        [Fact]
+        public async Task WriteFileAsync_RangeRequested_NotModified()
+        {
+            // Arrange
+            var path = Path.GetFullPath("helllo.txt");
+            var contentType = "text/plain; charset=us-ascii; p1=p1-value";
+            var result = new TestVirtualFileResult(path, contentType);
+            result.EnableRangeProcessing = true;
+            var appEnvironment = new Mock<IHostingEnvironment>();
+            appEnvironment.Setup(app => app.WebRootFileProvider)
+                .Returns(GetFileProvider(path));
+
+            var httpContext = GetHttpContext();
+            httpContext.Response.Body = new MemoryStream();
+            httpContext.RequestServices = new ServiceCollection()
+                .AddSingleton(appEnvironment.Object)
+                .AddTransient<IActionResultExecutor<VirtualFileResult>, TestVirtualFileResultExecutor>()
+                .AddTransient<ILoggerFactory, LoggerFactory>()
+                .BuildServiceProvider();
+
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.IfModifiedSince = DateTimeOffset.MinValue.AddDays(1);
+            httpContext.Request.Headers[HeaderNames.Range] = "bytes = 0-6";
+            httpContext.Request.Method = HttpMethods.Get;
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var httpResponse = actionContext.HttpContext.Response;
+            httpResponse.Body.Seek(0, SeekOrigin.Begin);
+            var streamReader = new StreamReader(httpResponse.Body);
+            var body = streamReader.ReadToEndAsync().Result;
+            Assert.Equal(StatusCodes.Status304NotModified, httpResponse.StatusCode);
+            Assert.Null(httpResponse.ContentLength);
+            Assert.Empty(httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Empty(body);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_FallsBackToWebRootFileProvider_IfNoFileProviderIsPresent()
+        {
+            // Arrange
+            var path = Path.Combine("TestFiles", "FilePathResultTestFile.txt");
+            var result = new TestVirtualFileResult(path, "text/plain");
+
+            var appEnvironment = new Mock<IHostingEnvironment>();
+            appEnvironment.Setup(app => app.WebRootFileProvider)
+                .Returns(GetFileProvider(path));
+
+            var httpContext = GetHttpContext();
+            httpContext.Response.Body = new MemoryStream();
+            httpContext.RequestServices = new ServiceCollection()
+                .AddSingleton(appEnvironment.Object)
+                .AddTransient<IActionResultExecutor<VirtualFileResult>, TestVirtualFileResultExecutor>()
+                .AddTransient<ILoggerFactory, LoggerFactory>()
+                .BuildServiceProvider();
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(context);
+            httpContext.Response.Body.Position = 0;
+
+            // Assert
+            Assert.NotNull(httpContext.Response.Body);
+            var contents = await new StreamReader(httpContext.Response.Body).ReadToEndAsync();
+            Assert.Equal("FilePathResultTestFile contents¡", contents);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_FallsbackToStreamCopy_IfNoIHttpSendFilePresent()
+        {
+            // Arrange
+            var path = Path.Combine("TestFiles", "FilePathResultTestFile.txt");
+            var result = new TestVirtualFileResult(path, "text/plain")
+            {
+                FileProvider = GetFileProvider(path),
+            };
+
+            var httpContext = GetHttpContext();
+            httpContext.Response.Body = new MemoryStream();
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(context);
+            httpContext.Response.Body.Position = 0;
+
+            // Assert
+            Assert.NotNull(httpContext.Response.Body);
+            var contents = await new StreamReader(httpContext.Response.Body).ReadToEndAsync();
+            Assert.Equal("FilePathResultTestFile contents¡", contents);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_CallsSendFileAsync_IfIHttpSendFilePresent()
+        {
+            // Arrange
+            var path = Path.Combine("TestFiles", "FilePathResultTestFile.txt");
+            var result = new TestVirtualFileResult(path, "text/plain")
+            {
+                FileProvider = GetFileProvider(path),
+            };
+
+            var sendFileMock = new Mock<IHttpSendFileFeature>();
+            sendFileMock
+                .Setup(s => s.SendFileAsync(path, 0, null, CancellationToken.None))
+                .Returns(Task.FromResult<int>(0));
+
+            var httpContext = GetHttpContext();
+            httpContext.Features.Set(sendFileMock.Object);
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(context);
+
+            // Assert
+            sendFileMock.Verify();
+        }
+
+        [Theory]
+        [InlineData(0, 3, "File", 4)]
+        [InlineData(8, 13, "Result", 6)]
+        [InlineData(null, 3, "ts¡", 3)]
+        [InlineData(8, null, "ResultTestFile contents¡", 25)]
+        public async Task ExecuteResultAsync_CallsSendFileAsyncWithRequestedRange_IfIHttpSendFilePresent(long? start, long? end, string expectedString, long contentLength)
+        {
+            // Arrange
+            var path = Path.Combine("TestFiles", "FilePathResultTestFile.txt");
+            var result = new TestVirtualFileResult(path, "text/plain")
+            {
+                FileProvider = GetFileProvider(path),
+                EnableRangeProcessing = true,
+            };
+
+            var sendFile = new TestSendFileFeature();
+            var httpContext = GetHttpContext();
+            httpContext.Features.Set<IHttpSendFileFeature>(sendFile);
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var appEnvironment = new Mock<IHostingEnvironment>();
+            appEnvironment.Setup(app => app.WebRootFileProvider)
+                .Returns(GetFileProvider(path));
+            httpContext.RequestServices = new ServiceCollection()
+                .AddSingleton(appEnvironment.Object)
+                .AddTransient<IActionResultExecutor<VirtualFileResult>, TestVirtualFileResultExecutor>()
+                .AddTransient<ILoggerFactory, LoggerFactory>()
+                .BuildServiceProvider();
+
+            var requestHeaders = httpContext.Request.GetTypedHeaders();
+            requestHeaders.Range = new RangeHeaderValue(start, end);
+            requestHeaders.IfUnmodifiedSince = DateTimeOffset.MinValue.AddDays(1);
+            httpContext.Request.Method = HttpMethods.Get;
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(actionContext);
+
+            // Assert
+            start = start ?? 33 - end;
+            end = start + contentLength - 1;
+            var httpResponse = actionContext.HttpContext.Response;
+            Assert.Equal(Path.Combine("TestFiles", "FilePathResultTestFile.txt"), sendFile.Name);
+            Assert.Equal(start, sendFile.Offset);
+            Assert.Equal(contentLength, sendFile.Length);
+            Assert.Equal(CancellationToken.None, sendFile.Token);
+            var contentRange = new ContentRangeHeaderValue(start.Value, end.Value, 33);
+            Assert.Equal(StatusCodes.Status206PartialContent, httpResponse.StatusCode);
+            Assert.Equal("bytes", httpResponse.Headers[HeaderNames.AcceptRanges]);
+            Assert.Equal(contentRange.ToString(), httpResponse.Headers[HeaderNames.ContentRange]);
+            Assert.NotEmpty(httpResponse.Headers[HeaderNames.LastModified]);
+            Assert.Equal(contentLength, httpResponse.ContentLength);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_SetsSuppliedContentTypeAndEncoding()
+        {
+            // Arrange
+            var expectedContentType = "text/foo; charset=us-ascii";
+            var result = new TestVirtualFileResult(
+                "FilePathResultTestFile_ASCII.txt", expectedContentType)
+            {
+                FileProvider = GetFileProvider("FilePathResultTestFile_ASCII.txt"),
+                IsAscii = true,
+            };
+
+            var httpContext = GetHttpContext();
+            var memoryStream = new MemoryStream();
+            httpContext.Response.Body = memoryStream;
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(context);
+
+            // Assert
+            var contents = Encoding.ASCII.GetString(memoryStream.ToArray());
+            Assert.Equal("FilePathResultTestFile contents ASCII encoded", contents);
+            Assert.Equal(expectedContentType, httpContext.Response.ContentType);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_ReturnsFileContentsForRelativePaths()
+        {
+            // Arrange
+            var path = Path.Combine("TestFiles", "FilePathResultTestFile.txt");
+            var result = new TestVirtualFileResult(path, "text/plain")
+            {
+                FileProvider = GetFileProvider(path),
+            };
+
+            var httpContext = GetHttpContext();
+            httpContext.Response.Body = new MemoryStream();
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(context);
+            httpContext.Response.Body.Position = 0;
+
+            // Assert
+            Assert.NotNull(httpContext.Response.Body);
+            var contents = await new StreamReader(httpContext.Response.Body).ReadToEndAsync();
+            Assert.Equal("FilePathResultTestFile contents¡", contents);
+        }
+
+        [Theory]
+        [InlineData("FilePathResultTestFile.txt")]
+        [InlineData("TestFiles/FilePathResultTestFile.txt")]
+        [InlineData("TestFiles/../FilePathResultTestFile.txt")]
+        [InlineData("TestFiles\\FilePathResultTestFile.txt")]
+        [InlineData("TestFiles\\..\\FilePathResultTestFile.txt")]
+        [InlineData(@"\\..//?><|""&@#\c:\..\? /..txt")]
+        public async Task ExecuteResultAsync_ReturnsFiles_ForDifferentPaths(string path)
+        {
+            // Arrange
+            var result = new TestVirtualFileResult(path, "text/plain")
+            {
+                FileProvider = GetFileProvider(path),
+            };
+            var httpContext = GetHttpContext();
+            var memoryStream = new MemoryStream();
+            httpContext.Response.Body = memoryStream;
+
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(context);
+            httpContext.Response.Body.Position = 0;
+
+            // Assert
+            var contents = await new StreamReader(httpContext.Response.Body).ReadToEndAsync();
+            Assert.Equal("FilePathResultTestFile contents¡", contents);
+            Mock.Get(result.FileProvider).Verify();
+        }
+
+        [Theory]
+        [InlineData("~/FilePathResultTestFile.txt")]
+        [InlineData("~/TestFiles/FilePathResultTestFile.txt")]
+        [InlineData("~/TestFiles/../FilePathResultTestFile.txt")]
+        [InlineData("~/TestFiles\\..\\FilePathResultTestFile.txt")]
+        [InlineData(@"~~~~\\..//?>~<|""&@#\c:\..\? /..txt~~~")]
+        public async Task ExecuteResultAsync_TrimsTilde_BeforeInvokingFileProvider(string path)
+        {
+            // Arrange
+            var expectedPath = path.Substring(1);
+            var result = new TestVirtualFileResult(path, "text/plain")
+            {
+                FileProvider = GetFileProvider(expectedPath),
+            };
+            var httpContext = GetHttpContext();
+            var memoryStream = new MemoryStream();
+            httpContext.Response.Body = memoryStream;
+
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            // Act
+            await result.ExecuteResultAsync(context);
+            httpContext.Response.Body.Position = 0;
+
+            // Assert
+            var contents = await new StreamReader(httpContext.Response.Body).ReadToEndAsync();
+            Assert.Equal("FilePathResultTestFile contents¡", contents);
+            Mock.Get(result.FileProvider).Verify();
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_WorksWithNonDiskBasedFiles()
+        {
+            // Arrange
+            var httpContext = GetHttpContext(typeof(VirtualFileResultExecutor));
+            httpContext.Response.Body = new MemoryStream();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var expectedData = "This is an embedded resource";
+            var sourceStream = new MemoryStream(Encoding.UTF8.GetBytes(expectedData));
+
+            var nonDiskFileInfo = new Mock<IFileInfo>();
+            nonDiskFileInfo.SetupGet(fi => fi.Exists).Returns(true);
+            nonDiskFileInfo.SetupGet(fi => fi.PhysicalPath).Returns(() => null); // set null to indicate non-disk file
+            nonDiskFileInfo.Setup(fi => fi.CreateReadStream()).Returns(sourceStream);
+            var nonDiskFileProvider = new Mock<IFileProvider>();
+            nonDiskFileProvider.Setup(fp => fp.GetFileInfo(It.IsAny<string>())).Returns(nonDiskFileInfo.Object);
+
+            var filePathResult = new VirtualFileResult("/SampleEmbeddedFile.txt", "text/plain")
+            {
+                FileProvider = nonDiskFileProvider.Object
+            };
+
+            // Act
+            await filePathResult.ExecuteResultAsync(actionContext);
+
+            // Assert
+            httpContext.Response.Body.Position = 0;
+            var contents = await new StreamReader(httpContext.Response.Body).ReadToEndAsync();
+            Assert.Equal(expectedData, contents);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_ThrowsFileNotFound_IfFileProviderCanNotFindTheFile()
+        {
+            // Arrange
+            var path = "TestPath.txt";
+            var fileInfo = new Mock<IFileInfo>();
+            fileInfo.SetupGet(f => f.Exists).Returns(false);
+            var fileProvider = new Mock<IFileProvider>();
+            fileProvider.Setup(f => f.GetFileInfo(path)).Returns(fileInfo.Object);
+            var filePathResult = new TestVirtualFileResult(path, "text/plain")
+            {
+                FileProvider = fileProvider.Object,
+            };
+
+            var expectedMessage = "Could not find file: " + path;
+            var context = new ActionContext(GetHttpContext(), new RouteData(), new ActionDescriptor());
+
+            // Act
+            var ex = await Assert.ThrowsAsync<FileNotFoundException>(() => filePathResult.ExecuteResultAsync(context));
+
+            // Assert
+            Assert.Equal(expectedMessage, ex.Message);
+            Assert.Equal(path, ex.FileName);
+        }
+
+        private static IServiceCollection CreateServices(Type executorType)
+        {
+            var services = new ServiceCollection();
+
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+
+            services.AddSingleton<IActionResultExecutor<VirtualFileResult>, TestVirtualFileResultExecutor>();
+            if (executorType != null)
+            {
+                services.AddSingleton(typeof(IActionResultExecutor<VirtualFileResult>), executorType);
+            }
+
+            services.AddSingleton<IHostingEnvironment>(hostingEnvironment.Object);
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+
+            return services;
+        }
+
+        private static HttpContext GetHttpContext(Type executorType = null)
+        {
+            var services = CreateServices(executorType);
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = services.BuildServiceProvider();
+
+            return httpContext;
+        }
+
+        private static IFileProvider GetFileProvider(string path)
+        {
+            var fileInfo = new Mock<IFileInfo>();
+            fileInfo.SetupGet(fi => fi.Length).Returns(33);
+            fileInfo.SetupGet(fi => fi.Exists).Returns(true);
+            var lastModified = DateTimeOffset.MinValue.AddDays(1);
+            lastModified = new DateTimeOffset(lastModified.Year, lastModified.Month, lastModified.Day, lastModified.Hour, lastModified.Minute, lastModified.Second, TimeSpan.FromSeconds(0));
+            fileInfo.SetupGet(fi => fi.LastModified).Returns(lastModified);
+            fileInfo.SetupGet(fi => fi.PhysicalPath).Returns(path);
+            var fileProvider = new Mock<IFileProvider>();
+            fileProvider.Setup(fp => fp.GetFileInfo(path))
+                .Returns(fileInfo.Object)
+                .Verifiable();
+
+            return fileProvider.Object;
+        }
+
+        private class TestVirtualFileResult : VirtualFileResult
+        {
+            public TestVirtualFileResult(string filePath, string contentType)
+                : base(filePath, contentType)
+            {
+            }
+
+            public override Task ExecuteResultAsync(ActionContext context)
+            {
+                var executor = (TestVirtualFileResultExecutor)context.HttpContext.RequestServices.GetRequiredService<IActionResultExecutor<VirtualFileResult>>();
+                executor.IsAscii = IsAscii;
+                return executor.ExecuteAsync(context, this);
+            }
+
+            public bool IsAscii { get; set; } = false;
+        }
+
+        private class TestVirtualFileResultExecutor : VirtualFileResultExecutor
+        {
+            public TestVirtualFileResultExecutor(ILoggerFactory loggerFactory, IHostingEnvironment hostingEnvironment)
+                : base(loggerFactory, hostingEnvironment)
+            {
+            }
+
+            public bool IsAscii { get; set; }
+
+            protected override Stream GetFileStream(IFileInfo fileInfo)
+            {
+                if (IsAscii)
+                {
+                    return new MemoryStream(Encoding.ASCII.GetBytes("FilePathResultTestFile contents ASCII encoded"));
+                }
+                else
+                {
+                    return new MemoryStream(Encoding.UTF8.GetBytes("FilePathResultTestFile contents¡"));
+                }
+            }
+        }
+
+        private class TestSendFileFeature : IHttpSendFileFeature
+        {
+            public string Name { get; set; }
+            public long Offset { get; set; }
+            public long? Length { get; set; }
+            public CancellationToken Token { get; set; }
+
+            public Task SendFileAsync(string path, long offset, long? length, CancellationToken cancellation)
+            {
+                Name = path;
+                Offset = offset;
+                Length = length;
+                Token = cancellation;
+
+                return Task.FromResult(0);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/xunit.runner.json b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/xunit.runner.json
new file mode 100644
index 0000000000..1c72a421ad
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/xunit.runner.json
@@ -0,0 +1,3 @@
+{
+  "shadowCopy": false
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs
new file mode 100644
index 0000000000..9bcefed3af
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs
@@ -0,0 +1,290 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Cors.Infrastructure;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Cors
+{
+    public class CorsAuthorizationFilterTest
+    {
+        [Theory]
+        [InlineData("options")]
+        [InlineData("Options")]
+        [InlineData("OPTIONS")]
+        public async Task CaseInsensitive_PreFlightRequest_SuccessfulMatch_WritesHeaders(string preflightRequestMethod)
+        {
+            // Arrange
+            var mockEngine = GetPassingEngine(supportsCredentials:true);
+            var filter = GetFilter(mockEngine);
+
+            var authorizationContext = GetAuthorizationContext(
+                new[] { new FilterDescriptor(filter, FilterScope.Action) },
+                GetRequestHeaders(true),
+                isPreflight: true);
+            authorizationContext.HttpContext.Request.Method = preflightRequestMethod;
+
+            // Act
+            await filter.OnAuthorizationAsync(authorizationContext);
+            await authorizationContext.Result.ExecuteResultAsync(authorizationContext);
+
+            // Assert
+            var response = authorizationContext.HttpContext.Response;
+            Assert.Equal(200, response.StatusCode);
+            Assert.Equal("http://example.com", response.Headers[CorsConstants.AccessControlAllowOrigin]);
+            Assert.Equal("header1,header2", response.Headers[CorsConstants.AccessControlAllowHeaders]);
+
+            // Notice: GET header gets filtered because it is a simple header.
+            Assert.Equal("PUT", response.Headers[CorsConstants.AccessControlAllowMethods]);
+            Assert.Equal("exposed1,exposed2", response.Headers[CorsConstants.AccessControlExposeHeaders]);
+            Assert.Equal("123", response.Headers[CorsConstants.AccessControlMaxAge]);
+            Assert.Equal("true", response.Headers[CorsConstants.AccessControlAllowCredentials]);
+        }
+
+        [Fact]
+        public async Task PreFlight_FailedMatch_Writes200()
+        {
+            // Arrange
+            var mockEngine = GetFailingEngine();
+            var filter = GetFilter(mockEngine);
+
+            var authorizationContext = GetAuthorizationContext(
+                new[] { new FilterDescriptor(filter, FilterScope.Action) },
+                GetRequestHeaders(),
+                isPreflight: true);
+
+            // Act
+            await filter.OnAuthorizationAsync(authorizationContext);
+            await authorizationContext.Result.ExecuteResultAsync(authorizationContext);
+
+            // Assert
+            Assert.Equal(200, authorizationContext.HttpContext.Response.StatusCode);
+            Assert.Empty(authorizationContext.HttpContext.Response.Headers);
+        }
+
+        [Fact]
+        public async Task CorsRequest_SuccessfulMatch_WritesHeaders()
+        {
+            // Arrange
+            var mockEngine = GetPassingEngine(supportsCredentials: true);
+            var filter = GetFilter(mockEngine);
+
+            var authorizationContext = GetAuthorizationContext(
+                new[] { new FilterDescriptor(filter, FilterScope.Action) },
+                GetRequestHeaders(true),
+                isPreflight: true);
+
+            // Act
+            await filter.OnAuthorizationAsync(authorizationContext);
+            await authorizationContext.Result.ExecuteResultAsync(authorizationContext);
+
+            // Assert
+            var response = authorizationContext.HttpContext.Response;
+            Assert.Equal(200, response.StatusCode);
+            Assert.Equal("http://example.com", response.Headers[CorsConstants.AccessControlAllowOrigin]);
+            Assert.Equal("exposed1,exposed2", response.Headers[CorsConstants.AccessControlExposeHeaders]);
+        }
+
+        [Fact]
+        public async Task CorsRequest_FailedMatch_Writes200()
+        {
+            // Arrange
+            var mockEngine = GetFailingEngine();
+            var filter = GetFilter(mockEngine);
+
+            var authorizationContext = GetAuthorizationContext(
+                new[] { new FilterDescriptor(filter, FilterScope.Action) },
+                GetRequestHeaders(),
+                isPreflight: false);
+
+            // Act
+            await filter.OnAuthorizationAsync(authorizationContext);
+
+            // Assert
+            Assert.Equal(200, authorizationContext.HttpContext.Response.StatusCode);
+            Assert.Empty(authorizationContext.HttpContext.Response.Headers);
+        }
+
+        private CorsAuthorizationFilter GetFilter(ICorsService corsService)
+        {
+            var policyProvider = new Mock<ICorsPolicyProvider>();
+            policyProvider
+                .Setup(o => o.GetPolicyAsync(It.IsAny<HttpContext>(), It.IsAny<string>()))
+                .Returns(Task.FromResult(new CorsPolicy()));
+
+            return new CorsAuthorizationFilter(corsService, policyProvider.Object, Mock.Of<ILoggerFactory>())
+            {
+                PolicyName = string.Empty
+            };
+        }
+
+        private AuthorizationFilterContext GetAuthorizationContext(
+            FilterDescriptor[] filterDescriptors,
+            RequestHeaders headers = null,
+            bool isPreflight = false)
+        {
+
+            // HttpContext
+            var httpContext = new DefaultHttpContext();
+            if (headers != null)
+            {
+                httpContext.Request.Headers.Add(CorsConstants.AccessControlRequestHeaders, headers.Headers.Split(','));
+                httpContext.Request.Headers.Add(CorsConstants.AccessControlRequestMethod,  new[] { headers.Method });
+                httpContext.Request.Headers.Add(CorsConstants.AccessControlExposeHeaders, headers.ExposedHeaders.Split(','));
+                httpContext.Request.Headers.Add(CorsConstants.Origin, new[] { headers.Origin });
+            }
+
+            var services = new ServiceCollection();
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+            httpContext.RequestServices = services.BuildServiceProvider();
+
+            var method = isPreflight ? CorsConstants.PreflightHttpMethod : "GET";
+            httpContext.Request.Method = method;
+
+            // AuthorizationFilterContext
+            var actionContext = new ActionContext(
+                httpContext: httpContext,
+                routeData: new RouteData(),
+                actionDescriptor: new ActionDescriptor() { FilterDescriptors = filterDescriptors });
+
+            var authorizationContext = new AuthorizationFilterContext(
+                actionContext,
+                filterDescriptors.Select(filter => filter.Filter).ToList()
+            );
+
+            return authorizationContext;
+        }
+
+        private ICorsService GetFailingEngine()
+        {
+            var mockEngine = new Mock<ICorsService>();
+            var result = GetCorsResult("http://example.com");
+
+            mockEngine
+                .Setup(o => o.EvaluatePolicy(It.IsAny<HttpContext>(), It.IsAny<CorsPolicy>()))
+                .Returns(result);
+            return mockEngine.Object;
+        }
+
+        private ICorsService GetPassingEngine(bool supportsCredentials = false)
+        {
+            var mockEngine = new Mock<ICorsService>();
+            var result = GetCorsResult(
+                "http://example.com",
+                new List<string> { "header1", "header2" },
+                new List<string> { "PUT" },
+                new List<string> { "exposed1", "exposed2" },
+                123,
+                supportsCredentials);
+
+            mockEngine
+                .Setup(o => o.EvaluatePolicy(It.IsAny<HttpContext>(), It.IsAny<CorsPolicy>()))
+                .Returns(result);
+
+            mockEngine
+                .Setup(o => o.ApplyResult(It.IsAny<CorsResult>(), It.IsAny<HttpResponse>()))
+                .Callback<CorsResult, HttpResponse>((result1, response1) =>
+                {
+                    var headers = response1.Headers;
+                    headers[CorsConstants.AccessControlMaxAge] =
+                        result1.PreflightMaxAge.Value.TotalSeconds.ToString();
+                    headers[CorsConstants.AccessControlAllowOrigin] = result1.AllowedOrigin;
+                    if (result1.SupportsCredentials)
+                    {
+                        headers.Add(CorsConstants.AccessControlAllowCredentials, new[] { "true" });
+                    }
+
+                    headers.Add(CorsConstants.AccessControlAllowHeaders, result1.AllowedHeaders.ToArray());
+                    headers.Add(CorsConstants.AccessControlAllowMethods, result1.AllowedMethods.ToArray());
+                    headers.Add(CorsConstants.AccessControlExposeHeaders, result1.AllowedExposedHeaders.ToArray());
+                });
+
+            return mockEngine.Object;
+        }
+
+        private RequestHeaders GetRequestHeaders(bool supportsCredentials = false)
+        {
+            return new RequestHeaders
+            {
+                Origin = "http://example.com",
+                Headers = "header1,header2",
+                Method = "GET",
+                ExposedHeaders = "exposed1,exposed2",
+            };
+        }
+
+        private CorsResult GetCorsResult(
+            string origin = null,
+            IList<string> headers = null,
+            IList<string> methods = null,
+            IList<string> exposedHeaders = null,
+            long? preFlightMaxAge = null,
+            bool? supportsCredentials = null)
+        {
+            var result = new CorsResult();
+
+            if (origin != null)
+            {
+                result.AllowedOrigin = origin;
+            }
+
+            if (headers != null)
+            {
+                AddRange(result.AllowedHeaders, headers);
+            }
+
+            if (methods != null)
+            {
+                AddRange(result.AllowedMethods, methods);
+            }
+
+            if (exposedHeaders != null)
+            {
+                AddRange(result.AllowedExposedHeaders, exposedHeaders);
+            }
+
+            if (preFlightMaxAge != null)
+            {
+                result.PreflightMaxAge = TimeSpan.FromSeconds(preFlightMaxAge.Value);
+            }
+
+            if (supportsCredentials != null)
+            {
+                result.SupportsCredentials = supportsCredentials.Value;
+            }
+
+            return result;
+        }
+
+        private void AddRange(IList<string> target, IList<string> source)
+        {
+            foreach (var item in source)
+            {
+                target.Add(item);
+            }
+        }
+
+        private class RequestHeaders
+        {
+            public string Origin { get; set; }
+
+            public string Headers { get; set; }
+
+            public string ExposedHeaders { get; set; }
+
+            public string Method { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/DisableCorsAuthorizationFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/DisableCorsAuthorizationFilterTest.cs
new file mode 100644
index 0000000000..5584abad3b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/DisableCorsAuthorizationFilterTest.cs
@@ -0,0 +1,80 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Cors.Infrastructure;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Cors.Internal;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Cors
+{
+    public class DisableCorsAuthorizationFilterTest
+    {
+        [Fact]
+        public async Task DisableCors_DoesNotShortCircuitsRequest_IfNotAPreflightRequest()
+        {
+            // Arrange
+            var filter = new DisableCorsAuthorizationFilter();
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Method = "GET";
+            httpContext.Request.Headers.Add(CorsConstants.Origin, "http://localhost:5000/");
+            httpContext.Request.Headers.Add(CorsConstants.AccessControlRequestMethod, "PUT");
+            var authorizationFilterContext = new AuthorizationFilterContext(
+                new ActionContext(httpContext, new RouteData(), new ActionDescriptor()),
+                new List<IFilterMetadata>());
+
+            // Act
+            await filter.OnAuthorizationAsync(authorizationFilterContext);
+
+            // Assert
+            Assert.Null(authorizationFilterContext.Result);
+        }
+
+        [Fact]
+        public async Task DisableCors_DoesNotShortCircuitsRequest_IfNoAccessControlRequestMethodFound()
+        {
+            // Arrange
+            var filter = new DisableCorsAuthorizationFilter();
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Method = "OPTIONS";
+            httpContext.Request.Headers.Add(CorsConstants.Origin, "http://localhost:5000/");
+            var authorizationFilterContext = new AuthorizationFilterContext(
+                new ActionContext(httpContext, new RouteData(), new ActionDescriptor()),
+                new List<IFilterMetadata>());
+
+            // Act
+            await filter.OnAuthorizationAsync(authorizationFilterContext);
+
+            // Assert
+            Assert.Null(authorizationFilterContext.Result);
+        }
+
+        [Theory]
+        [InlineData("OpTions")]
+        [InlineData("OPTIONS")]
+        public async Task DisableCors_CaseInsensitivePreflightMethod_ShortCircuitsRequest(string preflightMethod)
+        {
+            // Arrange
+            var filter = new DisableCorsAuthorizationFilter();
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Method = preflightMethod;
+            httpContext.Request.Headers.Add(CorsConstants.Origin, "http://localhost:5000/");
+            httpContext.Request.Headers.Add(CorsConstants.AccessControlRequestMethod, "PUT");
+            var authorizationFilterContext = new AuthorizationFilterContext(
+                new ActionContext(httpContext, new RouteData(), new ActionDescriptor()),
+                new List<IFilterMetadata>());
+
+            // Act
+            await filter.OnAuthorizationAsync(authorizationFilterContext);
+
+            // Assert
+            var statusCodeResult = Assert.IsType<StatusCodeResult>(authorizationFilterContext.Result);
+            Assert.Equal(StatusCodes.Status200OK, statusCodeResult.StatusCode);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Internal/CorsApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Internal/CorsApplicationModelProviderTest.cs
new file mode 100644
index 0000000000..3b9ab90213
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Internal/CorsApplicationModelProviderTest.cs
@@ -0,0 +1,300 @@
+// 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.
+
+using System;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Cors.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Cors.Internal
+{
+    public class CorsApplicationModelProviderTest
+    {
+        [Fact]
+        public void CreateControllerModel_EnableCorsAttributeAddsCorsAuthorizationFilterFactory()
+        {
+            // Arrange
+            var corsProvider = new CorsApplicationModelProvider();
+            var context = GetProviderContext(typeof(CorsController));
+
+            // Act
+            corsProvider.OnProvidersExecuting(context);
+
+            // Assert
+            var model = Assert.Single(context.Result.Controllers);
+            Assert.Single(model.Filters, f => f is CorsAuthorizationFilterFactory);
+            var action = Assert.Single(model.Actions);
+            var selector = Assert.Single(action.Selectors);
+            var constraint = Assert.Single(selector.ActionConstraints, c => c is HttpMethodActionConstraint);
+            Assert.IsType<CorsHttpMethodActionConstraint>(constraint);
+        }
+
+        [Fact]
+        public void CreateControllerModel_DisableCorsAttributeAddsDisableCorsAuthorizationFilter()
+        {
+            // Arrange
+            var corsProvider = new CorsApplicationModelProvider();
+            var context = GetProviderContext(typeof(DisableCorsController));
+
+            // Act
+            corsProvider.OnProvidersExecuting(context);
+
+            // Assert
+            var model = Assert.Single(context.Result.Controllers);
+            Assert.Single(model.Filters, f => f is DisableCorsAuthorizationFilter);
+            var action = Assert.Single(model.Actions);
+            var selector = Assert.Single(action.Selectors);
+            var constraint = Assert.Single(selector.ActionConstraints, c => c is HttpMethodActionConstraint);
+            Assert.IsType<CorsHttpMethodActionConstraint>(constraint);
+        }
+
+        [Fact]
+        public void CreateControllerModel_CustomCorsFilter_ReplacesHttpConstraints()
+        {
+            // Arrange
+            var corsProvider = new CorsApplicationModelProvider();
+            var context = GetProviderContext(typeof(CustomCorsFilterController));
+
+            // Act
+            corsProvider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controller.Actions);
+            var selector = Assert.Single(action.Selectors);
+            var constraint = Assert.Single(selector.ActionConstraints, c => c is HttpMethodActionConstraint);
+            Assert.IsType<CorsHttpMethodActionConstraint>(constraint);
+        }
+
+        [Fact]
+        public void BuildActionModel_EnableCorsAttributeAddsCorsAuthorizationFilterFactory()
+        {
+            // Arrange
+            var corsProvider = new CorsApplicationModelProvider();
+            var context = GetProviderContext(typeof(EnableCorsController));
+
+            // Act
+            corsProvider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controller.Actions);
+            Assert.Single(action.Filters, f => f is CorsAuthorizationFilterFactory);
+            var selector = Assert.Single(action.Selectors);
+            var constraint = Assert.Single(selector.ActionConstraints, c => c is HttpMethodActionConstraint);
+            Assert.IsType<CorsHttpMethodActionConstraint>(constraint);
+        }
+
+        [Fact]
+        public void BuildActionModel_DisableCorsAttributeAddsDisableCorsAuthorizationFilter()
+        {
+            // Arrange
+            var corsProvider = new CorsApplicationModelProvider();
+            var context = GetProviderContext(typeof(DisableCorsActionController));
+
+            // Act
+            corsProvider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controller.Actions);
+            Assert.Contains(action.Filters, f => f is DisableCorsAuthorizationFilter);
+            var selector = Assert.Single(action.Selectors);
+            var constraint = Assert.Single(selector.ActionConstraints, c => c is HttpMethodActionConstraint);
+            Assert.IsType<CorsHttpMethodActionConstraint>(constraint);
+        }
+
+        [Fact]
+        public void BuildActionModel_CustomCorsAuthorizationFilterOnAction_ReplacesHttpConstraints()
+        {
+            // Arrange
+            var corsProvider = new CorsApplicationModelProvider();
+            var context = GetProviderContext(typeof(CustomCorsFilterOnActionController));
+
+            // Act
+            corsProvider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(controller.Actions);
+            var selector = Assert.Single(action.Selectors);
+            var constraint = Assert.Single(selector.ActionConstraints, c => c is HttpMethodActionConstraint);
+            Assert.IsType<CorsHttpMethodActionConstraint>(constraint);
+        }
+
+        [Fact]
+        public void CreateControllerModel_EnableCorsGloballyReplacesHttpMethodConstraints()
+        {
+            // Arrange
+            var corsProvider = new CorsApplicationModelProvider();
+            var context = GetProviderContext(typeof(RegularController));
+
+            context.Result.Filters.Add(
+                new CorsAuthorizationFilter(Mock.Of<ICorsService>(), Mock.Of<ICorsPolicyProvider>(), Mock.Of<ILoggerFactory>()));
+
+            // Act
+            corsProvider.OnProvidersExecuting(context);
+
+            // Assert
+            var model = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(model.Actions);
+            var selector = Assert.Single(action.Selectors);
+            var constraint = Assert.Single(selector.ActionConstraints, c => c is HttpMethodActionConstraint);
+            Assert.IsType<CorsHttpMethodActionConstraint>(constraint);
+        }
+
+        [Fact]
+        public void CreateControllerModel_DisableCorsGloballyReplacesHttpMethodConstraints()
+        {
+            // Arrange
+            var corsProvider = new CorsApplicationModelProvider();
+            var context = GetProviderContext(typeof(RegularController));
+            context.Result.Filters.Add(new DisableCorsAuthorizationFilter());
+
+            // Act
+            corsProvider.OnProvidersExecuting(context);
+
+            // Assert
+            var model = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(model.Actions);
+            var selector = Assert.Single(action.Selectors);
+            var constraint = Assert.Single(selector.ActionConstraints, c => c is HttpMethodActionConstraint);
+            Assert.IsType<CorsHttpMethodActionConstraint>(constraint);
+        }
+
+        [Fact]
+        public void CreateControllerModel_CustomCorsFilterGloballyReplacesHttpMethodConstraints()
+        {
+            // Arrange
+            var corsProvider = new CorsApplicationModelProvider();
+            var context = GetProviderContext(typeof(RegularController));
+            context.Result.Filters.Add(new CustomCorsFilterAttribute());
+
+            // Act
+            corsProvider.OnProvidersExecuting(context);
+
+            // Assert
+            var model = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(model.Actions);
+            var selector = Assert.Single(action.Selectors);
+            var constraint = Assert.Single(selector.ActionConstraints, c => c is HttpMethodActionConstraint);
+            Assert.IsType<CorsHttpMethodActionConstraint>(constraint);
+        }
+
+        [Fact]
+        public void CreateControllerModel_CorsNotInUseDoesNotOverrideHttpConstraints()
+        {
+            // Arrange
+            var corsProvider = new CorsApplicationModelProvider();
+            var context = GetProviderContext(typeof(RegularController));
+
+            // Act
+            corsProvider.OnProvidersExecuting(context);
+
+            // Assert
+            var model = Assert.Single(context.Result.Controllers);
+            var action = Assert.Single(model.Actions);
+            var selector = Assert.Single(action.Selectors);
+            var constraint = Assert.Single(selector.ActionConstraints, c => c is HttpMethodActionConstraint);
+            Assert.IsNotType<CorsHttpMethodActionConstraint>(constraint);
+        }
+
+        private static ApplicationModelProviderContext GetProviderContext(Type controllerType)
+        {
+            var context = new ApplicationModelProviderContext(new[] { controllerType.GetTypeInfo() });
+            var provider = new DefaultApplicationModelProvider(
+                Options.Create(new MvcOptions()),
+                TestModelMetadataProvider.CreateDefaultProvider());
+            provider.OnProvidersExecuting(context);
+
+            return context;
+        }
+
+        private class EnableCorsController
+        {
+            [EnableCors("policy")]
+            [HttpGet]
+            public IActionResult Action()
+            {
+                return null;
+            }
+        }
+
+        private class DisableCorsActionController
+        {
+            [DisableCors]
+            [HttpGet]
+            public void Action()
+            {
+            }
+        }
+
+        [EnableCors("policy")]
+        public class CorsController
+        {
+            [HttpGet]
+            public IActionResult Action()
+            {
+                return null;
+            }
+        }
+
+        [DisableCors]
+        public class DisableCorsController
+        {
+            [HttpOptions]
+            public IActionResult Action()
+            {
+                return null;
+            }
+        }
+
+        public class RegularController
+        {
+            [HttpPost]
+            public IActionResult Action()
+            {
+                return null;
+            }
+        }
+
+        [CustomCorsFilter]
+        public class CustomCorsFilterController
+        {
+            [HttpPost]
+            public IActionResult Action()
+            {
+                return null;
+            }
+        }
+
+        public class CustomCorsFilterOnActionController
+        {
+            [HttpPost]
+            [CustomCorsFilter]
+            public IActionResult Action()
+            {
+                return null;
+            }
+        }
+
+        public class CustomCorsFilterAttribute : Attribute, ICorsAuthorizationFilter
+        {
+            public int Order { get; } = 1000;
+
+            public Task OnAuthorizationAsync(AuthorizationFilterContext context)
+            {
+                return Task.FromResult(0);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Internal/CorsHttpMethodActionConstraintTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Internal/CorsHttpMethodActionConstraintTest.cs
new file mode 100644
index 0000000000..b8ba11f04f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Internal/CorsHttpMethodActionConstraintTest.cs
@@ -0,0 +1,108 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Cors.Internal
+{
+    public class CorsHttpMethodActionConstraintTest
+    {
+        public static TheoryData AcceptCaseInsensitiveData =
+            new TheoryData<IEnumerable<string>, string>
+            {
+                { new string[] { "get", "Get", "GET", "GEt"}, "gEt" },
+                { new string[] { "POST", "PoSt", "GEt"}, "GET" },
+                { new string[] { "get" }, "get" },
+                { new string[] { "post" }, "POST" },
+                { new string[] { "gEt" }, "get" },
+                { new string[] { "get", "PoST" }, "pOSt" }
+            };
+
+        [Theory]
+        [MemberData(nameof(AcceptCaseInsensitiveData))]
+        public void HttpMethodActionConstraint_Accept_Preflight_CaseInsensitive(IEnumerable<string> httpMethods, string accessControlMethod)
+        {
+            // Arrange
+            var constraint = new CorsHttpMethodActionConstraint(new HttpMethodActionConstraint(httpMethods)) as IActionConstraint;
+            var context = CreateActionConstraintContext(constraint);
+            context.RouteContext = CreateRouteContext("oPtIoNs", accessControlMethod);
+
+            // Act
+            var result = constraint.Accept(context);
+
+            // Assert
+            Assert.True(result, "Request should have been accepted.");
+        }
+
+        [Fact]
+        public void HttpMethodActionConstraint_RejectsOptionsRequest_WithoutAccessControlMethod()
+        {
+            // Arrange
+            var constraint = new CorsHttpMethodActionConstraint(new HttpMethodActionConstraint(new[] { "GET", "Post" })) as IActionConstraint;
+            var context = CreateActionConstraintContext(constraint);
+            context.RouteContext = CreateRouteContext("oPtIoNs", accessControlMethod: "");
+
+            // Act
+            var result = constraint.Accept(context);
+
+            // Assert
+            Assert.False(result, "Request should have been rejected.");
+        }
+
+        [Theory]
+        [MemberData(nameof(AcceptCaseInsensitiveData))]
+        public void HttpMethodActionConstraint_Accept_CaseInsensitive(IEnumerable<string> httpMethods, string expectedMethod)
+        {
+            // Arrange
+            var constraint = new CorsHttpMethodActionConstraint(new HttpMethodActionConstraint(httpMethods)) as IActionConstraint;
+            var context = CreateActionConstraintContext(constraint);
+            context.RouteContext = CreateRouteContext(expectedMethod);
+
+            // Act
+            var result = constraint.Accept(context);
+
+            // Assert
+            Assert.True(result, "Request should have been accepted.");
+        }
+
+        private static ActionConstraintContext CreateActionConstraintContext(IActionConstraint constraint)
+        {
+            var context = new ActionConstraintContext();
+
+            var actionSelectorCandidate = new ActionSelectorCandidate(new ActionDescriptor(), new List<IActionConstraint> { constraint });
+
+            context.Candidates = new List<ActionSelectorCandidate> { actionSelectorCandidate };
+            context.CurrentCandidate = context.Candidates[0];
+
+            return context;
+        }
+
+        private static RouteContext CreateRouteContext(string requestedMethod, string accessControlMethod = null)
+        {
+            var httpContext = new DefaultHttpContext();
+
+            httpContext.Request.Method = requestedMethod;
+
+            if (accessControlMethod != null)
+            {
+                httpContext.Request.Headers.Add("Origin", StringValues.Empty);
+                if (accessControlMethod != string.Empty)
+                {
+                    httpContext.Request.Headers.Add("Access-Control-Request-Method", accessControlMethod);
+                }
+            }
+
+            var routeContext = new RouteContext(httpContext);
+            routeContext.RouteData = new RouteData();
+
+            return routeContext;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj
new file mode 100644
index 0000000000..f73ee9967c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Cors\Microsoft.AspNetCore.Mvc.Cors.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(MicrosoftAspNetCoreHttpPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/CompareAttributeAdapterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/CompareAttributeAdapterTest.cs
new file mode 100644
index 0000000000..8466b511fb
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/CompareAttributeAdapterTest.cs
@@ -0,0 +1,260 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.Extensions.Localization;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class CompareAttributeAdapterTest
+    {
+        [Fact]
+        [ReplaceCulture]
+        public void ClientRulesWithCompareAttribute_ErrorMessageUsesDisplayName_WithoutLocalizer()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = metadataProvider.GetMetadataForProperty(typeof(PropertyDisplayNameModel), "MyProperty");
+
+            var attribute = new CompareAttribute("OtherProperty");
+            var adapter = new CompareAttributeAdapter(attribute, stringLocalizer: null);
+
+            // Mono issue - https://github.com/aspnet/External/issues/19
+            var expectedMessage = PlatformNormalizer.NormalizeContent(
+                    "'MyPropertyDisplayName' and 'OtherPropertyDisplayName' do not match.");
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(
+                actionContext,
+                metadata,
+                metadataProvider,
+                new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-equalto", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); },
+                kvp =>
+                {
+                    Assert.Equal("data-val-equalto-other", kvp.Key);
+                    Assert.Equal("*.OtherProperty", kvp.Value);
+                });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void ClientRulesWithCompareAttribute_ErrorMessageUsesDisplayName()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = metadataProvider.GetMetadataForProperty(typeof(PropertyDisplayNameModel), "MyProperty");
+
+            var attribute = new CompareAttribute("OtherProperty");
+            attribute.ErrorMessage = "CompareAttributeErrorMessage";
+
+            var stringLocalizer = new Mock<IStringLocalizer>();
+            var expectedProperties = new object[] { "MyPropertyDisplayName", "OtherPropertyDisplayName" };
+
+            var expectedMessage = "'MyPropertyDisplayName' and 'OtherPropertyDisplayName' do not match.";
+
+            stringLocalizer.Setup(s => s[attribute.ErrorMessage, expectedProperties])
+                .Returns(new LocalizedString(attribute.ErrorMessage, expectedMessage));
+
+            var adapter = new CompareAttributeAdapter(attribute, stringLocalizer: stringLocalizer.Object);
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(
+                actionContext,
+                metadata,
+                metadataProvider,
+                new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-equalto", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); },
+                kvp =>
+                {
+                    Assert.Equal("data-val-equalto-other", kvp.Key);
+                    Assert.Equal("*.OtherProperty", kvp.Value);
+                });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void ClientRulesWithCompareAttribute_ErrorMessageUsesPropertyName()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = metadataProvider.GetMetadataForProperty(typeof(PropertyNameModel), "MyProperty");
+
+            var attribute = new CompareAttribute("OtherProperty");
+            var adapter = new CompareAttributeAdapter(attribute, stringLocalizer: null);
+
+            // Mono issue - https://github.com/aspnet/External/issues/19
+            var expectedMessage = PlatformNormalizer.NormalizeContent("'MyProperty' and 'OtherProperty' do not match.");
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(
+                actionContext,
+                metadata,
+                metadataProvider,
+                new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-equalto", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); },
+                kvp =>
+                {
+                    Assert.Equal("data-val-equalto-other", kvp.Key);
+                    Assert.Equal("*.OtherProperty", kvp.Value);
+                });
+        }
+
+        [Fact]
+        public void ClientRulesWithCompareAttribute_ErrorMessageUsesOverride()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = metadataProvider.GetMetadataForProperty(typeof(PropertyNameModel), "MyProperty");
+
+            var attribute = new CompareAttribute("OtherProperty")
+            {
+                ErrorMessage = "Hello '{0}', goodbye '{1}'."
+            };
+            var adapter = new CompareAttributeAdapter(attribute, stringLocalizer: null);
+
+            var expectedMessage = "Hello 'MyProperty', goodbye 'OtherProperty'.";
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(
+                actionContext,
+                metadata,
+                metadataProvider,
+                new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-equalto", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); },
+                kvp =>
+                {
+                    Assert.Equal("data-val-equalto-other", kvp.Key);
+                    Assert.Equal("*.OtherProperty", kvp.Value);
+                });
+        }
+
+        [ConditionalFact]
+        // ValidationAttribute in Mono does not read non-public resx properties.
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public void ClientRulesWithCompareAttribute_ErrorMessageUsesResourceOverride()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = metadataProvider.GetMetadataForProperty(typeof(PropertyNameModel), "MyProperty");
+
+            var attribute = new CompareAttribute("OtherProperty")
+            {
+                ErrorMessageResourceName = "CompareAttributeTestResource",
+                ErrorMessageResourceType = typeof(DataAnnotations.Test.Resources),
+            };
+            var adapter = new CompareAttributeAdapter(attribute, stringLocalizer: null);
+
+            var expectedMessage = "Comparing MyProperty to OtherProperty.";
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(
+                actionContext,
+                metadata,
+                metadataProvider,
+                new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-equalto", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); },
+                kvp =>
+                {
+                    Assert.Equal("data-val-equalto-other", kvp.Key);
+                    Assert.Equal("*.OtherProperty", kvp.Value);
+                });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_DoesNotTrounceExistingAttributes()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = metadataProvider.GetMetadataForProperty(typeof(PropertyNameModel), "MyProperty");
+
+            var attribute = new CompareAttribute("OtherProperty");
+            var adapter = new CompareAttributeAdapter(attribute, stringLocalizer: null);
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(
+                actionContext,
+                metadata,
+                metadataProvider,
+                new AttributeDictionary());
+
+            context.Attributes.Add("data-val", "original");
+            context.Attributes.Add("data-val-equalto", "original");
+            context.Attributes.Add("data-val-equalto-other", "original");
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("original", kvp.Value); },
+                kvp => { Assert.Equal("data-val-equalto", kvp.Key); Assert.Equal("original", kvp.Value); },
+                kvp => { Assert.Equal("data-val-equalto-other", kvp.Key); Assert.Equal("original", kvp.Value); });
+        }
+
+        private class PropertyDisplayNameModel
+        {
+            [Display(Name = "MyPropertyDisplayName")]
+            public string MyProperty { get; set; }
+
+            [Display(Name = "OtherPropertyDisplayName")]
+            public string OtherProperty { get; set; }
+        }
+
+        private class PropertyNameModel
+        {
+            public string MyProperty { get; set; }
+
+            public string OtherProperty { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsClientModelValidatorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsClientModelValidatorProviderTest.cs
new file mode 100644
index 0000000000..a5b00aba19
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsClientModelValidatorProviderTest.cs
@@ -0,0 +1,162 @@
+// 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.
+
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class DataAnnotationsClientModelValidatorProviderTest
+    {
+        private readonly IModelMetadataProvider _metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+        [Fact]
+        public void CreateValidators_AddsRequiredAttribute_ForIsRequiredTrue()
+        {
+            // Arrange
+            var provider = new DataAnnotationsClientModelValidatorProvider(
+                new ValidationAttributeAdapterProvider(),
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var metadata = _metadataProvider.GetMetadataForProperty(
+                typeof(DummyRequiredAttributeHelperClass),
+                nameof(DummyRequiredAttributeHelperClass.ValueTypeWithoutAttribute));
+
+            var providerContext = new ClientValidatorProviderContext(metadata, GetValidatorItems(metadata));
+
+            // Act
+            provider.CreateValidators(providerContext);
+
+            // Assert
+            var validatorItem = Assert.Single(providerContext.Results);
+            Assert.IsType<RequiredAttributeAdapter>(validatorItem.Validator);
+        }
+
+        [Fact]
+        public void CreateValidators_DoesNotAddDuplicateRequiredAttribute_ForIsRequiredTrue()
+        {
+            // Arrange
+            var provider = new DataAnnotationsClientModelValidatorProvider(
+                new ValidationAttributeAdapterProvider(),
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var metadata = _metadataProvider.GetMetadataForProperty(
+                typeof(DummyRequiredAttributeHelperClass),
+                nameof(DummyRequiredAttributeHelperClass.ValueTypeWithoutAttribute));
+
+            var items = GetValidatorItems(metadata);
+            var expectedValidatorItem = new ClientValidatorItem
+            {
+                Validator = new RequiredAttributeAdapter(new RequiredAttribute(), stringLocalizer: null),
+                IsReusable = true
+            };
+            items.Add(expectedValidatorItem);
+
+            var providerContext = new ClientValidatorProviderContext(metadata, items);
+
+            // Act
+            provider.CreateValidators(providerContext);
+
+            // Assert
+            var validatorItem = Assert.Single(providerContext.Results);
+            Assert.Same(expectedValidatorItem.Validator, validatorItem.Validator);
+        }
+
+        [Fact]
+        public void CreateValidators_DoesNotAddRequiredAttribute_ForIsRequiredFalse()
+        {
+            // Arrange
+            var provider = new DataAnnotationsClientModelValidatorProvider(
+                new ValidationAttributeAdapterProvider(),
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var metadata = _metadataProvider.GetMetadataForProperty(
+                typeof(DummyRequiredAttributeHelperClass),
+                nameof(DummyRequiredAttributeHelperClass.ReferenceTypeWithoutAttribute));
+
+            var providerContext = new ClientValidatorProviderContext(metadata, GetValidatorItems(metadata));
+
+            // Act
+            provider.CreateValidators(providerContext);
+
+            // Assert
+            Assert.Empty(providerContext.Results);
+        }
+
+        [Fact]
+        public void CreateValidators_DoesNotAddExtraRequiredAttribute_IfAttributeIsSpecifiedExplicitly()
+        {
+            // Arrange
+            var provider = new DataAnnotationsClientModelValidatorProvider(
+                new ValidationAttributeAdapterProvider(),
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var metadata = _metadataProvider.GetMetadataForProperty(
+                typeof(DummyRequiredAttributeHelperClass),
+                nameof(DummyRequiredAttributeHelperClass.WithAttribute));
+
+            var providerContext = new ClientValidatorProviderContext(metadata, GetValidatorItems(metadata));
+
+            // Act
+            provider.CreateValidators(providerContext);
+
+            // Assert
+            var validatorItem = Assert.Single(providerContext.Results);
+            var adapter = Assert.IsType<RequiredAttributeAdapter>(validatorItem.Validator);
+            Assert.Equal("Custom Required Message", adapter.Attribute.ErrorMessage);
+        }
+
+        [Fact]
+        public void UnknownValidationAttribute_IsNotAddedAsValidator()
+        {
+            // Arrange
+            var provider = new DataAnnotationsClientModelValidatorProvider(
+                new ValidationAttributeAdapterProvider(),
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+            var metadata = _metadataProvider.GetMetadataForType(typeof(DummyClassWithDummyValidationAttribute));
+
+            var providerContext = new ClientValidatorProviderContext(metadata, GetValidatorItems(metadata));
+
+            // Act
+            provider.CreateValidators(providerContext);
+
+            // Assert
+            var validatorItem = Assert.Single(providerContext.Results);
+            Assert.Null(validatorItem.Validator);
+        }
+
+        private IList<ClientValidatorItem> GetValidatorItems(ModelMetadata metadata)
+        {
+            return metadata.ValidatorMetadata.Select(v => new ClientValidatorItem(v)).ToList();
+        }
+
+        private class DummyValidationAttribute : ValidationAttribute
+        {
+        }
+
+        [DummyValidation]
+        private class DummyClassWithDummyValidationAttribute
+        {
+        }
+
+        private class DummyRequiredAttributeHelperClass
+        {
+            [Required(ErrorMessage = "Custom Required Message")]
+            public int WithAttribute { get; set; }
+
+            public int ValueTypeWithoutAttribute { get; set; }
+
+            public string ReferenceTypeWithoutAttribute { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsMetadataProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsMetadataProviderTest.cs
new file mode 100644
index 0000000000..ac90d1f155
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsMetadataProviderTest.cs
@@ -0,0 +1,1461 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class DataAnnotationsMetadataProviderTest
+    {
+        // Includes attributes with a 'simple' effect on display details.
+        public static TheoryData<object, Func<DisplayMetadata, object>, object> DisplayDetailsData
+        {
+            get
+            {
+                return new TheoryData<object, Func<DisplayMetadata, object>, object>
+                {
+                    { new DataTypeAttribute(DataType.Duration), d => d.DataTypeName, DataType.Duration.ToString() },
+
+                    { new DisplayAttribute() { Description = "d" }, d => d.Description(), "d" },
+                    { new DisplayAttribute() { Name = "DN" }, d => d.DisplayName(), "DN" },
+                    { new DisplayAttribute() { Order = 3 }, d => d.Order, 3 },
+                    { new DisplayAttribute() { Prompt = "Enter Value" }, d => d.Placeholder(), "Enter Value" },
+
+                    { new DisplayColumnAttribute("Property"), d => d.SimpleDisplayProperty, "Property" },
+
+                    { new DisplayFormatAttribute() { ConvertEmptyStringToNull = true }, d => d.ConvertEmptyStringToNull, true },
+                    { new DisplayFormatAttribute() { DataFormatString = "{0:G}" }, d => d.DisplayFormatString, "{0:G}" },
+                    {
+                        new DisplayFormatAttribute() { DataFormatString = "{0:G}" },
+                        d => d.DisplayFormatStringProvider(),
+                        "{0:G}"
+                    },
+                    {
+                        new DisplayFormatAttribute() { DataFormatString = "{0:G}", ApplyFormatInEditMode = true },
+                        d => d.EditFormatString,
+                        "{0:G}"
+                    },
+                    {
+                        new DisplayFormatAttribute() { DataFormatString = "{0:G}", ApplyFormatInEditMode = true },
+                        d => d.EditFormatStringProvider(),
+                        "{0:G}"
+                    },
+                    {
+                        new DisplayFormatAttribute() { DataFormatString = "{0:G}", ApplyFormatInEditMode = true },
+                        d => d.HasNonDefaultEditFormat,
+                        true
+                    },
+                    { new DisplayFormatAttribute() { HtmlEncode = false }, d => d.HtmlEncode, false },
+                    { new DisplayFormatAttribute() { NullDisplayText = "(null)" }, d => d.NullDisplayText, "(null)" },
+                    {
+                        new DisplayFormatAttribute() { NullDisplayText = "(null)" },
+                        d => d.NullDisplayTextProvider(),
+                        "(null)"
+                    },
+
+                    { new DisplayNameAttribute("DisplayNameValue"), d => d.DisplayName(), "DisplayNameValue"},
+                    { new HiddenInputAttribute() { DisplayValue = false }, d => d.HideSurroundingHtml, true },
+
+                    { new ScaffoldColumnAttribute(scaffold: false), d => d.ShowForDisplay, false },
+                    { new ScaffoldColumnAttribute(scaffold: false), d => d.ShowForEdit, false },
+
+                    { new UIHintAttribute("hintHint"), d => d.TemplateHint, "hintHint" },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(DisplayDetailsData))]
+        public void CreateDisplayMetadata_SimpleAttributes(
+            object attribute,
+            Func<DisplayMetadata, object> accessor,
+            object expected)
+        {
+            // Arrange
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(new object[] { attribute }));
+
+            // Act
+            provider.CreateDisplayMetadata(context);
+
+            // Assert
+            var value = accessor(context.DisplayMetadata);
+            Assert.Equal(expected, value);
+        }
+
+        [Fact]
+        public void CreateDisplayMetadata_FindsDisplayFormat_FromDataType()
+        {
+            // Arrange
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var dataType = new DataTypeAttribute(DataType.Currency);
+            var displayFormat = dataType.DisplayFormat; // Non-null for DataType.Currency.
+
+            var attributes = new[] { dataType, };
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            // Act
+            provider.CreateDisplayMetadata(context);
+
+            // Assert
+            Assert.Same(displayFormat.DataFormatString, context.DisplayMetadata.DisplayFormatString);
+        }
+
+        [Fact]
+        public void CreateDisplayMetadata_FindsDisplayFormat_OverridingDataType()
+        {
+            // Arrange
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var dataType = new DataTypeAttribute(DataType.Time); // Has a non-null DisplayFormat.
+            var displayFormat = new DisplayFormatAttribute() // But these values override the values from DataType
+            {
+                DataFormatString = "Cool {0}",
+            };
+
+            var attributes = new Attribute[] { dataType, displayFormat, };
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            // Act
+            provider.CreateDisplayMetadata(context);
+
+            // Assert
+            Assert.Same(displayFormat.DataFormatString, context.DisplayMetadata.DisplayFormatString);
+        }
+
+        [Fact]
+        public void CreateBindingMetadata_EditableAttributeFalse_SetsReadOnlyTrue()
+        {
+            // Arrange
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var editable = new EditableAttribute(allowEdit: false);
+
+            var attributes = new Attribute[] { editable };
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var context = new BindingMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.True(context.BindingMetadata.IsReadOnly);
+        }
+
+        [Fact]
+        public void CreateBindingMetadata_EditableAttributeTrue_SetsReadOnlyFalse()
+        {
+            // Arrange
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var editable = new EditableAttribute(allowEdit: true);
+
+            var attributes = new Attribute[] { editable };
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var context = new BindingMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.False(context.BindingMetadata.IsReadOnly);
+        }
+
+        [Fact]
+        public void CreateDisplayMetadata_DisplayAttribute_OverridesDisplayNameAttribute()
+        {
+            // Arrange
+            var localizationOptions = Options.Create(new MvcDataAnnotationsLocalizationOptions());
+
+            var provider = new DataAnnotationsMetadataProvider(
+                localizationOptions,
+                stringLocalizerFactory: null);
+
+            var displayName = new DisplayNameAttribute("DisplayNameAttributeValue");
+            var display = new DisplayAttribute()
+            {
+                Name = "DisplayAttributeValue"
+            };
+
+            var attributes = new Attribute[] { display, displayName };
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            // Act
+            provider.CreateDisplayMetadata(context);
+
+            // Assert
+            Assert.Equal("DisplayAttributeValue", context.DisplayMetadata.DisplayName());
+        }
+
+        [Fact]
+        public void CreateDisplayMetadata_DisplayAttribute_OverridesDisplayNameAttribute_IfNameEmpty()
+        {
+            // Arrange
+            var localizationOptions = Options.Create(new MvcDataAnnotationsLocalizationOptions());
+
+            var provider = new DataAnnotationsMetadataProvider(
+                localizationOptions,
+                stringLocalizerFactory: null);
+
+            var displayName = new DisplayNameAttribute("DisplayNameAttributeValue");
+            var display = new DisplayAttribute()
+            {
+                Name = string.Empty
+            };
+
+            var attributes = new Attribute[] { display, displayName };
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            // Act
+            provider.CreateDisplayMetadata(context);
+
+            // Assert
+            Assert.Equal(string.Empty, context.DisplayMetadata.DisplayName());
+        }
+
+        [Fact]
+        public void CreateDisplayMetadata_DisplayAttribute_DoesNotOverrideDisplayNameAttribute_IfNameNull()
+        {
+            // Arrange
+            var localizationOptions = Options.Create(new MvcDataAnnotationsLocalizationOptions());
+
+            var provider = new DataAnnotationsMetadataProvider(
+                localizationOptions,
+                stringLocalizerFactory: null);
+
+            var displayName = new DisplayNameAttribute("DisplayNameAttributeValue");
+            var display = new DisplayAttribute()
+            {
+                Description = "This is a description"
+            };
+
+            var attributes = new Attribute[] { display, displayName };
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            // Act
+            provider.CreateDisplayMetadata(context);
+
+            // Assert
+            Assert.Equal("DisplayNameAttributeValue", context.DisplayMetadata.DisplayName());
+        }
+
+        [Fact]
+        public void CreateDisplayMetadata_DisplayNameAttribute_LocalizesDisplayName()
+        {
+            // Arrange
+            var sharedLocalizer = new Mock<IStringLocalizer>(MockBehavior.Strict);
+            sharedLocalizer
+                .Setup(s => s["DisplayNameValue"])
+                .Returns(new LocalizedString("DisplayNameValue", "Name from DisplayNameAttribute"));
+
+            var stringLocalizerFactoryMock = new Mock<IStringLocalizerFactory>(MockBehavior.Strict);
+            stringLocalizerFactoryMock
+                .Setup(s => s.Create(typeof(EmptyClass)))
+                .Returns(() => sharedLocalizer.Object);
+
+            var localizationOptions = Options.Create(new MvcDataAnnotationsLocalizationOptions());
+            localizationOptions.Value.DataAnnotationLocalizerProvider = (type, stringLocalizerFactory) =>
+            {
+                return stringLocalizerFactory.Create(typeof(EmptyClass));
+            };
+
+            var provider = new DataAnnotationsMetadataProvider(
+                localizationOptions,
+                stringLocalizerFactory: stringLocalizerFactoryMock.Object);
+
+            var displayName = new DisplayNameAttribute("DisplayNameValue");
+
+            var attributes = new Attribute[] { displayName };
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            // Act
+            provider.CreateDisplayMetadata(context);
+
+            // Assert
+            Assert.Equal("Name from DisplayNameAttribute", context.DisplayMetadata.DisplayName());
+        }
+
+        [Fact]
+        public void CreateDisplayMetadata_DisplayAttribute_NameFromResources_UsesDataAnnotationLocalizerProvider()
+        {
+            // Arrange
+            var sharedLocalizer = new Mock<IStringLocalizer>(MockBehavior.Loose);
+
+            var stringLocalizerFactoryMock = new Mock<IStringLocalizerFactory>(MockBehavior.Strict);
+            stringLocalizerFactoryMock
+                .Setup(s => s.Create(typeof(EmptyClass)))
+                .Returns(() => sharedLocalizer.Object);
+
+            var options = Options.Create(new MvcDataAnnotationsLocalizationOptions());
+            var dataAnnotationLocalizerProviderWasUsed = false;
+            options.Value.DataAnnotationLocalizerProvider = (type, stringLocalizerFactory) =>
+            {
+                dataAnnotationLocalizerProviderWasUsed = true;
+                return stringLocalizerFactory.Create(typeof(EmptyClass));
+            };
+
+            var provider = new DataAnnotationsMetadataProvider(options, stringLocalizerFactoryMock.Object);
+
+            var display = new DisplayAttribute()
+            {
+                Name = "DisplayName"
+            };
+
+            var attributes = new Attribute[] { display };
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            // Act
+            provider.CreateDisplayMetadata(context);
+            context.DisplayMetadata.DisplayName();
+
+            // Assert
+            Assert.True(dataAnnotationLocalizerProviderWasUsed, "DataAnnotationLocalizerProvider wasn't used by DisplayMetadata");
+        }
+
+        // This is IMPORTANT. Product code needs to use GetName() instead of .Name. It's easy to regress.
+        [Fact]
+        public void CreateDisplayMetadata_DisplayAttribute_NameFromResources_NullLocalizer()
+        {
+            // Arrange
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var display = new DisplayAttribute()
+            {
+#if USE_REAL_RESOURCES
+                Name = nameof(Test.Resources.DisplayAttribute_Name),
+                ResourceType = typeof(Test.Resources),
+#else
+                Name = nameof(DataAnnotations.Test.Resources.DisplayAttribute_Name),
+                ResourceType = typeof(TestResources),
+#endif
+            };
+
+            var attributes = new Attribute[] { display };
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            // Act
+            provider.CreateDisplayMetadata(context);
+
+            // Assert
+            Assert.Equal("name from resources", context.DisplayMetadata.DisplayName());
+        }
+
+        // This is IMPORTANT. Product code needs to use GetName() instead of .Name. It's easy to regress.
+        [Fact]
+        public void CreateDisplayMetadata_DisplayAttribute_NameFromResources_WithLocalizer()
+        {
+            // Arrange
+            // Nothing on stringLocalizer should be called
+            var stringLocalizer = new Mock<IStringLocalizer>(MockBehavior.Strict);
+            var stringLocalizerFactory = new Mock<IStringLocalizerFactory>();
+            stringLocalizerFactory
+                .Setup(s => s.Create(It.IsAny<Type>()))
+                .Returns(() => stringLocalizer.Object);
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory.Object);
+
+            var display = new DisplayAttribute()
+            {
+#if USE_REAL_RESOURCES
+                Name = nameof(Test.Resources.DisplayAttribute_Name),
+                ResourceType = typeof(Test.Resources),
+#else
+                Name = nameof(DataAnnotations.Test.Resources.DisplayAttribute_Name),
+                ResourceType = typeof(TestResources),
+#endif
+            };
+
+            var attributes = new Attribute[] { display };
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            // Act
+            provider.CreateDisplayMetadata(context);
+
+            // Assert
+            Assert.Equal("name from resources", context.DisplayMetadata.DisplayName());
+        }
+
+        // This is IMPORTANT. Product code needs to use GetDescription() instead of .Description. It's easy to regress.
+        [Fact]
+        public void CreateDisplayMetadata_DisplayAttribute_DescriptionFromResources_WithLocalizer()
+        {
+            // Arrange
+            // Nothing on stringLocalizer should be called
+            var stringLocalizer = new Mock<IStringLocalizer>(MockBehavior.Strict);
+            var stringLocalizerFactory = new Mock<IStringLocalizerFactory>();
+            stringLocalizerFactory
+                .Setup(s => s.Create(It.IsAny<Type>()))
+                .Returns(() => stringLocalizer.Object);
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory.Object);
+
+            var display = new DisplayAttribute()
+            {
+#if USE_REAL_RESOURCES
+                Description = nameof(Test.Resources.DisplayAttribute_Description),
+                ResourceType = typeof(Test.Resources),
+#else
+                Description = nameof(DataAnnotations.Test.Resources.DisplayAttribute_Description),
+                ResourceType = typeof(TestResources),
+#endif
+            };
+
+            var attributes = new Attribute[] { display };
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            // Act
+            provider.CreateDisplayMetadata(context);
+
+            // Assert
+            Assert.Equal("description from resources", context.DisplayMetadata.Description());
+        }
+
+        // This is IMPORTANT. Product code needs to use GetDescription() instead of .Description. It's easy to regress.
+        [Fact]
+        public void CreateDisplayMetadata_DisplayAttribute_DescriptionFromResources_NullLocalizer()
+        {
+            // Arrange
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var display = new DisplayAttribute()
+            {
+#if USE_REAL_RESOURCES
+                Description = nameof(Test.Resources.DisplayAttribute_Description),
+                ResourceType = typeof(Test.Resources),
+#else
+                Description = nameof(DataAnnotations.Test.Resources.DisplayAttribute_Description),
+                ResourceType = typeof(TestResources),
+#endif
+            };
+
+            var attributes = new Attribute[] { display };
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            // Act
+            provider.CreateDisplayMetadata(context);
+
+            // Assert
+            Assert.Equal("description from resources", context.DisplayMetadata.Description());
+        }
+
+        // This is IMPORTANT. Product code needs to use GetPrompt() instead of .Prompt. It's easy to regress.
+        [Fact]
+        public void CreateDisplayMetadata_DisplayAttribute_PromptFromResources_WithLocalizer()
+        {
+            // Arrange
+            // Nothing on stringLocalizer should be called
+            var stringLocalizer = new Mock<IStringLocalizer>(MockBehavior.Strict);
+            var stringLocalizerFactory = new Mock<IStringLocalizerFactory>();
+            stringLocalizerFactory
+                .Setup(s => s.Create(It.IsAny<Type>()))
+                .Returns(() => stringLocalizer.Object);
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory.Object);
+
+            var display = new DisplayAttribute()
+            {
+#if USE_REAL_RESOURCES
+                Prompt = nameof(Test.Resources.DisplayAttribute_Prompt),
+                ResourceType = typeof(Test.Resources),
+#else
+                Prompt = nameof(DataAnnotations.Test.Resources.DisplayAttribute_Prompt),
+                ResourceType = typeof(TestResources),
+#endif
+            };
+
+            var attributes = new Attribute[] { display };
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            // Act
+            provider.CreateDisplayMetadata(context);
+
+            // Assert
+            Assert.Equal("prompt from resources", context.DisplayMetadata.Placeholder());
+        }
+
+        // This is IMPORTANT. Product code needs to use GetPrompt() instead of .Prompt. It's easy to regress.
+        [Fact]
+        public void CreateDisplayMetadata_DisplayAttribute_PromptFromResources_NullLocalizer()
+        {
+            // Arrange
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var display = new DisplayAttribute()
+            {
+#if USE_REAL_RESOURCES
+                Prompt = nameof(Test.Resources.DisplayAttribute_Prompt),
+                ResourceType = typeof(Test.Resources),
+#else
+                Prompt = nameof(DataAnnotations.Test.Resources.DisplayAttribute_Prompt),
+                ResourceType = typeof(TestResources),
+#endif
+            };
+
+            var attributes = new Attribute[] { display };
+            var key = ModelMetadataIdentity.ForType(typeof(string));
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            // Act
+            provider.CreateDisplayMetadata(context);
+
+            // Assert
+            Assert.Equal("prompt from resources", context.DisplayMetadata.Placeholder());
+        }
+
+        [Fact]
+        public void CreateDisplayMetadata_DisplayAttribute_LocalizeProperties()
+        {
+            // Arrange
+            var stringLocalizer = new Mock<IStringLocalizer>(MockBehavior.Strict);
+            stringLocalizer
+                .Setup(s => s["Model_Name"])
+                .Returns(() => new LocalizedString("Model_Name", "name from localizer " + CultureInfo.CurrentCulture));
+            stringLocalizer
+                .Setup(s => s["Model_Description"])
+                .Returns(() => new LocalizedString("Model_Description", "description from localizer " + CultureInfo.CurrentCulture));
+            stringLocalizer
+                .Setup(s => s["Model_Prompt"])
+                .Returns(() => new LocalizedString("Model_Prompt", "prompt from localizer " + CultureInfo.CurrentCulture));
+
+            var stringLocalizerFactoryMock = new Mock<IStringLocalizerFactory>(MockBehavior.Strict);
+            stringLocalizerFactoryMock
+                .Setup(f => f.Create(It.IsAny<Type>()))
+                .Returns(stringLocalizer.Object);
+
+            var options = Options.Create(new MvcDataAnnotationsLocalizationOptions());
+            options.Value.DataAnnotationLocalizerProvider = (type, stringLocalizerFactory) =>
+            {
+                return stringLocalizerFactory.Create(type);
+            };
+
+            var provider = new DataAnnotationsMetadataProvider(
+                options,
+                stringLocalizerFactoryMock.Object);
+
+            var display = new DisplayAttribute()
+            {
+                Name = "Model_Name",
+                Description = "Model_Description",
+                Prompt = "Model_Prompt"
+            };
+
+            var attributes = new Attribute[] { display };
+            var key = ModelMetadataIdentity.ForType(typeof(DataAnnotationsMetadataProviderTest));
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            // Act
+            provider.CreateDisplayMetadata(context);
+
+            // Assert
+            using (new CultureReplacer("en-US", "en-US"))
+            {
+                Assert.Equal("name from localizer en-US", context.DisplayMetadata.DisplayName());
+                Assert.Equal("description from localizer en-US", context.DisplayMetadata.Description());
+                Assert.Equal("prompt from localizer en-US", context.DisplayMetadata.Placeholder());
+            }
+            using (new CultureReplacer("fr-FR", "fr-FR"))
+            {
+                Assert.Equal("name from localizer fr-FR", context.DisplayMetadata.DisplayName());
+                Assert.Equal("description from localizer fr-FR", context.DisplayMetadata.Description());
+                Assert.Equal("prompt from localizer fr-FR", context.DisplayMetadata.Placeholder());
+            }
+        }
+
+        [Theory]
+        [InlineData(typeof(EmptyClass), false)]
+        [InlineData(typeof(ClassWithFields), false)]
+        [InlineData(typeof(ClassWithProperties), false)]
+        [InlineData(typeof(EmptyEnum), true)]
+        [InlineData(typeof(EmptyEnum?), true)]
+        [InlineData(typeof(EnumWithDisplayNames), true)]
+        [InlineData(typeof(EnumWithDisplayNames?), true)]
+        [InlineData(typeof(EnumWithDuplicates), true)]
+        [InlineData(typeof(EnumWithDuplicates?), true)]
+        [InlineData(typeof(EnumWithFlags), true)]
+        [InlineData(typeof(EnumWithFlags?), true)]
+        [InlineData(typeof(EnumWithFields), true)]
+        [InlineData(typeof(EnumWithFields?), true)]
+        [InlineData(typeof(EmptyStruct), false)]
+        [InlineData(typeof(StructWithFields), false)]
+        [InlineData(typeof(StructWithFields?), false)]
+        [InlineData(typeof(StructWithProperties), false)]
+        public void CreateDisplayMetadata_IsEnum_ReflectsModelType(Type type, bool expectedIsEnum)
+        {
+            // Arrange
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var key = ModelMetadataIdentity.ForType(type);
+            var attributes = new object[0];
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            // Act
+            provider.CreateDisplayMetadata(context);
+
+            // Assert
+            Assert.Equal(expectedIsEnum, context.DisplayMetadata.IsEnum);
+        }
+
+        [Theory]
+        [InlineData(typeof(EmptyClass), false)]
+        [InlineData(typeof(ClassWithFields), false)]
+        [InlineData(typeof(ClassWithProperties), false)]
+        [InlineData(typeof(EmptyEnum), false)]
+        [InlineData(typeof(EmptyEnum?), false)]
+        [InlineData(typeof(EnumWithDisplayNames), false)]
+        [InlineData(typeof(EnumWithDisplayNames?), false)]
+        [InlineData(typeof(EnumWithDuplicates), false)]
+        [InlineData(typeof(EnumWithDuplicates?), false)]
+        [InlineData(typeof(EnumWithFlags), true)]
+        [InlineData(typeof(EnumWithFlags?), true)]
+        [InlineData(typeof(EnumWithFields), false)]
+        [InlineData(typeof(EnumWithFields?), false)]
+        [InlineData(typeof(EmptyStruct), false)]
+        [InlineData(typeof(StructWithFields), false)]
+        [InlineData(typeof(StructWithFields?), false)]
+        [InlineData(typeof(StructWithProperties), false)]
+        public void CreateDisplayMetadata_IsFlagsEnum_ReflectsModelType(Type type, bool expectedIsFlagsEnum)
+        {
+            // Arrange
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var key = ModelMetadataIdentity.ForType(type);
+            var attributes = new object[0];
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            // Act
+            provider.CreateDisplayMetadata(context);
+
+            // Assert
+            Assert.Equal(expectedIsFlagsEnum, context.DisplayMetadata.IsFlagsEnum);
+        }
+
+        // Type -> expected EnumNamesAndValues
+        public static TheoryData<Type, IReadOnlyDictionary<string, string>> EnumNamesData
+        {
+            get
+            {
+                return new TheoryData<Type, IReadOnlyDictionary<string, string>>
+                {
+                    { typeof(ClassWithFields), null },
+                    { typeof(StructWithFields), null },
+                    { typeof(StructWithFields?), null },
+                    { typeof(EmptyEnum), new Dictionary<string, string>() },
+                    { typeof(EmptyEnum?), new Dictionary<string, string>() },
+                    {
+                        typeof(EnumWithDisplayNames),
+                        new Dictionary<string, string>
+                        {
+                            { nameof(EnumWithDisplayNames.MinusTwo), "-2" },
+                            { nameof(EnumWithDisplayNames.MinusOne), "-1" },
+                            { nameof(EnumWithDisplayNames.Zero), "0" },
+                            { nameof(EnumWithDisplayNames.One), "1" },
+                            { nameof(EnumWithDisplayNames.Two), "2" },
+                            { nameof(EnumWithDisplayNames.Three), "3" },
+                        }
+                    },
+                    {
+                        typeof(EnumWithDisplayNames?),
+                        new Dictionary<string, string>
+                        {
+                            { nameof(EnumWithDisplayNames.MinusTwo), "-2" },
+                            { nameof(EnumWithDisplayNames.MinusOne), "-1" },
+                            { nameof(EnumWithDisplayNames.Zero), "0" },
+                            { nameof(EnumWithDisplayNames.One), "1" },
+                            { nameof(EnumWithDisplayNames.Two), "2" },
+                            { nameof(EnumWithDisplayNames.Three), "3" },
+                        }
+                    },
+                    {
+                        typeof(EnumWithDuplicates),
+                        new Dictionary<string, string>
+                        {
+                            { nameof(EnumWithDuplicates.Zero), "0" },
+                            { nameof(EnumWithDuplicates.None), "0" },
+                            { nameof(EnumWithDuplicates.One), "1" },
+                            { nameof(EnumWithDuplicates.Two), "2" },
+                            { nameof(EnumWithDuplicates.Duece), "2" },
+                            { nameof(EnumWithDuplicates.Three), "3" },
+                            { nameof(EnumWithDuplicates.MoreThanTwo), "3" },
+                        }
+                    },
+                    {
+                        typeof(EnumWithDuplicates?),
+                        new Dictionary<string, string>
+                        {
+                            { nameof(EnumWithDuplicates.Zero), "0" },
+                            { nameof(EnumWithDuplicates.None), "0" },
+                            { nameof(EnumWithDuplicates.One), "1" },
+                            { nameof(EnumWithDuplicates.Two), "2" },
+                            { nameof(EnumWithDuplicates.Duece), "2" },
+                            { nameof(EnumWithDuplicates.Three), "3" },
+                            { nameof(EnumWithDuplicates.MoreThanTwo), "3" },
+                        }
+                    },
+                    {
+                        typeof(EnumWithFlags),
+                        new Dictionary<string, string>
+                        {
+                            { nameof(EnumWithFlags.All), "-1" },
+                            { nameof(EnumWithFlags.Zero), "0" },
+                            { nameof(EnumWithFlags.One), "1" },
+                            { nameof(EnumWithFlags.Two), "2" },
+                            { nameof(EnumWithFlags.Four), "4" },
+                        }
+                    },
+                    {
+                        typeof(EnumWithFlags?),
+                        new Dictionary<string, string>
+                        {
+                            { nameof(EnumWithFlags.All), "-1" },
+                            { nameof(EnumWithFlags.Zero), "0" },
+                            { nameof(EnumWithFlags.One), "1" },
+                            { nameof(EnumWithFlags.Two), "2" },
+                            { nameof(EnumWithFlags.Four), "4" },
+                        }
+                    },
+                    {
+                        typeof(EnumWithFields),
+                        new Dictionary<string, string>
+                        {
+                            { nameof(EnumWithFields.MinusTwo), "-2" },
+                            { nameof(EnumWithFields.MinusOne), "-1" },
+                            { nameof(EnumWithFields.Zero), "0" },
+                            { nameof(EnumWithFields.One), "1" },
+                            { nameof(EnumWithFields.Two), "2" },
+                            { nameof(EnumWithFields.Three), "3" },
+                        }
+                    },
+                    {
+                        typeof(EnumWithFields?),
+                        new Dictionary<string, string>
+                        {
+                            { nameof(EnumWithFields.MinusTwo), "-2" },
+                            { nameof(EnumWithFields.MinusOne), "-1" },
+                            { nameof(EnumWithFields.Zero), "0" },
+                            { nameof(EnumWithFields.One), "1" },
+                            { nameof(EnumWithFields.Two), "2" },
+                            { nameof(EnumWithFields.Three), "3" },
+                        }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(EnumNamesData))]
+        public void CreateDisplayMetadata_EnumNamesAndValues_ReflectsModelType(
+            Type type,
+            IReadOnlyDictionary<string, string> expectedDictionary)
+        {
+            // Arrange
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var key = ModelMetadataIdentity.ForType(type);
+            var attributes = new object[0];
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            // Act
+            provider.CreateDisplayMetadata(context);
+
+            // Assert
+            // This assertion does *not* require entry orders to match.
+            Assert.Equal(expectedDictionary, context.DisplayMetadata.EnumNamesAndValues);
+        }
+
+        [Fact]
+        public void CreateDisplayMetadata_DisplayName_LocalizeWithStringLocalizer()
+        {
+            // Arrange
+            var expectedKeyValuePairs = new List<KeyValuePair<EnumGroupAndName, string>>
+            {
+                new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName("Zero", string.Empty), "0"),
+                new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithDisplayNames.One)), "1"),
+                new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, "dos value"), "2"),
+                new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, "tres value"), "3"),
+                new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, "name from resources"), "-2"),
+                new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName("Negatives", "menos uno value"), "-1"),
+            };
+
+            var type = typeof(EnumWithDisplayNames);
+            var attributes = new object[0];
+
+            var key = ModelMetadataIdentity.ForType(type);
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            var stringLocalizer = new Mock<IStringLocalizer>(MockBehavior.Strict);
+            stringLocalizer
+                .Setup(s => s[It.IsAny<string>()])
+                .Returns<string>((index) => new LocalizedString(index, index + " value"));
+
+            var stringLocalizerFactory = new Mock<IStringLocalizerFactory>(MockBehavior.Strict);
+            stringLocalizerFactory
+                .Setup(f => f.Create(It.IsAny<Type>()))
+                .Returns(stringLocalizer.Object);
+
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory.Object);
+
+            // Act
+            provider.CreateDisplayMetadata(context);
+
+            // Assert
+            Assert.Equal(
+                expectedKeyValuePairs,
+                context.DisplayMetadata.EnumGroupedDisplayNamesAndValues,
+                KVPEnumGroupAndNameComparer.Instance);
+        }
+
+        // Type -> expected EnumDisplayNamesAndValues
+        public static TheoryData<Type, IEnumerable<KeyValuePair<EnumGroupAndName, string>>> EnumDisplayNamesData
+        {
+            get
+            {
+                return new TheoryData<Type, IEnumerable<KeyValuePair<EnumGroupAndName, string>>>
+                {
+                    { typeof(ClassWithFields), null },
+                    { typeof(StructWithFields), null },
+                    { typeof(EmptyEnum), new List<KeyValuePair<EnumGroupAndName, string>>() },
+                    { typeof(EmptyEnum?), new List<KeyValuePair<EnumGroupAndName, string>>() },
+                    {
+                        typeof(EnumWithDisplayNames),
+                        new List<KeyValuePair<EnumGroupAndName, string>>
+                        {
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName("Zero", string.Empty), "0"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithDisplayNames.One)), "1"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, "dos"), "2"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, "tres"), "3"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, "name from resources"), "-2"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName("Negatives", "menos uno"), "-1"),
+                        }
+                    },
+                    {
+                        typeof(EnumWithDisplayNames?),
+                        new List<KeyValuePair<EnumGroupAndName, string>>
+                        {
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName("Zero", string.Empty), "0"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithDisplayNames.One)), "1"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, "dos"), "2"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, "tres"), "3"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, "name from resources"), "-2"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName("Negatives", "menos uno"), "-1"),
+                        }
+                    },
+                    {
+                        // Note order duplicates appear cannot be inferred easily e.g. does not match the source.
+                        // Zero is before None but Two is before Duece in the class below.
+                        typeof(EnumWithDuplicates),
+                        new List<KeyValuePair<EnumGroupAndName, string>>
+                        {
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithDuplicates.Zero)), "0"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithDuplicates.None)), "0"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithDuplicates.One)), "1"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithDuplicates.Duece)), "2"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithDuplicates.Two)), "2"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithDuplicates.MoreThanTwo)), "3"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithDuplicates.Three)), "3"),
+                        }
+                    },
+                    {
+                        typeof(EnumWithDuplicates?),
+                        new List<KeyValuePair<EnumGroupAndName, string>>
+                        {
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithDuplicates.Zero)), "0"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithDuplicates.None)), "0"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithDuplicates.One)), "1"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithDuplicates.Duece)), "2"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithDuplicates.Two)), "2"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithDuplicates.MoreThanTwo)), "3"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithDuplicates.Three)), "3"),
+                        }
+                    },
+                    {
+                        typeof(EnumWithFlags),
+                        new List<KeyValuePair<EnumGroupAndName, string>>
+                        {
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.Zero)), "0"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.One)), "1"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.Two)), "2"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.Four)), "4"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.All)), "-1"),
+                        }
+                    },
+                    {
+                        typeof(EnumWithFlags?),
+                        new List<KeyValuePair<EnumGroupAndName, string>>
+                        {
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.Zero)), "0"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.One)), "1"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.Two)), "2"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.Four)), "4"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFlags.All)), "-1"),
+                        }
+                    },
+                    {
+                        typeof(EnumWithFields),
+                        new List<KeyValuePair<EnumGroupAndName, string>>
+                        {
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.Zero)), "0"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.One)), "1"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.Two)), "2"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.Three)), "3"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.MinusTwo)), "-2"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.MinusOne)), "-1"),
+                        }
+                    },
+                    {
+                        typeof(EnumWithFields?),
+                        new List<KeyValuePair<EnumGroupAndName, string>>
+                        {
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.Zero)), "0"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.One)), "1"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.Two)), "2"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.Three)), "3"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.MinusTwo)), "-2"),
+                            new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithFields.MinusOne)), "-1"),
+                        }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(EnumDisplayNamesData))]
+        public void CreateDisplayMetadata_EnumGroupedDisplayNamesAndValues_ReflectsModelType(
+            Type type,
+            IEnumerable<KeyValuePair<EnumGroupAndName, string>> expectedKeyValuePairs)
+        {
+            // Arrange
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var key = ModelMetadataIdentity.ForType(type);
+            var attributes = new object[0];
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            // Act
+            provider.CreateDisplayMetadata(context);
+
+            // Assert
+            Assert.Equal(
+                expectedKeyValuePairs,
+                context.DisplayMetadata.EnumGroupedDisplayNamesAndValues,
+                KVPEnumGroupAndNameComparer.Instance);
+        }
+
+        [Fact]
+        public void CreateDisplayMetadata_EnumGroupedDisplayNamesAndValues_ReflectsDisplayAttributeOrder()
+        {
+            // Arrange
+            var expectedKeyValuePairs = new List<KeyValuePair<EnumGroupAndName, string>>
+            {
+                new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithDisplayOrder.Three)), "2"),
+                new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithDisplayOrder.Two)), "1"),
+                new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithDisplayOrder.One)), "0"),
+                new KeyValuePair<EnumGroupAndName, string>(new EnumGroupAndName(string.Empty, nameof(EnumWithDisplayOrder.Null)), "3"),
+            };
+
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var key = ModelMetadataIdentity.ForType(typeof(EnumWithDisplayOrder));
+            var attributes = new object[0];
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(attributes));
+
+            // Act
+            provider.CreateDisplayMetadata(context);
+
+            // Assert
+            Assert.Equal(
+                expectedKeyValuePairs,
+                context.DisplayMetadata.EnumGroupedDisplayNamesAndValues,
+                KVPEnumGroupAndNameComparer.Instance);
+        }
+
+        [Fact]
+        public void CreateDisplayMetadata_EnumGroupedDisplayNamesAndValues_NameWithNoIStringLocalizerAndNoResourceType()
+        {
+            // Arrange & Act
+            var enumNameAndGroup = GetLocalizedEnumGroupedDisplayNamesAndValues(useStringLocalizer: false);
+
+            // Assert
+            var groupTwo = Assert.Single(enumNameAndGroup, e => e.Value.Equals("2", StringComparison.Ordinal));
+
+            using (new CultureReplacer("en-US", "en-US"))
+            {
+                Assert.Equal("Loc_Two_Name", groupTwo.Key.Name);
+            }
+
+            using (new CultureReplacer("fr-FR", "fr-FR"))
+            {
+                Assert.Equal("Loc_Two_Name", groupTwo.Key.Name);
+            }
+        }
+
+        [Fact]
+        public void CreateDisplayMetadata_EnumGroupedDisplayNamesAndValues_NameWithIStringLocalizerAndNoResourceType()
+        {
+            // Arrange & Act
+            var enumNameAndGroup = GetLocalizedEnumGroupedDisplayNamesAndValues(useStringLocalizer: true);
+
+            // Assert
+            var groupTwo = Assert.Single(enumNameAndGroup, e => e.Value.Equals("2", StringComparison.Ordinal));
+
+            using (new CultureReplacer("en-US", "en-US"))
+            {
+                Assert.Equal("Loc_Two_Name en-US", groupTwo.Key.Name);
+            }
+
+            using (new CultureReplacer("fr-FR", "fr-FR"))
+            {
+                Assert.Equal("Loc_Two_Name fr-FR", groupTwo.Key.Name);
+            }
+        }
+
+        [Fact]
+        public void CreateDisplayMetadata_EnumGroupedDisplayNamesAndValues_NameWithNoIStringLocalizerAndResourceType()
+        {
+            // Arrange & Act
+            var enumNameAndGroup = GetLocalizedEnumGroupedDisplayNamesAndValues(useStringLocalizer: false);
+
+            // Assert
+            var groupThree = Assert.Single(enumNameAndGroup, e => e.Value.Equals("3", StringComparison.Ordinal));
+
+            using (new CultureReplacer("en-US", "en-US"))
+            {
+                Assert.Equal("type three name en-US", groupThree.Key.Name);
+            }
+
+            using (new CultureReplacer("fr-FR", "fr-FR"))
+            {
+                Assert.Equal("type three name fr-FR", groupThree.Key.Name);
+            }
+        }
+
+        [Fact]
+        public void CreateDisplayMetadata_EnumGroupedDisplayNamesAndValues_NameWithIStringLocalizerAndResourceType()
+        {
+            // Arrange & Act
+            var enumNameAndGroup = GetLocalizedEnumGroupedDisplayNamesAndValues(useStringLocalizer: true);
+
+            var groupThree = Assert.Single(enumNameAndGroup, e => e.Value.Equals("3", StringComparison.Ordinal));
+
+            // Assert
+            using (new CultureReplacer("en-US", "en-US"))
+            {
+                Assert.Equal("type three name en-US", groupThree.Key.Name);
+            }
+
+            using (new CultureReplacer("fr-FR", "fr-FR"))
+            {
+                Assert.Equal("type three name fr-FR", groupThree.Key.Name);
+            }
+        }
+
+        [Fact]
+        public void CreateValidationMetadata_RequiredAttribute_SetsIsRequiredToTrue()
+        {
+            // Arrange
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var required = new RequiredAttribute();
+
+            var attributes = new Attribute[] { required };
+            var key = ModelMetadataIdentity.ForProperty(typeof(int), "Length", typeof(string));
+            var context = new ValidationMetadataProviderContext(key, GetModelAttributes(new object[0], attributes));
+
+            // Act
+            provider.CreateValidationMetadata(context);
+
+            // Assert
+            Assert.True(context.ValidationMetadata.IsRequired);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        [InlineData(null)]
+        public void CreateValidationMetadata_NoRequiredAttribute_IsRequiredLeftAlone(bool? initialValue)
+        {
+            // Arrange
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var attributes = new Attribute[] { };
+            var key = ModelMetadataIdentity.ForProperty(typeof(int), "Length", typeof(string));
+            var context = new ValidationMetadataProviderContext(key, GetModelAttributes(new object[0], attributes));
+            context.ValidationMetadata.IsRequired = initialValue;
+
+            // Act
+            provider.CreateValidationMetadata(context);
+
+            // Assert
+            Assert.Equal(initialValue, context.ValidationMetadata.IsRequired);
+        }
+
+        // [Required] has no effect on IsBindingRequired
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void CreateBindingMetadata_RequiredAttribute_IsBindingRequiredLeftAlone(bool initialValue)
+        {
+            // Arrange
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var attributes = new Attribute[] { new RequiredAttribute() };
+            var key = ModelMetadataIdentity.ForProperty(typeof(int), "Length", typeof(string));
+            var context = new BindingMetadataProviderContext(key, GetModelAttributes(new object[0], attributes));
+            context.BindingMetadata.IsBindingRequired = initialValue;
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.Equal(initialValue, context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        [InlineData(null)]
+        public void CreateBindingDetails_NoEditableAttribute_IsReadOnlyLeftAlone(bool? initialValue)
+        {
+            // Arrange
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var attributes = new Attribute[] { };
+            var key = ModelMetadataIdentity.ForProperty(typeof(int), "Length", typeof(string));
+            var context = new BindingMetadataProviderContext(key, GetModelAttributes(new object[0], attributes));
+            context.BindingMetadata.IsReadOnly = initialValue;
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.Equal(initialValue, context.BindingMetadata.IsReadOnly);
+        }
+
+        [Fact]
+        public void CreateValidationDetails_ValidatableObject_ReturnsObject()
+        {
+            // Arrange
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var attribute = new TestValidationAttribute();
+            var attributes = new Attribute[] { attribute };
+            var key = ModelMetadataIdentity.ForProperty(typeof(int), "Length", typeof(string));
+            var context = new ValidationMetadataProviderContext(key, GetModelAttributes(new object[0], attributes));
+
+            // Act
+            provider.CreateValidationMetadata(context);
+
+            // Assert
+            var validatorMetadata = Assert.Single(context.ValidationMetadata.ValidatorMetadata);
+            Assert.Same(attribute, validatorMetadata);
+        }
+
+        [Fact]
+        public void CreateValidationDetails_ValidatableObject_AlreadyInContext_Ignores()
+        {
+            // Arrange
+            var provider = new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+
+            var attribute = new TestValidationAttribute();
+            var attributes = new Attribute[] { attribute };
+            var key = ModelMetadataIdentity.ForProperty(typeof(int), "Length", typeof(string));
+            var context = new ValidationMetadataProviderContext(key, GetModelAttributes(new object[0], attributes));
+            context.ValidationMetadata.ValidatorMetadata.Add(attribute);
+
+            // Act
+            provider.CreateValidationMetadata(context);
+
+            // Assert
+            var validatorMetadata = Assert.Single(context.ValidationMetadata.ValidatorMetadata);
+            Assert.Same(attribute, validatorMetadata);
+        }
+
+        private IEnumerable<KeyValuePair<EnumGroupAndName, string>> GetLocalizedEnumGroupedDisplayNamesAndValues(
+            bool useStringLocalizer)
+        {
+            var provider = CreateIStringLocalizerProvider(useStringLocalizer);
+
+            var key = ModelMetadataIdentity.ForType(typeof(EnumWithLocalizedDisplayNames));
+            var attributes = new object[0];
+
+            var context = new DisplayMetadataProviderContext(key, GetModelAttributes(attributes));
+            provider.CreateDisplayMetadata(context);
+
+            return context.DisplayMetadata.EnumGroupedDisplayNamesAndValues;
+        }
+
+        private DataAnnotationsMetadataProvider CreateIStringLocalizerProvider(bool useStringLocalizer)
+        {
+            var stringLocalizer = new Mock<IStringLocalizer>(MockBehavior.Strict);
+            stringLocalizer
+                .Setup(loc => loc[It.IsAny<string>()])
+                .Returns<string>((k =>
+                {
+                    return new LocalizedString(k, $"{k} {CultureInfo.CurrentCulture}");
+                }));
+
+            var stringLocalizerFactory = new Mock<IStringLocalizerFactory>(MockBehavior.Strict);
+            stringLocalizerFactory
+                .Setup(factory => factory.Create(typeof(EnumWithLocalizedDisplayNames)))
+                .Returns(stringLocalizer.Object);
+
+            return new DataAnnotationsMetadataProvider(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                useStringLocalizer ? stringLocalizerFactory.Object : null);
+        }
+
+        private ModelAttributes GetModelAttributes(IEnumerable<object> typeAttributes)
+        {
+#pragma warning disable CS0618 // Type or member is obsolete
+            var modelAttributes = new ModelAttributes(typeAttributes);
+#pragma warning restore CS0618 // Type or member is obsolete
+
+            return modelAttributes;
+        }
+
+        private ModelAttributes GetModelAttributes(
+            IEnumerable<object> typeAttributes,
+            IEnumerable<object> propertyAttributes)
+        {
+#pragma warning disable CS0618 // Type or member is obsolete
+            var modelAttributes = new ModelAttributes(propertyAttributes, typeAttributes);
+#pragma warning restore CS0618 // Type or member is obsolete
+
+            return modelAttributes;
+        }
+
+        private class KVPEnumGroupAndNameComparer : IEqualityComparer<KeyValuePair<EnumGroupAndName, string>>
+        {
+            public static readonly IEqualityComparer<KeyValuePair<EnumGroupAndName, string>> Instance = new KVPEnumGroupAndNameComparer();
+
+            private KVPEnumGroupAndNameComparer()
+            {
+            }
+
+            public bool Equals(KeyValuePair<EnumGroupAndName, string> x, KeyValuePair<EnumGroupAndName, string> y)
+            {
+                using (new CultureReplacer(string.Empty, string.Empty))
+                {
+                    return x.Key.Name.Equals(y.Key.Name, StringComparison.Ordinal)
+                        && x.Key.Group.Equals(y.Key.Group, StringComparison.Ordinal);
+                }
+            }
+
+            public int GetHashCode(KeyValuePair<EnumGroupAndName, string> obj)
+            {
+                using (new CultureReplacer(string.Empty, string.Empty))
+                {
+                    var hashcode = HashCodeCombiner.Start();
+
+                    hashcode.Add(obj.Key.Name);
+                    hashcode.Add(obj.Key.Group);
+
+                    return hashcode.CombinedHash;
+                }
+            }
+        }
+
+        private class TestValidationAttribute : ValidationAttribute, IClientModelValidator
+        {
+            public void AddValidation(ClientModelValidationContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class EmptyClass
+        {
+        }
+
+        private class ClassWithFields
+        {
+            public const int Zero = 0;
+
+            public const int One = 1;
+        }
+
+        private class ClassWithProperties
+        {
+            public int Id { get; set; }
+
+            public string Name { get; set; }
+        }
+
+        private enum EnumWithLocalizedDisplayNames
+        {
+            [Display(Name = "Loc_Two_Name")]
+            Two = 2,
+            [Display(Name = nameof(TestResources.Type_Three_Name), ResourceType = typeof(TestResources))]
+            Three = 3
+        }
+
+        private enum EmptyEnum
+        {
+        }
+
+        private enum EnumWithDisplayNames
+        {
+            [Display(Name = "tres")]
+            Three = 3,
+
+            [Display(Name = "dos")]
+            Two = 2,
+
+            // Display attribute exists but does not set Name.
+            [Display(ShortName = "uno")]
+            One = 1,
+
+            [Display(Name = "", GroupName = "Zero")]
+            Zero = 0,
+
+            [Display(Name = "menos uno", GroupName = "Negatives")]
+            MinusOne = -1,
+
+#if USE_REAL_RESOURCES
+            [Display(Name = nameof(Test.Resources.DisplayAttribute_Name), ResourceType = typeof(Test.Resources))]
+#else
+            [Display(Name = nameof(TestResources.DisplayAttribute_Name), ResourceType = typeof(TestResources))]
+#endif
+            MinusTwo = -2,
+        }
+
+        private enum EnumWithDisplayOrder
+        {
+            [Display(Order = 3)]
+            One,
+
+            [Display(Order = 2)]
+            Two,
+
+            [Display(Order = 1)]
+            Three,
+
+            Null,
+        }
+
+        private enum EnumWithDuplicates
+        {
+            Zero = 0,
+            One = 1,
+            Three = 3,
+            MoreThanTwo = 3,
+            Two = 2,
+            None = 0,
+            Duece = 2,
+        }
+
+        [Flags]
+        private enum EnumWithFlags
+        {
+            Four = 4,
+            Two = 2,
+            One = 1,
+            Zero = 0,
+            All = -1,
+        }
+
+        private enum EnumWithFields
+        {
+            MinusTwo = -2,
+            MinusOne = -1,
+            Three = 3,
+            Two = 2,
+            One = 1,
+            Zero = 0,
+        }
+
+        private struct EmptyStruct
+        {
+        }
+
+        private struct StructWithFields
+        {
+            public const int Zero = 0;
+
+            public const int One = 1;
+        }
+
+        private struct StructWithProperties
+        {
+            public StructWithProperties(int id, string name)
+            {
+                Id = id;
+                Name = name;
+            }
+
+            public int Id { get; private set; }
+
+            public string Name { get; private set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsModelValidatorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsModelValidatorProviderTest.cs
new file mode 100644
index 0000000000..e0a156e8b1
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsModelValidatorProviderTest.cs
@@ -0,0 +1,191 @@
+// 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.
+
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class DataAnnotationsModelValidatorProviderTest
+    {
+        private readonly IModelMetadataProvider _metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+        [Fact]
+        public void CreateValidators_ReturnsValidatorForIValidatableObject()
+        {
+            // Arrange
+            var provider = new DataAnnotationsModelValidatorProvider(
+                new ValidationAttributeAdapterProvider(),
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+            var mockValidatable = Mock.Of<IValidatableObject>();
+            var metadata = _metadataProvider.GetMetadataForType(mockValidatable.GetType());
+
+            var providerContext = new ModelValidatorProviderContext(metadata, GetValidatorItems(metadata));
+
+            // Act
+            provider.CreateValidators(providerContext);
+
+            // Assert
+            var validatorItem = Assert.Single(providerContext.Results);
+            Assert.IsType<ValidatableObjectAdapter>(validatorItem.Validator);
+        }
+
+        [Fact]
+        public void CreateValidators_InsertsRequiredValidatorsFirst()
+        {
+            var provider = new DataAnnotationsModelValidatorProvider(
+                new ValidationAttributeAdapterProvider(),
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+            var metadata = _metadataProvider.GetMetadataForProperty(
+                typeof(ClassWithProperty),
+                "PropertyWithMultipleValidationAttributes");
+
+            var providerContext = new ModelValidatorProviderContext(metadata, GetValidatorItems(metadata));
+
+            // Act
+            provider.CreateValidators(providerContext);
+
+            // Assert
+            Assert.Equal(4, providerContext.Results.Count);
+            Assert.IsAssignableFrom<RequiredAttribute>(((DataAnnotationsModelValidator)providerContext.Results[0].Validator).Attribute);
+            Assert.IsAssignableFrom<RequiredAttribute>(((DataAnnotationsModelValidator)providerContext.Results[1].Validator).Attribute);
+        }
+
+        [Fact]
+        public void UnknownValidationAttributeGetsDefaultAdapter()
+        {
+            // Arrange
+            var provider = new DataAnnotationsModelValidatorProvider(
+                new ValidationAttributeAdapterProvider(),
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+            var metadata = _metadataProvider.GetMetadataForType(typeof(DummyClassWithDummyValidationAttribute));
+
+            var providerContext = new ModelValidatorProviderContext(metadata, GetValidatorItems(metadata));
+
+            // Act
+            provider.CreateValidators(providerContext);
+
+            // Assert
+            var validatorItem = providerContext.Results.Single();
+            Assert.IsType<DataAnnotationsModelValidator>(validatorItem.Validator);
+        }
+
+        private class DummyValidationAttribute : ValidationAttribute
+        {
+        }
+
+        [DummyValidation]
+        private class DummyClassWithDummyValidationAttribute
+        {
+        }
+
+        // Default IValidatableObject adapter factory
+
+        [Fact]
+        public void IValidatableObjectGetsAValidator()
+        {
+            // Arrange
+            var provider = new DataAnnotationsModelValidatorProvider(
+                new ValidationAttributeAdapterProvider(),
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                stringLocalizerFactory: null);
+            var mockValidatable = new Mock<IValidatableObject>();
+            var metadata = _metadataProvider.GetMetadataForType(mockValidatable.Object.GetType());
+
+            var providerContext = new ModelValidatorProviderContext(metadata, GetValidatorItems(metadata));
+
+            // Act
+            provider.CreateValidators(providerContext);
+
+            // Assert
+            Assert.Single(providerContext.Results);
+        }
+
+        private IList<ValidatorItem> GetValidatorItems(ModelMetadata metadata)
+        {
+            var items = new List<ValidatorItem>(metadata.ValidatorMetadata.Count);
+            for (var i = 0; i < metadata.ValidatorMetadata.Count; i++)
+            {
+                items.Add(new ValidatorItem(metadata.ValidatorMetadata[i]));
+            }
+
+            return items;
+        }
+
+        private class ObservableModel
+        {
+            private bool _propertyWasRead;
+
+            public string TheProperty
+            {
+                get
+                {
+                    _propertyWasRead = true;
+                    return "Hello";
+                }
+            }
+
+            public bool PropertyWasRead()
+            {
+                return _propertyWasRead;
+            }
+        }
+
+        private class BaseModel
+        {
+            public virtual string MyProperty { get; set; }
+        }
+
+        private class DerivedModel : BaseModel
+        {
+            [StringLength(10)]
+            public override string MyProperty
+            {
+                get { return base.MyProperty; }
+                set { base.MyProperty = value; }
+            }
+        }
+
+        private class DummyRequiredAttributeHelperClass
+        {
+            [Required(ErrorMessage = "Custom Required Message")]
+            public int WithAttribute { get; set; }
+
+            public int WithoutAttribute { get; set; }
+        }
+
+        private class ClassWithProperty
+        {
+            [CustomNonRequiredAttribute1]
+            [CustomNonRequiredAttribute2]
+            [CustomRequiredAttribute1]
+            [CustomRequiredAttribute2]
+            public string PropertyWithMultipleValidationAttributes { get; set; }
+        }
+
+        public class CustomRequiredAttribute1 : RequiredAttribute
+        {
+        }
+
+        public class CustomRequiredAttribute2 : RequiredAttribute
+        {
+        }
+
+        public class CustomNonRequiredAttribute1 : ValidationAttribute
+        {
+        }
+
+        public class CustomNonRequiredAttribute2 : ValidationAttribute
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsModelValidatorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsModelValidatorTest.cs
new file mode 100644
index 0000000000..17669fd0d4
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataAnnotationsModelValidatorTest.cs
@@ -0,0 +1,563 @@
+// 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.
+
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Localization;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class DataAnnotationsModelValidatorTest
+    {
+        private static readonly ModelMetadataProvider _metadataProvider
+            = TestModelMetadataProvider.CreateDefaultProvider();
+
+        [Fact]
+        public void Constructor_SetsAttribute()
+        {
+            // Arrange
+            var attribute = new RequiredAttribute();
+
+            // Act
+            var validator = new DataAnnotationsModelValidator(
+                new ValidationAttributeAdapterProvider(),
+                attribute,
+                stringLocalizer: null);
+
+            // Assert
+            Assert.Same(attribute, validator.Attribute);
+        }
+
+        public static TheoryData<ModelMetadata, object, object, string> Validate_SetsMemberName_AsExpectedData
+        {
+            get
+            {
+                var array = new[] { new SampleModel { Name = "one" }, new SampleModel { Name = "two" } };
+                var method = typeof(ModelValidationResultComparer).GetMethod(
+                    nameof(ModelValidationResultComparer.GetHashCode),
+                    new[] { typeof(ModelValidationResult) });
+                var parameter = method.GetParameters()[0]; // GetHashCode(ModelValidationResult obj)
+
+                // metadata, container, model, expected MemberName
+                return new TheoryData<ModelMetadata, object, object, string>
+                {
+                    {
+                        _metadataProvider.GetMetadataForProperty(typeof(string), nameof(string.Length)),
+                        "Hello",
+                        "Hello".Length,
+                        nameof(string.Length)
+                    },
+                    {
+                        // Validating a top-level property.
+                        _metadataProvider.GetMetadataForProperty(typeof(SampleModel), nameof(SampleModel.Name)),
+                        null,
+                        "Fred",
+                        nameof(SampleModel.Name)
+                    },
+                    {
+                        // Validating a parameter.
+                        _metadataProvider.GetMetadataForParameter(parameter),
+                        null,
+                        new ModelValidationResult(memberName: string.Empty, message: string.Empty),
+                        "obj"
+                    },
+                    {
+                        // Validating a top-level parameter as if using old-fashioned metadata provider.
+                        _metadataProvider.GetMetadataForType(typeof(SampleModel)),
+                        null,
+                        15,
+                        null
+                    },
+                    {
+                        // Validating an element in a collection.
+                        _metadataProvider.GetMetadataForType(typeof(SampleModel)),
+                        array,
+                        array[1],
+                        null
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(Validate_SetsMemberName_AsExpectedData))]
+        public void Validate_SetsMemberName_AsExpected(
+            ModelMetadata metadata,
+            object container,
+            object model,
+            string expectedMemberName)
+        {
+            // Arrange
+            var attribute = new Mock<TestableValidationAttribute> { CallBase = true };
+            attribute
+                .Setup(p => p.IsValidPublic(It.IsAny<object>(), It.IsAny<ValidationContext>()))
+                .Callback((object o, ValidationContext context) =>
+                {
+                    Assert.Equal(expectedMemberName, context.MemberName);
+                })
+                .Returns(ValidationResult.Success)
+                .Verifiable();
+            var validator = new DataAnnotationsModelValidator(
+                new ValidationAttributeAdapterProvider(),
+                attribute.Object,
+                stringLocalizer: null);
+            var validationContext = new ModelValidationContext(
+                actionContext: new ActionContext(),
+                modelMetadata: metadata,
+                metadataProvider: _metadataProvider,
+                container: container,
+                model: model);
+
+            // Act
+            var results = validator.Validate(validationContext);
+
+            // Assert
+            Assert.Empty(results);
+            attribute.VerifyAll();
+        }
+
+        [Fact]
+        public void Validate_Valid()
+        {
+            // Arrange
+            var metadata = _metadataProvider.GetMetadataForType(typeof(string));
+            var container = "Hello";
+            var model = container.Length;
+
+            var attribute = new Mock<ValidationAttribute> { CallBase = true };
+            attribute.Setup(a => a.IsValid(model)).Returns(true);
+
+            var validator = new DataAnnotationsModelValidator(
+                new ValidationAttributeAdapterProvider(),
+                attribute.Object,
+                stringLocalizer: null);
+            var validationContext = new ModelValidationContext(
+                actionContext: new ActionContext(),
+                modelMetadata: metadata,
+                metadataProvider: _metadataProvider,
+                container: container,
+                model: model);
+
+            // Act
+            var result = validator.Validate(validationContext);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public void Validate_Invalid()
+        {
+            // Arrange
+            var metadata = _metadataProvider.GetMetadataForProperty(typeof(string), "Length");
+            var container = "Hello";
+            var model = container.Length;
+
+            var attribute = new Mock<ValidationAttribute> { CallBase = true };
+            attribute.Setup(a => a.IsValid(model)).Returns(false);
+
+            var validator = new DataAnnotationsModelValidator(
+                new ValidationAttributeAdapterProvider(),
+                attribute.Object,
+                stringLocalizer: null);
+            var validationContext = new ModelValidationContext(
+                actionContext: new ActionContext(),
+                modelMetadata: metadata,
+                metadataProvider: _metadataProvider,
+                container: container,
+                model: model);
+
+            // Act
+            var result = validator.Validate(validationContext);
+
+            // Assert
+            var validationResult = result.Single();
+            Assert.Empty(validationResult.MemberName);
+            Assert.Equal(attribute.Object.FormatErrorMessage("Length"), validationResult.Message);
+        }
+
+        [Fact]
+        public void Validate_ValidationResultSuccess()
+        {
+            // Arrange
+            var metadata = _metadataProvider.GetMetadataForType(typeof(string));
+            var container = "Hello";
+            var model = container.Length;
+
+            var attribute = new Mock<TestableValidationAttribute> { CallBase = true };
+            attribute
+                .Setup(p => p.IsValidPublic(It.IsAny<object>(), It.IsAny<ValidationContext>()))
+                .Returns(ValidationResult.Success);
+            var validator = new DataAnnotationsModelValidator(
+                new ValidationAttributeAdapterProvider(),
+                attribute.Object,
+                stringLocalizer: null);
+            var validationContext = new ModelValidationContext(
+                actionContext: new ActionContext(),
+                modelMetadata: metadata,
+                metadataProvider: _metadataProvider,
+                container: container,
+                model: model);
+
+            // Act
+            var result = validator.Validate(validationContext);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public void Validate_RequiredButNullAtTopLevel_Invalid()
+        {
+            // Arrange
+            var metadata = _metadataProvider.GetMetadataForProperty(typeof(string), "Length");
+            var validator = new DataAnnotationsModelValidator(
+                new ValidationAttributeAdapterProvider(),
+                new RequiredAttribute(),
+                stringLocalizer: null);
+            var validationContext = new ModelValidationContext(
+                actionContext: new ActionContext(),
+                modelMetadata: metadata,
+                metadataProvider: _metadataProvider,
+                container: null,
+                model: null);
+
+            // Act
+            var result = validator.Validate(validationContext);
+
+            // Assert
+            var validationResult = result.Single();
+            Assert.Empty(validationResult.MemberName);
+            Assert.Equal(new RequiredAttribute().FormatErrorMessage("Length"), validationResult.Message);
+        }
+
+        [Fact]
+        public void Validate_RequiredAndNotNullAtTopLevel_Valid()
+        {
+            // Arrange
+            var metadata = _metadataProvider.GetMetadataForProperty(typeof(string), "Length");
+            var validator = new DataAnnotationsModelValidator(
+                new ValidationAttributeAdapterProvider(),
+                new RequiredAttribute(),
+                stringLocalizer: null);
+            var validationContext = new ModelValidationContext(
+                actionContext: new ActionContext(),
+                modelMetadata: metadata,
+                metadataProvider: _metadataProvider,
+                container: null,
+                model: 123);
+
+            // Act
+            var result = validator.Validate(validationContext);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        public static TheoryData<string, IEnumerable<string>, IEnumerable<ModelValidationResult>>
+            Valdate_ReturnsExpectedResults_Data
+        {
+            get
+            {
+                var errorMessage = "Some error message";
+                return new TheoryData<string, IEnumerable<string>, IEnumerable<ModelValidationResult>>
+                {
+                    {
+                        errorMessage,
+                        null,
+                        new[] { new ModelValidationResult(memberName: string.Empty, message: errorMessage) } },
+                    {
+                        errorMessage,
+                        Enumerable.Empty<string>(),
+                        new[] { new ModelValidationResult(memberName: string.Empty, message: errorMessage) }
+                    },
+                    {
+                        errorMessage,
+                        new[] { (string)null },
+                        new[] { new ModelValidationResult(memberName: string.Empty, message: errorMessage) }
+                    },
+                    {
+                        errorMessage,
+                        new[] { string.Empty },
+                        new[] { new ModelValidationResult(memberName: string.Empty, message: errorMessage) }
+                    },
+                    {
+                        errorMessage,
+                        // Name matches ValidationContext.MemberName.
+                        new[] { nameof(string.Length) },
+                        new[] { new ModelValidationResult(memberName: string.Empty, message: errorMessage) }
+                    },
+                    {
+                        errorMessage,
+                        new[] { "AnotherName" },
+                        new[] { new ModelValidationResult(memberName: "AnotherName", message: errorMessage) }
+                    },
+                    {
+                        errorMessage,
+                        new[] { "[1]" },
+                        new[] { new ModelValidationResult(memberName: "[1]", message: errorMessage) }
+                    },
+                    {
+                        errorMessage,
+                        new[] { "Name1", "Name2" },
+                        new[]
+                        {
+                            new ModelValidationResult(memberName: "Name1", message: errorMessage),
+                            new ModelValidationResult(memberName: "Name2", message: errorMessage),
+                        }
+                    },
+                    {
+                        errorMessage,
+                        new[] { "[0]", "[2]" },
+                        new[]
+                        {
+                            new ModelValidationResult(memberName: "[0]", message: errorMessage),
+                            new ModelValidationResult(memberName: "[2]", message: errorMessage),
+                        }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(Valdate_ReturnsExpectedResults_Data))]
+        public void Valdate_ReturnsExpectedResults(
+            string errorMessage,
+            IEnumerable<string> memberNames,
+            IEnumerable<ModelValidationResult> expectedResults)
+        {
+            // Arrange
+            var metadata = _metadataProvider.GetMetadataForProperty(typeof(string), nameof(string.Length));
+            var container = "Hello";
+            var model = container.Length;
+
+            var attribute = new Mock<TestableValidationAttribute> { CallBase = true };
+            attribute
+                 .Setup(p => p.IsValidPublic(It.IsAny<object>(), It.IsAny<ValidationContext>()))
+                 .Returns(new ValidationResult(errorMessage, memberNames));
+
+            var validator = new DataAnnotationsModelValidator(
+                new ValidationAttributeAdapterProvider(),
+                attribute.Object,
+                stringLocalizer: null);
+            var validationContext = new ModelValidationContext(
+                actionContext: new ActionContext(),
+                modelMetadata: metadata,
+                metadataProvider: _metadataProvider,
+                container: container,
+                model: model);
+
+            // Act
+            var results = validator.Validate(validationContext);
+
+            // Assert
+            Assert.Equal(expectedResults, results, ModelValidationResultComparer.Instance);
+        }
+
+        [Fact]
+        public void Validate_IsValidFalse_StringLocalizerReturnsLocalizerErrorMessage()
+        {
+            // Arrange
+            var metadata = _metadataProvider.GetMetadataForType(typeof(string));
+            var container = "Hello";
+
+            var attribute = new MaxLengthAttribute(4);
+            attribute.ErrorMessage = "{0} should have no more than {1} characters.";
+
+            var localizedString = new LocalizedString(attribute.ErrorMessage, "Longueur est invalide : 4");
+            var stringLocalizer = new Mock<IStringLocalizer>();
+            stringLocalizer.Setup(s => s[attribute.ErrorMessage, It.IsAny<object[]>()]).Returns(localizedString);
+
+            var validator = new DataAnnotationsModelValidator(
+                new ValidationAttributeAdapterProvider(),
+                attribute,
+                stringLocalizer.Object);
+            var validationContext = new ModelValidationContext(
+                actionContext: new ActionContext(),
+                modelMetadata: metadata,
+                metadataProvider: _metadataProvider,
+                container: container,
+                model: "abcde");
+
+            // Act
+            var result = validator.Validate(validationContext);
+
+            // Assert
+            var validationResult = result.Single();
+            Assert.Empty(validationResult.MemberName);
+            Assert.Equal("Longueur est invalide : 4", validationResult.Message);
+        }
+
+        [Fact]
+        public void Validate_CanUseRequestServices_WithinValidationAttribute()
+        {
+            // Arrange
+            var service = new Mock<IExampleService>();
+            service.Setup(x => x.DoSomething()).Verifiable();
+
+            var provider = new ServiceCollection().AddSingleton(service.Object).BuildServiceProvider();
+
+            var httpContext = new Mock<HttpContext>();
+            httpContext.SetupGet(x => x.RequestServices).Returns(provider);
+
+            var attribute = new Mock<TestableValidationAttribute> { CallBase = true };
+            attribute
+                .Setup(p => p.IsValidPublic(It.IsAny<object>(), It.IsAny<ValidationContext>()))
+                .Callback((object o, ValidationContext context) =>
+                {
+                    var receivedService = context.GetService<IExampleService>();
+                    Assert.Equal(service.Object, receivedService);
+                    receivedService.DoSomething();
+                });
+
+            var validator = new DataAnnotationsModelValidator(
+                new ValidationAttributeAdapterProvider(),
+                attribute.Object,
+                stringLocalizer: null);
+
+            var validationContext = new ModelValidationContext(
+                actionContext: new ActionContext
+                {
+                    HttpContext = httpContext.Object
+                },
+                modelMetadata: _metadataProvider.GetMetadataForType(typeof(object)),
+                metadataProvider: _metadataProvider,
+                container: null,
+                model: new object());
+
+            // Act
+            var results = validator.Validate(validationContext);
+
+            // Assert
+            service.Verify();
+        }
+
+        private const string LocalizationKey = "LocalizeIt";
+
+        public static TheoryData Validate_AttributesIncludeValues
+        {
+            get
+            {
+                var pattern = "apattern";
+                var length = 5;
+                var regex = "^((?!" + pattern + ").)*$";
+
+                return new TheoryData<ValidationAttribute, string, object[]>
+                {
+                    {
+                        new RegularExpressionAttribute(regex) { ErrorMessage = LocalizationKey },
+                        pattern,
+                        new object[] { nameof(SampleModel), regex }
+                    },
+                    {
+                        new MaxLengthAttribute(length) { ErrorMessage = LocalizationKey },
+                        pattern,
+                        new object[] { nameof(SampleModel), length }},
+                    {
+                        new MaxLengthAttribute(length) { ErrorMessage = LocalizationKey },
+                        pattern,
+                        new object[] { nameof(SampleModel), length }
+                    },
+                    {
+                        new CompareAttribute(pattern) { ErrorMessage = LocalizationKey },
+                        pattern,
+                        new object[] { nameof(SampleModel), pattern }},
+                    {
+                        new MinLengthAttribute(length) { ErrorMessage = LocalizationKey },
+                        "a",
+                        new object[] { nameof(SampleModel), length }
+                    },
+                    {
+                        new CreditCardAttribute() { ErrorMessage = LocalizationKey },
+                        pattern,
+                        new object[] { nameof(SampleModel), "CreditCard" }
+                    },
+                    {
+                        new StringLengthAttribute(length) { ErrorMessage = LocalizationKey, MinimumLength = 1},
+                        string.Empty,
+                        new object[] { nameof(SampleModel), length, 1 }
+                    },
+                    {
+                        new RangeAttribute(0, length) { ErrorMessage = LocalizationKey },
+                        pattern,
+                        new object[] { nameof(SampleModel), 0, length}
+                    },
+                    {
+                        new EmailAddressAttribute() { ErrorMessage = LocalizationKey },
+                        pattern,
+                        new object[] { nameof(SampleModel), "EmailAddress" }
+                    },
+                    {
+                        new PhoneAttribute() { ErrorMessage = LocalizationKey },
+                        pattern,
+                        new object[] { nameof(SampleModel), "PhoneNumber" }
+                    },
+                    {
+                        new UrlAttribute() { ErrorMessage = LocalizationKey },
+                        pattern,
+                        new object[] { nameof(SampleModel), "Url"  }
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(Validate_AttributesIncludeValues))]
+        public void Validate_IsValidFalse_StringLocalizerGetsArguments(
+            ValidationAttribute attribute,
+            string model,
+            object[] values)
+        {
+            // Arrange
+            var stringLocalizer = new Mock<IStringLocalizer>();
+
+            var validator = new DataAnnotationsModelValidator(
+                new ValidationAttributeAdapterProvider(),
+                attribute,
+                stringLocalizer.Object);
+
+            var metadata = _metadataProvider.GetMetadataForType(typeof(SampleModel));
+            var validationContext = new ModelValidationContext(
+                actionContext: new ActionContext(),
+                modelMetadata: metadata,
+                metadataProvider: _metadataProvider,
+                container: null,
+                model: model);
+
+            // Act
+            validator.Validate(validationContext);
+
+            // Assert
+            var json = Newtonsoft.Json.JsonConvert.SerializeObject(values) + " " + attribute.GetType().Name;
+
+            stringLocalizer.Verify(l => l[LocalizationKey, values], json);
+        }
+
+        public abstract class TestableValidationAttribute : ValidationAttribute
+        {
+            protected override ValidationResult IsValid(object value, ValidationContext validationContext)
+            {
+                return IsValidPublic(value, validationContext);
+            }
+
+            public abstract ValidationResult IsValidPublic(object value, ValidationContext validationContext);
+        }
+
+        private class SampleModel
+        {
+            public string Name { get; set; }
+        }
+
+        public interface IExampleService
+        {
+            void DoSomething();
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataMemberRequiredBindingMetadataProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataMemberRequiredBindingMetadataProviderTest.cs
new file mode 100644
index 0000000000..499808aa94
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataMemberRequiredBindingMetadataProviderTest.cs
@@ -0,0 +1,178 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class DataMemberRequiredBindingMetadataProviderTest
+    {
+        [Fact]
+        public void IsBindingRequired_SetToTrue_WithDataMemberIsRequiredTrue()
+        {
+            // Arrange
+            var provider = new DataMemberRequiredBindingMetadataProvider();
+
+            var attributes = new object[]
+            {
+                new DataMemberAttribute() { IsRequired = true, }
+            };
+
+            var key = ModelMetadataIdentity.ForProperty(
+                typeof(string),
+                nameof(ClassWithDataMemberIsRequiredTrue.StringProperty),
+                typeof(ClassWithDataMemberIsRequiredTrue));
+            var context = new BindingMetadataProviderContext(key, GetModelAttributes(new object[0], attributes));
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.True(context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void IsBindingRequired_LeftAlone_DataMemberIsRequiredFalse(bool initialValue)
+        {
+            // Arrange
+            var provider = new DataMemberRequiredBindingMetadataProvider();
+
+            var attributes = new object[]
+            {
+                new DataMemberAttribute() { IsRequired = false, }
+            };
+
+            var key = ModelMetadataIdentity.ForProperty(
+                typeof(string),
+                nameof(ClassWithDataMemberIsRequiredFalse.StringProperty),
+                typeof(ClassWithDataMemberIsRequiredFalse));
+            var context = new BindingMetadataProviderContext(key, GetModelAttributes(new object[0], attributes));
+
+            context.BindingMetadata.IsBindingRequired = initialValue;
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.Equal(initialValue, context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void IsBindingRequired_LeftAlone_ForNonPropertyMetadata(bool initialValue)
+        {
+            // Arrange
+            var provider = new DataMemberRequiredBindingMetadataProvider();
+
+            var attributes = new object[]
+            {
+                new DataMemberAttribute() { IsRequired = true, }
+            };
+
+            var key = ModelMetadataIdentity.ForType(typeof(ClassWithDataMemberIsRequiredTrue));
+            var context = new BindingMetadataProviderContext(key, GetModelAttributes(new object[0], attributes));
+
+            context.BindingMetadata.IsBindingRequired = initialValue;
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.Equal(initialValue, context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void IsBindingRequired_LeftAlone_WithoutDataMemberAttribute(bool initialValue)
+        {
+            // Arrange
+            var provider = new DataMemberRequiredBindingMetadataProvider();
+
+            var key = ModelMetadataIdentity.ForProperty(
+                typeof(string),
+                nameof(ClassWithoutAttributes.StringProperty),
+                typeof(ClassWithoutAttributes));
+            var context = new BindingMetadataProviderContext(key, GetModelAttributes(new object[0], new object[0]));
+
+            context.BindingMetadata.IsBindingRequired = initialValue;
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.Equal(initialValue, context.BindingMetadata.IsBindingRequired);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void IsBindingRequired_LeftAlone_WithoutDataContractAttribute(bool initialValue)
+        {
+            // Arrange
+            var provider = new DataMemberRequiredBindingMetadataProvider();
+
+            var attributes = new object[]
+            {
+                new DataMemberAttribute() { IsRequired = true, }
+            };
+
+            var key = ModelMetadataIdentity.ForProperty(
+                typeof(string),
+                nameof(ClassWithDataMemberIsRequiredTrueWithoutDataContract.StringProperty),
+                typeof(ClassWithDataMemberIsRequiredTrueWithoutDataContract));
+            var context = new BindingMetadataProviderContext(key, GetModelAttributes(new object[0], attributes));
+
+            context.BindingMetadata.IsBindingRequired = initialValue;
+
+            // Act
+            provider.CreateBindingMetadata(context);
+
+            // Assert
+            Assert.Equal(initialValue, context.BindingMetadata.IsBindingRequired);
+        }
+
+        private ModelAttributes GetModelAttributes(
+            IEnumerable<object> typeAttributes,
+            IEnumerable<object> propertyAttributes)
+        {
+#pragma warning disable CS0618 // Type or member is obsolete
+            var modelAttributes = new ModelAttributes(propertyAttributes, typeAttributes);
+#pragma warning restore CS0618 // Type or member is obsolete
+
+            return modelAttributes;
+        }
+
+        [DataContract]
+        private class ClassWithDataMemberIsRequiredTrue
+        {
+            [DataMember(IsRequired = true)]
+            public string StringProperty { get; set; }
+        }
+
+        [DataContract]
+        private class ClassWithDataMemberIsRequiredFalse
+        {
+            [DataMember(IsRequired = false)]
+            public string StringProperty { get; set; }
+        }
+
+        private class ClassWithDataMemberIsRequiredTrueWithoutDataContract
+        {
+            [DataMember(IsRequired = true)]
+            public string StringProperty { get; set; }
+        }
+
+        private class ClassWithoutAttributes
+        {
+            public string StringProperty { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataTypeClientModelValidatorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataTypeClientModelValidatorProviderTest.cs
new file mode 100644
index 0000000000..6d606bb739
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DataTypeClientModelValidatorProviderTest.cs
@@ -0,0 +1,92 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class DataTypeClientModelValidatorProviderTest
+    {
+        private readonly IModelMetadataProvider _metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+        [Theory]
+        [InlineData(typeof(float))]
+        [InlineData(typeof(double))]
+        [InlineData(typeof(decimal))]
+        [InlineData(typeof(float?))]
+        [InlineData(typeof(double?))]
+        [InlineData(typeof(decimal?))]
+        public void CreateValidators_GetsNumericValidator_ForNumericType(Type modelType)
+        {
+            // Arrange
+            var provider = new NumericClientModelValidatorProvider();
+            var metadata = _metadataProvider.GetMetadataForType(modelType);
+
+            var providerContext = new ClientValidatorProviderContext(metadata, GetValidatorItems(metadata));
+
+            // Act
+            provider.CreateValidators(providerContext);
+
+            // Assert
+            var validatorItem = Assert.Single(providerContext.Results);
+            Assert.IsType<NumericClientModelValidator>(validatorItem.Validator);
+        }
+
+        [Fact]
+        public void CreateValidators_DoesNotAddDuplicateValidators()
+        {
+            // Arrange
+            var provider = new NumericClientModelValidatorProvider();
+            var metadata = _metadataProvider.GetMetadataForType(typeof(float));
+            var items = GetValidatorItems(metadata);
+            var expectedValidatorItem = new ClientValidatorItem
+            {
+                Validator = new NumericClientModelValidator(),
+                IsReusable = true
+            };
+            items.Add(expectedValidatorItem);
+
+            var providerContext = new ClientValidatorProviderContext(metadata, items);
+
+            // Act
+            provider.CreateValidators(providerContext);
+
+            // Assert
+            var validatorItem = Assert.Single(providerContext.Results);
+            Assert.Same(expectedValidatorItem.Validator, validatorItem.Validator);
+        }
+
+        [Theory]
+        [InlineData(typeof(int))]
+        [InlineData(typeof(short))]
+        [InlineData(typeof(byte))]
+        [InlineData(typeof(uint?))]
+        [InlineData(typeof(long?))]
+        [InlineData(typeof(string))]
+        [InlineData(typeof(DateTime))]
+        public void CreateValidators_DoesNotGetsNumericValidator_ForUnsupportedTypes(Type modelType)
+        {
+            // Arrange
+            var provider = new NumericClientModelValidatorProvider();
+            var metadata = _metadataProvider.GetMetadataForType(modelType);
+
+            var providerContext = new ClientValidatorProviderContext(metadata, GetValidatorItems(metadata));
+
+            // Act
+            provider.CreateValidators(providerContext);
+
+            // Assert
+            Assert.Empty(providerContext.Results);
+        }
+
+        private IList<ClientValidatorItem> GetValidatorItems(ModelMetadata metadata)
+        {
+            return metadata.ValidatorMetadata.Select(v => new ClientValidatorItem(v)).ToList();
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DefaultModelClientValidatorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DefaultModelClientValidatorProviderTest.cs
new file mode 100644
index 0000000000..5ca1d5b1f5
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/DefaultModelClientValidatorProviderTest.cs
@@ -0,0 +1,276 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    // Integration tests for the default configuration of ModelMetadata and Validation providers
+    public class DefaultModelClientValidatorProviderTest
+    {
+        [Fact]
+        public void CreateValidators_ForIValidatableObject()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var validatorProvider = TestModelValidatorProvider.CreateDefaultProvider();
+
+            var metadata = metadataProvider.GetMetadataForType(typeof(ValidatableObject));
+            var context = new ModelValidatorProviderContext(metadata, GetValidatorItems(metadata));
+
+            // Act
+            validatorProvider.CreateValidators(context);
+
+            // Assert
+            var validatorItems = context.Results;
+
+            var validatorItem = Assert.Single(validatorItems);
+            Assert.IsType<ValidatableObjectAdapter>(validatorItem.Validator);
+        }
+
+        [Fact]
+        public void CreateValidators_ClientModelValidatorAttributeOnClass()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var validatorProvider = TestModelValidatorProvider.CreateDefaultProvider();
+
+            var metadata = metadataProvider.GetMetadataForType(typeof(ModelValidatorAttributeOnClass));
+            var context = new ModelValidatorProviderContext(metadata, GetValidatorItems(metadata));
+
+            // Act
+            validatorProvider.CreateValidators(context);
+
+            // Assert
+            var validatorItems = context.Results;
+
+            var validatorItem = Assert.Single(validatorItems);
+            var customModelValidator = Assert.IsType<CustomModelValidatorAttribute>(validatorItem.Validator);
+            Assert.Equal("Class", customModelValidator.Tag);
+        }
+
+        [Fact]
+        public void CreateValidators_ClientModelValidatorAttributeOnProperty()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var validatorProvider = TestModelValidatorProvider.CreateDefaultProvider();
+
+            var metadata = metadataProvider.GetMetadataForProperty(
+                typeof(ModelValidatorAttributeOnProperty),
+                nameof(ModelValidatorAttributeOnProperty.Property));
+            var context = new ModelValidatorProviderContext(metadata, GetValidatorItems(metadata));
+
+            // Act
+            validatorProvider.CreateValidators(context);
+
+            // Assert
+            var validatorItems = context.Results;
+
+            var validatorItem = Assert.IsType<CustomModelValidatorAttribute>(Assert.Single(validatorItems).Validator);
+            Assert.Equal("Property", validatorItem.Tag);
+        }
+
+        [Fact]
+        public void CreateValidators_ClientModelValidatorAttributeOnPropertyAndClass()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var validatorProvider = TestModelValidatorProvider.CreateDefaultProvider();
+
+            var metadata = metadataProvider.GetMetadataForProperty(
+                typeof(ModelValidatorAttributeOnPropertyAndClass),
+                nameof(ModelValidatorAttributeOnPropertyAndClass.Property));
+            var context = new ModelValidatorProviderContext(metadata, GetValidatorItems(metadata));
+
+            // Act
+            validatorProvider.CreateValidators(context);
+
+            // Assert
+            var validatorItems = context.Results;
+
+            Assert.Equal(2, validatorItems.Count);
+            Assert.Single(validatorItems, v => Assert.IsType<CustomModelValidatorAttribute>(v.Validator).Tag == "Class");
+            Assert.Single(validatorItems, v => Assert.IsType<CustomModelValidatorAttribute>(v.Validator).Tag == "Property");
+        }
+
+        // RangeAttribute is an example of a ValidationAttribute with it's own adapter type.
+        [Fact]
+        public void CreateValidators_ClientValidatorAttribute_SpecificAdapter()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var validatorProvider = TestClientModelValidatorProvider.CreateDefaultProvider();
+
+            var metadata = metadataProvider.GetMetadataForProperty(
+                typeof(RangeAttributeOnProperty),
+                nameof(RangeAttributeOnProperty.Property));
+            var context = new ClientValidatorProviderContext(metadata, GetClientValidatorItems(metadata));
+
+            // Act
+            validatorProvider.CreateValidators(context);
+
+            // Assert
+            var validatorItems = context.Results;
+
+            Assert.Equal(2, validatorItems.Count);
+            Assert.Single(validatorItems, v => v.Validator is RangeAttributeAdapter);
+            Assert.Single(validatorItems, v => v.Validator is RequiredAttributeAdapter);
+        }
+
+        [Fact]
+        public void CreateValidators_ClientValidatorAttribute_DefaultAdapter()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var validatorProvider = TestClientModelValidatorProvider.CreateDefaultProvider();
+
+            var metadata = metadataProvider.GetMetadataForProperty(
+                typeof(CustomValidationAttributeOnProperty),
+                nameof(CustomValidationAttributeOnProperty.Property));
+            var context = new ClientValidatorProviderContext(metadata, GetClientValidatorItems(metadata));
+
+            // Act
+            validatorProvider.CreateValidators(context);
+
+            // Assert
+            var validatorItems = context.Results;
+
+             Assert.IsType<CustomValidationAttribute>(Assert.Single(validatorItems).Validator);
+        }
+
+        [Fact]
+        public void CreateValidators_FromModelMetadataType_SingleValidator()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var validatorProvider = TestClientModelValidatorProvider.CreateDefaultProvider();
+
+            var metadata = metadataProvider.GetMetadataForProperty(
+                typeof(ProductViewModel),
+                nameof(ProductViewModel.Id));
+            var context = new ClientValidatorProviderContext(metadata, GetClientValidatorItems(metadata));
+
+            // Act
+            validatorProvider.CreateValidators(context);
+
+            // Assert
+            var validatorItems = context.Results;
+
+            Assert.Equal(2, validatorItems.Count);
+            Assert.Single(validatorItems, v => v.Validator is RangeAttributeAdapter);
+            Assert.Single(validatorItems, v => v.Validator is RequiredAttributeAdapter);
+        }
+
+        [Fact]
+        public void CreateValidators_FromModelMetadataType_MergedValidators()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var validatorProvider = TestClientModelValidatorProvider.CreateDefaultProvider();
+
+            var metadata = metadataProvider.GetMetadataForProperty(
+                typeof(ProductViewModel),
+                nameof(ProductViewModel.Name));
+            var context = new ClientValidatorProviderContext(metadata, GetClientValidatorItems(metadata));
+
+            // Act
+            validatorProvider.CreateValidators(context);
+
+            // Assert
+            var validatorItems = context.Results;
+
+            Assert.Equal(2, validatorItems.Count);
+            Assert.Single(validatorItems, v => v.Validator is RegularExpressionAttributeAdapter);
+            Assert.Single(validatorItems, v => v.Validator is StringLengthAttributeAdapter);
+        }
+
+        private IList<ClientValidatorItem> GetClientValidatorItems(ModelMetadata metadata)
+        {
+            return metadata.ValidatorMetadata.Select(v => new ClientValidatorItem(v)).ToList();
+        }
+
+        private IList<ValidatorItem> GetValidatorItems(ModelMetadata metadata)
+        {
+            return metadata.ValidatorMetadata.Select(v => new ValidatorItem(v)).ToList();
+        }
+
+        private class ValidatableObject : IValidatableObject
+        {
+            public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+            {
+                return null;
+            }
+        }
+
+        [CustomModelValidator(Tag = "Class")]
+        private class ModelValidatorAttributeOnClass
+        {
+        }
+
+        private class ModelValidatorAttributeOnProperty
+        {
+            [CustomModelValidator(Tag = "Property")]
+            public string Property { get; set; }
+        }
+
+        private class ModelValidatorAttributeOnPropertyAndClass
+        {
+            [CustomModelValidator(Tag = "Property")]
+            public ModelValidatorAttributeOnClass Property { get; set; }
+        }
+
+        private class CustomModelValidatorAttribute : Attribute, IModelValidator
+        {
+            public string Tag { get; set; }
+
+            public IEnumerable<ModelValidationResult> Validate(ModelValidationContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class RangeAttributeOnProperty
+        {
+            [Range(0, 10)]
+            public int Property { get; set; }
+        }
+
+        private class CustomValidationAttribute : Attribute, IClientModelValidator
+        {
+            public void AddValidation(ClientModelValidationContext context)
+            {
+            }
+        }
+
+        private class CustomValidationAttributeOnProperty
+        {
+            [CustomValidation]
+            public string Property { get; set; }
+        }
+
+        private class ProductEntity
+        {
+            [Range(0, 10)]
+            public int Id { get; set; }
+
+            [RegularExpression(".*")]
+            public string Name { get; set; }
+        }
+
+        [ModelMetadataType(typeof(ProductEntity))]
+        private class ProductViewModel
+        {
+            public int Id { get; set; }
+
+            [StringLength(4)]
+            public string Name { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/FileExtensionsAttributeAdapterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/FileExtensionsAttributeAdapterTest.cs
new file mode 100644
index 0000000000..0cdb65c847
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/FileExtensionsAttributeAdapterTest.cs
@@ -0,0 +1,167 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.Localization;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    public class FileExtensionsAttributeAdapterTest
+    {
+        [Theory]
+        [InlineData("", ".png,.jpg,.jpeg,.gif")]
+        [InlineData(null, ".png,.jpg,.jpeg,.gif")]
+        [ReplaceCulture]
+        public void AddValidation_WithoutLocalizationAndDefaultFileExtensions(string extensions, string expectedExtensions)
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(Profile), nameof(Profile.PhotoFileName));
+
+            var attribute = new FileExtensionsAttribute() { Extensions = extensions };
+            attribute.ErrorMessage = "{0} expects only the following extensions: {1}";
+
+            // FileExtensionsAttribute formats the extension list for the error message
+            var formattedExtensions = string.Join(", ", expectedExtensions.Split(','));
+            var expectedErrorMessage = string.Format(attribute.ErrorMessage, nameof(Profile.PhotoFileName), formattedExtensions);
+
+            var adapter = new FileExtensionsAttributeAdapter(attribute, stringLocalizer: null);
+            var context = new ClientModelValidationContext(new ActionContext(), metadata, provider, new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-fileextensions", kvp.Key); Assert.Equal(expectedErrorMessage, kvp.Value); },
+                kvp => { Assert.Equal("data-val-fileextensions-extensions", kvp.Key); Assert.Equal(expectedExtensions, kvp.Value); });
+        }
+
+        public static TheoryData<string, string> ExtensionsData
+        {
+            get
+            {
+                return new TheoryData<string, string>()
+                {
+                    { "jpg", ".jpg" },
+                    { " j p g ", ".jpg" },
+                    { ".jpg", ".jpg" },
+                    { ".x", ".x" },
+                    { "jpg,png", ".jpg,.png" },
+                    { "jpg, png", ".jpg,.png" },
+                    { "JPG, Png", ".jpg,.png" },
+                    { ".jpg,.png", ".jpg,.png" },
+                    { "..jpg,..png", ".jpg,.png" },
+                    { ".TXT, .png", ".txt,.png" },
+                    { ".pdf , .docx", ".pdf,.docx" },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ExtensionsData))]
+        [ReplaceCulture]
+        public void AddValidation_WithoutLocalizationAndCustomFileExtensions(string extensions, string expectedExtensions)
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(Profile), nameof(Profile.PhotoFileName));
+
+            var attribute = new FileExtensionsAttribute() { Extensions = extensions };
+            attribute.ErrorMessage = "{0} expects only the following extensions: {1}";
+
+            // FileExtensionsAttribute formats the extension list for the error message
+            var formattedExtensions = string.Join(", ", expectedExtensions.Split(','));
+            var expectedErrorMessage = string.Format(attribute.ErrorMessage, nameof(Profile.PhotoFileName), formattedExtensions);
+
+            var adapter = new FileExtensionsAttributeAdapter(attribute, stringLocalizer: null);
+            var context = new ClientModelValidationContext(new ActionContext(), metadata, provider, new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-fileextensions", kvp.Key); Assert.Equal(expectedErrorMessage, kvp.Value); },
+                kvp => { Assert.Equal("data-val-fileextensions-extensions", kvp.Key); Assert.Equal(expectedExtensions, kvp.Value); });
+        }
+
+        [Theory]
+        [MemberData(nameof(ExtensionsData))]
+        [ReplaceCulture]
+        public void AddValidation_WithLocalization(string extensions, string expectedExtensions)
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(Profile), nameof(Profile.PhotoFileName));
+
+            var attribute = new FileExtensionsAttribute() { Extensions = extensions };
+            attribute.ErrorMessage = "{0} expects only the following extensions: {1}";
+
+            var formattedExtensions = string.Join(", ", expectedExtensions.Split(','));
+            var expectedProperties = new object[] { "PhotoFileName", formattedExtensions };
+            var expectedErrorMessage = $"{nameof(Profile.PhotoFileName)} expects only the following extensions: {formattedExtensions}";
+
+            var stringLocalizer = new Mock<IStringLocalizer>();
+            stringLocalizer
+                .Setup(s => s[attribute.ErrorMessage, expectedProperties])
+                .Returns(new LocalizedString(attribute.ErrorMessage, expectedErrorMessage));
+
+            var adapter = new FileExtensionsAttributeAdapter(attribute, stringLocalizer: stringLocalizer.Object);
+            var context = new ClientModelValidationContext(new ActionContext(), metadata, provider, new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-fileextensions", kvp.Key); Assert.Equal(expectedErrorMessage, kvp.Value); },
+                kvp => { Assert.Equal("data-val-fileextensions-extensions", kvp.Key); Assert.Equal(expectedExtensions, kvp.Value); });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_DoesNotTrounceExistingAttributes()
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(Profile), "PhotoFileName");
+
+            var attribute = new FileExtensionsAttribute() { Extensions = "jpg" };
+            attribute.ErrorMessage = "{0} expects only the following extensions: {1}";
+
+            var adapter = new FileExtensionsAttributeAdapter(attribute, stringLocalizer: null);
+            var context = new ClientModelValidationContext(new ActionContext(), metadata, provider, new AttributeDictionary());
+
+            context.Attributes.Add("data-val", "original");
+            context.Attributes.Add("data-val-fileextensions", "original");
+            context.Attributes.Add("data-val-fileextensions-extensions", "original");
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("original", kvp.Value); },
+                kvp => { Assert.Equal("data-val-fileextensions", kvp.Key); Assert.Equal("original", kvp.Value); },
+                kvp => { Assert.Equal("data-val-fileextensions-extensions", kvp.Key); Assert.Equal("original", kvp.Value); });
+        }
+
+        private class Profile
+        {
+            public string PhotoFileName { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/MaxLengthAttributeAdapterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/MaxLengthAttributeAdapterTest.cs
new file mode 100644
index 0000000000..3b08753d71
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/MaxLengthAttributeAdapterTest.cs
@@ -0,0 +1,171 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.Localization;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class MaxLengthAttributeAdapterTest
+    {
+        [Fact]
+        [ReplaceCulture]
+        public void MaxLengthAttribute_AddValidation_Localize()
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
+
+            var attribute = new MaxLengthAttribute(10);
+            attribute.ErrorMessage = "Property must be max '{1}' characters long.";
+
+            var expectedProperties = new object[] { "Length", 10 };
+            var expectedMessage = "Property must be max '10' characters long.";
+
+            var stringLocalizer = new Mock<IStringLocalizer>();
+            stringLocalizer.Setup(s => s[attribute.ErrorMessage, expectedProperties])
+                .Returns(new LocalizedString(attribute.ErrorMessage, expectedMessage));
+
+            var adapter = new MaxLengthAttributeAdapter(attribute, stringLocalizer: stringLocalizer.Object);
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-maxlength", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); },
+                kvp => { Assert.Equal("data-val-maxlength-max", kvp.Key); Assert.Equal("10", kvp.Value); });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void MaxLengthAttribute_AddValidation()
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
+
+            var attribute = new MaxLengthAttribute(10);
+            var adapter = new MaxLengthAttributeAdapter(attribute, stringLocalizer: null);
+
+            var expectedMessage = attribute.FormatErrorMessage("Length");
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-maxlength", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); },
+                kvp => { Assert.Equal("data-val-maxlength-max", kvp.Key); Assert.Equal("10", kvp.Value); });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void MaxLengthAttribute_AddValidation_CustomMessage()
+        {
+            // Arrange
+            var propertyName = "Length";
+            var message = "{0} must be at most {1}";
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), propertyName);
+
+            var expectedMessage = "Length must be at most 5";
+
+            var attribute = new MaxLengthAttribute(5) { ErrorMessage = message };
+            var adapter = new MaxLengthAttributeAdapter(attribute, stringLocalizer: null);
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-maxlength", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); },
+                kvp => { Assert.Equal("data-val-maxlength-max", kvp.Key); Assert.Equal("5", kvp.Value); });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void MaxLengthAttribute_AddValidation_StringLocalizer_ReturnsLocalizedErrorString()
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
+
+            var errorKey = metadata.GetDisplayName();
+            var attribute = new MaxLengthAttribute(10);
+            attribute.ErrorMessage = errorKey;
+            var localizedString = new LocalizedString(errorKey, "Longueur est invalide");
+            var stringLocalizer = new Mock<IStringLocalizer>();
+            stringLocalizer.Setup(s => s[errorKey, metadata.GetDisplayName(), attribute.Length]).Returns(localizedString);
+
+            var expectedMessage = "Longueur est invalide";
+
+            var adapter = new MaxLengthAttributeAdapter(attribute, stringLocalizer.Object);
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-maxlength", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); },
+                kvp => { Assert.Equal("data-val-maxlength-max", kvp.Key); Assert.Equal("10", kvp.Value); });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_DoesNotTrounceExistingAttributes()
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
+
+            var attribute = new MaxLengthAttribute(10);
+            var adapter = new MaxLengthAttributeAdapter(attribute, stringLocalizer: null);
+
+            var expectedMessage = attribute.FormatErrorMessage("Length");
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            context.Attributes.Add("data-val", "original");
+            context.Attributes.Add("data-val-maxlength", "original");
+            context.Attributes.Add("data-val-maxlength-max", "original");
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("original", kvp.Value); },
+                kvp => { Assert.Equal("data-val-maxlength", kvp.Key); Assert.Equal("original", kvp.Value); },
+                kvp => { Assert.Equal("data-val-maxlength-max", kvp.Key); Assert.Equal("original", kvp.Value); });
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/MinLengthAttributeAdapterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/MinLengthAttributeAdapterTest.cs
new file mode 100644
index 0000000000..56d6d42efe
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/MinLengthAttributeAdapterTest.cs
@@ -0,0 +1,136 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.Localization;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class MinLengthAttributeAdapterTest
+    {
+        [Fact]
+        [ReplaceCulture]
+        public void MinLengthAttribute_AddValidation_Localize()
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
+
+            var attribute = new MinLengthAttribute(6);
+            attribute.ErrorMessage = "Property must be at least '{1}' characters long.";
+
+            var expectedProperties = new object[] { "Length", 6 };
+            var expectedMessage = "Property must be at least '6' characters long.";
+
+            var stringLocalizer = new Mock<IStringLocalizer>();
+            stringLocalizer.Setup(s => s[attribute.ErrorMessage, expectedProperties])
+                .Returns(new LocalizedString(attribute.ErrorMessage, expectedMessage));
+
+            var adapter = new MinLengthAttributeAdapter(attribute, stringLocalizer: stringLocalizer.Object);
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-minlength", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); },
+                kvp => { Assert.Equal("data-val-minlength-min", kvp.Key); Assert.Equal("6", kvp.Value); });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void MinLengthAttribute_AddValidation_Attribute()
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
+
+            var attribute = new MinLengthAttribute(6);
+            var adapter = new MinLengthAttributeAdapter(attribute, stringLocalizer: null);
+
+            var expectedMessage = attribute.FormatErrorMessage("Length");
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-minlength", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); },
+                kvp => { Assert.Equal("data-val-minlength-min", kvp.Key); Assert.Equal("6", kvp.Value); });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void MinLengthAttribute_AddValidation_AttributeAndCustomMessage()
+        {
+            // Arrange
+            var propertyName = "Length";
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), propertyName);
+
+            var attribute = new MinLengthAttribute(2) { ErrorMessage = "Array must have at least {1} items." };
+            var adapter = new MinLengthAttributeAdapter(attribute, stringLocalizer: null);
+
+            var expectedMessage = "Array must have at least 2 items.";
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-minlength", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); },
+                kvp => { Assert.Equal("data-val-minlength-min", kvp.Key); Assert.Equal("2", kvp.Value); });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_DoesNotTrounceExistingAttributes()
+        {
+            // Arrange
+            var propertyName = "Length";
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), propertyName);
+
+            var attribute = new MinLengthAttribute(2) { ErrorMessage = "Array must have at least {1} items." };
+            var adapter = new MinLengthAttributeAdapter(attribute, stringLocalizer: null);
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            context.Attributes.Add("data-val", "original");
+            context.Attributes.Add("data-val-minlength", "original");
+            context.Attributes.Add("data-val-minlength-min", "original");
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("original", kvp.Value); },
+                kvp => { Assert.Equal("data-val-minlength", kvp.Key); Assert.Equal("original", kvp.Value); },
+                kvp => { Assert.Equal("data-val-minlength-min", kvp.Key); Assert.Equal("original", kvp.Value); });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ModelMetadataProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ModelMetadataProviderTest.cs
new file mode 100644
index 0000000000..4002e30c99
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ModelMetadataProviderTest.cs
@@ -0,0 +1,1095 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Runtime.Serialization;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    // Integration tests for the default provider configuration.
+    public class ModelMetadataProviderTest
+    {
+        [Fact]
+        public void ModelMetadataProvider_UsesPropertyFilterProviderOnType()
+        {
+            // Arrange
+            var type = typeof(User);
+
+            var provider = CreateProvider();
+            var context = new DefaultModelBindingContext();
+
+            var expected = new[] { "IsAdmin", "UserName" };
+
+            // Act
+            var metadata = provider.GetMetadataForType(type);
+
+            // Assert
+            var propertyFilter = metadata.PropertyFilterProvider.PropertyFilter;
+
+            var matched = new HashSet<string>();
+            foreach (var property in metadata.Properties)
+            {
+                if (propertyFilter(property))
+                {
+                    matched.Add(property.PropertyName);
+                }
+            }
+
+            Assert.Equal<string>(expected, matched);
+        }
+
+        [Fact]
+        public void ModelMetadataProvider_ReadsModelNameProperty_ForTypes()
+        {
+            // Arrange
+            var type = typeof(User);
+            var provider = CreateProvider();
+
+            // Act
+            var metadata = provider.GetMetadataForType(type);
+
+            // Assert
+            Assert.Equal("TypePrefix", metadata.BinderModelName);
+        }
+
+
+        [Fact]
+        public void ModelMetadataProvider_ReadsScaffoldColumnAttribute_ForShowForDisplay()
+        {
+            // Arrange
+            var type = typeof(ScaffoldColumnModel);
+            var provider = CreateProvider();
+
+            // Act & Assert
+            Assert.True(provider.GetMetadataForProperty(type, "NoAttribute").ShowForDisplay);
+            Assert.True(provider.GetMetadataForProperty(type, "ScaffoldColumnTrue").ShowForDisplay);
+            Assert.False(provider.GetMetadataForProperty(type, "ScaffoldColumnFalse").ShowForDisplay);
+        }
+
+        [Fact]
+        public void ModelMetadataProvider_ReadsScaffoldColumnAttribute_ForShowForEdit()
+        {
+            // Arrange
+            var type = typeof(ScaffoldColumnModel);
+            var provider = CreateProvider();
+
+            // Act & Assert
+            Assert.True(provider.GetMetadataForProperty(type, "NoAttribute").ShowForEdit);
+            Assert.True(provider.GetMetadataForProperty(type, "ScaffoldColumnTrue").ShowForEdit);
+            Assert.False(provider.GetMetadataForProperty(type, "ScaffoldColumnFalse").ShowForEdit);
+        }
+
+        [Fact]
+        public void HiddenInputWorksOnProperty_ForHideSurroundingHtml()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var metadata = provider.GetMetadataForType(modelType: typeof(ClassWithHiddenProperties));
+            var property = metadata.Properties["DirectlyHidden"];
+
+            // Act
+            var result = property.HideSurroundingHtml;
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void HiddenInputWorksOnPropertyType_ForHideSurroundingHtml()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var metadata = provider.GetMetadataForType(typeof(ClassWithHiddenProperties));
+            var property = metadata.Properties["OfHiddenType"];
+
+            // Act
+            var result = property.HideSurroundingHtml;
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void HiddenInputWorksOnProperty_ForTemplateHint()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var metadata = provider.GetMetadataForType(typeof(ClassWithHiddenProperties));
+            var property = metadata.Properties["DirectlyHidden"];
+
+            // Act
+            var result = property.TemplateHint;
+
+            // Assert
+            Assert.Equal("HiddenInput", result);
+        }
+
+        [Fact]
+        public void HiddenInputWorksOnPropertyType_ForTemplateHint()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var metadata = provider.GetMetadataForType(typeof(ClassWithHiddenProperties));
+            var property = metadata.Properties["OfHiddenType"];
+
+            // Act
+            var result = property.TemplateHint;
+
+            // Assert
+            Assert.Equal("HiddenInput", result);
+        }
+
+        [Fact]
+        public void GetMetadataForProperty_WithNoBinderModelName_GetsItFromType()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var propertyMetadata = provider.GetMetadataForProperty(typeof(Person), nameof(Person.Parent));
+
+            // Assert
+            Assert.Equal("PersonType", propertyMetadata.BinderModelName);
+        }
+
+        [Fact]
+        public void GetMetadataForProperty_WithBinderMetadataOnPropertyAndType_GetsMetadataFromProperty()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var propertyMetadata = provider.GetMetadataForProperty(typeof(Person), nameof(Person.GrandParent));
+
+            // Assert
+            Assert.Equal("GrandParentProperty", propertyMetadata.BinderModelName);
+        }
+
+        public static TheoryData<object, Func<ModelMetadata, string>> ExpectedAttributeDataStrings
+        {
+            get
+            {
+                return new TheoryData<object, Func<ModelMetadata, string>>
+                {
+                    {
+                        new DataTypeAttribute("value"), metadata => metadata.DataTypeName
+                    },
+                    {
+                        new DataTypeWithCustomDisplayFormat(), metadata => metadata.DisplayFormatString
+                    },
+                    {
+                        new DataTypeWithCustomEditFormat(), metadata => metadata.EditFormatString
+                    },
+                    {
+                        new DisplayAttribute { Description = "value" }, metadata => metadata.Description
+                    },
+                    {
+                        new DisplayAttribute { Name = "value" }, metadata => metadata.DisplayName
+                    },
+                    {
+                        new DisplayAttribute { Prompt = "value" }, metadata => metadata.Placeholder
+                    },
+                    {
+                        new DisplayFormatAttribute { DataFormatString = "value" },
+                        metadata => metadata.DisplayFormatString
+                    },
+                    {
+                        // DisplayFormatString does not ignore [DisplayFormat] if ApplyFormatInEditMode==true.
+                        new DisplayFormatAttribute { ApplyFormatInEditMode = true, DataFormatString = "value" },
+                        metadata => metadata.DisplayFormatString
+                    },
+                    {
+                        new DisplayFormatAttribute { ApplyFormatInEditMode = true, DataFormatString = "value" },
+                        metadata => metadata.EditFormatString
+                    },
+                    {
+                        new DisplayFormatAttribute { NullDisplayText = "value" }, metadata => metadata.NullDisplayText
+                    },
+                    {
+                        new TestModelNameProvider { Name = "value" }, metadata => metadata.BinderModelName
+                    },
+                    {
+                         new UIHintAttribute("value"), metadata => metadata.TemplateHint
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ExpectedAttributeDataStrings))]
+        public void AttributesOverrideMetadataStrings(object attribute, Func<ModelMetadata, string> accessor)
+        {
+            // Arrange
+            var attributes = new[] { attribute };
+            var provider = CreateProvider(attributes);
+
+            var metadata = provider.GetMetadataForType(typeof(string));
+
+            // Act
+            var result = accessor(metadata);
+
+            // Assert
+            Assert.Equal("value", result);
+        }
+
+        [Fact]
+        public void AttributesOverrideMetadataStrings_SimpleDisplayProperty()
+        {
+            // Arrange
+            var attributes = new[] { new DisplayColumnAttribute("Property") };
+            var provider = CreateProvider(attributes);
+
+            var metadata = provider.GetMetadataForType(typeof(string));
+
+            // Act
+            var result = metadata.SimpleDisplayProperty;
+
+            // Assert
+            Assert.Equal("Property", result);
+        }
+
+        public static TheoryData<Attribute, Func<ModelMetadata, bool>, bool> ExpectedAttributeDataBooleans
+        {
+            get
+            {
+                return new TheoryData<Attribute, Func<ModelMetadata, bool>, bool>
+                {
+                    {
+                        // Edit formats from [DataType] subclass affect HasNonDefaultEditFormat.
+                        new DataTypeWithCustomEditFormat(),
+                        metadata => metadata.HasNonDefaultEditFormat,
+                        true
+                    },
+                    {
+                        // Edit formats from [DataType] do not affect HasNonDefaultEditFormat.
+                        new DataTypeAttribute(DataType.Date),
+                        metadata => metadata.HasNonDefaultEditFormat,
+                        false
+                    },
+                    {
+                        new DisplayFormatAttribute { ConvertEmptyStringToNull = false },
+                        metadata => metadata.ConvertEmptyStringToNull,
+                        false
+                    },
+                    {
+                        new DisplayFormatAttribute { ConvertEmptyStringToNull = true },
+                        metadata => metadata.ConvertEmptyStringToNull,
+                        true
+                    },
+                    {
+                        // Changes only to DisplayFormatString do not affect HasNonDefaultEditFormat.
+                        new DisplayFormatAttribute { DataFormatString = "value" },
+                        metadata => metadata.HasNonDefaultEditFormat,
+                        false
+                    },
+                    {
+                        new DisplayFormatAttribute { ApplyFormatInEditMode = true, DataFormatString = "value" },
+                        metadata => metadata.HasNonDefaultEditFormat,
+                        true
+                    },
+                    {
+                        new DisplayFormatAttribute { HtmlEncode = false },
+                        metadata => metadata.HtmlEncode,
+                        false
+                    },
+                    {
+                        new DisplayFormatAttribute { HtmlEncode = true },
+                        metadata => metadata.HtmlEncode,
+                        true
+                    },
+                    {
+                        new EditableAttribute(allowEdit: false),
+                        metadata => metadata.IsReadOnly,
+                        true
+                    },
+                    {
+                        new EditableAttribute(allowEdit: true),
+                        metadata => metadata.IsReadOnly,
+                        false
+                    },
+                    {
+                        new HiddenInputAttribute { DisplayValue = false },
+                        metadata => metadata.HideSurroundingHtml,
+                        true
+                    },
+                    {
+                        new HiddenInputAttribute { DisplayValue = true },
+                        metadata => metadata.HideSurroundingHtml,
+                        false
+                    },
+                    {
+                        new HiddenInputAttribute(),
+                        metadata => string.Equals("HiddenInput", metadata.TemplateHint, StringComparison.Ordinal),
+                        true
+                    },
+                    {
+                        new RequiredAttribute(),
+                        metadata => metadata.IsRequired,
+                        true
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ExpectedAttributeDataBooleans))]
+        public void AttributesOverrideMetadataBooleans(
+            Attribute attribute,
+            Func<ModelMetadata, bool> accessor,
+            bool expectedResult)
+        {
+            // Arrange
+            var attributes = new[] { attribute };
+            var provider = CreateProvider(attributes);
+            var metadata = provider.GetMetadataForProperty(typeof(CoolUser), nameof(CoolUser.Name));
+
+            // Act
+            var result = accessor(metadata);
+
+            // Assert
+            Assert.Equal(expectedResult, result);
+        }
+
+        public static TheoryData<DisplayAttribute, int> DisplayAttribute_OverridesOrderData
+        {
+            get
+            {
+                return new TheoryData<DisplayAttribute, int>
+                {
+                    {
+                        new DisplayAttribute(), ModelMetadata.DefaultOrder
+                    },
+                    {
+                        new DisplayAttribute { Order = int.MinValue }, int.MinValue
+                    },
+                    {
+                        new DisplayAttribute { Order = -100 }, -100
+                    },
+                    {
+                        new DisplayAttribute { Order = -1 }, -1
+                    },
+                    {
+                        new DisplayAttribute { Order = 0 }, 0
+                    },
+                    {
+                        new DisplayAttribute { Order = 1 }, 1
+                    },
+                    {
+                        new DisplayAttribute { Order = 200 }, 200
+                    },
+                    {
+                        new DisplayAttribute { Order = int.MaxValue }, int.MaxValue
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(DisplayAttribute_OverridesOrderData))]
+        public void DisplayAttribute_OverridesOrder(DisplayAttribute attribute, int expectedOrder)
+        {
+            // Arrange
+            var attributes = new[] { attribute };
+            var provider = CreateProvider(attributes);
+
+            var metadata = provider.GetMetadataForType(typeof(string));
+
+            // Act
+            var result = metadata.Order;
+
+            // Assert
+            Assert.Equal(expectedOrder, result);
+        }
+
+        [Fact]
+        public void DisplayAttribute_Description()
+        {
+            // Arrange
+            var display = new DisplayAttribute() { Description = "description" };
+            var provider = CreateProvider(new[] { display });
+
+            var metadata = provider.GetMetadataForType(typeof(string));
+
+            // Act
+            var result = metadata.Description;
+
+            // Assert
+            Assert.Equal("description", result);
+        }
+
+        [Fact]
+        public void DisplayAttribute_PromptAsPlaceholder()
+        {
+            // Arrange
+            var display = new DisplayAttribute() { Prompt = "prompt" };
+            var provider = CreateProvider(new[] { display });
+
+            var metadata = provider.GetMetadataForType(typeof(string));
+
+            // Act
+            var result = metadata.Placeholder;
+
+            // Assert
+            Assert.Equal("prompt", result);
+        }
+
+        [Fact]
+        public void DisplayName_FromResources_GetsRecomputed()
+        {
+            // Arrange
+            var display = new DisplayAttribute()
+            {
+                Name = nameof(TestResources.DisplayAttribute_CultureSensitiveName),
+                ResourceType = typeof(TestResources),
+            };
+
+            var provider = CreateProvider(new[] { display });
+            var metadata = provider.GetMetadataForType(typeof(string));
+
+            // Act & Assert
+            var cultures = new[] { "fr-FR", "en-US", "en-GB" };
+            foreach (var culture in cultures)
+            {
+                using (new CultureReplacer(uiCulture: culture))
+                {
+                    // Later iterations ensure value is recomputed.
+                    var result = metadata.DisplayName;
+                    Assert.Equal("name from resources" + culture, result);
+                }
+            }
+        }
+
+        [Fact]
+        public void Description_FromResources_GetsRecomputed()
+        {
+            // Arrange
+            var display = new DisplayAttribute()
+            {
+                Description = nameof(TestResources.DisplayAttribute_CultureSensitiveDescription),
+                ResourceType = typeof(TestResources),
+            };
+
+            var provider = CreateProvider(new[] { display });
+            var metadata = provider.GetMetadataForType(typeof(string));
+
+            // Act & Assert
+            var cultures = new[] { "fr-FR", "en-US", "en-GB" };
+            foreach (var culture in cultures)
+            {
+                using (new CultureReplacer(uiCulture: culture))
+                {
+                    // Later iterations ensure value is recomputed.
+                    var result = metadata.Description;
+                    Assert.Equal("description from resources" + culture, result);
+                }
+            }
+        }
+
+        [Fact]
+        public void DataTypeName_Null_IfHtmlEncodeTrue()
+        {
+            // Arrange
+            var displayFormat = new DisplayFormatAttribute { HtmlEncode = true, };
+            var provider = CreateProvider(new[] { displayFormat });
+
+            var metadata = provider.GetMetadataForType(typeof(string));
+
+            // Act
+            var result = metadata.DataTypeName;
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void DataTypeName_Html_IfHtmlEncodeFalse()
+        {
+            // Arrange
+            var expected = "Html";
+            var displayFormat = new DisplayFormatAttribute { HtmlEncode = false, };
+            var provider = CreateProvider(new[] { displayFormat });
+
+            var metadata = provider.GetMetadataForType(typeof(string));
+
+            // Act
+            var result = metadata.DataTypeName;
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Fact]
+        public void DataTypeName_AttributesHaveExpectedPrecedence()
+        {
+            // Arrange
+            var expected = "MultilineText";
+            var dataType = new DataTypeAttribute(DataType.MultilineText);
+            var displayFormat = new DisplayFormatAttribute { HtmlEncode = false, };
+            var provider = CreateProvider(new object[] { dataType, displayFormat });
+
+            var metadata = provider.GetMetadataForType(typeof(string));
+
+            // Act
+            var result = metadata.DataTypeName;
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Fact]
+        public void DisplayFormatString_AttributesHaveExpectedPrecedence()
+        {
+            // Arrange
+            var expected = "custom format";
+            var dataType = new DataTypeAttribute(DataType.Currency);
+            var displayFormat = new DisplayFormatAttribute { DataFormatString = expected, };
+            var provider = CreateProvider(new object[] { displayFormat, dataType, });
+
+            var metadata = provider.GetMetadataForType(typeof(string));
+
+            // Act
+            var result = metadata.DisplayFormatString;
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Fact]
+        public void EditFormatString_AttributesHaveExpectedPrecedence()
+        {
+            // Arrange
+            var expected = "custom format";
+            var dataType = new DataTypeAttribute(DataType.Currency);
+            var displayFormat = new DisplayFormatAttribute
+            {
+                ApplyFormatInEditMode = true,
+                DataFormatString = expected,
+            };
+
+            var provider = CreateProvider(new object[] { displayFormat, dataType, });
+
+            var metadata = provider.GetMetadataForType(typeof(string));
+
+            // Act
+            var result = metadata.EditFormatString;
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Fact]
+        public void TemplateHint_AttributesHaveExpectedPrecedence()
+        {
+            // Arrange
+            var expected = "this is a hint";
+            var hidden = new HiddenInputAttribute();
+            var uiHint = new UIHintAttribute(expected);
+            var provider = CreateProvider(new object[] { hidden, uiHint, });
+
+            var metadata = provider.GetMetadataForType(typeof(string));
+
+            // Act
+            var result = metadata.TemplateHint;
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Fact]
+        public void BinderTypeProviders_Null()
+        {
+            // Arrange
+            var binderProviders = new[]
+            {
+                new TestBinderTypeProvider(),
+                new TestBinderTypeProvider(),
+            };
+
+            var provider = CreateProvider(binderProviders);
+
+            // Act
+            var metadata = provider.GetMetadataForType(typeof(string));
+
+            // Assert
+            Assert.Null(metadata.BinderType);
+        }
+
+        [Fact]
+        public void BinderTypeProviders_Fallback()
+        {
+            // Arrange
+            var attributes = new[]
+            {
+                new TestBinderTypeProvider(),
+                new TestBinderTypeProvider() { BinderType = typeof(string) }
+            };
+
+            var provider = CreateProvider(attributes);
+
+            // Act
+            var metadata = provider.GetMetadataForType(typeof(string));
+
+            // Assert
+            Assert.Same(typeof(string), metadata.BinderType);
+        }
+
+        [Fact]
+        public void BinderTypeProviders_FirstAttributeHasPrecedence()
+        {
+            // Arrange
+            var attributes = new[]
+            {
+                new TestBinderTypeProvider() { BinderType = typeof(int) },
+                new TestBinderTypeProvider() { BinderType = typeof(string) }
+            };
+
+            var provider = CreateProvider(attributes);
+
+            // Act
+            var metadata = provider.GetMetadataForType(typeof(string));
+
+            // Assert
+            Assert.Same(typeof(int), metadata.BinderType);
+        }
+
+        [Fact]
+        public void IsRequired_DefaultsToTrueForValueType()
+        {
+            // Arrange
+            var attributes = new object[]
+            {
+            };
+
+            var provider = CreateProvider(attributes);
+
+            // Act
+            var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
+
+            // Assert
+            Assert.True(metadata.IsRequired);
+        }
+
+        [Fact]
+        public void IsRequired_DefaultsToFalseForReferenceType()
+        {
+            // Arrange
+            var attributes = new object[]
+            {
+            };
+
+            var provider = CreateProvider(attributes);
+
+            // Act
+            var metadata = provider.GetMetadataForProperty(typeof(Person), nameof(Person.Parent));
+
+            // Assert
+            Assert.False(metadata.IsRequired);
+        }
+
+        [Fact]
+        public void IsRequired_WithRequiredAttribute()
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+
+            // Act
+            var metadata = provider.GetMetadataForProperty(
+                typeof(RequiredMember),
+                nameof(RequiredMember.RequiredProperty));
+
+            // Assert
+            Assert.True(metadata.IsRequired);
+        }
+
+        [Fact]
+        public void IsBindingRequired_DataMemberIsRequiredTrue_SetsIsBindingRequiredToTrue()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+            // Act
+            var metadata = metadataProvider.GetMetadataForProperty(
+                typeof(ClassWithDataMemberIsRequiredTrue),
+                nameof(ClassWithDataMemberIsRequiredTrue.StringProperty));
+
+            // Assert
+            Assert.True(metadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void IsBindingRequired_DataMemberIsRequiredFalse_False()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+            // Act
+            var metadata = metadataProvider.GetMetadataForProperty(
+                typeof(ClassWithDataMemberIsRequiredFalse),
+                nameof(ClassWithDataMemberIsRequiredFalse.StringProperty));
+
+            // Assert
+            Assert.False(metadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void IsBindingRequiredDataMemberIsRequiredTrueWithoutDataContract_False()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+            // Act
+            var metadata = metadataProvider.GetMetadataForProperty(
+                typeof(ClassWithDataMemberIsRequiredTrueWithoutDataContract),
+                nameof(ClassWithDataMemberIsRequiredTrueWithoutDataContract.StringProperty));
+
+            // Assert
+            Assert.False(metadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void PropertySetter_NotNull_ForPublicSetProperty()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+            // Act
+            var metadata = metadataProvider.GetMetadataForProperty(
+                typeof(ClassWithPublicSetProperty),
+                nameof(ClassWithPublicSetProperty.StringProperty));
+
+            // Assert
+            Assert.NotNull(metadata.PropertySetter);
+            Assert.NotNull(metadata.PropertyGetter);
+        }
+
+        [Fact]
+        public void PropertySetter_Null_ForPrivateSetProperty()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+            // Act
+            var metadata = metadataProvider.GetMetadataForProperty(
+                typeof(ClassWithPrivateSetProperty),
+                nameof(ClassWithPrivateSetProperty.StringProperty));
+
+            // Assert
+            Assert.Null(metadata.PropertySetter);
+            Assert.NotNull(metadata.PropertyGetter);
+        }
+
+        [Fact]
+        public void Metadata_Null_ForPrivateGetProperty()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var type = typeof(ClassWithPrivateGetProperty);
+            var propertyName = nameof(ClassWithPrivateGetProperty.StringProperty);
+
+            // Act & Assert
+            var metadata = metadataProvider.GetMetadataForType(type);
+            Assert.Null(metadata.Properties[propertyName]);
+        }
+
+        [Fact]
+        public void BindingBehavior_GetMetadataForType_UsesDefaultValues()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var type = typeof(BindingBehaviorModel);
+
+            // Act
+            var metadata = metadataProvider.GetMetadataForType(type);
+
+            // Assert
+            Assert.True(metadata.IsBindingAllowed);
+            Assert.False(metadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void BindingBehavior_Override_RequiredOnProperty()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var type = typeof(BindingBehaviorModel);
+            var propertyName = nameof(BindingBehaviorModel.BindRequiredOverride);
+
+            // Act
+            var metadata = metadataProvider.GetMetadataForProperty(type, propertyName);
+
+            // Assert
+            Assert.True(metadata.IsBindingAllowed);
+            Assert.True(metadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void BindingBehavior_Override_OptionalOnProperty()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var type = typeof(BindingBehaviorModel);
+            var propertyName = nameof(BindingBehaviorModel.BindingBehaviorOptionalOverride);
+
+            // Act
+            var metadata = metadataProvider.GetMetadataForProperty(type, propertyName);
+
+            // Assert
+            Assert.True(metadata.IsBindingAllowed);
+            Assert.False(metadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void BindingBehavior_Never_DuplicatedPropertyAndClass()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var type = typeof(BindingBehaviorModel);
+            var propertyName = nameof(BindingBehaviorModel.BindingBehaviorNeverDuplicatedFromClass);
+
+            // Act
+            var metadata = metadataProvider.GetMetadataForProperty(type, propertyName);
+
+            // Assert
+            Assert.False(metadata.IsBindingAllowed);
+            Assert.False(metadata.IsBindingRequired);
+        }
+
+        [Fact]
+        public void BindingBehavior_Never_SetOnClass()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var type = typeof(BindingBehaviorModel);
+            var propertyName = nameof(BindingBehaviorModel.BindingBehaviorNeverSetOnClass);
+
+            // Act
+            var metadata = metadataProvider.GetMetadataForProperty(type, propertyName);
+
+            // Assert
+            Assert.False(metadata.IsBindingAllowed);
+            Assert.False(metadata.IsBindingRequired);
+        }
+
+        private IModelMetadataProvider CreateProvider(params object[] attributes)
+        {
+            return new AttributeInjectModelMetadataProvider(attributes);
+        }
+
+        private class ClassWithPrivateSetProperty
+        {
+            public string StringProperty { private set; get; }
+        }
+
+        private class ClassWithPublicSetProperty
+        {
+            public string StringProperty { set; get; }
+        }
+
+        private class ClassWithPrivateGetProperty
+        {
+            public string StringProperty { set; private get; }
+        }
+
+        [DataContract]
+        private class ClassWithDataMemberIsRequiredTrue
+        {
+            [DataMember(IsRequired = true)]
+            public string StringProperty { get; set; }
+        }
+
+        [DataContract]
+        private class ClassWithDataMemberIsRequiredFalse
+        {
+            [DataMember(IsRequired = false)]
+            public string StringProperty { get; set; }
+
+            [DataMember(IsRequired = false)]
+            public int IntProperty { get; set; }
+        }
+
+        private class ClassWithDataMemberIsRequiredTrueWithoutDataContract
+        {
+            [DataMember(IsRequired = true)]
+            public string StringProperty { get; set; }
+        }
+
+        private class TestBinderTypeProvider : IBinderTypeProviderMetadata
+        {
+            public Type BinderType { get; set; }
+
+            public BindingSource BindingSource { get; set; }
+        }
+
+        private class DataTypeWithCustomDisplayFormat : DataTypeAttribute
+        {
+            public DataTypeWithCustomDisplayFormat() : base("Custom datatype")
+            {
+                DisplayFormat = new DisplayFormatAttribute
+                {
+                    DataFormatString = "value",
+                };
+            }
+        }
+
+        private class DataTypeWithCustomEditFormat : DataTypeAttribute
+        {
+            public DataTypeWithCustomEditFormat() : base("Custom datatype")
+            {
+                DisplayFormat = new DisplayFormatAttribute
+                {
+                    ApplyFormatInEditMode = true,
+                    DataFormatString = "value",
+                };
+            }
+        }
+
+        public class CoolUser
+        {
+            public string Name { get; set; }
+        }
+
+        public class TypeBasedBinderAttribute : Attribute, IModelNameProvider
+        {
+            public string Name { get; set; }
+        }
+
+        public class NonTypeBasedBinderAttribute : Attribute, IModelNameProvider
+        {
+            public string Name { get; set; }
+        }
+
+        [TypeBasedBinder(Name = "PersonType")]
+        public class Person
+        {
+            public Person Parent { get; set; }
+
+            [NonTypeBasedBinder(Name = "GrandParentProperty")]
+            public Person GrandParent { get; set; }
+
+            public void Update(Person person)
+            {
+            }
+
+            public void Save([NonTypeBasedBinder(Name = "PersonParameter")] Person person)
+            {
+            }
+        }
+
+        private class ScaffoldColumnModel
+        {
+            public int NoAttribute { get; set; }
+
+            [ScaffoldColumn(scaffold: true)]
+            public int ScaffoldColumnTrue { get; set; }
+
+            [ScaffoldColumn(scaffold: false)]
+            public int ScaffoldColumnFalse { get; set; }
+        }
+
+        [HiddenInput(DisplayValue = false)]
+        private class HiddenClass
+        {
+            public string Property { get; set; }
+        }
+
+        private class ClassWithHiddenProperties
+        {
+            [HiddenInput(DisplayValue = false)]
+            public string DirectlyHidden { get; set; }
+
+            public HiddenClass OfHiddenType { get; set; }
+        }
+
+        [Bind(new[] { nameof(IsAdmin), nameof(UserName) }, Prefix = "TypePrefix")]
+        private class User
+        {
+            public int Id { get; set; }
+
+            public bool IsAdmin { get; set; }
+
+            public int UserName { get; set; }
+
+            public int NotIncludedOrExcluded { get; set; }
+        }
+
+        private class RequiredMember
+        {
+            [Required]
+            public string RequiredProperty { get; set; }
+        }
+
+        [BindNever]
+        private class BindingBehaviorModel
+        {
+            [BindRequired]
+            public int BindRequiredOverride { get; set; }
+
+            [BindingBehavior(BindingBehavior.Optional)]
+            public int BindingBehaviorOptionalOverride { get; set; }
+
+            [BindingBehavior(BindingBehavior.Never)]
+            public int BindingBehaviorNeverDuplicatedFromClass { get; set; }
+
+            public int BindingBehaviorNeverSetOnClass { get; set; }
+        }
+
+        private class AttributeInjectModelMetadataProvider : DefaultModelMetadataProvider
+        {
+            private readonly object[] _attributes;
+
+            public AttributeInjectModelMetadataProvider(object[] attributes)
+                : base(
+                      new DefaultCompositeMetadataDetailsProvider(new IMetadataDetailsProvider[]
+                      {
+                          new DefaultBindingMetadataProvider(),
+                          new DataAnnotationsMetadataProvider(
+                              Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                              stringLocalizerFactory: null),
+                      }),
+                      Options.Create(new MvcOptions()))
+            {
+                _attributes = attributes;
+            }
+
+            protected override DefaultMetadataDetails CreateTypeDetails(ModelMetadataIdentity key)
+            {
+                var entry = base.CreateTypeDetails(key);
+                if (_attributes?.Length > 0)
+                {
+                    return new DefaultMetadataDetails(
+                        key,
+#pragma warning disable CS0618 // Type or member is obsolete
+                        new ModelAttributes(_attributes.Concat(entry.ModelAttributes.TypeAttributes).ToArray()));
+#pragma warning restore CS0618 // Type or member is obsolete
+                }
+
+                return entry;
+            }
+
+            protected override DefaultMetadataDetails[] CreatePropertyDetails(ModelMetadataIdentity key)
+            {
+                var entries = base.CreatePropertyDetails(key);
+                return entries.Select(e =>
+                {
+                    return new DefaultMetadataDetails(
+                        e.Key,
+#pragma warning disable CS0618 // Type or member is obsolete
+                        new ModelAttributes(
+                            _attributes.Concat(e.ModelAttributes.PropertyAttributes),
+                            e.ModelAttributes.TypeAttributes));
+#pragma warning restore CS0618 // Type or member is obsolete
+                })
+                .ToArray();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ModelValidationResultComparer.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ModelValidationResultComparer.cs
new file mode 100644
index 0000000000..289f30ec35
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ModelValidationResultComparer.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class ModelValidationResultComparer : IEqualityComparer<ModelValidationResult>
+    {
+        public static readonly ModelValidationResultComparer Instance = new ModelValidationResultComparer();
+
+        private ModelValidationResultComparer()
+        {
+        }
+
+        public bool Equals(ModelValidationResult x, ModelValidationResult y)
+        {
+            if (x == null || y == null)
+            {
+                return x == null && y == null;
+            }
+
+            return string.Equals(x.MemberName, y.MemberName, StringComparison.Ordinal) &&
+                string.Equals(x.Message, y.Message, StringComparison.Ordinal);
+        }
+
+        public int GetHashCode(ModelValidationResult obj)
+        {
+            if (obj == null)
+            {
+                throw new ArgumentNullException(nameof(obj));
+            }
+
+            var hashCodeCombiner = HashCodeCombiner.Start();
+            hashCodeCombiner.Add(obj.MemberName, StringComparer.Ordinal);
+            hashCodeCombiner.Add(obj.Message, StringComparer.Ordinal);
+
+            return hashCodeCombiner.CombinedHash;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/MvcDataAnnotationsMvcOptionsSetup.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/MvcDataAnnotationsMvcOptionsSetup.cs
new file mode 100644
index 0000000000..78887bb309
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/MvcDataAnnotationsMvcOptionsSetup.cs
@@ -0,0 +1,37 @@
+// 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.
+
+using System.Reflection;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Test.Internal
+{
+    public class MvcDataAnnotationsMvcOptionsSetupTests
+    {
+        [Fact]
+        public void MvcDataAnnotationsMvcOptionsSetup_ServiceConstructorWithoutIStringLocalizer()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            services.AddSingleton<IHostingEnvironment>(Mock.Of<IHostingEnvironment>());
+            services.AddSingleton<IValidationAttributeAdapterProvider, ValidationAttributeAdapterProvider>();
+            services.AddSingleton<IOptions<MvcDataAnnotationsLocalizationOptions>>(
+                Options.Create(new MvcDataAnnotationsLocalizationOptions()));
+            services.AddSingleton<IConfigureOptions<MvcOptions>, MvcDataAnnotationsMvcOptionsSetup>();
+
+            var serviceProvider = services.BuildServiceProvider();
+
+            // Act
+            var optionsSetup = serviceProvider.GetRequiredService<IConfigureOptions<MvcOptions>>();
+
+            // Assert
+            Assert.NotNull(optionsSetup);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/NumericClientModelValidatorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/NumericClientModelValidatorTest.cs
new file mode 100644
index 0000000000..71e0b6adfb
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/NumericClientModelValidatorTest.cs
@@ -0,0 +1,167 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class NumericClientModelValidatorTest
+    {
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_CorrectValidationTypeAndErrorMessage()
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(TypeWithNumericProperty), "Id");
+
+            var adapter = new NumericClientModelValidator();
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            var expectedMessage = "The field DisplayId must be a number.";
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-number", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); });
+        }
+
+        [Fact]
+        public void AddValidation_CorrectValidationTypeAndOverriddenErrorMessage()
+        {
+            // Arrange
+            var expectedMessage = "Error message about 'DisplayId' from override.";
+            var provider = new TestModelMetadataProvider();
+            provider
+                .ForProperty(typeof(TypeWithNumericProperty), nameof(TypeWithNumericProperty.Id))
+                .BindingDetails(d =>
+                {
+                    d.ModelBindingMessageProvider.SetValueMustBeANumberAccessor(
+                        name => $"Error message about '{ name }' from override.");
+                });
+            var metadata = provider.GetMetadataForProperty(
+                typeof(TypeWithNumericProperty),
+                nameof(TypeWithNumericProperty.Id));
+
+            var adapter = new NumericClientModelValidator();
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-number", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); });
+        }
+
+        [Fact]
+        public void AddValidation_CorrectValidationTypeAndOverriddenErrorMessage_WithParameter()
+        {
+            // Arrange
+            var expectedMessage = "Error message about 'number' from override.";
+
+            var method = typeof(TypeWithNumericProperty).GetMethod(nameof(TypeWithNumericProperty.IsLovely));
+            var parameter = method.GetParameters()[0]; // IsLovely(double number)
+            var provider = new TestModelMetadataProvider();
+            provider
+                .ForParameter(parameter)
+                .BindingDetails(d =>
+                {
+                    d.ModelBindingMessageProvider.SetValueMustBeANumberAccessor(
+                        name => $"Error message about '{ name }' from override.");
+                });
+            var metadata = provider.GetMetadataForParameter(parameter);
+
+            var adapter = new NumericClientModelValidator();
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-number", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); });
+        }
+
+        [Fact]
+        public void AddValidation_CorrectValidationTypeAndOverriddenErrorMessage_WithType()
+        {
+            // Arrange
+            var expectedMessage = "Error message from override.";
+            var provider = new TestModelMetadataProvider();
+            provider
+                .ForType(typeof(int))
+                .BindingDetails(d => d.ModelBindingMessageProvider.SetNonPropertyValueMustBeANumberAccessor(
+                    () => $"Error message from override."));
+            var metadata = provider.GetMetadataForType(typeof(int));
+
+            var adapter = new NumericClientModelValidator();
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-number", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_DoesNotTrounceExistingAttributes()
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(TypeWithNumericProperty), "Id");
+
+            var adapter = new NumericClientModelValidator();
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            context.Attributes.Add("data-val", "original");
+            context.Attributes.Add("data-val-number", "original");
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("original", kvp.Value); },
+                kvp => { Assert.Equal("data-val-number", kvp.Key); Assert.Equal("original", kvp.Value); });
+        }
+
+        private class TypeWithNumericProperty
+        {
+            [Display(Name = "DisplayId")]
+            public float Id { get; set; }
+
+            public bool IsLovely(double number)
+            {
+                return true;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/RangeAttributeAdapterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/RangeAttributeAdapterTest.cs
new file mode 100644
index 0000000000..bbf5cf076b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/RangeAttributeAdapterTest.cs
@@ -0,0 +1,115 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.Localization;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    public class RangeAttributeAdapterTest
+    {
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_WithoutLocalization()
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
+
+            var attribute = new RangeAttribute(typeof(decimal), "0", "100");
+            attribute.ErrorMessage = "The field Length must be between {1} and {2}.";
+
+            var expectedMessage = "The field Length must be between 0 and 100.";
+
+            var adapter = new RangeAttributeAdapter(attribute, stringLocalizer: null);
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-range", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); },
+                kvp => { Assert.Equal("data-val-range-max", kvp.Key); Assert.Equal("100", kvp.Value); },
+                kvp => { Assert.Equal("data-val-range-min", kvp.Key); Assert.Equal("0", kvp.Value); });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_WithLocalization()
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
+
+            var attribute = new RangeAttribute(typeof(decimal), "0", "100");
+            attribute.ErrorMessage = "The field Length must be between {1} and {2}.";
+
+            var expectedProperties = new object[] { "Length", 0m, 100m };
+            var expectedMessage = "The field Length must be between 0 and 100.";
+
+            var stringLocalizer = new Mock<IStringLocalizer>();
+            stringLocalizer
+                .Setup(s => s[attribute.ErrorMessage, expectedProperties])
+                .Returns(new LocalizedString(attribute.ErrorMessage, expectedMessage));
+
+            var adapter = new RangeAttributeAdapter(attribute, stringLocalizer: stringLocalizer.Object);
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-range", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); },
+                kvp => { Assert.Equal("data-val-range-max", kvp.Key); Assert.Equal("100", kvp.Value); },
+                kvp => { Assert.Equal("data-val-range-min", kvp.Key); Assert.Equal("0", kvp.Value); });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_DoesNotTrounceExistingAttributes()
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
+
+            var attribute = new RangeAttribute(typeof(decimal), "0", "100");
+            attribute.ErrorMessage = "The field Length must be between {1} and {2}.";
+
+            var adapter = new RangeAttributeAdapter(attribute, stringLocalizer: null);
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            context.Attributes.Add("data-val", "original");
+            context.Attributes.Add("data-val-range", "original");
+            context.Attributes.Add("data-val-range-max", "original");
+            context.Attributes.Add("data-val-range-min", "original");
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("original", kvp.Value); },
+                kvp => { Assert.Equal("data-val-range", kvp.Key); Assert.Equal("original", kvp.Value); },
+                kvp => { Assert.Equal("data-val-range-max", kvp.Key); Assert.Equal("original", kvp.Value); },
+                kvp => { Assert.Equal("data-val-range-min", kvp.Key); Assert.Equal("original", kvp.Value); });
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/RequiredAttributeAdapterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/RequiredAttributeAdapterTest.cs
new file mode 100644
index 0000000000..6dec6abfa7
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/RequiredAttributeAdapterTest.cs
@@ -0,0 +1,104 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.Localization;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class RequiredAttributeAdapterTest
+    {
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_AddsValidation_Localize()
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
+
+            var attribute = new RequiredAttribute();
+
+            var expectedProperties = new object[] { "Length" };
+            var message = "This paramter is required.";
+            var expectedMessage = "FR This parameter is required.";
+            attribute.ErrorMessage = message;
+
+            var stringLocalizer = new Mock<IStringLocalizer>();
+            stringLocalizer.Setup(s => s[attribute.ErrorMessage, expectedProperties])
+                .Returns(new LocalizedString(attribute.ErrorMessage, expectedMessage));
+
+            var adapter = new RequiredAttributeAdapter(attribute, stringLocalizer: stringLocalizer.Object);
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-required", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_AddsValidation()
+        {
+            // Arrange
+            var expectedMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Length");
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
+
+            var attribute = new RequiredAttribute();
+            var adapter = new RequiredAttributeAdapter(attribute, stringLocalizer: null);
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-required", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_DoesNotTrounceExistingAttributes()
+        {
+            // Arrange
+            var expectedMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Length");
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
+
+            var attribute = new RequiredAttribute();
+            var adapter = new RequiredAttributeAdapter(attribute, stringLocalizer: null);
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            context.Attributes.Add("data-val", "original");
+            context.Attributes.Add("data-val-required", "original");
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("original", kvp.Value); },
+                kvp => { Assert.Equal("data-val-required", kvp.Key); Assert.Equal("original", kvp.Value); });
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/StringLengthAttributeAdapterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/StringLengthAttributeAdapterTest.cs
new file mode 100644
index 0000000000..87c820dfe8
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/StringLengthAttributeAdapterTest.cs
@@ -0,0 +1,167 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.Localization;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class StringLengthAttributeAdapterTest
+    {
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_WithMaxLengthAndMinLength_AddsAttributes_Localize()
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
+
+            var attribute = new StringLengthAttribute(8);
+            attribute.ErrorMessage = "Property must not be longer than '{1}' characters and not shorter than '{2}' characters.";
+
+            var expectedMessage = "Property must not be longer than '8' characters and not shorter than '0' characters.";
+
+            var stringLocalizer = new Mock<IStringLocalizer>();
+            var expectedProperties = new object[] { "Length", 8, 0 };
+
+            stringLocalizer.Setup(s => s[attribute.ErrorMessage, expectedProperties])
+                .Returns(new LocalizedString(attribute.ErrorMessage, expectedMessage));
+
+            var adapter = new StringLengthAttributeAdapter(attribute, stringLocalizer: stringLocalizer.Object);
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-length", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); },
+                kvp => { Assert.Equal("data-val-length-max", kvp.Key); Assert.Equal("8", kvp.Value); });
+
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_WithMaxLength_AddsAttributes()
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
+
+            var attribute = new StringLengthAttribute(8);
+            var adapter = new StringLengthAttributeAdapter(attribute, stringLocalizer: null);
+
+            var expectedMessage = attribute.FormatErrorMessage("Length");
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-length", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); },
+                kvp => { Assert.Equal("data-val-length-max", kvp.Key); Assert.Equal("8", kvp.Value); });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_WithMinAndMaxLength_AddsAttributes()
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
+
+            var attribute = new StringLengthAttribute(10) { MinimumLength = 3 };
+            var adapter = new StringLengthAttributeAdapter(attribute, stringLocalizer: null);
+
+            var expectedMessage = attribute.FormatErrorMessage("Length");
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-length", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); },
+                kvp => { Assert.Equal("data-val-length-max", kvp.Key); Assert.Equal("10", kvp.Value); },
+                kvp => { Assert.Equal("data-val-length-min", kvp.Key); Assert.Equal("3", kvp.Value); });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_WithMaxLength_AtIntMaxValue_AddsAttributes()
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
+
+            var attribute = new StringLengthAttribute(int.MaxValue);
+            var adapter = new StringLengthAttributeAdapter(attribute, stringLocalizer: null);
+
+            var expectedMessage = attribute.FormatErrorMessage("Length");
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-length", kvp.Key); Assert.Equal(expectedMessage, kvp.Value); });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_DoesNotTrounceExistingAttributes()
+        {
+            // Arrange
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
+
+            var attribute = new StringLengthAttribute(10) { MinimumLength = 3 };
+            var adapter = new StringLengthAttributeAdapter(attribute, stringLocalizer: null);
+
+            var expectedMessage = attribute.FormatErrorMessage("Length");
+
+            var actionContext = new ActionContext();
+            var context = new ClientModelValidationContext(actionContext, metadata, provider, new AttributeDictionary());
+
+            context.Attributes.Add("data-val", "original");
+            context.Attributes.Add("data-val-length", "original");
+            context.Attributes.Add("data-val-length-max", "original");
+            context.Attributes.Add("data-val-length-min", "original");
+
+            // Act
+            adapter.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("original", kvp.Value); },
+                kvp => { Assert.Equal("data-val-length", kvp.Key); Assert.Equal("original", kvp.Value); },
+                kvp => { Assert.Equal("data-val-length-max", kvp.Key); Assert.Equal("original", kvp.Value); },
+                kvp => { Assert.Equal("data-val-length-min", kvp.Key); Assert.Equal("original", kvp.Value); });
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/TestModelNameProvider.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/TestModelNameProvider.cs
new file mode 100644
index 0000000000..3e93fbb7b4
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/TestModelNameProvider.cs
@@ -0,0 +1,12 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class TestModelNameProvider : IModelNameProvider
+    {
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/TestResources.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/TestResources.cs
new file mode 100644
index 0000000000..4d02719fa8
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/TestResources.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using System.Globalization;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Test;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    // Wrap resources to make them available as public properties for [Display]. That attribute does not support
+    // internal properties.
+    public static class TestResources
+    {
+        public static string Type_Three_Name => "type three name " + CultureInfo.CurrentCulture;
+
+        public static string DisplayAttribute_Description => Resources.DisplayAttribute_Description;
+
+        public static string DisplayAttribute_Name => Resources.DisplayAttribute_Name;
+
+        public static string DisplayAttribute_Prompt => Resources.DisplayAttribute_Prompt;
+
+        public static string DisplayAttribute_CultureSensitiveName =>
+            Resources.DisplayAttribute_Name + CultureInfo.CurrentUICulture;
+
+        public static string DisplayAttribute_CultureSensitiveDescription =>
+            Resources.DisplayAttribute_Description + CultureInfo.CurrentUICulture;
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ValidatableObjectAdapterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ValidatableObjectAdapterTest.cs
new file mode 100644
index 0000000000..56a127ea25
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ValidatableObjectAdapterTest.cs
@@ -0,0 +1,221 @@
+// 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.
+
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class ValidatableObjectAdapterTest
+    {
+        private static readonly ModelMetadataProvider _metadataProvider
+            = TestModelMetadataProvider.CreateDefaultProvider();
+
+        // Inspired by DataAnnotationsModelValidatorTest.Validate_SetsMemberName_AsExpectedData but using a type that
+        // implements IValidatableObject. Values are metadata, expected DisplayName, and expected MemberName.
+        public static TheoryData<ModelMetadata, string, string> Validate_PassesExpectedNamesData
+        {
+            get
+            {
+                var method = typeof(SampleModel).GetMethod(nameof(SampleModel.IsLovely));
+                var parameter = method.GetParameters()[0]; // IsLovely(SampleModel other)
+                return new TheoryData<ModelMetadata, string, string>
+                {
+                    {
+                        // Validating a property.
+                        _metadataProvider.GetMetadataForProperty(
+                            typeof(SampleModelContainer),
+                            nameof(SampleModelContainer.SampleModel)),
+                        nameof(SampleModelContainer.SampleModel),
+                        nameof(SampleModelContainer.SampleModel)
+                    },
+                    {
+                        // Validating a property with [Display(Name = "...")].
+                        _metadataProvider.GetMetadataForProperty(
+                            typeof(SampleModelContainer),
+                            nameof(SampleModelContainer.SampleModelWithDisplay)),
+                        "sample model",
+                        nameof(SampleModelContainer.SampleModelWithDisplay)
+                    },
+                    {
+                        // Validating a parameter.
+                        _metadataProvider.GetMetadataForParameter(parameter),
+                        "other",
+                        "other"
+                    },
+                    {
+                        // Validating a top-level parameter when using old-fashioned metadata provider.
+                        // Or, validating an element of a collection.
+                        _metadataProvider.GetMetadataForType(typeof(SampleModel)),
+                        nameof(SampleModel),
+                        null
+                    },
+                };
+            }
+        }
+
+        public static TheoryData<ValidationResult[], ModelValidationResult[]> Validate_ReturnsExpectedResultsData
+        {
+            get
+            {
+                return new TheoryData<ValidationResult[], ModelValidationResult[]>
+                {
+                    {
+                        new[] { new ValidationResult("Error message") },
+                        new[] { new ModelValidationResult(memberName: null, message: "Error message") }
+                    },
+                    {
+                        new[] { new ValidationResult("Error message", new[] { nameof(SampleModel.FirstName) }) },
+                        new[] { new ModelValidationResult(nameof(SampleModel.FirstName), "Error message") }
+                    },
+                    {
+                        new[]
+                        {
+                            new ValidationResult("Error message1"),
+                            new ValidationResult("Error message2", new[] { nameof(SampleModel.FirstName) }),
+                            new ValidationResult("Error message3", new[] { nameof(SampleModel.LastName) }),
+                            new ValidationResult("Error message4", new[] { nameof(SampleModel) }),
+                        },
+                        new[]
+                        {
+                            new ModelValidationResult(memberName: null, message: "Error message1"),
+                            new ModelValidationResult(nameof(SampleModel.FirstName), "Error message2"),
+                            new ModelValidationResult(nameof(SampleModel.LastName), "Error message3"),
+                            // No special case for ValidationContext.MemberName==ValidationResult.MemberName
+                            new ModelValidationResult(nameof(SampleModel), "Error message4"),
+                        }
+                    },
+                    {
+                        new[]
+                        {
+                            new ValidationResult("Error message1", new[]
+                            {
+                                nameof(SampleModel.FirstName),
+                                nameof(SampleModel.LastName),
+                            }),
+                            new ValidationResult("Error message2"),
+                        },
+                        new[]
+                        {
+                            new ModelValidationResult(nameof(SampleModel.FirstName), "Error message1"),
+                            new ModelValidationResult(nameof(SampleModel.LastName), "Error message1"),
+                            new ModelValidationResult(memberName: null, message: "Error message2"),
+                        }
+                    },
+                };
+            }
+        }
+
+
+        [Theory]
+        [MemberData(nameof(Validate_PassesExpectedNamesData))]
+        public void Validate_PassesExpectedNames(
+            ModelMetadata metadata,
+            string expectedDisplayName,
+            string expectedMemberName)
+        {
+            // Arrange
+            var adapter = new ValidatableObjectAdapter();
+            var model = new SampleModel();
+            var validationContext = new ModelValidationContext(
+                new ActionContext(),
+                metadata,
+                _metadataProvider,
+                container: new SampleModelContainer(),
+                model: model);
+
+            // Act
+            var results = adapter.Validate(validationContext);
+
+            // Assert
+            Assert.NotNull(results);
+            Assert.Empty(results);
+
+            Assert.Equal(expectedDisplayName, model.DisplayName);
+            Assert.Equal(expectedMemberName, model.MemberName);
+            Assert.Equal(model, model.ObjectInstance);
+        }
+
+        [Theory]
+        [MemberData(nameof(Validate_ReturnsExpectedResultsData))]
+        public void Validate_ReturnsExpectedResults(
+            ValidationResult[] innerResults,
+            ModelValidationResult[] expectedResults)
+        {
+            // Arrange
+            var adapter = new ValidatableObjectAdapter();
+            var model = new SampleModel();
+            foreach (var result in innerResults)
+            {
+                model.ValidationResults.Add(result);
+            }
+
+            var metadata = _metadataProvider.GetMetadataForProperty(
+                typeof(SampleModelContainer),
+                nameof(SampleModelContainer.SampleModel));
+            var validationContext = new ModelValidationContext(
+                new ActionContext(),
+                metadata,
+                _metadataProvider,
+                container: null,
+                model: model);
+
+            // Act
+            var results = adapter.Validate(validationContext);
+
+            // Assert
+            Assert.NotNull(results);
+            Assert.Equal(expectedResults, results, ModelValidationResultComparer.Instance);
+        }
+
+        private class SampleModel : IValidatableObject
+        {
+            // "Real" properties.
+
+            public string FirstName { get; set; }
+
+            public string LastName { get; set; }
+
+            // ValidationContext members passed to Validate(...)
+
+            public string DisplayName { get; private set; }
+
+            public string MemberName { get; private set; }
+
+            public object ObjectInstance { get; private set; }
+
+            // What Validate(...) should return.
+
+            public IList<ValidationResult> ValidationResults { get; } = new List<ValidationResult>();
+
+            // Test method.
+
+            public bool IsLovely(SampleModel other)
+            {
+                return true;
+            }
+
+            // IValidatableObject for realz.
+
+            public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+            {
+                DisplayName = validationContext.DisplayName;
+                MemberName = validationContext.MemberName;
+                ObjectInstance = validationContext.ObjectInstance;
+
+                return ValidationResults;
+            }
+        }
+
+        private class SampleModelContainer
+        {
+            [Display(Name = "sample model")]
+            public SampleModel SampleModelWithDisplay { get; set; }
+
+            public SampleModel SampleModel { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ValidationAttributeAdapterOfTAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ValidationAttributeAdapterOfTAttributeTest.cs
new file mode 100644
index 0000000000..e616795fcf
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ValidationAttributeAdapterOfTAttributeTest.cs
@@ -0,0 +1,74 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Localization;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class ValidationAttributeAdapterOfTAttributeTest
+    {
+        [Fact]
+        public void GetErrorMessage_DontLocalizeWhenErrorMessageResourceTypeGiven()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+            var modelMetadata = metadataProvider.GetMetadataForProperty(typeof(string), "Length");
+
+            var stringLocalizer = new Mock<IStringLocalizer>(MockBehavior.Loose);
+
+            var attribute = new TestValidationAttribute();
+            var adapter = new TestValidationAttributeAdapter(attribute, stringLocalizer.Object);
+
+            var actionContext = new ActionContext();
+            var validationContext = new ModelValidationContext(
+                actionContext,
+                modelMetadata,
+                metadataProvider,
+                container: null,
+                model: null);
+
+            // Act
+            adapter.GetErrorMessage(validationContext);
+
+            // Assert
+            Assert.True(attribute.Formated);
+        }
+
+        public class TestValidationAttribute : ValidationAttribute
+        {
+            public bool Formated = false;
+
+            public override string FormatErrorMessage(string name)
+            {
+                Formated = true;
+                return base.FormatErrorMessage(name);
+            }
+        }
+
+        public class TestValidationAttributeAdapter : ValidationAttributeAdapter<TestValidationAttribute>
+        {
+            public TestValidationAttributeAdapter(TestValidationAttribute attribute, IStringLocalizer stringLocalizer)
+                : base(attribute, stringLocalizer)
+            { }
+
+            public override void AddValidation(ClientModelValidationContext context)
+            {
+                throw new NotImplementedException();
+            }
+
+            public string GetErrorMessage(ModelValidationContextBase validationContext)
+            {
+                var displayName = validationContext.ModelMetadata.GetDisplayName();
+                return GetErrorMessage(validationContext.ModelMetadata, displayName);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ValidationAttributeAdapterProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ValidationAttributeAdapterProviderTest.cs
new file mode 100644
index 0000000000..beb2ffda18
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Internal/ValidationAttributeAdapterProviderTest.cs
@@ -0,0 +1,89 @@
+// 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.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
+{
+    public class ValidationAttributeAdapterProviderTest
+    {
+        private readonly IValidationAttributeAdapterProvider _validationAttributeAdapterProvider =
+            new ValidationAttributeAdapterProvider();
+
+        public static TheoryData<ValidationAttribute, Type> DataAnnotationAdapters
+        {
+            get
+            {
+                return new TheoryData<ValidationAttribute, Type>
+                {
+                    {
+                        new RegularExpressionAttribute("abc"),
+                        typeof(RegularExpressionAttributeAdapter)
+                    },
+                    {
+                        new MaxLengthAttribute(),
+                        typeof(MaxLengthAttributeAdapter)
+                    },
+                    {
+                        new MinLengthAttribute(1),
+                        typeof(MinLengthAttributeAdapter)
+                    },
+                    {
+                        new RangeAttribute(1, 100),
+                        typeof(RangeAttributeAdapter)
+                    },
+                    {
+                        new StringLengthAttribute(6),
+                        typeof(StringLengthAttributeAdapter)
+                    },
+                    {
+                        new RequiredAttribute(),
+                        typeof(RequiredAttributeAdapter)
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(DataAnnotationAdapters))]
+        public void AdapterFactory_RegistersAdapters_ForDataAnnotationAttributes(
+               ValidationAttribute attribute,
+               Type expectedAdapterType)
+        {
+            // Arrange and Act
+            var adapter = _validationAttributeAdapterProvider.GetAttributeAdapter(attribute, stringLocalizer: null);
+
+            // Assert
+            Assert.IsType(expectedAdapterType, adapter);
+        }
+
+        public static TheoryData<ValidationAttribute, string> DataTypeAdapters
+        {
+            get
+            {
+                return new TheoryData<ValidationAttribute, string> {
+                    { new UrlAttribute(), "data-val-url" },
+                    { new CreditCardAttribute(), "data-val-creditcard" },
+                    { new EmailAddressAttribute(), "data-val-email" },
+                    { new PhoneAttribute(), "data-val-phone" }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(DataTypeAdapters))]
+        public void AdapterFactory_RegistersAdapters_ForDataTypeAttributes(
+            ValidationAttribute attribute,
+            string expectedRuleName)
+        {
+            // Arrange & Act
+            var adapter = _validationAttributeAdapterProvider.GetAttributeAdapter(attribute, stringLocalizer: null);
+
+            // Assert
+            var dataTypeAdapter = Assert.IsType<DataTypeAttributeAdapter>(adapter);
+            Assert.Equal(expectedRuleName, dataTypeAdapter.RuleName);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj
new file mode 100644
index 0000000000..84e189a38e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
+
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Properties/Resources.Designer.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..06beda8093
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Properties/Resources.Designer.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Test
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class Resources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.DataAnnotations.Test.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// Comparing {0} to {1}.
+        /// </summary>
+        internal static string CompareAttributeTestResource
+        {
+            get => GetString("CompareAttributeTestResource");
+        }
+
+        /// <summary>
+        /// Comparing {0} to {1}.
+        /// </summary>
+        internal static string FormatCompareAttributeTestResource(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("CompareAttributeTestResource"), p0, p1);
+
+        /// <summary>
+        /// description from resources
+        /// </summary>
+        internal static string DisplayAttribute_Description
+        {
+            get => GetString("DisplayAttribute_Description");
+        }
+
+        /// <summary>
+        /// description from resources
+        /// </summary>
+        internal static string FormatDisplayAttribute_Description()
+            => GetString("DisplayAttribute_Description");
+
+        /// <summary>
+        /// name from resources
+        /// </summary>
+        internal static string DisplayAttribute_Name
+        {
+            get => GetString("DisplayAttribute_Name");
+        }
+
+        /// <summary>
+        /// name from resources
+        /// </summary>
+        internal static string FormatDisplayAttribute_Name()
+            => GetString("DisplayAttribute_Name");
+
+        /// <summary>
+        /// prompt from resources
+        /// </summary>
+        internal static string DisplayAttribute_Prompt
+        {
+            get => GetString("DisplayAttribute_Prompt");
+        }
+
+        /// <summary>
+        /// prompt from resources
+        /// </summary>
+        internal static string FormatDisplayAttribute_Prompt()
+            => GetString("DisplayAttribute_Prompt");
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Resources.resx b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Resources.resx
new file mode 100644
index 0000000000..8ed00de591
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Resources.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CompareAttributeTestResource" xml:space="preserve">
+    <value>Comparing {0} to {1}.</value>
+  </data>
+  <data name="DisplayAttribute_Description" xml:space="preserve">
+    <value>description from resources</value>
+  </data>
+  <data name="DisplayAttribute_Name" xml:space="preserve">
+    <value>name from resources</value>
+  </data>
+  <data name="DisplayAttribute_Prompt" xml:space="preserve">
+    <value>prompt from resources</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Internal/JsonResultExecutorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Internal/JsonResultExecutorTest.cs
new file mode 100644
index 0000000000..81452cc818
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Internal/JsonResultExecutorTest.cs
@@ -0,0 +1,279 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Microsoft.Net.Http.Headers;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Json.Internal
+{
+    public class JsonResultExecutorTest
+    {
+        [Fact]
+        public async Task ExecuteAsync_UsesDefaultContentType_IfNoContentTypeSpecified()
+        {
+            // Arrange
+            var expected = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(new { foo = "abcd" }));
+
+            var context = GetActionContext();
+
+            var result = new JsonResult(new { foo = "abcd" });
+            var executor = CreateExcutor();
+
+            // Act
+            await executor.ExecuteAsync(context, result);
+
+            // Assert
+            var written = GetWrittenBytes(context.HttpContext);
+            Assert.Equal(expected, written);
+            Assert.Equal("application/json; charset=utf-8", context.HttpContext.Response.ContentType);
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_NullEncoding_DoesNotSetCharsetOnContentType()
+        {
+            // Arrange
+            var expected = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(new { foo = "abcd" }));
+
+            var context = GetActionContext();
+
+            var result = new JsonResult(new { foo = "abcd" });
+            result.ContentType = "text/json";
+            var executor = CreateExcutor();
+
+            // Act
+            await executor.ExecuteAsync(context, result);
+
+            // Assert
+            var written = GetWrittenBytes(context.HttpContext);
+            Assert.Equal(expected, written);
+            Assert.Equal("text/json", context.HttpContext.Response.ContentType);
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_SetsContentTypeAndEncoding()
+        {
+            // Arrange
+            var expected = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(new { foo = "abcd" }));
+
+            var context = GetActionContext();
+
+            var result = new JsonResult(new { foo = "abcd" });
+            result.ContentType = new MediaTypeHeaderValue("text/json")
+            {
+                Encoding = Encoding.ASCII
+            }.ToString();
+            var executor = CreateExcutor();
+
+            // Act
+            await executor.ExecuteAsync(context, result);
+
+            // Assert
+            var written = GetWrittenBytes(context.HttpContext);
+            Assert.Equal(expected, written);
+            Assert.Equal("text/json; charset=us-ascii", context.HttpContext.Response.ContentType);
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_NoResultContentTypeSet_UsesResponseContentType_AndSuppliedEncoding()
+        {
+            // Arrange
+            var expected = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(new { foo = "abcd" }));
+            var expectedContentType = "text/foo; p1=p1-value; charset=us-ascii";
+
+            var context = GetActionContext();
+            context.HttpContext.Response.ContentType = expectedContentType;
+
+            var result = new JsonResult(new { foo = "abcd" });
+            var executor = CreateExcutor();
+
+            // Act
+            await executor.ExecuteAsync(context, result);
+
+            // Assert
+            var written = GetWrittenBytes(context.HttpContext);
+            Assert.Equal(expected, written);
+            Assert.Equal(expectedContentType, context.HttpContext.Response.ContentType);
+        }
+
+        [Theory]
+        [InlineData("text/foo", "text/foo")]
+        [InlineData("text/foo; p1=p1-value", "text/foo; p1=p1-value")]
+        public async Task ExecuteAsync_NoResultContentTypeSet_UsesDefaultEncoding_DoesNotSetCharset(
+            string responseContentType,
+            string expectedContentType)
+        {
+            // Arrange
+            var expected = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(new { foo = "abcd" }));
+
+            var context = GetActionContext();
+            context.HttpContext.Response.ContentType = responseContentType;
+
+            var result = new JsonResult(new { foo = "abcd" });
+            var executor = CreateExcutor();
+
+            // Act
+            await executor.ExecuteAsync(context, result);
+
+            // Assert
+            var written = GetWrittenBytes(context.HttpContext);
+            Assert.Equal(expected, written);
+            Assert.Equal(expectedContentType, context.HttpContext.Response.ContentType);
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_UsesPassedInSerializerSettings()
+        {
+            // Arrange
+            var expected = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(
+                new { foo = "abcd" },
+                Formatting.Indented));
+
+            var context = GetActionContext();
+
+            var serializerSettings = new JsonSerializerSettings();
+            serializerSettings.Formatting = Formatting.Indented;
+
+            var result = new JsonResult(new { foo = "abcd" }, serializerSettings);
+            var executor = CreateExcutor();
+
+            // Act
+            await executor.ExecuteAsync(context, result);
+
+            // Assert
+            var written = GetWrittenBytes(context.HttpContext);
+            Assert.Equal(expected, written);
+            Assert.Equal("application/json; charset=utf-8", context.HttpContext.Response.ContentType);
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_ErrorDuringSerialization_DoesNotCloseTheBrackets()
+        {
+            // Arrange
+            var expected = Encoding.UTF8.GetBytes("{\"name\":\"Robert\"");
+            var context = GetActionContext();
+            var result = new JsonResult(new ModelWithSerializationError());
+            var executor = CreateExcutor();
+
+            // Act
+            try
+            {
+                await executor.ExecuteAsync(context, result);
+            }
+            catch (JsonSerializationException serializerException)
+            {
+                var expectedException = Assert.IsType<NotImplementedException>(serializerException.InnerException);
+                Assert.Equal("Property Age has not been implemented", expectedException.Message);
+            }
+
+            // Assert
+            var written = GetWrittenBytes(context.HttpContext);
+            Assert.Equal(expected, written);
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_NonNullResult_LogsResultType()
+        {
+            // Arrange
+            var expected = "Executing JsonResult, writing value of type 'System.String'.";
+            var context = GetActionContext();
+            var logger = new StubLogger();
+            var executer = CreateExcutor(logger);
+            var result = new JsonResult("result_value");
+
+            // Act
+            await executer.ExecuteAsync(context, result);
+
+            // Assert
+            Assert.Equal(expected, logger.MostRecentMessage);
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_NullResult_LogsNull()
+        {
+            // Arrange
+            var expected = "Executing JsonResult, writing value of type 'null'.";
+            var context = GetActionContext();
+            var logger = new StubLogger();
+            var executer = CreateExcutor(logger);
+            var result = new JsonResult(null);
+
+            // Act
+            await executer.ExecuteAsync(context, result);
+
+            // Assert
+            Assert.Equal(expected, logger.MostRecentMessage);
+        }
+
+        private static JsonResultExecutor CreateExcutor(ILogger<JsonResultExecutor> logger = null)
+        {
+            return new JsonResultExecutor(
+                new TestHttpResponseStreamWriterFactory(),
+                logger ?? NullLogger<JsonResultExecutor>.Instance,
+                Options.Create(new MvcJsonOptions()),
+                ArrayPool<char>.Shared);
+        }
+
+        private static HttpContext GetHttpContext()
+        {
+            var httpContext = new DefaultHttpContext();
+            httpContext.Response.Body = new MemoryStream();
+
+            var services = new ServiceCollection();
+            services.AddOptions();
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+            httpContext.RequestServices = services.BuildServiceProvider();
+
+            return httpContext;
+        }
+
+        private static ActionContext GetActionContext()
+        {
+            return new ActionContext(GetHttpContext(), new RouteData(), new ActionDescriptor());
+        }
+
+        private static byte[] GetWrittenBytes(HttpContext context)
+        {
+            context.Response.Body.Seek(0, SeekOrigin.Begin);
+            return Assert.IsType<MemoryStream>(context.Response.Body).ToArray();
+        }
+
+        private class ModelWithSerializationError
+        {
+            public string Name { get; } = "Robert";
+            public int Age
+            {
+                get
+                {
+                    throw new NotImplementedException($"Property {nameof(Age)} has not been implemented");
+                }
+            }
+        }
+
+        private class StubLogger : ILogger<JsonResultExecutor>
+        {
+            public string MostRecentMessage { get; private set; }
+
+            public IDisposable BeginScope<TState>(TState state) => throw new NotImplementedException();
+
+            public bool IsEnabled(LogLevel logLevel) => true;
+
+            public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
+            {
+                MostRecentMessage = formatter(state, exception);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonInputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonInputFormatterTest.cs
new file mode 100644
index 0000000000..0441961c2a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonInputFormatterTest.cs
@@ -0,0 +1,800 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.ObjectPool;
+using Moq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    public class JsonInputFormatterTest
+    {
+        private static readonly ObjectPoolProvider _objectPoolProvider = new DefaultObjectPoolProvider();
+        private static readonly JsonSerializerSettings _serializerSettings = new JsonSerializerSettings();
+
+        [Fact]
+        public async Task Version_2_0_Constructor_BuffersRequestBody_ByDefault()
+        {
+            // Arrange
+#pragma warning disable CS0618
+            var formatter = new JsonInputFormatter(
+                GetLogger(),
+                _serializerSettings,
+                ArrayPool<char>.Shared,
+                _objectPoolProvider);
+#pragma warning restore CS0618
+
+            var content = "{name: 'Person Name', Age: '30'}";
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<IHttpResponseFeature>(new TestResponseFeature());
+            httpContext.Request.Body = new NonSeekableReadStream(contentBytes);
+            httpContext.Request.ContentType = "application/json";
+            
+            var formatterContext = CreateInputFormatterContext(typeof(User), httpContext);
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+
+            var userModel = Assert.IsType<User>(result.Model);
+            Assert.Equal("Person Name", userModel.Name);
+            Assert.Equal(30, userModel.Age);
+
+            Assert.True(httpContext.Request.Body.CanSeek);
+            httpContext.Request.Body.Seek(0L, SeekOrigin.Begin);
+
+            result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+
+            userModel = Assert.IsType<User>(result.Model);
+            Assert.Equal("Person Name", userModel.Name);
+            Assert.Equal(30, userModel.Age);
+        }
+
+        [Fact]
+        public async Task Version_2_1_Constructor_BuffersRequestBody_UsingDefaultOptions()
+        {
+            // Arrange
+            var formatter = new JsonInputFormatter(
+                GetLogger(),
+                _serializerSettings,
+                ArrayPool<char>.Shared,
+                _objectPoolProvider,
+                new MvcOptions(),
+                new MvcJsonOptions());
+
+            var content = "{name: 'Person Name', Age: '30'}";
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<IHttpResponseFeature>(new TestResponseFeature());
+            httpContext.Request.Body = new NonSeekableReadStream(contentBytes);
+            httpContext.Request.ContentType = "application/json";
+
+            var formatterContext = CreateInputFormatterContext(typeof(User), httpContext);
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+
+            var userModel = Assert.IsType<User>(result.Model);
+            Assert.Equal("Person Name", userModel.Name);
+            Assert.Equal(30, userModel.Age);
+
+            Assert.True(httpContext.Request.Body.CanSeek);
+            httpContext.Request.Body.Seek(0L, SeekOrigin.Begin);
+
+            result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+
+            userModel = Assert.IsType<User>(result.Model);
+            Assert.Equal("Person Name", userModel.Name);
+            Assert.Equal(30, userModel.Age);
+        }
+
+        [Fact]
+        public async Task Version_2_0_Constructor_SuppressInputFormatterBufferingSetToTrue_DoesNotBufferRequestBody()
+        {
+            // Arrange
+#pragma warning disable CS0618
+            var formatter = new JsonInputFormatter(
+                GetLogger(),
+                _serializerSettings,
+                ArrayPool<char>.Shared,
+                _objectPoolProvider,
+                suppressInputFormatterBuffering: true);
+#pragma warning restore CS0618
+
+            var content = "{name: 'Person Name', Age: '30'}";
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<IHttpResponseFeature>(new TestResponseFeature());
+            httpContext.Request.Body = new NonSeekableReadStream(contentBytes);
+            httpContext.Request.ContentType = "application/json";
+
+            var formatterContext = CreateInputFormatterContext(typeof(User), httpContext);
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+
+            var userModel = Assert.IsType<User>(result.Model);
+            Assert.Equal("Person Name", userModel.Name);
+            Assert.Equal(30, userModel.Age);
+
+            Assert.False(httpContext.Request.Body.CanSeek);
+            result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+            Assert.Null(result.Model);
+        }
+
+        [Fact]
+        public async Task Version_2_1_Constructor_SuppressInputFormatterBuffering_UsingMvcOptions_DoesNotBufferRequestBody()
+        {
+            // Arrange
+            var mvcOptions = new MvcOptions()
+            {
+                SuppressInputFormatterBuffering = true,
+            };
+            var formatter = new JsonInputFormatter(
+                GetLogger(),
+                _serializerSettings,
+                ArrayPool<char>.Shared,
+                _objectPoolProvider,
+                mvcOptions,
+                new MvcJsonOptions());
+
+            var content = "{name: 'Person Name', Age: '30'}";
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<IHttpResponseFeature>(new TestResponseFeature());
+            httpContext.Request.Body = new NonSeekableReadStream(contentBytes);
+            httpContext.Request.ContentType = "application/json";
+
+            var formatterContext = CreateInputFormatterContext(typeof(User), httpContext);
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+
+            var userModel = Assert.IsType<User>(result.Model);
+            Assert.Equal("Person Name", userModel.Name);
+            Assert.Equal(30, userModel.Age);
+
+            Assert.False(httpContext.Request.Body.CanSeek);
+            result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+            Assert.Null(result.Model);
+        }
+
+        [Fact]
+        public async Task Version_2_1_Constructor_SuppressInputFormatterBufferingSetToTrue_UsingMutatedOptions()
+        {
+            // Arrange
+            var mvcOptions = new MvcOptions()
+            {
+                SuppressInputFormatterBuffering = false,
+            };
+            var formatter = new JsonInputFormatter(
+                GetLogger(),
+                _serializerSettings,
+                ArrayPool<char>.Shared,
+                _objectPoolProvider,
+                mvcOptions,
+                new MvcJsonOptions());
+
+            var content = "{name: 'Person Name', Age: '30'}";
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<IHttpResponseFeature>(new TestResponseFeature());
+            httpContext.Request.Body = new NonSeekableReadStream(contentBytes);
+            httpContext.Request.ContentType = "application/json";
+
+            var formatterContext = CreateInputFormatterContext(typeof(User), httpContext);
+
+            // Act
+            // Mutate options after passing into the constructor to make sure that the value type is not store in the constructor
+            mvcOptions.SuppressInputFormatterBuffering = true;
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+
+            var userModel = Assert.IsType<User>(result.Model);
+            Assert.Equal("Person Name", userModel.Name);
+            Assert.Equal(30, userModel.Age);
+
+            Assert.False(httpContext.Request.Body.CanSeek);
+            result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+            Assert.Null(result.Model);
+        }
+
+        [Theory]
+        [InlineData("application/json", true)]
+        [InlineData("application/*", false)]
+        [InlineData("*/*", false)]
+        [InlineData("text/json", true)]
+        [InlineData("text/*", false)]
+        [InlineData("text/xml", false)]
+        [InlineData("application/xml", false)]
+        [InlineData("application/some.entity+json", true)]
+        [InlineData("application/some.entity+json;v=2", true)]
+        [InlineData("application/some.entity+xml", false)]
+        [InlineData("application/some.entity+*", false)]
+        [InlineData("text/some.entity+json", false)]
+        [InlineData("", false)]
+        [InlineData(null, false)]
+        [InlineData("invalid", false)]
+        public void CanRead_ReturnsTrueForAnySupportedContentType(string requestContentType, bool expectedCanRead)
+        {
+            // Arrange
+            var formatter = CreateFormatter();
+
+            var contentBytes = Encoding.UTF8.GetBytes("content");
+            var httpContext = GetHttpContext(contentBytes, contentType: requestContentType);
+
+            var formatterContext = CreateInputFormatterContext(typeof(string), httpContext);
+
+            // Act
+            var result = formatter.CanRead(formatterContext);
+
+            // Assert
+            Assert.Equal(expectedCanRead, result);
+        }
+
+        [Fact]
+        public void DefaultMediaType_ReturnsApplicationJson()
+        {
+            // Arrange
+            var formatter = CreateFormatter();
+
+            // Act
+            var mediaType = formatter.SupportedMediaTypes[0];
+
+            // Assert
+            Assert.Equal("application/json", mediaType.ToString());
+        }
+
+        public static IEnumerable<object[]> JsonFormatterReadSimpleTypesData
+        {
+            get
+            {
+                yield return new object[] { "100", typeof(int), 100 };
+                yield return new object[] { "'abcd'", typeof(string), "abcd" };
+                yield return new object[] { "'2012-02-01 12:45 AM'", typeof(DateTime), new DateTime(2012, 02, 01, 00, 45, 00) };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(JsonFormatterReadSimpleTypesData))]
+        public async Task JsonFormatterReadsSimpleTypes(string content, Type type, object expected)
+        {
+            // Arrange
+            var formatter = CreateFormatter();
+
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+            var httpContext = GetHttpContext(contentBytes);
+
+            var formatterContext = CreateInputFormatterContext(type, httpContext);
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+            Assert.Equal(expected, result.Model);
+        }
+
+        [Fact]
+        public async Task JsonFormatterReadsComplexTypes()
+        {
+            // Arrange
+            var formatter = CreateFormatter();
+
+            var content = "{name: 'Person Name', Age: '30'}";
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+            var httpContext = GetHttpContext(contentBytes);
+
+            var formatterContext = CreateInputFormatterContext(typeof(User), httpContext);
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+            var userModel = Assert.IsType<User>(result.Model);
+            Assert.Equal("Person Name", userModel.Name);
+            Assert.Equal(30, userModel.Age);
+        }
+
+        [Fact]
+        public async Task ReadAsync_ReadsValidArray()
+        {
+            // Arrange
+            var formatter = CreateFormatter();
+
+            var content = "[0, 23, 300]";
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+            var httpContext = GetHttpContext(contentBytes);
+
+            var formatterContext = CreateInputFormatterContext(typeof(int[]), httpContext);
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+            var integers = Assert.IsType<int[]>(result.Model);
+            Assert.Equal(new int[] { 0, 23, 300 }, integers);
+        }
+
+        [Theory]
+        [InlineData(typeof(ICollection<int>))]
+        [InlineData(typeof(IEnumerable<int>))]
+        [InlineData(typeof(IList<int>))]
+        [InlineData(typeof(List<int>))]
+        public async Task ReadAsync_ReadsValidArray_AsList(Type requestedType)
+        {
+            // Arrange
+            var formatter = CreateFormatter();
+
+            var content = "[0, 23, 300]";
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+            var httpContext = GetHttpContext(contentBytes);
+
+            var formatterContext = CreateInputFormatterContext(requestedType, httpContext);
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+            var integers = Assert.IsType<List<int>>(result.Model);
+            Assert.Equal(new int[] { 0, 23, 300 }, integers);
+        }
+
+        [Fact]
+        public async Task ReadAsync_AddsModelValidationErrorsToModelState()
+        {
+            // Arrange
+            var formatter = CreateFormatter(allowInputFormatterExceptionMessages: true);
+
+            var content = "{name: 'Person Name', Age: 'not-an-age'}";
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+            var httpContext = GetHttpContext(contentBytes);
+
+            var formatterContext = CreateInputFormatterContext(typeof(User), httpContext);
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.True(result.HasError);
+            Assert.Equal(
+                "Could not convert string to decimal: not-an-age. Path 'Age', line 1, position 39.",
+                formatterContext.ModelState["Age"].Errors[0].ErrorMessage);
+        }
+
+        [Fact]
+        public async Task ReadAsync_InvalidArray_AddsOverflowErrorsToModelState()
+        {
+            // Arrange
+            var formatter = CreateFormatter(allowInputFormatterExceptionMessages: true);
+
+            var content = "[0, 23, 300]";
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+            var httpContext = GetHttpContext(contentBytes);
+
+            var formatterContext = CreateInputFormatterContext(typeof(byte[]), httpContext);
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.True(result.HasError);
+            Assert.Equal("The supplied value is invalid.", formatterContext.ModelState["[2]"].Errors[0].ErrorMessage);
+            Assert.Null(formatterContext.ModelState["[2]"].Errors[0].Exception);
+        }
+
+        [Fact]
+        public async Task ReadAsync_InvalidComplexArray_AddsOverflowErrorsToModelState()
+        {
+            // Arrange
+            var formatter = CreateFormatter(allowInputFormatterExceptionMessages: true);
+
+            var content = "[{name: 'Name One', Age: 30}, {name: 'Name Two', Small: 300}]";
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+            var httpContext = GetHttpContext(contentBytes);
+
+            var formatterContext = CreateInputFormatterContext(typeof(User[]), httpContext, modelName: "names");
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.True(result.HasError);
+            Assert.Equal(
+                "Error converting value 300 to type 'System.Byte'. Path '[1].Small', line 1, position 59.",
+                formatterContext.ModelState["names[1].Small"].Errors[0].ErrorMessage);
+        }
+
+        [Fact]
+        public async Task ReadAsync_UsesTryAddModelValidationErrorsToModelState()
+        {
+            // Arrange
+            var formatter = CreateFormatter();
+
+            var content = "{name: 'Person Name', Age: 'not-an-age'}";
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+            var httpContext = GetHttpContext(contentBytes);
+
+            var formatterContext = CreateInputFormatterContext(typeof(User), httpContext);
+            formatterContext.ModelState.MaxAllowedErrors = 3;
+            formatterContext.ModelState.AddModelError("key1", "error1");
+            formatterContext.ModelState.AddModelError("key2", "error2");
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.True(result.HasError);
+
+            Assert.False(formatterContext.ModelState.ContainsKey("age"));
+            var error = Assert.Single(formatterContext.ModelState[""].Errors);
+            Assert.IsType<TooManyModelErrorsException>(error.Exception);
+        }
+
+        [Theory]
+        [InlineData("null", true, true)]
+        [InlineData("null", false, false)]
+        [InlineData(" ", true, true)]
+        [InlineData(" ", false, false)]
+        public async Task ReadAsync_WithInputThatDeserializesToNull_SetsModelOnlyIfAllowingEmptyInput(
+            string content,
+            bool treatEmptyInputAsDefaultValue,
+            bool expectedIsModelSet)
+        {
+            // Arrange
+            var formatter = CreateFormatter();
+
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+            var httpContext = GetHttpContext(contentBytes);
+
+            var formatterContext = CreateInputFormatterContext(
+                typeof(object),
+                httpContext,
+                treatEmptyInputAsDefaultValue: treatEmptyInputAsDefaultValue);
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+            Assert.Equal(expectedIsModelSet, result.IsModelSet);
+            Assert.Null(result.Model);
+        }
+
+        [Fact]
+        public void Constructor_UsesSerializerSettings()
+        {
+            // Arrange
+            var serializerSettings = new JsonSerializerSettings();
+
+            // Act
+            var formatter = new TestableJsonInputFormatter(serializerSettings);
+
+            // Assert
+            Assert.Same(serializerSettings, formatter.SerializerSettings);
+        }
+
+        [Fact]
+        public async Task CustomSerializerSettingsObject_TakesEffect()
+        {
+            // Arrange
+            // by default we ignore missing members, so here explicitly changing it
+            var serializerSettings = new JsonSerializerSettings { MissingMemberHandling = MissingMemberHandling.Error };
+            var formatter = CreateFormatter(serializerSettings, allowInputFormatterExceptionMessages: true);
+
+            // missing password property here
+            var contentBytes = Encoding.UTF8.GetBytes("{ \"UserName\" : \"John\"}");
+            var httpContext = GetHttpContext(contentBytes, "application/json;charset=utf-8");
+            
+            var formatterContext = CreateInputFormatterContext(typeof(UserLogin), httpContext);
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.True(result.HasError);
+            Assert.False(formatterContext.ModelState.IsValid);
+
+            var message = formatterContext.ModelState.Values.First().Errors[0].ErrorMessage;
+            Assert.Contains("Required property 'Password' not found in JSON", message);
+        }
+
+        [Fact]
+        public void CreateJsonSerializer_UsesJsonSerializerSettings()
+        {
+            // Arrange
+            var settings = new JsonSerializerSettings
+            {
+                ContractResolver = Mock.Of<IContractResolver>(),
+                MaxDepth = 2,
+                DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind,
+            };
+            var formatter = new TestableJsonInputFormatter(settings);
+
+            // Act
+            var actual = formatter.CreateJsonSerializer();
+
+            // Assert
+            Assert.Same(settings.ContractResolver, actual.ContractResolver);
+            Assert.Equal(settings.MaxDepth, actual.MaxDepth);
+            Assert.Equal(settings.DateTimeZoneHandling, actual.DateTimeZoneHandling);
+        }
+
+        [Theory]
+        [InlineData("{", "", "Unexpected end when reading JSON. Path '', line 1, position 1.")]
+        [InlineData("{\"a\":{\"b\"}}", "a", "Invalid character after parsing property name. Expected ':' but got: }. Path 'a', line 1, position 9.")]
+        [InlineData("{\"age\":\"x\"}", "age", "Could not convert string to decimal: x. Path 'age', line 1, position 10.")]
+        [InlineData("{\"login\":1}", "login", "Error converting value 1 to type 'Microsoft.AspNetCore.Mvc.Formatters.JsonInputFormatterTest+UserLogin'. Path 'login', line 1, position 10.")]
+        [InlineData("{\"login\":{\"username\":\"somevalue\"}}", "login", "Required property 'Password' not found in JSON. Path 'login', line 1, position 33.")]
+        public async Task ReadAsync_WithAllowInputFormatterExceptionMessages_RegistersJsonInputExceptionsAsInputFormatterException(
+            string content,
+            string modelStateKey,
+            string expectedMessage)
+        {
+            // Arrange
+            var formatter = CreateFormatter(allowInputFormatterExceptionMessages: true);
+
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+            var httpContext = GetHttpContext(contentBytes);
+            
+            var formatterContext = CreateInputFormatterContext(typeof(User), httpContext);
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.True(result.HasError);
+            Assert.True(!formatterContext.ModelState.IsValid);
+            Assert.True(formatterContext.ModelState.ContainsKey(modelStateKey));
+
+            var modelError = formatterContext.ModelState[modelStateKey].Errors.Single();
+            Assert.Equal(expectedMessage, modelError.ErrorMessage);
+        }
+
+        [Fact]
+        public async Task ReadAsync_DefaultOptions_DoesNotWrapJsonInputExceptions()
+        {
+            // Arrange
+            var formatter = new JsonInputFormatter(
+                GetLogger(),
+                _serializerSettings,
+                ArrayPool<char>.Shared,
+                _objectPoolProvider,
+                new MvcOptions(),
+                new MvcJsonOptions());
+
+            var contentBytes = Encoding.UTF8.GetBytes("{");
+            var httpContext = GetHttpContext(contentBytes);
+
+            var formatterContext = CreateInputFormatterContext(typeof(User), httpContext);
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.True(result.HasError);
+            Assert.True(!formatterContext.ModelState.IsValid);
+            Assert.True(formatterContext.ModelState.ContainsKey(string.Empty));
+
+            var modelError = formatterContext.ModelState[string.Empty].Errors.Single();
+            Assert.IsNotType<InputFormatterException>(modelError.Exception);
+            Assert.Empty(modelError.ErrorMessage);
+        }
+
+        [Fact]
+        public async Task ReadAsync_AllowInputFormatterExceptionMessages_DoesNotWrapJsonInputExceptions()
+        {
+            // Arrange
+            var formatter = new JsonInputFormatter(
+                GetLogger(),
+                _serializerSettings,
+                ArrayPool<char>.Shared,
+                _objectPoolProvider,
+                new MvcOptions(),
+                new MvcJsonOptions()
+                {
+                    AllowInputFormatterExceptionMessages = true,
+                });
+
+            var contentBytes = Encoding.UTF8.GetBytes("{");
+            var httpContext = GetHttpContext(contentBytes);
+
+            var formatterContext = CreateInputFormatterContext(typeof(User), httpContext);
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.True(result.HasError);
+            Assert.True(!formatterContext.ModelState.IsValid);
+            Assert.True(formatterContext.ModelState.ContainsKey(string.Empty));
+
+            var modelError = formatterContext.ModelState[string.Empty].Errors.Single();
+            Assert.Null(modelError.Exception);
+            Assert.NotEmpty(modelError.ErrorMessage);
+        }
+
+        private class TestableJsonInputFormatter : JsonInputFormatter
+        {
+            public TestableJsonInputFormatter(JsonSerializerSettings settings)
+                : base(GetLogger(), settings, ArrayPool<char>.Shared, _objectPoolProvider, new MvcOptions(), new MvcJsonOptions())
+            {
+            }
+
+            public new JsonSerializerSettings SerializerSettings => base.SerializerSettings;
+
+            public new JsonSerializer CreateJsonSerializer() => base.CreateJsonSerializer();
+        }
+
+        private static ILogger GetLogger()
+        {
+            return NullLogger.Instance;
+        }
+
+        private JsonInputFormatter CreateFormatter(JsonSerializerSettings serializerSettings = null, bool allowInputFormatterExceptionMessages = false)
+        {
+            return new JsonInputFormatter(
+                GetLogger(),
+                serializerSettings ?? _serializerSettings,
+                ArrayPool<char>.Shared,
+                _objectPoolProvider,
+                new MvcOptions(),
+                new MvcJsonOptions()
+                {
+                    AllowInputFormatterExceptionMessages = allowInputFormatterExceptionMessages,
+                });
+        }
+
+        private static HttpContext GetHttpContext(
+            byte[] contentBytes,
+            string contentType = "application/json")
+        {
+            return GetHttpContext(new MemoryStream(contentBytes), contentType);
+        }
+
+        private static HttpContext GetHttpContext(
+            Stream requestStream,
+            string contentType = "application/json")
+        {
+            var request = new Mock<HttpRequest>();
+            var headers = new Mock<IHeaderDictionary>();
+            request.SetupGet(r => r.Headers).Returns(headers.Object);
+            request.SetupGet(f => f.Body).Returns(requestStream);
+            request.SetupGet(f => f.ContentType).Returns(contentType);
+
+            var httpContext = new Mock<HttpContext>();
+            httpContext.SetupGet(c => c.Request).Returns(request.Object);
+            httpContext.SetupGet(c => c.Request).Returns(request.Object);
+            return httpContext.Object;
+        }
+
+        private InputFormatterContext CreateInputFormatterContext(
+            Type modelType,
+            HttpContext httpContext,
+            string modelName = null,
+            bool treatEmptyInputAsDefaultValue = false)
+        {
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForType(modelType);
+
+            return new InputFormatterContext(
+                httpContext,
+                modelName: modelName ?? string.Empty,
+                modelState: new ModelStateDictionary(),
+                metadata: metadata,
+                readerFactory: new TestHttpRequestStreamReaderFactory().CreateReader,
+                treatEmptyInputAsDefaultValue: treatEmptyInputAsDefaultValue);
+        }
+
+        private IEnumerable<string> GetModelStateErrorMessages(ModelStateDictionary modelStateDictionary)
+        {
+            var allErrorMessages = new List<string>();
+            foreach (var keyModelStatePair in modelStateDictionary)
+            {
+                var key = keyModelStatePair.Key;
+                var errors = keyModelStatePair.Value.Errors;
+                if (errors != null && errors.Count > 0)
+                {
+                    foreach (var modelError in errors)
+                    {
+                        if (string.IsNullOrEmpty(modelError.ErrorMessage))
+                        {
+                            if (modelError.Exception != null)
+                            {
+                                allErrorMessages.Add(modelError.Exception.Message);
+                            }
+                        }
+                        else
+                        {
+                            allErrorMessages.Add(modelError.ErrorMessage);
+                        }
+                    }
+                }
+            }
+
+            return allErrorMessages;
+        }
+
+        private sealed class User
+        {
+            public string Name { get; set; }
+
+            public decimal Age { get; set; }
+
+            public byte Small { get; set; }
+
+            public UserLogin Login { get; set; }
+        }
+
+        private sealed class UserLogin
+        {
+            [JsonProperty(Required = Required.Always)]
+            public string UserName { get; set; }
+
+            [JsonProperty(Required = Required.Always)]
+            public string Password { get; set; }
+        }
+
+        private class Location
+        {
+            public int Id { get; set; }
+
+            public string Name { get; set; }
+        }
+
+        private class TestResponseFeature : HttpResponseFeature
+        {
+            public override void OnCompleted(Func<object, Task> callback, object state)
+            {
+                // do not do anything
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs
new file mode 100644
index 0000000000..15e735a328
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs
@@ -0,0 +1,539 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Primitives;
+using Microsoft.Net.Http.Headers;
+using Moq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Serialization;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    public class JsonOutputFormatterTests
+    {
+        [Fact]
+        public void Creates_SerializerSettings_ByDefault()
+        {
+            // Arrange & Act
+            var jsonFormatter = new TestableJsonOutputFormatter(new JsonSerializerSettings());
+
+            // Assert
+            Assert.NotNull(jsonFormatter.SerializerSettings);
+        }
+
+        [Fact]
+        public void Constructor_UsesSerializerSettings()
+        {
+            // Arrange
+            // Act
+            var serializerSettings = new JsonSerializerSettings();
+            var jsonFormatter = new TestableJsonOutputFormatter(serializerSettings);
+
+            // Assert
+            Assert.Same(serializerSettings, jsonFormatter.SerializerSettings);
+        }
+
+        [Fact]
+        public async Task ChangesTo_SerializerSettings_AffectSerialization()
+        {
+            // Arrange
+            var person = new User() { FullName = "John", age = 35 };
+            var outputFormatterContext = GetOutputFormatterContext(person, typeof(User));
+
+            var settings = new JsonSerializerSettings
+            {
+                ContractResolver = new CamelCasePropertyNamesContractResolver(),
+                Formatting = Formatting.Indented,
+            };
+            var expectedOutput = JsonConvert.SerializeObject(person, settings);
+            var jsonFormatter = new JsonOutputFormatter(settings, ArrayPool<char>.Shared);
+
+            // Act
+            await jsonFormatter.WriteResponseBodyAsync(outputFormatterContext, Encoding.UTF8);
+
+            // Assert
+            var body = outputFormatterContext.HttpContext.Response.Body;
+
+            Assert.NotNull(body);
+            body.Position = 0;
+
+            var content = new StreamReader(body, Encoding.UTF8).ReadToEnd();
+            Assert.Equal(expectedOutput, content);
+        }
+
+        [Fact]
+        public async Task ChangesTo_SerializerSettings_AfterSerialization_DoNotAffectSerialization()
+        {
+            // Arrange
+            var person = new User() { FullName = "John", age = 35 };
+            var expectedOutput = JsonConvert.SerializeObject(person, new JsonSerializerSettings());
+
+            var jsonFormatter = new TestableJsonOutputFormatter(new JsonSerializerSettings());
+
+            // This will create a serializer - which gets cached.
+            var outputFormatterContext1 = GetOutputFormatterContext(person, typeof(User));
+            await jsonFormatter.WriteResponseBodyAsync(outputFormatterContext1, Encoding.UTF8);
+
+            // These changes should have no effect.
+            jsonFormatter.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
+            jsonFormatter.SerializerSettings.Formatting = Formatting.Indented;
+
+            var outputFormatterContext2 = GetOutputFormatterContext(person, typeof(User));
+
+            // Act
+            await jsonFormatter.WriteResponseBodyAsync(outputFormatterContext2, Encoding.UTF8);
+
+            // Assert
+            var body = outputFormatterContext2.HttpContext.Response.Body;
+
+            Assert.NotNull(body);
+            body.Position = 0;
+
+            var content = new StreamReader(body, Encoding.UTF8).ReadToEnd();
+            Assert.Equal(expectedOutput, content);
+        }
+
+        public static TheoryData<NamingStrategy, string> NamingStrategy_AffectsSerializationData
+        {
+            get
+            {
+                return new TheoryData<NamingStrategy, string>
+                {
+                    { new CamelCaseNamingStrategy(), "{\"fullName\":\"John\",\"age\":35}" },
+                    { new DefaultNamingStrategy(), "{\"FullName\":\"John\",\"age\":35}" },
+                    { new SnakeCaseNamingStrategy(), "{\"full_name\":\"John\",\"age\":35}" },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(NamingStrategy_AffectsSerializationData))]
+        public async Task NamingStrategy_AffectsSerialization(NamingStrategy strategy, string expected)
+        {
+            // Arrange
+            var user = new User { FullName = "John", age = 35 };
+            var context = GetOutputFormatterContext(user, typeof(User));
+
+            var settings = new JsonSerializerSettings
+            {
+                ContractResolver = new DefaultContractResolver
+                {
+                    NamingStrategy = strategy,
+                },
+            };
+            var formatter = new TestableJsonOutputFormatter(settings);
+
+            // Act
+            await formatter.WriteResponseBodyAsync(context, Encoding.UTF8);
+
+            // Assert
+            var body = context.HttpContext.Response.Body;
+
+            Assert.NotNull(body);
+            body.Position = 0;
+
+            var content = new StreamReader(body, Encoding.UTF8).ReadToEnd();
+            Assert.Equal(expected, content);
+        }
+
+        public static TheoryData<NamingStrategy> NamingStrategy_DoesNotAffectSerializationData
+        {
+            get
+            {
+                return new TheoryData<NamingStrategy>
+                {
+                    { new CamelCaseNamingStrategy() },
+                    { new DefaultNamingStrategy() },
+                    { new SnakeCaseNamingStrategy() },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(NamingStrategy_DoesNotAffectSerializationData))]
+        public async Task NamingStrategy_DoesNotAffectDictionarySerialization(NamingStrategy strategy)
+        {
+            // Arrange
+            var dictionary = new Dictionary<string, int>(StringComparer.Ordinal)
+            {
+                { "id", 12 },
+                { "Id", 12 },
+                { "fullName", 12 },
+                { "full-name", 12 },
+                { "FullName", 12 },
+                { "full_Name", 12 },
+            };
+            var expected = "{\"id\":12,\"Id\":12,\"fullName\":12,\"full-name\":12,\"FullName\":12,\"full_Name\":12}";
+            var context = GetOutputFormatterContext(dictionary, typeof(Dictionary<string, int>));
+
+            var settings = new JsonSerializerSettings
+            {
+                ContractResolver = new DefaultContractResolver
+                {
+                    NamingStrategy = strategy,
+                },
+            };
+            var formatter = new TestableJsonOutputFormatter(settings);
+
+            // Act
+            await formatter.WriteResponseBodyAsync(context, Encoding.UTF8);
+
+            // Assert
+            var body = context.HttpContext.Response.Body;
+
+            Assert.NotNull(body);
+            body.Position = 0;
+
+            var content = new StreamReader(body, Encoding.UTF8).ReadToEnd();
+            Assert.Equal(expected, content);
+        }
+
+        [Theory]
+        [MemberData(nameof(NamingStrategy_DoesNotAffectSerializationData))]
+        public async Task NamingStrategy_DoesNotAffectSerialization_WithJsonProperty(NamingStrategy strategy)
+        {
+            // Arrange
+            var user = new UserWithJsonProperty
+            {
+                Name = "Joe",
+                AnotherName = "Joe",
+                ThirdName = "Joe",
+            };
+            var expected = "{\"ThisIsTheFullName\":\"Joe\",\"another_name\":\"Joe\",\"ThisIsTheThirdName\":\"Joe\"}";
+            var context = GetOutputFormatterContext(user, typeof(UserWithJsonProperty));
+
+            var settings = new JsonSerializerSettings
+            {
+                ContractResolver = new DefaultContractResolver
+                {
+                    NamingStrategy = strategy,
+                },
+            };
+            var formatter = new TestableJsonOutputFormatter(settings);
+
+            // Act
+            await formatter.WriteResponseBodyAsync(context, Encoding.UTF8);
+
+            // Assert
+            var body = context.HttpContext.Response.Body;
+
+            Assert.NotNull(body);
+            body.Position = 0;
+
+            var content = new StreamReader(body, Encoding.UTF8).ReadToEnd();
+            Assert.Equal(expected, content);
+        }
+
+        [Theory]
+        [MemberData(nameof(NamingStrategy_DoesNotAffectSerializationData))]
+        public async Task NamingStrategy_DoesNotAffectSerialization_WithJsonObject(NamingStrategy strategy)
+        {
+            // Arrange
+            var user = new UserWithJsonObject
+            {
+                age = 35,
+                FullName = "John",
+            };
+            var expected = "{\"age\":35,\"full_name\":\"John\"}";
+            var context = GetOutputFormatterContext(user, typeof(UserWithJsonProperty));
+
+            var settings = new JsonSerializerSettings
+            {
+                ContractResolver = new DefaultContractResolver
+                {
+                    NamingStrategy = strategy,
+                },
+            };
+            var formatter = new TestableJsonOutputFormatter(settings);
+
+            // Act
+            await formatter.WriteResponseBodyAsync(context, Encoding.UTF8);
+
+            // Assert
+            var body = context.HttpContext.Response.Body;
+
+            Assert.NotNull(body);
+            body.Position = 0;
+
+            var content = new StreamReader(body, Encoding.UTF8).ReadToEnd();
+            Assert.Equal(expected, content);
+        }
+
+        [Fact]
+        public async Task WriteToStreamAsync_RoundTripsJToken()
+        {
+            // Arrange
+            var beforeMessage = "Hello World";
+            var formatter = new JsonOutputFormatter(new JsonSerializerSettings(), ArrayPool<char>.Shared);
+            var before = new JValue(beforeMessage);
+            var memStream = new MemoryStream();
+            var outputFormatterContext = GetOutputFormatterContext(
+                beforeMessage,
+                typeof(string),
+                "application/json; charset=utf-8",
+                memStream);
+
+            // Act
+            await formatter.WriteResponseBodyAsync(outputFormatterContext, Encoding.UTF8);
+
+            // Assert
+            memStream.Position = 0;
+            var after = JToken.Load(new JsonTextReader(new StreamReader(memStream)));
+            var afterMessage = after.ToObject<string>();
+
+            Assert.Equal(beforeMessage, afterMessage);
+        }
+
+        public static TheoryData<string, string, bool> WriteCorrectCharacterEncoding
+        {
+            get
+            {
+                var data = new TheoryData<string, string, bool>
+                {
+                    { "This is a test 激光這兩個字是甚麼意思 string written using utf-8", "utf-8", true },
+                    { "This is a test 激光這兩個字是甚麼意思 string written using utf-16", "utf-16", true },
+                    { "This is a test 激光這兩個字是甚麼意思 string written using utf-32", "utf-32", false },
+                    { "This is a test æøå string written using iso-8859-1", "iso-8859-1", false },
+                };
+
+                return data;
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(WriteCorrectCharacterEncoding))]
+        public async Task WriteToStreamAsync_UsesCorrectCharacterEncoding(
+            string content,
+            string encodingAsString,
+            bool isDefaultEncoding)
+        {
+            // Arrange
+            var formatter = new JsonOutputFormatter(new JsonSerializerSettings(), ArrayPool<char>.Shared);
+            var formattedContent = "\"" + content + "\"";
+            var mediaType = MediaTypeHeaderValue.Parse(string.Format("application/json; charset={0}", encodingAsString));
+            var encoding = CreateOrGetSupportedEncoding(formatter, encodingAsString, isDefaultEncoding);
+            var expectedData = encoding.GetBytes(formattedContent);
+
+
+            var body = new MemoryStream();
+            var actionContext = GetActionContext(mediaType, body);
+
+            var outputFormatterContext = new OutputFormatterWriteContext(
+                actionContext.HttpContext,
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                typeof(string),
+                content)
+            {
+                ContentType = new StringSegment(mediaType.ToString()),
+            };
+
+            // Act
+            await formatter.WriteResponseBodyAsync(outputFormatterContext, Encoding.GetEncoding(encodingAsString));
+
+            // Assert
+            var actualData = body.ToArray();
+            Assert.Equal(expectedData, actualData);
+        }
+
+        [Fact]
+        public async Task ErrorDuringSerialization_DoesNotCloseTheBrackets()
+        {
+            // Arrange
+            var expectedOutput = "{\"name\":\"Robert\"";
+            var outputFormatterContext = GetOutputFormatterContext(
+                new ModelWithSerializationError(),
+                typeof(ModelWithSerializationError));
+            var serializerSettings = JsonSerializerSettingsProvider.CreateSerializerSettings();
+            var jsonFormatter = new JsonOutputFormatter(serializerSettings, ArrayPool<char>.Shared);
+
+            // Act
+            try
+            {
+                await jsonFormatter.WriteResponseBodyAsync(outputFormatterContext, Encoding.UTF8);
+            }
+            catch (JsonSerializationException serializerException)
+            {
+                var expectedException = Assert.IsType<NotImplementedException>(serializerException.InnerException);
+                Assert.Equal("Property Age has not been implemented", expectedException.Message);
+            }
+
+            // Assert
+            var body = outputFormatterContext.HttpContext.Response.Body;
+
+            Assert.NotNull(body);
+            body.Position = 0;
+
+            var content = new StreamReader(body, Encoding.UTF8).ReadToEnd();
+            Assert.Equal(expectedOutput, content);
+        }
+
+        [Theory]
+        [InlineData("application/json", false, "application/json")]
+        [InlineData("application/json", true, "application/json")]
+        [InlineData("application/xml", false, null)]
+        [InlineData("application/xml", true, null)]
+        [InlineData("application/*", false, "application/json")]
+        [InlineData("text/*", false, "text/json")]
+        [InlineData("custom/*", false, null)]
+        [InlineData("application/json;v=2", false, null)]
+        [InlineData("application/json;v=2", true, null)]
+        [InlineData("application/some.entity+json", false, null)]
+        [InlineData("application/some.entity+json", true, "application/some.entity+json")]
+        [InlineData("application/some.entity+json;v=2", true, "application/some.entity+json;v=2")]
+        [InlineData("application/some.entity+xml", true, null)]
+        public void CanWriteResult_ReturnsExpectedValueForMediaType(
+            string mediaType,
+            bool isServerDefined,
+            string expectedResult)
+        {
+            // Arrange
+            var formatter = new JsonOutputFormatter(new JsonSerializerSettings(), ArrayPool<char>.Shared);
+            
+            var body = new MemoryStream();
+            var actionContext = GetActionContext(MediaTypeHeaderValue.Parse(mediaType), body);
+            var outputFormatterContext = new OutputFormatterWriteContext(
+                actionContext.HttpContext,
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                typeof(string),
+                new object())
+            {
+                ContentType = new StringSegment(mediaType),
+                ContentTypeIsServerDefined = isServerDefined,
+            };
+
+            // Act
+            var actualCanWriteValue = formatter.CanWriteResult(outputFormatterContext);
+
+            // Assert
+            var expectedContentType = expectedResult ?? mediaType;
+            Assert.Equal(expectedResult != null, actualCanWriteValue);
+            Assert.Equal(new StringSegment(expectedContentType), outputFormatterContext.ContentType);
+        }
+
+        private static Encoding CreateOrGetSupportedEncoding(
+            JsonOutputFormatter formatter,
+            string encodingAsString,
+            bool isDefaultEncoding)
+        {
+            Encoding encoding = null;
+            if (isDefaultEncoding)
+            {
+                encoding = formatter.SupportedEncodings
+                               .First((e) => e.WebName.Equals(encodingAsString, StringComparison.OrdinalIgnoreCase));
+            }
+            else
+            {
+                encoding = Encoding.GetEncoding(encodingAsString);
+                formatter.SupportedEncodings.Add(encoding);
+            }
+
+            return encoding;
+        }
+
+        private static ILogger GetLogger()
+        {
+            return NullLogger.Instance;
+        }
+
+        private static OutputFormatterWriteContext GetOutputFormatterContext(
+            object outputValue,
+            Type outputType,
+            string contentType = "application/xml; charset=utf-8",
+            MemoryStream responseStream = null)
+        {
+            var mediaTypeHeaderValue = MediaTypeHeaderValue.Parse(contentType);
+
+            var actionContext = GetActionContext(mediaTypeHeaderValue, responseStream);
+            return new OutputFormatterWriteContext(
+                actionContext.HttpContext,
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                outputType,
+                outputValue)
+            {
+                ContentType = new StringSegment(contentType),
+            };
+        }
+
+        private static ActionContext GetActionContext(
+            MediaTypeHeaderValue contentType,
+            MemoryStream responseStream = null)
+        {
+            var request = new Mock<HttpRequest>();
+            var headers = new HeaderDictionary();
+            request.Setup(r => r.ContentType).Returns(contentType.ToString());
+            request.SetupGet(r => r.Headers).Returns(headers);
+            headers[HeaderNames.AcceptCharset] = contentType.Charset.ToString();
+            var response = new Mock<HttpResponse>();
+            response.SetupGet(f => f.Body).Returns(responseStream ?? new MemoryStream());
+            var httpContext = new Mock<HttpContext>();
+            httpContext.SetupGet(c => c.Request).Returns(request.Object);
+            httpContext.SetupGet(c => c.Response).Returns(response.Object);
+            return new ActionContext(httpContext.Object, new RouteData(), new ActionDescriptor());
+        }
+
+        private class TestableJsonOutputFormatter : JsonOutputFormatter
+        {
+            public TestableJsonOutputFormatter(JsonSerializerSettings serializerSettings)
+                : base(serializerSettings, ArrayPool<char>.Shared)
+            {
+            }
+
+            public new JsonSerializerSettings SerializerSettings => base.SerializerSettings;
+        }
+
+        private sealed class User
+        {
+            public string FullName { get; set; }
+
+            public int age { get; set; }
+        }
+
+        private class UserWithJsonProperty
+        {
+            [JsonProperty("ThisIsTheFullName")]
+            public string Name { get; set; }
+
+            [JsonProperty(NamingStrategyType = typeof(SnakeCaseNamingStrategy))]
+            public string AnotherName { get; set; }
+
+            // NamingStrategyType should be ignored with an explicit name.
+            [JsonProperty("ThisIsTheThirdName", NamingStrategyType = typeof(SnakeCaseNamingStrategy))]
+            public string ThirdName { get; set; }
+        }
+
+        [JsonObject(NamingStrategyType = typeof(SnakeCaseNamingStrategy))]
+        private class UserWithJsonObject
+        {
+            public int age { get; set; }
+
+            public string FullName { get; set; }
+        }
+
+        private class ModelWithSerializationError
+        {
+            public string Name { get; } = "Robert";
+            public int Age
+            {
+                get
+                {
+                    throw new NotImplementedException($"Property {nameof(Age)} has not been implemented");
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonPatchInputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonPatchInputFormatterTest.cs
new file mode 100644
index 0000000000..dc097cd5c4
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonPatchInputFormatterTest.cs
@@ -0,0 +1,387 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.JsonPatch;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.ObjectPool;
+using Moq;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters
+{
+    public class JsonPatchInputFormatterTest
+    {
+        private static readonly ObjectPoolProvider _objectPoolProvider = new DefaultObjectPoolProvider();
+        private static readonly JsonSerializerSettings _serializerSettings = new JsonSerializerSettings();
+
+        [Fact]
+        public async Task Version_2_0_Constructor_BuffersRequestBody_ByDefault()
+        {
+            // Arrange
+#pragma warning disable CS0618
+            var formatter = new JsonPatchInputFormatter(
+                GetLogger(), 
+                _serializerSettings,
+                ArrayPool<char>.Shared,
+                _objectPoolProvider);
+#pragma warning restore CS0618
+
+            var content = "[{\"op\":\"add\",\"path\":\"Customer/Name\",\"value\":\"John\"}]";
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<IHttpResponseFeature>(new TestResponseFeature());
+            httpContext.Request.Body = new NonSeekableReadStream(contentBytes);
+            httpContext.Request.ContentType = "application/json";
+
+            var formatterContext = CreateInputFormatterContext(typeof(JsonPatchDocument<Customer>), httpContext);
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+            var patchDocument = Assert.IsType<JsonPatchDocument<Customer>>(result.Model);
+            Assert.Equal("add", patchDocument.Operations[0].op);
+            Assert.Equal("Customer/Name", patchDocument.Operations[0].path);
+            Assert.Equal("John", patchDocument.Operations[0].value);
+
+            Assert.True(httpContext.Request.Body.CanSeek);
+            httpContext.Request.Body.Seek(0L, SeekOrigin.Begin);
+
+            result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+            patchDocument = Assert.IsType<JsonPatchDocument<Customer>>(result.Model);
+            Assert.Equal("add", patchDocument.Operations[0].op);
+            Assert.Equal("Customer/Name", patchDocument.Operations[0].path);
+            Assert.Equal("John", patchDocument.Operations[0].value);
+        }
+
+        [Fact]
+        public async Task Version_2_1_Constructor_BuffersRequestBody_ByDefault()
+        {
+            // Arrange
+            var formatter = new JsonPatchInputFormatter(
+                GetLogger(),
+                _serializerSettings,
+                ArrayPool<char>.Shared,
+                _objectPoolProvider,
+                new MvcOptions(),
+                new MvcJsonOptions());
+
+            var content = "[{\"op\":\"add\",\"path\":\"Customer/Name\",\"value\":\"John\"}]";
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<IHttpResponseFeature>(new TestResponseFeature());
+            httpContext.Request.Body = new NonSeekableReadStream(contentBytes);
+            httpContext.Request.ContentType = "application/json";
+
+            var formatterContext = CreateInputFormatterContext(typeof(JsonPatchDocument<Customer>), httpContext);
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+            var patchDocument = Assert.IsType<JsonPatchDocument<Customer>>(result.Model);
+            Assert.Equal("add", patchDocument.Operations[0].op);
+            Assert.Equal("Customer/Name", patchDocument.Operations[0].path);
+            Assert.Equal("John", patchDocument.Operations[0].value);
+
+            Assert.True(httpContext.Request.Body.CanSeek);
+            httpContext.Request.Body.Seek(0L, SeekOrigin.Begin);
+
+            result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+            patchDocument = Assert.IsType<JsonPatchDocument<Customer>>(result.Model);
+            Assert.Equal("add", patchDocument.Operations[0].op);
+            Assert.Equal("Customer/Name", patchDocument.Operations[0].path);
+            Assert.Equal("John", patchDocument.Operations[0].value);
+        }
+
+        [Fact]
+        public async Task Version_2_0_Constructor_SuppressInputFormatterBuffering_DoesNotBufferRequestBody()
+        {
+            // Arrange
+#pragma warning disable CS0618
+            var formatter = new JsonPatchInputFormatter(
+                GetLogger(), 
+                _serializerSettings, 
+                ArrayPool<char>.Shared, 
+                _objectPoolProvider, 
+                suppressInputFormatterBuffering: true);
+#pragma warning restore CS0618
+
+            var content = "[{\"op\":\"add\",\"path\":\"Customer/Name\",\"value\":\"John\"}]";
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<IHttpResponseFeature>(new TestResponseFeature());
+            httpContext.Request.Body = new NonSeekableReadStream(contentBytes);
+            httpContext.Request.ContentType = "application/json";
+
+            var context = CreateInputFormatterContext(typeof(JsonPatchDocument<Customer>), httpContext);
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.False(result.HasError);
+
+            var patchDocument = Assert.IsType<JsonPatchDocument<Customer>>(result.Model);
+            Assert.Equal("add", patchDocument.Operations[0].op);
+            Assert.Equal("Customer/Name", patchDocument.Operations[0].path);
+            Assert.Equal("John", patchDocument.Operations[0].value);
+
+            Assert.False(httpContext.Request.Body.CanSeek);
+            result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.False(result.HasError);
+            Assert.Null(result.Model);
+        }
+
+        [Fact]
+        public async Task Version_2_1_Constructor_SuppressInputFormatterBuffering_DoesNotBufferRequestBody()
+        {
+            // Arrange
+            var mvcOptions = new MvcOptions()
+            {
+                SuppressInputFormatterBuffering = false,
+            };
+            var formatter = new JsonPatchInputFormatter(
+                GetLogger(),
+                _serializerSettings,
+                ArrayPool<char>.Shared,
+                _objectPoolProvider,
+                mvcOptions,
+                new MvcJsonOptions());
+
+            var content = "[{\"op\":\"add\",\"path\":\"Customer/Name\",\"value\":\"John\"}]";
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+            
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<IHttpResponseFeature>(new TestResponseFeature());
+            httpContext.Request.Body = new NonSeekableReadStream(contentBytes);
+            httpContext.Request.ContentType = "application/json";
+
+            var formatterContext = CreateInputFormatterContext(typeof(JsonPatchDocument<Customer>), httpContext);
+
+            // Act
+            // Mutate options after passing into the constructor to make sure that the value type is not store in the constructor
+            mvcOptions.SuppressInputFormatterBuffering = true;
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+
+            var patchDocument = Assert.IsType<JsonPatchDocument<Customer>>(result.Model);
+            Assert.Equal("add", patchDocument.Operations[0].op);
+            Assert.Equal("Customer/Name", patchDocument.Operations[0].path);
+            Assert.Equal("John", patchDocument.Operations[0].value);
+
+            Assert.False(httpContext.Request.Body.CanSeek);
+            result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+            Assert.Null(result.Model);
+        }
+
+        [Fact]
+        public async Task JsonPatchInputFormatter_ReadsOneOperation_Successfully()
+        {
+            // Arrange
+            var formatter = CreateFormatter();
+
+            var content = "[{\"op\":\"add\",\"path\":\"Customer/Name\",\"value\":\"John\"}]";
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+            var httpContext = CreateHttpContext(contentBytes);
+
+            var formatterContext = CreateInputFormatterContext(typeof(JsonPatchDocument<Customer>), httpContext);
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+            var patchDocument = Assert.IsType<JsonPatchDocument<Customer>>(result.Model);
+            Assert.Equal("add", patchDocument.Operations[0].op);
+            Assert.Equal("Customer/Name", patchDocument.Operations[0].path);
+            Assert.Equal("John", patchDocument.Operations[0].value);
+        }
+
+        [Fact]
+        public async Task JsonPatchInputFormatter_ReadsMultipleOperations_Successfully()
+        {
+            // Arrange
+            var formatter = CreateFormatter();
+
+            var content = "[{\"op\": \"add\", \"path\" : \"Customer/Name\", \"value\":\"John\"}," +
+                "{\"op\": \"remove\", \"path\" : \"Customer/Name\"}]";
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+            var httpContext = CreateHttpContext(contentBytes);
+
+            var formatterContext = CreateInputFormatterContext(typeof(JsonPatchDocument<Customer>), httpContext);
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.False(result.HasError);
+            var patchDocument = Assert.IsType<JsonPatchDocument<Customer>>(result.Model);
+            Assert.Equal("add", patchDocument.Operations[0].op);
+            Assert.Equal("Customer/Name", patchDocument.Operations[0].path);
+            Assert.Equal("John", patchDocument.Operations[0].value);
+            Assert.Equal("remove", patchDocument.Operations[1].op);
+            Assert.Equal("Customer/Name", patchDocument.Operations[1].path);
+        }
+
+        [Theory]
+        [InlineData("application/json-patch+json", true)]
+        [InlineData("application/json", false)]
+        [InlineData("application/*", false)]
+        [InlineData("*/*", false)]
+        public void CanRead_ReturnsTrueOnlyForJsonPatchContentType(string requestContentType, bool expectedCanRead)
+        {
+            // Arrange
+            var formatter = CreateFormatter();
+
+            var content = "[{\"op\": \"add\", \"path\" : \"Customer/Name\", \"value\":\"John\"}]";
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+            var httpContext = CreateHttpContext(contentBytes, contentType: requestContentType);
+
+            var formatterContext = CreateInputFormatterContext(typeof(JsonPatchDocument<Customer>), httpContext);
+
+            // Act
+            var result = formatter.CanRead(formatterContext);
+
+            // Assert
+            Assert.Equal(expectedCanRead, result);
+        }
+
+        [Theory]
+        [InlineData(typeof(Customer))]
+        [InlineData(typeof(IJsonPatchDocument))]
+        public void CanRead_ReturnsFalse_NonJsonPatchContentType(Type modelType)
+        {
+            // Arrange
+            var formatter = CreateFormatter();
+
+            var content = "[{\"op\": \"add\", \"path\" : \"Customer/Name\", \"value\":\"John\"}]";
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+            var httpContext = CreateHttpContext(contentBytes, contentType: "application/json-patch+json");
+
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForType(modelType);
+            var formatterContext = CreateInputFormatterContext(modelType, httpContext);
+
+            // Act
+            var result = formatter.CanRead(formatterContext);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public async Task JsonPatchInputFormatter_ReturnsModelStateErrors_InvalidModelType()
+        {
+            // Arrange
+            var exceptionMessage = "Cannot deserialize the current JSON array (e.g. [1,2,3]) into type " +
+                $"'{typeof(Customer).FullName}' because the type requires a JSON object ";
+
+            // This test relies on 2.1 error message behavior
+            var formatter = CreateFormatter(allowInputFormatterExceptionMessages: true);
+
+            var content = "[{\"op\": \"add\", \"path\" : \"Customer/Name\", \"value\":\"John\"}]";
+            var contentBytes = Encoding.UTF8.GetBytes(content);
+            var httpContext = CreateHttpContext(contentBytes, contentType: "application/json-patch+json");
+
+            var formatterContext = CreateInputFormatterContext(typeof(Customer), httpContext);
+
+            // Act
+            var result = await formatter.ReadAsync(formatterContext);
+
+            // Assert
+            Assert.True(result.HasError);
+            Assert.Contains(exceptionMessage, formatterContext.ModelState[""].Errors[0].ErrorMessage);
+        }
+
+        private static ILogger GetLogger()
+        {
+            return NullLogger.Instance;
+        }
+
+        private JsonPatchInputFormatter CreateFormatter(bool allowInputFormatterExceptionMessages = false)
+        {
+            return new JsonPatchInputFormatter(
+                NullLogger.Instance,
+                _serializerSettings,
+                ArrayPool<char>.Shared,
+                _objectPoolProvider,
+                new MvcOptions(),
+                new MvcJsonOptions()
+                {
+                    AllowInputFormatterExceptionMessages = allowInputFormatterExceptionMessages,
+                });
+        }
+
+        private InputFormatterContext CreateInputFormatterContext(Type modelType, HttpContext httpContext)
+        {
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForType(modelType);
+
+            return new InputFormatterContext(
+                httpContext,
+                modelName: string.Empty,
+                modelState: new ModelStateDictionary(),
+                metadata: metadata,
+                readerFactory: new TestHttpRequestStreamReaderFactory().CreateReader);
+        }
+
+        private static HttpContext CreateHttpContext(
+            byte[] contentBytes,
+            string contentType = "application/json-patch+json")
+        {
+            var request = new Mock<HttpRequest>();
+            var headers = new Mock<IHeaderDictionary>();
+            request.SetupGet(r => r.Headers).Returns(headers.Object);
+            request.SetupGet(f => f.Body).Returns(new MemoryStream(contentBytes));
+            request.SetupGet(f => f.ContentType).Returns(contentType);
+
+            var httpContext = new Mock<HttpContext>();
+            httpContext.SetupGet(c => c.Request).Returns(request.Object);
+            httpContext.SetupGet(c => c.Request).Returns(request.Object);
+            return httpContext.Object;
+        }
+
+        private class Customer
+        {
+            public string Name { get; set; }
+        }
+
+        private class TestResponseFeature : HttpResponseFeature
+        {
+            public override void OnCompleted(Func<object, Task> callback, object state)
+            {
+                // do not do anything
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonPatchOperationsArrayProviderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonPatchOperationsArrayProviderTests.cs
new file mode 100644
index 0000000000..e3c9c4215b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonPatchOperationsArrayProviderTests.cs
@@ -0,0 +1,56 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.JsonPatch;
+using Microsoft.AspNetCore.JsonPatch.Operations;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Json
+{
+    public class JsonPatchOperationsArrayProviderTests
+    {
+        [Fact]
+        public void OnProvidersExecuting_FindsJsonPatchDocuments_ProvidesOperationsArray()
+        {
+            // Arrange
+            var metadataprovider = new TestModelMetadataProvider();
+            var provider = new JsonPatchOperationsArrayProvider(metadataprovider);
+            var jsonPatchParameterDescription = new ApiParameterDescription
+            {
+                Type = typeof(JsonPatchDocument)
+            };
+
+            var stringParameterDescription = new ApiParameterDescription
+            {
+                Type = typeof(string),
+            };
+
+            var apiDescription = new ApiDescription();
+            apiDescription.ParameterDescriptions.Add(jsonPatchParameterDescription);
+            apiDescription.ParameterDescriptions.Add(stringParameterDescription);
+
+            var actionDescriptorList = new List<ActionDescriptor>();
+            var apiDescriptionProviderContext = new ApiDescriptionProviderContext(actionDescriptorList);
+            apiDescriptionProviderContext.Results.Add(apiDescription);
+
+            // Act
+            provider.OnProvidersExecuting(apiDescriptionProviderContext);
+
+            // Assert
+            Assert.Collection(apiDescription.ParameterDescriptions,
+                description =>
+                {
+                    Assert.Equal(typeof(Operation[]), description.Type);
+                    Assert.Equal(typeof(Operation[]), description.ModelMetadata.ModelType);
+                },
+                description =>
+                {
+                    Assert.Equal(typeof(string), description.Type);
+                });
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonResultTest.cs
new file mode 100644
index 0000000000..bdc25acf77
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonResultTest.cs
@@ -0,0 +1,71 @@
+// 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.
+
+using System.Buffers;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Formatters.Json.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class JsonResultTest
+    {
+        [Fact]
+        public async Task ExecuteAsync_WritesJsonContent()
+        {
+            // Arrange
+            var value = new { foo = "abcd" };
+            var expected = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(value));
+
+            var context = GetActionContext();
+
+            var result = new JsonResult(value);
+
+            // Act
+            await result.ExecuteResultAsync(context);
+
+            // Assert
+            var written = GetWrittenBytes(context.HttpContext);
+            Assert.Equal(expected, written);
+            Assert.Equal("application/json; charset=utf-8", context.HttpContext.Response.ContentType);
+        }
+
+        private static HttpContext GetHttpContext()
+        {
+            var httpContext = new DefaultHttpContext();
+            httpContext.Response.Body = new MemoryStream();
+
+            var executor = new JsonResultExecutor(
+                new TestHttpResponseStreamWriterFactory(),
+                NullLogger<JsonResultExecutor>.Instance,
+                Options.Create(new MvcJsonOptions()),
+                ArrayPool<char>.Shared);
+
+            var services = new ServiceCollection();
+            services.AddSingleton(executor);
+            httpContext.RequestServices = services.BuildServiceProvider();
+
+            return httpContext;
+        }
+
+        private static ActionContext GetActionContext()
+        {
+            return new ActionContext(GetHttpContext(), new RouteData(), new ActionDescriptor());
+        }
+
+        private static byte[] GetWrittenBytes(HttpContext context)
+        {
+            context.Response.Body.Seek(0, SeekOrigin.Begin);
+            return Assert.IsType<MemoryStream>(context.Response.Body).ToArray();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj
new file mode 100644
index 0000000000..4ace996ce7
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(MicrosoftAspNetCoreHttpPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/FlushReportingStream.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/FlushReportingStream.cs
new file mode 100644
index 0000000000..9d83f7bb8f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/FlushReportingStream.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Moq;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public static class FlushReportingStream
+    {
+        public static Stream GetThrowingStream()
+        {
+            return new NonFlushingStream();
+        }
+
+        private class NonFlushingStream : MemoryStream
+        {
+            public override void Flush()
+            {
+                throw new InvalidOperationException("Flush should not have been called.");
+            }
+
+            public override Task FlushAsync(CancellationToken cancellationToken)
+            {
+                throw new InvalidOperationException("FlushAsync should not have been called.");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/DelegatingEnumerableTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/DelegatingEnumerableTest.cs
new file mode 100644
index 0000000000..b6945735eb
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/DelegatingEnumerableTest.cs
@@ -0,0 +1,71 @@
+// 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.
+
+using System.Linq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal
+{
+    public class DelegatingEnumerableTest
+    {
+        [Fact]
+        public void CanEnumerateOn_NonWrappableElementTypes()
+        {
+            // Arrange
+            var numbers = new[] { 10, 20 };
+            var delegatingEnumerable = new DelegatingEnumerable<int, int>(numbers, elementWrapperProvider: null);
+
+            // Act and Assert
+            Assert.Equal(numbers, delegatingEnumerable);
+        }
+
+        [Fact]
+        public void DoesNotThrowOn_EmptyCollections_NonWrappableElementTypes()
+        {
+            // Arrange
+            var numbers = new int[] { };
+            var delegatingEnumerable = new DelegatingEnumerable<int, int>(numbers, elementWrapperProvider: null);
+
+            // Act and Assert
+            Assert.Empty(delegatingEnumerable);
+        }
+
+        [Fact]
+        public void CanEnumerateOn_WrappableElementTypes()
+        {
+            // Arrange
+            var error1 = new SerializableError();
+            error1.Add("key1", "key1-error");
+            var error2 = new SerializableError();
+            error2.Add("key1", "key1-error");
+            var errors = new[] { error1, error2 };
+            var delegatingEnumerable = new DelegatingEnumerable<SerializableErrorWrapper, SerializableError>(
+                                                    errors,
+                                                    new SerializableErrorWrapperProvider());
+
+            // Act and Assert
+            Assert.Equal(errors.Length, delegatingEnumerable.Count());
+
+            for (var i = 0; i < errors.Length; i++)
+            {
+                var errorWrapper = delegatingEnumerable.ElementAt(i);
+
+                Assert.IsType<SerializableErrorWrapper>(errorWrapper);
+                Assert.NotNull(errorWrapper);
+                Assert.Same(errors[i], errorWrapper.SerializableError);
+            }
+        }
+
+        [Fact]
+        public void DoesNotThrowOn_EmptyCollections_WrappableElementTypes()
+        {
+            // Arrange
+            var errors = new SerializableError[] { };
+            var delegatingEnumerable = new DelegatingEnumerable<SerializableErrorWrapper, SerializableError>(
+                                                    errors, new SerializableErrorWrapperProvider());
+
+            // Act and Assert
+            Assert.Empty(delegatingEnumerable);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/DelegatingEnumeratorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/DelegatingEnumeratorTest.cs
new file mode 100644
index 0000000000..4fc0e455f0
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/DelegatingEnumeratorTest.cs
@@ -0,0 +1,84 @@
+// 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.
+
+using System.Collections.Generic;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal
+{
+    public class DelegatingEnumeratorTest
+    {
+        [Fact]
+        public void DisposeCalled_OnInnerEnumerator()
+        {
+            // Arrange
+            var innerEnumerator = new Mock<IEnumerator<int>>();
+            innerEnumerator.Setup(innerEnum => innerEnum.Dispose())
+                            .Verifiable();
+            var delegatingEnumerator = new DelegatingEnumerator<int, int>(
+                                                        innerEnumerator.Object,
+                                                        wrapperProvider: null);
+
+            // Act
+            delegatingEnumerator.Dispose();
+
+            // Assert
+            innerEnumerator.Verify();
+        }
+
+        [Fact]
+        public void MoveNextCalled_OnInnerEnumerator()
+        {
+            // Arrange
+            var innerEnumerator = new Mock<IEnumerator<int>>();
+            innerEnumerator.Setup(innerEnum => innerEnum.MoveNext())
+                            .Verifiable();
+            var delegatingEnumerator = new DelegatingEnumerator<int, int>(
+                                                        innerEnumerator.Object,
+                                                        wrapperProvider: null);
+
+            // Act
+            var available = delegatingEnumerator.MoveNext();
+
+            // Assert
+            innerEnumerator.Verify();
+        }
+
+        [Fact]
+        public void ResetCalled_OnInnerEnumerator()
+        {
+            // Arrange
+            var innerEnumerator = new Mock<IEnumerator<int>>();
+            innerEnumerator.Setup(innerEnum => innerEnum.Reset())
+                            .Verifiable();
+            var delegatingEnumerator = new DelegatingEnumerator<int, int>(
+                                                        innerEnumerator.Object,
+                                                        wrapperProvider: null);
+
+            // Act
+            delegatingEnumerator.Reset();
+
+            // Assert
+            innerEnumerator.Verify();
+        }
+
+        [Fact]
+        public void CurrentCalled_OnInnerEnumerator()
+        {
+            // Arrange
+            var innerEnumerator = new Mock<IEnumerator<int>>();
+            innerEnumerator.SetupGet(innerEnum => innerEnum.Current)
+                            .Verifiable();
+            var delegatingEnumerator = new DelegatingEnumerator<int, int>(
+                                                        innerEnumerator.Object,
+                                                        wrapperProvider: null);
+
+            // Act
+            var obj = delegatingEnumerator.Current;
+
+            // Assert
+            innerEnumerator.Verify();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/EnumerableWrapperProviderFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/EnumerableWrapperProviderFactoryTest.cs
new file mode 100644
index 0000000000..ccfcc526ae
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/EnumerableWrapperProviderFactoryTest.cs
@@ -0,0 +1,190 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal
+{
+    public class EnumerableWrapperProviderFactoryTest
+    {
+        public static TheoryData<Type, object, Type> EnumerableOfTInterfaceData
+        {
+            get
+            {
+                var serializableError = new SerializableError();
+                serializableError.Add("key1", "key1-error");
+
+                return new TheoryData<Type, object, Type>
+                {
+                    {
+                        typeof(IEnumerable<string>),
+                        new [] { "value1", "value2" },
+                        typeof(DelegatingEnumerable<string, string>)
+                    },
+                    {
+                        typeof(IEnumerable<int>),
+                        new [] { 10, 20 },
+                        typeof(DelegatingEnumerable<int, int>)
+                    },
+                    {
+                        typeof(IEnumerable<Person>),
+                        new [] { new Person() { Id =10, Name = "John" } },
+                        typeof(DelegatingEnumerable<Person, Person>)
+                    },
+                    {
+                        typeof(IEnumerable<SerializableError>),
+                        new [] { serializableError },
+                        typeof(DelegatingEnumerable<SerializableErrorWrapper, SerializableError>)
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(EnumerableOfTInterfaceData))]
+        public void Creates_WrapperProvider_EnumerableOfTInterface(
+                                                                    Type declaredType,
+                                                                    object objectToBeWrapped,
+                                                                    Type expectedWrappingType)
+        {
+            // Arrange
+            var wrapperProviderFactories = GetWrapperProviderFactories();
+            var enumerableWrapperProviderFactory = new EnumerableWrapperProviderFactory(wrapperProviderFactories);
+            var wrapperProviderContext = new WrapperProviderContext(declaredType, isSerialization: true);
+
+            // Act
+            var wrapperProvider = enumerableWrapperProviderFactory.GetProvider(wrapperProviderContext);
+
+            // Assert
+            Assert.NotNull(wrapperProvider);
+            Assert.Equal(expectedWrappingType, wrapperProvider.WrappingType);
+        }
+
+        public static TheoryData<Type, object, Type> QueryableOfTInterfaceData
+        {
+            get
+            {
+                var serializableError = new SerializableError();
+                serializableError.Add("key1", "key1-error");
+
+                return new TheoryData<Type, object, Type>
+                {
+                    {
+                        typeof(IEnumerable<string>),
+                        (new [] { "value1", "value2" }).AsQueryable(),
+                        typeof(DelegatingEnumerable<string, string>)
+                    },
+                    {
+                        typeof(IEnumerable<int>),
+                        (new [] { 10, 20 }).AsQueryable(),
+                        typeof(DelegatingEnumerable<int, int>)
+                    },
+                    {
+                        typeof(IEnumerable<Person>),
+                        (new [] { new Person() { Id =10, Name = "John" } }).AsQueryable(),
+                        typeof(DelegatingEnumerable<Person, Person>)
+                    },
+                    {
+                        typeof(IEnumerable<SerializableError>),
+                        (new [] { serializableError }).AsQueryable(),
+                        typeof(DelegatingEnumerable<SerializableErrorWrapper, SerializableError>)
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(QueryableOfTInterfaceData))]
+        public void Creates_WrapperProvider_QueryableOfTInterface(
+                                                                    Type declaredType,
+                                                                    object objectToBeWrapped,
+                                                                    Type expectedWrappingType)
+        {
+            // Arrange
+            var wrapperProviderFactories = GetWrapperProviderFactories();
+            var enumerableWrapperProviderFactory = new EnumerableWrapperProviderFactory(wrapperProviderFactories);
+            var wrapperProviderContext = new WrapperProviderContext(declaredType, isSerialization: true);
+
+            // Act
+            var wrapperProvider = enumerableWrapperProviderFactory.GetProvider(wrapperProviderContext);
+
+            // Assert
+            Assert.NotNull(wrapperProvider);
+            Assert.Equal(expectedWrappingType, wrapperProvider.WrappingType);
+        }
+
+        public static TheoryData<Type, object> ConcreteEnumerableOfTData
+        {
+            get
+            {
+                var serializableError = new SerializableError();
+                serializableError.Add("key1", "key1-error");
+
+                return new TheoryData<Type, object>
+                {
+                    {
+                        typeof(string), // 'string' implements IEnumerable<char>
+                        "value"
+                    },
+                    {
+                        typeof(List<int>),
+                        (new [] { 10, 20 }).ToList()
+                    },
+                    {
+                        typeof(List<Person>),
+                        (new [] { new Person() { Id =10, Name = "John" } }).ToList()
+                    },
+                    {
+                        typeof(List<SerializableError>),
+                        (new [] { serializableError }).ToList()
+                    },
+                    {
+                        typeof(PersonList),
+                        new PersonList()
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ConcreteEnumerableOfTData))]
+        public void DoesNot_CreateWrapperProvider_ForConcrete_EnumerableOfTImplementations(
+                                                                    Type declaredType,
+                                                                    object objectToBeWrapped)
+        {
+            // Arrange
+            var wrapperProviderFactories = GetWrapperProviderFactories();
+            var enumerableWrapperProviderFactory = new EnumerableWrapperProviderFactory(wrapperProviderFactories);
+            var wrapperProviderContext = new WrapperProviderContext(declaredType, isSerialization: true);
+
+            // Act
+            var wrapperProvider = enumerableWrapperProviderFactory.GetProvider(wrapperProviderContext);
+
+            // Assert
+            Assert.Null(wrapperProvider);
+        }
+
+        private IEnumerable<IWrapperProviderFactory> GetWrapperProviderFactories()
+        {
+            var wrapperProviderFactories = new List<IWrapperProviderFactory>();
+            wrapperProviderFactories.Add(new EnumerableWrapperProviderFactory(wrapperProviderFactories));
+            wrapperProviderFactories.Add(new SerializableErrorWrapperProviderFactory());
+
+            return wrapperProviderFactories;
+        }
+
+        internal class Person
+        {
+            public int Id { get; set; }
+
+            public string Name { get; set; }
+        }
+
+        internal class PersonList : List<Person>
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/EnumerableWrapperProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/EnumerableWrapperProviderTest.cs
new file mode 100644
index 0000000000..59ac66a273
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/EnumerableWrapperProviderTest.cs
@@ -0,0 +1,94 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal
+{
+    public class EnumerableWrapperProviderTest
+    {
+        [Theory]
+        [InlineData(typeof(IEnumerable<SerializableError>),
+            typeof(DelegatingEnumerable<SerializableErrorWrapper, SerializableError>))]
+        [InlineData(typeof(IQueryable<SerializableError>),
+            typeof(DelegatingEnumerable<SerializableErrorWrapper, SerializableError>))]
+        [InlineData(typeof(ICollection<SerializableError>),
+            typeof(DelegatingEnumerable<SerializableErrorWrapper, SerializableError>))]
+        [InlineData(typeof(IList<SerializableError>),
+            typeof(DelegatingEnumerable<SerializableErrorWrapper, SerializableError>))]
+        public void Gets_DelegatingWrappingType(Type declaredEnumerableOfT, Type expectedType)
+        {
+            // Arrange
+            var wrapperProvider = new EnumerableWrapperProvider(
+                                                            declaredEnumerableOfT,
+                                                            new SerializableErrorWrapperProvider());
+
+            // Act
+            var wrappingType = wrapperProvider.WrappingType;
+
+            // Assert
+            Assert.NotNull(wrappingType);
+            Assert.Equal(expectedType, wrappingType);
+        }
+
+        [Fact]
+        public void Wraps_EmptyCollections()
+        {
+            // Arrange
+            var declaredEnumerableOfT = typeof(IEnumerable<int>);
+            var wrapperProvider = new EnumerableWrapperProvider(
+                                                declaredEnumerableOfT,
+                                                elementWrapperProvider: null);
+
+            // Act
+            var wrapped = wrapperProvider.Wrap(new int[] { });
+
+            // Assert
+            Assert.Equal(typeof(DelegatingEnumerable<int, int>), wrapperProvider.WrappingType);
+            Assert.NotNull(wrapped);
+            var delegatingEnumerable = wrapped as DelegatingEnumerable<int, int>;
+            Assert.NotNull(delegatingEnumerable);
+            Assert.Empty(delegatingEnumerable);
+        }
+
+        [Fact]
+        public void Ignores_NullInstances()
+        {
+            // Arrange
+            var declaredEnumerableOfT = typeof(IEnumerable<int>);
+            var wrapperProvider = new EnumerableWrapperProvider(
+                                        declaredEnumerableOfT,
+                                        elementWrapperProvider: null);
+
+            // Act
+            var wrapped = wrapperProvider.Wrap(null);
+
+            // Assert
+            Assert.Equal(typeof(DelegatingEnumerable<int, int>), wrapperProvider.WrappingType);
+            Assert.Null(wrapped);
+        }
+
+        [Theory]
+        [InlineData(typeof(string))]
+        [InlineData(typeof(List<int>))]
+        [InlineData(typeof(List<Person>))]
+        [InlineData(typeof(List<SerializableError>))]
+        [InlineData(typeof(PersonList))]
+        public void ThrowsArugmentExceptionFor_ConcreteEnumerableOfT(Type declaredType)
+        {
+            // Arrange
+            var expectedMessage = "The type must be an interface and must be or derive from 'IEnumerable`1'.";
+
+            // Act and Assert
+            ExceptionAssert.ThrowsArgument(() => new EnumerableWrapperProvider(
+                declaredType,
+                elementWrapperProvider: null),
+                "sourceEnumerableOfT",
+                expectedMessage);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/MvcXmlDataContractSerializerMvcOptionsSetupTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/MvcXmlDataContractSerializerMvcOptionsSetupTest.cs
new file mode 100644
index 0000000000..5219f0b97a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/MvcXmlDataContractSerializerMvcOptionsSetupTest.cs
@@ -0,0 +1,42 @@
+// 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.
+
+using Microsoft.Extensions.Logging.Abstractions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal
+{
+    public class MvcXmlDataContractSerializerMvcOptionsSetupTest
+    {
+        [Fact]
+        public void AddsFormatterMapping()
+        {
+            // Arrange
+            var optionsSetup = new MvcXmlDataContractSerializerMvcOptionsSetup(NullLoggerFactory.Instance);
+            var options = new MvcOptions();
+
+            // Act
+            optionsSetup.Configure(options);
+
+            // Assert
+            var mappedContentType = options.FormatterMappings.GetMediaTypeMappingForFormat("xml");
+            Assert.Equal("application/xml", mappedContentType);
+        }
+
+        [Fact]
+        public void DoesNotOverrideExistingMapping()
+        {
+            // Arrange
+            var optionsSetup = new MvcXmlDataContractSerializerMvcOptionsSetup(NullLoggerFactory.Instance);
+            var options = new MvcOptions();
+            options.FormatterMappings.SetMediaTypeMappingForFormat("xml", "text/xml");
+
+            // Act
+            optionsSetup.Configure(options);
+
+            // Assert
+            var mappedContentType = options.FormatterMappings.GetMediaTypeMappingForFormat("xml");
+            Assert.Equal("text/xml", mappedContentType);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/MvcXmlSerializerMvcOptionsSetupTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/MvcXmlSerializerMvcOptionsSetupTest.cs
new file mode 100644
index 0000000000..0ff2072a4c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/MvcXmlSerializerMvcOptionsSetupTest.cs
@@ -0,0 +1,42 @@
+// 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.
+
+using Microsoft.Extensions.Logging.Abstractions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal
+{
+    public class MvcXmlSerializerMvcOptionsSetupTest
+    {
+        [Fact]
+        public void AddsFormatterMapping()
+        {
+            // Arrange
+            var optionsSetup = new MvcXmlSerializerMvcOptionsSetup(NullLoggerFactory.Instance);
+            var options = new MvcOptions();
+
+            // Act
+            optionsSetup.Configure(options);
+
+            // Assert
+            var mappedContentType = options.FormatterMappings.GetMediaTypeMappingForFormat("xml");
+            Assert.Equal("application/xml", mappedContentType);
+        }
+
+        [Fact]
+        public void DoesNotOverrideExistingMapping()
+        {
+            // Arrange
+            var optionsSetup = new MvcXmlSerializerMvcOptionsSetup(NullLoggerFactory.Instance);
+            var options = new MvcOptions();
+            options.FormatterMappings.SetMediaTypeMappingForFormat("xml", "text/xml");
+
+            // Act
+            optionsSetup.Configure(options);
+
+            // Assert
+            var mappedContentType = options.FormatterMappings.GetMediaTypeMappingForFormat("xml");
+            Assert.Equal("text/xml", mappedContentType);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/PersonWrapper.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/PersonWrapper.cs
new file mode 100644
index 0000000000..00488f741b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/PersonWrapper.cs
@@ -0,0 +1,35 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal
+{
+    public class PersonWrapper : IUnwrappable
+    {
+        public PersonWrapper() { }
+
+        public PersonWrapper(Person person)
+        {
+            Id = person.Id;
+            Name = person.Name;
+            Age = 35;
+        }
+
+        public int Id { get; set; }
+
+        public string Name { get; set; }
+
+        public int Age { get; set; }
+
+        public override string ToString()
+        {
+            return string.Format("{0}, {1}, {2}", Id, Name, Age);
+        }
+
+        public object Unwrap(Type declaredType)
+        {
+            return new Person() { Id = this.Id, Name = this.Name };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/PersonWrapperProvider.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/PersonWrapperProvider.cs
new file mode 100644
index 0000000000..572fc28ce7
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/PersonWrapperProvider.cs
@@ -0,0 +1,30 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal
+{
+    public class PersonWrapperProvider : IWrapperProvider
+    {
+        public object Wrap(object obj)
+        {
+            var person = obj as Person;
+
+            if (person == null)
+            {
+                return obj;
+            }
+
+            return new PersonWrapper(person);
+        }
+
+        public Type WrappingType
+        {
+            get
+            {
+                return typeof(PersonWrapper);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/PersonWrapperProviderFactory.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/PersonWrapperProviderFactory.cs
new file mode 100644
index 0000000000..4870541b48
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/PersonWrapperProviderFactory.cs
@@ -0,0 +1,18 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal
+{
+    public class PersonWrapperProviderFactory : IWrapperProviderFactory
+    {
+        public IWrapperProvider GetProvider(WrapperProviderContext context)
+        {
+            if (context.DeclaredType == typeof(Person))
+            {
+                return new PersonWrapperProvider();
+            }
+
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/SerializableErrorWrapperProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/SerializableErrorWrapperProviderTest.cs
new file mode 100644
index 0000000000..fbf779a0aa
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/SerializableErrorWrapperProviderTest.cs
@@ -0,0 +1,57 @@
+// 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.
+
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal
+{
+    public class SerializableErrorWrapperProviderTest
+    {
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void Gets_SerializableErrorWrapper_AsWrappingType(bool isSerialization)
+        {
+            // Arrange
+            var wrapperProvider = new SerializableErrorWrapperProvider();
+
+            // Act and Assert
+            Assert.Equal(typeof(SerializableErrorWrapper), wrapperProvider.WrappingType);
+        }
+
+        [Fact]
+        public void Wraps_SerializableErrorInstance()
+        {
+            // Arrange
+            var wrapperProvider = new SerializableErrorWrapperProvider();
+            var serializableError = new SerializableError();
+
+            // Act
+            var wrapped = wrapperProvider.Wrap(serializableError);
+
+            // Assert
+            Assert.NotNull(wrapped);
+            var errorWrapper = wrapped as SerializableErrorWrapper;
+            Assert.NotNull(errorWrapper);
+            Assert.Same(serializableError, errorWrapper.SerializableError);
+        }
+
+        [Fact]
+        public void ThrowsExceptionOn_NonSerializableErrorInstances()
+        {
+            // Arrange
+            var wrapperProvider = new SerializableErrorWrapperProvider();
+            var person = new Person() { Id = 10, Name = "John" };
+
+            var expectedMessage = "The object to be wrapped must be of type " +
+                $"'{nameof(SerializableErrorWrapper)}' but was of type 'Person'.";
+
+            // Act and Assert
+            ExceptionAssert.ThrowsArgument(
+                () => wrapperProvider.Wrap(person),
+                "original",
+                expectedMessage);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/SerializableErrorWrapperTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/SerializableErrorWrapperTests.cs
new file mode 100644
index 0000000000..2a6cfaf47d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/SerializableErrorWrapperTests.cs
@@ -0,0 +1,105 @@
+// 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.
+
+using System.IO;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Xml;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal
+{
+    public class SerializableErrorWrapperTests
+    {
+        [Fact]
+        public void DefaultConstructor_CreatesSerializableError()
+        {
+            // Arrange and Act
+            var wrapper = new SerializableErrorWrapper();
+
+            // Assert
+            Assert.NotNull(wrapper.SerializableError);
+            Assert.Empty(wrapper.SerializableError);
+        }
+
+        [Fact]
+        public void WrappedSerializableErrorInstance_ReturnedFromProperty()
+        {
+            // Arrange
+            var serializableError = new SerializableError();
+            serializableError.Add("key1", "key1-error");
+
+            // Act
+            var wrapper = new SerializableErrorWrapper(serializableError);
+
+            // Assert
+            Assert.NotNull(wrapper.SerializableError);
+            Assert.Same(serializableError, wrapper.SerializableError);
+            Assert.Single(wrapper.SerializableError);
+            Assert.True(wrapper.SerializableError.ContainsKey("key1"));
+            Assert.Equal("key1-error", wrapper.SerializableError["key1"]);
+        }
+
+        [Fact]
+        public void GetSchema_Returns_Null()
+        {
+            // Arrange
+            var serializableError = new SerializableErrorWrapper(new SerializableError(new ModelStateDictionary()));
+
+            // Act & Assert
+            Assert.Null(serializableError.GetSchema());
+        }
+
+        [Fact]
+        public void ReadXml_ReadsSerializableErrorXml()
+        {
+            // Arrange
+            var serializableErrorXml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
+                "<Error><key1>Test Error 1 Test Error 2</key1><key2>Test Error 3</key2></Error>";
+            var serializer = new DataContractSerializer(typeof(SerializableErrorWrapper));
+
+            // Act
+            var wrapper = (SerializableErrorWrapper)serializer.ReadObject(
+                new MemoryStream(Encoding.UTF8.GetBytes(serializableErrorXml)));
+            var errors = wrapper.SerializableError;
+
+            // Assert
+            Assert.Equal("Test Error 1 Test Error 2", errors["key1"]);
+            Assert.Equal("Test Error 3", errors["key2"]);
+        }
+
+        [Fact]
+        public void WriteXml_WritesValidXml()
+        {
+            // Arrange
+            var modelState = new ModelStateDictionary();
+            modelState.AddModelError("key1", "Test Error 1");
+            modelState.AddModelError("key1", "Test Error 2");
+            modelState.AddModelError("key2", "Test Error 3");
+            var serializableError = new SerializableError(modelState);
+            var outputStream = new MemoryStream();
+
+            // Act
+            using (var xmlWriter = XmlWriter.Create(outputStream))
+            {
+                var dataContractSerializer = new DataContractSerializer(typeof(SerializableErrorWrapper));
+                dataContractSerializer.WriteObject(xmlWriter, new SerializableErrorWrapper(serializableError));
+            }
+            outputStream.Position = 0;
+            var res = new StreamReader(outputStream, Encoding.UTF8).ReadToEnd();
+
+            // Assert
+            var expectedContent =
+                TestPlatformHelper.IsMono ?
+                    "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error xmlns:i=\"" +
+                    "http://www.w3.org/2001/XMLSchema-instance\"><key1>Test Error 1 Test Error 2</key1>" +
+                    "<key2>Test Error 3</key2></Error>" :
+                    "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
+                    "<Error><key1>Test Error 1 Test Error 2</key1><key2>Test Error 3</key2></Error>";
+
+            Assert.Equal(expectedContent, res);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/SerializableWrapperProviderFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/SerializableWrapperProviderFactoryTest.cs
new file mode 100644
index 0000000000..e300f1d434
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Internal/SerializableWrapperProviderFactoryTest.cs
@@ -0,0 +1,41 @@
+// 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.
+
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal
+{
+    public class SerializableWrapperProviderFactoryTest
+    {
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void Creates_WrapperProvider_ForSerializableErrorType(bool isSerialization)
+        {
+            // Arrange
+            var serializableErroWrapperProviderFactory = new SerializableErrorWrapperProviderFactory();
+
+            // Act
+            var wrapperProvider = serializableErroWrapperProviderFactory.GetProvider(
+                                        new WrapperProviderContext(typeof(SerializableError), isSerialization));
+
+            // Assert
+            Assert.NotNull(wrapperProvider);
+            Assert.Equal(typeof(SerializableErrorWrapper), wrapperProvider.WrappingType);
+        }
+
+        [Fact]
+        public void ReturnsNullFor_NonSerializableErrorTypes()
+        {
+            // Arrange
+            var serializableErroWrapperProviderFactory = new SerializableErrorWrapperProviderFactory();
+
+            // Act
+            var wrapperProvider = serializableErroWrapperProviderFactory.GetProvider(
+                                        new WrapperProviderContext(typeof(Person), isSerialization: true));
+
+            // Assert
+            Assert.Null(wrapperProvider);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj
new file mode 100644
index 0000000000..a02cf7ca47
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(MicrosoftAspNetCoreHttpPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Models/Person.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Models/Person.cs
new file mode 100644
index 0000000000..14ea5bcf53
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Models/Person.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using System;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
+{
+    public class Person
+    {
+        public int Id { get; set; }
+
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Models/PersonList.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Models/PersonList.cs
new file mode 100644
index 0000000000..43c19511a5
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Models/PersonList.cs
@@ -0,0 +1,11 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
+{
+    public class PersonList : List<Person>
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlAssert.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlAssert.cs
new file mode 100644
index 0000000000..c411ce44ee
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlAssert.cs
@@ -0,0 +1,82 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Xml;
+using System.Xml.Linq;
+using Xunit;
+using Xunit.Sdk;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
+{
+    /// <summary>
+    /// Xunit assertions related to Xml content.
+    /// </summary>
+    public static class XmlAssert
+    {
+        /// <summary>
+        /// Compares two xml strings ignoring an element's attribute order.
+        /// </summary>
+        /// <param name="expectedXml">Expected xml string.</param>
+        /// <param name="actualXml">Actual xml string.</param>
+        public static void Equal(string expectedXml, string actualXml)
+        {
+            var sortedExpectedXDocument = SortAttributes(XDocument.Parse(expectedXml));
+            var sortedActualXDocument = SortAttributes(XDocument.Parse(actualXml));
+
+            // Since XNode's DeepEquals does not check for presence of xml declaration,
+            // check it explicitly
+            bool areEqual = EqualDeclarations(sortedExpectedXDocument.Declaration, sortedActualXDocument.Declaration);
+
+            areEqual = areEqual && XNode.DeepEquals(sortedExpectedXDocument, sortedActualXDocument);
+
+            if (!areEqual)
+            {
+                throw new EqualException(
+                    sortedExpectedXDocument.ToString(SaveOptions.DisableFormatting),
+                    sortedActualXDocument.ToString(SaveOptions.DisableFormatting));
+            }
+        }
+
+        private static bool EqualDeclarations(XDeclaration expected, XDeclaration actual)
+        {
+            if (expected == null && actual == null)
+            {
+                return true;
+            }
+
+            if (expected == null || actual == null)
+            {
+                return false;
+            }
+
+            // Note that this ignores 'Standalone' property comparison.
+            return string.Equals(expected.Version, actual.Version, StringComparison.OrdinalIgnoreCase)
+                && string.Equals(expected.Encoding, actual.Encoding, StringComparison.OrdinalIgnoreCase);
+        }
+
+        private static XDocument SortAttributes(XDocument document)
+        {
+            return new XDocument(
+                document.Declaration,
+                SortAttributes(document.Root));
+        }
+
+        private static XNode SortAttributes(XNode node)
+        {
+            XElement element = node as XElement;
+            if (element == null)
+            {
+                return node;
+            }
+
+            return new XElement(
+                element.Name,
+                element.Attributes().OrderBy(a => a.Name.ToString()),
+                element.Nodes().Select(child => SortAttributes(child)));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlAssertTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlAssertTest.cs
new file mode 100644
index 0000000000..c63dececd6
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlAssertTest.cs
@@ -0,0 +1,120 @@
+// 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.
+
+using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.Testing.xunit;
+using Xunit;
+using Xunit.Sdk;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
+{
+    public class XmlAssertTest
+    {
+        [Theory]
+        [InlineData("<A>hello</A>", "<A>hey</A>")]
+        [InlineData("<A><B>hello world</B></A>", "<A><B>hello world!!</B></A>")]
+        [InlineData("<a><b>hello</b><b>world</b></a>", "<a><b>hello</b><c>world</c></a>")]
+        [InlineData("<a><b>hello</b><b>world</b></a>", "<a><b>hello</b><b attribute=\"value\">world</b></a>")]
+        [InlineData("<a>hello<b>world</b>hello</a>", "<a>hello<b>world</b>goodbye</a>")]
+        [InlineData("<a><b>hello</b><b>world</b></a>", "<a><b>hello</b><b>goodbye</b></a>")]
+        public void Throws_WithMismatchedTextNodes(string input1, string input2)
+        {
+            var equalException = Assert.Throws<EqualException>(() => XmlAssert.Equal(input1, input2));
+            Assert.Equal(input1, equalException.Expected);
+            Assert.Equal(input2, equalException.Actual);
+        }
+
+        [Theory]
+        [InlineData("<a>hello<b>world</b>hello</a>", "<a>hello<b>world</b>hello</a>")]
+        [InlineData("<a>hello<b/>hello</a>", "<a>hello<b/>hello</a>")]
+        [InlineData(
+            "<a>hello<b color=\"red\" siz=\"medium\">world</b>hello</a>",
+            "<a>hello<b siz=\"medium\" color=\"red\">world</b>hello</a>")]
+        public void ReturnsSuccessfully_WithMatchingTextNodes(string input1, string input2)
+        {
+            XmlAssert.Equal(input1, input2);
+        }
+
+        public static TheoryData<string, string> EmptyElementData
+        {
+            get
+            {
+                var data = new TheoryData<string, string>
+                {
+                    { "<A></A>", "<A></A>" },
+                    { "<A><!-- comment1 --><B></B></A>", "<A><!-- comment1 --><B></B></A>" },
+                    { "<A/>", "<A/>" },
+                };
+
+                // DeepEquals returns false even though the generated XML documents are equal.
+                // This is fixed in Mono 4.3.0
+                if (!TestPlatformHelper.IsMono)
+                {
+                    data.Add("<A><![CDATA[<greeting></greeting>]]></A>", "<A><![CDATA[<greeting></greeting>]]></A>");
+                }
+
+                return data;
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(EmptyElementData))]
+        public void ReturnsSuccessfully_WithEmptyElements(string input1, string input2)
+        {
+            XmlAssert.Equal(input1, input2);
+        }
+
+        [Theory]
+        [InlineData("<?xml version=\"1.0\" encoding=\"UTF-8\"?><A></A>",
+            "<A></A>")]
+        [InlineData("<?xml version=\"1.0\" encoding=\"UTF-8\"?><A></A>",
+            "<?xml version=\"1.0\" encoding=\"UTF-16\"?><A></A>")]
+        public void Throws_WithMismatchedXmlDeclaration(string input1, string input2)
+        {
+            Assert.Throws<EqualException>(() => XmlAssert.Equal(input1, input2));
+        }
+
+        [ConditionalFact]
+        // DeepEquals returns false even though the generated XML documents are equal.
+        // This is fixed in Mono 4.3.0
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public void ReturnsSuccessfully_WithMatchingXmlDeclaration_IgnoringCase()
+        {
+            // Arrange
+            var input1 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                        "<A><B color=\"red\" size=\"medium\">hello world</B></A>";
+            var input2 = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
+                        "<A><B size=\"medium\" color=\"red\">hello world</B></A>";
+
+            // Act and Assert
+            XmlAssert.Equal(input1, input2);
+        }
+
+        [Theory]
+        [InlineData(
+            "<A color=\"red\" size=\"medium\" />",
+            "<A size=\"medium\" color=\"red\" />")]
+        [InlineData(
+            "<A><B color=\"red\" size=\"medium\">hello world</B></A>",
+            "<A><B size=\"medium\" color=\"red\">hello world</B></A>")]
+        public void ReturnsSuccessfully_WithMatchingContent_IgnoringAttributeOrder(string input1, string input2)
+        {
+            XmlAssert.Equal(input1, input2);
+        }
+
+        [Fact]
+        public void Throws_WithMismatchedAttributeValues_ReorderingAttributes()
+        {
+            // Arrange
+            var expected = "<A>hello<B color=\"red\" size=\"medium\">hello world</B>hi</A>";
+            var actual = "<A>hello<B size=\"Medium\" color=\"red\">hello world</B>hi</A>";
+            var exceptionMessageForExpected = "<A>hello<B color=\"red\" size=\"medium\">hello world</B>hi</A>";
+            var exceptionMessageForActual = "<A>hello<B color=\"red\" size=\"Medium\">hello world</B>hi</A>";
+
+            // Act and Assert
+            var equalException = Assert.Throws<EqualException>(() => XmlAssert.Equal(expected, actual));
+            Assert.Equal(exceptionMessageForExpected, equalException.Expected);
+            Assert.Equal(exceptionMessageForActual, equalException.Actual);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerInputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerInputFormatterTest.cs
new file mode 100644
index 0000000000..5edf2998e6
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerInputFormatterTest.cs
@@ -0,0 +1,775 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
+{
+    public class XmlDataContractSerializerInputFormatterTest
+    {
+        [DataContract(Name = "DummyClass", Namespace = "")]
+        public class DummyClass
+        {
+            [DataMember]
+            public int SampleInt { get; set; }
+        }
+
+        [DataContract(Name = "SomeDummyClass", Namespace = "")]
+        public class SomeDummyClass : DummyClass
+        {
+            [DataMember]
+            public string SampleString { get; set; }
+        }
+
+        [DataContract(Name = "TestLevelOne", Namespace = "")]
+        public class TestLevelOne
+        {
+            [DataMember]
+            public int SampleInt { get; set; }
+            [DataMember]
+            public string sampleString;
+            public DateTime SampleDate { get; set; }
+        }
+
+        [DataContract(Name = "TestLevelTwo", Namespace = "")]
+        public class TestLevelTwo
+        {
+            [DataMember]
+            public string SampleString { get; set; }
+            [DataMember]
+            public TestLevelOne TestOne { get; set; }
+        }
+
+        [Theory]
+        [InlineData("application/xml", true)]
+        [InlineData("application/*", false)]
+        [InlineData("*/*", false)]
+        [InlineData("text/xml", true)]
+        [InlineData("text/*", false)]
+        [InlineData("text/json", false)]
+        [InlineData("application/json", false)]
+        [InlineData("application/some.entity+xml", true)]
+        [InlineData("application/some.entity+xml;v=2", true)]
+        [InlineData("application/some.entity+json", false)]
+        [InlineData("application/some.entity+*", false)]
+        [InlineData("text/some.entity+json", false)]
+        [InlineData("", false)]
+        [InlineData(null, false)]
+        [InlineData("invalid", false)]
+        public void CanRead_ReturnsTrueForAnySupportedContentType(string requestContentType, bool expectedCanRead)
+        {
+            // Arrange
+            var formatter = new XmlDataContractSerializerInputFormatter(new MvcOptions());
+            var contentBytes = Encoding.UTF8.GetBytes("content");
+
+            var modelState = new ModelStateDictionary();
+            var httpContext = GetHttpContext(contentBytes, contentType: requestContentType);
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForType(typeof(string));
+            var formatterContext = new InputFormatterContext(
+                httpContext,
+                modelName: string.Empty,
+                modelState: modelState,
+                metadata: metadata,
+                readerFactory: new TestHttpRequestStreamReaderFactory().CreateReader);
+
+            // Act
+            var result = formatter.CanRead(formatterContext);
+
+            // Assert
+            Assert.Equal(expectedCanRead, result);
+        }
+
+        [Fact]
+        public void XmlDataContractSerializer_CachesSerializerForType()
+        {
+            // Arrange
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<DummyClass><SampleInt>10</SampleInt></DummyClass>";
+            var formatter = new TestXmlDataContractSerializerInputFormatter();
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var context = GetInputFormatterContext(contentBytes, typeof(DummyClass));
+
+            // Act
+            formatter.CanRead(context);
+            formatter.CanRead(context);
+
+            // Assert
+            Assert.Equal(1, formatter.createSerializerCalledCount);
+        }
+
+        [Fact]
+        public void HasProperSuppportedMediaTypes()
+        {
+            // Arrange & Act
+            var formatter = new XmlDataContractSerializerInputFormatter(new MvcOptions());
+
+            // Assert
+            Assert.Contains("application/xml", formatter.SupportedMediaTypes
+                                 .Select(content => content.ToString()));
+            Assert.Contains("text/xml", formatter.SupportedMediaTypes
+                                 .Select(content => content.ToString()));
+        }
+
+        [Fact]
+        public void HasProperSuppportedEncodings()
+        {
+            // Arrange & Act
+            var formatter = new XmlDataContractSerializerInputFormatter(new MvcOptions());
+
+            // Assert
+            Assert.Contains(formatter.SupportedEncodings, i => i.WebName == "utf-8");
+            Assert.Contains(formatter.SupportedEncodings, i => i.WebName == "utf-16");
+        }
+
+        [Fact]
+        public async Task BuffersRequestBody_ByDefault()
+        {
+            // Arrange
+            var expectedInt = 10;
+            var expectedString = "TestString";
+
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<TestLevelOne><SampleInt>" + expectedInt + "</SampleInt>" +
+                "<sampleString>" + expectedString + "</sampleString></TestLevelOne>";
+
+#pragma warning disable CS0618
+            var formatter = new XmlDataContractSerializerInputFormatter();
+#pragma warning restore CS0618
+
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<IHttpResponseFeature>(new TestResponseFeature());
+            httpContext.Request.Body = new NonSeekableReadStream(contentBytes);
+            httpContext.Request.ContentType = "application/json";
+            var context = GetInputFormatterContext(httpContext, typeof(TestLevelOne));
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<TestLevelOne>(result.Model);
+
+            Assert.Equal(expectedInt, model.SampleInt);
+            Assert.Equal(expectedString, model.sampleString);
+
+            Assert.True(httpContext.Request.Body.CanSeek);
+            httpContext.Request.Body.Seek(0L, SeekOrigin.Begin);
+
+            result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            model = Assert.IsType<TestLevelOne>(result.Model);
+
+            Assert.Equal(expectedInt, model.SampleInt);
+            Assert.Equal(expectedString, model.sampleString);
+        }
+
+        [Fact]
+        public async Task SuppressInputFormatterBufferingSetToTrue_DoesNotBufferRequestBody()
+        {
+            // Arrange
+            var expectedInt = 10;
+            var expectedString = "TestString";
+
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<TestLevelOne><SampleInt>" + expectedInt + "</SampleInt>" +
+                "<sampleString>" + expectedString + "</sampleString></TestLevelOne>";
+
+#pragma warning disable CS0618
+            var formatter = new XmlDataContractSerializerInputFormatter(suppressInputFormatterBuffering: true);
+#pragma warning restore CS0618
+
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<IHttpResponseFeature>(new TestResponseFeature());
+            httpContext.Request.Body = new NonSeekableReadStream(contentBytes);
+            httpContext.Request.ContentType = "application/xml";
+            var context = GetInputFormatterContext(httpContext, typeof(TestLevelOne));
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<TestLevelOne>(result.Model);
+
+            Assert.Equal(expectedInt, model.SampleInt);
+            Assert.Equal(expectedString, model.sampleString);
+
+            // Reading again should fail as buffering request body is disabled
+            await Assert.ThrowsAsync<XmlException>(() => formatter.ReadAsync(context));
+        }
+
+        [Fact]
+        public async Task BuffersRequestBody_ByDefaultUsingMvcOptions()
+        {
+            // Arrange
+            var expectedInt = 10;
+            var expectedString = "TestString";
+
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<TestLevelOne><SampleInt>" + expectedInt + "</SampleInt>" +
+                "<sampleString>" + expectedString + "</sampleString></TestLevelOne>";
+
+            var formatter = new XmlDataContractSerializerInputFormatter(new MvcOptions());
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<IHttpResponseFeature>(new TestResponseFeature());
+            httpContext.Request.Body = new NonSeekableReadStream(contentBytes);
+            httpContext.Request.ContentType = "application/json";
+            var context = GetInputFormatterContext(httpContext, typeof(TestLevelOne));
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<TestLevelOne>(result.Model);
+
+            Assert.Equal(expectedInt, model.SampleInt);
+            Assert.Equal(expectedString, model.sampleString);
+
+            Assert.True(httpContext.Request.Body.CanSeek);
+            httpContext.Request.Body.Seek(0L, SeekOrigin.Begin);
+
+            result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            model = Assert.IsType<TestLevelOne>(result.Model);
+
+            Assert.Equal(expectedInt, model.SampleInt);
+            Assert.Equal(expectedString, model.sampleString);
+        }
+
+        [Fact]
+        public async Task SuppressInputFormatterBufferingSetToTrue_DoesNotBufferRequestBody_UsingMvcOptions()
+        {
+            // Arrange
+            var expectedInt = 10;
+            var expectedString = "TestString";
+
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<TestLevelOne><SampleInt>" + expectedInt + "</SampleInt>" +
+                "<sampleString>" + expectedString + "</sampleString></TestLevelOne>";
+
+            var formatter = new XmlDataContractSerializerInputFormatter(
+                new MvcOptions() { SuppressInputFormatterBuffering = true });
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<IHttpResponseFeature>(new TestResponseFeature());
+            httpContext.Request.Body = new NonSeekableReadStream(contentBytes);
+            httpContext.Request.ContentType = "application/xml";
+            var context = GetInputFormatterContext(httpContext, typeof(TestLevelOne));
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<TestLevelOne>(result.Model);
+
+            Assert.Equal(expectedInt, model.SampleInt);
+            Assert.Equal(expectedString, model.sampleString);
+
+            // Reading again should fail as buffering request body is disabled
+            await Assert.ThrowsAsync<XmlException>(() => formatter.ReadAsync(context));
+        }
+
+        [Fact]
+        public async Task ReadAsync_ReadsSimpleTypes()
+        {
+            // Arrange
+            var expectedInt = 10;
+            var expectedString = "TestString";
+
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<TestLevelOne><SampleInt>" + expectedInt + "</SampleInt>" +
+                "<sampleString>" + expectedString + "</sampleString></TestLevelOne>";
+
+            var formatter = new XmlDataContractSerializerInputFormatter(new MvcOptions());
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var context = GetInputFormatterContext(contentBytes, typeof(TestLevelOne));
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<TestLevelOne>(result.Model);
+
+            Assert.Equal(expectedInt, model.SampleInt);
+            Assert.Equal(expectedString, model.sampleString);
+        }
+
+        [Fact]
+        public async Task SuppressInputFormatterBufferingSetToTrue_UsingMutatedOptions()
+        {
+            // Arrange
+            var expectedInt = 10;
+            var expectedString = "TestString";
+
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<TestLevelOne><SampleInt>" + expectedInt + "</SampleInt>" +
+                "<sampleString>" + expectedString + "</sampleString></TestLevelOne>";
+
+            var mvcOptions = new MvcOptions() { SuppressInputFormatterBuffering = false };
+            var formatter = new XmlDataContractSerializerInputFormatter(mvcOptions);
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<IHttpResponseFeature>(new TestResponseFeature());
+            httpContext.Request.Body = new NonSeekableReadStream(contentBytes);
+            httpContext.Request.ContentType = "application/xml";
+            var context = GetInputFormatterContext(httpContext, typeof(TestLevelOne));
+
+            // Act
+            // Mutate options after passing into the constructor to make sure that the value type is not store in the constructor
+            mvcOptions.SuppressInputFormatterBuffering = true;
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<TestLevelOne>(result.Model);
+
+            Assert.Equal(expectedInt, model.SampleInt);
+            Assert.Equal(expectedString, model.sampleString);
+
+            // Reading again should fail as buffering request body is disabled
+            await Assert.ThrowsAsync<XmlException>(() => formatter.ReadAsync(context));
+        }
+
+        [Fact]
+        public async Task ReadAsync_ReadsComplexTypes()
+        {
+            // Arrange
+            var expectedInt = 10;
+            var expectedString = "TestString";
+            var expectedLevelTwoString = "102";
+
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<TestLevelTwo><SampleString>" + expectedLevelTwoString + "</SampleString>" +
+                "<TestOne><SampleInt>" + expectedInt + "</SampleInt>" +
+                "<sampleString>" + expectedString + "</sampleString></TestOne></TestLevelTwo>";
+
+            var formatter = new XmlDataContractSerializerInputFormatter(new MvcOptions());
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var context = GetInputFormatterContext(contentBytes, typeof(TestLevelTwo));
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<TestLevelTwo>(result.Model);
+
+            Assert.Equal(expectedLevelTwoString, model.SampleString);
+            Assert.Equal(expectedInt, model.TestOne.SampleInt);
+            Assert.Equal(expectedString, model.TestOne.sampleString);
+        }
+
+        [Fact]
+        public async Task ReadAsync_ReadsWhenMaxDepthIsModified()
+        {
+            // Arrange
+            var expectedInt = 10;
+
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<DummyClass><SampleInt>" + expectedInt + "</SampleInt></DummyClass>";
+            var formatter = new XmlDataContractSerializerInputFormatter(new MvcOptions());
+            formatter.MaxDepth = 10;
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var context = GetInputFormatterContext(contentBytes, typeof(DummyClass));
+
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<DummyClass>(result.Model);
+            Assert.Equal(expectedInt, model.SampleInt);
+        }
+
+        [Fact]
+        public async Task ReadAsync_ThrowsOnExceededMaxDepth()
+        {
+            // Arrange
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<TestLevelTwo><SampleString>test</SampleString>" +
+                "<TestOne><SampleInt>10</SampleInt><sampleString>test</sampleString></TestOne></TestLevelTwo>";
+            var formatter = new XmlDataContractSerializerInputFormatter(new MvcOptions());
+            formatter.MaxDepth = 1;
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var context = GetInputFormatterContext(contentBytes, typeof(TestLevelTwo));
+
+            // Act & Assert
+            await Assert.ThrowsAsync<InputFormatterException>(async () => await formatter.ReadAsync(context));
+        }
+
+        [Fact]
+        public async Task ReadAsync_ThrowsWhenReaderQuotasAreChanged()
+        {
+            // Arrange
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<TestLevelTwo><SampleString>test</SampleString><TestOne><SampleInt>10</SampleInt>" +
+                "<sampleString>test</sampleString></TestOne></TestLevelTwo>";
+            var formatter = new XmlDataContractSerializerInputFormatter(new MvcOptions());
+            formatter.XmlDictionaryReaderQuotas.MaxStringContentLength = 2;
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var context = GetInputFormatterContext(contentBytes, typeof(TestLevelTwo));
+
+            // Act & Assert
+            await Assert.ThrowsAsync<InputFormatterException>(async () => await formatter.ReadAsync(context));
+        }
+
+        [Fact]
+        public void SetMaxDepth_ThrowsWhenMaxDepthIsBelowOne()
+        {
+            // Arrange
+            var formatter = new XmlDataContractSerializerInputFormatter(new MvcOptions());
+
+            // Act & Assert
+            Assert.Throws<ArgumentException>(() => formatter.MaxDepth = 0);
+        }
+
+        [Fact]
+        public async Task ReadAsync_VerifyStreamIsOpenAfterRead()
+        {
+            // Arrange
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<DummyClass><SampleInt>10</SampleInt></DummyClass>";
+            var formatter = new XmlDataContractSerializerInputFormatter(new MvcOptions());
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var context = GetInputFormatterContext(contentBytes, typeof(DummyClass));
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            Assert.NotNull(result.Model);
+            Assert.True(context.HttpContext.Request.Body.CanRead);
+        }
+
+        [Fact]
+        public async Task ReadAsync_FallsbackToUTF8_WhenCharSet_NotInContentType()
+        {
+            // Arrange
+            var expectedException = typeof(XmlException);
+            var inpStart = Encoding.Unicode.GetBytes("<?xml version=\"1.0\" encoding=\"UTF-16\"?>" +
+                "<DummyClass><SampleInt>");
+            byte[] inp = { 192, 193 };
+            var inpEnd = Encoding.Unicode.GetBytes("</SampleInt></DummyClass>");
+
+            var contentBytes = new byte[inpStart.Length + inp.Length + inpEnd.Length];
+            Buffer.BlockCopy(inpStart, 0, contentBytes, 0, inpStart.Length);
+            Buffer.BlockCopy(inp, 0, contentBytes, inpStart.Length, inp.Length);
+            Buffer.BlockCopy(inpEnd, 0, contentBytes, inpStart.Length + inp.Length, inpEnd.Length);
+
+            var formatter = new XmlDataContractSerializerInputFormatter(new MvcOptions());
+            var context = GetInputFormatterContext(contentBytes, typeof(TestLevelTwo));
+
+            // Act
+            var ex = await Assert.ThrowsAsync(expectedException, () => formatter.ReadAsync(context));
+            Assert.Contains("utf-8", ex.Message);
+            Assert.Contains("utf-16LE", ex.Message);
+        }
+
+        [Fact]
+        public async Task ReadAsync_UsesContentTypeCharSet_ToReadStream()
+        {
+            // Arrange
+            var expectedException = typeof(XmlException);
+
+            var inputBytes = Encoding.UTF8.GetBytes("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<DummyClass><SampleInt>1000</SampleInt></DummyClass>");
+
+            var formatter = new XmlDataContractSerializerInputFormatter(new MvcOptions());
+
+            var modelState = new ModelStateDictionary();
+            var httpContext = GetHttpContext(inputBytes, contentType: "application/xml; charset=utf-16");
+
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForType(typeof(TestLevelOne));
+            var context = new InputFormatterContext(
+                httpContext,
+                modelName: string.Empty,
+                modelState: modelState,
+                metadata: metadata,
+                readerFactory: new TestHttpRequestStreamReaderFactory().CreateReader);
+
+            // Act
+            var ex = await Assert.ThrowsAsync(expectedException, () => formatter.ReadAsync(context));
+            Assert.Contains("utf-16LE", ex.Message);
+            Assert.Contains("utf-8", ex.Message);
+        }
+
+        [Fact]
+        public async Task ReadAsync_IgnoresBOMCharacters()
+        {
+            // Arrange
+            var sampleString = "Test";
+            var sampleStringBytes = Encoding.UTF8.GetBytes(sampleString);
+            var inputStart = Encoding.UTF8.GetBytes("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + Environment.NewLine +
+                "<TestLevelTwo><SampleString>" + sampleString);
+            byte[] bom = { 0xef, 0xbb, 0xbf };
+            var inputEnd = Encoding.UTF8.GetBytes("</SampleString></TestLevelTwo>");
+            var expectedBytes = new byte[sampleString.Length + bom.Length];
+
+            var contentBytes = new byte[inputStart.Length + bom.Length + inputEnd.Length];
+            Buffer.BlockCopy(inputStart, 0, contentBytes, 0, inputStart.Length);
+            Buffer.BlockCopy(bom, 0, contentBytes, inputStart.Length, bom.Length);
+            Buffer.BlockCopy(inputEnd, 0, contentBytes, inputStart.Length + bom.Length, inputEnd.Length);
+
+            var formatter = new XmlDataContractSerializerInputFormatter(new MvcOptions());
+            var context = GetInputFormatterContext(contentBytes, typeof(TestLevelTwo));
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<TestLevelTwo>(result.Model);
+            Buffer.BlockCopy(sampleStringBytes, 0, expectedBytes, 0, sampleStringBytes.Length);
+            Buffer.BlockCopy(bom, 0, expectedBytes, sampleStringBytes.Length, bom.Length);
+            Assert.Equal(expectedBytes, Encoding.UTF8.GetBytes(model.SampleString));
+        }
+
+        [Fact]
+        public async Task ReadAsync_AcceptsUTF16Characters()
+        {
+            // Arrange
+            var expectedInt = 10;
+            var expectedString = "TestString";
+
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-16\"?>" +
+                                "<TestLevelOne><SampleInt>" + expectedInt + "</SampleInt>" +
+                                "<sampleString>" + expectedString + "</sampleString></TestLevelOne>";
+
+            var formatter = new XmlDataContractSerializerInputFormatter(new MvcOptions());
+            var contentBytes = Encoding.Unicode.GetBytes(input);
+
+            var modelState = new ModelStateDictionary();
+            var httpContext = GetHttpContext(contentBytes, contentType: "application/xml; charset=utf-16");
+
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForType(typeof(TestLevelOne));
+            var context = new InputFormatterContext(
+                httpContext,
+                modelName: string.Empty,
+                modelState: modelState,
+                metadata: metadata,
+                readerFactory: new TestHttpRequestStreamReaderFactory().CreateReader);
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<TestLevelOne>(result.Model);
+
+            Assert.Equal(expectedInt, model.SampleInt);
+            Assert.Equal(expectedString, model.sampleString);
+        }
+
+        [Fact]
+        public async Task ReadAsync_ThrowsWhenNotConfiguredWithRootName()
+        {
+            // Arrange
+            var SubstituteRootName = "SomeOtherClass";
+            var SubstituteRootNamespace = "http://tempuri.org";
+
+            var input = string.Format(
+                "<{0} xmlns=\"{1}\"><SampleInt xmlns=\"\">1</SampleInt></{0}>",
+                SubstituteRootName,
+                SubstituteRootNamespace);
+            var formatter = new XmlDataContractSerializerInputFormatter(new MvcOptions());
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var context = GetInputFormatterContext(contentBytes, typeof(DummyClass));
+
+            // Act & Assert
+            await Assert.ThrowsAsync<InputFormatterException>(async () => await formatter.ReadAsync(context));
+        }
+
+        [Fact]
+        public async Task ReadAsync_ReadsWhenConfiguredWithRootName()
+        {
+            // Arrange
+            var expectedInt = 10;
+            var SubstituteRootName = "SomeOtherClass";
+            var SubstituteRootNamespace = "http://tempuri.org";
+
+            var input = string.Format(
+                "<{0} xmlns=\"{1}\"><SampleInt xmlns=\"\">{2}</SampleInt></{0}>",
+                SubstituteRootName,
+                SubstituteRootNamespace,
+                expectedInt);
+
+            var dictionary = new XmlDictionary();
+            var settings = new DataContractSerializerSettings
+            {
+                RootName = dictionary.Add(SubstituteRootName),
+                RootNamespace = dictionary.Add(SubstituteRootNamespace)
+            };
+            var formatter = new XmlDataContractSerializerInputFormatter(new MvcOptions())
+            {
+                SerializerSettings = settings
+            };
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var context = GetInputFormatterContext(contentBytes, typeof(DummyClass));
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<DummyClass>(result.Model);
+            Assert.Equal(expectedInt, model.SampleInt);
+        }
+
+        [Fact]
+        public async Task ReadAsync_ThrowsWhenNotConfiguredWithKnownTypes()
+        {
+            // Arrange
+            var KnownTypeName = "SomeDummyClass";
+            var InstanceNamespace = "http://www.w3.org/2001/XMLSchema-instance";
+
+            var input = string.Format(
+                    "<DummyClass i:type=\"{0}\" xmlns:i=\"{1}\"><SampleInt>1</SampleInt>"
+                    + "<SampleString>Some text</SampleString></DummyClass>",
+                    KnownTypeName,
+                    InstanceNamespace);
+            var formatter = new XmlDataContractSerializerInputFormatter(new MvcOptions());
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var context = GetInputFormatterContext(contentBytes, typeof(DummyClass));
+
+            // Act & Assert
+            await Assert.ThrowsAsync<InputFormatterException>(async () => await formatter.ReadAsync(context));
+        }
+
+        [Fact]
+        public async Task ReadAsync_ReadsWhenConfiguredWithKnownTypes()
+        {
+            // Arrange
+            var expectedInt = 10;
+            var expectedString = "TestString";
+            var KnownTypeName = "SomeDummyClass";
+            var InstanceNamespace = "http://www.w3.org/2001/XMLSchema-instance";
+
+            var input = string.Format(
+                    "<DummyClass i:type=\"{0}\" xmlns:i=\"{1}\"><SampleInt>{2}</SampleInt>"
+                    + "<SampleString>{3}</SampleString></DummyClass>",
+                    KnownTypeName,
+                    InstanceNamespace,
+                    expectedInt,
+                    expectedString);
+            var settings = new DataContractSerializerSettings
+            {
+                KnownTypes = new[] { typeof(SomeDummyClass) }
+            };
+            var formatter = new XmlDataContractSerializerInputFormatter(new MvcOptions())
+            {
+                SerializerSettings = settings
+            };
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var context = GetInputFormatterContext(contentBytes, typeof(DummyClass));
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<SomeDummyClass>(result.Model);
+            Assert.Equal(expectedInt, model.SampleInt);
+            Assert.Equal(expectedString, model.SampleString);
+        }
+
+        private InputFormatterContext GetInputFormatterContext(byte[] contentBytes, Type modelType)
+        {
+            var httpContext = GetHttpContext(contentBytes);
+            return GetInputFormatterContext(httpContext, modelType);
+        }
+
+        private InputFormatterContext GetInputFormatterContext(HttpContext httpContext, Type modelType)
+        {
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForType(modelType);
+            return new InputFormatterContext(
+                httpContext,
+                modelName: string.Empty,
+                modelState: new ModelStateDictionary(),
+                metadata: metadata,
+                readerFactory: new TestHttpRequestStreamReaderFactory().CreateReader);
+        }
+
+        private static HttpContext GetHttpContext(
+            byte[] contentBytes,
+            string contentType = "application/xml")
+        {
+            var request = new Mock<HttpRequest>();
+            var headers = new Mock<IHeaderDictionary>();
+            request.SetupGet(r => r.Headers).Returns(headers.Object);
+            request.SetupGet(f => f.Body).Returns(new MemoryStream(contentBytes));
+            request.SetupGet(f => f.ContentType).Returns(contentType);
+
+            var httpContext = new Mock<HttpContext>();
+            httpContext.SetupGet(c => c.Request).Returns(request.Object);
+            httpContext.SetupGet(c => c.Request).Returns(request.Object);
+            return httpContext.Object;
+        }
+
+        private class TestXmlDataContractSerializerInputFormatter : XmlDataContractSerializerInputFormatter
+        {
+            public int createSerializerCalledCount = 0;
+
+            public TestXmlDataContractSerializerInputFormatter()
+                : base(new MvcOptions())
+            {
+            }
+
+            protected override DataContractSerializer CreateSerializer(Type type)
+            {
+                createSerializerCalledCount++;
+                return base.CreateSerializer(type);
+            }
+        }
+
+        private class TestResponseFeature : HttpResponseFeature
+        {
+            public override void OnCompleted(Func<object, Task> callback, object state)
+            {
+                // do not do anything
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs
new file mode 100644
index 0000000000..d7ee5be5cf
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs
@@ -0,0 +1,779 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal;
+using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Testing;
+using Microsoft.Extensions.Primitives;
+using Microsoft.Net.Http.Headers;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
+{
+    public class XmlDataContractSerializerOutputFormatterTest
+    {
+        [DataContract(Name = "DummyClass", Namespace = "")]
+        public class DummyClass
+        {
+            [DataMember]
+            public int SampleInt { get; set; }
+        }
+
+        [DataContract(Name = "SomeDummyClass", Namespace = "")]
+        public class SomeDummyClass : DummyClass
+        {
+            [DataMember]
+            public string SampleString { get; set; }
+        }
+
+        [DataContract(Name = "TestLevelOne", Namespace = "")]
+        public class TestLevelOne
+        {
+            [DataMember]
+            public int SampleInt { get; set; }
+            [DataMember]
+            public string sampleString;
+        }
+
+        [DataContract(Name = "TestLevelTwo", Namespace = "")]
+        public class TestLevelTwo
+        {
+            [DataMember]
+            public string SampleString { get; set; }
+            [DataMember]
+            public TestLevelOne TestOne { get; set; }
+        }
+
+        [DataContract(Name = "Child", Namespace = "")]
+        public class Child
+        {
+            [DataMember]
+            public int Id { get; set; }
+            [DataMember]
+            public Parent Parent { get; set; }
+        }
+
+        [DataContract(Name = "Parent", Namespace = "")]
+        public class Parent
+        {
+            [DataMember]
+            public string Name { get; set; }
+            [DataMember]
+            public List<Child> Children { get; set; }
+        }
+
+        public static IEnumerable<object[]> BasicTypeValues
+        {
+            get
+            {
+                yield return new object[] { "sampleString",
+                    "<string xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/\">sampleString</string>" };
+                yield return new object[] { 5,
+                    "<int xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/\">5</int>" };
+                yield return new object[] { 5.43,
+                    "<double xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/\">5.43</double>" };
+                yield return new object[] { 'a',
+                    "<char xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/\">97</char>" };
+                yield return new object[] { new DummyClass { SampleInt = 10 },
+                    "<DummyClass xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\">" +
+                    "<SampleInt>10</SampleInt></DummyClass>" };
+                yield return new object[] { new Dictionary<string, string>() { { "Hello", "World" } },
+                    "<ArrayOfKeyValueOfstringstring xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                    "xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/Arrays\"><KeyValueOfstringstring>" +
+                    "<Key>Hello</Key><Value>World</Value></KeyValueOfstringstring></ArrayOfKeyValueOfstringstring>" };
+            }
+        }
+
+        [ConditionalTheory]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        [MemberData(nameof(BasicTypeValues))]
+        public async Task WriteAsync_CanWriteBasicTypes(object input, string expectedOutput)
+        {
+            // Arrange
+            var formatter = new XmlDataContractSerializerOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(input, input.GetType());
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            var body = outputFormatterContext.HttpContext.Response.Body;
+            body.Position = 0;
+
+            var content = new StreamReader(body).ReadToEnd();
+            XmlAssert.Equal(expectedOutput, content);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public void XmlDataContractSerializer_CachesSerializerForType()
+        {
+            // Arrange
+            var input = new DummyClass { SampleInt = 10 };
+            var formatter = new TestXmlDataContractSerializerOutputFormatter();
+
+            var context = GetOutputFormatterContext(input, typeof(DummyClass));
+            context.ContentType = new StringSegment("application/xml");
+
+            // Act
+            formatter.CanWriteResult(context);
+            formatter.CanWriteResult(context);
+
+            // Assert
+            Assert.Equal(1, formatter.createSerializerCalledCount);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public void DefaultConstructor_ExpectedWriterSettings_Created()
+        {
+            // Arrange and Act
+            var formatter = new XmlDataContractSerializerOutputFormatter();
+
+            // Assert
+            var writerSettings = formatter.WriterSettings;
+            Assert.NotNull(writerSettings);
+            Assert.True(writerSettings.OmitXmlDeclaration);
+            Assert.False(writerSettings.CloseOutput);
+            Assert.False(writerSettings.CheckCharacters);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task SuppliedWriterSettings_TakeAffect()
+        {
+            // Arrange
+            var writerSettings = FormattingUtilities.GetDefaultXmlWriterSettings();
+            writerSettings.OmitXmlDeclaration = false;
+            var sampleInput = new DummyClass { SampleInt = 10 };
+            var formatterContext = GetOutputFormatterContext(sampleInput, sampleInput.GetType());
+            var formatter = new XmlDataContractSerializerOutputFormatter(writerSettings);
+            var expectedOutput = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
+                                "<DummyClass xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\">" +
+                                "<SampleInt>10</SampleInt></DummyClass>";
+
+            // Act
+            await formatter.WriteAsync(formatterContext);
+
+            // Assert
+            Assert.Same(writerSettings, formatter.WriterSettings);
+
+            var body = formatterContext.HttpContext.Response.Body;
+            body.Position = 0;
+
+            var content = new StreamReader(body).ReadToEnd();
+            XmlAssert.Equal(expectedOutput, content);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task WriteAsync_WritesSimpleTypes()
+        {
+            // Arrange
+            var expectedOutput =
+                "<DummyClass xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\">" +
+                "<SampleInt>10</SampleInt></DummyClass>";
+
+            var sampleInput = new DummyClass { SampleInt = 10 };
+            var formatter = new XmlDataContractSerializerOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(sampleInput, sampleInput.GetType());
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            var body = outputFormatterContext.HttpContext.Response.Body;
+            body.Position = 0;
+
+            var content = new StreamReader(body).ReadToEnd();
+            XmlAssert.Equal(expectedOutput, content);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task WriteAsync_WritesComplexTypes()
+        {
+            // Arrange
+            var expectedOutput =
+                "<TestLevelTwo xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\">" +
+                "<SampleString>TestString</SampleString>" +
+                "<TestOne><SampleInt>10</SampleInt><sampleString>TestLevelOne string</sampleString>" +
+                "</TestOne></TestLevelTwo>";
+
+            var sampleInput = new TestLevelTwo
+            {
+                SampleString = "TestString",
+                TestOne = new TestLevelOne
+                {
+                    SampleInt = 10,
+                    sampleString = "TestLevelOne string"
+                }
+            };
+            var formatter = new XmlDataContractSerializerOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(sampleInput, sampleInput.GetType());
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            var body = outputFormatterContext.HttpContext.Response.Body;
+            body.Position = 0;
+
+            var content = new StreamReader(body).ReadToEnd();
+            XmlAssert.Equal(expectedOutput, content);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task WriteAsync_WritesOnModifiedWriterSettings()
+        {
+            // Arrange
+            var expectedOutput =
+                "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
+                "<DummyClass xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\">" +
+                "<SampleInt>10</SampleInt></DummyClass>";
+
+            var sampleInput = new DummyClass { SampleInt = 10 };
+            var outputFormatterContext = GetOutputFormatterContext(sampleInput, sampleInput.GetType());
+            var formatter = new XmlDataContractSerializerOutputFormatter(
+                new XmlWriterSettings
+                {
+                    OmitXmlDeclaration = false,
+                    CloseOutput = false
+                });
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            var body = outputFormatterContext.HttpContext.Response.Body;
+            body.Position = 0;
+
+            var content = new StreamReader(body).ReadToEnd();
+            XmlAssert.Equal(expectedOutput, content);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task WriteAsync_WritesUTF16Output()
+        {
+            // Arrange
+            var expectedOutput =
+                "<?xml version=\"1.0\" encoding=\"utf-16\"?>" +
+                "<DummyClass xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\">" +
+                "<SampleInt>10</SampleInt></DummyClass>";
+
+            var sampleInput = new DummyClass { SampleInt = 10 };
+            var outputFormatterContext = GetOutputFormatterContext(sampleInput, sampleInput.GetType(),
+                "application/xml; charset=utf-16");
+            var formatter = new XmlDataContractSerializerOutputFormatter();
+            formatter.WriterSettings.OmitXmlDeclaration = false;
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            var body = outputFormatterContext.HttpContext.Response.Body;
+            body.Position = 0;
+
+            var content = new StreamReader(
+                body,
+                new UnicodeEncoding(bigEndian: false, byteOrderMark: false, throwOnInvalidBytes: true)).ReadToEnd();
+            XmlAssert.Equal(expectedOutput, content);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task WriteAsync_WritesIndentedOutput()
+        {
+            // Arrange
+            var expectedOutput =
+                "<DummyClass xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\">" +
+                "\r\n  <SampleInt>10</SampleInt>\r\n</DummyClass>";
+
+            var sampleInput = new DummyClass { SampleInt = 10 };
+            var formatter = new XmlDataContractSerializerOutputFormatter();
+            formatter.WriterSettings.Indent = true;
+            var outputFormatterContext = GetOutputFormatterContext(sampleInput, sampleInput.GetType());
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            var body = outputFormatterContext.HttpContext.Response.Body;
+            body.Position = 0;
+
+            var content = new StreamReader(body).ReadToEnd();
+            XmlAssert.Equal(expectedOutput, content);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task WriteAsync_VerifyBodyIsNotClosedAfterOutputIsWritten()
+        {
+            // Arrange
+            var sampleInput = new DummyClass { SampleInt = 10 };
+            var formatter = new XmlDataContractSerializerOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(sampleInput, sampleInput.GetType());
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            var body = outputFormatterContext.HttpContext.Response.Body;
+            Assert.True(body.CanRead);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task WriteAsync_DoesntFlushOutputStream()
+        {
+            // Arrange
+            var sampleInput = new DummyClass { SampleInt = 10 };
+            var formatter = new XmlDataContractSerializerOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(sampleInput, sampleInput.GetType());
+
+            var response = outputFormatterContext.HttpContext.Response;
+            response.Body = FlushReportingStream.GetThrowingStream();
+
+            // Act & Assert
+            await formatter.WriteAsync(outputFormatterContext);
+        }
+
+        public static IEnumerable<object[]> TypesForCanWriteResult
+        {
+            get
+            {
+                yield return new object[] { null, typeof(string), true };
+                yield return new object[] { null, null, false };
+                yield return new object[] { new DummyClass { SampleInt = 5 }, typeof(DummyClass), true };
+                yield return new object[] {
+                    new Dictionary<string, string> { { "Hello", "world" } }, typeof(object), true };
+                yield return new object[] {
+                    new Dictionary<string, string> { { "Hello", "world" } }, typeof(Dictionary<string,string>), true };
+            }
+        }
+
+        [ConditionalTheory]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        [MemberData(nameof(TypesForCanWriteResult))]
+        public void CanWriteResult_ReturnsExpectedValueForObjectType(object input, Type declaredType, bool expectedOutput)
+        {
+            // Arrange
+            var formatter = new XmlDataContractSerializerOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(input, declaredType);
+            outputFormatterContext.ContentType = new StringSegment("application/xml");
+
+            // Act
+            var result = formatter.CanWriteResult(outputFormatterContext);
+
+            // Assert
+            Assert.Equal(expectedOutput, result);
+        }
+
+        [ConditionalTheory]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        [InlineData("application/xml", false, "application/xml")]
+        [InlineData("application/xml", true, "application/xml")]
+        [InlineData("application/other", false, null)]
+        [InlineData("application/other", true, null)]
+        [InlineData("application/*", false, "application/xml")]
+        [InlineData("text/*", false, "text/xml")]
+        [InlineData("custom/*", false, null)]
+        [InlineData("application/xml;v=2", false, null)]
+        [InlineData("application/xml;v=2", true, null)]
+        [InlineData("application/some.entity+xml", false, null)]
+        [InlineData("application/some.entity+xml", true, "application/some.entity+xml")]
+        [InlineData("application/some.entity+xml;v=2", true, "application/some.entity+xml;v=2")]
+        [InlineData("application/some.entity+other", true, null)]
+        public void CanWriteResult_ReturnsExpectedValueForMediaType(
+            string mediaType,
+            bool isServerDefined,
+            string expectedResult)
+        {
+            // Arrange
+            var formatter = new XmlDataContractSerializerOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(new object(), typeof(object));
+            outputFormatterContext.ContentType = new StringSegment(mediaType);
+            outputFormatterContext.ContentTypeIsServerDefined = isServerDefined;
+
+            // Act
+            var actualCanWriteValue = formatter.CanWriteResult(outputFormatterContext);
+
+            // Assert
+            var expectedContentType = expectedResult ?? mediaType;
+            Assert.Equal(expectedResult != null, actualCanWriteValue);
+            Assert.Equal(new StringSegment(expectedContentType), outputFormatterContext.ContentType);
+        }
+
+        public static IEnumerable<object[]> TypesForGetSupportedContentTypes
+        {
+            get
+            {
+                yield return new object[] { typeof(DummyClass), "application/xml" };
+                yield return new object[] { typeof(object), "application/xml" };
+                yield return new object[] { null, null };
+            }
+        }
+
+        [ConditionalTheory]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        [MemberData(nameof(TypesForGetSupportedContentTypes))]
+        public void GetSupportedContentTypes_ReturnsSupportedTypes(Type type, object expectedOutput)
+        {
+            // Arrange
+            var formatter = new XmlDataContractSerializerOutputFormatter();
+
+            // Act
+            var result = formatter.GetSupportedContentTypes(
+                "application/xml",
+                type);
+
+            // Assert
+            if (expectedOutput != null)
+            {
+                Assert.Equal(expectedOutput, Assert.Single(result).ToString());
+            }
+            else
+            {
+                Assert.Equal(expectedOutput, result);
+            }
+        }
+
+        [Fact]
+        public async Task WriteAsync_ThrowsWhenNotConfiguredWithKnownTypes()
+        {
+            // Arrange
+            var sampleInput = new SomeDummyClass { SampleInt = 1, SampleString = "TestString" };
+            var formatter = new XmlDataContractSerializerOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(sampleInput, typeof(DummyClass));
+
+            // Act & Assert
+            await Assert.ThrowsAsync<SerializationException>(async () => await formatter.WriteAsync(outputFormatterContext));
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task WriteAsync_ThrowsWhenNotConfiguredWithPreserveReferences()
+        {
+            // Arrange
+            var child = new Child { Id = 1 };
+            var parent = new Parent { Name = "Parent", Children = new List<Child> { child } };
+            child.Parent = parent;
+
+            var formatter = new XmlDataContractSerializerOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(parent, parent.GetType());
+
+            // Act & Assert
+            await Assert.ThrowsAsync<SerializationException>(async () => await formatter.WriteAsync(outputFormatterContext));
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task WriteAsync_WritesWhenConfiguredWithRootName()
+        {
+            // Arrange
+            var sampleInt = 10;
+            var SubstituteRootName = "SomeOtherClass";
+            var SubstituteRootNamespace = "http://tempuri.org";
+            var InstanceNamespace = "http://www.w3.org/2001/XMLSchema-instance";
+
+            var expectedOutput = string.Format(
+                "<{0} xmlns:i=\"{2}\" xmlns=\"{1}\"><SampleInt xmlns=\"\">{3}</SampleInt></{0}>",
+                SubstituteRootName,
+                SubstituteRootNamespace,
+                InstanceNamespace,
+                sampleInt);
+
+            var sampleInput = new DummyClass { SampleInt = sampleInt };
+
+            var dictionary = new XmlDictionary();
+            var settings = new DataContractSerializerSettings
+            {
+                RootName = dictionary.Add(SubstituteRootName),
+                RootNamespace = dictionary.Add(SubstituteRootNamespace)
+            };
+            var formatter = new XmlDataContractSerializerOutputFormatter
+            {
+                SerializerSettings = settings
+            };
+            var outputFormatterContext = GetOutputFormatterContext(sampleInput, sampleInput.GetType());
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            var body = outputFormatterContext.HttpContext.Response.Body;
+            body.Position = 0;
+
+            var content = new StreamReader(body).ReadToEnd();
+            XmlAssert.Equal(expectedOutput, content);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task WriteAsync_WritesWhenConfiguredWithKnownTypes()
+        {
+            // Arrange
+            var sampleInt = 10;
+            var sampleString = "TestString";
+            var KnownTypeName = "SomeDummyClass";
+            var InstanceNamespace = "http://www.w3.org/2001/XMLSchema-instance";
+
+            var expectedOutput = string.Format(
+                    "<DummyClass xmlns:i=\"{1}\" xmlns=\"\" i:type=\"{0}\"><SampleInt>{2}</SampleInt>"
+                    + "<SampleString>{3}</SampleString></DummyClass>",
+                    KnownTypeName,
+                    InstanceNamespace,
+                    sampleInt,
+                    sampleString);
+
+            var sampleInput = new SomeDummyClass
+            {
+                SampleInt = sampleInt,
+                SampleString = sampleString
+            };
+
+            var settings = new DataContractSerializerSettings
+            {
+                KnownTypes = new[] { typeof(SomeDummyClass) }
+            };
+            var formatter = new XmlDataContractSerializerOutputFormatter
+            {
+                SerializerSettings = settings
+            };
+            var outputFormatterContext = GetOutputFormatterContext(sampleInput, typeof(DummyClass));
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            var body = outputFormatterContext.HttpContext.Response.Body;
+            body.Position = 0;
+
+            var content = new StreamReader(body).ReadToEnd();
+            XmlAssert.Equal(expectedOutput, content);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task WriteAsync_WritesWhenConfiguredWithPreserveReferences()
+        {
+            // Arrange
+            var sampleId = 1;
+            var sampleName = "Parent";
+            var InstanceNamespace = "http://www.w3.org/2001/XMLSchema-instance";
+            var SerializationNamespace = "http://schemas.microsoft.com/2003/10/Serialization/";
+
+            var expectedOutput = string.Format(
+                    "<Parent xmlns:i=\"{0}\" z:Id=\"{2}\" xmlns:z=\"{1}\">" +
+                    "<Children z:Id=\"2\" z:Size=\"1\">" +
+                    "<Child z:Id=\"3\"><Id>{2}</Id><Parent z:Ref=\"1\" i:nil=\"true\" />" +
+                    "</Child></Children><Name z:Id=\"4\">{3}</Name></Parent>",
+                    InstanceNamespace,
+                    SerializationNamespace,
+                    sampleId,
+                    sampleName);
+
+            var child = new Child { Id = sampleId };
+            var parent = new Parent { Name = sampleName, Children = new List<Child> { child } };
+            child.Parent = parent;
+
+            var settings = new DataContractSerializerSettings
+            {
+                PreserveObjectReferences = true
+            };
+            var formatter = new XmlDataContractSerializerOutputFormatter
+            {
+                SerializerSettings = settings
+            };
+            var outputFormatterContext = GetOutputFormatterContext(parent, parent.GetType());
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            var body = outputFormatterContext.HttpContext.Response.Body;
+            body.Position = 0;
+
+            var content = new StreamReader(body).ReadToEnd();
+            XmlAssert.Equal(expectedOutput, content);
+        }
+
+        public static TheoryData<XmlDataContractSerializerOutputFormatter, TestSink> LogsWhenUnableToCreateSerializerForTypeData
+        {
+            get
+            {
+                var sink1 = new TestSink();
+                var formatter1 = new XmlDataContractSerializerOutputFormatter(new TestLoggerFactory(sink1, enabled: true));
+
+                var sink2 = new TestSink();
+                var formatter2 = new XmlDataContractSerializerOutputFormatter(
+                    new XmlWriterSettings(),
+                    new TestLoggerFactory(sink2, enabled: true));
+
+                return new TheoryData<XmlDataContractSerializerOutputFormatter, TestSink>()
+                {
+                    { formatter1, sink1 },
+                    { formatter2, sink2}
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(LogsWhenUnableToCreateSerializerForTypeData))]
+        public void CannotCreateSerializer_LogsWarning(
+            XmlDataContractSerializerOutputFormatter formatter,
+            TestSink sink)
+        {
+            // Arrange
+            var outputFormatterContext = GetOutputFormatterContext(new Customer(10), typeof(Customer));
+
+            // Act
+            var result = formatter.CanWriteResult(outputFormatterContext);
+
+            // Assert
+            Assert.False(result);
+            var write = Assert.Single(sink.Writes);
+            Assert.Equal(LogLevel.Warning, write.LogLevel);
+            Assert.Equal($"An error occurred while trying to create a DataContractSerializer for the type '{typeof(Customer).FullName}'.",
+                write.State.ToString());
+        }
+
+        [Fact]
+        public void DoesNotThrow_OnNoLoggerAnd_WhenUnableToCreateSerializerForType()
+        {
+            // Arrange
+            var formatter = new XmlDataContractSerializerOutputFormatter(); // no logger is being supplied here on purpose
+            var outputFormatterContext = GetOutputFormatterContext(new Customer(10), typeof(Customer));
+
+            // Act
+            var canWriteResult = formatter.CanWriteResult(outputFormatterContext);
+
+            // Assert
+            Assert.False(canWriteResult);
+        }
+
+        public static TheoryData<bool, object, string> CanIndentOutputConditionallyData
+        {
+            get
+            {
+                var obj = new DummyClass { SampleInt = 10 };
+                var newLine = Environment.NewLine;
+                return new TheoryData<bool, object, string>()
+                {
+                    { true, obj, "<DummyClass xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\">" +
+                    $"{newLine}  <SampleInt>10</SampleInt>{newLine}</DummyClass>" },
+                    { false, obj, "<DummyClass xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\">" +
+                        "<SampleInt>10</SampleInt></DummyClass>" }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(CanIndentOutputConditionallyData))]
+        public async Task CanIndentOutputConditionally(bool indent, object input, string expectedOutput)
+        {
+            // Arrange
+            var formatter = new IndentingXmlDataContractSerializerOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(input, input.GetType());
+            outputFormatterContext.HttpContext.Request.QueryString = new QueryString("?indent=" + indent);
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            var body = outputFormatterContext.HttpContext.Response.Body;
+            body.Position = 0;
+
+            var content = new StreamReader(body).ReadToEnd();
+            Assert.Equal(expectedOutput, content);
+        }
+
+        private OutputFormatterWriteContext GetOutputFormatterContext(
+            object outputValue,
+            Type outputType,
+            string contentType = "application/xml; charset=utf-8")
+        {
+            return new OutputFormatterWriteContext(
+                GetHttpContext(contentType),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                outputType,
+                outputValue);
+        }
+
+        private static HttpContext GetHttpContext(string contentType)
+        {
+            var httpContext = new DefaultHttpContext();
+            var request = httpContext.Request;
+            request.Headers["Accept-Charset"] = MediaTypeHeaderValue.Parse(contentType).Charset.ToString();
+            request.ContentType = contentType;
+            httpContext.Response.Body = new MemoryStream();
+            return httpContext;
+        }
+
+        private class TestXmlDataContractSerializerOutputFormatter : XmlDataContractSerializerOutputFormatter
+        {
+            public int createSerializerCalledCount = 0;
+
+            protected override DataContractSerializer CreateSerializer(Type type)
+            {
+                createSerializerCalledCount++;
+                return base.CreateSerializer(type);
+            }
+        }
+
+        private class IndentingXmlDataContractSerializerOutputFormatter : XmlDataContractSerializerOutputFormatter
+        {
+            public override XmlWriter CreateXmlWriter(
+                OutputFormatterWriteContext context,
+                TextWriter writer,
+                XmlWriterSettings xmlWriterSettings)
+            {
+                var request = context.HttpContext.Request;
+                if (request.Query["indent"] == "True")
+                {
+                    xmlWriterSettings.Indent = true;
+                }
+
+                return base.CreateXmlWriter(context, writer, xmlWriterSettings);
+            }
+        }
+        public class Customer
+        {
+            public Customer(int id)
+            {
+            }
+
+            public int MyProperty { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs
new file mode 100644
index 0000000000..84360e3c94
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs
@@ -0,0 +1,724 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml;
+using System.Xml.Serialization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.Testing.xunit;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
+{
+    public class XmlSerializerInputFormatterTest
+    {
+        public class DummyClass
+        {
+            public int SampleInt { get; set; }
+        }
+
+        public class TestLevelOne
+        {
+            public int SampleInt { get; set; }
+            public string sampleString;
+            public DateTime SampleDate { get; set; }
+        }
+
+        public class TestLevelTwo
+        {
+            public string SampleString { get; set; }
+            public TestLevelOne TestOne { get; set; }
+        }
+
+        [Fact]
+        public async Task BuffersRequestBody_ByDefault()
+        {
+            // Arrange
+            var expectedInt = 10;
+            var expectedString = "TestString";
+            var expectedDateTime = XmlConvert.ToString(DateTime.UtcNow, XmlDateTimeSerializationMode.Utc);
+
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<TestLevelOne><SampleInt>" + expectedInt + "</SampleInt>" +
+                "<sampleString>" + expectedString + "</sampleString>" +
+                "<SampleDate>" + expectedDateTime + "</SampleDate></TestLevelOne>";
+
+#pragma warning disable CS0618
+            var formatter = new XmlSerializerInputFormatter();
+#pragma warning restore CS0618
+
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<IHttpResponseFeature>(new TestResponseFeature());
+            httpContext.Request.Body = new NonSeekableReadStream(contentBytes);
+            httpContext.Request.ContentType = "application/json";
+            var context = GetInputFormatterContext(httpContext, typeof(TestLevelOne));
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<TestLevelOne>(result.Model);
+
+            Assert.Equal(expectedInt, model.SampleInt);
+            Assert.Equal(expectedString, model.sampleString);
+            Assert.Equal(
+                XmlConvert.ToDateTime(expectedDateTime, XmlDateTimeSerializationMode.Utc),
+                model.SampleDate);
+
+            Assert.True(httpContext.Request.Body.CanSeek);
+            httpContext.Request.Body.Seek(0L, SeekOrigin.Begin);
+
+            result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            model = Assert.IsType<TestLevelOne>(result.Model);
+
+            Assert.Equal(expectedInt, model.SampleInt);
+            Assert.Equal(expectedString, model.sampleString);
+            Assert.Equal(
+                XmlConvert.ToDateTime(expectedDateTime, XmlDateTimeSerializationMode.Utc),
+                model.SampleDate);
+        }
+
+        [Fact]
+        public async Task SuppressInputFormatterBufferingSetToTrue_DoesNotBufferRequestBody_ObsoleteParameter()
+        {
+            // Arrange
+            var expectedInt = 10;
+            var expectedString = "TestString";
+            var expectedDateTime = XmlConvert.ToString(DateTime.UtcNow, XmlDateTimeSerializationMode.Utc);
+
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<TestLevelOne><SampleInt>" + expectedInt + "</SampleInt>" +
+                "<sampleString>" + expectedString + "</sampleString>" +
+                "<SampleDate>" + expectedDateTime + "</SampleDate></TestLevelOne>";
+
+#pragma warning disable CS0618
+            var formatter = new XmlSerializerInputFormatter(suppressInputFormatterBuffering: true);
+#pragma warning restore CS0618
+
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<IHttpResponseFeature>(new TestResponseFeature());
+            httpContext.Request.Body = new NonSeekableReadStream(contentBytes);
+            httpContext.Request.ContentType = "application/xml";
+            var context = GetInputFormatterContext(httpContext, typeof(TestLevelOne));
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<TestLevelOne>(result.Model);
+
+            Assert.Equal(expectedInt, model.SampleInt);
+            Assert.Equal(expectedString, model.sampleString);
+            Assert.Equal(
+                XmlConvert.ToDateTime(expectedDateTime, XmlDateTimeSerializationMode.Utc),
+                model.SampleDate);
+
+            // Reading again should fail as buffering request body is disabled
+            await Assert.ThrowsAsync<XmlException>(() => formatter.ReadAsync(context));
+        }
+
+        [Fact]
+        public async Task BuffersRequestBody_ByDefaultUsingMvcOptions()
+        {
+            // Arrange
+            var expectedInt = 10;
+            var expectedString = "TestString";
+            var expectedDateTime = XmlConvert.ToString(DateTime.UtcNow, XmlDateTimeSerializationMode.Utc);
+
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<TestLevelOne><SampleInt>" + expectedInt + "</SampleInt>" +
+                "<sampleString>" + expectedString + "</sampleString>" +
+                "<SampleDate>" + expectedDateTime + "</SampleDate></TestLevelOne>";
+
+            var formatter = new XmlSerializerInputFormatter(new MvcOptions());
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<IHttpResponseFeature>(new TestResponseFeature());
+            httpContext.Request.Body = new NonSeekableReadStream(contentBytes);
+            httpContext.Request.ContentType = "application/json";
+            var context = GetInputFormatterContext(httpContext, typeof(TestLevelOne));
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<TestLevelOne>(result.Model);
+
+            Assert.Equal(expectedInt, model.SampleInt);
+            Assert.Equal(expectedString, model.sampleString);
+            Assert.Equal(
+                XmlConvert.ToDateTime(expectedDateTime, XmlDateTimeSerializationMode.Utc),
+                model.SampleDate);
+
+            Assert.True(httpContext.Request.Body.CanSeek);
+            httpContext.Request.Body.Seek(0L, SeekOrigin.Begin);
+
+            result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            model = Assert.IsType<TestLevelOne>(result.Model);
+
+            Assert.Equal(expectedInt, model.SampleInt);
+            Assert.Equal(expectedString, model.sampleString);
+            Assert.Equal(
+                XmlConvert.ToDateTime(expectedDateTime, XmlDateTimeSerializationMode.Utc),
+                model.SampleDate);
+        }
+
+        [Fact]
+        public async Task SuppressInputFormatterBufferingSetToTrue_DoesNotBufferRequestBody()
+        {
+            // Arrange
+            var expectedInt = 10;
+            var expectedString = "TestString";
+            var expectedDateTime = XmlConvert.ToString(DateTime.UtcNow, XmlDateTimeSerializationMode.Utc);
+
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<TestLevelOne><SampleInt>" + expectedInt + "</SampleInt>" +
+                "<sampleString>" + expectedString + "</sampleString>" +
+                "<SampleDate>" + expectedDateTime + "</SampleDate></TestLevelOne>";
+
+            var formatter = new XmlSerializerInputFormatter(new MvcOptions() { SuppressInputFormatterBuffering = true });
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<IHttpResponseFeature>(new TestResponseFeature());
+            httpContext.Request.Body = new NonSeekableReadStream(contentBytes);
+            httpContext.Request.ContentType = "application/xml";
+            var context = GetInputFormatterContext(httpContext, typeof(TestLevelOne));
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<TestLevelOne>(result.Model);
+
+            Assert.Equal(expectedInt, model.SampleInt);
+            Assert.Equal(expectedString, model.sampleString);
+            Assert.Equal(
+                XmlConvert.ToDateTime(expectedDateTime, XmlDateTimeSerializationMode.Utc),
+                model.SampleDate);
+
+            // Reading again should fail as buffering request body is disabled
+            await Assert.ThrowsAsync<XmlException>(() => formatter.ReadAsync(context));
+        }
+
+        [Fact]
+        public async Task SuppressInputFormatterBufferingSetToTrue_UsingMutatedOptions()
+        {
+            // Arrange
+            var expectedInt = 10;
+            var expectedString = "TestString";
+            var expectedDateTime = XmlConvert.ToString(DateTime.UtcNow, XmlDateTimeSerializationMode.Utc);
+
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<TestLevelOne><SampleInt>" + expectedInt + "</SampleInt>" +
+                "<sampleString>" + expectedString + "</sampleString>" +
+                "<SampleDate>" + expectedDateTime + "</SampleDate></TestLevelOne>";
+
+            var mvcOptions = new MvcOptions();
+            mvcOptions.SuppressInputFormatterBuffering = false;
+            var formatter = new XmlSerializerInputFormatter(mvcOptions);
+
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<IHttpResponseFeature>(new TestResponseFeature());
+            httpContext.Request.Body = new NonSeekableReadStream(contentBytes);
+            httpContext.Request.ContentType = "application/xml";
+            var context = GetInputFormatterContext(httpContext, typeof(TestLevelOne));
+
+            // Act
+            // Mutate options after passing into the constructor to make sure that the value type is not store in the constructor
+            mvcOptions.SuppressInputFormatterBuffering = true;
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<TestLevelOne>(result.Model);
+
+            Assert.Equal(expectedInt, model.SampleInt);
+            Assert.Equal(expectedString, model.sampleString);
+            Assert.Equal(
+                XmlConvert.ToDateTime(expectedDateTime, XmlDateTimeSerializationMode.Utc),
+                model.SampleDate);
+
+            // Reading again should fail as buffering request body is disabled
+            await Assert.ThrowsAsync<XmlException>(() => formatter.ReadAsync(context));
+        }
+
+        [Theory]
+        [InlineData("application/xml", true)]
+        [InlineData("application/*", false)]
+        [InlineData("*/*", false)]
+        [InlineData("text/xml", true)]
+        [InlineData("text/*", false)]
+        [InlineData("text/json", false)]
+        [InlineData("application/json", false)]
+        [InlineData("application/some.entity+xml", true)]
+        [InlineData("application/some.entity+xml;v=2", true)]
+        [InlineData("application/some.entity+json", false)]
+        [InlineData("application/some.entity+*", false)]
+        [InlineData("text/some.entity+json", false)]
+        [InlineData("", false)]
+        [InlineData("invalid", false)]
+        [InlineData(null, false)]
+        public void CanRead_ReturnsTrueForAnySupportedContentType(string requestContentType, bool expectedCanRead)
+        {
+            // Arrange
+            var formatter = new XmlSerializerInputFormatter(new MvcOptions());
+            var contentBytes = Encoding.UTF8.GetBytes("content");
+
+            var modelState = new ModelStateDictionary();
+            var httpContext = GetHttpContext(contentBytes, contentType: requestContentType);
+
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForType(typeof(string));
+            var formatterContext = new InputFormatterContext(
+                httpContext,
+                modelName: string.Empty,
+                modelState: modelState,
+                metadata: metadata,
+                readerFactory: new TestHttpRequestStreamReaderFactory().CreateReader);
+
+            // Act
+            var result = formatter.CanRead(formatterContext);
+
+            // Assert
+            Assert.Equal(expectedCanRead, result);
+        }
+
+        [Theory]
+        [InlineData(typeof(Dictionary<string, object>), false)]
+        [InlineData(typeof(string), true)]
+        public void CanRead_ReturnsFalse_ForAnyUnsupportedModelType(Type modelType, bool expectedCanRead)
+        {
+            // Arrange
+            var formatter = new XmlSerializerInputFormatter(new MvcOptions());
+            var contentBytes = Encoding.UTF8.GetBytes("content");
+
+            var context = GetInputFormatterContext(contentBytes, modelType);
+
+            // Act
+            var result = formatter.CanRead(context);
+
+            // Assert
+            Assert.Equal(expectedCanRead, result);
+        }
+
+        [Fact]
+        public void XmlSerializer_CachesSerializerForType()
+        {
+            // Arrange
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<DummyClass><SampleInt>10</SampleInt></DummyClass>";
+            var formatter = new TestXmlSerializerInputFormatter();
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var context = GetInputFormatterContext(contentBytes, typeof(DummyClass));
+
+            // Act
+            formatter.CanRead(context);
+            formatter.CanRead(context);
+
+            // Assert
+            Assert.Equal(1, formatter.createSerializerCalledCount);
+        }
+
+        [Fact]
+        public void HasProperSuppportedMediaTypes()
+        {
+            // Arrange & Act
+            var formatter = new XmlSerializerInputFormatter(new MvcOptions());
+
+            // Assert
+            Assert.Contains("application/xml", formatter.SupportedMediaTypes
+                                 .Select(content => content.ToString()));
+            Assert.Contains("text/xml", formatter.SupportedMediaTypes
+                                 .Select(content => content.ToString()));
+        }
+
+        [Fact]
+        public void HasProperSuppportedEncodings()
+        {
+            // Arrange & Act
+            var formatter = new XmlSerializerInputFormatter(new MvcOptions());
+
+            // Assert
+            Assert.Contains(formatter.SupportedEncodings, i => i.WebName == "utf-8");
+            Assert.Contains(formatter.SupportedEncodings, i => i.WebName == "utf-16");
+        }
+
+        [Fact]
+        public async Task ReadAsync_ReadsSimpleTypes()
+        {
+            // Arrange
+            var expectedInt = 10;
+            var expectedString = "TestString";
+            var expectedDateTime = XmlConvert.ToString(DateTime.UtcNow, XmlDateTimeSerializationMode.Utc);
+
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                                "<TestLevelOne><SampleInt>" + expectedInt + "</SampleInt>" +
+                                "<sampleString>" + expectedString + "</sampleString>" +
+                                "<SampleDate>" + expectedDateTime + "</SampleDate></TestLevelOne>";
+
+            var formatter = new XmlSerializerInputFormatter(new MvcOptions());
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var context = GetInputFormatterContext(contentBytes, typeof(TestLevelOne));
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<TestLevelOne>(result.Model);
+
+            Assert.Equal(expectedInt, model.SampleInt);
+            Assert.Equal(expectedString, model.sampleString);
+            Assert.Equal(
+                XmlConvert.ToDateTime(expectedDateTime, XmlDateTimeSerializationMode.Utc),
+                model.SampleDate);
+        }
+
+        [Fact]
+        public async Task ReadAsync_ReadsComplexTypes()
+        {
+            // Arrange
+            var expectedInt = 10;
+            var expectedString = "TestString";
+            var expectedDateTime = XmlConvert.ToString(DateTime.UtcNow, XmlDateTimeSerializationMode.Utc);
+            var expectedLevelTwoString = "102";
+
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                        "<TestLevelTwo><SampleString>" + expectedLevelTwoString + "</SampleString>" +
+                        "<TestOne><SampleInt>" + expectedInt + "</SampleInt>" +
+                        "<sampleString>" + expectedString + "</sampleString>" +
+                        "<SampleDate>" + expectedDateTime + "</SampleDate></TestOne></TestLevelTwo>";
+
+            var formatter = new XmlSerializerInputFormatter(new MvcOptions());
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var context = GetInputFormatterContext(contentBytes, typeof(TestLevelTwo));
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<TestLevelTwo>(result.Model);
+
+            Assert.Equal(expectedLevelTwoString, model.SampleString);
+            Assert.Equal(expectedInt, model.TestOne.SampleInt);
+            Assert.Equal(expectedString, model.TestOne.sampleString);
+            Assert.Equal(
+                XmlConvert.ToDateTime(expectedDateTime, XmlDateTimeSerializationMode.Utc),
+                model.TestOne.SampleDate);
+        }
+
+        [Fact]
+        public async Task ReadAsync_ReadsWhenMaxDepthIsModified()
+        {
+            // Arrange
+            var expectedInt = 10;
+
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<DummyClass><SampleInt>" + expectedInt + "</SampleInt></DummyClass>";
+            var formatter = new XmlSerializerInputFormatter(new MvcOptions());
+            formatter.MaxDepth = 10;
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var context = GetInputFormatterContext(contentBytes, typeof(DummyClass));
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<DummyClass>(result.Model);
+            Assert.Equal(expectedInt, model.SampleInt);
+        }
+
+        [ConditionalFact]
+        // ReaderQuotas are not honored on Mono
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task ReadAsync_ThrowsOnExceededMaxDepth()
+        {
+            // Arrange
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                        "<TestLevelTwo><SampleString>test</SampleString>" +
+                        "<TestOne><SampleInt>10</SampleInt>" +
+                        "<sampleString>test</sampleString>" +
+                        "<SampleDate>" + XmlConvert.ToString(DateTime.UtcNow, XmlDateTimeSerializationMode.Utc)
+                        + "</SampleDate></TestOne></TestLevelTwo>";
+            var formatter = new XmlSerializerInputFormatter(new MvcOptions());
+            formatter.MaxDepth = 1;
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var context = GetInputFormatterContext(contentBytes, typeof(TestLevelTwo));
+
+            // Act & Assert
+            await Assert.ThrowsAsync<InputFormatterException>(() => formatter.ReadAsync(context));
+        }
+
+        [ConditionalFact]
+        // ReaderQuotas are not honored on Mono
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task ReadAsync_ThrowsWhenReaderQuotasAreChanged()
+        {
+            // Arrange
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                        "<TestLevelTwo><SampleString>test</SampleString>" +
+                        "<TestOne><SampleInt>10</SampleInt>" +
+                        "<sampleString>test</sampleString>" +
+                        "<SampleDate>" + XmlConvert.ToString(DateTime.UtcNow, XmlDateTimeSerializationMode.Utc)
+                        + "</SampleDate></TestOne></TestLevelTwo>";
+            var formatter = new XmlSerializerInputFormatter(new MvcOptions());
+            formatter.XmlDictionaryReaderQuotas.MaxStringContentLength = 10;
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var context = GetInputFormatterContext(contentBytes, typeof(TestLevelTwo));
+
+            // Act & Assert
+            await Assert.ThrowsAsync<InputFormatterException>(() => formatter.ReadAsync(context));
+        }
+
+        [Fact]
+        public void SetMaxDepth_ThrowsWhenMaxDepthIsBelowOne()
+        {
+            // Arrange
+            var formatter = new XmlSerializerInputFormatter(new MvcOptions());
+
+            // Act & Assert
+            Assert.Throws<ArgumentException>(() => formatter.MaxDepth = 0);
+        }
+
+        [Fact]
+        public async Task ReadAsync_VerifyStreamIsOpenAfterRead()
+        {
+            // Arrange
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<DummyClass><SampleInt>10</SampleInt></DummyClass>";
+            var formatter = new XmlSerializerInputFormatter(new MvcOptions());
+            var contentBytes = Encoding.UTF8.GetBytes(input);
+            var context = GetInputFormatterContext(contentBytes, typeof(DummyClass));
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            Assert.NotNull(result.Model);
+            Assert.True(context.HttpContext.Request.Body.CanRead);
+        }
+
+        [ReplaceCulture]
+        [Fact]
+        public async Task ReadAsync_FallsbackToUTF8_WhenCharSet_NotInContentType()
+        {
+            // Arrange
+            var expectedException = typeof(XmlException);
+            var expectedMessage = "The expected encoding 'utf-8' does not match the actual encoding 'utf-16LE'.";
+
+            var inpStart = Encoding.Unicode.GetBytes("<?xml version=\"1.0\" encoding=\"UTF-16\"?>" +
+                "<DummyClass><SampleInt>");
+            byte[] inp = { 192, 193 };
+            var inpEnd = Encoding.Unicode.GetBytes("</SampleInt></DummyClass>");
+
+            var contentBytes = new byte[inpStart.Length + inp.Length + inpEnd.Length];
+            Buffer.BlockCopy(inpStart, 0, contentBytes, 0, inpStart.Length);
+            Buffer.BlockCopy(inp, 0, contentBytes, inpStart.Length, inp.Length);
+            Buffer.BlockCopy(inpEnd, 0, contentBytes, inpStart.Length + inp.Length, inpEnd.Length);
+
+            var formatter = new XmlSerializerInputFormatter(new MvcOptions());
+            var context = GetInputFormatterContext(contentBytes, typeof(TestLevelTwo));
+
+            // Act and Assert
+            var ex = await Assert.ThrowsAsync(expectedException, () => formatter.ReadAsync(context));
+            Assert.Equal(expectedMessage, ex.Message);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public async Task ReadAsync_UsesContentTypeCharSet_ToReadStream()
+        {
+            // Arrange
+            var expectedException = typeof(XmlException);
+            var expectedMessage = "The expected encoding 'utf-16LE' does not match the actual encoding 'utf-8'.";
+
+            var inputBytes = Encoding.UTF8.GetBytes("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<DummyClass><SampleInt>1000</SampleInt></DummyClass>");
+
+            var formatter = new XmlSerializerInputFormatter(new MvcOptions());
+
+            var modelState = new ModelStateDictionary();
+            var httpContext = GetHttpContext(inputBytes, contentType: "application/xml; charset=utf-16");
+
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForType(typeof(TestLevelOne));
+            var context = new InputFormatterContext(
+                httpContext,
+                modelName: string.Empty,
+                modelState: modelState,
+                metadata: metadata,
+                readerFactory: new TestHttpRequestStreamReaderFactory().CreateReader);
+
+            // Act and Assert
+            var ex = await Assert.ThrowsAsync(expectedException, () => formatter.ReadAsync(context));
+            Assert.Equal(expectedMessage, ex.Message);
+        }
+
+        [Fact]
+        public async Task ReadAsync_IgnoresBOMCharacters()
+        {
+            // Arrange
+            var sampleString = "Test";
+            var sampleStringBytes = Encoding.UTF8.GetBytes(sampleString);
+            var inputStart = Encoding.UTF8.GetBytes("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + Environment.NewLine +
+                "<TestLevelTwo><SampleString>" + sampleString);
+            byte[] bom = { 0xef, 0xbb, 0xbf };
+            var inputEnd = Encoding.UTF8.GetBytes("</SampleString></TestLevelTwo>");
+            var expectedBytes = new byte[sampleString.Length + bom.Length];
+
+            var contentBytes = new byte[inputStart.Length + bom.Length + inputEnd.Length];
+            Buffer.BlockCopy(inputStart, 0, contentBytes, 0, inputStart.Length);
+            Buffer.BlockCopy(bom, 0, contentBytes, inputStart.Length, bom.Length);
+            Buffer.BlockCopy(inputEnd, 0, contentBytes, inputStart.Length + bom.Length, inputEnd.Length);
+
+            var formatter = new XmlSerializerInputFormatter(new MvcOptions());
+            var context = GetInputFormatterContext(contentBytes, typeof(TestLevelTwo));
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<TestLevelTwo>(result.Model);
+            Buffer.BlockCopy(sampleStringBytes, 0, expectedBytes, 0, sampleStringBytes.Length);
+            Buffer.BlockCopy(bom, 0, expectedBytes, sampleStringBytes.Length, bom.Length);
+            Assert.Equal(expectedBytes, Encoding.UTF8.GetBytes(model.SampleString));
+        }
+
+        [Fact]
+        public async Task ReadAsync_AcceptsUTF16Characters()
+        {
+            // Arrange
+            var expectedInt = 10;
+            var expectedString = "TestString";
+            var expectedDateTime = XmlConvert.ToString(DateTime.UtcNow, XmlDateTimeSerializationMode.Utc);
+
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-16\"?>" +
+                                "<TestLevelOne><SampleInt>" + expectedInt + "</SampleInt>" +
+                                "<sampleString>" + expectedString + "</sampleString>" +
+                                "<SampleDate>" + expectedDateTime + "</SampleDate></TestLevelOne>";
+
+            var formatter = new XmlSerializerInputFormatter(new MvcOptions());
+            var contentBytes = Encoding.Unicode.GetBytes(input);
+
+            var modelState = new ModelStateDictionary();
+            var httpContext = GetHttpContext(contentBytes, contentType: "application/xml; charset=utf-16");
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForType(typeof(TestLevelOne));
+            var context = new InputFormatterContext(
+                httpContext,
+                modelName: string.Empty,
+                modelState: modelState,
+                metadata: metadata,
+                readerFactory: new TestHttpRequestStreamReaderFactory().CreateReader);
+
+            // Act
+            var result = await formatter.ReadAsync(context);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.False(result.HasError);
+            var model = Assert.IsType<TestLevelOne>(result.Model);
+
+            Assert.Equal(expectedInt, model.SampleInt);
+            Assert.Equal(expectedString, model.sampleString);
+            Assert.Equal(XmlConvert.ToDateTime(expectedDateTime, XmlDateTimeSerializationMode.Utc), model.SampleDate);
+        }
+
+        private InputFormatterContext GetInputFormatterContext(byte[] contentBytes, Type modelType)
+        {
+            var httpContext = GetHttpContext(contentBytes);
+            return GetInputFormatterContext(httpContext, modelType);
+        }
+
+        private InputFormatterContext GetInputFormatterContext(HttpContext httpContext, Type modelType)
+        {
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForType(modelType);
+            return new InputFormatterContext(
+                httpContext,
+                modelName: string.Empty,
+                modelState: new ModelStateDictionary(),
+                metadata: metadata,
+                readerFactory: new TestHttpRequestStreamReaderFactory().CreateReader);
+        }
+
+        private static HttpContext GetHttpContext(
+            byte[] contentBytes,
+            string contentType = "application/xml")
+        {
+            var request = new Mock<HttpRequest>();
+            var headers = new Mock<IHeaderDictionary>();
+            request.SetupGet(r => r.Headers).Returns(headers.Object);
+            request.SetupGet(f => f.Body).Returns(new MemoryStream(contentBytes));
+            request.SetupGet(f => f.ContentType).Returns(contentType);
+
+            var httpContext = new Mock<HttpContext>();
+            httpContext.SetupGet(c => c.Request).Returns(request.Object);
+            httpContext.SetupGet(c => c.Request).Returns(request.Object);
+            return httpContext.Object;
+        }
+
+        private class TestXmlSerializerInputFormatter : XmlSerializerInputFormatter
+        {
+            public int createSerializerCalledCount = 0;
+
+            public TestXmlSerializerInputFormatter()
+                : base(new MvcOptions())
+            {
+            }
+
+            protected override XmlSerializer CreateSerializer(Type type)
+            {
+                createSerializerCalledCount++;
+                return base.CreateSerializer(type);
+            }
+        }
+
+        private class TestResponseFeature : HttpResponseFeature
+        {
+            public override void OnCompleted(Func<object, Task> callback, object state)
+            {
+                // do not do anything
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerOutputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerOutputFormatterTest.cs
new file mode 100644
index 0000000000..dd2602e548
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerOutputFormatterTest.cs
@@ -0,0 +1,576 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml;
+using System.Xml.Serialization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.Formatters.Xml.Internal;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Testing;
+using Microsoft.Extensions.Primitives;
+using Microsoft.Net.Http.Headers;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
+{
+    public class XmlSerializerOutputFormatterTest
+    {
+        public class DummyClass
+        {
+            public int SampleInt { get; set; }
+        }
+
+        public class TestLevelOne
+        {
+            public int SampleInt { get; set; }
+            public string sampleString;
+        }
+
+        public class TestLevelTwo
+        {
+            public string SampleString { get; set; }
+            public TestLevelOne TestOne { get; set; }
+        }
+
+        public static IEnumerable<object[]> BasicTypeValues
+        {
+            get
+            {
+                yield return new object[] { "sampleString", "<string>sampleString</string>" };
+                yield return new object[] { 5, "<int>5</int>" };
+                yield return new object[] { 5.43, "<double>5.43</double>" };
+                yield return new object[] { 'a', "<char>97</char>" };
+                yield return new object[] { new DummyClass { SampleInt = 10 }, "<DummyClass xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                    "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"><SampleInt>10</SampleInt></DummyClass>" };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(BasicTypeValues))]
+        public async Task XmlSerializerOutputFormatterCanWriteBasicTypes(object input, string expectedOutput)
+        {
+            // Arrange
+            var formatter = new XmlSerializerOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(input, input.GetType());
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            var body = outputFormatterContext.HttpContext.Response.Body;
+            body.Position = 0;
+
+            var content = new StreamReader(body).ReadToEnd();
+            XmlAssert.Equal(expectedOutput, content);
+        }
+
+        public static TheoryData<bool, object, string> CanIndentOutputConditionallyData
+        {
+            get
+            {
+                var obj = new DummyClass { SampleInt = 10 };
+                var newLine = Environment.NewLine;
+                return new TheoryData<bool, object, string>()
+                {
+                    { true, obj, "<DummyClass xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                        $"xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">{newLine}  <SampleInt>10</SampleInt>{newLine}</DummyClass>" },
+                    { false, obj, "<DummyClass xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                        "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"><SampleInt>10</SampleInt></DummyClass>" }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(CanIndentOutputConditionallyData))]
+        public async Task XmlSerializer_CanIndentOutputConditionally(bool indent, object input, string expectedOutput)
+        {
+            // Arrange
+            var formatter = new IndentingXmlSerializerOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(input, input.GetType());
+            outputFormatterContext.HttpContext.Request.QueryString = new QueryString("?indent=" + indent);
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            var body = outputFormatterContext.HttpContext.Response.Body;
+            body.Position = 0;
+
+            var content = new StreamReader(body).ReadToEnd();
+            Assert.Equal(expectedOutput, content);
+        }
+
+        [Fact]
+        public async Task XmlSerializer_CanModifyNamespacesInGeneratedXml()
+        {
+            // Arrange
+            var input = new DummyClass { SampleInt = 10 };
+            var formatter = new IgnoreAmbientNamespacesXmlSerializerOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(input, input.GetType());
+            var expectedOutput = "<DummyClass><SampleInt>10</SampleInt></DummyClass>";
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            var body = outputFormatterContext.HttpContext.Response.Body;
+            body.Position = 0;
+
+            var content = new StreamReader(body).ReadToEnd();
+            Assert.Equal(expectedOutput, content);
+        }
+
+        [Fact]
+        public void XmlSerializer_CachesSerializerForType()
+        {
+            // Arrange
+            var input = new DummyClass { SampleInt = 10 };
+            var formatter = new TestXmlSerializerOutputFormatter();
+
+            var context = GetOutputFormatterContext(input, typeof(DummyClass));
+            context.ContentType = new StringSegment("application/xml");
+
+            // Act
+            formatter.CanWriteResult(context);
+            formatter.CanWriteResult(context);
+
+            // Assert
+            Assert.Equal(1, formatter.createSerializerCalledCount);
+        }
+
+        [Fact]
+        public void DefaultConstructor_ExpectedWriterSettings_Created()
+        {
+            // Arrange and Act
+            var formatter = new XmlSerializerOutputFormatter();
+
+            // Assert
+            var writerSettings = formatter.WriterSettings;
+            Assert.NotNull(writerSettings);
+            Assert.True(writerSettings.OmitXmlDeclaration);
+            Assert.False(writerSettings.CloseOutput);
+            Assert.False(writerSettings.CheckCharacters);
+        }
+
+        [Fact]
+        public async Task SuppliedWriterSettings_TakeAffect()
+        {
+            // Arrange
+            var writerSettings = FormattingUtilities.GetDefaultXmlWriterSettings();
+            writerSettings.OmitXmlDeclaration = false;
+            var sampleInput = new DummyClass { SampleInt = 10 };
+            var formatterContext = GetOutputFormatterContext(sampleInput, sampleInput.GetType());
+            var formatter = new XmlSerializerOutputFormatter(writerSettings);
+            var expectedOutput = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
+                                "<DummyClass xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                                "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"><SampleInt>10</SampleInt></DummyClass>";
+
+            // Act
+            await formatter.WriteAsync(formatterContext);
+
+            // Assert
+            var body = formatterContext.HttpContext.Response.Body;
+            body.Position = 0;
+
+            var content = new StreamReader(body).ReadToEnd();
+            XmlAssert.Equal(expectedOutput, content);
+        }
+
+        [Fact]
+        public async Task XmlSerializerOutputFormatterWritesSimpleTypes()
+        {
+            // Arrange
+            var expectedOutput =
+                "<DummyClass xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"><SampleInt>10</SampleInt></DummyClass>";
+
+            var sampleInput = new DummyClass { SampleInt = 10 };
+            var formatter = new XmlSerializerOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(sampleInput, sampleInput.GetType());
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            var body = outputFormatterContext.HttpContext.Response.Body;
+            body.Position = 0;
+
+            var content = new StreamReader(body).ReadToEnd();
+            XmlAssert.Equal(expectedOutput, content);
+        }
+
+        [Fact]
+        public async Task XmlSerializerOutputFormatterWritesComplexTypes()
+        {
+            // Arrange
+            var expectedOutput =
+                "<TestLevelTwo xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"><SampleString>TestString</SampleString>" +
+                "<TestOne><sampleString>TestLevelOne string</sampleString>" +
+                "<SampleInt>10</SampleInt></TestOne></TestLevelTwo>";
+
+            var sampleInput = new TestLevelTwo
+            {
+                SampleString = "TestString",
+                TestOne = new TestLevelOne
+                {
+                    SampleInt = 10,
+                    sampleString = "TestLevelOne string"
+                }
+            };
+            var formatter = new XmlSerializerOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(sampleInput, sampleInput.GetType());
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            var body = outputFormatterContext.HttpContext.Response.Body;
+            body.Position = 0;
+
+            var content = new StreamReader(body).ReadToEnd();
+            XmlAssert.Equal(expectedOutput, content);
+        }
+
+        [Fact]
+        public async Task XmlSerializerOutputFormatterWritesOnModifiedWriterSettings()
+        {
+            // Arrange
+            var expectedOutput =
+                "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
+                "<DummyClass xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"><SampleInt>10</SampleInt></DummyClass>";
+
+            var sampleInput = new DummyClass { SampleInt = 10 };
+            var outputFormatterContext = GetOutputFormatterContext(sampleInput, sampleInput.GetType());
+            var formatter = new XmlSerializerOutputFormatter(
+                new System.Xml.XmlWriterSettings
+                {
+                    OmitXmlDeclaration = false,
+                    CloseOutput = false
+                });
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            var body = outputFormatterContext.HttpContext.Response.Body;
+            body.Position = 0;
+
+            var content = new StreamReader(body).ReadToEnd();
+            XmlAssert.Equal(expectedOutput, content);
+        }
+
+        [Fact]
+        public async Task XmlSerializerOutputFormatterWritesUTF16Output()
+        {
+            // Arrange
+            var expectedOutput =
+                "<?xml version=\"1.0\" encoding=\"utf-16\"?>" +
+                "<DummyClass xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"><SampleInt>10</SampleInt></DummyClass>";
+
+            var sampleInput = new DummyClass { SampleInt = 10 };
+            var outputFormatterContext =
+                GetOutputFormatterContext(sampleInput, sampleInput.GetType(), "application/xml; charset=utf-16");
+            var formatter = new XmlSerializerOutputFormatter();
+            formatter.WriterSettings.OmitXmlDeclaration = false;
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            var body = outputFormatterContext.HttpContext.Response.Body;
+            body.Position = 0;
+            var content = new StreamReader(
+                body,
+                new UnicodeEncoding(bigEndian: false, byteOrderMark: false, throwOnInvalidBytes: true)).ReadToEnd();
+            XmlAssert.Equal(expectedOutput, content);
+        }
+
+        [Fact]
+        public async Task XmlSerializerOutputFormatterWritesIndentedOutput()
+        {
+            // Arrange
+            var expectedOutput =
+                "<DummyClass xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\r\n  <SampleInt>10</SampleInt>\r\n</DummyClass>";
+
+            var sampleInput = new DummyClass { SampleInt = 10 };
+            var formatter = new XmlSerializerOutputFormatter();
+            formatter.WriterSettings.Indent = true;
+            var outputFormatterContext = GetOutputFormatterContext(sampleInput, sampleInput.GetType());
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            var body = outputFormatterContext.HttpContext.Response.Body;
+            body.Position = 0;
+
+            var content = new StreamReader(body).ReadToEnd();
+            XmlAssert.Equal(expectedOutput, content);
+        }
+
+        [Fact]
+        public async Task VerifyBodyIsNotClosedAfterOutputIsWritten()
+        {
+            // Arrange
+            var sampleInput = new DummyClass { SampleInt = 10 };
+            var formatter = new XmlSerializerOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(sampleInput, sampleInput.GetType());
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            Assert.NotNull(outputFormatterContext.HttpContext.Response.Body);
+            Assert.True(outputFormatterContext.HttpContext.Response.Body.CanRead);
+        }
+
+        public static IEnumerable<object[]> TypesForCanWriteResult
+        {
+            get
+            {
+                yield return new object[] { null, typeof(string), true };
+                yield return new object[] { null, null, false };
+                yield return new object[] { new DummyClass { SampleInt = 5 }, typeof(DummyClass), true };
+                yield return new object[] { null, typeof(object), true };
+                yield return new object[] {
+                    new Dictionary<string, string> { { "Hello", "world" } }, typeof(Dictionary<string,string>), false };
+                yield return new object[] {
+                    new[] {"value1", "value2"}, typeof(IEnumerable<string>), true };
+                yield return new object[] {
+                    Enumerable.Range(1, 2).Select(i => "value" + i).AsQueryable(), typeof(IQueryable<string>), true };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(TypesForCanWriteResult))]
+        public void CanWriteResult_ReturnsExpectedValueForObjectType(object input, Type declaredType, bool expectedOutput)
+        {
+            // Arrange
+            var formatter = new XmlSerializerOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(input, declaredType);
+            outputFormatterContext.ContentType = new StringSegment("application/xml");
+
+            // Act
+            var result = formatter.CanWriteResult(outputFormatterContext);
+
+            // Assert
+            Assert.Equal(expectedOutput, result);
+        }
+
+        [Theory]
+        [InlineData("application/xml", false, "application/xml")]
+        [InlineData("application/xml", true, "application/xml")]
+        [InlineData("application/other", false, null)]
+        [InlineData("application/other", true, null)]
+        [InlineData("application/*", false, "application/xml")]
+        [InlineData("text/*", false, "text/xml")]
+        [InlineData("custom/*", false, null)]
+        [InlineData("application/xml;v=2", false, null)]
+        [InlineData("application/xml;v=2", true, null)]
+        [InlineData("application/some.entity+xml", false, null)]
+        [InlineData("application/some.entity+xml", true, "application/some.entity+xml")]
+        [InlineData("application/some.entity+xml;v=2", true, "application/some.entity+xml;v=2")]
+        [InlineData("application/some.entity+other", true, null)]
+        public void CanWriteResult_ReturnsExpectedValueForMediaType(
+            string mediaType,
+            bool isServerDefined,
+            string expectedResult)
+        {
+            // Arrange
+            var formatter = new XmlSerializerOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(new object(), typeof(object));
+            outputFormatterContext.ContentType = new StringSegment(mediaType);
+            outputFormatterContext.ContentTypeIsServerDefined = isServerDefined;
+
+            // Act
+            var actualCanWriteValue = formatter.CanWriteResult(outputFormatterContext);
+
+            // Assert
+            var expectedContentType = expectedResult ?? mediaType;
+            Assert.Equal(expectedResult != null, actualCanWriteValue);
+            Assert.Equal(new StringSegment(expectedContentType), outputFormatterContext.ContentType);
+        }
+
+        [Fact]
+        public async Task XmlSerializerOutputFormatterDoesntFlushOutputStream()
+        {
+            // Arrange
+            var sampleInput = new DummyClass { SampleInt = 10 };
+            var formatter = new XmlSerializerOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(sampleInput, sampleInput.GetType());
+
+            var response = outputFormatterContext.HttpContext.Response;
+            response.Body = FlushReportingStream.GetThrowingStream();
+
+            // Act & Assert
+            await formatter.WriteAsync(outputFormatterContext);
+        }
+
+        public static IEnumerable<object[]> TypesForGetSupportedContentTypes
+        {
+            get
+            {
+                yield return new object[] { typeof(DummyClass), "application/xml" };
+                yield return new object[] { typeof(object), "application/xml" };
+                yield return new object[] { null, null };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(TypesForGetSupportedContentTypes))]
+        public void XmlSerializer_GetSupportedContentTypes_Returns_SupportedTypes(Type type, object expectedOutput)
+        {
+            // Arrange
+            var formatter = new XmlSerializerOutputFormatter();
+
+            // Act
+            var result = formatter.GetSupportedContentTypes("application/xml", type);
+
+            // Assert
+            if (expectedOutput != null)
+            {
+                Assert.Equal(expectedOutput, Assert.Single(result).ToString());
+            }
+            else
+            {
+                Assert.Equal(expectedOutput, result);
+            }
+        }
+
+        public static TheoryData<XmlSerializerOutputFormatter, TestSink> LogsWhenUnableToCreateSerializerForTypeData
+        {
+            get
+            {
+                var sink1 = new TestSink();
+                var formatter1 = new XmlSerializerOutputFormatter(new TestLoggerFactory(sink1, enabled: true));
+
+                var sink2 = new TestSink();
+                var formatter2 = new XmlSerializerOutputFormatter(
+                    new XmlWriterSettings(),
+                    new TestLoggerFactory(sink2, enabled: true));
+
+                return new TheoryData<XmlSerializerOutputFormatter, TestSink>()
+                {
+                    { formatter1, sink1 },
+                    { formatter2, sink2}
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(LogsWhenUnableToCreateSerializerForTypeData))]
+        public void XmlSerializer_LogsWhenUnableToCreateSerializerForType(
+            XmlSerializerOutputFormatter formatter,
+            TestSink sink)
+        {
+            // Arrange
+            var outputFormatterContext = GetOutputFormatterContext(new Customer(10), typeof(Customer));
+
+            // Act
+            var canWriteResult = formatter.CanWriteResult(outputFormatterContext);
+
+            // Assert
+            Assert.False(canWriteResult);
+            var write = Assert.Single(sink.Writes);
+            Assert.Equal(LogLevel.Warning, write.LogLevel);
+            Assert.Equal(
+                $"An error occurred while trying to create an XmlSerializer for the type '{typeof(Customer).FullName}'.",
+                write.State.ToString());
+        }
+
+        [Fact]
+        public void XmlSerializer_DoesNotThrow_OnNoLoggerAnd_WhenUnableToCreateSerializerForType()
+        {
+            // Arrange
+            var formatter = new XmlSerializerOutputFormatter(); // no logger is being supplied here on purpose
+            var outputFormatterContext = GetOutputFormatterContext(new Customer(10), typeof(Customer));
+
+            // Act
+            var canWriteResult = formatter.CanWriteResult(outputFormatterContext);
+
+            // Assert
+            Assert.False(canWriteResult);
+        }
+
+        private OutputFormatterWriteContext GetOutputFormatterContext(
+            object outputValue,
+            Type outputType,
+            string contentType = "application/xml; charset=utf-8")
+        {
+            return new OutputFormatterWriteContext(
+                GetHttpContext(contentType),
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                outputType,
+                outputValue);
+        }
+
+        private static HttpContext GetHttpContext(string contentType)
+        {
+            var httpContext = new DefaultHttpContext();
+            var request = httpContext.Request;
+            request.Headers["Accept-Charset"] = MediaTypeHeaderValue.Parse(contentType).Charset.ToString();
+            request.ContentType = contentType;
+            httpContext.Response.Body = new MemoryStream();
+            return httpContext;
+        }
+
+        private class TestXmlSerializerOutputFormatter : XmlSerializerOutputFormatter
+        {
+            public int createSerializerCalledCount = 0;
+
+            protected override XmlSerializer CreateSerializer(Type type)
+            {
+                createSerializerCalledCount++;
+                return base.CreateSerializer(type);
+            }
+        }
+
+        public class Customer
+        {
+            public Customer(int id)
+            {
+            }
+
+            public int MyProperty { get; set; }
+        }
+        private class IndentingXmlSerializerOutputFormatter : XmlSerializerOutputFormatter
+        {
+            public override XmlWriter CreateXmlWriter(
+                OutputFormatterWriteContext context,
+                TextWriter writer,
+                XmlWriterSettings xmlWriterSettings)
+            {
+                var request = context.HttpContext.Request;
+                if (request.Query["indent"] == "True")
+                {
+                    xmlWriterSettings.Indent = true;
+                }
+
+                return base.CreateXmlWriter(context, writer, xmlWriterSettings);
+            }
+        }
+
+        private class IgnoreAmbientNamespacesXmlSerializerOutputFormatter : XmlSerializerOutputFormatter
+        {
+            protected override void Serialize(XmlSerializer xmlSerializer, XmlWriter xmlWriter, object value)
+            {
+                var namespaces = new XmlSerializerNamespaces();
+                namespaces.Add("", "");
+
+                xmlSerializer.Serialize(xmlWriter, value, namespaces);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryAuthTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryAuthTests.cs
new file mode 100644
index 0000000000..86e31edfff
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryAuthTests.cs
@@ -0,0 +1,65 @@
+// 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.
+
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using SecurityWebSite;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class AntiforgeryAuthTests : IClassFixture<MvcTestFixture<Startup>>
+    {
+        public AntiforgeryAuthTests(MvcTestFixture<Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task AutomaticAuthenticationBeforeAntiforgery()
+        {
+            // Arrange & Act
+            var response = await Client.PostAsync("http://localhost/Home/AutoAntiforgery", null);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal("/Home/Login", response.Headers.Location.AbsolutePath, StringComparer.OrdinalIgnoreCase);
+        }
+
+        [Fact]
+        public async Task AuthBeforeAntiforgery()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Home/Antiforgery");
+
+            // Assert
+            // Redirected to login page, Antiforgery didn't fail yet
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal("/Home/Login", response.Headers.Location.AbsolutePath, StringComparer.OrdinalIgnoreCase);
+        }
+
+        [Fact]
+        public async Task IgnoreAntiforgeryOverridesAutoAntiforgery()
+        {
+            // Arrange & Act
+            var response = await Client.PostAsync("http://localhost/Antiforgery/Index", content: null);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task AntiforgeryOverridesIgnoreAntiforgery()
+        {
+            // Arrange & Act
+            var response = await Client.PostAsync("http://localhost/IgnoreAntiforgery/Index", content: null);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryTestHelper.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryTestHelper.cs
new file mode 100644
index 0000000000..d7310e628b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryTestHelper.cs
@@ -0,0 +1,59 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Xml.Linq;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public static class AntiforgeryTestHelper
+    {
+        public static string RetrieveAntiforgeryToken(string htmlContent, string actionUrl)
+        {
+            htmlContent = "<Root>" + htmlContent + "</Root>";
+            var reader = new StringReader(htmlContent);
+            var htmlDocument = XDocument.Load(reader);
+
+            foreach (var form in htmlDocument.Descendants("form"))
+            {
+                foreach (var input in form.Descendants("input"))
+                {
+                    if (input.Attribute("name") != null &&
+                        input.Attribute("type") != null &&
+                        input.Attribute("type").Value == "hidden" &&
+                        (input.Attribute("name").Value == "__RequestVerificationToken" ||
+                         input.Attribute("name").Value == "HtmlEncode[[__RequestVerificationToken]]"))
+                    {
+                        return input.Attributes("value").First().Value;
+                    }
+                }
+            }
+
+            throw new Exception($"Antiforgery token could not be located in {htmlContent}.");
+        }
+
+        public static CookieMetadata RetrieveAntiforgeryCookie(HttpResponseMessage response)
+        {
+            var setCookieArray = response.Headers.GetValues("Set-Cookie").ToArray();
+            var cookie = setCookieArray[0].Split(';').First().Split('=');
+            var cookieKey = cookie[0];
+            var cookieData = cookie[1];
+
+            return new CookieMetadata()
+            {
+                Key = cookieKey,
+                Value = cookieData
+            };
+        }
+
+        public class CookieMetadata
+        {
+            public string Key { get; set; }
+
+            public string Value { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryTests.cs
new file mode 100644
index 0000000000..78fc00bec6
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryTests.cs
@@ -0,0 +1,179 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Antiforgery;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class AntiforgeryTests : IClassFixture<MvcTestFixture<BasicWebSite.Startup>>
+    {
+        public AntiforgeryTests(MvcTestFixture<BasicWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task MultipleAFTokensWithinTheSamePage_GeneratesASingleCookieToken()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Antiforgery/Login");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var header = Assert.Single(response.Headers.GetValues("X-Frame-Options"));
+            Assert.Equal("SAMEORIGIN", header);
+
+            var setCookieHeader = response.Headers.GetValues("Set-Cookie").ToArray();
+
+            // Even though there are two forms there should only be one response cookie,
+            // as for the second form, the cookie from the first token should be reused.
+            Assert.Single(setCookieHeader);
+
+            Assert.True(response.Headers.CacheControl.NoCache);
+            var pragmaValue = Assert.Single(response.Headers.Pragma.ToArray());
+            Assert.Equal("no-cache", pragmaValue.Name);
+        }
+
+        [Fact]
+        public async Task MultipleFormPostWithingASingleView_AreAllowed()
+        {
+            // Arrange
+            // Do a get request.
+            var getResponse = await Client.GetAsync("http://localhost/Antiforgery/Login");
+            var responseBody = await getResponse.Content.ReadAsStringAsync();
+
+            // Get the AF token for the second login. If the cookies are generated twice(i.e are different),
+            // this AF token will not work with the first cookie.
+            var formToken = AntiforgeryTestHelper.RetrieveAntiforgeryToken(
+                responseBody,
+                "/Antiforgery/UseFacebookLogin");
+            var cookieToken = AntiforgeryTestHelper.RetrieveAntiforgeryCookie(getResponse);
+
+            var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/Antiforgery/Login");
+            request.Headers.Add("Cookie", cookieToken.Key + "=" + cookieToken.Value);
+            var nameValueCollection = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string,string>("__RequestVerificationToken", formToken),
+                new KeyValuePair<string,string>("UserName", "abra"),
+                new KeyValuePair<string,string>("Password", "cadabra"),
+            };
+
+            request.Content = new FormUrlEncodedContent(nameValueCollection);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("OK", await response.Content.ReadAsStringAsync());
+        }
+
+        [Fact]
+        public async Task SetCookieAndHeaderBeforeFlushAsync_GeneratesCookieTokenAndHeader()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Antiforgery/FlushAsyncLogin");
+
+            // Assert
+            var header = Assert.Single(response.Headers.GetValues("X-Frame-Options"));
+            Assert.Equal("SAMEORIGIN", header);
+
+            var setCookieHeader = response.Headers.GetValues("Set-Cookie").ToArray();
+            Assert.Single(setCookieHeader);
+
+            Assert.True(response.Headers.CacheControl.NoCache);
+            var pragmaValue = Assert.Single(response.Headers.Pragma.ToArray());
+            Assert.Equal("no-cache", pragmaValue.Name);
+        }
+
+        [Fact]
+        public async Task SetCookieAndHeaderBeforeFlushAsync_PostToForm()
+        {
+            // Arrange
+            // do a get response.
+            var getResponse = await Client.GetAsync("http://localhost/Antiforgery/FlushAsyncLogin");
+            var responseBody = await getResponse.Content.ReadAsStringAsync();
+
+            var formToken = AntiforgeryTestHelper.RetrieveAntiforgeryToken(
+                responseBody,
+                "Antiforgery/FlushAsyncLogin");
+            var cookieToken = AntiforgeryTestHelper.RetrieveAntiforgeryCookie(getResponse);
+
+            var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/Antiforgery/FlushAsyncLogin");
+            request.Headers.Add("Cookie", cookieToken.Key + "=" + cookieToken.Value);
+            var nameValueCollection = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string,string>("__RequestVerificationToken", formToken),
+                new KeyValuePair<string,string>("UserName", "test"),
+                new KeyValuePair<string,string>("Password", "password"),
+            };
+
+            request.Content = new FormUrlEncodedContent(nameValueCollection);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("OK", await response.Content.ReadAsStringAsync());
+        }
+
+        [Fact]
+        public async Task Antiforgery_HeaderNotSet_SendsBadRequest()
+        {
+            // Arrange
+            var getResponse = await Client.GetAsync("http://localhost/Antiforgery/Login");
+            var responseBody = await getResponse.Content.ReadAsStringAsync();
+
+            var formToken = AntiforgeryTestHelper.RetrieveAntiforgeryToken(
+                responseBody,
+                "Antiforgery/Login");
+
+            var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/Antiforgery/Login");
+            var nameValueCollection = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string,string>("__RequestVerificationToken", formToken),
+                new KeyValuePair<string,string>("UserName", "test"),
+                new KeyValuePair<string,string>("Password", "password"),
+            };
+
+            request.Content = new FormUrlEncodedContent(nameValueCollection);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task AntiforgeryTokenGeneration_SetsDoNotCacheHeaders_OverridesExistingCachingHeaders()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Antiforgery/AntiforgeryTokenAndResponseCaching");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var header = Assert.Single(response.Headers.GetValues("X-Frame-Options"));
+            Assert.Equal("SAMEORIGIN", header);
+
+            var setCookieHeader = response.Headers.GetValues("Set-Cookie").ToArray();
+
+            // Even though there are two forms there should only be one response cookie,
+            // as for the second form, the cookie from the first token should be reused.
+            Assert.Single(setCookieHeader);
+
+            Assert.True(response.Headers.CacheControl.NoCache);
+            var pragmaValue = Assert.Single(response.Headers.Pragma.ToArray());
+            Assert.Equal("no-cache", pragmaValue.Name);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApiBehaviorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApiBehaviorTest.cs
new file mode 100644
index 0000000000..b27a549321
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApiBehaviorTest.cs
@@ -0,0 +1,207 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using BasicWebSite.Models;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class ApiBehaviorTest : IClassFixture<MvcTestFixture<BasicWebSite.Startup>>
+    {
+        public ApiBehaviorTest(MvcTestFixture<BasicWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task ActionsReturnBadRequest_WhenModelStateIsInvalid()
+        {
+            // Arrange
+            var contactModel = new Contact
+            {
+                Name = "Abc",
+                City = "Redmond",
+                State = "WA",
+                Zip = "Invalid",
+            };
+            var contactString = JsonConvert.SerializeObject(contactModel);
+
+            // Act
+            var response = await Client.PostAsJsonAsync("/contact", contactModel);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+            Assert.Equal("application/json", response.Content.Headers.ContentType.MediaType);
+            var actual = JsonConvert.DeserializeObject<Dictionary<string, string[]>>(await response.Content.ReadAsStringAsync());
+            Assert.Collection(
+                actual.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("Name", kvp.Key);
+                    var error = Assert.Single(kvp.Value);
+                    Assert.Equal("The field Name must be a string with a minimum length of 5 and a maximum length of 30.", error);
+                },
+                kvp =>
+                {
+                    Assert.Equal("Zip", kvp.Key);
+                    var error = Assert.Single(kvp.Value);
+                    Assert.Equal("The field Zip must match the regular expression '\\d{5}'.", error);
+                }
+            );
+        }
+
+        [Fact]
+        public async Task ActionsReturnBadRequest_UsesProblemDescriptionProviderAndApiConventionsToConfigureErrorResponse()
+        {
+            // Arrange
+            var contactModel = new Contact
+            {
+                Name = "Abc",
+                City = "Redmond",
+                State = "WA",
+                Zip = "Invalid",
+            };
+            var expected = new Dictionary<string, string[]>
+            {
+                {"Name", new string[] {"The field Name must be a string with a minimum length of 5 and a maximum length of 30."}},
+                {"Zip", new string[]{ @"The field Zip must match the regular expression '\d{5}'."}}
+            };
+            var contactString = JsonConvert.SerializeObject(contactModel);
+
+            // Act
+            var response = await Client.PostAsJsonAsync("/contact/PostWithVnd", contactModel);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+            Assert.Equal("application/vnd.error+json", response.Content.Headers.ContentType.MediaType);
+            var content = await response.Content.ReadAsStringAsync();
+            var actual = JsonConvert.DeserializeObject<Dictionary<string, string[]>>(content);
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public Task ActionsWithApiBehavior_InferFromBodyParameters()
+            => ActionsWithApiBehaviorInferFromBodyParameters("ActionWithInferredFromBodyParameter");
+
+        [Fact]
+        public Task ActionsWithApiBehavior_InferFromBodyParameters_DoNotConsiderCancellationTokenSourceParameter()
+            => ActionsWithApiBehaviorInferFromBodyParameters("ActionWithInferredFromBodyParameterAndCancellationToken");
+
+        private async Task ActionsWithApiBehaviorInferFromBodyParameters(string action)
+        {
+            // Arrange
+            var input = new Contact
+            {
+                ContactId = 13,
+                Name = "Test123",
+            };
+
+            // Act
+            var response = await Client.PostAsJsonAsync($"/contact/{action}", input);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = JsonConvert.DeserializeObject<Contact>(await response.Content.ReadAsStringAsync());
+            Assert.Equal(input.ContactId, result.ContactId);
+            Assert.Equal(input.Name, result.Name);
+        }
+
+        [Fact]
+        public async Task ActionsWithApiBehavior_InferQueryAndRouteParameters()
+        {
+            // Arrange
+            var id = 31;
+            var name = "test";
+            var email = "email@test.com";
+            var url = $"/contact/ActionWithInferredRouteAndQueryParameters/{name}/{id}?email={email}";
+            var response = await Client.PostAsync(url, new StringContent(string.Empty));
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = JsonConvert.DeserializeObject<Contact>(await response.Content.ReadAsStringAsync());
+            Assert.Equal(id, result.ContactId);
+            Assert.Equal(name, result.Name);
+            Assert.Equal(email, result.Email);
+        }
+
+        [Fact]
+        public async Task ActionsWithApiBehavior_InferEmptyPrefixForComplexValueProviderModel_Success()
+        {
+            // Arrange
+            var id = 31;
+            var name = "test_user";
+            var email = "email@test.com";
+            var url = $"/contact/ActionWithInferredEmptyPrefix?name={name}&contactid={id}&email={email}";
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var result = await response.Content.ReadAsAsync<Contact>();
+            Assert.Equal(id, result.ContactId);
+            Assert.Equal(name, result.Name);
+            Assert.Equal(email, result.Email);
+        }
+
+        [Fact]
+        public async Task ActionsWithApiBehavior_InferEmptyPrefixForComplexValueProviderModel_Ignored()
+        {
+            // Arrange
+            var id = 31;
+            var name = "test_user";
+            var email = "email@test.com";
+            var url = $"/contact/ActionWithInferredEmptyPrefix?contact.name={name}&contact.contactid={id}&contact.email={email}";
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var result = await response.Content.ReadAsAsync<Contact>();
+            Assert.Equal(0, result.ContactId);
+            Assert.Null(result.Name);
+            Assert.Null(result.Email);
+        }
+
+        [Fact]
+        public async Task ActionsWithApiBehavior_InferModelBinderType()
+        {
+            // Arrange
+            var expected = "From TestModelBinder: Hello!";
+
+            // Act
+            var response = await Client.GetAsync("/contact/ActionWithInferredModelBinderType?foo=Hello!");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expected, result);
+        }
+
+        [Fact]
+        public async Task ActionsWithApiBehavior_InferModelBinderTypeWithExplicitModelName()
+        {
+            // Arrange
+            var expected = "From TestModelBinder: Hello!";
+
+            // Act
+            var response = await Client.GetAsync("/contact/ActionWithInferredModelBinderTypeWithExplicitModelName?bar=Hello!");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expected, result);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApiExplorerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApiExplorerTest.cs
new file mode 100644
index 0000000000..774e0de862
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApiExplorerTest.cs
@@ -0,0 +1,1153 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Testing.xunit;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class ApiExplorerTest : IClassFixture<MvcTestFixture<ApiExplorerWebSite.Startup>>
+    {
+        public ApiExplorerTest(MvcTestFixture<ApiExplorerWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task ApiExplorer_IsVisible_EnabledWithConvention()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ApiExplorerVisbilityEnabledByConvention");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            Assert.Single(result);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_IsVisible_DisabledWithConvention()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ApiExplorerVisbilityDisabledByConvention");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_IsVisible_DisabledWithAttribute()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ApiExplorerVisibilitySetExplicitly/Disabled");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_IsVisible_EnabledWithAttribute()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ApiExplorerVisibilitySetExplicitly/Enabled");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            Assert.Single(result);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_GroupName_SetByConvention()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ApiExplorerNameSetByConvention");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Equal("ApiExplorerNameSetByConvention", description.GroupName);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_GroupName_SetByAttributeOnController()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ApiExplorerNameSetExplicitly/SetOnController");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Equal("SetOnController", description.GroupName);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_GroupName_SetByAttributeOnAction()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ApiExplorerNameSetExplicitly/SetOnAction");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Equal("SetOnAction", description.GroupName);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_RouteTemplate_DisplaysFixedRoute()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ApiExplorerRouteAndPathParametersInformation");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Equal("ApiExplorerRouteAndPathParametersInformation", description.RelativePath);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_RouteTemplate_DisplaysRouteWithParameters()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ApiExplorerRouteAndPathParametersInformation/5");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Equal("ApiExplorerRouteAndPathParametersInformation/{id}", description.RelativePath);
+
+            var parameter = Assert.Single(description.ParameterDescriptions);
+            Assert.Equal("id", parameter.Name);
+            Assert.False(parameter.RouteInfo.IsOptional);
+            Assert.Equal("Path", parameter.Source);
+            Assert.Empty(parameter.RouteInfo.ConstraintTypes);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_RouteTemplate_StripsInlineConstraintsFromThePath()
+        {
+            // Arrange
+            var url = "http://localhost/ApiExplorerRouteAndPathParametersInformation/Constraint/5";
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Equal("ApiExplorerRouteAndPathParametersInformation/Constraint/{integer}", description.RelativePath);
+
+            var parameter = Assert.Single(description.ParameterDescriptions);
+            Assert.Equal("integer", parameter.Name);
+            Assert.False(parameter.RouteInfo.IsOptional);
+            Assert.Equal("Path", parameter.Source);
+            Assert.Equal("IntRouteConstraint", Assert.Single(parameter.RouteInfo.ConstraintTypes));
+        }
+
+        [Fact]
+        public async Task ApiExplorer_RouteTemplate_StripsCatchAllsFromThePath()
+        {
+            // Arrange
+            var url = "http://localhost/ApiExplorerRouteAndPathParametersInformation/CatchAll/5";
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Equal("ApiExplorerRouteAndPathParametersInformation/CatchAll/{parameter}", description.RelativePath);
+
+            var parameter = Assert.Single(description.ParameterDescriptions);
+            Assert.Equal("parameter", parameter.Name);
+            Assert.False(parameter.RouteInfo.IsOptional);
+            Assert.Equal("Path", parameter.Source);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_RouteTemplate_StripsCatchAllsWithConstraintsFromThePath()
+        {
+            // Arrange
+            var url = "http://localhost/ApiExplorerRouteAndPathParametersInformation/CatchAllAndConstraint/5";
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Equal(
+                "ApiExplorerRouteAndPathParametersInformation/CatchAllAndConstraint/{integer}",
+                description.RelativePath);
+
+            var parameter = Assert.Single(description.ParameterDescriptions);
+            Assert.Equal("integer", parameter.Name);
+            Assert.False(parameter.RouteInfo.IsOptional);
+            Assert.Equal("Path", parameter.Source);
+            Assert.Equal("IntRouteConstraint", Assert.Single(parameter.RouteInfo.ConstraintTypes));
+        }
+
+        [Fact]
+        public async Task ApiExplorer_RouteTemplateStripsMultipleConstraints_OnTheSamePathSegment()
+        {
+            // Arrange
+            var url = "http://localhost/ApiExplorerRouteAndPathParametersInformation/"
+                + "MultipleParametersInSegment/12-01-1987";
+
+            var expectedRelativePath = "ApiExplorerRouteAndPathParametersInformation/"
+                + "MultipleParametersInSegment/{month}-{day}-{year}";
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Equal(expectedRelativePath, description.RelativePath);
+
+            var month = Assert.Single(description.ParameterDescriptions, p => p.Name == "month");
+            Assert.False(month.RouteInfo.IsOptional);
+            Assert.Equal("Path", month.Source);
+            Assert.Equal("RangeRouteConstraint", Assert.Single(month.RouteInfo.ConstraintTypes));
+
+            var day = Assert.Single(description.ParameterDescriptions, p => p.Name == "day");
+            Assert.False(day.RouteInfo.IsOptional);
+            Assert.Equal("Path", day.Source);
+            Assert.Equal("IntRouteConstraint", Assert.Single(day.RouteInfo.ConstraintTypes));
+
+            var year = Assert.Single(description.ParameterDescriptions, p => p.Name == "year");
+            Assert.False(year.RouteInfo.IsOptional);
+            Assert.Equal("Path", year.Source);
+            Assert.Equal("IntRouteConstraint", Assert.Single(year.RouteInfo.ConstraintTypes));
+        }
+
+        [Fact]
+        public async Task ApiExplorer_RouteTemplateStripsMultipleConstraints_InMultipleSegments()
+        {
+            // Arrange
+            var url = "http://localhost/ApiExplorerRouteAndPathParametersInformation/"
+                + "MultipleParametersInMultipleSegments/12/01/1987";
+
+            var expectedRelativePath = "ApiExplorerRouteAndPathParametersInformation/"
+                + "MultipleParametersInMultipleSegments/{month}/{day}/{year}";
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Equal(expectedRelativePath, description.RelativePath);
+
+            var month = Assert.Single(description.ParameterDescriptions, p => p.Name == "month");
+            Assert.False(month.RouteInfo.IsOptional);
+            Assert.Equal("Path", month.Source);
+            Assert.Equal("RangeRouteConstraint", Assert.Single(month.RouteInfo.ConstraintTypes));
+
+            var day = Assert.Single(description.ParameterDescriptions, p => p.Name == "day");
+            Assert.True(day.RouteInfo.IsOptional);
+            Assert.Equal("ModelBinding", day.Source);
+            Assert.Equal("IntRouteConstraint", Assert.Single(day.RouteInfo.ConstraintTypes));
+
+            var year = Assert.Single(description.ParameterDescriptions, p => p.Name == "year");
+            Assert.True(year.RouteInfo.IsOptional);
+            Assert.Equal("ModelBinding", year.Source);
+            Assert.Equal("IntRouteConstraint", Assert.Single(year.RouteInfo.ConstraintTypes));
+        }
+
+        [Fact]
+        public async Task ApiExplorer_DescribeParameters_FromAllSources()
+        {
+            // Arrange
+            var url = "http://localhost/ApiExplorerRouteAndPathParametersInformation/MultipleTypesOfParameters/1/2/3";
+
+            var expectedRelativePath = "ApiExplorerRouteAndPathParametersInformation/"
+                + "MultipleTypesOfParameters/{path}/{pathAndQuery}/{pathAndFromBody}";
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Equal(expectedRelativePath, description.RelativePath);
+
+            var path = Assert.Single(description.ParameterDescriptions, p => p.Name == "path");
+            Assert.Equal("Path", path.Source);
+
+            var pathAndQuery = Assert.Single(description.ParameterDescriptions, p => p.Name == "pathAndQuery");
+            Assert.Equal("Path", pathAndQuery.Source);
+
+            Assert.Single(description.ParameterDescriptions, p => p.Name == "pathAndFromBody" && p.Source == "Body");
+            Assert.Single(description.ParameterDescriptions, p => p.Name == "pathAndFromBody" && p.Source == "Path");
+        }
+
+        [Fact]
+        public async Task ApiExplorer_RouteTemplate_MakesParametersOptional()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync(
+                "http://localhost/ApiExplorerRouteAndPathParametersInformation/Optional/");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Equal("ApiExplorerRouteAndPathParametersInformation/Optional/{id}", description.RelativePath);
+
+            var id = Assert.Single(description.ParameterDescriptions, p => p.Name == "id");
+            Assert.True(id.RouteInfo.IsOptional);
+            Assert.Equal("ModelBinding", id.Source);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_HttpMethod_All()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ApiExplorerHttpMethod/All");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Null(description.HttpMethod);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_HttpMethod_Single_GET()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ApiExplorerHttpMethod/Get");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Equal("GET", description.HttpMethod);
+        }
+
+        // This is hitting one action with two allowed methods (using [AcceptVerbs]). This should
+        // return two api descriptions.
+        [Fact]
+        public async Task ApiExplorer_HttpMethod_Single_PUT()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod("PUT"),
+                "http://localhost/ApiExplorerHttpMethod/Single");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            Assert.Equal(2, result.Count);
+
+            Assert.Single(result, d => d.HttpMethod == "PUT");
+            Assert.Single(result, d => d.HttpMethod == "POST");
+        }
+
+        // This is hitting one action with two allowed methods (using [AcceptVerbs]). This should
+        // return two api descriptions.
+        [Fact]
+        public async Task ApiExplorer_HttpMethod_Single_POST()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod("POST"),
+                "http://localhost/ApiExplorerHttpMethod/Single");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            Assert.Equal(2, result.Count);
+
+            Assert.Single(result, d => d.HttpMethod == "PUT");
+            Assert.Single(result, d => d.HttpMethod == "POST");
+        }
+
+        [Theory]
+        [InlineData("GetVoidWithExplicitResponseTypeStatusCode")]
+        [InlineData("GetTaskWithExplicitResponseTypeStatusCode")]
+        public async Task ApiExplorer_ResponseType_VoidWithResponseTypeAttributeStatusCode(string action)
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync(
+                "http://localhost/ApiExplorerResponseTypeWithAttribute/" + action);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            var responseType = Assert.Single(description.SupportedResponseTypes);
+            Assert.Equal(typeof(void).FullName, responseType.ResponseType);
+            Assert.Equal(204, responseType.StatusCode);
+            Assert.Empty(responseType.ResponseFormats);
+        }
+
+        [Theory]
+        [InlineData("GetVoid")]
+        [InlineData("GetTask")]
+        public async Task ApiExplorer_ResponseType_VoidWithoutAttributeDefaultStatusCode(string action)
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync(
+                "http://localhost/ApiExplorerResponseTypeWithoutAttribute/" + action);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            var responseType = Assert.Single(description.SupportedResponseTypes);
+            Assert.Equal(typeof(void).FullName, responseType.ResponseType);
+            Assert.Equal(200, responseType.StatusCode);
+            Assert.Empty(responseType.ResponseFormats);
+        }
+
+        [Theory]
+        [InlineData("GetObject")]
+        [InlineData("GetIActionResult")]
+        [InlineData("GetDerivedActionResult")]
+        [InlineData("GetTaskOfObject")]
+        [InlineData("GetTaskOfIActionResult")]
+        [InlineData("GetTaskOfDerivedActionResult")]
+        public async Task ApiExplorer_ResponseType_UnknownWithoutAttribute(string action)
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync(
+                "http://localhost/ApiExplorerResponseTypeWithoutAttribute/" + action);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Empty(description.SupportedResponseTypes);
+        }
+
+        [Theory]
+        [InlineData("GetProduct", "ApiExplorerWebSite.Product")]
+        [InlineData("GetActionResultProduct", "ApiExplorerWebSite.Product")]
+        [InlineData("GetInt", "System.Int32")]
+        [InlineData("GetTaskOfProduct", "ApiExplorerWebSite.Product")]
+        [InlineData("GetTaskOfInt", "System.Int32")]
+        public async Task ApiExplorer_ResponseType_KnownWithoutAttribute(string action, string type)
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync(
+                "http://localhost/ApiExplorerResponseTypeWithoutAttribute/" + action);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+            var expectedMediaTypes = new[] { "application/json", "application/xml", "text/json", "text/xml" };
+
+            // Assert
+            var description = Assert.Single(result);
+            var responseType = Assert.Single(description.SupportedResponseTypes);
+            Assert.Equal(200, responseType.StatusCode);
+            Assert.Equal(type, responseType.ResponseType);
+            Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+        }
+
+        [Fact]
+        public async Task ApiExplorer_ResponseType_KnownWithoutAttribute_ReturnVoid()
+        {
+            // Arrange
+            var type = "ApiExplorerWebSite.Customer";
+            var expectedMediaTypes = new[] { "application/json", "application/xml", "text/json", "text/xml" };
+
+            // Act
+            var response = await Client.GetAsync(
+                "http://localhost/ApiExplorerResponseTypeWithAttribute/GetVoid");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            var responseType = Assert.Single(description.SupportedResponseTypes);
+            Assert.Equal(200, responseType.StatusCode);
+            Assert.Equal(type, responseType.ResponseType);
+            Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+        }
+
+        [Fact]
+        public async Task ApiExplorer_ResponseType_DifferentOnAttributeThanReturnType()
+        {
+            // Arrange
+            var type = "ApiExplorerWebSite.Customer";
+            var expectedMediaTypes = new[] { "application/json", "application/xml", "text/json", "text/xml" };
+
+            // Act
+            var response = await Client.GetAsync(
+                "http://localhost/ApiExplorerResponseTypeWithAttribute/GetProduct");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            var responseType = Assert.Single(description.SupportedResponseTypes);
+            Assert.Equal(200, responseType.StatusCode);
+            Assert.Equal(type, responseType.ResponseType);
+            Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+        }
+
+        [Theory]
+        [InlineData("GetObject", "ApiExplorerWebSite.Product")]
+        [InlineData("GetIActionResult", "System.String")]
+        [InlineData("GetTask", "System.Int32")]
+        public async Task ApiExplorer_ResponseType_KnownWithAttribute(string action, string type)
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync(
+                "http://localhost/ApiExplorerResponseTypeWithAttribute/" + action);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            var responseType = Assert.Single(description.SupportedResponseTypes);
+            Assert.Equal(type, responseType.ResponseType);
+            Assert.Equal(200, responseType.StatusCode);
+            var responseFormat = Assert.Single(responseType.ResponseFormats);
+            Assert.Equal("application/json", responseFormat.MediaType);
+        }
+
+        [Fact]
+        public async Task ExplicitResponseTypeDecoration_SuppressesDefaultStatus()
+        {
+            // Arrange
+            var type1 = typeof(ApiExplorerWebSite.Product).FullName;
+            var type2 = typeof(SerializableError).FullName;
+            var expectedMediaTypes = new[] { "application/json", "text/json", "application/xml", "text/xml" };
+
+            // Act
+            var response = await Client.GetAsync(
+                "http://localhost/ApiExplorerResponseTypeWithAttribute/CreateProductWithDefaultResponseContentTypes");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Equal(2, description.SupportedResponseTypes.Count);
+            var responseType = description.SupportedResponseTypes[0];
+            Assert.Equal(type1, responseType.ResponseType);
+            Assert.Equal(201, responseType.StatusCode);
+            Assert.Equal(
+                expectedMediaTypes,
+                responseType.ResponseFormats.Select(responseFormat => responseFormat.MediaType).ToArray());
+            responseType = description.SupportedResponseTypes[1];
+            Assert.Equal(type2, responseType.ResponseType);
+            Assert.Equal(400, responseType.StatusCode);
+            Assert.Equal(
+                expectedMediaTypes,
+                responseType.ResponseFormats.Select(responseFormat => responseFormat.MediaType).ToArray());
+        }
+
+        [Fact]
+        public async Task ExplicitResponseTypeDecoration_SuppressesDefaultStatus_AlsoHonorsProducesContentTypes()
+        {
+            // Arrange
+            var type1 = typeof(ApiExplorerWebSite.Product).FullName;
+            var type2 = typeof(SerializableError).FullName;
+            var expectedMediaTypes = new[] { "text/xml" };
+
+            // Act
+            var response = await Client.GetAsync(
+                "http://localhost/ApiExplorerResponseTypeWithAttribute/CreateProductWithLimitedResponseContentTypes");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Equal(2, description.SupportedResponseTypes.Count);
+            var responseType = description.SupportedResponseTypes[0];
+            Assert.Equal(type1, responseType.ResponseType);
+            Assert.Equal(201, responseType.StatusCode);
+            Assert.Equal(
+                expectedMediaTypes,
+                responseType.ResponseFormats.Select(responseFormat => responseFormat.MediaType).ToArray());
+            responseType = description.SupportedResponseTypes[1];
+            Assert.Equal(type2, responseType.ResponseType);
+            Assert.Equal(400, responseType.StatusCode);
+            Assert.Equal(
+                expectedMediaTypes,
+                responseType.ResponseFormats.Select(responseFormat => responseFormat.MediaType).ToArray());
+        }
+
+        [Fact]
+        public async Task ExplicitResponseTypeDecoration_WithExplicitDefaultStatus()
+        {
+            // Arrange
+            var type1 = typeof(ApiExplorerWebSite.Product).FullName;
+            var type2 = typeof(SerializableError).FullName;
+            var expectedMediaTypes = new[] { "application/json", "text/json", "application/xml", "text/xml" };
+
+            // Act
+            var response = await Client.GetAsync(
+                "http://localhost/ApiExplorerResponseTypeWithAttribute/UpdateProductWithDefaultResponseContentTypes");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Equal(2, description.SupportedResponseTypes.Count);
+            var responseType = description.SupportedResponseTypes[0];
+            Assert.Equal(type1, responseType.ResponseType);
+            Assert.Equal(200, responseType.StatusCode);
+            Assert.Equal(
+                expectedMediaTypes,
+                responseType.ResponseFormats.Select(responseFormat => responseFormat.MediaType).ToArray());
+            responseType = description.SupportedResponseTypes[1];
+            Assert.Equal(type2, responseType.ResponseType);
+            Assert.Equal(400, responseType.StatusCode);
+            Assert.Equal(
+                expectedMediaTypes,
+                responseType.ResponseFormats.Select(responseFormat => responseFormat.MediaType).ToArray());
+        }
+
+        [Fact]
+        public async Task ExplicitResponseTypeDecoration_WithExplicitDefaultStatus_SpecifiedViaProducesAttribute()
+        {
+            // Arrange
+            var type1 = typeof(ApiExplorerWebSite.Product).FullName;
+            var type2 = typeof(SerializableError).FullName;
+            var expectedMediaTypes = new[] { "text/xml" };
+
+            // Act
+            var response = await Client.GetAsync(
+                "http://localhost/ApiExplorerResponseTypeWithAttribute/UpdateProductWithLimitedResponseContentTypes");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Equal(2, description.SupportedResponseTypes.Count);
+            var responseType = description.SupportedResponseTypes[0];
+            Assert.Equal(type1, responseType.ResponseType);
+            Assert.Equal(200, responseType.StatusCode);
+            Assert.Equal(
+                expectedMediaTypes,
+                responseType.ResponseFormats.Select(responseFormat => responseFormat.MediaType).ToArray());
+            responseType = description.SupportedResponseTypes[1];
+            Assert.Equal(type2, responseType.ResponseType);
+            Assert.Equal(400, responseType.StatusCode);
+            Assert.Equal(
+                expectedMediaTypes,
+                responseType.ResponseFormats.Select(responseFormat => responseFormat.MediaType).ToArray());
+        }
+        [Fact]
+        public async Task ApiExplorer_ResponseType_InheritingFromController()
+        {
+            // Arrange
+            var type = "ApiExplorerWebSite.Product";
+            var errorType = "ApiExplorerWebSite.ErrorInfo";
+
+            // Act
+            var response = await Client.GetAsync(
+                "http://localhost/ApiExplorerResponseTypeOverrideOnAction/Controller");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Equal(2, description.SupportedResponseTypes.Count);
+
+            Assert.Collection(
+                description.SupportedResponseTypes.OrderBy(responseType => responseType.StatusCode),
+                responseType =>
+                {
+                    Assert.Equal(type, responseType.ResponseType);
+                    Assert.Equal(200, responseType.StatusCode);
+                    var responseFormat = Assert.Single(responseType.ResponseFormats);
+                    Assert.Equal("application/json", responseFormat.MediaType);
+                },
+                responseType =>
+                {
+                    Assert.Equal(errorType, responseType.ResponseType);
+                    Assert.Equal(500, responseType.StatusCode);
+                    var responseFormat = Assert.Single(responseType.ResponseFormats);
+                    Assert.Equal("application/json", responseFormat.MediaType);
+                });
+        }
+
+        [Fact]
+        public async Task ApiExplorer_ResponseType_OverrideOnAction()
+        {
+            // Arrange
+            var type = "ApiExplorerWebSite.Customer";
+            // type overriding the one specified on the controller
+            var errorType = "ApiExplorerWebSite.ErrorInfoOverride";
+            var expectedMediaTypes = new[] { "application/json", "application/xml", "text/json", "text/xml" };
+
+            // Act
+            var response = await Client.GetAsync(
+                "http://localhost/ApiExplorerResponseTypeOverrideOnAction/Action");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Equal(2, description.SupportedResponseTypes.Count);
+
+            Assert.Collection(
+                description.SupportedResponseTypes.OrderBy(responseType => responseType.StatusCode),
+                responseType =>
+                {
+                    Assert.Equal(type, responseType.ResponseType);
+                    Assert.Equal(200, responseType.StatusCode);
+                    Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+                },
+                responseType =>
+                {
+                    Assert.Equal(errorType, responseType.ResponseType);
+                    Assert.Equal(500, responseType.StatusCode);
+                    Assert.Equal(expectedMediaTypes, GetSortedMediaTypes(responseType));
+                });
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task ApiExplorer_ResponseContentType_Unset()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ApiExplorerResponseContentType/Unset");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+
+            var responseType = Assert.Single(description.SupportedResponseTypes);
+            Assert.Equal(4, responseType.ResponseFormats.Count);
+
+            var textXml = Assert.Single(responseType.ResponseFormats, f => f.MediaType == "text/xml");
+            Assert.Equal(typeof(XmlDataContractSerializerOutputFormatter).FullName, textXml.FormatterType);
+            var applicationXml = Assert.Single(responseType.ResponseFormats, f => f.MediaType == "application/xml");
+            Assert.Equal(typeof(XmlDataContractSerializerOutputFormatter).FullName, applicationXml.FormatterType);
+
+            var textJson = Assert.Single(responseType.ResponseFormats, f => f.MediaType == "text/json");
+            Assert.Equal(typeof(JsonOutputFormatter).FullName, textJson.FormatterType);
+            var applicationJson = Assert.Single(responseType.ResponseFormats, f => f.MediaType == "application/json");
+            Assert.Equal(typeof(JsonOutputFormatter).FullName, applicationJson.FormatterType);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_ResponseContentType_Specific()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ApiExplorerResponseContentType/Specific");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+
+            var responseType = Assert.Single(description.SupportedResponseTypes);
+            Assert.Equal(2, responseType.ResponseFormats.Count);
+
+            var applicationJson = Assert.Single(
+                responseType.ResponseFormats,
+                format => format.MediaType == "application/json");
+            Assert.Equal(typeof(JsonOutputFormatter).FullName, applicationJson.FormatterType);
+
+            var textJson = Assert.Single(responseType.ResponseFormats, f => f.MediaType == "text/json");
+            Assert.Equal(typeof(JsonOutputFormatter).FullName, textJson.FormatterType);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_ResponseContentType_WildcardMatch()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ApiExplorerResponseContentType/WildcardMatch");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            var responseType = Assert.Single(description.SupportedResponseTypes);
+            Assert.Equal(1, responseType.ResponseFormats.Count);
+
+            var responseFormat = responseType.ResponseFormats[0];
+            Assert.Equal("application/hal+json", responseFormat.MediaType);
+            Assert.Equal(typeof(JsonOutputFormatter).FullName, responseFormat.FormatterType);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_ResponseContentType_NoMatch()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ApiExplorerResponseContentType/NoMatch");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            var responseType = Assert.Single(description.SupportedResponseTypes);
+            Assert.Empty(responseType.ResponseFormats);
+        }
+
+        [ConditionalTheory]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        [InlineData("Controller", "text/xml", "Microsoft.AspNetCore.Mvc.Formatters.XmlDataContractSerializerOutputFormatter")]
+        [InlineData("Action", "application/json", "Microsoft.AspNetCore.Mvc.Formatters.JsonOutputFormatter")]
+        public async Task ApiExplorer_ResponseContentType_OverrideOnAction(
+            string action,
+            string contentType,
+            string formatterType)
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync(
+                "http://localhost/ApiExplorerResponseContentTypeOverrideOnAction/" + action);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+
+            var responseType = Assert.Single(description.SupportedResponseTypes);
+            var responseFormat = Assert.Single(responseType.ResponseFormats);
+            Assert.Equal(contentType, responseFormat.MediaType);
+            Assert.Equal(formatterType, responseFormat.FormatterType);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_Parameters_SimpleTypes_Default()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ApiExplorerParameters/SimpleParameters");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            var parameters = description.ParameterDescriptions;
+
+            Assert.Equal(2, parameters.Count);
+
+            var i = Assert.Single(parameters, p => p.Name == "i");
+            Assert.Equal(BindingSource.ModelBinding.Id, i.Source);
+            Assert.Equal(typeof(int).FullName, i.Type);
+
+            var s = Assert.Single(parameters, p => p.Name == "s");
+            Assert.Equal(BindingSource.ModelBinding.Id, s.Source);
+            Assert.Equal(typeof(string).FullName, s.Type);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_Parameters_SimpleTypes_BinderMetadataOnParameters()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync(
+                "http://localhost/ApiExplorerParameters/SimpleParametersWithBinderMetadata");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            var parameters = description.ParameterDescriptions;
+
+            Assert.Equal(2, parameters.Count);
+
+            var i = Assert.Single(parameters, p => p.Name == "i");
+            Assert.Equal(BindingSource.Query.Id, i.Source);
+            Assert.Equal(typeof(int).FullName, i.Type);
+
+            var s = Assert.Single(parameters, p => p.Name == "s");
+            Assert.Equal(BindingSource.Path.Id, s.Source);
+            Assert.Equal(typeof(string).FullName, s.Type);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_ParametersSimpleModel()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ApiExplorerParameters/SimpleModel");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            var parameters = description.ParameterDescriptions;
+
+            Assert.Equal(2, parameters.Count);
+
+            var id = Assert.Single(parameters, p => p.Name == "Id");
+            Assert.Equal(BindingSource.ModelBinding.Id, id.Source);
+            Assert.Equal(typeof(int).FullName, id.Type);
+
+            var name = Assert.Single(parameters, p => p.Name == "Name");
+            Assert.Equal(BindingSource.ModelBinding.Id, name.Source);
+            Assert.Equal(typeof(string).FullName, name.Type);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_Parameters_SimpleTypes_SimpleModel_FromBody()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ApiExplorerParameters/SimpleModelFromBody/5");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            var parameters = description.ParameterDescriptions;
+
+            Assert.Equal(2, parameters.Count);
+
+            var id = Assert.Single(parameters, p => p.Name == "id");
+            Assert.Equal(BindingSource.Path.Id, id.Source);
+            Assert.Equal(typeof(int).FullName, id.Type);
+
+            var product = Assert.Single(parameters, p => p.Name == "product");
+            Assert.Equal(BindingSource.Body.Id, product.Source);
+            Assert.Equal(typeof(ApiExplorerWebSite.Product).FullName, product.Type);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_Parameters_SimpleTypes_ComplexModel()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ApiExplorerParameters/ComplexModel");
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            var parameters = description.ParameterDescriptions;
+
+            Assert.Equal(7, parameters.Count);
+
+            var customerId = Assert.Single(parameters, p => p.Name == "CustomerId");
+            Assert.Equal(BindingSource.Query.Id, customerId.Source);
+            Assert.Equal(typeof(string).FullName, customerId.Type);
+
+            var referrer = Assert.Single(parameters, p => p.Name == "Referrer");
+            Assert.Equal(BindingSource.Header.Id, referrer.Source);
+            Assert.Equal(typeof(string).FullName, referrer.Type);
+
+            var quantity = Assert.Single(parameters, p => p.Name == "Details.Quantity");
+            Assert.Equal(BindingSource.Form.Id, quantity.Source);
+            Assert.Equal(typeof(int).FullName, quantity.Type);
+
+            var productId = Assert.Single(parameters, p => p.Name == "Details.Product.Id");
+            Assert.Equal(BindingSource.Form.Id, productId.Source);
+            Assert.Equal(typeof(int).FullName, productId.Type);
+
+            var productName = Assert.Single(parameters, p => p.Name == "Details.Product.Name");
+            Assert.Equal(BindingSource.Form.Id, productName.Source);
+            Assert.Equal(typeof(string).FullName, productName.Type);
+
+            var shippingInstructions = Assert.Single(parameters, p => p.Name == "Comments.ShippingInstructions");
+            Assert.Equal(BindingSource.Query.Id, shippingInstructions.Source);
+            Assert.Equal(typeof(string).FullName, shippingInstructions.Type);
+
+            var feedback = Assert.Single(parameters, p => p.Name == "Comments.Feedback");
+            Assert.Equal(BindingSource.Form.Id, feedback.Source);
+            Assert.Equal(typeof(string).FullName, feedback.Type);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_Updates_WhenActionDescriptorCollectionIsUpdated()
+        {
+            // Act - 1
+            var body = await Client.GetStringAsync("ApiExplorerReload/Index");
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert - 1
+            var description = Assert.Single(result);
+            Assert.Empty(description.ParameterDescriptions);
+            Assert.Equal("ApiExplorerReload/Index", description.RelativePath);
+
+            // Act - 2
+            var response = await Client.GetAsync("ApiExplorerReload/Reload");
+
+            // Assert - 2
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            // Act - 3
+            response = await Client.GetAsync("ApiExplorerReload/Index");
+
+            // Assert - 3
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+
+            // Act - 4
+            body = await Client.GetStringAsync("ApiExplorerReload/NewIndex");
+            result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert - 4
+            description = Assert.Single(result);
+            Assert.Empty(description.ParameterDescriptions);
+            Assert.Equal("ApiExplorerReload/NewIndex", description.RelativePath);
+        }
+
+        [Fact]
+        public async Task ApiExplorer_DoesNotListActionsSuppressedForPathMatching()
+        {
+            // Act
+            var body = await Client.GetStringAsync("ApiExplorerInboundOutbound/SuppressedForLinkGeneration");
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            Assert.Empty(description.ParameterDescriptions);
+            Assert.Equal("ApiExplorerInboundOutbound/SuppressedForLinkGeneration", description.RelativePath);
+        }
+
+        [Fact]
+        public async Task ApiBehavior_AddsMultipartFormDataConsumesConstraint_ForActionsWithFormFileParameters()
+        {
+            // Act
+            var body = await Client.GetStringAsync("ApiExplorerApiController/ActionWithFormFileCollectionParameter");
+            var result = JsonConvert.DeserializeObject<List<ApiExplorerData>>(body);
+
+            // Assert
+            var description = Assert.Single(result);
+            var requestFormat = Assert.Single(description.SupportedRequestFormats);
+            Assert.Equal("multipart/form-data", requestFormat.MediaType);
+        }
+
+        private IEnumerable<string> GetSortedMediaTypes(ApiExplorerResponseType apiResponseType)
+        {
+            return apiResponseType.ResponseFormats
+                .OrderBy(format => format.MediaType)
+                .Select(format => format.MediaType);
+        }
+
+        // Used to serialize data between client and server
+        private class ApiExplorerData
+        {
+            public string GroupName { get; set; }
+
+            public string HttpMethod { get; set; }
+
+            public List<ApiExplorerParameterData> ParameterDescriptions { get; } = new List<ApiExplorerParameterData>();
+
+            public string RelativePath { get; set; }
+
+            public List<ApiExplorerResponseType> SupportedResponseTypes { get; } = new List<ApiExplorerResponseType>();
+
+            public List<ApiExplorerRequestFormat> SupportedRequestFormats { get; } = new List<ApiExplorerRequestFormat>();
+        }
+
+        // Used to serialize data between client and server
+        private class ApiExplorerParameterData
+        {
+            public string Name { get; set; }
+
+            public ApiExplorerParameterRouteInfo RouteInfo { get; set; }
+
+            public string Source { get; set; }
+
+            public string Type { get; set; }
+        }
+
+        // Used to serialize data between client and server
+        private class ApiExplorerParameterRouteInfo
+        {
+            public string[] ConstraintTypes { get; set; }
+
+            public object DefaultValue { get; set; }
+
+            public bool IsOptional { get; set; }
+        }
+
+        // Used to serialize data between client and server
+        private class ApiExplorerResponseType
+        {
+            public IList<ApiExplorerResponseFormat> ResponseFormats { get; }
+                = new List<ApiExplorerResponseFormat>();
+
+            public string ResponseType { get; set; }
+
+            public int StatusCode { get; set; }
+
+            public bool IsDefaultResponse { get; set; }
+        }
+
+        private class ApiExplorerResponseFormat
+        {
+            public string MediaType { get; set; }
+
+            public string FormatterType { get; set; }
+        }
+
+        private class ApiExplorerRequestFormat
+        {
+            public string MediaType { get; set; }
+
+            public string FormatterType { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApplicationModelTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApplicationModelTest.cs
new file mode 100644
index 0000000000..a698af7ba4
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApplicationModelTest.cs
@@ -0,0 +1,200 @@
+// 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.
+
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class ApplicationModelTest : IClassFixture<MvcTestFixture<ApplicationModelWebSite.Startup>>
+    {
+        public ApplicationModelTest(MvcTestFixture<ApplicationModelWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task ControllerModel_CustomizedWithAttribute()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/CoolController/GetControllerName");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("CoolController", body);
+        }
+
+        [Fact]
+        public async Task ActionModel_CustomizedWithAttribute()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ActionModel/ActionName");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("ActionName", body);
+        }
+
+        [Fact]
+        public async Task ParameterModel_CustomizedWithAttribute()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ParameterModel/GetParameterMetadata");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("CoolMetadata", body);
+        }
+
+        [Fact]
+        public async Task ApplicationModel_AddPropertyToActionDescriptor_FromApplicationModel()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Home/GetCommonDescription");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Common Application Description", body);
+        }
+
+        [Fact]
+        public async Task ApplicationModel_AddPropertyToActionDescriptor_ControllerModelOverwritesCommonApplicationProperty()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ApplicationModel/GetControllerDescription");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Common Controller Description", body);
+        }
+
+        [Fact]
+        public async Task ApplicationModel_ProvidesMetadataToActionDescriptor_ActionModelOverwritesControllerModelProperty()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ApplicationModel/GetActionSpecificDescription");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Specific Action Description", body);
+       }
+
+        [Fact]
+        public async Task ApplicationModelExtensions_AddsConventionToAllControllers()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/License/GetLicense");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("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.", body);
+        }
+
+        [Fact]
+        public async Task ApplicationModelExtensions_AddsConventionToAllActions()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/Home/GetHelloWorld");
+            request.Headers.Add("helloWorld", "HelloWorld");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("From Header - HelloWorld", body);
+        }
+
+        [Fact]
+        public async Task ActionModelSuppressedForPathMatching_CannotBeRouted()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("Home/CannotBeRouted");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task ActionModelNotSuppressedForPathMatching_CanBeRouted()
+        {
+            // Arrange & Act
+            var response = await Client.GetStringAsync("Home/CanBeRouted");
+
+            // Assert
+            Assert.Equal("Hello world", response);
+        }
+
+        [Fact]
+        public async Task ActionModelSuppressedForLinkGeneration_CannotBeLinked()
+        {
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => Client.GetStringAsync("Home/RouteToSuppressLinkGeneration"));
+            Assert.Equal("No route matches the supplied values.", ex.Message);
+        }
+
+        [Fact]
+        public async Task ActionModelSuppressedForPathMatching_CanBeLinked()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("Home/RouteToSuppressPathMatching");
+
+            // Assert
+            Assert.Equal("/Home/CannotBeRouted", response.Headers.Location.ToString());
+        }
+
+        [Theory]
+        [InlineData("Products", "Products View")]
+        [InlineData("Services", "Services View")]
+        [InlineData("Manage", "Manage View")]
+        public async Task ApplicationModel_CanDuplicateController_InMultipleAreas(string areaName, string expectedContent)
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync(areaName + "/MultipleAreas/Index");
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Contains(expectedContent, content);
+        }
+
+        [Theory]
+        [InlineData("Help", "This is the help page")]        
+        [InlineData("MoreHelp", "This is the more help page")]        
+        public async Task ControllerModel_CanDuplicateActions_RoutesToDifferentNames(string actionName, string expectedContent)
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("ActionModel/" + actionName);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Contains(expectedContent, body);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AsyncActionsTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AsyncActionsTests.cs
new file mode 100644
index 0000000000..9f932f87a2
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AsyncActionsTests.cs
@@ -0,0 +1,282 @@
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class AsyncActionsTests : IClassFixture<MvcTestFixture<BasicWebSite.Startup>>
+    {
+        public AsyncActionsTests(MvcTestFixture<BasicWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task AsyncVoidAction_ReturnsOK()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/AsyncVoidAction");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(0, responseBody.Length);
+        }
+
+        [Fact]
+        public async Task TaskAction_ReturnsOK()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/TaskAction");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(0, responseBody.Length);
+        }
+
+        [Fact]
+        public async Task TaskExceptionAction_ReturnsCorrectError()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/TaskExceptionAction");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal("Action exception message: This is a custom exception.", responseBody);
+        }
+
+        [Fact]
+        public async Task TaskOfObjectAction_ReturnsJsonFormattedObject()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/TaskOfObjectAction?message=Alpha");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("{\"text\":\"Alpha\"}", responseBody);
+        }
+
+        [Fact]
+        public async Task TaskOfObjectExceptionAction_ReturnsCorrectError()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/TaskOfObjectExceptionAction?message=Alpha");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal("Action exception message: This is a custom exception.", responseBody);
+        }
+
+        [Fact]
+        public async Task TaskOfIActionResultAction_ReturnsString()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/TaskOfIActionResultAction?message=Beta");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("Beta", responseBody);
+        }
+
+        [Fact]
+        public async Task TaskOfIActionResultExceptionAction_ReturnsCorrectError()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/TaskOfIActionResultExceptionAction?message=Beta");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal("Action exception message: This is a custom exception.", responseBody);
+        }
+
+        [Fact]
+        public async Task TaskOfContentResultAction_ReturnsString()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/TaskOfContentResultAction?message=Gamma");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("Gamma", responseBody);
+        }
+
+        [Fact]
+        public async Task TaskOfContentResultExceptionAction_ReturnsCorrectError()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/TaskOfContentResultExceptionAction?message=Gamma");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal("Action exception message: This is a custom exception.", responseBody);
+        }
+
+        [Fact]
+        public async Task PreCompletedValueTaskOfObjectAction_ReturnsJsonFormattedObject()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/PreCompletedValueTaskOfObjectAction?message=Delta");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("{\"text\":\"Delta\"}", responseBody);
+        }
+
+        [Fact]
+        public async Task PreCompletedValueTaskOfObjectExceptionAction_ReturnsCorrectError()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/PreCompletedValueTaskOfObjectExceptionAction?message=Delta");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal("Action exception message: This is a custom exception.", responseBody);
+        }
+
+        [Fact]
+        public async Task PreCompletedValueTaskOfIActionResultAction_ReturnsString()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/PreCompletedValueTaskOfIActionResultAction?message=Epsilon");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("Epsilon", responseBody);
+        }
+
+        [Fact]
+        public async Task PreCompletedValueTaskOfIActionResultExceptionAction_ReturnsCorrectError()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/PreCompletedValueTaskOfIActionResultExceptionAction?message=Epsilon");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal("Action exception message: This is a custom exception.", responseBody);
+        }
+
+        [Fact]
+        public async Task PreCompletedValueTaskOfContentResultAction_ReturnsString()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/PreCompletedValueTaskOfContentResultAction?message=Zeta");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("Zeta", responseBody);
+        }
+
+        [Fact]
+        public async Task PreCompletedValueTaskOfContentResultExceptionAction_ReturnsCorrectError()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/PreCompletedValueTaskOfContentResultExceptionAction?message=Zeta");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal("Action exception message: This is a custom exception.", responseBody);
+        }
+
+        [Fact]
+        public async Task CustomAwaitableVoidAction_ReturnsOK()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/CustomAwaitableVoidAction");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(0, responseBody.Length);
+        }
+
+        [Fact]
+        public async Task CustomAwaitableVoidExceptionAction_ReturnsCorrectError()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/CustomAwaitableVoidExceptionAction");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal("Action exception message: This is a custom exception.", responseBody);
+        }
+
+        [Fact]
+        public async Task CustomAwaitableOfObjectAction_ReturnsJsonFormattedObject()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/CustomAwaitableOfObjectAction?message=Eta");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("{\"text\":\"Eta\"}", responseBody);
+        }
+
+        [Fact]
+        public async Task CustomAwaitableOfObjectExceptionAction_ReturnsCorrectError()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/CustomAwaitableOfObjectExceptionAction?message=Eta");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal("Action exception message: This is a custom exception.", responseBody);
+        }
+
+        [Fact]
+        public async Task CustomAwaitableOfIActionResultAction_ReturnsString()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/CustomAwaitableOfIActionResultAction?message=Theta");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("Theta", responseBody);
+        }
+
+        [Fact]
+        public async Task CustomAwaitableOfIActionResultExceptionAction_ReturnsCorrectError()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/CustomAwaitableOfIActionResultExceptionAction?message=Theta");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal("Action exception message: This is a custom exception.", responseBody);
+        }
+
+        [Fact]
+        public async Task CustomAwaitableOfContentResultAction_ReturnsString()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/CustomAwaitableOfContentResultAction?message=Iota");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("Iota", responseBody);
+        }
+
+        [Fact]
+        public async Task CustomAwaitableOfContentResultExceptionAction_ReturnsCorrectError()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/AsyncActions/CustomAwaitableOfContentResultExceptionAction?message=Iota");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal("Action exception message: This is a custom exception.", responseBody);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicTests.cs
new file mode 100644
index 0000000000..6761579f04
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicTests.cs
@@ -0,0 +1,632 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Reflection;
+using System.Threading.Tasks;
+using BasicWebSite.Models;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class BasicTests : IClassFixture<MvcTestFixture<BasicWebSite.Startup>>
+    {
+        // Some tests require comparing the actual response body against an expected response baseline
+        // so they require a reference to the assembly on which the resources are located, in order to
+        // make the tests less verbose, we get a reference to the assembly with the resources and we
+        // use it on all the rest of the tests.
+        private static readonly Assembly _resourcesAssembly = typeof(BasicTests).GetTypeInfo().Assembly;
+
+        public BasicTests(MvcTestFixture<BasicWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task CanRender_CSharp7Views()
+        {
+            // Arrange
+            var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");
+            var outputFile = "compiler/resources/BasicWebSite.Home.CSharp7View.html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            // Act
+            var response = await Client.GetAsync("Home/CSharp7View");
+            var responseContent = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
+
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            Assert.Equal(expectedContent, responseContent, ignoreLineEndingDifferences: true);
+#endif
+        }
+
+        [Fact]
+        public async Task CanRender_ViewComponentWithArgumentsFromController()
+        {
+            // Arrange
+            var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");
+            var outputFile = "compiler/resources/BasicWebSite.PassThrough.Index.html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            // Act
+            var response = await Client.GetAsync("PassThrough/Index?value=123");
+            var responseContent = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
+
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            Assert.Equal(expectedContent, responseContent, ignoreLineEndingDifferences: true);
+#endif
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData("Home")]
+        [InlineData("Home/Index")]
+        public async Task CanRender_ViewsWithLayout(string url)
+        {
+            // Arrange
+            var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");
+            var outputFile = "compiler/resources/BasicWebSite.Home.Index.html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            // Act
+            // The host is not important as everything runs in memory and tests are isolated from each other.
+            var response = await Client.GetAsync(url);
+            var responseContent = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
+
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            Assert.Equal(expectedContent, responseContent, ignoreLineEndingDifferences: true);
+#endif
+        }
+
+        [Fact]
+        public async Task CanRender_SimpleViews()
+        {
+            // Arrange
+            var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");
+            var outputFile = "compiler/resources/BasicWebSite.Home.PlainView.html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/Home/PlainView");
+            var responseContent = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
+
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            Assert.Equal(expectedContent, responseContent, ignoreLineEndingDifferences: true);
+#endif
+        }
+
+        [Fact]
+        public async Task ViewWithAttributePrefix_RendersWithoutIgnoringPrefix()
+        {
+            // Arrange
+            var outputFile = "compiler/resources/BasicWebSite.Home.ViewWithPrefixedAttributeValue.html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            // Act
+            var response = await Client.GetAsync("Home/ViewWithPrefixedAttributeValue");
+            var responseContent = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            Assert.Equal(expectedContent, responseContent, ignoreLineEndingDifferences: true);
+#endif
+        }
+
+        [Fact]
+        public async Task CanReturn_ResultsWithoutContent()
+        {
+            // Act
+            var response = await Client.GetAsync("Home/NoContentResult");
+            var responseContent = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
+            Assert.Null(response.Content.Headers.ContentType);
+            Assert.Equal(0, response.Content.Headers.ContentLength);
+            Assert.Equal(0, responseContent.Length);
+        }
+
+        [Fact]
+        public async Task ReturningTaskFromAction_ProducesEmptyResult()
+        {
+            // Act
+            var response = await Client.GetAsync("Home/ActionReturningTask");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("Hello, World!", Assert.Single(response.Headers.GetValues("Message")));
+            Assert.Empty(await response.Content.ReadAsStringAsync());
+        }
+
+        [Fact]
+        public async Task ActionDescriptors_CreatedOncePerRequest()
+        {
+            // Arrange
+            var expectedContent = "1";
+
+            // Act and Assert
+            for (var i = 0; i < 3; i++)
+            {
+                var result = await Client.GetAsync("Monitor/CountActionDescriptorInvocations");
+                Assert.Equal(HttpStatusCode.OK, result.StatusCode);
+                var responseContent = await result.Content.ReadAsStringAsync();
+
+                Assert.Equal(expectedContent, responseContent);
+            }
+        }
+
+        [Fact]
+        public async Task ActionWithRequireHttps_RedirectsToSecureUrl_ForNonHttpsGetRequests()
+        {
+            // Act
+            var response = await Client.GetAsync("Home/HttpsOnlyAction");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Found, response.StatusCode);
+            Assert.NotNull(response.Headers.Location);
+            Assert.Equal("https://localhost/Home/HttpsOnlyAction", response.Headers.Location.ToString());
+            Assert.Equal(0, response.Content.Headers.ContentLength);
+
+            var responseBytes = await response.Content.ReadAsByteArrayAsync();
+            Assert.Empty(responseBytes);
+        }
+
+        [Fact]
+        public async Task ActionWithRequireHttps_ReturnsBadRequestResponse_ForNonHttpsNonGetRequests()
+        {
+            // Act
+            var response = await Client.SendAsync(new HttpRequestMessage(
+                HttpMethod.Post,
+                "http://localhost/Home/HttpsOnlyAction"));
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode);
+            Assert.Equal(0, response.Content.Headers.ContentLength);
+
+            var responseBytes = await response.Content.ReadAsByteArrayAsync();
+            Assert.Empty(responseBytes);
+        }
+
+        [Theory]
+        [InlineData("GET")]
+        [InlineData("POST")]
+        public async Task ActionWithRequireHttps_AllowsHttpsRequests(string method)
+        {
+            // Act
+            var response = await Client.SendAsync(new HttpRequestMessage(
+                new HttpMethod(method),
+                "https://localhost/Home/HttpsOnlyAction"));
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task JsonHelper_RendersJson_WithCamelCaseNames()
+        {
+            // Arrange
+            var expectedBody =
+@"<script type=""text/javascript"">
+    var json = {""id"":9000,""fullName"":""John \u003cb\u003eSmith\u003c/b\u003e""};
+</script>";
+
+            // Act
+            var response = await Client.GetAsync("Home/JsonHelperInView");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("text/html", response.Content.Headers.ContentType.MediaType);
+
+            var actualBody = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, actualBody, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task JsonHelperWithSettings_RendersJson_WithNamesUnchanged()
+        {
+            // Arrange
+            var json = "{\"id\":9000,\"FullName\":\"John <b>Smith</b>\"}";
+            var expectedBody = string.Format(
+                @"<script type=""text/javascript"">
+    var json = {0};
+</script>",
+                json);
+
+            // Act
+            var response = await Client.GetAsync("Home/JsonHelperWithSettingsInView?snakeCase=false");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("text/html", response.Content.Headers.ContentType.MediaType);
+
+            var actualBody = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, actualBody, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task JsonHelperWithSettings_RendersJson_WithSnakeCaseNames()
+        {
+            // Arrange
+            var json = "{\"id\":9000,\"full_name\":\"John <b>Smith</b>\"}";
+            var expectedBody = string.Format(
+                @"<script type=""text/javascript"">
+    var json = {0};
+</script>",
+                json);
+
+            // Act
+            var response = await Client.GetAsync("Home/JsonHelperWithSettingsInView?snakeCase=true");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("text/html", response.Content.Headers.ContentType.MediaType);
+
+            var actualBody = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, actualBody, ignoreLineEndingDifferences: true);
+        }
+
+        public static IEnumerable<object[]> HtmlHelperLinkGenerationData
+        {
+            get
+            {
+                yield return new[] {
+                    "ActionLink_ActionOnSameController",
+                    @"<a href=""/Links/Details"">linktext</a>" };
+                yield return new[] {
+                    "ActionLink_ActionOnOtherController",
+                    @"<a href=""/Products/Details?print=true"">linktext</a>"
+                };
+                yield return new[] {
+                    "ActionLink_SecurePage_ImplicitHostName",
+                    @"<a href=""https://localhost/Products/Details?print=true"">linktext</a>"
+                };
+                yield return new[] {
+                    "ActionLink_HostNameFragmentAttributes",
+                    // note: attributes are alphabetically ordered
+                    @"<a href=""https://www.contoso.com:9000/Products/Details?print=true#details"" p1=""p1-value"">linktext</a>"
+                };
+                yield return new[] {
+                    "RouteLink_RestLinkToOtherController",
+                    @"<a href=""/api/orders/10"">linktext</a>"
+                };
+                yield return new[] {
+                    "RouteLink_SecureApi_ImplicitHostName",
+                    @"<a href=""https://localhost/api/orders/10"">linktext</a>"
+                };
+                yield return new[] {
+                    "RouteLink_HostNameFragmentAttributes",
+                    @"<a href=""https://www.contoso.com:9000/api/orders/10?print=True#details"" p1=""p1-value"">linktext</a>"
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(HtmlHelperLinkGenerationData))]
+        public async Task HtmlHelperLinkGeneration(string viewName, string expectedLink)
+        {
+            // Act
+            var response = await Client.GetAsync("Links/Index?view=" + viewName);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var responseData = await response.Content.ReadAsStringAsync();
+            Assert.Contains(expectedLink, responseData, StringComparison.OrdinalIgnoreCase);
+        }
+
+        [Fact]
+        public async Task ConfigureMvc_AddsOptionsProperly()
+        {
+            // Act
+            var response = await Client.GetAsync("Home/GetApplicationDescription");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var responseData = await response.Content.ReadAsStringAsync();
+            Assert.Equal("This is a basic website.", responseData);
+        }
+
+        [Fact]
+        public async Task TypesMarkedAsNonAction_AreInaccessible()
+        {
+            // Act
+            var response = await Client.GetAsync("SqlData/TruncateAllDbRecords");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task UsingPageRouteParameterInConventionalRouteWorks()
+        {
+            // Arrange
+            var expected = "ConventionalRoute - Hello from mypage";
+
+            // Act
+            var response = await Client.GetStringAsync("/PageRoute/ConventionalRoute/mypage");
+
+            // Assert
+            Assert.Equal(expected, response.Trim());
+        }
+
+        [Fact]
+        public async Task UsingPageRouteParameterInAttributeRouteWorks()
+        {
+            // Arrange
+            var expected = "AttributeRoute - Hello from test-page";
+
+            // Act
+            var response = await Client.GetStringAsync("/PageRoute/Attribute/test-page");
+
+            // Assert
+            Assert.Equal(expected, response.Trim());
+        }
+
+        [Fact]
+        public async Task RedirectToAction_WithEmptyActionName_UsesAmbientValue()
+        {
+            // Arrange
+            var product = new Dictionary<string, string>
+            {
+                { "SampleInt", "20" }
+            };
+
+            // Act
+            var response = await Client.PostAsync("/Home/Product", new FormUrlEncodedContent(product));
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.NotNull(response.Headers.Location);
+            Assert.Equal("/Home/Product", response.Headers.Location.ToString());
+
+            var responseBody = await Client.GetStringAsync("/Home/Product");
+            Assert.Equal("Get Product", responseBody);
+        }
+        [Fact]
+        public async Task ActionMethod_ReturningActionMethodOfT_WithBadRequest()
+        {
+            // Arrange
+            var url = "ActionResultOfT/GetProduct";
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task ActionMethod_ReturningActionMethodOfT()
+        {
+            // Arrange
+            var url = "ActionResultOfT/GetProduct?productId=10";
+
+            // Act
+            var response = await Client.GetStringAsync(url);
+
+            // Assert
+            var result = JsonConvert.DeserializeObject<Product>(response);
+            Assert.Equal(10, result.SampleInt);
+        }
+
+        [Fact]
+        public async Task ActionMethod_ReturningSequenceOfObjectsWrappedInActionResultOfT()
+        {
+            // Arrange
+            var url = "ActionResultOfT/GetProductsAsync";
+
+            // Act
+            var response = await Client.GetStringAsync(url);
+
+            // Assert
+            var result = JsonConvert.DeserializeObject<Product[]>(response);
+            Assert.Equal(2, result.Length);
+        }
+
+        [Fact]
+        public async Task TestingInfrastructure_InvokesCreateDefaultBuilder()
+        {
+            // Act
+            var response = await Client.GetStringAsync("Testing/Builder");
+
+            // Assert
+            Assert.Equal("true", response);
+        }
+
+        [Fact]
+        public async Task ApplicationAssemblyPartIsListedAsFirstAssembly()
+        {
+            // Act
+            var response = await Client.GetStringAsync("Home/GetAssemblyPartData");
+            var assemblyParts = JsonConvert.DeserializeObject<IList<string>>(response);
+            var expected = new[]
+            {
+                "BasicWebSite",
+                "Microsoft.AspNetCore.Mvc.TagHelpers",
+                "Microsoft.AspNetCore.Mvc.Razor",
+            };
+
+            // Assert
+            Assert.Equal(expected, assemblyParts);
+        }
+
+        [Fact]
+        public async Task ViewDataProperties_AreTransferredToViews()
+        {
+            // Act
+            var document = await Client.GetHtmlDocumentAsync("ViewDataProperty/ViewDataPropertyToView");
+
+            // Assert
+            var message = document.QuerySelector("#message").TextContent;
+            Assert.Equal("Message set in action", message);
+
+            var filterMessage = document.QuerySelector("#filter-message").TextContent;
+            Assert.Equal("Value set in OnActionExecuting", filterMessage);
+
+            var title = document.QuerySelector("title").TextContent;
+            Assert.Equal("View Data Property Sample", title);
+        }
+
+        [Fact]
+        public async Task ViewDataProperties_AreTransferredToViewComponents()
+        {
+            // Act
+            var document = await Client.GetHtmlDocumentAsync("ViewDataProperty/ViewDataPropertyToViewComponent");
+
+            // Assert
+            var message = document.QuerySelector("#message").TextContent;
+            Assert.Equal("Message set in action", message);
+
+            var title = document.QuerySelector("title").TextContent;
+            Assert.Equal("View Data Property Sample", title);
+        }
+
+        [Fact]
+        public async Task BindPropertiesAttribute_CanBeAppliedToControllers()
+        {
+            // Arrange
+            var formContent = new Dictionary<string, string>
+            {
+                { "Name", "TestName" },
+                { "Id", "10" },
+            };
+
+            // Act
+            var response = await Client.PostAsync("BindProperties/Action", new FormUrlEncodedContent(formContent));
+
+            // Assert
+            await response.AssertStatusCodeAsync(HttpStatusCode.OK);
+            var content = await response.Content.ReadAsStringAsync();
+            var data = JsonConvert.DeserializeObject<BindPropertyControllerData>(content);
+
+            Assert.Equal("TestName", data.Name);
+            Assert.Equal(10, data.Id);
+        }
+
+        [Fact]
+        public async Task BindPropertiesAttribute_DoesNotApplyToPropertiesWithBindingInfo()
+        {
+            // Arrange
+            var formContent = new Dictionary<string, string>
+            {
+                { "Id", "10" },
+                { "FromRoute", "12" },
+                { "CustomBound", "Test" },
+            };
+
+            // Act
+            var response = await Client.PostAsync("BindProperties/Action", new FormUrlEncodedContent(formContent));
+
+            // Assert
+            await response.AssertStatusCodeAsync(HttpStatusCode.OK);
+            var content = await response.Content.ReadAsStringAsync();
+            var data = JsonConvert.DeserializeObject<BindPropertyControllerData>(content);
+
+            Assert.Equal(10, data.Id);
+            Assert.Null(data.IdFromRoute);
+            Assert.Equal("CustomBoundValue", data.CustomBound);
+        }
+
+        [Fact]
+        public async Task BindPropertiesAttribute_DoesNotCausePropertiesWithBindNeverAttributeToBeModelBound()
+        {
+            // Arrange
+            var formContent = new Dictionary<string, string>
+            {
+                { "BindNeverProperty", "Hello world" },
+            };
+
+            // Act
+            var response = await Client.PostAsync("BindProperties/Action", new FormUrlEncodedContent(formContent));
+
+            // Assert
+            await response.AssertStatusCodeAsync(HttpStatusCode.OK);
+            var content = await response.Content.ReadAsStringAsync();
+            var data = JsonConvert.DeserializeObject<BindPropertyControllerData>(content);
+
+            Assert.Null(data.BindNeverProperty);
+        }
+
+        [Fact]
+        public async Task BindPropertiesAttributeWithSupportsGet_BindsOnNonGet()
+        {
+            // Arrange
+            var formContent = new Dictionary<string, string>
+            {
+                {  "Name", "TestName" },
+            };
+
+            // Act
+            var response = await Client.PostAsync("BindPropertiesSupportsGet/Action", new FormUrlEncodedContent(formContent));
+
+            // Assert
+            await response.AssertStatusCodeAsync(HttpStatusCode.OK);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("TestName", content);
+        }
+
+        [Fact]
+        public async Task BindPropertiesAttributeWithSupportsGet_BindsOnGet()
+        {
+            // Act
+            var response = await Client.GetAsync("BindPropertiesSupportsGet/Action?Name=OnGetTestName");
+
+            // Assert
+            await response.AssertStatusCodeAsync(HttpStatusCode.OK);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("OnGetTestName", content);
+        }
+
+        public class BindPropertyControllerData
+        {
+            public string Name { get; set; }
+
+            public int? Id { get; set; }
+
+            public int? IdFromRoute { get; set; }
+
+            public string CustomBound { get; set; }
+
+            public string BindNeverProperty { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs
new file mode 100644
index 0000000000..a0efcd00d1
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    // Test to verify compilation options from the application are used to compile
+    // precompiled and dynamically compiled views.
+    public class CompilationOptionsTests : IClassFixture<MvcTestFixture<RazorWebSite.Startup>>
+    {
+        public CompilationOptionsTests(MvcTestFixture<RazorWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task CompilationOptions_AreUsedByViewsAndPartials()
+        {
+            // Arrange
+            var expected =
+@"This method is running from NETCOREAPP2_0
+This method is only defined in NETCOREAPP2_0";
+
+            // Act
+            var body = await Client.GetStringAsync("http://localhost/ViewsConsumingCompilationOptions/");
+
+            // Assert
+            Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ConsumesAttributeTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ConsumesAttributeTests.cs
new file mode 100644
index 0000000000..181094b715
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ConsumesAttributeTests.cs
@@ -0,0 +1,169 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Testing.xunit;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class ConsumesAttributeTests : IClassFixture<MvcTestFixture<BasicWebSite.Startup>>
+    {
+        public ConsumesAttributeTests(MvcTestFixture<BasicWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task NoRequestContentType_SelectsActionWithoutConstraint()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                HttpMethod.Post,
+                "http://localhost/ConsumesAttribute_Company/CreateProduct");
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var body = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("CreateProduct_Product_Text", body);
+        }
+
+        [Fact]
+        public async Task NoRequestContentType_Selects_IfASingleActionWithConstraintIsPresent()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                HttpMethod.Post,
+                "http://localhost/ConsumesAttribute_PassThrough/CreateProduct");
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var body = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("ConsumesAttribute_PassThrough_Product_Json", body);
+        }
+
+        [Theory]
+        [InlineData("application/json")]
+        [InlineData("text/json")]
+        public async Task Selects_Action_BasedOnRequestContentType(string requestContentType)
+        {
+            // Arrange
+            var input = "{SampleString:\""+requestContentType+"\"}";
+            var request = new HttpRequestMessage(
+                HttpMethod.Post,
+                "http://localhost/ConsumesAttribute_AmbiguousActions/CreateProduct");
+            request.Content = new StringContent(input, Encoding.UTF8, requestContentType);
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var product = JsonConvert.DeserializeObject<Product>(await response.Content.ReadAsStringAsync());
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(requestContentType, product.SampleString);
+        }
+
+        [Theory]
+        [InlineData("application/json")]
+        [InlineData("text/json")]
+        public async Task ActionLevelAttribute_OveridesClassLevel(string requestContentType)
+        {
+            // Arrange
+            var input = "{SampleString:\"" + requestContentType + "\"}";
+            var request = new HttpRequestMessage(
+                HttpMethod.Post,
+                "http://localhost/ConsumesAttribute_OverridesBase/CreateProduct");
+            request.Content = new StringContent(input, Encoding.UTF8, requestContentType);
+            var expectedString = "ConsumesAttribute_OverridesBaseController_" + requestContentType;
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var product = JsonConvert.DeserializeObject<Product>(await response.Content.ReadAsStringAsync());
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedString, product.SampleString);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task DerivedClassLevelAttribute_OveridesBaseClassLevel()
+        {
+            // Arrange
+            var input = "<Product xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                "xmlns=\"http://schemas.datacontract.org/2004/07/BasicWebSite.Models\">" +
+                "<SampleString>application/xml</SampleString></Product>";
+            var request = new HttpRequestMessage(
+                HttpMethod.Post,
+                "http://localhost/ConsumesAttribute_Overrides/CreateProduct");
+            request.Content = new StringContent(input, Encoding.UTF8, "application/xml");
+            var expectedString = "ConsumesAttribute_OverridesController_application/xml";
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var responseString = await response.Content.ReadAsStringAsync();
+            var product = JsonConvert.DeserializeObject<Product>(responseString);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedString, product.SampleString);
+        }
+
+        [Fact]
+        public async Task JsonSyntaxSuffix_SelectsActionConsumingJson()
+        {
+            // Arrange
+            var input = "{SampleString:\"some input\"}";
+            var request = new HttpRequestMessage(
+                HttpMethod.Post,
+                "http://localhost/ConsumesAttribute_MediaTypeSuffix/CreateProduct");
+            request.Content = new StringContent(input, Encoding.UTF8, "application/vnd.example+json");
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var product = JsonConvert.DeserializeObject<Product>(await response.Content.ReadAsStringAsync());
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("Read from JSON: some input", product.SampleString);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task XmlSyntaxSuffix_SelectsActionConsumingXml()
+        {
+            // Arrange
+            var input = "<Product xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                "xmlns=\"http://schemas.datacontract.org/2004/07/BasicWebSite.Models\">" +
+                "<SampleString>some input</SampleString></Product>";
+            var request = new HttpRequestMessage(
+                HttpMethod.Post,
+                "http://localhost/ConsumesAttribute_MediaTypeSuffix/CreateProduct");
+            request.Content = new StringContent(input, Encoding.UTF8, "application/vnd.example+xml");
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var product = JsonConvert.DeserializeObject<Product>(await response.Content.ReadAsStringAsync());
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("Read from XML: some input", product.SampleString);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ContentNegotiationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ContentNegotiationTest.cs
new file mode 100644
index 0000000000..850ae97c7d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ContentNegotiationTest.cs
@@ -0,0 +1,531 @@
+// 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.
+
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Mvc.Formatters.Xml;
+using Microsoft.AspNetCore.Testing.xunit;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class ContentNegotiationTest : IClassFixture<MvcTestFixture<BasicWebSite.Startup>>
+    {
+        public ContentNegotiationTest(MvcTestFixture<BasicWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task ProducesAttribute_SingleContentType_PicksTheFirstSupportedFormatter()
+        {
+            // Arrange
+            // Selects custom even though it is last in the list.
+            var expectedContentType = MediaTypeHeaderValue.Parse("application/custom;charset=utf-8");
+            var expectedBody = "Written using custom format.";
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/Normal/WriteUserUsingCustomFormat");
+
+            // Assert
+            Assert.Equal(expectedContentType, response.Content.Headers.ContentType);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, body);
+        }
+
+        [Fact]
+        public async Task ProducesAttribute_MultipleContentTypes_RunsConnegToSelectFormatter()
+        {
+            // Arrange
+            var expectedContentType = MediaTypeHeaderValue.Parse("application/json;charset=utf-8");
+            var expectedBody = $"{{{Environment.NewLine}  \"name\": \"My name\",{Environment.NewLine}" +
+                $"  \"address\": \"My address\"{Environment.NewLine}}}";
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/Normal/MultipleAllowedContentTypes");
+
+            // Assert
+            Assert.Equal(expectedContentType, response.Content.Headers.ContentType);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, body);
+        }
+
+        [Fact]
+        public async Task NoProducesAttribute_ActionReturningString_RunsUsingTextFormatter()
+        {
+            // Arrange
+            var expectedContentType = MediaTypeHeaderValue.Parse("text/plain;charset=utf-8");
+            var expectedBody = "NormalController";
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/Normal/ReturnClassName");
+
+            // Assert
+            Assert.Equal(expectedContentType, response.Content.Headers.ContentType);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, body);
+        }
+
+        [Fact]
+        public async Task NoProducesAttribute_ActionReturningAnyObject_RunsUsingDefaultFormatters()
+        {
+            // Arrange
+            var expectedContentType = MediaTypeHeaderValue.Parse("application/json;charset=utf-8");
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/Normal/ReturnUser");
+
+            // Assert
+            Assert.Equal(expectedContentType, response.Content.Headers.ContentType);
+        }
+
+        [Theory]
+        [InlineData("/;q=0.9")]
+        [InlineData("/;q=0.9, invalid;q=0.5;application/json;q=0.1")]
+        [InlineData("/invalid;q=0.9, application/json;q=0.1,invalid;q=0.5")]
+        [InlineData("text/html, application/json, image/jpeg, *; q=.2, */*; q=.2")]
+        public async Task ContentNegotiationWithPartiallyValidAcceptHeader_SkipsInvalidEntries(string acceptHeader)
+        {
+            // Arrange
+            var expectedContentType = MediaTypeHeaderValue.Parse("application/json;charset=utf-8");
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/ContentNegotiation/UserInfo_ProducesWithTypeOnly");
+            request.Headers.TryAddWithoutValidation("Accept", acceptHeader);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedContentType, response.Content.Headers.ContentType);
+        }
+
+        [Fact]
+        public async Task ProducesAttributeWithTypeOnly_RunsRegularContentNegotiation()
+        {
+            // Arrange
+            var expectedContentType = MediaTypeHeaderValue.Parse("application/json;charset=utf-8");
+            var expectedOutput = "{\"name\":\"John\",\"address\":\"One Microsoft Way\"}";
+            var request = new HttpRequestMessage(
+                HttpMethod.Get,
+                "http://localhost/ContentNegotiation/UserInfo_ProducesWithTypeOnly");
+            request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedContentType, response.Content.Headers.ContentType);
+            var actual = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedOutput, actual);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task ProducesAttribute_WithTypeAndContentType_UsesContentType()
+        {
+            // Arrange
+            var expectedContentType = MediaTypeHeaderValue.Parse("application/xml;charset=utf-8");
+            var expectedOutput = "<User xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                "xmlns=\"http://schemas.datacontract.org/2004/07/BasicWebSite.Models\">" +
+                "<Address>One Microsoft Way</Address><Name>John</Name></User>";
+            var request = new HttpRequestMessage(
+                HttpMethod.Get,
+                "http://localhost/ContentNegotiation/UserInfo_ProducesWithTypeAndContentType");
+            request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedContentType, response.Content.Headers.ContentType);
+            var actual = await response.Content.ReadAsStringAsync();
+            XmlAssert.Equal(expectedOutput, actual);
+        }
+
+        [Theory]
+        [InlineData("http://localhost/FallbackOnTypeBasedMatch/UseTheFallback_WithDefaultFormatters")]
+        [InlineData("http://localhost/FallbackOnTypeBasedMatch/OverrideTheFallback_WithDefaultFormatters")]
+        public async Task NoAcceptAndRequestContentTypeHeaders_UsesFirstFormatterWhichCanWriteType(string url)
+        {
+            // Arrange
+            var expectedContentType = MediaTypeHeaderValue.Parse("application/json;charset=utf-8");
+
+            // Act
+            var response = await Client.GetAsync(url + "?input=100");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedContentType, response.Content.Headers.ContentType);
+            var actual = await response.Content.ReadAsStringAsync();
+            Assert.Equal("100", actual);
+        }
+
+        [Fact]
+        public async Task NoMatchingFormatter_ForTheGivenContentType_Returns406()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Normal/ReturnUser_NoMatchingFormatter");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotAcceptable, response.StatusCode);
+        }
+
+        [Theory]
+        [InlineData(
+            "ContactInfoUsingV3Format",
+            "text/vcard; version=v3.0; charset=utf-8",
+            @"BEGIN:VCARD
+FN:John Williams
+END:VCARD
+")]
+        [InlineData(
+            "ContactInfoUsingV4Format",
+            "text/vcard; version=v4.0; charset=utf-8",
+            @"BEGIN:VCARD
+FN:John Williams
+GENDER:M
+END:VCARD
+")]
+        public async Task ProducesAttribute_WithMediaTypeHavingParameters_IsCaseInsensitiveMatch(
+            string action,
+            string expectedMediaType,
+            string expectedResponseBody)
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/ProducesWithMediaTypeParameters/" + action);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content);
+            var contentType = response.Content.Headers.ContentType;
+            Assert.NotNull(contentType);
+            Assert.Equal(expectedMediaType, contentType.ToString());
+
+            var actualResponseBody = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedResponseBody, actualResponseBody, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task ProducesAttribute_OnAction_OverridesTheValueOnClass()
+        {
+            // Arrange
+            // Value on the class is application/json.
+            var expectedContentType = MediaTypeHeaderValue.Parse(
+                "application/custom_ProducesContentBaseController_Action;charset=utf-8");
+            var expectedBody = "ProducesContentBaseController";
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/ProducesContentBase/ReturnClassName");
+
+            // Assert
+            Assert.Equal(expectedContentType, response.Content.Headers.ContentType);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, body);
+        }
+
+        [Fact]
+        public async Task ProducesAttribute_OnDerivedClass_OverridesTheValueOnBaseClass()
+        {
+            // Arrange
+            var expectedContentType = MediaTypeHeaderValue.Parse(
+                "application/custom_ProducesContentOnClassController;charset=utf-8");
+            var expectedBody = "ProducesContentOnClassController";
+
+            // Act
+            var response = await Client.GetAsync(
+                "http://localhost/ProducesContentOnClass/ReturnClassNameWithNoContentTypeOnAction");
+
+            // Assert
+            Assert.Equal(expectedContentType, response.Content.Headers.ContentType);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, body);
+        }
+
+        [Fact]
+        public async Task ProducesAttribute_OnDerivedAction_OverridesTheValueOnBaseClass()
+        {
+            // Arrange
+            var expectedContentType = MediaTypeHeaderValue.Parse(
+                "application/custom_NoProducesContentOnClassController_Action;charset=utf-8");
+            var expectedBody = "NoProducesContentOnClassController";
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/NoProducesContentOnClass/ReturnClassName");
+
+            // Assert
+            Assert.Equal(expectedContentType, response.Content.Headers.ContentType);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, body);
+        }
+
+        [Fact]
+        public async Task ProducesAttribute_OnDerivedAction_OverridesTheValueOnBaseAction()
+        {
+            // Arrange
+            var expectedContentType = MediaTypeHeaderValue.Parse(
+                "application/custom_NoProducesContentOnClassController_Action;charset=utf-8");
+            var expectedBody = "NoProducesContentOnClassController";
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/NoProducesContentOnClass/ReturnClassName");
+
+            // Assert
+            Assert.Equal(expectedContentType, response.Content.Headers.ContentType);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, body);
+        }
+
+        [Fact]
+        public async Task ProducesAttribute_OnDerivedClassAndAction_OverridesTheValueOnBaseClass()
+        {
+            // Arrange
+            var expectedContentType = MediaTypeHeaderValue.Parse(
+                "application/custom_ProducesContentOnClassController_Action;charset=utf-8");
+            var expectedBody = "ProducesContentOnClassController";
+
+            // Act
+            var response = await Client.GetAsync(
+                "http://localhost/ProducesContentOnClass/ReturnClassNameContentTypeOnDerivedAction");
+
+            // Assert
+            Assert.Equal(expectedContentType, response.Content.Headers.ContentType);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, body);
+        }
+
+        [Fact]
+        public async Task ProducesAttribute_IsNotHonored_ForJsonResult()
+        {
+            // Arrange
+            var expectedContentType = MediaTypeHeaderValue.Parse("application/json;charset=utf-8");
+            var expectedBody = "{\"methodName\":\"Produces_WithNonObjectResult\"}";
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/ProducesJson/Produces_WithNonObjectResult");
+
+            // Assert
+            Assert.Equal(expectedContentType, response.Content.Headers.ContentType);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, body);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task XmlFormatter_SupportedMediaType_DoesNotChangeAcrossRequests()
+        {
+            // Arrange
+            var expectedContentType = MediaTypeHeaderValue.Parse("application/xml;charset=utf-8");
+            var expectedBody = @"<User xmlns:i=""http://www.w3.org/2001/XMLSchema-instance"" " +
+                @"xmlns=""http://schemas.datacontract.org/2004/07/BasicWebSite.Models""><Address>" +
+                @"One Microsoft Way</Address><Name>John</Name></User>";
+
+            for (int i = 0; i < 5; i++)
+            {
+                var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/ContentNegotiation/UserInfo");
+                request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml"));
+                request.Headers.AcceptCharset.Add(new StringWithQualityHeaderValue("utf-8"));
+
+                // Act and Assert
+                var response = await Client.SendAsync(request);
+
+                Assert.Equal(expectedContentType, response.Content.Headers.ContentType);
+                var body = await response.Content.ReadAsStringAsync();
+                Assert.Equal(expectedBody, body);
+            }
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("text/plain")]
+        [InlineData("text/plain; charset=utf-8")]
+        [InlineData("text/html, application/xhtml+xml, image/jxr, */*")] // typical browser accept header
+        public async Task ObjectResult_WithStringReturnType_DefaultToTextPlain(string acceptMediaType)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, "FallbackOnTypeBasedMatch/ReturnString");
+            request.Headers.Accept.ParseAdd(acceptMediaType);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("text/plain; charset=utf-8", response.Content.Headers.ContentType.ToString());
+            var actualBody = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Hello World!", actualBody);
+        }
+
+        [Fact]
+        public async Task ObjectResult_WithStringReturnType_AndNonTextPlainMediaType_DoesNotReturnTextPlain()
+        {
+            // Arrange
+            var targetUri = "http://localhost/FallbackOnTypeBasedMatch/ReturnString";
+            var request = new HttpRequestMessage(HttpMethod.Get, targetUri);
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/json"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("application/json; charset=utf-8", response.Content.Headers.ContentType.ToString());
+            var actualBody = await response.Content.ReadAsStringAsync();
+            Assert.Equal("\"Hello World!\"", actualBody);
+        }
+
+        [Fact]
+        public async Task NoMatchOn_RequestContentType_FallsBackOnTypeBasedMatch_NoMatchFound_Returns406()
+        {
+            // Arrange
+            var targetUri = "http://localhost/FallbackOnTypeBasedMatch/FallbackGivesNoMatch/?input=1234";
+            var content = new StringContent("1234", Encoding.UTF8, "application/custom");
+            var request = new HttpRequestMessage(HttpMethod.Post, targetUri);
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/custom1"));
+            request.Content = content;
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotAcceptable, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task InvalidResponseContentType_WithNotMatchingAcceptHeader_Returns406()
+        {
+            // Arrange
+            var targetUri = "http://localhost/InvalidContentType/SetResponseContentTypeJson";
+            var request = new HttpRequestMessage(HttpMethod.Get, targetUri);
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/custom1"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotAcceptable, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task InvalidResponseContentType_WithMatchingAcceptHeader_Returns406()
+        {
+            // Arrange
+            var targetUri = "http://localhost/InvalidContentType/SetResponseContentTypeJson";
+            var request = new HttpRequestMessage(HttpMethod.Get, targetUri);
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/json"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotAcceptable, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task InvalidResponseContentType_WithoutAcceptHeader_Returns406()
+        {
+            // Arrange
+            var targetUri = "http://localhost/InvalidContentType/SetResponseContentTypeJson";
+            var request = new HttpRequestMessage(HttpMethod.Get, targetUri);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotAcceptable, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task ProducesAttribute_And_FormatFilterAttribute_Conflicting()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync(
+                "http://localhost/FormatFilter/ProducesTakesPrecedenceOverUserSuppliedFormatMethod?format=json");
+
+            // Assert
+            // Explicit content type set by the developer takes precedence over the format requested by the end user
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task ProducesAttribute_And_FormatFilterAttribute_Collaborating()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync(
+                "http://localhost/FormatFilter/ProducesTakesPrecedenceOverUserSuppliedFormatMethod");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("MethodWithFormatFilter", body);
+        }
+
+        [Fact]
+        public async Task ProducesAttribute_CustomMediaTypeWithJsonSuffix_RunsConnegAndSelectsJsonFormatter()
+        {
+            // Arrange
+            var expectedMediaType = MediaTypeHeaderValue.Parse("application/vnd.example.contact+json; v=2; charset=utf-8");
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/ProducesWithMediaTypeSuffixesController/ContactInfo");
+            request.Headers.Add("Accept", "application/vnd.example.contact+json; v=2");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
+            var body = await response.Content.ReadAsStringAsync();
+            var contact = JsonConvert.DeserializeObject<Contact>(body);
+            Assert.Equal("Jason Ecsemelle", contact.Name);
+        }
+
+        [Fact]
+        public async Task ProducesAttribute_CustomMediaTypeWithXmlSuffix_RunsConnegAndSelectsXmlFormatter()
+        {
+            // Arrange
+            var expectedMediaType = MediaTypeHeaderValue.Parse("application/vnd.example.contact+xml; v=2; charset=utf-8");
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/ProducesWithMediaTypeSuffixesController/ContactInfo");
+            request.Headers.Add("Accept", "application/vnd.example.contact+xml; v=2");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
+            var bodyStream = await response.Content.ReadAsStreamAsync();
+            var xmlDeserializer = new DataContractSerializer(typeof(Contact));
+            var contact = xmlDeserializer.ReadObject(bodyStream) as Contact;
+            Assert.Equal("Jason Ecsemelle", contact.Name);
+        }
+
+        [Fact]
+        public async Task FormatFilter_XmlAsFormat_ReturnsXml()
+        {
+            // Arrange
+            var expectedBody = "<FormatFilterController.Customer xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\""
+                + " xmlns=\"http://schemas.datacontract.org/2004/07/BasicWebSite.Controllers.ContentNegotiation\">"
+                + "<Name>John</Name></FormatFilterController.Customer>";
+
+            // Act
+            var response = await Client.GetAsync(
+                "http://localhost/FormatFilter/CustomerInfo?format=xml");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("application/xml; charset=utf-8", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, body);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ControllerFromServicesTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ControllerFromServicesTests.cs
new file mode 100644
index 0000000000..01fb7c83b7
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ControllerFromServicesTests.cs
@@ -0,0 +1,121 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class ControllerFromServicesTest : IClassFixture<MvcTestFixture<ControllersFromServicesWebSite.Startup>>
+    {
+        public ControllerFromServicesTest(MvcTestFixture<ControllersFromServicesWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task ControllersWithConstructorInjectionAreCreatedAndActivated()
+        {
+            // Arrange
+            var expected = "/constructorinjection 14 test-header-value";
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/constructorinjection?value=14");
+            request.Headers.TryAddWithoutValidation("Test-Header", "test-header-value");
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var responseText = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(expected, responseText);
+        }
+
+        [Fact]
+        public async Task TypesDerivingFromControllerAreRegistered()
+        {
+            // Arrange
+            var expected = "No schedules available for 23";
+
+            // Act
+            var response = await Client.GetStringAsync("http://localhost/schedule/23");
+
+            // Assert
+            Assert.Equal(expected, response);
+        }
+
+        [Fact]
+        public async Task TypesDerivingFromTypesWithControllerAttributeAreRegistered()
+        {
+            // Arrange
+            var expected = "4";
+
+            // Act
+            var response = await Client.GetStringAsync("http://localhost/inventory/");
+
+            // Assert
+            Assert.Equal(expected, response);
+        }
+
+        [Fact]
+        public async Task TypesWithControllerSuffixAreRegistered()
+        {
+            // Arrange
+            var expected = "Updated record employee303";
+
+            // Act
+            var response = await Client.PutAsync(
+                "http://localhost/employee/update_records?recordId=employee303",
+                new StringContent(string.Empty));
+
+            // Assert
+            response.EnsureSuccessStatusCode();
+            Assert.Equal(expected, await response.Content.ReadAsStringAsync());
+        }
+
+        [Fact]
+        public async Task TypesWithControllerSuffixAreConventionalRouted()
+        {
+            // Arrange
+            var expected = "Saved record employee #211";
+
+            // Act
+            var response = await Client.PostAsync(
+                "http://localhost/employeerecords/save/211",
+                new StringContent(string.Empty));
+
+            // Assert
+            response.EnsureSuccessStatusCode();
+            Assert.Equal(expected, await response.Content.ReadAsStringAsync());
+        }
+
+        [Theory]
+        [InlineData("not-discovered/generic")]
+        [InlineData("not-discovered/nested")]
+        [InlineData("not-discovered/not-in-services")]
+        [InlineData("ClientUIStub/GetClientContent/5")]
+        public async Task AddControllersFromServices_UsesControllerDiscoveryContentions(string action)
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/" + action);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task AddControllersAsServices_MultipleCalls_DoesNotReplacePreviousProvider()
+        {
+            // Arrange
+            var expected = "1";
+
+            // Act
+            var response = await Client.GetStringAsync("http://localhost/another/");
+
+            // Assert
+            Assert.Equal(expected, response);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsTests.cs
new file mode 100644
index 0000000000..5d92c7e6eb
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsTests.cs
@@ -0,0 +1,354 @@
+// 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.
+
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Cors.Infrastructure;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class CorsTests : IClassFixture<MvcTestFixture<CorsWebSite.Startup>>
+    {
+        public CorsTests(MvcTestFixture<CorsWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Theory]
+        [InlineData("GET")]
+        [InlineData("HEAD")]
+        [InlineData("POST")]
+        public async Task ResourceWithSimpleRequestPolicy_Allows_SimpleRequests(string method)
+        {
+            // Arrange
+            var origin = "http://example.com";
+            var request = new HttpRequestMessage(new HttpMethod(method), "http://localhost/Cors/GetBlogComments");
+            request.Headers.Add(CorsConstants.Origin, origin);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("[\"comment1\",\"comment2\",\"comment3\"]", content);
+            var responseHeaders = response.Headers;
+            var header = Assert.Single(response.Headers);
+            Assert.Equal(CorsConstants.AccessControlAllowOrigin, header.Key);
+            Assert.Equal(new[] { "*" }, header.Value.ToArray());
+        }
+
+        [Fact]
+        public async Task OptionsRequest_NonPreflight_ExecutesOptionsAction()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(new HttpMethod("OPTIONS"), "http://localhost/NonCors/GetOptions");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("[\"Create\",\"Update\",\"Delete\"]", content);
+            Assert.Empty(response.Headers);
+        }
+
+        [Fact]
+        public async Task PreflightRequestOnNonCorsEnabledController_ExecutesOptionsAction()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(new HttpMethod("OPTIONS"), "http://localhost/NonCors/GetOptions");
+            request.Headers.Add(CorsConstants.Origin, "http://example.com");
+            request.Headers.Add(CorsConstants.AccessControlRequestMethod, "POST");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("[\"Create\",\"Update\",\"Delete\"]", content);
+            Assert.Empty(response.Headers);
+        }
+
+        [Fact]
+        public async Task PreflightRequestOnNonCorsEnabledController_DoesNotMatchTheAction()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(new HttpMethod("OPTIONS"), "http://localhost/NonCors/Post");
+            request.Headers.Add(CorsConstants.Origin, "http://example.com");
+            request.Headers.Add(CorsConstants.AccessControlRequestMethod, "POST");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        [Theory]
+        [InlineData("GET")]
+        [InlineData("HEAD")]
+        [InlineData("POST")]
+        [InlineData("PUT")]
+        public async Task PolicyFailed_Disallows_PreFlightRequest(string method)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod(CorsConstants.PreflightHttpMethod),
+                "http://localhost/Cors/GetBlogComments");
+
+            // Adding a custom header makes it a non-simple request.
+            request.Headers.Add(CorsConstants.Origin, "http://example.com");
+            request.Headers.Add(CorsConstants.AccessControlRequestMethod, method);
+            request.Headers.Add(CorsConstants.AccessControlRequestHeaders, "Custom");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            // MVC applied the policy and since that did not pass, there were no access control headers.
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Empty(response.Headers);
+
+            // It should short circuit and hence no result.
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal(string.Empty, content);
+        }
+
+        [Fact]
+        public async Task SuccessfulCorsRequest_AllowsCredentials_IfThePolicyAllowsCredentials()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                HttpMethod.Put,
+                "http://localhost/Cors/EditUserComment?userComment=abcd");
+
+            // Adding a custom header makes it a non-simple request.
+            request.Headers.Add(CorsConstants.Origin, "http://example.com");
+            request.Headers.Add(CorsConstants.AccessControlExposeHeaders, "exposed1,exposed2");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var responseHeaders = response.Headers;
+            Assert.Equal(
+                new[] { "http://example.com" },
+                responseHeaders.GetValues(CorsConstants.AccessControlAllowOrigin).ToArray());
+            Assert.Equal(
+               new[] { "true" },
+               responseHeaders.GetValues(CorsConstants.AccessControlAllowCredentials).ToArray());
+            Assert.Equal(
+               new[] { "exposed1,exposed2" },
+               responseHeaders.GetValues(CorsConstants.AccessControlExposeHeaders).ToArray());
+
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("abcd", content);
+        }
+
+        [Fact]
+        public async Task SuccessfulPreflightRequest_AllowsCredentials_IfThePolicyAllowsCredentials()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod(CorsConstants.PreflightHttpMethod),
+                "http://localhost/Cors/EditUserComment?userComment=abcd");
+
+            // Adding a custom header makes it a non-simple request.
+            request.Headers.Add(CorsConstants.Origin, "http://example.com");
+            request.Headers.Add(CorsConstants.AccessControlRequestMethod, "PUT");
+            request.Headers.Add(CorsConstants.AccessControlRequestHeaders, "header1,header2");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var responseHeaders = response.Headers;
+            Assert.Equal(
+                new[] { "http://example.com" },
+                responseHeaders.GetValues(CorsConstants.AccessControlAllowOrigin).ToArray());
+            Assert.Equal(
+               new[] { "true" },
+               responseHeaders.GetValues(CorsConstants.AccessControlAllowCredentials).ToArray());
+            Assert.Equal(
+               new[] { "header1,header2" },
+               responseHeaders.GetValues(CorsConstants.AccessControlAllowHeaders).ToArray());
+            Assert.Equal(
+               new[] { "PUT" },
+               responseHeaders.GetValues(CorsConstants.AccessControlAllowMethods).ToArray());
+
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Empty(content);
+        }
+
+        [Fact]
+        public async Task PolicyFailed_Allows_ActualRequest_WithMissingResponseHeaders()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Put, "http://localhost/Cors/GetUserComments");
+
+            // Adding a custom header makes it a non simple request.
+            request.Headers.Add(CorsConstants.Origin, "http://example2.com");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            // MVC applied the policy and since that did not pass, there were no access control headers.
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Empty(response.Headers);
+
+            // It still have executed the action.
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("[\"usercomment1\",\"usercomment2\",\"usercomment3\"]", content);
+        }
+
+        [Theory]
+        [InlineData("GET")]
+        [InlineData("HEAD")]
+        [InlineData("POST")]
+        public async Task DisableCors_ActionsCanOverride_ControllerLevel(string method)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(new HttpMethod(method), "http://localhost/Cors/GetExclusiveContent");
+
+            // Exclusive content is not available on other sites.
+            request.Headers.Add(CorsConstants.Origin, "http://example.com");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            // Since there are no response headers, the client should step in to block the content.
+            Assert.Empty(response.Headers);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("exclusive", content);
+        }
+
+        [Theory]
+        [InlineData("GET")]
+        [InlineData("HEAD")]
+        [InlineData("POST")]
+        public async Task DisableCors_PreFlight_ActionsCanOverride_ControllerLevel(string method)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod(CorsConstants.PreflightHttpMethod),
+                "http://localhost/Cors/GetExclusiveContent");
+
+            // Exclusive content is not available on other sites.
+            request.Headers.Add(CorsConstants.Origin, "http://example.com");
+            request.Headers.Add(CorsConstants.AccessControlRequestMethod, method);
+            request.Headers.Add(CorsConstants.AccessControlRequestHeaders, "Custom");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            // Since there are no response headers, the client should step in to block the content.
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Empty(response.Headers);
+
+            // Nothing gets executed for a pre-flight request.
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Empty(content);
+        }
+
+        [Theory]
+        [InlineData("http://localhost/api/store/actionusingcontrollercorssettings")]
+        [InlineData("http://localhost/api/store/actionwithcorssettings")]
+        public async Task CorsFilter_RunsBeforeOtherAuthorizationFilters(string url)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(new HttpMethod(CorsConstants.PreflightHttpMethod), url);
+
+            // Adding a custom header makes it a non-simple request.
+            request.Headers.Add(CorsConstants.Origin, "http://example.com");
+            request.Headers.Add(CorsConstants.AccessControlRequestMethod, "GET");
+            request.Headers.Add(CorsConstants.AccessControlRequestHeaders, "Custom");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var responseHeaders = response.Headers;
+            Assert.Equal(
+                new[] { "http://example.com" },
+                responseHeaders.GetValues(CorsConstants.AccessControlAllowOrigin).ToArray());
+            Assert.Equal(
+               new[] { "true" },
+               responseHeaders.GetValues(CorsConstants.AccessControlAllowCredentials).ToArray());
+            Assert.Equal(
+               new[] { "Custom" },
+               responseHeaders.GetValues(CorsConstants.AccessControlAllowHeaders).ToArray());
+
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Empty(content);
+        }
+
+        [Fact]
+        public async Task DisableCorsFilter_RunsBeforeOtherAuthorizationFilters()
+        {
+            // Controller has an authorization filter and Cors filter and the action has a DisableCors filter
+            // In this scenario, the CorsFilter should be executed before any other authorization filters
+            // i.e irrespective of where the Cors filter is applied(controller or action), Cors filters must
+            // always be executed before any other type of authorization filters.
+
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod(CorsConstants.PreflightHttpMethod),
+                "http://localhost/api/store/actionwithcorsdisabled");
+
+            // Adding a custom header makes it a non-simple request.
+            request.Headers.Add(CorsConstants.Origin, "http://example.com");
+            request.Headers.Add(CorsConstants.AccessControlRequestMethod, "GET");
+            request.Headers.Add(CorsConstants.AccessControlRequestHeaders, "Custom");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Empty(response.Headers);
+
+            // Nothing gets executed for a pre-flight request.
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Empty(content);
+        }
+
+        [Fact]
+        public async Task CorsFilter_OnAction_PreferredOverController_AndAuthorizationFiltersRunAfterCors()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod(CorsConstants.PreflightHttpMethod),
+                "http://localhost/api/store/actionwithdifferentcorspolicy");
+            request.Headers.Add(CorsConstants.Origin, "http://notexpecteddomain.com");
+            request.Headers.Add(CorsConstants.AccessControlRequestMethod, "GET");
+            request.Headers.Add(CorsConstants.AccessControlRequestHeaders, "Custom");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Empty(response.Headers);
+
+            // Nothing gets executed for a pre-flight request.
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Empty(content);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DefaultOrderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DefaultOrderTest.cs
new file mode 100644
index 0000000000..676ff499fa
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DefaultOrderTest.cs
@@ -0,0 +1,53 @@
+// 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.
+
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    // Tests that various MVC services have the correct order.
+    public class DefaultOrderTest : IClassFixture<MvcTestFixture<BasicWebSite.Startup>>
+    {
+        public DefaultOrderTest(MvcTestFixture<BasicWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Theory]
+        [InlineData(typeof(IActionDescriptorProvider), typeof(ControllerActionDescriptorProvider), -1000)]
+        [InlineData(typeof(IActionInvokerProvider), null, -1000)]
+        [InlineData(typeof(IApiDescriptionProvider), null, -1000)]
+        [InlineData(typeof(IFilterProvider), null, -1000)]
+        [InlineData(typeof(IActionConstraintProvider), null, -1000)]
+        public async Task ServiceOrder_GetOrder(Type serviceType, Type actualType, int order)
+        {
+            // Arrange
+            var url = "http://localhost/Order/GetServiceOrder?serviceType=" + serviceType.AssemblyQualifiedName;
+
+            if (actualType != null)
+            {
+                url += "&actualType=" + actualType.AssemblyQualifiedName;
+            }
+
+            // Act
+            var response = await Client.GetAsync(url);
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(order, int.Parse(content));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DefaultValuesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DefaultValuesTest.cs
new file mode 100644
index 0000000000..da39f5f4ca
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DefaultValuesTest.cs
@@ -0,0 +1,106 @@
+// 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.
+
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class DefaultValuesTest : IClassFixture<MvcTestFixture<BasicWebSite.Startup>>
+    {
+        public DefaultValuesTest(MvcTestFixture<BasicWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task Controller_WithDefaultValueAttribut_ReturnsDefault()
+        {
+            // Arrange
+            var expected = "hello";
+            var url = "http://localhost/DefaultValues/EchoValue_DefaultValueAttribute";
+
+            // Act
+            var response = await Client.GetStringAsync(url);
+
+            // Assert
+            Assert.Equal(expected, response);
+        }
+
+        [Fact]
+        public async Task Controller_WithDefaultValueAttribute_ReturnsModelBoundValues()
+        {
+            // Arrange
+            var expected = "cool";
+            var url = "http://localhost/DefaultValues/EchoValue_DefaultValueAttribute?input=cool";
+
+            // Act
+            var response = await Client.GetStringAsync(url);
+
+            // Assert
+            Assert.Equal(expected, response);
+        }
+
+        [Fact]
+        public async Task Controller_WithDefaultParameterValue_ReturnsDefault()
+        {
+            // Arrange
+            var expected = "world";
+            var url = "http://localhost/DefaultValues/EchoValue_DefaultParameterValue";
+
+            // Act
+            var response = await Client.GetStringAsync(url);
+
+            // Assert
+            Assert.Equal(expected, response);
+        }
+
+        [Fact]
+        public async Task Controller_WithDefaultParameterValue_ReturnsModelBoundValues()
+        {
+            // Arrange
+            var expected = "cool";
+            var url = "http://localhost/DefaultValues/EchoValue_DefaultParameterValue?input=cool";
+
+            // Act
+            var response = await Client.GetStringAsync(url);
+
+            // Assert
+            Assert.Equal(expected, response);
+        }
+
+        [Fact]
+        public async Task Controller_WithDefaultParameterValues_ForStructs_ReturnsDefaults()
+        {
+            // Arrange
+            var expected = $"{default(Guid)}, {default(TimeSpan)}";
+            var url = "http://localhost/DefaultValues/EchoValue_DefaultParameterValue_ForStructs";
+
+            // Act
+            var response = await Client.GetStringAsync(url);
+
+            // Assert
+            Assert.Equal(expected, response);
+        }
+
+        [Fact]
+        public async Task Controller_WithDefaultParameterValues_ForStructs_ReturnsBoundValues()
+        {
+            // Arrange
+            Guid guid = Guid.NewGuid();
+            TimeSpan timeSpan = new TimeSpan(10, 10, 10);
+            var expected = $"{guid}, {timeSpan}";
+            var url = $"http://localhost/DefaultValues/EchoValue_DefaultParameterValue_ForStructs?guid={guid}&timespan={timeSpan}";
+
+            // Act
+            var response = await Client.GetStringAsync(url);
+
+            // Assert
+            Assert.Equal(expected, response);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DirectivesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DirectivesTest.cs
new file mode 100644
index 0000000000..15ebfe4e45
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DirectivesTest.cs
@@ -0,0 +1,61 @@
+// 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.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class DirectivesTest : IClassFixture<MvcTestFixture<RazorWebSite.Startup>>
+    {
+        public DirectivesTest(MvcTestFixture<RazorWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task ViewsInheritsUsingsAndInjectDirectivesFromViewStarts()
+        {
+            // Arrange
+            var expected = "Hello Person1";
+
+            // Act
+            var body = await Client.GetStringAsync(
+                "http://localhost/Directives/ViewInheritsInjectAndUsingsFromViewImports");
+
+            // Assert
+            Assert.Equal(expected, body.Trim());
+        }
+
+        [Fact]
+        public async Task ViewInheritsBasePageFromViewStarts()
+        {
+            // Arrange
+            var expected = "WriteLiteral says:layout:Write says:Write says:Hello Person2";
+
+            // Act
+            var body = await Client.GetStringAsync("http://localhost/Directives/ViewInheritsBasePageFromViewImports");
+
+            // Assert
+            Assert.Equal(expected, body.Trim());
+        }
+
+        [Fact]
+        public async Task ViewAndViewComponentsReplaceTModelTokenFromInheritedBasePages()
+        {
+            // Arrange
+            var expected =
+@"WriteLiteral says:<h1>Write says:BobWriteLiteral says:</h1>
+Write says:WriteLiteral says:<strong>Write says:98052WriteLiteral says:</strong>";
+
+            // Act
+            var body = await Client.GetStringAsync("Directives/ViewReplacesTModelTokenFromInheritedBasePages");
+
+            // Assert
+            Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DoNotRespectBrowserAcceptHeaderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DoNotRespectBrowserAcceptHeaderTests.cs
new file mode 100644
index 0000000000..b446613c26
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DoNotRespectBrowserAcceptHeaderTests.cs
@@ -0,0 +1,142 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Formatters.Xml;
+using Microsoft.AspNetCore.Testing.xunit;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    /// <summary>
+    /// These tests are for scenarios when <see cref="MvcOptions.RespectBrowserAcceptHeader"/> is <c>False</c>, which is the default.
+    /// </summary>
+    public class DoNotRespectBrowserAcceptHeaderTests : IClassFixture<MvcTestFixture<FormatterWebSite.Startup>>
+    {
+        public DoNotRespectBrowserAcceptHeaderTests(MvcTestFixture<FormatterWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Theory]
+        [InlineData("application/xml,*/*;q=0.2")]
+        [InlineData("application/xml,*/*")]
+        public async Task AllMediaRangeAcceptHeader_FirstFormatterInListWritesResponse(string acceptHeader)
+        {
+            // Arrange
+            var request = RequestWithAccept("http://localhost/DoNotRespectBrowserAcceptHeader/EmployeeInfo", acceptHeader);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("application/json; charset=utf-8", response.Content.Headers.ContentType.ToString());
+            var responseData = await response.Content.ReadAsStringAsync();
+            Assert.Equal("{\"id\":10,\"name\":\"John\"}", responseData);
+        }
+
+        [ConditionalTheory]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        [InlineData("application/xml,*/*;q=0.2")]
+        [InlineData("application/xml,*/*")]
+        public async Task AllMediaRangeAcceptHeader_ProducesAttributeIsHonored(string acceptHeader)
+        {
+            // Arrange
+            var request = RequestWithAccept(
+                "http://localhost/DoNotRespectBrowserAcceptHeader/EmployeeInfoWithProduces",
+                acceptHeader);
+            var expectedResponseData =
+                "<DoNotRespectBrowserAcceptHeaderController.Employee xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+                " xmlns=\"http://schemas.datacontract.org/2004/07/FormatterWebSite.Controllers\"><Id>20</Id><Name>Mike" +
+                "</Name></DoNotRespectBrowserAcceptHeaderController.Employee>";
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("application/xml; charset=utf-8", response.Content.Headers.ContentType.ToString());
+            var responseData = await response.Content.ReadAsStringAsync();
+            XmlAssert.Equal(expectedResponseData, responseData);
+        }
+
+        [ConditionalTheory]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        [InlineData("application/xml,*/*;q=0.2")]
+        [InlineData("application/xml,*/*")]
+        public async Task AllMediaRangeAcceptHeader_WithContentTypeHeader_ContentTypeIsIgnored(string acceptHeader)
+        {
+            // Arrange
+            var requestData =
+                "<DoNotRespectBrowserAcceptHeaderController.Employee xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+                " xmlns=\"http://schemas.datacontract.org/2004/07/FormatterWebSite.Controllers\"><Id>35</Id><Name>Jimmy" +
+                "</Name></DoNotRespectBrowserAcceptHeaderController.Employee>";
+            var expectedResponseData = @"{""id"":35,""name"":""Jimmy""}";
+            var request = RequestWithAccept("http://localhost/DoNotRespectBrowserAcceptHeader/CreateEmployee", acceptHeader);
+            request.Content = new StringContent(requestData, Encoding.UTF8, "application/xml");
+            request.Method = HttpMethod.Post;
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content);
+            Assert.NotNull(response.Content.Headers.ContentType);
+
+            // Site uses default output formatter (ignores Accept header) because that header contained a wildcard match.
+            Assert.Equal("application/json; charset=utf-8", response.Content.Headers.ContentType.ToString());
+
+            var responseData = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedResponseData, responseData);
+        }
+
+        [ConditionalTheory]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        [InlineData("application/xml,application/json;q=0.2")]
+        [InlineData("application/xml,application/json")]
+        public async Task AllMediaRangeAcceptHeader_WithExactMatch_ReturnsExpectedContent(string acceptHeader)
+        {
+            // Arrange
+            var requestData =
+                "<DoNotRespectBrowserAcceptHeaderController.Employee xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+                " xmlns=\"http://schemas.datacontract.org/2004/07/FormatterWebSite.Controllers\"><Id>35</Id><Name>Jimmy" +
+                "</Name></DoNotRespectBrowserAcceptHeaderController.Employee>";
+            var request = RequestWithAccept("http://localhost/DoNotRespectBrowserAcceptHeader/CreateEmployee", acceptHeader);
+            request.Content = new StringContent(requestData, Encoding.UTF8, "application/xml");
+            request.Method = HttpMethod.Post;
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("application/xml; charset=utf-8", response.Content.Headers.ContentType.ToString());
+            var responseData = await response.Content.ReadAsStringAsync();
+            Assert.Equal(requestData, responseData);
+        }
+
+        private static HttpRequestMessage RequestWithAccept(string url, string accept)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            request.Headers.Add("Accept", accept);
+
+            return request;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ErrorPageTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ErrorPageTests.cs
new file mode 100644
index 0000000000..644a4ac067
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ErrorPageTests.cs
@@ -0,0 +1,148 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    /// <summary>
+    /// Functional test to verify the error reporting of Razor compilation by diagnostic middleware.
+    /// </summary>
+    public class ErrorPageTests : IClassFixture<MvcTestFixture<ErrorPageMiddlewareWebSite.Startup>>
+    {
+        private static readonly string PreserveCompilationContextMessage = HtmlEncoder.Default.Encode(
+            "One or more compilation references are missing. Ensure that your project is referencing " +
+            "'Microsoft.NET.Sdk.Web' and the 'PreserveCompilationContext' property is not set to false.");
+        public ErrorPageTests(MvcTestFixture<ErrorPageMiddlewareWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task CompilationFailuresAreListedByErrorPageMiddleware()
+        {
+            // Arrange
+            var action = "CompilationFailure";
+            var expected = "Cannot implicitly convert type &#x27;int&#x27; to &#x27;string&#x27;";
+            var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/" + action);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
+            Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Contains($"{action}.cshtml", content);
+            Assert.Contains(expected, content);
+            Assert.DoesNotContain(PreserveCompilationContextMessage, content);
+        }
+
+        [Fact]
+        public async Task ParseFailuresAreListedByErrorPageMiddleware()
+        {
+            // Arrange
+            var action = "ParserError";
+            var expected = "The code block is missing a closing &quot;}&quot; character.  Make sure you " +
+            "have a matching &quot;}&quot; character for all the &quot;{&quot; characters " +
+            "within this block, and that none of the &quot;}&quot; characters are being " +
+            "interpreted as markup.";
+            var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");
+
+            // Act
+            var response = await Client.GetAsync(action);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
+            Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Contains($"{action}.cshtml", content);
+            Assert.Contains(expected, content);
+        }
+
+        [Fact]
+        public async Task CompilationFailuresFromViewImportsAreListed()
+        {
+            // Arrange
+            var expectedMessage = "The type or namespace name &#x27;NamespaceDoesNotExist&#x27; could not be found ("
+                + "are you missing a using directive or an assembly reference?)";
+            var expectedCompilationContent = "public class Views_ErrorFromViewImports_Index : "
+                + "global::Microsoft.AspNetCore.Mvc.Razor.RazorPage&lt;dynamic&gt;";
+            var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/ErrorFromViewImports");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
+            Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Contains("_ViewImports.cshtml", content);
+            Assert.Contains(expectedMessage, content);
+            Assert.Contains(PreserveCompilationContextMessage, content);
+            Assert.Contains(expectedCompilationContent, content);
+        }
+
+        [Fact]
+        public async Task RuntimeErrorAreListedByErrorPageMiddleware()
+        {
+            // Arrange
+            var expectedMessage = HtmlEncoder.Default.Encode("throw new Exception(\"Error from view\");");
+            var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/RuntimeError");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
+            Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Contains("RuntimeError.cshtml", content);
+            Assert.Contains(expectedMessage, content);
+        }
+
+        [Fact]
+        public async Task LoaderExceptionsFromReflectionTypeLoadExceptionsAreListed()
+        {
+            // Arrange
+            var expectedMessage = "Custom Loader Exception.";
+            var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/LoaderException");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
+            Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Contains("Loader Exceptions:", content);
+            Assert.Contains(expectedMessage, content);
+        }
+
+        [Fact]
+        public async void AggregateException_FlattensInnerExceptions()
+        {
+            // Arrange
+            var aggregateException = "AggregateException: One or more errors occurred.";
+            var nullReferenceException = "NullReferenceException: Foo cannot be null";
+            var indexOutOfRangeException = "IndexOutOfRangeException: Index is out of range";
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/AggregateException");
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Contains(aggregateException, content);
+            Assert.Contains(nullReferenceException, content);
+            Assert.Contains(indexOutOfRangeException, content);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ExceptionInfo.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ExceptionInfo.cs
new file mode 100644
index 0000000000..163fb82133
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ExceptionInfo.cs
@@ -0,0 +1,16 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    /// <summary>
+    /// Information about an exception that occurred on the server side of a functional
+    /// test.
+    /// </summary>
+    public class ExceptionInfo
+    {
+        public string ExceptionMessage { get; set; }
+
+        public string ExceptionType { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FileResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FileResultTests.cs
new file mode 100644
index 0000000000..f49cc631fa
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FileResultTests.cs
@@ -0,0 +1,883 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Testing.xunit;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class FileResultTests : IClassFixture<MvcTestFixture<FilesWebSite.Startup>>
+    {
+        public FileResultTests(MvcTestFixture<FilesWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [ConditionalFact]
+        // https://github.com/aspnet/Mvc/issues/2727
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task FileFromDisk_CanBeEnabled_WithMiddleware()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/DownloadFiles/DownloadFromDisk");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.NotNull(body);
+            Assert.Equal("This is a sample text file", body);
+        }
+
+        [Theory]
+        [InlineData(0, 6, "This is")]
+        [InlineData(17, 25, "text file")]
+        [InlineData(0, 50, "This is a sample text file")]
+        public async Task FileFromDisk_CanBeEnabled_WithMiddleware_RangeRequest(long start, long end, string expectedBody)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/DownloadFiles/DownloadFromDisk");
+            httpRequestMessage.Headers.Range = new RangeHeaderValue(start, end);
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.PartialContent, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.NotNull(body);
+            Assert.Equal(expectedBody, body);
+        }
+
+        [Theory]
+        [InlineData("0-6")]
+        [InlineData("bytes = ")]
+        [InlineData("bytes = 1-4, 5-11")]
+        public async Task FileFromDisk_CanBeEnabled_WithMiddleware_RangeRequestIgnored(string rangeString)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/DownloadFiles/DownloadFromDisk");
+            httpRequestMessage.Headers.TryAddWithoutValidation("Range", rangeString);
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("This is a sample text file", body);
+        }
+
+        [Theory]
+        [InlineData("bytes = 35-36")]
+        [InlineData("bytes = -0")]
+        public async Task FileFromDisk_CanBeEnabled_WithMiddleware_RangeRequestNotSatisfiable(string rangeString)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/DownloadFiles/DownloadFromDisk");
+            httpRequestMessage.Headers.TryAddWithoutValidation("Range", rangeString);
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.RequestedRangeNotSatisfiable, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Empty(body);
+        }
+
+        [Theory]
+        [InlineData(0, 6, "This is")]
+        [InlineData(17, 25, "text file")]
+        [InlineData(0, 50, "This is a sample text file")]
+        public async Task FileFromDisk_CanBeEnabled_WithMiddleware_RangeRequest_WithLastModifiedAndEtag(long start, long end, string expectedBody)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/DownloadFiles/DownloadFromDisk_WithLastModifiedAndEtag");
+            httpRequestMessage.Headers.Range = new RangeHeaderValue(start, end);
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.PartialContent, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.NotNull(body);
+            Assert.Equal(expectedBody, body);
+        }
+
+        [Theory]
+        [InlineData("0-6")]
+        [InlineData("bytes = ")]
+        [InlineData("bytes = 1-4, 5-11")]
+        public async Task FileFromDisk_CanBeEnabled_WithMiddleware_RangeRequestIgnored_WithLastModifiedAndEtag(string rangeString)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/DownloadFiles/DownloadFromDiskWithFileName_WithLastModifiedAndEtag");
+            httpRequestMessage.Headers.TryAddWithoutValidation("Range", rangeString);
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("This is a sample text file", body);
+        }
+
+        [Theory]
+        [InlineData("bytes = 35-36")]
+        [InlineData("bytes = -0")]
+        public async Task FileFromDisk_CanBeEnabled_WithMiddleware_RangeRequestNotSatisfiable_WithLastModifiedAndEtag(string rangeString)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/DownloadFiles/DownloadFromDiskWithFileName_WithLastModifiedAndEtag");
+            httpRequestMessage.Headers.TryAddWithoutValidation("Range", rangeString);
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.RequestedRangeNotSatisfiable, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Empty(body);
+        }
+
+        [ConditionalFact]
+        // https://github.com/aspnet/Mvc/issues/2727
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task FileFromDisk_ReturnsFileWithFileName()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/DownloadFiles/DownloadFromDiskWithFileName");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.NotNull(body);
+            Assert.Equal("This is a sample text file", body);
+
+            var contentDisposition = response.Content.Headers.ContentDisposition.ToString();
+            Assert.NotNull(contentDisposition);
+            Assert.Equal("attachment; filename=downloadName.txt; filename*=UTF-8''downloadName.txt", contentDisposition);
+        }
+
+        [Theory]
+        [InlineData("GET", "This is a sample text file")]
+        [InlineData("HEAD", "")]
+        public async Task FileFromDisk_ReturnsFileWithFileName_RangeProcessingNotEnabled_RangeRequestedIgnored(string httpMethod, string expectedBody)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(new HttpMethod(httpMethod), "http://localhost/DownloadFiles/DownloadFromDiskWithFileName");
+            httpRequestMessage.Headers.Range = new RangeHeaderValue(0, 6);
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, body);
+        }
+
+        [Fact]
+        public async Task FileFromDisk_ReturnsFileWithFileName_IfRangeHeaderValid_RangeRequest_WithLastModifiedAndEtag()
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/DownloadFiles/DownloadFromDiskWithFileName_WithLastModifiedAndEtag");
+            httpRequestMessage.Headers.Range = new RangeHeaderValue(0, 6);
+            httpRequestMessage.Headers.IfRange = new RangeConditionHeaderValue(new EntityTagHeaderValue("\"Etag\""));
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.PartialContent, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.NotNull(body);
+            Assert.Equal("This is", body);
+        }
+
+        [Fact]
+        public async Task FileFromDisk_ReturnsFileWithFileName_IfRangeHeaderInvalid_RangeRequestIgnored_WithLastModifiedAndEtag()
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/DownloadFiles/DownloadFromDiskWithFileName_WithLastModifiedAndEtag");
+            httpRequestMessage.Headers.Range = new RangeHeaderValue(0, 6);
+            httpRequestMessage.Headers.IfRange = new RangeConditionHeaderValue(new EntityTagHeaderValue("\"NotEtag\""));
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("This is a sample text file", body);
+        }
+
+        [Theory]
+        [InlineData("", HttpStatusCode.OK, 26)]
+        [InlineData("bytes = 0-6", HttpStatusCode.PartialContent, 7)]
+        [InlineData("bytes = 17-25", HttpStatusCode.PartialContent, 9)]
+        [InlineData("bytes = 0-50", HttpStatusCode.PartialContent, 26)]
+        [InlineData("0-6", HttpStatusCode.OK, 26)]
+        [InlineData("bytes = ", HttpStatusCode.OK, 26)]
+        [InlineData("bytes = 1-4, 5-11", HttpStatusCode.OK, 26)]
+        [InlineData("bytes = 35-36", HttpStatusCode.RequestedRangeNotSatisfiable, 26)]
+        [InlineData("bytes = -0", HttpStatusCode.RequestedRangeNotSatisfiable, 26)]
+        public async Task FileFromDisk_ReturnsFileWithFileName_DoesNotServeBody_ForHeadRequest_WithLastModifiedAndEtag(string rangeString, HttpStatusCode httpStatusCode, int expectedContentLength)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Head, "http://localhost/DownloadFiles/DownloadFromDiskWithFileName_WithLastModifiedAndEtag");
+            httpRequestMessage.Headers.TryAddWithoutValidation("Range", rangeString);
+            httpRequestMessage.Headers.IfRange = new RangeConditionHeaderValue(new EntityTagHeaderValue("\"Etag\""));
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(httpStatusCode, response.StatusCode);
+
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.NotNull(body);
+            Assert.Equal(string.Empty, body);
+
+            var contentLength = response.Content.Headers.ContentLength;
+            Assert.Equal(expectedContentLength, contentLength);
+
+            var contentDisposition = response.Content.Headers.ContentDisposition.ToString();
+            Assert.NotNull(contentDisposition);
+            Assert.Equal("attachment; filename=downloadName.txt; filename*=UTF-8''downloadName.txt", contentDisposition);
+        }
+
+        [Fact]
+        public async Task FileFromStream_ReturnsFile()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/DownloadFiles/DownloadFromStream");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.NotNull(body);
+            Assert.Equal("This is sample text from a stream", body);
+        }
+
+        [Theory]
+        [InlineData(0, 6, "This is")]
+        [InlineData(25, 32, "a stream")]
+        [InlineData(0, 50, "This is sample text from a stream")]
+        public async Task FileFromStream_ReturnsFile_RangeRequest(long start, long end, string expectedBody)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/DownloadFiles/DownloadFromStream");
+            httpRequestMessage.Headers.Range = new RangeHeaderValue(start, end);
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.NotNull(body);
+            Assert.Equal(HttpStatusCode.PartialContent, response.StatusCode);
+            Assert.Equal(expectedBody, body);
+        }
+
+        [Theory]
+        [InlineData("0-6")]
+        [InlineData("bytes = ")]
+        [InlineData("bytes = 1-4, 5-11")]
+        public async Task FileFromStream_ReturnsFile_RangeRequestIgnored(string rangeString)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/DownloadFiles/DownloadFromStream");
+            httpRequestMessage.Headers.TryAddWithoutValidation("Range", rangeString);
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("This is sample text from a stream", body);
+        }
+
+        [Theory]
+        [InlineData("bytes = 35-36")]
+        [InlineData("bytes = -0")]
+        public async Task FileFromStream_ReturnsFile_RangeRequestNotSatisfiable(string rangeString)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/DownloadFiles/DownloadFromStream");
+            httpRequestMessage.Headers.TryAddWithoutValidation("Range", rangeString);
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+            var body = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.RequestedRangeNotSatisfiable, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            Assert.Empty(body);
+        }
+
+        [Fact]
+        public async Task FileFromStream_ReturnsFileWithFileName()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/DownloadFiles/DownloadFromStreamWithFileName");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.NotNull(body);
+            Assert.Equal("This is sample text from a stream", body);
+
+            var contentDisposition = response.Content.Headers.ContentDisposition.ToString();
+            Assert.NotNull(contentDisposition);
+            Assert.Equal("attachment; filename=downloadName.txt; filename*=UTF-8''downloadName.txt", contentDisposition);
+        }
+
+        [Theory]
+        [InlineData("GET", "This is sample text from a stream")]
+        [InlineData("HEAD", "")]
+        public async Task FileFromStream_ReturnsFileWithFileName_RangeProcessingNotEnabled_RangeRequestedIgnored(string httpMethod, string expectedBody)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(new HttpMethod(httpMethod), "http://localhost/DownloadFiles/DownloadFromStreamWithFileName");
+            httpRequestMessage.Headers.Range = new RangeHeaderValue(0, 6);
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, body);
+        }
+
+        [Fact]
+        public async Task FileFromStream_ReturnsFileWithFileName_IfRangeHeaderValid_RangeRequest()
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/DownloadFiles/DownloadFromStreamWithFileName_WithEtag");
+            httpRequestMessage.Headers.Range = new RangeHeaderValue(0, 6);
+            httpRequestMessage.Headers.IfRange = new RangeConditionHeaderValue(new EntityTagHeaderValue("\"Etag\""));
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+            var body = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            Assert.NotNull(body);
+            Assert.Equal(HttpStatusCode.PartialContent, response.StatusCode);
+            Assert.Equal("This is", body);
+        }
+
+        [Fact]
+        public async Task FileFromStream_ReturnsFileWithFileName_IfRangeHeaderInvalid_RangeRequestNotSatisfiable()
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/DownloadFiles/DownloadFromStreamWithFileName_WithEtag");
+            httpRequestMessage.Headers.Range = new RangeHeaderValue(0, 6);
+            httpRequestMessage.Headers.IfRange = new RangeConditionHeaderValue(new EntityTagHeaderValue("\"NotEtag\""));
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("This is sample text from a stream", body);
+        }
+
+        [Theory]
+        [InlineData("", HttpStatusCode.OK, 33)]
+        [InlineData("bytes = 0-6", HttpStatusCode.PartialContent, 7)]
+        [InlineData("bytes = 17-25", HttpStatusCode.PartialContent, 9)]
+        [InlineData("bytes = 0-50", HttpStatusCode.PartialContent, 33)]
+        [InlineData("0-6", HttpStatusCode.OK, 33)]
+        [InlineData("bytes = ", HttpStatusCode.OK, 33)]
+        [InlineData("bytes = 1-4, 5-11", HttpStatusCode.OK, 33)]
+        [InlineData("bytes = 35-36", HttpStatusCode.RequestedRangeNotSatisfiable, 33)]
+        [InlineData("bytes = -0", HttpStatusCode.RequestedRangeNotSatisfiable, 33)]
+        public async Task FileFromStream_ReturnsFileWithFileName_DoesNotServeBody_ForHeadRequest(string rangeString, HttpStatusCode httpStatusCode, int expectedContentLength)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Head, "http://localhost/DownloadFiles/DownloadFromStreamWithFileName_WithEtag");
+            httpRequestMessage.Headers.TryAddWithoutValidation("Range", rangeString);
+            httpRequestMessage.Headers.IfRange = new RangeConditionHeaderValue(new EntityTagHeaderValue("\"Etag\""));
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(httpStatusCode, response.StatusCode);
+
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.NotNull(body);
+            Assert.Equal(string.Empty, body);
+
+            var contentLength = response.Content.Headers.ContentLength;
+            Assert.Equal(expectedContentLength, contentLength);
+
+            var contentDisposition = response.Content.Headers.ContentDisposition.ToString();
+            Assert.NotNull(contentDisposition);
+            Assert.Equal("attachment; filename=downloadName.txt; filename*=UTF-8''downloadName.txt", contentDisposition);
+        }
+
+        [Fact]
+        public async Task FileFromBinaryData_ReturnsFile()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/DownloadFiles/DownloadFromBinaryData");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.NotNull(body);
+            Assert.Equal("This is a sample text from a binary array", body);
+        }
+
+        [Theory]
+        [InlineData(0, 6, "This is")]
+        [InlineData(29, 40, "binary array")]
+        [InlineData(0, 50, "This is a sample text from a binary array")]
+        public async Task FileFromBinaryData_ReturnsFile_RangeRequest(long start, long end, string expectedBody)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/DownloadFiles/DownloadFromBinaryData");
+            httpRequestMessage.Headers.Range = new RangeHeaderValue(start, end);
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+            var body = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            Assert.NotNull(body);
+            Assert.Equal(HttpStatusCode.PartialContent, response.StatusCode);
+            Assert.Equal(expectedBody, body);
+        }
+
+        [Theory]
+        [InlineData("0-6")]
+        [InlineData("bytes = ")]
+        [InlineData("bytes = 1-4, 5-11")]
+        public async Task FileFromBinaryData_ReturnsFile_RangeRequestIgnored(string rangeString)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/DownloadFiles/DownloadFromBinaryData");
+            httpRequestMessage.Headers.TryAddWithoutValidation("Range", rangeString);
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("This is a sample text from a binary array", body);
+        }
+
+        [Theory]
+        [InlineData("bytes = 45-46")]
+        [InlineData("bytes = -0")]
+        public async Task FileFromBinaryData_ReturnsFile_RangeRequestNotSatisfiable(string rangeString)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/DownloadFiles/DownloadFromBinaryData");
+            httpRequestMessage.Headers.TryAddWithoutValidation("Range", rangeString);
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+            var body = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            Assert.NotNull(body);
+            Assert.Equal(HttpStatusCode.RequestedRangeNotSatisfiable, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            Assert.Empty(body);
+        }
+
+        [Fact]
+        public async Task FileFromBinaryData_ReturnsFileWithFileName()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/DownloadFiles/DownloadFromBinaryDataWithFileName");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.NotNull(body);
+            Assert.Equal("This is a sample text from a binary array", body);
+
+            var contentDisposition = response.Content.Headers.ContentDisposition.ToString();
+            Assert.NotNull(contentDisposition);
+            Assert.Equal("attachment; filename=downloadName.txt; filename*=UTF-8''downloadName.txt", contentDisposition);
+        }
+
+        [Theory]
+        [InlineData("GET", "This is a sample text from a binary array")]
+        [InlineData("HEAD", "")]
+        public async Task FileFromBinaryData_ReturnsFileWithFileName_RangeProcessingNotEnabled_RangeRequestedIgnored(string httpMethod, string expectedBody)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(new HttpMethod(httpMethod), "http://localhost/DownloadFiles/DownloadFromBinaryDataWithFileName");
+            httpRequestMessage.Headers.Range = new RangeHeaderValue(0, 6);
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, body);
+        }
+
+        [Fact]
+        public async Task FileFromBinaryData_ReturnsFileWithFileName_IfRangeHeaderValid()
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/DownloadFiles/DownloadFromBinaryDataWithFileName_WithEtag");
+            httpRequestMessage.Headers.Range = new RangeHeaderValue(0, 6);
+            httpRequestMessage.Headers.IfRange = new RangeConditionHeaderValue(new EntityTagHeaderValue("\"Etag\""));
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+            var body = await response.Content.ReadAsStringAsync();
+
+            // Assert           
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            Assert.NotNull(body);
+            Assert.Equal(HttpStatusCode.PartialContent, response.StatusCode);
+            Assert.Equal("This is", body);
+        }
+
+        [Fact]
+        public async Task FileFromBinaryData_ReturnsFileWithFileName_IfRangeHeaderInvalid_RangeRequestIgnored()
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/DownloadFiles/DownloadFromBinaryDataWithFileName_WithEtag");
+            httpRequestMessage.Headers.Range = new RangeHeaderValue(0, 6);
+            httpRequestMessage.Headers.IfRange = new RangeConditionHeaderValue(new EntityTagHeaderValue("\"NotEtag\""));
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("This is a sample text from a binary array", body);
+        }
+
+        [Theory]
+        [InlineData("", HttpStatusCode.OK, 41)]
+        [InlineData("bytes = 0-6", HttpStatusCode.PartialContent, 7)]
+        [InlineData("bytes = 17-25", HttpStatusCode.PartialContent, 9)]
+        [InlineData("bytes = 0-50", HttpStatusCode.PartialContent, 41)]
+        [InlineData("0-6", HttpStatusCode.OK, 41)]
+        [InlineData("bytes = ", HttpStatusCode.OK, 41)]
+        [InlineData("bytes = 1-4, 5-11", HttpStatusCode.OK, 41)]
+        [InlineData("bytes = 45-46", HttpStatusCode.RequestedRangeNotSatisfiable, 41)]
+        [InlineData("bytes = -0", HttpStatusCode.RequestedRangeNotSatisfiable, 41)]
+        public async Task FileFromBinaryData_ReturnsFileWithFileName_DoesNotServeBody_ForHeadRequest(string rangeString, HttpStatusCode httpStatusCode, int expectedContentLength)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Head, "http://localhost/DownloadFiles/DownloadFromBinaryDataWithFileName_WithEtag");
+            httpRequestMessage.Headers.TryAddWithoutValidation("Range", rangeString);
+            httpRequestMessage.Headers.IfRange = new RangeConditionHeaderValue(new EntityTagHeaderValue("\"Etag\""));
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(httpStatusCode, response.StatusCode);
+
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.NotNull(body);
+            Assert.Equal(string.Empty, body);
+
+            var contentLength = response.Content.Headers.ContentLength;
+            Assert.Equal(expectedContentLength, contentLength);
+
+            var contentDisposition = response.Content.Headers.ContentDisposition.ToString();
+            Assert.NotNull(contentDisposition);
+            Assert.Equal("attachment; filename=downloadName.txt; filename*=UTF-8''downloadName.txt", contentDisposition);
+        }
+
+        [Fact]
+        public async Task FileFromEmbeddedResources_ReturnsFileWithFileName()
+        {
+            // Arrange
+            var expectedBody = "Sample text file as embedded resource.";
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/EmbeddedFiles/DownloadFileWithFileName");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.NotNull(body);
+            Assert.Equal(expectedBody, body);
+
+            var contentDisposition = response.Content.Headers.ContentDisposition.ToString();
+            Assert.NotNull(contentDisposition);
+            Assert.Equal("attachment; filename=downloadName.txt; filename*=UTF-8''downloadName.txt", contentDisposition);
+        }
+
+        [Theory]
+        [InlineData(0, 6, "Sample ")]
+        [InlineData(20, 37, "embedded resource.")]
+        [InlineData(7, 50, "text file as embedded resource.")]
+        public async Task FileFromEmbeddedResources_ReturnsFileWithFileName_RangeRequest(long start, long end, string expectedBody)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/EmbeddedFiles/DownloadFileWithFileName");
+            httpRequestMessage.Headers.Range = new RangeHeaderValue(start, end);
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.PartialContent, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.NotNull(body);
+            Assert.Equal(expectedBody, body);
+            var contentDisposition = response.Content.Headers.ContentDisposition.ToString();
+            Assert.NotNull(contentDisposition);
+            Assert.Equal("attachment; filename=downloadName.txt; filename*=UTF-8''downloadName.txt", contentDisposition);
+        }
+
+        [Theory]
+        [InlineData("GET", "Sample text file as embedded resource.")]
+        [InlineData("HEAD", "")]
+        public async Task FileFromEmbeddedResources_ReturnsFileWithFileName_RangeProcessingNotEnabled_RangeRequestedIgnored(string httpMethod, string expectedBody)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(new HttpMethod(httpMethod), "http://localhost/EmbeddedFiles/DownloadFileWithFileName_RangeProcessingNotEnabled");
+            httpRequestMessage.Headers.Range = new RangeHeaderValue(0, 6);
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, body);
+        }
+
+        [Fact]
+        public async Task FileFromEmbeddedResources_ReturnsFileWithFileName_IfRangeHeaderValid_RangeRequest()
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/EmbeddedFiles/DownloadFileWithFileName_WithEtag");
+            httpRequestMessage.Headers.Range = new RangeHeaderValue(0, 6);
+            httpRequestMessage.Headers.IfRange = new RangeConditionHeaderValue(new EntityTagHeaderValue("\"Etag\""));
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.PartialContent, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.NotNull(body);
+            Assert.Equal("Sample ", body);
+            var contentDisposition = response.Content.Headers.ContentDisposition.ToString();
+            Assert.NotNull(contentDisposition);
+            Assert.Equal("attachment; filename=downloadName.txt; filename*=UTF-8''downloadName.txt", contentDisposition);
+        }
+
+        [Fact]
+        public async Task FileFromEmbeddedResources_ReturnsFileWithFileName_IfRangeHeaderInvalid_RangeRequestIgnored()
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/EmbeddedFiles/DownloadFileWithFileName_WithEtag");
+            httpRequestMessage.Headers.Range = new RangeHeaderValue(0, 6);
+            httpRequestMessage.Headers.IfRange = new RangeConditionHeaderValue(new EntityTagHeaderValue("\"NotEtag\""));
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Sample text file as embedded resource.", body);
+            var contentDisposition = response.Content.Headers.ContentDisposition.ToString();
+            Assert.NotNull(contentDisposition);
+            Assert.Equal("attachment; filename=downloadName.txt; filename*=UTF-8''downloadName.txt", contentDisposition);
+        }
+
+        [Theory]
+        [InlineData("0-6")]
+        [InlineData("bytes = ")]
+        [InlineData("bytes = 1-4, 5-11")]
+        public async Task FileFromEmbeddedResources_ReturnsFileWithFileName_RangeRequestIgnored(string rangeString)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/EmbeddedFiles/DownloadFileWithFileName");
+            httpRequestMessage.Headers.TryAddWithoutValidation("Range", rangeString);
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Sample text file as embedded resource.", body);
+            var contentDisposition = response.Content.Headers.ContentDisposition.ToString();
+            Assert.NotNull(contentDisposition);
+            Assert.Equal("attachment; filename=downloadName.txt; filename*=UTF-8''downloadName.txt", contentDisposition);
+        }
+
+        [Theory]
+        [InlineData("bytes = 45-46")]
+        [InlineData("bytes = -0")]
+        public async Task FileFromEmbeddedResources_ReturnsFileWithFileName_RangeRequestNotSatisfiable(string rangeString)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, "http://localhost/EmbeddedFiles/DownloadFileWithFileName");
+            httpRequestMessage.Headers.TryAddWithoutValidation("Range", rangeString);
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.RequestedRangeNotSatisfiable, response.StatusCode);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Empty(body);
+            var contentDisposition = response.Content.Headers.ContentDisposition.ToString();
+            Assert.NotNull(contentDisposition);
+            Assert.Equal("attachment; filename=downloadName.txt; filename*=UTF-8''downloadName.txt", contentDisposition);
+        }
+
+        [Theory]
+        [InlineData("", HttpStatusCode.OK, 38)]
+        [InlineData("bytes = 0-6", HttpStatusCode.PartialContent, 7)]
+        [InlineData("bytes = 17-25", HttpStatusCode.PartialContent, 9)]
+        [InlineData("bytes = 0-50", HttpStatusCode.PartialContent, 38)]
+        [InlineData("0-6", HttpStatusCode.OK, 38)]
+        [InlineData("bytes = ", HttpStatusCode.OK, 38)]
+        [InlineData("bytes = 1-4, 5-11", HttpStatusCode.OK, 38)]
+        [InlineData("bytes = 45-46", HttpStatusCode.RequestedRangeNotSatisfiable, 38)]
+        [InlineData("bytes = -0", HttpStatusCode.RequestedRangeNotSatisfiable, 38)]
+        public async Task FileFromEmbeddedResources_ReturnsFileWithFileName_DoesNotServeBody_ForHeadRequest(string rangeString, HttpStatusCode httpStatusCode, int expectedContentLength)
+        {
+            // Arrange
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Head, "http://localhost/EmbeddedFiles/DownloadFileWithFileName");
+            httpRequestMessage.Headers.TryAddWithoutValidation("Range", rangeString);
+            httpRequestMessage.Headers.IfRange = new RangeConditionHeaderValue(new EntityTagHeaderValue("\"Etag\""));
+
+            // Act
+            var response = await Client.SendAsync(httpRequestMessage);
+
+            // Assert
+            Assert.Equal(httpStatusCode, response.StatusCode);
+
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
+
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.NotNull(body);
+            Assert.Equal(string.Empty, body);
+
+            var contentLength = response.Content.Headers.ContentLength;
+            Assert.Equal(expectedContentLength, contentLength);
+
+            var contentDisposition = response.Content.Headers.ContentDisposition.ToString();
+            Assert.NotNull(contentDisposition);
+            Assert.Equal("attachment; filename=downloadName.txt; filename*=UTF-8''downloadName.txt", contentDisposition);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FiltersTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FiltersTest.cs
new file mode 100644
index 0000000000..e3deb769d3
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FiltersTest.cs
@@ -0,0 +1,117 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class FiltersTest : IClassFixture<MvcTestFixture<BasicWebSite.Startup>>
+    {
+        public FiltersTest(MvcTestFixture<BasicWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task CanAuthorize_UsersByRole()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("AuthorizeUser/AdminRole");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("Hello World!", await response.Content.ReadAsStringAsync());
+        }
+
+        [Fact]
+        public async Task CanAuthorize_UsersByPolicyRequirements()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("AuthorizeUser/ApiManagers");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("Hello World!", await response.Content.ReadAsStringAsync());
+        }
+
+        [Fact]
+        public async Task ImpossiblePolicyFailsAuthorize()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("AuthorizeUser/Impossible");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode);
+        }
+
+        [Theory]
+        [InlineData("en-US", "en-US")]
+        [InlineData("fr", "fr")]
+        [InlineData("ab-cd", "en-US")]
+        public async Task MiddlewareFilter_LocalizationMiddlewareRegistration_UsesRouteDataToFindCulture(
+            string culture,
+            string expected)
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync($"{culture}/Filters/MiddlewareFilterTest");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(
+                $"CurrentCulture:{expected},CurrentUICulture:{expected}",
+                await response.Content.ReadAsStringAsync());
+        }
+
+        [Fact]
+        public async Task AlwaysRunResultFilters_CanRunWhenResourceFiltersShortCircuit()
+        {
+            // Arrange
+            var url = "Filters/AlwaysRunResultFiltersCanRunWhenResourceFilterShortCircuit";
+            var request = new HttpRequestMessage(HttpMethod.Post, url)
+            {
+                Content = new StringContent("Test", Encoding.UTF8, "application/json"),
+            };
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(422, (int)response.StatusCode);
+            Assert.Equal("Can't process this!", await response.Content.ReadAsStringAsync());
+        }
+
+        [Fact]
+        public async Task FiltersCanBeDeclaredGlobally()
+        {
+            // Arrange
+            var url = "Filters/TraceResult";
+
+            // Act
+            var response = await Client.GetStringAsync(url);
+
+            // Assert
+            Assert.Equal("This value was set by TraceResourceFilter", response);
+        }
+
+        [Fact]
+        public async Task ServiceFiltersWork()
+        {
+            // Arrange
+            var url = "Filters/ServiceFilterTest";
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("Service filter content", await response.Content.ReadAsStringAsync());
+            Assert.Equal(new[] { "True" }, response.Headers.GetValues("X-ServiceActionFilter"));
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FlushPointTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FlushPointTest.cs
new file mode 100644
index 0000000000..1ea8536830
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FlushPointTest.cs
@@ -0,0 +1,104 @@
+// 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.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Testing.xunit;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class FlushPointTest : IClassFixture<MvcTestFixture<RazorWebSite.Startup>>
+    {
+        public FlushPointTest(MvcTestFixture<RazorWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task FlushPointsAreExecutedForPagesWithLayouts()
+        {
+            var expected = @"<title>Page With Layout</title>
+
+RenderBody content
+
+
+    <span>Content that takes time to produce</span>
+
+";
+
+            // Act
+            var body = await Client.GetStringAsync("http://localhost/FlushPoint/PageWithLayout");
+
+            // Assert
+            Assert.Equal(expected, body, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task FlushPointsAreExecutedForPagesWithoutLayouts()
+        {
+            var expected = @"Initial content
+
+Secondary content
+
+Inside partial
+
+After flush inside partial<form action=""/FlushPoint/PageWithoutLayout"" method=""post"">" +
+                @"<input id=""Name1"" name=""Name1"" type=""text"" value="""" />" +
+                @"<input id=""Name2"" name=""Name2"" type=""text"" value="""" /></form>";
+
+            // Act
+            var body = await Client.GetStringAsync("http://localhost/FlushPoint/PageWithoutLayout");
+
+            // Assert
+            Assert.Equal(expected, body, ignoreLineEndingDifferences: true);
+        }
+
+        [Theory]
+        [InlineData("PageWithPartialsAndViewComponents", "FlushAsync invoked inside RenderSection")]
+        [InlineData("PageWithRenderSectionAsync", "FlushAsync invoked inside RenderSectionAsync")]
+        public async Task FlushPointsAreExecutedForPagesWithComponentsPartialsAndSections(string action, string title)
+        {
+            var expected = $@"<title>{ title }</title>
+RenderBody content
+
+
+partial-content
+
+Value from TaskReturningString
+<p>section-content</p>
+    component-content
+    <span>Content that takes time to produce</span>
+
+More content from layout
+";
+
+            // Act
+            var body = await Client.GetStringAsync("http://localhost/FlushPoint/" + action);
+
+            // Assert
+            Assert.Equal(expected, body, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task FlushPointsNestedLayout()
+        {
+            // Arrange
+            var expected = @"Inside Nested Layout
+<title>Nested Page With Layout</title>
+
+
+
+    <span>Nested content that takes time to produce</span>
+";
+
+            // Act
+            var body = await Client.GetStringAsync("http://localhost/FlushPoint/PageWithNestedLayout");
+
+            // Assert
+            Assert.Equal(expected, body, ignoreLineEndingDifferences: true);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FormFileUploadTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FormFileUploadTest.cs
new file mode 100644
index 0000000000..e75fbf039c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FormFileUploadTest.cs
@@ -0,0 +1,91 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class FormFileUploadTest : IClassFixture<MvcTestFixture<FilesWebSite.Startup>>
+    {
+        public FormFileUploadTest(MvcTestFixture<FilesWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task CanUploadFileInFrom()
+        {
+            // Arrange
+            var content = new MultipartFormDataContent();
+            content.Add(new StringContent("John"), "Name");
+            content.Add(new StringContent("23"), "Age");
+            content.Add(new StringContent("John's biography content"), "Biography", "Bio.txt");
+
+            var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/UploadFiles");
+            request.Content = content;
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var user = await response.Content.ReadAsAsync<User>();
+
+            Assert.Equal("John", user.Name);
+            Assert.Equal(23, user.Age);
+            Assert.Equal("John's biography content", user.Biography);
+        }
+
+        [Fact]
+        public async Task UploadMultipleFiles()
+        {
+            // Arrange
+            var content = new MultipartFormDataContent();
+            content.Add(new StringContent("Phone"), "Name");
+            content.Add(new StringContent("camera"), "Specs[0].Key");
+            content.Add(new StringContent("camera spec1 file contents"), "Specs[0].Value", "camera_spec1.txt");
+            content.Add(new StringContent("camera spec2 file contents"), "Specs[0].Value", "camera_spec2.txt");
+            content.Add(new StringContent("battery"), "Specs[1].Key");
+            content.Add(new StringContent("battery spec1 file contents"), "Specs[1].Value", "battery_spec1.txt");
+            content.Add(new StringContent("battery spec2 file contents"), "Specs[1].Value", "battery_spec2.txt");
+
+            var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/UploadProductSpecs");
+            request.Content = content;
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var product = await response.Content.ReadAsAsync<Product>();
+            Assert.NotNull(product);
+            Assert.Equal("Phone", product.Name);
+            Assert.NotNull(product.Specs);
+            Assert.Equal(2, product.Specs.Count);
+            Assert.True(product.Specs.ContainsKey("camera"));
+            Assert.Equal(new[] { "camera_spec1.txt", "camera_spec2.txt" }, product.Specs["camera"]);
+            Assert.True(product.Specs.ContainsKey("battery"));
+            Assert.Equal(new[] { "battery_spec1.txt", "battery_spec2.txt" }, product.Specs["battery"]);
+        }
+
+        private class User
+        {
+            public string Name { get; set; }
+            public int Age { get; set; }
+            public string Biography { get; set; }
+        }
+
+        private class Product
+        {
+            public string Name { get; set; }
+
+            public Dictionary<string, List<string>> Specs { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/GlobalAuthorizationFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/GlobalAuthorizationFilterTest.cs
new file mode 100644
index 0000000000..23dce2a053
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/GlobalAuthorizationFilterTest.cs
@@ -0,0 +1,110 @@
+// 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.
+
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class GlobalAuthorizationFilterTest : IClassFixture<MvcTestFixture<SecurityWebSite.StartupWithGlobalDenyAnonymousFilter>>
+    {
+        public GlobalAuthorizationFilterTest(MvcTestFixture<SecurityWebSite.StartupWithGlobalDenyAnonymousFilter> fixture)
+        {
+            Factory = fixture.Factories.FirstOrDefault() ?? fixture.WithWebHostBuilder(ConfigureWebHostBuilder);
+            Client = Factory.CreateDefaultClient();
+        }
+
+        private static void ConfigureWebHostBuilder(IWebHostBuilder builder) =>
+            builder.UseStartup<SecurityWebSite.StartupWithGlobalDenyAnonymousFilter>();
+
+        public HttpClient Client { get; }
+
+        public WebApplicationFactory<SecurityWebSite.StartupWithGlobalDenyAnonymousFilter> Factory { get; }
+
+        [Fact]
+        public async Task DeniesAnonymousUsers_ByDefault()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Administration/Index");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.NotNull(response.Headers.Location);
+            Assert.Equal(
+                "http://localhost/Home/Login?ReturnUrl=%2FAdministration%2FIndex",
+                response.Headers.Location.ToString());
+        }
+
+        [Fact]
+        public async Task AllowAnonymousUsers_ForActionsWithAllowAnonymousAttribute()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Administration/AllowAnonymousAction");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Administration.AllowAnonymousAction", body);
+        }
+
+        [Fact]
+        public async Task AuthorizationPoliciesDoNotCombine_WithV2_0()
+        {
+            // Arrange & Act
+            var factory = Factory.WithWebHostBuilder(
+                builder => builder.ConfigureServices(
+                    services => services.Configure<MvcCompatibilityOptions>(
+                        options => options.CompatibilityVersion = CompatibilityVersion.Version_2_0)));
+            var client = factory.CreateDefaultClient();
+            var response = await client.PostAsync("http://localhost/Administration/SignInCookie2", null);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.True(response.Headers.Contains("Set-Cookie"));
+
+            var cookie2 = response.Headers.GetValues("Set-Cookie").SingleOrDefault();
+
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/Administration/EitherCookie");
+            request.Headers.Add("Cookie", cookie2);
+
+            // Will fail because default cookie is not sent so [Authorize] fails.
+            response = await client.SendAsync(request);
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.NotNull(response.Headers.Location);
+            Assert.Equal(
+                "http://localhost/Home/Login?ReturnUrl=%2FAdministration%2FEitherCookie",
+                response.Headers.Location.ToString());
+        }
+
+        [Fact]
+        public async Task AuthorizationPoliciesCombine_WithV2_1()
+        {
+            // Arrange & Act 1
+            var response = await Client.PostAsync("http://localhost/Administration/SignInCookie2", null);
+
+            // Assert 1
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.True(response.Headers.Contains("Set-Cookie"));
+
+            // Arrange 2
+            var cookie2 = response.Headers.GetValues("Set-Cookie").SingleOrDefault();
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/Administration/EitherCookie");
+            request.Headers.Add("Cookie", cookie2);
+
+            // Act 2: Will succeed because, with AllowCombiningAuthorizeFilters true, [Authorize] allows either cookie.
+            response = await Client.SendAsync(request);
+
+            // Assert 2
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Null(response.Headers.Location);
+        }
+
+   }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationTest.cs
new file mode 100644
index 0000000000..f865f1bcd4
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationTest.cs
@@ -0,0 +1,607 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using AngleSharp.Dom;
+using AngleSharp.Dom.Html;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class HtmlGenerationTest :
+        IClassFixture<MvcTestFixture<HtmlGenerationWebSite.Startup>>,
+        IClassFixture<MvcEncodedTestFixture<HtmlGenerationWebSite.Startup>>
+    {
+        private static readonly Assembly _resourcesAssembly = typeof(HtmlGenerationTest).GetTypeInfo().Assembly;
+
+        public HtmlGenerationTest(
+            MvcTestFixture<HtmlGenerationWebSite.Startup> fixture,
+            MvcEncodedTestFixture<HtmlGenerationWebSite.Startup> encodedFixture)
+        {
+            Client = fixture.CreateDefaultClient();
+            EncodedClient = encodedFixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        public HttpClient EncodedClient { get; }
+
+        public static TheoryData<string, string> WebPagesData
+        {
+            get
+            {
+                var data = new TheoryData<string, string>
+                {
+                    { "Customer", "/Customer/HtmlGeneration_Customer" },
+                    { "Index", null },
+                    { "Product", null },
+                    // Testing attribute values with boolean and null values
+                    { "AttributesWithBooleanValues", null },
+                    // Testing SelectTagHelper with Html.BeginForm
+                    { "CreateWarehouse", "/HtmlGeneration_Home/CreateWarehouse" },
+                    // Testing the HTML helpers with FormTagHelper
+                    { "EditWarehouse", null },
+                    { "Form", "/HtmlGeneration_Home/Form" },
+                    // Testing MVC tag helpers invoked in the editor templates from HTML helpers
+                    { "EmployeeList", "/HtmlGeneration_Home/EmployeeList" },
+                    // Testing the EnvironmentTagHelper
+                    { "Environment", null },
+                    // Testing the ImageTagHelper
+                    { "Image", null },
+                    // Testing InputTagHelper with File
+                    { "Input", null },
+                    // Testing the LinkTagHelper
+                    { "Link", null },
+                    // Test ability to generate nearly identical HTML with MVC tag and HTML helpers.
+                    // Only attribute order should differ.
+                    { "Order", "/HtmlGeneration_Order/Submit" },
+                    { "OrderUsingHtmlHelpers", "/HtmlGeneration_Order/Submit" },
+                    // Testing PartialTagHelper
+                    { "PartialTagHelperWithoutModel", null },
+                    { "Warehouse", null },
+                    // Testing InputTagHelpers invoked in the partial views
+                    { "ProductList", "/HtmlGeneration_Product" },
+                    { "ProductListUsingTagHelpers", "/HtmlGeneration_Product" },
+                    { "ProductListUsingTagHelpersWithNullModel", "/HtmlGeneration_Product" },
+                    // Testing the ScriptTagHelper
+                    { "Script", null },
+                };
+
+                return data;
+            }
+        }
+
+        [Fact]
+        public async Task EnumValues_SerializeCorrectly()
+        {
+            // Arrange & Act
+            var response = await Client.GetStringAsync("http://localhost/HtmlGeneration_Home/Enum");
+
+            // Assert
+            Assert.Equal($"Vrijdag{Environment.NewLine}Month: FirstOne", response, ignoreLineEndingDifferences: true);
+        }
+
+        [Theory]
+        [MemberData(nameof(WebPagesData))]
+        public async Task HtmlGenerationWebSite_GeneratesExpectedResults(string action, string antiforgeryPath)
+        {
+            // Arrange
+            var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");
+            var outputFile = "compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home." + action + ".html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            // Act
+            // The host is not important as everything runs in memory and tests are isolated from each other.
+            var response = await Client.GetAsync("http://localhost/HtmlGeneration_Home/" + action);
+            var responseContent = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
+
+            responseContent = responseContent.Trim();
+            if (antiforgeryPath == null)
+            {
+#if GENERATE_BASELINES
+                ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+                Assert.Equal(expectedContent.Trim(), responseContent, ignoreLineEndingDifferences: true);
+#endif
+            }
+            else
+            {
+                var forgeryToken = AntiforgeryTestHelper.RetrieveAntiforgeryToken(responseContent, antiforgeryPath);
+#if GENERATE_BASELINES
+                // Reverse usual substitution and insert a format item into the new file content.
+                responseContent = responseContent.Replace(forgeryToken, "{0}");
+                ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+                expectedContent = string.Format(expectedContent, forgeryToken);
+                Assert.Equal(expectedContent.Trim(), responseContent, ignoreLineEndingDifferences: true);
+#endif
+            }
+        }
+
+        public static TheoryData<string, string> EncodedPagesData
+        {
+            get
+            {
+                return new TheoryData<string, string>
+                {
+                    { "AttributesWithBooleanValues", null },
+                    { "EditWarehouse", null },
+                    { "Index", null },
+                    { "Link", null },
+                    { "Order", "/HtmlGeneration_Order/Submit" },
+                    { "OrderUsingHtmlHelpers", "/HtmlGeneration_Order/Submit" },
+                    { "Product", null },
+                    { "Script", null },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(EncodedPagesData))]
+        public async Task HtmlGenerationWebSite_GenerateEncodedResults(string action, string antiforgeryPath)
+        {
+            // Arrange
+            var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");
+            var outputFile = "compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home." + action + ".Encoded.html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            // Act
+            // The host is not important as everything runs in memory and tests are isolated from each other.
+            var response = await EncodedClient.GetAsync("http://localhost/HtmlGeneration_Home/" + action);
+            var responseContent = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
+
+            responseContent = responseContent.Trim();
+            if (antiforgeryPath == null)
+            {
+#if GENERATE_BASELINES
+                ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+                Assert.Equal(
+                    expectedContent.Trim(),
+                    responseContent,
+                    ignoreLineEndingDifferences: true);
+#endif
+            }
+            else
+            {
+                var forgeryToken = AntiforgeryTestHelper.RetrieveAntiforgeryToken(responseContent, antiforgeryPath);
+#if GENERATE_BASELINES
+                // Reverse usual substitution and insert a format item into the new file content.
+                responseContent = responseContent.Replace(forgeryToken, "{0}");
+                ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+                expectedContent = string.Format(expectedContent, forgeryToken);
+                Assert.Equal(expectedContent.Trim(), responseContent, ignoreLineEndingDifferences: true);
+#endif
+            }
+        }
+
+        // Testing how ModelMetadata is handled as ViewDataDictionary instances are created.
+        [Theory]
+        [InlineData("AtViewModel")]
+        [InlineData("NullViewModel")]
+        [InlineData("ViewModel")]
+        public async Task CheckViewData_GeneratesExpectedResults(string action)
+        {
+            // Arrange
+            var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");
+            var outputFile = "compiler/resources/HtmlGenerationWebSite.CheckViewData." + action + ".html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/CheckViewData/" + action);
+            var responseContent = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
+
+            responseContent = responseContent.Trim();
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            Assert.Equal(expectedContent, responseContent, ignoreLineEndingDifferences: true);
+#endif
+        }
+
+        [Fact]
+        public async Task ValidationTagHelpers_GeneratesExpectedSpansAndDivs()
+        {
+            // Arrange
+            var outputFile = "compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Customer.Index.html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/Customer/HtmlGeneration_Customer");
+            var nameValueCollection = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string,string>("Number", string.Empty),
+                new KeyValuePair<string,string>("Name", string.Empty),
+                new KeyValuePair<string,string>("Email", string.Empty),
+                new KeyValuePair<string,string>("PhoneNumber", string.Empty),
+                new KeyValuePair<string,string>("Password", string.Empty)
+            };
+            request.Content = new FormUrlEncodedContent(nameValueCollection);
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var responseContent = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            responseContent = responseContent.Trim();
+            var forgeryToken =
+                AntiforgeryTestHelper.RetrieveAntiforgeryToken(responseContent, "Customer/HtmlGeneration_Customer");
+
+#if GENERATE_BASELINES
+            // Reverse usual substitution and insert a format item into the new file content.
+            responseContent = responseContent.Replace(forgeryToken, "{0}");
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            expectedContent = string.Format(expectedContent, forgeryToken);
+            Assert.Equal(expectedContent.Trim(), responseContent, ignoreLineEndingDifferences: true);
+#endif
+        }
+
+        [Fact]
+        public async Task CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents()
+        {
+            // Arrange
+            var assertFile =
+                "compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert";
+
+            var outputFile1 = assertFile + "1.txt";
+            var expected1 =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile1, sourceFile: false);
+            var outputFile2 = assertFile + "2.txt";
+            var expected2 =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile2, sourceFile: false);
+            var outputFile3 = assertFile + "3.txt";
+            var expected3 =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile3, sourceFile: false);
+
+            // Act - 1
+            // Verify that content gets cached based on vary-by-params
+            var targetUrl = "/catalog?categoryId=1&correlationid=1";
+            var request = RequestWithLocale(targetUrl, "North");
+            var response1 = await (await Client.SendAsync(request)).Content.ReadAsStringAsync();
+            request = RequestWithLocale(targetUrl, "North");
+            var response2 = await (await Client.SendAsync(request)).Content.ReadAsStringAsync();
+
+            // Assert - 1
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile1, expected1, response1.Trim());
+#else
+            Assert.Equal(expected1, response1.Trim(), ignoreLineEndingDifferences: true);
+            Assert.Equal(expected1, response2.Trim(), ignoreLineEndingDifferences: true);
+#endif
+
+            // Act - 2
+            // Verify content gets changed in partials when one of the vary by parameters is changed
+            targetUrl = "/catalog?categoryId=3&correlationid=2";
+            request = RequestWithLocale(targetUrl, "North");
+            var response3 = await (await Client.SendAsync(request)).Content.ReadAsStringAsync();
+            request = RequestWithLocale(targetUrl, "North");
+            var response4 = await (await Client.SendAsync(request)).Content.ReadAsStringAsync();
+
+            // Assert - 2
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile2, expected2, response3.Trim());
+#else
+            Assert.Equal(expected2, response3.Trim(), ignoreLineEndingDifferences: true);
+            Assert.Equal(expected2, response4.Trim(), ignoreLineEndingDifferences: true);
+#endif
+
+            // Act - 3
+            // Verify content gets changed in a View Component when the Vary-by-header parameters is changed
+            targetUrl = "/catalog?categoryId=3&correlationid=3";
+            request = RequestWithLocale(targetUrl, "East");
+            var response5 = await (await Client.SendAsync(request)).Content.ReadAsStringAsync();
+            request = RequestWithLocale(targetUrl, "East");
+            var response6 = await (await Client.SendAsync(request)).Content.ReadAsStringAsync();
+
+            // Assert - 3
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile3, expected3, response5.Trim());
+#else
+            Assert.Equal(expected3, response5.Trim(), ignoreLineEndingDifferences: true);
+            Assert.Equal(expected3, response6.Trim(), ignoreLineEndingDifferences: true);
+#endif
+        }
+
+        [Fact]
+        public async Task CacheTagHelper_ExpiresContent_BasedOnExpiresParameter()
+        {
+            // Arrange & Act - 1
+            var response1 = await Client.GetStringAsync("/catalog/2");
+
+            // Assert - 1
+            var expected1 = "Cached content for 2";
+            Assert.Equal(expected1, response1.Trim());
+
+            // Act - 2
+            await Task.Delay(TimeSpan.FromSeconds(2));
+            var response2 = await Client.GetStringAsync("/catalog/3");
+
+            // Assert - 2
+            var expected2 = "Cached content for 3";
+            Assert.Equal(expected2, response2.Trim());
+        }
+
+        [Fact]
+        public async Task CacheTagHelper_UsesVaryByCookie_ToVaryContent()
+        {
+            // Arrange & Act - 1
+            var response1 = await Client.GetStringAsync("/catalog/cart?correlationid=1");
+
+            // Assert - 1
+            var expected1 = "Cart content for 1";
+            Assert.Equal(expected1, response1.Trim());
+
+            // Act - 2
+            var request = new HttpRequestMessage(HttpMethod.Get, "/catalog/cart?correlationid=2");
+            request.Headers.Add("Cookie", "CartId=10");
+            var response2 = await (await Client.SendAsync(request)).Content.ReadAsStringAsync();
+
+            // Assert - 2
+            var expected2 = "Cart content for 2";
+            Assert.Equal(expected2, response2.Trim());
+
+            // Act - 3
+            // Resend the cookiesless request and cached result from the first response.
+            var response3 = await Client.GetStringAsync("/catalog/cart?correlationid=3");
+
+            // Assert - 3
+            Assert.Equal(expected1, response3.Trim());
+        }
+
+        [Fact]
+        public async Task CacheTagHelper_VariesByRoute()
+        {
+            // Arrange & Act - 1
+            var response1 = await Client.GetStringAsync(
+                "/catalog/north-west/confirm-payment?confirmationId=1");
+
+            // Assert - 1
+            var expected1 = "Welcome Guest. Your confirmation id is 1. (Region north-west)";
+            Assert.Equal(expected1, response1.Trim());
+
+            // Act - 2
+            var response2 = await Client.GetStringAsync(
+                "/catalog/south-central/confirm-payment?confirmationId=2");
+
+            // Assert - 2
+            var expected2 = "Welcome Guest. Your confirmation id is 2. (Region south-central)";
+            Assert.Equal(expected2, response2.Trim());
+
+            // Act 3
+            var response3 = await Client.GetStringAsync(
+                "/catalog/north-west/Silver/confirm-payment?confirmationId=4");
+
+            var expected3 = "Welcome Silver member. Your confirmation id is 4. (Region north-west)";
+            Assert.Equal(expected3, response3.Trim());
+
+            // Act 4
+            var response4 = await Client.GetStringAsync(
+                "/catalog/north-west/Gold/confirm-payment?confirmationId=5");
+
+            var expected4 = "Welcome Gold member. Your confirmation id is 5. (Region north-west)";
+            Assert.Equal(expected4, response4.Trim());
+
+            // Act - 4
+            // Resend the responses and expect cached results.
+            response1 = await Client.GetStringAsync(
+                "/catalog/north-west/confirm-payment?confirmationId=301");
+            response2 = await Client.GetStringAsync(
+                "/catalog/south-central/confirm-payment?confirmationId=402");
+            response3 = await Client.GetStringAsync(
+                "/catalog/north-west/Silver/confirm-payment?confirmationId=503");
+            response4 = await Client.GetStringAsync(
+                "/catalog/north-west/Gold/confirm-payment?confirmationId=608");
+
+            // Assert - 4
+            Assert.Equal(expected1, response1.Trim());
+            Assert.Equal(expected2, response2.Trim());
+            Assert.Equal(expected3, response3.Trim());
+            Assert.Equal(expected4, response4.Trim());
+        }
+
+        [Fact]
+        public async Task CacheTagHelper_VariesByUserId()
+        {
+            // Arrange & Act - 1
+            var response1 = await Client.GetStringAsync("/catalog/past-purchases/test1?correlationid=1");
+            var response2 = await Client.GetStringAsync("/catalog/past-purchases/test1?correlationid=2");
+
+            // Assert - 1
+            var expected1 = "Past purchases for user test1 (1)";
+            Assert.Equal(expected1, response1.Trim());
+            Assert.Equal(expected1, response2.Trim());
+
+            // Act - 2
+            var response3 = await Client.GetStringAsync("/catalog/past-purchases/test2?correlationid=3");
+            var response4 = await Client.GetStringAsync("/catalog/past-purchases/test2?correlationid=4");
+
+            // Assert - 2
+            var expected2 = "Past purchases for user test2 (3)";
+            Assert.Equal(expected2, response3.Trim());
+            Assert.Equal(expected2, response4.Trim());
+        }
+
+        [Fact]
+        public async Task CacheTagHelper_BubblesExpirationOfNestedTagHelpers()
+        {
+            // Arrange & Act - 1
+            var response1 = await Client.GetStringAsync("/categories/Books?correlationId=1");
+
+            // Assert - 1
+            var expected1 =
+@"Category: Books
+Products: Book1, Book2 (1)";
+            Assert.Equal(expected1, response1.Trim(), ignoreLineEndingDifferences: true);
+
+            // Act - 2
+            var response2 = await Client.GetStringAsync("/categories/Electronics?correlationId=2");
+
+            // Assert - 2
+            var expected2 =
+@"Category: Electronics
+Products: Book1, Book2 (1)";
+            Assert.Equal(expected2, response2.Trim(), ignoreLineEndingDifferences: true);
+
+            // Act - 3
+            // Trigger an expiration of the nested content.
+            var content = @"[{ productName: ""Music Systems"" },{ productName: ""Televisions"" }]";
+            var requestMessage = new HttpRequestMessage(HttpMethod.Post, "/categories/Electronics");
+            requestMessage.Content = new StringContent(content, Encoding.UTF8, "application/json");
+            (await Client.SendAsync(requestMessage)).EnsureSuccessStatusCode();
+
+            var response3 = await Client.GetStringAsync("/categories/Electronics?correlationId=3");
+
+            // Assert - 3
+            var expected3 =
+@"Category: Electronics
+Products: Music Systems, Televisions (3)";
+            Assert.Equal(expected3, response3.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task CacheTagHelper_DoesNotCacheIfDisabled()
+        {
+            // Arrange & Act
+            var response1 = await Client.GetStringAsync("/catalog/GetDealPercentage/20?isEnabled=true");
+            var response2 = await Client.GetStringAsync("/catalog/GetDealPercentage/40?isEnabled=true");
+            var response3 = await Client.GetStringAsync("/catalog/GetDealPercentage/30?isEnabled=false");
+
+            // Assert
+            Assert.Equal("Deal percentage is 20", response1.Trim());
+            Assert.Equal("Deal percentage is 20", response2.Trim());
+            Assert.Equal("Deal percentage is 30", response3.Trim());
+        }
+
+        [Fact]
+        public async Task EditorTemplateWithNoModel_RendersWithCorrectMetadata()
+        {
+            // Arrange
+            var expected =
+                "<label class=\"control-label col-md-2\" for=\"Name\">ItemName</label>" + Environment.NewLine +
+                "<input id=\"Name\" name=\"Name\" type=\"text\" value=\"\" />" + Environment.NewLine + Environment.NewLine +
+                "<label class=\"control-label col-md-2\" for=\"Id\">ItemNo</label>" + Environment.NewLine +
+                "<input data-val=\"true\" data-val-required=\"The ItemNo field is required.\" id=\"Id\" name=\"Id\" type=\"text\" value=\"\" />" +
+                Environment.NewLine + Environment.NewLine;
+
+            // Act
+            var response = await Client.GetStringAsync("http://localhost/HtmlGeneration_Home/ItemUsingSharedEditorTemplate");
+
+            // Assert
+            Assert.Equal(expected, response, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task EditorTemplateWithSpecificModel_RendersWithCorrectMetadata()
+        {
+            // Arrange
+            var expected = "<label for=\"Description\">ItemDesc</label>" + Environment.NewLine +
+                "<input id=\"Description\" name=\"Description\" type=\"text\" value=\"\" />" + Environment.NewLine + Environment.NewLine;
+
+            // Act
+            var response = await Client.GetStringAsync("http://localhost/HtmlGeneration_Home/ItemUsingModelSpecificEditorTemplate");
+
+            // Assert
+            Assert.Equal(expected, response, ignoreLineEndingDifferences: true);
+        }
+
+        // We want to make sure that for 'weird' model expressions involving:
+        // - fields
+        // - statics
+        // - private
+        //
+        // These tests verify that we don't throw, and can evaluate the expression to get the model
+        // value. One quirk of behavior for these cases is that we can't return a correct model metadata
+        // instance (this is true for anything other than a public instance property). We're not overly
+        // concerned with that, and so the accuracy of the model metadata is not verified by the test.
+        [Theory]
+        [InlineData("GetWeirdWithHtmlHelpers")]
+        [InlineData("GetWeirdWithTagHelpers")]
+        public async Task WeirdModelExpressions_CanAccessModelValues(string action)
+        {
+            // Arrange
+            var url = "http://localhost/HtmlGeneration_WeirdExpressions/" + action;
+
+            // Act
+            var response = await Client.GetStringAsync(url);
+
+            // Assert
+            Assert.Contains("Hello, Field World!", response);
+            Assert.Contains("Hello, Static World!", response);
+            Assert.Contains("Hello, Private World!", response);
+        }
+
+        [Fact]
+        public async Task PartialTagHelper_AllowsPassingModelValue()
+        {
+            // Arrange
+            var url = "/HtmlGeneration_Home/StatusMessage";
+
+            // Act
+            var document = await Client.GetHtmlDocumentAsync(url);
+
+            // Assert
+            var banner = QuerySelector(document, ".banner");
+            Assert.Equal("Some status message", banner.TextContent);
+        }
+
+        [Fact]
+        public async Task PartialTagHelper_AllowsPassingNullModelValue()
+        {
+            // Regression test for https://github.com/aspnet/Mvc/issues/7667.
+            // Arrange
+            var url = "/HtmlGeneration_Home/NullStatusMessage";
+
+            // Act
+            var document = await Client.GetHtmlDocumentAsync(url);
+
+            // Assert
+            var banner = QuerySelector(document, ".banner");
+            Assert.Empty(banner.TextContent);
+        }
+
+        private static IElement QuerySelector(IHtmlDocument document, string selector)
+        {
+            var element = document.QuerySelector(selector);
+            if (element == null)
+            {
+                throw new ArgumentException($"Document does not contain element that matches the selector {selector}: " + Environment.NewLine + document.DocumentElement.OuterHtml);
+            }
+
+            return element;
+        }
+
+        private static HttpRequestMessage RequestWithLocale(string url, string locale)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            request.Headers.Add("Locale", locale);
+
+            return request;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlHelperOptionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlHelperOptionsTest.cs
new file mode 100644
index 0000000000..41d1c2e9a7
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlHelperOptionsTest.cs
@@ -0,0 +1,82 @@
+// 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.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class HtmlHelperOptionsTest : IClassFixture<MvcTestFixture<RazorWebSite.Startup>>
+    {
+        public HtmlHelperOptionsTest(MvcTestFixture<RazorWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task AppWideDefaultsInViewAndPartialView()
+        {
+            // Arrange
+            var expected =
+@"<div class=""validation-summary-errors""><validationSummaryElement>MySummary</validationSummaryElement>
+<ul><li>A model error occurred.</li>
+</ul></div>
+<validationMessageElement class=""field-validation-error"">An error occurred.</validationMessageElement>
+<input id=""Prefix!Property1"" name=""Prefix.Property1"" type=""text"" value="""" />
+<div class=""editor-label""><label for=""MyDate"">MyDate</label></div>
+<div class=""editor-field""><input class=""text-box single-line"" id=""MyDate"" name=""MyDate"" type=""text"" value=""2000-01-02T03:04:05.060&#x2B;00:00"" /> </div>
+
+<div class=""validation-summary-errors""><validationSummaryElement>MySummary</validationSummaryElement>
+<ul><li>A model error occurred.</li>
+</ul></div>
+<validationMessageElement class=""field-validation-error"">An error occurred.</validationMessageElement>
+<input id=""Prefix!Property1"" name=""Prefix.Property1"" type=""text"" value="""" />
+<div class=""editor-label""><label for=""MyDate"">MyDate</label></div>
+<div class=""editor-field""><input class=""text-box single-line"" id=""MyDate"" name=""MyDate"" type=""text"" value=""2000-01-02T03:04:05.060&#x2B;00:00"" /> </div>
+
+False";
+
+            // Act
+            var body = await Client.GetStringAsync("http://localhost/HtmlHelperOptions/HtmlHelperOptionsDefaultsInView");
+
+            // Assert
+            Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public async Task OverrideAppWideDefaultsInViewAndPartialView()
+        {
+            // Arrange
+            var expected =
+@"<div class=""validation-summary-errors""><ValidationSummaryInView>MySummary</ValidationSummaryInView>
+<ul><li>A model error occurred.</li>
+</ul></div>
+<ValidationInView class=""field-validation-error"" data-valmsg-for=""Error"" data-valmsg-replace=""true"">An error occurred.</ValidationInView>
+<input id=""Prefix!Property1"" name=""Prefix.Property1"" type=""text"" value="""" />
+<div class=""editor-label""><label for=""MyDate"">MyDate</label></div>
+<div class=""editor-field""><input class=""text-box single-line"" data-val=""true"" data-val-required=""The MyDate field is required."" id=""MyDate"" name=""MyDate"" type=""text"" value=""02/01/2000 03:04:05 &#x2B;00:00"" /> <ValidationInView class=""field-validation-valid"" data-valmsg-for=""MyDate"" data-valmsg-replace=""true""></ValidationInView></div>
+
+True
+<div class=""validation-summary-errors""><ValidationSummaryInPartialView>MySummary</ValidationSummaryInPartialView>
+<ul><li>A model error occurred.</li>
+</ul></div>
+<ValidationInPartialView class=""field-validation-error"" data-valmsg-for=""Error"" data-valmsg-replace=""true"">An error occurred.</ValidationInPartialView>
+<input id=""Prefix!Property1"" name=""Prefix.Property1"" type=""text"" value="""" />
+<div class=""editor-label""><label for=""MyDate"">MyDate</label></div>
+<div class=""editor-field""><input class=""text-box single-line"" id=""MyDate"" name=""MyDate"" type=""text"" value=""02/01/2000 03:04:05 &#x2B;00:00"" /> <ValidationInPartialView class=""field-validation-valid"" data-valmsg-for=""MyDate"" data-valmsg-replace=""true""></ValidationInPartialView></div>
+
+True";
+
+            // Act
+            var body = await Client.GetStringAsync("http://localhost/HtmlHelperOptions/OverrideAppWideDefaultsInView");
+
+            // Assert
+            Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/CultureReplacerMiddleware.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/CultureReplacerMiddleware.cs
new file mode 100644
index 0000000000..ae40cee982
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/CultureReplacerMiddleware.cs
@@ -0,0 +1,54 @@
+// 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.
+
+using System.Globalization;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    /// <summary>
+    /// A middleware that ensures web sites run in a consistent culture. Currently useful for tests that format dates,
+    /// times, or numbers. Will be more useful when we have localized resources.
+    /// </summary>
+    public class CultureReplacerMiddleware
+    {
+        private readonly RequestDelegate _next;
+
+        private CultureInfo _originalCulture;
+        private CultureInfo _originalUICulture;
+
+        public CultureReplacerMiddleware(RequestDelegate next, TestCulture culture)
+        {
+            Culture = new CultureInfo(culture.Culture);
+            UICulture = new CultureInfo(culture.UICulture);
+            _next = next;
+        }
+
+        public CultureInfo UICulture { get; }
+        public CultureInfo Culture { get; }
+
+        public async Task Invoke(HttpContext context)
+        {
+            // Use ReplaceCultureAttribute to avoid thread consistency checks in CultureReplacer. await doesn't
+            // necessarily end on the original thread. For this case, problems arise when next middleware throws. Can
+            // remove the thread consistency checks once culture is (at least for .NET 4.6) handled using
+            // AsyncLocal<CultureInfo>.
+            try
+            {
+                _originalCulture = CultureInfo.CurrentCulture;
+                _originalUICulture = CultureInfo.CurrentUICulture;
+
+                CultureInfo.CurrentCulture = Culture;
+                CultureInfo.CurrentUICulture = UICulture;
+
+                await _next(context);
+            }
+            finally
+            {
+                CultureInfo.CurrentCulture = _originalCulture;
+                CultureInfo.CurrentUICulture = _originalUICulture;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/CultureReplacerStartupFilter.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/CultureReplacerStartupFilter.cs
new file mode 100644
index 0000000000..dff810ddaf
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/CultureReplacerStartupFilter.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    /// <summary>
+    /// Inserts the <see cref="CultureReplacerMiddleware"/> at the beginning of the pipeline.
+    /// </summary>
+    public class CultureReplacerStartupFilter : IStartupFilter
+    {
+        /// <inheritdoc />
+        public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
+        {
+            return AddCulture;
+
+            void AddCulture(IApplicationBuilder builder)
+            {
+                builder.UseMiddleware<CultureReplacerMiddleware>();
+                next(builder);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/HttpClientExtensions.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/HttpClientExtensions.cs
new file mode 100644
index 0000000000..fe8d4f300b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/HttpClientExtensions.cs
@@ -0,0 +1,74 @@
+// 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.
+
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using AngleSharp.Dom.Html;
+using AngleSharp.Parser.Html;
+using Xunit.Sdk;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public static class HttpClientExtensions
+    {
+        public static async Task<IHtmlDocument> GetHtmlDocumentAsync(this HttpClient client, string requestUri)
+        {
+            var response = await client.GetAsync(requestUri);
+            await AssertStatusCodeAsync(response, HttpStatusCode.OK);
+
+            var content = await response.Content.ReadAsStringAsync();
+            var parser = new HtmlParser();
+            var document = parser.Parse(content);
+            if (document == null)
+            {
+                throw new InvalidOperationException("Response content could not be parsed as HTML: " + Environment.NewLine + content);
+            }
+
+            return document;
+        }
+
+        public static async Task<HttpResponseMessage> AssertStatusCodeAsync(this HttpResponseMessage response, HttpStatusCode expectedStatusCode)
+        {
+            if (response.StatusCode == expectedStatusCode)
+            {
+                return response;
+            }
+
+            string responseContent = null;
+            try
+            {
+                responseContent = await response.Content.ReadAsStringAsync();
+            }
+            catch
+            {
+                // No-op
+            }
+
+            throw new StatusCodeMismatchException
+            {
+                ExpectedStatusCode = HttpStatusCode.OK,
+                ActualStatusCode = response.StatusCode,
+                ResponseContent = responseContent,
+            };
+        }
+
+        private class StatusCodeMismatchException : XunitException
+        {
+            public HttpStatusCode ExpectedStatusCode { get; set; }
+
+            public HttpStatusCode ActualStatusCode { get; set; }
+
+            public string ResponseContent { get; set; }
+
+            public override string Message
+            {
+                get
+                {
+                    return $"Excepted status code 200. Actual {ActualStatusCode}. Response Content:" + Environment.NewLine + ResponseContent;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcEncodedTestFixtureOfT.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcEncodedTestFixtureOfT.cs
new file mode 100644
index 0000000000..b978f8c818
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcEncodedTestFixtureOfT.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.WebEncoders.Testing;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class MvcEncodedTestFixture<TStartup> : MvcTestFixture<TStartup>
+        where TStartup : class
+    {
+        protected override void ConfigureWebHost(IWebHostBuilder builder)
+        {
+            base.ConfigureWebHost(builder);
+            builder.ConfigureServices(services =>
+            {
+                services.TryAddTransient<HtmlEncoder, HtmlTestEncoder>();
+                services.TryAddTransient<JavaScriptEncoder, JavaScriptTestEncoder>();
+                services.TryAddTransient<UrlEncoder, UrlTestEncoder>();
+            });
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcTestFixture.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcTestFixture.cs
new file mode 100644
index 0000000000..7e32759610
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcTestFixture.cs
@@ -0,0 +1,43 @@
+// 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.
+
+using System.Globalization;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class MvcTestFixture<TStartup> : WebApplicationFactory<TStartup>
+        where TStartup : class
+    {
+        protected override void ConfigureWebHost(IWebHostBuilder builder)
+        {
+            builder
+                .UseRequestCulture<TStartup>("en-GB", "en-US")
+                .UseEnvironment("Production")
+                .ConfigureServices(
+                    services => services.Configure<MvcCompatibilityOptions>(
+                        options => options.CompatibilityVersion = CompatibilityVersion.Version_2_1));
+        }
+
+        protected override TestServer CreateServer(IWebHostBuilder builder)
+        {
+            var originalCulture = CultureInfo.CurrentCulture;
+            var originalUICulture = CultureInfo.CurrentUICulture;
+            try
+            {
+                CultureInfo.CurrentCulture = new CultureInfo("en-GB");
+                CultureInfo.CurrentUICulture = new CultureInfo("en-US");
+                return base.CreateServer(builder);
+            }
+            finally
+            {
+                CultureInfo.CurrentCulture = originalCulture;
+                CultureInfo.CurrentUICulture = originalUICulture;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcWebApplicationBuilderExtensions.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcWebApplicationBuilderExtensions.cs
new file mode 100644
index 0000000000..d3da7ba515
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcWebApplicationBuilderExtensions.cs
@@ -0,0 +1,49 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public static class MvcWebApplicationBuilderExtensions
+    {
+        /// <summary>
+        /// Sets up an <see cref="IStartupFilter"/> that configures the <see cref="CultureReplacerMiddleware"/> at the
+        /// beginning of the pipeline to change the <see cref="CultureInfo.CurrentCulture"/> and <see cref="CultureInfo.CurrentUICulture"/>
+        /// of the thread so that they match the cultures in <paramref name="culture"/> and <paramref name="uiCulture"/> for the rest of the
+        /// <see cref="HttpRequest"/>.
+        /// </summary>
+        /// <param name="culture">The culture to use when processing <see cref="HttpRequest"/>.</param>
+        /// <param name="uiCulture">The UI culture to use when processing <see cref="HttpRequest"/>.</param>
+        /// <returns>An instance of this <see cref="IWebHostBuilder"/></returns>
+        public static IWebHostBuilder UseRequestCulture<TStartup>(this IWebHostBuilder builder, string culture, string uiCulture)
+            where TStartup : class
+        {
+            if (culture == null)
+            {
+                throw new ArgumentNullException(nameof(culture));
+            }
+
+            if (uiCulture == null)
+            {
+                throw new ArgumentNullException(nameof(uiCulture));
+            }
+
+            builder.ConfigureServices(services =>
+            {
+                services.TryAddSingleton(new TestCulture
+                {
+                    Culture = culture,
+                    UICulture = uiCulture
+                });
+                services.TryAddEnumerable(ServiceDescriptor.Singleton<IStartupFilter, CultureReplacerStartupFilter>());
+            });
+
+            return builder;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/TestCulture.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/TestCulture.cs
new file mode 100644
index 0000000000..180fa7490b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/TestCulture.cs
@@ -0,0 +1,11 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class TestCulture
+    {
+        public string Culture { get; set; }
+        public string UICulture { get; set; }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputFormatterTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputFormatterTests.cs
new file mode 100644
index 0000000000..2425c21f3a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputFormatterTests.cs
@@ -0,0 +1,317 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using FormatterWebSite.Models;
+using Microsoft.AspNetCore.Testing.xunit;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class InputFormatterTests : IClassFixture<MvcTestFixture<FormatterWebSite.Startup>>
+    {
+        public InputFormatterTests(MvcTestFixture<FormatterWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task CheckIfXmlInputFormatterIsBeingCalled()
+        {
+            // Arrange
+            var sampleInputInt = 10;
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<DummyClass xmlns=\"http://schemas.datacontract.org/2004/07/FormatterWebSite\"><SampleInt>"
+                + sampleInputInt.ToString() + "</SampleInt></DummyClass>";
+            var content = new StringContent(input, Encoding.UTF8, "application/xml");
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/Home/Index", content);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(sampleInputInt.ToString(), await response.Content.ReadAsStringAsync());
+        }
+
+        [Theory]
+        [InlineData("application/json")]
+        [InlineData("text/json")]
+        public async Task JsonInputFormatter_IsSelectedForJsonRequest(string requestContentType)
+        {
+            // Arrange
+            var sampleInputInt = 10;
+            var input = "{\"SampleInt\":10}";
+            var content = new StringContent(input, Encoding.UTF8, requestContentType);
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/Home/Index", content);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(sampleInputInt.ToString(), await response.Content.ReadAsStringAsync());
+        }
+
+        [Theory]
+        [InlineData("application/json", "{\"SampleInt\":10}", 10)]
+        [InlineData("application/json", "{}", 0)]
+        public async Task JsonInputFormatter_IsModelStateValid_ForValidContentType(
+            string requestContentType,
+            string jsonInput,
+            int expectedSampleIntValue)
+        {
+            // Arrange
+            var content = new StringContent(jsonInput, Encoding.UTF8, requestContentType);
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/JsonFormatter/ReturnInput/", content);
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedSampleIntValue.ToString(), responseBody);
+        }
+
+        [Theory]
+        [InlineData("application/json", "")]
+        [InlineData("application/json", "    ")]
+        public async Task JsonInputFormatter_ReturnsBadRequest_ForEmptyRequestBody(
+            string requestContentType,
+            string jsonInput)
+        {
+            // Arrange
+            var content = new StringContent(jsonInput, Encoding.UTF8, requestContentType);
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/JsonFormatter/ReturnInput/", content);
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+        }
+
+        [Fact] // This test covers the 2.0 behavior. JSON.Net error messages are not preserved.
+        public async Task JsonInputFormatter_SuppliedJsonDeserializationErrorMessage()
+        {
+            // Arrange
+            var content = new StringContent("{", Encoding.UTF8, "application/json");
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/JsonFormatter/ReturnInput/", content);
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+            Assert.Equal("{\"\":[\"Unexpected end when reading JSON. Path '', line 1, position 1.\"]}", responseBody);
+        }
+
+        [Theory]
+        [InlineData("\"I'm a JSON string!\"")]
+        [InlineData("true")]
+        [InlineData("\"\"")] // Empty string
+        public async Task JsonInputFormatter_ReturnsDefaultValue_ForValueTypes(string input)
+        {
+            // Arrange
+            var content = new StringContent(input, Encoding.UTF8, "application/json");
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/JsonFormatter/ValueTypeAsBody/", content);
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+            Assert.Equal("0", responseBody);
+        }
+
+        [Fact]
+        public async Task JsonInputFormatter_ReadsPrimitiveTypes()
+        {
+            // Arrange
+            var expected = "1773";
+            var content = new StringContent(expected, Encoding.UTF8, "application/json");
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/JsonFormatter/ValueTypeAsBody/", content);
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expected, responseBody);
+        }
+
+        [Fact]
+        public async Task JsonInputFormatter_Returns415UnsupportedMediaType_ForEmptyContentType()
+        {
+            // Arrange
+            var jsonInput = "{\"SampleInt\":10}";
+            var content = new StringContent(jsonInput, Encoding.UTF8, "application/json");
+            content.Headers.Clear();
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/JsonFormatter/ReturnInput/", content);
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.UnsupportedMediaType, response.StatusCode);
+        }
+
+        [Theory]
+        [InlineData("application/json", "{\"SampleInt\":10}", 10)]
+        [InlineData("application/json", "{}", 0)]
+        public async Task JsonInputFormatter_IsModelStateValid_ForTransferEncodingChunk(
+            string requestContentType,
+            string jsonInput,
+            int expectedSampleIntValue)
+        {
+            // Arrange
+            var content = new StringContent(jsonInput, Encoding.UTF8, requestContentType);
+            var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/JsonFormatter/ReturnInput/");
+            request.Headers.TransferEncodingChunked = true;
+            request.Content = content;
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedSampleIntValue.ToString(), responseBody);
+        }
+
+        [Theory]
+        [InlineData("utf-8")]
+        [InlineData("unicode")]
+        public async Task CustomFormatter_IsSelected_ForSupportedContentTypeAndEncoding(string encoding)
+        {
+            // Arrange
+            var content = new StringContent("Test Content", Encoding.GetEncoding(encoding), "text/plain");
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/InputFormatter/ReturnInput/", content);
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("Test Content", responseBody);
+        }
+
+        [Theory]
+        [InlineData("image/png")]
+        [InlineData("image/jpeg")]
+        public async Task CustomFormatter_NotSelected_ForUnsupportedContentType(string contentType)
+        {
+            // Arrange
+            var content = new StringContent("Test Content", Encoding.UTF8, contentType);
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/InputFormatter/ReturnInput/", content);
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.UnsupportedMediaType, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task BindingWorksForPolymorphicTypes()
+        {
+            // Act
+            var response = await Client.GetAsync("PolymorphicBinding/ModelBound?DerivedProperty=Test");
+
+            // Assert
+            await response.AssertStatusCodeAsync(HttpStatusCode.OK);
+            var result = JsonConvert.DeserializeObject<DerivedModel>(await response.Content.ReadAsStringAsync());
+            Assert.Equal("Test", result.DerivedProperty);
+        }
+
+        [Fact]
+        public async Task ValidationUsesModelMetadataFromActualModelType_ForModelBoundParameters()
+        {
+            // Act
+            var response = await Client.GetAsync("PolymorphicBinding/ModelBound");
+
+            // Assert
+            await response.AssertStatusCodeAsync(HttpStatusCode.BadRequest);
+            var result = JObject.Parse(await response.Content.ReadAsStringAsync());
+            Assert.Collection(
+                result.Properties(),
+                p =>
+                {
+                    Assert.Equal("DerivedProperty", p.Name);
+                    var value = Assert.IsType<JArray>(p.Value);
+                    Assert.Equal("The DerivedProperty field is required.", value.First);
+                });
+        }
+
+        [Fact]
+        public async Task InputFormatterWorksForPolymorphicTypes()
+        {
+            // Act
+            var input = "Test";
+            var response = await Client.PostAsJsonAsync("PolymorphicBinding/InputFormatted", input);
+
+            // Assert
+            await response.AssertStatusCodeAsync(HttpStatusCode.OK);
+            var result = JsonConvert.DeserializeObject<DerivedModel>(await response.Content.ReadAsStringAsync());
+            Assert.Equal(input, result.DerivedProperty);
+        }
+
+        [Fact]
+        public async Task ValidationUsesModelMetadataFromActualModelType_ForInputFormattedParameters()
+        {
+            // Act
+            var response = await Client.PostAsJsonAsync("PolymorphicBinding/InputFormatted", string.Empty);
+
+            // Assert
+            await response.AssertStatusCodeAsync(HttpStatusCode.BadRequest);
+            var result = JObject.Parse(await response.Content.ReadAsStringAsync());
+            Assert.Collection(
+                result.Properties(),
+                p =>
+                {
+                    Assert.Equal("DerivedProperty", p.Name);
+                    var value = Assert.IsType<JArray>(p.Value);
+                    Assert.Equal("The DerivedProperty field is required.", value.First);
+                });
+        }
+
+        [Fact]
+        public async Task InputFormatterWorksForPolymorphicProperties()
+        {
+            // Act
+            var input = "Test";
+            var response = await Client.PostAsJsonAsync("PolymorhpicPropertyBinding/Action", input);
+
+            // Assert
+            await response.AssertStatusCodeAsync(HttpStatusCode.OK);
+            var result = JsonConvert.DeserializeObject<DerivedModel>(await response.Content.ReadAsStringAsync());
+            Assert.Equal(input, result.DerivedProperty);
+        }
+
+        [Fact]
+        public async Task ValidationUsesModelMetadataFromActualModelType_ForInputFormattedProperties()
+        {
+            // Act
+            var response = await Client.PostAsJsonAsync("PolymorhpicPropertyBinding/Action", string.Empty);
+
+            // Assert
+            await response.AssertStatusCodeAsync(HttpStatusCode.BadRequest);
+            var result = JObject.Parse(await response.Content.ReadAsStringAsync());
+            Assert.Collection(
+                result.Properties(),
+                p =>
+                {
+                    Assert.Equal("DerivedProperty", p.Name);
+                    var value = Assert.IsType<JArray>(p.Value);
+                    Assert.Equal("The DerivedProperty field is required.", value.First);
+                });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputObjectValidationTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputObjectValidationTests.cs
new file mode 100644
index 0000000000..dbe25c6c92
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputObjectValidationTests.cs
@@ -0,0 +1,186 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.Testing.xunit;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class InputObjectValidationTests : IClassFixture<MvcTestFixture<FormatterWebSite.Startup>>
+    {
+        public InputObjectValidationTests(MvcTestFixture<FormatterWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        // Parameters: Request Content, Expected status code, Expected model state error message
+        public static IEnumerable<object[]> SimpleTypePropertiesModelRequestData
+        {
+            get
+            {
+                yield return new object[] {
+                    "{\"ByteProperty\":1, \"NullableByteProperty\":5, \"ByteArrayProperty\":[1,2,3]}",
+                    StatusCodes.Status400BadRequest,
+                    "The field ByteProperty must be between 2 and 8."};
+
+                yield return new object[] {
+                    "{\"ByteProperty\":8, \"NullableByteProperty\":1, \"ByteArrayProperty\":[1,2,3]}",
+                    StatusCodes.Status400BadRequest,
+                    "The field NullableByteProperty must be between 2 and 8."};
+
+                yield return new object[] {
+                    "{\"ByteProperty\":8, \"NullableByteProperty\":2, \"ByteArrayProperty\":[1]}",
+                    StatusCodes.Status400BadRequest,
+                    "The field ByteArrayProperty must be a string or array type with a minimum length of '2'."};
+            }
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task CheckIfObjectIsDeserializedWithoutErrors()
+        {
+            // Arrange
+            var sampleId = 2;
+            var sampleName = "SampleUser";
+            var sampleAlias = "SampleAlias";
+            var sampleDesignation = "HelloWorld";
+            var sampleDescription = "sample user";
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<User xmlns=\"http://schemas.datacontract.org/2004/07/FormatterWebSite\"><Id>" + sampleId +
+                "</Id><Name>" + sampleName + "</Name><Alias>" + sampleAlias + "</Alias>" +
+                "<Designation>" + sampleDesignation + "</Designation><description>" +
+                sampleDescription + "</description></User>";
+            var content = new StringContent(input, Encoding.UTF8, "application/xml");
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/Validation/Index", content);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("User has been registered : " + sampleName,
+                await response.Content.ReadAsStringAsync());
+        }
+
+        [Fact]
+        public async Task CheckIfObjectIsDeserialized_WithErrors()
+        {
+            // Arrange
+            var sampleId = 0;
+            var sampleName = "user";
+            var sampleAlias = "a";
+            var sampleDesignation = "HelloWorld!";
+            var sampleDescription = "sample user";
+            var input = "{ Id:" + sampleId + ", Name:'" + sampleName + "', Alias:'" + sampleAlias +
+                "' ,Designation:'" + sampleDesignation + "', description:'" + sampleDescription + "'}";
+            var content = new StringContent(input, Encoding.UTF8, "application/json");
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/Validation/Index", content);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            // Mono issue - https://github.com/aspnet/External/issues/29
+            Assert.Equal(PlatformNormalizer.NormalizeContent(
+                "The field Id must be between 1 and 2000.," +
+                "The field Name must be a string or array type with a minimum length of '5'.," +
+                "The field Alias must be a string with a minimum length of 3 and a maximum length of 15.," +
+                "The field Designation must match the regular expression " +
+                (TestPlatformHelper.IsMono ? "[0-9a-zA-Z]*." : "'[0-9a-zA-Z]*'.")),
+                await response.Content.ReadAsStringAsync());
+        }
+
+        [Fact]
+        public async Task CheckIfExcludedFieldsAreNotValidated()
+        {
+            // Arrange
+            var content = new StringContent("{\"Alias\":\"xyz\"}", Encoding.UTF8, "application/json");
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/Validation/GetDeveloperName", content);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("No model validation for developer, even though developer.Name is empty.",
+                         await response.Content.ReadAsStringAsync());
+        }
+
+        [Fact]
+        public async Task ShallowValidation_HappensOnExcluded_ComplexTypeProperties()
+        {
+            // Arrange
+            var requestData = "{\"Name\":\"Library Manager\", \"Suppliers\": [{\"Name\":\"Contoso Corp\"}]}";
+            var content = new StringContent(requestData, Encoding.UTF8, "application/json");
+            var expectedModelStateErrorMessage
+                                 = "The field Suppliers must be a string or array type with a minimum length of '2'.";
+            var shouldNotContainMessage
+                                 = "The field Name must be a string or array type with a maximum length of '5'.";
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/Validation/CreateProject", content);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status400BadRequest, (int)response.StatusCode);
+
+            var responseContent = await response.Content.ReadAsStringAsync();
+            var responseObject = JsonConvert.DeserializeObject<Dictionary<string, string[]>>(responseContent);
+            var errorKeyValuePair = Assert.Single(responseObject, keyValuePair => keyValuePair.Value.Length > 0);
+            var errorMessage = Assert.Single(errorKeyValuePair.Value);
+            Assert.Equal(expectedModelStateErrorMessage, errorMessage);
+
+            // verifies that the excluded type is not validated
+            Assert.NotEqual(shouldNotContainMessage, errorMessage);
+        }
+
+        [Theory]
+        [MemberData(nameof(SimpleTypePropertiesModelRequestData))]
+        public async Task ShallowValidation_HappensOnExcluded_SimpleTypeProperties(
+            string requestContent,
+            int expectedStatusCode,
+            string expectedModelStateErrorMessage)
+        {
+            // Arrange
+            var content = new StringContent(requestContent, Encoding.UTF8, "application/json");
+
+            // Act
+            var response = await Client.PostAsync(
+                "http://localhost/Validation/CreateSimpleTypePropertiesModel",
+                content);
+
+            // Assert
+            Assert.Equal(expectedStatusCode, (int)response.StatusCode);
+
+            var responseContent = await response.Content.ReadAsStringAsync();
+            var responseObject = JsonConvert.DeserializeObject<Dictionary<string, string[]>>(responseContent);
+            var errorKeyValuePair = Assert.Single(responseObject, keyValuePair => keyValuePair.Value.Length > 0);
+            var errorMessage = Assert.Single(errorKeyValuePair.Value);
+            Assert.Equal(expectedModelStateErrorMessage, errorMessage);
+        }
+
+        [Fact]
+        public async Task CheckIfExcludedField_IsNotValidatedForNonBodyBoundModels()
+        {
+            // Arrange
+            var kvps = new List<KeyValuePair<string, string>>();
+            kvps.Add(new KeyValuePair<string, string>("Alias", "xyz"));
+            var content = new FormUrlEncodedContent(kvps);
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/Validation/GetDeveloperAlias", content);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("xyz", await response.Content.ReadAsStringAsync());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputValidationTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputValidationTests.cs
new file mode 100644
index 0000000000..5c5c9e7189
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputValidationTests.cs
@@ -0,0 +1,120 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class InputValidationTests : IClassFixture<MvcTestFixture<FormatterWebSite.Startup>>
+    {
+        public InputValidationTests(MvcTestFixture<FormatterWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task ValidRequest_IsAccepted()
+        {
+            // Arrange
+            var content = new FormUrlEncodedContent(new Dictionary<string, string>
+            {
+                { "RequiredProp", "1" },
+                { "BindRequiredProp", "2" },
+                { "RequiredAndBindRequiredProp", "3" },
+                { "requiredParam", "4" },
+                { "bindRequiredParam", "5" },
+                { "requiredAndBindRequiredParam", "6" },
+                { "UnboundRequiredProp", "100" }, // Value should not be used
+                { "UnboundBindRequiredProp", "101" }, // Value should not be used
+                { "BindNeverRequiredProp", "ignoredValue" }, // Value should not be used
+            });
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/TopLevelValidation", content);
+            var responseText = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Contains("[OptionalProp:0]", responseText);
+            Assert.Contains("[RequiredProp:1]", responseText);
+            Assert.Contains("[BindRequiredProp:2]", responseText);
+            Assert.Contains("[RequiredAndBindRequiredProp:3]", responseText);
+            Assert.Contains("[OptionalStringLengthProp:]", responseText);
+            Assert.Contains("[OptionalRangeDisplayNameProp:0]", responseText);
+            Assert.Contains("[UnboundRequiredProp:0]", responseText);
+            Assert.Contains("[UnboundBindRequiredProp:0]", responseText);
+            Assert.Contains("[BindNeverRequiredProp:]", responseText);
+            Assert.Contains("[optionalParam:0]", responseText);
+            Assert.Contains("[requiredParam:4]", responseText);
+            Assert.Contains("[bindRequiredParam:5]", responseText);
+            Assert.Contains("[requiredAndBindRequiredParam:6]", responseText);
+            Assert.Contains("[optionalStringLengthParam:]", responseText);
+            Assert.Contains("[optionalRangeDisplayNameParam:0]", responseText);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task InvalidRequest_IsRejected()
+        {
+            // Arrange
+            var content = new FormUrlEncodedContent(new Dictionary<string, string>
+            {
+                { "OptionalStringLengthProp", "ThisStringIsTooLongForTheProperty" },
+                { "OptionalRangeDisplayNameProp", "123" },
+                { "optionalStringLengthParam", "ThisStringIsTooLongForTheParameter" },
+                { "optionalRangeDisplayNameParam", "456" },
+            });
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/TopLevelValidation", content);
+            var responseText = await response.Content.ReadAsStringAsync();
+            var errors = JsonConvert.DeserializeObject<JObject>(responseText)
+                .Properties()
+                .ToDictionary(
+                    prop => prop.Name,
+                    prop => ((JArray)prop.Value).Single().Value<string>());
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+            Assert.Equal(10, errors.Count);
+            Assert.Equal(
+                "The RequiredProp field is required.",
+                errors["RequiredProp"]);
+            Assert.Equal(
+                "A value for the 'BindRequiredProp' property was not provided.",
+                errors["BindRequiredProp"]);
+            Assert.Equal(
+                "A value for the 'RequiredAndBindRequiredProp' property was not provided.",
+                errors["RequiredAndBindRequiredProp"]);
+            Assert.Equal(
+                "The field OptionalStringLengthProp must be a string with a maximum length of 5.",
+                errors["OptionalStringLengthProp"]);
+            Assert.Equal(
+                "The field Some Display Name For Prop must be between 1 and 100.",
+                errors["OptionalRangeDisplayNameProp"]);
+            Assert.Equal(
+                "The requiredParam field is required.",
+                errors["requiredParam"]);
+            Assert.Equal(
+                "A value for the 'bindRequiredParam' property was not provided.",
+                errors["bindRequiredParam"]);
+            Assert.Equal(
+                "A value for the 'requiredAndBindRequiredParam' property was not provided.",
+                errors["requiredAndBindRequiredParam"]);
+            Assert.Equal(
+                "The field optionalStringLengthParam must be a string with a maximum length of 5.",
+                errors["optionalStringLengthParam"]);
+            Assert.Equal(
+                "The field Some Display Name For Param must be between 1 and 100.",
+                errors["optionalRangeDisplayNameParam"]);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonOutputFormatterTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonOutputFormatterTests.cs
new file mode 100644
index 0000000000..09ed5b4a07
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonOutputFormatterTests.cs
@@ -0,0 +1,90 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Testing.xunit;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class JsonOutputFormatterTests : IClassFixture<MvcTestFixture<FormatterWebSite.Startup>>
+    {
+        public JsonOutputFormatterTests(MvcTestFixture<FormatterWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task JsonOutputFormatter_ReturnsIndentedJson()
+        {
+            // Arrange
+            var user = new FormatterWebSite.User()
+            {
+                Id = 1,
+                Alias = "john",
+                description = "Administrator",
+                Designation = "Administrator",
+                Name = "John Williams"
+            };
+
+            var serializerSettings = JsonSerializerSettingsProvider.CreateSerializerSettings();
+            serializerSettings.Formatting = Formatting.Indented;
+            var expectedBody = JsonConvert.SerializeObject(user, serializerSettings);
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/JsonFormatter/ReturnsIndentedJson");
+
+            // Assert
+            var actualBody = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, actualBody);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task SerializableErrorIsReturnedInExpectedFormat()
+        {
+            // Arrange
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<Employee xmlns=\"http://schemas.datacontract.org/2004/07/FormatterWebSite\">" +
+                "<Id>2</Id><Name>foo</Name></Employee>";
+
+            var expectedOutput = "{\"Id\":[\"The field Id must be between 10 and 100." +
+                    "\"],\"Name\":[\"The field Name must be a string or array type with" +
+                    " a minimum length of '15'.\"]}";
+            var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/SerializableError/CreateEmployee");
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/json"));
+            request.Content = new StringContent(input, Encoding.UTF8, "application/xml");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+
+            var actualContent = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedOutput, actualContent);
+
+            var modelStateErrors = JsonConvert.DeserializeObject<Dictionary<string, string[]>>(actualContent);
+            Assert.Equal(2, modelStateErrors.Count);
+
+            var errors = Assert.Single(modelStateErrors, kvp => kvp.Key == "Id").Value;
+
+            var error = Assert.Single(errors);
+            Assert.Equal("The field Id must be between 10 and 100.", error);
+
+            errors = Assert.Single(modelStateErrors, kvp => kvp.Key == "Name").Value;
+            error = Assert.Single(errors);
+            Assert.Equal("The field Name must be a string or array type with a minimum length of '15'.", error);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonPatchInputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonPatchInputFormatterTest.cs
new file mode 100644
index 0000000000..211ff54a5e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonPatchInputFormatterTest.cs
@@ -0,0 +1,164 @@
+// 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.
+
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using FormatterWebSite;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class JsonPatchSampleTest : IClassFixture<MvcTestFixture<Startup>>
+    {
+        public JsonPatchSampleTest(MvcTestFixture<Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task AddOperation_Works()
+        {
+            // Arrange
+            var input = "[{ 'op': 'add', 'path': 'Reviews/-', 'value': { 'Rating': 3.5 }}]".Replace("'", "\"");
+            var request = GetPatchRequest(input);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var product = JsonConvert.DeserializeObject<Product>(body);
+            Assert.NotNull(product);
+            Assert.NotNull(product.Reviews);
+            Assert.Equal(3, product.Reviews.Count);
+            Assert.Equal(3.5, product.Reviews[2].Rating);
+        }
+
+        [Fact]
+        public async Task ReplaceOperation_Works()
+        {
+            // Arrange
+            var input = "[{ 'op': 'replace', 'path': 'Reviews/0/Rating', 'value': 5 }]".Replace("'", "\"");
+            var request = GetPatchRequest(input);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var product = JsonConvert.DeserializeObject<Product>(body);
+            Assert.NotNull(product);
+            Assert.NotNull(product.Reviews);
+            Assert.Equal(2, product.Reviews.Count);
+            Assert.Equal(5, product.Reviews[0].Rating);
+        }
+
+        [Fact]
+        public async Task CopyOperation_Works()
+        {
+            // Arrange
+            var input = "[{ 'op': 'copy', 'path': 'Reviews/1/Rating', 'from': 'Reviews/0/Rating'}]".Replace("'", "\"");
+            var request = GetPatchRequest(input);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var product = JsonConvert.DeserializeObject<Product>(body);
+            Assert.NotNull(product);
+            Assert.NotNull(product.Reviews);
+            Assert.Equal(2, product.Reviews.Count);
+            Assert.Equal(4, product.Reviews[1].Rating);
+            Assert.Equal(4, product.Reviews[0].Rating);
+        }
+
+        [Fact]
+        public async Task MoveOperation_Works()
+        {
+            // Arrange
+            var input = "[{ 'op': 'move', 'path': 'Reviews/1/Rating', 'from': 'Reviews/0/Rating'}]".Replace("'", "\"");
+            var request = GetPatchRequest(input);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var product = JsonConvert.DeserializeObject<Product>(body);
+            Assert.NotNull(product);
+            Assert.NotNull(product.Reviews);
+            Assert.Equal(2, product.Reviews.Count);
+            Assert.Equal(4, product.Reviews[1].Rating);
+            Assert.Equal(0, product.Reviews[0].Rating);
+        }
+
+        [Fact]
+        public async Task RemoveOperation_Works()
+        {
+            // Arrange
+            var input = "[{ 'op': 'remove', 'path': 'Reviews/0/Rating'}]".Replace("'", "\"");
+            var request = GetPatchRequest(input);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var product = JsonConvert.DeserializeObject<Product>(body);
+            Assert.NotNull(product);
+            Assert.NotNull(product.Reviews);
+            Assert.Equal(2, product.Reviews.Count);
+            Assert.Equal(0, product.Reviews[0].Rating);
+        }
+
+        [Fact]
+        public async Task AddOperation_InvalidValueForProperty_AddsErrorToModelState()
+        {
+            // Arrange
+            var input = "[{ 'op': 'add', 'path': 'Reviews/-', 'value': { 'Rating': 'not-a-double' }}]".Replace("'", "\"");
+            var request = GetPatchRequest(input);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task InvalidOperation_AddsErrorToModelState()
+        {
+            // Arrange
+            var input = "[{ 'op': 'invalid', 'path': 'Reviews/1/Rating', 'from': 'Reviews/0/Rating'}]".Replace("'", "\"");
+            var request = GetPatchRequest(input);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+        }
+
+        private HttpRequestMessage GetPatchRequest(string body)
+        {
+            return new HttpRequestMessage
+            {
+                Content = new StringContent(body, Encoding.UTF8, "application/json-patch+json"),
+                Method = new HttpMethod("PATCH"),
+                RequestUri = new Uri("http://localhost/jsonpatch/PatchProduct")
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonResultTest.cs
new file mode 100644
index 0000000000..f885d4ed28
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonResultTest.cs
@@ -0,0 +1,128 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class JsonResultTest : IClassFixture<MvcTestFixture<BasicWebSite.Startup>>
+    {
+        public JsonResultTest(MvcTestFixture<BasicWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task JsonResult_UsesDefaultContentType()
+        {
+            // Arrange
+            var url = "http://localhost/JsonResult/Plain";
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("application/json", response.Content.Headers.ContentType.MediaType);
+            Assert.Equal("{\"message\":\"hello\"}", content);
+        }
+
+        // Using an Accept header can't force Json to not be Json. If your accept header doesn't jive with the
+        // formatters/content-type configured on the result it will be ignored.
+        [Theory]
+        [InlineData("application/xml")]
+        [InlineData("text/xml")]
+        public async Task JsonResult_Conneg_Fails(string mediaType)
+        {
+            // Arrange
+            var url = "http://localhost/JsonResult/Plain";
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            request.Headers.TryAddWithoutValidation("Accept", mediaType);
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("application/json", response.Content.Headers.ContentType.MediaType);
+            Assert.Equal("{\"message\":\"hello\"}", content);
+        }
+
+        // If the object is null, it will get formatted as JSON. NOT as a 204/NoContent
+        [Fact]
+        public async Task JsonResult_Null()
+        {
+            // Arrange
+            var url = "http://localhost/JsonResult/Null";
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("application/json", response.Content.Headers.ContentType.MediaType);
+            Assert.Equal("null", content);
+        }
+
+        // If the object is a string, it will get formatted as JSON. NOT as text/plain.
+        [Fact]
+        public async Task JsonResult_String()
+        {
+            // Arrange
+            var url = "http://localhost/JsonResult/String";
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("application/json", response.Content.Headers.ContentType.MediaType);
+            Assert.Equal("\"hello\"", content);
+        }
+
+        [Fact]
+        public async Task JsonResult_Uses_CustomSerializerSettings()
+        {
+            // Arrange
+            var url = "http://localhost/JsonResult/CustomSerializerSettings";
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("{\"message\":\"hello\"}", content);
+        }
+
+        [Fact]
+        public async Task JsonResult_CustomContentType()
+        {
+            // Arrange
+            var url = "http://localhost/JsonResult/CustomContentType";
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("application/message+json", response.Content.Headers.ContentType.MediaType);
+            Assert.Equal("{\"message\":\"hello\"}", content);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/LinkGenerationTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/LinkGenerationTests.cs
new file mode 100644
index 0000000000..f2328da15b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/LinkGenerationTests.cs
@@ -0,0 +1,87 @@
+// 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.
+
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class LinkGenerationTests : IClassFixture<MvcTestFixture<BasicWebSite.Startup>>
+    {
+        // Some tests require comparing the actual response body against an expected response baseline
+        // so they require a reference to the assembly on which the resources are located, in order to
+        // make the tests less verbose, we get a reference to the assembly with the resources and we
+        // use it on all the rest of the tests.
+        private static readonly Assembly _resourcesAssembly = typeof(LinkGenerationTests).GetTypeInfo().Assembly;
+
+        public LinkGenerationTests(MvcTestFixture<BasicWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        public static TheoryData<string, string> RelativeLinksData
+        {
+            get
+            {
+                return new TheoryData<string, string>
+                {
+                    { "http://localhost/Home/RedirectToActionReturningTaskAction", "/Home/ActionReturningTask" },
+                    { "http://localhost/Home/RedirectToRouteActionAsMethodAction", "/Home/ActionReturningTask" },
+                    { "http://localhost/Home/RedirectToRouteUsingRouteName", "/api/orders/10" },
+                    { "http://pingüino/Home/RedirectToRouteUsingRouteName", "/api/orders/10" },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RelativeLinksData))]
+        public async Task GeneratedLinksWithActionResults_AreRelativeLinks_WhenSetOnLocationHeader(
+            string url,
+            string expected)
+        {
+            // Act
+            var response = await Client.GetAsync(url);
+            var responseContent = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            // Location.ToString() in mono returns file://url. (https://github.com/aspnet/External/issues/21)
+            Assert.Equal(
+                TestPlatformHelper.IsMono ? new Uri(expected) : new Uri(expected, UriKind.Relative),
+                response.Headers.Location);
+        }
+
+        [Fact]
+        public async Task GeneratedLinks_AreNotPunyEncoded_WhenGeneratedOnViews()
+        {
+            // Arrange
+            var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");
+            var outputFile = "compiler/resources/BasicWebSite.Home.ActionLinkView.html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            // Act
+            // The host is not important as everything runs in memory and tests are isolated from each other.
+            var response = await Client.GetAsync("http://localhost/Home/ActionLinkView");
+            var responseContent = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
+
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            Assert.Equal(expectedContent, responseContent, ignoreLineEndingDifferences: true);
+#endif
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
new file mode 100644
index 0000000000..954ef92727
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
@@ -0,0 +1,60 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\..\src\Microsoft.AspNetCore.Mvc.Testing\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Testing.targets" />
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+    <PlatformTarget Condition=" '$(TargetFramework)' == 'netcoreapp2.1' "></PlatformTarget>
+
+    <DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
+    <DefineConstants>$(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES</DefineConstants>
+    <DefineConstants>$(DefineConstants);FUNCTIONAL_TESTS</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Microsoft.AspNetCore.Mvc.Formatters.Xml.Test\XmlAssert.cs" />
+    <EmbeddedResource Include="compiler\resources\**\*" />
+    <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- For testing the testing infrastructure only -->
+    <WebApplicationFactoryContentRootAttribute Include="BasicWebSite" AssemblyName="BasicWebsite" ContentRootPath="../../../../WebSites/BasicWebSite" ContentRootTest="BasicWebSite.csproj" Priority="-1" />
+    <!-- For testing the testing infrastructure only. This attribute is
+     incorrect by design to ensure that the infrastructure falls back. -->
+    <WebApplicationFactoryContentRootAttribute Include="FiltersWebSite" AssemblyName="FiltersWebSite" ContentRootPath="/../WebSites/FiltersWebSite" ContentRootTest="Incorrect.csproj" Priority="-1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj" />
+    <ProjectReference Include="..\WebSites\ApiExplorerWebSite\ApiExplorerWebSite.csproj" />
+    <ProjectReference Include="..\WebSites\ApplicationModelWebSite\ApplicationModelWebSite.csproj" />
+    <ProjectReference Include="..\WebSites\BasicWebSite\BasicWebSite.csproj" />
+    <ProjectReference Include="..\WebSites\ControllersFromServicesWebSite\ControllersFromServicesWebSite.csproj" />
+    <ProjectReference Include="..\WebSites\CorsWebSite\CorsWebSite.csproj" />
+    <ProjectReference Include="..\WebSites\ErrorPageMiddlewareWebSite\ErrorPageMiddlewareWebSite.csproj" />
+    <ProjectReference Include="..\WebSites\FilesWebSite\FilesWebSite.csproj" />
+    <ProjectReference Include="..\WebSites\FormatterWebSite\FormatterWebSite.csproj" />
+    <ProjectReference Include="..\WebSites\HtmlGenerationWebSite\HtmlGenerationWebSite.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
+    <ProjectReference Include="..\..\samples\MvcSandbox\MvcSandbox.csproj" />
+    <ProjectReference Include="..\WebSites\RazorBuildWebSite\RazorBuildWebSite.csproj" />
+    <ProjectReference Include="..\WebSites\RazorPageExecutionInstrumentationWebSite\RazorPageExecutionInstrumentationWebSite.csproj" />
+    <ProjectReference Include="..\WebSites\RazorPagesWebSite\RazorPagesWebSite.csproj" />
+    <ProjectReference Include="..\WebSites\RazorWebSite\RazorWebSite.csproj" />
+    <ProjectReference Include="..\WebSites\RoutingWebSite\RoutingWebSite.csproj" />
+    <ProjectReference Include="..\WebSites\SecurityWebSite\SecurityWebSite.csproj" />
+    <ProjectReference Include="..\WebSites\SimpleWebSite\SimpleWebSite.csproj" />
+    <ProjectReference Include="..\WebSites\TagHelpersWebSite\TagHelpersWebSite.csproj" />
+    <ProjectReference Include="..\WebSites\VersioningWebSite\VersioningWebSite.csproj" />
+    <ProjectReference Include="..\WebSites\WebApiCompatShimWebSite\WebApiCompatShimWebSite.csproj" />
+    <ProjectReference Include="..\WebSites\XmlFormattersWebSite\XmlFormattersWebSite.csproj" />
+
+    <PackageReference Include="AngleSharp" Version="$(AngleSharpPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.ChunkingCookieManager.Sources" PrivateAssets="All" Version="$(MicrosoftAspNetCoreChunkingCookieManagerSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(MicrosoftAspNetCoreHttpPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="$(MicrosoftAspNetCoreWebUtilitiesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSandboxTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSandboxTest.cs
new file mode 100644
index 0000000000..45d88acbf7
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSandboxTest.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class MvcSandboxTest : IClassFixture<MvcTestFixture<MvcSandbox.Startup>>
+    {
+        public MvcSandboxTest(MvcTestFixture<MvcSandbox.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task Home_Pages_ReturnSuccess()
+        {
+            // Arrange & Act
+            var response = await Client.GetStringAsync("http://localhost");
+
+            // Assert
+            Assert.Contains("This sandbox should give you a quick view of a basic MVC application.", response);
+        }
+        [Fact]
+        public async Task RazorPages_ReturnSuccess()
+        {
+            // Arrange & Act
+            var response = await Client.GetStringAsync("http://localhost/PagesHome");
+
+            // Assert
+            Assert.Contains("This file should give you a quick view of a Mvc Razor Page in action.", response);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/OutputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/OutputFormatterTest.cs
new file mode 100644
index 0000000000..41cf8029ac
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/OutputFormatterTest.cs
@@ -0,0 +1,110 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class OutputFormatterTest : IClassFixture<MvcTestFixture<BasicWebSite.Startup>>
+    {
+        public OutputFormatterTest(MvcTestFixture<BasicWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Theory]
+        [InlineData("ReturnTaskOfString")]
+        [InlineData("ReturnTaskOfObject_StringValue")]
+        [InlineData("ReturnString")]
+        [InlineData("ReturnObject_StringValue")]
+        public async Task StringOutputFormatter_ForStringValues_GetsSelectedReturnsTextPlainContentType(string actionName)
+        {
+            // Arrange
+            var expectedContentType = MediaTypeHeaderValue.Parse("text/plain;charset=utf-8");
+            var expectedBody = actionName;
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/TextPlain/" + actionName);
+
+            // Assert
+            Assert.Equal(expectedContentType, response.Content.Headers.ContentType);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, body);
+        }
+
+        [Theory]
+        [InlineData("ReturnTaskOfObject_ObjectValue")]
+        [InlineData("ReturnObject_ObjectValue")]
+        public async Task JsonOutputFormatter_ForNonStringValue_GetsSelected(string actionName)
+        {
+            // Arrange
+            var expectedContentType = MediaTypeHeaderValue.Parse("application/json;charset=utf-8");
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/TextPlain/" + actionName);
+
+            // Assert
+            Assert.Equal(expectedContentType, response.Content.Headers.ContentType);
+        }
+
+        [Theory]
+        [InlineData("ReturnTask")]
+        [InlineData("ReturnVoid")]
+        public async Task NoContentFormatter_ForVoidAndTaskReturnType_DoesNotRun(string actionName)
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/NoContent/" + actionName);
+
+            // Assert
+            Assert.Null(response.Content.Headers.ContentType);
+            var body = await response.Content.ReadAsStringAsync();
+            // Response body is empty instead of null.
+            Assert.Empty(body);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(0, response.Content.Headers.ContentLength);
+        }
+
+        [Theory]
+        [InlineData("ReturnTaskOfString_NullValue")]
+        [InlineData("ReturnTaskOfObject_NullValue")]
+        [InlineData("ReturnObject_NullValue")]
+        public async Task NoContentFormatter_ForNullValue_ByDefault_GetsSelectedAndWritesResponse(string actionName)
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/NoContent/" + actionName);
+
+            // Assert
+            Assert.Null(response.Content.Headers.ContentType);
+            var body = await response.Content.ReadAsStringAsync();
+            // Response body is empty instead of null.
+            Assert.Empty(body);
+            Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
+            Assert.Equal(0, response.Content.Headers.ContentLength);
+        }
+
+        [Theory]
+        [InlineData("ReturnTaskOfString_NullValue")]
+        [InlineData("ReturnTaskOfObject_NullValue")]
+        [InlineData("ReturnObject_NullValue")]
+        public async Task
+            NoContentFormatter_ForNullValue_AndTreatNullAsNoContentFlagSetToFalse_DoesNotGetSelected(string actionName)
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/NoContentDoNotTreatNullValueAsNoContent/" +
+                                                 actionName);
+
+            // Assert
+            Assert.Null(response.Content.Headers.ContentType);
+            var body = await response.Content.ReadAsStringAsync();
+            // Response body is empty instead of null.
+            Assert.Empty(body);
+            Assert.Equal(HttpStatusCode.NotAcceptable, response.StatusCode);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorBuildTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorBuildTest.cs
new file mode 100644
index 0000000000..187e9d9ab3
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorBuildTest.cs
@@ -0,0 +1,81 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class RazorBuildTest : IClassFixture<MvcTestFixture<RazorBuildWebSite.Startup>>
+    {
+        public RazorBuildTest(MvcTestFixture<RazorBuildWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task PrecompiledPage_LocalPageWithDifferentContent_NotUsed()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/Precompilation/Page");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("Hello from buildtime-compiled precompilation page!", responseBody.Trim());
+        }
+
+        [Fact]
+        public async Task PrecompiledView_LocalViewWithDifferentContent_NotUsed()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/Precompilation/View");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("Hello from buildtime-compiled precompilation view!", responseBody.Trim());
+        }
+
+        [Fact]
+        public async Task Rzc_LocalPageWithDifferentContent_IsUsed()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/Rzc/Page");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("Hello from runtime-compiled rzc page!", responseBody.Trim());
+        }
+
+        [Fact]
+        public async Task Rzc_LocalViewWithDifferentContent_IsUsed()
+        {
+            // Act
+            var response = await Client.GetAsync("http://localhost/Rzc/View");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("Hello from runtime-compiled rzc view!", responseBody.Trim());
+        }
+
+        [Fact]
+        public async Task RzcViewsArePreferredToPrecompiledViews()
+        {
+            // Verifies that when two views have the same paths, the one compiled using rzc is preferred to the one from Precompilation.
+            // Act
+            var response = await Client.GetAsync("http://localhost/Common/View");
+            var responseBody = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("Hello from buildtime-compiled rzc view!", responseBody.Trim());
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPageExecutionInstrumentationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPageExecutionInstrumentationTest.cs
new file mode 100644
index 0000000000..b6e87cf1a5
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPageExecutionInstrumentationTest.cs
@@ -0,0 +1,43 @@
+// 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.
+
+using System.Net.Http;
+using System.Reflection;
+using System.Threading.Tasks;
+using RazorPageExecutionInstrumentationWebSite;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class RazorPageExecutionInstrumentationTest : IClassFixture<MvcTestFixture<Startup>>
+    {
+        private static readonly Assembly _resourcesAssembly =
+            typeof(RazorPageExecutionInstrumentationTest).GetTypeInfo().Assembly;
+
+        public RazorPageExecutionInstrumentationTest(MvcTestFixture<Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task InstrumentedViews_RenderAsExpected()
+        {
+            // Arrange
+            var outputFile = "compiler/resources/RazorPageExecutionInstrumentationWebSite.Home.ViewWithPartial.html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            // Act
+            var content = await Client.GetStringAsync("http://localhost/Home/ViewWithPartial");
+
+            // Assert
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, content);
+#else
+            Assert.Equal(expectedContent, content, ignoreLineEndingDifferences: true);
+#endif
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPageModelTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPageModelTest.cs
new file mode 100644
index 0000000000..66daab9783
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPageModelTest.cs
@@ -0,0 +1,191 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class RazorPageModelTest : IClassFixture<MvcTestFixture<RazorPagesWebSite.Startup>>
+    {
+        public RazorPageModelTest(MvcTestFixture<RazorPagesWebSite.Startup> fixture)
+        {
+            var factory = fixture.Factories.FirstOrDefault() ?? fixture.WithWebHostBuilder(ConfigureWebHostBuilder);
+            Client = factory.CreateDefaultClient();
+        }
+
+        private static void ConfigureWebHostBuilder(IWebHostBuilder builder) =>
+            builder.UseStartup<RazorPagesWebSite.Startup>();
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task Page_TryUpdateModelAsync_Success()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Post, "Pages/TryUpdateModel/10")
+            {
+                Content = new FormUrlEncodedContent(new KeyValuePair<string, string>[]
+                {
+                    new KeyValuePair<string, string>("Name", "Overriden"),
+                    new KeyValuePair<string, string>("Age", "25"),
+                })
+            };
+
+            await AddAntiforgeryHeaders(request);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Contains("Updated: True", content);
+            Assert.Contains("Name = Overriden", content);
+        }
+
+        [Fact]
+        public async Task Page_TryValidateModel_Success()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Post, "Pages/TryValidateModel/10")
+            {
+                Content = new FormUrlEncodedContent(new KeyValuePair<string, string>[]
+                {
+                    new KeyValuePair<string, string>("Name", "Foo"),
+                    new KeyValuePair<string, string>("Age", "25"),
+                })
+            };
+
+            await AddAntiforgeryHeaders(request);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+
+            Assert.Contains("Validation: success", content.Trim());
+        }
+
+        [Fact]
+        public async Task Page_TryValidateModel_TooLong()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Post, "Pages/TryValidateModel/10")
+            {
+                Content = new FormUrlEncodedContent(new KeyValuePair<string, string>[]
+                {
+                    new KeyValuePair<string, string>("Name", "Foo"),
+                    new KeyValuePair<string, string>("Age", "200"),
+                })
+            };
+
+            await AddAntiforgeryHeaders(request);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+
+            Assert.Contains("Validation: fail", content);
+            Assert.Contains("The field Age must be between 0 and 99.", content);
+        }
+
+        [Fact]
+        public async Task PageModel_TryUpdateModelAsync_Success()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Post, "Pages/TryUpdateModelPageModel/10")
+            {
+                Content = new FormUrlEncodedContent(new KeyValuePair<string, string>[]
+                {
+                    new KeyValuePair<string, string>("Name", "Overriden"),
+                    new KeyValuePair<string, string>("Age", "25"),
+                })
+            };
+
+            await AddAntiforgeryHeaders(request);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Contains("Updated: True", content);
+            Assert.Contains("Name = Overriden", content);
+        }
+
+        [Fact]
+        public async Task PageModel_TryValidateModel_Success()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Post, "Pages/TryValidateModelPageModel/10")
+            {
+                Content = new FormUrlEncodedContent(new KeyValuePair<string, string>[]
+                {
+                    new KeyValuePair<string, string>("Name", "Foo"),
+                    new KeyValuePair<string, string>("Age", "25"),
+                })
+            };
+
+            await AddAntiforgeryHeaders(request);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+
+            Assert.Contains("Validation: success", content.Trim());
+        }
+
+        [Fact]
+        public async Task PageModel_TryValidateModel_TooLong()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Post, "Pages/TryValidateModelPageModel/10")
+            {
+                Content = new FormUrlEncodedContent(new KeyValuePair<string, string>[]
+                {
+                    new KeyValuePair<string, string>("Name", "Foo"),
+                    new KeyValuePair<string, string>("Age", "200"),
+                })
+            };
+
+            await AddAntiforgeryHeaders(request);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+
+            Assert.Contains("Validation: fail", content);
+            Assert.Contains("The field Age must be between 0 and 99.", content);
+        }
+
+        private async Task AddAntiforgeryHeaders(HttpRequestMessage request)
+        {
+            var getResponse = await Client.GetAsync(request.RequestUri);
+            Assert.Equal(HttpStatusCode.OK, getResponse.StatusCode);
+            var getResponseBody = await getResponse.Content.ReadAsStringAsync();
+            var formToken = AntiforgeryTestHelper.RetrieveAntiforgeryToken(getResponseBody, "");
+            var cookie = AntiforgeryTestHelper.RetrieveAntiforgeryCookie(getResponse);
+
+            request.Headers.Add("Cookie", cookie.Key + "=" + cookie.Value);
+            request.Headers.Add("RequestVerificationToken", formToken);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesNamespaceTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesNamespaceTest.cs
new file mode 100644
index 0000000000..f5260d9dca
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesNamespaceTest.cs
@@ -0,0 +1,55 @@
+// 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.
+
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class RazorPagesNamespaceTest : IClassFixture<MvcTestFixture<RazorPagesWebSite.Startup>>
+    {
+        public RazorPagesNamespaceTest(MvcTestFixture<RazorPagesWebSite.Startup> fixture)
+        {
+            var factory = fixture.Factories.FirstOrDefault() ?? fixture.WithWebHostBuilder(ConfigureWebHostBuilder);
+            Client = factory.CreateDefaultClient();
+        }
+
+        private static void ConfigureWebHostBuilder(IWebHostBuilder builder) =>
+            builder.UseStartup<RazorPagesWebSite.Startup>();
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task Page_DefaultNamespace_IfUnset()
+        {
+            // Arrange & Act
+            var content = await Client.GetStringAsync("http://localhost/DefaultNamespace");
+
+            // Assert
+            Assert.Equal("AspNetCore", content.Trim());
+        }
+        
+        [Fact]
+        public async Task Page_ImportedNamespace_UsedFromViewImports()
+        {
+            // Arrange & Act
+            var content = await Client.GetStringAsync("http://localhost/Pages/Namespace/Nested/Folder");
+
+            // Assert
+            Assert.Equal("CustomNamespace.Nested.Folder", content.Trim());
+        }
+        
+        [Fact]
+        public async Task Page_OverrideNamespace_SetByPage()
+        {
+            // Arrange & Act
+            var content = await Client.GetStringAsync("http://localhost/Pages/Namespace/Nested/Override");
+
+            // Assert
+            Assert.Equal("Override", content.Trim());
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesTest.cs
new file mode 100644
index 0000000000..d97e128727
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesTest.cs
@@ -0,0 +1,1440 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Authorization;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Testing;
+using Newtonsoft.Json.Linq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class RazorPagesTest : IClassFixture<MvcTestFixture<RazorPagesWebSite.Startup>>
+    {
+        private static readonly Assembly _resourcesAssembly = typeof(RazorPagesTest).GetTypeInfo().Assembly;
+
+        public RazorPagesTest(MvcTestFixture<RazorPagesWebSite.Startup> fixture)
+        {
+            var factory = fixture.Factories.FirstOrDefault() ?? fixture.WithWebHostBuilder(ConfigureWebHostBuilder);
+            Client = factory.CreateDefaultClient();
+        }
+
+        private static void ConfigureWebHostBuilder(IWebHostBuilder builder) =>
+            builder.UseStartup<RazorPagesWebSite.Startup>();
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task Page_SimpleForms_RenderAntiforgery()
+        {
+            // Arrange
+            var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");
+            var outputFile = "compiler/resources/RazorPagesWebSite.SimpleForms.html";
+            var expectedContent = await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/SimpleForms");
+            var responseContent = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
+
+            var forgeryToken = AntiforgeryTestHelper.RetrieveAntiforgeryToken(responseContent, "SimpleForms");
+#if GENERATE_BASELINES
+            // Reverse usual substitution and insert a format item into the new file content.
+            responseContent = responseContent.Replace(forgeryToken, "{0}");
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            expectedContent = string.Format(expectedContent, forgeryToken);
+            Assert.Equal(expectedContent, responseContent.Trim(), ignoreLineEndingDifferences: true);
+#endif
+        }
+
+        [Fact]
+        public async Task Page_Handler_HandlerFromQueryString()
+        {
+            // Arrange & Act
+            var content = await Client.GetStringAsync("http://localhost/HandlerTestPage?handler=Customer");
+
+            // Assert
+            Assert.StartsWith("Method: OnGetCustomer", content.Trim());
+        }
+
+        [Fact]
+        public async Task Page_Handler_HandlerRouteDataChosenOverQueryString()
+        {
+            // Arrange & Act
+            var content = await Client.GetStringAsync("http://localhost/HandlerTestPage/Customer?handler=ViewCustomer");
+
+            // Assert
+            Assert.StartsWith("Method: OnGetCustomer", content.Trim());
+        }
+
+        [Fact]
+        public async Task Page_Handler_Handler()
+        {
+            // Arrange & Act
+            var content = await Client.GetStringAsync("http://localhost/HandlerTestPage/Customer");
+
+            // Assert
+            Assert.StartsWith("Method: OnGetCustomer", content.Trim());
+        }
+
+        [Fact]
+        public async Task Page_Handler_Async()
+        {
+            // Arrange
+            var getResponse = await Client.GetAsync("http://localhost/HandlerTestPage");
+            var getResponseBody = await getResponse.Content.ReadAsStringAsync();
+            var formToken = AntiforgeryTestHelper.RetrieveAntiforgeryToken(getResponseBody, "/ModelHandlerTestPage");
+            var cookie = AntiforgeryTestHelper.RetrieveAntiforgeryCookie(getResponse);
+
+            var postRequest = new HttpRequestMessage(HttpMethod.Post, "http://localhost/HandlerTestPage");
+            postRequest.Headers.Add("Cookie", cookie.Key + "=" + cookie.Value);
+            postRequest.Headers.Add("RequestVerificationToken", formToken);
+
+            // Act
+            var response = await Client.SendAsync(postRequest);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.StartsWith("Method: OnPostAsync", content.Trim());
+        }
+
+        [Fact]
+        public async Task Page_Handler_AsyncHandler()
+        {
+            // Arrange & Act
+            var content = await Client.GetStringAsync("http://localhost/HandlerTestPage/ViewCustomer");
+
+            // Assert
+            Assert.StartsWith("Method: OnGetViewCustomerAsync", content.Trim());
+        }
+
+        [Fact]
+        public async Task Page_Handler_ReturnTypeImplementsIActionResult()
+        {
+            // Arrange
+            var getResponse = await Client.GetAsync("http://localhost/HandlerTestPage");
+            var getResponseBody = await getResponse.Content.ReadAsStringAsync();
+            var formToken = AntiforgeryTestHelper.RetrieveAntiforgeryToken(getResponseBody, "/ModelHandlerTestPage");
+            var cookie = AntiforgeryTestHelper.RetrieveAntiforgeryCookie(getResponse);
+
+            var postRequest = new HttpRequestMessage(HttpMethod.Post, "http://localhost/HandlerTestPage/CustomActionResult");
+            postRequest.Headers.Add("Cookie", cookie.Key + "=" + cookie.Value);
+            postRequest.Headers.Add("RequestVerificationToken", formToken);
+            // Act
+            var response = await Client.SendAsync(postRequest);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("CustomActionResult", content);
+        }
+
+        [Fact]
+        public async Task Page_Handler_AsyncReturnTypeImplementsIActionResult()
+        {
+            // Arrange & Act
+            var content = await Client.GetStringAsync("http://localhost/HandlerTestPage/CustomActionResult");
+
+            // Assert
+            Assert.Equal("CustomActionResult", content);
+        }
+
+        [Fact]
+        public async Task PageModel_Handler_Handler()
+        {
+            // Arrange & Act
+            var content = await Client.GetStringAsync("http://localhost/ModelHandlerTestPage/Customer");
+
+            // Assert
+            Assert.StartsWith("Method: OnGetCustomer", content.Trim());
+        }
+
+        [Fact]
+        public async Task PageModel_Handler_Async()
+        {
+            // Arrange
+            var getResponse = await Client.GetAsync("http://localhost/ModelHandlerTestPage");
+            var getResponseBody = await getResponse.Content.ReadAsStringAsync();
+            var formToken = AntiforgeryTestHelper.RetrieveAntiforgeryToken(getResponseBody, "/ModelHandlerTestPage");
+            var cookie = AntiforgeryTestHelper.RetrieveAntiforgeryCookie(getResponse);
+
+            var postRequest = new HttpRequestMessage(HttpMethod.Post, "http://localhost/ModelHandlerTestPage");
+            postRequest.Headers.Add("Cookie", cookie.Key + "=" + cookie.Value);
+            postRequest.Headers.Add("RequestVerificationToken", formToken);
+
+            // Act
+            var response = await Client.SendAsync(postRequest);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.StartsWith("Method: OnPostAsync", content.Trim());
+        }
+
+        [Fact]
+        public async Task PageModel_Handler_AsyncHandler()
+        {
+            // Arrange & Act
+            var content = await Client.GetStringAsync("http://localhost/ModelHandlerTestPage/ViewCustomer");
+
+            // Assert
+            Assert.StartsWith("Method: OnGetViewCustomerAsync", content.Trim());
+        }
+
+        [Fact]
+        public async Task PageModel_Handler_ReturnTypeImplementsIActionResult()
+        {
+            // Arrange
+            var getResponse = await Client.GetAsync("http://localhost/ModelHandlerTestPage");
+            var getResponseBody = await getResponse.Content.ReadAsStringAsync();
+            var formToken = AntiforgeryTestHelper.RetrieveAntiforgeryToken(getResponseBody, "/ModelHandlerTestPage");
+            var cookie = AntiforgeryTestHelper.RetrieveAntiforgeryCookie(getResponse);
+
+            var postRequest = new HttpRequestMessage(HttpMethod.Post, "http://localhost/ModelHandlerTestPage/CustomActionResult");
+            postRequest.Headers.Add("Cookie", cookie.Key + "=" + cookie.Value);
+            postRequest.Headers.Add("RequestVerificationToken", formToken);
+            // Act
+            var response = await Client.SendAsync(postRequest);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("CustomActionResult", content);
+        }
+
+        [Fact]
+        public async Task PageModel_Handler_AsyncReturnTypeImplementsIActionResult()
+        {
+            // Arrange & Act
+            var content = await Client.GetStringAsync("http://localhost/ModelHandlerTestPage/CustomActionResult");
+
+            // Assert
+            Assert.Equal("CustomActionResult", content);
+        }
+
+        [Fact]
+        public async Task RouteData_StringValueOnIntProp_ExpectsNotFound()
+        {
+            // Arrange
+            var routeRequest = new HttpRequestMessage(HttpMethod.Get, "http://localhost/RouteData/pizza");
+
+            // Act
+            var routeResponse = await Client.SendAsync(routeRequest);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, routeResponse.StatusCode);
+        }
+
+        [Fact]
+        public async Task RouteData_IntProperty_IsCoerced()
+        {
+            // Arrange
+            var routeRequest = new HttpRequestMessage(HttpMethod.Get, "http://localhost/RouteData/5");
+
+            // Act
+            var routeResponse = await Client.SendAsync(routeRequest);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, routeResponse.StatusCode);
+
+            var content = await routeResponse.Content.ReadAsStringAsync();
+            Assert.Equal("From RouteData: 5", content.Trim());
+        }
+
+        [Fact]
+        public async Task Page_SetsPath()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/PathSet");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Path: /PathSet.cshtml", content.Trim());
+        }
+
+        // Tests that RazorPage includes InvalidTagHelperIndexerAssignment which is called when the page has an indexer
+        // Issue https://github.com/aspnet/Mvc/issues/5920
+        [Fact]
+        public async Task TagHelper_InvalidIndexerDoesNotFail()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/TagHelpers");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var content = await response.Content.ReadAsStringAsync();
+
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.StartsWith("<a href=\"/Show?id=2\">Post title</a>", content.Trim());
+        }
+
+        [Fact]
+        public async Task NoPage_NotFound()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/NoPage");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task PageHandlerCanReturnBadRequest()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/Pages/HandlerWithParameter");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+            Assert.Equal("Parameter cannot be null.", await response.Content.ReadAsStringAsync());
+        }
+
+        [Fact]
+        public async Task HelloWorld_CanGetContent()
+        {
+            // Arrange
+            // Note: If the route in this test case ever changes, the negative test case
+            // RazorPagesWithBasePathTest.PageOutsideBasePath_IsNotRouteable needs to be updated too.
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/HelloWorld");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Hello, World!", content.Trim());
+        }
+
+        [Fact]
+        public async Task HelloWorldWithRoute_CanGetContent()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/HelloWorldWithRoute/Some/Path/route");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Hello, route!", content.Trim());
+        }
+
+        [Fact]
+        public async Task HelloWorldWithHandler_CanGetContent()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/HelloWorldWithHandler?message=handler");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Hello, handler!", content.Trim());
+        }
+
+        [Fact]
+        public async Task HelloWorldWithPageModelHandler_CanPostContent()
+        {
+            // Arrange
+            var getRequest = new HttpRequestMessage(HttpMethod.Get, "http://localhost/HelloWorldWithPageModelHandler?message=message");
+            var getResponse = await Client.SendAsync(getRequest);
+            var getResponseBody = await getResponse.Content.ReadAsStringAsync();
+            var formToken = AntiforgeryTestHelper.RetrieveAntiforgeryToken(getResponseBody, "/HelloWorlWithPageModelHandler");
+            var cookie = AntiforgeryTestHelper.RetrieveAntiforgeryCookie(getResponse);
+
+
+            var postRequest = new HttpRequestMessage(HttpMethod.Post, "http://localhost/HelloWorldWithPageModelHandler");
+            postRequest.Headers.Add("Cookie", cookie.Key + "=" + cookie.Value);
+            postRequest.Headers.Add("RequestVerificationToken", formToken);
+
+            // Act
+            var response = await Client.SendAsync(postRequest);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.StartsWith("Hello, You posted!", content.Trim());
+        }
+
+        [Theory]
+        [InlineData("GET")]
+        [InlineData("HEAD")]
+        public async Task HelloWorldWithPageModelHandler_CanGetContent(string httpMethod)
+        {
+            // Arrange
+            var url = "http://localhost/HelloWorldWithPageModelHandler?message=pagemodel";
+            var request = new HttpRequestMessage(new HttpMethod(httpMethod), url);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.StartsWith("Hello, pagemodel!", content.Trim());
+        }
+
+        [Fact]
+        public async Task HelloWorldWithPageModelAttributeHandler()
+        {
+            // Arrange
+            var url = "HelloWorldWithPageModelAttributeModel?message=DecoratedModel";
+
+            // Act
+            var content = await Client.GetStringAsync(url);
+
+            // Assert
+            Assert.Equal("Hello, DecoratedModel!", content.Trim());
+        }
+
+        [Fact]
+        public async Task PageWithoutContent()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/PageWithoutContent/No/Content/Path");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("", content);
+        }
+
+        [Fact]
+        public async Task ViewReturnsPage()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/OnGetView");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("The message: From OnGet", content.Trim());
+        }
+
+        [Fact]
+        public async Task TempData_SetTempDataInPage_CanReadValue()
+        {
+            // Arrange 1
+            var url = "http://localhost/TempData/SetTempDataOnPageAndRedirect?message=Hi1";
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+
+            // Act 1
+            var response = await Client.SendAsync(request);
+
+            // Assert 1
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+
+            // Arrange 2
+            request = new HttpRequestMessage(HttpMethod.Get, response.Headers.Location);
+            request.Headers.Add("Cookie", GetCookie(response));
+
+            // Act2
+            response = await Client.SendAsync(request);
+
+            // Assert 2
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Hi1", content.Trim());
+        }
+
+        [Fact]
+        public async Task TempData_SetTempDataInPageModel_CanReadValue()
+        {
+            // Arrange 1
+            var url = "http://localhost/TempData/SetTempDataOnPageModelAndRedirect?message=Hi2";
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+
+            // Act 1
+            var response = await Client.SendAsync(request);
+
+            // Assert 1
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+
+            // Arrange 2
+            request = new HttpRequestMessage(HttpMethod.Get, response.Headers.Location);
+            request.Headers.Add("Cookie", GetCookie(response));
+
+            // Act 2
+            response = await Client.SendAsync(request);
+
+            // Assert 2
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Hi2", content.Trim());
+        }
+
+        [Fact]
+        public async Task TempData_TempDataPropertyOnPageModel_IsPopulatedFromTempData()
+        {
+            // Arrange 1
+            var url = "http://localhost/TempData/SetMessageAndRedirect";
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+
+            // Act 1
+            var response = await Client.SendAsync(request);
+
+            // Assert 1
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+
+            // Act 2
+            request = new HttpRequestMessage(HttpMethod.Get, response.Headers.Location);
+            request.Headers.Add("Cookie", GetCookie(response));
+            response = await Client.SendAsync(request);
+
+            // Assert 2
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.StartsWith("Message: Secret Message", content.Trim());
+            Assert.EndsWith("TempData: Secret Message", content.Trim());
+        }
+
+        [Fact]
+        public async Task TempData_TempDataPropertyOnPageModel_PopulatesTempData()
+        {
+            // Arrange 1
+            var getRequest = new HttpRequestMessage(HttpMethod.Get, "http://localhost/TempData/TempDataPageModelProperty");
+            var getResponse = await Client.SendAsync(getRequest);
+            var getResponseBody = await getResponse.Content.ReadAsStringAsync();
+            var formToken = AntiforgeryTestHelper.RetrieveAntiforgeryToken(getResponseBody, "/TempData/TempDataPageModelProperty");
+            var cookie = AntiforgeryTestHelper.RetrieveAntiforgeryCookie(getResponse);
+
+            var url = "http://localhost/TempData/TempDataPageModelProperty";
+            var request = new HttpRequestMessage(HttpMethod.Post, url);
+            request.Headers.Add("Cookie", cookie.Key + "=" + cookie.Value);
+            request.Headers.Add("RequestVerificationToken", formToken);
+
+            // Act 1
+            var response = await Client.SendAsync(request);
+
+            // Assert 1
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.StartsWith("Message: Secret post", content.Trim());
+            Assert.EndsWith("TempData:", content.Trim());
+
+            // Arrange 2
+            request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/TempData/TempDataPageModelProperty");
+            request.Headers.Add("Cookie", GetCookie(response));
+
+            // Act 2
+            response = await Client.SendAsync(request);
+
+            // Assert 2
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            content = await response.Content.ReadAsStringAsync();
+            Assert.StartsWith("Message: Secret post", content.Trim());
+            Assert.EndsWith("TempData: Secret post", content.Trim());
+        }
+
+        [Fact]
+        public async Task AuthorizePage_AddsAuthorizationForSpecificPages()
+        {
+            // Arrange
+            var url = "/HelloWorldWithAuth";
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal("/Login?ReturnUrl=%2FHelloWorldWithAuth", response.Headers.Location.PathAndQuery);
+        }
+
+        [Fact]
+        public async Task AuthorizePage_AllowAnonymousForSpecificPages()
+        {
+            // Arrange
+            var url = "/Pages/Admin/Login";
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Login Page", content);
+        }
+
+        [Fact]
+        public async Task ViewStart_IsDiscoveredWhenRootDirectoryIsNotSpecified()
+        {
+            // Test for https://github.com/aspnet/Mvc/issues/5915
+            //Arrange
+            var expected = @"Hello from _ViewStart
+Hello from /Pages/WithViewStart/Index.cshtml!";
+
+            // Act
+            var response = await Client.GetStringAsync("/Pages/WithViewStart");
+
+            // Assert
+            Assert.Equal(expected, response, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task ViewImport_IsDiscoveredWhenRootDirectoryIsNotSpecified()
+        {
+            // Test for https://github.com/aspnet/Mvc/issues/5915
+            // Arrange
+            var expected = "Hello from CustomService!";
+
+            // Act
+            var response = await Client.GetStringAsync("/Pages/WithViewImport");
+
+            // Assert
+            Assert.Equal(expected, response.Trim());
+        }
+
+        [Fact]
+        public async Task PropertiesOnPageAreBound()
+        {
+            // Arrange
+            var expected = "Id = 10, Name = Foo, Age = 25";
+            var request = new HttpRequestMessage(HttpMethod.Post, "Pages/PropertyBinding/PagePropertyBinding/10")
+            {
+                Content = new FormUrlEncodedContent(new KeyValuePair<string, string>[]
+                {
+                    new KeyValuePair<string, string>("Name", "Foo"),
+                    new KeyValuePair<string, string>("Age", "25"),
+                }),
+            };
+            await AddAntiforgeryHeaders(request);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.StartsWith(expected, content.Trim());
+        }
+
+        [Fact]
+        public async Task PropertiesOnPageAreValidated()
+        {
+            // Arrange
+            var expected = new[]
+            {
+                "Id = 27, Name = , Age = 325",
+                "The Name field is required.",
+                "The field Age must be between 0 and 99.",
+            };
+            var request = new HttpRequestMessage(HttpMethod.Post, "Pages/PropertyBinding/PagePropertyBinding/27")
+            {
+                Content = new FormUrlEncodedContent(new KeyValuePair<string, string>[]
+                {
+                    new KeyValuePair<string, string>("Age", "325"),
+                }),
+            };
+            await AddAntiforgeryHeaders(request);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            foreach (var item in expected)
+            {
+                Assert.Contains(item, content);
+            }
+        }
+
+        [Fact]
+        public async Task PropertiesOnPageModelAreBound()
+        {
+            // Arrange
+            var expected = "Id = 10, Name = Foo, Age = 25, PropertyWithSupportGetsTrue = foo";
+            var request = new HttpRequestMessage(HttpMethod.Post, "Pages/PropertyBinding/PageModelWithPropertyBinding/10?PropertyWithSupportGetsTrue=foo")
+            {
+                Content = new FormUrlEncodedContent(new KeyValuePair<string, string>[]
+                {
+                    new KeyValuePair<string, string>("Name", "Foo"),
+                    new KeyValuePair<string, string>("Age", "25"),
+                }),
+            };
+            await AddAntiforgeryHeaders(request);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.StartsWith(expected, content.Trim());
+        }
+
+        [Fact]
+        public async Task PropertiesOnPageModelAreValidated()
+        {
+            // Arrange
+            var url = "Pages/PropertyBinding/PageModelWithPropertyBinding/27";
+            var expected = new[]
+            {
+                "Id = 27, Name = , Age = 325, PropertyWithSupportGetsTrue =",
+                "The Name field is required.",
+                "The field Age must be between 0 and 99.",
+            };
+
+            var request = new HttpRequestMessage(HttpMethod.Post, url)
+            {
+                Content = new FormUrlEncodedContent(new KeyValuePair<string, string>[]
+                {
+                    new KeyValuePair<string, string>("Age", "325"),
+                }),
+            };
+
+            await AddAntiforgeryHeaders(request);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            foreach (var item in expected)
+            {
+                Assert.Contains(item, content);
+            }
+        }
+
+        [Fact]
+        public async Task PolymorphicPropertiesOnPageModelsAreBound()
+        {
+            // Arrange
+            var name = "TestName";
+            var age = 23;
+            var expected = $"Name = {name}, Age = {age}";
+            var request = new HttpRequestMessage(HttpMethod.Post, "Pages/PropertyBinding/PolymorphicBinding")
+            {
+                Content = new FormUrlEncodedContent(new Dictionary<string, string>
+                {
+                    { "Name", name },
+                    { "Age", age.ToString() },
+                }),
+            };
+            await AddAntiforgeryHeaders(request);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            await response.AssertStatusCodeAsync(HttpStatusCode.OK);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expected, content);
+        }
+
+        [Fact]
+        public async Task PolymorphicPropertiesOnPageModelsAreValidated()
+        {
+            // Arrange
+            var name = "TestName";
+            var age = 123;
+            var expected = $"Name = {name}, Age = {age}";
+            var request = new HttpRequestMessage(HttpMethod.Post, "Pages/PropertyBinding/PolymorphicBinding")
+            {
+                Content = new FormUrlEncodedContent(new Dictionary<string, string>
+                {
+                    { "Name", name },
+                    { "Age", age.ToString() },
+                }),
+            };
+            await AddAntiforgeryHeaders(request);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            await response.AssertStatusCodeAsync(HttpStatusCode.BadRequest);
+            var result = JObject.Parse(await response.Content.ReadAsStringAsync());
+            Assert.Collection(
+               result.Properties(),
+               p =>
+               {
+                   Assert.Equal("Age", p.Name);
+                   var value = Assert.IsType<JArray>(p.Value);
+                   Assert.Equal("The field Age must be between 0 and 99.", value.First.ToString());
+               });
+        }
+
+        [Fact]
+        public async Task HandlerMethodArgumentsAndPropertiesAreModelBound()
+        {
+            // Arrange
+            var expected = "Id = 11, Name = Test-Name, Age = 32";
+            var request = new HttpRequestMessage(HttpMethod.Post, "Pages/PropertyBinding/PageWithPropertyAndArgumentBinding?id=11")
+            {
+                Content = new FormUrlEncodedContent(new KeyValuePair<string, string>[]
+                {
+                    new KeyValuePair<string, string>("Name", "Test-Name"),
+                    new KeyValuePair<string, string>("Age", "32"),
+                }),
+            };
+            await AddAntiforgeryHeaders(request);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.StartsWith(expected, content.Trim());
+        }
+
+        [Fact]
+        public async Task PagePropertiesAreNotBoundInGetRequests()
+        {
+            // Arrange
+            var expected = "Id = 11, Name = Test-Name, Age =";
+            var validationError = "The Name field is required.";
+            var request = new HttpRequestMessage(HttpMethod.Get, "Pages/PropertyBinding/PageWithPropertyAndArgumentBinding?id=11")
+            {
+                Content = new FormUrlEncodedContent(new KeyValuePair<string, string>[]
+                {
+                    new KeyValuePair<string, string>("Name", "Test-Name"),
+                    new KeyValuePair<string, string>("Age", "32"),
+                }),
+            };
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.StartsWith(expected, content.Trim());
+            Assert.DoesNotContain(validationError, content);
+        }
+
+        [Fact]
+        public async Task PageProperty_WithSupportsGetTrue_OnPageWithHandler_FuzzyMatchesHeadRequest()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Head, "Pages/PropertyBinding/PageModelWithPropertyBinding/10?PropertyWithSupportGetsTrue=foo");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/html", response.Content.Headers.ContentType.MediaType);
+        }
+
+        [Fact]
+        public async Task PageProperty_WithSupportsGetTrue_OnPageWithNoHandler_FuzzyMatchesHeadRequest()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Head, "Pages/PropertyBinding/BindPropertyWithGet?value=11");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/html", response.Content.Headers.ContentType.MediaType);
+        }
+
+        [Fact]
+        public async Task PageProperty_WithSupportsGet_BoundInGet()
+        {
+            // Arrange
+            var expected = "<p>11</p>";
+            var request = new HttpRequestMessage(HttpMethod.Get, "Pages/PropertyBinding/BindPropertyWithGet?value=11");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.StartsWith(expected, content.Trim());
+        }
+
+        [Fact]
+        public async Task PagePropertiesAreInjected()
+        {
+            // Arrange
+            var expected =
+@"Microsoft.AspNetCore.Mvc.Routing.UrlHelper
+Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelper`1[AspNetCore.InjectedPageProperties]
+Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary`1[AspNetCore.InjectedPageProperties]";
+
+            // Act
+            var response = await Client.GetStringAsync("InjectedPageProperties");
+
+            // Assert
+            Assert.Equal(expected, response.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task RedirectFromPageWorks()
+        {
+            // Arrange
+            var expected = "/Pages/Redirects/Redirect/10";
+
+            // Act
+            var response = await Client.GetAsync("/Pages/Redirects/RedirectFromPage");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal(expected, response.Headers.Location.ToString());
+        }
+
+        [Fact]
+        public async Task RedirectFromPageModelWorks()
+        {
+            // Arrange
+            var expected = "/Pages/Redirects/Redirect/12";
+
+            // Act
+            var response = await Client.GetAsync("/Pages/Redirects/RedirectFromModel");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal(expected, response.Headers.Location.ToString());
+        }
+
+        [Fact]
+        public async Task RedirectToSelfWorks()
+        {
+            // Arrange
+            var expected = "/Pages/Redirects/RedirectToSelf?user=37";
+            var request = new HttpRequestMessage(HttpMethod.Post, "/Pages/Redirects/RedirectToSelf")
+            {
+                Content = new FormUrlEncodedContent(new KeyValuePair<string, string>[]
+                {
+                    new KeyValuePair<string, string>("value", "37"),
+                }),
+            };
+
+            // Act
+            await AddAntiforgeryHeaders(request);
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal(expected, response.Headers.Location.ToString());
+        }
+
+        [Fact]
+        public async Task RedirectDoesNotIncludeHandlerByDefault()
+        {
+            // Arrange
+            var expected = "/Pages/Redirects/RedirectFromHandler";
+
+            // Act
+            var response = await Client.GetAsync("/Pages/Redirects/RedirectFromHandler/RedirectToPage/10");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal(expected, response.Headers.Location.ToString());
+        }
+
+        [Fact]
+        public async Task RedirectToOtherHandlersWorks()
+        {
+            // Arrange
+            var expected = "/Pages/Redirects/RedirectFromHandler/RedirectToPage/11";
+
+            // Act
+            var response = await Client.GetAsync("/Pages/Redirects/RedirectFromHandler/RedirectToAnotherHandler/11");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal(expected, response.Headers.Location.ToString());
+        }
+
+        [Fact]
+        public async Task Controller_RedirectToPage()
+        {
+            // Arrange
+            var expected = "/RedirectToController?param=17";
+
+            // Act
+            var response = await Client.GetAsync("/RedirectToPage");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal(expected, response.Headers.Location.ToString());
+        }
+
+        [Fact]
+        public async Task Page_RedirectToController()
+        {
+            // Arrange
+            var expected = "/RedirectToPage?param=92";
+
+            // Act
+            var response = await Client.GetAsync("/RedirectToController");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal(expected, response.Headers.Location.ToString());
+        }
+
+        [Fact]
+        public async Task RedirectToSibling_Works()
+        {
+            // Arrange
+            var expected = "/Pages/Redirects/Redirect/10";
+            var response = await Client.GetAsync("/Pages/Redirects/RedirectToSibling/RedirectToRedirect");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal(expected, response.Headers.Location.ToString());
+        }
+
+        [Fact]
+        public async Task RedirectToSibling_RedirectsToIndexPage_WithoutIndexSegment()
+        {
+            // Arrange
+            var expected = "/Pages/Redirects";
+            var response = await Client.GetAsync("/Pages/Redirects/RedirectToSibling/RedirectToIndex");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal(expected, response.Headers.Location.ToString());
+        }
+
+        [Fact]
+        public async Task RedirectToSibling_RedirectsToSubDirectory()
+        {
+            // Arrange
+            var expected = "/Pages/Redirects/SubDir/SubDirPage";
+            var response = await Client.GetAsync("/Pages/Redirects/RedirectToSibling/RedirectToSubDir");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal(expected, response.Headers.Location.ToString());
+        }
+
+        [Fact]
+        public async Task RedirectToSibling_RedirectsToDotSlash()
+        {
+            // Arrange
+            var expected = "/Pages/Redirects/SubDir/SubDirPage";
+
+            // Act
+            var response = await Client.GetAsync("/Pages/Redirects/RedirectToSibling/RedirectToDotSlash");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal(expected, response.Headers.Location.ToString());
+        }
+
+        [Fact]
+        public async Task RedirectToSibling_RedirectsToParentDirectory()
+        {
+            // Arrange
+            var expected = "/Pages/Conventions/AuthFolder";
+            var response = await Client.GetAsync("/Pages/Redirects/RedirectToSibling/RedirectToParent");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal(expected, response.Headers.Location.ToString());
+        }
+
+        [Fact]
+        public async Task TagHelpers_SupportSiblingRoutes()
+        {
+            // Arrange
+            var expected =
+@"<form method=""post"" action=""/Pages/TagHelper/CrossPost""></form>
+<a href=""/Pages/TagHelper/SelfPost/12"" />
+<input type=""image"" formaction=""/Pages/TagHelper/CrossPost#my-fragment"" />";
+
+            // Act
+            var response = await Client.GetStringAsync("/Pages/TagHelper/SiblingLinks");
+
+            // Assert
+            Assert.Equal(expected, response.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task TagHelpers_SupportSubDirectoryRoutes()
+        {
+            // Arrange
+            var expected =
+@"<form method=""post"" action=""/Pages/TagHelper/SubDir/SubDirPage""></form>
+<a href=""/Pages/TagHelper/SubDir/SubDirPage/12"" />
+<input type=""image"" formaction=""/Pages/TagHelper/SubDir/SubDirPage#my-fragment"" />";
+
+            // Act
+            var response = await Client.GetStringAsync("/Pages/TagHelper/SubDirectoryLinks");
+
+            // Assert
+            Assert.Equal(expected, response.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task TagHelpers_SupportsPathNavigation()
+        {
+            // Arrange
+            var expected =
+@"<form method=""post"" action=""/Pages/TagHelper/SubDirectoryLinks""></form>
+<form method=""post"" action=""/HelloWorld""></form>
+<a href=""/Pages/Redirects/RedirectToIndex"" />
+<input type=""image"" formaction=""/Pages/Admin#my-fragment"" />";
+
+            // Act
+            var response = await Client.GetStringAsync("/Pages/TagHelper/PathTraversalLinks");
+
+            // Assert
+            Assert.Equal(expected, response.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task Page_WithSection_CanAccessModel()
+        {
+            // Arrange
+            var expected = "Value is 17";
+
+            // Act
+            var response = await Client.GetStringAsync("/Pages/Section");
+
+            // Assert
+            Assert.StartsWith(expected, response.Trim());
+        }
+
+        [Fact]
+        public async Task PagesCanByRoutedViaRoute_AddedViaAddPageRoute()
+        {
+            // Arrange
+            var expected = "Hello, test!";
+
+            // Act
+            var response = await Client.GetStringAsync("/Different-Route/test");
+
+            // Assert
+            Assert.StartsWith(expected, response.Trim());
+        }
+
+        [Fact]
+        public async Task PagesCanByRoutedToApplicationRoot_ViaAddPageRoute()
+        {
+            // Arrange
+            var expected = "Hello from NotTheRoot";
+
+            // Act
+            var response = await Client.GetStringAsync("");
+
+            // Assert
+            Assert.StartsWith(expected, response.Trim());
+        }
+
+        [Fact]
+        public async Task AuthFiltersAppliedToPageModel_AreExecuted()
+        {
+            // Act
+            var response = await Client.GetAsync("/ModelWithAuthFilter");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal("/Login?ReturnUrl=%2FModelWithAuthFilter", response.Headers.Location.PathAndQuery);
+        }
+
+        [Fact]
+        public async Task AuthorizeAttributeIsExecutedPriorToAutoAntiforgeryFilter()
+        {
+            // Act
+            var response = await Client.PostAsync("/Pages/Admin/Edit", new StringContent(""));
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal("/Login?ReturnUrl=%2FPages%2FAdmin%2FEdit", response.Headers.Location.PathAndQuery);
+        }
+
+        [Fact]
+        public async Task PageFiltersAppliedToPageModel_AreExecuted()
+        {
+            // Arrange
+            var expected = "Hello from OnGetEdit";
+
+            // Act
+            var response = await Client.GetStringAsync("/ModelWithPageFilter");
+
+            // Assert
+            Assert.Equal(expected, response.Trim());
+        }
+
+        [Fact]
+        public async Task ResponseCacheAttributes_AreApplied()
+        {
+            // Arrange
+            var expected = "Hello from ModelWithResponseCache.OnGet";
+
+            // Act
+            var response = await Client.GetAsync("/ModelWithResponseCache");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var cacheControl = response.Headers.CacheControl;
+            Assert.Equal(TimeSpan.FromSeconds(10), cacheControl.MaxAge.Value);
+            Assert.True(cacheControl.Private);
+            Assert.Equal(expected, (await response.Content.ReadAsStringAsync()).Trim());
+        }
+
+        [Fact]
+        public async Task ViewLocalizer_WorksForPagesWithoutModel()
+        {
+            // Arrange
+            var expected = "Bon Jour from Page";
+
+            // Act
+            var response = await Client.GetStringAsync("/Pages/Localized/Page?culture=fr-FR");
+
+            Assert.Equal(expected, response.Trim());
+        }
+
+        [Fact]
+        public async Task ViewLocalizer_WorksForPagesWithModel()
+        {
+            // Arrange
+            var expected = "Bon Jour from PageWithModel";
+
+            // Act
+            var response = await Client.GetStringAsync("/Pages/Localized/PageWithModel?culture=fr-FR");
+
+            // Assert
+            Assert.Equal(expected, response.Trim());
+        }
+
+        [Fact]
+        public async Task BindPropertiesAttribute_CanBeAppliedToModelType()
+        {
+            // Arrange
+            var expected = "Property1 = 123, Property2 = 25,";
+            var request = new HttpRequestMessage(HttpMethod.Post, "/Pages/PropertyBinding/BindPropertiesOnModel?Property1=123")
+            {
+                Content = new FormUrlEncodedContent(new Dictionary<string, string>
+                {
+                    { "Property2", "25" },
+                }),
+            };
+            await AddAntiforgeryHeaders(request);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            response.EnsureSuccessStatusCode();
+            var responseContent = await response.Content.ReadAsStringAsync();
+            Assert.StartsWith(expected, responseContent.Trim());
+        }
+
+        [Fact]
+        public async Task BindPropertiesAttribute_CanBeAppliedToModelType_AllowsBindingOnGet()
+        {
+            // Arrange
+            var url = "/Pages/PropertyBinding/BindPropertiesWithSupportsGetOnModel?Property=Property-Value";
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            await response.AssertStatusCodeAsync(HttpStatusCode.OK);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Property-Value", content.Trim());
+        }
+
+        [Fact]
+        public async Task BindingInfoOnPropertiesIsPreferredToBindingInfoOnType()
+        {
+            // Arrange
+            var expected = "Property1 = 123, Property2 = 25,";
+            var request = new HttpRequestMessage(HttpMethod.Post, "/Pages/PropertyBinding/BindPropertiesOnModel?Property1=123")
+            {
+                Content = new FormUrlEncodedContent(new[]
+                {
+                    // FormValueProvider appears before QueryStringValueProvider. However, the FromQuery explicitly listed
+                    // on the property should cause it to use the latter.
+                    new KeyValuePair<string, string>("Property1", "345"),
+                    new KeyValuePair<string, string>("Property2", "25"),
+                }),
+            };
+            await AddAntiforgeryHeaders(request);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            response.EnsureSuccessStatusCode();
+            var responseContent = await response.Content.ReadAsStringAsync();
+            Assert.StartsWith(expected, responseContent.Trim());
+        }
+
+        [Fact]
+        public Task InheritsOnViewImportsWorksForPagesWithoutModel()
+            => InheritsOnViewImportsWorks("Pages/CustomBaseType/Page");
+
+        [Fact]
+        public Task InheritsOnViewImportsWorksForPagesWithModel()
+            => InheritsOnViewImportsWorks("Pages/CustomBaseType/PageWithModel");
+
+        private async Task InheritsOnViewImportsWorks(string path)
+        {
+            // Arrange
+            var expected = "<custom-base-type-layout>RazorPagesWebSite.CustomPageBase</custom-base-type-layout>";
+
+            // Act
+            var response = await Client.GetStringAsync(path);
+
+            // Assert
+            Assert.Equal(expected, response.Trim());
+        }
+
+        [Fact]
+        public async Task PageHandlerFilterOnPageModelIsExecuted()
+        {
+            // Arrange
+            var expected = "Hello from OnPageHandlerExecuting";
+
+            // Act
+            var response = await Client.GetStringAsync("/ModelAsFilter?message=Hello+world");
+
+            // Assert
+            Assert.Equal(expected, response.Trim());
+        }
+
+        [Fact]
+        public async Task ResultFilterOnPageModelIsExecuted()
+        {
+            // Act
+            var response = await Client.GetAsync("/ModelAsFilter/TestResultFilter");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task Page_CanOverrideRouteTemplate()
+        {
+            // Arrange & Act
+            var content = await Client.GetStringAsync("like-totally-custom");
+
+            // Assert
+            Assert.Equal("<p>Hey, it's Mr. totally custom here!</p>", content.Trim());
+        }
+
+        [Fact]
+        public async Task Page_Handler_BindsToDefaultValues()
+        {
+            // Arrange
+            string expected;
+            using (new CultureReplacer(CultureInfo.InvariantCulture, CultureInfo.InvariantCulture))
+            {
+                expected = $"id: 10, guid: {default(Guid)}, boolean: {default(bool)}, dateTime: {default(DateTime)}";
+            }
+
+            // Act
+            var content = await Client.GetStringAsync("http://localhost/ModelHandlerTestPage/DefaultValues");
+
+            // Assert
+            Assert.Equal(expected, content);
+        }
+
+        [Theory]
+        [InlineData(nameof(IAuthorizationFilter.OnAuthorization))]
+        [InlineData(nameof(IAsyncAuthorizationFilter.OnAuthorizationAsync))]
+        public async Task PageResultSetAt_AuthorizationFilter_Works(string targetName)
+        {
+            // Act
+            var content = await Client.GetStringAsync("http://localhost/Pages/ShortCircuitPageAtAuthFilter?target=" + targetName);
+
+            // Assert
+            Assert.Equal("From ShortCircuitPageAtAuthFilter.cshtml", content);
+        }
+
+        [Theory]
+        [InlineData(nameof(IPageFilter.OnPageHandlerExecuting))]
+        [InlineData(nameof(IAsyncPageFilter.OnPageHandlerExecutionAsync))]
+        public async Task PageResultSetAt_PageFilter_Works(string targetName)
+        {
+            // Act
+            var content = await Client.GetStringAsync("http://localhost/Pages/ShortCircuitPageAtPageFilter?target=" + targetName);
+
+            // Assert
+            Assert.Equal("From ShortCircuitPageAtPageFilter.cshtml", content);
+        }
+
+        [Fact]
+        public async Task ViewDataAvaialableInPageFilter_AfterHandlerMethod_ReturnsPageResult()
+        {
+            // Act
+            var content = await Client.GetStringAsync("http://localhost/Pages/ViewDataAvailableAfterHandlerExecuted");
+
+            // Assert
+            Assert.Equal("ViewData: Bar", content);
+        }
+
+        private async Task AddAntiforgeryHeaders(HttpRequestMessage request)
+        {
+            var getResponse = await Client.GetAsync(request.RequestUri);
+            Assert.Equal(HttpStatusCode.OK, getResponse.StatusCode);
+            var getResponseBody = await getResponse.Content.ReadAsStringAsync();
+            var formToken = AntiforgeryTestHelper.RetrieveAntiforgeryToken(getResponseBody, "");
+            var cookie = AntiforgeryTestHelper.RetrieveAntiforgeryCookie(getResponse);
+
+            request.Headers.Add("Cookie", cookie.Key + "=" + cookie.Value);
+            request.Headers.Add("RequestVerificationToken", formToken);
+        }
+
+        private static string GetCookie(HttpResponseMessage response)
+        {
+            var setCookie = response.Headers.GetValues("Set-Cookie").ToArray();
+            return setCookie[0].Split(';').First();
+        }
+
+        public class CookieMetadata
+        {
+            public string Key { get; set; }
+
+            public string Value { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesViewSearchTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesViewSearchTest.cs
new file mode 100644
index 0000000000..a22742bf5d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesViewSearchTest.cs
@@ -0,0 +1,65 @@
+// 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.
+
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class RazorPagesViewSearchTest : IClassFixture<MvcTestFixture<RazorPagesWebSite.Startup>>
+    {
+        public RazorPagesViewSearchTest(MvcTestFixture<RazorPagesWebSite.Startup> fixture)
+        {
+            var factory = fixture.Factories.FirstOrDefault() ?? fixture.WithWebHostBuilder(ConfigureWebHostBuilder);
+            Client = factory.CreateDefaultClient();
+        }
+
+        private static void ConfigureWebHostBuilder(IWebHostBuilder builder) =>
+            builder.UseStartup<RazorPagesWebSite.Startup>();
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task Page_CanFindPartial_InCurrentDirectory()
+        {
+            // Arrange & Act
+            var content = await Client.GetStringAsync("http://localhost/Pages/ViewSearch?partial=_Sibling");
+
+            // Assert
+            Assert.Equal("Hello from sibling", content.Trim());
+        }
+        
+        [Fact]
+        public async Task Page_CanFindPartial_InParentDirectory()
+        {
+            // Arrange & Act
+            var content = await Client.GetStringAsync("http://localhost/Pages/ViewSearch?partial=_Parent");
+
+            // Assert
+            Assert.Equal("Hello from parent", content.Trim());
+        }
+        
+        [Fact]
+        public async Task Page_CanFindPartial_InRootDirectory()
+        {
+            // Arrange & Act
+            var content = await Client.GetStringAsync("http://localhost/Pages/ViewSearch?partial=_Root");
+
+            // Assert
+            Assert.Equal("Hello from root", content.Trim());
+        }
+
+        [Fact]
+        public async Task Page_CanFindPartial_InViewsSharedDirectory()
+        {
+            // Arrange & Act
+            var content = await Client.GetStringAsync("http://localhost/Pages/ViewSearch?partial=_Shared");
+
+            // Assert
+            Assert.Equal("Hello from shared", content.Trim());
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithBasePathTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithBasePathTest.cs
new file mode 100644
index 0000000000..680af29004
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithBasePathTest.cs
@@ -0,0 +1,556 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class RazorPagesWithBasePathTest : IClassFixture<MvcTestFixture<RazorPagesWebSite.StartupWithBasePath>>
+    {
+        public RazorPagesWithBasePathTest(MvcTestFixture<RazorPagesWebSite.StartupWithBasePath> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task PageOutsideBasePath_IsNotRouteable()
+        {
+            // Act
+            var response = await Client.GetAsync("/HelloWorld");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task IndexAtBasePath_IsRouteableAtRoot()
+        {
+            // Act
+            var response = await Client.GetAsync("/");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Hello from /Index", content.Trim());
+        }
+
+        [Fact]
+        public async Task IndexAtBasePath_IsRouteableViaIndex()
+        {
+            // Act
+            var response = await Client.GetAsync("/Index");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Hello from /Index", content.Trim());
+        }
+
+        [Fact]
+        public async Task IndexInSubdirectory_IsRouteableViaDirectoryName()
+        {
+            // Act
+            var response = await Client.GetAsync("/Admin/Index");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Hello from /Admin/Index", content.Trim());
+        }
+
+        [Fact]
+        public async Task PageWithRouteTemplateInSubdirectory_IsRouteable()
+        {
+            // Act
+            var response = await Client.GetAsync("/Admin/RouteTemplate/1/MyRouteSuffix/");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Hello from /Admin/RouteTemplate 1", content.Trim());
+        }
+
+        [Fact]
+        public async Task PageWithRouteTemplateInSubdirectory_IsRouteable_WithOptionalParameters()
+        {
+            // Act
+            var response = await Client.GetAsync("/Admin/RouteTemplate/my-user-id/MyRouteSuffix/4");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Hello from /Admin/RouteTemplate my-user-id 4", content.Trim());
+        }
+
+        [Fact]
+        public async Task AuthConvention_IsAppliedOnBasePathRelativePaths_ForFiles()
+        {
+            // Act
+            var response = await Client.GetAsync("/Conventions/Auth");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal("/Login?ReturnUrl=%2FConventions%2FAuth", response.Headers.Location.PathAndQuery);
+        }
+
+        [Fact]
+        public async Task AuthConvention_IsAppliedOnBasePathRelativePaths_For_Folders()
+        {
+            // Act
+            var response = await Client.GetAsync("/Conventions/AuthFolder");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal("/Login?ReturnUrl=%2FConventions%2FAuthFolder", response.Headers.Location.PathAndQuery);
+        }
+
+        [Fact]
+        public async Task AuthConvention_AppliedToFolders_CanByOverridenByFiltersOnModel()
+        {
+            // Act
+            var response = await Client.GetStringAsync("/Conventions/AuthFolder/AnonymousViaModel");
+
+            // Assert
+            Assert.Equal("Hello from Anonymous", response.Trim());
+        }
+
+        [Fact]
+        public async Task ViewStart_IsDiscoveredWhenRootDirectoryIsSpecified()
+        {
+            // Test for https://github.com/aspnet/Mvc/issues/5915
+            //Arrange
+            var expected = @"Hello from _ViewStart
+Hello from /Pages/WithViewStart/Index.cshtml!";
+
+            // Act
+            var response = await Client.GetStringAsync("/WithViewStart");
+
+            // Assert
+            Assert.Equal(expected, response, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task ViewStart_IsDiscoveredForFilesOutsidePageRoot()
+        {
+            //Arrange
+            var expected = @"Hello from _ViewStart at root
+Hello from _ViewStart
+Hello from page";
+
+            // Act
+            var response = await Client.GetStringAsync("/WithViewStart/ViewStartAtRoot");
+
+            // Assert
+            Assert.Equal(expected, response.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task ViewImport_IsDiscoveredWhenRootDirectoryIsSpecified()
+        {
+            // Test for https://github.com/aspnet/Mvc/issues/5915
+            //Arrange
+            var expected = "Hello from CustomService!";
+
+            // Act
+            var response = await Client.GetStringAsync("/WithViewImport");
+
+            // Assert
+            Assert.Equal(expected, response.Trim());
+        }
+
+        [Fact]
+        public async Task FormTagHelper_WithPage_GeneratesLinksToSelf()
+        {
+            //Arrange
+            var expected = "<form method=\"POST\" action=\"/TagHelper/SelfPost/10\">";
+
+            // Act
+            var response = await Client.GetStringAsync("/TagHelper/SelfPost");
+
+            // Assert
+            Assert.Contains(expected, response.Trim());
+        }
+
+        [Fact]
+        public async Task FormTagHelper_WithPageHandler_AllowsPostingToSelf()
+        {
+            //Arrange
+            var expected =
+@"<form action=""/TagHelper/PostWithHandler/Edit"" method=""post""><input name=""__RequestVerificationToken"" type=""hidden"" value=""{0}"" /></form>
+<form method=""post"" action=""/TagHelper/PostWithHandler/Edit""><input name=""__RequestVerificationToken"" type=""hidden"" value=""{0}"" /></form>
+<form method=""post"" action=""/TagHelper/PostWithHandler/Edit/10""></form>";
+
+            // Act
+            var response = await Client.GetStringAsync("/TagHelper/PostWithHandler");
+
+            // Assert
+            var responseContent = response.Trim();
+            var forgeryToken = AntiforgeryTestHelper.RetrieveAntiforgeryToken(responseContent, "/TagHelper/PostWithHandler");
+            var expectedContent = string.Format(expected, forgeryToken);
+
+            Assert.Equal(expectedContent, responseContent, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task FormTagHelper_WithPage_AllowsPostingToAnotherPage()
+        {
+            //Arrange
+            var expected =
+@"<form method=""POST"" action=""/TagHelper/SelfPost/10""></form>
+<form method=""POST"" action=""/TagHelper/PostWithHandler/Delete/10""></form>";
+
+            // Act
+            var response = await Client.GetStringAsync("/TagHelper/CrossPost");
+
+            // Assert
+            Assert.Equal(expected, response.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task FormActionTagHelper_WithPage_AllowsPostingToAnotherPage()
+        {
+            //Arrange
+            var expected =
+@"<button formaction=""/TagHelper/CrossPost/10"" />
+<input type=""submit"" formaction=""/TagHelper/CrossPost/10"" />
+<input type=""image"" formaction=""/TagHelper/CrossPost/10"" />
+<button formaction=""/TagHelper/PostWithHandler/Edit/11"" />
+<input type=""submit"" formaction=""/TagHelper/PostWithHandler/Edit/11"" />
+<input type=""image"" formaction=""/TagHelper/PostWithHandler/Delete/11"" />";
+
+            // Act
+            var response = await Client.GetStringAsync("/TagHelper/FormAction");
+
+            // Assert
+            Assert.Equal(expected, response, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task RedirectFromPage_RedirectsToPathWithoutIndexSegment()
+        {
+            //Arrange
+            var expected = "/Redirects";
+
+            // Act
+            var response = await Client.GetAsync("/Redirects/Index");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal(expected, response.Headers.Location.ToString());
+        }
+
+        [Fact]
+        public async Task RedirectFromPage_ToIndex_RedirectsToPathWithoutIndexSegment()
+        {
+            //Arrange
+            var expected = "/Redirects";
+
+            // Act
+            var response = await Client.GetAsync("/Redirects/RedirectToIndex");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal(expected, response.Headers.Location.ToString());
+        }
+
+        [Fact]
+        public async Task PageRoute_UsingDefaultPageNameToRoute()
+        {
+            // Arrange
+            var expected = @"<a href=""/Routes/Sibling/10"">Link</a>";
+
+            // Act
+            var response = await Client.GetStringAsync("/Routes/RouteUsingDefaultName");
+
+            // Assert
+            Assert.Equal(expected, response.Trim());
+        }
+
+        [Fact]
+        public async Task Pages_ReturnsFromPagesSharedDirectory()
+        {
+            // Arrange
+            var expected = "Hello from /Pages/Shared/";
+
+            // Act
+            var response = await Client.GetStringAsync("/SearchInPages");
+
+            // Assert
+            Assert.Equal(expected, response.Trim());
+        }
+
+        [Fact]
+        public async Task PagesInAreas_Work()
+        {
+            // Arrange
+            var expected = "Hello from a page in Accounts area";
+
+            // Act
+            var response = await Client.GetStringAsync("/Accounts/About");
+
+            // Assert
+            Assert.Equal(expected, response.Trim());
+        }
+
+        [Fact]
+        public async Task PagesInAreas_CanHaveRouteTemplates()
+        {
+            // Arrange
+            var expected = "The id is 42";
+
+            // Act
+            var response = await Client.GetStringAsync("/Accounts/PageWithRouteTemplate/42");
+
+            // Assert
+            Assert.Equal(expected, response.Trim());
+        }
+
+        [Fact]
+        public async Task PagesInAreas_CanGenerateLinksToControllersAndPages()
+        {
+            // Arrange
+            var expected =
+@"<a href=""/Accounts/Manage/RenderPartials"">Link inside area</a>
+<a href=""/Products/List/old/20"">Link to external area</a>
+<a href=""/Accounts"">Link to area action</a>
+<a href=""/Admin"">Link to non-area page</a>";
+
+            // Act
+            var response = await Client.GetStringAsync("/Accounts/PageWithLinks");
+
+            // Assert
+            Assert.Equal(expected, response.Trim());
+        }
+
+        [Fact]
+        public async Task PagesInAreas_CanGenerateRelativeLinks()
+        {
+            // Arrange
+            var expected =
+@"<a href=""/Accounts/PageWithRouteTemplate/1"">Parent directory</a>
+<a href=""/Accounts/Manage/RenderPartials"">Sibling directory</a>
+<a href=""/Products/List"">Go back to root of different area</a>";
+
+            // Act
+            var response = await Client.GetStringAsync("/Accounts/RelativeLinks");
+
+            // Assert
+            Assert.Equal(expected, response.Trim());
+        }
+
+        [Fact]
+        public async Task PagesInAreas_CanDiscoverViewsFromAreaAndSharedDirectories()
+        {
+            // Arrange
+            var expected =
+@"Layout in /Views/Shared
+Partial in /Areas/Accounts/Pages/Manage/
+
+Partial in /Areas/Accounts/Pages/
+
+Partial in /Areas/Accounts/Pages/
+
+Partial in /Areas/Accounts/Views/Shared/
+
+Hello from /Pages/Shared/";
+
+            // Act
+            var response = await Client.GetStringAsync("/Accounts/Manage/RenderPartials");
+
+            // Assert
+            Assert.Equal(expected, response.Trim());
+        }
+
+        [Fact]
+        public async Task AuthorizeFolderConvention_CanBeAppliedToAreaPages()
+        {
+            // Act
+            var response = await Client.GetAsync("/Accounts/RequiresAuth");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal("/Login?ReturnUrl=%2FAccounts%2FRequiresAuth", response.Headers.Location.PathAndQuery);
+        }
+
+        [Fact]
+        public async Task AllowAnonymouseToPageConvention_CanBeAppliedToAreaPages()
+        {
+            // Act
+            var response = await Client.GetStringAsync("/Accounts/RequiresAuth/AllowAnonymous");
+
+            // Assert
+            Assert.Equal("Hello from AllowAnonymous", response.Trim());
+        }
+
+        // These test is important as it covers a feature that allows razor pages to use a different
+        // model at runtime that wasn't known at compile time. Like a non-generic model used at compile
+        // time and overrided at runtime with a closed-generic model that performs the actual implementation.
+        // An example of this is how the Identity UI library defines a base page model in their views,
+        // like how the Register.cshtml view defines its model as RegisterModel and then, at runtime it replaces
+        // that model with RegisterModel<TUser> where TUser is the type of the user used to configure identity.
+        [Fact]
+        public async Task PageConventions_CanBeUsedToCustomizeTheModelType()
+        {
+            // Act
+            var response = await Client.GetAsync("/CustomModelTypeModel");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Contains("<h2>User</h2>", content);
+        }
+
+        [Fact]
+        public async Task PageConventions_CustomizedModelCanPostToHandlers()
+        {
+            // Arrange
+            var getPage = await Client.GetAsync("/CustomModelTypeModel");
+            var token = AntiforgeryTestHelper.RetrieveAntiforgeryToken(await getPage.Content.ReadAsStringAsync(), "");
+            var cookie = AntiforgeryTestHelper.RetrieveAntiforgeryCookie(getPage);
+
+            var message = new HttpRequestMessage(HttpMethod.Post, "/CustomModelTypeModel");
+            message.Content = new FormUrlEncodedContent(new Dictionary<string, string>
+            {
+                ["__RequestVerificationToken"] = token,
+                ["ConfirmPassword"] = "",
+                ["Password"] = "",
+                ["Email"] = ""
+            });
+            message.Headers.TryAddWithoutValidation("Cookie", $"{cookie.Key}={cookie.Value}");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Contains("is required.", content);
+        }
+
+        [Fact]
+        public async Task PageConventions_CustomizedModelCanWorkWithModelState()
+        {
+            // Arrange
+            var getPage = await Client.GetAsync("/CustomModelTypeModel");
+            var token = AntiforgeryTestHelper.RetrieveAntiforgeryToken(await getPage.Content.ReadAsStringAsync(), "");
+            var cookie = AntiforgeryTestHelper.RetrieveAntiforgeryCookie(getPage);
+
+            var message = new HttpRequestMessage(HttpMethod.Post, "/CustomModelTypeModel");
+            message.Content = new FormUrlEncodedContent(new Dictionary<string, string>
+            {
+                ["__RequestVerificationToken"] = token,
+                ["Email"] = "javi@example.com",
+                ["Password"] = "Password.12$",
+                ["ConfirmPassword"] = "Password.12$",
+            });
+            message.Headers.TryAddWithoutValidation("Cookie", $"{cookie.Key}={cookie.Value}");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal("/", response.Headers.Location.ToString());
+        }
+
+        [Fact]
+        public async Task ValidationAttributes_OnTopLevelProperties()
+        {
+            // Act
+            var response = await Client.GetStringAsync("/Validation/PageWithValidation?age=71");
+
+            // Assert
+            Assert.Contains("Name is required", response);
+            Assert.Contains("18 &#x2264; Age &#x2264; 60", response);
+        }
+
+        [Fact]
+        public async Task ValidationAttributes_OnHandlerParameters()
+        {
+            // Act
+            var response = await Client.GetStringAsync("/Validation/PageHandlerWithValidation");
+
+            // Assert
+            Assert.Contains("Name is required", response);
+        }
+
+        [Fact]
+        public async Task PagesFromClassLibraries_CanBeServed()
+        {
+            // Act
+            var response = await Client.GetStringAsync("/ClassLibraryPages/Served");
+
+            // Assert
+            Assert.Contains("This page is served from RazorPagesClassLibrary", response);
+        }
+
+        [Fact]
+        public async Task PagesFromClassLibraries_CanBeOverriden()
+        {
+            // Act
+            var response = await Client.GetStringAsync("/ClassLibraryPages/Overriden");
+
+            // Assert
+            Assert.Contains("This page is overriden by RazorPagesWebSite", response);
+        }
+
+        [Fact]
+        public async Task ViewDataAttributes_SetInPageModel_AreTransferedToLayout()
+        {
+            // Arrange
+            var document = await Client.GetHtmlDocumentAsync("/ViewData/ViewDataInPage");
+
+            // Assert
+            var description = document.QuerySelector("meta[name='description']").Attributes["content"];
+            Assert.Equal("Description set in handler", description.Value);
+
+            var keywords = document.QuerySelector("meta[name='keywords']").Attributes["content"];
+            Assert.Equal("Value set in filter", keywords.Value);
+
+            var author = document.QuerySelector("meta[name='author']").Attributes["content"];
+            Assert.Equal("Property with key", author.Value);
+
+            var title = document.QuerySelector("title").TextContent;
+            Assert.Equal("Title with default value", title);
+        }
+
+        [Fact]
+        public async Task ViewDataAttributes_SetInPageWithoutModel_AreTransferedToLayout()
+        {
+            // Arrange
+            var document = await Client.GetHtmlDocumentAsync("/ViewData/ViewDataInPageWithoutModel");
+
+            // Assert
+            var description = document.QuerySelector("meta[name='description']").Attributes["content"];
+            Assert.Equal("Description set in page handler", description.Value);
+
+            var title = document.QuerySelector("title").TextContent;
+            Assert.Equal("Default value", title);
+        }
+
+        [Fact]
+        public async Task ViewDataProperties_SetInPageModel_AreTransferredToViewComponents()
+        {
+            // Act
+            var document = await Client.GetHtmlDocumentAsync("ViewData/ViewDataToViewComponentPage");
+
+            // Assert
+            var message = document.QuerySelector("#message").TextContent;
+            Assert.Equal("Message set in handler", message);
+
+            var title = document.QuerySelector("title").TextContent;
+            Assert.Equal("View Data in Pages", title);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorViewLocationSpecificationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorViewLocationSpecificationTest.cs
new file mode 100644
index 0000000000..e2de2dd2f8
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorViewLocationSpecificationTest.cs
@@ -0,0 +1,114 @@
+// 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.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+using System.Net;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class RazorViewLocationSpecificationTest : IClassFixture<MvcTestFixture<RazorWebSite.Startup>>
+    {
+        private const string BaseUrl = "http://localhost/ViewNameSpecification_Home/";
+
+        public RazorViewLocationSpecificationTest(MvcTestFixture<RazorWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Theory]
+        [InlineData("LayoutSpecifiedWithPartialPathInViewStart")]
+        [InlineData("LayoutSpecifiedWithPartialPathInViewStart_ForViewSpecifiedWithRelativePath")]
+        [InlineData("LayoutSpecifiedWithPartialPathInViewStart_ForViewSpecifiedWithPartialName")]
+        [InlineData("LayoutSpecifiedWithPartialPathInViewStart_ForViewSpecifiedWithAppRelativePath")]
+        public async Task PartialLayoutPaths_SpecifiedInViewStarts_GetResolvedByViewEngine(string action)
+        {
+            // Arrange
+            var expected =
+@"<layout>
+_ViewStart that specifies partial Layout
+</layout>";
+
+            // Act
+            var body = await Client.GetStringAsync(BaseUrl + action);
+
+            // Assert
+            Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Theory]
+        [InlineData("LayoutSpecifiedWithPartialPathInPage")]
+        [InlineData("LayoutSpecifiedWithPartialPathInPageWithPartialPath")]
+        [InlineData("LayoutSpecifiedWithPartialPathInPageWithRelativePath")]
+        [InlineData("LayoutSpecifiedWithPartialPathInPageWithAppRelativePath")]
+        public async Task PartialLayoutPaths_SpecifiedInPage_GetResolvedByViewEngine(string actionName)
+        {
+            // Arrange
+            var expected =
+@"<non-shared>Layout specified in page
+</non-shared>";
+
+            // Act
+            var body = await Client.GetStringAsync(BaseUrl + actionName);
+
+            // Assert
+            Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Theory]
+        [InlineData("LayoutSpecifiedWithRelativePath")]
+        [InlineData("LayoutSpecifiedWithAppRelativePath")]
+        public async Task NonPartialLayoutPaths_GetResolvedByViewEngine(string actionName)
+        {
+            // Arrange
+            var expected =
+@"<non-shared>Page With Non Partial Layout
+</non-shared>";
+
+            // Act
+            var body = await Client.GetStringAsync(BaseUrl + actionName);
+
+            // Assert
+            Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Theory]
+        [InlineData("ViewWithPartial_SpecifiedWithPartialName")]
+        [InlineData("ViewWithPartial_SpecifiedWithRelativePath")]
+        [InlineData("ViewWithPartial_SpecifiedWithAppRelativePath")]
+        public async Task PartialsCanBeSpecifiedWithPartialPath(string actionName)
+        {
+            // Arrange
+            var expected =
+@"<layout>
+Non Shared Partial
+
+</layout>";
+
+            // Act
+            var body = await Client.GetStringAsync(BaseUrl + actionName);
+
+            // Assert
+            Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task PartialLayout_ThrowsIfRequiredSectionMissing()
+        {
+            // Arrange
+            var path = "http://localhost/PartialViewEngine/ViewPartialMissingSection";
+
+            // Act
+            var content = await (await Client.GetAsync(path)).Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Contains(
+                "The layout page '/Views/Shared/_PartialLayout.cshtml' cannot find the section " +
+                    "'section' in the content page '/Views/PartialViewEngine/PartialMissingSection.cshtml'.",
+                WebUtility.HtmlDecode(content));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RemoteAttributeValidationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RemoteAttributeValidationTest.cs
new file mode 100644
index 0000000000..5e1919c462
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RemoteAttributeValidationTest.cs
@@ -0,0 +1,109 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Reflection;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class RemoteAttributeValidationTest : IClassFixture<MvcTestFixture<BasicWebSite.Startup>>
+    {
+        private static readonly Assembly _resourcesAssembly =
+            typeof(RemoteAttributeValidationTest).GetTypeInfo().Assembly;
+
+        public RemoteAttributeValidationTest(MvcTestFixture<BasicWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Theory]
+        [InlineData("Area1", "/Area1")]
+        [InlineData("Root", "")]
+        public async Task RemoteAttribute_LeadsToExpectedValidationAttributes(string areaName, string pathSegment)
+        {
+            // Arrange
+            var outputFile = "compiler/resources/BasicWebSite." + areaName + ".RemoteAttribute_Home.Create.html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+            var url = "http://localhost" + pathSegment + "/RemoteAttribute_Home/Create";
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("text/html", response.Content.Headers.ContentType.MediaType);
+            Assert.Equal("utf-8", response.Content.Headers.ContentType.CharSet);
+
+            var responseContent = await response.Content.ReadAsStringAsync();
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            // Mono issue - https://github.com/aspnet/External/issues/19
+            Assert.Equal(
+                PlatformNormalizer.NormalizeContent(expectedContent),
+                responseContent,
+                ignoreLineEndingDifferences: true);
+#endif
+        }
+
+        [Theory]
+        [InlineData("", "\"/RemoteAttribute_Verify/IsIdAvailable rejects UserId1: 'Joe1'.\"")]
+        [InlineData("/Area1", "false")]
+        [InlineData("/Area2",
+            "\"/Area2/RemoteAttribute_Verify/IsIdAvailable rejects 'Joe4' with 'Joe1', 'Joe2', and 'Joe3'.\"")]
+        public async Task RemoteAttribute_VerificationAction_GetReturnsExpectedJson(
+            string pathSegment,
+            string expectedContent)
+        {
+            // Arrange
+            var url = "http://localhost" + pathSegment +
+                "/RemoteAttribute_Verify/IsIdAvailable?UserId1=Joe1&UserId2=Joe2&UserId3=Joe3&UserId4=Joe4";
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("application/json", response.Content.Headers.ContentType.MediaType);
+            Assert.Equal("utf-8", response.Content.Headers.ContentType.CharSet);
+            var responseContent = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedContent, responseContent);
+        }
+
+        [Theory]
+        [InlineData("", "\"/RemoteAttribute_Verify/IsIdAvailable rejects UserId1: 'Jane1'.\"")]
+        [InlineData("/Area1", "false")]
+        public async Task RemoteAttribute_VerificationAction_PostReturnsExpectedJson(
+            string pathSegment,
+            string expectedContent)
+        {
+            // Arrange
+            var url = "http://localhost" + pathSegment + "/RemoteAttribute_Verify/IsIdAvailable";
+            var contentDictionary = new Dictionary<string, string>
+            {
+                { "UserId1", "Jane1" },
+                { "UserId2", "Jane2" },
+                { "UserId3", "Jane3" },
+                { "UserId4", "Jane4" },
+            };
+            var content = new FormUrlEncodedContent(contentDictionary);
+
+            // Act
+            var response = await Client.PostAsync(url, content);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("application/json", response.Content.Headers.ContentType.MediaType);
+            Assert.Equal("utf-8", response.Content.Headers.ContentType.CharSet);
+            var responseContent = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedContent, responseContent);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestFormLimitsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestFormLimitsTest.cs
new file mode 100644
index 0000000000..285b6cc397
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestFormLimitsTest.cs
@@ -0,0 +1,176 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class RequestFormLimitsTest : IClassFixture<MvcTestFixture<BasicWebSite.StartupRequestLimitSize>>
+    {
+        public RequestFormLimitsTest(MvcTestFixture<BasicWebSite.StartupRequestLimitSize> fixture)
+        {
+            var factory = fixture.Factories.FirstOrDefault() ?? fixture.WithWebHostBuilder(ConfigureWebHostBuilder);
+            Client = factory.CreateDefaultClient();
+        }
+
+        private static void ConfigureWebHostBuilder(IWebHostBuilder builder) =>
+            builder.UseStartup<BasicWebSite.StartupRequestLimitSize>();
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task RequestFormLimitCheckHappens_BeforeAntiforgeryTokenValidation()
+        {
+            // Arrange
+            var request = new HttpRequestMessage();
+            var kvps = new List<KeyValuePair<string, string>>();
+            // Controller has value count limit of 2
+            kvps.Add(new KeyValuePair<string, string>("key1", "value1"));
+            kvps.Add(new KeyValuePair<string, string>("key2", "value2"));
+            kvps.Add(new KeyValuePair<string, string>("key3", "value3"));
+            kvps.Add(new KeyValuePair<string, string>("RequestVerificationToken", "invalid-data"));
+
+            // Act
+            var response = await Client.PostAsync(
+                "RequestFormLimits/RequestFormLimitsBeforeAntiforgeryValidation",
+                new FormUrlEncodedContent(kvps));
+
+            // Assert
+            Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            Assert.Contains(
+                "InvalidDataException: Form value count limit 2 exceeded.",
+                result);
+        }
+
+        [Fact]
+        public async Task OverridesControllerLevelLimits()
+        {
+            // Arrange
+            var expected = "{\"sampleInt\":10,\"sampleString\":null}";
+            var request = new HttpRequestMessage();
+            var kvps = new List<KeyValuePair<string, string>>();
+            // Controller has a value count limit of 2, but the action has a limit of 5
+            kvps.Add(new KeyValuePair<string, string>("key1", "value1"));
+            kvps.Add(new KeyValuePair<string, string>("key2", "value2"));
+            kvps.Add(new KeyValuePair<string, string>("SampleInt", "10"));
+
+            // Act
+            var response = await Client.PostAsync(
+                "RequestFormLimits/OverrideControllerLevelLimits",
+                new FormUrlEncodedContent(kvps));
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expected, result);
+        }
+
+        [Fact]
+        public async Task OverrideControllerLevelLimits_UsingDefaultLimits()
+        {
+            // Arrange
+            var expected = "{\"sampleInt\":50,\"sampleString\":null}";
+            var request = new HttpRequestMessage();
+            var kvps = new List<KeyValuePair<string, string>>();
+            // Controller has a key limit of 2, but the action has default limits
+            for (var i = 0; i < 10; i++)
+            {
+                kvps.Add(new KeyValuePair<string, string>($"key{i}", $"value{i}"));
+            }
+            kvps.Add(new KeyValuePair<string, string>("SampleInt", "50"));
+            kvps.Add(new KeyValuePair<string, string>("RequestVerificationToken", "invalid-data"));
+
+            // Act
+            var response = await Client.PostAsync(
+                "RequestFormLimits/OverrideControllerLevelLimitsUsingDefaultLimits",
+                new FormUrlEncodedContent(kvps));
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expected, result);
+        }
+
+        [Fact]
+        public async Task RequestSizeLimitCheckHappens_BeforeRequestFormLimits()
+        {
+            // Arrange
+            var request = new HttpRequestMessage();
+            var kvps = new List<KeyValuePair<string, string>>();
+            // Request size has a limit of 100 bytes
+            // Request form limits has a value count limit of 2
+            // Antiforgery validation is also present
+            kvps.Add(new KeyValuePair<string, string>("key1", new string('a', 1024)));
+            kvps.Add(new KeyValuePair<string, string>("key2", "value2"));
+            kvps.Add(new KeyValuePair<string, string>("RequestVerificationToken", "invalid-data"));
+
+            // Act
+            var response = await Client.PostAsync(
+                "RequestFormLimits/RequestSizeLimitBeforeRequestFormLimits",
+                new FormUrlEncodedContent(kvps));
+
+            // Assert
+            Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            Assert.Contains(
+                "InvalidOperationException: Request content size is greater than the limit size",
+                result);
+        }
+
+        [Fact]
+        public async Task RequestFormLimitsCheckHappens_AfterRequestSizeLimit()
+        {
+            // Arrange
+            var request = new HttpRequestMessage();
+            var kvps = new List<KeyValuePair<string, string>>();
+            // Request size has a limit of 100 bytes
+            // Request form limits has a value count limit of 2
+            // Antiforgery validation is also present
+            kvps.Add(new KeyValuePair<string, string>("key1", "value1"));
+            kvps.Add(new KeyValuePair<string, string>("key1", "value2"));
+            kvps.Add(new KeyValuePair<string, string>("key1", "value3"));
+            kvps.Add(new KeyValuePair<string, string>("RequestVerificationToken", "invalid-data"));
+
+            // Act
+            var response = await Client.PostAsync(
+                "RequestFormLimits/RequestSizeLimitBeforeRequestFormLimits",
+                new FormUrlEncodedContent(kvps));
+
+            // Assert
+            Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            Assert.Contains(
+                "InvalidDataException: Form value count limit 2 exceeded.",
+                result);
+        }
+
+        [Fact]
+        public async Task AntiforgeryValidationHappens_AfterRequestFormAndSizeLimitCheck()
+        {
+            // Arrange
+            var request = new HttpRequestMessage();
+            var kvps = new List<KeyValuePair<string, string>>();
+            // Request size has a limit of 100 bytes
+            // Request form limits has a value count limit of 2
+            // Antiforgery validation is also present
+            kvps.Add(new KeyValuePair<string, string>("key1", "value1"));
+            kvps.Add(new KeyValuePair<string, string>("RequestVerificationToken", "invalid-data"));
+
+            // Act
+            var response = await Client.PostAsync(
+                "RequestFormLimits/RequestSizeLimitBeforeRequestFormLimits",
+                new FormUrlEncodedContent(kvps));
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestServicesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestServicesTest.cs
new file mode 100644
index 0000000000..29fd69112c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestServicesTest.cs
@@ -0,0 +1,93 @@
+// 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.
+
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    // Each of these tests makes two requests, because we want each test to verify that the data is
+    // PER-REQUEST and does not linger around to impact the next request.
+    public class RequestServicesTest : IClassFixture<MvcTestFixture<BasicWebSite.Startup>>
+    {
+        public RequestServicesTest(MvcTestFixture<BasicWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Theory]
+        [InlineData("http://localhost/RequestScopedService/FromFilter")]
+        [InlineData("http://localhost/RequestScopedService/FromView")]
+        [InlineData("http://localhost/RequestScopedService/FromViewComponent")]
+        [InlineData("http://localhost/RequestScopedService/FromActionArgument")]
+        public async Task RequestServices(string url)
+        {
+            for (var i = 0; i < 2; i++)
+            {
+                // Arrange
+                var requestId = Guid.NewGuid().ToString();
+                var request = new HttpRequestMessage(HttpMethod.Get, url);
+                request.Headers.TryAddWithoutValidation("RequestId", requestId);
+
+                // Act
+                var response = await Client.SendAsync(request);
+
+                // Assert
+                response.EnsureSuccessStatusCode();
+                var body = (await response.Content.ReadAsStringAsync()).Trim();
+                Assert.Equal(requestId, body);
+            }
+        }
+
+        [Fact]
+        public async Task RequestServices_TagHelper()
+        {
+            // Arrange
+            var url = "http://localhost/RequestScopedService/FromTagHelper";
+
+            // Act & Assert
+            for (var i = 0; i < 2; i++)
+            {
+                var requestId = Guid.NewGuid().ToString();
+                var request = new HttpRequestMessage(HttpMethod.Get, url);
+                request.Headers.TryAddWithoutValidation("RequestId", requestId);
+
+                var response = await Client.SendAsync(request);
+
+                var body = (await response.Content.ReadAsStringAsync()).Trim();
+
+                var expected = "<request-scoped>" + requestId + "</request-scoped>";
+                Assert.Equal(expected, body);
+            }
+        }
+
+        [Fact]
+        public async Task RequestServices_ActionConstraint()
+        {
+            // Arrange
+            var url = "http://localhost/RequestScopedService/FromActionConstraint";
+
+            // Act & Assert
+            var requestId1 = "b40f6ec1-8a6b-41c1-b3fe-928f581ebaf5";
+            var request1 = new HttpRequestMessage(HttpMethod.Get, url);
+            request1.Headers.TryAddWithoutValidation("RequestId", requestId1);
+
+            var response1 = await Client.SendAsync(request1);
+
+            var body1 = (await response1.Content.ReadAsStringAsync()).Trim();
+            Assert.Equal(requestId1, body1);
+
+            var requestId2 = Guid.NewGuid().ToString();
+            var request2 = new HttpRequestMessage(HttpMethod.Get, url);
+            request2.Headers.TryAddWithoutValidation("RequestId", requestId2);
+
+            var response2 = await Client.SendAsync(request2);
+            Assert.Equal(HttpStatusCode.NotFound, response2.StatusCode);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestSizeLimitTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestSizeLimitTest.cs
new file mode 100644
index 0000000000..8e5ce315d3
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestSizeLimitTest.cs
@@ -0,0 +1,96 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class RequestSizeLimitTest : IClassFixture<MvcTestFixture<BasicWebSite.StartupRequestLimitSize>>
+    {
+        // Some tests require comparing the actual response body against an expected response baseline
+        // so they require a reference to the assembly on which the resources are located, in order to
+        // make the tests less verbose, we get a reference to the assembly with the resources and we
+        // use it on all the rest of the tests.
+        private static readonly Assembly _resourcesAssembly = typeof(BasicTests).GetTypeInfo().Assembly;
+
+        public RequestSizeLimitTest(MvcTestFixture<BasicWebSite.StartupRequestLimitSize> fixture)
+        {
+            var factory = fixture.Factories.FirstOrDefault() ?? fixture.WithWebHostBuilder(ConfigureWebHostBuilder);
+            Client = factory.CreateDefaultClient();
+        }
+
+        private static void ConfigureWebHostBuilder(IWebHostBuilder builder) =>
+            builder.UseStartup<BasicWebSite.StartupRequestLimitSize>();
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task RequestSizeLimitCheckHappens_BeforeAntiforgeryTokenValidation()
+        {
+            // Arrange
+            var request = new HttpRequestMessage();
+            var kvps = new List<KeyValuePair<string, string>>();
+            kvps.Add(new KeyValuePair<string, string>("SampleString", new string('p', 1024)));
+            kvps.Add(new KeyValuePair<string, string>("RequestVerificationToken", "invalid-data"));
+
+            // Act
+            var response = await Client.PostAsync(
+                "RequestSizeLimit/RequestSizeLimitCheckBeforeAntiforgeryValidation",
+                new FormUrlEncodedContent(kvps));
+
+            // Assert
+            Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            Assert.Contains(
+                "InvalidOperationException: Request content size is greater than the limit size",
+                result);
+        }
+
+        [Fact]
+        public async Task AntiforgeryTokenValidationHappens_AfterRequestSizeLimitCheck()
+        {
+            // Arrange
+            var request = new HttpRequestMessage();
+            var kvps = new List<KeyValuePair<string, string>>();
+            kvps.Add(new KeyValuePair<string, string>("SampleString", "string"));
+            kvps.Add(new KeyValuePair<string, string>("RequestVerificationToken", "invalid-data"));
+
+            // Act
+            var response = await Client.PostAsync(
+                "RequestSizeLimit/RequestSizeLimitCheckBeforeAntiforgeryValidation",
+                new FormUrlEncodedContent(kvps));
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task DisableRequestSizeLimitOnAction_OverridesControllerLevelSettings()
+        {
+            // Arrange
+            var expected = $"{{\"sampleInt\":10,\"sampleString\":\"{new string('p', 1024)}\"}}";
+            var request = new HttpRequestMessage();
+            request.Method = HttpMethod.Post;
+            request.Content = new StringContent(expected, Encoding.UTF8, "text/json");
+            request.RequestUri = new Uri("http://localhost/RequestSizeLimit/DisableRequestSizeLimit");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var actual = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expected, actual);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RespectBrowserAcceptHeaderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RespectBrowserAcceptHeaderTests.cs
new file mode 100644
index 0000000000..e796b034cd
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RespectBrowserAcceptHeaderTests.cs
@@ -0,0 +1,67 @@
+// 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.
+
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    /// <summary>
+    /// These tests are for scenarios when <see cref="MvcOptions.RespectBrowserAcceptHeader"/> is <c>True</c>(default is False).
+    /// </summary>
+    public class RespectBrowserAcceptHeaderTests : IClassFixture<MvcTestFixture<FormatterWebSite.StartupWithRespectBrowserAcceptHeader>>
+    {
+        public RespectBrowserAcceptHeaderTests(MvcTestFixture<FormatterWebSite.StartupWithRespectBrowserAcceptHeader> fixture)
+        {
+            var factory = fixture.Factories.FirstOrDefault() ?? fixture.WithWebHostBuilder(ConfigureWebHostBuilder);
+            Client = factory.CreateDefaultClient();
+        }
+
+        private static void ConfigureWebHostBuilder(IWebHostBuilder builder) =>
+            builder.UseStartup<FormatterWebSite.StartupWithRespectBrowserAcceptHeader>();
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task ReturnStringFromAction_StringOutputFormatterDoesNotWriteTheResponse()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, "RespectBrowserAcceptHeader/ReturnString");
+            request.Headers.Accept.ParseAdd("text/html, application/json, image/jpeg, */*; q=.2");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("application/json; charset=utf-8", response.Content.Headers.ContentType.ToString());
+            var responseData = await response.Content.ReadAsStringAsync();
+            Assert.Equal("\"Hello World!\"", responseData);
+        }
+
+        [Fact]
+        public async Task ReturnStringFromAction_AcceptHeaderWithTextPlain_WritesTextPlainResponse()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, "RespectBrowserAcceptHeader/ReturnString");
+            request.Headers.Accept.ParseAdd("text/plain; charset=utf-8");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal("text/plain; charset=utf-8", response.Content.Headers.ContentType.ToString());
+            var responseData = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Hello World!", responseData);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RouteDataTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RouteDataTest.cs
new file mode 100644
index 0000000000..3ea689b1a4
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RouteDataTest.cs
@@ -0,0 +1,103 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Routing;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class RouteDataTest : IClassFixture<MvcTestFixture<BasicWebSite.Startup>>
+    {
+        public RouteDataTest(MvcTestFixture<BasicWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task RouteData_Routers_ConventionalRoute()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Routing/Conventional");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<ResultData>(body);
+
+            Assert.Equal(
+                new string[]
+                {
+                    typeof(RouteCollection).FullName,
+                    typeof(Route).FullName,
+                    typeof(MvcRouteHandler).FullName,
+                },
+                result.Routers);
+        }
+
+        [Fact]
+        public async Task RouteData_Routers_AttributeRoute()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Routing/Attribute");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<ResultData>(body);
+
+            Assert.Equal(new string[]
+                {
+                    typeof(RouteCollection).FullName,
+                    typeof(AttributeRoute).FullName,
+                    typeof(MvcAttributeRouteHandler).FullName,
+                },
+                result.Routers);
+        }
+
+        // Verifies that components in the MVC pipeline can modify datatokens
+        // without impacting any static data.
+        //
+        // This does two request, to verify that the data in the route is not modified
+        [Fact]
+        public async Task RouteData_DataTokens_FilterCanSetDataTokens()
+        {
+            // Arrange
+            var response = await Client.GetAsync("http://localhost/Routing/DataTokens");
+
+            // Guard
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<ResultData>(body);
+            Assert.Single(result.DataTokens);
+            Assert.Single(result.DataTokens, kvp => kvp.Key == "actionName" && ((string)kvp.Value) == "DataTokens");
+
+            // Act
+            response = await Client.GetAsync("http://localhost/Routing/Conventional");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            body = await response.Content.ReadAsStringAsync();
+            result = JsonConvert.DeserializeObject<ResultData>(body);
+
+            Assert.Single(result.DataTokens);
+            Assert.Single(result.DataTokens, kvp => kvp.Key == "actionName" && ((string)kvp.Value) == "Conventional");
+        }
+
+        private class ResultData
+        {
+            public Dictionary<string, object> DataTokens { get; set; }
+
+            public string[] Routers { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTests.cs
new file mode 100644
index 0000000000..e2917d8f1e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTests.cs
@@ -0,0 +1,1259 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Routing;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class RoutingTests : IClassFixture<MvcTestFixture<RoutingWebSite.Startup>>
+    {
+        public RoutingTests(MvcTestFixture<RoutingWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task ConventionalRoutedController_ActionIsReachable()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Home/Index");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains("/Home/Index", result.ExpectedUrls);
+            Assert.Equal("Home", result.Controller);
+            Assert.Equal("Index", result.Action);
+            Assert.Equal(
+                new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase)
+                {
+                    { "controller", "Home" },
+                    { "action", "Index" },
+                },
+                result.RouteValues);
+        }
+
+        [Fact]
+        public async Task ConventionalRoutedController_ActionIsReachable_WithDefaults()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains("/", result.ExpectedUrls);
+            Assert.Equal("Home", result.Controller);
+            Assert.Equal("Index", result.Action);
+            Assert.Equal(
+                new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase)
+                {
+                    { "controller", "Home" },
+                    { "action", "Index" },
+                },
+                result.RouteValues);
+        }
+
+        [Fact]
+        public async Task ConventionalRoutedController_NonActionIsNotReachable()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Home/NotAnAction");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task ConventionalRoutedController_InArea_ActionIsReachable()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Travel/Flight/Index");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains("/Travel/Flight/Index", result.ExpectedUrls);
+            Assert.Equal("Flight", result.Controller);
+            Assert.Equal("Index", result.Action);
+            Assert.Equal(
+                new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase)
+                {
+                    { "area", "Travel" },
+                    { "controller", "Flight" },
+                    { "action", "Index" },
+                },
+                result.RouteValues);
+        }
+
+        [Fact]
+        public async Task ConventionalRoutedController_InArea_ActionBlockedByHttpMethod()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Travel/Flight/BuyTickets");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        [Theory]
+        [InlineData("", "/Home/OptionalPath/default")]
+        [InlineData("CustomPath", "/Home/OptionalPath/CustomPath")]
+        public async Task ConventionalRoutedController_WithOptionalSegment(string optionalSegment, string expected)
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Home/OptionalPath/" + optionalSegment);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Single(result.ExpectedUrls, expected);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_IsReachable()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Store/Shop/Products");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains("/Store/Shop/Products", result.ExpectedUrls);
+            Assert.Equal("Store", result.Controller);
+            Assert.Equal("ListProducts", result.Action);
+
+            Assert.Contains(
+                new KeyValuePair<string, object>("controller", "Store"),
+                result.RouteValues);
+
+            Assert.Contains(
+                new KeyValuePair<string, object>("action", "ListProducts"),
+                result.RouteValues);
+        }
+
+        [Theory]
+        [InlineData("Get", "/Friends")]
+        [InlineData("Get", "/Friends/Peter")]
+        [InlineData("Delete", "/Friends")]
+        public async Task AttributeRoutedAction_AcceptRequestsWithValidMethods_InRoutesWithoutExtraTemplateSegmentsOnTheAction(
+            string method,
+            string url)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(new HttpMethod(method), $"http://localhost{url}");
+
+            // Assert
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains(url, result.ExpectedUrls);
+            Assert.Equal("Friends", result.Controller);
+            Assert.Equal(method, result.Action);
+
+            Assert.Contains(
+                new KeyValuePair<string, object>("controller", "Friends"),
+                result.RouteValues);
+
+            Assert.Contains(
+                new KeyValuePair<string, object>("action", method),
+                result.RouteValues);
+
+            if (result.RouteValues.ContainsKey("id"))
+            {
+                Assert.Contains(
+                    new KeyValuePair<string, object>("id", "Peter"),
+                    result.RouteValues);
+            }
+        }
+
+        [Theory]
+        [InlineData("Post", "/Friends")]
+        [InlineData("Put", "/Friends")]
+        [InlineData("Patch", "/Friends")]
+        [InlineData("Options", "/Friends")]
+        [InlineData("Head", "/Friends")]
+        public async Task AttributeRoutedAction_RejectsRequestsWithWrongMethods_InRoutesWithoutExtraTemplateSegmentsOnTheAction(
+            string method,
+            string url)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(new HttpMethod(method), $"http://localhost{url}");
+
+            // Assert
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        [Theory]
+        [InlineData("http://localhost/api/v1/Maps")]
+        [InlineData("http://localhost/api/v2/Maps")]
+        public async Task AttributeRoutedAction_MultipleRouteAttributes_WorksWithNameAndOrder(string url)
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Maps", result.Controller);
+            Assert.Equal("Get", result.Action);
+
+            Assert.Equal(new string[]
+            {
+                    "/api/v2/Maps",
+                    "/api/v1/Maps",
+                    "/api/v2/Maps"
+            },
+            result.ExpectedUrls);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_MultipleRouteAttributes_WorksWithOverrideRoutes()
+        {
+            // Arrange
+            var url = "http://localhost/api/v2/Maps";
+
+            // Act
+            var response = await Client.SendAsync(new HttpRequestMessage(HttpMethod.Post, url));
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Maps", result.Controller);
+            Assert.Equal("Post", result.Action);
+
+            Assert.Equal(new string[]
+            {
+                    "/api/v2/Maps",
+                    "/api/v2/Maps"
+            },
+            result.ExpectedUrls);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_MultipleRouteAttributes_RouteAttributeTemplatesIgnoredForOverrideActions()
+        {
+            // Arrange
+            var url = "http://localhost/api/v1/Maps";
+
+            // Act
+            var response = await Client.SendAsync(new HttpRequestMessage(new HttpMethod("POST"), url));
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        [Theory]
+        [InlineData("http://localhost/api/v1/Maps/5", "PUT")]
+        [InlineData("http://localhost/api/v2/Maps/5", "PUT")]
+        [InlineData("http://localhost/api/v1/Maps/PartialUpdate/5", "PATCH")]
+        [InlineData("http://localhost/api/v2/Maps/PartialUpdate/5", "PATCH")]
+        public async Task AttributeRoutedAction_MultipleRouteAttributes_CombinesWithMultipleHttpAttributes(
+            string url,
+            string method)
+        {
+            // Arrange & Act
+            var response = await Client.SendAsync(new HttpRequestMessage(new HttpMethod(method), url));
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Maps", result.Controller);
+            Assert.Equal("Update", result.Action);
+
+            Assert.Equal(new string[]
+            {
+                    "/api/v2/Maps/PartialUpdate/5",
+                    "/api/v2/Maps/PartialUpdate/5"
+            },
+            result.ExpectedUrls);
+        }
+
+        [Theory]
+        [InlineData("http://localhost/Banks/Get/5")]
+        [InlineData("http://localhost/Bank/Get/5")]
+        public async Task AttributeRoutedAction_MultipleHttpAttributesAndTokenReplacement(string url)
+        {
+            // Arrange
+            var expectedUrl = new Uri(url).AbsolutePath;
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Banks", result.Controller);
+            Assert.Equal("Get", result.Action);
+
+            Assert.Equal(new string[]
+            {
+                    "/Bank/Get/5",
+                    "/Bank/Get/5"
+            },
+            result.ExpectedUrls);
+        }
+
+        [Theory]
+        [InlineData("http://localhost/api/v1/Maps/5", "PATCH")]
+        [InlineData("http://localhost/api/v2/Maps/5", "PATCH")]
+        [InlineData("http://localhost/api/v1/Maps/PartialUpdate/5", "PUT")]
+        [InlineData("http://localhost/api/v2/Maps/PartialUpdate/5", "PUT")]
+        public async Task AttributeRoutedAction_MultipleRouteAttributes_WithMultipleHttpAttributes_RespectsConstraints(
+            string url,
+            string method)
+        {
+            // Arrange
+            var expectedUrl = new Uri(url).AbsolutePath;
+
+            // Act
+            var response = await Client.SendAsync(new HttpRequestMessage(new HttpMethod(method), url));
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        // The url would be /Store/ListProducts with conventional routes
+        [Fact]
+        public async Task AttributeRoutedAction_IsNotReachableWithTraditionalRoute()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Store/ListProducts");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        // There's two actions at this URL - but attribute routes go in the route table
+        // first.
+        [Fact]
+        public async Task AttributeRoutedAction_TriedBeforeConventionalRouting()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Home/About");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains("/Home/About", result.ExpectedUrls);
+            Assert.Equal("Store", result.Controller);
+            Assert.Equal("About", result.Action);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_ControllerLevelRoute_WithActionParameter_IsReachable()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Blog/Edit/5");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains("/Blog/Edit/5", result.ExpectedUrls);
+            Assert.Equal("Blog", result.Controller);
+            Assert.Equal("Edit", result.Action);
+
+            Assert.Contains(
+                new KeyValuePair<string, object>("controller", "Blog"),
+                result.RouteValues);
+
+            Assert.Contains(
+                new KeyValuePair<string, object>("action", "Edit"),
+                result.RouteValues);
+
+            Assert.Contains(
+                new KeyValuePair<string, object>("postId", "5"),
+                result.RouteValues);
+        }
+
+        // There's no [HttpGet] on the action here.
+        [Fact]
+        public async Task AttributeRoutedAction_ControllerLevelRoute_IsReachable()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Employee");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains("/api/Employee", result.ExpectedUrls);
+            Assert.Equal("Employee", result.Controller);
+            Assert.Equal("List", result.Action);
+        }
+
+        // We are intentionally skipping GET because we have another method with [HttpGet] on the same controller
+        // and a test that verifies that if you define another action with a specific verb we'll route to that
+        // more specific action.
+        [Theory]
+        [InlineData("PUT")]
+        [InlineData("POST")]
+        [InlineData("PATCH")]
+        [InlineData("DELETE")]
+        public async Task AttributeRoutedAction_RouteAttributeOnAction_IsReachable(string method)
+        {
+            // Arrange
+            var message = new HttpRequestMessage(new HttpMethod(method), "http://localhost/Store/Shop/Orders");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains("/Store/Shop/Orders", result.ExpectedUrls);
+            Assert.Equal("Store", result.Controller);
+            Assert.Equal("Orders", result.Action);
+        }
+
+        [Theory]
+        [InlineData("GET")]
+        [InlineData("POST")]
+        [InlineData("PUT")]
+        [InlineData("PATCH")]
+        [InlineData("DELETE")]
+        public async Task AttributeRoutedAction_RouteAttributeOnActionAndController_IsReachable(string method)
+        {
+            // Arrange
+            var message = new HttpRequestMessage(new HttpMethod(method), "http://localhost/api/Employee/5/Salary");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains("/api/Employee/5/Salary", result.ExpectedUrls);
+            Assert.Equal("Employee", result.Controller);
+            Assert.Equal("Salary", result.Action);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_RouteAttributeOnActionAndHttpGetOnDifferentAction_ReachesHttpGetAction()
+        {
+            // Arrange
+            var message = new HttpRequestMessage(HttpMethod.Get, "http://localhost/Store/Shop/Orders");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains("/Store/Shop/Orders", result.ExpectedUrls);
+            Assert.Equal("Store", result.Controller);
+            Assert.Equal("GetOrders", result.Action);
+        }
+
+        // There's no [HttpGet] on the action here.
+        [Theory]
+        [InlineData("PUT")]
+        [InlineData("PATCH")]
+        public async Task AttributeRoutedAction_ControllerLevelRoute_WithAcceptVerbs_IsReachable(string verb)
+        {
+            // Arrange
+            var message = new HttpRequestMessage(new HttpMethod(verb), "http://localhost/api/Employee");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains("/api/Employee", result.ExpectedUrls);
+            Assert.Equal("Employee", result.Controller);
+            Assert.Equal("UpdateEmployee", result.Action);
+        }
+
+        [Theory]
+        [InlineData("PUT")]
+        [InlineData("PATCH")]
+        public async Task AttributeRoutedAction_ControllerLevelRoute_WithAcceptVerbsAndRouteTemplate_IsReachable(string verb)
+        {
+            // Arrange
+            var message = new HttpRequestMessage(new HttpMethod(verb), "http://localhost/api/Employee/Manager");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains("/api/Employee/Manager", result.ExpectedUrls);
+            Assert.Equal("Employee", result.Controller);
+            Assert.Equal("UpdateManager", result.Action);
+        }
+
+        [Theory]
+        [InlineData("PUT", "Bank")]
+        [InlineData("PATCH", "Bank")]
+        [InlineData("PUT", "Bank/Update")]
+        [InlineData("PATCH", "Bank/Update")]
+        public async Task AttributeRoutedAction_AcceptVerbsAndRouteTemplate_IsReachable(string verb, string path)
+        {
+            // Arrange
+            var expectedUrl = "/Bank/Update";
+            var message = new HttpRequestMessage(new HttpMethod(verb), "http://localhost/" + path);
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal(new string[] { expectedUrl, expectedUrl }, result.ExpectedUrls);
+            Assert.Equal("Banks", result.Controller);
+            Assert.Equal("UpdateBank", result.Action);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_WithCustomHttpAttributes_IsReachable()
+        {
+            // Arrange
+            var message = new HttpRequestMessage(new HttpMethod("MERGE"), "http://localhost/api/Employee/5");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains("/api/Employee/5", result.ExpectedUrls);
+            Assert.Equal("Employee", result.Controller);
+            Assert.Equal("MergeEmployee", result.Action);
+        }
+
+        // There's an [HttpGet] with its own template on the action here.
+        [Theory]
+        [InlineData("GET", "GetAdministrator")]
+        [InlineData("DELETE", "DeleteAdministrator")]
+        public async Task AttributeRoutedAction_ControllerLevelRoute_CombinedWithActionRoute_IsReachable(string verb, string action)
+        {
+            // Arrange
+            var message = new HttpRequestMessage(new HttpMethod(verb), "http://localhost/api/Employee/5/Administrator");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains("/api/Employee/5/Administrator", result.ExpectedUrls);
+            Assert.Equal("Employee", result.Controller);
+            Assert.Equal(action, result.Action);
+
+            Assert.Contains(
+                new KeyValuePair<string, object>("id", "5"),
+                result.RouteValues);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_ActionLevelRouteWithTildeSlash_OverridesControllerLevelRoute()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Manager/5");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains("/Manager/5", result.ExpectedUrls);
+            Assert.Equal("Employee", result.Controller);
+            Assert.Equal("GetManager", result.Action);
+
+            Assert.Contains(
+                new KeyValuePair<string, object>("id", "5"),
+                result.RouteValues);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_OverrideActionOverridesOrderOnController()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Team/5");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains("/Team/5", result.ExpectedUrls);
+            Assert.Equal("Team", result.Controller);
+            Assert.Equal("GetOrganization", result.Action);
+
+            Assert.Contains(
+                new KeyValuePair<string, object>("teamId", "5"),
+                result.RouteValues);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_OrderOnActionOverridesOrderOnController()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Teams");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains("/Teams", result.ExpectedUrls);
+            Assert.Equal("Team", result.Controller);
+            Assert.Equal("GetOrganizations", result.Action);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_LinkGeneration_OverrideActionOverridesOrderOnController()
+        {
+            // Arrange & Act
+            var response = await Client.GetStringAsync("http://localhost/Organization/5");
+
+            // Assert
+            Assert.NotNull(response);
+            Assert.Equal("/Club/5", response);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_LinkGeneration_OrderOnActionOverridesOrderOnController()
+        {
+            // Arrange & Act
+            var response = await Client.GetStringAsync("http://localhost/Teams/AllTeams");
+
+            // Assert
+            Assert.NotNull(response);
+            Assert.Equal("/Teams/AllOrganizations", response);
+        }
+
+        [Theory]
+        [InlineData("", "/TeamName/DefaultName")]
+        [InlineData("CustomName", "/TeamName/CustomName")]
+        public async Task AttributeRoutedAction_PreservesDefaultValue_IfRouteValueIsNull(string teamName, string expected)
+        {
+            // Arrange & Act
+            var body = await Client.GetStringAsync("http://localhost/TeamName/" + teamName);
+
+            // Assert
+            Assert.NotNull(body);
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+            Assert.Single(result.ExpectedUrls, expected);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_LinkToSelf()
+        {
+            // Arrange
+            var url = LinkFrom("http://localhost/api/Employee").To(new { });
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Employee", result.Controller);
+            Assert.Equal("List", result.Action);
+
+            Assert.Equal("/api/Employee", result.Link);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_LinkWithAmbientController()
+        {
+            // Arrange
+            var url = LinkFrom("http://localhost/api/Employee").To(new { action = "Get", id = 5 });
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Employee", result.Controller);
+            Assert.Equal("List", result.Action);
+
+            Assert.Equal("/api/Employee/5", result.Link);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_LinkToAttributeRoutedController()
+        {
+            // Arrange
+            var url = LinkFrom("http://localhost/api/Employee").To(new { action = "ShowPosts", controller = "Blog" });
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Employee", result.Controller);
+            Assert.Equal("List", result.Action);
+
+            Assert.Equal("/Blog/ShowPosts", result.Link);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_LinkToConventionalController()
+        {
+            // Arrange
+            var url = LinkFrom("http://localhost/api/Employee").To(new { action = "Index", controller = "Home" });
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Employee", result.Controller);
+            Assert.Equal("List", result.Action);
+
+            Assert.Equal("/", result.Link);
+        }
+
+        [Theory]
+        [InlineData("GET", "Get")]
+        [InlineData("PUT", "Put")]
+        public async Task AttributeRoutedAction_LinkWithName_WithNameInheritedFromControllerRoute(
+            string method,
+            string actionName)
+        {
+            // Arrange
+            var message = new HttpRequestMessage(new HttpMethod(method), "http://localhost/api/Company/5");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Company", result.Controller);
+            Assert.Equal(actionName, result.Action);
+
+            Assert.Equal("/api/Company/5", result.ExpectedUrls.Single());
+            Assert.Equal("Company", result.RouteName);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_LinkWithName_WithNameOverrridenFromController()
+        {
+            // Arrange & Act
+            var response = await Client.DeleteAsync("http://localhost/api/Company/5");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Company", result.Controller);
+            Assert.Equal("Delete", result.Action);
+
+            Assert.Equal("/api/Company/5", result.ExpectedUrls.Single());
+            Assert.Equal("RemoveCompany", result.RouteName);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_Link_WithNonEmptyActionRouteTemplateAndNoActionRouteName()
+        {
+            // Arrange
+            var url = LinkFrom("http://localhost")
+                .To(new { id = 5 });
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/api/Company/5/Employees");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Company", result.Controller);
+            Assert.Equal("GetEmployees", result.Action);
+
+            Assert.Equal("/api/Company/5/Employees", result.ExpectedUrls.Single());
+            Assert.Null(result.RouteName);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_LinkWithName_WithNonEmptyActionRouteTemplateAndActionRouteName()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Company/5/Departments");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Company", result.Controller);
+            Assert.Equal("GetDepartments", result.Action);
+
+            Assert.Equal("/api/Company/5/Departments", result.ExpectedUrls.Single());
+            Assert.Equal("Departments", result.RouteName);
+        }
+
+        [Fact]
+        public async Task ConventionalRoutedAction_LinkToArea()
+        {
+            // Arrange
+            var url = LinkFrom("http://localhost/")
+                .To(new { action = "BuyTickets", controller = "Flight", area = "Travel" });
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Home", result.Controller);
+            Assert.Equal("Index", result.Action);
+
+            Assert.Equal("/Travel/Flight/BuyTickets", result.Link);
+        }
+
+        [Fact]
+        public async Task ConventionalRoutedAction_InArea_ImplicitLinkToArea()
+        {
+            // Arrange
+            var url = LinkFrom("http://localhost/Travel/Flight").To(new { action = "BuyTickets" });
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Flight", result.Controller);
+            Assert.Equal("Index", result.Action);
+
+            Assert.Equal("/Travel/Flight/BuyTickets", result.Link);
+        }
+
+        [Fact]
+        public async Task ConventionalRoutedAction_InArea_ExplicitLeaveArea()
+        {
+            // Arrange
+            var url = LinkFrom("http://localhost/Travel/Flight")
+                .To(new { action = "Index", controller = "Home", area = "" });
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Flight", result.Controller);
+            Assert.Equal("Index", result.Action);
+
+            Assert.Equal("/", result.Link);
+        }
+
+        [Fact]
+        public async Task ConventionalRoutedAction_InArea_StaysInArea()
+        {
+            // Arrange
+            var url = LinkFrom("http://localhost/Travel/Flight").To(new { action = "Contact", controller = "Home", });
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Flight", result.Controller);
+            Assert.Equal("Index", result.Action);
+
+            Assert.Equal("/Travel/Home/Contact", result.Link);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_LinkToArea()
+        {
+            // Arrange
+            var url = LinkFrom("http://localhost/api/Employee")
+                .To(new { action = "Schedule", controller = "Rail", area = "Travel" });
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Employee", result.Controller);
+            Assert.Equal("List", result.Action);
+
+            Assert.Equal("/ContosoCorp/Trains/CheckSchedule", result.Link);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_InArea_ImplicitLinkToArea()
+        {
+            // Arrange
+            var url = LinkFrom("http://localhost/ContosoCorp/Trains/CheckSchedule").To(new { action = "Index" });
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Rail", result.Controller);
+            Assert.Equal("Schedule", result.Action);
+
+            Assert.Equal("/ContosoCorp/Trains", result.Link);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_InArea_ExplicitLeaveArea()
+        {
+            // Arrange
+            var url = LinkFrom("http://localhost/ContosoCorp/Trains/CheckSchedule")
+                .To(new { action = "Index", controller = "Home", area = "" });
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Rail", result.Controller);
+            Assert.Equal("Schedule", result.Action);
+
+            Assert.Equal("/", result.Link);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_InArea_StaysInArea_ActionDoesntExist()
+        {
+            // Arrange
+            var url = LinkFrom("http://localhost/ContosoCorp/Trains")
+                .To(new { action = "Contact", controller = "Home", });
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Rail", result.Controller);
+            Assert.Equal("Index", result.Action);
+
+            Assert.Equal("/Travel/Home/Contact", result.Link);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_InArea_LinkToConventionalRoutedActionInArea()
+        {
+            // Arrange
+            var url = LinkFrom("http://localhost/ContosoCorp/Trains")
+                .To(new { action = "Index", controller = "Flight", });
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Rail", result.Controller);
+            Assert.Equal("Index", result.Action);
+
+            Assert.Equal("/Travel/Flight", result.Link);
+        }
+
+        [Fact]
+        public async Task ConventionalRoutedAction_InArea_LinkToAttributeRoutedActionInArea()
+        {
+            // Arrange
+            var url = LinkFrom("http://localhost/Travel/Flight")
+                .To(new { action = "Index", controller = "Rail", });
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Flight", result.Controller);
+            Assert.Equal("Index", result.Action);
+
+            Assert.Equal("/ContosoCorp/Trains", result.Link);
+        }
+
+        [Fact]
+        public async Task ConventionalRoutedAction_InArea_LinkToAnotherArea()
+        {
+            // Arrange
+            var url = LinkFrom("http://localhost/Travel/Flight")
+                .To(new { action = "ListUsers", controller = "UserManagement", area = "Admin" });
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Flight", result.Controller);
+            Assert.Equal("Index", result.Action);
+
+            Assert.Equal("/Admin/Users/All", result.Link);
+        }
+
+        [Fact]
+        public async Task AttributeRoutedAction_InArea_LinkToAnotherArea()
+        {
+            // Arrange
+            var url = LinkFrom("http://localhost/ContosoCorp/Trains")
+                .To(new { action = "ListUsers", controller = "UserManagement", area = "Admin" });
+
+            // Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Rail", result.Controller);
+            Assert.Equal("Index", result.Action);
+
+            Assert.Equal("/Admin/Users/All", result.Link);
+        }
+
+        [Theory]
+        [InlineData("/Bank/Deposit", "PUT", "Deposit")]
+        [InlineData("/Bank/Deposit", "POST", "Deposit")]
+        [InlineData("/Bank/Deposit/5", "PUT", "Deposit")]
+        [InlineData("/Bank/Deposit/5", "POST", "Deposit")]
+        [InlineData("/Bank/Withdraw/5", "POST", "Withdraw")]
+        public async Task AttributeRouting_MixedAcceptVerbsAndRoute_Reachable(string path, string verb, string actionName)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(new HttpMethod(verb), "http://localhost" + path);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains(path, result.ExpectedUrls);
+            Assert.Equal("Banks", result.Controller);
+            Assert.Equal(actionName, result.Action);
+        }
+
+        // These verbs don't match
+        [Theory]
+        [InlineData("/Bank/Deposit", "GET")]
+        [InlineData("/Bank/Deposit/5", "DELETE")]
+        [InlineData("/Bank/Withdraw/5", "GET")]
+        public async Task AttributeRouting_MixedAcceptVerbsAndRoute_Unreachable(string path, string verb)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(new HttpMethod(verb), "http://localhost" + path);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        [Theory]
+        [InlineData("/Order/Add/1", "GET", "Add")]
+        [InlineData("/Order/Add", "POST", "Add")]
+        [InlineData("/Order/Edit/1", "PUT", "Edit")]
+        [InlineData("/Order/GetOrder", "GET", "GetOrder")]
+        public async Task AttributeRouting_RouteNameTokenReplace_Reachable(string path, string verb, string actionName)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(new HttpMethod(verb), "http://localhost" + path);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains(path, result.ExpectedUrls);
+            Assert.Equal("Order", result.Controller);
+            Assert.Equal(actionName, result.Action);
+        }
+
+        private static LinkBuilder LinkFrom(string url)
+        {
+            return new LinkBuilder(url);
+        }
+
+        // See TestResponseGenerator in RoutingWebSite for the code that generates this data.
+        private class RoutingResult
+        {
+            public string[] ExpectedUrls { get; set; }
+
+            public string ActualUrl { get; set; }
+
+            public Dictionary<string, object> RouteValues { get; set; }
+
+            public string RouteName { get; set; }
+
+            public string Action { get; set; }
+
+            public string Controller { get; set; }
+
+            public string Link { get; set; }
+        }
+
+        private class LinkBuilder
+        {
+            public LinkBuilder(string url)
+            {
+                Url = url;
+
+                Values = new Dictionary<string, object>();
+                Values.Add("link", string.Empty);
+            }
+
+            public string Url { get; set; }
+
+            public Dictionary<string, object> Values { get; set; }
+
+            public LinkBuilder To(object values)
+            {
+                var dictionary = new RouteValueDictionary(values);
+                foreach (var kvp in dictionary)
+                {
+                    Values.Add("link_" + kvp.Key, kvp.Value);
+                }
+
+                return this;
+            }
+
+            public override string ToString()
+            {
+                return Url + "?" + string.Join("&", Values.Select(kvp => kvp.Key + "=" + kvp.Value));
+            }
+
+            public static implicit operator string(LinkBuilder builder)
+            {
+                return builder.ToString();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SerializableErrorTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SerializableErrorTests.cs
new file mode 100644
index 0000000000..7f073ee9a3
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SerializableErrorTests.cs
@@ -0,0 +1,121 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Formatters.Xml;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.Testing.xunit;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class SerializableErrorTests : IClassFixture<MvcTestFixture<XmlFormattersWebSite.Startup>>
+    {
+        public SerializableErrorTests(MvcTestFixture<XmlFormattersWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        public static TheoryData AcceptHeadersData
+        {
+            get
+            {
+                var data = new TheoryData<string>
+                {
+                    "application/xml-xmlser"
+                };
+
+                // Mono issue - https://github.com/aspnet/External/issues/18
+                if (!TestPlatformHelper.IsMono)
+                {
+                    data.Add("application/xml-dcs");
+                }
+
+                return data;
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(AcceptHeadersData))]
+        public async Task ModelStateErrors_AreSerialized(string acceptHeader)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/SerializableError/ModelStateErrors");
+            request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptHeader));
+            var expectedXml = "<Error><key1>key1-error</key1><key2>The input was not valid.</key2></Error>";
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal(acceptHeader, response.Content.Headers.ContentType.MediaType);
+            var responseData = await response.Content.ReadAsStringAsync();
+            XmlAssert.Equal(expectedXml, responseData);
+        }
+
+        [ConditionalTheory]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        // XmlSerializer test is disabled Mono.Xml2.XmlTextReader.ReadText is unable to read the XML.
+        // This is fixed in mono 4.3.0.
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        [InlineData("application/xml-xmlser")]
+        [InlineData("application/xml-dcs")]
+        public async Task PostedSerializableError_IsBound(string acceptHeader)
+        {
+            // Arrange
+            var expectedXml = "<Error><key1>key1-error</key1><key2>The input was not valid.</key2></Error>";
+            var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/SerializableError/LogErrors");
+            request.Content = new StringContent(expectedXml, Encoding.UTF8, acceptHeader);
+            request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(acceptHeader));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content);
+            Assert.NotNull(response.Content.Headers.ContentType);
+            Assert.Equal(acceptHeader, response.Content.Headers.ContentType.MediaType);
+            var responseData = await response.Content.ReadAsStringAsync();
+            XmlAssert.Equal(expectedXml, responseData);
+        }
+
+        [ConditionalTheory]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        // XmlSerializer test is disabled Mono.Xml2.XmlTextReader.ReadText is unable to read the XML.
+        // This is fixed in mono 4.3.0.
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        [InlineData("application/xml-xmlser")]
+        [InlineData("application/xml-dcs")]
+        public async Task IsReturnedInExpectedFormat(string acceptHeader)
+        {
+            // Arrange
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<Employee xmlns=\"http://schemas.datacontract.org/2004/07/XmlFormattersWebSite.Models\">" +
+                "<Id>2</Id><Name>foo</Name></Employee>";
+            var expected = "<Error><Id>The field Id must be between 10 and 100.</Id>" +
+                "<Name>The field Name must be a string or array type with a minimum " +
+                "length of '15'.</Name></Error>";
+            var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/SerializableError/CreateEmployee");
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse(acceptHeader));
+            request.Content = new StringContent(input, Encoding.UTF8, "application/xml-dcs");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+            var responseData = await response.Content.ReadAsStringAsync();
+            XmlAssert.Equal(expected, responseData);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SimpleTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SimpleTests.cs
new file mode 100644
index 0000000000..b5169c96ab
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SimpleTests.cs
@@ -0,0 +1,37 @@
+// 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.
+
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class SimpleTests : IClassFixture<MvcTestFixture<SimpleWebSite.Startup>>
+    {
+        public SimpleTests(MvcTestFixture<SimpleWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task JsonSerializeFormated()
+        {
+            // Arrange
+            var expected = "{" + Environment.NewLine
+                 + "  \"first\": \"wall\"," + Environment.NewLine
+                 + "  \"second\": \"floor\"" + Environment.NewLine
+                 + "}";
+
+            // Act
+            var content = await Client.GetStringAsync("http://localhost/Home/Index");
+
+            // Assert
+            Assert.Equal(expected, content);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/StreamOutputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/StreamOutputFormatterTest.cs
new file mode 100644
index 0000000000..23db399359
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/StreamOutputFormatterTest.cs
@@ -0,0 +1,37 @@
+// 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.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class StreamOutputFormatterTest : IClassFixture<MvcTestFixture<FormatterWebSite.Startup>>
+    {
+        public StreamOutputFormatterTest(MvcTestFixture<FormatterWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Theory]
+        [InlineData("SimpleMemoryStream", null)]
+        [InlineData("MemoryStreamWithContentType", "text/html")]
+        [InlineData("MemoryStreamWithContentTypeFromProduces", "text/plain")]
+        [InlineData("MemoryStreamWithContentTypeFromProducesWithMultipleValues", "text/html")]
+        [InlineData("MemoryStreamOverridesProducesContentTypeWithResponseContentType", "text/plain")]
+        public async Task StreamOutputFormatter_ReturnsAppropriateContentAndContentType(string actionName, string contentType)
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/Stream/" + actionName);
+            var body = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(contentType, response.Content.Headers.ContentType?.ToString());
+
+            Assert.Equal("Sample text from a stream", body);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelperComponentTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelperComponentTagHelperTest.cs
new file mode 100644
index 0000000000..c388e93f3a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelperComponentTagHelperTest.cs
@@ -0,0 +1,95 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using System.Reflection;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class TagHelperComponentTagHelperTest : IClassFixture<MvcTestFixture<RazorWebSite.Startup>>
+    {
+        private static readonly Assembly _resourcesAssembly = typeof(TagHelperComponentTagHelperTest).GetTypeInfo().Assembly;
+
+        public TagHelperComponentTagHelperTest(MvcTestFixture<RazorWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task InjectsTestHeadTagHelperComponent()
+        {
+            // Arrange
+            var url = "http://localhost/TagHelperComponent/GetHead";
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            var outputFile = "compiler/resources/RazorWebSite.TagHelperComponent.Head.html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var responseContent = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            Assert.Equal(expectedContent, responseContent, ignoreLineEndingDifferences: true);
+#endif
+        }
+
+        [Fact]
+        public async Task InjectsTestBodyTagHelperComponent()
+        {
+            // Arrange
+            var url = "http://localhost/TagHelperComponent/GetBody";
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            var outputFile = "compiler/resources/RazorWebSite.TagHelperComponent.Body.html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var responseContent = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            Assert.Equal(expectedContent, responseContent, ignoreLineEndingDifferences: true);
+#endif
+        }
+
+        [Fact]
+        public async Task AddTestTagHelperComponent_FromController()
+        {
+            // Arrange
+            var url = "http://localhost/AddTagHelperComponent/AddComponent";
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            var outputFile = "compiler/resources/RazorWebSite.AddTagHelperComponent.AddComponent.html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var responseContent = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            Assert.Equal(expectedContent, responseContent, ignoreLineEndingDifferences: true);
+#endif
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelpersFromServicesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelpersFromServicesTest.cs
new file mode 100644
index 0000000000..6d1c7cf47d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelpersFromServicesTest.cs
@@ -0,0 +1,34 @@
+// 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.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class TagHelpersFromServicesTest : IClassFixture<MvcTestFixture<ControllersFromServicesWebSite.Startup>>
+    {
+        public TagHelpersFromServicesTest(MvcTestFixture<ControllersFromServicesWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task TagHelpersWithConstructorInjectionAreCreatedAndActivated()
+        {
+            // Arrange
+            var expected = "3";
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/another/inservicestaghelper");
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var responseText = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(expected, responseText.Trim());
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelpersTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelpersTest.cs
new file mode 100644
index 0000000000..b3c4d051aa
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelpersTest.cs
@@ -0,0 +1,323 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Reflection;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class TagHelpersTest :
+        IClassFixture<MvcTestFixture<TagHelpersWebSite.Startup>>,
+        IClassFixture<MvcEncodedTestFixture<TagHelpersWebSite.Startup>>
+    {
+        // Some tests require comparing the actual response body against an expected response baseline
+        // so they require a reference to the assembly on which the resources are located, in order to
+        // make the tests less verbose, we get a reference to the assembly with the resources and we
+        // use it on all the rest of the tests.
+        private static readonly Assembly _resourcesAssembly = typeof(TagHelpersTest).GetTypeInfo().Assembly;
+
+        public TagHelpersTest(
+            MvcTestFixture<TagHelpersWebSite.Startup> fixture,
+            MvcEncodedTestFixture<TagHelpersWebSite.Startup> encodedFixture)
+        {
+            Client = fixture.CreateDefaultClient();
+            EncodedClient = encodedFixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        public HttpClient EncodedClient { get; }
+
+        [Theory]
+        [InlineData("Index")]
+        [InlineData("About")]
+        [InlineData("Help")]
+        [InlineData("UnboundDynamicAttributes")]
+        [InlineData("ViewComponentTagHelpers")]
+        public async Task CanRenderViewsWithTagHelpers(string action)
+        {
+            // Arrange
+            var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");
+            var outputFile = "compiler/resources/TagHelpersWebSite.Home." + action + ".html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            // Act
+            // The host is not important as everything runs in memory and tests are isolated from each other.
+            var response = await Client.GetAsync("http://localhost/Home/" + action);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
+
+            var responseContent = await response.Content.ReadAsStringAsync();
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            Assert.Equal(expectedContent, responseContent, ignoreLineEndingDifferences: true);
+#endif
+        }
+
+        [Fact]
+        public async Task CanRenderViewsWithTagHelpersAndUnboundDynamicAttributes_Encoded()
+        {
+            // Arrange
+            var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");
+            var outputFile = "compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.Encoded.html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            // Act
+            // The host is not important as everything runs in memory and tests are isolated from each other.
+            var response = await EncodedClient.GetAsync("http://localhost/Home/UnboundDynamicAttributes");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
+
+            var responseContent = await response.Content.ReadAsStringAsync();
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            Assert.Equal(expectedContent, responseContent, ignoreLineEndingDifferences: true);
+#endif
+        }
+
+        [Fact]
+        public async Task ReregisteringAntiforgeryTokenInsideFormTagHelper_DoesNotAddDuplicateAntiforgeryTokenFields()
+        {
+            // Arrange
+            var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");
+            var outputFile = "compiler/resources/TagHelpersWebSite.Employee.DuplicateAntiforgeryTokenRegistration.html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/Employee/DuplicateAntiforgeryTokenRegistration");
+            var responseContent = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
+
+            responseContent = responseContent.Trim();
+
+            var forgeryToken = AntiforgeryTestHelper.RetrieveAntiforgeryToken(
+                responseContent, "/Employee/DuplicateAntiforgeryTokenRegistration");
+
+#if GENERATE_BASELINES
+            // Reverse usual substitution and insert a format item into the new file content.
+            responseContent = responseContent.Replace(forgeryToken, "{0}");
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            expectedContent = string.Format(expectedContent, forgeryToken);
+            // Mono issue - https://github.com/aspnet/External/issues/19
+            Assert.Equal(
+                PlatformNormalizer.NormalizeContent(expectedContent.Trim()),
+                responseContent,
+                ignoreLineEndingDifferences: true);
+#endif
+        }
+
+        public static TheoryData TagHelpersAreInheritedFromViewImportsPagesData
+        {
+            get
+            {
+                // action, expected
+                return new TheoryData<string, string>
+                {
+                    {
+                        "NestedViewImportsTagHelper",
+                        @"<root>root-content</root>
+
+
+<nested>nested-content</nested>"
+                    },
+                    {
+                        "ViewWithLayoutAndNestedTagHelper",
+                        @"layout:<root>root-content</root>
+<nested>nested-content</nested>"
+                    },
+                    {
+                        "ViewWithInheritedRemoveTagHelper",
+                        @"layout:<root>root-content</root>
+page:<root/>
+<nested>nested-content</nested>"
+                    },
+                    {
+                        "ViewWithInheritedTagHelperPrefix",
+                        @"layout:<root>root-content</root>
+page:<root>root-content</root>"
+                    },
+                    {
+                        "ViewWithOverriddenTagHelperPrefix",
+                        @"layout:<root>root-content</root>
+
+page:<root>root-content</root>"
+                    },
+                    {
+                        "ViewWithNestedInheritedTagHelperPrefix",
+                        @"layout:<root>root-content</root>
+page:<root>root-content</root>"
+                    },
+                    {
+                        "ViewWithNestedOverriddenTagHelperPrefix",
+                        @"layout:<root>root-content</root>
+
+page:<root>root-content</root>"
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(TagHelpersAreInheritedFromViewImportsPagesData))]
+        public async Task TagHelpersAreInheritedFromViewImportsPages(string action, string expected)
+        {
+            // Arrange & Act
+            var result = await Client.GetStringAsync("http://localhost/Home/" + action);
+
+            // Assert
+            Assert.Equal(expected, result.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task DefaultInheritedTagsCanBeRemoved()
+        {
+            // Arrange
+            var expected =
+@"<a href=""~/VirtualPath"">Virtual path</a>";
+
+            var result = await Client.GetStringAsync("RemoveDefaultInheritedTagHelpers");
+
+            // Assert
+            Assert.Equal(expected, result.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task ViewsWithModelMetadataAttributes_CanRenderForm()
+        {
+            // Arrange
+            var outputFile = "compiler/resources/TagHelpersWebSite.Employee.Create.html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/Employee/Create");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var responseContent = await response.Content.ReadAsStringAsync();
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            // Mono issue - https://github.com/aspnet/External/issues/19
+            Assert.Equal(
+                PlatformNormalizer.NormalizeContent(expectedContent),
+                responseContent,
+                ignoreLineEndingDifferences: true);
+#endif
+        }
+
+        [Fact]
+        public async Task ViewsWithModelMetadataAttributes_CanRenderPostedValue()
+        {
+            // Arrange
+            var outputFile = "compiler/resources/TagHelpersWebSite.Employee.Details.AfterCreate.html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+            var validPostValues = new Dictionary<string, string>
+            {
+                { "FullName", "Boo" },
+                { "Gender", "M" },
+                { "Age", "22" },
+                { "EmployeeId", "0" },
+                { "JoinDate", "2014-12-01" },
+                { "Email", "a@b.com" },
+            };
+            var postContent = new FormUrlEncodedContent(validPostValues);
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/Employee/Create", postContent);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var responseContent = await response.Content.ReadAsStringAsync();
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            Assert.Equal(expectedContent, responseContent, ignoreLineEndingDifferences: true);
+#endif
+        }
+
+        [Fact]
+        public async Task ViewsWithModelMetadataAttributes_CanHandleInvalidData()
+        {
+            // Arrange
+            var outputFile = "compiler/resources/TagHelpersWebSite.Employee.Create.Invalid.html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+            var validPostValues = new Dictionary<string, string>
+            {
+                { "FullName", "Boo" },
+                { "Gender", "M" },
+                { "Age", "1000" },
+                { "EmployeeId", "0" },
+                { "Email", "a@b.com" },
+                { "Salary", "z" },
+            };
+            var postContent = new FormUrlEncodedContent(validPostValues);
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/Employee/Create", postContent);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var responseContent = await response.Content.ReadAsStringAsync();
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            // Mono issue - https://github.com/aspnet/External/issues/19
+            Assert.Equal(
+                PlatformNormalizer.NormalizeContent(expectedContent),
+                responseContent,
+                ignoreLineEndingDifferences: true);
+#endif
+        }
+
+        [Theory]
+        [InlineData("Index")]
+        [InlineData("CustomEncoder")]
+        [InlineData("NullEncoder")]
+        [InlineData("TwoEncoders")]
+        [InlineData("ThreeEncoders")]
+        public async Task EncodersPages_ReturnExpectedContent(string actionName)
+        {
+            // Arrange
+            var outputFile = $"compiler/resources/TagHelpersWebSite.Encoders.{ actionName }.html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            // Act
+            var response = await Client.GetAsync($"/Encoders/{ actionName }");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var responseContent = await response.Content.ReadAsStringAsync();
+
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            Assert.Equal(expectedContent, responseContent, ignoreLineEndingDifferences: true);
+#endif
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInCookiesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInCookiesTest.cs
new file mode 100644
index 0000000000..b68cd88081
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInCookiesTest.cs
@@ -0,0 +1,166 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.Net.Http.Headers;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class TempDataInCookiesTest : TempDataTestBase, IClassFixture<MvcTestFixture<BasicWebSite.Startup>>
+    {
+        public TempDataInCookiesTest(MvcTestFixture<BasicWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        protected override HttpClient Client { get; }
+
+
+        [Theory]
+        [InlineData(ChunkingCookieManager.DefaultChunkSize)]
+        [InlineData(ChunkingCookieManager.DefaultChunkSize * 1.5)]
+        [InlineData(ChunkingCookieManager.DefaultChunkSize * 2)]
+        [InlineData(ChunkingCookieManager.DefaultChunkSize * 3)]
+        public async Task RoundTripLargeData_WorksWithChunkingCookies(int size)
+        {
+            // Arrange
+            var character = 'a';
+            var expected = new string(character, size);
+
+            // Act 1
+            var response = await Client.GetAsync($"/TempData/SetLargeValueInTempData?size={size}&character={character}");
+
+            // Assert 1
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.True(response.Headers.TryGetValues(HeaderNames.SetCookie, out IEnumerable<string> setCookieValues));
+            setCookieValues = setCookieValues.Where(cookie => cookie.Contains(CookieTempDataProvider.CookieName));
+            Assert.NotEmpty(setCookieValues);
+            // Verify that all the cookies from CookieTempDataProvider are within the maximum size
+            foreach (var cookie in setCookieValues)
+            {
+                Assert.True(cookie.Length <= ChunkingCookieManager.DefaultChunkSize);
+            }
+
+            var cookieTempDataProviderCookies = setCookieValues
+                .Select(setCookieValue => SetCookieHeaderValue.Parse(setCookieValue));
+            foreach (var cookieTempDataProviderCookie in cookieTempDataProviderCookies)
+            {
+                Assert.NotNull(cookieTempDataProviderCookie.Value.Value);
+                Assert.Equal("/", cookieTempDataProviderCookie.Path);
+                Assert.Null(cookieTempDataProviderCookie.Domain.Value);
+                Assert.False(cookieTempDataProviderCookie.Secure);
+            }
+
+            // Act 2
+            response = await Client.SendAsync(GetRequest("/TempData/GetLargeValueFromTempData", response));
+
+            // Assert 2
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expected, body);
+            Assert.True(response.Headers.TryGetValues(HeaderNames.SetCookie, out setCookieValues));
+            var setCookieHeaderValue = setCookieValues
+                .Select(setCookieValue => SetCookieHeaderValue.Parse(setCookieValue))
+                .FirstOrDefault(setCookieHeader => setCookieHeader.Name == CookieTempDataProvider.CookieName);
+            Assert.NotNull(setCookieHeaderValue);
+            Assert.Equal(string.Empty, setCookieHeaderValue.Value);
+            Assert.Equal("/", setCookieHeaderValue.Path);
+            Assert.Null(setCookieHeaderValue.Domain.Value);
+            Assert.NotNull(setCookieHeaderValue.Expires);
+            Assert.True(setCookieHeaderValue.Expires < DateTimeOffset.Now); // expired cookie
+
+            // Act 3
+            response = await Client.SendAsync(GetRequest("/TempData/GetLargeValueFromTempData", response));
+
+            // Assert 3
+            Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task Redirect_RetainsTempData_EvenIfAccessed_AndSetsAppropriateCookieValues()
+        {
+            // Arrange
+            var nameValueCollection = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>("value", "Foo"),
+            };
+            var content = new FormUrlEncodedContent(nameValueCollection);
+
+            // Act 1
+            var response = await Client.PostAsync("/TempData/SetTempData", content);
+
+            // Assert 1
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.True(response.Headers.TryGetValues(HeaderNames.SetCookie, out IEnumerable<string> setCookieValues));
+            var setCookieHeader = setCookieValues
+                .Select(setCookieValue => SetCookieHeaderValue.Parse(setCookieValue))
+                .FirstOrDefault(setCookieHeaderValue => setCookieHeaderValue.Name == CookieTempDataProvider.CookieName);
+            Assert.NotNull(setCookieHeader);
+            Assert.Equal("/", setCookieHeader.Path);
+            Assert.Null(setCookieHeader.Domain.Value);
+            Assert.False(setCookieHeader.Secure);
+            Assert.Null(setCookieHeader.Expires);
+
+            // Act 2
+            var redirectResponse = await Client.SendAsync(GetRequest("/TempData/GetTempDataAndRedirect", response));
+
+            // Assert 2
+            Assert.Equal(HttpStatusCode.Redirect, redirectResponse.StatusCode);
+
+            // Act 3
+            response = await Client.SendAsync(GetRequest(redirectResponse.Headers.Location.ToString(), response));
+
+            // Assert 3
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Foo", body);
+            Assert.True(response.Headers.TryGetValues(HeaderNames.SetCookie, out setCookieValues));
+            setCookieHeader = setCookieValues
+                .Select(setCookieValue => SetCookieHeaderValue.Parse(setCookieValue))
+                .FirstOrDefault(setCookieHeaderValue => setCookieHeaderValue.Name == CookieTempDataProvider.CookieName);
+            Assert.NotNull(setCookieHeader);
+            Assert.Equal(string.Empty, setCookieHeader.Value);
+            Assert.Equal("/", setCookieHeader.Path);
+            Assert.Null(setCookieHeader.Domain.Value);
+            Assert.NotNull(setCookieHeader.Expires);
+            Assert.True(setCookieHeader.Expires < DateTimeOffset.Now); // expired cookie
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task CookieTempDataProviderCookie_DoesNotSetsSecureAttributeOnCookie(bool secureRequest)
+        {
+            // Arrange
+            var protocol = secureRequest ? "https" : "http";
+            var nameValueCollection = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>("value", "Foo"),
+            };
+            var content = new FormUrlEncodedContent(nameValueCollection);
+
+            // Act
+            var response = await Client.PostAsync($"{protocol}://localhost/TempData/SetTempData", content);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.True(response.Headers.TryGetValues(HeaderNames.SetCookie, out IEnumerable<string> setCookieValues));
+            var setCookieHeader = setCookieValues
+                .Select(setCookieValue => SetCookieHeaderValue.Parse(setCookieValue))
+                .FirstOrDefault(setCookieHeaderValue => setCookieHeaderValue.Name == CookieTempDataProvider.CookieName);
+            Assert.NotNull(setCookieHeader);
+            Assert.Equal("/", setCookieHeader.Path);
+            Assert.Null(setCookieHeader.Domain.Value);
+            Assert.False(setCookieHeader.Secure);
+            Assert.Null(setCookieHeader.Expires);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInCookiesUsingCookieConsentTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInCookiesUsingCookieConsentTest.cs
new file mode 100644
index 0000000000..4c8c173a6f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInCookiesUsingCookieConsentTest.cs
@@ -0,0 +1,117 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Net.Http.Headers;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class TempDataInCookiesUsingCookieConsentTest
+        : IClassFixture<MvcTestFixture<BasicWebSite.StartupWithCookieTempDataProviderAndCookieConsent>>
+    {
+        private readonly HttpClient _client;
+
+        public TempDataInCookiesUsingCookieConsentTest(
+            MvcTestFixture<BasicWebSite.StartupWithCookieTempDataProviderAndCookieConsent> fixture)
+        {
+            var factory = fixture.Factories.FirstOrDefault() ?? fixture.WithWebHostBuilder(ConfigureWebHostBuilder);
+            _client = factory.CreateDefaultClient();
+        }
+
+        private static void ConfigureWebHostBuilder(IWebHostBuilder builder) =>
+            builder.UseStartup<BasicWebSite.StartupWithCookieTempDataProviderAndCookieConsent>();
+
+        [Fact]
+        public async Task CookieTempDataProviderCookie_SetInResponse_OnGrantingConsent()
+        {
+            // Arrange
+            var nameValueCollection = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>("value", "Foo"),
+            };
+            var content = new FormUrlEncodedContent(nameValueCollection);
+            // This response would have the consent cookie which would be sent on rest of the requests here
+            var response = await _client.GetAsync("/TempData/GrantConsent");
+
+            // Act 1
+            response = await _client.SendAsync(GetPostRequest("/TempData/SetTempData", content, response));
+
+            // Assert 1
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            // Act 2
+            response = await _client.SendAsync(GetRequest("/TempData/GetTempData", response));
+
+            // Assert 2
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Foo", body);
+
+            // Act 3
+            response = await _client.SendAsync(GetRequest("/TempData/GetTempData", response));
+
+            // Assert 3
+            Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task CookieTempDataProviderCookie_NotSetInResponse_OnNoConsent()
+        {
+            // Arrange
+            var nameValueCollection = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>("value", "Foo"),
+            };
+            var content = new FormUrlEncodedContent(nameValueCollection);
+
+            // Act 1
+            var response = await _client.PostAsync("/TempData/SetTempData", content);
+
+            // Assert 1
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            // Act 2
+            response = await _client.SendAsync(GetRequest("/TempData/GetTempData", response));
+
+            // Assert 2
+            Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
+        }
+
+        private HttpRequestMessage GetRequest(string path, HttpResponseMessage response)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Get, path);
+            SetCookieHeaders(request, response);
+            return request;
+        }
+
+        private HttpRequestMessage GetPostRequest(string path, HttpContent content, HttpResponseMessage response)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Post, path);
+            request.Content = content;
+            SetCookieHeaders(request, response);
+            return request;
+        }
+
+        private void SetCookieHeaders(HttpRequestMessage request, HttpResponseMessage response)
+        {
+            IEnumerable<string> values;
+            if (response.Headers.TryGetValues("Set-Cookie", out values))
+            {
+                foreach (var cookie in SetCookieHeaderValue.ParseList(values.ToList()))
+                {
+                    if (cookie.Expires == null || cookie.Expires >= DateTimeOffset.UtcNow)
+                    {
+                        request.Headers.Add("Cookie", new CookieHeaderValue(cookie.Name, cookie.Value).ToString());
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInSessionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInSessionTest.cs
new file mode 100644
index 0000000000..6c669f103c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInSessionTest.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using System.Net.Http;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class TempDataInSessionTest : TempDataTestBase, IClassFixture<MvcTestFixture<BasicWebSite.StartupWithSessionTempDataProvider>>
+    {
+        public TempDataInSessionTest(MvcTestFixture<BasicWebSite.StartupWithSessionTempDataProvider> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        protected override HttpClient Client { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataPropertyTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataPropertyTest.cs
new file mode 100644
index 0000000000..18a1870efd
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataPropertyTest.cs
@@ -0,0 +1,169 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Net.Http.Headers;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class TempDataPropertyTest : IClassFixture<MvcTestFixture<BasicWebSite.Startup>>
+    {
+        protected HttpClient Client { get; }
+
+        public TempDataPropertyTest(MvcTestFixture<BasicWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        [Fact]
+        public async Task TempDataPropertyAttribute_RetainsTempDataWithView()
+        {
+            // Arrange
+            var tempDataContent = "Success (from Temp Data)100";
+            var nameValueCollection = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>("FullName", "Bob"),
+                new KeyValuePair<string, string>("id", "1"),
+            };
+            var expected = $"{tempDataContent} for person {nameValueCollection[0].Value} with id {nameValueCollection[1].Value}.";
+            var content = new FormUrlEncodedContent(nameValueCollection);
+
+            // Act 1
+            var redirectResponse = await Client.PostAsync("TempDataProperty/CreateForView", content);
+
+            // Assert 1
+            Assert.Equal(HttpStatusCode.Redirect, redirectResponse.StatusCode);
+
+            // Act 2
+            var response = await Client.SendAsync(GetRequest(redirectResponse.Headers.Location.ToString(), redirectResponse));
+
+            // Assert 2
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expected, body.ToString().Trim());
+        }
+
+        [Fact]
+        public async Task TempDataPropertyAttribute_RetainsTempDataWithoutView()
+        {
+            // Arrange
+            var tempDataContent = "Success (from Temp Data)100";
+            var nameValueCollection = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>("FullName", "Bob"),
+                new KeyValuePair<string, string>("id", "1"),
+            };
+            var expected = $"{tempDataContent} for person {nameValueCollection[0].Value} with id {nameValueCollection[1].Value}.";
+            var content = new FormUrlEncodedContent(nameValueCollection);
+
+            // Act 1
+            var redirectResponse = await Client.PostAsync("TempDataProperty/Create", content);
+
+            // Assert 1
+            Assert.Equal(HttpStatusCode.Redirect, redirectResponse.StatusCode);
+
+            // Act 2
+            var response = await Client.SendAsync(GetRequest(redirectResponse.Headers.Location.ToString(), redirectResponse));
+
+            // Assert 2
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expected, body);
+        }
+
+        [Fact]
+        public async Task TempDataPropertyAttribute_TempDataKept()
+        {
+            // Arrange
+            var tempDataContent = "Success (from Temp Data)100";
+            var nameValueCollection = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>("FullName", "Bob"),
+                new KeyValuePair<string, string>("id", "1"),
+            };
+
+            var expected = $"{tempDataContent} for person {nameValueCollection[0].Value} with id {nameValueCollection[1].Value}.";
+            var content = new FormUrlEncodedContent(nameValueCollection);
+
+            // Act 1
+            var response = await Client.PostAsync("TempDataProperty/CreateNoRedirect", content);
+
+            // Assert 1
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            // Act 2
+            response = await Client.SendAsync(GetRequest("TempDataProperty/TempDataKept", response));
+
+            // Assert 2
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(tempDataContent, body);
+
+            // Act 3
+            response = await Client.SendAsync(GetRequest("TempDataProperty/ReadTempData", response));
+
+            // Assert 3
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(tempDataContent, body);
+        }
+
+        [Fact]
+        public async Task TempDataPropertyAttribute_TempDataNotKept()
+        {
+            // Arrange
+            var tempDataContent = "Success (from Temp Data)100";
+            var nameValueCollection = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>("FullName", "Bob"),
+                new KeyValuePair<string, string>("id", "1"),
+            };
+
+            var expected = $"{tempDataContent} for person {nameValueCollection[0].Value} with id {nameValueCollection[1].Value}.";
+            var content = new FormUrlEncodedContent(nameValueCollection);
+
+            // Act 1
+            var response = await Client.PostAsync("TempDataProperty/CreateNoRedirect", content);
+
+            // Assert 1
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            // Act 2
+            response = await Client.SendAsync(GetRequest("TempDataProperty/ReadTempData", response));
+
+            // Assert 2
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal(tempDataContent, body);
+
+            // Act 3
+            response = await Client.SendAsync(GetRequest("TempDataProperty/ReadTempData", response));
+
+            // Assert 3
+            body = await response.Content.ReadAsStringAsync();
+            Assert.Empty(body);
+        }
+
+        private HttpRequestMessage GetRequest(string path, HttpResponseMessage response)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Get, path);
+            if (response.Headers.TryGetValues("Set-Cookie", out var values))
+            {
+                foreach (var cookie in SetCookieHeaderValue.ParseList(values.ToList()))
+                {
+                    if (cookie.Expires == null || cookie.Expires >= DateTimeOffset.UtcNow)
+                    {
+                        request.Headers.Add("Cookie", new CookieHeaderValue(cookie.Name, cookie.Value).ToString());
+                    }
+                }
+            }
+            return request;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataTestBase.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataTestBase.cs
new file mode 100644
index 0000000000..c370123994
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataTestBase.cs
@@ -0,0 +1,263 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Net.Http.Headers;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public abstract class TempDataTestBase
+    {
+        protected abstract HttpClient Client { get; }
+
+        [Fact]
+        public async Task PersistsJustForNextRequest()
+        {
+            // Arrange
+            var nameValueCollection = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>("value", "Foo"),
+            };
+            var content = new FormUrlEncodedContent(nameValueCollection);
+
+            // Act 1
+            var response = await Client.PostAsync("/TempData/SetTempData", content);
+
+            // Assert 1
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            // Act 2
+            response = await Client.SendAsync(GetRequest("/TempData/GetTempData", response));
+
+            // Assert 2
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Foo", body);
+
+            // Act 3
+            response = await Client.SendAsync(GetRequest("/TempData/GetTempData", response));
+
+            // Assert 3
+            Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task ViewRendersTempData()
+        {
+            // Arrange
+            var nameValueCollection = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>("value", "Foo"),
+            };
+            var content = new FormUrlEncodedContent(nameValueCollection);
+
+            // Act
+            var response = await Client.PostAsync("/TempData/DisplayTempData", content);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Foo", body);
+        }
+
+        [Fact]
+        public async Task Redirect_RetainsTempData_EvenIfAccessed()
+        {
+            // Arrange
+            var nameValueCollection = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>("value", "Foo"),
+            };
+            var content = new FormUrlEncodedContent(nameValueCollection);
+
+            // Act 1
+            var response = await Client.PostAsync("/TempData/SetTempData", content);
+
+            // Assert 1
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            // Act 2
+            var redirectResponse = await Client.SendAsync(GetRequest("/TempData/GetTempDataAndRedirect", response));
+
+            // Assert 2
+            Assert.Equal(HttpStatusCode.Redirect, redirectResponse.StatusCode);
+
+            // Act 3
+            response = await Client.SendAsync(GetRequest(redirectResponse.Headers.Location.ToString(), response));
+
+            // Assert 3
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Foo", body);
+        }
+
+        [Fact]
+        public async Task Peek_RetainsTempData()
+        {
+            // Arrange
+            var nameValueCollection = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>("value", "Foo"),
+            };
+            var content = new FormUrlEncodedContent(nameValueCollection);
+
+            // Act 1
+            var response = await Client.PostAsync("/TempData/SetTempData", content);
+
+            // Assert 1
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            // Act 2
+            var peekResponse = await Client.SendAsync(GetRequest("/TempData/PeekTempData", response));
+
+            // Assert 2
+            Assert.Equal(HttpStatusCode.OK, peekResponse.StatusCode);
+            var body = await peekResponse.Content.ReadAsStringAsync();
+            Assert.Equal("Foo", body);
+
+            // Act 3
+            var getResponse = await Client.SendAsync(GetRequest("/TempData/GetTempData", response));
+
+            // Assert 3
+            Assert.Equal(HttpStatusCode.OK, getResponse.StatusCode);
+            body = await getResponse.Content.ReadAsStringAsync();
+            Assert.Equal("Foo", body);
+        }
+
+        [Fact]
+        public async Task ValidTypes_RoundTripProperly()
+        {
+            // Arrange
+            var testGuid = Guid.NewGuid();
+            var nameValueCollection = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>("value", "Foo"),
+                new KeyValuePair<string, string>("intValue", "10"),
+                new KeyValuePair<string, string>("listValues", "Foo1"),
+                new KeyValuePair<string, string>("listValues", "Foo2"),
+                new KeyValuePair<string, string>("listValues", "Foo3"),
+                new KeyValuePair<string, string>("datetimeValue", "10/10/2010"),
+                new KeyValuePair<string, string>("guidValue", testGuid.ToString()),
+            };
+            var content = new FormUrlEncodedContent(nameValueCollection);
+
+            // Act 1
+            var redirectResponse = await Client.PostAsync("/TempData/SetTempDataMultiple", content);
+
+            // Assert 1
+            Assert.Equal(HttpStatusCode.Redirect, redirectResponse.StatusCode);
+
+            // Act 2
+            var response = await Client.SendAsync(GetRequest(redirectResponse.Headers.Location.ToString(), redirectResponse));
+
+            // Assert 2
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal($"Foo 10 3 10/10/2010 00:00:00 {testGuid.ToString()}", body);
+        }
+
+        [Fact]
+        public async Task ResponseWrite_DoesNotCrashSaveTempDataFilter()
+        {
+            // Arrange
+            var nameValueCollection = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>("Name", "Jordan"),
+            };
+            var content = new FormUrlEncodedContent(nameValueCollection);
+
+            // Act, checking it didn't throw
+            var response = await Client.GetAsync("/TempData/SetTempDataResponseWrite");
+        }
+
+        [Fact]
+        public async Task SetInActionResultExecution_AvailableForNextRequest()
+        {
+            // Arrange
+            var nameValueCollection = new List<KeyValuePair<string, string>>
+            {
+                new KeyValuePair<string, string>("Name", "Jordan"),
+            };
+            var content = new FormUrlEncodedContent(nameValueCollection);
+
+            // Act 1
+            var response = await Client.GetAsync("/TempData/SetTempDataInActionResult");
+
+            // Assert 1
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            // Act 2
+            response = await Client.SendAsync(GetRequest("/TempData/GetTempDataSetInActionResult", response));
+
+            // Assert 2
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Michael", body);
+
+            // Act 3
+            response = await Client.SendAsync(GetRequest("/TempData/GetTempDataSetInActionResult", response));
+
+            // Assert 3
+            Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task SaveTempDataFilter_DoesNotSaveTempData_OnUnhandledException()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("/TempData/UnhandledExceptionAndSettingTempData");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
+            var responseBody = await response.Content.ReadAsStringAsync();
+            Assert.Contains("Exception from action UnhandledExceptionAndSettingTempData", responseBody);
+
+            // Arrange & Act
+            response = await Client.GetAsync("/TempData/UnhandledExceptionAndGetTempData");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task SaveTempDataFilter_DoesNotSaveTempData_OnHandledExceptions()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("/TempData/UnhandledExceptionAndSettingTempData?handleException=true");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var responseBody = await response.Content.ReadAsStringAsync();
+            Assert.Contains("Exception was handled in TestExceptionFilter", responseBody);
+
+            // Arrange & Act
+            response = await Client.GetAsync("/TempData/UnhandledExceptionAndGetTempData");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
+        }
+
+        public HttpRequestMessage GetRequest(string path, HttpResponseMessage response)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Get, path);
+            IEnumerable<string> values;
+            if (response.Headers.TryGetValues("Set-Cookie", out values))
+            {
+                foreach (var cookie in SetCookieHeaderValue.ParseList(values.ToList()))
+                {
+                    if (cookie.Expires == null || cookie.Expires >= DateTimeOffset.UtcNow)
+                    {
+                        request.Headers.Add("Cookie", new CookieHeaderValue(cookie.Name, cookie.Value).ToString());
+                    }
+                }
+            }
+            return request;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TestingInfrastructureInheritanceTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TestingInfrastructureInheritanceTests.cs
new file mode 100644
index 0000000000..02c2e622c3
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TestingInfrastructureInheritanceTests.cs
@@ -0,0 +1,65 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.AspNetCore.TestHost;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class TestingInfrastructureInheritanceTests
+    {
+        [Fact]
+        public void TestingInfrastructure_WithWebHostBuilderRespectsCustomizations()
+        {
+            // Act
+            var factory = new CustomizedFactory<BasicWebSite.Startup>();
+            var customized = factory
+                .WithWebHostBuilder(builder => factory.ConfigureWebHostCalled.Add("Customization"))
+                .WithWebHostBuilder(builder => factory.ConfigureWebHostCalled.Add("FurtherCustomization"));
+            var client = customized.CreateClient();
+
+            // Assert
+            Assert.Equal(new[] { "ConfigureWebHost", "Customization", "FurtherCustomization" }, factory.ConfigureWebHostCalled.ToArray());
+            Assert.True(factory.CreateServerCalled);
+            Assert.True(factory.CreateWebHostBuilderCalled);
+            Assert.True(factory.GetTestAssembliesCalled);
+        }
+
+        private class CustomizedFactory<TEntryPoint> : WebApplicationFactory<TEntryPoint> where TEntryPoint : class
+        {
+            public bool GetTestAssembliesCalled { get; private set; }
+            public bool CreateWebHostBuilderCalled { get; private set; }
+            public bool CreateServerCalled { get; private set; }
+            public IList<string> ConfigureWebHostCalled { get; private set; } = new List<string>();
+
+            protected override void ConfigureWebHost(IWebHostBuilder builder)
+            {
+                ConfigureWebHostCalled.Add("ConfigureWebHost");
+                base.ConfigureWebHost(builder);
+            }
+
+            protected override TestServer CreateServer(IWebHostBuilder builder)
+            {
+                CreateServerCalled = true;
+                return base.CreateServer(builder);
+            }
+
+            protected override IWebHostBuilder CreateWebHostBuilder()
+            {
+                CreateWebHostBuilderCalled = true;
+                return base.CreateWebHostBuilder();
+            }
+
+            protected override IEnumerable<Assembly> GetTestAssemblies()
+            {
+                GetTestAssembliesCalled = true;
+                return base.GetTestAssemblies();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TestingInfrastructureTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TestingInfrastructureTests.cs
new file mode 100644
index 0000000000..9e5be478f6
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TestingInfrastructureTests.cs
@@ -0,0 +1,97 @@
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Formatting;
+using System.Threading.Tasks;
+using BasicWebSite;
+using BasicWebSite.Controllers;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class TestingInfrastructureTests : IClassFixture<WebApplicationFactory<BasicWebSite.Startup>>
+    {
+        public TestingInfrastructureTests(WebApplicationFactory<BasicWebSite.Startup> fixture)
+        {
+            var factory = fixture.Factories.FirstOrDefault() ?? fixture.WithWebHostBuilder(ConfigureWebHostBuilder);
+            Client = factory.CreateClient();
+        }
+
+        private static void ConfigureWebHostBuilder(IWebHostBuilder builder) =>
+            builder.ConfigureTestServices(s => s.AddSingleton<TestService, OverridenService>());
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task TestingInfrastructure_CanOverrideServiceFromWithinTheTest()
+        {
+            // Act
+            var response = await Client.GetStringAsync("Testing/Builder");
+
+            // Assert
+            Assert.Equal("Test", response);
+        }
+
+        [Fact]
+        public async Task TestingInfrastructure_RedirectHandlerWorksWithPreserveMethod()
+        {
+            // Act
+            var request = new HttpRequestMessage(HttpMethod.Post, "Testing/RedirectHandler/2")
+            {
+                Content = new ObjectContent<Number>(new Number { Value = 5 }, new JsonMediaTypeFormatter())
+            };
+            request.Headers.Add("X-Pass-Thru", "Some-Value");
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var xPassThruValue = Assert.Single(response.Headers.GetValues("X-Pass-Thru"));
+            Assert.Equal("Some-Value", xPassThruValue);
+
+            var handlerResponse = await response.Content.ReadAsAsync<RedirectHandlerResponse>();
+            Assert.Equal(5, handlerResponse.Url);
+            Assert.Equal(5, handlerResponse.Body);
+        }
+
+        [Fact]
+        public async Task TestingInfrastructure_PostRedirectGetWorksWithCookies()
+        {
+            // Act
+            var acquireToken = await Client.GetAsync("Testing/AntiforgerySimulator/3");
+            Assert.Equal(HttpStatusCode.OK, acquireToken.StatusCode);
+
+            var response = await Client.PostAsync(
+                "Testing/PostRedirectGet/Post/3",
+                content: null);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var handlerResponse = await response.Content.ReadAsAsync<PostRedirectGetGetResponse>();
+            Assert.Equal(4, handlerResponse.TempDataValue);
+            Assert.Equal("Value-4", handlerResponse.CookieValue);
+        }
+
+        [Fact]
+        public async Task TestingInfrastructure_PutWithoutBodyFollowsRedirects()
+        {
+            // Act
+            var response = await Client.PutAsync("Testing/Put/3", content: null);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(5, await response.Content.ReadAsAsync<int>());
+        }
+
+        private class OverridenService : TestService
+        {
+            public OverridenService()
+            {
+                Message = "Test";
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/UrlResolutionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/UrlResolutionTest.cs
new file mode 100644
index 0000000000..4ff086953b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/UrlResolutionTest.cs
@@ -0,0 +1,71 @@
+// 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.
+
+using System.Net.Http;
+using System.Reflection;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class UrlResolutionTest :
+        IClassFixture<MvcTestFixture<RazorWebSite.Startup>>,
+        IClassFixture<MvcEncodedTestFixture<RazorWebSite.Startup>>
+    {
+        private static readonly Assembly _resourcesAssembly = typeof(UrlResolutionTest).GetTypeInfo().Assembly;
+
+        public UrlResolutionTest(
+            MvcTestFixture<RazorWebSite.Startup> fixture,
+            MvcEncodedTestFixture<RazorWebSite.Startup> encodedFixture)
+        {
+            Client = fixture.CreateDefaultClient();
+            EncodedClient = encodedFixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        public HttpClient EncodedClient { get; }
+
+        [Fact]
+        public async Task AppRelativeUrlsAreResolvedCorrectly()
+        {
+            // Arrange
+            var outputFile = "compiler/resources/RazorWebSite.UrlResolution.Index.html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/UrlResolution/Index");
+            var responseContent = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            responseContent = responseContent.Trim();
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            Assert.Equal(expectedContent.Trim(), responseContent, ignoreLineEndingDifferences: true);
+#endif
+        }
+
+        [Fact]
+        public async Task AppRelativeUrlsAreResolvedAndEncodedCorrectly()
+        {
+            // Arrange
+            var outputFile = "compiler/resources/RazorWebSite.UrlResolution.Index.Encoded.html";
+            var expectedContent =
+                await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
+
+            // Act
+            var response = await EncodedClient.GetAsync("http://localhost/UrlResolution/Index");
+            var responseContent = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            responseContent = responseContent.Trim();
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
+#else
+            Assert.Equal(expectedContent.Trim(), responseContent, ignoreLineEndingDifferences: true);
+#endif
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningTests.cs
new file mode 100644
index 0000000000..02a86d0871
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningTests.cs
@@ -0,0 +1,562 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class VersioningTests : IClassFixture<MvcTestFixture<VersioningWebSite.Startup>>
+    {
+        public VersioningTests(MvcTestFixture<VersioningWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Theory]
+        [InlineData("1")]
+        [InlineData("2")]
+        public async Task AttributeRoutedAction_WithVersionedRoutes_IsNotAmbiguous(string version)
+        {
+            // Arrange
+            var message = new HttpRequestMessage(HttpMethod.Get, "http://localhost/api/Addresses?version=" + version);
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains("api/addresses", result.ExpectedUrls);
+            Assert.Equal("Address", result.Controller);
+            Assert.Equal("GetV" + version, result.Action);
+        }
+
+        [Theory]
+        [InlineData("1")]
+        [InlineData("2")]
+        public async Task AttributeRoutedAction_WithAmbiguousVersionedRoutes_CanBeDisambiguatedUsingOrder(string version)
+        {
+            // Arrange
+            var query = "?version=" + version;
+            var message = new HttpRequestMessage(HttpMethod.Get, "http://localhost/api/Addresses/All" + query);
+
+            // Act
+
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Contains("/api/addresses/all?version=" + version, result.ExpectedUrls);
+            Assert.Equal("Address", result.Controller);
+            Assert.Equal("GetAllV" + version, result.Action);
+        }
+
+        [Fact]
+        public async Task VersionedApi_CanReachV1Operations_OnTheSameController_WithNoVersionSpecified()
+        {
+            // Arrange
+            var message = new HttpRequestMessage(HttpMethod.Get, "http://localhost/Tickets");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Tickets", result.Controller);
+            Assert.Equal("Get", result.Action);
+
+            Assert.DoesNotContain("id", result.RouteValues.Keys);
+        }
+
+        [Fact]
+        public async Task VersionedApi_CanReachV1Operations_OnTheSameController_WithVersionSpecified()
+        {
+            // Arrange
+            var message = new HttpRequestMessage(HttpMethod.Get, "http://localhost/Tickets?version=2");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Tickets", result.Controller);
+            Assert.Equal("Get", result.Action);
+        }
+
+        [Fact]
+        public async Task VersionedApi_CanReachV1OperationsWithParameters_OnTheSameController()
+        {
+            // Arrange
+            var message = new HttpRequestMessage(HttpMethod.Get, "http://localhost/Tickets/5");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Tickets", result.Controller);
+            Assert.Equal("GetById", result.Action);
+        }
+
+        [Fact]
+        public async Task VersionedApi_CanReachV1OperationsWithParameters_OnTheSameController_WithVersionSpecified()
+        {
+            // Arrange
+            var message = new HttpRequestMessage(HttpMethod.Get, "http://localhost/Tickets/5?version=2");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Tickets", result.Controller);
+            Assert.Equal("GetById", result.Action);
+            Assert.NotEmpty(result.RouteValues);
+
+            Assert.Contains(
+               new KeyValuePair<string, object>("id", "5"),
+               result.RouteValues);
+        }
+
+        [Theory]
+        [InlineData("2")]
+        [InlineData("3")]
+        [InlineData("4")]
+        public async Task VersionedApi_CanReachOtherVersionOperations_OnTheSameController(string version)
+        {
+            // Arrange
+            var message = new HttpRequestMessage(HttpMethod.Post, "http://localhost/Tickets?version=" + version);
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Tickets", result.Controller);
+            Assert.Equal("Post", result.Action);
+            Assert.NotEmpty(result.RouteValues);
+
+            Assert.DoesNotContain(
+               new KeyValuePair<string, object>("id", "5"),
+               result.RouteValues);
+        }
+
+        [Fact]
+        public async Task VersionedApi_CanNotReachOtherVersionOperations_OnTheSameController_WithNoVersionSpecified()
+        {
+            // Arrange
+            var message = new HttpRequestMessage(HttpMethod.Post, "http://localhost/Tickets");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+
+            var body = await response.Content.ReadAsByteArrayAsync();
+            Assert.Empty(body);
+        }
+
+        [Theory]
+        [InlineData("PUT", "Put", "2")]
+        [InlineData("PUT", "Put", "3")]
+        [InlineData("PUT", "Put", "4")]
+        [InlineData("DELETE", "Delete", "2")]
+        [InlineData("DELETE", "Delete", "3")]
+        [InlineData("DELETE", "Delete", "4")]
+        public async Task VersionedApi_CanReachOtherVersionOperationsWithParameters_OnTheSameController(
+            string method,
+            string action,
+            string version)
+        {
+            // Arrange
+            var message = new HttpRequestMessage(new HttpMethod(method), "http://localhost/Tickets/5?version=" + version);
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Tickets", result.Controller);
+            Assert.Equal(action, result.Action);
+            Assert.NotEmpty(result.RouteValues);
+
+            Assert.Contains(
+               new KeyValuePair<string, object>("id", "5"),
+               result.RouteValues);
+        }
+
+        [Theory]
+        [InlineData("PUT")]
+        [InlineData("DELETE")]
+        public async Task VersionedApi_CanNotReachOtherVersionOperationsWithParameters_OnTheSameController_WithNoVersionSpecified(string method)
+        {
+            // Arrange
+            var message = new HttpRequestMessage(new HttpMethod(method), "http://localhost/Tickets/5");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+
+            var body = await response.Content.ReadAsByteArrayAsync();
+            Assert.Empty(body);
+        }
+
+        [Theory]
+        [InlineData("3")]
+        [InlineData("4")]
+        [InlineData("5")]
+        public async Task VersionedApi_CanUseOrderToDisambiguate_OverlappingVersionRanges(string version)
+        {
+            // Arrange
+            var message = new HttpRequestMessage(HttpMethod.Get, "http://localhost/Books?version=" + version);
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Books", result.Controller);
+            Assert.Equal("GetBreakingChange", result.Action);
+        }
+
+        [Theory]
+        [InlineData("1")]
+        [InlineData("2")]
+        [InlineData("6")]
+        public async Task VersionedApi_OverlappingVersionRanges_FallsBackToLowerOrderAction(string version)
+        {
+            // Arrange
+            var message = new HttpRequestMessage(HttpMethod.Get, "http://localhost/Books?version=" + version);
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Books", result.Controller);
+            Assert.Equal("Get", result.Action);
+        }
+
+
+        [Theory]
+        [InlineData("GET", "Get")]
+        [InlineData("POST", "Post")]
+        public async Task VersionedApi_CanReachV1Operations_OnTheOriginalController_WithNoVersionSpecified(string method, string action)
+        {
+            // Arrange
+            var message = new HttpRequestMessage(new HttpMethod(method), "http://localhost/Movies");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Movies", result.Controller);
+            Assert.Equal(action, result.Action);
+        }
+
+        [Theory]
+        [InlineData("GET", "Get")]
+        [InlineData("POST", "Post")]
+        public async Task VersionedApi_CanReachV1Operations_OnTheOriginalController_WithVersionSpecified(string method, string action)
+        {
+            // Arrange
+            var message = new HttpRequestMessage(new HttpMethod(method), "http://localhost/Movies?version=2");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Movies", result.Controller);
+            Assert.Equal(action, result.Action);
+        }
+
+        [Theory]
+        [InlineData("GET", "GetById")]
+        [InlineData("PUT", "Put")]
+        [InlineData("DELETE", "Delete")]
+        public async Task VersionedApi_CanReachV1OperationsWithParameters_OnTheOriginalController(string method, string action)
+        {
+            // Arrange
+            var message = new HttpRequestMessage(new HttpMethod(method), "http://localhost/Movies/5");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Movies", result.Controller);
+            Assert.Equal(action, result.Action);
+        }
+
+        [Theory]
+        [InlineData("GET", "GetById")]
+        [InlineData("DELETE", "Delete")]
+        public async Task VersionedApi_CanReachV1OperationsWithParameters_OnTheOriginalController_WithVersionSpecified(string method, string action)
+        {
+            // Arrange
+            var message = new HttpRequestMessage(new HttpMethod(method), "http://localhost/Movies/5?version=2");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Movies", result.Controller);
+            Assert.Equal(action, result.Action);
+        }
+
+        [Fact]
+        public async Task VersionedApi_CanReachOtherVersionOperationsWithParameters_OnTheV2Controller()
+        {
+            // Arrange
+            var message = new HttpRequestMessage(HttpMethod.Put, "http://localhost/Movies/5?version=2");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("MoviesV2", result.Controller);
+            Assert.Equal("Put", result.Action);
+            Assert.NotEmpty(result.RouteValues);
+        }
+
+        [Theory]
+        [InlineData("v1/Pets")]
+        [InlineData("v2/Pets")]
+        public async Task VersionedApi_CanHaveTwoRoutesWithVersionOnTheUrl_OnTheSameAction(string url)
+        {
+            // Arrange
+            var message = new HttpRequestMessage(HttpMethod.Get, "http://localhost/" + url);
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Pets", result.Controller);
+            Assert.Equal("Get", result.Action);
+        }
+
+        [Theory]
+        [InlineData("v1/Pets/5", "V1")]
+        [InlineData("v2/Pets/5", "V2")]
+        public async Task VersionedApi_CanHaveTwoRoutesWithVersionOnTheUrl_OnDifferentActions(string url, string version)
+        {
+            // Arrange
+            var message = new HttpRequestMessage(HttpMethod.Get, "http://localhost/" + url);
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Pets", result.Controller);
+            Assert.Equal("Get" + version, result.Action);
+        }
+
+        [Theory]
+        [InlineData("v1/Pets", "V1")]
+        [InlineData("v2/Pets", "V2")]
+        public async Task VersionedApi_CanHaveTwoRoutesWithVersionOnTheUrl_OnDifferentActions_WithInlineConstraint(string url, string version)
+        {
+            // Arrange
+            var message = new HttpRequestMessage(HttpMethod.Post, "http://localhost/" + url);
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Pets", result.Controller);
+            Assert.Equal("Post" + version, result.Action);
+        }
+
+        [Theory]
+        [InlineData("Customers/5", "?version=1", "Get")]
+        [InlineData("Customers/5", "?version=2", "Get")]
+        [InlineData("Customers/5", "?version=3", "GetV3ToV5")]
+        [InlineData("Customers/5", "?version=4", "GetV3ToV5")]
+        [InlineData("Customers/5", "?version=5", "GetV3ToV5")]
+        public async Task VersionedApi_CanProvideVersioningInformation_UsingPlainActionConstraint(string url, string query, string actionName)
+        {
+            // Arrange
+            var message = new HttpRequestMessage(HttpMethod.Get, "http://localhost/" + url + query);
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Customers", result.Controller);
+            Assert.Equal(actionName, result.Action);
+        }
+
+        [Fact]
+        public async Task VersionedApi_ConstraintOrder_IsRespected()
+        {
+            // Arrange
+            var message = new HttpRequestMessage(HttpMethod.Post, "http://localhost/" + "Customers?version=2");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Customers", result.Controller);
+            Assert.Equal("AnyV2OrHigher", result.Action);
+        }
+
+        [Fact]
+        public async Task VersionedApi_CanUseConstraintOrder_ToChangeSelectedAction()
+        {
+            // Arrange
+            var message = new HttpRequestMessage(HttpMethod.Delete, "http://localhost/" + "Customers/5?version=2");
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Customers", result.Controller);
+            Assert.Equal("Delete", result.Action);
+        }
+
+        [Theory]
+        [InlineData("1")]
+        [InlineData("2")]
+        public async Task VersionedApi_MultipleVersionsUsingAttributeRouting_OnTheSameMethod(string version)
+        {
+            // Arrange
+            var path = "/" + version + "/Vouchers?version=" + version;
+            var message = new HttpRequestMessage(HttpMethod.Get, "http://localhost" + path);
+
+            // Act
+            var response = await Client.SendAsync(message);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var result = JsonConvert.DeserializeObject<RoutingResult>(body);
+
+            Assert.Equal("Vouchers", result.Controller);
+            Assert.Equal("GetVouchersMultipleVersions", result.Action);
+
+            var actualUrl = Assert.Single(result.ExpectedUrls);
+            Assert.Equal(path, actualUrl);
+        }
+
+        private class RoutingResult
+        {
+            public string[] ExpectedUrls { get; set; }
+
+            public string ActualUrl { get; set; }
+
+            public Dictionary<string, object> RouteValues { get; set; }
+
+            public string RouteName { get; set; }
+
+            public string Action { get; set; }
+
+            public string Controller { get; set; }
+
+            public string Link { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewComponentFromServicesTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewComponentFromServicesTests.cs
new file mode 100644
index 0000000000..f219c34613
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewComponentFromServicesTests.cs
@@ -0,0 +1,35 @@
+// 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.
+
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class ViewComponentFromServicesTest : IClassFixture<MvcTestFixture<ControllersFromServicesWebSite.Startup>>
+    {
+        public ViewComponentFromServicesTest(MvcTestFixture<ControllersFromServicesWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task ViewComponentsWithConstructorInjectionAreCreatedAndActivated()
+        {
+            // Arrange
+            var expected = "Value = 3";
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/another/InServicesViewComponent");
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var responseText = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(expected, responseText);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs
new file mode 100644
index 0000000000..363f534469
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs
@@ -0,0 +1,530 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Localization;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Net.Http.Headers;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class ViewEngineTests : IClassFixture<MvcTestFixture<RazorWebSite.Startup>>
+    {
+        private static readonly Assembly _assembly = typeof(ViewEngineTests).GetTypeInfo().Assembly;
+
+        public ViewEngineTests(MvcTestFixture<RazorWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        public static IEnumerable<object[]> RazorView_ExecutesPageAndLayoutData
+        {
+            get
+            {
+                yield return new[] { "ViewWithoutLayout", @"ViewWithoutLayout-Content" };
+                yield return new[]
+                {
+                    "ViewWithLayout",
+@"<layout>
+ViewWithLayout-Content
+</layout>"
+                };
+                yield return new[]
+                {
+                    "ViewWithFullPath",
+@"<layout>
+ViewWithFullPath-content
+</layout>"
+                };
+                yield return new[]
+                {
+                    "ViewWithNestedLayout",
+@"<layout>
+<nested-layout>
+/ViewEngine/ViewWithNestedLayout
+ViewWithNestedLayout-Content
+</nested-layout>
+</layout>"
+                };
+
+                yield return new[]
+                {
+                    "ViewWithDataFromController",
+                    "<h1>hello from controller</h1>"
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RazorView_ExecutesPageAndLayoutData))]
+        public async Task RazorView_ExecutesPageAndLayout(string actionName, string expected)
+        {
+            // Arrange & Act
+            var body = await Client.GetStringAsync("http://localhost/ViewEngine/" + actionName);
+
+            // Assert
+            Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task RazorView_ExecutesPartialPagesWithCorrectContext()
+        {
+            // Arrange
+            var expected = @"<partial>98052
+
+</partial>
+<partial2>98052
+
+</partial2>
+test-value";
+
+            // Act
+            var body = await Client.GetStringAsync("http://localhost/ViewEngine/ViewWithPartial");
+
+            // Assert
+            Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task RazorView_DoesNotThrow_PartialViewWithEnumerableModel()
+        {
+            // Arrange
+            var expected = "HelloWorld";
+
+            // Act
+            var body = await Client.GetStringAsync(
+                "http://localhost/ViewEngine/ViewWithPartialTakingModelFromIEnumerable");
+
+            // Assert
+            Assert.Equal(expected, body.Trim());
+        }
+
+        [Fact]
+        public async Task RazorView_PassesViewContextBetweenViewAndLayout()
+        {
+            // Arrange
+            var expected =
+@"<title>Page title</title>
+partial-contentcomponent-content";
+
+            // Act
+            var body = await Client.GetStringAsync("http://localhost/ViewEngine/ViewPassesViewDataToLayout");
+
+            // Assert
+            Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        public static IEnumerable<object[]> RazorViewEngine_UsesAllExpandedPathsToLookForViewsData
+        {
+            get
+            {
+                var expected1 = @"expander-index
+gb-partial";
+                yield return new[] { "en-GB", expected1 };
+
+                var expected2 = @"fr-index
+fr-partial";
+                yield return new[] { "fr", expected2 };
+
+                if (!TestPlatformHelper.IsMono)
+                {
+                    // https://github.com/aspnet/Mvc/issues/2759
+                    var expected3 = @"expander-index
+expander-partial";
+                    yield return new[] { "!-invalid-!", expected3 };
+                }
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RazorViewEngine_UsesAllExpandedPathsToLookForViewsData))]
+        public async Task RazorViewEngine_UsesViewExpandersForViewsAndPartials(string value, string expected)
+        {
+            // Arrange
+            var cultureCookie = "c=" + value + "|uic=" + value;
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/TemplateExpander");
+            request.Headers.Add("Cookie",
+                new CookieHeaderValue(CookieRequestCultureProvider.DefaultCookieName, cultureCookie).ToString());
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var body = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        public static TheoryData ViewLocationExpanders_GetIsMainPageFromContextData
+        {
+            get
+            {
+                return new TheoryData<string, string>
+                {
+                    {
+                        "Index",
+                        "<expander-view><shared-views>/Shared-Views/ExpanderViews/_ExpanderPartial.cshtml</shared-views></expander-view>"
+                    },
+                    {
+                        "Partial",
+                        "<shared-views>/Shared-Views/ExpanderViews/_ExpanderPartial.cshtml</shared-views>"
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ViewLocationExpanders_GetIsMainPageFromContextData))]
+        public async Task ViewLocationExpanders_GetIsMainPageFromContext(string action, string expected)
+        {
+            // Arrange & Act
+            var body = await Client.GetStringAsync($"http://localhost/ExpanderViews/{action}");
+
+            // Assert
+            Assert.Equal(expected, body.Trim());
+        }
+
+        public static IEnumerable<object[]> RazorViewEngine_RendersPartialViewsData
+        {
+            get
+            {
+                yield return new[]
+                {
+                    "ViewWithoutLayout", "ViewWithoutLayout-Content"
+                };
+                yield return new[]
+                {
+                    "PartialViewWithNamePassedIn",
+@"<layout>
+ViewWithLayout-Content
+</layout>"
+                };
+                yield return new[]
+                {
+                    "ViewWithFullPath",
+@"<layout>
+ViewWithFullPath-content
+</layout>"
+                };
+                yield return new[]
+                {
+                    "ViewWithNestedLayout",
+@"<layout>
+<nested-layout>
+/PartialViewEngine/ViewWithNestedLayout
+ViewWithNestedLayout-Content
+</nested-layout>
+</layout>"
+                };
+                yield return new[]
+                {
+                    "PartialWithDataFromController", "<h1>hello from controller</h1>"
+                };
+                yield return new[]
+                {
+                    "PartialWithModel",
+                    @"my name is judge
+<partial>98052
+</partial>"
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RazorViewEngine_RendersPartialViewsData))]
+        public async Task RazorViewEngine_RendersPartialViews(string actionName, string expected)
+        {
+            // Arrange & Act
+            var body = await Client.GetStringAsync("http://localhost/PartialViewEngine/" + actionName);
+
+            // Assert
+            Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public Task RazorViewEngine_RendersViewsFromEmbeddedFileProvider_WhenLookedupByName()
+            => RazorViewEngine_RendersIndexViewsFromEmbeddedFileProvider("/EmbeddedViews/LookupByName");
+
+        [Fact]
+        public Task RazorViewEngine_RendersViewsFromEmbeddedFileProvider_WhenLookedupByPath()
+            => RazorViewEngine_RendersIndexViewsFromEmbeddedFileProvider("/EmbeddedViews/LookupByPath");
+
+        private async Task RazorViewEngine_RendersIndexViewsFromEmbeddedFileProvider(string requestPath)
+        {
+            // Arrange
+            var expected =
+@"<embdedded-layout>Hello from EmbeddedShared/_Partial
+Hello from Shared/_EmbeddedPartial
+<a href=""/EmbeddedViews"">Tag Helper Link</a>
+</embdedded-layout>";
+
+            // Act
+            var body = await Client.GetStringAsync(requestPath);
+
+            // Assert
+            Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task RazorViewEngine_UpdatesViewsReferencedViaRelativePathsOnChange()
+        {
+            // Arrange
+            var expected1 = "Original content";
+            var expected2 = "New content";
+
+            // Act - 1
+            var body = await Client.GetStringAsync("/UpdateableFileProvider");
+
+            // Assert - 1
+            Assert.Equal(expected1, body.Trim(), ignoreLineEndingDifferences: true);
+
+            // Act - 2
+            var response = await Client.PostAsync("/UpdateableFileProvider/Update", new StringContent(string.Empty));
+            response.EnsureSuccessStatusCode();
+            body = await Client.GetStringAsync("/UpdateableFileProvider");
+
+            // Assert - 1
+            Assert.Equal(expected2, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task LayoutValueIsPassedBetweenNestedViewStarts()
+        {
+            // Arrange
+            var expected = @"<title>viewstart-value</title>
+~/Views/NestedViewStarts/NestedViewStarts/Layout.cshtml
+index-content";
+
+            // Act
+            var body = await Client.GetStringAsync("http://localhost/NestedViewStarts");
+
+            // Assert
+            Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        public static IEnumerable<object[]> RazorViewEngine_UsesExpandersForLayoutsData
+        {
+            get
+            {
+                var expected1 =
+ @"<language-layout>View With Layout
+</language-layout>";
+
+                yield return new[] { "en-GB", expected1 };
+
+                if (!TestPlatformHelper.IsMono)
+                {
+                    // https://github.com/aspnet/Mvc/issues/2759
+                    yield return new[] { "!-invalid-!", expected1 };
+                }
+
+                var expected2 =
+@"<fr-language-layout>View With Layout
+</fr-language-layout>";
+                yield return new[] { "fr", expected2 };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RazorViewEngine_UsesExpandersForLayoutsData))]
+        public async Task RazorViewEngine_UsesExpandersForLayouts(string value, string expected)
+        {
+            // Arrange
+            var cultureCookie = "c=" + value + "|uic=" + value;
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/TemplateExpander/ViewWithLayout");
+            request.Headers.Add("Cookie",
+                new CookieHeaderValue(CookieRequestCultureProvider.DefaultCookieName, cultureCookie).ToString());
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var body = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task ViewStartsCanUseDirectivesInjectedFromParentGlobals()
+        {
+            // Arrange
+            var expected =
+@"<view-start>Hello Controller-Person</view-start>
+<page>Hello Controller-Person</page>";
+            var target = "http://localhost/NestedViewImports";
+
+            // Act
+            var body = await Client.GetStringAsync(target);
+
+            // Assert
+            Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task ViewComponentsExecuteLayout()
+        {
+            // Arrange
+            var expected =
+@"<title>View With Component With Layout</title>
+Page Content
+<component-title>ViewComponent With Title</component-title>
+<component-body>Component With Layout</component-body>";
+
+            // Act
+            var body = await Client.GetStringAsync("http://localhost/ViewEngine/ViewWithComponentThatHasLayout");
+
+            // Assert
+            Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task RelativePathsWorkAsExpected()
+        {
+            // Arrange
+            var expected =
+@"<layout>
+<nested-layout>
+/ViewEngine/ViewWithRelativePath
+ViewWithRelativePath-content
+<partial>partial-content</partial>
+<component-title>View with relative path title</component-title>
+<component-body>Component with Relative Path
+<label><strong>Name:</strong> Fred</label>
+WriteLiteral says:<strong>Write says:98052WriteLiteral says:</strong></component-body>
+</nested-layout>
+</layout>";
+
+            // Act
+            var body = await Client.GetStringAsync("http://localhost/ViewEngine/ViewWithRelativePath");
+
+            // Assert
+            Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task ViewComponentsDoNotExecuteViewStarts()
+        {
+            // Arrange
+            var expected = @"<page-content>ViewComponent With ViewStart</page-content>";
+
+            // Act
+            var body = await Client.GetStringAsync("http://localhost/ViewEngine/ViewWithComponentThatHasViewStart");
+
+            // Assert
+            Assert.Equal(expected, body.Trim());
+        }
+
+        [Fact]
+        public async Task PartialDoNotExecuteViewStarts()
+        {
+            // Arrange
+            var expected = "Partial that does not specify Layout";
+
+            // Act
+            var body = await Client.GetStringAsync("http://localhost/PartialsWithLayout/PartialDoesNotExecuteViewStarts");
+
+            // Assert
+            Assert.Equal(expected, body.Trim());
+        }
+
+        [Fact]
+        public async Task PartialsRenderedViaRenderPartialAsync_CanRenderLayouts()
+        {
+            // Arrange
+            var expected =
+@"<layout-for-viewstart-with-layout><layout-for-viewstart-with-layout>Partial that specifies Layout
+</layout-for-viewstart-with-layout>Partial that does not specify Layout</layout-for-viewstart-with-layout>";
+
+            // Act
+            var body = await Client.GetStringAsync("http://localhost/PartialsWithLayout/PartialsRenderedViaRenderPartial");
+
+            // Assert
+            Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task PartialsRenderedViaPartialAsync_CanRenderLayouts()
+        {
+            // Arrange
+            var expected =
+@"<layout-for-viewstart-with-layout><layout-for-viewstart-with-layout>Partial that specifies Layout
+</layout-for-viewstart-with-layout>
+Partial that does not specify Layout
+</layout-for-viewstart-with-layout>";
+
+            // Act
+            var body = await Client.GetStringAsync("http://localhost/PartialsWithLayout/PartialsRenderedViaPartialAsync");
+
+            // Assert
+            Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task RazorView_SetsViewPathAndExecutingPagePath()
+        {
+            // Arrange
+            var outputFile = "compiler/resources/ViewEngineController.ViewWithPaths.txt";
+            var expectedContent = await ResourceFile.ReadResourceAsync(_assembly, outputFile, sourceFile: false);
+
+            // Act
+            var responseContent = await Client.GetStringAsync("http://localhost/ViewWithPaths");
+
+            // Assert
+            responseContent = responseContent.Trim();
+#if GENERATE_BASELINES
+            ResourceFile.UpdateFile(_assembly, outputFile, expectedContent, responseContent);
+#else
+            Assert.Equal(
+                expectedContent,
+                responseContent,
+                ignoreLineEndingDifferences: true);
+#endif
+        }
+
+        [Fact]
+        public async Task ViewEngine_NormalizesPathsReturnedByViewLocationExpanders()
+        {
+            // Arrange
+            var expected =
+@"Layout
+Page
+Partial";
+
+            // Act
+            var responseContent = await Client.GetStringAsync("/BackSlash");
+
+            // Assert
+            Assert.Equal(expected, responseContent, ignoreLineEndingDifferences: true);
+        }
+
+        [Fact]
+        public async Task ViewEngine_ResolvesPathsWithSlashesThatDoNotHaveExtensions()
+        {
+            // Arrange
+            var expected = @"<embdedded-layout>Hello from EmbeddedHome\EmbeddedPartial</embdedded-layout>";
+
+            // Act
+            var responseContent = await Client.GetStringAsync("/EmbeddedViews/RelativeNonPath");
+
+            // Assert
+            Assert.Equal(expected, responseContent.Trim());
+        }
+
+        [Fact]
+        public async Task ViewEngine_DiscoversViewsFromPagesSharedDirectory()
+        {
+            // Arrange
+            var expected = "Hello from Pages/Shared";
+
+            // Act
+            var responseContent = await Client.GetStringAsync("/ViewEngine/SearchInPages");
+
+            // Assert
+            Assert.Equal(expected, responseContent.Trim());
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimActionResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimActionResultTest.cs
new file mode 100644
index 0000000000..1c4b7bea7b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimActionResultTest.cs
@@ -0,0 +1,295 @@
+// 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.
+
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class WebApiCompatShimActionResultTest : IClassFixture<MvcTestFixture<WebApiCompatShimWebSite.Startup>>
+    {
+        public WebApiCompatShimActionResultTest(MvcTestFixture<WebApiCompatShimWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task ApiController_BadRequest()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/ActionResult/GetBadRequest");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task ApiController_BadRequestMessage()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/ActionResult/GetBadRequestMessage");
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+            Assert.Equal("{\"Message\":\"Hello, world!\"}", content);
+        }
+
+        [Fact]
+        public async Task ApiController_BadRequestModelState()
+        {
+            // Arrange
+            var expected = "{\"Message\":\"The request is invalid.\",\"ModelState\":{\"product.Name\":[\"Name is required.\"]}}";
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/ActionResult/GetBadRequestModelState");
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+            Assert.Equal(expected, content);
+        }
+
+        [Fact]
+        public async Task ApiController_Conflict()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/ActionResult/GetConflict");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Conflict, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task ApiController_Content()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/ActionResult/GetContent");
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Ambiguous, response.StatusCode);
+            Assert.Equal("{\"name\":\"Test User\"}", content);
+        }
+
+        [Fact]
+        public async Task ApiController_CreatedRelative()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/ActionResult/GetCreatedRelative");
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Created, response.StatusCode);
+            Assert.Equal("{\"name\":\"Test User\"}", content);
+            Assert.Equal("5", response.Headers.Location.OriginalString);
+        }
+
+        [Fact]
+        public async Task ApiController_CreatedAbsolute()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/ActionResult/GetCreatedAbsolute");
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Created, response.StatusCode);
+            Assert.Equal("{\"name\":\"Test User\"}", content);
+            Assert.Equal("/api/Blog/ActionResult/GetUser/5", response.Headers.Location.OriginalString);
+        }
+
+        [Fact]
+        public async Task ApiController_CreatedQualified()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/ActionResult/GetCreatedQualified");
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Created, response.StatusCode);
+            Assert.Equal("{\"name\":\"Test User\"}", content);
+            Assert.Equal("http://localhost/api/Blog/ActionResult/5", response.Headers.Location.OriginalString);
+        }
+
+        [Fact]
+        public async Task ApiController_CreatedUri()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/ActionResult/GetCreatedUri");
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Created, response.StatusCode);
+            Assert.Equal("{\"name\":\"Test User\"}", content);
+            Assert.Equal("/api/Blog/ActionResult/GetUser/5", response.Headers.Location.OriginalString);
+        }
+
+        [Fact]
+        public async Task ApiController_CreatedAtRoute()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/ActionResult/GetCreatedAtRoute");
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Created, response.StatusCode);
+            Assert.Equal("{\"name\":\"Test User\"}", content);
+            Assert.Equal("http://localhost/api/Blog/ActionResult/GetUser/5", response.Headers.Location.OriginalString);
+        }
+
+        [Fact]
+        public async Task ApiController_InternalServerError()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/ActionResult/GetInternalServerError");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task ApiController_InternalServerErrorException()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/ActionResult/GetInternalServerErrorException");
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
+            Assert.Equal("{\"Message\":\"An error has occurred.\"}", content);
+        }
+
+        [Fact]
+        public async Task ApiController_Json()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/ActionResult/GetJson");
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("{\"name\":\"Test User\"}", content);
+        }
+
+        [Fact]
+        public async Task ApiController_JsonSettings()
+        {
+            // Arrange
+            var expected =
+                "{" + Environment.NewLine +
+                "  \"name\": \"Test User\"" + Environment.NewLine +
+                "}";
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/ActionResult/GetJsonSettings");
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expected, content);
+        }
+
+        [Fact]
+        public async Task ApiController_JsonSettingsEncoding()
+        {
+            // Arrange
+            var expected =
+                "{" + Environment.NewLine +
+                "  \"name\": \"Test User\"" + Environment.NewLine +
+                "}";
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/ActionResult/GetJsonSettingsEncoding");
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expected, content);
+            Assert.Equal("utf-32", response.Content.Headers.ContentType.CharSet);
+        }
+
+        [Fact]
+        public async Task ApiController_NotFound()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/ActionResult/GetNotFound");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task ApiController_Ok()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/ActionResult/GetOk");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task ApiController_OkContent()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/ActionResult/GetOkContent");
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("{\"name\":\"Test User\"}", content);
+        }
+
+        [Fact]
+        public async Task ApiController_RedirectString()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/ActionResult/GetRedirectString");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal("http://localhost/api/Users", response.Headers.Location.OriginalString);
+        }
+
+        [Theory]
+        [InlineData("http://localhost/api/Blog/ActionResult/GetRedirectUri", "api/Blog")]
+        [InlineData(
+            "http://localhost/api/Blog/ActionResult/GetRedirectUrlUsingRouteName",
+            "/api/Blog/BasicApi/WriteToHttpContext")]
+        public async Task ApiController_RedirectUri(string url, string expected)
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync(url);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
+            Assert.Equal(expected, response.Headers.Location.OriginalString);
+        }
+
+        [Fact]
+        public async Task ApiController_ResponseMessage()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/ActionResult/GetResponseMessage");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(new string[] { "Hello" }, response.Headers.GetValues("X-Test"));
+        }
+
+        [Fact]
+        public async Task ApiController_StatusCode()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/ActionResult/GetStatusCode");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.PaymentRequired, response.StatusCode);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimActionSelectionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimActionSelectionTest.cs
new file mode 100644
index 0000000000..e13e6fff31
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimActionSelectionTest.cs
@@ -0,0 +1,592 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class WebApiCompatShimActionSelectionTest : IClassFixture<MvcTestFixture<WebApiCompatShimWebSite.Startup>>
+    {
+        public WebApiCompatShimActionSelectionTest(MvcTestFixture<WebApiCompatShimWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Theory]
+        [InlineData("GET", "GetItems")]
+        [InlineData("PUT", "PutItems")]
+        [InlineData("POST", "PostItems")]
+        [InlineData("DELETE", "DeleteItems")]
+        [InlineData("PATCH", "PatchItems")]
+        [InlineData("HEAD", "HeadItems")]
+        [InlineData("OPTIONS", "OptionsItems")]
+        public async Task WebAPIConvention_TakesHttpMethodFromPrefix_UnnamedAction(string httpMethod, string actionName)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod(httpMethod),
+                "http://localhost/api/Admin/WebAPIActionConventions");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var data = Assert.Single(response.Headers.GetValues("ActionSelection"));
+            var result = JsonConvert.DeserializeObject<ActionSelectionResult>(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(actionName, result.ActionName);
+        }
+
+        [Theory]
+        [InlineData("GET", "GetItems")]
+        [InlineData("PUT", "PutItems")]
+        [InlineData("POST", "PostItems")]
+        [InlineData("DELETE", "DeleteItems")]
+        [InlineData("PATCH", "PatchItems")]
+        [InlineData("HEAD", "HeadItems")]
+        [InlineData("OPTIONS", "OptionsItems")]
+        public async Task WebAPIConvention_TakesHttpMethodFromPrefix_NamedAction(string httpMethod, string actionName)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod(httpMethod),
+                "http://localhost/api/Blog/WebAPIActionConventions/" + actionName);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var data = Assert.Single(response.Headers.GetValues("ActionSelection"));
+            var result = JsonConvert.DeserializeObject<ActionSelectionResult>(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(actionName, result.ActionName);
+        }
+
+        [Fact]
+        public async Task WebAPIConvention_TakesHttpMethodFromPrefix_NamedAction_MismatchedVerb()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod("POST"),
+                "http://localhost/api/Blog/WebAPIActionConventions/GetItems");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task WebAPIConvention_TakesHttpMethodFromPrefix_UnnamedAction_DefaultVerbIsPost_Success()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod("POST"),
+                "http://localhost/api/Admin/WebApiActionConventionsDefaultPost");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var data = Assert.Single(response.Headers.GetValues("ActionSelection"));
+            var result = JsonConvert.DeserializeObject<ActionSelectionResult>(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("DefaultVerbIsPost", result.ActionName);
+        }
+
+        [Fact]
+        public async Task WebAPIConvention_TakesHttpMethodFromPrefix_NamedAction_DefaultVerbIsPost_Success()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod("POST"),
+                "http://localhost/api/Blog/WebAPIActionConventionsDefaultPost/DefaultVerbIsPost");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var data = Assert.Single(response.Headers.GetValues("ActionSelection"));
+            var result = JsonConvert.DeserializeObject<ActionSelectionResult>(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("DefaultVerbIsPost", result.ActionName);
+        }
+
+        [Fact]
+        public async Task WebAPIConvention_TakesHttpMethodFromPrefix_UnnamedAction_DefaultVerbIsPost_VerbMismatch()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod("GET"),
+                "http://localhost/api/Admin/WebApiActionConventionsDefaultPost");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task WebAPIConvention_TakesHttpMethodFromPrefix_NamedAction_DefaultVerbIsPost_VerbMismatch()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod("PUT"),
+                "http://localhost/api/Blog/WebApiActionConventionsDefaultPost/DefaultVerbIsPost");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task WebAPIConvention_TakesHttpMethodFromMethodName_NotActionName_UnnamedAction_Success()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod("POST"),
+                "http://localhost/api/Admin/WebAPIActionConventionsActionName");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var data = Assert.Single(response.Headers.GetValues("ActionSelection"));
+            var result = JsonConvert.DeserializeObject<ActionSelectionResult>(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("GetItems", result.ActionName);
+        }
+
+        [Fact]
+        public async Task WebAPIConvention_TakesHttpMethodFromMethodName_NotActionName_NamedAction_Success()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod("POST"),
+                "http://localhost/api/Blog/WebAPIActionConventionsActionName/GetItems");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var data = Assert.Single(response.Headers.GetValues("ActionSelection"));
+            var result = JsonConvert.DeserializeObject<ActionSelectionResult>(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("GetItems", result.ActionName);
+        }
+
+        [Fact]
+        public async Task WebAPIConvention_TakesHttpMethodFromMethodName_NotActionName_UnnamedAction_VerbMismatch()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod("Get"),
+                "http://localhost/api/Admin/WebAPIActionConventionsActionName");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task WebAPIConvention_TakesHttpMethodFromMethodName_NotActionName_NamedAction_VerbMismatch()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod("GET"),
+                "http://localhost/api/Blog/WebAPIActionConventionsActionName/GetItems");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task WebAPIConvention_HttpMethodOverride_UnnamedAction_Success()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod("GET"),
+                "http://localhost/api/Admin/WebAPIActionConventionsVerbOverride");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var data = Assert.Single(response.Headers.GetValues("ActionSelection"));
+            var result = JsonConvert.DeserializeObject<ActionSelectionResult>(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("PostItems", result.ActionName);
+        }
+
+        [Fact]
+        public async Task WebAPIConvention_HttpMethodOverride_NamedAction_Success()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod("GET"),
+                "http://localhost/api/Blog/WebAPIActionConventionsVerbOverride/PostItems");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var data = Assert.Single(response.Headers.GetValues("ActionSelection"));
+            var result = JsonConvert.DeserializeObject<ActionSelectionResult>(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("PostItems", result.ActionName);
+        }
+
+        [Fact]
+        public async Task WebAPIConvention_HttpMethodOverride_UnnamedAction_VerbMismatch()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod("POST"),
+                "http://localhost/api/Admin/WebAPIActionConventionsVerbOverride");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task WebAPIConvention_HttpMethodOverride_NamedAction_VerbMismatch()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                new HttpMethod("POST"),
+                "http://localhost/api/Blog/WebAPIActionConventionsVerbOverride/PostItems");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        // This was ported from the WebAPI 5.2 codebase. Kept the same intentionally for compatibility.
+        [Theory]
+        [InlineData("GET", "api/Admin/Test", "GetUsers")]
+        [InlineData("GET", "api/Admin/Test/2", "GetUser")]
+        [InlineData("GET", "api/Admin/Test/3?name=mario", "GetUserByNameAndId")]
+        [InlineData("GET", "api/Admin/Test/3?name=mario&ssn=123456", "GetUserByNameIdAndSsn")]
+        [InlineData("GET", "api/Admin/Test?name=mario&ssn=123456", "GetUserByNameAndSsn")]
+        [InlineData("GET", "api/Admin/Test?name=mario&ssn=123456&age=3", "GetUserByNameAgeAndSsn")]
+        [InlineData("GET", "api/Admin/Test/5?random=9", "GetUser")]
+        // Note: Normally the following would not match DeleteUserByIdAndOptName because it has 'id' and 'age' as parameters while the DeleteUserByIdAndOptName action has 'id' and 'name'.
+        // However, because the default value is provided on action parameter 'name', having the 'id' in the request was enough to match the action.
+        [InlineData("DELETE", "api/Admin/Test/6?age=10", "DeleteUserByIdAndOptName")]
+        [InlineData("DELETE", "api/Admin/Test", "DeleteUserByOptName")]
+        [InlineData("DELETE", "api/Admin/Test?name=user", "DeleteUserByOptName")]
+        [InlineData("DELETE", "api/Admin/Test/6?email=user@test.com", "DeleteUserById_Email_OptName_OptPhone")]
+        [InlineData("DELETE", "api/Admin/Test/6?email=user@test.com&name=user", "DeleteUserById_Email_OptName_OptPhone")]
+        [InlineData("DELETE", "api/Admin/Test/6?email=user@test.com&name=user&phone=123456789", "DeleteUserById_Email_OptName_OptPhone")]
+        [InlineData("DELETE", "api/Admin/Test/6?email=user@test.com&height=1.8", "DeleteUserById_Email_Height_OptName_OptPhone")]
+        [InlineData("DELETE", "api/Admin/Test/6?email=user@test.com&height=1.8&name=user", "DeleteUserById_Email_Height_OptName_OptPhone")]
+        [InlineData("DELETE", "api/Admin/Test/6?email=user@test.com&height=1.8&name=user&phone=12345678", "DeleteUserById_Email_Height_OptName_OptPhone")]
+        [InlineData("HEAD", "api/Admin/Test/6", "Head_Id_OptSize_OptIndex")]
+        [InlineData("HEAD", "api/Admin/Test/6?size=2", "Head_Id_OptSize_OptIndex")]
+        [InlineData("HEAD", "api/Admin/Test/6?index=2", "Head_Id_OptSize_OptIndex")]
+        [InlineData("HEAD", "api/Admin/Test/6?index=2&size=10", "Head_Id_OptSize_OptIndex")]
+        [InlineData("HEAD", "api/Admin/Test/6?index=2&otherParameter=10", "Head_Id_OptSize_OptIndex")]
+        [InlineData("HEAD", "api/Admin/Test/6?otherQueryParameter=1234", "Head_Id_OptSize_OptIndex")]
+        [InlineData("HEAD", "api/Admin/Test", "Head")]
+        [InlineData("HEAD", "api/Admin/Test?otherParam=2", "Head")]
+        [InlineData("HEAD", "api/Admin/Test?index=2&size=10", "Head")]
+        public async Task LegacyActionSelection_OverloadedAction_WithUnnamedAction(string httpMethod, string requestUrl, string expectedActionName)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(new HttpMethod(httpMethod), "http://localhost/" + requestUrl);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var data = Assert.Single(response.Headers.GetValues("ActionSelection"));
+            var result = JsonConvert.DeserializeObject<ActionSelectionResult>(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedActionName, result.ActionName);
+        }
+
+        [Theory]
+        [InlineData("api/Admin/Test", "PostUser")]
+        [InlineData("api/Admin/Test?name=mario&age=10", "PostUserByNameAndAge")]
+        public async Task LegacyActionSelection_OverloadedAction_WithUnnamedActionAndRequestContent(string requestUrl, string expectedActionName)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/" + requestUrl);
+            request.Content = new StringContent("{}", Encoding.UTF8, "application/json");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var data = Assert.Single(response.Headers.GetValues("ActionSelection"));
+            var result = JsonConvert.DeserializeObject<ActionSelectionResult>(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedActionName, result.ActionName);
+        }
+
+        [Theory]
+        [InlineData("GET", "api/Store/Test", "GetUsers")]
+        [InlineData("GET", "api/Store/Test/2", "GetUsersByName")]
+        [InlineData("GET", "api/Store/Test/luigi?ssn=123456", "GetUserByNameAndSsn")]
+        [InlineData("GET", "api/Store/Test/luigi?ssn=123456&id=2&ssn=12345", "GetUserByNameIdAndSsn")]
+        [InlineData("GET", "api/Store/Test?age=10&ssn=123456", "GetUsers")]
+        [InlineData("GET", "api/Store/Test?id=3&ssn=123456&name=luigi", "GetUserByNameIdAndSsn")]
+        [InlineData("POST", "api/Store/Test/luigi?age=20", "PostUserByNameAndAge")]
+        public async Task LegacyActionSelection_OverloadedAction_NonIdRouteParameter(string httpMethod, string requestUrl, string expectedActionName)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(new HttpMethod(httpMethod), "http://localhost/" + requestUrl);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var data = Assert.Single(response.Headers.GetValues("ActionSelection"));
+            var result = JsonConvert.DeserializeObject<ActionSelectionResult>(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedActionName, result.ActionName);
+        }
+
+        [Theory]
+        [InlineData("GET", "api/Admin/Test/3?NAME=mario", "GetUserByNameAndId")]
+        [InlineData("GET", "api/Admin/Test/3?name=mario&SSN=123456", "GetUserByNameIdAndSsn")]
+        [InlineData("GET", "api/Admin/Test?nAmE=mario&ssn=123456&AgE=3", "GetUserByNameAgeAndSsn")]
+        [InlineData("DELETE", "api/Admin/Test/6?AGe=10", "DeleteUserByIdAndOptName")]
+        public async Task LegacyActionSelection_OverloadedAction_Parameter_Casing(string httpMethod, string requestUrl, string expectedActionName)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(new HttpMethod(httpMethod), "http://localhost/" + requestUrl);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var data = Assert.Single(response.Headers.GetValues("ActionSelection"));
+            var result = JsonConvert.DeserializeObject<ActionSelectionResult>(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedActionName, result.ActionName);
+        }
+
+        [Theory]
+        [InlineData("GET", "api/Blog/Test/GetUsers", "GetUsers")]
+        [InlineData("GET", "api/Blog/Test/GetUser/7", "GetUser")]
+        [InlineData("GET", "api/Blog/Test/GetUser?id=3", "GetUser")]
+        [InlineData("GET", "api/Blog/Test/GetUser/4?id=3", "GetUser")]
+        [InlineData("GET", "api/Blog/Test/GetUserByNameAgeAndSsn?name=user&age=90&ssn=123456789", "GetUserByNameAgeAndSsn")]
+        [InlineData("GET", "api/Blog/Test/GetUserByNameAndSsn?name=user&ssn=123456789", "GetUserByNameAndSsn")]
+        public async Task LegacyActionSelection_RouteWithActionName(string httpMethod, string requestUrl, string expectedActionName)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(new HttpMethod(httpMethod), "http://localhost/" + requestUrl);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var data = Assert.Single(response.Headers.GetValues("ActionSelection"));
+            var result = JsonConvert.DeserializeObject<ActionSelectionResult>(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedActionName, result.ActionName);
+        }
+
+        [Fact]
+        public async Task LegacyActionSelection_RouteWithActionNameAndRequestContent()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                HttpMethod.Post,
+                "http://localhost/api/Blog/Test/PostUserByNameAndAddress?name=user");
+            request.Content = new StringContent("{}", Encoding.UTF8, "application/json");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var data = Assert.Single(response.Headers.GetValues("ActionSelection"));
+            var result = JsonConvert.DeserializeObject<ActionSelectionResult>(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("PostUserByNameAndAddress", result.ActionName);
+        }
+
+        [Theory]
+        [InlineData("GET", "api/Blog/Test/getusers", "GetUsers")]
+        [InlineData("GET", "api/Blog/Test/getuseR/1", "GetUser")]
+        [InlineData("GET", "api/Blog/Test/Getuser?iD=3", "GetUser")]
+        [InlineData("GET", "api/Blog/Test/GetUser/4?Id=3", "GetUser")]
+        [InlineData("GET", "api/Blog/Test/GetUserByNameAgeandSsn?name=user&age=90&ssn=123456789", "GetUserByNameAgeAndSsn")]
+        [InlineData("GET", "api/Blog/Test/getUserByNameAndSsn?name=user&ssn=123456789", "GetUserByNameAndSsn")]
+        public async Task LegacyActionSelection_RouteWithActionName_Casing(string httpMethod, string requestUrl, string expectedActionName)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(new HttpMethod(httpMethod), "http://localhost/" + requestUrl);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var data = Assert.Single(response.Headers.GetValues("ActionSelection"));
+            var result = JsonConvert.DeserializeObject<ActionSelectionResult>(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedActionName, result.ActionName);
+        }
+
+        [Fact]
+        public async Task LegacyActionSelection_RouteWithActionNameAndRequestContent_Casing()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                HttpMethod.Post,
+                "http://localhost/api/Blog/Test/PostUserByNameAndAddress?name=user");
+            request.Content = new StringContent("{}", Encoding.UTF8, "application/json");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var data = Assert.Single(response.Headers.GetValues("ActionSelection"));
+            var result = JsonConvert.DeserializeObject<ActionSelectionResult>(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("PostUserByNameAndAddress", result.ActionName);
+        }
+
+        [Theory]
+        [InlineData("GET", "api/Admin/Test", "GetUsers")]
+        [InlineData("GET", "api/Admin/Test/?name=peach", "GetUsersByName")]
+        [InlineData("GET", "api/Admin/Test?name=peach", "GetUsersByName")]
+        [InlineData("GET", "api/Admin/Test?name=peach&ssn=123456", "GetUserByNameAndSsn")]
+        [InlineData("GET", "api/Admin/Test?name=peach&ssn=123456&age=3", "GetUserByNameAgeAndSsn")]
+        public async Task LegacyActionSelection_RouteWithoutActionName(string httpMethod, string requestUrl, string expectedActionName)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(new HttpMethod(httpMethod), "http://localhost/" + requestUrl);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var data = Assert.Single(response.Headers.GetValues("ActionSelection"));
+            var result = JsonConvert.DeserializeObject<ActionSelectionResult>(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedActionName, result.ActionName);
+        }
+
+        [Theory]
+        [InlineData("GET", "api/Admin/ParameterAttribute/2", "GetUser")]
+        [InlineData("GET", "api/Admin/ParameterAttribute?id=2", "GetUser")]
+        [InlineData("GET", "api/Admin/ParameterAttribute?myId=2", "GetUserByMyId")]
+        [InlineData("DELETE", "api/Admin/ParameterAttribute/3?name=user", "DeleteUserWithNullableIdAndName")]
+        [InlineData("DELETE", "api/Admin/ParameterAttribute?address=userStreet", "DeleteUser")]
+        public async Task LegacyActionSelection_ModelBindingParameterAttribute_AreAppliedWhenSelectingActions(string httpMethod, string requestUrl, string expectedActionName)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(new HttpMethod(httpMethod), "http://localhost/" + requestUrl);
+            request.Content = new StringContent("{}", Encoding.UTF8, "application/json");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var data = Assert.Single(response.Headers.GetValues("ActionSelection"));
+            var result = JsonConvert.DeserializeObject<ActionSelectionResult>(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedActionName, result.ActionName);
+        }
+
+        [Theory]
+        [InlineData("api/Admin/ParameterAttribute/3?name=user", "PostUserNameFromUri")]
+        [InlineData("api/Admin/ParameterAttribute/3", "PostUserNameFromBody")]
+        public async Task LegacyActionSelection_Post_ModelBindingParameterAttribute_AreAppliedWhenSelectingActions(string requestUrl, string expectedActionName)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/" + requestUrl);
+            request.Content = new StringContent("{}", Encoding.UTF8, "application/json");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var data = Assert.Single(response.Headers.GetValues("ActionSelection"));
+            var result = JsonConvert.DeserializeObject<ActionSelectionResult>(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedActionName, result.ActionName);
+        }
+
+        [Theory]
+        [InlineData("GET", "api/Support/notActionParameterValue1/Test", "GetUsers")]
+        [InlineData("GET", "api/Support/notActionParameterValue2/Test/2", "GetUser")]
+        [InlineData("GET", "api/Support/notActionParameterValue1/Test?randomQueryVariable=val1", "GetUsers")]
+        [InlineData("GET", "api/Support/notActionParameterValue2/Test/2?randomQueryVariable=val2", "GetUser")]
+        public async Task LegacyActionSelection_ActionsThatHaveSubsetOfRouteParameters_AreConsideredForSelection(string httpMethod, string requestUrl, string expectedActionName)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(new HttpMethod(httpMethod), "http://localhost/" + requestUrl);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var data = Assert.Single(response.Headers.GetValues("ActionSelection"));
+            var result = JsonConvert.DeserializeObject<ActionSelectionResult>(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedActionName, result.ActionName);
+        }
+
+        [Theory]
+        [InlineData("GET", "api/Admin/EnumParameterOverloads", "Get")]
+        [InlineData("GET", "api/Admin/EnumParameterOverloads?scope=global", "GetWithEnumParameter")]
+        [InlineData("GET", "api/Admin/EnumParameterOverloads?level=off&kind=trace", "GetWithTwoEnumParameters")]
+        [InlineData("GET", "api/Admin/EnumParameterOverloads?level=", "GetWithNullableEnumParameter")]
+        public async Task LegacyActionSelection_SelectAction_ReturnsActionDescriptor_ForEnumParameterOverloads(string httpMethod, string requestUrl, string expectedActionName)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(new HttpMethod(httpMethod), "http://localhost/" + requestUrl);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var data = Assert.Single(response.Headers.GetValues("ActionSelection"));
+            var result = JsonConvert.DeserializeObject<ActionSelectionResult>(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expectedActionName, result.ActionName);
+        }
+
+        // Verify response has all the methods in its Allow header. values are unsorted.
+        private void AssertAllowedHeaders(HttpResponseMessage response, params HttpMethod[] allowedMethods)
+        {
+            foreach (var method in allowedMethods)
+            {
+                Assert.Contains(method.ToString(), response.Content.Headers.Allow);
+            }
+            Assert.Equal(allowedMethods.Length, response.Content.Headers.Allow.Count);
+        }
+
+        private class ActionSelectionResult
+        {
+            public string ActionName { get; set; }
+
+            public string ControllerName { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs
new file mode 100644
index 0000000000..9080f544e9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs
@@ -0,0 +1,467 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Formatting;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using System.Web.Http;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.Testing.xunit;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class WebApiCompatShimBasicTest : IClassFixture<MvcTestFixture<WebApiCompatShimWebSite.Startup>>
+    {
+        public WebApiCompatShimBasicTest(MvcTestFixture<WebApiCompatShimWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task ApiController_Activates_HttpContextAndUser()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/BasicApi/WriteToHttpContext");
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(
+                "Hello, Anonymous User from WebApiCompatShimWebSite.BasicApiController.WriteToHttpContext (WebApiCompatShimWebSite)",
+                content);
+        }
+
+        [Fact]
+        public async Task ApiController_Activates_UrlHelper()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/BasicApi/GenerateUrl");
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(
+                "Visited: /api/Blog/BasicApi/GenerateUrl",
+                content);
+        }
+
+        [Fact]
+        public async Task Options_SetsDefaultFormatters()
+        {
+            // Arrange
+            var expected = new string[]
+            {
+                typeof(JsonMediaTypeFormatter).FullName,
+                typeof(XmlMediaTypeFormatter).FullName,
+                typeof(FormUrlEncodedMediaTypeFormatter).FullName
+            };
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/BasicApi/GetFormatters");
+            var content = await response.Content.ReadAsStringAsync();
+
+            var formatters = JsonConvert.DeserializeObject<string[]>(content);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expected, formatters);
+        }
+
+        [Fact]
+        public async Task ActionThrowsHttpResponseException_WithStatusCode()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync(
+                "http://localhost/api/Blog/HttpResponseException/ThrowsHttpResponseExceptionWithHttpStatusCode");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal(string.Empty, content);
+        }
+
+        [Fact]
+        public async Task ActionThrowsHttpResponseException_WithResponse()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync(
+                "http://localhost/api/Blog/HttpResponseException" +
+                "/ThrowsHttpResponseExceptionWithHttpResponseMessage?message=send some message");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal("send some message", content);
+        }
+
+        [Fact]
+        public async Task ActionThrowsHttpResponseException_EnsureGlobalHttpresponseExceptionActionFilter_IsInvoked()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync(
+                "http://localhost/api/Blog/HttpResponseException/ThrowsHttpResponseExceptionEnsureGlobalFilterRunsLast");
+
+            // Assert
+            // Ensure we do not get a no content result.
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal(string.Empty, content);
+        }
+
+        [Fact]
+        public async Task ActionThrowsHttpResponseException_EnsureGlobalFilterConvention_IsApplied()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync(
+                "http://localhost/api/Blog/" +
+                "HttpResponseException/ThrowsHttpResponseExceptionInjectAFilterToHandleHttpResponseException");
+
+            // Assert
+            // Ensure we do get a no content result.
+            Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
+            var content = await response.Content.ReadAsStringAsync();
+            Assert.Equal(string.Empty, content);
+        }
+
+        [Fact]
+        public async Task ApiController_CanValidateCustomObjectWithPrefix_Fails()
+        {
+            // Arrange & Act
+            var response = await Client.GetStringAsync(
+                "http://localhost/api/Blog/BasicApi/ValidateObjectWithPrefixFails?prefix=prefix");
+
+            // Assert
+            var json = JsonConvert.DeserializeObject<Dictionary<string, string>>(response);
+            Assert.Single(json);
+            Assert.Equal("The field ID must be between 0 and 100.", json["prefix.ID"]);
+        }
+
+        [Fact]
+        public async Task ApiController_CanValidateCustomObject_IsSuccessFul()
+        {
+            // Arrange & Act
+            var response = await Client.GetStringAsync("http://localhost/api/Blog/BasicApi/ValidateObject_Passes");
+
+            // Assert
+            Assert.Equal("true", response);
+        }
+
+        [Fact]
+        public async Task ApiController_CanValidateCustomObject_Fails()
+        {
+            // Arrange & Act
+            var response = await Client.GetStringAsync("http://localhost/api/Blog/BasicApi/ValidateObjectFails");
+
+            // Assert
+            var json = JsonConvert.DeserializeObject<Dictionary<string, string>>(response);
+            Assert.Single(json);
+            Assert.Equal("The field ID must be between 0 and 100.", json["ID"]);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/24
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task ApiController_RequestProperty()
+        {
+            // Arrange
+            var expected = "POST http://localhost/api/Blog/HttpRequestMessage/EchoProperty localhost " +
+                "13 Hello, world!";
+
+            // Act
+            var response = await Client.PostAsync(
+                "http://localhost/api/Blog/HttpRequestMessage/EchoProperty",
+                new StringContent("Hello, world!"));
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expected, content);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/24
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task ApiController_RequestParameter()
+        {
+            // Arrange
+            var expected =
+                "POST http://localhost/api/Blog/HttpRequestMessage/EchoParameter localhost " +
+                "17 Hello, the world!";
+
+            // Act
+            var response = await Client.PostAsync(
+                "http://localhost/api/Blog/HttpRequestMessage/EchoParameter",
+                new StringContent("Hello, the world!"));
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expected, content);
+        }
+
+        [Fact]
+        public async Task ApiController_ResponseReturned()
+        {
+            // Arrange
+            var expected = "POST Hello, HttpResponseMessage world!";
+
+            // Act
+            var response = await Client.PostAsync(
+                "http://localhost/api/Blog/HttpRequestMessage/EchoWithResponseMessage",
+                new StringContent("Hello, HttpResponseMessage world!"));
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expected, content);
+
+            IEnumerable<string> values;
+            Assert.True(response.Headers.TryGetValues("X-Test", out values));
+            Assert.Equal(new string[] { "Hello!" }, values);
+            Assert.Equal(38, response.Content.Headers.ContentLength);
+        }
+
+        [Fact]
+        public async Task ApiController_ExplicitChunkedEncoding_IsIgnored()
+        {
+            // Arrange
+            var expected = "POST Hello, HttpResponseMessage world!";
+            var request = new HttpRequestMessage();
+            request.Method = HttpMethod.Post;
+            request.RequestUri = new Uri("http://localhost/api/Blog/HttpRequestMessage/EchoWithResponseMessageChunked");
+            request.Content = new StringContent("Hello, HttpResponseMessage world!");
+
+            // Act
+            // HttpClient buffers the response by default and this would set the Content-Length header and so
+            // this will not provide us accurate information as to whether the server set the header or
+            // the client. So here we explicitly mention to only read the headers and not the body.
+            var response = await Client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content);
+            if (!TestPlatformHelper.IsMono)
+            {
+                // Mono issue - https://github.com/aspnet/External/issues/20
+                Assert.NotNull(response.Content.Headers.ContentLength);
+            }
+
+            Assert.Null(response.Headers.TransferEncodingChunked);
+
+            // When HttpClient by default reads and buffers the response body, it disposes the
+            // response stream for us. But since we are reading the content explicitly, we need
+            // to close it.
+            var responseStream = await response.Content.ReadAsStreamAsync();
+            using (var streamReader = new StreamReader(responseStream))
+            {
+                Assert.Equal(expected, streamReader.ReadToEnd());
+            }
+
+            IEnumerable<string> values;
+            Assert.True(response.Headers.TryGetValues("X-Test", out values));
+            Assert.Equal(new string[] { "Hello!" }, values);
+        }
+
+        [Theory]
+        [InlineData("application/json", "application/json")]
+        [InlineData("text/xml", "text/xml")]
+        [InlineData("text/plain, text/xml; q=0.5", "text/xml")]
+        [InlineData("application/*", "application/json")]
+        public async Task ApiController_CreateResponse_Conneg(string accept, string mediaType)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                HttpMethod.Get,
+                "http://localhost/api/Blog/HttpRequestMessage/GetUser");
+            request.Headers.Accept.ParseAdd(accept);
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var user = await response.Content.ReadAsAsync<WebApiCompatShimWebSite.User>();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("Test User", user.Name);
+            Assert.Equal(mediaType, response.Content.Headers.ContentType.MediaType);
+        }
+
+        [Theory]
+        [InlineData("application/json")]
+        [InlineData("text/xml")]
+        public async Task ApiController_CreateResponse_HardcodedMediaType(string mediaType)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                HttpMethod.Get,
+                "http://localhost/api/Blog/HttpRequestMessage/GetUser?mediaType=" + mediaType);
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var user = await response.Content.ReadAsAsync<WebApiCompatShimWebSite.User>();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("Test User", user.Name);
+            Assert.Equal(mediaType, response.Content.Headers.ContentType.MediaType);
+        }
+
+        [Theory]
+        [InlineData("application/json", "application/json")]
+        [InlineData("text/xml", "text/xml")]
+        [InlineData("text/plain, text/xml; q=0.5", "text/xml")]
+        [InlineData("application/*", "application/json")]
+        public async Task ApiController_CreateResponse_Conneg_Error(string accept, string mediaType)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                HttpMethod.Get,
+                "http://localhost/api/Blog/HttpRequestMessage/Fail");
+            request.Headers.Accept.ParseAdd(accept);
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var error = await response.Content.ReadAsAsync<HttpError>();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
+            Assert.Equal("It failed.", error.Message);
+            Assert.Equal(mediaType, response.Content.Headers.ContentType.MediaType);
+        }
+
+        [Fact]
+        public async Task ApiController_CreateResponse_HardcodedFormatter()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                HttpMethod.Get,
+                "http://localhost/api/Blog/HttpRequestMessage/GetUserJson");
+
+            // Accept header will be ignored
+            request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("text/xml"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var user = await response.Content.ReadAsAsync<WebApiCompatShimWebSite.User>();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("Test User", user.Name);
+            Assert.Equal("text/json", response.Content.Headers.ContentType.MediaType);
+        }
+
+        [Theory]
+        [InlineData("http://localhost/Mvc/Index", HttpStatusCode.OK)]
+        [InlineData("http://localhost/api/Blog/Mvc/Index", HttpStatusCode.NotFound)]
+        public async Task WebApiRouting_AccessMvcController(string url, HttpStatusCode expected)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(expected, response.StatusCode);
+        }
+
+        [Theory]
+        [InlineData("http://localhost/BasicApi/GenerateUrl", HttpStatusCode.NotFound)]
+        [InlineData("http://localhost/api/Blog/BasicApi/GenerateUrl", HttpStatusCode.OK)]
+        public async Task WebApiRouting_AccessWebApiController(string url, HttpStatusCode expected)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(expected, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task ApiController_Returns_ByteArrayContent()
+        {
+            // Arrange
+            var expectedBody = "Hello from ByteArrayContent!!";
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/HttpRequestMessage/ReturnByteArrayContent");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content);
+            Assert.Equal("text/plain", response.Content.Headers.ContentType.MediaType);
+
+            var actualBody = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, actualBody);
+        }
+
+        [Fact]
+        public async Task ApiController_Returns_StreamContent()
+        {
+            // Arrange
+            var expectedBody = "This content is from a file";
+
+            // Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/HttpRequestMessage/ReturnStreamContent");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content);
+            Assert.Equal("image/jpeg", response.Content.Headers.ContentType.MediaType);
+            Assert.NotNull(response.Content.Headers.ContentDisposition);
+            Assert.Equal("attachment", response.Content.Headers.ContentDisposition.DispositionType);
+
+            var actualBody = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, actualBody);
+        }
+
+        [Theory]
+        [InlineData("ReturnPushStreamContent", "Hello from PushStreamContent!!")]
+        [InlineData("ReturnPushStreamContentSync", "Hello from PushStreamContent Sync!!")]
+        public async Task ApiController_Returns_PushStreamContent(string action, string expectedBody)
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("http://localhost/api/Blog/HttpRequestMessage/" + action);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content);
+            Assert.Equal("application/pdf", response.Content.Headers.ContentType.MediaType);
+
+            var actualBody = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, actualBody);
+        }
+
+        [Fact]
+        public async Task ApiController_Returns_PushStreamContentWithCustomHeaders()
+        {
+            // Arrange
+            var expectedBody = "Hello from PushStreamContent with custom headers!!";
+            var multipleValues = new[] { "value1", "value2" };
+
+            // Act
+            var response = await Client.GetAsync(
+                "http://localhost/api/Blog/HttpRequestMessage/ReturnPushStreamContentWithCustomHeaders");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.NotNull(response.Content);
+            Assert.Equal("application/octet-stream", response.Content.Headers.ContentType.ToString());
+
+            var actualBody = await response.Content.ReadAsStringAsync();
+            Assert.Equal(expectedBody, actualBody);
+            Assert.Equal(multipleValues, response.Headers.GetValues("Multiple"));
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimParameterBindingTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimParameterBindingTest.cs
new file mode 100644
index 0000000000..4c09b37d2e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimParameterBindingTest.cs
@@ -0,0 +1,199 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class WebApiCompatShimParameterBindingTest : IClassFixture<MvcTestFixture<WebApiCompatShimWebSite.Startup>>
+    {
+        public WebApiCompatShimParameterBindingTest(MvcTestFixture<WebApiCompatShimWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Theory]
+        [InlineData("http://localhost/api/Blog/Employees/PostByIdDefault/5")]
+        [InlineData("http://localhost/api/Blog/Employees/PostByIdDefault?id=5")]
+        public async Task ApiController_SimpleParameter_Default_ReadsFromUrl(string url)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Post, url);
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("5", content);
+        }
+
+        [Fact]
+        public async Task ApiController_SimpleParameter_Default_DoesNotReadFormData()
+        {
+            // Arrange
+            var url = "http://localhost/api/Blog/Employees/PostByIdDefault";
+            var request = new HttpRequestMessage(HttpMethod.Post, url);
+            request.Content = new FormUrlEncodedContent(new Dictionary<string, string>()
+            {
+                { "id", "5" },
+            });
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("-1", content);
+        }
+
+        [Theory]
+        [InlineData("http://localhost/api/Blog/Employees/PostByIdModelBinder/5")]
+        [InlineData("http://localhost/api/Blog/Employees/PostByIdModelBinder?id=5")]
+        public async Task ApiController_SimpleParameter_ModelBinder_ReadsFromUrl(string url)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Post, url);
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("5", content);
+        }
+
+        [Fact]
+        public async Task ApiController_SimpleParameter_ModelBinder_ReadsFromFormData()
+        {
+            // Arrange
+            var url = "http://localhost/api/Blog/Employees/PostByIdModelBinder";
+            var request = new HttpRequestMessage(HttpMethod.Post, url);
+            request.Content = new FormUrlEncodedContent(new Dictionary<string, string>()
+            {
+                { "id", "5" },
+            });
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("5", content);
+        }
+
+        [Theory]
+        [InlineData("http://localhost/api/Blog/Employees/PostByIdFromQuery/5", "-1")]
+        [InlineData("http://localhost/api/Blog/Employees/PostByIdFromQuery?id=5", "5")]
+        public async Task ApiController_SimpleParameter_FromQuery_ReadsFromQueryNotRouteData(string url, string expected)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Post, url);
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(expected, content);
+        }
+
+        [Fact]
+        public async Task ApiController_SimpleParameter_FromQuery_DoesNotReadFormData()
+        {
+            // Arrange
+            var url = "http://localhost/api/Blog/Employees/PostByIdFromQuery";
+            var request = new HttpRequestMessage(HttpMethod.Post, url);
+            request.Content = new FormUrlEncodedContent(new Dictionary<string, string>()
+            {
+                { "id", "5" },
+            });
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("-1", content);
+        }
+
+        [Fact]
+        public async Task ApiController_ComplexParameter_Default_ReadsFromBody()
+        {
+            // Arrange
+            var url = "http://localhost/api/Blog/Employees/PutEmployeeDefault";
+            var request = new HttpRequestMessage(HttpMethod.Put, url);
+            request.Content = new StringContent(JsonConvert.SerializeObject(new
+            {
+                Id = 5,
+                Name = "Test Employee",
+            }));
+            request.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json");
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("{\"id\":5,\"name\":\"Test Employee\"}", content);
+        }
+
+        [Fact]
+        public async Task ApiController_ComplexParameter_ModelBinder_ReadsFormAndUrl()
+        {
+            // Arrange
+            var url = "http://localhost/api/Blog/Employees/PutEmployeeModelBinder/5";
+            var request = new HttpRequestMessage(HttpMethod.Put, url);
+            request.Content = new FormUrlEncodedContent(new Dictionary<string, string>()
+            {
+                { "name", "Test Employee" },
+            });
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("{\"id\":5,\"name\":\"Test Employee\"}", content);
+        }
+
+        // name is read from the url - and the rest from the body (formatters)
+        [Fact]
+        public async Task ApiController_TwoParameters_DefaultSources()
+        {
+            // Arrange
+            var url = "http://localhost/api/Blog/Employees/PutEmployeeBothDefault?name=Name_Override";
+            var request = new HttpRequestMessage(HttpMethod.Put, url);
+            request.Content = new StringContent(JsonConvert.SerializeObject(new
+            {
+                Id = 5,
+                Name = "Test Employee",
+            }));
+            request.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json");
+
+            // Act
+            var response = await Client.SendAsync(request);
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("{\"id\":5,\"name\":\"Name_Override\"}", content);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlDataContractSerializerFormattersWrappingTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlDataContractSerializerFormattersWrappingTest.cs
new file mode 100644
index 0000000000..5e6443a862
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlDataContractSerializerFormattersWrappingTest.cs
@@ -0,0 +1,212 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Formatters.Xml;
+using Microsoft.AspNetCore.Testing.xunit;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class XmlDataContractSerializerFormattersWrappingTest : IClassFixture<MvcTestFixture<XmlFormattersWebSite.Startup>>
+    {
+        public XmlDataContractSerializerFormattersWrappingTest(MvcTestFixture<XmlFormattersWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [ConditionalTheory]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        [InlineData("http://localhost/IEnumerable/ValueTypes")]
+        [InlineData("http://localhost/IQueryable/ValueTypes")]
+        public async Task CanWrite_ValueTypes(string url)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml-dcs"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            XmlAssert.Equal(
+                "<ArrayOfint xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+                " xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/Arrays\">" +
+                "<int>10</int><int>20</int></ArrayOfint>",
+                result);
+        }
+
+        [ConditionalTheory]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        [InlineData("http://localhost/IEnumerable/NonWrappedTypes")]
+        [InlineData("http://localhost/IQueryable/NonWrappedTypes")]
+        public async Task CanWrite_NonWrappedTypes(string url)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml-dcs"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            XmlAssert.Equal(
+                "<ArrayOfstring xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+                " xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/Arrays\">" +
+                "<string>value1</string><string>value2</string></ArrayOfstring>",
+                result);
+        }
+
+        [ConditionalTheory]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        [InlineData("http://localhost/IEnumerable/NonWrappedTypes_Empty")]
+        [InlineData("http://localhost/IQueryable/NonWrappedTypes_Empty")]
+        public async Task CanWrite_NonWrappedTypes_Empty(string url)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml-dcs"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            XmlAssert.Equal(
+                "<ArrayOfstring xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+                " xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/Arrays\" />",
+                result);
+        }
+
+        [ConditionalTheory]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        [InlineData("http://localhost/IEnumerable/NonWrappedTypes_NullInstance")]
+        [InlineData("http://localhost/IQueryable/NonWrappedTypes_NullInstance")]
+        public async Task CanWrite_NonWrappedTypes_NullInstance(string url)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml-dcs"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            XmlAssert.Equal(
+                "<ArrayOfstring i:nil=\"true\" xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+                " xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/Arrays\" />",
+                result);
+        }
+
+        [ConditionalTheory]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        [InlineData("http://localhost/IEnumerable/WrappedTypes")]
+        [InlineData("http://localhost/IQueryable/WrappedTypes")]
+        public async Task CanWrite_WrappedTypes(string url)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml-dcs"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            XmlAssert.Equal(
+                "<ArrayOfPersonWrapper xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+                " xmlns=\"http://schemas.datacontract.org/2004/07/XmlFormattersWebSite\"><PersonWrapper>" +
+                "<Age>35</Age><Id>10</Id><Name>Mike</Name></PersonWrapper><PersonWrapper><Age>35</Age><Id>" +
+                "11</Id><Name>Jimmy</Name></PersonWrapper></ArrayOfPersonWrapper>",
+                result);
+        }
+
+        [ConditionalTheory]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        [InlineData("http://localhost/IEnumerable/WrappedTypes_Empty")]
+        [InlineData("http://localhost/IQueryable/WrappedTypes_Empty")]
+        public async Task CanWrite_WrappedTypes_Empty(string url)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml-dcs"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            XmlAssert.Equal(
+                "<ArrayOfPersonWrapper xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+                " xmlns=\"http://schemas.datacontract.org/2004/07/XmlFormattersWebSite\" />",
+                result);
+        }
+
+        [ConditionalTheory]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        [InlineData("http://localhost/IEnumerable/WrappedTypes_NullInstance")]
+        [InlineData("http://localhost/IQueryable/WrappedTypes_NullInstance")]
+        public async Task CanWrite_WrappedTypes_NullInstance(string url)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml-dcs"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            XmlAssert.Equal(
+                "<ArrayOfPersonWrapper i:nil=\"true\" xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+                " xmlns=\"http://schemas.datacontract.org/2004/07/XmlFormattersWebSite\" />",
+                result);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task CanWrite_IEnumerableOf_SerializableErrors()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/IEnumerable/SerializableErrors");
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml-dcs"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            XmlAssert.Equal(
+                "<ArrayOfSerializableErrorWrapper xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+                " xmlns=\"http://schemas.datacontract.org/2004/07/Microsoft.AspNetCore.Mvc.Formatters.Xml\"><SerializableErrorWrapper>" +
+                "<key1>key1-error</key1><key2>key2-error</key2></SerializableErrorWrapper><SerializableErrorWrapper>" +
+                "<key3>key1-error</key3><key4>key2-error</key4></SerializableErrorWrapper>" +
+                "</ArrayOfSerializableErrorWrapper>",
+                result);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlDataContractSerializerInputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlDataContractSerializerInputFormatterTest.cs
new file mode 100644
index 0000000000..3b97473fdd
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlDataContractSerializerInputFormatterTest.cs
@@ -0,0 +1,115 @@
+// 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.
+
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+using XmlFormattersWebSite;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class XmlDataContractSerializerInputFormatterTest : IClassFixture<MvcTestFixture<Startup>>
+    {
+        private readonly string errorMessageFormat = string.Format(
+            "{{1}}:{0} does not recognize '{1}', so instead use '{2}' with '{3}' set to '{4}' for value " +
+            "type property '{{0}}' on type '{{1}}'.",
+            typeof(DataContractSerializer).FullName,
+            typeof(RequiredAttribute).FullName,
+            typeof(DataMemberAttribute).FullName,
+            nameof(DataMemberAttribute.IsRequired),
+            bool.TrueString);
+
+        public XmlDataContractSerializerInputFormatterTest(MvcTestFixture<Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task ThrowsOnInvalidInput_AndAddsToModelState()
+        {
+            // Arrange
+            var input = "Not a valid xml document";
+            var content = new StringContent(input, Encoding.UTF8, "application/xml-dcs");
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/Home/Index", content);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+            var data = await response.Content.ReadAsStringAsync();
+            Assert.Contains("An error occurred while deserializing input data.", data);
+        }
+
+        [Fact]
+        public async Task RequiredDataIsProvided_AndModelIsBound_NoValidationErrors()
+        {
+            // Arrange
+            var input = "<Store xmlns=\"http://schemas.datacontract.org/2004/07/XmlFormattersWebSite\" " +
+                "xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\"><Address><State>WA</State><Zipcode>" +
+                "98052</Zipcode></Address><Id>10</Id></Store>";
+            var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/Validation/CreateStore");
+            request.Content = new StringContent(input, Encoding.UTF8, "application/xml-dcs");
+            request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml-dcs"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var dcsSerializer = new DataContractSerializer(typeof(ModelBindingInfo));
+            var responseStream = await response.Content.ReadAsStreamAsync();
+            var modelBindingInfo = dcsSerializer.ReadObject(responseStream) as ModelBindingInfo;
+            Assert.NotNull(modelBindingInfo);
+            Assert.NotNull(modelBindingInfo.Store);
+            Assert.Equal(10, modelBindingInfo.Store.Id);
+            Assert.NotNull(modelBindingInfo.Store.Address);
+            Assert.Equal(98052, modelBindingInfo.Store.Address.Zipcode);
+            Assert.Equal("WA", modelBindingInfo.Store.Address.State);
+            Assert.Empty(modelBindingInfo.ModelStateErrorMessages);
+        }
+
+        // Verifies that the model state has errors related to body model validation.
+        [Fact]
+        public async Task DataMissingForRefereneceTypeProperties_AndModelIsBound_AndHasMixedValidationErrors()
+        {
+            // Arrange
+            var input = "<Store xmlns=\"http://schemas.datacontract.org/2004/07/XmlFormattersWebSite\"" +
+                " xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\">" +
+                "<Address i:nil=\"true\"/><Id>10</Id></Store>";
+            var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/Validation/CreateStore");
+            request.Content = new StringContent(input, Encoding.UTF8, "application/xml-dcs");
+            request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml-dcs"));
+
+            var expectedErrorMessages = new List<string>();
+            expectedErrorMessages.Add("Address:The Address field is required.");
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            var dcsSerializer = new DataContractSerializer(typeof(ModelBindingInfo));
+            var responseStream = await response.Content.ReadAsStreamAsync();
+            var modelBindingInfo = dcsSerializer.ReadObject(responseStream) as ModelBindingInfo;
+            Assert.NotNull(modelBindingInfo);
+            Assert.NotNull(modelBindingInfo.Store);
+            Assert.Equal(10, modelBindingInfo.Store.Id);
+            Assert.NotNull(modelBindingInfo.ModelStateErrorMessages);
+
+            Assert.Equal(expectedErrorMessages.Count(), modelBindingInfo.ModelStateErrorMessages.Count);
+            foreach (var expectedErrorMessage in expectedErrorMessages)
+            {
+                Assert.Contains(
+                    modelBindingInfo.ModelStateErrorMessages,
+                    (actualErrorMessage) => actualErrorMessage.Equals(expectedErrorMessage));
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlOutputFormatterTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlOutputFormatterTests.cs
new file mode 100644
index 0000000000..35e406ac6a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlOutputFormatterTests.cs
@@ -0,0 +1,233 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Formatters.Xml;
+using Microsoft.AspNetCore.Testing.xunit;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class XmlOutputFormatterTests : IClassFixture<MvcTestFixture<FormatterWebSite.Startup>>
+    {
+        public XmlOutputFormatterTests(MvcTestFixture<FormatterWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [ConditionalFact]
+        // Mono.Xml2.XmlTextReader.ReadText is unable to read the XML. This is fixed in mono 4.3.0.
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task XmlDataContractSerializerOutputFormatterIsCalled()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                HttpMethod.Post,
+                "http://localhost/Home/GetDummyClass?sampleInput=10");
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            XmlAssert.Equal(
+                "<DummyClass xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                "xmlns=\"http://schemas.datacontract.org/2004/07/FormatterWebSite\">" +
+                "<SampleInt>10</SampleInt></DummyClass>",
+                await response.Content.ReadAsStringAsync());
+        }
+
+        [Fact]
+        public async Task XmlSerializerOutputFormatterIsCalled()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                HttpMethod.Post,
+                "http://localhost/XmlSerializer/GetDummyClass?sampleInput=10");
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            XmlAssert.Equal(
+                "<DummyClass xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"><SampleInt>10</SampleInt></DummyClass>",
+                await response.Content.ReadAsStringAsync());
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/18
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task XmlSerializerFailsAndDataContractSerializerIsCalled()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                HttpMethod.Post,
+                "http://localhost/DataContractSerializer/GetPerson?name=HelloWorld");
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            XmlAssert.Equal(
+                "<Person xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                "xmlns=\"http://schemas.datacontract.org/2004/07/FormatterWebSite\">" +
+                "<Name>HelloWorld</Name></Person>",
+                await response.Content.ReadAsStringAsync());
+        }
+
+        [Fact]
+        public async Task XmlSerializerOutputFormatter_WhenDerivedClassIsReturned()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                HttpMethod.Post,
+                "http://localhost/XmlSerializer/GetDerivedDummyClass?sampleInput=10");
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            XmlAssert.Equal(
+                "<DummyClass xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xsi:type=\"DerivedDummyClass\">" +
+                "<SampleInt>10</SampleInt><SampleIntInDerived>50</SampleIntInDerived></DummyClass>",
+                await response.Content.ReadAsStringAsync());
+        }
+
+        [ConditionalFact]
+        // Mono.Xml2.XmlTextReader.ReadText is unable to read the XML. This is fixed in mono 4.3.0.
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task XmlDataContractSerializerOutputFormatter_WhenDerivedClassIsReturned()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                HttpMethod.Post,
+                "http://localhost/Home/GetDerivedDummyClass?sampleInput=10");
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            XmlAssert.Equal(
+                "<DummyClass xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                "i:type=\"DerivedDummyClass\" xmlns=\"http://schemas.datacontract.org/2004/07/FormatterWebSite\"" +
+                "><SampleInt>10</SampleInt><SampleIntInDerived>50</SampleIntInDerived></DummyClass>",
+                await response.Content.ReadAsStringAsync());
+        }
+
+        [Fact]
+        public async Task XmlSerializerFormatter_DoesNotWriteDictionaryObjects()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                HttpMethod.Post,
+                "http://localhost/XmlSerializer/GetDictionary");
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NotAcceptable, response.StatusCode);
+        }
+
+        // Xml-based formatters are sensitive to ObjectResult.DeclaredType of the result. A couple of
+        // tests to verify we don't regress these.
+        [Fact]
+        public async Task XmlSerializerFormatter_WorksForActionsReturningTaskOfDummyClass()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                HttpMethod.Post,
+                "http://localhost/XmlSerializer/GetTaskOfDummyClass");
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            XmlAssert.Equal(
+                "<DummyClass xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"><SampleInt>10</SampleInt></DummyClass>",
+                await response.Content.ReadAsStringAsync());
+        }
+
+        [Fact]
+        public async Task XmlSerializerFormatter_WorksForActionsReturningDummyClassAsTaskOfObject()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                HttpMethod.Post,
+                "http://localhost/XmlSerializer/GetTaskOfDummyClassAsObject");
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            XmlAssert.Equal(
+                "<DummyClass xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"><SampleInt>10</SampleInt></DummyClass>",
+                await response.Content.ReadAsStringAsync());
+        }
+
+        [Fact]
+        public async Task XmlSerializerOutputFormatter_WorksForActionsReturningTaskOfPerson()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                HttpMethod.Post,
+                "http://localhost/DataContractSerializer/GetTaskOfPerson?name=HelloWorld");
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            XmlAssert.Equal(
+                "<Person xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                "xmlns=\"http://schemas.datacontract.org/2004/07/FormatterWebSite\">" +
+                "<Name>HelloWorld</Name></Person>",
+                await response.Content.ReadAsStringAsync());
+        }
+
+        [Fact]
+        public async Task XmlSerializerOutputFormatter_WorksForActionsReturningPersonAsTaskOfObject()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(
+                HttpMethod.Post,
+                "http://localhost/DataContractSerializer/GetTaskOfPersonAsObject?name=HelloWorld");
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            XmlAssert.Equal(
+                "<Person xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                "xmlns=\"http://schemas.datacontract.org/2004/07/FormatterWebSite\">" +
+                "<Name>HelloWorld</Name></Person>",
+                await response.Content.ReadAsStringAsync());
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs
new file mode 100644
index 0000000000..2b8ddd9a06
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs
@@ -0,0 +1,187 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Formatters.Xml;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class XmlSerializerFormattersWrappingTest : IClassFixture<MvcTestFixture<XmlFormattersWebSite.Startup>>
+    {
+        public XmlSerializerFormattersWrappingTest(MvcTestFixture<XmlFormattersWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Theory]
+        [InlineData("http://localhost/IEnumerable/ValueTypes")]
+        [InlineData("http://localhost/IQueryable/ValueTypes")]
+        public async Task CanWrite_ValueTypes(string url)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml-xmlser"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            XmlAssert.Equal("<ArrayOfInt xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                         "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"><int>10</int>" +
+                         "<int>20</int></ArrayOfInt>",
+                         result);
+        }
+
+        [Theory]
+        [InlineData("http://localhost/IEnumerable/NonWrappedTypes")]
+        [InlineData("http://localhost/IQueryable/NonWrappedTypes")]
+        public async Task CanWrite_NonWrappedTypes(string url)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml-xmlser"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            XmlAssert.Equal("<ArrayOfString xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                         "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"><string>value1</string>" +
+                         "<string>value2</string></ArrayOfString>",
+                         result);
+        }
+
+        [Theory]
+        [InlineData("http://localhost/IEnumerable/NonWrappedTypes_NullInstance")]
+        [InlineData("http://localhost/IQueryable/NonWrappedTypes_NullInstance")]
+        public async Task CanWrite_NonWrappedTypes_NullInstance(string url)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml-xmlser"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            XmlAssert.Equal("<ArrayOfString xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+                " xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xsi:nil=\"true\" />",
+                result);
+        }
+
+        [Theory]
+        [InlineData("http://localhost/IEnumerable/NonWrappedTypes_Empty")]
+        [InlineData("http://localhost/IQueryable/NonWrappedTypes_Empty")]
+        public async Task CanWrite_NonWrappedTypes_Empty(string url)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml-xmlser"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            XmlAssert.Equal("<ArrayOfString xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+                " xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" />",
+                result);
+        }
+
+        [Theory]
+        [InlineData("http://localhost/IEnumerable/WrappedTypes")]
+        [InlineData("http://localhost/IQueryable/WrappedTypes")]
+        public async Task CanWrite_WrappedTypes(string url)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml-xmlser"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            XmlAssert.Equal("<ArrayOfPersonWrapper xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+                         "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"><PersonWrapper><Id>10</Id>" +
+                         "<Name>Mike</Name><Age>35</Age></PersonWrapper><PersonWrapper><Id>11</Id>" +
+                         "<Name>Jimmy</Name><Age>35</Age></PersonWrapper></ArrayOfPersonWrapper>",
+                         result);
+        }
+
+        [Theory]
+        [InlineData("http://localhost/IEnumerable/WrappedTypes_Empty")]
+        [InlineData("http://localhost/IQueryable/WrappedTypes_Empty")]
+        public async Task CanWrite_WrappedTypes_Empty(string url)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml-xmlser"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            XmlAssert.Equal("<ArrayOfPersonWrapper xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+                " xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" />",
+                result);
+        }
+
+
+        [Theory]
+        [InlineData("http://localhost/IEnumerable/WrappedTypes_NullInstance")]
+        [InlineData("http://localhost/IQueryable/WrappedTypes_NullInstance")]
+        public async Task CanWrite_WrappedTypes_NullInstance(string url)
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, url);
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml-xmlser"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            XmlAssert.Equal("<ArrayOfPersonWrapper xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+                " xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xsi:nil=\"true\" />",
+                result);
+        }
+
+        [Fact]
+        public async Task CanWrite_IEnumerableOf_SerializableErrors()
+        {
+            // Arrange
+            var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/IEnumerable/SerializableErrors");
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml-xmlser"));
+
+            // Act
+            var response = await Client.SendAsync(request);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            var result = await response.Content.ReadAsStringAsync();
+            XmlAssert.Equal("<ArrayOfSerializableErrorWrapper xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+                " xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"><SerializableErrorWrapper><key1>key1-error</key1>" +
+                "<key2>key2-error</key2></SerializableErrorWrapper><SerializableErrorWrapper><key3>key1-error</key3>" +
+                "<key4>key2-error</key4></SerializableErrorWrapper></ArrayOfSerializableErrorWrapper>",
+                result);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlSerializerInputFormatterTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlSerializerInputFormatterTests.cs
new file mode 100644
index 0000000000..2f9cb57cba
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlSerializerInputFormatterTests.cs
@@ -0,0 +1,58 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Testing.xunit;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+    public class XmlSerializerInputFormatterTests : IClassFixture<MvcTestFixture<XmlFormattersWebSite.Startup>>
+    {
+        public XmlSerializerInputFormatterTests(MvcTestFixture<XmlFormattersWebSite.Startup> fixture)
+        {
+            Client = fixture.CreateDefaultClient();
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task CheckIfXmlSerializerInputFormatterIsCalled()
+        {
+            // Arrange
+            var sampleInputInt = 10;
+            var input = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+                "<DummyClass><SampleInt>"
+                + sampleInputInt.ToString() + "</SampleInt></DummyClass>";
+            var content = new StringContent(input, Encoding.UTF8, "application/xml-xmlser");
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/Home/Index", content);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(sampleInputInt.ToString(), await response.Content.ReadAsStringAsync());
+        }
+
+        [ConditionalFact]
+        // Mono.Xml2.XmlTextReader.ReadText is unable to read the XML. This is fixed in mono 4.3.0.
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task ThrowsOnInvalidInput_AndAddsToModelState()
+        {
+            // Arrange
+            var input = "Not a valid xml document";
+            var content = new StringContent(input, Encoding.UTF8, "application/xml-xmlser");
+
+            // Act
+            var response = await Client.PostAsync("http://localhost/Home/Index", content);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+            var data = await response.Content.ReadAsStringAsync();
+            Assert.Contains("An error occurred while deserializing input data.", data);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Area1.RemoteAttribute_Home.Create.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Area1.RemoteAttribute_Home.Create.html
new file mode 100644
index 0000000000..1759bc1d2a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Area1.RemoteAttribute_Home.Create.html
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Create in Area1 area. - My ASP.NET Application</title>
+</head>
+<body>
+    <div>
+        <div>
+            <div>
+                <a href="/RemoteAttribute_Home/Details">Basic web site</a>
+            </div>
+
+            <div>
+                <ul>
+                    <li><a href="/RemoteAttribute_Home/Details">Home</a></li>
+                    <li><a href="/Area1/RemoteAttribute_Home/Details">Area1 Home</a></li>
+                </ul>
+            </div>
+        </div>
+    </div>
+
+    <div>
+        
+<h2>Create in Area1 area.</h2>
+<form action="/Area1/RemoteAttribute_Home/Create" method="post">    <div class="form-horizontal">
+        <h4>Person</h4>
+        <hr />
+        
+
+        <div class="form-group">
+            <label class="control-label col-md-2" for="Id">Id</label>
+            <div class="col-md-10">
+                <input class="form-control text-box single-line" data-val="true" data-val-required="The Id field is required." id="Id" name="Id" type="number" value="" />
+                <span class="field-validation-valid text-danger" data-valmsg-for="Id" data-valmsg-replace="true"></span>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="control-label col-md-2" for="UserId1">UserId1</label>
+            <div class="col-md-10">
+                <input class="form-control text-box single-line" data-val="true" data-val-remote="&#x27;UserId1&#x27; is invalid." data-val-remote-additionalfields="*.UserId1" data-val-remote-url="/Area1/RemoteAttribute_Verify/IsIdAvailable" data-val-required="UserId1 is required" id="UserId1" name="UserId1" type="text" value="" />
+                <span class="field-validation-valid text-danger" data-valmsg-for="UserId1" data-valmsg-replace="true"></span>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="control-label col-md-2" for="UserId2">UserId2</label>
+            <div class="col-md-10">
+                <input class="form-control text-box single-line" data-val="true" data-val-remote="&#x27;UserId2&#x27; is invalid." data-val-remote-additionalfields="*.UserId2" data-val-remote-type="Post" data-val-remote-url="/RemoteAttribute_Verify/IsIdAvailable" data-val-required="UserId2 is required" id="UserId2" name="UserId2" type="text" value="" />
+                <span class="field-validation-valid text-danger" data-valmsg-for="UserId2" data-valmsg-replace="true"></span>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="control-label col-md-2" for="UserId3">UserId3</label>
+            <div class="col-md-10">
+                <input class="form-control text-box single-line" data-val="true" data-val-remote="/Area1/RemoteAttribute_Verify/IsIdAvailable rejects you." data-val-remote-additionalfields="*.UserId3" data-val-remote-url="/Area1/RemoteAttribute_Verify/IsIdAvailable" data-val-required="UserId3 is required" id="UserId3" name="UserId3" type="text" value="" />
+                <span class="field-validation-valid text-danger" data-valmsg-for="UserId3" data-valmsg-replace="true"></span>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="control-label col-md-2" for="UserId4">UserId4</label>
+            <div class="col-md-10">
+                <input class="form-control text-box single-line" data-val="true" data-val-remote="&#x27;UserId4&#x27; is invalid." data-val-remote-additionalfields="*.UserId4,*.UserId1,*.UserId2,*.UserId3" data-val-remote-url="/Area2/RemoteAttribute_Verify/IsIdAvailable" data-val-required="UserId4 is required" id="UserId4" name="UserId4" type="text" value="" />
+                <span class="field-validation-valid text-danger" data-valmsg-for="UserId4" data-valmsg-replace="true"></span>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="control-label col-md-2" for="UserId5">UserId5</label>
+            <div class="col-md-10">
+                <input class="form-control text-box single-line" data-val="true" data-val-remote="&#x27;UserId5&#x27; is invalid." data-val-remote-additionalfields="*.UserId5" data-val-remote-type="Post" data-val-remote-url="/RemoteAttribute_Verify/IsIdAvailable" data-val-required="UserId5 is required" id="UserId5" name="UserId5" type="text" value="" />
+                <span class="field-validation-valid text-danger" data-valmsg-for="UserId5" data-valmsg-replace="true"></span>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-md-offset-2 col-md-10">
+                <input type="submit" value="Create" class="btn btn-default" />
+            </div>
+        </div>
+    </div>
+</form>
+<div>
+    <a href="/Area1/RemoteAttribute_Home/Details">Go back to home</a>
+</div>
+
+
+    </div>
+
+    <script src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-2.1.4.min.js"></script>
+    
+    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.14.0/jquery.validate.min.js"></script>
+    <script src="/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ActionLinkView.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ActionLinkView.html
new file mode 100644
index 0000000000..3750dfeabf
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ActionLinkView.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<html>
+<head>
+    <title>Action Link with non unicode host</title>
+</head>
+<body>
+    <a href="http://ping&#xFC;ino/Home/ActionLinkView">Ping&#xFC;ino</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.CSharp7View.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.CSharp7View.html
new file mode 100644
index 0000000000..a2a29ca6c5
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.CSharp7View.html
@@ -0,0 +1,19 @@
+
+        <p>
+            <strong>John Doe's</strong> favorite number is
+
+            <em>
+(double) 6.02214085774747E&#x2B;23            </em>
+        </p>
+        <p>
+            <strong>John Smith's</strong> favorite number is
+
+            <em>
+(long) 100000000000            </em>
+        </p>
+        <p>
+            <strong>Someone Nice's</strong> favorite number is
+
+            <em>
+(decimal) 1.6180339887498948482045868344            </em>
+        </p>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.Index.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.Index.html
new file mode 100644
index 0000000000..90373040b9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.Index.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Home Page - My ASP.NET Application</title>
+
+</head>
+<body>
+    <div>
+        <div>
+            <div>
+                <a href="/">BasicWebApplication</a>
+            </div>
+            <div>
+                <ul>
+                    <li><a href="/">Home</a></li>
+                </ul>
+            </div>
+        </div>
+    </div>
+    <div>
+        
+<div>
+    <h1>ASP.NET vNext</h1>
+</div>
+        <hr />
+        <footer>
+            <p>&copy; 2014 - My ASP.NET Application</p>
+        </footer>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.PlainView.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.PlainView.html
new file mode 100644
index 0000000000..0ad61a0b3f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.PlainView.html
@@ -0,0 +1 @@
+Plain View
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ViewWithPrefixedAttributeValue.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ViewWithPrefixedAttributeValue.html
new file mode 100644
index 0000000000..3a64dd78a4
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ViewWithPrefixedAttributeValue.html
@@ -0,0 +1,4 @@
+
+<span foo="   abc" />
+<span bar="   Baz" />
+<span baz="   Baz   Baz" />
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.PassThrough.Index.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.PassThrough.Index.html
new file mode 100644
index 0000000000..6cec33b91a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.PassThrough.Index.html
@@ -0,0 +1 @@
+<p>The passed through value was: 123</p>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Root.RemoteAttribute_Home.Create.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Root.RemoteAttribute_Home.Create.html
new file mode 100644
index 0000000000..38b5724974
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Root.RemoteAttribute_Home.Create.html
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Create in root area. - My ASP.NET Application</title>
+</head>
+<body>
+    <div>
+        <div>
+            <div>
+                <a href="/RemoteAttribute_Home/Details">Basic web site</a>
+            </div>
+
+            <div>
+                <ul>
+                    <li><a href="/RemoteAttribute_Home/Details">Home</a></li>
+                    <li><a href="/Area1/RemoteAttribute_Home/Details">Area1 Home</a></li>
+                </ul>
+            </div>
+        </div>
+    </div>
+
+    <div>
+        
+<h2>Create in root area.</h2>
+<form action="/RemoteAttribute_Home/Create" method="post">    <div class="form-horizontal">
+        <h4>Person</h4>
+        <hr />
+        
+
+        <div class="form-group">
+            <label class="control-label col-md-2" for="Id">Id</label>
+            <div class="col-md-10">
+                <input class="form-control text-box single-line" data-val="true" data-val-required="The Id field is required." id="Id" name="Id" type="number" value="" />
+                <span class="field-validation-valid text-danger" data-valmsg-for="Id" data-valmsg-replace="true"></span>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="control-label col-md-2" for="UserId1">UserId1</label>
+            <div class="col-md-10">
+                <input class="form-control text-box single-line" data-val="true" data-val-remote="&#x27;UserId1&#x27; is invalid." data-val-remote-additionalfields="*.UserId1" data-val-remote-url="/RemoteAttribute_Verify/IsIdAvailable" data-val-required="UserId1 is required" id="UserId1" name="UserId1" type="text" value="" />
+                <span class="field-validation-valid text-danger" data-valmsg-for="UserId1" data-valmsg-replace="true"></span>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="control-label col-md-2" for="UserId2">UserId2</label>
+            <div class="col-md-10">
+                <input class="form-control text-box single-line" data-val="true" data-val-remote="&#x27;UserId2&#x27; is invalid." data-val-remote-additionalfields="*.UserId2" data-val-remote-type="Post" data-val-remote-url="/RemoteAttribute_Verify/IsIdAvailable" data-val-required="UserId2 is required" id="UserId2" name="UserId2" type="text" value="" />
+                <span class="field-validation-valid text-danger" data-valmsg-for="UserId2" data-valmsg-replace="true"></span>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="control-label col-md-2" for="UserId3">UserId3</label>
+            <div class="col-md-10">
+                <input class="form-control text-box single-line" data-val="true" data-val-remote="/Area1/RemoteAttribute_Verify/IsIdAvailable rejects you." data-val-remote-additionalfields="*.UserId3" data-val-remote-url="/Area1/RemoteAttribute_Verify/IsIdAvailable" data-val-required="UserId3 is required" id="UserId3" name="UserId3" type="text" value="" />
+                <span class="field-validation-valid text-danger" data-valmsg-for="UserId3" data-valmsg-replace="true"></span>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="control-label col-md-2" for="UserId4">UserId4</label>
+            <div class="col-md-10">
+                <input class="form-control text-box single-line" data-val="true" data-val-remote="&#x27;UserId4&#x27; is invalid." data-val-remote-additionalfields="*.UserId4,*.UserId1,*.UserId2,*.UserId3" data-val-remote-url="/Area2/RemoteAttribute_Verify/IsIdAvailable" data-val-required="UserId4 is required" id="UserId4" name="UserId4" type="text" value="" />
+                <span class="field-validation-valid text-danger" data-valmsg-for="UserId4" data-valmsg-replace="true"></span>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="control-label col-md-2" for="UserId5">UserId5</label>
+            <div class="col-md-10">
+                <input class="form-control text-box single-line" data-val="true" data-val-remote="&#x27;UserId5&#x27; is invalid." data-val-remote-additionalfields="*.UserId5" data-val-remote-type="Post" data-val-remote-url="/RemoteAttribute_Verify/IsIdAvailable" data-val-required="UserId5 is required" id="UserId5" name="UserId5" type="text" value="" />
+                <span class="field-validation-valid text-danger" data-valmsg-for="UserId5" data-valmsg-replace="true"></span>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-md-offset-2 col-md-10">
+                <input type="submit" value="Create" class="btn btn-default" />
+            </div>
+        </div>
+    </div>
+</form>
+<div>
+    <a href="/RemoteAttribute_Home/Details">Go back to home</a>
+</div>
+
+
+    </div>
+
+    <script src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-2.1.4.min.js"></script>
+    
+    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.14.0/jquery.validate.min.js"></script>
+    <script src="/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert1.txt b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert1.txt
new file mode 100644
index 0000000000..02138e2a5d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert1.txt
@@ -0,0 +1,15 @@
+<h2>Category: Laptops</h2>
+<h2>Region: North</h2>
+
+    <h2>Cached content</h2>
+    Locations closest to your locale:
+
+NorthWest Store
+<div>CorrelationId in View Component: 1</div>
+
+    <partial-title>Listing items</partial-title>
+
+Cached Content for Laptops
+<div>CorrelationId in Partial: 1</div>
+
+    <div>CorrelationId in Splash: 1</div>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert2.txt b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert2.txt
new file mode 100644
index 0000000000..ac40c7f759
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert2.txt
@@ -0,0 +1,15 @@
+<h2>Category: Phones</h2>
+<h2>Region: North</h2>
+
+    <h2>Cached content</h2>
+    Locations closest to your locale:
+
+NorthWest Store
+<div>CorrelationId in View Component: 1</div>
+
+    <partial-title>Listing items</partial-title>
+
+Cached Content for Phones
+<div>CorrelationId in Partial: 2</div>
+
+    <div>CorrelationId in Splash: 2</div>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert3.txt b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert3.txt
new file mode 100644
index 0000000000..eb4317226b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert3.txt
@@ -0,0 +1,15 @@
+<h2>Category: Phones</h2>
+<h2>Region: East</h2>
+
+    <h2>Cached content</h2>
+    Locations closest to your locale:
+
+Nationwide Store
+<div>CorrelationId in View Component: 3</div>
+
+    <partial-title>Listing items</partial-title>
+
+Cached Content for Phones
+<div>CorrelationId in Partial: 2</div>
+
+    <div>CorrelationId in Splash: 3</div>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.AtViewModel.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.AtViewModel.html
new file mode 100644
index 0000000000..21f738a390
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.AtViewModel.html
@@ -0,0 +1,54 @@
+<div class="row">
+    <h4>At Model index</h4>
+    <div class="col-md-3">MetadataKind: 'Type'</div>
+    <div class="col-md-3">ModelType: 'SuperViewModel'</div>
+</div>
+
+<div class="row">
+    
+<h5>Template for ViewModel</h5>
+<div class="col-md-3">MetadataKind: 'Type'</div>
+<div class="col-md-3">ModelType: 'SuperViewModel'</div>
+
+</div>
+<div class="row">
+    
+<h5>Partial for ViewModel</h5>
+<div class="col-md-3">MetadataKind: 'Type'</div>
+<div class="col-md-3">ModelType: 'SuperViewModel'</div>
+
+</div>
+<div class="row">
+    <h5>Check View Data view component</h5>
+<div class="col-md-3">MetadataKind: 'Type'</div>
+<div class="col-md-3">ModelType: 'SuperViewModel'</div>
+
+<h5>Check View Data view component's view</h5>
+<div class="col-md-3">MetadataKind: 'Type'</div>
+<div class="col-md-3">ModelType: 'SuperViewModel'</div>
+
+</div>
+<div class="row">
+    
+<h5>Template for Int32</h5>
+<div class="col-md-3">MetadataKind: 'Property'</div>
+<div class="col-md-3">ModelType: 'Int32'</div>
+    <div class="col-md-3">PropertyName: 'Integer'</div>
+
+</div>
+<div class="row">
+    
+<h5>Template for Int64</h5>
+<div class="col-md-3">MetadataKind: 'Property'</div>
+<div class="col-md-3">ModelType: 'Nullable`1'</div>
+    <div class="col-md-3">PropertyName: 'NullableLong'</div>
+
+</div>
+<div class="row">
+    
+<h5>Template for TemplateModel</h5>
+<div class="col-md-3">MetadataKind: 'Property'</div>
+<div class="col-md-3">ModelType: 'TemplateModel'</div>
+    <div class="col-md-3">PropertyName: 'Template'</div>
+
+</div>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.NullViewModel.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.NullViewModel.html
new file mode 100644
index 0000000000..73bcf08e7f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.NullViewModel.html
@@ -0,0 +1,54 @@
+<div class="row">
+    <h4>At Model index</h4>
+    <div class="col-md-3">MetadataKind: 'Type'</div>
+    <div class="col-md-3">ModelType: 'ViewModel'</div>
+</div>
+
+<div class="row">
+    
+<h5>Template for ViewModel</h5>
+<div class="col-md-3">MetadataKind: 'Type'</div>
+<div class="col-md-3">ModelType: 'ViewModel'</div>
+
+</div>
+<div class="row">
+    
+<h5>Partial for ViewModel</h5>
+<div class="col-md-3">MetadataKind: 'Type'</div>
+<div class="col-md-3">ModelType: 'ViewModel'</div>
+
+</div>
+<div class="row">
+    <h5>Check View Data view component</h5>
+<div class="col-md-3">MetadataKind: 'Type'</div>
+<div class="col-md-3">ModelType: 'ViewModel'</div>
+
+<h5>Check View Data view component's view</h5>
+<div class="col-md-3">MetadataKind: 'Type'</div>
+<div class="col-md-3">ModelType: 'ViewModel'</div>
+
+</div>
+<div class="row">
+    
+<h5>Template for Int32</h5>
+<div class="col-md-3">MetadataKind: 'Property'</div>
+<div class="col-md-3">ModelType: 'Int32'</div>
+    <div class="col-md-3">PropertyName: 'Integer'</div>
+
+</div>
+<div class="row">
+    
+<h5>Template for Int64</h5>
+<div class="col-md-3">MetadataKind: 'Property'</div>
+<div class="col-md-3">ModelType: 'Nullable`1'</div>
+    <div class="col-md-3">PropertyName: 'NullableLong'</div>
+
+</div>
+<div class="row">
+    
+<h5>Template for TemplateModel</h5>
+<div class="col-md-3">MetadataKind: 'Property'</div>
+<div class="col-md-3">ModelType: 'TemplateModel'</div>
+    <div class="col-md-3">PropertyName: 'Template'</div>
+
+</div>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.ViewModel.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.ViewModel.html
new file mode 100644
index 0000000000..4e44113222
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.ViewModel.html
@@ -0,0 +1,93 @@
+<div class="row">
+    <h4>View Model index</h4>
+    <div class="col-md-3">MetadataKind: 'Type'</div>
+    <div class="col-md-3">ModelType: 'SuperViewModel'</div>
+</div>
+
+<div class="row">
+    
+
+<h5>Template / partial for ... - LackModel</h5>
+<div class="col-md-3">MetadataKind: 'Type'</div>
+<div class="col-md-3">ModelType: 'SuperViewModel'</div>
+
+</div>
+<div class="row">
+    
+
+<h5>Template / partial for ... - LackModel</h5>
+<div class="col-md-3">MetadataKind: 'Type'</div>
+<div class="col-md-3">ModelType: 'SuperViewModel'</div>
+
+</div>
+<div class="row">
+    <h5>Check View Data - LackModel view component</h5>
+<div class="col-md-3">MetadataKind: 'Type'</div>
+<div class="col-md-3">ModelType: 'SuperViewModel'</div>
+<h5>Check View Data - LackModel view component after setting Model to 78.9</h5>
+<div class="col-md-3">MetadataKind: 'Type'</div>
+<div class="col-md-3">ModelType: 'Double'</div>
+
+
+<h5>Check View Data - LackModel view component's view</h5>
+<div class="col-md-3">MetadataKind: 'Type'</div>
+<div class="col-md-3">ModelType: 'SuperTemplateModel'</div>
+
+</div>
+<div class="row">
+    
+
+<h5>Template for Int32 - LackModel</h5>
+<div class="col-md-3">MetadataKind: 'Property'</div>
+<div class="col-md-3">ModelType: 'Int32'</div>
+    <div class="col-md-3">PropertyName: 'Integer'</div>
+
+
+<h5>Template for Int32 - LackModel after setting Model to 78.9</h5>
+<div class="col-md-3">MetadataKind: 'Type'</div>
+<div class="col-md-3">ModelType: 'Double'</div>
+
+</div>
+<div class="row">
+    
+
+<h5>Template for Int64</h5>
+<div class="col-md-3">MetadataKind: 'Property'</div>
+<div class="col-md-3">ModelType: 'Nullable`1'</div>
+    <div class="col-md-3">PropertyName: 'NullableLong'</div>
+
+<div class="row">
+    
+
+<h5>Template / partial for ... - LackModel</h5>
+<div class="col-md-3">MetadataKind: 'Property'</div>
+<div class="col-md-3">ModelType: 'Nullable`1'</div>
+    <div class="col-md-3">PropertyName: 'NullableLong'</div>
+
+</div>
+<div class="row">
+    <h5>Check View Data - LackModel view component</h5>
+<div class="col-md-3">MetadataKind: 'Property'</div>
+<div class="col-md-3">ModelType: 'Nullable`1'</div>
+<div class="col-md-3">PropertyName: 'NullableLong'</div>
+<h5>Check View Data - LackModel view component after setting Model to 78.9</h5>
+<div class="col-md-3">MetadataKind: 'Type'</div>
+<div class="col-md-3">ModelType: 'Double'</div>
+
+
+<h5>Check View Data - LackModel view component's view</h5>
+<div class="col-md-3">MetadataKind: 'Type'</div>
+<div class="col-md-3">ModelType: 'SuperTemplateModel'</div>
+
+</div>
+
+</div>
+<div class="row">
+    
+
+<h5>Template / partial for ... - LackModel</h5>
+<div class="col-md-3">MetadataKind: 'Property'</div>
+<div class="col-md-3">ModelType: 'TemplateModel'</div>
+    <div class="col-md-3">PropertyName: 'Template'</div>
+
+</div>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Customer.Index.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Customer.Index.html
new file mode 100644
index 0000000000..a61f895061
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Customer.Index.html
@@ -0,0 +1,40 @@
+<html>
+<body>
+    <form action="/Customer/HtmlGeneration_Customer" method="post">
+        <div>
+            <label class="order" for="Number">Number</label>
+            <input type="number" class="form-control input-validation-error" data-val="true" data-val-range="The field Number must be between 1 and 100." data-val-range-max="100" data-val-range-min="1" data-val-required="The Number field is required." id="Number" name="Number" value="" />
+            <span class="field-validation-error" data-valmsg-for="Number" data-valmsg-replace="true">The value &#x27;&#x27; is invalid.</span>
+        </div>
+        <div>
+            <label class="order" for="Name">Name</label>
+            <input type="text" id="Name" name="Name" value="" />
+        </div>
+        <div>
+            <label class="order" for="Email">Email</label>
+            <input type="email" id="Email" name="Email" value="" />
+            <span class="field-validation-valid" data-valmsg-for="Email" data-valmsg-replace="true"></span>
+        </div>
+        <div>
+            <label class="order" for="PhoneNumber">PhoneNumber</label>
+            <input type="tel" id="PhoneNumber" name="PhoneNumber" value="" />
+        </div>
+        <div>
+            <label class="order" for="Password">Password</label>
+            <input type="password" class="form-control input-validation-error" data-val="true" data-val-required="The Password field is required." id="Password" name="Password" />
+            <span class="field-validation-error" data-valmsg-for="Password" data-valmsg-replace="true">The Password field is required.</span>
+        </div>
+        <div>
+            <label class="order" for="Gender">Gender</label>
+            <input type="radio" value="Male" data-val="true" data-val-required="The Gender field is required." id="Gender" name="Gender" /> Male
+            <input type="radio" value="Female" id="Gender" name="Gender" /> Female
+            <span class="field-validation-valid" data-valmsg-for="Gender" data-valmsg-replace="true"></span>
+        </div>
+        <div class="order validation-summary-errors" data-valmsg-summary="true"><ul><li>The value &#x27;&#x27; is invalid.</li>
+<li>The Password field is required.</li>
+</ul></div>
+        
+        <input type="submit"/>
+    <input name="__RequestVerificationToken" type="hidden" value="{0}" /></form>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.Encoded.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.Encoded.html
new file mode 100644
index 0000000000..db26d46264
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.Encoded.html
@@ -0,0 +1,14 @@
+<input checked="HtmlEncode[[checked]]" />
+<input checked="HtmlEncode[[checked]]" />
+<input />
+<input />
+<input checked="  HtmlEncode[[True]]    " />
+<input checked="  HtmlEncode[[False]]    " />
+<input checked="    HtmlEncode[[value]]: HtmlEncode[[True]]   " />
+<input checked="    value: HtmlEncode[[False]]   " />
+<input checked="HtmlEncode[[True]] HtmlEncode[[True]]" />
+<input checked="   HtmlEncode[[False]]  HtmlEncode[[True]]" />
+<input />
+<input checked="" />
+<input checked="   " />
+<input checked=" HtmlEncode[[value]] HtmlEncode[[True]]" />
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.html
new file mode 100644
index 0000000000..4cdd10a012
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.html
@@ -0,0 +1,14 @@
+<input checked="checked" />
+<input checked="checked" />
+<input />
+<input />
+<input checked="  True    " />
+<input checked="  False    " />
+<input checked="    value: True   " />
+<input checked="    value: False   " />
+<input checked="True True" />
+<input checked="   False  True" />
+<input />
+<input checked="" />
+<input checked="   " />
+<input checked=" value True" />
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.CreateWarehouse.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.CreateWarehouse.html
new file mode 100644
index 0000000000..aab845064b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.CreateWarehouse.html
@@ -0,0 +1,20 @@
+<html>
+<body>
+<form action="/HtmlGeneration_Home/CreateWarehouse" method="post">        <div>
+            <label class="warehouse" for="City">City</label>
+            <input type="text" size="50" data-val="true" data-val-minlength="The field City must be a string or array type with a minimum length of &#x27;2&#x27;." data-val-minlength-min="2" id="City" name="City" value="" />
+            <span class="field-validation-valid" data-valmsg-for="City" data-valmsg-replace="true"></span>
+        </div>
+        <div>
+            <label class="warehouse" for="Product">Product</label>
+            <select data-val="true" data-val-range="The field Product must be between 1 and 100." data-val-range-max="100" data-val-range-min="1" data-val-required="The Product field is required." id="Product" name="Product"><option value="0">Product_0</option>
+<option value="1">Product_1</option>
+<option value="2">Product_2</option>
+</select>
+            <span class="field-validation-valid" data-valmsg-for="Product" data-valmsg-replace="true"></span>
+        </div>
+        <div class="warehouse validation-summary-valid" data-valmsg-summary="true"><ul><li style="display:none"></li>
+</ul></div>
+        <input type="submit" />
+<input name="__RequestVerificationToken" type="hidden" value="{0}" /></form></body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Customer.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Customer.html
new file mode 100644
index 0000000000..ec748e6ea5
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Customer.html
@@ -0,0 +1,39 @@
+<html>
+<body>
+    <form action="/Customer/HtmlGeneration_Customer" method="post">
+        <div>
+            <label class="order" for="Number">Number</label>
+            <input type="number" class="form-control" data-val="true" data-val-range="The field Number must be between 1 and 100." data-val-range-max="100" data-val-range-min="1" data-val-required="The Number field is required." id="Number" name="Number" value="" />
+            <span class="field-validation-valid" data-valmsg-for="Number" data-valmsg-replace="true"></span>
+        </div>
+        <div>
+            <label class="order" for="Name">Name</label>
+            <input type="text" id="Name" name="Name" value="" />
+        </div>
+        <div>
+            <label class="order" for="Email">Email</label>
+            <input type="email" id="Email" name="Email" value="" />
+            <span class="field-validation-valid" data-valmsg-for="Email" data-valmsg-replace="true"></span>
+        </div>
+        <div>
+            <label class="order" for="PhoneNumber">PhoneNumber</label>
+            <input type="tel" id="PhoneNumber" name="PhoneNumber" value="" />
+        </div>
+        <div>
+            <label class="order" for="Password">Password</label>
+            <input type="password" class="form-control" data-val="true" data-val-required="The Password field is required." id="Password" name="Password" />
+            <span class="field-validation-valid" data-valmsg-for="Password" data-valmsg-replace="true"></span>
+        </div>
+        <div>
+            <label class="order" for="Gender">Gender</label>
+            <input type="radio" value="Male" data-val="true" data-val-required="The Gender field is required." id="Gender" name="Gender" /> Male
+            <input type="radio" value="Female" id="Gender" name="Gender" /> Female
+            <span class="field-validation-valid" data-valmsg-for="Gender" data-valmsg-replace="true"></span>
+        </div>
+        <div class="order validation-summary-valid" data-valmsg-summary="true"><ul><li style="display:none"></li>
+</ul></div>
+        
+        <input type="submit"/>
+    <input name="__RequestVerificationToken" type="hidden" value="{0}" /></form>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.Encoded.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.Encoded.html
new file mode 100644
index 0000000000..737e085e83
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.Encoded.html
@@ -0,0 +1,43 @@
+<html>
+<body>
+    <form action="HtmlEncode[[/HtmlGeneration_Home/EditWarehouse]]" method="HtmlEncode[[post]]">
+        <div>
+            HtmlEncode[[City_1]]
+            <input type="HtmlEncode[[text]]" data-val="HtmlEncode[[true]]" data-val-minlength="HtmlEncode[[The field City must be a string or array type with a minimum length of '2'.]]" data-val-minlength-min="HtmlEncode[[2]]" id="HtmlEncode[[City]]" name="HtmlEncode[[City]]" value="HtmlEncode[[City_1]]" />
+        </div>
+        <div>
+            <label>HtmlEncode[[Address]]</label>
+            <textarea id="HtmlEncode[[Employee_Address]]" name="HtmlEncode[[Employee.Address]]">
+HtmlEncode[[Address_1]]</textarea>;
+        </div>
+        <div>
+            <label for="HtmlEncode[[Employee_Password]]">HtmlEncode[[Password]]</label>
+            <input data-val="HtmlEncode[[true]]" data-val-required="HtmlEncode[[The Password field is required.]]" id="HtmlEncode[[Employee_Password]]" name="HtmlEncode[[Employee.Password]]" type="HtmlEncode[[password]]" />
+        </div>
+        <div>
+            <label>HtmlEncode[[PhoneNumber]]</label>
+            <input id="HtmlEncode[[Employee_PhoneNumber]]" name="HtmlEncode[[Employee.PhoneNumber]]" type="HtmlEncode[[text]]" value="HtmlEncode[[PhoneNumber_1]]" />
+        </div>
+        <div>
+            <label for="HtmlEncode[[Employee_Name]]">HtmlEncode[[Employee.Name]]</label>
+            <input type="HtmlEncode[[text]]" id="HtmlEncode[[Employee_Name]]" name="HtmlEncode[[Employee.Name]]" value="HtmlEncode[[EmployeeName_1]]" />
+            <span class="HtmlEncode[[field-validation-valid]]" data-valmsg-for="HtmlEncode[[Employee.Name]]" data-valmsg-replace="HtmlEncode[[true]]"></span>
+        </div>
+        <div>
+            <label for="HtmlEncode[[Employee_Gender]]">HtmlEncode[[Gender]]</label>
+            <input checked="HtmlEncode[[checked]]" data-val="HtmlEncode[[true]]" data-val-required="HtmlEncode[[The Gender field is required.]]" id="HtmlEncode[[Employee_Gender]]" name="HtmlEncode[[Employee.Gender]]" type="HtmlEncode[[radio]]" value="HtmlEncode[[Female]]" /> Female
+            <input id="HtmlEncode[[Employee_Gender]]" name="HtmlEncode[[Employee.Gender]]" type="HtmlEncode[[radio]]" value="HtmlEncode[[Male]]" /> Male
+        </div>
+        <div>
+            <label for="HtmlEncode[[Employee_OfficeNumber]]">HtmlEncode[[OfficeNumber]]</label>
+            <select id="HtmlEncode[[Employee_OfficeNumber]]" name="HtmlEncode[[Employee.OfficeNumber]]"><option>HtmlEncode[[1001]]</option>
+<option>HtmlEncode[[1002]]</option>
+</select>
+        </div>
+        <input data-val="HtmlEncode[[true]]" data-val-range="HtmlEncode[[The field Number must be between 1 and 100.]]" data-val-range-max="HtmlEncode[[100]]" data-val-range-min="HtmlEncode[[1]]" data-val-required="HtmlEncode[[The Number field is required.]]" id="HtmlEncode[[Employee_Number]]" name="HtmlEncode[[Employee.Number]]" type="HtmlEncode[[hidden]]" value="HtmlEncode[[1]]" />
+        <div class="HtmlEncode[[validation-summary-valid]]" data-valmsg-summary="HtmlEncode[[true]]"><ul><li style="display:none"></li>
+</ul></div>
+        <input type="submit" />
+    </form>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.html
new file mode 100644
index 0000000000..4742cb6b00
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.html
@@ -0,0 +1,43 @@
+<html>
+<body>
+    <form action="/HtmlGeneration_Home/EditWarehouse" method="post">
+        <div>
+            City_1
+            <input type="text" data-val="true" data-val-minlength="The field City must be a string or array type with a minimum length of &#x27;2&#x27;." data-val-minlength-min="2" id="City" name="City" value="City_1" />
+        </div>
+        <div>
+            <label>Address</label>
+            <textarea id="Employee_Address" name="Employee.Address">
+Address_1</textarea>;
+        </div>
+        <div>
+            <label for="Employee_Password">Password</label>
+            <input data-val="true" data-val-required="The Password field is required." id="Employee_Password" name="Employee.Password" type="password" />
+        </div>
+        <div>
+            <label>PhoneNumber</label>
+            <input id="Employee_PhoneNumber" name="Employee.PhoneNumber" type="text" value="PhoneNumber_1" />
+        </div>
+        <div>
+            <label for="Employee_Name">Employee.Name</label>
+            <input type="text" id="Employee_Name" name="Employee.Name" value="EmployeeName_1" />
+            <span class="field-validation-valid" data-valmsg-for="Employee.Name" data-valmsg-replace="true"></span>
+        </div>
+        <div>
+            <label for="Employee_Gender">Gender</label>
+            <input checked="checked" data-val="true" data-val-required="The Gender field is required." id="Employee_Gender" name="Employee.Gender" type="radio" value="Female" /> Female
+            <input id="Employee_Gender" name="Employee.Gender" type="radio" value="Male" /> Male
+        </div>
+        <div>
+            <label for="Employee_OfficeNumber">OfficeNumber</label>
+            <select id="Employee_OfficeNumber" name="Employee.OfficeNumber"><option>1001</option>
+<option>1002</option>
+</select>
+        </div>
+        <input data-val="true" data-val-range="The field Number must be between 1 and 100." data-val-range-max="100" data-val-range-min="1" data-val-required="The Number field is required." id="Employee_Number" name="Employee.Number" type="hidden" value="1" />
+        <div class="validation-summary-valid" data-valmsg-summary="true"><ul><li style="display:none"></li>
+</ul></div>
+        <input type="submit" />
+    </form>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EmployeeList.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EmployeeList.html
new file mode 100644
index 0000000000..edc86e3450
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EmployeeList.html
@@ -0,0 +1,98 @@
+<html>
+<body>
+<form action="/HtmlGeneration_Home/EmployeeList" method="post">
+<div>
+    <label for="z0__Number">Number</label>
+    <input data-val="true" data-val-range="The field Number must be between 1 and 100." data-val-range-max="100" data-val-range-min="1" data-val-required="The Number field is required." disabled="disabled" id="z0__Number" name="[0].Number" readonly="readonly" type="text" value="0" />
+    <input type="number" class="form-control" id="z0__Number" name="[0].Number" value="0" />
+</div>
+<div>
+    <label class="employee" for="z0__Name">Name</label>
+    <textarea id="z0__Name" name="[0].Name">
+EmployeeName_0</textarea>
+</div>
+<div>
+    <label class="employee" for="z0__PhoneNumber">PhoneNumber</label>
+    <input type="tel" id="z0__PhoneNumber" name="[0].PhoneNumber" value="" />
+</div>
+<div>
+    <label class="employee" for="z0__Gender">Gender</label>
+    <input data-val="true" data-val-required="The Gender field is required." disabled="disabled" id="z0__Gender" name="[0].Gender" readonly="readonly" type="radio" value="Female" />
+    <select id="z0__Gender" name="[0].Gender"><option selected="selected">Male</option>
+<option>Female</option>
+</select>
+</div>
+<div>
+    <label class="employee" for="z0__Remote">Remote</label>
+    <input data-val="true" data-val-required="The Remote field is required." id="z0__Remote" name="[0].Remote" type="checkbox" value="true" />
+</div>
+<div>
+    <label class="employee" for="z0__OfficeNumber">OfficeNumber</label>
+    <select id="z0__OfficeNumber" name="[0].OfficeNumber"><option>1001</option>
+<option>1002</option>
+</select>
+</div>
+<div>
+    <label for="z1__Number">Number</label>
+    <input data-val="true" data-val-range="The field Number must be between 1 and 100." data-val-range-max="100" data-val-range-min="1" data-val-required="The Number field is required." disabled="disabled" id="z1__Number" name="[1].Number" readonly="readonly" type="text" value="1" />
+    <input type="number" class="form-control" id="z1__Number" name="[1].Number" value="1" />
+</div>
+<div>
+    <label class="employee" for="z1__Name">Name</label>
+    <textarea id="z1__Name" name="[1].Name">
+EmployeeName_1</textarea>
+</div>
+<div>
+    <label class="employee" for="z1__PhoneNumber">PhoneNumber</label>
+    <input type="tel" id="z1__PhoneNumber" name="[1].PhoneNumber" value="" />
+</div>
+<div>
+    <label class="employee" for="z1__Gender">Gender</label>
+    <input checked="checked" data-val="true" data-val-required="The Gender field is required." disabled="disabled" id="z1__Gender" name="[1].Gender" readonly="readonly" type="radio" value="Female" />
+    <select id="z1__Gender" name="[1].Gender"><option>Male</option>
+<option selected="selected">Female</option>
+</select>
+</div>
+<div>
+    <label class="employee" for="z1__Remote">Remote</label>
+    <input data-val="true" data-val-required="The Remote field is required." id="z1__Remote" name="[1].Remote" type="checkbox" value="true" />
+</div>
+<div>
+    <label class="employee" for="z1__OfficeNumber">OfficeNumber</label>
+    <select id="z1__OfficeNumber" name="[1].OfficeNumber"><option>1001</option>
+<option selected="selected">1002</option>
+</select>
+</div>
+<div>
+    <label for="z2__Number">Number</label>
+    <input data-val="true" data-val-range="The field Number must be between 1 and 100." data-val-range-max="100" data-val-range-min="1" data-val-required="The Number field is required." disabled="disabled" id="z2__Number" name="[2].Number" readonly="readonly" type="text" value="2" />
+    <input type="number" class="form-control" id="z2__Number" name="[2].Number" value="2" />
+</div>
+<div>
+    <label class="employee" for="z2__Name">Name</label>
+    <textarea id="z2__Name" name="[2].Name">
+EmployeeName_2</textarea>
+</div>
+<div>
+    <label class="employee" for="z2__PhoneNumber">PhoneNumber</label>
+    <input type="tel" id="z2__PhoneNumber" name="[2].PhoneNumber" value="" />
+</div>
+<div>
+    <label class="employee" for="z2__Gender">Gender</label>
+    <input data-val="true" data-val-required="The Gender field is required." disabled="disabled" id="z2__Gender" name="[2].Gender" readonly="readonly" type="radio" value="Female" />
+    <select id="z2__Gender" name="[2].Gender"><option selected="selected">Male</option>
+<option>Female</option>
+</select>
+</div>
+<div>
+    <label class="employee" for="z2__Remote">Remote</label>
+    <input checked="checked" data-val="true" data-val-required="The Remote field is required." id="z2__Remote" name="[2].Remote" type="checkbox" value="true" />
+</div>
+<div>
+    <label class="employee" for="z2__OfficeNumber">OfficeNumber</label>
+    <select id="z2__OfficeNumber" name="[2].OfficeNumber"><option>1001</option>
+<option>1002</option>
+</select>
+</div>            <input type="submit" />
+<input name="__RequestVerificationToken" type="hidden" value="{0}" /><input name="[0].Remote" type="hidden" value="false" /><input name="[1].Remote" type="hidden" value="false" /><input name="[2].Remote" type="hidden" value="false" /></form></body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Environment.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Environment.html
new file mode 100644
index 0000000000..09a8fe15c4
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Environment.html
@@ -0,0 +1,43 @@
+<!doctype html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Environment</title>
+</head>
+<body>
+
+    <h2>Environment Tag Helper Test</h2>
+
+    <ul>
+        
+            <li>This will show</li>
+        
+        
+            <li>This will show</li>
+        
+        
+            <li>This will show</li>
+        
+        
+            <li>This will show</li>
+        
+        
+            <li>This will show</li>
+        
+        
+            <li>This will show</li>
+        
+        
+            <li>This will show</li>
+        
+        
+            <li>This will show</li>
+        
+        
+            <li>This will show</li>
+        
+        
+        
+    </ul>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.html
new file mode 100644
index 0000000000..8529081f48
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.html
@@ -0,0 +1,16 @@
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Form</title>
+</head>
+<body>
+
+    <h2>Form Tag Helper Test</h2>
+    
+    <form></form>
+    <form action="/HtmlGeneration_Home/Form" method="post"><input name="__RequestVerificationToken" type="hidden" value="{0}" /></form>
+    <form action="/HtmlGeneration_Home/Form" method="post"></form>
+    <form action="/HtmlGeneration_Home/Form" method="post"><input name="__RequestVerificationToken" type="hidden" value="{0}" /></form>
+    <form action="/HtmlGeneration_Home/Form" method="post"></form>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Image.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Image.html
new file mode 100644
index 0000000000..95b1559a10
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Image.html
@@ -0,0 +1,35 @@
+<!doctype html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Image</title>
+
+</head>
+<body>
+
+    <h2>Image Tag Helper Test</h2>
+    <!-- Plain image tag -->
+    <img src="/images/red.png" alt="Red block" title="&lt;the title>">
+
+    <!-- Plain image tag with file version -->
+    <img src="/images/red.png?v=W2F5D366_nQ2fQqUk3URdgWy2ZekXjHzHJaY5yaiOOk" alt="Red versioned" title="Red versioned" />
+
+    <!-- Plain image tag with file version set to false -->
+    <img src="/images/red.png" alt="Red explicitly not versioned" title="Red versioned">
+
+    <!-- Plain image tag with absolute path and file version -->
+    <img src="http://contoso.com/hello/world" alt="Absolute path versioned">
+
+    <!-- Plain image tag with file version and path to file that does not exist -->
+    <img src="/images/fake.png" alt="Path to non existing file" />
+
+    <!-- Plain image tag with file version and path containing query string -->
+    <img src="/images/red.png?abc=def&amp;v=W2F5D366_nQ2fQqUk3URdgWy2ZekXjHzHJaY5yaiOOk" alt="Path with query string">
+
+    <!-- Plain image tag with file version and path containing fragment -->
+    <img src="/images/red.png?v=W2F5D366_nQ2fQqUk3URdgWy2ZekXjHzHJaY5yaiOOk#abc" alt="Path with query string" />
+
+    <!-- Plain image tag with file version and path linking to some action -->
+    <img src="/controller/action" alt="Path linking to some action">
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.Encoded.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.Encoded.html
new file mode 100644
index 0000000000..dfed464b45
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.Encoded.html
@@ -0,0 +1,73 @@
+<html>
+<body>
+    <div>
+        <a title="&lt;the title>" href="HtmlEncode[[/HtmlGeneration_Product]]">Product Index</a>
+    </div>
+    <div>
+        <a title='"the" title' href="HtmlEncode[[/HtmlGeneration_Product/List]]">Product List</a>
+    </div>
+    <div>
+        <a id="HtmlGenerationWebSite_Index">HtmlGenerationWebSite Index</a>
+    </div>
+    <div>
+        <a href="HtmlEncode[[/]]">Default Controller</a>
+    </div>
+    <div>
+        <a href="HtmlEncode[[/Product/Index#fragment]]">Product Index Fragment</a>
+    </div>
+    <div>
+        <a href="HtmlEncode[[/HtmlGeneration_Product/Submit#fragment]]">Product Submit Fragment</a>
+    </div>
+    <div>
+        <a id="HtmlGenerationWebSite_IndexFragment" href="HtmlEncode[[/#fragment]]">
+            HtmlGenerationWebSite Index Fragment
+        </a>
+    </div>
+    <div>
+        <a href="HtmlEncode[[ftp://localhost/#fragment]]">
+            FTP HtmlGenerationWebSite Index Fragment
+        </a>
+    </div>
+    <div>
+        <a href="HtmlEncode[[unkonwn://localhost/HtmlGeneration_Product/List]]">
+            Unknown Protocol Product List
+        </a>
+    </div>
+    <div>
+        <a id="HtmlGenerationWebSite_IndexProtocol" href="HtmlEncode[[/]]">
+            Empty Protocol HtmlGenerationWebSite Index
+        </a>
+    </div>
+    <div>
+        <a href="HtmlEncode[[/Customer/Customer#fragment]]">Customer Area Customer Index</a>
+    </div>
+    <div>
+        <a href="/Order/List">Href Order List</a>
+    </div>
+    <div>
+        <a href="HtmlEncode[[/NonExistentController]]">Non-existent Controller</a>
+    </div>
+    <div>
+        <a href="HtmlEncode[[/NonExistentController#fragment]]">
+            Non-existent Controller Fragment
+        </a>
+    </div>
+    <div>
+        <a href="HtmlEncode[[/Order/NonExistentAction]]">Non-existent Action</a>
+    </div>
+    <div>
+        <a id="Id" href="HtmlEncode[[http://somewhere/]]">Some Where</a>
+    </div>
+    <div>
+        <a href="HtmlEncode[[unknown://localhost/NoControll#fragment]]">
+            Unknown Protocol Non-existent Controller Fragment
+        </a>
+    </div>
+    <div>
+        <a href="HtmlEncode[[/Product/Submit?area=NonExistentArea&id=1#fragment]]">Product Route Non-existent Area Parameter</a>
+    </div>
+    <div>
+        <a href="">Non-existent Area</a>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.html
new file mode 100644
index 0000000000..e80ec4969e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.html
@@ -0,0 +1,73 @@
+<html>
+<body>
+    <div>
+        <a title="&lt;the title>" href="/HtmlGeneration_Product">Product Index</a>
+    </div>
+    <div>
+        <a title='"the" title' href="/HtmlGeneration_Product/List">Product List</a>
+    </div>
+    <div>
+        <a id="HtmlGenerationWebSite_Index">HtmlGenerationWebSite Index</a>
+    </div>
+    <div>
+        <a href="/">Default Controller</a>
+    </div>
+    <div>
+        <a href="/Product/Index#fragment">Product Index Fragment</a>
+    </div>
+    <div>
+        <a href="/HtmlGeneration_Product/Submit#fragment">Product Submit Fragment</a>
+    </div>
+    <div>
+        <a id="HtmlGenerationWebSite_IndexFragment" href="/#fragment">
+            HtmlGenerationWebSite Index Fragment
+        </a>
+    </div>
+    <div>
+        <a href="ftp://localhost/#fragment">
+            FTP HtmlGenerationWebSite Index Fragment
+        </a>
+    </div>
+    <div>
+        <a href="unkonwn://localhost/HtmlGeneration_Product/List">
+            Unknown Protocol Product List
+        </a>
+    </div>
+    <div>
+        <a id="HtmlGenerationWebSite_IndexProtocol" href="/">
+            Empty Protocol HtmlGenerationWebSite Index
+        </a>
+    </div>
+    <div>
+        <a href="/Customer/Customer#fragment">Customer Area Customer Index</a>
+    </div>
+    <div>
+        <a href="/Order/List">Href Order List</a>
+    </div>
+    <div>
+        <a href="/NonExistentController">Non-existent Controller</a>
+    </div>
+    <div>
+        <a href="/NonExistentController#fragment">
+            Non-existent Controller Fragment
+        </a>
+    </div>
+    <div>
+        <a href="/Order/NonExistentAction">Non-existent Action</a>
+    </div>
+    <div>
+        <a id="Id" href="http://somewhere/">Some Where</a>
+    </div>
+    <div>
+        <a href="unknown://localhost/NoControll#fragment">
+            Unknown Protocol Non-existent Controller Fragment
+        </a>
+    </div>
+    <div>
+        <a href="/Product/Submit?area=NonExistentArea&amp;id=1#fragment">Product Route Non-existent Area Parameter</a>
+    </div>
+    <div>
+        <a href="">Non-existent Area</a>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Input.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Input.html
new file mode 100644
index 0000000000..87ced71609
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Input.html
@@ -0,0 +1,22 @@
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>File Input</title>
+</head>
+<body>
+
+    <h2>Input Tag Helper Test</h2>
+
+    <input name="InterfaceFile" type="file" id="InterfaceFile" />
+    <input name="InterfaceFiles" type="file" id="InterfaceFiles" multiple="multiple" />
+    <input name="ConcreteFile" type="file" id="ConcreteFile">
+    <input name="ConcreteFiles" type="file" id="ConcreteFiles" multiple="multiple" />
+    <input name="EnumerableFiles" type="file" id="EnumerableFiles" multiple="multiple">
+
+    <input class="text-box single-line" id="InterfaceFile" name="InterfaceFile" type="file" />
+    <input class="text-box single-line" id="InterfaceFiles" multiple="multiple" name="InterfaceFiles" type="file" />
+    <input class="text-box single-line" id="ConcreteFile" name="ConcreteFile" type="file" />
+    <input class="text-box single-line" id="ConcreteFiles" multiple="multiple" name="ConcreteFiles" type="file" />
+    <input class="text-box single-line" id="EnumerableFiles" multiple="multiple" name="EnumerableFiles" type="file" />
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html
new file mode 100644
index 0000000000..30f65f5ccd
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html
@@ -0,0 +1,139 @@
+<!doctype html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Link</title>
+
+    <!-- Plain link tag -->
+    <link href="HtmlEncode[[/]]styles/site.css" rel="stylesheet" title="&lt;the title>" />
+
+    <!-- Globbed link tag with existing file -->
+    <link rel="stylesheet" title="&lt;the title>" href="HtmlEncode[[/styles/site.css]]" />
+
+    <!-- Globbed link tag with comma separated pattern -->
+    <link rel="stylesheet" title="&lt;the title" href="HtmlEncode[[/styles/site.css]]" /><link rel="stylesheet" title="&lt;the title" href="HtmlEncode[[/styles/sub/site2.css]]" /><link rel="stylesheet" title="&lt;the title" href="HtmlEncode[[/styles/sub/site3.css]]" /><link rel="stylesheet" title="&lt;the title" href="HtmlEncode[[/styles/sub/site3.min.css]]" />
+
+    <!-- Globbed link tag with existing file and exclude -->
+    <link rel="stylesheet" title='"the" title' href="HtmlEncode[[/styles/site.css]]" /><link rel="stylesheet" title='"the" title' href="HtmlEncode[[/styles/sub/site2.css]]" />
+
+    <!-- Globbed link tag missing include -->
+    <link rel="stylesheet">
+
+    <!-- Globbed link tag missing include but with static href -->
+    <link href="HtmlEncode[[/styles/site.css]]" rel="stylesheet" />
+
+    <!-- Globbed link tag with missing file -->
+    
+
+    <!-- Globbed link tag with file outside of webroot -->
+    
+
+    <!-- Globbed link tag with file outside of webroot -->
+    
+
+    <!-- Globbed link tag with existing file and static href -->
+    <link href="HtmlEncode[[/styles/site.css]]" rel="stylesheet" /><link href="HtmlEncode[[/styles/sub/site2.css]]" rel="stylesheet" />
+
+    <!-- Globbed link tag with existing file and static href should dedupe -->
+    <link href="HtmlEncode[[/styles/site.css]]" rel="stylesheet" />
+
+    <!-- Fallback to static href -->
+    <link href="HtmlEncode[[/styles/site.min.css?a=b&c=d]]" rel="stylesheet" data-extra="test" title='"the" title' />
+<meta name="x-stylesheet-fallback-test" content="" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[HtmlEncode[[/styles/site.css?a=b&c=d]]]]"], "JavaScriptEncode[[rel="stylesheet" data-extra="test" title='"the" title' ]]");</script>
+
+    <!-- Fallback to static href with dynamic attributes -->
+    <link href="HtmlEncode[[/styles/site.min.css?a=b&c=d]]" rel="HtmlEncode[[stylesheet]]" data-extra="HtmlEncode[[test]]" title='HtmlEncode[["the" title]]' />
+
+    <!-- Fallback to static href with custom rel -->
+    <link href="HtmlEncode[[/styles/site.min.css?a=b&c=d]]" rel="x-stylesheet" />
+
+    <!-- Fallback from globbed href to static href -->
+    
+<meta name="x-stylesheet-fallback-test" content="" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[HtmlEncode[[/styles/site.css]]]]"], "JavaScriptEncode[[rel="stylesheet" data-extra="test" ]]");</script>
+
+    <!-- Fallback from globbed href with exclude to static href -->
+    
+<meta name="x-stylesheet-fallback-test" content="" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[HtmlEncode[[/styles/site.css]]]]"], "JavaScriptEncode[[rel="stylesheet" data-extra="test" ]]");</script>
+
+    <!-- Fallback from globbed and static href to static href -->
+    <link href="HtmlEncode[[styles/site.min.css]]" rel="stylesheet" data-extra="test" /><link href="HtmlEncode[[/styles/site.css]]" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" content="" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[HtmlEncode[[/styles/site.css]]]]"], "JavaScriptEncode[[rel="stylesheet" data-extra="test" ]]");</script>
+
+    <!-- Fallback from globbed and static href with exclude to static href -->
+    <link href="HtmlEncode[[styles/site.min.css]]" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" content="" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[HtmlEncode[[/styles/site.css]]]]"], "JavaScriptEncode[[rel="stylesheet" data-extra="test" ]]");</script>
+
+    <!-- Fallback to static href with no primary href -->
+    <link rel="stylesheet" data-extra="test">
+<meta name="x-stylesheet-fallback-test" content="" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[HtmlEncode[[/styles/site.css]]]]"], "JavaScriptEncode[[rel="stylesheet" data-extra="test" ]]");</script>
+
+    <!-- Fallback to globbed href -->
+    <link href="HtmlEncode[[/styles/site.min.css]]" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" content="" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[HtmlEncode[[/styles/site.css]]]]"], "JavaScriptEncode[[rel="stylesheet" data-extra="test" ]]");</script>
+
+    <!-- Fallback to static and globbed href -->
+    <link href="HtmlEncode[[/styles/site.min.css]]" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" content="" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[HtmlEncode[[/styles/site.css]]]]","JavaScriptEncode[[HtmlEncode[[/styles/sub/site2.css]]]]"], "JavaScriptEncode[[rel="stylesheet" data-extra="test" ]]");</script>
+
+    <!-- Fallback to static and globbed href should dedupe -->
+    <link href="HtmlEncode[[/styles/site.min.css]]" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" content="" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[HtmlEncode[[/styles/site.css]]]]"], "JavaScriptEncode[[rel="stylesheet" data-extra="test" ]]");</script>
+
+    <!-- Fallback to static and globbed href with exclude -->
+    <link href="HtmlEncode[[/styles/site.min.css]]" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" content="" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[HtmlEncode[[/styles/site.css]]]]","JavaScriptEncode[[HtmlEncode[[/styles/sub/site2.css]]]]"], "JavaScriptEncode[[rel="stylesheet" data-extra="test" ]]");</script>
+
+    <!-- Fallback from globbed href to glbobed href -->
+    
+<meta name="x-stylesheet-fallback-test" content="" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[HtmlEncode[[/styles/site.css]]]]"], "JavaScriptEncode[[rel="stylesheet" data-extra="test" ]]");</script>
+
+    <!-- Fallback from globbed href with exclude to globbed href -->
+    
+<meta name="x-stylesheet-fallback-test" content="" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[HtmlEncode[[/styles/site.css]]]]"], "JavaScriptEncode[[rel="stylesheet" data-extra="test" ]]");</script>
+
+    <!-- Fallback from globbed and static href to globbed href -->
+    <link href="HtmlEncode[[styles/site.min.css]]" rel="stylesheet" data-extra="test" /><link href="HtmlEncode[[/styles/site.css]]" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" content="" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[HtmlEncode[[/styles/site.css]]]]"], "JavaScriptEncode[[rel="stylesheet" data-extra="test" ]]");</script>
+
+    <!-- Fallback from globbed and static href with exclude to globbed href -->
+    <link href="HtmlEncode[[styles/site.min.css]]" rel="stylesheet" data-extra="test">
+<meta name="x-stylesheet-fallback-test" content="" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[HtmlEncode[[/styles/site.css]]]]"], "JavaScriptEncode[[rel="stylesheet" data-extra="test" ]]");</script>
+
+    <!-- Kitchen sink, all the attributes -->
+    <link href="HtmlEncode[[styles/site.min.css]]" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" content="" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[HtmlEncode[[/styles/site.css]]]]","JavaScriptEncode[[HtmlEncode[[/styles/sub/site2.css]]]]"], "JavaScriptEncode[[rel="stylesheet" data-extra="test" ]]");</script>
+
+    <!-- Fallback to globbed href that doesn't exist -->
+    <link href="HtmlEncode[[/styles/site.min.css]]" rel="stylesheet" data-extra="test" />
+
+    <!-- Fallback to globbed href outside webroot -->
+    <link href="HtmlEncode[[/styles/site.min.css]]" rel="stylesheet" data-extra="test" />
+
+    <!-- Fallback with missing attribute -->
+    <link href="HtmlEncode[[/styles/site.min.css]]" rel="stylesheet" data-extra="test" />
+
+    <!-- Fallback with missing attribute -->
+    <link href="HtmlEncode[[/styles/site.min.css]]" rel="stylesheet" data-extra="test" />
+
+    <!-- Fallback with missing attribute -->
+    <link href="HtmlEncode[[/styles/site.min.css]]" rel="stylesheet" data-extra="test" />
+
+    <!-- Plain link tag with file version -->
+    <link href="HtmlEncode[[/styles/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc]]" rel="stylesheet" />
+
+    <!-- Globbed link tag with existing file and file version -->
+    <link rel="stylesheet" href="HtmlEncode[[/styles/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc]]" />
+
+    <!-- Fallback with file version -->
+    <link href="HtmlEncode[[/styles/site.min.css]]" rel="stylesheet" data-extra="test">
+<meta name="x-stylesheet-fallback-test" content="" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[HtmlEncode[[/styles/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc]]]]"], "JavaScriptEncode[[rel="stylesheet" data-extra="test" ]]");</script>
+
+    <!-- Globbed link tag with existing file, static href and file version -->
+    <link href="HtmlEncode[[/styles/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc]]" rel="stylesheet" /><link href="HtmlEncode[[/styles/sub/site2.css?v=30cxPex0tA9xEatW7f1Qhnn8tVLAHgE6xwIZhESq0y0]]" rel="stylesheet" /><link href="HtmlEncode[[/styles/sub/site3.css?v=fSxxOr1Q4Dq2uPuzlju5UYGuK0SKABI-ghvaIGEsZDc]]" rel="stylesheet" /><link href="HtmlEncode[[/styles/sub/site3.min.css?v=s8JMmAZxBn0dzuhRtQ0wgOvNBK4XRJRWEC2wfzsVF9M]]" rel="stylesheet" />
+</head>
+<body>
+
+    <h2>Link Tag Helper Test</h2>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.html
new file mode 100644
index 0000000000..cb7acce37c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.html
@@ -0,0 +1,140 @@
+<!doctype html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Link</title>
+
+    <!-- Plain link tag -->
+    <link href="/styles/site.css" rel="stylesheet" title="&lt;the title>" />
+
+    <!-- Globbed link tag with existing file -->
+    <link rel="stylesheet" title="&lt;the title>" href="/styles/site.css" />
+
+    <!-- Globbed link tag with comma separated pattern -->
+    <link rel="stylesheet" title="&lt;the title" href="/styles/site.css" /><link rel="stylesheet" title="&lt;the title" href="/styles/sub/site2.css" /><link rel="stylesheet" title="&lt;the title" href="/styles/sub/site3.css" /><link rel="stylesheet" title="&lt;the title" href="/styles/sub/site3.min.css" />
+
+    <!-- Globbed link tag with existing file and exclude -->
+    <link rel="stylesheet" title='"the" title' href="/styles/site.css" /><link rel="stylesheet" title='"the" title' href="/styles/sub/site2.css" />
+
+    <!-- Globbed link tag missing include -->
+    <link rel="stylesheet">
+
+    <!-- Globbed link tag missing include but with static href -->
+    <link href="/styles/site.css" rel="stylesheet" />
+
+    <!-- Globbed link tag with missing file -->
+    
+
+    <!-- Globbed link tag with file outside of webroot -->
+    
+
+    <!-- Globbed link tag with file outside of webroot -->
+    
+
+    <!-- Globbed link tag with existing file and static href -->
+    <link href="/styles/site.css" rel="stylesheet" /><link href="/styles/sub/site2.css" rel="stylesheet" />
+
+    <!-- Globbed link tag with existing file and static href should dedupe -->
+    <link href="/styles/site.css" rel="stylesheet" />
+
+    <!-- Fallback to static href -->
+    <link href="/styles/site.min.css?a=b&amp;c=d" rel="stylesheet" data-extra="test" title='"the" title' />
+<meta name="x-stylesheet-fallback-test" content="" class="hidden" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("visibility","hidden",["\/styles\/site.css?a=b\u0026amp;c=d"], "rel=\u0022stylesheet\u0022 data-extra=\u0022test\u0022 title=\u0027\u0022the\u0022 title\u0027 ");</script>
+
+    <!-- Fallback to static href with dynamic attributes -->
+    <link href="/styles/site.min.css?a=b&amp;c=d" rel="stylesheet" data-extra="test" title='&quot;the&quot; title' />
+<meta name="x-stylesheet-fallback-test" content="" class="hidden" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("visibility","hidden",["\/styles\/site.css?a=b\u0026amp;c=d"], "rel=\u0022stylesheet\u0022 data-extra=\u0022test\u0022 title=\u0027\u0026quot;the\u0026quot; title\u0027 ");</script>
+
+    <!-- Fallback to static href with custom rel -->
+    <link href="/styles/site.min.css?a=b&amp;c=d" rel="x-stylesheet" />
+
+    <!-- Fallback from globbed href to static href -->
+    
+<meta name="x-stylesheet-fallback-test" content="" class="hidden" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("visibility","hidden",["\/styles\/site.css"], "rel=\u0022stylesheet\u0022 data-extra=\u0022test\u0022 ");</script>
+
+    <!-- Fallback from globbed href with exclude to static href -->
+    
+<meta name="x-stylesheet-fallback-test" content="" class="hidden" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("visibility","hidden",["\/styles\/site.css"], "rel=\u0022stylesheet\u0022 data-extra=\u0022test\u0022 ");</script>
+
+    <!-- Fallback from globbed and static href to static href -->
+    <link href="styles/site.min.css" rel="stylesheet" data-extra="test" /><link href="/styles/site.css" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" content="" class="hidden" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("visibility","hidden",["\/styles\/site.css"], "rel=\u0022stylesheet\u0022 data-extra=\u0022test\u0022 ");</script>
+
+    <!-- Fallback from globbed and static href with exclude to static href -->
+    <link href="styles/site.min.css" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" content="" class="hidden" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("visibility","hidden",["\/styles\/site.css"], "rel=\u0022stylesheet\u0022 data-extra=\u0022test\u0022 ");</script>
+
+    <!-- Fallback to static href with no primary href -->
+    <link rel="stylesheet" data-extra="test">
+<meta name="x-stylesheet-fallback-test" content="" class="hidden" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("visibility","hidden",["\/styles\/site.css"], "rel=\u0022stylesheet\u0022 data-extra=\u0022test\u0022 ");</script>
+
+    <!-- Fallback to globbed href -->
+    <link href="/styles/site.min.css" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" content="" class="hidden" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("visibility","hidden",["\/styles\/site.css"], "rel=\u0022stylesheet\u0022 data-extra=\u0022test\u0022 ");</script>
+
+    <!-- Fallback to static and globbed href -->
+    <link href="/styles/site.min.css" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" content="" class="hidden" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("visibility","hidden",["\/styles\/site.css","\/styles\/sub\/site2.css"], "rel=\u0022stylesheet\u0022 data-extra=\u0022test\u0022 ");</script>
+
+    <!-- Fallback to static and globbed href should dedupe -->
+    <link href="/styles/site.min.css" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" content="" class="hidden" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("visibility","hidden",["\/styles\/site.css"], "rel=\u0022stylesheet\u0022 data-extra=\u0022test\u0022 ");</script>
+
+    <!-- Fallback to static and globbed href with exclude -->
+    <link href="/styles/site.min.css" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" content="" class="hidden" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("visibility","hidden",["\/styles\/site.css","\/styles\/sub\/site2.css"], "rel=\u0022stylesheet\u0022 data-extra=\u0022test\u0022 ");</script>
+
+    <!-- Fallback from globbed href to glbobed href -->
+    
+<meta name="x-stylesheet-fallback-test" content="" class="hidden" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("visibility","hidden",["\/styles\/site.css"], "rel=\u0022stylesheet\u0022 data-extra=\u0022test\u0022 ");</script>
+
+    <!-- Fallback from globbed href with exclude to globbed href -->
+    
+<meta name="x-stylesheet-fallback-test" content="" class="hidden" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("visibility","hidden",["\/styles\/site.css"], "rel=\u0022stylesheet\u0022 data-extra=\u0022test\u0022 ");</script>
+
+    <!-- Fallback from globbed and static href to globbed href -->
+    <link href="styles/site.min.css" rel="stylesheet" data-extra="test" /><link href="/styles/site.css" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" content="" class="hidden" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("visibility","hidden",["\/styles\/site.css"], "rel=\u0022stylesheet\u0022 data-extra=\u0022test\u0022 ");</script>
+
+    <!-- Fallback from globbed and static href with exclude to globbed href -->
+    <link href="styles/site.min.css" rel="stylesheet" data-extra="test">
+<meta name="x-stylesheet-fallback-test" content="" class="hidden" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("visibility","hidden",["\/styles\/site.css"], "rel=\u0022stylesheet\u0022 data-extra=\u0022test\u0022 ");</script>
+
+    <!-- Kitchen sink, all the attributes -->
+    <link href="styles/site.min.css" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" content="" class="hidden" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("visibility","hidden",["\/styles\/site.css","\/styles\/sub\/site2.css"], "rel=\u0022stylesheet\u0022 data-extra=\u0022test\u0022 ");</script>
+
+    <!-- Fallback to globbed href that doesn't exist -->
+    <link href="/styles/site.min.css" rel="stylesheet" data-extra="test" />
+
+    <!-- Fallback to globbed href outside webroot -->
+    <link href="/styles/site.min.css" rel="stylesheet" data-extra="test" />
+
+    <!-- Fallback with missing attribute -->
+    <link href="/styles/site.min.css" rel="stylesheet" data-extra="test" />
+
+    <!-- Fallback with missing attribute -->
+    <link href="/styles/site.min.css" rel="stylesheet" data-extra="test" />
+
+    <!-- Fallback with missing attribute -->
+    <link href="/styles/site.min.css" rel="stylesheet" data-extra="test" />
+
+    <!-- Plain link tag with file version -->
+    <link href="/styles/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc" rel="stylesheet" />
+
+    <!-- Globbed link tag with existing file and file version -->
+    <link rel="stylesheet" href="/styles/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc" />
+
+    <!-- Fallback with file version -->
+    <link href="/styles/site.min.css" rel="stylesheet" data-extra="test">
+<meta name="x-stylesheet-fallback-test" content="" class="hidden" /><script>!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName("SCRIPT"),h=g[g.length-1].previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView.getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link href="'+c[e]+'" '+d+"/>")}("visibility","hidden",["\/styles\/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc"], "rel=\u0022stylesheet\u0022 data-extra=\u0022test\u0022 ");</script>
+
+    <!-- Globbed link tag with existing file, static href and file version -->
+    <link href="/styles/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc" rel="stylesheet" /><link href="/styles/sub/site2.css?v=30cxPex0tA9xEatW7f1Qhnn8tVLAHgE6xwIZhESq0y0" rel="stylesheet" /><link href="/styles/sub/site3.css?v=fSxxOr1Q4Dq2uPuzlju5UYGuK0SKABI-ghvaIGEsZDc" rel="stylesheet" /><link href="/styles/sub/site3.min.css?v=s8JMmAZxBn0dzuhRtQ0wgOvNBK4XRJRWEC2wfzsVF9M" rel="stylesheet" />
+</head>
+<body>
+
+    <h2>Link Tag Helper Test</h2>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.Encoded.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.Encoded.html
new file mode 100644
index 0000000000..4ec3df1116
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.Encoded.html
@@ -0,0 +1,115 @@
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+</head>
+<body>
+    <form action="HtmlEncode[[/HtmlGeneration_Order/Submit]]" method="HtmlEncode[[post]]">
+        <div>
+            <label class="order" for="HtmlEncode[[Shipping]]">HtmlEncode[[Shipping]]</label>
+            <input type="HtmlEncode[[text]]" size="50" id="HtmlEncode[[Shipping]]" name="HtmlEncode[[Shipping]]" value="HtmlEncode[[Your shipping method is UPSP]]" />
+        </div>
+        <div>
+            <label class="order" for="HtmlEncode[[ShippingDateTime]]">HtmlEncode[[ShippingDateTime]]</label>
+            <input type="HtmlEncode[[datetime-local]]" data-val="HtmlEncode[[true]]" data-val-required="HtmlEncode[[The ShippingDateTime field is required.]]" id="HtmlEncode[[ShippingDateTime]]" name="HtmlEncode[[ShippingDateTime]]" value="HtmlEncode[[0001-01-01T00:00:00.000]]" />
+        </div>
+        <div>
+            <label class="order" for="HtmlEncode[[Products]]">HtmlEncode[[Products]]</label>
+            <select multiple="HtmlEncode[[multiple]]" id="HtmlEncode[[Products]]" name="HtmlEncode[[Products]]"><option selected="HtmlEncode[[selected]]" value="HtmlEncode[[0]]">HtmlEncode[[Product_0]]</option>
+<option selected="HtmlEncode[[selected]]" value="HtmlEncode[[1]]">HtmlEncode[[Product_1]]</option>
+<option value="HtmlEncode[[2]]">HtmlEncode[[Product_2]]</option>
+</select>
+        </div>
+        <div>
+                <table>
+                    <tr>
+                        <th>
+                            <label for="HtmlEncode[[Number]]">HtmlEncode[[Number]]</label>
+                        </th>
+                        <th>
+                            <label for="HtmlEncode[[ProductName]]">HtmlEncode[[ProductName]]</label>
+                        </th>
+                    </tr>
+                    <tr>
+                        <td>
+                            <input type="HtmlEncode[[number]]" data-val="HtmlEncode[[true]]" data-val-required="HtmlEncode[[The Number field is required.]]" id="HtmlEncode[[ProductDetails_0__Number]]" name="HtmlEncode[[ProductDetails[0].Number]]" value="HtmlEncode[[0]]" />
+                            <span class="text-danger HtmlEncode[[field-validation-valid]]" style="" data-valmsg-for="HtmlEncode[[ProductDetails[0].Number]]" data-valmsg-replace="HtmlEncode[[true]]"></span>
+                        </td>
+                        <td>
+                            <input type="HtmlEncode[[text]]" data-val="HtmlEncode[[true]]" data-val-required="HtmlEncode[[The ProductName field is required.]]" id="HtmlEncode[[ProductDetails_0__ProductName]]" name="HtmlEncode[[ProductDetails[0].ProductName]]" value="HtmlEncode[[Product_0]]" />
+                            <span class="text-danger HtmlEncode[[field-validation-valid]]" style="" data-valmsg-for="HtmlEncode[[ProductDetails[0].ProductName]]" data-valmsg-replace="HtmlEncode[[true]]"></span>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <input type="HtmlEncode[[number]]" data-val="HtmlEncode[[true]]" data-val-required="HtmlEncode[[The Number field is required.]]" id="HtmlEncode[[ProductDetails_1__Number]]" name="HtmlEncode[[ProductDetails[1].Number]]" value="HtmlEncode[[1]]" />
+                            <span class="text-danger HtmlEncode[[field-validation-valid]]" style="" data-valmsg-for="HtmlEncode[[ProductDetails[1].Number]]" data-valmsg-replace="HtmlEncode[[true]]"></span>
+                        </td>
+                        <td>
+                            <input type="HtmlEncode[[text]]" data-val="HtmlEncode[[true]]" data-val-required="HtmlEncode[[The ProductName field is required.]]" id="HtmlEncode[[ProductDetails_1__ProductName]]" name="HtmlEncode[[ProductDetails[1].ProductName]]" value="HtmlEncode[[Product_1]]" />
+                            <span class="text-danger HtmlEncode[[field-validation-valid]]" style="" data-valmsg-for="HtmlEncode[[ProductDetails[1].ProductName]]" data-valmsg-replace="HtmlEncode[[true]]"></span>
+                        </td>
+                    </tr>
+                </table>
+        </div>
+        <div>
+            <label class="order" for="HtmlEncode[[SubstituteProducts]]">HtmlEncode[[SubstituteProducts]]</label>
+            <select id="HtmlEncode[[SubstituteProducts]]" multiple="HtmlEncode[[multiple]]" name="HtmlEncode[[SubstituteProducts]]"><option value="HtmlEncode[[0]]">HtmlEncode[[Product_0]]</option>
+<option value="HtmlEncode[[1]]">HtmlEncode[[Product_1]]</option>
+<option selected="HtmlEncode[[selected]]" value="HtmlEncode[[2]]">HtmlEncode[[Product_2]]</option>
+</select>
+        </div>
+        <div>
+            <label class="order" for="HtmlEncode[[OrderDate]]">HtmlEncode[[OrderDate]]</label>
+            <input type="HtmlEncode[[datetime]]" data-val="HtmlEncode[[true]]" data-val-required="HtmlEncode[[The OrderDate field is required.]]" id="HtmlEncode[[OrderDate]]" name="HtmlEncode[[OrderDate]]" value="HtmlEncode[[0001/01/01 00:00:00]]" />
+        </div>
+        <div>
+            <label class="order" for="HtmlEncode[[NeedSpecialHandle]]">HtmlEncode[[NeedSpecialHandle]]</label>
+            <input type="HtmlEncode[[checkbox]]" checked="HtmlEncode[[checked]]" data-val="HtmlEncode[[true]]" data-val-required="HtmlEncode[[The NeedSpecialHandle field is required.]]" id="HtmlEncode[[NeedSpecialHandle]]" name="HtmlEncode[[NeedSpecialHandle]]" value="HtmlEncode[[true]]" />
+        </div>
+        <div>
+            <label class="order" for="HtmlEncode[[PaymentMethod]]">HtmlEncode[[PaymentMethod]]</label>
+            <select id="HtmlEncode[[PaymentMethod]]" multiple="HtmlEncode[[multiple]]" name="HtmlEncode[[PaymentMethod]]">
+                <option value="HtmlEncode[[Credit]]">Credit</option>
+                <option value="HtmlEncode[[Check]]" selected="HtmlEncode[[selected]]">Check</option>
+            </select>
+            <select>
+                <option value="HtmlEncode[[Check]]">Check</option>
+            </select>
+        </div>
+        <div>
+            <label class="order" for="HtmlEncode[[Customer_Number]]">HtmlEncode[[Number]]</label>
+            <input type="HtmlEncode[[number]]" class="form-control" data-val="HtmlEncode[[true]]" data-val-range="HtmlEncode[[The field Number must be between 1 and 100.]]" data-val-range-max="HtmlEncode[[100]]" data-val-range-min="HtmlEncode[[1]]" data-val-required="HtmlEncode[[The Number field is required.]]" id="HtmlEncode[[Customer_Number]]" name="HtmlEncode[[Customer.Number]]" value="HtmlEncode[[1]]" />
+            <span class="HtmlEncode[[field-validation-valid]]" data-valmsg-for="HtmlEncode[[Customer.Number]]" data-valmsg-replace="HtmlEncode[[true]]"></span>
+        </div>
+        <div>
+            <label class="order" for="HtmlEncode[[Customer_Name]]">HtmlEncode[[Name]]</label>
+            <input type="HtmlEncode[[text]]" id="HtmlEncode[[Customer_Name]]" name="HtmlEncode[[Customer.Name]]" value="HtmlEncode[[NameStringValue]]" />
+        </div>
+        <div>
+            <label class="order" for="HtmlEncode[[Customer_Email]]">HtmlEncode[[Email]]</label>
+            <input type="HtmlEncode[[email]]" id="HtmlEncode[[Customer_Email]]" name="HtmlEncode[[Customer.Email]]" value="" />
+            <span class="HtmlEncode[[field-validation-valid]]" data-valmsg-for="HtmlEncode[[Customer.Email]]" data-valmsg-replace="HtmlEncode[[true]]"></span>
+        </div>
+        <div>
+            <label class="order" for="HtmlEncode[[Customer_PhoneNumber]]">HtmlEncode[[PhoneNumber]]</label>
+            <input type="HtmlEncode[[tel]]" id="HtmlEncode[[Customer_PhoneNumber]]" name="HtmlEncode[[Customer.PhoneNumber]]" value="" />
+        </div>
+        <div>
+            <label class="order" for="HtmlEncode[[Customer_Password]]">HtmlEncode[[Password]]</label>
+            <input type="HtmlEncode[[password]]" class="form-control" data-val="HtmlEncode[[true]]" data-val-required="HtmlEncode[[The Password field is required.]]" id="HtmlEncode[[Customer_Password]]" name="HtmlEncode[[Customer.Password]]" />
+            <span class="HtmlEncode[[field-validation-valid]]" data-valmsg-for="HtmlEncode[[Customer.Password]]" data-valmsg-replace="HtmlEncode[[true]]"></span>
+        </div>
+        <div>
+            <label class="order" for="HtmlEncode[[Customer_Gender]]">HtmlEncode[[Gender]]</label>
+            <input type="HtmlEncode[[radio]]" value="HtmlEncode[[Male]]" data-val="HtmlEncode[[true]]" data-val-required="HtmlEncode[[The Gender field is required.]]" id="HtmlEncode[[Customer_Gender]]" name="HtmlEncode[[Customer.Gender]]" /> Male
+<input type="HtmlEncode[[radio]]" value="HtmlEncode[[Female]]" checked="HtmlEncode[[checked]]" id="HtmlEncode[[Customer_Gender]]" name="HtmlEncode[[Customer.Gender]]" /> Female
+            <span class="HtmlEncode[[field-validation-valid]]" data-valmsg-for="HtmlEncode[[Customer.Gender]]" data-valmsg-replace="HtmlEncode[[true]]"></span>
+        </div>
+        <div class="order HtmlEncode[[validation-summary-valid]]" data-valmsg-summary="HtmlEncode[[true]]"><ul><li style="display:none"></li>
+</ul></div>
+        <input type="HtmlEncode[[hidden]]" id="HtmlEncode[[Customer_Key]]" name="HtmlEncode[[Customer.Key]]" value="HtmlEncode[[KeyA]]" />
+        <input type="submit" />
+    <input name="HtmlEncode[[__RequestVerificationToken]]" type="hidden" value="{0}" /><input name="HtmlEncode[[NeedSpecialHandle]]" type="HtmlEncode[[hidden]]" value="HtmlEncode[[false]]" /></form>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.html
new file mode 100644
index 0000000000..54a6af28f8
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.html
@@ -0,0 +1,115 @@
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+</head>
+<body>
+    <form action="/HtmlGeneration_Order/Submit" method="post">
+        <div>
+            <label class="order" for="Shipping">Shipping</label>
+            <input type="text" size="50" id="Shipping" name="Shipping" value="Your shipping method is UPSP" />
+        </div>
+        <div>
+            <label class="order" for="ShippingDateTime">ShippingDateTime</label>
+            <input type="datetime-local" data-val="true" data-val-required="The ShippingDateTime field is required." id="ShippingDateTime" name="ShippingDateTime" value="0001-01-01T00:00:00.000" />
+        </div>
+        <div>
+            <label class="order" for="Products">Products</label>
+            <select multiple="multiple" id="Products" name="Products"><option selected="selected" value="0">Product_0</option>
+<option selected="selected" value="1">Product_1</option>
+<option value="2">Product_2</option>
+</select>
+        </div>
+        <div>
+                <table>
+                    <tr>
+                        <th>
+                            <label for="Number">Number</label>
+                        </th>
+                        <th>
+                            <label for="ProductName">ProductName</label>
+                        </th>
+                    </tr>
+                    <tr>
+                        <td>
+                            <input type="number" data-val="true" data-val-required="The Number field is required." id="ProductDetails_0__Number" name="ProductDetails[0].Number" value="0" />
+                            <span class="text-danger field-validation-valid" style="" data-valmsg-for="ProductDetails[0].Number" data-valmsg-replace="true"></span>
+                        </td>
+                        <td>
+                            <input type="text" data-val="true" data-val-required="The ProductName field is required." id="ProductDetails_0__ProductName" name="ProductDetails[0].ProductName" value="Product_0" />
+                            <span class="text-danger field-validation-valid" style="" data-valmsg-for="ProductDetails[0].ProductName" data-valmsg-replace="true"></span>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <input type="number" data-val="true" data-val-required="The Number field is required." id="ProductDetails_1__Number" name="ProductDetails[1].Number" value="1" />
+                            <span class="text-danger field-validation-valid" style="" data-valmsg-for="ProductDetails[1].Number" data-valmsg-replace="true"></span>
+                        </td>
+                        <td>
+                            <input type="text" data-val="true" data-val-required="The ProductName field is required." id="ProductDetails_1__ProductName" name="ProductDetails[1].ProductName" value="Product_1" />
+                            <span class="text-danger field-validation-valid" style="" data-valmsg-for="ProductDetails[1].ProductName" data-valmsg-replace="true"></span>
+                        </td>
+                    </tr>
+                </table>
+        </div>
+        <div>
+            <label class="order" for="SubstituteProducts">SubstituteProducts</label>
+            <select id="SubstituteProducts" multiple="multiple" name="SubstituteProducts"><option value="0">Product_0</option>
+<option value="1">Product_1</option>
+<option selected="selected" value="2">Product_2</option>
+</select>
+        </div>
+        <div>
+            <label class="order" for="OrderDate">OrderDate</label>
+            <input type="datetime" data-val="true" data-val-required="The OrderDate field is required." id="OrderDate" name="OrderDate" value="0001/01/01 00:00:00" />
+        </div>
+        <div>
+            <label class="order" for="NeedSpecialHandle">NeedSpecialHandle</label>
+            <input type="checkbox" checked="checked" data-val="true" data-val-required="The NeedSpecialHandle field is required." id="NeedSpecialHandle" name="NeedSpecialHandle" value="true" />
+        </div>
+        <div>
+            <label class="order" for="PaymentMethod">PaymentMethod</label>
+            <select id="PaymentMethod" multiple="multiple" name="PaymentMethod">
+                <option value="Credit">Credit</option>
+                <option value="Check" selected="selected">Check</option>
+            </select>
+            <select>
+                <option value="Check">Check</option>
+            </select>
+        </div>
+        <div>
+            <label class="order" for="Customer_Number">Number</label>
+            <input type="number" class="form-control" data-val="true" data-val-range="The field Number must be between 1 and 100." data-val-range-max="100" data-val-range-min="1" data-val-required="The Number field is required." id="Customer_Number" name="Customer.Number" value="1" />
+            <span class="field-validation-valid" data-valmsg-for="Customer.Number" data-valmsg-replace="true"></span>
+        </div>
+        <div>
+            <label class="order" for="Customer_Name">Name</label>
+            <input type="text" id="Customer_Name" name="Customer.Name" value="NameStringValue" />
+        </div>
+        <div>
+            <label class="order" for="Customer_Email">Email</label>
+            <input type="email" id="Customer_Email" name="Customer.Email" value="" />
+            <span class="field-validation-valid" data-valmsg-for="Customer.Email" data-valmsg-replace="true"></span>
+        </div>
+        <div>
+            <label class="order" for="Customer_PhoneNumber">PhoneNumber</label>
+            <input type="tel" id="Customer_PhoneNumber" name="Customer.PhoneNumber" value="" />
+        </div>
+        <div>
+            <label class="order" for="Customer_Password">Password</label>
+            <input type="password" class="form-control" data-val="true" data-val-required="The Password field is required." id="Customer_Password" name="Customer.Password" />
+            <span class="field-validation-valid" data-valmsg-for="Customer.Password" data-valmsg-replace="true"></span>
+        </div>
+        <div>
+            <label class="order" for="Customer_Gender">Gender</label>
+            <input type="radio" value="Male" data-val="true" data-val-required="The Gender field is required." id="Customer_Gender" name="Customer.Gender" /> Male
+<input type="radio" value="Female" checked="checked" id="Customer_Gender" name="Customer.Gender" /> Female
+            <span class="field-validation-valid" data-valmsg-for="Customer.Gender" data-valmsg-replace="true"></span>
+        </div>
+        <div class="order validation-summary-valid" data-valmsg-summary="true"><ul><li style="display:none"></li>
+</ul></div>
+        <input type="hidden" id="Customer_Key" name="Customer.Key" value="KeyA" />
+        <input type="submit" />
+    <input name="__RequestVerificationToken" type="hidden" value="{0}" /><input name="NeedSpecialHandle" type="hidden" value="false" /></form>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.Encoded.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.Encoded.html
new file mode 100644
index 0000000000..82eb28c7a5
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.Encoded.html
@@ -0,0 +1,114 @@
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+</head>
+<body>
+<form action="HtmlEncode[[/HtmlGeneration_Order/Submit]]" method="HtmlEncode[[post]]">
+        <div>
+            <label class="HtmlEncode[[order]]" for="HtmlEncode[[Shipping]]">HtmlEncode[[Shipping]]</label>
+            <input id="HtmlEncode[[Shipping]]" name="HtmlEncode[[Shipping]]" size="HtmlEncode[[50]]" type="HtmlEncode[[text]]" value="HtmlEncode[[Your shipping method is UPSP]]" />
+        </div>
+        <div>
+            <label class="HtmlEncode[[order]]" for="HtmlEncode[[ShippingDateTime]]">HtmlEncode[[ShippingDateTime]]</label>
+            <input data-val="HtmlEncode[[true]]" data-val-required="HtmlEncode[[The ShippingDateTime field is required.]]" id="HtmlEncode[[ShippingDateTime]]" name="HtmlEncode[[ShippingDateTime]]" type="HtmlEncode[[datetime-local]]" value="HtmlEncode[[01/01/0001 00:00:00]]" />
+        </div>
+        <div>
+            <label class="HtmlEncode[[order]]" for="HtmlEncode[[Products]]">HtmlEncode[[Products]]</label>
+            <select id="HtmlEncode[[Products]]" multiple="HtmlEncode[[multiple]]" name="HtmlEncode[[Products]]"><option selected="HtmlEncode[[selected]]" value="HtmlEncode[[0]]">HtmlEncode[[Product_0]]</option>
+<option selected="HtmlEncode[[selected]]" value="HtmlEncode[[1]]">HtmlEncode[[Product_1]]</option>
+<option value="HtmlEncode[[2]]">HtmlEncode[[Product_2]]</option>
+</select>
+        </div>
+        <div>
+                <table>
+                    <tr>
+                        <th>
+                            <label for="HtmlEncode[[Number]]">HtmlEncode[[Number]]</label>
+                        </th>
+                        <th>
+                            <label for="HtmlEncode[[ProductName]]">HtmlEncode[[ProductName]]</label>
+                        </th>
+                    </tr>
+                        <tr>
+                            <td>
+                                <input data-val="HtmlEncode[[true]]" data-val-required="HtmlEncode[[The Number field is required.]]" id="HtmlEncode[[ProductDetails_0__Number]]" name="HtmlEncode[[ProductDetails[0].Number]]" type="HtmlEncode[[number]]" value="HtmlEncode[[0]]" />
+                                <span class="HtmlEncode[[field-validation-valid text-danger]]" data-valmsg-for="HtmlEncode[[ProductDetails[0].Number]]" data-valmsg-replace="HtmlEncode[[true]]" style=""></span>
+                            </td>
+                            <td>
+                                <input data-val="HtmlEncode[[true]]" data-val-required="HtmlEncode[[The ProductName field is required.]]" id="HtmlEncode[[ProductDetails_0__ProductName]]" name="HtmlEncode[[ProductDetails[0].ProductName]]" type="HtmlEncode[[text]]" value="HtmlEncode[[Product_0]]" />
+                                <span class="HtmlEncode[[field-validation-valid text-danger]]" data-valmsg-for="HtmlEncode[[ProductDetails[0].ProductName]]" data-valmsg-replace="HtmlEncode[[true]]" style=""></span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input data-val="HtmlEncode[[true]]" data-val-required="HtmlEncode[[The Number field is required.]]" id="HtmlEncode[[ProductDetails_1__Number]]" name="HtmlEncode[[ProductDetails[1].Number]]" type="HtmlEncode[[number]]" value="HtmlEncode[[1]]" />
+                                <span class="HtmlEncode[[field-validation-valid text-danger]]" data-valmsg-for="HtmlEncode[[ProductDetails[1].Number]]" data-valmsg-replace="HtmlEncode[[true]]" style=""></span>
+                            </td>
+                            <td>
+                                <input data-val="HtmlEncode[[true]]" data-val-required="HtmlEncode[[The ProductName field is required.]]" id="HtmlEncode[[ProductDetails_1__ProductName]]" name="HtmlEncode[[ProductDetails[1].ProductName]]" type="HtmlEncode[[text]]" value="HtmlEncode[[Product_1]]" />
+                                <span class="HtmlEncode[[field-validation-valid text-danger]]" data-valmsg-for="HtmlEncode[[ProductDetails[1].ProductName]]" data-valmsg-replace="HtmlEncode[[true]]" style=""></span>
+                            </td>
+                        </tr>
+                </table>
+        </div>
+        <div>
+            <label class="HtmlEncode[[order]]" for="HtmlEncode[[SubstituteProducts]]">HtmlEncode[[SubstituteProducts]]</label>
+            <select id="HtmlEncode[[SubstituteProducts]]" multiple="HtmlEncode[[multiple]]" name="HtmlEncode[[SubstituteProducts]]"><option value="HtmlEncode[[0]]">HtmlEncode[[Product_0]]</option>
+<option value="HtmlEncode[[1]]">HtmlEncode[[Product_1]]</option>
+<option selected="HtmlEncode[[selected]]" value="HtmlEncode[[2]]">HtmlEncode[[Product_2]]</option>
+</select>
+        </div>
+        <div>
+            <label class="HtmlEncode[[order]]" for="HtmlEncode[[OrderDate]]">HtmlEncode[[OrderDate]]</label>
+            <input data-val="HtmlEncode[[true]]" data-val-required="HtmlEncode[[The OrderDate field is required.]]" id="HtmlEncode[[OrderDate]]" name="HtmlEncode[[OrderDate]]" type="HtmlEncode[[datetime]]" value="HtmlEncode[[0001/01/01 00:00:00]]" />
+        </div>
+        <div>
+            <label class="HtmlEncode[[order]]" for="HtmlEncode[[NeedSpecialHandle]]">HtmlEncode[[NeedSpecialHandle]]</label>
+            <input checked="HtmlEncode[[checked]]" data-val="HtmlEncode[[true]]" data-val-required="HtmlEncode[[The NeedSpecialHandle field is required.]]" id="HtmlEncode[[NeedSpecialHandle]]" name="HtmlEncode[[NeedSpecialHandle]]" type="HtmlEncode[[checkbox]]" value="HtmlEncode[[true]]" />
+        </div>
+        <div>
+            <label class="HtmlEncode[[order]]" for="HtmlEncode[[PaymentMethod]]">HtmlEncode[[PaymentMethod]]</label>
+            <select id="HtmlEncode[[PaymentMethod]]" multiple="HtmlEncode[[multiple]]" name="HtmlEncode[[PaymentMethod]]"><option value="HtmlEncode[[Credit]]">HtmlEncode[[Credit]]</option>
+<option selected="HtmlEncode[[selected]]" value="HtmlEncode[[Check]]">HtmlEncode[[Check]]</option>
+</select>
+            <select>
+                <option value="Check">Check</option>
+            </select>
+        </div>
+        <div>
+            <label class="HtmlEncode[[order]]" for="HtmlEncode[[Customer_Number]]">HtmlEncode[[Number]]</label>
+            <input class="HtmlEncode[[form-control]]" data-val="HtmlEncode[[true]]" data-val-range="HtmlEncode[[The field Number must be between 1 and 100.]]" data-val-range-max="HtmlEncode[[100]]" data-val-range-min="HtmlEncode[[1]]" data-val-required="HtmlEncode[[The Number field is required.]]" id="HtmlEncode[[Customer_Number]]" name="HtmlEncode[[Customer.Number]]" type="HtmlEncode[[number]]" value="HtmlEncode[[1]]" />
+            <span class="HtmlEncode[[field-validation-valid]]" data-valmsg-for="HtmlEncode[[Customer.Number]]" data-valmsg-replace="HtmlEncode[[true]]"></span>
+        </div>
+        <div>
+            <label class="HtmlEncode[[order]]" for="HtmlEncode[[Customer_Name]]">HtmlEncode[[Name]]</label>
+            <input id="HtmlEncode[[Customer_Name]]" name="HtmlEncode[[Customer.Name]]" type="HtmlEncode[[text]]" value="HtmlEncode[[NameStringValue]]" />
+        </div>
+        <div>
+            <label class="HtmlEncode[[order]]" for="HtmlEncode[[Customer_Email]]">HtmlEncode[[Email]]</label>
+            <input id="HtmlEncode[[Customer_Email]]" name="HtmlEncode[[Customer.Email]]" type="HtmlEncode[[email]]" value="" />
+            <span class="HtmlEncode[[field-validation-valid]]" data-valmsg-for="HtmlEncode[[Customer.Email]]" data-valmsg-replace="HtmlEncode[[true]]"></span>
+        </div>
+        <div>
+            <label class="HtmlEncode[[order]]" for="HtmlEncode[[Customer_PhoneNumber]]">HtmlEncode[[PhoneNumber]]</label>
+            <input id="HtmlEncode[[Customer_PhoneNumber]]" name="HtmlEncode[[Customer.PhoneNumber]]" type="HtmlEncode[[tel]]" value="" />
+        </div>
+        <div>
+            <label class="HtmlEncode[[order]]" for="HtmlEncode[[Customer_Password]]">HtmlEncode[[Password]]</label>
+            <input class="HtmlEncode[[form-control]]" data-val="HtmlEncode[[true]]" data-val-required="HtmlEncode[[The Password field is required.]]" id="HtmlEncode[[Customer_Password]]" name="HtmlEncode[[Customer.Password]]" type="HtmlEncode[[password]]" />
+            <span class="HtmlEncode[[field-validation-valid]]" data-valmsg-for="HtmlEncode[[Customer.Password]]" data-valmsg-replace="HtmlEncode[[true]]"></span>
+        </div>
+        <div>
+            <label class="HtmlEncode[[order]]" for="HtmlEncode[[Customer_Gender]]">HtmlEncode[[Gender]]</label>
+            <input data-val="HtmlEncode[[true]]" data-val-required="HtmlEncode[[The Gender field is required.]]" id="HtmlEncode[[Customer_Gender]]" name="HtmlEncode[[Customer.Gender]]" type="HtmlEncode[[radio]]" value="HtmlEncode[[Male]]" /> Male
+<input checked="HtmlEncode[[checked]]" id="HtmlEncode[[Customer_Gender]]" name="HtmlEncode[[Customer.Gender]]" type="HtmlEncode[[radio]]" value="HtmlEncode[[Female]]" /> Female
+            <span class="HtmlEncode[[field-validation-valid]]" data-valmsg-for="HtmlEncode[[Customer.Gender]]" data-valmsg-replace="HtmlEncode[[true]]"></span>
+        </div>
+        <div class="HtmlEncode[[validation-summary-valid order]]" data-valmsg-summary="HtmlEncode[[true]]"><ul><li style="display:none"></li>
+</ul></div>
+        <input id="HtmlEncode[[Customer_Key]]" name="HtmlEncode[[Customer.Key]]" type="HtmlEncode[[hidden]]" value="HtmlEncode[[KeyA]]" />
+        <input type="submit"/>
+    <input name="HtmlEncode[[__RequestVerificationToken]]" type="hidden" value="{0}" /><input name="HtmlEncode[[NeedSpecialHandle]]" type="HtmlEncode[[hidden]]" value="HtmlEncode[[false]]" /></form>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.html
new file mode 100644
index 0000000000..ca7a233d43
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.html
@@ -0,0 +1,114 @@
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+</head>
+<body>
+<form action="/HtmlGeneration_Order/Submit" method="post">
+        <div>
+            <label class="order" for="Shipping">Shipping</label>
+            <input id="Shipping" name="Shipping" size="50" type="text" value="Your shipping method is UPSP" />
+        </div>
+        <div>
+            <label class="order" for="ShippingDateTime">ShippingDateTime</label>
+            <input data-val="true" data-val-required="The ShippingDateTime field is required." id="ShippingDateTime" name="ShippingDateTime" type="datetime-local" value="01/01/0001 00:00:00" />
+        </div>
+        <div>
+            <label class="order" for="Products">Products</label>
+            <select id="Products" multiple="multiple" name="Products"><option selected="selected" value="0">Product_0</option>
+<option selected="selected" value="1">Product_1</option>
+<option value="2">Product_2</option>
+</select>
+        </div>
+        <div>
+                <table>
+                    <tr>
+                        <th>
+                            <label for="Number">Number</label>
+                        </th>
+                        <th>
+                            <label for="ProductName">ProductName</label>
+                        </th>
+                    </tr>
+                        <tr>
+                            <td>
+                                <input data-val="true" data-val-required="The Number field is required." id="ProductDetails_0__Number" name="ProductDetails[0].Number" type="number" value="0" />
+                                <span class="field-validation-valid text-danger" data-valmsg-for="ProductDetails[0].Number" data-valmsg-replace="true" style=""></span>
+                            </td>
+                            <td>
+                                <input data-val="true" data-val-required="The ProductName field is required." id="ProductDetails_0__ProductName" name="ProductDetails[0].ProductName" type="text" value="Product_0" />
+                                <span class="field-validation-valid text-danger" data-valmsg-for="ProductDetails[0].ProductName" data-valmsg-replace="true" style=""></span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input data-val="true" data-val-required="The Number field is required." id="ProductDetails_1__Number" name="ProductDetails[1].Number" type="number" value="1" />
+                                <span class="field-validation-valid text-danger" data-valmsg-for="ProductDetails[1].Number" data-valmsg-replace="true" style=""></span>
+                            </td>
+                            <td>
+                                <input data-val="true" data-val-required="The ProductName field is required." id="ProductDetails_1__ProductName" name="ProductDetails[1].ProductName" type="text" value="Product_1" />
+                                <span class="field-validation-valid text-danger" data-valmsg-for="ProductDetails[1].ProductName" data-valmsg-replace="true" style=""></span>
+                            </td>
+                        </tr>
+                </table>
+        </div>
+        <div>
+            <label class="order" for="SubstituteProducts">SubstituteProducts</label>
+            <select id="SubstituteProducts" multiple="multiple" name="SubstituteProducts"><option value="0">Product_0</option>
+<option value="1">Product_1</option>
+<option selected="selected" value="2">Product_2</option>
+</select>
+        </div>
+        <div>
+            <label class="order" for="OrderDate">OrderDate</label>
+            <input data-val="true" data-val-required="The OrderDate field is required." id="OrderDate" name="OrderDate" type="datetime" value="0001/01/01 00:00:00" />
+        </div>
+        <div>
+            <label class="order" for="NeedSpecialHandle">NeedSpecialHandle</label>
+            <input checked="checked" data-val="true" data-val-required="The NeedSpecialHandle field is required." id="NeedSpecialHandle" name="NeedSpecialHandle" type="checkbox" value="true" />
+        </div>
+        <div>
+            <label class="order" for="PaymentMethod">PaymentMethod</label>
+            <select id="PaymentMethod" multiple="multiple" name="PaymentMethod"><option value="Credit">Credit</option>
+<option selected="selected" value="Check">Check</option>
+</select>
+            <select>
+                <option value="Check">Check</option>
+            </select>
+        </div>
+        <div>
+            <label class="order" for="Customer_Number">Number</label>
+            <input class="form-control" data-val="true" data-val-range="The field Number must be between 1 and 100." data-val-range-max="100" data-val-range-min="1" data-val-required="The Number field is required." id="Customer_Number" name="Customer.Number" type="number" value="1" />
+            <span class="field-validation-valid" data-valmsg-for="Customer.Number" data-valmsg-replace="true"></span>
+        </div>
+        <div>
+            <label class="order" for="Customer_Name">Name</label>
+            <input id="Customer_Name" name="Customer.Name" type="text" value="NameStringValue" />
+        </div>
+        <div>
+            <label class="order" for="Customer_Email">Email</label>
+            <input id="Customer_Email" name="Customer.Email" type="email" value="" />
+            <span class="field-validation-valid" data-valmsg-for="Customer.Email" data-valmsg-replace="true"></span>
+        </div>
+        <div>
+            <label class="order" for="Customer_PhoneNumber">PhoneNumber</label>
+            <input id="Customer_PhoneNumber" name="Customer.PhoneNumber" type="tel" value="" />
+        </div>
+        <div>
+            <label class="order" for="Customer_Password">Password</label>
+            <input class="form-control" data-val="true" data-val-required="The Password field is required." id="Customer_Password" name="Customer.Password" type="password" />
+            <span class="field-validation-valid" data-valmsg-for="Customer.Password" data-valmsg-replace="true"></span>
+        </div>
+        <div>
+            <label class="order" for="Customer_Gender">Gender</label>
+            <input data-val="true" data-val-required="The Gender field is required." id="Customer_Gender" name="Customer.Gender" type="radio" value="Male" /> Male
+<input checked="checked" id="Customer_Gender" name="Customer.Gender" type="radio" value="Female" /> Female
+            <span class="field-validation-valid" data-valmsg-for="Customer.Gender" data-valmsg-replace="true"></span>
+        </div>
+        <div class="validation-summary-valid order" data-valmsg-summary="true"><ul><li style="display:none"></li>
+</ul></div>
+        <input id="Customer_Key" name="Customer.Key" type="hidden" value="KeyA" />
+        <input type="submit"/>
+    <input name="__RequestVerificationToken" type="hidden" value="{0}" /><input name="NeedSpecialHandle" type="hidden" value="false" /></form>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.PartialTagHelperWithoutModel.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.PartialTagHelperWithoutModel.html
new file mode 100644
index 0000000000..81eed3cee9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.PartialTagHelperWithoutModel.html
@@ -0,0 +1 @@
+PartialTagHelperWithoutModel: Hello from partial
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.Encoded.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.Encoded.html
new file mode 100644
index 0000000000..68230861ed
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.Encoded.html
@@ -0,0 +1,20 @@
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+</head>
+<body>
+    <form method="HtmlEncode[[get]]" action="HtmlEncode[[/HtmlGeneration_Home/ProductSubmit]]">
+        <div>
+            <label class="product" for="HtmlEncode[[HomePage]]">HtmlEncode[[HomePage]]</label>
+            <input type="HtmlEncode[[url]]" size="50" id="HtmlEncode[[HomePage]]" name="HtmlEncode[[HomePage]]" value="HtmlEncode[[http://www.contoso.com/]]" />
+        </div>
+        <div>
+            <label class="product" for="HtmlEncode[[Description]]">HtmlEncode[[Description]]</label>
+            <textarea rows="4" cols="50" class="product" id="HtmlEncode[[Description]]" name="HtmlEncode[[Description]]">
+HtmlEncode[[Type the product description]]</textarea>
+        </div>
+        <input type="submit" />
+    </form>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.html
new file mode 100644
index 0000000000..a7e6d03314
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.html
@@ -0,0 +1,20 @@
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+</head>
+<body>
+    <form method="get" action="/HtmlGeneration_Home/ProductSubmit">
+        <div>
+            <label class="product" for="HomePage">HomePage</label>
+            <input type="url" size="50" id="HomePage" name="HomePage" value="http://www.contoso.com/" />
+        </div>
+        <div>
+            <label class="product" for="Description">Description</label>
+            <textarea rows="4" cols="50" class="product" id="Description" name="Description">
+Type the product description</textarea>
+        </div>
+        <input type="submit" />
+    </form>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductList.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductList.html
new file mode 100644
index 0000000000..9ad0850e70
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductList.html
@@ -0,0 +1,59 @@
+<html>
+<head>
+    <meta charset="utf-8" />
+</head>
+<body>
+<form action="/HtmlGeneration_Product" method="post">            <div>
+                <label class="product" for="z0__HomePage">HomePage</label>
+                <input type="url" size="50" disabled="disabled" readonly="readonly" id="z0__HomePage" name="[0].HomePage" value="http://www.contoso.com/" />
+            </div>
+
+<div>
+    <label class="product" for="z0__Number">Number</label>
+    <input type="number" data-val="true" data-val-required="The Number field is required." id="z0__Number" name="[0].Number" value="0" />
+</div>
+<div>
+    <label class="product" for="z0__ProductName">ProductName</label>
+    <input type="text" data-val="true" data-val-required="The ProductName field is required." id="z0__ProductName" name="[0].ProductName" value="Product_0" />
+</div>
+<div>
+    <label class="product" for="z0__Description">Description</label>
+    <textarea rows="4" cols="50" class="product" id="z0__Description" name="[0].Description">
+</textarea>
+</div>            <div>
+                <label class="product" for="z1__HomePage">HomePage</label>
+                <input type="url" size="50" disabled="disabled" readonly="readonly" id="z1__HomePage" name="[1].HomePage" value="" />
+            </div>
+
+<div>
+    <label class="product" for="z1__Number">Number</label>
+    <input type="number" data-val="true" data-val-required="The Number field is required." id="z1__Number" name="[1].Number" value="1" />
+</div>
+<div>
+    <label class="product" for="z1__ProductName">ProductName</label>
+    <input type="text" data-val="true" data-val-required="The ProductName field is required." id="z1__ProductName" name="[1].ProductName" value="Product_1" />
+</div>
+<div>
+    <label class="product" for="z1__Description">Description</label>
+    <textarea rows="4" cols="50" class="product" id="z1__Description" name="[1].Description">
+</textarea>
+</div>            <div>
+                <label class="product" for="z2__HomePage">HomePage</label>
+                <input type="url" size="50" disabled="disabled" readonly="readonly" id="z2__HomePage" name="[2].HomePage" value="" />
+            </div>
+
+<div>
+    <label class="product" for="z2__Number">Number</label>
+    <input type="number" data-val="true" data-val-required="The Number field is required." id="z2__Number" name="[2].Number" value="2" />
+</div>
+<div>
+    <label class="product" for="z2__ProductName">ProductName</label>
+    <input type="text" data-val="true" data-val-required="The ProductName field is required." id="z2__ProductName" name="[2].ProductName" value="Product_2" />
+</div>
+<div>
+    <label class="product" for="z2__Description">Description</label>
+    <textarea rows="4" cols="50" class="product" id="z2__Description" name="[2].Description">
+Product_2 description</textarea>
+</div>        <input type="submit" />
+<input name="__RequestVerificationToken" type="hidden" value="{0}" /></form></body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpers.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpers.html
new file mode 100644
index 0000000000..09796d5ddd
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpers.html
@@ -0,0 +1,74 @@
+<html>
+<head>
+    <meta charset="utf-8" />
+</head>
+<body>
+    <form action="/HtmlGeneration_Product" method="post">
+            <div>
+                <label class="product" for="z0__HomePage">HomePage</label>
+                <input type="url" size="50" disabled="disabled" readonly="readonly" id="z0__HomePage" name="[0].HomePage" value="http://www.contoso.com/" />
+            </div>
+            
+<div>
+    <label class="product" for="z0__Number">Number</label>
+    <input type="number" data-val="true" data-val-required="The Number field is required." id="z0__Number" name="[0].Number" value="0" />
+</div>
+<div>
+    <label class="product" for="z0__ProductName">ProductName</label>
+    <input type="text" data-val="true" data-val-required="The ProductName field is required." id="z0__ProductName" name="[0].ProductName" value="Product_0" />
+</div>
+<div>
+    <label class="product" for="z0__Description">Description</label>
+    <textarea rows="4" cols="50" class="product" id="z0__Description" name="[0].Description">
+</textarea>
+</div>
+            <div>
+                <label class="product" for="z1__HomePage">HomePage</label>
+                <input type="url" size="50" disabled="disabled" readonly="readonly" id="z1__HomePage" name="[1].HomePage" value="" />
+            </div>
+            
+<div>
+    <label class="product" for="z1__Number">Number</label>
+    <input type="number" data-val="true" data-val-required="The Number field is required." id="z1__Number" name="[1].Number" value="1" />
+</div>
+<div>
+    <label class="product" for="z1__ProductName">ProductName</label>
+    <input type="text" data-val="true" data-val-required="The ProductName field is required." id="z1__ProductName" name="[1].ProductName" value="Product_1" />
+</div>
+<div>
+    <label class="product" for="z1__Description">Description</label>
+    <textarea rows="4" cols="50" class="product" id="z1__Description" name="[1].Description">
+</textarea>
+</div>
+            <div>
+                <label class="product" for="z2__HomePage">HomePage</label>
+                <input type="url" size="50" disabled="disabled" readonly="readonly" id="z2__HomePage" name="[2].HomePage" value="" />
+            </div>
+            
+<div>
+    <label class="product" for="z2__Number">Number</label>
+    <input type="number" data-val="true" data-val-required="The Number field is required." id="z2__Number" name="[2].Number" value="2" />
+</div>
+<div>
+    <label class="product" for="z2__ProductName">ProductName</label>
+    <input type="text" data-val="true" data-val-required="The ProductName field is required." id="z2__ProductName" name="[2].ProductName" value="Product_2" />
+</div>
+<div>
+    <label class="product" for="z2__Description">Description</label>
+    <textarea rows="4" cols="50" class="product" id="z2__Description" name="[2].Description">
+Product_2 description</textarea>
+</div>
+        
+        <div>HtmlFieldPrefix = </div>
+        <input type="submit" />
+    <input name="__RequestVerificationToken" type="hidden" value="{0}" /></form>
+
+    
+
+<hr />
+<h2>You might also like these products!</h2>
+<ul>
+        <li><a href="http://www.contoso.com/">THE Best Product</a></li>
+</ul>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpersWithNullModel.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpersWithNullModel.html
new file mode 100644
index 0000000000..20aabb80f3
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpersWithNullModel.html
@@ -0,0 +1,38 @@
+<html>
+<head>
+    <meta charset="utf-8" />
+</head>
+<body>
+    <form action="/HtmlGeneration_Product" method="post">
+            <div>
+                <label class="product" for="z0__HomePage">HomePage</label>
+                <input type="url" size="50" disabled="disabled" readonly="readonly" id="z0__HomePage" name="[0].HomePage" value="" />
+            </div>
+            
+<div>
+    <label class="product" for="z0__Number">Number</label>
+    <input type="number" data-val="true" data-val-required="The Number field is required." id="z0__Number" name="[0].Number" value="" />
+</div>
+<div>
+    <label class="product" for="z0__ProductName">ProductName</label>
+    <input type="text" data-val="true" data-val-required="The ProductName field is required." id="z0__ProductName" name="[0].ProductName" value="" />
+</div>
+<div>
+    <label class="product" for="z0__Description">Description</label>
+    <textarea rows="4" cols="50" class="product" id="z0__Description" name="[0].Description">
+</textarea>
+</div>
+        
+        <div>HtmlFieldPrefix = </div>
+        <input type="submit" />
+    <input name="__RequestVerificationToken" type="hidden" value="{0}" /></form>
+
+    
+
+<hr />
+<h2>You might also like these products!</h2>
+<ul>
+        <li><a href="http://www.contoso.com/">THE Best Product</a></li>
+</ul>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html
new file mode 100644
index 0000000000..680a5729a0
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html
@@ -0,0 +1,118 @@
+<!doctype html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Script</title>
+</head>
+<body>
+    <h2>Script tag helper test</h2>
+    <script src="HtmlEncode[[/]]styles/site.js" data-foo="foo-data1" title="&lt;the title>">
+        // Regular script with comment in body, and extra properties.
+    </script>
+
+    <script src="HtmlEncode[[/blank.js?a=b&c=d]]" data-foo="foo-data2" title="&lt;the title>">
+        // TagHelper script with comment in body, and extra properties.
+    </script>
+<script>(false||document.write("JavaScriptEncode[[<script src="HtmlEncode[[/styles/site.js?a=b&c=d]]" data-foo="foo-data2" title="&lt;the title>"></script>]]"));</script>
+
+    <script src="HtmlEncode[[/blank.js]]" title='"the" title'>
+        // Fallback to globbed src
+    </script>
+<script>(false||document.write("JavaScriptEncode[[<script src="HtmlEncode[[/styles/site.js]]" title='"the" title'></script>]]"));</script>
+
+    <script src="HtmlEncode[[/blank.js]]">
+        // Fallback to globbed src with exclude
+    </script>
+<script>(false||document.write("JavaScriptEncode[[<script src="HtmlEncode[[/styles/site.js]]"></script><script src="HtmlEncode[[/styles/sub/site2.js]]"></script>]]"));</script>
+
+    <script src="HtmlEncode[[/blank.js]]">
+        // Fallback to globbed and static src
+    </script>
+<script>(false||document.write("JavaScriptEncode[[<script src="HtmlEncode[[/styles/site.js]]"></script><script src="HtmlEncode[[/styles/sub/site2.js]]"></script>]]"));</script>
+
+    <script src="HtmlEncode[[/blank.js]]">
+        // Fallback to globbed and static src should de-dupe
+    </script>
+<script>(false||document.write("JavaScriptEncode[[<script src="HtmlEncode[[/styles/site.js]]"></script>]]"));</script>
+
+    <script src="HtmlEncode[[/blank.js]]">
+        // Fallback to globbed src with missing include
+    </script>
+
+    <script src="HtmlEncode[[/blank.js]]">
+        // Fallback to static and globbed src with missing include
+    </script>
+<script>(false||document.write("JavaScriptEncode[[<script src="HtmlEncode[[/styles/site.js]]"></script>]]"));</script>
+
+    <script src="HtmlEncode[[/blank.js]]">
+        // Fallback to globbed src outside of webroot
+    </script>
+
+    <script src="HtmlEncode[[/blank.js]]">
+        // Fallback to globbed src outside of webroot
+    </script>
+
+    <script data-foo="foo-data3">
+        // Valid TagHelper (although no src is provided) script with comment in body, and extra properties.
+    </script>
+<script>(false||document.write("JavaScriptEncode[[<script data-foo="foo-data3" src="HtmlEncode[[/styles/site.js]]"></script>]]"));</script>
+
+    <script src="HtmlEncode[[/blank.js]]">
+        // Invalid TagHelper script with comment in body.
+    </script>
+
+    <!-- Globbed script tag with existing file -->
+    <script src="HtmlEncode[[/styles/site.js]]"></script>
+
+    <!-- Globbed script tag with existing file and exclude -->
+    <script src="HtmlEncode[[/styles/site.js]]"></script><script src="HtmlEncode[[/styles/sub/site2.js]]"></script>
+
+    <script>
+        // Globbed script tag missing include
+    </script>
+
+    <script src="HtmlEncode[[/styles/site.js]]">
+        // Globbed script tag missing include but with static src
+    </script>
+
+    <!-- Globbed script tag with comma separated include pattern -->
+    <script src="HtmlEncode[[/styles/site.js]]"></script><script src="HtmlEncode[[/styles/sub/site2.js]]"></script><script src="HtmlEncode[[/styles/sub/site3.js]]"></script>
+
+    <!-- Globbed script tag with missing file -->
+    
+
+    <!-- Globbed script tag with file outside of webroot -->
+    
+
+    <!-- Globbed script tag with file outside of webroot -->
+    
+
+    <script src="HtmlEncode[[/styles/site.js]]">
+        // Globbed script tag with existing file and static src
+    </script><script src="HtmlEncode[[/styles/sub/site2.js]]"></script>
+
+    <script src="HtmlEncode[[/styles/site.js]]">
+        // Globbed script tag with existing file and static src should dedupe
+    </script>
+
+    <script src="HtmlEncode[[/blank.js]]">
+        // TagHelper script with comment in body, and file version.
+    </script>
+<script>(false||document.write("JavaScriptEncode[[<script src="HtmlEncode[[/styles/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I]]"></script>]]"));</script>
+
+    <script src="HtmlEncode[[/blank.js]]">
+        // Fallback to globbed src with file version.
+    </script>
+<script>(false||document.write("JavaScriptEncode[[<script src="HtmlEncode[[/styles/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I]]"></script>]]"));</script>
+
+    <script src="HtmlEncode[[/styles/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I]]">
+        // Regular script with comment in body, and file version.
+    </script>
+
+    <!-- Globbed script tag with existing files and version -->
+    <script src="HtmlEncode[[/styles/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I]]"></script><script src="HtmlEncode[[/styles/sub/site2.js?v=pwJaxaQxnb-rPAdF2JlAp4xiPNq1XuJFd6TyOOfNF-0]]"></script><script src="HtmlEncode[[/styles/sub/site3.js?v=lmeAMiqm76lnGyqHhu6PIBHAC0Vt46mgVB_KaG_gGdA]]"></script>
+
+    <!-- Globbed script tag with existing file, exclude and version -->
+    <script src="HtmlEncode[[/styles/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I]]"></script><script src="HtmlEncode[[/styles/sub/site2.js?v=pwJaxaQxnb-rPAdF2JlAp4xiPNq1XuJFd6TyOOfNF-0]]"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.html
new file mode 100644
index 0000000000..12b71d6555
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.html
@@ -0,0 +1,118 @@
+<!doctype html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Script</title>
+</head>
+<body>
+    <h2>Script tag helper test</h2>
+    <script src="/styles/site.js" data-foo="foo-data1" title="&lt;the title>">
+        // Regular script with comment in body, and extra properties.
+    </script>
+
+    <script src="/blank.js?a=b&amp;c=d" data-foo="foo-data2" title="&lt;the title>">
+        // TagHelper script with comment in body, and extra properties.
+    </script>
+<script>(false||document.write("\u003Cscript src=\u0022\/styles\/site.js?a=b\u0026amp;c=d\u0022 data-foo=\u0022foo-data2\u0022 title=\u0022\u0026lt;the title\u003E\u0022\u003E\u003C\/script\u003E"));</script>
+
+    <script src="/blank.js" title='"the" title'>
+        // Fallback to globbed src
+    </script>
+<script>(false||document.write("\u003Cscript src=\u0022\/styles\/site.js\u0022 title=\u0027\u0022the\u0022 title\u0027\u003E\u003C\/script\u003E"));</script>
+
+    <script src="/blank.js">
+        // Fallback to globbed src with exclude
+    </script>
+<script>(false||document.write("\u003Cscript src=\u0022\/styles\/site.js\u0022\u003E\u003C\/script\u003E\u003Cscript src=\u0022\/styles\/sub\/site2.js\u0022\u003E\u003C\/script\u003E"));</script>
+
+    <script src="/blank.js">
+        // Fallback to globbed and static src
+    </script>
+<script>(false||document.write("\u003Cscript src=\u0022\/styles\/site.js\u0022\u003E\u003C\/script\u003E\u003Cscript src=\u0022\/styles\/sub\/site2.js\u0022\u003E\u003C\/script\u003E"));</script>
+
+    <script src="/blank.js">
+        // Fallback to globbed and static src should de-dupe
+    </script>
+<script>(false||document.write("\u003Cscript src=\u0022\/styles\/site.js\u0022\u003E\u003C\/script\u003E"));</script>
+
+    <script src="/blank.js">
+        // Fallback to globbed src with missing include
+    </script>
+
+    <script src="/blank.js">
+        // Fallback to static and globbed src with missing include
+    </script>
+<script>(false||document.write("\u003Cscript src=\u0022\/styles\/site.js\u0022\u003E\u003C\/script\u003E"));</script>
+
+    <script src="/blank.js">
+        // Fallback to globbed src outside of webroot
+    </script>
+
+    <script src="/blank.js">
+        // Fallback to globbed src outside of webroot
+    </script>
+
+    <script data-foo="foo-data3">
+        // Valid TagHelper (although no src is provided) script with comment in body, and extra properties.
+    </script>
+<script>(false||document.write("\u003Cscript data-foo=\u0022foo-data3\u0022 src=\u0022\/styles\/site.js\u0022\u003E\u003C\/script\u003E"));</script>
+
+    <script src="/blank.js">
+        // Invalid TagHelper script with comment in body.
+    </script>
+
+    <!-- Globbed script tag with existing file -->
+    <script src="/styles/site.js"></script>
+
+    <!-- Globbed script tag with existing file and exclude -->
+    <script src="/styles/site.js"></script><script src="/styles/sub/site2.js"></script>
+
+    <script>
+        // Globbed script tag missing include
+    </script>
+
+    <script src="/styles/site.js">
+        // Globbed script tag missing include but with static src
+    </script>
+
+    <!-- Globbed script tag with comma separated include pattern -->
+    <script src="/styles/site.js"></script><script src="/styles/sub/site2.js"></script><script src="/styles/sub/site3.js"></script>
+
+    <!-- Globbed script tag with missing file -->
+    
+
+    <!-- Globbed script tag with file outside of webroot -->
+    
+
+    <!-- Globbed script tag with file outside of webroot -->
+    
+
+    <script src="/styles/site.js">
+        // Globbed script tag with existing file and static src
+    </script><script src="/styles/sub/site2.js"></script>
+
+    <script src="/styles/site.js">
+        // Globbed script tag with existing file and static src should dedupe
+    </script>
+
+    <script src="/blank.js">
+        // TagHelper script with comment in body, and file version.
+    </script>
+<script>(false||document.write("\u003Cscript src=\u0022\/styles\/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I\u0022\u003E\u003C\/script\u003E"));</script>
+
+    <script src="/blank.js">
+        // Fallback to globbed src with file version.
+    </script>
+<script>(false||document.write("\u003Cscript src=\u0022\/styles\/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I\u0022\u003E\u003C\/script\u003E"));</script>
+
+    <script src="/styles/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I">
+        // Regular script with comment in body, and file version.
+    </script>
+
+    <!-- Globbed script tag with existing files and version -->
+    <script src="/styles/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I"></script><script src="/styles/sub/site2.js?v=pwJaxaQxnb-rPAdF2JlAp4xiPNq1XuJFd6TyOOfNF-0"></script><script src="/styles/sub/site3.js?v=lmeAMiqm76lnGyqHhu6PIBHAC0Vt46mgVB_KaG_gGdA"></script>
+
+    <!-- Globbed script tag with existing file, exclude and version -->
+    <script src="/styles/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I"></script><script src="/styles/sub/site2.js?v=pwJaxaQxnb-rPAdF2JlAp4xiPNq1XuJFd6TyOOfNF-0"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Warehouse.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Warehouse.html
new file mode 100644
index 0000000000..d86cdb95db
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Warehouse.html
@@ -0,0 +1,15 @@
+<h3>City_1</h3>
+
+<div>
+    <label for="Employee_Name">Name</label>
+    <input type="text" id="Employee_Name" name="Employee.Name" value="EmployeeName_1" />
+</div>
+<div>
+    <label for="Employee_OfficeNumber">OfficeNumber</label>
+    <input type="number" id="Employee_OfficeNumber" name="Employee.OfficeNumber" value="Number_1" />
+</div>
+<div>
+    <label for="Employee_Address">Address</label>
+    <textarea rows="4" cols="50" id="Employee_Address" name="Employee.Address">
+Address_1</textarea>
+</div>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Details.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Details.html
new file mode 100644
index 0000000000..7197db3e89
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Details.html
@@ -0,0 +1,20 @@
+<h3>Vehicle details</h3>
+<div class="left">
+    <div class="display-label">Model</div>
+<div class="display-field">the Fastener</div>
+<div class="display-label">Make</div>
+<div class="display-field">Fast Cars</div>
+<div class="display-label">Vin</div>
+<div class="display-field">87654321</div>
+<div class="display-label">Year</div>
+<div class="display-field">2013</div>
+<div class="display-label">LastUpdatedTrackingId</div>
+<div class="display-field"></div>
+
+    <div class="display-label">
+        InspectedDates
+    </div>
+    <div class="display-field">
+        01/04/2001 00:00:00 -08:00
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.Invalid.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.Invalid.html
new file mode 100644
index 0000000000..99db7e9f37
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.Invalid.html
@@ -0,0 +1,22 @@
+<div class="left">
+<form action="/vehicles/42/edit" method="post"><div class="validation-summary-errors" data-valmsg-summary="true"><ul><li>The field Vin must be a string with a maximum length of 8.</li>
+<li>The field Year must be between 1980 and 2034.</li>
+<li>The field InspectedDates must be a string or array type with a maximum length of &#x27;10&#x27;.</li>
+</ul></div><div class="editor-label"><label for="Model">Model</label></div>
+<div class="editor-field"><input class="text-box single-line" id="Model" name="Model" type="text" value="the Fastener" /> <span class="field-validation-valid" data-valmsg-for="Model" data-valmsg-replace="true"></span></div>
+<div class="editor-label"><label for="Make">Make</label></div>
+<div class="editor-field"><input class="text-box single-line" id="Make" name="Make" type="text" value="Fast Cars" /> <span class="field-validation-valid" data-valmsg-for="Make" data-valmsg-replace="true"></span></div>
+<div class="editor-label"><label for="Vin">Vin</label></div>
+<div class="editor-field"><input class="input-validation-error text-box single-line" data-val="true" data-val-length="The field Vin must be a string with a maximum length of 8." data-val-length-max="8" data-val-required="The Vin field is required." id="Vin" name="Vin" type="text" value="8765432112345678" /> <span class="field-validation-error" data-valmsg-for="Vin" data-valmsg-replace="true">The field Vin must be a string with a maximum length of 8.</span></div>
+<div class="editor-label"><label for="Year">Year</label></div>
+<div class="editor-field"><input class="input-validation-error text-box single-line" data-val="true" data-val-range="The field Year must be between 1980 and 2034." data-val-range-max="2034" data-val-range-min="1980" data-val-required="The Year field is required." id="Year" name="Year" type="number" value="1979" /> <span class="field-validation-error" data-valmsg-for="Year" data-valmsg-replace="true">The field Year must be between 1980 and 2034.</span></div>
+<div class="editor-label"><label for="LastUpdatedTrackingId">LastUpdatedTrackingId</label></div>
+<div class="editor-field"><input class="text-box single-line" id="LastUpdatedTrackingId" name="LastUpdatedTrackingId" type="text" value="" /> <span class="field-validation-valid" data-valmsg-for="LastUpdatedTrackingId" data-valmsg-replace="true"></span></div>
+        <div class="editor-label">
+            <label for="InspectedDates">InspectedDates</label>
+        </div>
+        <div class="editor-field">
+            <input class="text-box single-line" data-val="true" data-val-required="The DateTimeOffset field is required." id="InspectedDates_0_" name="InspectedDates[0]" type="datetime" value="14/10/1979 00:00:00 -08:00" /><input class="text-box single-line" data-val="true" data-val-required="The DateTimeOffset field is required." id="InspectedDates_1_" name="InspectedDates[1]" type="datetime" value="16/10/1979 00:00:00 -08:00" /><input class="text-box single-line" data-val="true" data-val-required="The DateTimeOffset field is required." id="InspectedDates_2_" name="InspectedDates[2]" type="datetime" value="02/11/1979 00:00:00 -08:00" /><input class="text-box single-line" data-val="true" data-val-required="The DateTimeOffset field is required." id="InspectedDates_3_" name="InspectedDates[3]" type="datetime" value="13/11/1979 00:00:00 -08:00" /><input class="text-box single-line" data-val="true" data-val-required="The DateTimeOffset field is required." id="InspectedDates_4_" name="InspectedDates[4]" type="datetime" value="05/12/1979 00:00:00 -08:00" /><input class="text-box single-line" data-val="true" data-val-required="The DateTimeOffset field is required." id="InspectedDates_5_" name="InspectedDates[5]" type="datetime" value="12/12/1979 00:00:00 -08:00" /><input class="text-box single-line" data-val="true" data-val-required="The DateTimeOffset field is required." id="InspectedDates_6_" name="InspectedDates[6]" type="datetime" value="19/12/1979 00:00:00 -08:00" /><input class="text-box single-line" data-val="true" data-val-required="The DateTimeOffset field is required." id="InspectedDates_7_" name="InspectedDates[7]" type="datetime" value="26/12/1979 00:00:00 -08:00" /><input class="text-box single-line" data-val="true" data-val-required="The DateTimeOffset field is required." id="InspectedDates_8_" name="InspectedDates[8]" type="datetime" value="28/12/1979 00:00:00 -08:00" /><input class="text-box single-line" data-val="true" data-val-required="The DateTimeOffset field is required." id="InspectedDates_9_" name="InspectedDates[9]" type="datetime" value="29/12/1979 00:00:00 -08:00" /><input class="text-box single-line" data-val="true" data-val-required="The DateTimeOffset field is required." id="InspectedDates_10_" name="InspectedDates[10]" type="datetime" value="01/04/1980 00:00:00 -08:00" />
+        </div>
+        <input type="submit" value="Update" />
+</form></div>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.html
new file mode 100644
index 0000000000..e5c6ba4ef3
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.html
@@ -0,0 +1,20 @@
+<div class="left">
+<form action="/vehicles/42/edit" method="post"><div class="validation-summary-valid" data-valmsg-summary="true"><ul><li style="display:none"></li>
+</ul></div><div class="editor-label"><label for="Model">Model</label></div>
+<div class="editor-field"><input class="text-box single-line" id="Model" name="Model" type="text" value="the Fastener" /> <span class="field-validation-valid" data-valmsg-for="Model" data-valmsg-replace="true"></span></div>
+<div class="editor-label"><label for="Make">Make</label></div>
+<div class="editor-field"><input class="text-box single-line" id="Make" name="Make" type="text" value="Fast Cars" /> <span class="field-validation-valid" data-valmsg-for="Make" data-valmsg-replace="true"></span></div>
+<div class="editor-label"><label for="Vin">Vin</label></div>
+<div class="editor-field"><input class="text-box single-line" data-val="true" data-val-length="The field Vin must be a string with a maximum length of 8." data-val-length-max="8" data-val-required="The Vin field is required." id="Vin" name="Vin" type="text" value="87654321" /> <span class="field-validation-valid" data-valmsg-for="Vin" data-valmsg-replace="true"></span></div>
+<div class="editor-label"><label for="Year">Year</label></div>
+<div class="editor-field"><input class="text-box single-line" data-val="true" data-val-range="The field Year must be between 1980 and 2034." data-val-range-max="2034" data-val-range-min="1980" data-val-required="The Year field is required." id="Year" name="Year" type="number" value="2013" /> <span class="field-validation-valid" data-valmsg-for="Year" data-valmsg-replace="true"></span></div>
+<div class="editor-label"><label for="LastUpdatedTrackingId">LastUpdatedTrackingId</label></div>
+<div class="editor-field"><input class="text-box single-line" id="LastUpdatedTrackingId" name="LastUpdatedTrackingId" type="text" value="" /> <span class="field-validation-valid" data-valmsg-for="LastUpdatedTrackingId" data-valmsg-replace="true"></span></div>
+        <div class="editor-label">
+            <label for="InspectedDates">InspectedDates</label>
+        </div>
+        <div class="editor-field">
+            <input class="text-box single-line" data-val="true" data-val-required="The DateTimeOffset field is required." id="InspectedDates_0_" name="InspectedDates[0]" type="datetime" value="01/04/2001 00:00:00 -08:00" /><input class="text-box single-line" data-val="true" data-val-required="The DateTimeOffset field is required." id="InspectedDates_1_" name="InspectedDates[1]" type="datetime" value="01/01/0001 00:00:00 &#x2B;00:00" />
+        </div>
+        <input type="submit" value="Update" />
+</form></div>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorPageExecutionInstrumentationWebSite.Home.ViewWithPartial.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorPageExecutionInstrumentationWebSite.Home.ViewWithPartial.html
new file mode 100644
index 0000000000..81cbd4fb84
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorPageExecutionInstrumentationWebSite.Home.ViewWithPartial.html
@@ -0,0 +1,20 @@
+/Views/_ViewStart.cshtml: Non-literal at 96 contains 16 characters.
+/Views/_ViewStart.cshtml: Literal at 112 contains 2 characters.
+/Views/Home/ViewWithPartial.cshtml: Literal at 0 contains 27 characters.
+/Views/Home/ViewWithPartial.cshtml: Non-literal at 28 contains 39 characters.
+/Views/Home/_PartialView.cshtml: Literal at 31 contains 2 characters.
+/Views/Home/_PartialView.cshtml: Literal at 33 contains 8 characters.
+/Views/Home/_PartialView.cshtml: Non-literal at 41 contains 4 characters.
+/Views/Home/_PartialView.cshtml: Literal at 45 contains 1 characters.
+/Views/Home/_PartialView.cshtml: Literal at 46 contains 20 characters.
+/Views/Home/ViewWithPartial.cshtml: Literal at 67 contains 2 characters.
+/Views/Home/_PartialView.cshtml: Literal at 31 contains 2 characters.
+/Views/Home/_PartialView.cshtml: Literal at 33 contains 8 characters.
+/Views/Home/_PartialView.cshtml: Non-literal at 41 contains 4 characters.
+/Views/Home/_PartialView.cshtml: Literal at 45 contains 1 characters.
+/Views/Home/_PartialView.cshtml: Literal at 46 contains 20 characters.
+/Views/_Layout.cshtml: Literal at 0 contains 7 characters.
+/Views/_Layout.cshtml: Non-literal at 8 contains 12 characters.
+/Views/_Layout.cshtml: Literal at 20 contains 2 characters.
+/Views/_Layout.cshtml: Non-literal at 23 contains 12 characters.
+/Views/_Layout.cshtml: Literal at 35 contains 10 characters.
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorPagesWebSite.SimpleForms.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorPagesWebSite.SimpleForms.html
new file mode 100644
index 0000000000..ef06135e61
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorPagesWebSite.SimpleForms.html
@@ -0,0 +1,7 @@
+<form></form>
+<form method="get"></form>
+<form method="post"><input name="__RequestVerificationToken" type="hidden" value="{0}" /></form>
+<form action="" method="post"><input name="__RequestVerificationToken" type="hidden" value="{0}" /></form>
+<form action="/Foo/Bar/Baz.html" method="get"></form>
+<form action="/Foo/Bar/Baz.html" method="post"></form>
+<form action="/RedirectToPage" method="post"><input name="__RequestVerificationToken" type="hidden" value="{0}" /></form>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.AddTagHelperComponent.AddComponent.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.AddTagHelperComponent.AddComponent.html
new file mode 100644
index 0000000000..bfd9e6a783
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.AddTagHelperComponent.AddComponent.html
@@ -0,0 +1,6 @@
+<head inject>
+Hello from Head Tag Helper Component
+<script>'This was injected!!'</script></head>
+<body inject>
+Hello from Body Tag Helper Component
+Processed TagHelperComponent added from controller.<script>'This was injected!!'</script>Processed TagHelperComponent added from view.</body>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Body.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Body.html
new file mode 100644
index 0000000000..9d89dab30b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Body.html
@@ -0,0 +1,4 @@
+<body inject="true">
+Hello from Body Tag Helper Component
+<p>NewValue</p>
+<script>'This was injected!!'</script></body>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Head.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Head.html
new file mode 100644
index 0000000000..f4ecb47f0a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Head.html
@@ -0,0 +1,3 @@
+<head inject="true">
+Hello from Head Tag Helper Component
+<script>'This was injected!!'</script></head>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.Encoded.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.Encoded.html
new file mode 100644
index 0000000000..ce444b8c19
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.Encoded.html
@@ -0,0 +1,33 @@
+<html manifest="HtmlEncode[[/]]Person">
+<head>
+    <base href="HtmlEncode[[/]]A+Really(Crazy),Url.Is:This/HtmlEncode[[John Doe]]/Detail" target="_blank">
+</head>
+<body>
+    <dl itemscope itemid="HtmlEncode[[/]]Url"></dl>
+    <a href="HtmlEncode[[/]]Person">Person</a>
+    <area href="HtmlEncode[[/]]Person/HtmlEncode[[John Doe]]" alt="Url stuff">
+    <link href="HtmlEncode[[/]]Person/HtmlEncode[[John Doe]]/CSS" rel="stylesheet">
+    <video poster=HtmlEncode[[~/SomeUrl]] src='HtmlEncode[[~/SomeUrl]]/HtmlEncode[[video]]' />
+    <audio src="HtmlEncode[[~/SomeUrl]]">
+        <source src="HtmlEncode[[/]]Person" srcset="HtmlEncode[[/]]Person">
+        <track src="HtmlEncode[[/]]emailHtmlEncode[[~/SomeUrl]]">
+    </audio>
+    <embed src="HtmlEncode[[/]]email@dyanmicUrl">
+    <iframe src=HtmlEncode[[~/SomeUrl]] />
+    <img src="HtmlEncode[[/]]HtmlEncode[[John Doe]]" srcset="HtmlEncode[[/]]HtmlEncode[[John Doe]]">
+    <script src="HtmlEncode[[/]]Person/HtmlEncode[[John Doe]]/JS"></script>
+    <input src="HtmlEncode[[/]]/Person" itemscope itemid="HtmlEncode[[/]]Person" formaction="HtmlEncode[[~/SomeUrl]]">
+    <button formaction="HtmlEncode[[/]]\Person" />
+    <form action="HtmlEncode[[/]]~Person" />
+    <blockquote cite="HtmlEncode[[/]]Person" />
+    <del cite="HtmlEncode[[/]]Person" />
+    <ins cite="HtmlEncode[[/]]Person" />
+    <q cite="HtmlEncode[[/]]Person" />
+    <menu>
+        <menuitem icon="HtmlEncode[[/]]Person" />
+    </menu>
+    <object data="HtmlEncode[[/]]Person" archive="HtmlEncode[[/]]Person/HtmlEncode[[John Doe]]" data="HtmlEncode[[/]]Person" archive="HtmlEncode[[/]]Person/HtmlEncode[[John Doe]]" />
+    <object archive="~/Person/HtmlEncode[[John Doe]] " />
+    <applet archive="HtmlEncode[[/]]A+Really(Crazy),Url.Is:This/HtmlEncode[[John Doe]]/Detail" />
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.html
new file mode 100644
index 0000000000..f12fd1b500
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.html
@@ -0,0 +1,33 @@
+<html manifest="/Person">
+<head>
+    <base href="/A+Really(Crazy),Url.Is:This/John Doe/Detail" target="_blank">
+</head>
+<body>
+    <dl itemscope itemid="/Url"></dl>
+    <a href="/Person">Person</a>
+    <area href="/Person/John Doe" alt="Url stuff">
+    <link href="/Person/John Doe/CSS" rel="stylesheet">
+    <video poster=~/SomeUrl src='~/SomeUrl/video' />
+    <audio src="~/SomeUrl">
+        <source src="/Person" srcset="/Person">
+        <track src="/email~/SomeUrl">
+    </audio>
+    <embed src="/email@dyanmicUrl">
+    <iframe src=~/SomeUrl />
+    <img src="/John Doe" srcset="/John Doe">
+    <script src="/Person/John Doe/JS"></script>
+    <input src="//Person" itemscope itemid="/Person" formaction="/SomeUrl">
+    <button formaction="/\Person" />
+    <form action="/~Person" />
+    <blockquote cite="/Person" />
+    <del cite="/Person" />
+    <ins cite="/Person" />
+    <q cite="/Person" />
+    <menu>
+        <menuitem icon="/Person" />
+    </menu>
+    <object data="/Person" archive="/Person/John Doe" data="/Person" archive="/Person/John Doe" />
+    <object archive="~/Person/John Doe " />
+    <applet archive="/A+Really(Crazy),Url.Is:This/John Doe/Detail" />
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.Invalid.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.Invalid.html
new file mode 100644
index 0000000000..77ad4a0012
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.Invalid.html
@@ -0,0 +1,81 @@
+
+
+<!DOCTYPE html>
+
+
+<html>
+<head>
+    <meta name="viewport" content="width=device-width" />
+    <title>Create</title>
+</head>
+<body>
+
+    <form action="/Employee/Create" method="post">
+
+        <div class="form-horizontal">
+            <h4>Employee</h4>
+            <hr />
+            <div class="text-danger validation-summary-errors" data-valmsg-summary="true">
+            <ul><li>The field Age must be between 10 and 100.</li>
+<li>The JoinDate field is required.</li>
+<li>The value &#x27;z&#x27; is not valid for Salary.</li>
+</ul></div>
+            <div class="form-group">
+                <label class="control-label col-md-2" for="Age">Age</label>
+                <div class="col-md-10">
+                    <input class="form-control input-validation-error" type="number" data-val="true" data-val-range="The field Age must be between 10 and 100." data-val-range-max="100" data-val-range-min="10" data-val-required="The Age field is required." id="Age" name="Age" value="1000" />
+                    <span class="field-validation-error" data-valmsg-for="Age" data-valmsg-replace="true">The field Age must be between 10 and 100.</span>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-md-2" for="Email">Email</label>
+                <div class="col-md-10">
+                    <input class="form-control" type="email" id="Email" name="Email" value="a@b.com" />
+                    <span class="field-validation-valid" data-valmsg-for="Email" data-valmsg-replace="true"></span>
+                </div>
+            </div>
+            <input type="hidden" value="0" data-val="true" data-val-required="The EmployeeId field is required." id="EmployeeId" name="EmployeeId" />
+            <div class="form-group">
+                <label class="control-label col-md-2" for="FullName">Full Name</label>
+                <div class="col-md-10">
+                    <input class="form-control" type="text" id="FullName" name="FullName" value="Boo" />
+                    <span class="field-validation-valid" data-valmsg-for="FullName" data-valmsg-replace="true"></span>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-md-2" for="Gender">Gender</label>
+                <div class="col-md-10">
+                    <input type="radio" value="M" checked="checked" id="Gender" name="Gender" /> Male
+                    <input type="radio" value="F" id="Gender" name="Gender" /> Female
+                    <span class="field-validation-valid" data-valmsg-for="Gender" data-valmsg-replace="true"></span>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-md-2" for="JoinDate">JoinDate</label>
+                <div class="col-md-10">
+                    <input class="form-control input-validation-error" type="date" data-val="true" data-val-required="The JoinDate field is required." id="JoinDate" name="JoinDate" value="" />
+                    <span class="field-validation-error" data-valmsg-for="JoinDate" data-valmsg-replace="true">The JoinDate field is required.</span>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-md-2" for="Salary">Salary</label>
+                <div class="col-md-10">
+                    <input class="form-control input-validation-error" type="number" id="Salary" name="Salary" value="z" />
+                    <span class="field-validation-error" data-valmsg-for="Salary" data-valmsg-replace="true">The value &#x27;z&#x27; is not valid for Salary.</span>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <div class="col-md-offset-2 col-md-10">
+                    <input type="submit" value="Create" class="btn btn-default" />
+                </div>
+            </div>
+        </div>
+    </form>
+
+    <div>
+        <a href="/Employee">Back to List</a>
+    </div>
+</body>
+</html>
+
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.html
new file mode 100644
index 0000000000..441241eb84
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.html
@@ -0,0 +1,79 @@
+
+
+<!DOCTYPE html>
+
+
+<html>
+<head>
+    <meta name="viewport" content="width=device-width" />
+    <title>Create</title>
+</head>
+<body>
+
+    <form action="/Employee/Create" method="post">
+
+        <div class="form-horizontal">
+            <h4>Employee</h4>
+            <hr />
+            <div class="text-danger validation-summary-valid" data-valmsg-summary="true">
+            <ul><li style="display:none"></li>
+</ul></div>
+            <div class="form-group">
+                <label class="control-label col-md-2" for="Age">Age</label>
+                <div class="col-md-10">
+                    <input class="form-control" type="number" data-val="true" data-val-range="The field Age must be between 10 and 100." data-val-range-max="100" data-val-range-min="10" data-val-required="The Age field is required." id="Age" name="Age" value="" />
+                    <span class="field-validation-valid" data-valmsg-for="Age" data-valmsg-replace="true"></span>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-md-2" for="Email">Email</label>
+                <div class="col-md-10">
+                    <input class="form-control" type="email" id="Email" name="Email" value="" />
+                    <span class="field-validation-valid" data-valmsg-for="Email" data-valmsg-replace="true"></span>
+                </div>
+            </div>
+            <input type="hidden" value="0" data-val="true" data-val-required="The EmployeeId field is required." id="EmployeeId" name="EmployeeId" />
+            <div class="form-group">
+                <label class="control-label col-md-2" for="FullName">Full Name</label>
+                <div class="col-md-10">
+                    <input class="form-control" type="text" id="FullName" name="FullName" value="" />
+                    <span class="field-validation-valid" data-valmsg-for="FullName" data-valmsg-replace="true"></span>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-md-2" for="Gender">Gender</label>
+                <div class="col-md-10">
+                    <input type="radio" value="M" id="Gender" name="Gender" /> Male
+                    <input type="radio" value="F" id="Gender" name="Gender" /> Female
+                    <span class="field-validation-valid" data-valmsg-for="Gender" data-valmsg-replace="true"></span>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-md-2" for="JoinDate">JoinDate</label>
+                <div class="col-md-10">
+                    <input class="form-control" type="date" data-val="true" data-val-required="The JoinDate field is required." id="JoinDate" name="JoinDate" value="" />
+                    <span class="field-validation-valid" data-valmsg-for="JoinDate" data-valmsg-replace="true"></span>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-md-2" for="Salary">Salary</label>
+                <div class="col-md-10">
+                    <input class="form-control" type="number" id="Salary" name="Salary" value="" />
+                    <span class="field-validation-valid" data-valmsg-for="Salary" data-valmsg-replace="true"></span>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <div class="col-md-offset-2 col-md-10">
+                    <input type="submit" value="Create" class="btn btn-default" />
+                </div>
+            </div>
+        </div>
+    </form>
+
+    <div>
+        <a href="/Employee">Back to List</a>
+    </div>
+</body>
+</html>
+
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Details.AfterCreate.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Details.AfterCreate.html
new file mode 100644
index 0000000000..8bd63b0284
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Details.AfterCreate.html
@@ -0,0 +1,59 @@
+
+<!DOCTYPE html>
+
+<html>
+<head>
+    <meta name="viewport" content="width=device-width" />
+    <title>Details</title>
+</head>
+<body>
+
+
+<div>
+    <h4>Employee</h4>
+    <hr />
+    <dl class="dl-horizontal">
+        <dt>
+            Age
+        </dt>
+        <dd>
+            22
+        </dd>
+        <dt>
+            Email
+        </dt>
+        <dd>
+            <a href="mailto:a@b.com">a@b.com</a>
+        </dd>
+        <dt>
+            Full Name
+        </dt>
+        <dd>
+            Boo
+        </dd>
+        <dt>
+            Gender
+        </dt>
+        <dd>
+            M
+        </dd>
+        <dt>
+            JoinDate
+        </dt>
+        <dd>
+            01/12/2014
+        </dd>
+        <dt>
+            Salary
+        </dt>
+        <dd>
+            Not specified
+        </dd>
+    </dl>
+</div>
+<p>
+        <a href="/Employee">Back to List</a>
+</p>
+</body>
+</html>
+
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.DuplicateAntiforgeryTokenRegistration.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.DuplicateAntiforgeryTokenRegistration.html
new file mode 100644
index 0000000000..4abba03e7e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.DuplicateAntiforgeryTokenRegistration.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+    <form action="/Employee/DuplicateAntiforgeryTokenRegistration" method="post"><input name="__RequestVerificationToken" type="hidden" value="{0}" /></form>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.CustomEncoder.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.CustomEncoder.html
new file mode 100644
index 0000000000..c0d42ca346
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.CustomEncoder.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Using a custom HTML encoder - My MVC 6 Application</title>
+    </head>
+    <body>
+        <h1>MVC 6 - Using a custom HTML encoder</h1>
+        <div>
+            
+
+<pre>Custom encoder: Custom[[Outer knows <b>1 < 4</b>]]
+<inner>Custom[[Inner knows <b>1 < 4</b>]]</inner><br />Outer knows &lt;b&gt;2 &lt; 4&lt;/b&gt;
+<inner>Inner knows &lt;b&gt;2 &lt; 4&lt;/b&gt;</inner></pre>
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.Index.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.Index.html
new file mode 100644
index 0000000000..41fc219acc
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.Index.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Using the default HTML encoder - My MVC 6 Application</title>
+    </head>
+    <body>
+        <h1>MVC 6 - Using the default HTML encoder</h1>
+        <div>
+            
+
+<pre>Default encoder: Outer knows &lt;b&gt;1 &lt; 4&lt;/b&gt;
+<pre>Default encoder: Inner knows &lt;b&gt;1 &lt; 4&lt;/b&gt;</pre></pre>
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.NullEncoder.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.NullEncoder.html
new file mode 100644
index 0000000000..0c693004db
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.NullEncoder.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Using the null HTML encoder - My MVC 6 Application</title>
+    </head>
+    <body>
+        <h1>MVC 6 - Using the null HTML encoder</h1>
+        <div>
+            
+
+<pre>Outer knows &lt;b&gt;2 &lt; 4&lt;/b&gt;
+<inner>Inner knows &lt;b&gt;2 &lt; 4&lt;/b&gt;</inner><br />Null encoder: Outer knows <b>1 < 4</b>
+<inner>Inner knows <b>1 < 4</b></inner></pre>
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.ThreeEncoders.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.ThreeEncoders.html
new file mode 100644
index 0000000000..ebf91357fb
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.ThreeEncoders.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Using three HTML encoders - My MVC 6 Application</title>
+    </head>
+    <body>
+        <h1>MVC 6 - Using three HTML encoders</h1>
+        <div>
+            
+
+<pre>Custom encoder: Custom[[Outer knows <b>1 < 4</b>]]
+<pre>Default encoder: Custom[[Inner knows <b>1 < 4</b>]]</pre><br />Default encoder: Outer knows &lt;b&gt;2 &lt; 4&lt;/b&gt;
+<pre>Default encoder: Inner knows &lt;b&gt;2 &lt; 4&lt;/b&gt;</pre><br />Null encoder: Outer knows <b>3 < 4</b>
+<pre>Default encoder: Inner knows <b>3 < 4</b></pre></pre>
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.TwoEncoders.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.TwoEncoders.html
new file mode 100644
index 0000000000..53b8fd8475
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.TwoEncoders.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Using two HTML encoders - My MVC 6 Application</title>
+    </head>
+    <body>
+        <h1>MVC 6 - Using two HTML encoders</h1>
+        <div>
+            
+
+<pre>Custom encoder: Custom[[Outer knows <b>1 < 4</b>]]
+<inner>Custom[[Inner knows <b>1 < 4</b>]]</inner><br />Outer knows &lt;b&gt;3 &lt; 4&lt;/b&gt;
+<inner>Inner knows &lt;b&gt;3 &lt; 4&lt;/b&gt;</inner><br />Null encoder: Outer knows <b>2 < 4</b>
+<inner>Inner knows <b>2 < 4</b></inner></pre>
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.About.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.About.html
new file mode 100644
index 0000000000..e675616a89
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.About.html
@@ -0,0 +1,37 @@
+
+
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>About - My ASP.NET Application</title>
+
+    
+</head>
+<body>
+    <h1 style="font-family: cursive;">ASP.NET vNext - About</h1>
+    <p>| <a href="/" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My Home</a>
+       | <a href="/home/about" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My About</a> 
+       | <a href="/home/help" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My Help</a> |</p>
+    <div>
+        
+
+
+<div>
+    <p>Hello, you've reached the about page.</p>
+
+    <h3>Information about our website (outdated):</h3>
+    <section><p><strong>Version:</strong> 1.1</p>
+<p><strong>Copyright Year:</strong> 1990</p>
+<p><strong>Approved:</strong> True</p>
+<p><strong>Number of tags to show:</strong> 30</p>
+</section>
+</div>
+        <hr />
+        <footer>
+            
+        </footer>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Help.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Help.html
new file mode 100644
index 0000000000..0a20fbb435
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Help.html
@@ -0,0 +1,29 @@
+
+
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Help - My ASP.NET Application</title>
+
+    
+</head>
+<body>
+    <h1 style="font-family: cursive;">ASP.NET vNext - Help</h1>
+    <p>| <a href="/" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My Home</a>
+       | <a href="/home/about" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My About</a> 
+       | <a href="/home/help" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My Help</a> |</p>
+    <div>
+        
+
+<div>
+    <p>Hello, you've reached the help page. If you're having troubles try visiting our <a href="/?approved=true">My Approved Home Page</a></p>
+</div>
+        <hr />
+        <footer>
+            
+        </footer>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Index.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Index.html
new file mode 100644
index 0000000000..27bc4cf95a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Index.html
@@ -0,0 +1,56 @@
+
+
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Home Page - My ASP.NET Application</title>
+
+    
+    <style>
+        h1 {
+            color:red;
+            font-size:2em;
+        }
+    </style>
+
+</head>
+<body>
+    <h1 style="font-family: cursive;">ASP.NET vNext - Home Page</h1>
+    <p>| <a href="/" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My Home</a>
+       | <a href="/home/about" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My About</a> 
+       | <a href="/home/help" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My Help</a> |</p>
+    <div>
+        
+
+
+
+
+<div>
+    <p>This website has <em><strong style="font-size: 1.25em;text-decoration: underline;">not</strong></em> been approved yet. Visit <strong><a target="_blank" href="http://www.contoso.com">www.contoso.com</a></strong> for <strong>more</strong> information.</p>
+</div>
+
+<div>
+    <h3 style="font-family: cursive;">Current Tag Cloud from Tag Helper</h3>
+    <div>Lorem,ipsum,dolor,sit,amet,consectetur,adipisicing,elit,sed,do,eiusmod,tempor,incididunt,ut,labore,et,dolore,magna,aliquaUt,enim</div>
+    <h3 style="font-family: cursive;">Current Tag Cloud from ViewComponentHelper:</h3>
+    <section><b>Lorem,ipsum,dolor,sit,amet,consectetur,adipisicing,elit,sed,do,eiusmod,tempor,incididunt,ut,labore</b></section>
+<br /><p><em>Rendering Template:</em></p>
+<div><h3 style="font-family: cursive;">Tag Cloud from Template: </h3>Lorem,ipsum,dolor,sit,amet,consectetur,adipisicing,elit,sed,do,eiusmod,tempor,incididunt,ut,labore,et,dolore,magna,aliquaUt,enim</div></div>
+
+<div>
+    <h3 style="font-family: cursive;">Dictionary Valued Model Expression</h3>
+    <div><ul><li>TagsToShow</li><li>Version.Build</li></ul></div>
+</div>
+
+
+        <hr />
+        <footer>
+            
+    
+
+        </footer>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.Encoded.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.Encoded.html
new file mode 100644
index 0000000000..944255327a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.Encoded.html
@@ -0,0 +1,18 @@
+
+
+
+<input checked="HtmlEncode[[checked]]" processed />
+<input checked="HtmlEncode[[checked]]" processed />
+<input processed />
+<input processed />
+<input checked="  HtmlEncode[[True]]    " processed />
+<input checked="  HtmlEncode[[False]]    " processed />
+<input checked="    HtmlEncode[[value]]: HtmlEncode[[True]]   " processed />
+<input checked="    value: HtmlEncode[[False]]   " processed />
+<input checked="HtmlEncode[[True]] HtmlEncode[[True]]" processed />
+<input checked="   HtmlEncode[[False]]  HtmlEncode[[True]]" processed />
+<input processed />
+<input checked="" processed />
+<input checked="   " processed />
+<input checked=" HtmlEncode[[value]] HtmlEncode[[True]]" processed />
+<input checked=" True " processed />
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.html
new file mode 100644
index 0000000000..d1a78630dc
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.html
@@ -0,0 +1,18 @@
+
+
+
+<input checked="checked" processed />
+<input checked="checked" processed />
+<input processed />
+<input processed />
+<input checked="  True    " processed />
+<input checked="  False    " processed />
+<input checked="    value: True   " processed />
+<input checked="    value: False   " processed />
+<input checked="True True" processed />
+<input checked="   False  True" processed />
+<input processed />
+<input checked="" processed />
+<input checked="   " processed />
+<input checked=" value True" processed />
+<input checked=" True " processed />
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.ViewComponentTagHelpers.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.ViewComponentTagHelpers.html
new file mode 100644
index 0000000000..b6caedd04c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.ViewComponentTagHelpers.html
@@ -0,0 +1,47 @@
+
+
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title> - My ASP.NET Application</title>
+
+    
+</head>
+<body>
+    <h1 style="font-family: cursive;">ASP.NET vNext - </h1>
+    <p>| <a href="/" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My Home</a>
+       | <a href="/home/about" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My About</a> 
+       | <a href="/home/help" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My Help</a> |</p>
+    <div>
+        
+<div>Items: </div>
+<div>
+        <strong>Foo</strong><br/>
+            <span>One</span>
+            <span>Two</span>
+            <span>Three</span>
+</div>
+<div>Items: </div>
+<div>
+        <strong>foo</strong><br/>
+            <span>One</span>
+            <span>Two</span>
+            <span>Three</span>
+</div>
+<div id="ascii" style="font-family:Courier New, Courier, monospace; font-size: 6px">
+    <br>???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????+<br>???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????+<br>??????????????????????????????????????????????????????????????????????????????????????????????????I77III$77I7III???????????????????????????????????????????????????????????????????????????????????????+<br>?????????????????????????????????????????????????????????????????????????????????????????I??7$OO8ODNNDDDNNNNDDNN8Z8Z$77????????????????????????????????????????????????????????????????????????????????+<br>?????????????????????????????????????????????????????????????????????????????????????I7IZO88NDNNDDNNMNNNMMNMNNMNNMMNDDDDOOII???????????????????????????????????????????????????????????????????????????+<br>???????????????????????????????????????????????????????????????????????????????I?7I$ZDN8DNNNNNNDNNNNNMNMMMMMMMNNNMNNMNNNDDDD88$$???????????????????????????????????????????????????????????????????????+<br>???????????????????????????????????????????????????????????????????????????I??7O88DDDNNNDNNNNNNNDDDNNNNNNMNNNNNMNNMMNMNNNNNDNN8D8Z$$???????????????????????????????????????????????????????????????????+<br>???????????????????????????????????????????????????????????????????????????I$O8DDDNDNNDNNDDDNNNDNNNNNDNNNNNNNNNNNNNNDMMMNMMNNNND8D88$7??+??????????????????????????????????????????????????????????????+<br>?????????????????????????????????????????????????????????????????????????7Z8NDDDNNNNDNDNNNNDNNNNNNNNDNNDNNNNDNNNNNNNNNNNNNMNNMNNNDDDOD$O$??????????????????????????????????????????????????????????????+<br>??????????????????????????????????????????????????????????????????????I$8DNNNNDNNNDNNDDDD8DNDNNNDDDDDDDDDDDNDNNNNNNDDNNNNNMMNNNNNNND8NZDD8O$I??????????????????????????????????????????????????????????+<br>???????????????????????????????????????????????????????????????????I7O8DDNDNNNNNNNNNN8D8DNDNDD8DDDD88DDD8D8DDDDNNNNNNNDNDDDNNNDDMMNDNDDND88DOZ?????????????????????????????????????????????????????????+<br>?????????????????????????????????????????????????????????????????IIO88NDDDNNDNDNDDD88O88DDDDDN8DD8888O88888DDDDNDDN8D8DDDDDDDDDDDNNNDDNNDNDOOO$I???????????????????????????????????????????????????????+<br>????????????????????????????????????????????????????????????????IONDDNDDNMNNND888OZZOOODDO888ODO8OOZOOOOOO88888DDDDDD8DDDD88888DDNNNN8NDNDDO8D8OZ??????????????????????????????????????????????????????+<br>??????????????????????????????????????????????????????????????I7OD8NDDD8DNDNN88OZ$$$$ZOOO8888OOOOZOOZZZZOZZ8888888OOOZ8OOOOOO8O88888NNNDN8DDNO888O$I???????????????????????????????????????????????????+<br>??????????????????????????????????????????????????????????????7ZDDDDNNDNDND8OZZZ$$$ZZZOZOOO8OZOZZZZ$Z$ZZZOO$ZZOOOOOZOZZZZZZOOOOOOOO88DDNN8NDN8DNN8DZI??????????????????????????????????????????????????+<br>????????????????????????????????????????????????????????????IOD8DNDDDDNDD8OOZ$$$$$$$$$Z$8$ZOZ$ZZ$77777$7$$$$$$ZOOZ$$Z$$ZZZZZZZZOOZOOO8DDNNNN8DDD8DNDZ7I????????????????????????????????????????????????+<br>???????????????????????????????????????????????????????????7ONNDDDDDDDDDOOZ$$$77777777$$Z$77$$77III77I777Z$7$$$$$77777$$$$$$$ZZZOOOOOO8DDDNNNDNDNONND8Z7I??????????????????????????????????????????????+<br>??????????????????????????????????????????????????????????7$8DD8NDDN8D8Z$$777777II77777777$7$$$7IIIIIII7II77I77777777777777$$$$$ZZZZOOO88ODNNNDDDDODNNN8I??????????????????????????????????????????????+<br>?????????????????????????????????????????????????????????IZ8888DDDDD88Z$777777IIIIIIIII77$777II?IIIIIIIIIII7III777III777II77$$$Z$$Z$ZZZOOO88DD8NN88DDDDNDZ?????????????????????????????????????????????+<br>???????????????????????????????????????????????????????IZDDD88DDD888Z7777IIIIIIII?IIII?III7I???I???II??I?777III?IIIIIIIIIII777$$$$$$$$$ZZOO88DDNDDDDDNNDD8ZI???????????????????????????????????????????+<br>??????????????????????????????????????????????????????I$8NN8OD8N8D8Z$7I7IIIIIIII?I??I??I???????III???????I?I?I??III?IIIIII77777$$$$$$$$$ZZO88DDNDDDDNDDOD88O7??????????????????????????????????????????+<br>?????????????????????????????????????????????????????IO8DNN8D8DDD8Z$7I7IIIIIIIII????????+????I???++++++++??+???????IIIIIIII77777$7$$7$$$$$ZO88D8DDDND8NNDNNNZI?????????????????????????????????????????+<br>?????????????????????????????????????????????????????$8DDD8D88D88Z$7I7IIIIIIIII??I???????+?+?++++++++++++??+??????I?IIIIIII77I777777777$$$ZZO888D8DDO8DDDNND87?????????????????????????????????????????+<br>?????????????????????????????????????????????????????ODDNODD8D88O$777IIIIIIIII?II???????+++++++++++++++?+?+????????IIIIIIII7777777777777$7$$ZO8DODD8888NDDNND8$I???????????????????????????????????????+<br>????????????????????????????????????????????????????78888OO888DO$777IIIIIIIII?I????????+++++++++++++++++++++++???????IIIIIII777I777777777777$O88888O8888DNDDDDZI???????????????????????????????????????+<br>???????????????????????????????????????????????????IO88$8OODN8OZ777IIIIIIIIII??????+??++++++++++++++++++++++?++????????IIIIIII777I7777777777$ZZ88OOO88D8888DD887I??????????????????????????????????????+<br>??????????????????????????????????????????????????I7OO888888OOO$777IIIIIIII????????++++++++++++++++++++++++++++?+???????IIIIIIII7I77777777777$ZO88O8ZO88D88N8D8O7??????????????????????????????????????+<br>?????????????????????????????????????????????????I?I88D8OD8OOOZ777IIIIIIII???????++++++++++++++++++++++++++++++++????????IIIIII7777II77II77777$ZOOZOO88O8O8DD88OI??????????????????????????????????????+<br>??????????????????????????????????????????????????IZOOOZOOO$OO$7777IIIIII???????++++++++++=+++=+++=+++++++++++++++++?????IIIIIIIII7I7IIIIII777$O8ZZZO8ZZ8Z8DND8DO$?????????????????????????????????????+<br>??????????????????????????????????????????????????IZOZ8OZOZO8Z7777IIIIII???????++++++++=++=============+==+=++++++++++????I??III7IIIIIIIIIII77$ZOZ$ZZO8ZO$8O8DDDO7?????????????????????????????????????+<br>?????????????????????????????????????????????????I7O8OOZ$ZOOZ77777IIIII??????++++++=+++=====================+=++++++++????????IIIIIIIIIIIIIIII7ZOZZ$$ZZOO878DO8DDOI????????????????????????????????????+<br>??????????????????????????????????????????????????IZO$ZZZOZ$$$7777IIIII??????++++++==========================+++++++++?+??????I?IIIIIIIIIIIII77$ZO$ZZZ$8Z8OZ88DDO7$????????????????????????????????????+<br>??????????????????????????????????????????????????$$$ZO$ZZ$Z$$77IIIIIII?????++++++==============================++++++++++???????IIIIIIIIIIII77$OZZZ$8ZZO8Z$8D8D8O7?????????????????????????????????????<br>??????????????????????????????????????????????????$ZZOOO$I$$Z$77IIIII??????+++++++++=========================+==+++++++++++???????IIIIIIIIIIII7$Z$OZ$O$ZOZOOOO888O$????????????????????????????????????+<br>?????????????????????????????????????????????????7$OZOZZ$Z7$$77IIIIII??????+++++++================================+++=++++++?+????I??IIIIIIIII7$$ZZO$ZZZO$ZZ8O88D8ZI????????????????????????????????????<br>?????????????????????????????????????????????????7OZO$Z$$7$$$77IIIIII?I???+++++++=+===============================+++++++++????????IIIIIIIIIII7$Z$OO$OOOZOOZ8N88DOII????????????????????????????????????<br>?????????????????????????????????????????????????7$Z$Z$Z$77ZZ77IIIII??????+++++==================================+=+==++++??+???????IIIIIIIIII7ZZZ$ZOZZ8OOODD8888O$?????????????????????????????????????<br>?????????????????????????????????????????????????IOZ8$Z$77$O$77IIIII???????++++=+=+===================================+++++++??????I?I?IIIIIII7$ZOZZ$Z$ZOOO888888ZI?????????????????????????????????????<br>?????????????????????????????????????????????????788ZZ$77$Z$$77III????????+++++================~===================+==++++++?????????I?IIIIII77$OZZOZ7ZZ$OOZO88DZZ7?????????????????????????????????????<br>????????????????????????????????????????????????I7ZZ$$I7$O7$77III?I????????+++++++============~=======================++++?+??????????IIIIIII77$ZZZZ$$Z$ZZOZ8D8OOZ?I????????????????????????????????????<br>????????????????????????????????????????????????I7$$777$Z$$$77IIIIII???????++++++=========~====~===~==================+++++++??????????I?IIII77$ZZ$ZZ$ZZO$ZODOO8OZ?I????????????????????????????????????<br>????????????????????????????????????????????????I777I$$7$$Z$IIIIII????????++++++++================~===============+=+++++++++????????????IIII777$Z$$ZZ$ZZZ$O8ZZZ87I?????????????????????????????????????<br>?????????????????????????????????????????????????I$$77$7Z$$7IIIIII???????++++++++++===============================+++++++++++?????????????IIIII7$ZZZ$O7Z7OZ$$OZ887??????????????????????????????????????<br>?????????????????????????????????????????????????I$$7$77Z7$7IIII?I???????+?++++++++=============================+++++++++++++?????????????????I7$ZZ$Z$$$7$$7O$OO8Z?????????????????????????????????????+<br>?????????????????????????????????????????????????I7$777$7$$7IIIII???????+?++++++++==============================+++++++++++?????????????I????II77Z$$$7Z77Z$7Z$888$??????????????????????????????????????<br>????????????????????????????????????????????????I7$777777$$IIIII?III?????++?++++++================================++++?+++?+??????????????????III$$Z$7$$I$Z7OOZOOII?????????????????????????????????????<br>????????????????????????????????????????????????II$$77$$7$7IIIIIIII????????++++++++==============================+++++????????????????????????III$$$$$7$I7$7$Z$OZI??????????????????????????????????????<br>?????????????????????????????????????????????????7$$I77$$$IIIIIIIIIII?????++++++++++=============================++++++++????????III??????????I?I7$$$$$I$7I?ZIZZZ7?????????????????????????????????????+<br>?????????????????????????????????????????????????$Z$$77IZ7IIIIII7IIII????????+++++++==+=========================+++++++++????????I?IIIII????????II7$I$77I7$?Z$OOZ7I?????????????????????????????????????<br>????????????????????????????????????????????????II777$7$$IIIIIIIIIII????+???+++++++++===========================++++++?++????????IIIIIIIII???????II7777I77I+7$OZZZ??????????????????????????????????????<br>?I???????????????????????????????????????????????I$77$7$$IIIIIIIIII????????+??++++++++=+======================+=+++++++?????????I??IIIIIII?????????777I7I7I?I$$OZ7??????????????????????????????????????<br>?????????????????????????????????????????????????I$7$$$$$IIIIIII7II???I??????????+++++++++==================+++++++++??+???????II?IIIIIIII?????????7I$II?7?77I$OZ$??????????????????????????????????????<br>?????????????????????????????????????????????????I7$7$$$$IIIII7I7III7IIIIIII777777I???+?+++===========++++++++++????III?IIIIIIIIIIIIIIIIIII????????I7$$7II777I$OZ7I?????????????????????????????????????<br>????????????????????????????????????????????????II$$$$ZZ$IIIIII7II7I77$77$Z$ZOOOO8OZ77I???++++++===++++++++???III7$$ZZZZ7$777777II7IIIIIIII????????7$$$7I7I$778887??????????????????????????????????????<br>?I????????????????????????????????????????????I777$Z$Z$O$7IIIII7I777$7$77$ZZZOZZZ$Z$$7III???++++++++++?+?+???I$$$OOZOOOOOZZ$7$77$777IIII??I????????7$Z7777$7778O$I??????????????????????????????????????<br>?I???????????????????????????????????????????IIIII7Z$OZ8$7IIIII777Z$7$7I???++????II77777II????+??+++++??????III777$$$Z$$7I777$$77$$$7IIII??I?I?I???I$$$$$$77IO8ZI???????????????????????????????????????<br>?III??????????????????????????????????????????7I??I7ZOZ8$IIIII777Z$III??+?+??II7777$77II7II??????+++?????IIIII7IIIIII???+++++???I$7$$7II??I?II?????7$7ZOO7Z$ZOO$Z$$77I??????????????????????????????????<br>?III??????????????????????????????????????????I7I?II$ZZO77IIII7$$77II??II$$Z8DNNDNDDOII77I77I???+++++???III77II7$777$OOOO$7I????I??I77777IIIII?????7ZZ7OZ$$ZZO$$77II????????????????????????????????????<br>?IIII?????????????????????????????????????????I???III88O7IIII7II7?IIII$O8D8$I8DD.M.D8I7I?IIII??++===++??IIII7II?IZOI$8NNNNNDOZ$7II???IIIIIIIIII???I7ZOIZZ$7$Z$77I???O7+?????????????????????????????????<br>?III????????????????????????????????????????????????7Z8Z77IIIII????I7$Z$$77I+I8O8888?==+7I+?II?++++++??III7?++I7?+=~7O8NND88?$8DOO7????????I?IIIIIIIZO$Z77+777II?=+I77??????????????????????????????????<br>?I??????????????????????????????????????????????+?I??ZO$7IIII??????IIII?????I?II?IIIIIII77??II??++++??I7I7I+?7+I=?=~=ZO8888II7$Z8OZZII??I???III?IIIIZ$8O7$+III??==?III+?????????????????????????????????<br>?I??????????????????????????????????????????????????IO8$7IIII??????????+?+++++??????+?+++?IIIII???++?I77I7II?????I??II7III?I7I7II7$777I?????+??????I7$8OZ??I??I?+=III?+?????????????????????????????????<br>?II??????????????????????????????????????????????????$877IIIII??+??????++++++++++++++????IIIII???+???I77IIII+?+?????????????????IIII7IIII???II??????77OZ$?I?III?+?II????????????????????????????????????<br>?III???????????????????????????????????????????????+??Z77IIIII?I?+??++++++?+++++?????????IIII7I?????II777I?I?????????++++++++?????????III???????????I7O$???IIIII??7II???????????????????????????????????<br>?III????I??????????????????????????????????????????+++I77IIIII????++++++++++++++++++++??III7II?????III7777I????????????+??+??????????????????I???????77I??7IIIIII?77?+??????????????????????????????????<br>?IIIII??I????????????????????????????????????????I?+?+I77III???????++++++++++++++++++???I77III?I????II7777I??????????????????????????+???I????????????I??7$777III?7I?+??????????????????????????????????<br>?IIIIIII?????????????????????????????????????????II??II77III???I??++++++++++++++++++++?I7IIIIIIIIIIIII777$7II????????????++++++++++++????????????++??????$777II???7?????????????????????????????????????<br>?IIIIIII??????????????????????????????????????????I??II77I????????++++++++++++++++++??IIIIIIIII?I?III7I77777I??????????++++++++++++++????????I???++??????7777II?I?I?+???????????????????????????????????<br>?IIIIIIIIIII???????????????????????????????????????????77I????????+++++++++++++++++??IIIIIIIIIII?IIIII7777777????++++++?+?+++++??++?????????????++??????+77777I?+7?+????????????????????????????????????<br>?IIIIIIIIIIII??????????????????????????????????????????I7I???????++++++++++++++++++?IIIIIIIII????IIIII7777777II??+++++++++++++++++++?+??????????+???????I77$$I7I?I+?????????????????????????????????III?<br>?IIIIIIIIIIII??I??????????????????????????????????????+?7I????????++++++++=++++++++???III7I?I?????IIII777777III???+++++++++++++++++++?????????+++??????I7$Z$$7I?7????????????????????????????III???IIII?<br>?IIIIII?IIIIIIIII?????????????????????????????????????+?7II??????+?+++++++===+=+++???I7IIII????????III7777777I???+++++++++++++++++++?????????++++??????Z$777II+7???????????????????????II???IIII??IIIII?<br>?IIIIIIIIIIII????I?????????????????????????????????????+77I???????+++++++====++++??I77II7II????+????III7777777I???++++++++++++++++++++??????++++???????$77I???7I??????????????????????IIIIIIIIIIIIIIIII?<br>?IIIIIIIIIIII???III?????????????????????????????????????I7II?????++++++++=++++++??I77IIIII?????+???IIII777777$$7???++++++++++++++++?+?????++++++??????IIII??77I?????????????????IIIIIIIIIIIIIIIIIIIIIII?<br>?IIIIIIIIIIIIIII??II????????????????????????????????I????77III?????+++++++++++??III7III7III???+???IIIIII7777$7$$I???++++++++++++++??????+++++++?????+?II77?I7I+??????????????III?IIIIIIIIIIIIIIIIIIIIII?<br>?IIIIIIIIIIIIIIII??I????????????????????????????????I????77I?II????++++++++???IIIIIIIIIIII?+++++??????IIIIII777$$I????+?+++++++++++????++++++++++???+7II7II?I+???????????????IIIIIIIIIIIIIIIIIIIIIIIIII?<br>?IIIIIIIIIIIIIIII???I???????????????????????????????II???77II????????++?+???II77IIIIIIIIII??+++++++??????IIIIII$7II????++++++++++++????++++=++++++??$77?77I?????????????????IIIIIIIIIIIIIIIIIIIIIIIIIII?<br>?IIIIIIIIIIIIIIII????????????????????????????????????I??II7II????????????II7$7IIIIII77III7II??++??????IIII??I?7$7II?????????+??+??????++++++++++++?+Z77IIIII??????????I???IIIIIIIIIIIIIIIIIIIIIIIIIIIII?<br>?IIIIIIIIIIIIIIIII??I?????????????????????????????????I7$77IIII????????III$7I?IIIIIII77$$77II?????IIIIII7$Z$$$$77II?IIIIIII???????????+++++++++++++?O$7??II+????????I?I?IIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?<br>?IIIIIIIIIIIIIIIIIIIII????????????????????????????????????7IIII???????I7$?????IIIIII77I7$$$777777I7$$$$$7$7$77IIIIIIIII??????I77I?I???++++++++++++??7$7I??+?????IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?<br>?IIIIIIIIIIIIIIIIIIIIIII????????????????????????????????I?I7III???????7I??++??II?III7777777$77I77777$777777777II7IIIII?II????++?77I????++++++++++????7Z7II??IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?<br>?IIIIIIIIIIIIIIIIIIIIIII???????????????????????????????????7III?I?+++?I+??++???IIIIIII7II77III??IIIIIII7II77777IIIIII????????+++?I7???++++++++++++I??I????I??IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?<br>?IIIIIIIIIIIIIIIIIIIIII?IIIII??????????????????????????????IIII???++++?++?II???III7IIIIIII????+?++?+???III777I7II7IIIII????I?I?++?7???+++++++++?+?I???I?IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?<br>?IIIIIIIIIIIIIIIIIIIIIIIIIIIII?????????????????????????????I7II??I?+==++++?+?I??IIIIIII????++++++++++?+???IIIIIIIIIIIIIII7I????++?II?+++?+++++???I????I?IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?<br>?IIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?????????????????????????I?I7I?I??I?+==+=+?++IODZIIIIII?I??+?+++++++++++??I??IIIIII777$8OI??+?+++?II?+?+I++?+??????II?I?IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?<br>?IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII??????????????????IIII????I7I??+?I++====+?+??7N8OZ$77III??+++++++++++++????III7$ZOOODI??+++++++?7?+????++??????I?IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII????????????????????I??III7II?++I?+++==+?++??IODI?I=?7I777I??????IIII77777I$$$$IDZ7????+?++==+?7?++?I++?????+???IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII??????????III?I?IIIIII?I7II?++I?+++++++++???IOI?+~+~~?===?77I?++7?==7+~+$?77$I???????+++=++I?+++???????????IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII??????????IIIIIIIIIIIIII7II?++?I?+++++++??????I$??=~:=~~::=~:~:~?~~~?~=+777???????????++=++7+++??????I?????IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII??????????IIIIIIIIIIIIIII7II?++?I?+++++++???I????I?+~?=~~~=~~~~=?=~+?I7I?+?IIII??????+++=+I?++?????II???I??IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?IIIIIIIIIIIIIIIII??7II??++?I?++++++????II????IIII?+=?=++?IIIIII???I??III??????+++=++7++???????II?7+??IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII77I??+?I???+++????IIIII?????????????+???????I??????????????++++I?++?????III??++??IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7II??+?I???+++????I?I?I????+++++++++++???I?I????????????+++++?I++????IIIII??++??IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?77II???I??++?+?????????II??????????????III???????????????++++7++?+??III?I??++???IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7II????I??+??+++????????????IIIIIIIII???????????????????+++?I++???II?I?II?++???IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7II???II?????+???????++???II??????????+???????????????????I?++???II?II??++????IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7I????I??+??+++?+??++++++I????????+?++????????????????+?+?+????IIIII??++????IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?I77II?II??????++++?+++++++????????++++?+????????????????+?+++?????II??+++????IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7II?III?????++++++++++++????????++++?????????I??????+++??+?????II???++I???IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7IIIIII????+++++++++++?+????????++++++???????????+?++?++?????III??????????I<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>ZIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII77IIIII?????+++++++++++??+??+???+++++???+???????+++?+?+?????IIII??????+????<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>OIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII777IIII?????+++++?++?+???????????++?+??????????++???+++????7III????????????<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>ZIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII77777III???+?+??++???++?+???+?????????????????????+?+?+??II?III?I?I+?+?+??I<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>OIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII77I$777II??+????????????????????????????????????+++?+??II7IIIIIII???+?+??I$O<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>ZIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII77I7$77II??????+????????????????????????????????+??+?III7777IIII????????I7ZO<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>OIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII77II7$77II??????????????????+???????????????????????II7$7777III???I?I?II7$ZO<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>$IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIO<span style='color:Green'>#</span>77I7$$77I????????????++??++????????????????????I?II7$$7777III??II?IIII77$ZO<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>OIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>$7II7$$$7II?????+++?++??+++?++?+??+??????????IIII$$Z$$777III??I?????III77ZO<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>$IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>Z7III7$$$7I?????????+++?+++????++??+???????III77ZZ$$77IIIII????????III777ZO<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>OIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIZ<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>77III7$7$$7II?????++???++++++??+?????III7777$Z$$$77IIII????????????III7$Z<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>7IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>77III7$77$$$7IIII???????+++++??????III77$$ZZ$$777IIIII???????????????I77<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>OO7IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>$7III777III7$$77I?II?????????IIIII777$$$Z$$$77IIIIIII????+?+????????III$<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>OO7IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>7IIII777IIIII7$Z777II?IIIIIII777$$ZZ$$$$777IIIII???????++++??+???????IO<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7Z<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>77II777II??IIII777$ZZ$7$77$$$$77777777777II?????????+++++++++????????$<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>O7IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7Z<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>77II777II??????I?III?????+????IIIIIIIII7II????????+?++++++++++++++??7Z<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>ZIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7$<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>77III77II??++??????++++++++++?????????I????+++??++++++++++++++++++?I$<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>OO$IIIIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7$Z<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>Z77III777II?++??+++++++=+++++++?????????????+++++++++++++++++++++++?$<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>O$IIIIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7$O<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>?$7IIII777I?+?+++++++=+=++++++++????????++++++++++++++++++++++++++?7<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>$IIIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7Z<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>+Z7IIII777II?++++=+++++=++++++?++??++++++++=+++++++++++++++++++++?7<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>OZIIIIIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII$O<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>Z?Z$7IIII777I?++++===+++++++++++++++++++=====++++++=+++++++++++++I$<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>7IIIIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIIIIII$<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>IIZ$7IIIII777I??++==+++++++++++++++?++++=====+=+=+=+++++++=+++++?$<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>O7IIIIIIIIIIIIIIIIIIII<br>IIIIIIIIIIIIIIIIIIIIIIIIIIII$<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>?IZ$7IIIII77I7I?+++++++?+++???++??++++==========++++++++===+++?IZ<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>ZIIIIIIIIIIIIIIIII7I<br>IIIIIIIIIIIIIIIIIIIIIIIII$O<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>?IO77IIIIII7777?+++++????????+++++++++++=========+++=++++===+?IO<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>O$7II7IIIIIIIIII77I<br>IIIIIIIIIIIIIIIIIIIIII7Z<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>?I<span style='color:Green'>#</span>77II???II7777I???????++++++++++++++=========++++++++====+?I<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>ZOZ7III7IIIII7I77I<br>IIIIIIIIIIIIIIIIIII7$O<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>??<span style='color:Green'>#</span>$77I???IIII777I????+++++++++++++++=+=======++++++++==+=+?I<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>O<span style='color:Green'>#</span>OZ7777IIIIII7II<br>IIIIIIIIIIIIIIIII7Z<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>$+<span style='color:Green'>#</span>$77II???IIIII77II????+++++++++++++======+===+++++++==++?I<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>OZ7777777I77I<br>IIIIIIIIIIIIIII$O<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>=<span style='color:Green'>#</span>Z77II????IIIIIIIII????++++++++++==========+=++=+++==++?7<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>OZ$I777777I<br>IIIIIIIIIIII7Z<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>=Z<span style='color:Green'>#</span>777I??????IIIIIIII???++++++++++=====+++=======+=+=+??Z<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>ZZ$III77I<br>IIIIIIIIII7Z<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>I+<span style='color:Green'>#</span>777II?????I?I??????++++++++++=+=========++=+++++++??<span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span><span style='color:Green'>#</span>ZZZZ777I
+</div><br />
+<div>
+    <b><footer>Copyright 2016 example.com</footer>
+</b>
+</div>
+
+        <hr />
+        <footer>
+            
+        </footer>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesPropertyErrorsInViews.txt b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesPropertyErrorsInViews.txt
new file mode 100644
index 0000000000..0e644ed8d4
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesPropertyErrorsInViews.txt
@@ -0,0 +1,16 @@
+<div>
+    <span class="bold">TestCarDealer</span>
+    <em>SE</em>
+    <input data-val="true" data-val-required="The Id field is required." id="Dealer_Id" name="Dealer.Id" type="hidden" value="32" />
+</div>
+<div class="validation-summary-errors"><ul><li style="display:none"></li>
+</ul></div>
+<form action="/dealers/32/update-vehicle?dealer.name=TestCarDealer&amp;dealer.location=SE" method="post">    <fieldset>
+        <input class="input-validation-error" data-val="true" data-val-length="The field Vin must be a string with a maximum length of 8." data-val-length-max="8" data-val-required="The Vin field is required." id="Vehicle_Vin" name="Vehicle.Vin" type="text" value="LongerThan8Chars" />
+        <span class="field-validation-error" data-valmsg-for="Vehicle.Vin" data-valmsg-replace="true">The field Vin must be a string with a maximum length of 8.</span>
+    </fieldset>
+    <fieldset>
+        <input class="input-validation-error text-box single-line" data-val="true" data-val-range="The field Year must be between 1980 and 2034." data-val-range-max="2034" data-val-range-min="1980" data-val-required="The Year field is required." id="Vehicle_Year" name="Vehicle.Year" type="number" value="9001" />
+        <span class="field-validation-error" data-valmsg-for="Vehicle.Year" data-valmsg-replace="true">The field Year must be between 1980 and 2034.</span>
+    </fieldset>
+</form>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesValidationSummary.txt b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesValidationSummary.txt
new file mode 100644
index 0000000000..5ede8f708e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesValidationSummary.txt
@@ -0,0 +1,16 @@
+<div>
+    <span class="bold">TestCarDealer</span>
+    <em>SE</em>
+    <input data-val="true" data-val-required="The Id field is required." id="Dealer_Id" name="Dealer.Id" type="hidden" value="43" />
+</div>
+<div class="validation-summary-errors"><ul><li>Make is invalid for region.</li>
+</ul></div>
+<form action="/dealers/43/update-vehicle?dealer.name=TestCarDealer&amp;dealer.location=SE" method="post">    <fieldset>
+        <input data-val="true" data-val-length="The field Vin must be a string with a maximum length of 8." data-val-length-max="8" data-val-required="The Vin field is required." id="Vehicle_Vin" name="Vehicle.Vin" type="text" value="8chars" />
+        <span class="field-validation-valid" data-valmsg-for="Vehicle.Vin" data-valmsg-replace="true"></span>
+    </fieldset>
+    <fieldset>
+        <input class="text-box single-line" data-val="true" data-val-range="The field Year must be between 1980 and 2034." data-val-range-max="2034" data-val-range-min="1980" data-val-required="The Year field is required." id="Vehicle_Year" name="Vehicle.Year" type="number" value="2013" />
+        <span class="field-validation-valid" data-valmsg-for="Vehicle.Year" data-valmsg-replace="true"></span>
+    </fieldset>
+</form>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_UpdateSuccessful.txt b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_UpdateSuccessful.txt
new file mode 100644
index 0000000000..0e6753165b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_UpdateSuccessful.txt
@@ -0,0 +1,24 @@
+<div class="left">
+    <ul>
+        <li>
+            Vin: 8chars
+        </li>
+        <li>
+            Inspected Dates: 01/11/2008 00:00:00 -07:00
+        </li>
+    </ul>
+</div>
+<div>
+    <ul>
+        <li>
+            Dealer: 43
+        </li>
+        <li>
+            Phone: 999-99-0000
+        </li>
+    </ul>
+</div>
+
+<footer>
+Tracked by default-tracking-id
+</footer>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ViewEngineController.ViewWithPaths.txt b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ViewEngineController.ViewWithPaths.txt
new file mode 100644
index 0000000000..b8a7c4a5fd
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ViewEngineController.ViewWithPaths.txt
@@ -0,0 +1,20 @@
+<Layout>
+    /Views/ViewWithPaths/_Layout.cshtml
+    /Views/ViewWithPaths/Index.cshtml
+</Layout>
+<ViewStart>
+    /Views/ViewWithPaths/_ViewStart.cshtml
+    /Views/ViewWithPaths/Index.cshtml
+</ViewStart>
+<Index>
+    /Views/ViewWithPaths/Index.cshtml
+    /Views/ViewWithPaths/Index.cshtml
+    <component>
+/Views/Shared/Components/ComponentForViewWithPaths/Default.cshtml
+/Views/Shared/Components/ComponentForViewWithPaths/Default.cshtml
+</component>
+    <Partial>
+/Views/ViewWithPaths/_Partial.cshtml
+/Views/ViewWithPaths/_Partial.cshtml
+</Partial>
+</Index>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/xunit.runner.json b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/xunit.runner.json
new file mode 100644
index 0000000000..1c72a421ad
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/xunit.runner.json
@@ -0,0 +1,3 @@
+{
+  "shadowCopy": false
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ActionParametersIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ActionParametersIntegrationTest.cs
new file mode 100644
index 0000000000..fcd5923101
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ActionParametersIntegrationTest.cs
@@ -0,0 +1,896 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
+using Microsoft.Extensions.Logging.Abstractions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class ActionParameterIntegrationTest
+    {
+        private class Address
+        {
+            public string Street { get; set; }
+        }
+
+        private class Person3
+        {
+            public Person3()
+            {
+                Address = new List<Address>();
+            }
+
+            public List<Address> Address { get; }
+        }
+
+        [Fact]
+        public async Task ActionParameter_NonSettableCollectionModel_EmptyPrefix_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "prefix",
+                ParameterType = typeof(Person3)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Person3();
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            Assert.NotNull(modelBindingResult.Model);
+            var boundModel = Assert.IsType<Person3>(modelBindingResult.Model);
+            Assert.Single(boundModel.Address);
+            Assert.Equal("SomeStreet", boundModel.Address[0].Street);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var key = Assert.Single(modelState.Keys);
+            Assert.Equal("Address[0].Street", key);
+            Assert.Equal("SomeStreet", modelState[key].AttemptedValue);
+            Assert.Equal("SomeStreet", modelState[key].RawValue);
+            Assert.Empty(modelState[key].Errors);
+            Assert.Equal(ModelValidationState.Valid, modelState[key].ValidationState);
+        }
+
+        private class Person6
+        {
+            public CustomReadOnlyCollection<Address> Address { get; set; }
+        }
+
+        [Fact]
+        public async Task ActionParameter_ReadOnlyCollectionModel_EmptyPrefix_DoesNotGetBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "prefix",
+                ParameterType = typeof(Person6)
+            };
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var boundModel = Assert.IsType<Person6>(modelBindingResult.Model);
+            Assert.NotNull(boundModel);
+            Assert.NotNull(boundModel.Address);
+
+            // Read-only collection should not be updated.
+            Assert.Empty(boundModel.Address);
+
+            // ModelState (data is can't be validated).
+            Assert.False(modelState.IsValid);
+            var entry = Assert.Single(modelState);
+            Assert.Equal("Address[0].Street", entry.Key);
+            var state = entry.Value;
+            Assert.NotNull(state);
+            Assert.Equal(ModelValidationState.Unvalidated, state.ValidationState);
+            Assert.Equal("SomeStreet", state.RawValue);
+            Assert.Equal("SomeStreet", state.AttemptedValue);
+        }
+
+        private class Person4
+        {
+            public Address[] Address { get; set; }
+        }
+
+        [Fact]
+        public async Task ActionParameter_SettableArrayModel_EmptyPrefix_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "prefix",
+                ParameterType = typeof(Person4)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Person4();
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            Assert.NotNull(modelBindingResult.Model);
+            var boundModel = Assert.IsType<Person4>(modelBindingResult.Model);
+            Assert.NotNull(boundModel.Address);
+            Assert.Single(boundModel.Address);
+            Assert.Equal("SomeStreet", boundModel.Address[0].Street);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var key = Assert.Single(modelState.Keys);
+            Assert.Equal("Address[0].Street", key);
+            Assert.Equal("SomeStreet", modelState[key].AttemptedValue);
+            Assert.Equal("SomeStreet", modelState[key].RawValue);
+            Assert.Empty(modelState[key].Errors);
+            Assert.Equal(ModelValidationState.Valid, modelState[key].ValidationState);
+        }
+
+        private class Person5
+        {
+            public Address[] Address { get; } = new Address[] { };
+        }
+
+        [Fact]
+        public async Task ActionParameter_NonSettableArrayModel_EmptyPrefix_DoesNotGetBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "prefix",
+                ParameterType = typeof(Person5)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            Assert.NotNull(modelBindingResult.Model);
+            var boundModel = Assert.IsType<Person5>(modelBindingResult.Model);
+            Assert.NotNull(boundModel.Address);
+
+            // Arrays should not be updated.
+            Assert.Empty(boundModel.Address);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState.Keys);
+        }
+
+        [Fact]
+        public async Task ActionParameter_NonSettableCollectionModel_WithPrefix_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Address",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "prefix"
+                },
+                ParameterType = typeof(Person3)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            Assert.NotNull(modelBindingResult.Model);
+            var boundModel = Assert.IsType<Person3>(modelBindingResult.Model);
+            Assert.Single(boundModel.Address);
+            Assert.Equal("SomeStreet", boundModel.Address[0].Street);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var key = Assert.Single(modelState.Keys);
+            Assert.Equal("prefix.Address[0].Street", key);
+            Assert.Equal("SomeStreet", modelState[key].AttemptedValue);
+            Assert.Equal("SomeStreet", modelState[key].RawValue);
+            Assert.Empty(modelState[key].Errors);
+            Assert.Equal(ModelValidationState.Valid, modelState[key].ValidationState);
+        }
+
+        [Fact]
+        public async Task ActionParameter_ReadOnlyCollectionModel_WithPrefix_DoesNotGetBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Address",
+                BindingInfo = new BindingInfo
+                {
+                    BinderModelName = "prefix"
+                },
+                ParameterType = typeof(Person6)
+            };
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var boundModel = Assert.IsType<Person6>(modelBindingResult.Model);
+            Assert.NotNull(boundModel);
+            Assert.NotNull(boundModel.Address);
+
+            // Read-only collection should not be updated.
+            Assert.Empty(boundModel.Address);
+
+            // ModelState (data cannot be validated).
+            Assert.False(modelState.IsValid);
+            var entry = Assert.Single(modelState);
+            Assert.Equal("prefix.Address[0].Street", entry.Key);
+            var state = entry.Value;
+            Assert.NotNull(state);
+            Assert.Equal(ModelValidationState.Unvalidated, state.ValidationState);
+            Assert.Equal("SomeStreet", state.AttemptedValue);
+            Assert.Equal("SomeStreet", state.RawValue);
+        }
+
+        [Fact]
+        public async Task ActionParameter_SettableArrayModel_WithPrefix_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Address",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "prefix"
+                },
+                ParameterType = typeof(Person4)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            Assert.NotNull(modelBindingResult.Model);
+            var boundModel = Assert.IsType<Person4>(modelBindingResult.Model);
+            Assert.Single(boundModel.Address);
+            Assert.Equal("SomeStreet", boundModel.Address[0].Street);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var key = Assert.Single(modelState.Keys);
+            Assert.Equal("prefix.Address[0].Street", key);
+            Assert.Equal("SomeStreet", modelState[key].AttemptedValue);
+            Assert.Equal("SomeStreet", modelState[key].RawValue);
+            Assert.Empty(modelState[key].Errors);
+            Assert.Equal(ModelValidationState.Valid, modelState[key].ValidationState);
+        }
+
+        [Fact]
+        public async Task ActionParameter_NonSettableArrayModel_WithPrefix_DoesNotGetBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Address",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "prefix"
+                },
+                ParameterType = typeof(Person5)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            Assert.NotNull(modelBindingResult.Model);
+            var boundModel = Assert.IsType<Person5>(modelBindingResult.Model);
+
+            // Arrays should not be updated.
+            Assert.Empty(boundModel.Address);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState.Keys);
+        }
+
+        [Fact]
+        public async Task ActionParameter_ModelPropertyTypeWithNoParameterlessConstructor_ThrowsException()
+        {
+            // Arrange
+            var parameterType = typeof(Class1);
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "p",
+                ParameterType = parameterType
+            };
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Name", "James").Add("Property1.City", "Seattle");
+            });
+            var modelState = testContext.ModelState;
+
+            // Act & Assert
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => parameterBinder.BindModelAsync(parameter, testContext));
+            Assert.Equal(
+                string.Format(
+                    "Could not create an instance of type '{0}'. Model bound complex types must not be abstract or " +
+                    "value types and must have a parameterless constructor. Alternatively, set the '{1}' property to" +
+                    " a non-null value in the '{2}' constructor.",
+                    typeof(ClassWithNoDefaultConstructor).FullName,
+                    nameof(Class1.Property1),
+                    typeof(Class1).FullName),
+                exception.Message);
+        }
+
+        [Fact]
+        public async Task ActionParameter_BindingToStructModel_ThrowsException()
+        {
+            // Arrange
+            var parameterType = typeof(PointStruct);
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                ParameterType = parameterType,
+                Name = "p"
+            };
+            var testContext = ModelBindingTestHelper.GetTestContext();
+
+            // Act & Assert
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => parameterBinder.BindModelAsync(parameter, testContext));
+            Assert.Equal(
+                string.Format(
+                    "Could not create an instance of type '{0}'. Model bound complex types must not be abstract or " +
+                    "value types and must have a parameterless constructor.",
+                    typeof(PointStruct).FullName),
+                exception.Message);
+        }
+
+        [Theory]
+        [InlineData(typeof(ClassWithNoDefaultConstructor))]
+        [InlineData(typeof(AbstractClassWithNoDefaultConstructor))]
+        public async Task ActionParameter_BindingToTypeWithNoParameterlessConstructor_ThrowsException(Type parameterType)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                ParameterType = parameterType,
+                Name = "p"
+            };
+            var testContext = ModelBindingTestHelper.GetTestContext();
+
+            // Act & Assert
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => parameterBinder.BindModelAsync(parameter, testContext));
+            Assert.Equal(
+                string.Format(
+                    "Could not create an instance of type '{0}'. Model bound complex types must not be abstract or " +
+                    "value types and must have a parameterless constructor.",
+                    parameterType.FullName),
+                exception.Message);
+        }
+
+        [Fact]
+        public async Task ActionParameter_CustomModelBinder_CanCreateModels_ForParameterlessConstructorTypes()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var modelState = testContext.ModelState;
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(
+                testContext.MvcOptions,
+                new CustomComplexTypeModelBinderProvider());
+
+            var parameter = new ParameterDescriptor
+            {
+                Name = "prefix",
+                ParameterType = typeof(ClassWithNoDefaultConstructor)
+            };
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            Assert.NotNull(modelBindingResult.Model);
+            var boundModel = Assert.IsType<ClassWithNoDefaultConstructor>(modelBindingResult.Model);
+            Assert.Equal(100, boundModel.Id);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+        }
+
+        [Fact]
+        public async Task ActionParameter_WithBindNever_DoesNotGetBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = BindingAndValidationController.BindNeverParamInfo.Name,
+                ParameterType = typeof(int)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create(parameter.Name, "123");
+            });
+
+            var modelState = testContext.ModelState;
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelMetadata = modelMetadataProvider
+                .GetMetadataForParameter(BindingAndValidationController.BindNeverParamInfo);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(
+                parameter,
+                testContext,
+                modelMetadataProvider,
+                modelMetadata);
+
+            // Assert
+            Assert.False(modelBindingResult.IsModelSet);
+            Assert.True(modelState.IsValid);
+        }
+
+        [Theory]
+        [InlineData(123, true)]
+        [InlineData(null, false)]
+        public async Task ActionParameter_EnforcesBindRequired(int? input, bool isValid)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = BindingAndValidationController.BindRequiredParamInfo.Name,
+                ParameterType = typeof(int)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                if (input.HasValue)
+                {
+                    request.QueryString = QueryString.Create(parameter.Name, input.Value.ToString());
+                }
+            });
+
+            var modelState = testContext.ModelState;
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelMetadata = modelMetadataProvider
+                .GetMetadataForParameter(BindingAndValidationController.BindRequiredParamInfo);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(
+                parameter,
+                testContext,
+                modelMetadataProvider,
+                modelMetadata);
+
+            // Assert
+            Assert.Equal(input.HasValue, modelBindingResult.IsModelSet);
+            Assert.Equal(isValid, modelState.IsValid);
+            if (isValid)
+            {
+                Assert.Equal(input.Value, Assert.IsType<int>(modelBindingResult.Model));
+            }
+        }
+
+        [Theory]
+        [InlineData("requiredAndStringLengthParam", null, false)]
+        [InlineData("requiredAndStringLengthParam", "", false)]
+        [InlineData("requiredAndStringLengthParam", "abc", true)]
+        [InlineData("requiredAndStringLengthParam", "abcTooLong", false)]
+        [InlineData("displayNameStringLengthParam", null, true)]
+        [InlineData("displayNameStringLengthParam", "", true)]
+        [InlineData("displayNameStringLengthParam", "abc", true)]
+        [InlineData("displayNameStringLengthParam", "abcTooLong", false, "My Display Name")]
+        public async Task ActionParameter_EnforcesDataAnnotationsAttributes(
+            string paramName,
+            string input,
+            bool isValid,
+            string displayName = null)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameterInfo = BindingAndValidationController.GetParameterInfo(paramName);
+            var parameter = new ParameterDescriptor()
+            {
+                Name = parameterInfo.Name,
+                ParameterType = parameterInfo.ParameterType
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                if (input != null)
+                {
+                    request.QueryString = QueryString.Create(parameter.Name, input);
+                }
+            });
+
+            var modelState = testContext.ModelState;
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelMetadata = modelMetadataProvider
+                .GetMetadataForParameter(parameterInfo);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(
+                parameter,
+                testContext,
+                modelMetadataProvider,
+                modelMetadata);
+
+            // Assert
+            Assert.Equal(input != null, modelBindingResult.IsModelSet);
+            Assert.Equal(isValid, modelState.IsValid);
+            if (!isValid)
+            {
+                var entry = modelState[paramName];
+                Assert.NotNull(entry);
+
+                var message = entry.Errors.Single().ErrorMessage;
+                Assert.Contains(displayName ?? parameter.Name, message);
+            }
+        }
+
+        [Fact]
+        public async Task ActionParameter_CanRunIValidatableObject_EmptyPrefix()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameterInfo = BindingAndValidationController.ValidatableObjectParameterInfo;
+            var parameter = new ParameterDescriptor()
+            {
+                Name = parameterInfo.Name,
+                ParameterType = parameterInfo.ParameterType,
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create(nameof(ModelWithIValidatableObject.FirstName), "Billy");
+            });
+
+            var modelState = testContext.ModelState;
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelMetadata = modelMetadataProvider
+                .GetMetadataForParameter(parameterInfo);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(
+                parameter,
+                testContext,
+                modelMetadataProvider,
+                modelMetadata);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet, "model is set");
+            Assert.False(modelState.IsValid, "model is valid");
+
+            var entry = modelState[string.Empty];
+            Assert.NotNull(entry);
+            var message = entry.Errors.Single().ErrorMessage;
+            Assert.Equal("Not valid.", message);
+
+            entry = modelState[nameof(ModelWithIValidatableObject.FirstName)];
+            Assert.NotNull(entry);
+            message = entry.Errors.Single().ErrorMessage;
+            Assert.Equal("FirstName Not valid.", message);
+        }
+
+        [Fact]
+        public async Task ActionParameter_CanRunIValidatableObject_WithPrefix()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameterInfo = BindingAndValidationController.ValidatableObjectParameterInfo;
+            var parameter = new ParameterDescriptor()
+            {
+                Name = parameterInfo.Name,
+                ParameterType = parameterInfo.ParameterType,
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                var key = ModelNames.CreatePropertyModelName(parameter.Name, nameof(ModelWithIValidatableObject.FirstName));
+                request.QueryString = QueryString.Create(key, "Billy");
+            });
+
+            var modelState = testContext.ModelState;
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelMetadata = modelMetadataProvider
+                .GetMetadataForParameter(parameterInfo);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(
+                parameter,
+                testContext,
+                modelMetadataProvider,
+                modelMetadata);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet, "model is set");
+            Assert.False(modelState.IsValid, "model is valid");
+
+            var entry = modelState[parameter.Name];
+            Assert.NotNull(entry);
+            var message = entry.Errors.Single().ErrorMessage;
+            Assert.Equal("Not valid.", message);
+
+            entry = modelState[ModelNames.CreatePropertyModelName(parameter.Name, nameof(ModelWithIValidatableObject.FirstName))];
+            Assert.NotNull(entry);
+            message = entry.Errors.Single().ErrorMessage;
+            Assert.Equal("FirstName Not valid.", message);
+        }
+
+        private class ModelWithIValidatableObject : IValidatableObject
+        {
+            public string FirstName { get; set; }
+
+            public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+            {
+                yield return new ValidationResult("Not valid.");
+                yield return new ValidationResult("FirstName Not valid.", new string[] { nameof(FirstName) });
+            }
+        }
+
+        private struct PointStruct
+        {
+            public PointStruct(double x, double y)
+            {
+                X = x;
+                Y = y;
+            }
+            public double X { get; }
+            public double Y { get; }
+        }
+
+        private class Class1
+        {
+            public ClassWithNoDefaultConstructor Property1 { get; set; }
+            public string Name { get; set; }
+        }
+
+        private class ClassWithNoDefaultConstructor
+        {
+            public ClassWithNoDefaultConstructor(int id)
+            {
+                Id = id;
+            }
+            public string City { get; set; }
+            public int Id { get; }
+        }
+
+        private abstract class AbstractClassWithNoDefaultConstructor
+        {
+            private readonly string _name;
+
+            public AbstractClassWithNoDefaultConstructor()
+                : this("James")
+            {
+            }
+
+            public AbstractClassWithNoDefaultConstructor(string name)
+            {
+                _name = name;
+            }
+
+            public string Name { get; set; }
+        }
+
+        private class BindingAndValidationController
+        {
+            public void MyAction(
+                [BindNever] int bindNeverParam,
+                [BindRequired] int bindRequiredParam,
+                [Required, StringLength(3)] string requiredAndStringLengthParam,
+                [Display(Name = "My Display Name"), StringLength(3)] string displayNameStringLengthParam,
+                ModelWithIValidatableObject validatableObject)
+            {
+            }
+
+            private static MethodInfo MyActionMethodInfo
+                => typeof(BindingAndValidationController).GetMethod(nameof(MyAction));
+
+            public static ParameterInfo BindNeverParamInfo
+                => MyActionMethodInfo.GetParameters()[0];
+
+            public static ParameterInfo BindRequiredParamInfo
+                => MyActionMethodInfo.GetParameters()[1];
+
+            public static ParameterInfo ValidatableObjectParameterInfo => MyActionMethodInfo.GetParameters()[4];
+
+            public static ParameterInfo GetParameterInfo(string parameterName)
+            {
+                return MyActionMethodInfo
+                    .GetParameters()
+                    .Single(p => p.Name.Equals(parameterName, StringComparison.Ordinal));
+            }
+        }
+
+        private class CustomReadOnlyCollection<T> : ICollection<T>
+        {
+            private ICollection<T> _original;
+
+            public CustomReadOnlyCollection()
+                : this(new List<T>())
+            {
+            }
+
+            public CustomReadOnlyCollection(ICollection<T> original)
+            {
+                _original = original;
+            }
+
+            public int Count
+            {
+                get { return _original.Count; }
+            }
+
+            public bool IsReadOnly
+            {
+                get { return true; }
+            }
+
+            public void Add(T item)
+            {
+                throw new NotSupportedException();
+            }
+
+            public void Clear()
+            {
+                throw new NotSupportedException();
+            }
+
+            public bool Contains(T item)
+            {
+                return _original.Contains(item);
+            }
+
+            public void CopyTo(T[] array, int arrayIndex)
+            {
+                _original.CopyTo(array, arrayIndex);
+            }
+
+            public bool Remove(T item)
+            {
+                throw new NotSupportedException();
+            }
+
+            public IEnumerator<T> GetEnumerator()
+            {
+                foreach (var t in _original)
+                {
+                    yield return t;
+                }
+            }
+
+            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+            {
+                return GetEnumerator();
+            }
+        }
+
+        // By default the ComplexTypeModelBinder fails to construct models for types with no parameterless constructor,
+        // but a developer could change this behavior by overriding CreateModel
+        private class CustomComplexTypeModelBinder : ComplexTypeModelBinder
+        {
+            public CustomComplexTypeModelBinder(IDictionary<ModelMetadata, IModelBinder> propertyBinders)
+                : base(propertyBinders, NullLoggerFactory.Instance)
+            {
+            }
+
+            protected override object CreateModel(ModelBindingContext bindingContext)
+            {
+                Assert.Equal(typeof(ClassWithNoDefaultConstructor), bindingContext.ModelType);
+                return new ClassWithNoDefaultConstructor(100);
+            }
+        }
+
+        private class CustomComplexTypeModelBinderProvider : IModelBinderProvider
+        {
+            public IModelBinder GetBinder(ModelBinderProviderContext context)
+            {
+                var propertyBinders = new Dictionary<ModelMetadata, IModelBinder>();
+                foreach (var property in context.Metadata.Properties)
+                {
+                    propertyBinders.Add(property, context.CreateBinder(property));
+                }
+                return new CustomComplexTypeModelBinder(propertyBinders);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ArrayModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ArrayModelBinderIntegrationTest.cs
new file mode 100644
index 0000000000..921fa1f03f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ArrayModelBinderIntegrationTest.cs
@@ -0,0 +1,373 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    // Integration tests targeting the behavior of the ArrayModelBinder with other model binders.
+    public class ArrayModelBinderIntegrationTest
+    {
+        [Fact]
+        public async Task ArrayModelBinder_BindsArrayOfSimpleType_WithPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(int[])
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter[0]=10&parameter[1]=11");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<int[]>(modelBindingResult.Model);
+            Assert.Equal(new int[] { 10, 11 }, model);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "parameter[0]").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "parameter[1]").Value;
+            Assert.Equal("11", entry.AttemptedValue);
+            Assert.Equal("11", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task ArrayModelBinder_BindsArrayOfSimpleType_WithExplicitPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "prefix",
+                },
+                ParameterType = typeof(int[])
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?prefix[0]=10&prefix[1]=11");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<int[]>(modelBindingResult.Model);
+            Assert.Equal(new int[] { 10, 11 }, model);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "prefix[0]").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "prefix[1]").Value;
+            Assert.Equal("11", entry.AttemptedValue);
+            Assert.Equal("11", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task ArrayModelBinder_BindsArrayOfSimpleType_EmptyPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(int[])
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?[0]=10&[1]=11");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<int[]>(modelBindingResult.Model);
+            Assert.Equal(new int[] { 10, 11 }, model);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "[0]").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "[1]").Value;
+            Assert.Equal("11", entry.AttemptedValue);
+            Assert.Equal("11", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task ArrayModelBinder_BindsArrayOfSimpleType_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(int[])
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            Assert.Empty(Assert.IsType<int[]>(modelBindingResult.Model));
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        private class Person
+        {
+            public string Name { get; set; }
+        }
+
+        [Fact]
+        public async Task ArrayModelBinder_BindsArrayOfComplexType_WithPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Person[])
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter[0].Name=bill&parameter[1].Name=lang");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Person[]>(modelBindingResult.Model);
+            Assert.Equal("bill", model[0].Name);
+            Assert.Equal("lang", model[1].Name);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "parameter[0].Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "parameter[1].Name").Value;
+            Assert.Equal("lang", entry.AttemptedValue);
+            Assert.Equal("lang", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task ArrayModelBinder_BindsArrayOfComplexType_WithExplicitPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "prefix",
+                },
+                ParameterType = typeof(Person[])
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?prefix[0].Name=bill&prefix[1].Name=lang");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Person[]>(modelBindingResult.Model);
+            Assert.Equal("bill", model[0].Name);
+            Assert.Equal("lang", model[1].Name);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "prefix[0].Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "prefix[1].Name").Value;
+            Assert.Equal("lang", entry.AttemptedValue);
+            Assert.Equal("lang", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task ArrayModelBinder_BindsArrayOfComplexType_EmptyPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Person[])
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?[0].Name=bill&[1].Name=lang");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Person[]>(modelBindingResult.Model);
+            Assert.Equal("bill", model[0].Name);
+            Assert.Equal("lang", model[1].Name);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "[0].Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "[1].Name").Value;
+            Assert.Equal("lang", entry.AttemptedValue);
+            Assert.Equal("lang", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task ArrayModelBinder_BindsArrayOfComplexType_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Person[])
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            Assert.Empty(Assert.IsType<Person[]>(modelBindingResult.Model));
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        private class PersonWithReadOnlyAndInitializedProperty
+        {
+            public string Name { get; set; }
+
+            public string[] Aliases { get; } = new[] { "Alias1", "Alias2" };
+        }
+
+        [Fact]
+        public async Task ArrayModelBinder_BindsArrayOfComplexTypeHavingInitializedData_WithPrefix_Success_ReadOnly()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(PersonWithReadOnlyAndInitializedProperty)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Name=James&parameter.Aliases[0]=bill&parameter.Aliases[1]=william");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            Assert.True(modelState.IsValid);
+
+            var model = Assert.IsType<PersonWithReadOnlyAndInitializedProperty>(modelBindingResult.Model);
+            Assert.Equal("James", model.Name);
+            Assert.NotNull(model.Aliases);
+            Assert.Collection(
+                model.Aliases,
+                (e) => Assert.Equal("Alias1", e),
+                (e) => Assert.Equal("Alias2", e));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/AuthorizeFilterIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/AuthorizeFilterIntegrationTest.cs
new file mode 100644
index 0000000000..f19a67d45b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/AuthorizeFilterIntegrationTest.cs
@@ -0,0 +1,115 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization.Infrastructure;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Authorization;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.ObjectPool;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class AuthorizeFilterIntegrationTest
+    {
+        // This is a test for security, because we can't assume that any IAuthorizationPolicyProvider other than
+        // DefaultAuthorizationPolicyProvider will return the same result for the same input. So a cache could cause
+        // undesired access.
+        [Fact]
+        public async Task AuthorizeFilter_CalledTwiceWithNonDefaultProvider()
+        {
+            // Arrange
+            var applicationModelProviderContext = GetProviderContext(typeof(AuthorizeController));
+
+            var policyProvider = new TestAuthorizationPolicyProvider();
+
+            var controller = Assert.Single(applicationModelProviderContext.Result.Controllers);
+            var action = Assert.Single(controller.Actions);
+            var authorizeData = action.Attributes.OfType<AuthorizeAttribute>();
+            var authorizeFilter = new AuthorizeFilter(policyProvider, authorizeData);
+
+            var actionContext = new ActionContext(GetHttpContext(), new RouteData(), new ControllerActionDescriptor());
+
+            var authorizationFilterContext = new AuthorizationFilterContext(actionContext, action.Filters);
+
+            // Act
+            await authorizeFilter.OnAuthorizationAsync(authorizationFilterContext);
+            await authorizeFilter.OnAuthorizationAsync(authorizationFilterContext);
+
+            // Assert
+            Assert.Equal(2, policyProvider.GetPolicyCount);
+        }
+
+        private HttpContext GetHttpContext()
+        {
+            var httpContext = new DefaultHttpContext();
+
+            httpContext.RequestServices = GetServices();
+            return httpContext;
+        }
+
+        private static ApplicationModelProviderContext GetProviderContext(Type controllerType)
+        {
+            var context = new ApplicationModelProviderContext(new[] { controllerType.GetTypeInfo() });
+            var provider = new DefaultApplicationModelProvider(
+                Options.Create(new MvcOptions()),
+                TestModelMetadataProvider.CreateDefaultProvider());
+            provider.OnProvidersExecuting(context);
+
+            return context;
+        }
+
+        private static IServiceProvider GetServices()
+        {
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddAuthorization();
+            serviceCollection.AddMvc();
+            serviceCollection
+                .AddTransient<ILoggerFactory, LoggerFactory>()
+                .AddTransient<ILogger<DefaultAuthorizationService>, Logger<DefaultAuthorizationService>>()
+                .AddSingleton<ObjectPoolProvider, DefaultObjectPoolProvider>();
+            return serviceCollection.BuildServiceProvider();
+        }
+
+        public class TestAuthorizationPolicyProvider : IAuthorizationPolicyProvider
+        {
+            public int GetPolicyCount = 0;
+
+            public Task<AuthorizationPolicy> GetDefaultPolicyAsync()
+            {
+                throw new NotImplementedException();
+            }
+
+            public Task<AuthorizationPolicy> GetPolicyAsync(string policyName)
+            {
+                GetPolicyCount++;
+
+                var requirements = new IAuthorizationRequirement[]
+                {
+                    new AssertionRequirement((con) => { return true; })
+                };
+                return Task.FromResult(new AuthorizationPolicy(requirements, new string[] { }));
+            }
+        }
+
+        public class AuthorizeController
+        {
+            [Authorize(Policy = "Base")]
+            public virtual void Authorize()
+            { }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindPropertyIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindPropertyIntegrationTest.cs
new file mode 100644
index 0000000000..1b42c219f0
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindPropertyIntegrationTest.cs
@@ -0,0 +1,242 @@
+// 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.
+
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    // Integration tests for binding top level models with [BindProperty]
+    public class BindPropertyIntegrationTest
+    {
+        private class Person
+        {
+            public string Name { get; set; }
+        }
+
+        [Fact]
+        public async Task BindModelAsync_WithBindProperty_BindsModel_WhenRequestIsNotGet()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Person),
+                BindingInfo = BindingInfo.GetBindingInfo(new[] { new BindPropertyAttribute() }),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.Method = "POST";
+                request.QueryString = new QueryString("?parameter.Name=Joey");
+            });
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(result.IsModelSet);
+
+            Assert.Equal("Joey", Assert.IsType<Person>(result.Model).Name);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_WithBindProperty_SupportsGet_BindsModel_WhenRequestIsGet()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Person),
+                BindingInfo = BindingInfo.GetBindingInfo(new[] { new BindPropertyAttribute() { SupportsGet = true } }),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.Method = "GET";
+                request.QueryString = new QueryString("?parameter.Name=Joey");
+            });
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(result.IsModelSet);
+
+            Assert.Equal("Joey", Assert.IsType<Person>(result.Model).Name);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_WithBindProperty_DoesNotBindModel_WhenRequestIsGet()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Person),
+                BindingInfo = BindingInfo.GetBindingInfo(new[] { new BindPropertyAttribute() }),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.Method = "GET";
+                request.QueryString = new QueryString("?parameter.Name=Joey");
+            });
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.False(result.IsModelSet);
+        }
+
+        [Fact]
+        public async Task BindModelAsync_WithBindProperty_BindNever_DoesNotBindModel()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = nameof(TestController.BindNeverProp),
+                ParameterType = typeof(string),
+                BindingInfo = BindingInfo.GetBindingInfo(new[] { new BindPropertyAttribute() }),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.Method = "POST";
+                request.QueryString = new QueryString($"?{parameter.Name}=Joey");
+            });
+
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelMetadata = modelMetadataProvider
+                .GetMetadataForProperty(typeof(TestController), parameter.Name);
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(
+                parameter,
+                testContext,
+                modelMetadataProvider,
+                modelMetadata);
+
+            // Assert
+            Assert.False(result.IsModelSet);
+            Assert.True(testContext.ModelState.IsValid);
+        }
+
+        [Theory]
+        [InlineData(null, false)]
+        [InlineData(123, true)]
+        public async Task BindModelAsync_WithBindProperty_EnforcesBindRequired(int? input, bool isValid)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = nameof(TestController.BindRequiredProp),
+                ParameterType = typeof(string),
+                BindingInfo = BindingInfo.GetBindingInfo(new[] { new BindPropertyAttribute() }),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.Method = "POST";
+
+                if (input.HasValue)
+                {
+                    request.QueryString = new QueryString($"?{parameter.Name}={input.Value}");
+                }
+            });
+
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelMetadata = modelMetadataProvider
+                .GetMetadataForProperty(typeof(TestController), parameter.Name);
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(
+                parameter,
+                testContext,
+                modelMetadataProvider,
+                modelMetadata);
+
+            // Assert
+            Assert.Equal(input.HasValue, result.IsModelSet);
+            Assert.Equal(isValid, testContext.ModelState.IsValid);
+            if (isValid)
+            {
+                Assert.Equal(input.Value, Assert.IsType<int>(result.Model));
+            }
+        }
+
+        [Theory]
+        [InlineData("RequiredAndStringLengthProp", null, false)]
+        [InlineData("RequiredAndStringLengthProp", "", false)]
+        [InlineData("RequiredAndStringLengthProp", "abc", true)]
+        [InlineData("RequiredAndStringLengthProp", "abcTooLong", false)]
+        [InlineData("DisplayNameStringLengthProp", null, true)]
+        [InlineData("DisplayNameStringLengthProp", "", true)]
+        [InlineData("DisplayNameStringLengthProp", "abc", true)]
+        [InlineData("DisplayNameStringLengthProp", "abcTooLong", false, "My Display Name")]
+        public async Task BindModelAsync_WithBindProperty_EnforcesDataAnnotationsAttributes(
+            string propertyName, string input, bool isValid, string displayName = null)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = propertyName,
+                ParameterType = typeof(string),
+                BindingInfo = BindingInfo.GetBindingInfo(new[] { new BindPropertyAttribute() }),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.Method = "POST";
+
+                if (input != null)
+                {
+                    request.QueryString = new QueryString($"?{parameter.Name}={input}");
+                }
+            });
+
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelMetadata = modelMetadataProvider
+                .GetMetadataForProperty(typeof(TestController), parameter.Name);
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(
+                parameter,
+                testContext,
+                modelMetadataProvider,
+                modelMetadata);
+
+            // Assert
+            Assert.Equal(input != null, result.IsModelSet);
+            Assert.Equal(isValid, testContext.ModelState.IsValid);
+            if (!isValid)
+            {
+                var message = testContext.ModelState[propertyName].Errors.Single().ErrorMessage;
+                Assert.Contains(displayName ?? parameter.Name, message);
+            }
+        }
+
+        class TestController
+        {
+            [BindNever] public string BindNeverProp { get; set; }
+            [BindRequired] public int BindRequiredProp { get; set; }
+            [Required, StringLength(3)] public string RequiredAndStringLengthProp { get; set; }
+            [DisplayName("My Display Name"), StringLength(3)] public string DisplayNameStringLengthProp { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BinderTypeBasedModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BinderTypeBasedModelBinderIntegrationTest.cs
new file mode 100644
index 0000000000..b35b180597
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BinderTypeBasedModelBinderIntegrationTest.cs
@@ -0,0 +1,478 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class BinderTypeBasedModelBinderIntegrationTest
+    {
+        [Fact]
+        public async Task BindParameter_WithModelBinderType_NullData_ReturnsNull()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderType = typeof(NullModelBinder)
+                },
+
+                ParameterType = typeof(string)
+            };
+
+            // No data is passed.
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+            Assert.Null(modelBindingResult.Model);
+
+            // ModelState (not set unless inner binder sets it)
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+
+        [Fact]
+        public async Task BindParameter_WithModelBinderType_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderType = typeof(NullModelNotSetModelBinder)
+                },
+
+                ParameterType = typeof(string)
+            };
+
+            // No data is passed.
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.False(modelBindingResult.IsModelSet);
+
+            // ModelState (not set unless inner binder sets it)
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+
+        private class Person2
+        {
+        }
+
+        // Ensures that prefix is part of the result returned back.
+        [Fact]
+        [ReplaceCulture]
+        public async Task BindParameter_WithData_WithPrefix_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderType = typeof(SuccessModelBinder),
+                    BinderModelName = "CustomParameter"
+                },
+
+                ParameterType = typeof(Person2)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+            Assert.Equal("Success", modelBindingResult.Model);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            var key = Assert.Single(modelState.Keys);
+            Assert.Equal("CustomParameter", key);
+            Assert.Equal(ModelValidationState.Valid, modelState[key].ValidationState);
+            Assert.NotNull(modelState[key].RawValue); // Value is set by test model binder, no need to validate it.
+        }
+
+        private class Person
+        {
+            public Address Address { get; set; }
+        }
+
+        [ModelBinder(BinderType = typeof(AddressModelBinder))]
+        private class Address
+        {
+            public string Street { get; set; }
+        }
+
+        public static TheoryData<BindingInfo> NullAndEmptyBindingInfo
+        {
+            get
+            {
+                return new TheoryData<BindingInfo>
+                {
+                    null,
+                    new BindingInfo(),
+                };
+            }
+        }
+
+        // Make sure the metadata is honored when a [ModelBinder] attribute is associated with an action parameter's
+        // type. This should behave identically to such an attribute on an action parameter. (Tests such as
+        // BindParameter_WithData_WithPrefix_GetsBound cover associating [ModelBinder] with an action parameter.)
+        //
+        // This is a regression test for aspnet/Mvc#4652 and aspnet/Mvc#7595
+        [Theory]
+        [MemberData(nameof(NullAndEmptyBindingInfo))]
+        public async Task BinderTypeOnParameterType_WithData_EmptyPrefix_GetsBound(BindingInfo bindingInfo)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameters = typeof(TestController).GetMethod(nameof(TestController.Action)).GetParameters();
+            var parameter = new ControllerParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = bindingInfo,
+                ParameterInfo = parameters[0],
+                ParameterType = typeof(Address),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var address = Assert.IsType<Address>(modelBindingResult.Model);
+            Assert.Equal("SomeStreet", address.Street);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            var kvp = Assert.Single(modelState);
+            Assert.Equal("Street", kvp.Key);
+            var entry = kvp.Value;
+            Assert.NotNull(entry);
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.NotNull(entry.RawValue); // Value is set by test model binder, no need to validate it.
+        }
+
+        // Make sure the metadata is honored when a [ModelBinder] attribute is associated with an action parameter's
+        // type. This should behave identically to such an attribute on an action parameter. (Tests such as
+        // BindParameter_WithData_WithPrefix_GetsBound cover associating [ModelBinder] with an action parameter.)
+        //
+        // This is a regression test for aspnet/Mvc#4652
+        [Theory]
+        [MemberData(nameof(NullAndEmptyBindingInfo))]
+        public async Task BinderTypeOnParameterType_WithDataEmptyPrefixAndVersion20_GetsBound(
+            BindingInfo bindingInfo)
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                // ParameterBinder will use ModelMetadata for typeof(Address), not Parameter1's ParameterInfo.
+                updateOptions: options => options.AllowValidatingTopLevelNodes = false);
+
+            var modelState = testContext.ModelState;
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = bindingInfo,
+                ParameterType = typeof(Address),
+            };
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var address = Assert.IsType<Address>(modelBindingResult.Model);
+            Assert.Equal("SomeStreet", address.Street);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            var kvp = Assert.Single(modelState);
+            Assert.Equal("Street", kvp.Key);
+            var entry = kvp.Value;
+            Assert.NotNull(entry);
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.NotNull(entry.RawValue); // Value is set by test model binder, no need to validate it.
+        }
+
+        private class Person3
+        {
+            [ModelBinder(BinderType = typeof(Address3ModelBinder))]
+            public Address3 Address { get; set; }
+        }
+
+        private class Address3
+        {
+            public string Street { get; set; }
+        }
+
+        // Make sure the metadata is honored when a [ModelBinder] attribute is associated with a property in the type
+        // hierarchy of an action parameter. (Tests such as BindProperty_WithData_EmptyPrefix_GetsBound cover
+        // associating [ModelBinder] with a class somewhere in the type hierarchy of an action parameter.)
+        [Theory]
+        [MemberData(nameof(NullAndEmptyBindingInfo))]
+        public async Task BinderTypeOnProperty_WithData_EmptyPrefix_GetsBound(BindingInfo bindingInfo)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = bindingInfo,
+                ParameterType = typeof(Person3),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var person = Assert.IsType<Person3>(modelBindingResult.Model);
+            Assert.NotNull(person.Address);
+            Assert.Equal("SomeStreet", person.Address.Street);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            var kvp = Assert.Single(modelState);
+            Assert.Equal("Address.Street", kvp.Key);
+            var entry = kvp.Value;
+            Assert.NotNull(entry);
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.NotNull(entry.RawValue); // Value is set by test model binder, no need to validate it.
+        }
+
+        [Fact]
+        public async Task BindProperty_WithData_EmptyPrefix_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+                ParameterType = typeof(Person)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var boundPerson = Assert.IsType<Person>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson.Address);
+            Assert.Equal("SomeStreet", boundPerson.Address.Street);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            var key = Assert.Single(modelState.Keys);
+            Assert.Equal("Address.Street", key);
+            Assert.Equal(ModelValidationState.Valid, modelState[key].ValidationState);
+            Assert.NotNull(modelState[key].RawValue); // Value is set by test model binder, no need to validate it.
+        }
+
+        [Fact]
+        public async Task BindProperty_WithData_WithPrefix_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "CustomParameter"
+                },
+                ParameterType = typeof(Person)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var boundPerson = Assert.IsType<Person>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson.Address);
+            Assert.Equal("SomeStreet", boundPerson.Address.Street);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            var key = Assert.Single(modelState.Keys);
+            Assert.Equal("CustomParameter.Address.Street", key);
+            Assert.Equal(ModelValidationState.Valid, modelState[key].ValidationState);
+            Assert.NotNull(modelState[key].RawValue); // Value is set by test model binder, no need to validate it.
+        }
+
+        private class AddressModelBinder : IModelBinder
+        {
+            public Task BindModelAsync(ModelBindingContext bindingContext)
+            {
+                if (bindingContext == null)
+                {
+                    throw new ArgumentNullException(nameof(bindingContext));
+                }
+
+                Debug.Assert(bindingContext.Result == ModelBindingResult.Failed());
+
+                if (bindingContext.ModelType != typeof(Address))
+                {
+                    return Task.CompletedTask;
+                }
+
+                var address = new Address() { Street = "SomeStreet" };
+
+                bindingContext.ModelState.SetModelValue(
+                    ModelNames.CreatePropertyModelName(bindingContext.ModelName, "Street"),
+                    new string[] { address.Street },
+                    address.Street);
+
+                bindingContext.Result = ModelBindingResult.Success(address);
+                return Task.CompletedTask;
+            }
+        }
+
+        private class Address3ModelBinder : IModelBinder
+        {
+            public Task BindModelAsync(ModelBindingContext bindingContext)
+            {
+                if (bindingContext == null)
+                {
+                    throw new ArgumentNullException(nameof(bindingContext));
+                }
+
+                Debug.Assert(bindingContext.Result == ModelBindingResult.Failed());
+
+                if (bindingContext.ModelType != typeof(Address3))
+                {
+                    return Task.CompletedTask;
+                }
+
+                var address = new Address3 { Street = "SomeStreet" };
+
+                bindingContext.ModelState.SetModelValue(
+                    ModelNames.CreatePropertyModelName(bindingContext.ModelName, "Street"),
+                    new string[] { address.Street },
+                    address.Street);
+
+                bindingContext.Result = ModelBindingResult.Success(address);
+                return Task.CompletedTask;
+            }
+        }
+
+        private class SuccessModelBinder : IModelBinder
+        {
+            public Task BindModelAsync(ModelBindingContext bindingContext)
+            {
+                if (bindingContext == null)
+                {
+                    throw new ArgumentNullException(nameof(bindingContext));
+                }
+                Debug.Assert(bindingContext.Result == ModelBindingResult.Failed());
+
+                var model = "Success";
+                bindingContext.ModelState.SetModelValue(
+                    bindingContext.ModelName,
+                    new string[] { model },
+                    model);
+
+                bindingContext.Result =ModelBindingResult.Success(model);
+                return Task.CompletedTask;
+            }
+        }
+
+        private class NullModelBinder : IModelBinder
+        {
+            public Task BindModelAsync(ModelBindingContext bindingContext)
+            {
+                if (bindingContext == null)
+                {
+                    throw new ArgumentNullException(nameof(bindingContext));
+                }
+                Debug.Assert(bindingContext.Result == ModelBindingResult.Failed());
+
+                bindingContext.Result =  ModelBindingResult.Success(model: null);
+                return Task.CompletedTask;
+            }
+        }
+
+        private class NullModelNotSetModelBinder : IModelBinder
+        {
+            public Task BindModelAsync(ModelBindingContext bindingContext)
+            {
+                if (bindingContext == null)
+                {
+                    throw new ArgumentNullException(nameof(bindingContext));
+                }
+                Debug.Assert(bindingContext.Result == ModelBindingResult.Failed());
+
+                bindingContext.Result = ModelBindingResult.Failed();
+                return Task.CompletedTask;
+            }
+        }
+
+        private class TestController
+        {
+            public void Action(Address address)
+            {
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindingSourceMetadataProviderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindingSourceMetadataProviderIntegrationTest.cs
new file mode 100644
index 0000000000..0eaffb7f3d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindingSourceMetadataProviderIntegrationTest.cs
@@ -0,0 +1,152 @@
+// 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.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class BindingSourceMetadataProviderIntegrationTest
+    {
+        [Fact]
+        public async Task BindParameter_WithCancellationToken_BindingSourceSpecial()
+        {
+            // Arrange
+            var options = new MvcOptions();
+            var setup = new MvcCoreMvcOptionsSetup(new TestHttpRequestStreamReaderFactory());
+
+            options.ModelBinderProviders.Insert(0, new CancellationTokenModelBinderProvider());
+
+            setup.Configure(options);
+
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(options);
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+                ParameterType = typeof(CancellationTokenBundle),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.Form = new FormCollection(new Dictionary<string, StringValues>
+                {
+                    { "name", new[] { "Fred" } }
+                });
+            });
+
+            var modelState = testContext.ModelState;
+            var token = testContext.HttpContext.RequestAborted;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var boundPerson = Assert.IsType<CancellationTokenBundle>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson);
+            Assert.Equal("Fred", boundPerson.Name);
+            Assert.Equal(token, boundPerson.Token);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+        }
+
+        private class CancellationTokenBundle
+        {
+            public string Name { get; set; }
+
+            public CancellationToken Token { get; set; }
+        }
+
+        [Fact]
+        public async Task BindParameter_WithFormFile_BindingSourceFormFile()
+        {
+            // Arrange
+            var options = new MvcOptions();
+            var setup = new MvcCoreMvcOptionsSetup(new TestHttpRequestStreamReaderFactory());
+
+            options.ModelBinderProviders.Insert(0, new FormFileModelBinderProvider());
+
+            setup.Configure(options);
+
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(options);
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+                ParameterType = typeof(FormFileBundle),
+            };
+
+            var data = "Some Data Is Better Than No Data.";
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.QueryString = QueryString.Create("Name", "Fred");
+                    UpdateRequest(request, data, "File");
+                });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var boundPerson = Assert.IsType<FormFileBundle>(modelBindingResult.Model);
+            Assert.Equal("Fred", boundPerson.Name);
+            Assert.Equal("text.txt", boundPerson.File.FileName);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+        }
+
+        private class FormFileBundle
+        {
+            public string Name { get; set; }
+
+            public IFormFile File { get; set; }
+        }
+
+        private void UpdateRequest(HttpRequest request, string data, string name)
+        {
+            const string fileName = "text.txt";
+            var fileCollection = new FormFileCollection();
+            var formCollection = new FormCollection(new Dictionary<string, StringValues>(), fileCollection);
+
+            request.Form = formCollection;
+            request.ContentType = "multipart/form-data; boundary=----WebKitFormBoundarymx2fSWqWSd0OxQqq";
+
+            if (string.IsNullOrEmpty(data) || string.IsNullOrEmpty(name))
+            {
+                // Leave the submission empty.
+                return;
+            }
+
+            request.Headers["Content-Disposition"] = $"form-data; name={name}; filename={fileName}";
+
+            var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(data));
+            fileCollection.Add(new FormFile(memoryStream, 0, data.Length, name, fileName)
+            {
+                Headers = request.Headers
+            });
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BodyValidationIntegrationTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BodyValidationIntegrationTests.cs
new file mode 100644
index 0000000000..e4ee6a548c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BodyValidationIntegrationTests.cs
@@ -0,0 +1,883 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class BodyValidationIntegrationTests
+    {
+        [Fact]
+        public async Task ModelMetadataTypeAttribute_ValidBaseClass_NoModelStateErrors()
+        {
+            // Arrange
+            var input = "{ \"Name\": \"MVC\", \"Contact\":\"4258959019\", \"Category\":\"Technology\"," +
+                "\"CompanyName\":\"Microsoft\", \"Country\":\"USA\",\"Price\": 21, " +
+                "\"ProductDetails\": {\"Detail1\": \"d1\", \"Detail2\": \"d2\", \"Detail3\": \"d3\"}}";
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                ParameterType = typeof(ProductViewModel),
+                BindingInfo = new BindingInfo()
+                {
+                    BindingSource = BindingSource.Body
+                }
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+              request =>
+              {
+                  request.Body = new MemoryStream(Encoding.UTF8.GetBytes(input));
+                  request.ContentType = "application/json;charset=utf-8";
+              });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var boundPerson = Assert.IsType<ProductViewModel>(modelBindingResult.Model);
+            Assert.True(modelState.IsValid);
+            Assert.NotNull(boundPerson);
+        }
+
+        [Fact]
+        public async Task ModelMetadataType_ValidArray_NoModelStateErrors()
+        {
+            // Arrange
+            var input = "[" +
+                "{ \"Name\": \"MVC\", \"Contact\":\"4258959019\", \"Category\":\"Technology\"," +
+                "\"CompanyName\":\"Microsoft\", \"Country\":\"USA\",\"Price\": 21, " +
+                "\"ProductDetails\": {\"Detail1\": \"d1\", \"Detail2\": \"d2\", \"Detail3\": \"d3\"}}," +
+                "{ \"Name\": \"MVC too\", \"Contact\":\"4258959020\", \"Category\":\"Technology\"," +
+                "\"CompanyName\":\"Microsoft\", \"Country\":\"USA\",\"Price\": 22, " +
+                "\"ProductDetails\": {\"Detail1\": \"d2\", \"Detail2\": \"d3\", \"Detail3\": \"d4\"}}" +
+                "]";
+            var argumentBinding = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                ParameterType = typeof(IEnumerable<ProductViewModel>),
+                BindingInfo = new BindingInfo
+                {
+                    BindingSource = BindingSource.Body,
+                },
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.Body = new MemoryStream(Encoding.UTF8.GetBytes(input));
+                request.ContentType = "application/json;charset=utf-8";
+            });
+            var modelState = testContext.ModelState;
+
+            // Act
+            var result = await argumentBinding.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelState.IsValid);
+            Assert.True(result.IsModelSet);
+            var products = Assert.IsAssignableFrom<IEnumerable<ProductViewModel>>(result.Model);
+            Assert.Equal(2, products.Count());
+        }
+
+        [Fact]
+        public async Task ModelMetadataTypeAttribute_InvalidPropertiesAndSubPropertiesOnBaseClass_HasModelStateErrors()
+        {
+            // Arrange
+            var input = "{ \"Price\": 2, \"ProductDetails\": {\"Detail1\": \"d1\"}}";
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo()
+                {
+                    BindingSource = BindingSource.Body
+                },
+                ParameterType = typeof(ProductViewModel)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+              request =>
+              {
+                  request.Body = new MemoryStream(Encoding.UTF8.GetBytes(input));
+                  request.ContentType = "application/json";
+              });
+
+            var modelState = testContext.ModelState;
+
+            var priceRange = ValidationAttributeUtil.GetRangeErrorMessage(20, 100, "Price");
+            var categoryRequired = ValidationAttributeUtil.GetRequiredErrorMessage("Category");
+            var contactUsRequired = ValidationAttributeUtil.GetRequiredErrorMessage("Contact Us");
+            var detail2Required = ValidationAttributeUtil.GetRequiredErrorMessage("Detail2");
+            var detail3Required = ValidationAttributeUtil.GetRequiredErrorMessage("Detail3");
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var boundPerson = Assert.IsType<ProductViewModel>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson);
+            Assert.False(modelState.IsValid);
+            var modelStateErrors = CreateValidationDictionary(modelState);
+
+            Assert.Equal("CompanyName cannot be null or empty.", modelStateErrors["CompanyName"]);
+            Assert.Equal(priceRange, modelStateErrors["Price"]);
+            Assert.Equal(categoryRequired, modelStateErrors["Category"]);
+            Assert.Equal(contactUsRequired, modelStateErrors["Contact"]);
+            Assert.Equal(detail2Required, modelStateErrors["ProductDetails.Detail2"]);
+            Assert.Equal(detail3Required, modelStateErrors["ProductDetails.Detail3"]);
+        }
+
+        [Fact]
+        public async Task ModelMetadataTypeAttribute_InvalidComplexTypePropertyOnBaseClass_HasModelStateErrors()
+        {
+            // Arrange
+            var input = "{ \"Contact\":\"4255678765\", \"Category\":\"Technology\"," +
+                "\"CompanyName\":\"Microsoft\", \"Country\":\"USA\",\"Price\": 21 }";
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo()
+                {
+                    BindingSource = BindingSource.Body
+                },
+                ParameterType = typeof(ProductViewModel)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+              request =>
+              {
+                  request.Body = new MemoryStream(Encoding.UTF8.GetBytes(input));
+                  request.ContentType = "application/json";
+              });
+
+            var modelState = testContext.ModelState;
+
+            var productDetailsRequired = ValidationAttributeUtil.GetRequiredErrorMessage("ProductDetails");
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var boundPerson = Assert.IsType<ProductViewModel>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson);
+            Assert.False(modelState.IsValid);
+            var modelStateErrors = CreateValidationDictionary(modelState);
+            Assert.Equal(productDetailsRequired, modelStateErrors["ProductDetails"]);
+        }
+
+        [Fact]
+        public async Task ModelMetadataTypeAttribute_InvalidClassAttributeOnBaseClass_HasModelStateErrors()
+        {
+            // Arrange
+            var input = "{ \"Contact\":\"4258959019\", \"Category\":\"Technology\"," +
+                "\"CompanyName\":\"Microsoft\", \"Country\":\"UK\",\"Price\": 21, \"ProductDetails\": {\"Detail1\": \"d1\"," +
+                " \"Detail2\": \"d2\", \"Detail3\": \"d3\"}}";
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo()
+                {
+                    BindingSource = BindingSource.Body
+                },
+                ParameterType = typeof(ProductViewModel)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+              request =>
+              {
+                  request.Body = new MemoryStream(Encoding.UTF8.GetBytes(input));
+                  request.ContentType = "application/json";
+              });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var boundPerson = Assert.IsType<ProductViewModel>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson);
+            Assert.False(modelState.IsValid);
+            var modelStateErrors = CreateValidationDictionary(modelState);
+            Assert.Single(modelStateErrors);
+            Assert.Equal("Product must be made in the USA if it is not named.", modelStateErrors[""]);
+        }
+
+        [Fact]
+        public async Task ModelMetadataTypeAttribute_ValidDerivedClass_NoModelStateErrors()
+        {
+            // Arrange
+            var input = "{ \"Name\": \"MVC\", \"Contact\":\"4258959019\", \"Category\":\"Technology\"," +
+                "\"CompanyName\":\"Microsoft\", \"Country\":\"USA\", \"Version\":\"2\"," +
+                "\"DatePurchased\": \"/Date(1297246301973)/\", \"Price\" : \"110\" }";
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo()
+                {
+                    BindingSource = BindingSource.Body
+                },
+                ParameterType = typeof(SoftwareViewModel)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+              request =>
+              {
+                  request.Body = new MemoryStream(Encoding.UTF8.GetBytes(input));
+                  request.ContentType = "application/json";
+              });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var boundPerson = Assert.IsType<SoftwareViewModel>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson);
+            Assert.True(modelState.IsValid);
+        }
+
+        [Fact]
+        public async Task ModelMetadataTypeAttribute_InvalidPropertiesOnDerivedClass_HasModelStateErrors()
+        {
+            // Arrange
+            var input = "{ \"Name\": \"MVC\", \"Contact\":\"425-895-9019\", \"Category\":\"Technology\"," +
+                "\"CompanyName\":\"Microsoft\", \"Country\":\"USA\",\"Price\": 2}";
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo()
+                {
+                    BindingSource = BindingSource.Body
+                },
+                ParameterType = typeof(SoftwareViewModel)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+              request =>
+              {
+                  request.Body = new MemoryStream(Encoding.UTF8.GetBytes(input));
+                  request.ContentType = "application/json";
+              });
+
+            var modelState = testContext.ModelState;
+
+            var priceRange = ValidationAttributeUtil.GetRangeErrorMessage(100, 200, "Price");
+            var contactLength = ValidationAttributeUtil.GetStringLengthErrorMessage(null, 10, "Contact");
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var boundPerson = Assert.IsType<SoftwareViewModel>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson);
+            Assert.False(modelState.IsValid);
+            var modelStateErrors = CreateValidationDictionary(modelState);
+            Assert.Equal(2, modelStateErrors.Count);
+
+            Assert.Equal(priceRange, modelStateErrors["Price"]);
+            Assert.Equal(contactLength, modelStateErrors["Contact"]);
+        }
+
+        [Fact]
+        public async Task ModelMetadataTypeAttribute_InvalidClassAttributeOnBaseClassProduct_HasModelStateErrors()
+        {
+            // Arrange
+            var input = "{ \"Contact\":\"4258959019\", \"Category\":\"Technology\"," +
+                "\"CompanyName\":\"Microsoft\", \"Country\":\"UK\",\"Version\":\"2\"," +
+                "\"DatePurchased\": \"/Date(1297246301973)/\", \"Price\" : \"110\" }";
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo()
+                {
+                    BindingSource = BindingSource.Body
+                },
+                ParameterType = typeof(SoftwareViewModel)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+              request =>
+              {
+                  request.Body = new MemoryStream(Encoding.UTF8.GetBytes(input));
+                  request.ContentType = "application/json";
+              });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var boundPerson = Assert.IsType<SoftwareViewModel>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson);
+            Assert.False(modelState.IsValid);
+            var modelStateErrors = CreateValidationDictionary(modelState);
+            Assert.Single(modelStateErrors);
+            Assert.Equal("Product must be made in the USA if it is not named.", modelStateErrors[""]);
+        }
+
+        private class Person
+        {
+            [FromBody]
+            [Required]
+            public Address Address { get; set; }
+        }
+
+        private class Address
+        {
+            public string Street { get; set; }
+        }
+
+        [Fact]
+        public async Task FromBodyAllowingEmptyInputAndRequiredOnProperty_EmptyBody_AddsModelStateError()
+        {
+            // Arrange
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "CustomParameter",
+                },
+                ParameterType = typeof(Person)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+              request =>
+              {
+                  request.Body = new MemoryStream(Encoding.UTF8.GetBytes(string.Empty));
+                  request.ContentType = "application/json";
+              });
+            testContext.MvcOptions.AllowEmptyInputInBodyModelBinding = true;
+
+            var modelState = testContext.ModelState;
+            var addressRequired = ValidationAttributeUtil.GetRequiredErrorMessage("Address");
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var boundPerson = Assert.IsType<Person>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson);
+            var key = Assert.Single(modelState.Keys);
+            Assert.Equal("CustomParameter.Address", key);
+            Assert.False(modelState.IsValid);
+            var error = Assert.Single(modelState[key].Errors);
+            Assert.Equal(addressRequired, error.ErrorMessage);
+        }
+
+        [Fact]
+        public async Task FromBodyAllowingEmptyInputOnActionParameter_EmptyBody_BindsToNullValue()
+        {
+            // Arrange
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo
+                {
+                    BinderModelName = "CustomParameter",
+                    BindingSource = BindingSource.Body
+                },
+                ParameterType = typeof(Person)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.Body = new MemoryStream(Encoding.UTF8.GetBytes(string.Empty));
+                    request.ContentType = "application/json";
+                });
+            testContext.MvcOptions.AllowEmptyInputInBodyModelBinding = true;
+
+            var modelState = testContext.ModelState;
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            Assert.Null(modelBindingResult.Model);
+
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+
+        private class Person4
+        {
+            [FromBody]
+            [Required]
+            public int Address { get; set; }
+        }
+
+        [Fact] // This tests the 2.0 behavior. Error messages from JSON.NET are not preserved.
+        public async Task FromBodyAndRequiredOnValueTypeProperty_EmptyBody_JsonFormatterAddsModelStateError()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.Body = new MemoryStream(Encoding.UTF8.GetBytes(string.Empty));
+                    request.ContentType = "application/json";
+                });
+
+            // Override the AllowInputFormatterExceptionMessages setting ModelBindingTestHelper chooses.
+            var options = testContext.GetService<IOptions<MvcJsonOptions>>().Value;
+            options.AllowInputFormatterExceptionMessages = false;
+
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo
+                {
+                    BinderModelName = "CustomParameter",
+                },
+                ParameterType = typeof(Person4)
+            };
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var boundPerson = Assert.IsType<Person4>(modelBindingResult.Model);
+
+            Assert.False(modelState.IsValid);
+            var entry = Assert.Single(modelState);
+            Assert.Equal("CustomParameter.Address", entry.Key);
+            Assert.Null(entry.Value.AttemptedValue);
+            Assert.Null(entry.Value.RawValue);
+            var error = Assert.Single(entry.Value.Errors);
+
+            // Update me in 3.0 when MvcJsonOptions.AllowInputFormatterExceptionMessages is removed
+            Assert.IsType<JsonSerializationException>(error.Exception);
+            Assert.Empty(error.ErrorMessage);
+        }
+
+        private class Person5
+        {
+            [FromBody]
+            public Address5 Address { get; set; }
+        }
+
+        private class Address5
+        {
+            public int Number { get; set; }
+
+            // Required attribute does not cause an error in test scenarios. JSON deserializer ok w/ missing data.
+            [Required]
+            public int RequiredNumber { get; set; }
+        }
+
+        [Fact]
+        public async Task FromBodyAndRequiredOnInnerValueTypeProperty_NotBound_JsonFormatterSuccessful()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo
+                {
+                    BinderModelName = "CustomParameter",
+                },
+                ParameterType = typeof(Person5)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.Body = new MemoryStream(Encoding.UTF8.GetBytes("{ \"Number\": 5 }"));
+                    request.ContentType = "application/json";
+                });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var boundPerson = Assert.IsType<Person5>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson.Address);
+            Assert.Equal(5, boundPerson.Address.Number);
+            Assert.Equal(0, boundPerson.Address.RequiredNumber);
+
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+
+        [Fact] // This test covers the 2.0 behavior. Error messages from JSON.Net are preserved.
+        public async Task FromBodyWithInvalidPropertyData_JsonFormatterAddsModelError()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.Body = new MemoryStream(Encoding.UTF8.GetBytes("{ \"Number\": \"not a number\" }"));
+                    request.ContentType = "application/json";
+                });
+
+            // Override the AllowInputFormatterExceptionMessages setting ModelBindingTestHelper chooses.
+            var options = testContext.GetService<IOptions<MvcJsonOptions>>().Value;
+            options.AllowInputFormatterExceptionMessages = false;
+
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo
+                {
+                    BinderModelName = "CustomParameter",
+                },
+                ParameterType = typeof(Person5)
+            };
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var boundPerson = Assert.IsType<Person5>(modelBindingResult.Model);
+            Assert.Null(boundPerson.Address);
+
+            Assert.False(modelState.IsValid);
+            Assert.Single(modelState);
+            Assert.Equal(1, modelState.ErrorCount);
+
+            var state = modelState["CustomParameter.Address.Number"];
+            Assert.NotNull(state);
+            Assert.Null(state.AttemptedValue);
+            Assert.Null(state.RawValue);
+            var error = Assert.Single(state.Errors);
+
+            // Update me in 3.0 when MvcJsonOptions.AllowInputFormatterExceptionMessages is removed
+            Assert.IsType<JsonReaderException>(error.Exception);
+            Assert.Empty(error.ErrorMessage);
+        }
+
+        [Theory]
+        [InlineData(false, false)]
+        [InlineData(true, true)]
+        public async Task FromBodyWithEmptyBody_JsonFormatterAddsModelErrorWhenExpected(
+            bool allowEmptyInputInBodyModelBindingSetting,
+            bool expectedModelStateIsValid)
+        {
+            // Arrange
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo
+                {
+                    BinderModelName = "CustomParameter",
+                },
+                ParameterType = typeof(Person5)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.Body = new MemoryStream(Encoding.UTF8.GetBytes(string.Empty));
+                    request.ContentType = "application/json";
+                },
+                options => options.AllowEmptyInputInBodyModelBinding = allowEmptyInputInBodyModelBindingSetting);
+
+            var modelState = testContext.ModelState;
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var boundPerson = Assert.IsType<Person5>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson);
+
+            if (expectedModelStateIsValid)
+            {
+                Assert.True(modelState.IsValid);
+            }
+            else
+            {
+                Assert.False(modelState.IsValid);
+                var entry = Assert.Single(modelState);
+                Assert.Equal("CustomParameter.Address", entry.Key);
+                var street = entry.Value;
+                Assert.Equal(ModelValidationState.Invalid, street.ValidationState);
+                var error = Assert.Single(street.Errors);
+
+                // Since the message doesn't come from DataAnnotations, we don't have a way to get the
+                // exact string, so just check it's nonempty.
+                Assert.NotEmpty(error.ErrorMessage);
+            }
+        }
+
+        private class Person2
+        {
+            [FromBody]
+            public Address2 Address { get; set; }
+        }
+
+        private class Address2
+        {
+            [Required]
+            public string Street { get; set; }
+
+            public int Zip { get; set; }
+        }
+
+        [Theory]
+        [InlineData("{ \"Zip\" : 123 }")]
+        [InlineData("{}")]
+        public async Task FromBodyOnTopLevelProperty_RequiredOnSubProperty_AddsModelStateError(string inputText)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                BindingInfo = new BindingInfo
+                {
+                    BinderModelName = "CustomParameter",
+                },
+                ParameterType = typeof(Person2),
+                Name = "param-name",
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.Body = new MemoryStream(Encoding.UTF8.GetBytes(inputText));
+                    request.ContentType = "application/json";
+                });
+            var httpContext = testContext.HttpContext;
+            var modelState = testContext.ModelState;
+
+            var streetRequired = ValidationAttributeUtil.GetRequiredErrorMessage("Street");
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var boundPerson = Assert.IsType<Person2>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson);
+
+            Assert.False(modelState.IsValid);
+            var entry = Assert.Single(modelState);
+            Assert.Equal("CustomParameter.Address.Street", entry.Key);
+            var street = entry.Value;
+            Assert.Equal(ModelValidationState.Invalid, street.ValidationState);
+            var error = Assert.Single(street.Errors);
+            Assert.Equal(streetRequired, error.ErrorMessage);
+        }
+
+        private class Person3
+        {
+            [FromBody]
+            public Address3 Address { get; set; }
+        }
+
+        private class Address3
+        {
+            public string Street { get; set; }
+
+            [Required]
+            public int Zip { get; set; }
+        }
+
+        [Theory]
+        [InlineData("{ \"Street\" : \"someStreet\" }")]
+        [InlineData("{}")]
+        public async Task FromBodyOnProperty_Succeeds_IgnoresRequiredOnValueTypeSubProperty(string inputText)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                BindingInfo = new BindingInfo
+                {
+                    BinderModelName = "CustomParameter",
+                },
+                ParameterType = typeof(Person3),
+                Name = "param-name",
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.Body = new MemoryStream(Encoding.UTF8.GetBytes(inputText));
+                    request.ContentType = "application/json";
+                });
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            Assert.IsType<Person3>(modelBindingResult.Model);
+
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+
+        private class Person6
+        {
+            public Address6 Address { get; set; }
+        }
+
+        private class Address6
+        {
+            public string Street { get; set; }
+        }
+
+        // [FromBody] cannot be associated with a type. But a [FromBody] or [ModelBinder] subclass or custom
+        // IBindingSourceMetadata implementation might not have the same restriction. Make sure the metadata is honored
+        // when such an attribute is associated with a class somewhere in the type hierarchy of an action parameter.
+        [Theory]
+        [MemberData(
+            nameof(BinderTypeBasedModelBinderIntegrationTest.NullAndEmptyBindingInfo),
+            MemberType = typeof(BinderTypeBasedModelBinderIntegrationTest))]
+        public async Task FromBodyOnPropertyType_WithData_Succeeds(BindingInfo bindingInfo)
+        {
+            // Arrange
+            var inputText = "{ \"Street\" : \"someStreet\" }";
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider
+                .ForProperty<Person6>(nameof(Person6.Address))
+                .BindingDetails(binding => binding.BindingSource = BindingSource.Body);
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.Body = new MemoryStream(Encoding.UTF8.GetBytes(inputText));
+                    request.ContentType = "application/json";
+                },
+                metadataProvider: metadataProvider);
+
+            var modelState = testContext.ModelState;
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter-name",
+                BindingInfo = bindingInfo,
+                ParameterType = typeof(Person6),
+            };
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var person = Assert.IsType<Person6>(modelBindingResult.Model);
+            Assert.NotNull(person.Address);
+            Assert.Equal("someStreet", person.Address.Street, StringComparer.Ordinal);
+
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+
+        // [FromBody] cannot be associated with a type. But a [FromBody] or [ModelBinder] subclass or custom
+        // IBindingSourceMetadata implementation might not have the same restriction. Make sure the metadata is honored
+        // when such an attribute is associated with an action parameter's type.
+        [Theory]
+        [MemberData(
+            nameof(BinderTypeBasedModelBinderIntegrationTest.NullAndEmptyBindingInfo),
+            MemberType = typeof(BinderTypeBasedModelBinderIntegrationTest))]
+        public async Task FromBodyOnParameterType_WithData_Succeeds(BindingInfo bindingInfo)
+        {
+            // Arrange
+            var inputText = "{ \"Street\" : \"someStreet\" }";
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider
+                .ForType<Address6>()
+                .BindingDetails(binding => binding.BindingSource = BindingSource.Body);
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.Body = new MemoryStream(Encoding.UTF8.GetBytes(inputText));
+                    request.ContentType = "application/json";
+                },
+                metadataProvider: metadataProvider);
+
+            var modelState = testContext.ModelState;
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter-name",
+                BindingInfo = bindingInfo,
+                ParameterType = typeof(Address6),
+            };
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var address = Assert.IsType<Address6>(modelBindingResult.Model);
+            Assert.Equal("someStreet", address.Street, StringComparer.Ordinal);
+
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+
+        private Dictionary<string, string> CreateValidationDictionary(ModelStateDictionary modelState)
+        {
+            var result = new Dictionary<string, string>();
+            foreach (var item in modelState)
+            {
+                var errorMessage = string.Empty;
+                foreach (var error in item.Value.Errors)
+                {
+                    if (error != null)
+                    {
+                        errorMessage = errorMessage + error.ErrorMessage;
+                    }
+                }
+                if (!string.IsNullOrEmpty(errorMessage))
+                {
+                    result.Add(item.Key, errorMessage);
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ByteArrayModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ByteArrayModelBinderIntegrationTest.cs
new file mode 100644
index 0000000000..e05237d4b4
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ByteArrayModelBinderIntegrationTest.cs
@@ -0,0 +1,152 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class ByteArrayModelBinderIntegrationTest
+    {
+        private class Person
+        {
+            public byte[] Token { get; set; }
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task BindProperty_WithData_GetsBound(bool fallBackScenario)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+                ParameterType = typeof(Person)
+            };
+
+            var prefix = fallBackScenario ? string.Empty : "Parameter1";
+            var queryStringKey = fallBackScenario ? "Token" : prefix + "." + "Token";
+
+            // any valid base64 string
+            var expectedValue = new byte[] { 12, 13 };
+            var value = Convert.ToBase64String(expectedValue);
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.QueryString = QueryString.Create(queryStringKey, value);
+                });
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var boundPerson = Assert.IsType<Person>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson);
+            Assert.NotNull(boundPerson.Token);
+            Assert.Equal(expectedValue, boundPerson.Token);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState);
+            Assert.Equal(queryStringKey, entry.Key);
+            Assert.Empty(entry.Value.Errors);
+            Assert.Equal(ModelValidationState.Valid, entry.Value.ValidationState);
+            Assert.Equal(value, entry.Value.AttemptedValue);
+            Assert.Equal(value, entry.Value.RawValue);
+        }
+
+        [Fact]
+        public async Task BindParameter_NoData_DoesNotGetBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "CustomParameter",
+                },
+
+                ParameterType = typeof(byte[])
+            };
+
+            // No data is passed.
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.False(modelBindingResult.IsModelSet);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState.Keys);
+        }
+
+        [Fact]
+        public async Task BindParameter_WithData_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo
+                {
+                    BinderModelName = "CustomParameter",
+                },
+                ParameterType = typeof(byte[])
+            };
+
+            // any valid base64 string
+            var value = "four";
+            var expectedValue = Convert.FromBase64String(value);
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.QueryString = QueryString.Create("CustomParameter", value);
+                });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+            var model = Assert.IsType<byte[]>(modelBindingResult.Model);
+
+            // Model
+            Assert.Equal(expectedValue, model);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            var entry = Assert.Single(modelState);
+            Assert.Equal("CustomParameter", entry.Key);
+            Assert.Empty(entry.Value.Errors);
+            Assert.Equal(value, entry.Value.AttemptedValue);
+            Assert.Equal(value, entry.Value.RawValue);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CancellationTokenModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CancellationTokenModelBinderIntegrationTest.cs
new file mode 100644
index 0000000000..9ce033b2a8
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CancellationTokenModelBinderIntegrationTest.cs
@@ -0,0 +1,136 @@
+// 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.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class CancellationTokenModelBinderIntegrationTest
+    {
+        private class Person
+        {
+            public CancellationToken Token { get; set; }
+        }
+
+        [Fact]
+        public async Task BindProperty_WithData_WithPrefix_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "CustomParameter",
+                },
+
+                ParameterType = typeof(Person)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var boundPerson = Assert.IsType<Person>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson);
+            Assert.False(boundPerson.Token.IsCancellationRequested);
+            testContext.HttpContext.Abort();
+            Assert.True(boundPerson.Token.IsCancellationRequested);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            Assert.Empty(modelState.Keys);
+        }
+
+        [Fact]
+        public async Task BindProperty_WithData_WithEmptyPrefix_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+                ParameterType = typeof(Person)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var boundPerson = Assert.IsType<Person>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson);
+            Assert.False(boundPerson.Token.IsCancellationRequested);
+            testContext.HttpContext.Abort();
+            Assert.True(boundPerson.Token.IsCancellationRequested);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+
+        [Fact]
+        public async Task BindParameter_WithData_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "CustomParameter",
+                },
+
+                ParameterType = typeof(CancellationToken)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var token = Assert.IsType<CancellationToken>(modelBindingResult.Model);
+            Assert.False(token.IsCancellationRequested);
+            testContext.HttpContext.Abort();
+            Assert.True(token.IsCancellationRequested);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs
new file mode 100644
index 0000000000..7cb0c782d2
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs
@@ -0,0 +1,1259 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel.DataAnnotations;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    // Integration tests targeting the behavior of the CollectionModelBinder with other model binders.
+    //
+    // Note that CollectionModelBinder handles both ICollection{T} and IList{T}
+    public class CollectionModelBinderIntegrationTest
+    {
+        [Fact]
+        public async Task CollectionModelBinder_BindsListOfSimpleType_WithPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(List<int>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter[0]=10&parameter[1]=11");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<List<int>>(modelBindingResult.Model);
+            Assert.Equal(new List<int>() { 10, 11 }, model);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "parameter[0]").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "parameter[1]").Value;
+            Assert.Equal("11", entry.AttemptedValue);
+            Assert.Equal("11", entry.RawValue);
+        }
+
+        [Theory]
+        [InlineData("?prefix[0]=10&prefix[1]=11")]
+        [InlineData("?prefix.index=low&prefix.index=high&prefix[low]=10&prefix[high]=11")]
+        [InlineData("?prefix.index=index&prefix.index=indexer&prefix[index]=10&prefix[indexer]=11")]
+        [InlineData("?prefix.index=index&prefix.index=indexer&prefix[index]=10&prefix[indexer]=11&prefix[extra]=12")]
+        public async Task CollectionModelBinder_BindsListOfSimpleType_WithExplicitPrefix_Success(string queryString)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "prefix",
+                },
+                ParameterType = typeof(List<int>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString(queryString);
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<List<int>>(modelBindingResult.Model);
+            Assert.Equal(new List<int>() { 10, 11 }, model);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        [Theory]
+        [InlineData("?[0]=10&[1]=11")]
+        [InlineData("?index=low&index=high&[high]=11&[low]=10")]
+        [InlineData("?index=index&index=indexer&[indexer]=11&[index]=10")]
+        [InlineData("?index=index&index=indexer&[indexer]=11&[index]=10&[extra]=12")]
+        public async Task CollectionModelBinder_BindsCollectionOfSimpleType_EmptyPrefix_Success(string queryString)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(ICollection<int>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString(queryString);
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<List<int>>(modelBindingResult.Model);
+            Assert.Equal(new List<int> { 10, 11 }, model);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        [Fact]
+        public async Task CollectionModelBinder_BindsListOfSimpleType_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(List<int>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            Assert.Empty(Assert.IsType<List<int>>(modelBindingResult.Model));
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        private class Person
+        {
+            public int Id { get; set; }
+        }
+
+        [Theory]
+        [InlineData("?[0].Id=10&[1].Id=11")]
+        [InlineData("?index=low&index=high&[low].Id=10&[high].Id=11")]
+        [InlineData("?parameter[0].Id=10&parameter[1].Id=11")]
+        [InlineData("?parameter.index=low&parameter.index=high&parameter[low].Id=10&parameter[high].Id=11")]
+        [InlineData("?parameter.index=index&parameter.index=indexer&parameter[index].Id=10&parameter[indexer].Id=11")]
+        public async Task CollectionModelBinder_BindsListOfComplexType_ImpliedPrefix_Success(string queryString)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(List<Person>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString(queryString);
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<List<Person>>(modelBindingResult.Model);
+            Assert.Equal(10, model[0].Id);
+            Assert.Equal(11, model[1].Id);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        [Theory]
+        [InlineData("?prefix[0].Id=10&prefix[1].Id=11")]
+        [InlineData("?prefix.index=low&prefix.index=high&prefix[high].Id=11&prefix[low].Id=10")]
+        [InlineData("?prefix.index=index&prefix.index=indexer&prefix[indexer].Id=11&prefix[index].Id=10")]
+        public async Task CollectionModelBinder_BindsListOfComplexType_ExplicitPrefix_Success(string queryString)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "prefix",
+                },
+                ParameterType = typeof(List<Person>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString(queryString);
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<List<Person>>(modelBindingResult.Model);
+            Assert.Equal(10, model[0].Id);
+            Assert.Equal(11, model[1].Id);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        [Fact]
+        public async Task CollectionModelBinder_BindsListOfComplexType_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(List<Person>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            Assert.Empty(Assert.IsType<List<Person>>(modelBindingResult.Model));
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        private class Person2
+        {
+            public int Id { get; set; }
+
+            [BindRequired]
+            public string Name { get; set; }
+        }
+
+        [Fact]
+        public async Task CollectionModelBinder_BindsListOfComplexType_WithRequiredProperty_WithPrefix_PartialData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(List<Person2>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter[0].Id=10&parameter[1].Id=11");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<List<Person2>>(modelBindingResult.Model);
+            Assert.Equal(10, model[0].Id);
+            Assert.Equal(11, model[1].Id);
+            Assert.Null(model[0].Name);
+            Assert.Null(model[1].Name);
+
+            Assert.Equal(4, modelState.Count);
+            Assert.Equal(2, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "parameter[0].Id").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "parameter[1].Id").Value;
+            Assert.Equal("11", entry.AttemptedValue);
+            Assert.Equal("11", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "parameter[0].Name").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            var error = Assert.Single(entry.Errors);
+            Assert.Equal("A value for the 'Name' property was not provided.", error.ErrorMessage);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "parameter[1].Name").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            error = Assert.Single(entry.Errors);
+            Assert.Equal("A value for the 'Name' property was not provided.", error.ErrorMessage);
+        }
+
+        [Fact]
+        public async Task CollectionModelBinder_BindsListOfComplexType_WithRequiredProperty_WithExplicitPrefix_PartialData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "prefix",
+                },
+                ParameterType = typeof(List<Person2>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?prefix[0].Id=10&prefix[1].Id=11");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<List<Person2>>(modelBindingResult.Model);
+            Assert.Equal(10, model[0].Id);
+            Assert.Null(model[0].Name);
+            Assert.Equal(11, model[1].Id);
+            Assert.Null(model[1].Name);
+
+            Assert.Equal(4, modelState.Count);
+            Assert.Equal(2, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "prefix[0].Id").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "prefix[1].Id").Value;
+            Assert.Equal("11", entry.AttemptedValue);
+            Assert.Equal("11", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "prefix[0].Name").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "prefix[1].Name").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+        }
+
+        [Fact]
+        public async Task CollectionModelBinder_BindsCollectionOfComplexType_WithRequiredProperty_EmptyPrefix_PartialData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(ICollection<Person2>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?[0].Id=10&[1].Id=11");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<List<Person2>>(modelBindingResult.Model);
+            Assert.Equal(10, model[0].Id);
+            Assert.Null(model[0].Name);
+            Assert.Equal(11, model[1].Id);
+            Assert.Null(model[1].Name);
+
+            Assert.Equal(4, modelState.Count);
+            Assert.Equal(2, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "[0].Id").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "[1].Id").Value;
+            Assert.Equal("11", entry.AttemptedValue);
+            Assert.Equal("11", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "[0].Name").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "[1].Name").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+        }
+
+        [Fact]
+        public async Task CollectionModelBinder_BindsListOfSimpleType_WithIndex_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(List<int>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString =
+                    new QueryString("?parameter.index=low&parameter.index=high&parameter[low]=10&parameter[high]=11");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<List<int>>(modelBindingResult.Model);
+            Assert.Equal(new List<int>() { 10, 11 }, model);
+
+            // "index" is not stored in ModelState.
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "parameter[low]").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "parameter[high]").Value;
+            Assert.Equal("11", entry.AttemptedValue);
+            Assert.Equal("11", entry.RawValue);
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+        }
+
+        [Fact]
+        public async Task CollectionModelBinder_BindsCollectionOfComplexType_WithRequiredProperty_WithIndex_PartialData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(ICollection<Person2>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?index=low&index=high&[high].Id=11&[low].Id=10");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<List<Person2>>(modelBindingResult.Model);
+            Assert.Equal(10, model[0].Id);
+            Assert.Null(model[0].Name);
+            Assert.Equal(11, model[1].Id);
+            Assert.Null(model[1].Name);
+
+            Assert.Equal(4, modelState.Count);
+            Assert.Equal(2, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "[low].Id").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "[high].Id").Value;
+            Assert.Equal("11", entry.AttemptedValue);
+            Assert.Equal("11", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "[low].Name").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "[high].Name").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+        }
+
+        [Fact]
+        public async Task CollectionModelBinder_BindsListOfComplexType_WithRequiredProperty_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(List<Person2>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            Assert.Empty(Assert.IsType<List<Person2>>(modelBindingResult.Model));
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        private class Person4
+        {
+            public IList<Address4> Addresses { get; set; }
+        }
+
+        private class Address4
+        {
+            public int Zip { get; set; }
+
+            public string Street { get; set; }
+        }
+
+        [Fact]
+        public async Task CollectionModelBinder_UsesCustomIndexes()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Person4)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                var formCollection = new FormCollection(new Dictionary<string, StringValues>()
+                {
+                    { "Addresses.index", new [] { "Key1", "Key2" } },
+                    { "Addresses[Key1].Street", new [] { "Street1" } },
+                    { "Addresses[Key2].Street", new [] { "Street2" } },
+                });
+
+                request.Form = formCollection;
+                request.ContentType = "application/x-www-form-urlencoded";
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            Assert.IsType<Person4>(modelBindingResult.Model);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "Addresses[Key1].Street").Value;
+            Assert.Equal("Street1", entry.AttemptedValue);
+            Assert.Equal("Street1", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "Addresses[Key2].Street").Value;
+            Assert.Equal("Street2", entry.AttemptedValue);
+            Assert.Equal("Street2", entry.RawValue);
+        }
+
+        private class Person5
+        {
+            public IList<Address5> Addresses { get; set; }
+        }
+
+        private class Address5
+        {
+            public int Zip { get; set; }
+
+            [StringLength(3)]
+            public string Street { get; set; }
+        }
+
+        [Fact]
+        public async Task CollectionModelBinder_UsesCustomIndexes_AddsErrorsWithCorrectKeys()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Person5)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                var formCollection = new FormCollection(new Dictionary<string, StringValues>()
+                {
+                    { "Addresses.index", new [] { "Key1" } },
+                    { "Addresses[Key1].Street", new [] { "Street1" } },
+                });
+
+                request.Form = formCollection;
+                request.ContentType = "application/x-www-form-urlencoded";
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            Assert.IsType<Person5>(modelBindingResult.Model);
+
+            Assert.False(modelState.IsValid);
+
+            var kvp = Assert.Single(modelState);
+            Assert.Equal("Addresses[Key1].Street", kvp.Key);
+            var entry = kvp.Value;
+            var error = Assert.Single(entry.Errors);
+            Assert.Equal(ValidationAttributeUtil.GetStringLengthErrorMessage(null, 3, "Street"), error.ErrorMessage);
+        }
+
+        [Theory]
+        [InlineData("?[0].Street=LongStreet")]
+        [InlineData("?index=low&[low].Street=LongStreet")]
+        [InlineData("?parameter[0].Street=LongStreet")]
+        [InlineData("?parameter.index=low&parameter[low].Street=LongStreet")]
+        [InlineData("?parameter.index=index&parameter[index].Street=LongStreet")]
+        public async Task CollectionModelBinder_BindsCollectionOfComplexType_ImpliedPrefix_FindsValidationErrors(
+            string queryString)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(ICollection<Address5>),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString(queryString);
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var model = Assert.IsType<List<Address5>>(modelBindingResult.Model);
+            var address = Assert.Single(model);
+            Assert.Equal("LongStreet", address.Street);
+
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState).Value;
+            var error = Assert.Single(entry.Errors);
+            Assert.Equal(ValidationAttributeUtil.GetStringLengthErrorMessage(null, 3, "Street"), error.ErrorMessage);
+        }
+
+        // parameter type, form content, expected type
+        public static TheoryData<Type, IDictionary<string, StringValues>, Type> CollectionTypeData
+        {
+            get
+            {
+                return new TheoryData<Type, IDictionary<string, StringValues>, Type>
+                {
+                    {
+                        typeof(IEnumerable<string>),
+                        new Dictionary<string, StringValues>
+                        {
+                            { "[0]", new[] { "hello" } },
+                            { "[1]", new[] { "world" } },
+                        },
+                        typeof(List<string>)
+                    },
+                    {
+                        typeof(ICollection<string>),
+                        new Dictionary<string, StringValues>
+                        {
+                            { "index", new[] { "low", "high" } },
+                            { "[low]", new[] { "hello" } },
+                            { "[high]", new[] { "world" } },
+                        },
+                        typeof(List<string>)
+                    },
+                    {
+                        typeof(IReadOnlyCollection<string>),
+                        new Dictionary<string, StringValues>
+                        {
+                            { "index", new[] { "low", "high" } },
+                            { "[low]", new[] { "hello" } },
+                            { "[high]", new[] { "world" } },
+                        },
+                        typeof(List<string>)
+                    },
+                    {
+                        typeof(IList<string>),
+                        new Dictionary<string, StringValues>
+                        {
+                            { "[0]", new[] { "hello" } },
+                            { "[1]", new[] { "world" } },
+                        },
+                        typeof(List<string>)
+                    },
+                    {
+                        typeof(IReadOnlyList<string>),
+                        new Dictionary<string, StringValues>
+                        {
+                            { "[0]", new[] { "hello" } },
+                            { "[1]", new[] { "world" } },
+                        },
+                        typeof(List<string>)
+                    },
+                    {
+                        typeof(List<string>),
+                        new Dictionary<string, StringValues>
+                        {
+                            { "index", new[] { "low", "high" } },
+                            { "[low]", new[] { "hello" } },
+                            { "[high]", new[] { "world" } },
+                        },
+                        typeof(List<string>)
+                    },
+                    {
+                        typeof(ClosedGenericCollection),
+                        new Dictionary<string, StringValues>
+                        {
+                            { "[0]", new[] { "hello" } },
+                            { "[1]", new[] { "world" } },
+                        },
+                        typeof(ClosedGenericCollection)
+                    },
+                    {
+                        typeof(ClosedGenericList),
+                        new Dictionary<string, StringValues>
+                        {
+                            { "index", new[] { "low", "high" } },
+                            { "[low]", new[] { "hello" } },
+                            { "[high]", new[] { "world" } },
+                        },
+                        typeof(ClosedGenericList)
+                    },
+                    {
+                        typeof(ExplicitClosedGenericCollection),
+                        new Dictionary<string, StringValues>
+                        {
+                            { "[0]", new[] { "hello" } },
+                            { "[1]", new[] { "world" } },
+                        },
+                        typeof(ExplicitClosedGenericCollection)
+                    },
+                    {
+                        typeof(ExplicitClosedGenericList),
+                        new Dictionary<string, StringValues>
+                        {
+                            { "index", new[] { "low", "high" } },
+                            { "[low]", new[] { "hello" } },
+                            { "[high]", new[] { "world" } },
+                        },
+                        typeof(ExplicitClosedGenericList)
+                    },
+                    {
+                        typeof(ExplicitCollection<string>),
+                        new Dictionary<string, StringValues>
+                        {
+                            { "[0]", new[] { "hello" } },
+                            { "[1]", new[] { "world" } },
+                        },
+                        typeof(ExplicitCollection<string>)
+                    },
+                    {
+                        typeof(ExplicitList<string>),
+                        new Dictionary<string, StringValues>
+                        {
+                            { "index", new[] { "low", "high" } },
+                            { "[low]", new[] { "hello" } },
+                            { "[high]", new[] { "world" } },
+                        },
+                        typeof(ExplicitList<string>)
+                    },
+                    {
+                        typeof(IEnumerable<string>),
+                        new Dictionary<string, StringValues>
+                        {
+                            { string.Empty, new[] { "hello", "world" } },
+                        },
+                        typeof(List<string>)
+                    },
+                    {
+                        typeof(ICollection<string>),
+                        new Dictionary<string, StringValues>
+                        {
+                            { "[]", new[] { "hello", "world" } },
+                        },
+                        typeof(List<string>)
+                    },
+                    {
+                        typeof(IList<string>),
+                        new Dictionary<string, StringValues>
+                        {
+                            { string.Empty, new[] { "hello", "world" } },
+                        },
+                        typeof(List<string>)
+                    },
+                    {
+                        typeof(List<string>),
+                        new Dictionary<string, StringValues>
+                        {
+                            { "[]", new[] { "hello", "world" } },
+                        },
+                        typeof(List<string>)
+                    },
+                    {
+                        typeof(ClosedGenericCollection),
+                        new Dictionary<string, StringValues>
+                        {
+                            { string.Empty, new[] { "hello", "world" } },
+                        },
+                        typeof(ClosedGenericCollection)
+                    },
+                    {
+                        typeof(ClosedGenericList),
+                        new Dictionary<string, StringValues>
+                        {
+                            { "[]", new[] { "hello", "world" } },
+                        },
+                        typeof(ClosedGenericList)
+                    },
+                    {
+                        typeof(ExplicitClosedGenericCollection),
+                        new Dictionary<string, StringValues>
+                        {
+                            { string.Empty, new[] { "hello", "world" } },
+                        },
+                        typeof(ExplicitClosedGenericCollection)
+                    },
+                    {
+                        typeof(ExplicitClosedGenericList),
+                        new Dictionary<string, StringValues>
+                        {
+                            { "[]", new[] { "hello", "world" } },
+                        },
+                        typeof(ExplicitClosedGenericList)
+                    },
+                    {
+                        typeof(ExplicitCollection<string>),
+                        new Dictionary<string, StringValues>
+                        {
+                            { string.Empty, new[] { "hello", "world" } },
+                        },
+                        typeof(ExplicitCollection<string>)
+                    },
+                    {
+                        typeof(ExplicitList<string>),
+                        new Dictionary<string, StringValues>
+                        {
+                            { "[]", new[] { "hello", "world" } },
+                        },
+                        typeof(ExplicitList<string>)
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(CollectionTypeData))]
+        public async Task CollectionModelBinder_BindsParameterToExpectedType(
+            Type parameterType,
+            Dictionary<string, StringValues> formContent,
+            Type expectedType)
+        {
+            // Arrange
+            var expectedCollection = new List<string> { "hello", "world" };
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter",
+                ParameterType = parameterType,
+            };
+
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.Form = new FormCollection(formContent);
+            });
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            Assert.IsType(expectedType, modelBindingResult.Model);
+
+            var model = modelBindingResult.Model as IEnumerable<string>;
+            Assert.NotNull(model); // Guard
+            Assert.Equal(expectedCollection, model);
+
+            Assert.True(modelState.IsValid);
+            Assert.NotEmpty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+        }
+
+        private class ClosedGenericCollection : Collection<string>
+        {
+        }
+
+        private class ClosedGenericList : List<string>
+        {
+        }
+
+        private class ExplicitClosedGenericCollection : ICollection<string>
+        {
+            private List<string> _data = new List<string>();
+
+            int ICollection<string>.Count
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            bool ICollection<string>.IsReadOnly
+            {
+                get
+                {
+                    return false;
+                }
+            }
+
+            void ICollection<string>.Add(string item)
+            {
+                _data.Add(item);
+            }
+
+            void ICollection<string>.Clear()
+            {
+                _data.Clear();
+            }
+
+            bool ICollection<string>.Contains(string item)
+            {
+                throw new NotImplementedException();
+            }
+
+            void ICollection<string>.CopyTo(string[] array, int arrayIndex)
+            {
+                throw new NotImplementedException();
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                return ((IEnumerable)_data).GetEnumerator();
+            }
+
+            IEnumerator<string> IEnumerable<string>.GetEnumerator()
+            {
+                return _data.GetEnumerator();
+            }
+
+            bool ICollection<string>.Remove(string item)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class ExplicitClosedGenericList : IList<string>
+        {
+            private List<string> _data = new List<string>();
+
+            string IList<string>.this[int index]
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+
+                set
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            int ICollection<string>.Count
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            bool ICollection<string>.IsReadOnly
+            {
+                get
+                {
+                    return false;
+                }
+            }
+
+            void ICollection<string>.Add(string item)
+            {
+                _data.Add(item);
+            }
+
+            void ICollection<string>.Clear()
+            {
+                _data.Clear();
+            }
+
+            bool ICollection<string>.Contains(string item)
+            {
+                throw new NotImplementedException();
+            }
+
+            void ICollection<string>.CopyTo(string[] array, int arrayIndex)
+            {
+                throw new NotImplementedException();
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                return ((IEnumerable)_data).GetEnumerator();
+            }
+
+            IEnumerator<string> IEnumerable<string>.GetEnumerator()
+            {
+                return _data.GetEnumerator();
+            }
+
+            int IList<string>.IndexOf(string item)
+            {
+                throw new NotImplementedException();
+            }
+
+            void IList<string>.Insert(int index, string item)
+            {
+                throw new NotImplementedException();
+            }
+
+            bool ICollection<string>.Remove(string item)
+            {
+                throw new NotImplementedException();
+            }
+
+            void IList<string>.RemoveAt(int index)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class ExplicitCollection<T> : ICollection<T>
+        {
+            private List<T> _data = new List<T>();
+
+            int ICollection<T>.Count
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            bool ICollection<T>.IsReadOnly
+            {
+                get
+                {
+                    return false;
+                }
+            }
+
+            void ICollection<T>.Add(T item)
+            {
+                _data.Add(item);
+            }
+
+            void ICollection<T>.Clear()
+            {
+                _data.Clear();
+            }
+
+            bool ICollection<T>.Contains(T item)
+            {
+                throw new NotImplementedException();
+            }
+
+            void ICollection<T>.CopyTo(T[] array, int arrayIndex)
+            {
+                throw new NotImplementedException();
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                return ((IEnumerable)_data).GetEnumerator();
+            }
+
+            IEnumerator<T> IEnumerable<T>.GetEnumerator()
+            {
+                return _data.GetEnumerator();
+            }
+
+            bool ICollection<T>.Remove(T item)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class ExplicitList<T> : IList<T>
+        {
+            private List<T> _data = new List<T>();
+
+            T IList<T>.this[int index]
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+
+                set
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            int ICollection<T>.Count
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            bool ICollection<T>.IsReadOnly
+            {
+                get
+                {
+                    return false;
+                }
+            }
+
+            void ICollection<T>.Add(T item)
+            {
+                _data.Add(item);
+            }
+
+            void ICollection<T>.Clear()
+            {
+                _data.Clear();
+            }
+
+            bool ICollection<T>.Contains(T item)
+            {
+                throw new NotImplementedException();
+            }
+
+            void ICollection<T>.CopyTo(T[] array, int arrayIndex)
+            {
+                throw new NotImplementedException();
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                return ((IEnumerable)_data).GetEnumerator();
+            }
+
+            IEnumerator<T> IEnumerable<T>.GetEnumerator()
+            {
+                return _data.GetEnumerator();
+            }
+
+            int IList<T>.IndexOf(T item)
+            {
+                throw new NotImplementedException();
+            }
+
+            void IList<T>.Insert(int index, T item)
+            {
+                throw new NotImplementedException();
+            }
+
+            bool ICollection<T>.Remove(T item)
+            {
+                throw new NotImplementedException();
+            }
+
+            void IList<T>.RemoveAt(int index)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CompanyNameAttribute.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CompanyNameAttribute.cs
new file mode 100644
index 0000000000..09cb8002e5
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CompanyNameAttribute.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class CompanyNameAttribute : ValidationAttribute
+    {
+        protected override ValidationResult IsValid(object value, ValidationContext validationContext)
+        {
+            var valueString = value as string;
+            if (string.IsNullOrEmpty(valueString))
+            {
+                return new ValidationResult("CompanyName cannot be null or empty.");
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ComplexTypeModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ComplexTypeModelBinderIntegrationTest.cs
new file mode 100644
index 0000000000..e3f693f58a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ComplexTypeModelBinderIntegrationTest.cs
@@ -0,0 +1,2728 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    // Integration tests targeting the behavior of the MutableObjectModelBinder and related classes
+    // with other model binders.
+    public class ComplexTypeModelBinderIntegrationTest
+    {
+        private const string AddressBodyContent = "{ \"street\" : \"" + AddressStreetContent + "\" }";
+        private const string AddressStreetContent = "1 Microsoft Way";
+
+        private static readonly byte[] ByteArrayContent = Encoding.BigEndianUnicode.GetBytes("abcd");
+        private static readonly string ByteArrayEncoded = Convert.ToBase64String(ByteArrayContent);
+
+        private class Order1
+        {
+            public int ProductId { get; set; }
+
+            public Person1 Customer { get; set; }
+        }
+
+        private class Person1
+        {
+            public string Name { get; set; }
+
+            [FromBody]
+            public Address1 Address { get; set; }
+        }
+
+        private class Address1
+        {
+            public string Street { get; set; }
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsNestedPOCO_WithBodyModelBinder_WithPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order1)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Customer.Name=bill");
+                SetJsonBodyContent(request, AddressBodyContent);
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order1>(modelBindingResult.Model);
+            Assert.NotNull(model.Customer);
+            Assert.Equal("bill", model.Customer.Name);
+            Assert.NotNull(model.Customer.Address);
+            Assert.Equal(AddressStreetContent, model.Customer.Address.Street);
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Customer.Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsNestedPOCO_WithBodyModelBinder_WithEmptyPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order1)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?Customer.Name=bill");
+                SetJsonBodyContent(request, AddressBodyContent);
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order1>(modelBindingResult.Model);
+            Assert.NotNull(model.Customer);
+            Assert.Equal("bill", model.Customer.Name);
+            Assert.NotNull(model.Customer.Address);
+            Assert.Equal(AddressStreetContent, model.Customer.Address.Street);
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "Customer.Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsNestedPOCO_WithBodyModelBinder_WithPrefix_NoBodyData()
+        {
+            // Arrange
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order1)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Customer.Name=bill");
+                request.ContentType = "application/json";
+            });
+
+            testContext.MvcOptions.AllowEmptyInputInBodyModelBinding = true;
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order1>(modelBindingResult.Model);
+            Assert.NotNull(model.Customer);
+            Assert.Equal("bill", model.Customer.Name);
+            Assert.Null(model.Customer.Address);
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Customer.Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+        }
+
+        // We don't provide enough data in this test for the 'Person' model to be created. So even though there is
+        // body data in the request, it won't be used.
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsNestedPOCO_WithBodyModelBinder_WithPrefix_PartialData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order1)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.ProductId=10");
+                SetJsonBodyContent(request, AddressBodyContent);
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order1>(modelBindingResult.Model);
+            Assert.Null(model.Customer);
+            Assert.Equal(10, model.ProductId);
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.ProductId").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+        }
+
+        // We don't provide enough data in this test for the 'Person' model to be created. So even though there is
+        // body data in the request, it won't be used.
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsNestedPOCO_WithBodyModelBinder_WithPrefix_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order1)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+                SetJsonBodyContent(request, AddressBodyContent);
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order1>(modelBindingResult.Model);
+            Assert.Null(model.Customer);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        private class Order3
+        {
+            public int ProductId { get; set; }
+
+            public Person3 Customer { get; set; }
+        }
+
+        private class Person3
+        {
+            public string Name { get; set; }
+
+            public byte[] Token { get; set; }
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsNestedPOCO_WithByteArrayModelBinder_WithPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order3)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString =
+                    new QueryString("?parameter.Customer.Name=bill&parameter.Customer.Token=" + ByteArrayEncoded);
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order3>(modelBindingResult.Model);
+            Assert.NotNull(model.Customer);
+            Assert.Equal("bill", model.Customer.Name);
+            Assert.Equal(ByteArrayContent, model.Customer.Token);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Customer.Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "parameter.Customer.Token").Value;
+            Assert.Equal(ByteArrayEncoded, entry.AttemptedValue);
+            Assert.Equal(ByteArrayEncoded, entry.RawValue);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsNestedPOCO_WithByteArrayModelBinder_WithEmptyPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order3)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?Customer.Name=bill&Customer.Token=" + ByteArrayEncoded);
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order3>(modelBindingResult.Model);
+            Assert.NotNull(model.Customer);
+            Assert.Equal("bill", model.Customer.Name);
+            Assert.Equal(ByteArrayContent, model.Customer.Token);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "Customer.Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "Customer.Token").Value;
+            Assert.Equal(ByteArrayEncoded, entry.AttemptedValue);
+            Assert.Equal(ByteArrayEncoded, entry.RawValue);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsNestedPOCO_WithByteArrayModelBinder_WithPrefix_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order3)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Customer.Name=bill");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order3>(modelBindingResult.Model);
+            Assert.NotNull(model.Customer);
+            Assert.Equal("bill", model.Customer.Name);
+            Assert.Null(model.Customer.Token);
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Customer.Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+        }
+
+        private class Order4
+        {
+            public int ProductId { get; set; }
+
+            public Person4 Customer { get; set; }
+        }
+
+        private class Person4
+        {
+            public string Name { get; set; }
+
+            public IEnumerable<IFormFile> Documents { get; set; }
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsNestedPOCO_WithFormFileModelBinder_WithPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order4)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Customer.Name=bill");
+                SetFormFileBodyContent(request, "Hello, World!", "parameter.Customer.Documents");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order4>(modelBindingResult.Model);
+            Assert.NotNull(model.Customer);
+            Assert.Equal("bill", model.Customer.Name);
+            Assert.Single(model.Customer.Documents);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Customer.Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "parameter.Customer.Documents").Value;
+            Assert.Null(entry.AttemptedValue); // FormFile entries for body don't include original text.
+            Assert.Null(entry.RawValue);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsNestedPOCO_WithFormFileModelBinder_WithEmptyPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order4)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?Customer.Name=bill");
+                SetFormFileBodyContent(request, "Hello, World!", "Customer.Documents");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order4>(modelBindingResult.Model);
+            Assert.NotNull(model.Customer);
+            Assert.Equal("bill", model.Customer.Name);
+            Assert.Single(model.Customer.Documents);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "Customer.Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "Customer.Documents").Value;
+            Assert.Null(entry.AttemptedValue); // FormFile entries don't include the model.
+            Assert.Null(entry.RawValue);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsNestedPOCO_WithFormFileModelBinder_WithPrefix_NoBodyData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order4)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Customer.Name=bill");
+
+                // Deliberately leaving out any form data.
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order4>(modelBindingResult.Model);
+            Assert.NotNull(model.Customer);
+            Assert.Equal("bill", model.Customer.Name);
+            Assert.Null(model.Customer.Documents);
+
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var kvp = Assert.Single(modelState);
+            Assert.Equal("parameter.Customer.Name", kvp.Key);
+            var entry = kvp.Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+        }
+
+        // We don't provide enough data in this test for the 'Person' model to be created. So even though there are
+        // form files in the request, it won't be used.
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsNestedPOCO_WithFormFileModelBinder_WithPrefix_PartialData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order4)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.ProductId=10");
+                SetFormFileBodyContent(request, "Hello, World!", "parameter.Customer.Documents");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order4>(modelBindingResult.Model);
+            Assert.Null(model.Customer);
+            Assert.Equal(10, model.ProductId);
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.ProductId").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+        }
+
+        // We don't provide enough data in this test for the 'Person' model to be created. So even though there is
+        // body data in the request, it won't be used.
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsNestedPOCO_WithFormFileModelBinder_WithPrefix_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order4)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+                SetFormFileBodyContent(request, "Hello, World!", "parameter.Customer.Documents");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order4>(modelBindingResult.Model);
+            Assert.Null(model.Customer);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        private class Order5
+        {
+            public string Name { get; set; }
+
+            public int[] ProductIds { get; set; }
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsArrayProperty_WithPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order5)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString =
+                    new QueryString("?parameter.Name=bill&parameter.ProductIds[0]=10&parameter.ProductIds[1]=11");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order5>(modelBindingResult.Model);
+            Assert.Equal("bill", model.Name);
+            Assert.Equal(new int[] { 10, 11 }, model.ProductIds);
+
+            Assert.Equal(3, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "parameter.ProductIds[0]").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "parameter.ProductIds[1]").Value;
+            Assert.Equal("11", entry.AttemptedValue);
+            Assert.Equal("11", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsArrayProperty_EmptyPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order5)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?Name=bill&ProductIds[0]=10&ProductIds[1]=11");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order5>(modelBindingResult.Model);
+            Assert.Equal("bill", model.Name);
+            Assert.Equal(new int[] { 10, 11 }, model.ProductIds);
+
+            Assert.Equal(3, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "ProductIds[0]").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "ProductIds[1]").Value;
+            Assert.Equal("11", entry.AttemptedValue);
+            Assert.Equal("11", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsArrayProperty_NoCollectionData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order5)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Name=bill");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order5>(modelBindingResult.Model);
+            Assert.Equal("bill", model.Name);
+            Assert.Null(model.ProductIds);
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsArrayProperty_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order5)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order5>(modelBindingResult.Model);
+            Assert.Null(model.Name);
+            Assert.Null(model.ProductIds);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        private class Order6
+        {
+            public string Name { get; set; }
+
+            public List<int> ProductIds { get; set; }
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsListProperty_WithPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order6)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString =
+                    new QueryString("?parameter.Name=bill&parameter.ProductIds[0]=10&parameter.ProductIds[1]=11");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order6>(modelBindingResult.Model);
+            Assert.Equal("bill", model.Name);
+            Assert.Equal(new List<int>() { 10, 11 }, model.ProductIds);
+
+            Assert.Equal(3, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "parameter.ProductIds[0]").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "parameter.ProductIds[1]").Value;
+            Assert.Equal("11", entry.AttemptedValue);
+            Assert.Equal("11", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsListProperty_EmptyPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order6)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?Name=bill&ProductIds[0]=10&ProductIds[1]=11");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order6>(modelBindingResult.Model);
+            Assert.Equal("bill", model.Name);
+            Assert.Equal(new List<int>() { 10, 11 }, model.ProductIds);
+
+            Assert.Equal(3, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "ProductIds[0]").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "ProductIds[1]").Value;
+            Assert.Equal("11", entry.AttemptedValue);
+            Assert.Equal("11", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsListProperty_NoCollectionData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order6)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Name=bill");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order6>(modelBindingResult.Model);
+            Assert.Equal("bill", model.Name);
+            Assert.Null(model.ProductIds);
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsListProperty_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order6)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order6>(modelBindingResult.Model);
+            Assert.Null(model.Name);
+            Assert.Null(model.ProductIds);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        private class Order7
+        {
+            public string Name { get; set; }
+
+            public Dictionary<string, int> ProductIds { get; set; }
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsDictionaryProperty_WithPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order7)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString =
+                    new QueryString("?parameter.Name=bill&parameter.ProductIds[0].Key=key0&parameter.ProductIds[0].Value=10");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order7>(modelBindingResult.Model);
+            Assert.Equal("bill", model.Name);
+            Assert.Equal(new Dictionary<string, int>() { { "key0", 10 } }, model.ProductIds);
+
+            Assert.Equal(3, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "parameter.ProductIds[0].Key").Value;
+            Assert.Equal("key0", entry.AttemptedValue);
+            Assert.Equal("key0", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "parameter.ProductIds[0].Value").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsDictionaryProperty_EmptyPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order7)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?Name=bill&ProductIds[0].Key=key0&ProductIds[0].Value=10");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order7>(modelBindingResult.Model);
+            Assert.Equal("bill", model.Name);
+            Assert.Equal(new Dictionary<string, int>() { { "key0", 10 } }, model.ProductIds);
+
+            Assert.Equal(3, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "ProductIds[0].Key").Value;
+            Assert.Equal("key0", entry.AttemptedValue);
+            Assert.Equal("key0", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "ProductIds[0].Value").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsDictionaryProperty_NoCollectionData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order7)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Name=bill");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order7>(modelBindingResult.Model);
+            Assert.Equal("bill", model.Name);
+            Assert.Null(model.ProductIds);
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsDictionaryProperty_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order7)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order7>(modelBindingResult.Model);
+            Assert.Null(model.Name);
+            Assert.Null(model.ProductIds);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        // Dictionary property with an IEnumerable<> value type
+        private class Car1
+        {
+            public string Name { get; set; }
+
+            public Dictionary<string, IEnumerable<SpecDoc>> Specs { get; set; }
+        }
+
+        // Dictionary property with an Array value type
+        private class Car2
+        {
+            public string Name { get; set; }
+
+            public Dictionary<string, SpecDoc[]> Specs { get; set; }
+        }
+
+        private class Car3
+        {
+            public string Name { get; set; }
+
+            public IEnumerable<KeyValuePair<string, IEnumerable<SpecDoc>>> Specs { get; set; }
+        }
+
+        private class SpecDoc
+        {
+            public string Name { get; set; }
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsDictionaryProperty_WithIEnumerableComplexTypeValue_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "p",
+                ParameterType = typeof(Car1)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                var queryString = "?p.Name=Accord"
+                        + "&p.Specs[0].Key=camera_specs"
+                        + "&p.Specs[0].Value[0].Name=camera_spec1.txt"
+                        + "&p.Specs[0].Value[1].Name=camera_spec2.txt"
+                        + "&p.Specs[1].Key=tyre_specs"
+                        + "&p.Specs[1].Value[0].Name=tyre_spec1.txt"
+                        + "&p.Specs[1].Value[1].Name=tyre_spec2.txt";
+                request.QueryString = new QueryString(queryString);
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Car1>(modelBindingResult.Model);
+            Assert.Equal("Accord", model.Name);
+
+            Assert.Collection(
+                model.Specs,
+                (e) =>
+                {
+                    Assert.Equal("camera_specs", e.Key);
+                    Assert.Collection(
+                        e.Value,
+                        (s) =>
+                        {
+                            Assert.Equal("camera_spec1.txt", s.Name);
+                        },
+                        (s) =>
+                        {
+                            Assert.Equal("camera_spec2.txt", s.Name);
+                        });
+                },
+                (e) =>
+                {
+                    Assert.Equal("tyre_specs", e.Key);
+                    Assert.Collection(
+                        e.Value,
+                        (s) =>
+                        {
+                            Assert.Equal("tyre_spec1.txt", s.Name);
+                        },
+                        (s) =>
+                        {
+                            Assert.Equal("tyre_spec2.txt", s.Name);
+                        });
+                });
+
+            Assert.Equal(7, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "p.Name").Value;
+            Assert.Equal("Accord", entry.AttemptedValue);
+            Assert.Equal("Accord", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs[0].Key").Value;
+            Assert.Equal("camera_specs", entry.AttemptedValue);
+            Assert.Equal("camera_specs", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs[0].Value[0].Name").Value;
+            Assert.Equal("camera_spec1.txt", entry.AttemptedValue);
+            Assert.Equal("camera_spec1.txt", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs[0].Value[1].Name").Value;
+            Assert.Equal("camera_spec2.txt", entry.AttemptedValue);
+            Assert.Equal("camera_spec2.txt", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs[1].Key").Value;
+            Assert.Equal("tyre_specs", entry.AttemptedValue);
+            Assert.Equal("tyre_specs", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs[1].Value[0].Name").Value;
+            Assert.Equal("tyre_spec1.txt", entry.AttemptedValue);
+            Assert.Equal("tyre_spec1.txt", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs[1].Value[1].Name").Value;
+            Assert.Equal("tyre_spec2.txt", entry.AttemptedValue);
+            Assert.Equal("tyre_spec2.txt", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsDictionaryProperty_WithArrayOfComplexTypeValue_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "p",
+                ParameterType = typeof(Car2)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                var queryString = "?p.Name=Accord"
+                        + "&p.Specs[0].Key=camera_specs"
+                        + "&p.Specs[0].Value[0].Name=camera_spec1.txt"
+                        + "&p.Specs[0].Value[1].Name=camera_spec2.txt"
+                        + "&p.Specs[1].Key=tyre_specs"
+                        + "&p.Specs[1].Value[0].Name=tyre_spec1.txt"
+                        + "&p.Specs[1].Value[1].Name=tyre_spec2.txt";
+                request.QueryString = new QueryString(queryString);
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Car2>(modelBindingResult.Model);
+            Assert.Equal("Accord", model.Name);
+
+            Assert.Collection(
+                model.Specs,
+                (e) =>
+                {
+                    Assert.Equal("camera_specs", e.Key);
+                    Assert.Collection(
+                        e.Value,
+                        (s) =>
+                        {
+                            Assert.Equal("camera_spec1.txt", s.Name);
+                        },
+                        (s) =>
+                        {
+                            Assert.Equal("camera_spec2.txt", s.Name);
+                        });
+                },
+                (e) =>
+                {
+                    Assert.Equal("tyre_specs", e.Key);
+                    Assert.Collection(
+                        e.Value,
+                        (s) =>
+                        {
+                            Assert.Equal("tyre_spec1.txt", s.Name);
+                        },
+                        (s) =>
+                        {
+                            Assert.Equal("tyre_spec2.txt", s.Name);
+                        });
+                });
+
+            Assert.Equal(7, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "p.Name").Value;
+            Assert.Equal("Accord", entry.AttemptedValue);
+            Assert.Equal("Accord", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs[0].Key").Value;
+            Assert.Equal("camera_specs", entry.AttemptedValue);
+            Assert.Equal("camera_specs", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs[0].Value[0].Name").Value;
+            Assert.Equal("camera_spec1.txt", entry.AttemptedValue);
+            Assert.Equal("camera_spec1.txt", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs[0].Value[1].Name").Value;
+            Assert.Equal("camera_spec2.txt", entry.AttemptedValue);
+            Assert.Equal("camera_spec2.txt", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs[1].Key").Value;
+            Assert.Equal("tyre_specs", entry.AttemptedValue);
+            Assert.Equal("tyre_specs", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs[1].Value[0].Name").Value;
+            Assert.Equal("tyre_spec1.txt", entry.AttemptedValue);
+            Assert.Equal("tyre_spec1.txt", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs[1].Value[1].Name").Value;
+            Assert.Equal("tyre_spec2.txt", entry.AttemptedValue);
+            Assert.Equal("tyre_spec2.txt", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsDictionaryProperty_WithIEnumerableOfKeyValuePair_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "p",
+                ParameterType = typeof(Car3)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                var queryString = "?p.Name=Accord"
+                        + "&p.Specs[0].Key=camera_specs"
+                        + "&p.Specs[0].Value[0].Name=camera_spec1.txt"
+                        + "&p.Specs[0].Value[1].Name=camera_spec2.txt"
+                        + "&p.Specs[1].Key=tyre_specs"
+                        + "&p.Specs[1].Value[0].Name=tyre_spec1.txt"
+                        + "&p.Specs[1].Value[1].Name=tyre_spec2.txt";
+                request.QueryString = new QueryString(queryString);
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Car3>(modelBindingResult.Model);
+            Assert.Equal("Accord", model.Name);
+
+            Assert.Collection(
+                model.Specs,
+                (e) =>
+                {
+                    Assert.Equal("camera_specs", e.Key);
+                    Assert.Collection(
+                        e.Value,
+                        (s) =>
+                        {
+                            Assert.Equal("camera_spec1.txt", s.Name);
+                        },
+                        (s) =>
+                        {
+                            Assert.Equal("camera_spec2.txt", s.Name);
+                        });
+                },
+                (e) =>
+                {
+                    Assert.Equal("tyre_specs", e.Key);
+                    Assert.Collection(
+                        e.Value,
+                        (s) =>
+                        {
+                            Assert.Equal("tyre_spec1.txt", s.Name);
+                        },
+                        (s) =>
+                        {
+                            Assert.Equal("tyre_spec2.txt", s.Name);
+                        });
+                });
+
+            Assert.Equal(7, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "p.Name").Value;
+            Assert.Equal("Accord", entry.AttemptedValue);
+            Assert.Equal("Accord", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs[0].Key").Value;
+            Assert.Equal("camera_specs", entry.AttemptedValue);
+            Assert.Equal("camera_specs", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs[0].Value[0].Name").Value;
+            Assert.Equal("camera_spec1.txt", entry.AttemptedValue);
+            Assert.Equal("camera_spec1.txt", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs[0].Value[1].Name").Value;
+            Assert.Equal("camera_spec2.txt", entry.AttemptedValue);
+            Assert.Equal("camera_spec2.txt", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs[1].Key").Value;
+            Assert.Equal("tyre_specs", entry.AttemptedValue);
+            Assert.Equal("tyre_specs", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs[1].Value[0].Name").Value;
+            Assert.Equal("tyre_spec1.txt", entry.AttemptedValue);
+            Assert.Equal("tyre_spec1.txt", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs[1].Value[1].Name").Value;
+            Assert.Equal("tyre_spec2.txt", entry.AttemptedValue);
+            Assert.Equal("tyre_spec2.txt", entry.RawValue);
+        }
+
+        private class Order8
+        {
+            public string Name { get; set; }
+
+            public KeyValuePair<string, int> ProductId { get; set; }
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsKeyValuePairProperty_WithPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order8)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString =
+                    new QueryString("?parameter.Name=bill&parameter.ProductId.Key=key0&parameter.ProductId.Value=10");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order8>(modelBindingResult.Model);
+            Assert.Equal("bill", model.Name);
+            Assert.Equal(new KeyValuePair<string, int>("key0", 10), model.ProductId);
+
+            Assert.Equal(3, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "parameter.ProductId.Key").Value;
+            Assert.Equal("key0", entry.AttemptedValue);
+            Assert.Equal("key0", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "parameter.ProductId.Value").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsKeyValuePairProperty_EmptyPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order8)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?Name=bill&ProductId.Key=key0&ProductId.Value=10");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order8>(modelBindingResult.Model);
+            Assert.Equal("bill", model.Name);
+            Assert.Equal(new KeyValuePair<string, int>("key0", 10), model.ProductId);
+
+            Assert.Equal(3, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "ProductId.Key").Value;
+            Assert.Equal("key0", entry.AttemptedValue);
+            Assert.Equal("key0", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "ProductId.Value").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsKeyValuePairProperty_NoCollectionData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order8)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Name=bill");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order8>(modelBindingResult.Model);
+            Assert.Equal("bill", model.Name);
+            Assert.Equal(default, model.ProductId);
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsKeyValuePairProperty_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order8)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order8>(modelBindingResult.Model);
+            Assert.Null(model.Name);
+            Assert.Equal(default, model.ProductId);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        private class Car4
+        {
+            public string Name { get; set; }
+
+            public KeyValuePair<string, Dictionary<string, string>> Specs { get; set; }
+        }
+
+        [Fact]
+        public async Task Foo_MutableObjectModelBinder_BindsKeyValuePairProperty_WithPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "p",
+                ParameterType = typeof(Car4)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                var queryString = "?p.Name=Accord"
+                                + "&p.Specs.Key=camera_specs"
+                                + "&p.Specs.Value[0].Key=spec1"
+                                + "&p.Specs.Value[0].Value=spec1.txt"
+                                + "&p.Specs.Value[1].Key=spec2"
+                                + "&p.Specs.Value[1].Value=spec2.txt";
+
+                request.QueryString = new QueryString(queryString);
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Car4>(modelBindingResult.Model);
+            Assert.Equal("Accord", model.Name);
+
+            Assert.Collection(
+                model.Specs.Value,
+                (e) =>
+                {
+                    Assert.Equal("spec1", e.Key);
+                    Assert.Equal("spec1.txt", e.Value);
+                },
+                (e) =>
+                {
+                    Assert.Equal("spec2", e.Key);
+                    Assert.Equal("spec2.txt", e.Value);
+                });
+
+            Assert.Equal(6, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "p.Name").Value;
+            Assert.Equal("Accord", entry.AttemptedValue);
+            Assert.Equal("Accord", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs.Key").Value;
+            Assert.Equal("camera_specs", entry.AttemptedValue);
+            Assert.Equal("camera_specs", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs.Value[0].Key").Value;
+            Assert.Equal("spec1", entry.AttemptedValue);
+            Assert.Equal("spec1", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs.Value[0].Value").Value;
+            Assert.Equal("spec1.txt", entry.AttemptedValue);
+            Assert.Equal("spec1.txt", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs.Value[1].Key").Value;
+            Assert.Equal("spec2", entry.AttemptedValue);
+            Assert.Equal("spec2", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "p.Specs.Value[1].Value").Value;
+            Assert.Equal("spec2.txt", entry.AttemptedValue);
+            Assert.Equal("spec2.txt", entry.RawValue);
+        }
+
+        private class Order9
+        {
+            public Person9 Customer { get; set; }
+        }
+
+        private class Person9
+        {
+            [FromBody]
+            public Address1 Address { get; set; }
+        }
+
+        // If a nested POCO object has all properties bound from a greedy source, then it should be populated
+        // if the top-level object is created.
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsNestedPOCO_WithAllGreedyBoundProperties()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order9)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+                SetJsonBodyContent(request, AddressBodyContent);
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order9>(modelBindingResult.Model);
+            Assert.NotNull(model.Customer);
+
+            Assert.NotNull(model.Customer.Address);
+            Assert.Equal(AddressStreetContent, model.Customer.Address.Street);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        private class Order10
+        {
+            [BindRequired]
+            public Person10 Customer { get; set; }
+        }
+
+        private class Person10
+        {
+            public string Name { get; set; }
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_WithRequiredComplexProperty_NoData_GetsErrors()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order10)
+            };
+
+            // No Data
+            var testContext = ModelBindingTestHelper.GetTestContext();
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order10>(modelBindingResult.Model);
+            Assert.Null(model.Customer);
+
+            Assert.Single(modelState);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "Customer").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Null(entry.AttemptedValue);
+            var error = Assert.Single(modelState["Customer"].Errors);
+            Assert.Equal("A value for the 'Customer' property was not provided.", error.ErrorMessage);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_WithBindRequired_NoData_AndCustomizedMessage_AddsGivenMessage()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider
+                .ForProperty(typeof(Order10), nameof(Order10.Customer))
+                .BindingDetails((Action<ModelBinding.Metadata.BindingMetadata>)(binding =>
+                {
+                    // A real details provider could customize message based on BindingMetadataProviderContext.
+                    binding.ModelBindingMessageProvider.SetMissingBindRequiredValueAccessor(
+                        name => $"Hurts when '{ name }' is not provided.");
+                }));
+
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(metadataProvider);
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order10)
+            };
+
+            // No Data
+            var testContext = ModelBindingTestHelper.GetTestContext();
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order10>(modelBindingResult.Model);
+            Assert.Null(model.Customer);
+
+            Assert.Single(modelState);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "Customer").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Null(entry.AttemptedValue);
+            var error = Assert.Single(modelState["Customer"].Errors);
+            Assert.Equal("Hurts when 'Customer' is not provided.", error.ErrorMessage);
+        }
+
+        private class Order11
+        {
+            public Person11 Customer { get; set; }
+        }
+
+        private class Person11
+        {
+            public int Id { get; set; }
+
+            [BindRequired]
+            public string Name { get; set; }
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_WithNestedRequiredProperty_WithPartialData_GetsErrors()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order11)
+            };
+
+            // No Data
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Customer.Id=123");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order11>(modelBindingResult.Model);
+            Assert.NotNull(model.Customer);
+            Assert.Equal(123, model.Customer.Id);
+            Assert.Null(model.Customer.Name);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Customer.Id").Value;
+            Assert.Equal("123", entry.RawValue);
+            Assert.Equal("123", entry.AttemptedValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "parameter.Customer.Name").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Null(entry.AttemptedValue);
+            var error = Assert.Single(modelState["parameter.Customer.Name"].Errors);
+            Assert.Equal("A value for the 'Name' property was not provided.", error.ErrorMessage);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_WithNestedRequiredProperty_WithData_EmptyPrefix_GetsErrors()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order11)
+            };
+
+            // No Data
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?Customer.Id=123");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order11>(modelBindingResult.Model);
+            Assert.NotNull(model.Customer);
+            Assert.Equal(123, model.Customer.Id);
+            Assert.Null(model.Customer.Name);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "Customer.Id").Value;
+            Assert.Equal("123", entry.RawValue);
+            Assert.Equal("123", entry.AttemptedValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "Customer.Name").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Null(entry.AttemptedValue);
+            var error = Assert.Single(modelState["Customer.Name"].Errors);
+            Assert.Equal("A value for the 'Name' property was not provided.", error.ErrorMessage);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_WithNestedRequiredProperty_WithData_CustomPrefix_GetsErrors()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order11),
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "customParameter"
+                }
+            };
+
+            // No Data
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?customParameter.Customer.Id=123");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order11>(modelBindingResult.Model);
+            Assert.NotNull(model.Customer);
+            Assert.Equal(123, model.Customer.Id);
+            Assert.Null(model.Customer.Name);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "customParameter.Customer.Id").Value;
+            Assert.Equal("123", entry.RawValue);
+            Assert.Equal("123", entry.AttemptedValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "customParameter.Customer.Name").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Null(entry.AttemptedValue);
+            var error = Assert.Single(modelState["customParameter.Customer.Name"].Errors);
+            Assert.Equal("A value for the 'Name' property was not provided.", error.ErrorMessage);
+        }
+
+        private class Order12
+        {
+            [BindRequired]
+            public string ProductName { get; set; }
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_WithRequiredProperty_NoData_GetsErrors()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order12)
+            };
+
+            // No Data
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order12>(modelBindingResult.Model);
+            Assert.Null(model.ProductName);
+
+            Assert.Single(modelState);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "ProductName").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Null(entry.AttemptedValue);
+            var error = Assert.Single(modelState["ProductName"].Errors);
+            Assert.Equal("A value for the 'ProductName' property was not provided.", error.ErrorMessage);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_WithRequiredProperty_NoData_CustomPrefix_GetsErros()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order12),
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "customParameter"
+                }
+            };
+
+            // No Data
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order12>(modelBindingResult.Model);
+            Assert.Null(model.ProductName);
+
+            Assert.Single(modelState);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "customParameter.ProductName").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Null(entry.AttemptedValue);
+            var error = Assert.Single(modelState["customParameter.ProductName"].Errors);
+            Assert.Equal("A value for the 'ProductName' property was not provided.", error.ErrorMessage);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_WithRequiredProperty_WithData_EmptyPrefix_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order12),
+            };
+
+            // No Data
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?ProductName=abc");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order12>(modelBindingResult.Model);
+            Assert.Equal("abc", model.ProductName);
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "ProductName").Value;
+            Assert.Equal("abc", entry.RawValue);
+            Assert.Equal("abc", entry.AttemptedValue);
+        }
+
+        private class Order13
+        {
+            [BindRequired]
+            public List<int> OrderIds { get; set; }
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_WithRequiredCollectionProperty_NoData_GetsErros()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order13)
+            };
+
+            // No Data
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order13>(modelBindingResult.Model);
+            Assert.Null(model.OrderIds);
+
+            Assert.Single(modelState);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "OrderIds").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Null(entry.AttemptedValue);
+            var error = Assert.Single(modelState["OrderIds"].Errors);
+            Assert.Equal("A value for the 'OrderIds' property was not provided.", error.ErrorMessage);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_WithRequiredCollectionProperty_NoData_CustomPrefix_GetsErros()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order13),
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "customParameter"
+                }
+            };
+
+            // No Data
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order13>(modelBindingResult.Model);
+            Assert.Null(model.OrderIds);
+
+            Assert.Single(modelState);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "customParameter.OrderIds").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Null(entry.AttemptedValue);
+            var error = Assert.Single(modelState["customParameter.OrderIds"].Errors);
+            Assert.Equal("A value for the 'OrderIds' property was not provided.", error.ErrorMessage);
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_WithRequiredCollectionProperty_WithData_EmptyPrefix_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order13),
+            };
+
+            // No Data
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?OrderIds[0]=123");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order13>(modelBindingResult.Model);
+            Assert.Equal(new[] { 123 }, model.OrderIds.ToArray());
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "OrderIds[0]").Value;
+            Assert.Equal("123", entry.RawValue);
+            Assert.Equal("123", entry.AttemptedValue);
+        }
+
+        private class Order14
+        {
+            public int ProductId { get; set; }
+        }
+
+        // This covers the case where a key is present, but has an empty value. The type converter
+        // will report an error.
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsPOCO_TypeConvertedPropertyNonConvertableValue_GetsError()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order14)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.ProductId=");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order14>(modelBindingResult.Model);
+            Assert.NotNull(model);
+            Assert.Equal(0, model.ProductId);
+
+            Assert.Single(modelState);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.ProductId").Value;
+            Assert.Equal(string.Empty, entry.AttemptedValue);
+            Assert.Equal(string.Empty, entry.RawValue);
+
+            var error = Assert.Single(entry.Errors);
+            Assert.Equal("The value '' is invalid.", error.ErrorMessage);
+            Assert.Null(error.Exception);
+        }
+
+        // This covers the case where a key is present, but has no value. The model binder will
+        // report and error because it's a value type (non-nullable).
+        [Fact]
+        [ReplaceCulture]
+        public async Task MutableObjectModelBinder_BindsPOCO_TypeConvertedPropertyWithEmptyValue_Error()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order14)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.ProductId");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order14>(modelBindingResult.Model);
+            Assert.NotNull(model);
+            Assert.Equal(0, model.ProductId);
+
+            var entry = Assert.Single(modelState);
+            Assert.Equal("parameter.ProductId", entry.Key);
+            Assert.Equal(string.Empty, entry.Value.AttemptedValue);
+
+            var error = Assert.Single(entry.Value.Errors);
+            Assert.Equal("The value '' is invalid.", error.ErrorMessage, StringComparer.Ordinal);
+            Assert.Null(error.Exception);
+
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+        }
+
+        private class Person12
+        {
+            public Address12 Address { get; set; }
+        }
+
+        [ModelBinder(Name = "HomeAddress")]
+        private class Address12
+        {
+            public string Street { get; set; }
+        }
+
+        // Make sure the metadata is honored when a [ModelBinder] attribute is associated with a class somewhere in the
+        // type hierarchy of an action parameter. This should behave identically to such an attribute on a property in
+        // the type hierarchy.
+        [Theory]
+        [MemberData(
+            nameof(BinderTypeBasedModelBinderIntegrationTest.NullAndEmptyBindingInfo),
+            MemberType = typeof(BinderTypeBasedModelBinderIntegrationTest))]
+        public async Task ModelNameOnPropertyType_WithData_Succeeds(BindingInfo bindingInfo)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter-name",
+                BindingInfo = bindingInfo,
+                ParameterType = typeof(Person12),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => request.QueryString = new QueryString("?HomeAddress.Street=someStreet"));
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var person = Assert.IsType<Person12>(modelBindingResult.Model);
+            Assert.NotNull(person.Address);
+            Assert.Equal("someStreet", person.Address.Street, StringComparer.Ordinal);
+
+            Assert.True(modelState.IsValid);
+            var kvp = Assert.Single(modelState);
+            Assert.Equal("HomeAddress.Street", kvp.Key);
+            var entry = kvp.Value;
+            Assert.NotNull(entry);
+            Assert.Empty(entry.Errors);
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+        }
+
+        // Make sure the metadata is honored when a [ModelBinder] attribute is associated with an action parameter's
+        // type. This should behave identically to such an attribute on an action parameter.
+        [Theory]
+        [MemberData(
+            nameof(BinderTypeBasedModelBinderIntegrationTest.NullAndEmptyBindingInfo),
+            MemberType = typeof(BinderTypeBasedModelBinderIntegrationTest))]
+        public async Task ModelNameOnParameterType_WithData_Succeeds(BindingInfo bindingInfo)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter-name",
+                BindingInfo = bindingInfo,
+                ParameterType = typeof(Address12),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => request.QueryString = new QueryString("?HomeAddress.Street=someStreet"));
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var address = Assert.IsType<Address12>(modelBindingResult.Model);
+            Assert.Equal("someStreet", address.Street, StringComparer.Ordinal);
+
+            Assert.True(modelState.IsValid);
+            var kvp = Assert.Single(modelState);
+            Assert.Equal("HomeAddress.Street", kvp.Key);
+            var entry = kvp.Value;
+            Assert.NotNull(entry);
+            Assert.Empty(entry.Errors);
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+        }
+
+        private class Person13
+        {
+            public Address13 Address { get; set; }
+        }
+
+        [Bind("Street")]
+        private class Address13
+        {
+            public int Number { get; set; }
+
+            public string Street { get; set; }
+
+            public string City { get; set; }
+
+            public string State { get; set; }
+        }
+
+        // Make sure the metadata is honored when a [Bind] attribute is associated with a class somewhere in the type
+        // hierarchy of an action parameter. This should behave identically to such an attribute on a property in the
+        // type hierarchy. (Test is similar to ModelNameOnPropertyType_WithData_Succeeds() but covers implementing
+        // IPropertyFilterProvider, not IModelNameProvider.)
+        [Theory]
+        [MemberData(
+            nameof(BinderTypeBasedModelBinderIntegrationTest.NullAndEmptyBindingInfo),
+            MemberType = typeof(BinderTypeBasedModelBinderIntegrationTest))]
+        public async Task BindAttributeOnPropertyType_WithData_Succeeds(BindingInfo bindingInfo)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter-name",
+                BindingInfo = bindingInfo,
+                ParameterType = typeof(Person13),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => request.QueryString = new QueryString(
+                    "?Address.Number=23&Address.Street=someStreet&Address.City=Redmond&Address.State=WA"));
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var person = Assert.IsType<Person13>(modelBindingResult.Model);
+            Assert.NotNull(person.Address);
+            Assert.Null(person.Address.City);
+            Assert.Equal(0, person.Address.Number);
+            Assert.Null(person.Address.State);
+            Assert.Equal("someStreet", person.Address.Street, StringComparer.Ordinal);
+
+            Assert.True(modelState.IsValid);
+            var kvp = Assert.Single(modelState);
+            Assert.Equal("Address.Street", kvp.Key);
+            var entry = kvp.Value;
+            Assert.NotNull(entry);
+            Assert.Empty(entry.Errors);
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+        }
+
+        // Make sure the metadata is honored when a [Bind] attribute is associated with an action parameter's type.
+        // This should behave identically to such an attribute on an action parameter. (Test is similar
+        // to ModelNameOnParameterType_WithData_Succeeds() but covers implementing IPropertyFilterProvider, not
+        // IModelNameProvider.)
+        [Theory]
+        [MemberData(
+            nameof(BinderTypeBasedModelBinderIntegrationTest.NullAndEmptyBindingInfo),
+            MemberType = typeof(BinderTypeBasedModelBinderIntegrationTest))]
+        public async Task BindAttributeOnParameterType_WithData_Succeeds(BindingInfo bindingInfo)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter-name",
+                BindingInfo = bindingInfo,
+                ParameterType = typeof(Address13),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => request.QueryString = new QueryString("?Number=23&Street=someStreet&City=Redmond&State=WA"));
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var address = Assert.IsType<Address13>(modelBindingResult.Model);
+            Assert.Null(address.City);
+            Assert.Equal(0, address.Number);
+            Assert.Null(address.State);
+            Assert.Equal("someStreet", address.Street, StringComparer.Ordinal);
+
+            Assert.True(modelState.IsValid);
+            var kvp = Assert.Single(modelState);
+            Assert.Equal("Street", kvp.Key);
+            var entry = kvp.Value;
+            Assert.NotNull(entry);
+            Assert.Empty(entry.Errors);
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+        }
+
+        private class Product
+        {
+            public int ProductId { get; set; }
+
+            public string Name { get; }
+
+            public IList<string> Aliases { get; }
+        }
+
+        [Theory]
+        [InlineData("?parameter.ProductId=10")]
+        [InlineData("?parameter.ProductId=10&parameter.Name=Camera")]
+        [InlineData("?parameter.ProductId=10&parameter.Name=Camera&parameter.Aliases[0]=Camera1")]
+        public async Task ComplexTypeModelBinder_BindsSettableProperties(string queryString)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Product)
+            };
+
+            // Need to have a key here so that the ComplexTypeModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString(queryString);
+                SetJsonBodyContent(request, AddressBodyContent);
+            });
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Product>(modelBindingResult.Model);
+            Assert.NotNull(model);
+            Assert.Equal(10, model.ProductId);
+            Assert.Null(model.Name);
+            Assert.Null(model.Aliases);
+        }
+
+        private class Photo
+        {
+            public string Id { get; set; }
+
+            public KeyValuePair<string, LocationInfo> Info { get; set; }
+        }
+
+        private class LocationInfo
+        {
+            [FromHeader]
+            public string GpsCoordinates { get; set; }
+
+            public int Zipcode { get; set; }
+        }
+
+        [Fact]
+        public async Task MutableObjectModelBinder_BindsKeyValuePairProperty_HavingFromHeaderProperty_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Photo)
+            };
+
+            // Need to have a key here so that the MutableObjectModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.Headers.Add("GpsCoordinates", "10,20");
+                request.QueryString = new QueryString("?Id=1&Info.Key=location1&Info.Value.Zipcode=98052");
+            });
+
+            var modelState = testContext.ModelState;
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(testContext, valueProvider, parameter);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var model = Assert.IsType<Photo>(modelBindingResult.Model);
+            Assert.Equal("1", model.Id);
+            Assert.Equal("location1", model.Info.Key);
+            Assert.NotNull(model.Info.Value);
+            Assert.Equal("10,20", model.Info.Value.GpsCoordinates);
+            Assert.Equal(98052, model.Info.Value.Zipcode);
+
+            // ModelState
+            Assert.Equal(4, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "Id").Value;
+            Assert.Equal("1", entry.AttemptedValue);
+            Assert.Equal("1", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "Info.Key").Value;
+            Assert.Equal("location1", entry.AttemptedValue);
+            Assert.Equal("location1", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "Info.Value.Zipcode").Value;
+            Assert.Equal("98052", entry.AttemptedValue);
+            Assert.Equal("98052", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "Info.Value.GpsCoordinates").Value;
+            Assert.Equal("10,20", entry.AttemptedValue);
+            Assert.Equal("10,20", entry.RawValue);
+        }
+
+        private static void SetJsonBodyContent(HttpRequest request, string content)
+        {
+            var stream = new MemoryStream(new UTF8Encoding(encoderShouldEmitUTF8Identifier: false).GetBytes(content));
+            request.Body = stream;
+            request.ContentType = "application/json";
+        }
+
+        private static void SetFormFileBodyContent(HttpRequest request, string content, string name)
+        {
+            const string fileName = "text.txt";
+            var fileCollection = new FormFileCollection();
+            var formCollection = new FormCollection(new Dictionary<string, StringValues>(), fileCollection);
+            var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(content));
+
+            request.Form = formCollection;
+            request.ContentType = "multipart/form-data; boundary=----WebKitFormBoundarymx2fSWqWSd0OxQqq";
+            request.Headers["Content-Disposition"] = $"form-data; name={name}; filename={fileName}";
+
+            fileCollection.Add(new FormFile(memoryStream, 0, memoryStream.Length, name, fileName)
+            {
+                Headers = request.Headers
+            });
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs
new file mode 100644
index 0000000000..c19e7cfac5
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs
@@ -0,0 +1,1349 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    // Integration tests targeting the behavior of the DictionaryModelBinder with other model binders.
+    public class DictionaryModelBinderIntegrationTest
+    {
+        [Fact]
+        public async Task DictionaryModelBinder_BindsDictionaryOfSimpleType_WithPrefixAndKVP_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, int>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter[0].Key=key0&parameter[0].Value=10");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, int>>(modelBindingResult.Model);
+            Assert.Equal(new Dictionary<string, int>() { { "key0", 10 } }, model);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "parameter[0].Key").Value;
+            Assert.Equal("key0", entry.AttemptedValue);
+            Assert.Equal("key0", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "parameter[0].Value").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task DictionaryModelBinder_BindsDictionaryOfSimpleType_WithPrefixAndItem_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, int>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter[key0]=10");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, int>>(modelBindingResult.Model);
+            Assert.Equal(new Dictionary<string, int>() { { "key0", 10 } }, model);
+
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var kvp = Assert.Single(modelState);
+            Assert.Equal("parameter[key0]", kvp.Key);
+            var entry = kvp.Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task DictionaryModelBinder_BindsDictionaryOfSimpleType_WithIndex_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, int>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString =
+                    new QueryString("?parameter.index=low&parameter[low].Key=key0&parameter[low].Value=10");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, int>>(modelBindingResult.Model);
+            Assert.Equal(new Dictionary<string, int>() { { "key0", 10 } }, model);
+
+            // "index" is not stored in ModelState.
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "parameter[low].Key").Value;
+            Assert.Equal("key0", entry.AttemptedValue);
+            Assert.Equal("key0", entry.RawValue);
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "parameter[low].Value").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+        }
+
+        [Theory]
+        [InlineData("?prefix[key0]=10")]
+        [InlineData("?prefix[0].Key=key0&prefix[0].Value=10")]
+        [InlineData("?prefix.index=low&prefix[low].Key=key0&prefix[low].Value=10")]
+        [InlineData("?prefix.index=index&prefix[index].Key=key0&prefix[index].Value=10")]
+        [InlineData("?prefix.index=index&prefix[index].Key=key0&prefix[index].Value=10&prefix[extra].Key=key4&prefix[extra].Value=5")]
+        public async Task DictionaryModelBinder_BindsDictionaryOfSimpleType_WithExplicitPrefix_Success(
+            string queryString)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "prefix",
+                },
+                ParameterType = typeof(Dictionary<string, int>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString(queryString);
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, int>>(modelBindingResult.Model);
+            Assert.Equal(new Dictionary<string, int>() { { "key0", 10 }, }, model);
+
+            Assert.NotEmpty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        [Theory]
+        [InlineData("?[key0]=10")]
+        [InlineData("?[0].Key=key0&[0].Value=10")]
+        [InlineData("?index=low&[low].Key=key0&[low].Value=10")]
+        [InlineData("?index=index&[index].Key=key0&[index].Value=10")]
+        [InlineData("?index=index&[index].Key=key0&[index].Value=10&[extra].Key=key4&[extra].Value=5")]
+        public async Task DictionaryModelBinder_BindsDictionaryOfSimpleType_EmptyPrefix_Success(string queryString)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, int>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString(queryString);
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, int>>(modelBindingResult.Model);
+            Assert.Equal(new Dictionary<string, int>() { { "key0", 10 }, }, model);
+
+            Assert.NotEmpty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        public static TheoryData<Action<HttpRequest>> ThreeEntryTestData
+        {
+            get
+            {
+                var impliedPrefixQueryString = "?parameter[archive]=1&parameter[correlation]=2&parameter[index]=3";
+                var noPrefixQueryString = "?[archive]=1&[correlation]=2&[index]=3";
+                var reversedNoPrefixQueryString = "?[index]=3&[correlation]=2&[archive]=1";
+                var impliedPrefixDictionary = new Dictionary<string, StringValues>
+                {
+                    { "parameter[archive]", "1" },
+                    { "parameter[correlation]", "2" },
+                    { "parameter[index]", "3" },
+                };
+                var reversedImpliedPrefixDictionary = new Dictionary<string, StringValues>
+                {
+                    { "parameter[index]", "3" },
+                    { "parameter[correlation]", "2" },
+                    { "parameter[archive]", "1" },
+                };
+                var longFormDictionary = new Dictionary<string, StringValues>
+                {
+                    { "parameter[0].Key", "archive" },
+                    { "parameter[0].Value", "1" },
+                    { "parameter[1].Key", "correlation" },
+                    { "parameter[1].Value", "2" },
+                    { "parameter[2].Key", "index" },
+                    { "parameter[2].Value", "3" },
+                };
+                var longerFormDictionary = new Dictionary<string, StringValues>
+                {
+                    { "parameter[indexer].Key", "archive" },
+                    { "parameter[indexer].Value", "1" },
+                    { "parameter[index].Key", "correlation" },
+                    { "parameter.index", new[] { "indexer", "index", "indexes" } },
+                    { "parameter[index].Value", "2" },
+                    { "parameter[indexes].Key", "index" },
+                    { "parameter[indexes].Value", "3" },
+                };
+                var longestFormDictionary = new Dictionary<string, StringValues>
+                {
+                    { "parameter[indexer].Key", "archive" },
+                    { "parameter[indexer].Value", "1" },
+                    { "parameter[index].Key", "correlation" },
+                    { "parameter[extra].Key", "index" },
+                    { "parameter[extra].Value", "4" },
+                    { "parameter.index", new[] { "indexer", "index", "indexes" } },
+                    { "parameter[index].Value", "2" },
+                    { "parameter[indexes].Key", "index" },
+                    { "parameter[indexes].Value", "3" },
+                    { "parameter[another].Key", "index" },
+                    { "parameter[another].Value", "5" },
+                };
+                var noPrefixDictionary = new Dictionary<string, StringValues>
+                {
+                    { "[archive]", "1" },
+                    { "[correlation]", "2" },
+                    { "[index]", "3" },
+                };
+                var reversedNoPrefixDictionary = new Dictionary<string, StringValues>
+                {
+                    { "[index]", "3" },
+                    { "[correlation]", "2" },
+                    { "[archive]", "1" },
+                };
+
+                return new TheoryData<Action<HttpRequest>>
+                {
+                    request => request.QueryString = new QueryString(impliedPrefixQueryString),
+                    request => request.QueryString = new QueryString(noPrefixQueryString),
+                    request => request.QueryString = new QueryString(reversedNoPrefixQueryString),
+                    request =>
+                    {
+                        request.ContentType = "application/x-www-form-urlencoded";
+                        request.Form = new FormCollection(impliedPrefixDictionary);
+                    },
+                    request =>
+                    {
+                        request.ContentType = "application/x-www-form-urlencoded";
+                        request.Form = new FormCollection(reversedImpliedPrefixDictionary);
+                    },
+                    request =>
+                    {
+                        request.ContentType = "application/x-www-form-urlencoded";
+                        request.Form = new FormCollection(longFormDictionary);
+                    },
+                    request =>
+                    {
+                        request.ContentType = "application/x-www-form-urlencoded";
+                        request.Form = new FormCollection(longerFormDictionary);
+                    },
+                    request =>
+                    {
+                        request.ContentType = "application/x-www-form-urlencoded";
+                        request.Form = new FormCollection(longestFormDictionary);
+                    },
+                    request =>
+                    {
+                        request.ContentType = "application/x-www-form-urlencoded";
+                        request.Form = new FormCollection(noPrefixDictionary);
+                    },
+                    request =>
+                    {
+                        request.ContentType = "application/x-www-form-urlencoded";
+                        request.Form = new FormCollection(reversedNoPrefixDictionary);
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ThreeEntryTestData))]
+        public async Task DictionaryModelBinder_Binds3EntriesOfSimpleType(Action<HttpRequest> updateRequest)
+        {
+            // Arrange
+            var expectedDictionary = new Dictionary<string, int>
+            {
+                { "archive", 1 },
+                { "correlation", 2 },
+                { "index", 3 },
+            };
+
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var testContext = ModelBindingTestHelper.GetTestContext(updateRequest);
+            var modelState = testContext.ModelState;
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, int>),
+            };
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(result.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, int>>(result.Model);
+            Assert.Equal(expectedDictionary, model);
+
+            Assert.NotEmpty(modelState);
+            Assert.True(modelState.IsValid);
+        }
+
+        [Theory]
+        [MemberData(nameof(ThreeEntryTestData))]
+        public async Task DictionaryModelBinder_Binds3EntriesOfSimpleType_WithJQueryQueryString(
+            Action<HttpRequest> updateRequest)
+        {
+            // Arrange
+            var expectedDictionary = new Dictionary<string, int>
+            {
+                { "archive", 1 },
+                { "correlation", 2 },
+                { "index", 3 },
+            };
+
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                updateRequest,
+                options => options.ValueProviderFactories.Add(new JQueryQueryStringValueProviderFactory()));
+            var modelState = testContext.ModelState;
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, int>),
+            };
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(result.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, int>>(result.Model);
+            Assert.Equal(expectedDictionary, model);
+
+            Assert.NotEmpty(modelState);
+            Assert.True(modelState.IsValid);
+        }
+
+        [Fact]
+        public async Task DictionaryModelBinder_BindsDictionaryOfSimpleType_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, int>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, int>>(modelBindingResult.Model);
+            Assert.Empty(model);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        private class Person
+        {
+            [Range(minimum: 0, maximum: 15, ErrorMessage = "You're out of range.")]
+            public int Id { get; set; }
+
+            public override bool Equals(object obj)
+            {
+                return obj is Person other && Id == other.Id;
+            }
+
+            public override int GetHashCode()
+            {
+                return Id.GetHashCode();
+            }
+
+            public override string ToString()
+            {
+                return $"{{ { Id } }}";
+            }
+        }
+
+        public static TheoryData<string> ComplexType_ImpliedPrefixData
+        {
+            get
+            {
+                return new TheoryData<string>
+                {
+                    "?[key0].Id=10",
+                    "?[0].Key=key0&[0].Value.Id=10",
+                    "?index=low&[low].Key=key0&[low].Value.Id=10",
+                    "?parameter[key0].Id=10",
+                    "?parameter[0].Key=key0&parameter[0].Value.Id=10",
+                    "?parameter.index=low&parameter[low].Key=key0&parameter[low].Value.Id=10",
+                    "?parameter.index=index&parameter[index].Key=key0&parameter[index].Value.Id=10",
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ComplexType_ImpliedPrefixData))]
+        public async Task DictionaryModelBinder_BindsDictionaryOfComplexType_WithImpliedPrefix(string queryString)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, Person>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString(queryString);
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, Person>>(modelBindingResult.Model);
+            Assert.Equal(new Dictionary<string, Person> { { "key0", new Person { Id = 10 } }, }, model);
+
+            Assert.NotEmpty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        [Theory]
+        [InlineData("?[key0][Id]=10")] // Both key segments will be rewritten.
+        [InlineData("?[0][Key]=key0&[0][Value][Id]=10")]
+        [InlineData("?parameter[key0][Id]=10")]
+        [InlineData("?parameter[0][Key]=key0&parameter[0][Value][Id]=10")]
+        [MemberData(nameof(ComplexType_ImpliedPrefixData))]
+        public async Task DictionaryModelBinder_BindsDictionaryOfComplexType_WithImpliedPrefixAndJQuery(
+            string queryString)
+        {
+            // Arrange
+            var expectedDictionary = new Dictionary<string, Person> { { "key0", new Person { Id = 10 } } };
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => request.QueryString = new QueryString(queryString),
+                // Add JQueryQueryStringValueProviderFactory after default factories.
+                options => options.ValueProviderFactories.Add(new JQueryQueryStringValueProviderFactory()));
+
+            var modelState = testContext.ModelState;
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, Person>)
+            };
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, Person>>(modelBindingResult.Model);
+            Assert.Equal(expectedDictionary, model);
+
+            Assert.NotEmpty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        [Theory]
+        [InlineData("?[key0][Id]=10")] // Both key segments will be rewritten.
+        [InlineData("?[0][Key]=key0&[0][Value][Id]=10")]
+        [InlineData("?parameter[key0][Id]=10")]
+        [InlineData("?parameter[0][Key]=key0&parameter[0][Value][Id]=10")]
+        [MemberData(nameof(ComplexType_ImpliedPrefixData))]
+        public async Task DictionaryModelBinder_BindsDictionaryOfComplexType_WithImpliedPrefixAndJQueryFirst(
+            string queryString)
+        {
+            // Arrange
+            var expectedDictionary = new Dictionary<string, Person> { { "key0", new Person { Id = 10 } } };
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => request.QueryString = new QueryString(queryString),
+                // Add JQueryQueryStringValueProviderFactory before default factories.
+                options => options.ValueProviderFactories.Insert(0, new JQueryQueryStringValueProviderFactory()));
+
+            var modelState = testContext.ModelState;
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, Person>)
+            };
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, Person>>(modelBindingResult.Model);
+            Assert.Equal(expectedDictionary, model);
+
+            Assert.NotEmpty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        [Theory]
+        [InlineData("?[42][Id]=10")] // Only Id segment will be rewritten.
+        [InlineData("?parameter[42][Id]=10")]
+        public async Task DictionaryModelBinder_BindsDictionaryOfComplexType_WithImpliedPrefixIntegralKeysAndJQuery(
+            string queryString)
+        {
+            // Arrange
+            var expectedDictionary = new Dictionary<string, Person> { { "42", new Person { Id = 10 } } };
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => request.QueryString = new QueryString(queryString),
+                // Add JQueryQueryStringValueProviderFactory after default factories.
+                options => options.ValueProviderFactories.Add(new JQueryQueryStringValueProviderFactory()));
+
+            var modelState = testContext.ModelState;
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, Person>)
+            };
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, Person>>(modelBindingResult.Model);
+            Assert.Equal(expectedDictionary, model);
+
+            Assert.NotEmpty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        [Theory]
+        [InlineData("?[42][Id]=10")] // Only Id segment will be rewritten.
+        [InlineData("?parameter[42][Id]=10")]
+        public async Task DictionaryModelBinder_BindsDictionaryOfComplexType_WithImpliedPrefixIntegralKeysAndJQueryFirst(
+            string queryString)
+        {
+            // Arrange
+            var expectedDictionary = new Dictionary<string, Person> { { "42", new Person { Id = 10 } } };
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => request.QueryString = new QueryString(queryString),
+                // Add JQueryQueryStringValueProviderFactory before default factories.
+                options => options.ValueProviderFactories.Insert(0, new JQueryQueryStringValueProviderFactory()));
+
+            var modelState = testContext.ModelState;
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, Person>)
+            };
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, Person>>(modelBindingResult.Model);
+            Assert.Equal(expectedDictionary, model);
+
+            Assert.NotEmpty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        public static TheoryData<string> ComplexType_ExplicitPrefixData
+        {
+            get
+            {
+                return new TheoryData<string>
+                {
+                    "?prefix[key0].Id=10",
+                    "?prefix[0].Key=key0&prefix[0].Value.Id=10",
+                    "?prefix.index=low&prefix[low].Key=key0&prefix[low].Value.Id=10",
+                    "?prefix.index=index&prefix[index].Key=key0&prefix[index].Value.Id=10",
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ComplexType_ExplicitPrefixData))]
+        public async Task DictionaryModelBinder_BindsDictionaryOfComplexType_WithExplicitPrefix(
+            string queryString)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "prefix",
+                },
+                ParameterType = typeof(Dictionary<string, Person>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString(queryString);
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, Person>>(modelBindingResult.Model);
+            Assert.Equal(new Dictionary<string, Person> { { "key0", new Person { Id = 10 } }, }, model);
+
+            Assert.NotEmpty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        [Theory]
+        [InlineData("?prefix[key0][Id]=10")]
+        [MemberData(nameof(ComplexType_ExplicitPrefixData))]
+        public async Task DictionaryModelBinder_BindsDictionaryOfComplexType_WithExplicitPrefixAndJQuery(
+            string queryString)
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => request.QueryString = new QueryString(queryString),
+                // Add JQueryQueryStringValueProviderFactory after default factories.
+                options => options.ValueProviderFactories.Add(new JQueryQueryStringValueProviderFactory()));
+
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "prefix",
+                },
+                ParameterType = typeof(Dictionary<string, Person>)
+            };
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, Person>>(modelBindingResult.Model);
+            Assert.Equal(new Dictionary<string, Person> { { "key0", new Person { Id = 10 } }, }, model);
+
+            Assert.NotEmpty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        [Theory]
+        [InlineData("?[key0].Id=100")]
+        [InlineData("?[0].Key=key0&[0].Value.Id=100")]
+        [InlineData("?index=low&[low].Key=key0&[low].Value.Id=100")]
+        [InlineData("?parameter[key0].Id=100")]
+        [InlineData("?parameter[0].Key=key0&parameter[0].Value.Id=100")]
+        [InlineData("?parameter.index=low&parameter[low].Key=key0&parameter[low].Value.Id=100")]
+        [InlineData("?parameter.index=index&parameter[index].Key=key0&parameter[index].Value.Id=100")]
+        public async Task DictionaryModelBinder_BindsDictionaryOfComplexType_ImpliedPrefix_FindsValidationErrors(
+            string queryString)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, Person>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString(queryString);
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, Person>>(modelBindingResult.Model);
+            Assert.Equal(new Dictionary<string, Person> { { "key0", new Person { Id = 100 } }, }, model);
+
+            Assert.NotEmpty(modelState);
+            Assert.False(modelState.IsValid);
+            Assert.All(modelState, kvp =>
+            {
+                Assert.NotEqual(ModelValidationState.Unvalidated, kvp.Value.ValidationState);
+                Assert.NotEqual(ModelValidationState.Skipped, kvp.Value.ValidationState);
+            });
+
+            var entry = Assert.Single(modelState, kvp => kvp.Value.ValidationState == ModelValidationState.Invalid);
+            var error = Assert.Single(entry.Value.Errors);
+            Assert.Equal("You're out of range.", error.ErrorMessage);
+        }
+
+        [Fact]
+        public async Task DictionaryModelBinder_BindsDictionaryOfComplexType_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, Person>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, Person>>(modelBindingResult.Model);
+            Assert.Empty(model);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        public static TheoryData<string> CollectionType_ImpliedPrefixData
+        {
+            get
+            {
+                return new TheoryData<string>
+                {
+                    "?[key0]=10&[key0]=11",
+                    "?[key0][0]=10&[key0][1]=11",
+                    "?[0].Key=key0&[0].Value[0]=10&[0].Value[1]=11",
+                    "?index=low&[low].Key=key0&[low].Value[0]=10&[low].Value[1]=11",
+                    "?parameter[key0]=10&parameter[key0]=11",
+                    "?parameter[key0][0]=10&parameter[key0][1]=11",
+                    "?parameter[0].Key=key0&parameter[0].Value[0]=10&parameter[0].Value[1]=11",
+                    "?parameter.index=low&parameter[low].Key=key0&parameter[low].Value[0]=10&parameter[low].Value[1]=11",
+                    "?parameter.index=index&parameter[index].Key=key0&parameter[index].Value[0]=10&parameter[index].Value[1]=11",
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(CollectionType_ImpliedPrefixData))]
+        public async Task DictionaryModelBinder_BindsDictionaryOfCollectionType_WithImpliedPrefix(string queryString)
+        {
+            // Arrange
+            var expectedDictionary = new Dictionary<string, string[]> { { "key0", new[] { "10", "11" } } };
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, string[]>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => request.QueryString = new QueryString(queryString));
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, string[]>>(modelBindingResult.Model);
+            Assert.Equal(expectedDictionary, model);
+
+            Assert.NotEmpty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        [Theory]
+        [MemberData(nameof(CollectionType_ImpliedPrefixData))]
+        public async Task DictionaryModelBinder_BindsDictionaryOfCollectionType_WithImpliedPrefixAndJQuery(
+            string queryString)
+        {
+            // Arrange
+            var expectedDictionary = new Dictionary<string, string[]> { { "key0", new[] { "10", "11" } } };
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => request.QueryString = new QueryString(queryString),
+                // Add JQueryQueryStringValueProviderFactory after default factories.
+                options => options.ValueProviderFactories.Add(new JQueryQueryStringValueProviderFactory()));
+
+            var modelState = testContext.ModelState;
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, string[]>)
+            };
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, string[]>>(modelBindingResult.Model);
+            Assert.Equal(expectedDictionary, model);
+
+            Assert.NotEmpty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        [Theory]
+        [MemberData(nameof(CollectionType_ImpliedPrefixData))]
+        public async Task DictionaryModelBinder_BindsDictionaryOfCollectionType_WithImpliedPrefixAndJQueryFirst(
+            string queryString)
+        {
+            // Arrange
+            var expectedDictionary = new Dictionary<string, string[]> { { "key0", new[] { "10", "11" } } };
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => request.QueryString = new QueryString(queryString),
+                // Add JQueryQueryStringValueProviderFactory before default factories.
+                options => options.ValueProviderFactories.Insert(0, new JQueryQueryStringValueProviderFactory()));
+
+            var modelState = testContext.ModelState;
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, string[]>)
+            };
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, string[]>>(modelBindingResult.Model);
+            Assert.Equal(expectedDictionary, model);
+
+            Assert.NotEmpty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        [Theory]
+        [InlineData("?[42]=10&[42]=11")]
+        [InlineData("?[42][]=10&[42][]=11")]
+        [InlineData("?[42][0]=10&[42][1]=11")]
+        [InlineData("?parameter[42]=10&parameter[42]=11")]
+        [InlineData("?parameter[42][]=10&parameter[42][]=11")]
+        [InlineData("?parameter[42][0]=10&parameter[42][1]=11")]
+        public async Task DictionaryModelBinder_BindsDictionaryOfCollectionType_WithImpliedPrefixIntegralKeysAndJQuery(
+            string queryString)
+        {
+            // Arrange
+            var expectedDictionary = new Dictionary<string, string[]> { { "42", new[] { "10", "11" } } };
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => request.QueryString = new QueryString(queryString),
+                // Add JQueryQueryStringValueProviderFactory after default factories.
+                options => options.ValueProviderFactories.Add(new JQueryQueryStringValueProviderFactory()));
+
+            var modelState = testContext.ModelState;
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, string[]>)
+            };
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, string[]>>(modelBindingResult.Model);
+            Assert.Equal(expectedDictionary, model);
+
+            Assert.NotEmpty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        [Theory]
+        [InlineData("?[42]=10&[42]=11")]
+        [InlineData("?[42][]=10&[42][]=11")]
+        [InlineData("?[42][0]=10&[42][1]=11")]
+        [InlineData("?parameter[42]=10&parameter[42]=11")]
+        [InlineData("?parameter[42][]=10&parameter[42][]=11")]
+        [InlineData("?parameter[42][0]=10&parameter[42][1]=11")]
+        public async Task DictionaryModelBinder_BindsDictionaryOfCollectionType_WithImpliedPrefixIntegralKeysAndJQueryFirst(
+            string queryString)
+        {
+            // Arrange
+            var expectedDictionary = new Dictionary<string, string[]> { { "42", new[] { "10", "11" } } };
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => request.QueryString = new QueryString(queryString),
+                // Add JQueryQueryStringValueProviderFactory before default factories.
+                options => options.ValueProviderFactories.Insert(0, new JQueryQueryStringValueProviderFactory()));
+
+            var modelState = testContext.ModelState;
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, string[]>)
+            };
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, string[]>>(modelBindingResult.Model);
+            Assert.Equal(expectedDictionary, model);
+
+            Assert.NotEmpty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        // parameter type, query string, expected type
+        public static TheoryData<Type, string, Type> DictionaryTypeData
+        {
+            get
+            {
+                return new TheoryData<Type, string, Type>
+                {
+                    {
+                        typeof(IDictionary<string, string>),
+                        "?[key0]=hello&[key1]=world",
+                        typeof(Dictionary<string, string>)
+                    },
+                    {
+                        typeof(Dictionary<string, string>),
+                        "?[key0]=hello&[key1]=world",
+                        typeof(Dictionary<string, string>)
+                    },
+                    {
+                        typeof(ClosedGenericDictionary),
+                        "?[key0]=hello&[key1]=world",
+                        typeof(ClosedGenericDictionary)
+                    },
+                    {
+                        typeof(ClosedGenericKeyDictionary<string>),
+                        "?[key0]=hello&[key1]=world",
+                        typeof(ClosedGenericKeyDictionary<string>)
+                    },
+                    {
+                        typeof(ExplicitClosedGenericDictionary),
+                        "?[key0]=hello&[key1]=world",
+                        typeof(ExplicitClosedGenericDictionary)
+                    },
+                    {
+                        typeof(ExplicitDictionary<string, string>),
+                        "?[key0]=hello&[key1]=world",
+                        typeof(ExplicitDictionary<string, string>)
+                    },
+                    {
+                        typeof(IDictionary<string, string>),
+                        "?index=low&index=high&[low].Key=key0&[low].Value=hello&[high].Key=key1&[high].Value=world",
+                        typeof(Dictionary<string, string>)
+                    },
+                    {
+                        typeof(Dictionary<string, string>),
+                        "?[0].Key=key0&[0].Value=hello&[1].Key=key1&[1].Value=world",
+                        typeof(Dictionary<string, string>)
+                    },
+                    {
+                        typeof(ClosedGenericDictionary),
+                        "?index=low&index=high&[low].Key=key0&[low].Value=hello&[high].Key=key1&[high].Value=world",
+                        typeof(ClosedGenericDictionary)
+                    },
+                    {
+                        typeof(ClosedGenericKeyDictionary<string>),
+                        "?[0].Key=key0&[0].Value=hello&[1].Key=key1&[1].Value=world",
+                        typeof(ClosedGenericKeyDictionary<string>)
+                    },
+                    {
+                        typeof(ExplicitClosedGenericDictionary),
+                        "?index=low&index=high&[low].Key=key0&[low].Value=hello&[high].Key=key1&[high].Value=world",
+                        typeof(ExplicitClosedGenericDictionary)
+                    },
+                    {
+                        typeof(ExplicitDictionary<string, string>),
+                        "?[0].Key=key0&[0].Value=hello&[1].Key=key1&[1].Value=world",
+                        typeof(ExplicitDictionary<string, string>)
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(DictionaryTypeData))]
+        public async Task DictionaryModelBinder_BindsParameterToExpectedType(
+            Type parameterType,
+            string queryString,
+            Type expectedType)
+        {
+            // Arrange
+            var expectedDictionary = new Dictionary<string, string>
+            {
+                { "key0", "hello" },
+                { "key1", "world" },
+            };
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter",
+                ParameterType = parameterType,
+            };
+
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString(queryString);
+            });
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            Assert.IsType(expectedType, modelBindingResult.Model);
+
+            var model = modelBindingResult.Model as IDictionary<string, string>;
+            Assert.NotNull(model); // Guard
+            Assert.Equal(expectedDictionary.Keys, model.Keys);
+            Assert.Equal(expectedDictionary.Values, model.Values);
+
+            Assert.True(modelState.IsValid);
+            Assert.NotEmpty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+        }
+
+        private class ClosedGenericDictionary : Dictionary<string, string>
+        {
+        }
+
+        private class ClosedGenericKeyDictionary<TValue> : Dictionary<string, TValue>
+        {
+        }
+
+        private class ExplicitClosedGenericDictionary : IDictionary<string, string>
+        {
+            private IDictionary<string, string> _data = new Dictionary<string, string>();
+
+            string IDictionary<string, string>.this[string key]
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+
+                set
+                {
+                    _data[key] = value;
+                }
+            }
+
+            int ICollection<KeyValuePair<string, string>>.Count
+            {
+                get
+                {
+                    return _data.Count;
+                }
+            }
+
+            bool ICollection<KeyValuePair<string, string>>.IsReadOnly
+            {
+                get
+                {
+                    return false;
+                }
+            }
+
+            ICollection<string> IDictionary<string, string>.Keys
+            {
+                get
+                {
+                    return _data.Keys;
+                }
+            }
+
+            ICollection<string> IDictionary<string, string>.Values
+            {
+                get
+                {
+                    return _data.Values;
+                }
+            }
+
+            void ICollection<KeyValuePair<string, string>>.Add(KeyValuePair<string, string> item)
+            {
+                _data.Add(item);
+            }
+
+            void IDictionary<string, string>.Add(string key, string value)
+            {
+                throw new NotImplementedException();
+            }
+
+            void ICollection<KeyValuePair<string, string>>.Clear()
+            {
+                _data.Clear();
+            }
+
+            bool ICollection<KeyValuePair<string, string>>.Contains(KeyValuePair<string, string> item)
+            {
+                throw new NotImplementedException();
+            }
+
+            bool IDictionary<string, string>.ContainsKey(string key)
+            {
+                throw new NotImplementedException();
+            }
+
+            void ICollection<KeyValuePair<string, string>>.CopyTo(KeyValuePair<string, string>[] array, int arrayIndex)
+            {
+                throw new NotImplementedException();
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                return _data.GetEnumerator();
+            }
+
+            IEnumerator<KeyValuePair<string, string>> IEnumerable<KeyValuePair<string, string>>.GetEnumerator()
+            {
+                return _data.GetEnumerator();
+            }
+
+            bool ICollection<KeyValuePair<string, string>>.Remove(KeyValuePair<string, string> item)
+            {
+                throw new NotImplementedException();
+            }
+
+            bool IDictionary<string, string>.Remove(string key)
+            {
+                throw new NotImplementedException();
+            }
+
+            bool IDictionary<string, string>.TryGetValue(string key, out string value)
+            {
+                return _data.TryGetValue(key, out value);
+            }
+        }
+
+        private class ExplicitDictionary<TKey, TValue> : IDictionary<TKey, TValue>
+        {
+            private IDictionary<TKey, TValue> _data = new Dictionary<TKey, TValue>();
+
+            TValue IDictionary<TKey, TValue>.this[TKey key]
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+
+                set
+                {
+                    _data[key] = value;
+                }
+            }
+
+            int ICollection<KeyValuePair<TKey, TValue>>.Count
+            {
+                get
+                {
+                    return _data.Count;
+                }
+            }
+
+            bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly
+            {
+                get
+                {
+                    return false;
+                }
+            }
+
+            ICollection<TKey> IDictionary<TKey, TValue>.Keys
+            {
+                get
+                {
+                    return _data.Keys;
+                }
+            }
+
+            ICollection<TValue> IDictionary<TKey, TValue>.Values
+            {
+                get
+                {
+                    return _data.Values;
+                }
+            }
+
+            void ICollection<KeyValuePair<TKey, TValue>>.Add(KeyValuePair<TKey, TValue> item)
+            {
+                _data.Add(item);
+            }
+
+            void IDictionary<TKey, TValue>.Add(TKey key, TValue value)
+            {
+                throw new NotImplementedException();
+            }
+
+            void ICollection<KeyValuePair<TKey, TValue>>.Clear()
+            {
+                _data.Clear();
+            }
+
+            bool ICollection<KeyValuePair<TKey, TValue>>.Contains(KeyValuePair<TKey, TValue> item)
+            {
+                throw new NotImplementedException();
+            }
+
+            bool IDictionary<TKey, TValue>.ContainsKey(TKey key)
+            {
+                throw new NotImplementedException();
+            }
+
+            void ICollection<KeyValuePair<TKey, TValue>>.CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex)
+            {
+                throw new NotImplementedException();
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                return _data.GetEnumerator();
+            }
+
+            IEnumerator<KeyValuePair<TKey, TValue>> IEnumerable<KeyValuePair<TKey, TValue>>.GetEnumerator()
+            {
+                return _data.GetEnumerator();
+            }
+
+            bool ICollection<KeyValuePair<TKey, TValue>>.Remove(KeyValuePair<TKey, TValue> item)
+            {
+                throw new NotImplementedException();
+            }
+
+            bool IDictionary<TKey, TValue>.Remove(TKey key)
+            {
+                throw new NotImplementedException();
+            }
+
+            bool IDictionary<TKey, TValue>.TryGetValue(TKey key, out TValue value)
+            {
+                return _data.TryGetValue(key, out value);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ExcludeBindingMetadataProviderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ExcludeBindingMetadataProviderIntegrationTest.cs
new file mode 100644
index 0000000000..185f828a86
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ExcludeBindingMetadataProviderIntegrationTest.cs
@@ -0,0 +1,152 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class ExcludeBindingMetadataProviderIntegrationTest
+    {
+        [Fact]
+        public async Task BindParameter_WithTypeProperty_IsNotBound()
+        {
+            // Arrange
+            var options = new MvcOptions();
+            var setup = new MvcCoreMvcOptionsSetup(new TestHttpRequestStreamReaderFactory());
+            var modelBinderProvider = new TypeModelBinderProvider();
+
+            // Adding a custom model binder for Type to ensure it doesn't get called
+            options.ModelBinderProviders.Insert(0, modelBinderProvider);
+
+            setup.Configure(options);
+
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(options);
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+                ParameterType = typeof(TypesBundle),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.Form = new FormCollection(new Dictionary<string, StringValues>
+                {
+                    { "name", new[] { "Fred" } },
+                    { "type", new[] { "SomeType" } },
+                });
+            });
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var boundPerson = Assert.IsType<TypesBundle>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson);
+            Assert.Equal("Fred", boundPerson.Name);
+
+            // The TypeModelBinder should not be called
+            Assert.False(modelBinderProvider.Invoked);
+        }
+
+        [Fact()]
+        public async Task BindParameter_WithTypeProperty_IsBound()
+        {
+            // Arrange
+            var options = new MvcOptions();
+            var modelBinderProvider = new TypeModelBinderProvider();
+
+            // Adding a custom model binder for Type to ensure it doesn't get called
+            options.ModelBinderProviders.Insert(0, modelBinderProvider);
+
+            var setup = new MvcCoreMvcOptionsSetup(new TestHttpRequestStreamReaderFactory());
+            setup.Configure(options);
+
+            // Remove the ExcludeBindingMetadataProvider
+            for (var i = options.ModelMetadataDetailsProviders.Count - 1; i >= 0; i--)
+            {
+                if (options.ModelMetadataDetailsProviders[i] is ExcludeBindingMetadataProvider)
+                {
+                    options.ModelMetadataDetailsProviders.RemoveAt(i);
+                }
+            }
+
+            var metadataProvider = TestModelMetadataProvider.CreateProvider(options.ModelMetadataDetailsProviders);
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.Form = new FormCollection(new Dictionary<string, StringValues>
+                    {
+                        { "name", new[] { "Fred" } },
+                        { "type", new[] { "SomeType" } },
+                    });
+                },
+                metadataProvider: metadataProvider,
+                mvcOptions: options);
+
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+                ParameterType = typeof(TypesBundle),
+            };
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var boundPerson = Assert.IsType<TypesBundle>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson);
+            Assert.Equal("Fred", boundPerson.Name);
+
+            // The TypeModelBinder should be called
+            Assert.True(modelBinderProvider.Invoked);
+        }
+
+        private class TypesBundle
+        {
+            public string Name { get; set; }
+
+            public Type Type { get; set; }
+        }
+
+        public class TypeModelBinderProvider : IModelBinderProvider
+        {
+            public bool Invoked { get; set; }
+
+            /// <inheritdoc />
+            public IModelBinder GetBinder(ModelBinderProviderContext context)
+            {
+                if (context == null)
+                {
+                    throw new ArgumentNullException(nameof(context));
+                }
+
+                if (context.Metadata.ModelType == typeof(Type))
+                {
+                    Invoked = true;
+                }
+
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/FormCollectionModelBindingIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/FormCollectionModelBindingIntegrationTest.cs
new file mode 100644
index 0000000000..330da2bc38
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/FormCollectionModelBindingIntegrationTest.cs
@@ -0,0 +1,177 @@
+// 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.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class FormCollectionModelBindingIntegrationTest
+    {
+        private class Person
+        {
+            public Address Address { get; set; }
+        }
+
+        private class Address
+        {
+            public int Zip { get; set; }
+
+            public IFormCollection FileCollection { get; set; }
+        }
+
+        [Fact]
+        public async Task BindProperty_WithData_WithEmptyPrefix_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+                ParameterType = typeof(Person)
+            };
+
+            var data = "Some Data Is Better Than No Data.";
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.QueryString = QueryString.Create("Address.Zip", "12345");
+                    UpdateRequest(request, data, "Address.File");
+                });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var boundPerson = Assert.IsType<Person>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson.Address);
+            var formCollection = Assert.IsAssignableFrom<IFormCollection>(boundPerson.Address.FileCollection);
+            var file = Assert.Single(formCollection.Files);
+            Assert.Equal("form-data; name=Address.File; filename=text.txt", file.ContentDisposition);
+            var reader = new StreamReader(file.OpenReadStream());
+            Assert.Equal(data, reader.ReadToEnd());
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            var entry = Assert.Single(modelState);
+            Assert.Equal("Address.Zip", entry.Key);
+            Assert.Empty(entry.Value.Errors);
+            Assert.Equal(ModelValidationState.Valid, entry.Value.ValidationState);
+        }
+
+        [Fact]
+        public async Task BindParameter_WithData_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo
+                {
+                    // Setting a custom parameter prevents it from falling back to an empty prefix.
+                    BinderModelName = "CustomParameter",
+                },
+                ParameterType = typeof(IFormCollection)
+            };
+
+            var data = "Some Data Is Better Than No Data.";
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    UpdateRequest(request, data, "CustomParameter");
+                });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var formCollection = Assert.IsAssignableFrom<IFormCollection>(modelBindingResult.Model);
+            var file = Assert.Single(formCollection.Files);
+            Assert.NotNull(file);
+            Assert.Equal("form-data; name=CustomParameter; filename=text.txt", file.ContentDisposition);
+            var reader = new StreamReader(file.OpenReadStream());
+            Assert.Equal(data, reader.ReadToEnd());
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+
+        [Fact]
+        public async Task BindParameter_NoData_BindsWithEmptyCollection()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo
+                {
+                    BinderModelName = "CustomParameter",
+                },
+                ParameterType = typeof(IFormCollection)
+            };
+
+            // No data is passed.
+            var testContext = ModelBindingTestHelper.GetTestContext();
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            var collection = Assert.IsAssignableFrom<IFormCollection>(modelBindingResult.Model);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+
+            // FormCollection
+            Assert.Empty(collection);
+            Assert.Empty(collection.Files);
+            Assert.Empty(collection.Keys);
+        }
+
+        private void UpdateRequest(HttpRequest request, string data, string name)
+        {
+            const string fileName = "text.txt";
+            var fileCollection = new FormFileCollection();
+            var formCollection = new FormCollection(new Dictionary<string, StringValues>(), fileCollection);
+            var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(data));
+
+            request.Form = formCollection;
+            request.ContentType = "multipart/form-data; boundary=----WebKitFormBoundarymx2fSWqWSd0OxQqq";
+            request.Headers["Content-Disposition"] = $"form-data; name={name}; filename={fileName}";
+            fileCollection.Add(new FormFile(memoryStream, 0, data.Length, name, fileName)
+            {
+                Headers = request.Headers
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/FormFileModelBindingIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/FormFileModelBindingIntegrationTest.cs
new file mode 100644
index 0000000000..34e2a2a20f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/FormFileModelBindingIntegrationTest.cs
@@ -0,0 +1,382 @@
+// 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.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class FormFileModelBindingIntegrationTest
+    {
+        private class Person
+        {
+            public Address Address { get; set; }
+        }
+
+        private class Address
+        {
+            public int Zip { get; set; }
+
+            public IFormFile File { get; set; }
+        }
+
+        [Fact]
+        public async Task BindProperty_WithData_WithEmptyPrefix_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+                ParameterType = typeof(Person)
+            };
+
+            var data = "Some Data Is Better Than No Data.";
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.QueryString = QueryString.Create("Address.Zip", "12345");
+                    UpdateRequest(request, data, "Address.File");
+                });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var boundPerson = Assert.IsType<Person>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson.Address);
+            var file = Assert.IsAssignableFrom<IFormFile>(boundPerson.Address.File);
+            Assert.Equal("form-data; name=Address.File; filename=text.txt", file.ContentDisposition);
+            var reader = new StreamReader(boundPerson.Address.File.OpenReadStream());
+            Assert.Equal(data, reader.ReadToEnd());
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            Assert.Equal(2, modelState.Count);
+            Assert.Single(modelState.Keys, k => k == "Address.Zip");
+            var key = Assert.Single(modelState.Keys, k => k == "Address.File");
+            Assert.Null(modelState[key].RawValue);
+            Assert.Empty(modelState[key].Errors);
+            Assert.Equal(ModelValidationState.Valid, modelState[key].ValidationState);
+        }
+
+        private class ListContainer1
+        {
+            [ModelBinder(Name = "files")]
+            public List<IFormFile> ListProperty { get; set; }
+        }
+
+        [Fact]
+        public async Task BindCollectionProperty_WithData_IsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+                ParameterType = typeof(ListContainer1),
+            };
+
+            var data = "some data";
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => UpdateRequest(request, data, "files"));
+            var modelState = testContext.ModelState;
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(result.IsModelSet);
+
+            // Model
+            var boundContainer = Assert.IsType<ListContainer1>(result.Model);
+            Assert.NotNull(boundContainer);
+            Assert.NotNull(boundContainer.ListProperty);
+            var file = Assert.Single(boundContainer.ListProperty);
+            Assert.Equal("form-data; name=files; filename=text.txt", file.ContentDisposition);
+            using (var reader = new StreamReader(file.OpenReadStream()))
+            {
+                Assert.Equal(data, reader.ReadToEnd());
+            }
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            var kvp = Assert.Single(modelState);
+            Assert.Equal("files", kvp.Key);
+            var modelStateEntry = kvp.Value;
+            Assert.NotNull(modelStateEntry);
+            Assert.Empty(modelStateEntry.Errors);
+            Assert.Equal(ModelValidationState.Valid, modelStateEntry.ValidationState);
+            Assert.Null(modelStateEntry.AttemptedValue);
+            Assert.Null(modelStateEntry.RawValue);
+        }
+
+        [Fact]
+        public async Task BindCollectionProperty_NoData_IsNotBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+                ParameterType = typeof(ListContainer1),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => UpdateRequest(request, data: null, name: null));
+            var modelState = testContext.ModelState;
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(result.IsModelSet);
+
+            // Model (bound to an empty collection)
+            var boundContainer = Assert.IsType<ListContainer1>(result.Model);
+            Assert.NotNull(boundContainer);
+            Assert.Null(boundContainer.ListProperty);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+
+        private class ListContainer2
+        {
+            [ModelBinder(Name = "files")]
+            public List<IFormFile> ListProperty { get; } = new List<IFormFile>
+            {
+                new FormFile(new MemoryStream(), baseStreamOffset: 0, length: 0, name: "file", fileName: "file1"),
+                new FormFile(new MemoryStream(), baseStreamOffset: 0, length: 0, name: "file", fileName: "file2"),
+                new FormFile(new MemoryStream(), baseStreamOffset: 0, length: 0, name: "file", fileName: "file3"),
+            };
+        }
+
+        [Fact]
+        public async Task BindReadOnlyCollectionProperty_WithData_IsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+                ParameterType = typeof(ListContainer2),
+            };
+
+            var data = "some data";
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => UpdateRequest(request, data, "files"));
+            var modelState = testContext.ModelState;
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(result.IsModelSet);
+
+            // Model
+            var boundContainer = Assert.IsType<ListContainer2>(result.Model);
+            Assert.NotNull(boundContainer);
+            Assert.NotNull(boundContainer.ListProperty);
+            var file = Assert.Single(boundContainer.ListProperty);
+            Assert.Equal("form-data; name=files; filename=text.txt", file.ContentDisposition);
+            using (var reader = new StreamReader(file.OpenReadStream()))
+            {
+                Assert.Equal(data, reader.ReadToEnd());
+            }
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            var kvp = Assert.Single(modelState);
+            Assert.Equal("files", kvp.Key);
+            var modelStateEntry = kvp.Value;
+            Assert.NotNull(modelStateEntry);
+            Assert.Empty(modelStateEntry.Errors);
+            Assert.Equal(ModelValidationState.Valid, modelStateEntry.ValidationState);
+            Assert.Null(modelStateEntry.AttemptedValue);
+            Assert.Null(modelStateEntry.RawValue);
+        }
+
+        [Fact]
+        public async Task BindParameter_WithData_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo
+                {
+                    // Setting a custom parameter prevents it from falling back to an empty prefix.
+                    BinderModelName = "CustomParameter",
+                },
+                ParameterType = typeof(IFormFile)
+            };
+
+            var data = "Some Data Is Better Than No Data.";
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    UpdateRequest(request, data, "CustomParameter");
+                });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var file = Assert.IsType<FormFile>(modelBindingResult.Model);
+            Assert.NotNull(file);
+            Assert.Equal("form-data; name=CustomParameter; filename=text.txt", file.ContentDisposition);
+            var reader = new StreamReader(file.OpenReadStream());
+            Assert.Equal(data, reader.ReadToEnd());
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            var entry = Assert.Single(modelState);
+            Assert.Equal("CustomParameter", entry.Key);
+            Assert.Empty(entry.Value.Errors);
+            Assert.Equal(ModelValidationState.Valid, entry.Value.ValidationState);
+            Assert.Null(entry.Value.AttemptedValue);
+            Assert.Null(entry.Value.RawValue);
+        }
+
+        [Fact]
+        public async Task BindParameter_NoData_DoesNotGetBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "CustomParameter",
+                },
+
+                ParameterType = typeof(IFormFile)
+            };
+
+            // No data is passed.
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => UpdateRequest(request, data: null, name: null));
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.False(modelBindingResult.IsModelSet);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState.Keys);
+        }
+
+        private class Car1
+        {
+            public string Name { get; set; }
+
+            public FormFileCollection Specs { get; set; }
+        }
+
+        [Fact]
+        public async Task BindProperty_WithData_WithPrefix_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "p",
+                BindingInfo = new BindingInfo(),
+                ParameterType = typeof(Car1)
+            };
+
+            var data = "Some Data Is Better Than No Data.";
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.QueryString = QueryString.Create("p.Name", "Accord");
+                    UpdateRequest(request, data, "p.Specs");
+                });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var car = Assert.IsType<Car1>(modelBindingResult.Model);
+            Assert.NotNull(car.Specs);
+            var file = Assert.Single(car.Specs);
+            Assert.Equal("form-data; name=p.Specs; filename=text.txt", file.ContentDisposition);
+            var reader = new StreamReader(file.OpenReadStream());
+            Assert.Equal(data, reader.ReadToEnd());
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            Assert.Equal(2, modelState.Count);
+
+            var entry = Assert.Single(modelState, e => e.Key == "p.Name").Value;
+            Assert.Equal("Accord", entry.AttemptedValue);
+            Assert.Equal("Accord", entry.RawValue);
+
+            Assert.Single(modelState, e => e.Key == "p.Specs");
+        }
+
+        private void UpdateRequest(HttpRequest request, string data, string name)
+        {
+            const string fileName = "text.txt";
+            var fileCollection = new FormFileCollection();
+            var formCollection = new FormCollection(new Dictionary<string, StringValues>(), fileCollection);
+
+            request.Form = formCollection;
+            request.ContentType = "multipart/form-data; boundary=----WebKitFormBoundarymx2fSWqWSd0OxQqq";
+
+            if (string.IsNullOrEmpty(data) || string.IsNullOrEmpty(name))
+            {
+                // Leave the submission empty.
+                return;
+            }
+
+            request.Headers["Content-Disposition"] = $"form-data; name={name}; filename={fileName}";
+
+            var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(data));
+            fileCollection.Add(new FormFile(memoryStream, 0, data.Length, name, fileName)
+            {
+                Headers = request.Headers
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/GenericModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/GenericModelBinderIntegrationTest.cs
new file mode 100644
index 0000000000..22a7be2d24
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/GenericModelBinderIntegrationTest.cs
@@ -0,0 +1,643 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    // Integration tests targeting the behavior of the GenericModelBinder and related classes
+    // with other model binders.
+    public class GenericModelBinderIntegrationTest
+    {
+        // This isn't an especially useful scenario - but it exercises what happens when you
+        // try to use a Collection of something that is bound greedily by model-type.
+        //
+        // In this example we choose IFormCollection because IFormCollection has a dedicated
+        // model binder.
+        [Fact]
+        public async Task GenericModelBinder_BindsCollection_ElementTypeFromGreedyModelBinder_WithPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(List<IFormCollection>)
+            };
+
+            // Need to have a key here so that the GenericModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.index=10");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<List<IFormCollection>>(modelBindingResult.Model);
+            var formCollection = Assert.Single(model);
+            Assert.NotNull(formCollection);
+
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+
+        // This isn't an especially useful scenario - but it exercises what happens when you
+        // try to use a Collection of something that is bound greedily by model-type.
+        //
+        // In this example we choose IFormCollection - because IFormCollection has a dedicated
+        // model  binder.
+        [Fact]
+        public async Task GenericModelBinder_BindsCollection_ElementTypeFromGreedyModelBinder_EmptyPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(List<IFormCollection>)
+            };
+            // Need to have a key here so that the GenericModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?index=10");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<List<IFormCollection>>(modelBindingResult.Model);
+            var formCollection = Assert.Single(model);
+            Assert.NotNull(formCollection);
+
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+
+        // This isn't an especially useful scenario - but it exercises what happens when you
+        // try to use a Collection of something that is bound greedily by model-type.
+        //
+        // In this example we choose IFormCollection - because IFormCollection has a dedicated
+        // model  binder.
+        [Fact]
+        public async Task GenericModelBinder_BindsCollection_ElementTypeFromGreedyModelBinder_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(List<IFormCollection>)
+            };
+
+            // Without a key here so the GenericModelBinder will not recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<List<IFormCollection>>(modelBindingResult.Model);
+            Assert.Empty(model);
+        }
+
+        [BindAddress]
+        private class Address
+        {
+        }
+
+        private class BindAddressAttribute : Attribute, IBindingSourceMetadata
+        {
+            public static readonly BindingSource Source = new BindingSource(
+                "Address",
+                displayName: "Address",
+                isGreedy: true,
+                isFromRequest: true);
+
+            public BindingSource BindingSource
+            {
+                get
+                {
+                    return Source;
+                }
+            }
+        }
+
+        private class AddressBinderProvider : IModelBinderProvider
+        {
+            public IModelBinder GetBinder(ModelBinderProviderContext context)
+            {
+                var allowedBindingSource = context.BindingInfo.BindingSource;
+                if (allowedBindingSource?.CanAcceptDataFrom(BindAddressAttribute.Source) == true)
+                {
+                    // Binding Sources are opt-in. This model either didn't specify one or specified something
+                    // incompatible so let other binders run.
+                    return new AddressBinder();
+                }
+
+                return null;
+            }
+        }
+
+        private class AddressBinder : IModelBinder
+        {
+            public Task BindModelAsync(ModelBindingContext bindingContext)
+            {
+                if (bindingContext == null)
+                {
+                    throw new ArgumentNullException(nameof(bindingContext));
+                }
+
+                Debug.Assert(bindingContext.Result == ModelBindingResult.Failed());
+
+                var allowedBindingSource = bindingContext.BindingSource;
+                if (allowedBindingSource == null ||
+                    !allowedBindingSource.CanAcceptDataFrom(BindAddressAttribute.Source))
+                {
+                    // Binding Sources are opt-in. This model either didn't specify one or specified something
+                    // incompatible so let other binders run.
+                    return Task.CompletedTask;
+                }
+
+                bindingContext.Result = ModelBindingResult.Success(new Address());
+                return Task.CompletedTask;
+            }
+        }
+
+        // This isn't an especially useful scenario - but it exercises what happens when you
+        // try to use a Collection of something that is bound greedily by binding source.
+        [Fact]
+        public async Task GenericModelBinder_BindsCollection_ElementTypeUsesGreedyModelBinder_WithPrefix_Success()
+        {
+            // Arrange
+            // Need to have a key here so that the GenericModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => request.QueryString = new QueryString("?parameter.index=0"));
+
+            var modelState = testContext.ModelState;
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(
+                testContext.MvcOptions,
+                new AddressBinderProvider());
+
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Address[])
+            };
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Address[]>(modelBindingResult.Model);
+            Assert.Single(model);
+            Assert.NotNull(model[0]);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        // Similar to the GenericModelBinder_BindsCollection_ElementTypeUsesGreedyModelBinder_WithPrefix_Success
+        // scenario but mis-configured. Model using a BindingSource for which no ModelBinder is enabled.
+        [Fact]
+        public async Task GenericModelBinder_BindsCollection_ElementTypeUsesGreedyBindingSource_WithPrefix_NullElement()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Address[])
+            };
+
+            // Need to have a key here so that the GenericModelBinder will recurse to bind elements.
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => request.QueryString = new QueryString("?parameter.index=0"));
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Address[]>(modelBindingResult.Model);
+            Assert.Single(model);
+            Assert.Null(model[0]);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        // This is part of a random sampling of scenarios where a GenericModelBinder is used
+        // recursively.
+        [Fact]
+        public async Task GenericModelBinder_BindsArrayOfDictionary_WithPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, int>[])
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter[0][0].Key=key0&parameter[0][0].Value=10");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, int>[]>(modelBindingResult.Model);
+            var dictionary = Assert.Single(model);
+            var kvp = Assert.Single(dictionary);
+            Assert.Equal("key0", kvp.Key);
+            Assert.Equal(10, kvp.Value);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter[0][0].Key").Value;
+            Assert.Equal("key0", entry.AttemptedValue);
+            Assert.Equal("key0", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "parameter[0][0].Value").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+        }
+
+        // This is part of a random sampling of scenarios where a GenericModelBinder is used
+        // recursively.
+        [Fact]
+        public async Task GenericModelBinder_BindsArrayOfDictionary_EmptyPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, int>[])
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?[0][0].Key=key0&[0][0].Value=10");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, int>[]>(modelBindingResult.Model);
+            var dictionary = Assert.Single(model);
+            var kvp = Assert.Single(dictionary);
+            Assert.Equal("key0", kvp.Key);
+            Assert.Equal(10, kvp.Value);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "[0][0].Key").Value;
+            Assert.Equal("key0", entry.AttemptedValue);
+            Assert.Equal("key0", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "[0][0].Value").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+        }
+
+        // This is part of a random sampling of scenarios where a GenericModelBinder is used
+        // recursively.
+        [Fact]
+        public async Task GenericModelBinder_BindsArrayOfDictionary_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, int>[])
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, int>[]>(modelBindingResult.Model);
+            Assert.NotNull(model);
+            Assert.Empty(model);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        // This is part of a random sampling of scenarios where a GenericModelBinder is used
+        // recursively.
+        [Fact]
+        public async Task GenericModelBinder_BindsCollectionOfKeyValuePair_WithPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(ICollection<KeyValuePair<string, int>>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter[0].Key=key0&parameter[0].Value=10");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<List<KeyValuePair<string, int>>>(modelBindingResult.Model);
+            var kvp = Assert.Single(model);
+            Assert.Equal("key0", kvp.Key);
+            Assert.Equal(10, kvp.Value);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter[0].Key").Value;
+            Assert.Equal("key0", entry.AttemptedValue);
+            Assert.Equal("key0", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "parameter[0].Value").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+        }
+
+        // This is part of a random sampling of scenarios where a GenericModelBinder is used
+        // recursively.
+        [Fact]
+        public async Task GenericModelBinder_BindsCollectionOfKeyValuePair_EmptyPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(ICollection<KeyValuePair<string, int>>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?[0].Key=key0&[0].Value=10");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<List<KeyValuePair<string, int>>>(modelBindingResult.Model);
+            var kvp = Assert.Single(model);
+            Assert.Equal("key0", kvp.Key);
+            Assert.Equal(10, kvp.Value);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "[0].Key").Value;
+            Assert.Equal("key0", entry.AttemptedValue);
+            Assert.Equal("key0", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "[0].Value").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+        }
+
+        // This is part of a random sampling of scenarios where a GenericModelBinder is used
+        // recursively.
+        [Fact]
+        public async Task GenericModelBinder_BindsCollectionOfKeyValuePair_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(ICollection<KeyValuePair<string, int>>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<List<KeyValuePair<string, int>>>(modelBindingResult.Model);
+            Assert.NotNull(model);
+            Assert.Empty(model);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        // This is part of a random sampling of scenarios where a GenericModelBinder is used
+        // recursively.
+        [Fact]
+        public async Task GenericModelBinder_BindsDictionaryOfList_WithPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, List<int>>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString(
+                    "?parameter[0].Key=key0&parameter[0].Value[0]=10&parameter[0].Value[1]=11");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, List<int>>>(modelBindingResult.Model);
+            var kvp = Assert.Single(model);
+            Assert.Equal("key0", kvp.Key);
+            Assert.Equal(new List<int>() { 10, 11 }, kvp.Value);
+
+            Assert.Equal(3, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter[0].Key").Value;
+            Assert.Equal("key0", entry.AttemptedValue);
+            Assert.Equal("key0", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "parameter[0].Value[0]").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "parameter[0].Value[1]").Value;
+            Assert.Equal("11", entry.AttemptedValue);
+            Assert.Equal("11", entry.RawValue);
+        }
+
+        // This is part of a random sampling of scenarios where a GenericModelBinder is used
+        // recursively.
+        [Fact]
+        public async Task GenericModelBinder_BindsDictionaryOfList_EmptyPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, List<int>>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?[0].Key=key0&[0].Value[0]=10&[0].Value[1]=11");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, List<int>>>(modelBindingResult.Model);
+            var kvp = Assert.Single(model);
+            Assert.Equal("key0", kvp.Key);
+            Assert.Equal(new List<int>() { 10, 11 }, kvp.Value);
+
+            Assert.Equal(3, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "[0].Key").Value;
+            Assert.Equal("key0", entry.AttemptedValue);
+            Assert.Equal("key0", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "[0].Value[0]").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "[0].Value[1]").Value;
+            Assert.Equal("11", entry.AttemptedValue);
+            Assert.Equal("11", entry.RawValue);
+        }
+
+        // This is part of a random sampling of scenarios where a GenericModelBinder is used
+        // recursively.
+        [Fact]
+        public async Task GenericModelBinder_BindsDictionaryOfList_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, List<int>>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, List<int>>>(modelBindingResult.Model);
+            Assert.NotNull(model);
+            Assert.Empty(model);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/HeaderModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/HeaderModelBinderIntegrationTest.cs
new file mode 100644
index 0000000000..fb89e0e204
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/HeaderModelBinderIntegrationTest.cs
@@ -0,0 +1,515 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class HeaderModelBinderIntegrationTest
+    {
+        private class Person
+        {
+            public Address Address { get; set; }
+        }
+
+        private class Address
+        {
+            [FromHeader(Name = "Header")]
+            [Required]
+            public string Street { get; set; }
+        }
+
+        [Fact]
+        public async Task BindPropertyFromHeader_NoData_UsesFullPathAsKeyForModelStateErrors()
+        {
+            // Arrange
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "CustomParameter",
+                },
+                ParameterType = typeof(Person)
+            };
+
+            // Do not add any headers.
+            var testContext = GetModelBindingTestContext();
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var boundPerson = Assert.IsType<Person>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson);
+
+            // ModelState
+            Assert.False(modelState.IsValid);
+            var key = Assert.Single(modelState.Keys);
+            Assert.Equal("CustomParameter.Address.Header", key);
+            var error = Assert.Single(modelState[key].Errors);
+            Assert.Equal(ValidationAttributeUtil.GetRequiredErrorMessage("Street"), error.ErrorMessage);
+        }
+
+        [Fact]
+        public async Task BindPropertyFromHeader_WithPrefix_GetsBound()
+        {
+            // Arrange
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "prefix",
+                },
+                ParameterType = typeof(Person)
+            };
+
+            var testContext = GetModelBindingTestContext(
+                request => request.Headers.Add("Header", new[] { "someValue" }));
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var boundPerson = Assert.IsType<Person>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson);
+            Assert.NotNull(boundPerson.Address);
+            Assert.Equal("someValue", boundPerson.Address.Street);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            var entry = Assert.Single(modelState);
+            Assert.Equal("prefix.Address.Header", entry.Key);
+            Assert.Empty(entry.Value.Errors);
+            Assert.Equal(ModelValidationState.Valid, entry.Value.ValidationState);
+            Assert.Equal("someValue", entry.Value.AttemptedValue);
+            Assert.Equal("someValue", entry.Value.RawValue);
+        }
+
+        // The scenario is interesting as we to bind the top level model we fallback to empty prefix,
+        // and hence the model state keys have an empty prefix.
+        [Fact]
+        public async Task BindPropertyFromHeader_WithData_WithEmptyPrefix_GetsBound()
+        {
+            // Arrange
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+                ParameterType = typeof(Person)
+            };
+
+            var testContext = GetModelBindingTestContext(
+                request => request.Headers.Add("Header", new[] { "someValue" }));
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var boundPerson = Assert.IsType<Person>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson);
+            Assert.NotNull(boundPerson.Address);
+            Assert.Equal("someValue", boundPerson.Address.Street);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            var entry = Assert.Single(modelState);
+            Assert.Equal("Address.Header", entry.Key);
+            Assert.Empty(entry.Value.Errors);
+            Assert.Equal(ModelValidationState.Valid, entry.Value.ValidationState);
+            Assert.Equal("someValue", entry.Value.AttemptedValue);
+            Assert.Equal("someValue", entry.Value.RawValue);
+        }
+
+        private class ListContainer1
+        {
+            [FromHeader(Name = "Header")]
+            public List<string> ListProperty { get; set; }
+        }
+
+        [Fact]
+        public async Task BindCollectionPropertyFromHeader_WithData_IsBound()
+        {
+            // Arrange
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+                ParameterType = typeof(ListContainer1),
+            };
+
+            var testContext = GetModelBindingTestContext(
+                request => request.Headers.Add("Header", new[] { "someValue" }));
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var modelState = testContext.ModelState;
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(result.IsModelSet);
+
+            // Model
+            var boundContainer = Assert.IsType<ListContainer1>(result.Model);
+            Assert.NotNull(boundContainer);
+            Assert.NotNull(boundContainer.ListProperty);
+            var entry = Assert.Single(boundContainer.ListProperty);
+            Assert.Equal("someValue", entry);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            var kvp = Assert.Single(modelState);
+            Assert.Equal("Header", kvp.Key);
+            var modelStateEntry = kvp.Value;
+            Assert.NotNull(modelStateEntry);
+            Assert.Empty(modelStateEntry.Errors);
+            Assert.Equal(ModelValidationState.Valid, modelStateEntry.ValidationState);
+            Assert.Equal("someValue", modelStateEntry.AttemptedValue);
+            Assert.Equal("someValue", modelStateEntry.RawValue);
+        }
+
+        private class ListContainer2
+        {
+            [FromHeader(Name = "Header")]
+            public List<string> ListProperty { get; } = new List<string> { "One", "Two", "Three" };
+        }
+
+        [Fact]
+        public async Task BindReadOnlyCollectionPropertyFromHeader_WithData_IsBound()
+        {
+            // Arrange
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+                ParameterType = typeof(ListContainer2),
+            };
+
+            var testContext = GetModelBindingTestContext(
+                request => request.Headers.Add("Header", new[] { "someValue" }));
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var modelState = testContext.ModelState;
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(result.IsModelSet);
+
+            // Model
+            var boundContainer = Assert.IsType<ListContainer2>(result.Model);
+            Assert.NotNull(boundContainer);
+            Assert.NotNull(boundContainer.ListProperty);
+            var entry = Assert.Single(boundContainer.ListProperty);
+            Assert.Equal("someValue", entry);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            var kvp = Assert.Single(modelState);
+            Assert.Equal("Header", kvp.Key);
+            var modelStateEntry = kvp.Value;
+            Assert.NotNull(modelStateEntry);
+            Assert.Empty(modelStateEntry.Errors);
+            Assert.Equal(ModelValidationState.Valid, modelStateEntry.ValidationState);
+            Assert.Equal("someValue", modelStateEntry.AttemptedValue);
+            Assert.Equal("someValue", modelStateEntry.RawValue);
+        }
+
+        [Theory]
+        [InlineData(typeof(string[]), "value1, value2, value3")]
+        [InlineData(typeof(string), "value")]
+        public async Task BindParameterFromHeader_WithData_WithPrefix_ModelGetsBound(Type modelType, string value)
+        {
+            // Arrange
+            string expectedAttemptedValue;
+            object expectedRawValue;
+            if (modelType == typeof(string))
+            {
+                expectedAttemptedValue = value;
+                expectedRawValue = value;
+            }
+            else
+            {
+                expectedAttemptedValue = value.Replace(" ", "");
+                expectedRawValue = value.Split(',').Select(v => v.Trim()).ToArray();
+            }
+
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo
+                {
+                    BinderModelName = "CustomParameter",
+                    BindingSource = BindingSource.Header
+                },
+                ParameterType = modelType
+            };
+
+            Action<HttpRequest> action = r => r.Headers.Add("CustomParameter", new[] { expectedAttemptedValue });
+            var testContext = GetModelBindingTestContext(action);
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+
+            // Do not add any headers.
+            var httpContext = testContext.HttpContext;
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            Assert.NotNull(modelBindingResult.Model);
+            Assert.IsType(modelType, modelBindingResult.Model);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            var entry = Assert.Single(modelState);
+            Assert.Equal("CustomParameter", entry.Key);
+            Assert.Empty(entry.Value.Errors);
+            Assert.Equal(ModelValidationState.Valid, entry.Value.ValidationState);
+            Assert.Equal(expectedAttemptedValue, entry.Value.AttemptedValue);
+            Assert.Equal(expectedRawValue, entry.Value.RawValue);
+        }
+
+        [Fact]
+        public async Task BindPropertyFromHeader_WithPrefix_GetsBound_ForSimpleTypes()
+        {
+            // Arrange
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "prefix",
+                },
+                ParameterType = typeof(Product)
+            };
+
+            var testContext = GetModelBindingTestContext(
+                request =>
+                {
+                    request.Headers.Add("NoCommaString", "someValue");
+                    request.Headers.Add("OneCommaSeparatedString", "one, two, three");
+                    request.Headers.Add("IntProperty", "10");
+                    request.Headers.Add("NullableIntProperty", "300");
+                    request.Headers.Add("ArrayOfString", "first, second");
+                    request.Headers.Add("EnumerableOfDouble", "10.51, 45.44");
+                    request.Headers.Add("ListOfEnum", "Sedan, Coupe");
+                    request.Headers.Add("ListOfOrderWithTypeConverter", "10");
+                });
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var product = Assert.IsType<Product>(modelBindingResult.Model);
+            Assert.NotNull(product);
+            Assert.NotNull(product.Manufacturer);
+            Assert.Equal("someValue", product.Manufacturer.NoCommaString);
+            Assert.Equal("one, two, three", product.Manufacturer.OneCommaSeparatedStringProperty);
+            Assert.Equal(10, product.Manufacturer.IntProperty);
+            Assert.Equal(300, product.Manufacturer.NullableIntProperty);
+            Assert.Null(product.Manufacturer.NullableLongProperty);
+            Assert.Equal(new[] { "first", "second" }, product.Manufacturer.ArrayOfString);
+            Assert.Equal(new double[] { 10.51, 45.44 }, product.Manufacturer.EnumerableOfDoubleProperty);
+            Assert.Equal(new CarType[] { CarType.Sedan, CarType.Coupe }, product.Manufacturer.ListOfEnum);
+            var orderWithTypeConverter = Assert.Single(product.Manufacturer.ListOfOrderWithTypeConverterProperty);
+            Assert.Equal(10, orderWithTypeConverter.Id);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            Assert.Collection(
+                modelState.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("prefix.Manufacturer.ArrayOfString", kvp.Key);
+                    var entry = kvp.Value;
+                    Assert.Empty(entry.Errors);
+                    Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+                    Assert.Equal("first,second", entry.AttemptedValue);
+                    Assert.Equal(new[] { "first", "second" }, entry.RawValue);
+                },
+                kvp =>
+                {
+                    Assert.Equal("prefix.Manufacturer.EnumerableOfDouble", kvp.Key);
+                    var entry = kvp.Value;
+                    Assert.Empty(entry.Errors);
+                    Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+                    Assert.Equal("10.51,45.44", entry.AttemptedValue);
+                    Assert.Equal(new[] { "10.51", "45.44" }, entry.RawValue);
+                },
+                kvp =>
+                {
+                    Assert.Equal("prefix.Manufacturer.IntProperty", kvp.Key);
+                    var entry = kvp.Value;
+                    Assert.Empty(entry.Errors);
+                    Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+                    Assert.Equal("10", entry.AttemptedValue);
+                    Assert.Equal("10", entry.RawValue);
+                },
+                kvp =>
+                {
+                    Assert.Equal("prefix.Manufacturer.ListOfEnum", kvp.Key);
+                    var entry = kvp.Value;
+                    Assert.Empty(entry.Errors);
+                    Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+                    Assert.Equal("Sedan,Coupe", entry.AttemptedValue);
+                    Assert.Equal(new[] { "Sedan", "Coupe" }, entry.RawValue);
+                },
+                kvp =>
+                {
+                    Assert.Equal("prefix.Manufacturer.ListOfOrderWithTypeConverter", kvp.Key);
+                    var entry = kvp.Value;
+                    Assert.Empty(entry.Errors);
+                    Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+                    Assert.Equal("10", entry.AttemptedValue);
+                    Assert.Equal("10", entry.RawValue);
+                },
+                kvp =>
+                {
+                    Assert.Equal("prefix.Manufacturer.NoCommaString", kvp.Key);
+                    var entry = kvp.Value;
+                    Assert.Empty(entry.Errors);
+                    Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+                    Assert.Equal("someValue", entry.AttemptedValue);
+                    Assert.Equal("someValue", entry.RawValue);
+                },
+                kvp =>
+                {
+                    Assert.Equal("prefix.Manufacturer.NullableIntProperty", kvp.Key);
+                    var entry = kvp.Value;
+                    Assert.Empty(entry.Errors);
+                    Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+                    Assert.Equal("300", entry.AttemptedValue);
+                    Assert.Equal("300", entry.RawValue);
+                },
+                kvp =>
+                {
+                    Assert.Equal("prefix.Manufacturer.OneCommaSeparatedString", kvp.Key);
+                    var entry = kvp.Value;
+                    Assert.Empty(entry.Errors);
+                    Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+                    Assert.Equal("one, two, three", entry.AttemptedValue);
+                    Assert.Equal("one, two, three", entry.RawValue);
+                });
+        }
+
+        private ModelBindingTestContext GetModelBindingTestContext(
+            Action<HttpRequest> updateRequest = null,
+            Action<MvcOptions> updateOptions = null)
+        {
+            return ModelBindingTestHelper.GetTestContext(updateRequest, updateOptions);
+        }
+
+        private class Product
+        {
+            public Manufacturer Manufacturer { get; set; }
+        }
+
+        private class Manufacturer
+        {
+            [FromHeader]
+            public string NoCommaString { get; set; }
+
+            [FromHeader(Name = "OneCommaSeparatedString")]
+            public string OneCommaSeparatedStringProperty { get; set; }
+
+            [FromHeader]
+            public int IntProperty { get; set; }
+
+            [FromHeader]
+            public int? NullableIntProperty { get; set; }
+
+            [FromHeader]
+            public long? NullableLongProperty { get; set; }
+
+            [FromHeader]
+            public string[] ArrayOfString { get; set; }
+
+            [FromHeader(Name = "EnumerableOfDouble")]
+            public IEnumerable<double> EnumerableOfDoubleProperty { get; set; }
+
+            [FromHeader]
+            public List<CarType> ListOfEnum { get; set; }
+
+            [FromHeader(Name = "ListOfOrderWithTypeConverter")]
+            public List<OrderWithTypeConverter> ListOfOrderWithTypeConverterProperty { get; set; }
+        }
+
+        private enum CarType
+        {
+            Coupe,
+            Sedan
+        }
+
+        [TypeConverter(typeof(CanConvertFromStringConverter))]
+        private class OrderWithTypeConverter : IEquatable<OrderWithTypeConverter>
+        {
+            public int Id { get; set; }
+
+            public int ItemCount { get; set; }
+
+            public bool Equals(OrderWithTypeConverter other)
+            {
+                return Id == other.Id;
+            }
+        }
+
+        private class CanConvertFromStringConverter : TypeConverter
+        {
+            public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+            {
+                return sourceType == typeof(string);
+            }
+
+            public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+            {
+                var id = value.ToString();
+                return new OrderWithTypeConverter() { Id = int.Parse(id) };
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/JQueryFormatModelBindingIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/JQueryFormatModelBindingIntegrationTest.cs
new file mode 100644
index 0000000000..9376c85e92
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/JQueryFormatModelBindingIntegrationTest.cs
@@ -0,0 +1,114 @@
+// 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.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class JQueryFormatModelBindingIntegrationTest
+    {
+        [Fact]
+        public async Task BindsJQueryFormatData_FromQuery()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Customer)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.QueryString = new QueryString(
+                        "?Name=James&Address[0][City]=Redmond&Address[0][State][ShortName]=WA&Address[0][State][LongName]=Washington");
+                },
+                options =>
+                {
+                    options.ValueProviderFactories.Add(new JQueryQueryStringValueProviderFactory());
+                });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Customer>(modelBindingResult.Model);
+            Assert.Equal("James", model.Name);
+            Assert.NotNull(model.Address);
+            var address = Assert.Single(model.Address);
+            Assert.Equal("Redmond", address.City);
+            Assert.NotNull(address.State);
+            Assert.Equal("WA", address.State.ShortName);
+            Assert.Equal("Washington", address.State.LongName);
+            Assert.True(modelState.IsValid);
+        }
+
+        [Fact]
+        public async Task BindsJQueryFormatData_FromRequestBody()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Customer)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.Body = new MemoryStream(Encoding.UTF8.GetBytes(
+                        "Name=James&Address[0][City]=Redmond&Address[0][State][ShortName]=WA&Address[0][State][LongName]=Washington"));
+                    request.ContentType = "application/x-www-form-urlencoded;charset=utf-8";
+                });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Customer>(modelBindingResult.Model);
+            Assert.Equal("James", model.Name);
+            Assert.NotNull(model.Address);
+            var address = Assert.Single(model.Address);
+            Assert.Equal("Redmond", address.City);
+            Assert.NotNull(address.State);
+            Assert.Equal("WA", address.State.ShortName);
+            Assert.Equal("Washington", address.State.LongName);
+            Assert.True(modelState.IsValid);
+        }
+
+        private class Customer
+        {
+            public string Name { get; set; }
+            public List<Address> Address { get; set; }
+        }
+
+        private class Address
+        {
+            public string City { get; set; }
+            public State State { get; set; }
+        }
+
+        private class State
+        {
+            public string ShortName { get; set; }
+            public string LongName { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs
new file mode 100644
index 0000000000..42b6b827f9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs
@@ -0,0 +1,552 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    // Integration tests targeting the behavior of the KeyValuePairModelBinder with other model binders.
+    public class KeyValuePairModelBinderIntegrationTest
+    {
+        [Fact]
+        public async Task KeyValuePairModelBinder_BindsKeyValuePairOfSimpleType_WithPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(KeyValuePair<string, int>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Key=key0&parameter.Value=10");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<KeyValuePair<string, int>>(modelBindingResult.Model);
+            Assert.Equal(new KeyValuePair<string, int>("key0", 10), model);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "parameter.Key").Value;
+            Assert.Equal("key0", entry.AttemptedValue);
+            Assert.Equal("key0", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "parameter.Value").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task KeyValuePairModelBinder_SimpleTypes_WithNoKey_AddsError()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter",
+                ParameterType = typeof(KeyValuePair<string, int>)
+            };
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Value=10");
+            });
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.False(modelBindingResult.IsModelSet);
+            Assert.Equal(2, modelState.Count);
+
+            Assert.False(modelState.IsValid);
+            Assert.Equal(1, modelState.ErrorCount);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "parameter.Key").Value;
+            var error = Assert.Single(entry.Errors);
+            Assert.Null(error.Exception);
+            Assert.Equal("A value is required.", error.ErrorMessage);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "parameter.Value").Value;
+            Assert.Empty(entry.Errors);
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task KeyValuePairModelBinder_SimpleTypes_WithNoKey_AndCustomizedMessage_AddsGivenMessage()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider
+                .ForType(typeof(KeyValuePair<string, int>))
+                .BindingDetails((System.Action<ModelBinding.Metadata.BindingMetadata>)(binding =>
+                {
+                    // A real details provider could customize message based on BindingMetadataProviderContext.
+                    binding.ModelBindingMessageProvider.SetMissingKeyOrValueAccessor(
+                        () => $"Hurts when nothing is provided.");
+                }));
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.QueryString = new QueryString("?parameter.Value=10");
+                },
+                metadataProvider: metadataProvider);
+
+            var modelState = testContext.ModelState;
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter",
+                ParameterType = typeof(KeyValuePair<string, int>)
+            };
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.False(modelBindingResult.IsModelSet);
+            Assert.Equal(2, modelState.Count);
+
+            Assert.False(modelState.IsValid);
+            Assert.Equal(1, modelState.ErrorCount);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "parameter.Key").Value;
+            var error = Assert.Single(entry.Errors);
+            Assert.Null(error.Exception);
+            Assert.Equal("Hurts when nothing is provided.", error.ErrorMessage);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "parameter.Value").Value;
+            Assert.Empty(entry.Errors);
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task KeyValuePairModelBinder_SimpleTypes_WithNoValue_AddsError()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter",
+                ParameterType = typeof(KeyValuePair<string, int>)
+            };
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Key=10");
+            });
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.False(modelBindingResult.IsModelSet);
+            Assert.Equal(2, modelState.Count);
+
+            Assert.False(modelState.IsValid);
+            Assert.Equal(1, modelState.ErrorCount);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "parameter.Key").Value;
+            Assert.Empty(entry.Errors);
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "parameter.Value").Value;
+            var error = Assert.Single(entry.Errors);
+            Assert.Null(error.Exception);
+            Assert.Equal("A value is required.", error.ErrorMessage);
+        }
+
+        [Fact]
+        public async Task KeyValuePairModelBinder_SimpleTypes_WithNoValue_AndCustomizedMessage_AddsGivenMessage()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider
+                .ForType(typeof(KeyValuePair<string, int>))
+                .BindingDetails((System.Action<ModelBinding.Metadata.BindingMetadata>)(binding =>
+                {
+                    // A real details provider could customize message based on BindingMetadataProviderContext.
+                    binding.ModelBindingMessageProvider.SetMissingKeyOrValueAccessor(
+                        () => $"Hurts when nothing is provided.");
+                }));
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.QueryString = new QueryString("?parameter.Key=10");
+                },
+                metadataProvider: metadataProvider);
+
+            var modelState = testContext.ModelState;
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter",
+                ParameterType = typeof(KeyValuePair<string, int>)
+            };
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.False(modelBindingResult.IsModelSet);
+            Assert.Equal(2, modelState.Count);
+
+            Assert.False(modelState.IsValid);
+            Assert.Equal(1, modelState.ErrorCount);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "parameter.Key").Value;
+            Assert.Empty(entry.Errors);
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "parameter.Value").Value;
+            var error = Assert.Single(entry.Errors);
+            Assert.Null(error.Exception);
+            Assert.Equal("Hurts when nothing is provided.", error.ErrorMessage);
+        }
+
+        [Fact]
+        public async Task KeyValuePairModelBinder_BindsKeyValuePairOfSimpleType_WithExplicitPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "prefix",
+                },
+                ParameterType = typeof(KeyValuePair<string, int>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?prefix.Key=key0&prefix.Value=10");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<KeyValuePair<string, int>>(modelBindingResult.Model);
+            Assert.Equal(new KeyValuePair<string, int>("key0", 10), model);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "prefix.Key").Value;
+            Assert.Equal("key0", entry.AttemptedValue);
+            Assert.Equal("key0", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "prefix.Value").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task KeyValuePairModelBinder_BindsKeyValuePairOfSimpleType_EmptyPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(KeyValuePair<string, int>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?Key=key0&Value=10");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<KeyValuePair<string, int>>(modelBindingResult.Model);
+            Assert.Equal(new KeyValuePair<string, int>("key0", 10), model);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "Key").Value;
+            Assert.Equal("key0", entry.AttemptedValue);
+            Assert.Equal("key0", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "Value").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task KeyValuePairModelBinder_BindsKeyValuePairOfSimpleType_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(KeyValuePair<string, int>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            Assert.Equal(new KeyValuePair<string, int>(), modelBindingResult.Model);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        private class Person
+        {
+            public int Id { get; set; }
+        }
+
+        [Fact]
+        public async Task KeyValuePairModelBinder_BindsKeyValuePairOfComplexType_WithPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(KeyValuePair<string, Person>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Key=key0&parameter.Value.Id=10");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<KeyValuePair<string, Person>>(modelBindingResult.Model);
+            Assert.Equal("key0", model.Key);
+            Assert.Equal(10, model.Value.Id);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "parameter.Key").Value;
+            Assert.Equal("key0", entry.AttemptedValue);
+            Assert.Equal("key0", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "parameter.Value.Id").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task KeyValuePairModelBinder_BindsKeyValuePairOfComplexType_WithExplicitPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "prefix",
+                },
+                ParameterType = typeof(KeyValuePair<string, Person>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?prefix.Key=key0&prefix.Value.Id=10");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<KeyValuePair<string, Person>>(modelBindingResult.Model);
+            Assert.Equal("key0", model.Key);
+            Assert.Equal(10, model.Value.Id);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "prefix.Key").Value;
+            Assert.Equal("key0", entry.AttemptedValue);
+            Assert.Equal("key0", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "prefix.Value.Id").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task KeyValuePairModelBinder_BindsKeyValuePairOfComplexType_EmptyPrefix_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(KeyValuePair<string, Person>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?Key=key0&Value.Id=10");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<KeyValuePair<string, Person>>(modelBindingResult.Model);
+            Assert.Equal("key0", model.Key);
+            Assert.Equal(10, model.Value.Id);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "Key").Value;
+            Assert.Equal("key0", entry.AttemptedValue);
+            Assert.Equal("key0", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "Value.Id").Value;
+            Assert.Equal("10", entry.AttemptedValue);
+            Assert.Equal("10", entry.RawValue);
+        }
+
+        [Fact]
+        public async Task KeyValuePairModelBinder_BindsKeyValuePairOfComplexType_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(KeyValuePair<string, Person>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            Assert.Equal(new KeyValuePair<string, Person>(), modelBindingResult.Model);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        [Fact]
+        public async Task KeyValuePairModelBinder_BindsKeyValuePairOfArray_Success()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "p",
+                ParameterType = typeof(KeyValuePair<string, string[]>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?p.Key=key1&p.Value[0]=value1&p.Value[1]=value2");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var model = Assert.IsType<KeyValuePair<string, string[]>>(modelBindingResult.Model);
+            Assert.Equal("key1", model.Key);
+            Assert.Equal(new[] { "value1", "value2" }, model.Value);
+
+            Assert.Equal(3, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "p.Key").Value;
+            Assert.Equal("key1", entry.AttemptedValue);
+            Assert.Equal("key1", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "p.Value[0]").Value;
+            Assert.Equal("value1", entry.AttemptedValue);
+            Assert.Equal("value1", entry.RawValue);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "p.Value[1]").Value;
+            Assert.Equal("value2", entry.AttemptedValue);
+            Assert.Equal("value2", entry.RawValue);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj
new file mode 100644
index 0000000000..8e52e2a34f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(MicrosoftAspNetCoreHttpPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelBindingTestContext.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelBindingTestContext.cs
new file mode 100644
index 0000000000..4cf87f2300
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelBindingTestContext.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class ModelBindingTestContext : ControllerContext
+    {
+        public IModelMetadataProvider MetadataProvider { get; set; }
+
+        public MvcOptions MvcOptions { get; set; }
+
+        public T GetService<T>()
+        {
+            return (T)HttpContext.RequestServices.GetService(typeof(T));
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelBindingTestHelper.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelBindingTestHelper.cs
new file mode 100644
index 0000000000..6aa9da7cf0
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelBindingTestHelper.cs
@@ -0,0 +1,215 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.ObjectPool;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public static class ModelBindingTestHelper
+    {
+        public static ModelBindingTestContext GetTestContext(
+            Action<HttpRequest> updateRequest = null,
+            Action<MvcOptions> updateOptions = null,
+            ControllerActionDescriptor actionDescriptor = null,
+            IModelMetadataProvider metadataProvider = null,
+            MvcOptions mvcOptions = null)
+        {
+            var httpContext = GetHttpContext(metadataProvider, updateRequest, updateOptions, mvcOptions);
+            var services = httpContext.RequestServices;
+            metadataProvider = metadataProvider ?? services.GetRequiredService<IModelMetadataProvider>();
+            var options = services.GetRequiredService<IOptions<MvcOptions>>();
+
+            var context = new ModelBindingTestContext
+            {
+                ActionDescriptor = actionDescriptor ?? new ControllerActionDescriptor(),
+                HttpContext = httpContext,
+                MetadataProvider = metadataProvider,
+                MvcOptions = options.Value,
+                RouteData = new RouteData(),
+                ValueProviderFactories = new List<IValueProviderFactory>(options.Value.ValueProviderFactories),
+            };
+
+            return context;
+        }
+
+        public static ParameterBinder GetParameterBinder(
+            MvcOptions options = null,
+            IModelBinderProvider binderProvider = null)
+        {
+            if (options == null)
+            {
+                var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+                return GetParameterBinder(metadataProvider, binderProvider);
+            }
+            else
+            {
+                var metadataProvider = TestModelMetadataProvider.CreateProvider(options.ModelMetadataDetailsProviders);
+                return GetParameterBinder(metadataProvider, binderProvider, options);
+            }
+        }
+
+        public static ParameterBinder GetParameterBinder(IServiceProvider serviceProvider)
+        {
+            var metadataProvider = serviceProvider.GetRequiredService<IModelMetadataProvider>();
+            var options = serviceProvider.GetRequiredService<IOptions<MvcOptions>>();
+
+            return new ParameterBinder(
+                metadataProvider,
+                new ModelBinderFactory(metadataProvider, options, serviceProvider),
+                new DefaultObjectValidator(
+                    metadataProvider,
+                    new[] { new CompositeModelValidatorProvider(GetModelValidatorProviders(options)) }),
+                options,
+                NullLoggerFactory.Instance);
+        }
+
+        public static ParameterBinder GetParameterBinder(
+            IModelMetadataProvider metadataProvider,
+            IModelBinderProvider binderProvider = null,
+            MvcOptions mvcOptions = null)
+        {
+            var services = GetServices(metadataProvider, mvcOptions: mvcOptions);
+            var options = services.GetRequiredService<IOptions<MvcOptions>>();
+
+            if (binderProvider != null)
+            {
+                options.Value.ModelBinderProviders.Insert(0, binderProvider);
+            }
+
+            return new ParameterBinder(
+                metadataProvider,
+                new ModelBinderFactory(metadataProvider, options, services),
+                new DefaultObjectValidator(
+                    metadataProvider,
+                    new[] { new CompositeModelValidatorProvider(GetModelValidatorProviders(options)) }),
+                options,
+                NullLoggerFactory.Instance);
+        }
+
+        public static IModelBinderFactory GetModelBinderFactory(
+            IModelMetadataProvider metadataProvider,
+            IServiceProvider services = null)
+        {
+            if (services == null)
+            {
+                services = GetServices(metadataProvider);
+            }
+
+            var options = services.GetRequiredService<IOptions<MvcOptions>>();
+
+            return new ModelBinderFactory(metadataProvider, options, services);
+        }
+
+        public static IObjectModelValidator GetObjectValidator(
+            IModelMetadataProvider metadataProvider,
+            IOptions<MvcOptions> options = null)
+        {
+            return new DefaultObjectValidator(
+                metadataProvider,
+                GetModelValidatorProviders(options));
+        }
+
+        private static IList<IModelValidatorProvider> GetModelValidatorProviders(IOptions<MvcOptions> options)
+        {
+            if (options == null)
+            {
+                return TestModelValidatorProvider.CreateDefaultProvider().ValidatorProviders;
+            }
+            else
+            {
+                return options.Value.ModelValidatorProviders;
+            }
+        }
+
+        private static HttpContext GetHttpContext(
+            IModelMetadataProvider metadataProvider,
+            Action<HttpRequest> updateRequest = null,
+            Action<MvcOptions> updateOptions = null,
+            MvcOptions mvcOptions = null)
+        {
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<IHttpRequestLifetimeFeature>(new CancellableRequestLifetimeFeature());
+
+            updateRequest?.Invoke(httpContext.Request);
+
+            httpContext.RequestServices = GetServices(metadataProvider, updateOptions, mvcOptions);
+            return httpContext;
+        }
+
+        public static IServiceProvider GetServices(
+            IModelMetadataProvider metadataProvider,
+            Action<MvcOptions> updateOptions = null,
+            MvcOptions mvcOptions = null)
+        {
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddSingleton(new ApplicationPartManager());
+            if (metadataProvider != null)
+            {
+                serviceCollection.AddSingleton(metadataProvider);
+            }
+            else if (updateOptions != null || mvcOptions != null)
+            {
+                serviceCollection.AddSingleton(services =>
+                {
+                    var optionsAccessor = services.GetRequiredService<IOptions<MvcOptions>>();
+                    return TestModelMetadataProvider.CreateProvider(optionsAccessor.Value.ModelMetadataDetailsProviders);
+                });
+            }
+            else
+            {
+                serviceCollection.AddSingleton<IModelMetadataProvider>(services =>
+                {
+                    return TestModelMetadataProvider.CreateDefaultProvider();
+                });
+            }
+
+            if (mvcOptions != null)
+            {
+                serviceCollection.AddSingleton(Options.Create(mvcOptions));
+            }
+
+            serviceCollection
+                .AddMvc()
+                .SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+            serviceCollection
+                .AddSingleton<ObjectPoolProvider, DefaultObjectPoolProvider>()
+                .AddTransient<ILoggerFactory, LoggerFactory>()
+                .AddTransient<ILogger<DefaultAuthorizationService>, Logger<DefaultAuthorizationService>>();
+
+            if (updateOptions != null)
+            {
+                serviceCollection.Configure(updateOptions);
+            }
+
+            return serviceCollection.BuildServiceProvider();
+        }
+
+        private class CancellableRequestLifetimeFeature : IHttpRequestLifetimeFeature
+        {
+            private readonly CancellationTokenSource _cts = new CancellationTokenSource();
+
+            public CancellationToken RequestAborted { get => _cts.Token; set => throw new NotImplementedException(); }
+
+            public void Abort()
+            {
+                _cts.Cancel();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelPrefixSelectionIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelPrefixSelectionIntegrationTest.cs
new file mode 100644
index 0000000000..7a03494307
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelPrefixSelectionIntegrationTest.cs
@@ -0,0 +1,246 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    // Integration tests for the decision logic about how a model-name/prefix is selected at the top-level
+    // of ModelBinding.
+    public class ModelPrefixSelectionIntegrationTest
+    {
+        private class Person1
+        {
+            [FromForm]
+            public string Name { get; set; }
+        }
+
+        [Fact]
+        public async Task ComplexModel_PrefixSelected_ByValueProvider()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Person1),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                // This will cause selection of the "parameter" prefix.
+                request.QueryString = new QueryString("?parameter=");
+
+                // This value won't be used, because we select the "parameter" prefix.
+                request.Form = new FormCollection(new Dictionary<string, StringValues>()
+                {
+                    { "Name", "Billy" },
+                });
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Person1>(modelBindingResult.Model);
+            Assert.Null(model.Name);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        private class Person2
+        {
+            [FromForm]
+            public string Name { get; set; }
+        }
+
+        [Fact]
+        public async Task ComplexModel_PrefixSelected_ByValueProviderValue_WithFilteredValueProviders()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Person2),
+                BindingInfo = new BindingInfo()
+                {
+                    BindingSource = BindingSource.Query,
+                },
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                // This will cause selection of the "parameter" prefix.
+                request.QueryString = new QueryString("?parameter=");
+
+                // This value won't be used, because we select the "parameter" prefix.
+                request.Form = new FormCollection(new Dictionary<string, StringValues>()
+                {
+                    { "Name", "Billy" },
+                });
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Person2>(modelBindingResult.Model);
+            Assert.Null(model.Name);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        private class Person3
+        {
+            [FromForm]
+            public string Name { get; set; }
+        }
+
+        [Fact]
+        public async Task ComplexModel_EmptyPrefixSelected_NoMatchingValueProviderValue()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Person3),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                // This can't be used because of [FromForm] on the property.
+                request.QueryString = new QueryString("?Name=");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Person3>(modelBindingResult.Model);
+            Assert.Null(model.Name);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        private class Person4
+        {
+            [FromForm]
+            public string Name { get; set; }
+        }
+
+        [Fact]
+        public async Task ComplexModel_EmptyPrefixSelected_NoMatchingValueProviderValue_WithFilteredValueProviders()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Person4),
+                BindingInfo = new BindingInfo()
+                {
+                    BindingSource = BindingSource.Query,
+                },
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                // This will only match empty prefix, but can't be used because of [FromForm] on the property.
+                request.QueryString = new QueryString("?Name=");
+
+                // This value won't be used to select a prefix, because we're only looking at the query string.
+                request.Form = new FormCollection(new Dictionary<string, StringValues>()
+                {
+                    { "parameter", string.Empty },
+                });
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Person4>(modelBindingResult.Model);
+            Assert.Null(model.Name);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        private class Person5
+        {
+            [FromForm]
+            public string Name { get; set; }
+        }
+
+        [Fact]
+        public async Task ComplexModel_EmptyPrefixSelected_NoMatchingValueProviderValue_WithFilteredValueProviders_NoValues()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Person5),
+                BindingInfo = new BindingInfo()
+                {
+                    BindingSource = BindingSource.Query,
+                },
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                // This value won't be used to select a prefix, because we're only looking at the query string.
+                request.Form = new FormCollection(new Dictionary<string, StringValues>()
+                {
+                    { "parameter", string.Empty },
+                });
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Person5>(modelBindingResult.Model);
+            Assert.Null(model.Name);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/Product.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/Product.cs
new file mode 100644
index 0000000000..b7c9656464
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/Product.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    [ProductValidator]
+    public class Product
+    {
+        public string Name { get; set; }
+
+        [StringLength(20)]
+        [RegularExpression("^[0-9]*$")]
+        [Display(Name = "Contact Us")]
+        public string Contact { get; set; }
+
+        [Range(0, 100)]
+        public virtual int Price { get; set; }
+
+        [CompanyName]
+        public string CompanyName { get; set; }
+
+        public string Country { get; set; }
+
+        [Required]
+        public ProductDetails ProductDetails { get; set; }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/ProductDetails.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/ProductDetails.cs
new file mode 100644
index 0000000000..70afdb0ea6
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/ProductDetails.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class ProductDetails
+    {
+        [Required]
+        public string Detail1 { get; set; }
+
+        [Required]
+        public string Detail2 { get; set; }
+
+        [Required]
+        public string Detail3 { get; set; }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/ProductViewModel.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/ProductViewModel.cs
new file mode 100644
index 0000000000..0113f7fcf2
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/ProductViewModel.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    [ModelMetadataType(typeof(Product))]
+    public class ProductViewModel
+    {
+        public string Name { get; set; }
+
+        [Required]
+        public string Contact { get; set; }
+
+        [Range(20, 100)]
+        public int Price { get; set; }
+
+        [RegularExpression("^[a-zA-Z]*$")]
+        [Required]
+        public string Category { get; set; }
+
+        public string CompanyName { get; set; }
+
+        public string Country { get; set; }
+
+        public ProductDetails ProductDetails { get; set; }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/Software.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/Software.cs
new file mode 100644
index 0000000000..7f98162d48
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/Software.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class Software : Product
+    {
+        public string Version { get; set; }
+
+        [Required]
+        public DateTime DatePurchased { get; set; }
+
+        [Range(100, 200)]
+        public override int Price { get; set; }
+
+        [StringLength(10)]
+        public new string Contact { get; set; }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/SoftwareViewModel.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/SoftwareViewModel.cs
new file mode 100644
index 0000000000..0cb821a8c4
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/SoftwareViewModel.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    [ModelMetadataType(typeof(Software))]
+    public class SoftwareViewModel
+    {
+        [RegularExpression("^[0-9]*$")]
+        public string Version { get; set; }
+
+        public DateTime DatePurchased { get; set; }
+
+        public int Price { get; set; }
+
+        public string Contact { get; set; }
+
+        public string Country { get; set; }
+
+        public string Name { get; set; }
+
+        public string Category { get; set; }
+
+        public string CompanyName { get; set; }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ParameterBinderExtensions.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ParameterBinderExtensions.cs
new file mode 100644
index 0000000000..2cf116e039
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ParameterBinderExtensions.cs
@@ -0,0 +1,86 @@
+// 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.
+
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public static class ParameterBinderExtensions
+    {
+        public static Task<ModelBindingResult> BindModelAsync(
+            this ParameterBinder parameterBinder,
+            ParameterDescriptor parameter,
+            ControllerContext context)
+        {
+            var optionsAccessor = context.HttpContext.RequestServices.GetService<IOptions<MvcOptions>>();
+            Assert.NotNull(optionsAccessor?.Value); // Guard
+            var modelMetadataProvider = context.HttpContext.RequestServices.GetService<IModelMetadataProvider>();
+            Assert.NotNull(modelMetadataProvider); // Guard
+
+            // Imitate a bit of ControllerBinderDelegateProvider and PageBinderFactory
+            ParameterInfo parameterInfo;
+            if (parameter is ControllerParameterDescriptor controllerParameterDescriptor)
+            {
+                parameterInfo = controllerParameterDescriptor.ParameterInfo;
+            }
+            else if (parameter is HandlerParameterDescriptor handlerParameterDescriptor)
+            {
+                parameterInfo = handlerParameterDescriptor.ParameterInfo;
+            }
+            else
+            {
+                parameterInfo = null;
+            }
+
+            ModelMetadata metadata;
+            if (optionsAccessor.Value.AllowValidatingTopLevelNodes &&
+                modelMetadataProvider is ModelMetadataProvider modelMetadataProviderBase &&
+                parameterInfo != null)
+            {
+                metadata = modelMetadataProviderBase.GetMetadataForParameter(parameterInfo);
+            }
+            else
+            {
+                metadata = modelMetadataProvider.GetMetadataForType(parameter.ParameterType);
+            }
+
+            return parameterBinder.BindModelAsync(parameter, context, modelMetadataProvider, metadata);
+        }
+
+        public static async Task<ModelBindingResult> BindModelAsync(
+            this ParameterBinder parameterBinder,
+            ParameterDescriptor parameter,
+            ControllerContext context,
+            IModelMetadataProvider modelMetadataProvider,
+            ModelMetadata modelMetadata)
+        {
+            var valueProvider = await CompositeValueProvider.CreateAsync(context);
+            var modelBinderFactory = ModelBindingTestHelper.GetModelBinderFactory(
+                modelMetadataProvider,
+                context.HttpContext.RequestServices);
+
+            var modelBinder = modelBinderFactory.CreateBinder(new ModelBinderFactoryContext
+            {
+                BindingInfo = parameter.BindingInfo,
+                Metadata = modelMetadata,
+                CacheToken = parameter,
+            });
+
+            return await parameterBinder.BindModelAsync(
+                context,
+                modelBinder,
+                valueProvider,
+                parameter,
+                modelMetadata,
+                value: null);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ProductValidatorAttribute.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ProductValidatorAttribute.cs
new file mode 100644
index 0000000000..6c6b658853
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ProductValidatorAttribute.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class ProductValidatorAttribute : ValidationAttribute
+    {
+        protected override ValidationResult IsValid(object value, ValidationContext validationContext)
+        {
+            var product = value as ProductViewModel;
+            if (product != null)
+            {
+                if (!product.Country.Equals("USA") || string.IsNullOrEmpty(product.Name))
+                {
+                    return new ValidationResult("Product must be made in the USA if it is not named.");
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            var software = value as SoftwareViewModel;
+            if (software != null)
+            {
+                if (!software.Country.Equals("USA") || string.IsNullOrEmpty(software.Name))
+                {
+                    return new ValidationResult("Product must be made in the USA if it is not named.");
+                }
+                else
+                {
+                    return null;
+                }
+            }
+
+            return new ValidationResult("Expected either ProductViewModel or SoftwareViewModel instance but got "
+                + value.GetType() + " instance");
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ServicesModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ServicesModelBinderIntegrationTest.cs
new file mode 100644
index 0000000000..1ea4cbf95b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ServicesModelBinderIntegrationTest.cs
@@ -0,0 +1,267 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class ServicesModelBinderIntegrationTest
+    {
+        [Fact]
+        public async Task BindParameterFromService_WithData_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "CustomParameter",
+                    BindingSource = BindingSource.Services
+                },
+
+                // Using a service type already in defaults.
+                ParameterType = typeof(JsonOutputFormatter)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var outputFormatter = Assert.IsType<JsonOutputFormatter>(modelBindingResult.Model);
+            Assert.NotNull(outputFormatter);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState.Keys);
+        }
+
+        [Fact]
+        public async Task BindParameterFromService_NoPrefix_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "ControllerProperty",
+                BindingInfo = new BindingInfo
+                {
+                    BindingSource = BindingSource.Services,
+                },
+
+                // Use a service type already in defaults.
+                ParameterType = typeof(JsonOutputFormatter),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var outputFormatter = Assert.IsType<JsonOutputFormatter>(modelBindingResult.Model);
+            Assert.NotNull(outputFormatter);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+
+        [Fact]
+        public async Task BindEnumerableParameterFromService_NoPrefix_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "ControllerProperty",
+                BindingInfo = new BindingInfo
+                {
+                    BindingSource = BindingSource.Services,
+                },
+
+                // Use a service type already in defaults.
+                ParameterType = typeof(IEnumerable<JsonOutputFormatter>),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var formatterArray = Assert.IsType<JsonOutputFormatter[]>(modelBindingResult.Model);
+            Assert.Single(formatterArray);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+
+        [Fact]
+        public async Task BindEnumerableParameterFromService_NoService_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "ControllerProperty",
+                BindingInfo = new BindingInfo
+                {
+                    BindingSource = BindingSource.Services,
+                },
+
+                // Use a service type not available in DI.
+                ParameterType = typeof(IEnumerable<IActionResult>),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var actionResultArray = Assert.IsType<IActionResult[]>(modelBindingResult.Model);
+            Assert.Empty(actionResultArray);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+
+        [Fact]
+        public async Task BindParameterFromService_NoService_Throws()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "ControllerProperty",
+                BindingInfo = new BindingInfo
+                {
+                    BindingSource = BindingSource.Services,
+                },
+
+                // Use a service type not available in DI.
+                ParameterType = typeof(IActionResult),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext();
+
+            // Act & Assert
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => parameterBinder.BindModelAsync(parameter, testContext));
+            Assert.Contains(typeof(IActionResult).FullName, exception.Message);
+        }
+
+        private class Person
+        {
+            public JsonOutputFormatter Service { get; set; }
+        }
+
+        // [FromServices] cannot be associated with a type. But a [FromServices] or [ModelBinder] subclass or custom
+        // IBindingSourceMetadata implementation might not have the same restriction. Make sure the metadata is honored
+        // when such an attribute is associated with a type somewhere in the type hierarchy of an action parameter.
+        [Theory]
+        [MemberData(
+            nameof(BinderTypeBasedModelBinderIntegrationTest.NullAndEmptyBindingInfo),
+            MemberType = typeof(BinderTypeBasedModelBinderIntegrationTest))]
+        public async Task FromServicesOnPropertyType_WithData_Succeeds(BindingInfo bindingInfo)
+        {
+            // Arrange
+            // Similar to a custom IBindingSourceMetadata implementation or [ModelBinder] subclass on a custom service.
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider
+                .ForProperty<Person>(nameof(Person.Service))
+                .BindingDetails(binding => binding.BindingSource = BindingSource.Services);
+
+            var testContext = ModelBindingTestHelper.GetTestContext(metadataProvider: metadataProvider);
+            var modelState = testContext.ModelState;
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter-name",
+                BindingInfo = bindingInfo,
+                ParameterType = typeof(Person),
+            };
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            var person = Assert.IsType<Person>(modelBindingResult.Model);
+            Assert.NotNull(person.Service);
+
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+
+        // [FromServices] cannot be associated with a type. But a [FromServices] or [ModelBinder] subclass or custom
+        // IBindingSourceMetadata implementation might not have the same restriction. Make sure the metadata is honored
+        // when such an attribute is associated with an action parameter's type.
+        [Theory]
+        [MemberData(
+            nameof(BinderTypeBasedModelBinderIntegrationTest.NullAndEmptyBindingInfo),
+            MemberType = typeof(BinderTypeBasedModelBinderIntegrationTest))]
+        public async Task FromServicesOnParameterType_WithData_Succeeds(BindingInfo bindingInfo)
+        {
+            // Arrange
+            // Similar to a custom IBindingSourceMetadata implementation or [ModelBinder] subclass on a custom service.
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider
+                .ForType<JsonOutputFormatter>()
+                .BindingDetails(binding => binding.BindingSource = BindingSource.Services);
+
+            var testContext = ModelBindingTestHelper.GetTestContext(metadataProvider: metadataProvider);
+            var modelState = testContext.ModelState;
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter-name",
+                BindingInfo = bindingInfo,
+                ParameterType = typeof(JsonOutputFormatter),
+            };
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            Assert.IsType<JsonOutputFormatter>(modelBindingResult.Model);
+
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs
new file mode 100644
index 0000000000..420939c66b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs
@@ -0,0 +1,602 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class SimpleTypeModelBinderIntegrationTest
+    {
+        [Fact]
+        public async Task BindProperty_WithData_WithPrefix_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo()
+                {
+                    BinderModelName = "CustomParameter",
+                },
+
+                ParameterType = typeof(Person)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("CustomParameter.Address.Zip", "1");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var boundPerson = Assert.IsType<Person>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson);
+            Assert.NotNull(boundPerson.Address);
+            Assert.Equal(1, boundPerson.Address.Zip);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            Assert.Single(modelState.Keys);
+            var key = Assert.Single(modelState.Keys, k => k == "CustomParameter.Address.Zip");
+            Assert.Equal("1", modelState[key].AttemptedValue);
+            Assert.Equal("1", modelState[key].RawValue);
+            Assert.Empty(modelState[key].Errors);
+            Assert.Equal(ModelValidationState.Valid, modelState[key].ValidationState);
+        }
+
+        [Fact]
+        public async Task BindProperty_WithData_WithEmptyPrefix_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+                ParameterType = typeof(Person)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Address.Zip", "1");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var boundPerson = Assert.IsType<Person>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson);
+            Assert.NotNull(boundPerson.Address);
+            Assert.Equal(1, boundPerson.Address.Zip);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            Assert.Single(modelState.Keys);
+            var key = Assert.Single(modelState.Keys, k => k == "Address.Zip");
+            Assert.Equal("1", modelState[key].AttemptedValue);
+            Assert.Equal("1", modelState[key].RawValue);
+            Assert.Empty(modelState[key].Errors);
+            Assert.Equal(ModelValidationState.Valid, modelState[key].ValidationState);
+        }
+
+        [Fact]
+        public async Task BindParameter_WithData_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+
+                ParameterType = typeof(string)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Parameter1", "someValue");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var model = Assert.IsType<string>(modelBindingResult.Model);
+            Assert.Equal("someValue", model);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            Assert.Single(modelState.Keys);
+            var key = Assert.Single(modelState.Keys);
+            Assert.Equal("Parameter1", key);
+            Assert.Equal("someValue", modelState[key].AttemptedValue);
+            Assert.Equal("someValue", modelState[key].RawValue);
+            Assert.Empty(modelState[key].Errors);
+            Assert.Equal(ModelValidationState.Valid, modelState[key].ValidationState);
+        }
+
+        [Fact]
+        [ReplaceCulture("en-GB", "en-GB")]
+        public async Task BindDecimalParameter_WithData_GetsBound()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+                ParameterType = typeof(decimal),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Parameter1", "32,000.99");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var model = Assert.IsType<decimal>(modelBindingResult.Model);
+            Assert.Equal(32000.99M, model);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            Assert.Single(modelState.Keys);
+            var key = Assert.Single(modelState.Keys);
+            Assert.Equal("Parameter1", key);
+            Assert.Equal("32,000.99", modelState[key].AttemptedValue);
+            Assert.Equal("32,000.99", modelState[key].RawValue);
+            Assert.Empty(modelState[key].Errors);
+            Assert.Equal(ModelValidationState.Valid, modelState[key].ValidationState);
+        }
+
+        [Fact]
+        public async Task BindParameter_WithMultipleValues_GetsBoundToFirstValue()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+
+                ParameterType = typeof(string)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?Parameter1=someValue&Parameter1=otherValue");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var model = Assert.IsType<string>(modelBindingResult.Model);
+            Assert.Equal("someValue", model);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            Assert.Single(modelState.Keys);
+            var key = Assert.Single(modelState.Keys);
+            Assert.Equal("Parameter1", key);
+            Assert.Equal("someValue,otherValue", modelState[key].AttemptedValue);
+            Assert.Equal(new string[] { "someValue", "otherValue" }, modelState[key].RawValue);
+            Assert.Empty(modelState[key].Errors);
+            Assert.Equal(ModelValidationState.Valid, modelState[key].ValidationState);
+        }
+
+        [Fact]
+        public async Task BindParameter_NonConvertableValue_GetsError()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+
+                ParameterType = typeof(int)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Parameter1", "abcd");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.False(modelBindingResult.IsModelSet);
+
+            // Model
+            Assert.Null(modelBindingResult.Model);
+
+            // ModelState
+            Assert.False(modelState.IsValid);
+            Assert.Single(modelState);
+            Assert.Equal(1, modelState.ErrorCount);
+
+            var key = Assert.Single(modelState.Keys);
+            Assert.Equal("Parameter1", key);
+
+            var entry = modelState[key];
+            Assert.Equal("abcd", entry.RawValue);
+            Assert.Equal("abcd", entry.AttemptedValue);
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+
+            var error = Assert.Single(entry.Errors);
+            Assert.Null(error.Exception);
+            Assert.Equal("The value 'abcd' is not valid.", error.ErrorMessage);
+        }
+
+        [Fact]
+        public async Task BindParameter_NonConvertableValue_GetsCustomErrorMessage()
+        {
+            // Arrange
+            var parameterType = typeof(int);
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider
+                .ForType(parameterType)
+                .BindingDetails(binding =>
+                {
+                    // A real details provider could customize message based on BindingMetadataProviderContext.
+                    binding.ModelBindingMessageProvider.SetNonPropertyAttemptedValueIsInvalidAccessor(
+                        (value) => $"Hmm, '{ value }' is not a valid value.");
+                });
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.QueryString = QueryString.Create("Parameter1", "abcd");
+                },
+                metadataProvider: metadataProvider);
+
+            var modelState = testContext.ModelState;
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+                ParameterType = parameterType
+            };
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.False(modelBindingResult.IsModelSet);
+
+            // Model
+            Assert.Null(modelBindingResult.Model);
+
+            // ModelState
+            Assert.False(modelState.IsValid);
+            Assert.Single(modelState);
+            Assert.Equal(1, modelState.ErrorCount);
+
+            var key = Assert.Single(modelState.Keys);
+            Assert.Equal("Parameter1", key);
+
+            var entry = modelState[key];
+            Assert.Equal("abcd", entry.RawValue);
+            Assert.Equal("abcd", entry.AttemptedValue);
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+
+            var error = Assert.Single(entry.Errors);
+            Assert.Null(error.Exception);
+            Assert.Equal($"Hmm, 'abcd' is not a valid value.", error.ErrorMessage);
+        }
+
+        [Theory]
+        [InlineData(typeof(int))]
+        [InlineData(typeof(bool))]
+        public async Task BindParameter_WithEmptyData_DoesNotBind(Type parameterType)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+
+                ParameterType = parameterType
+            };
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Parameter1", "");
+            });
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.False(modelBindingResult.IsModelSet);
+
+            // Model
+            Assert.Null(modelBindingResult.Model);
+
+            // ModelState
+            Assert.False(modelState.IsValid);
+            var key = Assert.Single(modelState.Keys);
+            Assert.Equal("Parameter1", key);
+            Assert.Equal("", modelState[key].AttemptedValue);
+            Assert.Equal("", modelState[key].RawValue);
+            var error = Assert.Single(modelState[key].Errors);
+            Assert.Equal("The value '' is invalid.", error.ErrorMessage, StringComparer.Ordinal);
+            Assert.Null(error.Exception);
+        }
+
+        [Theory]
+        [InlineData(typeof(int))]
+        [InlineData(typeof(bool))]
+        public async Task BindParameter_WithEmptyData_AndPerTypeMessage_AddsGivenMessage(Type parameterType)
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider
+                .ForType(parameterType)
+                .BindingDetails(binding =>
+                {
+                    // A real details provider could customize message based on BindingMetadataProviderContext.
+                    binding.ModelBindingMessageProvider.SetValueMustNotBeNullAccessor(
+                        value => $"Hurts when '{ value }' is provided.");
+                });
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.QueryString = QueryString.Create("Parameter1", string.Empty);
+                },
+                metadataProvider: metadataProvider);
+
+            var modelState = testContext.ModelState;
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+
+                ParameterType = parameterType
+            };
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            // ModelBindingResult
+            Assert.False(modelBindingResult.IsModelSet);
+
+            // Model
+            Assert.Null(modelBindingResult.Model);
+
+            // ModelState
+            Assert.False(modelState.IsValid);
+            var key = Assert.Single(modelState.Keys);
+            Assert.Equal("Parameter1", key);
+            Assert.Equal(string.Empty, modelState[key].AttemptedValue);
+            Assert.Equal(string.Empty, modelState[key].RawValue);
+            var error = Assert.Single(modelState[key].Errors);
+            Assert.Equal("Hurts when '' is provided.", error.ErrorMessage, StringComparer.Ordinal);
+            Assert.Null(error.Exception);
+        }
+
+        [Theory]
+        [InlineData(typeof(int?))]
+        [InlineData(typeof(bool?))]
+        [InlineData(typeof(string))]
+        public async Task BindParameter_WithEmptyData_BindsReferenceAndNullableObjects(Type parameterType)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+
+                ParameterType = parameterType
+            };
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Parameter1", string.Empty);
+            });
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            Assert.Null(modelBindingResult.Model);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            var key = Assert.Single(modelState.Keys);
+            Assert.Equal("Parameter1", key);
+            Assert.Equal(string.Empty, modelState[key].AttemptedValue);
+            Assert.Equal(string.Empty, modelState[key].RawValue);
+            Assert.Empty(modelState[key].Errors);
+        }
+
+        [Fact]
+        public async Task BindParameter_NoData_Fails()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+
+                ParameterType = typeof(string)
+            };
+
+            // No Data.
+            var testContext = ModelBindingTestHelper.GetTestContext();
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+
+            // ModelBindingResult
+            Assert.Equal(ModelBindingResult.Failed(), modelBindingResult);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState.Keys);
+        }
+
+        public static TheoryData<IDictionary<string, StringValues>> PersonStoreData
+        {
+            get
+            {
+                return new TheoryData<IDictionary<string, StringValues>>
+                {
+                    new Dictionary<string, StringValues>
+                    {
+                        { "name", new[] { "Fred" } },
+                        { "address.zip", new[] { "98052" } },
+                        { "address.lines", new[] { "line 1", "line 2" } },
+                    },
+                    new Dictionary<string, StringValues>
+                    {
+                        { "address.lines[]", new[] { "line 1", "line 2" } },
+                        { "address[].zip", new[] { "98052" } },
+                        { "name[]", new[] { "Fred" } },
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(PersonStoreData))]
+        public async Task BindParameter_FromFormData_BindsCorrectly(Dictionary<string, StringValues> personStore)
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo(),
+                ParameterType = typeof(Person),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.Form = new FormCollection(personStore);
+            });
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            // ModelBindingResult
+            Assert.True(modelBindingResult.IsModelSet);
+
+            // Model
+            var boundPerson = Assert.IsType<Person>(modelBindingResult.Model);
+            Assert.NotNull(boundPerson);
+            Assert.Equal("Fred", boundPerson.Name);
+            Assert.NotNull(boundPerson.Address);
+            Assert.Equal(new[] { "line 1", "line 2" }, boundPerson.Address.Lines);
+            Assert.Equal(98052, boundPerson.Address.Zip);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            Assert.Equal(new[] { "Address.Lines", "Address.Zip", "Name" }, modelState.Keys.OrderBy(p => p).ToArray());
+            var entry = modelState["Address.Lines"];
+            Assert.NotNull(entry);
+            Assert.Empty(entry.Errors);
+            Assert.Equal(ModelValidationState.Valid, entry.ValidationState);
+            Assert.Equal("line 1,line 2", entry.AttemptedValue);
+            Assert.Equal(new[] { "line 1", "line 2" }, entry.RawValue);
+        }
+
+        private class Person
+        {
+            public Address Address { get; set; }
+
+            public string Name { get; set; }
+        }
+
+        private class Address
+        {
+            public string[] Lines { get; set; }
+
+            public int Zip { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TestMvcOptions.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TestMvcOptions.cs
new file mode 100644
index 0000000000..ef11bd7f1c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TestMvcOptions.cs
@@ -0,0 +1,59 @@
+// 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.
+
+using System;
+using System.Buffers;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Formatters.Json.Internal;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.ObjectPool;
+using Microsoft.Extensions.Options;
+using Moq;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class TestMvcOptions : IOptions<MvcOptions>
+    {
+        public TestMvcOptions()
+        {
+            Value = new MvcOptions();
+            var optionsSetup = new MvcCoreMvcOptionsSetup(new TestHttpRequestStreamReaderFactory());
+            optionsSetup.Configure(Value);
+
+            var validationAttributeAdapterProvider = new ValidationAttributeAdapterProvider();
+            var dataAnnotationLocalizationOptions = Options.Create(new MvcDataAnnotationsLocalizationOptions());
+            var stringLocalizer = new Mock<IStringLocalizer>();
+            var stringLocalizerFactory = new Mock<IStringLocalizerFactory>();
+            stringLocalizerFactory
+                .Setup(s => s.Create(It.IsAny<Type>()))
+                .Returns(stringLocalizer.Object);
+
+            var dataAnnotationOptionsSetup = new MvcDataAnnotationsMvcOptionsSetup(
+                validationAttributeAdapterProvider,
+                dataAnnotationLocalizationOptions,
+                stringLocalizerFactory.Object);
+            dataAnnotationOptionsSetup.Configure(Value);
+
+            var loggerFactory = new LoggerFactory();
+            var jsonOptions = Options.Create(new MvcJsonOptions());
+            var charPool = ArrayPool<char>.Shared;
+            var objectPoolProvider = new DefaultObjectPoolProvider();
+
+            var mvcJsonMvcOptionsSetup = new MvcJsonMvcOptionsSetup(
+                loggerFactory,
+                jsonOptions,
+                charPool,
+                objectPoolProvider);
+            mvcJsonMvcOptionsSetup.Configure(Value);
+        }
+
+        public MvcOptions Value { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryUpdateModelIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryUpdateModelIntegrationTest.cs
new file mode 100644
index 0000000000..200d95914d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryUpdateModelIntegrationTest.cs
@@ -0,0 +1,1243 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Internal;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class TryUpdateModelIntegrationTest
+    {
+        private class Address
+        {
+            public string Street { get; set; }
+
+            public string City { get; set; }
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_ExistingModel_EmptyPrefix_OverwritesBoundValues()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Address
+            {
+                Street = "DefaultStreet",
+                City = "Toronto",
+            };
+            var oldModel = model;
+
+            // Act
+            var result = await TryUpdateModelAsync(model, string.Empty, testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            Assert.Same(oldModel, model);
+            Assert.Equal("SomeStreet", model.Street);
+            Assert.Equal("Toronto", model.City);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState);
+            Assert.Equal("Street", entry.Key);
+            var state = entry.Value;
+            Assert.Equal("SomeStreet", state.AttemptedValue);
+            Assert.Equal("SomeStreet", state.RawValue);
+            Assert.Empty(state.Errors);
+            Assert.Equal(ModelValidationState.Valid, state.ValidationState);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_ExistingModel_EmptyPrefix_GetsBound()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Address();
+
+            // Act
+            var result = await TryUpdateModelAsync(model, string.Empty, testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            Assert.Equal("SomeStreet", model.Street);
+            Assert.Null(model.City);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState);
+            Assert.Equal("Street", entry.Key);
+            var state = entry.Value;
+            Assert.Equal("SomeStreet", state.AttemptedValue);
+            Assert.Equal("SomeStreet", state.RawValue);
+            Assert.Empty(state.Errors);
+            Assert.Equal(ModelValidationState.Valid, state.ValidationState);
+        }
+
+        private class Person1
+        {
+            public string Name { get; set; }
+
+            public Address Address { get; set; }
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_TopLevelCollection_EmptyPrefix_BindsAfterClearing()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create(new Dictionary<string, string>
+                {
+                    { "[0].Name", "One Name" },
+                    { "[1].Address.Street", "Two Street" },
+                });
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new List<Person1>
+            {
+                new Person1
+                {
+                    Name = "One",
+                    Address = new Address
+                    {
+                        Street = "DefaultStreet",
+                        City = "Toronto",
+                    },
+                },
+                new Person1 { Name = "Two" },
+                new Person1 { Name = "Three" },
+            };
+
+            // Act
+            var result = await TryUpdateModelAsync(model, string.Empty, testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            Assert.Collection(
+                model,
+                element =>
+                {
+                    Assert.Equal("One Name", element.Name);
+                    Assert.Null(element.Address);
+                },
+                element =>
+                {
+                    Assert.Null(element.Name);
+                    Assert.NotNull(element.Address);
+                    Assert.Equal("Two Street", element.Address.Street);
+                    Assert.Null(element.Address.City);
+                });
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            Assert.Equal(2, modelState.Count);
+            Assert.NotNull(modelState["[0].Name"]);
+            Assert.NotNull(modelState["[1].Address.Street"]);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_NestedPoco_EmptyPrefix_DoesNotTrounceUnboundValues()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Address.Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Person1
+            {
+                Name = "Joe",
+                Address = new Address
+                {
+                    Street = "DefaultStreet",
+                    City = "Toronto",
+                },
+            };
+            var oldModel = model;
+
+            // Act
+            var result = await TryUpdateModelAsync(model, string.Empty, testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            Assert.Same(oldModel, model);
+            Assert.Equal("Joe", model.Name);
+            Assert.Equal("SomeStreet", model.Address.Street);
+            Assert.Equal("Toronto", model.Address.City);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState);
+            Assert.Equal("Address.Street", entry.Key);
+            var state = entry.Value;
+            Assert.Equal("SomeStreet", state.AttemptedValue);
+            Assert.Equal("SomeStreet", state.RawValue);
+            Assert.Empty(state.Errors);
+            Assert.Equal(ModelValidationState.Valid, state.ValidationState);
+        }
+
+        private class Person2
+        {
+            public List<Address> Address { get; set; }
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_SettableCollectionModel_EmptyPrefix_CreatesCollection()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Person2();
+
+            // Act
+            var result = await TryUpdateModelAsync(model, string.Empty, testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            Assert.NotNull(model.Address);
+            Assert.Single(model.Address);
+            Assert.Equal("SomeStreet", model.Address[0].Street);
+            Assert.Null(model.Address[0].City);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState);
+            Assert.Equal("Address[0].Street", entry.Key);
+            var state = entry.Value;
+            Assert.Equal("SomeStreet", state.AttemptedValue);
+            Assert.Equal("SomeStreet", state.RawValue);
+            Assert.Empty(state.Errors);
+            Assert.Equal(ModelValidationState.Valid, state.ValidationState);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_SettableCollectionModel_EmptyPrefix_MaintainsCollectionIfNonNull()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Person2
+            {
+                Address = new List<Address>(),
+            };
+            var collection = model.Address;
+
+            // Act
+            var result = await TryUpdateModelAsync(model, string.Empty, testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            Assert.NotNull(model.Address);
+            Assert.Same(collection, model.Address);
+            Assert.Single(model.Address);
+            Assert.Equal("SomeStreet", model.Address[0].Street);
+            Assert.Null(model.Address[0].City);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState);
+            Assert.Equal("Address[0].Street", entry.Key);
+            var state = entry.Value;
+            Assert.Equal("SomeStreet", state.AttemptedValue);
+            Assert.Equal("SomeStreet", state.RawValue);
+            Assert.Empty(state.Errors);
+            Assert.Equal(ModelValidationState.Valid, state.ValidationState);
+        }
+
+        private class Person3
+        {
+            public Person3()
+            {
+                Address = new List<Address>();
+            }
+
+            public List<Address> Address { get; }
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_NonSettableCollectionModel_EmptyPrefix_GetsBound()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Person3
+            {
+                Address =
+                {
+                    new Address
+                    {
+                        Street = "Old street",
+                        City = "Redmond",
+                    },
+                    new Address
+                    {
+                        Street = "Older street",
+                        City = "Toronto",
+                    },
+                },
+            };
+
+            // Act
+            var result = await TryUpdateModelAsync(model, string.Empty, testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model (collection is cleared and new members created from scratch).
+            Assert.NotNull(model.Address);
+            Assert.Single(model.Address);
+            Assert.Equal("SomeStreet", model.Address[0].Street);
+            Assert.Null(model.Address[0].City);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState);
+            Assert.Equal("Address[0].Street", entry.Key);
+            var state = entry.Value;
+            Assert.Equal("SomeStreet", state.AttemptedValue);
+            Assert.Equal("SomeStreet", state.RawValue);
+            Assert.Empty(state.Errors);
+            Assert.Equal(ModelValidationState.Valid, state.ValidationState);
+        }
+
+        private class Person6
+        {
+            public CustomReadOnlyCollection<Address> Address { get; set; }
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_ReadOnlyCollectionModel_EmptyPrefix_DoesNotGetBound()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Person6();
+
+            // Act
+            var result = await TryUpdateModelAsync(model, string.Empty, testContext);
+
+            // Assert
+            Assert.False(result);
+
+            // ModelState
+            Assert.False(modelState.IsValid);
+            var entry = Assert.Single(modelState);
+            Assert.Equal("Address[0].Street", entry.Key);
+            var state = entry.Value;
+            Assert.NotNull(state);
+            Assert.Equal(ModelValidationState.Unvalidated, state.ValidationState);
+            Assert.Equal("SomeStreet", state.RawValue);
+            Assert.Equal("SomeStreet", state.AttemptedValue);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_ReadOnlyCollectionModel_WithPrefix_DoesNotGetBound()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Person6();
+
+            // Act
+            var result = await TryUpdateModelAsync(model, "prefix", testContext);
+
+            // Assert
+            Assert.False(result);
+
+            // ModelState
+            Assert.False(modelState.IsValid);
+            var entry = Assert.Single(modelState);
+            Assert.Equal("prefix.Address[0].Street", entry.Key);
+            var state = entry.Value;
+            Assert.NotNull(state);
+            Assert.Equal(ModelValidationState.Unvalidated, state.ValidationState);
+            Assert.Equal("SomeStreet", state.RawValue);
+            Assert.Equal("SomeStreet", state.AttemptedValue);
+        }
+
+        private class Person4
+        {
+            public Address[] Address { get; set; }
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_SettableArrayModel_EmptyPrefix_CreatesArray()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Person4();
+
+            // Act
+            var result = await TryUpdateModelAsync(model, string.Empty, testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            Assert.NotNull(model.Address);
+            Assert.Single(model.Address);
+            Assert.Equal("SomeStreet", model.Address[0].Street);
+            Assert.Null(model.Address[0].City);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState);
+            Assert.Equal("Address[0].Street", entry.Key);
+            var state = entry.Value;
+            Assert.Equal("SomeStreet", state.AttemptedValue);
+            Assert.Equal("SomeStreet", state.RawValue);
+            Assert.Empty(state.Errors);
+            Assert.Equal(ModelValidationState.Valid, state.ValidationState);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_SettableArrayModel_EmptyPrefix_OverwritesArray()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Person4
+            {
+                Address = new Address[]
+                {
+                    new Address
+                    {
+                        Street = "Old street",
+                        City = "Toronto",
+                    },
+                },
+            };
+            var collection = model.Address;
+
+            // Act
+            var result = await TryUpdateModelAsync(model, string.Empty, testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            Assert.NotNull(model.Address);
+            Assert.NotSame(collection, model.Address);
+            Assert.Single(model.Address);
+            Assert.Equal("SomeStreet", model.Address[0].Street);
+            Assert.Null(model.Address[0].City);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState);
+            Assert.Equal("Address[0].Street", entry.Key);
+            var state = entry.Value;
+            Assert.Equal("SomeStreet", state.AttemptedValue);
+            Assert.Equal("SomeStreet", state.RawValue);
+            Assert.Empty(state.Errors);
+            Assert.Equal(ModelValidationState.Valid, state.ValidationState);
+        }
+
+        private class Person5
+        {
+            public Address[] Address { get; } = new Address[] { };
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_NonSettableArrayModel_EmptyPrefix_IsNotBound()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Person5();
+
+            // Act
+            var result = await TryUpdateModelAsync(model, string.Empty, testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            Assert.NotNull(model.Address);
+
+            // Arrays should not be updated.
+            Assert.Empty(model.Address);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+
+        private class Person7
+        {
+            public IEnumerable<Address> Address { get; } = new Address[]
+            {
+                new Address()
+                {
+                     City = "Redmond",
+                     Street = "One Microsoft Way"
+                }
+            };
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_NonSettableIEnumerableModel_EmptyPrefix_IsNotBound()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Person7();
+
+            // Act
+            var result = await TryUpdateModelAsync(model, string.Empty, testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            Assert.NotNull(model.Address);
+
+            // Arrays should not be updated.
+            Assert.Single(model.Address);
+            Assert.Collection(
+                model.Address,
+                (a) =>
+                {
+                    Assert.Equal("Redmond", a.City);
+                    Assert.Equal("One Microsoft Way", a.Street);
+                });
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+        }
+
+        private class Person8
+        {
+            public ICollection<Address> Address { get; } = new Address[]
+            {
+                new Address()
+                {
+                     City = "Redmond",
+                     Street = "One Microsoft Way"
+                }
+            };
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_NonSettableICollectionModel_EmptyPrefix_IsNotBound()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Person8();
+
+            // Act
+            var result = await TryUpdateModelAsync(model, string.Empty, testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            Assert.NotNull(model.Address);
+
+            // Arrays should not be updated.
+            Assert.Single(model.Address);
+            Assert.Collection(
+                model.Address,
+                (a) =>
+                {
+                    Assert.Equal("Redmond", a.City);
+                    Assert.Equal("One Microsoft Way", a.Street);
+                });
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_ExistingModel_WithPrefix_ValuesGetOverwritten()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("prefix.Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Address
+            {
+                Street = "DefaultStreet",
+                City = "Toronto",
+            };
+            var oldModel = model;
+
+            // Act
+            var result = await TryUpdateModelAsync(model, "prefix", testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            Assert.Same(oldModel, model);
+            Assert.Equal("SomeStreet", model.Street);
+            Assert.Equal("Toronto", model.City);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState);
+            Assert.Equal("prefix.Street", entry.Key);
+            var state = entry.Value;
+            Assert.Equal("SomeStreet", state.AttemptedValue);
+            Assert.Equal("SomeStreet", state.RawValue);
+            Assert.Empty(state.Errors);
+            Assert.Equal(ModelValidationState.Valid, state.ValidationState);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_ExistingModel_WithPrefix_GetsBound()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("prefix.Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Address();
+
+            // Act
+            var result = await TryUpdateModelAsync(model, "prefix", testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            Assert.Equal("SomeStreet", model.Street);
+            Assert.Null(model.City);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState);
+            Assert.Equal("prefix.Street", entry.Key);
+            var state = entry.Value;
+            Assert.Equal("SomeStreet", state.AttemptedValue);
+            Assert.Equal("SomeStreet", state.RawValue);
+            Assert.Empty(state.Errors);
+            Assert.Equal(ModelValidationState.Valid, state.ValidationState);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_TopLevelCollection_WithPrefix_BindsAfterClearing()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create(new Dictionary<string, string>
+                {
+                    { "prefix[0].Name", "One Name" },
+                    { "prefix[1].Address.Street", "Two Street" },
+                });
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new List<Person1>
+            {
+                new Person1
+                {
+                    Name = "One",
+                    Address = new Address
+                    {
+                        Street = "DefaultStreet",
+                        City = "Toronto",
+                    },
+                },
+                new Person1 { Name = "Two" },
+                new Person1 { Name = "Three" },
+            };
+
+            // Act
+            var result = await TryUpdateModelAsync(model, "prefix", testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            Assert.Collection(
+                model,
+                element =>
+                {
+                    Assert.Equal("One Name", element.Name);
+                    Assert.Null(element.Address);
+                },
+                element =>
+                {
+                    Assert.Null(element.Name);
+                    Assert.NotNull(element.Address);
+                    Assert.Equal("Two Street", element.Address.Street);
+                    Assert.Null(element.Address.City);
+                });
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            Assert.Equal(2, modelState.Count);
+            Assert.NotNull(modelState["prefix[0].Name"]);
+            Assert.NotNull(modelState["prefix[1].Address.Street"]);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_NestedPoco_WithPrefix_DoesNotTrounceUnboundValues()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("prefix.Address.Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Person1
+            {
+                Name = "Joe",
+                Address = new Address
+                {
+                    Street = "DefaultStreet",
+                    City = "Toronto",
+                },
+            };
+            var oldModel = model;
+
+            // Act
+            var result = await TryUpdateModelAsync(model, "prefix", testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            Assert.Same(oldModel, model);
+            Assert.Equal("Joe", model.Name);
+            Assert.Equal("SomeStreet", model.Address.Street);
+            Assert.Equal("Toronto", model.Address.City);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState);
+            Assert.Equal("prefix.Address.Street", entry.Key);
+            var state = entry.Value;
+            Assert.Equal("SomeStreet", state.AttemptedValue);
+            Assert.Equal("SomeStreet", state.RawValue);
+            Assert.Empty(state.Errors);
+            Assert.Equal(ModelValidationState.Valid, state.ValidationState);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_SettableCollectionModel_WithPrefix_CreatesCollection()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Person2();
+
+            // Act
+            var result = await TryUpdateModelAsync(model, "prefix", testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            Assert.NotNull(model.Address);
+            Assert.Single(model.Address);
+            Assert.Equal("SomeStreet", model.Address[0].Street);
+            Assert.Null(model.Address[0].City);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState);
+            Assert.Equal("prefix.Address[0].Street", entry.Key);
+            var state = entry.Value;
+            Assert.Equal("SomeStreet", state.AttemptedValue);
+            Assert.Equal("SomeStreet", state.RawValue);
+            Assert.Empty(state.Errors);
+            Assert.Equal(ModelValidationState.Valid, state.ValidationState);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_SettableCollectionModel_WithPrefix_MaintainsCollectionIfNonNull()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Person2
+            {
+                Address = new List<Address>(),
+            };
+            var collection = model.Address;
+
+            // Act
+            var result = await TryUpdateModelAsync(model, "prefix", testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            Assert.NotNull(model.Address);
+            Assert.Same(collection, model.Address);
+            Assert.Single(model.Address);
+            Assert.Equal("SomeStreet", model.Address[0].Street);
+            Assert.Null(model.Address[0].City);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState);
+            Assert.Equal("prefix.Address[0].Street", entry.Key);
+            var state = entry.Value;
+            Assert.Equal("SomeStreet", state.AttemptedValue);
+            Assert.Equal("SomeStreet", state.RawValue);
+            Assert.Empty(state.Errors);
+            Assert.Equal(ModelValidationState.Valid, state.ValidationState);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_NonSettableCollectionModel_WithPrefix_GetsBound()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Person3
+            {
+                Address =
+                {
+                    new Address
+                    {
+                        Street = "Old street",
+                        City = "Redmond",
+                    },
+                    new Address
+                    {
+                        Street = "Older street",
+                        City = "Toronto",
+                    },
+                },
+            };
+
+            // Act
+            var result = await TryUpdateModelAsync(model, "prefix", testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model (collection is cleared and new members created from scratch).
+            Assert.NotNull(model.Address);
+            Assert.Single(model.Address);
+            Assert.Equal("SomeStreet", model.Address[0].Street);
+            Assert.Null(model.Address[0].City);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState);
+            Assert.Equal("prefix.Address[0].Street", entry.Key);
+            var state = entry.Value;
+            Assert.Equal("SomeStreet", state.AttemptedValue);
+            Assert.Equal("SomeStreet", state.RawValue);
+            Assert.Empty(state.Errors);
+            Assert.Equal(ModelValidationState.Valid, state.ValidationState);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_SettableArrayModel_WithPrefix_CreatesArray()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Person4();
+
+            // Act
+            var result = await TryUpdateModelAsync(model, "prefix", testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            Assert.NotNull(model.Address);
+            Assert.Single(model.Address);
+            Assert.Equal("SomeStreet", model.Address[0].Street);
+            Assert.Null(model.Address[0].City);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState);
+            Assert.Equal("prefix.Address[0].Street", entry.Key);
+            var state = entry.Value;
+            Assert.Equal("SomeStreet", state.AttemptedValue);
+            Assert.Equal("SomeStreet", state.RawValue);
+            Assert.Empty(state.Errors);
+            Assert.Equal(ModelValidationState.Valid, state.ValidationState);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_SettableArrayModel_WithPrefix_OverwritesArray()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Person4
+            {
+                Address = new Address[]
+                {
+                    new Address
+                    {
+                        Street = "Old street",
+                        City = "Toronto",
+                    },
+                },
+            };
+            var collection = model.Address;
+
+            // Act
+            var result = await TryUpdateModelAsync(model, "prefix", testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            Assert.NotNull(model.Address);
+            Assert.NotSame(collection, model.Address);
+            Assert.Single(model.Address);
+            Assert.Equal("SomeStreet", model.Address[0].Street);
+            Assert.Null(model.Address[0].City);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState);
+            Assert.Equal("prefix.Address[0].Street", entry.Key);
+            var state = entry.Value;
+            Assert.Equal("SomeStreet", state.AttemptedValue);
+            Assert.Equal("SomeStreet", state.RawValue);
+            Assert.Empty(state.Errors);
+            Assert.Equal(ModelValidationState.Valid, state.ValidationState);
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_NonSettableArrayModel_WithPrefix_GetsBound()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new Person5();
+
+            // Act
+            var result = await TryUpdateModelAsync(model, "prefix", testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            Assert.NotNull(model.Address);
+
+            // Arrays should not be updated.
+            Assert.Empty(model.Address);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+
+        [Fact]
+        public async Task TryUpdateModelAsync_TopLevelFormFileCollection_IsBound()
+        {
+            // Arrange
+            var data = "some data";
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => UpdateRequest(request, data, "files"));
+            var modelState = testContext.ModelState;
+            var model = new List<IFormFile>
+            {
+                new FormFile(new MemoryStream(), baseStreamOffset: 0, length: 0, name: "file", fileName: "file1"),
+                new FormFile(new MemoryStream(), baseStreamOffset: 0, length: 0, name: "file", fileName: "file2"),
+                new FormFile(new MemoryStream(), baseStreamOffset: 0, length: 0, name: "file", fileName: "file3"),
+            };
+
+            // Act
+            var result = await TryUpdateModelAsync(model, prefix: "files", testContext: testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            var file = Assert.Single(model);
+            Assert.Equal("form-data; name=files; filename=text.txt", file.ContentDisposition);
+            using (var reader = new StreamReader(file.OpenReadStream()))
+            {
+                Assert.Equal(data, reader.ReadToEnd());
+            }
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+            var kvp = Assert.Single(modelState);
+            Assert.Equal("files", kvp.Key);
+            var modelStateEntry = kvp.Value;
+            Assert.NotNull(modelStateEntry);
+            Assert.Empty(modelStateEntry.Errors);
+            Assert.Equal(ModelValidationState.Valid, modelStateEntry.ValidationState);
+            Assert.Null(modelStateEntry.AttemptedValue);
+            Assert.Null(modelStateEntry.RawValue);
+        }
+
+        private class AddressWithNoParameterlessConstructor
+        {
+            private readonly int _id;
+            public AddressWithNoParameterlessConstructor(int id)
+            {
+                _id = id;
+            }
+            public string Street { get; set; }
+            public string City { get; set; }
+        }
+
+        [Fact]
+        public async Task TryUpdateModel_ExistingModelWithNoParameterlessConstructor_OverwritesBoundValues()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = QueryString.Create("Street", "SomeStreet");
+            });
+
+            var modelState = testContext.ModelState;
+            var model = new AddressWithNoParameterlessConstructor(10)
+            {
+                Street = "DefaultStreet",
+                City = "Toronto",
+            };
+            var oldModel = model;
+
+            // Act
+            var result = await TryUpdateModelAsync(model, string.Empty, testContext);
+
+            // Assert
+            Assert.True(result);
+
+            // Model
+            Assert.Same(oldModel, model);
+            Assert.Equal("SomeStreet", model.Street);
+            Assert.Equal("Toronto", model.City);
+
+            // ModelState
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState);
+            Assert.Equal("Street", entry.Key);
+            var state = entry.Value;
+            Assert.Equal("SomeStreet", state.AttemptedValue);
+            Assert.Equal("SomeStreet", state.RawValue);
+            Assert.Empty(state.Errors);
+            Assert.Equal(ModelValidationState.Valid, state.ValidationState);
+        }
+
+        private void UpdateRequest(HttpRequest request, string data, string name)
+        {
+            const string fileName = "text.txt";
+            var fileCollection = new FormFileCollection();
+            var formCollection = new FormCollection(new Dictionary<string, StringValues>(), fileCollection);
+
+            request.Form = formCollection;
+            request.ContentType = "multipart/form-data; boundary=----WebKitFormBoundarymx2fSWqWSd0OxQqq";
+
+            request.Headers["Content-Disposition"] = $"form-data; name={name}; filename={fileName}";
+
+            var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(data));
+            fileCollection.Add(new FormFile(memoryStream, 0, data.Length, name, fileName)
+            {
+                Headers = request.Headers
+            });
+        }
+
+        private class CustomReadOnlyCollection<T> : ICollection<T>
+        {
+            private ICollection<T> _original;
+
+            public CustomReadOnlyCollection()
+                : this(new List<T>())
+            {
+            }
+
+            public CustomReadOnlyCollection(ICollection<T> original)
+            {
+                _original = original;
+            }
+
+            public int Count
+            {
+                get { return _original.Count; }
+            }
+
+            public bool IsReadOnly
+            {
+                get { return true; }
+            }
+
+            public void Add(T item)
+            {
+                throw new NotSupportedException();
+            }
+
+            public void Clear()
+            {
+                throw new NotSupportedException();
+            }
+
+            public bool Contains(T item)
+            {
+                return _original.Contains(item);
+            }
+
+            public void CopyTo(T[] array, int arrayIndex)
+            {
+                _original.CopyTo(array, arrayIndex);
+            }
+
+            public bool Remove(T item)
+            {
+                throw new NotSupportedException();
+            }
+
+            public IEnumerator<T> GetEnumerator()
+            {
+                foreach (T t in _original)
+                {
+                    yield return t;
+                }
+            }
+
+            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+            {
+                return GetEnumerator();
+            }
+        }
+
+        private async Task<bool> TryUpdateModelAsync(
+            object model,
+            string prefix,
+            ModelBindingTestContext testContext)
+        {
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+            return await ModelBindingHelper.TryUpdateModelAsync(
+                model,
+                model.GetType(),
+                prefix,
+                testContext,
+                testContext.MetadataProvider,
+                TestModelBinderFactory.CreateDefault(),
+                valueProvider,
+                ModelBindingTestHelper.GetObjectValidator(testContext.MetadataProvider));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryValidateModelIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryValidateModelIntegrationTest.cs
new file mode 100644
index 0000000000..68f63432a0
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryValidateModelIntegrationTest.cs
@@ -0,0 +1,288 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class TryValidateModelIntegrationTest
+    {
+        [Fact]
+        public void ModelState_IsInvalid_ForInvalidData_OnDerivedModel()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext();
+
+            var modelState = testContext.ModelState;
+            var model = new SoftwareViewModel
+            {
+                Category = "Technology",
+                CompanyName = "Microsoft",
+                Contact = "4258393231",
+                Country = "UK", // Here the validate country is USA only
+                DatePurchased = new DateTime(2010, 10, 10),
+                Price = 110,
+                Version = "2"
+            };
+
+            var controller = CreateController(testContext, testContext.MetadataProvider);
+
+            // Act
+            var result = controller.TryValidateModel(model, prefix: "software");
+
+            // Assert
+            Assert.False(result);
+            Assert.False(modelState.IsValid);
+            var modelStateErrors = GetModelStateErrors(modelState);
+            Assert.Single(modelStateErrors);
+            Assert.Equal("Product must be made in the USA if it is not named.", modelStateErrors["software"]);
+        }
+
+        [Fact]
+        public void ModelState_IsValid_ForValidData_OnDerivedModel()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var modelState = testContext.ModelState;
+            var model = new SoftwareViewModel
+            {
+                Category = "Technology",
+                CompanyName = "Microsoft",
+                Contact = "4258393231",
+                Country = "USA",
+                DatePurchased = new DateTime(2010, 10, 10),
+                Name = "MVC",
+                Price = 110,
+                Version = "2"
+            };
+
+            var controller = CreateController(testContext, testContext.MetadataProvider);
+
+            // Act
+            var result = controller.TryValidateModel(model);
+
+            // Assert
+            Assert.True(result);
+            Assert.True(modelState.IsValid);
+            var modelStateErrors = GetModelStateErrors(modelState);
+            Assert.Empty(modelStateErrors);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void TryValidateModel_CollectionsModel_ReturnsErrorsForInvalidProperties()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var modelState = testContext.ModelState;
+            var model = new List<ProductViewModel>();
+            model.Add(new ProductViewModel()
+            {
+                Price = 2,
+                Contact = "acvrdzersaererererfdsfdsfdsfsdf",
+                ProductDetails = new ProductDetails()
+                {
+                    Detail1 = "d1",
+                    Detail2 = "d2",
+                    Detail3 = "d3"
+                }
+            });
+            model.Add(new ProductViewModel()
+            {
+                Price = 2,
+                Contact = "acvrdzersaererererfdsfdsfdsfsdf",
+                ProductDetails = new ProductDetails()
+                {
+                    Detail1 = "d1",
+                    Detail2 = "d2",
+                    Detail3 = "d3"
+                }
+            });
+
+            var controller = CreateController(testContext, testContext.MetadataProvider);
+
+            // We define the "CompanyName null" message locally, so we should manually check its value.
+            var categoryRequired = ValidationAttributeUtil.GetRequiredErrorMessage("Category");
+            var priceRange = ValidationAttributeUtil.GetRangeErrorMessage(20, 100, "Price");
+            var contactUsMax = ValidationAttributeUtil.GetStringLengthErrorMessage(null, 20, "Contact Us");
+            var contactusRegEx = ValidationAttributeUtil.GetRegExErrorMessage("^[0-9]*$", "Contact Us");
+
+            // Act
+            var result = controller.TryValidateModel(model);
+
+            // Assert
+            Assert.False(result);
+            Assert.False(modelState.IsValid);
+            var modelStateErrors = GetModelStateErrors(modelState);
+
+            Assert.Equal("CompanyName cannot be null or empty.", modelStateErrors["[0].CompanyName"]);
+            Assert.Equal(priceRange, modelStateErrors["[0].Price"]);
+            Assert.Equal(categoryRequired, modelStateErrors["[0].Category"]);
+            AssertErrorEquals(contactUsMax + contactusRegEx, modelStateErrors["[0].Contact"]);
+            Assert.Equal("CompanyName cannot be null or empty.", modelStateErrors["[1].CompanyName"]);
+            Assert.Equal(priceRange, modelStateErrors["[1].Price"]);
+            Assert.Equal(categoryRequired, modelStateErrors["[1].Category"]);
+            AssertErrorEquals(contactUsMax + contactusRegEx, modelStateErrors["[1].Contact"]);
+        }
+
+        [Fact]
+        public void ValidationVisitor_ValidateComplexTypesIfChildValidationFailsSetToTrue_AddsModelLevelErrors()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var modelState = testContext.ModelState;
+            var model = new ModelLevelErrorTest();
+            var controller = CreateController(testContext, testContext.MetadataProvider);
+            controller.ObjectValidator = new CustomObjectValidator(testContext.MetadataProvider, TestModelValidatorProvider.CreateDefaultProvider().ValidatorProviders)
+            {
+                ValidateComplexTypesIfChildValidationFails = true
+            };
+
+            // Act
+            var result = controller.TryValidateModel(model);
+
+            // Assert
+            Assert.False(result);
+            Assert.False(modelState.IsValid);
+            var modelStateErrors = GetModelStateErrors(modelState);
+            Assert.Equal(2, modelStateErrors.Count);
+            AssertErrorEquals("Property", modelStateErrors["Message"]);
+            AssertErrorEquals("Model", modelStateErrors[""]);
+
+        }
+
+        [Fact]
+        public void ValidationVisitor_ValidateComplexTypesIfChildValidationFailsSetToFalse_DoesNotAddModelLevelErrors()
+        {
+            // Arrange
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var modelState = testContext.ModelState;
+            var model = new ModelLevelErrorTest();
+            var controller = CreateController(testContext, testContext.MetadataProvider);
+            controller.ObjectValidator = new CustomObjectValidator(testContext.MetadataProvider, TestModelValidatorProvider.CreateDefaultProvider().ValidatorProviders)
+            {
+                ValidateComplexTypesIfChildValidationFails= false
+            };
+
+            // Act
+            var result = controller.TryValidateModel(model);
+
+            // Assert
+            Assert.False(result);
+            Assert.False(modelState.IsValid);
+            var modelStateErrors = GetModelStateErrors(modelState);
+            Assert.Single(modelStateErrors); // single error from the required attribute
+            AssertErrorEquals("Property", modelStateErrors.Single().Value);
+
+        }
+
+        [ModelLevelError]
+        private class ModelLevelErrorTest
+        {
+            [Required(ErrorMessage = "Property")]
+            public string Message { get; set; }
+        }
+
+        private class ModelLevelErrorAttribute : ValidationAttribute
+        {
+            public ModelLevelErrorAttribute()
+            {
+                ErrorMessage = "Model";
+            }
+            public override bool IsValid(object value)
+            {
+                return false;
+            }
+        }
+
+        private void AssertErrorEquals(string expected, string actual)
+        {
+            // OrderBy is used because the order of the results may very depending on the platform / client.
+            Assert.Equal(
+                expected.Split('.').OrderBy(item => item, StringComparer.Ordinal),
+                actual.Split('.').OrderBy(item => item, StringComparer.Ordinal));
+        }
+
+        private TestController CreateController(
+            ActionContext actionContext,
+            IModelMetadataProvider metadataProvider)
+        {
+            var options = actionContext.HttpContext.RequestServices.GetRequiredService<IOptions<MvcOptions>>();
+
+            var controller = new TestController();
+            controller.ControllerContext = new ControllerContext(actionContext);
+            controller.ObjectValidator = ModelBindingTestHelper.GetObjectValidator(metadataProvider, options);
+            controller.MetadataProvider = metadataProvider;
+
+            return controller;
+        }
+
+        private Dictionary<string, string> GetModelStateErrors(ModelStateDictionary modelState)
+        {
+            var result = new Dictionary<string, string>();
+            foreach (var item in modelState)
+            {
+                var errorMessage = string.Empty;
+                foreach (var error in item.Value.Errors)
+                {
+                    if (error != null)
+                    {
+                        errorMessage = errorMessage + error.ErrorMessage;
+                    }
+                }
+                if (!string.IsNullOrEmpty(errorMessage))
+                {
+                    result.Add(item.Key, errorMessage);
+                }
+            }
+
+            return result;
+        }
+
+        private class TestController : Controller
+        {
+        }
+
+        private class CustomObjectValidator : IObjectModelValidator
+        {
+            private readonly IModelMetadataProvider _modelMetadataProvider;
+            private readonly IList<IModelValidatorProvider> _validatorProviders;
+            private ValidatorCache _validatorCache;
+            private CompositeModelValidatorProvider _validatorProvider;
+
+            public CustomObjectValidator(IModelMetadataProvider modelMetadataProvider, IList<IModelValidatorProvider> validatorProviders)
+            {
+                _modelMetadataProvider = modelMetadataProvider;
+                _validatorProviders = validatorProviders;
+                _validatorCache = new ValidatorCache();
+                _validatorProvider = new CompositeModelValidatorProvider(validatorProviders);
+            }
+
+            public void Validate(ActionContext actionContext, ValidationStateDictionary validationState, string prefix, object model)
+            {
+                var visitor = new ValidationVisitor(
+                    actionContext,
+                    _validatorProvider,
+                    _validatorCache,
+                    _modelMetadataProvider,
+                    validationState);
+
+                var metadata = model == null ? null : _modelMetadataProvider.GetMetadataForType(model.GetType());
+                visitor.ValidateComplexTypesIfChildValidationFails = ValidateComplexTypesIfChildValidationFails;
+                visitor.Validate(metadata, prefix, model);
+            }
+
+            public bool ValidateComplexTypesIfChildValidationFails { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ValidationIntegrationTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ValidationIntegrationTests.cs
new file mode 100644
index 0000000000..e5df3d1233
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ValidationIntegrationTests.cs
@@ -0,0 +1,1847 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Newtonsoft.Json.Linq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTests
+{
+    public class ValidationIntegrationTests
+    {
+        private class TransferInfo
+        {
+            [Range(25, 50)]
+            public int AccountId { get; set; }
+
+            public double Amount { get; set; }
+        }
+
+        private class TestController { }
+
+        public static TheoryData<List<ParameterDescriptor>> MultipleActionParametersAndValidationData
+        {
+            get
+            {
+                return new TheoryData<List<ParameterDescriptor>>
+                {
+                    // Irrespective of the order in which the parameters are defined on the action,
+                    // the validation on the TransferInfo's AccountId should occur.
+                    // Here 'accountId' parameter is bound by the prefix 'accountId' while the 'transferInfo'
+                    // property is bound using the empty prefix and the 'TransferInfo' property names.
+                    new List<ParameterDescriptor>()
+                    {
+                        new ParameterDescriptor()
+                        {
+                            Name = "accountId",
+                            ParameterType = typeof(int)
+                        },
+                        new ParameterDescriptor()
+                        {
+                            Name = "transferInfo",
+                            ParameterType = typeof(TransferInfo),
+                            BindingInfo = new BindingInfo()
+                            {
+                                BindingSource = BindingSource.Body
+                            }
+                        }
+                    },
+                    new List<ParameterDescriptor>()
+                    {
+                        new ParameterDescriptor()
+                        {
+                            Name = "transferInfo",
+                            ParameterType = typeof(TransferInfo),
+                            BindingInfo = new BindingInfo()
+                            {
+                                BindingSource = BindingSource.Body
+                            }
+                        },
+                        new ParameterDescriptor()
+                        {
+                            Name = "accountId",
+                            ParameterType = typeof(int)
+                        }
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(MultipleActionParametersAndValidationData))]
+        public async Task ValidationIsTriggered_OnFromBodyModels(List<ParameterDescriptor> parameters)
+        {
+            // Arrange
+            var actionDescriptor = new ControllerActionDescriptor()
+            {
+                BoundProperties = new List<ParameterDescriptor>(),
+                Parameters = parameters
+            };
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.QueryString = new QueryString("?accountId=30");
+                    request.Body = new MemoryStream(Encoding.UTF8.GetBytes("{\"accountId\": 15,\"amount\": 250.0}"));
+                    request.ContentType = "application/json";
+                },
+                actionDescriptor: actionDescriptor);
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            foreach (var parameter in parameters)
+            {
+                await parameterBinder.BindModelAsync(parameter, testContext);
+            }
+
+            // Assert
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(
+                modelState,
+                e => string.Equals(e.Key, "AccountId", StringComparison.OrdinalIgnoreCase)).Value;
+            var error = Assert.Single(entry.Errors);
+            Assert.Equal(ValidationAttributeUtil.GetRangeErrorMessage(25, 50, "AccountId"), error.ErrorMessage);
+        }
+
+        [Theory]
+        [MemberData(nameof(MultipleActionParametersAndValidationData))]
+        public async Task MultipleActionParameter_ValidModelState(List<ParameterDescriptor> parameters)
+        {
+            // Since validation attribute is only present on the FromBody model's property(TransferInfo's AccountId),
+            // validation should not trigger for the parameter which is bound from Uri.
+
+            // Arrange
+            var actionDescriptor = new ControllerActionDescriptor()
+            {
+                BoundProperties = new List<ParameterDescriptor>(),
+                Parameters = parameters
+            };
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.QueryString = new QueryString("?accountId=10");
+                    request.Body = new MemoryStream(Encoding.UTF8.GetBytes("{\"accountId\": 40,\"amount\": 250.0}"));
+                    request.ContentType = "application/json";
+                },
+                actionDescriptor: actionDescriptor);
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            foreach (var parameter in parameters)
+            {
+                await parameterBinder.BindModelAsync(parameter, testContext);
+            }
+
+            // Assert
+            Assert.True(modelState.IsValid);
+        }
+
+        private class Order1
+        {
+            [Required]
+            public string CustomerName { get; set; }
+        }
+
+        [Fact]
+        public async Task Validation_RequiredAttribute_OnSimpleTypeProperty_WithData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order1)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.CustomerName=bill");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order1>(modelBindingResult.Model);
+            Assert.Equal("bill", model.CustomerName);
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.CustomerName").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        public async Task Validation_RequiredAttribute_OnSimpleTypeProperty_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order1)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order1>(modelBindingResult.Model);
+            Assert.Null(model.CustomerName);
+
+            Assert.Single(modelState);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "CustomerName").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Null(entry.AttemptedValue);
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+
+            var error = Assert.Single(entry.Errors);
+            AssertRequiredError("CustomerName", error);
+        }
+
+        private class Order2
+        {
+            [Required]
+            public Person2 Customer { get; set; }
+        }
+
+        private class Person2
+        {
+            public string Name { get; set; }
+        }
+
+        [Fact]
+        public async Task Validation_RequiredAttribute_OnPOCOProperty_WithData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order2)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Customer.Name=bill");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order2>(modelBindingResult.Model);
+            Assert.NotNull(model.Customer);
+            Assert.Equal("bill", model.Customer.Name);
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Customer.Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        public async Task Validation_RequiredAttribute_OnPOCOProperty_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order2)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order2>(modelBindingResult.Model);
+            Assert.Null(model.Customer);
+
+            Assert.Single(modelState);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "Customer").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Null(entry.AttemptedValue);
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+
+            var error = Assert.Single(entry.Errors);
+            AssertRequiredError("Customer", error);
+        }
+
+        private class Order3
+        {
+            public Person3 Customer { get; set; }
+        }
+
+        private class Person3
+        {
+            public int Age { get; set; }
+
+            [Required]
+            public string Name { get; set; }
+        }
+
+        [Fact]
+        public async Task Validation_RequiredAttribute_OnNestedSimpleTypeProperty_WithData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order3)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Customer.Name=bill");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order3>(modelBindingResult.Model);
+            Assert.NotNull(model.Customer);
+            Assert.Equal("bill", model.Customer.Name);
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Customer.Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        public async Task Validation_RequiredAttribute_OnNestedSimpleTypeProperty_NoDataForRequiredProperty()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order3)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                // Force creation of the Customer model.
+                request.QueryString = new QueryString("?parameter.Customer.Age=17");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order3>(modelBindingResult.Model);
+            Assert.NotNull(model.Customer);
+            Assert.Equal(17, model.Customer.Age);
+            Assert.Null(model.Customer.Name);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Customer.Name").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Null(entry.AttemptedValue);
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+
+            var error = Assert.Single(entry.Errors);
+            AssertRequiredError("Name", error);
+        }
+
+        private class Order4
+        {
+            [Required]
+            public List<Item4> Items { get; set; }
+        }
+
+        private class Item4
+        {
+            public int ItemId { get; set; }
+        }
+
+        [Fact]
+        public async Task Validation_RequiredAttribute_OnCollectionProperty_WithData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order4)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?Items[0].ItemId=17");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order4>(modelBindingResult.Model);
+            Assert.NotNull(model.Items);
+            Assert.Equal(17, Assert.Single(model.Items).ItemId);
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "Items[0].ItemId").Value;
+            Assert.Equal("17", entry.AttemptedValue);
+            Assert.Equal("17", entry.RawValue);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        public async Task Validation_RequiredAttribute_OnCollectionProperty_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order4)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                // Force creation of the Customer model.
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order4>(modelBindingResult.Model);
+            Assert.Null(model.Items);
+
+            Assert.Single(modelState);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "Items").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Null(entry.AttemptedValue);
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+
+            var error = Assert.Single(entry.Errors);
+            AssertRequiredError("Items", error);
+        }
+
+        private class Order5
+        {
+            [Required]
+            public int? ProductId { get; set; }
+
+            public string Name { get; set; }
+        }
+
+        [Fact]
+        public async Task Validation_RequiredAttribute_OnPOCOPropertyOfBoundElement_WithData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(List<Order5>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter[0].ProductId=17");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<List<Order5>>(modelBindingResult.Model);
+            Assert.Equal(17, Assert.Single(model).ProductId);
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter[0].ProductId").Value;
+            Assert.Equal("17", entry.AttemptedValue);
+            Assert.Equal("17", entry.RawValue);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        public async Task Validation_RequiredAttribute_OnPOCOPropertyOfBoundElement_NoDataForRequiredProperty()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(List<Order5>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                // Force creation of the Customer model.
+                request.QueryString = new QueryString("?parameter[0].Name=bill");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<List<Order5>>(modelBindingResult.Model);
+            var item = Assert.Single(model);
+            Assert.Null(item.ProductId);
+            Assert.Equal("bill", item.Name);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter[0].ProductId").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Null(entry.AttemptedValue);
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+
+            var error = Assert.Single(entry.Errors);
+            AssertRequiredError("ProductId", error);
+        }
+
+        private class Order6
+        {
+            [StringLength(5, ErrorMessage = "Too Long.")]
+            public string Name { get; set; }
+        }
+
+        [Fact]
+        public async Task Validation_StringLengthAttribute_OnPropertyOfPOCO_Valid()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order6)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Name=bill");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order6>(modelBindingResult.Model);
+            Assert.Equal("bill", model.Name);
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        public async Task Validation_StringLengthAttribute_OnPropertyOfPOCO_Invalid()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order6)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Name=billybob");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order6>(modelBindingResult.Model);
+            Assert.Equal("billybob", model.Name);
+
+            Assert.Single(modelState);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Name").Value;
+            Assert.Equal("billybob", entry.AttemptedValue);
+            Assert.Equal("billybob", entry.RawValue);
+
+            var error = Assert.Single(entry.Errors);
+            Assert.Equal("Too Long.", error.ErrorMessage);
+            Assert.Null(error.Exception);
+        }
+
+        private class Order7
+        {
+            public Person7 Customer { get; set; }
+        }
+
+        private class Person7
+        {
+            [StringLength(5, ErrorMessage = "Too Long.")]
+            public string Name { get; set; }
+        }
+
+        [Fact]
+        public async Task Validation_StringLengthAttribute_OnPropertyOfNestedPOCO_Valid()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order7)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Customer.Name=bill");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order7>(modelBindingResult.Model);
+            Assert.Equal("bill", model.Customer.Name);
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Customer.Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        public async Task Validation_StringLengthAttribute_OnPropertyOfNestedPOCO_Invalid()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order7)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Customer.Name=billybob");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order7>(modelBindingResult.Model);
+            Assert.Equal("billybob", model.Customer.Name);
+
+            Assert.Single(modelState);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Customer.Name").Value;
+            Assert.Equal("billybob", entry.AttemptedValue);
+            Assert.Equal("billybob", entry.RawValue);
+
+            var error = Assert.Single(entry.Errors);
+            Assert.Equal("Too Long.", error.ErrorMessage);
+            Assert.Null(error.Exception);
+        }
+
+        [Fact]
+        public async Task Validation_StringLengthAttribute_OnPropertyOfNestedPOCO_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order7)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order7>(modelBindingResult.Model);
+            Assert.Null(model.Customer);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        private class Order8
+        {
+            [ValidatePerson8]
+            public Person8 Customer { get; set; }
+        }
+
+        private class Person8
+        {
+            public string Name { get; set; }
+        }
+
+        private class ValidatePerson8Attribute : ValidationAttribute
+        {
+            protected override ValidationResult IsValid(object value, ValidationContext validationContext)
+            {
+                if (((Person8)value).Name == "bill")
+                {
+                    return null;
+                }
+                else
+                {
+                    return new ValidationResult("Invalid Person.");
+                }
+            }
+        }
+
+        [Fact]
+        public async Task Validation_CustomAttribute_OnPOCOProperty_Valid()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order8)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Customer.Name=bill");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order8>(modelBindingResult.Model);
+            Assert.Equal("bill", model.Customer.Name);
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Customer.Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        public async Task Validation_CustomAttribute_OnPOCOProperty_Invalid()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order8)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Customer.Name=billybob");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order8>(modelBindingResult.Model);
+            Assert.Equal("billybob", model.Customer.Name);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Customer.Name").Value;
+            Assert.Equal("billybob", entry.AttemptedValue);
+            Assert.Equal("billybob", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "parameter.Customer").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Null(entry.AttemptedValue);
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+            var error = Assert.Single(entry.Errors);
+            Assert.Equal("Invalid Person.", error.ErrorMessage);
+            Assert.Null(error.Exception);
+        }
+
+        private class Order9
+        {
+            [ValidateProducts9]
+            public List<Product9> Products { get; set; }
+        }
+
+        private class Product9
+        {
+            public string Name { get; set; }
+        }
+
+        private class ValidateProducts9Attribute : ValidationAttribute
+        {
+            protected override ValidationResult IsValid(object value, ValidationContext validationContext)
+            {
+                if (((List<Product9>)value)[0].Name == "bill")
+                {
+                    return null;
+                }
+                else
+                {
+                    return new ValidationResult("Invalid Product.");
+                }
+            }
+        }
+
+        [Fact]
+        public async Task Validation_CustomAttribute_OnCollectionElement_Valid()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order9)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Products[0].Name=bill");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order9>(modelBindingResult.Model);
+            Assert.Equal("bill", Assert.Single(model.Products).Name);
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Products[0].Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        public async Task Validation_CustomAttribute_OnCollectionElement_Invalid()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order9)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter.Products[0].Name=billybob");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Order9>(modelBindingResult.Model);
+            Assert.Equal("billybob", Assert.Single(model.Products).Name);
+
+            Assert.Equal(2, modelState.Count);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter.Products[0].Name").Value;
+            Assert.Equal("billybob", entry.AttemptedValue);
+            Assert.Equal("billybob", entry.RawValue);
+
+            entry = Assert.Single(modelState, e => e.Key == "parameter.Products").Value;
+            Assert.Null(entry.RawValue);
+            Assert.Null(entry.AttemptedValue);
+            Assert.Equal(ModelValidationState.Invalid, entry.ValidationState);
+
+            var error = Assert.Single(entry.Errors);
+            Assert.Equal("Invalid Product.", error.ErrorMessage);
+            Assert.Null(error.Exception);
+        }
+
+        private class Order10
+        {
+            [StringLength(5, ErrorMessage = "Too Long.")]
+            public string Name { get; set; }
+        }
+
+        [Fact]
+        public async Task Validation_StringLengthAttribute_OnProperyOfCollectionElement_Valid()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(List<Order10>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter[0].Name=bill");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<List<Order10>>(modelBindingResult.Model);
+            Assert.Equal("bill", Assert.Single(model).Name);
+
+            Assert.Single(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter[0].Name").Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+            Assert.Empty(entry.Errors);
+        }
+
+        [Fact]
+        public async Task Validation_StringLengthAttribute_OnProperyOfCollectionElement_Invalid()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(List<Order10>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter[0].Name=billybob");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<List<Order10>>(modelBindingResult.Model);
+            Assert.Equal("billybob", Assert.Single(model).Name);
+
+            Assert.Single(modelState);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "parameter[0].Name").Value;
+            Assert.Equal("billybob", entry.AttemptedValue);
+            Assert.Equal("billybob", entry.RawValue);
+
+            var error = Assert.Single(entry.Errors);
+            Assert.Equal("Too Long.", error.ErrorMessage);
+            Assert.Null(error.Exception);
+        }
+
+        [Fact]
+        public async Task Validation_StringLengthAttribute_OnProperyOfCollectionElement_NoData()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(List<Order10>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<List<Order10>>(modelBindingResult.Model);
+            Assert.Empty(model);
+
+            Assert.Empty(modelState);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+        private class User
+        {
+            public int Id { get; set; }
+
+            public uint Zip { get; set; }
+
+        }
+
+        [Fact]
+        public async Task Validation_FormatException_ShowsInvalidValueMessage_OnSimpleTypeProperty()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(User)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?Id=bill");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<User>(modelBindingResult.Model);
+            Assert.Equal(0, model.Id);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var state = Assert.Single(modelState);
+            Assert.Equal("Id", state.Key);
+            var entry = state.Value;
+            Assert.Equal("bill", entry.AttemptedValue);
+            Assert.Equal("bill", entry.RawValue);
+            Assert.Single(entry.Errors);
+
+            var error = entry.Errors[0];
+            Assert.Equal("The value 'bill' is not valid for Id.", error.ErrorMessage);
+        }
+
+        [Fact]
+        public async Task Validation_OverflowException_ShowsInvalidValueMessage_OnSimpleTypeProperty()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(User)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?Zip=-123");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<User>(modelBindingResult.Model);
+            Assert.Equal<uint>(0, model.Zip);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+
+            var state = Assert.Single(modelState);
+            Assert.Equal("Zip", state.Key);
+            var entry = state.Value;
+            Assert.Equal("-123", entry.AttemptedValue);
+            Assert.Equal("-123", entry.RawValue);
+            Assert.Single(entry.Errors);
+
+            var error = entry.Errors[0];
+            Assert.Equal("The value '-123' is not valid for Zip.", error.ErrorMessage);
+        }
+
+        private class NeverValid : IValidatableObject
+        {
+            public string NeverValidProperty { get; set; }
+
+            public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+            {
+                var result = new ValidationResult(
+                    $"'{validationContext.MemberName}' (display: '{validationContext.DisplayName}') is not valid due " +
+                    $"to its {nameof(NeverValid)} type.");
+                return new[] { result };
+            }
+        }
+
+        private class NeverValidAttribute : ValidationAttribute
+        {
+            protected override ValidationResult IsValid(object value, ValidationContext validationContext)
+            {
+                // By default, ValidationVisitor visits _all_ properties within a non-null complex object.
+                // But, like most reasonable ValidationAttributes, NeverValidAttribute ignores null property values.
+                if (value == null)
+                {
+                    return ValidationResult.Success;
+                }
+
+                return new ValidationResult(
+                    $"'{validationContext.MemberName}' (display: '{validationContext.DisplayName}') is not valid due " +
+                    $"to its associated {nameof(NeverValidAttribute)}.");
+            }
+        }
+
+        private class ValidateSomeProperties
+        {
+            [Display(Name = "Not ever valid")]
+            public NeverValid NeverValidBecauseType { get; set; }
+
+            [NeverValid]
+            [Display(Name = "Never valid")]
+            public string NeverValidBecauseAttribute { get; set; }
+
+            [ValidateNever]
+            [NeverValid]
+            public string ValidateNever { get; set; }
+
+            [ValidateNever]
+            public int ValidateNeverLength => ValidateNever.Length;
+        }
+
+        [ValidateNever]
+        private class ValidateNoProperties : ValidateSomeProperties
+        {
+        }
+
+        [Fact]
+        public async Task IValidatableObject_IsValidated()
+        {
+            // Arrange
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter",
+                ParameterType = typeof(ValidateSomeProperties),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => request.QueryString
+                    = new QueryString($"?{nameof(ValidateSomeProperties.NeverValidBecauseType)}.{nameof(NeverValid.NeverValidProperty)}=1"));
+
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var modelState = testContext.ModelState;
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(result.IsModelSet);
+            var model = Assert.IsType<ValidateSomeProperties>(result.Model);
+            Assert.Equal("1", model.NeverValidBecauseType.NeverValidProperty);
+
+            Assert.False(modelState.IsValid);
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.Collection(
+                modelState,
+                state =>
+                {
+                    Assert.Equal(nameof(ValidateSomeProperties.NeverValidBecauseType), state.Key);
+                    Assert.Equal(ModelValidationState.Invalid, state.Value.ValidationState);
+
+                    var error = Assert.Single(state.Value.Errors);
+                    Assert.Equal(
+                        "'NeverValidBecauseType' (display: 'Not ever valid') is not valid due to its NeverValid type.",
+                        error.ErrorMessage);
+                    Assert.Null(error.Exception);
+                },
+                state =>
+                {
+                    Assert.Equal(
+                        $"{nameof(ValidateSomeProperties.NeverValidBecauseType)}.{nameof(NeverValid.NeverValidProperty)}",
+                        state.Key);
+                    Assert.Equal(ModelValidationState.Valid, state.Value.ValidationState);
+                });
+        }
+
+        [Fact]
+        public async Task CustomValidationAttribute_IsValidated()
+        {
+            // Arrange
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter",
+                ParameterType = typeof(ValidateSomeProperties),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => request.QueryString
+                    = new QueryString($"?{nameof(ValidateSomeProperties.NeverValidBecauseAttribute)}=1"));
+
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var modelState = testContext.ModelState;
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(result.IsModelSet);
+            var model = Assert.IsType<ValidateSomeProperties>(result.Model);
+            Assert.Equal("1", model.NeverValidBecauseAttribute);
+
+            Assert.False(modelState.IsValid);
+            Assert.Equal(1, modelState.ErrorCount);
+            var kvp = Assert.Single(modelState);
+            Assert.Equal(nameof(ValidateSomeProperties.NeverValidBecauseAttribute), kvp.Key);
+            var state = kvp.Value;
+            Assert.NotNull(state);
+            Assert.Equal(ModelValidationState.Invalid, state.ValidationState);
+            var error = Assert.Single(state.Errors);
+            Assert.Equal(
+                "'NeverValidBecauseAttribute' (display: 'Never valid') is not valid due to its associated NeverValidAttribute.",
+                error.ErrorMessage);
+            Assert.Null(error.Exception);
+        }
+
+        [Fact]
+        public async Task ValidateNeverProperty_IsSkipped()
+        {
+            // Arrange
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter",
+                ParameterType = typeof(ValidateSomeProperties),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => request.QueryString
+                    = new QueryString($"?{nameof(ValidateSomeProperties.ValidateNever)}=1"));
+
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var modelState = testContext.ModelState;
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(result.IsModelSet);
+            var model = Assert.IsType<ValidateSomeProperties>(result.Model);
+            Assert.Equal("1", model.ValidateNever);
+
+            Assert.True(modelState.IsValid);
+            var kvp = Assert.Single(modelState);
+            Assert.Equal(nameof(ValidateSomeProperties.ValidateNever), kvp.Key);
+            var state = kvp.Value;
+            Assert.NotNull(state);
+            Assert.Equal(ModelValidationState.Skipped, state.ValidationState);
+        }
+
+        [Fact]
+        public async Task ValidateNeverProperty_IsSkippedWithoutAccessingModel()
+        {
+            // Arrange
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter",
+                ParameterType = typeof(ValidateSomeProperties),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var modelState = testContext.ModelState;
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(result.IsModelSet);
+            var model = Assert.IsType<ValidateSomeProperties>(result.Model);
+
+            // Note this Exception is not thrown earlier.
+            Assert.Throws<NullReferenceException>(() => model.ValidateNeverLength);
+
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+
+        [Theory]
+        [InlineData(nameof(ValidateSomeProperties.NeverValidBecauseType) + "." + nameof(NeverValid.NeverValidProperty))]
+        [InlineData(nameof(ValidateSomeProperties.NeverValidBecauseAttribute))]
+        [InlineData(nameof(ValidateSomeProperties.ValidateNever))]
+        public async Task PropertyWithinValidateNeverType_IsSkipped(string propertyName)
+        {
+            // Arrange
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter",
+                ParameterType = typeof(ValidateNoProperties),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => request.QueryString = new QueryString($"?{propertyName}=1"));
+
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var modelState = testContext.ModelState;
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(result.IsModelSet);
+            Assert.IsType<ValidateNoProperties>(result.Model);
+
+            Assert.True(modelState.IsValid);
+            var kvp = Assert.Single(modelState);
+            Assert.Equal(propertyName, kvp.Key);
+            var state = kvp.Value;
+            Assert.NotNull(state);
+            Assert.Equal(ModelValidationState.Skipped, state.ValidationState);
+        }
+
+        private class ValidateSometimesAttribute : Attribute, IPropertyValidationFilter
+        {
+            private readonly string _otherProperty;
+
+            public ValidateSometimesAttribute(string otherProperty)
+            {
+                // Would null-check otherProperty in real life.
+                _otherProperty = otherProperty;
+            }
+
+            public bool ShouldValidateEntry(ValidationEntry entry, ValidationEntry parentEntry)
+            {
+                if (entry.Metadata.MetadataKind == ModelMetadataKind.Property &&
+                    parentEntry.Metadata != null)
+                {
+                    // In real life, would throw an InvalidOperationException if otherProperty were null i.e. the
+                    // property was not known. Could also assert container is non-null (see ValidationVisitor).
+                    var container = parentEntry.Model;
+                    var otherProperty = parentEntry.Metadata.Properties[_otherProperty];
+                    if (otherProperty.PropertyGetter(container) == null)
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+        }
+
+        private class ValidateSomePropertiesSometimes
+        {
+            public string Control { get; set; }
+
+            [ValidateSometimes(nameof(Control))]
+            public int ControlLength => Control.Length;
+        }
+
+        [Fact]
+        public async Task PropertyToSometimesSkip_IsSkipped_IfControlIsNull()
+        {
+            // Arrange
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter",
+                ParameterType = typeof(ValidateSomePropertiesSometimes),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext();
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var modelState = testContext.ModelState;
+
+            // Add an entry for the ControlLength property so that we can observe Skipped versus Valid states.
+            modelState.SetModelValue(
+                nameof(ValidateSomePropertiesSometimes.ControlLength),
+                rawValue: null,
+                attemptedValue: null);
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(result.IsModelSet);
+            var model = Assert.IsType<ValidateSomePropertiesSometimes>(result.Model);
+            Assert.Null(model.Control);
+
+            // Note this Exception is not thrown earlier.
+            Assert.Throws<NullReferenceException>(() => model.ControlLength);
+
+            Assert.True(modelState.IsValid);
+            var kvp = Assert.Single(modelState);
+            Assert.Equal(nameof(ValidateSomePropertiesSometimes.ControlLength), kvp.Key);
+            Assert.Equal(ModelValidationState.Skipped, kvp.Value.ValidationState);
+        }
+
+        [Fact]
+        public async Task PropertyToSometimesSkip_IsValidated_IfControlIsNotNull()
+        {
+            // Arrange
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter",
+                ParameterType = typeof(ValidateSomePropertiesSometimes),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request => request.QueryString = new QueryString(
+                    $"?{nameof(ValidateSomePropertiesSometimes.Control)}=1"));
+
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var modelState = testContext.ModelState;
+
+            // Add an entry for the ControlLength property so that we can observe Skipped versus Valid states.
+            modelState.SetModelValue(
+                nameof(ValidateSomePropertiesSometimes.ControlLength),
+                rawValue: null,
+                attemptedValue: null);
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(result.IsModelSet);
+            var model = Assert.IsType<ValidateSomePropertiesSometimes>(result.Model);
+            Assert.Equal("1", model.Control);
+            Assert.Equal(1, model.ControlLength);
+
+            Assert.True(modelState.IsValid);
+            Assert.Collection(
+                modelState,
+                state => Assert.Equal(nameof(ValidateSomePropertiesSometimes.Control), state.Key),
+                state =>
+                {
+                    Assert.Equal(nameof(ValidateSomePropertiesSometimes.ControlLength), state.Key);
+                    Assert.Equal(ModelValidationState.Valid, state.Value.ValidationState);
+                });
+        }
+
+        private class Order11
+        {
+            public IEnumerable<Address> ShippingAddresses { get; set; }
+
+            public Address HomeAddress { get; set; }
+
+            [FromBody]
+            public Address OfficeAddress { get; set; }
+        }
+
+        private class Address
+        {
+            public int Street { get; set; }
+
+            public string State { get; set; }
+
+            [Range(10000, 99999)]
+            public int Zip { get; set; }
+
+            public Country Country { get; set; }
+        }
+
+        private class Country
+        {
+            public string Name { get; set; }
+        }
+
+        [Fact]
+        public async Task TypeBasedExclusion_ForBodyAndNonBodyBoundModels()
+        {
+            // Arrange
+            var parameter = new ParameterDescriptor
+            {
+                Name = "parameter",
+                ParameterType = typeof(Order11)
+            };
+
+            var input = "{\"Zip\":\"47\"}";
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.QueryString =
+                        new QueryString("?HomeAddress.Country.Name=US&ShippingAddresses[0].Zip=45&HomeAddress.Zip=46");
+                    request.Body = new MemoryStream(Encoding.UTF8.GetBytes(input));
+                    request.ContentType = "application/json";
+                },
+                options =>
+                {
+                    options.ModelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider(typeof(Address)));
+                });
+
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext.HttpContext.RequestServices);
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            Assert.Equal(3, modelState.Count);
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+
+            var entry = Assert.Single(modelState, e => e.Key == "HomeAddress.Country.Name").Value;
+            Assert.Equal("US", entry.AttemptedValue);
+            Assert.Equal("US", entry.RawValue);
+            Assert.Equal(ModelValidationState.Skipped, entry.ValidationState);
+
+            entry = Assert.Single(modelState, e => e.Key == "ShippingAddresses[0].Zip").Value;
+            Assert.Equal("45", entry.AttemptedValue);
+            Assert.Equal("45", entry.RawValue);
+            Assert.Equal(ModelValidationState.Skipped, entry.ValidationState);
+
+            entry = Assert.Single(modelState, e => e.Key == "HomeAddress.Zip").Value;
+            Assert.Equal("46", entry.AttemptedValue);
+            Assert.Equal("46", entry.RawValue);
+            Assert.Equal(ModelValidationState.Skipped, entry.ValidationState);
+        }
+
+        [Fact]
+        public async Task FromBody_JToken_ExcludedFromValidation()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(new TestMvcOptions().Value);
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo
+                {
+                    BinderModelName = "CustomParameter",
+                    BindingSource = BindingSource.Body
+                },
+                ParameterType = typeof(JToken)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.Body = new MemoryStream(Encoding.UTF8.GetBytes("{ message: \"Hello\" }"));
+                    request.ContentType = "application/json";
+                });
+
+            var httpContext = testContext.HttpContext;
+            var modelState = testContext.ModelState;
+
+            // We need to add another model state entry which should get marked as skipped so
+            // we can prove that the JObject was skipped.
+            modelState.SetModelValue("CustomParameter.message", "Hello", "Hello");
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            Assert.NotNull(modelBindingResult.Model);
+            var message = Assert.IsType<JObject>(modelBindingResult.Model).GetValue("message").Value<string>();
+            Assert.Equal("Hello", message);
+
+            Assert.True(modelState.IsValid);
+            Assert.Single(modelState);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "CustomParameter.message");
+            Assert.Equal(ModelValidationState.Skipped, entry.Value.ValidationState);
+        }
+
+        // Regression test for https://github.com/aspnet/Mvc/issues/3743
+        //
+        // A cancellation token that's bound with the empty prefix will end up suppressing
+        // the empty prefix. Since the empty prefix is a prefix of everything, this will
+        // basically result in clearing out all model errors, which is BAD.
+        //
+        // The fix is to treat non-user-input as have a key of null, which means that the MSD
+        // isn't even examined when it comes to supressing validation.
+        [Fact]
+        public async Task CancellationToken_WithEmptyPrefix_DoesNotSuppressUnrelatedErrors()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(new TestMvcOptions().Value);
+            var parameter = new ParameterDescriptor
+            {
+                Name = "cancellationToken",
+                ParameterType = typeof(CancellationToken)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext();
+
+            var httpContext = testContext.HttpContext;
+            var modelState = testContext.ModelState;
+
+            // We need to add another model state entry - we want this to be ignored.
+            modelState.SetModelValue("message", "Hello", "Hello");
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            Assert.NotNull(modelBindingResult.Model);
+            Assert.IsType<CancellationToken>(modelBindingResult.Model);
+
+            Assert.False(modelState.IsValid);
+            Assert.Single(modelState);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "message");
+            Assert.Equal(ModelValidationState.Unvalidated, entry.Value.ValidationState);
+        }
+
+        // Similar to CancellationToken_WithEmptyPrefix_DoesNotSuppressUnrelatedErrors - binding the body
+        // with the empty prefix should not cause unrelated modelstate entries to get suppressed.
+        [Fact]
+        public async Task FromBody_WithEmptyPrefix_DoesNotSuppressUnrelatedErrors_Valid()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(new TestMvcOptions().Value);
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo
+                {
+                    BindingSource = BindingSource.Body
+                },
+                ParameterType = typeof(Greeting)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.Body = new MemoryStream(Encoding.UTF8.GetBytes("{ message: \"Hello\" }"));
+                    request.ContentType = "application/json";
+                });
+
+            var httpContext = testContext.HttpContext;
+            var modelState = testContext.ModelState;
+
+            // We need to add another model state entry which should not get changed.
+            modelState.SetModelValue("other.key", "1", "1");
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            Assert.NotNull(modelBindingResult.Model);
+            var message = Assert.IsType<Greeting>(modelBindingResult.Model).Message;
+            Assert.Equal("Hello", message);
+
+            Assert.False(modelState.IsValid);
+            Assert.Single(modelState);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "other.key");
+            Assert.Equal(ModelValidationState.Unvalidated, entry.Value.ValidationState);
+        }
+
+        // Similar to CancellationToken_WithEmptyPrefix_DoesNotSuppressUnrelatedErrors - binding the body
+        // with the empty prefix should not cause unrelated modelstate entries to get suppressed.
+        [Fact]
+        public async Task FromBody_WithEmptyPrefix_DoesNotSuppressUnrelatedErrors_Invalid()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(new TestMvcOptions().Value);
+            var parameter = new ParameterDescriptor
+            {
+                Name = "Parameter1",
+                BindingInfo = new BindingInfo
+                {
+                    BindingSource = BindingSource.Body
+                },
+                ParameterType = typeof(Greeting)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    // This string is too long and will have a validation error.
+                    request.Body = new MemoryStream(Encoding.UTF8.GetBytes("{ message: \"Hello There\" }"));
+                    request.ContentType = "application/json";
+                });
+
+            var httpContext = testContext.HttpContext;
+            var modelState = testContext.ModelState;
+
+            // We need to add another model state entry which should not get changed.
+            modelState.SetModelValue("other.key", "1", "1");
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+            Assert.NotNull(modelBindingResult.Model);
+            var message = Assert.IsType<Greeting>(modelBindingResult.Model).Message;
+            Assert.Equal("Hello There", message);
+
+            Assert.False(modelState.IsValid);
+            Assert.Equal(2, modelState.Count);
+
+            var entry = Assert.Single(modelState, kvp => kvp.Key == "Message");
+            Assert.Equal(ModelValidationState.Invalid, entry.Value.ValidationState);
+
+            entry = Assert.Single(modelState, kvp => kvp.Key == "other.key");
+            Assert.Equal(ModelValidationState.Unvalidated, entry.Value.ValidationState);
+        }
+
+        private class Greeting
+        {
+            [StringLength(5)]
+            public string Message { get; set; }
+        }
+
+        private static void AssertRequiredError(string key, ModelError error)
+        {
+            Assert.Equal(ValidationAttributeUtil.GetRequiredErrorMessage(key), error.ErrorMessage);
+            Assert.Null(error.Exception);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/HtmlLocalizerOfTTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/HtmlLocalizerOfTTest.cs
new file mode 100644
index 0000000000..93464e4b70
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/HtmlLocalizerOfTTest.cs
@@ -0,0 +1,60 @@
+// 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.
+
+using System.Globalization;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Localization.Test
+{
+    public class HtmlLocalizerOfTTest
+    {
+        [Fact]
+        public void HtmlLocalizerOfTTest_UseIndexer_ReturnsLocalizedHtmlString()
+        {
+            // Arrange
+            var localizedString = new LocalizedHtmlString("Hello", "Bonjour");
+
+            var htmlLocalizer = new Mock<IHtmlLocalizer>();
+            htmlLocalizer.Setup(h => h["Hello"]).Returns(localizedString);
+
+            var htmlLocalizerFactory = new Mock<IHtmlLocalizerFactory>();
+            htmlLocalizerFactory.Setup(h => h.Create(typeof(TestClass)))
+                .Returns(htmlLocalizer.Object);
+
+            var htmlLocalizerOfT = new HtmlLocalizer<TestClass>(htmlLocalizerFactory.Object);
+
+            // Act
+            var actualLocalizedString = htmlLocalizerOfT["Hello"];
+
+            // Assert
+            Assert.Equal(localizedString, actualLocalizedString);
+        }
+
+        [Fact]
+        public void HtmlLocalizerOfTTest_UseIndexerWithArguments_ReturnsLocalizedHtmlString()
+        {
+            // Arrange
+            var localizedString = new LocalizedHtmlString("Hello", "Bonjour test");
+
+            var htmlLocalizer = new Mock<IHtmlLocalizer>();
+            htmlLocalizer.Setup(h => h["Hello", "test"]).Returns(localizedString);
+
+            var htmlLocalizerFactory = new Mock<IHtmlLocalizerFactory>();
+            htmlLocalizerFactory.Setup(h => h.Create(typeof(TestClass)))
+                .Returns(htmlLocalizer.Object);
+
+            var htmlLocalizerOfT = new HtmlLocalizer<TestClass>(htmlLocalizerFactory.Object);
+
+            // Act
+            var actualLocalizedString = htmlLocalizerOfT["Hello", "test"];
+
+            // Assert
+            Assert.Equal(localizedString, actualLocalizedString);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/HtmlLocalizerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/HtmlLocalizerTest.cs
new file mode 100644
index 0000000000..d7cf25b528
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/HtmlLocalizerTest.cs
@@ -0,0 +1,258 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Localization.Test
+{
+    public class HtmlLocalizerTest
+    {
+        [Fact]
+        public void HtmlLocalizer_UseIndexer_ReturnsLocalizedHtmlString()
+        {
+            // Arrange
+            var localizedString = new LocalizedString("Hello", "Bonjour");
+            var stringLocalizer = new Mock<IStringLocalizer>();
+            stringLocalizer.Setup(s => s["Hello"]).Returns(localizedString);
+
+            var htmlLocalizer = new HtmlLocalizer(stringLocalizer.Object);
+
+            // Act
+            var actualLocalizedHtmlString = htmlLocalizer["Hello"];
+
+            // Assert
+            Assert.Equal(localizedString.Name, actualLocalizedHtmlString.Name);
+            Assert.Equal(localizedString.Value, actualLocalizedHtmlString.Value);
+        }
+
+        [Fact]
+        public void HtmlLocalizer_UseIndexerWithArguments_ReturnsLocalizedHtmlString()
+        {
+            // Arrange
+            var localizedString = new LocalizedString("Hello", "Bonjour test");
+
+            var stringLocalizer = new Mock<IStringLocalizer>();
+            stringLocalizer.Setup(s => s["Hello"]).Returns(localizedString);
+
+            var htmlLocalizer = new HtmlLocalizer(stringLocalizer.Object);
+
+            // Act
+            var actualLocalizedHtmlString = htmlLocalizer["Hello", "test"];
+
+            // Assert
+            Assert.Equal(localizedString.Name, actualLocalizedHtmlString.Name);
+            Assert.Equal(localizedString.Value, actualLocalizedHtmlString.Value);
+        }
+
+        public static IEnumerable<object[]> HtmlData
+        {
+            get
+            {
+                yield return new object[] { "Bonjour {0} {{{{ }}", new object[] { "test" }, "Bonjour HtmlEncode[[test]] {{ }" };
+                yield return new object[] { "Bonjour {{0}}", new object[] { "{0}" }, "Bonjour {0}" };
+                yield return new object[] { "Bonjour {0:x}", new object[] { 10 }, "Bonjour HtmlEncode[[a]]" };
+                yield return new object[] { "Bonjour {0:x}}}", new object[] { 10 }, "Bonjour HtmlEncode[[x}]]" };
+                yield return new object[] { "Bonjour {{0:x}}", new object[] { 10 }, "Bonjour {0:x}" };
+                yield return new object[] { "{{ Bonjour {{{0:x}}}", new object[] { 10 }, "{ Bonjour {HtmlEncode[[x}]]" };
+                yield return new object[] { "}} Bonjour {{{0:x}}}", new object[] { 10 }, "} Bonjour {HtmlEncode[[x}]]" };
+                yield return new object[] { "}} Bonjour", new object[] { }, "} Bonjour" };
+                yield return new object[] { "{{ {0} }}", new object[] { 10 }, "{ HtmlEncode[[10]] }" };
+                yield return new object[] {
+                    "Bonjour {{{0:x}}} {1:yyyy}",
+                    new object[] { 10, new DateTime(2015, 10, 10) },
+                    "Bonjour {HtmlEncode[[x}]] HtmlEncode[[2015]]"
+                };
+                yield return new object[] {
+                    "Bonjour {{{0:x}}} Bienvenue {{1:yyyy}}",
+                    new object[] { 10, new DateTime(2015, 10, 10) },
+                    "Bonjour {HtmlEncode[[x}]] Bienvenue {1:yyyy}"
+                };
+                yield return new object[] { // padding happens after encoding
+                    "Bonjour {0,6} Bienvenue {{1:yyyy}}",
+                    new object[] { 10, new DateTime(2015, 10, 10) },
+                    "Bonjour HtmlEncode[[10]] Bienvenue {1:yyyy}"
+                };
+                yield return new object[] { // padding happens after encoding
+                    "Bonjour {0,20} Bienvenue {{1:yyyy}}",
+                    new object[] { 10, new DateTime(2015, 10, 10) },
+                    "Bonjour     HtmlEncode[[10]] Bienvenue {1:yyyy}"
+                };
+                yield return new object[] { "{0:{{000}}}", new object[] { 10 }, "HtmlEncode[[{010}]]" };
+                yield return new object[] {
+                    "Bonjour {0:'{{characters that should be escaped}}b'###'b'}",
+                    new object[] { 10 },
+                    "Bonjour HtmlEncode[[{characters that should be escaped}b10b]]"
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(HtmlData))]
+        public void HtmlLocalizer_HtmlWithArguments_ReturnsLocalizedHtml(
+            string format,
+            object[] arguments,
+            string expectedText)
+        {
+            // Arrange
+            var localizedString = new LocalizedString("Hello", format);
+
+            var stringLocalizer = new Mock<IStringLocalizer>();
+            stringLocalizer.Setup(s => s["Hello"]).Returns(localizedString);
+
+            var htmlLocalizer = new HtmlLocalizer(stringLocalizer.Object);
+
+            // Act
+            var localizedHtmlString = htmlLocalizer.GetHtml("Hello", arguments);
+
+            // Assert
+            Assert.NotNull(localizedHtmlString);
+            Assert.Equal(format, localizedHtmlString.Value);
+            using (var writer = new StringWriter())
+            {
+                localizedHtmlString.WriteTo(writer, new HtmlTestEncoder());
+                Assert.Equal(expectedText, writer.ToString());
+            }
+        }
+
+        public static TheoryData<string> InvalidResourceStringData
+        {
+            get
+            {
+                return new TheoryData<string>
+                {
+                    "{0",
+                    "{"
+                };
+            }
+        }
+
+        [Theory]
+        [ReplaceCulture]
+        [MemberData(nameof(InvalidResourceStringData))]
+        public void HtmlLocalizer_HtmlWithInvalidResourceString_ContentThrowsException(string format)
+        {
+            // Arrange
+            var localizedString = new LocalizedString("Hello", format);
+
+            var stringLocalizer = new Mock<IStringLocalizer>();
+            stringLocalizer.Setup(s => s["Hello"]).Returns(localizedString);
+
+            var htmlLocalizer = new HtmlLocalizer(stringLocalizer.Object);
+            var content = htmlLocalizer.GetHtml("Hello", new object[] { });
+
+            // Act
+            var exception = Assert.Throws<FormatException>(
+                () => content.WriteTo(TextWriter.Null, new HtmlTestEncoder()));
+
+            // Assert
+            Assert.NotNull(exception);
+            Assert.Equal("Input string was not in a correct format.", exception.Message);
+        }
+
+        [Fact]
+        public void HtmlLocalizer_GetString_ReturnsLocalizedString()
+        {
+            // Arrange
+            var stringLocalizer = new TestStringLocalizer();
+
+            var htmlLocalizer = new HtmlLocalizer(stringLocalizer);
+
+            // Act
+            var actualLocalizedString = htmlLocalizer.GetString("John");
+
+            // Assert
+            Assert.Equal("Hello John", actualLocalizedString.Value);
+        }
+
+        [Fact]
+        public void HtmlLocalizer_GetStringWithArguments_ReturnsLocalizedString()
+        {
+            // Arrange
+            var stringLocalizer = new TestStringLocalizer();
+
+            var htmlLocalizer = new HtmlLocalizer(stringLocalizer);
+
+            // Act
+            var actualLocalizedString = htmlLocalizer.GetString("John", "Doe");
+
+            // Assert
+            Assert.Equal("Hello John Doe", actualLocalizedString.Value);
+        }
+
+        [Fact]
+        public void HtmlLocalizer_Html_ReturnsLocalizedHtmlString()
+        {
+            // Arrange
+            var stringLocalizer = new TestStringLocalizer();
+
+            var htmlLocalizer = new HtmlLocalizer(stringLocalizer);
+
+            // Act
+            var actualLocalizedHtmlString = htmlLocalizer.GetHtml("John");
+
+            // Assert
+            Assert.Equal("Hello John", actualLocalizedHtmlString.Value);
+        }
+
+        [Fact]
+        public void HtmlLocalizer_WithCulture_ReturnsLocalizedHtmlString()
+        {
+            // Arrange
+            var stringLocalizer = new TestStringLocalizer();
+
+            var htmlLocalizer = new HtmlLocalizer(stringLocalizer);
+
+            // Act
+            var actualLocalizedHtmlString = htmlLocalizer.WithCulture(new CultureInfo("fr"))["John"];
+
+            // Assert
+            Assert.Equal("Bonjour John", actualLocalizedHtmlString.Value);
+        }
+
+        [Fact]
+        public void HtmlLocalizer_GetAllStrings_ReturnsAllLocalizedStrings()
+        {
+            // Arrange
+            var stringLocalizer = new TestStringLocalizer();
+
+            var htmlLocalizer = new HtmlLocalizer(stringLocalizer);
+
+            // Act
+            var allLocalizedStrings = htmlLocalizer.GetAllStrings(includeParentCultures: false).ToList();
+
+            //Assert
+            Assert.Single(allLocalizedStrings);
+            Assert.Equal("World", allLocalizedStrings.First().Value);
+        }
+
+        [Fact]
+        public void HtmlLocalizer_GetAllStringsIncludeParentCulture_ReturnsAllLocalizedStrings()
+        {
+            // Arrange
+            var stringLocalizer = new TestStringLocalizer();
+
+            var htmlLocalizer = new HtmlLocalizer(stringLocalizer);
+
+            // Act
+            var allLocalizedStrings = htmlLocalizer.GetAllStrings().ToList();
+
+            //Assert
+            Assert.Equal(2, allLocalizedStrings.Count);
+            Assert.Equal("World", allLocalizedStrings[0].Value);
+            Assert.Equal("Bar", allLocalizedStrings[1].Value);
+        }
+    }
+
+    public class TestClass
+    {
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/Internal/MvcLocalizationServiceCollectionExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/Internal/MvcLocalizationServiceCollectionExtensionsTest.cs
new file mode 100644
index 0000000000..50f4c7626a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/Internal/MvcLocalizationServiceCollectionExtensionsTest.cs
@@ -0,0 +1,176 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Localization.Internal
+{
+    public class MvcLocalizationServicesTest
+    {
+        [Fact]
+        public void AddLocalizationServices_AddsNeededServices()
+        {
+            // Arrange
+            var collection = new ServiceCollection();
+
+            // Act
+            MvcLocalizationServices.AddMvcViewLocalizationServices(
+                collection,
+                LanguageViewLocationExpanderFormat.Suffix,
+                setupAction: null);
+
+            // Assert
+            AssertContainsSingle(collection, typeof(IHtmlLocalizerFactory), typeof(HtmlLocalizerFactory));
+            AssertContainsSingle(collection, typeof(IHtmlLocalizer<>), typeof(HtmlLocalizer<>));
+            AssertContainsSingle(collection, typeof(IViewLocalizer), typeof(ViewLocalizer));
+        }
+
+        [Fact]
+        public void AddCustomLocalizers_BeforeAddLocalizationServices_AddsNeededServices()
+        {
+            // Arrange
+            var collection = new ServiceCollection();
+
+            // Act
+            collection.Add(ServiceDescriptor.Singleton(typeof(IHtmlLocalizerFactory), typeof(TestHtmlLocalizerFactory)));
+            collection.Add(ServiceDescriptor.Transient(typeof(IHtmlLocalizer<>), typeof(TestHtmlLocalizer<>)));
+            collection.Add(ServiceDescriptor.Transient(typeof(IViewLocalizer), typeof(TestViewLocalizer)));
+
+            MvcLocalizationServices.AddMvcViewLocalizationServices(
+                collection,
+                LanguageViewLocationExpanderFormat.Suffix,
+                setupAction: null);
+
+            AssertContainsSingle(collection, typeof(IHtmlLocalizerFactory), typeof(TestHtmlLocalizerFactory));
+            AssertContainsSingle(collection, typeof(IHtmlLocalizer<>), typeof(TestHtmlLocalizer<>));
+            AssertContainsSingle(collection, typeof(IViewLocalizer), typeof(TestViewLocalizer));
+        }
+
+        private void AssertContainsSingle(
+            IServiceCollection services,
+            Type serviceType,
+            Type implementationType)
+        {
+            var matches = services
+                .Where(sd =>
+                    sd.ServiceType == serviceType &&
+                    sd.ImplementationType == implementationType)
+                .ToArray();
+
+            if (matches.Length == 0)
+            {
+                Assert.True(
+                    false,
+                    $"Could not find an instance of {implementationType} registered as {serviceType}");
+            }
+            else if (matches.Length > 1)
+            {
+                Assert.True(
+                    false,
+                    $"Found multiple instances of {implementationType} registered as {serviceType}");
+            }
+        }
+
+        public class TestViewLocalizer : IViewLocalizer
+        {
+            public LocalizedHtmlString this[string name]
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public LocalizedHtmlString this[string name, params object[] arguments]
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public LocalizedString GetString(string name)
+            {
+                throw new NotImplementedException();
+            }
+
+            public LocalizedString GetString(string name, params object[] arguments)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IHtmlLocalizer WithCulture(CultureInfo culture)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public class TestHtmlLocalizer<HomeController> : IHtmlLocalizer<HomeController>
+        {
+            public LocalizedHtmlString this[string name]
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public LocalizedHtmlString this[string name, params object[] arguments]
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public LocalizedString GetString(string name)
+            {
+                throw new NotImplementedException();
+            }
+
+            public LocalizedString GetString(string name, params object[] arguments)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IHtmlLocalizer WithCulture(CultureInfo culture)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public class TestHtmlLocalizerFactory : IHtmlLocalizerFactory
+        {
+            public IHtmlLocalizer Create(Type resourceSource)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IHtmlLocalizer Create(string baseName, string location)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj
new file mode 100644
index 0000000000..1ca6c1dee7
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationMvcBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationMvcBuilderExtensionsTest.cs
new file mode 100644
index 0000000000..1b0b4e947f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationMvcBuilderExtensionsTest.cs
@@ -0,0 +1,146 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Localization.Test
+{
+    public class MvcLocalizationMvcBuilderExtensionsTest
+    {
+        public static TheoryData<IMvcBuilder> MvcBuilderExtensionsData()
+        {
+            var builder1 = new TestMvcBuilder();
+            builder1.AddMvcLocalization();
+
+            var builder2 = new TestMvcBuilder();
+            builder2.AddMvcLocalization(LanguageViewLocationExpanderFormat.SubFolder);
+
+            var builder3 = new TestMvcBuilder();
+            builder3.AddMvcLocalization(localizationOptionsSetupAction: l => l.ResourcesPath = "Resources");
+
+            var builder4 = new TestMvcBuilder();
+            builder4.AddMvcLocalization(
+                localizationOptionsSetupAction: l => l.ResourcesPath = "Resources",
+                format: LanguageViewLocationExpanderFormat.SubFolder);
+
+            return new TheoryData<IMvcBuilder>()
+            {
+                builder1, builder2, builder3, builder4
+            };
+        }
+
+        [Theory]
+        [MemberData(nameof(MvcBuilderExtensionsData))]
+        public void AddsRequiredServices(IMvcBuilder mvcBuilder)
+        {
+            // Assert
+            var services = mvcBuilder.Services;
+            // Base localization services
+            var service = services.FirstOrDefault(
+                sd => sd.ServiceType == typeof(IStringLocalizerFactory));
+            Assert.NotNull(service);
+            Assert.Equal(ServiceLifetime.Singleton, service.Lifetime);
+            Assert.Equal(typeof(ResourceManagerStringLocalizerFactory), service.ImplementationType);
+
+            service = services.FirstOrDefault(
+                sd => sd.ServiceType == typeof(IStringLocalizer<>));
+            Assert.NotNull(service);
+            Assert.Equal(ServiceLifetime.Transient, service.Lifetime);
+            Assert.Equal(typeof(StringLocalizer<>), service.ImplementationType);
+
+            // View localization services
+            service = services.FirstOrDefault(
+                sd => sd.ServiceType == typeof(IConfigureOptions<MvcDataAnnotationsLocalizationOptions>));
+            Assert.NotNull(service);
+            Assert.Equal(ServiceLifetime.Transient, service.Lifetime);
+
+            service = services.FirstOrDefault(
+                sd => sd.ServiceType == typeof(IConfigureOptions<RazorViewEngineOptions>));
+            Assert.NotNull(service);
+            Assert.Equal(ServiceLifetime.Singleton, service.Lifetime);
+
+            service = services.FirstOrDefault(sd => sd.ServiceType == typeof(IHtmlLocalizerFactory));
+            Assert.NotNull(service);
+            Assert.Equal(typeof(HtmlLocalizerFactory), service.ImplementationType);
+            Assert.Equal(ServiceLifetime.Singleton, service.Lifetime);
+
+            service = services.FirstOrDefault(sd => sd.ServiceType == typeof(IHtmlLocalizer<>));
+            Assert.NotNull(service);
+            Assert.Equal(typeof(HtmlLocalizer<>), service.ImplementationType);
+            Assert.Equal(ServiceLifetime.Transient, service.Lifetime);
+
+            service = services.FirstOrDefault(sd => sd.ServiceType == typeof(IViewLocalizer));
+            Assert.NotNull(service);
+            Assert.Equal(typeof(ViewLocalizer), service.ImplementationType);
+            Assert.Equal(ServiceLifetime.Transient, service.Lifetime);
+        }
+
+        [Fact]
+        public void SetsLocalizationOptions_AsExpected()
+        {
+            // Arrange
+            var builder = new TestMvcBuilder();
+
+            // Act
+            builder.AddMvcLocalization(
+                localizationOptionsSetupAction: options => options.ResourcesPath = "TestResources");
+
+            // Assert
+            var serviceProvider = builder.Services.BuildServiceProvider();
+            var actualOptions = serviceProvider.GetRequiredService<IOptions<LocalizationOptions>>();
+            Assert.Equal("TestResources", actualOptions.Value.ResourcesPath);
+        }
+
+        [Fact]
+        public void SetsDataAnnotationsOptions_AsExpected()
+        {
+            // Arrange
+            var builder = new TestMvcBuilder();
+            var dataAnnotationLocalizerProvider = new Func<Type, IStringLocalizerFactory, IStringLocalizer>((type, factory) =>
+            {
+                return null;
+            });
+
+            // Act
+            builder.AddMvcLocalization(
+                dataAnnotationsLocalizationOptionsSetupAction: options
+                => options.DataAnnotationLocalizerProvider = dataAnnotationLocalizerProvider);
+
+            // Assert
+            var serviceProvider = builder.Services.BuildServiceProvider();
+            var actualOptions = serviceProvider.GetRequiredService<IOptions<MvcDataAnnotationsLocalizationOptions>>();
+            Assert.Same(dataAnnotationLocalizerProvider, actualOptions.Value.DataAnnotationLocalizerProvider);
+        }
+
+        private ServiceDescriptor GetService(IServiceCollection services, Type serviceType)
+        {
+            return services.FirstOrDefault(sd => sd.ServiceType == serviceType);
+        }
+
+        private class TestMvcBuilder : IMvcBuilder
+        {
+            IServiceCollection _services;
+            public IServiceCollection Services
+            {
+                get
+                {
+                    if (_services == null)
+                    {
+                        _services = new ServiceCollection();
+                    }
+                    return _services;
+                }
+            }
+
+            public ApplicationPartManager PartManager => new ApplicationPartManager();
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationMvcCoreBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationMvcCoreBuilderExtensionsTest.cs
new file mode 100644
index 0000000000..1412d35c94
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationMvcCoreBuilderExtensionsTest.cs
@@ -0,0 +1,146 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Localization.Test
+{
+    public class MvcLocalizationMvcCoreBuilderExtensionsTest
+    {
+        public static TheoryData<IMvcCoreBuilder> MvcCoreBuilderExtensionsData()
+        {
+            var builder1 = new TestMvcCoreBuilder();
+            builder1.AddMvcLocalization();
+
+            var builder2 = new TestMvcCoreBuilder();
+            builder2.AddMvcLocalization(LanguageViewLocationExpanderFormat.SubFolder);
+
+            var builder3 = new TestMvcCoreBuilder();
+            builder3.AddMvcLocalization(localizationOptionsSetupAction: l => l.ResourcesPath = "Resources");
+
+            var builder4 = new TestMvcCoreBuilder();
+            builder4.AddMvcLocalization(
+                localizationOptionsSetupAction: l => l.ResourcesPath = "Resources",
+                format: LanguageViewLocationExpanderFormat.SubFolder);
+
+            return new TheoryData<IMvcCoreBuilder>()
+            {
+                builder1, builder2, builder3, builder4
+            };
+        }
+
+        [Theory]
+        [MemberData(nameof(MvcCoreBuilderExtensionsData))]
+        public void AddsRequiredServices(IMvcCoreBuilder mvcCoreBuilder)
+        {
+            // Assert
+            var services = mvcCoreBuilder.Services;
+            // Base localization services
+            var service = services.FirstOrDefault(
+                sd => sd.ServiceType == typeof(IStringLocalizerFactory));
+            Assert.NotNull(service);
+            Assert.Equal(ServiceLifetime.Singleton, service.Lifetime);
+            Assert.Equal(typeof(ResourceManagerStringLocalizerFactory), service.ImplementationType);
+
+            service = services.FirstOrDefault(
+                sd => sd.ServiceType == typeof(IStringLocalizer<>));
+            Assert.NotNull(service);
+            Assert.Equal(ServiceLifetime.Transient, service.Lifetime);
+            Assert.Equal(typeof(StringLocalizer<>), service.ImplementationType);
+
+            // View localization services
+            service = services.FirstOrDefault(
+                sd => sd.ServiceType == typeof(IConfigureOptions<MvcDataAnnotationsLocalizationOptions>));
+            Assert.NotNull(service);
+            Assert.Equal(ServiceLifetime.Transient, service.Lifetime);
+
+            service = services.FirstOrDefault(
+                sd => sd.ServiceType == typeof(IConfigureOptions<RazorViewEngineOptions>));
+            Assert.NotNull(service);
+            Assert.Equal(ServiceLifetime.Transient, service.Lifetime);
+
+            service = services.FirstOrDefault(sd => sd.ServiceType == typeof(IHtmlLocalizerFactory));
+            Assert.NotNull(service);
+            Assert.Equal(typeof(HtmlLocalizerFactory), service.ImplementationType);
+            Assert.Equal(ServiceLifetime.Singleton, service.Lifetime);
+
+            service = services.FirstOrDefault(sd => sd.ServiceType == typeof(IHtmlLocalizer<>));
+            Assert.NotNull(service);
+            Assert.Equal(typeof(HtmlLocalizer<>), service.ImplementationType);
+            Assert.Equal(ServiceLifetime.Transient, service.Lifetime);
+
+            service = services.FirstOrDefault(sd => sd.ServiceType == typeof(IViewLocalizer));
+            Assert.NotNull(service);
+            Assert.Equal(typeof(ViewLocalizer), service.ImplementationType);
+            Assert.Equal(ServiceLifetime.Transient, service.Lifetime);
+        }
+
+        [Fact]
+        public void SetsLocalizationOptions_AsExpected()
+        {
+            // Arrange
+            var builder = new TestMvcCoreBuilder();
+
+            // Act
+            builder.AddMvcLocalization(
+                localizationOptionsSetupAction: options => options.ResourcesPath = "TestResources");
+
+            // Assert
+            var serviceProvider = builder.Services.BuildServiceProvider();
+            var actualOptions = serviceProvider.GetRequiredService<IOptions<LocalizationOptions>>();
+            Assert.Equal("TestResources", actualOptions.Value.ResourcesPath);
+        }
+
+        [Fact]
+        public void SetsDataAnnotationsOptions_AsExpected()
+        {
+            // Arrange
+            var builder = new TestMvcCoreBuilder();
+            var dataAnnotationLocalizerProvider = new Func<Type, IStringLocalizerFactory, IStringLocalizer>((type, factory) =>
+            {
+                return null;
+            });
+
+            // Act
+            builder.AddMvcLocalization(
+                dataAnnotationsLocalizationOptionsSetupAction: options
+                => options.DataAnnotationLocalizerProvider = dataAnnotationLocalizerProvider);
+
+            // Assert
+            var serviceProvider = builder.Services.BuildServiceProvider();
+            var actualOptions = serviceProvider.GetRequiredService<IOptions<MvcDataAnnotationsLocalizationOptions>>();
+            Assert.Same(dataAnnotationLocalizerProvider, actualOptions.Value.DataAnnotationLocalizerProvider);
+        }
+
+        private ServiceDescriptor GetService(IServiceCollection services, Type serviceType)
+        {
+            return services.FirstOrDefault(sd => sd.ServiceType == serviceType);
+        }
+
+        private class TestMvcCoreBuilder : IMvcCoreBuilder
+        {
+            IServiceCollection _services;
+            public IServiceCollection Services
+            {
+                get
+                {
+                    if (_services == null)
+                    {
+                        _services = new ServiceCollection();
+                    }
+                    return _services;
+                }
+            }
+
+            public ApplicationPartManager PartManager => new ApplicationPartManager();
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/TestStringLocalizer.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/TestStringLocalizer.cs
new file mode 100644
index 0000000000..a2268d47c9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/TestStringLocalizer.cs
@@ -0,0 +1,75 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Globalization;
+using Microsoft.Extensions.Localization;
+
+namespace Microsoft.AspNetCore.Mvc.Localization.Test
+{
+    public class TestStringLocalizer : IStringLocalizer
+    {
+        private CultureInfo _culture { get; set; }
+
+        public TestStringLocalizer() : this(null)
+        {
+        }
+
+        public TestStringLocalizer(CultureInfo culture)
+        {
+            _culture = culture;
+        }
+
+        public LocalizedString this[string name]
+        {
+            get
+            {
+                var value = "Hello ";
+
+                if (_culture != null)
+                {
+                    value = "Bonjour ";
+                }
+                return new LocalizedString(name, value + name);
+            }
+        }
+
+        public LocalizedString this[string name, params object[] arguments]
+        {
+            get
+            {
+                var value = "Hello ";
+
+                if (_culture != null)
+                {
+                    value = "Bonjour ";
+                }
+
+                string argument = string.Empty;
+                foreach (var arg in arguments)
+                {
+                    argument = argument + " " + arg;
+                }
+                return new LocalizedString(name, value + name + argument);
+            }
+        }
+
+        public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures)
+        {
+            var allStrings = new List<LocalizedString>();
+            allStrings.Add(new LocalizedString("Hello", "World"));
+
+            if (includeParentCultures)
+            {
+                allStrings.Add(new LocalizedString("Foo", "Bar"));
+            }
+
+            return allStrings;
+        }
+
+        public IStringLocalizer WithCulture(CultureInfo culture)
+        {
+            return new TestStringLocalizer(culture);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/ViewLocalizerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/ViewLocalizerTest.cs
new file mode 100644
index 0000000000..ae1afa5ce2
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/ViewLocalizerTest.cs
@@ -0,0 +1,357 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.Extensions.Localization;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Localization.Test
+{
+    public class ViewLocalizerTest
+    {
+        [Theory]
+        [InlineData("TestApplication", "Views/Home/Index.cshtml", "Views/Home/Index.cshtml", "TestApplication.Views.Home.Index")]
+        [InlineData("TestApplication", "/Views/Home/Index.cshtml", "/Views/Home/Index.cshtml", "TestApplication.Views.Home.Index")]
+        [InlineData("TestApplication", "\\Views\\Home\\Index.cshtml", "\\Views\\Home\\Index.cshtml", "TestApplication.Views.Home.Index")]
+        [InlineData("TestApplication.Web", "Views/Home/Index.cshtml", "Views/Home/Index.cshtml", "TestApplication.Web.Views.Home.Index")]
+        [InlineData("TestApplication", "Views/Home/Index.cshtml", "Views/Shared/_Layout.cshtml", "TestApplication.Views.Shared._Layout")]
+        [InlineData("TestApplication", "Views/Home/Index.cshtml", "Views/Shared/_MyPartial.cshtml", "TestApplication.Views.Shared._MyPartial")]
+        [InlineData("TestApplication", "Views/Home/Index.cshtml", "Views/Home/_HomePartial.cshtml", "TestApplication.Views.Home._HomePartial")]
+        [InlineData("TestApplication", "Views/Home/Index.cshtml", null, "TestApplication.Views.Home.Index")]
+        [InlineData("TestApplication", "Views/Home/Index.txt", null, "TestApplication.Views.Home.Index")]
+        [InlineData("TestApplication", "Views/Home/Index.cshtml", "", "TestApplication.Views.Home.Index")]
+        [InlineData("TestApplication", "Views/Home/Index.txt", "", "TestApplication.Views.Home.Index")]
+        public void ViewLocalizer_LooksForCorrectResourceBaseNameLocation(string appName, string viewPath, string executingPath, string expectedBaseName)
+        {
+            // Arrange
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.Setup(a => a.ApplicationName).Returns(appName);
+            var htmlLocalizerFactory = new Mock<IHtmlLocalizerFactory>(MockBehavior.Loose);
+            var view = new Mock<IView>();
+            view.Setup(v => v.Path).Returns(viewPath);
+            var viewContext = new ViewContext();
+            viewContext.ExecutingFilePath = executingPath;
+            viewContext.View = view.Object;
+            var viewLocalizer = new ViewLocalizer(htmlLocalizerFactory.Object, hostingEnvironment.Object);
+
+            // Act
+            viewLocalizer.Contextualize(viewContext);
+
+            // Assert
+            htmlLocalizerFactory.Verify(h => h.Create(
+                It.Is<string>(baseName => baseName == expectedBaseName),
+                It.Is<string>(location => location == appName)
+            ));
+        }
+
+        [Fact]
+        public void ViewLocalizer_UseIndexer_ReturnsLocalizedHtmlString()
+        {
+            // Arrange
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.Setup(a => a.ApplicationName).Returns("TestApplication");
+
+            var localizedString = new LocalizedHtmlString("Hello", "Bonjour");
+
+            var htmlLocalizer = new Mock<IHtmlLocalizer>();
+            htmlLocalizer.Setup(h => h["Hello"]).Returns(localizedString);
+
+            var htmlLocalizerFactory = new Mock<IHtmlLocalizerFactory>();
+            htmlLocalizerFactory.Setup(h => h.Create("TestApplication.example", "TestApplication"))
+                .Returns(htmlLocalizer.Object);
+
+            var viewLocalizer = new ViewLocalizer(htmlLocalizerFactory.Object, hostingEnvironment.Object);
+
+            var view = new Mock<IView>();
+            view.Setup(v => v.Path).Returns("example");
+            var viewContext = new ViewContext();
+            viewContext.View = view.Object;
+
+            viewLocalizer.Contextualize(viewContext);
+
+            // Act
+            var actualLocalizedString = viewLocalizer["Hello"];
+
+            // Assert
+            Assert.Equal(localizedString, actualLocalizedString);
+        }
+
+        [Fact]
+        public void ViewLocalizer_UseIndexerWithArguments_ReturnsLocalizedHtmlString()
+        {
+            // Arrange
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.Setup(a => a.ApplicationName).Returns("TestApplication");
+
+            var localizedString = new LocalizedHtmlString("Hello", "Bonjour test");
+
+            var htmlLocalizer = new Mock<IHtmlLocalizer>();
+            htmlLocalizer.Setup(h => h["Hello", "test"]).Returns(localizedString);
+
+            var htmlLocalizerFactory = new Mock<IHtmlLocalizerFactory>();
+            htmlLocalizerFactory.Setup(
+                h => h.Create("TestApplication.example", "TestApplication")).Returns(htmlLocalizer.Object);
+
+            var viewLocalizer = new ViewLocalizer(htmlLocalizerFactory.Object, hostingEnvironment.Object);
+
+            var view = new Mock<IView>();
+            view.Setup(v => v.Path).Returns("example");
+            var viewContext = new ViewContext();
+            viewContext.View = view.Object;
+
+            viewLocalizer.Contextualize(viewContext);
+
+            // Act
+            var actualLocalizedString = viewLocalizer["Hello", "test"];
+
+            // Assert
+            Assert.Equal(localizedString, actualLocalizedString);
+        }
+
+        [Fact]
+        public void ViewLocalizer_GetAllStrings_ReturnsLocalizedString()
+        {
+            // Arrange
+            var stringLocalizer = new TestStringLocalizer();
+            var htmlLocalizer = new HtmlLocalizer(stringLocalizer);
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.Setup(a => a.ApplicationName).Returns("TestApplication");
+            var viewLocalizer = new ViewLocalizer(new TestHtmlLocalizerFactory(), hostingEnvironment.Object);
+
+            var view = new Mock<IView>();
+            view.Setup(v => v.Path).Returns("example");
+            var viewContext = new ViewContext();
+            viewContext.View = view.Object;
+
+            viewLocalizer.Contextualize(viewContext);
+
+            // Act
+            var allLocalizedStrings = viewLocalizer.GetAllStrings(includeParentCultures: false).ToList();
+
+            // Assert
+            Assert.Single(allLocalizedStrings);
+            Assert.Equal("World", allLocalizedStrings.First().Value);
+        }
+
+        [Fact]
+        public void ViewLocalizer_GetAllStringsIncludeParentCulture_ReturnsLocalizedString()
+        {
+            // Arrange
+            var stringLocalizer = new TestStringLocalizer();
+            var htmlLocalizer = new HtmlLocalizer(stringLocalizer);
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.Setup(a => a.ApplicationName).Returns("TestApplication");
+            var viewLocalizer = new ViewLocalizer(new TestHtmlLocalizerFactory(), hostingEnvironment.Object);
+
+            var view = new Mock<IView>();
+            view.Setup(v => v.Path).Returns("example");
+            var viewContext = new ViewContext();
+            viewContext.View = view.Object;
+
+            viewLocalizer.Contextualize(viewContext);
+
+            // Act
+            var allLocalizedStrings = viewLocalizer.GetAllStrings(includeParentCultures: true).ToList();
+
+            // Assert
+            Assert.Equal(2, allLocalizedStrings.Count);
+            Assert.Equal("World", allLocalizedStrings[0].Value);
+            Assert.Equal("Bar", allLocalizedStrings[1].Value);
+        }
+
+        [Fact]
+        public void ViewLocalizer_GetString_ReturnsLocalizedString()
+        {
+            // Arrange
+            var stringLocalizer = new TestStringLocalizer();
+            var htmlLocalizer = new HtmlLocalizer(stringLocalizer);
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.Setup(a => a.ApplicationName).Returns("TestApplication");
+            var viewLocalizer = new ViewLocalizer(new TestHtmlLocalizerFactory(), hostingEnvironment.Object);
+
+            var view = new Mock<IView>();
+            view.Setup(v => v.Path).Returns("example");
+            var viewContext = new ViewContext();
+            viewContext.View = view.Object;
+
+            viewLocalizer.Contextualize(viewContext);
+
+            // Act
+            var actualLocalizedString = viewLocalizer.GetString("John");
+
+            // Assert
+            Assert.Equal("Hello John", actualLocalizedString.Value);
+        }
+
+        [Fact]
+        public void ViewLocalizer_GetStringWithArguments_ReturnsLocalizedString()
+        {
+            // Arrange
+            var stringLocalizer = new TestStringLocalizer();
+            var htmlLocalizer = new HtmlLocalizer(stringLocalizer);
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.Setup(a => a.ApplicationName).Returns("TestApplication");
+            var viewLocalizer = new ViewLocalizer(new TestHtmlLocalizerFactory(), hostingEnvironment.Object);
+
+            var view = new Mock<IView>();
+            view.Setup(v => v.Path).Returns("example");
+            var viewContext = new ViewContext();
+            viewContext.View = view.Object;
+
+            viewLocalizer.Contextualize(viewContext);
+
+            // Act
+            var actualLocalizedString = viewLocalizer.GetString("John", "Doe");
+
+            // Assert
+            Assert.Equal("Hello John Doe", actualLocalizedString.Value);
+        }
+
+        [Fact]
+        public void ViewLocalizer_Html_ReturnsLocalizedHtmlString()
+        {
+            // Arrange
+            var stringLocalizer = new TestStringLocalizer();
+            var htmlLocalizer = new HtmlLocalizer(stringLocalizer);
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.Setup(a => a.ApplicationName).Returns("TestApplication");
+            var viewLocalizer = new ViewLocalizer(new TestHtmlLocalizerFactory(), hostingEnvironment.Object);
+
+            var view = new Mock<IView>();
+            view.Setup(v => v.Path).Returns("example");
+            var viewContext = new ViewContext();
+            viewContext.View = view.Object;
+
+            viewLocalizer.Contextualize(viewContext);
+
+            // Act
+            var actualLocalizedString = viewLocalizer.GetHtml("John");
+
+            // Assert
+            Assert.Equal("Hello John", actualLocalizedString.Value);
+        }
+
+        [Fact]
+        public void ViewLocalizer_HtmlWithArguments_ReturnsLocalizedHtmlString()
+        {
+            // Arrange
+            var stringLocalizer = new TestStringLocalizer();
+            var htmlLocalizer = new HtmlLocalizer(stringLocalizer);
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.Setup(a => a.ApplicationName).Returns("TestApplication");
+            var viewLocalizer = new ViewLocalizer(new TestHtmlLocalizerFactory(), hostingEnvironment.Object);
+
+            var view = new Mock<IView>();
+            view.Setup(v => v.Path).Returns("example");
+            var viewContext = new ViewContext();
+            viewContext.View = view.Object;
+
+            viewLocalizer.Contextualize(viewContext);
+
+            // Act
+            var actualLocalizedString = viewLocalizer.GetHtml("John", "Doe");
+
+            // Assert
+            Assert.Equal("Hello John Doe", actualLocalizedString.Value);
+        }
+
+        [Fact]
+        public void ViewLocalizer_WithCulture_ReturnsLocalizedHtmlString()
+        {
+            // Arrange
+            var stringLocalizer = new TestStringLocalizer();
+            var htmlLocalizer = new HtmlLocalizer(stringLocalizer);
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.Setup(a => a.ApplicationName).Returns("TestApplication");
+            var viewLocalizer = new ViewLocalizer(new TestHtmlLocalizerFactory(), hostingEnvironment.Object);
+
+            var view = new Mock<IView>();
+            view.Setup(v => v.Path).Returns("example");
+            var viewContext = new ViewContext();
+            viewContext.View = view.Object;
+
+            viewLocalizer.Contextualize(viewContext);
+
+            // Act
+            var actualLocalizedString = viewLocalizer.WithCulture(new CultureInfo("fr"))["John"];
+
+            // Assert
+            Assert.Equal("Bonjour John", actualLocalizedString.Value);
+        }
+
+        private class TestHtmlLocalizer : IHtmlLocalizer
+        {
+            private IStringLocalizer _stringLocalizer { get; set; }
+
+            public TestHtmlLocalizer(IStringLocalizer stringLocalizer)
+            {
+                _stringLocalizer = stringLocalizer;
+            }
+
+            public LocalizedHtmlString this[string name]
+            {
+                get
+                {
+                    var localizedString = _stringLocalizer.GetString(name);
+                    return new LocalizedHtmlString(
+                        localizedString.Name,
+                        localizedString.Value,
+                        isResourceNotFound: false);
+                }
+            }
+
+            public LocalizedHtmlString this[string name, params object[] arguments]
+            {
+                get
+                {
+                    var localizedString = _stringLocalizer.GetString(name, arguments);
+                    return new LocalizedHtmlString(
+                        localizedString.Name,
+                        localizedString.Value,
+                        isResourceNotFound: false,
+                        arguments: arguments);
+                }
+            }
+
+            public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures)
+            {
+                return _stringLocalizer.GetAllStrings(includeParentCultures);
+            }
+
+            public IHtmlLocalizer WithCulture(CultureInfo culture)
+            {
+                return new TestHtmlLocalizer(new TestStringLocalizer(culture));
+            }
+
+            public LocalizedString GetString(string name)
+            {
+                return _stringLocalizer.GetString(name);
+            }
+
+            public LocalizedString GetString(string name, params object[] arguments)
+            {
+                return _stringLocalizer.GetString(name, arguments);
+            }
+        }
+
+        private class TestHtmlLocalizerFactory : IHtmlLocalizerFactory
+        {
+            public IHtmlLocalizer Create(Type resourceSource)
+            {
+                return new TestHtmlLocalizer(new TestStringLocalizer());
+            }
+
+            public IHtmlLocalizer Create(string baseName, string location)
+            {
+                return new TestHtmlLocalizer(new TestStringLocalizer());
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/ApplicationParts/RazorCompiledItemFeatureProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/ApplicationParts/RazorCompiledItemFeatureProviderTest.cs
new file mode 100644
index 0000000000..ffcc6ad8cf
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/ApplicationParts/RazorCompiledItemFeatureProviderTest.cs
@@ -0,0 +1,131 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Razor.Hosting;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationParts
+{
+    public class RazorCompiledItemFeatureProviderTest
+    {
+        [Fact]
+        public void PopulateFeature_AddsItemsFromProviderTypes()
+        {
+            // Arrange
+            var item1 = Mock.Of<RazorCompiledItem>(i => i.Identifier == "Item1" && i.Type == typeof(TestView));
+            var item2 = Mock.Of<RazorCompiledItem>(i => i.Identifier == "Item2" && i.Type == typeof(TestPage));
+            var part1 = new AssemblyPart(typeof(RazorCompiledItemFeatureProviderTest).Assembly);
+            var part2 = new Mock<ApplicationPart>();
+            part2
+                .As<IRazorCompiledItemProvider>()
+                .Setup(p => p.CompiledItems).Returns(new[] { item1, item2, });
+            var featureProvider = new RazorCompiledItemFeatureProvider();
+            var feature = new ViewsFeature();
+
+            // Act
+            featureProvider.PopulateFeature(new[] { part1, part2.Object }, feature);
+
+            // Assert
+            Assert.Equal(new[] { item1, item2 }, feature.ViewDescriptors.Select(d => d.Item));
+        }
+
+        [Fact]
+        public void PopulateFeature_PopulatesRazorViewAttributeFromTypeAssembly()
+        {
+            // Arrange
+            var item1 = Mock.Of<RazorCompiledItem>(i => i.Identifier == "Item1" && i.Type == typeof(TestView));
+            var item2 = Mock.Of<RazorCompiledItem>(i => i.Identifier == "Item2" && i.Type == typeof(TestPage));
+
+            var attribute1 = new RazorViewAttribute("Item1", typeof(TestView));
+            var attribute2 = new RazorViewAttribute("Item2", typeof(TestPage));
+
+            var assembly = new TestAssembly(new[] { attribute1, attribute2 });
+
+            var part1 = new AssemblyPart(assembly);
+            var part2 = new Mock<ApplicationPart>();
+            part2
+                .As<IRazorCompiledItemProvider>()
+                .Setup(p => p.CompiledItems).Returns(new[] { item1, item2, });
+            var featureProvider = new RazorCompiledItemFeatureProvider();
+            var feature = new ViewsFeature();
+
+            // Act
+            featureProvider.PopulateFeature(new[] { part1, part2.Object }, feature);
+
+            // Assert
+            Assert.Equal(new[] { item1, item2 }, feature.ViewDescriptors.Select(d => d.Item));
+        }
+
+        [Fact]
+        public void PopulateFeature_AllowsDuplicateItemsFromMultipleParts()
+        {
+            // Arrange
+            var item1 = Mock.Of<RazorCompiledItem>(i => i.Identifier == "Item" && i.Type == typeof(TestView));
+            var item2 = Mock.Of<RazorCompiledItem>(i => i.Identifier == "Item" && i.Type == typeof(TestPage));
+            var part1 = new Mock<ApplicationPart>();
+            part1
+                .As<IRazorCompiledItemProvider>()
+                .Setup(p => p.CompiledItems).Returns(new[] { item1, });
+            var part2 = new Mock<ApplicationPart>();
+            part2
+                .As<IRazorCompiledItemProvider>()
+                .Setup(p => p.CompiledItems).Returns(new[] { item2, });
+            var featureProvider = new RazorCompiledItemFeatureProvider();
+            var feature = new ViewsFeature();
+
+            // Act
+            featureProvider.PopulateFeature(new[] { part1.Object, part2.Object }, feature);
+
+            // Assert
+            Assert.Equal(new[] { item1, item2 }, feature.ViewDescriptors.Select(d => d.Item));
+        }
+
+        [Fact]
+        public void PopulateFeature_ThrowsIfTwoItemsFromSamePart_OnlyDifferInCase()
+        {
+            // Arrange
+            var item1 = Mock.Of<RazorCompiledItem>(i => i.Identifier == "Item");
+            var item2 = Mock.Of<RazorCompiledItem>(i => i.Identifier == "item");
+            var expected = string.Join(
+               Environment.NewLine,
+               "The following precompiled view paths differ only in case, which is not supported:",
+               "Item",
+               "item");
+            var part1 = new AssemblyPart(typeof(RazorCompiledItemFeatureProviderTest).Assembly);
+            var part2 = new Mock<ApplicationPart>();
+            part2
+                .As<IRazorCompiledItemProvider>()
+                .Setup(p => p.CompiledItems).Returns(new[] { item1, item2, });
+            var featureProvider = new RazorCompiledItemFeatureProvider();
+            var feature = new ViewsFeature();
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => featureProvider.PopulateFeature(new[] { part1, part2.Object }, feature));
+            Assert.Equal(expected, ex.Message);
+        }
+
+        private class TestAssembly : Assembly
+        {
+            private readonly object[] _attributes;
+
+            public TestAssembly(object[] attributes)
+            {
+                _attributes = attributes;
+            }
+
+            public override object[] GetCustomAttributes(Type attributeType, bool inherit)
+            {
+                return _attributes;
+            }
+        }
+
+        private class TestView { }
+
+        private class TestPage { }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/MetadataReferenceFeatureProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/MetadataReferenceFeatureProviderTest.cs
new file mode 100644
index 0000000000..fe05fdb561
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/MetadataReferenceFeatureProviderTest.cs
@@ -0,0 +1,51 @@
+// 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.
+
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+{
+    public class MetadataReferenceFeatureProviderTest
+    {
+        [Fact]
+        public void PopulateFeature_ReturnsEmptyList_IfNoAssemblyPartsAreRegistered()
+        {
+            // Arrange
+            var applicationPartManager = new ApplicationPartManager();
+            applicationPartManager.ApplicationParts.Add(Mock.Of<ApplicationPart>());
+            applicationPartManager.FeatureProviders.Add(new MetadataReferenceFeatureProvider());
+            var feature = new MetadataReferenceFeature();
+
+            // Act
+            applicationPartManager.PopulateFeature(feature);
+
+            // Assert
+            Assert.Empty(feature.MetadataReferences);
+        }
+
+        [Fact]
+        public void PopulateFeature_AddsMetadataReferenceForAssemblyPartsWithDependencyContext()
+        {
+            // Arrange
+            var applicationPartManager = new ApplicationPartManager();
+            var currentAssembly = GetType().GetTypeInfo().Assembly;
+            var assemblyPart1 = new AssemblyPart(currentAssembly);
+            applicationPartManager.ApplicationParts.Add(assemblyPart1);
+            var assemblyPart2 = new AssemblyPart(typeof(MetadataReferenceFeatureProvider).GetTypeInfo().Assembly);
+            applicationPartManager.ApplicationParts.Add(assemblyPart2);
+            applicationPartManager.FeatureProviders.Add(new MetadataReferenceFeatureProvider());
+            var feature = new MetadataReferenceFeature();
+
+            // Act
+            applicationPartManager.PopulateFeature(feature);
+
+            // Assert
+            Assert.Contains(
+                feature.MetadataReferences,
+                reference => reference.Display.Equals(currentAssembly.Location));
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/ViewsFeatureProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/ViewsFeatureProviderTest.cs
new file mode 100644
index 0000000000..4b76f0c8d9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/ViewsFeatureProviderTest.cs
@@ -0,0 +1,197 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Reflection.Emit;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+{
+#pragma warning disable CS0618 // Type or member is obsolete
+    public class ViewsFeatureProviderTest
+    {
+        [Fact]
+        public void PopulateFeature_ReturnsEmptySequenceIfNoAssemblyPartHasViewAssembly()
+        {
+            // Arrange
+            var applicationPartManager = new ApplicationPartManager();
+            applicationPartManager.ApplicationParts.Add(
+                new AssemblyPart(typeof(ViewsFeatureProviderTest).GetTypeInfo().Assembly));
+            applicationPartManager.FeatureProviders.Add(new ViewsFeatureProvider());
+            var feature = new ViewsFeature();
+
+            // Act
+            applicationPartManager.PopulateFeature(feature);
+
+            // Assert
+            Assert.Empty(feature.ViewDescriptors);
+        }
+
+        [Fact]
+        public void PopulateFeature_ReturnsViewsFromAllAvailableApplicationParts()
+        {
+            // Arrange
+            var part1 = new AssemblyPart(typeof(object).GetTypeInfo().Assembly);
+            var part2 = new AssemblyPart(GetType().GetTypeInfo().Assembly);
+            var featureProvider = new TestableViewsFeatureProvider(new Dictionary<AssemblyPart, IEnumerable<RazorViewAttribute>>
+            {
+                {
+                    part1,
+                    new[]
+                    {
+                        new RazorViewAttribute("/Views/test/Index.cshtml", typeof(object)),
+                    }
+                },
+                {
+                    part2,
+                    new[]
+                    {
+                        new RazorViewAttribute("/Areas/Admin/Views/Index.cshtml", typeof(string)),
+                        new RazorViewAttribute("/Areas/Admin/Views/About.cshtml", typeof(int)),
+                    }
+                },
+            });
+
+            var applicationPartManager = new ApplicationPartManager();
+            applicationPartManager.ApplicationParts.Add(part1);
+            applicationPartManager.ApplicationParts.Add(part2);
+            applicationPartManager.FeatureProviders.Add(featureProvider);
+            var feature = new ViewsFeature();
+
+            // Act
+            applicationPartManager.PopulateFeature(feature);
+
+            // Assert
+            Assert.Collection(feature.ViewDescriptors.OrderBy(f => f.RelativePath, StringComparer.Ordinal),
+                view =>
+                {
+                    Assert.Equal("/Areas/Admin/Views/About.cshtml", view.RelativePath);
+                    Assert.Equal(typeof(int), view.ViewAttribute.ViewType);
+                },
+                view =>
+                {
+                    Assert.Equal("/Areas/Admin/Views/Index.cshtml", view.RelativePath);
+                    Assert.Equal(typeof(string), view.ViewAttribute.ViewType);
+                },
+                view =>
+                {
+                    Assert.Equal("/Views/test/Index.cshtml", view.RelativePath);
+                    Assert.Equal(typeof(object), view.ViewAttribute.ViewType);
+                });
+        }
+
+        [Fact]
+        public void PopulateFeature_ThrowsIfSingleAssemblyContainsMultipleAttributesWithTheSamePath()
+        {
+            // Arrange
+            var path1 = "/Views/test/Index.cshtml";
+            var path2 = "/views/test/index.cshtml";
+            var expected = string.Join(
+                Environment.NewLine,
+                "The following precompiled view paths differ only in case, which is not supported:",
+                path1,
+                path2);
+            var part = new AssemblyPart(typeof(object).GetTypeInfo().Assembly);
+            var featureProvider = new TestableViewsFeatureProvider(new Dictionary<AssemblyPart, IEnumerable<RazorViewAttribute>>
+            {
+                {
+                    part,
+                    new[]
+                    {
+                        new RazorViewAttribute(path1, typeof(object)),
+                        new RazorViewAttribute(path2, typeof(object)),
+                    }
+                },
+            });
+
+            var applicationPartManager = new ApplicationPartManager();
+            applicationPartManager.ApplicationParts.Add(part);
+            applicationPartManager.FeatureProviders.Add(featureProvider);
+            var feature = new ViewsFeature();
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => applicationPartManager.PopulateFeature(feature));
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public void PopulateFeature_ReturnsEmptySequenceIfNoDynamicAssemblyPartHasViewAssembly()
+        {
+            // Arrange
+            var name = new AssemblyName($"DynamicAssembly-{Guid.NewGuid()}");
+            var assembly = AssemblyBuilder.DefineDynamicAssembly(name,
+                AssemblyBuilderAccess.RunAndCollect);
+
+            var applicationPartManager = new ApplicationPartManager();
+            applicationPartManager.ApplicationParts.Add(new AssemblyPart(assembly));
+            applicationPartManager.FeatureProviders.Add(new ViewsFeatureProvider());
+            var feature = new ViewsFeature();
+
+            // Act
+            applicationPartManager.PopulateFeature(feature);
+
+            // Assert
+            Assert.Empty(feature.ViewDescriptors);
+        }
+
+        [Fact]
+        public void PopulateFeature_DoesNotFail_IfAssemblyHasEmptyLocation()
+        {
+            // Arrange
+            var assembly = new AssemblyWithEmptyLocation();
+            var applicationPartManager = new ApplicationPartManager();
+            applicationPartManager.ApplicationParts.Add(new AssemblyPart(assembly));
+            applicationPartManager.FeatureProviders.Add(new ViewsFeatureProvider());
+            var feature = new ViewsFeature();
+
+            // Act
+            applicationPartManager.PopulateFeature(feature);
+
+            // Assert
+            Assert.Empty(feature.ViewDescriptors);
+        }
+
+        private class TestableViewsFeatureProvider : ViewsFeatureProvider
+        {
+            private readonly Dictionary<AssemblyPart, IEnumerable<RazorViewAttribute>> _attributeLookup;
+
+            public TestableViewsFeatureProvider(Dictionary<AssemblyPart, IEnumerable<RazorViewAttribute>> attributeLookup)
+            {
+                _attributeLookup = attributeLookup;
+            }
+
+            protected override IEnumerable<RazorViewAttribute> GetViewAttributes(AssemblyPart assemblyPart)
+            {
+                return _attributeLookup[assemblyPart];
+            }
+        }
+
+        private class AssemblyWithEmptyLocation : Assembly
+        {
+            public override string Location => string.Empty;
+
+            public override string FullName => typeof(ViewsFeatureProviderTest).GetTypeInfo().Assembly.FullName;
+
+            public override IEnumerable<TypeInfo> DefinedTypes
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public override IEnumerable<Module> Modules
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+        }
+    }
+#pragma warning restore CS0618 // Type or member is obsolete
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/MvcRazorMvcBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/MvcRazorMvcBuilderExtensionsTest.cs
new file mode 100644
index 0000000000..eecee7664c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/MvcRazorMvcBuilderExtensionsTest.cs
@@ -0,0 +1,82 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Runtime.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Test.DependencyInjection
+{
+    public class MvcRazorMvcBuilderExtensionsTest
+    {
+        [Fact]
+        public void AddTagHelpersAsServices_ReplacesTagHelperActivatorAndTagHelperTypeResolver()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services
+                .AddMvc()
+                .ConfigureApplicationPartManager(manager =>
+                {
+                    manager.ApplicationParts.Add(new TestApplicationPart());
+                });
+
+            // Act
+            builder.AddTagHelpersAsServices();
+
+            // Assert
+            var activatorDescriptor = Assert.Single(services.ToList(), d => d.ServiceType == typeof(ITagHelperActivator));
+            Assert.Equal(typeof(ServiceBasedTagHelperActivator), activatorDescriptor.ImplementationType);
+        }
+
+        [Fact]
+        public void AddTagHelpersAsServices_RegistersDiscoveredTagHelpers()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            var manager = new ApplicationPartManager();
+            manager.ApplicationParts.Add(new TestApplicationPart(
+                typeof(TestTagHelperOne),
+                typeof(TestTagHelperTwo)));
+
+            manager.FeatureProviders.Add(new TagHelperFeatureProvider());
+
+            var builder = new MvcBuilder(services, manager);
+
+            // Act
+            builder.AddTagHelpersAsServices();
+
+            // Assert
+            var collection = services.ToList();
+            Assert.Equal(3, collection.Count);
+
+            var tagHelperOne = Assert.Single(collection, t => t.ServiceType == typeof(TestTagHelperOne));
+            Assert.Equal(typeof(TestTagHelperOne), tagHelperOne.ImplementationType);
+            Assert.Equal(ServiceLifetime.Transient, tagHelperOne.Lifetime);
+
+            var tagHelperTwo = Assert.Single(collection, t => t.ServiceType == typeof(TestTagHelperTwo));
+            Assert.Equal(typeof(TestTagHelperTwo), tagHelperTwo.ImplementationType);
+            Assert.Equal(ServiceLifetime.Transient, tagHelperTwo.Lifetime);
+
+            var activator = Assert.Single(collection, t => t.ServiceType == typeof(ITagHelperActivator));
+            Assert.Equal(typeof(ServiceBasedTagHelperActivator), activator.ImplementationType);
+            Assert.Equal(ServiceLifetime.Transient, activator.Lifetime);
+        }
+
+        private class TestTagHelperOne : TagHelper
+        {
+        }
+
+        private class TestTagHelperTwo : TagHelper
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/MvcRazorMvcCoreBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/MvcRazorMvcCoreBuilderExtensionsTest.cs
new file mode 100644
index 0000000000..6ea2e2afb5
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/MvcRazorMvcCoreBuilderExtensionsTest.cs
@@ -0,0 +1,181 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Test.DependencyInjection
+{
+    public class MvcRazorMvcCoreBuilderExtensionsTest
+    {
+        [Fact]
+        public void AddMvcCore_OnServiceCollectionWithoutIHostingEnvironmentInstance_DoesNotDiscoverApplicationParts()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            var builder = services
+                .AddMvcCore();
+
+            // Assert
+            Assert.Empty(builder.PartManager.ApplicationParts);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        public void AddMvcCore_OnServiceCollectionWithIHostingEnvironmentInstanceWithInvalidApplicationName_DoesNotDiscoverApplicationParts(string applicationName)
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment
+                .Setup(h => h.ApplicationName)
+                .Returns(applicationName);
+
+            services.AddSingleton(hostingEnvironment.Object);
+
+            // Act
+            var builder = services
+                .AddMvcCore();
+
+            // Assert
+            Assert.Empty(builder.PartManager.ApplicationParts);
+        }
+
+        [Fact]
+        public void AddRazorViewEngine_AddsMetadataReferenceFeatureProvider()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services.AddMvcCore();
+
+            // Act
+            builder.AddRazorViewEngine();
+
+            // Assert
+            Assert.Single(builder.PartManager.FeatureProviders.OfType<MetadataReferenceFeatureProvider>());
+        }
+
+        [Fact]
+        public void AddRazorViewEngine_DoesNotAddMultipleMetadataReferenceFeatureProvider_OnMultipleInvocations()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services.AddMvcCore();
+
+            // Act - 1
+            builder.AddRazorViewEngine();
+
+            // Act - 2
+            builder.AddRazorViewEngine();
+
+            // Assert
+            Assert.Single(builder.PartManager.FeatureProviders.OfType<MetadataReferenceFeatureProvider>());
+        }
+
+        [Fact]
+        public void AddRazorViewEngine_DoesNotReplaceExistingMetadataReferenceFeatureProvider()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services.AddMvcCore();
+            var metadataReferenceFeatureProvider = new MetadataReferenceFeatureProvider();
+            builder.PartManager.FeatureProviders.Add(metadataReferenceFeatureProvider);
+
+            // Act
+            builder.AddRazorViewEngine();
+
+            // Assert
+            var actual = Assert.Single(
+                builder.PartManager.FeatureProviders.OfType<MetadataReferenceFeatureProvider>());
+            Assert.Same(metadataReferenceFeatureProvider, actual);
+        }
+
+        [Fact]
+        public void AddTagHelpersAsServices_ReplacesTagHelperActivatorAndTagHelperTypeResolver()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services
+                .AddMvcCore()
+                .ConfigureApplicationPartManager(manager =>
+                {
+                    manager.ApplicationParts.Add(new TestApplicationPart());
+                });
+
+            // Act
+            builder.AddTagHelpersAsServices();
+
+            // Assert
+            var activatorDescriptor = Assert.Single(services.ToList(), d => d.ServiceType == typeof(ITagHelperActivator));
+            Assert.Equal(typeof(ServiceBasedTagHelperActivator), activatorDescriptor.ImplementationType);
+        }
+
+        [Fact]
+        public void AddTagHelpersAsServices_RegistersDiscoveredTagHelpers()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            var manager = new ApplicationPartManager();
+            manager.ApplicationParts.Add(new TestApplicationPart(
+                typeof(TestTagHelperOne),
+                typeof(TestTagHelperTwo)));
+
+            manager.FeatureProviders.Add(new TestFeatureProvider());
+
+            var builder = new MvcCoreBuilder(services, manager);
+
+            // Act
+            builder.AddTagHelpersAsServices();
+
+            // Assert
+            var collection = services.ToList();
+            Assert.Equal(3, collection.Count);
+
+            var tagHelperOne = Assert.Single(collection, t => t.ServiceType == typeof(TestTagHelperOne));
+            Assert.Equal(typeof(TestTagHelperOne), tagHelperOne.ImplementationType);
+            Assert.Equal(ServiceLifetime.Transient, tagHelperOne.Lifetime);
+
+            var tagHelperTwo = Assert.Single(collection, t => t.ServiceType == typeof(TestTagHelperTwo));
+            Assert.Equal(typeof(TestTagHelperTwo), tagHelperTwo.ImplementationType);
+            Assert.Equal(ServiceLifetime.Transient, tagHelperTwo.Lifetime);
+
+            var activator = Assert.Single(collection, t => t.ServiceType == typeof(ITagHelperActivator));
+            Assert.Equal(typeof(ServiceBasedTagHelperActivator), activator.ImplementationType);
+            Assert.Equal(ServiceLifetime.Transient, activator.Lifetime);
+        }
+
+        private class TestTagHelperOne : TagHelper
+        {
+        }
+
+        private class TestTagHelperTwo : TagHelper
+        {
+        }
+
+        private class TestFeatureProvider : IApplicationFeatureProvider<TagHelperFeature>
+        {
+            public void PopulateFeature(IEnumerable<ApplicationPart> parts, TagHelperFeature feature)
+            {
+                foreach (var type in parts.OfType<IApplicationPartTypeProvider>().SelectMany(tp => tp.Types))
+                {
+                    feature.TagHelpers.Add(type);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/CSharpCompilerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/CSharpCompilerTest.cs
new file mode 100644
index 0000000000..3faddaa0e6
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/CSharpCompilerTest.cs
@@ -0,0 +1,414 @@
+// 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.
+
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Emit;
+using Microsoft.CodeAnalysis.Text;
+using Moq;
+using Xunit;
+using DependencyContextCompilationOptions = Microsoft.Extensions.DependencyModel.CompilationOptions;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class CSharpCompilerTest
+    {
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void GetCompilationOptions_ReturnsDefaultOptionsIfApplicationNameIsNullOrEmpty(string name)
+        {
+            // Arrange
+            var hostingEnvironment = Mock.Of<IHostingEnvironment>(e => e.ApplicationName == name);
+            var referenceManager = Mock.Of<RazorReferenceManager>();
+            var compiler = new CSharpCompiler(referenceManager, hostingEnvironment);
+
+            // Act
+            var options = compiler.GetDependencyContextCompilationOptions();
+
+            // Assert
+            Assert.Same(DependencyContextCompilationOptions.Default, options);
+        }
+
+        [Fact]
+        public void GetCompilationOptions_ReturnsDefaultOptionsIfApplicationDoesNotHaveDependencyContext()
+        {
+            // Arrange
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.SetupGet(e => e.ApplicationName)
+                .Returns(typeof(Controller).GetTypeInfo().Assembly.GetName().Name);
+            var referenceManager = Mock.Of<RazorReferenceManager>();
+            var compiler = new CSharpCompiler(referenceManager, hostingEnvironment.Object);
+
+            // Act
+            var options = compiler.GetDependencyContextCompilationOptions();
+
+            // Assert
+            Assert.Same(DependencyContextCompilationOptions.Default, options);
+        }
+
+        [Fact]
+        public void Constructor_SetsCompilationOptionsFromDependencyContext()
+        {
+            // Arrange
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.SetupGet(e => e.ApplicationName)
+                .Returns(GetType().GetTypeInfo().Assembly.GetName().Name);
+            var compiler = new CSharpCompiler(Mock.Of<RazorReferenceManager>(), hostingEnvironment.Object);
+
+            // Act & Assert
+            var parseOptions = compiler.ParseOptions;
+            Assert.Contains("SOME_TEST_DEFINE", parseOptions.PreprocessorSymbolNames);
+        }
+
+        [Theory]
+        [InlineData("Development", OptimizationLevel.Debug)]
+        [InlineData("Staging", OptimizationLevel.Release)]
+        [InlineData("Production", OptimizationLevel.Release)]
+        public void Constructor_SetsOptimizationLevelBasedOnEnvironment(
+            string environment,
+            OptimizationLevel expected)
+        {
+            // Arrange
+            var options = new RazorViewEngineOptions();
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.SetupGet(e => e.EnvironmentName)
+                  .Returns(environment);
+            var compiler = new CSharpCompiler(Mock.Of<RazorReferenceManager>(), hostingEnvironment.Object);
+
+            // Act & Assert
+            var compilationOptions = compiler.CSharpCompilationOptions;
+            Assert.Equal(expected, compilationOptions.OptimizationLevel);
+        }
+
+        [Theory]
+        [InlineData("Development", "DEBUG")]
+        [InlineData("Staging", "RELEASE")]
+        [InlineData("Production", "RELEASE")]
+        public void EnsureOptions_SetsPreprocessorSymbols(string environment, string expectedConfiguration)
+        {
+            // Arrange
+            var options = new RazorViewEngineOptions();
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.SetupGet(e => e.EnvironmentName)
+                  .Returns(environment);
+            var compiler = new CSharpCompiler(Mock.Of<RazorReferenceManager>(), hostingEnvironment.Object);
+
+            // Act & Assert
+            var parseOptions = compiler.ParseOptions;
+            Assert.Equal(new[] { expectedConfiguration }, parseOptions.PreprocessorSymbolNames);
+        }
+
+        [Fact]
+        public void EnsureOptions_ConfiguresDefaultCompilationOptions()
+        {
+            // Arrange
+            var hostingEnvironment = Mock.Of<IHostingEnvironment>(h => h.EnvironmentName == "Development");
+            var compiler = new CSharpCompiler(Mock.Of<RazorReferenceManager>(), hostingEnvironment);
+
+            // Act & Assert
+            var compilationOptions = compiler.CSharpCompilationOptions;
+            Assert.False(compilationOptions.AllowUnsafe);
+            Assert.Equal(ReportDiagnostic.Default, compilationOptions.GeneralDiagnosticOption);
+            Assert.Equal(OptimizationLevel.Debug, compilationOptions.OptimizationLevel);
+            Assert.Collection(compilationOptions.SpecificDiagnosticOptions.OrderBy(d => d.Key),
+                item =>
+                {
+                    Assert.Equal("CS1701", item.Key);
+                    Assert.Equal(ReportDiagnostic.Suppress, item.Value);
+                },
+                item =>
+                {
+                    Assert.Equal("CS1702", item.Key);
+                    Assert.Equal(ReportDiagnostic.Suppress, item.Value);
+                },
+                item =>
+                {
+                    Assert.Equal("CS1705", item.Key);
+                    Assert.Equal(ReportDiagnostic.Suppress, item.Value);
+                });
+        }
+
+        [Fact]
+        public void EnsureOptions_ConfiguresDefaultParseOptions()
+        {
+            // Arrange
+            var hostingEnvironment = Mock.Of<IHostingEnvironment>(h => h.EnvironmentName == "Development");
+            var compiler = new CSharpCompiler(Mock.Of<RazorReferenceManager>(), hostingEnvironment);
+
+            // Act & Assert
+            var parseOptions = compiler.ParseOptions;
+            Assert.Equal(LanguageVersion.CSharp7, parseOptions.LanguageVersion);
+            Assert.Equal(new[] { "DEBUG" }, parseOptions.PreprocessorSymbolNames);
+        }
+
+        [Fact]
+        public void Constructor_ConfiguresLanguageVersion()
+        {
+            // Arrange
+            var dependencyContextOptions = new DependencyContextCompilationOptions(
+                new[] { "MyDefine" },
+                languageVersion: "7.1",
+                platform: null,
+                allowUnsafe: true,
+                warningsAsErrors: null,
+                optimize: null,
+                keyFile: null,
+                delaySign: null,
+                publicSign: null,
+                debugType: null,
+                emitEntryPoint: null,
+                generateXmlDocumentation: null);
+            var referenceManager = Mock.Of<RazorReferenceManager>();
+            var hostingEnvironment = Mock.Of<IHostingEnvironment>();
+
+            var compiler = new TestCSharpCompiler(referenceManager, hostingEnvironment, dependencyContextOptions);
+
+            // Act & Assert
+            var compilationOptions = compiler.ParseOptions;
+            Assert.Equal(LanguageVersion.CSharp7_1, compilationOptions.LanguageVersion);
+        }
+
+
+        [Fact]
+        public void EmitOptions_ReadsDebugTypeFromDependencyContext()
+        {
+            // Arrange
+            var dependencyContextOptions = new DependencyContextCompilationOptions(
+                new[] { "MyDefine" },
+                languageVersion: "7.1",
+                platform: null,
+                allowUnsafe: true,
+                warningsAsErrors: null,
+                optimize: null,
+                keyFile: null,
+                delaySign: null,
+                publicSign: null,
+                debugType: "portable",
+                emitEntryPoint: null,
+                generateXmlDocumentation: null);
+            var referenceManager = Mock.Of<RazorReferenceManager>();
+            var hostingEnvironment = Mock.Of<IHostingEnvironment>();
+
+            var compiler = new TestCSharpCompiler(referenceManager, hostingEnvironment, dependencyContextOptions);
+
+            // Act & Assert
+            var emitOptions = compiler.EmitOptions;
+            Assert.Equal(DebugInformationFormat.PortablePdb, emitOptions.DebugInformationFormat);
+            Assert.True(compiler.EmitPdb);
+        }
+
+        [Fact]
+        public void EmitOptions_SetsDebugInformationFormatToPortable_WhenDebugTypeIsEmbedded()
+        {
+            // Arrange
+            var dependencyContextOptions = new DependencyContextCompilationOptions(
+                new[] { "MyDefine" },
+                languageVersion: "7.1",
+                platform: null,
+                allowUnsafe: true,
+                warningsAsErrors: null,
+                optimize: null,
+                keyFile: null,
+                delaySign: null,
+                publicSign: null,
+                debugType: "embedded",
+                emitEntryPoint: null,
+                generateXmlDocumentation: null);
+            var referenceManager = Mock.Of<RazorReferenceManager>();
+            var hostingEnvironment = Mock.Of<IHostingEnvironment>();
+
+            var compiler = new TestCSharpCompiler(referenceManager, hostingEnvironment, dependencyContextOptions);
+
+            // Act & Assert
+            var emitOptions = compiler.EmitOptions;
+            Assert.Equal(DebugInformationFormat.PortablePdb, emitOptions.DebugInformationFormat);
+            Assert.True(compiler.EmitPdb);
+        }
+
+        [Fact]
+        public void EmitOptions_DoesNotSetEmitPdb_IfDebugTypeIsNone()
+        {
+            // Arrange
+            var dependencyContextOptions = new DependencyContextCompilationOptions(
+                new[] { "MyDefine" },
+                languageVersion: "7.1",
+                platform: null,
+                allowUnsafe: true,
+                warningsAsErrors: null,
+                optimize: null,
+                keyFile: null,
+                delaySign: null,
+                publicSign: null,
+                debugType: "none",
+                emitEntryPoint: null,
+                generateXmlDocumentation: null);
+            var referenceManager = Mock.Of<RazorReferenceManager>();
+            var hostingEnvironment = Mock.Of<IHostingEnvironment>();
+
+            var compiler = new TestCSharpCompiler(referenceManager, hostingEnvironment, dependencyContextOptions);
+
+            // Act & Assert
+            Assert.False(compiler.EmitPdb);
+        }
+
+        [Fact]
+        public void Constructor_ConfiguresAllowUnsafe()
+        {
+            // Arrange
+            var dependencyContextOptions = new DependencyContextCompilationOptions(
+                new[] { "MyDefine" },
+                languageVersion: null,
+                platform: null,
+                allowUnsafe: true,
+                warningsAsErrors: null,
+                optimize: null,
+                keyFile: null,
+                delaySign: null,
+                publicSign: null,
+                debugType: null,
+                emitEntryPoint: null,
+                generateXmlDocumentation: null);
+            var referenceManager = Mock.Of<RazorReferenceManager>();
+            var hostingEnvironment = Mock.Of<IHostingEnvironment>();
+
+            var compiler = new TestCSharpCompiler(referenceManager, hostingEnvironment, dependencyContextOptions);
+
+            // Act & Assert
+            var compilationOptions = compiler.CSharpCompilationOptions;
+            Assert.True(compilationOptions.AllowUnsafe);
+        }
+
+        [Fact]
+        public void Constructor_SetsDiagnosticOption()
+        {
+            // Arrange
+            var dependencyContextOptions = new DependencyContextCompilationOptions(
+                new[] { "MyDefine" },
+                languageVersion: null,
+                platform: null,
+                allowUnsafe: null,
+                warningsAsErrors: true,
+                optimize: null,
+                keyFile: null,
+                delaySign: null,
+                publicSign: null,
+                debugType: null,
+                emitEntryPoint: null,
+                generateXmlDocumentation: null);
+            var referenceManager = Mock.Of<RazorReferenceManager>();
+            var hostingEnvironment = Mock.Of<IHostingEnvironment>();
+
+            var compiler = new TestCSharpCompiler(referenceManager, hostingEnvironment, dependencyContextOptions);
+
+            // Act & Assert
+            var compilationOptions = compiler.CSharpCompilationOptions;
+            Assert.Equal(ReportDiagnostic.Error, compilationOptions.GeneralDiagnosticOption);
+        }
+
+        [Fact]
+        public void Constructor_SetsOptimizationLevel()
+        {
+            // Arrange
+            var dependencyContextOptions = new DependencyContextCompilationOptions(
+                new[] { "MyDefine" },
+                languageVersion: null,
+                platform: null,
+                allowUnsafe: null,
+                warningsAsErrors: null,
+                optimize: true,
+                keyFile: null,
+                delaySign: null,
+                publicSign: null,
+                debugType: null,
+                emitEntryPoint: null,
+                generateXmlDocumentation: null);
+            var referenceManager = Mock.Of<RazorReferenceManager>();
+            var hostingEnvironment = Mock.Of<IHostingEnvironment>();
+
+            var compiler = new TestCSharpCompiler(referenceManager, hostingEnvironment, dependencyContextOptions);
+
+            // Act & Assert
+            var compilationOptions = compiler.CSharpCompilationOptions;
+            Assert.Equal(OptimizationLevel.Release, compilationOptions.OptimizationLevel);
+        }
+
+        [Fact]
+        public void Constructor_SetsDefines()
+        {
+            // Arrange
+            var dependencyContextOptions = new DependencyContextCompilationOptions(
+                new[] { "MyDefine" },
+                languageVersion: null,
+                platform: null,
+                allowUnsafe: null,
+                warningsAsErrors: null,
+                optimize: true,
+                keyFile: null,
+                delaySign: null,
+                publicSign: null,
+                debugType: null,
+                emitEntryPoint: null,
+                generateXmlDocumentation: null);
+            var referenceManager = Mock.Of<RazorReferenceManager>();
+            var hostingEnvironment = Mock.Of<IHostingEnvironment>();
+
+            var compiler = new TestCSharpCompiler(referenceManager, hostingEnvironment, dependencyContextOptions);
+
+            // Act & Assert
+            var parseOptions = compiler.ParseOptions;
+            Assert.Equal(new[] { "MyDefine", "RELEASE" }, parseOptions.PreprocessorSymbolNames);
+        }
+
+        [Fact]
+        public void Compile_UsesApplicationsCompilationSettings_ForParsingAndCompilation()
+        {
+            // Arrange
+            var content = "public class Test {}";
+            var define = "MY_CUSTOM_DEFINE";
+            var dependencyContextOptions = new DependencyContextCompilationOptions(
+                new[] { define },
+                languageVersion: null,
+                platform: null,
+                allowUnsafe: null,
+                warningsAsErrors: null,
+                optimize: true,
+                keyFile: null,
+                delaySign: null,
+                publicSign: null,
+                debugType: null,
+                emitEntryPoint: null,
+                generateXmlDocumentation: null);
+            var referenceManager = Mock.Of<RazorReferenceManager>();
+            var hostingEnvironment = Mock.Of<IHostingEnvironment>();
+            var compiler = new TestCSharpCompiler(referenceManager, hostingEnvironment, dependencyContextOptions);
+
+            // Act
+            var syntaxTree = compiler.CreateSyntaxTree(SourceText.From(content));
+
+            // Assert
+            Assert.Contains(define, syntaxTree.Options.PreprocessorSymbolNames);
+        }
+
+        private class TestCSharpCompiler : CSharpCompiler
+        {
+            private readonly DependencyContextCompilationOptions _options;
+
+            public TestCSharpCompiler(
+                RazorReferenceManager referenceManager,
+                IHostingEnvironment hostingEnvironment,
+                DependencyContextCompilationOptions options)
+                : base(referenceManager, hostingEnvironment)
+            {
+                _options = options;
+            }
+
+            protected internal override DependencyContextCompilationOptions GetDependencyContextCompilationOptions()
+                => _options;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ChecksumValidatorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ChecksumValidatorTest.cs
new file mode 100644
index 0000000000..b1e72b56c9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ChecksumValidatorTest.cs
@@ -0,0 +1,195 @@
+// 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.
+
+using Microsoft.AspNetCore.Razor.Hosting;
+using Microsoft.AspNetCore.Razor.Language;
+using Xunit;
+using static Microsoft.AspNetCore.Razor.Hosting.TestRazorCompiledItem;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class ChecksumValidatorTest
+    {
+        public ChecksumValidatorTest()
+        {
+            ProjectFileSystem = new VirtualRazorProjectFileSystem();
+        }
+
+        public VirtualRazorProjectFileSystem ProjectFileSystem { get; }
+
+        [Fact]
+        public void IsRecompilationSupported_NoChecksums_ReturnsFalse()
+        {
+            // Arrange
+            var item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", "/Views/Home/Index.cstml", new object[] { });
+
+            // Act
+            var result = ChecksumValidator.IsRecompilationSupported(item);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsRecompilationSupported_NoPrimaryChecksum_ReturnsFalse()
+        {
+            // Arrange
+            var item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", "/Views/Home/Index.cstml", new object[]
+            {
+                new RazorSourceChecksumAttribute("SHA1", GetChecksum("some import"), "/Views/Home/_ViewImports.cstml"),
+            });
+
+            // Act
+            var result = ChecksumValidator.IsRecompilationSupported(item);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsRecompilationSupported_HasPrimaryChecksum_ReturnsTrue()
+        {
+            // Arrange
+            var item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", "/Views/Home/Index.cstml", new object[]
+            {
+                new RazorSourceChecksumAttribute("SHA1", GetChecksum("some import"), "/Views/Home/_ViewImports.cstml"),
+                new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), "/Views/Home/Index.cstml"),
+            });
+
+            // Act
+            var result = ChecksumValidator.IsRecompilationSupported(item);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void IsItemValid_NoChecksums_ReturnsTrue()
+        {
+            // Arrange
+            var item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", "/Views/Home/Index.cstml", new object[] { });
+
+            // Act
+            var result = ChecksumValidator.IsItemValid(ProjectFileSystem, item);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void IsItemValid_NoPrimaryChecksum_ReturnsTrue()
+        {
+            // Arrange
+            var item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", "/Views/Home/Index.cstml", new object[]
+            {
+                new RazorSourceChecksumAttribute("SHA1", GetChecksum("some import"), "/Views/Home/_ViewImports.cstml"),
+                new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), "/Views/Home/About.cstml"),
+            });
+
+            // Act
+            var result = ChecksumValidator.IsItemValid(ProjectFileSystem, item);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void IsItemValid_PrimaryFileDoesNotExist_ReturnsTrue()
+        {
+            // Arrange
+            var item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", "/Views/Home/Index.cstml", new object[]
+            {
+                new RazorSourceChecksumAttribute("SHA1", GetChecksum("some import"), "/Views/Home/_ViewImports.cstml"),
+                new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), "/Views/Home/Index.cstml"),
+            });
+
+            ProjectFileSystem.Add(new TestRazorProjectItem("/Views/Home/_ViewImports.cstml", "dkdkfkdf")); // This will be ignored
+
+            // Act
+            var result = ChecksumValidator.IsItemValid(ProjectFileSystem, item);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void IsItemValid_PrimaryFileExistsButDoesNotMatch_ReturnsFalse()
+        {
+            // Arrange
+            var item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", "/Views/Home/Index.cstml", new object[]
+            {
+                new RazorSourceChecksumAttribute("SHA1", GetChecksum("some import"), "/Views/Home/_ViewImports.cstml"),
+                new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), "/Views/Home/Index.cstml"),
+            });
+
+            ProjectFileSystem.Add(new TestRazorProjectItem("/Views/Home/Index.cstml", "other content"));
+
+            // Act
+            var result = ChecksumValidator.IsItemValid(ProjectFileSystem, item);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsItemValid_ImportFileDoesNotExist_ReturnsFalse()
+        {
+            // Arrange
+            var item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", "/Views/Home/Index.cstml", new object[]
+            {
+                new RazorSourceChecksumAttribute("SHA1", GetChecksum("some import"), "/Views/Home/_ViewImports.cstml"),
+                new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), "/Views/Home/Index.cstml"),
+            });
+
+            ProjectFileSystem.Add(new TestRazorProjectItem("/Views/Home/Index.cstml", "some content"));
+
+            // Act
+            var result = ChecksumValidator.IsItemValid(ProjectFileSystem, item);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsItemValid_ImportFileExistsButDoesNotMatch_ReturnsFalse()
+        {
+            // Arrange
+            var item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", "/Views/Home/Index.cstml", new object[]
+            {
+                new RazorSourceChecksumAttribute("SHA1", GetChecksum("some import"), "/Views/Home/_ViewImports.cstml"),
+                new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), "/Views/Home/Index.cstml"),
+            });
+
+            ProjectFileSystem.Add(new TestRazorProjectItem("/Views/Home/Index.cstml", "some content"));
+            ProjectFileSystem.Add(new TestRazorProjectItem("/Views/Home/_ViewImports.cstml", "some other import"));
+
+            // Act
+            var result = ChecksumValidator.IsItemValid(ProjectFileSystem, item);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void IsItemValid_AllFilesMatch_ReturnsTrue()
+        {
+            // Arrange
+            var item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", "/Views/Home/Index.cstml", new object[]
+            {
+                new RazorSourceChecksumAttribute("SHA1", GetChecksum("some other import"), "/Views/_ViewImports.cstml"),
+                new RazorSourceChecksumAttribute("SHA1", GetChecksum("some import"), "/Views/Home/_ViewImports.cstml"),
+                new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), "/Views/Home/Index.cstml"),
+            });
+
+            ProjectFileSystem.Add(new TestRazorProjectItem("/Views/Home/Index.cstml", "some content"));
+            ProjectFileSystem.Add(new TestRazorProjectItem("/Views/Home/_ViewImports.cstml", "some import"));
+            ProjectFileSystem.Add(new TestRazorProjectItem("/Views/_ViewImports.cstml", "some other import"));
+
+            // Act
+            var result = ChecksumValidator.IsItemValid(ProjectFileSystem, item);
+
+            // Assert
+            Assert.True(result);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/CompilerFailedExceptionFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/CompilerFailedExceptionFactoryTest.cs
new file mode 100644
index 0000000000..05e156a6ef
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/CompilerFailedExceptionFactoryTest.cs
@@ -0,0 +1,330 @@
+// 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.
+
+using System.IO;
+using System.Text;
+using Microsoft.AspNetCore.Mvc.Razor.Extensions;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class CompilerFailedExceptionFactoryTest
+    {
+        [Fact]
+        public void GetCompilationFailedResult_ReadsRazorErrorsFromPage()
+        {
+            // Arrange
+            var viewPath = "/Views/Home/Index.cshtml";
+
+            var fileSystem = new VirtualRazorProjectFileSystem();
+            fileSystem.Add(new TestRazorProjectItem(viewPath, "<span name=\"@(User.Id\">"));
+
+            var razorEngine = RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem).Engine;
+
+            var templateEngine = new MvcRazorTemplateEngine(razorEngine, fileSystem);
+            var codeDocument = templateEngine.CreateCodeDocument(viewPath);
+
+            // Act
+            var csharpDocument = templateEngine.GenerateCode(codeDocument);
+            var compilationResult = CompilationFailedExceptionFactory.Create(codeDocument, csharpDocument.Diagnostics);
+
+            // Assert
+            var failure = Assert.Single(compilationResult.CompilationFailures);
+            Assert.Equal(viewPath, failure.SourceFilePath);
+            Assert.Collection(failure.Messages,
+                message => Assert.StartsWith(
+                    @"Unterminated string literal.",
+                    message.Message),
+                message => Assert.StartsWith(
+                    @"The explicit expression block is missing a closing "")"" character.",
+                    message.Message));
+        }
+
+        [Fact]
+        public void GetCompilationFailedResult_UsesPhysicalPath()
+        {
+            // Arrange
+            var viewPath = "/Views/Home/Index.cshtml";
+            var physicalPath = @"x:\myapp\views\home\index.cshtml";
+
+            var fileSystem = new VirtualRazorProjectFileSystem();
+            fileSystem.Add(new TestRazorProjectItem(viewPath, "<span name=\"@(User.Id\">", physicalPath: physicalPath));
+
+            var razorEngine = RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem).Engine;
+            var templateEngine = new MvcRazorTemplateEngine(razorEngine, fileSystem);
+
+            var codeDocument = templateEngine.CreateCodeDocument(viewPath);
+
+            // Act
+            var csharpDocument = templateEngine.GenerateCode(codeDocument);
+            var compilationResult = CompilationFailedExceptionFactory.Create(codeDocument, csharpDocument.Diagnostics);
+
+            // Assert
+            var failure = Assert.Single(compilationResult.CompilationFailures);
+            Assert.Equal(physicalPath, failure.SourceFilePath);
+        }
+
+        [Fact]
+        public void GetCompilationFailedResult_ReadsContentFromSourceDocuments()
+        {
+            // Arrange
+            var viewPath = "/Views/Home/Index.cshtml";
+            var fileContent =
+@"
+@if (User.IsAdmin)
+{
+    <span>
+}
+</span>";
+
+            var fileSystem = new VirtualRazorProjectFileSystem();
+            fileSystem.Add(new TestRazorProjectItem(viewPath, fileContent));
+
+            var razorEngine = RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem).Engine;
+            var templateEngine = new MvcRazorTemplateEngine(razorEngine, fileSystem);
+
+            var codeDocument = templateEngine.CreateCodeDocument(viewPath);
+
+            // Act
+            var csharpDocument = templateEngine.GenerateCode(codeDocument);
+            var compilationResult = CompilationFailedExceptionFactory.Create(codeDocument, csharpDocument.Diagnostics);
+
+            // Assert
+            var failure = Assert.Single(compilationResult.CompilationFailures);
+            Assert.Equal(fileContent, failure.SourceFileContent);
+        }
+
+        [Fact]
+        public void GetCompilationFailedResult_ReadsContentFromImports()
+        {
+            // Arrange
+            var viewPath = "/Views/Home/Index.cshtml";
+            var importsPath = "/Views/_MyImports.cshtml";
+            var fileContent = "@ ";
+            var importsContent = "@(abc";
+
+            var fileSystem = new VirtualRazorProjectFileSystem();
+            fileSystem.Add(new TestRazorProjectItem(viewPath, fileContent));
+            fileSystem.Add(new TestRazorProjectItem("/Views/_MyImports.cshtml", importsContent));
+
+            var razorEngine = RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem).Engine;
+            var templateEngine = new MvcRazorTemplateEngine(razorEngine, fileSystem)
+            {
+                Options =
+                {
+                    ImportsFileName = "_MyImports.cshtml",
+                }
+            };
+            var codeDocument = templateEngine.CreateCodeDocument(viewPath);
+
+            // Act
+            var csharpDocument = templateEngine.GenerateCode(codeDocument);
+            var compilationResult = CompilationFailedExceptionFactory.Create(codeDocument, csharpDocument.Diagnostics);
+
+            // Assert
+            Assert.Collection(
+                compilationResult.CompilationFailures,
+                failure =>
+                {
+                    Assert.Equal(viewPath, failure.SourceFilePath);
+                    Assert.Collection(failure.Messages,
+                        message =>
+                        {
+                            Assert.Equal(@"A space or line break was encountered after the ""@"" character.  Only valid identifiers, keywords, comments, ""("" and ""{"" are valid at the start of a code block and they must occur immediately following ""@"" with no space in between.",
+                                message.Message);
+                        });
+                },
+                failure =>
+                {
+                    Assert.Equal(importsPath, failure.SourceFilePath);
+                    Assert.Collection(failure.Messages,
+                        message =>
+                        {
+                            Assert.Equal(@"The explicit expression block is missing a closing "")"" character.  Make sure you have a matching "")"" character for all the ""("" characters within this block, and that none of the "")"" characters are being interpreted as markup.",
+                            message.Message);
+                        });
+                });
+        }
+
+        [Fact]
+        public void GetCompilationFailedResult_GroupsMessages()
+        {
+            // Arrange
+            var viewPath = "views/index.razor";
+            var viewImportsPath = "views/global.import.cshtml";
+            var codeDocument = RazorCodeDocument.Create(
+                Create(viewPath, "View Content"),
+                new[] { Create(viewImportsPath, "Global Import Content") });
+            var diagnostics = new[]
+            {
+                GetRazorDiagnostic("message-1", new SourceLocation(1, 2, 17), length: 1),
+                GetRazorDiagnostic("message-2", new SourceLocation(viewPath, 1, 4, 6), length: 7),
+                GetRazorDiagnostic("message-3", SourceLocation.Undefined, length: -1),
+                GetRazorDiagnostic("message-4", new SourceLocation(viewImportsPath, 1, 3, 8), length: 4),
+            };
+
+            // Act
+            var result = CompilationFailedExceptionFactory.Create(codeDocument, diagnostics);
+
+            // Assert
+            Assert.Collection(result.CompilationFailures,
+            failure =>
+            {
+                Assert.Equal(viewPath, failure.SourceFilePath);
+                Assert.Equal("View Content", failure.SourceFileContent);
+                Assert.Collection(failure.Messages,
+                    message =>
+                    {
+                        Assert.Equal(diagnostics[0].GetMessage(), message.Message);
+                        Assert.Equal(viewPath, message.SourceFilePath);
+                        Assert.Equal(3, message.StartLine);
+                        Assert.Equal(17, message.StartColumn);
+                        Assert.Equal(3, message.EndLine);
+                        Assert.Equal(18, message.EndColumn);
+                    },
+                    message =>
+                    {
+                        Assert.Equal(diagnostics[1].GetMessage(), message.Message);
+                        Assert.Equal(viewPath, message.SourceFilePath);
+                        Assert.Equal(5, message.StartLine);
+                        Assert.Equal(6, message.StartColumn);
+                        Assert.Equal(5, message.EndLine);
+                        Assert.Equal(13, message.EndColumn);
+                    },
+                    message =>
+                    {
+                        Assert.Equal(diagnostics[2].GetMessage(), message.Message);
+                        Assert.Equal(viewPath, message.SourceFilePath);
+                        Assert.Equal(0, message.StartLine);
+                        Assert.Equal(-1, message.StartColumn);
+                        Assert.Equal(0, message.EndLine);
+                        Assert.Equal(-2, message.EndColumn);
+                    });
+            },
+            failure =>
+            {
+                Assert.Equal(viewImportsPath, failure.SourceFilePath);
+                Assert.Equal("Global Import Content", failure.SourceFileContent);
+                Assert.Collection(failure.Messages,
+                    message =>
+                    {
+                        Assert.Equal(diagnostics[3].GetMessage(), message.Message);
+                        Assert.Equal(viewImportsPath, message.SourceFilePath);
+                        Assert.Equal(4, message.StartLine);
+                        Assert.Equal(8, message.StartColumn);
+                        Assert.Equal(4, message.EndLine);
+                        Assert.Equal(12, message.EndColumn);
+                    });
+            });
+        }
+
+        [Fact]
+        public void GetCompilationFailedResult_ReturnsCompilationResult_WithGroupedMessages()
+        {
+            // Arrange
+            var viewPath = "Views/Home/Index";
+            var generatedCodeFileName = "Generated Code";
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("view-content", viewPath));
+            var assemblyName = "random-assembly-name";
+
+            var diagnostics = new[]
+            {
+                Diagnostic.Create(
+                    GetRoslynDiagnostic("message-1"),
+                    Location.Create(
+                        viewPath,
+                        new TextSpan(10, 5),
+                        new LinePositionSpan(new LinePosition(10, 1), new LinePosition(10, 2)))),
+                Diagnostic.Create(
+                    GetRoslynDiagnostic("message-2"),
+                    Location.Create(
+                        assemblyName,
+                        new TextSpan(1, 6),
+                        new LinePositionSpan(new LinePosition(1, 2), new LinePosition(3, 4)))),
+                Diagnostic.Create(
+                    GetRoslynDiagnostic("message-3"),
+                    Location.Create(
+                        viewPath,
+                        new TextSpan(40, 50),
+                        new LinePositionSpan(new LinePosition(30, 5), new LinePosition(40, 12)))),
+            };
+
+            // Act
+            var compilationResult = CompilationFailedExceptionFactory.Create(
+                codeDocument,
+                "compilation-content",
+                assemblyName,
+                diagnostics);
+
+            // Assert
+            Assert.Collection(compilationResult.CompilationFailures,
+                failure =>
+                {
+                    Assert.Equal(viewPath, failure.SourceFilePath);
+                    Assert.Equal("view-content", failure.SourceFileContent);
+                    Assert.Collection(failure.Messages,
+                        message =>
+                        {
+                            Assert.Equal("message-1", message.Message);
+                            Assert.Equal(viewPath, message.SourceFilePath);
+                            Assert.Equal(11, message.StartLine);
+                            Assert.Equal(2, message.StartColumn);
+                            Assert.Equal(11, message.EndLine);
+                            Assert.Equal(3, message.EndColumn);
+                        },
+                        message =>
+                        {
+                            Assert.Equal("message-3", message.Message);
+                            Assert.Equal(viewPath, message.SourceFilePath);
+                            Assert.Equal(31, message.StartLine);
+                            Assert.Equal(6, message.StartColumn);
+                            Assert.Equal(41, message.EndLine);
+                            Assert.Equal(13, message.EndColumn);
+                        });
+                },
+                failure =>
+                {
+                    Assert.Equal(generatedCodeFileName, failure.SourceFilePath);
+                    Assert.Equal("compilation-content", failure.SourceFileContent);
+                    Assert.Collection(failure.Messages,
+                        message =>
+                        {
+                            Assert.Equal("message-2", message.Message);
+                            Assert.Equal(assemblyName, message.SourceFilePath);
+                            Assert.Equal(2, message.StartLine);
+                            Assert.Equal(3, message.StartColumn);
+                            Assert.Equal(4, message.EndLine);
+                            Assert.Equal(5, message.EndColumn);
+                        });
+                });
+        }
+
+        private static RazorSourceDocument Create(string path, string template)
+        {
+            var stream = new MemoryStream(Encoding.UTF8.GetBytes(template));
+            return RazorSourceDocument.ReadFrom(stream, path);
+        }
+
+        private static RazorDiagnostic GetRazorDiagnostic(string message, SourceLocation sourceLocation, int length)
+        {
+            var diagnosticDescriptor = new RazorDiagnosticDescriptor("test-id", () => message, RazorDiagnosticSeverity.Error);
+            var sourceSpan = new SourceSpan(sourceLocation, length);
+
+            return RazorDiagnostic.Create(diagnosticDescriptor, sourceSpan);
+        }
+
+        private static DiagnosticDescriptor GetRoslynDiagnostic(string messageFormat)
+        {
+            return new DiagnosticDescriptor(
+                id: "someid",
+                title: "sometitle",
+                messageFormat: messageFormat,
+                category: "some-category",
+                defaultSeverity: DiagnosticSeverity.Error,
+                isEnabledByDefault: true);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorPageFactoryProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorPageFactoryProviderTest.cs
new file mode 100644
index 0000000000..c216e4993a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorPageFactoryProviderTest.cs
@@ -0,0 +1,121 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.Extensions.Primitives;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class DefaultRazorPageFactoryProviderTest
+    {
+        [Fact]
+        public void CreateFactory_ReturnsViewDescriptor_ForUnsuccessfulResults()
+        {
+            // Arrange
+            var path = "/file-does-not-exist";
+            var expirationTokens = new[]
+            {
+                Mock.Of<IChangeToken>(),
+                Mock.Of<IChangeToken>(),
+            };
+            var descriptor = new CompiledViewDescriptor
+            {
+                RelativePath = path,
+                ExpirationTokens = expirationTokens,
+            };
+            var compilerCache = new Mock<IViewCompiler>();
+            compilerCache
+                .Setup(f => f.CompileAsync(It.IsAny<string>()))
+                .ReturnsAsync(descriptor);
+
+            var factoryProvider = new DefaultRazorPageFactoryProvider(GetCompilerProvider(compilerCache.Object));
+
+            // Act
+            var result = factoryProvider.CreateFactory(path);
+
+            // Assert
+            Assert.False(result.Success);
+            Assert.Same(descriptor, result.ViewDescriptor);
+        }
+
+        [Fact]
+        public void CreateFactory_ReturnsViewDescriptor_ForSuccessfulResults()
+        {
+            // Arrange
+            var relativePath = "/file-exists";
+            var expirationTokens = new[]
+            {
+                Mock.Of<IChangeToken>(),
+                Mock.Of<IChangeToken>(),
+            };
+            var descriptor = new CompiledViewDescriptor
+            {
+                RelativePath = relativePath,
+                ViewAttribute = new RazorViewAttribute(relativePath, typeof(TestRazorPage)),
+                ExpirationTokens = expirationTokens,
+            };
+            var compilerCache = new Mock<IViewCompiler>();
+            compilerCache
+                .Setup(f => f.CompileAsync(It.IsAny<string>()))
+                .ReturnsAsync(descriptor);
+
+            var factoryProvider = new DefaultRazorPageFactoryProvider(GetCompilerProvider(compilerCache.Object));
+
+            // Act
+            var result = factoryProvider.CreateFactory(relativePath);
+
+            // Assert
+            Assert.True(result.Success);
+            Assert.Equal(expirationTokens, descriptor.ExpirationTokens);
+        }
+
+        [Fact]
+        public void CreateFactory_ProducesDelegateThatSetsPagePath()
+        {
+            // Arrange
+            var relativePath = "/file-exists";
+            var descriptor = new CompiledViewDescriptor
+            {
+                RelativePath = relativePath,
+                ViewAttribute = new RazorViewAttribute(relativePath, typeof(TestRazorPage)),
+                ExpirationTokens = Array.Empty<IChangeToken>(),
+            };
+            var viewCompiler = new Mock<IViewCompiler>();
+            viewCompiler
+                .Setup(f => f.CompileAsync(It.IsAny<string>()))
+                .ReturnsAsync(descriptor);
+
+            var factoryProvider = new DefaultRazorPageFactoryProvider(GetCompilerProvider(viewCompiler.Object));
+
+            // Act
+            var result = factoryProvider.CreateFactory(relativePath);
+
+            // Assert
+            Assert.True(result.Success);
+            var actual = result.RazorPageFactory();
+            Assert.Equal("/file-exists", actual.Path);
+        }
+
+        private IViewCompilerProvider GetCompilerProvider(IViewCompiler cache)
+        {
+            var compilerCacheProvider = new Mock<IViewCompilerProvider>();
+            compilerCacheProvider
+                .Setup(c => c.GetCompiler())
+                .Returns(cache);
+
+            return compilerCacheProvider.Object;
+        }
+
+        private class TestRazorPage : RazorPage
+        {
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorReferenceManagerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorReferenceManagerTest.cs
new file mode 100644
index 0000000000..dc8cd4a3d0
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorReferenceManagerTest.cs
@@ -0,0 +1,55 @@
+// 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.
+
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.CodeAnalysis;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Test.Internal
+{
+    public class DefaultRazorReferenceManagerTest
+    {
+        [Fact]
+        public void GetCompilationReferences_CombinesApplicationPartAndOptionMetadataReferences()
+        {
+            // Arrange
+            var options = new RazorViewEngineOptions();
+            var objectAssemblyLocation = typeof(object).GetTypeInfo().Assembly.Location;
+            var objectAssemblyMetadataReference = MetadataReference.CreateFromFile(objectAssemblyLocation);
+            options.AdditionalCompilationReferences.Add(objectAssemblyMetadataReference);
+
+            var applicationPartManager = GetApplicationPartManager();
+            var feature = new MetadataReferenceFeature();
+            applicationPartManager.PopulateFeature(feature);
+            var partReferences = feature.MetadataReferences;
+            var expectedReferenceDisplays = partReferences
+                .Concat(new[] { objectAssemblyMetadataReference })
+                .Select(r => r.Display);
+            var referenceManager = new DefaultRazorReferenceManager(
+                applicationPartManager,
+                Options.Create(options));
+
+            // Act
+            var references = referenceManager.CompilationReferences;
+            var referenceDisplays = references.Select(reference => reference.Display);
+
+            // Assert
+            Assert.Equal(expectedReferenceDisplays, referenceDisplays);
+        }
+
+        private static ApplicationPartManager GetApplicationPartManager()
+        {
+            var applicationPartManager = new ApplicationPartManager();
+            var assembly = typeof(DefaultRazorReferenceManagerTest).GetTypeInfo().Assembly;
+            applicationPartManager.ApplicationParts.Add(new AssemblyPart(assembly));
+            applicationPartManager.FeatureProviders.Add(new MetadataReferenceFeatureProvider());
+
+            return applicationPartManager;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorViewEngineFileProviderAccessorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorViewEngineFileProviderAccessorTest.cs
new file mode 100644
index 0000000000..7f64ceb9f8
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorViewEngineFileProviderAccessorTest.cs
@@ -0,0 +1,65 @@
+// 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.
+
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class DefaultRazorViewEngineFileProviderAccessorTest
+    {
+        [Fact]
+        public void FileProvider_ReturnsInstance_IfExactlyOneFileProviderIsRegistered()
+        {
+            // Arrange
+            var fileProvider = new TestFileProvider();
+            var options = new RazorViewEngineOptions();
+            options.FileProviders.Add(fileProvider);
+            var optionsAccessor = new Mock<IOptions<RazorViewEngineOptions>>();
+            optionsAccessor.SetupGet(o => o.Value).Returns(options);
+            var fileProviderAccessor = new DefaultRazorViewEngineFileProviderAccessor(optionsAccessor.Object);
+
+            // Act
+            var actual = fileProviderAccessor.FileProvider;
+
+            // Assert
+            Assert.Same(fileProvider, actual);
+        }
+
+        [Fact]
+        public void FileProvider_ReturnsNullFileProvider_IfNoInstancesAreRegistered()
+        {
+            // Arrange
+            var options = new RazorViewEngineOptions();
+            var optionsAccessor = new Mock<IOptions<RazorViewEngineOptions>>();
+            optionsAccessor.SetupGet(o => o.Value).Returns(options);
+            var fileProviderAccessor = new DefaultRazorViewEngineFileProviderAccessor(optionsAccessor.Object);
+
+            // Act
+            var actual = fileProviderAccessor.FileProvider;
+
+            // Assert
+            Assert.IsType<NullFileProvider>(actual);
+        }
+
+        [Fact]
+        public void FileProvider_ReturnsCompositeFileProvider_IfMoreThanOneInstanceIsRegistered()
+        {
+            // Arrange
+            var options = new RazorViewEngineOptions();
+            options.FileProviders.Add(new TestFileProvider());
+            options.FileProviders.Add(new TestFileProvider());
+            var optionsAccessor = new Mock<IOptions<RazorViewEngineOptions>>();
+            optionsAccessor.SetupGet(o => o.Value).Returns(options);
+            var fileProviderAccessor = new DefaultRazorViewEngineFileProviderAccessor(optionsAccessor.Object);
+
+            // Act
+            var actual = fileProviderAccessor.FileProvider;
+
+            // Assert
+            Assert.IsType<CompositeFileProvider>(actual);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultTagHelperActivatorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultTagHelperActivatorTest.cs
new file mode 100644
index 0000000000..83a690499e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultTagHelperActivatorTest.cs
@@ -0,0 +1,85 @@
+// 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.
+
+using System.IO;
+using System.Reflection;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class DefaultTagHelperActivatorTest
+    {
+        [Fact]
+        public void CreateTagHelper_InitializesTagHelpers()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext()
+            {
+                RequestServices = new ServiceCollection().BuildServiceProvider()
+            };
+            var viewContext = MakeViewContext(httpContext);
+            var viewDataValue = new object();
+            viewContext.ViewData.Add("TestData", viewDataValue);
+            var activator = new DefaultTagHelperActivator(new TypeActivatorCache());
+
+            // Act
+            var helper = activator.Create<TestTagHelper>(viewContext);
+
+            // Assert
+            Assert.NotNull(helper);
+        }
+
+        private static ViewContext MakeViewContext(HttpContext httpContext)
+        {
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var viewData = new ViewDataDictionary(metadataProvider, new ModelStateDictionary());
+            var viewContext = new ViewContext(
+                actionContext,
+                Mock.Of<IView>(),
+                viewData,
+                Mock.Of<ITempDataDictionary>(),
+                TextWriter.Null,
+                new HtmlHelperOptions());
+
+            return viewContext;
+        }
+
+        private class TestTagHelper : TagHelper
+        {
+            public string Name { get; set; } = "Initial Name";
+
+            public int Number { get; set; } = 1000;
+
+            public object ViewDataValue { get; set; } = new object();
+
+            [ViewContext]
+            public ViewContext ViewContext { get; set; }
+        }
+
+        private class AnotherTestTagHelper : TagHelper
+        {
+            public string Name { get; set; } = "Initial Name";
+
+            public int Number { get; set; } = 1000;
+
+            public object ViewDataValue { get; set; } = new object();
+
+            [ViewContext]
+            public ViewContext ViewContext { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultTagHelperFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultTagHelperFactoryTest.cs
new file mode 100644
index 0000000000..54c6bad46a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultTagHelperFactoryTest.cs
@@ -0,0 +1,197 @@
+// 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.
+
+using System;
+using System.IO;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class DefaultTagHelperFactoryTest
+    {
+        [Theory]
+        [InlineData("test", 100)]
+        [InlineData(null, -1)]
+        public void CreateTagHelper_InitializesTagHelpers(string name, int number)
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = new MvcCoreBuilder(services, new ApplicationPartManager());
+            builder.InitializeTagHelper<TestTagHelper>((h, vc) =>
+            {
+                h.Name = name;
+                h.Number = number;
+                h.ViewDataValue = vc.ViewData["TestData"];
+            });
+            var httpContext = MakeHttpContext(services.BuildServiceProvider());
+            var viewContext = MakeViewContext(httpContext);
+            var viewDataValue = new object();
+            viewContext.ViewData.Add("TestData", viewDataValue);
+            var factory = CreateFactory();
+
+            // Act
+            var helper = factory.CreateTagHelper<TestTagHelper>(viewContext);
+
+            // Assert
+            Assert.Equal(name, helper.Name);
+            Assert.Equal(number, helper.Number);
+            Assert.Same(viewDataValue, helper.ViewDataValue);
+        }
+
+        [Fact]
+        public void CreateTagHelper_InitializesTagHelpersAfterActivatingProperties()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = new MvcCoreBuilder(services, new ApplicationPartManager());
+            builder.InitializeTagHelper<TestTagHelper>((h, _) => h.ViewContext = MakeViewContext(MakeHttpContext()));
+            var httpContext = MakeHttpContext(services.BuildServiceProvider());
+            var viewContext = MakeViewContext(httpContext);
+            var factory = CreateFactory();
+
+            // Act
+            var helper = factory.CreateTagHelper<TestTagHelper>(viewContext);
+
+            // Assert
+            Assert.NotSame(viewContext, helper.ViewContext);
+        }
+
+        [Fact]
+        public void CreateTagHelper_InitializesTagHelpersWithMultipleInitializers()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = new MvcCoreBuilder(services, new ApplicationPartManager());
+            builder.InitializeTagHelper<TestTagHelper>((h, vc) =>
+            {
+                h.Name = "Test 1";
+                h.Number = 100;
+            });
+            builder.InitializeTagHelper<TestTagHelper>((h, vc) =>
+            {
+                h.Name += ", Test 2";
+                h.Number += 100;
+            });
+            var httpContext = MakeHttpContext(services.BuildServiceProvider());
+            var viewContext = MakeViewContext(httpContext);
+            var factory = CreateFactory();
+
+            // Act
+            var helper = factory.CreateTagHelper<TestTagHelper>(viewContext);
+
+            // Assert
+            Assert.Equal("Test 1, Test 2", helper.Name);
+            Assert.Equal(200, helper.Number);
+        }
+
+        [Fact]
+        public void CreateTagHelper_InitializesTagHelpersWithCorrectInitializers()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = new MvcCoreBuilder(services, new ApplicationPartManager());
+            builder.InitializeTagHelper<TestTagHelper>((h, vc) =>
+            {
+                h.Name = "Test 1";
+                h.Number = 100;
+            });
+            builder.InitializeTagHelper<AnotherTestTagHelper>((h, vc) =>
+            {
+                h.Name = "Test 2";
+                h.Number = 102;
+            });
+            var httpContext = MakeHttpContext(services.BuildServiceProvider());
+            var viewContext = MakeViewContext(httpContext);
+
+            var activator = new Mock<ITagHelperActivator>();
+            activator
+                .Setup(a => a.Create<TestTagHelper>(It.IsAny<ViewContext>()))
+                .Returns(new TestTagHelper());
+
+            activator
+                .Setup(a => a.Create<AnotherTestTagHelper>(It.IsAny<ViewContext>()))
+                .Returns(new AnotherTestTagHelper());
+
+            var factory = new DefaultTagHelperFactory(activator.Object);
+
+            // Act
+            var testTagHelper = factory.CreateTagHelper<TestTagHelper>(viewContext);
+            var anotherTestTagHelper = factory.CreateTagHelper<AnotherTestTagHelper>(viewContext);
+
+            // Assert
+            Assert.Equal("Test 1", testTagHelper.Name);
+            Assert.Equal(100, testTagHelper.Number);
+            Assert.Equal("Test 2", anotherTestTagHelper.Name);
+            Assert.Equal(102, anotherTestTagHelper.Number);
+        }
+
+        private static HttpContext MakeHttpContext(IServiceProvider services = null)
+        {
+            var httpContext = new DefaultHttpContext();
+            if (services != null)
+            {
+                httpContext.RequestServices = services;
+            }
+            return httpContext;
+        }
+
+        private static DefaultTagHelperFactory CreateFactory()
+        {
+            var activator = new Mock<ITagHelperActivator>();
+            activator.Setup(a => a.Create<TestTagHelper>(It.IsAny<ViewContext>())).Returns(new TestTagHelper());
+            return new DefaultTagHelperFactory(activator.Object);
+        }
+
+        private static ViewContext MakeViewContext(HttpContext httpContext)
+        {
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var viewData = new ViewDataDictionary(metadataProvider, new ModelStateDictionary());
+            var viewContext = new ViewContext(
+                actionContext,
+                Mock.Of<IView>(),
+                viewData,
+                Mock.Of<ITempDataDictionary>(),
+                TextWriter.Null,
+                new HtmlHelperOptions());
+
+            return viewContext;
+        }
+
+        private class TestTagHelper : TagHelper
+        {
+            public string Name { get; set; } = "Initial Name";
+
+            public int Number { get; set; } = 1000;
+
+            public object ViewDataValue { get; set; } = new object();
+
+            [ViewContext]
+            public ViewContext ViewContext { get; set; }
+        }
+
+        private class AnotherTestTagHelper : TagHelper
+        {
+            public string Name { get; set; } = "Initial Name";
+
+            public int Number { get; set; } = 1000;
+
+            public object ViewDataValue { get; set; } = new object();
+
+            [ViewContext]
+            public ViewContext ViewContext { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ExpressionRewriterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ExpressionRewriterTest.cs
new file mode 100644
index 0000000000..9e55373f62
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ExpressionRewriterTest.cs
@@ -0,0 +1,576 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class ExpressionRewriterTest
+    {
+        [Fact]
+        public void ExpressionRewriter_DoesNotThrowsOnUnknownTypes()
+        {
+            // Arrange
+            var source = @"
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Razor;
+
+public class ExamplePage : RazorPage
+{
+    public IViewComponentHelper Component { get; set; }
+
+    public override async Task ExecuteAsync()
+    {
+        Write(
+            await Component.InvokeAsync(
+                ""SomeComponent"",
+                item => new HelperResult((__razor_template_writer) => WriteLiteralTo(__razor_template_writer, ""Hello World""))));
+        }
+    }
+";
+            var tree = CSharpSyntaxTree.ParseText(source);
+
+            // Allow errors here because of an anomaly where Roslyn (depending on code sample) will finish compilation
+            // without diagnostic errors. This test case replicates that scenario by allowing a semantic model with
+            // errors to be visited by the expression rewriter to validate unexpected exceptions aren't thrown.
+            // Error created: "Cannot convert lambda expression to type 'object' because it is not a delegate type."
+            var compilation = Compile(tree, allowErrors: true);
+            var semanticModel = compilation.GetSemanticModel(tree, ignoreAccessibility: true);
+            var rewriter = new ExpressionRewriter(semanticModel);
+            var root = tree.GetRoot();
+
+            // Act
+            var result = rewriter.Visit(root);
+
+            // Assert
+            Assert.True(root.IsEquivalentTo(result));
+        }
+
+        [Fact]
+        public void ExpressionRewriter_CanRewriteExpression_IdentityExpression()
+        {
+            // Arrange
+            var source = @"
+using System;
+using System.Linq.Expressions;
+public class Program
+{
+    public static void CalledWithExpression(Expression<Func<object, object>> expression)
+    {
+    }
+
+    public static void Main(string[] args)
+    {
+        CalledWithExpression(x => x);
+    }
+}
+";
+
+            var tree = CSharpSyntaxTree.ParseText(source);
+            var compilation = Compile(tree);
+            var semanticModel = compilation.GetSemanticModel(tree, ignoreAccessibility: true);
+
+            var rewriter = new ExpressionRewriter(semanticModel);
+
+            // Act
+            var result = rewriter.Visit(tree.GetRoot());
+
+            // Assert
+            var fields = FindFields(result);
+
+            var field = Assert.Single(fields);
+            Assert.Collection(
+                field.Modifiers,
+                m => Assert.Equal("private", m.ToString()),
+                m => Assert.Equal("static", m.ToString()),
+                m => Assert.Equal("readonly", m.ToString()));
+
+            var declaration = field.Declaration;
+            Assert.Equal(
+                "global::System.Linq.Expressions.Expression<global::System.Func<object, object>>",
+                declaration.Type.ToString());
+
+            var variable = Assert.Single(declaration.Variables);
+            Assert.Equal("__h0", variable.Identifier.ToString());
+            Assert.Equal("x => x", variable.Initializer.Value.ToString());
+
+            var arguments = FindArguments(result);
+            var argument = Assert.IsType<IdentifierNameSyntax>(Assert.Single(arguments.Arguments).Expression);
+            Assert.Equal("__h0", argument.Identifier.ToString());
+        }
+
+        [Fact]
+        public void ExpressionRewriter_CanRewriteExpression_MemberAccessExpression()
+        {
+            // Arrange
+            var source = @"
+using System;
+using System.Linq.Expressions;
+public class Program
+{
+    public static void CalledWithExpression(Expression<Func<Person, object>> expression)
+    {
+    }
+
+    public static void Main(string[] args)
+    {
+        CalledWithExpression(x => x.Name);
+    }
+}
+
+public class Person
+{
+    public string Name { get; set; }
+}
+";
+
+            var tree = CSharpSyntaxTree.ParseText(source);
+            var compilation = Compile(tree);
+            var semanticModel = compilation.GetSemanticModel(tree, ignoreAccessibility: true);
+
+            var rewriter = new ExpressionRewriter(semanticModel);
+
+            // Act
+            var result = rewriter.Visit(tree.GetRoot());
+
+            // Assert
+            var fields = FindFields(result);
+
+            var field = Assert.Single(fields);
+            Assert.Collection(
+                field.Modifiers,
+                m => Assert.Equal("private", m.ToString()),
+                m => Assert.Equal("static", m.ToString()),
+                m => Assert.Equal("readonly", m.ToString()));
+
+            var declaration = field.Declaration;
+            Assert.Equal(
+                "global::System.Linq.Expressions.Expression<global::System.Func<global::Person, object>>",
+                declaration.Type.ToString());
+
+            var variable = Assert.Single(declaration.Variables);
+            Assert.Equal("__h0", variable.Identifier.ToString());
+            Assert.Equal("x => x.Name", variable.Initializer.Value.ToString());
+
+            var arguments = FindArguments(result);
+            var argument = Assert.IsType<IdentifierNameSyntax>(Assert.Single(arguments.Arguments).Expression);
+            Assert.Equal("__h0", argument.Identifier.ToString());
+        }
+
+        [Fact]
+        public void ExpressionRewriter_CanRewriteExpression_ChainedMemberAccessExpression()
+        {
+            // Arrange
+            var source = @"
+using System;
+using System.Linq.Expressions;
+public class Program
+{
+    public static void CalledWithExpression(Expression<Func<Person, int>> expression)
+    {
+    }
+
+    public static void Main(string[] args)
+    {
+        CalledWithExpression(x => x.Name.Length);
+    }
+}
+
+public class Person
+{
+    public string Name { get; set; }
+}
+";
+
+            var tree = CSharpSyntaxTree.ParseText(source);
+            var compilation = Compile(tree);
+            var semanticModel = compilation.GetSemanticModel(tree, ignoreAccessibility: true);
+
+            var rewriter = new ExpressionRewriter(semanticModel);
+
+            // Act
+            var result = rewriter.Visit(tree.GetRoot());
+
+            // Assert
+            var fields = FindFields(result);
+
+            var field = Assert.Single(fields);
+            Assert.Collection(
+                field.Modifiers,
+                m => Assert.Equal("private", m.ToString()),
+                m => Assert.Equal("static", m.ToString()),
+                m => Assert.Equal("readonly", m.ToString()));
+
+            var declaration = field.Declaration;
+            Assert.Equal(
+                "global::System.Linq.Expressions.Expression<global::System.Func<global::Person, int>>",
+                declaration.Type.ToString());
+
+            var variable = Assert.Single(declaration.Variables);
+            Assert.Equal("__h0", variable.Identifier.ToString());
+            Assert.Equal("x => x.Name.Length", variable.Initializer.Value.ToString());
+
+            var arguments = FindArguments(result);
+            var argument = Assert.IsType<IdentifierNameSyntax>(Assert.Single(arguments.Arguments).Expression);
+            Assert.Equal("__h0", argument.Identifier.ToString());
+        }
+
+        [Fact]
+        public void ExpressionRewriter_CannotRewriteExpression_MethodCall()
+        {
+            // Arrange
+            var source = @"
+using System;
+using System.Linq.Expressions;
+public class Program
+{
+    public static void CalledWithExpression(Expression<Func<object, int>> expression)
+    {
+    }
+
+    public static void Main(string[] args)
+    {
+        CalledWithExpression(x => x.GetHashCode());
+    }
+}
+";
+
+            var tree = CSharpSyntaxTree.ParseText(source);
+            var compilation = Compile(tree);
+            var semanticModel = compilation.GetSemanticModel(tree, ignoreAccessibility: true);
+
+            var rewriter = new ExpressionRewriter(semanticModel);
+
+            // Act
+            var result = rewriter.Visit(tree.GetRoot());
+
+            // Assert
+            Assert.Empty(FindFields(result));
+        }
+
+        [Fact]
+        public void ExpressionRewriter_CannotRewriteExpression_NonArgument()
+        {
+            // Arrange
+            var source = @"
+using System;
+using System.Linq.Expressions;
+public class Program
+{
+    public static void CalledWithExpression(Expression<Func<object, int>> expression)
+    {
+    }
+
+    public static void Main(string[] args)
+    {
+        Expression<Func<object, int>> expr = x => x.GetHashCode();
+        CalledWithExpression(expr);
+    }
+}
+";
+
+            var tree = CSharpSyntaxTree.ParseText(source);
+            var compilation = Compile(tree);
+            var semanticModel = compilation.GetSemanticModel(tree, ignoreAccessibility: true);
+
+            var rewriter = new ExpressionRewriter(semanticModel);
+
+            // Act
+            var result = rewriter.Visit(tree.GetRoot());
+
+            // Assert
+            Assert.Empty(FindFields(result));
+        }
+
+        [Fact]
+        public void ExpressionRewriter_CannotRewriteExpression_NestedClass()
+        {
+            // Arrange
+            var source = @"
+using System;
+using System.Linq.Expressions;
+public class Program
+{
+    private class Nested
+    {
+        public static void CalledWithExpression(Expression<Func<object, int>> expression)
+        {
+        }
+
+        public static void Main(string[] args)
+        {
+            Expression<Func<object, int>> expr = x => x.GetHashCode();
+            CalledWithExpression(expr);
+        }
+    }
+}
+";
+
+            var tree = CSharpSyntaxTree.ParseText(source);
+            var compilation = Compile(tree);
+            var semanticModel = compilation.GetSemanticModel(tree, ignoreAccessibility: true);
+
+            var rewriter = new ExpressionRewriter(semanticModel);
+
+            // Act
+            var result = rewriter.Visit(tree.GetRoot());
+
+            // Assert
+            Assert.Empty(FindFields(result));
+        }
+
+        [Fact]
+        public void ExpressionRewriter_CanRewriteExpression_AdditionalArguments()
+        {
+            // Arrange
+            var source = @"
+using System;
+using System.Linq.Expressions;
+public class Program
+{
+    public static void CalledWithExpression(int x, Expression<Func<object, object>> expression, string name)
+    {
+    }
+
+    public static void Main(string[] args)
+    {
+        CalledWithExpression(5, x => x, ""Billy"");
+    }
+}
+";
+
+            var tree = CSharpSyntaxTree.ParseText(source);
+            var compilation = Compile(tree);
+            var semanticModel = compilation.GetSemanticModel(tree, ignoreAccessibility: true);
+
+            var rewriter = new ExpressionRewriter(semanticModel);
+
+            // Act
+            var result = rewriter.Visit(tree.GetRoot());
+
+            // Assert
+            var fields = FindFields(result);
+
+            var field = Assert.Single(fields);
+            Assert.Collection(
+                field.Modifiers,
+                m => Assert.Equal("private", m.ToString()),
+                m => Assert.Equal("static", m.ToString()),
+                m => Assert.Equal("readonly", m.ToString()));
+
+            var declaration = field.Declaration;
+            Assert.Equal(
+                "global::System.Linq.Expressions.Expression<global::System.Func<object, object>>",
+                declaration.Type.ToString());
+
+            var variable = Assert.Single(declaration.Variables);
+            Assert.Equal("__h0", variable.Identifier.ToString());
+            Assert.Equal("x => x", variable.Initializer.Value.ToString());
+
+            var arguments = FindArguments(result);
+            Assert.Equal(3, arguments.Arguments.Count);
+            var argument = Assert.IsType<IdentifierNameSyntax>(arguments.Arguments[1].Expression);
+            Assert.Equal("__h0", argument.Identifier.ToString());
+        }
+
+        // When we rewrite the expression, we want to maintain the original span as much as possible.
+        [Fact]
+        public void ExpressionRewriter_CanRewriteExpression_SimpleFormatting()
+        {
+            // Arrange
+            var source = @"
+using System;
+using System.Linq.Expressions;
+public class Program
+{
+    public static void CalledWithExpression(Expression<Func<Person, int>> expression)
+    {
+    }
+
+    public static void Main(string[] args)
+    {
+        CalledWithExpression(x => x.Name.Length);
+    }
+}
+
+public class Person
+{
+    public string Name { get; set; }
+}
+";
+
+            var tree = CSharpSyntaxTree.ParseText(source);
+
+            var originalArguments = FindArguments(tree.GetRoot());
+            var originalSpan = originalArguments.GetLocation().GetMappedLineSpan();
+
+            var compilation = Compile(tree);
+            var semanticModel = compilation.GetSemanticModel(tree, ignoreAccessibility: true);
+
+            var rewriter = new ExpressionRewriter(semanticModel);
+
+            // Act
+            var result = rewriter.Visit(tree.GetRoot());
+
+            // Assert
+            var arguments = FindArguments(result);
+            Assert.Equal(originalSpan, arguments.GetLocation().GetMappedLineSpan());
+        }
+
+        // When we rewrite the expression, we want to maintain the original span as much as possible.
+        [Fact]
+        public void ExpressionRewriter_CanRewriteExpression_ComplexFormatting()
+        {
+            // Arrange
+            var source = @"
+using System;
+using System.Linq.Expressions;
+public class Program
+{
+    public static void CalledWithExpression(int z, Expression<Func<Person, int>> expression)
+    {
+    }
+
+    public static void Main(string[] args)
+    {
+        CalledWithExpression(
+            17,
+            x =>
+                    x.Name.
+            Length
+        );
+    }
+}
+
+public class Person
+{
+    public string Name { get; set; }
+}
+";
+
+            var tree = CSharpSyntaxTree.ParseText(source);
+
+            var originalArguments = FindArguments(tree.GetRoot());
+            var originalSpan = originalArguments.GetLocation().GetMappedLineSpan();
+
+            var compilation = Compile(tree);
+            var semanticModel = compilation.GetSemanticModel(tree, ignoreAccessibility: true);
+
+            var rewriter = new ExpressionRewriter(semanticModel);
+
+            // Act
+            var result = rewriter.Visit(tree.GetRoot());
+
+            // Assert
+            var arguments = FindArguments(result);
+            Assert.Equal(originalSpan, arguments.GetLocation().GetMappedLineSpan());
+        }
+
+        [Fact]
+        public void ExpressionRewriter_CanRewriteExpression_BadlyIndentedFormatting()
+        {
+            // Arrange
+            var source = @"
+using System;
+using System.Linq.Expressions;
+public class Program
+{
+    public static void CalledWithExpression(Expression<Func<Person, int>> expression)
+    {
+    }
+
+    public static void Main(string[] args)
+    {
+        CalledWithExpression(x =>
+                    x.Name.
+          Length);
+    }
+}
+
+public class Person
+{
+    public string Name { get; set; }
+}
+";
+
+            var tree = CSharpSyntaxTree.ParseText(source);
+
+            var originalArguments = FindArguments(tree.GetRoot());
+            var originalSpan = originalArguments.GetLocation().GetMappedLineSpan();
+
+            var compilation = Compile(tree);
+            var semanticModel = compilation.GetSemanticModel(tree, ignoreAccessibility: true);
+
+            var rewriter = new ExpressionRewriter(semanticModel);
+
+            // Act
+            var result = rewriter.Visit(tree.GetRoot());
+
+            // Assert
+            var arguments = FindArguments(result);
+            Assert.Equal(originalSpan, arguments.GetLocation().GetMappedLineSpan());
+        }
+
+        public ArgumentListSyntax FindArguments(SyntaxNode node)
+        {
+            return node
+                .DescendantNodes(n => true)
+                .Where(n => n.IsKind(SyntaxKind.ArgumentList))
+                .Cast<ArgumentListSyntax>()
+                .Single();
+        }
+
+        public IEnumerable<FieldDeclarationSyntax> FindFields(SyntaxNode node)
+        {
+            return node
+                .DescendantNodes(n => true)
+                .Where(n => n.IsKind(SyntaxKind.FieldDeclaration))
+                .Cast<FieldDeclarationSyntax>();
+        }
+
+        private CSharpCompilation Compile(SyntaxTree tree, bool allowErrors = false)
+        {
+            // Disable 1702 until roslyn turns this off by default
+            var options = new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary)
+                .WithSpecificDiagnosticOptions(new Dictionary<string, ReportDiagnostic>
+                {
+                    { "CS1701", ReportDiagnostic.Suppress }, // Binding redirects
+                    { "CS1702", ReportDiagnostic.Suppress },
+                    { "CS1705", ReportDiagnostic.Suppress }
+                });
+
+            var compilation = CSharpCompilation.Create(
+                "Test.Assembly",
+                new[] { tree },
+                GetReferences(),
+                options: options);
+
+            if (!allowErrors)
+            {
+                var diagnostics = compilation.GetDiagnostics();
+                Assert.True(diagnostics.Length == 0, string.Join(Environment.NewLine, diagnostics));
+            }
+
+            return compilation;
+        }
+
+        private IEnumerable<MetadataReference> GetReferences()
+        {
+            var types = new[]
+            {
+                typeof(System.Linq.Expressions.Expression),
+                typeof(string),
+            };
+
+            return types.Select(t => MetadataReference.CreateFromFile(t.GetTypeInfo().Assembly.Location));
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/FileProviderRazorProjectFileSystemTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/FileProviderRazorProjectFileSystemTest.cs
new file mode 100644
index 0000000000..e2f8846111
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/FileProviderRazorProjectFileSystemTest.cs
@@ -0,0 +1,257 @@
+// 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.
+
+using System.IO;
+using System.Linq;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.FileProviders;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class FileProviderRazorProjectFileSystemTest
+    {
+        [Fact]
+        public void EnumerateFiles_ReturnsEmptySequenceIfNoCshtmlFilesArePresent()
+        {
+            // Arrange
+            var fileProvider = new TestFileProvider("BasePath");
+            var file1 = fileProvider.AddFile("/File1.txt", "content");
+            var file2 = fileProvider.AddFile("/File2.js", "content");
+            fileProvider.AddDirectoryContent("/", new IFileInfo[] { file1, file2 });
+
+            var accessor = Mock.Of<IRazorViewEngineFileProviderAccessor>(a => a.FileProvider == fileProvider);
+
+            var fileSystem = new FileProviderRazorProjectFileSystem(accessor, Mock.Of<IHostingEnvironment>(e => e.ContentRootPath == "BasePath"));
+
+            // Act
+            var razorFiles = fileSystem.EnumerateItems("/");
+
+            // Assert
+            Assert.Empty(razorFiles);
+        }
+
+        [Fact]
+        public void EnumerateFiles_ReturnsCshtmlFiles()
+        {
+            // Arrange
+            var fileProvider = new TestFileProvider("BasePath");
+            var file1 = fileProvider.AddFile("/File1.cshtml", "content");
+            var file2 = fileProvider.AddFile("/File2.js", "content");
+            var file3 = fileProvider.AddFile("/File3.cshtml", "content");
+            fileProvider.AddDirectoryContent("/", new IFileInfo[] { file1, file2, file3 });
+
+            var accessor = Mock.Of<IRazorViewEngineFileProviderAccessor>(a => a.FileProvider == fileProvider);
+
+            var fileSystem = new FileProviderRazorProjectFileSystem(accessor, Mock.Of<IHostingEnvironment>(e => e.ContentRootPath == "BasePath"));
+
+            // Act
+            var razorFiles = fileSystem.EnumerateItems("/");
+
+            // Assert
+            Assert.Collection(
+                razorFiles.OrderBy(f => f.FilePath),
+                file =>
+                {
+                    Assert.Equal("/File1.cshtml", file.FilePath);
+                    Assert.Equal("/", file.BasePath);
+                    Assert.Equal(Path.Combine("BasePath", "File1.cshtml"), file.PhysicalPath);
+                    Assert.Equal("File1.cshtml", file.RelativePhysicalPath);
+                },
+                file =>
+                {
+                    Assert.Equal("/File3.cshtml", file.FilePath);
+                    Assert.Equal("/", file.BasePath);
+                    Assert.Equal(Path.Combine("BasePath", "File3.cshtml"), file.PhysicalPath);
+                    Assert.Equal("File3.cshtml", file.RelativePhysicalPath);
+                });
+        }
+
+        [Fact]
+        public void EnumerateFiles_IteratesOverAllCshtmlUnderRoot()
+        {
+            // Arrange
+            var fileProvider = new TestFileProvider("BasePath");
+            var directory1 = new TestDirectoryFileInfo
+            {
+                Name = "Level1-Dir1",
+            };
+            var file1 = fileProvider.AddFile("File1.cshtml", "content");
+            var directory2 = new TestDirectoryFileInfo
+            {
+                Name = "Level1-Dir2",
+            };
+            fileProvider.AddDirectoryContent("/", new IFileInfo[] { directory1, file1, directory2 });
+
+            var file2 = fileProvider.AddFile("/Level1-Dir1/File2.cshtml", "content");
+            var file3 = fileProvider.AddFile("/Level1-Dir1/File3.cshtml", "content");
+            var file4 = fileProvider.AddFile("/Level1-Dir1/File4.txt", "content");
+            var directory3 = new TestDirectoryFileInfo
+            {
+                Name = "Level2-Dir1"
+            };
+            fileProvider.AddDirectoryContent("/Level1-Dir1", new IFileInfo[] { file2, directory3, file3, file4 });
+            var file5 = fileProvider.AddFile(Path.Combine("Level1-Dir2", "File5.cshtml"), "content");
+            fileProvider.AddDirectoryContent("/Level1-Dir2", new IFileInfo[] { file5 });
+            fileProvider.AddDirectoryContent("/Level1/Level2", new IFileInfo[0]);
+
+            var accessor = Mock.Of<IRazorViewEngineFileProviderAccessor>(a => a.FileProvider == fileProvider);
+
+            var fileSystem = new FileProviderRazorProjectFileSystem(accessor, Mock.Of<IHostingEnvironment>(e => e.ContentRootPath == "BasePath"));
+
+            // Act
+            var razorFiles = fileSystem.EnumerateItems("/");
+
+            // Assert
+            Assert.Collection(razorFiles.OrderBy(f => f.FilePath),
+                 file =>
+                 {
+                     Assert.Equal("/File1.cshtml", file.FilePath);
+                     Assert.Equal("/", file.BasePath);
+                     Assert.Equal(Path.Combine("BasePath", "File1.cshtml"), file.PhysicalPath);
+                     Assert.Equal("File1.cshtml", file.RelativePhysicalPath);
+                 },
+                file =>
+                {
+                    Assert.Equal("/Level1-Dir1/File2.cshtml", file.FilePath);
+                    Assert.Equal("/", file.BasePath);
+                    Assert.Equal(Path.Combine("BasePath", "Level1-Dir1", "File2.cshtml"), file.PhysicalPath);
+                    Assert.Equal(Path.Combine("Level1-Dir1", "File2.cshtml"), file.RelativePhysicalPath);
+                },
+                file =>
+                {
+                    Assert.Equal("/Level1-Dir1/File3.cshtml", file.FilePath);
+                    Assert.Equal("/", file.BasePath);
+                    Assert.Equal(Path.Combine("BasePath", "Level1-Dir1", "File3.cshtml"), file.PhysicalPath);
+                    Assert.Equal(Path.Combine("Level1-Dir1", "File3.cshtml"), file.RelativePhysicalPath);
+                },
+                file =>
+                {
+                    Assert.Equal("/Level1-Dir2/File5.cshtml", file.FilePath);
+                    Assert.Equal("/", file.BasePath);
+                    Assert.Equal(Path.Combine("BasePath", "Level1-Dir2", "File5.cshtml"), file.PhysicalPath);
+                    Assert.Equal(Path.Combine("Level1-Dir2", "File5.cshtml"), file.RelativePhysicalPath);
+                });
+        }
+
+        [Fact]
+        public void EnumerateFiles_IteratesOverAllCshtmlUnderPath()
+        {
+            // Arrange
+            var fileProvider = new TestFileProvider("BasePath");
+            var directory1 = new TestDirectoryFileInfo
+            {
+                Name = "Level1-Dir1",
+            };
+            var file1 = fileProvider.AddFile("/File1.cshtml", "content");
+            var directory2 = new TestDirectoryFileInfo
+            {
+                Name = "Level1-Dir2",
+            };
+            fileProvider.AddDirectoryContent("/", new IFileInfo[] { directory1, file1, directory2 });
+
+            var file2 = fileProvider.AddFile("/Level1-Dir1/File2.cshtml", "content");
+            var file3 = fileProvider.AddFile("/Level1-Dir1/File3.cshtml", "content");
+            var file4 = fileProvider.AddFile("/Level1-Dir1/File4.txt", "content");
+            var directory3 = new TestDirectoryFileInfo
+            {
+                Name = "Level2-Dir1"
+            };
+            fileProvider.AddDirectoryContent("/Level1-Dir1", new IFileInfo[] { file2, directory3, file3, file4 });
+            var file5 = fileProvider.AddFile(Path.Combine("Level1-Dir2", "File5.cshtml"), "content");
+            fileProvider.AddDirectoryContent("/Level1-Dir2", new IFileInfo[] { file5 });
+            fileProvider.AddDirectoryContent("/Level1/Level2", new IFileInfo[0]);
+
+            var accessor = Mock.Of<IRazorViewEngineFileProviderAccessor>(a => a.FileProvider == fileProvider);
+
+            var fileSystem = new FileProviderRazorProjectFileSystem(accessor, Mock.Of<IHostingEnvironment>(e => e.ContentRootPath == "BasePath"));
+
+            // Act
+            var razorFiles = fileSystem.EnumerateItems("/Level1-Dir1");
+
+            // Assert
+            Assert.Collection(razorFiles.OrderBy(f => f.FilePath),
+                file =>
+                {
+                    Assert.Equal("/File2.cshtml", file.FilePath);
+                    Assert.Equal("/Level1-Dir1", file.BasePath);
+                    Assert.Equal(Path.Combine("BasePath", "Level1-Dir1", "File2.cshtml"), file.PhysicalPath);
+                    Assert.Equal(Path.Combine("Level1-Dir1", "File2.cshtml"), file.RelativePhysicalPath);
+                },
+                file =>
+                {
+                    Assert.Equal("/File3.cshtml", file.FilePath);
+                    Assert.Equal("/Level1-Dir1", file.BasePath);
+                    Assert.Equal(Path.Combine("BasePath", "Level1-Dir1", "File3.cshtml"), file.PhysicalPath);
+                    Assert.Equal(Path.Combine("Level1-Dir1", "File3.cshtml"), file.RelativePhysicalPath);
+                });
+        }
+
+        [Fact]
+        public void GetItem_ReturnsFileFromDisk()
+        {
+            var fileProvider = new TestFileProvider("BasePath");
+            var file1 = fileProvider.AddFile("/File1.cshtml", "content");
+            var file2 = fileProvider.AddFile("/File2.js", "content");
+            var file3 = fileProvider.AddFile("/File3.cshtml", "content");
+            fileProvider.AddDirectoryContent("/", new IFileInfo[] { file1, file2, file3 });
+
+            var accessor = Mock.Of<IRazorViewEngineFileProviderAccessor>(a => a.FileProvider == fileProvider);
+
+            var fileSystem = new FileProviderRazorProjectFileSystem(accessor, Mock.Of<IHostingEnvironment>(e => e.ContentRootPath == "BasePath"));
+
+            // Act
+            var item = fileSystem.GetItem("/File3.cshtml");
+
+            // Assert
+            Assert.True(item.Exists);
+            Assert.Equal("/File3.cshtml", item.FilePath);
+            Assert.Equal(string.Empty, item.BasePath);
+            Assert.Equal(Path.Combine("BasePath", "File3.cshtml"), item.PhysicalPath);
+            Assert.Equal("File3.cshtml", item.RelativePhysicalPath);
+        }
+
+        [Fact]
+        public void GetItem_PhysicalPathDoesNotStartWithContentRoot_ReturnsNull()
+        {
+            var fileProvider = new TestFileProvider("BasePath2");
+            var file1 = fileProvider.AddFile("/File1.cshtml", "content");
+            var file2 = fileProvider.AddFile("/File2.js", "content");
+            var file3 = fileProvider.AddFile("/File3.cshtml", "content");
+            fileProvider.AddDirectoryContent("/", new IFileInfo[] { file1, file2, file3 });
+
+            var accessor = Mock.Of<IRazorViewEngineFileProviderAccessor>(a => a.FileProvider == fileProvider);
+
+            var fileSystem = new FileProviderRazorProjectFileSystem(accessor, Mock.Of<IHostingEnvironment>(e => e.ContentRootPath == "BasePath"));
+
+            // Act
+            var item = fileSystem.GetItem("/File3.cshtml");
+
+            // Assert
+            Assert.True(item.Exists);
+            Assert.Equal("/File3.cshtml", item.FilePath);
+            Assert.Equal(string.Empty, item.BasePath);
+            Assert.Equal(Path.Combine("BasePath2", "File3.cshtml"), item.PhysicalPath);
+            Assert.Null(item.RelativePhysicalPath);
+        }
+
+        [Fact]
+        public void GetItem_ReturnsNotFoundResult()
+        {
+            // Arrange
+            var fileProvider = new TestFileProvider("BasePath");
+            var file = fileProvider.AddFile("/SomeFile.cshtml", "content");
+            fileProvider.AddDirectoryContent("/", new IFileInfo[] { file });
+            var accessor = Mock.Of<IRazorViewEngineFileProviderAccessor>(a => a.FileProvider == fileProvider);
+
+            var fileSystem = new FileProviderRazorProjectFileSystem(accessor, Mock.Of<IHostingEnvironment>(e => e.ContentRootPath == "BasePath"));
+
+            // Act
+            var item = fileSystem.GetItem("/NotFound.cshtml");
+
+            // Assert
+            Assert.False(item.Exists);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorPagePropertyActivatorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorPagePropertyActivatorTest.cs
new file mode 100644
index 0000000000..c0221fc68d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorPagePropertyActivatorTest.cs
@@ -0,0 +1,230 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class RazorPagePropertyActivatorTest
+    {
+        [Fact]
+        public void CreateViewDataDictionary_MakesNewInstance_WhenValueOnContextIsNull()
+        {
+            // Arrange
+            var activator = new RazorPagePropertyActivator(
+                typeof(TestPage),
+                typeof(TestModel),
+                new TestModelMetadataProvider(),
+                propertyValueAccessors: null);
+            var viewContext = new ViewContext();
+
+            // Act
+            var viewDataDictionary = activator.CreateViewDataDictionary(viewContext);
+
+            // Assert
+            Assert.NotNull(viewDataDictionary);
+            Assert.IsType<ViewDataDictionary<TestModel>>(viewDataDictionary);
+        }
+
+        [Fact]
+        public void CreateViewDataDictionary_MakesNewInstanceWithObjectModelType_WhenValueOnContextAndModelTypeAreNull()
+        {
+            // Arrange
+            var activator = new RazorPagePropertyActivator(
+                typeof(TestPage),
+                declaredModelType: null,
+                metadataProvider: new TestModelMetadataProvider(),
+                propertyValueAccessors: null);
+            var viewContext = new ViewContext();
+
+            // Act
+            var viewDataDictionary = activator.CreateViewDataDictionary(viewContext);
+
+            // Assert
+            Assert.NotNull(viewDataDictionary);
+            Assert.IsType<ViewDataDictionary<object>>(viewDataDictionary);
+        }
+
+        [Fact]
+        public void CreateViewDataDictionary_CreatesNestedViewDataDictionary_WhenContextInstanceIsNonGeneric()
+        {
+            // Arrange
+            var modelMetadataProvider = new TestModelMetadataProvider();
+            var activator = new RazorPagePropertyActivator(
+                typeof(TestPage),
+                declaredModelType: typeof(TestModel),
+                metadataProvider: modelMetadataProvider,
+                propertyValueAccessors: null);
+            var original = new ViewDataDictionary(modelMetadataProvider, new ModelStateDictionary())
+            {
+                {  "test-key", "test-value" },
+            };
+            var viewContext = new ViewContext
+            {
+                ViewData = original,
+            };
+
+            // Act
+            var viewDataDictionary = activator.CreateViewDataDictionary(viewContext);
+
+            // Assert
+            Assert.NotNull(viewDataDictionary);
+            Assert.NotSame(original, viewDataDictionary);
+            Assert.IsType<ViewDataDictionary<TestModel>>(viewDataDictionary);
+            Assert.Equal("test-value", viewDataDictionary["test-key"]);
+        }
+
+        [Fact]
+        public void CreateViewDataDictionary_UsesDeclaredTypeOverModelType_WhenCreatingTheViewDataDictionary()
+        {
+            // Arrange
+            var modelMetadataProvider = new TestModelMetadataProvider();
+            var activator = new RazorPagePropertyActivator(
+                typeof(TestPage),
+                declaredModelType: typeof(TestModel),
+                metadataProvider: modelMetadataProvider,
+                propertyValueAccessors: null);
+            var original = new ViewDataDictionary(modelMetadataProvider, new ModelStateDictionary())
+            {
+                {  "test-key", "test-value" },
+            };
+            var viewContext = new ViewContext
+            {
+                ViewData = original,
+            };
+
+            // Act
+            var viewDataDictionary = activator.CreateViewDataDictionary(viewContext);
+
+            // Assert
+            Assert.NotNull(viewDataDictionary);
+            Assert.NotSame(original, viewDataDictionary);
+            Assert.IsType<ViewDataDictionary<TestModel>>(viewDataDictionary);
+            Assert.Equal("test-value", viewDataDictionary["test-key"]);
+        }
+
+        [Fact]
+        public void CreateViewDataDictionary_CreatesNestedViewDataDictionary_WhenModelTypeDoesNotMatch()
+        {
+            // Arrange
+            var modelMetadataProvider = new TestModelMetadataProvider();
+            var activator = new RazorPagePropertyActivator(
+                typeof(TestPage),
+                declaredModelType: typeof(TestModel),
+                metadataProvider: modelMetadataProvider,
+                propertyValueAccessors: null);
+            var original = new ViewDataDictionary<object>(modelMetadataProvider, new ModelStateDictionary())
+            {
+                {  "test-key", "test-value" },
+            };
+            var viewContext = new ViewContext
+            {
+                ViewData = original,
+            };
+
+            // Act
+            var viewDataDictionary = activator.CreateViewDataDictionary(viewContext);
+
+            // Assert
+            Assert.NotNull(viewDataDictionary);
+            Assert.NotSame(original, viewDataDictionary);
+            Assert.IsType<ViewDataDictionary<TestModel>>(viewDataDictionary);
+            Assert.Equal("test-value", viewDataDictionary["test-key"]);
+        }
+
+        [Fact]
+        public void CreateViewDataDictionary_CreatesNestedViewDataDictionary_WhenNullModelTypeDoesNotMatch()
+        {
+            // Arrange
+            var modelMetadataProvider = new TestModelMetadataProvider();
+            var activator = new RazorPagePropertyActivator(
+                typeof(TestPage),
+                declaredModelType: null,
+                metadataProvider: modelMetadataProvider,
+                propertyValueAccessors: null);
+            var original = new ViewDataDictionary<TestModel>(modelMetadataProvider, new ModelStateDictionary())
+            {
+                {  "test-key", "test-value" },
+            };
+            var viewContext = new ViewContext
+            {
+                ViewData = original,
+            };
+
+            // Act
+            var viewDataDictionary = activator.CreateViewDataDictionary(viewContext);
+
+            // Assert
+            Assert.NotNull(viewDataDictionary);
+            Assert.NotSame(original, viewDataDictionary);
+            Assert.IsType<ViewDataDictionary<object>>(viewDataDictionary);
+            Assert.Equal("test-value", viewDataDictionary["test-key"]);
+        }
+
+        [Fact]
+        public void CreateViewDataDictionary_ReturnsInstanceOnContext_IfModelTypeMatches()
+        {
+            // Arrange
+            var modelMetadataProvider = new TestModelMetadataProvider();
+            var activator = new RazorPagePropertyActivator(
+                typeof(TestPage),
+                declaredModelType: typeof(TestModel),
+                metadataProvider: modelMetadataProvider,
+                propertyValueAccessors: null);
+            var original = new ViewDataDictionary<TestModel>(modelMetadataProvider, new ModelStateDictionary())
+            {
+                {  "test-key", "test-value" },
+            };
+            var viewContext = new ViewContext
+            {
+                ViewData = original,
+            };
+
+            // Act
+            var viewDataDictionary = activator.CreateViewDataDictionary(viewContext);
+
+            // Assert
+            Assert.NotNull(viewDataDictionary);
+            Assert.Same(original, viewDataDictionary);
+        }
+
+        [Fact]
+        public void CreateViewDataDictionary_ReturnsInstanceOnContext_WithNullModelType()
+        {
+            // Arrange
+            var modelMetadataProvider = new TestModelMetadataProvider();
+            var activator = new RazorPagePropertyActivator(
+                typeof(TestPage),
+                declaredModelType: null,
+                metadataProvider: modelMetadataProvider,
+                propertyValueAccessors: null);
+            var original = new ViewDataDictionary<object>(modelMetadataProvider, new ModelStateDictionary());
+            var viewContext = new ViewContext
+            {
+                ViewData = original,
+            };
+
+            // Act
+            var viewDataDictionary = activator.CreateViewDataDictionary(viewContext);
+
+            // Assert
+            Assert.NotNull(viewDataDictionary);
+            Assert.Same(original, viewDataDictionary);
+        }
+
+        private class TestPage
+        {
+        }
+
+        private class TestModel
+        {
+        }
+
+        private class DerivedTestModel : TestModel
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewCompilerProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewCompilerProviderTest.cs
new file mode 100644
index 0000000000..c00237b990
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewCompilerProviderTest.cs
@@ -0,0 +1,50 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class RazorViewCompilerProviderTest
+    {
+        [Fact]
+        public void GetCompiler_ThrowsIfNullFileProvider()
+        {
+            // Arrange
+            var expected =
+                $"'{typeof(RazorViewEngineOptions).FullName}.{nameof(RazorViewEngineOptions.FileProviders)}' must " +
+                $"not be empty. At least one '{typeof(IFileProvider).FullName}' is required to locate a view for " +
+                "rendering.";
+            var fileProvider = new NullFileProvider();
+            var accessor = Mock.Of<IRazorViewEngineFileProviderAccessor>(a => a.FileProvider == fileProvider);
+
+            var partManager = new ApplicationPartManager();
+            var options = Options.Create(new RazorViewEngineOptions());
+
+            var referenceManager = new DefaultRazorReferenceManager(partManager, options);
+
+            var provider = new RazorViewCompilerProvider(
+                partManager,
+                RazorProjectEngine.Create(
+                    RazorConfiguration.Default, 
+                    new FileProviderRazorProjectFileSystem(accessor, Mock.Of<IHostingEnvironment>())),
+                accessor,
+                new CSharpCompiler(referenceManager, Mock.Of<IHostingEnvironment>()),
+                options,
+                NullLoggerFactory.Instance);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(
+                () => provider.GetCompiler());
+            Assert.Equal(expected, exception.Message);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewCompilerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewCompilerTest.cs
new file mode 100644
index 0000000000..c4df0280aa
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewCompilerTest.cs
@@ -0,0 +1,915 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Mvc.Razor.Extensions;
+using Microsoft.AspNetCore.Razor.Hosting;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Emit;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+using static Microsoft.AspNetCore.Razor.Hosting.TestRazorCompiledItem;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class RazorViewCompilerTest
+    {
+        [Fact]
+        public async Task CompileAsync_ReturnsResultWithNullAttribute_IfFileIsNotFoundInFileSystem()
+        {
+            // Arrange
+            var path = "/file/does-not-exist";
+            var fileProvider = new TestFileProvider();
+            var viewCompiler = GetViewCompiler(fileProvider);
+
+            // Act
+            var result1 = await viewCompiler.CompileAsync(path);
+            var result2 = await viewCompiler.CompileAsync(path);
+
+            // Assert
+            Assert.Same(result1, result2);
+            Assert.Null(result1.ViewAttribute);
+            Assert.Collection(
+                result1.ExpirationTokens,
+                token => Assert.Equal(fileProvider.GetChangeToken(path), token));
+        }
+
+        [Fact]
+        public async Task CompileAsync_AddsChangeTokensForViewStartsIfFileExists()
+        {
+            // Arrange
+            var path = "/file/exists/FilePath.cshtml";
+            var fileProvider = new TestFileProvider();
+            fileProvider.AddFile(path, "Content");
+            var viewCompiler = GetViewCompiler(fileProvider);
+
+            // Act
+            var result = await viewCompiler.CompileAsync(path);
+
+            // Assert
+            Assert.NotNull(result.ViewAttribute);
+            Assert.Collection(
+                result.ExpirationTokens,
+                token => Assert.Same(fileProvider.GetChangeToken(path), token),
+                token => Assert.Same(fileProvider.GetChangeToken("/_ViewImports.cshtml"), token),
+                token => Assert.Same(fileProvider.GetChangeToken("/file/_ViewImports.cshtml"), token),
+                token => Assert.Same(fileProvider.GetChangeToken("/file/exists/_ViewImports.cshtml"), token));
+        }
+
+        [Theory]
+        [InlineData("/Areas/Finances/Views/Home/Index.cshtml")]
+        [InlineData(@"Areas\Finances\Views\Home\Index.cshtml")]
+        [InlineData(@"\Areas\Finances\Views\Home\Index.cshtml")]
+        [InlineData(@"\Areas\Finances\Views/Home\Index.cshtml")]
+        public async Task CompileAsync_NormalizesPathSepartorForPaths(string relativePath)
+        {
+            // Arrange
+            var viewPath = "/Areas/Finances/Views/Home/Index.cshtml";
+            var fileProvider = new TestFileProvider();
+            fileProvider.AddFile(viewPath, "some content");
+            var viewCompiler = GetViewCompiler(fileProvider);
+
+            // Act - 1
+            var result1 = await viewCompiler.CompileAsync(@"Areas\Finances\Views\Home\Index.cshtml");
+
+            // Act - 2
+            viewCompiler.Compile = _ => throw new Exception("Can't call me");
+            var result2 = await viewCompiler.CompileAsync(relativePath);
+
+            // Assert - 2
+            Assert.Same(result1, result2);
+        }
+
+        [Fact]
+        public async Task CompileAsync_InvalidatesCache_IfChangeTokenExpires()
+        {
+            // Arrange
+            var path = "/Views/Home/Index.cshtml";
+            var fileProvider = new TestFileProvider();
+            var fileInfo = fileProvider.AddFile(path, "some content");
+            var viewCompiler = GetViewCompiler(fileProvider);
+
+            // Act 1
+            var result1 = await viewCompiler.CompileAsync(path);
+
+            // Assert 1
+            Assert.NotNull(result1.ViewAttribute);
+
+            // Act 2
+            fileProvider.DeleteFile(path);
+            fileProvider.GetChangeToken(path).HasChanged = true;
+            viewCompiler.Compile = _ => throw new Exception("Can't call me");
+            var result2 = await viewCompiler.CompileAsync(path);
+
+            // Assert 2
+            Assert.NotSame(result1, result2);
+            Assert.Null(result2.ViewAttribute);
+        }
+
+        [Fact]
+        public async Task CompileAsync_ReturnsNewResultIfFileWasModified()
+        {
+            // Arrange
+            var path = "/Views/Home/Index.cshtml";
+            var fileProvider = new TestFileProvider();
+            var fileInfo = fileProvider.AddFile(path, "some content");
+            var viewCompiler = GetViewCompiler(fileProvider);
+            var expected2 = new CompiledViewDescriptor();
+
+            // Act 1
+            var result1 = await viewCompiler.CompileAsync(path);
+
+            // Assert 1
+            Assert.NotNull(result1.ViewAttribute);
+
+            // Act 2
+            fileProvider.GetChangeToken(path).HasChanged = true;
+            viewCompiler.Compile = _ => expected2;
+            var result2 = await viewCompiler.CompileAsync(path);
+
+            // Assert 2
+            Assert.NotSame(result1, result2);
+            Assert.Same(expected2, result2);
+        }
+
+        [Fact]
+        public async Task CompileAsync_ReturnsNewResult_IfAncestorViewImportsWereModified()
+        {
+            // Arrange
+            var path = "/Views/Home/Index.cshtml";
+            var fileProvider = new TestFileProvider();
+            var fileInfo = fileProvider.AddFile(path, "some content");
+            var viewCompiler = GetViewCompiler(fileProvider);
+            var expected2 = new CompiledViewDescriptor();
+
+            // Act 1
+            var result1 = await viewCompiler.CompileAsync(path);
+
+            // Assert 1
+            Assert.NotNull(result1.ViewAttribute);
+
+            // Act 2
+            fileProvider.GetChangeToken("/Views/_ViewImports.cshtml").HasChanged = true;
+            viewCompiler.Compile = _ => expected2;
+            var result2 = await viewCompiler.CompileAsync(path);
+
+            // Assert 2
+            Assert.NotSame(result1, result2);
+            Assert.Same(expected2, result2);
+        }
+
+        [Fact]
+        public async Task CompileAsync_ReturnsPrecompiledViews()
+        {
+            // Arrange
+            var path = "/Views/Home/Index.cshtml";
+            var fileProvider = new TestFileProvider();
+            var fileInfo = fileProvider.AddFile(path, "some content");
+            var precompiledView = new CompiledViewDescriptor
+            {
+                RelativePath = path,
+            };
+            var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+
+            // Act
+            var result = await viewCompiler.CompileAsync(path);
+
+            // Assert
+            Assert.Same(precompiledView, result);
+
+            // This view doesn't have checksums so it can't be recompiled.
+            Assert.Null(precompiledView.ExpirationTokens);
+        }
+
+        [Theory]
+        [InlineData("/views/home/index.cshtml")]
+        [InlineData("/VIEWS/HOME/INDEX.CSHTML")]
+        [InlineData("/viEws/HoME/inDex.cshtml")]
+        public async Task CompileAsync_PerformsCaseInsensitiveLookupsForPrecompiledViews(string lookupPath)
+        {
+            // Arrange
+            var path = "/Views/Home/Index.cshtml";
+            var fileProvider = new TestFileProvider();
+            var fileInfo = fileProvider.AddFile(path, "some content");
+            var precompiledView = new CompiledViewDescriptor
+            {
+                RelativePath = path,
+            };
+            var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+
+            // Act
+            var result = await viewCompiler.CompileAsync(lookupPath);
+
+            // Assert
+            Assert.Same(precompiledView, result);
+        }
+
+        [Fact]
+        public async Task CompileAsync_PerformsCaseInsensitiveLookupsForPrecompiledViews_WithNonNormalizedPaths()
+        {
+            // Arrange
+            var path = "/Views/Home/Index.cshtml";
+            var fileProvider = new TestFileProvider();
+            var fileInfo = fileProvider.AddFile(path, "some content");
+            var precompiledView = new CompiledViewDescriptor
+            {
+                RelativePath = path,
+            };
+            var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+
+            // Act
+            var result = await viewCompiler.CompileAsync("Views\\Home\\Index.cshtml");
+
+            // Assert
+            Assert.Same(precompiledView, result);
+        }
+
+        [Fact]
+        public async Task CompileAsync_PrecompiledViewWithoutChecksumForMainSource_DoesNotSupportRecompilation()
+        {
+            // Arrange
+            var path = "/Views/Home/Index.cshtml";
+
+            var fileProvider = new TestFileProvider();
+            var fileInfo = fileProvider.AddFile(path, "some content");
+
+            var precompiledView = new CompiledViewDescriptor
+            {
+                RelativePath = path,
+                Item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", path, new object[]
+                {
+                    new RazorSourceChecksumAttribute("sha1", GetChecksum("some content"), "/Views/Some-Other-View"),
+                }),
+            };
+
+            var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+
+            // Act - 1
+            var result = await viewCompiler.CompileAsync(path);
+
+            // Assert - 1
+            Assert.Same(precompiledView.Item, result.Item);
+
+            // Act - 2
+            fileProvider.Watch(path);
+            fileProvider.GetChangeToken(path).HasChanged = true;
+            result = await viewCompiler.CompileAsync(path);
+
+            // Assert - 2
+            Assert.Same(precompiledView.Item, result.Item);
+
+            // This view doesn't have checksums so it can't be recompiled.
+            Assert.Null(result.ExpirationTokens);
+        }
+
+        [Fact]
+        public async Task CompileAsync_PrecompiledViewWithoutAnyChecksum_DoesNotSupportRecompilation()
+        {
+            // Arrange
+            var path = "/Views/Home/Index.cshtml";
+
+            var fileProvider = new TestFileProvider();
+            var fileInfo = fileProvider.AddFile(path, "some content");
+
+            var precompiledView = new CompiledViewDescriptor
+            {
+                RelativePath = path,
+                Item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", path, new object[] { }),
+            };
+
+            var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+
+            // Act - 1
+            var result = await viewCompiler.CompileAsync(path);
+
+            // Assert - 1
+            Assert.Same(precompiledView, result);
+
+            // Act - 2
+            fileProvider.Watch(path);
+            fileProvider.GetChangeToken(path).HasChanged = true;
+            result = await viewCompiler.CompileAsync(path);
+
+            // Assert - 2
+            Assert.Same(precompiledView, result);
+
+            // This view doesn't have checksums so it can't be recompiled.
+            Assert.Null(result.ExpirationTokens);
+        }
+
+        [Fact]
+        public async Task CompileAsync_PrecompiledViewWithChecksum_UsesPrecompiledViewWhenChecksumIsMatch()
+        {
+            // Arrange
+            var path = "/Views/Home/Index.cshtml";
+
+            var fileProvider = new TestFileProvider();
+            var fileInfo = fileProvider.AddFile(path, "some content");
+
+            var precompiledView = new CompiledViewDescriptor
+            {
+                RelativePath = path,
+                Item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", path, new object[]
+                {
+                    new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), path),
+                }),
+            };
+
+            var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+
+            // Act
+            var result = await viewCompiler.CompileAsync(path);
+
+            // Assert
+            Assert.Same(precompiledView.Item, result.Item);
+
+            // This view has checksums so it should also have tokens
+            Assert.Collection(
+                 result.ExpirationTokens,
+                 token => Assert.Same(fileProvider.GetChangeToken(path), token));
+        }
+
+        [Fact]
+        public async Task CompileAsync_PrecompiledViewWithChecksum_CanRejectWhenChecksumFails()
+        {
+            // Arrange
+            var path = "/Views/Home/Index.cshtml";
+
+            var fileProvider = new TestFileProvider();
+            var fileInfo = fileProvider.AddFile(path, "some content");
+
+            var expected = new CompiledViewDescriptor();
+
+            var precompiledView = new CompiledViewDescriptor
+            {
+                RelativePath = path,
+                Item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", path, new object[]
+                {
+                    new RazorSourceChecksumAttribute("SHA1", GetChecksum("some other content"), path),
+                }),
+            };
+
+            var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+            viewCompiler.Compile = _ => expected;
+
+            // Act
+            var result = await viewCompiler.CompileAsync(path);
+
+            // Assert
+            Assert.Same(expected, result);
+        }
+
+        [Fact]
+        public async Task CompileAsync_PrecompiledViewWithChecksum_CanRecompile()
+        {
+            // Arrange
+            var path = "/Views/Home/Index.cshtml";
+
+            var fileProvider = new TestFileProvider();
+            var fileInfo = fileProvider.AddFile(path, "some content");
+
+            var expected2 = new CompiledViewDescriptor();
+
+            var precompiledView = new CompiledViewDescriptor
+            {
+                RelativePath = path,
+                Item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", path, new object[]
+                {
+                    new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), path),
+                }),
+            };
+
+            var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+
+            // Act - 1
+            var result = await viewCompiler.CompileAsync(path);
+
+            // Assert - 1
+            Assert.Same(precompiledView.Item, result.Item);
+
+            // Act - 2
+            fileInfo.Content = "some other content";
+            fileProvider.GetChangeToken(path).HasChanged = true;
+            viewCompiler.Compile = _ => expected2;
+            result = await viewCompiler.CompileAsync(path);
+
+            // Assert - 2
+            Assert.Same(expected2, result);
+        }
+
+        [Fact]
+        public async Task CompileAsync_PrecompiledViewWithChecksum_DoesNotRecompiledWithoutContentChange()
+        {
+            // Arrange
+            var path = "/Views/Home/Index.cshtml";
+
+            var fileProvider = new TestFileProvider();
+            var fileInfo = fileProvider.AddFile(path, "some content");
+
+            var precompiledView = new CompiledViewDescriptor
+            {
+                RelativePath = path,
+                Item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", path, new object[]
+                {
+                    new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), path),
+                }),
+            };
+
+            var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+
+            // Act - 1
+            var result = await viewCompiler.CompileAsync(path);
+
+            // Assert - 1
+            Assert.Same(precompiledView.Item, result.Item);
+
+            // Act - 2
+            fileProvider.GetChangeToken(path).HasChanged = true;
+            result = await viewCompiler.CompileAsync(path);
+
+            // Assert - 2
+            Assert.Same(precompiledView.Item, result.Item);
+        }
+
+        [Fact]
+        public async Task CompileAsync_PrecompiledViewWithChecksum_CanReusePrecompiledViewIfContentChangesToMatch()
+        {
+            // Arrange
+            var path = "/Views/Home/Index.cshtml";
+
+            var fileProvider = new TestFileProvider();
+            var fileInfo = fileProvider.AddFile(path, "some other content");
+
+            var expected1 = new CompiledViewDescriptor();
+
+            var precompiledView = new CompiledViewDescriptor
+            {
+                RelativePath = path,
+                Item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", path, new object[]
+                {
+                    new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), path),
+                }),
+            };
+
+            var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+            viewCompiler.Compile = _ => expected1;
+
+            // Act - 1
+            var result = await viewCompiler.CompileAsync(path);
+
+            // Assert - 1
+            Assert.Same(expected1, result);
+
+            // Act - 2
+            fileInfo.Content = "some content";
+            fileProvider.GetChangeToken(path).HasChanged = true;
+            result = await viewCompiler.CompileAsync(path);
+
+            // Assert - 2
+            Assert.Same(precompiledView.Item, result.Item);
+        }
+
+        [Fact]
+        public async Task CompileAsync_PrecompiledViewWithChecksum_CanRecompileWhenViewImportChanges()
+        {
+            // Arrange
+            var path = "/Views/Home/Index.cshtml";
+            var importPath = "/Views/_ViewImports.cshtml";
+
+            var fileProvider = new TestFileProvider();
+            var fileInfo = fileProvider.AddFile(path, "some content");
+            var importFileInfo = fileProvider.AddFile(importPath, "some import");
+
+            var expected2 = new CompiledViewDescriptor();
+
+            var precompiledView = new CompiledViewDescriptor
+            {
+                RelativePath = path,
+                Item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", path, new object[]
+                {
+                    new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), path),
+                    new RazorSourceChecksumAttribute("SHA1", GetChecksum("some import"), importPath),
+                }),
+            };
+
+            var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+
+            // Act - 1
+            var result = await viewCompiler.CompileAsync(path);
+
+            // Assert - 1
+            Assert.Same(precompiledView.Item, result.Item);
+
+            // Act - 2
+            importFileInfo.Content = "some import changed";
+            fileProvider.GetChangeToken(importPath).HasChanged = true;
+            viewCompiler.Compile = _ => expected2;
+            result = await viewCompiler.CompileAsync(path);
+
+            // Assert - 2
+            Assert.Same(expected2, result);
+        }
+
+        [Fact]
+        public async Task GetOrAdd_AllowsConcurrentCompilationOfMultipleRazorPages()
+        {
+            // Arrange
+            var path1 = "/Views/Home/Index.cshtml";
+            var path2 = "/Views/Home/About.cshtml";
+            var waitDuration = TimeSpan.FromSeconds(20);
+
+            var fileProvider = new TestFileProvider();
+            fileProvider.AddFile(path1, "Index content");
+            fileProvider.AddFile(path2, "About content");
+
+            var resetEvent1 = new AutoResetEvent(initialState: false);
+            var resetEvent2 = new ManualResetEvent(initialState: false);
+
+            var compilingOne = false;
+            var compilingTwo = false;
+
+            var result1 = new CompiledViewDescriptor();
+            var result2 = new CompiledViewDescriptor();
+
+            var compiler = GetViewCompiler(fileProvider);
+
+            compiler.Compile = path =>
+            {
+                if (path == path1)
+                {
+                    compilingOne = true;
+
+                    // Event 2
+                    Assert.True(resetEvent1.WaitOne(waitDuration));
+
+                    // Event 3
+                    Assert.True(resetEvent2.Set());
+
+                    // Event 6
+                    Assert.True(resetEvent1.WaitOne(waitDuration));
+
+                    Assert.True(compilingTwo);
+
+                    return result1;
+                }
+                else if (path == path2)
+                {
+                    compilingTwo = true;
+
+                    // Event 4
+                    Assert.True(resetEvent2.WaitOne(waitDuration));
+
+                    // Event 5
+                    Assert.True(resetEvent1.Set());
+
+                    Assert.True(compilingOne);
+
+                    return result2;
+                }
+                else
+                {
+                    throw new Exception();
+                }
+            };
+
+            // Act
+            var task1 = Task.Run(() => compiler.CompileAsync(path1));
+            var task2 = Task.Run(() => compiler.CompileAsync(path2));
+
+            // Event 1
+            resetEvent1.Set();
+
+            await Task.WhenAll(task1, task2);
+
+            // Assert
+            Assert.True(compilingOne);
+            Assert.True(compilingTwo);
+            Assert.Same(result1, task1.Result);
+            Assert.Same(result2, task2.Result);
+        }
+
+        [Fact]
+        public async Task CompileAsync_DoesNotCreateMultipleCompilationResults_ForConcurrentInvocations()
+        {
+            // Arrange
+            var path = "/Views/Home/Index.cshtml";
+            var waitDuration = TimeSpan.FromSeconds(20);
+            var fileProvider = new TestFileProvider();
+            fileProvider.AddFile(path, "some content");
+            var resetEvent1 = new ManualResetEvent(initialState: false);
+            var resetEvent2 = new ManualResetEvent(initialState: false);
+            var compiler = GetViewCompiler(fileProvider);
+
+            compiler.Compile = _ =>
+            {
+                // Event 2
+                resetEvent1.WaitOne(waitDuration);
+
+                // Event 3
+                resetEvent2.Set();
+                return new CompiledViewDescriptor();
+            };
+
+            // Act
+            var task1 = Task.Run(() => compiler.CompileAsync(path));
+            var task2 = Task.Run(() =>
+            {
+                // Event 4
+                Assert.True(resetEvent2.WaitOne(waitDuration));
+                return compiler.CompileAsync(path);
+            });
+
+            // Event 1
+            resetEvent1.Set();
+            await Task.WhenAll(task1, task2);
+
+            // Assert
+            var result1 = task1.Result;
+            var result2 = task2.Result;
+            Assert.Same(result1, result2);
+        }
+
+        [Fact]
+        public async Task GetOrAdd_CachesCompilationExceptions()
+        {
+            // Arrange
+            var path = "/Views/Home/Index.cshtml";
+            var fileProvider = new TestFileProvider();
+            fileProvider.AddFile(path, "some content");
+            var exception = new InvalidTimeZoneException();
+            var compiler = GetViewCompiler(fileProvider);
+            compiler.Compile = _ => throw exception;
+
+            // Act and Assert - 1
+            var actual = await Assert.ThrowsAsync<InvalidTimeZoneException>(
+                () => compiler.CompileAsync(path));
+            Assert.Same(exception, actual);
+
+            // Act and Assert - 2
+            compiler.Compile = _ => throw new Exception("Shouldn't be called");
+
+            actual = await Assert.ThrowsAsync<InvalidTimeZoneException>(
+                () => compiler.CompileAsync(path));
+            Assert.Same(exception, actual);
+        }
+
+        [Fact]
+        public void Compile_SucceedsForCSharp7()
+        {
+            // Arrange
+            var content = @"
+public class MyTestType
+{
+    private string _name;
+
+    public string Name
+    {
+        get => _name;
+        set => _name = value ?? throw new System.ArgumentNullException(nameof(value));
+    }
+}";
+            var compiler = GetViewCompiler(new TestFileProvider());
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("razor-content", "filename"));
+
+            // Act
+            var result = compiler.CompileAndEmit(codeDocument, content);
+
+            // Assert
+            var exportedType = Assert.Single(result.ExportedTypes);
+            Assert.Equal("MyTestType", exportedType.Name);
+        }
+
+        [Fact]
+        public void Compile_ReturnsCompilationFailureWithPathsFromLinePragmas()
+        {
+            // Arrange
+            var viewPath = "some-relative-path";
+            var fileContent = "test file content";
+            var content = $@"
+#line 1 ""{viewPath}""
+this should fail";
+
+            var compiler = GetViewCompiler(new TestFileProvider());
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create(fileContent, viewPath));
+
+            // Act & Assert
+            var ex = Assert.Throws<CompilationFailedException>(() => compiler.CompileAndEmit(codeDocument, content));
+
+            var compilationFailure = Assert.Single(ex.CompilationFailures);
+            Assert.Equal(viewPath, compilationFailure.SourceFilePath);
+            Assert.Equal(fileContent, compilationFailure.SourceFileContent);
+        }
+
+        [Fact]
+        public void Compile_ReturnsGeneratedCodePath_IfLinePragmaIsNotAvailable()
+        {
+            // Arrange
+            var viewPath = "some-relative-path";
+            var fileContent = "file content";
+            var content = "this should fail";
+
+            var compiler = GetViewCompiler(new TestFileProvider());
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create(fileContent, viewPath));
+
+            // Act & Assert
+            var ex = Assert.Throws<CompilationFailedException>(() => compiler.CompileAndEmit(codeDocument, content));
+
+            var compilationFailure = Assert.Single(ex.CompilationFailures);
+            Assert.Equal("Generated Code", compilationFailure.SourceFilePath);
+            Assert.Equal(content, compilationFailure.SourceFileContent);
+        }
+
+        [Fact]
+        public void Compile_InvokessCallback()
+        {
+            // Arrange
+            var content = "public class MyTestType  {}";
+            var callbackInvoked = false;
+            var compiler = GetViewCompiler(
+                new TestFileProvider(),
+                context =>
+                {
+                    callbackInvoked = true;
+                });
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("some-content", "some-path"));
+
+            // Act
+            var result = compiler.CompileAndEmit(codeDocument, content);
+
+            // Assert
+            Assert.True(callbackInvoked);
+        }
+
+        [Fact]
+        public void Compile_SucceedsIfReferencesAreAddedInCallback()
+        {
+            // Arrange
+            Action<RoslynCompilationContext> compilationCallback = context =>
+            {
+                var assemblyLocation = typeof(object).Assembly.Location;
+
+                context.Compilation = context
+                    .Compilation
+                    .AddReferences(MetadataReference.CreateFromFile(assemblyLocation));
+            };
+
+            var applicationPartManager = new ApplicationPartManager();
+            var referenceManager = new DefaultRazorReferenceManager(
+                applicationPartManager,
+                Options.Create(new RazorViewEngineOptions()));
+            var compiler = GetViewCompiler(
+                compilationCallback: compilationCallback,
+                referenceManager: referenceManager);
+
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("Hello world", "some-relative-path.cshtml"));
+
+            // Act
+            var result = compiler.CompileAndEmit(codeDocument, "public class Test {}");
+
+            // Assert
+            Assert.NotNull(result);
+        }
+
+        [Fact]
+        public void CompileAndEmit_DoesNotThrowIfDebugTypeIsEmbedded()
+        {
+            // Arrange
+            var referenceManager = CreateReferenceManager(Options.Create(new RazorViewEngineOptions()));
+            var csharpCompiler = new TestCSharpCompiler(referenceManager, Mock.Of<IHostingEnvironment>())
+            {
+                EmitOptionsSettable = new EmitOptions(debugInformationFormat: DebugInformationFormat.Embedded),
+            };
+
+            var compiler = GetViewCompiler(csharpCompiler: csharpCompiler);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("Hello world", "some-relative-path.cshtml"));
+
+            // Act
+            var result = compiler.CompileAndEmit(codeDocument, "public class Test{}");
+
+            // Assert
+            Assert.NotNull(result);
+        }
+
+        [Fact]
+        public void CompileAndEmit_WorksIfEmitPdbIsNotSet()
+        {
+            // Arrange
+            var referenceManager = CreateReferenceManager(Options.Create(new RazorViewEngineOptions()));
+            var csharpCompiler = new TestCSharpCompiler(referenceManager, Mock.Of<IHostingEnvironment>())
+            {
+                EmitPdbSettable = false,
+            };
+
+            var compiler = GetViewCompiler(csharpCompiler: csharpCompiler);
+            var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("Hello world", "some-relative-path.cshtml"));
+
+            // Act
+            var result = compiler.CompileAndEmit(codeDocument, "public class Test{}");
+
+            // Assert
+            Assert.NotNull(result);
+        }
+
+        private static TestRazorViewCompiler GetViewCompiler(
+            TestFileProvider fileProvider = null,
+            Action<RoslynCompilationContext> compilationCallback = null,
+            RazorReferenceManager referenceManager = null,
+            IList<CompiledViewDescriptor> precompiledViews = null,
+            CSharpCompiler csharpCompiler = null)
+        {
+            fileProvider = fileProvider ?? new TestFileProvider();
+            var accessor = Mock.Of<IRazorViewEngineFileProviderAccessor>(a => a.FileProvider == fileProvider);
+
+            compilationCallback = compilationCallback ?? (_ => { });
+            var options = Options.Create(new RazorViewEngineOptions());
+            if (referenceManager == null)
+            {
+                referenceManager = CreateReferenceManager(options);
+            }
+
+            precompiledViews = precompiledViews ?? Array.Empty<CompiledViewDescriptor>();
+
+            var hostingEnvironment = Mock.Of<IHostingEnvironment>(e => e.ContentRootPath == "BasePath");
+            var fileSystem = new FileProviderRazorProjectFileSystem(accessor, hostingEnvironment);
+            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem, builder =>
+            {
+                RazorExtensions.Register(builder);
+            });
+
+            csharpCompiler = csharpCompiler ?? new CSharpCompiler(referenceManager, hostingEnvironment);
+
+            var viewCompiler = new TestRazorViewCompiler(
+                fileProvider,
+                projectEngine,
+                csharpCompiler,
+                compilationCallback,
+                precompiledViews);
+            return viewCompiler;
+        }
+
+        private static RazorReferenceManager CreateReferenceManager(IOptions<RazorViewEngineOptions> options)
+        {
+            var applicationPartManager = new ApplicationPartManager();
+            var assembly = typeof(RazorViewCompilerTest).Assembly;
+            applicationPartManager.ApplicationParts.Add(new AssemblyPart(assembly));
+            applicationPartManager.FeatureProviders.Add(new MetadataReferenceFeatureProvider());
+
+            return new DefaultRazorReferenceManager(applicationPartManager, options);
+        }
+
+        private class TestRazorViewCompiler : RazorViewCompiler
+        {
+            public TestRazorViewCompiler(
+                TestFileProvider fileProvider,
+                RazorProjectEngine projectEngine,
+                CSharpCompiler csharpCompiler,
+                Action<RoslynCompilationContext> compilationCallback,
+                IList<CompiledViewDescriptor> precompiledViews,
+                Func<string, CompiledViewDescriptor> compile = null) :
+                base(fileProvider, projectEngine, csharpCompiler, compilationCallback, precompiledViews, NullLogger.Instance)
+            {
+                Compile = compile;
+                if (Compile == null)
+                {
+                    Compile = path => new CompiledViewDescriptor
+                    {
+                        RelativePath = path,
+                        ViewAttribute = new RazorViewAttribute(path, typeof(object)),
+                    };
+                }
+            }
+
+            public Func<string, CompiledViewDescriptor> Compile { get; set; }
+
+            protected override CompiledViewDescriptor CompileAndEmit(string relativePath)
+            {
+                return Compile(relativePath);
+            }
+        }
+
+        private class TestCSharpCompiler : CSharpCompiler
+        {
+            public TestCSharpCompiler(RazorReferenceManager manager, IHostingEnvironment hostingEnvironment)
+                : base(manager, hostingEnvironment)
+            {
+            }
+
+            public EmitOptions EmitOptionsSettable { get; set; }
+
+            public bool EmitPdbSettable { get; set; }
+
+            public override EmitOptions EmitOptions => EmitOptionsSettable;
+
+            public override bool EmitPdb => EmitPdbSettable;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewEngineOptionsSetupTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewEngineOptionsSetupTest.cs
new file mode 100644
index 0000000000..1351b64fa5
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewEngineOptionsSetupTest.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.FileProviders;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class RazorViewEngineOptionsSetupTest
+    {
+        [Fact]
+        public void RazorViewEngineOptionsSetup_SetsUpFileProvider()
+        {
+            // Arrange
+            var options = new RazorViewEngineOptions();
+            var expected = Mock.Of<IFileProvider>();
+            var hostingEnv = new Mock<IHostingEnvironment>();
+            hostingEnv.SetupGet(e => e.ContentRootFileProvider)
+                .Returns(expected);
+            var optionsSetup = new RazorViewEngineOptionsSetup(hostingEnv.Object);
+
+            // Act
+            optionsSetup.Configure(options);
+
+            // Assert
+            var fileProvider = Assert.Single(options.FileProviders);
+            Assert.Same(expected, fileProvider);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ViewPathTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ViewPathTest.cs
new file mode 100644
index 0000000000..e7055650e2
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ViewPathTest.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+{
+    public class ViewPathTest
+    {
+        [Theory]
+        [InlineData("/Views/Home/Index.cshtml")]
+        [InlineData("\\Views/Home/Index.cshtml")]
+        [InlineData("\\Views\\Home/Index.cshtml")]
+        [InlineData("\\Views\\Home\\Index.cshtml")]
+        public void NormalizePath_NormalizesSlashes(string input)
+        {
+            // Act
+            var normalizedPath = ViewPath.NormalizePath(input);
+
+            // Assert
+            Assert.Equal("/Views/Home/Index.cshtml", normalizedPath);
+        }
+
+        [Theory]
+        [InlineData("Views/Home/Index.cshtml")]
+        [InlineData("Views\\Home\\Index.cshtml")]
+        public void NormalizePath_AppendsLeadingSlash(string input)
+        {
+            // Act
+            var normalizedPath = ViewPath.NormalizePath(input);
+
+            // Assert
+            Assert.Equal("/Views/Home/Index.cshtml", normalizedPath);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/LanguageViewLocationExpanderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/LanguageViewLocationExpanderTest.cs
new file mode 100644
index 0000000000..e31e66c3e5
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/LanguageViewLocationExpanderTest.cs
@@ -0,0 +1,208 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Testing.xunit;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public class LanguageViewLocationExpanderTest
+    {
+        public static IEnumerable<object[]> ViewLocationExpanderTestDataWithExpectedValues
+        {
+            get
+            {
+                yield return new object[]
+                {
+                    LanguageViewLocationExpanderFormat.Suffix,
+                    new[]
+                    {
+                        "/Views/{1}/{0}.cshtml",
+                        "/Views/Shared/{0}.cshtml"
+                    },
+                    new[]
+                    {
+                        "/Views/{1}/{0}.en-GB.cshtml",
+                        "/Views/{1}/{0}.en.cshtml",
+                        "/Views/{1}/{0}.cshtml",
+                        "/Views/Shared/{0}.en-GB.cshtml",
+                        "/Views/Shared/{0}.en.cshtml",
+                        "/Views/Shared/{0}.cshtml"
+                    }
+                };
+
+                yield return new object[]
+                {
+                    LanguageViewLocationExpanderFormat.SubFolder,
+                    new[]
+                    {
+                        "/Views/{1}/{0}.cshtml",
+                        "/Views/Shared/{0}.cshtml"
+                    },
+                    new[]
+                    {
+                        "/Views/{1}/en-GB/{0}.cshtml",
+                        "/Views/{1}/en/{0}.cshtml",
+                        "/Views/{1}/{0}.cshtml",
+                        "/Views/Shared/en-GB/{0}.cshtml",
+                        "/Views/Shared/en/{0}.cshtml",
+                        "/Views/Shared/{0}.cshtml"
+                    }
+                };
+
+                yield return new object[]
+                {
+                    LanguageViewLocationExpanderFormat.Suffix,
+                    new[]
+                    {
+                        "/Areas/{2}/Views/{1}/{0}.cshtml",
+                        "/Areas/{2}/Views/Shared/{0}.cshtml",
+                        "/Views/Shared/{0}.cshtml"
+                    },
+                    new[]
+                    {
+                        "/Areas/{2}/Views/{1}/{0}.en-GB.cshtml",
+                        "/Areas/{2}/Views/{1}/{0}.en.cshtml",
+                        "/Areas/{2}/Views/{1}/{0}.cshtml",
+                        "/Areas/{2}/Views/Shared/{0}.en-GB.cshtml",
+                        "/Areas/{2}/Views/Shared/{0}.en.cshtml",
+                        "/Areas/{2}/Views/Shared/{0}.cshtml",
+                        "/Views/Shared/{0}.en-GB.cshtml",
+                        "/Views/Shared/{0}.en.cshtml",
+                        "/Views/Shared/{0}.cshtml"
+                    }
+                };
+
+                yield return new object[]
+                {
+                    LanguageViewLocationExpanderFormat.SubFolder,
+                    new[]
+                    {
+                        "/Areas/{2}/Views/{1}/{0}.cshtml",
+                        "/Areas/{2}/Views/Shared/{0}.cshtml",
+                        "/Views/Shared/{0}.cshtml"
+                    },
+                    new[]
+                    {
+                        "/Areas/{2}/Views/{1}/en-GB/{0}.cshtml",
+                        "/Areas/{2}/Views/{1}/en/{0}.cshtml",
+                        "/Areas/{2}/Views/{1}/{0}.cshtml",
+                        "/Areas/{2}/Views/Shared/en-GB/{0}.cshtml",
+                        "/Areas/{2}/Views/Shared/en/{0}.cshtml",
+                        "/Areas/{2}/Views/Shared/{0}.cshtml",
+                        "/Views/Shared/en-GB/{0}.cshtml",
+                        "/Views/Shared/en/{0}.cshtml",
+                        "/Views/Shared/{0}.cshtml"
+                    }
+                };
+            }
+        }
+
+        public static IEnumerable<object[]> ViewLocationExpanderTestData
+        {
+            get
+            {
+                yield return new object[]
+                {
+                    new[]
+                    {
+                        "/Views/{1}/{0}.cshtml",
+                        "/Views/Shared/{0}.cshtml"
+                    }
+                };
+
+                yield return new object[]
+                {
+                    new[]
+                    {
+                        "/Areas/{2}/Views/{1}/{0}.cshtml",
+                        "/Areas/{2}/Views/Shared/{0}.cshtml",
+                        "/Views/Shared/{0}.cshtml"
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ViewLocationExpanderTestDataWithExpectedValues))]
+        public void ExpandViewLocations_SpecificLocale(
+            LanguageViewLocationExpanderFormat format,
+            IEnumerable<string> viewLocations,
+            IEnumerable<string> expectedViewLocations)
+        {
+            // Arrange
+            var viewLocationExpanderContext = new ViewLocationExpanderContext(
+                new ActionContext(), 
+                "testView", 
+                "test-controller",
+                "",
+                null,
+                false);
+            var languageViewLocationExpander = new LanguageViewLocationExpander(format);
+            viewLocationExpanderContext.Values = new Dictionary<string, string>();
+            viewLocationExpanderContext.Values["language"] = "en-GB";
+
+            // Act
+            var expandedViewLocations = languageViewLocationExpander.ExpandViewLocations(
+                viewLocationExpanderContext,
+                viewLocations);
+
+            // Assert
+            Assert.Equal(expectedViewLocations, expandedViewLocations);
+        }
+
+        [Theory]
+        [MemberData(nameof(ViewLocationExpanderTestData))]
+        public void ExpandViewLocations_NullContextValue(IEnumerable<string> viewLocations)
+        {
+            // Arrange
+            var viewLocationExpanderContext = new ViewLocationExpanderContext(
+                new ActionContext(), 
+                "testView", 
+                "test-controller",
+                "test-area",
+                null,
+                false);
+            var languageViewLocationExpander = new LanguageViewLocationExpander();
+            viewLocationExpanderContext.Values = new Dictionary<string, string>();
+
+            // Act
+            var expandedViewLocations = languageViewLocationExpander.ExpandViewLocations(
+                viewLocationExpanderContext,
+                viewLocations);
+
+            // Assert
+            Assert.Equal(viewLocations, expandedViewLocations);
+        }
+
+        [ConditionalTheory]
+        [OSSkipCondition(OperatingSystems.Linux,
+            SkipReason = "Invalid culture detection is OS-specific")]
+        [OSSkipCondition(OperatingSystems.MacOSX,
+            SkipReason = "Invalid culture detection is OS-specific")]
+        [MemberData(nameof(ViewLocationExpanderTestData))]
+        public void ExpandViewLocations_IncorrectLocaleContextValue(IEnumerable<string> viewLocations)
+        {
+            // Arrange
+            var viewLocationExpanderContext = new ViewLocationExpanderContext(
+                new ActionContext(), 
+                "testView", 
+                "test-controller",
+                "test-area",
+                null,
+                false);
+            var languageViewLocationExpander = new LanguageViewLocationExpander();
+            viewLocationExpanderContext.Values = new Dictionary<string, string>();
+            viewLocationExpanderContext.Values["language"] = "!-invalid-culture-!";
+
+            // Act
+            var expandedViewLocations = languageViewLocationExpander.ExpandViewLocations(
+                viewLocationExpanderContext,
+                viewLocations);
+
+            // Assert
+            Assert.Equal(viewLocations, expandedViewLocations);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj
new file mode 100644
index 0000000000..88f06a4cbb
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <DefineConstants>$(DefineConstants);SOME_TEST_DEFINE</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(MicrosoftAspNetCoreHttpPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources" PrivateAssets="All" Version="$(MicrosoftAspNetCoreRazorTagHelpersTestingSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Properties/AssemblyInfo.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..3337ebeac2
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// 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.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs
new file mode 100644
index 0000000000..17b0999b58
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs
@@ -0,0 +1,267 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public class RazorPageActivatorTest
+    {
+        public RazorPageActivatorTest()
+        {
+            DiagnosticSource = new DiagnosticListener("Microsoft.AspNetCore");
+            HtmlEncoder = new HtmlTestEncoder();
+            JsonHelper = Mock.Of<IJsonHelper>();
+            MetadataProvider = new EmptyModelMetadataProvider();
+            ModelExpressionProvider = new ModelExpressionProvider(MetadataProvider, new ExpressionTextCache());
+            UrlHelperFactory = new UrlHelperFactory();
+        }
+
+        private DiagnosticSource DiagnosticSource { get; }
+
+        private HtmlEncoder HtmlEncoder { get; }
+
+        private IJsonHelper JsonHelper { get; }
+
+        private IModelMetadataProvider MetadataProvider { get; }
+
+        private IModelExpressionProvider ModelExpressionProvider { get; }
+
+        private IUrlHelperFactory UrlHelperFactory { get; }
+
+        [Fact]
+        public void Activate_ContextualizesServices_AndSetsProperties_OnPage()
+        {
+            // Arrange
+            var activator = CreateActivator();
+
+            var instance = new TestRazorPage();
+            var viewData = new ViewDataDictionary<MyModel>(MetadataProvider, new ModelStateDictionary());
+            var viewContext = CreateViewContext();
+
+            var urlHelper = UrlHelperFactory.GetUrlHelper(viewContext);
+
+            // Act
+            activator.Activate(instance, viewContext);
+
+            // Assert
+            Assert.Same(DiagnosticSource, instance.DiagnosticSource);
+            Assert.Same(HtmlEncoder, instance.HtmlEncoder);
+            Assert.Same(JsonHelper, instance.Json);
+            Assert.Same(urlHelper, instance.Url);
+            Assert.Same(viewContext.ViewData, instance.ViewData);
+
+            // Has no [RazorInject] so it shouldn't get injected
+            Assert.Null(instance.MyService2);
+
+            // We're not testing the IViewContextualizable implementation here because it's a mock.
+            Assert.NotNull(instance.Html);
+            Assert.IsAssignableFrom<IHtmlHelper<object>>(instance.Html);
+
+            var service = instance.MyService;
+            Assert.NotNull(service);
+            Assert.Same(viewContext, service.ViewContext);
+        }
+
+        [Fact]
+        public void Activate_ContextualizesServices_AndSetsProperties_OnPageWithoutModel()
+        {
+            // Arrange
+            var activator = CreateActivator();
+
+            var viewData = new ViewDataDictionary<object>(MetadataProvider, new ModelStateDictionary());
+            var viewContext = CreateViewContext(viewData);
+
+            var urlHelper = UrlHelperFactory.GetUrlHelper(viewContext);
+
+            var instance = new NoModelPropertyPage();
+
+            // Act
+            activator.Activate(instance, viewContext);
+
+            // Assert
+            Assert.Same(DiagnosticSource, instance.DiagnosticSource);
+            Assert.Same(HtmlEncoder, instance.HtmlEncoder);
+
+            // When we don't have a model property, the activator will just leave viewdata alone.
+            Assert.NotNull(viewContext.ViewData);
+        }
+
+        [Fact]
+        public void Activate_InstantiatesNewViewDataDictionaryType_IfTheTypeDoesNotMatch()
+        {
+            // Arrange
+            var activator = CreateActivator();
+
+            var viewData = new ViewDataDictionary<object>(MetadataProvider, new ModelStateDictionary())
+            {
+                { "key", "value" },
+            };
+            var viewContext = CreateViewContext(viewData);
+
+            var urlHelper = UrlHelperFactory.GetUrlHelper(viewContext);
+
+            var instance = new TestRazorPage();
+
+            // Act
+            activator.Activate(instance, viewContext);
+
+            // Assert
+            Assert.Same(DiagnosticSource, instance.DiagnosticSource);
+            Assert.Same(HtmlEncoder, instance.HtmlEncoder);
+            Assert.Same(JsonHelper, instance.Json);
+            Assert.Same(urlHelper, instance.Url);
+            Assert.Same(viewContext.ViewData, instance.ViewData);
+
+            // The original ViewDataDictionary was replaced.
+            Assert.NotSame(viewData, viewContext.ViewData);
+            Assert.NotSame(viewData, instance.ViewData);
+
+            // But this value is copied
+            Assert.Equal("value", viewData["key"]);
+
+            // Has no [RazorInject] so it shouldn't get injected
+            Assert.Null(instance.MyService2);
+
+            // We're not testing the IViewContextualizable implementation here because it's a mock.
+            Assert.NotNull(instance.Html);
+            Assert.IsAssignableFrom<IHtmlHelper<object>>(instance.Html);
+
+            var service = instance.MyService;
+            Assert.NotNull(service);
+            Assert.Same(viewContext, service.ViewContext);
+        }
+
+        [Fact]
+        public void Activate_Throws_WhenViewDataPropertyHasIncorrectType()
+        {
+            // Arrange
+            var activator = CreateActivator();
+
+            var viewData = new ViewDataDictionary<MyModel>(MetadataProvider, new ModelStateDictionary());
+            var viewContext = CreateViewContext(viewData);
+
+            var instance = new HasIncorrectViewDataPropertyType();
+
+            // Act & Assert
+            Assert.Throws<InvalidCastException>(() => activator.Activate(instance, viewContext));
+        }
+
+        private RazorPageActivator CreateActivator()
+        {
+            return new RazorPageActivator(MetadataProvider, UrlHelperFactory, JsonHelper, DiagnosticSource, HtmlEncoder, ModelExpressionProvider);
+        }
+
+        private ViewContext CreateViewContext(ViewDataDictionary viewData = null)
+        {
+            if (viewData == null)
+            {
+                viewData = new ViewDataDictionary(MetadataProvider, new ModelStateDictionary());
+            }
+
+            var myService = new MyService();
+            var htmlHelper = Mock.Of<IHtmlHelper<object>>();
+
+            var serviceProvider = new ServiceCollection()
+                .AddSingleton(myService)
+                .AddSingleton(htmlHelper)
+                .AddSingleton(new ExpressionTextCache())
+                .BuildServiceProvider();
+
+            var httpContext = new DefaultHttpContext
+            {
+                RequestServices = serviceProvider
+            };
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            return new ViewContext(
+                actionContext,
+                Mock.Of<IView>(),
+                viewData,
+                Mock.Of<ITempDataDictionary>(),
+                TextWriter.Null,
+                new HtmlHelperOptions());
+        }
+
+        private abstract class TestPageBase<TModel> : RazorPage<TModel>
+        {
+            [RazorInject]
+            public MyService MyService { get; set; }
+
+            public MyService MyService2 { get; set; }
+
+            [RazorInject]
+            public IJsonHelper Json { get; set; }
+
+            [RazorInject]
+            public IUrlHelper Url { get; set; }
+        }
+
+        private class TestRazorPage : TestPageBase<MyModel>
+        {
+            [RazorInject]
+            internal IHtmlHelper<object> Html { get; private set; }
+
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private abstract class NoModelPropertyBase<TModel> : RazorPage
+        {
+            [RazorInject]
+            public ViewDataDictionary ViewData { get; set; }
+        }
+
+        private class NoModelPropertyPage : NoModelPropertyBase<MyModel>
+        {
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class HasIncorrectViewDataPropertyType : RazorPage<MyModel>
+        {
+            [RazorInject]
+            public ViewDataDictionary<object> MoreViewData { get; set; }
+
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class MyService : IViewContextAware
+        {
+            public ViewContext ViewContext { get; private set; }
+
+            public void Contextualize(ViewContext viewContext)
+            {
+                ViewContext = viewContext;
+            }
+        }
+
+        private class MyModel
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs
new file mode 100644
index 0000000000..b16c2fe500
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs
@@ -0,0 +1,332 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public class RazorPageCreateModelExpressionTest
+    {
+        public static TheoryData IdentityExpressions
+        {
+            get
+            {
+                return new TheoryData<Func<IdentityRazorPage, ModelExpression>, string>
+                {
+                    // m => m
+                    { page => page.CreateModelExpression1(), string.Empty },
+                    // m => Model
+                    { page => page.CreateModelExpression2(), string.Empty },
+                };
+            }
+        }
+
+        public static TheoryData NotQuiteIdentityExpressions
+        {
+            get
+            {
+                return new TheoryData<Func<NotQuiteIdentityRazorPage, ModelExpression>, string, Type>
+                {
+                    // m => m.Model
+                    { page => page.CreateModelExpression1(), "Model", typeof(RecursiveModel) },
+                    // m => ViewData.Model
+                    { page => page.CreateModelExpression2(), "ViewData.Model", typeof(RecursiveModel) },
+                    // m => ViewContext.ViewData.Model
+                    // This property has type object because ViewData is not exposed as ViewDataDictionary<TModel>.
+                    { page => page.CreateModelExpression3(), "ViewContext.ViewData.Model", typeof(object) },
+                };
+            }
+        }
+
+        public static TheoryData<Expression<Func<RazorPageCreateModelExpressionModel, int>>, string> IntExpressions
+        {
+            get
+            {
+                var somethingElse = 23;
+                return new TheoryData<Expression<Func<RazorPageCreateModelExpressionModel, int>>, string>
+                {
+                    { model => somethingElse, "somethingElse" },
+                    { model => model.Id, "Id" },
+                    { model => model.SubModel.Id, "SubModel.Id" },
+                    { model => model.SubModel.SubSubModel.Id, "SubModel.SubSubModel.Id" },
+                };
+            }
+        }
+
+        public static TheoryData<Expression<Func<RazorPageCreateModelExpressionModel, string>>, string> StringExpressions
+        {
+            get
+            {
+                var somethingElse = "This is something else";
+                return new TheoryData<Expression<Func<RazorPageCreateModelExpressionModel, string>>, string>
+                {
+                    { model => somethingElse, "somethingElse" },
+                    { model => model.Name, "Name" },
+                    { model => model.SubModel.Name, "SubModel.Name" },
+                    { model => model.SubModel.SubSubModel.Name, "SubModel.SubSubModel.Name" },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(IdentityExpressions))]
+        public void CreateModelExpression_ReturnsExpectedMetadata_IdentityExpressions(
+            Func<IdentityRazorPage, ModelExpression> createModelExpression,
+            string expectedName)
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var modelExplorer = viewContext.ViewData.ModelExplorer.GetExplorerForProperty(
+                nameof(RazorPageCreateModelExpressionModel.Name));
+            var viewData = new ViewDataDictionary<string>(viewContext.ViewData)
+            {
+                ModelExplorer = modelExplorer,
+            };
+            viewContext.ViewData = viewData;
+
+            var page = CreateIdentityPage(viewContext);
+
+            // Act
+            var modelExpression = createModelExpression(page);
+
+            // Assert
+            Assert.NotNull(modelExpression);
+            Assert.Equal(expectedName, modelExpression.Name);
+            Assert.Same(modelExplorer, modelExpression.ModelExplorer);
+        }
+
+        [Theory]
+        [MemberData(nameof(NotQuiteIdentityExpressions))]
+        public void CreateModelExpression_ReturnsExpectedMetadata_NotQuiteIdentityExpressions(
+            Func<NotQuiteIdentityRazorPage, ModelExpression> createModelExpression,
+            string expectedName,
+            Type expectedType)
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var viewData = new ViewDataDictionary<RecursiveModel>(viewContext.ViewData);
+            viewContext.ViewData = viewData;
+            var modelExplorer = viewData.ModelExplorer;
+
+            var page = CreateNotQuiteIdentityPage(viewContext);
+
+            // Act
+            var modelExpression = createModelExpression(page);
+
+            // Assert
+            Assert.NotNull(modelExpression);
+            Assert.Equal(expectedName, modelExpression.Name);
+            Assert.NotNull(modelExpression.ModelExplorer);
+            Assert.NotSame(modelExplorer, modelExpression.ModelExplorer);
+            Assert.NotNull(modelExpression.Metadata);
+            Assert.Equal(ModelMetadataKind.Property, modelExpression.Metadata.MetadataKind);
+            Assert.Equal(expectedType, modelExpression.Metadata.ModelType);
+        }
+
+        [Theory]
+        [MemberData(nameof(IntExpressions))]
+        public void CreateModelExpression_ReturnsExpectedMetadata_IntExpressions(
+            Expression<Func<RazorPageCreateModelExpressionModel, int>> expression,
+            string expectedName)
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var page = CreatePage(viewContext);
+
+            // Act
+            var result = page.ModelExpressionProvider.CreateModelExpression(page.ViewData, expression);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.NotNull(result.Metadata);
+            Assert.Equal(typeof(int), result.Metadata.ModelType);
+            Assert.Equal(expectedName, result.Name);
+        }
+
+        [Theory]
+        [MemberData(nameof(StringExpressions))]
+        public void CreateModelExpression_ReturnsExpectedMetadata_StringExpressions(
+            Expression<Func<RazorPageCreateModelExpressionModel, string>> expression,
+            string expectedName)
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var page = CreatePage(viewContext);
+
+            // Act
+            var result = page.ModelExpressionProvider.CreateModelExpression(page.ViewData, expression);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.NotNull(result.Metadata);
+            Assert.Equal(typeof(string), result.Metadata.ModelType);
+            Assert.Equal(expectedName, result.Name);
+        }
+
+        private static IdentityRazorPage CreateIdentityPage(ViewContext viewContext)
+        {
+            return new IdentityRazorPage
+            {
+                ViewContext = viewContext,
+                ViewData = (ViewDataDictionary<string>)viewContext.ViewData,
+                ModelExpressionProvider = CreateModelExpressionProvider(),
+            };
+        }
+
+        public static NotQuiteIdentityRazorPage CreateNotQuiteIdentityPage(ViewContext viewContext)
+        {
+            return new NotQuiteIdentityRazorPage
+            {
+                ViewContext = viewContext,
+                ViewData = (ViewDataDictionary<RecursiveModel>)viewContext.ViewData,
+                ModelExpressionProvider = CreateModelExpressionProvider(),
+            };
+        }
+
+        private static TestRazorPage CreatePage(ViewContext viewContext)
+        {
+            return new TestRazorPage
+            {
+                ViewContext = viewContext,
+                ViewData = (ViewDataDictionary<RazorPageCreateModelExpressionModel>)viewContext.ViewData,
+                ModelExpressionProvider = CreateModelExpressionProvider(),
+            };
+        }
+
+        private static IModelExpressionProvider CreateModelExpressionProvider()
+        {
+            var provider = new TestModelMetadataProvider();
+            var modelExpressionProvider = new ModelExpressionProvider(
+                provider,
+                new ExpressionTextCache());
+
+            return modelExpressionProvider;
+        }
+
+        private static ViewContext CreateViewContext()
+        {
+            var provider = new TestModelMetadataProvider();
+            var viewData = new ViewDataDictionary<RazorPageCreateModelExpressionModel>(provider, new ModelStateDictionary());
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddSingleton<IModelMetadataProvider>(provider);
+            serviceCollection.AddSingleton<ExpressionTextCache, ExpressionTextCache>();
+
+            var httpContext = new DefaultHttpContext
+            {
+                RequestServices = serviceCollection.BuildServiceProvider(),
+            };
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            return new ViewContext(
+                actionContext,
+                NullView.Instance,
+                viewData,
+                Mock.Of<ITempDataDictionary>(),
+                new StringWriter(),
+                new HtmlHelperOptions());
+        }
+
+        public class IdentityRazorPage : TestRazorPage<string>
+        {
+            public ModelExpression CreateModelExpression1()
+            {
+                return ModelExpressionProvider.CreateModelExpression(ViewData, m => m);
+            }
+
+            public ModelExpression CreateModelExpression2()
+            {
+                return ModelExpressionProvider.CreateModelExpression(ViewData, m => Model);
+            }
+
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public class NotQuiteIdentityRazorPage : TestRazorPage<RecursiveModel>
+        {
+            public ModelExpression CreateModelExpression1()
+            {
+                return ModelExpressionProvider.CreateModelExpression(ViewData, m => m.Model);
+            }
+
+            public ModelExpression CreateModelExpression2()
+            {
+                return ModelExpressionProvider.CreateModelExpression(ViewData, m => ViewData.Model);
+            }
+
+            public ModelExpression CreateModelExpression3()
+            {
+                return ModelExpressionProvider.CreateModelExpression(ViewData, m => ViewContext.ViewData.Model);
+            }
+
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class TestRazorPage : TestRazorPage<RazorPageCreateModelExpressionModel>
+        {
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public class TestRazorPage<TModel> : RazorPage<TModel>
+        {
+            public IModelExpressionProvider ModelExpressionProvider { get; set; }
+
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public class RecursiveModel
+        {
+            public RecursiveModel Model { get; set; }
+        }
+
+        public class RazorPageCreateModelExpressionModel
+        {
+            public int Id { get; set; }
+
+            public string Name { get; set; }
+
+            public RazorPageCreateModelExpressionSubModel SubModel { get; set; }
+        }
+
+        public class RazorPageCreateModelExpressionSubModel
+        {
+            public int Id { get; set; }
+
+            public string Name { get; set; }
+
+            public RazorPageCreateModelExpressionSubSubModel SubSubModel { get; set; }
+        }
+
+        public class RazorPageCreateModelExpressionSubSubModel
+        {
+            public int Id { get; set; }
+
+            public string Name { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs
new file mode 100644
index 0000000000..f4acfc4de6
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs
@@ -0,0 +1,159 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public class RazorPageCreateTagHelperTest
+    {
+        [Fact]
+        public void CreateTagHelper_CreatesProvidedTagHelperType()
+        {
+            // Arrange
+            var instance = CreateTestRazorPage();
+
+            // Act
+            var tagHelper = instance.CreateTagHelper<NoServiceTagHelper>();
+
+            // Assert
+            Assert.NotNull(tagHelper);
+        }
+
+        [Fact]
+        public void CreateTagHelper_ActivatesProvidedTagHelperType()
+        {
+            // Arrange
+            var instance = CreateTestRazorPage();
+
+            // Act
+            var tagHelper = instance.CreateTagHelper<ServiceTagHelper>();
+
+            // Assert
+            Assert.NotNull(tagHelper.ActivatedService);
+        }
+
+        [Fact]
+        public void CreateTagHelper_ProvidesTagHelperTypeWithViewContext()
+        {
+            // Arrange
+            var instance = CreateTestRazorPage();
+
+            // Act
+            var tagHelper = instance.CreateTagHelper<ViewContextTagHelper>();
+
+            // Assert
+            Assert.NotNull(tagHelper.ViewContext);
+        }
+
+        private static TestRazorPage CreateTestRazorPage()
+        {
+            var modelMetadataProvider = new EmptyModelMetadataProvider();
+            var modelExpressionProvider = new ModelExpressionProvider(modelMetadataProvider, new ExpressionTextCache());
+            var activator = new RazorPageActivator(
+                modelMetadataProvider,
+                new UrlHelperFactory(),
+                new JsonHelper(
+                    new JsonOutputFormatter(new JsonSerializerSettings(), ArrayPool<char>.Shared),
+                    ArrayPool<char>.Shared),
+                new DiagnosticListener("Microsoft.AspNetCore"),
+                new HtmlTestEncoder(),
+                modelExpressionProvider);
+
+            var serviceProvider = new Mock<IServiceProvider>();
+            var typeActivator = new TypeActivatorCache();
+            var tagHelperActivator = new DefaultTagHelperActivator(typeActivator);
+            var myService = new MyService();
+            serviceProvider.Setup(mock => mock.GetService(typeof(MyService)))
+                           .Returns(myService);
+            serviceProvider.Setup(mock => mock.GetService(typeof(ITagHelperFactory)))
+                .Returns(new DefaultTagHelperFactory(tagHelperActivator));
+            serviceProvider.Setup(mock => mock.GetService(typeof(ITagHelperActivator)))
+                           .Returns(tagHelperActivator);
+            serviceProvider.Setup(mock => mock.GetService(typeof(ITypeActivatorCache)))
+                           .Returns(typeActivator);
+            serviceProvider.Setup(mock => mock.GetService(It.Is<Type>(serviceType =>
+                serviceType.GetTypeInfo().IsGenericType && serviceType.GetGenericTypeDefinition() == typeof(IEnumerable<>))))
+                .Returns<Type>(serviceType =>
+                {
+                    var enumerableType = serviceType.GetGenericArguments().First();
+                    return typeof(Enumerable).GetMethod("Empty").MakeGenericMethod(enumerableType).Invoke(null, null);
+                });
+            var httpContext = new Mock<HttpContext>();
+            httpContext.SetupGet(c => c.RequestServices)
+                       .Returns(serviceProvider.Object);
+
+            var actionContext = new ActionContext(httpContext.Object, new RouteData(), new ActionDescriptor());
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider(), new ModelStateDictionary());
+            var viewContext = new ViewContext(
+                actionContext,
+                Mock.Of<IView>(),
+                viewData,
+                Mock.Of<ITempDataDictionary>(),
+                TextWriter.Null,
+                new HtmlHelperOptions());
+
+            return new TestRazorPage
+            {
+                ViewContext = viewContext
+            };
+        }
+
+        private class TestRazorPage : RazorPage<dynamic>
+        {
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class NoServiceTagHelper : TagHelper
+        {
+        }
+
+        private class ServiceTagHelper : TagHelper
+        {
+            public ServiceTagHelper(MyService service)
+            {
+                ActivatedService = service;
+            }
+
+            [HtmlAttributeNotBound]
+            public MyService ActivatedService { get; }
+        }
+
+        private class ViewContextTagHelper : TagHelper
+        {
+            [ViewContext]
+            public ViewContext ViewContext { get; set; }
+        }
+
+        private class MyService
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageTest.cs
new file mode 100644
index 0000000000..0484a805eb
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageTest.cs
@@ -0,0 +1,1628 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Razor.Runtime.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public class RazorPageTest
+    {
+        private readonly RenderAsyncDelegate _nullRenderAsyncDelegate = () => Task.FromResult(0);
+        private readonly Func<TextWriter, Task> NullAsyncWrite = writer => writer.WriteAsync(string.Empty);
+
+        [Fact]
+        public async Task WritingScopesRedirectContentWrittenToViewContextWriter()
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var page = CreatePage(v =>
+            {
+                v.HtmlEncoder = new HtmlTestEncoder();
+                v.Write("Hello Prefix");
+                v.StartTagHelperWritingScope(encoder: null);
+                v.Write("Hello from Output");
+                v.ViewContext.Writer.Write("Hello from view context writer");
+                var scopeValue = v.EndTagHelperWritingScope();
+                v.Write("From Scope: ");
+                v.Write(scopeValue);
+            });
+
+            // Act
+            await page.ExecuteAsync();
+            var pageOutput = page.RenderedContent;
+
+            // Assert
+            Assert.Equal(
+                "HtmlEncode[[Hello Prefix]]HtmlEncode[[From Scope: ]]HtmlEncode[[Hello from Output]]" +
+                "Hello from view context writer",
+                pageOutput);
+        }
+
+        [Fact]
+        public async Task WritingScopesRedirectsContentWrittenToOutput()
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var page = CreatePage(v =>
+            {
+                v.HtmlEncoder = new HtmlTestEncoder();
+                v.Write("Hello Prefix");
+                v.StartTagHelperWritingScope(encoder: null);
+                v.Write("Hello In Scope");
+                var scopeValue = v.EndTagHelperWritingScope();
+                v.Write("From Scope: ");
+                v.Write(scopeValue);
+            });
+
+            // Act
+            await page.ExecuteAsync();
+            var pageOutput = page.RenderedContent;
+
+            // Assert
+            Assert.Equal("HtmlEncode[[Hello Prefix]]HtmlEncode[[From Scope: ]]HtmlEncode[[Hello In Scope]]", pageOutput);
+        }
+
+        [Fact]
+        public async Task WritingScopesCanNest()
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var page = CreatePage(v =>
+            {
+                v.HtmlEncoder = new HtmlTestEncoder();
+                v.Write("Hello Prefix");
+                v.StartTagHelperWritingScope(encoder: null);
+                v.Write("Hello In Scope Pre Nest");
+
+                v.StartTagHelperWritingScope(encoder: null);
+                v.Write("Hello In Nested Scope");
+                var scopeValue1 = v.EndTagHelperWritingScope();
+
+                v.Write("Hello In Scope Post Nest");
+                var scopeValue2 = v.EndTagHelperWritingScope();
+
+                v.Write("From Scopes: ");
+                v.Write(scopeValue2);
+                v.Write(scopeValue1);
+            });
+
+            // Act
+            await page.ExecuteAsync();
+
+            // Assert
+            var pageOutput = page.RenderedContent;
+            Assert.Equal(
+                "HtmlEncode[[Hello Prefix]]HtmlEncode[[From Scopes: ]]HtmlEncode[[Hello In Scope Pre Nest]]" +
+                "HtmlEncode[[Hello In Scope Post Nest]]HtmlEncode[[Hello In Nested Scope]]",
+                pageOutput);
+        }
+
+        [Fact]
+        public async Task StartTagHelperWritingScope_CannotFlushInWritingScope()
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var page = CreatePage(async v =>
+            {
+                v.Path = "/Views/TestPath/Test.cshtml";
+                v.StartTagHelperWritingScope(encoder: null);
+                await v.FlushAsync();
+            });
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => page.ExecuteAsync());
+            Assert.Equal(
+                "The FlushAsync operation cannot be performed while " +
+                "inside a writing scope in '/Views/TestPath/Test.cshtml'.",
+                ex.Message);
+        }
+
+        public static TheoryData<HtmlEncoder> HtmlEncoderData
+        {
+            get
+            {
+                return new TheoryData<HtmlEncoder>
+                {
+                    HtmlEncoder.Default,
+                    NullHtmlEncoder.Default,
+                    new HtmlTestEncoder(),
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(HtmlEncoderData))]
+        public async Task StartTagHelperWritingScope_SetsHtmlEncoder(HtmlEncoder encoder)
+        {
+            // Arrange
+            var page = CreatePage(v =>
+            {
+                v.StartTagHelperWritingScope(encoder);
+            });
+
+            // Act
+            await page.ExecuteAsync();
+
+            // Assert
+            Assert.Same(encoder, page.HtmlEncoder);
+        }
+
+        [Fact]
+        public async Task StartTagHelperWritingScope_DoesNotSetHtmlEncoderToNull()
+        {
+            // Arrange
+            var page = CreatePage(v =>
+            {
+                v.StartTagHelperWritingScope(encoder: null);
+            });
+            var originalEncoder = page.HtmlEncoder;
+
+            // Act
+            await page.ExecuteAsync();
+
+            // Assert
+            Assert.NotNull(originalEncoder);
+            Assert.Same(originalEncoder, page.HtmlEncoder);
+        }
+
+        [Fact]
+        public async Task EndTagHelperWritingScope_CannotEndWritingScopeWhenNoWritingScope()
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var page = CreatePage(v =>
+            {
+                v.EndTagHelperWritingScope();
+            });
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => page.ExecuteAsync());
+            Assert.Equal("There is no active writing scope to end.", ex.Message);
+        }
+
+        [Fact]
+        public async Task EndTagHelperWritingScope_ReturnsAppropriateContent()
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var page = CreatePage(v =>
+            {
+                v.HtmlEncoder = new HtmlTestEncoder();
+                v.StartTagHelperWritingScope(encoder: null);
+                v.Write("Hello World!");
+                var returnValue = v.EndTagHelperWritingScope();
+
+                // Assert
+                var content = Assert.IsType<DefaultTagHelperContent>(returnValue);
+                Assert.Equal("HtmlEncode[[Hello World!]]", content.GetContent());
+            });
+
+            // Act & Assert
+            await page.ExecuteAsync();
+        }
+
+        [Fact]
+        public async Task EndWriteTagHelperAttribute_RestoresPageWriter()
+        {
+            // Arrange
+            var page = CreatePage(v =>
+            {
+                v.BeginWriteTagHelperAttribute();
+                v.Write("Hello World!");
+                v.EndWriteTagHelperAttribute();
+            });
+            var originalWriter = page.Output;
+
+            // Act
+            await page.ExecuteAsync();
+
+            // Assert
+            Assert.NotNull(originalWriter);
+            Assert.Same(originalWriter, page.Output);
+        }
+
+        [Fact]
+        public async Task EndWriteTagHelperAttribute_ReturnsAppropriateContent()
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var page = CreatePage(v =>
+            {
+                v.HtmlEncoder = new HtmlTestEncoder();
+                v.BeginWriteTagHelperAttribute();
+                v.Write("Hello World!");
+                var returnValue = v.EndWriteTagHelperAttribute();
+
+                // Assert
+                var content = Assert.IsType<string>(returnValue);
+                Assert.Equal("HtmlEncode[[Hello World!]]", content);
+            });
+
+            // Act & Assert
+            await page.ExecuteAsync();
+        }
+
+        [Fact]
+        public async Task BeginWriteTagHelperAttribute_NestingWritingScopesThrows()
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var page = CreatePage(v =>
+            {
+                v.BeginWriteTagHelperAttribute();
+                v.BeginWriteTagHelperAttribute();
+                v.Write("Hello World!");
+            });
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => page.ExecuteAsync());
+            Assert.Equal("Nesting of TagHelper attribute writing scopes is not supported.", ex.Message);
+        }
+
+        // This is an integration test for ensuring that ViewBuffer segments used by
+        // TagHelpers can be merged back into the 'main' segment where possible.
+        [Fact]
+        public async Task TagHelperScopes_ViewBuffersCanCombine()
+        {
+            // Arrange
+            var bufferScope = new TestViewBufferScope();
+            var viewContext = CreateViewContext(bufferScope: bufferScope);
+
+            var page = CreatePage(async v =>
+            {
+                Assert.Equal(0, bufferScope.CreatedBuffers.Count);
+                v.Write("Level:0"); // Creates a 'top-level' buffer.
+                Assert.Equal(1, bufferScope.CreatedBuffers.Count);
+
+                // Run a TagHelper
+                {
+                    v.StartTagHelperWritingScope(encoder: null);
+
+                    Assert.Equal(1, bufferScope.CreatedBuffers.Count);
+                    Assert.Equal(0, bufferScope.ReturnedBuffers.Count);
+                    v.Write("Level:1-A"); // Creates a new buffer for the taghelper.
+                    Assert.Equal(2, bufferScope.CreatedBuffers.Count);
+                    Assert.Equal(0, bufferScope.ReturnedBuffers.Count);
+
+                    TagHelperContent innerContentLevel1 = null;
+                    var outputLevel1 = new TagHelperOutput("t1", new TagHelperAttributeList(), (_, encoder) =>
+                    {
+                        return Task.FromResult(innerContentLevel1);
+                    });
+
+                    innerContentLevel1 = v.EndTagHelperWritingScope();
+                    outputLevel1.Content = await outputLevel1.GetChildContentAsync();
+
+                    Assert.Equal(2, bufferScope.CreatedBuffers.Count);
+                    Assert.Equal(0, bufferScope.ReturnedBuffers.Count);
+                    v.Write(outputLevel1); // Writing the taghelper to output returns a buffer.
+                    Assert.Equal(2, bufferScope.CreatedBuffers.Count);
+                    Assert.Equal(1, bufferScope.ReturnedBuffers.Count);
+                }
+
+                Assert.Equal(2, bufferScope.CreatedBuffers.Count);
+                Assert.Equal(1, bufferScope.ReturnedBuffers.Count);
+                v.Write("Level:0"); // Already have a buffer for this scope.
+                Assert.Equal(2, bufferScope.CreatedBuffers.Count);
+                Assert.Equal(1, bufferScope.ReturnedBuffers.Count);
+
+                // Run another TagHelper
+                {
+                    v.StartTagHelperWritingScope(encoder: null);
+
+                    Assert.Equal(2, bufferScope.CreatedBuffers.Count);
+                    Assert.Equal(1, bufferScope.ReturnedBuffers.Count);
+                    v.Write("Level:1-B"); // Creates a new buffer for the taghelper.
+                    Assert.Equal(3, bufferScope.CreatedBuffers.Count);
+                    Assert.Equal(1, bufferScope.ReturnedBuffers.Count);
+
+                    TagHelperContent innerContentLevel1 = null;
+                    var outputLevel1 = new TagHelperOutput("t2", new TagHelperAttributeList(), (_, encoder) =>
+                    {
+                        return Task.FromResult(innerContentLevel1);
+                    });
+
+                    // Run a nested TagHelper
+                    {
+                        v.StartTagHelperWritingScope(encoder: null);
+
+                        Assert.Equal(3, bufferScope.CreatedBuffers.Count);
+                        Assert.Equal(1, bufferScope.ReturnedBuffers.Count);
+                        v.Write("Level:2"); // Creates a new buffer for the taghelper.
+                        Assert.Equal(4, bufferScope.CreatedBuffers.Count);
+                        Assert.Equal(1, bufferScope.ReturnedBuffers.Count);
+
+                        TagHelperContent innerContentLevel2 = null;
+                        var outputLevel2 = new TagHelperOutput("t3", new TagHelperAttributeList(), (_, encoder) =>
+                        {
+                            return Task.FromResult(innerContentLevel2);
+                        });
+
+                        innerContentLevel2 = v.EndTagHelperWritingScope();
+                        outputLevel2.Content = await outputLevel2.GetChildContentAsync();
+
+                        Assert.Equal(4, bufferScope.CreatedBuffers.Count);
+                        Assert.Equal(1, bufferScope.ReturnedBuffers.Count);
+                        v.Write(outputLevel2); // Writing the taghelper to output returns a buffer.
+                        Assert.Equal(4, bufferScope.CreatedBuffers.Count);
+                        Assert.Equal(2, bufferScope.ReturnedBuffers.Count);
+                    }
+
+                    Assert.Equal(4, bufferScope.CreatedBuffers.Count);
+                    Assert.Equal(2, bufferScope.ReturnedBuffers.Count);
+                    v.Write("Level:1-B"); // Already have a buffer for this scope.
+                    Assert.Equal(4, bufferScope.CreatedBuffers.Count);
+                    Assert.Equal(2, bufferScope.ReturnedBuffers.Count);
+
+                    innerContentLevel1 = v.EndTagHelperWritingScope();
+                    outputLevel1.Content = await outputLevel1.GetChildContentAsync();
+
+                    Assert.Equal(4, bufferScope.CreatedBuffers.Count);
+                    Assert.Equal(2, bufferScope.ReturnedBuffers.Count);
+                    v.Write(outputLevel1); // Writing the taghelper to output returns a buffer.
+                    Assert.Equal(4, bufferScope.CreatedBuffers.Count);
+                    Assert.Equal(3, bufferScope.ReturnedBuffers.Count);
+                }
+
+                Assert.Equal(4, bufferScope.CreatedBuffers.Count);
+                Assert.Equal(3, bufferScope.ReturnedBuffers.Count);
+                v.Write("Level:0"); // Already have a buffer for this scope.
+                Assert.Equal(4, bufferScope.CreatedBuffers.Count);
+                Assert.Equal(3, bufferScope.ReturnedBuffers.Count);
+
+            }, viewContext);
+
+            // Act & Assert
+            await page.ExecuteAsync();
+            Assert.Equal(
+                "HtmlEncode[[Level:0]]" +
+                "<t1>" +
+                    "HtmlEncode[[Level:1-A]]" +
+                "</t1>" +
+                "HtmlEncode[[Level:0]]" +
+                "<t2>" +
+                    "HtmlEncode[[Level:1-B]]" +
+                    "<t3>" +
+                        "HtmlEncode[[Level:2]]" +
+                    "</t3>" +
+                    "HtmlEncode[[Level:1-B]]" +
+                "</t2>" +
+                "HtmlEncode[[Level:0]]",
+                page.RenderedContent);
+        }
+
+        [Fact]
+        public async Task DefineSection_ThrowsIfSectionIsAlreadyDefined()
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var page = CreatePage(v =>
+            {
+                v.DefineSection("qux", _nullRenderAsyncDelegate);
+                v.DefineSection("qux", _nullRenderAsyncDelegate);
+            });
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => page.ExecuteAsync());
+            Assert.Equal("Section 'qux' is already defined.", ex.Message);
+        }
+
+        [Fact]
+        public async Task RenderSection_RendersSectionFromPreviousPage()
+        {
+            // Arrange
+            var expected = "Hello world";
+            var viewContext = CreateViewContext();
+            var page = CreatePage(v =>
+            {
+                v.Write(v.RenderSection("bar"));
+            });
+            page.PreviousSectionWriters = new Dictionary<string, RenderAsyncDelegate>
+            {
+                { "bar", () => page.Output.WriteAsync(expected) }
+            };
+
+            // Act
+            await page.ExecuteAsync();
+
+            // Assert
+            Assert.Equal(expected, page.RenderedContent);
+        }
+
+        [Fact]
+        public async Task RenderSection_ThrowsIfPreviousSectionWritersIsNotSet()
+        {
+            // Arrange
+            Exception ex = null;
+            var page = CreatePage(v =>
+            {
+                v.Path = "/Views/TestPath/Test.cshtml";
+                ex = Assert.Throws<InvalidOperationException>(() => v.RenderSection("bar"));
+            });
+
+            // Act & Assert
+            await page.ExecuteAsync();
+            Assert.Equal("RenderSection invocation in '/Views/TestPath/Test.cshtml' is invalid. " +
+                "RenderSection can only be called from a layout page.",
+                ex.Message);
+        }
+
+        [Fact]
+        public async Task RenderSection_ThrowsIfRequiredSectionIsNotFound()
+        {
+            // Arrange
+            var context = CreateViewContext(viewPath: "/Views/TestPath/Test.cshtml");
+            context.ExecutingFilePath = "/Views/Shared/_Layout.cshtml";
+            var page = CreatePage(v =>
+            {
+                v.RenderSection("bar");
+            }, context: context);
+            page.PreviousSectionWriters = new Dictionary<string, RenderAsyncDelegate>
+            {
+                { "baz", _nullRenderAsyncDelegate }
+            };
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => page.ExecuteAsync());
+            var message = $"The layout page '/Views/Shared/_Layout.cshtml' cannot find the section 'bar'" +
+                " in the content page '/Views/TestPath/Test.cshtml'.";
+            Assert.Equal(message, ex.Message);
+        }
+
+        [Fact]
+        public async Task IgnoreSection_ThrowsIfSectionIsNotFound()
+        {
+            // Arrange
+            var context = CreateViewContext(viewPath: "/Views/TestPath/Test.cshtml");
+            context.ExecutingFilePath = "/Views/Shared/_Layout.cshtml";
+            var page = CreatePage(v =>
+            {
+                v.Path = "/Views/TestPath/Test.cshtml";
+                v.IgnoreSection("bar");
+            }, context);
+            page.PreviousSectionWriters = new Dictionary<string, RenderAsyncDelegate>
+            {
+                { "baz", _nullRenderAsyncDelegate }
+            };
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => page.ExecuteAsync());
+            var message = $"The layout page '/Views/Shared/_Layout.cshtml' cannot find the section 'bar'" +
+                " in the content page '/Views/TestPath/Test.cshtml'.";
+            Assert.Equal(message, ex.Message);
+        }
+
+        [Fact]
+        public void IsSectionDefined_ThrowsIfPreviousSectionWritersIsNotRegistered()
+        {
+            // Arrange
+            var page = CreatePage(v =>
+            {
+                v.Path = "/Views/TestPath/Test.cshtml";
+            });
+            page.ExecuteAsync();
+
+            // Act & Assert
+            ExceptionAssert.Throws<InvalidOperationException>(() => page.IsSectionDefined("foo"),
+                "IsSectionDefined invocation in '/Views/TestPath/Test.cshtml' is invalid." +
+                " IsSectionDefined can only be called from a layout page.");
+        }
+
+        [Fact]
+        public async Task IsSectionDefined_ReturnsFalseIfSectionNotDefined()
+        {
+            // Arrange
+            bool? actual = null;
+            var page = CreatePage(v =>
+            {
+                actual = v.IsSectionDefined("foo");
+                v.RenderSection("baz");
+                v.RenderBodyPublic();
+            });
+            page.PreviousSectionWriters = new Dictionary<string, RenderAsyncDelegate>
+            {
+                { "baz", _nullRenderAsyncDelegate }
+            };
+            page.BodyContent = new HtmlString("body-content");
+
+            // Act
+            await page.ExecuteAsync();
+
+            // Assert
+            Assert.False(actual);
+        }
+
+        [Fact]
+        public async Task IsSectionDefined_ReturnsTrueIfSectionDefined()
+        {
+            // Arrange
+            bool? actual = null;
+            var page = CreatePage(v =>
+            {
+                actual = v.IsSectionDefined("baz");
+                v.RenderSection("baz");
+                v.RenderBodyPublic();
+            });
+            page.PreviousSectionWriters = new Dictionary<string, RenderAsyncDelegate>
+            {
+                { "baz", _nullRenderAsyncDelegate }
+            };
+            page.BodyContent = new HtmlString("body-content");
+
+            // Act
+            await page.ExecuteAsync();
+
+            // Assert
+            Assert.True(actual);
+        }
+
+        [Fact]
+        public async Task RenderSection_ThrowsIfSectionIsRenderedMoreThanOnce()
+        {
+            // Arrange
+            var expected = new HelperResult(NullAsyncWrite);
+            var page = CreatePage(v =>
+            {
+                v.Path = "/Views/TestPath/Test.cshtml";
+                v.RenderSection("header");
+                v.RenderSection("header");
+            });
+            page.PreviousSectionWriters = new Dictionary<string, RenderAsyncDelegate>
+            {
+                { "header", _nullRenderAsyncDelegate }
+            };
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(page.ExecuteAsync);
+            Assert.Equal(
+                "RenderSectionAsync invocation in '/Views/TestPath/Test.cshtml' is invalid." +
+                " The section 'header' has already been rendered.",
+                ex.Message);
+        }
+
+        [Fact]
+        public async Task RenderSectionAsync_ThrowsIfSectionIsRenderedMoreThanOnce()
+        {
+            // Arrange
+            var expected = new HelperResult(NullAsyncWrite);
+            var page = CreatePage(async v =>
+            {
+                v.Path = "/Views/TestPath/Test.cshtml";
+                await v.RenderSectionAsync("header");
+                await v.RenderSectionAsync("header");
+            });
+            page.PreviousSectionWriters = new Dictionary<string, RenderAsyncDelegate>
+            {
+                { "header", _nullRenderAsyncDelegate }
+            };
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(page.ExecuteAsync);
+            Assert.Equal(
+                "RenderSectionAsync invocation in '/Views/TestPath/Test.cshtml' is invalid." +
+                " The section 'header' has already been rendered.",
+                ex.Message);
+        }
+
+        [Fact]
+        public async Task RenderSectionAsync_ThrowsIfSectionIsRenderedMoreThanOnce_WithSyncMethod()
+        {
+            // Arrange
+            var expected = new HelperResult(NullAsyncWrite);
+            var page = CreatePage(async v =>
+            {
+                v.Path = "/Views/TestPath/Test.cshtml";
+                v.RenderSection("header");
+                await v.RenderSectionAsync("header");
+            });
+            page.PreviousSectionWriters = new Dictionary<string, RenderAsyncDelegate>
+            {
+                { "header", _nullRenderAsyncDelegate }
+            };
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(page.ExecuteAsync);
+            Assert.Equal(
+                "RenderSectionAsync invocation in '/Views/TestPath/Test.cshtml' is invalid." +
+                " The section 'header' has already been rendered.",
+                ex.Message);
+        }
+
+        [Fact]
+        public async Task RenderSectionAsync_ThrowsIfNotInvokedFromLayoutPage()
+        {
+            // Arrange
+            var expected = new HelperResult(NullAsyncWrite);
+            var page = CreatePage(async v =>
+            {
+                v.Path = "/Views/TestPath/Test.cshtml";
+                await v.RenderSectionAsync("header");
+            });
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(page.ExecuteAsync);
+            Assert.Equal(
+                "RenderSectionAsync invocation in '/Views/TestPath/Test.cshtml' is invalid. " +
+                "RenderSectionAsync can only be called from a layout page.",
+                ex.Message);
+        }
+
+        [Fact]
+        public async Task EnsureRenderedBodyOrSections_ThrowsIfRenderBodyIsNotCalledFromPage_AndNoSectionsAreDefined()
+        {
+            // Arrange
+            var path = "page-path";
+            var page = CreatePage(v =>
+            {
+            });
+            page.Path = path;
+            page.BodyContent = new HtmlString("some content");
+            await page.ExecuteAsync();
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => page.EnsureRenderedBodyOrSections());
+            Assert.Equal($"RenderBody has not been called for the page at '{path}'. To ignore call IgnoreBody().", ex.Message);
+        }
+
+        [Fact]
+        public async Task EnsureRenderedBodyOrSections_SucceedsIfRenderBodyIsNotCalledFromPage_AndNoSectionsAreDefined_AndBodyIgnored()
+        {
+            // Arrange
+            var path = "page-path";
+            var page = CreatePage(v =>
+            {
+            });
+            page.Path = path;
+            page.BodyContent = new HtmlString("some content");
+            page.IgnoreBody();
+
+            // Act & Assert (does not throw)
+            await page.ExecuteAsync();
+            page.EnsureRenderedBodyOrSections();
+        }
+
+        [Fact]
+        public async Task EnsureRenderedBodyOrSections_ThrowsIfDefinedSectionsAreNotRendered()
+        {
+            // Arrange
+            var path = "page-path";
+            var sectionName = "sectionA";
+            var page = CreatePage(v =>
+            {
+            });
+            page.Path = path;
+            page.BodyContent = new HtmlString("some content");
+            page.PreviousSectionWriters = new Dictionary<string, RenderAsyncDelegate>
+            {
+                { sectionName, _nullRenderAsyncDelegate }
+            };
+            await page.ExecuteAsync();
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => page.EnsureRenderedBodyOrSections());
+            Assert.Equal(
+                "The following sections have been defined but have not been rendered by the page at " +
+                $"'{path}': '{sectionName}'. To ignore an unrendered section call IgnoreSection(\"sectionName\").",
+                ex.Message);
+        }
+
+        [Fact]
+        public async Task EnsureRenderedBodyOrSections_SucceedsIfDefinedSectionsAreNotRendered_AndIgnored()
+        {
+            // Arrange
+            var path = "page-path";
+            var sectionName = "sectionA";
+            var page = CreatePage(v =>
+            {
+            });
+            page.Path = path;
+            page.BodyContent = new HtmlString("some content");
+            page.PreviousSectionWriters = new Dictionary<string, RenderAsyncDelegate>
+            {
+                { sectionName, _nullRenderAsyncDelegate }
+            };
+            page.IgnoreSection(sectionName);
+
+            // Act & Assert (does not throw)
+            await page.ExecuteAsync();
+            page.EnsureRenderedBodyOrSections();
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_RendersSectionsThatAreNotIgnored()
+        {
+            // Arrange
+            var path = "page-path";
+            var page = CreatePage(async p =>
+            {
+                p.IgnoreSection("ignored");
+                p.Write(await p.RenderSectionAsync("not-ignored-section"));
+            });
+            page.Path = path;
+            page.BodyContent = new HtmlString("some content");
+            page.PreviousSectionWriters = new Dictionary<string, RenderAsyncDelegate>
+            {
+                { "ignored", _nullRenderAsyncDelegate },
+                { "not-ignored-section", () => page.Output.WriteAsync("not-ignored-section-content") }
+            };
+
+            // Act
+            await page.ExecuteAsync();
+
+            // Assert
+            Assert.Equal("not-ignored-section-content", page.RenderedContent);
+        }
+
+        [Fact]
+        public async Task EnsureRenderedBodyOrSections_SucceedsIfRenderBodyIsNotCalled_ButAllDefinedSectionsAreRendered()
+        {
+            // Arrange
+            var sectionA = "sectionA";
+            var sectionB = "sectionB";
+            var page = CreatePage(v =>
+            {
+                v.RenderSection(sectionA);
+                v.RenderSection(sectionB);
+            });
+            page.BodyContent = new HtmlString("some content");
+            page.PreviousSectionWriters = new Dictionary<string, RenderAsyncDelegate>
+            {
+                { sectionA, _nullRenderAsyncDelegate },
+                { sectionB, _nullRenderAsyncDelegate },
+            };
+
+            // Act & Assert (does not throw)
+            await page.ExecuteAsync();
+            page.EnsureRenderedBodyOrSections();
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_RendersSectionsAndBody()
+        {
+            // Arrange
+            var expected = string.Join(Environment.NewLine,
+                                       "Layout start",
+                                       "Header section",
+                                       "Async Header section",
+                                       "body content",
+                                       "Async Footer section",
+                                       "Footer section",
+                                       "Layout end");
+            var page = CreatePage(async v =>
+            {
+                v.WriteLiteral("Layout start" + Environment.NewLine);
+                v.Write(v.RenderSection("header"));
+                v.Write(await v.RenderSectionAsync("async-header"));
+                v.Write(v.RenderBodyPublic());
+                v.Write(await v.RenderSectionAsync("async-footer"));
+                v.Write(v.RenderSection("footer"));
+                v.WriteLiteral("Layout end");
+            });
+            page.BodyContent = new HtmlString("body content" + Environment.NewLine);
+            page.PreviousSectionWriters = new Dictionary<string, RenderAsyncDelegate>
+            {
+                {
+                    "footer", () => page.Output.WriteLineAsync("Footer section")
+                },
+                {
+                    "header", () => page.Output.WriteLineAsync("Header section")
+                },
+                {
+                    "async-header", () => page.Output.WriteLineAsync("Async Header section")
+                },
+                {
+                    "async-footer", () => page.Output.WriteLineAsync("Async Footer section")
+                },
+            };
+
+            // Act
+            await page.ExecuteAsync();
+
+            // Assert
+            var actual = page.RenderedContent;
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public async Task Href_ReadsUrlHelperFromServiceCollection()
+        {
+            // Arrange
+            var expected = "urlhelper-url";
+            var helper = new Mock<IUrlHelper>();
+            helper
+                .Setup(h => h.Content("url"))
+                .Returns(expected)
+                .Verifiable();
+            var factory = new Mock<IUrlHelperFactory>();
+            factory
+                .Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>()))
+                .Returns(helper.Object);
+
+            var page = CreatePage(v =>
+            {
+                v.HtmlEncoder = new HtmlTestEncoder();
+                v.Write(v.Href("url"));
+            });
+            var services = new Mock<IServiceProvider>();
+            services.Setup(s => s.GetService(typeof(IUrlHelperFactory)))
+                     .Returns(factory.Object);
+            page.Context.RequestServices = services.Object;
+
+            // Act
+            await page.ExecuteAsync();
+
+            // Assert
+            var actual = page.RenderedContent;
+            Assert.Equal($"HtmlEncode[[{expected}]]", actual);
+            helper.Verify();
+        }
+
+        [Fact]
+        public async Task FlushAsync_InvokesFlushOnWriter()
+        {
+            // Arrange
+            var writer = new Mock<TextWriter>();
+            var context = CreateViewContext(writer.Object);
+            var page = CreatePage(async p =>
+            {
+                await p.FlushAsync();
+            }, context);
+
+            // Act
+            await page.ExecuteAsync();
+
+            // Assert
+            writer.Verify(v => v.FlushAsync(), Times.Once());
+        }
+
+        [Fact]
+        public async Task FlushAsync_ThrowsIfTheLayoutHasBeenSet()
+        {
+            // Arrange
+            var expected = "Layout page '/Views/TestPath/Test.cshtml' cannot be rendered" +
+                " after 'FlushAsync' has been invoked.";
+            var writer = new Mock<TextWriter>();
+            var context = CreateViewContext(writer.Object);
+            var page = CreatePage(async p =>
+            {
+                p.Path = "/Views/TestPath/Test.cshtml";
+                p.Layout = "foo";
+                await p.FlushAsync();
+            }, context);
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => page.ExecuteAsync());
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public async Task FlushAsync_DoesNotThrowWhenIsRenderingLayoutIsSet()
+        {
+            // Arrange
+            var writer = new Mock<TextWriter>();
+            var context = CreateViewContext(writer.Object);
+            var page = CreatePage(p =>
+            {
+                p.Layout = "bar";
+                p.DefineSection("test-section", async () =>
+                {
+                    await p.FlushAsync();
+                });
+            }, context);
+
+            // Act
+            await page.ExecuteAsync();
+            page.IsLayoutBeingRendered = true;
+
+            // Assert (does not throw)
+            var renderAsyncDelegate = page.SectionWriters["test-section"];
+            await renderAsyncDelegate();
+        }
+
+        [Fact]
+        public async Task FlushAsync_ReturnsEmptyHtmlString()
+        {
+            // Arrange
+            HtmlString actual = null;
+            var writer = new Mock<TextWriter>();
+            var context = CreateViewContext(writer.Object);
+            var page = CreatePage(async p =>
+            {
+                actual = await p.FlushAsync();
+            }, context);
+
+            // Act
+            await page.ExecuteAsync();
+
+            // Assert
+            Assert.Same(HtmlString.Empty, actual);
+        }
+
+        [Fact]
+        public async Task WriteAttribute_WritesBeginAndEndEvents_ToDiagnosticSource()
+        {
+            // Arrange
+            var path = "path-to-page";
+            var page = CreatePage(p =>
+            {
+                p.HtmlEncoder = new HtmlTestEncoder();
+                p.BeginWriteAttribute("href", "prefix", 0, "suffix", 34, 2);
+                p.WriteAttributeValue("prefix", 0, "attr1-value", 8, 14, true);
+                p.WriteAttributeValue("prefix2", 22, "attr2", 29, 5, false);
+                p.EndWriteAttribute();
+            });
+            page.Path = path;
+            var adapter = new TestDiagnosticListener();
+            var diagnosticListener = new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor");
+            diagnosticListener.SubscribeWithAdapter(adapter);
+            page.DiagnosticSource = diagnosticListener;
+
+            // Act
+            await page.ExecuteAsync();
+
+            // Assert
+            Func<object, TestDiagnosticListener.BeginPageInstrumentationData> assertStartEvent = data =>
+            {
+                var beginEvent = Assert.IsType<TestDiagnosticListener.BeginPageInstrumentationData>(data);
+                Assert.NotNull(beginEvent.HttpContext);
+                Assert.Equal(path, beginEvent.Path);
+
+                return beginEvent;
+            };
+
+            Action<object> assertEndEvent = data =>
+            {
+                var endEvent = Assert.IsType<TestDiagnosticListener.EndPageInstrumentationData>(data);
+                Assert.NotNull(endEvent.HttpContext);
+                Assert.Equal(path, endEvent.Path);
+            };
+
+            Assert.Collection(adapter.PageInstrumentationData,
+                data =>
+                {
+                    var beginEvent = assertStartEvent(data);
+                    Assert.Equal(0, beginEvent.Position);
+                    Assert.Equal(6, beginEvent.Length);
+                    Assert.True(beginEvent.IsLiteral);
+                },
+                assertEndEvent,
+                data =>
+                {
+                    var beginEvent = assertStartEvent(data);
+                    Assert.Equal(0, beginEvent.Position);
+                    Assert.Equal(6, beginEvent.Length);
+                    Assert.True(beginEvent.IsLiteral);
+                },
+                assertEndEvent,
+                data =>
+                {
+                    var beginEvent = assertStartEvent(data);
+                    Assert.Equal(8, beginEvent.Position);
+                    Assert.Equal(14, beginEvent.Length);
+                    Assert.True(beginEvent.IsLiteral);
+                },
+                assertEndEvent,
+                data =>
+                {
+                    var beginEvent = assertStartEvent(data);
+                    Assert.Equal(22, beginEvent.Position);
+                    Assert.Equal(7, beginEvent.Length);
+                    Assert.True(beginEvent.IsLiteral);
+                },
+                assertEndEvent,
+                data =>
+                {
+                    var beginEvent = assertStartEvent(data);
+                    Assert.Equal(29, beginEvent.Position);
+                    Assert.Equal(5, beginEvent.Length);
+                    Assert.False(beginEvent.IsLiteral);
+                },
+                assertEndEvent,
+                data =>
+                {
+                    var beginEvent = assertStartEvent(data);
+                    Assert.Equal(34, beginEvent.Position);
+                    Assert.Equal(6, beginEvent.Length);
+                    Assert.True(beginEvent.IsLiteral);
+                },
+                assertEndEvent);
+        }
+
+        [Fact]
+        public async Task WriteAttribute_WithBoolValue_WritesBeginAndEndEvents_ToDiagnosticSource()
+        {
+            // Arrange
+            var path = "some-path";
+            var page = CreatePage(p =>
+            {
+                p.HtmlEncoder = new HtmlTestEncoder();
+                p.BeginWriteAttribute("href", "prefix", 0, "suffix", 10, 1);
+                p.WriteAttributeValue("", 6, "true", 6, 4, false);
+                p.EndWriteAttribute();
+            });
+            page.Path = path;
+            var adapter = new TestDiagnosticListener();
+            var diagnosticListener = new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor");
+            diagnosticListener.SubscribeWithAdapter(adapter);
+            page.DiagnosticSource = diagnosticListener;
+
+            // Act
+            await page.ExecuteAsync();
+
+            // Assert
+            Func<object, TestDiagnosticListener.BeginPageInstrumentationData> assertStartEvent = data =>
+            {
+                var beginEvent = Assert.IsType<TestDiagnosticListener.BeginPageInstrumentationData>(data);
+                Assert.NotNull(beginEvent.HttpContext);
+                Assert.Equal(path, beginEvent.Path);
+
+                return beginEvent;
+            };
+
+            Action<object> assertEndEvent = data =>
+            {
+                var endEvent = Assert.IsType<TestDiagnosticListener.EndPageInstrumentationData>(data);
+                Assert.NotNull(endEvent.HttpContext);
+                Assert.Equal(path, endEvent.Path);
+            };
+
+            Assert.Collection(adapter.PageInstrumentationData,
+                data =>
+                {
+                    var beginEvent = assertStartEvent(data);
+                    Assert.Equal(0, beginEvent.Position);
+                    Assert.Equal(6, beginEvent.Length);
+                    Assert.True(beginEvent.IsLiteral);
+                },
+                assertEndEvent,
+                data =>
+                {
+                    var beginEvent = assertStartEvent(data);
+                    Assert.Equal(6, beginEvent.Position);
+                    Assert.Equal(4, beginEvent.Length);
+                    Assert.False(beginEvent.IsLiteral);
+                },
+                assertEndEvent,
+                data =>
+                {
+                    var beginEvent = assertStartEvent(data);
+                    Assert.Equal(10, beginEvent.Position);
+                    Assert.Equal(6, beginEvent.Length);
+                    Assert.True(beginEvent.IsLiteral);
+                },
+                assertEndEvent);
+        }
+
+        [Fact]
+        public async Task WriteAttribute_WritesBeginAndEndEvents_ToDiagnosticSource_OnPrefixAndSuffixValues()
+        {
+            // Arrange
+            var path = "some-path";
+            var page = CreatePage(p =>
+            {
+                p.BeginWriteAttribute("href", "prefix", 0, "tail", 7, 0);
+                p.EndWriteAttribute();
+            });
+            page.Path = path;
+            var adapter = new TestDiagnosticListener();
+            var diagnosticListener = new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor");
+            diagnosticListener.SubscribeWithAdapter(adapter);
+            page.DiagnosticSource = diagnosticListener;
+
+            // Act
+            await page.ExecuteAsync();
+
+            // Assert
+            Func<object, TestDiagnosticListener.BeginPageInstrumentationData> assertStartEvent = data =>
+            {
+                var beginEvent = Assert.IsType<TestDiagnosticListener.BeginPageInstrumentationData>(data);
+                Assert.NotNull(beginEvent.HttpContext);
+                Assert.Equal(path, beginEvent.Path);
+
+                return beginEvent;
+            };
+
+            Action<object> assertEndEvent = data =>
+            {
+                var endEvent = Assert.IsType<TestDiagnosticListener.EndPageInstrumentationData>(data);
+                Assert.NotNull(endEvent.HttpContext);
+                Assert.Equal(path, endEvent.Path);
+            };
+
+            Assert.Collection(adapter.PageInstrumentationData,
+                data =>
+                {
+                    var beginEvent = assertStartEvent(data);
+                    Assert.Equal(0, beginEvent.Position);
+                    Assert.Equal(6, beginEvent.Length);
+                    Assert.True(beginEvent.IsLiteral);
+                },
+                assertEndEvent,
+                data =>
+                {
+                    var beginEvent = assertStartEvent(data);
+                    Assert.Equal(7, beginEvent.Position);
+                    Assert.Equal(4, beginEvent.Length);
+                    Assert.True(beginEvent.IsLiteral);
+                },
+                assertEndEvent);
+        }
+
+        public static TheoryData AddHtmlAttributeValues_ValueData
+        {
+            get
+            {
+                // attributeValues, expectedValue
+                return new TheoryData<Tuple<string, int, object, int, bool>[], string>
+                {
+                    {
+                        new []
+                        {
+                            Tuple.Create(string.Empty, 9, (object)"Hello", 9, true),
+                        },
+                        "Hello"
+                    },
+                    {
+                        new []
+                        {
+                            Tuple.Create(" ", 9, (object)"Hello", 10, true)
+                        },
+                        " Hello"
+                    },
+                    {
+
+                        new []
+                        {
+                            Tuple.Create(" ", 9, (object)null, 10, false)
+                        },
+                        string.Empty
+                    },
+                    {
+                        new []
+                        {
+                            Tuple.Create(" ", 9, (object)false, 10, false)
+                        },
+                        " HtmlEncode[[False]]"
+                    },
+                    {
+                        new []
+                        {
+                            Tuple.Create("  ", 9, (object)true, 11, false),
+                            Tuple.Create("  ", 9, (object)"abcd", 17, true)
+                        },
+                        "  HtmlEncode[[True]]  abcd"
+                    },
+                    {
+                        new []
+                        {
+                            Tuple.Create(string.Empty, 9, (object)"prefix", 9, true),
+                            Tuple.Create("  ", 15, (object)null, 17, false),
+                            Tuple.Create(" ", 21, (object)"suffix", 22, false),
+                        },
+                        "prefix HtmlEncode[[suffix]]"
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(AddHtmlAttributeValues_ValueData))]
+        public void AddHtmlAttributeValues_AddsToHtmlAttributesAsExpected(
+            Tuple<string, int, object, int, bool>[] attributeValues,
+            string expectedValue)
+        {
+            // Arrange
+            var page = CreatePage(p => { });
+            page.HtmlEncoder = new HtmlTestEncoder();
+            var executionContext = new TagHelperExecutionContext(
+                "p",
+                tagMode: TagMode.StartTagAndEndTag,
+                items: new Dictionary<object, object>(),
+                uniqueId: string.Empty,
+                executeChildContentAsync: () => Task.FromResult(result: true),
+                startTagHelperWritingScope: _ => { },
+                endTagHelperWritingScope: () => new DefaultTagHelperContent());
+
+            // Act
+            page.BeginAddHtmlAttributeValues(executionContext, "someattr", attributeValues.Length, HtmlAttributeValueStyle.SingleQuotes);
+            foreach (var value in attributeValues)
+            {
+                page.AddHtmlAttributeValue(value.Item1, value.Item2, value.Item3, value.Item4, 0, value.Item5);
+            }
+            page.EndAddHtmlAttributeValues(executionContext);
+
+            // Assert
+            var output = executionContext.Output;
+            var htmlAttribute = Assert.Single(output.Attributes);
+            Assert.Equal("someattr", htmlAttribute.Name, StringComparer.Ordinal);
+            var htmlContent = Assert.IsAssignableFrom<IHtmlContent>(htmlAttribute.Value);
+            Assert.Equal(expectedValue, HtmlContentUtilities.HtmlContentToString(htmlContent), StringComparer.Ordinal);
+            Assert.Equal(HtmlAttributeValueStyle.SingleQuotes, htmlAttribute.ValueStyle);
+
+            var context = executionContext.Context;
+            var allAttribute = Assert.Single(context.AllAttributes);
+            Assert.Equal("someattr", allAttribute.Name, StringComparer.Ordinal);
+            htmlContent = Assert.IsAssignableFrom<IHtmlContent>(allAttribute.Value);
+            Assert.Equal(expectedValue, HtmlContentUtilities.HtmlContentToString(htmlContent), StringComparer.Ordinal);
+            Assert.Equal(HtmlAttributeValueStyle.SingleQuotes, allAttribute.ValueStyle);
+        }
+
+        [Theory]
+        [InlineData(null, "")]
+        [InlineData(false, "False")]
+        public void AddHtmlAttributeValues_OnlyAddsToAllAttributesWhenAttributeRemoved(
+            object attributeValue,
+            string expectedValue)
+        {
+            // Arrange
+            var page = CreatePage(p => { });
+            page.HtmlEncoder = new HtmlTestEncoder();
+            var executionContext = new TagHelperExecutionContext(
+                "p",
+                tagMode: TagMode.StartTagAndEndTag,
+                items: new Dictionary<object, object>(),
+                uniqueId: string.Empty,
+                executeChildContentAsync: () => Task.FromResult(result: true),
+                startTagHelperWritingScope: _ => { },
+                endTagHelperWritingScope: () => new DefaultTagHelperContent());
+
+            // Act
+            page.BeginAddHtmlAttributeValues(executionContext, "someattr", 1, HtmlAttributeValueStyle.DoubleQuotes);
+            page.AddHtmlAttributeValue(string.Empty, 9, attributeValue, 9, valueLength: 0, isLiteral: false);
+            page.EndAddHtmlAttributeValues(executionContext);
+
+            // Assert
+            var output = executionContext.Output;
+            Assert.Empty(output.Attributes);
+            var context = executionContext.Context;
+            var attribute = Assert.Single(context.AllAttributes);
+            Assert.Equal("someattr", attribute.Name, StringComparer.Ordinal);
+            Assert.Equal(expectedValue, (string)attribute.Value, StringComparer.Ordinal);
+            Assert.Equal(HtmlAttributeValueStyle.DoubleQuotes, attribute.ValueStyle);
+        }
+
+        [Fact]
+        public void AddHtmlAttributeValues_AddsAttributeNameAsValueWhenValueIsUnprefixedTrue()
+        {
+            // Arrange
+            var page = CreatePage(p => { });
+            page.HtmlEncoder = new HtmlTestEncoder();
+            var executionContext = new TagHelperExecutionContext(
+                "p",
+                tagMode: TagMode.StartTagAndEndTag,
+                items: new Dictionary<object, object>(),
+                uniqueId: string.Empty,
+                executeChildContentAsync: () => Task.FromResult(result: true),
+                startTagHelperWritingScope: _ => { },
+                endTagHelperWritingScope: () => new DefaultTagHelperContent());
+
+            // Act
+            page.BeginAddHtmlAttributeValues(executionContext, "someattr", 1, HtmlAttributeValueStyle.NoQuotes);
+            page.AddHtmlAttributeValue(string.Empty, 9, true, 9, valueLength: 0, isLiteral: false);
+            page.EndAddHtmlAttributeValues(executionContext);
+
+            // Assert
+            var output = executionContext.Output;
+            var htmlAttribute = Assert.Single(output.Attributes);
+            Assert.Equal("someattr", htmlAttribute.Name, StringComparer.Ordinal);
+            Assert.Equal("someattr", (string)htmlAttribute.Value, StringComparer.Ordinal);
+            Assert.Equal(HtmlAttributeValueStyle.NoQuotes, htmlAttribute.ValueStyle);
+            var context = executionContext.Context;
+            var allAttribute = Assert.Single(context.AllAttributes);
+            Assert.Equal("someattr", allAttribute.Name, StringComparer.Ordinal);
+            Assert.Equal("someattr", (string)allAttribute.Value, StringComparer.Ordinal);
+            Assert.Equal(HtmlAttributeValueStyle.NoQuotes, allAttribute.ValueStyle);
+        }
+
+        public static TheoryData WriteAttributeData
+        {
+            get
+            {
+                // AttributeValues, ExpectedOutput
+                return new TheoryData<Tuple<string, int, object, int, bool>[], string>
+                {
+                    {
+                        new[]
+                        {
+                            Tuple.Create(string.Empty, 9, (object)true, 9, false),
+                        },
+                        "someattr=HtmlEncode[[someattr]]"
+                    },
+                    {
+                        new[]
+                        {
+                            Tuple.Create(string.Empty, 9, (object)false, 9, false),
+                        },
+                        string.Empty
+                    },
+                    {
+                        new[]
+                        {
+                            Tuple.Create(string.Empty, 9, (object)null, 9, false),
+                        },
+                        string.Empty
+                    },
+                    {
+                        new[]
+                        {
+                            Tuple.Create("  ", 9, (object)false, 11, false),
+                        },
+                        "someattr=  HtmlEncode[[False]]"
+                    },
+                    {
+                        new[]
+                        {
+                            Tuple.Create("  ", 9, (object)null, 11, false),
+                        },
+                        "someattr="
+                    },
+                    {
+                        new[]
+                        {
+                            Tuple.Create("  ", 9, (object)true, 11, false),
+                            Tuple.Create("  ", 15, (object)"abcd", 17, true),
+                        },
+                        "someattr=  HtmlEncode[[True]]  abcd"
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(WriteAttributeData))]
+        public void WriteAttribute_UsesSpecifiedWriter_WritesAsExpected(
+            Tuple<string, int, object, int, bool>[] attributeValues,
+            string expectedOutput)
+        {
+            // Arrange
+            var page = CreatePage(p => { });
+            page.HtmlEncoder = new HtmlTestEncoder();
+            var writer = new StringWriter();
+            var prefix = "someattr=";
+            var suffix = string.Empty;
+
+            // Act
+            page.PushWriter(writer);
+            page.BeginWriteAttribute("someattr", prefix, 0, suffix, 0, attributeValues.Length);
+            foreach (var value in attributeValues)
+            {
+                page.WriteAttributeValue(
+                    value.Item1,
+                    value.Item2,
+                    value.Item3,
+                    value.Item4,
+                    value.Item3?.ToString().Length ?? 0,
+                    value.Item5);
+            }
+            page.EndWriteAttribute();
+            page.PopWriter();
+
+            // Assert
+            Assert.Equal(expectedOutput, writer.ToString());
+        }
+
+        [Fact]
+        public void PushWriter_SetsUnderlyingWriter()
+        {
+            // Arrange
+            var page = CreatePage(p => { });
+            var writer = new StringWriter();
+
+            // Act
+            page.PushWriter(writer);
+
+            // Assert
+            Assert.Same(writer, page.ViewContext.Writer);
+        }
+
+        [Fact]
+        public void PopWriter_ResetsUnderlyingWriter()
+        {
+            // Arrange
+            var page = CreatePage(p => { });
+            var defaultWriter = new StringWriter();
+            page.ViewContext.Writer = defaultWriter;
+
+            var writer = new StringWriter();
+
+            // Act 1
+            page.PushWriter(writer);
+
+            // Assert 1
+            Assert.Same(writer, page.ViewContext.Writer);
+
+            // Act 2
+            var poppedWriter = page.PopWriter();
+
+            // Assert 2
+            Assert.Same(defaultWriter, poppedWriter);
+            Assert.Same(defaultWriter, page.ViewContext.Writer);
+        }
+
+        [Fact]
+        public void WriteLiteral_NullValue_DoesNothing()
+        {
+            // Arrange
+            var page = CreatePage(p => { });
+            var defaultWriter = new StringWriter();
+            page.ViewContext.Writer = defaultWriter;
+
+            // Act
+            page.WriteLiteral((object)null);
+
+            // Assert - does not throw
+            Assert.Empty(defaultWriter.ToString());
+        }
+
+        [Fact]
+        public void WriteLiteral_BuffersResultToPushedWriter()
+        {
+            // Arrange
+            var page = CreatePage(p => { });
+            var defaultWriter = new StringWriter();
+            page.ViewContext.Writer = defaultWriter;
+
+            var bufferWriter = new StringWriter();
+
+            // Act
+            page.WriteLiteral("Not");
+            page.PushWriter(bufferWriter);
+            page.WriteLiteral("This should be buffered");
+            page.PopWriter();
+            page.WriteLiteral(" buffered");
+
+            // Assert
+            Assert.Equal("Not buffered", defaultWriter.ToString());
+            Assert.Equal("This should be buffered", bufferWriter.ToString());
+        }
+
+        [Fact]
+        public void Write_StringValue_UsesSpecifiedWriter_EncodesValue()
+        {
+            // Arrange
+            var page = CreatePage(p => { });
+            var bufferWriter = new StringWriter();
+
+            // Act
+            page.PushWriter(bufferWriter);
+            page.Write("This should be encoded");
+            page.PopWriter();
+
+            // Assert
+            Assert.Equal("HtmlEncode[[This should be encoded]]", bufferWriter.ToString());
+        }
+
+        [Fact]
+        public async Task Write_WithHtmlString_WritesValueWithoutEncoding()
+        {
+            // Arrange
+            var buffer = new ViewBuffer(new TestViewBufferScope(), string.Empty, pageSize: 32);
+            var writer = new ViewBufferTextWriter(buffer, Encoding.UTF8);
+
+            var page = CreatePage(p =>
+            {
+                p.Write(new HtmlString("Hello world"));
+            });
+            page.ViewContext.Writer = writer;
+
+            // Act
+            await page.ExecuteAsync();
+
+            // Assert
+            Assert.Equal("Hello world", HtmlContentUtilities.HtmlContentToString(buffer));
+        }
+
+        private static TestableRazorPage CreatePage(
+            Action<TestableRazorPage> executeAction,
+            ViewContext context = null)
+        {
+            return CreatePage(page =>
+            {
+                executeAction(page);
+                return Task.FromResult(0);
+            }, context);
+        }
+
+
+        private static TestableRazorPage CreatePage(
+            Func<TestableRazorPage, Task> executeAction,
+            ViewContext context = null)
+        {
+            context = context ?? CreateViewContext();
+            var view = new Mock<TestableRazorPage> { CallBase = true };
+            if (executeAction != null)
+            {
+                view.Setup(v => v.ExecuteAsync())
+                    .Returns(() =>
+                    {
+                        return executeAction(view.Object);
+                    });
+            }
+
+            view.Object.ViewContext = context;
+            return view.Object;
+        }
+
+        private static ViewContext CreateViewContext(
+            TextWriter writer = null,
+            IViewBufferScope bufferScope = null,
+            string viewPath = null)
+        {
+            bufferScope = bufferScope ?? new TestViewBufferScope();
+            var buffer = new ViewBuffer(bufferScope, viewPath ?? "TEST", 32);
+            writer = writer ?? new ViewBufferTextWriter(buffer, Encoding.UTF8);
+
+            var httpContext = new DefaultHttpContext();
+            var serviceProvider = new ServiceCollection()
+                .AddSingleton<IViewBufferScope>(bufferScope)
+                .BuildServiceProvider();
+            httpContext.RequestServices = serviceProvider;
+            var actionContext = new ActionContext(
+                httpContext,
+                new RouteData(),
+                new ActionDescriptor());
+            var viewMock = new Mock<IView>();
+            if (!string.IsNullOrEmpty(viewPath))
+            {
+                viewMock.Setup(v => v.Path).Returns(viewPath);
+            }
+            return new ViewContext(
+                actionContext,
+                viewMock.Object,
+                new ViewDataDictionary(new EmptyModelMetadataProvider(), new ModelStateDictionary()),
+                Mock.Of<ITempDataDictionary>(),
+                writer,
+                new HtmlHelperOptions());
+        }
+
+        public abstract class TestableRazorPage : RazorPage
+        {
+            public TestableRazorPage()
+            {
+                HtmlEncoder = new HtmlTestEncoder();
+            }
+
+            public string RenderedContent
+            {
+                get
+                {
+                    var bufferedWriter = Assert.IsType<ViewBufferTextWriter>(Output);
+                    using (var stringWriter = new StringWriter())
+                    {
+                        bufferedWriter.Buffer.WriteTo(stringWriter, HtmlEncoder);
+                        return stringWriter.ToString();
+                    }
+                }
+            }
+
+            public IHtmlContent RenderBodyPublic()
+            {
+                return base.RenderBody();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewEngineOptionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewEngineOptionsTest.cs
new file mode 100644
index 0000000000..6172036b6c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewEngineOptionsTest.cs
@@ -0,0 +1,97 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public class RazorViewEngineOptionsTest
+    {
+        [Fact]
+        public void AreaViewLocationFormats_ContainsExpectedLocations()
+        {
+            // Arrange
+            var services = new ServiceCollection().AddOptions();
+            var areaViewLocations = new[]
+            {
+                "/Areas/{2}/MvcViews/{1}/{0}.cshtml",
+                "/Areas/{2}/MvcViews/Shared/{0}.cshtml",
+                "/MvcViews/Shared/{0}.cshtml"
+            };
+            var builder = new MvcBuilder(services, new ApplicationPartManager());
+            builder.AddRazorOptions(options =>
+            {
+                options.AreaViewLocationFormats.Clear();
+
+                foreach (var location in areaViewLocations)
+                {
+                    options.AreaViewLocationFormats.Add(location);
+                }
+            });
+            var serviceProvider = services.BuildServiceProvider();
+            var accessor = serviceProvider.GetRequiredService<IOptions<RazorViewEngineOptions>>();
+
+            // Act
+            var formats = accessor.Value.AreaViewLocationFormats;
+
+            // Assert
+            Assert.Equal(areaViewLocations, formats, StringComparer.Ordinal);
+        }
+
+        [Fact]
+        public void ViewLocationFormats_ContainsExpectedLocations()
+        {
+            // Arrange
+            var services = new ServiceCollection().AddOptions();
+            var viewLocations = new[]
+            {
+                "/MvcViews/{1}/{0}.cshtml",
+                "/MvcViews/Shared/{0}.cshtml"
+            };
+            var builder = new MvcBuilder(services, new ApplicationPartManager());
+            builder.AddRazorOptions(options =>
+            {
+                options.ViewLocationFormats.Clear();
+
+                foreach (var location in viewLocations)
+                {
+                    options.ViewLocationFormats.Add(location);
+                }
+            });
+            var serviceProvider = services.BuildServiceProvider();
+            var accessor = serviceProvider.GetRequiredService<IOptions<RazorViewEngineOptions>>();
+
+            // Act
+            var formats = accessor.Value.ViewLocationFormats;
+
+            // Assert
+            Assert.Equal(viewLocations, formats, StringComparer.Ordinal);
+        }
+
+        [Fact]
+        public void AddRazorOptions_ConfiguresOptionsAsExpected()
+        {
+            // Arrange
+            var services = new ServiceCollection().AddOptions();
+            var fileProvider = new TestFileProvider();
+
+            // Act
+            var builder = new MvcBuilder(services, new ApplicationPartManager());
+            builder.AddRazorOptions(options =>
+            {
+                options.FileProviders.Add(fileProvider);
+            });
+            var serviceProvider = services.BuildServiceProvider();
+
+            // Assert
+            var accessor = serviceProvider.GetRequiredService<IOptions<RazorViewEngineOptions>>();
+            Assert.Same(fileProvider, accessor.Value.FileProviders[0]);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewEngineTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewEngineTest.cs
new file mode 100644
index 0000000000..378ca51d42
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewEngineTest.cs
@@ -0,0 +1,2092 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Logging.Testing;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public class RazorViewEngineTest
+    {
+        private static readonly Dictionary<string, object> _areaTestContext = new Dictionary<string, object>()
+        {
+            {"area", "foo"},
+            {"controller", "bar"},
+        };
+
+        private static readonly Dictionary<string, object> _controllerTestContext = new Dictionary<string, object>()
+        {
+            {"controller", "bar"},
+        };
+
+        private static readonly Dictionary<string, object> _pageTestContext = new Dictionary<string, object>()
+        {
+            {"page", "/Accounts/Index"},
+        };
+
+        public static IEnumerable<object[]> AbsoluteViewPathData
+        {
+            get
+            {
+                yield return new[] { "~/foo/bar" };
+                yield return new[] { "/foo/bar" };
+                yield return new[] { "~/foo/bar.txt" };
+                yield return new[] { "/foo/bar.txt" };
+            }
+        }
+
+        public static IEnumerable<object[]> ViewLocationExpanderTestData
+        {
+            get
+            {
+                yield return new object[]
+                {
+                    _controllerTestContext,
+                    new[]
+                    {
+                        "/Views/{1}/{0}.cshtml",
+                        "/Views/Shared/{0}.cshtml"
+                    }
+                };
+
+                yield return new object[]
+                {
+                    _areaTestContext,
+                    new[]
+                    {
+                        "/Areas/{2}/Views/{1}/{0}.cshtml",
+                        "/Areas/{2}/Views/Shared/{0}.cshtml",
+                        "/Views/Shared/{0}.cshtml"
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void FindView_IsMainPage_ThrowsIfViewNameIsNullOrEmpty(string viewName)
+        {
+            // Arrange
+            var viewEngine = CreateViewEngine();
+            var context = GetActionContext(_controllerTestContext);
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => viewEngine.FindView(context, viewName, isMainPage: true),
+                "viewName");
+        }
+
+        [Theory]
+        [MemberData(nameof(AbsoluteViewPathData))]
+        public void FindView_IsMainPage_WithFullPath_ReturnsNotFound(string viewName)
+        {
+            // Arrange
+            var viewEngine = CreateSuccessfulViewEngine();
+            var context = GetActionContext(_controllerTestContext);
+
+            // Act
+            var result = viewEngine.FindView(context, viewName, isMainPage: true);
+
+            // Assert
+            Assert.False(result.Success);
+        }
+
+        [Theory]
+        [MemberData(nameof(AbsoluteViewPathData))]
+        public void FindView_IsMainPage_WithFullPathAndCshtmlEnding_ReturnsNotFound(string viewName)
+        {
+            // Arrange
+            var viewEngine = CreateSuccessfulViewEngine();
+            var context = GetActionContext(_controllerTestContext);
+            viewName += ".cshtml";
+
+            // Act
+            var result = viewEngine.FindView(context, viewName, isMainPage: true);
+
+            // Assert
+            Assert.False(result.Success);
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void FindView_WithRelativePath_ReturnsNotFound(bool isMainPage)
+        {
+            // Arrange
+            var viewEngine = CreateSuccessfulViewEngine();
+            var context = GetActionContext(_controllerTestContext);
+
+            // Act
+            var result = viewEngine.FindView(context, "View.cshtml", isMainPage);
+
+            // Assert
+            Assert.False(result.Success);
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void GetView_WithViewName_ReturnsNotFound(bool isMainPage)
+        {
+            // Arrange
+            var viewEngine = CreateSuccessfulViewEngine();
+
+            // Act
+            var result = viewEngine.GetView("~/Home/View1.cshtml", "View2", isMainPage);
+
+            // Assert
+            Assert.False(result.Success);
+        }
+
+        [Fact]
+        public void FindView_ReturnsRazorView_IfLookupWasSuccessful()
+        {
+            // Arrange
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            var page = Mock.Of<IRazorPage>();
+            var viewStart1 = Mock.Of<IRazorPage>();
+            var viewStart2 = Mock.Of<IRazorPage>();
+
+            pageFactory
+                .Setup(p => p.CreateFactory("/Views/bar/test-view.cshtml"))
+                .Returns(GetPageFactoryResult(() => page));
+
+            pageFactory
+                .Setup(p => p.CreateFactory("/Views/_ViewStart.cshtml"))
+                .Returns(GetPageFactoryResult(() => viewStart2));
+
+            pageFactory
+                .Setup(p => p.CreateFactory("/_ViewStart.cshtml"))
+                .Returns(GetPageFactoryResult(() => viewStart1));
+
+            var viewEngine = CreateViewEngine(pageFactory.Object);
+            var context = GetActionContext(_controllerTestContext);
+
+            // Act
+            var result = viewEngine.FindView(context, "test-view", isMainPage: false);
+
+            // Assert
+            Assert.True(result.Success);
+            var view = Assert.IsType<RazorView>(result.View);
+            Assert.Same(page, view.RazorPage);
+            Assert.Equal("test-view", result.ViewName);
+            Assert.Empty(view.ViewStartPages);
+        }
+
+        [Fact]
+        public void FindView_DoesNotExpireCachedResults_IfViewStartsExpire()
+        {
+            // Arrange
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            var page = Mock.Of<IRazorPage>();
+            var viewStart = Mock.Of<IRazorPage>();
+            var cancellationTokenSource = new CancellationTokenSource();
+            var changeToken = new CancellationChangeToken(cancellationTokenSource.Token);
+
+            pageFactory
+                .Setup(p => p.CreateFactory("/Views/bar/test-view.cshtml"))
+                .Returns(GetPageFactoryResult(() => page));
+
+            pageFactory
+                .Setup(p => p.CreateFactory("/Views/_ViewStart.cshtml"))
+                .Returns(GetPageFactoryResult(() => viewStart, new[] { changeToken }));
+
+            var viewEngine = CreateViewEngine(pageFactory.Object);
+            var context = GetActionContext(_controllerTestContext);
+
+            // Act - 1
+            var result1 = viewEngine.FindView(context, "test-view", isMainPage: false);
+
+            // Assert - 1
+            Assert.True(result1.Success);
+            var view1 = Assert.IsType<RazorView>(result1.View);
+            Assert.Same(page, view1.RazorPage);
+            Assert.Equal("test-view", result1.ViewName);
+            Assert.Empty(view1.ViewStartPages);
+
+            // Act - 2
+            cancellationTokenSource.Cancel();
+            var result2 = viewEngine.FindView(context, "test-view", isMainPage: false);
+
+            // Assert - 2
+            Assert.True(result2.Success);
+            var view2 = Assert.IsType<RazorView>(result2.View);
+            Assert.Same(page, view2.RazorPage);
+            pageFactory.Verify(p => p.CreateFactory("/Views/bar/test-view.cshtml"), Times.Once());
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void FindView_ThrowsIfViewNameIsNullOrEmpty(string partialViewName)
+        {
+            // Arrange
+            var viewEngine = CreateViewEngine();
+            var context = GetActionContext(_controllerTestContext);
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => viewEngine.FindView(context, partialViewName, isMainPage: false),
+                "viewName");
+        }
+
+        [Theory]
+        [MemberData(nameof(AbsoluteViewPathData))]
+        public void FindViewWithFullPath_ReturnsNotFound(string partialViewName)
+        {
+            // Arrange
+            var viewEngine = CreateSuccessfulViewEngine();
+            var context = GetActionContext(_controllerTestContext);
+
+            // Act
+            var result = viewEngine.FindView(context, partialViewName, isMainPage: false);
+
+            // Assert
+            Assert.False(result.Success);
+        }
+
+        [Theory]
+        [MemberData(nameof(AbsoluteViewPathData))]
+        public void FindViewWithFullPathAndCshtmlEnding_ReturnsNotFound(string partialViewName)
+        {
+            // Arrange
+            var viewEngine = CreateSuccessfulViewEngine();
+            var context = GetActionContext(_controllerTestContext);
+            partialViewName += ".cshtml";
+
+            // Act
+            var result = viewEngine.FindView(context, partialViewName, isMainPage: false);
+
+            // Assert
+            Assert.False(result.Success);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void FindView_FailsButSearchesCorrectLocationsWithAreas(bool isMainPage)
+        {
+            // Arrange
+            var viewEngine = CreateViewEngine();
+            var context = GetActionContext(_areaTestContext);
+
+            // Act
+            var result = viewEngine.FindView(context, "viewName", isMainPage);
+
+            // Assert
+            Assert.False(result.Success);
+            Assert.Equal(new[]
+            {
+                "/Areas/foo/Views/bar/viewName.cshtml",
+                "/Areas/foo/Views/Shared/viewName.cshtml",
+                "/Views/Shared/viewName.cshtml",
+            }, result.SearchedLocations);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void FindView_FailsButSearchesCorrectLocationsWithoutAreas(bool isMainPage)
+        {
+            // Arrange
+            var viewEngine = CreateViewEngine();
+            var context = GetActionContext(_controllerTestContext);
+
+            // Act
+            var result = viewEngine.FindView(context, "viewName", isMainPage);
+
+            // Assert
+            Assert.False(result.Success);
+            Assert.Equal(new[] {
+                "/Views/bar/viewName.cshtml",
+                "/Views/Shared/viewName.cshtml",
+            }, result.SearchedLocations);
+        }
+
+        [Fact]
+        public void FindView_IsMainPage_ReturnsRazorView_IfLookupWasSuccessful()
+        {
+            // Arrange
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            var page = Mock.Of<IRazorPage>();
+            var viewStart1 = Mock.Of<IRazorPage>();
+            var viewStart2 = Mock.Of<IRazorPage>();
+
+            pageFactory
+                .Setup(p => p.CreateFactory("/Views/bar/test-view.cshtml"))
+                .Returns(GetPageFactoryResult(() => page));
+
+            pageFactory
+                .Setup(p => p.CreateFactory("/Views/_ViewStart.cshtml"))
+                .Returns(GetPageFactoryResult(() => viewStart2));
+
+            pageFactory
+                .Setup(p => p.CreateFactory("/_ViewStart.cshtml"))
+                .Returns(GetPageFactoryResult(() => viewStart1));
+
+            var viewEngine = CreateViewEngine(pageFactory.Object);
+            var context = GetActionContext(_controllerTestContext);
+
+            // Act
+            var result = viewEngine.FindView(context, "test-view", isMainPage: true);
+
+            // Assert
+            Assert.True(result.Success);
+            var view = Assert.IsType<RazorView>(result.View);
+            Assert.Equal("test-view", result.ViewName);
+            Assert.Same(page, view.RazorPage);
+
+            // ViewStartPages is not empty as it is in FindView_ReturnsRazorView_IfLookupWasSuccessful() despite
+            // (faked) existence of the view start files in both tests.
+            Assert.Equal(new[] { viewStart1, viewStart2 }, view.ViewStartPages);
+        }
+
+        [Fact]
+        public void FindView_UsesViewLocationFormat_IfRouteDoesNotContainArea()
+        {
+            // Arrange
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+
+            var page = Mock.Of<IRazorPage>();
+            pageFactory
+                .Setup(p => p.CreateFactory("fake-path1/bar/test-view.rzr"))
+                .Returns(GetPageFactoryResult(() => page))
+                .Verifiable();
+            var viewEngine = new TestableRazorViewEngine(
+                pageFactory.Object,
+                GetOptionsAccessor(
+                    viewLocationFormats: new[] { "fake-path1/{1}/{0}.rzr" },
+                    areaViewLocationFormats: new[] { "fake-area-path/{2}/{1}/{0}.rzr" }));
+            var context = GetActionContext(_controllerTestContext);
+
+            // Act
+            var result = viewEngine.FindView(context, "test-view", isMainPage: true);
+
+            // Assert
+            pageFactory.Verify();
+            var view = Assert.IsType<RazorView>(result.View);
+            Assert.Same(page, view.RazorPage);
+        }
+
+        [Fact]
+        public void FindView_UsesAreaViewLocationFormat_IfRouteContainsArea()
+        {
+            // Arrange
+            var viewName = "test-view2";
+            var expectedViewName = "fake-area-path/foo/bar/test-view2.rzr";
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            var page = Mock.Of<IRazorPage>();
+            pageFactory
+                .Setup(p => p.CreateFactory(expectedViewName))
+                .Returns(GetPageFactoryResult(() => page))
+                .Verifiable();
+            var viewEngine = new TestableRazorViewEngine(
+                pageFactory.Object,
+                GetOptionsAccessor(
+                    viewLocationFormats: new[] { "fake-path1/{1}/{0}.rzr" },
+                    areaViewLocationFormats: new[] { "fake-area-path/{2}/{1}/{0}.rzr" }));
+            var context = GetActionContext(_areaTestContext);
+
+            // Act
+            var result = viewEngine.FindView(context, viewName, isMainPage: true);
+
+            // Assert
+            Assert.True(result.Success);
+            Assert.Equal(viewName, result.ViewName);
+            pageFactory.Verify();
+        }
+
+        [Theory]
+        [InlineData("Test-View.cshtml")]
+        [InlineData("/Home/Test-View.cshtml")]
+        public void GetView_DoesNotUseViewLocationFormat_WithRelativePath_IfRouteDoesNotContainArea(string viewName)
+        {
+            // Arrange
+            var expectedViewName = "/Home/Test-View.cshtml";
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            var page = Mock.Of<IRazorPage>();
+            pageFactory
+                .Setup(p => p.CreateFactory(expectedViewName))
+                .Returns(GetPageFactoryResult(() => page))
+                .Verifiable();
+            var viewEngine = new TestableRazorViewEngine(
+                pageFactory.Object,
+                GetOptionsAccessor());
+
+            // Act
+            var result = viewEngine.GetView("/Home/Page.cshtml", viewName, isMainPage: true);
+
+            // Assert
+            Assert.True(result.Success);
+            Assert.Equal(viewName, result.ViewName);
+            pageFactory.Verify();
+        }
+
+        [Theory]
+        [InlineData("Test-View.cshtml")]
+        [InlineData("/Home/Test-View.cshtml")]
+        public void GetView_DoesNotUseViewLocationFormat_WithRelativePath_IfRouteContainArea(string viewName)
+        {
+            // Arrange
+            var expectedViewName = "/Home/Test-View.cshtml";
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            var page = Mock.Of<IRazorPage>();
+            pageFactory
+                .Setup(p => p.CreateFactory(expectedViewName))
+                .Returns(GetPageFactoryResult(() => page))
+                .Verifiable();
+            var viewEngine = new TestableRazorViewEngine(
+                pageFactory.Object,
+                GetOptionsAccessor());
+
+            // Act
+            var result = viewEngine.GetView("/Home/Page.cshtml", viewName, isMainPage: true);
+
+            // Assert
+            Assert.True(result.Success);
+            Assert.Equal(viewName, result.ViewName);
+            pageFactory.Verify();
+        }
+
+        [Theory]
+        [InlineData("/Test-View.cshtml")]
+        [InlineData("~/Test-View.CSHTML")]
+        [InlineData("/Home/Test-View.CSHTML")]
+        [InlineData("~/Home/Test-View.cshtml")]
+        [InlineData("~/SHARED/TEST-VIEW.CSHTML")]
+        public void GetView_UsesGivenPath_WithAppRelativePath(string viewName)
+        {
+            // Arrange
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            var page = Mock.Of<IRazorPage>();
+            pageFactory
+                .Setup(p => p.CreateFactory(viewName))
+                .Returns(GetPageFactoryResult(() => page))
+                .Verifiable();
+            var viewEngine = new TestableRazorViewEngine(
+                pageFactory.Object,
+                GetOptionsAccessor());
+
+            // Act
+            var result = viewEngine.GetView(executingFilePath: null, viewPath: viewName, isMainPage: true);
+
+            // Assert
+            Assert.True(result.Success);
+            Assert.Equal(viewName, result.ViewName);
+            pageFactory.Verify();
+        }
+
+        [Theory]
+        [InlineData("Test-View.cshtml")]
+        [InlineData("Test-View.CSHTML")]
+        [InlineData("PATH/TEST-VIEW.CSHTML")]
+        [InlineData("Path1/Path2/Test-View.cshtml")]
+        public void GetView_ResolvesRelativeToCurrentPage_WithRelativePath(string viewName)
+        {
+            // Arrange
+            var expectedViewName = $"/Home/{ viewName }";
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            var page = Mock.Of<IRazorPage>();
+            pageFactory
+                .Setup(p => p.CreateFactory(expectedViewName))
+                .Returns(GetPageFactoryResult(() => page))
+                .Verifiable();
+            var viewEngine = new TestableRazorViewEngine(
+                pageFactory.Object,
+                GetOptionsAccessor());
+
+            // Act
+            var result = viewEngine.GetView("/Home/Page.cshtml", viewName, isMainPage: true);
+
+            // Assert
+            Assert.True(result.Success);
+            Assert.Equal(viewName, result.ViewName);
+            pageFactory.Verify();
+        }
+
+        [Theory]
+        [InlineData("Test-View.cshtml")]
+        [InlineData("Test-View.CSHTML")]
+        [InlineData("PATH/TEST-VIEW.CSHTML")]
+        [InlineData("Path1/Path2/Test-View.cshtml")]
+        public void GetView_ResolvesRelativeToAppRoot_WithRelativePath_IfNoPageExecuting(string viewName)
+        {
+            // Arrange
+            var expectedViewName = $"/{ viewName }";
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            var page = Mock.Of<IRazorPage>();
+            pageFactory
+                .Setup(p => p.CreateFactory(expectedViewName))
+                .Returns(GetPageFactoryResult(() => page))
+                .Verifiable();
+            var viewEngine = new TestableRazorViewEngine(
+                pageFactory.Object,
+                GetOptionsAccessor());
+
+            // Act
+            var result = viewEngine.GetView(executingFilePath: null, viewPath: viewName, isMainPage: true);
+
+            // Assert
+            Assert.True(result.Success);
+            Assert.Equal(viewName, result.ViewName);
+            pageFactory.Verify();
+            var view = Assert.IsType<RazorView>(result.View);
+            Assert.Same(page, view.RazorPage);
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void FindView_CreatesDifferentCacheEntries_ForAreaViewsAndNonAreaViews(bool isMainPage)
+        {
+            // Arrange
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            var areaPage = Mock.Of<IRazorPage>();
+            var nonAreaPage = Mock.Of<IRazorPage>();
+            pageFactory
+                .Setup(p => p.CreateFactory("/Areas/Admin/Views/Home/Index.cshtml"))
+                .Returns(GetPageFactoryResult(() => areaPage));
+            pageFactory
+                .Setup(p => p.CreateFactory("/Views/Home/Index.cshtml"))
+                .Returns(GetPageFactoryResult(() => nonAreaPage));
+
+            var viewEngine = new TestableRazorViewEngine(
+                pageFactory.Object,
+                GetOptionsAccessor());
+
+            // Act 1
+            var areaContext = GetActionContext(new Dictionary<string, object>()
+            {
+                {"area", "Admin"},
+                {"controller", "Home"},
+            });
+            var result1 = viewEngine.FindView(areaContext, "Index", isMainPage);
+
+            // Assert 1
+            Assert.NotNull(result1);
+            pageFactory.Verify(p => p.CreateFactory("/Areas/Admin/Views/Home/Index.cshtml"), Times.Once());
+            pageFactory.Verify(p => p.CreateFactory("/Views/Home/Index.cshtml"), Times.Never());
+            var view1 = Assert.IsType<RazorView>(result1.View);
+            Assert.Same(areaPage, view1.RazorPage);
+
+            // Act 2
+            var nonAreaContext = GetActionContext(new Dictionary<string, object>()
+            {
+                {"controller", "Home"},
+            });
+            var result2 = viewEngine.FindView(nonAreaContext, "Index", isMainPage);
+
+            // Assert 2
+            Assert.NotNull(result2);
+            pageFactory.Verify(p => p.CreateFactory("/Areas/Admin/Views/Home/Index.cshtml"), Times.Once());
+            pageFactory.Verify(p => p.CreateFactory("/Views/Home/Index.cshtml"), Times.Once());
+            var view2 = Assert.IsType<RazorView>(result2.View);
+            Assert.Same(nonAreaPage, view2.RazorPage);
+
+            // Act 3
+            // Ensure we're getting cached results.
+            var result3 = viewEngine.FindView(areaContext, "Index", isMainPage);
+            var result4 = viewEngine.FindView(nonAreaContext, "Index", isMainPage);
+
+            // Assert 4
+            pageFactory.Verify(p => p.CreateFactory("/Areas/Admin/Views/Home/Index.cshtml"), Times.Once());
+            pageFactory.Verify(p => p.CreateFactory("/Views/Home/Index.cshtml"), Times.Once());
+
+            var view3 = Assert.IsType<RazorView>(result3.View);
+            Assert.Same(areaPage, view3.RazorPage);
+            var view4 = Assert.IsType<RazorView>(result4.View);
+            Assert.Same(nonAreaPage, view4.RazorPage);
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void FindView_CreatesDifferentCacheEntries_ForDifferentAreas(bool isMainPage)
+        {
+            // Arrange
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            var areaPage1 = Mock.Of<IRazorPage>();
+            var areaPage2 = Mock.Of<IRazorPage>();
+            pageFactory
+                .Setup(p => p.CreateFactory("/Areas/Marketing/Views/Home/Index.cshtml"))
+                .Returns(GetPageFactoryResult(() => areaPage1));
+            pageFactory
+                .Setup(p => p.CreateFactory("/Areas/Sales/Views/Home/Index.cshtml"))
+                .Returns(GetPageFactoryResult(() => areaPage2));
+
+            var viewEngine = new TestableRazorViewEngine(
+                pageFactory.Object,
+                GetOptionsAccessor());
+
+            // Act 1
+            var areaContext1 = GetActionContext(new Dictionary<string, object>()
+            {
+                {"area", "Marketing"},
+                {"controller", "Home"},
+            });
+            var result1 = viewEngine.FindView(areaContext1, "Index", isMainPage);
+
+            // Assert 1
+            Assert.NotNull(result1);
+            pageFactory.Verify(p => p.CreateFactory("/Areas/Marketing/Views/Home/Index.cshtml"), Times.Once());
+            pageFactory.Verify(p => p.CreateFactory("/Areas/Sales/Views/Home/Index.cshtml"), Times.Never());
+            var view1 = Assert.IsType<RazorView>(result1.View);
+            Assert.Same(areaPage1, view1.RazorPage);
+
+            // Act 2
+            var areaContext2 = GetActionContext(new Dictionary<string, object>()
+            {
+                {"controller", "Home"},
+                {"area", "Sales"},
+            });
+            var result2 = viewEngine.FindView(areaContext2, "Index", isMainPage);
+
+            // Assert 2
+            Assert.NotNull(result2);
+            pageFactory.Verify(p => p.CreateFactory("/Areas/Marketing/Views/Home/Index.cshtml"), Times.Once());
+            pageFactory.Verify(p => p.CreateFactory("/Areas/Sales/Views/Home/Index.cshtml"), Times.Once());
+            var view2 = Assert.IsType<RazorView>(result2.View);
+            Assert.Same(areaPage2, view2.RazorPage);
+
+            // Act 3
+            // Ensure we're getting cached results.
+            var result3 = viewEngine.FindView(areaContext1, "Index", isMainPage);
+            var result4 = viewEngine.FindView(areaContext2, "Index", isMainPage);
+
+            // Assert 4
+            pageFactory.Verify(p => p.CreateFactory("/Areas/Marketing/Views/Home/Index.cshtml"), Times.Once());
+            pageFactory.Verify(p => p.CreateFactory("/Areas/Sales/Views/Home/Index.cshtml"), Times.Once());
+
+            var view3 = Assert.IsType<RazorView>(result3.View);
+            Assert.Same(areaPage1, view3.RazorPage);
+            var view4 = Assert.IsType<RazorView>(result4.View);
+            Assert.Same(areaPage2, view4.RazorPage);
+        }
+
+        [Theory]
+        [MemberData(nameof(ViewLocationExpanderTestData))]
+        public void FindView_UsesViewLocationExpandersToLocateViews(
+            IDictionary<string, object> routeValues,
+            IEnumerable<string> expectedSeeds)
+        {
+            // Arrange
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            pageFactory
+                .Setup(p => p.CreateFactory("test-string/bar.cshtml"))
+                .Returns(GetPageFactoryResult(() => Mock.Of<IRazorPage>()))
+                .Verifiable();
+
+            var expander1Result = new[] { "some-seed" };
+            var expander1 = new Mock<IViewLocationExpander>();
+            expander1
+                .Setup(e => e.PopulateValues(It.IsAny<ViewLocationExpanderContext>()))
+                .Callback((ViewLocationExpanderContext c) =>
+                {
+                    Assert.NotNull(c.ActionContext);
+                    c.Values["expander-key"] = expander1.ToString();
+                })
+                .Verifiable();
+            expander1
+                .Setup(e => e.ExpandViewLocations(
+                    It.IsAny<ViewLocationExpanderContext>(),
+                    It.IsAny<IEnumerable<string>>()))
+                .Callback((ViewLocationExpanderContext c, IEnumerable<string> seeds) =>
+                {
+                    Assert.NotNull(c.ActionContext);
+                    Assert.Equal(expectedSeeds, seeds);
+                })
+                .Returns(expander1Result)
+                .Verifiable();
+
+            var expander2 = new Mock<IViewLocationExpander>();
+            expander2
+                .Setup(e => e.ExpandViewLocations(
+                    It.IsAny<ViewLocationExpanderContext>(),
+                    It.IsAny<IEnumerable<string>>()))
+                .Callback((ViewLocationExpanderContext c, IEnumerable<string> seeds) =>
+                {
+                    Assert.Equal(expander1Result, seeds);
+                })
+                .Returns(new[] { "test-string/{1}.cshtml" })
+                .Verifiable();
+
+            var viewEngine = CreateViewEngine(
+                pageFactory.Object,
+                new[] { expander1.Object, expander2.Object });
+            var context = GetActionContext(routeValues);
+
+            // Act
+            var result = viewEngine.FindView(context, "test-view", isMainPage: true);
+
+            // Assert
+            Assert.True(result.Success);
+            Assert.IsAssignableFrom<IView>(result.View);
+            pageFactory.Verify();
+            expander1.Verify();
+            expander2.Verify();
+        }
+
+        [Fact]
+        public void FindView_NoramlizesPaths_ReturnedByViewLocationExpanders()
+        {
+            // Arrange
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            pageFactory
+                .Setup(p => p.CreateFactory(@"Views\Home\Index.cshtml"))
+                .Returns(GetPageFactoryResult(() => Mock.Of<IRazorPage>()))
+                .Verifiable();
+
+            var expander = new Mock<IViewLocationExpander>();
+            expander
+                .Setup(e => e.ExpandViewLocations(
+                    It.IsAny<ViewLocationExpanderContext>(),
+                    It.IsAny<IEnumerable<string>>()))
+                .Returns(new[] { @"Views\Home\Index.cshtml" });
+
+            var viewEngine = CreateViewEngine(
+                pageFactory.Object,
+                new[] { expander.Object });
+            var context = GetActionContext(new Dictionary<string, object>());
+
+            // Act
+            var result = viewEngine.FindView(context, "test-view", isMainPage: true);
+
+            // Assert
+            Assert.True(result.Success);
+            Assert.IsAssignableFrom<IView>(result.View);
+            pageFactory.Verify();
+        }
+
+        [Fact]
+        public void FindView_CachesValuesIfViewWasFound()
+        {
+            // Arrange
+            var page = Mock.Of<IRazorPage>();
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            pageFactory
+                .Setup(p => p.CreateFactory("/Views/bar/baz.cshtml"))
+                .Returns(GetPageFactoryResult(factory: null))
+                .Verifiable();
+            pageFactory
+               .Setup(p => p.CreateFactory("/Views/Shared/baz.cshtml"))
+               .Returns(GetPageFactoryResult(() => page))
+               .Verifiable();
+
+            var viewEngine = CreateViewEngine(pageFactory.Object);
+            var context = GetActionContext(_controllerTestContext);
+
+            // Act 1
+            var result1 = viewEngine.FindView(context, "baz", isMainPage: true);
+
+            // Assert 1
+            Assert.True(result1.Success);
+            var view1 = Assert.IsType<RazorView>(result1.View);
+            Assert.Same(page, view1.RazorPage);
+            pageFactory.Verify();
+
+            // Act 2
+            pageFactory
+               .Setup(p => p.CreateFactory(It.IsAny<string>()))
+               .Throws(new Exception("Shouldn't be called"));
+
+            var result2 = viewEngine.FindView(context, "baz", isMainPage: true);
+
+            // Assert 2
+            Assert.True(result2.Success);
+            var view2 = Assert.IsType<RazorView>(result2.View);
+            Assert.Same(page, view2.RazorPage);
+            pageFactory.Verify();
+        }
+
+        [Fact]
+        public void FindView_CachesValuesIfViewWasFound_ForPages()
+        {
+            // Arrange
+            var page = Mock.Of<IRazorPage>();
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            pageFactory
+               .Setup(p => p.CreateFactory("/Views/Shared/baz.cshtml"))
+               .Returns(GetPageFactoryResult(() => page))
+               .Verifiable();
+
+            var viewEngine = CreateViewEngine(pageFactory.Object);
+            var context = GetActionContext(_pageTestContext);
+
+            // Act 1
+            var result1 = viewEngine.FindView(context, "baz", isMainPage: false);
+
+            // Assert 1
+            Assert.True(result1.Success);
+            var view1 = Assert.IsType<RazorView>(result1.View);
+            Assert.Same(page, view1.RazorPage);
+            pageFactory.Verify();
+
+            // Act 2
+            pageFactory
+               .Setup(p => p.CreateFactory(It.IsAny<string>()))
+               .Throws(new Exception("Shouldn't be called"));
+
+            var result2 = viewEngine.FindView(context, "baz", isMainPage: false);
+
+            // Assert 2
+            Assert.True(result2.Success);
+            var view2 = Assert.IsType<RazorView>(result2.View);
+            Assert.Same(page, view2.RazorPage);
+            pageFactory.Verify();
+        }
+
+        [Fact]
+        public void FindView_InvokesPageFactoryIfChangeTokenExpired()
+        {
+            // Arrange
+            var page1 = Mock.Of<IRazorPage>();
+            var page2 = Mock.Of<IRazorPage>();
+            var sequence = new MockSequence();
+            var cancellationTokenSource = new CancellationTokenSource();
+            var changeToken = new CancellationChangeToken(cancellationTokenSource.Token);
+
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            pageFactory
+                .InSequence(sequence)
+                .Setup(p => p.CreateFactory("/Views/bar/baz.cshtml"))
+                .Returns(GetPageFactoryResult(factory: null, changeTokens: new[] { changeToken }));
+            pageFactory
+               .InSequence(sequence)
+               .Setup(p => p.CreateFactory("/Views/Shared/baz.cshtml"))
+               .Returns(GetPageFactoryResult(() => page1))
+               .Verifiable();
+            pageFactory
+                .InSequence(sequence)
+                .Setup(p => p.CreateFactory("/Views/bar/baz.cshtml"))
+                .Returns(GetPageFactoryResult(() => page2));
+
+            var viewEngine = CreateViewEngine(pageFactory.Object);
+            var context = GetActionContext(_controllerTestContext);
+
+            // Act 1
+            var result1 = viewEngine.FindView(context, "baz", isMainPage: true);
+
+            // Assert 1
+            Assert.True(result1.Success);
+            var view1 = Assert.IsType<RazorView>(result1.View);
+            Assert.Same(page1, view1.RazorPage);
+
+            // Act 2
+            cancellationTokenSource.Cancel();
+            var result2 = viewEngine.FindView(context, "baz", isMainPage: true);
+
+            // Assert 2
+            Assert.True(result2.Success);
+            var view2 = Assert.IsType<RazorView>(result2.View);
+            Assert.Same(page2, view2.RazorPage);
+            pageFactory.Verify();
+        }
+
+        [Fact]
+        public void FindView_InvokesPageFactoryIfViewStartExpirationTokensHaveExpired()
+        {
+            // Arrange
+            var page1 = Mock.Of<IRazorPage>();
+            var page2 = Mock.Of<IRazorPage>();
+            var viewStart = Mock.Of<IRazorPage>();
+            var sequence = new MockSequence();
+            var cancellationTokenSource = new CancellationTokenSource();
+            var changeToken = new CancellationChangeToken(cancellationTokenSource.Token);
+
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            pageFactory
+                .InSequence(sequence)
+                .Setup(p => p.CreateFactory("/Views/bar/baz.cshtml"))
+                .Returns(GetPageFactoryResult(() => page1));
+            pageFactory
+                .InSequence(sequence)
+               .Setup(p => p.CreateFactory("/Views/_ViewStart.cshtml"))
+               .Returns(GetPageFactoryResult(factory: null, changeTokens: new[] { changeToken }))
+               .Verifiable();
+            pageFactory
+                .InSequence(sequence)
+                .Setup(p => p.CreateFactory("/Views/bar/baz.cshtml"))
+                .Returns(GetPageFactoryResult(() => page2));
+            pageFactory
+                .InSequence(sequence)
+               .Setup(p => p.CreateFactory("/Views/_ViewStart.cshtml"))
+               .Returns(GetPageFactoryResult(() => viewStart));
+
+            var fileSystem = new VirtualRazorProjectFileSystem();
+            var viewEngine = CreateViewEngine(pageFactory.Object, fileSystem: fileSystem);
+            var context = GetActionContext(_controllerTestContext);
+
+            // Act 1
+            var result1 = viewEngine.FindView(context, "baz", isMainPage: true);
+
+            // Assert 1
+            Assert.True(result1.Success);
+            var view1 = Assert.IsType<RazorView>(result1.View);
+            Assert.Same(page1, view1.RazorPage);
+            Assert.Empty(view1.ViewStartPages);
+
+            // Act 2
+            cancellationTokenSource.Cancel();
+            var result2 = viewEngine.FindView(context, "baz", isMainPage: true);
+
+            // Assert 2
+            Assert.True(result2.Success);
+            var view2 = Assert.IsType<RazorView>(result2.View);
+            Assert.Same(page2, view2.RazorPage);
+            var actualViewStart = Assert.Single(view2.ViewStartPages);
+            Assert.Equal(viewStart, actualViewStart);
+            pageFactory.Verify();
+        }
+
+        // This test validates an important perf scenario of RazorViewEngine not constructing
+        // multiple strings for views that do not exist in the file system on a per-request basis.
+        [Fact]
+        public void FindView_DoesNotInvokeViewLocationExpanders_IfChangeTokenHasNotExpired()
+        {
+            // Arrange
+            var pageFactory = Mock.Of<IRazorPageFactoryProvider>();
+            var expander = new Mock<IViewLocationExpander>();
+            var expandedLocations = new[]
+            {
+                "viewlocation1",
+                "viewlocation2",
+                "viewlocation3",
+            };
+            expander
+                .Setup(v => v.PopulateValues(It.IsAny<ViewLocationExpanderContext>()))
+                .Callback((ViewLocationExpanderContext expanderContext) =>
+                {
+                    expanderContext.Values["somekey"] = "somevalue";
+                })
+                .Verifiable();
+            expander
+                .Setup(v => v.ExpandViewLocations(
+                    It.IsAny<ViewLocationExpanderContext>(),
+                    It.IsAny<IEnumerable<string>>()))
+                .Returns(expandedLocations)
+                .Verifiable();
+
+            var viewEngine = CreateViewEngine(
+                pageFactory,
+                expanders: new[] { expander.Object });
+            var context = GetActionContext(_controllerTestContext);
+
+            // Act - 1
+            var result = viewEngine.FindView(context, "myview", isMainPage: true);
+
+            // Assert - 1
+            Assert.False(result.Success);
+            Assert.Equal(expandedLocations, result.SearchedLocations);
+            expander.Verify();
+
+            // Act - 2
+            result = viewEngine.FindView(context, "myview", isMainPage: true);
+
+            // Assert - 2
+            Assert.False(result.Success);
+            Assert.Equal(expandedLocations, result.SearchedLocations);
+            expander.Verify(
+                v => v.PopulateValues(It.IsAny<ViewLocationExpanderContext>()),
+                Times.Exactly(2));
+            expander.Verify(
+                v => v.ExpandViewLocations(It.IsAny<ViewLocationExpanderContext>(), It.IsAny<IEnumerable<string>>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public void FindView_InvokesViewLocationExpanders_IfChangeTokenExpires()
+        {
+            // Arrange
+            var cancellationTokenSource = new CancellationTokenSource();
+            var changeToken = new CancellationChangeToken(cancellationTokenSource.Token);
+            var page = Mock.Of<IRazorPage>();
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            pageFactory
+                .Setup(p => p.CreateFactory("viewlocation3"))
+                .Returns(GetPageFactoryResult(factory: null, changeTokens: new[] { changeToken }));
+            var expander = new Mock<IViewLocationExpander>();
+            var expandedLocations = new[]
+            {
+                "viewlocation1",
+                "viewlocation2",
+                "viewlocation3",
+            };
+            expander
+                .Setup(v => v.PopulateValues(It.IsAny<ViewLocationExpanderContext>()))
+                .Callback((ViewLocationExpanderContext expanderContext) =>
+                {
+                    expanderContext.Values["somekey"] = "somevalue";
+                })
+                .Verifiable();
+            expander
+                .Setup(v => v.ExpandViewLocations(
+                    It.IsAny<ViewLocationExpanderContext>(),
+                    It.IsAny<IEnumerable<string>>()))
+                .Returns(expandedLocations)
+                .Verifiable();
+
+            var viewEngine = CreateViewEngine(
+                pageFactory.Object,
+                expanders: new[] { expander.Object });
+            var context = GetActionContext(_controllerTestContext);
+
+            // Act - 1
+            var result = viewEngine.FindView(context, "MyView", isMainPage: true);
+
+            // Assert - 1
+            Assert.False(result.Success);
+            Assert.Equal(expandedLocations, result.SearchedLocations);
+            expander.Verify();
+
+            // Act - 2
+            pageFactory
+                .Setup(p => p.CreateFactory("viewlocation3"))
+                .Returns(GetPageFactoryResult(() => page));
+            cancellationTokenSource.Cancel();
+            result = viewEngine.FindView(context, "MyView", isMainPage: true);
+
+            // Assert - 2
+            Assert.True(result.Success);
+            var view = Assert.IsType<RazorView>(result.View);
+            Assert.Same(page, view.RazorPage);
+            expander.Verify(
+                v => v.PopulateValues(It.IsAny<ViewLocationExpanderContext>()),
+                Times.Exactly(2));
+            expander.Verify(
+                v => v.ExpandViewLocations(It.IsAny<ViewLocationExpanderContext>(), It.IsAny<IEnumerable<string>>()),
+                Times.Exactly(2));
+        }
+
+        [Theory]
+        [MemberData(nameof(AbsoluteViewPathData))]
+        public void FindPage_WithFullPath_ReturnsNotFound(string viewName)
+        {
+            // Arrange
+            var viewEngine = CreateSuccessfulViewEngine();
+            var context = GetActionContext(_controllerTestContext);
+
+            // Act
+            var result = viewEngine.FindPage(context, viewName);
+
+            // Assert
+            Assert.Null(result.Page);
+        }
+
+        [Theory]
+        [MemberData(nameof(AbsoluteViewPathData))]
+        public void FindPage_WithFullPathAndCshtmlEnding_ReturnsNotFound(string viewName)
+        {
+            // Arrange
+            var viewEngine = CreateSuccessfulViewEngine();
+            var context = GetActionContext(_controllerTestContext);
+            viewName += ".cshtml";
+
+            // Act
+            var result = viewEngine.FindPage(context, viewName);
+
+            // Assert
+            Assert.Null(result.Page);
+        }
+
+        [Fact]
+        public void FindPage_WithRelativePath_ReturnsNotFound()
+        {
+            // Arrange
+            var viewEngine = CreateSuccessfulViewEngine();
+            var context = GetActionContext(_controllerTestContext);
+
+            // Act
+            var result = viewEngine.FindPage(context, "View.cshtml");
+
+            // Assert
+            Assert.Null(result.Page);
+        }
+
+        [Fact]
+        public void GetPage_WithViewName_ReturnsNotFound()
+        {
+            // Arrange
+            var viewEngine = CreateSuccessfulViewEngine();
+
+            // Act
+            var result = viewEngine.GetPage("~/Home/View1.cshtml", "View2");
+
+            // Assert
+            Assert.Null(result.Page);
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void FindPage_ThrowsIfNameIsNullOrEmpty(string pageName)
+        {
+            // Arrange
+            var viewEngine = CreateViewEngine();
+            var context = GetActionContext(_controllerTestContext);
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => viewEngine.FindPage(context, pageName),
+                "pageName");
+        }
+
+        [Theory]
+        [MemberData(nameof(ViewLocationExpanderTestData))]
+        public void FindPage_UsesViewLocationExpander_ToExpandPaths(
+            IDictionary<string, object> routeValues,
+            IEnumerable<string> expectedSeeds)
+        {
+            // Arrange
+            var page = Mock.Of<IRazorPage>();
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            pageFactory
+                .Setup(p => p.CreateFactory("expanded-path/bar-layout"))
+                .Returns(GetPageFactoryResult(() => page))
+                .Verifiable();
+
+            var expander = new Mock<IViewLocationExpander>();
+            expander
+                .Setup(e => e.PopulateValues(It.IsAny<ViewLocationExpanderContext>()))
+                .Callback((ViewLocationExpanderContext c) =>
+                {
+                    Assert.NotNull(c.ActionContext);
+                    c.Values["expander-key"] = expander.ToString();
+                })
+                .Verifiable();
+            expander
+                .Setup(e => e.ExpandViewLocations(
+                    It.IsAny<ViewLocationExpanderContext>(),
+                    It.IsAny<IEnumerable<string>>()))
+                .Returns((ViewLocationExpanderContext c, IEnumerable<string> seeds) =>
+                {
+                    Assert.NotNull(c.ActionContext);
+                    Assert.Equal(expectedSeeds, seeds);
+
+                    Assert.Equal(expander.ToString(), c.Values["expander-key"]);
+
+                    return new[] { "expanded-path/bar-{0}" };
+                })
+                .Verifiable();
+
+            var viewEngine = CreateViewEngine(
+                pageFactory.Object,
+                new[] { expander.Object });
+            var context = GetActionContext(routeValues);
+
+            // Act
+            var result = viewEngine.FindPage(context, "layout");
+
+            // Assert
+            Assert.Equal("layout", result.Name);
+            Assert.Same(page, result.Page);
+            Assert.Null(result.SearchedLocations);
+            pageFactory.Verify();
+            expander.Verify();
+        }
+
+        [Fact]
+        public void FindPage_ReturnsSearchedLocationsIfPageCannotBeFound()
+        {
+            // Arrange
+            var expected = new[]
+            {
+                "/Views/bar/layout.cshtml",
+                "/Views/Shared/layout.cshtml",
+            };
+
+            var viewEngine = CreateViewEngine();
+            var context = GetActionContext(_controllerTestContext);
+
+            // Act
+            var result = viewEngine.FindPage(context, "layout");
+
+            // Assert
+            Assert.Equal("layout", result.Name);
+            Assert.Null(result.Page);
+            Assert.Equal(expected, result.SearchedLocations);
+        }
+
+        [Fact]
+        public void FindPage_SelectsActionCaseInsensitively()
+        {
+            // The ActionDescriptor contains "Foo" and the RouteData contains "foo"
+            // which matches the case of the constructor thus searching in the appropriate location.
+            // Arrange
+            var routeValues = new Dictionary<string, object>
+            {
+                { "controller", "foo" }
+            };
+            var page = new Mock<IRazorPage>(MockBehavior.Strict);
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            pageFactory
+                .Setup(p => p.CreateFactory("/Views/Foo/details.cshtml"))
+                .Returns(GetPageFactoryResult(() => page.Object))
+                .Verifiable();
+
+            var viewEngine = CreateViewEngine(pageFactory.Object);
+            var routesInActionDescriptor = new Dictionary<string, string>()
+            {
+                { "controller", "Foo" }
+            };
+
+            var context = GetActionContextWithActionDescriptor(
+                routeValues,
+                routesInActionDescriptor);
+
+            // Act
+            var result = viewEngine.FindPage(context, "details");
+
+            // Assert
+            Assert.Equal("details", result.Name);
+            Assert.Same(page.Object, result.Page);
+            Assert.Null(result.SearchedLocations);
+            pageFactory.Verify();
+        }
+
+        [Fact]
+        public void FindPage_LooksForPages_UsingActionDescriptor_Controller()
+        {
+            // Arrange
+            var expected = new[]
+            {
+                "/Views/bar/foo.cshtml",
+                "/Views/Shared/foo.cshtml",
+            };
+
+            var routeValues = new Dictionary<string, object>
+            {
+                { "controller", "Bar" }
+            };
+            var routesInActionDescriptor = new Dictionary<string, string>()
+            {
+                { "controller", "bar" }
+            };
+
+            var viewEngine = CreateViewEngine();
+            var context = GetActionContextWithActionDescriptor(
+                routeValues,
+                routesInActionDescriptor);
+
+            // Act
+            var result = viewEngine.FindPage(context, "foo");
+
+            // Assert
+            Assert.Equal("foo", result.Name);
+            Assert.Null(result.Page);
+            Assert.Equal(expected, result.SearchedLocations);
+        }
+
+        [Fact]
+        public void FindPage_LooksForPages_UsingActionDescriptor_Areas()
+        {
+            // Arrange
+            var expected = new[]
+            {
+                "/Areas/world/Views/bar/foo.cshtml",
+                "/Areas/world/Views/Shared/foo.cshtml",
+                "/Views/Shared/foo.cshtml"
+            };
+
+            var routeValues = new Dictionary<string, object>
+            {
+                { "controller", "Bar" },
+                { "area", "World" }
+            };
+            var routesInActionDescriptor = new Dictionary<string, string>()
+            {
+                { "controller", "bar" },
+                { "area", "world" }
+            };
+
+            var viewEngine = CreateViewEngine();
+            var context = GetActionContextWithActionDescriptor(
+                routeValues,
+                routesInActionDescriptor);
+
+            // Act
+            var result = viewEngine.FindPage(context, "foo");
+
+            // Assert
+            Assert.Equal("foo", result.Name);
+            Assert.Null(result.Page);
+            Assert.Equal(expected, result.SearchedLocations);
+        }
+
+        [Fact]
+        public void FindPage_LooksForPages_UsesRouteValuesAsFallback()
+        {
+            // Arrange
+            var expected = new[]
+            {
+                "/Views/foo/bar.cshtml",
+                "/Views/Shared/bar.cshtml",
+            };
+
+            var routeValues = new Dictionary<string, object>()
+            {
+                { "controller", "foo" }
+            };
+
+            var viewEngine = CreateViewEngine();
+            var context = GetActionContextWithActionDescriptor(
+                routeValues,
+                new Dictionary<string, string>());
+
+            // Act
+            var result = viewEngine.FindPage(context, "bar");
+
+            // Assert
+            Assert.Equal("bar", result.Name);
+            Assert.Null(result.Page);
+            Assert.Equal(expected, result.SearchedLocations);
+        }
+
+        [Fact]
+        public void CreateCacheResult_LogsPrecompiledViewFound()
+        {
+            // Arrange
+            var sink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
+
+            var relativePath = "/Views/Foo/details.cshtml";
+            var factoryResult = GetPageFactoryResult(() => Mock.Of<IRazorPage>());
+            factoryResult.ViewDescriptor.IsPrecompiled = true;
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            pageFactory
+                .Setup(p => p.CreateFactory(relativePath))
+                .Returns(factoryResult)
+                .Verifiable();
+
+            var viewEngine = new RazorViewEngine(
+                pageFactory.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new HtmlTestEncoder(),
+                GetOptionsAccessor(expanders: null),
+                new VirtualRazorProjectFileSystem(),
+                loggerFactory,
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+
+            // Act
+            var result = viewEngine.CreateCacheResult(null, relativePath, false);
+
+            // Assert
+            var logMessage = Assert.Single(sink.Writes);
+            Assert.Equal($"Using precompiled view for '{relativePath}'.", logMessage.State.ToString());
+        }
+
+        [Theory]
+        [InlineData("/Test-View.cshtml")]
+        [InlineData("~/Test-View.CSHTML")]
+        [InlineData("/Home/Test-View.CSHTML")]
+        [InlineData("~/Home/Test-View.cshtml")]
+        [InlineData("~/SHARED/TEST-VIEW.CSHTML")]
+        public void GetPage_UsesGivenPath_WithAppRelativePath(string pageName)
+        {
+            // Arrange
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            var page = Mock.Of<IRazorPage>();
+            pageFactory
+                .Setup(p => p.CreateFactory(pageName))
+                .Returns(GetPageFactoryResult(() => page))
+                .Verifiable();
+            var viewEngine = new TestableRazorViewEngine(
+                pageFactory.Object,
+                GetOptionsAccessor());
+
+            // Act
+            var result = viewEngine.GetPage("~/Another/Place.cshtml", pagePath: pageName);
+
+            // Assert
+            Assert.Same(page, result.Page);
+            Assert.Equal(pageName, result.Name);
+            pageFactory.Verify();
+        }
+
+        [Theory]
+        [InlineData("Test-View.cshtml")]
+        [InlineData("Test-View.CSHTML")]
+        [InlineData("PATH/TEST-VIEW.CSHTML")]
+        [InlineData("Path1/Path2/Test-View.cshtml")]
+        public void GetPage_ResolvesRelativeToCurrentPage_WithRelativePath(string pageName)
+        {
+            // Arrange
+            var expectedPageName = $"/Home/{ pageName }";
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            var page = Mock.Of<IRazorPage>();
+            pageFactory
+                .Setup(p => p.CreateFactory(expectedPageName))
+                .Returns(GetPageFactoryResult(() => page))
+                .Verifiable();
+            var viewEngine = new TestableRazorViewEngine(
+                pageFactory.Object,
+                GetOptionsAccessor());
+
+            // Act
+            var result = viewEngine.GetPage("/Home/Page.cshtml", pageName);
+
+            // Assert
+            Assert.Same(page, result.Page);
+            Assert.Equal(pageName, result.Name);
+            pageFactory.Verify();
+        }
+
+        [Theory]
+        [InlineData("Test-View.cshtml")]
+        [InlineData("Test-View.CSHTML")]
+        [InlineData("PATH/TEST-VIEW.CSHTML")]
+        [InlineData("Path1/Path2/Test-View.cshtml")]
+        public void GetPage_ResolvesRelativeToAppRoot_WithRelativePath_IfNoPageExecuting(string pageName)
+        {
+            // Arrange
+            var expectedPageName = $"/{ pageName }";
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            var page = Mock.Of<IRazorPage>();
+            pageFactory
+                .Setup(p => p.CreateFactory(expectedPageName))
+                .Returns(GetPageFactoryResult(() => page))
+                .Verifiable();
+            var viewEngine = new TestableRazorViewEngine(
+                pageFactory.Object,
+                GetOptionsAccessor());
+
+            // Act
+            var result = viewEngine.GetPage(executingFilePath: null, pagePath: pageName);
+
+            // Assert
+            Assert.Same(page, result.Page);
+            Assert.Equal(pageName, result.Name);
+            pageFactory.Verify();
+        }
+
+        [Theory]
+        [InlineData(null, null)]
+        [InlineData(null, "")]
+        [InlineData(null, "Page")]
+        [InlineData(null, "Folder/Page")]
+        [InlineData(null, "Folder1/Folder2/Page")]
+        [InlineData("/Home/Index.cshtml", null)]
+        [InlineData("/Home/Index.cshtml", "")]
+        [InlineData("/Home/Index.cshtml", "Page")]
+        [InlineData("/Home/Index.cshtml", "Folder/Page")]
+        [InlineData("/Home/Index.cshtml", "Folder1/Folder2/Page")]
+        public void GetAbsolutePath_ReturnsPagePathUnchanged_IfNotAPath(string executingFilePath, string pagePath)
+        {
+            // Arrange
+            var viewEngine = CreateViewEngine();
+
+            // Act
+            var result = viewEngine.GetAbsolutePath(executingFilePath, pagePath);
+
+            // Assert
+            Assert.Same(pagePath, result);
+        }
+
+        [Theory]
+        [InlineData("/Views/Home/Index.cshtml", "../Shared/_Partial.cshtml")]
+        [InlineData("/Views/Home/Index.cshtml", "..\\Shared\\_Partial.cshtml")]
+        [InlineData("/Areas/MyArea/Views/Home/Index.cshtml", "../../../../Views/Shared/_Partial.cshtml")]
+        [InlineData("/Views/Accounts/Users.cshtml", "../Test/../Shared/_Partial.cshtml")]
+        [InlineData("Views/Accounts/Users.cshtml", "./../Shared/./_Partial.cshtml")]
+        public void GetAbsolutePath_ResolvesPathTraversals(string executingFilePath, string pagePath)
+        {
+            // Arrange
+            var viewEngine = CreateViewEngine();
+
+            // Act
+            var result = viewEngine.GetAbsolutePath(executingFilePath, pagePath);
+
+            // Assert
+            Assert.Equal("/Views/Shared/_Partial.cshtml", result);
+        }
+
+        [Theory]
+        [InlineData("../Shared/_Layout.cshtml")]
+        [InlineData("Folder1/../Folder2/../../File.cshtml")]
+        public void GetAbsolutePath_DoesNotResolvePathIfTraversalsEscapeTheRoot(string pagePath)
+        {
+            // Arrange
+            var expected = '/' + pagePath;
+            var viewEngine = CreateViewEngine();
+
+            // Act
+            var result = viewEngine.GetAbsolutePath("/Index.cshtml", pagePath);
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Theory]
+        [InlineData(null, "/Page")]
+        [InlineData(null, "~/Folder/Page.cshtml")]
+        [InlineData(null, "/Folder1/Folder2/Page.rzr")]
+        [InlineData("/Home/Index.cshtml", "~/Page")]
+        [InlineData("/Home/Index.cshtml", "/Folder/Page.cshtml")]
+        [InlineData("/Home/Index.cshtml", "~/Folder1/Folder2/Page.rzr")]
+        public void GetAbsolutePath_ReturnsPagePathUnchanged_IfAppRelative(string executingFilePath, string pagePath)
+        {
+            // Arrange
+            var viewEngine = CreateViewEngine();
+
+            // Act
+            var result = viewEngine.GetAbsolutePath(executingFilePath, pagePath);
+
+            // Assert
+            Assert.Same(pagePath, result);
+        }
+
+        [Theory]
+        [InlineData("Page.cshtml")]
+        [InlineData("Folder/Page.cshtml")]
+        [InlineData("../../Folder1/Folder2/Page.cshtml")]
+        public void GetAbsolutePath_ResolvesRelativeToExecutingPage(string pagePath)
+        {
+            // Arrange
+            var expectedPagePath = "/Home/" + pagePath;
+            var viewEngine = CreateViewEngine();
+
+            // Act
+            var result = viewEngine.GetAbsolutePath("/Home/Page.cshtml", pagePath);
+
+            // Assert
+            Assert.Equal(expectedPagePath, result);
+        }
+
+        [Theory]
+        [InlineData("Page.cshtml")]
+        [InlineData("Folder/Page.cshtml")]
+        [InlineData("../../Folder1/Folder2/Page.cshtml")]
+        public void GetAbsolutePath_ResolvesRelativeToAppRoot_IfNoPageExecuting(string pagePath)
+        {
+            // Arrange
+            var expectedPagePath = "/" + pagePath;
+            var viewEngine = CreateViewEngine();
+
+            // Act
+            var result = viewEngine.GetAbsolutePath(executingFilePath: null, pagePath: pagePath);
+
+            // Assert
+            Assert.Equal(expectedPagePath, result);
+        }
+
+        [Fact]
+        public void GetNormalizedRouteValue_ReturnsValueFromRouteValues()
+        {
+            // Arrange
+            var key = "some-key";
+            var actionDescriptor = new ActionDescriptor();
+            actionDescriptor.RouteValues.Add(key, "Route-Value");
+
+            var actionContext = new ActionContext
+            {
+                ActionDescriptor = actionDescriptor,
+                RouteData = new RouteData()
+            };
+
+            actionContext.RouteData.Values[key] = "route-value";
+
+            // Act
+            var result = RazorViewEngine.GetNormalizedRouteValue(actionContext, key);
+
+            // Assert
+            Assert.Equal("Route-Value", result);
+        }
+
+        [Fact]
+        public void GetNormalizedRouteValue_ReturnsRouteValue_IfValueDoesNotMatch()
+        {
+            // Arrange
+            var key = "some-key";
+            var actionDescriptor = new ActionDescriptor();
+            actionDescriptor.RouteValues.Add(key, "different-value");
+
+            var actionContext = new ActionContext
+            {
+                ActionDescriptor = actionDescriptor,
+                RouteData = new RouteData()
+            };
+
+            actionContext.RouteData.Values[key] = "route-value";
+
+            // Act
+            var result = RazorViewEngine.GetNormalizedRouteValue(actionContext, key);
+
+            // Assert
+            Assert.Equal("route-value", result);
+        }
+
+        [Fact]
+        public void GetNormalizedRouteValue_ReturnsNonNormalizedValue_IfActionRouteValueIsNull()
+        {
+            // Arrange
+            var key = "some-key";
+            var actionDescriptor = new ActionDescriptor();
+            actionDescriptor.RouteValues.Add(key, null);
+
+            var actionContext = new ActionContext
+            {
+                ActionDescriptor = actionDescriptor,
+                RouteData = new RouteData()
+            };
+
+            actionContext.RouteData.Values[key] = "route-value";
+
+            // Act
+            var result = RazorViewEngine.GetNormalizedRouteValue(actionContext, key);
+
+            // Assert
+            Assert.Equal("route-value", result);
+        }
+
+        [Fact]
+        public void GetNormalizedRouteValue_ConvertsRouteValueToString()
+        {
+            using (new CultureReplacer())
+            {
+                // Arrange
+                var key = "some-key";
+                var actionDescriptor = new ActionDescriptor
+                {
+                    AttributeRouteInfo = new AttributeRouteInfo(),
+                };
+
+                var actionContext = new ActionContext
+                {
+                    ActionDescriptor = actionDescriptor,
+                    RouteData = new RouteData()
+                };
+
+                actionContext.RouteData.Values[key] = 43;
+
+                // Act
+                var result = RazorViewEngine.GetNormalizedRouteValue(actionContext, key);
+
+                // Assert
+                Assert.Equal("43", result);
+            }
+        }
+
+        [Fact]
+        public void GetViewLocationFormats_ForControllerWithoutArea_ReturnsDefaultSet()
+        {
+            // Arrange
+            var expected = new string[] { "expected", };
+
+            var viewEngine = new TestableRazorViewEngine(
+                Mock.Of<IRazorPageFactoryProvider>(),
+                GetOptionsAccessor(viewLocationFormats: expected));
+
+            var context = new ViewLocationExpanderContext(
+                new ActionContext(),
+                "Index.cshtml",
+                controllerName: "Home",
+                areaName: null,
+                pageName: "ignored",
+                isMainPage: true);
+
+            // Act
+            var actual = viewEngine.GetViewLocationFormats(context);
+
+            // Assert
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void GetViewLocationFormats_ForControllerWithArea_ReturnsAreaSet()
+        {
+            // Arrange
+            var expected = new string[] { "expected", };
+
+            var viewEngine = new TestableRazorViewEngine(
+                Mock.Of<IRazorPageFactoryProvider>(),
+                GetOptionsAccessor(areaViewLocationFormats: expected));
+
+            var context = new ViewLocationExpanderContext(
+                new ActionContext(),
+                "Index.cshtml",
+                controllerName: "Home",
+                areaName: "Admin",
+                pageName: "ignored",
+                isMainPage: true);
+
+            // Act
+            var actual = viewEngine.GetViewLocationFormats(context);
+
+            // Assert
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void GetViewLocationFormats_ForPage_ReturnsPageSet()
+        {
+            // Arrange
+            var expected = new string[] { "expected", };
+
+            var viewEngine = new TestableRazorViewEngine(
+                Mock.Of<IRazorPageFactoryProvider>(),
+                GetOptionsAccessor(pageViewLocationFormats: expected));
+
+            var context = new ViewLocationExpanderContext(
+                new ActionContext(),
+                "Index.cshtml",
+                controllerName: null,
+                areaName: null,
+                pageName: "/Some/Page",
+                isMainPage: true);
+
+            // Act
+            var actual = viewEngine.GetViewLocationFormats(context);
+
+            // Assert
+            Assert.Equal(expected, actual);
+        }
+
+        // This isn't a real case we expect to hit in an app, just making sure we have a reasonable default
+        // for a weird configuration. In this case we preserve what we did in 1.0.0.
+        [Fact]
+        public void GetViewLocationFormats_NoRouteValues_ReturnsDefaultSet()
+        {
+            // Arrange
+            var expected = new string[] { "expected", };
+
+            var viewEngine = new TestableRazorViewEngine(
+                Mock.Of<IRazorPageFactoryProvider>(),
+                GetOptionsAccessor(viewLocationFormats: expected));
+
+            var context = new ViewLocationExpanderContext(
+                new ActionContext(),
+                "Index.cshtml",
+                controllerName: null,
+                areaName: null,
+                pageName: null,
+                isMainPage: true);
+
+            // Act
+            var actual = viewEngine.GetViewLocationFormats(context);
+
+            // Assert
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void ViewEngine_DoesNotSetPageValue_IfItIsNotSpecifiedInRouteValues()
+        {
+            // Arrange
+            var routeValues = new Dictionary<string, object>
+            {
+                { "controller", "MyController" },
+                { "action", "MyAction" }
+            };
+
+            var expected = new[] { "some-seed" };
+            var expander = new Mock<IViewLocationExpander>();
+            expander
+                .Setup(e => e.PopulateValues(It.IsAny<ViewLocationExpanderContext>()))
+                .Callback((ViewLocationExpanderContext c) =>
+                {
+                    Assert.Equal("MyController", c.ControllerName);
+                    Assert.Null(c.PageName);
+                })
+                .Verifiable();
+
+            expander
+                .Setup(e => e.ExpandViewLocations(
+                    It.IsAny<ViewLocationExpanderContext>(),
+                    It.IsAny<IEnumerable<string>>()))
+                .Returns(expected);
+
+            var viewEngine = CreateViewEngine(expanders: new[] { expander.Object });
+            var context = GetActionContext(routeValues);
+
+            // Act
+            viewEngine.FindView(context, viewName: "Test-view", isMainPage: true);
+
+            // Assert
+            expander.Verify();
+        }
+
+        [Fact]
+        public void ViewEngine_SetsPageValue_IfItIsSpecifiedInRouteValues()
+        {
+            // Arrange
+            var routeValues = new Dictionary<string, object>
+            {
+                { "page", "MyPage" },
+            };
+
+            var expected = new[] { "some-seed" };
+            var expander = new Mock<IViewLocationExpander>();
+            expander
+                .Setup(e => e.PopulateValues(It.IsAny<ViewLocationExpanderContext>()))
+                .Callback((ViewLocationExpanderContext c) =>
+                {
+                    Assert.Equal("MyPage", c.PageName);
+                })
+                .Verifiable();
+
+            expander
+                .Setup(e => e.ExpandViewLocations(
+                    It.IsAny<ViewLocationExpanderContext>(),
+                    It.IsAny<IEnumerable<string>>()))
+                .Returns(expected);
+
+            var viewEngine = CreateViewEngine(expanders: new[] { expander.Object });
+            var context = GetActionContext(routeValues);
+            context.ActionDescriptor.RouteValues["page"] = "MyPage";
+
+            // Act
+            viewEngine.FindView(context, viewName: "MyView", isMainPage: true);
+
+            // Assert
+            expander.Verify();
+        }
+
+        [Fact]
+        public void FindView_ResolvesDirectoryTraversalsPriorToInvokingPageFactory()
+        {
+            // Arrange
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            pageFactory.Setup(p => p.CreateFactory("/Views/Shared/_Partial.cshtml"))
+                .Returns(GetPageFactoryResult(() => Mock.Of<IRazorPage>()))
+                .Verifiable();
+            var viewEngine = CreateViewEngine(pageFactory.Object);
+            var context = GetActionContext(new Dictionary<string, object>());
+
+            // Act
+            var result = viewEngine.FindView(context, "../Shared/_Partial", isMainPage: false);
+
+            // Assert
+            pageFactory.Verify();
+        }
+
+        [Fact]
+        public void FindPage_ResolvesDirectoryTraversalsPriorToInvokingPageFactory()
+        {
+            // Arrange
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            pageFactory.Setup(p => p.CreateFactory("/Views/Shared/_Partial.cshtml"))
+                .Returns(GetPageFactoryResult(() => Mock.Of<IRazorPage>()))
+                .Verifiable();
+            var viewEngine = CreateViewEngine(pageFactory.Object);
+            var context = GetActionContext(new Dictionary<string, object>());
+
+            // Act
+            var result = viewEngine.FindPage(context, "../Shared/_Partial");
+
+            // Assert
+            pageFactory.Verify();
+        }
+
+        // Tests to verify fix for https://github.com/aspnet/Mvc/issues/6672
+        // Without normalizing the path, the view engine would have attempted to lookup "/Views//MyView.cshtml"
+        // which works for PhysicalFileProvider but fails for exact lookups performed during precompilation.
+        // We normalize it to "/Views/MyView.cshtml" to avoid this discrepancy.
+        [Fact]
+        public void FindView_ResolvesNormalizesSlashesPriorToInvokingPageFactory()
+        {
+            // Arrange
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            pageFactory.Setup(p => p.CreateFactory("/Views/MyView.cshtml"))
+                .Returns(GetPageFactoryResult(() => Mock.Of<IRazorPage>()))
+                .Verifiable();
+            var viewEngine = CreateViewEngine(pageFactory.Object);
+            var context = GetActionContext(new Dictionary<string, object>());
+
+            // Act
+            var result = viewEngine.FindView(context, "MyView", isMainPage: true);
+
+            // Assert
+            pageFactory.Verify();
+        }
+
+        [Fact]
+        public void FindPage_ResolvesNormalizesSlashesPriorToInvokingPageFactory()
+        {
+            // Arrange
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            pageFactory.Setup(p => p.CreateFactory("/Views/MyPage.cshtml"))
+                .Returns(GetPageFactoryResult(() => Mock.Of<IRazorPage>()))
+                .Verifiable();
+            var viewEngine = CreateViewEngine(pageFactory.Object);
+            var context = GetActionContext(new Dictionary<string, object>());
+
+            // Act
+            var result = viewEngine.FindPage(context, "MyPage");
+
+            // Assert
+            pageFactory.Verify();
+        }
+
+        // Return RazorViewEngine with a page factory provider that is always successful.
+        private RazorViewEngine CreateSuccessfulViewEngine()
+        {
+            var pageFactory = new Mock<IRazorPageFactoryProvider>(MockBehavior.Strict);
+            pageFactory
+                .Setup(f => f.CreateFactory(It.IsAny<string>()))
+                .Returns(GetPageFactoryResult(() => Mock.Of<IRazorPage>()));
+
+            return CreateViewEngine(pageFactory.Object);
+        }
+
+        private static RazorPageFactoryResult GetPageFactoryResult(
+            Func<IRazorPage> factory,
+            IList<IChangeToken> changeTokens = null,
+            string path = "/Views/Home/Index.cshtml")
+        {
+            var descriptor = new CompiledViewDescriptor
+            {
+                ExpirationTokens = changeTokens ?? Array.Empty<IChangeToken>(),
+                RelativePath = path,
+            };
+
+            return new RazorPageFactoryResult(descriptor, factory);
+        }
+
+        private TestableRazorViewEngine CreateViewEngine(
+            IRazorPageFactoryProvider pageFactory = null,
+            IEnumerable<IViewLocationExpander> expanders = null,
+            RazorProjectFileSystem fileSystem = null)
+        {
+            pageFactory = pageFactory ?? Mock.Of<IRazorPageFactoryProvider>();
+            fileSystem = fileSystem ?? new VirtualRazorProjectFileSystem();
+            return new TestableRazorViewEngine(pageFactory, GetOptionsAccessor(expanders), fileSystem);
+        }
+
+        private static IOptions<RazorViewEngineOptions> GetOptionsAccessor(
+            IEnumerable<IViewLocationExpander> expanders = null,
+            IEnumerable<string> viewLocationFormats = null,
+            IEnumerable<string> areaViewLocationFormats = null,
+            IEnumerable<string> pageViewLocationFormats = null)
+        {
+            var optionsSetup = new RazorViewEngineOptionsSetup(Mock.Of<IHostingEnvironment>());
+
+            var options = new RazorViewEngineOptions();
+            optionsSetup.Configure(options);
+            options.PageViewLocationFormats.Add("/Views/Shared/{0}.cshtml");
+            options.PageViewLocationFormats.Add("/Pages/Shared/{0}.cshtml");
+
+            if (expanders != null)
+            {
+                foreach (var expander in expanders)
+                {
+                    options.ViewLocationExpanders.Add(expander);
+                }
+            }
+
+            if (viewLocationFormats != null)
+            {
+                options.ViewLocationFormats.Clear();
+
+                foreach (var location in viewLocationFormats)
+                {
+                    options.ViewLocationFormats.Add(location);
+                }
+            }
+
+            if (areaViewLocationFormats != null)
+            {
+                options.AreaViewLocationFormats.Clear();
+
+                foreach (var location in areaViewLocationFormats)
+                {
+                    options.AreaViewLocationFormats.Add(location);
+                }
+            }
+
+            if (pageViewLocationFormats != null)
+            {
+                options.PageViewLocationFormats.Clear();
+
+                foreach (var location in pageViewLocationFormats)
+                {
+                    options.PageViewLocationFormats.Add(location);
+                }
+            }
+
+            var optionsAccessor = new Mock<IOptions<RazorViewEngineOptions>>();
+            optionsAccessor
+                .SetupGet(v => v.Value)
+                .Returns(options);
+            return optionsAccessor.Object;
+        }
+
+        private static ActionContext GetActionContext(IDictionary<string, object> routeValues)
+        {
+            var httpContext = new DefaultHttpContext();
+            var routeData = new RouteData();
+            foreach (var kvp in routeValues)
+            {
+                routeData.Values.Add(kvp.Key, kvp.Value);
+            }
+
+            var actionDesciptor = new ActionDescriptor();
+            return new ActionContext(httpContext, routeData, actionDesciptor);
+        }
+
+        private static ActionContext GetActionContextWithActionDescriptor(
+            IDictionary<string, object> routeValues,
+            IDictionary<string, string> actionRouteValues)
+        {
+            var httpContext = new DefaultHttpContext();
+            var routeData = new RouteData();
+            foreach (var kvp in routeValues)
+            {
+                routeData.Values.Add(kvp.Key, kvp.Value);
+            }
+
+            var actionDescriptor = new ActionDescriptor();
+
+            foreach (var kvp in actionRouteValues)
+            {
+                actionDescriptor.RouteValues.Add(kvp.Key, kvp.Value);
+            }
+
+            return new ActionContext(httpContext, routeData, actionDescriptor);
+        }
+
+        private class TestableRazorViewEngine : RazorViewEngine
+        {
+            public TestableRazorViewEngine(
+                IRazorPageFactoryProvider pageFactory,
+                IOptions<RazorViewEngineOptions> optionsAccessor)
+                : this(
+                      pageFactory,
+                      optionsAccessor,
+                      new FileProviderRazorProjectFileSystem(
+                          Mock.Of<IRazorViewEngineFileProviderAccessor>(a => a.FileProvider == new TestFileProvider()),
+                          Mock.Of<IHostingEnvironment>()))
+            {
+            }
+
+            public TestableRazorViewEngine(
+                IRazorPageFactoryProvider pageFactory,
+                IOptions<RazorViewEngineOptions> optionsAccessor,
+                RazorProjectFileSystem fileSystem)
+                : base(pageFactory, Mock.Of<IRazorPageActivator>(), new HtmlTestEncoder(), optionsAccessor, fileSystem, NullLoggerFactory.Instance, new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"))
+            {
+            }
+
+            public IMemoryCache ViewLookupCachePublic => ViewLookupCache;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewTest.cs
new file mode 100644
index 0000000000..cd5e8835a2
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewTest.cs
@@ -0,0 +1,1811 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Primitives;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public class RazorViewTest
+    {
+        private const string LayoutPath = "~/Shared/_Layout.cshtml";
+
+#pragma warning disable 1998
+        private readonly RenderAsyncDelegate _nullRenderAsyncDelegate = async () => { };
+#pragma warning restore 1998
+
+        [Fact]
+        public async Task RenderAsync_AsPartial_BuffersOutput()
+        {
+            // Arrange
+            TextWriter actual = null;
+            var page = new TestableRazorPage(v =>
+            {
+                actual = v.Output;
+                v.HtmlEncoder = new HtmlTestEncoder();
+                v.Write("Hello world");
+            });
+            var view = new RazorView(
+                Mock.Of<IRazorViewEngine>(),
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+            var expected = viewContext.Writer;
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            Assert.NotSame(expected, actual);
+            Assert.IsType<ViewBufferTextWriter>(actual);
+            Assert.Equal("HtmlEncode[[Hello world]]", viewContext.Writer.ToString());
+        }
+
+        [Fact]
+        public async Task RenderAsync_AsPartial_ActivatesViews_WithThePassedInViewContext()
+        {
+            // Arrange
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider(), new ModelStateDictionary());
+            var page = new TestableRazorPage(v =>
+            {
+                // viewData is assigned to ViewContext by the activator
+                Assert.Same(viewData, v.ViewContext.ViewData);
+            });
+            var activator = new Mock<IRazorPageActivator>();
+            var view = new RazorView(
+                Mock.Of<IRazorViewEngine>(),
+                activator.Object,
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+
+            var viewContext = CreateViewContext(view);
+            var expectedWriter = viewContext.Writer;
+            activator
+                .Setup(a => a.Activate(page, It.IsAny<ViewContext>()))
+                .Callback((IRazorPage p, ViewContext c) =>
+                {
+                    Assert.Same(c, viewContext);
+                    c.ViewData = viewData;
+                })
+                .Verifiable();
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            activator.Verify();
+            Assert.Same(expectedWriter, viewContext.Writer);
+        }
+
+        [Fact]
+        public async Task RenderAsync_AsPartial_ActivatesViews_WritesBeforeAndAfterRazorViewEventDiagnostics()
+        {
+            // Arrange
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider(), new ModelStateDictionary());
+            var page = new TestableRazorPageForDiagnostics(v =>
+            {
+                // viewData is assigned to ViewContext by the activator
+                Assert.Same(viewData, v.ViewContext.ViewData);
+            });
+            var activator = new Mock<IRazorPageActivator>();
+
+            var adapter = new TestDiagnosticListener();
+            var diagnosticSource = new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor");
+            diagnosticSource.SubscribeWithAdapter(adapter);
+
+            var view = new RazorView(
+                Mock.Of<IRazorViewEngine>(),
+                activator.Object,
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                diagnosticSource);
+
+            var viewContext = CreateViewContext(view);
+            var expectedWriter = viewContext.Writer;
+            activator
+                .Setup(a => a.Activate(page, It.IsAny<ViewContext>()))
+                .Callback((IRazorPage p, ViewContext c) =>
+                {
+                    Assert.Same(c, viewContext);
+                    c.ViewData = viewData;
+                })
+                .Verifiable();
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            Assert.NotNull(adapter.BeforeViewPage?.Page);
+            Assert.NotNull(adapter.BeforeViewPage?.ViewContext);
+            Assert.NotNull(adapter.BeforeViewPage?.ActionDescriptor);
+            Assert.NotNull(adapter.BeforeViewPage?.HttpContext);
+            Assert.NotNull(adapter.AfterViewPage?.Page);
+            Assert.NotNull(adapter.AfterViewPage?.ViewContext);
+            Assert.NotNull(adapter.AfterViewPage?.ActionDescriptor);
+            Assert.NotNull(adapter.AfterViewPage?.HttpContext);
+        }
+
+        [Fact]
+        public async Task ViewContext_ExecutingPagePath_ReturnsPathOfRazorPageBeingExecuted()
+        {
+            // Arrange
+            var pagePath = "/my/view";
+            var paths = new List<string>();
+            var page = new TestableRazorPage(v =>
+            {
+                paths.Add(v.ViewContext.ExecutingFilePath);
+                Assert.Equal(pagePath, v.ViewContext.View.Path);
+            })
+            {
+                Path = pagePath
+            };
+
+            var viewStart = new TestableRazorPage(v =>
+            {
+                v.Layout = LayoutPath;
+                paths.Add(v.ViewContext.ExecutingFilePath);
+                Assert.Equal(pagePath, v.ViewContext.View.Path);
+            })
+            {
+                Path = "_ViewStart"
+            };
+
+            var layout = new TestableRazorPage(v =>
+            {
+                v.RenderBodyPublic();
+                paths.Add(v.ViewContext.ExecutingFilePath);
+                Assert.Equal(pagePath, v.ViewContext.View.Path);
+            })
+            {
+                Path = LayoutPath
+            };
+
+            var activator = Mock.Of<IRazorPageActivator>();
+            var viewEngine = new Mock<IRazorViewEngine>();
+            viewEngine
+                .Setup(p => p.GetAbsolutePath("_ViewStart", LayoutPath))
+                .Returns(LayoutPath);
+            viewEngine
+                .Setup(v => v.GetPage(pagePath, LayoutPath))
+                .Returns(new RazorPageResult(LayoutPath, layout));
+            var view = new RazorView(
+                viewEngine.Object,
+                activator,
+                new[] { viewStart },
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+
+            var viewContext = CreateViewContext(view);
+            var expectedWriter = viewContext.Writer;
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            Assert.Equal(new[] { "_ViewStart", pagePath, LayoutPath }, paths);
+        }
+
+        [Fact]
+        public async Task RenderAsync_AsPartial_ActivatesViews()
+        {
+            // Arrange
+            var page = new TestableRazorPage(v => { });
+            var activator = new Mock<IRazorPageActivator>();
+            activator
+                .Setup(a => a.Activate(page, It.IsAny<ViewContext>()))
+                .Verifiable();
+            var view = new RazorView(
+                Mock.Of<IRazorViewEngine>(),
+                activator.Object,
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            activator.Verify();
+        }
+
+        [Fact]
+        public async Task RenderAsync_AsPartial_ExecutesLayout_ButNotViewStartPages()
+        {
+            // Arrange
+            var htmlEncoder = new HtmlTestEncoder();
+            var expected = string.Join(
+                Environment.NewLine,
+                "HtmlEncode[[layout-content",
+                "]]HtmlEncode[[page-content]]");
+            var page = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Layout = LayoutPath;
+                v.Write("page-content");
+            });
+
+            var layout = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Write("layout-content" + Environment.NewLine);
+                v.RenderBodyPublic();
+            });
+            var pageFactoryResult = new RazorPageFactoryResult(new CompiledViewDescriptor(), () => layout);
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            pageFactory
+                .Setup(p => p.CreateFactory(LayoutPath))
+                .Returns(pageFactoryResult);
+
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetPage(/*executingFilePath*/ null, LayoutPath))
+                .Returns(new RazorPageResult(LayoutPath, layout));
+
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            Assert.Equal(expected, viewContext.Writer.ToString());
+        }
+
+        [Fact]
+        public async Task RenderAsync_CreatesOutputBuffer()
+        {
+            // Arrange
+            TextWriter actual = null;
+            var page = new TestableRazorPage(v =>
+            {
+                actual = v.Output;
+            });
+            var view = new RazorView(
+                Mock.Of<IRazorViewEngine>(),
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+            var original = viewContext.Writer;
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            Assert.IsType<ViewBufferTextWriter>(actual);
+            Assert.NotSame(original, actual);
+        }
+
+        [Fact]
+        public async Task RenderAsync_CopiesBufferedContentToOutput()
+        {
+            // Arrange
+            var page = new TestableRazorPage(v =>
+            {
+                v.WriteLiteral("Hello world");
+            });
+            var view = new RazorView(
+                Mock.Of<IRazorViewEngine>(),
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+            var original = viewContext.Writer;
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            Assert.Equal("Hello world", original.ToString());
+        }
+
+        [Fact]
+        public async Task RenderAsync_ActivatesPages()
+        {
+            // Arrange
+            var page = new TestableRazorPage(v =>
+            {
+                v.WriteLiteral("Hello world");
+            });
+            var activator = new Mock<IRazorPageActivator>();
+            activator
+                .Setup(a => a.Activate(page, It.IsAny<ViewContext>()))
+                .Verifiable();
+            var view = new RazorView(
+                Mock.Of<IRazorViewEngine>(),
+                activator.Object,
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            activator.Verify();
+        }
+
+        [Fact]
+        public async Task RenderAsync_ExecutesViewStart()
+        {
+            // Arrange
+            var actualLayoutPath = "";
+            var layoutPath = "/Views/_Shared/_Layout.cshtml";
+            var viewStart1 = new TestableRazorPage(v =>
+            {
+                v.Layout = "/fake-layout-path";
+            });
+            var viewStart2 = new TestableRazorPage(v =>
+            {
+                v.Layout = layoutPath;
+            });
+            var page = new TestableRazorPage(v =>
+            {
+                // This path must have been set as a consequence of running viewStart
+                actualLayoutPath = v.Layout;
+                // Clear out layout so we don't render it
+                v.Layout = null;
+            });
+            var activator = new Mock<IRazorPageActivator>();
+            activator
+                .Setup(a => a.Activate(viewStart1, It.IsAny<ViewContext>()))
+                .Verifiable();
+            activator
+                .Setup(a => a.Activate(viewStart2, It.IsAny<ViewContext>()))
+                .Verifiable();
+            activator
+                .Setup(a => a.Activate(page, It.IsAny<ViewContext>()))
+                .Verifiable();
+
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(engine => engine.GetAbsolutePath(/*executingFilePath*/ null, "/fake-layout-path"))
+                .Returns("/fake-layout-path");
+            viewEngine
+                .Setup(engine => engine.GetAbsolutePath(/*executingFilePath*/ null, layoutPath))
+                .Returns(layoutPath);
+
+            var view = new RazorView(
+                viewEngine.Object,
+                activator.Object,
+                new[] { viewStart1, viewStart2 },
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            activator.Verify();
+        }
+
+        [Fact]
+        public async Task RenderAsync_ExecutesDefaultLayout()
+        {
+            // Arrange
+            var path = "/Views/Home/Index.cshtml";
+            var layoutPath = "/Views/_Shared/_Layout.cshtml";
+            var page = new TestableRazorPage(p => { })
+            {
+                Path = path,
+                // Initialize Layout property when instantiated.
+                Layout = layoutPath,
+            };
+            var layoutExecuted = false;
+            var layout = new TestableRazorPage(
+                p =>
+                {
+                    layoutExecuted = true;
+                    p.RenderBodyPublic();
+                })
+            {
+                Path = layoutPath,
+            };
+
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(engine => engine.GetPage(path, layoutPath))
+                .Returns(new RazorPageResult(layoutPath, layout));
+
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var context = CreateViewContext(view);
+
+            // Act
+            await view.RenderAsync(context);
+
+            // Assert
+            Assert.True(layoutExecuted);
+        }
+
+        [Fact]
+        public async Task RenderAsync_ExecutesDefaultLayout_WithViewStart()
+        {
+            // Arrange
+            var path = "/Views/Home/Index.cshtml";
+            var layoutPath = "/Views/_Shared/_Layout.cshtml";
+            var viewStartPath = "/Views/_ViewStart.cshtml";
+
+            var viewStart = new TestableRazorPage(p => { })
+            {
+                Path = viewStartPath,
+            };
+            var page = new TestableRazorPage(p => { })
+            {
+                Path = path,
+                // Initialize Layout property when instantiated.
+                Layout = layoutPath,
+            };
+
+            var layoutExecuted = false;
+            var layout = new TestableRazorPage(
+                p =>
+                {
+                    layoutExecuted = true;
+                    p.RenderBodyPublic();
+                })
+            {
+                Path = layoutPath,
+            };
+
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(engine => engine.GetAbsolutePath(viewStartPath, /* pagePath */ null))
+                .Returns<string>(null);
+            viewEngine
+                .Setup(engine => engine.GetPage(path, layoutPath))
+                .Returns(new RazorPageResult(layoutPath, layout));
+
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new[] { viewStart },
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var context = CreateViewContext(view);
+
+            // Act
+            await view.RenderAsync(context);
+
+            // Assert
+            Assert.True(layoutExecuted);
+        }
+
+        [Fact]
+        public async Task RenderAsync_ThrowsIfLayoutPageCannotBeFound_MessageUsesGetPageLocations()
+        {
+            // Arrange
+            var expected = string.Join(
+                Environment.NewLine,
+                "The layout view 'Does-Not-Exist-Layout' could not be located. The following locations were searched:",
+                "path1",
+                "path2");
+
+            var layoutPath = "Does-Not-Exist-Layout";
+            var page = new TestableRazorPage(v =>
+            {
+                v.Layout = layoutPath;
+            });
+
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            var activator = new Mock<IRazorPageActivator>();
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+            viewEngine
+                .Setup(v => v.GetPage(/*executingFilePath*/ null, layoutPath))
+                .Returns(new RazorPageResult(layoutPath, new[] { "path1", "path2" }))
+                .Verifiable();
+            viewEngine
+                .Setup(v => v.FindPage(viewContext, layoutPath))
+                .Returns(new RazorPageResult(layoutPath, Enumerable.Empty<string>()))
+                .Verifiable();
+
+            // Act
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => view.RenderAsync(viewContext));
+
+            // Assert
+            Assert.Equal(expected, ex.Message);
+            viewEngine.Verify();
+        }
+
+        [Fact]
+        public async Task RenderAsync_ThrowsIfLayoutPageCannotBeFound_MessageUsesFindPageLocations()
+        {
+            // Arrange
+            var expected = string.Join(
+                Environment.NewLine,
+                "The layout view 'Does-Not-Exist-Layout' could not be located. The following locations were searched:",
+                "path1",
+                "path2");
+
+            var layoutPath = "Does-Not-Exist-Layout";
+            var page = new TestableRazorPage(v =>
+            {
+                v.Layout = layoutPath;
+            });
+
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            var activator = new Mock<IRazorPageActivator>();
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+            viewEngine
+                .Setup(v => v.GetPage(/*executingFilePath*/ null, layoutPath))
+                .Returns(new RazorPageResult(layoutPath, Enumerable.Empty<string>()))
+                .Verifiable();
+            viewEngine
+                .Setup(v => v.FindPage(viewContext, layoutPath))
+                .Returns(new RazorPageResult(layoutPath, new[] { "path1", "path2" }))
+                .Verifiable();
+
+            // Act
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => view.RenderAsync(viewContext));
+
+            // Assert
+            Assert.Equal(expected, ex.Message);
+            viewEngine.Verify();
+        }
+
+        [Fact]
+        public async Task RenderAsync_ThrowsIfLayoutPageCannotBeFound_MessageUsesAllLocations()
+        {
+            // Arrange
+            var expected = string.Join(
+                Environment.NewLine,
+                "The layout view 'Does-Not-Exist-Layout' could not be located. The following locations were searched:",
+                "path1",
+                "path2",
+                "path3",
+                "path4");
+
+            var layoutPath = "Does-Not-Exist-Layout";
+            var page = new TestableRazorPage(v =>
+            {
+                v.Layout = layoutPath;
+            });
+
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            var activator = new Mock<IRazorPageActivator>();
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+            viewEngine
+                .Setup(v => v.GetPage(/*executingFilePath*/ null, layoutPath))
+                .Returns(new RazorPageResult(layoutPath, new[] { "path1", "path2" }))
+                .Verifiable();
+            viewEngine
+                .Setup(v => v.FindPage(viewContext, layoutPath))
+                .Returns(new RazorPageResult(layoutPath, new[] { "path3", "path4" }))
+                .Verifiable();
+
+            // Act
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => view.RenderAsync(viewContext));
+
+            // Assert
+            Assert.Equal(expected, ex.Message);
+            viewEngine.Verify();
+        }
+
+        [Fact]
+        public async Task RenderAsync_ExecutesLayoutPages()
+        {
+            // Arrange
+            var htmlEncoder = new HtmlTestEncoder();
+            var htmlEncodedNewLine = htmlEncoder.Encode(Environment.NewLine);
+            var expected = "HtmlEncode[[layout-content" +
+                           Environment.NewLine +
+                           "]]head-content" +
+                           htmlEncodedNewLine +
+                           "body-content" +
+                           htmlEncodedNewLine +
+                           "foot-content";
+
+            var page = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.WriteLiteral("body-content");
+                v.Layout = LayoutPath;
+                v.DefineSection("head", async () =>
+                {
+                    await v.Output.WriteAsync("head-content");
+                });
+                v.DefineSection("foot", async () =>
+                {
+                    await v.Output.WriteAsync("foot-content");
+                });
+            });
+            var layout = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Write("layout-content" + Environment.NewLine);
+                v.Write(v.RenderSection("head"));
+                v.Write(Environment.NewLine);
+                v.RenderBodyPublic();
+                v.Write(Environment.NewLine);
+                v.Write(v.RenderSection("foot"));
+            });
+            var activator = new Mock<IRazorPageActivator>();
+            activator
+                .Setup(a => a.Activate(page, It.IsAny<ViewContext>()))
+                .Verifiable();
+            activator
+                .Setup(a => a.Activate(layout, It.IsAny<ViewContext>()))
+                .Verifiable();
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetPage(/*executingFilePath*/ null, LayoutPath))
+                .Returns(new RazorPageResult(LayoutPath, layout))
+                .Verifiable();
+
+            var view = new RazorView(
+                viewEngine.Object,
+                activator.Object,
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            // Verify the activator was invoked for the primary page and layout page.
+            activator.Verify();
+            Assert.Equal(expected, viewContext.Writer.ToString());
+            viewEngine.Verify();
+        }
+
+        [Fact]
+        public async Task RenderAsync_ThrowsIfSectionsWereDefinedButNotRendered()
+        {
+            // Arrange
+            var page = new TestableRazorPage(v =>
+            {
+                v.DefineSection("head", _nullRenderAsyncDelegate);
+                v.Layout = LayoutPath;
+                v.DefineSection("foot", _nullRenderAsyncDelegate);
+            });
+            var layout = new TestableRazorPage(v =>
+            {
+                v.RenderBodyPublic();
+            })
+            {
+                Path = LayoutPath
+            };
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetPage(/*executingFilePath*/ null, LayoutPath))
+                .Returns(new RazorPageResult(LayoutPath, layout));
+
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act and Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => view.RenderAsync(viewContext));
+            Assert.Equal("The following sections have been defined but have not been rendered by the page "
+                + $"at '{LayoutPath}': 'head, foot'. To ignore an unrendered section call IgnoreSection(\"sectionName\").",
+                ex.Message);
+        }
+
+        [Fact]
+        public async Task RenderAsync_SucceedsIfNestedSectionsAreRendered()
+        {
+            // Arrange
+            var expected = string.Join(
+                Environment.NewLine,
+                "layout-section-content",
+                "page-section-content");
+
+            var htmlEncoder = new HtmlTestEncoder();
+            var page = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Layout = "~/Shared/Layout1.cshtml";
+                v.DefineSection("foo", async () =>
+                {
+                    await v.Output.WriteAsync("page-section-content");
+                });
+            });
+            var nestedLayout = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Layout = "~/Shared/Layout2.cshtml";
+                v.RenderBodyPublic();
+                v.DefineSection("foo", async () =>
+                {
+                    await v.Output.WriteLineAsync("layout-section-content");
+                    await v.RenderSectionAsync("foo");
+                });
+            })
+            {
+                Path = "/Shared/Layout1.cshtml"
+            };
+            var baseLayout = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.RenderBodyPublic();
+                v.RenderSection("foo");
+            })
+            {
+                Path = "/Shared/Layout2.cshtml"
+            };
+
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetPage(/*executingFilePath*/ null, "~/Shared/Layout1.cshtml"))
+                .Returns(new RazorPageResult("~/Shared/Layout1.cshtml", nestedLayout));
+            viewEngine
+                .Setup(v => v.GetPage("/Shared/Layout1.cshtml", "~/Shared/Layout2.cshtml"))
+                .Returns(new RazorPageResult("~/Shared/Layout2.cshtml", baseLayout));
+
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            Assert.Equal(expected, viewContext.Writer.ToString());
+        }
+
+        [Fact]
+        public async Task RenderAsync_SucceedsIfRenderBodyIsNotInvoked_ButAllSectionsAreRendered()
+        {
+            // Arrange
+            var expected = string.Join(
+                Environment.NewLine,
+                "layout-section-content",
+                "page-section-content");
+
+            var htmlEncoder = new HtmlTestEncoder();
+            var page = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Layout = "NestedLayout";
+                v.WriteLiteral("Page body content that will not be written");
+                v.DefineSection("sectionA", async () =>
+                {
+                    await v.Output.WriteAsync("page-section-content");
+                });
+            });
+            var nestedLayout = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Layout = "Layout";
+                v.WriteLiteral("Nested layout content that will not be written");
+                v.DefineSection("sectionB", async () =>
+                {
+                    await v.Output.WriteLineAsync("layout-section-content");
+                    await v.RenderSectionAsync("sectionA");
+                });
+            });
+            nestedLayout.Path = "NestedLayout";
+            var baseLayout = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.RenderSection("sectionB");
+            });
+            baseLayout.Path = "Layout";
+
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetPage(/*executingFilePath*/ null, "NestedLayout"))
+                .Returns(new RazorPageResult("NestedLayout", Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(p => p.FindPage(It.IsAny<ActionContext>(), "NestedLayout"))
+                .Returns(new RazorPageResult("NestedLayout", nestedLayout));
+            viewEngine
+                .Setup(v => v.GetPage("NestedLayout", "Layout"))
+                .Returns(new RazorPageResult("Layout", Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(p => p.FindPage(It.IsAny<ActionContext>(), "Layout"))
+                .Returns(new RazorPageResult("Layout", baseLayout));
+
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            Assert.Equal(expected, viewContext.Writer.ToString());
+        }
+
+        [Fact]
+        public async Task RenderAsync_WithNestedSections_ThrowsIfSectionsWereDefinedButNotRendered()
+        {
+            // Arrange
+            var htmlEncoder = new HtmlTestEncoder();
+            var page = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Layout = "~/Shared/Layout1.cshtml";
+                v.WriteLiteral("BodyContent");
+                v.DefineSection("foo", async () =>
+                {
+                    await v.Output.WriteLineAsync("foo-content");
+                });
+            });
+            var nestedLayout = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Layout = "~/Shared/Layout2.cshtml";
+                v.Write("NestedLayout" + Environment.NewLine);
+                v.RenderBodyPublic();
+                v.DefineSection("foo", async () =>
+                {
+                    await v.RenderSectionAsync("foo");
+                });
+            })
+            {
+                Path = "/Shared/Layout1.cshtml"
+            };
+            var baseLayout = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Write("BaseLayout" + Environment.NewLine);
+                v.RenderBodyPublic();
+            })
+            {
+                Path = "/Shared/Layout2.cshtml"
+            };
+
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetPage(/*executingFilePath*/ null, "~/Shared/Layout1.cshtml"))
+                .Returns(new RazorPageResult("~/Shared/Layout1.cshtml", nestedLayout));
+            viewEngine
+                .Setup(v => v.GetPage("/Shared/Layout1.cshtml", "~/Shared/Layout2.cshtml"))
+                .Returns(new RazorPageResult("~/Shared/Layout2.cshtml", baseLayout));
+
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act and Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => view.RenderAsync(viewContext));
+            Assert.Equal("The following sections have been defined but have not been rendered by the page at "
+                + "'/Shared/Layout1.cshtml': 'foo'. To ignore an unrendered section call IgnoreSection(\"sectionName\").",
+                ex.Message);
+        }
+
+        [Fact]
+        public async Task RenderAsync_WithNestedSectionsOfTheSameName_ThrowsIfSectionsWereDefinedButNotRendered()
+        {
+            // Arrange
+            var htmlEncoder = new HtmlTestEncoder();
+            var page = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Layout = "~/Shared/Layout1.cshtml";
+                v.WriteLiteral("BodyContent");
+                v.DefineSection("foo", async () =>
+                {
+                    await v.Output.WriteLineAsync("foo-content");
+                });
+            })
+            {
+                Path = "Page"
+            };
+
+            var nestedLayout = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Layout = "~/Shared/Layout2.cshtml";
+                v.Write("NestedLayout" + Environment.NewLine);
+                v.RenderBodyPublic();
+                v.DefineSection("foo", async () =>
+                {
+                    await v.Output.WriteLineAsync("dont-render-inner-foo");
+                });
+            })
+            {
+                Path = "/Shared/Layout1.cshtml"
+            };
+
+            var baseLayout = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Write("BaseLayout" + Environment.NewLine);
+                v.RenderBodyPublic();
+                v.RenderSection("foo");
+            })
+            {
+                Path = "/Shared/Layout2.cshtml"
+            };
+
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(p => p.GetPage("Page", "~/Shared/Layout1.cshtml"))
+                .Returns(new RazorPageResult("~/Shared/Layout1.cshtml", nestedLayout));
+            viewEngine
+                .Setup(p => p.GetPage("/Shared/Layout1.cshtml", "~/Shared/Layout2.cshtml"))
+                .Returns(new RazorPageResult("~/Shared/Layout2.cshtml", baseLayout));
+
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act and Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => view.RenderAsync(viewContext));
+            Assert.Equal("The following sections have been defined but have not been rendered by the page at " +
+                "'/Shared/Layout1.cshtml': 'foo'. To ignore an unrendered section call IgnoreSection(\"sectionName\").",
+                ex.Message);
+        }
+
+        [Fact]
+        public async Task RenderAsync_ThrowsIfBodyWasNotRendered()
+        {
+            // Arrange
+            var page = new TestableRazorPage(v =>
+            {
+                v.Layout = LayoutPath;
+            });
+            var layout = new TestableRazorPage(v =>
+            {
+            })
+            {
+                Path = LayoutPath
+            };
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(p => p.GetPage(/*executingFilePath*/ null, LayoutPath))
+                .Returns(new RazorPageResult(LayoutPath, layout));
+
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act and Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => view.RenderAsync(viewContext));
+            Assert.Equal($"RenderBody has not been called for the page at '{LayoutPath}'. To ignore call IgnoreBody().",
+                ex.Message);
+        }
+
+        [Fact]
+        public async Task RenderAsync_ExecutesNestedLayoutPages()
+        {
+            // Arrange
+            var htmlEncoder = new HtmlTestEncoder();
+            var expected = "HtmlEncode[[layout-2" +
+                           Environment.NewLine +
+                           "]]bar-content" +
+                           Environment.NewLine +
+                           "HtmlEncode[[layout-1" +
+                           Environment.NewLine +
+                           "]]foo-content" +
+                           Environment.NewLine +
+                           "body-content";
+
+            var page = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.DefineSection("foo", async () =>
+                {
+                    await v.Output.WriteLineAsync("foo-content");
+                });
+                v.Layout = "~/Shared/Layout1.cshtml";
+                v.WriteLiteral("body-content");
+            });
+            var layout1 = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Write("layout-1" + Environment.NewLine);
+                v.Write(v.RenderSection("foo"));
+                v.DefineSection("bar", () => v.Output.WriteLineAsync("bar-content"));
+                v.RenderBodyPublic();
+                v.Layout = "~/Shared/Layout2.cshtml";
+            });
+            layout1.Path = "~/Shared/Layout1.cshtml";
+
+            var layout2 = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Write("layout-2" + Environment.NewLine);
+                v.Write(v.RenderSection("bar"));
+                v.RenderBodyPublic();
+            });
+            layout2.Path = "~/Shared/Layout2.cshtml";
+
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(p => p.GetPage(/*executingFilePath*/ null, "~/Shared/Layout1.cshtml"))
+                .Returns(new RazorPageResult("~/Shared/Layout1.cshtml", layout1));
+            viewEngine
+                .Setup(p => p.GetPage("~/Shared/Layout1.cshtml", "~/Shared/Layout2.cshtml"))
+                .Returns(new RazorPageResult("~/Shared/Layout2.cshtml", layout2));
+
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            Assert.Equal(expected, viewContext.Writer.ToString());
+        }
+
+        [Fact]
+        public async Task RenderAsync_ExecutesNestedLayoutPages_WithRelativePaths()
+        {
+            // Arrange
+            var htmlEncoder = new HtmlTestEncoder();
+            var expected =
+                "HtmlEncode[[layout-2" + Environment.NewLine +
+                "]]bar-content" + Environment.NewLine +
+                "HtmlEncode[[layout-1" + Environment.NewLine +
+                "]]foo-content" + Environment.NewLine +
+                "body-content";
+
+            var page = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.DefineSection("foo", async () =>
+                {
+                    await v.Output.WriteLineAsync("foo-content");
+                });
+                v.Layout = "Layout1.cshtml";
+                v.WriteLiteral("body-content");
+            })
+            {
+                Path = "~/Shared/Page.cshtml",
+            };
+
+            var layout1 = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Write("layout-1" + Environment.NewLine);
+                v.Write(v.RenderSection("foo"));
+                v.DefineSection("bar", () => v.Output.WriteLineAsync("bar-content"));
+                v.RenderBodyPublic();
+                v.Layout = "Layout2.cshtml";
+            })
+            {
+                Path = "~/Shared/Layout1.cshtml",
+            };
+
+            var layout2 = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Write("layout-2" + Environment.NewLine);
+                v.Write(v.RenderSection("bar"));
+                v.RenderBodyPublic();
+            })
+            {
+                Path = "~/Shared/Layout2.cshtml",
+            };
+
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(p => p.GetPage("~/Shared/Page.cshtml", "Layout1.cshtml"))
+                .Returns(new RazorPageResult("~/Shared/Layout1.cshtml", layout1));
+            viewEngine
+                .Setup(p => p.GetPage("~/Shared/Layout1.cshtml", "Layout2.cshtml"))
+                .Returns(new RazorPageResult("~/Shared/Layout2.cshtml", layout2));
+
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            Assert.Equal(expected, viewContext.Writer.ToString());
+        }
+
+        [Fact]
+        public async Task RenderAsync_Throws_IfLayoutPageReferencesSelf()
+        {
+            // Arrange
+            var expectedMessage = "A circular layout reference was detected when rendering " +
+                "'Shared/Layout.cshtml'. The layout page 'Shared/Layout.cshtml' has already been rendered.";
+            var page = new TestableRazorPage(v =>
+            {
+                v.Layout = "_Layout";
+            });
+            var layout = new TestableRazorPage(v =>
+            {
+                v.Layout = "_Layout";
+                v.RenderBodyPublic();
+            });
+            layout.Path = "Shared/Layout.cshtml";
+
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(p => p.GetPage(It.IsAny<string>(), "_Layout"))
+                .Returns(new RazorPageResult("_Layout", Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(p => p.FindPage(It.IsAny<ActionContext>(), "_Layout"))
+                .Returns(new RazorPageResult("_Layout", layout));
+
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act and Assert
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => view.RenderAsync(viewContext));
+
+            // Assert
+            Assert.Equal(expectedMessage, exception.Message);
+        }
+
+        [Fact]
+        public async Task RenderAsync_Throws_IfNestedLayoutPagesResultInCyclicReferences()
+        {
+            // Arrange
+            var expectedMessage = "A circular layout reference was detected when rendering " +
+                "'/Shared/Layout2.cshtml'. The layout page 'Shared/_Layout.cshtml' has already been rendered.";
+            var page = new TestableRazorPage(v =>
+            {
+                v.Layout = "_Layout";
+            });
+            var layout1 = new TestableRazorPage(v =>
+            {
+                v.Layout = "_Layout2";
+                v.RenderBodyPublic();
+            });
+            layout1.Path = "Shared/_Layout.cshtml";
+
+            var layout2 = new TestableRazorPage(v =>
+            {
+                v.Layout = "_Layout";
+                v.RenderBodyPublic();
+            });
+            layout2.Path = "/Shared/Layout2.cshtml";
+
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(p => p.GetPage(It.IsAny<string>(), "_Layout"))
+                .Returns(new RazorPageResult("_Layout1", Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(p => p.FindPage(It.IsAny<ActionContext>(), "_Layout"))
+                .Returns(new RazorPageResult("_Layout", layout1));
+            viewEngine
+                .Setup(p => p.GetPage("Shared/_Layout.cshtml", "_Layout2"))
+                .Returns(new RazorPageResult("_Layout2", Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(p => p.FindPage(It.IsAny<ActionContext>(), "_Layout2"))
+                .Returns(new RazorPageResult("_Layout2", layout2));
+
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act and Assert
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => view.RenderAsync(viewContext));
+
+            // Assert
+            Assert.Equal(expectedMessage, exception.Message);
+        }
+
+        [Fact]
+        public async Task RenderAsync_ExecutesNestedLayoutsWithNestedSections()
+        {
+            // Arrange
+            var htmlEncoder = new HtmlTestEncoder();
+            var expected = "HtmlEncode[[BaseLayout" +
+                           Environment.NewLine +
+                           "]]HtmlEncode[[NestedLayout" +
+                           Environment.NewLine +
+                           "]]BodyContent" +
+                           "foo-content" +
+                           Environment.NewLine +
+                           Environment.NewLine;
+
+            var page = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Layout = "~/Shared/Layout1.cshtml";
+                v.WriteLiteral("BodyContent");
+                v.DefineSection("foo", async () =>
+                {
+                    await v.Output.WriteLineAsync("foo-content");
+                });
+            });
+            var nestedLayout = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Layout = "~/Shared/Layout2.cshtml";
+                v.Write("NestedLayout" + Environment.NewLine);
+                v.RenderBodyPublic();
+                v.DefineSection("foo", async () =>
+                {
+                    await v.Output.WriteLineAsync(htmlEncoder.Encode(v.RenderSection("foo").ToString()));
+                });
+            });
+            nestedLayout.Path = "~/Shared/Layout1.cshtml";
+
+            var baseLayout = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Write("BaseLayout" + Environment.NewLine);
+                v.RenderBodyPublic();
+                v.Write(v.RenderSection("foo"));
+            });
+            baseLayout.Path = "~/Shared/Layout2.cshtml";
+
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(p => p.GetPage(/*executingFilePath*/ null, "~/Shared/Layout1.cshtml"))
+                .Returns(new RazorPageResult("~/Shared/Layout1.cshtml", nestedLayout));
+            viewEngine
+                .Setup(p => p.GetPage("~/Shared/Layout1.cshtml", "~/Shared/Layout2.cshtml"))
+                .Returns(new RazorPageResult("~/Shared/Layout2.cshtml", baseLayout));
+
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            Assert.Equal(expected, viewContext.Writer.ToString());
+        }
+
+        [Fact]
+        public async Task RenderAsync_DoesNotCopyContentOnceRazorTextWriterIsNoLongerBuffering()
+        {
+            // Arrange
+            var htmlEncoder = new HtmlTestEncoder();
+            var expected = "HtmlEncode[[layout-1" +
+                           Environment.NewLine +
+                           "]]body content" +
+                           Environment.NewLine +
+                           "section-content-1" +
+                           Environment.NewLine +
+                           "section-content-2";
+
+            var page = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Layout = "layout-1";
+                v.WriteLiteral("body content" + Environment.NewLine);
+                v.DefineSection("foo", async () =>
+                {
+                    v.WriteLiteral("section-content-1" + Environment.NewLine);
+                    await v.FlushAsync();
+                    v.WriteLiteral("section-content-2");
+                });
+            });
+
+            var layout1 = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Write("layout-1" + Environment.NewLine);
+                v.RenderBodyPublic();
+                v.Write(v.RenderSection("foo"));
+            });
+
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(p => p.GetPage(/*executingFilePath*/ null, "layout-1"))
+                .Returns(new RazorPageResult("layout-1", Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(p => p.FindPage(It.IsAny<ActionContext>(), "layout-1"))
+                .Returns(new RazorPageResult("layout-1", layout1));
+
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            Assert.Equal(expected, viewContext.Writer.ToString());
+        }
+
+        [Fact]
+        public async Task FlushAsync_DoesNotThrowWhenInvokedInsideOfASection()
+        {
+            // Arrange
+            var htmlEncoder = new HtmlTestEncoder();
+            var expected = "HtmlEncode[[layout-1" +
+                           Environment.NewLine +
+                           "]]section-content-1" +
+                           Environment.NewLine +
+                           "section-content-2";
+
+            var page = new TestableRazorPage(v =>
+           {
+               v.HtmlEncoder = htmlEncoder;
+               v.Layout = "layout-1";
+               v.DefineSection("foo", async () =>
+               {
+                   v.WriteLiteral("section-content-1" + Environment.NewLine);
+                   await v.FlushAsync();
+                   v.WriteLiteral("section-content-2");
+               });
+           });
+
+            var layout1 = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = htmlEncoder;
+                v.Write("layout-1" + Environment.NewLine);
+                v.RenderBodyPublic();
+                v.Write(v.RenderSection("foo"));
+            });
+
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(p => p.GetPage(/*executingFilePath*/ null, "layout-1"))
+                .Returns(new RazorPageResult("layout-1", Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(p => p.FindPage(It.IsAny<ActionContext>(), "layout-1"))
+                .Returns(new RazorPageResult("layout-1", layout1));
+
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            Assert.Equal(expected, viewContext.Writer.ToString());
+        }
+
+        [Fact]
+        public async Task RenderAsync_ThrowsIfLayoutIsSpecifiedWhenNotBuffered()
+        {
+            // Arrange
+            var expected = "Layout page '/Views/TestPath/Test.cshtml' cannot be rendered" +
+                " after 'FlushAsync' has been invoked.";
+            var page = new TestableRazorPage(v =>
+            {
+                v.Path = "/Views/TestPath/Test.cshtml";
+                v.WriteLiteral("before-flush" + Environment.NewLine);
+                v.FlushAsync().Wait();
+                v.Layout = "test-layout";
+                v.WriteLiteral("after-flush");
+            });
+
+            var view = new RazorView(
+                Mock.Of<IRazorViewEngine>(),
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act and Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => view.RenderAsync(viewContext));
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public async Task RenderAsync_ThrowsIfFlushWasInvokedInsideRenderedSectionAndLayoutWasSet()
+        {
+            // Arrange
+            var expected = "Layout page '/Views/TestPath/Test.cshtml' cannot be rendered" +
+                " after 'FlushAsync' has been invoked.";
+            var page = new TestableRazorPage(v =>
+            {
+                v.Path = "/Views/TestPath/Test.cshtml";
+                v.HtmlEncoder = new HtmlTestEncoder();
+                v.DefineSection("foo", async () =>
+                {
+                    v.Output.WriteLine("foo-content");
+                    await v.FlushAsync();
+                });
+                v.Layout = "~/Shared/Layout1.cshtml";
+                v.WriteLiteral("body-content");
+            });
+            var layoutPage = new TestableRazorPage(v =>
+            {
+                v.HtmlEncoder = new HtmlTestEncoder();
+                v.Write("layout-1" + Environment.NewLine);
+                v.Write(v.RenderSection("foo"));
+                v.DefineSection("bar", () => v.Output.WriteLineAsync("bar-content"));
+                v.RenderBodyPublic();
+                v.Layout = "~/Shared/Layout2.cshtml";
+            });
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            var layoutPath = "~/Shared/Layout1.cshtml";
+            viewEngine
+                .Setup(p => p.GetPage("/Views/TestPath/Test.cshtml", layoutPath))
+                .Returns(new RazorPageResult(layoutPath, layoutPage));
+
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new IRazorPage[0],
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act and Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => view.RenderAsync(viewContext));
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public async Task RenderAsync_CopiesLayoutPropertyFromViewStart()
+        {
+            // Arrange
+            var expectedViewStart = "Layout1";
+            var expectedPage = "Layout2";
+            string actualViewStart = null;
+            string actualPage = null;
+            var page = new TestableRazorPage(v =>
+            {
+                actualPage = v.Layout;
+                // Clear it out because we don't care about rendering the layout in this test.
+                v.Layout = null;
+            });
+            var viewStart1 = new TestableRazorPage(v =>
+            {
+                v.Layout = expectedViewStart;
+            });
+            var viewStart2 = new TestableRazorPage(v =>
+            {
+                actualViewStart = v.Layout;
+                v.Layout = expectedPage;
+            });
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(engine => engine.GetAbsolutePath(/*executingFilePath*/ null, expectedViewStart))
+                .Returns(expectedViewStart);
+            viewEngine
+                .Setup(engine => engine.GetAbsolutePath(/*executingFilePath*/ null, expectedPage))
+                .Returns(expectedPage);
+
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new[] { viewStart1, viewStart2 },
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            Assert.Equal(expectedViewStart, actualViewStart);
+            Assert.Equal(expectedPage, actualPage);
+        }
+
+        [Fact]
+        public async Task RenderAsync_CopiesLayoutPropertyFromViewStart_WithRelativePaths()
+        {
+            // Arrange
+            var expectedViewStart = "~/_Layout.cshtml";
+            var expectedPage = "~/Home/_Layout.cshtml";
+            string actualViewStart = null;
+            string actualPage = null;
+            var page = new TestableRazorPage(v =>
+            {
+                actualPage = v.Layout;
+
+                // Clear it out because we don't care about rendering the layout in this test.
+                v.Layout = null;
+            });
+
+            var viewStart1 = new TestableRazorPage(v =>
+            {
+                v.Layout = "_Layout.cshtml";
+            })
+            {
+                Path = "~/_ViewStart.cshtml",
+            };
+
+            var viewStart2 = new TestableRazorPage(v =>
+            {
+                actualViewStart = v.Layout;
+                v.Layout = "_Layout.cshtml";
+            })
+            {
+                Path = "~/Home/_ViewStart.cshtml",
+            };
+
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(engine => engine.GetAbsolutePath("~/_ViewStart.cshtml", "_Layout.cshtml"))
+                .Returns("~/_Layout.cshtml");
+            viewEngine
+                .Setup(engine => engine.GetAbsolutePath("~/Home/_ViewStart.cshtml", "_Layout.cshtml"))
+                .Returns("~/Home/_Layout.cshtml");
+
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new[] { viewStart1, viewStart2 },
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            Assert.Equal(expectedViewStart, actualViewStart);
+            Assert.Equal(expectedPage, actualPage);
+        }
+
+        [Fact]
+        public async Task ResettingLayout_InViewStartCausesItToBeResetInPage()
+        {
+            // Arrange
+            var expected = "Layout";
+            string actual = null;
+
+            var page = new TestableRazorPage(v =>
+            {
+                Assert.Null(v.Layout);
+            });
+            var viewStart1 = new TestableRazorPage(v =>
+            {
+                v.Layout = expected;
+            });
+            var viewStart2 = new TestableRazorPage(v =>
+            {
+                actual = v.Layout;
+                v.Layout = null;
+            });
+            var viewEngine = new Mock<IRazorViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(engine => engine.GetAbsolutePath(/*executingFilePath*/ null, "Layout"))
+                .Returns("Layout");
+            viewEngine
+                .Setup(engine => engine.GetAbsolutePath(/*executingFilePath*/ null, /*pagePath*/ null))
+                .Returns<string>(null);
+
+            var view = new RazorView(
+                viewEngine.Object,
+                Mock.Of<IRazorPageActivator>(),
+                new[] { viewStart1, viewStart2 },
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public async Task RenderAsync_RendersViewStartsInOrderInWhichTheyAreSpecified()
+        {
+            // Arrange
+            var expected = string.Join(
+                Environment.NewLine,
+                new[]
+                {
+                    "ViewStart1",
+                    "ViewStart2",
+                    "Page",
+                });
+            var page = new TestableRazorPage(v =>
+            {
+                v.WriteLiteral("Page");
+            });
+            var viewStart1 = new TestableRazorPage(v =>
+            {
+                v.WriteLiteral("ViewStart1" + Environment.NewLine);
+            });
+            var viewStart2 = new TestableRazorPage(v =>
+            {
+                v.WriteLiteral("ViewStart2" + Environment.NewLine);
+            });
+            var viewEngine = Mock.Of<IRazorViewEngine>();
+
+            var view = new RazorView(
+                viewEngine,
+                Mock.Of<IRazorPageActivator>(),
+                new[] { viewStart1, viewStart2 },
+                page,
+                new HtmlTestEncoder(),
+                new DiagnosticListener("Microsoft.AspNetCore.Mvc.Razor"));
+            var viewContext = CreateViewContext(view);
+
+            // Act
+            await view.RenderAsync(viewContext);
+
+            // Assert
+            Assert.Equal(expected, viewContext.Writer.ToString());
+        }
+
+        private static ViewContext CreateViewContext(RazorView view)
+        {
+            var httpContext = new DefaultHttpContext();
+            var serviceProvider = new ServiceCollection()
+                .AddScoped<IViewBufferScope, TestViewBufferScope>()
+                .BuildServiceProvider();
+            httpContext.RequestServices = serviceProvider;
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            return new ViewContext(
+                actionContext,
+                view,
+                new ViewDataDictionary(new EmptyModelMetadataProvider(), new ModelStateDictionary()),
+                Mock.Of<ITempDataDictionary>(),
+                new StringWriter(),
+                new HtmlHelperOptions());
+        }
+
+        public class TestableRazorPageForDiagnostics : RazorPage
+        {
+            private readonly Action<TestableRazorPageForDiagnostics> _executeAction;
+
+            public TestableRazorPageForDiagnostics(Action<TestableRazorPageForDiagnostics> executeAction)
+            {
+                _executeAction = executeAction;
+                HtmlEncoder = new HtmlTestEncoder();
+            }
+
+            public void RenderBodyPublic()
+            {
+                Write(RenderBody());
+            }
+
+            public override Task ExecuteAsync()
+            {
+                _executeAction(this);
+                return Task.FromResult(0);
+            }
+        }
+
+        private class TestableRazorPage : RazorPage
+        {
+            private readonly Action<TestableRazorPage> _executeAction;
+
+            public TestableRazorPage(Action<TestableRazorPage> executeAction)
+            {
+                _executeAction = executeAction;
+                HtmlEncoder = new HtmlTestEncoder();
+            }
+
+            public void RenderBodyPublic()
+            {
+                Write(RenderBody());
+            }
+
+            public override Task ExecuteAsync()
+            {
+                _executeAction(this);
+                return Task.FromResult(0);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/TagHelperComponentPropertyActivatorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/TagHelperComponentPropertyActivatorTest.cs
new file mode 100644
index 0000000000..37fe160c56
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/TagHelperComponentPropertyActivatorTest.cs
@@ -0,0 +1,63 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers
+{
+    public class TagHelperComponentPropertyActivatorTest
+    {
+        [Fact]
+        public void Activate_InitializesViewContext()
+        {
+            // Arrange
+            var tagHelperComponent = new TestTagHelperComponent();
+            var viewContext = CreateViewContext();
+
+            var propertyActivator = new TagHelperComponentPropertyActivator();
+
+            // Act
+            propertyActivator.Activate(viewContext, tagHelperComponent);
+
+            // Assert
+            Assert.Same(viewContext, tagHelperComponent.ViewContext);
+        }
+
+        private class TestTagHelperComponent : ITagHelperComponent
+        {
+            public int Order => 1;
+
+            [ViewContext]
+            public ViewContext ViewContext { get; set; }
+
+            public void Init(TagHelperContext context)
+            {
+            }
+
+            public Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+            {
+                return Task.CompletedTask;
+            }
+        }
+
+        private static ViewContext CreateViewContext()
+        {
+            var httpContext = new DefaultHttpContext()
+            {
+                RequestServices = new ServiceCollection()
+                .AddSingleton<ITagHelperComponentPropertyActivator>(new TagHelperComponentPropertyActivator())
+                .BuildServiceProvider()
+            };
+
+            var viewContext = Mock.Of<ViewContext>(vc => vc.HttpContext == httpContext);
+            return viewContext;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/TagHelperComponentTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/TagHelperComponentTagHelperTest.cs
new file mode 100644
index 0000000000..660c548cf1
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/TagHelperComponentTagHelperTest.cs
@@ -0,0 +1,405 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Logging.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers
+{
+    public class TagHelperComponentTagHelperTest
+    {
+        [Fact]
+        public void Init_InvokesComponentsInitInCorrectOrder()
+        {
+            // Arrange
+            var tagHelperContext = new TagHelperContext(
+                "head",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            var incrementer = 0;
+            var testTagHelperComponentManager = new TagHelperComponentManager(new[]
+            {
+                new CallbackTagHelperComponent(
+                    order: 2,
+                    initCallback: () =>
+                    {
+                        Assert.Equal(1, incrementer);
+                        incrementer++;
+                    },
+                    processAsyncCallback: null),
+                new CallbackTagHelperComponent(
+                    order: 3,
+                    initCallback: () =>
+                    {
+                        Assert.Equal(2, incrementer);
+                        incrementer++;
+                    },
+                    processAsyncCallback: null),
+                new CallbackTagHelperComponent(
+                    order: 1,
+                    initCallback: () =>
+                    {
+                        Assert.Equal(0, incrementer);
+                        incrementer++;
+                    },
+                    processAsyncCallback: null),
+            });
+
+            var testTagHelperComponentTagHelper = new TestTagHelperComponentTagHelper(testTagHelperComponentManager, NullLoggerFactory.Instance);
+
+            // Act
+            testTagHelperComponentTagHelper.Init(tagHelperContext);
+
+            // Assert
+            Assert.Equal(3, incrementer);
+        }
+
+        [Fact]
+        public async void ProcessAsync_InvokesComponentsProcessAsyncInCorrectOrder()
+        {
+            // Arrange
+            var tagHelperContext = new TagHelperContext(
+                "head",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            var output = new TagHelperOutput(
+                "head",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+
+            var incrementer = 0;
+            var testTagHelperComponentManager = new TagHelperComponentManager(new[]
+            {
+                new CallbackTagHelperComponent(
+                    order: 2,
+                    initCallback: () => { },
+                    processAsyncCallback: () =>
+                    {
+                        Assert.Equal(1, incrementer);
+                        incrementer++;
+                    }),
+                new CallbackTagHelperComponent(
+                    order: 3,
+                    initCallback: () => { },
+                    processAsyncCallback: () =>
+                    {
+                        Assert.Equal(2, incrementer);
+                        incrementer++;
+                    }),
+                new CallbackTagHelperComponent(
+                    order: 1,
+                    initCallback: () => { },
+                    processAsyncCallback: () =>
+                    {
+                        Assert.Equal(0, incrementer);
+                        incrementer++;
+                    }),
+            });
+
+            var testTagHelperComponentTagHelper = new TestTagHelperComponentTagHelper(testTagHelperComponentManager, NullLoggerFactory.Instance);
+
+            // Act
+            testTagHelperComponentTagHelper.Init(tagHelperContext);
+            await testTagHelperComponentTagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal(3, incrementer);
+        }
+
+        [Fact]
+        public void Init_InvokesTagHelperComponentInit()
+        {
+            // Arrange
+            var tagHelperContext = new TagHelperContext(
+                "head",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            var output = new TagHelperOutput(
+                "head",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+
+            var testTagHelperComponentManager = new TagHelperComponentManager(new[]
+            {
+                new TestTagHelperComponent()
+            });
+
+            var testTagHelperComponentTagHelper = new TestTagHelperComponentTagHelper(testTagHelperComponentManager, NullLoggerFactory.Instance);
+
+            // Act
+            testTagHelperComponentTagHelper.Init(tagHelperContext);
+
+            // Assert
+            Assert.Equal("Value", tagHelperContext.Items["Key"]);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_InvokesTagHelperComponentProcessAsync()
+        {
+            // Arrange
+            var tagHelperContext = new TagHelperContext(
+                "head",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            var output = new TagHelperOutput(
+                "head",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+
+            var testTagHelperComponentManager = new TagHelperComponentManager(new[]
+            {
+                new TestTagHelperComponent()
+            });
+
+            var testTagHelperComponentTagHelper = new TestTagHelperComponentTagHelper(testTagHelperComponentManager, NullLoggerFactory.Instance);
+
+            // Act
+            await testTagHelperComponentTagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal("Processed1", output.PostContent.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_InvokesTagHelperComponentProcessAsync_WithAddedTagHelperComponents()
+        {
+            // Arrange
+            var tagHelperContext = new TagHelperContext(
+                "head",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            var output = new TagHelperOutput(
+                "head",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+
+            var testTagHelperComponentManager = new TagHelperComponentManager(new[]
+            {
+                new TestTagHelperComponent()
+            });
+
+            testTagHelperComponentManager.Components.Add(new TestAddTagHelperComponent(0));
+            testTagHelperComponentManager.Components.Add(new TestAddTagHelperComponent(2));
+            var testTagHelperComponentTagHelper = new TestTagHelperComponentTagHelper(testTagHelperComponentManager, NullLoggerFactory.Instance);
+
+            // Act
+            await testTagHelperComponentTagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal("Processed0Processed1Processed2", output.PostContent.GetContent());
+        }
+
+        [Fact]
+        public void Init_LogsTagHelperComponentInitialized()
+        {
+            // Arrange
+            var sink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
+            var tagHelperContext = new TagHelperContext(
+                "head",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            var output = new TagHelperOutput(
+                "head",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+
+            var testTagHelperComponentManager = new TagHelperComponentManager(new[]
+            {
+                new TestTagHelperComponent()
+            });
+
+            var testTagHelperComponentTagHelper = new TestTagHelperComponentTagHelper(testTagHelperComponentManager, loggerFactory);
+
+            // Act
+            testTagHelperComponentTagHelper.Init(tagHelperContext);
+
+            // Assert
+            Assert.Equal($"Tag helper component '{typeof(TestTagHelperComponent)}' initialized.", sink.Writes.First().State.ToString(), StringComparer.Ordinal);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_LogsTagHelperComponentProcessed()
+        {
+            // Arrange
+            var sink = new TestSink();
+            var loggerFactory = new TestLoggerFactory(sink, enabled: true);
+            var tagHelperContext = new TagHelperContext(
+                "head",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            var output = new TagHelperOutput(
+                "head",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+
+            var testTagHelperComponentManager = new TagHelperComponentManager(new[]
+            {
+                new TestTagHelperComponent()
+            });
+
+            var testTagHelperComponentTagHelper = new TestTagHelperComponentTagHelper(testTagHelperComponentManager, loggerFactory);
+
+            // Act
+            await testTagHelperComponentTagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal($"Tag helper component '{typeof(TestTagHelperComponent)}' processed.", sink.Writes.First().State.ToString(), StringComparer.Ordinal);
+        }
+
+        [Fact]
+        public void Init_GetsTagHelperComponentPropertyActivator_FromRequestServices()
+        {
+            // Arrange
+            var tagHelperContext = new TagHelperContext(
+                "head",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            var testTagHelperComponentManager = new TagHelperComponentManager(new[]
+            {
+                new TestTagHelperComponent()
+            });
+
+            var testTagHelperComponentTagHelper = new TestTagHelperComponentTagHelper(
+                testTagHelperComponentManager,
+                NullLoggerFactory.Instance);
+
+            // Act
+            testTagHelperComponentTagHelper.Init(tagHelperContext);
+
+            // Assert
+            Assert.NotNull(testTagHelperComponentTagHelper.PropertyActivator);
+        }
+
+        private class TestTagHelperComponentTagHelper : TagHelperComponentTagHelper
+        {
+            public TestTagHelperComponentTagHelper(
+                ITagHelperComponentManager manager,
+                ILoggerFactory loggerFactory)
+                : base(manager, loggerFactory)
+            {
+                ViewContext = CreateViewContext();
+            }
+        }
+
+        private class CallbackTagHelperComponent : ITagHelperComponent
+        {
+            private readonly Action _initCallback;
+            private readonly Action _processAsyncCallback;
+            private readonly int _order;
+
+            public CallbackTagHelperComponent(int order, Action initCallback, Action processAsyncCallback)
+            {
+                _initCallback = initCallback;
+                _processAsyncCallback = processAsyncCallback;
+                _order = order;
+            }
+
+            public int Order => _order;
+
+            public void Init(TagHelperContext context)
+            {
+                _initCallback();
+            }
+
+            public Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+            {
+                _processAsyncCallback();
+                return Task.CompletedTask;
+            }
+        }
+
+        private class TestTagHelperComponent : ITagHelperComponent
+        {
+            public int Order => 1;
+
+            public void Init(TagHelperContext context)
+            {
+                context.Items["Key"] = "Value";
+            }
+
+            public Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+            {
+                output.PostContent.AppendHtml("Processed1");
+                return Task.CompletedTask;
+            }
+        }
+
+        private class TestAddTagHelperComponent : ITagHelperComponent
+        {
+            private int _order;
+
+            public TestAddTagHelperComponent(int order)
+            {
+                _order = order;
+            }
+
+            public int Order => _order;
+
+            public void Init(TagHelperContext context)
+            {
+            }
+
+            public Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+            {
+                output.PostContent.AppendHtml("Processed" + Order);
+                return Task.CompletedTask;
+            }
+        }
+
+        private static ViewContext CreateViewContext()
+        {
+            var httpContext = new DefaultHttpContext()
+            {
+                RequestServices = new ServiceCollection()
+                .AddSingleton<ITagHelperComponentPropertyActivator>(new TagHelperComponentPropertyActivator())
+                .BuildServiceProvider()
+            };
+
+            var viewContext = Mock.Of<ViewContext>(vc => vc.HttpContext == httpContext);
+            return viewContext;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/UrlResolutionTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/UrlResolutionTagHelperTest.cs
new file mode 100644
index 0000000000..84db2e9a8e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/UrlResolutionTagHelperTest.cs
@@ -0,0 +1,349 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers
+{
+    public class UrlResolutionTagHelperTest
+    {
+        public static TheoryData ResolvableUrlData
+        {
+            get
+            {
+                // url, expectedHref
+                return new TheoryData<string, string>
+                {
+                   { "~/home/index.html", "/approot/home/index.html" },
+                   { "  ~/home/index.html", "/approot/home/index.html" },
+                   {
+                        "~/home/index.html ~/secondValue/index.html",
+                        "/approot/home/index.html ~/secondValue/index.html"
+                   },
+                };
+            }
+        }
+
+        [Fact]
+        public void Process_DoesNothingIfTagNameIsNull()
+        {
+            // Arrange
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: null,
+                attributes: new TagHelperAttributeList
+                {
+                    { "href", "~/home/index.html" }
+                },
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(null));
+
+            var tagHelper = new UrlResolutionTagHelper(Mock.Of<IUrlHelperFactory>(), new HtmlTestEncoder());
+            var context = new TagHelperContext(
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act
+            tagHelper.Process(context, tagHelperOutput);
+
+            // Assert
+            var attribute = Assert.Single(tagHelperOutput.Attributes);
+            Assert.Equal("href", attribute.Name, StringComparer.Ordinal);
+            var attributeValue = Assert.IsType<string>(attribute.Value);
+            Assert.Equal("~/home/index.html", attributeValue, StringComparer.Ordinal);
+        }
+
+        [Theory]
+        [MemberData(nameof(ResolvableUrlData))]
+        public void Process_ResolvesTildeSlashValues(string url, string expectedHref)
+        {
+            // Arrange
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "a",
+                attributes: new TagHelperAttributeList
+                {
+                    { "href", url }
+                },
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(null));
+            var urlHelperMock = new Mock<IUrlHelper>();
+            urlHelperMock
+                .Setup(urlHelper => urlHelper.Content(It.IsAny<string>()))
+                .Returns(new Func<string, string>(value => "/approot" + value.Substring(1)));
+            var urlHelperFactory = new Mock<IUrlHelperFactory>();
+            urlHelperFactory
+                .Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>()))
+                .Returns(urlHelperMock.Object);
+            var tagHelper = new UrlResolutionTagHelper(urlHelperFactory.Object, new HtmlTestEncoder());
+
+            var context = new TagHelperContext(
+                tagName: "a",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act
+            tagHelper.Process(context, tagHelperOutput);
+
+            // Assert
+            var attribute = Assert.Single(tagHelperOutput.Attributes);
+            Assert.Equal("href", attribute.Name, StringComparer.Ordinal);
+            var attributeValue = Assert.IsType<string>(attribute.Value);
+            Assert.Equal(expectedHref, attributeValue, StringComparer.Ordinal);
+            Assert.Equal(HtmlAttributeValueStyle.DoubleQuotes, attribute.ValueStyle);
+        }
+
+        public static TheoryData ResolvableUrlHtmlStringData
+        {
+            get
+            {
+                // url, expectedHref
+                return new TheoryData<HtmlString, string>
+                {
+                   { new HtmlString("~/home/index.html"), "HtmlEncode[[/approot/]]home/index.html" },
+                   { new HtmlString("  ~/home/index.html"), "HtmlEncode[[/approot/]]home/index.html" },
+                   {
+                        new HtmlString("~/home/index.html ~/secondValue/index.html"),
+                        "HtmlEncode[[/approot/]]home/index.html ~/secondValue/index.html"
+                   },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ResolvableUrlHtmlStringData))]
+        public void Process_ResolvesTildeSlashValues_InHtmlString(object url, string expectedHref)
+        {
+            // Arrange
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "a",
+                attributes: new TagHelperAttributeList
+                {
+                    { "href", url }
+                },
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(null));
+            var urlHelperMock = new Mock<IUrlHelper>();
+            urlHelperMock
+                .Setup(urlHelper => urlHelper.Content(It.IsAny<string>()))
+                .Returns(new Func<string, string>(value => "/approot" + value.Substring(1)));
+            var urlHelperFactory = new Mock<IUrlHelperFactory>();
+            urlHelperFactory
+                .Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>()))
+                .Returns(urlHelperMock.Object);
+            var tagHelper = new UrlResolutionTagHelper(urlHelperFactory.Object, new HtmlTestEncoder());
+
+            var context = new TagHelperContext(
+                tagName: "a",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act
+            tagHelper.Process(context, tagHelperOutput);
+
+            // Assert
+            var attribute = Assert.Single(tagHelperOutput.Attributes);
+            Assert.Equal("href", attribute.Name, StringComparer.Ordinal);
+            var htmlContent = Assert.IsAssignableFrom<IHtmlContent>(attribute.Value);
+            Assert.Equal(expectedHref, HtmlContentUtilities.HtmlContentToString(htmlContent), StringComparer.Ordinal);
+            Assert.Equal(HtmlAttributeValueStyle.DoubleQuotes, attribute.ValueStyle);
+        }
+
+        public static TheoryData UnresolvableUrlData
+        {
+            get
+            {
+                // url
+                return new TheoryData<string>
+                {
+                   { "/home/index.html" },
+                   { "~ /home/index.html" },
+                   { "/home/index.html ~/second/wontresolve.html" },
+                   { "  ~\\home\\index.html" },
+                   { "~\\/home/index.html" },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(UnresolvableUrlData))]
+        public void Process_DoesNotResolveNonTildeSlashValues(string url)
+        {
+            // Arrange
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "a",
+                attributes: new TagHelperAttributeList
+                {
+                    { "href", url }
+                },
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(null));
+            var urlHelperMock = new Mock<IUrlHelper>();
+            urlHelperMock
+                .Setup(urlHelper => urlHelper.Content(It.IsAny<string>()))
+                .Returns("approot/home/index.html");
+            var urlHelperFactory = new Mock<IUrlHelperFactory>();
+            urlHelperFactory
+                .Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>()))
+                .Returns(urlHelperMock.Object);
+            var tagHelper = new UrlResolutionTagHelper(urlHelperFactory.Object, new HtmlTestEncoder());
+
+            var context = new TagHelperContext(
+                tagName: "a",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act
+            tagHelper.Process(context, tagHelperOutput);
+
+            // Assert
+            var attribute = Assert.Single(tagHelperOutput.Attributes);
+            Assert.Equal("href", attribute.Name, StringComparer.Ordinal);
+            var attributeValue = Assert.IsType<string>(attribute.Value);
+            Assert.Equal(url, attributeValue, StringComparer.Ordinal);
+            Assert.Equal(HtmlAttributeValueStyle.DoubleQuotes, attribute.ValueStyle);
+        }
+
+        public static TheoryData UnresolvableUrlHtmlStringData
+        {
+            get
+            {
+                // url
+                return new TheoryData<HtmlString>
+                {
+                   { new HtmlString("/home/index.html") },
+                   { new HtmlString("~ /home/index.html") },
+                   { new HtmlString("/home/index.html ~/second/wontresolve.html") },
+                   { new HtmlString("~\\home\\index.html") },
+                   { new HtmlString("~\\/home/index.html") },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(UnresolvableUrlHtmlStringData))]
+        public void Process_DoesNotResolveNonTildeSlashValues_InHtmlString(HtmlString url)
+        {
+            // Arrange
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "a",
+                attributes: new TagHelperAttributeList
+                {
+                    { "href", url }
+                },
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(null));
+            var urlHelperMock = new Mock<IUrlHelper>();
+            urlHelperMock
+                .Setup(urlHelper => urlHelper.Content(It.IsAny<string>()))
+                .Returns("approot/home/index.html");
+            var urlHelperFactory = new Mock<IUrlHelperFactory>();
+            urlHelperFactory
+                .Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>()))
+                .Returns(urlHelperMock.Object);
+            var tagHelper = new UrlResolutionTagHelper(urlHelperFactory.Object, new HtmlTestEncoder());
+
+            var context = new TagHelperContext(
+                tagName: "a",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act
+            tagHelper.Process(context, tagHelperOutput);
+
+            // Assert
+            var attribute = Assert.Single(tagHelperOutput.Attributes);
+            Assert.Equal("href", attribute.Name, StringComparer.Ordinal);
+            var attributeValue = Assert.IsType<HtmlString>(attribute.Value);
+            Assert.Equal(url.ToString(), attributeValue.ToString(), StringComparer.Ordinal);
+            Assert.Equal(HtmlAttributeValueStyle.DoubleQuotes, attribute.ValueStyle);
+        }
+
+        [Fact]
+        public void Process_IgnoresNonHtmlStringOrStringValues()
+        {
+            // Arrange
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "a",
+                attributes: new TagHelperAttributeList
+                {
+                    { "href", true }
+                },
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(null));
+            var tagHelper = new UrlResolutionTagHelper(urlHelperFactory: null, htmlEncoder: null);
+
+            var context = new TagHelperContext(
+                tagName: "a",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act
+            tagHelper.Process(context, tagHelperOutput);
+
+            // Assert
+            var attribute = Assert.Single(tagHelperOutput.Attributes);
+            Assert.Equal("href", attribute.Name, StringComparer.Ordinal);
+            Assert.True(Assert.IsType<bool>(attribute.Value));
+            Assert.Equal(HtmlAttributeValueStyle.DoubleQuotes, attribute.ValueStyle);
+        }
+
+        [Fact]
+        public void Process_ThrowsWhenEncodingNeededAndIUrlHelperActsUnexpectedly()
+        {
+            // Arrange
+            var relativeUrl = "~/home/index.html";
+            var expectedExceptionMessage = Resources.FormatCouldNotResolveApplicationRelativeUrl_TagHelper(
+                relativeUrl,
+                nameof(IUrlHelper),
+                nameof(IUrlHelper.Content),
+                "removeTagHelper",
+                typeof(UrlResolutionTagHelper).FullName,
+                typeof(UrlResolutionTagHelper).GetTypeInfo().Assembly.GetName().Name);
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "a",
+                attributes: new TagHelperAttributeList
+                {
+                    { "href", new HtmlString(relativeUrl) }
+                },
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(null));
+            var urlHelperMock = new Mock<IUrlHelper>();
+            urlHelperMock
+                .Setup(urlHelper => urlHelper.Content(It.IsAny<string>()))
+                .Returns("UnexpectedResult");
+            var urlHelperFactory = new Mock<IUrlHelperFactory>();
+            urlHelperFactory
+                .Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>()))
+                .Returns(urlHelperMock.Object);
+            var tagHelper = new UrlResolutionTagHelper(urlHelperFactory.Object, new HtmlTestEncoder());
+
+            var context = new TagHelperContext(
+                tagName: "a",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(
+                () => tagHelper.Process(context, tagHelperOutput));
+            Assert.Equal(expectedExceptionMessage, exception.Message, StringComparer.Ordinal);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TestApplicationPart.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TestApplicationPart.cs
new file mode 100644
index 0000000000..5f67622424
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TestApplicationPart.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class TestApplicationPart : ApplicationPart, IApplicationPartTypeProvider
+    {
+        public TestApplicationPart()
+        {
+            Types = Enumerable.Empty<TypeInfo>();
+        }
+
+        public TestApplicationPart(params TypeInfo[] types)
+        {
+            Types = types;
+        }
+
+        public TestApplicationPart(IEnumerable<TypeInfo> types)
+        {
+            Types = types;
+        }
+
+        public TestApplicationPart(IEnumerable<Type> types)
+            :this(types.Select(t => t.GetTypeInfo()))
+        {
+        }
+
+        public TestApplicationPart(params Type[] types)
+            : this(types.Select(t => t.GetTypeInfo()))
+        {
+        }
+
+        public override string Name => "Test part";
+
+        public IEnumerable<TypeInfo> Types { get; }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/xunit.runner.json b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/xunit.runner.json
new file mode 100644
index 0000000000..1c72a421ad
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/xunit.runner.json
@@ -0,0 +1,3 @@
+{
+  "shadowCopy": false
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageConventionCollectionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageConventionCollectionTest.cs
new file mode 100644
index 0000000000..c1bc7e1367
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageConventionCollectionTest.cs
@@ -0,0 +1,120 @@
+// 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.
+
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
+{
+    public class PageConventionCollectionTest
+    {
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void EnsureValidPageName_ThrowsIfPageNameIsNullOrEmpty(string pageName)
+        {
+            // Act & Assert
+            var ex = ExceptionAssert.ThrowsArgument(
+                () => PageConventionCollection.EnsureValidPageName(pageName),
+                "pageName",
+                "Value cannot be null or empty.");
+        }
+
+        [Theory]
+        [InlineData("path-without-slash")]
+        [InlineData(@"c:\myapp\path-without-slash")]
+        public void EnsureValidPageName_ThrowsIfPageNameDoesNotStartWithLeadingSlash(string pageName)
+        {
+            // Arrange
+            var expected = $"'{pageName}' is not a valid page name. A page name is path relative to the Razor Pages root directory that starts with a leading forward slash ('/') and does not contain the file extension e.g \"/Users/Edit\".";
+            // Act & Assert
+            var ex = ExceptionAssert.ThrowsArgument(
+                () => PageConventionCollection.EnsureValidPageName(pageName),
+                "pageName",
+                expected);
+        }
+
+        [Fact]
+        public void EnsureValidPageName_ThrowsIfPageNameHasExtension()
+        {
+            // Arrange
+            var pageName = "/Page.cshtml";
+            var expected = $"'{pageName}' is not a valid page name. A page name is path relative to the Razor Pages root directory that starts with a leading forward slash ('/') and does not contain the file extension e.g \"/Users/Edit\".";
+            // Act & Assert
+            var ex = ExceptionAssert.ThrowsArgument(
+                () => PageConventionCollection.EnsureValidPageName(pageName),
+                "pageName",
+                expected);
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void EnsureValidFolderPath_ThrowsIfPathIsNullOrEmpty(string folderPath)
+        {
+            // Arrange
+            // Act & Assert
+            var ex = ExceptionAssert.ThrowsArgument(
+                () => PageConventionCollection.EnsureValidFolderPath(folderPath),
+                "folderPath",
+               "Value cannot be null or empty.");
+        }
+
+        [Theory]
+        [InlineData("path-without-slash")]
+        [InlineData(@"c:\myapp\path-without-slash")]
+        public void EnsureValidFolderPath_ThrowsIfPageNameDoesNotStartWithLeadingSlash(string folderPath)
+        {
+            // Arrange
+            // Act & Assert
+            var ex = ExceptionAssert.ThrowsArgument(
+                () => PageConventionCollection.EnsureValidFolderPath(folderPath),
+                "folderPath",
+                "Path must be a root relative path that starts with a forward slash '/'.");
+        }
+
+        [Fact]
+        public void RemoveType_RemovesAllOfType()
+        {
+            // Arrange
+            var collection = new PageConventionCollection
+            {
+                new FooPageConvention(),
+                new BarPageConvention(),
+                new FooPageConvention()
+            };
+
+            // Act
+            collection.RemoveType(typeof(FooPageConvention));
+
+            // Assert
+            Assert.Collection(
+                collection,
+                convention => Assert.IsType<BarPageConvention>(convention));
+        }
+
+        [Fact]
+        public void GenericRemoveType_RemovesAllOfType()
+        {
+            // Arrange
+            var collection = new PageConventionCollection
+            {
+                new FooPageConvention(),
+                new BarPageConvention(),
+                new FooPageConvention()
+            };
+
+            // Act
+            collection.RemoveType<FooPageConvention>();
+
+            // Assert
+            Assert.Collection(
+               collection,
+               convention => Assert.IsType<BarPageConvention>(convention));
+        }
+
+        private class FooPageConvention : IPageConvention { }
+
+        private class BarPageConvention : IPageConvention { }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/MvcRazorPagesMvcBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/MvcRazorPagesMvcBuilderExtensionsTest.cs
new file mode 100644
index 0000000000..4b209a45fd
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/MvcRazorPagesMvcBuilderExtensionsTest.cs
@@ -0,0 +1,42 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public class MvcRazorPagesMvcBuilderExtensionsTest
+    {
+        [Fact]
+        public void AddRazorPagesOptions_AddsConventions()
+        {
+            // Arrange
+            var services = new ServiceCollection().AddOptions();
+            var applicationModelConvention = Mock.Of<IPageApplicationModelConvention>();
+            var routeModelConvention = Mock.Of<IPageRouteModelConvention>();
+            var builder = new MvcBuilder(services, new ApplicationPartManager());
+            builder.AddRazorPagesOptions(options =>
+            {
+                options.Conventions.Add(applicationModelConvention);
+                options.Conventions.Add(routeModelConvention);
+            });
+            var serviceProvider = services.BuildServiceProvider();
+            var accessor = serviceProvider.GetRequiredService<IOptions<RazorPagesOptions>>();
+
+            // Act & Assert
+            var conventions = accessor.Value.Conventions;
+
+            // Assert
+            Assert.Collection(
+                conventions,
+                convention => Assert.Same(applicationModelConvention, convention),
+                convention => Assert.Same(routeModelConvention, convention));
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/PageConventionCollectionExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/PageConventionCollectionExtensionsTest.cs
new file mode 100644
index 0000000000..063fad5022
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/PageConventionCollectionExtensionsTest.cs
@@ -0,0 +1,602 @@
+// 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.
+
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Authorization;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Moq;
+using Xunit;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public class PageConventionCollectionExtensionsTest
+    {
+        [Fact]
+        public void AddFilter_AddsFiltersToAllPages()
+        {
+            // Arrange
+            var filter = Mock.Of<IFilterMetadata>();
+            var conventions = new PageConventionCollection();
+            var models = new[]
+            {
+                CreateApplicationModel("/Pages/Index.cshtml", "/Index"),
+                CreateApplicationModel("/Pages/Users/Account.cshtml", "/Users/Account"),
+                CreateApplicationModel("/Pages/Users/Contact.cshtml", "/Users/Contact"),
+            };
+
+            // Act
+            conventions.ConfigureFilter(filter);
+            ApplyConventions(conventions, models);
+
+            // Assert
+            Assert.Collection(models,
+                model => Assert.Same(filter, Assert.Single(model.Filters)),
+                model => Assert.Same(filter, Assert.Single(model.Filters)),
+                model => Assert.Same(filter, Assert.Single(model.Filters)));
+        }
+
+        [Fact]
+        public void AuthorizePage_AddsAllowAnonymousFilterToSpecificPage()
+        {
+            // Arrange
+            var conventions = new PageConventionCollection();
+            var models = new[]
+            {
+                CreateApplicationModel("/Pages/Index.cshtml", "/Index"),
+                CreateApplicationModel("/Pages/Users/Account.cshtml", "/Users/Account"),
+                CreateApplicationModel("/Pages/Users/Contact.cshtml", "/Users/Contact"),
+            };
+
+            // Act
+            conventions.AuthorizeFolder("/Users");
+            conventions.AllowAnonymousToPage("/Users/Contact");
+            ApplyConventions(conventions, models);
+
+            // Assert
+            Assert.Collection(models,
+                model => Assert.Empty(model.Filters),
+                model =>
+                {
+                    Assert.Equal("/Users/Account", model.ViewEnginePath);
+                    Assert.IsType<AuthorizeFilter>(Assert.Single(model.Filters));
+                },
+                model =>
+                {
+                    Assert.Equal("/Users/Contact", model.ViewEnginePath);
+                    Assert.IsType<AuthorizeFilter>(model.Filters[0]);
+                    Assert.IsType<AllowAnonymousFilter>(model.Filters[1]);
+                });
+        }
+
+        [Fact]
+        public void AllowAnonymousToAreaPage_AddsAllowAnonymousFilterToSpecificPage()
+        {
+            // Arrange
+            var conventions = new PageConventionCollection();
+            var models = new[]
+            {
+                CreateApplicationModel("/Profile.cshtml", "/Profile"),
+                CreateApplicationModel("/Areas/Accounts/Pages/Profile.cshtml", "/Profile", "Accounts"),
+            };
+
+            // Act
+            conventions.AllowAnonymousToAreaPage("Accounts", "/Profile");
+            ApplyConventions(conventions, models);
+
+            // Assert
+            Assert.Collection(models,
+                model => Assert.Empty(model.Filters),
+                model =>
+                {
+                    Assert.Equal("/Areas/Accounts/Pages/Profile.cshtml", model.RelativePath);
+                    Assert.IsType<AllowAnonymousFilter>(Assert.Single(model.Filters));
+                });
+        }
+
+        [Theory]
+        [InlineData("/Users")]
+        [InlineData("/Users/")]
+        public void AuthorizePage_AddsAllowAnonymousFilterToPagesUnderFolder(string folderName)
+        {
+            // Arrange
+            var conventions = new PageConventionCollection();
+            var models = new[]
+            {
+                CreateApplicationModel("/Pages/Index.cshtml", "/Index"),
+                CreateApplicationModel("/Pages/Users/Account.cshtml", "/Users/Account"),
+                CreateApplicationModel("/Pages/Users/Contact.cshtml", "/Users/Contact"),
+            };
+
+            // Act
+            conventions.AuthorizeFolder("/");
+            conventions.AllowAnonymousToFolder("/Users");
+            ApplyConventions(conventions, models);
+
+            // Assert
+            Assert.Collection(models,
+                model =>
+                {
+                    Assert.Equal("/Index", model.ViewEnginePath);
+                    Assert.IsType<AuthorizeFilter>(Assert.Single(model.Filters));
+                },
+                model =>
+                {
+                    Assert.Equal("/Users/Account", model.ViewEnginePath);
+                    Assert.IsType<AuthorizeFilter>(model.Filters[0]);
+                    Assert.IsType<AllowAnonymousFilter>(model.Filters[1]);
+                },
+                model =>
+                {
+                    Assert.Equal("/Users/Contact", model.ViewEnginePath);
+                    Assert.IsType<AuthorizeFilter>(model.Filters[0]);
+                    Assert.IsType<AllowAnonymousFilter>(model.Filters[1]);
+                });
+        }
+
+        [Fact]
+        public void AllowAnonymousToAreaFolder_AddsAllowAnonymousFilterToFolderInArea()
+        {
+            // Arrange
+            var conventions = new PageConventionCollection();
+            var models = new[]
+            {
+                CreateApplicationModel("/Profile.cshtml", "/Profile"),
+                CreateApplicationModel("/Mange/Profile.cshtml", "/Manage/Profile"),
+                CreateApplicationModel("/Areas/Accounts/Pages/Manage/Profile.cshtml", "/Manage/Profile", "Accounts"),
+                CreateApplicationModel("/Areas/Accounts/Pages/Manage/2FA.cshtml", "/Manage/2FA", "Accounts"),
+                CreateApplicationModel("/Areas/Accounts/Pages/View/OrderHistory.cshtml", "/View/OrderHistory", "Accounts"),
+            };
+
+            // Act
+            conventions.AllowAnonymousToAreaFolder("Accounts", "/Manage");
+            ApplyConventions(conventions, models);
+
+            // Assert
+            Assert.Collection(models,
+                model => Assert.Empty(model.Filters),
+                model => Assert.Empty(model.Filters),
+                model =>
+                {
+                    Assert.Equal("/Areas/Accounts/Pages/Manage/Profile.cshtml", model.RelativePath);
+                    Assert.IsType<AllowAnonymousFilter>(Assert.Single(model.Filters));
+                },
+                model =>
+                {
+                    Assert.Equal("/Areas/Accounts/Pages/Manage/2FA.cshtml", model.RelativePath);
+                    Assert.IsType<AllowAnonymousFilter>(Assert.Single(model.Filters));
+                },
+                model => Assert.Empty(model.Filters));
+        }
+
+        [Fact]
+        public void AuthorizePage_AddsAuthorizeFilterWithPolicyToSpecificPage()
+        {
+            // Arrange
+            var conventions = new PageConventionCollection();
+            var models = new[]
+            {
+                CreateApplicationModel("/Pages/Index.cshtml", "/Index"),
+                CreateApplicationModel("/Pages/Users/Account.cshtml", "/Users/Account"),
+                CreateApplicationModel("/Pages/Users/Contact.cshtml", "/Users/Contact"),
+            };
+
+            // Act
+            conventions.AuthorizePage("/Users/Account", "Manage-Accounts");
+            ApplyConventions(conventions, models);
+
+            // Assert
+            Assert.Collection(models,
+                model => Assert.Empty(model.Filters),
+                model =>
+                {
+                    Assert.Equal("/Users/Account", model.ViewEnginePath);
+                    var authorizeFilter = Assert.IsType<AuthorizeFilter>(Assert.Single(model.Filters));
+                    var authorizeData = Assert.IsType<AuthorizeAttribute>(Assert.Single(authorizeFilter.AuthorizeData));
+                    Assert.Equal("Manage-Accounts", authorizeData.Policy);
+                },
+                model => Assert.Empty(model.Filters));
+        }
+
+        [Fact]
+        public void AuthorizeAreaPage_AddsAuthorizeFilterWithDefaultPolicyToAreaPage()
+        {
+            // Arrange
+            var conventions = new PageConventionCollection();
+            var models = new[]
+            {
+                CreateApplicationModel("/Profile.cshtml", "/Profile"),
+                CreateApplicationModel("/Areas/Accounts/Pages/Profile.cshtml", "/Profile", "Accounts"),
+            };
+
+            // Act
+            conventions.AuthorizeAreaPage("Accounts", "/Profile");
+            ApplyConventions(conventions, models);
+
+            // Assert
+            Assert.Collection(models,
+                model => Assert.Empty(model.Filters),
+                model =>
+                {
+                    Assert.Equal("/Areas/Accounts/Pages/Profile.cshtml", model.RelativePath);
+                    var authFilter = Assert.IsType<AuthorizeFilter>(Assert.Single(model.Filters));
+                    var authorizeAttribute = Assert.Single(authFilter.AuthorizeData);
+                    Assert.Empty(authorizeAttribute.Policy);
+                });
+        }
+
+        [Fact]
+        public void AuthorizeAreaPage_AddsAuthorizeFilterWithCustomPolicyToAreaPage()
+        {
+            // Arrange
+            var conventions = new PageConventionCollection();
+            var models = new[]
+            {
+                CreateApplicationModel("/Profile.cshtml", "/Profile"),
+                CreateApplicationModel("/Areas/Accounts/Pages/Profile.cshtml", "/Profile", "Accounts"),
+            };
+
+            // Act
+            conventions.AuthorizeAreaPage("Accounts", "/Profile", "custom");
+            ApplyConventions(conventions, models);
+
+            // Assert
+            Assert.Collection(models,
+                model => Assert.Empty(model.Filters),
+                model =>
+                {
+                    Assert.Equal("/Areas/Accounts/Pages/Profile.cshtml", model.RelativePath);
+                    var authFilter = Assert.IsType<AuthorizeFilter>(Assert.Single(model.Filters));
+                    var authorizeAttribute = Assert.Single(authFilter.AuthorizeData);
+                    Assert.Equal("custom", authorizeAttribute.Policy);
+                });
+        }
+
+        [Fact]
+        public void AuthorizePage_AddsAuthorizeFilterWithoutPolicyToSpecificPage()
+        {
+            // Arrange
+            var conventions = new PageConventionCollection();
+            var models = new[]
+            {
+                CreateApplicationModel("/Pages/Index.cshtml", "/Index"),
+                CreateApplicationModel("/Pages/Users/Account.cshtml", "/Users/Account"),
+                CreateApplicationModel("/Pages/Users/Contact.cshtml", "/Users/Contact"),
+            };
+
+            // Act
+            conventions.AuthorizePage("/Users/Account");
+            ApplyConventions(conventions, models);
+
+            // Assert
+            Assert.Collection(models,
+                model => Assert.Empty(model.Filters),
+                model =>
+                {
+                    Assert.Equal("/Users/Account", model.ViewEnginePath);
+                    var authorizeFilter = Assert.IsType<AuthorizeFilter>(Assert.Single(model.Filters));
+                    var authorizeData = Assert.IsType<AuthorizeAttribute>(Assert.Single(authorizeFilter.AuthorizeData));
+                    Assert.Equal(string.Empty, authorizeData.Policy);
+                },
+                model => Assert.Empty(model.Filters));
+        }
+
+        [Theory]
+        [InlineData("/Users")]
+        [InlineData("/Users/")]
+        public void AuthorizePage_AddsAuthorizeFilterWithPolicyToPagesUnderFolder(string folderName)
+        {
+            // Arrange
+            var conventions = new PageConventionCollection();
+            var models = new[]
+            {
+                CreateApplicationModel("/Pages/Index.cshtml", "/Index"),
+                CreateApplicationModel("/Pages/Users/Account.cshtml", "/Users/Account"),
+                CreateApplicationModel("/Pages/Users/Contact.cshtml", "/Users/Contact"),
+            };
+
+            // Act
+            conventions.AuthorizeFolder(folderName, "Manage-Accounts");
+            ApplyConventions(conventions, models);
+
+            // Assert
+            Assert.Collection(models,
+                model => Assert.Empty(model.Filters),
+                model =>
+                {
+                    Assert.Equal("/Users/Account", model.ViewEnginePath);
+                    var authorizeFilter = Assert.IsType<AuthorizeFilter>(Assert.Single(model.Filters));
+                    var authorizeData = Assert.IsType<AuthorizeAttribute>(Assert.Single(authorizeFilter.AuthorizeData));
+                    Assert.Equal("Manage-Accounts", authorizeData.Policy);
+                },
+                model =>
+                {
+                    Assert.Equal("/Users/Contact", model.ViewEnginePath);
+                    var authorizeFilter = Assert.IsType<AuthorizeFilter>(Assert.Single(model.Filters));
+                    var authorizeData = Assert.IsType<AuthorizeAttribute>(Assert.Single(authorizeFilter.AuthorizeData));
+                    Assert.Equal("Manage-Accounts", authorizeData.Policy);
+                });
+        }
+
+        [Theory]
+        [InlineData("/Users")]
+        [InlineData("/Users/")]
+        public void AuthorizePage_AddsAuthorizeFilterWithoutPolicyToPagesUnderFolder(string folderName)
+        {
+            // Arrange
+            var conventions = new PageConventionCollection();
+            var models = new[]
+            {
+                CreateApplicationModel("/Pages/Index.cshtml", "/Index.cshtml"),
+                CreateApplicationModel("/Pages/Users/Account.cshtml", "/Users/Account"),
+                CreateApplicationModel("/Pages/Users/Contact.cshtml", "/Users/Contact"),
+            };
+
+            // Act
+            conventions.AuthorizeFolder(folderName);
+            ApplyConventions(conventions, models);
+
+            // Assert
+            Assert.Collection(models,
+                model => Assert.Empty(model.Filters),
+                model =>
+                {
+                    Assert.Equal("/Users/Account", model.ViewEnginePath);
+                    var authorizeFilter = Assert.IsType<AuthorizeFilter>(Assert.Single(model.Filters));
+                    var authorizeData = Assert.IsType<AuthorizeAttribute>(Assert.Single(authorizeFilter.AuthorizeData));
+                    Assert.Equal(string.Empty, authorizeData.Policy);
+                },
+                model =>
+                {
+                    Assert.Equal("/Users/Contact", model.ViewEnginePath);
+                    var authorizeFilter = Assert.IsType<AuthorizeFilter>(Assert.Single(model.Filters));
+                    var authorizeData = Assert.IsType<AuthorizeAttribute>(Assert.Single(authorizeFilter.AuthorizeData));
+                    Assert.Equal(string.Empty, authorizeData.Policy);
+                });
+        }
+
+        [Fact]
+        public void AuthorizeAreaFolder_AddsAuthorizeFilterWithDefaultPolicyToAreaPagesInFolder()
+        {
+            // Arrange
+            var conventions = new PageConventionCollection();
+            var models = new[]
+            {
+                CreateApplicationModel("/Profile.cshtml", "/Profile"),
+                CreateApplicationModel("/Mange/Profile.cshtml", "/Manage/Profile"),
+                CreateApplicationModel("/Areas/Accounts/Pages/Manage/Profile.cshtml", "/Manage/Profile", "Accounts"),
+                CreateApplicationModel("/Areas/Accounts/Pages/Manage/2FA.cshtml", "/Manage/2FA", "Accounts"),
+                CreateApplicationModel("/Areas/Accounts/Pages/View/OrderHistory.cshtml", "/View/OrderHistory", "Accounts"),
+            };
+
+            // Act
+            conventions.AuthorizeAreaFolder("Accounts", "/Manage");
+            ApplyConventions(conventions, models);
+
+            // Assert
+            Assert.Collection(models,
+                model => Assert.Empty(model.Filters),
+                model => Assert.Empty(model.Filters),
+                model =>
+                {
+                    Assert.Equal("/Areas/Accounts/Pages/Manage/Profile.cshtml", model.RelativePath);
+                    var authorizeFilter = Assert.IsType<AuthorizeFilter>(Assert.Single(model.Filters));
+                    var authorizeData = Assert.IsType<AuthorizeAttribute>(Assert.Single(authorizeFilter.AuthorizeData));
+                    Assert.Empty(authorizeData.Policy);
+                },
+                model =>
+                {
+                    Assert.Equal("/Areas/Accounts/Pages/Manage/2FA.cshtml", model.RelativePath);
+                    var authorizeFilter = Assert.IsType<AuthorizeFilter>(Assert.Single(model.Filters));
+                    var authorizeData = Assert.IsType<AuthorizeAttribute>(Assert.Single(authorizeFilter.AuthorizeData));
+                    Assert.Empty(authorizeData.Policy);
+                },
+                model => Assert.Empty(model.Filters));
+        }
+
+        [Fact]
+        public void AuthorizeAreaFolder_AddsAuthorizeFilterWithCustomPolicyToAreaPagesInFolder()
+        {
+            // Arrange
+            var conventions = new PageConventionCollection();
+            var models = new[]
+            {
+                CreateApplicationModel("/Profile.cshtml", "/Profile"),
+                CreateApplicationModel("/Mange/Profile.cshtml", "/Manage/Profile"),
+                CreateApplicationModel("/Areas/Accounts/Pages/Manage/Profile.cshtml", "/Manage/Profile", "Accounts"),
+                CreateApplicationModel("/Areas/Accounts/Pages/Manage/2FA.cshtml", "/Manage/2FA", "Accounts"),
+                CreateApplicationModel("/Areas/Accounts/Pages/View/OrderHistory.cshtml", "/View/OrderHistory", "Accounts"),
+            };
+
+            // Act
+            conventions.AuthorizeAreaFolder("Accounts", "/Manage", "custom");
+            ApplyConventions(conventions, models);
+
+            // Assert
+            Assert.Collection(models,
+                model => Assert.Empty(model.Filters),
+                model => Assert.Empty(model.Filters),
+                model =>
+                {
+                    Assert.Equal("/Areas/Accounts/Pages/Manage/Profile.cshtml", model.RelativePath);
+                    var authorizeFilter = Assert.IsType<AuthorizeFilter>(Assert.Single(model.Filters));
+                    var authorizeData = Assert.IsType<AuthorizeAttribute>(Assert.Single(authorizeFilter.AuthorizeData));
+                    Assert.Equal("custom", authorizeData.Policy);
+                },
+                model =>
+                {
+                    Assert.Equal("/Areas/Accounts/Pages/Manage/2FA.cshtml", model.RelativePath);
+                    var authorizeFilter = Assert.IsType<AuthorizeFilter>(Assert.Single(model.Filters));
+                    var authorizeData = Assert.IsType<AuthorizeAttribute>(Assert.Single(authorizeFilter.AuthorizeData));
+                    Assert.Equal("custom", authorizeData.Policy);
+                },
+                model => Assert.Empty(model.Filters));
+        }
+
+        [Fact]
+        public void AddPageRoute_AddsRouteToSelector()
+        {
+            // Arrange
+            var conventions = new PageConventionCollection();
+            var models = new[]
+            {
+                new PageRouteModel("/Pages/Index.cshtml", "/Index")
+                {
+                    Selectors =
+                    {
+                        CreateSelectorModel("Index", suppressLinkGeneration: true),
+                        CreateSelectorModel(""),
+                    }
+                },
+                new PageRouteModel("/Pages/About.cshtml", "/About")
+                {
+                    Selectors =
+                    {
+                        CreateSelectorModel("About"),
+                    }
+                }
+            };
+
+            // Act
+            conventions.AddPageRoute("/Index", "Different-Route");
+            ApplyConventions(conventions, models);
+
+            // Assert
+            Assert.Collection(models,
+                model =>
+                {
+                    Assert.Equal("/Index", model.ViewEnginePath);
+                    Assert.Collection(model.Selectors,
+                        selector =>
+                        {
+                            Assert.Equal("Index", selector.AttributeRouteModel.Template);
+                            Assert.True(selector.AttributeRouteModel.SuppressLinkGeneration);
+                        },
+                        selector =>
+                        {
+                            Assert.Equal("", selector.AttributeRouteModel.Template);
+                            Assert.True(selector.AttributeRouteModel.SuppressLinkGeneration);
+                        },
+                        selector =>
+                        {
+                            Assert.Equal("Different-Route", selector.AttributeRouteModel.Template);
+                            Assert.False(selector.AttributeRouteModel.SuppressLinkGeneration);
+                        });
+                },
+                model =>
+                {
+                    Assert.Equal("/About", model.ViewEnginePath);
+                    Assert.Collection(model.Selectors,
+                        selector =>
+                        {
+                            Assert.Equal("About", selector.AttributeRouteModel.Template);
+                            Assert.False(selector.AttributeRouteModel.SuppressLinkGeneration);
+                        });
+                });
+        }
+
+        [Fact]
+        public void AddAreaPageRoute_AddsRouteToSelector()
+        {
+            // Arrange
+            var conventions = new PageConventionCollection();
+            var models = new[]
+            {
+                new PageRouteModel("/Pages/Profile.cshtml", "/Profile")
+                {
+                    Selectors =
+                    {
+                        CreateSelectorModel("Profile"),
+                    }
+                },
+                new PageRouteModel("/Areas/Accounts/Pages/Profile.cshtml", "/Profile", "Accounts")
+                {
+                    Selectors =
+                    {
+                        CreateSelectorModel("Accounts/Profile"),
+                    }
+                }
+            };
+
+            // Act
+            conventions.AddAreaPageRoute("Accounts", "/Profile", "Different-Route");
+            ApplyConventions(conventions, models);
+
+            // Assert
+            Assert.Collection(models,
+                model =>
+                {
+                    Assert.Equal("/Pages/Profile.cshtml", model.RelativePath);
+                    Assert.Collection(model.Selectors,
+                        selector =>
+                        {
+                            Assert.Equal("Profile", selector.AttributeRouteModel.Template);
+                            Assert.False(selector.AttributeRouteModel.SuppressLinkGeneration);
+                        });
+                },
+                model =>
+                {
+                    Assert.Equal("/Areas/Accounts/Pages/Profile.cshtml", model.RelativePath);
+                    Assert.Collection(model.Selectors,
+                        selector =>
+                        {
+                            Assert.Equal("Accounts/Profile", selector.AttributeRouteModel.Template);
+                            Assert.True (selector.AttributeRouteModel.SuppressLinkGeneration);
+                        },
+                        selector =>
+                        {
+                            Assert.Equal("Different-Route", selector.AttributeRouteModel.Template);
+                            Assert.False(selector.AttributeRouteModel.SuppressLinkGeneration);
+                        });
+                });
+        }
+
+        private static SelectorModel CreateSelectorModel(string template, bool suppressLinkGeneration = false)
+        {
+            return new SelectorModel
+            {
+                AttributeRouteModel = new AttributeRouteModel
+                {
+                    Template = template,
+                    SuppressLinkGeneration = suppressLinkGeneration
+                },
+            };
+        }
+
+        private static void ApplyConventions(PageConventionCollection conventions, PageRouteModel[] models)
+        {
+            foreach (var convention in conventions.OfType<IPageRouteModelConvention>())
+            {
+                foreach (var model in models)
+                {
+                    convention.Apply(model);
+                }
+            }
+        }
+        private static void ApplyConventions(PageConventionCollection conventions, PageApplicationModel[] models)
+        {
+            foreach (var convention in conventions.OfType<IPageApplicationModelConvention>())
+            {
+                foreach (var model in models)
+                {
+                    convention.Apply(model);
+                }
+            }
+        }
+
+        private PageApplicationModel CreateApplicationModel(string relativePath, string viewEnginePath, string areaName = null)
+        {
+            var descriptor = new PageActionDescriptor
+            {
+                ViewEnginePath = viewEnginePath,
+                RelativePath = relativePath,
+                AreaName = areaName,
+            };
+
+            return new PageApplicationModel(descriptor, typeof(object).GetTypeInfo(), new object[0]);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageActivatorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageActivatorProviderTest.cs
new file mode 100644
index 0000000000..4276f81ae9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageActivatorProviderTest.cs
@@ -0,0 +1,159 @@
+// 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.
+
+using System;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.Logging;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    public class DefaultPageActivatorProviderTest
+    {
+        [Fact]
+        public void CreateActivator_ThrowsIfPageTypeInfoIsNull()
+        {
+            // Arrange
+            var descriptor = new CompiledPageActionDescriptor();
+            var activator = new DefaultPageActivatorProvider();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => activator.CreateActivator(descriptor),
+                "actionDescriptor",
+                "The 'PageTypeInfo' property of 'actionDescriptor' must not be null.");
+        }
+
+        [Theory]
+        [InlineData(typeof(TestPage))]
+        [InlineData(typeof(PageWithMultipleConstructors))]
+        public void CreateActivator_ReturnsFactoryForPage(Type type)
+        {
+            // Arrange
+            var pageContext = new PageContext();
+            var viewContext = new ViewContext();
+            var descriptor = new CompiledPageActionDescriptor
+            {
+                PageTypeInfo = type.GetTypeInfo(),
+            };
+
+
+            var activator = new DefaultPageActivatorProvider();
+
+            // Act
+            var factory = activator.CreateActivator(descriptor);
+            var instance = factory(pageContext, viewContext);
+
+            // Assert
+            Assert.NotNull(instance);
+            Assert.IsType(type, instance);
+        }
+
+        [Fact]
+        public void CreateActivator_ThrowsIfTypeDoesNotHaveParameterlessConstructor()
+        {
+            // Arrange
+            var descriptor = new CompiledPageActionDescriptor
+            {
+                PageTypeInfo = typeof(PageWithoutParameterlessConstructor).GetTypeInfo(),
+            };
+            var pageContext = new PageContext();
+            var activator = new DefaultPageActivatorProvider();
+
+            // Act & Assert
+            Assert.Throws<ArgumentException>(() => activator.CreateActivator(descriptor));
+        }
+
+        [Theory]
+        [InlineData(typeof(TestPage))]
+        [InlineData(typeof(object))]
+        public void CreateReleaser_ReturnsNullForPagesThatDoNotImplementDisposable(Type pageType)
+        {
+            // Arrange
+            var context = new PageContext();
+            var activator = new DefaultPageActivatorProvider();
+            var page = new TestPage();
+
+            // Act
+            var releaser = activator.CreateReleaser(new CompiledPageActionDescriptor
+            {
+                PageTypeInfo = pageType.GetTypeInfo()
+            });
+
+            // Assert
+            Assert.Null(releaser);
+        }
+
+        [Fact]
+        public void CreateReleaser_CreatesDelegateThatDisposesDisposableTypes()
+        {
+            // Arrange
+            var context = new PageContext();
+            var viewContext = new ViewContext();
+            var activator = new DefaultPageActivatorProvider();
+            var page = new DisposablePage();
+
+            // Act & Assert
+            var disposer = activator.CreateReleaser(new CompiledPageActionDescriptor
+            {
+                PageTypeInfo = page.GetType().GetTypeInfo()
+            });
+            Assert.NotNull(disposer);
+            disposer(context, viewContext, page);
+
+            // Assert
+            Assert.True(page.Disposed);
+        }
+
+        private class TestPage : Page
+        {
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class PageWithMultipleConstructors : Page
+        {
+            public PageWithMultipleConstructors(int x)
+            {
+
+            }
+
+            public PageWithMultipleConstructors()
+            {
+
+            }
+
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class PageWithoutParameterlessConstructor : Page
+        {
+            public PageWithoutParameterlessConstructor(ILogger logger)
+            {
+            }
+
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class DisposablePage : TestPage, IDisposable
+        {
+            public bool Disposed { get; private set; }
+
+            public void Dispose()
+            {
+                Disposed = true;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageFactoryProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageFactoryProviderTest.cs
new file mode 100644
index 0000000000..6b337a93eb
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageFactoryProviderTest.cs
@@ -0,0 +1,394 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Reflection;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    public class DefaultPageFactoryProviderTest
+    {
+        [Fact]
+        public void CreatePage_ThrowsIfActivatedInstanceIsNotAnInstanceOfRazorPage()
+        {
+            // Arrange
+            var descriptor = new CompiledPageActionDescriptor
+            {
+                PageTypeInfo = typeof(object).GetTypeInfo(),
+            };
+
+            var pageActivator = CreateActivator();
+            var factoryProvider = CreatePageFactory();
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => factoryProvider.CreatePageFactory(descriptor));
+            Assert.Equal(
+                $"Page created by '{pageActivator.GetType()}' must be an instance of '{typeof(PageBase)}'.",
+                ex.Message);
+        }
+
+        [Fact]
+        public void PageFactorySetsPageContext()
+        {
+            // Arrange
+            var descriptor = new CompiledPageActionDescriptor
+            {
+                PageTypeInfo = typeof(TestPage).GetTypeInfo(),
+            };
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = descriptor
+            };
+            var viewContext = new ViewContext();
+            var factoryProvider = CreatePageFactory();
+
+            // Act
+            var factory = factoryProvider.CreatePageFactory(descriptor);
+            var instance = factory(pageContext, viewContext);
+
+            // Assert
+            var testPage = Assert.IsType<TestPage>(instance);
+            Assert.Same(pageContext, testPage.PageContext);
+        }
+
+        [Fact]
+        public void PageFactorySetsPropertiesWithRazorInject()
+        {
+            // Arrange
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = new CompiledPageActionDescriptor
+                {
+                    PageTypeInfo = typeof(TestPage).GetTypeInfo(),
+                }
+            };
+
+            var viewContext = new ViewContext();
+
+            var urlHelperFactory = new Mock<IUrlHelperFactory>();
+            var urlHelper = Mock.Of<IUrlHelper>();
+            urlHelperFactory
+                .Setup(f => f.GetUrlHelper(viewContext))
+                .Returns(urlHelper)
+                .Verifiable();
+
+            var htmlEncoder = HtmlEncoder.Create();
+
+            var factoryProvider = CreatePageFactory(
+                urlHelperFactory: urlHelperFactory.Object,
+                htmlEncoder: htmlEncoder);
+
+            // Act
+            var factory = factoryProvider.CreatePageFactory(pageContext.ActionDescriptor);
+            var instance = factory(pageContext, viewContext);
+
+            // Assert
+            var testPage = Assert.IsType<TestPage>(instance);
+            Assert.Same(urlHelper, testPage.UrlHelper);
+            Assert.Same(htmlEncoder, testPage.HtmlEncoder);
+            Assert.NotNull(testPage.ViewData);
+        }
+
+        [Fact]
+        public void PageFactorySetsPath()
+        {
+            // Arrange
+            var descriptor = new CompiledPageActionDescriptor
+            {
+                PageTypeInfo = typeof(ViewDataTestPage).GetTypeInfo(),
+                DeclaredModelTypeInfo = typeof(ViewDataTestPageModel).GetTypeInfo(),
+                ModelTypeInfo = typeof(ViewDataTestPageModel).GetTypeInfo()
+            };
+            descriptor.RelativePath = "/this/is/a/path.cshtml";
+
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = descriptor
+            };
+            
+            var viewContext = new ViewContext();
+
+            // Act
+            var factory = CreatePageFactory().CreatePageFactory(descriptor);
+            var instance = factory(pageContext, viewContext);
+
+            // Assert
+            var testPage = Assert.IsType<ViewDataTestPage>(instance);
+            Assert.Equal("/this/is/a/path.cshtml", testPage.Path);
+        }
+
+        [Fact]
+        public void PageFactorySetViewDataWithModelTypeWhenNotNull()
+        {
+            // Arrange
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = new CompiledPageActionDescriptor
+                {
+                    PageTypeInfo = typeof(ViewDataTestPage).GetTypeInfo(),
+                    DeclaredModelTypeInfo = typeof(ViewDataTestPageModel).GetTypeInfo(),
+                    ModelTypeInfo = typeof(ViewDataTestPageModel).GetTypeInfo(),
+                },
+            };
+
+            var viewContext = new ViewContext();
+
+            var factoryProvider = CreatePageFactory();
+
+            // Act
+            var factory = factoryProvider.CreatePageFactory(pageContext.ActionDescriptor);
+            var instance = factory(pageContext, viewContext);
+
+            // Assert
+            var testPage = Assert.IsType<ViewDataTestPage>(instance);
+            Assert.NotNull(testPage.ViewData);
+        }
+
+        [Fact]
+        public void PageFactorySetViewDataWithDeclaredModelTypeWhenNotNull()
+        {
+            // Arrange
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = new CompiledPageActionDescriptor
+                {
+                    PageTypeInfo = typeof(ViewDataTestPage).GetTypeInfo(),
+                    DeclaredModelTypeInfo = typeof(ViewDataTestPageModel).GetTypeInfo(),
+                    ModelTypeInfo = typeof(DerivedViewDataTestPageModel).GetTypeInfo(),
+                },
+            };
+
+            var viewContext = new ViewContext();
+
+            var factoryProvider = CreatePageFactory();
+
+            // Act
+            var factory = factoryProvider.CreatePageFactory(pageContext.ActionDescriptor);
+            var instance = factory(pageContext, viewContext);
+
+            // Assert
+            var testPage = Assert.IsType<ViewDataTestPage>(instance);
+            Assert.NotNull(testPage.ViewData);
+        }
+
+        [Fact]
+        public void PageFactorySetsNonGenericViewDataDictionary()
+        {
+            // Arrange
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = new CompiledPageActionDescriptor
+                {
+                    PageTypeInfo = typeof(NonGenericViewDataTestPage).GetTypeInfo()
+                },
+            };
+
+            var viewContext = new ViewContext();
+
+            var factoryProvider = CreatePageFactory();
+
+            // Act
+            var factory = factoryProvider.CreatePageFactory(pageContext.ActionDescriptor);
+            var instance = factory(pageContext, viewContext);
+
+            // Assert
+            var testPage = Assert.IsType<NonGenericViewDataTestPage>(instance);
+            Assert.NotNull(testPage.ViewData);
+        }
+
+        [Fact]
+        public void PageFactory_SetsViewDataOnPage_FromPageContext()
+        {
+            // Arrange
+            var modelMetadataProvider = new EmptyModelMetadataProvider();
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = new CompiledPageActionDescriptor
+                {
+                    PageTypeInfo = typeof(TestPage).GetTypeInfo()
+                },
+                ViewData = new ViewDataDictionary<TestPage>(modelMetadataProvider, new ModelStateDictionary())
+                {
+                    { "test-key", "test-value" },
+                }
+            };
+
+            var viewContext = new ViewContext()
+            {
+                HttpContext = pageContext.HttpContext,
+                ViewData = pageContext.ViewData,
+            };
+
+            var factoryProvider = CreatePageFactory();
+
+            // Act
+            var factory = factoryProvider.CreatePageFactory(pageContext.ActionDescriptor);
+            var instance = factory(pageContext, viewContext);
+
+            // Assert
+            var testPage = Assert.IsType<TestPage>(instance);
+            Assert.NotNull(testPage.ViewData);
+            Assert.Same(pageContext.ViewData, testPage.ViewData);
+            Assert.Equal("test-value", testPage.ViewData["test-key"]);
+        }
+
+        [Fact]
+        public void PageFactoryDoesNotBindPropertiesWithNoRazorInjectAttribute()
+        {
+            // Arrange
+            var serviceProvider = new ServiceCollection()
+                .AddSingleton<ILogger>(NullLogger.Instance)
+                .BuildServiceProvider();
+
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = new CompiledPageActionDescriptor
+                {
+                    PageTypeInfo = typeof(PropertiesWithoutRazorInject).GetTypeInfo()
+                },
+                HttpContext = new DefaultHttpContext
+                {
+                    RequestServices = serviceProvider,
+                },
+            };
+
+            var viewContext = new ViewContext()
+            {
+                HttpContext = pageContext.HttpContext,
+            };
+
+            var factoryProvider = CreatePageFactory();
+
+            // Act
+            var factory = factoryProvider.CreatePageFactory(pageContext.ActionDescriptor);
+            var instance = factory(pageContext, viewContext);
+
+            // Assert
+            var testPage = Assert.IsType<PropertiesWithoutRazorInject>(instance);
+            Assert.Null(testPage.DiagnosticSourceWithoutInject);
+            Assert.NotNull(testPage.DiagnosticSourceWithInject);
+
+            Assert.Null(testPage.LoggerWithoutInject);
+            Assert.NotNull(testPage.LoggerWithInject);
+
+            Assert.Null(testPage.ModelExpressionProviderWithoutInject);
+            Assert.NotNull(testPage.ModelExpressionProviderWithInject);
+        }
+
+        private static DefaultPageFactoryProvider CreatePageFactory(
+            IPageActivatorProvider pageActivator = null,
+            IModelMetadataProvider provider = null,
+            IUrlHelperFactory urlHelperFactory = null,
+            IJsonHelper jsonHelper = null,
+            DiagnosticSource diagnosticSource = null,
+            HtmlEncoder htmlEncoder = null,
+            IModelExpressionProvider modelExpressionProvider = null)
+        {
+            return new DefaultPageFactoryProvider(
+                pageActivator ?? CreateActivator(),
+                provider ?? Mock.Of<IModelMetadataProvider>(),
+                urlHelperFactory ?? Mock.Of<IUrlHelperFactory>(),
+                jsonHelper ?? Mock.Of<IJsonHelper>(),
+                diagnosticSource ?? new DiagnosticListener("Microsoft.AspNetCore.Mvc.RazorPages"),
+                htmlEncoder ?? HtmlEncoder.Default,
+                modelExpressionProvider ?? Mock.Of<IModelExpressionProvider>());
+        }
+
+        private static IPageActivatorProvider CreateActivator()
+        {
+            var activator = new Mock<IPageActivatorProvider>();
+            activator
+                .Setup(a => a.CreateActivator(It.IsAny<CompiledPageActionDescriptor>()))
+                .Returns((CompiledPageActionDescriptor descriptor) =>
+                {
+                    return (context, viewContext) => Activator.CreateInstance(descriptor.PageTypeInfo.AsType());
+                });
+            return activator.Object;
+        }
+
+        private class TestPage : Page
+        {
+            [RazorInject]
+            public IUrlHelper UrlHelper { get; set; }
+
+            [RazorInject]
+            public new HtmlEncoder HtmlEncoder { get; set; }
+
+            [RazorInject]
+            public ViewDataDictionary<TestPage> ViewData { get; set; }
+
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class NonGenericViewDataTestPage : Page
+        {
+            [RazorInject]
+            public ViewDataDictionary ViewData { get; set; }
+
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class ViewDataTestPage : Page
+        {
+            [RazorInject]
+            public ViewDataDictionary<ViewDataTestPageModel> ViewData { get; set; }
+
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class ViewDataTestPageModel
+        {
+        }
+
+        private class DerivedViewDataTestPageModel : ViewDataTestPageModel
+        {
+        }
+
+
+        private class PropertiesWithoutRazorInject : Page
+        {
+            public IModelExpressionProvider ModelExpressionProviderWithoutInject { get; set; }
+
+            [RazorInject]
+            public IModelExpressionProvider ModelExpressionProviderWithInject { get; set; }
+
+            public DiagnosticSource DiagnosticSourceWithoutInject { get; set; }
+
+            [RazorInject]
+            public DiagnosticSource DiagnosticSourceWithInject { get; set; }
+
+            public ILogger LoggerWithoutInject { get; set; }
+
+            [RazorInject]
+            public ILogger LoggerWithInject { get; set; }
+
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageModelActivatorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageModelActivatorProviderTest.cs
new file mode 100644
index 0000000000..e2e89e5214
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageModelActivatorProviderTest.cs
@@ -0,0 +1,158 @@
+// 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.
+
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    public class DefaultPageModelActivatorProviderTest
+    {
+        [Fact]
+        public void CreateActivator_ThrowsIfModelTypeInfoOnActionDescriptorIsNull()
+        {
+            // Arrange
+            var activatorProvider = new DefaultPageModelActivatorProvider();
+            var actionDescriptor = new CompiledPageActionDescriptor();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => activatorProvider.CreateActivator(actionDescriptor),
+                "actionDescriptor",
+                "The 'ModelTypeInfo' property of 'actionDescriptor' must not be null.");
+        }
+
+        [Fact]
+        public void CreateActivator_CreatesModelInstance()
+        {
+            // Arrange
+            var activatorProvider = new DefaultPageModelActivatorProvider();
+            var actionDescriptor = new CompiledPageActionDescriptor
+            {
+                ModelTypeInfo = typeof(SimpleModel).GetTypeInfo(),
+            };
+            var serviceCollection = new ServiceCollection();
+            var generator = Mock.Of<IHtmlGenerator>();
+            serviceCollection.AddSingleton(generator);
+            var httpContext = new DefaultHttpContext
+            {
+                RequestServices = serviceCollection.BuildServiceProvider(),
+            };
+            var pageContext = new PageContext
+            {
+                HttpContext = httpContext
+            };
+
+            // Act
+            var activator = activatorProvider.CreateActivator(actionDescriptor);
+            var model = activator(pageContext);
+
+            // Assert
+            var simpleModel = Assert.IsType<SimpleModel>(model);
+            Assert.NotNull(simpleModel);
+        }
+
+        [Fact]
+        public void CreateActivator_TypeActivatesModelType()
+        {
+            // Arrange
+            var activatorProvider = new DefaultPageModelActivatorProvider();
+            var actionDescriptor = new CompiledPageActionDescriptor
+            {
+                ModelTypeInfo = typeof(ModelWithServices).GetTypeInfo(),
+            };
+            var serviceCollection = new ServiceCollection();
+            var generator = Mock.Of<IHtmlGenerator>();
+            serviceCollection.AddSingleton(generator);
+            var httpContext = new DefaultHttpContext
+            {
+                RequestServices = serviceCollection.BuildServiceProvider(),
+            };
+            var pageContext = new PageContext
+            {
+                HttpContext = httpContext
+            };
+
+            // Act
+            var activator = activatorProvider.CreateActivator(actionDescriptor);
+            var model = activator(pageContext);
+
+            // Assert
+            var modelWithServices = Assert.IsType<ModelWithServices>(model);
+            Assert.Same(generator, modelWithServices.Generator);
+        }
+
+        [Theory]
+        [InlineData(typeof(SimpleModel))]
+        [InlineData(typeof(object))]
+        public void CreateReleaser_ReturnsNullForModelsThatDoNotImplementDisposable(Type pageType)
+        {
+            // Arrange
+            var context = new PageContext();
+            var activator = new DefaultPageModelActivatorProvider();
+            var actionDescriptor = new CompiledPageActionDescriptor
+            {
+                PageTypeInfo = pageType.GetTypeInfo(),
+            };
+
+            // Act
+            var releaser = activator.CreateReleaser(actionDescriptor);
+
+            // Assert
+            Assert.Null(releaser);
+        }
+
+        [Fact]
+        public void CreateReleaser_CreatesDelegateThatDisposesDisposableTypes()
+        {
+            // Arrange
+            var context = new PageContext();
+
+            var activator = new DefaultPageModelActivatorProvider();
+            var actionDescriptor = new CompiledPageActionDescriptor
+            {
+                ModelTypeInfo = typeof(DisposableModel).GetTypeInfo(),
+            };
+
+            var model = new DisposableModel();
+
+            // Act & Assert
+            var releaser = activator.CreateReleaser(actionDescriptor);
+            releaser(context, model);
+
+            // Assert
+            Assert.True(model.Disposed);
+        }
+
+        private class SimpleModel
+        {
+        }
+
+        private class ModelWithServices
+        {
+            public ModelWithServices(IHtmlGenerator generator)
+            {
+                Generator = generator;
+            }
+
+            public IHtmlGenerator Generator { get; }
+        }
+
+        private class DisposableModel : IDisposable
+        {
+            public bool Disposed { get; private set; }
+
+            public void Dispose()
+            {
+                Disposed = true;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageModelFactoryProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageModelFactoryProviderTest.cs
new file mode 100644
index 0000000000..b405f17e2a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageModelFactoryProviderTest.cs
@@ -0,0 +1,136 @@
+// 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.
+
+using System;
+using System.Reflection;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    public class DefaultPageModelFactoryProviderTest
+    {
+        [Fact]
+        public void CreateModelFactory_ReturnsNullFactoryIfModelTypeIsNull()
+        {
+            // Arrange
+            var descriptor = new CompiledPageActionDescriptor();
+            var pageContext = new PageContext();
+            var factoryProvider = CreateModelFactoryProvider();
+
+            // Act
+            var factory = factoryProvider.CreateModelFactory(descriptor);
+
+            // Assert
+            Assert.Null(factory);
+        }
+
+        [Fact]
+        public void CreateModelDisposer_ReturnsNullFactoryIfModelTypeIsNull()
+        {
+            // Arrange
+            var descriptor = new CompiledPageActionDescriptor();
+            var pageContext = new PageContext();
+            var factoryProvider = CreateModelFactoryProvider();
+
+            // Act
+            var disposer = factoryProvider.CreateModelDisposer(descriptor);
+
+            // Assert
+            Assert.Null(disposer);
+        }
+
+        [Fact]
+        public void ModelFactory_InitializesModelInstances()
+        {
+            // Arrange
+            var descriptor = new CompiledPageActionDescriptor
+            {
+                ModelTypeInfo = typeof(SimpleModel).GetTypeInfo(),
+            };
+            var pageContext = new PageContext();
+            var factoryProvider = CreateModelFactoryProvider();
+
+            // Act
+            var factory = factoryProvider.CreateModelFactory(descriptor);
+            var instance = factory(pageContext);
+
+            // Assert
+            var model = Assert.IsType<SimpleModel>(instance);
+            Assert.NotNull(model);
+        }
+
+        [Fact]
+        public void ModelFactory_InjectsPropertiesWithPageContextAttribute()
+        {
+            // Arrange
+            var descriptor = new CompiledPageActionDescriptor
+            {
+                ModelTypeInfo = typeof(ModelWithPageContext).GetTypeInfo(),
+            };
+            var pageContext = new PageContext();
+            var factoryProvider = CreateModelFactoryProvider();
+
+            // Act
+            var factory = factoryProvider.CreateModelFactory(descriptor);
+            var instance = factory(pageContext);
+
+            // Assert
+            var testModel = Assert.IsType<ModelWithPageContext>(instance);
+            Assert.Same(pageContext, testModel.ContextWithAttribute);
+            Assert.Null(testModel.ContextWithoutAttribute);
+        }
+
+        [Fact]
+        public void CreateModelDisposer_ReturnsDisposerFromModelActivatorProvider()
+        {
+            // Arrange
+            var descriptor = new CompiledPageActionDescriptor
+            {
+                ModelTypeInfo = typeof(SimpleModel).GetTypeInfo()
+            };
+            var pageContext = new PageContext();
+            var modelActivatorProvider = new Mock<IPageModelActivatorProvider>();
+            Action<PageContext, object> disposer = (_, __) => { };
+            modelActivatorProvider.Setup(p => p.CreateReleaser(descriptor))
+                .Returns(disposer);
+            var factoryProvider = CreateModelFactoryProvider(modelActivatorProvider.Object);
+
+            // Act
+            var actual = factoryProvider.CreateModelDisposer(descriptor);
+
+            // Assert
+            Assert.Same(disposer, actual);
+        }
+
+        private static DefaultPageModelFactoryProvider CreateModelFactoryProvider(
+            IPageModelActivatorProvider modelActivator = null)
+        {
+            if (modelActivator == null)
+            {
+                var mockActivator = new Mock<IPageModelActivatorProvider>();
+                mockActivator.Setup(a => a.CreateActivator(It.IsAny<CompiledPageActionDescriptor>()))
+                    .Returns((CompiledPageActionDescriptor descriptor) =>
+                    {
+                        return (context) => Activator.CreateInstance(descriptor.ModelTypeInfo.AsType());
+                    });
+
+                modelActivator = mockActivator.Object;
+            }
+
+            return new DefaultPageModelFactoryProvider(modelActivator);
+        }
+
+        private class SimpleModel
+        {
+        }
+
+        private class ModelWithPageContext
+        {
+            [PageContext]
+            public PageContext ContextWithAttribute { get; set; }
+
+            public PageContext ContextWithoutAttribute { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionDescriptorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionDescriptorProviderTest.cs
new file mode 100644
index 0000000000..095a5f5415
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionDescriptorProviderTest.cs
@@ -0,0 +1,333 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    public class PageActionDescriptorProviderTest
+    {
+        [Fact]
+        public void GetDescriptors_DoesNotAddDescriptorsIfNoApplicationModelsAreDiscovered()
+        {
+            // Arrange
+            var applicationModelProvider = new TestPageRouteModelProvider();
+            var provider = new PageActionDescriptorProvider(
+                new[] { applicationModelProvider },
+                GetAccessor<MvcOptions>(),
+                GetRazorPagesOptions());
+            var context = new ActionDescriptorProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Empty(context.Results);
+        }
+
+        [Fact]
+        public void GetDescriptors_AddsDescriptorsForModelWithSelector()
+        {
+            // Arrange
+            var model = new PageRouteModel("/Test.cshtml", "/Test")
+            {
+                Selectors =
+                {
+                    new SelectorModel
+                    {
+                        AttributeRouteModel = new AttributeRouteModel
+                        {
+                            Template = "/Test/{id:int?}",
+                        }
+                    }
+                }
+            };
+            var applicationModelProvider = new TestPageRouteModelProvider(model);
+            var provider = new PageActionDescriptorProvider(
+                new[] { applicationModelProvider },
+                GetAccessor<MvcOptions>(),
+                GetRazorPagesOptions());
+            var context = new ActionDescriptorProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var result = Assert.Single(context.Results);
+            var descriptor = Assert.IsType<PageActionDescriptor>(result);
+            Assert.Equal("/Test.cshtml", descriptor.RelativePath);
+            Assert.Equal("/Test", descriptor.RouteValues["page"]);
+            Assert.Equal("/Test/{id:int?}", descriptor.AttributeRouteInfo.Template);
+        }
+
+        [Fact]
+        public void GetDescriptors_AddsDescriptorsForAreaPages()
+        {
+            // Arrange
+            var model = new PageRouteModel("/Test.cshtml", "/Test")
+            {
+                RouteValues =
+                {
+                    { "custom-key", "custom-value" },
+                },
+                Selectors =
+                {
+                    new SelectorModel
+                    {
+                        AttributeRouteModel = new AttributeRouteModel
+                        {
+                            Template = "/Test/{id:int?}",
+                        }
+                    }
+                }
+            };
+            var applicationModelProvider = new TestPageRouteModelProvider(model);
+            var provider = new PageActionDescriptorProvider(
+                new[] { applicationModelProvider },
+                GetAccessor<MvcOptions>(),
+                GetRazorPagesOptions());
+            var context = new ActionDescriptorProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var result = Assert.Single(context.Results);
+            var descriptor = Assert.IsType<PageActionDescriptor>(result);
+            Assert.Equal(model.RelativePath, descriptor.RelativePath);
+            Assert.Collection(
+                descriptor.RouteValues.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("custom-key", kvp.Key);
+                    Assert.Equal("custom-value", kvp.Value);
+                },
+                kvp =>
+                {
+                    Assert.Equal("page", kvp.Key);
+                    Assert.Equal("/Test", kvp.Value);
+                });
+        }
+
+        [Fact]
+        public void GetDescriptors_CopiesRouteValuesFromModel()
+        {
+            // Arrange
+            var model = new PageRouteModel("/Areas/Accounts/Pages/Test.cshtml", "/Test", "Accounts")
+            {
+                RouteValues =
+                {
+                    { "page", "/Test" },
+                    { "area", "Accounts" },
+                },
+                Selectors =
+                {
+                    new SelectorModel
+                    {
+                        AttributeRouteModel = new AttributeRouteModel
+                        {
+                            Template = "Accounts/Test/{id:int?}",
+                        }
+                    }
+                }
+            };
+            var applicationModelProvider = new TestPageRouteModelProvider(model);
+            var provider = new PageActionDescriptorProvider(
+                new[] { applicationModelProvider },
+                GetAccessor<MvcOptions>(),
+                GetRazorPagesOptions());
+            var context = new ActionDescriptorProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var result = Assert.Single(context.Results);
+            var descriptor = Assert.IsType<PageActionDescriptor>(result);
+            Assert.Equal(model.RelativePath, descriptor.RelativePath);
+            Assert.Collection(
+                descriptor.RouteValues.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("area", kvp.Key);
+                    Assert.Equal("Accounts", kvp.Value);
+                },
+                kvp =>
+                {
+                    Assert.Equal("page", kvp.Key);
+                    Assert.Equal("/Test", kvp.Value);
+                });
+            Assert.Equal("Accounts", descriptor.AreaName);
+            Assert.Equal("Accounts/Test/{id:int?}", descriptor.AttributeRouteInfo.Template);
+        }
+
+        [Fact]
+        public void GetDescriptors_AddsActionDescriptorForEachSelector()
+        {
+            // Arrange
+            var applicationModelProvider = new TestPageRouteModelProvider(
+                new PageRouteModel("/base-path/Test.cshtml", "/base-path/Test")
+                {
+                    Selectors =
+                    {
+                        CreateSelectorModel("base-path/Test/Home")
+                    }
+                },
+                new PageRouteModel("/base-path/Index.cshtml", "/base-path/Index")
+                {
+                    Selectors =
+                    {
+                         CreateSelectorModel("base-path/Index"),
+                         CreateSelectorModel("base-path/"),
+                    }
+                },
+                new PageRouteModel("/base-path/Admin/Index.cshtml", "/base-path/Admin/Index")
+                {
+                    Selectors =
+                    {
+                         CreateSelectorModel("base-path/Admin/Index"),
+                         CreateSelectorModel("base-path/Admin"),
+                    }
+                },
+                new PageRouteModel("/base-path/Admin/User.cshtml", "/base-path/Admin/User")
+                {
+                    Selectors =
+                    {
+                         CreateSelectorModel("base-path/Admin/User"),
+                    },
+                });
+
+            var options = GetRazorPagesOptions();
+
+            var provider = new PageActionDescriptorProvider(
+                new[] { applicationModelProvider },
+                GetAccessor<MvcOptions>(),
+                options);
+            var context = new ActionDescriptorProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(context.Results,
+                result => Assert.Equal("base-path/Test/Home", result.AttributeRouteInfo.Template),
+                result => Assert.Equal("base-path/Index", result.AttributeRouteInfo.Template),
+                result => Assert.Equal("base-path/", result.AttributeRouteInfo.Template),
+                result => Assert.Equal("base-path/Admin/Index", result.AttributeRouteInfo.Template),
+                result => Assert.Equal("base-path/Admin", result.AttributeRouteInfo.Template),
+                result => Assert.Equal("base-path/Admin/User", result.AttributeRouteInfo.Template));
+        }
+
+        private static SelectorModel CreateSelectorModel(string template)
+        {
+            return new SelectorModel
+            {
+                AttributeRouteModel = new AttributeRouteModel
+                {
+                    Template = template,
+                }
+            };
+        }
+
+        [Fact]
+        public void GetDescriptors_AddsMultipleDescriptorsForPageWithMultipleSelectors()
+        {
+            // Arrange
+            var applicationModelProvider = new TestPageRouteModelProvider(
+                new PageRouteModel("/Catalog/Details/Index.cshtml", "/Catalog/Details/Index")
+                {
+                    Selectors =
+                    {
+                         CreateSelectorModel("/Catalog/Details/Index/{id:int?}"),
+                         CreateSelectorModel("/Catalog/Details/{id:int?}"),
+                    },
+                });
+
+            var provider = new PageActionDescriptorProvider(
+                new[] { applicationModelProvider },
+                GetAccessor<MvcOptions>(),
+                GetRazorPagesOptions());
+            var context = new ActionDescriptorProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(context.Results,
+                result =>
+                {
+                    var descriptor = Assert.IsType<PageActionDescriptor>(result);
+                    Assert.Equal("/Catalog/Details/Index.cshtml", descriptor.RelativePath);
+                    Assert.Equal("/Catalog/Details/Index", descriptor.RouteValues["page"]);
+                    Assert.Equal("/Catalog/Details/Index/{id:int?}", descriptor.AttributeRouteInfo.Template);
+                },
+                result =>
+                {
+                    var descriptor = Assert.IsType<PageActionDescriptor>(result);
+                    Assert.Equal("/Catalog/Details/Index.cshtml", descriptor.RelativePath);
+                    Assert.Equal("/Catalog/Details/Index", descriptor.RouteValues["page"]);
+                    Assert.Equal("/Catalog/Details/{id:int?}", descriptor.AttributeRouteInfo.Template);
+                });
+        }
+
+        private static PageRouteModel CreateModel()
+        {
+            return new PageRouteModel("/Home.cshtml", "/Home")
+            {
+                Selectors =
+                {
+                    new SelectorModel
+                    {
+                        AttributeRouteModel = new AttributeRouteModel
+                        {
+                            Template = "Home",
+                        }
+                    }
+                }
+            };
+        }
+
+        private static IOptions<TOptions> GetAccessor<TOptions>(TOptions options = null)
+            where TOptions : class, new()
+        {
+            var accessor = new Mock<IOptions<TOptions>>();
+            accessor.SetupGet(a => a.Value).Returns(options ?? new TOptions());
+            return accessor.Object;
+        }
+
+        private static IOptions<RazorPagesOptions> GetRazorPagesOptions()
+        {
+            return Options.Create(new RazorPagesOptions());
+        }
+
+        private class TestPageRouteModelProvider : IPageRouteModelProvider
+        {
+            private readonly PageRouteModel[] _models;
+
+            public TestPageRouteModelProvider(params PageRouteModel[] models)
+            {
+                _models = models ?? Array.Empty<PageRouteModel>();
+            }
+
+            public int Order => -1000;
+
+            public void OnProvidersExecuted(PageRouteModelProviderContext context)
+            {
+            }
+
+            public void OnProvidersExecuting(PageRouteModelProviderContext context)
+            {
+                foreach (var model in _models)
+                {
+                    context.RouteModels.Add(model);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageDirectiveFeatureTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageDirectiveFeatureTest.cs
new file mode 100644
index 0000000000..a566331451
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageDirectiveFeatureTest.cs
@@ -0,0 +1,156 @@
+// 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.
+
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Logging.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    public class PageDirectiveFeatureTest
+    {
+        [Fact]
+        public void TryGetPageDirective_FindsTemplate()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Test.cshtml", @"@page ""Some/Path/{value}""
+The rest of the thing");
+            var sink = new TestSink();
+            var logger = new TestLogger("logger", sink, enabled: true);
+
+            // Act & Assert
+            Assert.True(PageDirectiveFeature.TryGetPageDirective(logger, projectItem, out var template));
+            Assert.Equal("Some/Path/{value}", template);
+            Assert.Empty(sink.Writes);
+        }
+
+        [Fact]
+        public void TryGetPageDirective_NoNewLine()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Test.cshtml", @"@page ""Some/Path/{value}""");
+            var sink = new TestSink();
+            var logger = new TestLogger("logger", sink, enabled: true);
+
+            // Act & Assert
+            Assert.True(PageDirectiveFeature.TryGetPageDirective(logger, projectItem, out var template));
+            Assert.Equal("Some/Path/{value}", template);
+            Assert.Empty(sink.Writes);
+        }
+
+        [Fact]
+        public void TryGetPageDirective_JunkBeforeDirective()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Test.cshtml", @"Not a directive @page ""Some/Path/{value}""");
+            var sink = new TestSink();
+            var logger = new TestLogger("logger", sink, enabled: true);
+
+            // Act & Assert
+            Assert.False(PageDirectiveFeature.TryGetPageDirective(logger, projectItem, out var template));
+            Assert.Null(template);
+            Assert.Empty(sink.Writes);
+        }
+
+        [Theory]
+        [InlineData(@"""Some/Path/{value}")]
+        [InlineData(@"Some/Path/{value}""")]
+        public void TryGetPageDirective_WithoutBothQuotes_LogsWarning(string inTemplate)
+        {
+            // Arrange
+            var expected = "The page directive at 'Test.cshtml' is malformed. Please fix the following issues: The 'page' directive expects a string surrounded by double quotes.";
+            var sink = new TestSink();
+            var logger = new TestLogger("logger", sink, enabled: true);
+            var projectItem = new TestRazorProjectItem("Test.cshtml", $@"@page {inTemplate}");
+
+            // Act & Assert
+            Assert.True(PageDirectiveFeature.TryGetPageDirective(logger, projectItem, out var template));
+            Assert.Null(template);
+            Assert.Collection(sink.Writes,
+                log =>
+                {
+                    Assert.Equal(LogLevel.Warning, log.LogLevel);
+                    Assert.Equal(expected, log.State.ToString());
+                });
+        }
+
+        [Fact]
+        public void TryGetPageDirective_NoQuotesAroundPath_LogsWarning()
+        {
+            // Arrange
+            var expected = "The page directive at 'Test.cshtml' is malformed. Please fix the following issues: The 'page' directive expects a string surrounded by double quotes.";
+            var sink = new TestSink();
+            var logger = new TestLogger("logger", sink, enabled: true);
+            var projectItem = new TestRazorProjectItem("Test.cshtml", @"@page Some/Path/{value}");
+
+            // Act & Assert
+            Assert.True(PageDirectiveFeature.TryGetPageDirective(logger, projectItem, out var template));
+            Assert.Null(template);
+            var logs = sink.Writes.Select(w => w.State.ToString().Trim()).ToList();
+            Assert.Collection(sink.Writes,
+                log =>
+                {
+                    Assert.Equal(LogLevel.Warning, log.LogLevel);
+                    Assert.Equal(expected, log.State.ToString());
+                });
+        }
+
+        [Fact]
+        public void TryGetPageDirective_NewLineBeforeDirective()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Test.cshtml", "\n @page \"Some/Path/{value}\"");
+            var sink = new TestSink();
+            var logger = new TestLogger("logger", sink, enabled: true);
+
+            // Act
+            Assert.True(PageDirectiveFeature.TryGetPageDirective(logger, projectItem, out var template));
+            Assert.Equal("Some/Path/{value}", template);
+            Assert.Empty(sink.Writes);
+        }
+
+        [Fact]
+        public void TryGetPageDirective_Directive_WithoutPathOrContent()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Test.cshtml", @"@page");
+
+            // Act & Assert
+            Assert.True(PageDirectiveFeature.TryGetPageDirective(NullLogger.Instance, projectItem, out var template));
+            Assert.Null(template);
+        }
+
+        [Fact]
+        public void TryGetPageDirective_DirectiveWithContent_WithoutPath()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Test.cshtml", @"@page
+Non-path things");
+            var sink = new TestSink();
+            var logger = new TestLogger("logger", sink, enabled: true);
+
+            // Act & Assert
+            Assert.True(PageDirectiveFeature.TryGetPageDirective(logger, projectItem, out var template));
+            Assert.Null(template);
+            Assert.Empty(sink.Writes);
+        }
+
+        [Fact]
+        public void TryGetPageDirective_NoDirective()
+        {
+            // Arrange
+            var projectItem = new TestRazorProjectItem("Test.cshtml", @"This is junk
+Nobody will use it");
+            var sink = new TestSink();
+            var logger = new TestLogger("logger", sink, enabled: true);
+
+            // Act & Assert
+            Assert.False(PageDirectiveFeature.TryGetPageDirective(logger, projectItem, out var template));
+            Assert.Null(template);
+            Assert.Empty(sink.Writes);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageViewLocationExpanderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageViewLocationExpanderTest.cs
new file mode 100644
index 0000000000..7623e4af9e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageViewLocationExpanderTest.cs
@@ -0,0 +1,223 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
+{
+    public class PageViewLocationExpanderTest
+    {
+        [Fact]
+        public void PopulateValues_DoesNothing()
+        {
+            // Arrange
+            var context = CreateContext();
+
+            var expander = new PageViewLocationExpander();
+
+            // Act
+            expander.PopulateValues(context);
+
+            // Assert
+            Assert.Empty(context.Values);
+        }
+
+        [Fact]
+        public void ExpandLocations_NoOp_ForNonPage()
+        {
+            // Arrange
+            var context = CreateContext(pageName: null);
+            var locations = new string[]
+            {
+                "/ignore-me",
+            };
+
+            var expander = new PageViewLocationExpander();
+
+            // Act
+            var actual = expander.ExpandViewLocations(context, locations);
+
+            // Assert
+            Assert.Equal(locations, actual);
+        }
+
+        [Fact]
+        public void ExpandLocations_NoOp_ForNonPageWithPageName()
+        {
+            // Verifies the fix for https://github.com/aspnet/Mvc/issues/6660. This ensures that when PageViewLocationExpander is called
+            // from a non-Razor Page with a route value for "
+            // Arrange
+            var context = CreateContext(pageName: "test");
+            context.ActionContext.ActionDescriptor = new ControllerActionDescriptor();
+            var locations = new string[]
+            {
+                "/ignore-me",
+            };
+
+            var expander = new PageViewLocationExpander();
+
+            // Act
+            var actual = expander.ExpandViewLocations(context, locations);
+
+            // Assert
+            Assert.Equal(locations, actual);
+        }
+
+        [Fact]
+        public void ExpandLocations_NoOp_WhenLocationDoesNotContainPageToken()
+        {
+            // Arrange
+            var context = CreateContext(pageName: null);
+            var locations = new string[]
+            {
+                "/ignore-me",
+            };
+
+            var expander = new PageViewLocationExpander();
+
+            // Act
+            var actual = expander.ExpandViewLocations(context, locations);
+
+            // Assert
+            Assert.Equal(locations, actual);
+        }
+
+        [Theory]
+        [InlineData("/Index", new string[] { "/{0}.cshtml" })]
+        [InlineData("/Edit", new string[] { "/{0}.cshtml" })]
+        [InlineData("/Customers/Add", new string[] { "/Customers/{0}.cshtml", "/{0}.cshtml" })]
+        public void ExpandLocations_ExpandsDirectories_WhenLocationContainsPage(
+            string pageName,
+            string[] expected)
+        {
+            // Arrange
+            var context = CreateContext(pageName: pageName);
+
+            var locations = new string[]
+            {
+                "/{1}/{0}.cshtml",
+            };
+
+            var expander = new PageViewLocationExpander();
+
+            // Act
+            var actual = expander.ExpandViewLocations(context, locations);
+
+            // Assert
+            Assert.Equal(expected, actual.ToArray());
+        }
+
+        [Fact]
+        public void ExpandLocations_ExpandsDirectories_MultipleLocations()
+        {
+            // Arrange
+            var context = CreateContext(pageName: "/Customers/Edit");
+
+            var locations = new string[]
+            {
+                "/Pages/{1}/{0}.cshtml",
+                "/More/Paths/{1}/{0}.cshtml",
+                "/Views/Shared/{0}.cshtml",
+            };
+
+            var expected = new string[]
+            {
+                "/Pages/Customers/{0}.cshtml",
+                "/Pages/{0}.cshtml",
+                "/More/Paths/Customers/{0}.cshtml",
+                "/More/Paths/{0}.cshtml",
+                "/Views/Shared/{0}.cshtml",
+            };
+
+            var expander = new PageViewLocationExpander();
+
+            // Act
+            var actual = expander.ExpandViewLocations(context, locations);
+
+            // Assert
+            Assert.Equal(expected, actual.ToArray());
+        }
+
+        [Theory]
+        [InlineData("/Index", new [] { "/Areas/{2}/Pages/{0}.cshtml" })]
+        [InlineData("/Manage/User", new [] { "/Areas/{2}/Pages/Manage/{0}.cshtml", "/Areas/{2}/Pages/{0}.cshtml" })]
+        public void ExpandLocations_ExpandsAreaPaths(string pageName, string[] expected)
+        {
+            // Arrange
+            var context = CreateContext(pageName: pageName);
+            var locations = new[]
+            {
+                "/Areas/{2}/Pages/{1}/{0}.cshtml",
+            };
+
+            var expander = new PageViewLocationExpander();
+
+            // Act
+            var actual = expander.ExpandViewLocations(context, locations);
+
+            // Assert
+            Assert.Equal(expected, actual.ToArray());
+        }
+
+        [Fact]
+        public void ExpandLocations_ExpandsAreaPaths_MultipleLocations()
+        {
+            // Arrange
+            var context = CreateContext(pageName: "/Customers/Edit");
+            var locations = new[]
+            {
+                "/Areas/{2}/Pages/{1}/{0}.cshtml",
+                "/Areas/{2}/Pages/Shared/{0}.cshtml",
+                "/Areas/{2}/Views/Shared/{0}.cshtml",
+                "/Areas/{2}/Pages/Shared/{0}.cshtml",
+                "/User/Customized/{1}/{0}.cshtml",
+                "/Views/Shared/{0}.cshtml",
+                "/Pages/Shared/{0}.cshtml",
+            };
+
+            var expected = new[]
+            {
+                "/Areas/{2}/Pages/Customers/{0}.cshtml",
+                "/Areas/{2}/Pages/{0}.cshtml",
+                "/Areas/{2}/Pages/Shared/{0}.cshtml",
+                "/Areas/{2}/Views/Shared/{0}.cshtml",
+                "/Areas/{2}/Pages/Shared/{0}.cshtml",
+                "/User/Customized/Customers/{0}.cshtml",
+                "/User/Customized/{0}.cshtml",
+                "/Views/Shared/{0}.cshtml",
+                "/Pages/Shared/{0}.cshtml",
+            };
+
+            var expander = new PageViewLocationExpander();
+
+            // Act
+            var actual = expander.ExpandViewLocations(context, locations);
+
+            // Assert
+            Assert.Equal(expected, actual.ToArray());
+        }
+
+        private ViewLocationExpanderContext CreateContext(string viewName = "_LoginPartial.cshtml", string pageName = null)
+        {
+            var actionContext = new ActionContext
+            {
+                ActionDescriptor = new PageActionDescriptor(),
+            };
+
+            return new ViewLocationExpanderContext(
+                actionContext,
+                viewName,
+                controllerName: null,
+                areaName: null,
+                pageName: pageName,
+                isMainPage: true)
+            {
+                Values = new Dictionary<string, string>(),
+            };
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/AuthorizationPageApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/AuthorizationPageApplicationModelProviderTest.cs
new file mode 100644
index 0000000000..85b51820df
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/AuthorizationPageApplicationModelProviderTest.cs
@@ -0,0 +1,172 @@
+// 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.
+
+using System;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Authorization;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class AuthorizationPageApplicationModelProviderTest
+    {
+        [Fact]
+        public void OnProvidersExecuting_IgnoresAttributesOnHandlerMethods()
+        {
+            // Arrange
+            var policyProvider = new DefaultAuthorizationPolicyProvider(Options.Create(new AuthorizationOptions()));
+            var autorizationProvider = new AuthorizationPageApplicationModelProvider(policyProvider);
+            var typeInfo = typeof(PageWithAuthorizeHandlers).GetTypeInfo();
+            var context = GetApplicationProviderContext(typeInfo);
+
+            // Act
+            autorizationProvider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                context.PageApplicationModel.Filters,
+                f => Assert.IsType<PageHandlerPageFilter>(f));
+        }
+
+        private class PageWithAuthorizeHandlers : Page
+        {
+            public ModelWithAuthorizeHandlers Model => null;
+
+            public override Task ExecuteAsync() => throw new NotImplementedException();
+        }
+
+        public class ModelWithAuthorizeHandlers : PageModel
+        {
+            [Authorize]
+            public void OnGet()
+            {
+            }
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_AddsAuthorizeFilter_IfModelHasAuthorizationAttributes()
+        {
+            // Arrange
+            var policyProvider = new DefaultAuthorizationPolicyProvider(Options.Create(new AuthorizationOptions()));
+            var autorizationProvider = new AuthorizationPageApplicationModelProvider(policyProvider);
+            var context = GetApplicationProviderContext(typeof(TestPage).GetTypeInfo());
+
+            // Act
+            autorizationProvider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                context.PageApplicationModel.Filters,
+                f => Assert.IsType<PageHandlerPageFilter>(f),
+                f => Assert.IsType<AuthorizeFilter>(f));
+        }
+
+        private class TestPage : Page
+        {
+            public TestModel Model => null;
+
+            public override Task ExecuteAsync() => throw new NotImplementedException();
+        }
+
+        [Authorize]
+        private class TestModel : PageModel
+        {
+            public virtual void OnGet()
+            {
+            }
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_CollatesAttributesFromInheritedTypes()
+        {
+            // Arrange
+            var options = Options.Create(new AuthorizationOptions());
+            options.Value.AddPolicy("Base", policy => policy.RequireClaim("Basic").RequireClaim("Basic2"));
+            options.Value.AddPolicy("Derived", policy => policy.RequireClaim("Derived"));
+
+            var policyProvider = new DefaultAuthorizationPolicyProvider(options);
+            var autorizationProvider = new AuthorizationPageApplicationModelProvider(policyProvider);
+
+            var context = GetApplicationProviderContext(typeof(TestPageWithDerivedModel).GetTypeInfo());
+
+            // Act
+            autorizationProvider.OnProvidersExecuting(context);
+
+            // Assert
+            AuthorizeFilter authorizeFilter = null;
+            Assert.Collection(
+                context.PageApplicationModel.Filters,
+                f => Assert.IsType<PageHandlerPageFilter>(f),
+                f => authorizeFilter = Assert.IsType<AuthorizeFilter>(f));
+
+            // Basic + Basic2 + Derived authorize
+            Assert.Equal(3, authorizeFilter.Policy.Requirements.Count);
+        }
+
+        private class TestPageWithDerivedModel : Page
+        {
+            public DeriviedModel Model => null;
+
+            public override Task ExecuteAsync() =>throw new NotImplementedException();
+        }
+
+        [Authorize(Policy = "Base")]
+        public class BaseModel : PageModel
+        {
+        }
+
+        [Authorize(Policy = "Derived")]
+        private class DeriviedModel : BaseModel
+        {
+            public virtual void OnGet()
+            {
+            }
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_AddsAllowAnonymousFilter()
+        {
+            // Arrange
+            var policyProvider = new DefaultAuthorizationPolicyProvider(Options.Create(new AuthorizationOptions()));
+            var autorizationProvider = new AuthorizationPageApplicationModelProvider(policyProvider);
+            var context = GetApplicationProviderContext(typeof(PageWithAnonymousModel).GetTypeInfo());
+
+            // Act
+            autorizationProvider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                context.PageApplicationModel.Filters,
+                f => Assert.IsType<PageHandlerPageFilter>(f),
+                f => Assert.IsType<AllowAnonymousFilter>(f));
+        }
+
+        private class PageWithAnonymousModel : Page
+        {
+            public AnonymousModel Model => null;
+
+            public override Task ExecuteAsync() => throw new NotImplementedException();
+        }
+
+        [AllowAnonymous]
+        public class AnonymousModel : PageModel
+        {
+            public void OnGet() { }
+        }
+
+        private static PageApplicationModelProviderContext GetApplicationProviderContext(TypeInfo typeInfo)
+        {
+            var defaultProvider = new DefaultPageApplicationModelProvider(
+                TestModelMetadataProvider.CreateDefaultProvider(),
+                Options.Create(new MvcOptions { AllowValidatingTopLevelNodes = true }));
+            var context = new PageApplicationModelProviderContext(new PageActionDescriptor(), typeInfo);
+            defaultProvider.OnProvidersExecuting(context);
+            return context;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/AutoValidateAntiforgeryPageApplicationModelProvider.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/AutoValidateAntiforgeryPageApplicationModelProvider.cs
new file mode 100644
index 0000000000..20d81e5c69
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/AutoValidateAntiforgeryPageApplicationModelProvider.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class AutoValidateAntiforgeryPageApplicationModelProviderTest
+    {
+        [Fact]
+        public void OnProvidersExecuting_AddsFiltersToModel()
+        {
+            // Arrange
+            var actionDescriptor = new PageActionDescriptor();
+            var applicationModel = new PageApplicationModel(
+                actionDescriptor,
+                typeof(object).GetTypeInfo(),
+                new object[0]);
+            var applicationModelProvider = new AutoValidateAntiforgeryPageApplicationModelProvider();
+            var context = new PageApplicationModelProviderContext(new PageActionDescriptor(), typeof(object).GetTypeInfo())
+            {
+                PageApplicationModel = applicationModel,
+            };
+
+            // Act
+            applicationModelProvider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                applicationModel.Filters,
+                filter => Assert.IsType<AutoValidateAntiforgeryTokenAttribute>(filter));
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/CompiledPageActionDescriptorBuilderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/CompiledPageActionDescriptorBuilderTest.cs
new file mode 100644
index 0000000000..2d08aee3d8
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/CompiledPageActionDescriptorBuilderTest.cs
@@ -0,0 +1,403 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class CompiledPageActionDescriptorBuilderTest
+    {
+        [Fact]
+        public void CreateDescriptor_CopiesPropertiesFromPageActionDescriptor()
+        {
+            // Arrange
+            var actionDescriptor = new PageActionDescriptor
+            {
+                ActionConstraints = new List<IActionConstraintMetadata>(),
+                AttributeRouteInfo = new AttributeRouteInfo(),
+                FilterDescriptors = new List<FilterDescriptor>(),
+                RelativePath = "/Foo",
+                RouteValues = new Dictionary<string, string>(),
+                ViewEnginePath = "/Pages/Foo",
+            };
+            var handlerTypeInfo = typeof(object).GetTypeInfo();
+            var pageApplicationModel = new PageApplicationModel(actionDescriptor, handlerTypeInfo, new object[0]);
+            var globalFilters = new FilterCollection();
+
+            // Act
+            var actual = CompiledPageActionDescriptorBuilder.Build(pageApplicationModel, globalFilters);
+
+            // Assert
+            Assert.Same(actionDescriptor.ActionConstraints, actual.ActionConstraints);
+            Assert.Same(actionDescriptor.AttributeRouteInfo, actual.AttributeRouteInfo);
+            Assert.Same(actionDescriptor.RelativePath, actual.RelativePath);
+            Assert.Same(actionDescriptor.RouteValues, actual.RouteValues);
+            Assert.Same(actionDescriptor.ViewEnginePath, actual.ViewEnginePath);
+        }
+        
+        [Fact]
+        public void CreateDescriptor_CopiesPropertiesFromPageApplicationModel()
+        {
+            // Arrange
+            var actionDescriptor = new PageActionDescriptor
+            {
+                ActionConstraints = new List<IActionConstraintMetadata>(),
+                AttributeRouteInfo = new AttributeRouteInfo(),
+                FilterDescriptors = new List<FilterDescriptor>(),
+                RelativePath = "/Foo",
+                RouteValues = new Dictionary<string, string>(),
+                ViewEnginePath = "/Pages/Foo",
+            };
+            var handlerTypeInfo = typeof(TestModel).GetTypeInfo();
+            var pageApplicationModel = new PageApplicationModel(actionDescriptor, typeof(TestModel).GetTypeInfo(), handlerTypeInfo, new object[0])
+            {
+                PageType = typeof(TestPage).GetTypeInfo(),
+                ModelType = typeof(TestModel).GetTypeInfo(),
+                Filters =
+                {
+                    Mock.Of<IFilterMetadata>(),
+                    Mock.Of<IFilterMetadata>(),
+                },
+                HandlerMethods =
+                {
+                    new PageHandlerModel(handlerTypeInfo.GetMethod(nameof(TestModel.OnGet)), new object[0]),
+                },
+                HandlerProperties =
+                {
+                    new PagePropertyModel(handlerTypeInfo.GetProperty(nameof(TestModel.Property)), new object[0])
+                    {
+                        BindingInfo = new BindingInfo(),
+                    },
+                }
+            };
+            var globalFilters = new FilterCollection();
+
+            // Act
+            var actual = CompiledPageActionDescriptorBuilder.Build(pageApplicationModel, globalFilters);
+
+            // Assert
+            Assert.Same(pageApplicationModel.PageType, actual.PageTypeInfo);
+            Assert.Same(pageApplicationModel.DeclaredModelType, actual.DeclaredModelTypeInfo);
+            Assert.Same(pageApplicationModel.ModelType, actual.ModelTypeInfo);
+            Assert.Same(pageApplicationModel.HandlerType, actual.HandlerTypeInfo);
+            Assert.Same(pageApplicationModel.Properties, actual.Properties);
+            Assert.Equal(pageApplicationModel.Filters, actual.FilterDescriptors.Select(f => f.Filter));
+            Assert.Equal(pageApplicationModel.HandlerMethods.Select(p => p.MethodInfo), actual.HandlerMethods.Select(p => p.MethodInfo));
+            Assert.Equal(pageApplicationModel.HandlerProperties.Select(p => p.PropertyName), actual.BoundProperties.Select(p => p.Name));
+        }
+
+        [Fact]
+        public void CreateDescriptor_ThrowsIfModelIsNotCompatibleWithDeclaredModel()
+        {
+            // Arrange
+            var actionDescriptor = new PageActionDescriptor
+            {
+                ActionConstraints = new List<IActionConstraintMetadata>(),
+                AttributeRouteInfo = new AttributeRouteInfo(),
+                FilterDescriptors = new List<FilterDescriptor>(),
+                RelativePath = "/Foo",
+                RouteValues = new Dictionary<string, string>(),
+                ViewEnginePath = "/Pages/Foo",
+            };
+            var handlerTypeInfo = typeof(TestModel).GetTypeInfo();
+            var pageApplicationModel = new PageApplicationModel(actionDescriptor, typeof(TestModel).GetTypeInfo(), handlerTypeInfo, new object[0])
+            {
+                PageType = typeof(TestPage).GetTypeInfo(),
+                ModelType = typeof(string).GetTypeInfo(),
+                Filters =
+                {
+                    Mock.Of<IFilterMetadata>(),
+                    Mock.Of<IFilterMetadata>(),
+                },
+                HandlerMethods =
+                {
+                    new PageHandlerModel(handlerTypeInfo.GetMethod(nameof(TestModel.OnGet)), new object[0]),
+                },
+                HandlerProperties =
+                {
+                    new PagePropertyModel(handlerTypeInfo.GetProperty(nameof(TestModel.Property)), new object[0])
+                    {
+                        BindingInfo = new BindingInfo(),
+                    },
+                }
+            };
+            var globalFilters = new FilterCollection();
+
+            // Act & Assert
+            var actual = Assert.Throws<InvalidOperationException>(() => 
+                CompiledPageActionDescriptorBuilder.Build(pageApplicationModel, globalFilters));
+        }
+
+        [Fact]
+        public void CreateDescriptor_AddsGlobalFiltersWithTheRightScope()
+        {
+            // Arrange
+            var actionDescriptor = new PageActionDescriptor
+            {
+                ActionConstraints = new List<IActionConstraintMetadata>(),
+                AttributeRouteInfo = new AttributeRouteInfo(),
+                FilterDescriptors = new List<FilterDescriptor>(),
+                RelativePath = "/Foo",
+                RouteValues = new Dictionary<string, string>(),
+                ViewEnginePath = "/Pages/Foo",
+            };
+            var handlerTypeInfo = typeof(TestModel).GetTypeInfo();
+            var pageApplicationModel = new PageApplicationModel(actionDescriptor, handlerTypeInfo, new object[0])
+            {
+                PageType = typeof(TestPage).GetTypeInfo(),
+                ModelType = typeof(TestModel).GetTypeInfo(),
+                Filters =
+                {
+                    Mock.Of<IFilterMetadata>(),
+                },
+            };
+            var globalFilters = new FilterCollection
+            {
+                Mock.Of<IFilterMetadata>(),
+            };
+
+            // Act
+            var compiledPageActionDescriptor = CompiledPageActionDescriptorBuilder.Build(pageApplicationModel, globalFilters);
+
+            // Assert
+            Assert.Collection(
+                compiledPageActionDescriptor.FilterDescriptors,
+                filterDescriptor =>
+                {
+                    Assert.Same(globalFilters[0], filterDescriptor.Filter);
+                    Assert.Equal(FilterScope.Global, filterDescriptor.Scope);
+                },
+                filterDescriptor =>
+                {
+                    Assert.Same(pageApplicationModel.Filters[0], filterDescriptor.Filter);
+                    Assert.Equal(FilterScope.Action, filterDescriptor.Scope);
+                });
+        }
+
+        private class TestPage
+        {
+            public TestModel Model { get; } = new TestModel();
+
+            [BindProperty]
+            public string Property { get; set; }
+
+            public void OnGet()
+            {
+
+            }
+        }
+
+        private class TestModel
+        {
+            [BindProperty]
+            public string Property { get; set; }
+
+            public void OnGet()
+            {
+
+            }
+        }
+
+        [Fact]
+        public void CreateHandlerMethods_CopiesPropertiesFromHandlerModel()
+        {
+            // Arrange
+            var actionDescriptor = new PageActionDescriptor();
+            var handlerTypeInfo = typeof(ModelWithHandler).GetTypeInfo();
+            var handlerModel = new PageHandlerModel(handlerTypeInfo.GetMethod(nameof(ModelWithHandler.OnGetCustomerAsync)), new object[0])
+            {
+                HttpMethod = "GET",
+                HandlerName = "Customer",
+            };
+            var pageApplicationModel = new PageApplicationModel(actionDescriptor, handlerTypeInfo, new object[0])
+            {
+                HandlerMethods =
+                {
+                    handlerModel,
+                }
+            };
+
+            // Act
+            var handlerDescriptors = CompiledPageActionDescriptorBuilder.CreateHandlerMethods(pageApplicationModel);
+
+            // Assert
+            Assert.Collection(
+                handlerDescriptors,
+                d =>
+                {
+                    Assert.Equal(handlerModel.MethodInfo, d.MethodInfo);
+                    Assert.Equal(handlerModel.HttpMethod, d.HttpMethod);
+                    Assert.Equal(handlerModel.HandlerName, d.Name);
+                });
+        }
+
+        private class ModelWithHandler
+        {
+            public void OnGetCustomerAsync()
+            {
+            }
+        }
+
+        [Fact]
+        public void CreateHandlerMethods_CopiesParameterDecriptorsFromParameterModel()
+        {
+            // Arrange
+            var actionDescriptor = new PageActionDescriptor();
+            var handlerTypeInfo = typeof(HandlerWithParameters).GetTypeInfo();
+            var handlerMethod = handlerTypeInfo.GetMethod(nameof(HandlerWithParameters.OnPost));
+            var parameters = handlerMethod.GetParameters();
+            var parameterModel1 = new PageParameterModel(parameters[0], new object[0])
+            {
+                ParameterName = "test-name"
+            };
+            var parameterModel2 = new PageParameterModel(parameters[1], new object[0])
+            {
+                BindingInfo = new BindingInfo(),
+            };
+            var handlerModel = new PageHandlerModel(handlerMethod, new object[0])
+            {
+                Parameters =
+                {
+                    parameterModel1,
+                    parameterModel2,
+                }
+            };
+            var pageApplicationModel = new PageApplicationModel(actionDescriptor, handlerTypeInfo, new object[0])
+            {
+                HandlerMethods =
+                {
+                    handlerModel,
+                }
+            };
+
+            // Act
+            var handlerDescriptors = CompiledPageActionDescriptorBuilder.CreateHandlerMethods(pageApplicationModel);
+
+            // Assert
+            Assert.Collection(
+                Assert.Single(handlerDescriptors).Parameters,
+                p =>
+                {
+                    Assert.Equal(parameters[0], p.ParameterInfo);
+                    Assert.Equal(typeof(string), p.ParameterType);
+                    Assert.Equal(parameterModel1.ParameterName, p.Name);
+                },
+                p =>
+                {
+                    Assert.Equal(parameters[1], p.ParameterInfo);
+                    Assert.Equal(typeof(int), p.ParameterType);
+                    Assert.Same(parameterModel2.BindingInfo, p.BindingInfo);
+                });
+        }
+
+        private class HandlerWithParameters
+        {
+            public void OnPost(string param1, [FromRoute(Name = "id")] int param2)
+            {
+            }
+        }
+
+        [Fact]
+        public void CreateBoundProperties_CopiesPropertyDescriptorsFromPagePropertyModel()
+        {
+            // Arrange
+            var actionDescriptor = new PageActionDescriptor();
+            var handlerTypeInfo = typeof(HandlerWithProperty).GetTypeInfo();
+            var propertyModel = new PagePropertyModel(
+                handlerTypeInfo.GetProperty(nameof(HandlerWithProperty.Property)),
+                new object[0])
+            {
+                PropertyName = nameof(HandlerWithProperty.Property),
+                BindingInfo = new BindingInfo(),
+            };
+            var pageApplicationModel = new PageApplicationModel(actionDescriptor, handlerTypeInfo, new object[0])
+            {
+                HandlerProperties =
+                {
+                    propertyModel,
+                }
+            };
+
+            // Act
+            var propertyDescriptors = CompiledPageActionDescriptorBuilder.CreateBoundProperties(pageApplicationModel);
+
+            // Assert
+            Assert.Collection(
+                propertyDescriptors,
+                p =>
+                {
+                    Assert.Same(propertyModel.PropertyName, p.Name);
+                    Assert.Same(typeof(int), p.ParameterType);
+                    Assert.Same(propertyModel.PropertyInfo, p.Property);
+                    Assert.Same(propertyModel.BindingInfo, p.BindingInfo);
+                });
+        }
+
+        private class HandlerWithProperty
+        {
+            [BindProperty]
+            public int Property { get; set; }
+        }
+
+        [Fact]
+        public void CreateBoundProperties_IgnoresPropertiesWithoutBindingInfo()
+        {
+            // Arrange
+            var actionDescriptor = new PageActionDescriptor();
+            var handlerTypeInfo = typeof(HandlerWithIgnoredProperties).GetTypeInfo();
+            var propertyModel1 = new PagePropertyModel(
+                handlerTypeInfo.GetProperty(nameof(HandlerWithIgnoredProperties.Property)),
+                new object[0])
+            {
+                PropertyName = nameof(HandlerWithIgnoredProperties.Property),
+                BindingInfo = new BindingInfo(),
+            };
+            var propertyModel2 = new PagePropertyModel(
+                handlerTypeInfo.GetProperty(nameof(HandlerWithIgnoredProperties.IgnoreMe)),
+                new object[0])
+            {
+                PropertyName = nameof(HandlerWithIgnoredProperties.IgnoreMe),
+            };
+            var pageApplicationModel = new PageApplicationModel(actionDescriptor, handlerTypeInfo, new object[0])
+            {
+                HandlerProperties =
+                {
+                    propertyModel1,
+                    propertyModel2,
+                }
+            };
+
+            // Act
+            var propertyDescriptors = CompiledPageActionDescriptorBuilder.CreateBoundProperties(pageApplicationModel);
+
+            // Assert
+            Assert.Collection(
+                propertyDescriptors,
+                p =>
+                {
+                    Assert.Same(propertyModel1.PropertyName, p.Name);
+                    Assert.Same(typeof(int), p.ParameterType);
+                    Assert.Same(propertyModel1.PropertyInfo, p.Property);
+                    Assert.Same(propertyModel1.BindingInfo, p.BindingInfo);
+                });
+        }
+
+        private class HandlerWithIgnoredProperties
+        {
+            [BindProperty]
+            public int Property { get; set; }
+
+            public string IgnoreMe { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/CompiledPageRouteModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/CompiledPageRouteModelProviderTest.cs
new file mode 100644
index 0000000000..fa00d8bd60
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/CompiledPageRouteModelProviderTest.cs
@@ -0,0 +1,690 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.AspNetCore.Razor.Hosting;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Xunit;
+using static Microsoft.AspNetCore.Razor.Hosting.TestRazorCompiledItem;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class CompiledPageRouteModelProviderTest
+    {
+        [Fact]
+        public void OnProvidersExecuting_AddsModelsForCompiledViews()
+        {
+            // Arrange
+            var descriptors = new[]
+            {
+                CreateVersion_2_0_Descriptor("/Pages/About.cshtml"),
+                CreateVersion_2_0_Descriptor("/Pages/Home.cshtml", "some-prefix"),
+            };
+
+            var provider = CreateProvider(descriptors: descriptors);
+            var context = new PageRouteModelProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                context.RouteModels,
+                result =>
+                {
+                    Assert.Equal("/Pages/About.cshtml", result.RelativePath);
+                    Assert.Equal("/About", result.ViewEnginePath);
+                    Assert.Collection(
+                        result.Selectors,
+                        selector => Assert.Equal("About", selector.AttributeRouteModel.Template));
+                    Assert.Collection(
+                        result.RouteValues.OrderBy(k => k.Key),
+                        kvp =>
+                        {
+                            Assert.Equal("page", kvp.Key);
+                            Assert.Equal("/About", kvp.Value);
+                        });
+                },
+                result =>
+                {
+                    Assert.Equal("/Pages/Home.cshtml", result.RelativePath);
+                    Assert.Equal("/Home", result.ViewEnginePath);
+                    Assert.Collection(
+                        result.Selectors,
+                        selector => Assert.Equal("Home/some-prefix", selector.AttributeRouteModel.Template));
+                    Assert.Collection(
+                        result.RouteValues.OrderBy(k => k.Key),
+                        kvp =>
+                        {
+                            Assert.Equal("page", kvp.Key);
+                            Assert.Equal("/Home", kvp.Value);
+                        });
+                });
+        }
+
+        [Fact] // 2.1 adds some additional metadata to the view descriptors. We want to make sure both versions work.
+        public void OnProvidersExecuting_AddsModelsForCompiledViews_Version_2_1()
+        {
+            // Arrange
+            var descriptors = new[]
+            {
+                CreateVersion_2_1_Descriptor("/Pages/About.cshtml"),
+                CreateVersion_2_1_Descriptor("/Pages/Home.cshtml", metadata: new[]
+                {
+                    new RazorCompiledItemMetadataAttribute("RouteTemplate", "some-prefix"),
+                }),
+            };
+
+            var provider = CreateProvider(descriptors: descriptors);
+            var context = new PageRouteModelProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                context.RouteModels,
+                result =>
+                {
+                    Assert.Equal("/Pages/About.cshtml", result.RelativePath);
+                    Assert.Equal("/About", result.ViewEnginePath);
+                    Assert.Collection(
+                        result.Selectors,
+                        selector => Assert.Equal("About", selector.AttributeRouteModel.Template));
+                    Assert.Collection(
+                        result.RouteValues.OrderBy(k => k.Key),
+                        kvp =>
+                        {
+                            Assert.Equal("page", kvp.Key);
+                            Assert.Equal("/About", kvp.Value);
+                        });
+                },
+                result =>
+                {
+                    Assert.Equal("/Pages/Home.cshtml", result.RelativePath);
+                    Assert.Equal("/Home", result.ViewEnginePath);
+                    Assert.Collection(
+                        result.Selectors,
+                        selector => Assert.Equal("Home/some-prefix", selector.AttributeRouteModel.Template));
+                    Assert.Collection(
+                        result.RouteValues.OrderBy(k => k.Key),
+                        kvp =>
+                        {
+                            Assert.Equal("page", kvp.Key);
+                            Assert.Equal("/Home", kvp.Value);
+                        });
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_ValidatesChecksum_RejectsPageWhenContentDoesntMatch()
+        {
+            // Arrange
+            var descriptors = new[]
+            {
+                CreateVersion_2_1_Descriptor("/Pages/About.cshtml", metadata: new object[]
+                {
+                    new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), "/Pages/About.cshtml"),
+                }),
+            };
+
+            var fileSystem = new VirtualRazorProjectFileSystem();
+            fileSystem.Add(new TestRazorProjectItem("/Pages/About.cshtml", "some other content"));
+
+            var provider = CreateProvider(descriptors: descriptors, fileSystem: fileSystem);
+            var context = new PageRouteModelProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Empty(context.RouteModels);
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_ValidatesChecksum_AcceptsPageWhenContentMatches()
+        {
+            // Arrange
+            var descriptors = new[]
+            {
+                CreateVersion_2_1_Descriptor("/Pages/About.cshtml", metadata: new object[]
+                {
+                    new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), "/Pages/About.cshtml"),
+                    new RazorSourceChecksumAttribute("SHA1", GetChecksum("some import"), "/Pages/_ViewImports.cshtml"),
+                }),
+            };
+
+            var fileSystem = new VirtualRazorProjectFileSystem();
+            fileSystem.Add(new TestRazorProjectItem("/Pages/About.cshtml", "some content"));
+            fileSystem.Add(new TestRazorProjectItem("/Pages/_ViewImports.cshtml", "some import"));
+
+            var provider = CreateProvider(descriptors: descriptors, fileSystem: fileSystem);
+            var context = new PageRouteModelProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                context.RouteModels,
+                result => Assert.Equal("/Pages/About.cshtml", result.RelativePath));
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_ValidatesChecksum_SkipsValidationWhenMainSourceMissing()
+        {
+            // Arrange
+            var descriptors = new[]
+            {
+                CreateVersion_2_1_Descriptor("/Pages/About.cshtml", metadata: new object[]
+                {
+                    new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), "/Pages/About.cshtml"),
+                    new RazorSourceChecksumAttribute("SHA1", GetChecksum("some import"), "/Pages/_ViewImports.cshtml"),
+                }),
+            };
+
+            var fileSystem = new VirtualRazorProjectFileSystem();
+            fileSystem.Add(new TestRazorProjectItem("/Pages/_ViewImports.cshtml", "some other import"));
+
+            var provider = CreateProvider(descriptors: descriptors, fileSystem: fileSystem);
+            var context = new PageRouteModelProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                context.RouteModels,
+                result => Assert.Equal("/Pages/About.cshtml", result.RelativePath));
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_AddsModelsForCompiledAreaPages()
+        {
+            // Arrange
+            var descriptors = new[]
+            {
+                CreateVersion_2_0_Descriptor("/Areas/Products/Files/About.cshtml"),
+                CreateVersion_2_0_Descriptor("/Areas/Products/Pages/About.cshtml"),
+                CreateVersion_2_0_Descriptor("/Areas/Products/Pages/Manage/Index.cshtml"),
+                CreateVersion_2_0_Descriptor("/Areas/Products/Pages/Manage/Edit.cshtml", "{id}"),
+            };
+
+            var options = new RazorPagesOptions
+            {
+                AllowAreas = true,
+                // Setting this value should not affect area page lookup.
+                RootDirectory = "/Files",
+            };
+
+            var provider = CreateProvider(options: options, descriptors: descriptors);
+            var context = new PageRouteModelProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                context.RouteModels,
+                result =>
+                {
+                    Assert.Equal("/Areas/Products/Pages/About.cshtml", result.RelativePath);
+                    Assert.Equal("/About", result.ViewEnginePath);
+                    Assert.Collection(
+                        result.Selectors,
+                        selector => Assert.Equal("Products/About", selector.AttributeRouteModel.Template));
+                    Assert.Collection(
+                        result.RouteValues.OrderBy(k => k.Key),
+                        kvp =>
+                        {
+                            Assert.Equal("area", kvp.Key);
+                            Assert.Equal("Products", kvp.Value);
+                        },
+                        kvp =>
+                        {
+                            Assert.Equal("page", kvp.Key);
+                            Assert.Equal("/About", kvp.Value);
+                        });
+                },
+                result =>
+                {
+                    Assert.Equal("/Areas/Products/Pages/Manage/Index.cshtml", result.RelativePath);
+                    Assert.Equal("/Manage/Index", result.ViewEnginePath);
+                    Assert.Collection(result.Selectors,
+                        selector => Assert.Equal("Products/Manage/Index", selector.AttributeRouteModel.Template),
+                        selector => Assert.Equal("Products/Manage", selector.AttributeRouteModel.Template));
+                    Assert.Collection(
+                        result.RouteValues.OrderBy(k => k.Key),
+                        kvp =>
+                        {
+                            Assert.Equal("area", kvp.Key);
+                            Assert.Equal("Products", kvp.Value);
+                        },
+                        kvp =>
+                        {
+                            Assert.Equal("page", kvp.Key);
+                            Assert.Equal("/Manage/Index", kvp.Value);
+                        });
+                },
+                result =>
+                {
+                    Assert.Equal("/Areas/Products/Pages/Manage/Edit.cshtml", result.RelativePath);
+                    Assert.Equal("/Manage/Edit", result.ViewEnginePath);
+                    Assert.Collection(
+                        result.Selectors,
+                        selector => Assert.Equal("Products/Manage/Edit/{id}", selector.AttributeRouteModel.Template));
+                    Assert.Collection(
+                        result.RouteValues.OrderBy(k => k.Key),
+                        kvp =>
+                        {
+                            Assert.Equal("area", kvp.Key);
+                            Assert.Equal("Products", kvp.Value);
+                        },
+                        kvp =>
+                        {
+                            Assert.Equal("page", kvp.Key);
+                            Assert.Equal("/Manage/Edit", kvp.Value);
+                        });
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_DoesNotAddsModelsForAreaPages_IfFeatureIsDisabled()
+        {
+            // Arrange
+            var descriptors = new[]
+            {
+                CreateVersion_2_0_Descriptor("/Pages/About.cshtml"),
+                CreateVersion_2_0_Descriptor("/Areas/Accounts/Pages/Home.cshtml"),
+            };
+
+            var options = new RazorPagesOptions { AllowAreas = false };
+
+            var provider = CreateProvider(options: options, descriptors: descriptors);
+            var context = new PageRouteModelProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                context.RouteModels,
+                result =>
+                {
+                    Assert.Equal("/Pages/About.cshtml", result.RelativePath);
+                    Assert.Equal("/About", result.ViewEnginePath);
+                    Assert.Collection(
+                        result.Selectors,
+                        selector => Assert.Equal("About", selector.AttributeRouteModel.Template));
+                    Assert.Collection(
+                        result.RouteValues.OrderBy(k => k.Key),
+                        kvp =>
+                        {
+                            Assert.Equal("page", kvp.Key);
+                            Assert.Equal("/About", kvp.Value);
+                        });
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_DoesNotAddAreaAndNonAreaRoutesForAPage()
+        {
+            // Arrange
+            var descriptors = new[]
+            {
+                CreateVersion_2_0_Descriptor("/Areas/Accounts/Pages/Manage/Home.cshtml"),
+                CreateVersion_2_0_Descriptor("/Areas/Accounts/Manage/Home.cshtml"),
+                CreateVersion_2_0_Descriptor("/Areas/About.cshtml"),
+                CreateVersion_2_0_Descriptor("/Contact.cshtml"),
+            };
+
+            var options = new RazorPagesOptions
+            {
+                AllowAreas = true,
+                RootDirectory = "/",
+            };
+
+            var provider = CreateProvider(options: options, descriptors: descriptors);
+            var context = new PageRouteModelProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                context.RouteModels,
+                result =>
+                {
+                    Assert.Equal("/Areas/Accounts/Pages/Manage/Home.cshtml", result.RelativePath);
+                    Assert.Equal("/Manage/Home", result.ViewEnginePath);
+                    Assert.Collection(
+                        result.Selectors,
+                        selector => Assert.Equal("Accounts/Manage/Home", selector.AttributeRouteModel.Template));
+                    Assert.Collection(
+                        result.RouteValues.OrderBy(k => k.Key),
+                        kvp =>
+                        {
+                            Assert.Equal("area", kvp.Key);
+                            Assert.Equal("Accounts", kvp.Value);
+                        },
+                        kvp =>
+                        {
+                            Assert.Equal("page", kvp.Key);
+                            Assert.Equal("/Manage/Home", kvp.Value);
+                        });
+                },
+                result =>
+                {
+                    Assert.Equal("/Contact.cshtml", result.RelativePath);
+                    Assert.Equal("/Contact", result.ViewEnginePath);
+                    Assert.Collection(
+                        result.Selectors,
+                        selector => Assert.Equal("Contact", selector.AttributeRouteModel.Template));
+                    Assert.Collection(
+                        result.RouteValues.OrderBy(k => k.Key),
+                        kvp =>
+                        {
+                            Assert.Equal("page", kvp.Key);
+                            Assert.Equal("/Contact", kvp.Value);
+                        });
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_AddsMultipleSelectorsForIndexPage_WithIndexAtRoot()
+        {
+            // Arrange
+            var descriptors = new[]
+            {
+                CreateVersion_2_0_Descriptor("/Pages/Index.cshtml"),
+                CreateVersion_2_0_Descriptor("/Pages/Admin/Index.cshtml", "some-template"),
+            };
+            var options = new RazorPagesOptions { RootDirectory = "/" };
+
+            var provider = CreateProvider(options: options, descriptors: descriptors);
+            var context = new PageRouteModelProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                context.RouteModels,
+                result =>
+                {
+                    Assert.Equal("/Pages/Index.cshtml", result.RelativePath);
+                    Assert.Equal("/Pages/Index", result.ViewEnginePath);
+                    Assert.Collection(
+                        result.Selectors,
+                        selector => Assert.Equal("Pages/Index", selector.AttributeRouteModel.Template),
+                        selector => Assert.Equal("Pages", selector.AttributeRouteModel.Template));
+                },
+                result =>
+                {
+                    Assert.Equal("/Pages/Admin/Index.cshtml", result.RelativePath);
+                    Assert.Equal("/Pages/Admin/Index", result.ViewEnginePath);
+                    Assert.Collection(
+                        result.Selectors,
+                        selector => Assert.Equal("Pages/Admin/Index/some-template", selector.AttributeRouteModel.Template),
+                        selector => Assert.Equal("Pages/Admin/some-template", selector.AttributeRouteModel.Template));
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_AddsMultipleSelectorsForIndexPage()
+        {
+            // Arrange
+            var descriptors = new[]
+            {
+                CreateVersion_2_0_Descriptor("/Pages/Index.cshtml"),
+                CreateVersion_2_0_Descriptor("/Pages/Admin/Index.cshtml", "some-template"),
+            };
+
+            var provider = CreateProvider(descriptors: descriptors);
+            var context = new PageRouteModelProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                context.RouteModels,
+                result =>
+                {
+                    Assert.Equal("/Pages/Index.cshtml", result.RelativePath);
+                    Assert.Equal("/Index", result.ViewEnginePath);
+                    Assert.Collection(
+                        result.Selectors,
+                        selector => Assert.Equal("Index", selector.AttributeRouteModel.Template),
+                        selector => Assert.Equal("", selector.AttributeRouteModel.Template));
+                },
+                result =>
+                {
+                    Assert.Equal("/Pages/Admin/Index.cshtml", result.RelativePath);
+                    Assert.Equal("/Admin/Index", result.ViewEnginePath);
+                    Assert.Collection(
+                        result.Selectors,
+                        selector => Assert.Equal("Admin/Index/some-template", selector.AttributeRouteModel.Template),
+                        selector => Assert.Equal("Admin/some-template", selector.AttributeRouteModel.Template));
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_AllowsRouteTemplatesWithOverridePattern()
+        {
+            // Arrange
+            var descriptors = new[]
+            {
+                CreateVersion_2_0_Descriptor("/Pages/Index.cshtml", "~/some-other-prefix"),
+                CreateVersion_2_0_Descriptor("/Pages/Home.cshtml", "/some-prefix"),
+            };
+
+            var provider = CreateProvider(descriptors: descriptors);
+            var context = new PageRouteModelProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                context.RouteModels,
+                result =>
+                {
+                    Assert.Equal("/Pages/Index.cshtml", result.RelativePath);
+                    Assert.Equal("/Index", result.ViewEnginePath);
+                    Assert.Collection(
+                        result.Selectors,
+                        selector => Assert.Equal("some-other-prefix", selector.AttributeRouteModel.Template));
+                },
+                result =>
+                {
+                    Assert.Equal("/Pages/Home.cshtml", result.RelativePath);
+                    Assert.Equal("/Home", result.ViewEnginePath);
+                    Assert.Collection(
+                        result.Selectors,
+                        selector => Assert.Equal("some-prefix", selector.AttributeRouteModel.Template));
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_UsesTheFirstDescriptorForEachPath()
+        {
+            // ViewsFeature may contain duplicate entries for the same Page - for instance when an app overloads a library's views.
+            // It picks the first entry for each path. In the ordinary case, this should ensure that the app's Razor Pages are prefered
+            // to a Razor Page added by a library.
+
+            // Arrange
+            var descriptors = new[]
+            {
+                // Page coming from the app
+                CreateVersion_2_1_Descriptor("/Pages/About.cshtml", metadata: new object[]
+                {
+                    new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), "/Pages/About.cshtml"),
+                }),
+                CreateVersion_2_1_Descriptor("/Pages/Home.cshtml", metadata: new object[]
+                {
+                    new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), "/Pages/Index.cshtml"),
+                }),
+                // Page coming from the app
+                CreateVersion_2_1_Descriptor("/Pages/About.cshtml", metadata: new object[]
+                {
+                    new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), "/Pages/About.cshtml"),
+                }),
+            };
+
+            var provider = CreateProvider(descriptors: descriptors);
+            var context = new PageRouteModelProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                context.RouteModels,
+                result =>
+                {
+                    Assert.Equal("/Pages/About.cshtml", result.RelativePath);
+                    Assert.Equal("/About", result.ViewEnginePath);
+                },
+                result =>
+                {
+                    Assert.Equal("/Pages/Home.cshtml", result.RelativePath);
+                    Assert.Equal("/Home", result.ViewEnginePath);
+                });
+        }
+
+        [Fact]
+        public void GetRouteTemplate_ReturnsPathFromRazorPageAttribute()
+        {
+            // Arrange
+            var expected = "test";
+            var descriptor = CreateVersion_2_0_Descriptor("/Pages/Home.cshtml", expected);
+
+            // Act
+            var result = CompiledPageRouteModelProvider.GetRouteTemplate(descriptor);
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Fact]
+        public void GetRouteTemplate_ReturnsNull_IfPageAttributeDoesNotHaveTemplate()
+        {
+            // Arrange
+            var descriptor = CreateVersion_2_0_Descriptor("/Pages/Home.cshtml", routeTemplate: null);
+
+            // Act
+            var result = CompiledPageRouteModelProvider.GetRouteTemplate(descriptor);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void GetRouteTemplate_ReturnsPathFromMetadataAttribute()
+        {
+            // Arrange
+            var expected = "test";
+            var descriptor = CreateVersion_2_1_Descriptor("/Pages/About.cshtml", metadata: new object[]
+            {
+                new RazorCompiledItemMetadataAttribute("RouteTemplate", expected),
+            });
+
+            // Act
+            var result = CompiledPageRouteModelProvider.GetRouteTemplate(descriptor);
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Fact]
+        public void GetRouteTemplate_ReturnsNull_IfAttributeDoesNotExist()
+        {
+            // Arrange
+            var descriptor = CreateVersion_2_1_Descriptor("/Pages/About.cshtml");
+
+            // Act
+            var result = CompiledPageRouteModelProvider.GetRouteTemplate(descriptor);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        private TestCompiledPageRouteModelProvider CreateProvider(
+           RazorPagesOptions options = null,
+           IList<CompiledViewDescriptor> descriptors = null,
+           VirtualRazorProjectFileSystem fileSystem = null)
+        {
+            options = options ?? new RazorPagesOptions();
+            fileSystem = fileSystem ?? new VirtualRazorProjectFileSystem();
+            var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem);
+
+            var provider = new TestCompiledPageRouteModelProvider(
+                new ApplicationPartManager(),
+                Options.Create(options),
+                projectEngine,
+                NullLogger<CompiledPageRouteModelProvider>.Instance);
+
+            provider.Descriptors.AddRange(descriptors ?? Array.Empty<CompiledViewDescriptor>());
+
+            return provider;
+        }
+
+        private static CompiledViewDescriptor CreateVersion_2_0_Descriptor(string path, string routeTemplate = "")
+        {
+            return new CompiledViewDescriptor
+            {
+                IsPrecompiled = true,
+                RelativePath = path,
+                ViewAttribute = new RazorPageAttribute(path, typeof(object), routeTemplate),
+            };
+        }
+
+        private static CompiledViewDescriptor CreateVersion_2_1_Descriptor(
+            string path,
+            object[] metadata = null)
+        {
+            return new CompiledViewDescriptor
+            {
+                IsPrecompiled = true,
+                RelativePath = path,
+                Item = new TestRazorCompiledItem(typeof(object), "mvc.1.0.razor-page", path, metadata ?? Array.Empty<object>()),
+            };
+        }
+
+        public class TestCompiledPageRouteModelProvider : CompiledPageRouteModelProvider
+        {
+            public TestCompiledPageRouteModelProvider(
+                ApplicationPartManager partManager,
+                IOptions<RazorPagesOptions> options,
+                RazorProjectEngine projectEngine,
+                ILogger<CompiledPageRouteModelProvider> logger)
+                : base(partManager, options, projectEngine, logger)
+            {
+            }
+
+            public List<CompiledViewDescriptor> Descriptors { get; } = new List<CompiledViewDescriptor>();
+
+            protected override ViewsFeature GetViewFeature(ApplicationPartManager applicationManager)
+            {
+                var feature = new ViewsFeature();
+                foreach (var descriptor in Descriptors)
+                {
+                    feature.ViewDescriptors.Add(descriptor);
+                }
+
+                return feature;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/DefaultPageApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/DefaultPageApplicationModelProviderTest.cs
new file mode 100644
index 0000000000..1a82c834ec
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/DefaultPageApplicationModelProviderTest.cs
@@ -0,0 +1,1191 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class DefaultPageApplicationModelProviderTest
+    {
+        [Fact]
+        public void OnProvidersExecuting_ThrowsIfPageDoesNotDeriveFromValidBaseType()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(InvalidPageWithWrongBaseClass).GetTypeInfo();
+            var descriptor = new PageActionDescriptor();
+            var context = new PageApplicationModelProviderContext(descriptor, typeInfo);
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => provider.OnProvidersExecuting(context));
+
+            // Assert
+            Assert.Equal(
+                 $"The type '{typeInfo.FullName}' is not a valid page. A page must inherit from '{typeof(PageBase).FullName}'.",
+                 ex.Message);
+        }
+
+        private class InvalidPageWithWrongBaseClass : RazorPageBase
+        {
+            public override void BeginContext(int position, int length, bool isLiteral)
+            {
+                throw new NotImplementedException();
+            }
+
+            public override void EndContext()
+            {
+                throw new NotImplementedException();
+            }
+
+            public override void EnsureRenderedBodyOrSections()
+            {
+                throw new NotImplementedException();
+            }
+
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_ThrowsIfModelPropertyDoesNotExistOnPage()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(PageWithoutModelProperty).GetTypeInfo();
+            var descriptor = new PageActionDescriptor();
+            var context = new PageApplicationModelProviderContext(descriptor, typeInfo);
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => provider.OnProvidersExecuting(context));
+
+            // Assert
+            Assert.Equal(
+                $"The type '{typeInfo.FullName}' is not a valid page. A page must define a public, non-static 'Model' property.",
+                ex.Message);
+        }
+
+        private class PageWithoutModelProperty : PageBase
+        {
+            public override Task ExecuteAsync() => throw new NotImplementedException();
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_ThrowsIfModelPropertyIsNotPublic()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(PageWithNonVisibleModel).GetTypeInfo();
+            var descriptor = new PageActionDescriptor();
+            var context = new PageApplicationModelProviderContext(descriptor, typeInfo);
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => provider.OnProvidersExecuting(context));
+
+            // Assert
+            Assert.Equal(
+                $"The type '{typeInfo.FullName}' is not a valid page. A page must define a public, non-static 'Model' property.",
+                ex.Message);
+        }
+
+        private class PageWithNonVisibleModel : PageBase
+        {
+            private object Model => null;
+
+            public override Task ExecuteAsync() => throw new NotImplementedException();
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_ThrowsIfModelPropertyIsStatic()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(PageWithStaticModel).GetTypeInfo();
+            var descriptor = new PageActionDescriptor();
+            var context = new PageApplicationModelProviderContext(descriptor, typeInfo);
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => provider.OnProvidersExecuting(context));
+
+            // Assert
+            Assert.Equal(
+                $"The type '{typeInfo.FullName}' is not a valid page. A page must define a public, non-static 'Model' property.",
+                ex.Message);
+        }
+
+        private class PageWithStaticModel : PageBase
+        {
+            public static object Model => null;
+
+            public override Task ExecuteAsync() => throw new NotImplementedException();
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_DiscoversPropertiesFromPage_IfModelTypeDoesNotHaveAttribute()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(PageWithModelWithoutPageModelAttribute).GetTypeInfo();
+            var descriptor = new PageActionDescriptor();
+            var context = new PageApplicationModelProviderContext(descriptor, typeInfo);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.NotNull(context.PageApplicationModel);
+            var propertiesOnPage = context.PageApplicationModel.HandlerProperties
+                .Where(p => p.PropertyInfo.DeclaringType.GetTypeInfo() == typeInfo);
+            Assert.Collection(
+                propertiesOnPage.OrderBy(p => p.PropertyName),
+                property =>
+                {
+                    Assert.Equal(typeInfo.GetProperty(nameof(PageWithModelWithoutPageModelAttribute.Model)), property.PropertyInfo);
+                    Assert.Equal(nameof(PageWithModelWithoutPageModelAttribute.Model), property.PropertyName);
+                },
+                property =>
+                {
+                    Assert.Equal(typeInfo.GetProperty(nameof(PageWithModelWithoutPageModelAttribute.Property1)), property.PropertyInfo);
+                    Assert.Null(property.BindingInfo);
+                    Assert.Equal(nameof(PageWithModelWithoutPageModelAttribute.Property1), property.PropertyName);
+                },
+                property =>
+                {
+                    Assert.Equal(typeInfo.GetProperty(nameof(PageWithModelWithoutPageModelAttribute.Property2)), property.PropertyInfo);
+                    Assert.Equal(nameof(PageWithModelWithoutPageModelAttribute.Property2), property.PropertyName);
+                    Assert.NotNull(property.BindingInfo);
+                    Assert.Equal(BindingSource.Path, property.BindingInfo.BindingSource);
+                });
+        }
+
+        private class PageWithModelWithoutPageModelAttribute : Page
+        {
+            public string Property1 { get; set; }
+
+            [FromRoute]
+            public object Property2 { get; set; }
+
+            public ModelWithoutPageModelAttribute Model => null;
+
+            public override Task ExecuteAsync() => throw new NotImplementedException();
+        }
+
+        private class ModelWithoutPageModelAttribute
+        {
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_DiscoversPropertiesFromPageModel_IfModelHasAttribute()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(PageWithModelWithPageModelAttribute).GetTypeInfo();
+            var modelType = typeof(ModelWithPageModelAttribute);
+            var descriptor = new PageActionDescriptor();
+            var context = new PageApplicationModelProviderContext(descriptor, typeInfo);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.NotNull(context.PageApplicationModel);
+            Assert.Collection(
+                context.PageApplicationModel.HandlerProperties.OrderBy(p => p.PropertyName),
+                property =>
+                {
+                    Assert.Equal(modelType.GetProperty(nameof(ModelWithPageModelAttribute.Property)), property.PropertyInfo);
+                    Assert.Equal(nameof(ModelWithPageModelAttribute.Property), property.PropertyName);
+                    Assert.NotNull(property.BindingInfo);
+                    Assert.Equal(BindingSource.Path, property.BindingInfo.BindingSource);
+                });
+        }
+
+        private class PageWithModelWithPageModelAttribute : Page
+        {
+            public string Property1 { get; set; }
+
+            [FromRoute]
+            public object Property2 { get; set; }
+
+            public ModelWithPageModelAttribute Model => null;
+            public override Task ExecuteAsync() => throw new NotImplementedException();
+        }
+
+        [PageModel]
+        private class ModelWithPageModelAttribute
+        {
+            [FromRoute]
+            public string Property { get; set; }
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_DiscoversProperties_FromAllSubTypesThatDeclaresBindProperty()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(BindPropertyAttributeOnBaseModelPage).GetTypeInfo();
+            var descriptor = new PageActionDescriptor();
+            var context = new PageApplicationModelProviderContext(descriptor, typeInfo);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.NotNull(context.PageApplicationModel);
+            Assert.Collection(
+                context.PageApplicationModel.HandlerProperties.OrderBy(p => p.PropertyName).Where(p => p.BindingInfo != null),
+                property =>
+                {
+                    var name = nameof(ModelLevel3.Property2);
+                    Assert.Equal(typeof(ModelLevel3).GetProperty(name), property.PropertyInfo);
+                    Assert.Equal(name, property.PropertyName);
+                    Assert.NotNull(property.BindingInfo);
+                },
+                property =>
+                {
+                    var name = nameof(ModelLevel3.Property3);
+                    Assert.Equal(typeof(ModelLevel3).GetProperty(name), property.PropertyInfo);
+                    Assert.Equal(name, property.PropertyName);
+                    Assert.NotNull(property.BindingInfo);
+                });
+        }
+
+        private class BindPropertyAttributeOnBaseModelPage : Page
+        {
+            public ModelLevel3 Model => null;
+            public override Task ExecuteAsync() => throw new NotImplementedException();
+        }
+
+        private class ModelLevel1 : PageModel
+        {
+            public string Property1 { get; set; }
+        }
+
+        [BindProperties]
+        private class ModelLevel2 : ModelLevel1
+        {
+            public string Property2 { get; set; }
+        }
+
+        private class ModelLevel3 : ModelLevel2
+        {
+            public string Property3 { get; set; }
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_DiscoversHandlersFromPage()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(PageWithModelWithoutHandlers).GetTypeInfo();
+            var descriptor = new PageActionDescriptor();
+            var context = new PageApplicationModelProviderContext(descriptor, typeInfo);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.NotNull(context.PageApplicationModel);
+            Assert.Collection(
+                context.PageApplicationModel.HandlerMethods.OrderBy(p => p.Name),
+                handler =>
+                {
+                    var name = nameof(PageWithModelWithoutHandlers.OnGet);
+                    Assert.Equal(typeInfo.GetMethod(name), handler.MethodInfo);
+                    Assert.Equal(name, handler.Name);
+                    Assert.Equal("Get", handler.HttpMethod);
+                    Assert.Null(handler.HandlerName);
+                },
+                handler =>
+                {
+                    var name = nameof(PageWithModelWithoutHandlers.OnPostAsync);
+                    Assert.Equal(typeInfo.GetMethod(name), handler.MethodInfo);
+                    Assert.Equal(name, handler.Name);
+                    Assert.Equal("Post", handler.HttpMethod);
+                    Assert.Null(handler.HandlerName);
+                },
+                handler =>
+                {
+                    var name = nameof(PageWithModelWithoutHandlers.OnPostDeleteCustomerAsync);
+                    Assert.Equal(typeInfo.GetMethod(name), handler.MethodInfo);
+                    Assert.Equal(name, handler.Name);
+                    Assert.Equal("Post", handler.HttpMethod);
+                    Assert.Equal("DeleteCustomer", handler.HandlerName);
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_DiscoversPropertiesFromModel()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(PageWithModel).GetTypeInfo();
+            var modelType = typeof(TestPageModel);
+            var descriptor = new PageActionDescriptor();
+            var context = new PageApplicationModelProviderContext(descriptor, typeInfo);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.NotNull(context.PageApplicationModel);
+            Assert.Collection(
+                context.PageApplicationModel.HandlerProperties.OrderBy(p => p.PropertyName),
+                property =>
+                {
+                    var name = nameof(TestPageModel.Property1);
+                    Assert.Equal(modelType.GetProperty(name), property.PropertyInfo);
+                    Assert.Null(property.BindingInfo);
+                    Assert.Equal(name, property.PropertyName);
+                },
+                property =>
+                {
+                    var name = nameof(TestPageModel.Property2);
+                    Assert.Equal(modelType.GetProperty(name), property.PropertyInfo);
+                    Assert.Equal(name, property.PropertyName);
+                    Assert.NotNull(property.BindingInfo);
+                    Assert.Equal(BindingSource.Query, property.BindingInfo.BindingSource);
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_DiscoversBindingInfoFromHandler()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(PageWithBindPropertyModel).GetTypeInfo();
+            var modelType = typeof(ModelWithBindProperty);
+            var descriptor = new PageActionDescriptor();
+            var context = new PageApplicationModelProviderContext(descriptor, typeInfo);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.NotNull(context.PageApplicationModel);
+            Assert.Collection(
+                context.PageApplicationModel.HandlerProperties.OrderBy(p => p.PropertyName),
+                property =>
+                {
+                    Assert.Equal(nameof(ModelWithBindProperty.Property1), property.PropertyName);
+                    Assert.NotNull(property.BindingInfo);
+                },
+                property =>
+                {
+                    Assert.Equal(nameof(ModelWithBindProperty.Property2), property.PropertyName);
+                    Assert.NotNull(property.BindingInfo);
+                    Assert.Equal(BindingSource.Path, property.BindingInfo.BindingSource);
+                });
+        }
+
+        private class PageWithBindPropertyModel : PageBase
+        {
+            public ModelWithBindProperty Model => null;
+
+            public override Task ExecuteAsync() => null;
+        }
+
+        [BindProperties]
+        [PageModel]
+        private class ModelWithBindProperty
+        {
+            public string Property1 { get; set; }
+
+            [FromRoute]
+            public string Property2 { get; set; }
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_DiscoversHandlersFromModel()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(PageWithModel).GetTypeInfo();
+            var modelType = typeof(TestPageModel);
+            var descriptor = new PageActionDescriptor();
+            var context = new PageApplicationModelProviderContext(descriptor, typeInfo);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.NotNull(context.PageApplicationModel);
+            Assert.Collection(
+                context.PageApplicationModel.HandlerMethods.OrderBy(p => p.Name),
+                handler =>
+                {
+                    var name = nameof(TestPageModel.OnGetUser);
+                    Assert.Equal(modelType.GetMethod(name), handler.MethodInfo);
+                    Assert.Equal(name, handler.Name);
+                    Assert.Equal("Get", handler.HttpMethod);
+                    Assert.Equal("User", handler.HandlerName);
+                });
+        }
+
+        // We want to test the 'empty' page has no bound properties, and no handler methods.
+        [Fact]
+        public void OnProvidersExecuting_EmptyPage()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(EmptyPage).GetTypeInfo();
+            var context = new PageApplicationModelProviderContext(new PageActionDescriptor(), typeInfo);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var pageModel = context.PageApplicationModel;
+            Assert.Empty(pageModel.HandlerProperties.Where(p => p.BindingInfo != null));
+            Assert.Empty(pageModel.HandlerMethods);
+            Assert.Same(typeof(EmptyPage).GetTypeInfo(), pageModel.HandlerType);
+            Assert.Same(typeof(EmptyPage).GetTypeInfo(), pageModel.ModelType);
+            Assert.Same(typeof(EmptyPage).GetTypeInfo(), pageModel.PageType);
+        }
+
+        // We want to test the 'empty' page and pagemodel has no bound properties, and no handler methods.
+        [Fact]
+        public void OnProvidersExecuting_EmptyPageModel()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(EmptyPageWithPageModel).GetTypeInfo();
+            var context = new PageApplicationModelProviderContext(new PageActionDescriptor(), typeInfo);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var pageModel = context.PageApplicationModel;
+            Assert.Empty(pageModel.HandlerProperties.Where(p => p.BindingInfo != null));
+            Assert.Empty(pageModel.HandlerMethods);
+            Assert.Same(typeof(EmptyPageModel).GetTypeInfo(), pageModel.DeclaredModelType);
+            Assert.Same(typeof(EmptyPageModel).GetTypeInfo(), pageModel.ModelType);
+            Assert.Same(typeof(EmptyPageModel).GetTypeInfo(), pageModel.HandlerType);
+            Assert.Same(typeof(EmptyPageWithPageModel).GetTypeInfo(), pageModel.PageType);
+        }
+
+        private class EmptyPage : Page
+        {
+            // Copied from generated code
+            [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+            public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+            [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+            public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+            [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+            public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+            [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+            public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+            [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+            public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<EmptyPage> Html { get; private set; }
+            public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<EmptyPage> ViewData => null;
+            public EmptyPage Model => ViewData.Model;
+
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class EmptyPageWithPageModel : Page
+        {
+            // Copied from generated code
+            [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+            public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+            [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+            public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+            [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+            public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+            [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+            public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+            [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+            public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<EmptyPageModel> Html { get; private set; }
+            public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<EmptyPageModel> ViewData => null;
+            public EmptyPageModel Model => ViewData.Model;
+
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class EmptyPageModel : PageModel
+        {
+        }
+
+        [Fact] // If the model has handler methods, we prefer those.
+        public void CreateDescriptor_FindsHandlerMethod_OnModel()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(PageWithHandlerThatGetsIgnored).GetTypeInfo();
+            var modelType = typeof(ModelWithHandler);
+            var context = new PageApplicationModelProviderContext(new PageActionDescriptor(), typeInfo);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var pageModel = context.PageApplicationModel;
+            Assert.Contains(
+                pageModel.HandlerProperties,
+                p => p.PropertyInfo == modelType.GetProperty(nameof(ModelWithHandler.BindMe)));
+
+            Assert.Collection(
+                pageModel.HandlerMethods,
+                p => Assert.Equal(modelType.GetMethod(nameof(ModelWithHandler.OnGet)), p.MethodInfo));
+
+            Assert.Same(typeof(ModelWithHandler).GetTypeInfo(), pageModel.HandlerType);
+            Assert.Same(typeof(ModelWithHandler).GetTypeInfo(), pageModel.ModelType);
+            Assert.Same(typeof(PageWithHandlerThatGetsIgnored).GetTypeInfo(), pageModel.PageType);
+        }
+
+        private class ModelWithHandler : PageModel
+        {
+            [ModelBinder]
+            public int BindMe { get; set; }
+
+            public void OnGet() { }
+        }
+
+        private class PageWithHandlerThatGetsIgnored : Page
+        {
+            public ModelWithHandler Model => null;
+
+            [ModelBinder]
+            public int IgnoreMe { get; set; }
+
+            public void OnPost() { }
+
+            public override Task ExecuteAsync() => throw new NotImplementedException();
+        }
+
+        [Fact] // If the model does not have the PageModelAttribute, we look at the page instead.
+        public void OnProvidersExecuting_FindsHandlerMethodOnPage_WhenModelIsNotAnnotatedWithPageModelAttribute()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(PageWithHandler).GetTypeInfo();
+            var context = new PageApplicationModelProviderContext(new PageActionDescriptor(), typeInfo);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var pageModel = context.PageApplicationModel;
+            var propertiesOnPage = pageModel.HandlerProperties
+                .Where(p => p.PropertyInfo.DeclaringType.GetTypeInfo() == typeInfo);
+            Assert.Collection(
+                propertiesOnPage.OrderBy(p => p.PropertyName),
+                p => Assert.Equal(typeInfo.GetProperty(nameof(PageWithHandler.BindMe)), p.PropertyInfo),
+                p => Assert.Equal(typeInfo.GetProperty(nameof(PageWithHandler.Model)), p.PropertyInfo));
+
+            Assert.Collection(
+                pageModel.HandlerMethods,
+                p => Assert.Equal(typeInfo.GetMethod(nameof(PageWithHandler.OnGet)), p.MethodInfo));
+
+            Assert.Same(typeof(PageWithHandler).GetTypeInfo(), pageModel.HandlerType);
+            Assert.Same(typeof(PocoModel).GetTypeInfo(), pageModel.ModelType);
+            Assert.Same(typeof(PageWithHandler).GetTypeInfo(), pageModel.PageType);
+        }
+
+        private class PageWithHandler : Page
+        {
+            public PocoModel Model => null;
+
+            [ModelBinder]
+            public int BindMe { get; set; }
+
+            public void OnGet() { }
+
+            public override Task ExecuteAsync() => throw new NotImplementedException();
+        }
+
+        private class PocoModel
+        {
+            // Just a plain ol' model, nothing to see here.
+
+            [ModelBinder]
+            public int IgnoreMe { get; set; }
+
+            public void OnGet() { }
+        }
+
+        [Fact]
+        public void PopulateHandlerMethods_DiscoversHandlersFromBaseType()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(InheritsMethods).GetTypeInfo();
+            var baseType = typeof(TestSetPageModel);
+            var pageModel = new PageApplicationModel(new PageActionDescriptor(), typeInfo, new object[0]);
+
+            // Act
+            provider.PopulateHandlerMethods(pageModel);
+
+            // Assert
+            var handlerMethods = pageModel.HandlerMethods;
+            Assert.Collection(
+                handlerMethods.OrderBy(h => h.MethodInfo.DeclaringType.Name).ThenBy(h => h.MethodInfo.Name),
+                handler =>
+                {
+                    Assert.Equal(nameof(InheritsMethods.OnGet), handler.MethodInfo.Name);
+                    Assert.Equal(typeInfo, handler.MethodInfo.DeclaringType.GetTypeInfo());
+                },
+                handler =>
+                {
+                    Assert.Equal(nameof(TestSetPageModel.OnGet), handler.MethodInfo.Name);
+                    Assert.Equal(baseType, handler.MethodInfo.DeclaringType);
+                },
+                handler =>
+                {
+                    Assert.Equal(nameof(TestSetPageModel.OnPost), handler.MethodInfo.Name);
+                    Assert.Equal(baseType, handler.MethodInfo.DeclaringType);
+                });
+        }
+
+        private class TestSetPageModel
+        {
+            public void OnGet()
+            {
+            }
+
+            public void OnPost()
+            {
+            }
+        }
+
+        private class InheritsMethods : TestSetPageModel
+        {
+            public new void OnGet()
+            {
+            }
+        }
+
+        [Fact]
+        public void PopulateHandlerMethods_IgnoresNonPublicMethods()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(ProtectedModel).GetTypeInfo();
+            var baseType = typeof(TestSetPageModel);
+            var pageModel = new PageApplicationModel(new PageActionDescriptor(), typeInfo, new object[0]);
+
+            // Act
+            provider.PopulateHandlerMethods(pageModel);
+
+            // Assert
+            var handlerMethods = pageModel.HandlerMethods;
+            Assert.Empty(handlerMethods);
+        }
+
+        private class ProtectedModel
+        {
+            protected void OnGet()
+            {
+            }
+
+            private void OnPost()
+            {
+            }
+        }
+
+        [Fact]
+        public void PopulateHandlerMethods_IgnoreGenericTypeParameters()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(GenericClassModel).GetTypeInfo();
+            var pageModel = new PageApplicationModel(new PageActionDescriptor(), typeInfo, new object[0]);
+
+            // Act
+            provider.PopulateHandlerMethods(pageModel);
+
+            // Assert
+            var handlerMethods = pageModel.HandlerMethods;
+            Assert.Empty(handlerMethods);
+        }
+
+        private class GenericClassModel
+        {
+            public void OnGet<T>()
+            {
+            }
+        }
+
+        [Fact]
+        public void PopulateHandlerMethods_IgnoresStaticMethods()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(PageModelWithStaticHandler).GetTypeInfo();
+            var expected = typeInfo.GetMethod(nameof(PageModelWithStaticHandler.OnGet), BindingFlags.Public | BindingFlags.Instance);
+            var pageModel = new PageApplicationModel(new PageActionDescriptor(), typeInfo, new object[0]);
+
+            // Act
+            provider.PopulateHandlerMethods(pageModel);
+
+            // Assert
+            var handlerMethods = pageModel.HandlerMethods;
+            Assert.Collection(
+                handlerMethods,
+                handler => Assert.Same(expected, handler.MethodInfo));
+        }
+
+        private class PageModelWithStaticHandler
+        {
+            public static void OnGet(string name)
+            {
+            }
+
+            public void OnGet()
+            {
+            }
+        }
+
+        [Fact]
+        public void PopulateHandlerMethods_IgnoresAbstractMethods()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(PageModelWithAbstractMethod).GetTypeInfo();
+            var expected = typeInfo.GetMethod(nameof(PageModelWithAbstractMethod.OnGet), BindingFlags.Public | BindingFlags.Instance);
+            var pageModel = new PageApplicationModel(new PageActionDescriptor(), typeInfo, new object[0]);
+
+            // Act
+            provider.PopulateHandlerMethods(pageModel);
+
+            // Assert
+            var handlerMethods = pageModel.HandlerMethods;
+            Assert.Collection(
+                handlerMethods,
+                handler => Assert.Same(expected, handler.MethodInfo));
+        }
+
+        private abstract class PageModelWithAbstractMethod
+        {
+            public abstract void OnPost(string name);
+
+            public void OnGet()
+            {
+            }
+        }
+
+        [Fact]
+        public void PopulateHandlerMethods_IgnoresMethodWithNonHandlerAttribute()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(PageWithNonHandlerMethod).GetTypeInfo();
+            var expected = typeInfo.GetMethod(nameof(PageWithNonHandlerMethod.OnGet), BindingFlags.Public | BindingFlags.Instance);
+            var pageModel = new PageApplicationModel(new PageActionDescriptor(), typeInfo, new object[0]);
+
+            // Act
+            provider.PopulateHandlerMethods(pageModel);
+
+            // Assert
+            var handlerMethods = pageModel.HandlerMethods;
+            Assert.Collection(
+                handlerMethods,
+                handler => Assert.Same(expected, handler.MethodInfo));
+        }
+
+        private class PageWithNonHandlerMethod
+        {
+            [NonHandler]
+            public void OnPost(string name) { }
+
+            public void OnGet()
+            {
+            }
+        }
+
+        // There are more tests for the parsing elsewhere, this is just testing that it's wired
+        // up to the model.
+        [Fact]
+        public void CreateHandlerModel_ParsesMethod()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(PageModelWithHandlerNames).GetTypeInfo();
+            var pageModel = new PageApplicationModel(new PageActionDescriptor(), typeInfo, new object[0]);
+
+            // Act
+            provider.PopulateHandlerMethods(pageModel);
+
+            // Assert
+            var handlerMethods = pageModel.HandlerMethods;
+            Assert.Collection(
+                handlerMethods.OrderBy(h => h.MethodInfo.Name),
+                handler =>
+                {
+                    Assert.Same(typeInfo.GetMethod(nameof(PageModelWithHandlerNames.OnPutDeleteAsync)), handler.MethodInfo);
+                    Assert.Equal("Put", handler.HttpMethod);
+                    Assert.Equal("Delete", handler.HandlerName);
+                });
+        }
+
+        private class PageModelWithHandlerNames
+        {
+            public void OnPutDeleteAsync()
+            {
+            }
+
+            public void Foo() // This isn't a valid handler name.
+            {
+            }
+        }
+
+        [Fact]
+        public void CreateHandlerMethods_AddsParameterDescriptors()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(PageWithHandlerParameters).GetTypeInfo();
+            var expected = typeInfo.GetMethod(nameof(PageWithHandlerParameters.OnPost));
+            var pageModel = new PageApplicationModel(new PageActionDescriptor(), typeInfo, new object[0]);
+
+            // Act
+            provider.PopulateHandlerMethods(pageModel);
+
+            // Assert
+            var handlerMethods = pageModel.HandlerMethods;
+            var handler = Assert.Single(handlerMethods);
+
+            Assert.Collection(
+                handler.Parameters,
+                p =>
+                {
+                    Assert.NotNull(p.ParameterInfo);
+                    Assert.Equal(typeof(string), p.ParameterInfo.ParameterType);
+                    Assert.Equal("name", p.ParameterName);
+                },
+                p =>
+                {
+                    Assert.NotNull(p.ParameterInfo);
+                    Assert.Equal(typeof(int), p.ParameterInfo.ParameterType);
+                    Assert.Equal("id", p.ParameterName);
+                    Assert.Equal("personId", p.BindingInfo.BinderModelName);
+                });
+        }
+
+        [Fact]
+        public void CreateHandlerMethods_WithLegacyValidationBehavior_AddsParameterDescriptors()
+        {
+            // Arrange
+            var provider = new DefaultPageApplicationModelProvider(
+                TestModelMetadataProvider.CreateDefaultProvider(),
+                Options.Create(new MvcOptions { AllowValidatingTopLevelNodes = false }));
+            var typeInfo = typeof(PageWithHandlerParameters).GetTypeInfo();
+            var expected = typeInfo.GetMethod(nameof(PageWithHandlerParameters.OnPost));
+            var pageModel = new PageApplicationModel(new PageActionDescriptor(), typeInfo, new object[0]);
+
+            // Act
+            provider.PopulateHandlerMethods(pageModel);
+
+            // Assert
+            var handlerMethods = pageModel.HandlerMethods;
+            var handler = Assert.Single(handlerMethods);
+
+            Assert.Collection(
+                handler.Parameters,
+                p =>
+                {
+                    Assert.NotNull(p.ParameterInfo);
+                    Assert.Equal(typeof(string), p.ParameterInfo.ParameterType);
+                    Assert.Equal("name", p.ParameterName);
+                },
+                p =>
+                {
+                    Assert.NotNull(p.ParameterInfo);
+                    Assert.Equal(typeof(int), p.ParameterInfo.ParameterType);
+                    Assert.Equal("id", p.ParameterName);
+                    Assert.Equal("personId", p.BindingInfo.BinderModelName);
+                });
+        }
+
+        private class PageWithHandlerParameters
+        {
+            public void OnPost(string name, [ModelBinder(Name = "personId")] int id) { }
+        }
+
+        // We're using PropertyHelper from Common to find the properties here, which implements 
+        // out standard set of semantics for properties that the framework interacts with.
+        // 
+        // One of the desirable consequences of that is we only find 'visible' properties. We're not 
+        // retesting all of the details of PropertyHelper here, just the visibility part as a quick check 
+        // that we're using PropertyHelper as expected.
+        [Fact]
+        public void PopulateHandlerProperties_UsesPropertyHelpers_ToFindProperties()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(HidesAProperty).GetTypeInfo();
+            var pageModel = new PageApplicationModel(new PageActionDescriptor(), typeInfo, new object[0]);
+
+            // Act
+            provider.PopulateHandlerProperties(pageModel);
+
+            // Assert
+            var properties = pageModel.HandlerProperties;
+            Assert.Collection(
+                properties,
+                p =>
+                {
+                    Assert.Equal(typeof(HidesAProperty).GetTypeInfo(), p.PropertyInfo.DeclaringType.GetTypeInfo());
+                });
+        }
+
+        private class HasAHiddenProperty
+        {
+            [BindProperty]
+            public int Property { get; set; }
+        }
+
+        private class HidesAProperty : HasAHiddenProperty
+        {
+            [BindProperty]
+            public new int Property { get; set; }
+        }
+
+        [Fact]
+        public void PopulateHandlerProperties_SupportsGet_OnProperty()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(ModelSupportsGetOnProperty).GetTypeInfo();
+            var pageModel = new PageApplicationModel(new PageActionDescriptor(), typeInfo, new object[0]);
+
+            // Act
+            provider.PopulateHandlerProperties(pageModel);
+
+            // Assert
+            var properties = pageModel.HandlerProperties;
+            Assert.Collection(
+                properties.OrderBy(p => p.PropertyName),
+                p =>
+                {
+                    Assert.Equal(typeInfo.GetProperty(nameof(ModelSupportsGetOnProperty.Property)), p.PropertyInfo);
+                    Assert.NotNull(p.BindingInfo.RequestPredicate);
+                    Assert.True(p.BindingInfo.RequestPredicate(new ActionContext
+                    {
+                        HttpContext = new DefaultHttpContext
+                        {
+                            Request =
+                            {
+                                Method ="GET",
+                            }
+                        }
+                    }));
+                });
+        }
+
+        private class ModelSupportsGetOnProperty
+        {
+            [BindProperty(SupportsGet = true)]
+            public int Property { get; set; }
+        }
+
+        [Theory]
+        [InlineData("Foo")]
+        [InlineData("On")]
+        [InlineData("OnAsync")]
+        [InlineData("Async")]
+        public void TryParseHandler_ParsesHandlerNames_InvalidData(string methodName)
+        {
+            // Act
+            var result = DefaultPageApplicationModelProvider.TryParseHandlerMethod(methodName, out var httpMethod, out var handler);
+
+            // Assert
+            Assert.False(result);
+            Assert.Null(httpMethod);
+            Assert.Null(handler);
+        }
+
+        [Theory]
+        [InlineData("OnG", "G", null)]
+        [InlineData("OnGAsync", "G", null)]
+        [InlineData("OnPOST", "P", "OST")]
+        [InlineData("OnPOSTAsync", "P", "OST")]
+        [InlineData("OnDeleteFoo", "Delete", "Foo")]
+        [InlineData("OnDeleteFooAsync", "Delete", "Foo")]
+        [InlineData("OnMadeupLongHandlerName", "Madeup", "LongHandlerName")]
+        [InlineData("OnMadeupLongHandlerNameAsync", "Madeup", "LongHandlerName")]
+        public void TryParseHandler_ParsesHandlerNames_ValidData(string methodName, string expectedHttpMethod, string expectedHandler)
+        {
+            // Arrange
+
+            // Act
+            var result = DefaultPageApplicationModelProvider.TryParseHandlerMethod(methodName, out var httpMethod, out var handler);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal(expectedHttpMethod, httpMethod);
+            Assert.Equal(expectedHandler, handler);
+        }
+
+        private class PageWithModelWithoutHandlers : Page
+        {
+            public ModelWithoutHandler Model { get; }
+
+            public override Task ExecuteAsync() => throw new NotImplementedException();
+
+            public void OnGet() { }
+
+            public void OnPostAsync() { }
+
+            public void OnPostDeleteCustomerAsync() { }
+
+            public class ModelWithoutHandler
+            {
+            }
+        }
+
+        private class PageWithModel : Page
+        {
+            public TestPageModel Model { get; }
+
+            public override Task ExecuteAsync() => throw new NotImplementedException();
+        }
+
+        [PageModel]
+        private class TestPageModel
+        {
+            public string Property1 { get; set; }
+
+            [FromQuery]
+            public string Property2 { get; set; }
+
+            public void OnGetUser() { }
+        }
+
+        [Fact]
+        public void PopulateFilters_AddsIFilterMetadataAttributesToModel()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(FilterModel).GetTypeInfo();
+            var pageModel = new PageApplicationModel(new PageActionDescriptor(), typeInfo, typeInfo.GetCustomAttributes(inherit: true));
+
+            // Act
+            provider.PopulateFilters(pageModel);
+
+            // Assert
+            Assert.Collection(
+                pageModel.Filters,
+                filter => Assert.IsType<TypeFilterAttribute>(filter));
+        }
+
+        [PageModel]
+        [Serializable]
+        [TypeFilter(typeof(object))]
+        private class FilterModel
+        {
+        }
+
+        [Fact]
+        public void PopulateFilters_AddsPageHandlerPageFilter_IfPageImplementsIAsyncPageFilter()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(ModelImplementingAsyncPageFilter).GetTypeInfo();
+            var pageModel = new PageApplicationModel(new PageActionDescriptor(), typeInfo, typeInfo.GetCustomAttributes(inherit: true));
+
+            // Act
+            provider.PopulateFilters(pageModel);
+
+            // Assert
+            Assert.Collection(
+                pageModel.Filters,
+                filter => Assert.IsType<PageHandlerPageFilter>(filter));
+        }
+
+        private class ModelImplementingAsyncPageFilter : IAsyncPageFilter
+        {
+            public Task OnPageHandlerExecutionAsync(PageHandlerExecutingContext context, PageHandlerExecutionDelegate next)
+            {
+                throw new NotImplementedException();
+            }
+
+            public Task OnPageHandlerSelectionAsync(PageHandlerSelectedContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        [Fact]
+        public void PopulateFilters_AddsPageHandlerPageFilter_IfPageImplementsIPageFilter()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(ModelImplementingPageFilter).GetTypeInfo();
+            var pageModel = new PageApplicationModel(new PageActionDescriptor(), typeInfo, typeInfo.GetCustomAttributes(inherit: true));
+
+            // Act
+            provider.PopulateFilters(pageModel);
+
+            // Assert
+            Assert.Collection(
+                pageModel.Filters,
+                filter => Assert.IsType<PageHandlerPageFilter>(filter));
+        }
+
+        private class ModelImplementingPageFilter : IPageFilter
+        {
+            public void OnPageHandlerExecuted(PageHandlerExecutedContext context)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void OnPageHandlerExecuting(PageHandlerExecutingContext context)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void OnPageHandlerSelected(PageHandlerSelectedContext context)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        [Fact]
+        public void PopulateFilters_AddsPageHandlerPageFilter_ForModelDerivingFromTypeImplementingPageFilter()
+        {
+            // Arrange
+            var provider = CreateProvider();
+            var typeInfo = typeof(DerivedFromPageModel).GetTypeInfo();
+            var pageModel = new PageApplicationModel(new PageActionDescriptor(), typeInfo, typeInfo.GetCustomAttributes(inherit: true));
+
+            // Act
+            provider.PopulateFilters(pageModel);
+
+            // Assert
+            Assert.Collection(
+                pageModel.Filters,
+                filter => Assert.IsType<ServiceFilterAttribute>(filter),
+                filter => Assert.IsType<PageHandlerPageFilter>(filter));
+        }
+
+        [ServiceFilter(typeof(IServiceProvider))]
+        private class DerivedFromPageModel : PageModel { }
+
+        private static DefaultPageApplicationModelProvider CreateProvider()
+        {
+            return new DefaultPageApplicationModelProvider(
+                TestModelMetadataProvider.CreateDefaultProvider(),
+                Options.Create(new MvcOptions { AllowValidatingTopLevelNodes = true }));
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/DefaultPageHandlerMethodSelectorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/DefaultPageHandlerMethodSelectorTest.cs
new file mode 100644
index 0000000000..f4fe43fdf2
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/DefaultPageHandlerMethodSelectorTest.cs
@@ -0,0 +1,741 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class DefaultPageHandlerMethodSelectorTest
+    {
+        [Fact]
+        public void LegacyBehavior_Select_ReturnsNull_WhenNoHandlerMatchesHttpMethod()
+        {
+            // Arrange
+            var descriptor1 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "GET"
+            };
+
+            var descriptor2 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "POST"
+            };
+
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = new CompiledPageActionDescriptor
+                {
+                    HandlerMethods = new List<HandlerMethodDescriptor>()
+                    {
+                        descriptor1,
+                        descriptor2,
+                    },
+                },
+                RouteData = new RouteData(),
+                HttpContext = new DefaultHttpContext
+                {
+                    Request =
+                    {
+                        Method = "PUT"
+                    },
+                },
+            };
+            var selector = CreateSelector(legacyBehavior: true);
+
+            // Act
+            var actual = selector.Select(pageContext);
+
+            // Assert
+            Assert.Null(actual);
+        }
+
+        [Fact]
+        public void NewBehavior_Select_ReturnsFuzzyMatchForHead_WhenNoHeadHandlerDefined()
+        {
+            // Arrange
+            var descriptor1 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "GET"
+            };
+
+            var descriptor2 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "POST"
+            };
+
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = new CompiledPageActionDescriptor
+                {
+                    HandlerMethods = new List<HandlerMethodDescriptor>()
+                    {
+                        descriptor1,
+                        descriptor2,
+                    },
+                },
+                RouteData = new RouteData(),
+                HttpContext = new DefaultHttpContext
+                {
+                    Request =
+                    {
+                        Method = "HEAD"
+                    },
+                },
+            };
+            var selector = CreateSelector();
+
+            // Act
+            var actual = selector.Select(pageContext);
+
+            // Assert
+            Assert.Same(descriptor1, actual);
+        }
+
+        [Fact]
+        public void NewBehavior_Select_PrefersExactMatch()
+        {
+            // Arrange
+            var descriptor1 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "GET"
+            };
+
+            var descriptor2 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "POST"
+            };
+
+            var descriptor3 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "HEAD"
+            };
+
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = new CompiledPageActionDescriptor
+                {
+                    HandlerMethods = new List<HandlerMethodDescriptor>()
+                    {
+                        descriptor1,
+                        descriptor2,
+                        descriptor3,
+                    },
+                },
+                RouteData = new RouteData(),
+                HttpContext = new DefaultHttpContext
+                {
+                    Request =
+                    {
+                        Method = "HEAD",
+                    },
+                },
+            };
+            var selector = CreateSelector();
+
+            // Act
+            var actual = selector.Select(pageContext);
+
+            // Assert
+            Assert.Same(descriptor3, actual);
+        }
+
+        [Fact]
+        public void NewBehavior_Select_PrefersExactMatch_ReturnsNullWhenHandlerNameDoesntMatch()
+        {
+            // Arrange
+            var descriptor1 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "GET"
+            };
+
+            var descriptor2 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "POST"
+            };
+
+            // This will match the HTTP method 'round' of selection, but won't match the
+            // handler name.
+            var descriptor3 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "HEAD",
+                Name = "not-provided",
+            };
+
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = new CompiledPageActionDescriptor
+                {
+                    HandlerMethods = new List<HandlerMethodDescriptor>()
+                    {
+                        descriptor1,
+                        descriptor2,
+                        descriptor3,
+                    },
+                },
+                RouteData = new RouteData(),
+                HttpContext = new DefaultHttpContext
+                {
+                    Request =
+                    {
+                        Method = "HEAD",
+                    },
+                },
+            };
+            var selector = CreateSelector();
+
+            // Act
+            var actual = selector.Select(pageContext);
+
+            // Assert
+            Assert.Null(actual);
+        }
+
+        [Theory]
+        [InlineData("HEAD")]
+        [InlineData("heAd")]
+        public void NewBehavior_Select_ReturnsFuzzyMatch_SafeVerbs(string httpMethod)
+        {
+            // Arrange
+            var descriptor1 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "GET"
+            };
+
+            var descriptor2 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "POST"
+            };
+
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = new CompiledPageActionDescriptor
+                {
+                    HandlerMethods = new List<HandlerMethodDescriptor>()
+                    {
+                        descriptor1,
+                        descriptor2,
+                    },
+                },
+                RouteData = new RouteData(),
+                HttpContext = new DefaultHttpContext
+                {
+                    Request =
+                    {
+                        Method = httpMethod
+                    },
+                },
+            };
+            var selector = CreateSelector();
+
+            // Act
+            var actual = selector.Select(pageContext);
+
+            // Assert
+            Assert.Same(descriptor1, actual);
+        }
+
+        [Fact]
+        public void Select_ReturnsOnlyHandler()
+        {
+            // Arrange
+            var descriptor = new HandlerMethodDescriptor
+            {
+                HttpMethod = "GET"
+            };
+
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = new CompiledPageActionDescriptor
+                {
+                    HandlerMethods = new List<HandlerMethodDescriptor>()
+                    {
+                        descriptor,
+                    },
+                },
+                RouteData = new RouteData(),
+                HttpContext = new DefaultHttpContext
+                {
+                    Request =
+                    {
+                        Method = "GET"
+                    },
+                },
+            };
+            var selector = CreateSelector();
+
+            // Act
+            var actual = selector.Select(pageContext);
+
+            // Assert
+            Assert.Same(descriptor, actual);
+        }
+
+        [Theory]
+        [InlineData("GET")]
+        [InlineData("POST")]
+        public void Select_ReturnsHandlerWithMatchingHttpRequestMethod(string httpMethod)
+        {
+            // Arrange
+            var descriptor1 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "PUT",
+            };
+            var descriptor2 = new HandlerMethodDescriptor
+            {
+                HttpMethod = httpMethod,
+            };
+
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = new CompiledPageActionDescriptor
+                {
+                    HandlerMethods = new List<HandlerMethodDescriptor>()
+                    {
+                        descriptor1,
+                        descriptor2,
+                    },
+                },
+                RouteData = new RouteData(),
+                HttpContext = new DefaultHttpContext
+                {
+                    Request =
+                    {
+                        Method = httpMethod,
+                    },
+                },
+            };
+            var selector = CreateSelector();
+
+            // Act
+            var actual = selector.Select(pageContext);
+
+            // Assert
+            Assert.Same(descriptor2, actual);
+        }
+
+        [Fact]
+        public void Select_ReturnsNullWhenNoHandlerMatchesHandler()
+        {
+            // Arrange
+            var descriptor1 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "POST",
+                Name = "Add",
+            };
+
+            var descriptor2 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "POST",
+                Name = "Delete",
+            };
+
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = new CompiledPageActionDescriptor
+                {
+                    HandlerMethods = new List<HandlerMethodDescriptor>()
+                    {
+                        descriptor1,
+                        descriptor2,
+                    },
+                },
+                RouteData = new RouteData
+                {
+                    Values =
+                    {
+                        { "handler", "update" }
+                    }
+                },
+                HttpContext = new DefaultHttpContext
+                {
+                    Request =
+                    {
+                        Method = "POST"
+                    },
+                },
+            };
+            var selector = CreateSelector();
+
+            // Act
+            var actual = selector.Select(pageContext);
+
+            // Assert
+            Assert.Null(actual);
+        }
+
+        [Fact]
+        public void Select_ReturnsHandlerThatMatchesHandler()
+        {
+            // Arrange
+            var descriptor1 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "POST",
+                Name = "Add",
+            };
+
+            var descriptor2 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "POST",
+                Name = "Delete",
+            };
+
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = new CompiledPageActionDescriptor
+                {
+                    HandlerMethods = new List<HandlerMethodDescriptor>()
+                    {
+                        descriptor1,
+                        descriptor2,
+                    },
+                },
+                RouteData = new RouteData
+                {
+                    Values =
+                    {
+                        { "handler", "Add" }
+                    }
+                },
+                HttpContext = new DefaultHttpContext
+                {
+                    Request =
+                    {
+                        Method = "Post"
+                    },
+                },
+            };
+            var selector = CreateSelector();
+
+            // Act
+            var actual = selector.Select(pageContext);
+
+            // Assert
+            Assert.Same(descriptor1, actual);
+        }
+
+        [Fact]
+        public void Select_HandlerFromQueryString()
+        {
+            // Arrange
+            var descriptor1 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "POST",
+                Name = "Add",
+            };
+
+            var descriptor2 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "POST",
+                Name = "Delete",
+            };
+
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = new CompiledPageActionDescriptor
+                {
+                    HandlerMethods = new List<HandlerMethodDescriptor>()
+                    {
+                        descriptor1,
+                        descriptor2,
+                    },
+                },
+                RouteData = new RouteData(),
+                HttpContext = new DefaultHttpContext
+                {
+                    Request =
+                    {
+                        Method = "Post",
+                        QueryString = new QueryString("?handler=Delete"),
+                    },
+                },
+            };
+            var selector = CreateSelector();
+
+            // Act
+            var actual = selector.Select(pageContext);
+
+            // Assert
+            Assert.Same(descriptor2, actual);
+        }
+
+        [Fact]
+        public void Select_HandlerConsidersRouteDataFirst()
+        {
+            // Arrange
+            var descriptor1 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "POST",
+                Name = "Add",
+            };
+
+            var descriptor2 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "POST",
+                Name = "Delete",
+            };
+
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = new CompiledPageActionDescriptor
+                {
+                    HandlerMethods = new List<HandlerMethodDescriptor>()
+                    {
+                        descriptor1,
+                        descriptor2,
+                    },
+                },
+                RouteData = new RouteData
+                {
+                    Values =
+                    {
+                        { "handler", "Add" }
+                    }
+                },
+                HttpContext = new DefaultHttpContext
+                {
+                    Request =
+                    {
+                        Method = "Post",
+                        QueryString = new QueryString("?handler=Delete"),
+                    },
+                },
+            };
+            var selector = CreateSelector();
+
+            // Act
+            var actual = selector.Select(pageContext);
+
+            // Assert
+            Assert.Same(descriptor1, actual);
+        }
+
+        [Fact]
+        public void Select_HandlerMultipleTimesInQueryString_UsesFirst()
+        {
+            // Arrange
+            var descriptor1 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "POST",
+                Name = "Add",
+            };
+
+            var descriptor2 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "POST",
+                Name = "Delete",
+            };
+
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = new CompiledPageActionDescriptor
+                {
+                    HandlerMethods = new List<HandlerMethodDescriptor>()
+                    {
+                        descriptor1,
+                        descriptor2,
+                    },
+                },
+                RouteData = new RouteData(),
+                HttpContext = new DefaultHttpContext
+                {
+                    Request =
+                    {
+                        Method = "Post",
+                        QueryString = new QueryString("?handler=Delete&handler=Add"),
+                    },
+                },
+            };
+            var selector = CreateSelector();
+
+            // Act
+            var actual = selector.Select(pageContext);
+
+            // Assert
+            Assert.Same(descriptor2, actual);
+        }
+
+        [Fact]
+        public void Select_ReturnsHandlerWithMatchingHttpMethodWithoutAHandler()
+        {
+            // Arrange
+            var descriptor1 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "POST",
+                Name = "Subscribe",
+            };
+
+            var descriptor2 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "POST",
+            };
+
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = new CompiledPageActionDescriptor
+                {
+                    HandlerMethods = new List<HandlerMethodDescriptor>()
+                    {
+                        descriptor1,
+                        descriptor2,
+                    },
+                },
+                RouteData = new RouteData
+                {
+                    Values =
+                    {
+                        { "handler", "Add" }
+                    }
+                },
+                HttpContext = new DefaultHttpContext
+                {
+                    Request =
+                    {
+                        Method = "Post"
+                    },
+                },
+            };
+            var selector = CreateSelector();
+
+            // Act
+            var actual = selector.Select(pageContext);
+
+            // Assert
+            Assert.Same(descriptor2, actual);
+        }
+
+        [Fact]
+        public void Select_WithoutHandler_ThrowsIfMoreThanOneHandlerMatches()
+        {
+            // Arrange
+            var descriptor1 = new HandlerMethodDescriptor
+            {
+                MethodInfo = GetType().GetMethod(nameof(Post)),
+                HttpMethod = "POST",
+            };
+
+            var descriptor2 = new HandlerMethodDescriptor
+            {
+                MethodInfo = GetType().GetMethod(nameof(PostAsync)),
+                HttpMethod = "POST",
+            };
+
+            var descriptor3 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "GET",
+            };
+
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = new CompiledPageActionDescriptor
+                {
+                    HandlerMethods = new List<HandlerMethodDescriptor>()
+                    {
+                        descriptor1,
+                        descriptor2,
+                        descriptor3,
+                    },
+                },
+                RouteData = new RouteData(),
+                HttpContext = new DefaultHttpContext
+                {
+                    Request =
+                    {
+                        Method = "Post"
+                    },
+                },
+            };
+            var selector = CreateSelector();
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => selector.Select(pageContext));
+            var methods = descriptor1.MethodInfo + ", " + descriptor2.MethodInfo;
+            var message = "Multiple handlers matched. The following handlers matched route data and had all constraints satisfied:" +
+                Environment.NewLine + Environment.NewLine + methods;
+
+            Assert.Equal(message, ex.Message);
+        }
+
+        [Fact]
+        public void Select_WithHandler_ThrowsIfMoreThanOneHandlerMatches()
+        {
+            // Arrange
+            var descriptor1 = new HandlerMethodDescriptor
+            {
+                MethodInfo = GetType().GetMethod(nameof(Post)),
+                HttpMethod = "POST",
+                Name = "Add",
+            };
+
+            var descriptor2 = new HandlerMethodDescriptor
+            {
+                MethodInfo = GetType().GetMethod(nameof(PostAsync)),
+                HttpMethod = "POST",
+                Name = "Add",
+            };
+
+            var descriptor3 = new HandlerMethodDescriptor
+            {
+                HttpMethod = "GET",
+            };
+
+            var pageContext = new PageContext
+            {
+                ActionDescriptor = new CompiledPageActionDescriptor
+                {
+                    HandlerMethods = new List<HandlerMethodDescriptor>()
+                    {
+                        descriptor1,
+                        descriptor2,
+                        descriptor3,
+                    },
+                },
+                RouteData = new RouteData
+                {
+                    Values =
+                    {
+                        { "handler", "Add" }
+                    }
+                },
+                HttpContext = new DefaultHttpContext
+                {
+                    Request =
+                    {
+                        Method = "Post"
+                    },
+                },
+            };
+            var selector = CreateSelector();
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => selector.Select(pageContext));
+            var methods = descriptor1.MethodInfo + ", " + descriptor2.MethodInfo;
+            var message = "Multiple handlers matched. The following handlers matched route data and had all constraints satisfied:" +
+                Environment.NewLine + Environment.NewLine + methods;
+
+            Assert.Equal(message, ex.Message);
+        }
+
+        protected void Post()
+        {
+        }
+
+        protected void PostAsync()
+        {
+        }
+
+        private static DefaultPageHandlerMethodSelector CreateSelector(bool legacyBehavior = false)
+        {
+            var options = Options.Create(new RazorPagesOptions()
+            {
+                AllowMappingHeadRequestsToGetHandler = !legacyBehavior
+            });
+            return new DefaultPageHandlerMethodSelector(options);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/DefaultPageLoaderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/DefaultPageLoaderTest.cs
new file mode 100644
index 0000000000..d31359df2f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/DefaultPageLoaderTest.cs
@@ -0,0 +1,515 @@
+// 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.
+
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class DefaultPageLoaderTest
+    {
+        [Fact]
+        public void Load_InvokesApplicationModelProviders()
+        {
+            // Arrange
+            var descriptor = new PageActionDescriptor();
+
+            var compilerProvider = GetCompilerProvider();
+
+            var razorPagesOptions = Options.Create(new RazorPagesOptions());
+            var mvcOptions = Options.Create(new MvcOptions());
+
+            var provider1 = new Mock<IPageApplicationModelProvider>();
+            var provider2 = new Mock<IPageApplicationModelProvider>();
+
+            var sequence = 0;
+            var pageApplicationModel1 = new PageApplicationModel(descriptor, typeof(object).GetTypeInfo(), Array.Empty<object>());
+            var pageApplicationModel2 = new PageApplicationModel(descriptor, typeof(object).GetTypeInfo(), Array.Empty<object>());
+
+            provider1.Setup(p => p.OnProvidersExecuting(It.IsAny<PageApplicationModelProviderContext>()))
+                .Callback((PageApplicationModelProviderContext c) =>
+                {
+                    Assert.Equal(0, sequence++);
+                    Assert.Null(c.PageApplicationModel);
+                    c.PageApplicationModel = pageApplicationModel1;
+                })
+                .Verifiable();
+
+            provider2.Setup(p => p.OnProvidersExecuting(It.IsAny<PageApplicationModelProviderContext>()))
+                .Callback((PageApplicationModelProviderContext c) =>
+                {
+                    Assert.Equal(1, sequence++);
+                    Assert.Same(pageApplicationModel1, c.PageApplicationModel);
+                    c.PageApplicationModel = pageApplicationModel2;
+                })
+                .Verifiable();
+
+            provider1.Setup(p => p.OnProvidersExecuted(It.IsAny<PageApplicationModelProviderContext>()))
+                .Callback((PageApplicationModelProviderContext c) =>
+                {
+                    Assert.Equal(3, sequence++);
+                    Assert.Same(pageApplicationModel2, c.PageApplicationModel);
+                })
+                .Verifiable();
+
+            provider2.Setup(p => p.OnProvidersExecuted(It.IsAny<PageApplicationModelProviderContext>()))
+                .Callback((PageApplicationModelProviderContext c) =>
+                {
+                    Assert.Equal(2, sequence++);
+                    Assert.Same(pageApplicationModel2, c.PageApplicationModel);
+                })
+                .Verifiable();
+
+            var providers = new[]
+            {
+                provider1.Object, provider2.Object
+            };
+
+            var loader = new DefaultPageLoader(
+                providers,
+                compilerProvider,
+                razorPagesOptions,
+                mvcOptions);
+
+            // Act
+            var result = loader.Load(new PageActionDescriptor());
+
+            // Assert
+            provider1.Verify();
+            provider2.Verify();
+        }
+
+        [Fact]
+        public void Load_InvokesApplicationModelProviders_WithTheRightOrder()
+        {
+            // Arrange
+            var descriptor = new PageActionDescriptor();
+            var compilerProvider = GetCompilerProvider();
+            var razorPagesOptions = Options.Create(new RazorPagesOptions());
+            var mvcOptions = Options.Create(new MvcOptions());
+
+            var provider1 = new Mock<IPageApplicationModelProvider>();
+            provider1.SetupGet(p => p.Order).Returns(10);
+            var provider2 = new Mock<IPageApplicationModelProvider>();
+            provider2.SetupGet(p => p.Order).Returns(-5);
+
+            var sequence = 0;
+            provider1.Setup(p => p.OnProvidersExecuting(It.IsAny<PageApplicationModelProviderContext>()))
+                .Callback((PageApplicationModelProviderContext c) =>
+                {
+                    Assert.Equal(1, sequence++);
+                    c.PageApplicationModel = new PageApplicationModel(descriptor, typeof(object).GetTypeInfo(), Array.Empty<object>());
+                })
+                .Verifiable();
+
+            provider2.Setup(p => p.OnProvidersExecuting(It.IsAny<PageApplicationModelProviderContext>()))
+                .Callback((PageApplicationModelProviderContext c) =>
+                {
+                    Assert.Equal(0, sequence++);
+                })
+                .Verifiable();
+
+            provider1.Setup(p => p.OnProvidersExecuted(It.IsAny<PageApplicationModelProviderContext>()))
+                .Callback((PageApplicationModelProviderContext c) =>
+                {
+                    Assert.Equal(2, sequence++);
+                })
+                .Verifiable();
+
+            provider2.Setup(p => p.OnProvidersExecuted(It.IsAny<PageApplicationModelProviderContext>()))
+                .Callback((PageApplicationModelProviderContext c) =>
+                {
+                    Assert.Equal(3, sequence++);
+                })
+                .Verifiable();
+
+            var providers = new[]
+            {
+                provider1.Object, provider2.Object
+            };
+
+            var loader = new DefaultPageLoader(
+                providers,
+                compilerProvider,
+                razorPagesOptions,
+                mvcOptions);
+
+            // Act
+            var result = loader.Load(new PageActionDescriptor());
+
+            // Assert
+            provider1.Verify();
+            provider2.Verify();
+        }
+
+        [Fact]
+        public void ApplyConventions_InvokesApplicationModelConventions()
+        {
+            // Arrange
+            var descriptor = new PageActionDescriptor();
+            var model = new PageApplicationModel(descriptor, typeof(object).GetTypeInfo(), Array.Empty<object>());
+
+            var convention = new Mock<IPageApplicationModelConvention>();
+            convention.Setup(c => c.Apply(It.IsAny<PageApplicationModel>()))
+                .Callback((PageApplicationModel m) =>
+                {
+                    Assert.Same(model, m);
+                })
+                .Verifiable();
+            var conventionCollection = new PageConventionCollection
+            {
+                convention.Object,
+            };
+
+            // Act
+            DefaultPageLoader.ApplyConventions(conventionCollection, model);
+
+            // Assert
+            convention.Verify();
+        }
+
+        [Fact]
+        public void ApplyConventions_InvokesApplicationModelConventions_SpecifiedOnHandlerType()
+        {
+            // Arrange
+            var descriptor = new PageActionDescriptor();
+            var handlerConvention = new Mock<IPageApplicationModelConvention>();
+            var model = new PageApplicationModel(descriptor, typeof(object).GetTypeInfo(), new[] { handlerConvention.Object });
+
+            var globalConvention = new Mock<IPageApplicationModelConvention>();
+            globalConvention.Setup(c => c.Apply(It.IsAny<PageApplicationModel>()))
+                .Callback((PageApplicationModel m) =>
+                {
+                    Assert.Same(model, m);
+                })
+                .Verifiable();
+
+            handlerConvention.Setup(c => c.Apply(It.IsAny<PageApplicationModel>()))
+                .Callback((PageApplicationModel m) =>
+                {
+                    Assert.Same(model, m);
+                })
+                .Verifiable();
+            var conventionCollection = new PageConventionCollection
+            {
+                globalConvention.Object,
+            };
+
+            // Act
+            DefaultPageLoader.ApplyConventions(conventionCollection, model);
+
+            // Assert
+            globalConvention.Verify();
+            handlerConvention.Verify();
+        }
+
+        [Fact]
+        public void ApplyConventions_InvokesHandlerModelConventions()
+        {
+            // Arrange
+            var descriptor = new PageActionDescriptor();
+            var methodInfo = GetType().GetMethod(nameof(OnGet), BindingFlags.Instance | BindingFlags.NonPublic);
+            var handlerModelConvention = new Mock<IPageHandlerModelConvention>();
+
+            var applicationModel = new PageApplicationModel(descriptor, typeof(object).GetTypeInfo(), Array.Empty<object>());
+            var handlerModel = new PageHandlerModel(methodInfo, new[] { handlerModelConvention.Object });
+
+            applicationModel.HandlerMethods.Add(handlerModel);
+
+            handlerModelConvention.Setup(p => p.Apply(It.IsAny<PageHandlerModel>()))
+                .Callback((PageHandlerModel m) =>
+                {
+                    Assert.Same(handlerModel, m);
+                })
+                .Verifiable();
+            var conventionCollection = new PageConventionCollection();
+
+            // Act
+            DefaultPageLoader.ApplyConventions(conventionCollection, applicationModel);
+
+            // Assert
+            handlerModelConvention.Verify();
+        }
+
+        [Fact]
+        public void ApplyConventions_InvokesHandlerModelConventions_DefinedGlobally()
+        {
+            // Arrange
+            var descriptor = new PageActionDescriptor();
+            var methodInfo = GetType().GetMethod(nameof(OnGet), BindingFlags.Instance | BindingFlags.NonPublic);
+
+            var applicationModel = new PageApplicationModel(descriptor, typeof(object).GetTypeInfo(), Array.Empty<object>());
+            var handlerModel = new PageHandlerModel(methodInfo, Array.Empty<object>());
+            applicationModel.HandlerMethods.Add(handlerModel);
+
+            var handlerModelConvention = new Mock<IPageHandlerModelConvention>();
+            handlerModelConvention.Setup(p => p.Apply(It.IsAny<PageHandlerModel>()))
+                .Callback((PageHandlerModel m) =>
+                {
+                    Assert.Same(handlerModel, m);
+                })
+                .Verifiable();
+            var conventionCollection = new PageConventionCollection { handlerModelConvention.Object };
+
+            // Act
+            DefaultPageLoader.ApplyConventions(conventionCollection, applicationModel);
+
+            // Assert
+            handlerModelConvention.Verify();
+        }
+
+        [Fact]
+        public void ApplyConventions_RemovingHandlerAsPartOfHandlerModelConvention_Works()
+        {
+            // Arrange
+            var descriptor = new PageActionDescriptor();
+            var methodInfo = GetType().GetMethod(nameof(OnGet), BindingFlags.Instance | BindingFlags.NonPublic);
+            var handlerModelConvention = new Mock<IPageHandlerModelConvention>();
+
+            var applicationModel = new PageApplicationModel(descriptor, typeof(object).GetTypeInfo(), Array.Empty<object>());
+            var handlerModel = new PageHandlerModel(methodInfo, new[] { handlerModelConvention.Object })
+            {
+                Page = applicationModel,
+            };
+
+            applicationModel.HandlerMethods.Add(handlerModel);
+
+            handlerModelConvention.Setup(p => p.Apply(It.IsAny<PageHandlerModel>()))
+                .Callback((PageHandlerModel m) =>
+                {
+                    m.Page.HandlerMethods.Remove(m);
+                })
+                .Verifiable();
+            var conventionCollection = new PageConventionCollection();
+
+            // Act
+            DefaultPageLoader.ApplyConventions(conventionCollection, applicationModel);
+
+            // Assert
+            handlerModelConvention.Verify();
+        }
+
+        [Fact]
+        public void ApplyConventions_InvokesParameterModelConventions()
+        {
+            // Arrange
+            var descriptor = new PageActionDescriptor();
+            var methodInfo = GetType().GetMethod(nameof(OnGet), BindingFlags.Instance | BindingFlags.NonPublic);
+            var parameterInfo = methodInfo.GetParameters()[0];
+
+            var applicationModel = new PageApplicationModel(descriptor, typeof(object).GetTypeInfo(), Array.Empty<object>());
+            var handlerModel = new PageHandlerModel(methodInfo, Array.Empty<object>());
+            var parameterModelConvention = new Mock<IParameterModelBaseConvention>();
+            var parameterModel = new PageParameterModel(parameterInfo, new[] { parameterModelConvention.Object });
+
+            applicationModel.HandlerMethods.Add(handlerModel);
+            handlerModel.Parameters.Add(parameterModel);
+
+            parameterModelConvention.Setup(p => p.Apply(It.IsAny<ParameterModelBase>()))
+                .Callback((ParameterModelBase m) =>
+                {
+                    Assert.Same(parameterModel, m);
+                })
+                .Verifiable();
+            var conventionCollection = new PageConventionCollection();
+
+            // Act
+            DefaultPageLoader.ApplyConventions(conventionCollection, applicationModel);
+
+            // Assert
+            parameterModelConvention.Verify();
+        }
+
+        [Fact]
+        public void ApplyConventions_InvokesParameterModelConventions_DeclaredGlobally()
+        {
+            // Arrange
+            var descriptor = new PageActionDescriptor();
+            var methodInfo = GetType().GetMethod(nameof(OnGet), BindingFlags.Instance | BindingFlags.NonPublic);
+            var parameterInfo = methodInfo.GetParameters()[0];
+
+            var applicationModel = new PageApplicationModel(descriptor, typeof(object).GetTypeInfo(), Array.Empty<object>());
+            var handlerModel = new PageHandlerModel(methodInfo, Array.Empty<object>());
+            var parameterModel = new PageParameterModel(parameterInfo, Array.Empty<object>());
+
+            applicationModel.HandlerMethods.Add(handlerModel);
+            handlerModel.Parameters.Add(parameterModel);
+
+            var parameterModelConvention = new Mock<IParameterModelBaseConvention>();
+            parameterModelConvention.Setup(p => p.Apply(It.IsAny<ParameterModelBase>()))
+                .Callback((ParameterModelBase m) =>
+                {
+                    Assert.Same(parameterModel, m);
+                })
+                .Verifiable();
+            var conventionCollection = new PageConventionCollection { parameterModelConvention.Object };
+
+            // Act
+            DefaultPageLoader.ApplyConventions(conventionCollection, applicationModel);
+
+            // Assert
+            parameterModelConvention.Verify();
+        }
+
+        [Fact]
+        public void ApplyConventions_RemovingParameterModelAsPartOfConventionWorks()
+        {
+            // Arrange
+            var descriptor = new PageActionDescriptor();
+            var methodInfo = GetType().GetMethod(nameof(OnGet), BindingFlags.Instance | BindingFlags.NonPublic);
+            var parameterInfo = methodInfo.GetParameters()[0];
+
+            var applicationModel = new PageApplicationModel(descriptor, typeof(object).GetTypeInfo(), Array.Empty<object>());
+            var handlerModel = new PageHandlerModel(methodInfo, Array.Empty<object>());
+            var parameterModelConvention = new Mock<IParameterModelBaseConvention>();
+            var parameterModel = new PageParameterModel(parameterInfo, new[] { parameterModelConvention.Object })
+            {
+                Handler = handlerModel,
+            };
+
+            applicationModel.HandlerMethods.Add(handlerModel);
+            handlerModel.Parameters.Add(parameterModel);
+
+            parameterModelConvention.Setup(p => p.Apply(It.IsAny<ParameterModelBase>()))
+                .Callback((ParameterModelBase m) =>
+                {
+                    var model = Assert.IsType<PageParameterModel>(m);
+                    model.Handler.Parameters.Remove(model);
+                })
+                .Verifiable();
+            var conventionCollection = new PageConventionCollection();
+
+            // Act
+            DefaultPageLoader.ApplyConventions(conventionCollection, applicationModel);
+
+            // Assert
+            parameterModelConvention.Verify();
+        }
+
+        [Fact]
+        public void ApplyConventions_InvokesPropertyModelConventions()
+        {
+            // Arrange
+            var descriptor = new PageActionDescriptor();
+            var methodInfo = GetType().GetMethod(nameof(OnGet), BindingFlags.Instance | BindingFlags.NonPublic);
+            var propertyInfo = GetType().GetProperty(nameof(TestProperty), BindingFlags.Instance | BindingFlags.NonPublic);
+            var parameterInfo = methodInfo.GetParameters()[0];
+
+            var applicationModel = new PageApplicationModel(descriptor, typeof(object).GetTypeInfo(), Array.Empty<object>());
+            var handlerModel = new PageHandlerModel(methodInfo, Array.Empty<object>());
+            var parameterModel = new PageParameterModel(parameterInfo, Array.Empty<object>());
+            var propertyModelConvention = new Mock<IParameterModelBaseConvention>();
+            var propertyModel = new PagePropertyModel(propertyInfo, new[] { propertyModelConvention.Object });
+
+            applicationModel.HandlerMethods.Add(handlerModel);
+            applicationModel.HandlerProperties.Add(propertyModel);
+            handlerModel.Parameters.Add(parameterModel);
+
+            propertyModelConvention.Setup(p => p.Apply(It.IsAny<ParameterModelBase>()))
+                .Callback((ParameterModelBase m) =>
+                {
+                    Assert.Same(propertyModel, m);
+                })
+                .Verifiable();
+            var conventionCollection = new PageConventionCollection();
+
+            // Act
+            DefaultPageLoader.ApplyConventions(conventionCollection, applicationModel);
+
+            // Assert
+            propertyModelConvention.Verify();
+        }
+
+        [Fact]
+        public void ApplyConventions_InvokesPropertyModelConventions_DeclaredGlobally()
+        {
+            // Arrange
+            var descriptor = new PageActionDescriptor();
+            var methodInfo = GetType().GetMethod(nameof(OnGet), BindingFlags.Instance | BindingFlags.NonPublic);
+            var propertyInfo = GetType().GetProperty(nameof(TestProperty), BindingFlags.Instance | BindingFlags.NonPublic);
+
+            var applicationModel = new PageApplicationModel(descriptor, typeof(object).GetTypeInfo(), Array.Empty<object>());
+            var handlerModel = new PageHandlerModel(methodInfo, Array.Empty<object>());
+            var propertyModel = new PagePropertyModel(propertyInfo, Array.Empty<object>());
+
+            applicationModel.HandlerMethods.Add(handlerModel);
+            applicationModel.HandlerProperties.Add(propertyModel);
+
+            var propertyModelConvention = new Mock<IParameterModelBaseConvention>();
+            propertyModelConvention.Setup(p => p.Apply(It.IsAny<ParameterModelBase>()))
+                .Callback((ParameterModelBase m) =>
+                {
+                    Assert.Same(propertyModel, m);
+                })
+                .Verifiable();
+            var conventionCollection = new PageConventionCollection { propertyModelConvention.Object };
+
+            // Act
+            DefaultPageLoader.ApplyConventions(conventionCollection, applicationModel);
+
+            // Assert
+            propertyModelConvention.Verify();
+        }
+
+        [Fact]
+        public void ApplyConventions_RemovingPropertyModelAsPartOfConvention_Works()
+        {
+            // Arrange
+            var descriptor = new PageActionDescriptor();
+            var propertyInfo = GetType().GetProperty(nameof(TestProperty), BindingFlags.Instance | BindingFlags.NonPublic);
+
+            var applicationModel = new PageApplicationModel(descriptor, typeof(object).GetTypeInfo(), Array.Empty<object>());
+            var propertyModelConvention = new Mock<IParameterModelBaseConvention>();
+            var propertyModel = new PagePropertyModel(propertyInfo, new[] { propertyModelConvention.Object })
+            {
+                Page = applicationModel,
+            };
+
+            applicationModel.HandlerProperties.Add(propertyModel);
+
+            propertyModelConvention.Setup(p => p.Apply(It.IsAny<ParameterModelBase>()))
+                .Callback((ParameterModelBase m) =>
+                {
+                    var model = Assert.IsType<PagePropertyModel>(m);
+                    model.Page.HandlerProperties.Remove(model);
+                })
+                .Verifiable();
+            var conventionCollection = new PageConventionCollection();
+
+            // Act
+            DefaultPageLoader.ApplyConventions(conventionCollection, applicationModel);
+
+            // Assert
+            propertyModelConvention.Verify();
+        }
+
+        private static IViewCompilerProvider GetCompilerProvider()
+        {
+            var descriptor = new CompiledViewDescriptor
+            {
+                ViewAttribute = new RazorPageAttribute("/Views/Index.cshtml", typeof(object), null),
+            };
+
+            var compiler = new Mock<IViewCompiler>();
+            compiler.Setup(c => c.CompileAsync(It.IsAny<string>()))
+                .ReturnsAsync(descriptor);
+            var compilerProvider = new Mock<IViewCompilerProvider>();
+            compilerProvider.Setup(p => p.GetCompiler())
+                .Returns(compiler.Object);
+            return compilerProvider.Object;
+        }
+
+        private void OnGet(string parameter)
+        {
+        }
+
+        private string TestProperty { get; set; }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ExecutorFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ExecutorFactoryTest.cs
new file mode 100644
index 0000000000..a5a58227e0
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ExecutorFactoryTest.cs
@@ -0,0 +1,331 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.AspNetCore.Mvc.RazorPages.Internal;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Test.Internal
+{
+    public class ExecutorFactoryTest
+    {
+        [Fact]
+        public async Task CreateExecutor_ForActionResultMethod()
+        {
+            // Arrange
+            var handler = new HandlerMethodDescriptor()
+            {
+                MethodInfo = typeof(TestPage).GetMethod(nameof(TestPage.ActionResultReturningHandler)),
+                Parameters = new HandlerParameterDescriptor[0],
+            };
+
+            // Act
+            var executor = ExecutorFactory.CreateExecutor(handler);
+
+            // Assert
+            Assert.NotNull(executor);
+            var actionResultTask = executor(new TestPage(), null);
+            var actionResult = await actionResultTask;
+            Assert.IsType<EmptyResult>(actionResult);
+        }
+
+        [Fact]
+        public async Task CreateExecutor_ForMethodReturningConcreteSubtypeOfIActionResult()
+        {
+            // Arrange
+            var handler = new HandlerMethodDescriptor()
+            {
+                MethodInfo = typeof(TestPage).GetMethod(nameof(TestPage.ConcreteActionResult)),
+                Parameters = new HandlerParameterDescriptor[0],
+            };
+
+            // Act
+            var executor = ExecutorFactory.CreateExecutor(handler);
+
+            // Assert
+            Assert.NotNull(executor);
+            var actionResultTask = executor(new TestPage(), null);
+            var actionResult = await actionResultTask;
+            Assert.IsType<ViewResult>(actionResult);
+        }
+
+        [Fact]
+        public async Task CreateExecutor_ForActionResultReturningMethod_WithParameters()
+        {
+            // Arrange
+            var methodInfo = typeof(TestPage).GetMethod(nameof(TestPage.ActionResultReturnHandlerWithParameters));
+            var handler = new HandlerMethodDescriptor()
+            {
+                MethodInfo = methodInfo,
+                Parameters = CreateParameters(methodInfo),
+            };
+
+            // Act
+            var executor = ExecutorFactory.CreateExecutor(handler);
+
+            // Assert
+            Assert.NotNull(executor);
+            var actionResultTask = executor(new TestPage(), CreateArguments(methodInfo));
+            var actionResult = await actionResultTask;
+            var contentResult = Assert.IsType<ContentResult>(actionResult);
+            Assert.Equal("Hello 0", contentResult.Content);
+        }
+
+        [Fact]
+        public async Task CreateExecutor_ForVoidReturningMethod()
+        {
+            // Arrange
+            var handler = new HandlerMethodDescriptor()
+            {
+                MethodInfo = typeof(TestPage).GetMethod(nameof(TestPage.VoidReturningHandler)),
+                Parameters = new HandlerParameterDescriptor[0],
+            };
+
+            var page = new TestPage();
+
+            // Act
+            var executor = ExecutorFactory.CreateExecutor(handler);
+
+            // Assert
+            Assert.NotNull(executor);
+            var actionResultTask = executor(page, null);
+            var actionResult = await actionResultTask;
+            Assert.Null(actionResult);
+            Assert.True(page.SideEffects);
+        }
+
+        [Fact]
+        public async Task CreateExecutor_ForVoidTaskReturningMethod()
+        {
+            // Arrange
+            var handler = new HandlerMethodDescriptor()
+            {
+                MethodInfo = typeof(TestPage).GetMethod(nameof(TestPage.VoidTaskReturningHandler)),
+                Parameters = new HandlerParameterDescriptor[0],
+            };
+
+            var page = new TestPage();
+
+            // Act
+            var executor = ExecutorFactory.CreateExecutor(handler);
+
+            // Assert
+            Assert.NotNull(executor);
+            var actionResultTask = executor(page, null);
+            var actionResult = await actionResultTask;
+            Assert.Null(actionResult);
+            Assert.True(page.SideEffects);
+        }
+
+        [Fact]
+        public async Task CreateExecutor_ForTaskOfIActionResultReturningMethod()
+        {
+            // Arrange
+            var methodInfo = typeof(TestPage).GetMethod(nameof(TestPage.GenericTaskHandler));
+            var handler = new HandlerMethodDescriptor()
+            {
+                MethodInfo = methodInfo,
+                Parameters = CreateParameters(methodInfo),
+            };
+
+            // Act
+            var executor = ExecutorFactory.CreateExecutor(handler);
+
+            // Assert
+            Assert.NotNull(executor);
+            var actionResultTask = executor(new TestPage(), null);
+            var actionResult = await actionResultTask;
+            Assert.IsType<EmptyResult>(actionResult);
+        }
+
+        [Fact]
+        public async Task CreateExecutor_ForTaskOfConcreteActionResultReturningMethod()
+        {
+            // Arrange
+            var methodInfo = typeof(TestPage).GetMethod(nameof(TestPage.TaskReturningConcreteSubtype));
+            var handler = new HandlerMethodDescriptor()
+            {
+                MethodInfo = methodInfo,
+                Parameters = CreateParameters(methodInfo),
+            };
+
+            // Act
+            var executor = ExecutorFactory.CreateExecutor(handler);
+
+            // Assert
+            Assert.NotNull(executor);
+            var actionResultTask = executor(new TestPage(), CreateArguments(methodInfo));
+            var actionResult = await actionResultTask;
+            var contentResult = Assert.IsType<ContentResult>(actionResult);
+            Assert.Equal("value", contentResult.Content);
+        }
+
+        [Theory]
+        [InlineData(nameof(TestPageModel.StringResult))]
+        [InlineData(nameof(TestPageModel.TaskOfObject))]
+        [InlineData(nameof(TestPageModel.ViewComponent))]
+        public void CreateExecutor_ThrowsIfTypeIsNotAValidReturnType(string methodName)
+        {
+            // Arrange
+            var methodInfo = typeof(TestPageModel).GetMethod(methodName);
+            var handler = new HandlerMethodDescriptor()
+            {
+                MethodInfo = methodInfo,
+                Parameters = CreateParameters(methodInfo),
+            };
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => ExecutorFactory.CreateExecutor(handler));
+            Assert.Equal($"Unsupported handler method return type '{methodInfo.ReturnType}'.", ex.Message);
+        }
+
+        private static object[] CreateArguments(MethodInfo methodInfo)
+        {
+            var parameters = methodInfo.GetParameters();
+
+            return parameters.Select(s => GetDefaultValue(s)).ToArray();
+        }
+
+        private static object GetDefaultValue(ParameterInfo methodParameter)
+        {
+            object defaultValue = null;
+            if (methodParameter.HasDefaultValue)
+            {
+                defaultValue = methodParameter.DefaultValue;
+            }
+            else if (methodParameter.ParameterType.GetTypeInfo().IsValueType)
+            {
+                defaultValue = Activator.CreateInstance(methodParameter.ParameterType);
+            }
+
+            return defaultValue;
+        }
+
+        private static HandlerParameterDescriptor[] CreateParameters(MethodInfo methodInfo)
+        {
+            var parameters = methodInfo.GetParameters();
+
+            return parameters.Select(p => new HandlerParameterDescriptor()
+            {
+                BindingInfo = BindingInfo.GetBindingInfo(p.GetCustomAttributes()),
+                Name = p.Name,
+                ParameterInfo = p,
+                ParameterType = p.ParameterType,
+            }).ToArray();
+        }
+
+        private class TestPage : Page
+        {
+            public TestPage()
+            {
+            }
+
+            public bool SideEffects { get; private set; }
+
+            public IActionResult ActionResultReturningHandler() => new EmptyResult();
+
+            public IActionResult ActionResultReturnHandlerWithParameters(int arg1, string arg2 = "Hello")
+            {
+                return new ContentResult
+                {
+                    Content = $"{arg2} {arg1}",
+                };
+            }
+
+            public ViewResult ConcreteActionResult() => new ViewResult();
+
+            public void VoidReturningHandler()
+            {
+                SideEffects = true;
+            }
+
+            public async Task VoidTaskReturningHandler()
+            {
+                await Task.Run(() =>
+                {
+                    SideEffects = true;
+                });
+            }
+
+            public Task<IActionResult> GenericTaskHandler() => Task.FromResult<IActionResult>(new EmptyResult());
+
+            public Task<ContentResult> TaskReturningConcreteSubtype(string arg = "value")
+            {
+                return Task.FromResult(new ContentResult
+                {
+                    Content = arg,
+                });
+            }
+
+
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class TestPageModel
+        {
+            public bool SideEffects { get; private set; }
+
+            public IActionResult ActionResultReturningHandler() => new EmptyResult();
+
+            public IActionResult ActionResultReturnHandlerWithParameters(int arg1, string arg2 = "Hello")
+            {
+                return new ContentResult
+                {
+                    Content = $"{arg2} {arg1}",
+                };
+            }
+
+            public ViewResult ConcreteActionResult() => new ViewResult();
+
+            public void VoidReturningHandler()
+            {
+                SideEffects = true;
+            }
+
+            public async Task VoidTaskReturningHandler()
+            {
+                await Task.Run(() =>
+                {
+                    SideEffects = true;
+                });
+            }
+
+            public Task<IActionResult> GenericTaskHandler() => Task.FromResult<IActionResult>(new EmptyResult());
+
+            public Task<ContentResult> TaskReturningConcreteSubtype(string arg = "value")
+            {
+                return Task.FromResult(new ContentResult
+                {
+                    Content = arg,
+                });
+            }
+
+            public string StringResult() => "";
+
+            public Task<object> TaskOfObject() => Task.FromResult(new object());
+
+            public IViewComponentResult ViewComponent() => new ViewViewComponentResult();
+        }
+
+        private class EmptyPage : Page
+        {
+            public EmptyPage()
+            {
+            }
+
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionDescriptorChangeProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionDescriptorChangeProviderTest.cs
new file mode 100644
index 0000000000..21f9db7215
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionDescriptorChangeProviderTest.cs
@@ -0,0 +1,168 @@
+// 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.
+
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class PageActionDescriptorChangeProviderTest
+    {
+        private readonly IHostingEnvironment _hostingEnvironment = Mock.Of<IHostingEnvironment>(e => e.ContentRootPath == "BasePath");
+
+        [Fact]
+        public void GetChangeToken_WatchesAllCshtmlFilesUnderFileSystemRoot()
+        {
+            // Arrange
+            var fileProvider = new Mock<IFileProvider>();
+            fileProvider.Setup(f => f.Watch(It.IsAny<string>()))
+                .Returns(Mock.Of<IChangeToken>());
+            var accessor = Mock.Of<IRazorViewEngineFileProviderAccessor>(a => a.FileProvider == fileProvider.Object);
+
+            var fileSystem = new FileProviderRazorProjectFileSystem(accessor, _hostingEnvironment);
+            var templateEngine = new RazorTemplateEngine(
+                RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem).Engine,
+                fileSystem);
+            var options = Options.Create(new RazorPagesOptions());
+            var changeProvider = new PageActionDescriptorChangeProvider(templateEngine, accessor, options);
+
+            // Act
+            var changeToken = changeProvider.GetChangeToken();
+
+            // Assert
+            fileProvider.Verify(f => f.Watch("/Pages/**/*.cshtml"));
+        }
+
+        [Theory]
+        [InlineData("/pages-base-dir")]
+        [InlineData("/pages-base-dir/")]
+        public void GetChangeToken_WatchesAllCshtmlFilesUnderSpecifiedRootDirectory(string rootDirectory)
+        {
+            // Arrange
+            var fileProvider = new Mock<IFileProvider>();
+            fileProvider.Setup(f => f.Watch(It.IsAny<string>()))
+                .Returns(Mock.Of<IChangeToken>());
+            var accessor = Mock.Of<IRazorViewEngineFileProviderAccessor>(a => a.FileProvider == fileProvider.Object);
+
+            var fileSystem = new FileProviderRazorProjectFileSystem(accessor, _hostingEnvironment);
+            var templateEngine = new RazorTemplateEngine(
+                RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem).Engine,
+                fileSystem);
+            var options = Options.Create(new RazorPagesOptions());
+            options.Value.RootDirectory = rootDirectory;
+
+            var changeProvider = new PageActionDescriptorChangeProvider(templateEngine, accessor, options);
+
+            // Act
+            var changeToken = changeProvider.GetChangeToken();
+
+            // Assert
+            fileProvider.Verify(f => f.Watch("/pages-base-dir/**/*.cshtml"));
+        }
+
+        [Fact]
+        public void GetChangeToken_WatchesFilesUnderAreaRoot()
+        {
+            // Arrange
+            var fileProvider = new Mock<IFileProvider>();
+            fileProvider.Setup(f => f.Watch(It.IsAny<string>()))
+                .Returns(Mock.Of<IChangeToken>());
+            var accessor = Mock.Of<IRazorViewEngineFileProviderAccessor>(a => a.FileProvider == fileProvider.Object);
+
+            var fileSystem = new FileProviderRazorProjectFileSystem(accessor, _hostingEnvironment);
+            var templateEngine = new RazorTemplateEngine(
+                RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem).Engine,
+                fileSystem);
+            var options = Options.Create(new RazorPagesOptions { AllowAreas = true });
+            var changeProvider = new PageActionDescriptorChangeProvider(templateEngine, accessor, options);
+
+            // Act
+            var changeToken = changeProvider.GetChangeToken();
+
+            // Assert
+            fileProvider.Verify(f => f.Watch("/Areas/**/*.cshtml"));
+        }
+
+        [Fact]
+        public void GetChangeToken_WatchesViewImportsOutsidePagesRoot_WhenPagesRootIsNested()
+        {
+            // Arrange
+            var fileProvider = new TestFileProvider();
+            var accessor = Mock.Of<IRazorViewEngineFileProviderAccessor>(a => a.FileProvider == fileProvider);
+
+            var fileSystem = new FileProviderRazorProjectFileSystem(accessor, _hostingEnvironment);
+            var templateEngine = new RazorTemplateEngine(
+                RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem).Engine,
+                fileSystem);
+            templateEngine.Options.ImportsFileName = "_ViewImports.cshtml";
+            var options = Options.Create(new RazorPagesOptions());
+            options.Value.RootDirectory = "/dir1/dir2";
+
+            var changeProvider = new PageActionDescriptorChangeProvider(templateEngine, accessor, options);
+
+            // Act & Assert
+            var compositeChangeToken = Assert.IsType<CompositeChangeToken>(changeProvider.GetChangeToken());
+            Assert.Collection(compositeChangeToken.ChangeTokens,
+                changeToken => Assert.Same(fileProvider.GetChangeToken("/dir1/_ViewImports.cshtml"), changeToken),
+                changeToken => Assert.Same(fileProvider.GetChangeToken("/_ViewImports.cshtml"), changeToken),
+                changeToken => Assert.Same(fileProvider.GetChangeToken("/dir1/dir2/**/*.cshtml"), changeToken));
+        }
+
+        [Fact]
+        public void GetChangeToken_WatchesViewImportsOutsidePagesRoot_WhenAllowAreasIsSpecified()
+        {
+            // Arrange
+            var fileProvider = new TestFileProvider();
+            var accessor = Mock.Of<IRazorViewEngineFileProviderAccessor>(a => a.FileProvider == fileProvider);
+
+            var fileSystem = new FileProviderRazorProjectFileSystem(accessor, _hostingEnvironment);
+            var templateEngine = new RazorTemplateEngine(
+                RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem).Engine,
+                fileSystem);
+            templateEngine.Options.ImportsFileName = "_ViewImports.cshtml";
+            var options = Options.Create(new RazorPagesOptions());
+            options.Value.RootDirectory = "/dir1/dir2";
+            options.Value.AllowAreas = true;
+
+            var changeProvider = new PageActionDescriptorChangeProvider(templateEngine, accessor, options);
+
+            // Act & Assert
+            var compositeChangeToken = Assert.IsType<CompositeChangeToken>(changeProvider.GetChangeToken());
+            Assert.Collection(compositeChangeToken.ChangeTokens,
+                changeToken => Assert.Same(fileProvider.GetChangeToken("/dir1/_ViewImports.cshtml"), changeToken),
+                changeToken => Assert.Same(fileProvider.GetChangeToken("/_ViewImports.cshtml"), changeToken),
+                changeToken => Assert.Same(fileProvider.GetChangeToken("/dir1/dir2/**/*.cshtml"), changeToken),
+                changeToken => Assert.Same(fileProvider.GetChangeToken("/Areas/**/*.cshtml"), changeToken));
+        }
+
+        [Fact]
+        public void GetChangeToken_WatchesViewImportsOutsidePagesRoot_WhenAreaFeatureIsDisabled()
+        {
+            // Arrange
+            var fileProvider = new TestFileProvider();
+            var accessor = Mock.Of<IRazorViewEngineFileProviderAccessor>(a => a.FileProvider == fileProvider);
+
+            var fileSystem = new FileProviderRazorProjectFileSystem(accessor, _hostingEnvironment);
+            var templateEngine = new RazorTemplateEngine(
+                RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem).Engine,
+                fileSystem);
+            templateEngine.Options.ImportsFileName = "_ViewImports.cshtml";
+            var options = Options.Create(new RazorPagesOptions { AllowAreas = false });
+
+            var changeProvider = new PageActionDescriptorChangeProvider(templateEngine, accessor, options);
+
+            // Act & Assert
+            var compositeChangeToken = Assert.IsType<CompositeChangeToken>(changeProvider.GetChangeToken());
+            Assert.Collection(compositeChangeToken.ChangeTokens,
+                changeToken => Assert.Same(fileProvider.GetChangeToken("/_ViewImports.cshtml"), changeToken),
+                changeToken => Assert.Same(fileProvider.GetChangeToken("/Pages/**/*.cshtml"), changeToken));
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionInvokerProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionInvokerProviderTest.cs
new file mode 100644
index 0000000000..b2d6aa0186
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionInvokerProviderTest.cs
@@ -0,0 +1,547 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class PageInvokerProviderTest
+    {
+        private readonly IHostingEnvironment _hostingEnvironment = Mock.Of<IHostingEnvironment>(e => e.ContentRootPath == "BasePath");
+
+        [Fact]
+        public void OnProvidersExecuting_WithEmptyModel_PopulatesCacheEntry()
+        {
+            // Arrange
+            var descriptor = new PageActionDescriptor
+            {
+                RelativePath = "Path1",
+                FilterDescriptors = new FilterDescriptor[0],
+            };
+
+            Func<PageContext, ViewContext, object> factory = (a, b) => null;
+            Action<PageContext, ViewContext, object> releaser = (a, b, c) => { };
+
+            var loader = new Mock<IPageLoader>();
+            loader
+                .Setup(l => l.Load(It.IsAny<PageActionDescriptor>()))
+                .Returns(CreateCompiledPageActionDescriptor(descriptor));
+
+            var pageFactoryProvider = new Mock<IPageFactoryProvider>();
+            pageFactoryProvider
+                .Setup(f => f.CreatePageFactory(It.IsAny<CompiledPageActionDescriptor>()))
+                .Returns(factory);
+            pageFactoryProvider
+                .Setup(f => f.CreatePageDisposer(It.IsAny<CompiledPageActionDescriptor>()))
+                .Returns(releaser);
+
+            var invokerProvider = CreateInvokerProvider(
+                loader.Object,
+                CreateActionDescriptorCollection(descriptor),
+                pageFactoryProvider.Object);
+
+            var context = new ActionInvokerProviderContext(new ActionContext()
+            {
+                ActionDescriptor = descriptor,
+                HttpContext = new DefaultHttpContext(),
+                RouteData = new RouteData(),
+            });
+
+            // Act
+            invokerProvider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.NotNull(context.Result);
+            var actionInvoker = Assert.IsType<PageActionInvoker>(context.Result);
+            var entry = actionInvoker.CacheEntry;
+            Assert.Equal(descriptor.RelativePath, entry.ActionDescriptor.RelativePath);
+            Assert.Same(factory, entry.PageFactory);
+            Assert.Same(releaser, entry.ReleasePage);
+            Assert.Null(entry.ModelFactory);
+            Assert.Null(entry.ReleaseModel);
+            Assert.NotNull(entry.ViewDataFactory);
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_WithModel_PopulatesCacheEntry()
+        {
+            // Arrange
+            var descriptor = new PageActionDescriptor
+            {
+                RelativePath = "Path1",
+                FilterDescriptors = new FilterDescriptor[0]
+            };
+
+            Func<PageContext, ViewContext, object> factory = (a, b) => null;
+            Action<PageContext, ViewContext, object> releaser = (a, b, c) => { };
+            Func<PageContext, object> modelFactory = _ => null;
+            Action<PageContext, object> modelDisposer = (_, __) => { };
+
+            var loader = new Mock<IPageLoader>();
+            loader
+                .Setup(l => l.Load(It.IsAny<PageActionDescriptor>()))
+                .Returns(CreateCompiledPageActionDescriptor(
+                    descriptor,
+                    pageType: typeof(PageWithModel),
+                    modelType: typeof(DerivedTestPageModel)));
+
+            var pageFactoryProvider = new Mock<IPageFactoryProvider>();
+            pageFactoryProvider
+                .Setup(f => f.CreatePageFactory(It.IsAny<CompiledPageActionDescriptor>()))
+                .Returns(factory);
+            pageFactoryProvider
+                .Setup(f => f.CreatePageDisposer(It.IsAny<CompiledPageActionDescriptor>()))
+                .Returns(releaser);
+
+            var modelFactoryProvider = new Mock<IPageModelFactoryProvider>();
+            modelFactoryProvider
+                .Setup(f => f.CreateModelFactory(It.IsAny<CompiledPageActionDescriptor>()))
+                .Returns(modelFactory);
+            modelFactoryProvider
+                .Setup(f => f.CreateModelDisposer(It.IsAny<CompiledPageActionDescriptor>()))
+                .Returns(modelDisposer);
+
+            var invokerProvider = CreateInvokerProvider(
+                loader.Object,
+                CreateActionDescriptorCollection(descriptor),
+                pageFactoryProvider.Object,
+                modelFactoryProvider.Object);
+
+            var context = new ActionInvokerProviderContext(new ActionContext()
+            {
+                ActionDescriptor = descriptor,
+                HttpContext = new DefaultHttpContext(),
+                RouteData = new RouteData(),
+            });
+
+            // Act
+            invokerProvider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.NotNull(context.Result);
+
+            var actionInvoker = Assert.IsType<PageActionInvoker>(context.Result);
+
+            var entry = actionInvoker.CacheEntry;
+            var compiledPageActionDescriptor = Assert.IsType<CompiledPageActionDescriptor>(entry.ActionDescriptor);
+            Assert.Equal(descriptor.RelativePath, compiledPageActionDescriptor.RelativePath);
+            Assert.Same(factory, entry.PageFactory);
+            Assert.Same(releaser, entry.ReleasePage);
+            Assert.Same(modelFactory, entry.ModelFactory);
+            Assert.Same(modelDisposer, entry.ReleaseModel);
+            Assert.NotNull(entry.ViewDataFactory);
+
+            var pageContext = actionInvoker.PageContext;
+            Assert.Same(compiledPageActionDescriptor, pageContext.ActionDescriptor);
+            Assert.Same(context.ActionContext.HttpContext, pageContext.HttpContext);
+            Assert.Same(context.ActionContext.ModelState, pageContext.ModelState);
+            Assert.Same(context.ActionContext.RouteData, pageContext.RouteData);
+            Assert.Empty(pageContext.ValueProviderFactories);
+            Assert.NotNull(Assert.IsType<ViewDataDictionary<TestPageModel>>(pageContext.ViewData));
+            Assert.Empty(pageContext.ViewStartFactories);
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_CachesViewStartFactories()
+        {
+            // Arrange
+            var descriptor = new PageActionDescriptor
+            {
+                RelativePath = "/Home/Path1/File.cshtml",
+                ViewEnginePath = "/Home/Path1/File.cshtml",
+                FilterDescriptors = new FilterDescriptor[0],
+            };
+
+            var loader = new Mock<IPageLoader>();
+            loader
+                .Setup(l => l.Load(It.IsAny<PageActionDescriptor>()))
+                .Returns(CreateCompiledPageActionDescriptor(descriptor, pageType: typeof(PageWithModel)));
+
+            var razorPageFactoryProvider = new Mock<IRazorPageFactoryProvider>();
+
+            Func<IRazorPage> factory1 = () => null;
+            Func<IRazorPage> factory2 = () => null;
+
+            razorPageFactoryProvider
+                .Setup(f => f.CreateFactory("/Home/Path1/_ViewStart.cshtml"))
+                .Returns(new RazorPageFactoryResult(new CompiledViewDescriptor(), factory1));
+            razorPageFactoryProvider
+                .Setup(f => f.CreateFactory("/_ViewStart.cshtml"))
+                .Returns(new RazorPageFactoryResult(new CompiledViewDescriptor(), factory2));
+
+            var fileSystem = new VirtualRazorProjectFileSystem();
+            fileSystem.Add(new TestRazorProjectItem("/Home/Path1/_ViewStart.cshtml", "content1"));
+            fileSystem.Add(new TestRazorProjectItem("/_ViewStart.cshtml", "content2"));
+
+            var invokerProvider = CreateInvokerProvider(
+                loader.Object,
+                CreateActionDescriptorCollection(descriptor),
+                razorPageFactoryProvider: razorPageFactoryProvider.Object,
+                fileSystem: fileSystem);
+
+            var context = new ActionInvokerProviderContext(new ActionContext()
+            {
+                ActionDescriptor = descriptor,
+                HttpContext = new DefaultHttpContext(),
+                RouteData = new RouteData(),
+            });
+
+            // Act
+            invokerProvider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.NotNull(context.Result);
+            var actionInvoker = Assert.IsType<PageActionInvoker>(context.Result);
+            var entry = actionInvoker.CacheEntry;
+            Assert.Equal(new[] { factory2, factory1 }, entry.ViewStartFactories);
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_CachesEntries()
+        {
+            // Arrange
+            var descriptor = new PageActionDescriptor
+            {
+                RelativePath = "Path1",
+                FilterDescriptors = new FilterDescriptor[0],
+            };
+
+            var loader = new Mock<IPageLoader>();
+            loader
+                .Setup(l => l.Load(It.IsAny<PageActionDescriptor>()))
+                .Returns(CreateCompiledPageActionDescriptor(descriptor));
+
+            var invokerProvider = CreateInvokerProvider(
+                loader.Object,
+                CreateActionDescriptorCollection(descriptor));
+
+            var context = new ActionInvokerProviderContext(new ActionContext
+            {
+                ActionDescriptor = descriptor,
+                HttpContext = new DefaultHttpContext(),
+                RouteData = new RouteData(),
+            });
+
+            // Act - 1
+            invokerProvider.OnProvidersExecuting(context);
+
+            // Assert - 1
+            Assert.NotNull(context.Result);
+            var actionInvoker = Assert.IsType<PageActionInvoker>(context.Result);
+            var entry1 = actionInvoker.CacheEntry;
+
+            // Act - 2
+            context = new ActionInvokerProviderContext(new ActionContext
+            {
+                ActionDescriptor = descriptor,
+                HttpContext = new DefaultHttpContext(),
+                RouteData = new RouteData(),
+            });
+            invokerProvider.OnProvidersExecuting(context);
+
+            // Assert - 2
+            Assert.NotNull(context.Result);
+            actionInvoker = Assert.IsType<PageActionInvoker>(context.Result);
+            var entry2 = actionInvoker.CacheEntry;
+            Assert.Same(entry1, entry2);
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_UpdatesEntriesWhenActionDescriptorProviderCollectionIsUpdated()
+        {
+            // Arrange
+            var descriptor = new PageActionDescriptor
+            {
+                RelativePath = "Path1",
+                FilterDescriptors = new FilterDescriptor[0],
+            };
+
+            var descriptorCollection1 = new ActionDescriptorCollection(new[] { descriptor }, version: 1);
+            var descriptorCollection2 = new ActionDescriptorCollection(new[] { descriptor }, version: 2);
+
+            var actionDescriptorProvider = new Mock<IActionDescriptorCollectionProvider>();
+            actionDescriptorProvider
+                .SetupSequence(p => p.ActionDescriptors)
+                .Returns(descriptorCollection1)
+                .Returns(descriptorCollection2);
+
+            var loader = new Mock<IPageLoader>();
+            loader
+                .Setup(l => l.Load(It.IsAny<PageActionDescriptor>()))
+                .Returns(CreateCompiledPageActionDescriptor(descriptor));
+
+            var invokerProvider = CreateInvokerProvider(
+                 loader.Object,
+                 actionDescriptorProvider.Object);
+
+            var context = new ActionInvokerProviderContext(new ActionContext()
+            {
+                ActionDescriptor = descriptor,
+                HttpContext = new DefaultHttpContext(),
+                RouteData = new RouteData(),
+            });
+
+            // Act - 1
+            invokerProvider.OnProvidersExecuting(context);
+
+            // Assert - 1
+            Assert.NotNull(context.Result);
+            var actionInvoker = Assert.IsType<PageActionInvoker>(context.Result);
+            var entry1 = actionInvoker.CacheEntry;
+
+            // Act - 2
+            invokerProvider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.NotNull(context.Result);
+            actionInvoker = Assert.IsType<PageActionInvoker>(context.Result);
+            var entry2 = actionInvoker.CacheEntry;
+            Assert.NotSame(entry1, entry2);
+        }
+
+        [Fact]
+        public void GetViewStartFactories_FindsFullHierarchy()
+        {
+
+            // Arrange
+            var descriptor = new PageActionDescriptor()
+            {
+                RelativePath = "/Pages/Level1/Level2/Index.cshtml",
+                FilterDescriptors = new FilterDescriptor[0],
+                ViewEnginePath = "/Pages/Level1/Level2/Index.cshtml"
+            };
+
+            var compiledPageDescriptor = new CompiledPageActionDescriptor(descriptor)
+            {
+                PageTypeInfo = typeof(object).GetTypeInfo(),
+            };
+
+            var loader = new Mock<IPageLoader>();
+            loader
+                .Setup(l => l.Load(It.IsAny<PageActionDescriptor>()))
+                .Returns(compiledPageDescriptor);
+
+            var fileProvider = new TestFileProvider();
+            fileProvider.AddFile("/_ViewStart.cshtml", "page content");
+            fileProvider.AddFile("/Pages/_ViewStart.cshtml", "page content");
+            fileProvider.AddFile("/Pages/Level1/_ViewStart.cshtml", "page content");
+            fileProvider.AddFile("/Pages/Level1/Level2/_ViewStart.cshtml", "page content");
+            fileProvider.AddFile("/Pages/Level1/Level3/_ViewStart.cshtml", "page content");
+
+            var fileSystem = new TestRazorProjectFileSystem(fileProvider, _hostingEnvironment);
+
+            var mock = new Mock<IRazorPageFactoryProvider>(MockBehavior.Strict);
+            mock
+                .Setup(p => p.CreateFactory("/Pages/Level1/Level2/_ViewStart.cshtml"))
+                .Returns(new RazorPageFactoryResult(new CompiledViewDescriptor(), () => null))
+                .Verifiable();
+            mock
+                .Setup(p => p.CreateFactory("/Pages/Level1/_ViewStart.cshtml"))
+                .Returns(new RazorPageFactoryResult(new CompiledViewDescriptor(), () => null))
+                .Verifiable();
+            mock
+                .Setup(p => p.CreateFactory("/Pages/_ViewStart.cshtml"))
+                .Returns(new RazorPageFactoryResult(new CompiledViewDescriptor(), () => null))
+                .Verifiable();
+            mock
+                .Setup(p => p.CreateFactory("/_ViewStart.cshtml"))
+                .Returns(new RazorPageFactoryResult(new CompiledViewDescriptor(), () => null))
+                .Verifiable();
+
+            var razorPageFactoryProvider = mock.Object;
+
+            var invokerProvider = CreateInvokerProvider(
+                loader.Object,
+                CreateActionDescriptorCollection(descriptor),
+                razorPageFactoryProvider: razorPageFactoryProvider,
+                fileSystem: fileSystem);
+
+            // Act
+            var factories = invokerProvider.GetViewStartFactories(compiledPageDescriptor);
+
+            // Assert
+            mock.Verify();
+        }
+
+        [Fact]
+        public void GetViewStartFactories_ReturnsFactoriesForFilesThatDoNotExistInProject()
+        {
+            // The factory provider might have access to _ViewStarts for files that do not exist on disk \ RazorProject.
+            // This test verifies that we query the factory provider correctly.
+            // Arrange
+            var descriptor = new PageActionDescriptor()
+            {
+                RelativePath = "/Views/Deeper/Index.cshtml",
+                FilterDescriptors = new FilterDescriptor[0],
+                ViewEnginePath = "/Views/Deeper/Index.cshtml"
+            };
+
+            var loader = new Mock<IPageLoader>();
+            loader
+                .Setup(l => l.Load(It.IsAny<PageActionDescriptor>()))
+                .Returns(CreateCompiledPageActionDescriptor(descriptor, typeof(TestPageModel)));
+
+            var pageFactory = new Mock<IRazorPageFactoryProvider>();
+            pageFactory
+                .Setup(f => f.CreateFactory("/Views/Deeper/_ViewStart.cshtml"))
+                .Returns(new RazorPageFactoryResult(new CompiledViewDescriptor(), () => null));
+            pageFactory
+                .Setup(f => f.CreateFactory("/Views/_ViewStart.cshtml"))
+                .Returns(new RazorPageFactoryResult(new CompiledViewDescriptor(), razorPageFactory: null));
+            pageFactory
+                .Setup(f => f.CreateFactory("/_ViewStart.cshtml"))
+                .Returns(new RazorPageFactoryResult(new CompiledViewDescriptor(), () => null));
+
+            // No files
+            var fileProvider = new TestFileProvider();
+            var fileSystem = new TestRazorProjectFileSystem(fileProvider, _hostingEnvironment);
+
+            var invokerProvider = CreateInvokerProvider(
+                loader.Object,
+                CreateActionDescriptorCollection(descriptor),
+                pageProvider: null,
+                modelProvider: null,
+                razorPageFactoryProvider: pageFactory.Object,
+                fileSystem: fileSystem);
+
+            var compiledDescriptor = CreateCompiledPageActionDescriptor(descriptor);
+
+            // Act
+            var factories = invokerProvider.GetViewStartFactories(compiledDescriptor).ToList();
+
+            // Assert
+            Assert.Equal(2, factories.Count);
+        }
+
+        private static CompiledPageActionDescriptor CreateCompiledPageActionDescriptor(
+            PageActionDescriptor descriptor,
+            Type pageType = null,
+            Type modelType = null)
+        {
+            pageType = pageType ?? typeof(object);
+            var pageTypeInfo = pageType.GetTypeInfo();
+
+            var modelTypeInfo = modelType?.GetTypeInfo();
+            TypeInfo declaredModelTypeInfo = null;
+            if (pageType != null)
+            {
+                declaredModelTypeInfo = pageTypeInfo.GetProperty("Model")?.PropertyType.GetTypeInfo();
+                if (modelTypeInfo == null)
+                {
+                    modelTypeInfo = declaredModelTypeInfo;
+                }
+            }
+
+            return new CompiledPageActionDescriptor(descriptor)
+            {
+                HandlerTypeInfo = modelTypeInfo ?? pageTypeInfo,
+                DeclaredModelTypeInfo = declaredModelTypeInfo ?? pageTypeInfo,
+                ModelTypeInfo = modelTypeInfo ?? pageTypeInfo,
+                PageTypeInfo = pageTypeInfo,
+                FilterDescriptors = Array.Empty<FilterDescriptor>(),
+            };
+        }
+
+        private static PageActionInvokerProvider CreateInvokerProvider(
+            IPageLoader loader,
+            IActionDescriptorCollectionProvider actionDescriptorProvider,
+            IPageFactoryProvider pageProvider = null,
+            IPageModelFactoryProvider modelProvider = null,
+            IRazorPageFactoryProvider razorPageFactoryProvider = null,
+            RazorProjectFileSystem fileSystem = null)
+        {
+            var tempDataFactory = new Mock<ITempDataDictionaryFactory>();
+            tempDataFactory
+                .Setup(t => t.GetTempData(It.IsAny<HttpContext>()))
+                .Returns((HttpContext context) => new TempDataDictionary(context, Mock.Of<ITempDataProvider>()));
+
+            if (fileSystem == null)
+            {
+                fileSystem = Mock.Of<RazorProjectFileSystem>();
+            }
+
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelBinderFactory = TestModelBinderFactory.CreateDefault();
+            var mvcOptions = new MvcOptions
+            {
+                AllowValidatingTopLevelNodes = true,
+            };
+
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                TestModelBinderFactory.CreateDefault(),
+                Mock.Of<IObjectModelValidator>(),
+                Options.Create(mvcOptions),
+                NullLoggerFactory.Instance);
+
+            return new PageActionInvokerProvider(
+                loader,
+                pageProvider ?? Mock.Of<IPageFactoryProvider>(),
+                modelProvider ?? Mock.Of<IPageModelFactoryProvider>(),
+                razorPageFactoryProvider ?? Mock.Of<IRazorPageFactoryProvider>(),
+                actionDescriptorProvider,
+                new IFilterProvider[0],
+                parameterBinder,
+                modelMetadataProvider,
+                modelBinderFactory,
+                tempDataFactory.Object,
+                Options.Create(new MvcOptions()),
+                Options.Create(new HtmlHelperOptions()),
+                Mock.Of<IPageHandlerMethodSelector>(),
+                fileSystem,
+                new DiagnosticListener("Microsoft.AspNetCore"),
+                NullLoggerFactory.Instance,
+                new ActionResultTypeMapper());
+        }
+
+        private IActionDescriptorCollectionProvider CreateActionDescriptorCollection(PageActionDescriptor descriptor)
+        {
+            var descriptorCollection = new ActionDescriptorCollection(new[] { descriptor }, version: 1);
+            var actionDescriptorProvider = new Mock<IActionDescriptorCollectionProvider>();
+            actionDescriptorProvider
+                .Setup(p => p.ActionDescriptors)
+                .Returns(descriptorCollection);
+
+            return actionDescriptorProvider.Object;
+        }
+
+        private class PageWithModel
+        {
+            public TestPageModel Model { get; set; }
+        }
+
+        private class TestPageModel
+        {
+            public void OnGet()
+            {
+            }
+        }
+
+        private class DerivedTestPageModel : TestPageModel
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionInvokerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionInvokerTest.cs
new file mode 100644
index 0000000000..5b7899ac3e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionInvokerTest.cs
@@ -0,0 +1,1724 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class PageActionInvokerTest : CommonResourceInvokerTest
+    {
+        #region Diagnostics
+
+        [Fact]
+        public async Task Invoke_WritesDiagnostic_ActionSelected()
+        {
+            // Arrange
+            var actionDescriptor = CreateDescriptorForSimplePage();
+            var displayName = actionDescriptor.DisplayName;
+
+            var routeData = new RouteData();
+            routeData.Values.Add("tag", "value");
+
+            var listener = new TestDiagnosticListener();
+
+            var invoker = CreateInvoker(filters: null, actionDescriptor: actionDescriptor, listener: listener, routeData: routeData);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.NotNull(listener.BeforeAction?.ActionDescriptor);
+            Assert.NotNull(listener.BeforeAction?.HttpContext);
+
+            var routeValues = listener.BeforeAction?.RouteData?.Values;
+            Assert.NotNull(routeValues);
+
+            Assert.Equal(1, routeValues.Count);
+            Assert.Contains(routeValues, kvp => kvp.Key == "tag" && string.Equals(kvp.Value, "value"));
+        }
+
+        [Fact]
+        public async Task Invoke_WritesDiagnostic_ActionInvoked()
+        {
+            // Arrange
+            var actionDescriptor = CreateDescriptorForSimplePage();
+            var displayName = actionDescriptor.DisplayName;
+
+            var routeData = new RouteData();
+            routeData.Values.Add("tag", "value");
+
+            var listener = new TestDiagnosticListener();
+
+            var invoker = CreateInvoker(filters: null, actionDescriptor: actionDescriptor, listener: listener, routeData: routeData);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.NotNull(listener.AfterAction?.ActionDescriptor);
+            Assert.NotNull(listener.AfterAction?.HttpContext);
+        }
+
+        #endregion
+
+        #region Page Context
+
+        [Fact]
+        public async Task AddingValueProviderFactory_AtResourceFilter_IsAvailableInPageContext()
+        {
+            // Arrange
+            var valueProviderFactory2 = Mock.Of<IValueProviderFactory>();
+            var resourceFilter = new Mock<IResourceFilter>();
+            resourceFilter
+                .Setup(f => f.OnResourceExecuting(It.IsAny<ResourceExecutingContext>()))
+                .Callback<ResourceExecutingContext>((resourceExecutingContext) =>
+                {
+                    resourceExecutingContext.ValueProviderFactories.Add(valueProviderFactory2);
+                });
+            var valueProviderFactory1 = Mock.Of<IValueProviderFactory>();
+            var valueProviderFactories = new List<IValueProviderFactory>
+            {
+                valueProviderFactory1
+            };
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[] { resourceFilter.Object }, valueProviderFactories: valueProviderFactories);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var pageContext = Assert.IsType<PageActionInvoker>(invoker).PageContext;
+            Assert.NotNull(pageContext);
+            Assert.Equal(2, pageContext.ValueProviderFactories.Count);
+            Assert.Same(valueProviderFactory1, pageContext.ValueProviderFactories[0]);
+            Assert.Same(valueProviderFactory2, pageContext.ValueProviderFactories[1]);
+        }
+
+        [Fact]
+        public async Task DeletingValueProviderFactory_AtResourceFilter_IsNotAvailableInPageContext()
+        {
+            // Arrange
+            var resourceFilter = new Mock<IResourceFilter>();
+            resourceFilter
+                .Setup(f => f.OnResourceExecuting(It.IsAny<ResourceExecutingContext>()))
+                .Callback<ResourceExecutingContext>((resourceExecutingContext) =>
+                {
+                    resourceExecutingContext.ValueProviderFactories.RemoveAt(0);
+                });
+
+            var valueProviderFactory1 = Mock.Of<IValueProviderFactory>();
+            var valueProviderFactory2 = Mock.Of<IValueProviderFactory>();
+            var valueProviderFactories = new List<IValueProviderFactory>
+            {
+                valueProviderFactory1,
+                valueProviderFactory2
+            };
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[] { resourceFilter.Object }, valueProviderFactories: valueProviderFactories);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var pageContext = Assert.IsType<PageActionInvoker>(invoker).PageContext;
+            Assert.NotNull(pageContext);
+            Assert.Equal(1, pageContext.ValueProviderFactories.Count);
+            Assert.Same(valueProviderFactory2, pageContext.ValueProviderFactories[0]);
+        }
+
+        #endregion
+
+        #region Page vs PageModel
+
+        [Fact]
+        public async Task InvokeAction_WithSimplePage_FlowsRightValues()
+        {
+            // Arrange
+            object instance = null;
+            IActionResult result = null;
+
+            var pageFilter = new Mock<IPageFilter>(MockBehavior.Strict);
+            AllowSelector(pageFilter);
+            pageFilter
+                .Setup(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()))
+                .Callback<PageHandlerExecutingContext>(c =>
+                {
+                    instance = c.HandlerInstance;
+                });
+            pageFilter
+                .Setup(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()))
+                .Callback<PageHandlerExecutedContext>(c =>
+                {
+                    Assert.Same(instance, c.HandlerInstance);
+                });
+
+            var resultFilter = new Mock<IResultFilter>(MockBehavior.Strict);
+            resultFilter
+                .Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()))
+                .Callback<ResultExecutingContext>(c =>
+                {
+                    Assert.Same(instance, c.Controller);
+                    result = c.Result;
+                });
+            resultFilter
+                .Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()))
+                .Callback<ResultExecutedContext>(c =>
+                {
+                    Assert.Same(instance, c.Controller);
+                    Assert.Same(result, c.Result);
+                });
+
+            var filters = new IFilterMetadata[] { pageFilter.Object, resultFilter.Object };
+
+            var invoker = CreateInvoker(filters, CreateDescriptorForSimplePage());
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var page = Assert.IsType<TestPage>(instance);
+            Assert.IsType<ViewDataDictionary<TestPage>>(page.ViewContext.ViewData);
+            Assert.Same(page, page.ViewContext.ViewData.Model);
+
+            var pageResult = Assert.IsType<PageResult>(result);
+            Assert.Same(page, pageResult.Page);
+            Assert.Same(page, pageResult.Model);
+            Assert.Same(page.ViewContext.ViewData, pageResult.ViewData);
+        }
+
+        [Fact]
+        public async Task InvokeAction_WithSimplePageWithPocoModel_FlowsRightValues()
+        {
+            // Arrange
+            object instance = null;
+            IActionResult result = null;
+
+            var pageFilter = new Mock<IPageFilter>(MockBehavior.Strict);
+            AllowSelector(pageFilter);
+            pageFilter
+                .Setup(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()))
+                .Callback<PageHandlerExecutingContext>(c =>
+                {
+                    instance = c.HandlerInstance;
+                });
+            pageFilter
+                .Setup(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()))
+                .Callback<PageHandlerExecutedContext>(c =>
+                {
+                    Assert.Same(instance, c.HandlerInstance);
+                });
+
+            var resultFilter = new Mock<IResultFilter>(MockBehavior.Strict);
+            resultFilter
+                .Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()))
+                .Callback<ResultExecutingContext>(c =>
+                {
+                    Assert.Same(instance, c.Controller);
+                    result = c.Result;
+                });
+            resultFilter
+                .Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()))
+                .Callback<ResultExecutedContext>(c =>
+                {
+                    Assert.Same(instance, c.Controller);
+                    Assert.Same(result, c.Result);
+                });
+
+            var filters = new IFilterMetadata[] { pageFilter.Object, resultFilter.Object };
+
+            var invoker = CreateInvoker(filters, CreateDescriptorForSimplePageWithPocoModel());
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var page = Assert.IsType<TestPage>(instance);
+            Assert.IsType<ViewDataDictionary<PocoModel>>(page.PageContext.ViewData);
+            Assert.Null(page.PageContext.ViewData.Model);
+
+            var pageResult = Assert.IsType<PageResult>(result);
+            Assert.Same(page, pageResult.Page);
+            Assert.Null(pageResult.Model);
+            Assert.Same(page.ViewContext.ViewData, pageResult.ViewData);
+
+        }
+
+        [Fact]
+        public async Task InvokeAction_WithPageModel_FlowsRightValues()
+        {
+            // Arrange
+            object instance = null;
+            IActionResult result = null;
+
+            var pageFilter = new Mock<IPageFilter>(MockBehavior.Strict);
+            AllowSelector(pageFilter);
+            pageFilter
+                .Setup(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()))
+                .Callback<PageHandlerExecutingContext>(c =>
+                {
+                    instance = c.HandlerInstance;
+                });
+            pageFilter
+                .Setup(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()))
+                .Callback<PageHandlerExecutedContext>(c =>
+                {
+                    Assert.Same(instance, c.HandlerInstance);
+                });
+
+            var resultFilter = new Mock<IResultFilter>(MockBehavior.Strict);
+            resultFilter
+                .Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()))
+                .Callback<ResultExecutingContext>(c =>
+                {
+                    Assert.Same(instance, c.Controller);
+                    result = c.Result;
+                });
+            resultFilter
+                .Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()))
+                .Callback<ResultExecutedContext>(c =>
+                {
+                    Assert.Same(instance, c.Controller);
+                    Assert.Same(result, c.Result);
+                });
+
+            var filters = new IFilterMetadata[] { pageFilter.Object, resultFilter.Object };
+
+            var invoker = CreateInvoker(
+                filters,
+                CreateDescriptorForPageModelPage(),
+                modelFactory: context => new TestPageModel() { PageContext = context });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var pageModel = Assert.IsType<TestPageModel>(instance);
+            Assert.IsType<ViewDataDictionary<TestPageModel>>(pageModel.PageContext.ViewData);
+            Assert.Same(pageModel, pageModel.ViewData.Model);
+
+            var pageResult = Assert.IsType<PageResult>(result);
+            Assert.IsType<TestPage>(pageResult.Page);
+            Assert.Same(pageModel, pageResult.Model);
+            Assert.Same(pageModel.PageContext.ViewData, pageResult.ViewData);
+        }
+
+        [Fact]
+        public async Task InvokeAction_WithPage_SetsExecutingFilePath()
+        {
+            // Arrange
+            var relativePath = "/Pages/Users/Show.cshtml";
+            var descriptor = CreateDescriptorForSimplePage();
+            descriptor.RelativePath = relativePath;
+
+            object instance = null;
+            var pageFilter = new Mock<IPageFilter>();
+            AllowSelector(pageFilter);
+            pageFilter
+                .Setup(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()))
+                .Callback<PageHandlerExecutingContext>(c =>
+                {
+                    instance = c.HandlerInstance;
+                });
+            var invoker = CreateInvoker(new[] { pageFilter.Object }, descriptor);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            var page = Assert.IsType<TestPage>(instance);
+            Assert.Equal(relativePath, page.ViewContext.ExecutingFilePath);
+        }
+        #endregion
+
+        #region Handler Selection
+
+        [Fact]
+        public async Task InvokeAction_InvokesPageFilter_CanModifySelectedHandler()
+        {
+            // Arrange
+            HandlerMethodDescriptor handler = null;
+
+            var filter1 = new Mock<IPageFilter>(MockBehavior.Strict);
+            filter1
+                .Setup(f => f.OnPageHandlerSelected(It.IsAny<PageHandlerSelectedContext>()))
+                .Callback<PageHandlerSelectedContext>(c =>
+                {
+                    handler = c.HandlerMethod = c.ActionDescriptor.HandlerMethods[1];
+                })
+                .Verifiable();
+            filter1
+                .Setup(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()))
+                .Callback<PageHandlerExecutingContext>(c => Assert.Same(handler, c.HandlerMethod))
+                .Verifiable();
+            filter1
+                .Setup(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()))
+                .Callback<PageHandlerExecutedContext>(c => Assert.Same(handler, c.HandlerMethod))
+                .Verifiable();
+
+            var filter2 = new Mock<IPageFilter>(MockBehavior.Strict);
+            filter2
+                .Setup(f => f.OnPageHandlerSelected(It.IsAny<PageHandlerSelectedContext>()))
+                .Callback<PageHandlerSelectedContext>(c => Assert.Same(handler, c.HandlerMethod))
+                .Verifiable();
+            filter2
+                .Setup(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()))
+                .Callback<PageHandlerExecutingContext>(c => Assert.Same(handler, c.HandlerMethod))
+                .Verifiable();
+            filter2
+                .Setup(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()))
+                .Callback<PageHandlerExecutedContext>(c => Assert.Same(handler, c.HandlerMethod))
+                .Verifiable();
+
+            var filters = new IFilterMetadata[] { filter1.Object, filter2.Object };
+
+            var invoker = CreateInvoker(filters, actionDescriptor: CreateDescriptorForSimplePage());
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter1.Verify(f => f.OnPageHandlerSelected(It.IsAny<PageHandlerSelectedContext>()), Times.Once());
+            filter1.Verify(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()), Times.Once());
+            filter1.Verify(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()), Times.Once());
+
+            filter2.Verify(f => f.OnPageHandlerSelected(It.IsAny<PageHandlerSelectedContext>()), Times.Once());
+            filter2.Verify(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()), Times.Once());
+            filter2.Verify(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()), Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncPageFilter_CanModifySelectedHandler()
+        {
+            // Arrange
+            HandlerMethodDescriptor handler = null;
+
+            var filter1 = new Mock<IAsyncPageFilter>(MockBehavior.Strict);
+            filter1
+                .Setup(f => f.OnPageHandlerSelectionAsync(It.IsAny<PageHandlerSelectedContext>()))
+                .Callback<PageHandlerSelectedContext>(c =>
+                {
+                    handler = c.HandlerMethod = c.ActionDescriptor.HandlerMethods[1];
+                })
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+            filter1
+                .Setup(f => f.OnPageHandlerExecutionAsync(It.IsAny<PageHandlerExecutingContext>(), It.IsAny<PageHandlerExecutionDelegate>()))
+                .Returns<PageHandlerExecutingContext, PageHandlerExecutionDelegate>(async (c, next) =>
+                {
+                    Assert.Same(handler, c.HandlerMethod);
+                    await next();
+                })
+                .Verifiable();
+
+            var filter2 = new Mock<IAsyncPageFilter>(MockBehavior.Strict);
+            filter2
+                .Setup(f => f.OnPageHandlerSelectionAsync(It.IsAny<PageHandlerSelectedContext>()))
+                .Callback<PageHandlerSelectedContext>(c => Assert.Same(handler, c.HandlerMethod))
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+            filter2
+                .Setup(f => f.OnPageHandlerExecutionAsync(It.IsAny<PageHandlerExecutingContext>(), It.IsAny<PageHandlerExecutionDelegate>()))
+                .Returns<PageHandlerExecutingContext, PageHandlerExecutionDelegate>(async (c, next) =>
+                {
+                    Assert.Same(handler, c.HandlerMethod);
+                    await next();
+                })
+                .Verifiable();
+
+            var filters = new IFilterMetadata[] { filter1.Object, filter2.Object };
+
+            var invoker = CreateInvoker(filters, actionDescriptor: CreateDescriptorForSimplePage());
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter1.Verify(f => f.OnPageHandlerSelectionAsync(It.IsAny<PageHandlerSelectedContext>()), Times.Once());
+            filter1.Verify(f => f.OnPageHandlerExecutionAsync(It.IsAny<PageHandlerExecutingContext>(), It.IsAny<PageHandlerExecutionDelegate>()), Times.Once());
+
+            filter2.Verify(f => f.OnPageHandlerSelectionAsync(It.IsAny<PageHandlerSelectedContext>()), Times.Once());
+            filter2.Verify(f => f.OnPageHandlerExecutionAsync(It.IsAny<PageHandlerExecutingContext>(), It.IsAny<PageHandlerExecutionDelegate>()), Times.Once());
+        }
+
+        #endregion
+
+        #region Page Filters
+
+        [Fact]
+        public async Task ViewDataIsSet_AfterHandlerMethodIsExecuted()
+        {
+            // Arrange
+            var pageHandlerExecutedCalled = false;
+            var pageFilter = new Mock<IPageFilter>();
+            AllowSelector(pageFilter);
+            pageFilter
+                .Setup(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()))
+                .Callback<PageHandlerExecutedContext>(c =>
+                {
+                    pageHandlerExecutedCalled = true;
+                    var result = c.Result;
+                    var pageResult = Assert.IsType<PageResult>(result);
+                    Assert.IsType<ViewDataDictionary<TestPage>>(pageResult.ViewData);
+                    Assert.IsType<TestPage>(pageResult.Model);
+                    Assert.Null(pageResult.Page);
+                });
+            var invoker = CreateInvoker(new IFilterMetadata[] { pageFilter.Object }, result: new PageResult());
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.True(pageHandlerExecutedCalled);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesPageFilter()
+        {
+            // Arrange
+            IActionResult result = null;
+
+            var filter = new Mock<IPageFilter>(MockBehavior.Strict);
+            AllowSelector(filter);
+            filter.Setup(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()))
+                .Callback<PageHandlerExecutedContext>(c => result = c.Result)
+                .Verifiable();
+
+            var invoker = CreateInvoker(filter.Object, result: Result);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter.Verify(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()), Times.Once());
+            filter.Verify(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()), Times.Once());
+
+            Assert.Same(Result, result);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncPageFilter()
+        {
+            // Arrange
+            IActionResult result = null;
+
+            var filter = new Mock<IAsyncPageFilter>(MockBehavior.Strict);
+            AllowSelector(filter);
+            filter
+                .Setup(f => f.OnPageHandlerExecutionAsync(It.IsAny<PageHandlerExecutingContext>(), It.IsAny<PageHandlerExecutionDelegate>()))
+                .Returns<PageHandlerExecutingContext, PageHandlerExecutionDelegate>(async (context, next) =>
+                {
+                    var resultContext = await next();
+                    result = resultContext.Result;
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(filter.Object, result: Result);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter.Verify(
+                f => f.OnPageHandlerExecutionAsync(It.IsAny<PageHandlerExecutingContext>(), It.IsAny<PageHandlerExecutionDelegate>()),
+                Times.Once());
+
+            Assert.Same(Result, result);
+        }
+
+        [Fact]
+        public async Task InvokeAction_PageResultSetAt_AsyncAuthorizeFilter_PopulatesProperties()
+        {
+            // Arrange
+            var expectedResult = new PageResult();
+
+            IActionResult result = null;
+            var filter = new Mock<IAsyncAuthorizationFilter>(MockBehavior.Strict);
+            filter
+                .Setup(f => f.OnAuthorizationAsync(It.IsAny<AuthorizationFilterContext>()))
+                .Returns<AuthorizationFilterContext>((context) =>
+                {
+                    context.Result = expectedResult;
+                    result = context.Result;
+                    return Task.CompletedTask;
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(filter.Object);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter.Verify(
+                f => f.OnAuthorizationAsync(It.IsAny<AuthorizationFilterContext>()),
+                Times.Once());
+
+            var pageResult = Assert.IsType<PageResult>(result);
+            Assert.Same(expectedResult, pageResult);
+            Assert.NotNull(pageResult.Page);
+            Assert.NotNull(pageResult.ViewData);
+            Assert.NotNull(pageResult.Page.ViewContext);
+        }
+
+        [Fact]
+        public async Task InvokeAction_PageResultSetAt_SyncAuthorizeFilter_PopulatesProperties()
+        {
+            // Arrange
+            var expectedResult = new PageResult();
+
+            IActionResult result = null;
+            var filter = new Mock<IAuthorizationFilter>(MockBehavior.Strict);
+            filter
+                .Setup(f => f.OnAuthorization(It.IsAny<AuthorizationFilterContext>()))
+                .Callback<AuthorizationFilterContext>((context) =>
+                {
+                    context.Result = expectedResult;
+                    result = context.Result;
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(filter.Object);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter.Verify(
+                f => f.OnAuthorization(It.IsAny<AuthorizationFilterContext>()),
+                Times.Once());
+
+            var pageResult = Assert.IsType<PageResult>(result);
+            Assert.Same(expectedResult, pageResult);
+            Assert.NotNull(pageResult.Page);
+            Assert.NotNull(pageResult.ViewData);
+            Assert.NotNull(pageResult.Page.ViewContext);
+        }
+
+        [Fact]
+        public async Task InvokeAction_PageResultSetAt_AsyncResourceFilter_PopulatesProperties()
+        {
+            // Arrange
+            var expectedResult = new PageResult();
+
+            IActionResult result = null;
+            var filter = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            filter
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>((context, next) =>
+                {
+                    context.Result = expectedResult;
+                    result = context.Result;
+                    return Task.CompletedTask;
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(filter.Object);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter.Verify(
+                f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()),
+                Times.Once());
+
+            var pageResult = Assert.IsType<PageResult>(result);
+            Assert.Same(expectedResult, pageResult);
+            Assert.NotNull(pageResult.Page);
+            Assert.NotNull(pageResult.ViewData);
+            Assert.NotNull(pageResult.Page.ViewContext);
+        }
+
+        [Fact]
+        public async Task InvokeAction_PageResultSetAt_SyncResourceFilter_PopulatesProperties()
+        {
+            // Arrange
+            var expectedResult = new PageResult();
+
+            IActionResult result = null;
+            var filter = new Mock<IResourceFilter>(MockBehavior.Strict);
+            filter
+                .Setup(f => f.OnResourceExecuting(It.IsAny<ResourceExecutingContext>()))
+                .Callback<ResourceExecutingContext>((context) =>
+                {
+                    context.Result = expectedResult;
+                    result = context.Result;
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(filter.Object);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter.Verify(
+                f => f.OnResourceExecuting(It.IsAny<ResourceExecutingContext>()),
+                Times.Once());
+
+            var pageResult = Assert.IsType<PageResult>(result);
+            Assert.Same(expectedResult, pageResult);
+            Assert.NotNull(pageResult.Page);
+            Assert.NotNull(pageResult.ViewData);
+            Assert.NotNull(pageResult.Page.ViewContext);
+        }
+
+        [Fact]
+        public async Task InvokeAction_PageResultSetAt_AsyncResultFilter_PopulatesProperties()
+        {
+            // Arrange
+            var expectedResult = new PageResult();
+
+            IActionResult result = null;
+            var filter = new Mock<IAsyncResultFilter>(MockBehavior.Strict);
+            filter
+                .Setup(f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()))
+                .Returns<ResultExecutingContext, ResultExecutionDelegate>((context, next) =>
+                {
+                    context.Result = expectedResult;
+                    result = context.Result;
+                    return next();
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(filter.Object);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter.Verify(
+                f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()),
+                Times.Once());
+
+            var pageResult = Assert.IsType<PageResult>(result);
+            Assert.Same(expectedResult, pageResult);
+            Assert.NotNull(pageResult.Page);
+            Assert.NotNull(pageResult.ViewData);
+            Assert.NotNull(pageResult.Page.ViewContext);
+        }
+
+        [Fact]
+        public async Task InvokeAction_PageResultSetAt_SyncResultFilter_PopulatesProperties()
+        {
+            // Arrange
+            var expectedResult = new PageResult();
+
+            IActionResult result = null;
+            var filter = new Mock<IResultFilter>();
+            filter
+                .Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()))
+                .Callback<ResultExecutingContext>((context) =>
+                {
+                    context.Result = expectedResult;
+                    result = context.Result;
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(filter.Object);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter.Verify(
+                f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()),
+                Times.Once());
+
+            var pageResult = Assert.IsType<PageResult>(result);
+            Assert.Same(expectedResult, pageResult);
+            Assert.NotNull(pageResult.Page);
+            Assert.NotNull(pageResult.ViewData);
+            Assert.NotNull(pageResult.Page.ViewContext);
+        }
+
+        [Fact]
+        public async Task InvokeAction_PageResultSetAt_AsyncPageFilter_PopulatesProperties()
+        {
+            // Arrange
+            var expectedResult = new PageResult();
+
+            IActionResult result = null;
+            var filter = new Mock<IAsyncPageFilter>(MockBehavior.Strict);
+            AllowSelector(filter);
+            filter
+                .Setup(f => f.OnPageHandlerExecutionAsync(It.IsAny<PageHandlerExecutingContext>(), It.IsAny<PageHandlerExecutionDelegate>()))
+                .Returns<PageHandlerExecutingContext, PageHandlerExecutionDelegate>((context, next) =>
+                {
+                    context.Result = expectedResult;
+                    result = context.Result;
+                    return Task.CompletedTask;
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(filter.Object);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter.Verify(
+                f => f.OnPageHandlerExecutionAsync(It.IsAny<PageHandlerExecutingContext>(), It.IsAny<PageHandlerExecutionDelegate>()),
+                Times.Once());
+
+            var pageResult = Assert.IsType<PageResult>(result);
+            Assert.Same(expectedResult, pageResult);
+            Assert.NotNull(pageResult.Page);
+            Assert.NotNull(pageResult.ViewData);
+            Assert.NotNull(pageResult.Page.ViewContext);
+        }
+
+        [Fact]
+        public async Task InvokeAction_PageResultSetAt_SyncPageFilter_PopulatesProperties()
+        {
+            // Arrange
+            var expectedResult = new PageResult();
+
+            IActionResult result = null;
+            var filter = new Mock<IPageFilter>(MockBehavior.Strict);
+            AllowSelector(filter);
+            filter
+                .Setup(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()))
+                .Callback<PageHandlerExecutingContext>((context) =>
+                {
+                    context.Result = expectedResult;
+                    result = context.Result;
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(filter.Object);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter.Verify(
+                f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()),
+                Times.Once());
+
+            var pageResult = Assert.IsType<PageResult>(result);
+            Assert.Same(expectedResult, pageResult);
+            Assert.NotNull(pageResult.Page);
+            Assert.NotNull(pageResult.ViewData);
+            Assert.NotNull(pageResult.Page.ViewContext);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesPageFilter_ShortCircuit()
+        {
+            // Arrange
+            var result = new Mock<IActionResult>(MockBehavior.Strict);
+            result
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Returns(Task.FromResult(true))
+                .Verifiable();
+
+            PageHandlerExecutedContext context = null;
+
+            var pageFilter1 = new Mock<IPageFilter>(MockBehavior.Strict);
+            AllowSelector(pageFilter1);
+            pageFilter1.Setup(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>())).Verifiable();
+            pageFilter1
+                .Setup(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()))
+                .Callback<PageHandlerExecutedContext>(c => context = c)
+                .Verifiable();
+
+            var pageFilter2 = new Mock<IPageFilter>(MockBehavior.Strict);
+            AllowSelector(pageFilter2);
+            pageFilter2
+                .Setup(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()))
+                .Callback<PageHandlerExecutingContext>(c => c.Result = result.Object)
+                .Verifiable();
+
+            var pageFilter3 = new Mock<IPageFilter>(MockBehavior.Strict);
+            AllowSelector(pageFilter3);
+
+            var resultFilter = new Mock<IResultFilter>(MockBehavior.Strict);
+            resultFilter.Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>())).Verifiable();
+            resultFilter.Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>())).Verifiable();
+
+            var invoker = CreateInvoker(new IFilterMetadata[]
+            {
+                pageFilter1.Object,
+                pageFilter2.Object,
+                pageFilter3.Object,
+                resultFilter.Object,
+            });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            result.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+            pageFilter1.Verify(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()), Times.Once());
+            pageFilter1.Verify(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()), Times.Once());
+
+            pageFilter2.Verify(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()), Times.Once());
+            pageFilter2.Verify(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()), Times.Never());
+
+            resultFilter.Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+            resultFilter.Verify(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()), Times.Once());
+
+            Assert.True(context.Canceled);
+            Assert.Same(context.Result, result.Object);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncPageFilter_ShortCircuit_WithResult()
+        {
+            // Arrange
+            var result = new Mock<IActionResult>(MockBehavior.Strict);
+            result
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Returns(Task.FromResult(true))
+                .Verifiable();
+
+            PageHandlerExecutedContext context = null;
+
+            var pageFilter1 = new Mock<IPageFilter>(MockBehavior.Strict);
+            AllowSelector(pageFilter1);
+            pageFilter1.Setup(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>())).Verifiable();
+            pageFilter1
+                .Setup(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()))
+                .Callback<PageHandlerExecutedContext>(c => context = c)
+                .Verifiable();
+
+            var pageFilter2 = new Mock<IAsyncPageFilter>(MockBehavior.Strict);
+            AllowSelector(pageFilter2);
+            pageFilter2
+                .Setup(f => f.OnPageHandlerExecutionAsync(It.IsAny<PageHandlerExecutingContext>(), It.IsAny<PageHandlerExecutionDelegate>()))
+                .Returns<PageHandlerExecutingContext, PageHandlerExecutionDelegate>((c, next) =>
+                {
+                    // Notice we're not calling next
+                    c.Result = result.Object;
+                    return Task.FromResult(true);
+                })
+                .Verifiable();
+
+            var pageFilter3 = new Mock<IPageFilter>(MockBehavior.Strict);
+            AllowSelector(pageFilter3);
+
+            var resultFilter1 = new Mock<IResultFilter>(MockBehavior.Strict);
+            resultFilter1.Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>())).Verifiable();
+            resultFilter1.Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>())).Verifiable();
+            var resultFilter2 = new Mock<IResultFilter>(MockBehavior.Strict);
+            resultFilter2.Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>())).Verifiable();
+            resultFilter2.Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>())).Verifiable();
+
+            var invoker = CreateInvoker(new IFilterMetadata[]
+            {
+                pageFilter1.Object,
+                pageFilter2.Object,
+                pageFilter3.Object,
+                resultFilter1.Object,
+                resultFilter2.Object,
+            });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            result.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+            pageFilter1.Verify(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()), Times.Once());
+            pageFilter1.Verify(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()), Times.Once());
+
+            pageFilter2.Verify(
+                f => f.OnPageHandlerExecutionAsync(It.IsAny<PageHandlerExecutingContext>(), It.IsAny<PageHandlerExecutionDelegate>()),
+                Times.Once());
+
+            resultFilter1.Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+            resultFilter1.Verify(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()), Times.Once());
+            resultFilter2.Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+            resultFilter2.Verify(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()), Times.Once());
+
+            Assert.True(context.Canceled);
+            Assert.Same(context.Result, result.Object);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncPageFilter_ShortCircuit_WithoutResult()
+        {
+            // Arrange
+            PageHandlerExecutedContext context = null;
+
+            var pageFilter1 = new Mock<IPageFilter>(MockBehavior.Strict);
+            AllowSelector(pageFilter1);
+            pageFilter1.Setup(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>())).Verifiable();
+            pageFilter1
+                .Setup(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()))
+                .Callback<PageHandlerExecutedContext>(c => context = c)
+                .Verifiable();
+
+            var pageFilter2 = new Mock<IAsyncPageFilter>(MockBehavior.Strict);
+            AllowSelector(pageFilter2);
+            pageFilter2
+                .Setup(f => f.OnPageHandlerExecutionAsync(It.IsAny<PageHandlerExecutingContext>(), It.IsAny<PageHandlerExecutionDelegate>()))
+                .Returns<PageHandlerExecutingContext, PageHandlerExecutionDelegate>((c, next) =>
+                {
+                    // Notice we're not calling next
+                    return Task.FromResult(true);
+                })
+                .Verifiable();
+
+            var pageFilter3 = new Mock<IPageFilter>(MockBehavior.Strict);
+            AllowSelector(pageFilter3);
+
+            var resultFilter = new Mock<IResultFilter>(MockBehavior.Strict);
+            resultFilter.Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>())).Verifiable();
+            resultFilter.Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>())).Verifiable();
+
+            var invoker = CreateInvoker(new IFilterMetadata[]
+            {
+                pageFilter1.Object,
+                pageFilter2.Object,
+                pageFilter3.Object,
+                resultFilter.Object,
+            });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            pageFilter1.Verify(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()), Times.Once());
+            pageFilter1.Verify(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()), Times.Once());
+
+            pageFilter2.Verify(
+                f => f.OnPageHandlerExecutionAsync(It.IsAny<PageHandlerExecutingContext>(), It.IsAny<PageHandlerExecutionDelegate>()),
+                Times.Once());
+
+            resultFilter.Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+            resultFilter.Verify(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()), Times.Once());
+
+            Assert.True(context.Canceled);
+            Assert.Null(context.Result);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncPageFilter_ShortCircuit_WithResult_CallNext()
+        {
+            // Arrange
+            var pageFilter = new Mock<IAsyncPageFilter>(MockBehavior.Strict);
+            AllowSelector(pageFilter);
+            pageFilter
+                .Setup(f => f.OnPageHandlerExecutionAsync(It.IsAny<PageHandlerExecutingContext>(), It.IsAny<PageHandlerExecutionDelegate>()))
+                .Returns<PageHandlerExecutingContext, PageHandlerExecutionDelegate>(async (c, next) =>
+                {
+                    c.Result = new EmptyResult();
+                    await next();
+                })
+                .Verifiable();
+
+            var message =
+                "If an IAsyncPageFilter provides a result value by setting the Result property of " +
+                "PageHandlerExecutingContext to a non-null value, then it cannot call the next filter by invoking " +
+                "PageHandlerExecutionDelegate.";
+
+            var invoker = CreateInvoker(pageFilter.Object);
+
+            // Act & Assert
+            await ExceptionAssert.ThrowsAsync<InvalidOperationException>(
+                () => invoker.InvokeAsync(),
+                message);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesPageFilter_WithExceptionThrownByAction()
+        {
+            // Arrange
+            PageHandlerExecutedContext context = null;
+
+            var filter = new Mock<IPageFilter>(MockBehavior.Strict);
+            AllowSelector(filter);
+            filter.Setup(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>())).Verifiable();
+            filter
+                .Setup(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()))
+                .Callback<PageHandlerExecutedContext>(c =>
+                {
+                    context = c;
+
+                    // Handle the exception so the test doesn't throw.
+                    Assert.Same(Exception, c.Exception);
+                    Assert.False(c.ExceptionHandled);
+                    c.ExceptionHandled = true;
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(filter.Object, exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter.Verify(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()), Times.Once());
+            filter.Verify(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()), Times.Once());
+
+            Assert.Same(Exception, context.Exception);
+            Assert.Null(context.Result);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesPageFilter_WithExceptionThrownByPageFilter()
+        {
+            // Arrange
+            var exception = new DataMisalignedException();
+            PageHandlerExecutedContext context = null;
+
+            var filter1 = new Mock<IPageFilter>(MockBehavior.Strict);
+            AllowSelector(filter1);
+            filter1.Setup(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>())).Verifiable();
+            filter1
+                .Setup(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()))
+                .Callback<PageHandlerExecutedContext>(c =>
+                {
+                    context = c;
+
+                    // Handle the exception so the test doesn't throw.
+                    Assert.False(c.ExceptionHandled);
+                    c.ExceptionHandled = true;
+                })
+                .Verifiable();
+
+            var filter2 = new Mock<IPageFilter>(MockBehavior.Strict);
+            AllowSelector(filter2);
+            filter2
+                .Setup(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()))
+                .Callback<PageHandlerExecutingContext>(c => { throw exception; })
+                .Verifiable();
+
+            var invoker = CreateInvoker(new[] { filter1.Object, filter2.Object });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter1.Verify(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()), Times.Once());
+            filter1.Verify(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()), Times.Once());
+
+            filter2.Verify(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()), Times.Once());
+            filter2.Verify(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()), Times.Never());
+
+            Assert.Same(exception, context.Exception);
+            Assert.Null(context.Result);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncPageFilter_WithExceptionThrownByPageFilter()
+        {
+            // Arrange
+            var exception = new DataMisalignedException();
+            PageHandlerExecutedContext context = null;
+
+            var filter1 = new Mock<IAsyncPageFilter>(MockBehavior.Strict);
+            AllowSelector(filter1);
+            filter1
+                .Setup(f => f.OnPageHandlerExecutionAsync(It.IsAny<PageHandlerExecutingContext>(), It.IsAny<PageHandlerExecutionDelegate>()))
+                .Returns<PageHandlerExecutingContext, PageHandlerExecutionDelegate>(async (c, next) =>
+                {
+                    context = await next();
+
+                    // Handle the exception so the test doesn't throw.
+                    Assert.False(context.ExceptionHandled);
+                    context.ExceptionHandled = true;
+                })
+                .Verifiable();
+
+            var filter2 = new Mock<IPageFilter>(MockBehavior.Strict);
+            AllowSelector(filter2);
+            filter2.Setup(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>())).Verifiable();
+            filter2
+                .Setup(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()))
+                .Callback<PageHandlerExecutedContext>(c => { throw exception; })
+                .Verifiable();
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { filter1.Object, filter2.Object });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter1.Verify(
+                f => f.OnPageHandlerExecutionAsync(It.IsAny<PageHandlerExecutingContext>(), It.IsAny<PageHandlerExecutionDelegate>()),
+                Times.Once());
+
+            filter2.Verify(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()), Times.Once());
+
+            Assert.Same(exception, context.Exception);
+            Assert.Null(context.Result);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesPageFilter_HandleException()
+        {
+            // Arrange
+            var result = new Mock<IActionResult>(MockBehavior.Strict);
+            result
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Returns<ActionContext>((context) => Task.FromResult(true))
+                .Verifiable();
+
+            var pageFilter = new Mock<IPageFilter>(MockBehavior.Strict);
+            AllowSelector(pageFilter);
+            pageFilter.Setup(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>())).Verifiable();
+            pageFilter
+                .Setup(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()))
+                .Callback<PageHandlerExecutedContext>(c =>
+                {
+                    // Handle the exception so the test doesn't throw.
+                    Assert.False(c.ExceptionHandled);
+                    c.ExceptionHandled = true;
+
+                    c.Result = result.Object;
+                })
+                .Verifiable();
+
+            var resultFilter = new Mock<IResultFilter>(MockBehavior.Strict);
+            resultFilter.Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>())).Verifiable();
+            resultFilter.Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>())).Verifiable();
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[] { pageFilter.Object, resultFilter.Object },
+                exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            pageFilter.Verify(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()), Times.Once());
+            pageFilter.Verify(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()), Times.Once());
+
+            resultFilter.Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+            resultFilter.Verify(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()), Times.Once());
+
+            result.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResourceFilter_WithActionResult_FromPageFilter()
+        {
+            // Arrange
+            var expected = Mock.Of<IActionResult>();
+
+            ResourceExecutedContext context = null;
+            var resourceFilter = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    context = await next();
+                })
+                .Verifiable();
+
+            var pageFilter = new Mock<IPageFilter>(MockBehavior.Strict);
+            AllowSelector(pageFilter);
+            pageFilter
+                .Setup(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()))
+                .Callback<PageHandlerExecutingContext>((c) =>
+                {
+                    c.Result = expected;
+                });
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { resourceFilter.Object, pageFilter.Object });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.Same(expected, context.Result);
+
+            resourceFilter.Verify(
+                f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResourceFilter_HandleException_FromPageFilter()
+        {
+            // Arrange
+            var expected = new DataMisalignedException();
+
+            ResourceExecutedContext context = null;
+            var resourceFilter = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    context = await next();
+                    context.ExceptionHandled = true;
+                })
+                .Verifiable();
+
+            var pageFilter = new Mock<IPageFilter>(MockBehavior.Strict);
+            AllowSelector(pageFilter);
+            pageFilter
+                .Setup(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()))
+                .Callback<PageHandlerExecutingContext>((c) =>
+                {
+                    throw expected;
+                });
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { resourceFilter.Object, pageFilter.Object });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.Same(expected, context.Exception);
+            Assert.Same(expected, context.ExceptionDispatchInfo.SourceException);
+
+            resourceFilter.Verify(
+                f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResourceFilter_HandlesException_FromExceptionFilter()
+        {
+            // Arrange
+            var expected = new DataMisalignedException();
+
+            ResourceExecutedContext context = null;
+            var resourceFilter = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    context = await next();
+                    context.ExceptionHandled = true;
+                })
+                .Verifiable();
+
+            var exceptionFilter = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            exceptionFilter
+                .Setup(f => f.OnException(It.IsAny<ExceptionContext>()))
+                .Callback<ExceptionContext>((c) =>
+                {
+                    throw expected;
+                });
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { resourceFilter.Object, exceptionFilter.Object }, exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.Same(expected, context.Exception);
+            Assert.Same(expected, context.ExceptionDispatchInfo.SourceException);
+
+            resourceFilter.Verify(
+                f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_ExceptionBubbling_AsyncPageFilter_To_ResourceFilter()
+        {
+            // Arrange
+            var resourceFilter = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    var context = await next();
+                    Assert.Same(Exception, context.Exception);
+                    context.ExceptionHandled = true;
+                })
+                .Verifiable();
+
+            var pageFilter1 = new Mock<IAsyncPageFilter>(MockBehavior.Strict);
+            AllowSelector(pageFilter1);
+            pageFilter1
+                .Setup(f => f.OnPageHandlerExecutionAsync(It.IsAny<PageHandlerExecutingContext>(), It.IsAny<PageHandlerExecutionDelegate>()))
+                .Returns<PageHandlerExecutingContext, PageHandlerExecutionDelegate>(async (c, next) =>
+                {
+                    await next();
+                });
+
+            var pageFilter2 = new Mock<IAsyncPageFilter>(MockBehavior.Strict);
+            AllowSelector(pageFilter2);
+            pageFilter2
+                .Setup(f => f.OnPageHandlerExecutionAsync(It.IsAny<PageHandlerExecutingContext>(), It.IsAny<PageHandlerExecutionDelegate>()))
+                .Returns<PageHandlerExecutingContext, PageHandlerExecutionDelegate>(async (c, next) =>
+                {
+                    await next();
+                });
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[]
+                {
+                    resourceFilter.Object,
+                    pageFilter1.Object,
+                    pageFilter2.Object,
+                },
+                // The action won't run
+                exception: Exception);
+
+            // Act & Assert
+            await invoker.InvokeAsync();
+
+            resourceFilter.Verify(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()), Times.Once());
+        }
+
+        #endregion
+
+        protected override ResourceInvoker CreateInvoker(
+            IFilterMetadata[] filters,
+            Exception exception = null,
+            IActionResult result = null,
+            IList<IValueProviderFactory> valueProviderFactories = null)
+        {
+            var actionDescriptor = new CompiledPageActionDescriptor
+            {
+                ViewEnginePath = "/Index.cshtml",
+                RelativePath = "/Index.cshtml",
+                HandlerMethods = new List<HandlerMethodDescriptor>(),
+                HandlerTypeInfo = typeof(TestPage).GetTypeInfo(),
+                ModelTypeInfo = typeof(TestPage).GetTypeInfo(),
+                PageTypeInfo = typeof(TestPage).GetTypeInfo(),
+                BoundProperties = new List<ParameterDescriptor>(),
+            };
+
+            var handlers = new List<PageHandlerExecutorDelegate>();
+            if (result != null)
+            {
+                handlers.Add((obj, args) => Task.FromResult(result));
+                actionDescriptor.HandlerMethods.Add(new HandlerMethodDescriptor()
+                {
+                    HttpMethod = "GET",
+                    Parameters = new List<HandlerParameterDescriptor>(),
+                });
+            }
+            else if (exception != null)
+            {
+                handlers.Add((obj, args) => Task.FromException<IActionResult>(exception));
+                actionDescriptor.HandlerMethods.Add(new HandlerMethodDescriptor()
+                {
+                    HttpMethod = "GET",
+                    Parameters = new List<HandlerParameterDescriptor>(),
+                });
+            }
+
+            return CreateInvoker(
+                filters,
+                actionDescriptor,
+                handlers: handlers.ToArray(),
+                valueProviderFactories: valueProviderFactories);
+        }
+
+        private PageActionInvoker CreateInvoker(
+            IFilterMetadata[] filters,
+            CompiledPageActionDescriptor actionDescriptor,
+            Func<PageContext, object> modelFactory = null,
+            ITempDataDictionaryFactory tempDataFactory = null,
+            IList<IValueProviderFactory> valueProviderFactories = null,
+            PageHandlerExecutorDelegate[] handlers = null,
+            PageHandlerBinderDelegate[] handlerBinders = null,
+            RouteData routeData = null,
+            ILogger logger = null,
+            TestDiagnosticListener listener = null)
+        {
+            var diagnosticListener = new DiagnosticListener("Microsoft.AspNetCore");
+            if (listener != null)
+            {
+                diagnosticListener.SubscribeWithAdapter(listener);
+            }
+
+            var httpContext = new DefaultHttpContext();
+            var services = new ServiceCollection();
+            services.AddSingleton<PageResultExecutor, TestPageResultExecutor>();
+            httpContext.RequestServices = services.BuildServiceProvider();
+
+            var pageContext = new PageContext()
+            {
+                ActionDescriptor = actionDescriptor,
+                HttpContext = httpContext,
+                RouteData = routeData ?? new RouteData(),
+                ValueProviderFactories = valueProviderFactories?.ToList() ?? new List<IValueProviderFactory>(),
+                ViewStartFactories = new List<Func<IRazorPage>>(),
+            };
+
+            var viewDataFactory = ViewDataDictionaryFactory.CreateFactory(actionDescriptor.ModelTypeInfo);
+            pageContext.ViewData = viewDataFactory(new EmptyModelMetadataProvider(), pageContext.ModelState);
+
+            if (tempDataFactory == null)
+            {
+                tempDataFactory = Mock.Of<ITempDataDictionaryFactory>(m => m.GetTempData(It.IsAny<HttpContext>()) == Mock.Of<ITempDataDictionary>());
+            }
+
+            object pageFactory(PageContext context, ViewContext viewContext)
+            {
+                var instance = (Page)Activator.CreateInstance(actionDescriptor.PageTypeInfo.AsType());
+                instance.PageContext = context;
+                instance.ViewContext = viewContext;
+                return instance;
+            }
+
+            if (handlers == null)
+            {
+                handlers = new PageHandlerExecutorDelegate[actionDescriptor.HandlerMethods.Count];
+                for (var i = 0; i < handlers.Length; i++)
+                {
+                    handlers[i] = (obj, args) => Task.FromResult<IActionResult>(new PageResult());
+                }
+            }
+
+            handlerBinders = handlerBinders ?? Array.Empty<PageHandlerBinderDelegate>();
+
+            if (modelFactory == null)
+            {
+                modelFactory = _ => Activator.CreateInstance(actionDescriptor.ModelTypeInfo.AsType());
+            }
+
+            var cacheEntry = new PageActionInvokerCacheEntry(
+                actionDescriptor,
+                viewDataFactory,
+                pageFactory,
+                (c, viewContext, page) => { (page as IDisposable)?.Dispose(); },
+                modelFactory,
+                (c, model) => { (model as IDisposable)?.Dispose(); },
+                null,
+                handlers,
+                handlerBinders,
+                null,
+                new FilterItem[0]);
+
+            // Always just select the first one.
+            var selector = new Mock<IPageHandlerMethodSelector>();
+            selector
+                .Setup(s => s.Select(It.IsAny<PageContext>()))
+                .Returns<PageContext>(c => c.ActionDescriptor.HandlerMethods.FirstOrDefault());
+
+            var invoker = new PageActionInvoker(
+                selector.Object,
+                diagnosticListener ?? new DiagnosticListener("Microsoft.AspNetCore"),
+                logger ?? NullLogger.Instance,
+                new ActionResultTypeMapper(),
+                pageContext,
+                filters ?? Array.Empty<IFilterMetadata>(),
+                cacheEntry,
+                GetParameterBinder(),
+                tempDataFactory,
+                new HtmlHelperOptions());
+            return invoker;
+        }
+
+        private static ParameterBinder GetParameterBinder(
+            IModelBinderFactory factory = null,
+            IModelValidatorProvider validator = null)
+        {
+            if (validator == null)
+            {
+                validator = CreateMockValidatorProvider();
+            }
+
+            if (factory == null)
+            {
+                factory = TestModelBinderFactory.CreateDefault();
+            }
+
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var mvcOptions = new MvcOptions
+            {
+                AllowValidatingTopLevelNodes = true,
+            };
+
+            return new ParameterBinder(
+                metadataProvider,
+                factory,
+                new DefaultObjectValidator(metadataProvider, new[] { validator }),
+                Options.Create(mvcOptions),
+                NullLoggerFactory.Instance);
+        }
+
+        private static IModelValidatorProvider CreateMockValidatorProvider()
+        {
+            var mockValidator = new Mock<IModelValidatorProvider>(MockBehavior.Strict);
+            mockValidator
+                .Setup(o => o.CreateValidators(
+                    It.IsAny<ModelValidatorProviderContext>()));
+            return mockValidator.Object;
+        }
+
+        private CompiledPageActionDescriptor CreateDescriptorForSimplePage()
+        {
+            return new CompiledPageActionDescriptor()
+            {
+                HandlerTypeInfo = typeof(TestPage).GetTypeInfo(),
+                ModelTypeInfo = typeof(TestPage).GetTypeInfo(),
+                PageTypeInfo = typeof(TestPage).GetTypeInfo(),
+
+                BoundProperties = new List<ParameterDescriptor>(),
+
+                HandlerMethods = new HandlerMethodDescriptor[]
+                {
+                    new HandlerMethodDescriptor()
+                    {
+                        HttpMethod = "GET",
+                        MethodInfo = typeof(TestPage).GetTypeInfo().GetMethod(nameof(TestPage.OnGetHandler1)),
+                        Parameters = new List<HandlerParameterDescriptor>(),
+                    },
+                    new HandlerMethodDescriptor()
+                    {
+                        HttpMethod = "GET",
+                        MethodInfo = typeof(TestPage).GetTypeInfo().GetMethod(nameof(TestPage.OnGetHandler2)),
+                        Parameters = new List<HandlerParameterDescriptor>(),
+                    },
+                },
+            };
+        }
+
+        private CompiledPageActionDescriptor CreateDescriptorForSimplePageWithPocoModel()
+        {
+            return new CompiledPageActionDescriptor()
+            {
+                HandlerTypeInfo = typeof(TestPage).GetTypeInfo(),
+                ModelTypeInfo = typeof(PocoModel).GetTypeInfo(),
+                PageTypeInfo = typeof(TestPage).GetTypeInfo(),
+
+                BoundProperties = new List<ParameterDescriptor>(),
+
+                HandlerMethods = new HandlerMethodDescriptor[]
+                {
+                    new HandlerMethodDescriptor()
+                    {
+                        HttpMethod = "GET",
+                        MethodInfo = typeof(TestPage).GetTypeInfo().GetMethod(nameof(TestPage.OnGetHandler1)),
+                        Parameters = new List<HandlerParameterDescriptor>(),
+                    },
+                    new HandlerMethodDescriptor()
+                    {
+                        HttpMethod = "GET",
+                        MethodInfo = typeof(TestPage).GetTypeInfo().GetMethod(nameof(TestPage.OnGetHandler2)),
+                        Parameters = new List<HandlerParameterDescriptor>(),
+                    },
+                },
+            };
+        }
+
+        private CompiledPageActionDescriptor CreateDescriptorForPageModelPage()
+        {
+            return new CompiledPageActionDescriptor()
+            {
+                HandlerTypeInfo = typeof(TestPageModel).GetTypeInfo(),
+                ModelTypeInfo = typeof(TestPageModel).GetTypeInfo(),
+                PageTypeInfo = typeof(TestPage).GetTypeInfo(),
+
+                BoundProperties = new List<ParameterDescriptor>(),
+
+                HandlerMethods = new HandlerMethodDescriptor[]
+                {
+                    new HandlerMethodDescriptor()
+                    {
+                        HttpMethod = "GET",
+                        MethodInfo = typeof(PageModel).GetTypeInfo().GetMethod(nameof(TestPageModel.OnGetHandler1)),
+                        Parameters = new List<HandlerParameterDescriptor>(),
+                    },
+                    new HandlerMethodDescriptor()
+                    {
+                        HttpMethod = "GET",
+                        MethodInfo = typeof(PageModel).GetTypeInfo().GetMethod(nameof(TestPageModel.OnGetHandler2)),
+                        Parameters = new List<HandlerParameterDescriptor>(),
+                    },
+                },
+            };
+        }
+
+        private void AllowSelector(Mock<IPageFilter> filter)
+        {
+            filter.Setup(f => f.OnPageHandlerSelected(It.IsAny<PageHandlerSelectedContext>()));
+        }
+
+        private void AllowSelector(Mock<IAsyncPageFilter> filter)
+        {
+            filter.Setup(f => f.OnPageHandlerSelectionAsync(It.IsAny<PageHandlerSelectedContext>())).Returns(Task.CompletedTask);
+        }
+
+        private class TestPageResultExecutor : PageResultExecutor
+        {
+            private readonly Func<PageContext, Task> _executeAction;
+
+            public TestPageResultExecutor()
+                : this(null)
+            {
+            }
+
+            public TestPageResultExecutor(Func<PageContext, Task> executeAction)
+                : base(
+                    Mock.Of<IHttpResponseStreamWriterFactory>(),
+                    Mock.Of<ICompositeViewEngine>(),
+                    Mock.Of<IRazorViewEngine>(),
+                    Mock.Of<IRazorPageActivator>(),
+                    new DiagnosticListener("Microsoft.AspNetCore"),
+                    HtmlEncoder.Default)
+            {
+                _executeAction = executeAction;
+            }
+
+            public override Task ExecuteAsync(PageContext pageContext, PageResult result)
+            {
+                return _executeAction?.Invoke(pageContext) ?? Task.CompletedTask;
+            }
+        }
+
+        private class PocoModel
+        {
+        }
+
+        private class TestPage : Page
+        {
+            public void OnGetHandler1()
+            {
+            }
+
+            public void OnGetHandler2()
+            {
+            }
+
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class TestPageModel : PageModel
+        {
+            public void OnGetHandler1()
+            {
+            }
+
+            public void OnGetHandler2()
+            {
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageBinderFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageBinderFactoryTest.cs
new file mode 100644
index 0000000000..eed043db10
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageBinderFactoryTest.cs
@@ -0,0 +1,984 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class PageBinderFactoryTest
+    {
+        private static readonly MvcOptions _options = new MvcOptions
+        {
+            AllowValidatingTopLevelNodes = true,
+        };
+        private static readonly IOptions<MvcOptions> _optionsAccessor = Options.Create(_options);
+
+        [Fact]
+        public void GetModelBinderFactory_ReturnsNullIfPageHasNoBoundProperties()
+        {
+            // Arrange
+            var actionDescriptor = new CompiledPageActionDescriptor
+            {
+                PageTypeInfo = typeof(PageWithNoBoundProperties).GetTypeInfo(),
+            };
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelBinderFactory = TestModelBinderFactory.CreateDefault();
+
+            var binder = new ParameterBinder(
+                modelMetadataProvider,
+                modelBinderFactory,
+                Mock.Of<IObjectModelValidator>(),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Act
+            var factory = PageBinderFactory.CreatePropertyBinder(binder, modelMetadataProvider, modelBinderFactory, actionDescriptor);
+
+            // Assert
+            Assert.Same(PageBinderFactory.NullPropertyBinder, factory);
+        }
+
+        [Fact]
+        public void GetModelBinderFactory_ReturnsNullIfPageModelHasNoBoundProperties()
+        {
+            // Arrange
+            var actionDescriptor = new CompiledPageActionDescriptor
+            {
+                PageTypeInfo = typeof(PageWithNoBoundProperties).GetTypeInfo(),
+                ModelTypeInfo = typeof(PageModelWithNoBoundProperties).GetTypeInfo(),
+            };
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelBinderFactory = TestModelBinderFactory.CreateDefault();
+
+            var binder = new ParameterBinder(
+                modelMetadataProvider,
+                modelBinderFactory,
+                Mock.Of<IObjectModelValidator>(),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Act
+            var factory = PageBinderFactory.CreatePropertyBinder(binder, modelMetadataProvider, modelBinderFactory, actionDescriptor);
+
+            // Assert
+            Assert.Same(PageBinderFactory.NullPropertyBinder, factory);
+        }
+
+        [Fact]
+        public void GetModelBinderFactory_ReturnsNullIfPageHasNoVisibleBoundProperties()
+        {
+            // Arrange
+            var actionDescriptor = new CompiledPageActionDescriptor
+            {
+                PageTypeInfo = typeof(PageWithNoVisibleBoundProperties).GetTypeInfo(),
+            };
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelBinderFactory = TestModelBinderFactory.CreateDefault();
+
+            var binder = new ParameterBinder(
+                modelMetadataProvider,
+                modelBinderFactory,
+                Mock.Of<IObjectModelValidator>(),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Act
+            var factory = PageBinderFactory.CreatePropertyBinder(binder, modelMetadataProvider, modelBinderFactory, actionDescriptor);
+
+            // Assert
+            Assert.Same(PageBinderFactory.NullPropertyBinder, factory);
+        }
+
+        [Fact]
+        public void GetModelBinderFactory_ReturnsNullIfPageModelHasNoVisibleBoundProperties()
+        {
+            // Arrange
+            var actionDescriptor = new CompiledPageActionDescriptor
+            {
+                PageTypeInfo = typeof(object).GetTypeInfo(),
+                ModelTypeInfo = typeof(PageModelWithNoVisibleBoundProperties).GetTypeInfo(),
+            };
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelBinderFactory = TestModelBinderFactory.CreateDefault();
+
+            var binder = new ParameterBinder(
+                modelMetadataProvider,
+                modelBinderFactory,
+                Mock.Of<IObjectModelValidator>(),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Act
+            var factory = PageBinderFactory.CreatePropertyBinder(binder, modelMetadataProvider, modelBinderFactory, actionDescriptor);
+
+            // Assert
+            Assert.Same(PageBinderFactory.NullPropertyBinder, factory);
+        }
+
+        [Fact]
+        public void GetModelBinderFactory_ReturnsNullIfPageHasNoSettableBoundProperties()
+        {
+            // Arrange
+            var actionDescriptor = new CompiledPageActionDescriptor
+            {
+                PageTypeInfo = typeof(PageWithReadOnlyProperties).GetTypeInfo(),
+            };
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelBinderFactory = TestModelBinderFactory.CreateDefault();
+
+            var binder = new ParameterBinder(
+                modelMetadataProvider,
+                modelBinderFactory,
+                Mock.Of<IObjectModelValidator>(),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Act
+            var factory = PageBinderFactory.CreatePropertyBinder(binder, modelMetadataProvider, modelBinderFactory, actionDescriptor);
+
+            // Assert
+            Assert.Same(PageBinderFactory.NullPropertyBinder, factory);
+        }
+
+        [Fact]
+        public void GetModelBinderFactory_ReturnsNullIfPageModelHasNoSettableBoundProperties()
+        {
+            // Arrange
+            var actionDescriptor = new CompiledPageActionDescriptor
+            {
+                PageTypeInfo = typeof(PageWithReadOnlyProperties).GetTypeInfo(),
+                ModelTypeInfo = typeof(PageModelWithReadOnlyProperties).GetTypeInfo(),
+            };
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelBinderFactory = TestModelBinderFactory.CreateDefault();
+
+            var binder = new ParameterBinder(
+                modelMetadataProvider,
+                modelBinderFactory,
+                Mock.Of<IObjectModelValidator>(),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            // Act
+            var factory = PageBinderFactory.CreatePropertyBinder(binder, modelMetadataProvider, modelBinderFactory, actionDescriptor);
+
+            // Assert
+            Assert.Same(PageBinderFactory.NullPropertyBinder, factory);
+        }
+
+        [Fact]
+        public async Task ModelBinderFactory_BindsPropertiesOnPage()
+        {
+            // Arrange
+            var type = typeof(PageWithProperty).GetTypeInfo();
+
+            var actionDescriptor = new CompiledPageActionDescriptor
+            {
+                BoundProperties = new[]
+                {
+                    new PageBoundPropertyDescriptor()
+                    {
+                        Name = nameof(PageWithProperty.Id),
+                        ParameterType = typeof(int),
+                        Property = type.GetProperty(nameof(PageWithProperty.Id)),
+                    },
+                    new PageBoundPropertyDescriptor()
+                    {
+                        Name = nameof(PageWithProperty.RouteDifferentValue),
+                        ParameterType = typeof(string),
+                        Property = type.GetProperty(nameof(PageWithProperty.RouteDifferentValue)),
+                    },
+                    new PageBoundPropertyDescriptor()
+                    {
+                        Name = nameof(PageWithProperty.PropertyWithNoValue),
+                        ParameterType = typeof(string),
+                        Property = type.GetProperty(nameof(PageWithProperty.PropertyWithNoValue)),
+                    }
+                },
+                HandlerTypeInfo = type,
+                PageTypeInfo = type,
+            };
+
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelBinderFactory = TestModelBinderFactory.CreateDefault();
+
+            var binder = new TestParameterBinder(new Dictionary<string, object>
+            {
+                { nameof(PageWithProperty.Id), 10 },
+                { nameof(PageWithProperty.RouteDifferentValue), "route-value" }
+            });
+
+            var factory = PageBinderFactory.CreatePropertyBinder(binder, modelMetadataProvider, modelBinderFactory, actionDescriptor);
+
+            var page = new PageWithProperty
+            {
+                PageContext = GetPageContext(),
+            };
+
+            // Act
+            await factory(page.PageContext, page);
+
+            // Assert
+            Assert.Equal(10, page.Id);
+            Assert.Equal("route-value", page.RouteDifferentValue);
+            Assert.Null(page.PropertyWithNoValue);
+        }
+
+        [Fact]
+        public async Task ModelBinderFactory_BindsPropertiesOnPageModel()
+        {
+            // Arrange
+            var type = typeof(PageModelWithProperty).GetTypeInfo();
+
+            var actionDescriptor = new CompiledPageActionDescriptor
+            {
+                BoundProperties = new[]
+                {
+                    new PageBoundPropertyDescriptor()
+                    {
+                        Name = nameof(PageModelWithProperty.Id),
+                        ParameterType = typeof(int),
+                        Property = type.GetProperty(nameof(PageModelWithProperty.Id)),
+                    },
+                    new PageBoundPropertyDescriptor()
+                    {
+                        Name = nameof(PageModelWithProperty.RouteDifferentValue),
+                        ParameterType = typeof(string),
+                        Property = type.GetProperty(nameof(PageModelWithProperty.RouteDifferentValue)),
+                    },
+                    new PageBoundPropertyDescriptor()
+                    {
+                        Name = nameof(PageModelWithProperty.PropertyWithNoValue),
+                        ParameterType = typeof(string),
+                        Property = type.GetProperty(nameof(PageModelWithProperty.PropertyWithNoValue)),
+                    }
+                },
+
+                HandlerTypeInfo = typeof(PageModelWithProperty).GetTypeInfo(),
+                PageTypeInfo = typeof(PageWithProperty).GetTypeInfo(),
+                ModelTypeInfo = typeof(PageModelWithProperty).GetTypeInfo(),
+            };
+
+            var binder = new TestParameterBinder(new Dictionary<string, object>
+            {
+                { nameof(PageModelWithProperty.Id), 10 },
+                { nameof(PageModelWithProperty.RouteDifferentValue), "route-value" }
+            });
+
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelBinderFactory = TestModelBinderFactory.CreateDefault();
+
+            var factory = PageBinderFactory.CreatePropertyBinder(binder, modelMetadataProvider, modelBinderFactory, actionDescriptor);
+
+            var page = new PageWithProperty
+            {
+                PageContext = GetPageContext()
+            };
+
+            var model = new PageModelWithProperty();
+
+            // Act
+            await factory(page.PageContext, model);
+
+            // Assert
+            // Verify that the page properties were not bound.
+            Assert.Equal(default, page.Id);
+            Assert.Null(page.RouteDifferentValue);
+
+            Assert.Equal(10, model.Id);
+            Assert.Equal("route-value", model.RouteDifferentValue);
+            Assert.Null(model.PropertyWithNoValue);
+        }
+
+        [Fact]
+        public async Task ModelBinderFactory_PreservesExistingValueIfModelBindingFailed()
+        {
+            // Arrange
+            var type = typeof(PageModelWithDefaultValue).GetTypeInfo();
+
+            var actionDescriptor = new CompiledPageActionDescriptor
+            {
+                BoundProperties = new[]
+                {
+                    new PageBoundPropertyDescriptor()
+                    {
+                        Name = nameof(PageModelWithDefaultValue.PropertyWithDefaultValue),
+                        ParameterType = typeof(string),
+                        Property = type.GetProperty(nameof(PageModelWithDefaultValue.PropertyWithDefaultValue)),
+                    },
+                },
+
+                HandlerTypeInfo = type,
+                PageTypeInfo = typeof(PageWithProperty).GetTypeInfo(),
+                ModelTypeInfo = type,
+            };
+
+            var binder = new TestParameterBinder(new Dictionary<string, object>());
+
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelBinderFactory = TestModelBinderFactory.CreateDefault();
+
+            var factory = PageBinderFactory.CreatePropertyBinder(binder, modelMetadataProvider, modelBinderFactory, actionDescriptor);
+
+            var page = new PageWithProperty
+            {
+                PageContext = GetPageContext()
+            };
+
+            var model = new PageModelWithDefaultValue();
+            var defaultValue = model.PropertyWithDefaultValue;
+
+            // Act
+            await factory(page.PageContext, model);
+
+            // Assert
+            Assert.Equal(defaultValue, model.PropertyWithDefaultValue);
+        }
+
+        [Theory]
+        [InlineData("Get")]
+        [InlineData("GET")]
+        [InlineData("gET")]
+        public async Task ModelBinderFactory_BindsPropertyWithoutSupportsGet_WhenRequestIsGet(string method)
+        {
+            // Arrange
+            var type = typeof(PageModelWithSupportsGetProperty).GetTypeInfo();
+
+            var actionDescriptor = new CompiledPageActionDescriptor
+            {
+                BoundProperties = new[]
+                {
+                    new PageBoundPropertyDescriptor()
+                    {
+                        Name = nameof(PageModelWithSupportsGetProperty.SupportsGet),
+                        ParameterType = typeof(string),
+                        Property = type.GetProperty(nameof(PageModelWithSupportsGetProperty.SupportsGet)),
+                        BindingInfo = new BindingInfo()
+                        {
+                            // Simulates placing a [BindProperty] on the property
+                            RequestPredicate = ((IRequestPredicateProvider)new BindPropertyAttribute() { SupportsGet = true }).RequestPredicate,
+                        }
+                    },
+                    new PageBoundPropertyDescriptor()
+                    {
+                        Name = nameof(PageModelWithSupportsGetProperty.Default),
+                        ParameterType = typeof(string),
+                        Property = type.GetProperty(nameof(PageModelWithSupportsGetProperty.Default)),
+                    },
+                },
+
+                HandlerTypeInfo = type,
+                PageTypeInfo = typeof(PageWithProperty).GetTypeInfo(),
+                ModelTypeInfo = type,
+            };
+
+            var binder = new TestParameterBinder(new Dictionary<string, object>()
+            {
+                { "SupportsGet", "value" },
+                { "Default", "set" },
+            });
+
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelBinderFactory = TestModelBinderFactory.CreateDefault();
+
+            var factory = PageBinderFactory.CreatePropertyBinder(binder, modelMetadataProvider, modelBinderFactory, actionDescriptor);
+
+            var page = new PageWithProperty
+            {
+                PageContext = GetPageContext(method)
+            };
+
+            var model = new PageModelWithSupportsGetProperty();
+
+            // Act
+            await factory(page.PageContext, model);
+
+            // Assert
+            Assert.Equal("value", model.SupportsGet);
+            Assert.Equal("set", model.Default);
+        }
+
+        [Fact]
+        public async Task ModelBinderFactory_BindsPropertyWithoutSupportsGet_WhenRequestIsNotGet()
+        {
+            // Arrange
+            var type = typeof(PageModelWithSupportsGetProperty).GetTypeInfo();
+
+            var actionDescriptor = new CompiledPageActionDescriptor
+            {
+                BoundProperties = new[]
+                {
+                    new PageBoundPropertyDescriptor()
+                    {
+                        Name = nameof(PageModelWithSupportsGetProperty.SupportsGet),
+                        ParameterType = typeof(string),
+                        Property = type.GetProperty(nameof(PageModelWithSupportsGetProperty.SupportsGet)),
+                        BindingInfo = new BindingInfo()
+                        {
+                            RequestPredicate = ((IRequestPredicateProvider)new BindPropertyAttribute() { SupportsGet = true }).RequestPredicate,
+                        }
+                    },
+                    new PageBoundPropertyDescriptor()
+                    {
+                        Name = nameof(PageModelWithSupportsGetProperty.Default),
+                        ParameterType = typeof(string),
+                        Property = type.GetProperty(nameof(PageModelWithSupportsGetProperty.Default)),
+                    },
+                },
+
+                HandlerTypeInfo = type,
+                PageTypeInfo = typeof(PageWithProperty).GetTypeInfo(),
+                ModelTypeInfo = type,
+            };
+
+            var binder = new TestParameterBinder(new Dictionary<string, object>()
+            {
+                { "SupportsGet", "value" },
+                { "Default", "value" },
+            });
+
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelBinderFactory = TestModelBinderFactory.CreateDefault();
+
+            var factory = PageBinderFactory.CreatePropertyBinder(binder, modelMetadataProvider, modelBinderFactory, actionDescriptor);
+
+            var page = new PageWithProperty
+            {
+                PageContext = GetPageContext()
+            };
+
+            page.HttpContext.Request.Method = "Post";
+
+            var model = new PageModelWithSupportsGetProperty();
+
+            // Act
+            await factory(page.PageContext, model);
+
+            // Assert
+            Assert.Equal("value", model.SupportsGet);
+            Assert.Equal("value", model.Default);
+        }
+
+        [Fact]
+        public async Task CreatePropertyBinder_SkipsBindingPropertiesWithBindNever()
+        {
+            // Arrange
+            var type = typeof(PageModelWithBindNeverProperty).GetTypeInfo();
+
+            var actionDescriptor = new CompiledPageActionDescriptor
+            {
+                BoundProperties = new[]
+                {
+                    new PageBoundPropertyDescriptor()
+                    {
+                        Name = nameof(PageModelWithBindNeverProperty.BindNeverProperty),
+                        ParameterType = typeof(string),
+                        Property = type.GetProperty(nameof(PageModelWithBindNeverProperty.BindNeverProperty)),
+                    },
+                },
+
+                HandlerTypeInfo = type,
+                PageTypeInfo = typeof(PageWithProperty).GetTypeInfo(),
+                ModelTypeInfo = type,
+            };
+
+            var binder = new TestParameterBinder(new Dictionary<string, object>
+            {
+                { nameof(PageModelWithBindNeverProperty.BindNeverProperty), "value" },
+            });
+
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelBinderFactory = TestModelBinderFactory.CreateDefault();
+
+            var factory = PageBinderFactory.CreatePropertyBinder(binder, modelMetadataProvider, modelBinderFactory, actionDescriptor);
+
+            var page = new PageWithProperty
+            {
+                PageContext = GetPageContext()
+            };
+
+            var model = new PageModelWithBindNeverProperty();
+
+            // Act
+            await factory(page.PageContext, model);
+
+            // Assert
+            Assert.Null(model.BindNeverProperty);
+        }
+
+        [Fact]
+        public async Task CreatePropertyBinder_ValidatesTopLevelProperties()
+        {
+            // Arrange
+            var type = typeof(PageModelWithValidation).GetTypeInfo();
+
+            var actionDescriptor = new CompiledPageActionDescriptor
+            {
+                BoundProperties = new[]
+                {
+                    new PageBoundPropertyDescriptor()
+                    {
+                        Name = nameof(PageModelWithValidation.Validated),
+                        ParameterType = typeof(string),
+                        Property = type.GetProperty(nameof(PageModelWithValidation.Validated)),
+                    },
+                },
+
+                HandlerTypeInfo = type,
+                PageTypeInfo = typeof(PageWithProperty).GetTypeInfo(),
+                ModelTypeInfo = type,
+            };
+
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelBinderFactory = TestModelBinderFactory.CreateDefault();
+
+            var binder = new ParameterBinder(
+                modelMetadataProvider,
+                modelBinderFactory,
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new[] { TestModelValidatorProvider.CreateDefaultProvider() }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            var factory = PageBinderFactory.CreatePropertyBinder(binder, modelMetadataProvider, modelBinderFactory, actionDescriptor);
+
+            var page = new PageWithProperty
+            {
+                PageContext = GetPageContext()
+            };
+
+            var model = new PageModelWithValidation();
+
+            // Act
+            await factory(page.PageContext, model);
+
+            // Assert
+            var modelState = page.PageContext.ModelState;
+            Assert.False(modelState.IsValid);
+            Assert.Collection(
+                modelState,
+                kvp =>
+                {
+                    Assert.Equal(nameof(PageModelWithValidation.Validated), kvp.Key);
+                });
+        }
+
+        [Fact]
+        public async Task CreateHandlerBinder_BindsHandlerParameters()
+        {
+            // Arrange
+            var type = typeof(PageModelWithExecutors);
+            var actionDescriptor = GetActionDescriptorWithHandlerMethod(type, nameof(PageModelWithExecutors.OnGet));
+
+            // Act
+            var parameterBinder = new TestParameterBinder(new Dictionary<string, object>()
+            {
+                { "id", "value" },
+            });
+
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelBinderFactory = TestModelBinderFactory.CreateDefault();
+            var factory = PageBinderFactory.CreateHandlerBinder(
+                parameterBinder,
+                modelMetadataProvider,
+                modelBinderFactory,
+                actionDescriptor,
+                actionDescriptor.HandlerMethods[0],
+                _options);
+
+            var page = new PageWithProperty
+            {
+                PageContext = GetPageContext()
+            };
+
+            var model = new PageModelWithExecutors();
+            var arguments = new Dictionary<string, object>();
+
+            // Act
+            await factory(page.PageContext, arguments);
+
+            // Assert
+            Assert.Collection(
+                arguments,
+                kvp =>
+                {
+                    Assert.Equal("id", kvp.Key);
+                    Assert.Equal("value", kvp.Value);
+                });
+        }
+
+        [Fact]
+        public async Task CreateHandlerBinder_SkipBindingParametersThatDisallowBinding()
+        {
+            // Arrange
+            var type = typeof(PageModelWithExecutors);
+            var actionDescriptor = GetActionDescriptorWithHandlerMethod(type, nameof(PageModelWithExecutors.OnGetWithBindNever));
+
+            // Act
+            var parameterBinder = new TestParameterBinder(new Dictionary<string, object>()
+            {
+                { "id", "value" },
+            });
+
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelBinderFactory = TestModelBinderFactory.CreateDefault();
+            var factory = PageBinderFactory.CreateHandlerBinder(
+                parameterBinder,
+                modelMetadataProvider,
+                modelBinderFactory,
+                actionDescriptor,
+                actionDescriptor.HandlerMethods[0],
+                _options);
+
+            var page = new PageWithProperty
+            {
+                PageContext = GetPageContext()
+            };
+
+            var model = new PageModelWithExecutors();
+            var arguments = new Dictionary<string, object>();
+
+            // Act
+            await factory(page.PageContext, arguments);
+
+            // Assert
+            Assert.Empty(arguments);
+        }
+
+        [Fact]
+        public async Task CreateHandlerBinder_ValidatesTopLevelParameters()
+        {
+            // Arrange
+            var type = typeof(PageModelWithExecutors);
+            var actionDescriptor = GetActionDescriptorWithHandlerMethod(type, nameof(PageModelWithExecutors.OnPostWithValidation));
+
+            // Act
+
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelBinderFactory = TestModelBinderFactory.CreateDefault();
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                modelBinderFactory,
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new[] { TestModelValidatorProvider.CreateDefaultProvider() }),
+                _optionsAccessor,
+                NullLoggerFactory.Instance);
+
+            var factory = PageBinderFactory.CreateHandlerBinder(
+                parameterBinder,
+                modelMetadataProvider,
+                modelBinderFactory,
+                actionDescriptor,
+                actionDescriptor.HandlerMethods[0],
+                _options);
+
+            var page = new PageWithProperty
+            {
+                PageContext = GetPageContext()
+            };
+
+            var model = new PageModelWithExecutors();
+            var arguments = new Dictionary<string, object>();
+
+            // Act
+            await factory(page.PageContext, arguments);
+
+            // Assert
+            var modelState = page.PageContext.ModelState;
+            Assert.False(modelState.IsValid);
+            Assert.Collection(
+                modelState,
+                kvp =>
+                {
+                    Assert.Equal("name", kvp.Key);
+                });
+        }
+
+        [Fact]
+        public async Task CreateHandlerBinder_DoesNotValidateTopLevelParameters_IfDisabled()
+        {
+            // Arrange
+            var type = typeof(PageModelWithExecutors);
+            var actionDescriptor = GetActionDescriptorWithHandlerMethod(
+                type,
+                nameof(PageModelWithExecutors.OnPostWithValidation));
+
+            // Act
+
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var modelBinderFactory = TestModelBinderFactory.CreateDefault();
+            var mvcOptions = new MvcOptions();
+
+            var parameterBinder = new ParameterBinder(
+                modelMetadataProvider,
+                modelBinderFactory,
+                new DefaultObjectValidator(
+                    modelMetadataProvider,
+                    new[] { TestModelValidatorProvider.CreateDefaultProvider() }),
+                Options.Create(mvcOptions),
+                NullLoggerFactory.Instance);
+
+            var factory = PageBinderFactory.CreateHandlerBinder(
+                parameterBinder,
+                modelMetadataProvider,
+                modelBinderFactory,
+                actionDescriptor,
+                actionDescriptor.HandlerMethods[0],
+                mvcOptions);
+
+            var page = new PageWithProperty
+            {
+                PageContext = GetPageContext()
+            };
+
+            var model = new PageModelWithExecutors();
+            var arguments = new Dictionary<string, object>();
+
+            // Act
+            await factory(page.PageContext, arguments);
+
+            // Assert
+            var modelState = page.PageContext.ModelState;
+            Assert.True(modelState.IsValid);
+            Assert.Empty(modelState);
+        }
+
+        private static CompiledPageActionDescriptor GetActionDescriptorWithHandlerMethod(Type type, string method)
+        {
+            var handlerMethodInfo = type.GetMethod(method);
+            var parameterInfo = handlerMethodInfo.GetParameters()[0];
+
+            var actionDescriptor = new CompiledPageActionDescriptor
+            {
+                HandlerTypeInfo = type.GetTypeInfo(),
+                HandlerMethods = new[]
+                {
+                    new HandlerMethodDescriptor
+                    {
+                        HttpMethod = "Post",
+                        MethodInfo = handlerMethodInfo,
+                        Parameters = new[]
+                        {
+                            new HandlerParameterDescriptor
+                            {
+                                ParameterInfo = parameterInfo,
+                                ParameterType = parameterInfo.ParameterType,
+                                Name = parameterInfo.Name
+                            },
+                        },
+                    },
+                },
+            };
+            return actionDescriptor;
+        }
+
+        private PageContext GetPageContext(string httpMethod = null)
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+
+            var httpContext = new DefaultHttpContext()
+            {
+                RequestServices = services.BuildServiceProvider()
+            };
+
+            if (httpMethod != null)
+            {
+                httpContext.Request.Method = httpMethod;
+            }
+
+            return new PageContext()
+            {
+                HttpContext = httpContext
+            };
+        }
+
+        private class TestParameterBinder : ParameterBinder
+        {
+            private readonly IDictionary<string, object> _args;
+
+            public TestParameterBinder(IDictionary<string, object> args)
+                : base(
+                    TestModelMetadataProvider.CreateDefaultProvider(),
+                    TestModelBinderFactory.CreateDefault(),
+                    Mock.Of<IObjectModelValidator>(),
+                    _optionsAccessor,
+                    NullLoggerFactory.Instance)
+            {
+                _args = args;
+            }
+
+            public IList<ParameterDescriptor> Descriptors { get; } = new List<ParameterDescriptor>();
+
+            public override Task<ModelBindingResult> BindModelAsync(
+                ActionContext actionContext,
+                IModelBinder modelBinder,
+                IValueProvider valueProvider,
+                ParameterDescriptor parameter,
+                ModelMetadata metadata,
+                object value)
+            {
+                Descriptors.Add(parameter);
+
+                if (_args.TryGetValue(parameter.Name, out var result))
+                {
+                    return Task.FromResult(ModelBindingResult.Success(result));
+                }
+
+                return Task.FromResult(ModelBindingResult.Failed());
+            }
+        }
+
+        private class PageModelWithNoBoundProperties : PageModel
+        {
+        }
+
+        private class PageWithNoBoundProperties : Page
+        {
+            public override Task ExecuteAsync() => Task.FromResult(0);
+        }
+
+        private class PageWithNoVisibleBoundProperties : Page
+        {
+            [FromBody]
+            private string FromBody { get; set; }
+
+            [FromQuery]
+            protected string FromQuery { get; set; }
+
+            [FromRoute]
+            public static int FromRoute { get; set; }
+
+            public override Task ExecuteAsync() => Task.FromResult(0);
+        }
+
+        private class PageModelWithNoVisibleBoundProperties : PageModel
+        {
+            [FromBody]
+            private string FromBody { get; set; }
+
+            [FromQuery]
+            protected string FromQuery { get; set; }
+
+            [FromRoute]
+            public static int FromRoute { get; set; }
+        }
+
+        private class PageWithReadOnlyProperties : Page
+        {
+            [FromBody]
+            private string FromBody { get; }
+
+            public override Task ExecuteAsync() => Task.FromResult(0);
+        }
+
+        private class PageModelWithReadOnlyProperties
+        {
+            [FromBody]
+            private string FromBody { get; }
+        }
+
+        private class PageWithProperty : Page
+        {
+            [FromQuery]
+            public int Id { get; set; }
+
+            [FromRoute(Name = "route-value")]
+            public string RouteDifferentValue { get; set; }
+
+            [FromForm]
+            public string PropertyWithNoValue { get; set; }
+
+            public override Task ExecuteAsync() => Task.FromResult(0);
+        }
+
+        private class PageModelWithProperty : PageModel
+        {
+            [FromQuery]
+            public int Id { get; set; }
+
+            [FromRoute(Name = "route-value")]
+            public string RouteDifferentValue { get; set; }
+
+            [FromForm]
+            public string PropertyWithNoValue { get; set; }
+        }
+
+        private class PageModelWithModelBinderAttribute
+        {
+            [ModelBinder(BinderType = typeof(DeclarativeSecurityAction))]
+            public Guid PropertyWithBinderType { get; set; }
+        }
+
+        private class PageModelWithPropertyFilterAttribute
+        {
+            [ModelBinder]
+            [TestPropertyFilterProvider]
+            public object PropertyWithFilter { get; set; }
+        }
+
+        private class TestPropertyFilterProvider : Attribute, IPropertyFilterProvider
+        {
+            public Func<ModelMetadata, bool> PropertyFilter => _ => true;
+        }
+
+        private class PageModelWithDefaultValue
+        {
+            [ModelBinder]
+            public string PropertyWithDefaultValue { get; set; } = "Hello world";
+        }
+
+        private class PageModelWithSupportsGetProperty
+        {
+            [BindProperty(SupportsGet = true)]
+            public string SupportsGet { get; set; }
+
+            public string Default { get; set; }
+        }
+
+        private class PageModelWithBindNeverProperty
+        {
+            [BindNever]
+            public string BindNeverProperty { get; set; }
+        }
+
+        private class PageModelWithValidation
+        {
+            [Required]
+            public string Validated { get; set; }
+        }
+
+        private class PageModelWithExecutors
+        {
+            public void OnGetWithBindNever([BindNever] string id)
+            {
+            }
+
+            public void OnGet(string id)
+            {
+            }
+
+            public void OnPostWithValidation([Required] string name)
+            {
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageHandlerPageFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageHandlerPageFilterTest.cs
new file mode 100644
index 0000000000..6b8e1e5d17
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageHandlerPageFilterTest.cs
@@ -0,0 +1,181 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.AspNetCore.Routing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class PageHandlerPageFilterTest
+    {
+        [Fact]
+        public async Task OnPageHandlerExecutionAsync_ExecutesAsyncFilters()
+        {
+            // Arrange
+            var pageContext = new PageContext(new ActionContext(
+                new DefaultHttpContext(),
+                new RouteData(),
+                new PageActionDescriptor(),
+                new ModelStateDictionary()));
+            var model = new Mock<PageModel>();
+
+            var pageHandlerExecutingContext = new PageHandlerExecutingContext(
+               pageContext,
+               Array.Empty<IFilterMetadata>(),
+               new HandlerMethodDescriptor(),
+               new Dictionary<string, object>(),
+               model.Object);
+            var pageHandlerExecutedContext = new PageHandlerExecutedContext(
+              pageContext,
+              Array.Empty<IFilterMetadata>(),
+              new HandlerMethodDescriptor(),
+              model.Object);
+            PageHandlerExecutionDelegate next = () => Task.FromResult(pageHandlerExecutedContext);
+
+            var modelAsFilter = model.As<IAsyncPageFilter>();
+            modelAsFilter
+                .Setup(f => f.OnPageHandlerExecutionAsync(pageHandlerExecutingContext, next))
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+
+            var pageHandlerPageFilter = new PageHandlerPageFilter();
+
+            // Act
+            await pageHandlerPageFilter.OnPageHandlerExecutionAsync(pageHandlerExecutingContext, next);
+
+            // Assert
+            modelAsFilter.Verify();
+        }
+
+        [Fact]
+        public async Task OnPageHandlerExecutionAsync_ExecutesSyncFilters()
+        {
+            // Arrange
+            var pageContext = new PageContext(new ActionContext(
+                new DefaultHttpContext(),
+                new RouteData(),
+                new PageActionDescriptor(),
+                new ModelStateDictionary()));
+            var model = new Mock<object>();
+
+            var modelAsFilter = model.As<IPageFilter>();
+            modelAsFilter
+                .Setup(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()))
+                .Verifiable();
+
+            modelAsFilter
+                .Setup(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()))
+                .Verifiable();
+
+            var pageHandlerExecutingContext = new PageHandlerExecutingContext(
+               pageContext,
+               Array.Empty<IFilterMetadata>(),
+               new HandlerMethodDescriptor(),
+               new Dictionary<string, object>(),
+               model.Object);
+            var pageHandlerExecutedContext = new PageHandlerExecutedContext(
+              pageContext,
+              Array.Empty<IFilterMetadata>(),
+              new HandlerMethodDescriptor(),
+              model.Object);
+            PageHandlerExecutionDelegate next = () => Task.FromResult(pageHandlerExecutedContext);
+
+            var pageHandlerPageFilter = new PageHandlerPageFilter();
+
+            // Act
+            await pageHandlerPageFilter.OnPageHandlerExecutionAsync(pageHandlerExecutingContext, next);
+
+            // Assert
+            modelAsFilter.Verify();
+        }
+
+        [Fact]
+        public async Task OnPageHandlerExecutionAsync_DoesNotInvokeHandlerExecuted_IfResultIsSet()
+        {
+            // Arrange
+            var pageContext = new PageContext(new ActionContext(
+                new DefaultHttpContext(),
+                new RouteData(),
+                new PageActionDescriptor(),
+                new ModelStateDictionary()));
+            var model = new Mock<object>();
+
+            var modelAsFilter = model.As<IPageFilter>();
+            modelAsFilter
+                .Setup(f => f.OnPageHandlerExecuting(It.IsAny<PageHandlerExecutingContext>()))
+                .Callback((PageHandlerExecutingContext context) => context.Result = new PageResult())
+                .Verifiable();
+
+            modelAsFilter
+                .Setup(f => f.OnPageHandlerExecuted(It.IsAny<PageHandlerExecutedContext>()))
+                .Throws(new Exception("Shouldn't be called"));
+
+            var pageHandlerExecutingContext = new PageHandlerExecutingContext(
+               pageContext,
+               Array.Empty<IFilterMetadata>(),
+               new HandlerMethodDescriptor(),
+               new Dictionary<string, object>(),
+               model.Object);
+            var pageHandlerExecutedContext = new PageHandlerExecutedContext(
+              pageContext,
+              Array.Empty<IFilterMetadata>(),
+              new HandlerMethodDescriptor(),
+              model.Object);
+            PageHandlerExecutionDelegate next = () => Task.FromResult(pageHandlerExecutedContext);
+
+            var pageHandlerPageFilter = new PageHandlerPageFilter();
+
+            // Act
+            await pageHandlerPageFilter.OnPageHandlerExecutionAsync(pageHandlerExecutingContext, next);
+
+            // Assert
+            modelAsFilter.Verify();
+        }
+
+        [Fact]
+        public async Task OnPageHandlerExecutionAsync_InvokesNextDelegateIfHandlerDoesNotImplementFilter()
+        {
+            // Arrange
+            var pageContext = new PageContext(new ActionContext(
+                new DefaultHttpContext(),
+                new RouteData(),
+                new PageActionDescriptor(),
+                new ModelStateDictionary()));
+            var model = new object();
+
+            var pageHandlerExecutingContext = new PageHandlerExecutingContext(
+               pageContext,
+               Array.Empty<IFilterMetadata>(),
+               new HandlerMethodDescriptor(),
+               new Dictionary<string, object>(),
+               model);
+            var pageHandlerExecutedContext = new PageHandlerExecutedContext(
+              pageContext,
+              Array.Empty<IFilterMetadata>(),
+              new HandlerMethodDescriptor(),
+              model);
+            var invoked = false;
+            PageHandlerExecutionDelegate next = () =>
+            {
+                invoked = true;
+                return Task.FromResult(pageHandlerExecutedContext);
+            };
+
+            var pageHandlerPageFilter = new PageHandlerPageFilter();
+
+            // Act
+            await pageHandlerPageFilter.OnPageHandlerExecutionAsync(pageHandlerExecutingContext, next);
+
+            // Assert
+            Assert.True(invoked);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageHandlerResultFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageHandlerResultFilterTest.cs
new file mode 100644
index 0000000000..46b7996080
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageHandlerResultFilterTest.cs
@@ -0,0 +1,176 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Routing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class PageHandlerResultFilterTest
+    {
+        [Fact]
+        public async Task OnResultExecutionAsync_ExecutesAsyncFilters()
+        {
+            // Arrange
+            var pageContext = new PageContext(new ActionContext(
+                new DefaultHttpContext(),
+                new RouteData(),
+                new PageActionDescriptor(),
+                new ModelStateDictionary()));
+            var model = new Mock<PageModel>();
+
+
+            var modelAsFilter = model.As<IAsyncResultFilter>();
+            modelAsFilter
+                .Setup(f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()))
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+
+            var resultExecutingContext = new ResultExecutingContext(
+               pageContext,
+               Array.Empty<IFilterMetadata>(),
+               new PageResult(),
+               model.Object);
+            var resultExecutedContext = new ResultExecutedContext(
+                pageContext,
+                Array.Empty<IFilterMetadata>(),
+                resultExecutingContext.Result,
+                model.Object);
+            ResultExecutionDelegate next = () => Task.FromResult(resultExecutedContext);
+
+            var pageHandlerResultFilter = new PageHandlerResultFilter();
+
+            // Act
+            await pageHandlerResultFilter.OnResultExecutionAsync(resultExecutingContext, next);
+
+            // Assert
+            modelAsFilter.Verify();
+        }
+
+        [Fact]
+        public async Task OnResultExecutionAsyn_ExecutesSyncFilters()
+        {
+            // Arrange
+            var pageContext = new PageContext(new ActionContext(
+                new DefaultHttpContext(),
+                new RouteData(),
+                new PageActionDescriptor(),
+                new ModelStateDictionary()));
+            var model = new Mock<object>();
+
+            var modelAsFilter = model.As<IResultFilter>();
+            modelAsFilter
+                .Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()))
+                .Verifiable();
+
+            modelAsFilter
+                .Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()))
+                .Verifiable();
+
+            var resultExecutingContext = new ResultExecutingContext(
+               pageContext,
+               Array.Empty<IFilterMetadata>(),
+               new PageResult(),
+               model.Object);
+            var resultExecutedContext = new ResultExecutedContext(
+                pageContext,
+                Array.Empty<IFilterMetadata>(),
+                resultExecutingContext.Result,
+                model.Object);
+            ResultExecutionDelegate next = () => Task.FromResult(resultExecutedContext);
+
+            var pageHandlerResultFilter = new PageHandlerResultFilter();
+
+            // Act
+            await pageHandlerResultFilter.OnResultExecutionAsync(resultExecutingContext, next);
+
+            // Assert
+            modelAsFilter.Verify();
+        }
+
+        [Fact]
+        public async Task OnPageHandlerExecutionAsync_DoesNotInvokeResultExecuted_IfCancelled()
+        {
+            // Arrange
+            var pageContext = new PageContext(new ActionContext(
+                new DefaultHttpContext(),
+                new RouteData(),
+                new PageActionDescriptor(),
+                new ModelStateDictionary()));
+            var model = new Mock<object>();
+
+            var modelAsFilter = model.As<IResultFilter>();
+            modelAsFilter
+                .Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()))
+                .Callback((ResultExecutingContext context) => context.Cancel = true)
+                .Verifiable();
+
+            modelAsFilter
+                .Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()))
+                .Throws(new Exception("Shouldn't be called"));
+
+            var resultExecutingContext = new ResultExecutingContext(
+               pageContext,
+               Array.Empty<IFilterMetadata>(),
+               new PageResult(),
+               model.Object);
+            var resultExecutedContext = new ResultExecutedContext(
+                pageContext,
+                Array.Empty<IFilterMetadata>(),
+                resultExecutingContext.Result,
+                model.Object);
+            ResultExecutionDelegate next = () => Task.FromResult(resultExecutedContext);
+
+            var pageHandlerResultFilter = new PageHandlerResultFilter();
+
+            // Act
+            await pageHandlerResultFilter.OnResultExecutionAsync(resultExecutingContext, next);
+
+            // Assert
+            modelAsFilter.Verify();
+        }
+
+        [Fact]
+        public async Task OnPageHandlerExecutionAsync_InvokesNextDelegateIfHandlerDoesNotImplementFilter()
+        {
+            // Arrange
+            var pageContext = new PageContext(new ActionContext(
+                new DefaultHttpContext(),
+                new RouteData(),
+                new PageActionDescriptor(),
+                new ModelStateDictionary()));
+            var model = new object();
+
+            var resultExecutingContext = new ResultExecutingContext(
+               pageContext,
+               Array.Empty<IFilterMetadata>(),
+               new PageResult(),
+               model);
+            var resultExecutedContext = new ResultExecutedContext(
+                pageContext,
+                Array.Empty<IFilterMetadata>(),
+                resultExecutingContext.Result,
+                model);
+            var invoked = false;
+            ResultExecutionDelegate next = () =>
+            {
+                invoked = true;
+                return Task.FromResult(resultExecutedContext);
+            };
+
+            var pageHandlerResultFilter = new PageHandlerResultFilter();
+
+            // Act
+            await pageHandlerResultFilter.OnResultExecutionAsync(resultExecutingContext, next);
+
+            // Assert
+            Assert.True(invoked);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageRouteModelFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageRouteModelFactoryTest.cs
new file mode 100644
index 0000000000..64e9156fa5
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageRouteModelFactoryTest.cs
@@ -0,0 +1,225 @@
+// 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.
+
+using System.Linq;
+using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.Extensions.Logging.Abstractions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class PageRouteModelFactoryTest
+    {
+        [Fact]
+        public void CreateRouteModel_AddsSelector()
+        {
+            // Arrange
+            var relativePath = "/Pages/Users/Profile.cshtml";
+            var options = new RazorPagesOptions();
+            var routeModelFactory = new PageRouteModelFactory(options, NullLogger.Instance);
+
+            // Act
+            var routeModel = routeModelFactory.CreateRouteModel(relativePath, "{id?}");
+
+            // Assert
+            Assert.Equal(relativePath, routeModel.RelativePath);
+            Assert.Equal("/Users/Profile", routeModel.ViewEnginePath);
+            Assert.Null(routeModel.AreaName);
+
+            Assert.Collection(
+                routeModel.Selectors,
+                selector => Assert.Equal("Users/Profile/{id?}", selector.AttributeRouteModel.Template));
+
+            Assert.Collection(
+                routeModel.RouteValues,
+                kvp =>
+                {
+                    Assert.Equal("page", kvp.Key);
+                    Assert.Equal("/Users/Profile", kvp.Value);
+                });
+        }
+
+        [Fact]
+        public void CreateRouteModel_AddsMultipleSelectorsForIndexPage()
+        {
+            // Arrange
+            var relativePath = "/Pages/Users/Profile/Index.cshtml";
+            var options = new RazorPagesOptions();
+            var routeModelFactory = new PageRouteModelFactory(options, NullLogger.Instance);
+
+            // Act
+            var routeModel = routeModelFactory.CreateRouteModel(relativePath, "{id?}");
+
+            // Assert
+            Assert.Equal(relativePath, routeModel.RelativePath);
+            Assert.Equal("/Users/Profile/Index", routeModel.ViewEnginePath);
+
+            Assert.Collection(
+                routeModel.Selectors,
+                selector => Assert.Equal("Users/Profile/Index/{id?}", selector.AttributeRouteModel.Template),
+                selector => Assert.Equal("Users/Profile/{id?}", selector.AttributeRouteModel.Template));
+
+            Assert.Collection(
+                routeModel.RouteValues,
+                kvp =>
+                {
+                    Assert.Equal("page", kvp.Key);
+                    Assert.Equal("/Users/Profile/Index", kvp.Value);
+                });
+        }
+
+        [Fact]
+        public void CreateRouteModel_DoesNotAddMultipleSelectorsWhenRouteTemplateIsAbsolute()
+        {
+            // Arrange
+            var relativePath = "/Pages/Users/Profile/Index.cshtml";
+            var options = new RazorPagesOptions();
+            var routeModelFactory = new PageRouteModelFactory(options, NullLogger.Instance);
+
+            // Act
+            var routeModel = routeModelFactory.CreateRouteModel(relativePath, "/my-override");
+
+            // Assert
+            Assert.Equal(relativePath, routeModel.RelativePath);
+            Assert.Equal("/Users/Profile/Index", routeModel.ViewEnginePath);
+
+            Assert.Collection(
+                routeModel.Selectors,
+                selector => Assert.Equal("my-override", selector.AttributeRouteModel.Template));
+
+            Assert.Collection(
+                routeModel.RouteValues,
+                kvp =>
+                {
+                    Assert.Equal("page", kvp.Key);
+                    Assert.Equal("/Users/Profile/Index", kvp.Value);
+                });
+        }
+
+        [Fact]
+        public void CreateAreaRouteModel_AddsSelector()
+        {
+            // Arrange
+            var relativePath = "/Areas/TestArea/Pages/Users/Profile.cshtml";
+            var options = new RazorPagesOptions();
+            var routeModelFactory = new PageRouteModelFactory(options, NullLogger.Instance);
+
+            // Act
+            var routeModel = routeModelFactory.CreateAreaRouteModel(relativePath, "{id?}");
+
+            // Assert
+            Assert.Equal(relativePath, routeModel.RelativePath);
+            Assert.Equal("/Users/Profile", routeModel.ViewEnginePath);
+            Assert.Equal("TestArea", routeModel.AreaName);
+
+            Assert.Collection(
+                routeModel.Selectors,
+                selector => Assert.Equal("TestArea/Users/Profile/{id?}", selector.AttributeRouteModel.Template));
+
+            Assert.Collection(
+                routeModel.RouteValues.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("area", kvp.Key);
+                    Assert.Equal("TestArea", kvp.Value);
+                },
+                kvp =>
+                {
+                    Assert.Equal("page", kvp.Key);
+                    Assert.Equal("/Users/Profile", kvp.Value);
+                });
+        }
+
+        [Fact]
+        public void CreateAreaRouteModel_AddsMultipleSelectorsForIndexPage()
+        {
+            // Arrange
+            var relativePath = "/Areas/TestArea/Pages/Users/Profile/Index.cshtml";
+            var options = new RazorPagesOptions();
+            var routeModelFactory = new PageRouteModelFactory(options, NullLogger.Instance);
+
+            // Act
+            var routeModel = routeModelFactory.CreateAreaRouteModel(relativePath, "{id?}");
+
+            // Assert
+            Assert.Equal(relativePath, routeModel.RelativePath);
+            Assert.Equal("/Users/Profile/Index", routeModel.ViewEnginePath);
+            Assert.Equal("TestArea", routeModel.AreaName);
+
+            Assert.Collection(
+                routeModel.Selectors,
+                selector => Assert.Equal("TestArea/Users/Profile/Index/{id?}", selector.AttributeRouteModel.Template),
+                selector => Assert.Equal("TestArea/Users/Profile/{id?}", selector.AttributeRouteModel.Template));
+
+            Assert.Collection(
+                routeModel.RouteValues.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("area", kvp.Key);
+                    Assert.Equal("TestArea", kvp.Value);
+                },
+                kvp =>
+                {
+                    Assert.Equal("page", kvp.Key);
+                    Assert.Equal("/Users/Profile/Index", kvp.Value);
+                });
+        }
+
+        [ConditionalTheory]
+        [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "Fails due to dotnet/standard#567")]
+        [InlineData("/Areas/About.cshtml")]
+        [InlineData("/Areas/MyArea/Index.cshtml")]
+        public void TryParseAreaPath_ReturnsFalse_IfPathDoesNotConform(string path)
+        {
+            // Arrange
+            var options = new RazorPagesOptions();
+            var routeModelFactory = new PageRouteModelFactory(options, NullLogger.Instance);
+
+            // Act
+            var success = routeModelFactory.TryParseAreaPath(path, out _);
+
+            // Assert
+            Assert.False(success);
+        }
+
+        [ConditionalTheory]
+        [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "Fails due to dotnet/standard#567")]
+        [InlineData("/Areas/MyArea/Views/About.cshtml")]
+        [InlineData("/Areas/MyArea/SubDir/Pages/Index.cshtml")]
+        [InlineData("/Areas/MyArea/NotPages/SubDir/About.cshtml")]
+        public void TryParseAreaPath_ReturnsFalse_IfPathDoesNotBelongToRootDirectory(string path)
+        {
+            // Arrange
+            var options = new RazorPagesOptions();
+            var routeModelFactory = new PageRouteModelFactory(options, NullLogger.Instance);
+
+            // Act
+            var success = routeModelFactory.TryParseAreaPath(path, out _);
+
+            // Assert
+            Assert.False(success);
+        }
+
+        [ConditionalTheory]
+        [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "Fails due to dotnet/standard#567")]
+        [InlineData("/Areas/MyArea/Pages/Index.cshtml", "MyArea", "/Index")]
+        [InlineData("/Areas/Accounts/Pages/Manage/Edit.cshtml", "Accounts", "/Manage/Edit")]
+        public void TryParseAreaPath_ParsesAreaPath(
+            string path,
+            string expectedArea,
+            string expectedViewEnginePath)
+        {
+            // Arrange
+            var options = new RazorPagesOptions();
+            var routeModelFactory = new PageRouteModelFactory(options, NullLogger.Instance);
+
+            // Act
+            var success = routeModelFactory.TryParseAreaPath(path, out var result);
+
+            // Assert
+            Assert.True(success);
+            Assert.Equal(expectedArea, result.areaName);
+            Assert.Equal(expectedViewEnginePath, result.viewEnginePath);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterFactoryTest.cs
new file mode 100644
index 0000000000..92b7455009
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterFactoryTest.cs
@@ -0,0 +1,48 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    public class PageSaveTempDataPropertyFilterFactoryTest
+    {
+        [Fact]
+        public void CreatesInstanceWithProperties()
+        {
+            // Arrange
+            var property = typeof(TestPageModel).GetProperty(nameof(TestPageModel.Property1));
+            var lifecycleProperties = new[] { new LifecycleProperty(property, "key") };
+            var factory = new PageSaveTempDataPropertyFilterFactory(lifecycleProperties);
+            var serviceProvider = CreateServiceProvider();
+
+            // Act
+            var filter = factory.CreateInstance(serviceProvider);
+
+            // Assert
+            var pageFilter = Assert.IsType<PageSaveTempDataPropertyFilter>(filter);
+            Assert.Same(lifecycleProperties, pageFilter.Properties);
+        }
+
+        private ServiceProvider CreateServiceProvider()
+        {
+            var serviceCollection = new ServiceCollection();
+
+            serviceCollection.AddSingleton(Mock.Of<ITempDataProvider>());
+            serviceCollection.AddSingleton<ITempDataDictionaryFactory, TempDataDictionaryFactory>();
+            serviceCollection.AddTransient<PageSaveTempDataPropertyFilter>();
+
+            return serviceCollection.BuildServiceProvider();
+        }
+
+        private class TestPageModel : PageModel
+        {
+            [TempData]
+            public string Property1 { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterTest.cs
new file mode 100644
index 0000000000..c6a1c27f2e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterTest.cs
@@ -0,0 +1,226 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Routing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class PageSaveTempDataPropertyFilterTest
+    {
+        [Fact]
+        public void OnTempDataSaving_PopulatesTempDataWithNewValuesFromPageProperties()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+
+            var tempData = new TempDataDictionary(httpContext, Mock.Of<ITempDataProvider>())
+            {
+                ["TempDataProperty-Test"] = "Old-Value",
+            };
+            var pageModel = new TestPageModel()
+            {
+                Test = "TestString",
+                Test2 = "Test2",
+            };
+
+            var filter = CreatePageSaveTempDataPropertyFilter(tempData, "TempDataProperty-");
+            filter.Subject = pageModel;
+
+            // Act
+            filter.OnTempDataSaving(tempData);
+
+            // Assert
+            Assert.Equal("TestString", tempData["TempDataProperty-Test"]);
+            Assert.False(tempData.ContainsKey("TestDataProperty-Test2"));
+        }
+
+        [Fact]
+        public void OnPageExecuting_SetsPropertyValue()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+
+            var tempData = new TempDataDictionary(httpContext, Mock.Of<ITempDataProvider>())
+            {
+                { "TempDataProperty-Test", "Value" }
+            };
+
+            var pageModel = new TestPageModel();
+
+            var filter = CreatePageSaveTempDataPropertyFilter(tempData, "TempDataProperty-");
+            filter.Subject = pageModel;
+
+            var context = new PageHandlerExecutingContext(
+                new PageContext()
+                {
+                    ActionDescriptor = new CompiledPageActionDescriptor(),
+                    HttpContext = httpContext,
+                    RouteData = new RouteData(),
+                },
+                Array.Empty<IFilterMetadata>(),
+                null,
+                new Dictionary<string, object>(),
+                pageModel);
+
+            // Act
+            filter.OnPageHandlerExecuting(context);
+
+            // Assert
+            Assert.Equal("Value", pageModel.Test);
+            Assert.Null(pageModel.Test2);
+        }
+
+        [Fact]
+        public void OnPageExecuting_InitializesAndSavesProperties()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+
+            var tempData = new TempDataDictionary(httpContext, Mock.Of<ITempDataProvider>())
+            {
+                { "TempDataProperty-Test", "Value" }
+            };
+            tempData.Save();
+
+            var pageModel = new TestPageModel();
+
+            var filter = CreatePageSaveTempDataPropertyFilter(tempData, "TempDataProperty-");
+            filter.Subject = pageModel;
+
+            var pageType = typeof(TestPageModel);
+            var testProperty = pageType.GetProperty(nameof(TestPageModel.Test));
+            var test2Property = pageType.GetProperty(nameof(TestPageModel.Test2));
+
+            var context = new PageHandlerExecutingContext(
+                new PageContext()
+                {
+                    ActionDescriptor = new CompiledPageActionDescriptor(),
+                    HttpContext = httpContext,
+                    RouteData = new RouteData(),
+                },
+                Array.Empty<IFilterMetadata>(),
+                null,
+                new Dictionary<string, object>(),
+                pageModel);
+
+            // Act
+            filter.OnPageHandlerExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                filter.Properties.OrderBy(p => p.PropertyInfo.Name),
+                p => Assert.Equal(testProperty, p.PropertyInfo),
+                p => Assert.Equal(test2Property, p.PropertyInfo));
+        }
+
+        [Fact]
+        public void OnPageExecuting_ReadsTempDataPropertiesWithoutPrefix()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+
+            var tempData = new TempDataDictionary(httpContext, Mock.Of<ITempDataProvider>())
+            {
+                { "TempDataProperty-Test", "Prefix-Value" },
+                { "Test", "Value" }
+            };
+            tempData.Save();
+
+            var model = new TestPageModel();
+
+            var filter = CreatePageSaveTempDataPropertyFilter(tempData, string.Empty);
+            filter.Subject = model;
+
+            var context = new PageHandlerExecutingContext(
+                new PageContext()
+                {
+                    ActionDescriptor = new CompiledPageActionDescriptor(),
+                    HttpContext = httpContext,
+                    RouteData = new RouteData(),
+                },
+                Array.Empty<IFilterMetadata>(),
+                null,
+                new Dictionary<string, object>(),
+                model);
+
+            // Act
+            filter.OnPageHandlerExecuting(context);
+
+            // Assert
+            Assert.Equal("Value", model.Test);
+            Assert.Null(model.Test2);
+        }
+
+        [Fact]
+        public void OnTempDataSaving_WritesToTempData_WithoutPrefix()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+
+            var tempData = new TempDataDictionary(httpContext, Mock.Of<ITempDataProvider>())
+            {
+                ["Test"] = "Old-Value",
+            };
+            var pageModel = new TestPageModel
+            {
+                Test = "New-Value",
+            };
+
+            var filter = CreatePageSaveTempDataPropertyFilter(tempData, string.Empty);
+            filter.Subject = pageModel;
+
+            // Act
+            filter.OnTempDataSaving(tempData);
+
+            // Assert
+            Assert.Collection(
+                tempData,
+                item =>
+                {
+                    Assert.Equal("Test", item.Key);
+                    Assert.Equal("New-Value", item.Value);
+                });
+        }
+
+        private PageSaveTempDataPropertyFilter CreatePageSaveTempDataPropertyFilter(TempDataDictionary tempData, string prefix)
+        {
+            var factory = new Mock<ITempDataDictionaryFactory>();
+            factory
+                .Setup(f => f.GetTempData(It.IsAny<HttpContext>()))
+                .Returns(tempData);
+
+            var pageModelType = typeof(TestPageModel);
+            var property1 = pageModelType.GetProperty(nameof(TestPageModel.Test));
+            var property2 = pageModelType.GetProperty(nameof(TestPageModel.Test2));
+
+            var filter = new PageSaveTempDataPropertyFilter(factory.Object)
+            {
+                Properties = new[]
+                {
+                    new LifecycleProperty(property1, prefix + property1.Name),
+                    new LifecycleProperty(property2, prefix + property2.Name),
+                }
+            };
+
+            return filter;
+        }
+
+        public class TestPageModel : PageModel
+        {
+            [TempData]
+            public string Test { get; set; }
+
+            [TempData]
+            public string Test2 { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterFactoryTest.cs
new file mode 100644
index 0000000000..8b032e59f9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterFactoryTest.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    public class PageViewDataAttributeFilterFactoryTest
+    {
+        [Fact]
+        public void CreateInstance_CreatesFilter()
+        {
+            // Arrange
+            var properties = new LifecycleProperty[]
+            {
+                new LifecycleProperty(),
+                new LifecycleProperty(),
+            };
+            var filterFactory = new PageViewDataAttributeFilterFactory(properties);
+
+            // Act
+            var result = filterFactory.CreateInstance(Mock.Of<IServiceProvider>());
+
+            // Assert
+            var filter = Assert.IsType<PageViewDataAttributeFilter>(result);
+            Assert.Same(properties, filter.Properties);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterTest.cs
new file mode 100644
index 0000000000..1978424d5a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterTest.cs
@@ -0,0 +1,105 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Routing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    public class PageViewDataAttributeFilterTest
+    {
+        [Fact]
+        public void OnPageHandlerExecuting_AddsFeature()
+        {
+            // Arrange
+            var filter = new PageViewDataAttributeFilter(Array.Empty<LifecycleProperty>());
+            var handler = new object();
+            var httpContext = new DefaultHttpContext();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var pageContext = new PageContext(actionContext);
+            var context = new PageHandlerExecutingContext(pageContext, new IFilterMetadata[0], new HandlerMethodDescriptor(), new Dictionary<string, object>(), handler);
+
+            // Act
+            filter.OnPageHandlerExecuting(context);
+
+            // Assert
+            var feature = Assert.Single(httpContext.Features, f => f.Key == typeof(IViewDataValuesProviderFeature));
+            Assert.Same(filter, feature.Value);
+        }
+
+        [Fact]
+        public void OnPageHandlerExecuting_SetsSubject()
+        {
+            // Arrange
+            var filter = new PageViewDataAttributeFilter(Array.Empty<LifecycleProperty>());
+            var handler = new object();
+            var httpContext = new DefaultHttpContext();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var pageContext = new PageContext(actionContext);
+            var context = new PageHandlerExecutingContext(pageContext, new IFilterMetadata[0], new HandlerMethodDescriptor(), new Dictionary<string, object>(), handler);
+
+            // Act
+            filter.OnPageHandlerExecuting(context);
+
+            // Assert
+            Assert.Same(handler, filter.Subject);
+        }
+
+        [Fact]
+        public void ProvideValues_AddsNonNullPropertyValuesToViewData()
+        {
+            // Arrange
+            var type = typeof(TestModel);
+            var properties = new[]
+            {
+                new LifecycleProperty(type.GetProperty(nameof(TestModel.Prop1)), "Prop1"),
+                new LifecycleProperty(type.GetProperty(nameof(TestModel.Prop2)), "Prop2"),
+                new LifecycleProperty(type.GetProperty(nameof(TestModel.Prop3)), "Prop3"),
+            };
+
+            var controller = new TestModel();
+            var filter = new PageViewDataAttributeFilter(properties)
+            {
+                Subject = controller,
+            };
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider(), new ModelStateDictionary());
+
+            // Act
+            controller.Prop1 = "New-Value";
+            filter.ProvideViewDataValues(viewData);
+
+            // Assert
+            Assert.Collection(
+                viewData.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("Prop1", kvp.Key);
+                    Assert.Equal("New-Value", kvp.Value);
+                },
+                kvp =>
+                {
+                    Assert.Equal("Prop2", kvp.Key);
+                    Assert.Equal("Test", kvp.Value);
+                });
+        }
+
+        public class TestModel
+        {
+            public string Prop1 { get; set; }
+
+            public string Prop2 => "Test";
+
+            public string Prop3 { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/RazorPagesRazorViewEngineOptionsSetupTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/RazorPagesRazorViewEngineOptionsSetupTest.cs
new file mode 100644
index 0000000000..e1571e451f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/RazorPagesRazorViewEngineOptionsSetupTest.cs
@@ -0,0 +1,196 @@
+// 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.
+
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class RazorPagesRazorViewEngineOptionsSetupTest
+    {
+        [Fact]
+        public void Configure_AddsPageViewLocationFormats_WhenPagesRootIsAppRoot()
+        {
+            // Arrange
+            var expected = new[]
+            {
+                "/{1}/{0}.cshtml",
+                "/Shared/{0}.cshtml",
+                "/Views/Shared/{0}.cshtml",
+            };
+
+            var razorPagesOptions = new RazorPagesOptions
+            {
+                RootDirectory = "/"
+            };
+            var viewEngineOptions = GetViewEngineOptions();
+            var setup = new RazorPagesRazorViewEngineOptionsSetup(
+                Options.Create(razorPagesOptions));
+
+            // Act
+            setup.Configure(viewEngineOptions);
+
+            // Assert
+            Assert.Equal(expected, viewEngineOptions.PageViewLocationFormats);
+        }
+
+        [Fact]
+        public void Configure_AddsPageViewLocationFormats_WithDefaultPagesRoot()
+        {
+            // Arrange
+            var expected = new[]
+            {
+                "/Pages/{1}/{0}.cshtml",
+                "/Pages/Shared/{0}.cshtml",
+                "/Views/Shared/{0}.cshtml",
+            };
+
+            var razorPagesOptions = new RazorPagesOptions();
+            var viewEngineOptions = GetViewEngineOptions();
+            var setup = new RazorPagesRazorViewEngineOptionsSetup(
+                Options.Create(razorPagesOptions));
+
+            // Act
+            setup.Configure(viewEngineOptions);
+
+            // Assert
+            Assert.Equal(expected, viewEngineOptions.PageViewLocationFormats);
+        }
+
+        [Fact]
+        public void Configure_AddsAreaPageViewLocationFormats()
+        {
+            // Arrange
+            var expected = new[]
+            {
+                "/Areas/{2}/Pages/{1}/{0}.cshtml",
+                "/Areas/{2}/Pages/Shared/{0}.cshtml",
+                "/Areas/{2}/Views/Shared/{0}.cshtml",
+                "/Pages/Shared/{0}.cshtml",
+                "/Views/Shared/{0}.cshtml",
+            };
+
+            var razorPagesOptions = new RazorPagesOptions();
+            var viewEngineOptions = GetViewEngineOptions();
+            var setup = new RazorPagesRazorViewEngineOptionsSetup(
+                Options.Create(razorPagesOptions));
+
+            // Act
+            setup.Configure(viewEngineOptions);
+
+            // Assert
+            Assert.Equal(expected, viewEngineOptions.AreaPageViewLocationFormats);
+        }
+
+        [Fact]
+        public void Configure_WithCustomRoot_AddsAreaPageViewLocationFormats()
+        {
+            // Arrange
+            var expected = new[]
+            {
+                "/Areas/{2}/Pages/{1}/{0}.cshtml",
+                "/Areas/{2}/Pages/Shared/{0}.cshtml",
+                "/Areas/{2}/Views/Shared/{0}.cshtml",
+                "/RazorFiles/Shared/{0}.cshtml",
+                "/Views/Shared/{0}.cshtml",
+            };
+
+            var razorPagesOptions = new RazorPagesOptions
+            {
+                RootDirectory = "/RazorFiles/",
+            };
+            var viewEngineOptions = GetViewEngineOptions();
+            var setup = new RazorPagesRazorViewEngineOptionsSetup(
+                Options.Create(razorPagesOptions));
+
+            // Act
+            setup.Configure(viewEngineOptions);
+
+            // Assert
+            Assert.Equal(expected, viewEngineOptions.AreaPageViewLocationFormats);
+        }
+
+        [Fact]
+        public void Configure_AddsSharedPagesDirectoryToViewLocationFormats()
+        {
+            // Arrange
+            var expected = new[]
+            {
+                "/Views/{1}/{0}.cshtml",
+                "/Views/Shared/{0}.cshtml",
+                "/PagesRoot/Shared/{0}.cshtml",
+            };
+
+            var razorPagesOptions = new RazorPagesOptions
+            {
+                RootDirectory = "/PagesRoot",
+            };
+            var viewEngineOptions = GetViewEngineOptions();
+            var setup = new RazorPagesRazorViewEngineOptionsSetup(
+                Options.Create(razorPagesOptions));
+
+            // Act
+            setup.Configure(viewEngineOptions);
+
+            // Assert
+            Assert.Equal(expected, viewEngineOptions.ViewLocationFormats);
+        }
+
+        [Fact]
+        public void Configure_AddsSharedPagesDirectoryToAreaViewLocationFormats()
+        {
+            // Arrange
+            var expected = new[]
+            {
+                "/Areas/{2}/Views/{1}/{0}.cshtml",
+                "/Areas/{2}/Views/Shared/{0}.cshtml",
+                "/Views/Shared/{0}.cshtml",
+                "/PagesRoot/Shared/{0}.cshtml",
+            };
+
+            var razorPagesOptions = new RazorPagesOptions
+            {
+                RootDirectory = "/PagesRoot",
+            };
+            var viewEngineOptions = GetViewEngineOptions();
+            var setup = new RazorPagesRazorViewEngineOptionsSetup(
+                Options.Create(razorPagesOptions));
+
+            // Act
+            setup.Configure(viewEngineOptions);
+
+            // Assert
+            Assert.Equal(expected, viewEngineOptions.AreaViewLocationFormats);
+        }
+
+        [Fact]
+        public void Configure_RegistersPageViewLocationExpander()
+        {
+            // Arrange
+            var viewEngineOptions = GetViewEngineOptions();
+            var setup = new RazorPagesRazorViewEngineOptionsSetup(Options.Create(new RazorPagesOptions()));
+
+            // Act
+            setup.Configure(viewEngineOptions);
+
+            // Assert
+            Assert.Collection(
+                viewEngineOptions.ViewLocationExpanders,
+                expander => Assert.IsType<PageViewLocationExpander>(expander));
+        }
+
+        private static RazorViewEngineOptions GetViewEngineOptions()
+        {
+            var defaultSetup = new RazorViewEngineOptionsSetup(Mock.Of<IHostingEnvironment>());
+            var options = new RazorViewEngineOptions();
+            defaultSetup.Configure(options);
+
+            return options;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/RazorProjectPageRouteModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/RazorProjectPageRouteModelProviderTest.cs
new file mode 100644
index 0000000000..e6bc51da23
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/RazorProjectPageRouteModelProviderTest.cs
@@ -0,0 +1,356 @@
+// 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.
+
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class RazorProjectPageRouteModelProviderTest
+    {
+        [Fact]
+        public void OnProvidersExecuting_ReturnsPagesWithPageDirective()
+        {
+            // Arrange
+            var fileSystem = new VirtualRazorProjectFileSystem();
+            fileSystem.Add(new TestRazorProjectItem("/Pages/Home.cshtml", "@page"));
+            fileSystem.Add(new TestRazorProjectItem("/Pages/Test.cshtml", "Hello world"));
+
+            var optionsManager = Options.Create(new RazorPagesOptions());
+            optionsManager.Value.RootDirectory = "/";
+            var provider = new RazorProjectPageRouteModelProvider(fileSystem, optionsManager, NullLoggerFactory.Instance);
+            var context = new PageRouteModelProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(context.RouteModels,
+                model =>
+                {
+                    Assert.Equal("/Pages/Home.cshtml", model.RelativePath);
+                    Assert.Equal("/Pages/Home", model.ViewEnginePath);
+                    Assert.Collection(model.Selectors,
+                        selector => Assert.Equal("Pages/Home", selector.AttributeRouteModel.Template));
+                    Assert.Collection(model.RouteValues.OrderBy(k => k.Key),
+                       kvp =>
+                       {
+                           Assert.Equal("page", kvp.Key);
+                           Assert.Equal("/Pages/Home", kvp.Value);
+                       });
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_AddsPagesUnderAreas()
+        {
+            // Arrange
+            var fileSystem = new VirtualRazorProjectFileSystem();
+            fileSystem.Add(new TestRazorProjectItem("/Areas/Products/Pages/Manage/Categories.cshtml", "@page"));
+            fileSystem.Add(new TestRazorProjectItem("/Areas/Products/Pages/Index.cshtml", "@page"));
+            fileSystem.Add(new TestRazorProjectItem("/Areas/Products/Pages/List.cshtml", "@page \"{sortOrder?}\""));
+            fileSystem.Add(new TestRazorProjectItem("/Areas/Products/Pages/_ViewStart.cshtml", "@page"));
+
+            var optionsManager = Options.Create(new RazorPagesOptions { AllowAreas = true });
+            var provider = new RazorProjectPageRouteModelProvider(fileSystem, optionsManager, NullLoggerFactory.Instance);
+            var context = new PageRouteModelProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(context.RouteModels,
+                model =>
+                {
+                    Assert.Equal("/Areas/Products/Pages/Index.cshtml", model.RelativePath);
+                    Assert.Equal("/Index", model.ViewEnginePath);
+                    Assert.Collection(model.Selectors,
+                        selector => Assert.Equal("Products/Index", selector.AttributeRouteModel.Template),
+                        selector => Assert.Equal("Products", selector.AttributeRouteModel.Template));
+                    Assert.Collection(model.RouteValues.OrderBy(k => k.Key),
+                      kvp =>
+                      {
+                          Assert.Equal("area", kvp.Key);
+                          Assert.Equal("Products", kvp.Value);
+                      },
+                      kvp =>
+                      {
+                          Assert.Equal("page", kvp.Key);
+                          Assert.Equal("/Index", kvp.Value);
+                      });
+                },
+                model =>
+                {
+                    Assert.Equal("/Areas/Products/Pages/List.cshtml", model.RelativePath);
+                    Assert.Equal("/List", model.ViewEnginePath);
+                    Assert.Collection(model.Selectors,
+                        selector => Assert.Equal("Products/List/{sortOrder?}", selector.AttributeRouteModel.Template));
+                    Assert.Collection(model.RouteValues.OrderBy(k => k.Key),
+                      kvp =>
+                      {
+                          Assert.Equal("area", kvp.Key);
+                          Assert.Equal("Products", kvp.Value);
+                      },
+                      kvp =>
+                      {
+                          Assert.Equal("page", kvp.Key);
+                          Assert.Equal("/List", kvp.Value);
+                      });
+                },
+                model =>
+                {
+                    Assert.Equal("/Areas/Products/Pages/Manage/Categories.cshtml", model.RelativePath);
+                    Assert.Equal("/Manage/Categories", model.ViewEnginePath);
+                    Assert.Collection(model.Selectors,
+                        selector => Assert.Equal("Products/Manage/Categories", selector.AttributeRouteModel.Template));
+                    Assert.Collection(model.RouteValues.OrderBy(k => k.Key),
+                       kvp =>
+                       {
+                           Assert.Equal("area", kvp.Key);
+                           Assert.Equal("Products", kvp.Value);
+                       },
+                       kvp =>
+                       {
+                           Assert.Equal("page", kvp.Key);
+                           Assert.Equal("/Manage/Categories", kvp.Value);
+                       });
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_DoesNotAddPagesUnderAreas_WhenFeatureIsDisabled()
+        {
+            // Arrange
+            var fileSystem = new VirtualRazorProjectFileSystem();
+            fileSystem.Add(new TestRazorProjectItem("/Areas/Products/Pages/Manage/Categories.cshtml", "@page"));
+            fileSystem.Add(new TestRazorProjectItem("/Areas/Products/Pages/Index.cshtml", "@page"));
+            fileSystem.Add(new TestRazorProjectItem("/Areas/Products/Pages/List.cshtml", "@page \"{sortOrder?}\""));
+            fileSystem.Add(new TestRazorProjectItem("/Areas/Products/Pages/_ViewStart.cshtml", "@page"));
+            fileSystem.Add(new TestRazorProjectItem("/Pages/About.cshtml", "@page"));
+
+            var optionsManager = Options.Create(new RazorPagesOptions { AllowAreas = false });
+            var provider = new RazorProjectPageRouteModelProvider(fileSystem, optionsManager, NullLoggerFactory.Instance);
+            var context = new PageRouteModelProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(context.RouteModels,
+                model =>
+                {
+                    Assert.Equal("/Pages/About.cshtml", model.RelativePath);
+                    Assert.Equal("/About", model.ViewEnginePath);
+                    Assert.Collection(model.Selectors,
+                        selector => Assert.Equal("About", selector.AttributeRouteModel.Template));
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_DoesNotAddAreaAndNonAreaRoutesForAPage()
+        {
+            // Arrange
+            var fileSystem = new VirtualRazorProjectFileSystem();
+            fileSystem.Add(new TestRazorProjectItem("/Areas/Products/Pages/Categories.cshtml", "@page"));
+            fileSystem.Add(new TestRazorProjectItem("/About.cshtml", "@page"));
+            // We shouldn't add a route for the following paths.
+            fileSystem.Add(new TestRazorProjectItem("/Areas/Products/Categories.cshtml", "@page"));
+            fileSystem.Add(new TestRazorProjectItem("/Areas/Home.cshtml", "@page"));
+
+            var optionsManager = Options.Create(new RazorPagesOptions
+            {
+                RootDirectory = "/",
+                AllowAreas = true,
+            });
+            var provider = new RazorProjectPageRouteModelProvider(fileSystem, optionsManager, NullLoggerFactory.Instance);
+            var context = new PageRouteModelProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(context.RouteModels,
+                model =>
+                {
+                    Assert.Equal("/Areas/Products/Pages/Categories.cshtml", model.RelativePath);
+                    Assert.Equal("/Categories", model.ViewEnginePath);
+                    Assert.Collection(model.Selectors,
+                        selector => Assert.Equal("Products/Categories", selector.AttributeRouteModel.Template));
+                    Assert.Collection(model.RouteValues.OrderBy(k => k.Key),
+                      kvp =>
+                      {
+                          Assert.Equal("area", kvp.Key);
+                          Assert.Equal("Products", kvp.Value);
+                      },
+                      kvp =>
+                      {
+                          Assert.Equal("page", kvp.Key);
+                          Assert.Equal("/Categories", kvp.Value);
+                      });
+                },
+                model =>
+                {
+                    Assert.Equal("/About.cshtml", model.RelativePath);
+                    Assert.Equal("/About", model.ViewEnginePath);
+                    Assert.Collection(model.Selectors,
+                        selector => Assert.Equal("About", selector.AttributeRouteModel.Template));
+                    Assert.Collection(model.RouteValues.OrderBy(k => k.Key),
+                      kvp =>
+                      {
+                          Assert.Equal("page", kvp.Key);
+                          Assert.Equal("/About", kvp.Value);
+                      });
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_AddsMultipleSelectorsForIndexPages()
+        {
+            // Arrange
+            var fileSystem = new VirtualRazorProjectFileSystem();
+            fileSystem.Add(new TestRazorProjectItem("/Pages/Index.cshtml", "@page"));
+            fileSystem.Add(new TestRazorProjectItem("/Pages/Test.cshtml", "Hello world"));
+            fileSystem.Add(new TestRazorProjectItem("/Pages/Admin/Index.cshtml", "@page \"test\""));
+
+            var optionsManager = Options.Create(new RazorPagesOptions());
+            optionsManager.Value.RootDirectory = "/";
+            var provider = new RazorProjectPageRouteModelProvider(fileSystem, optionsManager, NullLoggerFactory.Instance);
+            var context = new PageRouteModelProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(context.RouteModels,
+                model =>
+                {
+                    Assert.Equal("/Pages/Index.cshtml", model.RelativePath);
+                    Assert.Equal("/Pages/Index", model.ViewEnginePath);
+                    Assert.Collection(model.Selectors,
+                        selector => Assert.Equal("Pages/Index", selector.AttributeRouteModel.Template),
+                        selector => Assert.Equal("Pages", selector.AttributeRouteModel.Template));
+                },
+                model =>
+                {
+                    Assert.Equal("/Pages/Admin/Index.cshtml", model.RelativePath);
+                    Assert.Equal("/Pages/Admin/Index", model.ViewEnginePath);
+                    Assert.Collection(model.Selectors,
+                        selector => Assert.Equal("Pages/Admin/Index/test", selector.AttributeRouteModel.Template),
+                        selector => Assert.Equal("Pages/Admin/test", selector.AttributeRouteModel.Template));
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_AllowsRouteTemplateWithOverridePattern()
+        {
+            // Arrange
+            var fileSystem = new VirtualRazorProjectFileSystem();
+            fileSystem.Add(new TestRazorProjectItem("/Index.cshtml", "@page \"/custom-route\""));
+
+            var optionsManager = Options.Create(new RazorPagesOptions());
+            optionsManager.Value.RootDirectory = "/";
+            var provider = new RazorProjectPageRouteModelProvider(fileSystem, optionsManager, NullLoggerFactory.Instance);
+            var context = new PageRouteModelProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                context.RouteModels,
+                model =>
+                {
+                    Assert.Equal("/Index.cshtml", model.RelativePath);
+                    Assert.Equal("/Index", model.ViewEnginePath);
+                    Assert.Collection(
+                        model.Selectors,
+                        selector => Assert.Equal("custom-route", selector.AttributeRouteModel.Template));
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_SkipsPagesStartingWithUnderscore()
+        {
+            // Arrange
+            var fileSystem = new VirtualRazorProjectFileSystem();
+            fileSystem.Add(new TestRazorProjectItem("/Pages/Home.cshtml", "@page"));
+            fileSystem.Add(new TestRazorProjectItem("/Pages/_Layout.cshtml", "@page"));
+
+            var optionsManager = Options.Create(new RazorPagesOptions());
+            optionsManager.Value.RootDirectory = "/";
+            var provider = new RazorProjectPageRouteModelProvider(fileSystem, optionsManager, NullLoggerFactory.Instance);
+            var context = new PageRouteModelProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(context.RouteModels,
+                model =>
+                {
+                    Assert.Equal("/Pages/Home.cshtml", model.RelativePath);
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_DiscoversFilesUnderBasePath()
+        {
+            // Arrange
+            var fileSystem = new VirtualRazorProjectFileSystem();
+            fileSystem.Add(new TestRazorProjectItem("/Pages/Index.cshtml", "@page"));
+            fileSystem.Add(new TestRazorProjectItem("/Pages/_Layout.cshtml", "@page"));
+            fileSystem.Add(new TestRazorProjectItem("/NotPages/Index.cshtml", "@page"));
+            fileSystem.Add(new TestRazorProjectItem("/NotPages/_Layout.cshtml", "@page"));
+            fileSystem.Add(new TestRazorProjectItem("/Index.cshtml", "@page"));
+
+            var optionsManager = Options.Create(new RazorPagesOptions());
+            optionsManager.Value.RootDirectory = "/Pages";
+            var provider = new RazorProjectPageRouteModelProvider(fileSystem, optionsManager, NullLoggerFactory.Instance);
+            var context = new PageRouteModelProviderContext();
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(context.RouteModels,
+                model =>
+                {
+                    Assert.Equal("/Pages/Index.cshtml", model.RelativePath);
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_DoesNotAddPageDirectivesIfItAlreadyExists()
+        {
+            // Arrange
+            var fileSystem = new VirtualRazorProjectFileSystem();
+            fileSystem.Add(new TestRazorProjectItem("/Pages/Home.cshtml", "@page"));
+            fileSystem.Add(new TestRazorProjectItem("/Pages/Test.cshtml", "@page"));
+
+            var optionsManager = Options.Create(new RazorPagesOptions());
+            optionsManager.Value.RootDirectory = "/";
+            var provider = new RazorProjectPageRouteModelProvider(fileSystem, optionsManager, NullLoggerFactory.Instance);
+            var context = new PageRouteModelProviderContext();
+            var pageModel = new PageRouteModel("/Pages/Test.cshtml", "/Pages/Test");
+            context.RouteModels.Add(pageModel);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(context.RouteModels,
+                model => Assert.Same(pageModel, model),
+                model =>
+                {
+                    Assert.Equal("/Pages/Home.cshtml", model.RelativePath);
+                    Assert.Equal("/Pages/Home", model.ViewEnginePath);
+                    Assert.Collection(model.Selectors,
+                        selector => Assert.Equal("Pages/Home", selector.AttributeRouteModel.Template));
+                });
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ResponseCacheFilterApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ResponseCacheFilterApplicationModelProviderTest.cs
new file mode 100644
index 0000000000..cf6acab03f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ResponseCacheFilterApplicationModelProviderTest.cs
@@ -0,0 +1,148 @@
+// 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.
+
+using System;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class ResponseCacheFilterApplicationModelProviderTest
+    {
+        [Fact]
+        public void OnProvidersExecuting_DoesNothingIfHandlerHasNoResponseCacheAttributes()
+        {
+            // Arrange
+            var options = Options.Create(new MvcOptions());
+            var provider = new ResponseCacheFilterApplicationModelProvider(options, Mock.Of<ILoggerFactory>());
+            var typeInfo = typeof(PageWithoutResponseCache).GetTypeInfo();
+            var context = GetApplicationProviderContext(typeInfo);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                context.PageApplicationModel.Filters,
+                f => Assert.IsType<PageHandlerPageFilter>(f));
+        }
+
+        private class PageWithoutResponseCache : Page
+        {
+            public ModelWithoutResponseCache Model => null;
+
+            public override Task ExecuteAsync() => throw new NotImplementedException();
+        }
+
+        [Authorize]
+        public class ModelWithoutResponseCache : PageModel
+        {
+            public void OnGet()
+            {
+            }
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_AddsResponseCacheFilters()
+        {
+            // Arrange
+            var options = Options.Create(new MvcOptions());
+            var provider = new ResponseCacheFilterApplicationModelProvider(options, Mock.Of<ILoggerFactory>());
+            var typeInfo = typeof(PageWithResponseCache).GetTypeInfo();
+            var context = GetApplicationProviderContext(typeInfo);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                context.PageApplicationModel.Filters,
+                f => { },
+                f => Assert.IsType<PageHandlerPageFilter>(f),
+                f =>
+                {
+                    var filter = Assert.IsType<ResponseCacheFilter>(f);
+                    Assert.Equal("Abc", filter.VaryByHeader);
+                    Assert.Equal(12, filter.Duration);
+                    Assert.True(filter.NoStore);
+                });
+        }
+
+        private class PageWithResponseCache : Page
+        {
+            public ModelWithResponseCache Model => null;
+
+            public override Task ExecuteAsync() => throw new NotImplementedException();
+        }
+
+        [ResponseCache(Duration = 12, NoStore = true, VaryByHeader = "Abc")]
+        private class ModelWithResponseCache : PageModel
+        {
+            public virtual void OnGet()
+            {
+            }
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_ReadsCacheProfileFromOptions()
+        {
+            // Arrange
+            var options = Options.Create(new MvcOptions());
+            options.Value.CacheProfiles.Add("TestCacheProfile", new CacheProfile
+            {
+                Duration = 14,
+                VaryByQueryKeys = new[] { "A" },
+            });
+            var provider = new ResponseCacheFilterApplicationModelProvider(options, Mock.Of<ILoggerFactory>());
+            var typeInfo = typeof(PageWithResponseCacheProfile).GetTypeInfo();
+            var context = GetApplicationProviderContext(typeInfo);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Collection(
+                context.PageApplicationModel.Filters,
+                f => { },
+                f => Assert.IsType<PageHandlerPageFilter>(f),
+                f =>
+                {
+                    var filter = Assert.IsType<ResponseCacheFilter>(f);
+                    Assert.Equal(new[] { "A" }, filter.VaryByQueryKeys);
+                    Assert.Equal(14, filter.Duration);
+                });
+        }
+
+        private class PageWithResponseCacheProfile : Page
+        {
+            public ModelWithResponseCacheProfile Model => null;
+
+            public override Task ExecuteAsync() => throw new NotImplementedException();
+        }
+
+        [ResponseCache(CacheProfileName = "TestCacheProfile")]
+        private class ModelWithResponseCacheProfile : PageModel
+        {
+            public virtual void OnGet()
+            {
+            }
+        }
+
+        private static PageApplicationModelProviderContext GetApplicationProviderContext(TypeInfo typeInfo)
+        {
+            var defaultProvider = new DefaultPageApplicationModelProvider(
+                TestModelMetadataProvider.CreateDefaultProvider(),
+                Options.Create(new MvcOptions()));
+            var context = new PageApplicationModelProviderContext(new PageActionDescriptor(), typeInfo);
+            defaultProvider.OnProvidersExecuting(context);
+            return context;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/TempDataFilterPageApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/TempDataFilterPageApplicationModelProviderTest.cs
new file mode 100644
index 0000000000..cc2429ca16
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/TempDataFilterPageApplicationModelProviderTest.cs
@@ -0,0 +1,161 @@
+// 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.
+
+using System;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class TempDataFilterPageApplicationModelProviderTest
+    {
+        [Fact]
+        public void OnProvidersExecuting_DoesNotAddFilter_IfTypeHasNoTempDataProperties()
+        {
+            // Arrange
+            var type = typeof(TestPageModel_NoTempDataProperties);
+            var options = Options.Create(new MvcViewOptions());
+            var provider = new TempDataFilterPageApplicationModelProvider(options);
+            var context = CreateProviderContext(type);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Empty(context.PageApplicationModel.Filters);
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_ValidatesTempDataProperties()
+        {
+            // Arrange
+            var type = typeof(TestPageModel_PrivateSet);
+            var expected = $"The '{type.FullName}.Test' property with TempDataAttribute is invalid. A property using TempDataAttribute must have a public getter and setter.";
+
+            var options = Options.Create(new MvcViewOptions());
+            var provider = new TempDataFilterPageApplicationModelProvider(options);
+            var context = CreateProviderContext(type);
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => provider.OnProvidersExecuting(context));
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public void AddsTempDataPropertyFilter_ForTempDataAttributeProperties()
+        {
+            // Arrange
+            var type = typeof(TestPageModel_OneTempDataProperty);
+            var options = Options.Create(new MvcViewOptions());
+            var provider = new TempDataFilterPageApplicationModelProvider(options);
+            var context = CreateProviderContext(type);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var filter = Assert.Single(context.PageApplicationModel.Filters);
+            Assert.IsType<PageSaveTempDataPropertyFilterFactory>(filter);
+        }
+
+        [Fact]
+        public void InitializeFilterFactory_WithExpectedPropertyHelpers_ForTempDataAttributeProperties()
+        {
+            // Arrange
+            var type = typeof(TestPageModel_OneTempDataProperty);
+            var options = Options.Create(new MvcViewOptions());
+            var provider = new TempDataFilterPageApplicationModelProvider(options);
+            var context = CreateProviderContext(type);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var filter = Assert.IsType<PageSaveTempDataPropertyFilterFactory>(Assert.Single(context.PageApplicationModel.Filters));
+            Assert.Collection(
+                filter.Properties,
+                property =>
+                {
+                    Assert.Equal("TempDataProperty-Test2", property.Key);
+                    Assert.Equal(type.GetProperty(nameof(TestPageModel_OneTempDataProperty.Test2)), property.PropertyInfo);
+                });
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_SetsKeyPrefixToEmptyString_IfCompatSwitchIsSet()
+        {
+            // Arrange
+            var type = typeof(TestPageModel_OneTempDataProperty);
+            var options = Options.Create(new MvcViewOptions { SuppressTempDataAttributePrefix = true });
+            var provider = new TempDataFilterPageApplicationModelProvider(options);
+            var context = CreateProviderContext(type);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var filter = Assert.IsType<PageSaveTempDataPropertyFilterFactory>(Assert.Single(context.PageApplicationModel.Filters));
+            Assert.Collection(
+                filter.Properties,
+                property =>
+                {
+                    Assert.Equal("Test2", property.Key);
+                });
+        }
+
+        private static PageApplicationModelProviderContext CreateProviderContext(Type handlerType)
+        {
+            var descriptor = new CompiledPageActionDescriptor();
+            var context = new PageApplicationModelProviderContext(descriptor, typeof(TestPage).GetTypeInfo())
+            {
+                PageApplicationModel = new PageApplicationModel(descriptor, handlerType.GetTypeInfo(), Array.Empty<object>()),
+            };
+
+            return context;
+        }
+
+        private static CompiledPageActionDescriptor CreateDescriptor(Type type)
+        {
+            return new CompiledPageActionDescriptor(new PageActionDescriptor())
+            {
+                PageTypeInfo = typeof(TestPage).GetTypeInfo(),
+                HandlerTypeInfo = type.GetTypeInfo(),
+            };
+        }
+
+        private class TestPage : Page
+        {
+            public object Model => null;
+
+            public override Task ExecuteAsync() => null;
+        }
+
+        public class TestPageModel_NoTempDataProperties
+        {
+            public DateTime? DateTime { get; set; }
+        }
+
+        public class TestPageModel_NullableNonPrimitiveTempDataProperty
+        {
+            [TempData]
+            public DateTime? DateTime { get; set; }
+        }
+
+        public class TestPageModel_OneTempDataProperty
+        {
+            public string Test { get; set; }
+
+            [TempData]
+            public string Test2 { get; set; }
+        }
+
+        public class TestPageModel_PrivateSet
+        {
+            [TempData]
+            public string Test { get; private set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ViewDataAttributePageApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ViewDataAttributePageApplicationModelProviderTest.cs
new file mode 100644
index 0000000000..7caf17e358
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ViewDataAttributePageApplicationModelProviderTest.cs
@@ -0,0 +1,77 @@
+// 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.
+
+using System;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+{
+    public class ViewDataAttributePageApplicationModelProviderTest
+    {
+        [Fact]
+        public void OnProvidersExecuting_DoesNotAddFilter_IfTypeHasNoViewDataProperties()
+        {
+            // Arrange
+            var type = typeof(TestPageModel_NoViewDataProperties);
+            var provider = new ViewDataAttributePageApplicationModelProvider();
+            var context = CreateProviderContext(type);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            Assert.Empty(context.PageApplicationModel.Filters);
+        }
+
+        [Fact]
+        public void AddsViewDataPropertyFilter_ForViewDataAttributeProperties()
+        {
+            // Arrange
+            var type = typeof(TestPageModel_ViewDataProperties);
+            var provider = new ViewDataAttributePageApplicationModelProvider();
+            var context = CreateProviderContext(type);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var filter = Assert.Single(context.PageApplicationModel.Filters);
+            var viewDataFilter = Assert.IsType<PageViewDataAttributeFilterFactory>(filter);
+            Assert.Collection(
+                viewDataFilter.Properties,
+                property => Assert.Equal(nameof(TestPageModel_ViewDataProperties.DateTime), property.PropertyInfo.Name));
+        }
+
+        private static PageApplicationModelProviderContext CreateProviderContext(Type handlerType)
+        {
+            var descriptor = new CompiledPageActionDescriptor();
+            var context = new PageApplicationModelProviderContext(descriptor, typeof(TestPage).GetTypeInfo())
+            {
+                PageApplicationModel = new PageApplicationModel(descriptor, handlerType.GetTypeInfo(), Array.Empty<object>()),
+            };
+
+            return context;
+        }
+
+        private class TestPage : Page
+        {
+            public object Model => null;
+
+            public override Task ExecuteAsync() => null;
+        }
+
+        public class TestPageModel_NoViewDataProperties
+        {
+            public DateTime? DateTime { get; set; }
+        }
+
+        public class TestPageModel_ViewDataProperties
+        {
+            [ViewData]
+            public DateTime? DateTime { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj
new file mode 100644
index 0000000000..26a80f2c7a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.RazorPages\Microsoft.AspNetCore.Mvc.RazorPages.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj" />
+
+    <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="$(MicrosoftExtensionsDiagnosticAdapterPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageModelTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageModelTest.cs
new file mode 100644
index 0000000000..6d0913d394
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageModelTest.cs
@@ -0,0 +1,1946 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    public class PageModelTest
+    {
+        [Fact]
+        public void PageContext_GetsInitialized()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act & Assert
+            Assert.NotNull(pageModel.PageContext);
+        }
+
+        [Fact]
+        public void Redirect_WithParameterUrl_SetsRedirectResultSameUrl()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var url = "/test/url";
+
+            // Act
+            var result = pageModel.Redirect(url);
+
+            // Assert
+            Assert.IsType<RedirectResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void RedirectPermanent_WithParameterUrl_SetsRedirectResultPermanentAndSameUrl()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var url = "/test/url";
+
+            // Act
+            var result = pageModel.RedirectPermanent(url);
+
+            // Assert
+            Assert.IsType<RedirectResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void RedirectPermanent_WithParameterUrl_SetsRedirectResultPreserveMethodAndSameUrl()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var url = "/test/url";
+
+            // Act
+            var result = pageModel.RedirectPreserveMethod(url);
+
+            // Assert
+            Assert.IsType<RedirectResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void RedirectPermanent_WithParameterUrl_SetsRedirectResultPermanentPreserveMethodAndSameUrl()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var url = "/test/url";
+
+            // Act
+            var result = pageModel.RedirectPermanentPreserveMethod(url);
+
+            // Assert
+            Assert.IsType<RedirectResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void Redirect_WithParameter_NullOrEmptyUrl_Throws(string url)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => pageModel.Redirect(url: url), "url", "Value cannot be null or empty.");
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void RedirectPreserveMethod_WithParameter_NullOrEmptyUrl_Throws(string url)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => pageModel.RedirectPreserveMethod(url: url), "url");
+        }
+
+        [Fact]
+        public void LocalRedirect_WithParameterUrl_SetsLocalRedirectResultWithSameUrl()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var url = "/test/url";
+
+            // Act
+            var result = pageModel.LocalRedirect(url);
+
+            // Assert
+            Assert.IsType<LocalRedirectResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void LocalRedirectPermanent_WithParameterUrl_SetsLocalRedirectResultPermanentWithSameUrl()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var url = "/test/url";
+
+            // Act
+            var result = pageModel.LocalRedirectPermanent(url);
+
+            // Assert
+            Assert.IsType<LocalRedirectResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void LocalRedirectPermanent_WithParameterUrl_SetsLocalRedirectResultPreserveMethodWithSameUrl()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var url = "/test/url";
+
+            // Act
+            var result = pageModel.LocalRedirectPreserveMethod(url);
+
+            // Assert
+            Assert.IsType<LocalRedirectResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void LocalRedirectPermanent_WithParameterUrl_SetsLocalRedirectResultPermanentPreservesMethodWithSameUrl()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var url = "/test/url";
+
+            // Act
+            var result = pageModel.LocalRedirectPermanentPreserveMethod(url);
+
+            // Assert
+            Assert.IsType<LocalRedirectResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void LocalRedirect_WithParameter_NullOrEmptyUrl_Throws(string url)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => pageModel.LocalRedirect(localUrl: url), "localUrl");
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void LocalRedirectPreserveMethod_WithParameter_NullOrEmptyUrl_Throws(string url)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => pageModel.LocalRedirectPreserveMethod(localUrl: url), "localUrl");
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void LocalRedirectPermanentPreserveMethod_WithParameter_NullOrEmptyUrl_Throws(string url)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => pageModel.LocalRedirectPermanentPreserveMethod(localUrl: url), "localUrl");
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void RedirectPermanent_WithParameter_NullOrEmptyUrl_Throws(string url)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => pageModel.RedirectPermanent(url: url), "url");
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void RedirectPermanentPreserveMethod_WithParameter_NullOrEmptyUrl_Throws(string url)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => pageModel.RedirectPermanentPreserveMethod(url: url), "url");
+        }
+
+        [Fact]
+        public void RedirectToAction_WithParameterActionName_SetsResultActionName()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var resultTemporary = pageModel.RedirectToAction("SampleAction");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.False(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal("SampleAction", resultTemporary.ActionName);
+        }
+
+        [Fact]
+        public void RedirectToActionPreserveMethod_WithParameterActionName_SetsResultActionName()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var resultTemporary = pageModel.RedirectToActionPreserveMethod(actionName: "SampleAction");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.True(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal("SampleAction", resultTemporary.ActionName);
+        }
+
+        [Fact]
+        public void RedirectToActionPermanent_WithParameterActionName_SetsResultActionNameAndPermanent()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var resultPermanent = pageModel.RedirectToActionPermanent("SampleAction");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.False(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal("SampleAction", resultPermanent.ActionName);
+        }
+
+        [Fact]
+        public void RedirectToActionPermanentPreserveMethod_WithParameterActionName_SetsResultActionNameAndPermanent()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var resultPermanent = pageModel.RedirectToActionPermanentPreserveMethod(actionName: "SampleAction");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal("SampleAction", resultPermanent.ActionName);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        [InlineData("SampleController")]
+        public void RedirectToAction_WithParameterActionAndControllerName_SetsEqualNames(string pageModelName)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var resultTemporary = pageModel.RedirectToAction("SampleAction", pageModelName);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.False(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal("SampleAction", resultTemporary.ActionName);
+            Assert.Equal(pageModelName, resultTemporary.ControllerName);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        [InlineData("SampleController")]
+        public void RedirectToActionPreserveMethod_WithParameterActionAndControllerName_SetsEqualNames(string pageModelName)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var resultTemporary = pageModel.RedirectToActionPreserveMethod(actionName: "SampleAction", controllerName: pageModelName);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.True(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal("SampleAction", resultTemporary.ActionName);
+            Assert.Equal(pageModelName, resultTemporary.ControllerName);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        [InlineData("SampleController")]
+        public void RedirectToActionPermanent_WithParameterActionAndControllerName_SetsEqualNames(string pageModelName)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var resultPermanent = pageModel.RedirectToActionPermanent("SampleAction", pageModelName);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.False(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal("SampleAction", resultPermanent.ActionName);
+            Assert.Equal(pageModelName, resultPermanent.ControllerName);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        [InlineData("SampleController")]
+        public void RedirectToActionPermanentPreserveMethod_WithParameterActionAndControllerName_SetsEqualNames(string pageModelName)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var resultPermanent = pageModel.RedirectToActionPermanentPreserveMethod(actionName: "SampleAction", controllerName: pageModelName);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal("SampleAction", resultPermanent.ActionName);
+            Assert.Equal(pageModelName, resultPermanent.ControllerName);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToAction_WithParameterActionControllerRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var resultTemporary = pageModel.RedirectToAction("SampleAction", "SampleController", routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.False(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal("SampleAction", resultTemporary.ActionName);
+            Assert.Equal("SampleController", resultTemporary.ControllerName);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPreserveMethod_WithParameterActionControllerRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var resultTemporary = pageModel.RedirectToActionPreserveMethod(
+                actionName: "SampleAction",
+                controllerName: "SampleController",
+                routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.True(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal("SampleAction", resultTemporary.ActionName);
+            Assert.Equal("SampleController", resultTemporary.ControllerName);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPermanent_WithParameterActionControllerRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var resultPermanent = pageModel.RedirectToActionPermanent(
+                "SampleAction",
+                "SampleController",
+                routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.False(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal("SampleAction", resultPermanent.ActionName);
+            Assert.Equal("SampleController", resultPermanent.ControllerName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPermanentPreserveMethod_WithParameterActionControllerRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var resultPermanent = pageModel.RedirectToActionPermanentPreserveMethod(
+                actionName: "SampleAction",
+                controllerName: "SampleController",
+                routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal("SampleAction", resultPermanent.ActionName);
+            Assert.Equal("SampleController", resultPermanent.ControllerName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToAction_WithParameterActionAndRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var resultTemporary = pageModel.RedirectToAction(actionName: null, routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.False(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Null(resultTemporary.ActionName);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPreserveMethod_WithParameterActionAndRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var resultTemporary = pageModel.RedirectToActionPreserveMethod(actionName: null, routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.True(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Null(resultTemporary.ActionName);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToAction_WithParameterActionAndControllerAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var expectedAction = "Action";
+            var expectedController = "Home";
+            var expectedFragment = "test";
+
+            // Act
+            var result = pageModel.RedirectToAction("Action", "Home", routeValues, "test");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Equal(expectedAction, result.ActionName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedController, result.ControllerName);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPreserveMethod_WithParameterActionAndControllerAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var expectedAction = "Action";
+            var expectedController = "Home";
+            var expectedFragment = "test";
+
+            // Act
+            var result = pageModel.RedirectToActionPreserveMethod("Action", "Home", routeValues, "test");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Equal(expectedAction, result.ActionName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedController, result.ControllerName);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPermanent_WithParameterActionAndRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var resultPermanent = pageModel.RedirectToActionPermanent(null, routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.False(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Null(resultPermanent.ActionName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPermanentPreserveMethod_WithParameterActionAndRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var resultPermanent = pageModel.RedirectToActionPermanentPreserveMethod(actionName: null, routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Null(resultPermanent.ActionName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPermanent_WithParameterActionAndControllerAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var expectedAction = "Action";
+            var expectedController = "Home";
+            var expectedFragment = "test";
+
+            // Act
+            var result = pageModel.RedirectToActionPermanent("Action", "Home", routeValues, fragment: "test");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Equal(expectedAction, result.ActionName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedController, result.ControllerName);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPermanentPreserveMethod_WithParameterActionAndControllerAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var expectedAction = "Action";
+            var expectedController = "Home";
+            var expectedFragment = "test";
+
+            // Act
+            var result = pageModel.RedirectToActionPermanentPreserveMethod(
+                actionName: "Action",
+                controllerName: "Home",
+                routeValues: routeValues,
+                fragment: "test");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Equal(expectedAction, result.ActionName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedController, result.ControllerName);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoute_WithParameterRouteValues_SetsResultEqualRouteValues(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var resultTemporary = pageModel.RedirectToRoute(routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultTemporary);
+            Assert.False(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePreserveMethod_WithParameterRouteValues_SetsResultEqualRouteValues(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var resultTemporary = pageModel.RedirectToRoutePreserveMethod(routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultTemporary);
+            Assert.True(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoute_WithParameterRouteNameAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var expectedRoute = "TestRoute";
+            var expectedFragment = "test";
+
+            // Act
+            var result = pageModel.RedirectToRoute("TestRoute", routeValues, "test");
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Equal(expectedRoute, result.RouteName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePreserveMethod_WithParameterRouteNameAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var expectedRoute = "TestRoute";
+            var expectedFragment = "test";
+
+            // Act
+            var result = pageModel.RedirectToRoutePreserveMethod(routeName: "TestRoute", routeValues: routeValues, fragment: "test");
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Equal(expectedRoute, result.RouteName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePermanent_WithParameterRouteValues_SetsResultEqualRouteValuesAndPermanent(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var resultPermanent = pageModel.RedirectToRoutePermanent(routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultPermanent);
+            Assert.False(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePermanentPreserveMethod_WithParameterRouteValues_SetsResultEqualRouteValuesAndPermanent(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var resultPermanent = pageModel.RedirectToRoutePermanentPreserveMethod(routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePermanent_WithParameterRouteNameAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var expectedRoute = "TestRoute";
+            var expectedFragment = "test";
+
+            // Act
+            var result = pageModel.RedirectToRoutePermanent("TestRoute", routeValues, "test");
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Equal(expectedRoute, result.RouteName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePermanentPreserveMethod_WithParameterRouteNameAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var expectedRoute = "TestRoute";
+            var expectedFragment = "test";
+
+            // Act
+            var result = pageModel.RedirectToRoutePermanentPreserveMethod(routeName: "TestRoute", routeValues: routeValues, fragment: "test");
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Equal(expectedRoute, result.RouteName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Fact]
+        public void RedirectToRoute_WithParameterRouteName_SetsResultSameRouteName()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultTemporary = pageModel.RedirectToRoute(routeName);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultTemporary);
+            Assert.False(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Same(routeName, resultTemporary.RouteName);
+        }
+
+        [Fact]
+        public void RedirectToRoutePreserveMethod_WithParameterRouteName_SetsResultSameRouteName()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var routeName = "CustomRouteName";
+
+            // Act;
+            var resultTemporary = pageModel.RedirectToRoutePreserveMethod(routeName: routeName);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultTemporary);
+            Assert.True(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Same(routeName, resultTemporary.RouteName);
+        }
+
+        [Fact]
+        public void RedirectToRoutePermanent_WithParameterRouteName_SetsResultSameRouteNameAndPermanent()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultPermanent = pageModel.RedirectToRoutePermanent(routeName);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultPermanent);
+            Assert.False(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Same(routeName, resultPermanent.RouteName);
+        }
+
+        [Fact]
+        public void RedirectToRoutePermanentPreserveMethod_WithParameterRouteName_SetsResultSameRouteNameAndPermanent()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultPermanent = pageModel.RedirectToRoutePermanentPreserveMethod(routeName: routeName);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Same(routeName, resultPermanent.RouteName);
+        }
+
+        public static IEnumerable<object[]> RedirectTestData
+        {
+            get
+            {
+                yield return new object[]
+                {
+                    null,
+                    null,
+                };
+
+                yield return new object[]
+                {
+                    new Dictionary<string, object> { { "hello", "world" } },
+                    new RouteValueDictionary() { { "hello", "world" } },
+                };
+
+                var expected2 = new Dictionary<string, object>
+                {
+                    { "test", "case" },
+                    { "sample", "route" },
+                };
+
+                yield return new object[]
+                {
+                    new RouteValueDictionary(expected2),
+                    new RouteValueDictionary(expected2),
+                };
+            }
+        }
+
+        [Fact]
+        public void RedirectToPage_WithNoArguments()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var result = pageModel.RedirectToPage();
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Null(result.PageName);
+        }
+
+        [Fact]
+        public void RedirectToPage_WithPageName()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var pageName = "/Page";
+
+            // Act
+            var result = pageModel.RedirectToPage(pageName);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+        }
+
+        [Fact]
+        public void RedirectToPage_WithRouteValues()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var routeValues = new { key = "value" };
+
+            // Act
+            var result = pageModel.RedirectToPage(routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Null(result.PageName);
+            Assert.Collection(
+                result.RouteValues,
+                item =>
+                {
+                    Assert.Equal("key", item.Key);
+                    Assert.Equal("value", item.Value);
+                });
+        }
+
+        [Fact]
+        public void RedirectToPage_WithPageNameAndHandler()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var pageName = "/Page-Name";
+            var pageHandler = "page-handler";
+
+            // Act
+            var result = pageModel.RedirectToPage(pageName, pageHandler);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Equal(pageHandler, result.PageHandler);
+        }
+
+        [Fact]
+        public void RedirectToPage_WithPageNameAndRouteValues()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var pageName = "/Page-Name";
+            var routeVaues = new { key = "value" };
+
+            // Act
+            var result = pageModel.RedirectToPage(pageName, routeVaues);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Collection(
+                result.RouteValues,
+                item =>
+                {
+                    Assert.Equal("key", item.Key);
+                    Assert.Equal("value", item.Value);
+                });
+        }
+
+        [Fact]
+        public void RedirectToPage_WithPageNameHandlerAndFragment()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var pageName = "/Page-Name";
+            var pageHandler = "page-handler";
+            var fragment = "fragment";
+
+            // Act
+            var result = pageModel.RedirectToPage(pageName, pageHandler, fragment);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Equal(pageHandler, result.PageHandler);
+            Assert.Equal(fragment, result.Fragment);
+        }
+
+        [Fact]
+        public void RedirectToPage_WithPageNameRouteValuesHandlerAndFragment()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var pageName = "/Page-Name";
+            var pageHandler = "page-handler";
+            var fragment = "fragment";
+            var routeValues = new { key = "value" };
+
+            // Act
+            var result = pageModel.RedirectToPage(pageName, pageHandler, routeValues, fragment);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Equal(pageHandler, result.PageHandler);
+            Assert.Collection(
+                result.RouteValues,
+                item =>
+                {
+                    Assert.Equal("key", item.Key);
+                    Assert.Equal("value", item.Value);
+                });
+            Assert.Equal(fragment, result.Fragment);
+        }
+
+        [Fact]
+        public void RedirectToPagePermanent_WithPageName()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var pageName = "/Page-Name";
+
+            // Act
+            var result = pageModel.RedirectToPagePermanent(pageName);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.True(result.Permanent);
+        }
+
+        [Fact]
+        public void RedirectToPagePermanent_WithPageNameAndPageHandler()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var pageName = "/Page-Name";
+            var pageHandler = "page-handler";
+
+            // Act
+            var result = pageModel.RedirectToPagePermanent(pageName, pageHandler);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Equal(pageHandler, result.PageHandler);
+            Assert.True(result.Permanent);
+        }
+
+        [Fact]
+        public void RedirectToPagePermanent_WithPageNameAndRouteValues()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var pageName = "/Page-Name";
+            var routeValues = new { key = "value" };
+
+            // Act
+            var result = pageModel.RedirectToPagePermanent(pageName, routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Collection(
+                result.RouteValues,
+                item =>
+                {
+                    Assert.Equal("key", item.Key);
+                    Assert.Equal("value", item.Value);
+                });
+            Assert.True(result.Permanent);
+        }
+
+        [Fact]
+        public void RedirectToPagePermanent_WithPageNamePageHandlerAndRouteValues()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var pageName = "/Page-Name";
+            var pageHandler = "page-handler";
+            var routeValues = new { key = "value" };
+
+            // Act
+            var result = pageModel.RedirectToPagePermanent(pageName, pageHandler, routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Equal(pageHandler, result.PageHandler);
+            Assert.Collection(
+                result.RouteValues,
+                item =>
+                {
+                    Assert.Equal("key", item.Key);
+                    Assert.Equal("value", item.Value);
+                });
+            Assert.True(result.Permanent);
+        }
+
+        [Fact]
+        public void RedirectToPagePermanent_WithPageNamePageHandlerAndFragment()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var pageName = "/Page-Name";
+            var pageHandler = "page-handler";
+            var fragment = "fragment";
+
+            // Act
+            var result = pageModel.RedirectToPagePermanent(pageName, pageHandler, fragment);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Equal(pageHandler, result.PageHandler);
+            Assert.Equal(fragment, result.Fragment);
+            Assert.True(result.Permanent);
+        }
+
+        [Fact]
+        public void RedirectToPagePermanent_WithPageNamePageHandlerRouteValuesAndFragment()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var pageName = "/Page-Name";
+            var pageHandler = "page-handler";
+            var routeValues = new { key = "value" };
+            var fragment = "fragment";
+
+            // Act
+            var result = pageModel.RedirectToPagePermanent(pageName, pageHandler, routeValues, fragment);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Equal(pageHandler, result.PageHandler);
+            Assert.Collection(
+                result.RouteValues,
+                item =>
+                {
+                    Assert.Equal("key", item.Key);
+                    Assert.Equal("value", item.Value);
+                });
+            Assert.Equal(fragment, result.Fragment);
+            Assert.True(result.Permanent);
+        }
+
+        [Fact]
+        public void RedirectToPagePreserveMethod_WithParameterUrl_SetsRedirectResultPreserveMethod()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var url = "/test/url";
+
+            // Act
+            var result = pageModel.RedirectToPagePreserveMethod(url);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Same(url, result.PageName);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToPagePreserveMethod_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var pageName = "CustomRouteName";
+
+            // Act
+            var resultPermanent = pageModel.RedirectToPagePreserveMethod(pageName, routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.False(resultPermanent.Permanent);
+            Assert.Same(pageName, resultPermanent.PageName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToPagePermanentPreserveMethod_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultPermanent = pageModel.RedirectToPagePermanentPreserveMethod(routeName, routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Same(routeName, resultPermanent.PageName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoute_WithParameterRouteNameAndRouteValues_SetsResultSameRouteNameAndRouteValues(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultTemporary = pageModel.RedirectToRoute(routeName, routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultTemporary);
+            Assert.False(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Same(routeName, resultTemporary.RouteName);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePreserveMethod_WithParameterRouteNameAndRouteValues_SetsResultSameRouteNameAndRouteValues(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultTemporary = pageModel.RedirectToRoutePreserveMethod(routeName: routeName, routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultTemporary);
+            Assert.True(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Same(routeName, resultTemporary.RouteName);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePermanent_WithParameterRouteNameAndRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultPermanent = pageModel.RedirectToRoutePermanent(routeName, routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultPermanent);
+            Assert.False(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Same(routeName, resultPermanent.RouteName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePermanentPreserveMethod_WithParameterRouteNameAndRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultPermanent = pageModel.RedirectToRoutePermanentPreserveMethod(routeName: routeName, routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Same(routeName, resultPermanent.RouteName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Fact]
+        public void File_WithContents()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var fileContents = new byte[0];
+
+            // Act
+            var result = pageModel.File(fileContents, "application/pdf");
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Same(fileContents, result.FileContents);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal(string.Empty, result.FileDownloadName);
+        }
+
+        [Fact]
+        public void File_WithContentsAndFileDownloadName()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var fileContents = new byte[0];
+
+            // Act
+            var result = pageModel.File(fileContents, "application/pdf", "someDownloadName");
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Same(fileContents, result.FileContents);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal("someDownloadName", result.FileDownloadName);
+        }
+
+        [Fact]
+        public void File_WithPath()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var path = Path.GetFullPath("somepath");
+
+            // Act
+            var result = pageModel.File(path, "application/pdf");
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Equal(path, result.FileName);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal(string.Empty, result.FileDownloadName);
+        }
+
+        [Fact]
+        public void File_WithPathAndFileDownloadName()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+            var path = Path.GetFullPath("somepath");
+
+            // Act
+            var result = pageModel.File(path, "application/pdf", "someDownloadName");
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Equal(path, result.FileName);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal("someDownloadName", result.FileDownloadName);
+        }
+
+        [Fact]
+        public void File_WithStream()
+        {
+            // Arrange
+            var mockHttpContext = new Mock<HttpContext>();
+            mockHttpContext.Setup(x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()));
+
+            var pageModel = new TestPageModel()
+            {
+                PageContext = new PageContext
+                {
+                    HttpContext = mockHttpContext.Object
+                }
+            };
+
+            var fileStream = Stream.Null;
+
+            // Act
+            var result = pageModel.File(fileStream, "application/pdf");
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Same(fileStream, result.FileStream);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal(string.Empty, result.FileDownloadName);
+        }
+
+        [Fact]
+        public void File_WithStreamAndFileDownloadName()
+        {
+            // Arrange
+            var mockHttpContext = new Mock<HttpContext>();
+
+            var pageModel = new TestPageModel()
+            {
+                PageContext = new PageContext
+                {
+                    HttpContext = mockHttpContext.Object
+                }
+            };
+
+            var fileStream = Stream.Null;
+
+            // Act
+            var result = pageModel.File(fileStream, "application/pdf", "someDownloadName");
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Same(fileStream, result.FileStream);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal("someDownloadName", result.FileDownloadName);
+        }
+
+        [Fact]
+        public void Unauthorized_SetsStatusCode()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var result = pageModel.Unauthorized();
+
+            // Assert
+            Assert.IsType<UnauthorizedResult>(result);
+            Assert.Equal(StatusCodes.Status401Unauthorized, result.StatusCode);
+        }
+
+        [Fact]
+        public void BadRequest_SetsStatusCode()
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var result = page.BadRequest();
+
+            // Assert
+            Assert.IsType<BadRequestResult>(result);
+            Assert.Equal(StatusCodes.Status400BadRequest, result.StatusCode);
+        }
+
+        [Fact]
+        public void BadRequest_SetsStatusCodeAndResponseContent()
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var result = page.BadRequest("Test Content");
+
+            // Assert
+            Assert.IsType<BadRequestObjectResult>(result);
+            Assert.Equal(StatusCodes.Status400BadRequest, result.StatusCode);
+            Assert.Equal("Test Content", result.Value);
+        }
+
+        [Fact]
+        public void NotFound_SetsStatusCode()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var result = pageModel.NotFound();
+
+            // Assert
+            Assert.IsType<NotFoundResult>(result);
+            Assert.Equal(StatusCodes.Status404NotFound, result.StatusCode);
+        }
+
+        [Fact]
+        public void NotFound_SetsStatusCodeAndResponseContent()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var result = pageModel.NotFound("Test Content");
+
+            // Assert
+            Assert.IsType<NotFoundObjectResult>(result);
+            Assert.Equal(StatusCodes.Status404NotFound, result.StatusCode);
+            Assert.Equal("Test Content", result.Value);
+        }
+
+        [Fact]
+        public void Content_WithParameterContentString_SetsResultContent()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var actualContentResult = pageModel.Content("TestContent");
+
+            // Assert
+            Assert.IsType<ContentResult>(actualContentResult);
+            Assert.Equal("TestContent", actualContentResult.Content);
+            Assert.Null(actualContentResult.ContentType);
+        }
+
+        [Fact]
+        public void Content_WithParameterContentStringAndContentType_SetsResultContentAndContentType()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var actualContentResult = pageModel.Content("TestContent", "text/plain");
+
+            // Assert
+            Assert.IsType<ContentResult>(actualContentResult);
+            Assert.Equal("TestContent", actualContentResult.Content);
+            Assert.Null(MediaType.GetEncoding(actualContentResult.ContentType));
+            Assert.Equal("text/plain", actualContentResult.ContentType.ToString());
+        }
+
+        [Fact]
+        public void Content_WithParameterContentAndTypeAndEncoding_SetsResultContentAndTypeAndEncoding()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var actualContentResult = pageModel.Content("TestContent", "text/plain", Encoding.UTF8);
+
+            // Assert
+            Assert.IsType<ContentResult>(actualContentResult);
+            Assert.Equal("TestContent", actualContentResult.Content);
+            Assert.Same(Encoding.UTF8, MediaType.GetEncoding(actualContentResult.ContentType));
+            Assert.Equal("text/plain; charset=utf-8", actualContentResult.ContentType.ToString());
+        }
+
+        [Fact]
+        public void Content_NoContentType_DefaultEncodingIsUsed()
+        {
+            // Arrange
+            var contentPageModel = new ContentPageModel();
+
+            // Act
+            var contentResult = (ContentResult)contentPageModel.Content_WithNoEncoding();
+
+            // Assert
+            // The default content type of ContentResult is used when the result is executed.
+            Assert.Null(contentResult.ContentType);
+        }
+
+        [Fact]
+        public void Content_InvalidCharset_DefaultEncodingIsUsed()
+        {
+            // Arrange
+            var contentPageModel = new ContentPageModel();
+            var contentType = "text/xml; charset=invalid; p1=p1-value";
+
+            // Act
+            var contentResult = (ContentResult)contentPageModel.Content_WithInvalidCharset();
+
+            // Assert
+            Assert.NotNull(contentResult.ContentType);
+            Assert.Equal(contentType, contentResult.ContentType.ToString());
+            // The default encoding of ContentResult is used when this result is executed.
+            Assert.Null(MediaType.GetEncoding(contentResult.ContentType));
+        }
+
+        [Fact]
+        public void Content_CharsetAndEncodingProvided_EncodingIsUsed()
+        {
+            // Arrange
+            var contentPageModel = new ContentPageModel();
+            var contentType = "text/xml; charset=us-ascii; p1=p1-value";
+
+            // Act
+            var contentResult = (ContentResult)contentPageModel.Content_WithEncodingInCharset_AndEncodingParameter();
+
+            // Assert
+            MediaTypeAssert.Equal(contentType, contentResult.ContentType);
+        }
+
+        [Fact]
+        public void Content_CharsetInContentType_IsUsedForEncoding()
+        {
+            // Arrange
+            var contentPageModel = new ContentPageModel();
+            var contentType = "text/xml; charset=us-ascii; p1=p1-value";
+
+            // Act
+            var contentResult = (ContentResult)contentPageModel.Content_WithEncodingInCharset();
+
+            // Assert
+            Assert.Equal(contentType, contentResult.ContentType);
+        }
+
+        [Fact]
+        public void StatusCode_SetObject()
+        {
+            // Arrange
+            var statusCode = 204;
+            var value = new { Value = 42 };
+
+            var statusCodeController = new StatusCodePageModel();
+
+            // Act
+            var result = (ObjectResult)statusCodeController.StatusCode_Object(statusCode, value);
+
+            // Assert
+            Assert.Equal(statusCode, result.StatusCode);
+            Assert.Equal(value, result.Value);
+        }
+
+        [Fact]
+        public void StatusCode_SetObjectNull()
+        {
+            // Arrange
+            var statusCode = 204;
+            object value = null;
+
+            var statusCodeController = new StatusCodePageModel();
+
+            // Act
+            var result = statusCodeController.StatusCode_Object(statusCode, value);
+
+            // Assert
+            Assert.Equal(statusCode, result.StatusCode);
+            Assert.Equal(value, result.Value);
+        }
+
+        [Fact]
+        public void StatusCode_SetsStatusCode()
+        {
+            // Arrange
+            var statusCode = 205;
+            var statusCodeModel = new StatusCodePageModel();
+
+            // Act
+            var result = statusCodeModel.StatusCode_Int(statusCode);
+
+            // Assert
+            Assert.Equal(statusCode, result.StatusCode);
+        }
+
+        [Fact]
+        public void PageModelPropertiesArePopulatedFromContext()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            var modelState = new ModelStateDictionary();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new PageActionDescriptor(), modelState);
+            var modelMetadataProvider = new EmptyModelMetadataProvider();
+            var viewData = new ViewDataDictionary(modelMetadataProvider, modelState);
+            var pageContext = new PageContext(actionContext)
+            {
+                ViewData = viewData,
+            };
+
+            var page = new TestPage
+            {
+                PageContext = pageContext,
+            };
+
+            var pageModel = new TestPageModel
+            {
+                PageContext = pageContext,
+            };
+
+            // Act & Assert
+            Assert.Same(pageContext, pageModel.PageContext);
+            Assert.Same(httpContext, pageModel.HttpContext);
+            Assert.Same(httpContext.Request, pageModel.Request);
+            Assert.Same(httpContext.Response, pageModel.Response);
+            Assert.Same(modelState, pageModel.ModelState);
+            Assert.Same(viewData, pageModel.ViewData);
+        }
+
+        [Fact]
+        public void UrlHelperIsSet()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            var urlHelper = Mock.Of<IUrlHelper>();
+            var urlHelperFactory = new Mock<IUrlHelperFactory>();
+            urlHelperFactory.Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>()))
+                .Returns(urlHelper);
+            httpContext.RequestServices = new ServiceCollection()
+                .AddSingleton(urlHelperFactory.Object)
+                .BuildServiceProvider();
+            var actionContext = new ActionContext
+            {
+                HttpContext = httpContext,
+            };
+            var pageContext = new PageContext
+            {
+                HttpContext = httpContext,
+            };
+
+            var pageModel = new TestPageModel
+            {
+                PageContext = pageContext,
+            };
+
+            // Act & Assert
+            Assert.Same(urlHelper, pageModel.Url);
+        }
+
+        [Fact]
+        public void Redirect_ReturnsARedirectResult()
+        {
+            // Arrange
+            var pageModel = new TestPageModel();
+
+            // Act
+            var result = pageModel.Redirect("test-url");
+
+            // Assert
+            var redirectResult = Assert.IsType<RedirectResult>(result);
+            Assert.Equal("test-url", redirectResult.Url);
+        }
+
+        [Fact]
+        public void View_ReturnsPageViewResult()
+        {
+            // Arrange
+            var page = new TestPage();
+            var pageModel = new TestPageModel
+            {
+                PageContext = new PageContext()
+            };
+
+            // Act
+            var result = pageModel.Page();
+
+            // Assert
+            var pageResult = Assert.IsType<PageResult>(result);
+            Assert.Null(pageResult.Page); // This is set by the invoker
+        }
+
+        [Fact]
+        public async Task AsyncPageHandlerExecutingMethod_InvokeSyncMethods()
+        {
+            // Arrange
+            var pageContext = new PageContext(new ActionContext(
+                new DefaultHttpContext(),
+                new RouteData(),
+                new PageActionDescriptor(),
+                new ModelStateDictionary()));
+            var pageHandlerExecutingContext = new PageHandlerExecutingContext(
+                pageContext,
+                Array.Empty<IFilterMetadata>(),
+                new HandlerMethodDescriptor(),
+                new Dictionary<string, object>(),
+                new object());
+            var pageHandlerExecutedContext = new PageHandlerExecutedContext(
+                pageContext,
+                Array.Empty<IFilterMetadata>(),
+                new HandlerMethodDescriptor(),
+                new object());
+            var testPageModel = new Mock<PageModel> { CallBase = true };
+            testPageModel.Setup(p => p.OnPageHandlerExecuting(pageHandlerExecutingContext))
+                .Verifiable();
+            testPageModel.Setup(p => p.OnPageHandlerExecuted(pageHandlerExecutedContext))
+                .Verifiable();
+
+            // Act
+            await testPageModel.Object.OnPageHandlerExecutionAsync(
+                pageHandlerExecutingContext,
+                () => Task.FromResult(pageHandlerExecutedContext));
+
+            testPageModel.Verify();
+        }
+
+        [Fact]
+        public async Task AsyncPageHandlerExecutingMethod__DoesNotInvokeExecutedMethod_IfResultIsSet()
+        {
+            // Arrange
+            var pageContext = new PageContext(new ActionContext(
+                new DefaultHttpContext(),
+                new RouteData(),
+                new PageActionDescriptor(),
+                new ModelStateDictionary()));
+            var pageHandlerExecutingContext = new PageHandlerExecutingContext(
+                pageContext,
+                Array.Empty<IFilterMetadata>(),
+                new HandlerMethodDescriptor(),
+                new Dictionary<string, object>(),
+                new object());
+            var pageHandlerExecutedContext = new PageHandlerExecutedContext(
+                pageContext,
+                Array.Empty<IFilterMetadata>(),
+                new HandlerMethodDescriptor(),
+                new object());
+            var testPageModel = new Mock<PageModel>() { CallBase = true };
+            testPageModel.Setup(p => p.OnPageHandlerExecuting(pageHandlerExecutingContext))
+                .Callback((PageHandlerExecutingContext context) => context.Result = new PageResult())
+                .Verifiable();
+            testPageModel.Setup(p => p.OnPageHandlerExecuted(pageHandlerExecutedContext))
+                .Throws(new Exception("Shouldn't be called"));
+
+            // Act
+            await testPageModel.Object.OnPageHandlerExecutionAsync(
+                pageHandlerExecutingContext,
+                () => Task.FromResult(pageHandlerExecutedContext));
+
+            testPageModel.Verify();
+        }
+
+        [Fact]
+        public async Task AsyncPageHandlerSelectingMethod_InvokeSyncMethods()
+        {
+            // Arrange
+            var pageContext = new PageContext(new ActionContext(
+                new DefaultHttpContext(),
+                new RouteData(),
+                new PageActionDescriptor(),
+                new ModelStateDictionary()));
+            var pageHandlerSelectedContext = new PageHandlerSelectedContext(
+                pageContext,
+                Array.Empty<IFilterMetadata>(),
+                new object());
+
+            var testPageModel = new Mock<PageModel> { CallBase = true };
+            testPageModel.Setup(p => p.OnPageHandlerSelected(pageHandlerSelectedContext))
+                .Verifiable();
+
+            // Act
+            await testPageModel.Object.OnPageHandlerSelectionAsync(pageHandlerSelectedContext);
+
+            testPageModel.Verify();
+        }
+
+        private class ContentPageModel : PageModel
+        {
+            public IActionResult Content_WithNoEncoding()
+            {
+                return Content("Hello!!");
+            }
+
+            public IActionResult Content_WithEncodingInCharset()
+            {
+                return Content("Hello!!", "text/xml; charset=us-ascii; p1=p1-value");
+            }
+
+            public IActionResult Content_WithInvalidCharset()
+            {
+                return Content("Hello!!", "text/xml; charset=invalid; p1=p1-value");
+            }
+
+            public IActionResult Content_WithEncodingInCharset_AndEncodingParameter()
+            {
+                return Content("Hello!!", "text/xml; charset=invalid; p1=p1-value", Encoding.ASCII);
+            }
+        }
+
+        private class StatusCodePageModel : PageModel
+        {
+            public StatusCodeResult StatusCode_Int(int statusCode)
+            {
+                return StatusCode(statusCode);
+            }
+
+            public ObjectResult StatusCode_Object(int statusCode, object value)
+            {
+                return StatusCode(statusCode, value);
+            }
+        }
+
+        private class TestPageModel : PageModel
+        {
+        }
+
+        private class TestPage : Page
+        {
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageTest.cs
new file mode 100644
index 0000000000..aaefccfcc9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageTest.cs
@@ -0,0 +1,1785 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    public class PageTest
+    {
+        [Fact]
+        public void PagePropertiesArePopulatedFromContext()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            var modelState = new ModelStateDictionary();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new PageActionDescriptor(), modelState);
+            var modelMetadataProvider = new EmptyModelMetadataProvider();
+            var viewData = new ViewDataDictionary(modelMetadataProvider, modelState);
+            var tempData = Mock.Of<ITempDataDictionary>();
+
+            var pageContext = new PageContext(actionContext)
+            {
+                ViewData = viewData,
+            };
+            var viewContext = new ViewContext(pageContext, NullView.Instance, viewData, tempData, TextWriter.Null, new HtmlHelperOptions());
+
+            var page = new TestPage
+            {
+                PageContext = pageContext,
+                ViewContext = viewContext,
+            };
+
+            // Act & Assert
+            Assert.Same(pageContext, page.PageContext);
+            Assert.Same(viewContext, page.ViewContext);
+            Assert.Same(httpContext, page.HttpContext);
+            Assert.Same(httpContext.Request, page.Request);
+            Assert.Same(httpContext.Response, page.Response);
+            Assert.Same(modelState, page.ModelState);
+            Assert.Same(tempData, page.TempData);
+        }
+
+        [Fact]
+        public void Redirect_WithParameterUrl_SetsRedirectResultSameUrl()
+        {
+            // Arrange
+            var page = new TestPage();
+            var url = "/test/url";
+
+            // Act
+            var result = page.Redirect(url);
+
+            // Assert
+            Assert.IsType<RedirectResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void RedirectPermanent_WithParameterUrl_SetsRedirectResultPermanentAndSameUrl()
+        {
+            // Arrange
+            var page = new TestPage();
+            var url = "/test/url";
+
+            // Act
+            var result = page.RedirectPermanent(url);
+
+            // Assert
+            Assert.IsType<RedirectResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void RedirectPermanent_WithParameterUrl_SetsRedirectResultPreserveMethodAndSameUrl()
+        {
+            // Arrange
+            var page = new TestPage();
+            var url = "/test/url";
+
+            // Act
+            var result = page.RedirectPreserveMethod(url);
+
+            // Assert
+            Assert.IsType<RedirectResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void RedirectPermanent_WithParameterUrl_SetsRedirectResultPermanentPreserveMethodAndSameUrl()
+        {
+            // Arrange
+            var page = new TestPage();
+            var url = "/test/url";
+
+            // Act
+            var result = page.RedirectPermanentPreserveMethod(url);
+
+            // Assert
+            Assert.IsType<RedirectResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void Redirect_WithParameter_NullOrEmptyUrl_Throws(string url)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => page.Redirect(url: url), "url");
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void RedirectPreserveMethod_WithParameter_NullOrEmptyUrl_Throws(string url)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => page.RedirectPreserveMethod(url: url), "url");
+        }
+
+        [Fact]
+        public void LocalRedirect_WithParameterUrl_SetsLocalRedirectResultWithSameUrl()
+        {
+            // Arrange
+            var page = new TestPage();
+            var url = "/test/url";
+
+            // Act
+            var result = page.LocalRedirect(url);
+
+            // Assert
+            Assert.IsType<LocalRedirectResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void LocalRedirectPermanent_WithParameterUrl_SetsLocalRedirectResultPermanentWithSameUrl()
+        {
+            // Arrange
+            var page = new TestPage();
+            var url = "/test/url";
+
+            // Act
+            var result = page.LocalRedirectPermanent(url);
+
+            // Assert
+            Assert.IsType<LocalRedirectResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void LocalRedirectPermanent_WithParameterUrl_SetsLocalRedirectResultPreserveMethodWithSameUrl()
+        {
+            // Arrange
+            var page = new TestPage();
+            var url = "/test/url";
+
+            // Act
+            var result = page.LocalRedirectPreserveMethod(url);
+
+            // Assert
+            Assert.IsType<LocalRedirectResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Fact]
+        public void LocalRedirectPermanent_WithParameterUrl_SetsLocalRedirectResultPermanentPreservesMethodWithSameUrl()
+        {
+            // Arrange
+            var page = new TestPage();
+            var url = "/test/url";
+
+            // Act
+            var result = page.LocalRedirectPermanentPreserveMethod(url);
+
+            // Assert
+            Assert.IsType<LocalRedirectResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Same(url, result.Url);
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void LocalRedirect_WithParameter_NullOrEmptyUrl_Throws(string url)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => page.LocalRedirect(localUrl: url), "localUrl");
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void LocalRedirectPreserveMethod_WithParameter_NullOrEmptyUrl_Throws(string url)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => page.LocalRedirectPreserveMethod(localUrl: url), "localUrl");
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void LocalRedirectPermanentPreserveMethod_WithParameter_NullOrEmptyUrl_Throws(string url)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => page.LocalRedirectPermanentPreserveMethod(localUrl: url), "localUrl");
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void RedirectPermanent_WithParameter_NullOrEmptyUrl_Throws(string url)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => page.RedirectPermanent(url: url), "url");
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void RedirectPermanentPreserveMethod_WithParameter_NullOrEmptyUrl_Throws(string url)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgumentNullOrEmpty(
+                () => page.RedirectPermanentPreserveMethod(url: url), "url");
+        }
+
+        [Fact]
+        public void RedirectToAction_WithParameterActionName_SetsResultActionName()
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var resultTemporary = page.RedirectToAction("SampleAction");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.False(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal("SampleAction", resultTemporary.ActionName);
+        }
+
+        [Fact]
+        public void RedirectToActionPreserveMethod_WithParameterActionName_SetsResultActionName()
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var resultTemporary = page.RedirectToActionPreserveMethod(actionName: "SampleAction");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.True(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal("SampleAction", resultTemporary.ActionName);
+        }
+
+        [Fact]
+        public void RedirectToActionPermanent_WithParameterActionName_SetsResultActionNameAndPermanent()
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var resultPermanent = page.RedirectToActionPermanent("SampleAction");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.False(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal("SampleAction", resultPermanent.ActionName);
+        }
+
+        [Fact]
+        public void RedirectToActionPermanentPreserveMethod_WithParameterActionName_SetsResultActionNameAndPermanent()
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var resultPermanent = page.RedirectToActionPermanentPreserveMethod(actionName: "SampleAction");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal("SampleAction", resultPermanent.ActionName);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        [InlineData("SampleController")]
+        public void RedirectToAction_WithParameterActionAndControllerName_SetsEqualNames(string controllerName)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var resultTemporary = page.RedirectToAction("SampleAction", controllerName);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.False(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal("SampleAction", resultTemporary.ActionName);
+            Assert.Equal(controllerName, resultTemporary.ControllerName);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        [InlineData("SampleController")]
+        public void RedirectToActionPreserveMethod_WithParameterActionAndControllerName_SetsEqualNames(string controllerName)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var resultTemporary = page.RedirectToActionPreserveMethod(actionName: "SampleAction", controllerName: controllerName);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.True(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal("SampleAction", resultTemporary.ActionName);
+            Assert.Equal(controllerName, resultTemporary.ControllerName);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        [InlineData("SampleController")]
+        public void RedirectToActionPermanent_WithParameterActionAndControllerName_SetsEqualNames(string controllerName)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var resultPermanent = page.RedirectToActionPermanent("SampleAction", controllerName);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.False(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal("SampleAction", resultPermanent.ActionName);
+            Assert.Equal(controllerName, resultPermanent.ControllerName);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData(null)]
+        [InlineData("SampleController")]
+        public void RedirectToActionPermanentPreserveMethod_WithParameterActionAndControllerName_SetsEqualNames(string controllerName)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var resultPermanent = page.RedirectToActionPermanentPreserveMethod(actionName: "SampleAction", controllerName: controllerName);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal("SampleAction", resultPermanent.ActionName);
+            Assert.Equal(controllerName, resultPermanent.ControllerName);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToAction_WithParameterActionControllerRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var resultTemporary = page.RedirectToAction("SampleAction", "SampleController", routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.False(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal("SampleAction", resultTemporary.ActionName);
+            Assert.Equal("SampleController", resultTemporary.ControllerName);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPreserveMethod_WithParameterActionControllerRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var resultTemporary = page.RedirectToActionPreserveMethod(
+                actionName: "SampleAction",
+                controllerName: "SampleController",
+                routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.True(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal("SampleAction", resultTemporary.ActionName);
+            Assert.Equal("SampleController", resultTemporary.ControllerName);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPermanent_WithParameterActionControllerRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var resultPermanent = page.RedirectToActionPermanent(
+                "SampleAction",
+                "SampleController",
+                routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.False(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal("SampleAction", resultPermanent.ActionName);
+            Assert.Equal("SampleController", resultPermanent.ControllerName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPermanentPreserveMethod_WithParameterActionControllerRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var resultPermanent = page.RedirectToActionPermanentPreserveMethod(
+                actionName: "SampleAction",
+                controllerName: "SampleController",
+                routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal("SampleAction", resultPermanent.ActionName);
+            Assert.Equal("SampleController", resultPermanent.ControllerName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToAction_WithParameterActionAndRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var resultTemporary = page.RedirectToAction(actionName: null, routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.False(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Null(resultTemporary.ActionName);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPreserveMethod_WithParameterActionAndRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var resultTemporary = page.RedirectToActionPreserveMethod(actionName: null, routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultTemporary);
+            Assert.True(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Null(resultTemporary.ActionName);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToAction_WithParameterActionAndControllerAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var page = new TestPage();
+            var expectedAction = "Action";
+            var expectedController = "Home";
+            var expectedFragment = "test";
+
+            // Act
+            var result = page.RedirectToAction("Action", "Home", routeValues, "test");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Equal(expectedAction, result.ActionName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedController, result.ControllerName);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPreserveMethod_WithParameterActionAndControllerAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var page = new TestPage();
+            var expectedAction = "Action";
+            var expectedController = "Home";
+            var expectedFragment = "test";
+
+            // Act
+            var result = page.RedirectToActionPreserveMethod("Action", "Home", routeValues, "test");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Equal(expectedAction, result.ActionName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedController, result.ControllerName);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPermanent_WithParameterActionAndRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var resultPermanent = page.RedirectToActionPermanent(null, routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.False(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Null(resultPermanent.ActionName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPermanentPreserveMethod_WithParameterActionAndRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var resultPermanent = page.RedirectToActionPermanentPreserveMethod(actionName: null, routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Null(resultPermanent.ActionName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPermanent_WithParameterActionAndControllerAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var page = new TestPage();
+            var expectedAction = "Action";
+            var expectedController = "Home";
+            var expectedFragment = "test";
+
+            // Act
+            var result = page.RedirectToActionPermanent("Action", "Home", routeValues, fragment: "test");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Equal(expectedAction, result.ActionName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedController, result.ControllerName);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToActionPermanentPreserveMethod_WithParameterActionAndControllerAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var page = new TestPage();
+            var expectedAction = "Action";
+            var expectedController = "Home";
+            var expectedFragment = "test";
+
+            // Act
+            var result = page.RedirectToActionPermanentPreserveMethod(
+                actionName: "Action",
+                controllerName: "Home",
+                routeValues: routeValues,
+                fragment: "test");
+
+            // Assert
+            Assert.IsType<RedirectToActionResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Equal(expectedAction, result.ActionName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedController, result.ControllerName);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoute_WithParameterRouteValues_SetsResultEqualRouteValues(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var resultTemporary = page.RedirectToRoute(routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultTemporary);
+            Assert.False(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePreserveMethod_WithParameterRouteValues_SetsResultEqualRouteValues(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var resultTemporary = page.RedirectToRoutePreserveMethod(routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultTemporary);
+            Assert.True(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoute_WithParameterRouteNameAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var page = new TestPage();
+            var expectedRoute = "TestRoute";
+            var expectedFragment = "test";
+
+            // Act
+            var result = page.RedirectToRoute("TestRoute", routeValues, "test");
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Equal(expectedRoute, result.RouteName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePreserveMethod_WithParameterRouteNameAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var page = new TestPage();
+            var expectedRoute = "TestRoute";
+            var expectedFragment = "test";
+
+            // Act
+            var result = page.RedirectToRoutePreserveMethod(routeName: "TestRoute", routeValues: routeValues, fragment: "test");
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Equal(expectedRoute, result.RouteName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePermanent_WithParameterRouteValues_SetsResultEqualRouteValuesAndPermanent(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var resultPermanent = page.RedirectToRoutePermanent(routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultPermanent);
+            Assert.False(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePermanentPreserveMethod_WithParameterRouteValues_SetsResultEqualRouteValuesAndPermanent(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var resultPermanent = page.RedirectToRoutePermanentPreserveMethod(routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePermanent_WithParameterRouteNameAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var page = new TestPage();
+            var expectedRoute = "TestRoute";
+            var expectedFragment = "test";
+
+            // Act
+            var result = page.RedirectToRoutePermanent("TestRoute", routeValues, "test");
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(result);
+            Assert.False(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Equal(expectedRoute, result.RouteName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePermanentPreserveMethod_WithParameterRouteNameAndRouteValuesAndFragment_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expectedRouteValues)
+        {
+            // Arrange
+            var page = new TestPage();
+            var expectedRoute = "TestRoute";
+            var expectedFragment = "test";
+
+            // Act
+            var result = page.RedirectToRoutePermanentPreserveMethod(routeName: "TestRoute", routeValues: routeValues, fragment: "test");
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.True(result.Permanent);
+            Assert.Equal(expectedRoute, result.RouteName);
+            Assert.Equal(expectedRouteValues, result.RouteValues);
+            Assert.Equal(expectedFragment, result.Fragment);
+        }
+
+        [Fact]
+        public void RedirectToRoute_WithParameterRouteName_SetsResultSameRouteName()
+        {
+            // Arrange
+            var page = new TestPage();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultTemporary = page.RedirectToRoute(routeName);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultTemporary);
+            Assert.False(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Same(routeName, resultTemporary.RouteName);
+        }
+
+        [Fact]
+        public void RedirectToRoutePreserveMethod_WithParameterRouteName_SetsResultSameRouteName()
+        {
+            // Arrange
+            var page = new TestPage();
+            var routeName = "CustomRouteName";
+
+            // Act;
+            var resultTemporary = page.RedirectToRoutePreserveMethod(routeName: routeName);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultTemporary);
+            Assert.True(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Same(routeName, resultTemporary.RouteName);
+        }
+
+        [Fact]
+        public void RedirectToRoutePermanent_WithParameterRouteName_SetsResultSameRouteNameAndPermanent()
+        {
+            // Arrange
+            var page = new TestPage();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultPermanent = page.RedirectToRoutePermanent(routeName);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultPermanent);
+            Assert.False(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Same(routeName, resultPermanent.RouteName);
+        }
+
+        [Fact]
+        public void RedirectToRoutePermanentPreserveMethod_WithParameterRouteName_SetsResultSameRouteNameAndPermanent()
+        {
+            // Arrange
+            var page = new TestPage();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultPermanent = page.RedirectToRoutePermanentPreserveMethod(routeName: routeName);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Same(routeName, resultPermanent.RouteName);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoute_WithParameterRouteNameAndRouteValues_SetsResultSameRouteNameAndRouteValues(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var page = new TestPage();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultTemporary = page.RedirectToRoute(routeName, routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultTemporary);
+            Assert.False(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Same(routeName, resultTemporary.RouteName);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePreserveMethod_WithParameterRouteNameAndRouteValues_SetsResultSameRouteNameAndRouteValues(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var page = new TestPage();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultTemporary = page.RedirectToRoutePreserveMethod(routeName: routeName, routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultTemporary);
+            Assert.True(resultTemporary.PreserveMethod);
+            Assert.False(resultTemporary.Permanent);
+            Assert.Same(routeName, resultTemporary.RouteName);
+            Assert.Equal(expected, resultTemporary.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePermanent_WithParameterRouteNameAndRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var page = new TestPage();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultPermanent = page.RedirectToRoutePermanent(routeName, routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultPermanent);
+            Assert.False(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Same(routeName, resultPermanent.RouteName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToRoutePermanentPreserveMethod_WithParameterRouteNameAndRouteValues_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var page = new TestPage();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultPermanent = page.RedirectToRoutePermanentPreserveMethod(routeName: routeName, routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToRouteResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Same(routeName, resultPermanent.RouteName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Fact]
+        public void RedirectToPage_WithNoArguments()
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var result = page.RedirectToPage();
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Null(result.PageName);
+        }
+
+        [Fact]
+        public void RedirectToPage_WithPageName()
+        {
+            // Arrange
+            var page = new TestPage();
+            var pageName = "/Page";
+
+            // Act
+            var result = page.RedirectToPage(pageName);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+        }
+
+        [Fact]
+        public void RedirectToPage_WithRouteValues()
+        {
+            // Arrange
+            var page = new TestPage();
+            var routeValues = new { key = "value" };
+
+            // Act
+            var result = page.RedirectToPage(routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Null(result.PageName);
+            Assert.Collection(
+                result.RouteValues,
+                item =>
+                {
+                    Assert.Equal("key", item.Key);
+                    Assert.Equal("value", item.Value);
+                });
+        }
+
+        [Fact]
+        public void RedirectToPage_WithPageNameAndHandler()
+        {
+            // Arrange
+            var page = new TestPage();
+            var pageName = "/Page-Name";
+            var pageHandler = "page-handler";
+
+            // Act
+            var result = page.RedirectToPage(pageName, pageHandler);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Equal(pageHandler, result.PageHandler);
+        }
+
+        [Fact]
+        public void RedirectToPage_WithPageNameAndRouteValues()
+        {
+            // Arrange
+            var page = new TestPage();
+            var pageName = "/Page-Name";
+            var routeVaues = new { key = "value" };
+
+            // Act
+            var result = page.RedirectToPage(pageName, routeVaues);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Collection(
+                result.RouteValues,
+                item =>
+                {
+                    Assert.Equal("key", item.Key);
+                    Assert.Equal("value", item.Value);
+                });
+        }
+
+        [Fact]
+        public void RedirectToPage_WithPageNameHandlerAndFragment()
+        {
+            // Arrange
+            var page = new TestPage();
+            var pageName = "/Page-Name";
+            var pageHandler = "page-handler";
+            var fragment = "fragment";
+
+            // Act
+            var result = page.RedirectToPage(pageName, pageHandler, fragment);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Equal(pageHandler, result.PageHandler);
+            Assert.Equal(fragment, result.Fragment);
+        }
+
+        [Fact]
+        public void RedirectToPage_WithPageNameRouteValuesHandlerAndFragment()
+        {
+            // Arrange
+            var page = new TestPage();
+            var pageName = "/Page-Name";
+            var pageHandler = "page-handler";
+            var fragment = "fragment";
+            var routeValues = new { key = "value" };
+
+            // Act
+            var result = page.RedirectToPage(pageName, pageHandler, routeValues, fragment);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Equal(pageHandler, result.PageHandler);
+            Assert.Collection(
+                result.RouteValues,
+                item =>
+                {
+                    Assert.Equal("key", item.Key);
+                    Assert.Equal("value", item.Value);
+                });
+            Assert.Equal(fragment, result.Fragment);
+        }
+
+        [Fact]
+        public void RedirectToPagePermanent_WithPageName()
+        {
+            // Arrange
+            var page = new TestPage();
+            var pageName = "/Page-Name";
+
+            // Act
+            var result = page.RedirectToPagePermanent(pageName);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.True(result.Permanent);
+        }
+
+        [Fact]
+        public void RedirectToPagePermanent_WithPageNameAndPageHandler()
+        {
+            // Arrange
+            var page = new TestPage();
+            var pageName = "/Page-Name";
+            var pageHandler = "page-handler";
+
+            // Act
+            var result = page.RedirectToPagePermanent(pageName, pageHandler);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Equal(pageHandler, result.PageHandler);
+            Assert.True(result.Permanent);
+        }
+
+        [Fact]
+        public void RedirectToPagePermanent_WithPageNameAndRouteValues()
+        {
+            // Arrange
+            var page = new TestPage();
+            var pageName = "/Page-Name";
+            var routeValues = new { key = "value" };
+
+            // Act
+            var result = page.RedirectToPagePermanent(pageName, routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Collection(
+                result.RouteValues,
+                item =>
+                {
+                    Assert.Equal("key", item.Key);
+                    Assert.Equal("value", item.Value);
+                });
+            Assert.True(result.Permanent);
+        }
+
+        [Fact]
+        public void RedirectToPagePermanent_WithPageNamePageHandlerAndRouteValues()
+        {
+            // Arrange
+            var page = new TestPage();
+            var pageName = "/Page-Name";
+            var pageHandler = "page-handler";
+            var routeValues = new { key = "value" };
+
+            // Act
+            var result = page.RedirectToPagePermanent(pageName, pageHandler, routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Equal(pageHandler, result.PageHandler);
+            Assert.Collection(
+                result.RouteValues,
+                item =>
+                {
+                    Assert.Equal("key", item.Key);
+                    Assert.Equal("value", item.Value);
+                });
+            Assert.True(result.Permanent);
+        }
+
+        [Fact]
+        public void RedirectToPagePermanent_WithPageNamePageHandlerAndFragment()
+        {
+            // Arrange
+            var page = new TestPage();
+            var pageName = "/Page-Name";
+            var pageHandler = "page-handler";
+            var fragment = "fragment";
+
+            // Act
+            var result = page.RedirectToPagePermanent(pageName, pageHandler, fragment);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Equal(pageHandler, result.PageHandler);
+            Assert.Equal(fragment, result.Fragment);
+            Assert.True(result.Permanent);
+        }
+
+        [Fact]
+        public void RedirectToPagePermanent_WithPageNamePageHandlerRouteValuesAndFragment()
+        {
+            // Arrange
+            var page = new TestPage();
+            var pageName = "/Page-Name";
+            var pageHandler = "page-handler";
+            var routeValues = new { key = "value" };
+            var fragment = "fragment";
+
+            // Act
+            var result = page.RedirectToPagePermanent(pageName, pageHandler, routeValues, fragment);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.Equal(pageName, result.PageName);
+            Assert.Equal(pageHandler, result.PageHandler);
+            Assert.Collection(
+                result.RouteValues,
+                item =>
+                {
+                    Assert.Equal("key", item.Key);
+                    Assert.Equal("value", item.Value);
+                });
+            Assert.Equal(fragment, result.Fragment);
+            Assert.True(result.Permanent);
+        }
+
+        [Fact]
+        public void RedirectToPagePreserveMethod_WithParameterUrl_SetsRedirectResultPreserveMethod()
+        {
+            // Arrange
+            var pageModel = new TestPage();
+            var url = "/test/url";
+
+            // Act
+            var result = pageModel.RedirectToPagePreserveMethod(url);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(result);
+            Assert.True(result.PreserveMethod);
+            Assert.False(result.Permanent);
+            Assert.Same(url, result.PageName);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToPagePreserveMethod_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestPage();
+            var pageName = "CustomRouteName";
+
+            // Act
+            var resultPermanent = pageModel.RedirectToPagePreserveMethod(pageName, routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.False(resultPermanent.Permanent);
+            Assert.Same(pageName, resultPermanent.PageName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(RedirectTestData))]
+        public void RedirectToPagePermanentPreserveMethod_SetsResultProperties(
+            object routeValues,
+            IEnumerable<KeyValuePair<string, object>> expected)
+        {
+            // Arrange
+            var pageModel = new TestPage();
+            var routeName = "CustomRouteName";
+
+            // Act
+            var resultPermanent = pageModel.RedirectToPagePermanentPreserveMethod(routeName, routeValues: routeValues);
+
+            // Assert
+            Assert.IsType<RedirectToPageResult>(resultPermanent);
+            Assert.True(resultPermanent.PreserveMethod);
+            Assert.True(resultPermanent.Permanent);
+            Assert.Same(routeName, resultPermanent.PageName);
+            Assert.Equal(expected, resultPermanent.RouteValues);
+        }
+
+        [Fact]
+        public void File_WithContents()
+        {
+            // Arrange
+            var page = new TestPage();
+            var fileContents = new byte[0];
+
+            // Act
+            var result = page.File(fileContents, "application/pdf");
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Same(fileContents, result.FileContents);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal(string.Empty, result.FileDownloadName);
+        }
+
+        [Fact]
+        public void File_WithContentsAndFileDownloadName()
+        {
+            // Arrange
+            var page = new TestPage();
+            var fileContents = new byte[0];
+
+            // Act
+            var result = page.File(fileContents, "application/pdf", "someDownloadName");
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Same(fileContents, result.FileContents);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal("someDownloadName", result.FileDownloadName);
+        }
+
+        [Fact]
+        public void File_WithPath()
+        {
+            // Arrange
+            var page = new TestPage();
+            var path = Path.GetFullPath("somepath");
+
+            // Act
+            var result = page.File(path, "application/pdf");
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Equal(path, result.FileName);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal(string.Empty, result.FileDownloadName);
+        }
+
+        [Fact]
+        public void File_WithPathAndFileDownloadName()
+        {
+            // Arrange
+            var page = new TestPage();
+            var path = Path.GetFullPath("somepath");
+
+            // Act
+            var result = page.File(path, "application/pdf", "someDownloadName");
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Equal(path, result.FileName);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal("someDownloadName", result.FileDownloadName);
+        }
+
+        [Fact]
+        public void File_WithStream()
+        {
+            // Arrange
+            var mockHttpContext = new Mock<HttpContext>();
+            mockHttpContext.Setup(x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()));
+
+            var page = new TestPage()
+            {
+                PageContext = new PageContext
+                {
+                    HttpContext = mockHttpContext.Object
+                }
+            };
+
+            var fileStream = Stream.Null;
+
+            // Act
+            var result = page.File(fileStream, "application/pdf");
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Same(fileStream, result.FileStream);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal(string.Empty, result.FileDownloadName);
+        }
+
+        [Fact]
+        public void File_WithStreamAndFileDownloadName()
+        {
+            // Arrange
+            var mockHttpContext = new Mock<HttpContext>();
+
+            var page = new TestPage()
+            {
+                PageContext = new PageContext
+                {
+                    HttpContext = mockHttpContext.Object
+                }
+            };
+
+            var fileStream = Stream.Null;
+
+            // Act
+            var result = page.File(fileStream, "application/pdf", "someDownloadName");
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Same(fileStream, result.FileStream);
+            Assert.Equal("application/pdf", result.ContentType.ToString());
+            Assert.Equal("someDownloadName", result.FileDownloadName);
+        }
+
+        [Fact]
+        public void Unauthorized_SetsStatusCode()
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var result = page.Unauthorized();
+
+            // Assert
+            Assert.IsType<UnauthorizedResult>(result);
+            Assert.Equal(StatusCodes.Status401Unauthorized, result.StatusCode);
+        }
+
+        [Fact]
+        public void BadRequest_SetsStatusCode()
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var result = page.BadRequest();
+
+            // Assert
+            Assert.IsType<BadRequestResult>(result);
+            Assert.Equal(StatusCodes.Status400BadRequest, result.StatusCode);
+        }
+
+        [Fact]
+        public void BadRequest_SetsStatusCodeAndResponseContent()
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var result = page.BadRequest("Test Content");
+
+            // Assert
+            Assert.IsType<BadRequestObjectResult>(result);
+            Assert.Equal(StatusCodes.Status400BadRequest, result.StatusCode);
+            Assert.Equal("Test Content", result.Value);
+        }
+
+        [Fact]
+        public void NotFound_SetsStatusCode()
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var result = page.NotFound();
+
+            // Assert
+            Assert.IsType<NotFoundResult>(result);
+            Assert.Equal(StatusCodes.Status404NotFound, result.StatusCode);
+        }
+
+        [Fact]
+        public void NotFound_SetsStatusCodeAndResponseContent()
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var result = page.NotFound("Test Content");
+
+            // Assert
+            Assert.IsType<NotFoundObjectResult>(result);
+            Assert.Equal(StatusCodes.Status404NotFound, result.StatusCode);
+            Assert.Equal("Test Content", result.Value);
+        }
+
+        [Fact]
+        public void Content_WithParameterContentString_SetsResultContent()
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var actualContentResult = page.Content("TestContent");
+
+            // Assert
+            Assert.IsType<ContentResult>(actualContentResult);
+            Assert.Equal("TestContent", actualContentResult.Content);
+            Assert.Null(actualContentResult.ContentType);
+        }
+
+        [Fact]
+        public void Content_WithParameterContentStringAndContentType_SetsResultContentAndContentType()
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var actualContentResult = page.Content("TestContent", "text/plain");
+
+            // Assert
+            Assert.IsType<ContentResult>(actualContentResult);
+            Assert.Equal("TestContent", actualContentResult.Content);
+            Assert.Null(MediaType.GetEncoding(actualContentResult.ContentType));
+            Assert.Equal("text/plain", actualContentResult.ContentType.ToString());
+        }
+
+        [Fact]
+        public void Content_WithParameterContentAndTypeAndEncoding_SetsResultContentAndTypeAndEncoding()
+        {
+            // Arrange
+            var page = new TestPage();
+
+            // Act
+            var actualContentResult = page.Content("TestContent", "text/plain", Encoding.UTF8);
+
+            // Assert
+            Assert.IsType<ContentResult>(actualContentResult);
+            Assert.Equal("TestContent", actualContentResult.Content);
+            Assert.Same(Encoding.UTF8, MediaType.GetEncoding(actualContentResult.ContentType));
+            Assert.Equal("text/plain; charset=utf-8", actualContentResult.ContentType.ToString());
+        }
+
+        [Fact]
+        public void Content_NoContentType_DefaultEncodingIsUsed()
+        {
+            // Arrange
+            var contentPage = new ContentPage();
+
+            // Act
+            var contentResult = (ContentResult)contentPage.Content_WithNoEncoding();
+
+            // Assert
+            // The default content type of ContentResult is used when the result is executed.
+            Assert.Null(contentResult.ContentType);
+        }
+
+        [Fact]
+        public void Content_InvalidCharset_DefaultEncodingIsUsed()
+        {
+            // Arrange
+            var contentPage = new ContentPage();
+            var contentType = "text/xml; charset=invalid; p1=p1-value";
+
+            // Act
+            var contentResult = (ContentResult)contentPage.Content_WithInvalidCharset();
+
+            // Assert
+            Assert.NotNull(contentResult.ContentType);
+            Assert.Equal(contentType, contentResult.ContentType.ToString());
+            // The default encoding of ContentResult is used when this result is executed.
+            Assert.Null(MediaType.GetEncoding(contentResult.ContentType));
+        }
+
+        [Fact]
+        public void Content_CharsetAndEncodingProvided_EncodingIsUsed()
+        {
+            // Arrange
+            var contentPage = new ContentPage();
+            var contentType = "text/xml; charset=us-ascii; p1=p1-value";
+
+            // Act
+            var contentResult = (ContentResult)contentPage.Content_WithEncodingInCharset_AndEncodingParameter();
+
+            // Assert
+            MediaTypeAssert.Equal(contentType, contentResult.ContentType);
+        }
+
+        [Fact]
+        public void Content_CharsetInContentType_IsUsedForEncoding()
+        {
+            // Arrange
+            var contentPage = new ContentPage();
+            var contentType = "text/xml; charset=us-ascii; p1=p1-value";
+
+            // Act
+            var contentResult = (ContentResult)contentPage.Content_WithEncodingInCharset();
+
+            // Assert
+            Assert.Equal(contentType, contentResult.ContentType);
+        }
+
+        [Fact]
+        public void StatusCode_SetObject()
+        {
+            // Arrange
+            var statusCode = 204;
+            var value = new { Value = 42 };
+
+            var statusCodePage = new StatusCodePage();
+
+            // Act
+            var result = (ObjectResult)statusCodePage.StatusCode_Object(statusCode, value);
+
+            // Assert
+            Assert.Equal(statusCode, result.StatusCode);
+            Assert.Equal(value, result.Value);
+        }
+
+        [Fact]
+        public void StatusCode_SetObjectNull()
+        {
+            // Arrange
+            var statusCode = 204;
+            object value = null;
+
+            var statusCodePage = new StatusCodePage();
+
+            // Act
+            var result = statusCodePage.StatusCode_Object(statusCode, value);
+
+            // Assert
+            Assert.Equal(statusCode, result.StatusCode);
+            Assert.Equal(value, result.Value);
+        }
+
+        [Fact]
+        public void StatusCode_SetsStatusCode()
+        {
+            // Arrange
+            var statusCode = 205;
+            var statusCodePage = new StatusCodePage();
+
+            // Act
+            var result = statusCodePage.StatusCode_Int(statusCode);
+
+            // Assert
+            Assert.Equal(statusCode, result.StatusCode);
+        }
+
+        public static IEnumerable<object[]> RedirectTestData
+        {
+            get
+            {
+                yield return new object[]
+                {
+                    null,
+                    null,
+                };
+
+                yield return new object[]
+                {
+                    new Dictionary<string, object> { { "hello", "world" } },
+                    new RouteValueDictionary() { { "hello", "world" } },
+                };
+
+                var expected2 = new Dictionary<string, object>
+                {
+                    { "test", "case" },
+                    { "sample", "route" },
+                };
+
+                yield return new object[]
+                {
+                    new RouteValueDictionary(expected2),
+                    new RouteValueDictionary(expected2),
+                };
+            }
+        }
+
+        private class ContentPage : Page
+        {
+            public IActionResult Content_WithNoEncoding()
+            {
+                return Content("Hello!!");
+            }
+
+            public IActionResult Content_WithEncodingInCharset()
+            {
+                return Content("Hello!!", "text/xml; charset=us-ascii; p1=p1-value");
+            }
+
+            public IActionResult Content_WithInvalidCharset()
+            {
+                return Content("Hello!!", "text/xml; charset=invalid; p1=p1-value");
+            }
+
+            public IActionResult Content_WithEncodingInCharset_AndEncodingParameter()
+            {
+                return Content("Hello!!", "text/xml; charset=invalid; p1=p1-value", Encoding.ASCII);
+            }
+
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class StatusCodePage : Page
+        {
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+
+            public StatusCodeResult StatusCode_Int(int statusCode)
+            {
+                return StatusCode(statusCode);
+            }
+
+            public ObjectResult StatusCode_Object(int statusCode, object value)
+            {
+                return StatusCode(statusCode, value);
+            }
+        }
+
+        private class TestPage : Page
+        {
+            public override Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/TestRazorProjectFileSystem.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/TestRazorProjectFileSystem.cs
new file mode 100644
index 0000000000..49244b8980
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/TestRazorProjectFileSystem.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.Extensions.FileProviders;
+using Moq;
+
+namespace Microsoft.AspNetCore.Mvc.RazorPages
+{
+    public class TestRazorProjectFileSystem : FileProviderRazorProjectFileSystem
+    {
+        public TestRazorProjectFileSystem(IFileProvider fileProvider, IHostingEnvironment hostingEnvironment)
+            :base(GetAccessor(fileProvider), hostingEnvironment)
+        {
+        }
+
+        private static IRazorViewEngineFileProviderAccessor GetAccessor(IFileProvider fileProvider)
+        {
+            var fileProviderAccessor = new Mock<IRazorViewEngineFileProviderAccessor>();
+            fileProviderAccessor.SetupGet(f => f.FileProvider)
+                .Returns(fileProvider);
+
+            return fileProviderAccessor.Object;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/AnchorTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/AnchorTagHelperTest.cs
new file mode 100644
index 0000000000..c3cdb498f2
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/AnchorTagHelperTest.cs
@@ -0,0 +1,651 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Routing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    public class AnchorTagHelperTest
+    {
+        [Fact]
+        public async Task ProcessAsync_GeneratesExpectedOutput()
+        {
+            // Arrange
+            var expectedTagName = "not-a";
+            var metadataProvider = new TestModelMetadataProvider();
+
+            var tagHelperContext = new TagHelperContext(
+                tagName: "not-a",
+                allAttributes: new TagHelperAttributeList
+                {
+                    { "id", "myanchor" },
+                    { "asp-route-name", "value" },
+                    { "asp-action", "index" },
+                    { "asp-controller", "home" },
+                    { "asp-fragment", "hello=world" },
+                    { "asp-host", "contoso.com" },
+                    { "asp-protocol", "http" }
+                },
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                attributes: new TagHelperAttributeList
+                {
+                    { "id", "myanchor" },
+                },
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something Else");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            output.Content.SetContent("Something");
+
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper
+                .Setup(mock => mock.Action(It.IsAny<UrlActionContext>())).Returns("home/index");
+
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider, urlHelper.Object);
+            var viewContext = TestableHtmlGenerator.GetViewContext(
+                model: null,
+                htmlGenerator: htmlGenerator,
+                metadataProvider: metadataProvider);
+            var anchorTagHelper = new AnchorTagHelper(htmlGenerator)
+            {
+                Action = "index",
+                Controller = "home",
+                Fragment = "hello=world",
+                Host = "contoso.com",
+                Protocol = "http",
+                RouteValues =
+                {
+                    {  "name", "value" },
+                },
+                ViewContext = viewContext,
+            };
+
+            // Act
+            await anchorTagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal(2, output.Attributes.Count);
+            var attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("id"));
+            Assert.Equal("myanchor", attribute.Value);
+            attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("href"));
+            Assert.Equal("home/index", attribute.Value);
+            Assert.Equal("Something", output.Content.GetContent());
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_CallsIntoRouteLinkWithExpectedParameters()
+        {
+            // Arrange
+            var context = new TagHelperContext(
+                tagName: "a",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "a",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            output.Content.SetContent(string.Empty);
+
+            var generator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            generator
+                .Setup(mock => mock.GenerateRouteLink(
+                    It.IsAny<ViewContext>(),
+                    string.Empty,
+                    "Default",
+                    "http",
+                    "contoso.com",
+                    "hello=world",
+                    It.IsAny<IDictionary<string, object>>(),
+                    null))
+                .Returns(new TagBuilder("a"))
+                .Verifiable();
+            var anchorTagHelper = new AnchorTagHelper(generator.Object)
+            {
+                Fragment = "hello=world",
+                Host = "contoso.com",
+                Protocol = "http",
+                Route = "Default",
+            };
+
+            // Act & Assert
+            await anchorTagHelper.ProcessAsync(context, output);
+            generator.Verify();
+            Assert.Equal("a", output.TagName);
+            Assert.Empty(output.Attributes);
+            Assert.Empty(output.Content.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_CallsIntoActionLinkWithExpectedParameters()
+        {
+            // Arrange
+            var context = new TagHelperContext(
+                tagName: "a",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "a",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            output.Content.SetContent(string.Empty);
+
+            var generator = new Mock<IHtmlGenerator>();
+            generator
+                .Setup(mock => mock.GenerateActionLink(
+                    It.IsAny<ViewContext>(),
+                    string.Empty,
+                    "Index",
+                    "Home",
+                    "http",
+                    "contoso.com",
+                    "hello=world",
+                    It.IsAny<IDictionary<string, object>>(),
+                    null))
+                .Returns(new TagBuilder("a"))
+                .Verifiable();
+            var anchorTagHelper = new AnchorTagHelper(generator.Object)
+            {
+                Action = "Index",
+                Controller = "Home",
+                Fragment = "hello=world",
+                Host = "contoso.com",
+                Protocol = "http",
+            };
+
+            // Act & Assert
+            await anchorTagHelper.ProcessAsync(context, output);
+            generator.Verify();
+            Assert.Equal("a", output.TagName);
+            Assert.Empty(output.Attributes);
+            Assert.Empty(output.Content.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_AddsAreaToRouteValuesAndCallsIntoActionLinkWithExpectedParameters()
+        {
+            // Arrange
+            var context = new TagHelperContext(
+                tagName: "a",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "a",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            output.Content.SetContent(string.Empty);
+
+            var generator = new Mock<IHtmlGenerator>();
+            var expectedRouteValues = new Dictionary<string, object> { { "area", "Admin" } };
+
+            generator
+                .Setup(mock => mock.GenerateActionLink(
+                    It.IsAny<ViewContext>(),
+                    string.Empty,
+                    "Index",
+                    "Home",
+                    "http",
+                    "contoso.com",
+                    "hello=world",
+                    expectedRouteValues,
+                    null))
+                .Returns(new TagBuilder("a"))
+                .Verifiable();
+            var anchorTagHelper = new AnchorTagHelper(generator.Object)
+            {
+                Action = "Index",
+                Controller = "Home",
+                Area = "Admin",
+                Fragment = "hello=world",
+                Host = "contoso.com",
+                Protocol = "http",
+            };
+
+            // Act
+            await anchorTagHelper.ProcessAsync(context, output);
+
+            // Assert
+            generator.Verify();
+
+            Assert.Equal("a", output.TagName);
+            Assert.Empty(output.Attributes);
+            Assert.Empty(output.Content.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_AspAreaOverridesAspRouteArea()
+        {
+            // Arrange
+            var context = new TagHelperContext(
+                tagName: "a",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "a",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            output.Content.SetContent(string.Empty);
+
+            var generator = new Mock<IHtmlGenerator>();
+            var expectedRouteValues = new Dictionary<string, object> { { "area", "Admin" } };
+
+            generator
+                .Setup(mock => mock.GenerateActionLink(
+                    It.IsAny<ViewContext>(),
+                    string.Empty,
+                    "Index",
+                    "Home",
+                    "http",
+                    "contoso.com",
+                    "hello=world",
+                    expectedRouteValues,
+                    null))
+                .Returns(new TagBuilder("a"))
+                .Verifiable();
+            var anchorTagHelper = new AnchorTagHelper(generator.Object)
+            {
+                Action = "Index",
+                Controller = "Home",
+                Area = "Admin",
+                Fragment = "hello=world",
+                Host = "contoso.com",
+                Protocol = "http",
+                RouteValues = new Dictionary<string, string> { { "area", "Home" } }
+            };
+
+            // Act
+            await anchorTagHelper.ProcessAsync(context, output);
+
+            // Assert
+            generator.Verify();
+
+            Assert.Equal("a", output.TagName);
+            Assert.Empty(output.Attributes);
+            Assert.Empty(output.Content.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_EmptyStringOnAspAreaIsPassedThroughToRouteValues()
+        {
+            // Arrange
+            var context = new TagHelperContext(
+                tagName: "a",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "a",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            output.Content.SetContent(string.Empty);
+
+            var generator = new Mock<IHtmlGenerator>();
+            var expectedRouteValues = new Dictionary<string, object> { { "area", string.Empty } };
+
+            generator
+                .Setup(mock => mock.GenerateActionLink(
+                    It.IsAny<ViewContext>(),
+                    string.Empty,
+                    "Index",
+                    "Home",
+                    "http",
+                    "contoso.com",
+                    "hello=world",
+                    expectedRouteValues,
+                    null))
+                .Returns(new TagBuilder("a"))
+                .Verifiable();
+            var anchorTagHelper = new AnchorTagHelper(generator.Object)
+            {
+                Action = "Index",
+                Controller = "Home",
+                Area = string.Empty,
+                Fragment = "hello=world",
+                Host = "contoso.com",
+                Protocol = "http"
+            };
+
+            // Act
+            await anchorTagHelper.ProcessAsync(context, output);
+
+            // Assert
+            generator.Verify();
+
+            Assert.Equal("a", output.TagName);
+            Assert.Empty(output.Attributes);
+            Assert.Empty(output.Content.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_AddsPageToRouteValuesAndCallsPageLinkWithExpectedParameters()
+        {
+            // Arrange
+            var context = new TagHelperContext(
+                tagName: "a",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "a",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            output.Content.SetContent(string.Empty);
+
+            var generator = new Mock<IHtmlGenerator>();
+            generator
+                .Setup(mock => mock.GeneratePageLink(
+                    It.IsAny<ViewContext>(),
+                    string.Empty,
+                    "/User/Home/Index",
+                    "page-handler",
+                    "http",
+                    "contoso.com",
+                    "hello=world",
+                    It.IsAny<object>(),
+                    null))
+                .Returns(new TagBuilder("a"))
+                .Verifiable();
+            var anchorTagHelper = new AnchorTagHelper(generator.Object)
+            {
+                Page = "/User/Home/Index",
+                PageHandler = "page-handler",
+                Fragment = "hello=world",
+                Host = "contoso.com",
+                Protocol = "http",
+            };
+
+            // Act
+            await anchorTagHelper.ProcessAsync(context, output);
+
+            // Assert
+            generator.Verify();
+        }
+
+        [Fact]
+        public async Task ProcessAsync_AddsAreaToRouteValuesAndCallsPageLinkWithExpectedParameters()
+        {
+            // Arrange
+            var context = new TagHelperContext(
+                tagName: "a",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "a",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            output.Content.SetContent(string.Empty);
+
+            var generator = new Mock<IHtmlGenerator>();
+            generator
+                .Setup(mock => mock.GeneratePageLink(
+                    It.IsAny<ViewContext>(),
+                    string.Empty,
+                    "/User/Home/Index",
+                    "page-handler",
+                    "http",
+                    "contoso.com",
+                    "hello=world",
+                    It.IsAny<object>(),
+                    null))
+                .Callback((ViewContext v, string linkText, string pageName, string pageHandler, string protocol, string hostname, string fragment, object routeValues, object htmlAttributes) =>
+                {
+                    var rvd = Assert.IsType<RouteValueDictionary>(routeValues);
+                    Assert.Collection(rvd.OrderBy(item => item.Key),
+                        item =>
+                        {
+                            Assert.Equal("area", item.Key);
+                            Assert.Equal("test-area", item.Value);
+                        });
+                })
+                .Returns(new TagBuilder("a"))
+                .Verifiable();
+            var anchorTagHelper = new AnchorTagHelper(generator.Object)
+            {
+                Page = "/User/Home/Index",
+                Area = "test-area",
+                PageHandler = "page-handler",
+                Fragment = "hello=world",
+                Host = "contoso.com",
+                Protocol = "http",
+            };
+
+            // Act
+            await anchorTagHelper.ProcessAsync(context, output);
+
+            // Assert
+            generator.Verify();
+        }
+
+        [Theory]
+        [InlineData("Action")]
+        [InlineData("Controller")]
+        [InlineData("Route")]
+        [InlineData("Protocol")]
+        [InlineData("Host")]
+        [InlineData("Fragment")]
+        [InlineData("asp-route-")]
+        [InlineData("Page")]
+        [InlineData("PageHandler")]
+        public async Task ProcessAsync_ThrowsIfHrefConflictsWithBoundAttributes(string propertyName)
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+
+            var anchorTagHelper = new AnchorTagHelper(htmlGenerator);
+
+            var output = new TagHelperOutput(
+                "a",
+                attributes: new TagHelperAttributeList
+                {
+                    { "href", "http://www.contoso.com" }
+                },
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(null));
+            if (propertyName == "asp-route-")
+            {
+                anchorTagHelper.RouteValues.Add("name", "value");
+            }
+            else
+            {
+                typeof(AnchorTagHelper).GetProperty(propertyName).SetValue(anchorTagHelper, "Home");
+            }
+
+            var expectedErrorMessage = "Cannot override the 'href' attribute for <a>. An <a> with a specified " +
+                "'href' must not have attributes starting with 'asp-route-' or an " +
+                "'asp-action', 'asp-controller', 'asp-area', 'asp-route', 'asp-protocol', 'asp-host', " +
+                "'asp-fragment', 'asp-page' or 'asp-page-handler' attribute.";
+
+            var context = new TagHelperContext(
+                tagName: "test",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => anchorTagHelper.ProcessAsync(context, output));
+
+            Assert.Equal(expectedErrorMessage, ex.Message);
+        }
+
+        [Theory]
+        [InlineData("Action")]
+        [InlineData("Controller")]
+        public async Task ProcessAsync_ThrowsIfRouteAndActionOrControllerProvided(string propertyName)
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+
+            var anchorTagHelper = new AnchorTagHelper(htmlGenerator)
+            {
+                Route = "Default",
+            };
+
+            typeof(AnchorTagHelper).GetProperty(propertyName).SetValue(anchorTagHelper, "Home");
+            var output = new TagHelperOutput(
+                "a",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(null));
+            var expectedErrorMessage = string.Join(
+                Environment.NewLine,
+                "Cannot determine the 'href' attribute for <a>. The following attributes are mutually exclusive:",
+                "asp-route",
+                "asp-controller, asp-action",
+                "asp-page, asp-page-handler");
+
+            var context = new TagHelperContext(
+                tagName: "test",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => anchorTagHelper.ProcessAsync(context, output));
+
+            Assert.Equal(expectedErrorMessage, ex.Message);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_ThrowsIfRouteAndPageProvided()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+
+            var anchorTagHelper = new AnchorTagHelper(htmlGenerator)
+            {
+                Route = "Default",
+                Page = "Page",
+            };
+
+            var output = new TagHelperOutput(
+                "a",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(null));
+            var expectedErrorMessage = string.Join(
+                Environment.NewLine,
+                "Cannot determine the 'href' attribute for <a>. The following attributes are mutually exclusive:",
+                "asp-route",
+                "asp-controller, asp-action",
+                "asp-page, asp-page-handler");
+
+            var context = new TagHelperContext(
+                tagName: "test",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => anchorTagHelper.ProcessAsync(context, output));
+
+            Assert.Equal(expectedErrorMessage, ex.Message);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_ThrowsIfActionAndPageProvided()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+
+            var anchorTagHelper = new AnchorTagHelper(htmlGenerator)
+            {
+                Action = "Action",
+                Page = "Page",
+            };
+
+            var output = new TagHelperOutput(
+                "a",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(null));
+            var expectedErrorMessage = string.Join(
+                Environment.NewLine,
+                "Cannot determine the 'href' attribute for <a>. The following attributes are mutually exclusive:",
+                "asp-route",
+                "asp-controller, asp-action",
+                "asp-page, asp-page-handler");
+
+            var context = new TagHelperContext(
+                tagName: "test",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => anchorTagHelper.ProcessAsync(context, output));
+
+            Assert.Equal(expectedErrorMessage, ex.Message);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagHelperTest.cs
new file mode 100644
index 0000000000..589ce007f8
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagHelperTest.cs
@@ -0,0 +1,1057 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.Encodings.Web;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TagHelpers.Cache;
+using Microsoft.AspNetCore.Mvc.TagHelpers.Internal;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Primitives;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    public class CacheTagHelperTest
+    {
+        [Fact]
+        public async Task ProcessAsync_DoesNotCache_IfDisabled()
+        {
+            // Arrange
+            var id = "unique-id";
+            var childContent = "original-child-content";
+            var cache = new Mock<IMemoryCache>();
+            var value = new Mock<ICacheEntry>();
+            value.Setup(c => c.Value).Returns(new DefaultTagHelperContent().SetContent("ok"));
+            cache.Setup(c => c.CreateEntry(
+                /*key*/ It.IsAny<string>()))
+                .Returns((object key) => value.Object)
+                .Verifiable();
+            object cacheResult;
+            cache.Setup(c => c.TryGetValue(It.IsAny<string>(), out cacheResult))
+                .Returns(false);
+            var tagHelperContext = GetTagHelperContext(id);
+            var tagHelperOutput = GetTagHelperOutput(
+                attributes: new TagHelperAttributeList(),
+                childContent: childContent);
+            var cacheTagHelper = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache.Object), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                Enabled = false
+            };
+
+            // Act
+            await cacheTagHelper.ProcessAsync(tagHelperContext, tagHelperOutput);
+
+            // Assert
+            Assert.Equal(childContent, tagHelperOutput.Content.GetContent());
+            cache.Verify(c => c.CreateEntry(
+                /*key*/ It.IsAny<string>()),
+                Times.Never);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_ReturnsCachedValue_IfEnabled()
+        {
+            // Arrange
+            var id = "unique-id";
+            var childContent = "original-child-content";
+            var cache = new MemoryCache(new MemoryCacheOptions());
+            var tagHelperContext = GetTagHelperContext(id);
+            var tagHelperOutput = GetTagHelperOutput(
+                attributes: new TagHelperAttributeList(),
+                childContent: childContent);
+            var cacheTagHelper = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                Enabled = true
+            };
+
+            // Act
+            await cacheTagHelper.ProcessAsync(tagHelperContext, tagHelperOutput);
+
+            // Assert
+            Assert.Empty(tagHelperOutput.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput.PostContent.GetContent());
+            Assert.True(tagHelperOutput.IsContentModified);
+            Assert.Equal(childContent, tagHelperOutput.Content.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_ReturnsCachedValue_IfVaryByParamIsUnchanged()
+        {
+            // Arrange - 1
+            var id = "unique-id";
+            var childContent = "original-child-content";
+            var cache = new MemoryCache(new MemoryCacheOptions());
+            var tagHelperContext1 = GetTagHelperContext(id);
+            var tagHelperOutput1 = GetTagHelperOutput(
+                attributes: new TagHelperAttributeList(),
+                childContent: childContent);
+            var cacheTagHelper1 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                VaryByQuery = "key1,key2",
+                ViewContext = GetViewContext(),
+            };
+            cacheTagHelper1.ViewContext.HttpContext.Request.QueryString = new QueryString(
+                "?key1=value1&key2=value2");
+
+            // Act - 1
+            await cacheTagHelper1.ProcessAsync(tagHelperContext1, tagHelperOutput1);
+
+            // Assert - 1
+            Assert.Empty(tagHelperOutput1.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput1.PostContent.GetContent());
+            Assert.True(tagHelperOutput1.IsContentModified);
+            Assert.Equal(childContent, tagHelperOutput1.Content.GetContent());
+
+            // Arrange - 2
+            var tagHelperContext2 = GetTagHelperContext(id);
+            var tagHelperOutput2 = GetTagHelperOutput(
+                attributes: new TagHelperAttributeList(),
+                childContent: "different-content");
+            var cacheTagHelper2 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                VaryByQuery = "key1,key2",
+                ViewContext = GetViewContext(),
+            };
+            cacheTagHelper2.ViewContext.HttpContext.Request.QueryString = new QueryString(
+                "?key1=value1&key2=value2");
+
+            // Act - 2
+            await cacheTagHelper2.ProcessAsync(tagHelperContext2, tagHelperOutput2);
+
+            // Assert - 2
+            Assert.Empty(tagHelperOutput2.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput2.PostContent.GetContent());
+            Assert.True(tagHelperOutput2.IsContentModified);
+            Assert.Equal(childContent, tagHelperOutput2.Content.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_RecalculatesValueIfCacheKeyChanges()
+        {
+            // Arrange - 1
+            var id = "unique-id";
+            var childContent1 = "original-child-content";
+            var cache = new MemoryCache(new MemoryCacheOptions());
+            var tagHelperContext1 = GetTagHelperContext(id);
+            var tagHelperOutput1 = GetTagHelperOutput(childContent: childContent1);
+            tagHelperOutput1.PreContent.Append("<cache>");
+            tagHelperOutput1.PostContent.SetContent("</cache>");
+            var cacheTagHelper1 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                VaryByCookie = "cookie1,cookie2",
+                ViewContext = GetViewContext(),
+            };
+            cacheTagHelper1.ViewContext.HttpContext.Request.Headers["Cookie"] = "cookie1=value1;cookie2=value2";
+
+            // Act - 1
+            await cacheTagHelper1.ProcessAsync(tagHelperContext1, tagHelperOutput1);
+
+            // Assert - 1
+            Assert.Empty(tagHelperOutput1.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput1.PostContent.GetContent());
+            Assert.True(tagHelperOutput1.IsContentModified);
+            Assert.Equal(childContent1, tagHelperOutput1.Content.GetContent());
+
+            // Arrange - 2
+            var childContent2 = "different-content";
+            var tagHelperContext2 = GetTagHelperContext(id);
+            var tagHelperOutput2 = GetTagHelperOutput(childContent: childContent2);
+            tagHelperOutput2.PreContent.SetContent("<cache>");
+            tagHelperOutput2.PostContent.SetContent("</cache>");
+            var cacheTagHelper2 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                VaryByCookie = "cookie1,cookie2",
+                ViewContext = GetViewContext(),
+            };
+            cacheTagHelper2.ViewContext.HttpContext.Request.Headers["Cookie"] = "cookie1=value1;cookie2=not-value2";
+
+            // Act - 2
+            await cacheTagHelper2.ProcessAsync(tagHelperContext2, tagHelperOutput2);
+
+            // Assert - 2
+            Assert.Empty(tagHelperOutput2.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput2.PostContent.GetContent());
+            Assert.True(tagHelperOutput2.IsContentModified);
+            Assert.Equal(childContent2, tagHelperOutput2.Content.GetContent());
+        }
+
+        [Fact]
+        public void UpdateCacheEntryOptions_SetsAbsoluteExpiration_IfExpiresOnIsSet()
+        {
+            // Arrange
+            var expiresOn = DateTimeOffset.UtcNow.AddMinutes(4);
+            var cache = new MemoryCache(new MemoryCacheOptions());
+            var cacheTagHelper = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                ExpiresOn = expiresOn
+            };
+
+            // Act
+            var cacheEntryOptions = cacheTagHelper.GetMemoryCacheEntryOptions();
+
+            // Assert
+            Assert.Equal(expiresOn, cacheEntryOptions.AbsoluteExpiration);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_SetsEntrySize_ForPlaceholderAndFinalCacheEntries()
+        {
+            // Arrange
+            var mockCache = new Mock<IMemoryCache>();
+            var tempEntry = new Mock<ICacheEntry>();
+            tempEntry.SetupAllProperties();
+            tempEntry.Setup(e => e.ExpirationTokens).Returns(new List<IChangeToken>());
+            tempEntry.Setup(e => e.PostEvictionCallbacks).Returns(new List<PostEvictionCallbackRegistration>());
+            var finalEntry = new Mock<ICacheEntry>();
+            finalEntry.SetupAllProperties();
+            finalEntry.Setup(e => e.ExpirationTokens).Returns(new List<IChangeToken>());
+            finalEntry.Setup(e => e.PostEvictionCallbacks).Returns(new List<PostEvictionCallbackRegistration>());
+            object value;
+            mockCache
+                .Setup(s => s.TryGetValue(It.IsAny<object>(), out value))
+                .Returns(false);
+
+            mockCache.SetupSequence(mc => mc.CreateEntry(It.IsAny<object>()))
+                .Returns(tempEntry.Object)
+                .Returns(finalEntry.Object);
+
+            var id = "unique-id";
+            var childContent1 = "original-child-content";
+            var tagHelperContext1 = GetTagHelperContext(id);
+            var tagHelperOutput1 = GetTagHelperOutput(childContent: childContent1);
+            tagHelperOutput1.PreContent.Append("<cache>");
+            tagHelperOutput1.PostContent.SetContent("</cache>");
+            var cacheTagHelper1 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(mockCache.Object), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+            };
+
+            // Act
+            await cacheTagHelper1.ProcessAsync(tagHelperContext1, tagHelperOutput1);
+
+            // Assert
+            Assert.Empty(tagHelperOutput1.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput1.PostContent.GetContent());
+            Assert.True(tagHelperOutput1.IsContentModified);
+            Assert.Equal(childContent1, tagHelperOutput1.Content.GetContent());
+            tempEntry.VerifySet(e => e.Size = 64);
+            finalEntry.VerifySet(e => e.Size = childContent1.Length * 2);
+        }
+
+        [Fact]
+        public void UpdateCacheEntryOptions_DefaultsTo30SecondsSliding_IfNoEvictionCriteriaIsProvided()
+        {
+            // Arrange
+            var slidingExpiresIn = TimeSpan.FromSeconds(30);
+            var cache = new MemoryCache(new MemoryCacheOptions());
+            var cacheTagHelper = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder());
+
+            // Act
+            var cacheEntryOptions = cacheTagHelper.GetMemoryCacheEntryOptions();
+
+            // Assert
+            Assert.Equal(slidingExpiresIn, cacheEntryOptions.SlidingExpiration);
+        }
+
+        [Fact]
+        public void UpdateCacheEntryOptions_SetsAbsoluteExpiration_IfExpiresAfterIsSet()
+        {
+            // Arrange
+            var expiresAfter = TimeSpan.FromSeconds(42);
+            var cache = new MemoryCache(new MemoryCacheOptions());
+            var cacheTagHelper = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                ExpiresAfter = expiresAfter
+            };
+
+            // Act
+            var cacheEntryOptions = cacheTagHelper.GetMemoryCacheEntryOptions();
+
+            // Assert
+            Assert.Equal(expiresAfter, cacheEntryOptions.AbsoluteExpirationRelativeToNow);
+        }
+
+        [Fact]
+        public void UpdateCacheEntryOptions_SetsSlidingExpiration_IfExpiresSlidingIsSet()
+        {
+            // Arrange
+            var expiresSliding = TimeSpan.FromSeconds(37);
+            var cache = new MemoryCache(new MemoryCacheOptions());
+            var cacheTagHelper = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                ExpiresSliding = expiresSliding
+            };
+
+            // Act
+            var cacheEntryOptions = cacheTagHelper.GetMemoryCacheEntryOptions();
+
+            // Assert
+            Assert.Equal(expiresSliding, cacheEntryOptions.SlidingExpiration);
+        }
+
+        [Fact]
+        public void UpdateCacheEntryOptions_SetsCachePreservationPriority()
+        {
+            // Arrange
+            var priority = CacheItemPriority.High;
+            var cache = new MemoryCache(new MemoryCacheOptions());
+            var cacheTagHelper = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                Priority = priority
+            };
+
+            // Act
+            var cacheEntryOptions = cacheTagHelper.GetMemoryCacheEntryOptions();
+
+            // Assert
+            Assert.Equal(priority, cacheEntryOptions.Priority);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_UsesExpiresAfter_ToExpireCacheEntry()
+        {
+            // Arrange - 1
+            var currentTime = new DateTimeOffset(2010, 1, 1, 0, 0, 0, TimeSpan.Zero);
+            var id = "unique-id";
+            var childContent1 = "original-child-content";
+            var clock = new Mock<ISystemClock>();
+            clock.SetupGet(p => p.UtcNow)
+                .Returns(() => currentTime);
+            var cache = new MemoryCache(new MemoryCacheOptions { Clock = clock.Object });
+            var tagHelperContext1 = GetTagHelperContext(id);
+            var tagHelperOutput1 = GetTagHelperOutput(childContent: childContent1);
+            tagHelperOutput1.PreContent.SetContent("<cache>");
+            tagHelperOutput1.PostContent.SetContent("</cache>");
+            var cacheTagHelper1 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                ExpiresAfter = TimeSpan.FromMinutes(10)
+            };
+
+            // Act - 1
+            await cacheTagHelper1.ProcessAsync(tagHelperContext1, tagHelperOutput1);
+
+            // Assert - 1
+            Assert.Empty(tagHelperOutput1.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput1.PostContent.GetContent());
+            Assert.True(tagHelperOutput1.IsContentModified);
+            Assert.Equal(childContent1, tagHelperOutput1.Content.GetContent());
+
+            // Arrange - 2
+            var childContent2 = "different-content";
+            var tagHelperContext2 = GetTagHelperContext(id);
+            var tagHelperOutput2 = GetTagHelperOutput(childContent: childContent2);
+            tagHelperOutput2.PreContent.SetContent("<cache>");
+            tagHelperOutput2.PostContent.SetContent("</cache>");
+            var cacheTagHelper2 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                ExpiresAfter = TimeSpan.FromMinutes(10)
+            };
+            currentTime = currentTime.AddMinutes(11);
+
+            // Act - 2
+            await cacheTagHelper2.ProcessAsync(tagHelperContext2, tagHelperOutput2);
+
+            // Assert - 2
+            Assert.Empty(tagHelperOutput2.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput2.PostContent.GetContent());
+            Assert.True(tagHelperOutput2.IsContentModified);
+            Assert.Equal(childContent2, tagHelperOutput2.Content.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_UsesExpiresOn_ToExpireCacheEntry()
+        {
+            // Arrange - 1
+            var currentTime = new DateTimeOffset(2010, 1, 1, 0, 0, 0, TimeSpan.Zero);
+            var id = "unique-id";
+            var childContent1 = "original-child-content";
+            var clock = new Mock<ISystemClock>();
+            clock.SetupGet(p => p.UtcNow)
+                .Returns(() => currentTime);
+            var cache = new MemoryCache(new MemoryCacheOptions { Clock = clock.Object });
+            var tagHelperContext1 = GetTagHelperContext(id);
+            var tagHelperOutput1 = GetTagHelperOutput(childContent: childContent1);
+            tagHelperOutput1.PreContent.SetContent("<cache>");
+            tagHelperOutput1.PostContent.SetContent("</cache>");
+            var cacheTagHelper1 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                ExpiresOn = currentTime.AddMinutes(5)
+            };
+
+            // Act - 1
+            await cacheTagHelper1.ProcessAsync(tagHelperContext1, tagHelperOutput1);
+
+            // Assert - 1
+            Assert.Empty(tagHelperOutput1.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput1.PostContent.GetContent());
+            Assert.True(tagHelperOutput1.IsContentModified);
+            Assert.Equal(childContent1, tagHelperOutput1.Content.GetContent());
+
+            // Arrange - 2
+            currentTime = currentTime.AddMinutes(5).AddSeconds(2);
+            var childContent2 = "different-content";
+            var tagHelperContext2 = GetTagHelperContext(id);
+            var tagHelperOutput2 = GetTagHelperOutput(childContent: childContent2);
+            tagHelperOutput2.PreContent.SetContent("<cache>");
+            tagHelperOutput2.PostContent.SetContent("</cache>");
+            var cacheTagHelper2 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                ExpiresOn = currentTime.AddMinutes(5)
+            };
+
+            // Act - 2
+            await cacheTagHelper2.ProcessAsync(tagHelperContext2, tagHelperOutput2);
+
+            // Assert - 2
+            Assert.Empty(tagHelperOutput2.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput2.PostContent.GetContent());
+            Assert.True(tagHelperOutput2.IsContentModified);
+            Assert.Equal(childContent2, tagHelperOutput2.Content.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_UsesExpiresSliding_ToExpireCacheEntryWithSlidingExpiration()
+        {
+            // Arrange - 1
+            var currentTime = new DateTimeOffset(2010, 1, 1, 0, 0, 0, TimeSpan.Zero);
+            var id = "unique-id";
+            var childContent1 = "original-child-content";
+            var clock = new Mock<ISystemClock>();
+            clock.SetupGet(p => p.UtcNow)
+                .Returns(() => currentTime);
+            var cache = new MemoryCache(new MemoryCacheOptions { Clock = clock.Object });
+            var tagHelperContext1 = GetTagHelperContext(id);
+            var tagHelperOutput1 = GetTagHelperOutput(childContent: childContent1);
+            tagHelperOutput1.PreContent.SetContent("<cache>");
+            tagHelperOutput1.PostContent.SetContent("</cache>");
+            var cacheTagHelper1 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                ExpiresSliding = TimeSpan.FromSeconds(30)
+            };
+
+            // Act - 1
+            await cacheTagHelper1.ProcessAsync(tagHelperContext1, tagHelperOutput1);
+
+            // Assert - 1
+            Assert.Empty(tagHelperOutput1.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput1.PostContent.GetContent());
+            Assert.True(tagHelperOutput1.IsContentModified);
+            Assert.Equal(childContent1, tagHelperOutput1.Content.GetContent());
+
+            // Arrange - 2
+            currentTime = currentTime.AddSeconds(35);
+            var childContent2 = "different-content";
+            var tagHelperContext2 = GetTagHelperContext(id);
+            var tagHelperOutput2 = GetTagHelperOutput(childContent: childContent2);
+            tagHelperOutput2.PreContent.SetContent("<cache>");
+            tagHelperOutput2.PostContent.SetContent("</cache>");
+            var cacheTagHelper2 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                ExpiresSliding = TimeSpan.FromSeconds(30)
+            };
+
+            // Act - 2
+            await cacheTagHelper2.ProcessAsync(tagHelperContext2, tagHelperOutput2);
+
+            // Assert - 2
+            Assert.Empty(tagHelperOutput2.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput2.PostContent.GetContent());
+            Assert.True(tagHelperOutput2.IsContentModified);
+            Assert.Equal(childContent2, tagHelperOutput2.Content.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_FlowsEntryLinkThatAllowsAddingTriggersToAddedEntry()
+        {
+            // Arrange
+            var id = "some-id";
+            var expectedContent = new DefaultTagHelperContent();
+            expectedContent.SetContent("some-content");
+            var tokenSource = new CancellationTokenSource();
+            var cache = new MemoryCache(new MemoryCacheOptions());
+            var cacheEntryOptions = new MemoryCacheEntryOptions()
+                .AddExpirationToken(new CancellationChangeToken(tokenSource.Token));
+            var tagHelperContext = new TagHelperContext(
+                tagName: "cache",
+                allAttributes: new TagHelperAttributeList(),
+                items: new Dictionary<object, object>(),
+                uniqueId: id);
+            var tagHelperOutput = new TagHelperOutput(
+                "cache",
+                new TagHelperAttributeList { { "attr", "value" } },
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    if (!cache.TryGetValue("key1", out TagHelperContent tagHelperContent))
+                    {
+                        tagHelperContent = expectedContent;
+                        cache.Set("key1", tagHelperContent, cacheEntryOptions);
+                    }
+
+                    return Task.FromResult(tagHelperContent);
+                });
+            tagHelperOutput.PreContent.SetContent("<cache>");
+            tagHelperOutput.PostContent.SetContent("</cache>");
+            var cacheTagHelper = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+            };
+
+            var cacheTagKey = new CacheTagKey(cacheTagHelper, tagHelperContext);
+            var key = cacheTagKey.GenerateKey();
+
+            // Act - 1
+            await cacheTagHelper.ProcessAsync(tagHelperContext, tagHelperOutput);
+            var result = cache.TryGetValue(cacheTagKey, out Task<IHtmlContent> cachedValue);
+
+            // Assert - 1
+            Assert.Equal("HtmlEncode[[some-content]]", tagHelperOutput.Content.GetContent());
+            Assert.True(result);
+
+            // Act - 2
+            tokenSource.Cancel();
+            result = cache.TryGetValue(cacheTagKey, out cachedValue);
+
+            // Assert - 2
+            Assert.False(result);
+            Assert.Null(cachedValue);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_ComputesValueOnce_WithConcurrentRequests()
+        {
+            // Arrange
+            var id = "unique-id";
+            var childContent = "some-content";
+            var resetEvent1 = new ManualResetEvent(false);
+            var resetEvent2 = new ManualResetEvent(false);
+            var resetEvent3 = new ManualResetEvent(false);
+            var calls = 0;
+            var cache = new MemoryCache(new MemoryCacheOptions());
+
+            var tagHelperContext1 = GetTagHelperContext(id + 1);
+            var tagHelperContext2 = GetTagHelperContext(id + 2);
+
+            var tagHelperOutput1 = new TagHelperOutput(
+                "cache",
+                new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    calls++;
+                    resetEvent2.Set();
+
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetHtmlContent(childContent);
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+
+            var tagHelperOutput2 = new TagHelperOutput(
+                "cache",
+                new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    calls++;
+                    resetEvent3.WaitOne(5000);
+
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetHtmlContent(childContent);
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+
+            var cacheTagHelper1 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                Enabled = true
+            };
+
+            var cacheTagHelper2 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                Enabled = true
+            };
+
+            // Act
+
+            var task1 = Task.Run(async () =>
+            {
+                resetEvent1.WaitOne(5000);
+                await cacheTagHelper1.ProcessAsync(tagHelperContext1, tagHelperOutput1);
+                resetEvent3.Set();
+            });
+
+            var task2 = Task.Run(async () =>
+            {
+                resetEvent2.WaitOne(5000);
+                await cacheTagHelper2.ProcessAsync(tagHelperContext1, tagHelperOutput2);
+            });
+
+            resetEvent1.Set();
+            await Task.WhenAll(task1, task2);
+
+            // Assert
+            Assert.Empty(tagHelperOutput1.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput1.PostContent.GetContent());
+            Assert.True(tagHelperOutput1.IsContentModified);
+            Assert.Equal(childContent, tagHelperOutput1.Content.GetContent());
+
+            Assert.Empty(tagHelperOutput2.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput2.PostContent.GetContent());
+            Assert.True(tagHelperOutput2.IsContentModified);
+            Assert.Equal(childContent, tagHelperOutput2.Content.GetContent());
+
+            Assert.Equal(1, calls);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_ExceptionInProcessing_DoesntBlockConcurrentRequests()
+        {
+            // Arrange
+            var id = "unique-id";
+            var childContent = "some-content";
+            var resetEvent1 = new ManualResetEvent(false);
+            var resetEvent2 = new ManualResetEvent(false);
+            var resetEvent3 = new ManualResetEvent(false);
+            var calls = 0;
+            var cache = new MemoryCache(new MemoryCacheOptions());
+
+            var tagHelperContext1 = GetTagHelperContext(id + 1);
+            var tagHelperContext2 = GetTagHelperContext(id + 2);
+
+            var tagHelperOutput1 = new TagHelperOutput(
+                "cache",
+                new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    calls++;
+                    resetEvent2.Set();
+
+                    throw new Exception();
+                });
+
+            var tagHelperOutput2 = new TagHelperOutput(
+                "cache",
+                new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    calls++;
+                    resetEvent3.WaitOne(5000);
+
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetHtmlContent(childContent);
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+
+            var cacheTagHelper1 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                Enabled = true
+            };
+
+            var cacheTagHelper2 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                Enabled = true
+            };
+
+            // Act
+
+            var task1 = Task.Run(async () =>
+            {
+                resetEvent1.WaitOne(5000);
+                await Assert.ThrowsAsync<Exception>(() => cacheTagHelper1.ProcessAsync(tagHelperContext1, tagHelperOutput1));
+                resetEvent3.Set();
+            });
+
+            var task2 = Task.Run(async () =>
+            {
+                resetEvent2.WaitOne(5000);
+                await cacheTagHelper2.ProcessAsync(tagHelperContext2, tagHelperOutput2);
+            });
+
+            resetEvent1.Set();
+            await Task.WhenAll(task1, task2);
+
+            // Assert
+            Assert.Empty(tagHelperOutput1.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput1.PostContent.GetContent());
+            Assert.False(tagHelperOutput1.IsContentModified);
+            Assert.Empty(tagHelperOutput1.Content.GetContent());
+
+            Assert.Empty(tagHelperOutput2.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput2.PostContent.GetContent());
+            Assert.True(tagHelperOutput2.IsContentModified);
+            Assert.Equal(childContent, tagHelperOutput2.Content.GetContent());
+
+            Assert.Equal(2, calls);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_ExceptionInProcessing_DoNotThrowInSubsequentRequests()
+        {
+            // Arrange
+            var id = "unique-id";
+            var childContent = "some-content";
+            var cache = new MemoryCache(new MemoryCacheOptions());
+
+            var counter = 0;
+
+            Task<TagHelperContent> GetChildContentAsync(bool useCachedResult, HtmlEncoder encoder)
+            {
+                counter++;
+                if (counter < 3)
+                {
+                    // throw on first two calls
+                    throw new Exception();
+                }
+                else
+                {
+                    // produce content on third call
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetHtmlContent(childContent);
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                }
+            }
+
+            var tagHelperContext1 = GetTagHelperContext(id);
+            var tagHelperContext2 = GetTagHelperContext(id);
+            var tagHelperContext3 = GetTagHelperContext(id);
+            var tagHelperContext4 = GetTagHelperContext(id);
+
+            var tagHelperOutput1 = new TagHelperOutput("cache", new TagHelperAttributeList(), GetChildContentAsync);
+            var tagHelperOutput2 = new TagHelperOutput("cache", new TagHelperAttributeList(), GetChildContentAsync);
+            var tagHelperOutput3 = new TagHelperOutput("cache", new TagHelperAttributeList(), GetChildContentAsync);
+            var tagHelperOutput4 = new TagHelperOutput("cache", new TagHelperAttributeList(), GetChildContentAsync);
+
+            var cacheTagHelper = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                Enabled = true,
+                ExpiresAfter = TimeSpan.FromHours(1.0)
+            };
+
+            // Act - 1
+
+            await Assert.ThrowsAsync<Exception>(() => cacheTagHelper.ProcessAsync(tagHelperContext1, tagHelperOutput1));
+
+            // Assert - 1
+
+            Assert.Equal(1, counter);
+            Assert.Empty(tagHelperOutput1.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput1.PostContent.GetContent());
+            Assert.False(tagHelperOutput1.IsContentModified);
+            Assert.Empty(tagHelperOutput1.Content.GetContent());
+
+            // Act - 2
+
+            await Assert.ThrowsAsync<Exception>(() => cacheTagHelper.ProcessAsync(tagHelperContext2, tagHelperOutput2));
+
+            // Assert - 2
+
+            Assert.Equal(2, counter);
+            Assert.Empty(tagHelperOutput2.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput2.PostContent.GetContent());
+            Assert.False(tagHelperOutput2.IsContentModified);
+            Assert.Empty(tagHelperOutput2.Content.GetContent());
+
+            // Act - 3
+
+            await cacheTagHelper.ProcessAsync(tagHelperContext3, tagHelperOutput3);
+
+            // Assert - 3
+
+            Assert.Equal(3, counter);
+            Assert.Empty(tagHelperOutput3.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput3.PostContent.GetContent());
+            Assert.True(tagHelperOutput3.IsContentModified);
+            Assert.Equal(childContent, tagHelperOutput3.Content.GetContent());
+
+            // Act - 4
+
+            await cacheTagHelper.ProcessAsync(tagHelperContext4, tagHelperOutput4);
+
+            // Assert - 4
+
+            Assert.Equal(3, counter);
+            Assert.Empty(tagHelperOutput4.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput4.PostContent.GetContent());
+            Assert.True(tagHelperOutput4.IsContentModified);
+            Assert.Equal(childContent, tagHelperOutput4.Content.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_WorksForNestedCacheTagHelpers()
+        {
+            // Arrange
+            var expected = "Hello world";
+            var cache = new MemoryCache(new MemoryCacheOptions());
+            var encoder = new HtmlTestEncoder();
+            var cacheTagHelper1 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), encoder)
+            {
+                ViewContext = GetViewContext(),
+                Enabled = true
+            };
+
+            var cacheTagHelper2 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), encoder)
+            {
+                ViewContext = GetViewContext(),
+                Enabled = true
+            };
+
+            var tagHelperOutput2 = new TagHelperOutput(
+                "cache",
+                new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, _) =>
+                {
+                    var content = new DefaultTagHelperContent();
+                    content.SetContent(expected);
+                    return Task.FromResult<TagHelperContent>(content);
+                });
+
+            var tagHelperOutput1 = new TagHelperOutput(
+                "cache",
+                new TagHelperAttributeList(),
+                getChildContentAsync: async (useCachedResult, _) =>
+                {
+                    var context = GetTagHelperContext("test2");
+                    var output = tagHelperOutput2;
+                    await cacheTagHelper2.ProcessAsync(context, output);
+                    return await output.GetChildContentAsync();
+                });
+
+            // Act
+            await cacheTagHelper1.ProcessAsync(GetTagHelperContext(), tagHelperOutput1);
+
+            // Assert
+            Assert.Equal(encoder.Encode(expected), tagHelperOutput1.Content.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_ThrowsExceptionForAwaiters_IfExecutorEncountersAnException()
+        {
+            // Arrange
+            var expected = new DivideByZeroException();
+            var cache = new TestMemoryCache();
+            // The two instances represent two instances of the same cache tag helper appearance in the page.
+            var cacheTagHelper1 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                Enabled = true
+            };
+            var cacheTagHelper2 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                Enabled = true
+            };
+
+            var invokeCount = 0;
+            var tagHelperOutput = new TagHelperOutput(
+                "cache",
+                new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, _) =>
+                {
+                    invokeCount++;
+                    throw expected;
+                });
+
+            // Act
+            var task1 = Task.Run(() => cacheTagHelper1.ProcessAsync(GetTagHelperContext(cache.Key1), tagHelperOutput));
+            var task2 = Task.Run(() => cacheTagHelper2.ProcessAsync(GetTagHelperContext(cache.Key2), tagHelperOutput));
+
+            // Assert
+            await Assert.ThrowsAsync<DivideByZeroException>(() => task1);
+            await Assert.ThrowsAsync<DivideByZeroException>(() => task2);
+            Assert.Equal(1, invokeCount);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_AwaitersUseTheResultOfExecutor()
+        {
+            // Arrange
+            var expected = "Hello world";
+            var cache = new TestMemoryCache();
+            var encoder = new HtmlTestEncoder();
+            // The two instances represent two instances of the same cache tag helper appearance in the page.
+            var cacheTagHelper1 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), encoder)
+            {
+                ViewContext = GetViewContext(),
+                Enabled = true
+            };
+
+            var cacheTagHelper2 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), encoder)
+            {
+                ViewContext = GetViewContext(),
+                Enabled = true
+            };
+
+            var invokeCount = 0;
+            var tagHelperOutput = new TagHelperOutput(
+                "cache",
+                new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, _) =>
+                {
+                    invokeCount++;
+
+                    var content = new DefaultTagHelperContent();
+                    content.SetContent(expected);
+                    return Task.FromResult<TagHelperContent>(content);
+                });
+
+            // Act
+            var task1 = Task.Run(() => cacheTagHelper1.ProcessAsync(GetTagHelperContext(cache.Key1), tagHelperOutput));
+            var task2 = Task.Run(() => cacheTagHelper2.ProcessAsync(GetTagHelperContext(cache.Key2), tagHelperOutput));
+
+            // Assert
+            await Task.WhenAll(task1, task2);
+            Assert.Equal(encoder.Encode(expected), tagHelperOutput.Content.GetContent());
+            Assert.Equal(1, invokeCount);
+        }
+
+        private static ViewContext GetViewContext()
+        {
+            var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+            return new ViewContext(
+                actionContext,
+                Mock.Of<IView>(),
+                new ViewDataDictionary(new EmptyModelMetadataProvider(), new ModelStateDictionary()),
+                Mock.Of<ITempDataDictionary>(),
+                TextWriter.Null,
+                new HtmlHelperOptions());
+        }
+
+        private static TagHelperContext GetTagHelperContext(string id = "testid")
+        {
+            return new TagHelperContext(
+                tagName: "cache",
+                allAttributes: new TagHelperAttributeList(),
+                items: new Dictionary<object, object>(),
+                uniqueId: id);
+        }
+
+        private static TagHelperOutput GetTagHelperOutput(
+            string tagName = "cache",
+            TagHelperAttributeList attributes = null,
+            string childContent = "some child content")
+        {
+            attributes = attributes ?? new TagHelperAttributeList { { "attr", "value" } };
+
+            return new TagHelperOutput(
+                tagName,
+                attributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetHtmlContent(childContent);
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+        }
+
+        private class TestCacheEntry : ICacheEntry
+        {
+            public object Key { get; set; }
+            public object Value { get; set; }
+            public DateTimeOffset? AbsoluteExpiration { get; set; }
+            public TimeSpan? AbsoluteExpirationRelativeToNow { get; set; }
+            public TimeSpan? SlidingExpiration { get; set; }
+            public long? Size { get; set; }
+
+            public IList<IChangeToken> ExpirationTokens { get; } = new List<IChangeToken>();
+
+            public IList<PostEvictionCallbackRegistration> PostEvictionCallbacks { get; } =
+                new List<PostEvictionCallbackRegistration>();
+
+            public CacheItemPriority Priority { get; set; }
+
+            public Action DisposeCallback { get; set; }
+
+            public void Dispose() => DisposeCallback();
+        }
+
+        // Simulates the scenario where a call to CacheTagHelper.ProcessAsync appears immediately after a prior one has assigned
+        // a TaskCancellationSource as an entry. We want to ensure that both calls use the results of the TCS as their output.
+        private class TestMemoryCache : IMemoryCache
+        {
+            private const int WaitTimeout = 5000;
+            public readonly string Key1 = "Key1";
+            public readonly string Key2 = "Key2";
+            public readonly ManualResetEventSlim ManualResetEvent1 = new ManualResetEventSlim();
+            public readonly ManualResetEventSlim ManualResetEvent2 = new ManualResetEventSlim();
+            public TestCacheEntry Entry { get; private set; }
+
+            public ICacheEntry CreateEntry(object key)
+            {
+                if (Entry != null)
+                {
+                    // We're being invoked in the inner "CreateEntry" call where the TCS is replaced by the GetChildContentAsync
+                    // Task. Wait for the other concurrent Task to grab the TCS before we proceed.
+                    Assert.True(ManualResetEvent1.Wait(WaitTimeout));
+                }
+
+                var cacheKey = Assert.IsType<CacheTagKey>(key);
+                Assert.Equal(Key1, cacheKey.Key);
+
+                Entry = new TestCacheEntry
+                {
+                    Key = key,
+                    DisposeCallback = ManualResetEvent2.Set,
+                };
+
+                return Entry;
+            }
+
+            public void Dispose()
+            {
+            }
+
+            public void Remove(object key)
+            {
+            }
+
+            public bool TryGetValue(object key, out object value)
+            {
+                var cacheKey = Assert.IsType<CacheTagKey>(key);
+                if (cacheKey.Key == Key2)
+                {
+                    Assert.True(ManualResetEvent2.Wait(WaitTimeout));
+
+                    Assert.NotNull(Entry);
+                    value = Entry.Value;
+                    Assert.NotNull(value);
+
+                    ManualResetEvent1.Set();
+
+                    return true;
+                }
+                else if (cacheKey.Key == Key1)
+                {
+                    value = null;
+                    return false;
+                }
+
+                throw new Exception();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagKeyTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagKeyTest.cs
new file mode 100644
index 0000000000..7cd1718b20
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagKeyTest.cs
@@ -0,0 +1,394 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Security.Claims;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TagHelpers.Cache;
+using Microsoft.AspNetCore.Mvc.TagHelpers.Internal;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    public class CacheTagKeyTest
+    {
+        [Fact]
+        public void GenerateKey_ReturnsKeyBasedOnTagHelperUniqueId()
+        {
+            // Arrange
+            var id = Guid.NewGuid().ToString();
+            var tagHelperContext = GetTagHelperContext(id);
+            var cacheTagHelper = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(Mock.Of<IMemoryCache>()), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext()
+            };
+            var expected = "CacheTagHelper||" + id;
+
+            // Act
+            var cacheTagKey = new CacheTagKey(cacheTagHelper, tagHelperContext);
+            var key = cacheTagKey.GenerateKey();
+
+            // Assert
+            Assert.Equal(expected, key);
+        }
+
+        [Fact]
+        public void Equals_ReturnsTrueOnSameKey()
+        {
+            // Arrange
+            var id = Guid.NewGuid().ToString();
+            var tagHelperContext1 = GetTagHelperContext(id);
+            var cacheTagHelper1 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(Mock.Of<IMemoryCache>()), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext()
+            };
+
+            var tagHelperContext2 = GetTagHelperContext(id);
+            var cacheTagHelper2 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(Mock.Of<IMemoryCache>()), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext()
+            };
+
+            // Act
+            var cacheTagKey1 = new CacheTagKey(cacheTagHelper1, tagHelperContext1);
+            var cacheTagKey2 = new CacheTagKey(cacheTagHelper2, tagHelperContext2);
+
+            // Assert
+            Assert.Equal(cacheTagKey1, cacheTagKey2);
+        }
+
+        [Fact]
+        public void Equals_ReturnsFalseOnDifferentKey()
+        {
+            // Arrange
+            var tagHelperContext1 = GetTagHelperContext("some-id");
+            var cacheTagHelper1 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(Mock.Of<IMemoryCache>()), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext()
+            };
+
+            var tagHelperContext2 = GetTagHelperContext("some-other-id");
+            var cacheTagHelper2 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(Mock.Of<IMemoryCache>()), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext()
+            };
+
+            // Act
+            var cacheTagKey1 = new CacheTagKey(cacheTagHelper1, tagHelperContext1);
+            var cacheTagKey2 = new CacheTagKey(cacheTagHelper2, tagHelperContext2);
+
+            // Assert
+            Assert.NotEqual(cacheTagKey1, cacheTagKey2);
+        }
+
+        [Fact]
+        public void GetHashCode_IsSameForSimilarCacheTagHelper()
+        {
+            // Arrange
+            var tagHelperContext1 = GetTagHelperContext("some-id");
+            var cacheTagHelper1 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(Mock.Of<IMemoryCache>()), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext()
+            };
+
+            var tagHelperContext2 = GetTagHelperContext("some-id");
+            var cacheTagHelper2 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(Mock.Of<IMemoryCache>()), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext()
+            };
+
+            var cacheKey1 = new CacheTagKey(cacheTagHelper1, tagHelperContext1);
+            var cacheKey2 = new CacheTagKey(cacheTagHelper2, tagHelperContext2);
+
+            // Act
+            var hashcode1 = cacheKey1.GetHashCode();
+            var hashcode2 = cacheKey2.GetHashCode();
+
+            // Assert
+            Assert.Equal(hashcode1, hashcode2);
+        }
+
+        [Fact]
+        public void GetHashCode_VariesByUniqueId()
+        {
+            // Arrange
+            var tagHelperContext1 = GetTagHelperContext("some-id");
+            var cacheTagHelper1 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(Mock.Of<IMemoryCache>()), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext()
+            };
+
+            var tagHelperContext2 = GetTagHelperContext("some-other-id");
+            var cacheTagHelper2 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(Mock.Of<IMemoryCache>()), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext()
+            };
+
+            var cacheKey1 = new CacheTagKey(cacheTagHelper1, tagHelperContext1);
+            var cacheKey2 = new CacheTagKey(cacheTagHelper2, tagHelperContext2);
+
+            // Act
+            var hashcode1 = cacheKey1.GetHashCode();
+            var hashcode2 = cacheKey2.GetHashCode();
+
+            // Assert
+            Assert.NotEqual(hashcode1, hashcode2);
+        }
+
+        [Fact]
+        public void GenerateKey_ReturnsKeyBasedOnTagHelperName()
+        {
+            // Arrange
+            var name = "some-name";
+            var tagHelperContext = GetTagHelperContext();
+            var cacheTagHelper = new DistributedCacheTagHelper(
+                Mock.Of<IDistributedCacheTagHelperService>(),
+                new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                Name = name
+            };
+            var expected = "DistributedCacheTagHelper||" + name;
+
+            // Act
+            var cacheTagKey = new CacheTagKey(cacheTagHelper);
+            var key = cacheTagKey.GenerateKey();
+
+            // Assert
+            Assert.Equal(expected, key);
+        }
+
+        [Theory]
+        [InlineData("Vary-By-Value")]
+        [InlineData("Vary  with spaces")]
+        [InlineData("  Vary  with more spaces   ")]
+        public void GenerateKey_UsesVaryByPropertyToGenerateKey(string varyBy)
+        {
+            // Arrange
+            var tagHelperContext = GetTagHelperContext();
+            var cacheTagHelper = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(Mock.Of<IMemoryCache>()), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                VaryBy = varyBy
+            };
+            var expected = "CacheTagHelper||testid||VaryBy||" + varyBy;
+
+            // Act
+            var cacheTagKey = new CacheTagKey(cacheTagHelper, tagHelperContext);
+            var key = cacheTagKey.GenerateKey();
+
+            // Assert
+            Assert.Equal(expected, key);
+        }
+
+        [Theory]
+        [InlineData("Cookie0", "CacheTagHelper||testid||VaryByCookie(Cookie0||Cookie0Value)")]
+        [InlineData("Cookie0,Cookie1",
+            "CacheTagHelper||testid||VaryByCookie(Cookie0||Cookie0Value||Cookie1||Cookie1Value)")]
+        [InlineData("Cookie0, Cookie1",
+            "CacheTagHelper||testid||VaryByCookie(Cookie0||Cookie0Value||Cookie1||Cookie1Value)")]
+        [InlineData("   Cookie0,   ,   Cookie1   ",
+            "CacheTagHelper||testid||VaryByCookie(Cookie0||Cookie0Value||Cookie1||Cookie1Value)")]
+        [InlineData(",Cookie0,,Cookie1,",
+            "CacheTagHelper||testid||VaryByCookie(Cookie0||Cookie0Value||Cookie1||Cookie1Value)")]
+        public void GenerateKey_UsesVaryByCookieName(string varyByCookie, string expected)
+        {
+            // Arrange
+            var tagHelperContext = GetTagHelperContext();
+            var cacheTagHelper = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(Mock.Of<IMemoryCache>()), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                VaryByCookie = varyByCookie
+            };
+            cacheTagHelper.ViewContext.HttpContext.Request.Headers["Cookie"] =
+                "Cookie0=Cookie0Value;Cookie1=Cookie1Value";
+
+            // Act
+            var cacheTagKey = new CacheTagKey(cacheTagHelper, tagHelperContext);
+            var key = cacheTagKey.GenerateKey();
+
+            // Assert
+            Assert.Equal(expected, key);
+        }
+
+        [Theory]
+        [InlineData("Accept-Language", "CacheTagHelper||testid||VaryByHeader(Accept-Language||en-us;charset=utf8)")]
+        [InlineData("X-CustomHeader,Accept-Encoding, NotAvailable",
+            "CacheTagHelper||testid||VaryByHeader(X-CustomHeader||Header-Value||Accept-Encoding||utf8||NotAvailable||)")]
+        [InlineData("X-CustomHeader,  , Accept-Encoding, NotAvailable",
+            "CacheTagHelper||testid||VaryByHeader(X-CustomHeader||Header-Value||Accept-Encoding||utf8||NotAvailable||)")]
+        public void GenerateKey_UsesVaryByHeader(string varyByHeader, string expected)
+        {
+            // Arrange
+            var tagHelperContext = GetTagHelperContext();
+            var cacheTagHelper = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(Mock.Of<IMemoryCache>()), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                VaryByHeader = varyByHeader
+            };
+            var headers = cacheTagHelper.ViewContext.HttpContext.Request.Headers;
+            headers["Accept-Language"] = "en-us;charset=utf8";
+            headers["Accept-Encoding"] = "utf8";
+            headers["X-CustomHeader"] = "Header-Value";
+
+            // Act
+            var cacheTagKey = new CacheTagKey(cacheTagHelper, tagHelperContext);
+            var key = cacheTagKey.GenerateKey();
+
+            // Assert
+            Assert.Equal(expected, key);
+        }
+
+        [Theory]
+        [InlineData("category", "CacheTagHelper||testid||VaryByQuery(category||cats)")]
+        [InlineData("Category,SortOrder,SortOption",
+            "CacheTagHelper||testid||VaryByQuery(Category||cats||SortOrder||||SortOption||Adorability)")]
+        [InlineData("Category,  SortOrder, SortOption,  ",
+            "CacheTagHelper||testid||VaryByQuery(Category||cats||SortOrder||||SortOption||Adorability)")]
+        public void GenerateKey_UsesVaryByQuery(string varyByQuery, string expected)
+        {
+            // Arrange
+            var tagHelperContext = GetTagHelperContext();
+            var cacheTagHelper = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(Mock.Of<IMemoryCache>()), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                VaryByQuery = varyByQuery
+            };
+            cacheTagHelper.ViewContext.HttpContext.Request.QueryString =
+                new QueryString("?sortoption=Adorability&Category=cats&sortOrder=");
+
+            // Act
+            var cacheTagKey = new CacheTagKey(cacheTagHelper, tagHelperContext);
+            var key = cacheTagKey.GenerateKey();
+
+            // Assert
+            Assert.Equal(expected, key);
+        }
+
+        [Theory]
+        [InlineData("id", "CacheTagHelper||testid||VaryByRoute(id||4)")]
+        [InlineData("Category,,Id,OptionRouteValue",
+            "CacheTagHelper||testid||VaryByRoute(Category||MyCategory||Id||4||OptionRouteValue||)")]
+        [InlineData(" Category,  , Id,   OptionRouteValue,   ",
+            "CacheTagHelper||testid||VaryByRoute(Category||MyCategory||Id||4||OptionRouteValue||)")]
+        public void GenerateKey_UsesVaryByRoute(string varyByRoute, string expected)
+        {
+            // Arrange
+            var tagHelperContext = GetTagHelperContext();
+            var cacheTagHelper = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(Mock.Of<IMemoryCache>()), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                VaryByRoute = varyByRoute
+            };
+            cacheTagHelper.ViewContext.RouteData.Values["id"] = 4;
+            cacheTagHelper.ViewContext.RouteData.Values["category"] = "MyCategory";
+
+            // Act
+            var cacheTagKey = new CacheTagKey(cacheTagHelper, tagHelperContext);
+            var key = cacheTagKey.GenerateKey();
+
+            // Assert
+            Assert.Equal(expected, key);
+        }
+
+        [Fact]
+        public void GenerateKey_UsesVaryByUser_WhenUserIsNotAuthenticated()
+        {
+            // Arrange
+            var expected = "CacheTagHelper||testid||VaryByUser||";
+            var tagHelperContext = GetTagHelperContext();
+            var cacheTagHelper = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(Mock.Of<IMemoryCache>()), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                VaryByUser = true
+            };
+
+            // Act
+            var cacheTagKey = new CacheTagKey(cacheTagHelper, tagHelperContext);
+            var key = cacheTagKey.GenerateKey();
+
+            // Assert
+            Assert.Equal(expected, key);
+        }
+
+        [Fact]
+        public void GenerateKey_UsesVaryByUserAndAuthenticatedUserName()
+        {
+            // Arrange
+            var expected = "CacheTagHelper||testid||VaryByUser||test_name";
+            var tagHelperContext = GetTagHelperContext();
+            var cacheTagHelper = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(Mock.Of<IMemoryCache>()), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                VaryByUser = true
+            };
+            var identity = new ClaimsIdentity(new[] { new Claim(ClaimsIdentity.DefaultNameClaimType, "test_name") });
+            cacheTagHelper.ViewContext.HttpContext.User = new ClaimsPrincipal(identity);
+
+            // Act
+            var cacheTagKey = new CacheTagKey(cacheTagHelper, tagHelperContext);
+            var key = cacheTagKey.GenerateKey();
+
+            // Assert
+            Assert.Equal(expected, key);
+        }
+
+        [Fact]
+        public void GenerateKey_WithMultipleVaryByOptions_CreatesCombinedKey()
+        {
+            // Arrange
+            var expected = "CacheTagHelper||testid||VaryBy||custom-value||" +
+                "VaryByHeader(content-type||text/html)||VaryByUser||someuser";
+            var tagHelperContext = GetTagHelperContext();
+            var cacheTagHelper = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(Mock.Of<IMemoryCache>()), new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                VaryByUser = true,
+                VaryByHeader = "content-type",
+                VaryBy = "custom-value"
+            };
+            cacheTagHelper.ViewContext.HttpContext.Request.Headers["Content-Type"] = "text/html";
+            var identity = new ClaimsIdentity(new[] { new Claim(ClaimsIdentity.DefaultNameClaimType, "someuser") });
+            cacheTagHelper.ViewContext.HttpContext.User = new ClaimsPrincipal(identity);
+
+            // Act
+            var cacheTagKey = new CacheTagKey(cacheTagHelper, tagHelperContext);
+            var key = cacheTagKey.GenerateKey();
+
+            // Assert
+            Assert.Equal(expected, key);
+        }
+
+        private static ViewContext GetViewContext()
+        {
+            var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+            return new ViewContext(actionContext,
+                                   Mock.Of<IView>(),
+                                   new ViewDataDictionary(new EmptyModelMetadataProvider(), new ModelStateDictionary()),
+                                   Mock.Of<ITempDataDictionary>(),
+                                   TextWriter.Null,
+                                   new HtmlHelperOptions());
+        }
+
+        private static TagHelperContext GetTagHelperContext(string id = "testid")
+        {
+            return new TagHelperContext(
+                tagName: "test",
+                allAttributes: new TagHelperAttributeList(),
+                items: new Dictionary<object, object>(),
+                uniqueId: id);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DistributedCacheTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DistributedCacheTagHelperTest.cs
new file mode 100644
index 0000000000..19d56fb5af
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DistributedCacheTagHelperTest.cs
@@ -0,0 +1,789 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TagHelpers.Cache;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Internal;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    public class DistributedCacheTagHelperTest
+    {
+
+        [Fact]
+        public async Task ProcessAsync_DoesNotCache_IfDisabled()
+        {
+            // Arrange
+            var childContent = "original-child-content";
+            var storage = new Mock<IDistributedCacheTagHelperStorage>();
+            var value = Encoding.UTF8.GetBytes("ok");
+            storage.Setup(c => c.SetAsync(
+                /*key*/ It.IsAny<string>(),
+                /*value*/ value,
+                /*options*/ It.IsAny<DistributedCacheEntryOptions>()));
+            storage.Setup(c => c.GetAsync(It.IsAny<string>()))
+                .Returns(Task.FromResult(value));
+            var tagHelperContext = GetTagHelperContext();
+            var service = new DistributedCacheTagHelperService(
+                storage.Object,
+                Mock.Of<IDistributedCacheTagHelperFormatter>(),
+                new HtmlTestEncoder(),
+                NullLoggerFactory.Instance);
+            var tagHelperOutput = GetTagHelperOutput(
+                attributes: new TagHelperAttributeList(),
+                childContent: childContent);
+            var cacheTagHelper = new DistributedCacheTagHelper(
+                service,
+                new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                Enabled = false
+            };
+
+            // Act
+            await cacheTagHelper.ProcessAsync(tagHelperContext, tagHelperOutput);
+
+            // Assert
+            Assert.Equal(childContent, tagHelperOutput.Content.GetContent());
+            storage.Verify(c => c.SetAsync(
+                /*key*/ It.IsAny<string>(),
+                /*content*/ value,
+                /*options*/ It.IsAny<DistributedCacheEntryOptions>()),
+                Times.Never);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_ReturnsCachedValue_IfEnabled()
+        {
+            // Arrange
+            var childContent = "original-child-content";
+            var storage = new Mock<IDistributedCacheTagHelperStorage>();
+            var value = Encoding.UTF8.GetBytes(childContent);
+            storage.Setup(c => c.SetAsync(
+                /*key*/ It.IsAny<string>(),
+                /*value*/ value,
+                /*options*/ It.IsAny<DistributedCacheEntryOptions>()));
+            storage.Setup(c => c.GetAsync(It.IsAny<string>()))
+                .Returns(Task.FromResult<byte[]>(null));
+            var service = new DistributedCacheTagHelperService(
+                storage.Object,
+                Mock.Of<IDistributedCacheTagHelperFormatter>(),
+                new HtmlTestEncoder(),
+                NullLoggerFactory.Instance);
+            var tagHelperContext = GetTagHelperContext();
+            var tagHelperOutput = GetTagHelperOutput(
+                attributes: new TagHelperAttributeList(),
+                childContent: childContent);
+            var cacheTagHelper = new DistributedCacheTagHelper(
+                service,
+                new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                Enabled = true,
+                Name = "some-name"
+            };
+
+            // Act
+            await cacheTagHelper.ProcessAsync(tagHelperContext, tagHelperOutput);
+
+            // Assert
+            Assert.Empty(tagHelperOutput.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput.PostContent.GetContent());
+            Assert.True(tagHelperOutput.IsContentModified);
+            Assert.Equal(childContent, tagHelperOutput.Content.GetContent());
+
+            storage.Verify(c => c.GetAsync(
+                /*key*/ It.IsAny<string>()
+                ),
+                Times.Once);
+
+            storage.Verify(c => c.SetAsync(
+                /*key*/ It.IsAny<string>(),
+                /*value*/ It.IsAny<byte[]>(),
+                /*options*/ It.IsAny<DistributedCacheEntryOptions>()),
+                Times.Once);
+
+        }
+
+        [Fact]
+        public async Task ProcessAsync_ReturnsCachedValue_IfVaryByParamIsUnchanged()
+        {
+            // Arrange - 1
+            var childContent = "original-child-content";
+            var storage = GetStorage();
+            var formatter = GetFormatter();
+            var tagHelperContext1 = GetTagHelperContext();
+            var tagHelperOutput1 = GetTagHelperOutput(
+                attributes: new TagHelperAttributeList(),
+                childContent: childContent);
+            var service = new DistributedCacheTagHelperService(
+                storage,
+                formatter,
+                new HtmlTestEncoder(),
+                NullLoggerFactory.Instance);
+            var cacheTagHelper1 = new DistributedCacheTagHelper(
+                service,
+                new HtmlTestEncoder())
+            {
+                Enabled = true,
+                VaryByQuery = "key1,key2",
+                ViewContext = GetViewContext(),
+            };
+            cacheTagHelper1.ViewContext.HttpContext.Request.QueryString = new QueryString(
+                "?key1=value1&key2=value2");
+
+            // Act - 1
+            await cacheTagHelper1.ProcessAsync(tagHelperContext1, tagHelperOutput1);
+
+            // Assert - 1
+            Assert.Empty(tagHelperOutput1.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput1.PostContent.GetContent());
+            Assert.True(tagHelperOutput1.IsContentModified);
+            Assert.Equal(childContent, tagHelperOutput1.Content.GetContent());
+
+            // Arrange - 2
+            var tagHelperContext2 = GetTagHelperContext();
+            var tagHelperOutput2 = GetTagHelperOutput(
+                attributes: new TagHelperAttributeList(),
+                childContent: "different-content");
+            var cacheTagHelper2 = new DistributedCacheTagHelper(
+                service,
+                new HtmlTestEncoder())
+            {
+                Enabled = true,
+                VaryByQuery = "key1,key2",
+                ViewContext = GetViewContext(),
+            };
+            cacheTagHelper2.ViewContext.HttpContext.Request.QueryString = new QueryString(
+                "?key1=value1&key2=value2");
+
+            // Act - 2
+            await cacheTagHelper2.ProcessAsync(tagHelperContext2, tagHelperOutput2);
+
+            // Assert - 2
+            Assert.Empty(tagHelperOutput2.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput2.PostContent.GetContent());
+            Assert.True(tagHelperOutput2.IsContentModified);
+            Assert.Equal(childContent, tagHelperOutput2.Content.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_RecalculatesValueIfCacheKeyChanges()
+        {
+            // Arrange - 1
+            var childContent1 = "original-child-content";
+            var storage = GetStorage();
+            var service = new DistributedCacheTagHelperService(
+                storage,
+                Mock.Of<IDistributedCacheTagHelperFormatter>(),
+                new HtmlTestEncoder(),
+                NullLoggerFactory.Instance);
+            var tagHelperContext1 = GetTagHelperContext();
+            var tagHelperOutput1 = GetTagHelperOutput(childContent: childContent1);
+            tagHelperOutput1.PreContent.Append("<cache>");
+            tagHelperOutput1.PostContent.SetContent("</cache>");
+            var cacheTagHelper1 = new DistributedCacheTagHelper(
+                service,
+                new HtmlTestEncoder())
+            {
+                VaryByCookie = "cookie1,cookie2",
+                ViewContext = GetViewContext(),
+            };
+            cacheTagHelper1.ViewContext.HttpContext.Request.Headers["Cookie"] = "cookie1=value1;cookie2=value2";
+
+            // Act - 1
+            await cacheTagHelper1.ProcessAsync(tagHelperContext1, tagHelperOutput1);
+
+            // Assert - 1
+            Assert.Empty(tagHelperOutput1.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput1.PostContent.GetContent());
+            Assert.True(tagHelperOutput1.IsContentModified);
+            Assert.Equal(childContent1, tagHelperOutput1.Content.GetContent());
+
+            // Arrange - 2
+            var childContent2 = "different-content";
+            var tagHelperContext2 = GetTagHelperContext();
+            var tagHelperOutput2 = GetTagHelperOutput(childContent: childContent2);
+            tagHelperOutput2.PreContent.SetContent("<cache>");
+            tagHelperOutput2.PostContent.SetContent("</cache>");
+            var cacheTagHelper2 = new DistributedCacheTagHelper(
+                service,
+                new HtmlTestEncoder())
+            {
+                VaryByCookie = "cookie1,cookie2",
+                ViewContext = GetViewContext(),
+            };
+            cacheTagHelper2.ViewContext.HttpContext.Request.Headers["Cookie"] = "cookie1=value1;cookie2=not-value2";
+
+            // Act - 2
+            await cacheTagHelper2.ProcessAsync(tagHelperContext2, tagHelperOutput2);
+
+            // Assert - 2
+            Assert.Empty(tagHelperOutput2.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput2.PostContent.GetContent());
+            Assert.True(tagHelperOutput2.IsContentModified);
+            Assert.Equal(childContent2, tagHelperOutput2.Content.GetContent());
+        }
+
+        [Fact]
+        public void UpdateCacheEntryOptions_SetsAbsoluteExpiration_IfExpiresOnIsSet()
+        {
+            // Arrange
+            var expiresOn = DateTimeOffset.UtcNow.AddMinutes(4);
+            var storage = GetStorage();
+            var service = new DistributedCacheTagHelperService(
+                storage,
+                Mock.Of<IDistributedCacheTagHelperFormatter>(),
+                new HtmlTestEncoder(),
+                NullLoggerFactory.Instance
+                );
+            var cacheTagHelper = new DistributedCacheTagHelper(
+                service,
+                new HtmlTestEncoder())
+            {
+                ExpiresOn = expiresOn
+            };
+
+            // Act
+            var cacheEntryOptions = cacheTagHelper.GetDistributedCacheEntryOptions();
+
+            // Assert
+            Assert.Equal(expiresOn, cacheEntryOptions.AbsoluteExpiration);
+        }
+
+        [Fact]
+        public void UpdateCacheEntryOptions_DefaultsTo30SecondsSliding_IfNoEvictionCriteriaIsProvided()
+        {
+            // Arrange
+            var slidingExpiresIn = TimeSpan.FromSeconds(30);
+            var storage = GetStorage();
+            var service = new DistributedCacheTagHelperService(
+                storage,
+                Mock.Of<IDistributedCacheTagHelperFormatter>(),
+                new HtmlTestEncoder(),
+                NullLoggerFactory.Instance
+                );
+            var cacheTagHelper = new DistributedCacheTagHelper(
+                service,
+                new HtmlTestEncoder());
+
+            // Act
+            var cacheEntryOptions = cacheTagHelper.GetDistributedCacheEntryOptions();
+
+            // Assert
+            Assert.Equal(slidingExpiresIn, cacheEntryOptions.SlidingExpiration);
+        }
+
+        [Fact]
+        public void UpdateCacheEntryOptions_SetsAbsoluteExpiration_IfExpiresAfterIsSet()
+        {
+            // Arrange
+            var expiresAfter = TimeSpan.FromSeconds(42);
+            var storage = GetStorage();
+            var service = new DistributedCacheTagHelperService(
+                storage,
+                Mock.Of<IDistributedCacheTagHelperFormatter>(),
+                new HtmlTestEncoder(),
+                NullLoggerFactory.Instance
+                );
+            var cacheTagHelper = new DistributedCacheTagHelper(
+                service,
+                new HtmlTestEncoder())
+            {
+                ExpiresAfter = expiresAfter
+            };
+
+            // Act
+            var cacheEntryOptions = cacheTagHelper.GetDistributedCacheEntryOptions();
+
+            // Assert
+            Assert.Equal(expiresAfter, cacheEntryOptions.AbsoluteExpirationRelativeToNow);
+        }
+
+        [Fact]
+        public void UpdateCacheEntryOptions_SetsSlidingExpiration_IfExpiresSlidingIsSet()
+        {
+            // Arrange
+            var expiresSliding = TimeSpan.FromSeconds(37);
+            var storage = GetStorage();
+            var service = new DistributedCacheTagHelperService(
+                storage,
+                Mock.Of<IDistributedCacheTagHelperFormatter>(),
+                new HtmlTestEncoder(),
+                NullLoggerFactory.Instance
+                );
+            var cacheTagHelper = new DistributedCacheTagHelper(
+                service,
+                new HtmlTestEncoder())
+            {
+                ExpiresSliding = expiresSliding
+            };
+
+            // Act
+            var cacheEntryOptions = cacheTagHelper.GetDistributedCacheEntryOptions();
+
+            // Assert
+            Assert.Equal(expiresSliding, cacheEntryOptions.SlidingExpiration);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_UsesExpiresAfter_ToExpireCacheEntry()
+        {
+            // Arrange - 1
+            var currentTime = new DateTimeOffset(2010, 1, 1, 0, 0, 0, TimeSpan.Zero);
+            var childContent1 = "original-child-content";
+            var clock = new Mock<ISystemClock>();
+            clock.SetupGet(p => p.UtcNow)
+                .Returns(() => currentTime);
+            var storage = GetStorage(Options.Create(new MemoryDistributedCacheOptions { Clock = clock.Object }));
+            var service = new DistributedCacheTagHelperService(
+                storage,
+                Mock.Of<IDistributedCacheTagHelperFormatter>(),
+                new HtmlTestEncoder(),
+                NullLoggerFactory.Instance
+                );
+            var tagHelperContext1 = GetTagHelperContext();
+            var tagHelperOutput1 = GetTagHelperOutput(childContent: childContent1);
+            tagHelperOutput1.PreContent.SetContent("<cache>");
+            tagHelperOutput1.PostContent.SetContent("</cache>");
+            var cacheTagHelper1 = new DistributedCacheTagHelper(
+                service,
+                new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                ExpiresAfter = TimeSpan.FromMinutes(10)
+            };
+
+            // Act - 1
+            await cacheTagHelper1.ProcessAsync(tagHelperContext1, tagHelperOutput1);
+
+            // Assert - 1
+            Assert.Empty(tagHelperOutput1.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput1.PostContent.GetContent());
+            Assert.True(tagHelperOutput1.IsContentModified);
+            Assert.Equal(childContent1, tagHelperOutput1.Content.GetContent());
+
+            // Arrange - 2
+            var childContent2 = "different-content";
+            var tagHelperContext2 = GetTagHelperContext();
+            var tagHelperOutput2 = GetTagHelperOutput(childContent: childContent2);
+            tagHelperOutput2.PreContent.SetContent("<cache>");
+            tagHelperOutput2.PostContent.SetContent("</cache>");
+            var cacheTagHelper2 = new DistributedCacheTagHelper(
+                service,
+                new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                ExpiresAfter = TimeSpan.FromMinutes(10)
+            };
+            currentTime = currentTime.AddMinutes(11);
+
+            // Act - 2
+            await cacheTagHelper2.ProcessAsync(tagHelperContext2, tagHelperOutput2);
+
+            // Assert - 2
+            Assert.Empty(tagHelperOutput2.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput2.PostContent.GetContent());
+            Assert.True(tagHelperOutput2.IsContentModified);
+            Assert.Equal(childContent2, tagHelperOutput2.Content.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_UsesExpiresOn_ToExpireCacheEntry()
+        {
+            // Arrange - 1
+            var currentTime = new DateTimeOffset(2010, 1, 1, 0, 0, 0, TimeSpan.Zero);
+            var childContent1 = "original-child-content";
+            var clock = new Mock<ISystemClock>();
+            clock.SetupGet(p => p.UtcNow)
+                .Returns(() => currentTime);
+            var storage = GetStorage(Options.Create(new MemoryDistributedCacheOptions { Clock = clock.Object }));
+            var service = new DistributedCacheTagHelperService(
+                storage,
+                Mock.Of<IDistributedCacheTagHelperFormatter>(),
+                new HtmlTestEncoder(),
+                NullLoggerFactory.Instance
+                );
+            var tagHelperContext1 = GetTagHelperContext();
+            var tagHelperOutput1 = GetTagHelperOutput(childContent: childContent1);
+            tagHelperOutput1.PreContent.SetContent("<distributed-cache>");
+            tagHelperOutput1.PostContent.SetContent("</distributed-cache>");
+            var cacheTagHelper1 = new DistributedCacheTagHelper(
+                service,
+                new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                ExpiresOn = currentTime.AddMinutes(5)
+            };
+
+            // Act - 1
+            await cacheTagHelper1.ProcessAsync(tagHelperContext1, tagHelperOutput1);
+
+            // Assert - 1
+            Assert.Empty(tagHelperOutput1.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput1.PostContent.GetContent());
+            Assert.True(tagHelperOutput1.IsContentModified);
+            Assert.Equal(childContent1, tagHelperOutput1.Content.GetContent());
+
+            // Arrange - 2
+            currentTime = currentTime.AddMinutes(5).AddSeconds(2);
+            var childContent2 = "different-content";
+            var tagHelperContext2 = GetTagHelperContext();
+            var tagHelperOutput2 = GetTagHelperOutput(childContent: childContent2);
+            tagHelperOutput2.PreContent.SetContent("<distributed-cache>");
+            tagHelperOutput2.PostContent.SetContent("</distributed-cache>");
+            var cacheTagHelper2 = new DistributedCacheTagHelper(
+                service,
+                new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                ExpiresOn = currentTime.AddMinutes(5)
+            };
+
+            // Act - 2
+            await cacheTagHelper2.ProcessAsync(tagHelperContext2, tagHelperOutput2);
+
+            // Assert - 2
+            Assert.Empty(tagHelperOutput2.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput2.PostContent.GetContent());
+            Assert.True(tagHelperOutput2.IsContentModified);
+            Assert.Equal(childContent2, tagHelperOutput2.Content.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_UsesExpiresSliding_ToExpireCacheEntryWithSlidingExpiration()
+        {
+            // Arrange - 1
+            var currentTime = new DateTimeOffset(2010, 1, 1, 0, 0, 0, TimeSpan.Zero);
+            var childContent1 = "original-child-content";
+            var clock = new Mock<ISystemClock>();
+            clock.SetupGet(p => p.UtcNow)
+                .Returns(() => currentTime);
+            var storage = GetStorage(Options.Create(new MemoryDistributedCacheOptions { Clock = clock.Object }));
+            var service = new DistributedCacheTagHelperService(
+                storage,
+                Mock.Of<IDistributedCacheTagHelperFormatter>(),
+                new HtmlTestEncoder(),
+                NullLoggerFactory.Instance
+                );
+            var tagHelperContext1 = GetTagHelperContext();
+            var tagHelperOutput1 = GetTagHelperOutput(childContent: childContent1);
+            tagHelperOutput1.PreContent.SetContent("<distributed-cache>");
+            tagHelperOutput1.PostContent.SetContent("</distributed-cache>");
+            var cacheTagHelper1 = new DistributedCacheTagHelper(
+                service,
+                new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                ExpiresSliding = TimeSpan.FromSeconds(30)
+            };
+
+            // Act - 1
+            await cacheTagHelper1.ProcessAsync(tagHelperContext1, tagHelperOutput1);
+
+            // Assert - 1
+            Assert.Empty(tagHelperOutput1.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput1.PostContent.GetContent());
+            Assert.True(tagHelperOutput1.IsContentModified);
+            Assert.Equal(childContent1, tagHelperOutput1.Content.GetContent());
+
+            // Arrange - 2
+            currentTime = currentTime.AddSeconds(35);
+            var childContent2 = "different-content";
+            var tagHelperContext2 = GetTagHelperContext();
+            var tagHelperOutput2 = GetTagHelperOutput(childContent: childContent2);
+            tagHelperOutput2.PreContent.SetContent("<distributed-cache>");
+            tagHelperOutput2.PostContent.SetContent("</distributed-cache>");
+            var cacheTagHelper2 = new DistributedCacheTagHelper(
+                service,
+                new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                ExpiresSliding = TimeSpan.FromSeconds(30)
+            };
+
+            // Act - 2
+            await cacheTagHelper2.ProcessAsync(tagHelperContext2, tagHelperOutput2);
+
+            // Assert - 2
+            Assert.Empty(tagHelperOutput2.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput2.PostContent.GetContent());
+            Assert.True(tagHelperOutput2.IsContentModified);
+            Assert.Equal(childContent2, tagHelperOutput2.Content.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_ComputesValueOnce_WithConcurrentRequests()
+        {
+            // Arrange
+            var childContent = "some-content";
+            var resetEvent1 = new ManualResetEvent(false);
+            var resetEvent2 = new ManualResetEvent(false);
+            var resetEvent3 = new ManualResetEvent(false);
+            var calls = 0;
+            var formatter = GetFormatter();
+            var storage = GetStorage();
+            var service = new DistributedCacheTagHelperService(
+                storage,
+                formatter,
+                new HtmlTestEncoder(),
+                NullLoggerFactory.Instance
+                );
+            var tagHelperContext1 = GetTagHelperContext();
+            var tagHelperContext2 = GetTagHelperContext();
+
+            var tagHelperOutput1 = new TagHelperOutput(
+                "distributed-cache",
+                new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    calls++;
+                    resetEvent2.Set();
+
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetHtmlContent(childContent);
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+
+            var tagHelperOutput2 = new TagHelperOutput(
+                "distributed-cache",
+                new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    calls++;
+                    resetEvent3.WaitOne(5000);
+
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetHtmlContent(childContent);
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+
+            var cacheTagHelper1 = new DistributedCacheTagHelper(
+                service,
+                new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                Enabled = true
+            };
+
+            var cacheTagHelper2 = new DistributedCacheTagHelper(
+                service,
+                new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                Enabled = true
+            };
+
+            // Act
+
+            var task1 = Task.Run(async () =>
+            {
+                resetEvent1.WaitOne(5000);
+                await cacheTagHelper1.ProcessAsync(tagHelperContext1, tagHelperOutput1);
+                resetEvent3.Set();
+            });
+
+            var task2 = Task.Run(async () =>
+            {
+                resetEvent2.WaitOne(5000);
+                await cacheTagHelper2.ProcessAsync(tagHelperContext1, tagHelperOutput2);
+            });
+
+            resetEvent1.Set();
+            await Task.WhenAll(task1, task2);
+
+            // Assert
+            Assert.Empty(tagHelperOutput1.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput1.PostContent.GetContent());
+            Assert.True(tagHelperOutput1.IsContentModified);
+            Assert.Equal(childContent, tagHelperOutput1.Content.GetContent());
+
+            Assert.Empty(tagHelperOutput2.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput2.PostContent.GetContent());
+            Assert.True(tagHelperOutput2.IsContentModified);
+            Assert.Equal(childContent, tagHelperOutput2.Content.GetContent());
+
+            Assert.Equal(1, calls);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_ExceptionInProcessing_DoesntBlockConcurrentRequests()
+        {
+            // Arrange
+            var childContent = "some-content";
+            var resetEvent1 = new ManualResetEvent(false);
+            var resetEvent2 = new ManualResetEvent(false);
+            var resetEvent3 = new ManualResetEvent(false);
+            var calls = 0;
+            var formatter = GetFormatter();
+            var storage = GetStorage();
+            var service = new DistributedCacheTagHelperService(
+                storage,
+                formatter,
+                new HtmlTestEncoder(),
+                NullLoggerFactory.Instance
+                );
+            var tagHelperContext1 = GetTagHelperContext();
+            var tagHelperContext2 = GetTagHelperContext();
+
+            var tagHelperOutput1 = new TagHelperOutput(
+                "distributed-cache",
+                new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    calls++;
+                    resetEvent2.Set();
+
+                    throw new Exception();
+                });
+
+            var tagHelperOutput2 = new TagHelperOutput(
+                "distributed-cache",
+                new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    calls++;
+                    resetEvent3.WaitOne(5000);
+
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetHtmlContent(childContent);
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+
+            var cacheTagHelper1 = new DistributedCacheTagHelper(
+                service,
+                new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                Enabled = true
+            };
+
+            var cacheTagHelper2 = new DistributedCacheTagHelper(
+                service,
+                new HtmlTestEncoder())
+            {
+                ViewContext = GetViewContext(),
+                Enabled = true
+            };
+
+            // Act
+
+            var task1 = Task.Run(async () =>
+            {
+                resetEvent1.WaitOne(5000);
+                await Assert.ThrowsAsync<Exception>(() => cacheTagHelper1.ProcessAsync(tagHelperContext1, tagHelperOutput1));
+                resetEvent3.Set();
+            });
+
+            var task2 = Task.Run(async () =>
+            {
+                resetEvent2.WaitOne(5000);
+                await cacheTagHelper2.ProcessAsync(tagHelperContext2, tagHelperOutput2);
+            });
+
+            resetEvent1.Set();
+            await Task.WhenAll(task1, task2);
+
+            // Assert
+            Assert.Empty(tagHelperOutput1.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput1.PostContent.GetContent());
+            Assert.False(tagHelperOutput1.IsContentModified);
+            Assert.Empty(tagHelperOutput1.Content.GetContent());
+
+            Assert.Empty(tagHelperOutput2.PreContent.GetContent());
+            Assert.Empty(tagHelperOutput2.PostContent.GetContent());
+            Assert.True(tagHelperOutput2.IsContentModified);
+            Assert.Equal(childContent, tagHelperOutput2.Content.GetContent());
+
+            Assert.Equal(2, calls);
+        }
+
+        [Fact]
+        public async Task Deserialize_DoesntAlterValue_WhenSerialized()
+        {
+            // Arrange
+            var content = "<b>some content</b>";
+            var formatter = GetFormatter();
+            var context = new DistributedCacheTagHelperFormattingContext
+            {
+                Html = new HtmlString(content)
+            };
+            var serialized = await formatter.SerializeAsync(context);
+
+            // Act
+            var deserialized = await formatter.DeserializeAsync(serialized);
+
+            // Assert
+            Assert.Equal(deserialized.ToString(), content);
+        }
+
+        private static ViewContext GetViewContext()
+        {
+            var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+            return new ViewContext(actionContext,
+                Mock.Of<IView>(),
+                new ViewDataDictionary(new EmptyModelMetadataProvider(), new ModelStateDictionary()),
+                Mock.Of<ITempDataDictionary>(),
+                TextWriter.Null,
+                new HtmlHelperOptions());
+        }
+
+        private static TagHelperContext GetTagHelperContext()
+        {
+            return new TagHelperContext(
+                tagName: "test",
+                allAttributes: new TagHelperAttributeList(),
+                items: new Dictionary<object, object>(),
+                uniqueId: "testid");
+        }
+
+        private static TagHelperOutput GetTagHelperOutput(
+            string tagName = "distributed-cache",
+            TagHelperAttributeList attributes = null,
+            string childContent = "some child content")
+        {
+            attributes = attributes ?? new TagHelperAttributeList { { "attr", "value" } };
+
+            return new TagHelperOutput(
+                tagName,
+                attributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetHtmlContent(childContent);
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+        }
+
+        private static IDistributedCacheTagHelperStorage GetStorage(IOptions<MemoryDistributedCacheOptions> options = null)
+        {
+            return new DistributedCacheTagHelperStorage(new MemoryDistributedCache(options ?? Options.Create(new MemoryDistributedCacheOptions())));
+        }
+
+        private static IDistributedCacheTagHelperFormatter GetFormatter()
+        {
+            return new DistributedCacheTagHelperFormatter();
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/EnvironmentTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/EnvironmentTagHelperTest.cs
new file mode 100644
index 0000000000..be53a4f6b9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/EnvironmentTagHelperTest.cs
@@ -0,0 +1,241 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Test
+{
+    public class EnvironmentTagHelperTest
+    {
+        [Theory]
+        [InlineData("Development", "Development")]
+        [InlineData("development", "Development")]
+        [InlineData("DEVELOPMENT", "Development")]
+        [InlineData(" development", "Development")]
+        [InlineData("development ", "Development")]
+        [InlineData(" development ", "Development")]
+        [InlineData("Development,Production", "Development")]
+        [InlineData("Production,Development", "Development")]
+        [InlineData("Development , Production", "Development")]
+        [InlineData("   Development,Production   ", "Development")]
+        [InlineData("Development ,  Production", "Development")]
+        [InlineData("Development\t,Production", "Development")]
+        [InlineData("Development,\tProduction", "Development")]
+        [InlineData(" Development,Production ", "Development")]
+        [InlineData("Development,Staging,Production", "Development")]
+        [InlineData("Staging,Development,Production", "Development")]
+        [InlineData("Staging,Production,Development", "Development")]
+        [InlineData("Test", "Test")]
+        [InlineData("Test,Staging", "Test")]
+        public void ShowsContentWhenCurrentEnvironmentIsSpecified(string namesAttribute, string environmentName)
+        {
+            ShouldShowContent(namesAttribute, environmentName);
+        }
+
+        [Theory]
+        [InlineData("", "Development")]
+        [InlineData(null, "Development")]
+        [InlineData("  ", "Development")]
+        [InlineData(", ", "Development")]
+        [InlineData("   , ", "Development")]
+        [InlineData("\t,\t", "Development")]
+        [InlineData(",", "Development")]
+        [InlineData(",,", "Development")]
+        [InlineData(",,,", "Development")]
+        [InlineData(",,, ", "Development")]
+        public void ShowsContentWhenNoEnvironmentIsSpecified(string namesAttribute, string environmentName)
+        {
+            ShouldShowContent(namesAttribute, environmentName);
+        }
+
+        [Theory]
+        [InlineData("Development", null)]
+        [InlineData("Development", "")]
+        [InlineData("Development", " ")]
+        [InlineData("Development", "  ")]
+        [InlineData("Development", "\t")]
+        [InlineData("Test", null)]
+        public void ShowsContentWhenCurrentEnvironmentIsNotSet(string namesAttribute, string environmentName)
+        {
+            ShouldShowContent(namesAttribute, environmentName);
+        }
+
+        [Theory]
+        [InlineData("", "", "")]
+        [InlineData("", null, "Test")]
+        [InlineData("Development", "", "")]
+        [InlineData("", "Development, Test", "")]
+        [InlineData(null, "development, TEST", "Test")]
+        [InlineData("Development", "", "Test")]
+        [InlineData("Development", "Test, Development", "")]
+        [InlineData("Test", "DEVELOPMENT", null)]
+        [InlineData("Development", "Test", "")]
+        [InlineData("Development", null, "Test")]
+        [InlineData("Development", "Test", "Test")]
+        [InlineData("Test", "Development", "Test")]
+        public void ShouldShowContent_IncludeExcludeSpecified(string namesAttribute, string includeAttribute, string excludeAttribute)
+        {
+            // Arrange
+            var content = "content";
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList {
+                    { "names", namesAttribute },
+                    { "include", includeAttribute },
+                    { "exclude", excludeAttribute },
+                });
+            var output = MakeTagHelperOutput("environment", childContent: content);
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.SetupProperty(h => h.EnvironmentName, "Development");
+
+            // Act
+            var helper = new EnvironmentTagHelper(hostingEnvironment.Object)
+            {
+                Names = namesAttribute,
+                Include = includeAttribute,
+                Exclude = excludeAttribute,
+            };
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Null(output.TagName);
+            Assert.False(output.IsContentModified);
+        }
+
+        [Theory]
+        [InlineData(null, "", "Development")]
+        [InlineData("", "Development", "development")]
+        [InlineData("", "Test", "Development, test")]
+        [InlineData("Development", "", "Development")]
+        [InlineData("Test", "", "Development")]
+        [InlineData("Development", "Development", "DEVELOPMENT, TEST")]
+        [InlineData("Development", "Test", "Development")]
+        [InlineData("Test", "Development", "Development")]
+        [InlineData("Test", "Test", "Development")]
+        [InlineData("", "Test", "Test")]
+        [InlineData("Test", null, "Test")]
+        [InlineData("Test", "Test", "Test")]
+        [InlineData("", "Test", null)]
+        [InlineData("Test", "", "")]
+        [InlineData("Test", "Test", null)]
+        public void DoesNotShowContent_IncludeExcludeSpecified(string namesAttribute, string includeAttribute, string excludeAttribute)
+        {
+            // Arrange
+            var content = "content";
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList {
+                    { "names", namesAttribute },
+                    { "include", includeAttribute },
+                    { "exclude", excludeAttribute },
+                });
+            var output = MakeTagHelperOutput("environment", childContent: content);
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.SetupProperty(h => h.EnvironmentName, "Development");
+
+            // Act
+            var helper = new EnvironmentTagHelper(hostingEnvironment.Object)
+            {
+                Names = namesAttribute,
+                Include = includeAttribute,
+                Exclude = excludeAttribute,
+            };
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Null(output.TagName);
+            Assert.Empty(output.PreContent.GetContent());
+            Assert.True(output.Content.GetContent().Length == 0);
+            Assert.Empty(output.PostContent.GetContent());
+            Assert.True(output.IsContentModified);
+        }
+
+        [Theory]
+        [InlineData("NotDevelopment", "Development")]
+        [InlineData("NOTDEVELOPMENT", "Development")]
+        [InlineData("NotDevelopment,AlsoNotDevelopment", "Development")]
+        [InlineData("Doesn'tMatchAtAll", "Development")]
+        [InlineData("Development and a space", "Development")]
+        [InlineData("Development and a space,SomethingElse", "Development")]
+        public void DoesNotShowContentWhenCurrentEnvironmentIsNotSpecified(
+            string namesAttribute,
+            string environmentName)
+        {
+            // Arrange
+            var content = "content";
+            var context = MakeTagHelperContext(attributes: new TagHelperAttributeList { { "names", namesAttribute } });
+            var output = MakeTagHelperOutput("environment", childContent: content);
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.SetupProperty(h => h.EnvironmentName, environmentName);
+
+            // Act
+            var helper = new EnvironmentTagHelper(hostingEnvironment.Object)
+            {
+                Names = namesAttribute
+            };
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Null(output.TagName);
+            Assert.Empty(output.PreContent.GetContent());
+            Assert.True(output.Content.GetContent().Length == 0);
+            Assert.Empty(output.PostContent.GetContent());
+            Assert.True(output.IsContentModified);
+        }
+
+        private void ShouldShowContent(string namesAttribute, string environmentName)
+        {
+            // Arrange
+            var content = "content";
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList { { "names", namesAttribute } });
+            var output = MakeTagHelperOutput("environment", childContent: content);
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.SetupProperty(h => h.EnvironmentName, environmentName);
+
+            // Act
+            var helper = new EnvironmentTagHelper(hostingEnvironment.Object)
+            {
+                Names = namesAttribute
+            };
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Null(output.TagName);
+            Assert.False(output.IsContentModified);
+        }
+
+        private TagHelperContext MakeTagHelperContext(TagHelperAttributeList attributes = null)
+        {
+            attributes = attributes ?? new TagHelperAttributeList();
+
+            return new TagHelperContext(
+                tagName: "env",
+                allAttributes: attributes,
+                items: new Dictionary<object, object>(),
+                uniqueId: Guid.NewGuid().ToString("N"));
+        }
+
+        private TagHelperOutput MakeTagHelperOutput(
+            string tagName,
+            TagHelperAttributeList attributes = null,
+            string childContent = null)
+        {
+            attributes = attributes ?? new TagHelperAttributeList();
+
+            return new TagHelperOutput(
+                tagName,
+                attributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent(childContent);
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormActionTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormActionTagHelperTest.cs
new file mode 100644
index 0000000000..21773cae67
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormActionTagHelperTest.cs
@@ -0,0 +1,711 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Routing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    public class FormActionTagHelperTest
+    {
+        [Fact]
+        public async Task ProcessAsync_GeneratesExpectedOutput()
+        {
+            // Arrange
+            var expectedTagName = "not-button-or-submit";
+            var metadataProvider = new TestModelMetadataProvider();
+
+            var tagHelperContext = new TagHelperContext(
+                tagName: "form-action",
+                allAttributes: new TagHelperAttributeList
+                {
+                    { "id", "my-id" },
+                },
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                attributes: new TagHelperAttributeList
+                {
+                    { "id", "my-id" },
+                },
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something Else");  // ignored
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+
+            var urlHelper = new Mock<IUrlHelper>(MockBehavior.Strict);
+            urlHelper
+                .Setup(mock => mock.Action(It.IsAny<UrlActionContext>()))
+                .Returns<UrlActionContext>(c => $"{c.Controller}/{c.Action}/{(c.Values as RouteValueDictionary)["name"]}");
+
+            var viewContext = new ViewContext();
+            var urlHelperFactory = new Mock<IUrlHelperFactory>(MockBehavior.Strict);
+            urlHelperFactory
+                .Setup(f => f.GetUrlHelper(viewContext))
+                .Returns(urlHelper.Object);
+
+            var tagHelper = new FormActionTagHelper(urlHelperFactory.Object)
+            {
+                Action = "index",
+                Controller = "home",
+                RouteValues =
+                {
+                    {  "name", "value" },
+                },
+                ViewContext = viewContext,
+            };
+
+            // Act
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Collection(
+                output.Attributes,
+                attribute =>
+                {
+                    Assert.Equal("id", attribute.Name, StringComparer.Ordinal);
+                    Assert.Equal("my-id", attribute.Value as string, StringComparer.Ordinal);
+                },
+                attribute =>
+                {
+                    Assert.Equal("formaction", attribute.Name, StringComparer.Ordinal);
+                    Assert.Equal("home/index/value", attribute.Value as string, StringComparer.Ordinal);
+                });
+            Assert.False(output.IsContentModified);
+            Assert.False(output.PostContent.IsModified);
+            Assert.False(output.PostElement.IsModified);
+            Assert.False(output.PreContent.IsModified);
+            Assert.False(output.PreElement.IsModified);
+            Assert.Equal(TagMode.StartTagAndEndTag, output.TagMode);
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_GeneratesExpectedOutput_WithRoute()
+        {
+            // Arrange
+            var expectedTagName = "not-button-or-submit";
+            var metadataProvider = new TestModelMetadataProvider();
+
+            var tagHelperContext = new TagHelperContext(
+                tagName: "form-action",
+                allAttributes: new TagHelperAttributeList
+                {
+                    { "id", "my-id" },
+                },
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                attributes: new TagHelperAttributeList
+                {
+                    { "id", "my-id" },
+                },
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something Else");  // ignored
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+
+            var urlHelper = new Mock<IUrlHelper>(MockBehavior.Strict);
+            urlHelper
+                .Setup(mock => mock.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Returns<UrlRouteContext>(c => $"{c.RouteName}/{(c.Values as RouteValueDictionary)["name"]}");
+
+            var viewContext = new ViewContext();
+            var urlHelperFactory = new Mock<IUrlHelperFactory>(MockBehavior.Strict);
+            urlHelperFactory
+                .Setup(f => f.GetUrlHelper(viewContext))
+                .Returns(urlHelper.Object);
+
+            var tagHelper = new FormActionTagHelper(urlHelperFactory.Object)
+            {
+                Route = "routine",
+                RouteValues =
+                {
+                    {  "name", "value" },
+                },
+                ViewContext = viewContext,
+            };
+
+            // Act
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Collection(
+                output.Attributes,
+                attribute =>
+                {
+                    Assert.Equal("id", attribute.Name, StringComparer.Ordinal);
+                    Assert.Equal("my-id", attribute.Value as string, StringComparer.Ordinal);
+                },
+                attribute =>
+                {
+                    Assert.Equal("formaction", attribute.Name, StringComparer.Ordinal);
+                    Assert.Equal("routine/value", attribute.Value as string, StringComparer.Ordinal);
+                });
+            Assert.False(output.IsContentModified);
+            Assert.False(output.PostContent.IsModified);
+            Assert.False(output.PostElement.IsModified);
+            Assert.False(output.PreContent.IsModified);
+            Assert.False(output.PreElement.IsModified);
+            Assert.Equal(TagMode.StartTagAndEndTag, output.TagMode);
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        // RouteValues property value, expected RouteValuesDictionary content.
+        public static TheoryData<IDictionary<string, string>, IDictionary<string, object>> RouteValuesData
+        {
+            get
+            {
+                return new TheoryData<IDictionary<string, string>, IDictionary<string, object>>
+                {
+                    { null, null },
+                    // FormActionTagHelper ignores an empty route values dictionary.
+                    { new Dictionary<string, string>(), null },
+                    {
+                        new Dictionary<string, string> { { "name", "value" } },
+                        new Dictionary<string, object> { { "name", "value" } }
+                    },
+                    {
+                        new SortedDictionary<string, string>(StringComparer.Ordinal)
+                        {
+                            { "name1", "value1" },
+                            { "name2", "value2" },
+                        },
+                        new SortedDictionary<string, object>(StringComparer.Ordinal)
+                        {
+                            { "name1", "value1" },
+                            { "name2", "value2" },
+                        }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RouteValuesData))]
+        public async Task ProcessAsync_CallsActionWithExpectedParameters(
+            IDictionary<string, string> routeValues,
+            IDictionary<string, object> expectedRouteValues)
+        {
+            // Arrange
+            var context = new TagHelperContext(
+                tagName: "form-action",
+                allAttributes: new TagHelperAttributeList(),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "button",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    return Task.FromResult<TagHelperContent>(new DefaultTagHelperContent());
+                });
+
+            var urlHelper = new Mock<IUrlHelper>(MockBehavior.Strict);
+            urlHelper
+                .Setup(mock => mock.Action(It.IsAny<UrlActionContext>()))
+                .Callback<UrlActionContext>(param =>
+                {
+                    Assert.Equal("delete", param.Action, StringComparer.Ordinal);
+                    Assert.Equal("books", param.Controller, StringComparer.Ordinal);
+                    Assert.Equal("test", param.Fragment, StringComparer.Ordinal);
+                    Assert.Null(param.Host);
+                    Assert.Null(param.Protocol);
+                    Assert.Equal<KeyValuePair<string, object>>(expectedRouteValues, param.Values as RouteValueDictionary);
+                })
+                .Returns("home/index");
+
+            var viewContext = new ViewContext();
+            var urlHelperFactory = new Mock<IUrlHelperFactory>(MockBehavior.Strict);
+            urlHelperFactory
+                .Setup(f => f.GetUrlHelper(viewContext))
+                .Returns(urlHelper.Object);
+
+            var tagHelper = new FormActionTagHelper(urlHelperFactory.Object)
+            {
+                Action = "delete",
+                Controller = "books",
+                Fragment = "test",
+                RouteValues = routeValues,
+                ViewContext = viewContext,
+            };
+
+            // Act
+            await tagHelper.ProcessAsync(context, output);
+
+            // Assert
+            Assert.Equal("button", output.TagName);
+            var attribute = Assert.Single(output.Attributes);
+            Assert.Equal("formaction", attribute.Name);
+            Assert.Equal("home/index", attribute.Value);
+            Assert.Empty(output.Content.GetContent());
+        }
+
+        [Theory]
+        [MemberData(nameof(RouteValuesData))]
+        public async Task ProcessAsync_CallsRouteUrlWithExpectedParameters(
+            IDictionary<string, string> routeValues,
+            IDictionary<string, object> expectedRouteValues)
+        {
+            // Arrange
+            var context = new TagHelperContext(
+                tagName: "form-action",
+                allAttributes: new TagHelperAttributeList(),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "button",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    return Task.FromResult<TagHelperContent>(new DefaultTagHelperContent());
+                });
+
+            var urlHelper = new Mock<IUrlHelper>(MockBehavior.Strict);
+            urlHelper
+                .Setup(mock => mock.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Callback<UrlRouteContext>(param =>
+                {
+                    Assert.Null(param.Host);
+                    Assert.Null(param.Protocol);
+                    Assert.Equal("test", param.Fragment, StringComparer.Ordinal);
+                    Assert.Equal("Default", param.RouteName, StringComparer.Ordinal);
+                    Assert.Equal<KeyValuePair<string, object>>(expectedRouteValues, param.Values as RouteValueDictionary);
+                })
+                .Returns("home/index");
+
+            var viewContext = new ViewContext();
+            var urlHelperFactory = new Mock<IUrlHelperFactory>(MockBehavior.Strict);
+            urlHelperFactory
+                .Setup(f => f.GetUrlHelper(viewContext))
+                .Returns(urlHelper.Object);
+
+            var tagHelper = new FormActionTagHelper(urlHelperFactory.Object)
+            {
+                Route = "Default",
+                Fragment = "test",
+                RouteValues = routeValues,
+                ViewContext = viewContext,
+            };
+
+            // Act
+            await tagHelper.ProcessAsync(context, output);
+
+            // Assert
+            Assert.Equal("button", output.TagName);
+            var attribute = Assert.Single(output.Attributes);
+            Assert.Equal("formaction", attribute.Name);
+            Assert.Equal("home/index", attribute.Value);
+            Assert.Empty(output.Content.GetContent());
+        }
+
+        // Area property value, RouteValues property value, expected "area" in final RouteValuesDictionary.
+        public static TheoryData<string, Dictionary<string, string>, string> AreaRouteValuesData
+        {
+            get
+            {
+                return new TheoryData<string, Dictionary<string, string>, string>
+                {
+                    { "Area", null, "Area" },
+                    // Explicit Area overrides value in the dictionary.
+                    { "Area", new Dictionary<string, string> { { "area", "Home" } }, "Area" },
+                    // Empty string is also passed through to the helper.
+                    { string.Empty, null, string.Empty },
+                    { string.Empty, new Dictionary<string, string> { { "area", "Home" } }, string.Empty },
+                    // Fall back "area" entry in the provided route values if Area is null.
+                    { null, new Dictionary<string, string> { { "area", "Admin" } }, "Admin" },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(AreaRouteValuesData))]
+        public async Task ProcessAsync_CallsActionWithExpectedRouteValues(
+            string area,
+            Dictionary<string, string> routeValues,
+            string expectedArea)
+        {
+            // Arrange
+            var context = new TagHelperContext(
+                tagName: "form-action",
+                allAttributes: new TagHelperAttributeList(),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "submit",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    return Task.FromResult<TagHelperContent>(new DefaultTagHelperContent());
+                });
+
+            var expectedRouteValues = new Dictionary<string, object> { { "area", expectedArea } };
+            var urlHelper = new Mock<IUrlHelper>(MockBehavior.Strict);
+            urlHelper
+                .Setup(mock => mock.Action(It.IsAny<UrlActionContext>()))
+                .Callback<UrlActionContext>(param => Assert.Equal(expectedRouteValues, param.Values as RouteValueDictionary))
+                .Returns("admin/dashboard/index");
+
+            var viewContext = new ViewContext();
+            var urlHelperFactory = new Mock<IUrlHelperFactory>(MockBehavior.Strict);
+            urlHelperFactory
+                .Setup(f => f.GetUrlHelper(viewContext))
+                .Returns(urlHelper.Object);
+
+            var tagHelper = new FormActionTagHelper(urlHelperFactory.Object)
+            {
+                Action = "Index",
+                Area = area,
+                Controller = "Dashboard",
+                RouteValues = routeValues,
+                ViewContext = viewContext,
+            };
+
+            // Act
+            await tagHelper.ProcessAsync(context, output);
+
+            // Assert
+            Assert.Equal("submit", output.TagName);
+            var attribute = Assert.Single(output.Attributes);
+            Assert.Equal("formaction", attribute.Name);
+            Assert.Equal("admin/dashboard/index", attribute.Value);
+            Assert.Empty(output.Content.GetContent());
+        }
+
+        [Theory]
+        [MemberData(nameof(AreaRouteValuesData))]
+        public async Task ProcessAsync_CallsRouteUrlWithExpectedRouteValues(
+            string area,
+            Dictionary<string, string> routeValues,
+            string expectedArea)
+        {
+            // Arrange
+            var context = new TagHelperContext(
+                tagName: "form-action",
+                allAttributes: new TagHelperAttributeList(),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "submit",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    return Task.FromResult<TagHelperContent>(new DefaultTagHelperContent());
+                });
+
+            var expectedRouteValues = new Dictionary<string, object> { { "area", expectedArea } };
+            var urlHelper = new Mock<IUrlHelper>(MockBehavior.Strict);
+            urlHelper
+                .Setup(mock => mock.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Callback<UrlRouteContext>(param => Assert.Equal(expectedRouteValues, param.Values as RouteValueDictionary))
+                .Returns("admin/dashboard/index");
+
+            var viewContext = new ViewContext();
+            var urlHelperFactory = new Mock<IUrlHelperFactory>(MockBehavior.Strict);
+            urlHelperFactory
+                .Setup(f => f.GetUrlHelper(viewContext))
+                .Returns(urlHelper.Object);
+
+            var tagHelper = new FormActionTagHelper(urlHelperFactory.Object)
+            {
+                Area = area,
+                Route = "routine",
+                RouteValues = routeValues,
+                ViewContext = viewContext,
+            };
+
+            // Act
+            await tagHelper.ProcessAsync(context, output);
+
+            // Assert
+            Assert.Equal("submit", output.TagName);
+            var attribute = Assert.Single(output.Attributes);
+            Assert.Equal("formaction", attribute.Name);
+            Assert.Equal("admin/dashboard/index", attribute.Value);
+            Assert.Empty(output.Content.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_WithPageAndArea_CallsUrlHelperWithExpectedValues()
+        {
+            // Arrange
+            var context = new TagHelperContext(
+                tagName: "form-action",
+                allAttributes: new TagHelperAttributeList(),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "submit",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    return Task.FromResult<TagHelperContent>(new DefaultTagHelperContent());
+                });
+
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper
+                .Setup(mock => mock.RouteUrl(It.IsAny<UrlRouteContext>()))
+                .Callback<UrlRouteContext>(routeContext =>
+                {
+                    var rvd = Assert.IsType<RouteValueDictionary>(routeContext.Values);
+                    Assert.Collection(
+                        rvd.OrderBy(item => item.Key),
+                        item =>
+                        {
+                            Assert.Equal("area", item.Key);
+                            Assert.Equal("test-area", item.Value);
+                        },
+                        item =>
+                        {
+                            Assert.Equal("page", item.Key);
+                            Assert.Equal("/my-page", item.Value);
+                        });
+                })
+                .Returns("admin/dashboard/index")
+                .Verifiable();
+
+            var viewContext = new ViewContext
+            {
+                RouteData = new RouteData(),
+            };
+
+            urlHelper.SetupGet(h => h.ActionContext)
+                .Returns(viewContext);
+            var urlHelperFactory = new Mock<IUrlHelperFactory>(MockBehavior.Strict);
+            urlHelperFactory
+                .Setup(f => f.GetUrlHelper(viewContext))
+                .Returns(urlHelper.Object);
+
+            var tagHelper = new FormActionTagHelper(urlHelperFactory.Object)
+            {
+                Area = "test-area",
+                Page = "/my-page",
+                ViewContext = viewContext,
+            };
+
+            // Act
+            await tagHelper.ProcessAsync(context, output);
+
+            // Assert
+            urlHelper.Verify();
+        }
+
+        [Theory]
+        [InlineData("button", "Action")]
+        [InlineData("button", "Controller")]
+        [InlineData("button", "Route")]
+        [InlineData("button", "asp-route-")]
+        [InlineData("submit", "Action")]
+        [InlineData("submit", "Controller")]
+        [InlineData("submit", "Route")]
+        [InlineData("submit", "asp-route-")]
+        public async Task ProcessAsync_ThrowsIfFormActionConflictsWithBoundAttributes(string tagName, string propertyName)
+        {
+            // Arrange
+            var urlHelperFactory = new Mock<IUrlHelperFactory>().Object;
+
+            var tagHelper = new FormActionTagHelper(urlHelperFactory);
+
+            var output = new TagHelperOutput(
+                tagName,
+                attributes: new TagHelperAttributeList
+                {
+                    { "formaction", "my-action" }
+                },
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(null));
+            if (propertyName == "asp-route-")
+            {
+                tagHelper.RouteValues.Add("name", "value");
+            }
+            else
+            {
+                typeof(FormActionTagHelper).GetProperty(propertyName).SetValue(tagHelper, "Home");
+            }
+
+            var expectedErrorMessage = $"Cannot override the 'formaction' attribute for <{tagName}>. <{tagName}> " +
+                "elements with a specified 'formaction' must not have attributes starting with 'asp-route-' or an " +
+                "'asp-action', 'asp-controller', 'asp-area', 'asp-fragment', 'asp-route', 'asp-page' or 'asp-page-handler' attribute.";
+
+            var context = new TagHelperContext(
+                tagName: "form-action",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => tagHelper.ProcessAsync(context, output));
+
+            Assert.Equal(expectedErrorMessage, ex.Message);
+        }
+
+        [Theory]
+        [InlineData("button", "Action")]
+        [InlineData("button", "Controller")]
+        [InlineData("submit", "Action")]
+        [InlineData("submit", "Controller")]
+        public async Task ProcessAsync_ThrowsIfRouteAndActionOrControllerProvided(string tagName, string propertyName)
+        {
+            // Arrange
+            var urlHelperFactory = new Mock<IUrlHelperFactory>().Object;
+
+            var tagHelper = new FormActionTagHelper(urlHelperFactory)
+            {
+                Route = "Default",
+            };
+
+            typeof(FormActionTagHelper).GetProperty(propertyName).SetValue(tagHelper, "Home");
+            var output = new TagHelperOutput(
+                tagName,
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(null));
+            var expectedErrorMessage = string.Join(
+                Environment.NewLine,
+                $"Cannot determine the 'formaction' attribute for <{tagName}>. The following attributes are mutually exclusive:",
+                "asp-route",
+                "asp-controller, asp-action",
+                "asp-page, asp-page-handler");
+
+            var context = new TagHelperContext(
+                tagName: "form-action",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => tagHelper.ProcessAsync(context, output));
+
+            Assert.Equal(expectedErrorMessage, ex.Message);
+        }
+
+        [Theory]
+        [InlineData("button")]
+        [InlineData("submit")]
+        public async Task ProcessAsync_ThrowsIfRouteAndPageProvided(string tagName)
+        {
+            // Arrange
+            var urlHelperFactory = new Mock<IUrlHelperFactory>().Object;
+
+            var tagHelper = new FormActionTagHelper(urlHelperFactory)
+            {
+                Route = "Default",
+                Page = "Page",
+            };
+
+            var output = new TagHelperOutput(
+                tagName,
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(null));
+            var expectedErrorMessage = string.Join(
+                Environment.NewLine,
+                $"Cannot determine the 'formaction' attribute for <{tagName}>. The following attributes are mutually exclusive:",
+                "asp-route",
+                "asp-controller, asp-action",
+                "asp-page, asp-page-handler");
+
+            var context = new TagHelperContext(
+                tagName: "form-action",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => tagHelper.ProcessAsync(context, output));
+
+            Assert.Equal(expectedErrorMessage, ex.Message);
+        }
+
+        [Theory]
+        [InlineData("button")]
+        [InlineData("submit")]
+        public async Task ProcessAsync_ThrowsIfRouteAndPageHandlerProvided(string tagName)
+        {
+            // Arrange
+            var urlHelperFactory = new Mock<IUrlHelperFactory>().Object;
+
+            var tagHelper = new FormActionTagHelper(urlHelperFactory)
+            {
+                Route = "Default",
+                PageHandler = "PageHandler",
+            };
+
+            var output = new TagHelperOutput(
+                tagName,
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(null));
+            var expectedErrorMessage = string.Join(
+                Environment.NewLine,
+                $"Cannot determine the 'formaction' attribute for <{tagName}>. The following attributes are mutually exclusive:",
+                "asp-route",
+                "asp-controller, asp-action",
+                "asp-page, asp-page-handler");
+
+            var context = new TagHelperContext(
+                tagName: "form-action",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => tagHelper.ProcessAsync(context, output));
+
+            Assert.Equal(expectedErrorMessage, ex.Message);
+        }
+
+        [Theory]
+        [InlineData("button")]
+        [InlineData("submit")]
+        public async Task ProcessAsync_ThrowsIfActionAndPageProvided(string tagName)
+        {
+            // Arrange
+            var urlHelperFactory = new Mock<IUrlHelperFactory>().Object;
+
+            var tagHelper = new FormActionTagHelper(urlHelperFactory)
+            {
+                Action = "Default",
+                Page = "Page",
+            };
+
+            var output = new TagHelperOutput(
+                tagName,
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(null));
+            var expectedErrorMessage = string.Join(
+                Environment.NewLine,
+                $"Cannot determine the 'formaction' attribute for <{tagName}>. The following attributes are mutually exclusive:",
+                "asp-route",
+                "asp-controller, asp-action",
+                "asp-page, asp-page-handler");
+
+            var context = new TagHelperContext(
+                tagName: "form-action",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => tagHelper.ProcessAsync(context, output));
+
+            Assert.Equal(expectedErrorMessage, ex.Message);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormTagHelperTest.cs
new file mode 100644
index 0000000000..11fbbe5d0a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormTagHelperTest.cs
@@ -0,0 +1,1178 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Routing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    public class FormTagHelperTest
+    {
+        [Fact]
+        public async Task ProcessAsync_InvokesGeneratePageForm_WithOnlyPageHandler()
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var context = new TagHelperContext(
+                tagName: "form",
+                allAttributes: new TagHelperAttributeList()
+                {
+                    { "asp-handler", "page-handler" },
+                    { "method", "get" }
+                },
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "form",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            var generator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            generator
+                .Setup(mock => mock.GeneratePageForm(
+                    viewContext,
+                    null,
+                    "page-handler",
+                    null,
+                    null,
+                    null,
+                    null))
+                .Returns(new TagBuilder("form"))
+                .Verifiable();
+            var formTagHelper = new FormTagHelper(generator.Object)
+            {
+                ViewContext = viewContext,
+                PageHandler = "page-handler",
+                Method = "get"
+            };
+
+            // Act & Assert
+            await formTagHelper.ProcessAsync(context, output);
+            generator.Verify();
+        }
+
+        [Fact]
+        public async Task ProcessAsync_ActionAndControllerGenerateAntiforgery()
+        {
+            // Arrange
+            var expectedTagName = "form";
+            var metadataProvider = new TestModelMetadataProvider();
+            var tagHelperContext = new TagHelperContext(
+                tagName: "form",
+                allAttributes: new TagHelperAttributeList()
+                {
+                    { "asp-action", "index" },
+                    { "asp-controller", "home" }
+                },
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper
+                .Setup(mock => mock.Action(It.IsAny<UrlActionContext>())).Returns("home/index");
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider, urlHelper.Object);
+            var viewContext = TestableHtmlGenerator.GetViewContext(
+                model: null,
+                htmlGenerator: htmlGenerator,
+                metadataProvider: metadataProvider);
+            var expectedPostContent = HtmlContentUtilities.HtmlContentToString(
+                htmlGenerator.GenerateAntiforgery(viewContext),
+                HtmlEncoder.Default);
+            var formTagHelper = new FormTagHelper(htmlGenerator)
+            {
+                ViewContext = viewContext,
+                Action = "index",
+                Controller = "home",
+            };
+
+            // Act
+            await formTagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal(2, output.Attributes.Count);
+            var attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("method"));
+            Assert.Equal("post", attribute.Value);
+            attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("action"));
+            Assert.Equal("home/index", attribute.Value);
+            Assert.Empty(output.PreContent.GetContent());
+            Assert.True(output.Content.GetContent().Length == 0);
+            Assert.Equal(expectedPostContent, output.PostContent.GetContent());
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_AspAntiforgeryAloneGeneratesProperFormTag()
+        {
+            // Arrange
+            var expectedTagName = "form";
+            var metadataProvider = new TestModelMetadataProvider();
+            var tagHelperContext = new TagHelperContext(
+                tagName: "form",
+                allAttributes: new TagHelperAttributeList()
+                {
+                    { "asp-antiforgery", true }
+                },
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            var urlHelper = new Mock<IUrlHelper>();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider, urlHelper.Object);
+            var viewContext = TestableHtmlGenerator.GetViewContext(
+                model: null,
+                htmlGenerator: htmlGenerator,
+                metadataProvider: metadataProvider);
+            viewContext.HttpContext.Request.Path = "/home/index";
+            var expectedPostContent = HtmlContentUtilities.HtmlContentToString(
+                htmlGenerator.GenerateAntiforgery(viewContext),
+                HtmlEncoder.Default);
+            var formTagHelper = new FormTagHelper(htmlGenerator)
+            {
+                ViewContext = viewContext,
+                Antiforgery = true,
+            };
+
+            // Act
+            await formTagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal(2, output.Attributes.Count);
+            var attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("method"));
+            Assert.Equal("post", attribute.Value);
+            attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("action"));
+            Assert.Equal("/home/index", attribute.Value);
+            Assert.Empty(output.PreContent.GetContent());
+            Assert.True(output.Content.GetContent().Length == 0);
+            Assert.Equal(expectedPostContent, output.PostContent.GetContent());
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_EmptyHtmlStringActionGeneratesAntiforgery()
+        {
+            // Arrange
+            var expectedTagName = "form";
+            var metadataProvider = new TestModelMetadataProvider();
+            var tagHelperContext = new TagHelperContext(
+                tagName: "form",
+                allAttributes: new TagHelperAttributeList()
+                {
+                    { "method", new HtmlString("post") }
+                },
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                attributes: new TagHelperAttributeList()
+                {
+                    { "action", HtmlString.Empty },
+                },
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper
+                .Setup(mock => mock.Action(It.IsAny<UrlActionContext>())).Returns("home/index");
+
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider, urlHelper.Object);
+            var viewContext = TestableHtmlGenerator.GetViewContext(
+                model: null,
+                htmlGenerator: htmlGenerator,
+                metadataProvider: metadataProvider);
+            var expectedPostContent = HtmlContentUtilities.HtmlContentToString(
+                htmlGenerator.GenerateAntiforgery(viewContext),
+                HtmlEncoder.Default);
+            var formTagHelper = new FormTagHelper(htmlGenerator)
+            {
+                ViewContext = viewContext,
+                Method = "post",
+            };
+
+            // Act
+            await formTagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            var attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("action"));
+            Assert.Equal(HtmlString.Empty, attribute.Value);
+            Assert.Empty(output.PreElement.GetContent());
+            Assert.Empty(output.PreContent.GetContent());
+            Assert.Empty(output.Content.GetContent());
+            Assert.Equal(expectedPostContent, output.PostContent.GetContent());
+            Assert.Empty(output.PostElement.GetContent());
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_EmptyStringActionGeneratesAntiforgery()
+        {
+            // Arrange
+            var expectedTagName = "form";
+            var metadataProvider = new TestModelMetadataProvider();
+            var tagHelperContext = new TagHelperContext(
+                tagName: "form",
+                allAttributes: new TagHelperAttributeList()
+                {
+                    { "method", new HtmlString("post") }
+                },
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                attributes: new TagHelperAttributeList()
+                {
+                    { "action", string.Empty },
+                },
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper
+                .Setup(mock => mock.Action(It.IsAny<UrlActionContext>())).Returns("home/index");
+
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider, urlHelper.Object);
+            var viewContext = TestableHtmlGenerator.GetViewContext(
+                model: null,
+                htmlGenerator: htmlGenerator,
+                metadataProvider: metadataProvider);
+            var expectedPostContent = HtmlContentUtilities.HtmlContentToString(
+                htmlGenerator.GenerateAntiforgery(viewContext),
+                HtmlEncoder.Default);
+            var formTagHelper = new FormTagHelper(htmlGenerator)
+            {
+                ViewContext = viewContext,
+                Method = "post",
+            };
+
+            // Act
+            await formTagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            var attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("action"));
+            Assert.Equal(string.Empty, attribute.Value);
+            Assert.Empty(output.PreElement.GetContent());
+            Assert.Empty(output.PreContent.GetContent());
+            Assert.Empty(output.Content.GetContent());
+            Assert.Equal(expectedPostContent, output.PostContent.GetContent());
+            Assert.Empty(output.PostElement.GetContent());
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_GeneratesExpectedOutput()
+        {
+            // Arrange
+            var expectedTagName = "not-form";
+            var metadataProvider = new TestModelMetadataProvider();
+            var tagHelperContext = new TagHelperContext(
+                tagName: "form",
+                allAttributes: new TagHelperAttributeList
+                {
+                    { "id", "myform" },
+                    { "asp-route-name", "value" },
+                    { "asp-action", "index" },
+                    { "asp-controller", "home" },
+                    { "method", "post" },
+                    { "asp-antiforgery", true }
+                },
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                attributes: new TagHelperAttributeList
+                {
+                    { "id", "myform" },
+                },
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something Else");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            output.PostContent.SetContent("Something");
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper
+                .Setup(mock => mock.Action(It.IsAny<UrlActionContext>())).Returns("home/index");
+
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider, urlHelper.Object);
+            var viewContext = TestableHtmlGenerator.GetViewContext(
+                model: null,
+                htmlGenerator: htmlGenerator,
+                metadataProvider: metadataProvider);
+            var expectedPostContent = "Something" +
+                HtmlContentUtilities.HtmlContentToString(
+                    htmlGenerator.GenerateAntiforgery(viewContext),
+                    HtmlEncoder.Default);
+            var formTagHelper = new FormTagHelper(htmlGenerator)
+            {
+                Action = "index",
+                Antiforgery = true,
+                Controller = "home",
+                ViewContext = viewContext,
+                RouteValues =
+                {
+                    { "name", "value" },
+                },
+            };
+
+            // Act
+            await formTagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal(3, output.Attributes.Count);
+            var attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("id"));
+            Assert.Equal("myform", attribute.Value);
+            attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("method"));
+            Assert.Equal("post", attribute.Value);
+            attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("action"));
+            Assert.Equal("home/index", attribute.Value);
+            Assert.Empty(output.PreContent.GetContent());
+            Assert.True(output.Content.GetContent().Length == 0);
+            Assert.Equal(expectedPostContent, output.PostContent.GetContent());
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Theory]
+        [InlineData(null, FormMethod.Post, "<input />")]
+        [InlineData(true, FormMethod.Post, "<input />")]
+        [InlineData(false, FormMethod.Post, "")]
+        [InlineData(null, FormMethod.Get, "")]
+        [InlineData(true, FormMethod.Get, "<input />")]
+        [InlineData(false, FormMethod.Get, "")]
+        public async Task ProcessAsync_GeneratesAntiforgeryCorrectly(
+            bool? antiforgery,
+            FormMethod method,
+            string expectedPostContent)
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var expectedAttribute = new TagHelperAttribute("method", method.ToString().ToLowerInvariant());
+            var context = new TagHelperContext(
+                tagName: "form",
+                allAttributes: new TagHelperAttributeList(new[] { expectedAttribute }),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "form",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            var generator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            generator
+                .Setup(mock => mock.GenerateForm(
+                    It.IsAny<ViewContext>(),
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>()))
+                .Returns(new TagBuilder("form"));
+
+            generator.Setup(mock => mock.GenerateAntiforgery(viewContext))
+                     .Returns(new HtmlString("<input />"));
+            var formTagHelper = new FormTagHelper(generator.Object)
+            {
+                Action = "Index",
+                Antiforgery = antiforgery,
+                ViewContext = viewContext,
+                Method = method.ToString().ToLowerInvariant()
+            };
+
+            // Act
+            await formTagHelper.ProcessAsync(context, output);
+
+            // Assert
+            Assert.Equal("form", output.TagName);
+            Assert.Equal(TagMode.StartTagAndEndTag, output.TagMode);
+            var attribute = Assert.Single(output.Attributes);
+            Assert.Equal(expectedAttribute, attribute);
+            Assert.Empty(output.PreContent.GetContent());
+            Assert.True(output.Content.GetContent().Length == 0);
+            Assert.Equal(expectedPostContent, output.PostContent.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_BindsRouteValues()
+        {
+            // Arrange
+            var testViewContext = CreateViewContext();
+            var context = new TagHelperContext(
+                tagName: "form",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var expectedAttribute = new TagHelperAttribute("asp-ROUTEE-NotRoute", "something");
+            var output = new TagHelperOutput(
+                "form",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            output.Attributes.Add(expectedAttribute);
+
+            var generator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            generator
+                .Setup(mock => mock.GenerateForm(
+                    It.IsAny<ViewContext>(),
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>()))
+                .Callback<ViewContext, string, string, object, string, object>(
+                    (viewContext, actionName, controllerName, routeValues, method, htmlAttributes) =>
+                    {
+                        // Fixes Roslyn bug with lambdas
+                        generator.ToString();
+
+                        var routeValueDictionary = Assert.IsType<RouteValueDictionary>(routeValues);
+                        Assert.Equal(2, routeValueDictionary.Count);
+                        var routeValue = Assert.Single(routeValueDictionary, attr => attr.Key.Equals("val"));
+                        Assert.Equal("hello", routeValue.Value);
+                        routeValue = Assert.Single(routeValueDictionary, attr => attr.Key.Equals("-Name"));
+                        Assert.Equal("Value", routeValue.Value);
+                    })
+                .Returns(new TagBuilder("form"))
+                .Verifiable();
+            var formTagHelper = new FormTagHelper(generator.Object)
+            {
+                Action = "Index",
+                Antiforgery = false,
+                ViewContext = testViewContext,
+                RouteValues =
+                {
+                    { "val", "hello" },
+                    { "-Name", "Value" },
+                },
+            };
+
+            // Act & Assert
+            await formTagHelper.ProcessAsync(context, output);
+
+            Assert.Equal("form", output.TagName);
+            Assert.Equal(TagMode.StartTagAndEndTag, output.TagMode);
+            var attribute = Assert.Single(output.Attributes);
+            Assert.Equal(expectedAttribute, attribute);
+            Assert.Empty(output.PreContent.GetContent());
+            Assert.True(output.Content.GetContent().Length == 0);
+            Assert.Empty(output.PostContent.GetContent());
+            generator.Verify();
+        }
+
+        [Fact]
+        public async Task ProcessAsync_CallsIntoGenerateFormWithExpectedParameters()
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var context = new TagHelperContext(
+                tagName: "form",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "form",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            var generator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            generator
+                .Setup(mock => mock.GenerateForm(
+                    viewContext,
+                    "Index",
+                    "Home",
+                    It.IsAny<IDictionary<string, object>>(),
+                    null,
+                    null))
+                .Returns(new TagBuilder("form"))
+                .Verifiable();
+            var formTagHelper = new FormTagHelper(generator.Object)
+            {
+                Action = "Index",
+                Antiforgery = false,
+                Controller = "Home",
+                ViewContext = viewContext,
+            };
+
+            // Act & Assert
+            await formTagHelper.ProcessAsync(context, output);
+            generator.Verify();
+
+            Assert.Equal("form", output.TagName);
+            Assert.Equal(TagMode.StartTagAndEndTag, output.TagMode);
+            Assert.Empty(output.Attributes);
+            Assert.Empty(output.PreElement.GetContent());
+            Assert.Empty(output.PreContent.GetContent());
+            Assert.True(output.Content.GetContent().Length == 0);
+            Assert.Empty(output.PostContent.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_AspFragmentAddsFragmentToAction()
+        {
+            // Arrange
+            var expectedTagName = "form";
+            var metadataProvider = new TestModelMetadataProvider();
+            var tagHelperContext = new TagHelperContext(
+                tagName: "form",
+                allAttributes: new TagHelperAttributeList
+                {
+                    { "id", "myform" },
+                    { "asp-route-name", "value" },
+                    { "asp-action", "index" },
+                    { "asp-controller", "home" },
+                    { "asp-fragment", "test" },
+                    { "method", "post" },
+                    { "asp-antiforgery", true }
+                },
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            var output = new TagHelperOutput(
+                expectedTagName,
+                attributes: new TagHelperAttributeList
+                {
+                    { "id", "myform" },
+                },
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper
+                .Setup(mock => mock.Action(It.IsAny<UrlActionContext>())).Returns("home/index");
+
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider, urlHelper.Object);
+            var viewContext = TestableHtmlGenerator.GetViewContext(
+                model: null,
+                htmlGenerator: htmlGenerator,
+                metadataProvider: metadataProvider);
+
+            var formTagHelper = new FormTagHelper(htmlGenerator)
+            {
+                Action = "index",
+                Antiforgery = true,
+                Controller = "home",
+                Fragment = "test",
+                ViewContext = viewContext,
+                RouteValues =
+                {
+                    { "name", "value" },
+                },
+            };
+
+            // Act
+            await formTagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+
+            Assert.Equal("form", output.TagName);
+            Assert.Equal(TagMode.StartTagAndEndTag, output.TagMode);
+            var attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("action"));
+            Assert.Equal("home/index#test", attribute.Value);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_AspAreaAddsAreaToRouteValues()
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var context = new TagHelperContext(
+                tagName: "form",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "form",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+
+            var expectedRouteValues = new Dictionary<string, object> { { "area", "Admin" } };
+            var generator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            generator
+                .Setup(mock => mock.GenerateForm(
+                    viewContext,
+                    "Index",
+                    "Home",
+                    expectedRouteValues,
+                    null,
+                    null))
+                .Returns(new TagBuilder("form"))
+                .Verifiable();
+            var formTagHelper = new FormTagHelper(generator.Object)
+            {
+                Action = "Index",
+                Antiforgery = false,
+                Controller = "Home",
+                Area = "Admin",
+                ViewContext = viewContext,
+            };
+
+            // Act
+            await formTagHelper.ProcessAsync(context, output);
+
+            // Assert
+            generator.Verify();
+
+            Assert.Equal("form", output.TagName);
+            Assert.Equal(TagMode.StartTagAndEndTag, output.TagMode);
+            Assert.Empty(output.Attributes);
+            Assert.Empty(output.PreElement.GetContent());
+            Assert.Empty(output.PreContent.GetContent());
+            Assert.True(output.Content.GetContent().Length == 0);
+            Assert.Empty(output.PostContent.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_EmptyStringOnAspAreaIsPassedThroughToRouteValues()
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var context = new TagHelperContext(
+                tagName: "form",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "form",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+
+            var expectedRouteValues = new Dictionary<string, object> { { "area", string.Empty } };
+            var generator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            generator
+                .Setup(mock => mock.GenerateForm(
+                    viewContext,
+                    "Index",
+                    "Home",
+                    expectedRouteValues,
+                    null,
+                    null))
+                .Returns(new TagBuilder("form"))
+                .Verifiable();
+            var formTagHelper = new FormTagHelper(generator.Object)
+            {
+                Action = "Index",
+                Antiforgery = false,
+                Controller = "Home",
+                Area = string.Empty,
+                ViewContext = viewContext,
+            };
+
+            // Act
+            await formTagHelper.ProcessAsync(context, output);
+
+            // Assert
+            generator.Verify();
+
+            Assert.Equal("form", output.TagName);
+            Assert.Equal(TagMode.StartTagAndEndTag, output.TagMode);
+            Assert.Empty(output.Attributes);
+            Assert.Empty(output.PreElement.GetContent());
+            Assert.Empty(output.PreContent.GetContent());
+            Assert.True(output.Content.GetContent().Length == 0);
+            Assert.Empty(output.PostContent.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_AspAreaOverridesAspRouteArea()
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var context = new TagHelperContext(
+                tagName: "form",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "form",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+
+            var expectedRouteValues = new Dictionary<string, object> { { "area", "Admin" } };
+            var generator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            generator
+                .Setup(mock => mock.GenerateForm(
+                    viewContext,
+                    "Index",
+                    "Home",
+                    expectedRouteValues,
+                    null,
+                    null))
+                .Returns(new TagBuilder("form"))
+                .Verifiable();
+            var formTagHelper = new FormTagHelper(generator.Object)
+            {
+                Action = "Index",
+                Antiforgery = false,
+                Controller = "Home",
+                Area = "Admin",
+                RouteValues = new Dictionary<string, string> { { "area", "Client" } },
+                ViewContext = viewContext,
+            };
+
+            // Act
+            await formTagHelper.ProcessAsync(context, output);
+
+            // Assert
+            generator.Verify();
+
+            Assert.Equal("form", output.TagName);
+            Assert.Equal(TagMode.StartTagAndEndTag, output.TagMode);
+            Assert.Empty(output.Attributes);
+            Assert.Empty(output.PreElement.GetContent());
+            Assert.Empty(output.PreContent.GetContent());
+            Assert.True(output.Content.GetContent().Length == 0);
+            Assert.Empty(output.PostContent.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_CallsIntoGenerateRouteFormWithExpectedParameters()
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var context = new TagHelperContext(
+                tagName: "form",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "form",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            var generator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            generator
+                .Setup(mock => mock.GenerateRouteForm(
+                    viewContext,
+                    "Default",
+                    It.Is<RouteValueDictionary>(m => string.Equals(m["name"], "value")),
+                    null,
+                    null))
+                .Returns(new TagBuilder("form"))
+                .Verifiable();
+            var formTagHelper = new FormTagHelper(generator.Object)
+            {
+                Antiforgery = false,
+                Route = "Default",
+                ViewContext = viewContext,
+                RouteValues =
+                {
+                    { "name", "value" },
+                },
+            };
+
+            // Act & Assert
+            await formTagHelper.ProcessAsync(context, output);
+            generator.Verify();
+
+            Assert.Equal("form", output.TagName);
+            Assert.Equal(TagMode.StartTagAndEndTag, output.TagMode);
+            Assert.Empty(output.Attributes);
+            Assert.Empty(output.PreElement.GetContent());
+            Assert.Empty(output.PreContent.GetContent());
+            Assert.True(output.Content.GetContent().Length == 0);
+            Assert.Empty(output.PostContent.GetContent());
+            Assert.Empty(output.PostElement.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_InvokesGeneratePageForm()
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var context = new TagHelperContext(
+                tagName: "form",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "form",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            var generator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            generator
+                .Setup(mock => mock.GeneratePageForm(
+                    viewContext,
+                    "/Home/Admin/Post",
+                    "page-handler",
+                    null,
+                    "hello-world",
+                    null,
+                    null))
+                .Returns(new TagBuilder("form"))
+                .Verifiable();
+            var formTagHelper = new FormTagHelper(generator.Object)
+            {
+                Antiforgery = false,
+                ViewContext = viewContext,
+                Page = "/Home/Admin/Post",
+                PageHandler = "page-handler",
+                Fragment = "hello-world",
+            };
+
+            // Act & Assert
+            await formTagHelper.ProcessAsync(context, output);
+            generator.Verify();
+        }
+
+        [Fact]
+        public async Task ProcessAsync_WithPageAndArea_InvokesGeneratePageForm()
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var context = new TagHelperContext(
+                tagName: "form",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "form",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            var generator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            generator
+                .Setup(mock => mock.GeneratePageForm(
+                    viewContext,
+                    "/Home/Admin/Post",
+                    "page-handler",
+                    It.IsAny<object>(),
+                    "hello-world",
+                    null,
+                    null))
+                .Callback((ViewContext _, string pageName, string pageHandler, object routeValues, string fragment, string method, object htmlAttributes) =>
+                {
+                    var rvd = Assert.IsType<RouteValueDictionary>(routeValues);
+                    Assert.Collection(
+                        rvd.OrderBy(item => item.Key),
+                        item =>
+                        {
+                            Assert.Equal("area", item.Key);
+                            Assert.Equal("test-area", item.Value);
+                        });
+                })
+                .Returns(new TagBuilder("form"))
+                .Verifiable();
+            var formTagHelper = new FormTagHelper(generator.Object)
+            {
+                Antiforgery = false,
+                ViewContext = viewContext,
+                Page = "/Home/Admin/Post",
+                PageHandler = "page-handler",
+                Fragment = "hello-world",
+                Area = "test-area",
+            };
+
+            // Act & Assert
+            await formTagHelper.ProcessAsync(context, output);
+            generator.Verify();
+        }
+
+        [Theory]
+        [InlineData(true, "<input />")]
+        [InlineData(false, "")]
+        [InlineData(null, "")]
+        public async Task ProcessAsync_SupportsAntiforgeryIfActionIsSpecified(
+            bool? antiforgery,
+            string expectedPostContent)
+        {
+            // Arrange
+            var viewContext = CreateViewContext();
+            var generator = new Mock<IHtmlGenerator>();
+
+            generator.Setup(mock => mock.GenerateAntiforgery(It.IsAny<ViewContext>()))
+                     .Returns(new HtmlString("<input />"));
+            var formTagHelper = new FormTagHelper(generator.Object)
+            {
+                Antiforgery = antiforgery,
+                ViewContext = viewContext,
+            };
+
+            var output = new TagHelperOutput(
+                tagName: "form",
+                attributes: new TagHelperAttributeList
+                {
+                    { "aCTiON", "my-action" },
+                },
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            var context = new TagHelperContext(
+                tagName: "form",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+
+            // Act
+            await formTagHelper.ProcessAsync(context, output);
+
+            // Assert
+            Assert.Equal("form", output.TagName);
+            Assert.Equal(TagMode.StartTagAndEndTag, output.TagMode);
+            var attribute = Assert.Single(output.Attributes);
+            Assert.Equal(new TagHelperAttribute("aCTiON", "my-action"), attribute);
+            Assert.Empty(output.PreContent.GetContent());
+            Assert.True(output.Content.GetContent().Length == 0);
+            Assert.Equal(expectedPostContent, output.PostContent.GetContent());
+        }
+
+        [Theory]
+        [InlineData("Action")]
+        [InlineData("Controller")]
+        [InlineData("Page")]
+        [InlineData("PageHandler")]
+        [InlineData("asp-route-")]
+        public async Task ProcessAsync_ThrowsIfActionConflictsWithBoundAttributes(string propertyName)
+        {
+            // Arrange
+            var formTagHelper = new FormTagHelper(new TestableHtmlGenerator(new EmptyModelMetadataProvider()));
+            var tagHelperOutput = new TagHelperOutput(
+                "form",
+                attributes: new TagHelperAttributeList
+                {
+                    { "action", "my-action" },
+                },
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(null));
+            if (propertyName == "asp-route-")
+            {
+                formTagHelper.RouteValues.Add("name", "value");
+            }
+            else
+            {
+                typeof(FormTagHelper).GetProperty(propertyName).SetValue(formTagHelper, "Home");
+            }
+
+            var expectedErrorMessage = "Cannot override the 'action' attribute for <form>. A <form> with a specified " +
+                "'action' must not have attributes starting with 'asp-route-' or an " +
+                "'asp-action', 'asp-controller', 'asp-fragment', 'asp-area', 'asp-route', 'asp-page' or 'asp-page-handler' attribute.";
+
+            var context = new TagHelperContext(
+                tagName: "form",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => formTagHelper.ProcessAsync(context, tagHelperOutput));
+
+            Assert.Equal(expectedErrorMessage, ex.Message);
+        }
+
+        [Theory]
+        [InlineData("Action")]
+        [InlineData("Controller")]
+        public async Task ProcessAsync_ThrowsIfRouteAndActionOrControllerProvided(string propertyName)
+        {
+            // Arrange
+            var formTagHelper = new FormTagHelper(new TestableHtmlGenerator(new EmptyModelMetadataProvider()))
+            {
+                Route = "Default",
+            };
+            typeof(FormTagHelper).GetProperty(propertyName).SetValue(formTagHelper, "Home");
+            var output = new TagHelperOutput(
+                "form",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(null));
+            var expectedErrorMessage = string.Join(
+                Environment.NewLine,
+                "Cannot determine the 'action' attribute for <form>. The following attributes are mutually exclusive:",
+                "asp-route",
+                "asp-controller, asp-action",
+                "asp-page");
+
+            var context = new TagHelperContext(
+                tagName: "form",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => formTagHelper.ProcessAsync(context, output));
+
+            Assert.Equal(expectedErrorMessage, ex.Message);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_ThrowsIfRouteAndPageProvided()
+        {
+            // Arrange
+            var formTagHelper = new FormTagHelper(new TestableHtmlGenerator(new EmptyModelMetadataProvider()))
+            {
+                Route = "Default",
+                Page = "Page",
+            };
+            var output = new TagHelperOutput(
+                "form",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(null));
+            var expectedErrorMessage = string.Join(
+                Environment.NewLine,
+                "Cannot determine the 'action' attribute for <form>. The following attributes are mutually exclusive:",
+                "asp-route",
+                "asp-controller, asp-action",
+                "asp-page");
+
+            var context = new TagHelperContext(
+                tagName: "form",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => formTagHelper.ProcessAsync(context, output));
+
+            Assert.Equal(expectedErrorMessage, ex.Message);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_ThrowsIfActionAndPageProvided()
+        {
+            // Arrange
+            var formTagHelper = new FormTagHelper(new TestableHtmlGenerator(new EmptyModelMetadataProvider()))
+            {
+                Action = "Default",
+                Page = "Page",
+            };
+            var output = new TagHelperOutput(
+                "form",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(null));
+            var expectedErrorMessage = string.Join(
+                Environment.NewLine,
+                "Cannot determine the 'action' attribute for <form>. The following attributes are mutually exclusive:",
+                "asp-route",
+                "asp-controller, asp-action",
+                "asp-page");
+
+            var context = new TagHelperContext(
+                tagName: "form",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act & Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => formTagHelper.ProcessAsync(context, output));
+
+            Assert.Equal(expectedErrorMessage, ex.Message);
+        }
+
+        private static ViewContext CreateViewContext()
+        {
+            var actionContext = new ActionContext(
+                new DefaultHttpContext(),
+                new RouteData(),
+                new ActionDescriptor());
+
+            return new ViewContext(
+                actionContext,
+                Mock.Of<IView>(),
+                new ViewDataDictionary(new TestModelMetadataProvider(), new ModelStateDictionary()),
+                Mock.Of<ITempDataDictionary>(),
+                TextWriter.Null,
+                new HtmlHelperOptions());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ImageTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ImageTagHelperTest.cs
new file mode 100644
index 0000000000..a2159f251f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ImageTagHelperTest.cs
@@ -0,0 +1,349 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Primitives;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    public class ImageTagHelperTest
+    {
+        [Theory]
+        [InlineData(null, "test.jpg", "test.jpg")]
+        [InlineData("abcd.jpg", "test.jpg", "test.jpg")]
+        [InlineData(null, "~/test.jpg", "virtualRoot/test.jpg")]
+        [InlineData("abcd.jpg", "~/test.jpg", "virtualRoot/test.jpg")]
+        public void Process_SrcDefaultsToTagHelperOutputSrcAttributeAddedByOtherTagHelper(
+            string src,
+            string srcOutput,
+            string expectedSrcPrefix)
+        {
+            // Arrange
+            var allAttributes = new TagHelperAttributeList(
+                new TagHelperAttributeList
+                {
+                    { "alt", new HtmlString("Testing") },
+                    { "asp-append-version", true },
+                });
+            var context = MakeTagHelperContext(allAttributes);
+            var outputAttributes = new TagHelperAttributeList
+                {
+                    { "alt", new HtmlString("Testing") },
+                    { "src", srcOutput },
+                };
+            var output = new TagHelperOutput(
+                "img",
+                outputAttributes,
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+            var urlHelper = new Mock<IUrlHelper>();
+
+            // Ensure expanded path does not look like an absolute path on Linux, avoiding
+            // https://github.com/aspnet/External/issues/21
+            urlHelper
+                .Setup(urlhelper => urlhelper.Content(It.IsAny<string>()))
+                .Returns(new Func<string, string>(url => url.Replace("~/", "virtualRoot/")));
+            var urlHelperFactory = new Mock<IUrlHelperFactory>();
+            urlHelperFactory
+                .Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>()))
+                .Returns(urlHelper.Object);
+
+            var helper = new ImageTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                urlHelperFactory.Object)
+            {
+                ViewContext = viewContext,
+                AppendVersion = true,
+                Src = src,
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal(
+                expectedSrcPrefix + "?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk",
+                (string)output.Attributes["src"].Value,
+                StringComparer.Ordinal);
+        }
+
+        [Fact]
+        public void PreservesOrderOfSourceAttributesWhenRun()
+        {
+            // Arrange
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "alt", new HtmlString("alt text") },
+                    { "data-extra", new HtmlString("something") },
+                    { "title", new HtmlString("Image title") },
+                    { "src", "testimage.png" },
+                    { "asp-append-version", "true" }
+                });
+            var output = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "alt", new HtmlString("alt text") },
+                    { "data-extra", new HtmlString("something") },
+                    { "title", new HtmlString("Image title") },
+                });
+
+            var expectedOutput = MakeImageTagHelperOutput(
+                attributes: new TagHelperAttributeList
+                {
+                    { "alt", new HtmlString("alt text") },
+                    { "data-extra", new HtmlString("something") },
+                    { "title", new HtmlString("Image title") },
+                    { "src", "testimage.png?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk" }
+                });
+
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+
+            var helper = new ImageTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                ViewContext = viewContext,
+                Src = "testimage.png",
+                AppendVersion = true,
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedOutput.TagName, output.TagName);
+            Assert.Equal(4, output.Attributes.Count);
+
+            for (var i = 0; i < expectedOutput.Attributes.Count; i++)
+            {
+                var expectedAtribute = expectedOutput.Attributes[i];
+                var actualAttribute = output.Attributes[i];
+                Assert.Equal(expectedAtribute.Name, actualAttribute.Name);
+                Assert.Equal(expectedAtribute.Value.ToString(), actualAttribute.Value.ToString());
+            }
+        }
+
+        [Fact]
+        public void RendersImageTag_AddsFileVersion()
+        {
+            // Arrange
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "alt", new HtmlString("Alt image text") },
+                    { "src", "/images/test-image.png" },
+                    { "asp-append-version", "true" }
+                });
+            var output = MakeImageTagHelperOutput(attributes: new TagHelperAttributeList
+            {
+                { "alt", new HtmlString("Alt image text") },
+            });
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+
+            var helper = new ImageTagHelper(hostingEnvironment, MakeCache(), new HtmlTestEncoder(), MakeUrlHelperFactory())
+            {
+                ViewContext = viewContext,
+                Src = "/images/test-image.png",
+                AppendVersion = true
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.True(output.Content.GetContent().Length == 0);
+            Assert.Equal("img", output.TagName);
+            Assert.Equal(2, output.Attributes.Count);
+            var srcAttribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("src"));
+            Assert.Equal("/images/test-image.png?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk", srcAttribute.Value);
+        }
+
+        [Fact]
+        public void RendersImageTag_DoesNotAddFileVersion()
+        {
+            // Arrange
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "alt", new HtmlString("Alt image text") },
+                    { "src", "/images/test-image.png" },
+                    { "asp-append-version", "false" }
+                });
+            var output = MakeImageTagHelperOutput(attributes: new TagHelperAttributeList
+            {
+                { "alt", new HtmlString("Alt image text") },
+            });
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+
+            var helper = new ImageTagHelper(hostingEnvironment, MakeCache(), new HtmlTestEncoder(), MakeUrlHelperFactory())
+            {
+                ViewContext = viewContext,
+                Src = "/images/test-image.png",
+                AppendVersion = false
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.True(output.Content.GetContent().Length == 0);
+            Assert.Equal("img", output.TagName);
+            Assert.Equal(2, output.Attributes.Count);
+            var srcAttribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("src"));
+            Assert.Equal("/images/test-image.png", srcAttribute.Value);
+        }
+
+        [Fact]
+        public void RendersImageTag_AddsFileVersion_WithRequestPathBase()
+        {
+            // Arrange
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "alt", new HtmlString("alt text") },
+                    { "src", "/bar/images/image.jpg" },
+                    { "asp-append-version", "true" },
+                });
+            var output = MakeImageTagHelperOutput(attributes: new TagHelperAttributeList
+            {
+                { "alt", new HtmlString("alt text") },
+            });
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext("/bar");
+
+            var helper = new ImageTagHelper(hostingEnvironment, MakeCache(), new HtmlTestEncoder(), MakeUrlHelperFactory())
+            {
+                ViewContext = viewContext,
+                Src = "/bar/images/image.jpg",
+                AppendVersion = true
+            };
+
+            // Act
+            helper.Process(context, output);
+            // Assert
+            Assert.True(output.Content.GetContent().Length == 0);
+            Assert.Equal("img", output.TagName);
+            Assert.Equal(2, output.Attributes.Count);
+            var srcAttribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("src"));
+            Assert.Equal("/bar/images/image.jpg?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk", srcAttribute.Value);
+        }
+
+        private static ViewContext MakeViewContext(string requestPathBase = null)
+        {
+            var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+            if (requestPathBase != null)
+            {
+                actionContext.HttpContext.Request.PathBase = new Http.PathString(requestPathBase);
+            }
+
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var viewData = new ViewDataDictionary(metadataProvider, new ModelStateDictionary());
+            var viewContext = new ViewContext(
+                actionContext,
+                Mock.Of<IView>(),
+                viewData,
+                Mock.Of<ITempDataDictionary>(),
+                TextWriter.Null,
+                new HtmlHelperOptions());
+
+            return viewContext;
+        }
+
+        private static TagHelperContext MakeTagHelperContext(
+            TagHelperAttributeList attributes)
+        {
+            return new TagHelperContext(
+                tagName: "image",
+                allAttributes: attributes,
+                items: new Dictionary<object, object>(),
+                uniqueId: Guid.NewGuid().ToString("N"));
+        }
+
+        private static TagHelperOutput MakeImageTagHelperOutput(TagHelperAttributeList attributes)
+        {
+            attributes = attributes ?? new TagHelperAttributeList();
+
+            return new TagHelperOutput(
+                "img",
+                attributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent(default(string));
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+        }
+
+        private static IHostingEnvironment MakeHostingEnvironment()
+        {
+            var emptyDirectoryContents = new Mock<IDirectoryContents>();
+            emptyDirectoryContents.Setup(dc => dc.GetEnumerator())
+                .Returns(Enumerable.Empty<IFileInfo>().GetEnumerator());
+            var mockFile = new Mock<IFileInfo>();
+            mockFile.SetupGet(f => f.Exists).Returns(true);
+            mockFile
+                .Setup(m => m.CreateReadStream())
+                .Returns(() => new MemoryStream(Encoding.UTF8.GetBytes("Hello World!")));
+            var mockFileProvider = new Mock<IFileProvider>();
+            mockFileProvider.Setup(fp => fp.GetDirectoryContents(It.IsAny<string>()))
+                .Returns(emptyDirectoryContents.Object);
+            mockFileProvider.Setup(fp => fp.GetFileInfo(It.IsAny<string>()))
+                .Returns(mockFile.Object);
+            mockFileProvider.Setup(fp => fp.Watch(It.IsAny<string>()))
+                .Returns(new TestFileChangeToken());
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.Setup(h => h.WebRootFileProvider).Returns(mockFileProvider.Object);
+
+            return hostingEnvironment.Object;
+        }
+
+        private static IMemoryCache MakeCache() => new MemoryCache(new MemoryCacheOptions());
+
+        private static IUrlHelperFactory MakeUrlHelperFactory()
+        {
+            var urlHelper = new Mock<IUrlHelper>();
+
+            urlHelper
+                .Setup(helper => helper.Content(It.IsAny<string>()))
+                .Returns(new Func<string, string>(url => url));
+
+            var urlHelperFactory = new Mock<IUrlHelperFactory>();
+            urlHelperFactory
+                .Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>()))
+                .Returns(urlHelper.Object);
+
+            return urlHelperFactory.Object;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/InputTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/InputTagHelperTest.cs
new file mode 100644
index 0000000000..79e44651b3
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/InputTagHelperTest.cs
@@ -0,0 +1,1915 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers.Testing;
+using Microsoft.AspNetCore.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    public class InputTagHelperTest
+    {
+        public static TheoryData<TagHelperAttributeList, string> MultiAttributeCheckBoxData
+        {
+            get
+            {
+                // outputAttributes, expectedAttributeString
+                return new TheoryData<TagHelperAttributeList, string>
+                {
+                    {
+                        new TagHelperAttributeList
+                        {
+                            { "hello", "world" },
+                            { "hello", "world2" }
+                        },
+                        "hello=\"HtmlEncode[[world]]\" hello=\"HtmlEncode[[world2]]\""
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            { "hello", "world" },
+                            { "hello", "world2" },
+                            { "hello", "world3" }
+                        },
+                        "hello=\"HtmlEncode[[world]]\" hello=\"HtmlEncode[[world2]]\" hello=\"HtmlEncode[[world3]]\""
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            { "HelLO", "world" },
+                            { "HELLO", "world2" }
+                        },
+                        "HelLO=\"HtmlEncode[[world]]\" HELLO=\"HtmlEncode[[world2]]\""
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            { "Hello", "world" },
+                            { "HELLO", "world2" },
+                            { "hello", "world3" }
+                        },
+                        "Hello=\"HtmlEncode[[world]]\" HELLO=\"HtmlEncode[[world2]]\" hello=\"HtmlEncode[[world3]]\""
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            { "HeLlO", "world" },
+                            { "hello", "world2" }
+                        },
+                        "HeLlO=\"HtmlEncode[[world]]\" hello=\"HtmlEncode[[world2]]\""
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(MultiAttributeCheckBoxData))]
+        public async Task CheckBoxHandlesMultipleAttributesSameNameArePreserved(
+            TagHelperAttributeList outputAttributes,
+            string expectedAttributeString)
+        {
+            // Arrange
+            var originalContent = "original content";
+            var expectedContent = $"<input {expectedAttributeString} type=\"HtmlEncode[[checkbox]]\" id=\"HtmlEncode[[IsACar]]\" " +
+                $"name=\"HtmlEncode[[IsACar]]\" value=\"HtmlEncode[[true]]\" />" +
+                "<input name=\"HtmlEncode[[IsACar]]\" type=\"HtmlEncode[[hidden]]\" value=\"HtmlEncode[[false]]\" />";
+
+            var context = new TagHelperContext(
+                tagName: "input",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "input",
+                outputAttributes,
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(result: null))
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+
+            output.Content.AppendHtml(originalContent);
+            var htmlGenerator = new TestableHtmlGenerator(new EmptyModelMetadataProvider());
+            var tagHelper = GetTagHelper(htmlGenerator, model: false, propertyName: nameof(Model.IsACar));
+
+            // Act
+            await tagHelper.ProcessAsync(context, output);
+
+            // Assert
+            Assert.NotNull(output.PostElement);
+            Assert.Equal(originalContent, HtmlContentUtilities.HtmlContentToString(output.Content));
+            Assert.Equal(expectedContent, HtmlContentUtilities.HtmlContentToString(output));
+        }
+
+        [Theory]
+        [InlineData("bad")]
+        [InlineData("notbool")]
+        public void CheckBoxHandlesNonParsableStringsAsBoolsCorrectly(
+            string possibleBool)
+        {
+            // Arrange
+            const string content = "original content";
+            const string tagName = "input";
+            const string forAttributeName = "asp-for";
+
+            var expected = Resources.FormatInputTagHelper_InvalidStringResult(
+                forAttributeName,
+                possibleBool,
+                typeof(bool).FullName);
+
+            var attributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+            };
+
+            var context = new TagHelperContext(
+                tagName: "input",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                tagName,
+                attributes,
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(result: null))
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+            output.Content.AppendHtml(content);
+            var htmlGenerator = new TestableHtmlGenerator(new EmptyModelMetadataProvider());
+            var tagHelper = GetTagHelper(htmlGenerator, model: possibleBool, propertyName: nameof(Model.IsACar));
+
+            // Act and Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => tagHelper.Process(context, output));
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Theory]
+        [InlineData(10)]
+        [InlineData(1337)]
+        public void CheckBoxHandlesInvalidDataTypesCorrectly(
+            int possibleBool)
+        {
+            // Arrange
+            const string content = "original content";
+            const string tagName = "input";
+            const string forAttributeName = "asp-for";
+
+            var expected = Resources.FormatInputTagHelper_InvalidExpressionResult(
+                "<input>",
+                forAttributeName,
+                possibleBool.GetType().FullName,
+                typeof(bool).FullName,
+                typeof(string).FullName,
+                "type",
+                "checkbox");
+
+            var attributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+            };
+
+            var context = new TagHelperContext(
+                tagName: "input",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                tagName,
+                attributes,
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(result: null))
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+            output.Content.AppendHtml(content);
+            var htmlGenerator = new TestableHtmlGenerator(new EmptyModelMetadataProvider());
+            var tagHelper = GetTagHelper(htmlGenerator, model: possibleBool, propertyName: nameof(Model.IsACar));
+
+            // Act and Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => tagHelper.Process(context, output));
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Theory]
+        [InlineData("trUE")]
+        [InlineData("FAlse")]
+        public void CheckBoxHandlesParsableStringsAsBoolsCorrectly(
+            string possibleBool)
+        {
+            // Arrange
+            const string content = "original content";
+            const string tagName = "input";
+            const string isCheckedAttr = "checked=\"HtmlEncode[[checked]]\" ";
+            var isChecked = (bool.Parse(possibleBool) ? isCheckedAttr : string.Empty);
+            var expectedContent = $"<input class=\"HtmlEncode[[form-control]]\" type=\"HtmlEncode[[checkbox]]\" " +
+                $"{isChecked}id=\"HtmlEncode[[IsACar]]\" name=\"HtmlEncode[[IsACar]]\" " +
+                "value=\"HtmlEncode[[true]]\" /><input name=\"HtmlEncode[[IsACar]]\" type=\"HtmlEncode[[hidden]]\" " +
+                "value=\"HtmlEncode[[false]]\" />";
+            var expectedPostElement = "<input name=\"IsACar\" type=\"hidden\" value=\"false\" />";
+
+            var attributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+            };
+
+            var context = new TagHelperContext(
+                tagName: "input",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                tagName,
+                attributes,
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(result: null))
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+            output.Content.AppendHtml(content);
+            var htmlGenerator = new TestableHtmlGenerator(new EmptyModelMetadataProvider());
+            var tagHelper = GetTagHelper(htmlGenerator, model: possibleBool, propertyName: nameof(Model.IsACar));
+
+            // Act
+            tagHelper.Process(context, output);
+
+            // Assert
+            Assert.Equal(content, HtmlContentUtilities.HtmlContentToString(output.Content));
+            Assert.Equal(expectedContent, HtmlContentUtilities.HtmlContentToString(output));
+            Assert.Equal(expectedPostElement, output.PostElement.GetContent());
+        }
+
+        [Theory]
+        [InlineData("checkbox")]
+        [InlineData("hidden")]
+        [InlineData("number")]
+        [InlineData("password")]
+        [InlineData("text")]
+        public void Process_WithEmptyForName_Throws(string inputTypeName)
+        {
+            // Arrange
+            var expectedMessage = "The name of an HTML field cannot be null or empty. Instead use methods " +
+                "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper.Editor or Microsoft.AspNetCore.Mvc.Rendering." +
+                "IHtmlHelper`1.EditorFor with a non-empty htmlFieldName argument value.";
+
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+            var model = false;
+            var modelExplorer = metadataProvider.GetModelExplorerForType(typeof(bool), model);
+            var modelExpression = new ModelExpression(name: string.Empty, modelExplorer: modelExplorer);
+            var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator, metadataProvider);
+            var tagHelper = new InputTagHelper(htmlGenerator)
+            {
+                For = modelExpression,
+                InputTypeName = inputTypeName,
+                ViewContext = viewContext,
+            };
+
+            var attributes = new TagHelperAttributeList
+            {
+                { "type", inputTypeName },
+            };
+
+            var context = new TagHelperContext(attributes, new Dictionary<object, object>(), "test");
+            var output = new TagHelperOutput(
+                "input",
+                new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(result: null))
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => tagHelper.Process(context, output),
+                paramName: "expression",
+                exceptionMessage: expectedMessage);
+        }
+
+        [Fact]
+        public void Process_Radio_WithEmptyForName_Throws()
+        {
+            // Arrange
+            var expectedMessage = "The name of an HTML field cannot be null or empty. Instead use methods " +
+                "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper.Editor or Microsoft.AspNetCore.Mvc.Rendering." +
+                "IHtmlHelper`1.EditorFor with a non-empty htmlFieldName argument value.";
+
+            var inputTypeName = "radio";
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+            var model = 23;
+            var modelExplorer = metadataProvider.GetModelExplorerForType(typeof(int), model);
+            var modelExpression = new ModelExpression(name: string.Empty, modelExplorer: modelExplorer);
+            var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator, metadataProvider);
+            var tagHelper = new InputTagHelper(htmlGenerator)
+            {
+                For = modelExpression,
+                InputTypeName = inputTypeName,
+                Value = "24",
+                ViewContext = viewContext,
+            };
+
+            var attributes = new TagHelperAttributeList
+            {
+                { "type", inputTypeName },
+                { "value", "24" },
+            };
+
+            var context = new TagHelperContext(attributes, new Dictionary<object, object>(), "test");
+            var output = new TagHelperOutput(
+                "input",
+                new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(result: null))
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => tagHelper.Process(context, output),
+                paramName: "expression",
+                exceptionMessage: expectedMessage);
+        }
+
+        [Theory]
+        [InlineData("hidden")]
+        [InlineData("number")]
+        [InlineData("text")]
+        public void Process_WithEmptyForName_DoesNotThrow_WithName(string inputTypeName)
+        {
+            // Arrange
+            var expectedAttributeValue = "-expression-";
+            var expectedTagName = "input";
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                { "name",  expectedAttributeValue },
+                { "type", inputTypeName },
+                { "value", "False" },
+            };
+
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+            var model = false;
+            var modelExplorer = metadataProvider.GetModelExplorerForType(typeof(bool), model);
+            var modelExpression = new ModelExpression(name: string.Empty, modelExplorer: modelExplorer);
+            var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator, metadataProvider);
+            viewContext.ClientValidationEnabled = false;
+
+            var tagHelper = new InputTagHelper(htmlGenerator)
+            {
+                For = modelExpression,
+                InputTypeName = inputTypeName,
+                Name = expectedAttributeValue,
+                ViewContext = viewContext,
+            };
+
+            var attributes = new TagHelperAttributeList
+            {
+                { "name", expectedAttributeValue },
+                { "type", inputTypeName },
+            };
+
+            var context = new TagHelperContext(attributes, new Dictionary<object, object>(), "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(result: null))
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+
+            // Act
+            tagHelper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedAttributes, output.Attributes);
+            Assert.False(output.IsContentModified);
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Fact]
+        public void Process_Checkbox_WithEmptyForName_DoesNotThrow_WithName()
+        {
+            // Arrange
+            var expectedAttributeValue = "-expression-";
+            var expectedPostElementContent = $"<input name=\"HtmlEncode[[{expectedAttributeValue}]]\" " +
+                "type=\"HtmlEncode[[hidden]]\" value=\"HtmlEncode[[false]]\" />";
+            var expectedTagName = "input";
+            var inputTypeName = "checkbox";
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                { "name",  expectedAttributeValue },
+                { "type", inputTypeName },
+                { "value", "true" },
+            };
+
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+            var model = false;
+            var modelExplorer = metadataProvider.GetModelExplorerForType(typeof(bool), model);
+            var modelExpression = new ModelExpression(name: string.Empty, modelExplorer: modelExplorer);
+            var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator, metadataProvider);
+            viewContext.ClientValidationEnabled = false;
+
+            var tagHelper = new InputTagHelper(htmlGenerator)
+            {
+                For = modelExpression,
+                InputTypeName = inputTypeName,
+                Name = expectedAttributeValue,
+                ViewContext = viewContext,
+            };
+
+            var attributes = new TagHelperAttributeList
+            {
+                { "name", expectedAttributeValue },
+                { "type", inputTypeName },
+            };
+
+            var context = new TagHelperContext(attributes, new Dictionary<object, object>(), "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(result: null))
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+
+            // Act
+            tagHelper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedAttributes, output.Attributes);
+            Assert.False(output.IsContentModified);
+            Assert.Equal(expectedTagName, output.TagName);
+
+            Assert.False(viewContext.FormContext.HasEndOfFormContent);
+            Assert.Equal(expectedPostElementContent, HtmlContentUtilities.HtmlContentToString(output.PostElement));
+        }
+
+        [Fact]
+        public void Process_Password_WithEmptyForName_DoesNotThrow_WithName()
+        {
+            // Arrange
+            var expectedAttributeValue = "-expression-";
+            var expectedTagName = "input";
+            var inputTypeName = "password";
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                { "name",  expectedAttributeValue },
+                { "type", inputTypeName },
+            };
+
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+            var model = "password";
+            var modelExplorer = metadataProvider.GetModelExplorerForType(typeof(string), model);
+            var modelExpression = new ModelExpression(name: string.Empty, modelExplorer: modelExplorer);
+            var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator, metadataProvider);
+            viewContext.ClientValidationEnabled = false;
+
+            var tagHelper = new InputTagHelper(htmlGenerator)
+            {
+                For = modelExpression,
+                InputTypeName = inputTypeName,
+                Name = expectedAttributeValue,
+                ViewContext = viewContext,
+            };
+
+            // Expect attributes to just pass through. Tag helper binds all input attributes and doesn't add any.
+            var context = new TagHelperContext(expectedAttributes, new Dictionary<object, object>(), "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(result: null))
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+
+            // Act
+            tagHelper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedAttributes, output.Attributes);
+            Assert.False(output.IsContentModified);
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Fact]
+        public void Process_Radio_WithEmptyForName_DoesNotThrow_WithName()
+        {
+            // Arrange
+            var expectedAttributeValue = "-expression-";
+            var expectedTagName = "input";
+            var inputTypeName = "radio";
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                { "name",  expectedAttributeValue },
+                { "type", inputTypeName },
+                { "value", "24" },
+            };
+
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+            var model = 23;
+            var modelExplorer = metadataProvider.GetModelExplorerForType(typeof(int), model);
+            var modelExpression = new ModelExpression(name: string.Empty, modelExplorer: modelExplorer);
+            var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator, metadataProvider);
+            viewContext.ClientValidationEnabled = false;
+
+            var tagHelper = new InputTagHelper(htmlGenerator)
+            {
+                For = modelExpression,
+                InputTypeName = inputTypeName,
+                Name = expectedAttributeValue,
+                Value = "24",
+                ViewContext = viewContext,
+            };
+
+            var attributes = new TagHelperAttributeList
+            {
+                { "name", expectedAttributeValue },
+                { "type", inputTypeName },
+                { "value", "24" },
+            };
+
+            var context = new TagHelperContext(attributes, new Dictionary<object, object>(), "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(result: null))
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+
+            // Act
+            tagHelper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedAttributes, output.Attributes);
+            Assert.False(output.IsContentModified);
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        // Top-level container (List<Model> or Model instance), immediate container type (Model or NestModel),
+        // model accessor, expression path / id, expected value.
+        public static TheoryData<object, Type, object, NameAndId, string> TestDataSet
+        {
+            get
+            {
+                var modelWithNull = new Model
+                {
+                    NestedModel = new NestedModel
+                    {
+                        Text = null,
+                    },
+                    Text = null,
+                };
+                var modelWithText = new Model
+                {
+                    NestedModel = new NestedModel
+                    {
+                        Text = "inner text",
+                    },
+                    Text = "outer text",
+                };
+                var models = new List<Model>
+                {
+                    modelWithNull,
+                    modelWithText,
+                };
+
+                return new TheoryData<object, Type, object, NameAndId, string>
+                {
+                    { null, typeof(Model), null, new NameAndId("Text", "Text"),
+                        string.Empty },
+
+                    { modelWithNull, typeof(Model), modelWithNull.Text, new NameAndId("Text", "Text"),
+                        string.Empty },
+                    { modelWithText, typeof(Model), modelWithText.Text, new NameAndId("Text", "Text"),
+                        "outer text" },
+
+                    { modelWithNull, typeof(NestedModel), modelWithNull.NestedModel.Text,
+                        new NameAndId("NestedModel.Text", "NestedModel_Text"), string.Empty },
+                    { modelWithText, typeof(NestedModel), modelWithText.NestedModel.Text,
+                        new NameAndId("NestedModel.Text", "NestedModel_Text"), "inner text" },
+
+                    { models, typeof(Model), models[0].Text,
+                        new NameAndId("[0].Text", "z0__Text"), string.Empty },
+                    { models, typeof(Model), models[1].Text,
+                        new NameAndId("[1].Text", "z1__Text"), "outer text" },
+
+                    { models, typeof(NestedModel), models[0].NestedModel.Text,
+                        new NameAndId("[0].NestedModel.Text", "z0__NestedModel_Text"), string.Empty },
+                    { models, typeof(NestedModel), models[1].NestedModel.Text,
+                        new NameAndId("[1].NestedModel.Text", "z1__NestedModel_Text"), "inner text" },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(TestDataSet))]
+        public async Task ProcessAsync_GeneratesExpectedOutput(
+            object container,
+            Type containerType,
+            object model,
+            NameAndId nameAndId,
+            string expectedValue)
+        {
+            // Arrange
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+                { "type", "text" },
+                { "id", nameAndId.Id },
+                { "name", nameAndId.Name },
+                { "valid", "from validation attributes" },
+                { "value", expectedValue },
+            };
+            var expectedPreContent = "original pre-content";
+            var expectedContent = "original content";
+            var expectedPostContent = "original post-content";
+            var expectedTagName = "not-input";
+
+            var context = new TagHelperContext(
+                tagName: "input",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var originalAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+            };
+            var output = new TagHelperOutput(
+                expectedTagName,
+                originalAttributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                })
+            {
+                TagMode = TagMode.StartTagOnly,
+            };
+            output.PreContent.SetContent(expectedPreContent);
+            output.Content.SetContent(expectedContent);
+            output.PostContent.SetContent(expectedPostContent);
+
+            var htmlGenerator = new TestableHtmlGenerator(new EmptyModelMetadataProvider())
+            {
+                ValidationAttributes =
+                {
+                    {  "valid", "from validation attributes" },
+                }
+            };
+
+            // Property name is either nameof(Model.Text) or nameof(NestedModel.Text).
+            var tagHelper = GetTagHelper(
+                htmlGenerator,
+                container,
+                containerType,
+                model,
+                propertyName: nameof(Model.Text),
+                expressionName: nameAndId.Name);
+
+            // Act
+            await tagHelper.ProcessAsync(context, output);
+
+            // Assert
+            Assert.Equal(expectedAttributes, output.Attributes);
+            Assert.Equal(expectedPreContent, output.PreContent.GetContent());
+            Assert.Equal(expectedContent, output.Content.GetContent());
+            Assert.Equal(expectedPostContent, output.PostContent.GetContent());
+            Assert.Equal(TagMode.StartTagOnly, output.TagMode);
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Theory]
+        [InlineData("datetime", "datetime")]
+        [InlineData(null, "text")]
+        [InlineData("hidden", "hidden")]
+        public void Process_GeneratesFormattedOutput(string specifiedType, string expectedType)
+        {
+            // Arrange
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                { "type", expectedType },
+                { "id", "DateTimeOffset" },
+                { "name", "DateTimeOffset" },
+                { "valid", "from validation attributes" },
+                { "value", "datetime: 2011-08-31T05:30:45.0000000+03:00" },
+            };
+            var expectedTagName = "not-input";
+            var container = new Model
+            {
+                DateTimeOffset = new DateTimeOffset(2011, 8, 31, hour: 5, minute: 30, second: 45, offset: TimeSpan.FromHours(3))
+            };
+
+            var allAttributes = new TagHelperAttributeList
+            {
+                { "type", specifiedType },
+            };
+            var context = new TagHelperContext(
+                tagName: "input",
+                allAttributes: allAttributes,
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    throw new Exception("getChildContentAsync should not be called.");
+                })
+            {
+                TagMode = TagMode.StartTagOnly,
+            };
+
+            var htmlGenerator = new TestableHtmlGenerator(new EmptyModelMetadataProvider())
+            {
+                ValidationAttributes =
+                {
+                    {  "valid", "from validation attributes" },
+                }
+            };
+
+            var tagHelper = GetTagHelper(
+                htmlGenerator,
+                container,
+                typeof(Model),
+                model: container.DateTimeOffset,
+                propertyName: nameof(Model.DateTimeOffset),
+                expressionName: nameof(Model.DateTimeOffset));
+            tagHelper.Format = "datetime: {0:o}";
+            tagHelper.InputTypeName = specifiedType;
+
+            // Act
+            tagHelper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedAttributes, output.Attributes);
+            Assert.Empty(output.PreContent.GetContent());
+            Assert.Empty(output.Content.GetContent());
+            Assert.Empty(output.PostContent.GetContent());
+            Assert.Equal(TagMode.StartTagOnly, output.TagMode);
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Theory]
+        [InlineData("datetime", "datetime")]
+        [InlineData(null, "datetime-local")]
+        [InlineData("hidden", "hidden")]
+        public void Process_GeneratesFormattedOutput_ForDateTime(string specifiedType, string expectedType)
+        {
+            // Arrange
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                { "type", expectedType },
+                { "id", nameof(Model.DateTime) },
+                { "name", nameof(Model.DateTime) },
+                { "valid", "from validation attributes" },
+                { "value", "datetime: 2011-08-31T05:30:45.0000000Z" },
+            };
+            var expectedTagName = "not-input";
+            var container = new Model
+            {
+                DateTime = new DateTime(2011, 8, 31, hour: 5, minute: 30, second: 45, kind: DateTimeKind.Utc),
+            };
+
+            var allAttributes = new TagHelperAttributeList
+            {
+                { "type", specifiedType },
+            };
+            var context = new TagHelperContext(
+                tagName: "input",
+                allAttributes: allAttributes,
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    throw new Exception("getChildContentAsync should not be called.");
+                })
+            {
+                TagMode = TagMode.StartTagOnly,
+            };
+
+            var htmlGenerator = new TestableHtmlGenerator(new EmptyModelMetadataProvider())
+            {
+                ValidationAttributes =
+                {
+                    {  "valid", "from validation attributes" },
+                }
+            };
+
+            var tagHelper = GetTagHelper(
+                htmlGenerator,
+                container,
+                typeof(Model),
+                model: container.DateTime,
+                propertyName: nameof(Model.DateTime),
+                expressionName: nameof(Model.DateTime));
+            tagHelper.Format = "datetime: {0:o}";
+            tagHelper.InputTypeName = specifiedType;
+
+            // Act
+            tagHelper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedAttributes, output.Attributes);
+            Assert.Empty(output.PreContent.GetContent());
+            Assert.Empty(output.Content.GetContent());
+            Assert.Empty(output.PostContent.GetContent());
+            Assert.Equal(TagMode.StartTagOnly, output.TagMode);
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_CallsGenerateCheckBox_WithExpectedParameters()
+        {
+            // Arrange
+            var originalContent = "original content";
+            var expectedPreContent = "original pre-content";
+            var expectedContent = "<input class=\"HtmlEncode[[form-control]]\" type=\"HtmlEncode[[checkbox]]\" /><hidden />";
+            var expectedPostContent = "original post-content";
+            var expectedPostElement = "<hidden />";
+
+            var context = new TagHelperContext(
+                tagName: "input",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var originalAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+            };
+            var output = new TagHelperOutput(
+                "input",
+                originalAttributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                })
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+            output.PreContent.AppendHtml(expectedPreContent);
+            output.Content.AppendHtml(originalContent);
+            output.PostContent.AppendHtml(expectedPostContent);
+
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var tagHelper = GetTagHelper(htmlGenerator.Object, model: false, propertyName: nameof(Model.IsACar));
+            tagHelper.Format = "somewhat-less-null"; // ignored
+
+            var tagBuilder = new TagBuilder("input")
+            {
+                TagRenderMode = TagRenderMode.SelfClosing
+            };
+            htmlGenerator
+                .Setup(mock => mock.GenerateCheckBox(
+                    tagHelper.ViewContext,
+                    tagHelper.For.ModelExplorer,
+                    tagHelper.For.Name,
+                    null,                   // isChecked
+                    It.IsAny<object>()))    // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+            htmlGenerator
+                .Setup(mock => mock.GenerateHiddenForCheckbox(
+                    tagHelper.ViewContext,
+                    tagHelper.For.ModelExplorer,
+                    tagHelper.For.Name))
+                .Returns(new TagBuilder("hidden") { TagRenderMode = TagRenderMode.SelfClosing })
+                .Verifiable();
+
+            // Act
+            await tagHelper.ProcessAsync(context, output);
+
+            // Assert
+            htmlGenerator.Verify();
+
+            Assert.NotEmpty(output.Attributes);
+            Assert.Equal(expectedPreContent, output.PreContent.GetContent());
+            Assert.Equal(originalContent, HtmlContentUtilities.HtmlContentToString(output.Content));
+            Assert.Equal(expectedContent, HtmlContentUtilities.HtmlContentToString(output));
+            Assert.Equal(expectedPostContent, output.PostContent.GetContent());
+            Assert.Equal(expectedPostElement, output.PostElement.GetContent());
+            Assert.Equal(TagMode.SelfClosing, output.TagMode);
+        }
+
+        [Theory]
+        [InlineData(null, "hidden", null, null)]
+        [InlineData(null, "Hidden", "not-null", "somewhat-less-null")]
+        [InlineData(null, "HIDden", null, "somewhat-less-null")]
+        [InlineData(null, "HIDDEN", "not-null", null)]
+        [InlineData("hiddeninput", null, null, null)]
+        [InlineData("HiddenInput", null, "not-null", null)]
+        [InlineData("hidDENinPUT", null, null, "somewhat-less-null")]
+        [InlineData("HIDDENINPUT", null, "not-null", "somewhat-less-null")]
+        public async Task ProcessAsync_CallsGenerateTextBox_WithExpectedParametersForHidden(
+            string dataTypeName,
+            string inputTypeName,
+            string model,
+            string format)
+        {
+            // Arrange
+            var contextAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+            };
+            if (!string.IsNullOrEmpty(inputTypeName))
+            {
+                contextAttributes.SetAttribute("type", inputTypeName);  // Support restoration of type attribute, if any.
+            }
+
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control hidden-control" },
+                { "type", inputTypeName ?? "hidden" },      // Generator restores type attribute; adds "hidden" if none.
+            };
+            var expectedPreContent = "original pre-content";
+            var expectedContent = "original content";
+            var expectedPostContent = "original post-content";
+            var expectedTagName = "not-input";
+
+            var context = new TagHelperContext(
+                tagName: "input",
+                allAttributes: contextAttributes,
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var originalAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+            };
+            var output = new TagHelperOutput(
+                expectedTagName,
+                originalAttributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                })
+            {
+                TagMode = TagMode.StartTagOnly,
+            };
+            output.PreContent.SetContent(expectedPreContent);
+            output.Content.SetContent(expectedContent);
+            output.PostContent.SetContent(expectedPostContent);
+
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider.ForProperty<Model>("Text").DisplayDetails(dd => dd.DataTypeName = dataTypeName);
+
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var tagHelper = GetTagHelper(
+                htmlGenerator.Object,
+                model,
+                nameof(Model.Text),
+                metadataProvider: metadataProvider);
+            tagHelper.Format = format;
+            tagHelper.InputTypeName = inputTypeName;
+
+            var tagBuilder = new TagBuilder("input")
+            {
+                Attributes =
+                {
+                    { "class", "hidden-control" },
+                },
+            };
+            htmlGenerator
+                .Setup(mock => mock.GenerateTextBox(
+                    tagHelper.ViewContext,
+                    tagHelper.For.ModelExplorer,
+                    tagHelper.For.Name,
+                    model,  // value
+                    format,
+                    new Dictionary<string, object> { { "type", "hidden" } }))   // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            // Act
+            await tagHelper.ProcessAsync(context, output);
+
+            // Assert
+            htmlGenerator.Verify();
+
+            Assert.Equal(TagMode.StartTagOnly, output.TagMode);
+            Assert.Equal(expectedAttributes, output.Attributes, CaseSensitiveTagHelperAttributeComparer.Default);
+            Assert.Equal(expectedPreContent, output.PreContent.GetContent());
+            Assert.Equal(expectedContent, output.Content.GetContent());
+            Assert.Equal(expectedPostContent, output.PostContent.GetContent());
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Theory]
+        [InlineData(null, "password", null)]
+        [InlineData(null, "Password", "not-null")]
+        [InlineData(null, "PASSword", null)]
+        [InlineData(null, "PASSWORD", "not-null")]
+        [InlineData("password", null, null)]
+        [InlineData("Password", null, "not-null")]
+        [InlineData("PASSword", null, null)]
+        [InlineData("PASSWORD", null, "not-null")]
+        public async Task ProcessAsync_CallsGeneratePassword_WithExpectedParameters(
+            string dataTypeName,
+            string inputTypeName,
+            string model)
+        {
+            // Arrange
+            var contextAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+            };
+            if (!string.IsNullOrEmpty(inputTypeName))
+            {
+                contextAttributes.SetAttribute("type", inputTypeName);  // Support restoration of type attribute, if any.
+            }
+
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control password-control" },
+                { "type", inputTypeName ?? "password" },    // Generator restores type attribute; adds "password" if none.
+            };
+            var expectedPreContent = "original pre-content";
+            var expectedContent = "original content";
+            var expectedPostContent = "original post-content";
+            var expectedTagName = "not-input";
+
+            var context = new TagHelperContext(
+                tagName: "input",
+                allAttributes: contextAttributes,
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var originalAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+            };
+            var output = new TagHelperOutput(
+                expectedTagName,
+                originalAttributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                })
+            {
+                TagMode = TagMode.StartTagOnly,
+            };
+            output.PreContent.SetContent(expectedPreContent);
+            output.Content.SetContent(expectedContent);
+            output.PostContent.SetContent(expectedPostContent);
+
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider.ForProperty<Model>("Text").DisplayDetails(dd => dd.DataTypeName = dataTypeName);
+
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var tagHelper = GetTagHelper(
+                htmlGenerator.Object,
+                model,
+                nameof(Model.Text),
+                metadataProvider: metadataProvider);
+            tagHelper.Format = "somewhat-less-null"; // ignored
+            tagHelper.InputTypeName = inputTypeName;
+
+            var tagBuilder = new TagBuilder("input")
+            {
+                Attributes =
+                {
+                    { "class", "password-control" },
+                },
+            };
+            htmlGenerator
+                .Setup(mock => mock.GeneratePassword(
+                    tagHelper.ViewContext,
+                    tagHelper.For.ModelExplorer,
+                    tagHelper.For.Name,
+                    null,       // value
+                    null))      // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            // Act
+            await tagHelper.ProcessAsync(context, output);
+
+            // Assert
+            htmlGenerator.Verify();
+
+            Assert.Equal(TagMode.StartTagOnly, output.TagMode);
+            Assert.Equal(expectedAttributes, output.Attributes, CaseSensitiveTagHelperAttributeComparer.Default);
+            Assert.Equal(expectedPreContent, output.PreContent.GetContent());
+            Assert.Equal(expectedContent, output.Content.GetContent());
+            Assert.Equal(expectedPostContent, output.PostContent.GetContent());
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Theory]
+        [InlineData("radio", null)]
+        [InlineData("Radio", "not-null")]
+        [InlineData("RADio", null)]
+        [InlineData("RADIO", "not-null")]
+        public async Task ProcessAsync_CallsGenerateRadioButton_WithExpectedParameters(
+            string inputTypeName,
+            string model)
+        {
+            // Arrange
+            var value = "match";            // Real generator would use this for comparison with For.Metadata.Model.
+            var contextAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+                { "value", value },
+            };
+            if (!string.IsNullOrEmpty(inputTypeName))
+            {
+                contextAttributes.SetAttribute("type", inputTypeName);  // Support restoration of type attribute, if any.
+            }
+
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control radio-control" },
+                { "value", value },
+                { "type", inputTypeName ?? "radio" },       // Generator restores type attribute; adds "radio" if none.
+            };
+            var expectedPreContent = "original pre-content";
+            var expectedContent = "original content";
+            var expectedPostContent = "original post-content";
+            var expectedTagName = "not-input";
+
+            var context = new TagHelperContext(
+                tagName: "input",
+                allAttributes: contextAttributes,
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var originalAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+            };
+            var output = new TagHelperOutput(
+                expectedTagName,
+                originalAttributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                })
+            {
+                TagMode = TagMode.StartTagOnly,
+            };
+            output.PreContent.SetContent(expectedPreContent);
+            output.Content.SetContent(expectedContent);
+            output.PostContent.SetContent(expectedPostContent);
+
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var tagHelper = GetTagHelper(htmlGenerator.Object, model, nameof(Model.Text));
+            tagHelper.Format = "somewhat-less-null"; // ignored
+            tagHelper.InputTypeName = inputTypeName;
+            tagHelper.Value = value;
+
+            var tagBuilder = new TagBuilder("input")
+            {
+                Attributes =
+                {
+                    { "class", "radio-control" },
+                },
+            };
+            htmlGenerator
+                .Setup(mock => mock.GenerateRadioButton(
+                    tagHelper.ViewContext,
+                    tagHelper.For.ModelExplorer,
+                    tagHelper.For.Name,
+                    value,
+                    null,       // isChecked
+                    null))      // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            // Act
+            await tagHelper.ProcessAsync(context, output);
+
+            // Assert
+            htmlGenerator.Verify();
+
+            Assert.Equal(TagMode.StartTagOnly, output.TagMode);
+            Assert.Equal(expectedAttributes, output.Attributes, CaseSensitiveTagHelperAttributeComparer.Default);
+            Assert.Equal(expectedPreContent, output.PreContent.GetContent());
+            Assert.Equal(expectedContent, output.Content.GetContent());
+            Assert.Equal(expectedPostContent, output.PostContent.GetContent());
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Theory]
+        [InlineData(null, null, null, "somewhat-less-null")]
+        [InlineData(null, null, "not-null", null)]
+        [InlineData(null, "string", null, null)]
+        [InlineData(null, "String", "not-null", null)]
+        [InlineData(null, "STRing", null, "somewhat-less-null")]
+        [InlineData(null, "STRING", "not-null", null)]
+        [InlineData(null, "text", null, null)]
+        [InlineData(null, "Text", "not-null", "somewhat-less-null")]
+        [InlineData(null, "TExt", null, null)]
+        [InlineData(null, "TEXT", "not-null", null)]
+        [InlineData("string", null, null, null)]
+        [InlineData("String", null, "not-null", null)]
+        [InlineData("STRing", null, null, null)]
+        [InlineData("STRING", null, "not-null", null)]
+        [InlineData("text", null, null, null)]
+        [InlineData("Text", null, "not-null", null)]
+        [InlineData("TExt", null, null, null)]
+        [InlineData("TEXT", null, "not-null", null)]
+        [InlineData("custom-datatype", null, null, null)]
+        [InlineData(null, "unknown-input-type", "not-null", null)]
+        [InlineData("Image", null, "not-null", "somewhat-less-null")]
+        [InlineData(null, "image", "not-null", null)]
+        public async Task ProcessAsync_CallsGenerateTextBox_WithExpectedParameters(
+            string dataTypeName,
+            string inputTypeName,
+            string model,
+            string format)
+        {
+            // Arrange
+            var contextAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+            };
+            if (!string.IsNullOrEmpty(inputTypeName))
+            {
+                contextAttributes.SetAttribute("type", inputTypeName);  // Support restoration of type attribute, if any.
+            }
+
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control text-control" },
+                { "type", inputTypeName ?? "text" },        // Generator restores type attribute; adds "text" if none.
+            };
+            var expectedPreContent = "original pre-content";
+            var expectedContent = "original content";
+            var expectedPostContent = "original post-content";
+            var expectedTagName = "not-input";
+
+            var context = new TagHelperContext(
+                tagName: "input",
+                allAttributes: contextAttributes,
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var originalAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+            };
+            var output = new TagHelperOutput(
+                expectedTagName,
+                originalAttributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                })
+            {
+                TagMode = TagMode.StartTagOnly,
+            };
+            output.PreContent.SetContent(expectedPreContent);
+            output.Content.SetContent(expectedContent);
+            output.PostContent.SetContent(expectedPostContent);
+
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider.ForProperty<Model>("Text").DisplayDetails(dd => dd.DataTypeName = dataTypeName);
+
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var tagHelper = GetTagHelper(
+                htmlGenerator.Object,
+                model,
+                nameof(Model.Text),
+                metadataProvider: metadataProvider);
+            tagHelper.Format = format;
+            tagHelper.InputTypeName = inputTypeName;
+
+            var tagBuilder = new TagBuilder("input")
+            {
+                Attributes =
+                {
+                    { "class", "text-control" },
+                },
+            };
+            htmlGenerator
+                .Setup(mock => mock.GenerateTextBox(
+                    tagHelper.ViewContext,
+                    tagHelper.For.ModelExplorer,
+                    tagHelper.For.Name,
+                    model,  // value
+                    format,
+                    It.Is<Dictionary<string, object>>(m => m.ContainsKey("type"))))     // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            // Act
+            await tagHelper.ProcessAsync(context, output);
+
+            // Assert
+            htmlGenerator.Verify();
+
+            Assert.Equal(TagMode.StartTagOnly, output.TagMode);
+            Assert.Equal(expectedAttributes, output.Attributes, CaseSensitiveTagHelperAttributeComparer.Default);
+            Assert.Equal(expectedPreContent, output.PreContent.GetContent());
+            Assert.Equal(expectedContent, output.Content.GetContent());
+            Assert.Equal(expectedPostContent, output.PostContent.GetContent());
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        public static TheoryData<string, string, string> InputTypeData
+        {
+            get
+            {
+                return new TheoryData<string, string, string>
+                {
+                    { null, null, "text" },
+                    { "Byte", null, "number" },
+                    { "custom-datatype", null, "text" },
+                    { "Custom-Datatype", null, "text" },
+                    { "date", null, "date" },                  // No date/time special cases since ModelType is string.
+                    { "datetime", null, "datetime-local" },
+                    { "datetime-local", null, "datetime-local" },
+                    { "DATETIME-local", null, "datetime-local" },
+                    { "datetimeOffset", null, "text" },
+                    { "Decimal", "{0:0.00}", "text" },
+                    { "Double", null, "text" },
+                    { "Int16", null, "number" },
+                    { "Int32", null, "number" },
+                    { "int32", null, "number" },
+                    { "Int64", null, "number" },
+                    { "SByte", null, "number" },
+                    { "Single", null, "text" },
+                    { "SINGLE", null, "text" },
+                    { "string", null, "text" },
+                    { "STRING", null, "text" },
+                    { "text", null, "text" },
+                    { "TEXT", null, "text" },
+                    { "time", null, "time" },
+                    { "month", "{0:yyyy-MM}", "month" },
+                    { "week", null, "week" },
+                    { "UInt16", null, "number" },
+                    { "uint16", null, "number" },
+                    { "UInt32", null, "number" },
+                    { "UInt64", null, "number" },
+                    { nameof(IFormFile), null, "file" },
+                    { TemplateRenderer.IEnumerableOfIFormFileName, null, "file" },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(InputTypeData))]
+        public async Task ProcessAsync_CallsGenerateTextBox_AddsExpectedAttributes(
+            string dataTypeName,
+            string expectedFormat,
+            string expectedType)
+        {
+            // Arrange
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                { "type", expectedType },                   // Calculated; not passed to HtmlGenerator.
+            };
+            var expectedTagName = "not-input";
+
+            var context = new TagHelperContext(
+                tagName: "input",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            var output = new TagHelperOutput(
+                expectedTagName,
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()))
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider.ForProperty<Model>("Text").DisplayDetails(dd => dd.DataTypeName = dataTypeName);
+
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var tagHelper = GetTagHelper(
+                htmlGenerator.Object,
+                model: null,
+                propertyName: nameof(Model.Text),
+                metadataProvider: metadataProvider);
+
+            var tagBuilder = new TagBuilder("input");
+
+            var htmlAttributes = new Dictionary<string, object>
+            {
+                { "type", expectedType }
+            };
+            if (string.Equals(dataTypeName, TemplateRenderer.IEnumerableOfIFormFileName))
+            {
+                htmlAttributes["multiple"] = "multiple";
+            }
+            htmlGenerator
+                .Setup(mock => mock.GenerateTextBox(
+                    tagHelper.ViewContext,
+                    tagHelper.For.ModelExplorer,
+                    tagHelper.For.Name,
+                    null,                                   // value
+                    expectedFormat,
+                    htmlAttributes))                // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            // Act
+            await tagHelper.ProcessAsync(context, output);
+
+            // Assert
+            htmlGenerator.Verify();
+
+            Assert.Equal(TagMode.SelfClosing, output.TagMode);
+            Assert.Equal(expectedAttributes, output.Attributes);
+            Assert.Empty(output.PreContent.GetContent());
+            Assert.Equal(string.Empty, output.Content.GetContent());
+            Assert.Empty(output.PostContent.GetContent());
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_CallsGenerateTextBox_InputTypeDateTime_RendersAsDateTime()
+        {
+            // Arrange
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                { "type", "datetime" },                   // Calculated; not passed to HtmlGenerator.
+            };
+            var expectedTagName = "not-input";
+
+            var context = new TagHelperContext(
+                tagName: "input",
+                allAttributes: new TagHelperAttributeList()
+                {
+                    {"type", "datetime" }
+                },
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            var output = new TagHelperOutput(
+                expectedTagName,
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()))
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+
+            var htmlAttributes = new Dictionary<string, object>
+            {
+                { "type", "datetime" }
+            };
+
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var tagHelper = GetTagHelper(
+                htmlGenerator.Object,
+                model: null,
+                propertyName: "DateTime",
+                metadataProvider: metadataProvider);
+            tagHelper.ViewContext.Html5DateRenderingMode = Html5DateRenderingMode.Rfc3339;
+            tagHelper.InputTypeName = "datetime";
+            var tagBuilder = new TagBuilder("input");
+            htmlGenerator
+                .Setup(mock => mock.GenerateTextBox(
+                    tagHelper.ViewContext,
+                    tagHelper.For.ModelExplorer,
+                    tagHelper.For.Name,
+                    null,                                   // value
+                    @"{0:yyyy-MM-ddTHH\:mm\:ss.fffK}",
+                    htmlAttributes))                    // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            // Act
+            await tagHelper.ProcessAsync(context, output);
+
+            // Assert
+            htmlGenerator.Verify();
+
+            Assert.Equal(TagMode.SelfClosing, output.TagMode);
+            Assert.Equal(expectedAttributes, output.Attributes);
+            Assert.Empty(output.PreContent.GetContent());
+            Assert.Equal(string.Empty, output.Content.GetContent());
+            Assert.Empty(output.PostContent.GetContent());
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Theory]
+        [InlineData("Date", Html5DateRenderingMode.CurrentCulture, "{0:d}", "date")]    // Format from [DataType].
+        [InlineData("Date", Html5DateRenderingMode.Rfc3339, "{0:yyyy-MM-dd}", "date")]
+        [InlineData("DateTime", Html5DateRenderingMode.CurrentCulture, null, "datetime-local")]
+        [InlineData("DateTime", Html5DateRenderingMode.Rfc3339, @"{0:yyyy-MM-ddTHH\:mm\:ss.fff}", "datetime-local")]
+        [InlineData("DateTimeOffset", Html5DateRenderingMode.CurrentCulture, null, "text")]
+        [InlineData("DateTimeOffset", Html5DateRenderingMode.Rfc3339, @"{0:yyyy-MM-ddTHH\:mm\:ss.fffK}", "text")]
+        [InlineData("DateTimeLocal", Html5DateRenderingMode.CurrentCulture, null, "datetime-local")]
+        [InlineData("DateTimeLocal", Html5DateRenderingMode.Rfc3339, @"{0:yyyy-MM-ddTHH\:mm\:ss.fff}", "datetime-local")]
+        [InlineData("Time", Html5DateRenderingMode.CurrentCulture, "{0:t}", "time")]    // Format from [DataType].
+        [InlineData("Time", Html5DateRenderingMode.Rfc3339, @"{0:HH\:mm\:ss.fff}", "time")]
+        [InlineData("Month", Html5DateRenderingMode.CurrentCulture, "{0:yyyy-MM}", "month")]
+        [InlineData("Month", Html5DateRenderingMode.Rfc3339, "{0:yyyy-MM}", "month")]
+        [InlineData("Week", Html5DateRenderingMode.CurrentCulture, null, "week")]
+        [InlineData("Week", Html5DateRenderingMode.Rfc3339, null, "week")]
+        [InlineData("NullableDate", Html5DateRenderingMode.Rfc3339, "{0:yyyy-MM-dd}", "date")]
+        [InlineData("NullableDateTime", Html5DateRenderingMode.Rfc3339, @"{0:yyyy-MM-ddTHH\:mm\:ss.fff}", "datetime-local")]
+        [InlineData("NullableDateTimeOffset", Html5DateRenderingMode.Rfc3339, @"{0:yyyy-MM-ddTHH\:mm\:ss.fffK}", "text")]
+        public async Task ProcessAsync_CallsGenerateTextBox_AddsExpectedAttributesForRfc3339(
+            string propertyName,
+            Html5DateRenderingMode dateRenderingMode,
+            string expectedFormat,
+            string expectedType)
+        {
+            // Arrange
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                { "type", expectedType },                   // Calculated; not passed to HtmlGenerator.
+            };
+            var expectedTagName = "not-input";
+
+            var context = new TagHelperContext(
+                tagName: "input",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            var output = new TagHelperOutput(
+                expectedTagName,
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()))
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+
+            var htmlAttributes = new Dictionary<string, object>
+            {
+                { "type", expectedType }
+            };
+
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var tagHelper = GetTagHelper(
+                htmlGenerator.Object,
+                model: null,
+                propertyName: propertyName,
+                metadataProvider: metadataProvider);
+            tagHelper.ViewContext.Html5DateRenderingMode = dateRenderingMode;
+
+            var tagBuilder = new TagBuilder("input");
+            htmlGenerator
+                .Setup(mock => mock.GenerateTextBox(
+                    tagHelper.ViewContext,
+                    tagHelper.For.ModelExplorer,
+                    tagHelper.For.Name,
+                    null,                                   // value
+                    expectedFormat,
+                    htmlAttributes))                    // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            // Act
+            await tagHelper.ProcessAsync(context, output);
+
+            // Assert
+            htmlGenerator.Verify();
+
+            Assert.Equal(TagMode.SelfClosing, output.TagMode);
+            Assert.Equal(expectedAttributes, output.Attributes);
+            Assert.Empty(output.PreContent.GetContent());
+            Assert.Equal(string.Empty, output.Content.GetContent());
+            Assert.Empty(output.PostContent.GetContent());
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        // Html5DateRenderingMode.Rfc3339 is enabled by default.
+        [Theory]
+        [InlineData("Date", "2000-01-02", "date")]
+        [InlineData("DateTime", "2000-01-02T03:04:05.060", "datetime-local")]
+        [InlineData("DateTimeLocal", "2000-01-02T03:04:05.060", "datetime-local")]
+        [InlineData("DateTimeOffset", "2000-01-02T03:04:05.060Z", "text")]
+        [InlineData("Time", "03:04:05.060", "time")]
+        [InlineData("Month", "2000-01", "month")]
+        [InlineData("Week", "1999-W52", "week")]
+        public async Task ProcessAsync_CallsGenerateTextBox_ProducesExpectedValue_ForDateTime(
+            string propertyName,
+            string expectedValue,
+            string expectedType)
+        {
+            // Arrange
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                { "type", expectedType },
+                { "id", propertyName },
+                { "name", propertyName },
+                { "value", expectedValue },
+            };
+
+            var context = new TagHelperContext(
+                tagName: "input",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            var output = new TagHelperOutput(
+                expectedType,
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()))
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var model = new DateTime(
+                year: 2000,
+                month: 1,
+                day: 2,
+                hour: 3,
+                minute: 4,
+                second: 5,
+                millisecond: 60,
+                kind: DateTimeKind.Utc);
+
+            var htmlGenerator = HtmlGeneratorUtilities.GetHtmlGenerator(metadataProvider);
+            var tagHelper = GetTagHelper(
+                htmlGenerator,
+                model: model,
+                propertyName: propertyName,
+                metadataProvider: metadataProvider);
+            tagHelper.ViewContext.Html5DateRenderingMode = Html5DateRenderingMode.Rfc3339;
+
+            // Act
+            await tagHelper.ProcessAsync(context, output);
+
+            // Assert
+            Assert.Equal(expectedAttributes, output.Attributes);
+            Assert.Equal(expectedType, output.TagName);
+        }
+
+        // Html5DateRenderingMode.Rfc3339 can be disabled.
+        [Theory]
+        [InlineData("Date", null, "02/01/2000", "date")]
+        [InlineData("Date", "{0:d}", "02/01/2000", "date")]
+        [InlineData("DateTime", null, "02/01/2000 03:04:05", "datetime-local")]
+        [InlineData("DateTimeLocal", null, "02/01/2000 03:04:05", "datetime-local")]
+        [InlineData("DateTimeOffset", null, "02/01/2000 03:04:05", "text")]
+        [InlineData("DateTimeOffset", "{0:o}", "2000-01-02T03:04:05.0600000Z", "text")]
+        [InlineData("Time", null, "03:04", "time")]
+        [InlineData("Time", "{0:t}", "03:04", "time")]
+        [InlineData("Month", null, "2000-01", "month")]
+        [InlineData("Month", "{0:yyyy/MM}", "2000/01", "month")]
+        [InlineData("Week", null, "1999-W52", "week")]
+        [InlineData("Week", "{0:yyyy/'W1'}", "2000/W1", "week")]
+        [ReplaceCulture]
+        public async Task ProcessAsync_CallsGenerateTextBox_ProducesExpectedValue_ForDateTimeNotRfc3339(
+            string propertyName,
+            string editFormatString,
+            string expectedValue,
+            string expectedType)
+        {
+            // Arrange
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                { "type", expectedType },
+                { "id", propertyName },
+                { "name", propertyName },
+                { "value", expectedValue },
+            };
+
+            var context = new TagHelperContext(
+                tagName: "input",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            var output = new TagHelperOutput(
+                expectedType,
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()))
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+            var model = new DateTime(
+                year: 2000,
+                month: 1,
+                day: 2,
+                hour: 3,
+                minute: 4,
+                second: 5,
+                millisecond: 60,
+                kind: DateTimeKind.Utc);
+
+            var htmlGenerator = HtmlGeneratorUtilities.GetHtmlGenerator(metadataProvider);
+            var tagHelper = GetTagHelper(
+                htmlGenerator,
+                model: model,
+                propertyName: propertyName,
+                metadataProvider: metadataProvider);
+            tagHelper.ViewContext.Html5DateRenderingMode = Html5DateRenderingMode.CurrentCulture;
+            tagHelper.Format = editFormatString;
+
+            // Act
+            await tagHelper.ProcessAsync(context, output);
+
+            // Assert
+            Assert.Equal(expectedAttributes, output.Attributes);
+            Assert.Equal(expectedType, output.TagName);
+        }
+
+        // Html5DateRenderingMode.Rfc3339 can be disabled.
+        [Theory]
+        [InlineData("Month", "month")]
+        [InlineData("Week", "week")]
+        [ReplaceCulture]
+        public async Task ProcessAsync_CallsGenerateTextBox_ProducesExpectedValue_OverridesDefaultFormat(
+            string propertyName,
+            string expectedType)
+        {
+            // Arrange
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                { "type", expectedType },
+                { "id", propertyName },
+                { "name", propertyName },
+                { "value", "non-default format string" },
+            };
+
+            var context = new TagHelperContext(
+                tagName: "input",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            var output = new TagHelperOutput(
+                expectedType,
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()))
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+
+            var model = new DateTime(
+                year: 2000,
+                month: 1,
+                day: 2,
+                hour: 3,
+                minute: 4,
+                second: 5,
+                millisecond: 60,
+                kind: DateTimeKind.Utc);
+
+            var htmlGenerator = HtmlGeneratorUtilities.GetHtmlGenerator(metadataProvider);
+            var tagHelper = GetTagHelper(
+                htmlGenerator,
+                model: model,
+                propertyName: propertyName,
+                metadataProvider: metadataProvider);
+            tagHelper.ViewContext.Html5DateRenderingMode = Html5DateRenderingMode.CurrentCulture;
+            tagHelper.Format = "non-default format string";
+
+            // Act
+            await tagHelper.ProcessAsync(context, output);
+
+            // Assert
+            Assert.Equal(expectedAttributes, output.Attributes);
+            Assert.Equal(expectedType, output.TagName);
+        }
+
+        private static InputTagHelper GetTagHelper(
+            IHtmlGenerator htmlGenerator,
+            object model,
+            string propertyName,
+            IModelMetadataProvider metadataProvider = null)
+        {
+            return GetTagHelper(
+                htmlGenerator,
+                container: new Model(),
+                containerType: typeof(Model),
+                model: model,
+                propertyName: propertyName,
+                expressionName: propertyName,
+                metadataProvider: metadataProvider);
+        }
+
+        private static InputTagHelper GetTagHelper(
+            IHtmlGenerator htmlGenerator,
+            object container,
+            Type containerType,
+            object model,
+            string propertyName,
+            string expressionName,
+            IModelMetadataProvider metadataProvider = null)
+        {
+            if (metadataProvider == null)
+            {
+                metadataProvider = new TestModelMetadataProvider();
+            }
+
+            var containerMetadata = metadataProvider.GetMetadataForType(containerType);
+            var containerExplorer = metadataProvider.GetModelExplorerForType(containerType, container);
+
+            var propertyMetadata = metadataProvider.GetMetadataForProperty(containerType, propertyName);
+            var modelExplorer = containerExplorer.GetExplorerForExpression(propertyMetadata, model);
+
+            var modelExpression = new ModelExpression(expressionName, modelExplorer);
+            var viewContext = TestableHtmlGenerator.GetViewContext(container, htmlGenerator, metadataProvider);
+            var inputTagHelper = new InputTagHelper(htmlGenerator)
+            {
+                For = modelExpression,
+                ViewContext = viewContext,
+            };
+
+            return inputTagHelper;
+        }
+
+        public class NameAndId
+        {
+            public NameAndId(string name, string id)
+            {
+                Name = name;
+                Id = id;
+            }
+
+            public string Name { get; private set; }
+
+            public string Id { get; private set; }
+        }
+
+        private class Model
+        {
+            public string Text { get; set; }
+
+            public NestedModel NestedModel { get; set; }
+
+            public bool IsACar { get; set; }
+
+            [DataType(DataType.Date)]
+            public DateTime Date { get; set; }
+
+            public DateTime DateTime { get; set; }
+
+            public DateTimeOffset DateTimeOffset { get; set; }
+
+            [DataType(DataType.Date)]
+            public DateTime? NullableDate { get; set; }
+
+            public DateTime? NullableDateTime { get; set; }
+
+            public DateTimeOffset? NullableDateTimeOffset { get; set; }
+
+            [DataType("datetime-local")]
+            public DateTime DateTimeLocal { get; set; }
+
+            [DataType(DataType.Time)]
+            public DateTimeOffset Time { get; set; }
+
+            [DataType("month")]
+            public DateTimeOffset Month { get; set; }
+
+            [DataType("week")]
+            public DateTimeOffset Week { get; set; }
+        }
+
+        private class NestedModel
+        {
+            public string Text { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Internal/AttributeMatcherTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Internal/AttributeMatcherTest.cs
new file mode 100644
index 0000000000..a4aff7f9ab
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Internal/AttributeMatcherTest.cs
@@ -0,0 +1,113 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
+{
+    public class AttributeMatcherTest
+    {
+        private static readonly Func<Mode, Mode, int> Compare = (a, b) => a - b;
+
+        [Theory]
+        [InlineData(new object[] { new[] { "required-attr" } })]
+        [InlineData(new object[] { new[] { "first-attr", "second-attr" } })]
+        public void TryDetermineMode_ReturnsFalseIfNoAttributeMatchesAllRequiredAttributes(string[] modeAttributes)
+        {
+            // Arrange
+            var modeInfos = new[]
+            {
+                new ModeAttributes<Mode>(Mode.A, modeAttributes)
+            };
+            var attributes = new TagHelperAttributeList
+            {
+                new TagHelperAttribute("first-attr", "value"),
+                new TagHelperAttribute("not-in-any-mode", "value")
+            };
+            var context = MakeTagHelperContext(attributes);
+
+            // Act
+            Mode result;
+            var modeMatch = AttributeMatcher.TryDetermineMode(context, modeInfos, Compare, out result);
+
+            // Assert
+            Assert.False(modeMatch);
+        }
+
+        [Fact]
+        public void DetermineMode_SetsModeIfAllAttributesMatch()
+        {
+            // Arrange
+            var modeInfos = new[]
+            {
+                new ModeAttributes<Mode>(Mode.A, new[] { "a-required-attributes" }),
+                new ModeAttributes<Mode>(Mode.B, new[] { "first-attr", "second-attr" }),
+                new ModeAttributes<Mode>(Mode.C, new[] { "first-attr", "third-attr" }),
+            };
+            var attributes = new TagHelperAttributeList
+            {
+                new TagHelperAttribute("first-attr", "value"),
+                new TagHelperAttribute("second-attr", "value"),
+                new TagHelperAttribute("not-in-any-mode", "value")
+            };
+            var context = MakeTagHelperContext(attributes);
+
+            // Act
+            Mode result;
+            var modeMatch = AttributeMatcher.TryDetermineMode(context, modeInfos, Compare, out result);
+
+            // Assert
+            Assert.True(modeMatch);
+            Assert.Equal(Mode.B, result);
+        }
+
+        [Fact]
+        public void DetermineMode_SetsModeWithHigestValue()
+        {
+            // Arrange
+            var modeInfos = new[]
+            {
+                new ModeAttributes<Mode>(Mode.A, new[] { "first-attr" }),
+                new ModeAttributes<Mode>(Mode.B, new[] { "first-attr", "second-attr" }),
+                new ModeAttributes<Mode>(Mode.D, new[] { "second-attr", "third-attr" }),
+                new ModeAttributes<Mode>(Mode.C, new[] { "first-attr", "second-attr", "third-attr" }),
+            };
+            var attributes = new TagHelperAttributeList
+            {
+                new TagHelperAttribute("first-attr", "value"),
+                new TagHelperAttribute("second-attr", "value"),
+                new TagHelperAttribute("third-attr", "value"),
+                new TagHelperAttribute("not-in-any-mode", "value")
+            };
+            var context = MakeTagHelperContext(attributes);
+
+            // Act
+            Mode result;
+            var modeMatch = AttributeMatcher.TryDetermineMode(context, modeInfos, Compare, out result);
+
+            // Assert
+            Assert.True(modeMatch);
+            Assert.Equal(Mode.D, result);
+        }
+
+        private static TagHelperContext MakeTagHelperContext(TagHelperAttributeList attributes)
+        {
+            return new TagHelperContext(
+                tagName: "test",
+                allAttributes: attributes,
+                items: new Dictionary<object, object>(),
+                uniqueId: Guid.NewGuid().ToString("N"));
+        }
+
+        private enum Mode
+        {
+            A = 0,
+            B = 1,
+            C = 3,
+            D = 4
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Internal/FileVersionProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Internal/FileVersionProviderTest.cs
new file mode 100644
index 0000000000..533a38faf3
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Internal/FileVersionProviderTest.cs
@@ -0,0 +1,360 @@
+// 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.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Primitives;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
+{
+    public class FileVersionProviderTest
+    {
+        [Theory]
+        [InlineData("/hello/world", "/hello/world?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk")]
+        [InlineData("/hello/world?q=test", "/hello/world?q=test&v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk")]
+        [InlineData("/hello/world?q=foo&bar", "/hello/world?q=foo&bar&v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk")]
+        [InlineData("/hello/world?q=foo&bar#abc", "/hello/world?q=foo&bar&v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk#abc")]
+        [InlineData("/hello/world#somefragment", "/hello/world?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk#somefragment")]
+        public void AddFileVersionToPath_WhenCacheIsAbsent(string filePath, string expected)
+        {
+            // Arrange
+            var fileProvider = GetMockFileProvider(filePath);
+            var fileVersionProvider = new FileVersionProvider(
+                fileProvider,
+                new MemoryCache(new MemoryCacheOptions()),
+                GetRequestPathBase());
+
+            // Act
+            var result = fileVersionProvider.AddFileVersionToPath(filePath);
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Fact]
+        public void AddFileVersionToPath_CachesNotFoundResults()
+        {
+            // Arrange
+            var path = "/wwwroot/file.txt";
+            var fileProvider = GetMockFileProvider(
+                path,
+                pathStartsWithAppName: false,
+                fileDoesNotExist: true);
+            var fileVersionProvider = new FileVersionProvider(
+                fileProvider,
+                new MemoryCache(new MemoryCacheOptions()),
+                GetRequestPathBase());
+            var mockFileProvider = Mock.Get(fileProvider);
+
+            // Act 1
+            var result = fileVersionProvider.AddFileVersionToPath(path);
+
+            // Assert 1
+            Assert.Equal(path, result);
+            mockFileProvider.Verify(f => f.GetFileInfo(It.IsAny<string>()), Times.Once());
+            mockFileProvider.Verify(f => f.Watch(It.IsAny<string>()), Times.Once());
+
+            // Act 2
+            result = fileVersionProvider.AddFileVersionToPath(path);
+
+            // Assert 2
+            Assert.Equal(path, result);
+            mockFileProvider.Verify(f => f.GetFileInfo(It.IsAny<string>()), Times.Once());
+            mockFileProvider.Verify(f => f.Watch(It.IsAny<string>()), Times.Once());
+        }
+
+        [Theory]
+        [InlineData("file.txt", false)]
+        [InlineData("/wwwroot/file.txt", true)]
+        public void AddFileVersionToPath_CachesFoundResults(string path, bool pathStartsWithAppName)
+        {
+            // Arrange
+            var fileProvider = GetMockFileProvider(
+                "file.txt",
+                pathStartsWithAppName);
+            var fileVersionProvider = new FileVersionProvider(
+                fileProvider,
+                new MemoryCache(new MemoryCacheOptions()),
+                GetRequestPathBase());
+            var mockFileProvider = Mock.Get(fileProvider);
+
+            // Act 1
+            var result = fileVersionProvider.AddFileVersionToPath(path);
+
+            // Assert 1
+            Assert.Equal($"{path}?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk", result);
+            mockFileProvider.Verify(f => f.GetFileInfo(It.IsAny<string>()), Times.Once());
+            mockFileProvider.Verify(f => f.Watch(It.IsAny<string>()), Times.Once());
+
+            // Act 2
+            result = fileVersionProvider.AddFileVersionToPath(path);
+
+            // Assert 2
+            Assert.Equal($"{path}?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk", result);
+            mockFileProvider.Verify(f => f.GetFileInfo(It.IsAny<string>()), Times.Once());
+            mockFileProvider.Verify(f => f.Watch(It.IsAny<string>()), Times.Once());
+        }
+
+        [Fact]
+        public void AddFileVersionToPath_UpdatesEntryWhenCacheExpires_ForNonExistingFile()
+        {
+            // Arrange
+            var fileProvider = new TestFileProvider();
+            var fileVersionProvider = new FileVersionProvider(
+                fileProvider,
+                new MemoryCache(new MemoryCacheOptions()),
+                GetRequestPathBase());
+
+            // Act 1 - File does not exist
+            var result = fileVersionProvider.AddFileVersionToPath("file.txt");
+
+            // Assert 1
+            Assert.Equal("file.txt", result);
+
+            // Act 2 - File gets added
+            fileProvider.AddFile("file.txt", "Hello World!");
+            fileProvider.GetChangeToken("file.txt").HasChanged = true;
+            result = fileVersionProvider.AddFileVersionToPath("file.txt");
+
+            // Assert 2
+            Assert.Equal("file.txt?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk", result);
+        }
+
+        [Fact]
+        public void AddFileVersionToPath_UpdatesEntryWhenCacheExpires_ForExistingFile()
+        {
+            // Arrange
+            var fileProvider = new TestFileProvider();
+            var fileVersionProvider = new FileVersionProvider(
+                fileProvider,
+                new MemoryCache(new MemoryCacheOptions()),
+                GetRequestPathBase());
+            fileProvider.AddFile("file.txt", "Hello World!");
+
+            // Act 1 - File exists
+            var result = fileVersionProvider.AddFileVersionToPath("file.txt");
+
+            // Assert 1
+            Assert.Equal("file.txt?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk", result);
+
+            // Act 2
+            fileProvider.DeleteFile("file.txt");
+            fileProvider.GetChangeToken("file.txt").HasChanged = true;
+            result = fileVersionProvider.AddFileVersionToPath("file.txt");
+
+            // Assert 2
+            Assert.Equal("file.txt", result);
+        }
+
+        [Fact]
+        public void AddFileVersionToPath_UpdatesEntryWhenCacheExpires_ForExistingFile_WithRequestPathBase()
+        {
+            // Arrange
+            var fileProvider = new TestFileProvider();
+            var fileVersionProvider = new FileVersionProvider(
+                fileProvider,
+                new MemoryCache(new MemoryCacheOptions()),
+                GetRequestPathBase("/wwwroot/"));
+            fileProvider.AddFile("file.txt", "Hello World!");
+
+            // Act 1 - File exists
+            var result = fileVersionProvider.AddFileVersionToPath("/wwwroot/file.txt");
+
+            // Assert 1
+            Assert.Equal("/wwwroot/file.txt?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk", result);
+
+            // Act 2
+            fileProvider.DeleteFile("file.txt");
+            fileProvider.GetChangeToken("file.txt").HasChanged = true;
+            result = fileVersionProvider.AddFileVersionToPath("/wwwroot/file.txt");
+
+            // Assert 2
+            Assert.Equal("/wwwroot/file.txt", result);
+        }
+
+        // Verifies if the stream is closed after reading.
+        [Fact]
+        public void AddFileVersionToPath_DoesNotLockFileAfterReading()
+        {
+            // Arrange
+            var stream = new TestableMemoryStream(Encoding.UTF8.GetBytes("Hello World!"));
+            var mockFile = new Mock<IFileInfo>();
+            mockFile.SetupGet(f => f.Exists).Returns(true);
+            mockFile
+                .Setup(m => m.CreateReadStream())
+                .Returns(stream);
+
+            var fileProvider = new TestFileProvider();
+            fileProvider.AddFile("/hello/world", mockFile.Object);
+
+            var fileVersionProvider = new FileVersionProvider(
+                fileProvider,
+                new MemoryCache(new MemoryCacheOptions()),
+                GetRequestPathBase());
+
+            // Act
+            var result = fileVersionProvider.AddFileVersionToPath("/hello/world");
+
+            // Assert
+            Assert.True(stream.Disposed);
+        }
+
+        [Theory]
+        [InlineData("/testApp/hello/world", true, "/testApp")]
+        [InlineData("/testApp/foo/bar/hello/world", true, "/testApp/foo/bar")]
+        [InlineData("/test/testApp/hello/world", false, "/testApp")]
+        public void AddFileVersionToPath_PathContainingAppName(
+            string filePath,
+            bool pathStartsWithAppBase,
+            string requestPathBase)
+        {
+            // Arrange
+            var fileProvider = GetMockFileProvider(filePath, pathStartsWithAppBase);
+            var fileVersionProvider = new FileVersionProvider(
+                fileProvider,
+                new MemoryCache(new MemoryCacheOptions()),
+                GetRequestPathBase(requestPathBase));
+
+            // Act
+            var result = fileVersionProvider.AddFileVersionToPath(filePath);
+
+            // Assert
+            Assert.Equal(filePath + "?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk", result);
+        }
+
+        [Fact]
+        public void DoesNotAddVersion_IfFileNotFound()
+        {
+            // Arrange
+            var filePath = "http://contoso.com/hello/world";
+            var fileProvider = GetMockFileProvider(filePath, false, true);
+            var fileVersionProvider = new FileVersionProvider(
+                fileProvider,
+                new MemoryCache(new MemoryCacheOptions()),
+                GetRequestPathBase());
+
+            // Act
+            var result = fileVersionProvider.AddFileVersionToPath(filePath);
+
+            // Assert
+            Assert.Equal("http://contoso.com/hello/world", result);
+        }
+
+        [Fact]
+        public void ReturnsValueFromCache()
+        {
+            // Arrange
+            var filePath = "/hello/world";
+            var fileProvider = GetMockFileProvider(filePath);
+            var memoryCache = new MemoryCache(new MemoryCacheOptions());
+            memoryCache.Set(filePath, "FromCache");
+            var fileVersionProvider = new FileVersionProvider(
+                fileProvider,
+                memoryCache,
+                GetRequestPathBase());
+
+            // Act
+            var result = fileVersionProvider.AddFileVersionToPath(filePath);
+
+            // Assert
+            Assert.Equal("FromCache", result);
+        }
+
+        [Theory]
+        [InlineData("/hello/world", "/hello/world", null)]
+        [InlineData("/testApp/hello/world", "/hello/world", "/testApp")]
+        public void SetsValueInCache(string filePath, string watchPath, string requestPathBase)
+        {
+            // Arrange
+            var changeToken = new Mock<IChangeToken>();
+            var fileProvider = GetMockFileProvider(filePath, requestPathBase != null);
+            Mock.Get(fileProvider)
+                .Setup(f => f.Watch(watchPath)).Returns(changeToken.Object);
+
+            object cacheValue = null;
+            var value = new Mock<ICacheEntry>();
+            value.Setup(c => c.Value).Returns(cacheValue);
+            value.Setup(c => c.ExpirationTokens).Returns(new List<IChangeToken>());
+            var cache = new Mock<IMemoryCache>();
+            cache.CallBase = true;
+            cache.Setup(c => c.TryGetValue(It.IsAny<string>(), out cacheValue))
+                .Returns(cacheValue != null);
+            cache.Setup(c => c.CreateEntry(
+                /*key*/ filePath))
+                .Returns((object key) => value.Object)
+                .Verifiable();
+            var fileVersionProvider = new FileVersionProvider(
+                fileProvider,
+                cache.Object,
+                GetRequestPathBase(requestPathBase));
+
+            // Act
+            var result = fileVersionProvider.AddFileVersionToPath(filePath);
+
+            // Assert
+            Assert.Equal(filePath + "?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk", result);
+            cache.VerifyAll();
+        }
+
+        private static IFileProvider GetMockFileProvider(
+            string filePath,
+            bool pathStartsWithAppName = false,
+            bool fileDoesNotExist = false)
+        {
+            var existingMockFile = new Mock<IFileInfo>();
+            existingMockFile.SetupGet(f => f.Exists).Returns(true);
+            existingMockFile
+                .Setup(m => m.CreateReadStream())
+                .Returns(() => new MemoryStream(Encoding.UTF8.GetBytes("Hello World!")));
+
+            var doesNotExistMockFile = new Mock<IFileInfo>();
+            doesNotExistMockFile.SetupGet(f => f.Exists).Returns(false);
+
+            var mockFileProvider = new Mock<IFileProvider>();
+            if (pathStartsWithAppName)
+            {
+                mockFileProvider.Setup(fp => fp.GetFileInfo(filePath)).Returns(doesNotExistMockFile.Object);
+                mockFileProvider.Setup(fp => fp.GetFileInfo(It.Is<string>(str => str != filePath)))
+                    .Returns(existingMockFile.Object);
+            }
+            else
+            {
+                mockFileProvider.Setup(fp => fp.GetFileInfo(It.IsAny<string>()))
+                    .Returns(fileDoesNotExist ? doesNotExistMockFile.Object : existingMockFile.Object);
+            }
+
+            mockFileProvider.Setup(fp => fp.Watch(It.IsAny<string>()))
+                .Returns(new TestFileChangeToken());
+
+            return mockFileProvider.Object;
+        }
+
+        private static PathString GetRequestPathBase(string requestPathBase = null)
+        {
+            return new PathString(requestPathBase);
+        }
+
+        private class TestableMemoryStream : MemoryStream
+        {
+            public TestableMemoryStream(byte[] buffer)
+                : base(buffer)
+            {
+            }
+
+            public bool Disposed { get; private set; }
+
+            protected override void Dispose(bool disposing)
+            {
+                base.Dispose(disposing);
+                Disposed = true;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Internal/GlobbingUrlBuilderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Internal/GlobbingUrlBuilderTest.cs
new file mode 100644
index 0000000000..8493f1daa5
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Internal/GlobbingUrlBuilderTest.cs
@@ -0,0 +1,533 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.FileSystemGlobbing;
+using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
+using Microsoft.Extensions.Primitives;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
+{
+    public class GlobbingUrlBuilderTest
+    {
+        [Fact]
+        public void ReturnsOnlyStaticUrlWhenPatternDoesntFindAnyMatches()
+        {
+            // Arrange
+            var fileProvider = MakeFileProvider();
+            var cache = new MemoryCache(new MemoryCacheOptions());
+            var requestPathBase = PathString.Empty;
+            var globbingUrlBuilder = new GlobbingUrlBuilder(fileProvider, cache, requestPathBase);
+
+            // Act
+            var urlList = globbingUrlBuilder.BuildUrlList("/site.css", "**/*.css", excludePattern: null);
+
+            // Assert
+            Assert.Collection(urlList, url => Assert.Equal("/site.css", url));
+        }
+
+        [Fact]
+        public void DedupesStaticUrlAndPatternMatches()
+        {
+            // Arrange
+            var fileProvider = MakeFileProvider(MakeDirectoryContents("site.css", "blank.css"));
+            var cache = new MemoryCache(new MemoryCacheOptions());
+            var requestPathBase = PathString.Empty;
+            var globbingUrlBuilder = new GlobbingUrlBuilder(fileProvider, cache, requestPathBase);
+
+            // Act
+            var urlList = globbingUrlBuilder.BuildUrlList("/site.css", "**/*.css", excludePattern: null);
+
+            // Assert
+            Assert.Collection(urlList,
+                url => Assert.Equal("/site.css", url),
+                url => Assert.Equal("/blank.css", url));
+        }
+
+        public static TheoryData OrdersGlobbedMatchResultsCorrectly_Data
+        {
+            get
+            {
+                return new TheoryData<string, FileNode, string[]>
+                {
+                    {
+                        /* staticUrl */ "/site.css",
+                        /* dirStructure */ new FileNode(null, new [] {
+                            new FileNode("B", new [] {
+                                new FileNode("a.css"),
+                                new FileNode("b.css"),
+                                new FileNode("ba.css"),
+                                new FileNode("b", new [] {
+                                    new FileNode("a.css")
+                                })
+                            }),
+                            new FileNode("A", new [] {
+                                new FileNode("c.css"),
+                                new FileNode("d.css")
+                            }),
+                            new FileNode("a.css")
+                        }),
+                        /* expectedPaths */ new []
+                        {
+                            "/site.css",
+                            "/a.css",
+                            "/A/c.css", "/A/d.css",
+                            "/B/a.css", "/B/b.css", "/B/ba.css",
+                            "/B/b/a.css"
+                        }
+                    },
+                    {
+                        /* staticUrl */ "/site.css",
+                        /* dirStructure */ new FileNode(null, new [] {
+                            new FileNode("A", new [] {
+                                new FileNode("c.css"),
+                                new FileNode("d.css")
+                            }),
+                            new FileNode("_A", new [] {
+                                new FileNode("1.css"),
+                                new FileNode("2.css")
+                            }),
+                            new FileNode("__A", new [] {
+                                new FileNode("1.css"),
+                                new FileNode("_1.css")
+                            })
+                        }),
+                        /* expectedPaths */ new []
+                        {
+                            "/site.css",
+                            "/A/c.css", "/A/d.css",
+                            "/_A/1.css", "/_A/2.css",
+                            "/__A/1.css", "/__A/_1.css"
+                        }
+                    },
+                    {
+                        /* staticUrl */ "/site.css",
+                        /* dirStructure */ new FileNode(null, new [] {
+                            new FileNode("A", new [] {
+                                new FileNode("a.b.css"),
+                                new FileNode("a-b.css"),
+                                new FileNode("a_b.css"),
+                                new FileNode("a.css"),
+                                new FileNode("a.c.css")
+                            })
+                        }),
+                        /* expectedPaths */ new []
+                        {
+                            "/site.css",
+                            "/A/a.css", "/A/a-b.css", "/A/a.b.css", "/A/a.c.css", "/A/a_b.css"
+                        }
+                    },
+                    {
+                        /* staticUrl */ "/site.css",
+                        /* dirStructure */ new FileNode(null, new [] {
+                            new FileNode("B", new [] {
+                                new FileNode("a.bss"),
+                                new FileNode("a.css")
+                            }),
+                            new FileNode("A", new [] {
+                                new FileNode("a.css"),
+                                new FileNode("a.bss")
+                            })
+                        }),
+                        /* expectedPaths */ new []
+                        {
+                            "/site.css",
+                            "/A/a.bss", "/A/a.css",
+                            "/B/a.bss", "/B/a.css"
+                        }
+                    },
+                    {
+                        /* staticUrl */ "/site.css",
+                        /* dirStructure */ new FileNode(null, new [] {
+                            new FileNode("B", new [] {
+                                new FileNode("site2.css"),
+                                new FileNode("site11.css")
+                            }),
+                            new FileNode("A", new [] {
+                                new FileNode("site2.css"),
+                                new FileNode("site11.css")
+                            })
+                        }),
+                        /* expectedPaths */ new []
+                        {
+                            "/site.css",
+                            "/A/site11.css", "/A/site2.css",
+                            "/B/site11.css", "/B/site2.css"
+                        }
+                    },
+                    {
+                        /* staticUrl */ "/site.css",
+                        /* dirStructure */ new FileNode(null, new [] {
+                            new FileNode("B", new [] {
+                                new FileNode("site"),
+                                new FileNode("site.css")
+                            }),
+                            new FileNode("A", new [] {
+                                new FileNode("site.css"),
+                                new FileNode("site")
+                            })
+                        }),
+                        /* expectedPaths */ new []
+                        {
+                            "/site.css",
+                            "/A/site", "/A/site.css",
+                            "/B/site", "/B/site.css"
+                        }
+                    },
+                    {
+                        /* staticUrl */ "/site.css",
+                        /* dirStructure */ new FileNode(null, new [] {
+                            new FileNode("B.B", new [] {
+                                new FileNode("site"),
+                                new FileNode("site.css")
+                            }),
+                            new FileNode("A.A", new [] {
+                                new FileNode("site.css"),
+                                new FileNode("site")
+                            })
+                        }),
+                        /* expectedPaths */ new []
+                        {
+                            "/site.css",
+                            "/A.A/site", "/A.A/site.css",
+                            "/B.B/site", "/B.B/site.css"
+                        }
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(OrdersGlobbedMatchResultsCorrectly_Data))]
+        public void OrdersGlobbedMatchResultsCorrectly(string staticUrl, FileNode dirStructure, string[] expectedPaths)
+        {
+            // Arrange
+            var fileProvider = MakeFileProvider(dirStructure);
+            var cache = new MemoryCache(new MemoryCacheOptions());
+            var requestPathBase = PathString.Empty;
+            var globbingUrlBuilder = new GlobbingUrlBuilder(fileProvider, cache, requestPathBase);
+
+            // Act
+            var urlList = globbingUrlBuilder.BuildUrlList(staticUrl, "**/*.*", excludePattern: null);
+
+            // Assert
+            var collectionAssertions = expectedPaths.Select<string, Action<string>>(expected =>
+                actual => Assert.Equal(expected, actual));
+            Assert.Collection(urlList, collectionAssertions.ToArray());
+        }
+
+        [Theory]
+        [InlineData("/sub")]
+        [InlineData("/sub/again")]
+        public void ResolvesMatchedUrlsAgainstPathBase(string pathBase)
+        {
+            // Arrange
+            var fileProvider = MakeFileProvider(MakeDirectoryContents("site.css", "blank.css"));
+            var cache = new MemoryCache(new MemoryCacheOptions());
+            var requestPathBase = new PathString(pathBase);
+            var globbingUrlBuilder = new GlobbingUrlBuilder(fileProvider, cache, requestPathBase);
+
+            // Act
+            var urlList = globbingUrlBuilder.BuildUrlList(
+                staticUrl: null,
+                includePattern: "**/*.css",
+                excludePattern: null);
+
+            // Assert
+            Assert.Collection(urlList,
+                url => Assert.Equal($"{pathBase}/blank.css", url),
+                url => Assert.Equal($"{pathBase}/site.css", url));
+        }
+
+        [Fact]
+        public void UsesCachedMatchResults()
+        {
+            // Arrange
+            var fileProvider = MakeFileProvider();
+            var expected = new List<string> { "/blank.css", "/site.css" };
+            var cache = MakeCache(result: expected);
+            var requestPathBase = PathString.Empty;
+            var globbingUrlBuilder = new GlobbingUrlBuilder(fileProvider, cache, requestPathBase);
+
+            // Act
+            var actual = globbingUrlBuilder.BuildUrlList(
+                staticUrl: null,
+                includePattern: "**/*.css",
+                excludePattern: null);
+
+            // Assert
+            Assert.Collection(actual,
+                url => Assert.Equal("/blank.css", url),
+                url => Assert.Equal("/site.css", url));
+        }
+
+        [Fact]
+        public void CachesMatchResults()
+        {
+            // Arrange
+            var changeToken = new Mock<IChangeToken>();
+            var fileProvider = MakeFileProvider(MakeDirectoryContents("site.css", "blank.css"));
+            Mock.Get(fileProvider).Setup(f => f.Watch(It.IsAny<string>())).Returns(changeToken.Object);
+            var value = new Mock<ICacheEntry>();
+            value.Setup(c => c.Value).Returns(null);
+            value.Setup(c => c.ExpirationTokens).Returns(new List<IChangeToken>());
+            var cache = MakeCache();
+            Mock.Get(cache).Setup(c => c.CreateEntry(
+                /*key*/ It.IsAny<object>()))
+                .Returns((object key) => value.Object)
+                .Verifiable();
+            var requestPathBase = PathString.Empty;
+            var globbingUrlBuilder = new GlobbingUrlBuilder(fileProvider, cache, requestPathBase);
+
+            // Act
+            var urlList = globbingUrlBuilder.BuildUrlList(
+                staticUrl: null,
+                includePattern: "**/*.css",
+                excludePattern: null);
+
+            // Assert
+            Assert.Collection(urlList,
+                url => Assert.Equal("/blank.css", url),
+                url => Assert.Equal("/site.css", url));
+            Mock.Get(cache).VerifyAll();
+        }
+
+        public static TheoryData CommaSeparatedPatternData
+        {
+            get
+            {
+                // Include pattern, expected output
+                return new TheoryData<string, string[]>
+                {
+                    {
+                        "~/*.css, ~/*.txt",
+                        new[] { "/site.css", "/site2.txt" }
+                    },
+                    {
+                        "*.css, /*.txt",
+                        new[] { "/site.css", "/site2.txt" }
+                    },
+                    {
+                        "\\*.css,~/*.txt",
+                        new[] { "/site.css", "/site2.txt" }
+                    },
+                    {
+                        "~/*.js, *.txt",
+                        new[] { "/blank.js", "/site.js", "/site2.txt" }
+                    },
+                    {
+                        " ~/*.js,*.txt, /*.css",
+                        new[] { "/blank.js", "/site.css", "/site.js", "/site2.txt" }
+                    },
+                    {
+                        "~/blank.js, blank.js,/blank.js, \\blank.js",
+                        new[] { "/blank.js" }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(CommaSeparatedPatternData))]
+        public void HandlesCommaSeparatedPatterns(string includePattern, string[] expectedOutput)
+        {
+            // Arrange
+            var fileProvider = MakeFileProvider(MakeDirectoryContents("site.css", "blank.js", "site2.txt", "site.js"));
+            var cache = new MemoryCache(new MemoryCacheOptions());
+            var requestPathBase = PathString.Empty;
+            var globbingUrlBuilder = new GlobbingUrlBuilder(fileProvider, cache, requestPathBase);
+
+            // Act
+            var urlList = globbingUrlBuilder.BuildUrlList(
+                staticUrl: null,
+                includePattern: includePattern,
+                excludePattern: null);
+
+            // Assert
+            Assert.Equal(expectedOutput, urlList, StringComparer.Ordinal);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData("/")]
+        [InlineData(" \\")]
+        [InlineData("~/")]
+        [InlineData("  ~/")]
+        public void TrimsLeadingTildeAndSlashFromPatterns(string prefix)
+        {
+            // Arrange
+            var fileProvider = MakeFileProvider(MakeDirectoryContents("site.css", "blank.css"));
+            var cache = new MemoryCache(new MemoryCacheOptions());
+            var requestPathBase = PathString.Empty;
+            var includePatterns = new List<string>();
+            var excludePatterns = new List<string>();
+            var matcher = MakeMatcher(includePatterns, excludePatterns);
+            var globbingUrlBuilder = new GlobbingUrlBuilder(fileProvider, cache, requestPathBase);
+            globbingUrlBuilder.MatcherBuilder = () => matcher;
+
+            // Act
+            var urlList = globbingUrlBuilder.BuildUrlList(
+                staticUrl: null,
+                includePattern: $"{prefix}**/*.css",
+                excludePattern: $"{prefix}**/*.min.css");
+
+            // Assert
+            Assert.Collection(includePatterns, pattern => Assert.Equal("**/*.css", pattern));
+            Assert.Collection(excludePatterns, pattern => Assert.Equal("**/*.min.css", pattern));
+        }
+
+        [Theory]
+        [InlineData("~/")]
+        [InlineData("/")]
+        [InlineData("\\")]
+        public void TrimsOnlySingleLeadingSlashOrTildeSlashFromPatterns(string prefix)
+        {
+            // Arrange
+            var leadingSlashes = $"{prefix}{prefix}";
+            var fileProvider = MakeFileProvider(MakeDirectoryContents("site.css", "blank.css"));
+            var cache = new MemoryCache(new MemoryCacheOptions());
+            var requestPathBase = PathString.Empty;
+            var includePatterns = new List<string>();
+            var excludePatterns = new List<string>();
+            var matcher = MakeMatcher(includePatterns, excludePatterns);
+            var globbingUrlBuilder = new GlobbingUrlBuilder(fileProvider, cache, requestPathBase);
+            globbingUrlBuilder.MatcherBuilder = () => matcher;
+
+            // Act
+            var urlList = globbingUrlBuilder.BuildUrlList(
+                staticUrl: null,
+                includePattern: $"{leadingSlashes}**/*.css",
+                excludePattern: $"{leadingSlashes}**/*.min.css");
+
+            // Assert
+            Assert.Collection(includePatterns, pattern => Assert.Equal($"{prefix}**/*.css", pattern));
+            Assert.Collection(excludePatterns, pattern => Assert.Equal($"{prefix}**/*.min.css", pattern));
+        }
+
+        public class FileNode
+        {
+            public FileNode(string name)
+            {
+                Name = name;
+            }
+
+            public FileNode(string name, IList<FileNode> children)
+            {
+                Name = name;
+                Children = children;
+            }
+
+            public string Name { get; }
+
+            public IList<FileNode> Children { get; }
+
+            public bool IsDirectory => Children != null && Children.Any();
+        }
+
+        private static IFileInfo MakeFileInfo(string name, bool isDirectory = false)
+        {
+            var fileInfo = new Mock<IFileInfo>();
+            fileInfo.Setup(f => f.Name).Returns(name);
+            fileInfo.Setup(f => f.IsDirectory).Returns(isDirectory);
+            return fileInfo.Object;
+        }
+
+        private static IFileProvider MakeFileProvider(FileNode rootNode)
+        {
+            if (rootNode.Children == null || !rootNode.Children.Any())
+            {
+                throw new ArgumentException(nameof(rootNode));
+            }
+
+            var fileProvider = new Mock<IFileProvider>(MockBehavior.Strict);
+            fileProvider.Setup(fp => fp.GetDirectoryContents(string.Empty))
+                .Returns(MakeDirectoryContents(rootNode, fileProvider));
+            fileProvider.Setup(fp => fp.Watch(It.IsAny<string>()))
+                .Returns(new TestFileChangeToken());
+
+            return fileProvider.Object;
+        }
+
+        private static IDirectoryContents MakeDirectoryContents(FileNode fileNode, Mock<IFileProvider> fileProviderMock)
+        {
+            var children = new List<IFileInfo>();
+
+            foreach (var node in fileNode.Children)
+            {
+                children.Add(MakeFileInfo(node.Name, node.IsDirectory));
+                if (node.IsDirectory)
+                {
+                    var subPath = fileNode.Name != null
+                        ? (fileNode.Name + "/" + node.Name)
+                        : node.Name;
+                    fileProviderMock.Setup(fp => fp.GetDirectoryContents(subPath))
+                        .Returns(MakeDirectoryContents(node, fileProviderMock));
+                }
+            }
+
+            var directoryContents = new Mock<IDirectoryContents>();
+            directoryContents.Setup(dc => dc.GetEnumerator()).Returns(children.GetEnumerator());
+
+            return directoryContents.Object;
+        }
+
+        private static IDirectoryContents MakeDirectoryContents(params string[] fileNames)
+        {
+            var files = fileNames.Select(name => MakeFileInfo(name));
+            var directoryContents = new Mock<IDirectoryContents>();
+            directoryContents.Setup(dc => dc.GetEnumerator()).Returns(files.GetEnumerator());
+
+            return directoryContents.Object;
+        }
+
+        private static IFileProvider MakeFileProvider(IDirectoryContents directoryContents = null)
+        {
+            if (directoryContents == null)
+            {
+                directoryContents = MakeDirectoryContents();
+            }
+
+            var fileProvider = new Mock<IFileProvider>();
+            fileProvider.Setup(fp => fp.GetDirectoryContents(It.IsAny<string>()))
+                .Returns(directoryContents);
+            fileProvider.Setup(fp => fp.Watch(It.IsAny<string>()))
+                .Returns(new TestFileChangeToken());
+            return fileProvider.Object;
+        }
+
+        private static IMemoryCache MakeCache(object result = null)
+        {
+            var cache = new Mock<IMemoryCache>();
+            cache.Setup(c => c.TryGetValue(It.IsAny<object>(), out result))
+                .Returns(result != null);
+            return cache.Object;
+        }
+
+        private static Matcher MakeMatcher(List<string> includePatterns, List<string> excludePatterns)
+        {
+            var matcher = new Mock<Matcher>();
+            matcher.Setup(m => m.AddInclude(It.IsAny<string>()))
+                .Returns<string>(pattern =>
+                {
+                    includePatterns.Add(pattern);
+                    return matcher.Object;
+                });
+            matcher.Setup(m => m.AddExclude(It.IsAny<string>()))
+                .Returns<string>(pattern =>
+                {
+                    excludePatterns.Add(pattern);
+                    return matcher.Object;
+                });
+            var patternMatchingResult = new PatternMatchingResult(Enumerable.Empty<FilePatternMatch>());
+            matcher.Setup(m => m.Execute(It.IsAny<DirectoryInfoBase>())).Returns(patternMatchingResult);
+            return matcher.Object;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Internal/JavaScriptResourcesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Internal/JavaScriptResourcesTest.cs
new file mode 100644
index 0000000000..477182cda7
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Internal/JavaScriptResourcesTest.cs
@@ -0,0 +1,93 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using System.IO;
+using System.Text;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers.Internal
+{
+    public class JavaScriptResourcesTest
+    {
+        [Fact]
+        public void GetEmbeddedJavaScript_LoadsEmbeddedResourceFromManifestStream()
+        {
+            // Arrange
+            var resource = "window.alert('An alert');";
+            var expected = resource.Substring(0, resource.Length - 2);
+            var stream = new MemoryStream(Encoding.UTF8.GetBytes(resource));
+            var getManifestResourceStream = new Func<string, Stream>(name => stream);
+            var cache = new ConcurrentDictionary<string, string>();
+
+            // Act
+            var result = JavaScriptResources.GetEmbeddedJavaScript("test.js", getManifestResourceStream, cache);
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Fact]
+        public void GetEmbeddedJavaScript_AddsResourceToCacheWhenRead()
+        {
+            // Arrange
+            var resource = "window.alert('An alert');";
+            var expected = resource.Substring(0, resource.Length - 2);
+            var stream = new MemoryStream(Encoding.UTF8.GetBytes(resource));
+            var getManifestResourceStream = new Func<string, Stream>(name => stream);
+            var cache = new ConcurrentDictionary<string, string>();
+
+            // Act
+            var result = JavaScriptResources.GetEmbeddedJavaScript("test.js", getManifestResourceStream, cache);
+
+            // Assert
+            Assert.Collection(cache, kvp =>
+            {
+                Assert.Equal("test.js", kvp.Key);
+                Assert.Equal(expected, kvp.Value);
+            });
+        }
+
+        [Fact]
+        public void GetEmbeddedJavaScript_LoadsResourceFromCacheAfterInitialCall()
+        {
+            // Arrange
+            var resource = "window.alert('An alert');";
+            var stream = new MemoryStream(Encoding.UTF8.GetBytes(resource));
+            var callCount = 0;
+            var getManifestResourceStream = new Func<string, Stream>(name =>
+            {
+                callCount++;
+                return stream;
+            });
+            var cache = new ConcurrentDictionary<string, string>();
+
+            // Act
+            var result = JavaScriptResources.GetEmbeddedJavaScript("test.js", getManifestResourceStream, cache);
+            result = JavaScriptResources.GetEmbeddedJavaScript("test.js", getManifestResourceStream, cache);
+
+            // Assert
+            Assert.Equal(1, callCount);
+        }
+
+        [Theory]
+        [InlineData("window.alert(\"[[[0]]]\")")]
+        [InlineData("var test = { a: 1 };")]
+        [InlineData("var test = { a: 1, b: \"[[[0]]]\" };")]
+        public void GetEmbeddedJavaScript_PreparesJavaScriptCorrectly(string resource)
+        {
+            // Arrange
+            var expected = resource.Substring(0, resource.Length - 2);
+            var stream = new MemoryStream(Encoding.UTF8.GetBytes(resource));
+            var getManifestResourceStream = new Func<string, Stream>(name => stream);
+            var cache = new ConcurrentDictionary<string, string>();
+
+            // Act
+            var result = JavaScriptResources.GetEmbeddedJavaScript("test.js", getManifestResourceStream, cache);
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LabelTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LabelTagHelperTest.cs
new file mode 100644
index 0000000000..3d4e171a6f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LabelTagHelperTest.cs
@@ -0,0 +1,371 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    public class LabelTagHelperTest
+    {
+        // Model (List<Model> or Model instance), container type (Model or NestModel), model accessor,
+        // property path, TagHelperOutput values. All accessors should end at a Text property.
+        public static TheoryData<object, Type, Func<object>, string, TagHelperOutputContent> TestDataSet
+        {
+            get
+            {
+                var modelWithNull = new Model
+                {
+                    NestedModel = new NestedModel
+                    {
+                        Text = null,
+                    },
+                    Text = null,
+                };
+                var modelWithText = new Model
+                {
+                    NestedModel = new NestedModel
+                    {
+                        Text = "inner text",
+                    },
+                    Text = "outer text",
+                };
+                var models = new List<Model>
+                {
+                    modelWithNull,
+                    modelWithText,
+                };
+
+                return new TheoryData<object, Type, Func<object>, string, TagHelperOutputContent>
+                {
+                    { null, typeof(Model), () => null, "Text",
+                        new TagHelperOutputContent(string.Empty, Environment.NewLine, Environment.NewLine, "Text") },
+                    { null, typeof(Model), () => null, "Text",
+                        new TagHelperOutputContent(Environment.NewLine, string.Empty, "HtmlEncode[[Text]]", "Text") },
+
+                    { modelWithNull, typeof(Model), () => modelWithNull.Text, "Text",
+                        new TagHelperOutputContent(string.Empty, Environment.NewLine, Environment.NewLine, "Text") },
+                    { modelWithNull, typeof(Model), () => modelWithNull.Text, "Text",
+                        new TagHelperOutputContent(Environment.NewLine, string.Empty, "HtmlEncode[[Text]]", "Text") },
+                    { modelWithNull, typeof(Model), () => modelWithNull.Text, "Text",
+                        new TagHelperOutputContent(Environment.NewLine, "Hello World", "Hello World", "Text") },
+                    { modelWithText, typeof(Model), () => modelWithText.Text, "Text",
+                        new TagHelperOutputContent(string.Empty, Environment.NewLine, Environment.NewLine, "Text") },
+                    { modelWithText, typeof(Model), () => modelWithText.Text, "Text",
+                        new TagHelperOutputContent(Environment.NewLine, string.Empty, "HtmlEncode[[Text]]", "Text") },
+                    { modelWithText, typeof(Model), () => modelWithText.Text, "Text",
+                        new TagHelperOutputContent(Environment.NewLine, "Hello World", "Hello World", "Text") },
+                    { modelWithText, typeof(Model), () => modelWithNull.Text, "Text",
+                        new TagHelperOutputContent(string.Empty, "Hello World", "Hello World", "Text") },
+                    { modelWithText, typeof(Model), () => modelWithText.Text, "Text",
+                        new TagHelperOutputContent(string.Empty, "Hello World", "Hello World", "Text") },
+                    { modelWithText, typeof(Model), () => modelWithNull.Text, "Text",
+                        new TagHelperOutputContent("Hello World", string.Empty, "Hello World", "Text") },
+                    { modelWithText, typeof(Model), () => modelWithText.Text, "Text",
+                        new TagHelperOutputContent("Hello World", string.Empty, "Hello World", "Text") },
+                    { modelWithText, typeof(Model), () => modelWithNull.Text, "Text",
+                        new TagHelperOutputContent("Hello World1", "Hello World2", "Hello World2", "Text") },
+                    { modelWithText, typeof(Model), () => modelWithText.Text, "Text",
+                        new TagHelperOutputContent("Hello World1", "Hello World2", "Hello World2", "Text") },
+
+                    { modelWithNull, typeof(NestedModel), () => modelWithNull.NestedModel.Text, "NestedModel.Text",
+                        new TagHelperOutputContent(Environment.NewLine, string.Empty, "HtmlEncode[[Text]]", "NestedModel_Text") },
+                    { modelWithNull, typeof(NestedModel), () => modelWithNull.NestedModel.Text, "NestedModel.Text",
+                        new TagHelperOutputContent(Environment.NewLine, "Hello World", "Hello World", "NestedModel_Text") },
+                    { modelWithNull, typeof(NestedModel), () => modelWithNull.NestedModel.Text, "NestedModel.Text",
+                        new TagHelperOutputContent(string.Empty, Environment.NewLine, Environment.NewLine, "NestedModel_Text") },
+                    { modelWithText, typeof(NestedModel), () => modelWithText.NestedModel.Text, "NestedModel.Text",
+                        new TagHelperOutputContent(Environment.NewLine, string.Empty, "HtmlEncode[[Text]]", "NestedModel_Text") },
+                    { modelWithText, typeof(NestedModel), () => modelWithText.NestedModel.Text, "NestedModel.Text",
+                        new TagHelperOutputContent(Environment.NewLine, "Hello World", "Hello World", "NestedModel_Text") },
+                    { modelWithText, typeof(NestedModel), () => modelWithText.NestedModel.Text, "NestedModel.Text",
+                        new TagHelperOutputContent(string.Empty, Environment.NewLine, Environment.NewLine, "NestedModel_Text") },
+                    { modelWithNull, typeof(NestedModel), () => modelWithNull.NestedModel.Text, "NestedModel.Text",
+                        new TagHelperOutputContent(string.Empty, "Hello World", "Hello World", "NestedModel_Text") },
+                    { modelWithText, typeof(NestedModel), () => modelWithText.NestedModel.Text, "NestedModel.Text",
+                        new TagHelperOutputContent(string.Empty, "Hello World", "Hello World", "NestedModel_Text") },
+                    { modelWithNull, typeof(NestedModel), () => modelWithNull.NestedModel.Text, "NestedModel.Text",
+                        new TagHelperOutputContent("Hello World", string.Empty, "Hello World", "NestedModel_Text") },
+                    { modelWithText, typeof(NestedModel), () => modelWithText.NestedModel.Text, "NestedModel.Text",
+                        new TagHelperOutputContent("Hello World", string.Empty, "Hello World", "NestedModel_Text") },
+                    { modelWithNull, typeof(NestedModel), () => modelWithNull.NestedModel.Text, "NestedModel.Text",
+                        new TagHelperOutputContent("Hello World1", "Hello World2", "Hello World2", "NestedModel_Text") },
+                    { modelWithText, typeof(NestedModel), () => modelWithText.NestedModel.Text, "NestedModel.Text",
+                        new TagHelperOutputContent("Hello World1", "Hello World2", "Hello World2", "NestedModel_Text") },
+
+                    { models, typeof(Model), () => models[0].Text, "[0].Text",
+                        new TagHelperOutputContent(Environment.NewLine, string.Empty, "HtmlEncode[[Text]]", "z0__Text") },
+                    { models, typeof(Model), () => models[0].Text, "[0].Text",
+                        new TagHelperOutputContent(Environment.NewLine, "Hello World", "Hello World", "z0__Text") },
+                    { models, typeof(Model), () => models[0].Text, "[0].Text",
+                        new TagHelperOutputContent(string.Empty, Environment.NewLine, Environment.NewLine, "z0__Text") },
+                    { models, typeof(Model), () => models[1].Text, "[1].Text",
+                        new TagHelperOutputContent(Environment.NewLine, string.Empty, "HtmlEncode[[Text]]", "z1__Text") },
+                    { models, typeof(Model), () => models[1].Text, "[1].Text",
+                        new TagHelperOutputContent(Environment.NewLine, "Hello World", "Hello World", "z1__Text") },
+                    { models, typeof(Model), () => models[1].Text, "[1].Text",
+                        new TagHelperOutputContent(string.Empty, Environment.NewLine, Environment.NewLine, "z1__Text") },
+                    { models, typeof(Model), () => models[0].Text, "[0].Text",
+                        new TagHelperOutputContent(string.Empty, "Hello World", "Hello World", "z0__Text") },
+                    { models, typeof(Model), () => models[1].Text, "[1].Text",
+                        new TagHelperOutputContent(string.Empty, "Hello World", "Hello World", "z1__Text") },
+                    { models, typeof(Model), () => models[0].Text, "[0].Text",
+                        new TagHelperOutputContent("Hello World", string.Empty, "Hello World", "z0__Text") },
+                    { models, typeof(Model), () => models[1].Text, "[1].Text",
+                        new TagHelperOutputContent("Hello World", string.Empty, "Hello World", "z1__Text") },
+                    { models, typeof(Model), () => models[0].Text, "[0].Text",
+                        new TagHelperOutputContent("Hello World1", "Hello World2", "Hello World2", "z0__Text") },
+                    { models, typeof(Model), () => models[1].Text, "[1].Text",
+                        new TagHelperOutputContent("Hello World1", "Hello World2", "Hello World2", "z1__Text") },
+
+                    { models, typeof(NestedModel), () => models[0].NestedModel.Text, "[0].NestedModel.Text",
+                        new TagHelperOutputContent(Environment.NewLine, string.Empty, "HtmlEncode[[Text]]", "z0__NestedModel_Text") },
+                    { models, typeof(NestedModel), () => models[0].NestedModel.Text, "[0].NestedModel.Text",
+                        new TagHelperOutputContent(Environment.NewLine, "Hello World", "Hello World", "z0__NestedModel_Text") },
+                    { models, typeof(NestedModel), () => models[0].NestedModel.Text, "[0].NestedModel.Text",
+                        new TagHelperOutputContent(string.Empty, Environment.NewLine, Environment.NewLine, "z0__NestedModel_Text") },
+                    { models, typeof(NestedModel), () => models[1].NestedModel.Text, "[1].NestedModel.Text",
+                        new TagHelperOutputContent(Environment.NewLine, string.Empty, "HtmlEncode[[Text]]", "z1__NestedModel_Text") },
+                    { models, typeof(NestedModel), () => models[1].NestedModel.Text, "[1].NestedModel.Text",
+                        new TagHelperOutputContent(Environment.NewLine, "Hello World", "Hello World", "z1__NestedModel_Text") },
+                    { models, typeof(NestedModel), () => models[1].NestedModel.Text, "[1].NestedModel.Text",
+                        new TagHelperOutputContent(string.Empty, Environment.NewLine, Environment.NewLine, "z1__NestedModel_Text") },
+                    { models, typeof(NestedModel), () => models[0].NestedModel.Text, "[0].NestedModel.Text",
+                        new TagHelperOutputContent(string.Empty, "Hello World", "Hello World", "z0__NestedModel_Text") },
+                    { models, typeof(NestedModel), () => models[1].NestedModel.Text, "[1].NestedModel.Text",
+                        new TagHelperOutputContent(string.Empty, "Hello World", "Hello World", "z1__NestedModel_Text") },
+                    { models, typeof(NestedModel), () => models[0].NestedModel.Text, "[0].NestedModel.Text",
+                        new TagHelperOutputContent("Hello World", string.Empty, "Hello World", "z0__NestedModel_Text") },
+                    { models, typeof(NestedModel), () => models[1].NestedModel.Text, "[1].NestedModel.Text",
+                        new TagHelperOutputContent("Hello World", string.Empty, "Hello World", "z1__NestedModel_Text") },
+                    { models, typeof(NestedModel), () => models[0].NestedModel.Text, "[0].NestedModel.Text",
+                        new TagHelperOutputContent("Hello World1", "Hello World2", "Hello World2", "z0__NestedModel_Text") },
+                    { models, typeof(NestedModel), () => models[1].NestedModel.Text, "[1].NestedModel.Text",
+                        new TagHelperOutputContent("Hello World1", "Hello World2", "Hello World2", "z1__NestedModel_Text") },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(TestDataSet))]
+        public async Task ProcessAsync_GeneratesExpectedOutput(
+            object model,
+            Type containerType,
+            Func<object> modelAccessor,
+            string propertyPath,
+            TagHelperOutputContent tagHelperOutputContent)
+        {
+            // Arrange
+            var expectedTagName = "not-label";
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+                { "for", tagHelperOutputContent.ExpectedId }
+            };
+            var metadataProvider = new TestModelMetadataProvider();
+
+            var containerMetadata = metadataProvider.GetMetadataForType(containerType);
+            var containerExplorer = metadataProvider.GetModelExplorerForType(containerType, model);
+
+            var propertyMetadata = metadataProvider.GetMetadataForProperty(containerType, "Text");
+            var modelExplorer = containerExplorer.GetExplorerForExpression(propertyMetadata, modelAccessor());
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+
+            var modelExpression = new ModelExpression(propertyPath, modelExplorer);
+            var tagHelper = new LabelTagHelper(htmlGenerator)
+            {
+                For = modelExpression,
+            };
+            var expectedPreContent = "original pre-content";
+            var expectedPostContent = "original post-content";
+
+            var tagHelperContext = new TagHelperContext(
+                tagName: "not-label",
+                allAttributes: new TagHelperAttributeList(),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var htmlAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+            };
+            var output = new TagHelperOutput(
+                expectedTagName,
+                htmlAttributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.AppendHtml(tagHelperOutputContent.OriginalChildContent);
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            output.PreContent.AppendHtml(expectedPreContent);
+            output.PostContent.AppendHtml(expectedPostContent);
+
+            // LabelTagHelper checks IsContentModified so we don't want to forcibly set it if
+            // tagHelperOutputContent.OriginalContent is going to be null or empty.
+            if (!string.IsNullOrEmpty(tagHelperOutputContent.OriginalContent))
+            {
+                output.Content.AppendHtml(tagHelperOutputContent.OriginalContent);
+            }
+
+            var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator, metadataProvider);
+            tagHelper.ViewContext = viewContext;
+
+            // Act
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal(expectedAttributes, output.Attributes);
+            Assert.Equal(expectedPreContent, output.PreContent.GetContent());
+            Assert.Equal(
+                tagHelperOutputContent.ExpectedContent,
+                HtmlContentUtilities.HtmlContentToString(output.Content));
+            Assert.Equal(expectedPostContent, output.PostContent.GetContent());
+            Assert.Equal(TagMode.StartTagAndEndTag, output.TagMode);
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        // Display name, original child content, HTML field prefix, expected child content, and expected ID.
+        // Uses TagHelperOutputContent.OriginalContent to pass HtmlFieldPrefix values.
+        public static TheoryData<string, string, string, string, string> DisplayNameDataSet
+        {
+            get
+            {
+                return new TheoryData<string, string, string, string, string>
+                {
+                    {
+                        null, string.Empty, string.Empty, $"HtmlEncode[[{nameof(NestedModel.Text)}]]", nameof(NestedModel.Text)
+                    },
+                    {
+                        string.Empty, string.Empty, string.Empty, string.Empty, nameof(NestedModel.Text)
+                    },
+                    {
+                        "a label", string.Empty, string.Empty, "HtmlEncode[[a label]]", nameof(NestedModel.Text)
+                    },
+                    {
+                        null, "original label", string.Empty, "original label", nameof(NestedModel.Text)
+                    },
+                    {
+                        string.Empty, "original label", string.Empty, "original label", nameof(NestedModel.Text)
+                    },
+                    {
+                        "a label", "original label", string.Empty, "original label", nameof(NestedModel.Text)
+                    },
+                    {
+                        null, string.Empty, "prefix", $"HtmlEncode[[{nameof(NestedModel.Text)}]]", $"prefix_{nameof(NestedModel.Text)}"
+                    },
+                    {
+                        string.Empty, string.Empty, "prefix", string.Empty, $"prefix_{nameof(NestedModel.Text)}"
+                    },
+                    {
+                        "a label", string.Empty, "prefix", "HtmlEncode[[a label]]", $"prefix_{nameof(NestedModel.Text)}"
+                    },
+                };
+            }
+        }
+
+        // Prior to aspnet/Mvc#6638 fix, helpers generated nothing in this test when displayName was empty.
+        [Theory]
+        [MemberData(nameof(DisplayNameDataSet))]
+        public async Task ProcessAsync_GeneratesExpectedOutput_WithDisplayName(
+            string displayName,
+            string originalChildContent,
+            string htmlFieldPrefix,
+            string expectedContent,
+            string expectedId)
+        {
+            // Arrange
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                { "for", expectedId }
+            };
+
+            var name = nameof(NestedModel.Text);
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider
+                .ForProperty<NestedModel>(name)
+                .DisplayDetails(metadata => metadata.DisplayName = () => displayName);
+
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+            var viewContext = TestableHtmlGenerator.GetViewContext(
+                model: null,
+                htmlGenerator: htmlGenerator,
+                metadataProvider: metadataProvider);
+
+            var viewData = new ViewDataDictionary<NestedModel>(metadataProvider, viewContext.ModelState);
+            viewData.TemplateInfo.HtmlFieldPrefix = htmlFieldPrefix;
+            viewContext.ViewData = viewData;
+
+            var containerExplorer = metadataProvider.GetModelExplorerForType(typeof(NestedModel), model: null);
+            var modelExplorer = containerExplorer.GetExplorerForProperty(name);
+            var modelExpression = new ModelExpression(name, modelExplorer);
+            var tagHelper = new LabelTagHelper(htmlGenerator)
+            {
+                For = modelExpression,
+                ViewContext = viewContext,
+            };
+
+            var tagHelperContext = new TagHelperContext(
+                tagName: "label",
+                allAttributes: new TagHelperAttributeList(),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "label",
+                new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.AppendHtml(originalChildContent);
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+
+            // Act
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal(expectedAttributes, output.Attributes);
+            Assert.Equal(expectedContent, HtmlContentUtilities.HtmlContentToString(output.Content));
+        }
+
+        public class TagHelperOutputContent
+        {
+            public TagHelperOutputContent(
+                string originalChildContent,
+                string outputContent,
+                string expectedContent,
+                string expectedId)
+            {
+                OriginalChildContent = originalChildContent;
+                OriginalContent = outputContent;
+                ExpectedContent = expectedContent;
+                ExpectedId = expectedId;
+            }
+
+            public string OriginalChildContent { get; set; }
+
+            public string OriginalContent { get; set; }
+
+            public string ExpectedContent { get; set; }
+
+            public string ExpectedId { get; set; }
+        }
+
+        private class Model
+        {
+            public string Text { get; set; }
+
+            public NestedModel NestedModel { get; set; }
+        }
+
+        private class NestedModel
+        {
+            public string Text { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LinkTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LinkTagHelperTest.cs
new file mode 100644
index 0000000000..1c18cf70cf
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LinkTagHelperTest.cs
@@ -0,0 +1,1064 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.TagHelpers.Internal;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Primitives;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    public class LinkTagHelperTest
+    {
+        [Theory]
+        [InlineData(null, "test.css", "test.css")]
+        [InlineData("abcd.css", "test.css", "test.css")]
+        [InlineData(null, "~/test.css", "virtualRoot/test.css")]
+        [InlineData("abcd.css", "~/test.css", "virtualRoot/test.css")]
+        public void Process_HrefDefaultsToTagHelperOutputHrefAttributeAddedByOtherTagHelper(
+            string href,
+            string hrefOutput,
+            string expectedHrefPrefix)
+        {
+            // Arrange
+            var allAttributes = new TagHelperAttributeList(
+                new TagHelperAttributeList
+                {
+                    { "rel", new HtmlString("stylesheet") },
+                    { "asp-append-version", true },
+                });
+            var context = MakeTagHelperContext(allAttributes);
+            var outputAttributes = new TagHelperAttributeList
+                {
+                    { "rel", new HtmlString("stylesheet") },
+                    { "href", hrefOutput },
+                };
+            var output = MakeTagHelperOutput("link", outputAttributes);
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+            var urlHelper = new Mock<IUrlHelper>();
+
+            // Ensure expanded path does not look like an absolute path on Linux, avoiding
+            // https://github.com/aspnet/External/issues/21
+            urlHelper
+                .Setup(urlhelper => urlhelper.Content(It.IsAny<string>()))
+                .Returns(new Func<string, string>(url => url.Replace("~/", "virtualRoot/")));
+            var urlHelperFactory = new Mock<IUrlHelperFactory>();
+            urlHelperFactory
+                .Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>()))
+                .Returns(urlHelper.Object);
+
+            var helper = new LinkTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                urlHelperFactory.Object)
+            {
+                ViewContext = viewContext,
+                AppendVersion = true,
+                Href = href,
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal(
+                expectedHrefPrefix + "?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk",
+                (string)output.Attributes["href"].Value,
+                StringComparer.Ordinal);
+        }
+
+        public static TheoryData MultiAttributeSameNameData
+        {
+            get
+            {
+                // outputAttributes
+                return new TheoryData<TagHelperAttributeList>
+                {
+                    {
+                        new TagHelperAttributeList
+                        {
+                            { "hello", "world" },
+                            { "hello", "world2" }
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            { "hello", "world" },
+                            { "hello", "world2" },
+                            { "hello", "world3" }
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            { "HelLO", "world" },
+                            { "HELLO", "world2" }
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            { "Hello", "world" },
+                            { "HELLO", "world2" },
+                            { "hello", "world3" }
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            { "HeLlO", "world" },
+                            { "hello", "world2" }
+                        }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(MultiAttributeSameNameData))]
+        public void HandlesMultipleAttributesSameNameCorrectly(TagHelperAttributeList outputAttributes)
+        {
+            // Arrange
+            var allAttributes = new TagHelperAttributeList(
+                outputAttributes.Concat(
+                    new TagHelperAttributeList
+                    {
+                        { "rel", new HtmlString("stylesheet") },
+                        { "href", "test.css" },
+                        { "asp-fallback-href", "test.css" },
+                        { "asp-fallback-test-class", "hidden" },
+                        { "asp-fallback-test-property", "visibility" },
+                        { "asp-fallback-test-value", "hidden" },
+                    }));
+            var context = MakeTagHelperContext(allAttributes);
+            var combinedOutputAttributes = new TagHelperAttributeList(
+                outputAttributes.Concat(
+                    new[]
+                    {
+                        new TagHelperAttribute("rel", new HtmlString("stylesheet"))
+                    }));
+            var output = MakeTagHelperOutput("link", combinedOutputAttributes);
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+
+            var helper = new LinkTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                ViewContext = viewContext,
+                FallbackHref = "test.css",
+                FallbackTestClass = "hidden",
+                FallbackTestProperty = "visibility",
+                FallbackTestValue = "hidden",
+                Href = "test.css",
+            };
+            var expectedAttributes = new TagHelperAttributeList(output.Attributes);
+            expectedAttributes.Add(new TagHelperAttribute("href", "test.css"));
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedAttributes, output.Attributes);
+        }
+
+        public static TheoryData RunsWhenRequiredAttributesArePresent_Data
+        {
+            get
+            {
+                return new TheoryData<TagHelperAttributeList, Action<LinkTagHelper>>
+                {
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-fallback-href", "test.css"),
+                            new TagHelperAttribute("asp-fallback-test-class", "hidden"),
+                            new TagHelperAttribute("asp-fallback-test-property", "visibility"),
+                            new TagHelperAttribute("asp-fallback-test-value", "hidden")
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.FallbackHref = "test.css";
+                            tagHelper.FallbackTestClass = "hidden";
+                            tagHelper.FallbackTestProperty = "visibility";
+                            tagHelper.FallbackTestValue = "hidden";
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-fallback-href-include", "*.css"),
+                            new TagHelperAttribute("asp-fallback-test-class", "hidden"),
+                            new TagHelperAttribute("asp-fallback-test-property", "visibility"),
+                            new TagHelperAttribute("asp-fallback-test-value", "hidden")
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.FallbackHrefInclude = "*.css";
+                            tagHelper.FallbackTestClass = "hidden";
+                            tagHelper.FallbackTestProperty = "visibility";
+                            tagHelper.FallbackTestValue = "hidden";
+                        }
+                    },
+                    // File Version
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-fallback-href", "test.css"),
+                            new TagHelperAttribute("asp-fallback-test-class", "hidden"),
+                            new TagHelperAttribute("asp-fallback-test-property", "visibility"),
+                            new TagHelperAttribute("asp-fallback-test-value", "hidden"),
+                            new TagHelperAttribute("asp-append-version", "true")
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.FallbackHref = "test.css";
+                            tagHelper.FallbackTestClass = "hidden";
+                            tagHelper.FallbackTestProperty = "visibility";
+                            tagHelper.FallbackTestValue = "hidden";
+                            tagHelper.AppendVersion = true;
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-fallback-href-include", "*.css"),
+                            new TagHelperAttribute("asp-fallback-test-class", "hidden"),
+                            new TagHelperAttribute("asp-fallback-test-property", "visibility"),
+                            new TagHelperAttribute("asp-fallback-test-value", "hidden"),
+                            new TagHelperAttribute("asp-append-version", "true")
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.FallbackHrefInclude = "*.css";
+                            tagHelper.FallbackTestClass = "hidden";
+                            tagHelper.FallbackTestProperty = "visibility";
+                            tagHelper.FallbackTestValue = "hidden";
+                            tagHelper.AppendVersion = true;
+                        }
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RunsWhenRequiredAttributesArePresent_Data))]
+        public void RunsWhenRequiredAttributesArePresent(
+            TagHelperAttributeList attributes,
+            Action<LinkTagHelper> setProperties)
+        {
+            // Arrange
+            var context = MakeTagHelperContext(attributes);
+            var output = MakeTagHelperOutput("link");
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+            var globbingUrlBuilder = new Mock<GlobbingUrlBuilder>(
+                new TestFileProvider(),
+                Mock.Of<IMemoryCache>(),
+                PathString.Empty);
+            globbingUrlBuilder.Setup(g => g.BuildUrlList(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
+                .Returns(new[] { "/common.css" });
+
+            var helper = new LinkTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                ViewContext = viewContext,
+                GlobbingUrlBuilder = globbingUrlBuilder.Object
+            };
+            setProperties(helper);
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.NotNull(output.TagName);
+            Assert.False(output.IsContentModified);
+            Assert.True(output.PostElement.IsModified);
+        }
+
+        public static TheoryData RunsWhenRequiredAttributesArePresent_NoHref_Data
+        {
+            get
+            {
+                return new TheoryData<TagHelperAttributeList, Action<LinkTagHelper>>
+                {
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-href-include", "*.css")
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.HrefInclude = "*.css";
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-href-include", "*.css"),
+                            new TagHelperAttribute("asp-href-exclude", "*.min.css")
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.HrefInclude = "*.css";
+                            tagHelper.HrefExclude = "*.min.css";
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-href-include", "*.css"),
+                            new TagHelperAttribute("asp-append-version", "true")
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.HrefInclude = "*.css";
+                            tagHelper.AppendVersion = true;
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-href-include", "*.css"),
+                            new TagHelperAttribute("asp-href-exclude", "*.min.css"),
+                            new TagHelperAttribute("asp-append-version", "true")
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.HrefInclude = "*.css";
+                            tagHelper.HrefExclude = "*.min.css";
+                            tagHelper.AppendVersion = true;
+                        }
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RunsWhenRequiredAttributesArePresent_NoHref_Data))]
+        public void RunsWhenRequiredAttributesArePresent_NoHref(
+            TagHelperAttributeList attributes,
+            Action<LinkTagHelper> setProperties)
+        {
+            // Arrange
+            var context = MakeTagHelperContext(attributes);
+            var output = MakeTagHelperOutput("link");
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+            var globbingUrlBuilder = new Mock<GlobbingUrlBuilder>(
+                new TestFileProvider(),
+                Mock.Of<IMemoryCache>(),
+                PathString.Empty);
+            globbingUrlBuilder.Setup(g => g.BuildUrlList(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
+                .Returns(new[] { "/common.css" });
+
+            var helper = new LinkTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                ViewContext = viewContext,
+                GlobbingUrlBuilder = globbingUrlBuilder.Object
+            };
+            setProperties(helper);
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Null(output.TagName);
+            Assert.True(output.IsContentModified);
+            Assert.True(output.Content.GetContent().Length == 0);
+            Assert.True(output.PostElement.IsModified);
+        }
+
+        [Fact]
+        public void PreservesOrderOfNonHrefAttributes()
+        {
+            // Arrange
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "rel", new HtmlString("stylesheet") },
+                    { "href", "test.css" },
+                    { "data-extra", new HtmlString("something") },
+                    { "asp-fallback-href", "test.css" },
+                    { "asp-fallback-test-class", "hidden" },
+                    { "asp-fallback-test-property", "visibility" },
+                    { "asp-fallback-test-value", "hidden" },
+                });
+            var output = MakeTagHelperOutput("link",
+                attributes: new TagHelperAttributeList
+                {
+                    { "rel", new HtmlString("stylesheet") },
+                    { "data-extra", new HtmlString("something") },
+                });
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+
+            var helper = new LinkTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                ViewContext = viewContext,
+                FallbackHref = "test.css",
+                FallbackTestClass = "hidden",
+                FallbackTestProperty = "visibility",
+                FallbackTestValue = "hidden",
+                Href = "test.css",
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal("rel", output.Attributes[0].Name);
+            Assert.Equal("href", output.Attributes[1].Name);
+            Assert.Equal("data-extra", output.Attributes[2].Name);
+        }
+
+        public static TheoryData DoesNotRunWhenARequiredAttributeIsMissing_Data
+        {
+            get
+            {
+                return new TheoryData<TagHelperAttributeList, Action<LinkTagHelper>>
+                {
+                    {
+                        new TagHelperAttributeList
+                        {
+                            // This is commented out on purpose: new TagHelperAttribute("asp-href-include", "*.css"),
+                            // Note asp-href-include attribute isn't included.
+                            new TagHelperAttribute("asp-href-exclude", "*.min.css")
+                        },
+                        tagHelper =>
+                        {
+                            // This is commented out on purpose: tagHelper.HrefInclude = "*.css";
+                            tagHelper.HrefExclude = "*.min.css";
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            // This is commented out on purpose: new TagHelperAttribute("asp-fallback-href", "test.css"),
+                            // Note asp-href-include attribute isn't included.
+                            new TagHelperAttribute("asp-fallback-test-class", "hidden"),
+                            new TagHelperAttribute("asp-fallback-test-property", "visibility"),
+                            new TagHelperAttribute("asp-fallback-test-value", "hidden")
+                        },
+                        tagHelper =>
+                        {
+                            // This is commented out on purpose: tagHelper.FallbackHref = "test.css";
+                            tagHelper.FallbackTestClass = "hidden";
+                            tagHelper.FallbackTestProperty = "visibility";
+                            tagHelper.FallbackTestValue = "hidden";
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-fallback-href", "test.css"),
+                            new TagHelperAttribute("asp-fallback-test-class", "hidden"),
+                            // This is commented out on purpose: new TagHelperAttribute("asp-fallback-test-property", "visibility"),
+                            // Note asp-href-include attribute isn't included.
+                            new TagHelperAttribute("asp-fallback-test-value", "hidden")
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.FallbackHref = "test.css";
+                            tagHelper.FallbackTestClass = "hidden";
+                            // This is commented out on purpose: tagHelper.FallbackTestProperty = "visibility";
+                            tagHelper.FallbackTestValue = "hidden";
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            // This is commented out on purpose: new TagHelperAttribute("asp-fallback-href-include", "test.css"),
+                            new TagHelperAttribute("asp-fallback-href-exclude", "**/*.min.css"),
+                            new TagHelperAttribute("asp-fallback-test-class", "hidden"),
+                            new TagHelperAttribute("asp-fallback-test-property", "visibility"),
+                            new TagHelperAttribute("asp-fallback-test-value", "hidden")
+                        },
+                        tagHelper =>
+                        {
+                            // This is commented out on purpose: tagHelper.FallbackHrefInclude = "test.css";
+                            tagHelper.FallbackHrefExclude = "**/*.min.css";
+                            tagHelper.FallbackTestClass = "hidden";
+                            tagHelper.FallbackTestProperty = "visibility";
+                            tagHelper.FallbackTestValue = "hidden";
+                        }
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(DoesNotRunWhenARequiredAttributeIsMissing_Data))]
+        public void DoesNotRunWhenARequiredAttributeIsMissing(
+            TagHelperAttributeList attributes,
+            Action<LinkTagHelper> setProperties)
+        {
+            // Arrange
+            var context = MakeTagHelperContext(attributes);
+            var output = MakeTagHelperOutput("link");
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+
+            var helper = new LinkTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                ViewContext = viewContext,
+            };
+            setProperties(helper);
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.NotNull(output.TagName);
+            Assert.False(output.IsContentModified);
+            Assert.Empty(output.Attributes);
+            Assert.True(output.PostElement.GetContent().Length == 0);
+        }
+
+        [Fact]
+        public void DoesNotRunWhenAllRequiredAttributesAreMissing()
+        {
+            // Arrange
+            var context = MakeTagHelperContext();
+            var output = MakeTagHelperOutput("link");
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+
+            var helper = new LinkTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                ViewContext = viewContext,
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.NotNull(output.TagName);
+            Assert.False(output.IsContentModified);
+            Assert.Empty(output.Attributes);
+            Assert.True(output.PostElement.GetContent().Length == 0);
+        }
+
+        [Fact]
+        public void RendersLinkTagsForGlobbedHrefResults()
+        {
+            // Arrange
+            var expectedContent = "<link rel=\"stylesheet\" href=\"HtmlEncode[[/css/site.css]]\" />" +
+                "<link rel=\"stylesheet\" href=\"HtmlEncode[[/base.css]]\" />";
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "rel", new HtmlString("stylesheet") },
+                    { "href", "/css/site.css" },
+                    { "asp-href-include", "**/*.css" },
+                });
+            var output = MakeTagHelperOutput("link", attributes: new TagHelperAttributeList
+            {
+                { "rel", new HtmlString("stylesheet") },
+            });
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+            var globbingUrlBuilder = new Mock<GlobbingUrlBuilder>(
+                new TestFileProvider(),
+                Mock.Of<IMemoryCache>(),
+                PathString.Empty);
+            globbingUrlBuilder.Setup(g => g.BuildUrlList(null, "**/*.css", null))
+                .Returns(new[] { "/base.css" });
+
+            var helper = new LinkTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                GlobbingUrlBuilder = globbingUrlBuilder.Object,
+                ViewContext = viewContext,
+                Href = "/css/site.css",
+                HrefInclude = "**/*.css",
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal("link", output.TagName);
+            Assert.Equal("/css/site.css", output.Attributes["href"].Value);
+            var content = HtmlContentUtilities.HtmlContentToString(output, new HtmlTestEncoder());
+            Assert.Equal(expectedContent, content);
+        }
+
+        [Fact]
+        public void RendersLinkTagsForGlobbedHrefResults_EncodesAsExpected()
+        {
+            // Arrange
+            var expectedContent =
+                "<link encoded='contains \"quotes\"' href=\"HtmlEncode[[/css/site.css]]\" " +
+                "literal=\"HtmlEncode[[all HTML encoded]]\" " +
+                "mixed='HtmlEncode[[HTML encoded]] and contains \"quotes\"' />" +
+                "<link encoded='contains \"quotes\"' href=\"HtmlEncode[[/base.css]]\" " +
+                "literal=\"HtmlEncode[[all HTML encoded]]\" " +
+                "mixed='HtmlEncode[[HTML encoded]] and contains \"quotes\"' />";
+            var mixed = new DefaultTagHelperContent();
+            mixed.Append("HTML encoded");
+            mixed.AppendHtml(" and contains \"quotes\"");
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "asp-href-include", "**/*.css" },
+                    { new TagHelperAttribute("encoded", new HtmlString("contains \"quotes\""), HtmlAttributeValueStyle.SingleQuotes) },
+                    { "href", "/css/site.css" },
+                    { "literal", "all HTML encoded" },
+                    { new TagHelperAttribute("mixed", mixed, HtmlAttributeValueStyle.SingleQuotes) },
+                });
+            var output = MakeTagHelperOutput(
+                "link",
+                attributes: new TagHelperAttributeList
+                {
+                    { new TagHelperAttribute("encoded", new HtmlString("contains \"quotes\""), HtmlAttributeValueStyle.SingleQuotes) },
+                    { "literal", "all HTML encoded" },
+                    { new TagHelperAttribute("mixed", mixed, HtmlAttributeValueStyle.SingleQuotes) },
+                });
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+            var globbingUrlBuilder = new Mock<GlobbingUrlBuilder>(
+                new TestFileProvider(),
+                Mock.Of<IMemoryCache>(),
+                PathString.Empty);
+            globbingUrlBuilder.Setup(g => g.BuildUrlList(null, "**/*.css", null))
+                .Returns(new[] { "/base.css" });
+
+            var helper = new LinkTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                GlobbingUrlBuilder = globbingUrlBuilder.Object,
+                Href = "/css/site.css",
+                HrefInclude = "**/*.css",
+                ViewContext = viewContext,
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal("link", output.TagName);
+            Assert.Equal("/css/site.css", output.Attributes["href"].Value);
+            var content = HtmlContentUtilities.HtmlContentToString(output, new HtmlTestEncoder());
+            Assert.Equal(expectedContent, content);
+        }
+
+        [Fact]
+        public void RendersLinkTags_WithFileVersion()
+        {
+            // Arrange
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "rel", new HtmlString("stylesheet") },
+                    { "href", "/css/site.css" },
+                    { "asp-append-version", "true" }
+                });
+            var output = MakeTagHelperOutput("link", attributes: new TagHelperAttributeList
+            {
+                { "rel", new HtmlString("stylesheet") },
+            });
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+
+            var helper = new LinkTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                ViewContext = viewContext,
+                Href = "/css/site.css",
+                AppendVersion = true
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal("link", output.TagName);
+            Assert.Equal("/css/site.css?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk", output.Attributes["href"].Value);
+        }
+
+        [Fact]
+        public void RendersLinkTags_WithFileVersion_AndRequestPathBase()
+        {
+            // Arrange
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "rel", new HtmlString("stylesheet") },
+                    { "href", "/bar/css/site.css" },
+                    { "asp-append-version", "true" },
+                });
+            var output = MakeTagHelperOutput("link", attributes: new TagHelperAttributeList
+            {
+                { "rel", new HtmlString("stylesheet") },
+            });
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext("/bar");
+
+            var helper = new LinkTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                ViewContext = viewContext,
+                Href = "/bar/css/site.css",
+                AppendVersion = true
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal("link", output.TagName);
+            Assert.Equal("/bar/css/site.css?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk", output.Attributes["href"].Value);
+        }
+
+        [Fact]
+        public void RenderLinkTags_FallbackHref_WithFileVersion()
+        {
+            // Arrange
+            var expectedPostElement = Environment.NewLine +
+                "<meta name=\"x-stylesheet-fallback-test\" content=\"\" class=\"hidden\" /><script>!function" +
+                "(a,b,c,d){var e,f=document,g=f.getElementsByTagName(\"SCRIPT\"),h=g[g.length-1]." +
+                "previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView." +
+                "getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link " +
+                "href=\"'+c[e]+'\" '+d+\"/>\")}(\"JavaScriptEncode[[visibility]]\",\"JavaScriptEncode[[hidden]]\"" +
+                ",[\"JavaScriptEncode[[HtmlEncode[[/fallback.css?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk]]]]\"]," +
+                " \"JavaScriptEncode[[rel=\"stylesheet\" ]]\");</script>";
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "asp-append-version", "true" },
+                    { "asp-fallback-href-include", "**/fallback.css" },
+                    { "asp-fallback-test-class", "hidden" },
+                    { "asp-fallback-test-property", "visibility" },
+                    { "asp-fallback-test-value", "hidden" },
+                    { "href", "/css/site.css" },
+                    { "rel", new HtmlString("stylesheet") },
+                });
+            var output = MakeTagHelperOutput(
+                "link",
+                attributes: new TagHelperAttributeList
+                {
+                    { "rel", new HtmlString("stylesheet") },
+                });
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+            var globbingUrlBuilder = new Mock<GlobbingUrlBuilder>(
+                new TestFileProvider(),
+                Mock.Of<IMemoryCache>(),
+                PathString.Empty);
+            globbingUrlBuilder.Setup(g => g.BuildUrlList(null, "**/fallback.css", null))
+                .Returns(new[] { "/fallback.css" });
+
+            var helper = new LinkTagHelper(
+                MakeHostingEnvironment(),
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                AppendVersion = true,
+                Href = "/css/site.css",
+                FallbackHrefInclude = "**/fallback.css",
+                FallbackTestClass = "hidden",
+                FallbackTestProperty = "visibility",
+                FallbackTestValue = "hidden",
+                GlobbingUrlBuilder = globbingUrlBuilder.Object,
+                ViewContext = viewContext,
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal("link", output.TagName);
+            Assert.Equal("/css/site.css?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk", output.Attributes["href"].Value);
+            Assert.Equal(expectedPostElement, output.PostElement.GetContent());
+        }
+
+        [Fact]
+        public void RenderLinkTags_FallbackHref_WithFileVersion_EncodesAsExpected()
+        {
+            // Arrange
+            var expectedContent = "<link encoded=\"contains \"quotes\"\" " +
+                "href=\"HtmlEncode[[/css/site.css?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk]]\" " +
+                "literal=\"HtmlEncode[[all HTML encoded]]\" " +
+                "mixed=\"HtmlEncode[[HTML encoded]] and contains \"quotes\"\" rel=\"stylesheet\" />" +
+                Environment.NewLine +
+                "<meta name=\"x-stylesheet-fallback-test\" content=\"\" class=\"HtmlEncode[[hidden]]\" /><script>" +
+                "!function(a,b,c,d){var e,f=document,g=f.getElementsByTagName(\"SCRIPT\"),h=g[g.length-1]." +
+                "previousElementSibling,i=f.defaultView&&f.defaultView.getComputedStyle?f.defaultView." +
+                "getComputedStyle(h):h.currentStyle;if(i&&i[a]!==b)for(e=0;e<c.length;e++)f.write('<link " +
+                "href=\"'+c[e]+'\" '+d+\"/>\")}(\"JavaScriptEncode[[visibility]]\",\"JavaScriptEncode[[hidden]]\"," +
+                "[\"JavaScriptEncode[[HtmlEncode[[/fallback.css?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk]]]]\"], " +
+                "\"JavaScriptEncode[[encoded=\"contains \"quotes\"\" literal=\"HtmlEncode[[all HTML encoded]]\" " +
+                "mixed=\"HtmlEncode[[HTML encoded]] and contains \"quotes\"\" rel=\"stylesheet\" ]]\");" +
+                "</script>";
+            var mixed = new DefaultTagHelperContent();
+            mixed.Append("HTML encoded");
+            mixed.AppendHtml(" and contains \"quotes\"");
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "asp-append-version", "true" },
+                    { "asp-fallback-href-include", "**/fallback.css" },
+                    { "asp-fallback-test-class", "hidden" },
+                    { "asp-fallback-test-property", "visibility" },
+                    { "asp-fallback-test-value", "hidden" },
+                    { "encoded", new HtmlString("contains \"quotes\"") },
+                    { "href", "/css/site.css" },
+                    { "literal", "all HTML encoded" },
+                    { "mixed", mixed },
+                    { "rel", new HtmlString("stylesheet") },
+                });
+            var output = MakeTagHelperOutput(
+                "link",
+                attributes: new TagHelperAttributeList
+                {
+                    { "encoded", new HtmlString("contains \"quotes\"") },
+                    { "literal", "all HTML encoded" },
+                    { "mixed", mixed },
+                    { "rel", new HtmlString("stylesheet") },
+                });
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+            var globbingUrlBuilder = new Mock<GlobbingUrlBuilder>(
+                new TestFileProvider(),
+                Mock.Of<IMemoryCache>(),
+                PathString.Empty);
+            globbingUrlBuilder.Setup(g => g.BuildUrlList(null, "**/fallback.css", null))
+                .Returns(new[] { "/fallback.css" });
+
+            var helper = new LinkTagHelper(
+                MakeHostingEnvironment(),
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                AppendVersion = true,
+                FallbackHrefInclude = "**/fallback.css",
+                FallbackTestClass = "hidden",
+                FallbackTestProperty = "visibility",
+                FallbackTestValue = "hidden",
+                GlobbingUrlBuilder = globbingUrlBuilder.Object,
+                Href = "/css/site.css",
+                ViewContext = viewContext,
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal("link", output.TagName);
+            Assert.Equal("/css/site.css?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk", output.Attributes["href"].Value);
+            var content = HtmlContentUtilities.HtmlContentToString(output, new HtmlTestEncoder());
+            Assert.Equal(expectedContent, content);
+        }
+
+        [Fact]
+        public void RendersLinkTags_GlobbedHref_WithFileVersion()
+        {
+            // Arrange
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "rel", new HtmlString("stylesheet") },
+                    { "href", "/css/site.css" },
+                    { "asp-href-include", "**/*.css" },
+                    { "asp-append-version", "true" },
+                });
+            var output = MakeTagHelperOutput("link", attributes: new TagHelperAttributeList
+            {
+                { "rel", new HtmlString("stylesheet") },
+            });
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+            var globbingUrlBuilder = new Mock<GlobbingUrlBuilder>(
+                new TestFileProvider(),
+                Mock.Of<IMemoryCache>(),
+                PathString.Empty);
+            globbingUrlBuilder.Setup(g => g.BuildUrlList(null, "**/*.css", null))
+                .Returns(new[] { "/base.css" });
+
+            var helper = new LinkTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                GlobbingUrlBuilder = globbingUrlBuilder.Object,
+                ViewContext = viewContext,
+                Href = "/css/site.css",
+                HrefInclude = "**/*.css",
+                AppendVersion = true
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal("link", output.TagName);
+            Assert.Equal("/css/site.css?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk", output.Attributes["href"].Value);
+            var content = HtmlContentUtilities.HtmlContentToString(output.PostElement, new HtmlTestEncoder());
+            Assert.Equal(
+                "<link rel=\"stylesheet\" href=\"HtmlEncode[[/base.css?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk]]\" />",
+                content);
+        }
+
+        private static ViewContext MakeViewContext(string requestPathBase = null)
+        {
+            var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+            if (requestPathBase != null)
+            {
+                actionContext.HttpContext.Request.PathBase = new Http.PathString(requestPathBase);
+            }
+
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var viewData = new ViewDataDictionary(metadataProvider, new ModelStateDictionary());
+            var viewContext = new ViewContext(
+                actionContext,
+                Mock.Of<IView>(),
+                viewData,
+                Mock.Of<ITempDataDictionary>(),
+                TextWriter.Null,
+                new HtmlHelperOptions());
+
+            return viewContext;
+        }
+
+        private static TagHelperContext MakeTagHelperContext(TagHelperAttributeList attributes = null)
+        {
+            attributes = attributes ?? new TagHelperAttributeList();
+
+            return new TagHelperContext(
+                tagName: "link",
+                allAttributes: attributes,
+                items: new Dictionary<object, object>(),
+                uniqueId: Guid.NewGuid().ToString("N"));
+        }
+
+        private static TagHelperOutput MakeTagHelperOutput(string tagName, TagHelperAttributeList attributes = null)
+        {
+            attributes = attributes ?? new TagHelperAttributeList();
+
+            return new TagHelperOutput(
+                tagName,
+                attributes,
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()))
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+        }
+
+        private static IHostingEnvironment MakeHostingEnvironment()
+        {
+            var emptyDirectoryContents = new Mock<IDirectoryContents>();
+            emptyDirectoryContents.Setup(dc => dc.GetEnumerator())
+                .Returns(Enumerable.Empty<IFileInfo>().GetEnumerator());
+            var mockFile = new Mock<IFileInfo>();
+            mockFile.SetupGet(f => f.Exists).Returns(true);
+            mockFile
+                .Setup(m => m.CreateReadStream())
+                .Returns(() => new MemoryStream(Encoding.UTF8.GetBytes("Hello World!")));
+            var mockFileProvider = new Mock<IFileProvider>();
+            mockFileProvider.Setup(fp => fp.GetDirectoryContents(It.IsAny<string>()))
+                .Returns(emptyDirectoryContents.Object);
+            mockFileProvider.Setup(fp => fp.GetFileInfo(It.IsAny<string>()))
+                .Returns(mockFile.Object);
+            mockFileProvider.Setup(fp => fp.Watch(It.IsAny<string>()))
+                .Returns(new TestFileChangeToken());
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.Setup(h => h.WebRootFileProvider).Returns(mockFileProvider.Object);
+
+            return hostingEnvironment.Object;
+        }
+
+        private static IMemoryCache MakeCache() => new MemoryCache(new MemoryCacheOptions());
+
+        private static IUrlHelperFactory MakeUrlHelperFactory()
+        {
+            var urlHelper = new Mock<IUrlHelper>();
+
+            urlHelper
+                .Setup(helper => helper.Content(It.IsAny<string>()))
+                .Returns(new Func<string, string>(url => url));
+            var urlHelperFactory = new Mock<IUrlHelperFactory>();
+            urlHelperFactory
+                .Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>()))
+                .Returns(urlHelper.Object);
+
+            return urlHelperFactory.Object;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj
new file mode 100644
index 0000000000..d9c1634c3c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.TagHelpers\Microsoft.AspNetCore.Mvc.TagHelpers.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(MicrosoftAspNetCoreHttpPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources" PrivateAssets="All" Version="$(MicrosoftAspNetCoreRazorTagHelpersTestingSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/OptionTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/OptionTagHelperTest.cs
new file mode 100644
index 0000000000..9aa2ad26dc
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/OptionTagHelperTest.cs
@@ -0,0 +1,587 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.TagHelpers.Internal;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    public class OptionTagHelperTest
+    {
+        // Original content, selected attribute, value attribute, selected values (to place in TagHelperContext.Items)
+        // and expected tag helper output.
+        public static TheoryData<string, string, string, CurrentValues, TagHelperOutput> GeneratesExpectedDataSet
+        {
+            get
+            {
+                return new TheoryData<string, string, string, CurrentValues, TagHelperOutput>
+                {
+                    // original content, selected, value, selected values,
+                    // expected tag helper output - attributes, content
+                    {
+                        null, null, null, null,
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }
+                            },
+                            "")
+                    },
+                    {
+                        null, string.Empty, "value", null,
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "value", "value" }, { "selected", "" }
+                            },
+                            "")
+                    },
+                    {
+                        null, "selected", "value", null,
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "value", "value" }, { "selected", "selected" }
+                            },
+                            "")
+                    },
+                    {
+                        null, null, "value", new CurrentValues(new HashSet<string>()),
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "value", "value" }
+                            },
+                            "")
+                    },
+                    {
+                        null, null, "value", new CurrentValues(new HashSet<string>(new [] { string.Empty, })),
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "value", "value" }
+                            },
+                            "")
+                    },
+                    {
+                        null, string.Empty, "value", new CurrentValues(new HashSet<string>(new [] { string.Empty, })),
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "value", "value" }, { "selected", "" }
+                            },
+                            "")
+                    },
+                    {
+                        null, null, "value", new CurrentValues(new HashSet<string>(new [] { "value", })),
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "value", "value" }, { "selected", "selected" }
+                            },
+                            "")
+                    },
+                    {
+                        null, null, "value", new CurrentValues(new HashSet<string>(new [] { string.Empty, "value", })),
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "value", "value" }, { "selected", "selected" }
+                            },
+                            "")
+                    },
+                    {
+                        string.Empty, null, null, null,
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }
+                            },
+                        "")
+                    },
+                    {
+                        string.Empty, string.Empty, null, null,
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "selected", "" }
+                            },
+                            "")
+                    },
+                    {
+                        string.Empty, "selected", null, null,
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "selected", "selected" }
+                            },
+                            "")
+                    },
+                    {
+                        string.Empty, null, null, new CurrentValues(new HashSet<string>()),
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }
+                            },
+                            "")
+                    },
+                    {
+                        string.Empty, null, null, new CurrentValues(new HashSet<string>(new [] { string.Empty, })),
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "selected", "selected" }
+                            },
+                            "")
+                    },
+                    {
+                        string.Empty, string.Empty, null,
+                        new CurrentValues(new HashSet<string>(new [] { string.Empty, })),
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "selected", "" }
+                            },
+                            "")
+                    },
+                    {
+                        string.Empty, null, null, new CurrentValues(new HashSet<string>(new [] { "text", })),
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }
+                            },
+                            "")
+                    },
+                    {
+                        string.Empty, null, null,
+                        new CurrentValues(new HashSet<string>(new [] { string.Empty, "text", })),
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "selected", "selected" }
+                            },
+                            "")
+                    },
+                    {
+                        "text", null, null, null,
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }
+                            },
+                            "text")
+                    },
+                    {
+                        "text", string.Empty, null, null,
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "selected", "" }
+                            },
+                            "text")
+                    },
+                    {
+                        "text", "selected", null, null,
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "selected", "selected" }
+                            },
+                            "text")
+                    },
+                    {
+                        "text", null, null, new CurrentValues(new HashSet<string>()),
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }
+                            },
+                            "text")
+                    },
+                    {
+                        "text", null, null, new CurrentValues(new HashSet<string>(new [] { string.Empty, })),
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }
+                            },
+                            "text")
+                    },
+                    {
+                        "HtmlEncode[[text]]", null, null, new CurrentValues(new HashSet<string>(new [] { "text", })),
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "selected", "selected" }
+                            },
+                            "HtmlEncode[[text]]")
+                    },
+                    {
+                        "text", string.Empty, null, new CurrentValues(new HashSet<string>(new [] { "text", })),
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "selected", "" }
+                            },
+                            "text")
+                    },
+                    {
+                        "HtmlEncode[[text]]", null, null,
+                        new CurrentValues(new HashSet<string>(new [] { string.Empty, "text", })),
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "selected", "selected" }
+                            },
+                            "HtmlEncode[[text]]")
+                    },
+                    {
+                        "text", string.Empty, "value", null,
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "value", "value" }, { "selected", "" }
+                            },
+                            "text")
+                    },
+                    {
+                        "text", "selected", "value", null,
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "value", "value" }, { "selected", "selected" }
+                            },
+                            "text")
+                    },
+                    {
+                        "text", null, "value", new CurrentValues(new HashSet<string>()),
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "value", "value" }
+                            },
+                            "text")
+                    },
+                    {
+                        "text", null, "value", new CurrentValues(new HashSet<string>(new [] { string.Empty, })),
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "value", "value" }
+                            },
+                            "text")
+                    },
+                    {
+                        "text", string.Empty, "value",
+                        new CurrentValues(new HashSet<string>(new [] { string.Empty, })),
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "value", "value" }, { "selected", "" }
+                            },
+                            "text")
+                    },
+                    {
+                        "text", null, "value", new CurrentValues(new HashSet<string>(new [] { "text", })),
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "value", "value" }
+                            },
+                            "text")
+                    },
+                    {
+                        "text", null, "value", new CurrentValues(new HashSet<string>(new [] { "value", })),
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "value", "value" }, { "selected", "selected" }
+                            },
+                            "text")
+                    },
+                    {
+                        "text", null, "value",
+                        new CurrentValues(new HashSet<string>(new [] { string.Empty, "value", })),
+                        GetTagHelperOutput(
+                            "not-option",
+                            new TagHelperAttributeList
+                            {
+                                { "label", "my-label" }, { "value", "value" }, { "selected", "selected" }
+                            },
+                            "text")
+                    }
+                };
+            }
+        }
+
+        // Original content, selected attribute, value attribute, selected values (to place in TagHelperContext.Items)
+        // and expected output (concatenation of TagHelperOutput generations). Excludes non-null selected attribute,
+        // null selected values, and empty selected values cases.
+        public static IEnumerable<object[]> DoesNotUseGeneratorDataSet
+        {
+            get
+            {
+                return GeneratesExpectedDataSet.Where(
+                    entry => (entry[1] != null || entry[3] == null || ((CurrentValues)(entry[3])).Values.Count == 0));
+            }
+        }
+
+        // Original content, selected attribute, value attribute, selected values (to place in TagHelperContext.Items)
+        // and expected output (concatenation of TagHelperOutput generations). Excludes non-null selected attribute
+        // cases.
+        public static IEnumerable<object[]> DoesNotUseViewContextDataSet
+        {
+            get
+            {
+                return GeneratesExpectedDataSet.Where(entry => entry[1] != null);
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(GeneratesExpectedDataSet))]
+        public async Task ProcessAsync_GeneratesExpectedOutput(
+            string originalContent,
+            string selected,
+            string value,
+            CurrentValues currentValues,
+            TagHelperOutput expectedTagHelperOutput)
+        {
+            // Arrange
+            var originalAttributes = new TagHelperAttributeList
+            {
+                { "label", "my-label" },
+            };
+            if (selected != null)
+            {
+                originalAttributes.Add("selected", selected);
+            }
+
+            var contextAttributes = new TagHelperAttributeList(originalAttributes);
+            if (value != null)
+            {
+                contextAttributes.Add("value", value);
+            }
+
+            var tagHelperContext = new TagHelperContext(
+                tagName: "option",
+                allAttributes: contextAttributes,
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            var output = new TagHelperOutput(
+                expectedTagHelperOutput.TagName,
+                originalAttributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    // GetChildContentAsync should not be invoked since we are setting the content below.
+                    Assert.True(false);
+                    return Task.FromResult<TagHelperContent>(null);
+                })
+            {
+                TagMode = TagMode.StartTagAndEndTag
+            };
+
+            output.Content.SetContent(originalContent);
+
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+            var viewContext = TestableHtmlGenerator.GetViewContext(
+                model: null,
+                htmlGenerator: htmlGenerator,
+                metadataProvider: metadataProvider);
+            tagHelperContext.Items[typeof(SelectTagHelper)] = currentValues;
+            var tagHelper = new OptionTagHelper(htmlGenerator)
+            {
+                Value = value,
+                ViewContext = viewContext,
+            };
+
+            // Act
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal(expectedTagHelperOutput.TagName, output.TagName);
+            Assert.Equal(expectedTagHelperOutput.Content.GetContent(), output.Content.GetContent());
+            Assert.Equal(expectedTagHelperOutput.Attributes.Count, output.Attributes.Count);
+            foreach (var attribute in output.Attributes)
+            {
+                Assert.Contains(attribute, expectedTagHelperOutput.Attributes);
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(DoesNotUseGeneratorDataSet))]
+        public async Task ProcessAsync_DoesNotUseGenerator_IfSelectedNullOrNoSelectedValues(
+            string originalContent,
+            string selected,
+            string value,
+            CurrentValues currentValues,
+            TagHelperOutput ignored)
+        {
+            // Arrange
+            var originalAttributes = new TagHelperAttributeList
+            {
+                { "label", "my-label" },
+                { "selected", selected },
+            };
+            var originalTagName = "not-option";
+
+            var contextAttributes = new TagHelperAttributeList
+            {
+                { "label", "my-label" },
+                { "selected", selected },
+                { "value", value },
+            };
+            var originalPreContent = "original pre-content";
+            var originalPostContent = "original post-content";
+            var tagHelperContext = new TagHelperContext(
+                tagName: "option",
+                allAttributes: contextAttributes,
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                originalTagName,
+                originalAttributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent(originalContent);
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                })
+            {
+                TagMode = TagMode.StartTagAndEndTag,
+            };
+            output.PreContent.SetContent(originalPreContent);
+            output.Content.SetContent(originalContent);
+            output.PostContent.SetContent(originalPostContent);
+
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+            var viewContext = TestableHtmlGenerator.GetViewContext(
+                model: null,
+                htmlGenerator: htmlGenerator,
+                metadataProvider: metadataProvider);
+            tagHelperContext.Items[typeof(SelectTagHelper)] = currentValues;
+            var tagHelper = new OptionTagHelper(htmlGenerator)
+            {
+                Value = value,
+                ViewContext = viewContext,
+            };
+
+            // Act & Assert (does not throw)
+            // Tag helper would throw an NRE if it used Generator value.
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+        }
+
+        [Theory]
+        [MemberData(nameof(DoesNotUseViewContextDataSet))]
+        public async Task ProcessAsync_DoesNotUseViewContext_IfSelectedNotNull(
+            string originalContent,
+            string selected,
+            string value,
+            CurrentValues ignoredValues,
+            TagHelperOutput ignoredOutput)
+        {
+            // Arrange
+            var originalAttributes = new TagHelperAttributeList
+            {
+                { "label", "my-label" },
+                { "selected", selected },
+            };
+            var originalTagName = "not-option";
+
+            var contextAttributes = new TagHelperAttributeList
+            {
+                { "label", "my-label" },
+                { "selected", selected },
+                { "value", value },
+            };
+            var originalPreContent = "original pre-content";
+            var originalPostContent = "original post-content";
+            var tagHelperContext = new TagHelperContext(
+                tagName: "option",
+                allAttributes: contextAttributes,
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            var output = new TagHelperOutput(
+                originalTagName,
+                originalAttributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent(originalContent);
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                })
+            {
+                TagMode = TagMode.StartTagAndEndTag,
+            };
+            output.PreContent.SetContent(originalPreContent);
+            output.Content.SetContent(originalContent);
+            output.PostContent.SetContent(originalPostContent);
+
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+
+            var tagHelper = new OptionTagHelper(htmlGenerator)
+            {
+                Value = value,
+            };
+
+            // Act & Assert (does not throw)
+            // Tag helper would throw an NRE if it used ViewContext or Generator values.
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+        }
+
+        private static TagHelperOutput GetTagHelperOutput(
+            string tagName, TagHelperAttributeList attributes, string content)
+        {
+            var tagHelperOutput = new TagHelperOutput(
+                tagName,
+                attributes,
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+            tagHelperOutput.Content.SetContent(content);
+
+            return tagHelperOutput;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/PartialTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/PartialTagHelperTest.cs
new file mode 100644
index 0000000000..d1f0e16ee1
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/PartialTagHelperTest.cs
@@ -0,0 +1,647 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    public class PartialTagHelperTest
+    {
+        [Fact]
+        public void ResolveModel_ReturnsModelWhenProvided()
+        {
+            // Arrange
+            var expectedModel = new object();
+            var tagHelper = new PartialTagHelper(Mock.Of<ICompositeViewEngine>(), Mock.Of<IViewBufferScope>())
+            {
+                Model = expectedModel,
+            };
+
+            // Act
+            var model = tagHelper.ResolveModel();
+
+            // Assert
+            Assert.Same(expectedModel, model);
+        }
+
+        [Fact]
+        public void ResolveModel_ReturnsModelWhenNullValueIsProvided()
+        {
+            // Regression test for https://github.com/aspnet/Mvc/issues/7667.
+            // Arrange
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider(), new ModelStateDictionary())
+            {
+                Model = new object(),
+            };
+            var tagHelper = new PartialTagHelper(Mock.Of<ICompositeViewEngine>(), Mock.Of<IViewBufferScope>())
+            {
+                Model = null,
+                ViewData = viewData,
+            };
+
+            // Act
+            var model = tagHelper.ResolveModel();
+
+            // Assert
+            Assert.Null(model);
+        }
+
+        [Fact]
+        public void ResolveModel_ReturnsForModelWhenProvided()
+        {
+            // Arrange
+            var expectedModel = new PropertyModel();
+            var modelMetadataProvider = new TestModelMetadataProvider();
+            var containerModel = new TestModel()
+            {
+                Property = expectedModel
+            };
+            var containerModelExplorer = modelMetadataProvider.GetModelExplorerForType(
+                typeof(TestModel),
+                containerModel);
+            var propertyModelExplorer = containerModelExplorer.GetExplorerForProperty(nameof(TestModel.Property));
+            var tagHelper = new PartialTagHelper(Mock.Of<ICompositeViewEngine>(), Mock.Of<IViewBufferScope>())
+            {
+                For = new ModelExpression("Property", propertyModelExplorer),
+            };
+
+            // Act
+            var model = tagHelper.ResolveModel();
+
+            // Assert
+            Assert.Same(expectedModel, model);
+        }
+
+        [Fact]
+        public void ResolveModel_ReturnsViewContextsViewDataModelWhenModelAndForAreNotSet()
+        {
+            // Arrange
+            var expectedModel = new object();
+            var viewContext = GetViewContext();
+            viewContext.ViewData.Model = expectedModel;
+            var tagHelper = new PartialTagHelper(Mock.Of<ICompositeViewEngine>(), Mock.Of<IViewBufferScope>())
+            {
+                ViewContext = viewContext
+            };
+
+            // Act
+            var model = tagHelper.ResolveModel();
+
+            // Assert
+            Assert.Same(expectedModel, model);
+        }
+
+        [Fact]
+        public void ResolveModel_ThrowsWhenModelAndForProvided()
+        {
+            // Arrange
+            var modelMetadataProvider = new TestModelMetadataProvider();
+            var containerModel = new TestModel();
+            var containerModelExplorer = modelMetadataProvider.GetModelExplorerForType(
+                typeof(TestModel),
+                containerModel);
+            var propertyModelExplorer = containerModelExplorer.GetExplorerForProperty(nameof(TestModel.Property));
+            var tagHelper = new PartialTagHelper(Mock.Of<ICompositeViewEngine>(), Mock.Of<IViewBufferScope>())
+            {
+                Model = new object(),
+                For = new ModelExpression("Property", propertyModelExplorer),
+            };
+            var expectedMessage = Resources.FormatPartialTagHelper_InvalidModelAttributes(typeof(PartialTagHelper).FullName, "for", "model");
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => tagHelper.ResolveModel());
+            Assert.Equal(expectedMessage, exception.Message);
+        }
+
+        [Fact]
+        public void ResolveModel_ThrowsWhenNullModelAndForProvided()
+        {
+            // Arrange
+            var modelMetadataProvider = new TestModelMetadataProvider();
+            var containerModel = new TestModel();
+            var containerModelExplorer = modelMetadataProvider.GetModelExplorerForType(
+                typeof(TestModel),
+                containerModel);
+            var propertyModelExplorer = containerModelExplorer.GetExplorerForProperty(nameof(TestModel.Property));
+            var tagHelper = new PartialTagHelper(Mock.Of<ICompositeViewEngine>(), Mock.Of<IViewBufferScope>())
+            {
+                Model = null,
+                For = new ModelExpression("Property", propertyModelExplorer),
+            };
+            var expectedMessage = Resources.FormatPartialTagHelper_InvalidModelAttributes(typeof(PartialTagHelper).FullName, "for", "model");
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => tagHelper.ResolveModel());
+            Assert.Equal(expectedMessage, exception.Message);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_RendersPartialView_IfGetViewReturnsView()
+        {
+            // Arrange
+            var expected = "Hello world!";
+            var bufferScope = new TestViewBufferScope();
+            var partialName = "_Partial";
+            var model = new object();
+            var viewContext = GetViewContext();
+
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) =>
+                {
+                    v.Writer.Write(expected);
+                })
+                .Returns(Task.CompletedTask);
+
+            var viewEngine = new Mock<ICompositeViewEngine>();
+            viewEngine.Setup(v => v.GetView(It.IsAny<string>(), partialName, false))
+                .Returns(ViewEngineResult.Found(partialName, view.Object));
+
+            var tagHelper = new PartialTagHelper(viewEngine.Object, bufferScope)
+            {
+                Name = partialName,
+                ViewContext = viewContext,
+            };
+            var tagHelperContext = GetTagHelperContext();
+            var output = GetTagHelperOutput();
+
+            // Act
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            var content = HtmlContentUtilities.HtmlContentToString(output.Content, new HtmlTestEncoder());
+            Assert.Equal(expected, content);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_RendersPartialView_IfFindViewReturnsView()
+        {
+            // Arrange
+            var expected = "Hello world!";
+            var bufferScope = new TestViewBufferScope();
+            var partialName = "_Partial";
+            var model = new object();
+            var viewContext = GetViewContext();
+
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) =>
+                {
+                    v.Writer.Write(expected);
+                })
+                .Returns(Task.CompletedTask);
+
+            var viewEngine = new Mock<ICompositeViewEngine>();
+            viewEngine.Setup(v => v.GetView(It.IsAny<string>(), partialName, false))
+                .Returns(ViewEngineResult.NotFound(partialName, new[] { partialName }));
+
+            viewEngine.Setup(v => v.FindView(viewContext, partialName, false))
+                .Returns(ViewEngineResult.Found(partialName, view.Object));
+
+            var tagHelper = new PartialTagHelper(viewEngine.Object, bufferScope)
+            {
+                Name = partialName,
+                ViewContext = viewContext,
+            };
+            var tagHelperContext = GetTagHelperContext();
+            var output = GetTagHelperOutput();
+
+            // Act
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            var content = HtmlContentUtilities.HtmlContentToString(output.Content, new HtmlTestEncoder());
+            Assert.Equal(expected, content);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_UsesViewDataFromContext()
+        {
+            // Arrange
+            var expected = "Implicit";
+            var bufferScope = new TestViewBufferScope();
+            var partialName = "_Partial";
+            var viewContext = GetViewContext();
+            viewContext.ViewData["key"] = expected;
+
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) =>
+                {
+                    v.Writer.Write(v.ViewData["key"]);
+                })
+                .Returns(Task.CompletedTask);
+
+            var viewEngine = new Mock<ICompositeViewEngine>();
+            viewEngine.Setup(v => v.GetView(It.IsAny<string>(), partialName, false))
+                .Returns(ViewEngineResult.NotFound(partialName, new[] { partialName }));
+
+            viewEngine.Setup(v => v.FindView(viewContext, partialName, false))
+                .Returns(ViewEngineResult.Found(partialName, view.Object));
+
+            var tagHelper = new PartialTagHelper(viewEngine.Object, bufferScope)
+            {
+                Name = partialName,
+                ViewContext = viewContext,
+            };
+            var tagHelperContext = GetTagHelperContext();
+            var output = GetTagHelperOutput();
+
+            // Act
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            var content = HtmlContentUtilities.HtmlContentToString(output.Content, new HtmlTestEncoder());
+            Assert.Equal(expected, content);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_UsesPassedInViewData_WhenNotNull()
+        {
+            // Arrange
+            var expected = "Explicit";
+            var bufferScope = new TestViewBufferScope();
+            var partialName = "_Partial";
+            var model = new object();
+            var viewData = new ViewDataDictionary(new TestModelMetadataProvider(), new ModelStateDictionary());
+            viewData["key"] = expected;
+            var viewContext = GetViewContext();
+            viewContext.ViewData["key"] = "ViewContext";
+
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) =>
+                {
+                    v.Writer.Write(v.ViewData["key"]);
+                })
+                .Returns(Task.CompletedTask);
+
+            var viewEngine = new Mock<ICompositeViewEngine>();
+            viewEngine.Setup(v => v.GetView(It.IsAny<string>(), partialName, false))
+                .Returns(ViewEngineResult.Found(partialName, view.Object));
+
+            var tagHelper = new PartialTagHelper(viewEngine.Object, bufferScope)
+            {
+                Name = partialName,
+                ViewContext = viewContext,
+                ViewData = viewData,
+            };
+            var tagHelperContext = GetTagHelperContext();
+            var output = GetTagHelperOutput();
+
+            // Act
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            var content = HtmlContentUtilities.HtmlContentToString(output.Content, new HtmlTestEncoder());
+            Assert.Equal(expected, content);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_UsesModelExpression_ToDetermineModel()
+        {
+            // Arrange
+            var expected = new PropertyModel();
+            var bufferScope = new TestViewBufferScope();
+            var partialName = "_Partial";
+            var modelMetadataProvider = new TestModelMetadataProvider();
+            var containerModel = new TestModel { Property = expected };
+            var containerModelExplorer = modelMetadataProvider.GetModelExplorerForType(
+                typeof(TestModel),
+                containerModel);
+            var propertyModelExplorer = containerModelExplorer.GetExplorerForProperty(nameof(TestModel.Property));
+
+            var modelExpression = new ModelExpression("Property", propertyModelExplorer);
+            var viewContext = GetViewContext();
+            viewContext.ViewData.Model = new object();
+
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) =>
+                {
+                    var actual = Assert.IsType<PropertyModel>(v.ViewData.Model);
+                    Assert.Same(expected, actual);
+                })
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+
+            var viewEngine = new Mock<ICompositeViewEngine>();
+            viewEngine.Setup(v => v.GetView(It.IsAny<string>(), partialName, false))
+                .Returns(ViewEngineResult.Found(partialName, view.Object));
+
+            var tagHelper = new PartialTagHelper(viewEngine.Object, bufferScope)
+            {
+                Name = partialName,
+                ViewContext = viewContext,
+                For = modelExpression,
+            };
+            var tagHelperContext = GetTagHelperContext();
+            var output = GetTagHelperOutput();
+
+            // Act
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            view.Verify();
+        }
+
+        [Fact]
+        public async Task ProcessAsync_DoesNotUseModelFromViewdata_IfModelExpressionEvalulatesToNull()
+        {
+            // Arrange
+            var bufferScope = new TestViewBufferScope();
+            var partialName = "_Partial";
+            var modelMetadataProvider = new TestModelMetadataProvider();
+            var containerModel = new TestModel { Property = null };
+            var containerModelExplorer = modelMetadataProvider.GetModelExplorerForType(
+                typeof(TestModel),
+                containerModel);
+            var propertyModelExplorer = containerModelExplorer.GetExplorerForProperty(nameof(TestModel.Property));
+
+            var modelExpression = new ModelExpression("Property", propertyModelExplorer);
+            var viewContext = GetViewContext();
+            viewContext.ViewData.Model = new object();
+
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) =>
+                {
+                    Assert.Null(v.ViewData.Model);
+                })
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+
+            var viewEngine = new Mock<ICompositeViewEngine>();
+            viewEngine.Setup(v => v.GetView(It.IsAny<string>(), partialName, false))
+                .Returns(ViewEngineResult.Found(partialName, view.Object));
+
+            var tagHelper = new PartialTagHelper(viewEngine.Object, bufferScope)
+            {
+                Name = partialName,
+                ViewContext = viewContext,
+                For = modelExpression,
+            };
+            var tagHelperContext = GetTagHelperContext();
+            var output = GetTagHelperOutput();
+
+            // Act
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            view.Verify();
+        }
+
+        [Fact]
+        public async Task ProcessAsync_SetsHtmlFieldPrefix_UsingModelExpression()
+        {
+            // Arrange
+            var expected = "order.items[0].Property";
+            var bufferScope = new TestViewBufferScope();
+            var partialName = "_Partial";
+            var modelMetadataProvider = new TestModelMetadataProvider();
+            var containerModel = new TestModel { Property = new PropertyModel() };
+            var containerModelExplorer = modelMetadataProvider.GetModelExplorerForType(
+                typeof(TestModel),
+                containerModel);
+            var propertyModelExplorer = containerModelExplorer.GetExplorerForProperty(nameof(TestModel.Property));
+
+            var modelExpression = new ModelExpression("Property", propertyModelExplorer);
+            var viewContext = GetViewContext();
+            viewContext.ViewData.TemplateInfo.HtmlFieldPrefix = "order.items[0]";
+
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) =>
+                {
+                    Assert.Equal(expected, v.ViewData.TemplateInfo.HtmlFieldPrefix);
+                })
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+
+            var viewEngine = new Mock<ICompositeViewEngine>();
+            viewEngine.Setup(v => v.GetView(It.IsAny<string>(), partialName, false))
+                .Returns(ViewEngineResult.Found(partialName, view.Object));
+
+            var tagHelper = new PartialTagHelper(viewEngine.Object, bufferScope)
+            {
+                Name = partialName,
+                ViewContext = viewContext,
+                For = modelExpression,
+            };
+            var tagHelperContext = GetTagHelperContext();
+            var output = GetTagHelperOutput();
+
+            // Act
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            view.Verify();
+            Assert.Equal("order.items[0]", viewContext.ViewData.TemplateInfo.HtmlFieldPrefix);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_UsesModelOnViewContextViewData_WhenModelExpresionIsNull()
+        {
+            // Arrange
+            var bufferScope = new TestViewBufferScope();
+            var partialName = "_Partial";
+            var model = new object();
+            var viewContext = GetViewContext();
+            viewContext.ViewData.Model = model;
+
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) =>
+                {
+                    Assert.Same(model, v.ViewData.Model);
+                })
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+
+            var viewEngine = new Mock<ICompositeViewEngine>();
+            viewEngine.Setup(v => v.GetView(It.IsAny<string>(), partialName, false))
+                .Returns(ViewEngineResult.Found(partialName, view.Object));
+
+            var tagHelper = new PartialTagHelper(viewEngine.Object, bufferScope)
+            {
+                Name = partialName,
+                ViewContext = viewContext,
+            };
+            var tagHelperContext = GetTagHelperContext();
+            var output = GetTagHelperOutput();
+
+            // Act
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            view.Verify();
+        }
+
+        [Fact]
+        public async Task ProcessAsync_DoesNotModifyHtmlFieldPrefix_WhenModelExpressionIsNull()
+        {
+            // Arrange
+            var expected = "original";
+            var bufferScope = new TestViewBufferScope();
+            var partialName = "_Partial";
+            var model = new object();
+            var viewContext = GetViewContext();
+            viewContext.ViewData.Model = model;
+            viewContext.ViewData.TemplateInfo.HtmlFieldPrefix = expected;
+
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) =>
+                {
+                    Assert.Equal(expected, v.ViewData.TemplateInfo.HtmlFieldPrefix);
+                })
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+
+            var viewEngine = new Mock<ICompositeViewEngine>();
+            viewEngine.Setup(v => v.GetView(It.IsAny<string>(), partialName, false))
+                .Returns(ViewEngineResult.Found(partialName, view.Object));
+
+            var tagHelper = new PartialTagHelper(viewEngine.Object, bufferScope)
+            {
+                Name = partialName,
+                ViewContext = viewContext,
+            };
+            var tagHelperContext = GetTagHelperContext();
+            var output = GetTagHelperOutput();
+
+            // Act
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            view.Verify();
+        }
+
+        [Fact]
+        public async Task ProcessAsync_DisposesViewInstance()
+        {
+            // Arrange
+            var bufferScope = new TestViewBufferScope();
+            var partialName = "_Partial";
+            var viewContext = GetViewContext();
+
+            var disposable = new Mock<IDisposable>();
+            disposable.Setup(d => d.Dispose()).Verifiable();
+            var view = disposable.As<IView>();
+
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Returns(Task.CompletedTask)
+                .Verifiable();
+
+            var viewEngine = new Mock<ICompositeViewEngine>();
+            viewEngine.Setup(v => v.GetView(It.IsAny<string>(), partialName, false))
+                .Returns(ViewEngineResult.Found(partialName, view.Object));
+
+            var tagHelper = new PartialTagHelper(viewEngine.Object, bufferScope)
+            {
+                Name = partialName,
+                ViewContext = viewContext,
+            };
+            var tagHelperContext = GetTagHelperContext();
+            var output = GetTagHelperOutput();
+
+            // Act
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            disposable.Verify();
+            view.Verify();
+        }
+
+        [Fact]
+        public async Task ProcessAsync_Throws_IfGetViewAndFindReturnNotFoundResults()
+        {
+            // Arrange
+            var bufferScope = new TestViewBufferScope();
+            var partialName = "_Partial";
+            var expected = string.Join(Environment.NewLine,
+                $"The partial view '{partialName}' was not found. The following locations were searched:",
+                "NotFound1",
+                "NotFound2",
+                "NotFound3",
+                "NotFound4");
+            var viewData = new ViewDataDictionary(new TestModelMetadataProvider(), new ModelStateDictionary());
+            var viewContext = GetViewContext();
+
+            var view = Mock.Of<IView>();
+            var viewEngine = new Mock<ICompositeViewEngine>();
+            viewEngine.Setup(v => v.GetView(It.IsAny<string>(), partialName, false))
+                .Returns(ViewEngineResult.NotFound(partialName, new[] { "NotFound1", "NotFound2" }));
+
+            viewEngine.Setup(v => v.FindView(viewContext, partialName, false))
+                .Returns(ViewEngineResult.NotFound(partialName, new[] { $"NotFound3", $"NotFound4" }));
+
+            var tagHelper = new PartialTagHelper(viewEngine.Object, bufferScope)
+            {
+                Name = partialName,
+                ViewContext = viewContext,
+                ViewData = viewData,
+            };
+            var tagHelperContext = GetTagHelperContext();
+            var output = GetTagHelperOutput();
+
+            // Act & Assert
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => tagHelper.ProcessAsync(tagHelperContext, output));
+            Assert.Equal(expected, exception.Message);
+        }
+
+        private static ViewContext GetViewContext()
+        {
+            return new ViewContext(
+                new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor()),
+                NullView.Instance,
+                new ViewDataDictionary(new TestModelMetadataProvider(), new ModelStateDictionary()),
+                Mock.Of<ITempDataDictionary>(),
+                TextWriter.Null,
+                new HtmlHelperOptions());
+        }
+
+        private static TagHelperContext GetTagHelperContext()
+        {
+            return new TagHelperContext(
+                "partial",
+                new TagHelperAttributeList(),
+                new Dictionary<object, object>(),
+                Guid.NewGuid().ToString("N"));
+        }
+
+        private static TagHelperOutput GetTagHelperOutput()
+        {
+            return new TagHelperOutput(
+                "partial",
+                new TagHelperAttributeList(),
+                (_, __) => Task.FromResult<TagHelperContent>(new DefaultTagHelperContent()));
+        }
+
+        private class TestModel
+        {
+            public PropertyModel Property { get; set; }
+        }
+
+        private class PropertyModel
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/RenderAtEndOfFormTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/RenderAtEndOfFormTagHelperTest.cs
new file mode 100644
index 0000000000..03304ab18a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/RenderAtEndOfFormTagHelperTest.cs
@@ -0,0 +1,151 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Razor.Runtime.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    public class RenderAtEndOfFormTagHelperTest
+    {
+        public static TheoryData RenderAtEndOfFormTagHelperData
+        {
+            get
+            {
+                // tagBuilderList, expectedOutput
+                return new TheoryData<List<TagBuilder>, string>
+                {
+                    {
+                        new List<TagBuilder>
+                        {
+                            GetTagBuilder("input", "SomeName", "hidden", "false", TagRenderMode.SelfClosing)
+                        },
+                        @"<input name=""SomeName"" type=""hidden"" value=""false"" />"
+                    },
+                    {
+                        new List<TagBuilder>
+                        {
+                            GetTagBuilder("input", "SomeName", "hidden", "false", TagRenderMode.SelfClosing),
+                            GetTagBuilder("input", "SomeOtherName", "hidden", "false", TagRenderMode.SelfClosing)
+                        },
+                        @"<input name=""SomeName"" type=""hidden"" value=""false"" />" +
+                        @"<input name=""SomeOtherName"" type=""hidden"" value=""false"" />"
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RenderAtEndOfFormTagHelperData))]
+        public async Task Process_AddsHiddenInputTag_FromEndOfFormContent(
+            List<TagBuilder> tagBuilderList,
+            string expectedOutput)
+        {
+            // Arrange
+            var viewContext = new ViewContext();
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "form",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    Assert.True(viewContext.FormContext.CanRenderAtEndOfForm);
+                    foreach (var item in tagBuilderList)
+                    {
+                        viewContext.FormContext.EndOfFormContent.Add(item);
+                    }
+
+                    return Task.FromResult<TagHelperContent>(new DefaultTagHelperContent());
+                });
+
+            var tagHelperContext = new TagHelperContext(
+                "test",
+                new TagHelperAttributeList(),
+                new Dictionary<object, object>(),
+                "someId");
+
+            var tagHelper = new RenderAtEndOfFormTagHelper
+            {
+                ViewContext = viewContext
+            };
+            tagHelper.Init(tagHelperContext);
+
+            // Act
+            await tagHelper.ProcessAsync(context: tagHelperContext, output: tagHelperOutput);
+
+            // Assert
+            Assert.Equal(expectedOutput, tagHelperOutput.PostContent.GetContent());
+        }
+
+        [Theory]
+        [MemberData(nameof(RenderAtEndOfFormTagHelperData))]
+        public async Task Process_AddsHiddenInputTag_FromEndOfFormContent_WithCachedBody(
+            List<TagBuilder> tagBuilderList,
+            string expectedOutput)
+        {
+            // Arrange
+            var viewContext = new ViewContext();
+            var runner = new TagHelperRunner();
+            var tagHelperExecutionContext = new TagHelperExecutionContext(
+                "form",
+                TagMode.StartTagAndEndTag,
+                items: new Dictionary<object, object>(),
+                uniqueId: string.Empty,
+                executeChildContentAsync: () =>
+                {
+                    foreach (var item in tagBuilderList)
+                    {
+                        viewContext.FormContext.EndOfFormContent.Add(item);
+                    }
+
+                    return Task.FromResult(true);
+                },
+                startTagHelperWritingScope: _ => { },
+                endTagHelperWritingScope: () => new DefaultTagHelperContent());
+
+            // This TagHelper will pre-execute the child content forcing the body to be cached.
+            tagHelperExecutionContext.Add(new ChildContentInvoker());
+            tagHelperExecutionContext.Add(new RenderAtEndOfFormTagHelper
+            {
+                ViewContext = viewContext
+            });
+
+            // Act
+            await runner.RunAsync(tagHelperExecutionContext);
+
+            // Assert
+            Assert.Equal(expectedOutput, tagHelperExecutionContext.Output.PostContent.GetContent());
+        }
+
+        private static TagBuilder GetTagBuilder(string tag, string name, string type, string value, TagRenderMode mode)
+        {
+            var tagBuilder = new TagBuilder(tag);
+            tagBuilder.MergeAttribute("name", name);
+            tagBuilder.MergeAttribute("type", type);
+            tagBuilder.MergeAttribute("value", value);
+            tagBuilder.TagRenderMode = mode;
+
+            return tagBuilder;
+        }
+
+        private class ChildContentInvoker : TagHelper
+        {
+            public override int Order
+            {
+                get
+                {
+                    return int.MinValue;
+                }
+            }
+
+            public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+            {
+                await output.GetChildContentAsync();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs
new file mode 100644
index 0000000000..7abb469556
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs
@@ -0,0 +1,990 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.TagHelpers.Internal;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Primitives;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    public class ScriptTagHelperTest
+    {
+        [Theory]
+        [InlineData(null, "test.js", "test.js")]
+        [InlineData("abcd.js", "test.js", "test.js")]
+        [InlineData(null, "~/test.js", "virtualRoot/test.js")]
+        [InlineData("abcd.js", "~/test.js", "virtualRoot/test.js")]
+        public void Process_SrcDefaultsToTagHelperOutputSrcAttributeAddedByOtherTagHelper(
+            string src,
+            string srcOutput,
+            string expectedSrcPrefix)
+        {
+            // Arrange
+            var allAttributes = new TagHelperAttributeList(
+                new TagHelperAttributeList
+                {
+                    { "type", new HtmlString("text/javascript") },
+                    { "asp-append-version", true },
+                });
+            var context = MakeTagHelperContext(allAttributes);
+            var outputAttributes = new TagHelperAttributeList
+                {
+                    { "type", new HtmlString("text/javascript") },
+                    { "src", srcOutput },
+                };
+            var output = MakeTagHelperOutput("script", outputAttributes);
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+            var urlHelper = new Mock<IUrlHelper>();
+
+            // Ensure expanded path does not look like an absolute path on Linux, avoiding
+            // https://github.com/aspnet/External/issues/21
+            urlHelper
+                .Setup(urlhelper => urlhelper.Content(It.IsAny<string>()))
+                .Returns(new Func<string, string>(url => url.Replace("~/", "virtualRoot/")));
+            var urlHelperFactory = new Mock<IUrlHelperFactory>();
+            urlHelperFactory
+                .Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>()))
+                .Returns(urlHelper.Object);
+
+            var helper = new ScriptTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                urlHelperFactory.Object)
+            {
+                ViewContext = viewContext,
+                AppendVersion = true,
+                Src = src,
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal(
+                expectedSrcPrefix + "?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk",
+                (string)output.Attributes["src"].Value,
+                StringComparer.Ordinal);
+        }
+
+        [Theory]
+        [MemberData(nameof(LinkTagHelperTest.MultiAttributeSameNameData), MemberType = typeof(LinkTagHelperTest))]
+        public void HandlesMultipleAttributesSameNameCorrectly(TagHelperAttributeList outputAttributes)
+        {
+            // Arrange
+            var allAttributes = new TagHelperAttributeList(
+                outputAttributes.Concat(
+                    new TagHelperAttributeList
+                    {
+                        new TagHelperAttribute("data-extra", "something"),
+                        new TagHelperAttribute("src", "/blank.js"),
+                        new TagHelperAttribute("asp-fallback-src", "http://www.example.com/blank.js"),
+                        new TagHelperAttribute("asp-fallback-test", "isavailable()"),
+                    }));
+            var tagHelperContext = MakeTagHelperContext(allAttributes);
+            var viewContext = MakeViewContext();
+            var combinedOutputAttributes = new TagHelperAttributeList(
+                outputAttributes.Concat(
+                    new[]
+                    {
+                        new TagHelperAttribute("data-extra", new HtmlString("something"))
+                    }));
+            var output = MakeTagHelperOutput("script", combinedOutputAttributes);
+            var hostingEnvironment = MakeHostingEnvironment();
+
+            var helper = new ScriptTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                ViewContext = viewContext,
+                FallbackSrc = "~/blank.js",
+                FallbackTestExpression = "http://www.example.com/blank.js",
+                Src = "/blank.js",
+            };
+            var expectedAttributes = new TagHelperAttributeList(output.Attributes);
+            expectedAttributes.Add(new TagHelperAttribute("src", "/blank.js"));
+
+            // Act
+            helper.Process(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal(expectedAttributes, output.Attributes);
+        }
+
+        public static TheoryData RunsWhenRequiredAttributesArePresent_Data
+        {
+            get
+            {
+                return new TheoryData<TagHelperAttributeList, Action<ScriptTagHelper>>
+                {
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-fallback-src", "test.js"),
+                            new TagHelperAttribute("asp-fallback-test", "isavailable()")
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.FallbackSrc = "test.js";
+                            tagHelper.FallbackTestExpression = "isavailable()";
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-fallback-src-include", "*.js"),
+                            new TagHelperAttribute("asp-fallback-test", "isavailable()")
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.FallbackSrcInclude = "*.css";
+                            tagHelper.FallbackTestExpression = "isavailable()";
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-fallback-src", "test.js"),
+                            new TagHelperAttribute("asp-fallback-src-include", "*.js"),
+                            new TagHelperAttribute("asp-fallback-test", "isavailable()")
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.FallbackSrc = "test.js";
+                            tagHelper.FallbackSrcInclude = "*.css";
+                            tagHelper.FallbackTestExpression = "isavailable()";
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-fallback-src-include", "*.js"),
+                            new TagHelperAttribute("asp-fallback-src-exclude", "*.min.js"),
+                            new TagHelperAttribute("asp-fallback-test", "isavailable()")
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.FallbackSrcInclude = "*.css";
+                            tagHelper.FallbackSrcExclude = "*.min.css";
+                            tagHelper.FallbackTestExpression = "isavailable()";
+                        }
+                    },
+                    // File Version
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-fallback-src", "test.js"),
+                            new TagHelperAttribute("asp-fallback-test", "isavailable()"),
+                            new TagHelperAttribute("asp-append-version", "true")
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.FallbackSrc = "test.js";
+                            tagHelper.FallbackTestExpression = "isavailable()";
+                            tagHelper.AppendVersion = true;
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-fallback-src-include", "*.js"),
+                            new TagHelperAttribute("asp-fallback-test", "isavailable()"),
+                            new TagHelperAttribute("asp-append-version", "true")
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.FallbackSrcInclude = "*.css";
+                            tagHelper.FallbackTestExpression = "isavailable()";
+                            tagHelper.AppendVersion = true;
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-fallback-src", "test.js"),
+                            new TagHelperAttribute("asp-fallback-src-include", "*.js"),
+                            new TagHelperAttribute("asp-fallback-test", "isavailable()"),
+                            new TagHelperAttribute("asp-append-version", "true")
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.FallbackSrc = "test.js";
+                            tagHelper.FallbackSrcInclude = "*.css";
+                            tagHelper.FallbackTestExpression = "isavailable()";
+                            tagHelper.AppendVersion = true;
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-fallback-src-include", "*.js"),
+                            new TagHelperAttribute("asp-fallback-src-exclude", "*.min.js"),
+                            new TagHelperAttribute("asp-fallback-test", "isavailable()"),
+                            new TagHelperAttribute("asp-append-version", "true")
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.FallbackSrcInclude = "*.css";
+                            tagHelper.FallbackSrcExclude = "*.min.css";
+                            tagHelper.FallbackTestExpression = "isavailable()";
+                            tagHelper.AppendVersion = true;
+                        }
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RunsWhenRequiredAttributesArePresent_Data))]
+        public void RunsWhenRequiredAttributesArePresent(
+            TagHelperAttributeList attributes,
+            Action<ScriptTagHelper> setProperties)
+        {
+            // Arrange
+            var context = MakeTagHelperContext(attributes);
+            var output = MakeTagHelperOutput("script");
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+            var globbingUrlBuilder = new Mock<GlobbingUrlBuilder>(
+                new TestFileProvider(),
+                Mock.Of<IMemoryCache>(),
+                PathString.Empty);
+            globbingUrlBuilder.Setup(g => g.BuildUrlList(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
+                .Returns(new[] { "/common.js" });
+
+            var helper = new ScriptTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                ViewContext = viewContext,
+                GlobbingUrlBuilder = globbingUrlBuilder.Object
+            };
+            setProperties(helper);
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.NotNull(output.TagName);
+            Assert.False(output.IsContentModified);
+            Assert.True(output.PostElement.IsModified);
+        }
+
+        public static TheoryData RunsWhenRequiredAttributesArePresent_NoSrc_Data
+        {
+            get
+            {
+                return new TheoryData<TagHelperAttributeList, Action<ScriptTagHelper>>
+                {
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-src-include", "*.js")
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.SrcInclude = "*.js";
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-src-include", "*.js"),
+                            new TagHelperAttribute("asp-src-exclude", "*.min.js")
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.SrcInclude = "*.js";
+                            tagHelper.SrcExclude = "*.min.js";
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-src-include", "*.js"),
+                            new TagHelperAttribute("asp-append-version", "true")
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.SrcInclude = "*.js";
+                            tagHelper.AppendVersion = true;
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-src-include", "*.js"),
+                            new TagHelperAttribute("asp-src-exclude", "*.min.js"),
+                            new TagHelperAttribute("asp-append-version", "true")
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.SrcInclude = "*.js";
+                            tagHelper.SrcExclude = "*.min.js";
+                            tagHelper.AppendVersion = true;
+                        }
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RunsWhenRequiredAttributesArePresent_NoSrc_Data))]
+        public void RunsWhenRequiredAttributesArePresent_NoSrc(
+            TagHelperAttributeList attributes,
+            Action<ScriptTagHelper> setProperties)
+        {
+            // Arrange
+            var context = MakeTagHelperContext(attributes);
+            var output = MakeTagHelperOutput("script");
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+            var globbingUrlBuilder = new Mock<GlobbingUrlBuilder>(
+                new TestFileProvider(),
+                Mock.Of<IMemoryCache>(),
+                PathString.Empty);
+            globbingUrlBuilder.Setup(g => g.BuildUrlList(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
+                .Returns(new[] { "/common.js" });
+
+            var helper = new ScriptTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                ViewContext = viewContext,
+                GlobbingUrlBuilder = globbingUrlBuilder.Object
+            };
+            setProperties(helper);
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Null(output.TagName);
+            Assert.True(output.IsContentModified);
+            Assert.True(output.Content.GetContent().Length == 0);
+            Assert.True(output.PostElement.IsModified);
+        }
+
+        public static TheoryData DoesNotRunWhenARequiredAttributeIsMissing_Data
+        {
+            get
+            {
+                return new TheoryData<TagHelperAttributeList, Action<ScriptTagHelper>>
+                {
+                    {
+                        new TagHelperAttributeList
+                        {
+                            // This is commented out on purpose: new TagHelperAttribute("asp-src-include", "*.js"),
+                            // Note asp-src-include attribute isn't included.
+                            new TagHelperAttribute("asp-src-exclude", "*.min.js")
+                        },
+                        tagHelper =>
+                        {
+                            // This is commented out on purpose: tagHelper.SrcInclude = "*.js";
+                            tagHelper.SrcExclude = "*.min.js";
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            // This is commented out on purpose: new TagHelperAttribute("asp-fallback-src", "test.js"),
+                            // Note asp-src-include attribute isn't included.
+                            new TagHelperAttribute("asp-fallback-test", "isavailable()"),
+                        },
+                        tagHelper =>
+                        {
+                            // This is commented out on purpose: tagHelper.FallbackSrc = "test.js";
+                            tagHelper.FallbackTestExpression = "isavailable()";
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            new TagHelperAttribute("asp-fallback-src", "test.js"),
+                            // This is commented out on purpose: new TagHelperAttribute("asp-fallback-test", "isavailable()")
+                            // Note asp-src-include attribute isn't included.
+                        },
+                        tagHelper =>
+                        {
+                            tagHelper.FallbackSrc = "test.js";
+                            // This is commented out on purpose: tagHelper.FallbackTestExpression = "isavailable()";
+                        }
+                    },
+                    {
+                        new TagHelperAttributeList
+                        {
+                            // This is commented out on purpose: new TagHelperAttribute("asp-fallback-src-include", "test.js"),
+                            // Note asp-src-include attribute isn't included.
+                            new TagHelperAttribute("asp-fallback-src-exclude", "**/*.min.js"),
+                            new TagHelperAttribute("asp-fallback-test", "isavailable()"),
+                        },
+                        tagHelper =>
+                        {
+                            // This is commented out on purpose: tagHelper.FallbackSrcInclude = "test.js";
+                            tagHelper.FallbackSrcExclude = "**/*.min.js";
+                            tagHelper.FallbackTestExpression = "isavailable()";
+                        }
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(DoesNotRunWhenARequiredAttributeIsMissing_Data))]
+        public void DoesNotRunWhenARequiredAttributeIsMissing(
+            TagHelperAttributeList attributes,
+            Action<ScriptTagHelper> setProperties)
+        {
+            // Arrange
+            var tagHelperContext = MakeTagHelperContext(attributes);
+            var output = MakeTagHelperOutput("script");
+            var logger = new Mock<ILogger<ScriptTagHelper>>();
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+
+            var helper = new ScriptTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                ViewContext = viewContext,
+            };
+            setProperties(helper);
+
+            // Act
+            helper.Process(tagHelperContext, output);
+
+            // Assert
+            Assert.NotNull(output.TagName);
+            Assert.False(output.IsContentModified);
+            Assert.Empty(output.Attributes);
+            Assert.True(output.PostElement.GetContent().Length == 0);
+        }
+
+        [Fact]
+        public void DoesNotRunWhenAllRequiredAttributesAreMissing()
+        {
+            // Arrange
+            var tagHelperContext = MakeTagHelperContext();
+            var viewContext = MakeViewContext();
+            var output = MakeTagHelperOutput("script");
+
+            var helper = new ScriptTagHelper(
+                MakeHostingEnvironment(),
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                ViewContext = viewContext,
+            };
+
+            // Act
+            helper.Process(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal("script", output.TagName);
+            Assert.False(output.IsContentModified);
+            Assert.Empty(output.Attributes);
+            Assert.True(output.PostElement.GetContent().Length == 0);
+        }
+
+        [Fact]
+        public void PreservesOrderOfNonSrcAttributes()
+        {
+            // Arrange
+            var tagHelperContext = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    new TagHelperAttribute("data-extra", "something"),
+                    new TagHelperAttribute("src", "/blank.js"),
+                    new TagHelperAttribute("data-more", "else"),
+                    new TagHelperAttribute("asp-fallback-src", "http://www.example.com/blank.js"),
+                    new TagHelperAttribute("asp-fallback-test", "isavailable()"),
+                });
+
+            var viewContext = MakeViewContext();
+
+            var output = MakeTagHelperOutput("src",
+                attributes: new TagHelperAttributeList
+                {
+                    new TagHelperAttribute("data-extra", "something"),
+                    new TagHelperAttribute("data-more", "else"),
+                });
+
+            var hostingEnvironment = MakeHostingEnvironment();
+
+            var helper = new ScriptTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                ViewContext = viewContext,
+                FallbackSrc = "~/blank.js",
+                FallbackTestExpression = "http://www.example.com/blank.js",
+                Src = "/blank.js",
+            };
+
+            // Act
+            helper.Process(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal("data-extra", output.Attributes[0].Name);
+            Assert.Equal("src", output.Attributes[1].Name);
+            Assert.Equal("data-more", output.Attributes[2].Name);
+        }
+
+        [Fact]
+        public void RendersScriptTagsForGlobbedSrcResults()
+        {
+            // Arrange
+            var expectedContent = "<script src=\"HtmlEncode[[/js/site.js]]\"></script>" +
+                "<script src=\"HtmlEncode[[/common.js]]\"></script>";
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    new TagHelperAttribute("src", "/js/site.js"),
+                    new TagHelperAttribute("asp-src-include", "**/*.js")
+                });
+            var output = MakeTagHelperOutput("script", attributes: new TagHelperAttributeList());
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+            var globbingUrlBuilder = new Mock<GlobbingUrlBuilder>(
+                new TestFileProvider(),
+                Mock.Of<IMemoryCache>(),
+                PathString.Empty);
+            globbingUrlBuilder.Setup(g => g.BuildUrlList(null, "**/*.js", null))
+                .Returns(new[] { "/common.js" });
+
+            var helper = new ScriptTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                GlobbingUrlBuilder = globbingUrlBuilder.Object,
+                ViewContext = viewContext,
+                Src = "/js/site.js",
+                SrcInclude = "**/*.js",
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal("script", output.TagName);
+            Assert.Equal("/js/site.js", output.Attributes["src"].Value);
+            var content = HtmlContentUtilities.HtmlContentToString(output, new HtmlTestEncoder());
+            Assert.Equal(expectedContent, content);
+        }
+
+        [Fact]
+        public void RendersScriptTagsForGlobbedSrcResults_EncodesAsExpected()
+        {
+            // Arrange
+            var expectedContent =
+                "<script encoded='contains \"quotes\"' literal=\"HtmlEncode[[all HTML encoded]]\" " +
+                "mixed='HtmlEncode[[HTML encoded]] and contains \"quotes\"' " +
+                "src=\"HtmlEncode[[/js/site.js]]\"></script>" +
+                "<script encoded='contains \"quotes\"' literal=\"HtmlEncode[[all HTML encoded]]\" " +
+                "mixed='HtmlEncode[[HTML encoded]] and contains \"quotes\"' " +
+                "src=\"HtmlEncode[[/common.js]]\"></script>";
+            var mixed = new DefaultTagHelperContent();
+            mixed.Append("HTML encoded");
+            mixed.AppendHtml(" and contains \"quotes\"");
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "asp-src-include", "**/*.js" },
+                    { new TagHelperAttribute("encoded", new HtmlString("contains \"quotes\""), HtmlAttributeValueStyle.SingleQuotes) },
+                    { "literal", "all HTML encoded" },
+                    { new TagHelperAttribute("mixed", mixed, HtmlAttributeValueStyle.SingleQuotes) },
+                    { "src", "/js/site.js" },
+                });
+            var output = MakeTagHelperOutput(
+                "script",
+                attributes: new TagHelperAttributeList
+                {
+                    { new TagHelperAttribute("encoded", new HtmlString("contains \"quotes\""), HtmlAttributeValueStyle.SingleQuotes) },
+                    { "literal", "all HTML encoded"},
+                    { new TagHelperAttribute("mixed", mixed, HtmlAttributeValueStyle.SingleQuotes) },
+                });
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+            var globbingUrlBuilder = new Mock<GlobbingUrlBuilder>(
+                new TestFileProvider(),
+                Mock.Of<IMemoryCache>(),
+                PathString.Empty);
+            globbingUrlBuilder.Setup(g => g.BuildUrlList(null, "**/*.js", null))
+                .Returns(new[] { "/common.js" });
+
+            var helper = new ScriptTagHelper(
+                hostingEnvironment,
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                GlobbingUrlBuilder = globbingUrlBuilder.Object,
+                Src = "/js/site.js",
+                SrcInclude = "**/*.js",
+                ViewContext = viewContext,
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal("script", output.TagName);
+            Assert.Equal("/js/site.js", output.Attributes["src"].Value);
+            var content = HtmlContentUtilities.HtmlContentToString(output, new HtmlTestEncoder());
+            Assert.Equal(expectedContent, content);
+        }
+
+        [Fact]
+        public void RenderScriptTags_WithFileVersion()
+        {
+            // Arrange
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    new TagHelperAttribute("src", "/js/site.js"),
+                    new TagHelperAttribute("asp-append-version", "true")
+                });
+            var output = MakeTagHelperOutput("script", attributes: new TagHelperAttributeList());
+
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+
+            var helper = new ScriptTagHelper(
+                MakeHostingEnvironment(),
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                ViewContext = viewContext,
+                AppendVersion = true,
+                Src = "/js/site.js",
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal("script", output.TagName);
+            Assert.Equal("/js/site.js?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk", output.Attributes["src"].Value);
+        }
+
+        [Fact]
+        public void RenderScriptTags_WithFileVersion_AndRequestPathBase()
+        {
+            // Arrange
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    new TagHelperAttribute("src", "/bar/js/site.js"),
+                    new TagHelperAttribute("asp-append-version", "true")
+                });
+            var output = MakeTagHelperOutput("script", attributes: new TagHelperAttributeList());
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext("/bar");
+
+            var helper = new ScriptTagHelper(
+                MakeHostingEnvironment(),
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                ViewContext = viewContext,
+                AppendVersion = true,
+                Src = "/bar/js/site.js",
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal("script", output.TagName);
+            Assert.Equal("/bar/js/site.js?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk", output.Attributes["src"].Value);
+        }
+
+        [Fact]
+        public void RenderScriptTags_FallbackSrc_WithFileVersion()
+        {
+            // Arrange
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    new TagHelperAttribute("src", "/js/site.js"),
+                    new TagHelperAttribute("asp-fallback-src-include", "fallback.js"),
+                    new TagHelperAttribute("asp-fallback-test", "isavailable()"),
+                    new TagHelperAttribute("asp-append-version", "true")
+                });
+            var output = MakeTagHelperOutput("script", attributes: new TagHelperAttributeList());
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+
+            var helper = new ScriptTagHelper(
+                MakeHostingEnvironment(),
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                ViewContext = viewContext,
+                FallbackSrc = "fallback.js",
+                FallbackTestExpression = "isavailable()",
+                AppendVersion = true,
+                Src = "/js/site.js",
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal("script", output.TagName);
+            Assert.Equal("/js/site.js?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk", output.Attributes["src"].Value);
+            Assert.Equal(Environment.NewLine + "<script>(isavailable()||document.write(\"JavaScriptEncode[[<script " +
+                "src=\"HtmlEncode[[fallback.js?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk]]\">" +
+                "</script>]]\"));</script>", output.PostElement.GetContent());
+        }
+
+        [Fact]
+        public void RenderScriptTags_FallbackSrc_WithFileVersion_EncodesAsExpected()
+        {
+            // Arrange
+            var expectedContent =
+                "<script encoded='contains \"quotes\"' literal=\"HtmlEncode[[all HTML encoded]]\" " +
+                "mixed='HtmlEncode[[HTML encoded]] and contains \"quotes\"' " +
+                "src=\"HtmlEncode[[/js/site.js?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk]]\"></script>" +
+                Environment.NewLine +
+                "<script>(isavailable()||document.write(\"JavaScriptEncode[[<script encoded=\'contains \"quotes\"\' " +
+                "literal=\"HtmlEncode[[all HTML encoded]]\" mixed=\'HtmlEncode[[HTML encoded]] and contains " +
+                "\"quotes\"' src=\"HtmlEncode[[fallback.js?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk]]\">" +
+                "</script>]]\"));</script>";
+            var mixed = new DefaultTagHelperContent();
+            mixed.Append("HTML encoded");
+            mixed.AppendHtml(" and contains \"quotes\"");
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    { "asp-append-version", "true" },
+                    { "asp-fallback-src-include", "fallback.js" },
+                    { "asp-fallback-test", "isavailable()" },
+                    { new TagHelperAttribute("encoded", new HtmlString("contains \"quotes\""), HtmlAttributeValueStyle.SingleQuotes) },
+                    { "literal", "all HTML encoded" },
+                    { new TagHelperAttribute("mixed", mixed, HtmlAttributeValueStyle.SingleQuotes) },
+                    { "src", "/js/site.js" },
+                });
+            var output = MakeTagHelperOutput(
+                "script",
+                attributes: new TagHelperAttributeList
+                {
+                    { new TagHelperAttribute("encoded", new HtmlString("contains \"quotes\""), HtmlAttributeValueStyle.SingleQuotes) },
+                    { "literal", "all HTML encoded" },
+                    { new TagHelperAttribute("mixed", mixed, HtmlAttributeValueStyle.SingleQuotes) },
+                });
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+
+            var helper = new ScriptTagHelper(
+                MakeHostingEnvironment(),
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                AppendVersion = true,
+                FallbackSrc = "fallback.js",
+                FallbackTestExpression = "isavailable()",
+                Src = "/js/site.js",
+                ViewContext = viewContext,
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal("script", output.TagName);
+            Assert.Equal("/js/site.js?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk", output.Attributes["src"].Value);
+            var content = HtmlContentUtilities.HtmlContentToString(output, new HtmlTestEncoder());
+            Assert.Equal(expectedContent, content);
+        }
+
+        [Fact]
+        public void RenderScriptTags_GlobbedSrc_WithFileVersion()
+        {
+            // Arrange
+            var expectedContent = "<script " +
+                "src=\"HtmlEncode[[/js/site.js?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk]]\"></script>" +
+                "<script src=\"HtmlEncode[[/common.js?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk]]\"></script>";
+            var context = MakeTagHelperContext(
+                attributes: new TagHelperAttributeList
+                {
+                    new TagHelperAttribute("src", "/js/site.js"),
+                    new TagHelperAttribute("asp-src-include", "*.js"),
+                    new TagHelperAttribute("asp-append-version", "true")
+                });
+            var output = MakeTagHelperOutput("script", attributes: new TagHelperAttributeList());
+            var hostingEnvironment = MakeHostingEnvironment();
+            var viewContext = MakeViewContext();
+            var globbingUrlBuilder = new Mock<GlobbingUrlBuilder>(
+                new TestFileProvider(),
+                Mock.Of<IMemoryCache>(),
+                PathString.Empty);
+            globbingUrlBuilder.Setup(g => g.BuildUrlList(null, "*.js", null))
+                .Returns(new[] { "/common.js" });
+
+            var helper = new ScriptTagHelper(
+                MakeHostingEnvironment(),
+                MakeCache(),
+                new HtmlTestEncoder(),
+                new JavaScriptTestEncoder(),
+                MakeUrlHelperFactory())
+            {
+                GlobbingUrlBuilder = globbingUrlBuilder.Object,
+                ViewContext = viewContext,
+                SrcInclude = "*.js",
+                AppendVersion = true,
+                Src = "/js/site.js",
+            };
+
+            // Act
+            helper.Process(context, output);
+
+            // Assert
+            Assert.Equal("script", output.TagName);
+            Assert.Equal("/js/site.js?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk", output.Attributes["src"].Value);
+            var content = HtmlContentUtilities.HtmlContentToString(output, new HtmlTestEncoder());
+            Assert.Equal(expectedContent, content);
+        }
+
+        private TagHelperContext MakeTagHelperContext(
+            TagHelperAttributeList attributes = null,
+            string content = null)
+        {
+            attributes = attributes ?? new TagHelperAttributeList();
+
+            return new TagHelperContext(
+                tagName: "script",
+                allAttributes: attributes,
+                items: new Dictionary<object, object>(),
+                uniqueId: Guid.NewGuid().ToString("N"));
+        }
+
+        private static ViewContext MakeViewContext(string requestPathBase = null)
+        {
+            var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+            if (requestPathBase != null)
+            {
+                actionContext.HttpContext.Request.PathBase = new Http.PathString(requestPathBase);
+            }
+
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var viewData = new ViewDataDictionary(metadataProvider, new ModelStateDictionary());
+            var viewContext = new ViewContext(
+                actionContext,
+                Mock.Of<IView>(),
+                viewData,
+                Mock.Of<ITempDataDictionary>(),
+                TextWriter.Null,
+                new HtmlHelperOptions());
+
+            return viewContext;
+        }
+
+        private TagHelperOutput MakeTagHelperOutput(string tagName, TagHelperAttributeList attributes = null)
+        {
+            attributes = attributes ?? new TagHelperAttributeList();
+
+            return new TagHelperOutput(
+                tagName,
+                attributes,
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+        }
+
+        private static IHostingEnvironment MakeHostingEnvironment()
+        {
+            var emptyDirectoryContents = new Mock<IDirectoryContents>();
+            emptyDirectoryContents.Setup(dc => dc.GetEnumerator())
+                .Returns(Enumerable.Empty<IFileInfo>().GetEnumerator());
+            var mockFile = new Mock<IFileInfo>();
+            mockFile.SetupGet(f => f.Exists).Returns(true);
+            mockFile
+                .Setup(m => m.CreateReadStream())
+                .Returns(() => new MemoryStream(Encoding.UTF8.GetBytes("Hello World!")));
+            var mockFileProvider = new Mock<IFileProvider>();
+            mockFileProvider.Setup(fp => fp.GetDirectoryContents(It.IsAny<string>()))
+                .Returns(emptyDirectoryContents.Object);
+            mockFileProvider.Setup(fp => fp.GetFileInfo(It.IsAny<string>()))
+                .Returns(mockFile.Object);
+            mockFileProvider.Setup(fp => fp.Watch(It.IsAny<string>()))
+                .Returns(new TestFileChangeToken());
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.Setup(h => h.WebRootFileProvider).Returns(mockFileProvider.Object);
+
+            return hostingEnvironment.Object;
+        }
+
+        private static IMemoryCache MakeCache() => new MemoryCache(new MemoryCacheOptions());
+
+        private static IUrlHelperFactory MakeUrlHelperFactory()
+        {
+            var urlHelper = new Mock<IUrlHelper>();
+
+            urlHelper
+                .Setup(helper => helper.Content(It.IsAny<string>()))
+                .Returns(new Func<string, string>(url => url));
+
+            var urlHelperFactory = new Mock<IUrlHelperFactory>();
+            urlHelperFactory
+                .Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>()))
+                .Returns(urlHelper.Object);
+
+            return urlHelperFactory.Object;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/SelectTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/SelectTagHelperTest.cs
new file mode 100644
index 0000000000..dd41bb306b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/SelectTagHelperTest.cs
@@ -0,0 +1,860 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TagHelpers.Internal;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    public class SelectTagHelperTest
+    {
+        // Model (List<Model> or Model instance), container type (Model or NestModel), model accessor,
+        // property path / id, expected content.
+        public static TheoryData<object, Type, Func<object>, NameAndId, string> GeneratesExpectedDataSet
+        {
+            get
+            {
+                var modelWithNull = new Model
+                {
+                    NestedModel = new NestedModel
+                    {
+                        Text = null,
+                    },
+                    Text = null,
+                };
+                var modelWithText = new Model
+                {
+                    NestedModel = new NestedModel
+                    {
+                        Text = "inner text",
+                    },
+                    Text = "outer text",
+                };
+                var models = new List<Model>
+                {
+                    modelWithNull,
+                    modelWithText,
+                };
+                var noneSelected = "<option></option>" + Environment.NewLine +
+                    "<option>HtmlEncode[[outer text]]</option>" + Environment.NewLine +
+                    "<option>HtmlEncode[[inner text]]</option>" + Environment.NewLine +
+                    "<option>HtmlEncode[[other text]]</option>" + Environment.NewLine;
+                var innerSelected = "<option></option>" + Environment.NewLine +
+                    "<option>HtmlEncode[[outer text]]</option>" + Environment.NewLine +
+                    "<option selected=\"HtmlEncode[[selected]]\">HtmlEncode[[inner text]]</option>" + Environment.NewLine +
+                    "<option>HtmlEncode[[other text]]</option>" + Environment.NewLine;
+                var outerSelected = "<option></option>" + Environment.NewLine +
+                    "<option selected=\"HtmlEncode[[selected]]\">HtmlEncode[[outer text]]</option>" + Environment.NewLine +
+                    "<option>HtmlEncode[[inner text]]</option>" + Environment.NewLine +
+                    "<option>HtmlEncode[[other text]]</option>" + Environment.NewLine;
+
+                return new TheoryData<object, Type, Func<object>, NameAndId, string>
+                {
+                    { null, typeof(Model), () => null, new NameAndId("Text", "Text"), noneSelected },
+
+                    // Imitate a temporary variable set from somewhere else in the view model.
+                    { null, typeof(Model), () => modelWithText.NestedModel.Text,
+                        new NameAndId("item.Text", "item_Text"), innerSelected },
+
+                    { modelWithNull, typeof(Model), () => modelWithNull.Text,
+                        new NameAndId("Text", "Text"), noneSelected },
+                    { modelWithText, typeof(Model), () => modelWithText.Text,
+                        new NameAndId("Text", "Text"), outerSelected },
+
+                    { modelWithNull, typeof(NestedModel), () => modelWithNull.NestedModel.Text,
+                        new NameAndId("NestedModel.Text", "NestedModel_Text"), noneSelected },
+                    { modelWithText, typeof(NestedModel), () => modelWithText.NestedModel.Text,
+                        new NameAndId("NestedModel.Text", "NestedModel_Text"), innerSelected },
+
+                    { models, typeof(Model), () => models[0].Text,
+                        new NameAndId("[0].Text", "z0__Text"), noneSelected },
+                    { models, typeof(NestedModel), () => models[0].NestedModel.Text,
+                        new NameAndId("[0].NestedModel.Text", "z0__NestedModel_Text"), noneSelected },
+
+                    { models, typeof(Model), () => models[1].Text,
+                        new NameAndId("[1].Text", "z1__Text"), outerSelected },
+                    { models, typeof(NestedModel), () => models[1].NestedModel.Text,
+                        new NameAndId("[1].NestedModel.Text", "z1__NestedModel_Text"), innerSelected },
+                };
+            }
+        }
+
+        // Items property value, attribute name, attribute value, expected items value (passed to generator). Provides
+        // cross product of Items and attributes. These values should not interact.
+        public static TheoryData<IEnumerable<SelectListItem>, string, string, IEnumerable<SelectListItem>>
+            ItemsAndMultipleDataSet
+        {
+            get
+            {
+                var arrayItems = new[] { new SelectListItem() };
+                var listItems = new List<SelectListItem>();
+                var multiItems = new MultiSelectList(Enumerable.Range(0, 5));
+                var selectItems = new SelectList(Enumerable.Range(0, 5));
+                var itemsData = new[]
+                {
+                    new[] { (IEnumerable<SelectListItem>)null, Enumerable.Empty<SelectListItem>() },
+                    new[] { arrayItems, arrayItems },
+                    new[] { listItems, listItems },
+                    new[] { multiItems, multiItems },
+                    new[] { selectItems, selectItems },
+                };
+                var attributeData = new Dictionary<string, string>(StringComparer.Ordinal)
+                {
+                    // SelectTagHelper ignores all "multiple" attribute values.
+                    { "multiple", null },
+                    { "mUltiple", string.Empty },
+                    { "muLtiple", "true" },
+                    { "Multiple", "false" },
+                    { "MUltiple", "multiple" },
+                    { "MuLtiple", "Multiple" },
+                    { "mUlTiPlE", "mUlTiPlE" },
+                    { "mULTiPlE", "MULTIPLE" },
+                    { "mUlTIPlE", "Invalid" },
+                    { "MULTiPLE", "0" },
+                    { "MUlTIPLE", "1" },
+                    { "MULTIPLE", "__true" },
+                    // SelectTagHelper also ignores non-"multiple" attributes.
+                    { "multiple_", "multiple" },
+                    { "not-multiple", "multiple" },
+                    { "__multiple", "multiple" },
+                };
+
+                var theoryData =
+                    new TheoryData<IEnumerable<SelectListItem>, string, string, IEnumerable<SelectListItem>>();
+                foreach (var items in itemsData)
+                {
+                    foreach (var attribute in attributeData)
+                    {
+                        theoryData.Add(items[0], attribute.Key, attribute.Value, items[1]);
+                    }
+                }
+
+                return theoryData;
+            }
+        }
+
+        // Model type, model, allowMultiple expected value
+        public static TheoryData<Type, object, bool> RealModelTypeDataSet
+        {
+            get
+            {
+                return new TheoryData<Type, object, bool>
+                {
+                    { typeof(object), string.Empty, false },
+                    { typeof(string), null, false },
+                    { typeof(int?), null, false },
+                    { typeof(int), 23, false },
+                    { typeof(IEnumerable), null, true },
+                    { typeof(IEnumerable<string>), null, true },
+                    { typeof(List<int>), null, true },
+                    { typeof(object), new[] { "", "", "" }, true },
+                    { typeof(object), new List<string>(), true },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(GeneratesExpectedDataSet))]
+        public async Task ProcessAsync_GeneratesExpectedOutput(
+            object model,
+            Type containerType,
+            Func<object> modelAccessor,
+            NameAndId nameAndId,
+            string ignored)
+        {
+            // Arrange
+            var originalAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+            };
+            var originalPostContent = "original content";
+
+            var expectedAttributes = new TagHelperAttributeList(originalAttributes)
+            {
+                { "id", nameAndId.Id },
+                { "name", nameAndId.Name },
+                { "valid", "from validation attributes" },
+            };
+            var expectedPreContent = "original pre-content";
+            var expectedContent = "original content";
+            var expectedPostContent = originalPostContent;
+            var expectedTagName = "not-select";
+
+            var metadataProvider = new TestModelMetadataProvider();
+            var containerMetadata = metadataProvider.GetMetadataForType(containerType);
+            var containerExplorer = metadataProvider.GetModelExplorerForType(containerType, model);
+
+            var propertyMetadata = metadataProvider.GetMetadataForProperty(containerType, "Text");
+            var modelExplorer = containerExplorer.GetExplorerForExpression(propertyMetadata, modelAccessor());
+
+            var modelExpression = new ModelExpression(nameAndId.Name, modelExplorer);
+
+            var tagHelperContext = new TagHelperContext(
+                tagName: "select",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                originalAttributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                })
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+            output.PreContent.SetContent(expectedPreContent);
+            output.Content.SetContent(expectedContent);
+            output.PostContent.SetContent(originalPostContent);
+
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider)
+            {
+                ValidationAttributes =
+                {
+                    {  "valid", "from validation attributes" },
+                }
+            };
+            var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator, metadataProvider);
+            var tagHelper = new SelectTagHelper(htmlGenerator)
+            {
+                For = modelExpression,
+                ViewContext = viewContext,
+            };
+
+            // Act
+            tagHelper.Init(tagHelperContext);
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal(TagMode.SelfClosing, output.TagMode);
+            Assert.Equal(expectedAttributes, output.Attributes);
+            Assert.Equal(expectedPreContent, output.PreContent.GetContent());
+            Assert.Equal(expectedContent, output.Content.GetContent());
+            Assert.Equal(expectedPostContent, output.PostContent.GetContent());
+            Assert.Equal(expectedTagName, output.TagName);
+
+            Assert.Single(
+                tagHelperContext.Items,
+                entry => (Type)entry.Key == typeof(SelectTagHelper));
+        }
+
+        [Theory]
+        [MemberData(nameof(GeneratesExpectedDataSet))]
+        public async Task ProcessAsync_WithItems_GeneratesExpectedOutput_DoesNotChangeSelectList(
+            object model,
+            Type containerType,
+            Func<object> modelAccessor,
+            NameAndId nameAndId,
+            string expectedOptions)
+        {
+            // Arrange
+            var originalAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+            };
+            var originalPostContent = "original content";
+
+            var expectedAttributes = new TagHelperAttributeList(originalAttributes)
+            {
+                { "id", nameAndId.Id },
+                { "name", nameAndId.Name },
+                { "valid", "from validation attributes" },
+            };
+            var expectedPreContent = "original pre-content";
+            var expectedContent = "original content";
+            var expectedPostContent = originalPostContent + expectedOptions;
+            var expectedTagName = "select";
+
+            var metadataProvider = new TestModelMetadataProvider();
+
+            var containerMetadata = metadataProvider.GetMetadataForType(containerType);
+            var containerExplorer = metadataProvider.GetModelExplorerForType(containerType, model);
+
+            var propertyMetadata = metadataProvider.GetMetadataForProperty(containerType, "Text");
+            var modelExplorer = containerExplorer.GetExplorerForExpression(propertyMetadata, modelAccessor());
+
+            var modelExpression = new ModelExpression(nameAndId.Name, modelExplorer);
+
+            var tagHelperContext = new TagHelperContext(
+                tagName: "select",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                originalAttributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.AppendHtml("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                })
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+            output.PreContent.AppendHtml(expectedPreContent);
+            output.Content.AppendHtml(expectedContent);
+            output.PostContent.AppendHtml(originalPostContent);
+
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider)
+            {
+                ValidationAttributes =
+                {
+                    {  "valid", "from validation attributes" },
+                }
+            };
+            var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator, metadataProvider);
+
+            var items = new SelectList(new[] { "", "outer text", "inner text", "other text" });
+            var savedDisabled = items.Select(item => item.Disabled).ToList();
+            var savedGroup = items.Select(item => item.Group).ToList();
+            var savedSelected = items.Select(item => item.Selected).ToList();
+            var savedText = items.Select(item => item.Text).ToList();
+            var savedValue = items.Select(item => item.Value).ToList();
+
+            var tagHelper = new SelectTagHelper(htmlGenerator)
+            {
+                For = modelExpression,
+                Items = items,
+                ViewContext = viewContext,
+            };
+
+            // Act
+            tagHelper.Init(tagHelperContext);
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal(TagMode.SelfClosing, output.TagMode);
+            Assert.Equal(expectedAttributes, output.Attributes);
+            Assert.Equal(expectedPreContent, output.PreContent.GetContent());
+            Assert.Equal(expectedContent, output.Content.GetContent());
+            Assert.Equal(expectedPostContent, HtmlContentUtilities.HtmlContentToString(output.PostContent));
+            Assert.Equal(expectedTagName, output.TagName);
+
+            Assert.Single(
+                tagHelperContext.Items,
+                entry => (Type)entry.Key == typeof(SelectTagHelper));
+
+            Assert.Equal(savedDisabled, items.Select(item => item.Disabled));
+            Assert.Equal(savedGroup, items.Select(item => item.Group));
+            Assert.Equal(savedSelected, items.Select(item => item.Selected));
+            Assert.Equal(savedText, items.Select(item => item.Text));
+            Assert.Equal(savedValue, items.Select(item => item.Value));
+        }
+
+        [Fact]
+        public async Task ProcessAsync_WithItems_AndNoModelExpression_GeneratesExpectedOutput()
+        {
+            // Arrange
+            var originalAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+            };
+            var originalPostContent = "original content";
+
+            var expectedAttributes = new TagHelperAttributeList(originalAttributes);
+            var selectItems = new SelectList(Enumerable.Range(0, 5));
+            var expectedOptions = "<option>HtmlEncode[[0]]</option>" + Environment.NewLine
+                + "<option>HtmlEncode[[1]]</option>" + Environment.NewLine
+                + "<option>HtmlEncode[[2]]</option>" + Environment.NewLine
+                + "<option>HtmlEncode[[3]]</option>" + Environment.NewLine
+                + "<option>HtmlEncode[[4]]</option>" + Environment.NewLine;
+
+            var expectedPreContent = "original pre-content";
+            var expectedContent = "original content";
+            var expectedPostContent = originalPostContent + expectedOptions;
+            var expectedTagName = "select";
+
+            var tagHelperContext = new TagHelperContext(
+                tagName: "select",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                originalAttributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.AppendHtml("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                })
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+            output.PreContent.AppendHtml(expectedPreContent);
+            output.Content.AppendHtml(expectedContent);
+            output.PostContent.AppendHtml(originalPostContent);
+
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+            var viewContext = TestableHtmlGenerator.GetViewContext(
+                model: null,
+                htmlGenerator: htmlGenerator,
+                metadataProvider: metadataProvider);
+
+            var tagHelper = new SelectTagHelper(htmlGenerator)
+            {
+                Items = selectItems,
+                ViewContext = viewContext,
+            };
+
+            // Act
+            tagHelper.Init(tagHelperContext);
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal(TagMode.SelfClosing, output.TagMode);
+            Assert.Equal(expectedAttributes, output.Attributes);
+            Assert.Equal(expectedPreContent, output.PreContent.GetContent());
+            Assert.Equal(expectedContent, output.Content.GetContent());
+            Assert.Equal(expectedPostContent, HtmlContentUtilities.HtmlContentToString(output.PostContent));
+            Assert.Equal(expectedTagName, output.TagName);
+
+            var kvp = Assert.Single(tagHelperContext.Items);
+            Assert.Equal(typeof(SelectTagHelper), kvp.Key);
+            Assert.Null(kvp.Value);
+        }
+
+        [Theory]
+        [MemberData(nameof(GeneratesExpectedDataSet))]
+        public async Task ProcessAsyncInTemplate_WithItems_GeneratesExpectedOutput_DoesNotChangeSelectList(
+            object model,
+            Type containerType,
+            Func<object> modelAccessor,
+            NameAndId nameAndId,
+            string expectedOptions)
+        {
+            // Arrange
+            var originalAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+            };
+            var originalPostContent = "original content";
+
+            var expectedAttributes = new TagHelperAttributeList(originalAttributes)
+            {
+                { "id", nameAndId.Id },
+                { "name", nameAndId.Name },
+                { "valid", "from validation attributes" },
+            };
+            var expectedPreContent = "original pre-content";
+            var expectedContent = "original content";
+            var expectedPostContent = originalPostContent + expectedOptions;
+            var expectedTagName = "select";
+
+            var metadataProvider = new TestModelMetadataProvider();
+
+            var containerMetadata = metadataProvider.GetMetadataForType(containerType);
+            var containerExplorer = metadataProvider.GetModelExplorerForType(containerType, model);
+
+            var propertyMetadata = metadataProvider.GetMetadataForProperty(containerType, "Text");
+            var modelExplorer = containerExplorer.GetExplorerForExpression(propertyMetadata, modelAccessor());
+
+            var modelExpression = new ModelExpression(name: string.Empty, modelExplorer: modelExplorer);
+
+            var tagHelperContext = new TagHelperContext(
+                tagName: "select",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                originalAttributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.AppendHtml("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                })
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+            output.PreContent.AppendHtml(expectedPreContent);
+            output.Content.AppendHtml(expectedContent);
+            output.PostContent.AppendHtml(originalPostContent);
+
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider)
+            {
+                ValidationAttributes =
+                {
+                    {  "valid", "from validation attributes" },
+                }
+            };
+            var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator, metadataProvider);
+            viewContext.ViewData.TemplateInfo.HtmlFieldPrefix = nameAndId.Name;
+
+            var items = new SelectList(new[] { "", "outer text", "inner text", "other text" });
+            var savedDisabled = items.Select(item => item.Disabled).ToList();
+            var savedGroup = items.Select(item => item.Group).ToList();
+            var savedSelected = items.Select(item => item.Selected).ToList();
+            var savedText = items.Select(item => item.Text).ToList();
+            var savedValue = items.Select(item => item.Value).ToList();
+            var tagHelper = new SelectTagHelper(htmlGenerator)
+            {
+                For = modelExpression,
+                Items = items,
+                ViewContext = viewContext,
+            };
+
+            // Act
+            tagHelper.Init(tagHelperContext);
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal(TagMode.SelfClosing, output.TagMode);
+            Assert.Equal(expectedAttributes, output.Attributes);
+            Assert.Equal(expectedPreContent, output.PreContent.GetContent());
+            Assert.Equal(expectedContent, output.Content.GetContent());
+            Assert.Equal(expectedPostContent, HtmlContentUtilities.HtmlContentToString(output.PostContent));
+            Assert.Equal(expectedTagName, output.TagName);
+
+            Assert.Single(
+                tagHelperContext.Items,
+                entry => (Type)entry.Key == typeof(SelectTagHelper));
+
+            Assert.Equal(savedDisabled, items.Select(item => item.Disabled));
+            Assert.Equal(savedGroup, items.Select(item => item.Group));
+            Assert.Equal(savedSelected, items.Select(item => item.Selected));
+            Assert.Equal(savedText, items.Select(item => item.Text));
+            Assert.Equal(savedValue, items.Select(item => item.Value));
+        }
+
+        [Theory]
+        [MemberData(nameof(ItemsAndMultipleDataSet))]
+        public async Task ProcessAsync_CallsGeneratorWithExpectedValues_ItemsAndAttribute(
+            IEnumerable<SelectListItem> inputItems,
+            string attributeName,
+            string attributeValue,
+            IEnumerable<SelectListItem> expectedItems)
+        {
+            // Arrange
+            var contextAttributes = new TagHelperAttributeList
+            {
+                // Provided for completeness. Select tag helper does not confirm AllAttributes set is consistent.
+                { attributeName, attributeValue },
+            };
+            var originalAttributes = new TagHelperAttributeList
+            {
+                { attributeName, attributeValue },
+            };
+            var propertyName = "Property1";
+            var expectedTagName = "select";
+
+            var tagHelperContext = new TagHelperContext(
+                tagName: "select",
+                allAttributes: contextAttributes,
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            var output = new TagHelperOutput(
+                expectedTagName,
+                originalAttributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            var metadataProvider = new EmptyModelMetadataProvider();
+            string model = null;
+            var modelExplorer = metadataProvider.GetModelExplorerForType(typeof(string), model);
+
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator.Object, metadataProvider);
+
+            // Simulate a (model => model) scenario. E.g. the calling helper may appear in a low-level template.
+            var modelExpression = new ModelExpression(string.Empty, modelExplorer);
+            viewContext.ViewData.TemplateInfo.HtmlFieldPrefix = propertyName;
+
+            var currentValues = new string[0];
+            htmlGenerator
+                .Setup(real => real.GetCurrentValues(
+                    viewContext,
+                    modelExplorer,
+                    string.Empty,   // expression
+                    false))         // allowMultiple
+                .Returns(currentValues)
+                .Verifiable();
+            htmlGenerator
+                .Setup(real => real.GenerateSelect(
+                    viewContext,
+                    modelExplorer,
+                    null,           // optionLabel
+                    string.Empty,   // expression
+                    expectedItems,
+                    currentValues,
+                    false,          // allowMultiple
+                    null))          // htmlAttributes
+                .Returns((TagBuilder)null)
+                .Verifiable();
+
+            var tagHelper = new SelectTagHelper(htmlGenerator.Object)
+            {
+                For = modelExpression,
+                Items = inputItems,
+                ViewContext = viewContext,
+            };
+
+            // Act
+            tagHelper.Init(tagHelperContext);
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            htmlGenerator.Verify();
+
+            var keyValuePair = Assert.Single(
+                tagHelperContext.Items,
+                entry => (Type)entry.Key == typeof(SelectTagHelper));
+            var actualCurrentValues = Assert.IsType<CurrentValues>(keyValuePair.Value);
+            Assert.Same(currentValues, actualCurrentValues.Values);
+        }
+
+        [Theory]
+        [MemberData(nameof(RealModelTypeDataSet))]
+        public async Task TagHelper_CallsGeneratorWithExpectedValues_RealModelType(
+            Type modelType,
+            object model,
+            bool allowMultiple)
+        {
+            // Arrange
+            var contextAttributes = new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>());
+            var originalAttributes = new TagHelperAttributeList();
+            var propertyName = "Property1";
+            var tagName = "select";
+
+            var tagHelperContext = new TagHelperContext(
+                tagName: "select",
+                allAttributes: contextAttributes,
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                tagName,
+                originalAttributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var modelExplorer = metadataProvider.GetModelExplorerForType(modelType, model);
+            var modelExpression = new ModelExpression(propertyName, modelExplorer);
+
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator.Object, metadataProvider);
+            var currentValues = new string[0];
+            htmlGenerator
+                .Setup(real => real.GetCurrentValues(
+                    viewContext,
+                    modelExplorer,
+                    propertyName,   // expression
+                    allowMultiple))
+                .Returns(currentValues)
+                .Verifiable();
+            htmlGenerator
+                .Setup(real => real.GenerateSelect(
+                    viewContext,
+                    modelExplorer,
+                    null,           // optionLabel
+                    propertyName,   // expression
+                    It.IsAny<IEnumerable<SelectListItem>>(),
+                    currentValues,
+                    allowMultiple,
+                    null))          // htmlAttributes
+                .Returns((TagBuilder)null)
+                .Verifiable();
+
+            var tagHelper = new SelectTagHelper(htmlGenerator.Object)
+            {
+                For = modelExpression,
+                ViewContext = viewContext,
+            };
+
+            // Act
+            tagHelper.Init(tagHelperContext);
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            htmlGenerator.Verify();
+
+            var keyValuePair = Assert.Single(
+                tagHelperContext.Items,
+                entry => (Type)entry.Key == typeof(SelectTagHelper));
+            var actualCurrentValues = Assert.IsType<CurrentValues>(keyValuePair.Value);
+            Assert.Same(currentValues, actualCurrentValues.Values);
+        }
+
+        [Fact]
+        public void Process_WithEmptyForName_Throws()
+        {
+            // Arrange
+            var expectedMessage = "The name of an HTML field cannot be null or empty. Instead use methods " +
+                "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper.Editor or Microsoft.AspNetCore.Mvc.Rendering." +
+                "IHtmlHelper`1.EditorFor with a non-empty htmlFieldName argument value.";
+            var expectedTagName = "select";
+
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+            var model = "model-value";
+            var modelExplorer = metadataProvider.GetModelExplorerForType(typeof(string), model);
+            var modelExpression = new ModelExpression(name: string.Empty, modelExplorer: modelExplorer);
+            var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator, metadataProvider);
+            var tagHelper = new SelectTagHelper(htmlGenerator)
+            {
+                For = modelExpression,
+                ViewContext = viewContext,
+            };
+
+            var context = new TagHelperContext(new TagHelperAttributeList(), new Dictionary<object, object>(), "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                new TagHelperAttributeList(),
+                (_, __) => Task.FromResult<TagHelperContent>(new DefaultTagHelperContent()));
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => tagHelper.Process(context, output),
+                paramName: "expression",
+                exceptionMessage: expectedMessage);
+        }
+
+        [Fact]
+        public void Process_WithEmptyForName_DoesNotThrow_WithName()
+        {
+            // Arrange
+            var expectedAttributeValue = "-expression-";
+            var expectedTagName = "select";
+
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+            var model = "model-value";
+            var modelExplorer = metadataProvider.GetModelExplorerForType(typeof(string), model);
+            var modelExpression = new ModelExpression(name: string.Empty, modelExplorer: modelExplorer);
+            var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator, metadataProvider);
+            var tagHelper = new SelectTagHelper(htmlGenerator)
+            {
+                For = modelExpression,
+                Name = expectedAttributeValue,
+                ViewContext = viewContext,
+            };
+
+            var attributes = new TagHelperAttributeList
+            {
+                { "name", expectedAttributeValue },
+            };
+
+            var context = new TagHelperContext(attributes, new Dictionary<object, object>(), "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                new TagHelperAttributeList(),
+                (_, __) => Task.FromResult<TagHelperContent>(new DefaultTagHelperContent()));
+
+            // Act
+            tagHelper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedTagName, output.TagName);
+            Assert.False(output.IsContentModified);
+
+            var attribute = Assert.Single(output.Attributes);
+            Assert.Equal("name", attribute.Name);
+            Assert.Equal(expectedAttributeValue, attribute.Value);
+        }
+
+        [Fact]
+        public void Process_PassesNameThrough_EvenIfNullFor()
+        {
+            // Arrange
+            var expectedAttributeValue = "-expression-";
+            var expectedTagName = "span";
+
+            var selectList = Array.Empty<SelectListItem>();
+            var generator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            generator
+                .Setup(gen => gen.GenerateGroupsAndOptions(/* optionLabel: */ null, selectList))
+                .Returns(HtmlString.Empty)
+                .Verifiable();
+
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var viewContext = TestableHtmlGenerator.GetViewContext(
+                model: null,
+                htmlGenerator: generator.Object,
+                metadataProvider: metadataProvider);
+
+            var tagHelper = new SelectTagHelper(generator.Object)
+            {
+                Items = selectList,
+                Name = expectedAttributeValue,
+                ViewContext = viewContext,
+            };
+
+            var attributes = new TagHelperAttributeList
+            {
+                { "name", expectedAttributeValue },
+            };
+
+            var tagHelperContext = new TagHelperContext(attributes, new Dictionary<object, object>(), "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                new TagHelperAttributeList(),
+                (_, __) => Task.FromResult<TagHelperContent>(new DefaultTagHelperContent()));
+
+            // Act
+            tagHelper.Process(tagHelperContext, output);
+
+            // Assert
+            generator.VerifyAll();
+            Assert.Equal(expectedTagName, output.TagName);
+            var attribute = Assert.Single(output.Attributes);
+            Assert.Equal("name", attribute.Name);
+            Assert.Equal(expectedAttributeValue, attribute.Value);
+        }
+
+        public class NameAndId
+        {
+            public NameAndId(string name, string id)
+            {
+                Name = name;
+                Id = id;
+            }
+
+            public string Name { get; private set; }
+
+            public string Id { get; private set; }
+        }
+
+        private class Model
+        {
+            public string Text { get; set; }
+
+            public NestedModel NestedModel { get; set; }
+        }
+
+        private class NestedModel
+        {
+            public string Text { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TagHelperLogger.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TagHelperLogger.cs
new file mode 100644
index 0000000000..9e074fbffb
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TagHelperLogger.cs
@@ -0,0 +1,41 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    public class TagHelperLogger<T> : ILogger<T>
+    {
+        public List<LoggerData> Logged { get; } = new List<LoggerData>();
+
+        public IDisposable BeginScope<TState>(TState state)
+        {
+            return null;
+        }
+
+        public bool IsEnabled(LogLevel logLevel)
+        {
+            return true;
+        }
+
+        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
+        {
+            Logged.Add(new LoggerData(logLevel, state));
+        }
+
+        public class LoggerData
+        {
+            public LoggerData(LogLevel logLevel, object state)
+            {
+                LogLevel = logLevel;
+                State = state;
+            }
+
+            public LogLevel LogLevel { get; set; }
+            public object State { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TagHelperOutputExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TagHelperOutputExtensionsTest.cs
new file mode 100644
index 0000000000..2c1cc87c07
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TagHelperOutputExtensionsTest.cs
@@ -0,0 +1,1154 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers.Testing;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    public class TagHelperOutputExtensionsTest
+    {
+        public static TheoryData CopyHtmlAttributeData_MaintainsOrder
+        {
+            get
+            {
+                // attributeNameToCopy, outputAttributes, allAttributes, expectedAttributes
+                return new TheoryData<
+                    string,
+                    TagHelperAttributeList,
+                    TagHelperAttributeList,
+                    IEnumerable<TagHelperAttribute>>
+                {
+                    {
+                        "first",
+                        new TagHelperAttributeList
+                        {
+                            { "second", "B" },
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "first", "A" },
+                            { "second", "B" }
+                        },
+                        new[]
+                        {
+                            new TagHelperAttribute("first", "A"),
+                            new TagHelperAttribute("second", "B"),
+                        }
+                    },
+                    {
+                        "second",
+                        new TagHelperAttributeList
+                        {
+                            { "first", "A" },
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "second", "B" },
+                            { "second", "Duplicate B" },
+                            { "first", "A" },
+                        },
+                        new[]
+                        {
+                            new TagHelperAttribute("second", "B"),
+                            new TagHelperAttribute("second", "Duplicate B"),
+                            new TagHelperAttribute("first", "A"),
+                        }
+                    },
+                    {
+                        "second",
+                        new TagHelperAttributeList
+                        {
+                            { "first", "A" },
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "second", "B" },
+                            { "first", "A" },
+                            { "second", "Duplicate B" }
+                        },
+                        new[]
+                        {
+                            new TagHelperAttribute("second", "B"),
+                            new TagHelperAttribute("first", "A"),
+                            new TagHelperAttribute("second", "Duplicate B"),
+                        }
+                    },
+                    {
+                        "dynamic",
+                        new TagHelperAttributeList
+                        {
+                            { "first", "A" },
+                            { "second", "B" },
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "dynamic", "value" },
+                        },
+                        new[]
+                        {
+                            new TagHelperAttribute("first", "A"),
+                            new TagHelperAttribute("second", "B"),
+                            new TagHelperAttribute("dynamic", "value"),
+                        }
+                    },
+                    {
+                        "second",
+                        new TagHelperAttributeList
+                        {
+                            { "first", "A" },
+                            { "dynamic", "value" },
+                            { "secondDynamic", "another value"}
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "second", "B" }
+                        },
+                        new[]
+                        {
+                            new TagHelperAttribute("first", "A"),
+                            new TagHelperAttribute("dynamic", "value"),
+                            new TagHelperAttribute("secondDynamic", "another value"),
+                            new TagHelperAttribute("second", "B"),
+                        }
+                    },
+                    {
+                        "second",
+                        new TagHelperAttributeList
+                        {
+                            { "first", "A" },
+                            { "dynamic", "value" },
+                            { "secondDynamic", "another value"}
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "first", "A" },
+                            { "second", "B" }
+                        },
+                        new[]
+                        {
+                            new TagHelperAttribute("first", "A"),
+                            new TagHelperAttribute("second", "B"),
+                            new TagHelperAttribute("dynamic", "value"),
+                            new TagHelperAttribute("secondDynamic", "another value"),
+                        }
+                    },
+                    {
+                        "third",
+                        new TagHelperAttributeList
+                        {
+                            { "first", "A" },
+                            { "dynamic", "value" },
+                            { "secondDynamic", "another value"}
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "first", "A" },
+                            { "second", "B" },
+                            { "third", "C" }
+                        },
+                        new[]
+                        {
+                            new TagHelperAttribute("first", "A"),
+                            new TagHelperAttribute("third", "C"),
+                            new TagHelperAttribute("dynamic", "value"),
+                            new TagHelperAttribute("secondDynamic", "another value"),
+                        }
+                    },
+                    {
+                        "first",
+                        new TagHelperAttributeList
+                        {
+                            { "third", "C" },
+                            { "dynamic", "value" },
+                            { "secondDynamic", "another value"}
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "first", "A" },
+                            { "second", "B" },
+                            { "third", "C" }
+                        },
+                        new[]
+                        {
+                            new TagHelperAttribute("first", "A"),
+                            new TagHelperAttribute("third", "C"),
+                            new TagHelperAttribute("dynamic", "value"),
+                            new TagHelperAttribute("secondDynamic", "another value"),
+                        }
+                    },
+                    {
+                        "first",
+                        new TagHelperAttributeList
+                        {
+                            { "third", "C" },
+                            { "dynamic", "value" },
+                            { "secondDynamic", "another value"}
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "first", "A" },
+                            { "secondDynamic", "another value"},
+                            { "second", "B" },
+                            { "third", "C" },
+                        },
+                        new[]
+                        {
+                            new TagHelperAttribute("third", "C"),
+                            new TagHelperAttribute("dynamic", "value"),
+                            new TagHelperAttribute("first", "A"),
+                            new TagHelperAttribute("secondDynamic", "another value"),
+                        }
+                    },
+                    {
+                        "first",
+                        new TagHelperAttributeList
+                        {
+                            { "third", "C" },
+                            { "dynamic", "value" },
+                            { "secondDynamic", "another value"}
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "first", "A" },
+                            { "secondDynamic", "another value"},
+                            { "first", "Second first" },
+                            { "second", "B" },
+                            { "third", "C" },
+                            { "first", "third first" },
+                        },
+                        new[]
+                        {
+                            new TagHelperAttribute("third", "C"),
+                            new TagHelperAttribute("first", "third first"),
+                            new TagHelperAttribute("dynamic", "value"),
+                            new TagHelperAttribute("first", "A"),
+                            new TagHelperAttribute("secondDynamic", "another value"),
+                            new TagHelperAttribute("first", "Second first"),
+                        }
+                    },
+                    {
+                        "first",
+                        new TagHelperAttributeList
+                        {
+                            { "third", "C" },
+                            { "third", "Duplicate Third" },
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "third", "C" },
+                            { "first", "A" },
+                            { "third", "Duplicate Third" },
+                        },
+                        new[]
+                        {
+                            new TagHelperAttribute("third", "C"),
+                            new TagHelperAttribute("first", "A"),
+                            new TagHelperAttribute("third", "Duplicate Third"),
+                        }
+                    },
+                    {
+                        "first",
+                        new TagHelperAttributeList
+                        {
+                            { "third", "C" },
+                            { "third", "Duplicate Third" },
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "third", "C" },
+                            { "third", "Duplicate Third" },
+                            { "first", "A" },
+                        },
+                        new[]
+                        {
+                            new TagHelperAttribute("third", "C"),
+                            new TagHelperAttribute("first", "A"),
+                            new TagHelperAttribute("third", "Duplicate Third"),
+                        }
+                    },
+                    {
+                        "first",
+                        new TagHelperAttributeList
+                        {
+                            { "third", "D" },
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "first", "A" },
+                            { "first", "B" },
+                            { "first", "C" },
+                            { "third", "D" },
+                        },
+                        new[]
+                        {
+                            new TagHelperAttribute("first", "A"),
+                            new TagHelperAttribute("first", "C"),
+                            new TagHelperAttribute("first", "B"),
+                            new TagHelperAttribute("third", "D"),
+                        }
+                    },
+                    {
+                        "first",
+                        new TagHelperAttributeList
+                        {
+                            { "third", "D" },
+                            { "dynamic", "value" },
+                            { "third", "Duplicate Third" },
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "third", "D" },
+                            { "first", "A" },
+                            { "third", "Duplicate Third" },
+                            { "first", "B" },
+                            { "first", "C" },
+                        },
+                        new[]
+                        {
+                            new TagHelperAttribute("third", "D"),
+                            new TagHelperAttribute("first", "A"),
+                            new TagHelperAttribute("first", "B"),
+                            new TagHelperAttribute("first", "C"),
+                            new TagHelperAttribute("dynamic", "value"),
+                            new TagHelperAttribute("third", "Duplicate Third"),
+                        }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(CopyHtmlAttributeData_MaintainsOrder))]
+        public void CopyHtmlAttribute_MaintainsOrder(
+            string attributeNameToCopy,
+            TagHelperAttributeList outputAttributes,
+            TagHelperAttributeList allAttributes,
+            IEnumerable<TagHelperAttribute> expectedAttributes)
+        {
+            // Arrange
+            var output = new TagHelperOutput(
+                tagName: "p",
+                attributes: new TagHelperAttributeList(outputAttributes),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+            var context = new TagHelperContext(
+                tagName: "p",
+                allAttributes: allAttributes,
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act
+            output.CopyHtmlAttribute(attributeNameToCopy, context);
+
+            // Assert
+            Assert.Equal(expectedAttributes, output.Attributes, CaseSensitiveTagHelperAttributeComparer.Default);
+        }
+
+        public static TheoryData CopyHtmlAttributeData_MultipleAttributesSameName
+        {
+            get
+            {
+                // attributeNameToCopy, allAttributes, expectedAttributes
+                return new TheoryData<string, TagHelperAttributeList, IEnumerable<TagHelperAttribute>>
+                {
+                    {
+                        "hello",
+                        new TagHelperAttributeList
+                        {
+                            { "hello", "world" },
+                            { "hello", "world2" }
+                        },
+                        new[]
+                        {
+                            new TagHelperAttribute("hello", "world"),
+                            new TagHelperAttribute("hello", "world2"),
+                        }
+                    },
+                    {
+                        "HELLO",
+                        new TagHelperAttributeList
+                        {
+                            { "hello", "world" },
+                            { "hello", "world2" }
+                        },
+                        new[]
+                        {
+                            new TagHelperAttribute("hello", "world"),
+                            new TagHelperAttribute("hello", "world2"),
+                        }
+                    },
+                    {
+                        "hello",
+                        new TagHelperAttributeList
+                        {
+                            { "HelLO", "world" },
+                            { "HELLO", "world2" }
+                        },
+                        new[]
+                        {
+                            new TagHelperAttribute("HelLO", "world"),
+                            new TagHelperAttribute("HELLO", "world2"),
+                        }
+                    },
+                    {
+                        "hello",
+                        new TagHelperAttributeList
+                        {
+                            { "hello", "world" },
+                            { "HELLO", "world2" }
+                        },
+                        new[]
+                        {
+                            new TagHelperAttribute("hello", "world"),
+                            new TagHelperAttribute("HELLO", "world2"),
+                        }
+                    },
+                    {
+                        "HELLO",
+                        new TagHelperAttributeList
+                        {
+                            { "HeLlO", "world" },
+                            { "heLLo", "world2" }
+                        },
+                        new[]
+                        {
+                            new TagHelperAttribute("HeLlO", "world"),
+                            new TagHelperAttribute("heLLo", "world2"),
+                        }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(CopyHtmlAttributeData_MultipleAttributesSameName))]
+        public void CopyHtmlAttribute_CopiesAllOriginalAttributes(
+            string attributeNameToCopy,
+            TagHelperAttributeList allAttributes,
+            IEnumerable<TagHelperAttribute> expectedAttributes)
+        {
+            // Arrange
+            var output = new TagHelperOutput(
+                tagName: "p",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+            var context = new TagHelperContext(
+                tagName: "p",
+                allAttributes: allAttributes,
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act
+            output.CopyHtmlAttribute(attributeNameToCopy, context);
+
+            // Assert
+            Assert.Equal(expectedAttributes, output.Attributes, CaseSensitiveTagHelperAttributeComparer.Default);
+        }
+
+        [Theory]
+        [InlineData("hello", "world")]
+        [InlineData("HeLlO", "wOrLd")]
+        public void CopyHtmlAttribute_CopiesOriginalAttributes(string attributeName, string attributeValue)
+        {
+            // Arrange
+            var tagHelperOutput = new TagHelperOutput(
+                "p",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.Append("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            var tagHelperContext = new TagHelperContext(
+                tagName: "p",
+                allAttributes: new TagHelperAttributeList
+                {
+                    { attributeName, attributeValue }
+                },
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var expectedAttribute = new TagHelperAttribute(attributeName, attributeValue);
+
+            // Act
+            tagHelperOutput.CopyHtmlAttribute("hello", tagHelperContext);
+
+            // Assert
+            var attribute = Assert.Single(tagHelperOutput.Attributes);
+            Assert.Equal(expectedAttribute, attribute);
+        }
+
+        [Fact]
+        public void CopyHtmlAttribute_DoesNotOverrideAttributes()
+        {
+            // Arrange
+            var attributeName = "hello";
+            var tagHelperOutput = new TagHelperOutput(
+                "p",
+                attributes: new TagHelperAttributeList()
+                {
+                    { attributeName, "world2" }
+                },
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.Append("Something Else");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            var expectedAttribute = new TagHelperAttribute(attributeName, "world2");
+            var tagHelperContext = new TagHelperContext(
+                tagName: "p",
+                allAttributes: new TagHelperAttributeList
+                {
+                    { attributeName, "world" }
+                },
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act
+            tagHelperOutput.CopyHtmlAttribute(attributeName, tagHelperContext);
+
+            // Assert
+            var attribute = Assert.Single(tagHelperOutput.Attributes);
+            Assert.Equal(expectedAttribute, attribute);
+        }
+
+        [Fact]
+        public void CopyHtmlAttribute_ThrowsWhenUnknownAttribute()
+        {
+            // Arrange
+            var invalidAttributeName = "hello2";
+            var tagHelperOutput = new TagHelperOutput(
+                "p",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.Append("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            var tagHelperContext = new TagHelperContext(
+                tagName: "p",
+                allAttributes: new TagHelperAttributeList
+                {
+                    { "hello", "world" }
+                },
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => tagHelperOutput.CopyHtmlAttribute(invalidAttributeName, tagHelperContext),
+                "attributeName",
+                "The attribute 'hello2' does not exist in the TagHelperContext.");
+        }
+
+        [Fact]
+        public void RemoveRange_RemovesProvidedAttributes_WithArrayInput()
+        {
+            // Arrange
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "p",
+                attributes: new TagHelperAttributeList()
+                {
+                    { "route-Hello", "World" },
+                    { "Route-I", "Am" }
+                },
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+            var expectedAttribute = new TagHelperAttribute("type", "btn");
+            tagHelperOutput.Attributes.Add(expectedAttribute);
+
+            var attributes = tagHelperOutput.Attributes
+                .Where(item => item.Name.StartsWith("route-", StringComparison.OrdinalIgnoreCase))
+                .ToList();
+
+            // Act
+            tagHelperOutput.RemoveRange(attributes);
+
+            // Assert
+            var attribute = Assert.Single(tagHelperOutput.Attributes);
+            Assert.Equal(expectedAttribute, attribute);
+        }
+
+        [Fact]
+        public void RemoveRange_RemovesProvidedAttributes_WithCollectionInput()
+        {
+            // Arrange
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "p",
+                attributes: new TagHelperAttributeList()
+                {
+                    { "route-Hello", "World" },
+                    { "Route-I", "Am" }
+                },
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+            var expectedAttribute = new TagHelperAttribute("type", "btn");
+            tagHelperOutput.Attributes.Add(expectedAttribute);
+            var attributes = tagHelperOutput.Attributes
+                .Where(item => item.Name.StartsWith("route-", StringComparison.OrdinalIgnoreCase));
+
+            // Act
+            tagHelperOutput.RemoveRange(attributes);
+
+            // Assert
+            var attribute = Assert.Single(tagHelperOutput.Attributes);
+            Assert.Equal(expectedAttribute, attribute);
+        }
+
+        [Fact]
+        public void FindPrefixedAttributes_ReturnsEmpty_AttributeListIfNoAttributesPrefixed()
+        {
+            // Arrange
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "p",
+                attributes: new TagHelperAttributeList()
+                {
+                    { "route-Hello", "World" },
+                    { "Route-I", "Am" }
+                },
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+            var expectedAttribute = new TagHelperAttribute("type", "btn");
+            tagHelperOutput.Attributes.Add(expectedAttribute);
+
+            var attributes = tagHelperOutput.Attributes
+                .Where(item => item.Name.StartsWith("route-", StringComparison.OrdinalIgnoreCase));
+
+            // Act
+            tagHelperOutput.RemoveRange(attributes);
+
+            // Assert
+            var attribute = Assert.Single(tagHelperOutput.Attributes);
+            Assert.Equal(expectedAttribute, attribute);
+        }
+
+        public static TheoryData MultipleAttributeSameNameData
+        {
+            get
+            {
+                // tagBuilderAttributes, outputAttributes, expectedAttributes
+                return new TheoryData<Dictionary<string, string>, TagHelperAttributeList, TagHelperAttributeList>
+                {
+                    {
+                        new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                        {
+                            { "class", "btn" }
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "class", "btn2" },
+                            { "class", "btn3" }
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "class", "btn2 btn" }
+                        }
+                    },
+                    {
+                        new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                        {
+                            { "ClAsS", "btn" }
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "class", "btn2" },
+                            { "class", "btn3" }
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "class", "btn2 btn" }
+                        }
+                    },
+                    {
+                        new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                        {
+                            { "class", "btn" }
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "clASS", "btn2" },
+                            { "class", "btn3" }
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "clASS", "btn2 btn" }
+                        }
+                    },
+                    {
+                        new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                        {
+                            { "class", "btn" }
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "clASS", "btn2" },
+                            { "CLass", "btn3" }
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "clASS", "btn2 btn" }
+                        }
+                    },
+                    {
+                        new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                        {
+                            { "CLASS", "btn" }
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "clASS", "btn2" },
+                            { "CLass", "btn3" }
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "clASS", "btn2 btn" }
+                        }
+                    },
+                    {
+                        new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                        {
+                            { "CLASS", "btn" }
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "before", "before value" },
+                            { "clASS", "btn2" },
+                            { "mid", "mid value" },
+                            { "CLass", "btn3" },
+                            { "after", "after value" },
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "before", "before value" },
+                            { "clASS", "btn2 btn" },
+                            { "mid", "mid value" },
+                            { "after", "after value" },
+                        }
+                    },
+                    {
+                        new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                        {
+                            { "A", "A Value" },
+                            { "CLASS", "btn" },
+                            { "B", "B Value" },
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "before", "before value" },
+                            { "clASS", "btn2" },
+                            { "mid", "mid value" },
+                            { "CLass", "btn3" },
+                            { "after", "after value" },
+                        },
+                        new TagHelperAttributeList
+                        {
+                            { "before", "before value" },
+                            { "clASS", "btn2 btn" },
+                            { "mid", "mid value" },
+                            { "after", "after value" },
+                            { "A", "A Value" },
+                            { "B", "B Value" },
+                        }
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(MultipleAttributeSameNameData))]
+        public void MergeAttributes_ClearsDuplicateClassNameAttributes(
+            Dictionary<string, string> tagBuilderAttributes,
+            TagHelperAttributeList outputAttributes,
+            TagHelperAttributeList expectedAttributes)
+        {
+            // Arrange
+            var tagHelperOutput = new TagHelperOutput(
+                "p",
+                outputAttributes,
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+
+            var tagBuilder = new TagBuilder("p");
+            foreach (var attr in tagBuilderAttributes)
+            {
+                tagBuilder.Attributes.Add(attr.Key, attr.Value);
+            }
+
+            // Act
+            tagHelperOutput.MergeAttributes(tagBuilder);
+
+            // Assert
+            Assert.Equal(
+                expectedAttributes,
+                tagHelperOutput.Attributes,
+                CaseSensitiveTagHelperAttributeComparer.Default);
+        }
+
+        [Fact]
+        public void MergeAttributes_DoesNotReplace_TagHelperOutputAttributeValues()
+        {
+            // Arrange
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "p",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+            var expectedAttribute = new TagHelperAttribute("type", "btn");
+            tagHelperOutput.Attributes.Add(expectedAttribute);
+
+            var tagBuilder = new TagBuilder("p");
+            tagBuilder.Attributes.Add("type", "hello");
+
+            // Act
+            tagHelperOutput.MergeAttributes(tagBuilder);
+
+            // Assert
+            var attribute = Assert.Single(tagHelperOutput.Attributes);
+            Assert.Equal(expectedAttribute, attribute);
+        }
+
+        [Fact]
+        public void MergeAttributes_AppendsClass_TagHelperOutputAttributeValues()
+        {
+            // Arrange
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "p",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+            tagHelperOutput.Attributes.Add("class", "Hello");
+
+            var tagBuilder = new TagBuilder("p");
+            tagBuilder.Attributes.Add("class", "btn");
+
+            var expectedAttribute = new TagHelperAttribute("class", "Hello btn");
+
+            // Act
+            tagHelperOutput.MergeAttributes(tagBuilder);
+
+            // Assert
+            var attribute = Assert.Single(tagHelperOutput.Attributes);
+            Assert.Equal(expectedAttribute, attribute, CaseSensitiveTagHelperAttributeComparer.Default);
+        }
+
+        [Theory]
+        [InlineData("class", "CLAss")]
+        [InlineData("ClaSS", "class")]
+        [InlineData("ClaSS", "cLaSs")]
+        public void MergeAttributes_AppendsClass_TagHelperOutputAttributeValues_IgnoresCase(
+            string originalName, string updateName)
+        {
+            // Arrange
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "p",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+            tagHelperOutput.Attributes.Add(originalName, "Hello");
+
+            var tagBuilder = new TagBuilder("p");
+            tagBuilder.Attributes.Add(updateName, "btn");
+
+            // Act
+            tagHelperOutput.MergeAttributes(tagBuilder);
+
+            // Assert
+            var attribute = Assert.Single(tagHelperOutput.Attributes);
+            Assert.Equal(
+                new TagHelperAttribute(originalName, "Hello btn"),
+                attribute,
+                CaseSensitiveTagHelperAttributeComparer.Default);
+        }
+
+        [Fact]
+        public void MergeAttributes_DoesNotEncode_TagHelperOutputAttributeValues()
+        {
+            // Arrange
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "p",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+
+            var tagBuilder = new TagBuilder("p");
+            var expectedAttribute = new TagHelperAttribute("visible", "val < 3");
+            tagBuilder.Attributes.Add("visible", "val < 3");
+
+            // Act
+            tagHelperOutput.MergeAttributes(tagBuilder);
+
+            // Assert
+            var attribute = Assert.Single(tagHelperOutput.Attributes);
+            Assert.Equal(expectedAttribute, attribute);
+        }
+
+        [Fact]
+        public void MergeAttributes_CopiesMultiple_TagHelperOutputAttributeValues()
+        {
+            // Arrange
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "p",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+
+            var tagBuilder = new TagBuilder("p");
+            var expectedAttribute1 = new TagHelperAttribute("class", "btn");
+            var expectedAttribute2 = new TagHelperAttribute("class2", "btn");
+            tagBuilder.Attributes.Add("class", "btn");
+            tagBuilder.Attributes.Add("class2", "btn");
+
+            // Act
+            tagHelperOutput.MergeAttributes(tagBuilder);
+
+            // Assert
+            Assert.Equal(2, tagHelperOutput.Attributes.Count);
+            var attribute = Assert.Single(tagHelperOutput.Attributes, attr => attr.Name.Equals("class"));
+            Assert.Equal(expectedAttribute1.Value, attribute.Value);
+            attribute = Assert.Single(tagHelperOutput.Attributes, attr => attr.Name.Equals("class2"));
+            Assert.Equal(expectedAttribute2.Value, attribute.Value);
+        }
+
+        [Fact]
+        public void MergeAttributes_Maintains_TagHelperOutputAttributeValues()
+        {
+            // Arrange
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "p",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+            var expectedAttribute = new TagHelperAttribute("class", "btn");
+            tagHelperOutput.Attributes.Add(expectedAttribute);
+
+            var tagBuilder = new TagBuilder("p");
+
+            // Act
+            tagHelperOutput.MergeAttributes(tagBuilder);
+
+            // Assert
+            var attribute = Assert.Single(tagHelperOutput.Attributes);
+            Assert.Equal(expectedAttribute, attribute);
+        }
+
+        [Fact]
+        public void MergeAttributes_Combines_TagHelperOutputAttributeValues()
+        {
+            // Arrange
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "p",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+            var expectedOutputAttribute = new TagHelperAttribute("class", "btn");
+            tagHelperOutput.Attributes.Add(expectedOutputAttribute);
+
+            var tagBuilder = new TagBuilder("p");
+            var expectedBuilderAttribute = new TagHelperAttribute("for", "hello");
+            tagBuilder.Attributes.Add("for", "hello");
+
+            // Act
+            tagHelperOutput.MergeAttributes(tagBuilder);
+
+            // Assert
+            Assert.Equal(2, tagHelperOutput.Attributes.Count);
+            var attribute = Assert.Single(tagHelperOutput.Attributes, attr => attr.Name.Equals("class"));
+            Assert.Equal(expectedOutputAttribute.Value, attribute.Value);
+            attribute = Assert.Single(tagHelperOutput.Attributes, attr => attr.Name.Equals("for"));
+            Assert.Equal(expectedBuilderAttribute.Value, attribute.Value);
+        }
+
+        [Fact]
+        public void Single_AddClass()
+        {
+            // Arrange
+            var expectedValue = "class=\"HtmlEncode[[btn]]\"";
+            var htmlEncoder = new HtmlTestEncoder();
+
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "p",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+
+            // Act
+            tagHelperOutput.AddClass("btn", htmlEncoder);
+
+            // Assert
+            var classAttribute = Assert.Single(tagHelperOutput.Attributes, attr => attr.Name.Equals("class"));
+            Assert.Equal(expectedValue, HtmlContentUtilities.HtmlContentToString(classAttribute));
+        }
+
+        [Fact]
+        public void Multiple_AddClass()
+        {
+            // Arrange
+            var expectedValue = "class=\"HtmlEncode[[btn]] HtmlEncode[[btn-primary]]\"";
+            var htmlEncoder = new HtmlTestEncoder();
+
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "p",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+
+            // Act
+            tagHelperOutput.AddClass("btn", htmlEncoder);
+            tagHelperOutput.AddClass("btn-primary", htmlEncoder);
+
+            // Assert
+            var classAttribute = Assert.Single(tagHelperOutput.Attributes, attr => attr.Name.Equals("class"));
+            Assert.Equal(expectedValue, HtmlContentUtilities.HtmlContentToString(classAttribute));
+        }
+
+        [Fact]
+        public void Multiple_AddClass_RemoveClass_RemovesAllButOne()
+        {
+            // Arrange
+            var expectedValue = "class=\"HtmlEncode[[btn]]\"";
+            var htmlEncoder = new HtmlTestEncoder();
+
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "p",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+
+            tagHelperOutput.AddClass("btn", htmlEncoder);
+            tagHelperOutput.AddClass("btn-success", htmlEncoder);
+            tagHelperOutput.AddClass("btn-primary", htmlEncoder);
+
+            // Act
+            tagHelperOutput.RemoveClass("btn-success", htmlEncoder);
+            tagHelperOutput.RemoveClass("btn-primary", htmlEncoder);
+
+            // Assert
+            var classAttribute = Assert.Single(tagHelperOutput.Attributes, attr => attr.Name.Equals("class"));
+            Assert.Equal(expectedValue, HtmlContentUtilities.HtmlContentToString(classAttribute));
+        }
+
+        [Fact]
+        public void AddClass_RemoveClass_ContainsSpace()
+        {
+            // Arrange
+            var classValue = "btn btn-success";
+            var expected = new ArgumentException(Resources.ArgumentCannotContainHtmlSpace, nameof(classValue)).Message;
+            var htmlEncoder = new HtmlTestEncoder();
+
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "p",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+
+            // Act and Assert
+            var exceptionAdd = Assert.Throws<ArgumentException>(() => tagHelperOutput.AddClass(classValue, htmlEncoder));
+            var exceptionRemove = Assert.Throws<ArgumentException>(() => tagHelperOutput.RemoveClass(classValue, htmlEncoder));
+            Assert.Equal(expected, exceptionAdd.Message);
+            Assert.Equal(expected, exceptionRemove.Message);
+        }
+
+        [Fact]
+        public void Single_RemoveClass_RemovesDuplicates_RemovesEntirely()
+        {
+            // Arrange
+            var htmlEncoder = new HtmlTestEncoder();
+
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "p",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+
+            tagHelperOutput.Attributes.SetAttribute("class", new HtmlString("HtmlEncode[[btn]] HtmlEncode[[btn]]"));
+
+            // Act
+            tagHelperOutput.RemoveClass("btn", htmlEncoder);
+
+            // Assert
+            var classAttribute = tagHelperOutput.Attributes["class"];
+            Assert.Null(classAttribute);
+        }
+
+        [Fact]
+        public void Single_RemoveClass_RemovesDuplicates()
+        {
+            // Arrange
+            var expectedValue = "class=\"HtmlEncode[[btn-primary]]\"";
+            var htmlEncoder = new HtmlTestEncoder();
+
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "p",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+
+            tagHelperOutput.Attributes.SetAttribute("class", new HtmlString("HtmlEncode[[btn]] HtmlEncode[[btn-primary]] HtmlEncode[[btn]]"));
+
+            // Act
+            tagHelperOutput.RemoveClass("btn", htmlEncoder);
+
+            // Assert
+            var classAttribute = Assert.Single(tagHelperOutput.Attributes, attr => attr.Name.Equals("class"));
+            Assert.Equal(expectedValue, HtmlContentUtilities.HtmlContentToString(classAttribute));
+        }
+
+        [Fact]
+        public void Single_RemoveClass_RemovesEntirely()
+        {
+            var htmlEncoder = new HtmlTestEncoder();
+
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "p",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+
+            tagHelperOutput.Attributes.SetAttribute("class", new HtmlString("HtmlEncode[[btn]]"));
+
+            // Act
+            tagHelperOutput.RemoveClass("btn", htmlEncoder);
+
+            // Assert
+            var classAttribute = tagHelperOutput.Attributes["class"];
+            Assert.Null(classAttribute);
+        }
+
+        [Fact]
+        public void Single_RemoveClass()
+        {
+            // Arrange
+            var expectedValue = "class=\"HtmlEncode[[btn]]\"";
+            var htmlEncoder = new HtmlTestEncoder();
+
+            var tagHelperOutput = new TagHelperOutput(
+                tagName: "p",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+
+            tagHelperOutput.Attributes.SetAttribute("class", new HtmlString("HtmlEncode[[btn]] HtmlEncode[[btn-primary]]"));
+
+            // Act
+            tagHelperOutput.RemoveClass("btn-primary", htmlEncoder);
+
+            // Assert
+            var classAttribute = Assert.Single(tagHelperOutput.Attributes, attr => attr.Name.Equals("class"));
+            Assert.Equal(expectedValue, HtmlContentUtilities.HtmlContentToString(classAttribute));
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs
new file mode 100644
index 0000000000..daf8314ff5
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs
@@ -0,0 +1,142 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.AspNetCore.Antiforgery;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    public class TestableHtmlGenerator : DefaultHtmlGenerator
+    {
+        private IDictionary<string, object> _validationAttributes;
+
+        public TestableHtmlGenerator(IModelMetadataProvider metadataProvider)
+            : this(metadataProvider, Mock.Of<IUrlHelper>())
+        {
+        }
+
+        public TestableHtmlGenerator(IModelMetadataProvider metadataProvider, IUrlHelper urlHelper)
+            : this(
+                  metadataProvider,
+                  GetOptions(),
+                  urlHelper,
+                  validationAttributes: new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase))
+        {
+        }
+
+        public TestableHtmlGenerator(
+            IModelMetadataProvider metadataProvider,
+            IOptions<MvcViewOptions> options,
+            IUrlHelper urlHelper,
+            IDictionary<string, object> validationAttributes)
+            : base(
+                  Mock.Of<IAntiforgery>(),
+                  options,
+                  metadataProvider,
+                  CreateUrlHelperFactory(urlHelper),
+                  new HtmlTestEncoder(),
+                  new DefaultValidationHtmlAttributeProvider(options, metadataProvider, new ClientValidatorCache()))
+        {
+            _validationAttributes = validationAttributes;
+        }
+
+        public IDictionary<string, object> ValidationAttributes
+        {
+            get { return _validationAttributes; }
+        }
+
+        public static ViewContext GetViewContext(
+            object model,
+            IHtmlGenerator htmlGenerator,
+            IModelMetadataProvider metadataProvider)
+        {
+            return GetViewContext(model, htmlGenerator, metadataProvider, modelState: new ModelStateDictionary());
+        }
+
+        public static ViewContext GetViewContext(
+            object model,
+            IHtmlGenerator htmlGenerator,
+            IModelMetadataProvider metadataProvider,
+            ModelStateDictionary modelState)
+        {
+            var actionContext = new ActionContext(
+                new DefaultHttpContext(),
+                new RouteData(),
+                new ActionDescriptor(),
+                modelState);
+            var viewData = new ViewDataDictionary(metadataProvider, modelState)
+            {
+                Model = model,
+            };
+            var viewContext = new ViewContext(
+                actionContext,
+                Mock.Of<IView>(),
+                viewData,
+                Mock.Of<ITempDataDictionary>(),
+                TextWriter.Null,
+                new HtmlHelperOptions());
+
+            return viewContext;
+        }
+
+        public override IHtmlContent GenerateAntiforgery(ViewContext viewContext)
+        {
+            var tagBuilder = new TagBuilder("input")
+            {
+                Attributes =
+                {
+                    { "name", "__RequestVerificationToken" },
+                    { "type", "hidden" },
+                    { "value", "olJlUDjrouRNWLen4tQJhauj1Z1rrvnb3QD65cmQU1Ykqi6S4" }, // 50 chars of a token.
+                },
+            };
+
+            tagBuilder.TagRenderMode = TagRenderMode.SelfClosing;
+            return tagBuilder;
+        }
+
+        protected override void AddValidationAttributes(
+            ViewContext viewContext,
+            TagBuilder tagBuilder,
+            ModelExplorer modelExplorer,
+            string expression)
+        {
+            tagBuilder.MergeAttributes(ValidationAttributes);
+        }
+
+        private static IOptions<MvcViewOptions> GetOptions()
+        {
+            var mockOptions = new Mock<IOptions<MvcViewOptions>>();
+            mockOptions
+                .SetupGet(options => options.Value)
+                .Returns(new MvcViewOptions());
+
+            return mockOptions.Object;
+        }
+
+        private static IUrlHelperFactory CreateUrlHelperFactory(IUrlHelper urlHelper)
+        {
+            var factory = new Mock<IUrlHelperFactory>();
+            factory
+                .Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>()))
+                .Returns(urlHelper);
+
+            return factory.Object;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TextAreaTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TextAreaTagHelperTest.cs
new file mode 100644
index 0000000000..614ceb985a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TextAreaTagHelperTest.cs
@@ -0,0 +1,266 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    public class TextAreaTagHelperTest
+    {
+        // Model (List<Model> or Model instance), container type (Model or NestModel), model accessor,
+        // property path / id, expected content.
+        public static TheoryData<object, Type, object, NameAndId, string> TestDataSet
+        {
+            get
+            {
+                var modelWithNull = new Model
+                {
+                    NestedModel = new NestedModel
+                    {
+                        Text = null,
+                    },
+                    Text = null,
+                };
+                var modelWithText = new Model
+                {
+                    NestedModel = new NestedModel
+                    {
+                        Text = "inner text",
+                    },
+                    Text = "outer text",
+                };
+                var models = new List<Model>
+                {
+                    modelWithNull,
+                    modelWithText,
+                };
+
+                return new TheoryData<object, Type, object, NameAndId, string>
+                {
+                    { null, typeof(Model), null,
+                        new NameAndId("Text", "Text"),
+                        Environment.NewLine },
+
+                    { modelWithNull, typeof(Model), modelWithNull.Text,
+                        new NameAndId("Text", "Text"),
+                        Environment.NewLine },
+                    { modelWithText, typeof(Model), modelWithText.Text,
+                        new NameAndId("Text", "Text"),
+                        Environment.NewLine + "HtmlEncode[[outer text]]" },
+
+                    { modelWithNull, typeof(NestedModel), modelWithNull.NestedModel.Text,
+                        new NameAndId("NestedModel.Text", "NestedModel_Text"),
+                        Environment.NewLine },
+                    { modelWithText, typeof(NestedModel), modelWithText.NestedModel.Text,
+                        new NameAndId("NestedModel.Text", "NestedModel_Text"),
+                        Environment.NewLine + "HtmlEncode[[inner text]]" },
+
+                    { models, typeof(Model), models[0].Text,
+                        new NameAndId("[0].Text", "z0__Text"),
+                        Environment.NewLine },
+                    { models, typeof(Model), models[1].Text,
+                        new NameAndId("[1].Text", "z1__Text"),
+                        Environment.NewLine + "HtmlEncode[[outer text]]" },
+
+                    { models, typeof(NestedModel), models[0].NestedModel.Text,
+                        new NameAndId("[0].NestedModel.Text", "z0__NestedModel_Text"),
+                        Environment.NewLine },
+                    { models, typeof(NestedModel), models[1].NestedModel.Text,
+                        new NameAndId("[1].NestedModel.Text", "z1__NestedModel_Text"),
+                        Environment.NewLine + "HtmlEncode[[inner text]]" },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(TestDataSet))]
+        public async Task Process_GeneratesExpectedOutput(
+            object container,
+            Type containerType,
+            object model,
+            NameAndId nameAndId,
+            string expectedContent)
+        {
+            // Arrange
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+                { "id", nameAndId.Id },
+                { "name", nameAndId.Name },
+                {  "valid", "from validation attributes" },
+            };
+            var expectedTagName = "not-textarea";
+
+            var metadataProvider = new TestModelMetadataProvider();
+
+            var containerMetadata = metadataProvider.GetMetadataForType(containerType);
+            var containerExplorer = metadataProvider.GetModelExplorerForType(containerType, container);
+
+            var propertyMetadata = metadataProvider.GetMetadataForProperty(containerType, "Text");
+            var modelExplorer = containerExplorer.GetExplorerForExpression(propertyMetadata, model);
+
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider)
+            {
+                ValidationAttributes =
+                {
+                    {  "valid", "from validation attributes" },
+                }
+            };
+
+            // Property name is either nameof(Model.Text) or nameof(NestedModel.Text).
+            var modelExpression = new ModelExpression(nameAndId.Name, modelExplorer);
+            var tagHelper = new TextAreaTagHelper(htmlGenerator)
+            {
+                For = modelExpression,
+            };
+
+            var tagHelperContext = new TagHelperContext(
+                tagName: "text-area",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var htmlAttributes = new TagHelperAttributeList
+            {
+                { "class", "form-control" },
+            };
+            var output = new TagHelperOutput(
+                expectedTagName,
+                htmlAttributes,
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                })
+            {
+                TagMode = TagMode.SelfClosing,
+            };
+            output.Content.SetContent("original content");
+
+            var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator, metadataProvider);
+            tagHelper.ViewContext = viewContext;
+
+            // Act
+            await tagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal(TagMode.SelfClosing, output.TagMode);
+            Assert.Equal(expectedAttributes, output.Attributes);
+            Assert.Equal(expectedContent, HtmlContentUtilities.HtmlContentToString(output.Content));
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Fact]
+        public void Process_WithEmptyForName_Throws()
+        {
+            // Arrange
+            var expectedMessage = "The name of an HTML field cannot be null or empty. Instead use methods " +
+                "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper.Editor or Microsoft.AspNetCore.Mvc.Rendering." +
+                "IHtmlHelper`1.EditorFor with a non-empty htmlFieldName argument value.";
+            var expectedTagName = "textarea";
+
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+            var model = "model-value";
+            var modelExplorer = metadataProvider.GetModelExplorerForType(typeof(string), model);
+            var modelExpression = new ModelExpression(name: string.Empty, modelExplorer: modelExplorer);
+            var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator, metadataProvider);
+            var tagHelper = new TextAreaTagHelper(htmlGenerator)
+            {
+                For = modelExpression,
+                ViewContext = viewContext,
+            };
+
+            var context = new TagHelperContext(new TagHelperAttributeList(), new Dictionary<object, object>(), "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                new TagHelperAttributeList(),
+                (_, __) => Task.FromResult<TagHelperContent>(new DefaultTagHelperContent()));
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => tagHelper.Process(context, output),
+                paramName: "expression",
+                exceptionMessage: expectedMessage);
+        }
+
+        [Fact]
+        public void Process_WithEmptyForName_DoesNotThrow_WithName()
+        {
+            // Arrange
+            var expectedAttributeValue = "-expression-";
+            var expectedContent = Environment.NewLine + "HtmlEncode[[model-value]]";
+            var expectedTagName = "textarea";
+
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+            var model = "model-value";
+            var modelExplorer = metadataProvider.GetModelExplorerForType(typeof(string), model);
+            var modelExpression = new ModelExpression(name: string.Empty, modelExplorer: modelExplorer);
+            var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator, metadataProvider);
+            var tagHelper = new TextAreaTagHelper(htmlGenerator)
+            {
+                For = modelExpression,
+                Name = expectedAttributeValue,
+                ViewContext = viewContext,
+            };
+
+            var attributes = new TagHelperAttributeList
+            {
+                { "name", expectedAttributeValue },
+            };
+
+            var context = new TagHelperContext(attributes, new Dictionary<object, object>(), "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                new TagHelperAttributeList(),
+                (_, __) => Task.FromResult<TagHelperContent>(new DefaultTagHelperContent()));
+
+            // Act
+            tagHelper.Process(context, output);
+
+            // Assert
+            Assert.Equal(expectedTagName, output.TagName);
+            Assert.Equal(expectedContent, HtmlContentUtilities.HtmlContentToString(output.Content));
+
+            var attribute = Assert.Single(output.Attributes);
+            Assert.Equal("name", attribute.Name);
+            Assert.Equal(expectedAttributeValue, attribute.Value);
+        }
+
+        public class NameAndId
+        {
+            public NameAndId(string name, string id)
+            {
+                Name = name;
+                Id = id;
+            }
+
+            public string Name { get; private set; }
+
+            public string Id { get; private set; }
+        }
+
+        private class Model
+        {
+            public string Text { get; set; }
+
+            public NestedModel NestedModel { get; set; }
+        }
+
+        private class NestedModel
+        {
+            public string Text { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs
new file mode 100644
index 0000000000..69522655cb
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs
@@ -0,0 +1,485 @@
+// 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.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    public class ValidationMessageTagHelperTest
+    {
+        [Fact]
+        public async Task ProcessAsync_GeneratesExpectedOutput()
+        {
+            // Arrange
+            var expectedTagName = "not-span";
+            var metadataProvider = new TestModelMetadataProvider();
+            var modelExpression = CreateModelExpression("Name");
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+
+            var validationMessageTagHelper = new ValidationMessageTagHelper(htmlGenerator)
+            {
+                For = modelExpression
+            };
+
+            var expectedPreContent = "original pre-content";
+            var expectedContent = "original content";
+            var expectedPostContent = "original post-content";
+
+            var tagHelperContext = new TagHelperContext(
+                tagName: "not-span",
+                allAttributes: new TagHelperAttributeList
+                {
+                    { "id", "myvalidationmessage" },
+                    { "for", modelExpression },
+                },
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                attributes: new TagHelperAttributeList
+                {
+                    { "id", "myvalidationmessage" }
+                },
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            output.PreContent.SetContent(expectedPreContent);
+            output.Content.SetContent(expectedContent);
+            output.PostContent.SetContent(expectedPostContent);
+
+            var viewContext = TestableHtmlGenerator.GetViewContext(
+                model: null,
+                htmlGenerator: htmlGenerator,
+                metadataProvider: metadataProvider);
+            validationMessageTagHelper.ViewContext = viewContext;
+
+            // Act
+            await validationMessageTagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal(4, output.Attributes.Count);
+            var attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("id"));
+            Assert.Equal("myvalidationmessage", attribute.Value);
+            attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("class"));
+            Assert.Equal("field-validation-valid", attribute.Value);
+            attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("data-valmsg-for"));
+            Assert.Equal("Name", attribute.Value);
+            attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("data-valmsg-replace"));
+            Assert.Equal("true", attribute.Value);
+            Assert.Equal(expectedPreContent, output.PreContent.GetContent());
+            Assert.Equal(expectedContent, output.Content.GetContent());
+            Assert.Equal(expectedPostContent, output.PostContent.GetContent());
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_WithEmptyNameFor_Throws()
+        {
+            // Arrange
+            var expectedTagName = "span";
+            var expectedMessage = "The name of an HTML field cannot be null or empty. Instead use methods " +
+                "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper.Editor or Microsoft.AspNetCore.Mvc.Rendering." +
+                "IHtmlHelper`1.EditorFor with a non-empty htmlFieldName argument value.";
+
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var modelExpression = CreateModelExpression(string.Empty);
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+            var viewContext = TestableHtmlGenerator.GetViewContext(
+                model: null,
+                htmlGenerator: htmlGenerator,
+                metadataProvider: metadataProvider);
+
+            var validationMessageTagHelper = new ValidationMessageTagHelper(htmlGenerator)
+            {
+                For = modelExpression,
+                ViewContext = viewContext,
+            };
+
+            var tagHelperContext = new TagHelperContext(
+                expectedTagName,
+                new TagHelperAttributeList
+                {
+                    { "for", modelExpression },
+                },
+                new Dictionary<object, object>(),
+                "test");
+
+            var output = new TagHelperOutput(
+                expectedTagName,
+                new TagHelperAttributeList(),
+                (_, __) => Task.FromResult<TagHelperContent>(new DefaultTagHelperContent()));
+
+            // Act & Assert
+            await ExceptionAssert.ThrowsArgumentAsync(
+                () => validationMessageTagHelper.ProcessAsync(tagHelperContext, output),
+                paramName: "expression",
+                exceptionMessage: expectedMessage);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_GeneratesExpectedOutput_WithEmptyNameFor_WithValidationFor()
+        {
+            // Arrange
+            var expectedAttributeValue = "-expression-";
+            var expectedTagName = "span";
+
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var modelExpression = CreateModelExpression(string.Empty);
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+            var viewContext = TestableHtmlGenerator.GetViewContext(
+                model: null,
+                htmlGenerator: htmlGenerator,
+                metadataProvider: metadataProvider);
+
+            var validationMessageTagHelper = new ValidationMessageTagHelper(htmlGenerator)
+            {
+                For = modelExpression,
+                ViewContext = viewContext,
+            };
+
+            var tagHelperContext = new TagHelperContext(
+                expectedTagName,
+                new TagHelperAttributeList
+                {
+                    { "for", modelExpression },
+                },
+                new Dictionary<object, object>(),
+                "test");
+
+            var output = new TagHelperOutput(
+                expectedTagName,
+                new TagHelperAttributeList
+                {
+                    { "data-valmsg-for", expectedAttributeValue },
+                },
+                (_, __) => Task.FromResult<TagHelperContent>(new DefaultTagHelperContent()));
+
+            validationMessageTagHelper.ViewContext = viewContext;
+
+            // Act
+            await validationMessageTagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal(expectedTagName, output.TagName);
+            Assert.Collection(output.Attributes,
+                attribute =>
+                {
+                    Assert.Equal("data-valmsg-for", attribute.Name);
+                    Assert.Equal(expectedAttributeValue, attribute.Value);
+                },
+                attribute =>
+                {
+                    Assert.Equal("class", attribute.Name);
+                    Assert.Equal("field-validation-valid", attribute.Value);
+                },
+                attribute =>
+                {
+                    Assert.Equal("data-valmsg-replace", attribute.Name);
+                    Assert.Equal("true", attribute.Value);
+                });
+        }
+
+        [Fact]
+        public async Task ProcessAsync_PassesValidationForThrough_EvenIfNullFor()
+        {
+            // Arrange
+            var expectedAttributeValue = "-expression-";
+            var expectedTagName = "span";
+
+            // Generator is not used in this scenario.
+            var generator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var validationMessageTagHelper = new ValidationMessageTagHelper(generator.Object)
+            {
+                ViewContext = CreateViewContext(),
+            };
+
+            var tagHelperContext = new TagHelperContext(
+                expectedTagName,
+                new TagHelperAttributeList(),
+                new Dictionary<object, object>(),
+                "test");
+
+            var output = new TagHelperOutput(
+                expectedTagName,
+                new TagHelperAttributeList
+                {
+                    { "data-valmsg-for", expectedAttributeValue },
+                },
+                (_, __) => Task.FromResult<TagHelperContent>(new DefaultTagHelperContent()));
+
+            // Act
+            await validationMessageTagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal(expectedTagName, output.TagName);
+            var attribute = Assert.Single(output.Attributes);
+            Assert.Equal("data-valmsg-for", attribute.Name);
+            Assert.Equal(expectedAttributeValue, attribute.Value);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_CallsIntoGenerateValidationMessageWithExpectedParameters()
+        {
+            // Arrange
+            var expectedViewContext = CreateViewContext();
+            var modelExpression = CreateModelExpression("Hello");
+            var generator = new Mock<IHtmlGenerator>();
+            generator
+                .Setup(mock => mock.GenerateValidationMessage(
+                    expectedViewContext,
+                    modelExpression.ModelExplorer,
+                    modelExpression.Name,
+                    null,
+                    null,
+                    null))
+                .Returns(new TagBuilder("span"))
+                .Verifiable();
+
+            var validationMessageTagHelper = new ValidationMessageTagHelper(generator.Object)
+            {
+                For = modelExpression,
+            };
+            var expectedPreContent = "original pre-content";
+            var expectedContent = "original content";
+            var expectedPostContent = "original post-content";
+            var context = new TagHelperContext(
+                tagName: "span",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                "span",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            output.PreContent.SetContent(expectedPreContent);
+            output.Content.SetContent(expectedContent);
+            output.PostContent.SetContent(expectedPostContent);
+
+            validationMessageTagHelper.ViewContext = expectedViewContext;
+
+            // Act & Assert
+            await validationMessageTagHelper.ProcessAsync(context, output);
+
+            generator.Verify();
+            Assert.Equal("span", output.TagName);
+            Assert.Empty(output.Attributes);
+            Assert.Equal(expectedPreContent, output.PreContent.GetContent());
+            Assert.Equal(expectedContent, output.Content.GetContent());
+            Assert.Equal(expectedPostContent, output.PostContent.GetContent());
+        }
+
+        [Theory]
+        [InlineData("Content of validation message", "Some Content", "Some Content")]
+        [InlineData("\r\n  \r\n", "\r\n Something Else \r\n", "\r\n Something Else \r\n")]
+        [InlineData("\r\n  \r\n", "Some Content", "Some Content")]
+        public async Task ProcessAsync_DoesNotOverrideOutputContent(
+            string childContent,
+            string outputContent,
+            string expectedOutputContent)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder("span2");
+            tagBuilder.InnerHtml.SetHtmlContent("New HTML");
+            tagBuilder.Attributes.Add("data-foo", "bar");
+            tagBuilder.Attributes.Add("data-hello", "world");
+
+            var generator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var setup = generator
+                .Setup(mock => mock.GenerateValidationMessage(
+                    It.IsAny<ViewContext>(),
+                    It.IsAny<ModelExplorer>(),
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>()))
+                .Returns(tagBuilder);
+
+            var validationMessageTagHelper = new ValidationMessageTagHelper(generator.Object)
+            {
+                For = CreateModelExpression("Hello")
+            };
+            var output = new TagHelperOutput(
+                "span",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.AppendHtml(childContent);
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            output.Content.AppendHtml(outputContent);
+
+            var context = new TagHelperContext(
+                tagName: "span",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            var viewContext = CreateViewContext();
+            validationMessageTagHelper.ViewContext = viewContext;
+
+            // Act
+            await validationMessageTagHelper.ProcessAsync(context, output);
+
+            // Assert
+            Assert.Equal("span", output.TagName);
+            Assert.Equal(2, output.Attributes.Count);
+            var attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("data-foo"));
+            Assert.Equal("bar", attribute.Value);
+            attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("data-hello"));
+            Assert.Equal("world", attribute.Value);
+            Assert.Equal(expectedOutputContent, output.Content.GetContent());
+        }
+
+        [Theory]
+        [InlineData("Content of validation message", "Content of validation message")]
+        [InlineData("\r\n  \r\n", "New HTML")]
+        public async Task ProcessAsync_MergesTagBuilderFromGenerateValidationMessage(
+            string childContent,
+            string expectedOutputContent)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder("span2");
+            tagBuilder.InnerHtml.SetHtmlContent("New HTML");
+            tagBuilder.Attributes.Add("data-foo", "bar");
+            tagBuilder.Attributes.Add("data-hello", "world");
+
+            var generator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var setup = generator
+                .Setup(mock => mock.GenerateValidationMessage(
+                    It.IsAny<ViewContext>(),
+                    It.IsAny<ModelExplorer>(),
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>()))
+                .Returns(tagBuilder);
+
+            var validationMessageTagHelper = new ValidationMessageTagHelper(generator.Object)
+            {
+                For = CreateModelExpression("Hello")
+            };
+            var output = new TagHelperOutput(
+                "span",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent(childContent);
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+
+            var context = new TagHelperContext(
+                tagName: "span",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            var viewContext = CreateViewContext();
+            validationMessageTagHelper.ViewContext = viewContext;
+
+            // Act
+            await validationMessageTagHelper.ProcessAsync(context, output);
+
+            // Assert
+            Assert.Equal("span", output.TagName);
+            Assert.Equal(2, output.Attributes.Count);
+            var attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("data-foo"));
+            Assert.Equal("bar", attribute.Value);
+            attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("data-hello"));
+            Assert.Equal("world", attribute.Value);
+            Assert.Equal(expectedOutputContent, output.Content.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_DoesNothingIfNullFor()
+        {
+            // Arrange
+            var generator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var validationMessageTagHelper = new ValidationMessageTagHelper(generator.Object);
+            var expectedPreContent = "original pre-content";
+            var expectedContent = "original content";
+            var expectedPostContent = "original post-content";
+            var output = new TagHelperOutput(
+                tagName: "span",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+            output.PreContent.SetContent(expectedPreContent);
+            output.Content.SetContent(expectedContent);
+            output.PostContent.SetContent(expectedPostContent);
+
+            var context = new TagHelperContext(
+                tagName: "span",
+                allAttributes: new TagHelperAttributeList(
+                    Enumerable.Empty<TagHelperAttribute>()),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            var viewContext = CreateViewContext();
+            validationMessageTagHelper.ViewContext = viewContext;
+
+            // Act
+            await validationMessageTagHelper.ProcessAsync(context, output);
+
+            // Assert
+            Assert.Equal("span", output.TagName);
+            Assert.Empty(output.Attributes);
+            Assert.Equal(expectedPreContent, output.PreContent.GetContent());
+            Assert.Equal(expectedContent, output.Content.GetContent());
+            Assert.Equal(expectedPostContent, output.PostContent.GetContent());
+        }
+
+        private static ModelExpression CreateModelExpression(string name)
+        {
+            var modelMetadataProvider = new EmptyModelMetadataProvider();
+            return new ModelExpression(
+                name,
+                modelMetadataProvider.GetModelExplorerForType(typeof(object), model: null));
+        }
+
+        private static ViewContext CreateViewContext()
+        {
+            var actionContext = new ActionContext(
+                new DefaultHttpContext(),
+                new RouteData(),
+                new ActionDescriptor());
+
+            return new ViewContext(
+                actionContext,
+                Mock.Of<IView>(),
+                new ViewDataDictionary(
+                    new EmptyModelMetadataProvider(),
+                    new ModelStateDictionary()),
+                Mock.Of<ITempDataDictionary>(),
+                TextWriter.Null,
+                new HtmlHelperOptions());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs
new file mode 100644
index 0000000000..1b4ec3cc80
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs
@@ -0,0 +1,634 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers.Testing;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.TagHelpers
+{
+    public class ValidationSummaryTagHelperTest
+    {
+        public static TheoryData<ModelStateDictionary> ProcessAsync_GeneratesExpectedOutput_WithNoErrorsData
+        {
+            get
+            {
+                var emptyModelState = new ModelStateDictionary();
+
+                var modelState = new ModelStateDictionary();
+                SetValidModelState(modelState);
+
+                return new TheoryData<ModelStateDictionary>
+                {
+                    emptyModelState,
+                    modelState,
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ProcessAsync_GeneratesExpectedOutput_WithNoErrorsData))]
+        public async Task ProcessAsync_GeneratesExpectedOutput_WithNoErrors(ModelStateDictionary modelState)
+        {
+            // Arrange
+            var expectedTagName = "not-div";
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                new TagHelperAttribute("class", "form-control validation-summary-valid"),
+                new TagHelperAttribute("data-valmsg-summary", "true"),
+            };
+
+            var expectedPreContent = "original pre-content";
+            var expectedContent = "original content";
+            var tagHelperContext = new TagHelperContext(
+                tagName: "not-div",
+                allAttributes: new TagHelperAttributeList(),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                attributes: new TagHelperAttributeList
+                {
+                    { "class", "form-control" }
+                },
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    throw new InvalidOperationException("getChildContentAsync called unexpectedly");
+                });
+            output.PreContent.SetContent(expectedPreContent);
+            output.Content.SetContent(expectedContent);
+            output.PostContent.SetContent("Custom Content");
+
+            var model = new Model();
+            var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator, metadataProvider, modelState);
+            var validationSummaryTagHelper = new ValidationSummaryTagHelper(htmlGenerator)
+            {
+                ValidationSummary = ValidationSummary.All,
+                ViewContext = viewContext,
+            };
+
+            // Act
+            await validationSummaryTagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal(expectedAttributes, output.Attributes, CaseSensitiveTagHelperAttributeComparer.Default);
+            Assert.Equal(expectedPreContent, output.PreContent.GetContent());
+            Assert.Equal(expectedContent, output.Content.GetContent());
+            Assert.Equal(
+                $"Custom Content<ul><li style=\"display:none\"></li>{Environment.NewLine}</ul>",
+                output.PostContent.GetContent());
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Theory]
+        [MemberData(nameof(ProcessAsync_GeneratesExpectedOutput_WithNoErrorsData))]
+        public async Task ProcessAsync_SuppressesOutput_IfClientSideValiationDisabled_WithNoErrorsData(
+            ModelStateDictionary modelStateDictionary)
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+            var viewContext = CreateViewContext();
+            viewContext.ClientValidationEnabled = false;
+
+            var validationSummaryTagHelper = new ValidationSummaryTagHelper(htmlGenerator)
+            {
+                ValidationSummary = ValidationSummary.All,
+                ViewContext = viewContext,
+            };
+
+            var output = new TagHelperOutput(
+                "div",
+                new TagHelperAttributeList(),
+                (useCachedResult, encoder) =>
+                {
+                    throw new InvalidOperationException("getChildContentAsync called unexpectedly.");
+                });
+
+            var context = new TagHelperContext(
+                tagName: "div",
+                allAttributes: new TagHelperAttributeList(),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act
+            await validationSummaryTagHelper.ProcessAsync(context, output);
+
+            // Assert
+            Assert.Null(output.TagName);
+            Assert.Empty(output.Attributes);
+            Assert.Empty(HtmlContentUtilities.HtmlContentToString(output));
+        }
+
+        public static TheoryData<string, ModelStateDictionary> ProcessAsync_SuppressesOutput_IfModelOnlyWithNoModelErrorData
+        {
+            get
+            {
+                var emptyModelState = new ModelStateDictionary();
+
+                var modelState = new ModelStateDictionary();
+                SetValidModelState(modelState);
+
+                var invalidModelState = new ModelStateDictionary();
+                SetValidModelState(invalidModelState);
+                invalidModelState.AddModelError($"{nameof(Model.Strings)}[1]", "This value is invalid.");
+
+                return new TheoryData<string, ModelStateDictionary>
+                {
+                    { string.Empty, emptyModelState },
+                    { string.Empty, modelState },
+                    { nameof(Model.Text), modelState },
+                    { "not-a-key", modelState },
+                    { string.Empty, invalidModelState },
+                    { $"{nameof(Model.Strings)}[2]", invalidModelState },
+                    { nameof(Model.Text), invalidModelState },
+                    { "not-a-key", invalidModelState },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ProcessAsync_SuppressesOutput_IfModelOnlyWithNoModelErrorData))]
+        public async Task ProcessAsync_SuppressesOutput_IfModelOnly_WithNoModelError(
+            string prefix,
+            ModelStateDictionary modelStateDictionary)
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+            var viewContext = CreateViewContext();
+            viewContext.ViewData.TemplateInfo.HtmlFieldPrefix = prefix;
+
+            var validationSummaryTagHelper = new ValidationSummaryTagHelper(htmlGenerator)
+            {
+                ValidationSummary = ValidationSummary.ModelOnly,
+                ViewContext = viewContext,
+            };
+
+            var output = new TagHelperOutput(
+                "div",
+                new TagHelperAttributeList(),
+                (useCachedResult, encoder) =>
+                {
+                    throw new InvalidOperationException("getChildContentAsync called unexpectedly.");
+                });
+
+            var context = new TagHelperContext(
+                tagName: "div",
+                allAttributes: new TagHelperAttributeList(),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act
+            await validationSummaryTagHelper.ProcessAsync(context, output);
+
+            // Assert
+            Assert.Null(output.TagName);
+            Assert.Empty(output.Attributes);
+            Assert.Empty(HtmlContentUtilities.HtmlContentToString(output));
+        }
+
+        [Theory]
+        [InlineData(ValidationSummary.All)]
+        [InlineData(ValidationSummary.ModelOnly)]
+        public async Task ProcessAsync_GeneratesExpectedOutput_WithModelError(ValidationSummary validationSummary)
+        {
+            // Arrange
+            var expectedError = "I am an error.";
+            var expectedTagName = "not-div";
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+
+            var validationSummaryTagHelper = new ValidationSummaryTagHelper(htmlGenerator)
+            {
+                ValidationSummary = validationSummary,
+            };
+
+            var expectedPreContent = "original pre-content";
+            var expectedContent = "original content";
+            var tagHelperContext = new TagHelperContext(
+                tagName: "not-div",
+                allAttributes: new TagHelperAttributeList(),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                attributes: new TagHelperAttributeList
+                {
+                    { "class", "form-control" }
+                },
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            output.PreContent.SetContent(expectedPreContent);
+            output.Content.SetContent(expectedContent);
+            output.PostContent.SetContent("Custom Content");
+
+            var model = new Model();
+            var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator, metadataProvider);
+            validationSummaryTagHelper.ViewContext = viewContext;
+
+            var modelState = viewContext.ModelState;
+            SetValidModelState(modelState);
+            modelState.AddModelError(string.Empty, expectedError);
+
+            // Act
+            await validationSummaryTagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.InRange(output.Attributes.Count, low: 1, high: 2);
+            var attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("class"));
+            Assert.Equal(
+                new TagHelperAttribute("class", "form-control validation-summary-errors"),
+                attribute,
+                CaseSensitiveTagHelperAttributeComparer.Default);
+
+            Assert.Equal(expectedPreContent, output.PreContent.GetContent());
+            Assert.Equal(expectedContent, output.Content.GetContent());
+            Assert.Equal(
+                $"Custom Content<ul><li>{expectedError}</li>{Environment.NewLine}</ul>",
+                output.PostContent.GetContent());
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Fact]
+        public async Task ProcessAsync_GeneratesExpectedOutput_WithPropertyErrors()
+        {
+            // Arrange
+            var expectedError0 = "I am an error.";
+            var expectedError2 = "I am also an error.";
+            var expectedTagName = "not-div";
+            var expectedAttributes = new TagHelperAttributeList
+            {
+                new TagHelperAttribute("class", "form-control validation-summary-errors"),
+                new TagHelperAttribute("data-valmsg-summary", "true"),
+            };
+
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = new TestableHtmlGenerator(metadataProvider);
+            var validationSummaryTagHelper = new ValidationSummaryTagHelper(htmlGenerator)
+            {
+                ValidationSummary = ValidationSummary.All,
+            };
+
+            var expectedPreContent = "original pre-content";
+            var expectedContent = "original content";
+            var tagHelperContext = new TagHelperContext(
+                tagName: "not-div",
+                allAttributes: new TagHelperAttributeList(),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+            var output = new TagHelperOutput(
+                expectedTagName,
+                attributes: new TagHelperAttributeList
+                {
+                    { "class", "form-control" }
+                },
+                getChildContentAsync: (useCachedResult, encoder) =>
+                {
+                    var tagHelperContent = new DefaultTagHelperContent();
+                    tagHelperContent.SetContent("Something");
+                    return Task.FromResult<TagHelperContent>(tagHelperContent);
+                });
+            output.PreContent.SetContent(expectedPreContent);
+            output.Content.SetContent(expectedContent);
+            output.PostContent.SetContent("Custom Content");
+
+            var model = new Model();
+            var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator, metadataProvider);
+            validationSummaryTagHelper.ViewContext = viewContext;
+
+            var modelState = viewContext.ModelState;
+            SetValidModelState(modelState);
+            modelState.AddModelError(key: $"{nameof(Model.Strings)}[0]", errorMessage: expectedError0);
+            modelState.AddModelError(key: $"{nameof(Model.Strings)}[2]", errorMessage: expectedError2);
+
+            // Act
+            await validationSummaryTagHelper.ProcessAsync(tagHelperContext, output);
+
+            // Assert
+            Assert.Equal(expectedAttributes, output.Attributes, CaseSensitiveTagHelperAttributeComparer.Default);
+            Assert.Equal(expectedPreContent, output.PreContent.GetContent());
+            Assert.Equal(expectedContent, output.Content.GetContent());
+            Assert.Equal(
+                $"Custom Content<ul><li>{expectedError0}</li>{Environment.NewLine}" +
+                $"<li>{expectedError2}</li>{Environment.NewLine}</ul>",
+                output.PostContent.GetContent());
+            Assert.Equal(expectedTagName, output.TagName);
+        }
+
+        [Theory]
+        [InlineData(ValidationSummary.All, false)]
+        [InlineData(ValidationSummary.ModelOnly, true)]
+        public async Task ProcessAsync_CallsIntoGenerateValidationSummaryWithExpectedParameters(
+            ValidationSummary validationSummary,
+            bool expectedExcludePropertyErrors)
+        {
+            // Arrange
+            var expectedViewContext = CreateViewContext();
+
+            var generator = new Mock<IHtmlGenerator>();
+            generator
+                .Setup(mock => mock.GenerateValidationSummary(
+                    expectedViewContext,
+                    expectedExcludePropertyErrors,
+                    null,   // message
+                    null,   // headerTag
+                    null))  // htmlAttributes
+                .Returns(new TagBuilder("div"))
+                .Verifiable();
+
+            var validationSummaryTagHelper = new ValidationSummaryTagHelper(generator.Object)
+            {
+                ValidationSummary = validationSummary,
+            };
+
+            var expectedPreContent = "original pre-content";
+            var expectedContent = "original content";
+            var expectedPostContent = "original post-content";
+            var output = new TagHelperOutput(
+                tagName: "div",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+            output.PreContent.SetContent(expectedPreContent);
+            output.Content.SetContent(expectedContent);
+            output.PostContent.SetContent(expectedPostContent);
+
+            validationSummaryTagHelper.ViewContext = expectedViewContext;
+
+            var context = new TagHelperContext(
+                tagName: "div",
+                allAttributes: new TagHelperAttributeList(),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act & Assert
+            await validationSummaryTagHelper.ProcessAsync(context, output);
+
+            generator.Verify();
+            Assert.Equal("div", output.TagName);
+            Assert.Empty(output.Attributes);
+            Assert.Equal(expectedPreContent, output.PreContent.GetContent());
+            Assert.Equal(expectedContent, output.Content.GetContent());
+            Assert.Equal(expectedPostContent, output.PostContent.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_MergesTagBuilderFromGenerateValidationSummary()
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder("span2");
+            tagBuilder.InnerHtml.SetHtmlContent("New HTML");
+            tagBuilder.Attributes.Add("anything", "something");
+            tagBuilder.Attributes.Add("data-foo", "bar");
+            tagBuilder.Attributes.Add("data-hello", "world");
+
+            var generator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            generator
+                .Setup(mock => mock.GenerateValidationSummary(
+                    It.IsAny<ViewContext>(),
+                    It.IsAny<bool>(),
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>()))
+                .Returns(tagBuilder);
+
+            var validationSummaryTagHelper = new ValidationSummaryTagHelper(generator.Object)
+            {
+                ValidationSummary = ValidationSummary.ModelOnly,
+            };
+
+            var expectedPreContent = "original pre-content";
+            var expectedContent = "original content";
+            var output = new TagHelperOutput(
+                tagName: "div",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+            output.PreContent.SetContent(expectedPreContent);
+            output.Content.SetContent(expectedContent);
+            output.PostContent.SetContent("Content of validation summary");
+
+            var viewContext = CreateViewContext();
+            validationSummaryTagHelper.ViewContext = viewContext;
+
+            var context = new TagHelperContext(
+                tagName: "div",
+                allAttributes: new TagHelperAttributeList(),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act
+            await validationSummaryTagHelper.ProcessAsync(context, output);
+
+            // Assert
+            Assert.Equal("div", output.TagName);
+            Assert.Collection(
+                output.Attributes,
+                attribute =>
+                {
+                    Assert.Equal("anything", attribute.Name);
+                    Assert.Equal("something", attribute.Value);
+                },
+                attribute =>
+                {
+                    Assert.Equal("data-foo", attribute.Name);
+                    Assert.Equal("bar", attribute.Value);
+                },
+                attribute =>
+                {
+                    Assert.Equal("data-hello", attribute.Name);
+                    Assert.Equal("world", attribute.Value);
+                });
+            Assert.Equal(expectedPreContent, output.PreContent.GetContent());
+            Assert.Equal(expectedContent, output.Content.GetContent());
+            Assert.Equal("Content of validation summaryNew HTML", output.PostContent.GetContent());
+        }
+
+        [Fact]
+        public async Task ProcessAsync_DoesNothingIfValidationSummaryNone()
+        {
+            // Arrange
+            var generator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+
+            var validationSummaryTagHelper = new ValidationSummaryTagHelper(generator.Object)
+            {
+                ValidationSummary = ValidationSummary.None,
+            };
+
+            var expectedPreContent = "original pre-content";
+            var expectedContent = "original content";
+            var expectedPostContent = "original post-content";
+            var output = new TagHelperOutput(
+                tagName: "div",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+            output.PreContent.SetContent(expectedPreContent);
+            output.Content.SetContent(expectedContent);
+            output.PostContent.SetContent(expectedPostContent);
+
+            var viewContext = CreateViewContext();
+            validationSummaryTagHelper.ViewContext = viewContext;
+
+            var context = new TagHelperContext(
+                tagName: "div",
+                allAttributes: new TagHelperAttributeList(),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act
+            await validationSummaryTagHelper.ProcessAsync(context, output);
+
+            // Assert
+            Assert.Equal("div", output.TagName);
+            Assert.Empty(output.Attributes);
+            Assert.Equal(expectedPreContent, output.PreContent.GetContent());
+            Assert.Equal(expectedContent, output.Content.GetContent());
+            Assert.Equal(expectedPostContent, output.PostContent.GetContent());
+        }
+
+        [Theory]
+        [InlineData(ValidationSummary.All)]
+        [InlineData(ValidationSummary.ModelOnly)]
+        public async Task ProcessAsync_GeneratesValidationSummaryWhenNotNone(ValidationSummary validationSummary)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder("span2");
+            tagBuilder.InnerHtml.SetHtmlContent("New HTML");
+
+            var generator = new Mock<IHtmlGenerator>();
+            generator
+                .Setup(mock => mock.GenerateValidationSummary(
+                    It.IsAny<ViewContext>(),
+                    It.IsAny<bool>(),
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>()))
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            var validationSummaryTagHelper = new ValidationSummaryTagHelper(generator.Object)
+            {
+                ValidationSummary = validationSummary,
+            };
+
+            var expectedPreContent = "original pre-content";
+            var expectedContent = "original content";
+            var output = new TagHelperOutput(
+                tagName: "div",
+                attributes: new TagHelperAttributeList(),
+                getChildContentAsync: (useCachedResult, encoder) => Task.FromResult<TagHelperContent>(
+                    new DefaultTagHelperContent()));
+            output.PreContent.SetContent(expectedPreContent);
+            output.Content.SetContent(expectedContent);
+            output.PostContent.SetContent("Content of validation message");
+
+            var viewContext = CreateViewContext();
+            validationSummaryTagHelper.ViewContext = viewContext;
+
+            var context = new TagHelperContext(
+                tagName: "div",
+                allAttributes: new TagHelperAttributeList(),
+                items: new Dictionary<object, object>(),
+                uniqueId: "test");
+
+            // Act
+            await validationSummaryTagHelper.ProcessAsync(context, output);
+
+            // Assert
+            Assert.Equal("div", output.TagName);
+            Assert.Empty(output.Attributes);
+            Assert.Equal(expectedPreContent, output.PreContent.GetContent());
+            Assert.Equal(expectedContent, output.Content.GetContent());
+            Assert.Equal("Content of validation messageNew HTML", output.PostContent.GetContent());
+            generator.Verify();
+        }
+
+        [Theory]
+        [InlineData((ValidationSummary)(-1))]
+        [InlineData((ValidationSummary)23)]
+        [InlineData(ValidationSummary.All | ValidationSummary.ModelOnly)]
+        [ReplaceCulture]
+        public void ValidationSummaryProperty_ThrowsWhenSetToInvalidValidationSummaryValue(
+            ValidationSummary validationSummary)
+        {
+            // Arrange
+            var generator = new TestableHtmlGenerator(new EmptyModelMetadataProvider());
+
+            var validationSummaryTagHelper = new ValidationSummaryTagHelper(generator);
+            var validationTypeName = typeof(ValidationSummary).FullName;
+            var expectedMessage = $"The value of argument 'value' ({validationSummary}) is invalid for Enum type '{validationTypeName}'.";
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => validationSummaryTagHelper.ValidationSummary = validationSummary,
+                "value",
+                expectedMessage);
+        }
+
+        private static ViewContext CreateViewContext()
+        {
+            var actionContext = new ActionContext(
+                new DefaultHttpContext(),
+                new RouteData(),
+                new ActionDescriptor());
+
+            return new ViewContext(
+                actionContext,
+                Mock.Of<IView>(),
+                new ViewDataDictionary(
+                    new EmptyModelMetadataProvider(),
+                    new ModelStateDictionary()),
+                Mock.Of<ITempDataDictionary>(),
+                TextWriter.Null,
+                new HtmlHelperOptions());
+        }
+
+        private static void SetValidModelState(ModelStateDictionary modelState)
+        {
+            modelState.SetModelValue(key: nameof(Model.Empty), rawValue: null, attemptedValue: null);
+            modelState.SetModelValue(key: $"{nameof(Model.Strings)}[0]", rawValue: null, attemptedValue: null);
+            modelState.SetModelValue(key: $"{nameof(Model.Strings)}[1]", rawValue: null, attemptedValue: null);
+            modelState.SetModelValue(key: $"{nameof(Model.Strings)}[2]", rawValue: null, attemptedValue: null);
+            modelState.SetModelValue(key: nameof(Model.Text), rawValue: null, attemptedValue: null);
+
+            foreach (var key in modelState.Keys)
+            {
+                modelState.MarkFieldValid(key);
+            }
+        }
+
+        private class Model
+        {
+            public string Text { get; set; }
+
+            public string[] Strings { get; set; }
+
+            // Exists to ensure #4989 does not regress. Issue specific to case where collection has a ModelStateEntry
+            // but no element does.
+            public byte[] Empty { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/IntegrationTest/CompatibilitySwitchIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/IntegrationTest/CompatibilitySwitchIntegrationTest.cs
new file mode 100644
index 0000000000..998343d7bb
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/IntegrationTest/CompatibilitySwitchIntegrationTest.cs
@@ -0,0 +1,99 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.ObjectPool;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.IntegrationTest
+{
+    // Integration tests for compatibility switches. These tests verify which compatibility
+    // values apply to each supported version.
+    //
+    // If you add a new compatibility switch, make sure to update ALL of these tests. Each test
+    // here should include verification for all of the switches.
+    public class CompatibilitySwitchIntegrationTest
+    {
+        [Fact]
+        public void CompatibilitySwitches_Version_2_0()
+        {
+            // Arrange
+            var serviceCollection = new ServiceCollection();
+            AddHostingServices(serviceCollection);
+            serviceCollection.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_0);
+
+            var services = serviceCollection.BuildServiceProvider();
+
+            // Act
+            var mvcOptions = services.GetRequiredService<IOptions<MvcOptions>>().Value;
+            var jsonOptions = services.GetRequiredService<IOptions<MvcJsonOptions>>().Value;
+            var razorPagesOptions = services.GetRequiredService<IOptions<RazorPagesOptions>>().Value;
+
+            // Assert
+            Assert.False(mvcOptions.AllowCombiningAuthorizeFilters);
+            Assert.False(mvcOptions.AllowBindingHeaderValuesToNonStringModelTypes);
+            Assert.False(mvcOptions.SuppressBindingUndefinedValueToEnumType);
+            Assert.Equal(InputFormatterExceptionPolicy.AllExceptions, mvcOptions.InputFormatterExceptionPolicy);
+            Assert.False(jsonOptions.AllowInputFormatterExceptionMessages);
+            Assert.False(razorPagesOptions.AllowAreas);
+        }
+
+        [Fact]
+        public void CompatibilitySwitches_Version_2_1()
+        {
+            // Arrange
+            var serviceCollection = new ServiceCollection();
+            AddHostingServices(serviceCollection);
+            serviceCollection.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+
+            var services = serviceCollection.BuildServiceProvider();
+
+            // Act
+            var mvcOptions = services.GetRequiredService<IOptions<MvcOptions>>().Value;
+            var jsonOptions = services.GetRequiredService<IOptions<MvcJsonOptions>>().Value;
+            var razorPagesOptions = services.GetRequiredService<IOptions<RazorPagesOptions>>().Value;
+
+            // Assert
+            Assert.True(mvcOptions.AllowCombiningAuthorizeFilters);
+            Assert.True(mvcOptions.AllowBindingHeaderValuesToNonStringModelTypes);
+            Assert.True(mvcOptions.SuppressBindingUndefinedValueToEnumType);
+            Assert.Equal(InputFormatterExceptionPolicy.MalformedInputExceptions, mvcOptions.InputFormatterExceptionPolicy);
+            Assert.True(jsonOptions.AllowInputFormatterExceptionMessages);
+            Assert.True(razorPagesOptions.AllowAreas);
+        }
+
+        [Fact]
+        public void CompatibilitySwitches_Version_Latest()
+        {
+            // Arrange
+            var serviceCollection = new ServiceCollection();
+            AddHostingServices(serviceCollection);
+            serviceCollection.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Latest);
+
+            var services = serviceCollection.BuildServiceProvider();
+
+            // Act
+            var mvcOptions = services.GetRequiredService<IOptions<MvcOptions>>().Value;
+            var jsonOptions = services.GetRequiredService<IOptions<MvcJsonOptions>>().Value;
+            var razorPagesOptions = services.GetRequiredService<IOptions<RazorPagesOptions>>().Value;
+
+            // Assert
+            Assert.True(mvcOptions.AllowCombiningAuthorizeFilters);
+            Assert.True(mvcOptions.AllowBindingHeaderValuesToNonStringModelTypes);
+            Assert.True(mvcOptions.SuppressBindingUndefinedValueToEnumType);
+            Assert.Equal(InputFormatterExceptionPolicy.MalformedInputExceptions, mvcOptions.InputFormatterExceptionPolicy);
+            Assert.True(jsonOptions.AllowInputFormatterExceptionMessages);
+            Assert.True(razorPagesOptions.AllowAreas);
+        }
+
+        // This just does the minimum needed to be able to resolve these options.
+        private static void AddHostingServices(IServiceCollection serviceCollection)
+        {
+            serviceCollection.AddLogging();
+            serviceCollection.AddSingleton<ObjectPoolProvider, DefaultObjectPoolProvider>();
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/JsonPatchExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/JsonPatchExtensionsTest.cs
new file mode 100644
index 0000000000..5823345a4c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/JsonPatchExtensionsTest.cs
@@ -0,0 +1,99 @@
+// 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.
+
+using System.Linq;
+using Microsoft.AspNetCore.JsonPatch;
+using Microsoft.AspNetCore.JsonPatch.Operations;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class JsonPatchExtensionsTest
+    {
+        [Fact]
+        public void ApplyTo_JsonPatchDocument_ModelState()
+        {
+            // Arrange
+            var operation = new Operation<Customer>("add", "CustomerId", from: null, value: "TestName");
+            var patchDoc = new JsonPatchDocument<Customer>();
+            patchDoc.Operations.Add(operation);
+
+            var modelState = new ModelStateDictionary();
+
+            // Act
+            patchDoc.ApplyTo(new Customer(), modelState);
+
+            // Assert
+            var error = Assert.Single(modelState["Customer"].Errors);
+            Assert.Equal("The target location specified by path segment 'CustomerId' was not found.", error.ErrorMessage);
+        }
+
+        [Fact]
+        public void ApplyTo_JsonPatchDocument_PrefixModelState()
+        {
+            // Arrange
+            var operation = new Operation<Customer>("add", "CustomerId", from: null, value: "TestName");
+            var patchDoc = new JsonPatchDocument<Customer>();
+            patchDoc.Operations.Add(operation);
+
+            var modelState = new ModelStateDictionary();
+
+            // Act
+            patchDoc.ApplyTo(new Customer(), modelState, "jsonpatch");
+
+            // Assert
+            var error = Assert.Single(modelState["jsonpatch.Customer"].Errors);
+            Assert.Equal("The target location specified by path segment 'CustomerId' was not found.", error.ErrorMessage);
+        }
+
+        [Fact]
+        public void ApplyTo_ValidPatchOperation_NoErrorsAdded()
+        {
+            // Arrange
+            var patch = new JsonPatchDocument<Customer>();
+            patch.Operations.Add(new Operation<Customer>("replace", "/CustomerName", null, "James"));
+            var model = new Customer();
+            var modelState = new ModelStateDictionary();
+
+            // Act
+            patch.ApplyTo(model, modelState);
+
+            // Assert
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.Equal("James", model.CustomerName);
+        }
+
+        [Theory]
+        [InlineData("test", "/CustomerName", null, "James", "The current value '' at path 'CustomerName' is not equal to the test value 'James'.")]
+        [InlineData("invalid", "/CustomerName", null, "James", "Invalid JsonPatch operation 'invalid'.")]
+        [InlineData("", "/CustomerName", null, "James", "Invalid JsonPatch operation ''.")]
+        public void ApplyTo_InvalidPatchOperations_AddsModelStateError(
+            string op,
+            string path,
+            string from,
+            string value,
+            string error)
+        {
+            // Arrange
+            var patch = new JsonPatchDocument<Customer>();
+            patch.Operations.Add(new Operation<Customer>(op, path, from, value));
+            var model = new Customer();
+            var modelState = new ModelStateDictionary();
+
+            // Act
+            patch.ApplyTo(model, modelState);
+
+            // Assert
+            Assert.Equal(1, modelState.ErrorCount);
+            Assert.Equal(nameof(Customer), modelState.First().Key);
+            Assert.Single(modelState.First().Value.Errors);
+            Assert.Equal(error, modelState.First().Value.Errors.First().ErrorMessage);
+        }
+
+        private class Customer
+        {
+            public string CustomerName { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj
new file mode 100644
index 0000000000..90beaff56b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Formatters.Xml\Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj" />
+
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/MvcOptionsSetupTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/MvcOptionsSetupTest.cs
new file mode 100644
index 0000000000..eb9f5434a3
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/MvcOptionsSetupTest.cs
@@ -0,0 +1,288 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading;
+using System.Xml;
+using System.Xml.Linq;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.JsonPatch;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.ObjectPool;
+using Microsoft.Extensions.Options;
+using Moq;
+using Newtonsoft.Json.Linq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class MvcOptionsSetupTest
+    {
+        [Fact]
+        public void Setup_SetsUpViewEngines()
+        {
+            // Arrange & Act
+            var options = GetOptions<MvcViewOptions>(AddViewEngineOptionsServices);
+
+            // Assert
+            var viewEngine = Assert.Single(options.ViewEngines);
+            Assert.IsType<RazorViewEngine>(viewEngine);
+        }
+
+        [Fact]
+        public void Setup_SetsUpModelBinderProviders()
+        {
+            // Arrange & Act
+            var options = GetOptions<MvcOptions>();
+
+            // Assert
+            Assert.Collection(
+                options.ModelBinderProviders,
+                binder => Assert.IsType<BinderTypeModelBinderProvider>(binder),
+                binder => Assert.IsType<ServicesModelBinderProvider>(binder),
+                binder => Assert.IsType<BodyModelBinderProvider>(binder),
+                binder => Assert.IsType<HeaderModelBinderProvider>(binder),
+                binder => Assert.IsType<FloatingPointTypeModelBinderProvider>(binder),
+                binder => Assert.IsType<EnumTypeModelBinderProvider>(binder),
+                binder => Assert.IsType<SimpleTypeModelBinderProvider>(binder),
+                binder => Assert.IsType<CancellationTokenModelBinderProvider>(binder),
+                binder => Assert.IsType<ByteArrayModelBinderProvider>(binder),
+                binder => Assert.IsType<FormFileModelBinderProvider>(binder),
+                binder => Assert.IsType<FormCollectionModelBinderProvider>(binder),
+                binder => Assert.IsType<KeyValuePairModelBinderProvider>(binder),
+                binder => Assert.IsType<DictionaryModelBinderProvider>(binder),
+                binder => Assert.IsType<ArrayModelBinderProvider>(binder),
+                binder => Assert.IsType<CollectionModelBinderProvider>(binder),
+                binder => Assert.IsType<ComplexTypeModelBinderProvider>(binder));
+        }
+
+        [Fact]
+        public void Setup_SetsUpValueProviders()
+        {
+            // Arrange & Act
+            var options = GetOptions<MvcOptions>();
+
+            // Assert
+            var valueProviders = options.ValueProviderFactories;
+            Assert.Collection(valueProviders,
+                provider => Assert.IsType<FormValueProviderFactory>(provider),
+                provider => Assert.IsType<RouteValueProviderFactory>(provider),
+                provider => Assert.IsType<QueryStringValueProviderFactory>(provider),
+                provider => Assert.IsType<JQueryFormValueProviderFactory>(provider));
+        }
+
+        [Fact]
+        public void Setup_SetsUpOutputFormatters()
+        {
+            // Arrange & Act
+            var options = GetOptions<MvcOptions>();
+
+            // Assert
+            Assert.Collection(options.OutputFormatters,
+                formatter => Assert.IsType<HttpNoContentOutputFormatter>(formatter),
+                formatter => Assert.IsType<StringOutputFormatter>(formatter),
+                formatter => Assert.IsType<StreamOutputFormatter>(formatter),
+                formatter => Assert.IsType<JsonOutputFormatter>(formatter));
+        }
+
+        [Fact]
+        public void Setup_SetsUpInputFormatters()
+        {
+            // Arrange & Act
+            var options = GetOptions<MvcOptions>();
+
+            // Assert
+            Assert.Collection(options.InputFormatters,
+                formatter => Assert.IsType<JsonPatchInputFormatter>(formatter),
+                formatter => Assert.IsType<JsonInputFormatter>(formatter));
+        }
+
+        [Fact]
+        public void Setup_SetsUpModelValidatorProviders()
+        {
+            // Arrange & Act
+            var options = GetOptions<MvcOptions>();
+
+            // Assert
+            Assert.Collection(options.ModelValidatorProviders,
+                validator => Assert.IsType<DefaultModelValidatorProvider>(validator),
+                validator => Assert.IsType<DataAnnotationsModelValidatorProvider>(validator));
+        }
+
+        [Fact]
+        public void Setup_SetsUpClientModelValidatorProviders()
+        {
+            // Arrange & Act
+            var options = GetOptions<MvcViewOptions>(AddViewEngineOptionsServices);
+
+            // Assert
+            Assert.Collection(options.ClientModelValidatorProviders,
+                validator => Assert.IsType<DefaultClientModelValidatorProvider>(validator),
+                validator => Assert.IsType<DataAnnotationsClientModelValidatorProvider>(validator),
+                validator => Assert.IsType<NumericClientModelValidatorProvider>(validator));
+        }
+
+        [Fact]
+        public void Setup_IgnoresAcceptHeaderHavingWildCardMediaAndSubMediaTypes()
+        {
+            // Arrange & Act
+            var options = GetOptions<MvcOptions>();
+
+            // Assert
+            Assert.False(options.RespectBrowserAcceptHeader);
+        }
+
+        [Fact]
+        public void Setup_SetsUpMetadataDetailsProviders()
+        {
+            // Arrange & Act
+            var options = GetOptions<MvcOptions>(services =>
+            {
+                var builder = new MvcCoreBuilder(services, new ApplicationPartManager());
+                builder.AddXmlDataContractSerializerFormatters();
+            });
+
+            // Assert
+            var providers = options.ModelMetadataDetailsProviders;
+            Assert.Collection(providers,
+                provider => Assert.IsType<ExcludeBindingMetadataProvider>(provider),
+                provider => Assert.IsType<DefaultBindingMetadataProvider>(provider),
+                provider => Assert.IsType<DefaultValidationMetadataProvider>(provider),
+                provider =>
+                {
+                    var specialParameter = Assert.IsType<BindingSourceMetadataProvider>(provider);
+                    Assert.Equal(typeof(CancellationToken), specialParameter.Type);
+                    Assert.Equal(BindingSource.Special, specialParameter.BindingSource);
+                },
+                provider =>
+                {
+                    var formFileParameter = Assert.IsType<BindingSourceMetadataProvider>(provider);
+                    Assert.Equal(typeof(IFormFile), formFileParameter.Type);
+                    Assert.Equal(BindingSource.FormFile, formFileParameter.BindingSource);
+                },
+                provider =>
+                {
+                    var formCollectionParameter = Assert.IsType<BindingSourceMetadataProvider>(provider);
+                    Assert.Equal(typeof(IFormCollection), formCollectionParameter.Type);
+                    Assert.Equal(BindingSource.FormFile, formCollectionParameter.BindingSource);
+                },
+                provider =>
+                {
+                    var formFileParameter = Assert.IsType<BindingSourceMetadataProvider>(provider);
+                    Assert.Equal(typeof(IFormFileCollection), formFileParameter.Type);
+                    Assert.Equal(BindingSource.FormFile, formFileParameter.BindingSource);
+                },
+                provider =>
+                {
+                    var excludeFilter = Assert.IsType<SuppressChildValidationMetadataProvider>(provider);
+                    Assert.Equal(typeof(Type), excludeFilter.Type);
+                },
+                provider =>
+                {
+                    var excludeFilter = Assert.IsType<SuppressChildValidationMetadataProvider>(provider);
+                    Assert.Equal(typeof(Uri), excludeFilter.Type);
+                },
+                provider =>
+                {
+                    var excludeFilter = Assert.IsType<SuppressChildValidationMetadataProvider>(provider);
+                    Assert.Equal(typeof(CancellationToken), excludeFilter.Type);
+                },
+                provider =>
+                {
+                    var excludeFilter = Assert.IsType<SuppressChildValidationMetadataProvider>(provider);
+                    Assert.Equal(typeof(IFormFile), excludeFilter.Type);
+                },
+                provider =>
+                {
+                    var excludeFilter = Assert.IsType<SuppressChildValidationMetadataProvider>(provider);
+                    Assert.Equal(typeof(IFormCollection), excludeFilter.Type);
+                },
+                provider =>
+                {
+                    var excludeFilter = Assert.IsType<SuppressChildValidationMetadataProvider>(provider);
+                    Assert.Equal(typeof(IFormFileCollection), excludeFilter.Type);
+                },
+                provider =>
+                {
+                    var excludeFilter = Assert.IsType<SuppressChildValidationMetadataProvider>(provider);
+                    Assert.Equal(typeof(Stream), excludeFilter.Type);
+                },
+                provider => Assert.IsType<DataAnnotationsMetadataProvider>(provider),
+                provider =>
+                {
+                    var excludeFilter = Assert.IsType<SuppressChildValidationMetadataProvider>(provider);
+                    Assert.Equal(typeof(IJsonPatchDocument), excludeFilter.Type);
+                },
+                provider =>
+                {
+                    var excludeFilter = Assert.IsType<SuppressChildValidationMetadataProvider>(provider);
+                    Assert.Equal(typeof(JToken), excludeFilter.Type);
+                },
+                provider => Assert.IsType<DataMemberRequiredBindingMetadataProvider>(provider),
+                provider =>
+                {
+                    var excludeFilter = Assert.IsType<SuppressChildValidationMetadataProvider>(provider);
+                    Assert.Equal(typeof(XObject).FullName, excludeFilter.FullTypeName);
+                },
+                provider =>
+                {
+                    var excludeFilter = Assert.IsType<SuppressChildValidationMetadataProvider>(provider);
+                    Assert.Equal(typeof(XmlNode).FullName, excludeFilter.FullTypeName);
+                });
+        }
+
+        private static T GetOptions<T>(Action<IServiceCollection> action = null)
+            where T : class, new()
+        {
+            var serviceProvider = GetServiceProvider(action);
+            return serviceProvider.GetRequiredService<IOptions<T>>().Value;
+        }
+
+        private static IServiceProvider GetServiceProvider(Action<IServiceCollection> action = null)
+        {
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddSingleton(new ApplicationPartManager());
+            serviceCollection.AddSingleton<DiagnosticSource>(new DiagnosticListener("Microsoft.AspNetCore.Mvc"));
+            serviceCollection.AddMvc();
+            serviceCollection
+                .AddSingleton<ObjectPoolProvider, DefaultObjectPoolProvider>()
+                .AddTransient<ILoggerFactory, LoggerFactory>();
+
+            if (action != null)
+            {
+                action(serviceCollection);
+            }
+
+            var serviceProvider = serviceCollection.BuildServiceProvider();
+            return serviceProvider;
+        }
+
+        private static void AddViewEngineOptionsServices(IServiceCollection serviceCollection)
+        {
+            var hostingEnvironment = new Mock<IHostingEnvironment>();
+            hostingEnvironment.SetupGet(e => e.ApplicationName)
+                .Returns(typeof(MvcOptionsSetupTest).GetTypeInfo().Assembly.GetName().Name);
+
+            hostingEnvironment.SetupGet(e => e.ContentRootFileProvider)
+                .Returns(Mock.Of<IFileProvider>());
+
+            serviceCollection.AddSingleton(hostingEnvironment.Object);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/MvcServiceCollectionExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/MvcServiceCollectionExtensionsTest.cs
new file mode 100644
index 0000000000..a9fa6f7d9c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/MvcServiceCollectionExtensionsTest.cs
@@ -0,0 +1,530 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Cors.Internal;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Formatters.Json;
+using Microsoft.AspNetCore.Mvc.Formatters.Json.Internal;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.AspNetCore.Mvc.RazorPages.Internal;
+using Microsoft.AspNetCore.Mvc.TagHelpers;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.ObjectPool;
+using Microsoft.Extensions.Options;
+using Moq;
+using Newtonsoft.Json.Serialization;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class MvcServiceCollectionExtensionsTest
+    {
+        // Some MVC services can be registered multiple times, for example, 'IConfigureOptions<MvcOptions>' can
+        // be registered by calling 'ConfigureMvc(...)' before the call to 'AddMvc()' in which case the options
+        // configuration is run in the order they were registered.
+        //
+        // For these kind of multi registration service types, we want to make sure that MVC will still add its
+        // services if the implementation type is different.
+        [Fact]
+        public void MultiRegistrationServiceTypes_AreRegistered_MultipleTimes()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            services.AddSingleton<IHostingEnvironment>(GetHostingEnvironment());
+
+            // Register a mock implementation of each service, AddMvcServices should add another implementation.
+            foreach (var serviceType in MutliRegistrationServiceTypes)
+            {
+                var mockType = typeof(Mock<>).MakeGenericType(serviceType.Key);
+                services.Add(ServiceDescriptor.Transient(serviceType.Key, mockType));
+            }
+
+            // Act
+            services.AddMvc();
+
+            // Assert
+            foreach (var serviceType in MutliRegistrationServiceTypes)
+            {
+                AssertServiceCountEquals(services, serviceType.Key, serviceType.Value.Length + 1);
+
+                foreach (var implementationType in serviceType.Value)
+                {
+                    AssertContainsSingle(services, serviceType.Key, implementationType);
+                }
+            }
+        }
+
+        [Fact]
+        public void SingleRegistrationServiceTypes_AreNotRegistered_MultipleTimes()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            services.AddSingleton<IHostingEnvironment>(GetHostingEnvironment());
+
+            // Register a mock implementation of each service, AddMvcServices should not replace it.
+            foreach (var serviceType in SingleRegistrationServiceTypes)
+            {
+                var mockType = typeof(Mock<>).MakeGenericType(serviceType);
+                services.Add(ServiceDescriptor.Transient(serviceType, mockType));
+            }
+
+            // Act
+            services.AddMvc();
+
+            // Assert
+            foreach (var singleRegistrationType in SingleRegistrationServiceTypes)
+            {
+                AssertServiceCountEquals(services, singleRegistrationType, 1);
+            }
+        }
+
+        [Fact]
+        public void AddMvcServicesTwice_DoesNotAddDuplicates()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            services.AddSingleton<IHostingEnvironment>(GetHostingEnvironment());
+
+            // Act
+            services.AddMvc();
+            services.AddMvc();
+
+            // Assert
+            var singleRegistrationServiceTypes = SingleRegistrationServiceTypes;
+            foreach (var service in services)
+            {
+                if (singleRegistrationServiceTypes.Contains(service.ServiceType))
+                {
+                    // 'single-registration' services should only have one implementation registered.
+                    AssertServiceCountEquals(services, service.ServiceType, 1);
+                }
+                else if (service.ImplementationType != null && !service.ImplementationType.GetTypeInfo().Assembly.FullName.Contains("Mvc"))
+                {
+                    // Ignore types that don't come from MVC
+                }
+                else
+                {
+                    // 'multi-registration' services should only have one *instance* of each implementation registered.
+                    AssertContainsSingle(services, service.ServiceType, service.ImplementationType);
+                }
+            }
+        }
+
+        [Fact]
+        public void AddMvc_AddsAssemblyPartsForFrameworkTagHelpers()
+        {
+            // Arrange
+            var mvcRazorAssembly = typeof(UrlResolutionTagHelper).GetTypeInfo().Assembly;
+            var mvcTagHelpersAssembly = typeof(InputTagHelper).GetTypeInfo().Assembly;
+            var services = new ServiceCollection();
+            var providers = new IApplicationFeatureProvider[]
+            {
+                new ControllerFeatureProvider(),
+                new ViewComponentFeatureProvider()
+            };
+
+            // Act
+            services.AddMvc();
+
+            // Assert
+            var descriptor = Assert.Single(services, d => d.ServiceType == typeof(ApplicationPartManager));
+            Assert.Equal(ServiceLifetime.Singleton, descriptor.Lifetime);
+            Assert.NotNull(descriptor.ImplementationInstance);
+            var manager = Assert.IsType<ApplicationPartManager>(descriptor.ImplementationInstance);
+
+            Assert.Equal(2, manager.ApplicationParts.Count);
+            Assert.Single(manager.ApplicationParts.OfType<AssemblyPart>(), p => p.Assembly == mvcRazorAssembly);
+            Assert.Single(manager.ApplicationParts.OfType<AssemblyPart>(), p => p.Assembly == mvcTagHelpersAssembly);
+        }
+
+        [Fact]
+        public void AddMvcTwice_DoesNotAddDuplicateFramewokrParts()
+        {
+            // Arrange
+            var mvcRazorAssembly = typeof(UrlResolutionTagHelper).GetTypeInfo().Assembly;
+            var mvcTagHelpersAssembly = typeof(InputTagHelper).GetTypeInfo().Assembly;
+            var services = new ServiceCollection();
+            var providers = new IApplicationFeatureProvider[]
+            {
+                new ControllerFeatureProvider(),
+                new ViewComponentFeatureProvider()
+            };
+
+            // Act
+            services.AddMvc();
+            services.AddMvc();
+
+            // Assert
+            var descriptor = Assert.Single(services, d => d.ServiceType == typeof(ApplicationPartManager));
+            Assert.Equal(ServiceLifetime.Singleton, descriptor.Lifetime);
+            Assert.NotNull(descriptor.ImplementationInstance);
+            var manager = Assert.IsType<ApplicationPartManager>(descriptor.ImplementationInstance);
+
+            Assert.Equal(2, manager.ApplicationParts.Count);
+            Assert.Single(manager.ApplicationParts.OfType<AssemblyPart>(), p => p.Assembly == mvcRazorAssembly);
+            Assert.Single(manager.ApplicationParts.OfType<AssemblyPart>(), p => p.Assembly == mvcTagHelpersAssembly);
+        }
+
+        [Fact]
+        public void AddMvcTwice_DoesNotAddApplicationFeatureProvidersTwice()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var providers = new IApplicationFeatureProvider[]
+            {
+                new ControllerFeatureProvider(),
+                new ViewComponentFeatureProvider()
+            };
+
+            // Act
+            services.AddMvc();
+            services.AddMvc();
+
+            // Assert
+            var descriptor = Assert.Single(services, d => d.ServiceType == typeof(ApplicationPartManager));
+            Assert.Equal(ServiceLifetime.Singleton, descriptor.Lifetime);
+            Assert.NotNull(descriptor.ImplementationInstance);
+            var manager = Assert.IsType<ApplicationPartManager>(descriptor.ImplementationInstance);
+
+            Assert.Collection(manager.FeatureProviders,
+                feature => Assert.IsType<ControllerFeatureProvider>(feature),
+                feature => Assert.IsType<ViewComponentFeatureProvider>(feature),
+                feature => Assert.IsType<MetadataReferenceFeatureProvider>(feature),
+                feature => Assert.IsType<TagHelperFeatureProvider>(feature),
+                feature => Assert.IsType<RazorCompiledItemFeatureProvider>(feature),
+#pragma warning disable CS0618 // Type or member is obsolete
+                feature => Assert.IsType<ViewsFeatureProvider>(feature));
+#pragma warning restore CS0618 // Type or member is obsolete
+        }
+
+        [Fact]
+        public void AddMvcCore_ReusesExistingApplicationPartManagerInstance_IfFoundOnServiceCollection()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var manager = new ApplicationPartManager();
+            services.AddSingleton(manager);
+
+            // Act
+            services.AddMvc();
+
+            // Assert
+            var descriptor = Assert.Single(services, d => d.ServiceType == typeof(ApplicationPartManager));
+            Assert.Same(manager, descriptor.ImplementationInstance);
+        }
+
+        [Fact]
+        public void AddMvcCore_AddsMvcJsonOption()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            services.AddMvcCore()
+                .AddJsonOptions((options) =>
+                {
+                    options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
+                });
+
+            // Assert
+            Assert.Single(services, d => d.ServiceType == typeof(IConfigureOptions<MvcJsonOptions>));
+        }
+
+        [Fact]
+        public void AddMvc_NoScopedServiceIsReferredToByASingleton()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            services.AddSingleton<IHostingEnvironment>(GetHostingEnvironment());
+            services.AddSingleton<ObjectPoolProvider, DefaultObjectPoolProvider>();
+            services.AddSingleton<DiagnosticSource>(new DiagnosticListener("Microsoft.AspNet"));
+            services.AddSingleton<IConfiguration>(new ConfigurationBuilder().Build());
+            services.AddLogging();
+            services.AddOptions();
+            services.AddMvc();
+
+            var root = services.BuildServiceProvider(validateScopes: true);
+
+            var scopeFactory = root.GetRequiredService<IServiceScopeFactory>();
+
+            // Act & Assert
+            using (var scope = scopeFactory.CreateScope())
+            {
+                foreach (var serviceType in services.Select(d => d.ServiceType).Where(t => !t.GetTypeInfo().IsGenericTypeDefinition).Distinct())
+                {
+                    // This will throw if something is invalid.
+                    scope.ServiceProvider.GetService(typeof(IEnumerable<>).MakeGenericType(serviceType));
+                }
+            }
+        }
+
+        [Fact]
+        public void AddMvc_RegistersExpectedTempDataProvider()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            services.AddMvc();
+
+            // Assert
+            var descriptor = Assert.Single(services, item => item.ServiceType == typeof(ITempDataProvider));
+            Assert.Equal(typeof(CookieTempDataProvider), descriptor.ImplementationType);
+        }
+
+        [Fact]
+        public void AddMvc_DoesNotRegisterCookieTempDataOptionsConfiguration()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            // Act
+            var builder = services.AddMvc();
+
+            // Assert
+            Assert.DoesNotContain(
+                services,
+                item => item.ServiceType == typeof(IConfigureOptions<CookieTempDataProviderOptions>));
+        }
+
+        private IEnumerable<Type> SingleRegistrationServiceTypes
+        {
+            get
+            {
+                var services = new ServiceCollection();
+                services.AddSingleton<IHostingEnvironment>(GetHostingEnvironment());
+                services.AddMvc();
+
+                var multiRegistrationServiceTypes = MutliRegistrationServiceTypes;
+                return services
+                    .Where(sd => !multiRegistrationServiceTypes.Keys.Contains(sd.ServiceType))
+                    .Where(sd => sd.ServiceType.GetTypeInfo().Assembly.FullName.Contains("Mvc"))
+                    .Select(sd => sd.ServiceType);
+            }
+        }
+
+        private Dictionary<Type, Type[]> MutliRegistrationServiceTypes
+        {
+            get
+            {
+                return new Dictionary<Type, Type[]>()
+                {
+                    {
+                        typeof(IConfigureOptions<MvcOptions>),
+                        new Type[]
+                        {
+                            typeof(MvcCoreMvcOptionsSetup),
+                            typeof(MvcDataAnnotationsMvcOptionsSetup),
+                            typeof(MvcJsonMvcOptionsSetup),
+                            typeof(TempDataMvcOptionsSetup),
+                        }
+                    },
+                    {
+                        typeof(IConfigureOptions<RouteOptions>),
+                        new Type[]
+                        {
+                            typeof(MvcCoreRouteOptionsSetup),
+                        }
+                    },
+                    {
+                        typeof(IConfigureOptions<ApiBehaviorOptions>),
+                        new Type[]
+                        {
+                            typeof(ApiBehaviorOptionsSetup),
+                        }
+                    },
+                    {
+                        typeof(IConfigureOptions<MvcViewOptions>),
+                        new Type[]
+                        {
+                            typeof(MvcViewOptionsSetup),
+                            typeof(MvcRazorMvcViewOptionsSetup),
+                        }
+                    },
+                    {
+                        typeof(IConfigureOptions<RazorViewEngineOptions>),
+                        new[]
+                        {
+                            typeof(RazorViewEngineOptionsSetup),
+                            typeof(RazorPagesRazorViewEngineOptionsSetup),
+                        }
+                    },
+                    {
+                        typeof(IPostConfigureOptions<MvcOptions>),
+                        new[]
+                        {
+                            typeof(MvcOptions).Assembly.GetType("Microsoft.AspNetCore.Mvc.Infrastructure.MvcOptionsConfigureCompatibilityOptions", throwOnError: true),
+                        }
+                    },
+                    {
+                        typeof(IPostConfigureOptions<RazorPagesOptions>),
+                        new[]
+                        {
+                            typeof(RazorPagesOptions).Assembly.GetType("Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptionsConfigureCompatibilityOptions", throwOnError: true),
+                        }
+                    },
+                    {
+                        typeof(IPostConfigureOptions<MvcJsonOptions>),
+                        new[]
+                        {
+                            typeof(MvcJsonOptions).Assembly.GetType("Microsoft.AspNetCore.Mvc.MvcJsonOptionsConfigureCompatibilityOptions", throwOnError: true),
+                        }
+                    },
+                    {
+                        typeof(IActionConstraintProvider),
+                        new Type[]
+                        {
+                            typeof(DefaultActionConstraintProvider),
+                        }
+                    },
+                    {
+                        typeof(IActionDescriptorProvider),
+                        new Type[]
+                        {
+                            typeof(ControllerActionDescriptorProvider),
+                            typeof(PageActionDescriptorProvider),
+                        }
+                    },
+                    {
+                        typeof(IActionInvokerProvider),
+                        new Type[]
+                        {
+                            typeof(ControllerActionInvokerProvider),
+                            typeof(PageActionInvokerProvider),
+                        }
+                    },
+                    {
+                        typeof(IFilterProvider),
+                        new Type[]
+                        {
+                            typeof(DefaultFilterProvider),
+                        }
+                    },
+                    {
+                        typeof(IControllerPropertyActivator),
+                        new Type[]
+                        {
+                            typeof(DefaultControllerPropertyActivator),
+                            typeof(ViewDataDictionaryControllerPropertyActivator),
+                        }
+                    },
+                    {
+                        typeof(IApplicationModelProvider),
+                        new Type[]
+                        {
+                            typeof(DefaultApplicationModelProvider),
+                            typeof(CorsApplicationModelProvider),
+                            typeof(AuthorizationApplicationModelProvider),
+                            typeof(TempDataApplicationModelProvider),
+                            typeof(ViewDataAttributeApplicationModelProvider),
+                            typeof(ApiBehaviorApplicationModelProvider),
+                        }
+                    },
+                    {
+                        typeof(IApiDescriptionProvider),
+                        new Type[]
+                        {
+                            typeof(DefaultApiDescriptionProvider),
+                            typeof(JsonPatchOperationsArrayProvider),
+                        }
+                    },
+                    {
+                        typeof(IPageRouteModelProvider),
+                        new[]
+                        {
+                            typeof(CompiledPageRouteModelProvider),
+                            typeof(RazorProjectPageRouteModelProvider),
+                        }
+                    },
+                    {
+                        typeof(IPageApplicationModelProvider),
+                        new[]
+                        {
+                            typeof(AuthorizationPageApplicationModelProvider),
+                            typeof(AuthorizationPageApplicationModelProvider),
+                            typeof(DefaultPageApplicationModelProvider),
+                            typeof(TempDataFilterPageApplicationModelProvider),
+                            typeof(ViewDataAttributePageApplicationModelProvider),
+                            typeof(ResponseCacheFilterApplicationModelProvider),
+                        }
+                    },
+                };
+            }
+        }
+
+        private void AssertServiceCountEquals(
+            IServiceCollection services,
+            Type serviceType,
+            int expectedServiceRegistrationCount)
+        {
+            var serviceDescriptors = services.Where(serviceDescriptor => serviceDescriptor.ServiceType == serviceType);
+            var actual = serviceDescriptors.Count();
+
+            Assert.True(
+                (expectedServiceRegistrationCount == actual),
+                $"Expected service type '{serviceType}' to be registered {expectedServiceRegistrationCount}" +
+                $" time(s) but was actually registered {actual} time(s).");
+        }
+
+        private void AssertContainsSingle(
+            IServiceCollection services,
+            Type serviceType,
+            Type implementationType)
+        {
+            var matches = services
+                .Where(sd =>
+                    sd.ServiceType == serviceType &&
+                    sd.ImplementationType == implementationType)
+                .ToArray();
+
+            if (matches.Length == 0)
+            {
+                Assert.True(
+                    false,
+                    $"Could not find an instance of {implementationType} registered as {serviceType}");
+            }
+            else if (matches.Length > 1)
+            {
+                Assert.True(
+                    false,
+                    $"Found multiple instances of {implementationType} registered as {serviceType}");
+            }
+        }
+
+        private IHostingEnvironment GetHostingEnvironment()
+        {
+            var environment = new Mock<IHostingEnvironment>();
+            environment
+                .Setup(e => e.ApplicationName)
+                .Returns(typeof(MvcServiceCollectionExtensionsTest).GetTypeInfo().Assembly.GetName().Name);
+
+            return environment.Object;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/CommonFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/CommonFilterTest.cs
new file mode 100644
index 0000000000..61c2ac3b90
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/CommonFilterTest.cs
@@ -0,0 +1,239 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Filters
+{
+    public class CommonFilterTest
+    {
+        // This is used as a 'common' test method for ActionFilterAttribute and Controller
+        public static async Task ActionFilter_Calls_OnActionExecuted(Mock mock)
+        {
+            // Arrange
+            mock.As<IAsyncActionFilter>()
+                .Setup(f => f.OnActionExecutionAsync(
+                    It.IsAny<ActionExecutingContext>(),
+                    It.IsAny<ActionExecutionDelegate>()))
+                .CallBase();
+
+            mock.As<IActionFilter>()
+                .Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>()))
+                .Verifiable();
+
+            mock.As<IActionFilter>()
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Verifiable();
+
+            var context = CreateActionExecutingContext(mock.As<IFilterMetadata>().Object);
+            var next = new ActionExecutionDelegate(() => Task.FromResult(CreateActionExecutedContext(context)));
+
+            // Act
+            await mock.As<IAsyncActionFilter>().Object.OnActionExecutionAsync(context, next);
+
+            // Assert
+            Assert.Null(context.Result);
+
+            mock.As<IActionFilter>()
+                .Verify(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>()), Times.Once());
+
+            mock.As<IActionFilter>()
+                .Verify(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()), Times.Once());
+        }
+
+        // This is used as a 'common' test method for ActionFilterAttribute and Controller
+        public static async Task ActionFilter_SettingResult_ShortCircuits(Mock mock)
+        {
+            // Arrange
+            mock.As<IAsyncActionFilter>()
+                .Setup(f => f.OnActionExecutionAsync(
+                    It.IsAny<ActionExecutingContext>(),
+                    It.IsAny<ActionExecutionDelegate>()))
+                .CallBase();
+
+            mock.As<IActionFilter>()
+                .Setup(f => f.OnActionExecuting(It.IsAny<ActionExecutingContext>()))
+                .Callback<ActionExecutingContext>(c =>
+                {
+                    mock.ToString();
+                    c.Result = new NoOpResult();
+                });
+
+            mock.As<IActionFilter>()
+                .Setup(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()))
+                .Verifiable();
+
+            var context = CreateActionExecutingContext(mock.As<IFilterMetadata>().Object);
+            var next = new ActionExecutionDelegate(() => { throw null; }); // This won't run
+
+            // Act
+            await mock.As<IAsyncActionFilter>().Object.OnActionExecutionAsync(context, next);
+
+            // Assert
+            Assert.IsType<NoOpResult>(context.Result);
+
+            mock.As<IActionFilter>()
+                .Verify(f => f.OnActionExecuted(It.IsAny<ActionExecutedContext>()), Times.Never());
+        }
+
+        // This is used as a 'common' test method for ActionFilterAttribute and ResultFilterAttribute
+        public static async Task ResultFilter_Calls_OnResultExecuted(Mock mock)
+        {
+            // Arrange
+            mock.As<IAsyncResultFilter>()
+                .Setup(f => f.OnResultExecutionAsync(
+                    It.IsAny<ResultExecutingContext>(),
+                    It.IsAny<ResultExecutionDelegate>()))
+                .CallBase();
+
+            mock.As<IResultFilter>()
+                .Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()))
+                .Verifiable();
+
+            mock.As<IResultFilter>()
+                .Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()))
+                .Verifiable();
+
+            var context = CreateResultExecutingContext(mock.As<IFilterMetadata>().Object);
+            var next = new ResultExecutionDelegate(() => Task.FromResult(CreateResultExecutedContext(context)));
+
+            // Act
+            await mock.As<IAsyncResultFilter>().Object.OnResultExecutionAsync(context, next);
+
+            // Assert
+            Assert.False(context.Cancel);
+
+            mock.As<IResultFilter>()
+                .Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+
+            mock.As<IResultFilter>()
+                .Verify(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()), Times.Once());
+        }
+
+        // This is used as a 'common' test method for ActionFilterAttribute and ResultFilterAttribute
+        public static async Task ResultFilter_SettingResult_DoesNotShortCircuit(Mock mock)
+        {
+            // Arrange
+            mock.As<IAsyncResultFilter>()
+                .Setup(f => f.OnResultExecutionAsync(
+                    It.IsAny<ResultExecutingContext>(),
+                    It.IsAny<ResultExecutionDelegate>()))
+                .CallBase();
+
+            mock.As<IResultFilter>()
+                .Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()))
+                .Callback<ResultExecutingContext>(c =>
+                {
+                    mock.ToString();
+                    c.Result = new NoOpResult();
+                });
+
+            mock.As<IResultFilter>()
+                .Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()))
+                .Verifiable();
+
+            var context = CreateResultExecutingContext(mock.As<IFilterMetadata>().Object);
+            var next = new ResultExecutionDelegate(() => Task.FromResult(CreateResultExecutedContext(context)));
+
+            // Act
+            await mock.As<IAsyncResultFilter>().Object.OnResultExecutionAsync(context, next);
+
+            // Assert
+            Assert.False(context.Cancel);
+
+            mock.As<IResultFilter>()
+                .Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+
+            mock.As<IResultFilter>()
+                .Verify(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()), Times.Once());
+        }
+
+        // This is used as a 'common' test method for ActionFilterAttribute and ResultFilterAttribute
+        public static async Task ResultFilter_SettingCancel_ShortCircuits(Mock mock)
+        {
+            // Arrange
+            mock.As<IAsyncResultFilter>()
+                .Setup(f => f.OnResultExecutionAsync(
+                    It.IsAny<ResultExecutingContext>(),
+                    It.IsAny<ResultExecutionDelegate>()))
+                .CallBase();
+
+            mock.As<IResultFilter>()
+                .Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()))
+                .Callback<ResultExecutingContext>(c =>
+                {
+                    mock.ToString();
+                    c.Cancel = true;
+                });
+
+            mock.As<IResultFilter>()
+                .Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()))
+                .Verifiable();
+
+            var context = CreateResultExecutingContext(mock.As<IFilterMetadata>().Object);
+            var next = new ResultExecutionDelegate(() => { throw null; }); // This won't run
+
+            // Act
+            await mock.As<IAsyncResultFilter>().Object.OnResultExecutionAsync(context, next);
+
+            // Assert
+            Assert.True(context.Cancel);
+
+            mock.As<IResultFilter>()
+                .Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+
+            mock.As<IResultFilter>()
+                .Verify(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()), Times.Never());
+        }
+
+        private static ActionExecutingContext CreateActionExecutingContext(IFilterMetadata filter)
+        {
+            return new ActionExecutingContext(
+                CreateActionContext(),
+                new IFilterMetadata[] { filter, },
+                new Dictionary<string, object>(),
+                controller: new object());
+        }
+
+        private static ActionExecutedContext CreateActionExecutedContext(ActionExecutingContext context)
+        {
+            return new ActionExecutedContext(context, context.Filters, context.Controller)
+            {
+                Result = context.Result,
+            };
+        }
+
+        private static ResultExecutingContext CreateResultExecutingContext(IFilterMetadata filter)
+        {
+            return new ResultExecutingContext(
+                CreateActionContext(),
+                new IFilterMetadata[] { filter, },
+                new NoOpResult(),
+                controller: new object());
+        }
+
+        private static ResultExecutedContext CreateResultExecutedContext(ResultExecutingContext context)
+        {
+            return new ResultExecutedContext(context, context.Filters, context.Result, context.Controller);
+        }
+
+        private static ActionContext CreateActionContext()
+        {
+            return new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+        }
+
+        private class NoOpResult : IActionResult
+        {
+            public Task ExecuteResultAsync(ActionContext context)
+            {
+                return Task.FromResult(true);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/CommonResourceInvokerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/CommonResourceInvokerTest.cs
new file mode 100644
index 0000000000..86d2f27071
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/CommonResourceInvokerTest.cs
@@ -0,0 +1,2080 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public abstract class CommonResourceInvokerTest
+    {
+        protected static readonly TestResult Result = new TestResult();
+
+        // Intentionally choosing an uncommon exception type.
+        protected static readonly Exception Exception = new DivideByZeroException();
+
+        protected ResourceInvoker CreateInvoker(
+            IFilterMetadata filter,
+            Exception exception = null,
+            IActionResult result = null,
+            IList<IValueProviderFactory> valueProviderFactories = null)
+        {
+            return CreateInvoker(new IFilterMetadata[] { filter }, exception, result, valueProviderFactories);
+        }
+
+        protected abstract ResourceInvoker CreateInvoker(
+            IFilterMetadata[] filters,
+            Exception exception = null,
+            IActionResult result = null,
+            IList<IValueProviderFactory> valueProviderFactories = null);
+
+        [Fact]
+        public async Task InvokeAction_DoesNotInvokeExceptionFilter_WhenActionDoesNotThrow()
+        {
+            // Arrange
+            var filter = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            filter
+                .Setup(f => f.OnException(It.IsAny<ExceptionContext>()))
+                .Verifiable();
+
+            var invoker = CreateInvoker(filter.Object, exception: null);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter.Verify(f => f.OnException(It.IsAny<ExceptionContext>()), Times.Never());
+        }
+
+        [Fact]
+        public async Task InvokeAction_DoesNotAsyncInvokeExceptionFilter_WhenActionDoesNotThrow()
+        {
+            // Arrange
+            var filter = new Mock<IAsyncExceptionFilter>(MockBehavior.Strict);
+            filter
+                .Setup(f => f.OnExceptionAsync(It.IsAny<ExceptionContext>()))
+                .Returns<ExceptionContext>((context) => Task.FromResult(true))
+                .Verifiable();
+
+            var invoker = CreateInvoker(filter.Object, exception: null);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter.Verify(
+                f => f.OnExceptionAsync(It.IsAny<ExceptionContext>()),
+                Times.Never());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesExceptionFilter_WhenActionThrows()
+        {
+            // Arrange
+            Exception exception = null;
+            IActionResult resultFromAction = null;
+            var expected = new Mock<IActionResult>(MockBehavior.Strict);
+            expected
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Returns(Task.FromResult(true))
+                .Verifiable();
+
+            var filter1 = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            filter1
+                .Setup(f => f.OnException(It.IsAny<ExceptionContext>()))
+                .Verifiable();
+            var filter2 = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            filter2
+                .Setup(f => f.OnException(It.IsAny<ExceptionContext>()))
+                .Callback<ExceptionContext>(context =>
+                {
+                    exception = context.Exception;
+                    resultFromAction = context.Result;
+
+                    // Handle the exception
+                    context.Result = expected.Object;
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(new[] { filter1.Object, filter2.Object }, exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            expected.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+            filter2.Verify(f => f.OnException(It.IsAny<ExceptionContext>()), Times.Once());
+
+            Assert.Same(Exception, exception);
+            Assert.Null(resultFromAction);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncExceptionFilter_WhenActionThrows()
+        {
+            // Arrange
+            Exception exception = null;
+            IActionResult resultFromAction = null;
+            var expected = new Mock<IActionResult>(MockBehavior.Strict);
+            expected
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Returns(Task.FromResult(true))
+                .Verifiable();
+
+            var filter1 = new Mock<IAsyncExceptionFilter>(MockBehavior.Strict);
+            filter1
+                .Setup(f => f.OnExceptionAsync(It.IsAny<ExceptionContext>()))
+                .Returns<ExceptionContext>((context) => Task.FromResult(true))
+                .Verifiable();
+            var filter2 = new Mock<IAsyncExceptionFilter>(MockBehavior.Strict);
+            filter2
+                .Setup(f => f.OnExceptionAsync(It.IsAny<ExceptionContext>()))
+                .Callback<ExceptionContext>(context =>
+                {
+                    exception = context.Exception;
+                    resultFromAction = context.Result;
+
+                    // Handle the exception
+                    context.Result = expected.Object;
+                })
+                .Returns<ExceptionContext>((context) => Task.FromResult(true))
+                .Verifiable();
+
+            var invoker = CreateInvoker(new[] { filter1.Object, filter2.Object }, exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            expected.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+            filter2.Verify(
+                f => f.OnExceptionAsync(It.IsAny<ExceptionContext>()),
+                Times.Once());
+
+            Assert.Same(Exception, exception);
+            Assert.Null(resultFromAction);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesExceptionFilter_ShortCircuit_ExceptionNull_WithoutResult()
+        {
+            // Arrange
+            var filter1 = new Mock<IExceptionFilter>(MockBehavior.Strict);
+
+            var filter2 = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            filter2
+                .Setup(f => f.OnException(It.IsAny<ExceptionContext>()))
+                .Callback<ExceptionContext>(context =>
+                {
+                    filter2.ToString();
+                    context.Exception = null;
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(new[] { filter1.Object, filter2.Object }, exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter2.Verify(
+                f => f.OnException(It.IsAny<ExceptionContext>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesExceptionFilter_ShortCircuit_ExceptionNull_WithResult()
+        {
+            // Arrange
+            var result = new Mock<IActionResult>(MockBehavior.Strict);
+            result
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Returns(Task.FromResult(true))
+                .Verifiable();
+
+            var filter1 = new Mock<IExceptionFilter>(MockBehavior.Strict);
+
+            var filter2 = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            filter2
+                .Setup(f => f.OnException(It.IsAny<ExceptionContext>()))
+                .Callback<ExceptionContext>(context =>
+                {
+                    context.Result = result.Object;
+                    context.Exception = null;
+                })
+                .Verifiable();
+
+            // Result filters are never used when an exception bubbles up to exception filters.
+            var resultFilter = new Mock<IResultFilter>(MockBehavior.Strict);
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[] { filter1.Object, filter2.Object, resultFilter.Object },
+                exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter2.Verify(
+                f => f.OnException(It.IsAny<ExceptionContext>()),
+                Times.Once());
+
+            result.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesExceptionFilter_ShortCircuit_ExceptionHandled_WithoutResult()
+        {
+            // Arrange
+            var filter1 = new Mock<IExceptionFilter>(MockBehavior.Strict);
+
+            var filter2 = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            filter2
+                .Setup(f => f.OnException(It.IsAny<ExceptionContext>()))
+                .Callback<ExceptionContext>(context =>
+                {
+                    context.ExceptionHandled = true;
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(new[] { filter1.Object, filter2.Object }, exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter2.Verify(
+                f => f.OnException(It.IsAny<ExceptionContext>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesExceptionFilter_ShortCircuit_ExceptionHandled_WithResult()
+        {
+            // Arrange
+            var result = new Mock<IActionResult>(MockBehavior.Strict);
+            result
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Returns(Task.FromResult(true))
+                .Verifiable();
+
+            var filter1 = new Mock<IExceptionFilter>(MockBehavior.Strict);
+
+            var filter2 = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            filter2
+                .Setup(f => f.OnException(It.IsAny<ExceptionContext>()))
+                .Callback<ExceptionContext>(context =>
+                {
+                    context.Result = result.Object;
+                    context.ExceptionHandled = true;
+                })
+                .Verifiable();
+
+            // Result filters are never used when an exception bubbles up to exception filters.
+            var resultFilter = new Mock<IResultFilter>(MockBehavior.Strict);
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[] { filter1.Object, filter2.Object, resultFilter.Object },
+                exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter2.Verify(
+                f => f.OnException(It.IsAny<ExceptionContext>()),
+                Times.Once());
+
+            result.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncExceptionFilter_ShortCircuit_ExceptionNull_WithoutResult()
+        {
+            // Arrange
+            var filter1 = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            var filter2 = new Mock<IAsyncExceptionFilter>(MockBehavior.Strict);
+
+            filter2
+                .Setup(f => f.OnExceptionAsync(It.IsAny<ExceptionContext>()))
+                .Callback<ExceptionContext>(context =>
+                {
+                    context.Exception = null;
+                })
+                .Returns<ExceptionContext>((context) => Task.FromResult(true))
+                .Verifiable();
+
+            var filterMetadata = new IFilterMetadata[] { filter1.Object, filter2.Object };
+            var invoker = CreateInvoker(filterMetadata, exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter2.Verify(
+                f => f.OnExceptionAsync(It.IsAny<ExceptionContext>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncExceptionFilter_ShortCircuit_ExceptionNull_WithResult()
+        {
+            // Arrange
+            var result = new Mock<IActionResult>(MockBehavior.Strict);
+            result
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Returns(Task.FromResult(true))
+                .Verifiable();
+
+            var filter1 = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            var filter2 = new Mock<IAsyncExceptionFilter>(MockBehavior.Strict);
+
+            filter2
+                .Setup(f => f.OnExceptionAsync(It.IsAny<ExceptionContext>()))
+                .Callback<ExceptionContext>(context =>
+                {
+                    context.Exception = null;
+                    context.Result = result.Object;
+                })
+                .Returns<ExceptionContext>((context) => Task.FromResult(true))
+                .Verifiable();
+
+            // Result filters are never used when an exception bubbles up to exception filters.
+            var resultFilter = new Mock<IResultFilter>(MockBehavior.Strict);
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[] { filter1.Object, filter2.Object, resultFilter.Object },
+                exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter2.Verify(
+                f => f.OnExceptionAsync(It.IsAny<ExceptionContext>()),
+                Times.Once());
+
+            result.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncExceptionFilter_ShortCircuit_ExceptionHandled_WithoutResult()
+        {
+            // Arrange
+            var filter1 = new Mock<IExceptionFilter>(MockBehavior.Strict);
+
+            var filter2 = new Mock<IAsyncExceptionFilter>(MockBehavior.Strict);
+            filter2
+                .Setup(f => f.OnExceptionAsync(It.IsAny<ExceptionContext>()))
+                .Callback<ExceptionContext>(context =>
+                {
+                    context.ExceptionHandled = true;
+                })
+                .Returns<ExceptionContext>((context) => Task.FromResult(true))
+                .Verifiable();
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { filter1.Object, filter2.Object }, exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter2.Verify(
+                f => f.OnExceptionAsync(It.IsAny<ExceptionContext>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncExceptionFilter_ShortCircuit_ExceptionHandled_WithResult()
+        {
+            // Arrange
+            var result = new Mock<IActionResult>(MockBehavior.Strict);
+            result
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Returns(Task.FromResult(true))
+                .Verifiable();
+
+            var filter1 = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            var filter2 = new Mock<IAsyncExceptionFilter>(MockBehavior.Strict);
+
+            filter2
+                .Setup(f => f.OnExceptionAsync(It.IsAny<ExceptionContext>()))
+                .Callback<ExceptionContext>(context =>
+                {
+                    context.ExceptionHandled = true;
+                    context.Result = result.Object;
+                })
+                .Returns<ExceptionContext>((context) => Task.FromResult(true))
+                .Verifiable();
+
+            // Result filters are never used when an exception bubbles up to exception filters.
+            var resultFilter = new Mock<IResultFilter>(MockBehavior.Strict);
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[] { filter1.Object, filter2.Object, resultFilter.Object },
+                exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter2.Verify(
+                f => f.OnExceptionAsync(It.IsAny<ExceptionContext>()),
+                Times.Once());
+
+            result.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncExceptionFilter_SettingResultDoesNotShortCircuit()
+        {
+            // Arrange
+            var result = new Mock<IActionResult>(MockBehavior.Strict);
+            result
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Returns<ActionContext>((context) => Task.FromResult(true))
+                .Verifiable();
+
+            var filter1 = new Mock<IAsyncExceptionFilter>(MockBehavior.Strict);
+            filter1
+                .Setup(f => f.OnExceptionAsync(It.IsAny<ExceptionContext>()))
+                .Callback<ExceptionContext>(context =>
+                {
+                    context.Result = result.Object;
+                })
+                .Returns<ExceptionContext>((context) => Task.FromResult(true))
+                .Verifiable();
+
+            var filter2 = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            filter2
+                .Setup(f => f.OnException(It.IsAny<ExceptionContext>()))
+                .Callback<ExceptionContext>(c => { }) // Does nothing, we just want to verify that it was called.
+                .Verifiable();
+
+            var resultFilter = new Mock<IResultFilter>(MockBehavior.Strict);
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[] { filter1.Object, filter2.Object, resultFilter.Object },
+                exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter1.Verify(f => f.OnExceptionAsync(It.IsAny<ExceptionContext>()), Times.Once());
+            filter2.Verify(f => f.OnException(It.IsAny<ExceptionContext>()), Times.Once());
+            result.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesExceptionFilter_UnhandledExceptionIsThrown()
+        {
+            // Arrange
+            var filter = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            filter
+                .Setup(f => f.OnException(It.IsAny<ExceptionContext>()))
+                .Verifiable();
+
+            var invoker = CreateInvoker(filter.Object, exception: Exception);
+
+            // Act
+            await Assert.ThrowsAsync(Exception.GetType(), async () => await invoker.InvokeAsync());
+
+            // Assert
+            filter.Verify(f => f.OnException(It.IsAny<ExceptionContext>()), Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesExceptionFilter_ResultIsExecuted_WithoutResultFilters()
+        {
+            // Arrange
+            var result = new Mock<IActionResult>(MockBehavior.Strict);
+            result
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Returns<ActionContext>((context) => Task.FromResult(true))
+                .Verifiable();
+
+            var filter = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            filter
+                .Setup(f => f.OnException(It.IsAny<ExceptionContext>()))
+                .Callback<ExceptionContext>(c => c.Result = result.Object)
+                .Verifiable();
+
+            var resultFilter = new Mock<IResultFilter>(MockBehavior.Strict);
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { filter.Object, resultFilter.Object }, exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter.Verify(f => f.OnException(It.IsAny<ExceptionContext>()), Times.Once());
+            result.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesExceptionFilter_SettingResultDoesNotShortCircuit()
+        {
+            // Arrange
+            var result = new Mock<IActionResult>(MockBehavior.Strict);
+            result
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Returns<ActionContext>((context) => Task.FromResult(true))
+                .Verifiable();
+
+            var filter1 = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            filter1
+                .Setup(f => f.OnException(It.IsAny<ExceptionContext>()))
+                .Callback<ExceptionContext>(c => c.Result = result.Object)
+                .Verifiable();
+
+            var filter2 = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            filter2
+                .Setup(f => f.OnException(It.IsAny<ExceptionContext>()))
+                .Callback<ExceptionContext>(c => { }) // Does nothing, we just want to verify that it was called.
+                .Verifiable();
+
+            var resultFilter = new Mock<IResultFilter>(MockBehavior.Strict);
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[] { filter1.Object, filter2.Object, resultFilter.Object },
+                exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter1.Verify(f => f.OnException(It.IsAny<ExceptionContext>()), Times.Once());
+            filter2.Verify(f => f.OnException(It.IsAny<ExceptionContext>()), Times.Once());
+            result.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_WithExceptionFilterInTheStack_InvokesResultFilter()
+        {
+            // Arrange
+            var exceptionFilter = new Mock<IExceptionFilter>();
+            var resultFilter = new Mock<IResultFilter>();
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[] { exceptionFilter.Object, resultFilter.Object });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            exceptionFilter.Verify(f => f.OnException(It.IsAny<ExceptionContext>()), Times.Never());
+            resultFilter.Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAuthorizationFilter()
+        {
+            // Arrange
+            var filter = new Mock<IAuthorizationFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnAuthorization(It.IsAny<AuthorizationFilterContext>())).Verifiable();
+
+            var invoker = CreateInvoker(filter.Object);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter.Verify(f => f.OnAuthorization(It.IsAny<AuthorizationFilterContext>()), Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncAuthorizationFilter()
+        {
+            // Arrange
+            var filter = new Mock<IAsyncAuthorizationFilter>(MockBehavior.Strict);
+            filter
+                .Setup(f => f.OnAuthorizationAsync(It.IsAny<AuthorizationFilterContext>()))
+                .Returns<AuthorizationFilterContext>(context => Task.FromResult(true))
+                .Verifiable();
+
+            var invoker = CreateInvoker(filter.Object);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter.Verify(
+                f => f.OnAuthorizationAsync(It.IsAny<AuthorizationFilterContext>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAuthorizationFilter_ShortCircuit()
+        {
+            // Arrange
+            var challenge = new Mock<IActionResult>(MockBehavior.Strict);
+            challenge
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Returns(Task.FromResult(true))
+                .Verifiable();
+
+            var filter1 = new Mock<IAuthorizationFilter>(MockBehavior.Strict);
+            filter1
+                .Setup(f => f.OnAuthorization(It.IsAny<AuthorizationFilterContext>()))
+                .Callback<AuthorizationFilterContext>(c => Task.FromResult(true))
+                .Verifiable();
+
+            var filter2 = new Mock<IAuthorizationFilter>(MockBehavior.Strict);
+            filter2
+                .Setup(f => f.OnAuthorization(It.IsAny<AuthorizationFilterContext>()))
+                .Callback<AuthorizationFilterContext>(c => c.Result = challenge.Object)
+                .Verifiable();
+
+            var filter3 = new Mock<IAuthorizationFilter>(MockBehavior.Strict);
+
+            var invoker = CreateInvoker(new[] { filter1.Object, filter2.Object, filter3.Object });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            challenge.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+            filter1.Verify(f => f.OnAuthorization(It.IsAny<AuthorizationFilterContext>()), Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncAuthorizationFilter_ShortCircuit()
+        {
+            // Arrange
+            var challenge = new Mock<IActionResult>(MockBehavior.Strict);
+            challenge
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Returns(Task.FromResult(true))
+                .Verifiable();
+
+            var filter1 = new Mock<IAsyncAuthorizationFilter>(MockBehavior.Strict);
+            filter1
+                .Setup(f => f.OnAuthorizationAsync(It.IsAny<AuthorizationFilterContext>()))
+                .Returns<AuthorizationFilterContext>((context) =>
+                {
+                    return Task.FromResult(true);
+                })
+                .Verifiable();
+
+            var filter2 = new Mock<IAsyncAuthorizationFilter>(MockBehavior.Strict);
+            filter2
+                .Setup(f => f.OnAuthorizationAsync(It.IsAny<AuthorizationFilterContext>()))
+                .Returns<AuthorizationFilterContext>((context) =>
+                {
+                    context.Result = challenge.Object;
+                    return Task.FromResult(true);
+                });
+
+            var filter3 = new Mock<IAuthorizationFilter>(MockBehavior.Strict);
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { filter1.Object, filter2.Object, filter3.Object });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            challenge.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+            filter1.Verify(
+                f => f.OnAuthorizationAsync(It.IsAny<AuthorizationFilterContext>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_ExceptionInAuthorizationFilter_CannotBeHandledByOtherFilters()
+        {
+            // Arrange
+            var expected = new InvalidCastException();
+
+            var exceptionFilter = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            exceptionFilter
+                .Setup(f => f.OnException(It.IsAny<ExceptionContext>()))
+                .Callback<ExceptionContext>(context =>
+                {
+                    // Mark as handled
+                    context.Result = new EmptyResult();
+                })
+                .Verifiable();
+
+            var authorizationFilter1 = new Mock<IAuthorizationFilter>(MockBehavior.Strict);
+            authorizationFilter1
+                .Setup(f => f.OnAuthorization(It.IsAny<AuthorizationFilterContext>()))
+                .Callback<AuthorizationFilterContext>(c => { throw expected; })
+                .Verifiable();
+
+            // None of these filters should run
+            var authorizationFilter2 = new Mock<IAuthorizationFilter>(MockBehavior.Strict);
+            var resourceFilter = new Mock<IResourceFilter>(MockBehavior.Strict);
+            var resultFilter = new Mock<IResultFilter>(MockBehavior.Strict);
+
+            var invoker = CreateInvoker(new IFilterMetadata[]
+            {
+                exceptionFilter.Object,
+                authorizationFilter1.Object,
+                authorizationFilter2.Object,
+                resourceFilter.Object,
+                resultFilter.Object,
+            });
+
+            // Act
+            var thrown = await Assert.ThrowsAsync<InvalidCastException>(invoker.InvokeAsync);
+
+            // Assert
+            Assert.Same(expected, thrown);
+            exceptionFilter.Verify(f => f.OnException(It.IsAny<ExceptionContext>()), Times.Never());
+            authorizationFilter1.Verify(f => f.OnAuthorization(It.IsAny<AuthorizationFilterContext>()), Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAuthorizationFilter_ChallengeNotSeenByResultFilters()
+        {
+            // Arrange
+            var challenge = new Mock<IActionResult>(MockBehavior.Strict);
+            challenge
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Returns<ActionContext>((context) => Task.FromResult(true))
+                .Verifiable();
+
+            var authorizationFilter = new Mock<IAuthorizationFilter>(MockBehavior.Strict);
+            authorizationFilter
+                .Setup(f => f.OnAuthorization(It.IsAny<AuthorizationFilterContext>()))
+                .Callback<AuthorizationFilterContext>(c => c.Result = challenge.Object)
+                .Verifiable();
+
+            var resultFilter = new Mock<IResultFilter>(MockBehavior.Strict);
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { authorizationFilter.Object, resultFilter.Object });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            authorizationFilter.Verify(f => f.OnAuthorization(It.IsAny<AuthorizationFilterContext>()), Times.Once());
+            challenge.Verify(c => c.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesResultFilter()
+        {
+            // Arrange
+            var filter = new Mock<IResultFilter>(MockBehavior.Strict);
+            filter.Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>())).Verifiable();
+            filter.Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>())).Verifiable();
+
+            var invoker = CreateInvoker(filter.Object);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter.Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+            filter.Verify(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()), Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResultFilter()
+        {
+            // Arrange
+            var filter = new Mock<IAsyncResultFilter>(MockBehavior.Strict);
+            filter
+                .Setup(f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()))
+                .Returns<ResultExecutingContext, ResultExecutionDelegate>(async (context, next) => await next())
+                .Verifiable();
+
+            var invoker = CreateInvoker(filter.Object);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter.Verify(
+                f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesResultFilter_ShortCircuit_WithCancel()
+        {
+            // Arrange
+            ResultExecutedContext context = null;
+
+            var filter1 = new Mock<IResultFilter>(MockBehavior.Strict);
+            filter1.Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>())).Verifiable();
+            filter1
+                .Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()))
+                .Callback<ResultExecutedContext>(c => context = c)
+                .Verifiable();
+
+            var filter2 = new Mock<IResultFilter>(MockBehavior.Strict);
+            filter2
+                .Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()))
+                .Callback<ResultExecutingContext>(c =>
+                {
+                    filter2.ToString();
+                    c.Cancel = true;
+                })
+                .Verifiable();
+
+            var filter3 = new Mock<IResultFilter>(MockBehavior.Strict);
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { filter1.Object, filter2.Object, filter3.Object });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter1.Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+            filter1.Verify(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()), Times.Once());
+
+            filter2.Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+            filter2.Verify(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()), Times.Never());
+
+            Assert.True(context.Canceled);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResultFilter_ShortCircuit_WithCancel()
+        {
+            // Arrange
+            ResultExecutedContext context = null;
+
+            var filter1 = new Mock<IResultFilter>(MockBehavior.Strict);
+            filter1.Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>())).Verifiable();
+            filter1
+                .Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()))
+                .Callback<ResultExecutedContext>(c => context = c)
+                .Verifiable();
+
+            var filter2 = new Mock<IAsyncResultFilter>(MockBehavior.Strict);
+            filter2
+                .Setup(f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()))
+                .Returns<ResultExecutingContext, ResultExecutionDelegate>((c, next) =>
+                {
+                    // Not calling next here
+                    c.Cancel = true;
+                    return Task.FromResult(true);
+                })
+                .Verifiable();
+
+            var filter3 = new Mock<IResultFilter>(MockBehavior.Strict);
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { filter1.Object, filter2.Object, filter3.Object }, result: Result);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter1.Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+            filter1.Verify(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()), Times.Once());
+
+            filter2.Verify(
+                f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()),
+                Times.Once());
+
+            Assert.True(context.Canceled);
+            Assert.Same(Result, context.Result);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResultFilter_ShortCircuit_WithoutCancel()
+        {
+            // Arrange
+            ResultExecutedContext context = null;
+
+            var filter1 = new Mock<IResultFilter>(MockBehavior.Strict);
+            filter1.Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>())).Verifiable();
+            filter1
+                .Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()))
+                .Callback<ResultExecutedContext>(c => context = c)
+                .Verifiable();
+
+            var filter2 = new Mock<IAsyncResultFilter>(MockBehavior.Strict);
+            filter2
+                .Setup(f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()))
+                .Returns<ResultExecutingContext, ResultExecutionDelegate>((c, next) =>
+                {
+                    // Not calling next here
+                    return Task.FromResult(true);
+                })
+                .Verifiable();
+
+            var filter3 = new Mock<IResultFilter>(MockBehavior.Strict);
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { filter1.Object, filter2.Object, filter3.Object }, result: Result);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            filter1.Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+            filter1.Verify(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()), Times.Once());
+
+            filter2.Verify(
+                f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()),
+                Times.Once());
+
+            Assert.True(context.Canceled);
+            Assert.Same(Result, context.Result);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResultFilter_ShortCircuit_WithoutCancel_CallNext()
+        {
+            // Arrange
+            var filter = new Mock<IAsyncResultFilter>(MockBehavior.Strict);
+            filter
+                .Setup(f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()))
+                .Returns<ResultExecutingContext, ResultExecutionDelegate>(async (c, next) =>
+                {
+                    // Not calling next here
+                    c.Cancel = true;
+                    await next();
+                })
+                .Verifiable();
+
+            var message =
+                "If an IAsyncResultFilter cancels execution by setting the Cancel property of " +
+                "ResultExecutingContext to 'true', then it cannot call the next filter by invoking " +
+                "ResultExecutionDelegate.";
+
+            var invoker = CreateInvoker(filter.Object);
+
+            // Act & Assert
+            await ExceptionAssert.ThrowsAsync<InvalidOperationException>(
+                async () => await invoker.InvokeAsync(),
+                message);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesResultFilter_ExceptionGoesUnhandled()
+        {
+            // Arrange
+            var exception = new DataMisalignedException();
+
+            var result = new Mock<IActionResult>(MockBehavior.Strict);
+            result
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Throws(exception)
+                .Verifiable();
+
+            var filter = new Mock<IResultFilter>(MockBehavior.Strict);
+            filter
+                .Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()))
+                .Callback<ResultExecutingContext>(c => c.Result = result.Object)
+                .Verifiable();
+
+            filter.Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>())).Verifiable();
+
+            var invoker = CreateInvoker(filter.Object);
+
+            // Act
+            await Assert.ThrowsAsync(exception.GetType(), async () => await invoker.InvokeAsync());
+
+            // Assert
+            result.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+
+            filter.Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+            filter.Verify(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()), Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesResultFilter_WithExceptionThrownByResult()
+        {
+            // Arrange
+            ResultExecutedContext context = null;
+            var exception = new DataMisalignedException();
+
+            var result = new Mock<IActionResult>(MockBehavior.Strict);
+            result
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Throws(exception)
+                .Verifiable();
+
+            var filter = new Mock<IResultFilter>(MockBehavior.Strict);
+            filter
+                .Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()))
+                .Callback<ResultExecutingContext>(c => c.Result = result.Object)
+                .Verifiable();
+
+            filter
+                .Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()))
+                .Callback<ResultExecutedContext>(c =>
+                {
+                    context = c;
+
+                    // Handle the exception
+                    Assert.False(c.ExceptionHandled);
+                    c.ExceptionHandled = true;
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(filter.Object);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.Same(exception, context.Exception);
+
+            result.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+
+            filter.Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+            filter.Verify(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()), Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResultFilter_WithExceptionThrownByResult()
+        {
+            // Arrange
+            ResultExecutedContext context = null;
+            var exception = new DataMisalignedException();
+
+            var result = new Mock<IActionResult>(MockBehavior.Strict);
+            result
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Throws(exception)
+                .Verifiable();
+
+            var filter = new Mock<IAsyncResultFilter>(MockBehavior.Strict);
+            filter
+                .Setup(f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()))
+                .Returns<ResultExecutingContext, ResultExecutionDelegate>(async (c, next) =>
+                {
+                    c.Result = result.Object;
+
+                    context = await next();
+
+                    // Handle the exception
+                    Assert.False(context.ExceptionHandled);
+                    context.ExceptionHandled = true;
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(filter.Object);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.Same(exception, context.Exception);
+
+            result.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+
+            filter.Verify(
+                f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesResultFilter_WithExceptionThrownByResultFilter()
+        {
+            // Arrange
+            ResultExecutedContext context = null;
+            var exception = new DataMisalignedException();
+
+            var resultFilter1 = new Mock<IResultFilter>(MockBehavior.Strict);
+            resultFilter1.Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>())).Verifiable();
+            resultFilter1
+                .Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()))
+                .Callback<ResultExecutedContext>(c =>
+                {
+                    context = c;
+
+                    // Handle the exception
+                    Assert.False(c.ExceptionHandled);
+                    c.ExceptionHandled = true;
+                })
+                .Verifiable();
+
+            var resultFilter2 = new Mock<IResultFilter>(MockBehavior.Strict);
+            resultFilter2
+                .Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()))
+                .Throws(exception)
+                .Verifiable();
+
+            var resultFilter3 = new Mock<IResultFilter>(MockBehavior.Strict);
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { resultFilter1.Object, resultFilter2.Object, resultFilter3.Object });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.Same(exception, context.Exception);
+
+            resultFilter1.Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+            resultFilter1.Verify(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()), Times.Once());
+
+            resultFilter2.Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResultFilter_WithExceptionThrownByResultFilter()
+        {
+            // Arrange
+            ResultExecutedContext context = null;
+            var exception = new DataMisalignedException();
+
+            var resultFilter1 = new Mock<IAsyncResultFilter>(MockBehavior.Strict);
+            resultFilter1
+                .Setup(f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()))
+                .Returns<ResultExecutingContext, ResultExecutionDelegate>(async (c, next) =>
+                {
+                    context = await next();
+
+                    // Handle the exception
+                    Assert.False(context.ExceptionHandled);
+                    context.ExceptionHandled = true;
+                })
+                .Verifiable();
+
+            var resultFilter2 = new Mock<IResultFilter>(MockBehavior.Strict);
+            resultFilter2
+                .Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()))
+                .Throws(exception)
+                .Verifiable();
+
+            var resultFilter3 = new Mock<IResultFilter>(MockBehavior.Strict);
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { resultFilter1.Object, resultFilter2.Object, resultFilter3.Object });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.Same(exception, context.Exception);
+
+            resultFilter1.Verify(
+                f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()),
+                Times.Once());
+
+            resultFilter2.Verify(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()), Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResourceFilter()
+        {
+            // Arrange
+            var resourceFilter = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    await next();
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { resourceFilter.Object });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            resourceFilter.Verify(
+                f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesResourceFilter()
+        {
+            // Arrange
+            var resourceFilter = new Mock<IResourceFilter>(MockBehavior.Strict);
+            resourceFilter
+                .Setup(f => f.OnResourceExecuting(It.IsAny<ResourceExecutingContext>()))
+                .Verifiable();
+            resourceFilter
+                .Setup(f => f.OnResourceExecuted(It.IsAny<ResourceExecutedContext>()))
+                .Verifiable();
+
+            var invoker = CreateInvoker(resourceFilter.Object);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            resourceFilter.Verify(
+                f => f.OnResourceExecuted(It.IsAny<ResourceExecutedContext>()),
+                Times.Once());
+            resourceFilter.Verify(
+                f => f.OnResourceExecuted(It.IsAny<ResourceExecutedContext>()),
+                Times.Once());
+
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResourceFilter_WithActionResult_FromAction()
+        {
+            // Arrange
+            ResourceExecutedContext context = null;
+            var resourceFilter = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    context = await next();
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(resourceFilter.Object, result: Result);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.Same(Result, context.Result);
+
+            resourceFilter.Verify(
+                f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResourceFilter_WithActionResult_FromExceptionFilter()
+        {
+            // Arrange
+            var expected = Mock.Of<IActionResult>();
+
+            ResourceExecutedContext context = null;
+            var resourceFilter = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    context = await next();
+                })
+                .Verifiable();
+
+            var exceptionFilter = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            exceptionFilter
+                .Setup(f => f.OnException(It.IsAny<ExceptionContext>()))
+                .Callback<ExceptionContext>((c) =>
+                {
+                    c.Result = expected;
+                });
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { resourceFilter.Object, exceptionFilter.Object }, exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.Same(expected, context.Result);
+            Assert.Null(context.Exception);
+            Assert.Null(context.ExceptionDispatchInfo);
+
+            resourceFilter.Verify(
+                f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResourceFilter_WithActionResult_FromResultFilter()
+        {
+            // Arrange
+            var expected = Mock.Of<IActionResult>();
+
+            ResourceExecutedContext context = null;
+            var resourceFilter = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    context = await next();
+                })
+                .Verifiable();
+
+            var resultFilter = new Mock<IResultFilter>(MockBehavior.Loose);
+            resultFilter
+                .Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()))
+                .Callback<ResultExecutingContext>((c) =>
+                {
+                    c.Result = expected;
+                });
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { resourceFilter.Object, resultFilter.Object });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.Same(expected, context.Result);
+
+            resourceFilter.Verify(
+                f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResourceFilter_HandleException_FromAction()
+        {
+            // Arrange
+            ResourceExecutedContext context = null;
+            var resourceFilter = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    context = await next();
+                    context.ExceptionHandled = true;
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { resourceFilter.Object }, exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.Same(Exception, context.Exception);
+            Assert.Same(Exception, context.ExceptionDispatchInfo.SourceException);
+
+            resourceFilter.Verify(
+                f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResourceFilter_HandlesException_FromResultFilter()
+        {
+            // Arrange
+            var expected = new DataMisalignedException();
+
+            ResourceExecutedContext context = null;
+            var resourceFilter = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    context = await next();
+                    context.ExceptionHandled = true;
+                })
+                .Verifiable();
+
+            var resultFilter = new Mock<IResultFilter>(MockBehavior.Loose);
+            resultFilter
+                .Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()))
+                .Callback<ResultExecutingContext>((c) =>
+                {
+                    throw expected;
+                });
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { resourceFilter.Object, resultFilter.Object });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.Same(expected, context.Exception);
+            Assert.Same(expected, context.ExceptionDispatchInfo.SourceException);
+
+            resourceFilter.Verify(
+                f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResourceFilter_HandleException_BySettingNull()
+        {
+            // Arrange
+            ResourceExecutedContext context = null;
+            var resourceFilter = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    context = await next();
+
+                    Assert.Same(Exception, context.Exception);
+                    Assert.Same(Exception, context.ExceptionDispatchInfo.SourceException);
+
+                    context.Exception = null;
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { resourceFilter.Object }, exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            resourceFilter.Verify(
+                f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResourceFilter_ThrowsUnhandledException()
+        {
+            // Arrange
+            var expected = new DataMisalignedException();
+
+            ResourceExecutedContext context = null;
+            var resourceFilter1 = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter1
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    context = await next();
+                })
+                .Verifiable();
+
+            var resourceFilter2 = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter2
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>((c, next) =>
+                {
+                    throw expected;
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { resourceFilter1.Object, resourceFilter2.Object }, exception: Exception);
+
+            // Act
+            var exception = await Assert.ThrowsAsync<DataMisalignedException>(invoker.InvokeAsync);
+
+            // Assert
+            Assert.Same(expected, exception);
+            Assert.Same(expected, context.Exception);
+            Assert.Same(expected, context.ExceptionDispatchInfo.SourceException);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesResourceFilter_OnResourceExecuting_ThrowsUnhandledException()
+        {
+            // Arrange
+            var expected = new DataMisalignedException();
+
+            ResourceExecutedContext context = null;
+            var resourceFilter1 = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter1
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    context = await next();
+                })
+                .Verifiable();
+
+            var resourceFilter2 = new Mock<IResourceFilter>(MockBehavior.Strict);
+            resourceFilter2
+                .Setup(f => f.OnResourceExecuting(It.IsAny<ResourceExecutingContext>()))
+                .Callback<ResourceExecutingContext>((c) =>
+                {
+                    throw expected;
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { resourceFilter1.Object, resourceFilter2.Object }, exception: Exception);
+
+            // Act
+            var exception = await Assert.ThrowsAsync<DataMisalignedException>(invoker.InvokeAsync);
+
+            // Assert
+            Assert.Same(expected, exception);
+            Assert.Same(expected, context.Exception);
+            Assert.Same(expected, context.ExceptionDispatchInfo.SourceException);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesResourceFilter_OnResourceExecuted_ThrowsUnhandledException()
+        {
+            // Arrange
+            var expected = new DataMisalignedException();
+
+            ResourceExecutedContext context = null;
+            var resourceFilter1 = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter1
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    context = await next();
+                })
+                .Verifiable();
+
+            var resourceFilter2 = new Mock<IResourceFilter>(MockBehavior.Loose);
+            resourceFilter2
+                .Setup(f => f.OnResourceExecuted(It.IsAny<ResourceExecutedContext>()))
+                .Callback<ResourceExecutedContext>((c) =>
+                {
+                    throw expected;
+                })
+                .Verifiable();
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { resourceFilter1.Object, resourceFilter2.Object }, exception: Exception);
+
+            // Act
+            var exception = await Assert.ThrowsAsync<DataMisalignedException>(invoker.InvokeAsync);
+
+            // Assert
+            Assert.Same(expected, exception);
+            Assert.Same(expected, context.Exception);
+            Assert.Same(expected, context.ExceptionDispatchInfo.SourceException);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResourceFilter_ShortCircuit()
+        {
+            // Arrange
+            var expected = new Mock<IActionResult>(MockBehavior.Strict);
+            expected
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Returns(Task.FromResult(true))
+                .Verifiable();
+
+            ResourceExecutedContext context = null;
+            var resourceFilter1 = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter1
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    context = await next();
+                })
+                .Verifiable();
+
+            var resourceFilter2 = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter2
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>((c, next) =>
+                {
+                    c.Result = expected.Object;
+                    return Task.FromResult(true);
+                })
+                .Verifiable();
+
+            var resourceFilter3 = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            var exceptionFilter = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            var resultFilter = new Mock<IAsyncResultFilter>(MockBehavior.Strict);
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[]
+                {
+                    resourceFilter1.Object, // This filter should see the result retured from resourceFilter2
+                    resourceFilter2.Object, // This filter will short circuit
+                    resourceFilter3.Object, // This shouldn't run - it will throw if it does
+                    exceptionFilter.Object, // This shouldn't run - it will throw if it does
+                    resultFilter.Object // This shouldn't run - it will throw if it does
+                },
+                // The action won't run
+                exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            expected.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+            Assert.Same(expected.Object, context.Result);
+            Assert.True(context.Canceled);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResourceFilter_ShortCircuit_WithoutResult()
+        {
+            // Arrange
+            ResourceExecutedContext context = null;
+            var resourceFilter1 = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter1
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    context = await next();
+                })
+                .Verifiable();
+
+            var resourceFilter2 = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter2
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>((c, next) =>
+                {
+                    return Task.FromResult(true);
+                })
+                .Verifiable();
+
+            var resourceFilter3 = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            var exceptionFilter = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            var resultFilter = new Mock<IAsyncResultFilter>(MockBehavior.Strict);
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[]
+                {
+                    resourceFilter1.Object, // This filter should see the result retured from resourceFilter2
+                    resourceFilter2.Object, // This filter will short circuit
+                    resourceFilter3.Object, // This shouldn't run - it will throw if it does
+                    exceptionFilter.Object, // This shouldn't run - it will throw if it does
+                    resultFilter.Object // This shouldn't run - it will throw if it does
+                },
+                // The action won't run
+                exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            Assert.Null(context.Result);
+            Assert.True(context.Canceled);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesResourceFilter_ShortCircuit()
+        {
+            // Arrange
+            var expected = new Mock<IActionResult>(MockBehavior.Strict);
+            expected
+                .Setup(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()))
+                .Returns(Task.FromResult(true))
+                .Verifiable();
+
+            ResourceExecutedContext context = null;
+            var resourceFilter1 = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter1
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    context = await next();
+                });
+
+            var resourceFilter2 = new Mock<IResourceFilter>(MockBehavior.Strict);
+            resourceFilter2
+                .Setup(f => f.OnResourceExecuting(It.IsAny<ResourceExecutingContext>()))
+                .Callback<ResourceExecutingContext>((c) =>
+                {
+                    c.Result = expected.Object;
+                });
+
+            var resourceFilter3 = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            var resultFilter = new Mock<IAsyncResultFilter>(MockBehavior.Strict);
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[]
+                {
+                    resourceFilter1.Object, // This filter should see the result retured from resourceFilter2
+                    resourceFilter2.Object,
+                    resourceFilter3.Object, // This shouldn't run - it will throw if it does
+                    resultFilter.Object // This shouldn't run - it will throw if it does
+                },
+                // The action won't run
+                exception: Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            expected.Verify(r => r.ExecuteResultAsync(It.IsAny<ActionContext>()), Times.Once());
+            Assert.Same(expected.Object, context.Result);
+            Assert.True(context.Canceled);
+        }
+
+        [Fact]
+        public async Task InvokeAction_InvokesAsyncResourceFilter_InvalidShortCircuit()
+        {
+            // Arrange
+            var message =
+                "If an IAsyncResourceFilter provides a result value by setting the Result property of " +
+                "ResourceExecutingContext to a non-null value, then it cannot call the next filter by invoking " +
+                "ResourceExecutionDelegate.";
+
+            ResourceExecutedContext context = null;
+            var resourceFilter = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    // This is not valid.
+                    c.Result = Mock.Of<IActionResult>();
+                    context = await next();
+                });
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { resourceFilter.Object, });
+
+            // Act
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(invoker.InvokeAsync);
+
+            // Assert
+            Assert.Equal(message, exception.Message);
+        }
+
+        [Fact]
+        public async Task InvokeAction_AuthorizationFilter_ChallengePreventsResourceFiltersFromRunning()
+        {
+            // Arrange
+            var resourceFilter = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>(async (c, next) =>
+                {
+                    await next();
+                })
+                .Verifiable();
+
+            var authorizationFilter = new Mock<IAuthorizationFilter>(MockBehavior.Strict);
+            authorizationFilter
+                .Setup(f => f.OnAuthorization(It.IsAny<AuthorizationFilterContext>()))
+                .Callback<AuthorizationFilterContext>((c) =>
+                {
+                    c.Result = Result;
+                });
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { authorizationFilter.Object, resourceFilter.Object, });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            resourceFilter.Verify(
+                f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()),
+                Times.Never());
+        }
+
+        [Fact]
+        public async Task InvokeAction_AuthorizationFilterShortCircuit_InvokesAlwaysRunResultFilter()
+        {
+            // Arrange
+            var resultFilter = new Mock<IAlwaysRunResultFilter>(MockBehavior.Strict);
+            resultFilter.Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()))
+                .Callback<ResultExecutingContext>(c => Assert.Same(Result, c.Result))
+                .Verifiable();
+            resultFilter.Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()))
+                .Callback<ResultExecutedContext>(c => Assert.Same(Result, c.Result))
+                .Verifiable();
+
+            var authorizationFilter = new Mock<IAsyncAuthorizationFilter>(MockBehavior.Strict);
+            authorizationFilter
+                .Setup(f => f.OnAuthorizationAsync(It.IsAny<AuthorizationFilterContext>()))
+                .Returns<AuthorizationFilterContext>((c) =>
+                {
+                    c.Result = Result;
+                    return Task.CompletedTask;
+                });
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { authorizationFilter.Object, resultFilter.Object, });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            resultFilter.Verify();
+        }
+
+        [Fact]
+        public async Task InvokeAction_AuthorizationFilterShortCircuit_InvokesAsyncAlwaysRunResultFilter()
+        {
+            // Arrange
+            var resultFilter = new Mock<IAsyncAlwaysRunResultFilter>(MockBehavior.Strict);
+            resultFilter.Setup(f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()))
+                .Returns<ResultExecutingContext, ResultExecutionDelegate>((c, next) =>
+                {
+                    Assert.Same(Result, c.Result);
+                    return next();
+                })
+                .Verifiable();
+
+            var authorizationFilter = new Mock<IAuthorizationFilter>(MockBehavior.Strict);
+            authorizationFilter
+                .Setup(f => f.OnAuthorization(It.IsAny<AuthorizationFilterContext>()))
+                .Callback<AuthorizationFilterContext>((c) =>
+                {
+                    c.Result = Result;
+                });
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { authorizationFilter.Object, resultFilter.Object, });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            resultFilter.Verify();
+        }
+
+        [Fact]
+        public async Task InvokeAction_AuthorizationFilterShortCircuit_DoesNotRunResultFilters()
+        {
+            // Arrange
+            var resultFilter1 = new Mock<IResultFilter>(MockBehavior.Strict);
+            resultFilter1.Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()));
+            resultFilter1.Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()));
+
+            var resultFilter2 = new Mock<IAsyncResultFilter>(MockBehavior.Strict);
+            resultFilter2.Setup(f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()));
+
+            var resultFilter3 = new Mock<IAsyncAlwaysRunResultFilter>(MockBehavior.Strict);
+            resultFilter3.Setup(f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()))
+                .Returns(Task.CompletedTask);
+
+            var authorizationFilter = new Mock<IAuthorizationFilter>(MockBehavior.Strict);
+            authorizationFilter
+                .Setup(f => f.OnAuthorization(It.IsAny<AuthorizationFilterContext>()))
+                .Callback<AuthorizationFilterContext>((c) =>
+                {
+                    c.Result = Result;
+                });
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { authorizationFilter.Object, resultFilter1.Object, resultFilter2.Object, resultFilter3.Object, });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            resultFilter1.Verify(
+                f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()),
+                Times.Never());
+            resultFilter1.Verify(
+                f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()),
+                Times.Never());
+            resultFilter2.Verify(
+                f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()),
+                Times.Never());
+            resultFilter3.Verify(
+                f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_ResourceFilterShortCircuit_InvokesAlwaysRunResultFilter()
+        {
+            // Arrange
+            var resultFilter = new Mock<IAlwaysRunResultFilter>(MockBehavior.Strict);
+            resultFilter.Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()))
+                .Callback<ResultExecutingContext>(c => Assert.Same(Result, c.Result))
+                .Verifiable();
+            resultFilter.Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()))
+                .Callback<ResultExecutedContext>(c => Assert.Same(Result, c.Result))
+                .Verifiable();
+
+            var resourceFilter = new Mock<IAsyncResourceFilter>(MockBehavior.Strict);
+            resourceFilter
+                .Setup(f => f.OnResourceExecutionAsync(It.IsAny<ResourceExecutingContext>(), It.IsAny<ResourceExecutionDelegate>()))
+                .Returns<ResourceExecutingContext, ResourceExecutionDelegate>((c, next) =>
+                {
+                    c.Result = Result;
+                    return Task.CompletedTask;
+                });
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { resourceFilter.Object, resultFilter.Object, });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            resultFilter.Verify();
+        }
+
+        [Fact]
+        public async Task InvokeAction_ResourceFilterShortCircuit_InvokesAsyncAlwaysRunResultFilter()
+        {
+            // Arrange
+            var resultFilter = new Mock<IAsyncAlwaysRunResultFilter>(MockBehavior.Strict);
+            resultFilter.Setup(f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()))
+                .Returns<ResultExecutingContext, ResultExecutionDelegate>((c, next) =>
+                {
+                    Assert.Same(Result, c.Result);
+                    return next();
+                })
+                .Verifiable();
+
+            var resourceFilter = new Mock<IResourceFilter>(MockBehavior.Strict);
+            resourceFilter
+                .Setup(f => f.OnResourceExecuting(It.IsAny<ResourceExecutingContext>()))
+                .Callback<ResourceExecutingContext>(c => c.Result = Result);
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { resourceFilter.Object, resultFilter.Object, });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            resultFilter.Verify();
+        }
+
+        [Fact]
+        public async Task InvokeAction_ResourceFilterShortCircuit_DoesNotRunResultFilters()
+        {
+            // Arrange
+            var resultFilter1 = new Mock<IResultFilter>(MockBehavior.Strict);
+            resultFilter1.Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()));
+            resultFilter1.Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()));
+
+            var resultFilter2 = new Mock<IAsyncResultFilter>(MockBehavior.Strict);
+            resultFilter2.Setup(f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()));
+
+            var resultFilter3 = new Mock<IAsyncAlwaysRunResultFilter>(MockBehavior.Strict);
+            resultFilter3.Setup(f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()))
+                .Returns(Task.CompletedTask);
+
+            var resourceFilter = new Mock<IResourceFilter>(MockBehavior.Strict);
+            resourceFilter
+                .Setup(f => f.OnResourceExecuting(It.IsAny<ResourceExecutingContext>()))
+                .Callback<ResourceExecutingContext>(c => c.Result = Result);
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { resourceFilter.Object, resultFilter1.Object, resultFilter2.Object, resultFilter3.Object, });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            resultFilter1.Verify(
+                f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()),
+                Times.Never());
+            resultFilter1.Verify(
+                f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()),
+                Times.Never());
+            resultFilter2.Verify(
+                f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()),
+                Times.Never());
+            resultFilter3.Verify(
+                f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_ExceptionFilterShortCircuit_InvokesAlwaysRunResultFilter()
+        {
+            // Arrange
+            var resultFilter = new Mock<IAlwaysRunResultFilter>(MockBehavior.Strict);
+            resultFilter.Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()))
+                .Callback<ResultExecutingContext>(c => Assert.Same(Result, c.Result))
+                .Verifiable();
+            resultFilter.Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()))
+                .Callback<ResultExecutedContext>(c => Assert.Same(Result, c.Result))
+                .Verifiable();
+
+            var exceptionFilter = new Mock<IAsyncExceptionFilter>(MockBehavior.Strict);
+            exceptionFilter
+                .Setup(f => f.OnExceptionAsync(It.IsAny<ExceptionContext>()))
+                .Returns<ExceptionContext>(c =>
+                {
+                    c.Result = Result;
+                    return Task.CompletedTask;
+                });
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { exceptionFilter.Object, resultFilter.Object, }, Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            resultFilter.Verify();
+        }
+
+        [Fact]
+        public async Task InvokeAction_ExceptionFilterShortCircuit_InvokesAsyncAlwaysRunResultFilter()
+        {
+            // Arrange
+            var resultFilter = new Mock<IAsyncAlwaysRunResultFilter>(MockBehavior.Strict);
+            resultFilter.Setup(f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()))
+                .Returns<ResultExecutingContext, ResultExecutionDelegate>((c, next) =>
+                {
+                    Assert.Same(Result, c.Result);
+                    return next();
+                })
+                .Verifiable();
+
+            var exceptionFilter = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            exceptionFilter
+                .Setup(f => f.OnException(It.IsAny<ExceptionContext>()))
+                .Callback<ExceptionContext>(c => c.Result = Result);
+
+            var invoker = CreateInvoker(new IFilterMetadata[] { exceptionFilter.Object, resultFilter.Object, }, Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            resultFilter.Verify();
+        }
+
+        [Fact]
+        public async Task InvokeAction_ExceptionFilterShortCircuit_DoesNotRunResultFilters()
+        {
+            // Arrange
+            var resultFilter1 = new Mock<IResultFilter>(MockBehavior.Strict);
+            resultFilter1.Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()));
+            resultFilter1.Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()));
+
+            var resultFilter2 = new Mock<IAsyncResultFilter>(MockBehavior.Strict);
+            resultFilter2.Setup(f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()));
+
+            var resultFilter3 = new Mock<IAsyncAlwaysRunResultFilter>(MockBehavior.Strict);
+            resultFilter3.Setup(f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()))
+                .Returns(Task.CompletedTask);
+
+            var exceptionFilter = new Mock<IExceptionFilter>(MockBehavior.Strict);
+            exceptionFilter
+                .Setup(f => f.OnException(It.IsAny<ExceptionContext>()))
+                .Callback<ExceptionContext>(c => c.Result = Result);
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[] { exceptionFilter.Object, resultFilter1.Object, resultFilter2.Object, resultFilter3.Object, },
+                Exception);
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            resultFilter1.Verify(
+                f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()),
+                Times.Never());
+            resultFilter1.Verify(
+                f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()),
+                Times.Never());
+            resultFilter2.Verify(
+                f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()),
+                Times.Never());
+            resultFilter3.Verify(
+                f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()),
+                Times.Once());
+        }
+
+        [Fact]
+        public async Task InvokeAction_AlwaysRunResultFiltersAndRunWithResultFilters()
+        {
+            // Arrange
+            var resultFilter1 = new Mock<IResultFilter>(MockBehavior.Strict);
+            resultFilter1
+                .Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()))
+                .Verifiable();
+            resultFilter1
+                .Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()))
+                .Verifiable();
+
+            var resultFilter2 = new Mock<IAlwaysRunResultFilter>(MockBehavior.Strict);
+            resultFilter2
+                .Setup(f => f.OnResultExecuting(It.IsAny<ResultExecutingContext>()))
+                .Verifiable();
+            resultFilter2
+                .Setup(f => f.OnResultExecuted(It.IsAny<ResultExecutedContext>()))
+                .Verifiable();
+
+            var resultFilter3 = new Mock<IAsyncResultFilter>(MockBehavior.Strict);
+            resultFilter3.Setup(f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()))
+                .Returns<ResultExecutingContext, ResultExecutionDelegate>((c, next) => next())
+                .Verifiable();
+
+            var resultFilter4 = new Mock<IAsyncAlwaysRunResultFilter>(MockBehavior.Strict);
+            resultFilter4.Setup(f => f.OnResultExecutionAsync(It.IsAny<ResultExecutingContext>(), It.IsAny<ResultExecutionDelegate>()))
+                .Returns<ResultExecutingContext, ResultExecutionDelegate>((c, next) => next())
+                .Verifiable();
+
+            var invoker = CreateInvoker(
+                new IFilterMetadata[] { resultFilter1.Object, resultFilter2.Object, resultFilter3.Object, resultFilter4.Object });
+
+            // Act
+            await invoker.InvokeAsync();
+
+            // Assert
+            resultFilter1.Verify();
+            resultFilter2.Verify();
+            resultFilter3.Verify();
+            resultFilter4.Verify();
+        }
+
+        public class TestResult : ActionResult
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/HtmlContentUtilities.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/HtmlContentUtilities.cs
new file mode 100644
index 0000000000..0f7c7aca6e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/HtmlContentUtilities.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using System.IO;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Html;
+using Microsoft.Extensions.WebEncoders.Testing;
+
+namespace Microsoft.AspNetCore.Mvc.TestCommon
+{
+    public class HtmlContentUtilities
+    {
+        public static string HtmlContentToString(IHtmlContent content, HtmlEncoder encoder = null)
+        {
+            if (encoder == null)
+            {
+                encoder = new HtmlTestEncoder();
+            }
+
+            using (var writer = new StringWriter())
+            {
+                content.WriteTo(writer, encoder);
+                return writer.ToString();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/HtmlGeneratorUtilities.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/HtmlGeneratorUtilities.cs
new file mode 100644
index 0000000000..a40024c7e4
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/HtmlGeneratorUtilities.cs
@@ -0,0 +1,49 @@
+// 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.
+
+using Microsoft.AspNetCore.Antiforgery;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public static class HtmlGeneratorUtilities
+    {
+        public static IHtmlGenerator GetHtmlGenerator(IModelMetadataProvider provider)
+        {
+            var options = new MvcViewOptions();
+            var urlHelperFactory = new Mock<IUrlHelperFactory>();
+            urlHelperFactory
+                .Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>()))
+                .Returns(Mock.Of<IUrlHelper>());
+
+            return GetHtmlGenerator(provider, urlHelperFactory.Object, options);
+        }
+
+        public static IHtmlGenerator GetHtmlGenerator(IModelMetadataProvider provider, IUrlHelperFactory urlHelperFactory, MvcViewOptions options)
+        {
+            var optionsAccessor = new Mock<IOptions<MvcViewOptions>>();
+            optionsAccessor
+                .SetupGet(o => o.Value)
+                .Returns(options);
+
+            var attributeProvider = new DefaultValidationHtmlAttributeProvider(
+                optionsAccessor.Object,
+                provider,
+                new ClientValidatorCache());
+
+            var htmlGenerator = new DefaultHtmlGenerator(
+                    Mock.Of<IAntiforgery>(),
+                    optionsAccessor.Object,
+                    provider,
+                    urlHelperFactory,
+                    new HtmlTestEncoder(),
+                    attributeProvider);
+            return htmlGenerator;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/MediaTypeAssert.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/MediaTypeAssert.cs
new file mode 100644
index 0000000000..bfd7576836
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/MediaTypeAssert.cs
@@ -0,0 +1,49 @@
+// 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.
+
+using Microsoft.Extensions.Primitives;
+using Microsoft.Net.Http.Headers;
+using Xunit.Sdk;
+
+namespace Microsoft.AspNetCore.Mvc.TestCommon
+{
+    public class MediaTypeAssert
+    {
+        public static void Equal(string left, string right)
+        {
+            Equal(new StringSegment(left), new StringSegment(right));
+        }
+
+        public static void Equal(string left, StringSegment right)
+        {
+            Equal(new StringSegment(left), right);
+        }
+
+        public static void Equal(StringSegment left, string right)
+        {
+            Equal(left, new StringSegment(right));
+        }
+
+        public static void Equal(StringSegment left, StringSegment right)
+        {
+            if (!left.HasValue && !right.HasValue)
+            {
+                return;
+            }
+            else if (!left.HasValue || !right.HasValue)
+            {
+                throw new EqualException(left.ToString(), right.ToString());
+            }
+
+            MediaTypeHeaderValue leftMediaType = null;
+            MediaTypeHeaderValue rightMediaType = null;
+
+            if (!MediaTypeHeaderValue.TryParse(left.Value, out leftMediaType) ||
+                !MediaTypeHeaderValue.TryParse(right.Value, out rightMediaType) ||
+                !leftMediaType.Equals(rightMediaType))
+            {
+                throw new EqualException(left.ToString(), right.ToString());
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/Microsoft.AspNetCore.Mvc.TestCommon.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/Microsoft.AspNetCore.Mvc.TestCommon.csproj
new file mode 100644
index 0000000000..203c301faa
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/Microsoft.AspNetCore.Mvc.TestCommon.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Formatters.Xml\Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.ViewFeatures\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="$(MicrosoftAspNetCoreHtmlAbstractionsPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Runtime" Version="$(MicrosoftAspNetCoreRazorRuntimePackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="$(MicrosoftAspNetCoreRazorLanguagePackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.WebEncoders" Version="$(MicrosoftExtensionsWebEncodersPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/NonSeekableReadableStream.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/NonSeekableReadableStream.cs
new file mode 100644
index 0000000000..b729dc6b68
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/NonSeekableReadableStream.cs
@@ -0,0 +1,75 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Mvc.TestCommon
+{
+    public class NonSeekableReadStream : Stream
+    {
+        private Stream _inner;
+
+        public NonSeekableReadStream(byte[] data)
+            : this(new MemoryStream(data))
+        {
+        }
+
+        public NonSeekableReadStream(Stream inner)
+        {
+            _inner = inner;
+        }
+
+        public override bool CanRead => _inner.CanRead;
+
+        public override bool CanSeek => false;
+
+        public override bool CanWrite => false;
+
+        public override long Length
+        {
+            get { throw new NotSupportedException(); }
+        }
+
+        public override long Position
+        {
+            get { throw new NotSupportedException(); }
+            set { throw new NotSupportedException(); }
+        }
+
+        public override void Flush()
+        {
+            throw new NotImplementedException();
+        }
+
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override void SetLength(long value)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            count = Math.Max(count, 1);
+            return _inner.Read(buffer, offset, count);
+        }
+
+        public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+        {
+            count = Math.Max(count, 1);
+            return _inner.ReadAsync(buffer, offset, count, cancellationToken);
+        }
+    }
+}
+
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/PlatformNormalizer.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/PlatformNormalizer.cs
new file mode 100644
index 0000000000..3c8737c9b9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/PlatformNormalizer.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using Microsoft.AspNetCore.Testing;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public static class PlatformNormalizer
+    {
+        // Mono issue - https://github.com/aspnet/External/issues/19
+        public static string NormalizeContent(string input)
+        {
+            if (TestPlatformHelper.IsMono)
+            {
+                var equivalents = new Dictionary<string, string> {
+                    {
+                        "The [0-9a-zA-Z ]+ field is required.", "RequiredAttribute_ValidationError"
+                    },
+                    {
+                        "'[0-9a-zA-Z ]+' and '[0-9a-zA-Z ]+' do not match.", "CompareAttribute_MustMatch"
+                    },
+                    {
+                        "The field [0-9a-zA-Z ]+ must be a string with a minimum length of [0-9]+ and a " +
+                            "maximum length of [0-9]+.",
+                        "StringLengthAttribute_ValidationErrorIncludingMinimum"
+                    },
+                };
+
+                var result = input;
+
+                foreach (var kvp in equivalents)
+                {
+                    result = Regex.Replace(result, kvp.Key, kvp.Value);
+                }
+
+                return result;
+            }
+
+            return input;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/ResourceFile.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/ResourceFile.cs
new file mode 100644
index 0000000000..f1128e0f66
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/ResourceFile.cs
@@ -0,0 +1,230 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    /// <summary>
+    /// Reader and, if GENERATE_BASELINES is defined, writer for files compiled into an assembly as resources.
+    /// </summary>
+    /// <remarks>Inspired by Razor's BaselineWriter and TestFile test classes.</remarks>
+    public static class ResourceFile
+    {
+        private static object writeLock = new object();
+
+        /// <summary>
+        /// Return <see cref="Stream"/> for <paramref name="resourceName"/> from <paramref name="assembly"/>'s
+        /// manifest.
+        /// </summary>
+        /// <param name="assembly">The <see cref="Assembly"/> containing <paramref name="resourceName"/>.</param>
+        /// <param name="resourceName">
+        /// Name of the manifest resource in <paramref name="assembly"/>. A path relative to the test project
+        /// directory.
+        /// </param>
+        /// <param name="sourceFile">
+        /// If <c>true</c> <paramref name="resourceName"/> is used as a source file and must exist. Otherwise
+        /// <paramref name="resourceName"/> is an output file and, if <c>GENERATE_BASELINES</c> is defined, it will
+        /// soon be generated if missing.
+        /// </param>
+        /// <returns>
+        /// <see cref="Stream"/> for <paramref name="resourceName"/> from <paramref name="assembly"/>'s
+        /// manifest. <c>null</c> if <c>GENERATE_BASELINES</c> is defined, <paramref name="sourceFile"/> is
+        /// <c>false</c>, and <paramref name="resourceName"/> is not found in <paramref name="assembly"/>.
+        /// </returns>
+        /// <exception cref="Xunit.Sdk.TrueException">
+        /// Thrown if <c>GENERATE_BASELINES</c> is not defined or <paramref name="sourceFile"/> is <c>true</c> and
+        /// <paramref name="resourceName"/> is not found in <paramref name="assembly"/>.
+        /// </exception>
+        public static Stream GetResourceStream(Assembly assembly, string resourceName, bool sourceFile)
+        {
+            var fullName = $"{ assembly.GetName().Name }.{ resourceName.Replace('/', '.') }";
+            if (!Exists(assembly, fullName))
+            {
+#if GENERATE_BASELINES
+                if (sourceFile)
+                {
+                    // Even when generating baselines, a missing source file is a serious problem.
+                    Assert.True(false, $"Manifest resource: { fullName } not found.");
+                }
+#else
+                // When not generating baselines, a missing source or output file is always an error.
+                Assert.True(false, $"Manifest resource '{ fullName }' not found.");
+#endif
+
+                return null;
+            }
+
+            var stream = assembly.GetManifestResourceStream(fullName);
+            if (sourceFile)
+            {
+                // Normalize line endings to '\r\n' (CRLF). This removes core.autocrlf, core.eol, core.safecrlf, and
+                // .gitattributes from the equation and treats "\r\n" and "\n" as equivalent. Does not handle
+                // some line endings like "\r" but otherwise ensures checksums and line mappings are consistent.
+                string text;
+                using (var streamReader = new StreamReader(stream))
+                {
+                    text = streamReader.ReadToEnd().Replace("\r", "").Replace("\n", "\r\n");
+                }
+
+                var bytes = Encoding.UTF8.GetBytes(text);
+                stream = new MemoryStream(bytes);
+            }
+
+            return stream;
+        }
+
+        /// <summary>
+        /// Return <see cref="string"/> content of <paramref name="resourceName"/> from <paramref name="assembly"/>'s
+        /// manifest.
+        /// </summary>
+        /// <param name="assembly">The <see cref="Assembly"/> containing <paramref name="resourceName"/>.</param>
+        /// <param name="resourceName">
+        /// Name of the manifest resource in <paramref name="assembly"/>. A path relative to the test project
+        /// directory.
+        /// </param>
+        /// <param name="sourceFile">
+        /// If <c>true</c> <paramref name="resourceName"/> is used as a source file and must exist. Otherwise
+        /// <paramref name="resourceName"/> is an output file and, if <c>GENERATE_BASELINES</c> is defined, it will
+        /// soon be generated if missing.
+        /// </param>
+        /// <returns>
+        /// A <see cref="Task{string}"/> which on completion returns the <see cref="string"/> content of
+        /// <paramref name="resourceName"/> from <paramref name="assembly"/>'s manifest. <c>null</c> if
+        /// <c>GENERATE_BASELINES</c> is defined, <paramref name="sourceFile"/> is <c>false</c>, and
+        /// <paramref name="resourceName"/> is not found in <paramref name="assembly"/>.
+        /// </returns>
+        /// <exception cref="Xunit.Sdk.TrueException">
+        /// Thrown if <c>GENERATE_BASELINES</c> is not defined or <paramref name="sourceFile"/> is <c>true</c> and
+        /// <paramref name="resourceName"/> is not found in <paramref name="assembly"/>.
+        /// </exception>
+        /// <remarks>Normalizes line endings to <see cref="Environment.NewLine"/>.</remarks>
+        public static async Task<string> ReadResourceAsync(Assembly assembly, string resourceName, bool sourceFile)
+        {
+            using (var stream = GetResourceStream(assembly, resourceName, sourceFile))
+            {
+                if (stream == null)
+                {
+                    return null;
+                }
+
+                using (var streamReader = new StreamReader(stream))
+                {
+                    return await streamReader.ReadToEndAsync();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Return <see cref="string"/> content of <paramref name="resourceName"/> from <paramref name="assembly"/>'s
+        /// manifest.
+        /// </summary>
+        /// <param name="assembly">The <see cref="Assembly"/> containing <paramref name="resourceName"/>.</param>
+        /// <param name="resourceName">
+        /// Name of the manifest resource in <paramref name="assembly"/>. A path relative to the test project
+        /// directory.
+        /// </param>
+        /// <param name="sourceFile">
+        /// If <c>true</c> <paramref name="resourceName"/> is used as a source file and must exist. Otherwise
+        /// <paramref name="resourceName"/> is an output file and, if <c>GENERATE_BASELINES</c> is defined, it will
+        /// soon be generated if missing.
+        /// </param>
+        /// <returns>
+        /// The <see cref="string"/> content of <paramref name="resourceName"/> from <paramref name="assembly"/>'s
+        /// manifest. <c>null</c> if <c>GENERATE_BASELINES</c> is defined, <paramref name="sourceFile"/> is
+        /// <c>false</c>, and <paramref name="resourceName"/> is not found in <paramref name="assembly"/>.
+        /// </returns>
+        /// <exception cref="Xunit.Sdk.TrueException">
+        /// Thrown if <c>GENERATE_BASELINES</c> is not defined or <paramref name="sourceFile"/> is <c>true</c> and
+        /// <paramref name="resourceName"/> is not found in <paramref name="assembly"/>.
+        /// </exception>
+        /// <remarks>Normalizes line endings to <see cref="Environment.NewLine"/>.</remarks>
+        public static string ReadResource(Assembly assembly, string resourceName, bool sourceFile)
+        {
+            using (var stream = GetResourceStream(assembly, resourceName, sourceFile))
+            {
+                if (stream == null)
+                {
+                    return null;
+                }
+
+                using (var streamReader = new StreamReader(stream))
+                {
+                    return streamReader.ReadToEnd();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Write <paramref name="content"/> to file that will become <paramref name="resourceName"/> in
+        /// <paramref name="assembly"/> the next time the project is built. Does nothing if
+        /// <paramref name="previousContent"/> and <paramref name="content"/> already match.
+        /// </summary>
+        /// <param name="assembly">The <see cref="Assembly"/> containing <paramref name="resourceName"/>.</param>
+        /// <param name="resourceName">
+        /// Name of the manifest resource in <paramref name="assembly"/>. A path relative to the test project
+        /// directory.
+        /// </param>
+        /// <param name="previousContent">
+        /// Current content of <paramref name="resourceName"/>. <c>null</c> if <paramref name="resourceName"/> does
+        /// not currently exist in <paramref name="assembly"/>.
+        /// </param>
+        /// <param name="content">
+        /// New content of <paramref name="resourceName"/> in <paramref name="assembly"/>.
+        /// </param>
+        [Conditional("GENERATE_BASELINES")]
+        public static void UpdateFile(Assembly assembly, string resourceName, string previousContent, string content)
+        {
+            // Normalize line endings to '\r\n' for comparison. This removes Environment.NewLine from the equation. Not
+            // worth updating files just because we generate baselines on a different system.
+            var normalizedPreviousContent = previousContent?.Replace("\r", "").Replace("\n", "\r\n");
+            var normalizedContent = content.Replace("\r", "").Replace("\n", "\r\n");
+
+            if (!string.Equals(normalizedPreviousContent, normalizedContent, StringComparison.Ordinal))
+            {
+                // The build system compiles every file under the resources folder as a resource available at runtime
+                // with the same name as the file name. Need to update this file on disc.
+                var projectPath = SolutionPathUtility.GetProjectPath("test", assembly);
+                var fullPath = Path.Combine(projectPath, resourceName);
+                WriteFile(fullPath, content);
+            }
+        }
+
+        private static bool Exists(Assembly assembly, string fullName)
+        {
+            var resourceNames = assembly.GetManifestResourceNames();
+            foreach (var resourceName in resourceNames)
+            {
+                // Resource names are case-sensitive.
+                if (string.Equals(fullName, resourceName, StringComparison.Ordinal))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private static void WriteFile(string fullPath, string content)
+        {
+            // Serialize writes to minimize contention for file handles and directory access.
+            lock (writeLock)
+            {
+                // Write content to the file, creating it if necessary.
+                using (var stream = File.Open(fullPath, FileMode.Create, FileAccess.Write))
+                {
+                    using (var writer = new StreamWriter(stream))
+                    {
+                        writer.Write(content);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/SimpleValueProvider.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/SimpleValueProvider.cs
new file mode 100644
index 0000000000..a5e4fac206
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/SimpleValueProvider.cs
@@ -0,0 +1,65 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public sealed class SimpleValueProvider : Dictionary<string, object>, IValueProvider
+    {
+        private readonly CultureInfo _culture;
+
+        public SimpleValueProvider()
+            : this(null)
+        {
+        }
+
+        public SimpleValueProvider(CultureInfo culture)
+            : base(StringComparer.OrdinalIgnoreCase)
+        {
+            _culture = culture ?? CultureInfo.InvariantCulture;
+        }
+
+        public bool ContainsPrefix(string prefix)
+        {
+            foreach (string key in Keys)
+            {
+                if (ModelStateDictionary.StartsWithPrefix(prefix, key))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public ValueProviderResult GetValue(string key)
+        {
+            object rawValue;
+            if (TryGetValue(key, out rawValue))
+            {
+                if (rawValue != null && rawValue.GetType().IsArray)
+                {
+                    var array = (Array)rawValue;
+
+                    var stringValues = new string[array.Length];
+                    for (var i = 0; i < array.Length; i++)
+                    {
+                        stringValues[i] = array.GetValue(i) as string ?? Convert.ToString(array.GetValue(i), _culture);
+                    }
+
+                    return new ValueProviderResult(stringValues, _culture);
+                }
+                else
+                {
+                    var stringValue = rawValue as string ?? Convert.ToString(rawValue, _culture) ?? string.Empty;
+                    return new ValueProviderResult(stringValue, _culture);
+                }
+            }
+
+            return ValueProviderResult.None;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/SimpleValueProviderFactory.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/SimpleValueProviderFactory.cs
new file mode 100644
index 0000000000..d6a1ac1d27
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/SimpleValueProviderFactory.cs
@@ -0,0 +1,36 @@
+// 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.
+
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Internal;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class SimpleValueProviderFactory : IValueProviderFactory
+    {
+        private readonly IValueProvider _valueProvider;
+
+        public SimpleValueProviderFactory()
+        {
+            _valueProvider = new SimpleValueProvider();
+        }
+
+        public SimpleValueProviderFactory(IValueProvider valueProvider)
+        {
+            if (valueProvider == null)
+            {
+                throw new ArgumentNullException(nameof(valueProvider));
+            }
+
+            _valueProvider = valueProvider;
+        }
+
+        public Task CreateValueProviderAsync(ValueProviderFactoryContext context)
+        {
+            context.ValueProviders.Add(_valueProvider);
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/SolutionPathUtility.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/SolutionPathUtility.cs
new file mode 100644
index 0000000000..a3d372fbf2
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/SolutionPathUtility.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public static class SolutionPathUtility
+    {
+        private const string SolutionName = "Mvc.sln";
+
+        /// <summary>
+        /// Gets the full path to the project.
+        /// </summary>
+        /// <param name="solutionRelativePath">
+        /// The parent directory of the project.
+        /// e.g. samples, test, or test/Websites
+        /// </param>
+        /// <param name="assembly">The project's assembly.</param>
+        /// <returns>The full path to the project.</returns>
+        public static string GetProjectPath(string solutionRelativePath, Assembly assembly)
+        {
+            var projectName = assembly.GetName().Name;
+            var applicationBasePath = AppContext.BaseDirectory;
+
+            var directoryInfo = new DirectoryInfo(applicationBasePath);
+            do
+            {
+                var solutionFileInfo = new FileInfo(Path.Combine(directoryInfo.FullName, SolutionName));
+                if (solutionFileInfo.Exists)
+                {
+                    return Path.GetFullPath(Path.Combine(directoryInfo.FullName, solutionRelativePath, projectName));
+                }
+
+                directoryInfo = directoryInfo.Parent;
+            }
+            while (directoryInfo.Parent != null);
+
+            throw new Exception($"Solution root could not be located using application root {applicationBasePath}.");
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestClientModelValidatorProvider.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestClientModelValidatorProvider.cs
new file mode 100644
index 0000000000..b466463027
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestClientModelValidatorProvider.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    public class TestClientModelValidatorProvider : CompositeClientModelValidatorProvider
+    {
+        // Creates a provider with all the defaults - includes data annotations
+        public static IClientModelValidatorProvider CreateDefaultProvider()
+        {
+            var providers = new IClientModelValidatorProvider[]
+            {
+                new DefaultClientModelValidatorProvider(),
+                new DataAnnotationsClientModelValidatorProvider(
+                    new ValidationAttributeAdapterProvider(),
+                    Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                    stringLocalizerFactory: null),
+            };
+
+            return new TestClientModelValidatorProvider(providers);
+        }
+
+        public TestClientModelValidatorProvider(IEnumerable<IClientModelValidatorProvider> providers)
+            : base(providers)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestDirectoryContent.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestDirectoryContent.cs
new file mode 100644
index 0000000000..0ddb4f7823
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestDirectoryContent.cs
@@ -0,0 +1,43 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.Extensions.FileProviders;
+
+namespace Microsoft.AspNetCore.Mvc.TestCommon
+{
+    public class TestDirectoryContent : IDirectoryContents, IFileInfo
+    {
+        private readonly IEnumerable<IFileInfo> _files;
+
+        public TestDirectoryContent(string name, IEnumerable<IFileInfo> files)
+        {
+            Name = name;
+            _files = files;
+        }
+
+        public bool Exists => true;
+
+        public long Length => throw new NotSupportedException();
+
+        public string PhysicalPath => throw new NotSupportedException();
+
+        public string Name { get; }
+
+        public DateTimeOffset LastModified => throw new NotSupportedException();
+
+        public bool IsDirectory => true;
+
+        public Stream CreateReadStream()
+        {
+            throw new NotSupportedException();
+        }
+
+        public IEnumerator<IFileInfo> GetEnumerator() => _files.GetEnumerator();
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestDirectoryFileInfo.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestDirectoryFileInfo.cs
new file mode 100644
index 0000000000..4183025503
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestDirectoryFileInfo.cs
@@ -0,0 +1,30 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Text;
+using Microsoft.Extensions.FileProviders;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public class TestDirectoryFileInfo : IFileInfo
+    {
+        public bool IsDirectory => true;
+
+        public long Length { get; set; }
+
+        public string Name { get; set; }
+
+        public string PhysicalPath { get; set; }
+
+        public bool Exists => true;
+
+        public DateTimeOffset LastModified => throw new NotImplementedException();
+
+        public Stream CreateReadStream()
+        {
+            throw new NotSupportedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestFileChangeToken.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestFileChangeToken.cs
new file mode 100644
index 0000000000..5d814eb353
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestFileChangeToken.cs
@@ -0,0 +1,35 @@
+// 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.
+
+using System;
+
+namespace Microsoft.Extensions.Primitives
+{
+    public class TestFileChangeToken : IChangeToken
+    {
+        public TestFileChangeToken(string filter = "")
+        {
+            Filter = filter;
+        }
+
+        public bool ActiveChangeCallbacks => false;
+
+        public bool HasChanged { get; set; }
+
+        public string Filter { get; }
+
+        public IDisposable RegisterChangeCallback(Action<object> callback, object state)
+        {
+            return new NullDisposable();
+        }
+
+        private class NullDisposable : IDisposable
+        {
+            public void Dispose()
+            {
+            }
+        }
+
+        public override string ToString() => Filter;
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestFileInfo.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestFileInfo.cs
new file mode 100644
index 0000000000..79b2f94c4f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestFileInfo.cs
@@ -0,0 +1,46 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Text;
+using Microsoft.Extensions.FileProviders;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public class TestFileInfo : IFileInfo
+    {
+        private string _content;
+
+        public bool IsDirectory { get; } = false;
+
+        public DateTimeOffset LastModified { get; set; }
+
+        public long Length { get; set; }
+
+        public string Name { get; set; }
+
+        public string PhysicalPath { get; set; }
+
+        public string Content
+        {
+            get { return _content; }
+            set
+            {
+                _content = value;
+                Length = Encoding.UTF8.GetByteCount(Content);
+            }
+        }
+
+        public bool Exists
+        {
+            get { return true; }
+        }
+
+        public Stream CreateReadStream()
+        {
+            var bytes = Encoding.UTF8.GetBytes(Content);
+            return new MemoryStream(bytes);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestFileProvider.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestFileProvider.cs
new file mode 100644
index 0000000000..3e3f62a9e5
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestFileProvider.cs
@@ -0,0 +1,185 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.Razor
+{
+    public class TestFileProvider : IFileProvider
+    {
+        private readonly Dictionary<string, IFileInfo> _lookup =
+            new Dictionary<string, IFileInfo>(StringComparer.Ordinal);
+        private readonly Dictionary<string, IDirectoryContents> _directoryContentsLookup =
+            new Dictionary<string, IDirectoryContents>();
+
+        private readonly Dictionary<string, TestFileChangeToken> _fileTriggers =
+            new Dictionary<string, TestFileChangeToken>(StringComparer.Ordinal);
+
+        public TestFileProvider() : this(string.Empty)
+        {
+        }
+
+        public TestFileProvider(string root)
+        {
+            Root = root;
+        }
+
+        public string Root { get; }
+
+        public virtual IDirectoryContents GetDirectoryContents(string subpath)
+        {
+            if (_directoryContentsLookup.TryGetValue(subpath, out var value))
+            {
+                return value;
+            }
+
+            return new NotFoundDirectoryContents();
+        }
+
+        public TestFileInfo AddFile(string path, string contents)
+        {
+            var fileInfo = new TestFileInfo
+            {
+                Content = contents,
+                PhysicalPath = Path.Combine(Root, NormalizeAndEnsureValidPhysicalPath(path)),
+                Name = Path.GetFileName(path),
+                LastModified = DateTime.UtcNow,
+            };
+
+            AddFile(path, fileInfo);
+
+            return fileInfo;
+        }
+
+        public TestDirectoryContent AddDirectoryContent(string path, IEnumerable<IFileInfo> files)
+        {
+            var directoryContent = new TestDirectoryContent(Path.GetFileName(path), files);
+            _directoryContentsLookup[path] = directoryContent;
+            return directoryContent;
+        }
+
+        public void AddFile(string path, IFileInfo contents)
+        {
+            _lookup[path] = contents;
+        }
+
+        public void DeleteFile(string path)
+        {
+            _lookup.Remove(path);
+        }
+
+        public virtual IFileInfo GetFileInfo(string subpath)
+        {
+            if (_lookup.ContainsKey(subpath))
+            {
+                return _lookup[subpath];
+            }
+            else
+            {
+                return new NotFoundFileInfo();
+            }
+        }
+
+        public virtual TestFileChangeToken AddChangeToken(string filter)
+        {
+            var changeToken = new TestFileChangeToken(filter);
+            _fileTriggers[filter] = changeToken;
+
+            return changeToken;
+        }
+
+        public virtual IChangeToken Watch(string filter)
+        {
+            if (!_fileTriggers.TryGetValue(filter, out var changeToken) || changeToken.HasChanged)
+            {
+                changeToken = new TestFileChangeToken(filter);
+                _fileTriggers[filter] = changeToken;
+            }
+
+            return changeToken;
+        }
+
+        public TestFileChangeToken GetChangeToken(string filter)
+        {
+            return _fileTriggers[filter];
+        }
+
+        private static string NormalizeAndEnsureValidPhysicalPath(string filePath)
+        {
+            if (string.IsNullOrEmpty(filePath))
+            {
+                return filePath;
+            }
+
+            filePath = filePath.Replace('/', Path.DirectorySeparatorChar);
+
+            if (filePath[0] == Path.DirectorySeparatorChar)
+            {
+                filePath = filePath.Substring(1);
+            }
+
+            return filePath;
+        }
+
+        private class NotFoundFileInfo : IFileInfo
+        {
+            public bool Exists
+            {
+                get
+                {
+                    return false;
+                }
+            }
+
+            public bool IsDirectory
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public DateTimeOffset LastModified
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public long Length
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public string Name
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public string PhysicalPath
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public Stream CreateReadStream()
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestHttpRequestStreamReaderFactory.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestHttpRequestStreamReaderFactory.cs
new file mode 100644
index 0000000000..639c336d46
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestHttpRequestStreamReaderFactory.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using System.IO;
+using System.Text;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.WebUtilities;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class TestHttpRequestStreamReaderFactory : IHttpRequestStreamReaderFactory
+    {
+        public TextReader CreateReader(Stream stream, Encoding encoding)
+        {
+            return new HttpRequestStreamReader(stream, encoding);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestHttpResponseStreamWriterFactory.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestHttpResponseStreamWriterFactory.cs
new file mode 100644
index 0000000000..ad63961d7e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestHttpResponseStreamWriterFactory.cs
@@ -0,0 +1,20 @@
+// 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.
+
+using System.IO;
+using System.Text;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.WebUtilities;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class TestHttpResponseStreamWriterFactory : IHttpResponseStreamWriterFactory
+    {
+        public const int DefaultBufferSize = 16 * 1024;
+
+        public TextWriter CreateWriter(Stream stream, Encoding encoding)
+        {
+            return new HttpResponseStreamWriter(stream, encoding, DefaultBufferSize);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestModelBinderFactory.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestModelBinderFactory.cs
new file mode 100644
index 0000000000..87ed105988
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestModelBinderFactory.cs
@@ -0,0 +1,90 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class TestModelBinderFactory : ModelBinderFactory
+    {
+        public static TestModelBinderFactory Create(IServiceProvider serviceProvider)
+        {
+            var options = serviceProvider.GetRequiredService<IOptions<MvcOptions>>();
+            return new TestModelBinderFactory(
+                TestModelMetadataProvider.CreateDefaultProvider(),
+                options,
+                serviceProvider);
+        }
+
+        public static TestModelBinderFactory Create(params IModelBinderProvider[] providers)
+        {
+            return Create(null, providers);
+        }
+
+        public static TestModelBinderFactory Create(
+            IModelMetadataProvider metadataProvider,
+            params IModelBinderProvider[] providers)
+        {
+            if (metadataProvider == null)
+            {
+                metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            }
+
+            var options = Options.Create(new MvcOptions());
+            foreach (var provider in providers)
+            {
+                options.Value.ModelBinderProviders.Add(provider);
+            }
+            return new TestModelBinderFactory(metadataProvider, options);
+        }
+
+        public static TestModelBinderFactory CreateDefault(params IModelBinderProvider[] providers)
+        {
+            return CreateDefault(null, providers);
+        }
+
+        public static TestModelBinderFactory CreateDefault(
+            IModelMetadataProvider metadataProvider,
+            params IModelBinderProvider[] providers)
+        {
+            if (metadataProvider == null)
+            {
+                metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            }
+
+            var options = Options.Create(new MvcOptions());
+            foreach (var provider in providers)
+            {
+                options.Value.ModelBinderProviders.Add(provider);
+            }
+            new MvcCoreMvcOptionsSetup(new TestHttpRequestStreamReaderFactory()).Configure(options.Value);
+            return new TestModelBinderFactory(metadataProvider, options);
+        }
+
+        protected TestModelBinderFactory(IModelMetadataProvider metadataProvider, IOptions<MvcOptions> options)
+            : this(metadataProvider, options, GetServices(options))
+        {
+        }
+
+        protected TestModelBinderFactory(
+            IModelMetadataProvider metadataProvider,
+            IOptions<MvcOptions> options,
+            IServiceProvider serviceProvider)
+            : base(metadataProvider, options, serviceProvider)
+        {
+        }
+
+        private static IServiceProvider GetServices(IOptions<MvcOptions> options)
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<ILoggerFactory, NullLoggerFactory>();
+            services.AddSingleton(options);
+            return services.BuildServiceProvider();
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestModelMetadataProvider.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestModelMetadataProvider.cs
new file mode 100644
index 0000000000..73fe0c4c6b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestModelMetadataProvider.cs
@@ -0,0 +1,239 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class TestModelMetadataProvider : DefaultModelMetadataProvider
+    {
+        // Creates a provider with all the defaults - includes data annotations
+        public static ModelMetadataProvider CreateDefaultProvider(IStringLocalizerFactory stringLocalizerFactory = null)
+        {
+            var detailsProviders = new List<IMetadataDetailsProvider>
+            {
+                new DefaultBindingMetadataProvider(),
+                new DefaultValidationMetadataProvider(),
+                new DataAnnotationsMetadataProvider(
+                    Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                    stringLocalizerFactory),
+                new DataMemberRequiredBindingMetadataProvider(),
+            };
+
+            MvcCoreMvcOptionsSetup.ConfigureAdditionalModelMetadataDetailsProvider(detailsProviders);
+
+            var compositeDetailsProvider = new DefaultCompositeMetadataDetailsProvider(detailsProviders);
+            return new DefaultModelMetadataProvider(compositeDetailsProvider, Options.Create(new MvcOptions()));
+        }
+
+        public static IModelMetadataProvider CreateDefaultProvider(IList<IMetadataDetailsProvider> providers)
+        {
+            var detailsProviders = new List<IMetadataDetailsProvider>()
+            {
+                new DefaultBindingMetadataProvider(),
+                new DefaultValidationMetadataProvider(),
+                new DataAnnotationsMetadataProvider(
+                    Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                    stringLocalizerFactory: null),
+                new DataMemberRequiredBindingMetadataProvider(),
+            };
+
+            MvcCoreMvcOptionsSetup.ConfigureAdditionalModelMetadataDetailsProvider(detailsProviders);
+
+            detailsProviders.AddRange(providers);
+
+            var compositeDetailsProvider = new DefaultCompositeMetadataDetailsProvider(detailsProviders);
+            return new DefaultModelMetadataProvider(compositeDetailsProvider, Options.Create(new MvcOptions()));
+        }
+
+        public static IModelMetadataProvider CreateProvider(IList<IMetadataDetailsProvider> providers)
+        {
+            var detailsProviders = new List<IMetadataDetailsProvider>();
+            if (providers != null)
+            {
+                detailsProviders.AddRange(providers);
+            }
+
+            var compositeDetailsProvider = new DefaultCompositeMetadataDetailsProvider(detailsProviders);
+            return new DefaultModelMetadataProvider(compositeDetailsProvider, Options.Create(new MvcOptions()));
+        }
+
+        private readonly TestModelMetadataDetailsProvider _detailsProvider;
+
+        public TestModelMetadataProvider()
+            : this(new TestModelMetadataDetailsProvider())
+        {
+        }
+
+        private TestModelMetadataProvider(TestModelMetadataDetailsProvider detailsProvider)
+            : base(
+                  new DefaultCompositeMetadataDetailsProvider(new IMetadataDetailsProvider[]
+                  {
+                      new DefaultBindingMetadataProvider(),
+                      new DefaultValidationMetadataProvider(),
+                      new DataAnnotationsMetadataProvider(
+                          Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                          stringLocalizerFactory: null),
+                      detailsProvider
+                  }),
+                  Options.Create(new MvcOptions()))
+        {
+            _detailsProvider = detailsProvider;
+        }
+
+        public IMetadataBuilder ForType(Type type)
+        {
+            var key = ModelMetadataIdentity.ForType(type);
+
+            var builder = new MetadataBuilder(key);
+            _detailsProvider.Builders.Add(builder);
+            return builder;
+        }
+
+        public IMetadataBuilder ForType<TModel>()
+        {
+            return ForType(typeof(TModel));
+        }
+
+        public IMetadataBuilder ForProperty(Type containerType, string propertyName)
+        {
+            var property = containerType.GetRuntimeProperty(propertyName);
+            Assert.NotNull(property);
+
+            var key = ModelMetadataIdentity.ForProperty(property.PropertyType, propertyName, containerType);
+
+            var builder = new MetadataBuilder(key);
+            _detailsProvider.Builders.Add(builder);
+            return builder;
+        }
+
+        public IMetadataBuilder ForParameter(ParameterInfo parameter)
+        {
+            var key = ModelMetadataIdentity.ForParameter(parameter);
+            var builder = new MetadataBuilder(key);
+            _detailsProvider.Builders.Add(builder);
+
+            return builder;
+        }
+
+        public IMetadataBuilder ForProperty<TContainer>(string propertyName)
+        {
+            return ForProperty(typeof(TContainer), propertyName);
+        }
+
+        private class TestModelMetadataDetailsProvider :
+            IBindingMetadataProvider,
+            IDisplayMetadataProvider,
+            IValidationMetadataProvider
+        {
+            public List<MetadataBuilder> Builders { get; } = new List<MetadataBuilder>();
+
+            public void CreateBindingMetadata(BindingMetadataProviderContext context)
+            {
+                foreach (var builder in Builders)
+                {
+                    builder.Apply(context);
+                }
+            }
+
+            public void CreateDisplayMetadata(DisplayMetadataProviderContext context)
+            {
+                foreach (var builder in Builders)
+                {
+                    builder.Apply(context);
+                }
+            }
+
+            public void CreateValidationMetadata(ValidationMetadataProviderContext context)
+            {
+                foreach (var builder in Builders)
+                {
+                    builder.Apply(context);
+                }
+            }
+        }
+
+        public interface IMetadataBuilder
+        {
+            IMetadataBuilder BindingDetails(Action<BindingMetadata> action);
+
+            IMetadataBuilder DisplayDetails(Action<DisplayMetadata> action);
+
+            IMetadataBuilder ValidationDetails(Action<ValidationMetadata> action);
+        }
+
+        private class MetadataBuilder : IMetadataBuilder
+        {
+            private List<Action<BindingMetadata>> _bindingActions = new List<Action<BindingMetadata>>();
+            private List<Action<DisplayMetadata>> _displayActions = new List<Action<DisplayMetadata>>();
+            private List<Action<ValidationMetadata>> _valiationActions = new List<Action<ValidationMetadata>>();
+
+            private readonly ModelMetadataIdentity _key;
+
+            public MetadataBuilder(ModelMetadataIdentity key)
+            {
+                _key = key;
+            }
+
+            public void Apply(BindingMetadataProviderContext context)
+            {
+                if (_key.Equals(context.Key))
+                {
+                    foreach (var action in _bindingActions)
+                    {
+                        action(context.BindingMetadata);
+                    }
+                }
+            }
+
+            public void Apply(DisplayMetadataProviderContext context)
+            {
+                if (_key.Equals(context.Key))
+                {
+                    foreach (var action in _displayActions)
+                    {
+                        action(context.DisplayMetadata);
+                    }
+                }
+            }
+
+            public void Apply(ValidationMetadataProviderContext context)
+            {
+                if (_key.Equals(context.Key))
+                {
+                    foreach (var action in _valiationActions)
+                    {
+                        action(context.ValidationMetadata);
+                    }
+                }
+            }
+
+            public IMetadataBuilder BindingDetails(Action<BindingMetadata> action)
+            {
+                _bindingActions.Add(action);
+                return this;
+            }
+
+            public IMetadataBuilder DisplayDetails(Action<DisplayMetadata> action)
+            {
+                _displayActions.Add(action);
+                return this;
+            }
+
+            public IMetadataBuilder ValidationDetails(Action<ValidationMetadata> action)
+            {
+                _valiationActions.Add(action);
+                return this;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestModelValidatorProvider.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestModelValidatorProvider.cs
new file mode 100644
index 0000000000..96d714ee24
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestModelValidatorProvider.cs
@@ -0,0 +1,34 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
+{
+    public class TestModelValidatorProvider : CompositeModelValidatorProvider
+    {
+        // Creates a provider with all the defaults - includes data annotations
+        public static CompositeModelValidatorProvider CreateDefaultProvider()
+        {
+            var providers = new IModelValidatorProvider[]
+            {
+                new DefaultModelValidatorProvider(),
+                new DataAnnotationsModelValidatorProvider(
+                    new ValidationAttributeAdapterProvider(),
+                    Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                    stringLocalizerFactory: null)
+            };
+
+            return new TestModelValidatorProvider(providers);
+        }
+
+        public TestModelValidatorProvider(IList<IModelValidatorProvider> providers)
+            : base(providers)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestRazorCompiledItem.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestRazorCompiledItem.cs
new file mode 100644
index 0000000000..6bd6b246e9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestRazorCompiledItem.cs
@@ -0,0 +1,47 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Hosting
+{
+    public class TestRazorCompiledItem : RazorCompiledItem
+    {
+        public TestRazorCompiledItem(Type type, string kind, string identifier, object[] metadata)
+        {
+            Type = type;
+            Kind = kind;
+            Identifier = identifier;
+            Metadata = metadata;
+        }
+
+        public override string Identifier { get; }
+
+        public override string Kind { get; }
+
+        public override IReadOnlyList<object> Metadata { get; }
+
+        public override Type Type { get; }
+
+        public static string GetChecksum(string content)
+        {
+            byte[] bytes;
+            using (var sha = SHA1.Create())
+            {
+                bytes = sha.ComputeHash(Encoding.UTF8.GetBytes(content));
+            }
+
+            var result = new StringBuilder(bytes.Length);
+            for (var i = 0; i < bytes.Length; i++)
+            {
+                // The x2 format means lowercase hex, where each byte is a 2-character string.
+                result.Append(bytes[i].ToString("x2"));
+            }
+
+            return result.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestRazorProjectItem.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestRazorProjectItem.cs
new file mode 100644
index 0000000000..05b9aee207
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestRazorProjectItem.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System.IO;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class TestRazorProjectItem : RazorProjectItem
+    {
+        public TestRazorProjectItem(
+            string filePath,
+            string content = "Default content",
+            string physicalPath = null,
+            string relativePhysicalPath = null,
+            string basePath = "/")
+        {
+            FilePath = filePath;
+            PhysicalPath = physicalPath;
+            RelativePhysicalPath = relativePhysicalPath;
+            BasePath = basePath;
+            Content = content;
+        }
+
+        public override string BasePath { get; }
+
+        public override string FilePath { get; }
+
+        public override string PhysicalPath { get; }
+
+        public override string RelativePhysicalPath { get; }
+
+        public override bool Exists { get; } = true;
+
+        public string Content { get; set; }
+
+        public override Stream Read()
+        {
+            var stream = new MemoryStream(Encoding.UTF8.GetBytes(Content));
+
+            return stream;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestViewBufferScope.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestViewBufferScope.cs
new file mode 100644
index 0000000000..4497a592d4
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/TestViewBufferScope.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using System.Buffers;
+using System.Collections.Generic;
+using System.IO;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class TestViewBufferScope : IViewBufferScope
+    {
+        public IList<ViewBufferValue[]> CreatedBuffers { get; } = new List<ViewBufferValue[]>();
+
+        public IList<ViewBufferValue[]> ReturnedBuffers { get; } = new List<ViewBufferValue[]>();
+
+        public ViewBufferValue[] GetPage(int size)
+        {
+            var buffer = new ViewBufferValue[size];
+            CreatedBuffers.Add(buffer);
+            return buffer;
+        }
+
+        public void ReturnSegment(ViewBufferValue[] segment)
+        {
+            ReturnedBuffers.Add(segment);
+        }
+
+        public PagedBufferedTextWriter CreateWriter(TextWriter writer)
+        {
+            return new PagedBufferedTextWriter(ArrayPool<char>.Shared, writer);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/ValidationAttributeUtil.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/ValidationAttributeUtil.cs
new file mode 100644
index 0000000000..20da144e20
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/ValidationAttributeUtil.cs
@@ -0,0 +1,39 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public static class ValidationAttributeUtil
+    {
+        public static string GetRequiredErrorMessage(string field)
+        {
+            var attr = new RequiredAttribute();
+            return attr.FormatErrorMessage(field);
+        }
+
+        public static string GetStringLengthErrorMessage(int? minimumLength, int maximumLength, string field)
+        {
+            var attr = new StringLengthAttribute(maximumLength);
+            if (minimumLength != null)
+            {
+                attr.MinimumLength = (int)minimumLength;
+            }
+
+            return attr.FormatErrorMessage(field);
+        }
+
+        public static string GetRegExErrorMessage(string pattern, string field)
+        {
+            var attr = new RegularExpressionAttribute(pattern);
+            return attr.FormatErrorMessage(field);
+        }
+
+        public static string GetRangeErrorMessage(int min, int max, string field)
+        {
+            var attr = new RangeAttribute(min, max);
+            return attr.FormatErrorMessage(field);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/VirtualRazorProjectFileSystem.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/VirtualRazorProjectFileSystem.cs
new file mode 100644
index 0000000000..2d848bc7ea
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestCommon/VirtualRazorProjectFileSystem.cs
@@ -0,0 +1,233 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+    public class VirtualRazorProjectFileSystem : RazorProjectFileSystem
+    {
+        private readonly DirectoryNode _root = new DirectoryNode("/");
+
+        public override IEnumerable<RazorProjectItem> EnumerateItems(string basePath)
+        {
+            basePath = NormalizeAndEnsureValidPath(basePath);
+            var directory = _root.GetDirectory(basePath);
+            return directory?.EnumerateItems() ?? Enumerable.Empty<RazorProjectItem>();
+        }
+
+        public override RazorProjectItem GetItem(string path)
+        {
+            path = NormalizeAndEnsureValidPath(path);
+            return _root.GetItem(path) ?? new NotFoundProjectItem(string.Empty, path);
+        }
+
+        public void Add(RazorProjectItem projectItem)
+        {
+            if (projectItem == null)
+            {
+                throw new ArgumentNullException(nameof(projectItem));
+            }
+
+            var filePath = NormalizeAndEnsureValidPath(projectItem.FilePath);
+            _root.AddFile(new FileNode(filePath, projectItem));
+        }
+
+        // Internal for testing
+        [DebuggerDisplay("{Path}")]
+        internal class DirectoryNode
+        {
+            public DirectoryNode(string path)
+            {
+                Path = path;
+            }
+
+            public string Path { get; }
+
+            public List<DirectoryNode> Directories { get; } = new List<DirectoryNode>();
+
+            public List<FileNode> Files { get; } = new List<FileNode>();
+
+            public void AddFile(FileNode fileNode)
+            {
+                var filePath = fileNode.Path;
+                if (!filePath.StartsWith(Path, StringComparison.OrdinalIgnoreCase))
+                {
+                    throw new InvalidOperationException($"File {fileNode.Path} does not belong to {Path}.");
+                }
+
+                // Look for the first / that appears in the path after the current directory path.
+                var directoryPath = GetDirectoryPath(filePath);
+                var directory = GetOrAddDirectory(this, directoryPath, createIfNotExists: true);
+                Debug.Assert(directory != null);
+                directory.Files.Add(fileNode);
+            }
+
+            public DirectoryNode GetDirectory(string path)
+            {
+                if (!path.StartsWith(Path, StringComparison.OrdinalIgnoreCase))
+                {
+                    throw new InvalidOperationException($"File {path} does not belong to {Path}.");
+                }
+
+                return GetOrAddDirectory(this, path);
+            }
+
+            public IEnumerable<RazorProjectItem> EnumerateItems()
+            {
+                foreach (var file in Files)
+                {
+                    yield return file.ProjectItem;
+                }
+
+                foreach (var directory in Directories)
+                {
+                    foreach (var file in directory.EnumerateItems())
+                    {
+                        yield return file;
+                    }
+                }
+            }
+
+            public RazorProjectItem GetItem(string path)
+            {
+                if (!path.StartsWith(Path, StringComparison.OrdinalIgnoreCase))
+                {
+                    throw new InvalidOperationException($"File {path} does not belong to {Path}.");
+                }
+
+                var directoryPath = GetDirectoryPath(path);
+                var directory = GetOrAddDirectory(this, directoryPath);
+                if (directory == null)
+                {
+                    return null;
+                }
+
+                foreach (var file in directory.Files)
+                {
+                    var filePath = file.Path;
+                    var directoryLength = directory.Path.Length;
+
+                    // path, filePath -> /Views/Home/Index.cshtml
+                    // directory.Path -> /Views/Home/
+                    // We only need to match the file name portion since we've already matched the directory segment.
+                    if (string.Compare(path, directoryLength, filePath, directoryLength, path.Length - directoryLength, StringComparison.OrdinalIgnoreCase) == 0)
+                    {
+                        return file.ProjectItem;
+                    }
+                }
+
+                return null;
+            }
+
+            private static string GetDirectoryPath(string path)
+            {
+                // /dir1/dir2/file.cshtml -> /dir1/dir2/
+                var fileNameIndex = path.LastIndexOf('/');
+                if (fileNameIndex == -1)
+                {
+                    return path;
+                }
+
+                return path.Substring(0, fileNameIndex + 1);
+            }
+
+            private static DirectoryNode GetOrAddDirectory(
+                DirectoryNode directory,
+                string path,
+                bool createIfNotExists = false)
+            {
+                Debug.Assert(!string.IsNullOrEmpty(path));
+                if (path[path.Length - 1] != '/')
+                {
+                    path += '/';
+                }
+
+                int index;
+                while ((index = path.IndexOf('/', directory.Path.Length)) != -1 && index != path.Length)
+                {
+                    var subDirectory = FindSubDirectory(directory, path);
+
+                    if (subDirectory == null)
+                    {
+                        if (createIfNotExists)
+                        {
+                            var directoryPath = path.Substring(0, index + 1); // + 1 to include trailing slash
+                            subDirectory = new DirectoryNode(directoryPath);
+                            directory.Directories.Add(subDirectory);
+                        }
+                        else
+                        {
+                            return null;
+                        }
+                    }
+
+                    directory = subDirectory;
+                }
+
+                return directory;
+            }
+
+            private static DirectoryNode FindSubDirectory(DirectoryNode parentDirectory, string path)
+            {
+                for (var i = 0; i < parentDirectory.Directories.Count; i++)
+                {
+                    // ParentDirectory.Path -> /Views/Home/
+                    // CurrentDirectory.Path -> /Views/Home/SubDir/
+                    // Path -> /Views/Home/SubDir/MorePath/File.cshtml
+                    // Each invocation of FindSubDirectory returns the immediate subdirectory along the path to the file.
+
+                    var currentDirectory = parentDirectory.Directories[i];
+                    var directoryPath = currentDirectory.Path;
+                    var startIndex = parentDirectory.Path.Length;
+                    var directoryNameLength = directoryPath.Length - startIndex;
+
+                    if (string.Compare(path, startIndex, directoryPath, startIndex, directoryPath.Length - startIndex, StringComparison.OrdinalIgnoreCase) == 0)
+                    {
+                        return currentDirectory;
+                    }
+                }
+
+                return null;
+            }
+        }
+
+        // Internal for testing
+        [DebuggerDisplay("{Path}")]
+        internal struct FileNode
+        {
+            public FileNode(string path, RazorProjectItem projectItem)
+            {
+                Path = path;
+                ProjectItem = projectItem;
+            }
+
+            public string Path { get; }
+
+            public RazorProjectItem ProjectItem { get; }
+        }
+
+        private class NotFoundProjectItem : RazorProjectItem
+        {
+            public NotFoundProjectItem(string basePath, string path)
+            {
+                BasePath = basePath;
+                FilePath = path;
+            }
+
+            public override string BasePath { get; }
+
+            public override string FilePath { get; }
+
+            public override bool Exists => false;
+
+            public override string PhysicalPath => throw new NotSupportedException();
+
+            public override Stream Read() => throw new NotSupportedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionContext.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionContext.cs
new file mode 100644
index 0000000000..6a2ab0ef50
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionContext.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public interface IProxyActionContext
+    {
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionDescriptor.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionDescriptor.cs
new file mode 100644
index 0000000000..85364d6b84
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionDescriptor.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public interface IProxyActionDescriptor
+    {
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionResult.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionResult.cs
new file mode 100644
index 0000000000..e6ac61fbbc
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionResult.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public interface IProxyActionResult
+    {
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyHttpContext.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyHttpContext.cs
new file mode 100644
index 0000000000..b8777776e1
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyHttpContext.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public interface IProxyHttpContext
+    {
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyPage.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyPage.cs
new file mode 100644
index 0000000000..c39cd01d8b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyPage.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public interface IProxyPage
+    {
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyRouteData.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyRouteData.cs
new file mode 100644
index 0000000000..3967c5a5aa
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyRouteData.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public interface IProxyRouteData
+    {
+        IReadOnlyList<object> Routers { get; }
+        IDictionary<string, object> DataTokens { get; }
+        IDictionary<string, object> Values { get; }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyView.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyView.cs
new file mode 100644
index 0000000000..fe84b9c049
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyView.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public interface IProxyView
+    {
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewComponentContext.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewComponentContext.cs
new file mode 100644
index 0000000000..9c30b3e30f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewComponentContext.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public interface IProxyViewComponentContext
+    {
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewComponentResult.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewComponentResult.cs
new file mode 100644
index 0000000000..b384cecde5
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewComponentResult.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public interface IProxyViewComponentResult
+    {
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewContext.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewContext.cs
new file mode 100644
index 0000000000..318216c381
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewContext.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public interface IProxyViewContext
+    {
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj
new file mode 100644
index 0000000000..23a77e17a1
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="$(MicrosoftExtensionsDiagnosticAdapterPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/TestDiagnosticListener.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/TestDiagnosticListener.cs
new file mode 100644
index 0000000000..02966a1ece
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/TestDiagnosticListener.cs
@@ -0,0 +1,435 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.Extensions.DiagnosticAdapter;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class TestDiagnosticListener
+    {
+        public class OnBeforeActionEventData
+        {
+            public IProxyActionDescriptor ActionDescriptor { get; set; }
+            public IProxyHttpContext HttpContext { get; set; }
+            public IProxyRouteData RouteData { get; set; }
+        }
+
+        public OnBeforeActionEventData BeforeAction { get; set; }
+
+        [DiagnosticName("Microsoft.AspNetCore.Mvc.BeforeAction")]
+        public virtual void OnBeforeAction(
+            IProxyHttpContext httpContext,
+            IProxyRouteData routeData,
+            IProxyActionDescriptor actionDescriptor)
+        {
+            BeforeAction = new OnBeforeActionEventData()
+            {
+                ActionDescriptor = actionDescriptor,
+                HttpContext = httpContext,
+                RouteData = routeData,
+            };
+        }
+
+        public class OnAfterActionEventData
+        {
+            public IProxyActionDescriptor ActionDescriptor { get; set; }
+            public IProxyHttpContext HttpContext { get; set; }
+        }
+
+        public OnAfterActionEventData AfterAction { get; set; }
+
+        [DiagnosticName("Microsoft.AspNetCore.Mvc.AfterAction")]
+        public virtual void OnAfterAction(
+            IProxyHttpContext httpContext,
+            IProxyActionDescriptor actionDescriptor)
+        {
+            AfterAction = new OnAfterActionEventData()
+            {
+                ActionDescriptor = actionDescriptor,
+                HttpContext = httpContext,
+            };
+        }
+
+        public class OnBeforeActionMethodEventData
+        {
+            public IProxyActionContext ActionContext { get; set; }
+            public IReadOnlyDictionary<string, object> Arguments { get; set; }
+        }
+
+        public OnBeforeActionMethodEventData BeforeActionMethod { get; set; }
+
+        [DiagnosticName("Microsoft.AspNetCore.Mvc.BeforeActionMethod")]
+        public virtual void OnBeforeActionMethod(
+            IProxyActionContext actionContext,
+            IReadOnlyDictionary<string, object> arguments)
+        {
+            BeforeActionMethod = new OnBeforeActionMethodEventData()
+            {
+                ActionContext = actionContext,
+                Arguments = arguments,
+            };
+        }
+
+        public class OnAfterActionMethodEventData
+        {
+            public IProxyActionContext ActionContext { get; set; }
+            public IProxyActionResult Result { get; set; }
+        }
+
+        public OnAfterActionMethodEventData AfterActionMethod { get; set; }
+
+        [DiagnosticName("Microsoft.AspNetCore.Mvc.AfterActionMethod")]
+        public virtual void OnAfterActionMethod(
+            IProxyActionContext actionContext,
+            IProxyActionResult result)
+        {
+            AfterActionMethod = new OnAfterActionMethodEventData()
+            {
+                ActionContext = actionContext,
+                Result = result,
+            };
+        }
+
+        public class OnBeforeActionResultEventData
+        {
+            public IProxyActionContext ActionContext { get; set; }
+            public IProxyActionResult Result { get; set; }
+        }
+
+        public OnBeforeActionResultEventData BeforeActionResult { get; set; }
+
+        [DiagnosticName("Microsoft.AspNetCore.Mvc.BeforeActionResult")]
+        public virtual void OnBeforeActionResult(IProxyActionContext actionContext, IProxyActionResult result)
+        {
+            BeforeActionResult = new OnBeforeActionResultEventData()
+            {
+                ActionContext = actionContext,
+                Result = result,
+            };
+        }
+
+        public class OnAfterActionResultEventData
+        {
+            public IProxyActionContext ActionContext { get; set; }
+            public IProxyActionResult Result { get; set; }
+        }
+
+        public OnAfterActionResultEventData AfterActionResult { get; set; }
+
+        [DiagnosticName("Microsoft.AspNetCore.Mvc.AfterActionResult")]
+        public virtual void OnAfterActionResult(IProxyActionContext actionContext, IProxyActionResult result)
+        {
+            AfterActionResult = new OnAfterActionResultEventData()
+            {
+                ActionContext = actionContext,
+                Result = result,
+            };
+        }
+
+        public class OnViewFoundEventData
+        {
+            public IProxyActionContext ActionContext { get; set; }
+            public bool IsMainPage { get; set; }
+            public IProxyActionResult Result { get; set; }
+            public string ViewName { get; set; }
+            public IProxyView View { get; set; }
+        }
+
+        public OnViewFoundEventData ViewFound { get; set; }
+
+        [DiagnosticName("Microsoft.AspNetCore.Mvc.ViewFound")]
+        public virtual void OnViewFound(
+            IProxyActionContext actionContext,
+            bool isMainPage,
+            IProxyActionResult result,
+            string viewName,
+            IProxyView view)
+        {
+            ViewFound = new OnViewFoundEventData()
+            {
+                ActionContext = actionContext,
+                IsMainPage = isMainPage,
+                Result = result,
+                ViewName = viewName,
+                View = view,
+            };
+        }
+
+        public class OnViewNotFoundEventData
+        {
+            public IProxyActionContext ActionContext { get; set; }
+            public bool IsMainPage { get; set; }
+            public IProxyActionResult Result { get; set; }
+            public string ViewName { get; set; }
+            public IEnumerable<string> SearchedLocations { get; set; }
+        }
+
+        public OnViewNotFoundEventData ViewNotFound { get; set; }
+
+        [DiagnosticName("Microsoft.AspNetCore.Mvc.ViewNotFound")]
+        public virtual void OnViewNotFound(
+            IProxyActionContext actionContext,
+            bool isMainPage,
+            IProxyActionResult result,
+            string viewName,
+            IEnumerable<string> searchedLocations)
+        {
+            ViewNotFound = new OnViewNotFoundEventData()
+            {
+                ActionContext = actionContext,
+                IsMainPage = isMainPage,
+                Result = result,
+                ViewName = viewName,
+                SearchedLocations = searchedLocations,
+            };
+        }
+
+        public class OnBeforeViewEventData
+        {
+            public IProxyView View { get; set; }
+            public IProxyViewContext ViewContext { get; set; }
+        }
+
+        public OnBeforeViewEventData BeforeView { get; set; }
+
+        [DiagnosticName("Microsoft.AspNetCore.Mvc.BeforeView")]
+        public virtual void OnBeforeView(IProxyView view, IProxyViewContext viewContext)
+        {
+            BeforeView = new OnBeforeViewEventData()
+            {
+                View = view,
+                ViewContext = viewContext,
+            };
+        }
+
+        public class OnAfterViewEventData
+        {
+            public IProxyView View { get; set; }
+            public IProxyViewContext ViewContext { get; set; }
+        }
+
+        public OnAfterViewEventData AfterView { get; set; }
+
+        [DiagnosticName("Microsoft.AspNetCore.Mvc.AfterView")]
+        public virtual void OnAfterView(IProxyView view, IProxyViewContext viewContext)
+        {
+            AfterView = new OnAfterViewEventData()
+            {
+                View = view,
+                ViewContext = viewContext,
+            };
+        }
+
+        public class OnBeforeViewPageEventData
+        {
+            public IProxyPage Page { get; set; }
+            public IProxyViewContext ViewContext { get; set; }
+            public IProxyActionDescriptor ActionDescriptor { get; set; }
+            public IProxyHttpContext HttpContext { get; set; }
+        }
+
+        public OnBeforeViewPageEventData BeforeViewPage { get; set; }
+
+        [DiagnosticName("Microsoft.AspNetCore.Mvc.Razor.BeforeViewPage")]
+        public virtual void OnBeforeViewPage(
+            IProxyPage page,
+            IProxyViewContext viewContext,
+            IProxyActionDescriptor actionDescriptor,
+            IProxyHttpContext httpContext)
+        {
+            BeforeViewPage = new OnBeforeViewPageEventData()
+            {
+                Page = page,
+                ViewContext = viewContext,
+                ActionDescriptor = actionDescriptor,
+                HttpContext = httpContext,
+            };
+        }
+
+        public class OnAfterViewPageEventData
+        {
+            public IProxyPage Page { get; set; }
+            public IProxyViewContext ViewContext { get; set; }
+            public IProxyActionDescriptor ActionDescriptor { get; set; }
+            public IProxyHttpContext HttpContext { get; set; }
+        }
+
+        public OnAfterViewPageEventData AfterViewPage { get; set; }
+
+        [DiagnosticName("Microsoft.AspNetCore.Mvc.Razor.AfterViewPage")]
+        public virtual void OnAfterViewPage(
+            IProxyPage page,
+            IProxyViewContext viewContext,
+            IProxyActionDescriptor actionDescriptor,
+            IProxyHttpContext httpContext)
+        {
+            AfterViewPage = new OnAfterViewPageEventData()
+            {
+                Page = page,
+                ViewContext = viewContext,
+                ActionDescriptor = actionDescriptor,
+                HttpContext = httpContext,
+            };
+        }
+
+        public class OnBeforeViewComponentEventData
+        {
+            public IProxyActionDescriptor ActionDescriptor { get; set; }
+
+            public IProxyViewComponentContext ViewComponentContext { get; set; }
+
+            public object ViewComponent { get; set; }
+        }
+
+        public OnBeforeViewComponentEventData BeforeViewComponent { get; set; }
+
+        [DiagnosticName("Microsoft.AspNetCore.Mvc.BeforeViewComponent")]
+        public virtual void OnBeforeViewComponent(
+            IProxyActionDescriptor actionDescriptor,
+            IProxyViewComponentContext viewComponentContext,
+            object viewComponent)
+        {
+            BeforeViewComponent = new OnBeforeViewComponentEventData()
+            {
+                ActionDescriptor = actionDescriptor,
+                ViewComponentContext = viewComponentContext,
+                ViewComponent = viewComponent
+            };
+        }
+
+        public class OnAfterViewComponentEventData
+        {
+            public IProxyActionDescriptor ActionDescriptor { get; set; }
+
+            public IProxyViewComponentContext ViewComponentContext { get; set; }
+
+            public IProxyViewComponentResult ViewComponentResult { get; set; }
+
+            public object ViewComponent { get; set; }
+        }
+
+        public OnAfterViewComponentEventData AfterViewComponent { get; set; }
+
+        [DiagnosticName("Microsoft.AspNetCore.Mvc.AfterViewComponent")]
+        public virtual void OnAfterViewComponent(
+            IProxyActionDescriptor actionDescriptor,
+            IProxyViewComponentContext viewComponentContext,
+            IProxyViewComponentResult viewComponentResult,
+            object viewComponent)
+        {
+            AfterViewComponent = new OnAfterViewComponentEventData()
+            {
+                ActionDescriptor = actionDescriptor,
+                ViewComponentContext = viewComponentContext,
+                ViewComponentResult = viewComponentResult,
+                ViewComponent = viewComponent
+            };
+        }
+
+        public class OnViewComponentBeforeViewExecuteEventData
+        {
+            public IProxyActionDescriptor ActionDescriptor { get; set; }
+
+            public IProxyViewComponentContext ViewComponentContext { get; set; }
+
+            public IProxyView View { get; set; }
+        }
+
+        public OnViewComponentBeforeViewExecuteEventData ViewComponentBeforeViewExecute { get; set; }
+
+        [DiagnosticName("Microsoft.AspNetCore.Mvc.ViewComponentBeforeViewExecute")]
+        public virtual void OnViewComponentBeforeViewExecute(
+            IProxyActionDescriptor actionDescriptor,
+            IProxyViewComponentContext viewComponentContext,
+            IProxyView view)
+        {
+            ViewComponentBeforeViewExecute = new OnViewComponentBeforeViewExecuteEventData()
+            {
+                ActionDescriptor = actionDescriptor,
+                ViewComponentContext = viewComponentContext,
+                View = view
+            };
+        }
+
+        public class OnViewComponentAfterViewExecuteEventData
+        {
+            public IProxyActionDescriptor ActionDescriptor { get; set; }
+
+            public IProxyViewComponentContext ViewComponentContext { get; set; }
+
+            public IProxyView View { get; set; }
+        }
+
+        public OnViewComponentAfterViewExecuteEventData ViewComponentAfterViewExecute { get; set; }
+
+        [DiagnosticName("Microsoft.AspNetCore.Mvc.ViewComponentAfterViewExecute")]
+        public virtual void OnViewComponentAfterViewExecute(
+            IProxyActionDescriptor actionDescriptor,
+            IProxyViewComponentContext viewComponentContext,
+            IProxyView view)
+        {
+            ViewComponentAfterViewExecute = new OnViewComponentAfterViewExecuteEventData()
+            {
+                ActionDescriptor = actionDescriptor,
+                ViewComponentContext = viewComponentContext,
+                View = view
+            };
+        }
+
+        public class BeginPageInstrumentationData
+        {
+            public IProxyHttpContext HttpContext { get; set; }
+
+            public string Path { get; set; }
+
+            public int Position { get; set; }
+
+            public int Length { get; set; }
+
+            public bool IsLiteral { get; set; }
+        }
+
+        public class EndPageInstrumentationData
+        {
+            public IProxyHttpContext HttpContext { get; set; }
+
+            public string Path { get; set; }
+        }
+
+        public List<object> PageInstrumentationData { get; set; } = new List<object>();
+
+        [DiagnosticName("Microsoft.AspNetCore.Mvc.Razor.BeginInstrumentationContext")]
+        public virtual void OnBeginPageInstrumentationContext(
+            IProxyHttpContext httpContext,
+            string path,
+            int position,
+            int length,
+            bool isLiteral)
+        {
+            PageInstrumentationData.Add(new BeginPageInstrumentationData
+            {
+                HttpContext = httpContext,
+                Path = path,
+                Position = position,
+                Length = length,
+                IsLiteral = isLiteral,
+            });
+        }
+
+        [DiagnosticName("Microsoft.AspNetCore.Mvc.Razor.EndInstrumentationContext")]
+        public virtual void OnEndPageInstrumentationContext(
+            IProxyHttpContext httpContext,
+            string path,
+            int position,
+            int length,
+            bool isLiteral)
+        {
+            PageInstrumentationData.Add(new EndPageInstrumentationData
+            {
+                HttpContext = httpContext,
+                Path = path,
+            });
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerTest.cs
new file mode 100644
index 0000000000..d88b338f7c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerTest.cs
@@ -0,0 +1,491 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Options;
+using Moq;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Test
+{
+    public class ControllerTest
+    {
+        public static IEnumerable<object[]> PublicNormalMethodsFromController
+        {
+            get
+            {
+                return typeof(Controller).GetTypeInfo()
+                    .DeclaredMethods
+                    .Where(method => method.IsPublic &&
+                    !method.IsSpecialName &&
+                    !method.Name.Equals("Dispose", StringComparison.OrdinalIgnoreCase))
+                    .Select(method => new[] { method });
+            }
+        }
+
+        [Fact]
+        public void SettingViewData_AlsoUpdatesViewBag()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var controller = new TestableController();
+            var originalViewData = controller.ViewData = new ViewDataDictionary<object>(metadataProvider);
+            var replacementViewData = new ViewDataDictionary<object>(metadataProvider);
+
+            // Act
+            controller.ViewBag.Hello = "goodbye";
+            controller.ViewData = replacementViewData;
+            controller.ViewBag.Another = "property";
+
+            // Assert
+            Assert.NotSame(originalViewData, controller.ViewData);
+            Assert.Same(replacementViewData, controller.ViewData);
+            Assert.Null(controller.ViewBag.Hello);
+            Assert.Equal("property", controller.ViewBag.Another);
+            Assert.Equal("property", controller.ViewData["Another"]);
+        }
+
+        [Theory]
+        [MemberData(nameof(PublicNormalMethodsFromController))]
+        public void NonActionAttribute_IsOnEveryPublicNormalMethodFromController(MethodInfo method)
+        {
+            // Arrange & Act & Assert
+            Assert.True(method.IsDefined(typeof(NonActionAttribute)));
+        }
+
+        [Fact]
+        public void Controller_View_WithoutParameter_SetsResultNullViewNameAndNullViewDataModelAndSameTempData()
+        {
+            // Arrange
+            var controller = new TestableController()
+            {
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = new TempDataDictionary(new DefaultHttpContext(), Mock.Of<ITempDataProvider>()),
+            };
+
+            // Act
+            var actualViewResult = controller.View();
+
+            // Assert
+            Assert.IsType<ViewResult>(actualViewResult);
+            Assert.Null(actualViewResult.ViewName);
+            Assert.Same(controller.ViewData, actualViewResult.ViewData);
+            Assert.Same(controller.TempData, actualViewResult.TempData);
+            Assert.Null(actualViewResult.ViewData.Model);
+        }
+
+        [Fact]
+        public void Controller_View_WithoutParameter_MaintainsModelInViewData()
+        {
+            // Arrange
+            var controller = new TestableController()
+            {
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = new TempDataDictionary(new DefaultHttpContext(), Mock.Of<ITempDataProvider>()),
+            };
+
+            var model = new object();
+            controller.ViewData.Model = model;
+
+            // Act
+            var actualViewResult = controller.View();
+
+            // Assert
+            Assert.IsType<ViewResult>(actualViewResult);
+            Assert.Null(actualViewResult.ViewName);
+            Assert.Same(controller.ViewData, actualViewResult.ViewData);
+            Assert.Same(controller.TempData, actualViewResult.TempData);
+            Assert.Same(model, actualViewResult.ViewData.Model);
+        }
+
+        [Fact]
+        public void Controller_View_WithParameterViewName_SetsResultViewNameAndNullViewDataModelAndSameTempData()
+        {
+            // Arrange
+            var controller = new TestableController()
+            {
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = new TempDataDictionary(new DefaultHttpContext(), Mock.Of<ITempDataProvider>()),
+            };
+
+            // Act
+            var actualViewResult = controller.View("CustomViewName");
+
+            // Assert
+            Assert.IsType<ViewResult>(actualViewResult);
+            Assert.Equal("CustomViewName", actualViewResult.ViewName);
+            Assert.Same(controller.ViewData, actualViewResult.ViewData);
+            Assert.Same(controller.TempData, actualViewResult.TempData);
+            Assert.Null(actualViewResult.ViewData.Model);
+        }
+
+        [Fact]
+        public void Controller_View_WithParameterViewModel_SetsResultNullViewNameAndViewDataModelAndSameTempData()
+        {
+            // Arrange
+            var controller = new TestableController()
+            {
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = new TempDataDictionary(new DefaultHttpContext(), Mock.Of<ITempDataProvider>()),
+            };
+            var model = new object();
+
+            // Act
+            var actualViewResult = controller.View(model);
+
+            // Assert
+            Assert.IsType<ViewResult>(actualViewResult);
+            Assert.Null(actualViewResult.ViewName);
+            Assert.Same(controller.ViewData, actualViewResult.ViewData);
+            Assert.Same(controller.TempData, actualViewResult.TempData);
+            Assert.Same(model, actualViewResult.ViewData.Model);
+        }
+
+        [Fact]
+        public void Controller_View_WithParameterViewNameAndViewModel_SetsResultViewNameAndViewDataModelAndSameTempData()
+        {
+            // Arrange
+            var controller = new TestableController()
+            {
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = new TempDataDictionary(new DefaultHttpContext(), Mock.Of<ITempDataProvider>()),
+            };
+            var model = new object();
+
+            // Act
+            var actualViewResult = controller.View("CustomViewName", model);
+
+            // Assert
+            Assert.IsType<ViewResult>(actualViewResult);
+            Assert.Equal("CustomViewName", actualViewResult.ViewName);
+            Assert.Same(controller.ViewData, actualViewResult.ViewData);
+            Assert.Same(controller.TempData, actualViewResult.TempData);
+            Assert.Same(model, actualViewResult.ViewData.Model);
+        }
+
+        [Fact]
+        public void Controller_View_WithNullModelParameter_OverwritesViewDataModel()
+        {
+            // Arrange
+            var controller = new TestableController()
+            {
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = new TempDataDictionary(new DefaultHttpContext(), Mock.Of<ITempDataProvider>()),
+            };
+            controller.ViewData.Model = new object();
+
+            // Act
+            var actualViewResult = controller.View(model: null);
+
+            // Assert
+            Assert.IsType<ViewResult>(actualViewResult);
+            Assert.Null(actualViewResult.ViewName);
+            Assert.Same(controller.ViewData, actualViewResult.ViewData);
+            Assert.Same(controller.TempData, actualViewResult.TempData);
+            Assert.Null(actualViewResult.ViewData.Model);
+        }
+
+        [Fact]
+        public void Controller_PartialView_WithoutParameter_MaintainsModelInViewData()
+        {
+            // Arrange
+            var controller = new TestableController()
+            {
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = new TempDataDictionary(new DefaultHttpContext(), Mock.Of<ITempDataProvider>()),
+            };
+
+            var model = new object();
+            controller.ViewData.Model = model;
+
+            // Act
+            var actualViewResult = controller.PartialView();
+
+            // Assert
+            Assert.IsType<PartialViewResult>(actualViewResult);
+            Assert.Null(actualViewResult.ViewName);
+            Assert.Same(controller.ViewData, actualViewResult.ViewData);
+            Assert.Same(controller.TempData, actualViewResult.TempData);
+            Assert.Same(model, actualViewResult.ViewData.Model);
+        }
+
+        [Fact]
+        public void Controller_PartialView_WithParameterViewName_SetsResultViewNameAndMaintainsSameViewDataModelAndTempData()
+        {
+            // Arrange
+            var controller = new TestableController()
+            {
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = new TempDataDictionary(new DefaultHttpContext(), Mock.Of<ITempDataProvider>()),
+            };
+            var model = new object();
+            controller.ViewData.Model = model;
+
+            // Act
+            var actualViewResult = controller.PartialView("CustomViewName");
+
+            // Assert
+            Assert.IsType<PartialViewResult>(actualViewResult);
+            Assert.Equal("CustomViewName", actualViewResult.ViewName);
+            Assert.Same(controller.ViewData, actualViewResult.ViewData);
+            Assert.Same(controller.TempData, actualViewResult.TempData);
+            Assert.Same(model, actualViewResult.ViewData.Model);
+        }
+
+        [Fact]
+        public void Controller_PartialView_WithParameterViewModel_SetsResultNullViewNameAndViewDataModelAndSameTempData()
+        {
+            // Arrange
+            var controller = new TestableController()
+            {
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = new TempDataDictionary(new DefaultHttpContext(), Mock.Of<ITempDataProvider>()),
+            };
+            var model = new object();
+
+            // Act
+            var actualViewResult = controller.PartialView(model);
+
+            // Assert
+            Assert.IsType<PartialViewResult>(actualViewResult);
+            Assert.Null(actualViewResult.ViewName);
+            Assert.Same(controller.ViewData, actualViewResult.ViewData);
+            Assert.Same(controller.TempData, actualViewResult.TempData);
+            Assert.Same(model, actualViewResult.ViewData.Model);
+        }
+
+        [Fact]
+        public void Controller_PartialView_WithParameterViewNameAndViewModel_SetsResultViewNameAndViewDataModelAndSameTempData()
+        {
+            // Arrange
+            var controller = new TestableController()
+            {
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = new TempDataDictionary(new DefaultHttpContext(), Mock.Of<ITempDataProvider>()),
+            };
+            var model = new object();
+
+            // Act
+            var actualViewResult = controller.PartialView("CustomViewName", model);
+
+            // Assert
+            Assert.IsType<PartialViewResult>(actualViewResult);
+            Assert.Equal("CustomViewName", actualViewResult.ViewName);
+            Assert.Same(controller.ViewData, actualViewResult.ViewData);
+            Assert.Same(controller.TempData, actualViewResult.TempData);
+            Assert.Same(model, actualViewResult.ViewData.Model);
+        }
+
+        [Fact]
+        public void Controller_PartialView_WithNullModelParameter_OverwritesViewDataModel()
+        {
+            // Arrange
+            var controller = new TestableController()
+            {
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = new TempDataDictionary(new DefaultHttpContext(), Mock.Of<ITempDataProvider>()),
+            };
+            controller.ViewData.Model = new object();
+
+            // Act
+            var actualViewResult = controller.PartialView(model: null);
+
+            // Assert
+            Assert.IsType<PartialViewResult>(actualViewResult);
+            Assert.Null(actualViewResult.ViewName);
+            Assert.Same(controller.ViewData, actualViewResult.ViewData);
+            Assert.Same(controller.TempData, actualViewResult.TempData);
+            Assert.Null(actualViewResult.ViewData.Model);
+        }
+
+        [Fact]
+        public void Controller_Json_WithParameterValue_SetsResultData()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var data = new object();
+
+            // Act
+            var actualJsonResult = controller.Json(data);
+
+            // Assert
+            Assert.IsType<JsonResult>(actualJsonResult);
+            Assert.Same(data, actualJsonResult.Value);
+        }
+
+        [Fact]
+        public void Controller_Json_WithParameterValue_SetsRespectiveProperty()
+        {
+            // Arrange
+            var controller = new TestableController();
+            var data = new object();
+            var serializerSettings = new JsonSerializerSettings();
+
+            // Act
+            var actualJsonResult = controller.Json(data, serializerSettings);
+
+            // Assert
+            Assert.IsType<JsonResult>(actualJsonResult);
+            Assert.Same(data, actualJsonResult.Value);
+        }
+
+        // These tests share code with the ActionFilterAttribute tests because the various filter
+        // implementations need to behave the same way.
+        [Fact]
+        public async Task Controller_ActionFilter_SettingResult_ShortCircuits()
+        {
+            // Arrange, Act &  Assert
+            await CommonFilterTest.ActionFilter_SettingResult_ShortCircuits(
+                new Mock<Controller>());
+        }
+
+        [Fact]
+        public async Task Controller_ActionFilter_Calls_OnActionExecuted()
+        {
+            // Arrange, Act &  Assert
+            await CommonFilterTest.ActionFilter_Calls_OnActionExecuted(
+                new Mock<Controller>());
+        }
+
+        [Fact]
+        public void ControllerDispose_CallsDispose()
+        {
+            // Arrange
+            var controller = new DisposableController();
+
+            // Act
+            controller.Dispose();
+
+            // Assert
+            Assert.True(controller.DisposeCalled);
+        }
+
+        [Fact]
+        public void TempData_CanSetAndGetValues()
+        {
+            // Arrange
+            var controller = GetController(null, null);
+            var input = "Foo";
+
+            // Act
+            controller.TempData["key"] = input;
+            var result = controller.TempData["key"];
+
+            // Assert
+            Assert.Equal(input, result);
+        }
+
+        public static TheoryData<object, Type> IncompatibleModelData
+        {
+            get
+            {
+                // Small grab bag of instances and expected types with no common base except typeof(object).
+                return new TheoryData<object, Type>
+                {
+                    { null, typeof(object) },
+                    { true, typeof(bool) },
+                    { 43.78, typeof(double) },
+                    { "test string", typeof(string) },
+                    { new List<int>(), typeof(List<int>) },
+                    { new List<string>(), typeof(List<string>) },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(IncompatibleModelData))]
+        public void ViewDataModelSetter_DoesNotThrow(object model, Type expectedType)
+        {
+            // Arrange
+            var activator = new ViewDataDictionaryControllerPropertyActivator(new EmptyModelMetadataProvider());
+            var actionContext = new ActionContext(
+                new DefaultHttpContext(),
+                new RouteData(),
+                new ControllerActionDescriptor());
+            var controllerContext = new ControllerContext(actionContext);
+            var controller = new TestableController();
+            activator.Activate(controllerContext, controller);
+
+            // Guard
+            Assert.NotNull(controller.ViewData);
+
+            // Act (does not throw)
+            controller.ViewData.Model = model;
+
+            // Assert
+            Assert.NotNull(controller.ViewData.ModelMetadata);
+            Assert.Equal(expectedType, controller.ViewData.ModelMetadata.ModelType);
+        }
+
+        private static Controller GetController(IModelBinder binder, IValueProvider valueProvider)
+        {
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var httpContext = new DefaultHttpContext();
+
+            var viewData = new ViewDataDictionary(metadataProvider, new ModelStateDictionary());
+            var tempData = new TempDataDictionary(httpContext, Mock.Of<ITempDataProvider>());
+
+            var valiatorProviders = new[]
+            {
+                new DataAnnotationsModelValidatorProvider(
+                    new ValidationAttributeAdapterProvider(),
+                    Options.Create(new MvcDataAnnotationsLocalizationOptions()),
+                    stringLocalizerFactory: null),
+            };
+
+            valueProvider = valueProvider ?? new SimpleValueProvider();
+            var controllerContext = new ControllerContext()
+            {
+                HttpContext = httpContext,
+                ValueProviderFactories = new[] { new SimpleValueProviderFactory(valueProvider), },
+            };
+
+            var controller = new TestableController()
+            {
+                ControllerContext = controllerContext,
+                MetadataProvider = metadataProvider,
+                ObjectValidator = new DefaultObjectValidator(metadataProvider, valiatorProviders),
+                TempData = tempData,
+                ViewData = viewData,
+            };
+            return controller;
+        }
+
+        private class DisposableController : Controller
+        {
+            public bool DisposeCalled { get; private set; }
+
+            protected override void Dispose(bool disposing)
+            {
+                DisposeCalled = true;
+            }
+        }
+
+        private class TestableController : Controller
+        {
+
+        }
+
+        private class DisposableObject : IDisposable
+        {
+            public void Dispose()
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs
new file mode 100644
index 0000000000..34e560c7c2
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs
@@ -0,0 +1,819 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Routing;
+using Moq;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    // Tests Controller for the unit testability with which users can simply instantiate controllers for unit tests
+    public class ControllerUnitTestabilityTests
+    {
+        [Theory]
+        [MemberData(nameof(TestabilityViewTestData))]
+        public void ControllerView_InvokedInUnitTests(object model, string viewName)
+        {
+            // Arrange
+            var controller = new TestabilityController();
+
+            // Act
+            var result = controller.View_Action(viewName, model);
+
+            // Assert
+            Assert.NotNull(result);
+
+            var viewResult = Assert.IsType<ViewResult>(result);
+            Assert.Equal(viewName, viewResult.ViewName);
+            Assert.NotNull(viewResult.ViewData);
+            Assert.Same(model, viewResult.Model);
+            Assert.Same(model, viewResult.ViewData.Model);
+            Assert.Same(controller.ViewData, viewResult.ViewData);
+            Assert.Same(controller.TempData, viewResult.TempData);
+        }
+
+        [Theory]
+        [MemberData(nameof(TestabilityViewTestData))]
+        public void ControllerPartialView_InvokedInUnitTests(object model, string viewName)
+        {
+            // Arrange
+            var controller = new TestabilityController();
+
+            // Act
+            var result = controller.PartialView_Action(viewName, model);
+
+            // Assert
+            Assert.NotNull(result);
+
+            var viewResult = Assert.IsType<PartialViewResult>(result);
+            Assert.Equal(viewName, viewResult.ViewName);
+            Assert.NotNull(viewResult.ViewData);
+            Assert.Same(model, viewResult.Model);
+            Assert.Same(model, viewResult.ViewData.Model);
+            Assert.Same(controller.ViewData, viewResult.ViewData);
+            Assert.Same(controller.TempData, viewResult.TempData);
+        }
+
+        [Fact]
+        public void ControllerContent_InvokedInUnitTests()
+        {
+            // Arrange
+            var content = "Content_1";
+            var contentType = "text/asp";
+            var encoding = Encoding.ASCII;
+            var controller = new TestabilityController();
+
+            // Act
+            var result = controller.Content_Action(content, contentType, encoding);
+
+            // Assert
+            Assert.NotNull(result);
+
+            var contentResult = Assert.IsType<ContentResult>(result);
+            Assert.Equal(content, contentResult.Content);
+            Assert.Equal("text/asp; charset=us-ascii", contentResult.ContentType.ToString());
+            Assert.Equal(encoding, MediaType.GetEncoding(contentResult.ContentType));
+        }
+
+        [Theory]
+        [InlineData("/Created_1", "<html>CreatedBody</html>")]
+        [InlineData("/Created_2", null)]
+        public void ControllerCreated_InvokedInUnitTests(string uri, string content)
+        {
+            // Arrange
+            var controller = new TestabilityController();
+
+            // Act
+            var result = controller.Created_Action(uri, content);
+
+            // Assert
+            Assert.NotNull(result);
+
+            var createdResult = Assert.IsType<CreatedResult>(result);
+            Assert.Equal(uri, createdResult.Location);
+            Assert.Equal(content, createdResult.Value);
+            Assert.Equal(StatusCodes.Status201Created, createdResult.StatusCode);
+        }
+
+        [Theory]
+        [InlineData("/Accepted_1", "<html>AcceptedBody</html>")]
+        [InlineData("/Accepted_2", null)]
+        public void ControllerAccepted_InvokedInUnitTests(string uri, string content)
+        {
+            // Arrange
+            var controller = new TestabilityController();
+
+            // Act
+            var result = controller.Accepted_Action(uri, content);
+
+            // Assert
+            Assert.NotNull(result);
+
+            var acceptedResult = Assert.IsType<AcceptedResult>(result);
+            Assert.Equal(uri, acceptedResult.Location);
+            Assert.Equal(content, acceptedResult.Value);
+            Assert.Equal(StatusCodes.Status202Accepted, acceptedResult.StatusCode);
+        }
+
+        [Fact]
+        public void ControllerFileContent_InvokedInUnitTests()
+        {
+            // Arrange
+            var content = "<html>CreatedBody</html>";
+            var contentType = "text/html";
+            var fileName = "Created.html";
+            var controller = new TestabilityController();
+
+            // Act
+            var result = controller.FileContent_Action(content, contentType, fileName);
+
+            // Assert
+            Assert.NotNull(result);
+
+            var fileContentResult = Assert.IsType<FileContentResult>(result);
+            Assert.Equal(contentType, fileContentResult.ContentType.ToString());
+            Assert.Equal(fileName ?? string.Empty, fileContentResult.FileDownloadName);
+
+            if (content == null)
+            {
+                Assert.Null(fileContentResult.FileContents);
+            }
+            else
+            {
+                Assert.Equal(content, Encoding.UTF8.GetString(fileContentResult.FileContents));
+            }
+        }
+
+        [Fact]
+        public void ControllerFileStream_InvokedInUnitTests()
+        {
+            // Arrange
+            var content = "<html>CreatedBody</html>";
+            var contentType = "text/html";
+            var fileName = "Created.html";
+            var mockHttpContext = new Mock<HttpContext>();
+            mockHttpContext.Setup(x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()));
+
+            var controller = new TestabilityController();
+            controller.ControllerContext.HttpContext = mockHttpContext.Object;
+
+            // Act
+            var result = controller.FileStream_Action(content, contentType, fileName);
+
+            // Assert
+            Assert.NotNull(result);
+
+            var fileStreamResult = Assert.IsType<FileStreamResult>(result);
+            Assert.Equal(contentType, fileStreamResult.ContentType.ToString());
+            Assert.Equal(fileName ?? string.Empty, fileStreamResult.FileDownloadName);
+
+            if (content == null)
+            {
+                Assert.Null(fileStreamResult.FileStream);
+            }
+            else
+            {
+                using (var stream = new StreamReader(fileStreamResult.FileStream, Encoding.UTF8))
+                {
+                    Assert.Equal(content, stream.ReadToEnd());
+                }
+            }
+        }
+
+        [Fact]
+        public void ControllerJson_InvokedInUnitTests()
+        {
+            // Arrange
+            var controller = new TestabilityController();
+            var model = new MyModel() { Property1 = "Property_1" };
+
+            // Act
+            var result = controller.Json_Action(model);
+
+            // Assert
+            Assert.NotNull(result);
+
+            var jsonResult = Assert.IsType<JsonResult>(result);
+            Assert.NotNull(jsonResult.Value);
+            Assert.Same(model, jsonResult.Value);
+            Assert.IsType<MyModel>(jsonResult.Value);
+
+            // Arrange
+            controller = new TestabilityController();
+
+            // Act
+            result = controller.Json_Action(null);
+
+            // Assert
+            Assert.NotNull(result);
+
+            jsonResult = Assert.IsType<JsonResult>(result);
+            Assert.Null(jsonResult.Value);
+        }
+
+        [Fact]
+        public void ControllerJsonWithSerializerSettings_InvokedInUnitTests()
+        {
+            // Arrange
+            var controller = new TestabilityController();
+            var model = new MyModel() { Property1 = "Property_1" };
+            var serializerSettings = new JsonSerializerSettings();
+
+            // Act
+            var result = controller.JsonWithSerializerSettings_Action(model, serializerSettings);
+
+            // Assert
+            Assert.NotNull(result);
+
+            var jsonResult = Assert.IsType<JsonResult>(result);
+            Assert.NotNull(jsonResult.Value);
+            Assert.Same(model, jsonResult.Value);
+            Assert.IsType<MyModel>(jsonResult.Value);
+        }
+
+        [Fact]
+        public void ControllerHttpNotFound_InvokedInUnitTests()
+        {
+            // Arrange
+            var controller = new TestabilityController();
+
+            // Act
+            var result = controller.HttpNotFound_Action();
+
+            // Assert
+            Assert.NotNull(result);
+
+            var httpNotFoundResult = Assert.IsType<NotFoundResult>(result);
+            Assert.Equal(StatusCodes.Status404NotFound, httpNotFoundResult.StatusCode);
+        }
+
+        [Fact]
+        public void ControllerHttpNotFoundObject_InvokedInUnitTests()
+        {
+            // Arrange
+            var controller = new TestabilityController();
+
+            // Act
+            var result = controller.HttpNotFoundObject_Action("Test Content");
+
+            // Assert
+            Assert.NotNull(result);
+
+            var httpNotFoundObjectResult = Assert.IsType<NotFoundObjectResult>(result);
+            Assert.Equal(StatusCodes.Status404NotFound, httpNotFoundObjectResult.StatusCode);
+            Assert.Equal("Test Content", httpNotFoundObjectResult.Value);
+        }
+
+        [Fact]
+        public void ControllerHttpBadRequest_InvokedInUnitTests()
+        {
+            // Arrange
+            var controller = new TestabilityController();
+
+            // Act
+            var result = controller.HttpBadRequest_Action();
+
+            // Assert
+            Assert.NotNull(result);
+
+            var httpBadRequest = Assert.IsType<BadRequestResult>(result);
+            Assert.Equal(StatusCodes.Status400BadRequest, httpBadRequest.StatusCode);
+        }
+
+        [Fact]
+        public void ControllerHttpBadRequestObject_InvokedInUnitTests()
+        {
+            // Arrange
+            var controller = new TestabilityController();
+            var error = new { Error = "Error Message" };
+
+            // Act
+            var result = controller.HttpBadRequestObject_Action(error);
+
+            // Assert
+            Assert.NotNull(result);
+
+            var httpBadRequest = Assert.IsType<BadRequestObjectResult>(result);
+            Assert.Equal(StatusCodes.Status400BadRequest, httpBadRequest.StatusCode);
+            Assert.Same(error, httpBadRequest.Value);
+
+            // Arrange
+            controller = new TestabilityController();
+
+            // Act
+            result = controller.HttpBadRequestObject_Action(null);
+
+            // Assert
+            Assert.NotNull(result);
+
+            httpBadRequest = Assert.IsType<BadRequestObjectResult>(result);
+            Assert.Equal(StatusCodes.Status400BadRequest, httpBadRequest.StatusCode);
+            Assert.Null(httpBadRequest.Value);
+        }
+
+        [Fact]
+        public void ControllerCreatedAtRoute_InvokedInUnitTests()
+        {
+            // Arrange
+            var controller = new TestabilityController();
+            var routeName = "RouteName_1";
+            var routeValues = new Dictionary<string, object>() { { "route", "sample" } };
+            var value = new { Value = "Value_1" };
+
+            // Act
+            var result = controller.CreatedAtRoute_Action(routeName, routeValues, value);
+
+            // Assert
+            Assert.NotNull(result);
+
+            var createdAtRouteResult = Assert.IsType<CreatedAtRouteResult>(result);
+            Assert.Equal(routeName, createdAtRouteResult.RouteName);
+            Assert.Single(createdAtRouteResult.RouteValues);
+            Assert.Equal("sample", createdAtRouteResult.RouteValues["route"]);
+            Assert.Same(value, createdAtRouteResult.Value);
+
+            // Arrange
+            controller = new TestabilityController();
+
+            // Act
+            result = controller.CreatedAtRoute_Action(null, null, null);
+
+            // Assert
+            Assert.NotNull(result);
+
+            createdAtRouteResult = Assert.IsType<CreatedAtRouteResult>(result);
+            Assert.Null(createdAtRouteResult.RouteName);
+            Assert.Null(createdAtRouteResult.RouteValues);
+            Assert.Null(createdAtRouteResult.Value);
+        }
+
+        [Fact]
+        public void ControllerAcceptedAtRoute_InvokedInUnitTests()
+        {
+            // Arrange
+            var controller = new TestabilityController();
+            var routeName = "RouteName_1";
+            var routeValues = new Dictionary<string, object>() { { "route", "sample" } };
+            var value = new { Value = "Value_1" };
+
+            // Act
+            var result = controller.AcceptedAtRoute_Action(routeName, routeValues, value);
+
+            // Assert
+            Assert.NotNull(result);
+
+            var acceptedAtRouteResult = Assert.IsType<AcceptedAtRouteResult>(result);
+            Assert.Equal(routeName, acceptedAtRouteResult.RouteName);
+            Assert.Single(acceptedAtRouteResult.RouteValues);
+            Assert.Equal("sample", acceptedAtRouteResult.RouteValues["route"]);
+            Assert.Same(value,acceptedAtRouteResult.Value);
+
+            // Arrange
+            controller = new TestabilityController();
+
+            // Act
+            result = controller.AcceptedAtRoute_Action(null, null, null);
+
+            // Assert
+            Assert.NotNull(result);
+
+            acceptedAtRouteResult = Assert.IsType<AcceptedAtRouteResult>(result);
+            Assert.Null(acceptedAtRouteResult.RouteName);
+            Assert.Null(acceptedAtRouteResult.RouteValues);
+            Assert.Null(acceptedAtRouteResult.Value);
+        }
+
+        [Fact]
+        public void ControllerCreatedAtAction_InvokedInUnitTests()
+        {
+            // Arrange
+            var controller = new TestabilityController();
+            var actionName = "ActionName_1";
+            var controllerName = "ControllerName_1";
+            var routeValues = new Dictionary<string, object>() { { "route", "sample" } };
+            var value = new { Value = "Value_1" };
+
+            // Act
+            var result = controller.CreatedAtAction_Action(actionName, controllerName, routeValues, value);
+
+            // Assert
+            Assert.NotNull(result);
+
+            var createdAtActionResult = Assert.IsType<CreatedAtActionResult>(result);
+            Assert.Equal(actionName, createdAtActionResult.ActionName);
+            Assert.Equal(controllerName, createdAtActionResult.ControllerName);
+            Assert.Single(createdAtActionResult.RouteValues);
+            Assert.Equal("sample", createdAtActionResult.RouteValues["route"]);
+            Assert.Same(value, createdAtActionResult.Value);
+
+            // Arrange
+            controller = new TestabilityController();
+
+            // Act
+            result = controller.CreatedAtAction_Action(null, null, null, null);
+
+            // Assert
+            Assert.NotNull(result);
+
+            createdAtActionResult = Assert.IsType<CreatedAtActionResult>(result);
+            Assert.Null(createdAtActionResult.ActionName);
+            Assert.Null(createdAtActionResult.ControllerName);
+            Assert.Null(createdAtActionResult.Value);
+            Assert.Null(createdAtActionResult.RouteValues);
+        }
+
+        [Fact]
+        public void ControllerAcceptedAtAction_InvokedInUnitTests()
+        {
+            // Arrange
+            var controller = new TestabilityController();
+            var actionName = "ActionName_1";
+            var controllerName = "ControllerName_1";
+            var routeValues = new Dictionary<string, object>() { { "route", "sample" } };
+            var value = new { Value = "Value_1" };
+
+            // Act
+            var result = controller.AcceptedAtAction_Action(actionName, controllerName, routeValues, value);
+
+            // Assert
+            Assert.NotNull(result);
+
+            var acceptedAtActionResult = Assert.IsType<AcceptedAtActionResult>(result);
+            Assert.Equal(actionName, acceptedAtActionResult.ActionName);
+            Assert.Equal(controllerName, acceptedAtActionResult.ControllerName);
+            Assert.Single(acceptedAtActionResult.RouteValues);
+            Assert.Equal("sample", acceptedAtActionResult.RouteValues["route"]);
+            Assert.Same(value, acceptedAtActionResult.Value);
+
+            // Arrange
+            controller = new TestabilityController();
+
+            // Act
+            result = controller.AcceptedAtAction_Action(null, null, null, null);
+
+            // Assert
+            Assert.NotNull(result);
+
+            acceptedAtActionResult = Assert.IsType<AcceptedAtActionResult>(result);
+            Assert.Null(acceptedAtActionResult.ActionName);
+            Assert.Null(acceptedAtActionResult.ControllerName);
+            Assert.Null(acceptedAtActionResult.Value);
+            Assert.Null(acceptedAtActionResult.RouteValues);
+        }
+
+        [Fact]
+        public void ControllerRedirectToRoute_InvokedInUnitTests()
+        {
+            // Arrange
+            var controller = new TestabilityController();
+            var routeName = "RouteName_1";
+            var routeValues = new Dictionary<string, object>() { { "route", "sample" } };
+
+            // Act
+            var result = controller.RedirectToRoute_Action(routeName, routeValues);
+
+            // Assert
+            Assert.NotNull(result);
+
+            var redirectToRouteResult = Assert.IsType<RedirectToRouteResult>(result);
+            Assert.Equal(routeName, redirectToRouteResult.RouteName);
+            Assert.Single(redirectToRouteResult.RouteValues);
+            Assert.Equal("sample", redirectToRouteResult.RouteValues["route"]);
+
+            // Arrange
+            controller = new TestabilityController();
+
+            // Act
+            result = controller.RedirectToRoute_Action(null, null);
+
+            // Assert
+            Assert.NotNull(result);
+
+            redirectToRouteResult = Assert.IsType<RedirectToRouteResult>(result);
+            Assert.Null(redirectToRouteResult.RouteName);
+            Assert.Null(redirectToRouteResult.RouteValues);
+        }
+
+        [Fact]
+        public void ControllerRedirectToAction_InvokedInUnitTests()
+        {
+            // Arrange
+            var controller = new TestabilityController();
+            var controllerName = "ControllerName_1";
+            var actionName = "ActionName_1";
+            var routeValues = new Dictionary<string, object>() { { "route", "sample" } };
+
+            // Act
+            var result = controller.RedirectToAction_Action(actionName, controllerName, routeValues);
+
+            // Assert
+            Assert.NotNull(result);
+
+            var redirectToActionResult = Assert.IsType<RedirectToActionResult>(result);
+            Assert.Equal(actionName, redirectToActionResult.ActionName);
+            Assert.Equal(controllerName, redirectToActionResult.ControllerName);
+            Assert.Single(redirectToActionResult.RouteValues);
+            Assert.Equal("sample", redirectToActionResult.RouteValues["route"]);
+
+            // Arrange
+            controller = new TestabilityController();
+
+            // Act
+            result = controller.RedirectToAction_Action(null, null, null);
+
+            // Assert
+            Assert.NotNull(result);
+
+            redirectToActionResult = Assert.IsType<RedirectToActionResult>(result);
+            Assert.Null(redirectToActionResult.ControllerName);
+            Assert.Null(redirectToActionResult.ActionName);
+            Assert.Null(redirectToActionResult.RouteValues);
+        }
+
+        [Fact]
+        public void ControllerRedirect_InvokedInUnitTests()
+        {
+            // Arrange
+            var controller = new TestabilityController();
+            var url = "http://contoso.com";
+
+            // Act
+            var result = controller.Redirect_Action(url);
+
+            // Assert
+            Assert.NotNull(result);
+
+            var redirectResult = Assert.IsType<RedirectResult>(result);
+            Assert.Equal(url, redirectResult.Url);
+
+            // Arrange
+            controller = new TestabilityController();
+
+            // Act && Assert
+            Assert.Throws<ArgumentException>(() => controller.Redirect_Action(null));
+        }
+
+        [Fact]
+        public void ControllerActionContext_ReturnsNotNull()
+        {
+            // Arrange && Act
+            var controller = new TestabilityController();
+
+            // Assert
+            Assert.NotNull(controller.ControllerContext);
+            Assert.NotNull(controller.ControllerContext.ModelState);
+            Assert.Null(controller.ControllerContext.ActionDescriptor);
+            Assert.Null(controller.ControllerContext.HttpContext);
+            Assert.Null(controller.ControllerContext.RouteData);
+        }
+
+        [Fact]
+        public void ContextDefaultConstructor_CanBeUsedForControllerContext()
+        {
+            // Arrange
+            var controllerContext = new ControllerContext();
+            var controller = new TestabilityController();
+
+            // Act
+            controller.ControllerContext = controllerContext;
+
+            // Assert
+            Assert.Equal(controllerContext.HttpContext, controller.HttpContext);
+            Assert.Equal(controllerContext.RouteData, controller.RouteData);
+            Assert.Equal(controllerContext.ModelState, controller.ModelState);
+        }
+
+        [Fact]
+        public void ControllerContextSetter_CanBeUsedWithControllerActionContext()
+        {
+            // Arrange
+            var actionDescriptor = new ControllerActionDescriptor();
+            var httpContext = new DefaultHttpContext();
+            var routeData = new RouteData();
+
+            var controllerContext = new ControllerContext()
+            {
+                ActionDescriptor = actionDescriptor,
+                HttpContext = httpContext,
+                RouteData = routeData,
+            };
+
+            var controller = new TestabilityController();
+
+            // Act
+            controller.ControllerContext = controllerContext;
+
+            // Assert
+            Assert.Same(httpContext, controller.HttpContext);
+            Assert.Same(routeData, controller.RouteData);
+            Assert.Equal(controllerContext.ModelState, controller.ModelState);
+            Assert.Same(actionDescriptor, controllerContext.ActionDescriptor);
+        }
+
+        [Fact]
+        public void ContextModelState_ShouldBeSameAsViewDataAndControllerModelState()
+        {
+            // Arrange
+            var controller1 = new TestabilityController();
+            var controller2 = new TestabilityController();
+
+            // Act
+            controller2.ControllerContext = new ControllerContext();
+
+            // Assert
+            Assert.Equal(controller1.ModelState, controller1.ControllerContext.ModelState);
+            Assert.Equal(controller1.ModelState, controller1.ViewData.ModelState);
+
+            Assert.Equal(controller1.ControllerContext.ModelState, controller2.ModelState);
+            Assert.Equal(controller1.ControllerContext.ModelState, controller2.ControllerContext.ModelState);
+            Assert.Equal(controller1.ControllerContext.ModelState, controller2.ViewData.ModelState);
+        }
+
+        [Fact]
+        public void ViewComponent_WithName()
+        {
+            // Arrange
+            var controller = new TestabilityController();
+
+            // Act
+            var result = controller.ViewComponent("TagCloud");
+
+            // Assert
+            Assert.NotNull(result);
+
+            Assert.Equal("TagCloud", result.ViewComponentName);
+        }
+
+        [Fact]
+        public void ViewComponent_WithType()
+        {
+            // Arrange
+            var controller = new TestabilityController();
+
+            // Act
+            var result = controller.ViewComponent(typeof(TagCloudViewComponent));
+
+            // Assert
+            Assert.NotNull(result);
+
+            Assert.Equal(typeof(TagCloudViewComponent), result.ViewComponentType);
+        }
+
+        [Fact]
+        public void ViewComponent_WithArguments()
+        {
+            // Arrange
+            var controller = new TestabilityController();
+
+            // Act
+            var result = controller.ViewComponent(typeof(TagCloudViewComponent), new { Arg1 = "Hi", Arg2 = "There" });
+
+            // Assert
+            Assert.NotNull(result);
+
+            Assert.Equal(typeof(TagCloudViewComponent), result.ViewComponentType);
+            Assert.Equal(new { Arg1 = "Hi", Arg2 = "There" }, result.Arguments);
+        }
+
+        public static IEnumerable<object[]> TestabilityViewTestData
+        {
+            get
+            {
+                yield return new object[]
+                {
+                    null,
+                    null
+                };
+
+                yield return new object[]
+                {
+                    new MyModel { Property1 = "Property_1", Property2 = "Property_2" },
+                    "ViewName_1"
+                };
+            }
+        }
+
+        private class TestabilityController : Controller
+        {
+            public IActionResult View_Action(string viewName, object data)
+            {
+                return View(viewName, data);
+            }
+
+            public IActionResult PartialView_Action(string viewName, object data)
+            {
+                return PartialView(viewName, data);
+            }
+
+            public IActionResult Content_Action(string content, string contentType, Encoding encoding)
+            {
+                return Content(content, contentType, encoding);
+            }
+
+            public IActionResult Created_Action(string uri, object data)
+            {
+                return Created(uri, data);
+            }
+
+            public IActionResult Accepted_Action(string uri, object data)
+            {
+                return Accepted(uri, data);
+            }
+
+            public IActionResult FileContent_Action(string content, string contentType, string fileName)
+            {
+                var contentArray = Encoding.UTF8.GetBytes(content);
+                return File(contentArray, contentType, fileName);
+            }
+
+            public IActionResult FileStream_Action(string content, string contentType, string fileName)
+            {
+                var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(content));
+                return File(memoryStream, contentType, fileName);
+            }
+
+            public IActionResult Json_Action(object data)
+            {
+                return Json(data);
+            }
+
+            public IActionResult JsonWithSerializerSettings_Action(object data, JsonSerializerSettings serializerSettings)
+            {
+                return Json(data, serializerSettings);
+            }
+
+            public IActionResult Redirect_Action(string url)
+            {
+                return Redirect(url);
+            }
+
+            public IActionResult RedirectToAction_Action(string actionName, string controllerName, object routeValues)
+            {
+                return RedirectToAction(actionName, controllerName, routeValues);
+            }
+
+            public IActionResult RedirectToRoute_Action(string routeName, object routeValues)
+            {
+                return RedirectToRoute(routeName, routeValues);
+            }
+
+            public IActionResult CreatedAtAction_Action(string actionName, string controllerName, object routeValues, object value)
+            {
+                return CreatedAtAction(actionName, controllerName, routeValues, value);
+            }
+
+            public IActionResult CreatedAtRoute_Action(string routeName, object routeValues, object value)
+            {
+                return CreatedAtRoute(routeName, routeValues, value);
+            }
+
+            public IActionResult AcceptedAtAction_Action(string actionName, string controllerName, object routeValues, object value)
+            {
+                return AcceptedAtAction(actionName, controllerName, routeValues, value);
+            }
+
+            public IActionResult AcceptedAtRoute_Action(string routeName, object routeValues, object value)
+            {
+                return AcceptedAtRoute(routeName, routeValues, value);
+            }
+
+            public IActionResult HttpBadRequest_Action()
+            {
+                return BadRequest();
+            }
+
+            public IActionResult HttpBadRequestObject_Action(object error)
+            {
+                return BadRequest(error);
+            }
+
+            public IActionResult HttpNotFound_Action()
+            {
+                return NotFound();
+            }
+
+            public IActionResult HttpNotFoundObject_Action(object value)
+            {
+                return NotFound(value);
+            }
+        }
+
+        private class MyModel
+        {
+            public string Property1 { get; set; }
+            public string Property2 { get; set; }
+        }
+
+        private class TagCloudViewComponent
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DependencyInjection/MvcViewFeaturesMvcBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DependencyInjection/MvcViewFeaturesMvcBuilderExtensionsTest.cs
new file mode 100644
index 0000000000..e8c04b1370
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DependencyInjection/MvcViewFeaturesMvcBuilderExtensionsTest.cs
@@ -0,0 +1,191 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public class MvcViewFeaturesMvcBuilderExtensionsTest
+    {
+        [Fact]
+        public void AddViewComponentsAsServices_ReplacesViewComponentActivator()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services
+                .AddMvc()
+                .ConfigureApplicationPartManager(manager =>
+                {
+                    manager.ApplicationParts.Add(new TestApplicationPart());
+                    manager.FeatureProviders.Add(new ViewComponentFeatureProvider());
+                });
+
+            // Act
+            builder.AddViewComponentsAsServices();
+
+            // Assert
+            var descriptor = Assert.Single(services.ToList(), d => d.ServiceType == typeof(IViewComponentActivator));
+            Assert.Equal(typeof(ServiceBasedViewComponentActivator), descriptor.ImplementationType);
+        }
+
+        [Fact]
+        public void AddCookieTempDataProvider_RegistersExpectedTempDataProvider()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services.AddMvc();
+
+            // Act
+            builder.AddCookieTempDataProvider();
+
+            // Assert
+            var descriptor = Assert.Single(services, item => item.ServiceType == typeof(ITempDataProvider));
+            Assert.Equal(typeof(CookieTempDataProvider), descriptor.ImplementationType);
+        }
+
+        [Fact]
+        public void AddCookieTempDataProvider_DoesNotRegisterOptionsConfiguration()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services.AddMvc();
+
+            // Act
+            builder.AddCookieTempDataProvider();
+
+            // Assert
+            Assert.DoesNotContain(
+                services,
+                item => item.ServiceType == typeof(IConfigureOptions<CookieTempDataProviderOptions>));
+        }
+
+        [Fact]
+        public void AddCookieTempDataProviderWithSetupAction_RegistersExpectedTempDataProvider()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services.AddMvc();
+
+            // Act
+            builder.AddCookieTempDataProvider(options => { });
+
+            // Assert
+            var descriptor = Assert.Single(services, item => item.ServiceType == typeof(ITempDataProvider));
+            Assert.Equal(typeof(CookieTempDataProvider), descriptor.ImplementationType);
+        }
+
+        [Fact]
+        public void AddCookieTempDataProviderWithSetupAction_RegistersOptionsConfiguration()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services.AddMvc();
+
+            // Act
+            builder.AddCookieTempDataProvider(options => { });
+
+            // Assert
+            Assert.Single(
+                services,
+                item => item.ServiceType == typeof(IConfigureOptions<CookieTempDataProviderOptions>));
+        }
+
+        [Fact]
+        public void AddCookieTempDataProvider_RegistersExpectedTempDataProvider_IfCalledTwice()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services.AddMvc();
+
+            // Act
+            builder.AddCookieTempDataProvider();
+            builder.AddCookieTempDataProvider();
+
+            // Assert
+            var descriptor = Assert.Single(services, item => item.ServiceType == typeof(ITempDataProvider));
+            Assert.Equal(typeof(CookieTempDataProvider), descriptor.ImplementationType);
+        }
+
+        [Fact]
+        public void AddCookieTempDataProviderWithSetupAction_RegistersExpectedTempDataProvider_IfCalledTwice()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services.AddMvc();
+
+            // Act
+            builder.AddCookieTempDataProvider(options => { });
+            builder.AddCookieTempDataProvider(options => { });
+
+            // Assert
+            var descriptor = Assert.Single(services, item => item.ServiceType == typeof(ITempDataProvider));
+            Assert.Equal(typeof(CookieTempDataProvider), descriptor.ImplementationType);
+        }
+
+        [Fact]
+        public void AddViewComponentsAsServices_RegistersDiscoveredViewComponents()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+
+            var manager = new ApplicationPartManager();
+            manager.ApplicationParts.Add(new TestApplicationPart(
+                typeof(ConventionsViewComponent),
+                typeof(AttributeViewComponent)));
+
+            manager.FeatureProviders.Add(new TestProvider());
+
+            var builder = new MvcBuilder(services, manager);
+
+            // Act
+            builder.AddViewComponentsAsServices();
+
+            // Assert
+            var collection = services.ToList();
+            Assert.Equal(3, collection.Count);
+
+            Assert.Equal(typeof(ConventionsViewComponent), collection[0].ServiceType);
+            Assert.Equal(typeof(ConventionsViewComponent), collection[0].ImplementationType);
+            Assert.Equal(ServiceLifetime.Transient, collection[0].Lifetime);
+
+            Assert.Equal(typeof(AttributeViewComponent), collection[1].ServiceType);
+            Assert.Equal(typeof(AttributeViewComponent), collection[1].ImplementationType);
+            Assert.Equal(ServiceLifetime.Transient, collection[1].Lifetime);
+
+            Assert.Equal(typeof(IViewComponentActivator), collection[2].ServiceType);
+            Assert.Equal(typeof(ServiceBasedViewComponentActivator), collection[2].ImplementationType);
+            Assert.Equal(ServiceLifetime.Singleton, collection[2].Lifetime);
+        }
+
+        public class ConventionsViewComponent
+        {
+            public string Invoke() => "Hello world";
+        }
+
+        [ViewComponent(Name = "AttributesAreGreat")]
+        public class AttributeViewComponent
+        {
+            public Task<string> InvokeAsync() => Task.FromResult("Hello world");
+        }
+
+        private class TestProvider : IApplicationFeatureProvider<ViewComponentFeature>
+        {
+            public void PopulateFeature(IEnumerable<ApplicationPart> parts, ViewComponentFeature feature)
+            {
+                foreach (var type in parts.OfType<IApplicationPartTypeProvider>().SelectMany(p => p.Types))
+                {
+                    feature.ViewComponents.Add(type);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensionsTest.cs
new file mode 100644
index 0000000000..3ca3128324
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensionsTest.cs
@@ -0,0 +1,186 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public class MvcViewFeaturesMvcCoreBuilderExtensionsTest
+    {
+        [Fact]
+        public void AddViews_RegistersExpectedTempDataProvider()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services.AddMvcCore();
+
+            // Act
+            builder.AddViews();
+
+            // Assert
+            var descriptor = Assert.Single(services, item => item.ServiceType == typeof(ITempDataProvider));
+            Assert.Equal(typeof(CookieTempDataProvider), descriptor.ImplementationType);
+        }
+
+        [Fact]
+        public void AddCookieTempDataProvider_RegistersExpectedTempDataProvider()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services.AddMvcCore();
+
+            // Act
+            builder.AddCookieTempDataProvider();
+
+            // Assert
+            var descriptor = Assert.Single(services, item => item.ServiceType == typeof(ITempDataProvider));
+            Assert.Equal(typeof(CookieTempDataProvider), descriptor.ImplementationType);
+        }
+
+        [Fact]
+        public void AddCookieTempDataProvider_DoesNotRegisterOptionsConfiguration()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services.AddMvcCore();
+
+            // Act
+            builder.AddCookieTempDataProvider();
+
+            // Assert
+            Assert.DoesNotContain(
+                services,
+                item => item.ServiceType == typeof(IConfigureOptions<CookieTempDataProviderOptions>));
+        }
+
+        [Fact]
+        public void AddCookieTempDataProviderWithSetupAction_RegistersExpectedTempDataProvider()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services.AddMvcCore();
+
+            // Act
+            builder.AddCookieTempDataProvider(options => { });
+
+            // Assert
+            var descriptor = Assert.Single(services, item => item.ServiceType == typeof(ITempDataProvider));
+            Assert.Equal(typeof(CookieTempDataProvider), descriptor.ImplementationType);
+        }
+
+        [Fact]
+        public void AddCookieTempDataProviderWithSetupAction_RegistersOptionsConfiguration()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services.AddMvcCore();
+
+            // Act
+            builder.AddCookieTempDataProvider(options => { });
+
+            // Assert
+            Assert.Single(
+                services,
+                item => item.ServiceType == typeof(IConfigureOptions<CookieTempDataProviderOptions>));
+        }
+
+        [Fact]
+        public void AddCookieTempDataProvider_RegistersExpectedTempDataProvider_IfCalledBeforeAddViews()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services.AddMvcCore();
+
+            // Act
+            builder.AddCookieTempDataProvider();
+            builder.AddViews();
+
+            // Assert
+            var descriptor = Assert.Single(services, item => item.ServiceType == typeof(ITempDataProvider));
+            Assert.Equal(typeof(CookieTempDataProvider), descriptor.ImplementationType);
+        }
+
+        [Fact]
+        public void AddCookieTempDataProviderWithSetupAction_RegistersExpectedTempDataProvider_IfCalledBeforeAddViews()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services.AddMvcCore();
+
+            // Act
+            builder.AddCookieTempDataProvider(options => { });
+            builder.AddViews();
+
+            // Assert
+            var descriptor = Assert.Single(services, item => item.ServiceType == typeof(ITempDataProvider));
+            Assert.Equal(typeof(CookieTempDataProvider), descriptor.ImplementationType);
+        }
+
+        [Fact]
+        public void AddCookieTempDataProvider_RegistersExpectedTempDataProvider_IfCalledAfterAddViews()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services.AddMvcCore();
+
+            // Act
+            builder.AddViews();
+            builder.AddCookieTempDataProvider();
+
+            // Assert
+            var descriptor = Assert.Single(services, item => item.ServiceType == typeof(ITempDataProvider));
+            Assert.Equal(typeof(CookieTempDataProvider), descriptor.ImplementationType);
+        }
+
+        [Fact]
+        public void AddCookieTempDataProviderWithSetupAction_RegistersExpectedTempDataProvider_IfCalledAfterAddViews()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services.AddMvcCore();
+
+            // Act
+            builder.AddViews();
+            builder.AddCookieTempDataProvider(options => { });
+
+            // Assert
+            var descriptor = Assert.Single(services, item => item.ServiceType == typeof(ITempDataProvider));
+            Assert.Equal(typeof(CookieTempDataProvider), descriptor.ImplementationType);
+        }
+
+        [Fact]
+        public void AddCookieTempDataProvider_RegistersExpectedTempDataProvider_IfCalledTwice()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services.AddMvcCore();
+
+            // Act
+            builder.AddCookieTempDataProvider();
+            builder.AddCookieTempDataProvider();
+
+            // Assert
+            var descriptor = Assert.Single(services, item => item.ServiceType == typeof(ITempDataProvider));
+            Assert.Equal(typeof(CookieTempDataProvider), descriptor.ImplementationType);
+        }
+
+        [Fact]
+        public void AddCookieTempDataProviderWithSetupAction_RegistersExpectedTempDataProvider_IfCalledTwice()
+        {
+            // Arrange
+            var services = new ServiceCollection();
+            var builder = services.AddMvcCore();
+
+            // Act
+            builder.AddCookieTempDataProvider(options => { });
+            builder.AddCookieTempDataProvider(options => { });
+
+            // Assert
+            var descriptor = Assert.Single(services, item => item.ServiceType == typeof(ITempDataProvider));
+            Assert.Equal(typeof(CookieTempDataProvider), descriptor.ImplementationType);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs
new file mode 100644
index 0000000000..88129eeb7d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs
@@ -0,0 +1,101 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Antiforgery;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class AutoValidateAntiforgeryTokenAuthorizationFilterTest
+    {
+        [Theory]
+        [InlineData("PUT")]
+        [InlineData("POsT")]
+        [InlineData("DeLETE")]
+        public async Task Filter_ValidatesAntiforgery_ForUnsafeMethod(string httpMethod)
+        {
+            // Arrange
+            var antiforgery = new Mock<IAntiforgery>(MockBehavior.Strict);
+            antiforgery
+                .Setup(a => a.ValidateRequestAsync(It.IsAny<HttpContext>()))
+                .Returns(Task.FromResult(0))
+                .Verifiable();
+
+            var filter = new AutoValidateAntiforgeryTokenAuthorizationFilter(antiforgery.Object, NullLoggerFactory.Instance);
+
+            var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+            actionContext.HttpContext.Request.Method = httpMethod;
+
+            var context = new AuthorizationFilterContext(actionContext, new[] { filter });
+
+            // Act
+            await filter.OnAuthorizationAsync(context);
+
+            // Assert
+            antiforgery.Verify();
+        }
+
+        [Theory]
+        [InlineData("GET")]
+        [InlineData("HEAD")]
+        [InlineData("TracE")]
+        [InlineData("OPTIONs")]
+        public async Task Filter_SkipsAntiforgeryVerification_ForSafeMethod(string httpMethod)
+        {
+            // Arrange
+            var antiforgery = new Mock<IAntiforgery>(MockBehavior.Strict);
+            antiforgery
+                .Setup(a => a.ValidateRequestAsync(It.IsAny<HttpContext>()))
+                .Returns(Task.FromResult(0))
+                .Verifiable();
+
+            var filter = new AutoValidateAntiforgeryTokenAuthorizationFilter(antiforgery.Object, NullLoggerFactory.Instance);
+
+            var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+            actionContext.HttpContext.Request.Method = httpMethod;
+
+            var context = new AuthorizationFilterContext(actionContext, new[] { filter });
+
+            // Act
+            await filter.OnAuthorizationAsync(context);
+
+            // Assert
+            antiforgery.Verify(a => a.ValidateRequestAsync(It.IsAny<HttpContext>()), Times.Never());
+        }
+
+        [Fact]
+        public async Task Filter_SkipsAntiforgeryVerification_WhenOverridden()
+        {
+            // Arrange
+            var antiforgery = new Mock<IAntiforgery>(MockBehavior.Strict);
+            antiforgery
+                .Setup(a => a.ValidateRequestAsync(It.IsAny<HttpContext>()))
+                .Returns(Task.FromResult(0))
+                .Verifiable();
+
+            var filter = new AutoValidateAntiforgeryTokenAuthorizationFilter(antiforgery.Object, NullLoggerFactory.Instance);
+
+            var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+            actionContext.HttpContext.Request.Method = "POST";
+
+            var context = new AuthorizationFilterContext(actionContext, new IFilterMetadata[]
+            {
+                filter,
+                new IgnoreAntiforgeryTokenAttribute(),
+            });
+
+            // Act
+            await filter.OnAuthorizationAsync(context);
+
+            // Assert
+            antiforgery.Verify(a => a.ValidateRequestAsync(It.IsAny<HttpContext>()), Times.Never());
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerSaveTempDataPropertyFilterFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerSaveTempDataPropertyFilterFactoryTest.cs
new file mode 100644
index 0000000000..5383d49d1c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerSaveTempDataPropertyFilterFactoryTest.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class ControllerSaveTempDataPropertyFilterFactoryTest
+    {
+        [Fact]
+        public void CreateInstance_CreatesFilter()
+        {
+            // Arrange
+            var property = typeof(StringController).GetProperty(nameof(StringController.StringProp));
+            var lifecycleProperties = new[] { new LifecycleProperty(property, "key") };
+            var factory = new ControllerSaveTempDataPropertyFilterFactory(lifecycleProperties);
+
+            // Act
+            var filter = factory.CreateInstance(CreateServiceProvider());
+
+            // Assert
+            var tempDataFilter = Assert.IsType<ControllerSaveTempDataPropertyFilter>(filter);
+            Assert.Same(lifecycleProperties, tempDataFilter.Properties);
+        }
+
+        private ServiceProvider CreateServiceProvider()
+        {
+            var serviceCollection = new ServiceCollection();
+
+            serviceCollection.AddSingleton(Mock.Of<ITempDataProvider>());
+            serviceCollection.AddSingleton<ITempDataDictionaryFactory, TempDataDictionaryFactory>();
+            serviceCollection.AddTransient<ControllerSaveTempDataPropertyFilter>();
+
+            return serviceCollection.BuildServiceProvider();
+        }
+
+        private class StringController
+        {
+            [TempData]
+            public string StringProp { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerSaveTempDataPropertyFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerSaveTempDataPropertyFilterTest.cs
new file mode 100644
index 0000000000..7826bbb2e3
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerSaveTempDataPropertyFilterTest.cs
@@ -0,0 +1,223 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class ControllerSaveTempDataPropertyFilterTest
+    {
+        [Fact]
+        public void PopulatesTempDataWithValuesFromControllerProperty()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            var tempData = new TempDataDictionary(httpContext, Mock.Of<ITempDataProvider>())
+            {
+                ["TempDataProperty-Test"] = "FirstValue"
+            };
+
+            var filter = CreateControllerSaveTempDataPropertyFilter(httpContext, tempData);
+
+            var controller = new TestController();
+
+            var controllerType = controller.GetType();
+            var property1 = controllerType.GetProperty(nameof(TestController.Test));
+            var property2 = controllerType.GetProperty(nameof(TestController.Test2));
+
+            filter.Properties = new[]
+            {
+                new LifecycleProperty(property1, "TempDataProperty-Test"),
+                new LifecycleProperty(property1, "TempDataProperty-Test2"),
+            };
+
+            var context = new ActionExecutingContext(
+                new ActionContext
+                {
+                    HttpContext = httpContext,
+                    RouteData = new RouteData(),
+                    ActionDescriptor = new ActionDescriptor(),
+                },
+                new List<IFilterMetadata>(),
+                new Dictionary<string, object>(),
+                controller);
+
+            // Act
+            filter.OnActionExecuting(context);
+            controller.Test = "SecondValue";
+            filter.OnTempDataSaving(tempData);
+
+            // Assert
+            Assert.Equal("SecondValue", controller.Test);
+            Assert.Equal("SecondValue", tempData["TempDataProperty-Test"]);
+            Assert.Equal(0, controller.Test2);
+        }
+
+        [Fact]
+        public void ReadsTempDataFromTempDataDictionary()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            var tempData = new TempDataDictionary(httpContext, Mock.Of<ITempDataProvider>())
+            {
+                ["TempDataProperty-Test"] = "FirstValue"
+            };
+
+            var filter = CreateControllerSaveTempDataPropertyFilter(httpContext, tempData: tempData);
+            var controller = new TestController();
+
+            var controllerType = controller.GetType();
+
+            var property1 = controllerType.GetProperty(nameof(TestController.Test));
+            var property2 = controllerType.GetProperty(nameof(TestController.Test2));
+
+            filter.Properties = new[]
+            {
+                new LifecycleProperty(property1, "TempDataProperty-Test"),
+                new LifecycleProperty(property2, "TempDataProperty-Test2"),
+            };
+
+            var context = new ActionExecutingContext(
+                new ActionContext
+                {
+                    HttpContext = httpContext,
+                    RouteData = new RouteData(),
+                    ActionDescriptor = new ActionDescriptor(),
+                },
+                new List<IFilterMetadata>(),
+                new Dictionary<string, object>(),
+                controller);
+
+            // Act
+            filter.OnActionExecuting(context);
+
+            // Assert
+            Assert.Equal("FirstValue", controller.Test);
+            Assert.Equal(0, controller.Test2);
+        }
+
+        [Fact]
+        public void ReadsTempDataFromTempDataDictionary_WithoutKeyPrefix()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            var tempData = new TempDataDictionary(httpContext, Mock.Of<ITempDataProvider>())
+            {
+                ["TempDataProperty-Test"] = "ValueWithPrefix",
+                ["Test"] = "Value"
+            };
+
+            var filter = CreateControllerSaveTempDataPropertyFilter(httpContext, tempData: tempData);
+            var controller = new TestController();
+
+            var controllerType = controller.GetType();
+            var property1 = controllerType.GetProperty(nameof(TestController.Test));
+            var property2 = controllerType.GetProperty(nameof(TestController.Test2));
+
+            filter.Properties = new[]
+            {
+                new LifecycleProperty(property1, "Test"),
+                new LifecycleProperty(property2, "Test2"),
+            };
+
+            var context = new ActionExecutingContext(
+                new ActionContext
+                {
+                    HttpContext = httpContext,
+                    RouteData = new RouteData(),
+                    ActionDescriptor = new ActionDescriptor(),
+                },
+                new List<IFilterMetadata>(),
+                new Dictionary<string, object>(),
+                controller);
+
+            // Act
+            filter.OnActionExecuting(context);
+
+            // Assert
+            Assert.Equal("Value", controller.Test);
+            Assert.Equal(0, controller.Test2);
+        }
+
+        [Fact]
+        public void WritesTempDataFromTempDataDictionary_WithoutKeyPrefix()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            var tempData = new TempDataDictionary(httpContext, Mock.Of<ITempDataProvider>());
+
+            var filter = CreateControllerSaveTempDataPropertyFilter(httpContext, tempData: tempData);
+            var controller = new TestController();
+
+            var controllerType = controller.GetType();
+            var property1 = controllerType.GetProperty(nameof(TestController.Test));
+            var property2 = controllerType.GetProperty(nameof(TestController.Test2));
+
+            filter.Properties = new[]
+            {
+                new LifecycleProperty(property1, "Test"),
+                new LifecycleProperty(property2, "Test2"),
+            };
+
+            var context = new ActionExecutingContext(
+                new ActionContext
+                {
+                    HttpContext = httpContext,
+                    RouteData = new RouteData(),
+                    ActionDescriptor = new ActionDescriptor(),
+                },
+                new List<IFilterMetadata>(),
+                new Dictionary<string, object>(),
+                controller);
+
+            // Act
+            filter.OnActionExecuting(context);
+            controller.Test = "New-Value";
+            controller.Test2 = 42;
+
+            filter.OnTempDataSaving(tempData);
+
+            // Assert
+            Assert.Collection(
+                tempData.OrderBy(i => i.Key),
+                item =>
+                {
+                    Assert.Equal(nameof(TestController.Test), item.Key);
+                    Assert.Equal("New-Value", item.Value);
+                },
+                item =>
+                {
+                    Assert.Equal(nameof(TestController.Test2), item.Key);
+                    Assert.Equal(42, item.Value);
+                });
+        }
+
+        private ControllerSaveTempDataPropertyFilter CreateControllerSaveTempDataPropertyFilter(
+            HttpContext httpContext,
+            TempDataDictionary tempData)
+        {
+            var factory = new Mock<ITempDataDictionaryFactory>();
+            factory
+                .Setup(f => f.GetTempData(httpContext))
+                .Returns(tempData);
+
+            return new ControllerSaveTempDataPropertyFilter(factory.Object);
+        }
+
+        public class TestController : Controller
+        {
+            [TempData]
+            public string Test { get; set; }
+
+            [TempData]
+            public int Test2 { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerViewDataAttributeFilterFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerViewDataAttributeFilterFactoryTest.cs
new file mode 100644
index 0000000000..75638684ee
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerViewDataAttributeFilterFactoryTest.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ControllerViewDataAttributeFilterFactoryTest
+    {
+        [Fact]
+        public void CreateInstance_CreatesFilter()
+        {
+            // Arrange
+            var properties = new LifecycleProperty[]
+            {
+                new LifecycleProperty(),
+                new LifecycleProperty(),
+            };
+            var filterFactory = new ControllerViewDataAttributeFilterFactory(properties);
+
+            // Act
+            var result = filterFactory.CreateInstance(Mock.Of<IServiceProvider>());
+
+            // Assert
+            var filter = Assert.IsType<ControllerViewDataAttributeFilter>(result);
+            Assert.Same(properties, filter.Properties);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerViewDataAttributeFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerViewDataAttributeFilterTest.cs
new file mode 100644
index 0000000000..c90f220557
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerViewDataAttributeFilterTest.cs
@@ -0,0 +1,101 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Routing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ControllerViewDataAttributeFilterTest
+    {
+        [Fact]
+        public void OnActionExecuting_AddsFeature()
+        {
+            // Arrange
+            var filter = new ControllerViewDataAttributeFilter(Array.Empty<LifecycleProperty>());
+            var controller = new object();
+            var httpContext = new DefaultHttpContext();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var context = new ActionExecutingContext(actionContext, new IFilterMetadata[0], new Dictionary<string, object>(), controller);
+
+            // Act
+            filter.OnActionExecuting(context);
+
+            // Assert
+            var feature = Assert.Single(httpContext.Features, f => f.Key == typeof(IViewDataValuesProviderFeature));
+            Assert.Same(filter, feature.Value);
+        }
+
+        [Fact]
+        public void OnActionExecuting_SetsSubject()
+        {
+            // Arrange
+            var filter = new ControllerViewDataAttributeFilter(Array.Empty<LifecycleProperty>());
+            var controller = new object();
+            var httpContext = new DefaultHttpContext();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var context = new ActionExecutingContext(actionContext, new IFilterMetadata[0], new Dictionary<string, object>(), controller);
+
+            // Act
+            filter.OnActionExecuting(context);
+
+            // Assert
+            Assert.Same(controller, filter.Subject);
+        }
+
+        [Fact]
+        public void ProvideValues_AddsNonNullPropertyValuesToViewData()
+        {
+            // Arrange
+            var type = typeof(TestController);
+            var properties = new[]
+            {
+                new LifecycleProperty(type.GetProperty(nameof(TestController.Prop1)), "Prop1"),
+                new LifecycleProperty(type.GetProperty(nameof(TestController.Prop2)), "Prop2"),
+                new LifecycleProperty(type.GetProperty(nameof(TestController.Prop3)), "Prop3"),
+            };
+
+            var controller = new TestController();
+            var filter = new ControllerViewDataAttributeFilter(properties)
+            {
+                Subject = controller,
+            };
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider(), new ModelStateDictionary());
+
+            // Act
+            controller.Prop1 = "New-Value";
+            filter.ProvideViewDataValues(viewData);
+
+            // Assert
+            Assert.Collection(
+                viewData.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("Prop1", kvp.Key);
+                    Assert.Equal("New-Value", kvp.Value);
+                },
+                kvp =>
+                {
+                    Assert.Equal("Prop2", kvp.Key);
+                    Assert.Equal("Test", kvp.Value);
+                });
+        }
+
+        public class TestController
+        {
+            public string Prop1 { get; set; }
+
+            public string Prop2 => "Test";
+
+            public string Prop3 { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/DefaultDisplayTemplatesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/DefaultDisplayTemplatesTest.cs
new file mode 100644
index 0000000000..bf9c3446ca
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/DefaultDisplayTemplatesTest.cs
@@ -0,0 +1,412 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class DefaultDisplayTemplatesTest
+    {
+        // Input value; HTML encode; expected value.
+        public static TheoryData<string, bool, string> HtmlEncodeData
+        {
+            get
+            {
+                return new TheoryData<string, bool, string>
+                {
+                    { "Simple Display Text", false, "Simple Display Text" },
+                    { "Simple Display Text", true, "HtmlEncode[[Simple Display Text]]" },
+                    { "<blink>text</blink>", false, "<blink>text</blink>" },
+                    { "<blink>text</blink>", true, "HtmlEncode[[<blink>text</blink>]]" },
+                    { "&'\"", false, "&'\"" },
+                    { "&'\"", true, "HtmlEncode[[&'\"]]" },
+                    { " ¡ÿĀ", false, " ¡ÿĀ" },                                           // high ASCII
+                    { " ¡ÿĀ", true, "HtmlEncode[[ ¡ÿĀ]]" },
+                    { "Chinese西雅图Chars", false, "Chinese西雅图Chars" },
+                    { "Chinese西雅图Chars", true, "HtmlEncode[[Chinese西雅图Chars]]" },
+                    { "Unicode؃Format؃Char", false, "Unicode؃Format؃Char" },            // class Cf
+                    { "Unicode؃Format؃Char", true, "HtmlEncode[[Unicode؃Format؃Char]]" },
+                    { "UnicodeῼTitlecaseῼChar", false, "UnicodeῼTitlecaseῼChar" },       // class Lt
+                    { "UnicodeῼTitlecaseῼChar", true, "HtmlEncode[[UnicodeῼTitlecaseῼChar]]" },
+                    { "UnicodeःCombiningःChar", false, "UnicodeःCombiningःChar" },    // class Mc
+                    { "UnicodeःCombiningःChar", true, "HtmlEncode[[UnicodeःCombiningःChar]]" },
+                };
+            }
+        }
+
+        [Fact]
+        public void ObjectTemplateDisplaysSimplePropertiesOnObjectByDefault()
+        {
+            var expected =
+                "<div class=\"HtmlEncode[[display-label]]\">HtmlEncode[[Property1]]</div>" + Environment.NewLine
+              + "<div class=\"HtmlEncode[[display-field]]\">Model = p1, ModelType = System.String, PropertyName = Property1," +
+                    " SimpleDisplayText = p1</div>" + Environment.NewLine
+              + "<div class=\"HtmlEncode[[display-label]]\">HtmlEncode[[Prop2]]</div>" + Environment.NewLine
+              + "<div class=\"HtmlEncode[[display-field]]\">Model = (null), ModelType = System.String, PropertyName = Property2," +
+                    " SimpleDisplayText = (null)</div>" + Environment.NewLine;
+
+            // Arrange
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "p1", Property2 = null };
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model);
+
+            // Act
+            var result = DefaultDisplayTemplates.ObjectTemplate(html);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void ObjectTemplateDisplaysNullDisplayTextWhenObjectIsNull()
+        {
+            // Arrange
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<DefaultTemplatesUtilities.ObjectTemplateModel>().DisplayDetails(dd =>
+            {
+                dd.NullDisplayText = "(null value)";
+            });
+
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(provider: provider);
+
+            // Act
+            var result = DefaultDisplayTemplates.ObjectTemplate(html);
+
+            // Assert
+            Assert.Equal("(null value)", HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Theory]
+        [MemberData(nameof(HtmlEncodeData))]
+        public void ObjectTemplateDisplaysSimpleDisplayTextWhenTemplateDepthGreaterThanOne(
+            string simpleDisplayText,
+            bool htmlEncode,
+            string expectedResult)
+        {
+            // Arrange
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel();
+            model.Property1 = simpleDisplayText;
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<DefaultTemplatesUtilities.ObjectTemplateModel>().DisplayDetails(dd =>
+            {
+                dd.HtmlEncode = htmlEncode;
+                dd.SimpleDisplayProperty = "Property1";
+            });
+
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model, provider);
+
+            html.ViewData.TemplateInfo.AddVisited("foo");
+            html.ViewData.TemplateInfo.AddVisited("bar");
+
+            // Act
+            var result = DefaultDisplayTemplates.ObjectTemplate(html);
+
+            // Assert
+            Assert.Equal(expectedResult, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void ObjectTemplate_IgnoresPropertiesWith_ScaffoldColumnFalse()
+        {
+            // Arrange
+            var expected = "<div class=\"HtmlEncode[[display-label]]\">HtmlEncode[[Property1]]</div>" + Environment.NewLine +
+                "<div class=\"HtmlEncode[[display-field]]\"></div>" + Environment.NewLine +
+                "<div class=\"HtmlEncode[[display-label]]\">HtmlEncode[[Property3]]</div>" + Environment.NewLine +
+                "<div class=\"HtmlEncode[[display-field]]\"></div>" + Environment.NewLine;
+
+            var model = new DefaultTemplatesUtilities.ObjectWithScaffoldColumn();
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var result = DefaultDisplayTemplates.ObjectTemplate(htmlHelper);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void ObjectTemplate_HonoursHideSurroundingHtml()
+        {
+            // Arrange
+            var expected =
+                "Model = p1, ModelType = System.String, PropertyName = Property1, SimpleDisplayText = p1" +
+                "<div class=\"HtmlEncode[[display-label]]\">HtmlEncode[[Prop2]]</div>" + Environment.NewLine +
+                "<div class=\"HtmlEncode[[display-field]]\">Model = (null), ModelType = System.String, PropertyName = Property2," +
+                    " SimpleDisplayText = (null)</div>" + Environment.NewLine;
+
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "p1", Property2 = null };
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForProperty<DefaultTemplatesUtilities.ObjectTemplateModel>("Property1").DisplayDetails(dd =>
+            {
+                dd.HideSurroundingHtml = true;
+            });
+
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model, provider);
+
+            // Act
+            var result = DefaultDisplayTemplates.ObjectTemplate(html);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void ObjectTemplate_OrdersProperties_AsExpected()
+        {
+            // Arrange
+            var model = new OrderedModel();
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            var expectedProperties = new List<string>
+            {
+                "OrderedProperty3",
+                "OrderedProperty2",
+                "OrderedProperty1",
+                "Property3",
+                "Property1",
+                "Property2",
+                "LastProperty",
+            };
+
+            var stringBuilder = new StringBuilder();
+            foreach (var property in expectedProperties)
+            {
+                var label = string.Format(
+                    CultureInfo.InvariantCulture,
+                    "<div class=\"HtmlEncode[[display-label]]\">HtmlEncode[[{0}]]</div>",
+                    property);
+                stringBuilder.AppendLine(label);
+
+                var value = string.Format(
+                    CultureInfo.InvariantCulture,
+                    "<div class=\"HtmlEncode[[display-field]]\">Model = (null), ModelType = System.String, PropertyName = {0}, " +
+                    "SimpleDisplayText = (null)</div>",
+                    property);
+                stringBuilder.AppendLine(value);
+            }
+            var expected = stringBuilder.ToString();
+
+            // Act
+            var result = DefaultDisplayTemplates.ObjectTemplate(html);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenInputTemplate_ReturnsValue()
+        {
+            // Arrange
+            var model = "Model string";
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            var templateInfo = html.ViewData.TemplateInfo;
+            templateInfo.HtmlFieldPrefix = "FieldPrefix";
+
+            // TemplateBuilder sets FormattedModelValue before calling TemplateRenderer and it's used below.
+            templateInfo.FormattedModelValue = "Formatted string";
+
+            // Act
+            var result = DefaultDisplayTemplates.HiddenInputTemplate(html);
+
+            // Assert
+            Assert.Equal("HtmlEncode[[Formatted string]]", HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenInputTemplate_HonoursHideSurroundingHtml()
+        {
+            // Arrange
+            var model = "Model string";
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<string>().DisplayDetails(dd =>
+            {
+                dd.HideSurroundingHtml = true;
+            });
+
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model, provider: provider);
+            var viewData = html.ViewData;
+
+            var templateInfo = viewData.TemplateInfo;
+            templateInfo.HtmlFieldPrefix = "FieldPrefix";
+            templateInfo.FormattedModelValue = "Formatted string";
+
+            // Act
+            var result = DefaultDisplayTemplates.HiddenInputTemplate(html);
+
+            // Assert
+            Assert.Empty(HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void Display_FindsViewDataMember()
+        {
+            // Arrange
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "Model string" };
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+            helper.ViewData["Property1"] = "ViewData string";
+
+            // Act
+            var result = helper.Display("Property1");
+
+            // Assert
+            Assert.Equal("HtmlEncode[[ViewData string]]", HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void DisplayFor_FindsModel()
+        {
+            // Arrange
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "Model string" };
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+            helper.ViewData["Property1"] = "ViewData string";
+
+            // Act
+            var result = helper.DisplayFor(m => m.Property1);
+
+            // Assert
+            Assert.Equal("HtmlEncode[[Model string]]", HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void Display_FindsModel_IfNoViewDataMember()
+        {
+            // Arrange
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "Model string" };
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var result = helper.Display("Property1");
+
+            // Assert
+            Assert.Equal("HtmlEncode[[Model string]]", HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void DisplayFor_FindsModel_EvenIfNullOrEmpty(string propertyValue)
+        {
+            // Arrange
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = propertyValue, };
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+            helper.ViewData["Property1"] = "ViewData string";
+
+            // Act
+            var result = helper.DisplayFor(m => m.Property1);
+
+            // Assert
+            Assert.Equal(string.Empty, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void DisplayFor_DoesNotWrapExceptionThrowsDuringViewRendering()
+        {
+            // Arrange
+            var expectedMessage = "my exception message";
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "Test string", };
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Returns(Task.Run(() =>
+                {
+                    throw new ArgumentException(expectedMessage);
+                }));
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("test-view", view.Object));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+            helper.ViewData["Property1"] = "ViewData string";
+
+            // Act and Assert
+            var ex = Assert.Throws<ArgumentException>(() => helper.DisplayFor(m => m.Property1));
+            Assert.Equal(expectedMessage, ex.Message);
+        }
+
+        [Fact]
+        public void Display_CallsFindView_WithExpectedPath()
+        {
+            // Arrange
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "DisplayTemplates/String", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found(string.Empty, new Mock<IView>().Object))
+                .Verifiable();
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(new object(), viewEngine: viewEngine.Object);
+
+            // Act & Assert
+            html.Display(expression: string.Empty, templateName: null, htmlFieldName: null, additionalViewData: null);
+            viewEngine.Verify();
+        }
+
+        private class OrderedModel
+        {
+            [Display(Order = 10001)]
+            public string LastProperty { get; set; }
+
+            public string Property3 { get; set; }
+            public string Property1 { get; set; }
+            public string Property2 { get; set; }
+
+            [Display(Order = 23)]
+            public string OrderedProperty3 { get; set; }
+            [Display(Order = 23)]
+            public string OrderedProperty2 { get; set; }
+            [Display(Order = 23)]
+            public string OrderedProperty1 { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/DefaultEditorTemplatesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/DefaultEditorTemplatesTest.cs
new file mode 100644
index 0000000000..793f7a176e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/DefaultEditorTemplatesTest.cs
@@ -0,0 +1,1638 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class DefaultEditorTemplatesTest
+    {
+        // Mappings from templateName to expected result when using StubbyHtmlHelper.
+        public static TheoryData<string, string> TemplateNameData
+        {
+            get
+            {
+                return new TheoryData<string, string>
+                {
+                    { null, "__TextBox__ class='text-box single-line'" },
+                    { string.Empty, "__TextBox__ class='text-box single-line'" },
+                    { "EmailAddress", "__TextBox__ class='text-box single-line' type='email'" },
+                    { "emailaddress", "__TextBox__ class='text-box single-line' type='email'" },
+                    { "HiddenInput", "HtmlEncode[[True]]__Hidden__" }, // Hidden also generates value by default.
+                    { "HIDDENINPUT", "HtmlEncode[[True]]__Hidden__" },
+                    { "MultilineText", "__TextArea__ class='text-box multi-line'" },
+                    { "multilinetext", "__TextArea__ class='text-box multi-line'" },
+                    { "Password", "__Password__ class='text-box single-line password'" },
+                    { "PASSWORD", "__Password__ class='text-box single-line password'" },
+                    { "PhoneNumber", "__TextBox__ class='text-box single-line' type='tel'" },
+                    { "phonenumber", "__TextBox__ class='text-box single-line' type='tel'" },
+                    { "Text", "__TextBox__ class='text-box single-line'" },
+                    { "TEXT", "__TextBox__ class='text-box single-line'" },
+                    { "Url", "__TextBox__ class='text-box single-line' type='url'" },
+                    { "url", "__TextBox__ class='text-box single-line' type='url'" },
+                    { "Date", "__TextBox__ class='text-box single-line' type='date'" },
+                    { "DATE", "__TextBox__ class='text-box single-line' type='date'" },
+                    { "DateTime", "__TextBox__ class='text-box single-line' type='datetime-local'" },
+                    { "datetime", "__TextBox__ class='text-box single-line' type='datetime-local'" },
+                    { "DateTime-local", "__TextBox__ class='text-box single-line' type='datetime-local'" },
+                    { "DATETIME-LOCAL", "__TextBox__ class='text-box single-line' type='datetime-local'" },
+                    { "datetimeoffset", "__TextBox__ class='text-box single-line' type='text'" },
+                    { "DateTimeOffset", "__TextBox__ class='text-box single-line' type='text'" },
+                    { "Time", "__TextBox__ class='text-box single-line' type='time'" },
+                    { "time", "__TextBox__ class='text-box single-line' type='time'" },
+                    { "Month", "__TextBox__ class='text-box single-line' type='month'" },
+                    { "month", "__TextBox__ class='text-box single-line' type='month'" },
+                    { "Week", "__TextBox__ class='text-box single-line' type='week'" },
+                    { "week", "__TextBox__ class='text-box single-line' type='week'" },
+                    { "Byte", "__TextBox__ class='text-box single-line' type='number'" },
+                    { "BYTE", "__TextBox__ class='text-box single-line' type='number'" },
+                    { "SByte", "__TextBox__ class='text-box single-line' type='number'" },
+                    { "sbyte", "__TextBox__ class='text-box single-line' type='number'" },
+                    { "Int16", "__TextBox__ class='text-box single-line' type='number'" },
+                    { "INT16", "__TextBox__ class='text-box single-line' type='number'" },
+                    { "UInt16", "__TextBox__ class='text-box single-line' type='number'" },
+                    { "uint16", "__TextBox__ class='text-box single-line' type='number'" },
+                    { "Int32", "__TextBox__ class='text-box single-line' type='number'" },
+                    { "INT32", "__TextBox__ class='text-box single-line' type='number'" },
+                    { "UInt32", "__TextBox__ class='text-box single-line' type='number'" },
+                    { "uint32", "__TextBox__ class='text-box single-line' type='number'" },
+                    { "Int64", "__TextBox__ class='text-box single-line' type='number'" },
+                    { "INT64", "__TextBox__ class='text-box single-line' type='number'" },
+                    { "UInt64", "__TextBox__ class='text-box single-line' type='number'" },
+                    { "uint64", "__TextBox__ class='text-box single-line' type='number'" },
+                    { "Single", "__TextBox__ class='text-box single-line'" },
+                    { "SINGLE", "__TextBox__ class='text-box single-line'" },
+                    { "Double", "__TextBox__ class='text-box single-line'" },
+                    { "double", "__TextBox__ class='text-box single-line'" },
+                    { "Boolean", "__CheckBox__ class='check-box'" }, // Not tri-state b/c string is not a Nullable type.
+                    { "BOOLEAN", "__CheckBox__ class='check-box'" },
+                    { "Decimal", "__TextBox__ class='text-box single-line'" },
+                    { "decimal", "__TextBox__ class='text-box single-line'" },
+                    { "String", "__TextBox__ class='text-box single-line'" },
+                    { "STRING", "__TextBox__ class='text-box single-line'" },
+                    { typeof(IFormFile).Name, "__TextBox__ class='text-box single-line' type='file'" },
+                    { TemplateRenderer.IEnumerableOfIFormFileName,
+                        "__TextBox__ class='text-box single-line' type='file' multiple='multiple'" },
+                };
+            }
+        }
+
+        // label's IHtmlContent -> expected label text
+        public static TheoryData<IHtmlContent, string> ObjectTemplate_ChecksWriteTo_NotToStringData
+        {
+            get
+            {
+                // Similar to HtmlString.Empty today.
+                var noopContentWithEmptyToString = new Mock<IHtmlContent>(MockBehavior.Strict);
+                noopContentWithEmptyToString
+                    .Setup(c => c.ToString())
+                    .Returns(string.Empty);
+                noopContentWithEmptyToString.Setup(c => c.WriteTo(It.IsAny<TextWriter>(), It.IsAny<HtmlEncoder>()));
+
+                // Similar to an empty StringHtmlContent today.
+                var noopContentWithNonEmptyToString = new Mock<IHtmlContent>(MockBehavior.Strict);
+                noopContentWithNonEmptyToString
+                    .Setup(c => c.ToString())
+                    .Returns(typeof(StringHtmlContent).FullName);
+                noopContentWithNonEmptyToString.Setup(c => c.WriteTo(It.IsAny<TextWriter>(), It.IsAny<HtmlEncoder>()));
+
+                // Makes noop calls on the TextWriter.
+                var busyNoopContentWithNonEmptyToString = new Mock<IHtmlContent>(MockBehavior.Strict);
+                busyNoopContentWithNonEmptyToString
+                    .Setup(c => c.ToString())
+                    .Returns(typeof(StringHtmlContent).FullName);
+                busyNoopContentWithNonEmptyToString
+                    .Setup(c => c.WriteTo(It.IsAny<TextWriter>(), It.IsAny<HtmlEncoder>()))
+                    .Callback<TextWriter, HtmlEncoder>((writer, encoder) =>
+                    {
+                        writer.Write(string.Empty);
+                        writer.Write(new char[0]);
+                        writer.Write((char[])null);
+                        writer.Write((object)null);
+                        writer.Write((string)null);
+                        writer.Write(format: "{0}", arg0: null);
+                        writer.Write(new char[] { 'a', 'b', 'c' }, index: 1, count: 0);
+                    });
+
+                // Unrealistic but covers all the bases.
+                var writingContentWithEmptyToString = new Mock<IHtmlContent>(MockBehavior.Strict);
+                writingContentWithEmptyToString
+                    .Setup(c => c.ToString())
+                    .Returns(string.Empty);
+                writingContentWithEmptyToString
+                    .Setup(c => c.WriteTo(It.IsAny<TextWriter>(), It.IsAny<HtmlEncoder>()))
+                    .Callback<TextWriter, HtmlEncoder>((writer, encoder) => writer.Write("Some string"));
+
+                // Similar to TagBuilder today.
+                var writingContentWithNonEmptyToString = new Mock<IHtmlContent>(MockBehavior.Strict);
+                writingContentWithNonEmptyToString
+                    .Setup(c => c.ToString())
+                    .Returns(typeof(TagBuilder).FullName);
+                writingContentWithNonEmptyToString
+                    .Setup(c => c.WriteTo(It.IsAny<TextWriter>(), It.IsAny<HtmlEncoder>()))
+                    .Callback<TextWriter, HtmlEncoder>((writer, encoder) => writer.Write("Some string"));
+
+                // label's IHtmlContent -> expected label text
+                return new TheoryData<IHtmlContent, string>
+                {
+                    // Types HtmlHelper actually uses.
+                    { HtmlString.Empty, string.Empty },
+                    {
+                        new TagBuilder("label"),
+                        "<div class=\"HtmlEncode[[editor-label]]\"><label></label></div>" + Environment.NewLine
+                    },
+
+                    // Another IHtmlContent implementation that does not override ToString().
+                    { new StringHtmlContent(string.Empty), string.Empty },
+
+                    // Mocks
+                    { noopContentWithEmptyToString.Object, string.Empty },
+                    { noopContentWithNonEmptyToString.Object, string.Empty },
+                    { busyNoopContentWithNonEmptyToString.Object, string.Empty },
+                    {
+                        writingContentWithEmptyToString.Object,
+                        "<div class=\"HtmlEncode[[editor-label]]\">Some string</div>" + Environment.NewLine
+                    },
+                    {
+                        writingContentWithNonEmptyToString.Object,
+                        "<div class=\"HtmlEncode[[editor-label]]\">Some string</div>" + Environment.NewLine
+                    },
+                };
+            }
+        }
+
+        [Fact]
+        public void ObjectTemplateEditsSimplePropertiesOnObjectByDefault()
+        {
+            // Arrange
+            var expected =
+                "<div class=\"HtmlEncode[[editor-label]]\"><label for=\"HtmlEncode[[Property1]]\">HtmlEncode[[Property1]]</label></div>" +
+                Environment.NewLine +
+                "<div class=\"HtmlEncode[[editor-field]]\">Model = p1, ModelType = System.String, PropertyName = Property1, SimpleDisplayText = p1 " +
+                "<span class=\"HtmlEncode[[field-validation-valid]]\" data-valmsg-for=\"HtmlEncode[[Property1]]\" data-valmsg-replace=\"HtmlEncode[[true]]\">" +
+                "</span></div>" +
+                Environment.NewLine +
+                "<div class=\"HtmlEncode[[editor-label]]\"><label for=\"HtmlEncode[[Property2]]\">HtmlEncode[[Prop2]]</label></div>" +
+                Environment.NewLine +
+                "<div class=\"HtmlEncode[[editor-field]]\">Model = (null), ModelType = System.String, PropertyName = Property2, SimpleDisplayText = (null) " +
+                "<span class=\"HtmlEncode[[field-validation-valid]]\" data-valmsg-for=\"HtmlEncode[[Property2]]\" data-valmsg-replace=\"HtmlEncode[[true]]\">" +
+                "</span></div>" +
+                Environment.NewLine;
+
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "p1", Property2 = null };
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model);
+
+            // Act
+            var result = DefaultEditorTemplates.ObjectTemplate(html);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        // Prior to aspnet/Mvc#6638 fix, helper did not generate Property1 <label> or containing <div> with this setup.
+        // Expect almost the same HTML as in ObjectTemplateEditsSimplePropertiesOnObjectByDefault(). Only difference is
+        // the <div class="editor-label">...</div> is not present for Property1.
+        [Fact]
+        public void ObjectTemplateSkipsLabel_IfDisplayNameIsEmpty()
+        {
+            // Arrange
+            var expected =
+                "<div class=\"HtmlEncode[[editor-label]]\"><label for=\"HtmlEncode[[Property1]]\"></label></div>" +
+                Environment.NewLine +
+                "<div class=\"HtmlEncode[[editor-field]]\">Model = p1, ModelType = System.String, PropertyName = Property1, SimpleDisplayText = p1 " +
+                "<span class=\"HtmlEncode[[field-validation-valid]]\" data-valmsg-for=\"HtmlEncode[[Property1]]\" data-valmsg-replace=\"HtmlEncode[[true]]\">" +
+                "</span></div>" +
+                Environment.NewLine +
+                "<div class=\"HtmlEncode[[editor-label]]\"><label for=\"HtmlEncode[[Property2]]\">HtmlEncode[[Prop2]]</label></div>" +
+                Environment.NewLine +
+                "<div class=\"HtmlEncode[[editor-field]]\">Model = (null), ModelType = System.String, PropertyName = Property2, SimpleDisplayText = (null) " +
+                "<span class=\"HtmlEncode[[field-validation-valid]]\" data-valmsg-for=\"HtmlEncode[[Property2]]\" data-valmsg-replace=\"HtmlEncode[[true]]\">" +
+                "</span></div>" +
+                Environment.NewLine;
+
+            var provider = new TestModelMetadataProvider();
+            provider
+                .ForProperty<DefaultTemplatesUtilities.ObjectTemplateModel>(
+                    nameof(DefaultTemplatesUtilities.ObjectTemplateModel.Property1))
+                .DisplayDetails(dd => dd.DisplayName = () => string.Empty);
+
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "p1", Property2 = null };
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model, provider);
+
+            // Act
+            var result = DefaultEditorTemplates.ObjectTemplate(html);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Theory]
+        [MemberData(nameof(ObjectTemplate_ChecksWriteTo_NotToStringData))]
+        public void ObjectTemplate_ChecksWriteTo_NotToString(IHtmlContent labelContent, string expectedLabel)
+        {
+            // Arrange
+            var expected =
+                expectedLabel +
+                "<div class=\"HtmlEncode[[editor-field]]\">Model = (null), ModelType = System.String, PropertyName = Property1, SimpleDisplayText = (null) " +
+                "</div>" +
+                Environment.NewLine +
+                expectedLabel +
+                "<div class=\"HtmlEncode[[editor-field]]\">Model = (null), ModelType = System.String, PropertyName = Property2, SimpleDisplayText = (null) " +
+                "</div>" +
+                Environment.NewLine;
+
+            var helperToCopy = DefaultTemplatesUtilities.GetHtmlHelper();
+            var helperMock = new Mock<IHtmlHelper>(MockBehavior.Strict);
+            helperMock.SetupGet(h => h.ViewContext).Returns(helperToCopy.ViewContext);
+            helperMock.SetupGet(h => h.ViewData).Returns(helperToCopy.ViewData);
+            helperMock
+                .Setup(h => h.Label(
+                    It.Is<string>(s => string.Equals("Property1", s, StringComparison.Ordinal) ||
+                        string.Equals("Property2", s, StringComparison.Ordinal)),
+                    null,   // labelText
+                    null))  // htmlAttributes
+                .Returns(labelContent);
+            helperMock
+                .Setup(h => h.ValidationMessage(
+                    It.Is<string>(s => string.Equals("Property1", s, StringComparison.Ordinal) ||
+                        string.Equals("Property2", s, StringComparison.Ordinal)),
+                    null,   // message
+                    null,   // htmlAttributes
+                    null))  // tag
+                .Returns(HtmlString.Empty);
+
+            // Act
+            var result = DefaultEditorTemplates.ObjectTemplate(helperMock.Object);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void ObjectTemplateDisplaysNullDisplayTextWithNullModelAndTemplateDepthGreaterThanOne()
+        {
+            // Arrange
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<DefaultTemplatesUtilities.ObjectTemplateModel>().DisplayDetails(dd =>
+            {
+                dd.NullDisplayText = "Null Display Text";
+                dd.SimpleDisplayProperty = "Property1";
+            });
+
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(provider: provider);
+
+            html.ViewData.TemplateInfo.AddVisited("foo");
+            html.ViewData.TemplateInfo.AddVisited("bar");
+
+            // Act
+            var result = DefaultEditorTemplates.ObjectTemplate(html);
+
+            // Assert
+            Assert.Equal(html.ViewData.ModelMetadata.NullDisplayText, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Theory]
+        [MemberData(nameof(DefaultDisplayTemplatesTest.HtmlEncodeData), MemberType = typeof(DefaultDisplayTemplatesTest))]
+        public void ObjectTemplateDisplaysSimpleDisplayTextWithNonNullModelTemplateDepthGreaterThanOne(
+            string simpleDisplayText,
+            bool htmlEncode,
+            string expectedResult)
+        {
+            // Arrange
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel()
+            {
+                Property1 = simpleDisplayText,
+            };
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<DefaultTemplatesUtilities.ObjectTemplateModel>().DisplayDetails(dd =>
+            {
+                dd.HtmlEncode = htmlEncode;
+                dd.NullDisplayText = "Null Display Text";
+                dd.SimpleDisplayProperty = "Property1";
+            });
+
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model, provider: provider);
+
+            html.ViewData.TemplateInfo.AddVisited("foo");
+            html.ViewData.TemplateInfo.AddVisited("bar");
+
+            // Act
+            var result = DefaultEditorTemplates.ObjectTemplate(html);
+
+            // Assert
+            Assert.Equal(expectedResult, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void ObjectTemplate_IgnoresPropertiesWith_ScaffoldColumnFalse()
+        {
+            // Arrange
+            var expected =
+@"<div class=""HtmlEncode[[editor-label]]""><label for=""HtmlEncode[[Property1]]"">HtmlEncode[[Property1]]</label></div>" +
+Environment.NewLine +
+@"<div class=""HtmlEncode[[editor-field]]""><input class=""HtmlEncode[[text-box single-line]]"" id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[text]]"" value="""" /> " +
+@"<span class=""HtmlEncode[[field-validation-valid]]"" data-valmsg-for=""HtmlEncode[[Property1]]"" data-valmsg-replace=""HtmlEncode[[true]]""></span></div>" +
+Environment.NewLine +
+@"<div class=""HtmlEncode[[editor-label]]""><label for=""HtmlEncode[[Property3]]"">HtmlEncode[[Property3]]</label></div>" +
+Environment.NewLine +
+@"<div class=""HtmlEncode[[editor-field]]""><input class=""HtmlEncode[[text-box single-line]]"" id=""HtmlEncode[[Property3]]"" name=""HtmlEncode[[Property3]]"" type=""HtmlEncode[[text]]"" value="""" /> " +
+@"<span class=""HtmlEncode[[field-validation-valid]]"" data-valmsg-for=""HtmlEncode[[Property3]]"" data-valmsg-replace=""HtmlEncode[[true]]""></span></div>" +
+Environment.NewLine;
+
+            var model = new DefaultTemplatesUtilities.ObjectWithScaffoldColumn();
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("", Enumerable.Empty<string>()));
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var result = DefaultEditorTemplates.ObjectTemplate(htmlHelper);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void ObjectTemplate_HonoursHideSurroundingHtml()
+        {
+            // Arrange
+            var expected =
+                "Model = p1, ModelType = System.String, PropertyName = Property1, SimpleDisplayText = p1" +
+                "<div class=\"HtmlEncode[[editor-label]]\"><label for=\"HtmlEncode[[Property2]]\">HtmlEncode[[Prop2]]</label></div>" +
+                Environment.NewLine +
+                "<div class=\"HtmlEncode[[editor-field]]\">" +
+                    "Model = (null), ModelType = System.String, PropertyName = Property2, SimpleDisplayText = (null) " +
+                    "<span class=\"HtmlEncode[[field-validation-valid]]\" data-valmsg-for=\"HtmlEncode[[Property2]]\" data-valmsg-replace=\"HtmlEncode[[true]]\">" +
+                    "</span></div>" +
+                Environment.NewLine;
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForProperty<DefaultTemplatesUtilities.ObjectTemplateModel>("Property1").DisplayDetails(dd =>
+            {
+                dd.HideSurroundingHtml = true;
+            });
+
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "p1", Property2 = null };
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model, provider: provider);
+
+            // Act
+            var result = DefaultEditorTemplates.ObjectTemplate(html);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void ObjectTemplate_OrdersProperties_AsExpected()
+        {
+            // Arrange
+            var model = new OrderedModel();
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            var expectedProperties = new List<string>
+            {
+                "OrderedProperty3",
+                "OrderedProperty2",
+                "OrderedProperty1",
+                "Property3",
+                "Property1",
+                "Property2",
+                "LastProperty",
+            };
+
+            var stringBuilder = new StringBuilder();
+            foreach (var property in expectedProperties)
+            {
+                var label = string.Format(
+                    CultureInfo.InvariantCulture,
+                    "<div class=\"HtmlEncode[[editor-label]]\"><label for=\"HtmlEncode[[{0}]]\">HtmlEncode[[{0}]]</label></div>",
+                    property);
+                stringBuilder.AppendLine(label);
+
+                var value = string.Format(
+                    CultureInfo.InvariantCulture,
+                    "<div class=\"HtmlEncode[[editor-field]]\">Model = (null), ModelType = System.String, PropertyName = {0}, " +
+                    "SimpleDisplayText = (null) " +
+                    "<span class=\"HtmlEncode[[field-validation-valid]]\" data-valmsg-for=\"HtmlEncode[[{0}]]\" data-valmsg-replace=\"HtmlEncode[[true]]\">" +
+                    "</span></div>",
+                    property);
+                stringBuilder.AppendLine(value);
+            }
+            var expected = stringBuilder.ToString();
+
+            // Act
+            var result = DefaultEditorTemplates.ObjectTemplate(html);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenInputTemplate_ReturnsValueAndHiddenInput()
+        {
+            // Arrange
+            var expected =
+                "HtmlEncode[[Formatted string]]<input id=\"HtmlEncode[[FieldPrefix]]\" name=\"HtmlEncode[[FieldPrefix]]\" type=\"HtmlEncode[[hidden]]\" value=\"HtmlEncode[[Model string]]\" />";
+
+            var model = "Model string";
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            var templateInfo = html.ViewData.TemplateInfo;
+            templateInfo.HtmlFieldPrefix = "FieldPrefix";
+
+            // TemplateBuilder sets FormattedModelValue before calling TemplateRenderer and it's used below.
+            templateInfo.FormattedModelValue = "Formatted string";
+
+            // Act
+            var result = DefaultEditorTemplates.HiddenInputTemplate(html);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenInputTemplate_HonoursHideSurroundingHtml()
+        {
+            // Arrange
+            var expected = "<input id=\"HtmlEncode[[FieldPrefix]]\" name=\"HtmlEncode[[FieldPrefix]]\" type=\"HtmlEncode[[hidden]]\" value=\"HtmlEncode[[Model string]]\" />";
+
+            var model = "Model string";
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<string>().DisplayDetails(dd =>
+            {
+                dd.HideSurroundingHtml = true;
+            });
+
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model, provider: provider);
+
+            var templateInfo = html.ViewData.TemplateInfo;
+            templateInfo.HtmlFieldPrefix = "FieldPrefix";
+            templateInfo.FormattedModelValue = "Formatted string";
+
+            // Act
+            var result = DefaultEditorTemplates.HiddenInputTemplate(html);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void MultilineTextTemplate_ReturnsTextArea()
+        {
+            // Arrange
+            var expected =
+                "<textarea class=\"HtmlEncode[[text-box multi-line]]\" id=\"HtmlEncode[[FieldPrefix]]\" name=\"HtmlEncode[[FieldPrefix]]\">" +
+                Environment.NewLine +
+                "HtmlEncode[[Formatted string]]</textarea>";
+
+            var model = "Model string";
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            var templateInfo = html.ViewData.TemplateInfo;
+            templateInfo.HtmlFieldPrefix = "FieldPrefix";
+
+            // TemplateBuilder sets FormattedModelValue before calling TemplateRenderer and it's used below.
+            templateInfo.FormattedModelValue = "Formatted string";
+
+            // Act
+            var result = DefaultEditorTemplates.MultilineTemplate(html);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void PasswordTemplate_ReturnsInputElement_IgnoresValues()
+        {
+            // Arrange
+            var expected = "<input class=\"HtmlEncode[[text-box single-line password]]\" " +
+                "id=\"HtmlEncode[[FieldPrefix]]\" name=\"HtmlEncode[[FieldPrefix]]\" " +
+                "type=\"HtmlEncode[[password]]\" />";
+
+            // Template ignores Model.
+            var model = "Model string";
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            var viewData = helper.ViewData;
+            var templateInfo = viewData.TemplateInfo;
+            templateInfo.HtmlFieldPrefix = "FieldPrefix";
+
+            // Template ignores FormattedModelValue, ModelState and ViewData.
+            templateInfo.FormattedModelValue = "Formatted string";
+            viewData.ModelState.SetModelValue("FieldPrefix", "Raw model string", "Attempted model string");
+            viewData["FieldPrefix"] = "ViewData string";
+
+            // Act
+            var result = DefaultEditorTemplates.PasswordTemplate(helper);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void PasswordTemplate_ReturnsInputElement_UsesHtmlAttributes()
+        {
+            // Arrange
+            var expected = "<input class=\"HtmlEncode[[super text-box single-line password]]\" " +
+                "id=\"HtmlEncode[[FieldPrefix]]\" name=\"HtmlEncode[[FieldPrefix]]\" " +
+                "type=\"HtmlEncode[[password]]\" value=\"HtmlEncode[[Html attributes string]]\" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<string>(model: null);
+            var viewData = helper.ViewData;
+            var templateInfo = viewData.TemplateInfo;
+            templateInfo.HtmlFieldPrefix = "FieldPrefix";
+
+            viewData["htmlAttributes"] = new { @class = "super", value = "Html attributes string" };
+
+            // Act
+            var result = DefaultEditorTemplates.PasswordTemplate(helper);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Theory]
+        [MemberData(nameof(TemplateNameData))]
+        public void Editor_CallsExpectedHtmlHelper(string templateName, string expectedResult)
+        {
+            // Arrange
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "True" };
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(
+                model,
+                viewEngine.Object,
+                innerHelper => new StubbyHtmlHelper(innerHelper));
+            helper.ViewData["Property1"] = "True";
+
+            // TemplateBuilder sets FormattedModelValue before calling TemplateRenderer and it's used in most templates.
+            helper.ViewData.TemplateInfo.FormattedModelValue = "Formatted string";
+
+            // Act
+            var result = helper.Editor(
+                "Property1",
+                templateName,
+                htmlFieldName: null,
+                additionalViewData: null);
+
+            // Assert
+            Assert.Equal(expectedResult, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Theory]
+        [MemberData(nameof(TemplateNameData))]
+        public void EditorFor_CallsExpectedHtmlHelper(string templateName, string expectedResult)
+        {
+            // Arrange
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "True" };
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(
+                model,
+                viewEngine.Object,
+                innerHelper => new StubbyHtmlHelper(innerHelper));
+
+            // TemplateBuilder sets FormattedModelValue before calling TemplateRenderer and it's used in most templates.
+            helper.ViewData.TemplateInfo.FormattedModelValue = "Formatted string";
+
+            // Act
+            var result = helper.EditorFor(
+                anotherModel => anotherModel.Property1,
+                templateName,
+                htmlFieldName: null,
+                additionalViewData: null);
+
+            // Assert
+            Assert.Equal(expectedResult, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Theory]
+        [MemberData(nameof(TemplateNameData))]
+        public void Editor_CallsExpectedHtmlHelper_DataTypeName(string templateName, string expectedResult)
+        {
+            // Arrange
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "True" };
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForProperty<DefaultTemplatesUtilities.ObjectTemplateModel>("Property1").DisplayDetails(dd =>
+            {
+                dd.DataTypeName = templateName;
+            });
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(
+                model,
+                Mock.Of<IUrlHelper>(),
+                viewEngine.Object,
+                provider,
+                innerHelper => new StubbyHtmlHelper(innerHelper));
+            helper.ViewData["Property1"] = "True";
+
+            // TemplateBuilder sets FormattedModelValue before calling TemplateRenderer and it's used in most templates.
+            helper.ViewData.TemplateInfo.FormattedModelValue = "Formatted string";
+
+            // Act
+            var result = helper.Editor(
+                "Property1",
+                templateName,
+                htmlFieldName: null,
+                additionalViewData: null);
+
+            // Assert
+            Assert.Equal(expectedResult, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Theory]
+        [MemberData(nameof(TemplateNameData))]
+        public void EditorFor_CallsExpectedHtmlHelper_DataTypeName(string templateName, string expectedResult)
+        {
+            // Arrange
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "True" };
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForProperty<DefaultTemplatesUtilities.ObjectTemplateModel>("Property1").DisplayDetails(dd =>
+            {
+                dd.DataTypeName = templateName;
+            });
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(
+                model,
+                Mock.Of<IUrlHelper>(),
+                viewEngine.Object,
+                provider,
+                innerHelper => new StubbyHtmlHelper(innerHelper));
+
+            // TemplateBuilder sets FormattedModelValue before calling TemplateRenderer and it's used in most templates.
+            helper.ViewData.TemplateInfo.FormattedModelValue = "Formatted string";
+
+            // Act
+            var result = helper.EditorFor(
+                anotherModel => anotherModel.Property1,
+                templateName,
+                htmlFieldName: null,
+                additionalViewData: null);
+
+            // Assert
+            Assert.Equal(expectedResult, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Theory]
+        [MemberData(nameof(TemplateNameData))]
+        public void Editor_CallsExpectedHtmlHelper_TemplateHint(string templateName, string expectedResult)
+        {
+            // Arrange
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "True" };
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForProperty<DefaultTemplatesUtilities.ObjectTemplateModel>("Property1").DisplayDetails(dd =>
+            {
+                dd.TemplateHint = templateName;
+            });
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(
+                model,
+                Mock.Of<IUrlHelper>(),
+                viewEngine.Object,
+                provider,
+                innerHelper => new StubbyHtmlHelper(innerHelper));
+            helper.ViewData["Property1"] = "True";
+
+            // TemplateBuilder sets FormattedModelValue before calling TemplateRenderer and it's used in most templates.
+            helper.ViewData.TemplateInfo.FormattedModelValue = "Formatted string";
+
+            // Act
+            var result = helper.Editor(
+                "Property1",
+                templateName,
+                htmlFieldName: null,
+                additionalViewData: null);
+
+            // Assert
+            Assert.Equal(expectedResult, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Theory]
+        [MemberData(nameof(TemplateNameData))]
+        public void EditorFor_CallsExpectedHtmlHelper_TemplateHint(string templateName, string expectedResult)
+        {
+            // Arrange
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "True" };
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForProperty<DefaultTemplatesUtilities.ObjectTemplateModel>("Property1").DisplayDetails(dd =>
+            {
+                dd.TemplateHint = templateName;
+            });
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(
+                model,
+                Mock.Of<IUrlHelper>(),
+                viewEngine.Object,
+                provider,
+                innerHelper => new StubbyHtmlHelper(innerHelper));
+
+            // TemplateBuilder sets FormattedModelValue before calling TemplateRenderer and it's used in most templates.
+            helper.ViewData.TemplateInfo.FormattedModelValue = "Formatted string";
+
+            // Act
+            var result = helper.EditorFor(
+                anotherModel => anotherModel.Property1,
+                templateName,
+                htmlFieldName: null,
+                additionalViewData: null);
+
+            // Assert
+            Assert.Equal(expectedResult, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void Editor_FindsViewDataMember()
+        {
+            // Arrange
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "Model string" };
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+            helper.ViewData["Property1"] = "ViewData string";
+
+            // Act
+            var result = helper.Editor("Property1");
+
+            // Assert
+            Assert.Equal(
+                "<input class=\"HtmlEncode[[text-box single-line]]\" id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[text]]\" value=\"HtmlEncode[[ViewData string]]\" />",
+                HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void Editor_InputTypeDateTime_RendersAsDateTime()
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("DateTimeOffset");
+            var expectedInput = "<input class=\"HtmlEncode[[text-box single-line]]\" data-val=\"HtmlEncode[[true]]\" " +
+                $"data-val-required=\"HtmlEncode[[{requiredMessage}]]\" id=\"HtmlEncode[[FieldPrefix]]\" " +
+                "name=\"HtmlEncode[[FieldPrefix]]\" type=\"HtmlEncode[[datetime]]\" value=\"HtmlEncode[[2000-01-02T03:04:05.060+00:00]]\" />";
+
+            var offset = TimeSpan.FromHours(0);
+            var model = new DateTimeOffset(
+                year: 2000,
+                month: 1,
+                day: 2,
+                hour: 3,
+                minute: 4,
+                second: 5,
+                millisecond: 60,
+                offset: offset);
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+
+            var provider = new TestModelMetadataProvider();
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(
+                model,
+                Mock.Of<IUrlHelper>(),
+                viewEngine.Object,
+                provider);
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "FieldPrefix";
+
+            // Act
+            var result = helper.Editor(
+                string.Empty,
+                new { htmlAttributes = new { type = "datetime" } });
+
+            // Assert
+            Assert.Equal(expectedInput, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        // Html5DateRenderingMode.Rfc3339 is enabled by default.
+        [Theory]
+        [InlineData(null, null, "2000-01-02T03:04:05.060-05:00", "text")]
+        [InlineData("date", null, "2000-01-02", "date")]
+        [InlineData("date", "{0:d}", "02/01/2000", "date")]
+        [InlineData("datetime", null, "2000-01-02T03:04:05.060", "datetime-local")]
+        [InlineData("datetime-local", null, "2000-01-02T03:04:05.060", "datetime-local")]
+        [InlineData("DateTimeOffset", null, "2000-01-02T03:04:05.060-05:00", "text")]
+        [InlineData("DateTimeOffset", "{0:o}", "2000-01-02T03:04:05.0600000-05:00", "text")]
+        [InlineData("time", null, "03:04:05.060", "time")]
+        [InlineData("time", "{0:t}", "03:04", "time")]
+        [InlineData("month", null, "2000-01", "month")]
+        [InlineData("month", "{0:yyyy-MM}", "2000-01", "month")]
+        [InlineData("week", null, "1999-W52", "week")]
+        [InlineData("week", "{0:yyyy-'W1'}", "2000-W1", "week")]
+        [ReplaceCulture]
+        public void Editor_FindsCorrectDateOrTimeTemplate_WithTimeOffset(
+            string dataTypeName,
+            string editFormatString,
+            string expectedValue,
+            string expectedType)
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("DateTimeOffset");
+            var expectedInput = "<input class=\"HtmlEncode[[text-box single-line]]\" data-val=\"HtmlEncode[[true]]\" " +
+                $"data-val-required=\"HtmlEncode[[{requiredMessage}]]\" id=\"HtmlEncode[[FieldPrefix]]\" " +
+                "name=\"HtmlEncode[[FieldPrefix]]\" type=\"HtmlEncode[[" +
+                expectedType +
+                "]]\" value=\"HtmlEncode[[" + expectedValue + "]]\" />";
+
+            var offset = TimeSpan.FromHours(-5);
+            var model = new DateTimeOffset(
+                year: 2000,
+                month: 1,
+                day: 2,
+                hour: 3,
+                minute: 4,
+                second: 5,
+                millisecond: 60,
+                offset: offset);
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<DateTimeOffset>().DisplayDetails(dd =>
+            {
+                dd.DataTypeName = dataTypeName;
+                dd.EditFormatString = editFormatString; // What [DataType] does for given type.
+                dd.HasNonDefaultEditFormat = true;
+            });
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(
+                model,
+                Mock.Of<IUrlHelper>(),
+                viewEngine.Object,
+                provider);
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "FieldPrefix";
+
+            // Act
+            var result = helper.Editor(string.Empty);
+
+            // Assert
+            Assert.Equal(expectedInput, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        // Html5DateRenderingMode.Rfc3339 can be disabled.
+        [Theory]
+        [InlineData(null, null, "02/01/2000 03:04:05 -05:00", "text")]
+        [InlineData("date", null, "02/01/2000 03:04:05 -05:00", "date")]
+        [InlineData("date", "{0:d}", "02/01/2000", "date")]
+        [InlineData("datetime", null, "02/01/2000 03:04:05 -05:00", "datetime-local")]
+        [InlineData("datetime-local", null, "02/01/2000 03:04:05 -05:00", "datetime-local")]
+        [InlineData("DateTimeOffset", null, "02/01/2000 03:04:05 -05:00", "text")]
+        [InlineData("DateTimeOffset", "{0:o}", "2000-01-02T03:04:05.0600000-05:00", "text")]
+        [InlineData("time", null, "02/01/2000 03:04:05 -05:00", "time")]
+        [InlineData("time", "{0:t}", "03:04", "time")]
+        [InlineData("month", null, "2000-01", "month")]
+        [InlineData("month", "{0:yyyy-MM}", "2000-01", "month")]
+        [InlineData("week", null, "1999-W52", "week")]
+        [InlineData("week", "{0:yyyy-'W1'}", "2000-W1", "week")]
+        [ReplaceCulture]
+        public void Editor_FindsCorrectDateOrTimeTemplate_WithTimeOffset_NotRfc3339(
+            string dataTypeName,
+            string editFormatString,
+            string expectedValue,
+            string expectedType)
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("DateTimeOffset");
+            var expectedInput =
+                "<input class=\"HtmlEncode[[text-box single-line]]\" data-val=\"HtmlEncode[[true]]\" " +
+                $"data-val-required=\"HtmlEncode[[{requiredMessage}]]\" id=\"HtmlEncode[[FieldPrefix]]\" " +
+                "name=\"HtmlEncode[[FieldPrefix]]\" type=\"HtmlEncode[[" +
+                expectedType +
+                "]]\" value=\"HtmlEncode[[" + expectedValue + "]]\" />";
+
+            var offset = TimeSpan.FromHours(-5);
+            var model = new DateTimeOffset(
+                year: 2000,
+                month: 1,
+                day: 2,
+                hour: 3,
+                minute: 4,
+                second: 5,
+                millisecond: 60,
+                offset: offset);
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<DateTimeOffset>().DisplayDetails(dd =>
+            {
+                dd.DataTypeName = dataTypeName;
+                dd.EditFormatString = editFormatString; // What [DataType] does for given type.
+                dd.HasNonDefaultEditFormat = true;
+            });
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(
+                model,
+                Mock.Of<IUrlHelper>(),
+                viewEngine.Object,
+                provider);
+            helper.Html5DateRenderingMode = Html5DateRenderingMode.CurrentCulture;
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "FieldPrefix";
+
+            // Act
+            var result = helper.Editor(string.Empty);
+
+            // Assert
+            Assert.Equal(expectedInput, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        // Html5DateRenderingMode.Rfc3339 is enabled by default.
+        [Theory]
+        [InlineData(null, null, "2000-01-02T03:04:05.060", "datetime-local")]
+        [InlineData("date", null, "2000-01-02", "date")]
+        [InlineData("date", "{0:d}", "02/01/2000", "date")]
+        [InlineData("datetime", null, "2000-01-02T03:04:05.060", "datetime-local")]
+        [InlineData("datetime-local", null, "2000-01-02T03:04:05.060", "datetime-local")]
+        [InlineData("DateTimeOffset", null, "2000-01-02T03:04:05.060Z", "text")]
+        [InlineData("DateTimeOffset", "{0:o}", "2000-01-02T03:04:05.0600000Z", "text")]
+        [InlineData("time", null, "03:04:05.060", "time")]
+        [InlineData("time", "{0:t}", "03:04", "time")]
+        [InlineData("month", null, "2000-01", "month")]
+        [InlineData("month", "{0:yyyy/MM}", "2000/01", "month")]
+        [InlineData("week", null, "1999-W52", "week")]
+        [InlineData("Week", "{0:yyyy/'W1'}", "2000/W1", "week")]
+        [ReplaceCulture]
+        public void Editor_FindsCorrectDateOrTimeTemplate_ForDateTime(
+            string dataTypeName,
+            string editFormatString,
+            string expectedValue,
+            string expectedType)
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("DateTime");
+            var expectedInput = "<input class=\"HtmlEncode[[text-box single-line]]\" data-val=\"HtmlEncode[[true]]\" " +
+                $"data-val-required=\"HtmlEncode[[{requiredMessage}]]\" id=\"HtmlEncode[[FieldPrefix]]\" " +
+                "name=\"HtmlEncode[[FieldPrefix]]\" type=\"HtmlEncode[[" +
+                expectedType +
+                "]]\" value=\"HtmlEncode[[" + expectedValue + "]]\" />";
+
+            var model = new DateTime(
+                year: 2000,
+                month: 1,
+                day: 2,
+                hour: 3,
+                minute: 4,
+                second: 5,
+                millisecond: 60,
+                kind: DateTimeKind.Utc);
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<DateTime>().DisplayDetails(dd =>
+            {
+                dd.DataTypeName = dataTypeName;
+                dd.EditFormatString = editFormatString; // What [DataType] does for given type.
+                dd.HasNonDefaultEditFormat = true;
+            });
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(
+                model,
+                Mock.Of<IUrlHelper>(),
+                viewEngine.Object,
+                provider);
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "FieldPrefix";
+
+            // Act
+            var result = helper.Editor(string.Empty);
+
+            // Assert
+            Assert.Equal(expectedInput, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        // Html5DateRenderingMode.Rfc3339 can be disabled.
+        [Theory]
+        [InlineData(null, null, "02/01/2000 03:04:05", "datetime-local")]
+        [InlineData("date", null, "02/01/2000 03:04:05", "date")]
+        [InlineData("date", "{0:d}", "02/01/2000", "date")]
+        [InlineData("datetime", null, "02/01/2000 03:04:05", "datetime-local")]
+        [InlineData("datetime-local", null, "02/01/2000 03:04:05", "datetime-local")]
+        [InlineData("DateTimeOffset", null, "02/01/2000 03:04:05", "text")]
+        [InlineData("DateTimeOffset", "{0:o}", "2000-01-02T03:04:05.0600000Z", "text")]
+        [InlineData("time", "{0:t}", "03:04", "time")]
+        [InlineData("month", null, "2000-01", "month")]
+        [InlineData("month", "{0:yyyy/MM}", "2000/01", "month")]
+        [InlineData("week", null, "1999-W52", "week")]
+        [InlineData("Week", "{0:yyyy/'W1'}", "2000/W1", "week")]
+        [ReplaceCulture]
+        public void Editor_FindsCorrectDateOrTimeTemplate_ForDateTimeNotRfc3339(
+            string dataTypeName,
+            string editFormatString,
+            string expectedValue,
+            string expectedType)
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("DateTime");
+            var expectedInput =
+                "<input class=\"HtmlEncode[[text-box single-line]]\" data-val=\"HtmlEncode[[true]]\" " +
+                $"data-val-required=\"HtmlEncode[[{requiredMessage}]]\" id=\"HtmlEncode[[FieldPrefix]]\" " +
+                "name=\"HtmlEncode[[FieldPrefix]]\" type=\"HtmlEncode[[" +
+                expectedType +
+                "]]\" value=\"HtmlEncode[[" + expectedValue + "]]\" />";
+
+            var model = new DateTime(
+                year: 2000,
+                month: 1,
+                day: 2,
+                hour: 3,
+                minute: 4,
+                second: 5,
+                millisecond: 60,
+                kind: DateTimeKind.Utc);
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<DateTime>().DisplayDetails(dd =>
+            {
+                dd.DataTypeName = dataTypeName;
+                dd.EditFormatString = editFormatString; // What [DataType] does for given type.
+                dd.HasNonDefaultEditFormat = true;
+            });
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(
+                model,
+                Mock.Of<IUrlHelper>(),
+                viewEngine.Object,
+                provider);
+            helper.Html5DateRenderingMode = Html5DateRenderingMode.CurrentCulture;
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "FieldPrefix";
+
+            // Act
+            var result = helper.Editor(string.Empty);
+
+            // Assert
+            Assert.Equal(expectedInput, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Theory]
+        [InlineData(null, Html5DateRenderingMode.CurrentCulture, "text")]
+        [InlineData(null, Html5DateRenderingMode.Rfc3339, "text")]
+        [InlineData("date", Html5DateRenderingMode.CurrentCulture, "date")]
+        [InlineData("date", Html5DateRenderingMode.Rfc3339, "date")]
+        [InlineData("datetime", Html5DateRenderingMode.CurrentCulture, "datetime-local")]
+        [InlineData("datetime", Html5DateRenderingMode.Rfc3339, "datetime-local")]
+        [InlineData("datetime-local", Html5DateRenderingMode.CurrentCulture, "datetime-local")]
+        [InlineData("datetime-local", Html5DateRenderingMode.Rfc3339, "datetime-local")]
+        [InlineData("time", Html5DateRenderingMode.CurrentCulture, "time")]
+        [InlineData("time", Html5DateRenderingMode.Rfc3339, "time")]
+        [InlineData("month", Html5DateRenderingMode.CurrentCulture, "month")]
+        [InlineData("month", Html5DateRenderingMode.Rfc3339, "month")]
+        [InlineData("week", Html5DateRenderingMode.CurrentCulture, "week")]
+        [InlineData("week", Html5DateRenderingMode.Rfc3339, "week")]
+        public void Editor_AppliesNonDefaultEditFormat(string dataTypeName, Html5DateRenderingMode renderingMode, string expectedType)
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("DateTimeOffset");
+            var expectedInput = "<input class=\"HtmlEncode[[text-box single-line]]\" data-val=\"HtmlEncode[[true]]\" " +
+                $"data-val-required=\"HtmlEncode[[{requiredMessage}]]\" id=\"HtmlEncode[[FieldPrefix]]\" " +
+                "name=\"HtmlEncode[[FieldPrefix]]\" type=\"HtmlEncode[[" +
+                expectedType +
+                "]]\" value=\"HtmlEncode[[Formatted as 2000-01-02T03:04:05.0600000+00:00]]\" />";
+
+            var offset = TimeSpan.FromHours(0);
+            var model = new DateTimeOffset(
+                year: 2000,
+                month: 1,
+                day: 2,
+                hour: 3,
+                minute: 4,
+                second: 5,
+                millisecond: 60,
+                offset: offset);
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<DateTimeOffset>().DisplayDetails(dd =>
+            {
+                dd.DataTypeName = dataTypeName;
+                dd.EditFormatString = "Formatted as {0:O}"; // What [DataType] does for given type.
+                dd.HasNonDefaultEditFormat = true;
+            });
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(
+                model,
+                Mock.Of<IUrlHelper>(),
+                viewEngine.Object,
+                provider);
+
+            helper.Html5DateRenderingMode = renderingMode; // Ignored due to HasNonDefaultEditFormat.
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "FieldPrefix";
+
+            // Act
+            var result = helper.Editor(string.Empty);
+
+            // Assert
+            Assert.Equal(expectedInput, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void EditorFor_FindsModel()
+        {
+            // Arrange
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "Model string" };
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+            helper.ViewData["Property1"] = "ViewData string";
+
+            // Act
+            var result = helper.EditorFor(m => m.Property1);
+
+            // Assert
+            Assert.Equal(
+                "<input class=\"HtmlEncode[[text-box single-line]]\" id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[text]]\" value=\"HtmlEncode[[Model string]]\" />",
+                HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void Editor_FindsModel_IfNoViewDataMember()
+        {
+            // Arrange
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "Model string" };
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var result = helper.Editor("Property1");
+
+            // Assert
+            Assert.Equal(
+                "<input class=\"HtmlEncode[[text-box single-line]]\" id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[text]]\" value=\"HtmlEncode[[Model string]]\" />",
+                HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void EditorFor_FindsModel_EvenIfNullOrEmpty(string propertyValue)
+        {
+            // Arrange
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = propertyValue, };
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+            helper.ViewData["Property1"] = "ViewData string";
+
+            // Act
+            var result = helper.EditorFor(m => m.Property1);
+
+            // Assert
+            Assert.Equal(
+                "<input class=\"HtmlEncode[[text-box single-line]]\" id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[text]]\" value=\"\" />",
+                HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void EditorFor_DoesNotWrapExceptionThrowsDuringViewRendering()
+        {
+            // Arrange
+            var expectedMessage = "my exception message";
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "Test string", };
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Returns(Task.Run(() =>
+                {
+                    throw new FormatException(expectedMessage);
+                }));
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("test-view", view.Object));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+            helper.ViewData["Property1"] = "ViewData string";
+
+            // Act and Assert
+            var ex = Assert.Throws<FormatException>(() => helper.EditorFor(m => m.Property1));
+            Assert.Equal(expectedMessage, ex.Message);
+        }
+
+        [Fact]
+        public void EditorForModel_CallsFindView_WithExpectedPath()
+        {
+            // Arrange
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "EditorTemplates/String", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found(string.Empty, new Mock<IView>().Object))
+                .Verifiable();
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(new object(), viewEngine: viewEngine.Object);
+
+            // Act & Assert
+            html.Editor(expression: string.Empty, templateName: null, htmlFieldName: null, additionalViewData: null);
+            viewEngine.Verify();
+        }
+
+        private class OrderedModel
+        {
+            [Display(Order = 10001)]
+            public string LastProperty { get; set; }
+
+            public string Property3 { get; set; }
+            public string Property1 { get; set; }
+            public string Property2 { get; set; }
+
+            [Display(Order = 23)]
+            public string OrderedProperty3 { get; set; }
+            [Display(Order = 23)]
+            public string OrderedProperty2 { get; set; }
+            [Display(Order = 23)]
+            public string OrderedProperty1 { get; set; }
+        }
+
+        private class StubbyHtmlHelper : IHtmlHelper, IViewContextAware
+        {
+            private readonly IHtmlHelper _innerHelper;
+
+            public StubbyHtmlHelper(IHtmlHelper innerHelper)
+            {
+                _innerHelper = innerHelper;
+            }
+
+            public Html5DateRenderingMode Html5DateRenderingMode
+            {
+                get { return _innerHelper.Html5DateRenderingMode; }
+                set { _innerHelper.Html5DateRenderingMode = value; }
+            }
+
+            public string IdAttributeDotReplacement
+            {
+                get { return _innerHelper.IdAttributeDotReplacement; }
+            }
+
+            public IModelMetadataProvider MetadataProvider
+            {
+                get { return _innerHelper.MetadataProvider; }
+            }
+
+            public dynamic ViewBag
+            {
+                get { return _innerHelper.ViewBag; }
+            }
+
+            public ViewContext ViewContext
+            {
+                get { return _innerHelper.ViewContext; }
+            }
+
+            public ViewDataDictionary ViewData
+            {
+                get { return _innerHelper.ViewData; }
+            }
+
+            public ITempDataDictionary TempData
+            {
+                get { return _innerHelper.TempData; }
+            }
+
+            public UrlEncoder UrlEncoder
+            {
+                get { return _innerHelper.UrlEncoder; }
+            }
+
+            public void Contextualize(ViewContext viewContext)
+            {
+                (_innerHelper as IViewContextAware)?.Contextualize(viewContext);
+            }
+
+            public IHtmlContent ActionLink(
+                string linkText,
+                string actionName,
+                string controllerName,
+                string protocol,
+                string hostname,
+                string fragment,
+                object routeValues,
+                object htmlAttributes)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IHtmlContent AntiForgeryToken()
+            {
+                throw new NotImplementedException();
+            }
+
+            public MvcForm BeginForm(
+                string actionName,
+                string controllerName,
+                object routeValues,
+                FormMethod method,
+                bool? antiforgery,
+                object htmlAttributes)
+            {
+                throw new NotImplementedException();
+            }
+
+            public MvcForm BeginRouteForm(
+                string routeName,
+                object routeValues,
+                FormMethod method,
+                bool? antiforgery,
+                object htmlAttributes)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IHtmlContent CheckBox(string name, bool? isChecked, object htmlAttributes)
+            {
+                return HelperName("__CheckBox__", htmlAttributes);
+            }
+
+            public IHtmlContent Display(
+                string expression,
+                string templateName,
+                string htmlFieldName,
+                object additionalViewData)
+            {
+                throw new NotImplementedException();
+            }
+
+            public string DisplayName(string expression)
+            {
+                throw new NotImplementedException();
+            }
+
+            public string DisplayText(string name)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IHtmlContent DropDownList(
+                string name,
+                IEnumerable<SelectListItem> selectList,
+                string optionLabel,
+                object htmlAttributes)
+            {
+                return HelperName("__DropDownList__", htmlAttributes);
+            }
+
+            public IHtmlContent Editor(
+                string expression,
+                string templateName,
+                string htmlFieldName,
+                object additionalViewData)
+            {
+                return _innerHelper.Editor(expression, templateName, htmlFieldName, additionalViewData);
+            }
+
+            public string Encode(string value)
+            {
+                throw new NotImplementedException();
+            }
+
+            public string Encode(object value)
+            {
+                return _innerHelper.Encode(value);
+            }
+
+            public void EndForm()
+            {
+                throw new NotImplementedException();
+            }
+
+            public string FormatValue(object value, string format)
+            {
+                throw new NotImplementedException();
+            }
+
+            public string GenerateIdFromName(string name)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IEnumerable<SelectListItem> GetEnumSelectList<TEnum>() where TEnum : struct
+            {
+                throw new NotImplementedException();
+            }
+
+            public IEnumerable<SelectListItem> GetEnumSelectList(Type enumType)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IHtmlContent Hidden(string name, object value, object htmlAttributes)
+            {
+                return HelperName("__Hidden__", htmlAttributes);
+            }
+
+            public string Id(string name)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IHtmlContent Label(string expression, string labelText, object htmlAttributes)
+            {
+                return HelperName("__Label__", htmlAttributes);
+            }
+
+            public IHtmlContent ListBox(string name, IEnumerable<SelectListItem> selectList, object htmlAttributes)
+            {
+                throw new NotImplementedException();
+            }
+
+            public string Name(string name)
+            {
+                throw new NotImplementedException();
+            }
+
+            public Task<IHtmlContent> PartialAsync(
+                string partialViewName,
+                object model,
+                ViewDataDictionary viewData)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IHtmlContent Password(string name, object value, object htmlAttributes)
+            {
+                return HelperName("__Password__", htmlAttributes);
+            }
+
+            public IHtmlContent RadioButton(string name, object value, bool? isChecked, object htmlAttributes)
+            {
+                return HelperName("__RadioButton__", htmlAttributes);
+            }
+
+            public IHtmlContent Raw(object value)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IHtmlContent Raw(string value)
+            {
+                throw new NotImplementedException();
+            }
+
+            public Task RenderPartialAsync(string partialViewName, object model, ViewDataDictionary viewData)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IHtmlContent RouteLink(
+                string linkText,
+                string routeName,
+                string protocol,
+                string hostName,
+                string fragment,
+                object routeValues,
+                object htmlAttributes)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IHtmlContent TextArea(string name, string value, int rows, int columns, object htmlAttributes)
+            {
+                return HelperName("__TextArea__", htmlAttributes);
+            }
+
+            public IHtmlContent TextBox(string name, object value, string format, object htmlAttributes)
+            {
+                return HelperName("__TextBox__", htmlAttributes);
+            }
+
+            public IHtmlContent ValidationMessage(string modelName, string message, object htmlAttributes, string tag)
+            {
+                return HelperName("__ValidationMessage__", htmlAttributes);
+            }
+
+            public IHtmlContent ValidationSummary(
+                bool excludePropertyErrors,
+                string message,
+                object htmlAttributes,
+                string tag)
+            {
+                throw new NotImplementedException();
+            }
+
+            public string Value(string name, string format)
+            {
+                throw new NotImplementedException();
+            }
+
+            private IHtmlContent HelperName(string name, object htmlAttributes)
+            {
+                var htmlAttributesDictionary = HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes);
+                var htmlAttributesString =
+                    string.Join(" ", htmlAttributesDictionary.Select(entry => $"{ entry.Key }='{ entry.Value }'"));
+                var helperName = $"{ name } { htmlAttributesString }";
+
+                return new HtmlString(helperName.TrimEnd());
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ExpressionHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ExpressionHelperTest.cs
new file mode 100644
index 0000000000..eee3b4fb66
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ExpressionHelperTest.cs
@@ -0,0 +1,503 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class ExpressionHelperTest
+    {
+        private readonly ExpressionTextCache _expressionTextCache = new ExpressionTextCache();
+
+        public static TheoryData<Expression, string> ExpressionAndTexts
+        {
+            get
+            {
+                var i = 3;
+                var value = "Test";
+                var key = "TestModel";
+                var myModels = new List<TestModel>();
+                var models = new List<TestModel>();
+                var modelTest = new TestModel();
+                var modelType = typeof(TestModel);
+
+                var data = new TheoryData<Expression, string>
+                {
+                    {
+                        (Expression<Func<TestModel, Category>>)(model => model.SelectedCategory),
+                        "SelectedCategory"
+                    },
+                    {
+                        (Expression<Func<TestModel, CategoryName>>)(model => model.SelectedCategory.CategoryName),
+                        "SelectedCategory.CategoryName"
+                    },
+                    {
+                        (Expression<Func<TestModel, int>>)(testModel => testModel.SelectedCategory.CategoryId),
+                        "SelectedCategory.CategoryId"
+                    },
+                    {
+                        (Expression<Func<LowerModel, int>>)(testModel => testModel.selectedcategory.CategoryId),
+                        "selectedcategory.CategoryId"
+                    },
+                    {
+                        (Expression<Func<TestModel, string>>)(model => model.SelectedCategory.CategoryName.MainCategory),
+                        "SelectedCategory.CategoryName.MainCategory"
+                    },
+                    {
+                        (Expression<Func<TestModel, TestModel>>)(model => model),
+                        string.Empty
+                    },
+                    {
+                        (Expression<Func<TestModel, string>>)(model => value),
+                        "value"
+                    },
+                    {
+                        (Expression<Func<TestModel, int>>)(model => models[0].SelectedCategory.CategoryId),
+                        "models[0].SelectedCategory.CategoryId"
+                    },
+                    {
+                        (Expression<Func<TestModel, string>>)(model => modelTest.Name),
+                        "modelTest.Name"
+                    },
+                    {
+                        (Expression<Func<TestModel, Type>>)(model => modelType),
+                        "modelType"
+                    },
+                    {
+                        (Expression<Func<IList<TestModel>, Category>>)(model => model[2].SelectedCategory),
+                        "[2].SelectedCategory"
+                    },
+                    {
+                        (Expression<Func<IList<TestModel>, Category>>)(model => model[i].SelectedCategory),
+                        "[3].SelectedCategory"
+                    },
+                    {
+                        (Expression<Func<IList<LowerModel>, Category>>)(model => model[i].selectedcategory),
+                        "[3].selectedcategory"
+                    },
+                    {
+                        (Expression<Func<IDictionary<string, TestModel>, string>>)(model => model[key].SelectedCategory.CategoryName.MainCategory),
+                        "[TestModel].SelectedCategory.CategoryName.MainCategory"
+                    },
+                    {
+                        (Expression<Func<TestModel, int>>)(model => model.PreferredCategories[i].CategoryId),
+                        "PreferredCategories[3].CategoryId"
+                    },
+                    {
+                        (Expression<Func<IList<TestModel>, Category>>)(model => myModels[i].SelectedCategory),
+                        "myModels[3].SelectedCategory"
+                    },
+                    {
+                        (Expression<Func<IList<TestModel>, int>>)(model => model[2].PreferredCategories[i].CategoryId),
+                        "[2].PreferredCategories[3].CategoryId"
+                    },
+                    {
+                        (Expression<Func<IList<LowerModel>, int>>)(model => model[2].preferredcategories[i].CategoryId),
+                        "[2].preferredcategories[3].CategoryId"
+                    },
+                    {
+                        (Expression<Func<IList<TestModel>, string>>)(model => model.FirstOrDefault().Name),
+                        "Name"
+                    },
+                    {
+                        (Expression<Func<IList<LowerModel>, string>>)(model => model.FirstOrDefault().name),
+                        "name"
+                    },
+                    {
+                        (Expression<Func<IList<TestModel>, string>>)(model => model.FirstOrDefault().Model),
+                        "Model"
+                    },
+                    {
+                        (Expression<Func<IList<TestModel>, int>>)(model => model.FirstOrDefault().SelectedCategory.CategoryId),
+                        "SelectedCategory.CategoryId"
+                    },
+                    {
+                        (Expression<Func<IList<TestModel>, string>>)(model => model.FirstOrDefault().SelectedCategory.CategoryName.MainCategory),
+                        "SelectedCategory.CategoryName.MainCategory"
+                    },
+                    {
+                        (Expression<Func<IList<TestModel>, int>>)(model => model.FirstOrDefault().PreferredCategories.Count),
+                        "PreferredCategories.Count"
+                    },
+                    {
+                        (Expression<Func<IList<TestModel>, int>>)(model => model.FirstOrDefault().PreferredCategories.FirstOrDefault().CategoryId),
+                        "CategoryId"
+                    },
+                    // Constants are not supported.
+                    {
+                        // Namespace never appears in expression name. "Model" there doesn't matter.
+                        (Expression<Func<TestModel, int>>)(m => Microsoft.AspNetCore.Mvc.ViewFeatures.Model.Constants.WoodstockYear),
+                        string.Empty
+                    },
+                    {
+                        // Class name never appears in expression name. "Model" there doesn't matter.
+                        (Expression<Func<TestModel, int>>)(m => Model.Constants.WoodstockYear),
+                        string.Empty
+                    },
+                    // ExpressionHelper treats static properties like other member accesses. Similarly to
+                    // RazorPage.Model, name "Model" is ignored at LHS of these expressions. This is a rare case because
+                    // static properties are the only leftmost member accesses that can reach beyond the current class.
+                    {
+                        (Expression<Func<TestModel, string>>)(m => Model.Constants.Model.Name),
+                        "Name"
+                    },
+                    {
+                        (Expression<Func<TestModel, string>>)(m => AStaticClass.Model),
+                        string.Empty
+                    },
+                    {
+                        (Expression<Func<TestModel, string>>)(m => AStaticClass.Test),
+                        "Test"
+                    },
+                    {
+                        (Expression<Func<TestModel, string>>)(m => AnotherStaticClass.Model.Name),
+                        "Name"
+                    },
+                    {
+                        (Expression<Func<TestModel, string>>)(m => AnotherStaticClass.Test.Name),
+                        "Test.Name"
+                    },
+                };
+
+                {
+                    // Nearly impossible in a .cshtml file because model is a keyword.
+                    var model = "Some string";
+                    data.Add((Expression<Func<TestModel, string>>)(m => model), string.Empty);
+                }
+
+                {
+                    // Model property in RazorPage is "special" (in a good way).
+                    var Model = new TestModel();
+                    data.Add((Expression<Func<TestModel, TestModel>>)(m => Model), string.Empty);
+                    data.Add((Expression<Func<TestModel, TestModel>>)(model => Model), string.Empty);
+                    data.Add((Expression<Func<TestModel, Category>>)(m => Model.SelectedCategory), "SelectedCategory");
+                }
+
+                return data;
+            }
+        }
+
+        public static TheoryData<Expression> CachedExpressions
+        {
+            get
+            {
+                var key = "TestModel";
+                var myModel = new TestModel();
+
+                return new TheoryData<Expression>
+                {
+                    (Expression<Func<TestModel, Category>>)(model => model.SelectedCategory),
+                    (Expression<Func<TestModel, CategoryName>>)(model => model.SelectedCategory.CategoryName),
+                    (Expression<Func<TestModel, int>>)(testModel => testModel.SelectedCategory.CategoryId),
+                    (Expression<Func<TestModel, string>>)(model => model.SelectedCategory.CategoryName.MainCategory),
+                    (Expression<Func<TestModel, string>>)(testModel => key),
+                    (Expression<Func<TestModel, TestModel>>)(m => m),
+                    (Expression<Func<TestModel, Category>>)(m => myModel.SelectedCategory),
+                };
+            }
+        }
+
+        public static TheoryData<Expression> IndexerExpressions
+        {
+            get
+            {
+                var i = 3;
+                var key = "TestModel";
+                var myModels = new List<TestModel>();
+
+                return new TheoryData<Expression>
+                {
+                    (Expression<Func<IList<TestModel>, Category>>)(model => model[2].SelectedCategory),
+                    (Expression<Func<IList<TestModel>, Category>>)(model => myModels[i].SelectedCategory),
+                    (Expression<Func<IList<TestModel>, CategoryName>>)(testModel => testModel[i].SelectedCategory.CategoryName),
+                    (Expression<Func<TestModel, int>>)(model => model.PreferredCategories[i].CategoryId),
+                    (Expression<Func<IDictionary<string, TestModel>, string>>)(model => model[key].SelectedCategory.CategoryName.MainCategory),
+                };
+            }
+        }
+
+        public static TheoryData<Expression> UnsupportedExpressions
+        {
+            get
+            {
+                var i = 2;
+                var j = 3;
+
+                return new TheoryData<Expression>
+                {
+                    // Indexers that have multiple arguments.
+                    (Expression<Func<TestModel[][], string>>)(model => model[23][3].Name),
+                    (Expression<Func<TestModel[][], string>>)(model => model[i][3].Name),
+                    (Expression<Func<TestModel[][], string>>)(model => model[23][j].Name),
+                    (Expression<Func<TestModel[][], string>>)(model => model[i][j].Name),
+                    // Calls that aren't indexers.
+                    (Expression<Func<IList<TestModel>, string>>)(model => model.FirstOrDefault().Name),
+                    (Expression<Func<IList<TestModel>, string>>)(model => model.FirstOrDefault().SelectedCategory.CategoryName.MainCategory),
+                    (Expression<Func<IList<TestModel>, int>>)(model => model.FirstOrDefault().PreferredCategories.FirstOrDefault().CategoryId),
+                };
+            }
+        }
+
+        public static TheoryData<Expression, Expression> EquivalentExpressions
+        {
+            get
+            {
+                var value = "Test";
+                var Model = "Test";
+
+                return new TheoryData<Expression, Expression>
+                {
+                    {
+                        (Expression<Func<TestModel, Category>>)(model => model.SelectedCategory),
+                        (Expression<Func<TestModel, Category>>)(model => model.SelectedCategory)
+                    },
+                    {
+                        (Expression<Func<TestModel, CategoryName>>)(model => model.SelectedCategory.CategoryName),
+                        (Expression<Func<TestModel, CategoryName>>)(model => model.SelectedCategory.CategoryName)
+                    },
+                    {
+                        (Expression<Func<TestModel, int>>)(testModel => testModel.SelectedCategory.CategoryId),
+                        (Expression<Func<TestModel, int>>)(testModel => testModel.SelectedCategory.CategoryId)
+                    },
+                    {
+                        (Expression<Func<TestModel, string>>)(model => model.SelectedCategory.CategoryName.MainCategory),
+                        (Expression<Func<TestModel, string>>)(model => model.SelectedCategory.CategoryName.MainCategory)
+                    },
+                    {
+                        (Expression<Func<TestModel, TestModel>>)(model => model),
+                        (Expression<Func<TestModel, TestModel>>)(m => m)
+                    },
+                    {
+                        (Expression<Func<TestModel, string>>)(model => value),
+                        (Expression<Func<TestModel, string>>)(m => value)
+                    },
+                    {
+                        // These two expressions are not actually equivalent. However ExpressionHelper returns
+                        // string.Empty for these two expressions and hence they are considered as equivalent by the
+                        // cache.
+                        (Expression<Func<TestModel, string>>)(m => Model),
+                        (Expression<Func<TestModel, TestModel>>)(m => m)
+                    },
+                };
+            }
+        }
+
+        public static TheoryData<Expression, Expression> NonEquivalentExpressions
+        {
+            get
+            {
+                var value = "test";
+                var key = "TestModel";
+                var Model = "Test";
+                var myModel = new TestModel();
+
+                return new TheoryData<Expression, Expression>
+                {
+                    {
+                        (Expression<Func<TestModel, Category>>)(model => model.SelectedCategory),
+                        (Expression<Func<TestModel, CategoryName>>)(model => model.SelectedCategory.CategoryName)
+                    },
+                    {
+                        (Expression<Func<TestModel, CategoryName>>)(model => model.SelectedCategory.CategoryName),
+                        (Expression<Func<LowerModel, CategoryName>>)(model => model.selectedcategory.CategoryName)
+                    },
+                    {
+                        (Expression<Func<TestModel, string>>)(model => model.Model),
+                        (Expression<Func<TestModel, string>>)(model => model.Name)
+                    },
+                    {
+                        (Expression<Func<TestModel, string>>)(model => model.Model),
+                        (Expression<Func<LowerModel, string>>)(model => model.model)
+                    },
+                    {
+                        (Expression<Func<TestModel, string>>)(model => model.Name),
+                        (Expression<Func<LowerModel, string>>)(model => model.name)
+                    },
+                    {
+                        (Expression<Func<TestModel, CategoryName>>)(model => model.SelectedCategory.CategoryName),
+                        (Expression<Func<TestModel, string>>)(model => value)
+                    },
+                    {
+                        (Expression<Func<TestModel, string>>)(testModel => testModel.SelectedCategory.CategoryName.MainCategory),
+                        (Expression<Func<TestModel, string>>)(testModel => value)
+                    },
+                    {
+                        (Expression<Func<IList<TestModel>, Category>>)(model => model[2].SelectedCategory),
+                        (Expression<Func<TestModel, string>>)(model => model.SelectedCategory.CategoryName.MainCategory)
+                    },
+                    {
+                        (Expression<Func<IList<TestModel>, Category>>)(model => model[2].SelectedCategory),
+                        (Expression<Func<IList<LowerModel>, Category>>)(model => model[2].selectedcategory)
+                    },
+                    {
+                        (Expression<Func<TestModel, int>>)(testModel => testModel.SelectedCategory.CategoryId),
+                        (Expression<Func<TestModel, Category>>)(model => model.SelectedCategory)
+                    },
+                    {
+                        (Expression<Func<IDictionary<string, TestModel>, string>>)(model => model[key].SelectedCategory.CategoryName.MainCategory),
+                        (Expression<Func<TestModel, Category>>)(model => model.SelectedCategory)
+                    },
+                    {
+                        (Expression<Func<IDictionary<string, TestModel>, string>>)(model => model[key].SelectedCategory.CategoryName.MainCategory),
+                        (Expression<Func<IDictionary<string, LowerModel>, string>>)(model => model[key].selectedcategory.CategoryName.MainCategory)
+                    },
+                    {
+                        (Expression<Func<TestModel, string>>)(m => Model),
+                        (Expression<Func<TestModel, string>>)(m => m.Model)
+                    },
+                    {
+                        (Expression<Func<TestModel, TestModel>>)(m => m),
+                        (Expression<Func<TestModel, string>>)(m => m.Model)
+                    },
+                    {
+                        (Expression<Func<TestModel, string>>)(m => myModel.Name),
+                        (Expression<Func<TestModel, string>>)(m => m.Name)
+                    },
+                    {
+                        (Expression<Func<TestModel, string>>)(m => key),
+                        (Expression<Func<TestModel, string>>)(m => value)
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ExpressionAndTexts))]
+        public void GetExpressionText_ReturnsExpectedExpressionText(LambdaExpression expression, string expressionText)
+        {
+            // Act
+            var text = ExpressionHelper.GetExpressionText(expression, _expressionTextCache);
+
+            // Assert
+            Assert.Equal(expressionText, text);
+        }
+
+        [Theory]
+        [MemberData(nameof(CachedExpressions))]
+        public void GetExpressionText_CachesExpression(LambdaExpression expression)
+        {
+            // Act - 1
+            var text1 = ExpressionHelper.GetExpressionText(expression, _expressionTextCache);
+
+            // Act - 2
+            var text2 = ExpressionHelper.GetExpressionText(expression, _expressionTextCache);
+
+            // Assert
+            Assert.Same(text1, text2); // cached
+        }
+
+        [Theory]
+        [MemberData(nameof(IndexerExpressions))]
+        [MemberData(nameof(UnsupportedExpressions))]
+        public void GetExpressionText_DoesNotCacheIndexerOrUnspportedExpression(LambdaExpression expression)
+        {
+            // Act - 1
+            var text1 = ExpressionHelper.GetExpressionText(expression, _expressionTextCache);
+
+            // Act - 2
+            var text2 = ExpressionHelper.GetExpressionText(expression, _expressionTextCache);
+
+            // Assert
+            Assert.Equal(text1, text2, StringComparer.Ordinal);
+            Assert.NotSame(text1, text2); // not cached
+        }
+
+        [Theory]
+        [MemberData(nameof(EquivalentExpressions))]
+        public void GetExpressionText_CacheEquivalentExpressions(LambdaExpression expression1, LambdaExpression expression2)
+        {
+            // Act - 1
+            var text1 = ExpressionHelper.GetExpressionText(expression1, _expressionTextCache);
+
+            // Act - 2
+            var text2 = ExpressionHelper.GetExpressionText(expression2, _expressionTextCache);
+
+            // Assert
+            Assert.Same(text1, text2); // cached
+        }
+
+        [Theory]
+        [MemberData(nameof(NonEquivalentExpressions))]
+        public void GetExpressionText_CheckNonEquivalentExpressions(LambdaExpression expression1, LambdaExpression expression2)
+        {
+            // Act - 1
+            var text1 = ExpressionHelper.GetExpressionText(expression1, _expressionTextCache);
+
+            // Act - 2
+            var text2 = ExpressionHelper.GetExpressionText(expression2, _expressionTextCache);
+
+            // Assert
+            Assert.NotEqual(text1, text2, StringComparer.Ordinal);
+            Assert.NotSame(text1, text2);
+        }
+
+        [Fact]
+        public void GetExpressionText_WithinALoop_ReturnsExpectedText()
+        {
+            // Arrange 0
+            var collection = new List<TestModel>();
+
+            for (var i = 0; i < 2; i++)
+            {
+                // Arrange i
+                var expectedText = $"collection[{i}].SelectedCategory.CategoryId";
+
+                // Act i
+                var result = ExpressionHelper.GetExpressionText(
+                    (Expression<Func<List<TestModel>, int>>)(m => collection[i].SelectedCategory.CategoryId),
+                    _expressionTextCache);
+
+                // Assert i
+                Assert.Equal(expectedText, result);
+            }
+        }
+
+        private class TestModel
+        {
+            public string Name { get; set; }
+            public string Model { get; set; }
+            public Category SelectedCategory { get; set; }
+
+            public IList<Category> PreferredCategories { get; set; }
+        }
+
+        private class LowerModel
+        {
+            public string name { get; set; }
+
+            public string model { get; set; }
+
+            public Category selectedcategory { get; set; }
+
+            public IList<Category> preferredcategories { get; set; }
+        }
+
+        private class Category
+        {
+            public int CategoryId { get; set; }
+            public CategoryName CategoryName { get; set; }
+        }
+
+        private class CategoryName
+        {
+            public string MainCategory { get; set; }
+            public string SubCategory { get; set; }
+        }
+
+        private static class AStaticClass
+        {
+            public static string Model { get; set; }
+            public static string Test { get; set; }
+        }
+
+        private static class AnotherStaticClass
+        {
+            public static Model.Model Model { get; set; }
+            public static Model.Model Test { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ExpressionMetadataProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ExpressionMetadataProviderTest.cs
new file mode 100644
index 0000000000..44d421c376
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ExpressionMetadataProviderTest.cs
@@ -0,0 +1,235 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class ExpressionMetadataProviderTest
+    {
+        private string PrivateProperty { get; set; }
+
+        public static string StaticProperty { get; set; }
+
+        public string Field = "Hello";
+
+        [Fact]
+        public void FromLambdaExpression_GetsExpectedMetadata_ForIdentityExpression()
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var viewData = new ViewDataDictionary<TestModel>(provider);
+
+            // Act
+            var explorer = ExpressionMetadataProvider.FromLambdaExpression(m => m, viewData, provider);
+
+            // Assert
+            Assert.NotNull(explorer);
+            Assert.NotNull(explorer.Metadata);
+            Assert.Equal(ModelMetadataKind.Type, explorer.Metadata.MetadataKind);
+            Assert.Equal(typeof(TestModel), explorer.ModelType);
+            Assert.Null(explorer.Model);
+        }
+
+        [Fact]
+        public void FromLambdaExpression_GetsExpectedMetadata_ForPropertyExpression()
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var viewData = new ViewDataDictionary<TestModel>(provider);
+
+            // Act
+            var explorer = ExpressionMetadataProvider.FromLambdaExpression(m => m.SelectedCategory, viewData, provider);
+
+            // Assert
+            Assert.NotNull(explorer);
+            Assert.NotNull(explorer.Metadata);
+            Assert.Equal(ModelMetadataKind.Property, explorer.Metadata.MetadataKind);
+            Assert.Equal(typeof(Category), explorer.ModelType);
+            Assert.Null(explorer.Model);
+        }
+
+        [Fact]
+        public void FromLambdaExpression_GetsExpectedMetadata_ForIndexerExpression()
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var viewData = new ViewDataDictionary<TestModel[]>(provider);
+
+            // Act
+            var explorer = ExpressionMetadataProvider.FromLambdaExpression(m => m[23], viewData, provider);
+
+            // Assert
+            Assert.NotNull(explorer);
+            Assert.NotNull(explorer.Metadata);
+            Assert.Equal(ModelMetadataKind.Type, explorer.Metadata.MetadataKind);
+            Assert.Equal(typeof(TestModel), explorer.ModelType);
+            Assert.Null(explorer.Model);
+        }
+
+        [Fact]
+        public void FromLambdaExpression_GetsExpectedMetadata_ForLongerExpression()
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var viewData = new ViewDataDictionary<TestModel[]>(provider);
+            var index = 42;
+
+            // Act
+            var explorer = ExpressionMetadataProvider.FromLambdaExpression(
+                m => m[index].SelectedCategory.CategoryId,
+                viewData,
+                provider);
+
+            // Assert
+            Assert.NotNull(explorer);
+            Assert.NotNull(explorer.Metadata);
+            Assert.Equal(ModelMetadataKind.Property, explorer.Metadata.MetadataKind);
+            Assert.Equal(typeof(int), explorer.ModelType);
+            Assert.Null(explorer.Model);
+        }
+
+        [Fact]
+        public void FromLambaExpression_SetsContainerAsExpected()
+        {
+            // Arrange
+            var myModel = new TestModel { SelectedCategory = new Category() };
+            var provider = new EmptyModelMetadataProvider();
+            var viewData = new ViewDataDictionary<TestModel>(provider);
+            viewData.Model = myModel;
+
+            // Act
+            var metadata = ExpressionMetadataProvider.FromLambdaExpression<TestModel, Category>(
+                model => model.SelectedCategory,
+                viewData,
+                provider);
+
+            // Assert
+            Assert.Same(myModel, metadata.Container.Model);
+        }
+
+        [Theory]
+        [InlineData(null, ModelMetadataKind.Type, typeof(TestModel))]
+        [InlineData("", ModelMetadataKind.Type, typeof(TestModel))]
+        [InlineData("SelectedCategory", ModelMetadataKind.Property, typeof(Category))]
+        [InlineData("SelectedCategory.CategoryName", ModelMetadataKind.Type, typeof(string))]
+        public void FromStringExpression_GetsExpectedMetadata(
+            string expression,
+            ModelMetadataKind expectedKind,
+            Type expectedType)
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var viewData = new ViewDataDictionary<TestModel>(provider);
+
+            // Act
+            var explorer = ExpressionMetadataProvider.FromStringExpression(expression, viewData, provider);
+
+            // Assert
+            Assert.NotNull(explorer);
+            Assert.NotNull(explorer.Metadata);
+            Assert.Equal(expectedKind, explorer.Metadata.MetadataKind);
+            Assert.Equal(expectedType, explorer.ModelType);
+            Assert.Null(explorer.Model);
+        }
+
+        [Fact]
+        public void FromStringExpression_SetsContainerAsExpected()
+        {
+            // Arrange
+            var myModel = new TestModel { SelectedCategory = new Category() };
+            var provider = new EmptyModelMetadataProvider();
+            var viewData = new ViewDataDictionary<TestModel>(provider);
+            viewData["Object"] = myModel;
+
+            // Act
+            var metadata = ExpressionMetadataProvider.FromStringExpression("Object.SelectedCategory",
+                                                                           viewData,
+                                                                           provider);
+
+            // Assert
+            Assert.Same(myModel, metadata.Container.Model);
+        }
+
+        // A private property can't be found by the model metadata provider, so return the property's type
+        // as a best-effort mechanism.
+        [Fact]
+        public void FromLambdaExpression_ForPrivateProperty_ReturnsMetadataOfExpressionType()
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var viewData = new ViewDataDictionary<ExpressionMetadataProviderTest>(provider);
+
+            // Act
+            var explorer = ExpressionMetadataProvider.FromLambdaExpression(
+                m => m.PrivateProperty,
+                viewData,
+                provider);
+
+            // Assert
+            Assert.NotNull(explorer);
+            Assert.NotNull(explorer.Metadata);
+            Assert.Equal(ModelMetadataKind.Type, explorer.Metadata.MetadataKind);
+            Assert.Equal(typeof(string), explorer.ModelType);
+        }
+
+        // A static property can't be found by the model metadata provider, so return the property's type
+        // as a best-effort mechanism.
+        [Fact]
+        public void FromLambdaExpression_ForStaticProperty_ReturnsMetadataOfExpressionType()
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var viewData = new ViewDataDictionary<ExpressionMetadataProviderTest>(provider);
+
+            // Act
+            var explorer = ExpressionMetadataProvider.FromLambdaExpression(
+                m => ExpressionMetadataProviderTest.StaticProperty,
+                viewData,
+                provider);
+
+            // Assert
+            Assert.NotNull(explorer);
+            Assert.NotNull(explorer.Metadata);
+            Assert.Equal(ModelMetadataKind.Type, explorer.Metadata.MetadataKind);
+            Assert.Equal(typeof(string), explorer.ModelType);
+        }
+
+        // A field can't be found by the model metadata provider, so return the field's type
+        // as a best-effort mechanism.
+        [Fact]
+        public void FromLambdaExpression_ForField_ReturnsMetadataOfExpressionType()
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var viewData = new ViewDataDictionary<ExpressionMetadataProviderTest>(provider);
+
+            // Act
+            var explorer = ExpressionMetadataProvider.FromLambdaExpression(
+                m => m.Field,
+                viewData,
+                provider);
+
+            // Assert
+            Assert.NotNull(explorer);
+            Assert.NotNull(explorer.Metadata);
+            Assert.Equal(ModelMetadataKind.Type, explorer.Metadata.MetadataKind);
+            Assert.Equal(typeof(string), explorer.ModelType);
+        }
+
+        private class TestModel
+        {
+            public Category SelectedCategory { get; set; }
+        }
+
+        private class Category
+        {
+            public int CategoryId { get; set; }
+
+            public string CategoryName { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/FormatWeekHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/FormatWeekHelperTest.cs
new file mode 100644
index 0000000000..97f45f0c0f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/FormatWeekHelperTest.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class FormatWeekHelperTest
+    {
+        // See blog post: https://blogs.msdn.microsoft.com/shawnste/2006/01/24/iso-8601-week-of-year-format-in-microsoft-net/
+        [Theory]
+        [InlineData(2001, 1, 1, "2001-W01")]
+        [InlineData(2007, 12, 31, "2008-W01")]
+        [InlineData(2000, 12, 31, "2000-W52")]
+        [InlineData(2012, 1, 1, "2011-W52")]
+        [InlineData(2005, 1, 1, "2004-W53")]
+        [InlineData(2015, 12, 31, "2015-W53")]
+        public void GetFormattedWeek_ReturnsExpectedFormattedValue(int year, int month, int day, string expectedOutput)
+        {
+            // Arrange
+            var detailsProvider = new DefaultCompositeMetadataDetailsProvider(
+                Enumerable.Empty<IMetadataDetailsProvider>());
+            var key = ModelMetadataIdentity.ForType(typeof(DateTime));
+#pragma warning disable CS0618 // Type or member is obsolete
+            var cache = new DefaultMetadataDetails(key, new ModelAttributes(new object[0]));
+#pragma warning restore CS0618 // Type or member is obsolete
+
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = new DefaultModelMetadata(provider, detailsProvider, cache);
+            var model = new DateTime(year, month, day);
+            var modelExplorer = new ModelExplorer(provider, metadata, model);
+
+            // Act
+            var formattedValue = FormatWeekHelper.GetFormattedWeek(modelExplorer);
+
+            // Assert
+            Assert.Equal(expectedOutput, formattedValue);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/HtmlAttributePropertyHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/HtmlAttributePropertyHelperTest.cs
new file mode 100644
index 0000000000..00c7672240
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/HtmlAttributePropertyHelperTest.cs
@@ -0,0 +1,113 @@
+// 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.
+
+using System.Linq;
+using System.Reflection;
+using Microsoft.Extensions.Internal;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class HtmlAttributePropertyHelperTest
+    {
+        [Fact]
+        public void HtmlAttributePropertyHelper_RenamesPropertyNames()
+        {
+            // Arrange
+            var anonymous = new { bar_baz = "foo" };
+            var property = anonymous.GetType().GetTypeInfo().DeclaredProperties.First();
+
+            // Act
+            var helper = new HtmlAttributePropertyHelper(property);
+
+            // Assert
+            Assert.Equal("bar_baz", property.Name);
+            Assert.Equal("bar-baz", helper.Name);
+        }
+
+        [Fact]
+        public void HtmlAttributePropertyHelper_ReturnsNameCorrectly()
+        {
+            // Arrange
+            var anonymous = new { foo = "bar" };
+            var property = anonymous.GetType().GetTypeInfo().DeclaredProperties.First();
+
+            // Act
+            var helper = new HtmlAttributePropertyHelper(property);
+
+            // Assert
+            Assert.Equal("foo", property.Name);
+            Assert.Equal("foo", helper.Name);
+        }
+
+        [Fact]
+        public void HtmlAttributePropertyHelper_ReturnsValueCorrectly()
+        {
+            // Arrange
+            var anonymous = new { bar = "baz" };
+            var property = anonymous.GetType().GetTypeInfo().DeclaredProperties.First();
+
+            // Act
+            var helper = new HtmlAttributePropertyHelper(property);
+
+            // Assert
+            Assert.Equal("bar", helper.Name);
+            Assert.Equal("baz", helper.GetValue(anonymous));
+        }
+
+        [Fact]
+        public void HtmlAttributePropertyHelper_ReturnsValueCorrectly_ForValueTypes()
+        {
+            // Arrange
+            var anonymous = new { foo = 32 };
+            var property = anonymous.GetType().GetTypeInfo().DeclaredProperties.First();
+
+            // Act
+            var helper = new HtmlAttributePropertyHelper(property);
+
+            // Assert
+            Assert.Equal("foo", helper.Name);
+            Assert.Equal(32, helper.GetValue(anonymous));
+        }
+
+        [Fact]
+        public void HtmlAttributePropertyHelper_ReturnsCachedPropertyHelper()
+        {
+            // Arrange
+            var anonymous = new { foo = "bar" };
+
+            // Act
+            var helpers1 = HtmlAttributePropertyHelper.GetProperties(anonymous.GetType());
+            var helpers2 = HtmlAttributePropertyHelper.GetProperties(anonymous.GetType());
+
+            // Assert
+            Assert.Single(helpers1);
+            Assert.Same(helpers1, helpers2);
+            Assert.Same(helpers1[0], helpers2[0]);
+        }
+
+        [Fact]
+        public void HtmlAttributePropertyHelper_DoesNotShareCacheWithPropertyHelper()
+        {
+            // Arrange
+            var anonymous = new { bar_baz1 = "foo" };
+
+            // Act
+            var helpers1 = HtmlAttributePropertyHelper.GetProperties(anonymous.GetType());
+            var helpers2 = PropertyHelper.GetProperties(anonymous.GetType());
+
+            // Assert
+            Assert.Single(helpers1);
+            Assert.Single(helpers2);
+
+            Assert.NotEqual<PropertyHelper[]>(helpers1, helpers2);
+            Assert.NotEqual<PropertyHelper>(helpers1[0], helpers2[0]);
+
+            Assert.IsType<HtmlAttributePropertyHelper>(helpers1[0]);
+            Assert.IsNotType<HtmlAttributePropertyHelper>(helpers2[0]);
+
+            Assert.Equal("bar-baz1", helpers1[0].Name);
+            Assert.Equal("bar_baz1", helpers2[0].Name);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/LifecyclePropertyTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/LifecyclePropertyTest.cs
new file mode 100644
index 0000000000..87aa7dd5e7
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/LifecyclePropertyTest.cs
@@ -0,0 +1,94 @@
+// 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.
+
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class LifecyclePropertyTest
+    {
+        [Fact]
+        public void GetValue_GetsPropertyValue()
+        {
+            // Arrange
+            var propertyInfo = typeof(TestSubject).GetProperty(nameof(TestSubject.TestProperty));
+            var lifecycleProperty = new LifecycleProperty(propertyInfo, "test-key");
+            var subject = new TestSubject { TestProperty = "test-value" };
+
+            // Act
+            var value = lifecycleProperty.GetValue(subject);
+
+            // Assert
+            Assert.Equal("test-value", value);
+        }
+
+        [Fact]
+        public void SetValue_SetsPropertyValue()
+        {
+            // Arrange
+            var propertyInfo = typeof(TestSubject).GetProperty(nameof(TestSubject.TestProperty));
+            var lifecycleProperty = new LifecycleProperty(propertyInfo, "test-key");
+            var subject = new TestSubject { TestProperty = "test-value" };
+
+            // Act
+            lifecycleProperty.SetValue(subject, "new-value");
+
+            // Assert
+            Assert.Equal("new-value", subject.TestProperty);
+        }
+
+        [Fact]
+        public void SetValue_SetsNullPropertyValue()
+        {
+            // Arrange
+            var propertyInfo = typeof(TestSubject).GetProperty(nameof(TestSubject.TestProperty));
+            var lifecycleProperty = new LifecycleProperty(propertyInfo, "test-key");
+            var subject = new TestSubject { TestProperty = "test-value" };
+
+            // Act
+            lifecycleProperty.SetValue(subject, null);
+
+            // Assert
+            Assert.Null(subject.TestProperty);
+        }
+
+        [Fact]
+        public void SetValue_NoopsIfNullIsBeingAssignedToValueType()
+        {
+            // Arrange
+            var propertyInfo = typeof(TestSubject).GetProperty(nameof(TestSubject.ValueTypeProperty));
+            var lifecycleProperty = new LifecycleProperty(propertyInfo, "test-key");
+            var subject = new TestSubject { ValueTypeProperty = 42 };
+
+            // Act
+            lifecycleProperty.SetValue(subject, null);
+
+            // Assert
+            Assert.Equal(42, subject.ValueTypeProperty);
+        }
+
+        [Fact]
+        public void SetValue_SetsNullValue_ForNullableProperties()
+        {
+            // Arrange
+            var propertyInfo = typeof(TestSubject).GetProperty(nameof(TestSubject.NullableProperty));
+            var lifecycleProperty = new LifecycleProperty(propertyInfo, "test-key");
+            var subject = new TestSubject { NullableProperty = 42 };
+
+            // Act
+            lifecycleProperty.SetValue(subject, null);
+
+            // Assert
+            Assert.Null(subject.NullableProperty);
+        }
+
+        public class TestSubject
+        {
+            public string TestProperty { get; set; }
+
+            public int ValueTypeProperty { get; set; }
+
+            public int? NullableProperty { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/PagedBufferedTextWriterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/PagedBufferedTextWriterTest.cs
new file mode 100644
index 0000000000..42bc170a5d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/PagedBufferedTextWriterTest.cs
@@ -0,0 +1,358 @@
+// 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.
+
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class PagedBufferedTextWriterTest
+    {
+        private static readonly char[] Content;
+
+        static PagedBufferedTextWriterTest()
+        {
+            Content = new char[4 * PagedCharBuffer.PageSize];
+            for (var i = 0; i < Content.Length; i++)
+            {
+                Content[i] = (char)((i % 26) + 'A');
+            }
+        }
+
+        [Fact]
+        public async Task Write_Char()
+        {
+            // Arrange
+            var pool = new TestArrayPool();
+            var inner = new StringWriter();
+
+            var writer = new PagedBufferedTextWriter(pool, inner);
+
+            // Act
+            for (var i = 0; i < Content.Length; i++)
+            {
+                writer.Write(Content[i]);
+            }
+
+            await writer.FlushAsync();
+
+            // Assert
+            Assert.Equal<char>(Content, inner.ToString().ToCharArray());
+        }
+
+        [Fact]
+        public async Task Write_CharArray_Null()
+        {
+            // Arrange
+            var pool = new TestArrayPool();
+            var inner = new StringWriter();
+
+            var writer = new PagedBufferedTextWriter(pool, inner);
+
+            // Act
+            writer.Write((char[])null);
+
+            await writer.FlushAsync();
+
+            // Assert
+            Assert.Empty(inner.ToString());
+        }
+
+        [Fact]
+        public async Task Write_CharArray()
+        {
+            // Arrange
+            var pool = new TestArrayPool();
+            var inner = new StringWriter();
+
+            var writer = new PagedBufferedTextWriter(pool, inner);
+
+            // These numbers chosen to hit boundary conditions in buffer lengths
+            Assert.Equal(4096, Content.Length); // Update these numbers if this changes.
+            var chunkSizes = new int[] { 3, 1021, 1023, 1023, 1, 1, 1024 };
+
+            // Act
+            var offset = 0;
+            foreach (var chunkSize in chunkSizes)
+            {
+                var chunk = new char[chunkSize];
+                for (var j = 0; j < chunkSize; j++)
+                {
+                    chunk[j] = Content[offset + j];
+                }
+
+                writer.Write(chunk);
+                offset += chunkSize;
+            }
+
+            await writer.FlushAsync();
+
+            // Assert
+            var array = inner.ToString().ToCharArray();
+            for (var i = 0; i < Content.Length; i++)
+            {
+                Assert.Equal(Content[i], array[i]);
+            }
+
+            Assert.Equal<char>(Content, inner.ToString().ToCharArray());
+        }
+
+        [Fact]
+        public void Write_CharArray_Bounded_Null()
+        {
+            // Arrange
+            var pool = new TestArrayPool();
+            var inner = new StringWriter();
+
+            var writer = new PagedBufferedTextWriter(pool, inner);
+
+            // Act & Assert
+            Assert.Throws<ArgumentNullException>("buffer", () => writer.Write(null, 0, 0));
+        }
+
+        [Fact]
+        public async Task Write_CharArray_Bounded()
+        {
+            // Arrange
+            var pool = new TestArrayPool();
+            var inner = new StringWriter();
+
+            var writer = new PagedBufferedTextWriter(pool, inner);
+
+            // These numbers chosen to hit boundary conditions in buffer lengths
+            Assert.Equal(4096, Content.Length); // Update these numbers if this changes.
+            var chunkSizes = new int[] { 3, 1021, 1023, 1023, 1, 1, 1024 };
+
+            // Act
+            var offset = 0;
+            foreach (var chunkSize in chunkSizes)
+            {
+                writer.Write(Content, offset, chunkSize);
+                offset += chunkSize;
+            }
+
+            await writer.FlushAsync();
+
+            // Assert
+            Assert.Equal<char>(Content, inner.ToString().ToCharArray());
+        }
+
+        [Fact]
+        public async Task Write_String_Null()
+        {
+            // Arrange
+            var pool = new TestArrayPool();
+            var inner = new StringWriter();
+
+            var writer = new PagedBufferedTextWriter(pool, inner);
+
+            // Act
+            writer.Write((string)null);
+
+            await writer.FlushAsync();
+
+            // Assert
+            Assert.Empty(inner.ToString());
+        }
+
+        [Fact]
+        public async Task Write_String()
+        {
+            // Arrange
+            var pool = new TestArrayPool();
+            var inner = new StringWriter();
+
+            var writer = new PagedBufferedTextWriter(pool, inner);
+
+            // These numbers chosen to hit boundary conditions in buffer lengths
+            Assert.Equal(4096, Content.Length); // Update these numbers if this changes.
+            var chunkSizes = new int[] { 3, 1021, 1023, 1023, 1, 1, 1024 };
+
+            // Act
+            var offset = 0;
+            foreach (var chunkSize in chunkSizes)
+            {
+                var chunk = new string(Content, offset, chunkSize);
+                writer.Write(chunk);
+                offset += chunkSize;
+            }
+
+            await writer.FlushAsync();
+
+            // Assert
+            Assert.Equal<char>(Content, inner.ToString().ToCharArray());
+        }
+
+        [Fact]
+        public async Task SynchronousWrites_FollowedByAsyncWriteString_WritesAllContent()
+        {
+            // Arrange
+            var pool = new TestArrayPool();
+            var inner = new StringWriter();
+
+            var writer = new PagedBufferedTextWriter(new TestArrayPool(), inner);
+
+            // Act
+            writer.Write('a');
+            writer.Write(new[] { 'b', 'c', 'd' });
+            writer.Write("ef");
+            await writer.WriteAsync("ghi");
+
+            // Assert
+            Assert.Equal("abcdefghi", inner.ToString());
+        }
+
+        [Fact]
+        public async Task SynchronousWrites_FollowedByAsyncWriteChar_WritesAllContent()
+        {
+            // Arrange
+            var pool = new TestArrayPool();
+            var inner = new StringWriter();
+
+            var writer = new PagedBufferedTextWriter(new TestArrayPool(), inner);
+
+            // Act
+            writer.Write('a');
+            writer.Write(new[] { 'b', 'c', 'd' });
+            writer.Write("ef");
+            await writer.WriteAsync('g');
+
+            // Assert
+            Assert.Equal("abcdefg", inner.ToString());
+        }
+
+        [Fact]
+        public async Task SynchronousWrites_FollowedByAsyncWriteCharArray_WritesAllContent()
+        {
+            // Arrange
+            var pool = new TestArrayPool();
+            var inner = new StringWriter();
+
+            var writer = new PagedBufferedTextWriter(new TestArrayPool(), inner);
+
+            // Act
+            writer.Write('a');
+            writer.Write(new[] { 'b', 'c', 'd' });
+            writer.Write("ef");
+            await writer.WriteAsync(new[] { 'g', 'h', 'i' });
+
+            // Assert
+            Assert.Equal("abcdefghi", inner.ToString());
+        }
+
+        [Fact]
+        public async Task FlushAsync_ReturnsPages()
+        {
+            // Arrange
+            var pool = new TestArrayPool();
+            var inner = new StringWriter();
+
+            var writer = new PagedBufferedTextWriter(pool, inner);
+
+            for (var i = 0; i < Content.Length; i++)
+            {
+                writer.Write(Content[i]);
+            }
+
+            // Act
+            await writer.FlushAsync();
+
+            // Assert
+            Assert.Equal(3, pool.Returned.Count);
+        }
+
+        [Fact]
+        public async Task FlushAsync_FlushesContent()
+        {
+            // Arrange
+            var pool = new TestArrayPool();
+            var inner = new StringWriter();
+
+            var writer = new PagedBufferedTextWriter(pool, inner);
+            for (var i = 0; i < Content.Length; i++)
+            {
+                writer.Write(Content[i]);
+            }
+
+            // Act
+            await writer.FlushAsync();
+
+            // Assert
+            Assert.Equal<char>(Content, inner.ToString().ToCharArray());
+        }
+
+        [Fact]
+        public async Task FlushAsync_WritesContentToInner()
+        {
+            // Arrange
+            var pool = new TestArrayPool();
+            var inner = new StringWriter();
+
+            var writer = new PagedBufferedTextWriter(pool, inner);
+            for (var i = 0; i < Content.Length; i++)
+            {
+                writer.Write(Content[i]);
+            }
+
+            // Act
+            await writer.FlushAsync();
+
+            // Assert
+            Assert.Equal<char>(Content, inner.ToString().ToCharArray());
+        }
+
+        [Fact]
+        public async Task FlushAsync_WritesContentToInner_WithLargeArrays()
+        {
+            // Arrange
+            var pool = new RentMoreArrayPool();
+            var inner = new StringWriter();
+
+            var writer = new PagedBufferedTextWriter(pool, inner);
+            for (var i = 0; i < Content.Length; i++)
+            {
+                writer.Write(Content[i]);
+            }
+
+            // Act
+            await writer.FlushAsync();
+
+            // Assert
+            Assert.Equal<char>(Content, inner.ToString().ToCharArray());
+        }
+
+        private class TestArrayPool : ArrayPool<char>
+        {
+            public IList<char[]> Returned { get; } = new List<char[]>();
+
+            public override char[] Rent(int minimumLength)
+            {
+                return new char[minimumLength];
+            }
+
+            public override void Return(char[] buffer, bool clearArray = false)
+            {
+                Returned.Add(buffer);
+            }
+        }
+
+        private class RentMoreArrayPool : ArrayPool<char>
+        {
+            public IList<char[]> Returned { get; } = new List<char[]>();
+
+            public override char[] Rent(int minimumLength)
+            {
+                return new char[2 * minimumLength];
+            }
+
+            public override void Return(char[] buffer, bool clearArray = false)
+            {
+                Returned.Add(buffer);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/PagedCharBufferTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/PagedCharBufferTest.cs
new file mode 100644
index 0000000000..28944150ff
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/PagedCharBufferTest.cs
@@ -0,0 +1,483 @@
+// 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.
+
+using System.Linq;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class PagedCharBufferTest
+    {
+        [Fact]
+        public void AppendWithChar_AddsCharacterToPage()
+        {
+            // Arrange
+            var charToAppend = 't';
+            var buffer = new PagedCharBuffer(new CharArrayBufferSource());
+
+            // Act
+            buffer.Append(charToAppend);
+
+            // Assert
+            var page = Assert.Single(buffer.Pages);
+            Assert.Equal(1, buffer.Length);
+            Assert.Equal(charToAppend, page[buffer.Length - 1]);
+        }
+
+        [Fact]
+        public void AppendWithChar_AddsCharacterToNewPage()
+        {
+            // Arrange
+            var stringToAppend = new string('a', PagedCharBuffer.PageSize);
+            var charToAppend = 't';
+            var buffer = new PagedCharBuffer(new CharArrayBufferSource());
+
+            // Act
+            buffer.Append(stringToAppend);
+            buffer.Append(charToAppend);
+
+            // Assert
+            Assert.Collection(buffer.Pages,
+                page => Assert.Equal(stringToAppend.ToCharArray(), page),
+                page => Assert.Equal(charToAppend, page[0]));
+            Assert.Equal(1 + PagedCharBuffer.PageSize, buffer.Length);
+        }
+
+        [Fact]
+        public void AppendWithChar_AppendsToTheCurrentPageIfItIsNotFull()
+        {
+            // Arrange
+            var stringToAppend = "abc";
+            var charToAppend = 't';
+            var buffer = new PagedCharBuffer(new CharArrayBufferSource());
+
+            // Act
+            buffer.Append(stringToAppend);
+            buffer.Append(charToAppend);
+
+            // Assert
+            var page = Assert.Single(buffer.Pages);
+            Assert.Equal(new[] { 'a', 'b', 'c', 't' }, page.Take(4));
+            Assert.Equal(4, buffer.Length);
+        }
+
+        [Fact]
+        public void AppendWithChar_AppendsLastCharacterToTheCurrentPage()
+        {
+            // Arrange
+            var stringToAppend = new string('a', PagedCharBuffer.PageSize - 1);
+            var charToAppend = 't';
+            var buffer = new PagedCharBuffer(new CharArrayBufferSource());
+
+            // Act
+            buffer.Append(stringToAppend);
+            buffer.Append(charToAppend);
+
+            // Assert
+            Assert.Equal(PagedCharBuffer.PageSize, buffer.Length);
+            var page = Assert.Single(buffer.Pages);
+            Assert.Equal(stringToAppend.ToCharArray(), page.Take(PagedCharBuffer.PageSize - 1));
+            Assert.Equal('t', page[PagedCharBuffer.PageSize - 1]);
+        }
+
+        [Fact]
+        public void AppendWithChar_AddsCharacterToNewPage_AfterLengthFallback()
+        {
+            // Arrange
+            // Imitate ArrayPool<char>.Shared after it falls back from its default char[1024] Bucket to the next one.
+            var bufferSource = new Mock<ICharBufferSource>();
+            bufferSource
+                .Setup(s => s.Rent(PagedCharBuffer.PageSize))
+                .Returns(() => new char[2 * PagedCharBuffer.PageSize]);
+            var buffer = new PagedCharBuffer(bufferSource.Object);
+
+            var stringToAppend = new string('a', 2 * PagedCharBuffer.PageSize);
+            var charToAppend = 't';
+
+            // Act
+            buffer.Append(stringToAppend);
+            buffer.Append(charToAppend);
+
+            // Assert
+            Assert.Equal(2 * PagedCharBuffer.PageSize + 1, buffer.Length);
+            Assert.Collection(buffer.Pages,
+                page => Assert.Equal(stringToAppend.ToCharArray(), page),
+                page => Assert.Equal(charToAppend, page[0]));
+        }
+
+        [Fact]
+        public void AppendWithChar_AppendsLastCharacterToTheCurrentPage_AfterLengthFallback()
+        {
+            // Arrange
+            // Imitate ArrayPool<char>.Shared after it falls back from its default char[1024] Bucket to the next one.
+            var bufferSource = new Mock<ICharBufferSource>();
+            bufferSource
+                .Setup(s => s.Rent(PagedCharBuffer.PageSize))
+                .Returns(new char[2 * PagedCharBuffer.PageSize]);
+            var buffer = new PagedCharBuffer(bufferSource.Object);
+
+            var stringToAppend = new string('a', 2 * PagedCharBuffer.PageSize - 1);
+            var charToAppend = 't';
+
+            // Act
+            buffer.Append(stringToAppend);
+            buffer.Append(charToAppend);
+
+            // Assert
+            Assert.Equal(2 * PagedCharBuffer.PageSize, buffer.Length);
+            var page = Assert.Single(buffer.Pages);
+            Assert.Equal(stringToAppend.ToCharArray(), page.Take(2 * PagedCharBuffer.PageSize - 1));
+            Assert.Equal('t', page[2 * PagedCharBuffer.PageSize - 1]);
+        }
+
+        [Fact]
+        public void AppendWithString_AppendsToPage()
+        {
+            // Arrange
+            var stringToAppend = "abc";
+            var buffer = new PagedCharBuffer(new CharArrayBufferSource());
+
+            // Act
+            buffer.Append(stringToAppend);
+
+            // Assert
+            Assert.Equal(3, buffer.Length);
+            var page = Assert.Single(buffer.Pages);
+            Assert.Equal(new[] { 'a', 'b', 'c' }, page.Take(buffer.Length));
+        }
+
+        [Fact]
+        public void AppendWithString_AppendsToMultiplePages()
+        {
+            // Arrange
+            var length = 2 * PagedCharBuffer.PageSize + 1;
+            var expected = Enumerable.Repeat('d', PagedCharBuffer.PageSize);
+            var stringToAppend = new string('d', length);
+            var buffer = new PagedCharBuffer(new CharArrayBufferSource());
+
+            // Act
+            buffer.Append(stringToAppend);
+
+            // Assert
+            Assert.Equal(length, buffer.Length);
+            Assert.Collection(
+                buffer.Pages,
+                page => Assert.Equal(expected, page),
+                page => Assert.Equal(expected, page),
+                page => Assert.Equal('d', page[0]));
+        }
+
+        [Fact]
+        public void AppendWithString_AppendsToMultiplePages_AsLengthFallsBack()
+        {
+            // Arrange
+            // Imitate ArrayPool<char>.Shared as it falls back from its default char[1024] Bucket to the next one.
+            var bufferSource = new Mock<ICharBufferSource>();
+            bufferSource
+                .SetupSequence(s => s.Rent(PagedCharBuffer.PageSize))
+                .Returns(new char[PagedCharBuffer.PageSize])
+                .Returns(new char[2 * PagedCharBuffer.PageSize]);
+            var buffer = new PagedCharBuffer(bufferSource.Object);
+
+            // Request enough space that transition should occur.
+            var length = 2 * PagedCharBuffer.PageSize + 1;
+            var expected1 = Enumerable.Repeat('d', PagedCharBuffer.PageSize);
+            var expected2 = Enumerable.Repeat('d', PagedCharBuffer.PageSize + 1);
+            var laterString = new string('d', PagedCharBuffer.PageSize);
+
+            // Act (loop within first Append(string) call).
+            buffer.Append('d');
+            buffer.Append(laterString);
+            buffer.Append(laterString);
+
+            // Assert
+            Assert.Equal(length, buffer.Length);
+            Assert.Collection(
+                buffer.Pages,
+                page => Assert.Equal(expected1, page),
+                page => Assert.Equal(expected2, page.Take(PagedCharBuffer.PageSize + 1)));
+        }
+
+        [Fact]
+        public void AppendWithString_AppendsToMultiplePages_AsLengthReturnsToNormal()
+        {
+            // Arrange
+            // Imitate ArrayPool<char>.Shared just after an entry in its default char[1024] Bucket is returned.
+            var bufferSource = new Mock<ICharBufferSource>();
+            bufferSource
+                .SetupSequence(s => s.Rent(PagedCharBuffer.PageSize))
+                .Returns(new char[2 * PagedCharBuffer.PageSize])
+                .Returns(new char[PagedCharBuffer.PageSize]);
+            var buffer = new PagedCharBuffer(bufferSource.Object);
+
+            // Request enough space that transition should occur.
+            var length = 2 * PagedCharBuffer.PageSize + 1;
+            var expected = Enumerable.Repeat('d', 2 * PagedCharBuffer.PageSize);
+            var laterString = new string('d', PagedCharBuffer.PageSize);
+
+            // Act (loop within second Append(string) call).
+            buffer.Append('d');
+            buffer.Append(laterString);
+            buffer.Append(laterString);
+
+            // Assert
+            Assert.Equal(length, buffer.Length);
+            Assert.Collection(
+                buffer.Pages,
+                page => Assert.Equal(expected, page),
+                page => Assert.Equal('d', page[0]));
+        }
+
+        [Fact]
+        public void AppendWithString_AppendsToMultiplePages_AfterLengthFallback()
+        {
+            // Arrange
+            // Imitate ArrayPool<char>.Shared after it falls back from its default char[1024] Bucket to the next one.
+            var bufferSource = new Mock<ICharBufferSource>();
+            bufferSource
+                .Setup(s => s.Rent(PagedCharBuffer.PageSize))
+                .Returns(() => new char[2 * PagedCharBuffer.PageSize]);
+            var buffer = new PagedCharBuffer(bufferSource.Object);
+
+            // Request enough space that transition should occur.
+            var length = 2 * PagedCharBuffer.PageSize + 1;
+            var expected = Enumerable.Repeat('d', 2 * PagedCharBuffer.PageSize);
+            var laterString = new string('d', PagedCharBuffer.PageSize);
+
+            // Act (loop within second Append(string) call).
+            buffer.Append('d');
+            buffer.Append(laterString);
+            buffer.Append(laterString);
+
+            // Assert
+            Assert.Equal(length, buffer.Length);
+            Assert.Collection(
+                buffer.Pages,
+                page => Assert.Equal(expected, page),
+                page => Assert.Equal('d', page[0]));
+        }
+
+        [Fact]
+        public void AppendWithString_AppendsToTheCurrentPageIfItIsNotEmpty()
+        {
+            // Arrange
+            var string1 = "abc";
+            var string2 = "def";
+            var buffer = new PagedCharBuffer(new CharArrayBufferSource());
+
+            // Act
+            buffer.Append(string1);
+            buffer.Append(string2);
+
+            // Assert
+            Assert.Equal(6, buffer.Length);
+            var page = Assert.Single(buffer.Pages);
+            Assert.Equal(new[] { 'a', 'b', 'c', 'd', 'e', 'f' }, page.Take(buffer.Length));
+        }
+
+        [Fact]
+        public void AppendWithCharArray_AppendsToPage()
+        {
+            // Arrange
+            var charsToAppend = new[] { 'a', 'b', 'c', 'd' };
+            var buffer = new PagedCharBuffer(new CharArrayBufferSource());
+
+            // Act
+            buffer.Append(charsToAppend, 1, 3);
+
+            // Assert
+            Assert.Equal(3, buffer.Length);
+            var page = Assert.Single(buffer.Pages);
+            Assert.Equal(new[] { 'b', 'c', 'd' }, page.Take(buffer.Length));
+        }
+
+        [Fact]
+        public void AppendWithCharArray_AppendsToMultiplePages()
+        {
+            // Arrange
+            var ch = 'e';
+            var length = PagedCharBuffer.PageSize * 2 + 3;
+            var charsToAppend = Enumerable.Repeat(ch, 2 * length).ToArray();
+            var expected = Enumerable.Repeat(ch, PagedCharBuffer.PageSize);
+            var buffer = new PagedCharBuffer(new CharArrayBufferSource());
+
+            // Act
+            buffer.Append(charsToAppend, 0, length);
+
+            // Assert
+            Assert.Equal(length, buffer.Length);
+            Assert.Collection(buffer.Pages,
+                page => Assert.Equal(expected, page),
+                page => Assert.Equal(expected, page),
+                page =>
+                {
+                    Assert.Equal(ch, page[0]);
+                    Assert.Equal(ch, page[1]);
+                    Assert.Equal(ch, page[2]);
+                });
+        }
+
+        [Fact]
+        public void AppendWithCharArray_AppendsToMultiplePages_AsLengthFallsBack()
+        {
+            // Arrange
+            // Imitate ArrayPool<char>.Shared as it falls back from its default char[1024] Bucket to the next one.
+            var bufferSource = new Mock<ICharBufferSource>();
+            bufferSource
+                .SetupSequence(s => s.Rent(PagedCharBuffer.PageSize))
+                .Returns(new char[PagedCharBuffer.PageSize])
+                .Returns(new char[2 * PagedCharBuffer.PageSize]);
+            var buffer = new PagedCharBuffer(bufferSource.Object);
+
+            // Request enough space that transition should occur.
+            var length = 2 * PagedCharBuffer.PageSize + 1;
+            var expected1 = Enumerable.Repeat('d', PagedCharBuffer.PageSize);
+            var expected2 = Enumerable.Repeat('d', PagedCharBuffer.PageSize + 1);
+            var laterChars = new string('d', PagedCharBuffer.PageSize).ToCharArray();
+
+            // Act (loop within first Append(char[]) call).
+            buffer.Append('d');
+            buffer.Append(laterChars, 0, laterChars.Length);
+            buffer.Append(laterChars, 0, laterChars.Length);
+
+            // Assert
+            Assert.Equal(length, buffer.Length);
+            Assert.Collection(
+                buffer.Pages,
+                page => Assert.Equal(expected1, page),
+                page => Assert.Equal(expected2, page.Take(PagedCharBuffer.PageSize + 1)));
+        }
+
+        [Fact]
+        public void AppendWithCharArray_AppendsToMultiplePages_AsLengthReturnsToNormal()
+        {
+            // Arrange
+            // Imitate ArrayPool<char>.Shared just after an entry in its default char[1024] Bucket is returned.
+            var bufferSource = new Mock<ICharBufferSource>();
+            bufferSource
+                .SetupSequence(s => s.Rent(PagedCharBuffer.PageSize))
+                .Returns(new char[2 * PagedCharBuffer.PageSize])
+                .Returns(new char[PagedCharBuffer.PageSize]);
+            var buffer = new PagedCharBuffer(bufferSource.Object);
+
+            // Request enough space that transition should occur.
+            var length = 2 * PagedCharBuffer.PageSize + 1;
+            var expected = Enumerable.Repeat('d', 2 * PagedCharBuffer.PageSize);
+            var laterChars = new string('d', PagedCharBuffer.PageSize).ToCharArray();
+
+            // Act (loop within second Append(char[]) call).
+            buffer.Append('d');
+            buffer.Append(laterChars, 0, laterChars.Length);
+            buffer.Append(laterChars, 0, laterChars.Length);
+
+            // Assert
+            Assert.Equal(length, buffer.Length);
+            Assert.Collection(
+                buffer.Pages,
+                page => Assert.Equal(expected, page),
+                page => Assert.Equal('d', page[0]));
+        }
+
+        [Fact]
+        public void AppendWithCharArray_AppendsToMultiplePages_AfterLengthFallback()
+        {
+            // Arrange
+            // Imitate ArrayPool<char>.Shared after it falls back from its default char[1024] Bucket to the next one.
+            var bufferSource = new Mock<ICharBufferSource>();
+            bufferSource
+                .Setup(s => s.Rent(PagedCharBuffer.PageSize))
+                .Returns(() => new char[2 * PagedCharBuffer.PageSize]);
+            var buffer = new PagedCharBuffer(bufferSource.Object);
+
+            // Request enough space that transition should occur.
+            var length = 2 * PagedCharBuffer.PageSize + 1;
+            var expected = Enumerable.Repeat('d', 2 * PagedCharBuffer.PageSize);
+            var laterChars = new string('d', PagedCharBuffer.PageSize).ToCharArray();
+
+            // Act (loop within second Append(char[]) call).
+            buffer.Append('d');
+            buffer.Append(laterChars, 0, laterChars.Length);
+            buffer.Append(laterChars, 0, laterChars.Length);
+
+            // Assert
+            Assert.Equal(length, buffer.Length);
+            Assert.Collection(
+                buffer.Pages,
+                page => Assert.Equal(expected, page),
+                page => Assert.Equal('d', page[0]));
+        }
+
+        [Fact]
+        public void AppendWithCharArray_AppendsToCurrentPage()
+        {
+            // Arrange
+            var arrayToAppend = new[] { 'c', 'd', 'e' };
+            var buffer = new PagedCharBuffer(new CharArrayBufferSource());
+
+            // Act
+            buffer.Append("Ab");
+            buffer.Append(arrayToAppend, 0, arrayToAppend.Length);
+
+            // Assert
+            Assert.Equal(5, buffer.Length);
+            var page = Assert.Single(buffer.Pages);
+            Assert.Equal(new[] { 'A', 'b', 'c', 'd', 'e' }, page.Take(buffer.Length));
+        }
+
+        [Fact]
+        public void Clear_WorksIfBufferHasNotBeenWrittenTo()
+        {
+            // Arrange
+            var buffer = new PagedCharBuffer(new CharArrayBufferSource());
+
+            // Act
+            buffer.Clear();
+
+            // Assert
+            Assert.Equal(0, buffer.Length);
+        }
+
+        [Fact]
+        public void Clear_ReturnsPagesToBufferSource()
+        {
+            // Arrange
+            var bufferSource = new Mock<ICharBufferSource>();
+            bufferSource.Setup(s => s.Rent(PagedCharBuffer.PageSize))
+                .Returns(new char[PagedCharBuffer.PageSize]);
+            var buffer = new PagedCharBuffer(bufferSource.Object);
+
+            // Act
+            buffer.Append(new string('a', PagedCharBuffer.PageSize * 3 + 4));
+            buffer.Clear();
+
+            // Assert
+            Assert.Equal(0, buffer.Length);
+            bufferSource.Verify(s => s.Return(It.IsAny<char[]>()), Times.Exactly(3));
+        }
+
+        [Fact]
+        public void UseAfterClear_Works()
+        {
+            // Arrange
+            var buffer = new PagedCharBuffer(new CharArrayBufferSource());
+
+            // Act - 1
+            buffer.Append(new string('a', PagedCharBuffer.PageSize));
+            buffer.Append(new string('b', 10));
+            buffer.Clear();
+
+            // Assert - 1
+            Assert.Equal(0, buffer.Length);
+            Assert.Equal(1, buffer.Pages.Count);
+
+            // Act - 2
+            buffer.Append("efgh");
+
+            // Assert - 2
+            Assert.Equal(4, buffer.Length);
+            Assert.Equal(1, buffer.Pages.Count);
+            Assert.Equal(new[] { 'e', 'f', 'g', 'h' }, buffer.Pages[0].Take(buffer.Length));
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/SaveTempDataFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/SaveTempDataFilterTest.cs
new file mode 100644
index 0000000000..9ccf374554
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/SaveTempDataFilterTest.cs
@@ -0,0 +1,440 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Routing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class SaveTempDataFilterTest
+    {
+        public static TheoryData<IActionResult> ActionResultsData
+        {
+            get
+            {
+                return new TheoryData<IActionResult>()
+                {
+                    new TestActionResult(),
+                    new TestKeepTempDataActionResult()
+                };
+            }
+        }
+
+        [Fact]
+        public async Task OnResultExecuting_DoesntThrowIfResponseStarted()
+        {
+            // Arrange
+            var responseFeature = new TestResponseFeature(hasStarted: true);
+            var httpContext = GetHttpContext(responseFeature);
+            var tempDataFactory = new Mock<ITempDataDictionaryFactory>(MockBehavior.Loose);
+            tempDataFactory
+                .Setup(f => f.GetTempData(It.IsAny<HttpContext>()))
+                .Verifiable();
+            var filter = new SaveTempDataFilter(tempDataFactory.Object);
+            var context = GetResultExecutingContext(httpContext);
+            filter.OnResultExecuting(context);
+
+            // Act
+            // Checking it doesn't throw
+            await responseFeature.FireOnSendingHeadersAsync();
+        }
+
+        [Fact]
+        public void OnResourceExecuting_RegistersOnStartingCallback()
+        {
+            // Arrange
+            var responseFeature = new Mock<IHttpResponseFeature>(MockBehavior.Strict);
+            responseFeature
+                .Setup(rf => rf.OnStarting(It.IsAny<Func<object, Task>>(), It.IsAny<object>()))
+                .Verifiable();
+            responseFeature
+                .SetupGet(rf => rf.HasStarted)
+                .Returns(false);
+
+            var tempDataFactory = new Mock<ITempDataDictionaryFactory>(MockBehavior.Strict);
+            tempDataFactory
+                .Setup(f => f.GetTempData(It.IsAny<HttpContext>()))
+                .Verifiable();
+            var filter = new SaveTempDataFilter(tempDataFactory.Object);
+            var httpContext = GetHttpContext(responseFeature.Object);
+            var context = GetResourceExecutingContext(httpContext);
+
+            // Act
+            filter.OnResourceExecuting(context);
+
+            // Assert
+            responseFeature.Verify();
+            tempDataFactory.Verify(tdf => tdf.GetTempData(It.IsAny<HttpContext>()), Times.Never());
+        }
+
+        [Fact]
+        public void OnResultExecuted_CanBeCalledTwice()
+        {
+            // Arrange
+            var responseFeature = new TestResponseFeature();
+            var httpContext = GetHttpContext(responseFeature);
+            var tempData = GetTempDataDictionary();
+            var tempDataFactory = new Mock<ITempDataDictionaryFactory>(MockBehavior.Strict);
+            tempDataFactory
+                .Setup(f => f.GetTempData(It.IsAny<HttpContext>()))
+                .Returns(tempData.Object)
+                .Verifiable();
+            var filter = new SaveTempDataFilter(tempDataFactory.Object);
+            var context = GetResultExecutedContext(httpContext);
+
+            // Act (No Assert)
+            filter.OnResultExecuted(context);
+            // Shouldn't have thrown
+            filter.OnResultExecuted(context);
+        }
+
+        [Fact]
+        public async Task OnResourceExecuting_DoesNotSaveTempData_WhenTempDataAlreadySaved()
+        {
+            // Arrange
+            var responseFeature = new TestResponseFeature();
+            var httpContext = GetHttpContext(responseFeature);
+            httpContext.Items[SaveTempDataFilter.SaveTempDataFilterContextKey] = new SaveTempDataFilter.SaveTempDataContext() { TempDataSaved = true };
+            var tempDataFactory = new Mock<ITempDataDictionaryFactory>(MockBehavior.Strict);
+            tempDataFactory
+                .Setup(f => f.GetTempData(It.IsAny<HttpContext>()))
+                .Verifiable();
+            var filter = new SaveTempDataFilter(tempDataFactory.Object);
+            var context = GetResourceExecutingContext(httpContext);
+            filter.OnResourceExecuting(context); // registers callback
+
+            // Act
+            await responseFeature.FireOnSendingHeadersAsync();
+
+            // Assert
+            tempDataFactory.Verify(tdf => tdf.GetTempData(It.IsAny<HttpContext>()), Times.Never());
+        }
+
+        [Fact]
+        public async Task OnResourceExecuting_DoesNotSaveTempData_WhenUnhandledExceptionOccurs()
+        {
+            // Arrange
+            var responseFeature = new TestResponseFeature();
+            var httpContext = GetHttpContext(responseFeature);
+            httpContext.Items[SaveTempDataFilter.SaveTempDataFilterContextKey] = new SaveTempDataFilter.SaveTempDataContext() { RequestHasUnhandledException = true };
+            var tempDataFactory = new Mock<ITempDataDictionaryFactory>(MockBehavior.Strict);
+            tempDataFactory
+                .Setup(f => f.GetTempData(It.IsAny<HttpContext>()))
+                .Verifiable();
+            var filter = new SaveTempDataFilter(tempDataFactory.Object);
+            var context = GetResourceExecutingContext(httpContext);
+            filter.OnResourceExecuting(context); // registers callback
+
+            // Act
+            await responseFeature.FireOnSendingHeadersAsync();
+
+            // Assert
+            tempDataFactory.Verify(tdf => tdf.GetTempData(It.IsAny<HttpContext>()), Times.Never());
+        }
+
+        [Theory]
+        [MemberData(nameof(ActionResultsData))]
+        public async Task OnResultExecuting_SavesTempData_WhenTempData_NotSavedAlready(IActionResult result)
+        {
+            // Arrange
+            var tempDataDictionary = GetTempDataDictionary();
+            var filter = GetFilter(tempDataDictionary.Object);
+            var responseFeature = new TestResponseFeature();
+            var httpContext = GetHttpContext(responseFeature);
+            var resourceContext = GetResourceExecutingContext(httpContext);
+            var resultContext = GetResultExecutedContext(httpContext, result);
+
+            filter.OnResourceExecuting(resourceContext); // registers callback
+            filter.OnResultExecuted(resultContext);
+            // Act
+            await responseFeature.FireOnSendingHeadersAsync();
+
+            // Assert
+            tempDataDictionary.Verify(tdd => tdd.Save(), Times.Once());
+        }
+
+        [Fact]
+        public async Task OnResourceExecuting_KeepsTempData_ForIKeepTempDataResult()
+        {
+            // Arrange
+            var tempDataDictionary = GetTempDataDictionary();
+            var filter = GetFilter(tempDataDictionary.Object);
+            var responseFeature = new TestResponseFeature();
+            var httpContext = GetHttpContext(responseFeature);
+            var resourceContext = GetResourceExecutingContext(httpContext);
+            var resultContext = GetResultExecutedContext(httpContext, new TestKeepTempDataActionResult());
+            filter.OnResourceExecuting(resourceContext); // registers callback
+            filter.OnResultExecuted(resultContext);
+
+            // Act
+            await responseFeature.FireOnSendingHeadersAsync();
+
+            // Assert
+            tempDataDictionary.Verify(tdf => tdf.Keep(), Times.Once());
+            tempDataDictionary.Verify(tdf => tdf.Save(), Times.Once());
+        }
+
+        [Fact]
+        public async Task OnResultExecuting_DoesNotKeepTempData_ForNonIKeepTempDataResult()
+        {
+            // Arrange
+            var tempDataDictionary = GetTempDataDictionary();
+            var filter = GetFilter(tempDataDictionary.Object);
+            var responseFeature = new TestResponseFeature();
+            var actionContext = GetHttpContext(responseFeature);
+            var context = GetResourceExecutingContext(actionContext);
+            filter.OnResourceExecuting(context); // registers callback
+
+            // Act
+            await responseFeature.FireOnSendingHeadersAsync();
+
+            // Assert
+            tempDataDictionary.Verify(tdf => tdf.Keep(), Times.Never());
+            tempDataDictionary.Verify(tdf => tdf.Save(), Times.Once());
+        }
+
+        [Fact]
+        public void OnResultExecuted_DoesNotSaveTempData_WhenResponseHas_AlreadyStarted()
+        {
+            // Arrange
+            var tempDataFactory = new Mock<ITempDataDictionaryFactory>(MockBehavior.Strict);
+            tempDataFactory
+                .Setup(f => f.GetTempData(It.IsAny<HttpContext>()))
+                .Verifiable();
+            var filter = new SaveTempDataFilter(tempDataFactory.Object);
+            var httpContext = GetHttpContext(new TestResponseFeature(hasStarted: true));
+            var context = GetResultExecutedContext(httpContext);
+
+            // Act
+            filter.OnResultExecuted(context);
+
+            // Assert
+            tempDataFactory.Verify(tdf => tdf.GetTempData(It.IsAny<HttpContext>()), Times.Never());
+        }
+
+        [Theory]
+        [MemberData(nameof(ActionResultsData))]
+        public void OnResultExecuted_SavesTempData_WhenResponseHas_NotStarted(IActionResult result)
+        {
+            // Arrange
+            var tempDataDictionary = GetTempDataDictionary();
+            var filter = GetFilter(tempDataDictionary.Object);
+            var context = GetResultExecutedContext(actionResult: result);
+
+            // Act
+            filter.OnResultExecuted(context);
+
+            // Assert
+            tempDataDictionary.Verify(tdf => tdf.Save(), Times.Once());
+        }
+
+        [Fact]
+        public void OnResultExecuted_KeepsTempData_ForIKeepTempDataResult()
+        {
+            // Arrange
+            var tempDataDictionary = GetTempDataDictionary();
+            var filter = GetFilter(tempDataDictionary.Object);
+            var context = GetResultExecutedContext(actionResult: new TestKeepTempDataActionResult());
+
+            // Act
+            filter.OnResultExecuted(context);
+
+            // Assert
+            tempDataDictionary.Verify(tdf => tdf.Keep(), Times.Once());
+            tempDataDictionary.Verify(tdf => tdf.Save(), Times.Once());
+        }
+
+        [Fact]
+        public void OnResultExecuted_DoesNotKeepTempData_ForNonIKeepTempDataResult()
+        {
+            // Arrange
+            var tempDataDictionary = GetTempDataDictionary();
+            var filter = GetFilter(tempDataDictionary.Object);
+            var context = GetResultExecutedContext(actionResult: new TestActionResult());
+
+            // Act
+            filter.OnResultExecuted(context);
+
+            // Assert
+            tempDataDictionary.Verify(tdf => tdf.Keep(), Times.Never());
+            tempDataDictionary.Verify(tdf => tdf.Save(), Times.Once());
+        }
+
+        private SaveTempDataFilter GetFilter(ITempDataDictionary tempDataDictionary)
+        {
+            var tempDataFactory = GetTempDataDictionaryFactory(tempDataDictionary);
+            return new SaveTempDataFilter(tempDataFactory.Object);
+        }
+
+        private Mock<ITempDataDictionaryFactory> GetTempDataDictionaryFactory(ITempDataDictionary tempDataDictionary)
+        {
+            var tempDataFactory = new Mock<ITempDataDictionaryFactory>(MockBehavior.Strict);
+            tempDataFactory
+                .Setup(f => f.GetTempData(It.IsAny<HttpContext>()))
+                .Returns(tempDataDictionary);
+            return tempDataFactory;
+        }
+
+        private Mock<ITempDataDictionary> GetTempDataDictionary()
+        {
+            var tempDataDictionary = new Mock<ITempDataDictionary>(MockBehavior.Strict);
+            tempDataDictionary
+                .Setup(tdd => tdd.Keep())
+                .Verifiable();
+            tempDataDictionary
+                .Setup(tdd => tdd.Save())
+                .Verifiable();
+            return tempDataDictionary;
+        }
+
+        private ResourceExecutingContext GetResourceExecutingContext(HttpContext httpContext)
+        {
+            if (httpContext == null)
+            {
+                httpContext = GetHttpContext();
+            }
+            var actionResult = new TestActionResult();
+
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var filters = new IFilterMetadata[] { };
+            var valueProviderFactories = new IValueProviderFactory[] { };
+
+            return new ResourceExecutingContext(actionContext, filters, valueProviderFactories);
+        }
+
+        private ResultExecutedContext GetResultExecutedContext(HttpContext httpContext = null, IActionResult actionResult = null)
+        {
+            if (httpContext == null)
+            {
+                httpContext = GetHttpContext();
+            }
+            if (actionResult == null)
+            {
+                actionResult = new TestActionResult();
+            }
+            return new ResultExecutedContext(
+                new ActionContext(httpContext, new RouteData(), new ActionDescriptor()),
+                new IFilterMetadata[] { },
+                actionResult,
+                new TestController());
+        }
+
+        private ResultExecutingContext GetResultExecutingContext(ActionContext actionContext, IActionResult actionResult = null)
+        {
+            if (actionResult == null)
+            {
+                actionResult = new TestActionResult();
+            }
+            return new ResultExecutingContext(
+                actionContext,
+                new IFilterMetadata[] { },
+                actionResult,
+                new TestController());
+        }
+
+        private ResultExecutingContext GetResultExecutingContext(HttpContext httpContext = null, IActionResult actionResult = null)
+        {
+            if (httpContext == null)
+            {
+                httpContext = new DefaultHttpContext();
+            }
+            if (actionResult == null)
+            {
+                actionResult = new TestActionResult();
+            }
+            return new ResultExecutingContext(
+                new ActionContext(httpContext, new RouteData(), new ActionDescriptor()),
+                new IFilterMetadata[] { },
+                new Mock<IActionResult>().Object,
+                new TestController());
+        }
+
+        private HttpContext GetHttpContext(IHttpResponseFeature responseFeature = null)
+        {
+            if (responseFeature == null)
+            {
+                responseFeature = new TestResponseFeature();
+            }
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<IHttpResponseFeature>(responseFeature);
+            return httpContext;
+        }
+
+        private ActionContext GetActionContext(HttpContext httpContext = null)
+        {
+            if (httpContext == null)
+            {
+                httpContext = GetHttpContext();
+            }
+            return new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+        }
+
+        private class TestController : Controller
+        {
+        }
+
+        private class TestActionResult : IActionResult
+        {
+            public Task ExecuteResultAsync(ActionContext context)
+            {
+                return context.HttpContext.Response.WriteAsync($"Hello from {nameof(TestActionResult)}");
+            }
+        }
+
+        private class TestKeepTempDataActionResult : IActionResult, IKeepTempDataResult
+        {
+            public Task ExecuteResultAsync(ActionContext context)
+            {
+                return context.HttpContext.Response.WriteAsync($"Hello from {nameof(TestKeepTempDataActionResult)}");
+            }
+        }
+
+        private class TestResponseFeature : HttpResponseFeature
+        {
+            private bool _hasStarted;
+            private Func<Task> _responseStartingAsync = () => Task.FromResult(true);
+
+            public TestResponseFeature(bool hasStarted = false)
+            {
+                _hasStarted = hasStarted;
+            }
+
+            public override bool HasStarted
+            {
+                get
+                {
+                    return _hasStarted;
+                }
+            }
+
+            public override void OnStarting(Func<object, Task> callback, object state)
+            {
+                if (_hasStarted)
+                {
+                    throw new ArgumentException();
+                }
+
+                var prior = _responseStartingAsync;
+                _responseStartingAsync = async () =>
+                {
+                    await callback(state);
+                    await prior();
+                };
+            }
+
+            public async Task FireOnSendingHeadersAsync()
+            {
+                await _responseStartingAsync();
+                _hasStarted = true;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TempDataApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TempDataApplicationModelProviderTest.cs
new file mode 100644
index 0000000000..fb6ec71dc1
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TempDataApplicationModelProviderTest.cs
@@ -0,0 +1,158 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class TempDataApplicationModelProviderTest
+    {
+        [Fact]
+        public void OnProvidersExecuting_DoesNotAddFilter_IfTypeHasNoTempDataProperties()
+        {
+            // Arrange
+            var type = typeof(TestController_NoTempDataProperties);
+            var options = Options.Create(new MvcViewOptions());
+            var provider = new TempDataApplicationModelProvider(options);
+            var defaultProvider = new DefaultApplicationModelProvider(
+                Options.Create(new MvcOptions()),
+                TestModelMetadataProvider.CreateDefaultProvider());
+
+            var context = new ApplicationModelProviderContext(new[] { type.GetTypeInfo() });
+            defaultProvider.OnProvidersExecuting(context);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            Assert.Empty(controller.Filters);
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_ValidatesTempDataProperties()
+        {
+            // Arrange
+            var type = typeof(TestController_PrivateSet);
+            var options = Options.Create(new MvcViewOptions());
+            var provider = new TempDataApplicationModelProvider(options);
+            var expected = $"The '{type.FullName}.Test' property with TempDataAttribute is invalid. A property using TempDataAttribute must have a public getter and setter.";
+            var defaultProvider = new DefaultApplicationModelProvider(
+                Options.Create(new MvcOptions()),
+                TestModelMetadataProvider.CreateDefaultProvider());
+
+            var context = new ApplicationModelProviderContext(new[] { type.GetTypeInfo() });
+            defaultProvider.OnProvidersExecuting(context);
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => provider.OnProvidersExecuting(context));
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public void AddsTempDataPropertyFilter_ForTempDataAttributeProperties()
+        {
+            // Arrange
+            var type = typeof(TestController_NullableNonPrimitiveTempDataProperty);
+            var options = Options.Create(new MvcViewOptions());
+            var provider = new TempDataApplicationModelProvider(options);
+            var defaultProvider = new DefaultApplicationModelProvider(
+                Options.Create(new MvcOptions()),
+                TestModelMetadataProvider.CreateDefaultProvider());
+
+            var context = new ApplicationModelProviderContext(new[] { type.GetTypeInfo() });
+            defaultProvider.OnProvidersExecuting(context);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            Assert.IsType<ControllerSaveTempDataPropertyFilterFactory>(Assert.Single(controller.Filters));
+        }
+
+        [Fact]
+        public void InitializeFilterFactory_WithExpectedPropertyHelpers_ForTempDataAttributeProperties()
+        {
+            // Arrange
+            var expected = typeof(TestController_OneTempDataProperty).GetProperty(nameof(TestController_OneTempDataProperty.Test2));
+            var options = Options.Create(new MvcViewOptions());
+            var provider = new TempDataApplicationModelProvider(options);
+            var defaultProvider = new DefaultApplicationModelProvider(
+                Options.Create(new MvcOptions()),
+                TestModelMetadataProvider.CreateDefaultProvider());
+
+            var context = new ApplicationModelProviderContext(new[] { typeof(TestController_OneTempDataProperty).GetTypeInfo() });
+            defaultProvider.OnProvidersExecuting(context);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+            var controller = context.Result.Controllers.SingleOrDefault();
+            var filter = Assert.IsType<ControllerSaveTempDataPropertyFilterFactory>(Assert.Single(controller.Filters));
+
+            // Assert
+            Assert.NotNull(filter);
+            var property = Assert.Single(filter.TempDataProperties);
+            Assert.Same(expected, property.PropertyInfo);
+            Assert.Equal("TempDataProperty-Test2", property.Key);
+        }
+
+        [Fact]
+        public void OnProvidersExecuting_SetsKeyPrefixToEmptyString_IfCompatSwitchIsSet()
+        {
+            // Arrange
+            var expected = typeof(TestController_OneTempDataProperty).GetProperty(nameof(TestController_OneTempDataProperty.Test2));
+            var options = Options.Create(new MvcViewOptions { SuppressTempDataAttributePrefix = true });
+            var provider = new TempDataApplicationModelProvider(options);
+            var defaultProvider = new DefaultApplicationModelProvider(
+                Options.Create(new MvcOptions()),
+                TestModelMetadataProvider.CreateDefaultProvider());
+
+            var context = new ApplicationModelProviderContext(new[] { typeof(TestController_OneTempDataProperty).GetTypeInfo() });
+            defaultProvider.OnProvidersExecuting(context);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+            var controller = context.Result.Controllers.SingleOrDefault();
+            var filter = Assert.IsType<ControllerSaveTempDataPropertyFilterFactory>(Assert.Single(controller.Filters));
+
+            // Assert
+            Assert.NotNull(filter);
+            var property = Assert.Single(filter.TempDataProperties);
+            Assert.Same(expected, property.PropertyInfo);
+            Assert.Equal("Test2", property.Key);
+        }
+
+        public class TestController_NoTempDataProperties
+        {
+            public DateTime? DateTime { get; set; }
+        }
+
+        public class TestController_NullableNonPrimitiveTempDataProperty
+        {
+            [TempData]
+            public DateTime? DateTime { get; set; }
+        }
+
+        public class TestController_OneTempDataProperty
+        {
+            public string Test { get; set; }
+
+            [TempData]
+            public string Test2 { get; set; }
+        }
+
+        public class TestController_PrivateSet
+        {
+            [TempData]
+            public string Test { get; private set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TempDataSerializerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TempDataSerializerTest.cs
new file mode 100644
index 0000000000..2cc577b21d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TempDataSerializerTest.cs
@@ -0,0 +1,146 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class TempDataSerializerTest
+    {
+        public static TheoryData<object, Type> InvalidTypes
+        {
+            get
+            {
+                return new TheoryData<object, Type>
+                {
+                    { new object(), typeof(object) },
+                    { new object[3], typeof(object) },
+                    { new TestItem(), typeof(TestItem) },
+                    { new List<TestItem>(), typeof(TestItem) },
+                    { new Dictionary<string, TestItem>(), typeof(TestItem) },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(InvalidTypes))]
+        public void EnsureObjectCanBeSerialized_ThrowsException_OnInvalidType(object value, Type type)
+        {
+            // Arrange
+            var testProvider = new TempDataSerializer();
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() =>
+            {
+                testProvider.EnsureObjectCanBeSerialized(value);
+            });
+            Assert.Equal($"The '{typeof(TempDataSerializer).FullName}' cannot serialize " +
+                $"an object of type '{type}'.",
+                exception.Message);
+        }
+
+        public static TheoryData<object, Type> InvalidDictionaryTypes
+        {
+            get
+            {
+                return new TheoryData<object, Type>
+                {
+                    { new Dictionary<int, string>(), typeof(int) },
+                    { new Dictionary<Uri, Guid>(), typeof(Uri) },
+                    { new Dictionary<object, string>(), typeof(object) },
+                    { new Dictionary<TestItem, TestItem>(), typeof(TestItem) }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(InvalidDictionaryTypes))]
+        public void EnsureObjectCanBeSerialized_ThrowsException_OnInvalidDictionaryType(object value, Type type)
+        {
+            // Arrange
+            var testProvider = new TempDataSerializer();
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() =>
+            {
+                testProvider.EnsureObjectCanBeSerialized(value);
+            });
+            Assert.Equal($"The '{typeof(TempDataSerializer).FullName}' cannot serialize a dictionary " +
+                $"with a key of type '{type}'. The key must be of type 'System.String'.",
+                exception.Message);
+        }
+
+        public static TheoryData<object> ValidTypes
+        {
+            get
+            {
+                return new TheoryData<object>
+                {
+                    { 10 },
+                    { new int[]{ 10, 20 } },
+                    { "FooValue" },
+                    { new Uri("http://Foo") },
+                    { Guid.NewGuid() },
+                    { new List<string> { "foo", "bar" } },
+                    { new DateTimeOffset() },
+                    { 100.1m },
+                    { new Dictionary<string, int>() },
+                    { new Uri[] { new Uri("http://Foo"), new Uri("http://Bar") } },
+                    { DayOfWeek.Sunday },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidTypes))]
+        public void EnsureObjectCanBeSerialized_DoesNotThrow_OnValidType(object value)
+        {
+            // Arrange
+            var testProvider = new TempDataSerializer();
+
+            // Act & Assert (Does not throw)
+            testProvider.EnsureObjectCanBeSerialized(value);
+        }
+
+        [Fact]
+        public void DeserializeTempData_ReturnsEmptyDictionary_DataIsEmpty()
+        {
+            // Arrange
+            var serializer = new TempDataSerializer();
+
+            // Act
+            var tempDataDictionary = serializer.Deserialize(new byte[0]);
+
+            // Assert
+            Assert.NotNull(tempDataDictionary);
+            Assert.Empty(tempDataDictionary);
+        }
+
+        [Fact]
+        public void SerializeAndDeserialize_NullValue_RoundTripsSuccessfully()
+        {
+            // Arrange
+            var key = "NullKey";
+            var testProvider = new TempDataSerializer();
+            var input = new Dictionary<string, object>
+             {
+                 { key, null }
+             };
+
+            // Act
+            var bytes = testProvider.Serialize(input);
+            var values = testProvider.Deserialize(bytes);
+
+            // Assert
+            Assert.True(values.ContainsKey(key));
+            Assert.Null(values[key]);
+        }
+
+        private class TestItem
+        {
+            public int DummyInt { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TemplateRendererTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TemplateRendererTest.cs
new file mode 100644
index 0000000000..31345d4205
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TemplateRendererTest.cs
@@ -0,0 +1,66 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class TemplateRendererTest
+    {
+        public static TheoryData<Type, string[]> TypeNameData
+        {
+            get
+            {
+                return new TheoryData<Type, string[]>
+                {
+                    { typeof(string), new string[] { "String" } },
+                    { typeof(bool), new string[] { "Boolean", "String" } },
+                    { typeof(DateTime), new string[] { "DateTime", "String" } },
+                    { typeof(float), new string[] { "Single", "String" } },
+                    { typeof(double), new string[] { "Double", "String" } },
+                    { typeof(Guid), new string[] { "Guid", "String" } },
+                    { typeof(TimeSpan), new string[] { "TimeSpan", "String" } },
+                    { typeof(int), new string[] { "Int32", "String" } },
+                    { typeof(ulong), new string[] { "UInt64", "String" } },
+
+                    { typeof(Enum), new string[] { "Enum", "String" } },
+                    { typeof(HttpStatusCode), new string[] { "HttpStatusCode", "Enum", "String" } },
+
+                    { typeof(FormFile), new string[] { "FormFile", "IFormFile", "Object" } },
+                    { typeof(IFormFile), new string[] { "IFormFile", "Object" } },
+
+                    { typeof(FormFileCollection), new string[] { "FormFileCollection", typeof(List<IFormFile>).Name,
+                        TemplateRenderer.IEnumerableOfIFormFileName, "Collection", "Object" } },
+                    { typeof(IFormFileCollection), new string[] { "IFormFileCollection",
+                        TemplateRenderer.IEnumerableOfIFormFileName, "Collection", "Object" } },
+                    { typeof(IEnumerable<IFormFile>), new string[] { TemplateRenderer.IEnumerableOfIFormFileName,
+                        typeof(IEnumerable<IFormFile>).Name, "Collection", "Object" } },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(TypeNameData))]
+        public void GetTypeNames_ReturnsExpectedResults(Type fieldType, string[] expectedResult)
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            var metadata = metadataProvider.GetMetadataForType(fieldType);
+
+            // Act
+            var typeNames = TemplateRenderer.GetTypeNames(metadata, fieldType);
+
+            // Assert
+            var collectionAssertions = expectedResult.Select<string, Action<string>>(expected =>
+                actual => Assert.Equal(expected, actual));
+            Assert.Collection(typeNames, collectionAssertions.ToArray());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ValidateAntiforgeryTokenAuthorizationFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ValidateAntiforgeryTokenAuthorizationFilterTest.cs
new file mode 100644
index 0000000000..2748716667
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ValidateAntiforgeryTokenAuthorizationFilterTest.cs
@@ -0,0 +1,77 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Antiforgery;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class ValidateAntiforgeryTokenAuthorizationFilterTest
+    {
+        [Theory]
+        [InlineData("PUT")]
+        [InlineData("POsT")]
+        [InlineData("DeLETE")]
+        [InlineData("GET")]
+        [InlineData("HEAD")]
+        [InlineData("TracE")]
+        [InlineData("OPTIONs")]
+        public async Task Filter_ValidatesAntiforgery_ForAllMethods(string httpMethod)
+        {
+            // Arrange
+            var antiforgery = new Mock<IAntiforgery>(MockBehavior.Strict);
+            antiforgery
+                .Setup(a => a.ValidateRequestAsync(It.IsAny<HttpContext>()))
+                .Returns(Task.FromResult(0))
+                .Verifiable();
+
+            var filter = new ValidateAntiforgeryTokenAuthorizationFilter(antiforgery.Object, NullLoggerFactory.Instance);
+
+            var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+            actionContext.HttpContext.Request.Method = httpMethod;
+
+            var context = new AuthorizationFilterContext(actionContext, new[] { filter });
+
+            // Act
+            await filter.OnAuthorizationAsync(context);
+
+            // Assert
+            antiforgery.Verify();
+        }
+
+        [Fact]
+        public async Task Filter_SkipsAntiforgeryVerification_WhenOverridden()
+        {
+            // Arrange
+            var antiforgery = new Mock<IAntiforgery>(MockBehavior.Strict);
+            antiforgery
+                .Setup(a => a.ValidateRequestAsync(It.IsAny<HttpContext>()))
+                .Returns(Task.FromResult(0))
+                .Verifiable();
+
+            var filter = new ValidateAntiforgeryTokenAuthorizationFilter(antiforgery.Object, NullLoggerFactory.Instance);
+
+            var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+            actionContext.HttpContext.Request.Method = "POST";
+
+            var context = new AuthorizationFilterContext(actionContext, new IFilterMetadata[]
+            {
+                filter,
+                new IgnoreAntiforgeryTokenAttribute(),
+            });
+
+            // Act
+            await filter.OnAuthorizationAsync(context);
+
+            // Assert
+            antiforgery.Verify(a => a.ValidateRequestAsync(It.IsAny<HttpContext>()), Times.Never());
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewBufferTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewBufferTest.cs
new file mode 100644
index 0000000000..eeb189dafc
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewBufferTest.cs
@@ -0,0 +1,519 @@
+// 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.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class ViewBufferTest
+    {
+        [Fact]
+        public void Append_AddsEncodingWrapper()
+        {
+            // Arrange
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 32);
+
+            // Act
+            buffer.Append("Hello world");
+
+            // Assert
+            Assert.Equal(1, buffer.Count);
+            var page = buffer[0];
+            Assert.Equal(1, page.Count);
+            Assert.IsAssignableFrom<IHtmlContent>(page.Buffer[0].Value);
+        }
+
+        [Fact]
+        public void AppendHtml_AddsHtmlContentRazorValue()
+        {
+            // Arrange
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 32);
+            var content = new HtmlString("hello-world");
+
+            // Act
+            buffer.AppendHtml(content);
+
+            // Assert
+            Assert.Equal(1, buffer.Count);
+            var page = buffer[0];
+            Assert.Equal(1, page.Count);
+            Assert.Same(content, page.Buffer[0].Value);
+        }
+
+        [Fact]
+        public void AppendHtml_AddsString()
+        {
+            // Arrange
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 32);
+            var value = "Hello world";
+
+            // Act
+            buffer.AppendHtml(value);
+
+            // Assert
+            Assert.Equal(1, buffer.Count);
+            var page = buffer[0];
+            Assert.Equal(1, page.Count);
+            Assert.Equal("Hello world", Assert.IsType<string>(page.Buffer[0].Value));
+        }
+
+        [Fact]
+        public void Append_CreatesOnePage()
+        {
+            // Arrange
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 32);
+            var expected = Enumerable.Range(0, 32).Select(i => i.ToString());
+
+            // Act
+            foreach (var item in expected)
+            {
+                buffer.AppendHtml(item);
+            }
+
+            // Assert
+            Assert.Equal(1, buffer.Count);
+            Assert.Equal(expected, buffer[0].Buffer.Select(v => v.Value));
+        }
+
+        [Fact]
+        public void Append_CreatesTwoPages()
+        {
+            // Arrange
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 32);
+            var expected = Enumerable.Range(0, 32).Select(i => i.ToString());
+
+            // Act
+            foreach (var item in expected)
+            {
+                buffer.AppendHtml(item);
+            }
+            buffer.AppendHtml("Hello");
+            buffer.AppendHtml("world");
+
+            // Assert
+            Assert.Equal(2, buffer.Count);
+            Assert.Collection(new[] { buffer[0], buffer[1] },
+                page => Assert.Equal(expected, page.Buffer.Select(v => v.Value)),
+                page =>
+                {
+                    var array = page.Buffer;
+                    Assert.Equal("Hello", array[0].Value);
+                    Assert.Equal("world", array[1].Value);
+                });
+        }
+
+        [Fact]
+        public void Append_CreatesManyPages()
+        {
+            // Arrange
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 32);
+            var expected0 = Enumerable.Range(0, 32).Select(i => i.ToString());
+            var expected1 = Enumerable.Range(32, 32).Select(i => i.ToString());
+
+            // Act
+            foreach (var item in expected0)
+            {
+                buffer.AppendHtml(item);
+            }
+            foreach (var item in expected1)
+            {
+                buffer.AppendHtml(item);
+            }
+            buffer.AppendHtml("Hello");
+            buffer.AppendHtml("world");
+
+            // Assert
+            Assert.Equal(3, buffer.Count);
+            Assert.Collection(new[] { buffer[0], buffer[1], buffer[2] },
+                page => Assert.Equal(expected0, page.Buffer.Select(v => v.Value)),
+                page => Assert.Equal(expected1, page.Buffer.Select(v => v.Value)),
+                page =>
+                {
+                    var array = page.Buffer;
+                    Assert.Equal("Hello", array[0].Value);
+                    Assert.Equal("world", array[1].Value);
+                });
+        }
+
+        [Theory]
+        [InlineData(1)]             // Create one page before clear
+        [InlineData(35)]            // Create two pages before clear
+        [InlineData(65)]            // Create many pages before clear
+        public void Clear_ResetsBackingBufferAndIndex(int valuesToWrite)
+        {
+            // Arrange
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 32);
+
+            // Act
+            for (var i = 0; i < valuesToWrite; i++)
+            {
+                buffer.AppendHtml("Hello");
+            }
+            buffer.Clear();
+            buffer.AppendHtml("world");
+
+            // Assert
+            Assert.Equal(1, buffer.Count);
+            var page = buffer[0];
+            Assert.Equal(1, page.Count);
+            Assert.Equal("world", page.Buffer[0].Value);
+        }
+
+        [Fact]
+        public void WriteTo_WritesRazorValues_ToTextWriter()
+        {
+            // Arrange
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 32);
+            var writer = new StringWriter();
+
+            // Act
+            buffer.Append("Hello");
+            buffer.AppendHtml(new HtmlString(" world"));
+            buffer.AppendHtml(" 123");
+            buffer.WriteTo(writer, new HtmlTestEncoder());
+
+            // Assert
+            Assert.Equal("HtmlEncode[[Hello]] world 123", writer.ToString());
+        }
+
+        [Theory]
+        [InlineData(9)]
+        [InlineData(10)]
+        [InlineData(11)]
+        [InlineData(23)]
+        public void WriteTo_WritesRazorValuesFromAllBuffers(int valuesToWrite)
+        {
+            // Arrange
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 4);
+            var writer = new StringWriter();
+            var expected = string.Join("", Enumerable.Range(0, valuesToWrite).Select(_ => "abc"));
+
+            // Act
+            for (var i = 0; i < valuesToWrite; i++)
+            {
+                buffer.AppendHtml("abc");
+            }
+            buffer.WriteTo(writer, new HtmlTestEncoder());
+
+            // Assert
+            Assert.Equal(expected, writer.ToString());
+        }
+
+        [Fact]
+        public async Task WriteToAsync_WritesRazorValues_ToTextWriter()
+        {
+            // Arrange
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 128);
+            var writer = new StringWriter();
+
+            // Act
+            buffer.Append("Hello");
+            buffer.AppendHtml(new HtmlString(" world"));
+            buffer.AppendHtml(" 123");
+
+            await buffer.WriteToAsync(writer, new HtmlTestEncoder());
+
+            // Assert
+            Assert.Equal("HtmlEncode[[Hello]] world 123", writer.ToString());
+        }
+
+        [Theory]
+        [InlineData(9)]
+        [InlineData(10)]
+        [InlineData(11)]
+        [InlineData(23)]
+        public async Task WriteToAsync_WritesRazorValuesFromAllBuffers(int valuesToWrite)
+        {
+            // Arrange
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 4);
+            var writer = new StringWriter();
+            var expected = string.Join("", Enumerable.Range(0, valuesToWrite).Select(_ => "abc"));
+
+            // Act
+            for (var i = 0; i < valuesToWrite; i++)
+            {
+                buffer.AppendHtml("abc");
+            }
+
+            await buffer.WriteToAsync(writer, new HtmlTestEncoder());
+
+            // Assert
+            Assert.Equal(expected, writer.ToString());
+        }
+
+        [Fact]
+        public void CopyTo_Flattens()
+        {
+            // Arrange
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 4);
+
+            var nestedItems = new List<object>();
+            var nested = new HtmlContentBuilder(nestedItems);
+            nested.AppendHtml("Hello");
+            buffer.AppendHtml(nested);
+
+            var destinationItems = new List<object>();
+            var destination = new HtmlContentBuilder(destinationItems);
+
+            // Act
+            buffer.CopyTo(destination);
+
+            // Assert
+            Assert.Same(nested, buffer[0].Buffer[0].Value);
+            Assert.Equal("Hello", Assert.IsType<HtmlString>(nestedItems[0]).Value);
+            Assert.Equal("Hello", Assert.IsType<HtmlString>(destinationItems[0]).Value);
+        }
+
+        [Fact]
+        public void MoveTo_FlattensAndClears()
+        {
+            // Arrange
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 4);
+
+            var nestedItems = new List<object>();
+            var nested = new HtmlContentBuilder(nestedItems);
+            nested.AppendHtml("Hello");
+            buffer.AppendHtml(nested);
+
+            var destinationItems = new List<object>();
+            var destination = new HtmlContentBuilder(destinationItems);
+
+            // Act
+            buffer.MoveTo(destination);
+
+            // Assert
+            Assert.Empty(nestedItems);
+            Assert.Equal(0, buffer.Count);
+            Assert.Equal("Hello", Assert.IsType<HtmlString>(destinationItems[0]).Value);
+        }
+
+        [Fact]
+        public void MoveTo_ViewBuffer_TakesPage_IfOriginalIsEmpty()
+        {
+            // Arrange
+            var scope = new TestViewBufferScope();
+
+            var original = new ViewBuffer(scope, "original", pageSize: 4);
+            var other = new ViewBuffer(scope, "other", pageSize: 4);
+
+            other.AppendHtml("Hi");
+
+            var page = other[0];
+
+            // Act
+            other.MoveTo(original);
+
+            // Assert
+            Assert.Equal(0, other.Count); // Page was taken
+            Assert.Equal(1, original.Count);
+            Assert.Same(page, original[0]);
+        }
+
+        [Fact]
+        public void MoveTo_ViewBuffer_TakesPage_IfCurrentPageInOriginalIsFull()
+        {
+            // Arrange
+            var scope = new TestViewBufferScope();
+
+            var original = new ViewBuffer(scope, "original", pageSize: 4);
+            var other = new ViewBuffer(scope, "other", pageSize: 4);
+
+            for (var i = 0; i < 4; i++)
+            {
+                original.AppendHtml($"original-{i}");
+            }
+
+            other.AppendHtml("Hi");
+
+            var page = other[0];
+
+            // Act
+            other.MoveTo(original);
+
+            // Assert
+            Assert.Equal(0, other.Count); // Page was taken
+            Assert.Equal(2, original.Count);
+            Assert.Same(page, original[1]);
+        }
+
+        [Fact]
+        public void MoveTo_ViewBuffer_TakesPage_IfCurrentPageDoesNotHaveCapacity()
+        {
+            // Arrange
+            var scope = new TestViewBufferScope();
+
+            var original = new ViewBuffer(scope, "original", pageSize: 4);
+            var other = new ViewBuffer(scope, "other", pageSize: 4);
+
+            for (var i = 0; i < 3; i++)
+            {
+                original.AppendHtml($"original-{i}");
+            }
+
+            // With two items, we'd try to copy the items, but there's no room in the current page.
+            // So we just take over the page.
+            for (var i = 0; i < 2; i++)
+            {
+                other.AppendHtml($"other-{i}");
+            }
+
+            var page = other[0];
+
+            // Act
+            other.MoveTo(original);
+
+            // Assert
+            Assert.Equal(0, other.Count); // Page was taken
+            Assert.Equal(2, original.Count);
+            Assert.Same(page, original[1]);
+        }
+
+        [Fact]
+        public void MoveTo_ViewBuffer_CopiesItems_IfCurrentPageHasRoom()
+        {
+            // Arrange
+            var scope = new TestViewBufferScope();
+
+            var original = new ViewBuffer(scope, "original", pageSize: 4);
+            var other = new ViewBuffer(scope, "other", pageSize: 4);
+
+            for (var i = 0; i < 2; i++)
+            {
+                original.AppendHtml($"original-{i}");
+            }
+
+            // With two items, this is half full so we try to copy the items.
+            for (var i = 0; i < 2; i++)
+            {
+                other.AppendHtml($"other-{i}");
+            }
+
+            var page = other[0];
+
+            // Act
+            other.MoveTo(original);
+
+            // Assert
+            Assert.Equal(0, other.Count); // Other is cleared
+            Assert.Contains(page.Buffer, scope.ReturnedBuffers); // Buffer was returned
+
+            Assert.Equal(1, original.Count);
+            Assert.Collection(
+                original[0].Buffer,
+                item => Assert.Equal("original-0", item.Value),
+                item => Assert.Equal("original-1", item.Value),
+                item => Assert.Equal("other-0", item.Value),
+                item => Assert.Equal("other-1", item.Value));
+        }
+
+        [Fact]
+        public void MoveTo_ViewBuffer_CanAddToTakenPage()
+        {
+            // Arrange
+            var scope = new TestViewBufferScope();
+
+            var original = new ViewBuffer(scope, "original", pageSize: 4);
+            var other = new ViewBuffer(scope, "other", pageSize: 4);
+
+            for (var i = 0; i < 3; i++)
+            {
+                original.AppendHtml($"original-{i}");
+            }
+
+            // More than half full, so we take the page
+            for (var i = 0; i < 3; i++)
+            {
+                other.AppendHtml($"other-{i}");
+            }
+
+            var page = other[0];
+            other.MoveTo(original);
+
+            // Act
+            original.AppendHtml("after-merge");
+
+            // Assert
+            Assert.Equal(0, other.Count); // Other is cleared
+
+            Assert.Equal(2, original.Count);
+            Assert.Collection(
+                original[0].Buffer,
+                item => Assert.Equal("original-0", item.Value),
+                item => Assert.Equal("original-1", item.Value),
+                item => Assert.Equal("original-2", item.Value),
+                item => Assert.Null(item.Value));
+            Assert.Collection(
+                original[1].Buffer,
+                item => Assert.Equal("other-0", item.Value),
+                item => Assert.Equal("other-1", item.Value),
+                item => Assert.Equal("other-2", item.Value),
+                item => Assert.Equal("after-merge", item.Value));
+        }
+
+        [Fact]
+        public void MoveTo_ViewBuffer_MultiplePages()
+        {
+            // Arrange
+            var scope = new TestViewBufferScope();
+
+            var original = new ViewBuffer(scope, "original", pageSize: 4);
+            var other = new ViewBuffer(scope, "other", pageSize: 4);
+
+            for (var i = 0; i < 2; i++)
+            {
+                original.AppendHtml($"original-{i}");
+            }
+            
+            for (var i = 0; i < 9; i++)
+            {
+                other.AppendHtml($"other-{i}");
+            }
+
+            var pages = new List<ViewBufferPage>();
+            for (var i = 0; i < other.Count; i++)
+            {
+                pages.Add(other[i]);
+            }
+
+            // Act
+            other.MoveTo(original);
+
+            // Assert
+            Assert.Equal(0, other.Count); // Other is cleared
+
+            Assert.Equal(4, original.Count);
+            Assert.Collection(
+                original[0].Buffer,
+                item => Assert.Equal("original-0", item.Value),
+                item => Assert.Equal("original-1", item.Value),
+                item => Assert.Null(item.Value),
+                item => Assert.Null(item.Value));
+            Assert.Collection(
+                original[1].Buffer,
+                item => Assert.Equal("other-0", item.Value),
+                item => Assert.Equal("other-1", item.Value),
+                item => Assert.Equal("other-2", item.Value),
+                item => Assert.Equal("other-3", item.Value));
+            Assert.Collection(
+                original[2].Buffer,
+                item => Assert.Equal("other-4", item.Value),
+                item => Assert.Equal("other-5", item.Value),
+                item => Assert.Equal("other-6", item.Value),
+                item => Assert.Equal("other-7", item.Value));
+            Assert.Collection(
+                original[3].Buffer,
+                item => Assert.Equal("other-8", item.Value),
+                item => Assert.Null(item.Value),
+                item => Assert.Null(item.Value),
+                item => Assert.Null(item.Value));
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewBufferTextWriterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewBufferTextWriterTest.cs
new file mode 100644
index 0000000000..d5951053af
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewBufferTextWriterTest.cs
@@ -0,0 +1,244 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class ViewBufferTextWriterTest
+    {
+        [Fact]
+        [ReplaceCulture]
+        public void Write_WritesDataTypes_ToBuffer()
+        {
+            // Arrange
+            var expected = new object[] { "True", "3", "18446744073709551615", "Hello world", "3.14", "2.718", "m" };
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 4);
+            var writer = new ViewBufferTextWriter(buffer, Encoding.UTF8);
+
+            // Act
+            writer.Write(true);
+            writer.Write(3);
+            writer.Write(ulong.MaxValue);
+            writer.Write(new TestClass());
+            writer.Write(3.14);
+            writer.Write(2.718m);
+            writer.Write('m');
+
+            // Assert
+            Assert.Equal(expected, GetValues(buffer));
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void Write_WritesDataTypes_ToUnderlyingStream_WhenNotBuffering()
+        {
+            // Arrange
+            var expected = new[] { "True", "3", "18446744073709551615", "Hello world", "3.14", "2.718" };
+            var inner = new Mock<TextWriter>();
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 4);
+            var writer = new ViewBufferTextWriter(buffer, Encoding.UTF8, new HtmlTestEncoder(), inner.Object);
+            var testClass = new TestClass();
+
+            // Act
+            writer.Flush();
+            writer.Write(true);
+            writer.Write(3);
+            writer.Write(ulong.MaxValue);
+            writer.Write(testClass);
+            writer.Write(3.14);
+            writer.Write(2.718m);
+
+            // Assert
+            Assert.Equal(0, buffer.Count);
+            foreach (var item in expected)
+            {
+                inner.Verify(v => v.Write(item), Times.Once());
+            }
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public async Task Write_WritesCharValues_ToUnderlyingStream_WhenNotBuffering()
+        {
+            // Arrange
+            var inner = new Mock<TextWriter> { CallBase = true };
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 4);
+            var writer = new ViewBufferTextWriter(buffer, Encoding.UTF8, new HtmlTestEncoder(), inner.Object);
+            var buffer1 = new[] { 'a', 'b', 'c', 'd' };
+            var buffer2 = new[] { 'd', 'e', 'f' };
+
+            // Act
+            writer.Flush();
+            writer.Write('x');
+            writer.Write(buffer1, 1, 2);
+            writer.Write(buffer2);
+            await writer.WriteAsync(buffer2, 1, 1);
+            await writer.WriteLineAsync(buffer1);
+
+            // Assert
+            inner.Verify(v => v.Write('x'), Times.Once());
+            inner.Verify(v => v.Write(buffer1, 1, 2), Times.Once());
+            inner.Verify(v => v.Write(buffer1, 0, 4), Times.Once());
+            inner.Verify(v => v.Write(buffer2, 0, 3), Times.Once());
+            inner.Verify(v => v.WriteAsync(buffer2, 1, 1), Times.Once());
+            inner.Verify(v => v.WriteLine(), Times.Once());
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public async Task Write_WritesStringValues_ToUnbufferedStream_WhenNotBuffering()
+        {
+            // Arrange
+            var inner = new Mock<TextWriter>();
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 4);
+            var writer = new ViewBufferTextWriter(buffer, Encoding.UTF8, new HtmlTestEncoder(), inner.Object);
+
+            // Act
+            await writer.FlushAsync();
+            writer.Write("a");
+            writer.WriteLine("ab");
+            await writer.WriteAsync("ef");
+            await writer.WriteLineAsync("gh");
+
+            // Assert
+            inner.Verify(v => v.Write("a"), Times.Once());
+            inner.Verify(v => v.WriteLine("ab"), Times.Once());
+            inner.Verify(v => v.WriteAsync("ef"), Times.Once());
+            inner.Verify(v => v.WriteLineAsync("gh"), Times.Once());
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void WriteLine_WritesDataTypes_ToBuffer()
+        {
+            // Arrange
+            var newLine = Environment.NewLine;
+            var expected = new List<object> { "False", newLine, "1.1", newLine, "3", newLine };
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 4);
+            var writer = new ViewBufferTextWriter(buffer, Encoding.UTF8);
+
+            // Act
+            writer.WriteLine(false);
+            writer.WriteLine(1.1f);
+            writer.WriteLine(3L);
+
+            // Assert
+            Assert.Equal(expected, GetValues(buffer));
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void WriteLine_WritesDataTypes_ToUnbufferedStream_WhenNotBuffering()
+        {
+            // Arrange
+            var inner = new Mock<TextWriter>();
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 4);
+            var writer = new ViewBufferTextWriter(buffer, Encoding.UTF8, new HtmlTestEncoder(), inner.Object);
+
+            // Act
+            writer.Flush();
+            writer.WriteLine(false);
+            writer.WriteLine(1.1f);
+            writer.WriteLine(3L);
+
+            // Assert
+            inner.Verify(v => v.Write("False"), Times.Once());
+            inner.Verify(v => v.Write("1.1"), Times.Once());
+            inner.Verify(v => v.Write("3"), Times.Once());
+            inner.Verify(v => v.WriteLine(), Times.Exactly(3));
+        }
+
+        [Fact]
+        public async Task WriteLines_WritesCharBuffer()
+        {
+            // Arrange
+            var newLine = Environment.NewLine;
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 4);
+            var writer = new ViewBufferTextWriter(buffer, Encoding.UTF8);
+
+            // Act
+            writer.WriteLine();
+            await writer.WriteLineAsync();
+
+            // Assert
+            var actual = GetValues(buffer);
+            Assert.Equal<object>(new[] { newLine, newLine }, actual);
+        }
+
+        [Fact]
+        public async Task Write_WritesStringBuffer()
+        {
+            // Arrange
+            var newLine = Environment.NewLine;
+            var input1 = "Hello";
+            var input2 = "from";
+            var input3 = "ASP";
+            var input4 = ".Net";
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 4);
+            var writer = new ViewBufferTextWriter(buffer, Encoding.UTF8);
+
+            // Act
+            writer.Write(input1);
+            writer.WriteLine(input2);
+            await writer.WriteAsync(input3);
+            await writer.WriteLineAsync(input4);
+
+            // Assert
+            var actual = GetValues(buffer);
+            Assert.Equal<object>(new[] { input1, input2, newLine, input3, input4, newLine }, actual);
+        }
+
+        [Fact]
+        public void Write_HtmlContent_AfterFlush_GoesToStream()
+        {
+            // Arrange
+            var inner = new StringWriter();
+            var buffer = new ViewBuffer(new TestViewBufferScope(), "some-name", pageSize: 4);
+            var writer = new ViewBufferTextWriter(buffer, Encoding.UTF8, new HtmlTestEncoder(), inner);
+
+            writer.Flush();
+
+            var content = new HtmlString("Hello, world!");
+
+            // Act
+            writer.Write(content);
+
+            // Assert
+            Assert.Equal("Hello, world!", inner.ToString());
+        }
+
+        private static object[] GetValues(ViewBuffer buffer)
+        {
+            var pages = new List<ViewBufferPage>();
+            for (var i = 0; i < buffer.Count; i++)
+            {
+                pages.Add(buffer[i]);
+            }
+
+            return pages
+                .SelectMany(c => c.Buffer)
+                .Select(d => d.Value)
+                .TakeWhile(d => d != null)
+                .ToArray();
+        }
+
+        private class TestClass
+        {
+            public override string ToString()
+            {
+                return "Hello world";
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewDataAttributeApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewDataAttributeApplicationModelProviderTest.cs
new file mode 100644
index 0000000000..0d8bf53d6d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewDataAttributeApplicationModelProviderTest.cs
@@ -0,0 +1,99 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class ViewDataAttributeApplicationModelProviderTest
+    {
+        [Fact]
+        public void OnProvidersExecuting_DoesNotAddFilter_IfTypeHasNoViewDataProperties()
+        {
+            // Arrange
+            var type = typeof(TestController_NoViewDataProperties);
+            var provider = new ViewDataAttributeApplicationModelProvider();
+            var context = GetContext(type);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            Assert.Empty(controller.Filters);
+        }
+
+        [Fact]
+        public void AddsViewDataPropertyFilter_ForViewDataAttributeProperties()
+        {
+            // Arrange
+            var type = typeof(TestController_NullableNonPrimitiveViewDataProperty);
+            var provider = new ViewDataAttributeApplicationModelProvider();
+            var context = GetContext(type);
+
+            // Act
+            provider.OnProvidersExecuting(context);
+
+            // Assert
+            var controller = Assert.Single(context.Result.Controllers);
+            Assert.IsType<ControllerViewDataAttributeFilterFactory>(Assert.Single(controller.Filters));
+        }
+
+        [Fact]
+        public void InitializeFilterFactory_WithExpectedPropertyHelpers_ForViewDataAttributeProperties()
+        {
+            // Arrange
+            var expected = typeof(TestController_OneViewDataProperty).GetProperty(nameof(TestController_OneViewDataProperty.Test2));
+            var provider = new ViewDataAttributeApplicationModelProvider();
+            var context = GetContext(typeof(TestController_OneViewDataProperty));
+
+            // Act
+            provider.OnProvidersExecuting(context);
+            var controller = context.Result.Controllers.SingleOrDefault();
+            var filter = Assert.IsType<ControllerViewDataAttributeFilterFactory>(Assert.Single(controller.Filters));
+
+            // Assert
+            Assert.NotNull(filter);
+            var property = Assert.Single(filter.Properties);
+            Assert.Same(expected, property.PropertyInfo);
+            Assert.Equal("Test2", property.Key);
+        }
+
+        private static ApplicationModelProviderContext GetContext(Type type)
+        {
+            var defaultProvider = new DefaultApplicationModelProvider(
+                Options.Create(new MvcOptions()),
+                new EmptyModelMetadataProvider());
+
+            var context = new ApplicationModelProviderContext(new[] { type.GetTypeInfo() });
+            defaultProvider.OnProvidersExecuting(context);
+            return context;
+        }
+
+        public class TestController_NoViewDataProperties
+        {
+            public DateTime? DateTime { get; set; }
+        }
+
+        public class TestController_NullableNonPrimitiveViewDataProperty
+        {
+            [ViewData]
+            public DateTime? DateTime { get; set; }
+        }
+
+        public class TestController_OneViewDataProperty
+        {
+            public string Test { get; set; }
+
+            [ViewData]
+            public string Test2 { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewDataAttributePropertyProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewDataAttributePropertyProviderTest.cs
new file mode 100644
index 0000000000..48f0726884
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewDataAttributePropertyProviderTest.cs
@@ -0,0 +1,102 @@
+// 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.
+
+using System;
+using System.Linq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
+{
+    public class ViewDataAttributePropertyProviderTest
+    {
+        [Fact]
+        public void GetViewDataProperties_ReturnsNull_IfTypeDoesNotHaveAnyViewDataProperties()
+        {
+            // Arrange
+            var type = typeof(TestController_NoViewDataProperties);
+
+            // Act
+            var result = ViewDataAttributePropertyProvider.GetViewDataProperties(type);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void GetViewDataProperties_ReturnsViewDataProperties()
+        {
+            // Arrange
+            var type = typeof(BaseController);
+
+            // Act
+            var result = ViewDataAttributePropertyProvider.GetViewDataProperties(type);
+
+            // Assert
+            Assert.Collection(
+                result.OrderBy(p => p.Key),
+                property =>
+                {
+                    Assert.Equal(nameof(BaseController.BaseProperty), property.PropertyInfo.Name);
+                    Assert.Equal(nameof(BaseController.BaseProperty), property.Key);
+                });
+        }
+
+        [Fact]
+        public void GetViewDataProperties_ReturnsViewDataProperties_FromBaseTypes()
+        {
+            // Arrange
+            var type = typeof(DerivedController);
+
+            // Act
+            var result = ViewDataAttributePropertyProvider.GetViewDataProperties(type);
+
+            // Assert
+            Assert.Collection(
+                result.OrderBy(p => p.Key),
+                property => Assert.Equal(nameof(BaseController.BaseProperty), property.PropertyInfo.Name),
+                property => Assert.Equal(nameof(DerivedController.DeriviedProperty), property.PropertyInfo.Name));
+        }
+
+        [Fact]
+        public void GetViewDataProperties_UsesKeyFromViewDataAttribute()
+        {
+            // Arrange
+            var type = typeof(PropertyWithKeyController);
+
+            // Act
+            var result = ViewDataAttributePropertyProvider.GetViewDataProperties(type);
+
+            // Assert
+            Assert.Collection(
+                result.OrderBy(p => p.Key),
+                property =>
+                {
+                    Assert.Equal(nameof(PropertyWithKeyController.Different), property.PropertyInfo.Name);
+                    Assert.Equal("Test", property.Key);
+                });
+        }
+
+        public class TestController_NoViewDataProperties
+        {
+            public DateTime? DateTime { get; set; }
+        }
+
+        public class BaseController
+        {
+            [ViewData]
+            public string BaseProperty { get; }
+        }
+
+        public class DerivedController : BaseController
+        {
+            [ViewData]
+            public string DeriviedProperty { get; set; }
+        }
+
+        public class PropertyWithKeyController
+        {
+            [ViewData(Key = "Test")]
+            public string Different { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj
new file mode 100644
index 0000000000..f3dea58d26
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestDiagnosticListener\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(MicrosoftAspNetCoreHttpPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Model/Constants.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Model/Constants.cs
new file mode 100644
index 0000000000..4a5fee5b43
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Model/Constants.cs
@@ -0,0 +1,15 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Model
+{
+    public static class Constants
+    {
+        public const int WoodstockYear = 1969;
+
+        public static Model Model { get; } = new Model
+        {
+            Name = "Woodstock",
+        };
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Model/Model.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Model/Model.cs
new file mode 100644
index 0000000000..d38f673122
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Model/Model.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Model
+{
+    public class Model
+    {
+        public string Name { get; set; }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelStateDictionaryExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelStateDictionaryExtensionsTest.cs
new file mode 100644
index 0000000000..80c47900db
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelStateDictionaryExtensionsTest.cs
@@ -0,0 +1,409 @@
+// 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.
+
+using System;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ModelBinding
+{
+    public class ModelStateDictionaryExtensionsTest
+    {
+        [Fact]
+        public void AddModelError_ForSingleExpression_AddsExpectedMessage()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+
+            // Act
+            dictionary.AddModelError<TestModel>(model => model.Text, "Message");
+
+            // Assert
+            var modelState = Assert.Single(dictionary);
+            var modelError = Assert.Single(modelState.Value.Errors);
+
+            Assert.Equal("Text", modelState.Key);
+            Assert.Equal("Message", modelError.ErrorMessage);
+        }
+
+        [Fact]
+        public void AddModelError_ForRelationExpression_AddsExpectedMessage()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+
+            // Act
+            dictionary.AddModelError<TestModel>(model => model.Child.Text, "Message");
+
+            // Assert
+            var modelState = Assert.Single(dictionary);
+            var modelError = Assert.Single(modelState.Value.Errors);
+
+            Assert.Equal("Child.Text", modelState.Key);
+            Assert.Equal("Message", modelError.ErrorMessage);
+        }
+
+        [Fact]
+        public void AddModelError_ForImplicitlyCastedToObjectExpression_AddsExpectedMessage()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+
+            // Act
+            dictionary.AddModelError<TestModel>(model => model.Child.Value, "Message");
+
+            // Assert
+            var modelState = Assert.Single(dictionary);
+            var modelError = Assert.Single(modelState.Value.Errors);
+
+            Assert.Equal("Child.Value", modelState.Key);
+            Assert.Equal("Message", modelError.ErrorMessage);
+        }
+
+        [Fact]
+        public void AddModelError_ForNotModelsExpression_AddsExpectedMessage()
+        {
+            // Arrange
+            var variable = "Test";
+            var dictionary = new ModelStateDictionary();
+
+            // Act
+            dictionary.AddModelError<TestModel>(model => variable, "Message");
+
+            // Assert
+            var modelState = Assert.Single(dictionary);
+            var modelError = Assert.Single(modelState.Value.Errors);
+
+            Assert.Equal("variable", modelState.Key);
+            Assert.Equal("Message", modelError.ErrorMessage);
+        }
+
+        [Fact]
+        public void TryAddModelException_ForSingleExpression_AddsExpectedException()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            var exception = new Exception();
+
+            // Act
+            dictionary.TryAddModelException<TestModel>(model => model.Text, exception);
+
+            // Assert
+            var modelState = Assert.Single(dictionary);
+            var modelError = Assert.Single(modelState.Value.Errors);
+
+            Assert.Equal("Text", modelState.Key);
+            Assert.Same(exception, modelError.Exception);
+        }
+
+        [Fact]
+        public void AddModelError_ForSingleExpression_AddsExpectedException_WithModelMetadata()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            var exception = new Exception();
+            var provider = new TestModelMetadataProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(TestModel), nameof(TestModel.Text));
+
+            // Act
+            dictionary.AddModelError<TestModel>(model => model.Text, exception, metadata);
+
+            // Assert
+            var modelState = Assert.Single(dictionary);
+            var modelError = Assert.Single(modelState.Value.Errors);
+
+            Assert.Equal("Text", modelState.Key);
+            Assert.Same(exception, modelError.Exception);
+        }
+
+        [Fact]
+        public void TryAddModelException_ForRelationExpression_AddsExpectedException()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            var exception = new Exception();
+
+            // Act
+            dictionary.TryAddModelException<TestModel>(model => model.Child.Text, exception);
+
+            // Assert
+            var modelState = Assert.Single(dictionary);
+            var modelError = Assert.Single(modelState.Value.Errors);
+
+            Assert.Equal("Child.Text", modelState.Key);
+            Assert.Same(exception, modelError.Exception);
+        }
+
+        [Fact]
+        public void AddModelError_ForRelationExpression_AddsExpectedException_WithModelMetadata()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            var exception = new Exception();
+            var provider = new TestModelMetadataProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(ChildModel), nameof(ChildModel.Text));
+
+            // Act
+            dictionary.AddModelError<TestModel>(model => model.Child.Text, exception, metadata);
+
+            // Assert
+            var modelState = Assert.Single(dictionary);
+            var modelError = Assert.Single(modelState.Value.Errors);
+
+            Assert.Equal("Child.Text", modelState.Key);
+            Assert.Same(exception, modelError.Exception);
+        }
+
+        [Fact]
+        public void TryAddModelException_ForImplicitlyCastedToObjectExpression_AddsExpectedException()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            var exception = new Exception();
+
+            // Act
+            dictionary.TryAddModelException<TestModel>(model => model.Child.Value, exception);
+
+            // Assert
+            var modelState = Assert.Single(dictionary);
+            var modelError = Assert.Single(modelState.Value.Errors);
+
+            Assert.Equal("Child.Value", modelState.Key);
+            Assert.Same(exception, modelError.Exception);
+        }
+
+        [Fact]
+        public void AddModelError_ForImplicitlyCastedToObjectExpression_AddsExpectedException_WithModelMetadata()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            var exception = new Exception();
+            var provider = new TestModelMetadataProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(ChildModel), nameof(ChildModel.Value));
+
+            // Act
+            dictionary.AddModelError<TestModel>(model => model.Child.Value, exception, metadata);
+
+            // Assert
+            var modelState = Assert.Single(dictionary);
+            var modelError = Assert.Single(modelState.Value.Errors);
+
+            Assert.Equal("Child.Value", modelState.Key);
+            Assert.Same(exception, modelError.Exception);
+        }
+
+        [Fact]
+        public void TryAddModelException_ForNotModelsExpression_AddsExpectedException()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            var variable = "Test";
+            var exception = new Exception();
+
+            // Act
+            dictionary.TryAddModelException<TestModel>(model => variable, exception);
+
+            // Assert
+            var modelState = Assert.Single(dictionary);
+            var modelError = Assert.Single(modelState.Value.Errors);
+
+            Assert.Equal("variable", modelState.Key);
+            Assert.Same(exception, modelError.Exception);
+        }
+
+        [Fact]
+        public void AddModelError_ForNotModelsExpression_AddsExpectedException_WithModelMetadata()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            var variable = "Test";
+            var exception = new Exception();
+            var provider = new TestModelMetadataProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), nameof(string.Length));
+
+            // Act
+            dictionary.AddModelError<TestModel>(model => variable, exception, metadata);
+
+            // Assert
+            var modelState = Assert.Single(dictionary);
+            var modelError = Assert.Single(modelState.Value.Errors);
+
+            Assert.Equal("variable", modelState.Key);
+            Assert.Same(exception, modelError.Exception);
+        }
+
+        [Fact]
+        public void Remove_ForSingleExpression_RemovesModelStateKey()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.SetModelValue("Text", "value", "value");
+
+            // Act
+            dictionary.Remove<TestModel>(model => model.Text);
+
+            // Assert
+            Assert.Empty(dictionary);
+        }
+
+        [Fact]
+        public void Remove_ForRelationExpression_RemovesModelStateKey()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.SetModelValue("Child.Text", "value", "value");
+
+            // Act
+            dictionary.Remove<TestModel>(model => model.Child.Text);
+
+            // Assert
+            Assert.Empty(dictionary);
+        }
+
+        [Fact]
+        public void Remove_ForImplicitlyCastedToObjectExpression_RemovesModelStateKey()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.SetModelValue("Child.Value", "value", "value");
+
+            // Act
+            dictionary.Remove<TestModel>(model => model.Child.Value);
+
+            // Assert
+            Assert.Empty(dictionary);
+        }
+
+        [Fact]
+        public void Remove_ForNotModelsExpression_RemovesModelStateKey()
+        {
+            // Arrange
+            var variable = "Test";
+            var dictionary = new ModelStateDictionary();
+            dictionary.SetModelValue("variable", "value", "value");
+
+            // Act
+            dictionary.Remove<TestModel>(model => variable);
+
+            // Assert
+            Assert.Empty(dictionary);
+        }
+
+        [Fact]
+        public void RemoveAll_ForSingleExpression_RemovesModelStateKeys()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+
+            dictionary.SetModelValue("Key", "value1", "value1");
+            dictionary.SetModelValue("Text", "value2", "value2");
+            dictionary.SetModelValue("Text.Length", "value3", "value3");
+            var expected = dictionary["Key"];
+
+            // Act
+            dictionary.RemoveAll<TestModel>(model => model.Text);
+
+            // Assert
+            var modelState = Assert.Single(dictionary);
+
+            Assert.Equal("Key", modelState.Key);
+            Assert.Same(expected, modelState.Value);
+        }
+
+        [Fact]
+        public void RemoveAll_ForRelationExpression_RemovesModelStateKeys()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.SetModelValue("Key", "value1", "value1");
+            dictionary.SetModelValue("Child", "value2", "value2");
+            dictionary.SetModelValue("Child.Text", "value3", "value3");
+            var expected = dictionary["Key"];
+
+            // Act
+            dictionary.RemoveAll<TestModel>(model => model.Child);
+
+            // Assert
+            var modelState = Assert.Single(dictionary);
+
+            Assert.Equal("Key", modelState.Key);
+            Assert.Same(expected, modelState.Value);
+        }
+
+        [Fact]
+        public void RemoveAll_ForImplicitlyCastedToObjectExpression_RemovesModelStateKeys()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.SetModelValue("Child", "value1", "value1");
+            dictionary.SetModelValue("Child.Value", "value2", "value2");
+            var expected = dictionary["child"];
+
+            // Act
+            dictionary.RemoveAll<TestModel>(model => model.Child.Value);
+
+            // Assert
+            var modelState = Assert.Single(dictionary);
+
+            Assert.Equal("Child", modelState.Key);
+            Assert.Same(expected, modelState.Value);
+        }
+
+        [Fact]
+        public void RemoveAll_ForNotModelsExpression_RemovesModelStateKeys()
+        {
+            // Arrange
+            var variable = "Test";
+            var dictionary = new ModelStateDictionary();
+            dictionary.SetModelValue("Key", "value1", "value1");
+            dictionary.SetModelValue("variable", "value2", "value2");
+            dictionary.SetModelValue("variable.Text", "value3", "value3");
+            dictionary.SetModelValue("variable.Value", "value4", "value4");
+
+            var expected = dictionary["Key"];
+
+            // Act
+            dictionary.RemoveAll<TestModel>(model => variable);
+
+            // Assert
+            var modelState = Assert.Single(dictionary);
+
+            Assert.Equal("Key", modelState.Key);
+            Assert.Same(expected, modelState.Value);
+        }
+
+        [Fact]
+        public void RemoveAll_ForModelExpression_RemovesModelPropertyKeys()
+        {
+            // Arrange
+            var dictionary = new ModelStateDictionary();
+            dictionary.SetModelValue("Key", "value1", "value1");
+            dictionary.SetModelValue("Text", "value2", "value2");
+            dictionary.SetModelValue("Child", "value3", "value3");
+            dictionary.SetModelValue("Child.Text", "value4", "value4");
+            dictionary.SetModelValue("Child.NoValue", "value5", "value5");
+            var expected = dictionary["Key"];
+
+            // Act
+            dictionary.RemoveAll<TestModel>(model => model);
+
+            // Assert
+            var modelState = Assert.Single(dictionary);
+
+            Assert.Equal("Key", modelState.Key);
+            Assert.Same(expected, modelState.Value);
+        }
+
+        private class TestModel
+        {
+            public string Text { get; set; }
+
+            public ChildModel Child { get; set; }
+        }
+
+        private class ChildModel
+        {
+            public int Value { get; set; }
+            public string Text { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PartialViewResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PartialViewResultTest.cs
new file mode 100644
index 0000000000..91766e10cb
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PartialViewResultTest.cs
@@ -0,0 +1,237 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    // These tests cover the logic included in PartialViewResult.ExecuteResultAsync - see PartialViewResultExecutorTest
+    // and ViewExecutorTest for more comprehensive tests.
+    public class PartialViewResultTest
+    {
+        [Fact]
+        public void Model_ExposesViewDataModel()
+        {
+            // Arrange
+            var customModel = new object();
+            var viewResult = new PartialViewResult
+            {
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider())
+                {
+                    Model = customModel
+                },
+            };
+
+            // Act & Assert
+            Assert.Same(customModel, viewResult.Model);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_Throws_IfViewCouldNotBeFound_MessageUsesGetViewLocations()
+        {
+            // Arrange
+            var viewName = "MyView";
+            var actionContext = GetActionContext();
+            var expected = string.Join(
+                Environment.NewLine,
+                $"The view '{viewName}' was not found. The following locations were searched:",
+                "Location1",
+                "Location2");
+
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, viewName, /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(viewName, new[] { "Location1", "Location2" }))
+                .Verifiable();
+
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(viewName, Enumerable.Empty<string>()))
+                .Verifiable();
+
+            var viewResult = new PartialViewResult
+            {
+                ViewEngine = viewEngine.Object,
+                ViewName = viewName,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act and Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => viewResult.ExecuteResultAsync(actionContext));
+            Assert.Equal(expected, ex.Message);
+            viewEngine.Verify();
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_Throws_IfViewCouldNotBeFound_MessageUsesFindViewLocations()
+        {
+            // Arrange
+            var viewName = "MyView";
+            var actionContext = GetActionContext();
+            var expected = string.Join(
+                Environment.NewLine,
+                $"The view '{viewName}' was not found. The following locations were searched:",
+                "Location1",
+                "Location2");
+
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, viewName, /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(viewName, Enumerable.Empty<string>()))
+                .Verifiable();
+
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(viewName, new[] { "Location1", "Location2" }))
+                .Verifiable();
+
+            var viewResult = new PartialViewResult
+            {
+                ViewEngine = viewEngine.Object,
+                ViewName = viewName,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act and Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => viewResult.ExecuteResultAsync(actionContext));
+            Assert.Equal(expected, ex.Message);
+            viewEngine.Verify();
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_Throws_IfViewCouldNotBeFound_MessageUsesAllLocations()
+        {
+            // Arrange
+            var viewName = "MyView";
+            var actionContext = GetActionContext();
+            var expected = string.Join(
+                Environment.NewLine,
+                $"The view '{viewName}' was not found. The following locations were searched:",
+                "Location1",
+                "Location2",
+                "Location3",
+                "Location4");
+
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, viewName, /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(viewName, new[] { "Location1", "Location2" }))
+                .Verifiable();
+
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(viewName, new[] { "Location3", "Location4" }))
+                .Verifiable();
+
+            var viewResult = new PartialViewResult
+            {
+                ViewEngine = viewEngine.Object,
+                ViewName = viewName,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act and Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => viewResult.ExecuteResultAsync(actionContext));
+            Assert.Equal(expected, ex.Message);
+            viewEngine.Verify();
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_FindsAndExecutesView()
+        {
+            // Arrange
+            var viewName = "MyView";
+            var actionContext = GetActionContext();
+
+            var view = new Mock<IView>(MockBehavior.Strict);
+            view
+                .Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Returns(Task.FromResult(0))
+                .Verifiable();
+
+            view
+                .As<IDisposable>()
+                .Setup(v => v.Dispose())
+                .Verifiable();
+
+            // Used by logging
+            view
+                .SetupGet(v => v.Path)
+                .Returns($"{viewName}.cshtml");
+
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, viewName, /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(viewName, Enumerable.Empty<string>()))
+                .Verifiable();
+
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found(viewName, view.Object))
+                .Verifiable();
+
+            var viewResult = new PartialViewResult
+            {
+                ViewName = viewName,
+                ViewEngine = viewEngine.Object,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act
+            await viewResult.ExecuteResultAsync(actionContext);
+
+            // Assert
+            view.Verify();
+            viewEngine.Verify();
+        }
+
+        private ActionContext GetActionContext()
+        {
+            return new ActionContext(GetHttpContext(), new RouteData(), new ActionDescriptor());
+        }
+
+        private HttpContext GetHttpContext()
+        {
+            var options = Options.Create(new MvcViewOptions());
+
+            var viewExecutor = new PartialViewResultExecutor(
+                options,
+                new TestHttpResponseStreamWriterFactory(),
+                new CompositeViewEngine(options),
+                new TempDataDictionaryFactory(new SessionStateTempDataProvider()),
+                new DiagnosticListener("Microsoft.AspNetCore"),
+                NullLoggerFactory.Instance,
+                new EmptyModelMetadataProvider());
+
+            var services = new ServiceCollection();
+            services.AddSingleton<IActionResultExecutor<PartialViewResult>>(viewExecutor);
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = services.BuildServiceProvider();
+            return httpContext;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Properties/AssemblyInfo.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..8beb903785
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// 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.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Properties/Resources.Designer.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..3f23183787
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Properties/Resources.Designer.cs
@@ -0,0 +1,86 @@
+// <auto-generated />
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Test
+{
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+
+    internal static class Resources
+    {
+        private static readonly ResourceManager _resourceManager
+            = new ResourceManager("Microsoft.AspNetCore.Mvc.ViewFeatures.Test.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+        /// <summary>
+        /// Comparing {0} to {1}.
+        /// </summary>
+        internal static string CompareAttributeTestResource
+        {
+            get => GetString("CompareAttributeTestResource");
+        }
+
+        /// <summary>
+        /// Comparing {0} to {1}.
+        /// </summary>
+        internal static string FormatCompareAttributeTestResource(object p0, object p1)
+            => string.Format(CultureInfo.CurrentCulture, GetString("CompareAttributeTestResource"), p0, p1);
+
+        /// <summary>
+        /// description from resources
+        /// </summary>
+        internal static string DisplayAttribute_Description
+        {
+            get => GetString("DisplayAttribute_Description");
+        }
+
+        /// <summary>
+        /// description from resources
+        /// </summary>
+        internal static string FormatDisplayAttribute_Description()
+            => GetString("DisplayAttribute_Description");
+
+        /// <summary>
+        /// name from resources
+        /// </summary>
+        internal static string DisplayAttribute_Name
+        {
+            get => GetString("DisplayAttribute_Name");
+        }
+
+        /// <summary>
+        /// name from resources
+        /// </summary>
+        internal static string FormatDisplayAttribute_Name()
+            => GetString("DisplayAttribute_Name");
+
+        /// <summary>
+        /// Error about '{0}' from resources.
+        /// </summary>
+        internal static string RemoteAttribute_Error
+        {
+            get => GetString("RemoteAttribute_Error");
+        }
+
+        /// <summary>
+        /// Error about '{0}' from resources.
+        /// </summary>
+        internal static string FormatRemoteAttribute_Error(object p0)
+            => string.Format(CultureInfo.CurrentCulture, GetString("RemoteAttribute_Error"), p0);
+
+        private static string GetString(string name, params string[] formatterNames)
+        {
+            var value = _resourceManager.GetString(name);
+
+            System.Diagnostics.Debug.Assert(value != null);
+
+            if (formatterNames != null)
+            {
+                for (var i = 0; i < formatterNames.Length; i++)
+                {
+                    value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+                }
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs
new file mode 100644
index 0000000000..5c8da2b478
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs
@@ -0,0 +1,1140 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.ObjectPool;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+using Resources = Microsoft.AspNetCore.Mvc.ViewFeatures.Test.Resources;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class RemoteAttributeTest
+    {
+        private static readonly IModelMetadataProvider _metadataProvider = new EmptyModelMetadataProvider();
+        private static readonly ModelMetadata _metadata = _metadataProvider.GetMetadataForProperty(
+            typeof(string),
+            nameof(string.Length));
+
+        public static TheoryData<string> SomeNames
+        {
+            get
+            {
+                return new TheoryData<string>
+                {
+                    string.Empty,
+                    "Action",
+                    "In a controller",
+                    "  slightly\t odd\t whitespace\t\r\n",
+                };
+            }
+        }
+
+        // Null or empty property names are invalid. (Those containing just whitespace are legal.)
+        public static TheoryData<string> NullOrEmptyNames
+        {
+            get
+            {
+                return new TheoryData<string>
+                {
+                    null,
+                    string.Empty,
+                };
+            }
+        }
+
+        [Fact]
+        public void IsValidAlwaysReturnsTrue()
+        {
+            // Act & Assert
+            Assert.True(new RemoteAttribute("RouteName", "ParameterName").IsValid(value: null));
+            Assert.True(new RemoteAttribute("ActionName", "ControllerName", "ParameterName").IsValid(value: null));
+        }
+
+        [Fact]
+        public void Constructor_WithNullAction_IgnoresArgument()
+        {
+            // Arrange & Act
+            var attribute = new TestableRemoteAttribute(action: null, controller: "AController");
+
+            // Assert
+            var keyValuePair = Assert.Single(attribute.RouteData);
+            Assert.Equal("controller", keyValuePair.Key);
+        }
+
+        [Fact]
+        public void Constructor_WithNullController_IgnoresArgument()
+        {
+            // Arrange & Act
+            var attribute = new TestableRemoteAttribute("AnAction", controller: null);
+
+            // Assert
+            var keyValuePair = Assert.Single(attribute.RouteData);
+            Assert.Equal("action", keyValuePair.Key);
+            Assert.Null(attribute.RouteName);
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [MemberData(nameof(SomeNames))]
+        public void Constructor_WithRouteName_UpdatesProperty(string routeName)
+        {
+            // Arrange & Act
+            var attribute = new TestableRemoteAttribute(routeName);
+
+            // Assert
+            Assert.Empty(attribute.RouteData);
+            Assert.Equal(routeName, attribute.RouteName);
+        }
+
+        [Theory]
+        [MemberData(nameof(SomeNames))]
+        public void Constructor_WithActionController_UpdatesActionRouteData(string action)
+        {
+            // Arrange & Act
+            var attribute = new TestableRemoteAttribute(action, "AController");
+
+            // Assert
+            Assert.Equal(2, attribute.RouteData.Count);
+            Assert.Contains("controller", attribute.RouteData.Keys);
+            var resultName = Assert.Single(
+                    attribute.RouteData,
+                    keyValuePair => string.Equals(keyValuePair.Key, "action", StringComparison.Ordinal))
+                .Value;
+            Assert.Equal(action, resultName);
+            Assert.Null(attribute.RouteName);
+        }
+
+        [Theory]
+        [MemberData(nameof(SomeNames))]
+        public void Constructor_WithActionController_UpdatesControllerRouteData(string controller)
+        {
+            // Arrange & Act
+            var attribute = new TestableRemoteAttribute("AnAction", controller);
+
+            // Assert
+            Assert.Equal(2, attribute.RouteData.Count);
+            Assert.Contains("action", attribute.RouteData.Keys);
+            var resultName = Assert.Single(
+                    attribute.RouteData,
+                    keyValuePair => string.Equals(keyValuePair.Key, "controller", StringComparison.Ordinal))
+                .Value;
+            Assert.Equal(controller, resultName);
+            Assert.Null(attribute.RouteName);
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [MemberData(nameof(SomeNames))]
+        public void Constructor_WithActionControllerAreaName_UpdatesAreaRouteData(string areaName)
+        {
+            // Arrange & Act
+            var attribute = new TestableRemoteAttribute("AnAction", "AController", areaName: areaName);
+
+            // Assert
+            Assert.Equal(3, attribute.RouteData.Count);
+            Assert.Contains("action", attribute.RouteData.Keys);
+            Assert.Contains("controller", attribute.RouteData.Keys);
+            var resultName = Assert.Single(
+                    attribute.RouteData,
+                    keyValuePair => string.Equals(keyValuePair.Key, "area", StringComparison.Ordinal))
+                .Value;
+            Assert.Equal(areaName, resultName);
+            Assert.Null(attribute.RouteName);
+        }
+
+        [Fact]
+        public void ErrorMessageProperties_HaveExpectedDefaultValues()
+        {
+            // Arrange & Act
+            var attribute = new RemoteAttribute("Action", "Controller");
+
+            // Assert
+            Assert.Null(attribute.ErrorMessage);
+            Assert.Null(attribute.ErrorMessageResourceName);
+            Assert.Null(attribute.ErrorMessageResourceType);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void FormatErrorMessage_ReturnsDefaultErrorMessage()
+        {
+            // Arrange
+            // See ViewFeatures.Resources.RemoteAttribute_RemoteValidationFailed.
+            var expected = "'Property1' is invalid.";
+            var attribute = new RemoteAttribute("Action", "Controller");
+
+            // Act
+            var message = attribute.FormatErrorMessage("Property1");
+
+            // Assert
+            Assert.Equal(expected, message);
+        }
+
+        [Fact]
+        public void FormatErrorMessage_UsesOverriddenErrorMessage()
+        {
+            // Arrange
+            var expected = "Error about 'Property1' from override.";
+            var attribute = new RemoteAttribute("Action", "Controller")
+            {
+                ErrorMessage = "Error about '{0}' from override.",
+            };
+
+            // Act
+            var message = attribute.FormatErrorMessage("Property1");
+
+            // Assert
+            Assert.Equal(expected, message);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void FormatErrorMessage_UsesErrorMessageFromResource()
+        {
+            // Arrange
+            var expected = "Error about 'Property1' from resources.";
+            var attribute = new RemoteAttribute("Action", "Controller")
+            {
+                ErrorMessageResourceName = nameof(Resources.RemoteAttribute_Error),
+                ErrorMessageResourceType = typeof(Resources),
+            };
+
+            // Act
+            var message = attribute.FormatErrorMessage("Property1");
+
+            // Assert
+            Assert.Equal(expected, message);
+        }
+
+        [Theory]
+        [MemberData(nameof(NullOrEmptyNames))]
+        public void FormatAdditionalFieldsForClientValidation_WithInvalidPropertyName_Throws(string property)
+        {
+            // Arrange
+            var attribute = new RemoteAttribute(routeName: "default");
+            var expectedMessage = "Value cannot be null or empty.";
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => attribute.FormatAdditionalFieldsForClientValidation(property),
+                "property",
+                expectedMessage);
+        }
+
+        [Theory]
+        [MemberData(nameof(NullOrEmptyNames))]
+        public void FormatPropertyForClientValidation_WithInvalidPropertyName_Throws(string property)
+        {
+            // Arrange
+            var expected = "Value cannot be null or empty.";
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => RemoteAttribute.FormatPropertyForClientValidation(property),
+                "property",
+                expected);
+        }
+
+        [Fact]
+        public void AddValidation_WithBadRouteName_Throws()
+        {
+            // Arrange
+            var attribute = new RemoteAttribute("nonexistentRoute");
+            var context = GetValidationContextWithArea(currentArea: null);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => attribute.AddValidation(context));
+            Assert.Equal("No URL for remote validation could be found.", exception.Message);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_WithRoute_CallsUrlHelperWithExpectedValues()
+        {
+            // Arrange
+            var routeName = "RouteName";
+            var attribute = new RemoteAttribute(routeName);
+            var url = "/my/URL";
+            var urlHelper = new MockUrlHelper(url, routeName);
+            var context = GetValidationContext(urlHelper);
+
+            // Act
+            attribute.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote", kvp.Key); Assert.Equal("'Length' is invalid.", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-additionalfields", kvp.Key); Assert.Equal("*.Length", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-url", kvp.Key); Assert.Equal(url, kvp.Value); });
+
+            var routeDictionary = Assert.IsType<RouteValueDictionary>(urlHelper.RouteValues);
+            Assert.Empty(routeDictionary);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_WithActionController_CallsUrlHelperWithExpectedValues()
+        {
+            // Arrange
+            var attribute = new RemoteAttribute("Action", "Controller");
+            var url = "/Controller/Action";
+            var urlHelper = new MockUrlHelper(url, routeName: null);
+            var context = GetValidationContext(urlHelper);
+
+            // Act
+            attribute.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote", kvp.Key); Assert.Equal("'Length' is invalid.", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-additionalfields", kvp.Key); Assert.Equal("*.Length", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-url", kvp.Key); Assert.Equal(url, kvp.Value); });
+
+            var routeDictionary = Assert.IsType<RouteValueDictionary>(urlHelper.RouteValues);
+            Assert.Equal(2, routeDictionary.Count);
+            Assert.Equal("Action", routeDictionary["action"] as string);
+            Assert.Equal("Controller", routeDictionary["controller"] as string);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_WithActionController_PropertiesSet_CallsUrlHelperWithExpectedValues()
+        {
+            // Arrange
+            var attribute = new RemoteAttribute("Action", "Controller")
+            {
+                HttpMethod = "POST",
+                AdditionalFields = "Password,ConfirmPassword",
+            };
+            var url = "/Controller/Action";
+            var urlHelper = new MockUrlHelper(url, routeName: null);
+            var context = GetValidationContext(urlHelper);
+
+            // Act
+            attribute.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote", kvp.Key); Assert.Equal("'Length' is invalid.", kvp.Value); },
+                kvp =>
+                {
+                    Assert.Equal("data-val-remote-additionalfields", kvp.Key);
+                    Assert.Equal("*.Length,*.Password,*.ConfirmPassword", kvp.Value);
+                },
+                kvp => { Assert.Equal("data-val-remote-type", kvp.Key); Assert.Equal("POST", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-url", kvp.Key); Assert.Equal(url, kvp.Value); });
+
+            var routeDictionary = Assert.IsType<RouteValueDictionary>(urlHelper.RouteValues);
+            Assert.Equal(2, routeDictionary.Count);
+            Assert.Equal("Action", routeDictionary["action"] as string);
+            Assert.Equal("Controller", routeDictionary["controller"] as string);
+        }
+
+        [Fact]
+        public void AddValidation_WithErrorMessage_SetsAttributesAsExpected()
+        {
+            // Arrange
+            var expected = "Error about 'Length' from override.";
+            var attribute = new RemoteAttribute("Action", "Controller")
+            {
+                HttpMethod = "POST",
+                ErrorMessage = "Error about '{0}' from override.",
+            };
+            var url = "/Controller/Action";
+            var context = GetValidationContext(url);
+
+            // Act
+            attribute.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp =>
+                {
+                    Assert.Equal("data-val-remote", kvp.Key);
+                    Assert.Equal(expected, kvp.Value);
+                },
+                kvp =>
+                {
+                    Assert.Equal("data-val-remote-additionalfields", kvp.Key);
+                    Assert.Equal("*.Length", kvp.Value);
+                },
+                kvp => { Assert.Equal("data-val-remote-type", kvp.Key); Assert.Equal("POST", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-url", kvp.Key); Assert.Equal(url, kvp.Value); });
+        }
+
+        [Fact]
+        public void AddValidation_WithErrorMessageAndLocalizerFactory_SetsAttributesAsExpected()
+        {
+            // Arrange
+            var expected = "Error about 'Length' from override.";
+            var attribute = new RemoteAttribute("Action", "Controller")
+            {
+                HttpMethod = "POST",
+                ErrorMessage = "Error about '{0}' from override.",
+            };
+            var url = "/Controller/Action";
+            var context = GetValidationContextWithLocalizerFactory(url);
+
+            // Act
+            attribute.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp =>
+                {
+                    // IStringLocalizerFactory existence alone is insufficient to change error message.
+                    Assert.Equal("data-val-remote", kvp.Key);
+                    Assert.Equal(expected, kvp.Value);
+                },
+                kvp =>
+                {
+                    Assert.Equal("data-val-remote-additionalfields", kvp.Key);
+                    Assert.Equal("*.Length", kvp.Value);
+                },
+                kvp => { Assert.Equal("data-val-remote-type", kvp.Key); Assert.Equal("POST", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-url", kvp.Key); Assert.Equal(url, kvp.Value); });
+        }
+
+        [Fact]
+        public void AddValidation_WithErrorMessageAndLocalizerProvider_SetsAttributesAsExpected()
+        {
+            // Arrange
+            var expected = "Error about 'Length' from override.";
+            var attribute = new RemoteAttribute("Action", "Controller")
+            {
+                HttpMethod = "POST",
+                ErrorMessage = "Error about '{0}' from override.",
+            };
+            var url = "/Controller/Action";
+            var context = GetValidationContext(url);
+
+            var options = context.ActionContext.HttpContext.RequestServices
+                .GetRequiredService<IOptions<MvcDataAnnotationsLocalizationOptions>>();
+            var localizer = new Mock<IStringLocalizer>(MockBehavior.Strict);
+            options.Value.DataAnnotationLocalizerProvider = (type, factory) => localizer.Object;
+
+            // Act
+            attribute.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp =>
+                {
+                    // Non-null DataAnnotationLocalizerProvider alone is insufficient to change error message.
+                    Assert.Equal("data-val-remote", kvp.Key);
+                    Assert.Equal(expected, kvp.Value);
+                },
+                kvp =>
+                {
+                    Assert.Equal("data-val-remote-additionalfields", kvp.Key);
+                    Assert.Equal("*.Length", kvp.Value);
+                },
+                kvp => { Assert.Equal("data-val-remote-type", kvp.Key); Assert.Equal("POST", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-url", kvp.Key); Assert.Equal(url, kvp.Value); });
+        }
+
+        [Fact]
+        public void AddValidation_WithErrorMessageLocalizerFactoryAndLocalizerProvider_SetsAttributesAsExpected()
+        {
+            // Arrange
+            var expected = "Error about 'Length' from localizer.";
+            var attribute = new RemoteAttribute("Action", "Controller")
+            {
+                HttpMethod = "POST",
+                ErrorMessage = "Error about '{0}' from override.",
+            };
+            var url = "/Controller/Action";
+            var context = GetValidationContextWithLocalizerFactory(url);
+
+            var localizedString = new LocalizedString("Fred", expected);
+            var localizer = new Mock<IStringLocalizer>(MockBehavior.Strict);
+            localizer
+                .Setup(l => l["Error about '{0}' from override.", "Length"])
+                .Returns(localizedString)
+                .Verifiable();
+            var options = context.ActionContext.HttpContext.RequestServices
+                .GetRequiredService<IOptions<MvcDataAnnotationsLocalizationOptions>>();
+            options.Value.DataAnnotationLocalizerProvider = (type, factory) => localizer.Object;
+
+            // Act
+            attribute.AddValidation(context);
+
+            // Assert
+            localizer.VerifyAll();
+
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp =>
+                {
+                    Assert.Equal("data-val-remote", kvp.Key);
+                    Assert.Equal(expected, kvp.Value);
+                },
+                kvp =>
+                {
+                    Assert.Equal("data-val-remote-additionalfields", kvp.Key);
+                    Assert.Equal("*.Length", kvp.Value);
+                },
+                kvp => { Assert.Equal("data-val-remote-type", kvp.Key); Assert.Equal("POST", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-url", kvp.Key); Assert.Equal(url, kvp.Value); });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_WithErrorResourcesLocalizerFactoryAndLocalizerProvider_SetsAttributesAsExpected()
+        {
+            // Arrange
+            var expected = "Error about 'Length' from resources.";
+            var attribute = new RemoteAttribute("Action", "Controller")
+            {
+                HttpMethod = "POST",
+                ErrorMessageResourceName = nameof(Resources.RemoteAttribute_Error),
+                ErrorMessageResourceType = typeof(Resources),
+            };
+            var url = "/Controller/Action";
+            var context = GetValidationContextWithLocalizerFactory(url);
+
+            var localizer = new Mock<IStringLocalizer>(MockBehavior.Strict);
+            var options = context.ActionContext.HttpContext.RequestServices
+                .GetRequiredService<IOptions<MvcDataAnnotationsLocalizationOptions>>();
+            options.Value.DataAnnotationLocalizerProvider = (type, factory) => localizer.Object;
+
+            // Act
+            attribute.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp =>
+                {
+                    // Configuring the attribute using ErrorMessageResource* trumps available IStringLocalizer etc.
+                    Assert.Equal("data-val-remote", kvp.Key);
+                    Assert.Equal(expected, kvp.Value);
+                },
+                kvp =>
+                {
+                    Assert.Equal("data-val-remote-additionalfields", kvp.Key);
+                    Assert.Equal("*.Length", kvp.Value);
+                },
+                kvp => { Assert.Equal("data-val-remote-type", kvp.Key); Assert.Equal("POST", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-url", kvp.Key); Assert.Equal(url, kvp.Value); });
+        }
+
+        [Fact]
+        public void AddValidation_WithErrorMessageAndDisplayName_SetsAttributesAsExpected()
+        {
+            // Arrange
+            var expected = "Error about 'Display Length' from override.";
+            var attribute = new RemoteAttribute("Action", "Controller")
+            {
+                HttpMethod = "POST",
+                ErrorMessage = "Error about '{0}' from override.",
+            };
+
+            var url = "/Controller/Action";
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider
+                .ForProperty(typeof(string), nameof(string.Length))
+                .DisplayDetails(d => d.DisplayName = () => "Display Length");
+            var context = GetValidationContext(url, metadataProvider);
+
+            // Act
+            attribute.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp =>
+                {
+                    Assert.Equal("data-val-remote", kvp.Key);
+                    Assert.Equal(expected, kvp.Value);
+                },
+                kvp =>
+                {
+                    Assert.Equal("data-val-remote-additionalfields", kvp.Key);
+                    Assert.Equal("*.Length", kvp.Value);
+                },
+                kvp => { Assert.Equal("data-val-remote-type", kvp.Key); Assert.Equal("POST", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-url", kvp.Key); Assert.Equal(url, kvp.Value); });
+        }
+
+        [Fact]
+        public void AddValidation_WithErrorMessageLocalizerFactoryLocalizerProviderAndDisplayName_SetsAttributesAsExpected()
+        {
+            // Arrange
+            var expected = "Error about 'Length' from localizer.";
+            var attribute = new RemoteAttribute("Action", "Controller")
+            {
+                HttpMethod = "POST",
+                ErrorMessage = "Error about '{0}' from override.",
+            };
+
+            var url = "/Controller/Action";
+            var metadataProvider = new TestModelMetadataProvider();
+            metadataProvider
+                .ForProperty(typeof(string), nameof(string.Length))
+                .DisplayDetails(d => d.DisplayName = () => "Display Length");
+            var context = GetValidationContextWithLocalizerFactory(url, metadataProvider);
+
+            var localizedString = new LocalizedString("Fred", expected);
+            var localizer = new Mock<IStringLocalizer>(MockBehavior.Strict);
+            localizer
+                .Setup(l => l["Error about '{0}' from override.", "Display Length"])
+                .Returns(localizedString)
+                .Verifiable();
+            var options = context.ActionContext.HttpContext.RequestServices
+                .GetRequiredService<IOptions<MvcDataAnnotationsLocalizationOptions>>();
+            options.Value.DataAnnotationLocalizerProvider = (type, factory) => localizer.Object;
+
+            // Act
+            attribute.AddValidation(context);
+
+            // Assert
+            localizer.VerifyAll();
+
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp =>
+                {
+                    Assert.Equal("data-val-remote", kvp.Key);
+                    Assert.Equal(expected, kvp.Value);
+                },
+                kvp =>
+                {
+                    Assert.Equal("data-val-remote-additionalfields", kvp.Key);
+                    Assert.Equal("*.Length", kvp.Value);
+                },
+                kvp => { Assert.Equal("data-val-remote-type", kvp.Key); Assert.Equal("POST", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-url", kvp.Key); Assert.Equal(url, kvp.Value); });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_WithActionControllerArea_CallsUrlHelperWithExpectedValues()
+        {
+            // Arrange
+            var attribute = new RemoteAttribute("Action", "Controller", "Test")
+            {
+                HttpMethod = "POST",
+            };
+            var url = "/Test/Controller/Action";
+            var urlHelper = new MockUrlHelper(url, routeName: null);
+            var context = GetValidationContext(urlHelper);
+
+            // Act
+            attribute.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote", kvp.Key); Assert.Equal("'Length' is invalid.", kvp.Value); },
+                kvp =>
+                {
+                    Assert.Equal("data-val-remote-additionalfields", kvp.Key);
+                    Assert.Equal("*.Length", kvp.Value);
+                },
+                kvp => { Assert.Equal("data-val-remote-type", kvp.Key); Assert.Equal("POST", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-url", kvp.Key); Assert.Equal(url, kvp.Value); });
+
+            var routeDictionary = Assert.IsType<RouteValueDictionary>(urlHelper.RouteValues);
+            Assert.Equal(3, routeDictionary.Count);
+            Assert.Equal("Action", routeDictionary["action"] as string);
+            Assert.Equal("Controller", routeDictionary["controller"] as string);
+            Assert.Equal("Test", routeDictionary["area"] as string);
+        }
+
+        // Root area is current in this case.
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_WithActionController_FindsControllerInCurrentArea()
+        {
+            // Arrange
+            var attribute = new RemoteAttribute("Action", "Controller");
+            var context = GetValidationContextWithArea(currentArea: null);
+
+            // Act
+            attribute.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote", kvp.Key); Assert.Equal("'Length' is invalid.", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-additionalfields", kvp.Key); Assert.Equal("*.Length", kvp.Value); },
+                kvp =>
+                {
+                    Assert.Equal("data-val-remote-url", kvp.Key);
+                    Assert.Equal("/Controller/Action", kvp.Value);
+                });
+        }
+
+        // Test area is current in this case.
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_WithActionControllerInArea_FindsControllerInCurrentArea()
+        {
+            // Arrange
+            var attribute = new RemoteAttribute("Action", "Controller");
+            var context = GetValidationContextWithArea(currentArea: "Test");
+
+            // Act
+            attribute.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote", kvp.Key); Assert.Equal("'Length' is invalid.", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-additionalfields", kvp.Key); Assert.Equal("*.Length", kvp.Value); },
+                kvp =>
+                {
+                    Assert.Equal("data-val-remote-url", kvp.Key);
+                    Assert.Equal("/Test/Controller/Action", kvp.Value);
+                });
+        }
+
+        // Explicit reference to the (current) root area.
+        [Theory]
+        [MemberData(nameof(NullOrEmptyNames))]
+        [ReplaceCulture]
+        public void AddValidation_WithActionControllerArea_FindsControllerInRootArea(string areaName)
+        {
+            // Arrange
+            var attribute = new RemoteAttribute("Action", "Controller", areaName);
+            var context = GetValidationContextWithArea(currentArea: null);
+
+            // Act
+            attribute.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote", kvp.Key); Assert.Equal("'Length' is invalid.", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-additionalfields", kvp.Key); Assert.Equal("*.Length", kvp.Value); },
+                kvp =>
+                {
+                    Assert.Equal("data-val-remote-url", kvp.Key);
+                    Assert.Equal("/Controller/Action", kvp.Value);
+                });
+        }
+
+        // Test area is current in this case.
+        [Theory]
+        [MemberData(nameof(NullOrEmptyNames))]
+        [ReplaceCulture]
+        public void AddValidation_WithActionControllerAreaInArea_FindsControllerInRootArea(string areaName)
+        {
+            // Arrange
+            var attribute = new RemoteAttribute("Action", "Controller", areaName);
+            var context = GetValidationContextWithArea(currentArea: "Test");
+
+            // Act
+            attribute.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote", kvp.Key); Assert.Equal("'Length' is invalid.", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-additionalfields", kvp.Key); Assert.Equal("*.Length", kvp.Value); },
+                kvp =>
+                {
+                    Assert.Equal("data-val-remote-url", kvp.Key);
+                    Assert.Equal("/Controller/Action", kvp.Value);
+                });
+        }
+
+        // Root area is current in this case.
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_WithActionControllerArea_FindsControllerInNamedArea()
+        {
+            // Arrange
+            var attribute = new RemoteAttribute("Action", "Controller", "Test");
+            var context = GetValidationContextWithArea(currentArea: null);
+
+            // Act
+            attribute.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote", kvp.Key); Assert.Equal("'Length' is invalid.", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-additionalfields", kvp.Key); Assert.Equal("*.Length", kvp.Value); },
+                kvp =>
+                {
+                    Assert.Equal("data-val-remote-url", kvp.Key);
+                    Assert.Equal("/Test/Controller/Action", kvp.Value);
+                });
+        }
+
+        // Explicit reference to the current (Test) area.
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_WithActionControllerAreaInArea_FindsControllerInNamedArea()
+        {
+            // Arrange
+            var attribute = new RemoteAttribute("Action", "Controller", "Test");
+            var context = GetValidationContextWithArea(currentArea: "Test");
+
+            // Act
+            attribute.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote", kvp.Key); Assert.Equal("'Length' is invalid.", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-additionalfields", kvp.Key); Assert.Equal("*.Length", kvp.Value); },
+                kvp =>
+                {
+                    Assert.Equal("data-val-remote-url", kvp.Key);
+                    Assert.Equal("/Test/Controller/Action", kvp.Value);
+                });
+        }
+
+        // Test area is current in this case.
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidation_WithActionControllerAreaInArea_FindsControllerInDifferentArea()
+        {
+            // Arrange
+            var attribute = new RemoteAttribute("Action", "Controller", "AnotherArea");
+            var context = GetValidationContextWithArea(currentArea: "Test");
+
+            // Act
+            attribute.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("true", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote", kvp.Key); Assert.Equal("'Length' is invalid.", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-additionalfields", kvp.Key); Assert.Equal("*.Length", kvp.Value); },
+                kvp =>
+                {
+                    Assert.Equal("data-val-remote-url", kvp.Key);
+                    Assert.Equal("/AnotherArea/Controller/Action", kvp.Value);
+                });
+        }
+
+        // Test area is current in this case.
+        [Fact]
+        public void AddValidation_DoesNotTrounceExistingAttributes()
+        {
+            // Arrange
+            var attribute = new RemoteAttribute("Action", "Controller", "AnotherArea")
+            {
+                HttpMethod = "PUT",
+            };
+
+            var context = GetValidationContextWithArea(currentArea: "Test");
+
+            context.Attributes.Add("data-val", "original");
+            context.Attributes.Add("data-val-remote", "original");
+            context.Attributes.Add("data-val-remote-additionalfields", "original");
+            context.Attributes.Add("data-val-remote-type", "original");
+            context.Attributes.Add("data-val-remote-url", "original");
+
+            // Act
+            attribute.AddValidation(context);
+
+            // Assert
+            Assert.Collection(
+                context.Attributes,
+                kvp => { Assert.Equal("data-val", kvp.Key); Assert.Equal("original", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote", kvp.Key); Assert.Equal("original", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-additionalfields", kvp.Key); Assert.Equal("original", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-type", kvp.Key); Assert.Equal("original", kvp.Value); },
+                kvp => { Assert.Equal("data-val-remote-url", kvp.Key); Assert.Equal("original", kvp.Value); });
+        }
+
+        private static ClientModelValidationContext GetValidationContext(
+            string url,
+            IModelMetadataProvider metadataProvider = null)
+        {
+            var urlHelper = new MockUrlHelper(url, routeName: null);
+            return GetValidationContext(urlHelper, localizerFactory: null, metadataProvider: metadataProvider);
+        }
+
+        private static ClientModelValidationContext GetValidationContextWithLocalizerFactory(
+            string url,
+            IModelMetadataProvider metadataProvider = null)
+        {
+            var urlHelper = new MockUrlHelper(url, routeName: null);
+            var localizerFactory = new Mock<IStringLocalizerFactory>(MockBehavior.Strict);
+            return GetValidationContext(urlHelper, localizerFactory.Object, metadataProvider);
+        }
+
+        private static ClientModelValidationContext GetValidationContext(
+            IUrlHelper urlHelper,
+            IStringLocalizerFactory localizerFactory = null,
+            IModelMetadataProvider metadataProvider = null)
+        {
+            var serviceCollection = GetServiceCollection(localizerFactory);
+            var factory = new Mock<IUrlHelperFactory>(MockBehavior.Strict);
+            serviceCollection.AddSingleton<IUrlHelperFactory>(factory.Object);
+
+            var serviceProvider = serviceCollection.BuildServiceProvider();
+            var actionContext = GetActionContext(serviceProvider, routeData: null);
+
+            factory
+                .Setup(f => f.GetUrlHelper(actionContext))
+                .Returns(urlHelper);
+
+            var metadata = _metadata;
+            if (metadataProvider == null)
+            {
+                metadataProvider = _metadataProvider;
+            }
+            else
+            {
+                metadata = metadataProvider.GetMetadataForProperty(typeof(string), nameof(string.Length));
+            }
+
+            return new ClientModelValidationContext(
+                actionContext,
+                metadata,
+                metadataProvider,
+                new AttributeDictionary());
+        }
+
+        private static ClientModelValidationContext GetValidationContextWithArea(string currentArea)
+        {
+            var serviceCollection = GetServiceCollection(localizerFactory: null);
+            var serviceProvider = serviceCollection.BuildServiceProvider();
+            var routeCollection = GetRouteCollectionWithArea(serviceProvider);
+            var routeData = new RouteData
+            {
+                Routers =
+                {
+                    routeCollection,
+                },
+                Values =
+                {
+                    { "action", "Index" },
+                    { "controller", "Home" },
+                },
+            };
+            if (!string.IsNullOrEmpty(currentArea))
+            {
+                routeData.Values["area"] = currentArea;
+            }
+
+            var actionContext = GetActionContext(serviceProvider, routeData);
+
+            var urlHelper = new UrlHelper(actionContext);
+            var factory = new Mock<IUrlHelperFactory>(MockBehavior.Strict);
+            factory
+                .Setup(f => f.GetUrlHelper(actionContext))
+                .Returns(urlHelper);
+
+            // Make an IUrlHelperFactory available through the ActionContext.
+            serviceCollection.AddSingleton<IUrlHelperFactory>(factory.Object);
+            serviceProvider = serviceCollection.BuildServiceProvider();
+            actionContext.HttpContext.RequestServices = serviceProvider;
+
+            return new ClientModelValidationContext(
+                 actionContext,
+                 _metadata,
+                 _metadataProvider,
+                 new AttributeDictionary());
+        }
+
+        private static IRouter GetRouteCollectionWithArea(IServiceProvider serviceProvider)
+        {
+            var builder = GetRouteBuilder(serviceProvider);
+
+            // Setting IsBound to true makes order more important than usual. First try the route that requires the
+            // area value. Skip usual "area:exists" constraint because that isn't relevant for link generation and it
+            // complicates the setup significantly.
+            builder.MapRoute("areaRoute", "{area}/{controller}/{action}");
+            builder.MapRoute("default", "{controller}/{action}", new { controller = "Home", action = "Index" });
+
+            return builder.Build();
+        }
+
+        private static IRouter GetRouteCollectionWithNoController(IServiceProvider serviceProvider)
+        {
+            var builder = GetRouteBuilder(serviceProvider);
+            builder.MapRoute("default", "static/route");
+
+            return builder.Build();
+        }
+
+        private static RouteBuilder GetRouteBuilder(IServiceProvider serviceProvider)
+        {
+            var app = new Mock<IApplicationBuilder>(MockBehavior.Strict);
+            app
+                .SetupGet(a => a.ApplicationServices)
+                .Returns(serviceProvider);
+
+            var builder = new RouteBuilder(app.Object);
+
+            var handler = new Mock<IRouter>(MockBehavior.Strict);
+            handler
+                .Setup(router => router.GetVirtualPath(It.IsAny<VirtualPathContext>()))
+                .Returns((VirtualPathData)null);
+            builder.DefaultHandler = handler.Object;
+
+            return builder;
+        }
+
+        private static ActionContext GetActionContext(IServiceProvider serviceProvider, RouteData routeData)
+        {
+            // Set IServiceProvider properties because TemplateRoute gets services (e.g. an ILoggerFactory instance)
+            // through the HttpContext.
+            var httpContext = new DefaultHttpContext
+            {
+                RequestServices = serviceProvider,
+            };
+
+            if (routeData == null)
+            {
+                routeData = new RouteData
+                {
+                    Routers = { Mock.Of<IRouter>(), },
+                };
+            }
+
+            return new ActionContext(httpContext, routeData, new ActionDescriptor());
+        }
+
+        private static ServiceCollection GetServiceCollection(IStringLocalizerFactory localizerFactory)
+        {
+            var serviceCollection = new ServiceCollection();
+            serviceCollection
+                .AddSingleton<ObjectPoolProvider, DefaultObjectPoolProvider>()
+                .AddSingleton<ILoggerFactory>(new NullLoggerFactory());
+
+            serviceCollection.AddOptions();
+            serviceCollection.AddRouting();
+
+            serviceCollection.AddSingleton<IInlineConstraintResolver>(
+                provider => new DefaultInlineConstraintResolver(provider.GetRequiredService<IOptions<RouteOptions>>()));
+
+            if (localizerFactory != null)
+            {
+                serviceCollection.AddSingleton<IStringLocalizerFactory>(localizerFactory);
+            }
+
+            return serviceCollection;
+        }
+
+        private class MockUrlHelper : IUrlHelper
+        {
+            private readonly string _routeName;
+            private readonly string _url;
+
+            public MockUrlHelper(string url, string routeName)
+            {
+                _routeName = routeName;
+                _url = url;
+            }
+
+            public ActionContext ActionContext { get; }
+
+            public object RouteValues { get; private set; }
+
+            public string Action(UrlActionContext actionContext)
+            {
+                throw new NotImplementedException();
+            }
+
+            public string Content(string contentPath)
+            {
+                throw new NotImplementedException();
+            }
+
+            public bool IsLocalUrl(string url)
+            {
+                throw new NotImplementedException();
+            }
+
+            public string Link(string routeName, object values)
+            {
+                throw new NotImplementedException();
+            }
+
+            public string RouteUrl(UrlRouteContext routeContext)
+            {
+                Assert.Equal(_routeName, routeContext.RouteName);
+                Assert.Null(routeContext.Protocol);
+                Assert.Null(routeContext.Host);
+                Assert.Null(routeContext.Fragment);
+
+                RouteValues = routeContext.Values;
+
+                return _url;
+            }
+        }
+
+        private class TestableRemoteAttribute : RemoteAttribute
+        {
+            public TestableRemoteAttribute(string routeName)
+                : base(routeName)
+            {
+            }
+
+            public TestableRemoteAttribute(string action, string controller)
+                : base(action, controller)
+            {
+            }
+
+            public TestableRemoteAttribute(string action, string controller, string areaName)
+                : base(action, controller, areaName)
+            {
+            }
+
+            public new string RouteName
+            {
+                get
+                {
+                    return base.RouteName;
+                }
+            }
+
+            public new RouteValueDictionary RouteData
+            {
+                get
+                {
+                    return base.RouteData;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs
new file mode 100644
index 0000000000..75649f3223
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs
@@ -0,0 +1,349 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public class DefaultTemplatesUtilities
+    {
+        public class ObjectTemplateModel
+        {
+            public ObjectTemplateModel()
+            {
+                ComplexInnerModel = new object();
+            }
+
+            public string Property1 { get; set; }
+            [Display(Name = "Prop2")]
+            public string Property2 { get; set; }
+            public object ComplexInnerModel { get; set; }
+        }
+
+        public class ObjectWithScaffoldColumn
+        {
+            public string Property1 { get; set; }
+
+            [ScaffoldColumn(false)]
+            public string Property2 { get; set; }
+
+            [ScaffoldColumn(true)]
+            public string Property3 { get; set; }
+        }
+
+        public static HtmlHelper<ObjectTemplateModel> GetHtmlHelper()
+        {
+            return GetHtmlHelper<ObjectTemplateModel>(model: null);
+        }
+
+        public static HtmlHelper<IEnumerable<ObjectTemplateModel>> GetHtmlHelperForEnumerable()
+        {
+            return GetHtmlHelper<IEnumerable<ObjectTemplateModel>>(model: null);
+        }
+
+        public static HtmlHelper<ObjectTemplateModel> GetHtmlHelper(IUrlHelper urlHelper)
+        {
+            return GetHtmlHelper<ObjectTemplateModel>(
+                model: null,
+                urlHelper: urlHelper,
+                viewEngine: CreateViewEngine(),
+                provider: TestModelMetadataProvider.CreateDefaultProvider());
+        }
+
+        public static HtmlHelper<ObjectTemplateModel> GetHtmlHelper(IHtmlGenerator htmlGenerator)
+        {
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            return GetHtmlHelper<ObjectTemplateModel>(
+                new ViewDataDictionary<ObjectTemplateModel>(metadataProvider),
+                CreateUrlHelper(),
+                CreateViewEngine(),
+                metadataProvider,
+                innerHelperWrapper: null,
+                htmlGenerator: htmlGenerator,
+                idAttributeDotReplacement: null);
+        }
+
+        public static HtmlHelper<TModel> GetHtmlHelper<TModel>(ViewDataDictionary<TModel> viewData)
+        {
+            return GetHtmlHelper(
+                viewData,
+                CreateUrlHelper(),
+                CreateViewEngine(),
+                TestModelMetadataProvider.CreateDefaultProvider(),
+                innerHelperWrapper: null,
+                htmlGenerator: null,
+                idAttributeDotReplacement: null);
+        }
+
+        public static HtmlHelper<TModel> GetHtmlHelper<TModel>(
+            ViewDataDictionary<TModel> viewData,
+            string idAttributeDotReplacement)
+        {
+            return GetHtmlHelper(
+                viewData,
+                CreateUrlHelper(),
+                CreateViewEngine(),
+                TestModelMetadataProvider.CreateDefaultProvider(),
+                innerHelperWrapper: null,
+                htmlGenerator: null,
+                idAttributeDotReplacement: idAttributeDotReplacement);
+        }
+
+        public static HtmlHelper<TModel> GetHtmlHelper<TModel>(TModel model)
+        {
+            return GetHtmlHelper(model, CreateViewEngine());
+        }
+
+        public static HtmlHelper<TModel> GetHtmlHelper<TModel>(TModel model, string idAttributeDotReplacement)
+        {
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var viewData = new ViewDataDictionary<TModel>(provider);
+            viewData.Model = model;
+
+            return GetHtmlHelper(
+                viewData,
+                CreateUrlHelper(),
+                CreateViewEngine(),
+                provider,
+                innerHelperWrapper: null,
+                htmlGenerator: null,
+                idAttributeDotReplacement: idAttributeDotReplacement);
+        }
+
+        public static HtmlHelper<IEnumerable<TModel>> GetHtmlHelperForEnumerable<TModel>(TModel model)
+        {
+            return GetHtmlHelper<IEnumerable<TModel>>(new TModel[] { model });
+        }
+
+        public static HtmlHelper<TModel> GetHtmlHelper<TModel>(IModelMetadataProvider provider)
+        {
+            return GetHtmlHelper<TModel>(model: default(TModel), provider: provider);
+        }
+
+        public static HtmlHelper<ObjectTemplateModel> GetHtmlHelper(IModelMetadataProvider provider)
+        {
+            return GetHtmlHelper<ObjectTemplateModel>(model: null, provider: provider);
+        }
+
+        public static HtmlHelper<IEnumerable<ObjectTemplateModel>> GetHtmlHelperForEnumerable(
+            IModelMetadataProvider provider)
+        {
+            return GetHtmlHelper<IEnumerable<ObjectTemplateModel>>(model: null, provider: provider);
+        }
+
+        public static HtmlHelper<TModel> GetHtmlHelper<TModel>(TModel model, IModelMetadataProvider provider)
+        {
+            return GetHtmlHelper(model, CreateUrlHelper(), CreateViewEngine(), provider);
+        }
+
+        public static HtmlHelper<TModel> GetHtmlHelper<TModel>(
+            TModel model,
+            ICompositeViewEngine viewEngine,
+            IStringLocalizerFactory stringLocalizerFactory = null)
+        {
+            return GetHtmlHelper(
+                model,
+                CreateUrlHelper(),
+                viewEngine,
+                TestModelMetadataProvider.CreateDefaultProvider(stringLocalizerFactory));
+        }
+
+        public static HtmlHelper<TModel> GetHtmlHelper<TModel>(
+            TModel model,
+            ICompositeViewEngine viewEngine,
+            Func<IHtmlHelper, IHtmlHelper> innerHelperWrapper)
+        {
+            return GetHtmlHelper(
+                model,
+                CreateUrlHelper(),
+                viewEngine,
+                TestModelMetadataProvider.CreateDefaultProvider(),
+                innerHelperWrapper);
+        }
+
+        public static HtmlHelper<TModel> GetHtmlHelper<TModel>(
+            TModel model,
+            IUrlHelper urlHelper,
+            ICompositeViewEngine viewEngine,
+            IModelMetadataProvider provider)
+        {
+            return GetHtmlHelper(model, urlHelper, viewEngine, provider, innerHelperWrapper: null);
+        }
+
+        public static HtmlHelper<TModel> GetHtmlHelper<TModel>(
+            TModel model,
+            IUrlHelper urlHelper,
+            ICompositeViewEngine viewEngine,
+            IModelMetadataProvider provider,
+            Func<IHtmlHelper, IHtmlHelper> innerHelperWrapper)
+        {
+            var viewData = new ViewDataDictionary<TModel>(provider);
+            viewData.Model = model;
+
+            return GetHtmlHelper(
+                viewData,
+                urlHelper,
+                viewEngine,
+                provider,
+                innerHelperWrapper,
+                htmlGenerator: null,
+                idAttributeDotReplacement: null);
+        }
+
+        private static HtmlHelper<TModel> GetHtmlHelper<TModel>(
+            ViewDataDictionary<TModel> viewData,
+            IUrlHelper urlHelper,
+            ICompositeViewEngine viewEngine,
+            IModelMetadataProvider provider,
+            Func<IHtmlHelper, IHtmlHelper> innerHelperWrapper,
+            IHtmlGenerator htmlGenerator,
+            string idAttributeDotReplacement)
+        {
+            var httpContext = new DefaultHttpContext();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            var options = new MvcViewOptions();
+            if (!string.IsNullOrEmpty(idAttributeDotReplacement))
+            {
+                options.HtmlHelperOptions.IdAttributeDotReplacement = idAttributeDotReplacement;
+            }
+            var localizationOptionsAccesor = new Mock<IOptions<MvcDataAnnotationsLocalizationOptions>>();
+
+            localizationOptionsAccesor.SetupGet(o => o.Value).Returns(new MvcDataAnnotationsLocalizationOptions());
+
+            options.ClientModelValidatorProviders.Add(new DataAnnotationsClientModelValidatorProvider(
+                new ValidationAttributeAdapterProvider(),
+                localizationOptionsAccesor.Object,
+                stringLocalizerFactory: null));
+
+            var urlHelperFactory = new Mock<IUrlHelperFactory>();
+            urlHelperFactory
+                .Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>()))
+                .Returns(urlHelper);
+
+            var expressionTextCache = new ExpressionTextCache();
+
+            if (htmlGenerator == null)
+            {
+                htmlGenerator = HtmlGeneratorUtilities.GetHtmlGenerator(provider, urlHelperFactory.Object, options);
+            }
+
+            // TemplateRenderer will Contextualize this transient service.
+            var innerHelper = (IHtmlHelper)new HtmlHelper(
+                htmlGenerator,
+                viewEngine,
+                provider,
+                new TestViewBufferScope(),
+                new HtmlTestEncoder(),
+                UrlEncoder.Default);
+
+            if (innerHelperWrapper != null)
+            {
+                innerHelper = innerHelperWrapper(innerHelper);
+            }
+
+            var serviceProvider = new ServiceCollection()
+               .AddSingleton(viewEngine)
+               .AddSingleton(urlHelperFactory.Object)
+               .AddSingleton(Mock.Of<IViewComponentHelper>())
+               .AddSingleton(innerHelper)
+               .AddSingleton<IViewBufferScope, TestViewBufferScope>()
+               .BuildServiceProvider();
+
+            httpContext.RequestServices = serviceProvider;
+
+            var htmlHelper = new HtmlHelper<TModel>(
+                htmlGenerator,
+                viewEngine,
+                provider,
+                new TestViewBufferScope(),
+                new HtmlTestEncoder(),
+                UrlEncoder.Default,
+                expressionTextCache);
+
+            var viewContext = new ViewContext(
+                actionContext,
+                Mock.Of<IView>(),
+                viewData,
+                new TempDataDictionary(
+                    httpContext,
+                    Mock.Of<ITempDataProvider>()),
+                new StringWriter(),
+                options.HtmlHelperOptions);
+
+            htmlHelper.Contextualize(viewContext);
+
+            return htmlHelper;
+        }
+
+        private static ICompositeViewEngine CreateViewEngine()
+        {
+            var view = new Mock<IView>();
+            view
+                .Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback(async (ViewContext v) =>
+                {
+                    view.ToString();
+                    await v.Writer.WriteAsync(FormatOutput(v.ViewData.ModelExplorer));
+                })
+                .Returns(Task.FromResult(0));
+
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("MyView", Enumerable.Empty<string>()))
+                .Verifiable();
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("MyView", view.Object))
+                .Verifiable();
+
+            return viewEngine.Object;
+        }
+
+        public static string FormatOutput(IHtmlHelper helper, object model)
+        {
+            var modelExplorer = helper.MetadataProvider.GetModelExplorerForType(model.GetType(), model);
+            return FormatOutput(modelExplorer);
+        }
+
+        private static string FormatOutput(ModelExplorer modelExplorer)
+        {
+            var metadata = modelExplorer.Metadata;
+            return string.Format(
+                CultureInfo.InvariantCulture,
+                "Model = {0}, ModelType = {1}, PropertyName = {2}, SimpleDisplayText = {3}",
+                modelExplorer.Model ?? "(null)",
+                metadata.ModelType == null ? "(null)" : metadata.ModelType.FullName,
+                metadata.PropertyName ?? "(null)",
+                modelExplorer.GetSimpleDisplayText() ?? "(null)");
+        }
+
+        private static IUrlHelper CreateUrlHelper()
+        {
+            return Mock.Of<IUrlHelper>();
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperCheckboxTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperCheckboxTest.cs
new file mode 100644
index 0000000000..6f56ab6dde
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperCheckboxTest.cs
@@ -0,0 +1,785 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.IO;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public class HtmlHelperCheckBoxTest
+    {
+        [Fact]
+        public void CheckBoxOverridesCalculatedValuesWithValuesFromHtmlAttributes()
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Boolean");
+            var expected = @"<input checked=""HtmlEncode[[checked]]"" data-val=""HtmlEncode[[true]]"" " +
+                $@"data-val-required=""HtmlEncode[[{requiredMessage}]]"" id=""HtmlEncode[[Property3]]"" " +
+                @"name=""HtmlEncode[[Property3]]"" type=""HtmlEncode[[checkbox]]"" " +
+                @"value=""HtmlEncode[[false]]"" /><input name=""HtmlEncode[[Property3]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetTestModelViewData());
+
+            // Act
+            var html = helper.CheckBox("Property3",
+                                       isChecked: null,
+                                       htmlAttributes: new { @checked = "checked", value = "false" });
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxExplicitParametersOverrideDictionary_ForValueInModel()
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Boolean");
+            var expected = @"<input checked=""HtmlEncode[[checked]]"" data-val=""HtmlEncode[[true]]"" " +
+                $@"data-val-required=""HtmlEncode[[{requiredMessage}]]"" id=""HtmlEncode[[Property3]]"" " +
+                @"name=""HtmlEncode[[Property3]]"" type=""HtmlEncode[[checkbox]]"" " +
+                @"value=""HtmlEncode[[false]]"" /><input name=""HtmlEncode[[Property3]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetTestModelViewData());
+
+            // Act
+            var html = helper.CheckBox("Property3",
+                                       isChecked: true,
+                                       htmlAttributes: new { @checked = "unchecked", value = "false" });
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxExplicitParametersOverrideDictionary_ForNullModel()
+        {
+            // Arrange
+            var expected = @"<input checked=""HtmlEncode[[checked]]"" id=""HtmlEncode[[foo]]"" name=""HtmlEncode[[foo]]"" type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[false]]"" />" +
+                           @"<input name=""HtmlEncode[[foo]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var html = helper.CheckBox("foo",
+                                       isChecked: true,
+                                       htmlAttributes: new { @checked = "unchecked", value = "false" });
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxWithInvalidBooleanThrows()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetTestModelViewData());
+
+            // Act & Assert
+            var ex = Assert.Throws<FormatException>(
+                        () => helper.CheckBox("Property2", isChecked: null, htmlAttributes: null));
+            Assert.Contains("Boolean", ex.Message);
+        }
+
+        [Fact]
+        public void CheckBoxWithNullExpressionThrows()
+        {
+            // Arrange
+            var expected = "The name of an HTML field cannot be null or empty. Instead use methods " +
+                "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper.Editor or Microsoft.AspNetCore.Mvc.Rendering." +
+                "IHtmlHelper`1.EditorFor with a non-empty htmlFieldName argument value.";
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model: false);
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => helper.CheckBox(null, isChecked: true, htmlAttributes: null),
+                "expression",
+                expected);
+        }
+
+        [Fact]
+        public void CheckBoxWithNullExpression_DoesNotThrow_WithNameAttribute()
+        {
+            // Arrange
+            var expected = @"<input class=""HtmlEncode[[some-class]]"" name=""HtmlEncode[[-expression-]]"" " +
+                @"type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" /><input " +
+                @"name=""HtmlEncode[[-expression-]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model: false);
+            helper.ViewContext.ClientValidationEnabled = false;
+            var attributes = new Dictionary<string, object>
+            {
+                { "class", "some-class"},
+                { "name", "-expression-" },
+            };
+
+            // Act
+            var html = helper.CheckBox(null, isChecked: false, htmlAttributes: attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxCheckedWithOnlyName_GeneratesExpectedValue()
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Boolean");
+            var expected = @"<input checked=""HtmlEncode[[checked]]"" data-val=""HtmlEncode[[true]]"" " +
+                $@"data-val-required=""HtmlEncode[[{requiredMessage}]]"" id=""HtmlEncode[[Property1]]"" " +
+                @"name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[checkbox]]"" " +
+                @"value=""HtmlEncode[[true]]"" /><input name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetTestModelViewData());
+
+            // Act
+            var html = helper.CheckBox("Property1", isChecked: true, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBox_WithCanRenderAtEndOfFormSet_DoesNotGenerateInlineHiddenTag()
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Boolean");
+            var expected = @"<input checked=""HtmlEncode[[checked]]"" data-val=""HtmlEncode[[true]]"" " +
+                $@"data-val-required=""HtmlEncode[[{requiredMessage}]]"" id=""HtmlEncode[[Property1]]"" " +
+                @"name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[checkbox]]"" " +
+                @"value=""HtmlEncode[[true]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetTestModelViewData());
+            helper.ViewContext.FormContext.CanRenderAtEndOfForm = true;
+
+            // Act
+            var html = helper.CheckBox("Property1", isChecked: true, htmlAttributes: null);
+
+            // Assert
+            Assert.True(helper.ViewContext.FormContext.HasEndOfFormContent);
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+            var writer = new StringWriter();
+            var hiddenTag = Assert.Single(helper.ViewContext.FormContext.EndOfFormContent);
+            hiddenTag.WriteTo(writer, new HtmlTestEncoder());
+            Assert.Equal("<input name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[hidden]]\" value=\"HtmlEncode[[false]]\" />",
+                writer.ToString());
+        }
+
+        [Fact]
+        public void CheckBoxUsesAttemptedValueFromModelState()
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Boolean");
+            var expected = $@"<input data-val=""HtmlEncode[[true]]"" data-val-required=""HtmlEncode[[{requiredMessage}]]"" " +
+                @"id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" />" +
+                @"<input name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetTestModelViewData());
+            helper.ViewData.ModelState.SetModelValue("Property1", new string[] { "false" }, "false");
+
+            // Act
+            var html = helper.CheckBox("Property1", isChecked: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxNotInTemplate_GetsValueFromViewDataDictionary()
+        {
+            // Arrange
+            var expected =
+                @"<input checked=""HtmlEncode[[checked]]"" id=""HtmlEncode[[Property1]]"" " +
+                @"name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" />" +
+                @"<input name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetTestModelViewData());
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel();
+
+            // Act
+            var html = helper.CheckBox("Property1", isChecked: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxInTemplate_GetsValueFromViewDataDictionary()
+        {
+            // Arrange
+            var expected =
+                @"<input checked=""HtmlEncode[[checked]]"" id=""HtmlEncode[[Prefix_Property1]]"" " +
+                @"name=""HtmlEncode[[Prefix.Property1]]"" type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" />" +
+                @"<input name=""HtmlEncode[[Prefix.Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetTestModelViewData());
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Remove(nameof(TestModel.Property1));
+            helper.ViewData["Prefix.Property1"] = true;
+            helper.ViewData.Model = new TestModel();
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Prefix";
+
+            // Act
+            var html = helper.CheckBox("Property1", isChecked: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxNotInTemplate_GetsValueFromPropertyOfViewDataEntry()
+        {
+            // Arrange
+            var expected =
+                @"<input checked=""HtmlEncode[[checked]]"" id=""HtmlEncode[[Prefix_Property1]]"" " +
+                @"name=""HtmlEncode[[Prefix.Property1]]"" type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" />" +
+                @"<input name=""HtmlEncode[[Prefix.Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetTestModelViewData());
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Remove(nameof(TestModel.Property1));
+            helper.ViewData["Prefix"] = new TestModel { Property1 = true };
+            helper.ViewData.Model = new TestModel();
+
+            // Act
+            var html = helper.CheckBox("Prefix.Property1", isChecked: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxInTemplate_GetsValueFromPropertyOfViewDataEntry()
+        {
+            // Arrange
+            var expected =
+                @"<input checked=""HtmlEncode[[checked]]"" id=""HtmlEncode[[Prefix_Property1]]"" " +
+                @"name=""HtmlEncode[[Prefix.Property1]]"" type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" />" +
+                @"<input name=""HtmlEncode[[Prefix.Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetTestModelViewData());
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Remove(nameof(TestModel.Property1));
+            helper.ViewData["Prefix"] = new TestModel { Property1 = true };
+            helper.ViewData.Model = new TestModel();
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Prefix";
+
+            // Act
+            var html = helper.CheckBox("Property1", isChecked: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxNotInTemplate_GetsModelValue_IfModelStateAndViewDataEmpty()
+        {
+            // Arrange
+            var expected =
+                @"<input checked=""HtmlEncode[[checked]]"" id=""HtmlEncode[[Property1]]"" " +
+                @"name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" />" +
+                @"<input name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property1 = true };
+
+            // Act
+            var html = helper.CheckBox("Property1", isChecked: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxInTemplate_GetsModelValue_IfModelStateAndViewDataEmpty()
+        {
+            // Arrange
+            var expected =
+                @"<input checked=""HtmlEncode[[checked]]"" id=""HtmlEncode[[Prefix_Property1]]"" " +
+                @"name=""HtmlEncode[[Prefix.Property1]]"" type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" />" +
+                @"<input name=""HtmlEncode[[Prefix.Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property1 = true };
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Prefix";
+
+            // Act
+            var html = helper.CheckBox("Property1", isChecked: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxNotInTemplate_NotChecked_IfPropertyIsNotFound()
+        {
+            // Arrange
+            var expected =
+                @"<input id=""HtmlEncode[[Property1]]"" " +
+                @"name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" />" +
+                @"<input name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+
+            // Act
+            var html = helper.CheckBox("Property1", isChecked: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxInTemplate_NotChecked_IfPropertyIsNotFound()
+        {
+            // Arrange
+            var expected =
+                @"<input id=""HtmlEncode[[Prefix_Property1]]"" " +
+                @"name=""HtmlEncode[[Prefix.Property1]]"" type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" />" +
+                @"<input name=""HtmlEncode[[Prefix.Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Prefix";
+
+            // Act
+            var html = helper.CheckBox("Property1", isChecked: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxGeneratesUnobtrusiveValidationAttributes()
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Name");
+            var expected =
+                $@"<input data-val=""HtmlEncode[[true]]"" data-val-required=""HtmlEncode[[{requiredMessage}]]"" id=""HtmlEncode[[Name]]""" +
+                @" name=""HtmlEncode[[Name]]"" type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" />" +
+                @"<input name=""HtmlEncode[[Name]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetModelWithValidationViewData());
+
+            // Act
+            var html = helper.CheckBox("Name", isChecked: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxReplacesUnderscoresInHtmlAttributesWithDashes()
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Boolean");
+            var expected = @"<input checked=""HtmlEncode[[checked]]"" data-val=""HtmlEncode[[true]]"" " +
+                $@"data-val-required=""HtmlEncode[[{requiredMessage}]]"" id=""HtmlEncode[[Property1]]"" " +
+                @"name=""HtmlEncode[[Property1]]"" Property1-Property3=""HtmlEncode[[Property3ObjValue]]"" " +
+                @"type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" /><input " +
+                @"name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetTestModelViewData());
+            var htmlAttributes = new { Property1_Property3 = "Property3ObjValue" };
+
+            // Act
+            var html = helper.CheckBox("Property1", isChecked: true, htmlAttributes: htmlAttributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxInTemplate_ReplaceDotsInIdByDefaultWithUnderscores()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[MyPrefix_Property1]]"" name=""HtmlEncode[[MyPrefix.Property1]]"" " +
+                           @"Property3=""HtmlEncode[[Property3Value]]"" type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" /><input " +
+                           @"name=""HtmlEncode[[MyPrefix.Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var dictionary = new RouteValueDictionary(new { Property3 = "Property3Value" });
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            helper.ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = "MyPrefix";
+
+            // Act
+            var html = helper.CheckBox("Property1", isChecked: false, htmlAttributes: dictionary);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxInTemplate_ReplacesDotsInIdWithIdDotReplacement()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[MyPrefix!!!Property1]]"" name=""HtmlEncode[[MyPrefix.Property1]]"" " +
+                           @"Property3=""HtmlEncode[[Property3Value]]"" type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" /><input " +
+                           @"name=""HtmlEncode[[MyPrefix.Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var dictionary = new Dictionary<string, object> { { "Property3", "Property3Value" } };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<DefaultTemplatesUtilities.ObjectTemplateModel>(
+                model: null,
+                idAttributeDotReplacement: "!!!");
+            helper.ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = "MyPrefix";
+
+            // Act
+            var html = helper.CheckBox("Property1", isChecked: false, htmlAttributes: dictionary);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxInTemplate_WithEmptyExpression_GeneratesExpectedValue()
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Boolean");
+            var expected =
+                $@"<input data-val=""HtmlEncode[[true]]"" data-val-required=""HtmlEncode[[{requiredMessage}]]"" " +
+                @"id=""HtmlEncode[[MyPrefix]]"" name=""HtmlEncode[[MyPrefix]]"" " +
+                @"Property3=""HtmlEncode[[Property3Value]]"" type=""HtmlEncode[[checkbox]]"" " +
+                @"value=""HtmlEncode[[true]]"" /><input name=""HtmlEncode[[MyPrefix]]"" " +
+                @"type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model: false);
+            helper.ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = "MyPrefix";
+            var attributes = new Dictionary<string, object>
+            {
+                { "Property3", "Property3Value" },
+                { "name", "-expression-" }, // overridden
+            };
+
+            // Act
+            var html = helper.CheckBox(string.Empty, isChecked: false, htmlAttributes: attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxWithComplexExpressionsEvaluatesValuesInViewDataDictionary()
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Boolean");
+            var expected = @"<input checked=""HtmlEncode[[checked]]"" data-val=""HtmlEncode[[true]]"" " +
+                $@"data-val-required=""HtmlEncode[[{requiredMessage}]]"" id=""HtmlEncode[[ComplexProperty_Property1]]"" " +
+                @"name=""HtmlEncode[[ComplexProperty." +
+                @"Property1]]"" type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" /><input name=""HtmlEncode[[ComplexProperty.Property1]]""" +
+                @" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetModelWithValidationViewData());
+
+            // Act
+            var html = helper.CheckBox("ComplexProperty.Property1", isChecked: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxForWithNullContainer_TreatsBooleanAsFalse()
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Property1");
+            var expected =
+                $@"<input data-val=""HtmlEncode[[true]]"" data-val-required=""HtmlEncode[[{requiredMessage}]]"" " +
+                @"id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" />" +
+                @"<input name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var viewData = GetTestModelViewData();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewData);
+            viewData.ModelState.SetModelValue("Property1", new string[] { "false" }, "false");
+
+            // Act
+            var html = helper.CheckBoxFor(m => m.Property1, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Theory]
+        [InlineData(false, "")]
+        [InlineData(true, "checked=\"HtmlEncode[[checked]]\" ")]
+        public void CheckBoxForWithNonNullContainer_UsesPropertyValue(bool value, string expectedChecked)
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Property1");
+            // Mono issue - https://github.com/aspnet/External/issues/19
+            var expected =
+                $@"<input {{0}}data-val=""HtmlEncode[[true]]"" data-val-required=""HtmlEncode[[{requiredMessage}]]"" " +
+                @"id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" />" +
+                @"<input name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            expected = string.Format(expected, expectedChecked);
+
+            var viewData = GetTestModelViewData();
+            viewData.Model = new TestModel
+            {
+                Property1 = value,
+            };
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewData);
+
+            // Act
+            var html = helper.CheckBoxFor(m => m.Property1, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxForOverridesCalculatedParametersWithValuesFromHtmlAttributes()
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Property3");
+            var expected =
+                @"<input checked=""HtmlEncode[[checked]]"" data-val=""HtmlEncode[[true]]"" " +
+                $@"data-val-required=""HtmlEncode[[{requiredMessage}]]"" " +
+                @"id=""HtmlEncode[[Property3]]"" name=""HtmlEncode[[Property3]]"" type=""HtmlEncode[[checkbox]]"" " +
+                @"value=""HtmlEncode[[false]]"" /><input name=""HtmlEncode[[Property3]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetTestModelViewData());
+
+            // Act
+            var html = helper.CheckBoxFor(m => m.Property3, new { @checked = "checked", value = "false" });
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxForGeneratesUnobtrusiveValidationAttributes()
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Name");
+            var expected =
+                $@"<input data-val=""HtmlEncode[[true]]"" data-val-required=""HtmlEncode[[{requiredMessage}]]"" id=""HtmlEncode[[Name]]""" +
+                @" name=""HtmlEncode[[Name]]"" type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" />" +
+                @"<input name=""HtmlEncode[[Name]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var viewDataDictionary = new ViewDataDictionary<ModelWithValidation>(metadataProvider)
+            {
+                Model = new ModelWithValidation()
+            };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewDataDictionary);
+
+            // Act
+            var html = helper.CheckBoxFor(m => m.Name, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Theory]
+        [InlineData("false", "")]
+        [InlineData("true", "checked=\"HtmlEncode[[checked]]\" ")]
+        public void CheckBoxFor_UsesModelStateAttemptedValue(string attemptedValue, string expectedChecked)
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Property1");
+            var expected =
+                $@"<input {{0}}data-val=""HtmlEncode[[true]]"" data-val-required=""HtmlEncode[[{requiredMessage}]]"" " +
+                @"id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" />" +
+                @"<input name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            expected = string.Format(expected, expectedChecked);
+
+            var viewData = GetTestModelViewData();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewData);
+            viewData.ModelState.SetModelValue("Property1", new string[] { attemptedValue }, attemptedValue);
+
+            // Act
+            var html = helper.CheckBoxFor(m => m.Property1, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxFor_WithObjectAttribute_MapsUnderscoresInNamesToDashes()
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Property1");
+            var expected =
+                $@"<input data-val=""HtmlEncode[[true]]"" data-val-required=""HtmlEncode[[{requiredMessage}]]"" " +
+                @"id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" " +
+                @"Property1-Property3=""HtmlEncode[[Property3ObjValue]]"" type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" /><input " +
+                @"name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetTestModelViewData());
+            var htmlAttributes = new { Property1_Property3 = "Property3ObjValue" };
+
+            // Act
+            var html = helper.CheckBoxFor(m => m.Property1, htmlAttributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxFor_WithAttributeDictionary_GeneratesExpectedAttributes()
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Property1");
+            var expected =
+                $@"<input data-val=""HtmlEncode[[true]]"" data-val-required=""HtmlEncode[[{requiredMessage}]]"" " +
+                @"id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" " +
+                @"Property3=""HtmlEncode[[Property3Value]]"" type=""HtmlEncode[[checkbox]]"" " +
+                @"value=""HtmlEncode[[true]]"" /><input name=""HtmlEncode[[Property1]]"" " +
+                @"type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetTestModelViewData());
+            var attributes = new Dictionary<string, object>
+            {
+                { "Property3", "Property3Value" },
+                { "name", "-expression-" }, // overridden
+            };
+
+            // Act
+            var html = helper.CheckBoxFor(m => m.Property1, attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxForInTemplate_GeneratesExpectedValue()
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Property1");
+            var expected =
+                $@"<input data-val=""HtmlEncode[[true]]"" data-val-required=""HtmlEncode[[{requiredMessage}]]"" " +
+                @"id=""HtmlEncode[[MyPrefix_Property1]]"" name=""HtmlEncode[[MyPrefix.Property1]]"" Property3=""HtmlEncode[[PropValue]]"" " +
+                @"type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" /><input name=""HtmlEncode[[MyPrefix.Property1]]"" type=""HtmlEncode[[hidden]]"" " +
+                @"value=""HtmlEncode[[false]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetTestModelViewData());
+            helper.ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = "MyPrefix";
+            var attributes = new Dictionary<string, object> { { "Property3", "PropValue" } };
+
+            // Act
+            var html = helper.CheckBoxFor(m => m.Property1, attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void CheckBoxFor_WithComplexExpressions_DoesNotUseValuesFromViewDataDictionary()
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Property1");
+            var expected =
+                $@"<input data-val=""HtmlEncode[[true]]"" data-val-required=""HtmlEncode[[{requiredMessage}]]"" " +
+                @"id=""HtmlEncode[[ComplexProperty_Property1]]"" name=""HtmlEncode[[ComplexProperty." +
+                @"Property1]]"" type=""HtmlEncode[[checkbox]]"" value=""HtmlEncode[[true]]"" /><input name=""HtmlEncode[[ComplexProperty.Property1]]"" " +
+                @"type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[false]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetModelWithValidationViewData());
+
+            // Act
+            var html = helper.CheckBoxFor(m => m.ComplexProperty.Property1, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void Checkbox_UsesSpecifiedExpression()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var checkboxResult = helper.CheckBox("Property1");
+
+            // Assert
+            Assert.Equal(
+                "<input id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[checkbox]]\" value=\"HtmlEncode[[true]]\" />" +
+                "<input name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[hidden]]\" value=\"HtmlEncode[[false]]\" />",
+                HtmlContentUtilities.HtmlContentToString(checkboxResult));
+        }
+
+        [Fact]
+        public void Checkbox_UsesSpecifiedIsChecked()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var checkboxResult = helper.CheckBox("Property1", isChecked: true);
+
+            // Assert
+            Assert.Equal(
+                "<input checked=\"HtmlEncode[[checked]]\" id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[checkbox]]\" value=\"HtmlEncode[[true]]\" />" +
+                "<input name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[hidden]]\" value=\"HtmlEncode[[false]]\" />",
+                HtmlContentUtilities.HtmlContentToString(checkboxResult));
+        }
+
+        [Fact]
+        public void Checkbox_UsesSpecifiedIsCheckedRegardlessOfExpressionValue()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property1 = true };
+
+            // Act
+            var checkboxResult = helper.CheckBox("Property1", isChecked: false);
+
+            // Assert
+            Assert.Equal(
+                "<input id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[checkbox]]\" value=\"HtmlEncode[[true]]\" />" +
+                "<input name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[hidden]]\" value=\"HtmlEncode[[false]]\" />",
+                HtmlContentUtilities.HtmlContentToString(checkboxResult));
+        }
+
+        [Fact]
+        public void Checkbox_UsesSpecifiedHtmlAttributes()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var checkboxResult = helper.CheckBox("Property1", htmlAttributes: new { attr = "value" });
+
+            // Assert
+            Assert.Equal(
+                "<input attr=\"HtmlEncode[[value]]\" id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[checkbox]]\" value=\"HtmlEncode[[true]]\" />" +
+                "<input name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[hidden]]\" value=\"HtmlEncode[[false]]\" />",
+                HtmlContentUtilities.HtmlContentToString(checkboxResult));
+        }
+
+        private static ViewDataDictionary<TestModel> GetTestModelViewData()
+        {
+            return new ViewDataDictionary<TestModel>(new EmptyModelMetadataProvider())
+            {
+                { "Property1", true },
+                { "Property2", "NotTrue" },
+                { "Property3", false }
+            };
+        }
+
+        private static ViewDataDictionary<ModelWithValidation> GetModelWithValidationViewData()
+        {
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var viewData = new ViewDataDictionary<ModelWithValidation>(provider)
+            {
+                { "ComplexProperty.Property1", true },
+                { "ComplexProperty.Property2", "NotTrue" },
+                { "ComplexProperty.Property3", false }
+            };
+            viewData.Model = new ModelWithValidation();
+
+            return viewData;
+        }
+
+        private class TestModel
+        {
+            public bool Property1 { get; set; }
+
+            public bool Property2 { get; set; }
+
+            public bool Property3 { get; set; }
+        }
+
+        private class ModelWithValidation
+        {
+            [Required]
+            public bool Name { get; set; }
+
+            public TestModel ComplexProperty { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayExtensionsTest.cs
new file mode 100644
index 0000000000..c32e06c3bf
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayExtensionsTest.cs
@@ -0,0 +1,547 @@
+// 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.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.Extensions.Localization;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public class HtmlHelperDisplayExtensionsTest
+    {
+        [Fact]
+        public void DisplayHelpers_FindsModel_WhenViewDataIsNotSet()
+        {
+            // Arrange
+            var expected = $"<div class=\"HtmlEncode[[display-label]]\">HtmlEncode[[SomeProperty]]</div>{Environment.NewLine}" +
+                $"<div class=\"HtmlEncode[[display-field]]\">HtmlEncode[[PropValue]]</div>{Environment.NewLine}";
+            var model = new SomeModel
+            {
+                SomeProperty = "PropValue"
+            };
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var displayResult = helper.Display(expression: string.Empty);
+            var displayNullResult = helper.Display(expression: null);   // null is another alias for current model
+            var displayForResult = helper.DisplayFor(m => m);
+            var displayForModelResult = helper.DisplayForModel();
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(displayResult));
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(displayNullResult));
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(displayForResult));
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(displayForModelResult));
+        }
+
+        [Fact]
+        public void Display_UsesAdditionalViewData()
+        {
+            // Arrange
+            var model = new SomeModel { SomeProperty = "ModelValue" };
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) => v.Writer.WriteAsync(v.ViewData["SomeProperty"].ToString()))
+                .Returns(Task.FromResult(0));
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("SomeView", view.Object));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var displayResult = helper.Display(expression: "SomeProperty", additionalViewData: new { SomeProperty = "ViewDataValue" });
+
+            // Assert
+            Assert.Equal("ViewDataValue", HtmlContentUtilities.HtmlContentToString(displayResult));
+        }
+
+        [Fact]
+        public void Display_UsesTemplateName()
+        {
+            // Arrange
+            var model = new SomeModel { SomeProperty = "ModelValue" };
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "DisplayTemplates/SomeTemplate", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("SomeView", Mock.Of<IView>()))
+                .Verifiable();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var displayResult = helper.Display(expression: "SomeProperty", templateName: "SomeTemplate");
+
+            // Assert
+            viewEngine.Verify();
+        }
+
+        public static TheoryData<FormatModel, string> EnumFormatModels
+        {
+            get
+            {
+                return new TheoryData<FormatModel, string>
+                {
+                    {
+                        new FormatModel{ FormatProperty = Status.Created },
+                        "Value: Created"
+                    },
+                    {
+                        new FormatModel { FormatProperty = Status.Done },
+                        "Value: Done"
+                    }
+                };
+            }
+        }
+
+        public static TheoryData<FormatModel, string> EnumUnformattedModels
+        {
+            get
+            {
+                return new TheoryData<FormatModel, string>
+                {
+                    {
+                        new FormatModel {NonFormatProperty = Status.Created },
+                        "CreatedKey"
+                    },
+                    {
+                        new FormatModel {NonFormatProperty = Status.Done },
+                        "Done"
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(EnumUnformattedModels))]
+        public void Display_UsesTemplateUnFormatted(FormatModel model, string expectedResult)
+        {
+            // Arrange
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) => v.Writer.WriteAsync(v.ViewData.TemplateInfo.FormattedModelValue.ToString()))
+                .Returns(Task.FromResult(0));
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "DisplayTemplates/Status", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("Status", view.Object))
+                .Verifiable();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var displayResult = helper.DisplayFor(x => x.NonFormatProperty);
+
+            // Assert
+            Assert.Equal(expectedResult, HtmlContentUtilities.HtmlContentToString(displayResult));
+        }
+
+        [Theory]
+        [MemberData(nameof(EnumFormatModels))]
+        public void Display_UsesTemplateFormatted(FormatModel model, string expectedResult)
+        {
+            // Arrange
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) => v.Writer.WriteAsync(v.ViewData.TemplateInfo.FormattedModelValue.ToString()))
+                .Returns(Task.FromResult(0));
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "DisplayTemplates/Status", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("Status", view.Object))
+                .Verifiable();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var displayResult = helper.DisplayFor(x => x.FormatProperty);
+
+            // Assert
+            Assert.Equal(expectedResult, HtmlContentUtilities.HtmlContentToString(displayResult));
+        }
+
+        [Fact]
+        public void Display_UsesTemplateNameAndAdditionalViewData()
+        {
+            // Arrange
+            var model = new SomeModel { SomeProperty = "ModelValue" };
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) => v.Writer.WriteAsync(v.ViewData["SomeProperty"].ToString()))
+                .Returns(Task.FromResult(0));
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "DisplayTemplates/SomeTemplate", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("SomeView", view.Object));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var displayResult = helper.Display(
+                expression: "SomeProperty",
+                templateName: "SomeTemplate",
+                additionalViewData: new { SomeProperty = "ViewDataValue" });
+
+            // Assert
+            Assert.Equal("ViewDataValue", HtmlContentUtilities.HtmlContentToString(displayResult));
+        }
+
+        [Fact]
+        public void Display_UsesTemplateNameAndHtmlFieldName()
+        {
+            // Arrange
+            var model = new SomeModel { SomeProperty = "ModelValue" };
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) => v.Writer.WriteAsync(v.ViewData.TemplateInfo.HtmlFieldPrefix))
+                .Returns(Task.FromResult(0));
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "DisplayTemplates/SomeTemplate", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("SomeView", view.Object));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var displayResult = helper.Display(
+                expression: "SomeProperty",
+                templateName: "SomeTemplate",
+                htmlFieldName: "SomeField");
+
+            // Assert
+            Assert.Equal("SomeField", HtmlContentUtilities.HtmlContentToString(displayResult));
+        }
+
+        [Fact]
+        public void DisplayFor_UsesAdditionalViewData()
+        {
+            // Arrange
+            var model = new SomeModel { SomeProperty = "ModelValue" };
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) => v.Writer.WriteAsync(v.ViewData["SomeProperty"].ToString()))
+                .Returns(Task.FromResult(0));
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("SomeView", view.Object));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var displayResult = helper.DisplayFor(expression: m => m.SomeProperty, additionalViewData: new { SomeProperty = "ViewDataValue" });
+
+            // Assert
+            Assert.Equal("ViewDataValue", HtmlContentUtilities.HtmlContentToString(displayResult));
+        }
+
+        [Fact]
+        public void DisplayFor_UsesTemplateName()
+        {
+            // Arrange
+            var model = new SomeModel { SomeProperty = "ModelValue" };
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "DisplayTemplates/SomeTemplate", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("SomeView", Mock.Of<IView>()))
+                .Verifiable();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var displayResult = helper.DisplayFor(expression: m => m.SomeProperty, templateName: "SomeTemplate");
+
+            // Assert
+            viewEngine.Verify();
+        }
+
+        [Fact]
+        public void DisplayFor_UsesTemplateNameAndAdditionalViewData()
+        {
+            // Arrange
+            var model = new SomeModel { SomeProperty = "ModelValue" };
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) => v.Writer.WriteAsync(v.ViewData["SomeProperty"].ToString()))
+                .Returns(Task.FromResult(0));
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "DisplayTemplates/SomeTemplate", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("SomeView", view.Object));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var displayResult = helper.DisplayFor(
+                expression: m => m.SomeProperty,
+                templateName: "SomeTemplate",
+                additionalViewData: new { SomeProperty = "ViewDataValue" });
+
+            // Assert
+            Assert.Equal("ViewDataValue", HtmlContentUtilities.HtmlContentToString(displayResult));
+        }
+
+        [Fact]
+        public void DisplayFor_EnumProperty_IStringLocalizedValue()
+        {
+            // Arrange
+            var model = new StatusModel
+            {
+                Status = Status.Created
+            };
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) => v.Writer.WriteAsync(v.ViewData.TemplateInfo.FormattedModelValue.ToString()))
+                .Returns(Task.FromResult(0));
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "DisplayTemplates/Status", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("SomeView", view.Object));
+
+            var stringLocalizer = new Mock<IStringLocalizer>(MockBehavior.Strict);
+            stringLocalizer
+                .Setup(s => s["CreatedKey"])
+                .Returns<string>((key) =>
+                {
+                    return new LocalizedString(key, "created from IStringLocalizer");
+                });
+            var stringLocalizerFactory = new Mock<IStringLocalizerFactory>();
+            stringLocalizerFactory
+                .Setup(s => s.Create(typeof(Status)))
+                .Returns(stringLocalizer.Object);
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object, stringLocalizerFactory.Object);
+
+            // Act
+            var displayResult = helper.DisplayFor(m => m.Status);
+
+            // Assert
+            Assert.Equal("created from IStringLocalizer", HtmlContentUtilities.HtmlContentToString(displayResult));
+        }
+
+        [Fact]
+        public void DisplayFor_EnumProperty_ResourceTypeLocalizedValue()
+        {
+            // Arrange
+            var model = new StatusModel
+            {
+                Status = Status.Faulted
+            };
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) => v.Writer.WriteAsync(v.ViewData.TemplateInfo.FormattedModelValue.ToString()))
+                .Returns(Task.FromResult(0));
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "DisplayTemplates/Status", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("SomeView", view.Object));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var displayResult = helper.DisplayFor(m => m.Status);
+
+            // Assert
+            Assert.Equal("Faulted from ResourceType", HtmlContentUtilities.HtmlContentToString(displayResult));
+        }
+
+        [Fact]
+        public void DisplayFor_UsesTemplateNameAndHtmlFieldName()
+        {
+            // Arrange
+            var model = new SomeModel { SomeProperty = "ModelValue" };
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) => v.Writer.WriteAsync(v.ViewData.TemplateInfo.HtmlFieldPrefix))
+                .Returns(Task.FromResult(0));
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "DisplayTemplates/SomeTemplate", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("SomeView", view.Object));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var displayResult = helper.DisplayFor(
+                expression: m => m.SomeProperty,
+                templateName: "SomeTemplate",
+                htmlFieldName: "SomeField");
+
+            // Assert
+            Assert.Equal("SomeField", HtmlContentUtilities.HtmlContentToString(displayResult));
+        }
+
+        [Fact]
+        public void DisplayForModel_UsesAdditionalViewData()
+        {
+            // Arrange
+            var model = new SomeModel { SomeProperty = "ModelValue" };
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) => v.Writer.WriteAsync(v.ViewData["SomeProperty"].ToString()))
+                .Returns(Task.FromResult(0));
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("SomeView", view.Object));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var displayResult = helper.DisplayForModel(additionalViewData: new { SomeProperty = "ViewDataValue" });
+
+            // Assert
+            Assert.Equal("ViewDataValue", HtmlContentUtilities.HtmlContentToString(displayResult));
+        }
+
+        [Fact]
+        public void DisplayForModel_UsesTemplateName()
+        {
+            // Arrange
+            var model = new SomeModel { SomeProperty = "ModelValue" };
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "DisplayTemplates/SomeTemplate", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("SomeView", Mock.Of<IView>()))
+                .Verifiable();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var displayResult = helper.DisplayForModel(templateName: "SomeTemplate");
+
+            // Assert
+            viewEngine.Verify();
+        }
+
+        [Fact]
+        public void DisplayForModel_UsesTemplateNameAndAdditionalViewData()
+        {
+            // Arrange
+            var model = new SomeModel { SomeProperty = "ModelValue" };
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) => v.Writer.WriteAsync(v.ViewData["SomeProperty"].ToString()))
+                .Returns(Task.FromResult(0));
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "DisplayTemplates/SomeTemplate", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("SomeView", view.Object));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var displayResult = helper.DisplayForModel(
+                templateName: "SomeTemplate",
+                additionalViewData: new { SomeProperty = "ViewDataValue" });
+
+            // Assert
+            Assert.Equal("ViewDataValue", HtmlContentUtilities.HtmlContentToString(displayResult));
+        }
+
+        [Fact]
+        public void DisplayForModel_UsesTemplateNameAndHtmlFieldName()
+        {
+            // Arrange
+            var model = new SomeModel { SomeProperty = "ModelValue" };
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) => v.Writer.WriteAsync(v.ViewData.TemplateInfo.HtmlFieldPrefix))
+                .Returns(Task.FromResult(0));
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "DisplayTemplates/SomeTemplate", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("SomeView", view.Object));
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var displayResult = helper.DisplayForModel(
+                templateName: "SomeTemplate",
+                htmlFieldName: "SomeField");
+
+            // Assert
+            Assert.Equal("SomeField", HtmlContentUtilities.HtmlContentToString(displayResult));
+        }
+
+
+        public class StatusResource
+        {
+            public static string FaultedKey { get { return "Faulted from ResourceType"; } }
+        }
+
+        public enum Status : byte
+        {
+            [Display(Name = "CreatedKey")]
+            Created,
+            [Display(Name = "FaultedKey", ResourceType = typeof(StatusResource))]
+            Faulted,
+            Done
+        }
+
+        public class FormatModel
+        {
+            [DisplayFormat(ApplyFormatInEditMode = true, DataFormatString = "Value: {0}")]
+            public Status FormatProperty { get; set; }
+
+            public Status NonFormatProperty { get; set; }
+        }
+
+        private class SomeModel
+        {
+            public string SomeProperty { get; set; }
+        }
+
+        private class StatusModel
+        {
+            public Status Status { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs
new file mode 100644
index 0000000000..11c603b007
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs
@@ -0,0 +1,230 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Test the <see cref="HtmlHelperDisplayNameExtensions" /> class.
+    /// </summary>
+    public class HtmlHelperDisplayNameExtensionsTest
+    {
+        [Fact]
+        public void DisplayNameHelpers_ReturnEmptyForModel()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            var enumerableHelper =
+                DefaultTemplatesUtilities.GetHtmlHelper<IEnumerable<DefaultTemplatesUtilities.ObjectTemplateModel>>(model: null);
+
+            // Act
+            var displayNameResult = helper.DisplayName(expression: string.Empty);
+            var displayNameNullResult = helper.DisplayName(expression: null);   // null is another alias for current model
+            var displayNameForResult = helper.DisplayNameFor(m => m);
+            var displayNameForEnumerableModelResult = enumerableHelper.DisplayNameFor(m => m);
+            var displayNameForModelResult = helper.DisplayNameForModel();
+
+            // Assert
+            Assert.Empty(displayNameResult);
+            Assert.Empty(displayNameNullResult);
+            Assert.Empty(displayNameForResult);
+            Assert.Empty(displayNameForEnumerableModelResult);
+            Assert.Empty(displayNameForModelResult);
+        }
+
+        [Fact]
+        public void DisplayNameHelpers_ReturnPropertyName()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            var enumerableHelper = DefaultTemplatesUtilities.GetHtmlHelperForEnumerable();
+
+            // Act
+            var displayNameResult = helper.DisplayName("Property1");
+            var displayNameForResult = helper.DisplayNameFor(m => m.Property1);
+            var displayNameForEnumerableResult = enumerableHelper.DisplayNameFor(m => m.Property1);
+
+            // Assert
+            Assert.Equal("Property1", displayNameResult);
+            Assert.Equal("Property1", displayNameForResult);
+            Assert.Equal("Property1", displayNameForEnumerableResult);
+        }
+
+        // If the metadata is for a type (not property), then DisplayName(expression) will evaluate the expression
+        [Fact]
+        public void DisplayNameHelpers_DisplayName_Evaluates_Expression()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            helper.ViewData["value"] = "testvalue";
+
+            // Act
+            var displayNameResult = helper.DisplayName(expression: "value");
+
+            // Assert
+            Assert.Equal("value", displayNameResult);
+        }
+
+        [Fact]
+        public void DisplayNameHelpers_ReturnPropertyName_ForNestedProperty()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<OuterClass>(model: null);
+            var enumerableHelper = DefaultTemplatesUtilities.GetHtmlHelperForEnumerable<OuterClass>(model: null);
+
+            // Act
+            var displayNameResult = helper.DisplayName("Inner.Id");
+            var displayNameForResult = helper.DisplayNameFor(m => m.Inner.Id);
+            var displayNameForEnumerableResult = enumerableHelper.DisplayNameFor(m => m.Inner.Id);
+
+            // Assert
+            Assert.Equal("Id", displayNameResult);
+            Assert.Equal("Id", displayNameForResult);
+            Assert.Equal("Id", displayNameForEnumerableResult);
+        }
+
+        [Theory]
+        [InlineData("")]    // Empty display name wins over non-empty property name.
+        [InlineData("Custom display name from metadata")]
+        public void DisplayNameHelpers_ReturnDisplayName_IfNonNull(string displayName)
+        {
+            // Arrange
+            var provider = new TestModelMetadataProvider();
+            provider
+                .ForType<DefaultTemplatesUtilities.ObjectTemplateModel>()
+                .DisplayDetails(dd => dd.DisplayName = () => displayName);
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(provider: provider);
+            var enumerableHelper = DefaultTemplatesUtilities.GetHtmlHelperForEnumerable(provider: provider);
+
+            // Act
+            var displayNameResult = helper.DisplayName(expression: string.Empty);
+            var displayNameForResult = helper.DisplayNameFor(m => m);
+            var displayNameForEnumerableResult = enumerableHelper.DisplayNameFor((DefaultTemplatesUtilities.ObjectTemplateModel m) => m);
+            var displayNameForModelResult = helper.DisplayNameForModel();
+
+            // Assert
+            Assert.Equal(displayName, displayNameResult);
+            Assert.Equal(displayName, displayNameForResult);
+            Assert.Equal(displayName, displayNameForEnumerableResult);
+            Assert.Equal(displayName, displayNameForModelResult);
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData("Custom display name from metadata")]
+        public void DisplayNameHelpers_ReturnDisplayNameForProperty_IfNonNull(string displayName)
+        {
+            // Arrange
+            var provider = new TestModelMetadataProvider();
+            provider
+                .ForProperty<DefaultTemplatesUtilities.ObjectTemplateModel>("Property1")
+                .DisplayDetails(dd => dd.DisplayName = () => displayName);
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(provider: provider);
+            var enumerableHelper = DefaultTemplatesUtilities.GetHtmlHelperForEnumerable(provider: provider);
+
+            // Act
+            var displayNameResult = helper.DisplayName("Property1");
+            var displayNameForResult = helper.DisplayNameFor(m => m.Property1);
+            var displayNameForEnumerableResult = enumerableHelper.DisplayNameFor(m => m.Property1);
+
+            // Assert
+            Assert.Equal(displayName, displayNameResult);
+            Assert.Equal(displayName, displayNameForResult);
+            Assert.Equal(displayName, displayNameForEnumerableResult);
+        }
+
+        [Theory]
+        [InlineData("A", "A")]
+        [InlineData("A[23]", "A[23]")]
+        [InlineData("A[0].B", "B")]
+        [InlineData("A.B.C.D", "D")]
+        public void DisplayName_ReturnsRightmostExpressionSegment_IfPropertiesNotFound(
+            string expression,
+            string expectedResult)
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var result = helper.DisplayName(expression);
+
+            // Assert
+            // DisplayName() falls back to expression name when DisplayName and PropertyName are null.
+            Assert.Equal(expectedResult, result);
+        }
+
+        [Fact]
+        public void DisplayNameFor_ThrowsInvalidOperation_IfExpressionUnsupported()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(
+                () => helper.DisplayNameFor(model => new { foo = "Bar" }));
+            Assert.Equal(
+                "Templates can be used only with field access, property access, single-dimension array index, or single-parameter custom indexer expressions.",
+                exception.Message);
+        }
+
+        [Fact]
+        public void EnumerableDisplayNameFor_ThrowsInvalidOperation_IfExpressionUnsupported()
+        {
+            // Arrange
+            var helper =
+                DefaultTemplatesUtilities.GetHtmlHelper<IEnumerable<DefaultTemplatesUtilities.ObjectTemplateModel>>(model: null);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(
+                () => helper.DisplayNameFor(model => new { foo = "Bar" }));
+            Assert.Equal(
+                "Templates can be used only with field access, property access, single-dimension array index, or single-parameter custom indexer expressions.",
+                exception.Message);
+        }
+
+        [Fact]
+        public void DisplayNameFor_ReturnsVariableName()
+        {
+            // Arrange
+            var unknownKey = "this is a dummy parameter value";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var result = helper.DisplayNameFor(model => unknownKey);
+
+            // Assert
+            Assert.Equal("unknownKey", result);
+        }
+
+        [Fact]
+        public void EnumerableDisplayNameFor_ReturnsVariableName()
+        {
+            // Arrange
+            var unknownKey = "this is a dummy parameter value";
+            var helper =
+                DefaultTemplatesUtilities.GetHtmlHelper<IEnumerable<DefaultTemplatesUtilities.ObjectTemplateModel>>(model: null);
+
+            // Act
+            var result = helper.DisplayNameFor(model => unknownKey);
+
+            // Assert
+            Assert.Equal("unknownKey", result);
+        }
+
+        private sealed class InnerClass
+        {
+            public int Id { get; set; }
+        }
+
+        private sealed class OuterClass
+        {
+            public InnerClass Inner { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayTextTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayTextTest.cs
new file mode 100644
index 0000000000..b6c9367656
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayTextTest.cs
@@ -0,0 +1,384 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Test the <see cref="IHtmlHelper.DisplayText"/> and
+    /// <see cref="IHtmlHelper{TModel}.DisplayTextFor{TValue}"/> methods.
+    /// </summary>
+    public class HtmlHelperDisplayTextTest
+    {
+        [Fact]
+        public void DisplayText_ReturnsEmpty_IfValueNull()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<OverriddenToStringModel>(model: null);
+
+            // Act
+            var result = helper.DisplayText(expression: string.Empty);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public void DisplayTextFor_ReturnsEmpty_IfValueNull()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<OverriddenToStringModel>(model: null);
+
+            // Act
+            var result = helper.DisplayTextFor(m => m);
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public void DisplayText_ReturnsNullDisplayText_IfSetAndValueNull()
+        {
+            // Arrange
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<OverriddenToStringModel>().DisplayDetails(dd =>
+            {
+                dd.NullDisplayText = "Null display Text";
+            });
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<OverriddenToStringModel>(model: null, provider: provider);
+
+            // Act
+            var result = helper.DisplayText(expression: string.Empty);
+
+            // Assert
+            Assert.Equal("Null display Text", result);
+        }
+
+        [Fact]
+        public void DisplayTextFor_ReturnsNullDisplayText_IfSetAndValueNull()
+        {
+            // Arrange
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<OverriddenToStringModel>().DisplayDetails(dd =>
+            {
+                dd.NullDisplayText = "Null display Text";
+            });
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<OverriddenToStringModel>(model: null, provider: provider);
+
+            // Act
+            var result = helper.DisplayTextFor(m => m);
+
+            // Assert
+            Assert.Equal("Null display Text", result);
+        }
+
+        [Fact]
+        public void DisplayText_ReturnsValue_IfNameEmpty()
+        {
+            // Arrange
+            var model = new OverriddenToStringModel("Model value");
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+
+            // Act
+            var result = helper.DisplayText(expression: string.Empty);
+            var nullResult = helper.DisplayText(expression: null);    // null is another alias for current model
+
+            // Assert
+            Assert.Equal("Model value", result);
+            Assert.Equal("Model value", nullResult);
+        }
+
+        [Fact]
+        public void DisplayText_ReturnsEmpty_IfNameNotFound()
+        {
+            // Arrange
+            var model = new OverriddenToStringModel("Model value");
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+
+            // Act
+            var result = helper.DisplayText("NonExistentProperty");
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public void DisplayTextFor_ReturnsValue_IfIdentityExpression()
+        {
+            // Arrange
+            var model = new OverriddenToStringModel("Model value");
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+
+            // Act
+            var result = helper.DisplayTextFor(m => m);
+
+            // Assert
+            Assert.Equal("Model value", result);
+        }
+
+        [Fact]
+        public void DisplayText_ReturnsSimpleDisplayText_IfSetAndValueNonNull()
+        {
+            // Arrange
+            var model = new OverriddenToStringModel("Ignored text")
+            {
+                SimpleDisplay = "Simple display text",
+            };
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<OverriddenToStringModel>().DisplayDetails(dd =>
+            {
+                dd.SimpleDisplayProperty = nameof(OverriddenToStringModel.SimpleDisplay);
+            });
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<OverriddenToStringModel>(model: model, provider: provider);
+
+            // Act
+            var result = helper.DisplayText(expression: string.Empty);
+
+            // Assert
+            Assert.Equal("Simple display text", result);
+        }
+
+        [Fact]
+        public void DisplayTextFor_ReturnsSimpleDisplayText_IfSetAndValueNonNull()
+        {
+            // Arrange
+            var model = new OverriddenToStringModel("Ignored text")
+            {
+                SimpleDisplay = "Simple display text",
+            };
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<OverriddenToStringModel>().DisplayDetails(dd =>
+            {
+                dd.SimpleDisplayProperty = nameof(OverriddenToStringModel.SimpleDisplay);
+            });
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<OverriddenToStringModel>(model: model, provider: provider);
+
+            // Act
+            var result = helper.DisplayTextFor(m => m);
+
+            // Assert
+            Assert.Equal("Simple display text", result);
+        }
+
+        [Fact]
+        public void DisplayText_ReturnsPropertyValue_IfNameFound()
+        {
+            // Arrange
+            var model = new OverriddenToStringModel("Ignored text")
+            {
+                Name = "Property value",
+                SimpleDisplay = "Simple display text",
+            };
+
+            var provider = new TestModelMetadataProvider();
+            provider.ForType<OverriddenToStringModel>().DisplayDetails(dd =>
+            {
+                dd.SimpleDisplayProperty = nameof(OverriddenToStringModel.SimpleDisplay);
+            });
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<OverriddenToStringModel>(model: model, provider: provider);
+
+            // Act
+            var result = helper.DisplayText("Name");
+
+            // Assert
+            Assert.Equal("Property value", result);
+        }
+
+        [Fact]
+        public void DisplayTextFor_ReturnsPropertyValue_IfPropertyExpression()
+        {
+            // Arrange
+            var model = new OverriddenToStringModel("ignored text")
+            {
+                Name = "Property value",
+            };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+
+            // Act
+            var result = helper.DisplayTextFor(m => m.Name);
+
+            // Assert
+            Assert.Equal("Property value", result);
+        }
+
+        [Fact]
+        public void DisplayText_ReturnsViewDataEntry()
+        {
+            // Arrange
+            var model = new OverriddenToStringModel("Model value")
+            {
+                Name = "Property value",
+            };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            helper.ViewData["Name"] = "View data dictionary value";
+
+            // Act
+            var result = helper.DisplayText("Name");
+
+            // Assert
+            Assert.Equal("View data dictionary value", result);
+        }
+
+        [Fact]
+        public void DisplayTextFor_IgnoresViewDataEntry()
+        {
+            // Arrange
+            var model = new OverriddenToStringModel("Model value")
+            {
+                Name = "Property value",
+            };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            helper.ViewData["Name"] = "View data dictionary value";
+
+            // Act
+            var result = helper.DisplayTextFor(m => m.Name);
+
+            // Assert
+            Assert.Equal("Property value", result);
+        }
+
+        [Fact]
+        public void DisplayText_IgnoresModelStateEntry_ReturnsViewDataEntry()
+        {
+            // Arrange
+            var model = new OverriddenToStringModel("Model value")
+            {
+                Name = "Property value",
+            };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            var viewData = helper.ViewData;
+            viewData["FieldPrefix.Name"] = "View data dictionary value";
+            viewData.TemplateInfo.HtmlFieldPrefix = "FieldPrefix";
+
+            viewData.ModelState.SetModelValue(
+                "FieldPrefix.Name",
+                "Attempted name value",
+                "Attempted name value");
+
+            // Act
+            var result = helper.DisplayText("Name");
+
+            // Assert
+            Assert.Equal("View data dictionary value", result);
+        }
+
+        [Fact]
+        public void DisplayTextFor_IgnoresModelStateEntry()
+        {
+            // Arrange
+            var model = new OverriddenToStringModel("Model value")
+            {
+                Name = "Property value",
+            };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            var viewData = helper.ViewData;
+            viewData["Name"] = "View data dictionary value";
+            viewData.TemplateInfo.HtmlFieldPrefix = "FieldPrefix";
+
+            viewData.ModelState.SetModelValue(
+                "FieldPrefix.Name",
+                "Attempted name value",
+                "Attempted name value");
+
+            // Act
+            var result = helper.DisplayTextFor(m => m.Name);
+
+            // Assert
+            Assert.Equal("Property value", result);
+        }
+
+        [Fact]
+        public void DisplayTextFor_EnumDisplayAttribute_WhenPresent()
+        {
+            // Arrange
+            var model = EnumWithDisplayAttribute.Value1;
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+
+            // Act
+            var result = helper.DisplayText(expression: string.Empty);
+            var forResult = helper.DisplayTextFor(m => m);
+
+            // Assert
+            Assert.Equal("Value One", result);
+            Assert.Equal("Value One", forResult);
+        }
+
+        [Fact]
+        public void DisplayTextFor_EnumDisplayAttribute_WhenPresentOnProperty()
+        {
+            // Arrange
+            var model = new EnumWithDisplayAttributeContainer { EnumValue = EnumWithDisplayAttribute.Value1 };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+
+            // Act
+            var result = helper.DisplayText(expression: nameof(EnumWithDisplayAttributeContainer.EnumValue));
+            var forResult = helper.DisplayTextFor(m => m.EnumValue);
+
+            // Assert
+            Assert.Equal("Value One", result);
+            Assert.Equal("Value One", forResult);
+        }
+
+        [Fact]
+        public void DisplayTextFor_EnumDisplayAttribute_WhenNotPresent()
+        {
+            // Arrange
+            var model = EnumWithoutDisplayAttribute.Value1;
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+
+            // Act
+            var result = helper.DisplayText(expression: null);
+            var forResult = helper.DisplayTextFor(m => m);
+
+            // Assert
+            Assert.Equal("Value1", result);
+            Assert.Equal("Value1", forResult);
+        }
+
+        // ModelMetadata.SimpleDisplayText returns ToString() result if that method has been overridden.
+        private sealed class OverriddenToStringModel
+        {
+            private readonly string _simpleDisplayText;
+
+            public OverriddenToStringModel(string simpleDisplayText)
+            {
+                _simpleDisplayText = simpleDisplayText;
+            }
+
+            public string SimpleDisplay { get; set; }
+
+            public string Name { get; set; }
+
+            public override string ToString()
+            {
+                return _simpleDisplayText;
+            }
+        }
+
+        private enum EnumWithDisplayAttribute
+        {
+            [Display(Name = "Value One")]
+            Value1
+        }
+
+        private enum EnumWithoutDisplayAttribute
+        {
+            Value1
+        }
+
+        private class EnumWithDisplayAttributeContainer
+        {
+            public EnumWithDisplayAttribute EnumValue { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDropDownListExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDropDownListExtensionsTest.cs
new file mode 100644
index 0000000000..b7d1846b0b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDropDownListExtensionsTest.cs
@@ -0,0 +1,257 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Core
+{
+    public class HtmlHelperDropDownListExtensionsTest
+    {
+        private static readonly List<SelectListItem> BasicSelectList = new List<SelectListItem>
+        {
+            new SelectListItem("Zero", "0"),
+            new SelectListItem("One", "1"),
+            new SelectListItem("Two", "2"),
+            new SelectListItem("Three", "3"),
+        };
+
+        [Fact]
+        public void DropDownList_FindsSelectList()
+        {
+            // Arrange
+            var expectedHtml = "<select id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\">" +
+                "<option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" + Environment.NewLine +
+                "<option value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                "<option value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                "</select>";
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.ModelState.SetModelValue("Property1", 3, "3");
+            helper.ViewData["Property1"] = BasicSelectList;
+
+            // Act
+            var dropDownListResult = helper.DropDownList("Property1");
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(dropDownListResult));
+        }
+
+        [Fact]
+        public void DropDownList_FindsSelectList_UsesOptionLabel()
+        {
+            // Arrange
+            var expectedHtml = "<select id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\">" +
+                "<option value=\"\">HtmlEncode[[--select--]]</option>" + Environment.NewLine +
+                "<option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" + Environment.NewLine +
+                "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                "<option value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                "<option value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                "</select>";
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.ModelState.SetModelValue("Property1", 1, "1");
+            helper.ViewData["Property1"] = BasicSelectList;
+
+            // Act
+            var dropDownListResult = helper.DropDownList("Property1", "--select--");
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(dropDownListResult));
+        }
+
+        [Fact]
+        public void DropDownList_UsesSpecifiedExpressionAndSelectList()
+        {
+            // Arrange
+            var expectedHtml = "<select id=\"HtmlEncode[[Property2]]\" name=\"HtmlEncode[[Property2]]\">" +
+                "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[4]]\">HtmlEncode[[Four]]</option>" + Environment.NewLine +
+                "<option value=\"HtmlEncode[[5]]\">HtmlEncode[[Five]]</option>" + Environment.NewLine +
+                "</select>";
+            var selectList = new List<SelectListItem>
+            {
+                new SelectListItem("Four", "4"),
+                new SelectListItem("Five", "5"),
+            };
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property2 = "4" };
+
+            // Act
+            var dropDownListResult = helper.DropDownList("Property2", selectList);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(dropDownListResult));
+        }
+
+        [Fact]
+        public void DropDownList_UsesSpecifiedExpressionAndSelectListAndHtmlAttributes()
+        {
+            // Arrange
+            var expectedHtml = "<select id=\"HtmlEncode[[Property1]]\" Key=\"HtmlEncode[[Value]]\" name=\"HtmlEncode[[Property1]]\">" +
+                "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[4]]\">HtmlEncode[[Four]]</option>" + Environment.NewLine +
+                "<option value=\"HtmlEncode[[5]]\">HtmlEncode[[Five]]</option>" + Environment.NewLine +
+                "</select>";
+            var selectList = new List<SelectListItem>
+            {
+                new SelectListItem("Four", "4"),
+                new SelectListItem("Five", "5"),
+            };
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.ModelState.SetModelValue("Property1", 4, "4");
+            helper.ViewData["Property1"] = BasicSelectList;
+
+            // Act
+            var dropDownListResult = helper.DropDownList("Property1", selectList, new { Key = "Value", name = "CustomName" });
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(dropDownListResult));
+        }
+
+        [Fact]
+        public void DropDownList_UsesExpressionAndSpecifiedSelectListAndOptionLabel()
+        {
+            // Arrange
+            var expectedHtml = "<select id=\"HtmlEncode[[Property2]]\" name=\"HtmlEncode[[Property2]]\">" +
+                "<option value=\"\">HtmlEncode[[--select--]]</option>" + Environment.NewLine +
+                "<option value=\"HtmlEncode[[4]]\">HtmlEncode[[Four]]</option>" + Environment.NewLine +
+                "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[5]]\">HtmlEncode[[Five]]</option>" + Environment.NewLine +
+                "</select>";
+            var selectList = new List<SelectListItem>
+            {
+                new SelectListItem("Four", "4"),
+                new SelectListItem("Five", "5"),
+            };
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property2 = "5" };
+
+            // Act
+            var dropDownListResult = helper.DropDownList("Property2", selectList, "--select--");
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(dropDownListResult));
+        }
+
+        [Fact]
+        public void DropDownListFor_NullSelectListFindsListFromViewData()
+        {
+            // Arrange
+            var expectedHtml = "<select id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\">" +
+                "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" + Environment.NewLine +
+                "<option value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                "<option value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                "<option value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                "</select>";
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData["Property1"] = BasicSelectList;
+            helper.ViewData.Model = new TestModel { Property1 = 0 };
+
+            // Act
+            var dropDownListForResult = helper.DropDownListFor(m => m.Property1, selectList: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(dropDownListForResult));
+        }
+
+        [Fact]
+        public void DropDownListFor_UsesSpecifiedExpressionAndSelectList()
+        {
+            // Arrange
+            var expectedHtml = "<select id=\"HtmlEncode[[Property2]]\" name=\"HtmlEncode[[Property2]]\">" +
+                "<option value=\"HtmlEncode[[4]]\">HtmlEncode[[Four]]</option>" + Environment.NewLine +
+                "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[5]]\">HtmlEncode[[Five]]</option>" + Environment.NewLine +
+                "</select>";
+            var selectList = new List<SelectListItem>
+            {
+                new SelectListItem("Four", "4"),
+                new SelectListItem("Five", "5"),
+            };
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData["Property1"] = BasicSelectList;
+            helper.ViewData.Model = new TestModel { Property2 = "5" };
+
+            // Act
+            var dropDownListForResult = helper.DropDownListFor(m => m.Property2, selectList);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(dropDownListForResult));
+        }
+
+        [Fact]
+        public void DropDownListFor_UsesSpecifiedExpressionAndSelectListAndHtmlAttributes()
+        {
+            // Arrange
+            var expectedHtml = "<select id=\"HtmlEncode[[Property3_2_]]\" Key=\"HtmlEncode[[Value]]\" name=\"HtmlEncode[[Property3[2]]]\">" +
+                "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[4]]\">HtmlEncode[[Four]]</option>" + Environment.NewLine +
+                "<option value=\"HtmlEncode[[5]]\">HtmlEncode[[Five]]</option>" + Environment.NewLine +
+                "</select>";
+            var selectList = new List<SelectListItem>
+            {
+                new SelectListItem("Four", "4"),
+                new SelectListItem("Five", "5"),
+            };
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property3 = new List<string> { "0", "2", "4" } };
+
+            // Act
+            var dropDownListForResult = helper.DropDownListFor(m => m.Property3[2], selectList, new { Key = "Value", name = "CustomName" });
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(dropDownListForResult));
+        }
+
+        [Fact]
+        public void DropDownListFor_UsesSpecifiedSelectListAndOptionLabel()
+        {
+            // Arrange
+            var expectedHtml = "<select id=\"HtmlEncode[[Property2]]\" name=\"HtmlEncode[[Property2]]\">" +
+                "<option value=\"\">HtmlEncode[[--select--]]</option>" + Environment.NewLine +
+                "<option value=\"HtmlEncode[[4]]\">HtmlEncode[[Four]]</option>" + Environment.NewLine +
+                "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[5]]\">HtmlEncode[[Five]]</option>" + Environment.NewLine +
+                "</select>";
+            var selectList = new List<SelectListItem>
+            {
+                new SelectListItem("Four", "4"),
+                new SelectListItem("Five", "5"),
+            };
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property2 = "5" };
+
+            // Act
+            var dropDownListForResult = helper.DropDownListFor(m => m.Property2, selectList, "--select--");
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(dropDownListForResult));
+        }
+
+        private class TestModel
+        {
+            public int Property1 { get; set; }
+
+            public string Property2 { get; set; }
+
+            public List<string> Property3 { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperEditorExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperEditorExtensionsTest.cs
new file mode 100644
index 0000000000..a73fc44a2f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperEditorExtensionsTest.cs
@@ -0,0 +1,68 @@
+// 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.
+
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public class HtmlHelperEditorExtensionsTest
+    {
+        [Theory]
+        [MemberData(nameof(HtmlHelperDisplayExtensionsTest.EnumUnformattedModels),
+            MemberType = typeof(HtmlHelperDisplayExtensionsTest))]
+        public void Display_UsesTemplateUnFormatted(HtmlHelperDisplayExtensionsTest.FormatModel model, string expectedResult)
+        {
+            // Arrange
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) => v.Writer.WriteAsync(v.ViewData.TemplateInfo.FormattedModelValue.ToString()))
+                .Returns(Task.FromResult(0));
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "EditorTemplates/Status", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("Status", view.Object))
+                .Verifiable();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var displayResult = helper.EditorFor(x => x.NonFormatProperty);
+
+            // Assert
+            Assert.Equal(expectedResult, HtmlContentUtilities.HtmlContentToString(displayResult));
+        }
+
+        [Theory]
+        [MemberData(nameof(HtmlHelperDisplayExtensionsTest.EnumFormatModels), MemberType = typeof(HtmlHelperDisplayExtensionsTest))]
+        public void Display_UsesTemplateFormatted(HtmlHelperDisplayExtensionsTest.FormatModel model, string expectedResult)
+        {
+            // Arrange
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Callback((ViewContext v) => v.Writer.WriteAsync(v.ViewData.TemplateInfo.FormattedModelValue.ToString()))
+                .Returns(Task.FromResult(0));
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(string.Empty, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "EditorTemplates/Status", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("Status", view.Object))
+                .Verifiable();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+
+            // Act
+            var displayResult = helper.EditorFor(x => x.FormatProperty);
+
+            // Assert
+            Assert.Equal(expectedResult, HtmlContentUtilities.HtmlContentToString(displayResult));
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormExtensionsTest.cs
new file mode 100644
index 0000000000..13beb13337
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormExtensionsTest.cs
@@ -0,0 +1,1367 @@
+// 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.
+
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Tests the <see cref="IHtmlHelper"/>'s <see cref="IHtmlHelper.BeginForm"/> and
+    /// <see cref="IHtmlHelper.BeginRouteForm"/> methods.
+    /// </summary>
+    public class HtmlHelperFormExtensionsTest
+    {
+        private static readonly IEnumerable<string> _actionNames = new List<string> { null, "Details" };
+        private static readonly IEnumerable<string> _controllerNames = new List<string> { null, "Product" };
+        private static readonly IEnumerable<object> _htmlAttributes = new List<object>
+        {
+            null,
+            new { isprint = "false", showreviews = "false" },
+            new Dictionary<string, object> { { "isprint", "false" }, { "showreviews", "true" }, },
+        };
+        private static readonly IEnumerable<FormMethod> _methods = new List<FormMethod>
+        {
+            FormMethod.Get,
+            FormMethod.Post,
+        };
+        private static readonly IEnumerable<string> _routeNames = new List<string> { null, "default" };
+        private static readonly IEnumerable<object> _routeValues = new List<object>
+        {
+            null,
+            new { p1_name = "p1-value" },
+            new Dictionary<string, object> { { "p1-name", "p1-value" }, { "p2-name", "p2-value" } },
+        };
+
+        public static TheoryData<string, string> ActionNameAndControllerNameDataSet
+        {
+            get
+            {
+                var dataSet = new TheoryData<string, string>();
+                foreach (var actionName in _actionNames)
+                {
+                    foreach (var controllerName in _controllerNames)
+                    {
+                        dataSet.Add(actionName, controllerName);
+                    }
+                }
+
+                return dataSet;
+            }
+        }
+
+        public static TheoryData<string, string, FormMethod> ActionNameControllerNameAndMethodDataSet
+        {
+            get
+            {
+                var dataSet = new TheoryData<string, string, FormMethod>();
+                foreach (var actionName in _actionNames)
+                {
+                    foreach (var controllerName in _controllerNames)
+                    {
+                        foreach (var method in _methods)
+                        {
+                            dataSet.Add(actionName, controllerName, method);
+                        }
+                    }
+                }
+
+                return dataSet;
+            }
+        }
+
+        public static TheoryData<string, string, FormMethod, object> ActionNameControllerNameMethodAndHtmlAttributesDataSet
+        {
+            get
+            {
+                var dataSet = new TheoryData<string, string, FormMethod, object>();
+                foreach (var actionName in _actionNames)
+                {
+                    foreach (var controllerName in _controllerNames)
+                    {
+                        foreach (var method in _methods)
+                        {
+                            foreach (var htmlAttributes in _htmlAttributes)
+                            {
+                                dataSet.Add(actionName, controllerName, method, htmlAttributes);
+                            }
+                        }
+                    }
+                }
+
+                return dataSet;
+            }
+        }
+
+        public static TheoryData<string, string, object> ActionNameControllerNameAndRouteValuesDataSet
+        {
+            get
+            {
+                var dataSet = new TheoryData<string, string, object>();
+                foreach (var actionName in _actionNames)
+                {
+                    foreach (var controllerName in _controllerNames)
+                    {
+                        foreach (var routeValues in _routeValues)
+                        {
+                            dataSet.Add(actionName, controllerName, routeValues);
+                        }
+                    }
+                }
+
+                return dataSet;
+            }
+        }
+
+        public static TheoryData<string, string, object, FormMethod> ActionNameControllerNameRouteValuesAndMethodDataSet
+        {
+            get
+            {
+                var dataSet = new TheoryData<string, string, object, FormMethod>();
+                foreach (var actionName in _actionNames)
+                {
+                    foreach (var controllerName in _controllerNames)
+                    {
+                        foreach (var routeValues in _routeValues)
+                        {
+                            foreach (var method in _methods)
+                            {
+                                dataSet.Add(actionName, controllerName, routeValues, method);
+                            }
+                        }
+                    }
+                }
+
+                return dataSet;
+            }
+        }
+
+        public static TheoryData<FormMethod> MethodDataSet
+        {
+            get
+            {
+                var dataSet = new TheoryData<FormMethod>();
+                foreach (var method in _methods)
+                {
+                    dataSet.Add(method);
+                }
+
+                return dataSet;
+            }
+        }
+
+        public static TheoryData<FormMethod, object> MethodAndHtmlAttributesDataSet
+        {
+            get
+            {
+                var dataSet = new TheoryData<FormMethod, object>();
+                foreach (var method in _methods)
+                {
+                    foreach (var htmlAttributes in _htmlAttributes)
+                    {
+                        dataSet.Add(method, htmlAttributes);
+                    }
+                }
+
+                return dataSet;
+            }
+        }
+
+        public static TheoryData<string> RouteNameDataSet
+        {
+            get
+            {
+                var dataSet = new TheoryData<string>();
+                foreach (var routeName in _routeNames)
+                {
+                    dataSet.Add(routeName);
+                }
+
+                return dataSet;
+            }
+        }
+
+        public static TheoryData<string, FormMethod> RouteNameAndMethodDataSet
+        {
+            get
+            {
+                var dataSet = new TheoryData<string, FormMethod>();
+                foreach (var routeName in _routeNames)
+                {
+                    foreach (var method in _methods)
+                    {
+                        dataSet.Add(routeName, method);
+                    }
+                }
+
+                return dataSet;
+            }
+        }
+
+        public static TheoryData<string, FormMethod, object> RouteNameMethodAndHtmlAttributesDataSet
+        {
+            get
+            {
+                var dataSet = new TheoryData<string, FormMethod, object>();
+                foreach (var routeName in _routeNames)
+                {
+                    foreach (var method in _methods)
+                    {
+                        foreach (var htmlAttributes in _htmlAttributes)
+                        {
+                            dataSet.Add(routeName, method, htmlAttributes);
+                        }
+                    }
+                }
+
+                return dataSet;
+            }
+        }
+
+        public static TheoryData<string, object> RouteNameAndRouteValuesDataSet
+        {
+            get
+            {
+                var dataSet = new TheoryData<string, object>();
+                foreach (var routeName in _routeNames)
+                {
+                    foreach (var routeValues in _routeValues)
+                    {
+                        dataSet.Add(routeName, routeValues);
+                    }
+                }
+
+                return dataSet;
+            }
+        }
+
+        public static TheoryData<string, object, FormMethod> RouteNameRouteValuesAndMethodDataSet
+        {
+            get
+            {
+                var dataSet = new TheoryData<string, object, FormMethod>();
+                foreach (var routeName in _routeNames)
+                {
+                    foreach (var routeValues in _routeValues)
+                    {
+                        foreach (var method in _methods)
+                        {
+                            dataSet.Add(routeName, routeValues, method);
+                        }
+                    }
+                }
+
+                return dataSet;
+            }
+        }
+
+        public static TheoryData<object> RouteValuesDataSet
+        {
+            get
+            {
+                var dataSet = new TheoryData<object>();
+                foreach (var routeValues in _routeValues)
+                {
+                    dataSet.Add(routeValues);
+                }
+
+                return dataSet;
+            }
+        }
+
+        [Fact]
+        public void BeginFormWithNoParameters_CallsHtmlGeneratorWithExpectedValues()
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateForm(
+                    htmlHelper.ViewContext,
+                    null,   // actionName
+                    null,   // controllerName
+                    null,   // routeValues
+                    "post", // method
+                    null))  // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(htmlHelper.ViewContext))
+                .Returns(HtmlString.Empty)
+                .Verifiable();
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginForm();
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Fact]
+        public void BeginForm_WithAntiforgery_CallsHtmlGeneratorWithExpectedValues()
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateForm(
+                    htmlHelper.ViewContext,
+                    null,   // actionName
+                    null,   // controllerName
+                    null,   // routeValues
+                    "post", // method
+                    null))  // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(htmlHelper.ViewContext))
+                .Returns(HtmlString.Empty)
+                .Verifiable();
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginForm(antiforgery: true);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Fact]
+        public void BeginForm_SuppressAntiforgery_CallsHtmlGeneratorWithExpectedValues()
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateForm(
+                    htmlHelper.ViewContext,
+                    null,   // actionName
+                    null,   // controllerName
+                    null,   // routeValues
+                    "post", // method
+                    null))  // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginForm(antiforgery: false);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(MethodDataSet))]
+        public void BeginFormWithMethodParameter_CallsHtmlGeneratorWithExpectedValues(FormMethod method)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateForm(
+                    htmlHelper.ViewContext,
+                    null,   // actionName
+                    null,   // controllerName
+                    null,   // routeValues
+                    method.ToString().ToLowerInvariant(),
+                    null))  // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            if (method != FormMethod.Get)
+            {
+                htmlGenerator
+                    .Setup(g => g.GenerateAntiforgery(htmlHelper.ViewContext))
+                    .Returns(HtmlString.Empty)
+                    .Verifiable();
+            }
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginForm(method);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(MethodAndHtmlAttributesDataSet))]
+        public void BeginFormWithMethodAndHtmlAttributesParameters_CallsHtmlGeneratorWithExpectedValues(
+            FormMethod method,
+            object htmlAttributes)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateForm(
+                    htmlHelper.ViewContext,
+                    null,   // actionName
+                    null,   // controllerName
+                    null,   // routeValues
+                    method.ToString().ToLowerInvariant(),
+                    htmlAttributes))
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            if (method != FormMethod.Get)
+            {
+                htmlGenerator
+                    .Setup(g => g.GenerateAntiforgery(htmlHelper.ViewContext))
+                    .Returns(HtmlString.Empty)
+                    .Verifiable();
+            }
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginForm(method, htmlAttributes);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(MethodAndHtmlAttributesDataSet))]
+        public void BeginFormWithMethodAndHtmlAttributesParameters_WithAntiforgery_CallsHtmlGeneratorWithExpectedValues(
+            FormMethod method,
+            object htmlAttributes)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateForm(
+                    htmlHelper.ViewContext,
+                    null,   // actionName
+                    null,   // controllerName
+                    null,   // routeValues
+                    method.ToString().ToLowerInvariant(),
+                    htmlAttributes))
+                .Returns(tagBuilder)
+                .Verifiable();
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(htmlHelper.ViewContext))
+                .Returns(HtmlString.Empty)
+                .Verifiable();
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginForm(method, antiforgery: true, htmlAttributes: htmlAttributes);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(MethodAndHtmlAttributesDataSet))]
+        public void BeginFormWithMethodAndHtmlAttributesParameters_SuppressAntiforgery_CallsHtmlGeneratorWithExpectedValues(
+            FormMethod method,
+            object htmlAttributes)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateForm(
+                    htmlHelper.ViewContext,
+                    null,   // actionName
+                    null,   // controllerName
+                    null,   // routeValues
+                    method.ToString().ToLowerInvariant(),
+                    htmlAttributes))
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginForm(method, antiforgery: false, htmlAttributes: htmlAttributes);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(RouteValuesDataSet))]
+        public void BeginFormWithRouteValuesParameter_CallsHtmlGeneratorWithExpectedValues(object routeValues)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateForm(
+                    htmlHelper.ViewContext,
+                    null,   // actionName
+                    null,   // controllerName
+                    routeValues,
+                    "post", // method
+                    null))  // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(htmlHelper.ViewContext))
+                .Returns(HtmlString.Empty)
+                .Verifiable();
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginForm(routeValues);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(ActionNameAndControllerNameDataSet))]
+        public void BeginFormWithActionNameAndControllerNameParameters_CallsHtmlGeneratorWithExpectedValues(
+            string actionName,
+            string controllerName)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateForm(
+                    htmlHelper.ViewContext,
+                    actionName,
+                    controllerName,
+                    null,   // routeValues
+                    "post", // method
+                    null))  // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(htmlHelper.ViewContext))
+                .Returns(HtmlString.Empty)
+                .Verifiable();
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginForm(actionName, controllerName);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(ActionNameControllerNameAndRouteValuesDataSet))]
+        public void BeginFormWithActionNameControllerNameAndRouteValuesParameters_CallsHtmlGeneratorWithExpectedValues(
+            string actionName,
+            string controllerName,
+            object routeValues)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateForm(
+                    htmlHelper.ViewContext,
+                    actionName,
+                    controllerName,
+                    routeValues,
+                    "post", // method
+                    null))  // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(htmlHelper.ViewContext))
+                .Returns(HtmlString.Empty)
+                .Verifiable();
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginForm(actionName, controllerName, routeValues);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(ActionNameControllerNameAndMethodDataSet))]
+        public void BeginFormWithActionNameControllerNameAndMethodParameters_CallsHtmlGeneratorWithExpectedValues(
+            string actionName,
+            string controllerName,
+            FormMethod method)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateForm(
+                    htmlHelper.ViewContext,
+                    actionName,
+                    controllerName,
+                    null,   // routeValues
+                    method.ToString().ToLowerInvariant(),
+                    null))  // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            if (method != FormMethod.Get)
+            {
+                htmlGenerator
+                    .Setup(g => g.GenerateAntiforgery(htmlHelper.ViewContext))
+                    .Returns(HtmlString.Empty)
+                    .Verifiable();
+            }
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginForm(actionName, controllerName, method);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(ActionNameControllerNameRouteValuesAndMethodDataSet))]
+        public void BeginFormWithActionNameContollerNameRouteValuesAndMethodParameters_CallsHtmlGeneratorWithExpectedValues(
+            string actionName,
+            string controllerName,
+            object routeValues,
+            FormMethod method)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateForm(
+                    htmlHelper.ViewContext,
+                    actionName,
+                    controllerName,
+                    routeValues,
+                    method.ToString().ToLowerInvariant(),
+                    null))  // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            if (method != FormMethod.Get)
+            {
+                htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(htmlHelper.ViewContext))
+                .Returns(HtmlString.Empty)
+                .Verifiable();
+            }
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginForm(actionName, controllerName, routeValues, method);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(ActionNameControllerNameMethodAndHtmlAttributesDataSet))]
+        public void BeginFormWithActionNameContollerNameMethodAndHtmlAttributesParameters_CallsHtmlGeneratorWithExpectedValues(
+            string actionName,
+            string controllerName,
+            FormMethod method,
+            object htmlAttributes)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateForm(
+                    htmlHelper.ViewContext,
+                    actionName,
+                    controllerName,
+                    null,   // routeValues
+                    method.ToString().ToLowerInvariant(),
+                    htmlAttributes))
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            if (method != FormMethod.Get)
+            {
+                htmlGenerator
+                    .Setup(g => g.GenerateAntiforgery(htmlHelper.ViewContext))
+                    .Returns(HtmlString.Empty)
+                    .Verifiable();
+            }
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginForm(actionName, controllerName, method, htmlAttributes);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(ActionNameControllerNameMethodAndHtmlAttributesDataSet))]
+        public void BeginFormWithActionNameContollerNameMethodAndHtmlAttributesParameters_WithAntiforgery_CallsHtmlGeneratorWithExpectedValues(
+            string actionName,
+            string controllerName,
+            FormMethod method,
+            object htmlAttributes)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateForm(
+                    htmlHelper.ViewContext,
+                    actionName,
+                    controllerName,
+                    null,   // routeValues
+                    method.ToString().ToLowerInvariant(),
+                    htmlAttributes))
+                .Returns(tagBuilder)
+                .Verifiable();
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(htmlHelper.ViewContext))
+                .Returns(HtmlString.Empty)
+                .Verifiable();
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginForm(
+                actionName,
+                controllerName,
+                routeValues: null,
+                method: method,
+                antiforgery: true,
+                htmlAttributes: htmlAttributes);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(ActionNameControllerNameMethodAndHtmlAttributesDataSet))]
+        public void BeginFormWithActionNameContollerNameMethodAndHtmlAttributesParameters_SuppressAntiforgery_CallsHtmlGeneratorWithExpectedValues(
+            string actionName,
+            string controllerName,
+            FormMethod method,
+            object htmlAttributes)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateForm(
+                    htmlHelper.ViewContext,
+                    actionName,
+                    controllerName,
+                    null,   // routeValues
+                    method.ToString().ToLowerInvariant(),
+                    htmlAttributes))
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginForm(
+                actionName,
+                controllerName,
+                routeValues: null,
+                method: method,
+                antiforgery: false,
+                htmlAttributes: htmlAttributes);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(RouteValuesDataSet))]
+        public void BeginRouteFormWithRouteValuesParameter_CallsHtmlGeneratorWithExpectedValues(object routeValues)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateRouteForm(
+                    htmlHelper.ViewContext,
+                    null,   // routeName
+                    routeValues,
+                    "post", // method
+                    null))  // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(htmlHelper.ViewContext))
+                .Returns(HtmlString.Empty)
+                .Verifiable();
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginRouteForm(routeValues);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(RouteValuesDataSet))]
+        public void BeginRouteFormWithRouteValuesParameter_WithAntiforgery_CallsHtmlGeneratorWithExpectedValues(
+            object routeValues)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateRouteForm(
+                    htmlHelper.ViewContext,
+                    null,   // routeName
+                    routeValues,
+                    "post", // method
+                    null))  // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(htmlHelper.ViewContext))
+                .Returns(HtmlString.Empty)
+                .Verifiable();
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginRouteForm(routeValues, antiforgery: true);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(RouteValuesDataSet))]
+        public void BeginRouteFormWithRouteValuesParameter_SuppressAntiforgery_CallsHtmlGeneratorWithExpectedValues(
+            object routeValues)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateRouteForm(
+                    htmlHelper.ViewContext,
+                    null,   // routeName
+                    routeValues,
+                    "post", // method
+                    null))  // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginRouteForm(routeValues, antiforgery: false);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(RouteNameDataSet))]
+        public void BeginRouteFormWithRouteNameParameter_CallsHtmlGeneratorWithExpectedValues(string routeName)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateRouteForm(
+                    htmlHelper.ViewContext,
+                    routeName,
+                    null,   // routeValues
+                    "post", // method
+                    null))  // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(htmlHelper.ViewContext))
+                .Returns(HtmlString.Empty)
+                .Verifiable();
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginRouteForm(routeName);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(RouteNameDataSet))]
+        public void BeginRouteFormWithRouteNameParameter_WithAntiforgery_CallsHtmlGeneratorWithExpectedValues(
+            string routeName)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateRouteForm(
+                    htmlHelper.ViewContext,
+                    routeName,
+                    null,   // routeValues
+                    "post", // method
+                    null))  // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(htmlHelper.ViewContext))
+                .Returns(HtmlString.Empty)
+                .Verifiable();
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginRouteForm(routeName, antiforgery: true);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(RouteNameDataSet))]
+        public void BeginRouteFormWithRouteNameParameter_SuppressAntiforgery_CallsHtmlGeneratorWithExpectedValues(
+            string routeName)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateRouteForm(
+                    htmlHelper.ViewContext,
+                    routeName,
+                    null,   // routeValues
+                    "post", // method
+                    null))  // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginRouteForm(routeName, antiforgery: false);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(RouteNameAndRouteValuesDataSet))]
+        public void BeginRouteFormWithRouteNameAndRouteValuesParameters_CallsHtmlGeneratorWithExpectedValues(
+            string routeName,
+            object routeValues)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateRouteForm(
+                    htmlHelper.ViewContext,
+                    routeName,
+                    routeValues,
+                    "post", // method
+                    null))  // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(htmlHelper.ViewContext))
+                .Returns(HtmlString.Empty)
+                .Verifiable();
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginRouteForm(routeName, routeValues);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(RouteNameAndMethodDataSet))]
+        public void BeginRouteFormWithRouteNameAndMethodParameters_CallsHtmlGeneratorWithExpectedValues(
+            string routeName,
+            FormMethod method)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateRouteForm(
+                    htmlHelper.ViewContext,
+                    routeName,
+                    null,   // routeValues
+                    method.ToString().ToLowerInvariant(),
+                    null))  // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            if (method != FormMethod.Get)
+            {
+                htmlGenerator
+                    .Setup(g => g.GenerateAntiforgery(htmlHelper.ViewContext))
+                    .Returns(HtmlString.Empty)
+                    .Verifiable();
+            }
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginRouteForm(routeName, method);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(RouteNameRouteValuesAndMethodDataSet))]
+        public void BeginRouteFormWithRouteNameRouteValuesAndMethodParameters_CallsHtmlGeneratorWithExpectedValues(
+            string routeName,
+            object routeValues,
+            FormMethod method)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateRouteForm(
+                    htmlHelper.ViewContext,
+                    routeName,
+                    routeValues,
+                    method.ToString().ToLowerInvariant(),
+                    null))  // htmlAttributes
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            if (method != FormMethod.Get)
+            {
+                htmlGenerator
+                    .Setup(g => g.GenerateAntiforgery(htmlHelper.ViewContext))
+                    .Returns(HtmlString.Empty)
+                    .Verifiable();
+            }
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginRouteForm(routeName, routeValues, method);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(RouteNameMethodAndHtmlAttributesDataSet))]
+        public void BeginRouteFormWithRouteNameMethodAndHtmlAttributesParameters_CallsHtmlGeneratorWithExpectedValues(
+            string routeName,
+            FormMethod method,
+            object htmlAttributes)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateRouteForm(
+                    htmlHelper.ViewContext,
+                    routeName,
+                    null,   // routeValues
+                    method.ToString().ToLowerInvariant(),
+                    htmlAttributes))
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            if (method != FormMethod.Get)
+            {
+                htmlGenerator
+                    .Setup(g => g.GenerateAntiforgery(htmlHelper.ViewContext))
+                    .Returns(HtmlString.Empty)
+                    .Verifiable();
+            }
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginRouteForm(routeName, method, htmlAttributes);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(RouteNameMethodAndHtmlAttributesDataSet))]
+        public void BeginRouteFormWithRouteNameMethodAndHtmlAttributesParameters_WithAntiforgery_CallsHtmlGeneratorWithExpectedValues(
+            string routeName,
+            FormMethod method,
+            object htmlAttributes)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateRouteForm(
+                    htmlHelper.ViewContext,
+                    routeName,
+                    null,   // routeValues
+                    method.ToString().ToLowerInvariant(),
+                    htmlAttributes))
+                .Returns(tagBuilder)
+                .Verifiable();
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(htmlHelper.ViewContext))
+                .Returns(HtmlString.Empty)
+                .Verifiable();
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginRouteForm(
+                routeName,
+                routeValues: null,
+                method: method,
+                antiforgery: true,
+                htmlAttributes: htmlAttributes);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(RouteNameMethodAndHtmlAttributesDataSet))]
+        public void BeginRouteFormWithRouteNameMethodAndHtmlAttributesParameters_SuppressAntiforgery_CallsHtmlGeneratorWithExpectedValues(
+            string routeName,
+            FormMethod method,
+            object htmlAttributes)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder(tagName: "form");
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            htmlGenerator
+                .Setup(g => g.GenerateRouteForm(
+                    htmlHelper.ViewContext,
+                    routeName,
+                    null,   // routeValues
+                    method.ToString().ToLowerInvariant(),
+                    htmlAttributes))
+                .Returns(tagBuilder)
+                .Verifiable();
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginRouteForm(
+                routeName,
+                routeValues: null,
+                method: method,
+                antiforgery: false,
+                htmlAttributes: htmlAttributes);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal("<form>", builder.ToString());
+            htmlGenerator.Verify();
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormTest.cs
new file mode 100644
index 0000000000..ceebb8f712
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormTest.cs
@@ -0,0 +1,818 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Tests the <see cref="IHtmlHelper"/>'s <see cref="IHtmlHelper.BeginForm"/> and
+    /// <see cref="IHtmlHelper.BeginRouteForm"/>methods.
+    /// </summary>
+    public class HtmlHelperFormTest
+    {
+        // actionName, controllerName, routeValues, method, htmlAttributes
+        public static TheoryData<string, string, object, FormMethod, object> BeginFormDataSet
+        {
+            get
+            {
+                return new TheoryData<string, string, object, FormMethod, object>
+                {
+                    {
+                        null, null, null, FormMethod.Get, null
+                    },
+                    {
+                        "Details", "Product", null, FormMethod.Get, null
+                    },
+                    {
+                        "Details", "Product", null, FormMethod.Post, null
+                    },
+                    {
+                        "Details", "Product", new { isprint = "false", showreviews = "false" }, FormMethod.Get, null
+                    },
+                    {
+                        "Details", "Product", new { isprint = "false", showreviews = "true" }, FormMethod.Post, null
+                    },
+                    {
+                        "Details", "Product", new { isprint = "true", showreviews = "false" }, FormMethod.Get,
+                        new { p1_name = "p1-value" }
+                    },
+                    {
+                        "Details", "Product", new { isprint = "true", showreviews = "true" }, FormMethod.Post,
+                        new { p1_name = "p1-value" }
+                    },
+                    {
+                        "Details", "Product",
+                        new Dictionary<string, object> { { "isprint", "false" }, { "showreviews", "false" }, },
+                        FormMethod.Get,
+                        new Dictionary<string, object> { { "p1-name", "p1-value" }, { "p2-name", "p2-value" } }
+                    },
+                    {
+                        "Details", "Product",
+                        new Dictionary<string, object> { { "isprint", "false" }, { "showreviews", "false" }, },
+                        FormMethod.Post,
+                        new Dictionary<string, object> { { "p1-name", "p1-value" }, { "p2-name", "p2-value" } }
+                    },
+                };
+            }
+        }
+
+        // routeName, routeValues, method, htmlAttributes
+        public static TheoryData<string, object, FormMethod, object> BeginRouteFormDataSet
+        {
+            get
+            {
+                return new TheoryData<string, object, FormMethod, object>
+                {
+                    {
+                        null, null, FormMethod.Get, null
+                    },
+                    {
+                        null, null, FormMethod.Post, null
+                    },
+                    {
+                        "default", null, FormMethod.Get, null
+                    },
+                    {
+                        "default", null, FormMethod.Post, null
+                    },
+                    {
+                        "default", new { isprint = "false", showreviews = "false" }, FormMethod.Get, null
+                    },
+                    {
+                        "default", new { isprint = "false", showreviews = "true" }, FormMethod.Post, null
+                    },
+                    {
+                        "default", new { isprint = "true", showreviews = "false" }, FormMethod.Get,
+                        new { p1 = "p1-value" }
+                    },
+                    {
+                        "default", new { isprint = "true", showreviews = "true" }, FormMethod.Post,
+                        new { p1 = "p1-value" }
+                    },
+                    {
+                        "default",
+                        new Dictionary<string, object> { { "isprint", "false" }, { "showreviews", "false" }, },
+                        FormMethod.Get,
+                        new Dictionary<string, object> { { "p1-name", "p1-value" }, { "p2-name", "p2-value" } }
+                    },
+                    {
+                        "default",
+                        new Dictionary<string, object> { { "isprint", "false" }, { "showreviews", "false" }, },
+                        FormMethod.Post,
+                        new Dictionary<string, object> { { "p1-name", "p1-value" }, { "p2-name", "p2-value" } }
+                    },
+                };
+            }
+        }
+
+        [Fact]
+        public void BeginForm_RendersExpectedValues_WithDefaultArguments()
+        {
+            // Arrange
+            var pathBase = "/Base";
+            var path = "/Path";
+            var queryString = "?query=string";
+            var expectedAction = pathBase + path + queryString;
+            var expectedStartTag = string.Format("<form action=\"HtmlEncode[[{0}]]\" method=\"HtmlEncode[[post]]\">", expectedAction);
+
+            // IUrlHelper should not be used in this scenario.
+            var urlHelper = new Mock<IUrlHelper>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(urlHelper.Object);
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+            Assert.NotNull(htmlHelper.ViewContext.HttpContext);
+            var request = htmlHelper.ViewContext.HttpContext.Request;
+            Assert.NotNull(request);
+
+            // Set properties the IHtmlGenerator implementation should use in this scenario.
+            request.PathBase = new PathString(pathBase);
+            request.Path = new PathString(path);
+            request.QueryString = new QueryString(queryString);
+
+            // Act
+            var mvcForm = htmlHelper.BeginForm(
+                actionName: null,
+                controllerName: null,
+                routeValues: null,
+                method: FormMethod.Post,
+                antiforgery: false,
+                htmlAttributes: null);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal(expectedStartTag, builder.ToString());
+            urlHelper.Verify();
+
+            builder.Clear();
+            mvcForm.Dispose();
+            Assert.Equal("</form>", builder.ToString());
+        }
+
+        [Fact]
+        public void BeginForm_RendersExpectedValues_WithDefaultArgumentsAndHtmlAttributes()
+        {
+            // Arrange
+            var pathBase = "/Base";
+            var path = "/Path";
+            var queryString = "?query=string";
+            var expectedAction = pathBase + path + queryString;
+            var htmlAttributes = new { p1_name = "p1-value" };
+            var expectedStartTag = string.Format("<form action=\"HtmlEncode[[{0}]]\" method=\"HtmlEncode[[post]]\"{1}>",
+                expectedAction,
+                GetHtmlAttributesAsString(htmlAttributes));
+
+            // IUrlHelper should not be used in this scenario.
+            var urlHelper = new Mock<IUrlHelper>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(urlHelper.Object);
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+            Assert.NotNull(htmlHelper.ViewContext.HttpContext);
+            var request = htmlHelper.ViewContext.HttpContext.Request;
+            Assert.NotNull(request);
+
+            // Set properties the IHtmlGenerator implementation should use in this scenario.
+            request.PathBase = new PathString(pathBase);
+            request.Path = new PathString(path);
+            request.QueryString = new QueryString(queryString);
+
+            // Act
+            var mvcForm = htmlHelper.BeginForm(
+                actionName: null,
+                controllerName: null,
+                routeValues: null,
+                method: FormMethod.Post,
+                antiforgery: false,
+                htmlAttributes: htmlAttributes);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal(expectedStartTag, builder.ToString());
+            urlHelper.Verify();
+
+            builder.Clear();
+            mvcForm.Dispose();
+            Assert.Equal("</form>", builder.ToString());
+        }
+
+        [Theory]
+        [MemberData(nameof(BeginFormDataSet))]
+        public void BeginForm_RendersExpectedValues(
+            string actionName,
+            string controllerName,
+            object routeValues,
+            FormMethod method,
+            object htmlAttributes)
+        {
+            // Arrange
+            var expectedAction = "http://localhost/Hello/World";
+            var expectedStartTag = string.Format(
+                "<form action=\"HtmlEncode[[{0}]]\" method=\"HtmlEncode[[{1}]]\"{2}>",
+                expectedAction,
+                method.ToString().ToLowerInvariant(),
+                GetHtmlAttributesAsString(htmlAttributes));
+
+            var urlHelper = new Mock<IUrlHelper>(MockBehavior.Strict);
+            urlHelper
+                .Setup(realHelper => realHelper.Action(It.Is<UrlActionContext>((context) =>
+                    string.Equals(context.Action, actionName) &&
+                    string.Equals(context.Controller, controllerName) &&
+                    context.Values == routeValues
+                )))
+                .Returns(expectedAction)
+                .Verifiable();
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(urlHelper.Object);
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginForm(
+                actionName,
+                controllerName,
+                routeValues,
+                method,
+                antiforgery: false,
+                htmlAttributes: htmlAttributes);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal(expectedStartTag, builder.ToString());
+            urlHelper.Verify();
+        }
+
+        [Theory]
+        [MemberData(nameof(BeginRouteFormDataSet))]
+        public void BeginRouteForm_RendersExpectedValues(
+            string routeName,
+            object routeValues,
+            FormMethod method,
+            object htmlAttributes)
+        {
+            // Arrange
+            var expectedAction = "http://localhost/Hello/World";
+            var expectedStartTag = string.Format(
+                "<form action=\"HtmlEncode[[{0}]]\" method=\"HtmlEncode[[{1}]]\"{2}>",
+                expectedAction,
+                method.ToString().ToLowerInvariant(),
+                GetHtmlAttributesAsString(htmlAttributes));
+
+            var urlHelper = new Mock<IUrlHelper>(MockBehavior.Strict);
+            urlHelper
+                .Setup(realHelper => realHelper.RouteUrl(It.Is<UrlRouteContext>(context =>
+                    string.Equals(context.RouteName, routeName) &&
+                    context.Values == routeValues &&
+                    context.Protocol == null &&
+                    context.Host == null &&
+                    context.Fragment == null)))
+                .Returns(expectedAction)
+                .Verifiable();
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(urlHelper.Object);
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            var mvcForm = htmlHelper.BeginRouteForm(
+                routeName,
+                routeValues,
+                method,
+                antiforgery: false,
+                htmlAttributes: htmlAttributes);
+
+            // Assert
+            Assert.NotNull(mvcForm);
+            Assert.Equal(expectedStartTag, builder.ToString());
+            urlHelper.Verify();
+        }
+
+        [Fact]
+        public void EndForm_RendersExpectedValues()
+        {
+            // Arrange
+            // IUrlHelper should not be used in this scenario.
+            var urlHelper = new Mock<IUrlHelper>(MockBehavior.Strict);
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(urlHelper.Object);
+
+            // Guards
+            Assert.NotNull(htmlHelper.ViewContext);
+            var writer = Assert.IsAssignableFrom<StringWriter>(htmlHelper.ViewContext.Writer);
+            var builder = writer.GetStringBuilder();
+            Assert.NotNull(builder);
+
+            // Act
+            htmlHelper.EndForm();
+
+            // Assert
+            Assert.Equal("</form>", builder.ToString());
+            urlHelper.Verify();
+        }
+
+        [Fact]
+        public void EndForm_RendersHiddenTagForCheckBox()
+        {
+            // Arrange
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper();
+            var serviceProvider = new Mock<IServiceProvider>();
+            serviceProvider.Setup(s => s.GetService(typeof(HtmlEncoder))).Returns(new HtmlTestEncoder());
+            var viewContext = htmlHelper.ViewContext;
+            viewContext.HttpContext.RequestServices = serviceProvider.Object;
+
+            var writer = viewContext.Writer as StringWriter;
+            Assert.NotNull(writer);
+            var builder = writer.GetStringBuilder();
+
+            var tagBuilder = new TagBuilder("input");
+            tagBuilder.MergeAttribute("name", "SomeName");
+            tagBuilder.MergeAttribute("type", "hidden");
+            tagBuilder.MergeAttribute("value", "false");
+            tagBuilder.TagRenderMode = TagRenderMode.SelfClosing;
+
+            htmlHelper.ViewContext.FormContext.EndOfFormContent.Add(tagBuilder);
+
+            // Act
+            htmlHelper.EndForm();
+
+            // Assert
+            Assert.Equal(
+                "<input name=\"HtmlEncode[[SomeName]]\" type=\"HtmlEncode[[hidden]]\" value=\"HtmlEncode[[false]]\" /></form>",
+                builder.ToString());
+        }
+
+        // This is an integration for the implicit antiforgery token added by BeginForm.
+        [Fact]
+        public void BeginForm_EndForm_RendersAntiforgeryToken()
+        {
+            // Arrange
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            htmlGenerator
+                .Setup(g => g.GenerateForm(
+                    It.IsAny<ViewContext>(),
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>()))
+                .Returns(new TagBuilder("form"));
+
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(It.IsAny<ViewContext>()))
+                .Returns(new TagBuilder("antiforgery"));
+
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            var serviceProvider = new Mock<IServiceProvider>();
+            serviceProvider.Setup(s => s.GetService(typeof(HtmlEncoder))).Returns(new HtmlTestEncoder());
+            var viewContext = htmlHelper.ViewContext;
+            viewContext.HttpContext.RequestServices = serviceProvider.Object;
+
+            var writer = viewContext.Writer as StringWriter;
+            Assert.NotNull(writer);
+
+            // Act & Assert
+            using (var form = htmlHelper.BeginForm())
+            {
+            }
+
+            Assert.Equal(
+                "<form><antiforgery></antiforgery></form>",
+                writer.GetStringBuilder().ToString());
+        }
+
+        [Fact]
+        public void BeginForm_EndForm_RendersAntiforgeryTokenWhenMethodIsPost()
+        {
+            // Arrange
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            htmlGenerator
+                .Setup(g => g.GenerateForm(
+                    It.IsAny<ViewContext>(),
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>()))
+                .Returns(new TagBuilder("form"));
+
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(It.IsAny<ViewContext>()))
+                .Returns(new TagBuilder("antiforgery"));
+
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            var serviceProvider = new Mock<IServiceProvider>();
+            serviceProvider.Setup(s => s.GetService(typeof(HtmlEncoder))).Returns(new HtmlTestEncoder());
+            var viewContext = htmlHelper.ViewContext;
+            viewContext.HttpContext.RequestServices = serviceProvider.Object;
+
+            var writer = viewContext.Writer as StringWriter;
+            Assert.NotNull(writer);
+
+            // Act & Assert
+            using (var form = htmlHelper.BeginForm(FormMethod.Post, antiforgery: null, htmlAttributes: null))
+            {
+            }
+
+            Assert.Equal(
+                "<form><antiforgery></antiforgery></form>",
+                writer.GetStringBuilder().ToString());
+        }
+
+        // This is an integration for suppressing implicit antiforgery token added by BeginForm.
+        [Fact]
+        public void BeginForm_EndForm_SuppressAntiforgeryToken()
+        {
+            // Arrange
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            htmlGenerator
+                .Setup(g => g.GenerateForm(
+                    It.IsAny<ViewContext>(),
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>()))
+                .Returns(new TagBuilder("form"));
+
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(It.IsAny<ViewContext>()))
+                .Returns(new TagBuilder("antiforgery"));
+
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            var serviceProvider = new Mock<IServiceProvider>();
+            serviceProvider.Setup(s => s.GetService(typeof(HtmlEncoder))).Returns(new HtmlTestEncoder());
+            var viewContext = htmlHelper.ViewContext;
+            viewContext.HttpContext.RequestServices = serviceProvider.Object;
+
+            var writer = viewContext.Writer as StringWriter;
+            Assert.NotNull(writer);
+
+            // Act & Assert
+            using (var form = htmlHelper.BeginForm(FormMethod.Post, antiforgery: false, htmlAttributes: null))
+            {
+            }
+
+            Assert.Equal(
+                "<form></form>",
+                writer.GetStringBuilder().ToString());
+        }
+
+        [Fact]
+        public void BeginForm_EndForm_SuppressAntiforgeryTokenWhenMethodIsGet()
+        {
+            // Arrange
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            htmlGenerator
+                .Setup(g => g.GenerateForm(
+                    It.IsAny<ViewContext>(),
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>()))
+                .Returns(new TagBuilder("form"));
+
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(It.IsAny<ViewContext>()))
+                .Returns(new TagBuilder("antiforgery"));
+
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            var serviceProvider = new Mock<IServiceProvider>();
+            serviceProvider.Setup(s => s.GetService(typeof(HtmlEncoder))).Returns(new HtmlTestEncoder());
+            var viewContext = htmlHelper.ViewContext;
+            viewContext.HttpContext.RequestServices = serviceProvider.Object;
+
+            var writer = viewContext.Writer as StringWriter;
+            Assert.NotNull(writer);
+
+            // Act & Assert
+            using (var form = htmlHelper.BeginForm(FormMethod.Get, antiforgery: null, htmlAttributes: null))
+            {
+            }
+
+            Assert.Equal(
+                "<form></form>",
+                writer.GetStringBuilder().ToString());
+        }
+
+        [Theory]
+        [InlineData(FormMethod.Get)]
+        [InlineData(FormMethod.Post)]
+        public void BeginForm_EndForm_DoesNotSuppressAntiforgeryTokenWhenAntiforgeryIsTrue(FormMethod method)
+        {
+            // Arrange
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            htmlGenerator
+                .Setup(g => g.GenerateForm(
+                    It.IsAny<ViewContext>(),
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>()))
+                .Returns(new TagBuilder("form"));
+
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(It.IsAny<ViewContext>()))
+                .Returns(new TagBuilder("antiforgery"));
+
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            var serviceProvider = new Mock<IServiceProvider>();
+            serviceProvider.Setup(s => s.GetService(typeof(HtmlEncoder))).Returns(new HtmlTestEncoder());
+            var viewContext = htmlHelper.ViewContext;
+            viewContext.HttpContext.RequestServices = serviceProvider.Object;
+
+            var writer = viewContext.Writer as StringWriter;
+            Assert.NotNull(writer);
+
+            // Act & Assert
+            using (var form = htmlHelper.BeginForm(method, antiforgery: true, htmlAttributes: null))
+            {
+            }
+
+            Assert.Equal(
+                "<form><antiforgery></antiforgery></form>",
+                writer.GetStringBuilder().ToString());
+        }
+
+        // This is an integration for suppressing implicit antiforgery token added by BeginForm.
+        [Fact]
+        public void BeginForm_EndForm_SuppressAntiforgeryToken_WithExplicitCallToAntiforgery()
+        {
+            // Arrange
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            htmlGenerator
+                .Setup(g => g.GenerateForm(
+                    It.IsAny<ViewContext>(),
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>()))
+                .Returns(new TagBuilder("form"));
+
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(It.IsAny<ViewContext>()))
+                .Returns(new TagBuilder("antiforgery"));
+
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            var serviceProvider = new Mock<IServiceProvider>();
+            serviceProvider.Setup(s => s.GetService(typeof(HtmlEncoder))).Returns(new HtmlTestEncoder());
+            var viewContext = htmlHelper.ViewContext;
+            viewContext.HttpContext.RequestServices = serviceProvider.Object;
+
+            var writer = viewContext.Writer as StringWriter;
+            Assert.NotNull(writer);
+
+            // Act & Assert
+            using (var form = htmlHelper.BeginForm(FormMethod.Post, antiforgery: false, htmlAttributes: null))
+            {
+                // This call will output a token.
+                Assert.Equal("antiforgery", Assert.IsType<TagBuilder>(htmlHelper.AntiForgeryToken()).TagName);
+            }
+
+            Assert.Equal(
+                "<form></form>",
+                writer.GetStringBuilder().ToString());
+        }
+
+        // This is an integration for the implicit antiforgery token added by BeginRouteForm.
+        [Fact]
+        public void BeginRouteForm_EndForm_RendersAntiforgeryToken()
+        {
+            // Arrange
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            htmlGenerator
+                .Setup(g => g.GenerateRouteForm(
+                    It.IsAny<ViewContext>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>()))
+                .Returns(new TagBuilder("form"));
+
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(It.IsAny<ViewContext>()))
+                .Returns(new TagBuilder("antiforgery"));
+
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            var serviceProvider = new Mock<IServiceProvider>();
+            serviceProvider.Setup(s => s.GetService(typeof(HtmlEncoder))).Returns(new HtmlTestEncoder());
+            var viewContext = htmlHelper.ViewContext;
+            viewContext.HttpContext.RequestServices = serviceProvider.Object;
+
+            var writer = viewContext.Writer as StringWriter;
+            Assert.NotNull(writer);
+
+            // Act & Assert
+            using (var form = htmlHelper.BeginRouteForm(routeValues: null))
+            {
+            }
+
+            Assert.Equal(
+                "<form><antiforgery></antiforgery></form>",
+                writer.GetStringBuilder().ToString());
+        }
+
+        [Fact]
+        public void BeginRouteForm_EndForm_RendersAntiforgeryTokenWhenMethodIsPost()
+        {
+            // Arrange
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            htmlGenerator
+                .Setup(g => g.GenerateRouteForm(
+                    It.IsAny<ViewContext>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>()))
+                .Returns(new TagBuilder("form"));
+
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(It.IsAny<ViewContext>()))
+                .Returns(new TagBuilder("antiforgery"));
+
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            var serviceProvider = new Mock<IServiceProvider>();
+            serviceProvider.Setup(s => s.GetService(typeof(HtmlEncoder))).Returns(new HtmlTestEncoder());
+            var viewContext = htmlHelper.ViewContext;
+            viewContext.HttpContext.RequestServices = serviceProvider.Object;
+
+            var writer = viewContext.Writer as StringWriter;
+            Assert.NotNull(writer);
+
+            // Act & Assert
+            using (var form = htmlHelper.BeginRouteForm(
+                routeName: null,
+                routeValues: null,
+                method: FormMethod.Post,
+                antiforgery: null,
+                htmlAttributes: null))
+            {
+            }
+
+            Assert.Equal(
+                "<form><antiforgery></antiforgery></form>",
+                writer.GetStringBuilder().ToString());
+        }
+
+        // This is an integration for suppressing implicit antiforgery token added by BeginRouteForm.
+        [Fact]
+        public void BeginRouteForm_EndForm_SuppressAntiforgeryToken()
+        {
+            // Arrange
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            htmlGenerator
+                .Setup(g => g.GenerateRouteForm(
+                    It.IsAny<ViewContext>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>()))
+                .Returns(new TagBuilder("form"));
+
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(It.IsAny<ViewContext>()))
+                .Returns(new TagBuilder("antiforgery"));
+
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            var serviceProvider = new Mock<IServiceProvider>();
+            serviceProvider.Setup(s => s.GetService(typeof(HtmlEncoder))).Returns(new HtmlTestEncoder());
+            var viewContext = htmlHelper.ViewContext;
+            viewContext.HttpContext.RequestServices = serviceProvider.Object;
+
+            var writer = viewContext.Writer as StringWriter;
+            Assert.NotNull(writer);
+
+            // Act & Assert
+            using (var form = htmlHelper.BeginRouteForm(
+                routeName: null,
+                routeValues: null,
+                method: FormMethod.Post,
+                antiforgery: false,
+                htmlAttributes: null))
+            {
+            }
+
+            Assert.Equal(
+                "<form></form>",
+                writer.GetStringBuilder().ToString());
+        }
+
+        [Fact]
+        public void BeginRouteForm_EndForm_SuppressAntiforgeryTokenWhenMethodIsGet()
+        {
+            // Arrange
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            htmlGenerator
+                .Setup(g => g.GenerateRouteForm(
+                    It.IsAny<ViewContext>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>()))
+                .Returns(new TagBuilder("form"));
+
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(It.IsAny<ViewContext>()))
+                .Returns(new TagBuilder("antiforgery"));
+
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            var serviceProvider = new Mock<IServiceProvider>();
+            serviceProvider.Setup(s => s.GetService(typeof(HtmlEncoder))).Returns(new HtmlTestEncoder());
+            var viewContext = htmlHelper.ViewContext;
+            viewContext.HttpContext.RequestServices = serviceProvider.Object;
+
+            var writer = viewContext.Writer as StringWriter;
+            Assert.NotNull(writer);
+
+            // Act & Assert
+            using (var form = htmlHelper.BeginRouteForm(
+                routeName: null,
+                routeValues: null,
+                method: FormMethod.Get,
+                antiforgery: null,
+                htmlAttributes: null))
+            {
+            }
+
+            Assert.Equal(
+                "<form></form>",
+                writer.GetStringBuilder().ToString());
+        }
+
+        [Theory]
+        [InlineData(FormMethod.Get)]
+        [InlineData(FormMethod.Post)]
+        public void BeginRouteForm_EndForm_DoesNotSuppressAntiforgeryTokenWhenAntiforgeryIsTrue(FormMethod method)
+        {
+            // Arrange
+            var htmlGenerator = new Mock<IHtmlGenerator>(MockBehavior.Strict);
+            htmlGenerator
+                .Setup(g => g.GenerateRouteForm(
+                    It.IsAny<ViewContext>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>(),
+                    It.IsAny<string>(),
+                    It.IsAny<object>()))
+                .Returns(new TagBuilder("form"));
+
+            htmlGenerator
+                .Setup(g => g.GenerateAntiforgery(It.IsAny<ViewContext>()))
+                .Returns(new TagBuilder("antiforgery"));
+
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(htmlGenerator.Object);
+            var serviceProvider = new Mock<IServiceProvider>();
+            serviceProvider.Setup(s => s.GetService(typeof(HtmlEncoder))).Returns(new HtmlTestEncoder());
+            var viewContext = htmlHelper.ViewContext;
+            viewContext.HttpContext.RequestServices = serviceProvider.Object;
+
+            var writer = viewContext.Writer as StringWriter;
+            Assert.NotNull(writer);
+
+            // Act & Assert
+            using (var form = htmlHelper.BeginRouteForm(
+                routeName: null,
+                routeValues: null,
+                method: method,
+                antiforgery: true,
+                htmlAttributes: null))
+            {
+            }
+
+            Assert.Equal(
+                "<form><antiforgery></antiforgery></form>",
+                writer.GetStringBuilder().ToString());
+        }
+
+        private string GetHtmlAttributesAsString(object htmlAttributes)
+        {
+            var dictionary = HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributes);
+            return string.Join(
+                string.Empty,
+                dictionary.Select(keyValue => string.Format(" {0}=\"HtmlEncode[[{1}]]\"", keyValue.Key, keyValue.Value)));
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperHiddenTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperHiddenTest.cs
new file mode 100644
index 0000000000..2829b1746d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperHiddenTest.cs
@@ -0,0 +1,1007 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public class HtmlHelperHiddenTest
+    {
+        public static TheoryData<object, string> HiddenWithAttributesData
+        {
+            get
+            {
+                var expected1 = @"<input baz=""HtmlEncode[[BazValue]]"" id=""HtmlEncode[[Property1]]"" " +
+                    @"name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" " +
+                    @"value=""HtmlEncode[[ModelStateValue]]"" />";
+                var expected2 = @"<input foo-baz=""HtmlEncode[[BazValue]]"" id=""HtmlEncode[[Property1]]"" " +
+                    @"name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" " +
+                    @"value=""HtmlEncode[[ModelStateValue]]"" />";
+                var htmlAttributes1 = new Dictionary<string, object>
+                {
+                    { "baz", "BazValue" },
+                    { "name", "-expression-" }, // overridden
+                };
+                var htmlAttributes2 = new
+                {
+                    baz = "BazValue",
+                    name = "-expression-", // overridden
+                };
+
+                var data = new TheoryData<object, string>
+                {
+                    { htmlAttributes1, expected1 },
+                    { htmlAttributes2, expected1 },
+                    { new Dictionary<string, object> { { "foo-baz", "BazValue" } }, expected2 },
+                    { new { foo_baz = "BazValue" }, expected2 }
+                };
+
+                return data;
+            }
+        }
+
+        [Fact]
+        public void HiddenWithByteArrayValue_GeneratesBase64EncodedValue()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[ProductName]]"" name=""HtmlEncode[[ProductName]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[Fys1]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var result = helper.Hidden("ProductName", new byte[] { 23, 43, 53 }, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Theory]
+        [MemberData(nameof(HiddenWithAttributesData))]
+        public void HiddenWithArgumentValueAndAttributes_UsesArgumentValue(object attributes, string expected)
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithModelStateAndModelAndViewDataValues());
+            helper.ViewData.Model.Property1 = "should-not-be-used";
+
+            // Act
+            var result = helper.Hidden("Property1", "test", attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenNotInTemplate_GetsValueFromPropertyOfViewDataEntry()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Prefix_Property1]]"" name=""HtmlEncode[[Prefix.Property1]]"" " +
+                @"type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[contained-view-data-value]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithNonNullModel());
+            helper.ViewData.Model.Property1 = "model-property1-value";
+            helper.ViewData["Prefix"] = new HiddenModel { Property1 = "contained-view-data-value" };
+
+            // Act
+            var html = helper.Hidden("Prefix.Property1", value: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void HiddenInTemplate_GetsValueFromPropertyOfViewDataEntry()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Prefix_Property1]]"" name=""HtmlEncode[[Prefix.Property1]]"" " +
+                @"type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[contained-view-data-value]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithNonNullModel());
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Prefix";
+            helper.ViewData.Model.Property1 = "model-property1-value";
+            helper.ViewData["Prefix"] = new HiddenModel { Property1 = "contained-view-data-value" };
+
+            // Act
+            var html = helper.Hidden("Property1", value: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void HiddenNotInTemplate_GetsValueFromViewDataEntry_EvenIfNull()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" " +
+                @"type=""HtmlEncode[[hidden]]"" value="""" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithNonNullModel());
+            helper.ViewData.Model.Property1 = "model-property1-value";
+            helper.ViewData["Property1"] = null;
+
+            // Act
+            var html = helper.Hidden("Property1", value: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void HiddenInTemplate_GetsValueFromViewDataEntry_EvenIfNull()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Prefix_Property1]]"" name=""HtmlEncode[[Prefix.Property1]]"" " +
+                @"type=""HtmlEncode[[hidden]]"" value="""" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithNonNullModel());
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Prefix";
+            helper.ViewData.Model.Property1 = "model-property1-value";
+            helper.ViewData["Prefix.Property1"] = null;
+
+            // Act
+            var html = helper.Hidden("Property1", value: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void HiddenOverridesValueFromAttributesWithArgumentValue()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[explicit-value]]"" />";
+            var attributes = new { value = "attribute-value" };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithNullModelAndNonNullViewData());
+            helper.ViewData.Clear();
+
+            // Act
+            var result = helper.Hidden("Property1", "explicit-value", attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenWithArgumentValueAndNullModel_UsesArgumentValue()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Property1]]"" key=""HtmlEncode[[value]]"" name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" " +
+                @"value=""HtmlEncode[[test]]"" />";
+            var attributes = new { key = "value" };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithNullModelAndNonNullViewData());
+
+            // Act
+            var result = helper.Hidden("Property1", "test", attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenWithNonNullValue_GeneratesExpectedValue()
+        {
+            // Arrange
+            var expected = @"<input data-key=""HtmlEncode[[value]]"" id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" " +
+                @"value=""HtmlEncode[[test]]"" />";
+            var attributes = new Dictionary<string, object> { { "data-key", "value" } };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithNullModelAndNonNullViewData());
+
+            // Act
+            var result = helper.Hidden("Property1", "test", attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenUsesValuesFromModelState_OverExplicitSpecifiedValueAndPropertyValue()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[ModelStateValue]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithModelStateAndModelAndViewDataValues());
+            helper.ViewData.Model.Property1 = "test-value";
+
+            // Act
+            var result = helper.Hidden("Property1", value: "explicit-value", htmlAttributes: new { value = "attribute-value" });
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenUsesExplicitValue_IfModelStateDoesNotHaveProperty()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[explicit-value]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithModelStateAndModelAndViewDataValues());
+            helper.ViewData.ModelState.Clear();
+            helper.ViewData.Model.Property1 = "property-value";
+
+            // Act
+            var result = helper.Hidden("Property1", value: "explicit-value", htmlAttributes: new { value = "attribute-value" });
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenUsesValueFromViewData_IfModelStateDoesNotHavePropertyAndExplicitValueIsNull()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[view-data-val]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithModelStateAndModelAndViewDataValues());
+            helper.ViewData.ModelState.Clear();
+            helper.ViewData.Model.Property1 = "property-value";
+
+            // Act
+            var result = helper.Hidden("Property1", value: null, htmlAttributes: new { value = "attribute-value" });
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenNotInTemplate_GetsModelValue_IfModelStateAndViewDataEmpty()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[property-value]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithNonNullModel());
+            helper.ViewData.Model.Property1 = "property-value";
+
+            // Act
+            var result = helper.Hidden("Property1", value: null, htmlAttributes: new { value = "attribute-value" });
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenInTemplate_GetsModelValue_IfModelStateAndViewDataEmpty()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Prefix_Property1]]"" name=""HtmlEncode[[Prefix.Property1]]"" " +
+                @"type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[property-value]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithNonNullModel());
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Prefix";
+            helper.ViewData.Model.Property1 = "property-value";
+
+            // Act
+            var html = helper.Hidden("Property1", value: null, htmlAttributes: new { value = "attribute-value" });
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void HiddenNotInTemplate_DoesNotUseAttributeValue()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value="""" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithNonNullModel());
+
+            // Act
+            var result = helper.Hidden("Property1", value: null, htmlAttributes: new { value = "attribute-value" });
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenInTemplate_DoesNotUseAttributeValue()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Prefix_Property1]]"" name=""HtmlEncode[[Prefix.Property1]]"" " +
+                @"type=""HtmlEncode[[hidden]]"" value="""" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithNonNullModel());
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Prefix";
+
+            // Act
+            var html = helper.Hidden("Property1", value: null, htmlAttributes: new { value = "attribute-value" });
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void HiddenNotInTemplate_GetsEmptyValue_IfPropertyIsNotFound()
+        {
+            // Arrange
+            var expected = @"<input baz=""HtmlEncode[[BazValue]]"" id=""HtmlEncode[[keyNotFound]]"" name=""HtmlEncode[[keyNotFound]]"" type=""HtmlEncode[[hidden]]"" " +
+                @"value="""" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithModelStateAndModelAndViewDataValues());
+            var attributes = new Dictionary<string, object> { { "baz", "BazValue" } };
+
+            // Act
+            var result = helper.Hidden("keyNotFound", value: null, htmlAttributes: attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenInTemplate_GetsEmptyValue_IfPropertyIsNotFound()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Prefix_keyNotFound]]"" name=""HtmlEncode[[Prefix.keyNotFound]]"" " +
+                @"type=""HtmlEncode[[hidden]]"" value="""" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithModelStateAndModelAndViewDataValues());
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Prefix";
+
+            // Act
+            var html = helper.Hidden("keyNotFound", value: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void HiddenInTemplate_WithExplicitValue_GeneratesExpectedValue()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[MyPrefix_Property1]]"" name=""HtmlEncode[[MyPrefix.Property1]]"" type=""HtmlEncode[[hidden]]"" " +
+                           @"value=""HtmlEncode[[PropValue]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithModelStateAndModelAndViewDataValues());
+            helper.ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = "MyPrefix";
+
+            // Act
+            var result = helper.Hidden("Property1", "PropValue", htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenInTemplate_WithExplicitValueAndEmptyName_GeneratesExpectedValue()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[MyPrefix]]"" name=""HtmlEncode[[MyPrefix]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[fooValue]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithModelStateAndModelAndViewDataValues());
+            helper.ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = "MyPrefix";
+
+            // Act
+            var result = helper.Hidden(string.Empty, "fooValue", htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenInTemplate_UsesPrefixName_ToLookupPropertyValueInModelState()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[MyPrefix$Property1]]"" name=""HtmlEncode[[MyPrefix.Property1]]"" type=""HtmlEncode[[hidden]]"" " +
+                           @"value=""HtmlEncode[[modelstate-with-prefix]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(
+                GetViewDataWithModelStateAndModelAndViewDataValues(),
+                idAttributeDotReplacement: "$");
+            helper.ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = "MyPrefix";
+            helper.ViewData.ModelState.Clear();
+            helper.ViewData.ModelState.SetModelValue(
+                "Property1",
+                "modelstate-without-prefix",
+                "modelstate-without-prefix");
+            helper.ViewData.ModelState.SetModelValue(
+                "MyPrefix.Property1",
+                "modelstate-with-prefix",
+                "modelstate-with-prefix");
+            helper.ViewData.ModelState.SetModelValue(
+                "MyPrefix$Property1",
+                "modelstate-with-iddotreplacement",
+                "modelstate-with-iddotreplacement");
+
+            // Act
+            var result = helper.Hidden("Property1", "explicit-value", htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenInTemplate_UsesPrefixNameToLookupPropertyValueInViewData()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[MyPrefix$Property1]]"" name=""HtmlEncode[[MyPrefix.Property1]]"" type=""HtmlEncode[[hidden]]"" " +
+                           @"value=""HtmlEncode[[vdd-with-prefix]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(
+                GetViewDataWithModelStateAndModelAndViewDataValues(),
+                idAttributeDotReplacement: "$");
+            helper.ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = "MyPrefix";
+            helper.ViewData.ModelState.Clear();
+            helper.ViewData.Clear();
+            helper.ViewData.Add("Property1", "vdd-without-prefix");
+            helper.ViewData.Add("MyPrefix.Property1", "vdd-with-prefix");
+            helper.ViewData.Add("MyPrefix$Property1", "vdd-with-iddotreplacement");
+
+            // Act
+            var result = helper.Hidden("Property1", value: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenWithEmptyNameAndPrefixThrows()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper("model-value");
+            var attributes = new Dictionary<string, object>
+            {
+                { "class", "some-class"}
+            };
+            var expected = "The name of an HTML field cannot be null or empty. Instead use methods " +
+                "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper.Editor or Microsoft.AspNetCore.Mvc.Rendering." +
+                "IHtmlHelper`1.EditorFor with a non-empty htmlFieldName argument value.";
+
+            // Act and Assert
+            ExceptionAssert.ThrowsArgument(
+                () => helper.Hidden(expression: string.Empty, value: null, htmlAttributes: attributes),
+                "expression",
+                expected);
+        }
+
+        [Fact]
+        public void HiddenWithEmptyNameAndPrefix_DoesNotThrow_WithNameAttribute()
+        {
+            // Arrange
+            var expected = @"<input class=""HtmlEncode[[some-class]]"" name=""HtmlEncode[[-expression-]]"" " +
+                @"type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[model-value]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper("model-value");
+            var attributes = new Dictionary<string, object>
+            {
+                { "class", "some-class"},
+                { "name", "-expression-" },
+            };
+
+            // Act
+            var result = helper.Hidden(expression: string.Empty, value: null, htmlAttributes: attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenWithViewDataErrors_GeneratesExpectedValue()
+        {
+            // Arrange
+            var expected = @"<input baz=""HtmlEncode[[BazValue]]"" class=""HtmlEncode[[input-validation-error some-class]]"" id=""HtmlEncode[[Property1]]""" +
+                           @" name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[ModelStateValue]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithErrors());
+            var attributes = new Dictionary<string, object>
+            {
+                { "baz", "BazValue" },
+                { "class", "some-class"}
+            };
+
+            // Act
+            var result = helper.Hidden("Property1", value: null, htmlAttributes: attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenGeneratesUnobtrusiveValidation()
+        {
+            // Arrange
+            var requiredMessage = new RequiredAttribute().FormatErrorMessage("Property2");
+            var expected =
+                $@"<input data-val=""HtmlEncode[[true]]"" data-val-required=""HtmlEncode[[{requiredMessage}]]"" " +
+                @"id=""HtmlEncode[[Property2]]"" name=""HtmlEncode[[Property2]]"" type=""HtmlEncode[[hidden]]"" value="""" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithModelStateAndModelAndViewDataValues());
+
+            // Act
+            var result = helper.Hidden("Property2", value: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        public static IEnumerable<object[]> HiddenWithComplexExpressions_UsesValueFromViewDataData
+        {
+            get
+            {
+                yield return new object[]
+                {
+                    "Property3[height]",
+                    @"<input data-test=""HtmlEncode[[val]]"" id=""HtmlEncode[[Property3_height_]]"" name=""HtmlEncode[[Property3[height]]]"" type=""HtmlEncode[[hidden]]"" " +
+                    @"value=""HtmlEncode[[Prop3Value]]"" />",
+                };
+
+                yield return new object[]
+                {
+                    "Property4.Property5",
+                    @"<input data-test=""HtmlEncode[[val]]"" id=""HtmlEncode[[Property4_Property5]]"" name=""HtmlEncode[[Property4.Property5]]"" " +
+                    @"type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[Prop5Value]]"" />",
+                };
+
+                yield return new object[]
+               {
+                    "Property4.Property6[0]",
+                    @"<input data-test=""HtmlEncode[[val]]"" id=""HtmlEncode[[Property4_Property6_0_]]"" name=""HtmlEncode[[Property4.Property6[0]]]"" " +
+                    @"type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[Prop6Value]]"" />",
+               };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(HiddenWithComplexExpressions_UsesValueFromViewDataData))]
+        public void HiddenWithComplexExpressions_UsesValueFromViewData(string expression, string expected)
+        {
+            // Arrange
+            var viewData = GetViewDataWithModelStateAndModelAndViewDataValues();
+            viewData["Property3[height]"] = "Prop3Value";
+            viewData["Property4.Property5"] = "Prop5Value";
+            viewData["Property4.Property6[0]"] = "Prop6Value";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewData);
+            var attributes = new Dictionary<string, object> { { "data-test", "val" } };
+
+            // Act
+            var result = helper.Hidden(expression, value: null, htmlAttributes: attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        public static IEnumerable<object[]> HiddenWithComplexExpressions_UsesIdDotSeparatorData
+        {
+            get
+            {
+                yield return new object[]
+                {
+                    "Property4.Property5",
+                    @"<input data-test=""HtmlEncode[[val]]"" id=""HtmlEncode[[Property4$$Property5]]"" name=""HtmlEncode[[Property4.Property5]]"" " +
+                    @"type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[Prop5Value]]"" />",
+                };
+
+                yield return new object[]
+               {
+                    "Property4.Property6[0]",
+                    @"<input data-test=""HtmlEncode[[val]]"" id=""HtmlEncode[[Property4$$Property6$$0$$]]"" name=""HtmlEncode[[Property4.Property6[0]]]"" " +
+                    @"type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[Prop6Value]]"" />",
+               };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(HiddenWithComplexExpressions_UsesIdDotSeparatorData))]
+        public void HiddenWithComplexExpressions_UsesIdDotSeparator(string expression, string expected)
+        {
+            // Arrange
+            var viewData = GetViewDataWithModelStateAndModelAndViewDataValues();
+            viewData["Property3[height]"] = "Prop3Value";
+            viewData["Property4.Property5"] = "Prop5Value";
+            viewData["Property4.Property6[0]"] = "Prop6Value";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewData, idAttributeDotReplacement: "$$");
+            var attributes = new Dictionary<string, object> { { "data-test", "val" } };
+
+            // Act
+            var result = helper.Hidden(expression, value: null, htmlAttributes: attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenForWithByteArrayValue_GeneratesBase64EncodedValue()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Bytes]]"" name=""HtmlEncode[[Bytes]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[Fys1]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithModelStateAndModelAndViewDataValues());
+            helper.ViewData.Model.Bytes = new byte[] { 23, 43, 53 };
+
+            // Act
+            var result = helper.HiddenFor(m => m.Bytes, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Theory]
+        [MemberData(nameof(HiddenWithAttributesData))]
+        public void HiddenForWithAttributes_GeneratesExpectedValue(object htmlAttributes, string expected)
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithModelStateAndModelAndViewDataValues());
+            helper.ViewData.Model.Property1 = "test";
+
+            // Act
+            var result = helper.HiddenFor(m => m.Property1, htmlAttributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenFor_UsesModelStateValueOverPropertyValue()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[ModelStateValue]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithModelStateAndModelAndViewDataValues());
+            helper.ViewData.Model.Property1 = "DefaultValue";
+
+            // Act
+            var result = helper.HiddenFor(m => m.Property1, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenFor_UsesPropertyValueIfModelStateDoesNotHaveKey()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[PropertyValue]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithModelStateAndModelAndViewDataValues());
+            helper.ViewData.ModelState.Clear();
+            helper.ViewData.Model.Property1 = "PropertyValue";
+
+            // Act
+            var result = helper.HiddenFor(m => m.Property1, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenForDoesNotUseValueFromViewDataDictionary_IfModelStateAndPropertyValueIsNull()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value="""" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithModelStateAndModelAndViewDataValues());
+            helper.ViewData.Model.Property1 = null;
+            helper.ViewData.ModelState.Clear();
+
+            // Act
+            var result = helper.HiddenFor(m => m.Property1, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenForWithAttributesDictionaryAndNullModel_GeneratesExpectedValue()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Property1]]"" key=""HtmlEncode[[value]]"" name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value="""" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithNullModelAndNonNullViewData());
+            var attributes = new Dictionary<string, object> { { "key", "value" } };
+
+            // Act
+            var result = helper.HiddenFor(m => m.Property1, attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        // This test ensures that specifying a the prefix does not affect the expression result.
+        [Fact]
+        public void HiddenForInTemplate_GeneratesExpectedValue()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[MyPrefix_Property1]]"" name=""HtmlEncode[[MyPrefix.Property1]]"" type=""HtmlEncode[[hidden]]"" " +
+                           @"value=""HtmlEncode[[propValue]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithModelStateAndModelAndViewDataValues());
+            helper.ViewData.Model.Property1 = "propValue";
+            helper.ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = "MyPrefix";
+
+            // Act
+            var result = helper.HiddenFor(m => m.Property1, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenForInTemplate_UsesPrefixWhenLookingUpModelStateValues()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[MyPrefix$Property1]]"" name=""HtmlEncode[[MyPrefix.Property1]]"" type=""HtmlEncode[[hidden]]"" " +
+                           @"value=""HtmlEncode[[modelstate-with-prefix]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(
+                GetViewDataWithModelStateAndModelAndViewDataValues(),
+                "$");
+            helper.ViewData.Model.Property1 = "propValue";
+            helper.ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = "MyPrefix";
+            helper.ViewData.ModelState.Clear();
+            helper.ViewData.ModelState.SetModelValue(
+                "Property1",
+                "modelstate-without-prefix",
+                "modelstate-without-prefix");
+            helper.ViewData.ModelState.SetModelValue(
+                "MyPrefix.Property1",
+                "modelstate-with-prefix",
+                "modelstate-with-prefix");
+            helper.ViewData.ModelState.SetModelValue(
+                "MyPrefix$Property1",
+                "modelstate-with-iddotreplacement",
+                "modelstate-with-iddotreplacement");
+
+            // Act
+            var result = helper.HiddenFor(m => m.Property1, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenForWithViewDataErrors_GeneratesExpectedValue()
+        {
+            // Arrange
+            var expected = @"<input baz=""HtmlEncode[[BazValue]]"" class=""HtmlEncode[[input-validation-error some-class]]"" id=""HtmlEncode[[Property1]]"" " +
+                           @"name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[ModelStateValue]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithErrors());
+            var attributes = new Dictionary<string, object>
+            {
+                { "baz", "BazValue" },
+                { "class", "some-class"}
+            };
+
+            // Act
+            var result = helper.HiddenFor(m => m.Property1, attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenFor_GeneratesUnobtrusiveValidationAttributes()
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Property2");
+            var expected =
+                $@"<input data-val=""HtmlEncode[[true]]"" data-val-required=""HtmlEncode[[{requiredMessage}]]"" " +
+                @"id=""HtmlEncode[[Property2]]"" name=""HtmlEncode[[Property2]]"" type=""HtmlEncode[[hidden]]"" value="""" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithErrors());
+
+            // Act
+            var result = helper.HiddenFor(m => m.Property2, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        public static TheoryData HiddenFor_UsesPropertyValueIfModelStateDoesNotContainValueData
+        {
+            get
+            {
+                var localModel = new HiddenModel();
+                localModel.Property4.Property5 = "local-value";
+                return new TheoryData<Expression<Func<HiddenModel, string>>, string>
+                {
+                    {
+                        model => model.Property3["key"],
+                        @"<input data-val=""HtmlEncode[[true]]"" id=""HtmlEncode[[Property3_key_]]"" name=""HtmlEncode[[Property3[key]]]"" " +
+                        @"type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[ModelProp3Val]]"" />"
+                    },
+                    {
+                        model => model.Property4.Property5,
+                        @"<input data-val=""HtmlEncode[[true]]"" id=""HtmlEncode[[Property4_Property5]]"" name=""HtmlEncode[[Property4.Property5]]"" " +
+                        @"type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[ModelProp5Val]]"" />"
+                    },
+                    {
+                        model => model.Property4.Property6[0],
+                        @"<input data-val=""HtmlEncode[[true]]"" id=""HtmlEncode[[Property4_Property6_0_]]"" name=""HtmlEncode[[Property4.Property6[0]]]"" " +
+                        @"type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[ModelProp6Val]]"" />"
+                    },
+                    {
+                        model => localModel.Property4.Property5,
+                        @"<input data-val=""HtmlEncode[[true]]"" id=""HtmlEncode[[localModel_Property4_Property5]]"" " +
+                        @"name=""HtmlEncode[[localModel.Property4.Property5]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[local-value]]"" />"
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(HiddenFor_UsesPropertyValueIfModelStateDoesNotContainValueData))]
+        public void HiddenFor_UsesPropertyValueIfModelStateDoesNotContainValue(
+            Expression<Func<HiddenModel, string>> expression,
+            string expected)
+        {
+            // Arrange
+            var viewData = GetViewDataWithModelStateAndModelAndViewDataValues();
+            viewData["Property3[key]"] = "Prop3Val";
+            viewData["Property4.Property5"] = "Prop4Val";
+            viewData["Property4.Property6[0]"] = "Prop6Val";
+            viewData.Model.Property3["key"] = "ModelProp3Val";
+            viewData.Model.Property4.Property5 = "ModelProp5Val";
+            viewData.Model.Property4.Property6.Add("ModelProp6Val");
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewData);
+            var attributes = new Dictionary<string, object>
+            {
+                { "data-val", "true" },
+                { "value", "attr-val" }
+            };
+
+            // Act
+            var result = helper.HiddenFor(expression, attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        public static TheoryData HiddenFor_UsesModelStateValueForComplexExpressionsData
+        {
+            get
+            {
+                return new TheoryData<Expression<Func<HiddenModel, string>>, string>
+                {
+                    {
+                        model => model.Property3["key"],
+                        @"<input data-val=""HtmlEncode[[true]]"" id=""HtmlEncode[[pre_Property3_key_]]"" name=""HtmlEncode[[pre.Property3[key]]]"" " +
+                        @"type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[Prop3Val]]"" />"
+                    },
+                    {
+                        model => model.Property4.Property5,
+                        @"<input data-val=""HtmlEncode[[true]]"" id=""HtmlEncode[[pre_Property4_Property5]]"" name=""HtmlEncode[[pre.Property4.Property5]]"" " +
+                        @"type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[Prop5Val]]"" />"
+                    },
+                    {
+                        model => model.Property4.Property6[0],
+                        @"<input data-val=""HtmlEncode[[true]]"" id=""HtmlEncode[[pre_Property4_Property6_0_]]"" " +
+                        @"name=""HtmlEncode[[pre.Property4.Property6[0]]]"" type=""HtmlEncode[[hidden]]"" value=""HtmlEncode[[Prop6Val]]"" />"
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(HiddenFor_UsesModelStateValueForComplexExpressionsData))]
+        public void HiddenForInTemplate_UsesModelStateValueForComplexExpressions(
+            Expression<Func<HiddenModel, string>> expression,
+            string expected)
+        {
+            // Arrange
+            var viewData = GetViewDataWithNullModelAndNonNullViewData();
+            viewData.ModelState.SetModelValue("pre.Property3[key]", "Prop3Val", "Prop3Val");
+            viewData.ModelState.SetModelValue("pre.Property4.Property5", "Prop5Val", "Prop5Val");
+            viewData.ModelState.SetModelValue("pre.Property4.Property6[0]", "Prop6Val", "Prop6Val");
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewData);
+            viewData.TemplateInfo.HtmlFieldPrefix = "pre";
+            var attributes = new { data_val = "true", value = "attr-val" };
+
+            // Act
+            var result = helper.HiddenFor(expression, attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void HiddenFor_DoesNotUseAttributeValue()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[hidden]]"" value="""" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithNullModelAndNonNullViewData());
+            var attributes = new Dictionary<string, object>
+            {
+                { "value", "AttrValue" }
+            };
+
+            // Act
+            var result = helper.HiddenFor(m => m.Property1, attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void Hidden_UsesSpecifiedExpression()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property1 = "propValue" };
+
+            // Act
+            var hiddenResult = helper.Hidden("Property1");
+
+            // Assert
+            Assert.Equal(
+                "<input id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[hidden]]\" value=\"HtmlEncode[[propValue]]\" />",
+                HtmlContentUtilities.HtmlContentToString(hiddenResult));
+        }
+
+        [Fact]
+        public void HiddenFor_UsesSpecifiedExpression()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property1 = "propValue" };
+
+            // Act
+            var hiddenForResult = helper.HiddenFor(m => m.Property1);
+
+            // Assert
+            Assert.Equal(
+                "<input id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[hidden]]\" value=\"HtmlEncode[[propValue]]\" />",
+                HtmlContentUtilities.HtmlContentToString(hiddenForResult));
+        }
+
+        [Fact]
+        public void Hidden_UsesSpecifiedValue()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property1 = "propValue" };
+
+            // Act
+            var hiddenResult = helper.Hidden("Property1", value: "myvalue");
+
+            // Assert
+            Assert.Equal(
+                "<input id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[hidden]]\" value=\"HtmlEncode[[myvalue]]\" />",
+                HtmlContentUtilities.HtmlContentToString(hiddenResult));
+        }
+
+        private static ViewDataDictionary<HiddenModel> GetViewDataWithNullModelAndNonNullViewData()
+        {
+            return new ViewDataDictionary<HiddenModel>(new EmptyModelMetadataProvider())
+            {
+                ["Property1"] = "view-data-val",
+            };
+        }
+
+        private static ViewDataDictionary<HiddenModel> GetViewDataWithNonNullModel()
+        {
+            var viewData = new ViewDataDictionary<HiddenModel>(new EmptyModelMetadataProvider())
+            {
+                Model = new HiddenModel(),
+            };
+
+            return viewData;
+        }
+
+        private static ViewDataDictionary<HiddenModel> GetViewDataWithModelStateAndModelAndViewDataValues()
+        {
+            var viewData = GetViewDataWithNonNullModel();
+            viewData["Property1"] = "view-data-val";
+            viewData.ModelState.SetModelValue("Property1", "ModelStateValue", "ModelStateValue");
+
+            return viewData;
+        }
+
+        private static ViewDataDictionary<HiddenModel> GetViewDataWithErrors()
+        {
+            var viewData = GetViewDataWithModelStateAndModelAndViewDataValues();
+            viewData.ModelState.AddModelError("Property1", "error 1");
+            viewData.ModelState.AddModelError("Property1", "error 2");
+            return viewData;
+        }
+
+        public class HiddenModel
+        {
+            public string Property1 { get; set; }
+
+            public byte[] Bytes { get; set; }
+
+            [Required]
+            public string Property2 { get; set; }
+
+            public Dictionary<string, string> Property3 { get; } = new Dictionary<string, string>();
+
+            public NestedClass Property4 { get; } = new NestedClass();
+        }
+
+        public class NestedClass
+        {
+            public string Property5 { get; set; }
+
+            public List<string> Property6 { get; } = new List<string>();
+        }
+
+        private class TestModel
+        {
+            public string Property1 { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLabelExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLabelExtensionsTest.cs
new file mode 100644
index 0000000000..95c8d3a38a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLabelExtensionsTest.cs
@@ -0,0 +1,528 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Core
+{
+    /// <summary>
+    /// Test the <see cref="HtmlHelperLabelExtensions" /> class.
+    /// </summary>
+    public class HtmlHelperLabelExtensionsTest
+    {
+        [Fact]
+        public void LabelHelpers_ReturnEmptyForModel()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var labelResult = helper.Label(expression: string.Empty);
+            var labelNullResult = helper.Label(expression: null);   // null is another alias for current model
+            var labelForResult = helper.LabelFor(m => m);
+            var labelForModelResult = helper.LabelForModel();
+
+            // Assert
+            Assert.Empty(HtmlContentUtilities.HtmlContentToString(labelResult));
+            Assert.Empty(HtmlContentUtilities.HtmlContentToString(labelNullResult));
+            Assert.Empty(HtmlContentUtilities.HtmlContentToString(labelForResult));
+            Assert.Empty(HtmlContentUtilities.HtmlContentToString(labelForModelResult));
+        }
+
+        [Fact]
+        public void LabelHelpers_ReturnExpectedElementForModel_WithLabelText()
+        {
+            // Arrange
+            var expectedLabel = "<label for=\"\">HtmlEncode[[a label]]</label>";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var labelResult = helper.Label(expression: string.Empty, labelText: "a label");
+            var labelNullResult = helper.Label(expression: null, labelText: "a label");
+            var labelForResult = helper.LabelFor(m => m, labelText: "a label");
+            var labelForModelResult = helper.LabelForModel(labelText: "a label");
+
+            // Assert
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelNullResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelForResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelForModelResult));
+        }
+
+        // Prior to aspnet/Mvc#6638 fix, helpers generated nothing with this setup.
+        [Fact]
+        public void LabelHelpers_ReturnExpectedElementForModel_WithEmptyLabelText()
+        {
+            // Arrange
+            var expectedLabel = "<label for=\"\"></label>";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var labelResult = helper.Label(expression: string.Empty, labelText: string.Empty);
+            var labelNullResult = helper.Label(expression: null, labelText: string.Empty);
+            var labelForResult = helper.LabelFor(m => m, labelText: string.Empty);
+            var labelForModelResult = helper.LabelForModel(labelText: string.Empty);
+
+            // Assert
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelNullResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelForResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelForModelResult));
+        }
+
+        [Fact]
+        public void LabelHelpers_DisplayPropertyName()
+        {
+            // Arrange
+            var expectedLabel = "<label for=\"HtmlEncode[[Property1]]\">HtmlEncode[[Property1]]</label>";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var labelResult = helper.Label("Property1");
+            var labelForResult = helper.LabelFor(m => m.Property1);
+
+            // Assert
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelForResult));
+        }
+
+        [Fact]
+        public void LabelHelpers_DisplayPropertyName_ForNestedProperty()
+        {
+            // Arrange
+            var expectedLabel = "<label for=\"HtmlEncode[[Inner_Id]]\">HtmlEncode[[Id]]</label>";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<OuterClass>(model: null);
+
+            // Act
+            var labelResult = helper.Label("Inner.Id");
+            var labelForResult = helper.LabelFor(m => m.Inner.Id);
+
+            // Assert
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelForResult));
+        }
+
+        [Fact]
+        public void LabelHelpers_DisplayMetadataPropertyNameForProperty()
+        {
+            // Arrange
+            var propertyName = "Property1";
+
+            var provider = new EmptyModelMetadataProvider();
+
+            var modelExplorer = provider
+                .GetModelExplorerForType(typeof(DefaultTemplatesUtilities.ObjectTemplateModel), model: null)
+                .GetExplorerForProperty(propertyName);
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            helper.ViewData.ModelExplorer = modelExplorer;
+
+            // Act
+            var labelResult = helper.Label(expression: string.Empty);
+            var labelForResult = helper.LabelFor(m => m);
+            var labelForModelResult = helper.LabelForModel();
+
+            // Assert
+            Assert.Equal("<label for=\"\">HtmlEncode[[" + propertyName + "]]</label>", HtmlContentUtilities.HtmlContentToString(labelResult));
+            Assert.Equal("<label for=\"\">HtmlEncode[[" + propertyName + "]]</label>", HtmlContentUtilities.HtmlContentToString(labelForResult));
+            Assert.Equal("<label for=\"\">HtmlEncode[[" + propertyName + "]]</label>", HtmlContentUtilities.HtmlContentToString(labelForModelResult));
+        }
+
+        // If the metadata is for a type (not property), then Label(expression) will evaluate the expression
+        [Fact]
+        public void LabelHelpers_Label_Evaluates_Expression()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            helper.ViewData["value"] = "testvalue";
+
+            // Act
+            var labelResult = helper.Label(expression: "value");
+
+            // Assert
+            Assert.Equal("<label for=\"HtmlEncode[[value]]\">HtmlEncode[[value]]</label>", HtmlContentUtilities.HtmlContentToString(labelResult));
+        }
+
+        // Following test is identical to LabelHelpers_ReturnEmptyForModel() from the HTML helpers' perspective. But,
+        // test confirms the added metadata does not change the behavior.
+        [Fact]
+        public void LabelHelpers_ReturnEmptyForModel_IfDisplayNameEmpty()
+        {
+            // Arrange
+            var provider = new TestModelMetadataProvider();
+            provider
+                .ForType<DefaultTemplatesUtilities.ObjectTemplateModel>()
+                .DisplayDetails(dd => dd.DisplayName = () => string.Empty);
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(provider: provider);
+
+            // Act
+            var labelResult = helper.Label(expression: string.Empty);
+            var labelNullResult = helper.Label(expression: null);   // null is another alias for current model
+            var labelForResult = helper.LabelFor(m => m);
+            var labelForModelResult = helper.LabelForModel();
+
+            // Assert
+            Assert.Empty(HtmlContentUtilities.HtmlContentToString(labelResult));
+            Assert.Empty(HtmlContentUtilities.HtmlContentToString(labelNullResult));
+            Assert.Empty(HtmlContentUtilities.HtmlContentToString(labelForResult));
+            Assert.Empty(HtmlContentUtilities.HtmlContentToString(labelForModelResult));
+        }
+
+        // Prior to aspnet/Mvc#6638 fix, helpers generated nothing with this setup.
+        // Following test mimics use of an identity expression in an editor template if invoked for an element in a
+        // collection. See also LabelHelpers_ReturnExpectedElementForProperty_IfDisplayNameEmptyAndNotTopLevel().
+        [Fact]
+        public void LabelHelpers_ReturnExpectedElementForModel_IfDisplayNameEmptyAndNotTopLevel()
+        {
+            // Arrange
+            var expectedLabel = "<label for=\"HtmlEncode[[prefix]]\"></label>";
+            var provider = new TestModelMetadataProvider();
+            provider
+                .ForType<DefaultTemplatesUtilities.ObjectTemplateModel>()
+                .DisplayDetails(dd => dd.DisplayName = () => string.Empty);
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(provider: provider);
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "prefix";
+
+            // Act
+            var labelResult = helper.Label(expression: string.Empty);
+            var labelNullResult = helper.Label(expression: null);   // null is another alias for current model
+            var labelForResult = helper.LabelFor(m => m);
+            var labelForModelResult = helper.LabelForModel();
+
+            // Assert
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelNullResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelForResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelForModelResult));
+        }
+
+        [Fact]
+        public void LabelHelpers_ReturnExpectedElementForModel_IfDisplayNameEmpty_WithLabelText()
+        {
+            // Arrange
+            var expectedLabel = "<label for=\"\">HtmlEncode[[a label]]</label>";
+            var provider = new TestModelMetadataProvider();
+            provider
+                .ForType<DefaultTemplatesUtilities.ObjectTemplateModel>()
+                .DisplayDetails(dd => dd.DisplayName = () => string.Empty);
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(provider: provider);
+
+            // Act
+            var labelResult = helper.Label(expression: string.Empty, labelText: "a label");
+            var labelNullResult = helper.Label(expression: null, labelText: "a label");
+            var labelForResult = helper.LabelFor(m => m, labelText: "a label");
+            var labelForModelResult = helper.LabelForModel(labelText: "a label");
+
+            // Assert
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelNullResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelForResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelForModelResult));
+        }
+
+        // Prior to aspnet/Mvc#6638 fix, helpers generated nothing with this setup.
+        [Fact]
+        public void LabelHelpers_ReturnExpectedElementForModel_IfDisplayNameEmpty_WithEmptyLabelText()
+        {
+            // Arrange
+            var expectedLabel = "<label for=\"\"></label>";
+            var provider = new TestModelMetadataProvider();
+            provider
+                .ForType<DefaultTemplatesUtilities.ObjectTemplateModel>()
+                .DisplayDetails(dd => dd.DisplayName = () => string.Empty);
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(provider: provider);
+
+            // Act
+            var labelResult = helper.Label(expression: string.Empty, labelText: string.Empty);
+            var labelNullResult = helper.Label(expression: null, labelText: string.Empty);
+            var labelForResult = helper.LabelFor(m => m, labelText: string.Empty);
+            var labelForModelResult = helper.LabelForModel(labelText: string.Empty);
+
+            // Assert
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelNullResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelForResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelForModelResult));
+        }
+
+        [Theory]
+        [InlineData("DisplayName")]
+        [InlineData("Custom display name from metadata")]
+        public void LabelHelpers_DisplayDisplayName_IfNonNull(string displayName)
+        {
+            // Arrange
+            var provider = new TestModelMetadataProvider();
+            provider
+                .ForType<DefaultTemplatesUtilities.ObjectTemplateModel>()
+                .DisplayDetails(dd => dd.DisplayName = () => displayName);
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(provider: provider);
+
+            // Act
+            var labelResult = helper.Label(expression: string.Empty);
+            var labelForResult = helper.LabelFor(m => m);
+            var labelForModelResult = helper.LabelForModel();
+
+            // Assert
+            Assert.Equal("<label for=\"\">HtmlEncode[[" + displayName + "]]</label>", HtmlContentUtilities.HtmlContentToString(labelResult));
+            Assert.Equal("<label for=\"\">HtmlEncode[[" + displayName + "]]</label>", HtmlContentUtilities.HtmlContentToString(labelForResult));
+            Assert.Equal("<label for=\"\">HtmlEncode[[" + displayName + "]]</label>", HtmlContentUtilities.HtmlContentToString(labelForModelResult));
+        }
+
+        // Prior to aspnet/Mvc#6638 fix, helpers generated nothing with this setup.
+        // Following test mimics use of an identity expression in an editor template if invoked for a property. See
+        // also LabelHelpers_ReturnExpectedElementForModel_IfDisplayNameEmptyAndNotTopLevel().
+        [Fact]
+        public void LabelHelpers_ReturnExpectedElementForProperty_IfDisplayNameEmptyAndNotTopLevel()
+        {
+            // Arrange
+            var expectedLabel = "<label for=\"HtmlEncode[[Property1]]\"></label>";
+            var provider = new TestModelMetadataProvider();
+            provider
+                .ForProperty<DefaultTemplatesUtilities.ObjectTemplateModel>("Property1")
+                .DisplayDetails(dd => dd.DisplayName = () => string.Empty);
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<string>(provider: provider);
+            helper.ViewData.ModelExplorer = provider
+                .GetModelExplorerForType(typeof(DefaultTemplatesUtilities.ObjectTemplateModel), model: null)
+                .GetExplorerForProperty(nameof(DefaultTemplatesUtilities.ObjectTemplateModel.Property1));
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = nameof(DefaultTemplatesUtilities.ObjectTemplateModel.Property1);
+
+            // Act
+            var labelResult = helper.Label(expression: string.Empty);
+            var labelNullResult = helper.Label(expression: null);   // null is another alias for current model
+            var labelForResult = helper.LabelFor(m => m);
+            var labelForModelResult = helper.LabelForModel();
+
+            // Assert
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelNullResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelForResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelForModelResult));
+        }
+
+        // Prior to aspnet/Mvc#6638 fix, helpers generated nothing with this setup.
+        [Fact]
+        public void LabelHelpers_ReturnExpectedElementForProperty_IfDisplayNameEmpty()
+        {
+            // Arrange
+            var expectedLabel = "<label for=\"HtmlEncode[[Property1]]\"></label>";
+            var provider = new TestModelMetadataProvider();
+            provider
+                .ForProperty<DefaultTemplatesUtilities.ObjectTemplateModel>("Property1")
+                .DisplayDetails(dd => dd.DisplayName = () => string.Empty);
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(provider: provider);
+
+            // Act
+            var labelResult = helper.Label(expression: nameof(DefaultTemplatesUtilities.ObjectTemplateModel.Property1));
+            var labelForResult = helper.LabelFor(m => m.Property1);
+
+            // Assert
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelForResult));
+        }
+
+        [Fact]
+        public void LabelHelpers_ReturnExpectedElementForProperty_IfDisplayNameEmpty_WithLabelText()
+        {
+            // Arrange
+            var expectedLabel = "<label for=\"HtmlEncode[[Property1]]\">HtmlEncode[[a label]]</label>";
+            var provider = new TestModelMetadataProvider();
+            provider
+                .ForProperty<DefaultTemplatesUtilities.ObjectTemplateModel>("Property1")
+                .DisplayDetails(dd => dd.DisplayName = () => string.Empty);
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(provider: provider);
+
+            // Act
+            var labelResult = helper.Label(
+                expression: nameof(DefaultTemplatesUtilities.ObjectTemplateModel.Property1),
+                labelText: "a label");
+            var labelForResult = helper.LabelFor(m => m.Property1, labelText: "a label");
+
+            // Assert
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelForResult));
+        }
+
+        // Prior to aspnet/Mvc#6638 fix, helpers generated nothing with this setup.
+        [Fact]
+        public void LabelHelpers_ReturnExpectedElementForProperty_IfDisplayNameEmpty_WithEmptyLabelText()
+        {
+            // Arrange
+            var expectedLabel = "<label for=\"HtmlEncode[[Property1]]\"></label>";
+            var provider = new TestModelMetadataProvider();
+            provider
+                .ForProperty<DefaultTemplatesUtilities.ObjectTemplateModel>("Property1")
+                .DisplayDetails(dd => dd.DisplayName = () => string.Empty);
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(provider: provider);
+
+            // Act
+            var labelResult = helper.Label(
+                expression: nameof(DefaultTemplatesUtilities.ObjectTemplateModel.Property1),
+                labelText: string.Empty);
+            var labelForResult = helper.LabelFor(m => m.Property1, labelText: string.Empty);
+
+            // Assert
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelResult));
+            Assert.Equal(expectedLabel, HtmlContentUtilities.HtmlContentToString(labelForResult));
+        }
+
+        [Theory]
+        [InlineData("DisplayName")]
+        [InlineData("Custom display name from metadata")]
+        public void LabelHelpers_DisplayDisplayNameForProperty_IfNonNull(string displayName)
+        {
+            // Arrange
+            var provider = new TestModelMetadataProvider();
+            provider
+                .ForProperty<DefaultTemplatesUtilities.ObjectTemplateModel>("Property1")
+                .DisplayDetails(dd => dd.DisplayName = () => displayName);
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(provider: provider);
+
+            // Act
+            var labelResult = helper.Label("Property1");
+            var labelForResult = helper.LabelFor(m => m.Property1);
+
+            // Assert
+            Assert.Equal("<label for=\"HtmlEncode[[Property1]]\">HtmlEncode[[" + displayName + "]]</label>", HtmlContentUtilities.HtmlContentToString(labelResult));
+            Assert.Equal("<label for=\"HtmlEncode[[Property1]]\">HtmlEncode[[" + displayName + "]]</label>", HtmlContentUtilities.HtmlContentToString(labelForResult));
+        }
+
+        [Theory]
+        [InlineData("A", "A", "A")]
+        [InlineData("A[23]", "A[23]", "A_23_")]
+        [InlineData("A[0].B", "B", "A_0__B")]
+        [InlineData("A.B.C.D", "D", "A_B_C_D")]
+        public void Label_DisplaysRightmostExpressionSegment_IfPropertiesNotFound(
+            string expression,
+            string expectedText,
+            string expectedId)
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var result = helper.Label(expression);
+
+            // Assert
+            // Label() falls back to expression name when DisplayName and PropertyName are null.
+            Assert.Equal("<label for=\"HtmlEncode[[" + expectedId + "]]\">HtmlEncode[[" + expectedText + "]]</label>", HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void LabelFor_ThrowsInvalidOperation_IfExpressionUnsupported()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(
+                () => helper.LabelFor(model => new { foo = "Bar" }));
+            Assert.Equal(
+                "Templates can be used only with field access, property access, single-dimension array index, or single-parameter custom indexer expressions.",
+                exception.Message);
+        }
+
+        [Fact]
+        public void LabelFor_DisplaysVariableName()
+        {
+            // Arrange
+            var unknownKey = "this is a dummy parameter value";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var result = helper.LabelFor(model => unknownKey);
+
+            // Assert
+            Assert.Equal("<label for=\"HtmlEncode[[unknownKey]]\">HtmlEncode[[unknownKey]]</label>", HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void Label_UsesSpecifiedLabelText()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var labelResult = helper.Label("Property1", labelText: "Hello");
+
+            // Assert
+            Assert.Equal("<label for=\"HtmlEncode[[Property1]]\">HtmlEncode[[Hello]]</label>", HtmlContentUtilities.HtmlContentToString(labelResult));
+        }
+
+        [Fact]
+        public void LabelFor_UsesSpecifiedLabelText()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var labelForResult = helper.LabelFor(m => m.Property1, labelText: "Hello");
+
+            // Assert
+            Assert.Equal("<label for=\"HtmlEncode[[Property1]]\">HtmlEncode[[Hello]]</label>", HtmlContentUtilities.HtmlContentToString(labelForResult));
+        }
+
+        [Fact]
+        public void LabelForModel_UsesSpecifiedLabelText()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var labelForModelResult = helper.LabelForModel(labelText: "Hello");
+
+            // Assert
+            Assert.Equal("<label for=\"\">HtmlEncode[[Hello]]</label>", HtmlContentUtilities.HtmlContentToString(labelForModelResult));
+        }
+
+        [Fact]
+        public void LabelFor_DisplaysSpecifiedHtmlAttributes()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var labelForResult = helper.LabelFor(m => m.Property1, htmlAttributes: new { attr="value" });
+
+            // Assert
+            Assert.Equal("<label attr=\"HtmlEncode[[value]]\" for=\"HtmlEncode[[Property1]]\">HtmlEncode[[Property1]]</label>", HtmlContentUtilities.HtmlContentToString(labelForResult));
+        }
+
+        [Fact]
+        public void LabelForModel_DisplaysSpecifiedHtmlAttributes()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var labelForModelResult = helper.LabelForModel(labelText: "Hello", htmlAttributes: new { attr = "value" });
+
+            // Assert
+            Assert.Equal("<label attr=\"HtmlEncode[[value]]\" for=\"\">HtmlEncode[[Hello]]</label>", HtmlContentUtilities.HtmlContentToString(labelForModelResult));
+        }
+
+        private sealed class InnerClass
+        {
+            public int Id { get; set; }
+        }
+
+        private sealed class OuterClass
+        {
+            public InnerClass Inner { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLinkGenerationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLinkGenerationTest.cs
new file mode 100644
index 0000000000..3339241361
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLinkGenerationTest.cs
@@ -0,0 +1,164 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.Extensions.Internal;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Tests the <see cref="HtmlHelper"/>'s link generation methods.
+    /// </summary>
+    public class HtmlHelperLinkGenerationTest
+    {
+        public static IEnumerable<object[]> ActionLinkGenerationData
+        {
+            get
+            {
+                yield return new object[] {
+                    "Details", "Product", new { isprint = "true", showreviews = "true" }, "https", "www.contoso.com", "h1",
+                    new { p1 = "p1-value" } };
+                yield return new object[] {
+                    "Details", "Product", new { isprint = "true", showreviews = "true" }, "https", "www.contoso.com", null, null };
+                yield return new object[] {
+                    "Details", "Product", new { isprint = "true", showreviews = "true" }, "https", null, null, null };
+                yield return new object[] {
+                    "Details", "Product", new { isprint = "true", showreviews = "true" }, null, null, null, null };
+                yield return new object[] {
+                    "Details", "Product", null, null, null, null, null };
+                yield return new object[] {
+                    null, null, null, null, null, null, null };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ActionLinkGenerationData))]
+        public void ActionLink_GeneratesLink_WithExpectedValues(
+                                        string action,
+                                        string controller,
+                                        object routeValues,
+                                        string protocol,
+                                        string hostname,
+                                        string fragment,
+                                        object htmlAttributes)
+        {
+            //Arrange
+            string expectedLink = string.Format(@"<a href=""HtmlEncode[[{0}{1}{2}{3}{4}{5}]]""{6}>HtmlEncode[[Details]]</a>",
+                                                                protocol,
+                                                                hostname,
+                                                                controller,
+                                                                action,
+                                                                GetRouteValuesAsString(routeValues),
+                                                                fragment,
+                                                                GetHtmlAttributesAsString(htmlAttributes));
+            expectedLink = expectedLink.Replace("HtmlEncode[[]]", string.Empty);
+
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper.Setup(h => h.Action(It.IsAny<UrlActionContext>()))
+                .Returns<UrlActionContext>((actionContext) =>
+                    string.Format("{0}{1}{2}{3}{4}{5}",
+                    actionContext.Protocol,
+                    actionContext.Host,
+                    actionContext.Controller,
+                    actionContext.Action,
+                    GetRouteValuesAsString(actionContext.Values),
+                    actionContext.Fragment));
+
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(urlHelper.Object);
+
+            // Act
+            var actualLink = htmlHelper.ActionLink(
+                                            linkText: "Details",
+                                            actionName: action,
+                                            controllerName: controller,
+                                            protocol: protocol,
+                                            hostname: hostname,
+                                            fragment: fragment,
+                                            routeValues: routeValues,
+                                            htmlAttributes: htmlAttributes);
+
+            // Assert
+            Assert.Equal(expectedLink, HtmlContentUtilities.HtmlContentToString(actualLink));
+        }
+
+        public static IEnumerable<object[]> RouteLinkGenerationData
+        {
+            get
+            {
+                yield return new object[] {
+                    "default", new { isprint = "true", showreviews = "true" }, "https", "www.contoso.com", "h1",
+                    new { p1 = "p1-value" } };
+                yield return new object[] {
+                    "default", new { isprint = "true", showreviews = "true" }, "https", "www.contoso.com", null, null };
+                yield return new object[] {
+                    "default", new { isprint = "true", showreviews = "true" }, "https", null, null, null };
+                yield return new object[] {
+                    "default", new { isprint = "true", showreviews = "true" }, null, null, null, null };
+                yield return new object[] {
+                    "default", null, null, null, null, null };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RouteLinkGenerationData))]
+        public void RouteLink_GeneratesLink_WithExpectedValues(
+                                        string routeName,
+                                        object routeValues,
+                                        string protocol,
+                                        string hostname,
+                                        string fragment,
+                                        object htmlAttributes)
+        {
+            //Arrange
+            string expectedLink = string.Format(@"<a href=""HtmlEncode[[{0}{1}{2}{3}]]""{4}>HtmlEncode[[Details]]</a>",
+                                                                    protocol,
+                                                                    hostname,
+                                                                    GetRouteValuesAsString(routeValues),
+                                                                    fragment,
+                                                                    GetHtmlAttributesAsString(htmlAttributes));
+            expectedLink = expectedLink.Replace("HtmlEncode[[]]", string.Empty);
+
+            var urlHelper = new Mock<IUrlHelper>();
+            urlHelper
+                .Setup(
+                    h => h.RouteUrl(It.IsAny<UrlRouteContext>())).Returns<UrlRouteContext>((context) =>
+                        string.Format("{0}{1}{2}{3}",
+                        context.Protocol,
+                        context.Host,
+                        GetRouteValuesAsString(context.Values),
+                        context.Fragment));
+
+            var htmlHelper = DefaultTemplatesUtilities.GetHtmlHelper(urlHelper.Object);
+
+            // Act
+            var actualLink = htmlHelper.RouteLink(
+                                            linkText: "Details",
+                                            routeName: routeName,
+                                            protocol: protocol,
+                                            hostName: hostname,
+                                            fragment: fragment,
+                                            routeValues: routeValues,
+                                            htmlAttributes: htmlAttributes);
+
+            // Assert
+            Assert.Equal(expectedLink, HtmlContentUtilities.HtmlContentToString(actualLink));
+        }
+
+        private string GetRouteValuesAsString(object routeValues)
+        {
+            var dict = PropertyHelper.ObjectToDictionary(routeValues);
+            return string.Join(string.Empty, dict.Select(kvp => string.Format("{0}={1}", kvp.Key, kvp.Value.ToString())));
+        }
+
+        private string GetHtmlAttributesAsString(object routeValues)
+        {
+            var dict = PropertyHelper.ObjectToDictionary(routeValues);
+            return string.Join(string.Empty, dict.Select(kvp => string.Format(" {0}=\"HtmlEncode[[{1}]]\"", kvp.Key, kvp.Value.ToString())));
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperListBoxExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperListBoxExtensionsTest.cs
new file mode 100644
index 0000000000..d5277ae2bd
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperListBoxExtensionsTest.cs
@@ -0,0 +1,178 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Core
+{
+    public class HtmlHelperListBoxExtensionsTest
+    {
+        private static readonly List<SelectListItem> BasicSelectList = new List<SelectListItem>
+        {
+            new SelectListItem("Zero", "0"),
+            new SelectListItem("One", "1"),
+            new SelectListItem("Two", "2"),
+            new SelectListItem("Three", "3"),
+        };
+
+        [Fact]
+        public void ListBox_FindsSelectList()
+        {
+            // Arrange
+            var expectedHtml = "<select id=\"HtmlEncode[[Property1]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[Property1]]\">" +
+                "<option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" + Environment.NewLine +
+                "<option value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                "<option value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                "</select>";
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.ModelState.SetModelValue("Property1", 2, "2");
+            helper.ViewData["Property1"] = BasicSelectList;
+
+            // Act
+            var listBoxResult = helper.ListBox("Property1");
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(listBoxResult));
+        }
+
+        [Fact]
+        public void ListBox_UsesSpecifiedExpressionAndSelectList()
+        {
+            // Arrange
+            var expectedHtml = "<select id=\"HtmlEncode[[Property3]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[Property3]]\">" +
+                "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[4]]\">HtmlEncode[[Four]]</option>" + Environment.NewLine +
+                "<option value=\"HtmlEncode[[5]]\">HtmlEncode[[Five]]</option>" + Environment.NewLine +
+                "</select>";
+            var selectList = new List<SelectListItem>
+            {
+                new SelectListItem("Four", "4"),
+                new SelectListItem("Five", "5"),
+            };
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property3 = new List<string> { "4" } };
+
+            // Act
+            var listBoxResult = helper.ListBox("Property3", selectList);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(listBoxResult));
+        }
+
+        [Fact]
+        public void ListBox_UsesSpecifiedSelectExpressionAndListAndHtmlAttributes()
+        {
+            // Arrange
+            var expectedHtml = "<select id=\"HtmlEncode[[Property2]]\" Key=\"HtmlEncode[[Value]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[Property2]]\">" +
+                "<option value=\"HtmlEncode[[4]]\">HtmlEncode[[Four]]</option>" + Environment.NewLine +
+                "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[5]]\">HtmlEncode[[Five]]</option>" + Environment.NewLine +
+                "</select>";
+            var selectList = new List<SelectListItem>
+            {
+                new SelectListItem("Four", "4"),
+                new SelectListItem("Five", "5"),
+            };
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData["Property2"] = new List<string> { "1", "2", "5" };
+
+            // Act
+            var listBoxResult = helper.ListBox("Property2", selectList, new { Key = "Value", name = "CustomName" });
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(listBoxResult));
+        }
+
+        [Fact]
+        public void ListBoxFor_NullSelectListFindsListFromViewData()
+        {
+            // Arrange
+            var expectedHtml = "<select id=\"HtmlEncode[[Property1]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[Property1]]\">" +
+                "<option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" + Environment.NewLine +
+                "<option value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                "<option value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                "<option value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                "</select>";
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData["Property1"] = BasicSelectList;
+
+            // Act
+            var listBoxForResult = helper.ListBoxFor(m => m.Property1, null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(listBoxForResult));
+        }
+
+        [Fact]
+        public void ListBoxFor_UsesSpecifiedExpressionAndSelectList()
+        {
+            // Arrange
+            var expectedHtml = "<select id=\"HtmlEncode[[Property3]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[Property3]]\">" +
+                "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[4]]\">HtmlEncode[[Four]]</option>" + Environment.NewLine +
+                "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[5]]\">HtmlEncode[[Five]]</option>" + Environment.NewLine +
+                "</select>";
+            var selectList = new List<SelectListItem>
+            {
+                new SelectListItem("Four", "4"),
+                new SelectListItem("Five", "5"),
+            };
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property3 = new List<string> { "0", "4", "5" } };
+
+            // Act
+            var listBoxForResult = helper.ListBoxFor(m => m.Property3, selectList);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(listBoxForResult));
+        }
+
+        [Fact]
+        public void ListBoxFor_UsesSpecifiedExpressionAndSelectListAndHtmlAttributes()
+        {
+            // Arrange
+            var expectedHtml = "<select id=\"HtmlEncode[[Property3]]\" Key=\"HtmlEncode[[Value]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[Property3]]\">" +
+                "<option value=\"HtmlEncode[[4]]\">HtmlEncode[[Four]]</option>" + Environment.NewLine +
+                "<option value=\"HtmlEncode[[5]]\">HtmlEncode[[Five]]</option>" + Environment.NewLine +
+                "</select>";
+            var selectList = new List<SelectListItem>
+            {
+                new SelectListItem("Four", "4"),
+                new SelectListItem("Five", "5"),
+            };
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData["Property3"] = new List<string> { "0", "2" };
+
+            // Act
+            var listBoxForResult = helper.ListBoxFor(m => m.Property3, selectList, new { Key = "Value", name = "CustomName" });
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(listBoxForResult));
+        }
+
+        private class TestModel
+        {
+            public int Property1 { get; set; }
+
+            public string Property2 { get; set; }
+
+            public List<string> Property3 { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperNameExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperNameExtensionsTest.cs
new file mode 100644
index 0000000000..25d43e0fe0
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperNameExtensionsTest.cs
@@ -0,0 +1,354 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Core
+{
+    /// <summary>
+    /// Test the <see cref="HtmlHelperNameExtensions" /> class.
+    /// </summary>
+    public class HtmlHelperNameExtensionsTest
+    {
+        private static List<string> _staticCollection = new List<string>();
+        private static int _staticIndex = 6;
+
+        private List<string> _collection = new List<string>();
+        private int _index = 7;
+        private List<string[]> _nestedCollection = new List<string[]>();
+        private string _string = string.Empty;
+
+        private static List<string> StaticCollection { get; }
+
+        private static int StaticIndex { get; } = 8;
+
+        private List<string> Collection { get; }
+
+        private int Index { get; } = 9;
+
+        private List<string[]> NestedCollection { get; }
+
+        private string StringProperty { get; }
+
+        [Fact]
+        public void IdAndNameHelpers_ReturnEmptyForModel()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var idResult = helper.Id(expression: string.Empty);
+            var idNullResult = helper.Id(expression: null);   // null is another alias for current model
+            var idForResult = helper.IdFor(m => m);
+            var idForModelResult = helper.IdForModel();
+            var nameResult = helper.Name(expression: string.Empty);
+            var nameNullResult = helper.Name(expression: null);
+            var nameForResult = helper.NameFor(m => m);
+            var nameForModelResult = helper.NameForModel();
+
+            // Assert
+            Assert.Empty(idResult);
+            Assert.Empty(idNullResult);
+            Assert.Empty(idForResult);
+            Assert.Empty(idForModelResult);
+            Assert.Empty(nameResult);
+            Assert.Empty(nameNullResult);
+            Assert.Empty(nameForResult);
+            Assert.Empty(nameForModelResult);
+        }
+
+        [Theory]
+        [InlineData("", "")]
+        [InlineData("A", "A")]
+        [InlineData("A[23]", "A_23_")]
+        [InlineData("A[0].B", "A_0__B")]
+        [InlineData("A.B.C.D", "A_B_C_D")]
+        public void IdAndNameHelpers_ReturnPrefixForModel(string prefix, string expectedId)
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = prefix;
+
+            // Act
+            var idResult = helper.Id(expression: string.Empty);
+            var idForResult = helper.IdFor(m => m);
+            var idForModelResult = helper.IdForModel();
+            var nameResult = helper.Name(expression: string.Empty);
+            var nameForResult = helper.NameFor(m => m);
+            var nameForModelResult = helper.NameForModel();
+
+            // Assert
+            Assert.Equal(expectedId, idResult);
+            Assert.Equal(expectedId, idForResult);
+            Assert.Equal(expectedId, idForModelResult);
+            Assert.Equal(prefix, nameResult);
+            Assert.Equal(prefix, nameForResult);
+            Assert.Equal(prefix, nameForModelResult);
+        }
+
+        [Fact]
+        public void IdAndNameHelpers_ReturnPropertyName()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var idResult = helper.Id("Property1");
+            var idForResult = helper.IdFor(m => m.Property1);
+            var nameResult = helper.Name("Property1");
+            var nameForResult = helper.NameFor(m => m.Property1);
+
+            // Assert
+            Assert.Equal("Property1", idResult);
+            Assert.Equal("Property1", idForResult);
+            Assert.Equal("Property1", nameResult);
+            Assert.Equal("Property1", nameForResult);
+        }
+
+        [Theory]
+        [InlineData(null, "Property1", "Property1")]
+        [InlineData("", "Property1", "Property1")]
+        [InlineData("A", "A.Property1", "A_Property1")]
+        [InlineData("A[23]", "A[23].Property1", "A_23__Property1")]
+        [InlineData("A[0].B", "A[0].B.Property1", "A_0__B_Property1")]
+        [InlineData("A.B.C.D", "A.B.C.D.Property1", "A_B_C_D_Property1")]
+        public void IdAndNameHelpers_ReturnPrefixAndPropertyName(string prefix, string expectedName, string expectedId)
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = prefix;
+
+            // Act
+            var idResult = helper.Id("Property1");
+            var idForResult = helper.IdFor(m => m.Property1);
+            var nameResult = helper.Name("Property1");
+            var nameForResult = helper.NameFor(m => m.Property1);
+
+            // Assert
+            Assert.Equal(expectedId, idResult);
+            Assert.Equal(expectedId, idForResult);
+            Assert.Equal(expectedName, nameResult);
+            Assert.Equal(expectedName, nameForResult);
+        }
+
+        [Fact]
+        public void IdAndNameHelpers_ReturnPropertyPath_ForNestedProperty()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<OuterClass>(model: null);
+
+            // Act
+            var idResult = helper.Id("Inner.Id");
+            var idForResult = helper.IdFor(m => m.Inner.Id);
+            var nameResult = helper.Name("Inner.Id");
+            var nameForResult = helper.NameFor(m => m.Inner.Id);
+
+            // Assert
+            Assert.Equal("Inner_Id", idResult);
+            Assert.Equal("Inner_Id", idForResult);
+            Assert.Equal("Inner.Id", nameResult);
+            Assert.Equal("Inner.Id", nameForResult);
+        }
+
+        [Fact]
+        public void IdAndNameHelpers_DoNotConsultMetadataOrMetadataProvider()
+        {
+            // Arrange
+            var provider = new Mock<IModelMetadataProvider>(MockBehavior.Strict);
+            var metadata = new Mock<ModelMetadata>(
+                MockBehavior.Loose,
+                ModelMetadataIdentity.ForType(typeof(DefaultTemplatesUtilities.ObjectTemplateModel)));
+            provider
+                .Setup(m => m.GetMetadataForType(typeof(DefaultTemplatesUtilities.ObjectTemplateModel)))
+                .Returns(metadata.Object);
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(provider.Object);
+
+            // Act (do not throw)
+            var idResult = helper.Id(expression: string.Empty);
+            var idForResult = helper.IdFor(m => m);
+            var idForModelResult = helper.IdForModel();
+            var nameResult = helper.Name(expression: string.Empty);
+            var nameForResult = helper.NameFor(m => m);
+            var nameForModelResult = helper.NameForModel();
+
+            // Assert
+            // Only the ViewDataDictionary should do anything with metadata.
+            provider.Verify(
+                m => m.GetMetadataForType(typeof(DefaultTemplatesUtilities.ObjectTemplateModel)),
+                Times.Exactly(1));
+        }
+
+        [Fact]
+        public void IdAndNameHelpers_DoNotConsultMetadataOrMetadataProvider_ForProperty()
+        {
+            // Arrange
+            var provider = new Mock<IModelMetadataProvider>(MockBehavior.Strict);
+            var metadata = new Mock<ModelMetadata>(
+                MockBehavior.Loose,
+                ModelMetadataIdentity.ForType(typeof(DefaultTemplatesUtilities.ObjectTemplateModel)));
+            provider
+                .Setup(m => m.GetMetadataForType(typeof(DefaultTemplatesUtilities.ObjectTemplateModel)))
+                .Returns(metadata.Object);
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(provider.Object);
+
+            // Act (do not throw)
+            var idResult = helper.Id("Property1");
+            var idForResult = helper.IdFor(m => m.Property1);
+            var nameResult = helper.Name("Property1");
+            var nameForResult = helper.NameFor(m => m.Property1);
+
+            // Assert
+            // Only the ViewDataDictionary should do anything with metadata.
+            provider.Verify(
+                m => m.GetMetadataForType(typeof(DefaultTemplatesUtilities.ObjectTemplateModel)),
+                Times.Exactly(1));
+        }
+
+        [Theory]
+        [InlineData("A", "A")]
+        [InlineData("A[0].B", "A_0__B")]
+        [InlineData("A.B.C.D", "A_B_C_D")]
+        public void IdAndName_ReturnExpression_EvenIfExpressionNotFound(string expression, string expectedId)
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var idResult = helper.Id(expression);
+            var nameResult = helper.Name(expression);
+
+            // Assert
+            Assert.Equal(expectedId, idResult);
+            Assert.Equal(expression, nameResult);
+        }
+
+        [Fact]
+        public void IdForAndNameFor_ReturnEmpty_IfExpressionUnsupported()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var idResult = helper.IdFor(model => new { foo = "Bar" });
+            var nameResult = helper.NameFor(model => new { foo = "Bar" });
+
+            // Assert
+            Assert.Empty(idResult);
+            Assert.Empty(nameResult);
+        }
+
+        // expression, expected name, expected id
+        public static TheoryData StaticExpressionNamesData
+        {
+            get
+            {
+                // Give expressions access to non-static fields and properties.
+                var test = new HtmlHelperNameExtensionsTest();
+                return test.ExpressionNamesData;
+            }
+        }
+
+        // expression, expected name, expected id
+        private TheoryData ExpressionNamesData
+        {
+            get
+            {
+                var collection = new List<string>();
+                var nestedCollection = new List<string[]>();
+                var index1 = 5;
+                var index2 = 23;
+                var unknownKey = "this is a dummy parameter value";
+
+                return new TheoryData<Expression<Func<List<OuterClass>, string>>, string, string>
+                {
+                    { m => unknownKey, "unknownKey", "unknownKey" },
+                    { m => collection[index1], "collection[5]", "collection_5_" },
+                    { m => nestedCollection[index1][23], "nestedCollection[5][23]", "nestedCollection_5__23_" },
+                    { m => nestedCollection[index1][index2], "nestedCollection[5][23]", "nestedCollection_5__23_" },
+                    { m => nestedCollection[_index][Index], "nestedCollection[7][9]", "nestedCollection_7__9_" },
+                    { m => nestedCollection[Index][StaticIndex], "nestedCollection[9][8]", "nestedCollection_9__8_" },
+                    { m => _string, "_string", "zstring" },
+                    { m => _collection[_index], "_collection[7]", "zcollection_7_" },
+                    { m => _nestedCollection[_index][23], "_nestedCollection[7][23]", "znestedCollection_7__23_" },
+                    { m => _nestedCollection[_index][index2], "_nestedCollection[7][23]", "znestedCollection_7__23_" },
+                    { m => _nestedCollection[Index][_staticIndex], "_nestedCollection[9][6]", "znestedCollection_9__6_" },
+                    { m => _nestedCollection[StaticIndex][_index], "_nestedCollection[8][7]", "znestedCollection_8__7_" },
+                    { m => StringProperty, "StringProperty", "StringProperty" },
+                    { m => Collection[Index], "Collection[9]", "Collection_9_" },
+                    { m => NestedCollection[Index][23], "NestedCollection[9][23]", "NestedCollection_9__23_" },
+                    { m => NestedCollection[Index][index2], "NestedCollection[9][23]", "NestedCollection_9__23_" },
+                    { m => NestedCollection[_index][Index], "NestedCollection[7][9]", "NestedCollection_7__9_" },
+                    { m => NestedCollection[Index][StaticIndex], "NestedCollection[9][8]", "NestedCollection_9__8_" },
+                    { m => _staticCollection[_staticIndex], "_staticCollection[6]", "zstaticCollection_6_" },
+                    { m => _staticCollection[Index], "_staticCollection[9]", "zstaticCollection_9_" },
+                    { m => _staticCollection[_index], "_staticCollection[7]", "zstaticCollection_7_" },
+                    { m => StaticCollection[StaticIndex], "StaticCollection[8]", "StaticCollection_8_" },
+                    { m => StaticCollection[_staticIndex], "StaticCollection[6]", "StaticCollection_6_" },
+                    { m => StaticCollection[index1], "StaticCollection[5]", "StaticCollection_5_" },
+                    { m => m[index1].Inner.Name, "[5].Inner.Name", "z5__Inner_Name" },
+                    { m => m[_staticIndex].Inner.Name, "[6].Inner.Name", "z6__Inner_Name" },
+                    { m => m[_index].Inner.Name, "[7].Inner.Name", "z7__Inner_Name" },
+                    { m => m[StaticIndex].Inner.Name, "[8].Inner.Name", "z8__Inner_Name" },
+                    { m => m[Index].Inner.Name, "[9].Inner.Name", "z9__Inner_Name" },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(StaticExpressionNamesData))]
+        public void IdForAndNameFor_ReturnExpectedValues_WithVariablesInExpression(
+            Expression<Func<List<OuterClass>, string>> expression,
+            string expectedName,
+            string expectedId)
+        {
+            // Arrange
+            var model = new List<OuterClass>();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+
+            // Act
+            var idResult = helper.IdFor(expression);
+            var nameResult = helper.NameFor(expression);
+
+            // Assert
+            Assert.Equal(expectedId, idResult);
+            Assert.Equal(expectedName, nameResult);
+        }
+
+        [Fact]
+        public void IdForAndNameFor_Throws_WhenParameterUsedAsIndexer()
+        {
+            // Arrange
+            var collection = new List<string>();
+            var index = 24;
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(index);
+            var message = "The expression compiler was unable to evaluate the indexer expression 'm' because it " +
+                "references the model parameter 'm' which is unavailable.";
+
+            // Act & Assert
+            ExceptionAssert.Throws<InvalidOperationException>(() => helper.IdFor(m => collection[m]), message);
+            ExceptionAssert.Throws<InvalidOperationException>(() => helper.NameFor(m => collection[m]), message);
+        }
+
+        public sealed class InnerClass
+        {
+            public int Id { get; set; }
+
+            public string Name { get; set; }
+        }
+
+        public sealed class OuterClass
+        {
+            public InnerClass Inner { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPartialExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPartialExtensionsTest.cs
new file mode 100644
index 0000000000..23944cc16e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPartialExtensionsTest.cs
@@ -0,0 +1,587 @@
+// 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.
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public class HtmlHelperPartialExtensionsTest
+    {
+        // Func<IHtmlHelper, IHtmlContent>, expected Model, expected ViewDataDictionary
+        public static TheoryData<Func<IHtmlHelper, IHtmlContent>, object, ViewDataDictionary> PartialExtensionMethods
+        {
+            get
+            {
+                var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+                var model = new object();
+                return new TheoryData<Func<IHtmlHelper, IHtmlContent>, object, ViewDataDictionary>
+                {
+                    { helper => helper.Partial("test"), null, null },
+                    { helper => helper.Partial("test", model), model, null },
+                    { helper => helper.Partial("test", viewData), null, viewData },
+                    { helper => helper.Partial("test", model, viewData), model, viewData },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(PartialExtensionMethods))]
+        public void PartialMethods_CallHtmlHelperWithExpectedArguments(
+            Func<IHtmlHelper, IHtmlContent> partialMethod,
+            object expectedModel,
+            ViewDataDictionary expectedViewData)
+        {
+            // Arrange
+            var htmlContent = Mock.Of<IHtmlContent>();
+            var helper = new Mock<IHtmlHelper>(MockBehavior.Strict);
+            if (expectedModel == null)
+            {
+                // Extension methods without model parameter use ViewData.Model to get Model.
+                var viewData = expectedViewData ?? new ViewDataDictionary(new EmptyModelMetadataProvider());
+                helper
+                    .SetupGet(h => h.ViewData)
+                    .Returns(viewData)
+                    .Verifiable();
+            }
+
+            helper
+                .Setup(h => h.PartialAsync("test", expectedModel, expectedViewData))
+                .Returns(Task.FromResult(htmlContent))
+                .Verifiable();
+
+            // Act
+            var result = partialMethod(helper.Object);
+
+            // Assert
+            Assert.Same(htmlContent, result);
+            helper.VerifyAll();
+        }
+
+        [Theory]
+        [MemberData(nameof(PartialExtensionMethods))]
+        public void PartialMethods_DoesNotWrapThrownException(
+            Func<IHtmlHelper, IHtmlContent> partialMethod,
+            object unusedModel,
+            ViewDataDictionary unusedViewData)
+        {
+            // Arrange
+            var expected = new InvalidOperationException();
+            var helper = new Mock<IHtmlHelper>();
+            helper.Setup(h => h.PartialAsync("test", It.IsAny<object>(), It.IsAny<ViewDataDictionary>()))
+                  .Callback(() =>
+                  {
+                      // Workaround for compilation issue with Moq.
+                      helper.ToString();
+                      throw expected;
+                  });
+            helper.SetupGet(h => h.ViewData)
+                  .Returns(new ViewDataDictionary(new EmptyModelMetadataProvider()));
+
+            // Act and Assert
+            var actual = Assert.Throws<InvalidOperationException>(() => partialMethod(helper.Object));
+            Assert.Same(expected, actual);
+        }
+
+        // Func<IHtmlHelper, IHtmlContent>, expected Model, expected ViewDataDictionary
+        public static TheoryData<Func<IHtmlHelper, Task<IHtmlContent>>, object, ViewDataDictionary> PartialAsyncExtensionMethods
+        {
+            get
+            {
+                var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+                var model = new object();
+                return new TheoryData<Func<IHtmlHelper, Task<IHtmlContent>>, object, ViewDataDictionary>
+                {
+                    { helper => helper.PartialAsync("test"), null, null },
+                    { helper => helper.PartialAsync("test", model), model, null },
+                    { helper => helper.PartialAsync("test", viewData), null, viewData },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(PartialAsyncExtensionMethods))]
+        public async Task PartialAsyncMethods_CallHtmlHelperWithExpectedArguments(
+            Func<IHtmlHelper, Task<IHtmlContent>> partialAsyncMethod,
+            object expectedModel,
+            ViewDataDictionary expectedViewData)
+        {
+            // Arrange
+            var htmlContent = Mock.Of<IHtmlContent>();
+            var helper = new Mock<IHtmlHelper>(MockBehavior.Strict);
+            if (expectedModel == null)
+            {
+                // Extension methods without model parameter use ViewData.Model to get Model.
+                var viewData = expectedViewData ?? new ViewDataDictionary(new EmptyModelMetadataProvider());
+                helper
+                    .SetupGet(h => h.ViewData)
+                    .Returns(viewData)
+                    .Verifiable();
+            }
+
+            helper
+                .Setup(h => h.PartialAsync("test", expectedModel, expectedViewData))
+                .Returns(Task.FromResult(htmlContent))
+                .Verifiable();
+
+            // Act
+            var result = await partialAsyncMethod(helper.Object);
+
+            // Assert
+            Assert.Same(htmlContent, result);
+            helper.VerifyAll();
+        }
+
+        // Func<IHtmlHelper, IHtmlContent>, expected Model, expected ViewDataDictionary
+        public static TheoryData<Action<IHtmlHelper>, object, ViewDataDictionary> RenderPartialExtensionMethods
+        {
+            get
+            {
+                var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+                var model = new object();
+                return new TheoryData<Action<IHtmlHelper>, object, ViewDataDictionary>
+                {
+                    { helper => helper.RenderPartial("test"), null, null },
+                    { helper => helper.RenderPartial("test", model), model, null },
+                    { helper => helper.RenderPartial("test", viewData), null, viewData },
+                    { helper => helper.RenderPartial("test", model, viewData), model, viewData },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RenderPartialExtensionMethods))]
+        public void RenderPartialMethods_DoesNotWrapThrownException(
+            Action<IHtmlHelper> partialMethod,
+            object unusedModel,
+            ViewDataDictionary unusedViewData)
+        {
+            // Arrange
+            var expected = new InvalidOperationException();
+            var helper = new Mock<IHtmlHelper>();
+            helper.Setup(h => h.RenderPartialAsync("test", It.IsAny<object>(), It.IsAny<ViewDataDictionary>()))
+                  .Callback(() =>
+                  {
+                      // Workaround for compilation issue with Moq.
+                      helper.ToString();
+                      throw expected;
+                  });
+            helper.SetupGet(h => h.ViewData)
+                  .Returns(new ViewDataDictionary(new EmptyModelMetadataProvider()));
+
+            // Act and Assert
+            var actual = Assert.Throws<InvalidOperationException>(() => partialMethod(helper.Object));
+            Assert.Same(expected, actual);
+        }
+
+        [Theory]
+        [MemberData(nameof(RenderPartialAsyncExtensionMethods))]
+        public async Task RenderPartialMethods_CallHtmlHelperWithExpectedArguments(
+            Func<IHtmlHelper, Task> renderPartialAsyncMethod,
+            object expectedModel,
+            ViewDataDictionary expectedViewData)
+        {
+            // Arrange
+            var htmlContent = Mock.Of<IHtmlContent>();
+            var helper = new Mock<IHtmlHelper>(MockBehavior.Strict);
+            if (expectedModel == null)
+            {
+                // Extension methods without model parameter use ViewData.Model to get Model.
+                var viewData = expectedViewData ?? new ViewDataDictionary(new EmptyModelMetadataProvider());
+                helper
+                    .SetupGet(h => h.ViewData)
+                    .Returns(viewData)
+                    .Verifiable();
+            }
+
+            helper
+                .Setup(h => h.RenderPartialAsync("test", expectedModel, expectedViewData))
+                .Returns(Task.FromResult(true))
+                .Verifiable();
+
+            // Act
+            await renderPartialAsyncMethod(helper.Object);
+
+            // Assert
+            helper.VerifyAll();
+        }
+
+        // Func<IHtmlHelper, IHtmlContent>, expected Model, expected ViewDataDictionary
+        public static TheoryData<Func<IHtmlHelper, Task>, object, ViewDataDictionary> RenderPartialAsyncExtensionMethods
+        {
+            get
+            {
+                var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+                var model = new object();
+                return new TheoryData<Func<IHtmlHelper, Task>, object, ViewDataDictionary>
+                {
+                    { helper => helper.RenderPartialAsync("test"), null, null },
+                    { helper => helper.RenderPartialAsync("test", model), model, null },
+                    { helper => helper.RenderPartialAsync("test", viewData), null, viewData },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RenderPartialAsyncExtensionMethods))]
+        public async Task RenderPartialAsyncMethods_CallHtmlHelperWithExpectedArguments(
+            Func<IHtmlHelper, Task> renderPartialAsyncMethod,
+            object expectedModel,
+            ViewDataDictionary expectedViewData)
+        {
+            // Arrange
+            var htmlContent = Mock.Of<IHtmlContent>();
+            var helper = new Mock<IHtmlHelper>(MockBehavior.Strict);
+            if (expectedModel == null)
+            {
+                // Extension methods without model parameter use ViewData.Model to get Model.
+                var viewData = expectedViewData ?? new ViewDataDictionary(new EmptyModelMetadataProvider());
+                helper
+                    .SetupGet(h => h.ViewData)
+                    .Returns(viewData)
+                    .Verifiable();
+            }
+
+            helper
+                .Setup(h => h.RenderPartialAsync("test", expectedModel, expectedViewData))
+                .Returns(Task.FromResult(true))
+                .Verifiable();
+
+            // Act
+            await renderPartialAsyncMethod(helper.Object);
+
+            // Assert
+            helper.VerifyAll();
+        }
+
+        [Fact]
+        public void Partial_InvokesPartialAsyncWithCurrentModel()
+        {
+            // Arrange
+            var expected = new HtmlString("value");
+            var model = new object();
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider())
+            {
+                Model = model
+            };
+            var helper = new Mock<IHtmlHelper>(MockBehavior.Strict);
+            helper.Setup(h => h.PartialAsync("test", model, null))
+                  .Returns(Task.FromResult((IHtmlContent)expected))
+                  .Verifiable();
+            helper.SetupGet(h => h.ViewData)
+                  .Returns(viewData);
+
+            // Act
+            var actual = helper.Object.Partial("test");
+
+            // Assert
+            Assert.Same(expected, actual);
+            helper.Verify();
+        }
+
+        [Fact]
+        public void PartialWithModel_InvokesPartialAsyncWithPassedInModel()
+        {
+            // Arrange
+            var expected = new HtmlString("value");
+            var model = new object();
+            var helper = new Mock<IHtmlHelper>(MockBehavior.Strict);
+            helper.Setup(h => h.PartialAsync("test", model, null))
+                  .Returns(Task.FromResult((IHtmlContent)expected))
+                  .Verifiable();
+
+            // Act
+            var actual = helper.Object.Partial("test", model);
+
+            // Assert
+            Assert.Same(expected, actual);
+            helper.Verify();
+        }
+
+        [Fact]
+        public void PartialWithViewData_InvokesPartialAsyncWithPassedInViewData()
+        {
+            // Arrange
+            var expected = new HtmlString("value");
+            var model = new object();
+            var passedInViewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider())
+            {
+                Model = model
+            };
+            var helper = new Mock<IHtmlHelper>(MockBehavior.Strict);
+            helper.Setup(h => h.PartialAsync("test", model, passedInViewData))
+                  .Returns(Task.FromResult((IHtmlContent)expected))
+                  .Verifiable();
+            helper.SetupGet(h => h.ViewData)
+                  .Returns(viewData);
+
+            // Act
+            var actual = helper.Object.Partial("test", passedInViewData);
+
+            // Assert
+            Assert.Same(expected, actual);
+            helper.Verify();
+        }
+
+        [Fact]
+        public void PartialWithViewDataAndModel_InvokesPartialAsyncWithPassedInViewDataAndModel()
+        {
+            // Arrange
+            var expected = new HtmlString("value");
+            var passedInModel = new object();
+            var passedInViewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+            var helper = new Mock<IHtmlHelper>(MockBehavior.Strict);
+            helper.Setup(h => h.PartialAsync("test", passedInModel, passedInViewData))
+                  .Returns(Task.FromResult((IHtmlContent)expected))
+                  .Verifiable();
+
+            // Act
+            var actual = helper.Object.Partial("test", passedInModel, passedInViewData);
+
+            // Assert
+            Assert.Same(expected, actual);
+            helper.Verify();
+        }
+
+        [Fact]
+        public void Partial_InvokesAndRendersPartialAsyncOnHtmlHelperOfT()
+        {
+            // Arrange
+            var model = new TestModel();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            var expected = DefaultTemplatesUtilities.FormatOutput(helper, model);
+
+            // Act
+            var actual = helper.Partial("some-partial");
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(actual));
+        }
+
+        [Fact]
+        public void PartialWithModel_InvokesAndRendersPartialAsyncOnHtmlHelperOfT()
+        {
+            // Arrange
+            var model = new TestModel();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            var expected = DefaultTemplatesUtilities.FormatOutput(helper, model);
+
+            // Act
+            var actual = helper.Partial("some-partial", model);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(actual));
+        }
+
+        [Fact]
+        public void PartialWithViewData_InvokesAndRendersPartialAsyncOnHtmlHelperOfT()
+        {
+            // Arrange
+            var model = new TestModel();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            var viewData = new ViewDataDictionary(helper.MetadataProvider);
+            var expected = DefaultTemplatesUtilities.FormatOutput(helper, model);
+
+            // Act
+            var actual = helper.Partial("some-partial", viewData);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(actual));
+        }
+
+        [Fact]
+        public async Task PartialAsync_Throws_IfViewNotFound_MessageUsesGetViewLocations()
+        {
+            // Arrange
+            var expected = "The partial view 'test-view' was not found. The following locations were searched:" +
+                Environment.NewLine +
+                "location1" + Environment.NewLine +
+                "location2";
+
+            var model = new TestModel();
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("test-view", new[] { "location1", "location2" }))
+                .Verifiable();
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("test-view", Enumerable.Empty<string>()))
+                .Verifiable();
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+            var viewData = helper.ViewData;
+
+            // Act & Assert
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => helper.PartialAsync("test-view", model, viewData));
+            Assert.Equal(expected, exception.Message);
+        }
+
+        [Fact]
+        public async Task PartialAsync_Throws_IfViewNotFound_MessageUsesFindViewLocations()
+        {
+            // Arrange
+            var expected = "The partial view 'test-view' was not found. The following locations were searched:" +
+                Environment.NewLine +
+                "location1" + Environment.NewLine +
+                "location2";
+
+            var model = new TestModel();
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("test-view", Enumerable.Empty<string>()))
+                .Verifiable();
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("test-view", new[] { "location1", "location2" }))
+                .Verifiable();
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+            var viewData = helper.ViewData;
+
+            // Act & Assert
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => helper.PartialAsync("test-view", model, viewData));
+            Assert.Equal(expected, exception.Message);
+        }
+
+        [Fact]
+        public async Task PartialAsync_Throws_IfViewNotFound_MessageUsesAllLocations()
+        {
+            // Arrange
+            var expected = "The partial view 'test-view' was not found. The following locations were searched:" +
+                Environment.NewLine +
+                "location1" + Environment.NewLine +
+                "location2" + Environment.NewLine +
+                "location3" + Environment.NewLine +
+                "location4";
+
+            var model = new TestModel();
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("test-view", new[] { "location1", "location2" }))
+                .Verifiable();
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("test-view", new[] { "location3", "location4" }))
+                .Verifiable();
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+            var viewData = helper.ViewData;
+
+            // Act & Assert
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => helper.PartialAsync("test-view", model, viewData));
+            Assert.Equal(expected, exception.Message);
+        }
+
+        [Fact]
+        public async Task RenderPartialAsync_Throws_IfViewNotFound_MessageUsesGetViewLocations()
+        {
+            // Arrange
+            var expected = "The partial view 'test-view' was not found. The following locations were searched:" +
+                Environment.NewLine +
+                "location1" + Environment.NewLine +
+                "location2";
+
+            var model = new TestModel();
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("test-view", new[] { "location1", "location2" }))
+                .Verifiable();
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("test-view", Enumerable.Empty<string>()))
+                .Verifiable();
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+            var viewData = helper.ViewData;
+
+            // Act & Assert
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => helper.RenderPartialAsync("test-view", model, viewData));
+            Assert.Equal(expected, exception.Message);
+        }
+
+        [Fact]
+        public async Task RenderPartialAsync_Throws_IfViewNotFound_MessageUsesFindViewLocations()
+        {
+            // Arrange
+            var expected = "The partial view 'test-view' was not found. The following locations were searched:" +
+                Environment.NewLine +
+                "location1" + Environment.NewLine +
+                "location2";
+
+            var model = new TestModel();
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("test-view", Enumerable.Empty<string>()))
+                .Verifiable();
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("test-view", new[] { "location1", "location2" }))
+                .Verifiable();
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+            var viewData = helper.ViewData;
+
+            // Act & Assert
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => helper.RenderPartialAsync("test-view", model, viewData));
+            Assert.Equal(expected, exception.Message);
+        }
+
+        [Fact]
+        public async Task RenderPartialAsync_Throws_IfViewNotFound_MessageUsesAllLocations()
+        {
+            // Arrange
+            var expected = "The partial view 'test-view' was not found. The following locations were searched:" +
+                Environment.NewLine +
+                "location1" + Environment.NewLine +
+                "location2" + Environment.NewLine +
+                "location3" + Environment.NewLine +
+                "location4";
+
+            var model = new TestModel();
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("test-view", new[] { "location1", "location2" }))
+                .Verifiable();
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("test-view", new[] { "location3", "location4" }))
+                .Verifiable();
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model, viewEngine.Object);
+            var viewData = helper.ViewData;
+
+            // Act & Assert
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => helper.RenderPartialAsync("test-view", model, viewData));
+            Assert.Equal(expected, exception.Message);
+        }
+
+        private sealed class TestModel
+        {
+            public override string ToString()
+            {
+                return "test-model-content";
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPasswordTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPasswordTest.cs
new file mode 100644
index 0000000000..f951e13c9f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPasswordTest.cs
@@ -0,0 +1,557 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public class HtmlHelperPasswordTest
+    {
+        public static TheoryData<object> HtmlAttributeData
+        {
+            get
+            {
+                return new TheoryData<object>
+                {
+                    new Dictionary<string, object>
+                    {
+                        { "name", "-expression-" }, // overridden
+                        { "test-key", "test-value" },
+                        { "value", "attribute-value" },
+                    },
+                    new
+                    {
+                        name = "-expression-", // overridden
+                        test_key = "test-value",
+                        value = "attribute-value",
+                    },
+                };
+            }
+        }
+
+        public static TheoryData<ViewDataDictionary<PasswordModel>, object> PasswordWithViewDataAndAttributesData
+        {
+            get
+            {
+                var nullModelViewData = GetViewDataWithNullModelAndNonEmptyViewData();
+                var viewData = GetViewDataWithModelStateAndModelAndViewDataValues();
+                viewData.Model.Property1 = "does-not-get-used";
+
+                var data = new TheoryData<ViewDataDictionary<PasswordModel>, object>();
+                foreach (var items in HtmlAttributeData)
+                {
+                    data.Add(viewData, items[0]);
+                    data.Add(nullModelViewData, items[0]);
+                }
+
+                return data;
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(PasswordWithViewDataAndAttributesData))]
+        public void Password_UsesAttributeValueWhenValueArgumentIsNull(
+            ViewDataDictionary<PasswordModel> viewData,
+            object attributes)
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" " +
+                @"test-key=""HtmlEncode[[test-value]]"" type=""HtmlEncode[[password]]"" " +
+                @"value=""HtmlEncode[[attribute-value]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewData);
+
+            // Act
+            var result = helper.Password("Property1", value: null, htmlAttributes: attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Theory]
+        [MemberData(nameof(PasswordWithViewDataAndAttributesData))]
+        public void Password_UsesExplicitValue_IfSpecified(
+            ViewDataDictionary<PasswordModel> viewData,
+            object attributes)
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" " +
+                @"test-key=""HtmlEncode[[test-value]]"" type=""HtmlEncode[[password]]"" " +
+                @"value=""HtmlEncode[[explicit-value]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewData);
+
+            // Act
+            var result = helper.Password("Property1", "explicit-value", attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void PasswordWithPrefix_GeneratesExpectedValue()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[MyPrefix_Property1]]"" name=""HtmlEncode[[MyPrefix.Property1]]"" type=""HtmlEncode[[password]]"" " +
+                           @"value=""HtmlEncode[[explicit-value]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithModelStateAndModelAndViewDataValues());
+            helper.ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = "MyPrefix";
+
+            // Act
+            var result = helper.Password("Property1", "explicit-value", htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void PasswordWithPrefix_UsesIdDotReplacementToken()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[MyPrefix$Property1]]"" name=""HtmlEncode[[MyPrefix.Property1]]"" type=""HtmlEncode[[password]]"" " +
+                           @"value=""HtmlEncode[[explicit-value]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(
+                GetViewDataWithModelStateAndModelAndViewDataValues(),
+                idAttributeDotReplacement: "$");
+            helper.ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = "MyPrefix";
+
+            // Act
+            var result = helper.Password("Property1", "explicit-value", htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void PasswordWithPrefixAndEmptyName_GeneratesExpectedValue()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[MyPrefix]]"" name=""HtmlEncode[[MyPrefix]]"" type=""HtmlEncode[[password]]"" value=""HtmlEncode[[explicit-value]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithModelStateAndModelAndViewDataValues());
+            helper.ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = "MyPrefix";
+            var name = string.Empty;
+
+            // Act
+            var result = helper.Password(name, "explicit-value", htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void PasswordWithEmptyNameAndPrefixThrows()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper("model-value");
+            var expression = string.Empty;
+            var expectedMessage = "The name of an HTML field cannot be null or empty. Instead use methods " +
+                "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper.Editor or Microsoft.AspNetCore.Mvc.Rendering." +
+                "IHtmlHelper`1.EditorFor with a non-empty htmlFieldName argument value.";
+
+            // Act and Assert
+            ExceptionAssert.ThrowsArgument(
+                () => helper.Password(expression, value: null, htmlAttributes: null),
+                "expression",
+                expectedMessage);
+        }
+
+        [Fact]
+        public void PasswordWithEmptyNameAndPrefix_DoesNotThrow_WithNameAttribute()
+        {
+            // Arrange
+            var expected = @"<input name=""HtmlEncode[[-expression-]]"" type=""HtmlEncode[[password]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper("model-value");
+            var expression = string.Empty;
+            var htmlAttributes = new { name = "-expression-" };
+
+            // Act
+            var result = helper.Password(expression, value: null, htmlAttributes: htmlAttributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void Password_UsesModelStateErrors_ButDoesNotUseModelOrViewDataOrModelStateForValueAttribute()
+        {
+            // Arrange
+            var expected = @"<input class=""HtmlEncode[[input-validation-error some-class]]"" id=""HtmlEncode[[Property1]]""" +
+                           @" name=""HtmlEncode[[Property1]]"" test-key=""HtmlEncode[[test-value]]"" type=""HtmlEncode[[password]]"" />";
+            var vdd = GetViewDataWithErrors();
+            vdd.Model.Property1 = "property-value";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(vdd);
+            var attributes = new Dictionary<string, object>
+            {
+                { "test-key", "test-value" },
+                { "class", "some-class"}
+            };
+
+            // Act
+            var result = helper.Password("Property1", value: null, htmlAttributes: attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void PasswordGeneratesUnobtrusiveValidation()
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Property2");
+            var expected =
+                $@"<input data-val=""HtmlEncode[[true]]"" data-val-required=""HtmlEncode[[{requiredMessage}]]"" " +
+                @"id=""HtmlEncode[[Property2]]"" name=""HtmlEncode[[Property2]]"" type=""HtmlEncode[[password]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithModelStateAndModelAndViewDataValues());
+
+            // Act
+            var result = helper.Password("Property2", value: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        public static IEnumerable<object[]> PasswordWithComplexExpressions_UsesIdDotSeparatorData
+        {
+            get
+            {
+                yield return new object[]
+                {
+                    "Property4.Property5",
+                    @"<input data-test=""HtmlEncode[[val]]"" id=""HtmlEncode[[Property4$$Property5]]"" name=""HtmlEncode[[Property4.Property5]]"" " +
+                    @"type=""HtmlEncode[[password]]"" />",
+                };
+
+                yield return new object[]
+               {
+                    "Property4.Property6[0]",
+                    @"<input data-test=""HtmlEncode[[val]]"" id=""HtmlEncode[[Property4$$Property6$$0$$]]"" name=""HtmlEncode[[Property4.Property6[0]]]"" " +
+                    @"type=""HtmlEncode[[password]]"" />",
+               };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(PasswordWithComplexExpressions_UsesIdDotSeparatorData))]
+        public void PasswordWithComplexExpressions_UsesIdDotSeparator(string expression, string expected)
+        {
+            // Arrange
+            var viewData = GetViewDataWithModelStateAndModelAndViewDataValues();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewData, idAttributeDotReplacement: "$$");
+            var attributes = new Dictionary<string, object> { { "data-test", "val" } };
+
+            // Act
+            var result = helper.Password(expression, value: null, htmlAttributes: attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Theory]
+        [MemberData(nameof(HtmlAttributeData))]
+        public void PasswordForWithAttributes_GeneratesExpectedValue(object htmlAttributes)
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Property1]]"" name=""HtmlEncode[[Property1]]"" " +
+                @"test-key=""HtmlEncode[[test-value]]"" type=""HtmlEncode[[password]]"" " +
+                @"value=""HtmlEncode[[attribute-value]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithModelStateAndModelAndViewDataValues());
+            helper.ViewData.Model.Property1 = "test";
+
+            // Act
+            var result = helper.PasswordFor(m => m.Property1, htmlAttributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void PasswordForWithPrefix_GeneratesExpectedValue()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[MyPrefix_Property1]]"" name=""HtmlEncode[[MyPrefix.Property1]]"" type=""HtmlEncode[[password]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithModelStateAndModelAndViewDataValues());
+            helper.ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = "MyPrefix";
+
+            // Act
+            var result = helper.PasswordFor(m => m.Property1, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void PasswordFor_UsesModelStateErrors_ButDoesNotUseModelOrViewDataOrModelStateForValueAttribute()
+        {
+            // Arrange
+            var expected = @"<input baz=""HtmlEncode[[BazValue]]"" class=""HtmlEncode[[input-validation-error some-class]]"" id=""HtmlEncode[[Property1]]"" " +
+                           @"name=""HtmlEncode[[Property1]]"" type=""HtmlEncode[[password]]"" />";
+            var vdd = GetViewDataWithErrors();
+            vdd.Model.Property1 = "prop1-value";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(vdd);
+            var attributes = new Dictionary<string, object>
+            {
+                { "baz", "BazValue" },
+                { "class", "some-class"}
+            };
+
+            // Act
+            var result = helper.PasswordFor(m => m.Property1, attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void PasswordFor_GeneratesUnobtrusiveValidationAttributes()
+        {
+            // Arrange
+            var requiredMessage = ValidationAttributeUtil.GetRequiredErrorMessage("Property2");
+            var expected =
+                $@"<input data-val=""HtmlEncode[[true]]"" data-val-required=""HtmlEncode[[{requiredMessage}]]"" " +
+                @"id=""HtmlEncode[[Property2]]"" name=""HtmlEncode[[Property2]]"" type=""HtmlEncode[[password]]"" />";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(GetViewDataWithErrors());
+
+            // Act
+            var result = helper.PasswordFor(m => m.Property2, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        public static TheoryData PasswordFor_WithComplexExpressionsData
+        {
+            get
+            {
+                return new TheoryData<Expression<Func<PasswordModel, string>>, string>
+                {
+                    {
+                        model => model.Property3["key"],
+                        @"<input data-val=""HtmlEncode[[true]]"" id=""HtmlEncode[[pre_Property3_key_]]"" name=""HtmlEncode[[pre.Property3[key]]]"" " +
+                        @"type=""HtmlEncode[[password]]"" value=""HtmlEncode[[attr-value]]"" />"
+                    },
+                    {
+                        model => model.Property4.Property5,
+                        @"<input data-val=""HtmlEncode[[true]]"" id=""HtmlEncode[[pre_Property4_Property5]]"" name=""HtmlEncode[[pre.Property4.Property5]]"" " +
+                        @"type=""HtmlEncode[[password]]"" value=""HtmlEncode[[attr-value]]"" />"
+                    },
+                    {
+                        model => model.Property4.Property6[0],
+                        @"<input data-val=""HtmlEncode[[true]]"" id=""HtmlEncode[[pre_Property4_Property6_0_]]"" " +
+                        @"name=""HtmlEncode[[pre.Property4.Property6[0]]]"" type=""HtmlEncode[[password]]"" value=""HtmlEncode[[attr-value]]"" />"
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(PasswordFor_WithComplexExpressionsData))]
+        public void PasswordFor_WithComplexExpressionsAndFieldPrefix_UsesAttributeValueIfSpecified(
+            Expression<Func<PasswordModel, string>> expression,
+            string expected)
+        {
+            // Arrange
+            var viewData = GetViewDataWithModelStateAndModelAndViewDataValues();
+            viewData.ModelState.SetModelValue("pre.Property3[key]", "Property3Val", "Property3Val");
+            viewData.ModelState.SetModelValue("pre.Property4.Property5", "Property5Val", "Property5Val");
+            viewData.ModelState.SetModelValue("pre.Property4.Property6[0]", "Property6Val", "Property6Val");
+            viewData["pre.Property3[key]"] = "vdd-value1";
+            viewData["pre.Property4.Property5"] = "vdd-value2";
+            viewData["pre.Property4.Property6[0]"] = "vdd-value3";
+            viewData.Model.Property3["key"] = "prop-value1";
+            viewData.Model.Property4.Property5 = "prop-value2";
+            viewData.Model.Property4.Property6.Add("prop-value3");
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewData);
+            viewData.TemplateInfo.HtmlFieldPrefix = "pre";
+            var attributes = new { data_val = "true", value = "attr-value" };
+
+            // Act
+            var result = helper.PasswordFor(expression, attributes);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void Password_UsesSpecifiedExpressionForNames_IgnoresExpressionValue()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property1 = "propValue" };
+
+            // Act
+            var passwordResult = helper.Password("Property1");
+
+            // Assert
+            Assert.Equal(
+                "<input id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[password]]\" />",
+                HtmlContentUtilities.HtmlContentToString(passwordResult));
+        }
+
+        [Fact]
+        public void PasswordFor_UsesSpecifiedExpressionForNames_IgnoresExpressionValue()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property1 = "propValue" };
+
+            // Act
+            var passwordForResult = helper.PasswordFor(m => m.Property1);
+
+            // Assert
+            Assert.Equal(
+                "<input id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[password]]\" />",
+                HtmlContentUtilities.HtmlContentToString(passwordForResult));
+        }
+
+        [Fact]
+        public void Password_UsesSpecifiedValue()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property1 = "propValue" };
+
+            // Act
+            var passwordResult = helper.Password("Property1", value: "myvalue");
+
+            // Assert
+            Assert.Equal(
+                "<input id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[password]]\" value=\"HtmlEncode[[myvalue]]\" />",
+                HtmlContentUtilities.HtmlContentToString(passwordResult));
+        }
+
+        [Fact]
+        public void PasswordFor_GeneratesPlaceholderAttribute_WhenDisplayAttributePromptIsSet()
+        {
+            // Arrange
+            var expected = @"<input id=""HtmlEncode[[Property7]]"" name=""HtmlEncode[[Property7]]"" placeholder=""HtmlEncode[[placeholder]]"" type=""HtmlEncode[[password]]"" />";
+            var model = new PasswordModel();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+
+            // Act
+            var result = helper.PasswordFor(m => m.Property7, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        private static ViewDataDictionary<PasswordModel> GetViewDataWithNullModelAndNonEmptyViewData()
+        {
+            return new ViewDataDictionary<PasswordModel>(new EmptyModelMetadataProvider())
+            {
+                ["Property1"] = "view-data-val",
+            };
+        }
+
+        private static ViewDataDictionary<PasswordModel> GetViewDataWithModelStateAndModelAndViewDataValues()
+        {
+            var viewData = GetViewDataWithNullModelAndNonEmptyViewData();
+            viewData.Model = new PasswordModel();
+            viewData.ModelState.SetModelValue("Property1", "ModelStateValue", "ModelStateValue");
+
+            return viewData;
+        }
+
+        private static ViewDataDictionary<PasswordModel> GetViewDataWithErrors()
+        {
+            var viewData = GetViewDataWithModelStateAndModelAndViewDataValues();
+            viewData.ModelState.AddModelError("Property1", "error 1");
+            viewData.ModelState.AddModelError("Property1", "error 2");
+            return viewData;
+        }
+
+        public static TheoryData PasswordFor_IgnoresExpressionValueForComplexExpressionsData
+        {
+            get
+            {
+                return new TheoryData<Expression<Func<PasswordModel, string>>, string>
+                {
+                    {
+                        model => model.Property3["key"],
+                        @"<input id=""HtmlEncode[[pre_Property3_key_]]"" name=""HtmlEncode[[pre.Property3[key]]]"" " +
+                        @"type=""HtmlEncode[[password]]"" />"
+                    },
+                    {
+                        model => model.Property4.Property5,
+                        @"<input id=""HtmlEncode[[pre_Property4_Property5]]"" name=""HtmlEncode[[pre.Property4.Property5]]"" " +
+                        @"type=""HtmlEncode[[password]]"" />"
+                    },
+                    {
+                        model => model.Property4.Property6[0],
+                        @"<input id=""HtmlEncode[[pre_Property4_Property6_0_]]"" " +
+                        @"name=""HtmlEncode[[pre.Property4.Property6[0]]]"" type=""HtmlEncode[[password]]"" />"
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(PasswordFor_IgnoresExpressionValueForComplexExpressionsData))]
+        public void PasswordFor_ComplexExpressions_IgnoresValueFromViewDataModelStateAndModel(
+            Expression<Func<PasswordModel, string>> expression,
+            string expected)
+        {
+            // Arrange
+            var model = new PasswordModel();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "pre";
+
+            helper.ViewData.ModelState.SetModelValue("pre.Property3[key]", "MProp3Val", "MProp3Val");
+            helper.ViewData.ModelState.SetModelValue("pre.Property4.Property5", "MProp5Val", "MProp5Val");
+            helper.ViewData.ModelState.SetModelValue("pre.Property4.Property6[0]", "MProp6Val", "MProp6Val");
+
+            helper.ViewData["pre.Property3[key]"] = "VDProp3Val";
+            helper.ViewData["pre.Property4.Property5"] = "VDProp5Val";
+            helper.ViewData["pre.Property4.Property6"] = "VDProp6Val";
+
+            helper.ViewData.Model.Property3["key"] = "Prop3Val";
+            helper.ViewData.Model.Property4.Property5 = "Prop5Val";
+            helper.ViewData.Model.Property4.Property6.Add("Prop6Val");
+
+            // Act
+            var result = helper.PasswordFor(expression);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        public class PasswordModel
+        {
+            public string Property1 { get; set; }
+
+            [Required]
+            public string Property2 { get; set; }
+
+            public Dictionary<string, string> Property3 { get; } = new Dictionary<string, string>();
+
+            public NestedClass Property4 { get; } = new NestedClass();
+
+            [Display(Prompt = "placeholder")]
+            public string Property7 { get; set; }
+        }
+
+        public class NestedClass
+        {
+            public string Property5 { get; set; }
+
+            public List<string> Property6 { get; } = new List<string>();
+        }
+
+        private class TestModel
+        {
+            public string Property1 { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperRadioButtonExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperRadioButtonExtensionsTest.cs
new file mode 100644
index 0000000000..ce3b3ca7fe
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperRadioButtonExtensionsTest.cs
@@ -0,0 +1,212 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Core
+{
+    /// <summary>
+    /// Test the RadioButton extensions in <see cref="HtmlHelperInputExtensions" /> class.
+    /// </summary>
+    public class HtmlHelperRadioButtonExtensionsTest
+    {
+        [Fact]
+        public void RadioButton_UsesSpecifiedExpression()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var radioButtonResult = helper.RadioButton("Property1", value: "myvalue");
+
+            // Assert
+            Assert.Equal(
+                "<input id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[radio]]\" value=\"HtmlEncode[[myvalue]]\" />",
+                HtmlContentUtilities.HtmlContentToString(radioButtonResult));
+        }
+
+        [Fact]
+        public void RadioButtonFor_UsesSpecifiedExpression()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var radioButtonForResult = helper.RadioButtonFor(m => m.Property1, value: "myvalue");
+
+            // Assert
+            Assert.Equal(
+                "<input id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[radio]]\" value=\"HtmlEncode[[myvalue]]\" />",
+                HtmlContentUtilities.HtmlContentToString(radioButtonForResult));
+        }
+
+        [Theory]
+        [InlineData("MyValue")]
+        [InlineData("myvalue")]
+        public void RadioButton_CheckedWhenValueMatchesSpecifiedExpression(string value)
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property1 = value };
+
+            // Act
+            var radioButtonResult = helper.RadioButton("Property1", value: "myvalue");
+
+            // Assert
+            Assert.Equal(
+                "<input checked=\"HtmlEncode[[checked]]\" id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[radio]]\" value=\"HtmlEncode[[myvalue]]\" />",
+                HtmlContentUtilities.HtmlContentToString(radioButtonResult));
+        }
+
+        [Theory]
+        [InlineData("MyValue")]
+        [InlineData("myvalue")]
+        public void RadioButtonFor_CheckedWhenValueMatchesSpecifiedExpression(string value)
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property1 = value };
+
+            // Act
+            var radioButtonForResult = helper.RadioButtonFor(m => m.Property1, value: "myvalue");
+
+            // Assert
+            Assert.Equal(
+                "<input checked=\"HtmlEncode[[checked]]\" id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[radio]]\" value=\"HtmlEncode[[myvalue]]\" />",
+                HtmlContentUtilities.HtmlContentToString(radioButtonForResult));
+        }
+
+        [Fact]
+        public void RadioButtonHelpers_UsesSpecifiedIsChecked()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var radioButtonResult = helper.RadioButton("Property1", value: "myvalue", isChecked: true);
+
+            // Assert
+            Assert.Equal(
+                "<input checked=\"HtmlEncode[[checked]]\" id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[radio]]\" value=\"HtmlEncode[[myvalue]]\" />",
+                HtmlContentUtilities.HtmlContentToString(radioButtonResult));
+        }
+
+        [Fact]
+        public void RadioButtonHelpers_UsesSpecifiedIsCheckedRegardlessOfValue()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property2 = true };
+
+            // Act
+            var radioButtonResult = helper.RadioButton("Property2", value: "myvalue", isChecked: false);
+
+            // Assert
+            Assert.Equal(
+                "<input id=\"HtmlEncode[[Property2]]\" name=\"HtmlEncode[[Property2]]\" type=\"HtmlEncode[[radio]]\" value=\"HtmlEncode[[myvalue]]\" />",
+                HtmlContentUtilities.HtmlContentToString(radioButtonResult));
+        }
+
+        [Fact]
+        public void RadioButton_UsesSpecifiedHtmlAttributes()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            var htmlAttributes = new
+            {
+                attr = "value",
+                name = "-expression-", // overridden
+            };
+
+            // Act
+            var radioButtonResult = helper.RadioButton("Property1", "myvalue", htmlAttributes);
+
+            // Assert
+            Assert.Equal(
+                "<input attr=\"HtmlEncode[[value]]\" id=\"HtmlEncode[[Property1]]\" " +
+                "name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[radio]]\" value=\"HtmlEncode[[myvalue]]\" />",
+                HtmlContentUtilities.HtmlContentToString(radioButtonResult));
+        }
+
+        [Fact]
+        public void RadioButtonFor_UsesSpecifiedHtmlAttributes()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            var htmlAttributes = new
+            {
+                attr = "value",
+                name = "-expression-", // overridden
+            };
+
+            // Act
+            var radioButtonForResult = helper.RadioButtonFor(m => m.Property1, "myvalue", htmlAttributes);
+
+            // Assert
+            Assert.Equal(
+                "<input attr=\"HtmlEncode[[value]]\" id=\"HtmlEncode[[Property1]]\" " +
+                "name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[radio]]\" value=\"HtmlEncode[[myvalue]]\" />",
+                HtmlContentUtilities.HtmlContentToString(radioButtonForResult));
+        }
+
+        [Fact]
+        public void RadioButtonFor_Throws_IfFullNameEmpty()
+        {
+            // Arrange
+            var expectedMessage = "The name of an HTML field cannot be null or empty. Instead use methods " +
+                "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper.Editor or Microsoft.AspNetCore.Mvc.Rendering." +
+                "IHtmlHelper`1.EditorFor with a non-empty htmlFieldName argument value.";
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper("anotherValue");
+            var htmlAttributes = new
+            {
+                attr = "value",
+            };
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => helper.RadioButtonFor(m => m, "myvalue", htmlAttributes),
+                paramName: "expression",
+                exceptionMessage: expectedMessage);
+        }
+
+        [Fact]
+        public void RadioButtonFor_DoesNotThrow_IfFullNameEmpty_WithNameAttribute()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper("anotherValue");
+            var htmlAttributes = new
+            {
+                attr = "value",
+                name = "-expression-",
+            };
+
+            // Act
+            var radioButtonForResult = helper.RadioButtonFor(m => m, "myvalue", htmlAttributes);
+
+            // Assert
+            Assert.Equal(
+                "<input attr=\"HtmlEncode[[value]]\" " +
+                "name=\"HtmlEncode[[-expression-]]\" type=\"HtmlEncode[[radio]]\" value=\"HtmlEncode[[myvalue]]\" />",
+                HtmlContentUtilities.HtmlContentToString(radioButtonForResult));
+        }
+
+        private class TestModel
+        {
+            public string Property1 { get; set; }
+
+            public bool Property2 { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs
new file mode 100644
index 0000000000..9a0d279ffe
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs
@@ -0,0 +1,1724 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+using System.Linq;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.Localization;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public class HtmlHelperSelectTest
+    {
+        private static readonly SelectListGroup GroupOne = new SelectListGroup { Name = "Group One", };
+        private static readonly SelectListGroup GroupTwo = new SelectListGroup { Name = "Group Two", };
+        private static readonly SelectListGroup DisabledGroup = new SelectListGroup
+        {
+            Disabled = true,
+            Name = "Disabled Group",
+        };
+
+        private static readonly List<SelectListItem> BasicSelectList = new List<SelectListItem>
+        {
+            new SelectListItem("Zero", "0"),
+            new SelectListItem("One", "1"),
+            new SelectListItem("Two", "2"),
+            new SelectListItem("Three", "3"),
+        };
+        private static readonly List<SelectListItem> SomeDisabledOneSelectedSelectList = new List<SelectListItem>
+        {
+            new SelectListItem("Zero",  "0", false, false),
+            new SelectListItem("One",   "1", true, true),
+            new SelectListItem("Two",   "2", false, false),
+            new SelectListItem("Three", "3", false, true),
+        };
+        private static readonly List<SelectListItem> SomeGroupedSomeSelectedSelectList = new List<SelectListItem>
+        {
+            new SelectListItem("Zero",  "0", true)  { Group = GroupOne },
+            new SelectListItem("One",   "1", false) { Group = GroupTwo },
+            new SelectListItem("Two",   "2", true)  { Group = GroupOne },
+            new SelectListItem("Three", "3", false) { Group = null },
+        };
+        private static readonly List<SelectListItem> OneGroupSomeSelectedSelectList = new List<SelectListItem>
+        {
+            new SelectListItem("Zero",  "0", true)  { Group = GroupOne },
+            new SelectListItem("One",   "1", true)  { Group = GroupOne },
+            new SelectListItem("Two",   "2", false) { Group = GroupOne },
+            new SelectListItem("Three", "3", false) { Group = GroupOne },
+        };
+        private static readonly List<SelectListItem> OneDisabledGroupAllSelectedSelectList = new List<SelectListItem>
+        {
+            new SelectListItem("Zero",  "0", true)  { Group = DisabledGroup },
+            new SelectListItem("One",   "1", true)  { Group = DisabledGroup },
+            new SelectListItem("Two",   "2", true) { Group = DisabledGroup },
+            new SelectListItem("Three", "3", true) { Group = DisabledGroup },
+        };
+        private static readonly List<SelectListItem> SourcesSelectList = new List<SelectListItem>
+        {
+            new SelectListItem { Text = SelectSources.ModelStateEntry.ToString() },
+            new SelectListItem { Text = SelectSources.ModelStateEntryWithPrefix.ToString() },
+            new SelectListItem { Text = SelectSources.ViewDataEntry.ToString() },
+            new SelectListItem { Text = SelectSources.PropertyOfViewDataEntry.ToString() },
+            new SelectListItem { Text = SelectSources.ViewDataEntryWithPrefix.ToString() },
+            new SelectListItem { Text = SelectSources.PropertyOfViewDataEntryWithPrefix.ToString() },
+            new SelectListItem { Text = SelectSources.ModelValue.ToString() },
+            new SelectListItem { Text = SelectSources.PropertyOfModel.ToString() },
+        };
+
+        // Select list -> expected HTML with null model, expected HTML with model containing "2".
+        public static TheoryData<IEnumerable<SelectListItem>, string, string> DropDownListDataSet
+        {
+            get
+            {
+                return new TheoryData<IEnumerable<SelectListItem>, string, string>
+                {
+                    {
+                        BasicSelectList,
+                        "<select id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\"><option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" +
+                        Environment.NewLine +
+                        "<option value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</select>",
+                        "<select id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\"><option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" +
+                        Environment.NewLine +
+                        "<option value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</select>"
+                    },
+                    {
+                        SomeDisabledOneSelectedSelectList,
+                        "<select id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\"><option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" +
+                        Environment.NewLine +
+                        "<option disabled=\"HtmlEncode[[disabled]]\" selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" +
+                        Environment.NewLine +
+                        "<option value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "<option disabled=\"HtmlEncode[[disabled]]\" value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</select>",
+                        "<select id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\"><option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" +
+                        Environment.NewLine +
+                        "<option disabled=\"HtmlEncode[[disabled]]\" value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "<option disabled=\"HtmlEncode[[disabled]]\" value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</select>"
+                    },
+                    {
+                        SomeGroupedSomeSelectedSelectList,
+                        "<select id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\"><optgroup label=\"HtmlEncode[[Group One]]\">" +
+                        Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "</optgroup>" + Environment.NewLine +
+                        "<optgroup label=\"HtmlEncode[[Group Two]]\">" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "</optgroup>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</select>",
+                        "<select id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\"><optgroup label=\"HtmlEncode[[Group One]]\">" +
+                        Environment.NewLine +
+                        "<option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "</optgroup>" + Environment.NewLine +
+                        "<optgroup label=\"HtmlEncode[[Group Two]]\">" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "</optgroup>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</select>"
+                    },
+                    {
+                        OneGroupSomeSelectedSelectList,
+                        "<select id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\"><optgroup label=\"HtmlEncode[[Group One]]\">" +
+                        Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</optgroup>" + Environment.NewLine +
+                        "</select>",
+                        "<select id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\"><optgroup label=\"HtmlEncode[[Group One]]\">" +
+                        Environment.NewLine +
+                        "<option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</optgroup>" + Environment.NewLine +
+                        "</select>"
+                    },
+                    {
+                        OneDisabledGroupAllSelectedSelectList,
+                        "<select id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\"><optgroup disabled=\"HtmlEncode[[disabled]]\" label=\"HtmlEncode[[Disabled Group]]\">" +
+                        Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</optgroup>" + Environment.NewLine +
+                        "</select>",
+                        "<select id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\"><optgroup disabled=\"HtmlEncode[[disabled]]\" label=\"HtmlEncode[[Disabled Group]]\">" +
+                        Environment.NewLine +
+                        "<option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</optgroup>" + Environment.NewLine +
+                        "</select>"
+                    },
+                };
+            }
+        }
+
+        // Select list -> expected HTML with null model, with model containing "2", and with model containing "1", "3".
+        public static TheoryData<IEnumerable<SelectListItem>, string, string, string> ListBoxDataSet
+        {
+            get
+            {
+                return new TheoryData<IEnumerable<SelectListItem>, string, string, string>
+                {
+                    {
+                        BasicSelectList,
+                        "<select id=\"HtmlEncode[[Property1]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[Property1]]\"><option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" +
+                        Environment.NewLine +
+                        "<option value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</select>",
+                        "<select id=\"HtmlEncode[[Property1]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[Property1]]\"><option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" +
+                        Environment.NewLine +
+                        "<option value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</select>",
+                        "<select id=\"HtmlEncode[[Property1]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[Property1]]\"><option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" +
+                        Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</select>"
+                    },
+                    {
+                        SomeDisabledOneSelectedSelectList,
+                        "<select id=\"HtmlEncode[[Property1]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[Property1]]\"><option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" +
+                        Environment.NewLine +
+                        "<option disabled=\"HtmlEncode[[disabled]]\" selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" +
+                        Environment.NewLine +
+                        "<option value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "<option disabled=\"HtmlEncode[[disabled]]\" value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</select>",
+                        "<select id=\"HtmlEncode[[Property1]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[Property1]]\"><option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" +
+                        Environment.NewLine +
+                        "<option disabled=\"HtmlEncode[[disabled]]\" value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "<option disabled=\"HtmlEncode[[disabled]]\" value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</select>",
+                        "<select id=\"HtmlEncode[[Property1]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[Property1]]\"><option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" +
+                        Environment.NewLine +
+                        "<option disabled=\"HtmlEncode[[disabled]]\" selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "<option disabled=\"HtmlEncode[[disabled]]\" selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</select>"
+                    },
+                    {
+                        SomeGroupedSomeSelectedSelectList,
+                        "<select id=\"HtmlEncode[[Property1]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[Property1]]\"><optgroup label=\"HtmlEncode[[Group One]]\">" +
+                        Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "</optgroup>" + Environment.NewLine +
+                        "<optgroup label=\"HtmlEncode[[Group Two]]\">" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "</optgroup>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</select>",
+                        "<select id=\"HtmlEncode[[Property1]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[Property1]]\"><optgroup label=\"HtmlEncode[[Group One]]\">" +
+                        Environment.NewLine +
+                        "<option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "</optgroup>" + Environment.NewLine +
+                        "<optgroup label=\"HtmlEncode[[Group Two]]\">" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "</optgroup>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</select>",
+                        "<select id=\"HtmlEncode[[Property1]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[Property1]]\"><optgroup label=\"HtmlEncode[[Group One]]\">" +
+                        Environment.NewLine +
+                        "<option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "</optgroup>" + Environment.NewLine +
+                        "<optgroup label=\"HtmlEncode[[Group Two]]\">" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "</optgroup>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</select>"
+                    },
+                    {
+                        OneGroupSomeSelectedSelectList,
+                        "<select id=\"HtmlEncode[[Property1]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[Property1]]\"><optgroup label=\"HtmlEncode[[Group One]]\">" +
+                        Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</optgroup>" + Environment.NewLine +
+                        "</select>",
+                        "<select id=\"HtmlEncode[[Property1]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[Property1]]\"><optgroup label=\"HtmlEncode[[Group One]]\">" +
+                        Environment.NewLine +
+                        "<option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</optgroup>" + Environment.NewLine +
+                        "</select>",
+                        "<select id=\"HtmlEncode[[Property1]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[Property1]]\"><optgroup label=\"HtmlEncode[[Group One]]\">" +
+                        Environment.NewLine +
+                        "<option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</optgroup>" + Environment.NewLine +
+                        "</select>"
+                    },
+                    {
+                        OneDisabledGroupAllSelectedSelectList,
+                        "<select id=\"HtmlEncode[[Property1]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[Property1]]\">" +
+                        "<optgroup disabled=\"HtmlEncode[[disabled]]\" label=\"HtmlEncode[[Disabled Group]]\">" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</optgroup>" + Environment.NewLine +
+                        "</select>",
+                        "<select id=\"HtmlEncode[[Property1]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[Property1]]\">" +
+                        "<optgroup disabled=\"HtmlEncode[[disabled]]\" label=\"HtmlEncode[[Disabled Group]]\">" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</optgroup>" + Environment.NewLine +
+                        "</select>",
+                        "<select id=\"HtmlEncode[[Property1]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[Property1]]\">" +
+                        "<optgroup disabled=\"HtmlEncode[[disabled]]\" label=\"HtmlEncode[[Disabled Group]]\">" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                        "<option value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                        "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                        "</optgroup>" + Environment.NewLine +
+                        "</select>"
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(DropDownListDataSet))]
+        public void DropDownList_WithNullModel_GeneratesExpectedValue_DoesNotChangeSelectList(
+            IEnumerable<SelectListItem> selectList,
+            string expectedHtml,
+            string ignoredHtml)
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            var savedDisabled = selectList.Select(item => item.Disabled).ToList();
+            var savedGroup = selectList.Select(item => item.Group).ToList();
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+            var savedText = selectList.Select(item => item.Text).ToList();
+            var savedValue = selectList.Select(item => item.Value).ToList();
+
+            // Act
+            var html = helper.DropDownList("Property1", selectList, optionLabel: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedDisabled, selectList.Select(item => item.Disabled));
+            Assert.Equal(savedGroup, selectList.Select(item => item.Group));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+            Assert.Equal(savedText, selectList.Select(item => item.Text));
+            Assert.Equal(savedValue, selectList.Select(item => item.Value));
+        }
+
+        [Theory]
+        [MemberData(nameof(DropDownListDataSet))]
+        public void DropDownList_WithNullSelectList_GeneratesExpectedValue(
+            IEnumerable<SelectListItem> selectList,
+            string expectedHtml,
+            string ignoredHtml)
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            helper.ViewData["Property1"] = selectList;
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+
+            // Act
+            var html = helper.DropDownList("Property1", selectList: null, optionLabel: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+        }
+
+        [Theory]
+        [MemberData(nameof(DropDownListDataSet))]
+        public void DropDownList_WithNullExpression_Throws(
+            IEnumerable<SelectListItem> selectList,
+            string expectedHtml,
+            string ignoredHtml)
+        {
+            // Arrange
+            var expected = "The name of an HTML field cannot be null or empty. Instead use methods " +
+                "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper.Editor or Microsoft.AspNetCore.Mvc.Rendering." +
+                "IHtmlHelper`1.EditorFor with a non-empty htmlFieldName argument value.";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => helper.DropDownList(null, selectList: null, optionLabel: null, htmlAttributes: null),
+                "expression",
+                expected);
+        }
+
+        [Theory]
+        [MemberData(nameof(DropDownListDataSet))]
+        public void DropDownList_WithModelValue_GeneratesExpectedValue(
+            IEnumerable<SelectListItem> selectList,
+            string ignoredHtml,
+            string expectedHtml)
+        {
+            // Arrange
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "2" };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+
+            // Act
+            var html = helper.DropDownList("Property1", selectList, optionLabel: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+        }
+
+        [Fact]
+        public void DropDownListNotInTemplate_GetsModelStateEntry()
+        {
+            // Arrange
+            var expectedHtml = GetExpectedSelectElement(SelectSources.ModelStateEntry, allowMultiple: false);
+
+            var modelState = new ModelStateDictionary();
+            modelState.SetModelValue(
+                "Property1",
+                 SelectSources.ModelStateEntry,
+                 SelectSources.ModelStateEntry.ToString());
+            modelState.SetModelValue(
+                "Prefix.Property1",
+                 SelectSources.ModelStateEntryWithPrefix,
+                 SelectSources.ModelStateEntryWithPrefix.ToString());
+
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var viewData = new ViewDataDictionary<ModelContainingSources>(provider, modelState)
+            {
+                ["Property1"] = SelectSources.ViewDataEntry,
+                ["Prefix.Property1"] = SelectSources.ViewDataEntryWithPrefix,
+                ["Prefix"] = new ModelContainingSources { Property1 = SelectSources.PropertyOfViewDataEntry },
+            };
+            viewData.Model = new ModelContainingSources { Property1 = SelectSources.PropertyOfModel };
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewData);
+            helper.ViewContext.ClientValidationEnabled = false;
+
+            // Act
+            var html = helper.DropDownList("Property1", SourcesSelectList, optionLabel: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void DropDownListInTemplate_GetsModelStateEntry()
+        {
+            // Arrange
+            var expectedHtml = GetExpectedSelectElementWithPrefix(
+                SelectSources.ModelStateEntryWithPrefix,
+                allowMultiple: false);
+
+            var modelState = new ModelStateDictionary();
+            modelState.SetModelValue(
+                "Property1",
+                 SelectSources.ModelStateEntry,
+                 SelectSources.ModelStateEntry.ToString());
+            modelState.SetModelValue(
+                "Prefix.Property1",
+                 SelectSources.ModelStateEntryWithPrefix,
+                 SelectSources.ModelStateEntryWithPrefix.ToString());
+
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var viewData = new ViewDataDictionary<ModelContainingSources>(provider, modelState)
+            {
+                ["Property1"] = SelectSources.ViewDataEntry,
+                ["Prefix.Property1"] = SelectSources.ViewDataEntryWithPrefix,
+                ["Prefix"] = new ModelContainingSources { Property1 = SelectSources.PropertyOfViewDataEntry },
+            };
+            viewData.Model = new ModelContainingSources { Property1 = SelectSources.PropertyOfModel };
+            viewData.TemplateInfo.HtmlFieldPrefix = "Prefix";
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewData);
+            helper.ViewContext.ClientValidationEnabled = false;
+
+            // Act
+            var html = helper.DropDownList("Property1", SourcesSelectList, optionLabel: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void DropDownListNotInTemplate_GetsViewDataEntry_IfModelStateEmpty()
+        {
+            // Arrange
+            var expectedHtml = GetExpectedSelectElement(SelectSources.ViewDataEntry, allowMultiple: false);
+
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var viewData = new ViewDataDictionary<ModelContainingSources>(provider)
+            {
+                ["Property1"] = SelectSources.ViewDataEntry,
+                ["Prefix.Property1"] = SelectSources.ViewDataEntryWithPrefix,
+                ["Prefix"] = new ModelContainingSources { Property1 = SelectSources.PropertyOfViewDataEntry },
+            };
+            viewData.Model = new ModelContainingSources { Property1 = SelectSources.PropertyOfModel };
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewData);
+            helper.ViewContext.ClientValidationEnabled = false;
+
+            // Act
+            var html = helper.DropDownList("Property1", SourcesSelectList, optionLabel: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void DropDownListInTemplate_GetsViewDataEntry_IfModelStateEmpty()
+        {
+            // Arrange
+            var expectedHtml = GetExpectedSelectElementWithPrefix(
+                SelectSources.ViewDataEntryWithPrefix,
+                allowMultiple: false);
+
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var viewData = new ViewDataDictionary<ModelContainingSources>(provider)
+            {
+                ["Property1"] = SelectSources.ViewDataEntry,
+                ["Prefix.Property1"] = SelectSources.ViewDataEntryWithPrefix,
+                ["Prefix"] = new ModelContainingSources { Property1 = SelectSources.PropertyOfViewDataEntry },
+            };
+            viewData.Model = new ModelContainingSources { Property1 = SelectSources.PropertyOfModel };
+            viewData.TemplateInfo.HtmlFieldPrefix = "Prefix";
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewData);
+            helper.ViewContext.ClientValidationEnabled = false;
+
+            // Act
+            var html = helper.DropDownList("Property1", SourcesSelectList, optionLabel: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void DropDownListInTemplate_GetsPropertyOfViewDataEntry_IfModelStateEmptyAndNoViewDataEntryWithPrefix()
+        {
+            // Arrange
+            var expectedHtml = GetExpectedSelectElementWithPrefix(
+                SelectSources.PropertyOfViewDataEntry,
+                allowMultiple: false);
+
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var viewData = new ViewDataDictionary<ModelContainingSources>(provider)
+            {
+                ["Property1"] = SelectSources.ViewDataEntry,
+                ["Prefix"] = new ModelContainingSources { Property1 = SelectSources.PropertyOfViewDataEntry },
+            };
+            viewData.Model = new ModelContainingSources { Property1 = SelectSources.PropertyOfModel };
+            viewData.TemplateInfo.HtmlFieldPrefix = "Prefix";
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewData);
+            helper.ViewContext.ClientValidationEnabled = false;
+
+            // Act
+            var html = helper.DropDownList("Property1", SourcesSelectList, optionLabel: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void DropDownListNotInTemplate_GetsPropertyOfModel_IfModelStateAndViewDataEmpty()
+        {
+            // Arrange
+            var expectedHtml = GetExpectedSelectElement(SelectSources.PropertyOfModel, allowMultiple: false);
+            var model = new ModelContainingSources { Property1 = SelectSources.PropertyOfModel };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            helper.ViewContext.ClientValidationEnabled = false;
+
+            // Act
+            var html = helper.DropDownList("Property1", SourcesSelectList, optionLabel: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void DropDownListInTemplate_GetsPropertyOfModel_IfModelStateAndViewDataEmpty()
+        {
+            // Arrange
+            var expectedHtml = GetExpectedSelectElementWithPrefix(SelectSources.PropertyOfModel, allowMultiple: false);
+            var model = new ModelContainingSources { Property1 = SelectSources.PropertyOfModel };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Prefix";
+
+            // Act
+            var html = helper.DropDownList("Property1", SourcesSelectList, optionLabel: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Theory]
+        [MemberData(nameof(DropDownListDataSet))]
+        public void DropDownListFor_WithNullModel_GeneratesExpectedValue(
+            IEnumerable<SelectListItem> selectList,
+            string expectedHtml,
+            string ignoredHtml)
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+
+            // Act
+            var html = helper.DropDownListFor(
+                value => value.Property1,
+                selectList,
+                optionLabel: null,
+                htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+        }
+
+        [Theory]
+        [MemberData(nameof(DropDownListDataSet))]
+        public void DropDownListFor_WithNullModelAndNullSelectList_GeneratesExpectedValue(
+            IEnumerable<SelectListItem> selectList,
+            string expectedHtml,
+            string ignoredHtml)
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            helper.ViewData["Property1"] = selectList;
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+
+            // Act
+            var html = helper.DropDownListFor(
+                value => value.Property1,
+                selectList: null,
+                optionLabel: null,
+                htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+        }
+
+        [Theory]
+        [MemberData(nameof(DropDownListDataSet))]
+        public void DropDownListFor_WithModelValue_GeneratesExpectedValue(
+            IEnumerable<SelectListItem> selectList,
+            string ignoredHtml,
+            string expectedHtml)
+        {
+            // Arrange
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "2" };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+
+            // Act
+            var html = helper.DropDownListFor(
+                value => value.Property1,
+                selectList,
+                optionLabel: null,
+                htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+        }
+
+        [Theory]
+        [MemberData(nameof(DropDownListDataSet))]
+        public void DropDownListFor_WithModelValueAndNullSelectList_GeneratesExpectedValue(
+            IEnumerable<SelectListItem> selectList,
+            string ignoredHtml,
+            string expectedHtml)
+        {
+            // Arrange
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "2" };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            helper.ViewData["Property1"] = selectList;
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+
+            // Act
+            var html = helper.DropDownListFor(
+                value => value.Property1,
+                selectList: null,
+                optionLabel: null,
+                htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+        }
+
+        [Fact]
+        public void DropDownListFor_WithIndexerExpression_GeneratesExpectedValue()
+        {
+            // Arrange
+            var model = new ModelContainingList { Property1 = { "0", "1", "2" } };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            var selectList = SomeDisabledOneSelectedSelectList;
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+            var expectedHtml =
+                "<select id=\"HtmlEncode[[Property1_2_]]\" name=\"HtmlEncode[[Property1[2]]]\"><option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" +
+                Environment.NewLine +
+                "<option disabled=\"HtmlEncode[[disabled]]\" value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                "<option disabled=\"HtmlEncode[[disabled]]\" value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                "</select>";
+
+            // Act
+            var html = helper.DropDownListFor(
+                value => value.Property1[2],
+                selectList,
+                optionLabel: null,
+                htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+        }
+
+        [Fact]
+        public void DropDownListFor_WithUnrelatedExpression_GeneratesExpectedValue()
+        {
+            // Arrange
+            var unrelated = "2";
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            var selectList = SomeDisabledOneSelectedSelectList;
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+            var expectedHtml =
+                "<select id=\"HtmlEncode[[unrelated]]\" name=\"HtmlEncode[[unrelated]]\"><option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" + Environment.NewLine +
+                "<option disabled=\"HtmlEncode[[disabled]]\" value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                "<option disabled=\"HtmlEncode[[disabled]]\" value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                "</select>";
+
+            // Act
+            var html = helper.DropDownListFor(value => unrelated, selectList, optionLabel: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+        }
+
+        [Theory]
+        [MemberData(nameof(ListBoxDataSet))]
+        public void ListBox_WithNullModel_GeneratesExpectedValue_DoesNotChangeSelectList(
+            IEnumerable<SelectListItem> selectList,
+            string expectedHtml,
+            string ignoredHtml1,
+            string ignoredHtml2)
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<ModelContainingList>(model: null);
+            var savedDisabled = selectList.Select(item => item.Disabled).ToList();
+            var savedGroup = selectList.Select(item => item.Group).ToList();
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+            var savedText = selectList.Select(item => item.Text).ToList();
+            var savedValue = selectList.Select(item => item.Value).ToList();
+
+            // Act
+            var html = helper.ListBox("Property1", selectList, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedDisabled, selectList.Select(item => item.Disabled));
+            Assert.Equal(savedGroup, selectList.Select(item => item.Group));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+            Assert.Equal(savedText, selectList.Select(item => item.Text));
+            Assert.Equal(savedValue, selectList.Select(item => item.Value));
+        }
+
+        [Theory]
+        [MemberData(nameof(ListBoxDataSet))]
+        public void ListBox_WithModelValue_GeneratesExpectedValue(
+            IEnumerable<SelectListItem> selectList,
+            string ignoredHtml1,
+            string expectedHtml,
+            string ignoredHtml2)
+        {
+            // Arrange
+            var model = new ModelContainingList { Property1 = { "2" } };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+
+            // Act
+            var html = helper.ListBox("Property1", selectList, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+        }
+
+        [Theory]
+        [MemberData(nameof(ListBoxDataSet))]
+        public void ListBox_WithMultipleModelValues_GeneratesExpectedValue(
+            IEnumerable<SelectListItem> selectList,
+            string ignoredHtml1,
+            string ignoredHtml2,
+            string expectedHtml)
+        {
+            // Arrange
+            var model = new ModelContainingList { Property1 = { "1", "3" } };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+
+            // Act
+            var html = helper.ListBox("Property1", selectList, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+        }
+
+        [Fact]
+        public void ListBoxNotInTemplate_GetsModelStateEntry()
+        {
+            // Arrange
+            var expectedHtml = GetExpectedSelectElement(SelectSources.ModelStateEntry, allowMultiple: true);
+
+            var modelState = new ModelStateDictionary();
+            modelState.SetModelValue(
+                "Property1",
+                 SelectSources.ModelStateEntry,
+                 SelectSources.ModelStateEntry.ToString());
+            modelState.SetModelValue(
+                "Prefix.Property1",
+                 SelectSources.ModelStateEntryWithPrefix,
+                 SelectSources.ModelStateEntryWithPrefix.ToString());
+
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var viewData = new ViewDataDictionary<ModelContainingListOfSources>(provider, modelState)
+            {
+                ["Property1"] = new[] { SelectSources.ViewDataEntry },
+                ["Prefix.Property1"] = new[] { SelectSources.ViewDataEntryWithPrefix },
+                ["Prefix"] = new ModelContainingListOfSources { Property1 = { SelectSources.PropertyOfViewDataEntry } },
+            };
+            viewData.Model = new ModelContainingListOfSources { Property1 = { SelectSources.PropertyOfModel } };
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewData);
+            helper.ViewContext.ClientValidationEnabled = false;
+
+            // Act
+            var html = helper.ListBox("Property1", SourcesSelectList, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void ListBoxInTemplate_GetsModelStateEntry()
+        {
+            // Arrange
+            var expectedHtml = GetExpectedSelectElementWithPrefix(
+                SelectSources.ModelStateEntryWithPrefix,
+                allowMultiple: true);
+
+            var modelState = new ModelStateDictionary();
+            modelState.SetModelValue(
+                "Property1",
+                 SelectSources.ModelStateEntry,
+                 SelectSources.ModelStateEntry.ToString());
+            modelState.SetModelValue(
+                "Prefix.Property1",
+                 SelectSources.ModelStateEntryWithPrefix,
+                 SelectSources.ModelStateEntryWithPrefix.ToString());
+
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var viewData = new ViewDataDictionary<ModelContainingListOfSources>(provider, modelState)
+            {
+                ["Property1"] = new[] { SelectSources.ViewDataEntry },
+                ["Prefix.Property1"] = new[] { SelectSources.ViewDataEntryWithPrefix },
+                ["Prefix"] = new ModelContainingListOfSources { Property1 = { SelectSources.PropertyOfViewDataEntry } },
+            };
+            viewData.Model = new ModelContainingListOfSources { Property1 = { SelectSources.PropertyOfModel } };
+            viewData.TemplateInfo.HtmlFieldPrefix = "Prefix";
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewData);
+            helper.ViewContext.ClientValidationEnabled = false;
+
+            // Act
+            var html = helper.ListBox("Property1", SourcesSelectList, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void ListBoxNotInTemplate_GetsViewDataEntry_IfModelStateEmpty()
+        {
+            // Arrange
+            var expectedHtml = GetExpectedSelectElement(SelectSources.ViewDataEntry, allowMultiple: true);
+
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var viewData = new ViewDataDictionary<ModelContainingListOfSources>(provider)
+            {
+                ["Property1"] = new[] { SelectSources.ViewDataEntry },
+                ["Prefix.Property1"] = new[] { SelectSources.ViewDataEntryWithPrefix },
+                ["Prefix"] = new ModelContainingListOfSources { Property1 = { SelectSources.PropertyOfViewDataEntry } },
+            };
+            viewData.Model = new ModelContainingListOfSources { Property1 = { SelectSources.PropertyOfModel } };
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewData);
+            helper.ViewContext.ClientValidationEnabled = false;
+
+            // Act
+            var html = helper.ListBox("Property1", SourcesSelectList, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void ListBoxInTemplate_GetsViewDataEntry_IfModelStateEmpty()
+        {
+            // Arrange
+            var expectedHtml = GetExpectedSelectElementWithPrefix(
+                SelectSources.ViewDataEntryWithPrefix,
+                allowMultiple: true);
+
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var viewData = new ViewDataDictionary<ModelContainingListOfSources>(provider)
+            {
+                ["Property1"] = new[] { SelectSources.ViewDataEntry },
+                ["Prefix.Property1"] = new[] { SelectSources.ViewDataEntryWithPrefix },
+                ["Prefix"] = new ModelContainingListOfSources { Property1 = { SelectSources.PropertyOfViewDataEntry } },
+            };
+            viewData.Model = new ModelContainingListOfSources { Property1 = { SelectSources.PropertyOfModel } };
+            viewData.TemplateInfo.HtmlFieldPrefix = "Prefix";
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewData);
+            helper.ViewContext.ClientValidationEnabled = false;
+
+            // Act
+            var html = helper.ListBox("Property1", SourcesSelectList, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void ListBoxInTemplate_GetsPropertyOfViewDataEntry_IfModelStateEmptyAndNoViewDataEntryWithPrefix()
+        {
+            // Arrange
+            var expectedHtml = GetExpectedSelectElementWithPrefix(
+                SelectSources.PropertyOfViewDataEntry,
+                allowMultiple: true);
+
+            var provider = TestModelMetadataProvider.CreateDefaultProvider();
+            var viewData = new ViewDataDictionary<ModelContainingListOfSources>(provider)
+            {
+                ["Property1"] = new[] { SelectSources.ViewDataEntry },
+                ["Prefix"] = new ModelContainingListOfSources { Property1 = { SelectSources.PropertyOfViewDataEntry } },
+            };
+            viewData.Model = new ModelContainingListOfSources { Property1 = { SelectSources.PropertyOfModel } };
+            viewData.TemplateInfo.HtmlFieldPrefix = "Prefix";
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(viewData);
+            helper.ViewContext.ClientValidationEnabled = false;
+
+            // Act
+            var html = helper.ListBox("Property1", SourcesSelectList, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void ListBoxNotInTemplate_GetsPropertyOfModel_IfModelStateAndViewDataEmpty()
+        {
+            // Arrange
+            var expectedHtml = GetExpectedSelectElement(SelectSources.PropertyOfModel, allowMultiple: true);
+            var model = new ModelContainingListOfSources { Property1 = { SelectSources.PropertyOfModel } };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            helper.ViewContext.ClientValidationEnabled = false;
+
+            // Act
+            var html = helper.ListBox("Property1", SourcesSelectList, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Fact]
+        public void ListBoxInTemplate_GetsPropertyOfModel_IfModelStateAndViewDataEmpty()
+        {
+            // Arrange
+            var expectedHtml = GetExpectedSelectElementWithPrefix(SelectSources.PropertyOfModel, allowMultiple: true);
+            var model = new ModelContainingListOfSources { Property1 = { SelectSources.PropertyOfModel } };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Prefix";
+
+            // Act
+            var html = helper.ListBox("Property1", SourcesSelectList, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+        }
+
+        [Theory]
+        [MemberData(nameof(ListBoxDataSet))]
+        public void ListBoxFor_WithNullModel_GeneratesExpectedValue(
+            IEnumerable<SelectListItem> selectList,
+            string expectedHtml,
+            string ignoredHtml1,
+            string ignoredHtml2)
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<ModelContainingList>(model: null);
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+
+            // Act
+            var html = helper.ListBoxFor(value => value.Property1, selectList, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+        }
+
+        [Theory]
+        [MemberData(nameof(ListBoxDataSet))]
+        public void ListBoxFor_WithModelValue_GeneratesExpectedValue(
+            IEnumerable<SelectListItem> selectList,
+            string ignoredHtml1,
+            string expectedHtml,
+            string ignoredHtml2)
+        {
+            // Arrange
+            var model = new ModelContainingList { Property1 = { "2" } };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+
+            // Act
+            var html = helper.ListBoxFor(value => value.Property1, selectList, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+        }
+
+        [Fact]
+        public void ListBoxFor_WithUnreleatedExpression_GeneratesExpectedValue()
+        {
+            // Arrange
+            var unrelated = new[] { "2" };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            var selectList = SomeDisabledOneSelectedSelectList;
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+            var expectedHtml =
+                "<select id=\"HtmlEncode[[unrelated]]\" multiple=\"HtmlEncode[[multiple]]\" name=\"HtmlEncode[[unrelated]]\"><option value=\"HtmlEncode[[0]]\">HtmlEncode[[Zero]]</option>" +
+                Environment.NewLine +
+                "<option disabled=\"HtmlEncode[[disabled]]\" value=\"HtmlEncode[[1]]\">HtmlEncode[[One]]</option>" + Environment.NewLine +
+                "<option selected=\"HtmlEncode[[selected]]\" value=\"HtmlEncode[[2]]\">HtmlEncode[[Two]]</option>" + Environment.NewLine +
+                "<option disabled=\"HtmlEncode[[disabled]]\" value=\"HtmlEncode[[3]]\">HtmlEncode[[Three]]</option>" + Environment.NewLine +
+                "</select>";
+
+            // Act
+            var html = helper.ListBoxFor(value => unrelated, selectList, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+        }
+
+        [Theory]
+        [MemberData(nameof(ListBoxDataSet))]
+        public void ListBoxFor_WithMultipleModelValues_GeneratesExpectedValue(
+            IEnumerable<SelectListItem> selectList,
+            string ignoredHtml1,
+            string ignoredHtml2,
+            string expectedHtml)
+        {
+            // Arrange
+            var model = new ModelContainingList { Property1 = { "1", "3" } };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+
+            // Act
+            var html = helper.ListBoxFor(value => value.Property1, selectList, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+        }
+
+        [Theory]
+        [MemberData(nameof(DropDownListDataSet))]
+        public void DropDownListInTemplate_WithNullModel_GeneratesExpectedValue_DoesNotChangeSelectList(
+            IEnumerable<SelectListItem> selectList,
+            string expectedHtml,
+            string ignoredHtml)
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<string>(model: null);
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Property1";
+            var savedDisabled = selectList.Select(item => item.Disabled).ToList();
+            var savedGroup = selectList.Select(item => item.Group).ToList();
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+            var savedText = selectList.Select(item => item.Text).ToList();
+            var savedValue = selectList.Select(item => item.Value).ToList();
+
+            // Act
+            var html = helper.DropDownList(
+                expression: string.Empty,
+                selectList: selectList,
+                optionLabel: null,
+                htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedDisabled, selectList.Select(item => item.Disabled));
+            Assert.Equal(savedGroup, selectList.Select(item => item.Group));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+            Assert.Equal(savedText, selectList.Select(item => item.Text));
+            Assert.Equal(savedValue, selectList.Select(item => item.Value));
+        }
+
+        [Theory]
+        [MemberData(nameof(DropDownListDataSet))]
+        public void DropDownListInTemplate_WithModelValue_GeneratesExpectedValue(
+            IEnumerable<SelectListItem> selectList,
+            string ignoredHtml,
+            string expectedHtml)
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper("2");
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Property1";
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+
+            // Act
+            var html = helper.DropDownList(
+                expression: string.Empty,
+                selectList: selectList,
+                optionLabel: null,
+                htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+        }
+
+        [Theory]
+        [MemberData(nameof(DropDownListDataSet))]
+        public void DropDownListForInTemplate_WithNullModel_GeneratesExpectedValue(
+            IEnumerable<SelectListItem> selectList,
+            string expectedHtml,
+            string ignoredHtml)
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<string>(model: null);
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Property1";
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+
+            // Act
+            var html = helper.DropDownListFor(value => value, selectList, optionLabel: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+        }
+
+        [Theory]
+        [MemberData(nameof(DropDownListDataSet))]
+        public void DropDownListForInTemplate_WithModelValue_GeneratesExpectedValue(
+            IEnumerable<SelectListItem> selectList,
+            string ignoredHtml,
+            string expectedHtml)
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper("2");
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Property1";
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+
+            // Act
+            var html = helper.DropDownListFor(value => value, selectList, optionLabel: null, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+        }
+
+        [Theory]
+        [MemberData(nameof(ListBoxDataSet))]
+        public void ListBoxInTemplate_WithNullModel_GeneratesExpectedValue_DoesNotChangeSelectList(
+            IEnumerable<SelectListItem> selectList,
+            string expectedHtml,
+            string ignoredHtml1,
+            string ignoredHtml2)
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<List<string>>(model: null);
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Property1";
+            var savedDisabled = selectList.Select(item => item.Disabled).ToList();
+            var savedGroup = selectList.Select(item => item.Group).ToList();
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+            var savedText = selectList.Select(item => item.Text).ToList();
+            var savedValue = selectList.Select(item => item.Value).ToList();
+
+            // Act
+            var html = helper.ListBox(expression: string.Empty, selectList: selectList, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedDisabled, selectList.Select(item => item.Disabled));
+            Assert.Equal(savedGroup, selectList.Select(item => item.Group));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+            Assert.Equal(savedText, selectList.Select(item => item.Text));
+            Assert.Equal(savedValue, selectList.Select(item => item.Value));
+        }
+
+        [Theory]
+        [MemberData(nameof(ListBoxDataSet))]
+        public void ListBoxInTemplate_WithModelValue_GeneratesExpectedValue(
+            IEnumerable<SelectListItem> selectList,
+            string ignoredHtml1,
+            string expectedHtml,
+            string ignoredHtml2)
+        {
+            // Arrange
+            var model = new List<string> { "2" };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Property1";
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+
+            // Act
+            var html = helper.ListBox(expression: string.Empty, selectList: selectList, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+        }
+
+        [Theory]
+        [MemberData(nameof(ListBoxDataSet))]
+        public void ListBoxForInTemplate_WithNullModel_GeneratesExpectedValue(
+            IEnumerable<SelectListItem> selectList,
+            string expectedHtml,
+            string ignoredHtml1,
+            string ignoredHtml2)
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<List<string>>(model: null);
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Property1";
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+
+            // Act
+            var html = helper.ListBoxFor(value => value, selectList, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+        }
+
+        [Theory]
+        [MemberData(nameof(ListBoxDataSet))]
+        public void ListBoxForInTemplate_WithModelValue_GeneratesExpectedValue(
+            IEnumerable<SelectListItem> selectList,
+            string ignoredHtml1,
+            string expectedHtml,
+            string ignoredHtml2)
+        {
+            // Arrange
+            var model = new List<string> { "2" };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Property1";
+            var savedSelected = selectList.Select(item => item.Selected).ToList();
+
+            // Act
+            var html = helper.ListBoxFor(value => value, selectList, htmlAttributes: null);
+
+            // Assert
+            Assert.Equal(expectedHtml, HtmlContentUtilities.HtmlContentToString(html));
+            Assert.Equal(savedSelected, selectList.Select(item => item.Selected));
+        }
+
+        [Fact]
+        public void GetEnumSelectListTEnum_ThrowsWithFlagsEnum()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var htmlHelper = new TestHtmlHelper(metadataProvider);
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => htmlHelper.GetEnumSelectList<EnumWithFlags>(),
+                "TEnum",
+                $"The type '{ typeof(EnumWithFlags).FullName }' is not supported.");
+        }
+
+        [Fact]
+        public void GetEnumSelectListTEnum_ThrowsWithNonEnum()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var htmlHelper = new TestHtmlHelper(metadataProvider);
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => htmlHelper.GetEnumSelectList<StructWithFields>(),
+                "TEnum",
+                $"The type '{ typeof(StructWithFields).FullName }' is not supported.");
+        }
+
+        [Fact]
+        [ReplaceCulture("en-US", "en-US")]
+        public void GetEnumSelectListTEnum_DisplayAttributeUsesIStringLocalizer()
+        {
+            // Arrange
+            var stringLocalizer = new Mock<IStringLocalizer>();
+            stringLocalizer
+                .Setup(s => s[It.IsAny<string>()])
+                .Returns<string>((s) => { return new LocalizedString(s, s + " " + CultureInfo.CurrentCulture); });
+            var stringLocalizerFactory = new Mock<IStringLocalizerFactory>();
+            stringLocalizerFactory
+                .Setup(s => s.Create(It.IsAny<Type>()))
+                .Returns(stringLocalizer.Object);
+
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider(stringLocalizerFactory.Object);
+            var metadata = metadataProvider.GetMetadataForType(typeof(EnumWithFields));
+            var htmlHelper = new TestHtmlHelper(metadataProvider);
+
+            // Act
+            var result = htmlHelper.GetEnumSelectList<EnumWithDisplayNames>();
+
+            // Assert
+            var zeroSelect = Assert.Single(result, s => s.Value.Equals("0", StringComparison.Ordinal));
+            Assert.Equal("cero en-US", zeroSelect.Text);
+        }
+
+        [Fact]
+        public void GetEnumSelectListTEnum_WrapsGetEnumSelectListModelMetadata()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = metadataProvider.GetMetadataForType(typeof(EnumWithFields));
+            var htmlHelper = new TestHtmlHelper(metadataProvider);
+
+            // Act
+            var result = htmlHelper.GetEnumSelectList<EnumWithFields>();
+
+            // Assert
+            Assert.Equal(metadata.ModelType, htmlHelper.Metadata.ModelType);
+
+            Assert.Same(htmlHelper.SelectListItems, result);            // No replacement of the underlying List
+            VerifySelectList(htmlHelper.CopiedSelectListItems, result); // No change to the (mutable) items
+        }
+
+        [Fact]
+        public void GetEnumSelectListType_ThrowsWithFlagsEnum()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var htmlHelper = new TestHtmlHelper(metadataProvider);
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => htmlHelper.GetEnumSelectList(typeof(EnumWithFlags)),
+                "enumType",
+                $"The type '{ typeof(EnumWithFlags).FullName }' is not supported.");
+        }
+
+        [Fact]
+        public void GetEnumSelectListType_ThrowsWithNonEnum()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var htmlHelper = new TestHtmlHelper(metadataProvider);
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => htmlHelper.GetEnumSelectList(typeof(StructWithFields)),
+                "enumType",
+                $"The type '{ typeof(StructWithFields).FullName }' is not supported.");
+        }
+
+        [Fact]
+        public void GetEnumSelectListType_ThrowsWithNonStruct()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var htmlHelper = new TestHtmlHelper(metadataProvider);
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => htmlHelper.GetEnumSelectList(typeof(ClassWithFields)),
+                "enumType",
+                $"The type '{ typeof(ClassWithFields).FullName }' is not supported.");
+        }
+
+        [Fact]
+        public void GetEnumSelectListType_WrapsGetEnumSelectListModelMetadata()
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = metadataProvider.GetMetadataForType(typeof(EnumWithFields));
+            var htmlHelper = new TestHtmlHelper(metadataProvider);
+
+            // Act
+            var result = htmlHelper.GetEnumSelectList(typeof(EnumWithFields));
+
+            // Assert
+            Assert.Equal(metadata.ModelType, htmlHelper.Metadata.ModelType);
+
+            Assert.Same(htmlHelper.SelectListItems, result);            // No replacement of the underlying List
+            VerifySelectList(htmlHelper.CopiedSelectListItems, result); // No change to the (mutable) items
+        }
+
+        public static TheoryData<Type, IEnumerable<SelectListItem>> GetEnumSelectListData
+        {
+            get
+            {
+                return new TheoryData<Type, IEnumerable<SelectListItem>>
+                {
+                    { typeof(EmptyEnum), Enumerable.Empty<SelectListItem>() },
+                    { typeof(EmptyEnum?), Enumerable.Empty<SelectListItem>() },
+                    {
+                        typeof(EnumWithDisplayNames),
+                        new List<SelectListItem>
+                        {
+                            new SelectListItem { Text = "cero", Value = "0" },
+                            new SelectListItem { Text = nameof(EnumWithDisplayNames.One), Value = "1" },
+                            new SelectListItem { Text = "dos", Value = "2" },
+                            new SelectListItem { Text = "tres", Value = "3" },
+                            new SelectListItem { Text = "name from resources", Value = "-2" },
+                            new SelectListItem { Text = "menos uno", Value = "-1" },
+                        }
+                    },
+                    {
+                        typeof(EnumWithDisplayNames?),
+                        new List<SelectListItem>
+                        {
+                            new SelectListItem { Text = "cero", Value = "0" },
+                            new SelectListItem { Text = nameof(EnumWithDisplayNames.One), Value = "1" },
+                            new SelectListItem { Text = "dos", Value = "2" },
+                            new SelectListItem { Text = "tres", Value = "3" },
+                            new SelectListItem { Text = "name from resources", Value = "-2" },
+                            new SelectListItem { Text = "menos uno", Value = "-1" },
+                        }
+                    },
+                    {
+                        typeof(EnumWithDuplicates),
+                        new List<SelectListItem>
+                        {
+                            new SelectListItem { Text = nameof(EnumWithDuplicates.Zero), Value = "0" },
+                            new SelectListItem { Text = nameof(EnumWithDuplicates.None), Value = "0" },
+                            new SelectListItem { Text = nameof(EnumWithDuplicates.One), Value = "1" },
+                            new SelectListItem { Text = nameof(EnumWithDuplicates.Duece), Value = "2" },
+                            new SelectListItem { Text = nameof(EnumWithDuplicates.Two), Value = "2" },
+                            new SelectListItem { Text = nameof(EnumWithDuplicates.MoreThanTwo), Value = "3" },
+                            new SelectListItem { Text = nameof(EnumWithDuplicates.Three), Value = "3" },
+                        }
+                    },
+                    {
+                        typeof(EnumWithDuplicates?),
+                        new List<SelectListItem>
+                        {
+                            new SelectListItem { Text = nameof(EnumWithDuplicates.Zero), Value = "0" },
+                            new SelectListItem { Text = nameof(EnumWithDuplicates.None), Value = "0" },
+                            new SelectListItem { Text = nameof(EnumWithDuplicates.One), Value = "1" },
+                            new SelectListItem { Text = nameof(EnumWithDuplicates.Duece), Value = "2" },
+                            new SelectListItem { Text = nameof(EnumWithDuplicates.Two), Value = "2" },
+                            new SelectListItem { Text = nameof(EnumWithDuplicates.MoreThanTwo), Value = "3" },
+                            new SelectListItem { Text = nameof(EnumWithDuplicates.Three), Value = "3" },
+                        }
+                    },
+                    {
+                        typeof(EnumWithFields),
+                        new List<SelectListItem>
+                        {
+                            new SelectListItem { Text = nameof(EnumWithFields.Zero), Value = "0" },
+                            new SelectListItem { Text = nameof(EnumWithFields.One), Value = "1" },
+                            new SelectListItem { Text = nameof(EnumWithFields.Two), Value = "2" },
+                            new SelectListItem { Text = nameof(EnumWithFields.Three), Value = "3" },
+                            new SelectListItem { Text = nameof(EnumWithFields.MinusTwo), Value = "-2" },
+                            new SelectListItem { Text = nameof(EnumWithFields.MinusOne), Value = "-1" },
+                        }
+                    },
+                    {
+                        typeof(EnumWithFields?),
+                        new List<SelectListItem>
+                        {
+                            new SelectListItem { Text = nameof(EnumWithFields.Zero), Value = "0" },
+                            new SelectListItem { Text = nameof(EnumWithFields.One), Value = "1" },
+                            new SelectListItem { Text = nameof(EnumWithFields.Two), Value = "2" },
+                            new SelectListItem { Text = nameof(EnumWithFields.Three), Value = "3" },
+                            new SelectListItem { Text = nameof(EnumWithFields.MinusTwo), Value = "-2" },
+                            new SelectListItem { Text = nameof(EnumWithFields.MinusOne), Value = "-1" },
+                        }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(GetEnumSelectListData))]
+        public void GetEnumSelectList_ReturnsExpectedItems(Type type, IEnumerable<SelectListItem> expected)
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var metadata = metadataProvider.GetMetadataForType(type);
+            var htmlHelper = new TestHtmlHelper(metadataProvider);
+
+            // Act
+            var result = htmlHelper.GetEnumSelectList(type);
+
+            // Assert
+            // OrderBy is used because the order of the results may very depending on the platform / client.
+            VerifySelectList(
+                expected.OrderBy(item => item.Text, StringComparer.Ordinal),
+                result.OrderBy(item => item.Text, StringComparer.Ordinal));
+        }
+
+        private static string GetExpectedSelectElement(SelectSources source, bool allowMultiple)
+        {
+            return $"<select id=\"HtmlEncode[[Property1]]\"{ GetMultiple(allowMultiple) } " +
+                "name=\"HtmlEncode[[Property1]]\">" +
+                $"{ GetOption(SelectSources.ModelStateEntry, source) }{ Environment.NewLine }" +
+                $"{ GetOption(SelectSources.ModelStateEntryWithPrefix, source) }{ Environment.NewLine }" +
+                $"{ GetOption(SelectSources.ViewDataEntry, source) }{ Environment.NewLine }" +
+                $"{ GetOption(SelectSources.PropertyOfViewDataEntry, source) }{ Environment.NewLine }" +
+                $"{ GetOption(SelectSources.ViewDataEntryWithPrefix, source) }{ Environment.NewLine }" +
+                $"{ GetOption(SelectSources.PropertyOfViewDataEntryWithPrefix, source) }{ Environment.NewLine }" +
+                $"{ GetOption(SelectSources.ModelValue, source) }{ Environment.NewLine }" +
+                $"{ GetOption(SelectSources.PropertyOfModel, source) }{ Environment.NewLine }" +
+                "</select>";
+        }
+
+        private static string GetExpectedSelectElementWithPrefix(SelectSources source, bool allowMultiple)
+        {
+            return $"<select id=\"HtmlEncode[[Prefix_Property1]]\"{ GetMultiple(allowMultiple) } " +
+                "name=\"HtmlEncode[[Prefix.Property1]]\">" +
+                $"{ GetOption(SelectSources.ModelStateEntry, source) }{ Environment.NewLine }" +
+                $"{ GetOption(SelectSources.ModelStateEntryWithPrefix, source) }{ Environment.NewLine }" +
+                $"{ GetOption(SelectSources.ViewDataEntry, source) }{ Environment.NewLine }" +
+                $"{ GetOption(SelectSources.PropertyOfViewDataEntry, source) }{ Environment.NewLine }" +
+                $"{ GetOption(SelectSources.ViewDataEntryWithPrefix, source) }{ Environment.NewLine }" +
+                $"{ GetOption(SelectSources.PropertyOfViewDataEntryWithPrefix, source) }{ Environment.NewLine }" +
+                $"{ GetOption(SelectSources.ModelValue, source) }{ Environment.NewLine }" +
+                $"{ GetOption(SelectSources.PropertyOfModel, source) }{ Environment.NewLine }" +
+                "</select>";
+        }
+
+        private static string GetMultiple(bool allowMultiple)
+        {
+            return allowMultiple ? " multiple=\"HtmlEncode[[multiple]]\"" : string.Empty;
+        }
+
+        private static string GetOption(SelectSources optionSource, SelectSources source)
+        {
+            return $"<option{ GetSelected(optionSource, source) }>HtmlEncode[[{ optionSource.ToString() }]]</option>";
+        }
+
+        private static string GetSelected(SelectSources optionSource, SelectSources source)
+        {
+            return optionSource == source ? " selected=\"HtmlEncode[[selected]]\"" : string.Empty;
+        }
+
+        // Confirm methods that wrap GetEnumSelectList(ModelMetadata) are not changing anything in returned collection.
+        private void VerifySelectList(IEnumerable<SelectListItem> expected, IEnumerable<SelectListItem> actual)
+        {
+            Assert.NotNull(actual);
+            Assert.Equal(expected.Count(), actual.Count());
+            for (var i = 0; i < actual.Count(); i++)
+            {
+                var expectedItem = expected.ElementAt(i);
+                var actualItem = actual.ElementAt(i);
+
+                Assert.False(actualItem.Disabled);
+                Assert.Null(actualItem.Group);
+                Assert.False(actualItem.Selected);
+                Assert.Equal(expectedItem.Text, actualItem.Text);
+                Assert.Equal(expectedItem.Value, actualItem.Value);
+            }
+        }
+
+        private class TestHtmlHelper : HtmlHelper
+        {
+            public TestHtmlHelper(IModelMetadataProvider metadataProvider)
+                : base(
+                      new Mock<IHtmlGenerator>(MockBehavior.Strict).Object,
+                      new Mock<ICompositeViewEngine>(MockBehavior.Strict).Object,
+                      metadataProvider,
+                      new TestViewBufferScope(),
+                      new Mock<HtmlEncoder>(MockBehavior.Strict).Object,
+                      new Mock<UrlEncoder>(MockBehavior.Strict).Object)
+            {
+            }
+
+            public ModelMetadata Metadata { get; private set; }
+
+            public IEnumerable<SelectListItem> SelectListItems { get; private set; }
+
+            public IEnumerable<SelectListItem> CopiedSelectListItems { get; private set; }
+
+            protected override IEnumerable<SelectListItem> GetEnumSelectList(ModelMetadata metadata)
+            {
+                Metadata = metadata;
+                SelectListItems = base.GetEnumSelectList(metadata);
+                if (SelectListItems != null)
+                {
+                    // Perform a deep copy to help confirm the mutable items are not changed.
+                    var copiedSelectListItems = new List<SelectListItem>();
+                    CopiedSelectListItems = copiedSelectListItems;
+                    foreach (var item in SelectListItems)
+                    {
+                        var copy = new SelectListItem
+                        {
+                            Disabled = item.Disabled,
+                            Group = item.Group,
+                            Selected = item.Selected,
+                            Text = item.Text,
+                            Value = item.Value,
+                        };
+
+                        copiedSelectListItems.Add(copy);
+                    }
+                }
+
+                return SelectListItems;
+            }
+        }
+
+        private enum SelectSources
+        {
+            ModelStateEntry,
+            ModelStateEntryWithPrefix,
+            ViewDataEntry,
+            PropertyOfViewDataEntry,
+            ViewDataEntryWithPrefix,
+            PropertyOfViewDataEntryWithPrefix,
+            ModelValue,
+            PropertyOfModel,
+        };
+
+        private class ModelContainingSources
+        {
+            public SelectSources Property1 { get; set; }
+        }
+
+        private class ModelContainingListOfSources
+        {
+            public List<SelectSources> Property1 { get; } = new List<SelectSources>();
+        }
+
+        private class ClassWithFields
+        {
+            public const int Zero = 0;
+
+            public const int One = 1;
+        }
+
+        private enum EmptyEnum
+        {
+        }
+
+        private enum EnumWithDisplayNames
+        {
+            [Display(Name = "tres")]
+            Three = 3,
+
+            [Display(Name = "dos")]
+            Two = 2,
+
+            // Display attribute exists but does not set Name.
+            [Display(ShortName = "uno")]
+            One = 1,
+
+            [Display(Name = "cero")]
+            Zero = 0,
+
+            [Display(Name = "menos uno")]
+            MinusOne = -1,
+
+#if USE_REAL_RESOURCES
+            [Display(Name = nameof(Test.Resources.DisplayAttribute_Name), ResourceType = typeof(Test.Resources))]
+#else
+            [Display(Name = nameof(TestResources.DisplayAttribute_Name), ResourceType = typeof(TestResources))]
+#endif
+            MinusTwo = -2,
+        }
+
+        private enum EnumWithDuplicates
+        {
+            Zero = 0,
+            One = 1,
+            Three = 3,
+            MoreThanTwo = 3,
+            Two = 2,
+            None = 0,
+            Duece = 2,
+        }
+
+        [Flags]
+        private enum EnumWithFlags
+        {
+            Four = 4,
+            Two = 2,
+            One = 1,
+            Zero = 0,
+            All = -1,
+        }
+
+        private enum EnumWithFields
+        {
+            MinusTwo = -2,
+            MinusOne = -1,
+            Three = 3,
+            Two = 2,
+            One = 1,
+            Zero = 0,
+        }
+
+        private struct StructWithFields
+        {
+            public const int Zero = 0;
+
+            public const int One = 1;
+        }
+
+        private class ModelContainingList
+        {
+            public List<string> Property1 { get; } = new List<string>();
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTest.cs
new file mode 100644
index 0000000000..29ffb589d8
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTest.cs
@@ -0,0 +1,420 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public class HtmlHelperTest
+    {
+        public static TheoryData<object, KeyValuePair<string, object>> IgnoreCaseTestData
+        {
+            get
+            {
+                return new TheoryData<object, KeyValuePair<string, object>>
+                {
+                    {
+                        new
+                        {
+                            selected = true,
+                            SeLeCtEd = false
+                        },
+                        new KeyValuePair<string, object>("selected", false)
+                    },
+                    {
+                        new
+                        {
+                            SeLeCtEd = false,
+                            selected = true
+                        },
+                        new KeyValuePair<string, object>("SeLeCtEd", true)
+                    },
+                    {
+                        new
+                        {
+                            SelECTeD = false,
+                            SeLECTED = true
+                        },
+                        new KeyValuePair<string, object>("SelECTeD", true)
+                    }
+                };
+            }
+        }
+
+        // value, expectedString
+        public static TheoryData<object, string> EncodeDynamicTestData
+        {
+            get
+            {
+                var data = new TheoryData<object, string>
+                {
+                    { null, string.Empty },
+                    // Dynamic implementation calls the string overload when possible.
+                    { string.Empty, string.Empty },
+                    { "<\">", "HtmlEncode[[<\">]]" },
+                    { "<br />", "HtmlEncode[[<br />]]" },
+                    { "<b>bold</b>", "HtmlEncode[[<b>bold</b>]]" },
+                    { new ObjectWithToStringOverride(), "HtmlEncode[[<b>boldFromObject</b>]]" },
+                };
+
+                return data;
+            }
+        }
+
+        // value, expectedString
+        public static TheoryData<object, string> EncodeObjectTestData
+        {
+            get
+            {
+                var data = new TheoryData<object, string>
+                {
+                    { null, string.Empty },
+                    { string.Empty, string.Empty },
+                    { "<\">", "HtmlEncode[[<\">]]" },
+                    { "<br />", "HtmlEncode[[<br />]]" },
+                    { "<b>bold</b>", "HtmlEncode[[<b>bold</b>]]" },
+                    { new ObjectWithToStringOverride(), "HtmlEncode[[<b>boldFromObject</b>]]" },
+                };
+
+                return data;
+            }
+        }
+
+        // value, expectedString
+        public static TheoryData<string, string> EncodeStringTestData
+        {
+            get
+            {
+                return new TheoryData<string, string>
+                {
+                    { null, string.Empty },
+                    // String overload does not encode the empty string.
+                    { string.Empty, string.Empty },
+                    { "<\">", "HtmlEncode[[<\">]]" },
+                    { "<br />", "HtmlEncode[[<br />]]" },
+                    { "<b>bold</b>", "HtmlEncode[[<b>bold</b>]]" },
+                };
+            }
+        }
+
+        // value, expectedString
+        public static TheoryData<object, string> RawObjectTestData
+        {
+            get
+            {
+                var data = new TheoryData<object, string>
+                {
+                    { new ObjectWithToStringOverride(), "<b>boldFromObject</b>" },
+                };
+
+                foreach (var item in RawStringTestData)
+                {
+                    data.Add(item[0], (string)item[1]);
+                }
+
+                return data;
+            }
+        }
+
+        // value, expectedString
+        public static TheoryData<string, string> RawStringTestData
+        {
+            get
+            {
+                return new TheoryData<string, string>
+                {
+                    { null, string.Empty },
+                    { string.Empty, string.Empty },
+                    { "<\">", "<\">" },
+                    { "<br />", "<br />" },
+                    { "<b>bold</b>", "<b>bold</b>" },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(IgnoreCaseTestData))]
+        public void AnonymousObjectToHtmlAttributes_IgnoresPropertyCase(
+            object htmlAttributeObject,
+            KeyValuePair<string, object> expectedEntry)
+        {
+            // Act
+            var result = HtmlHelper.AnonymousObjectToHtmlAttributes(htmlAttributeObject);
+
+            // Assert
+            var entry = Assert.Single(result);
+            Assert.Equal(expectedEntry, entry);
+        }
+
+        [Theory]
+        [MemberData(nameof(EncodeDynamicTestData))]
+        public void EncodeDynamic_ReturnsExpectedString(object value, string expectedString)
+        {
+            // Arrange
+            // Important to preserve these particular variable types. Otherwise may end up testing different runtime
+            // (not compiler) behaviors.
+            dynamic dynamicValue = value;
+            IHtmlHelper<DefaultTemplatesUtilities.ObjectTemplateModel> helper =
+                DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var result = helper.Encode(dynamicValue);
+
+            // Assert
+            Assert.Equal(expectedString, result);
+        }
+
+        [Theory]
+        [MemberData(nameof(EncodeDynamicTestData))]
+        public void EncodeDynamic_ReturnsExpectedString_WithBaseHelper(object value, string expectedString)
+        {
+            // Arrange
+            // Important to preserve these particular variable types. Otherwise may end up testing different runtime
+            // (not compiler) behaviors.
+            dynamic dynamicValue = value;
+            IHtmlHelper helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var result = helper.Encode(dynamicValue);
+
+            // Assert
+            Assert.Equal(expectedString, result);
+        }
+
+        [Theory]
+        [MemberData(nameof(EncodeObjectTestData))]
+        public void EncodeObject_ReturnsExpectedString(object value, string expectedString)
+        {
+            // Arrange
+            // Important to preserve this particular variable type and the (object) type of the value parameter.
+            // Otherwise may end up testing different runtime (not compiler) behaviors.
+            IHtmlHelper<DefaultTemplatesUtilities.ObjectTemplateModel> helper =
+                DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var result = helper.Encode(value);
+
+            // Assert
+            Assert.Equal(expectedString, result);
+        }
+
+        [Theory]
+        [MemberData(nameof(EncodeStringTestData))]
+        public void EncodeString_ReturnsExpectedString(string value, string expectedString)
+        {
+            // Arrange
+            // Important to preserve this particular variable type and the (string) type of the value parameter.
+            // Otherwise may end up testing different runtime (not compiler) behaviors.
+            IHtmlHelper<DefaultTemplatesUtilities.ObjectTemplateModel> helper =
+                DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var result = helper.Encode(value);
+
+            // Assert
+            Assert.Equal(expectedString, result);
+        }
+
+        [Theory]
+        [MemberData(nameof(RawObjectTestData))]
+        public void RawDynamic_ReturnsExpectedString(object value, string expectedString)
+        {
+            // Arrange
+            // Important to preserve these particular variable types. Otherwise may end up testing different runtime
+            // (not compiler) behaviors.
+            dynamic dynamicValue = value;
+            IHtmlHelper<DefaultTemplatesUtilities.ObjectTemplateModel> helper =
+                DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var result = helper.Raw(dynamicValue);
+
+            // Assert
+            Assert.Equal(expectedString, result.ToString());
+        }
+
+        [Theory]
+        [MemberData(nameof(RawObjectTestData))]
+        public void RawDynamic_ReturnsExpectedString_WithBaseHelper(object value, string expectedString)
+        {
+            // Arrange
+            // Important to preserve these particular variable types. Otherwise may end up testing different runtime
+            // (not compiler) behaviors.
+            dynamic dynamicValue = value;
+            IHtmlHelper helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var result = helper.Raw(dynamicValue);
+
+            // Assert
+            Assert.Equal(expectedString, result.ToString());
+        }
+
+        [Theory]
+        [MemberData(nameof(RawObjectTestData))]
+        public void RawObject_ReturnsExpectedString(object value, string expectedString)
+        {
+            // Arrange
+            // Important to preserve this particular variable type and the (object) type of the value parameter.
+            // Otherwise may end up testing different runtime (not compiler) behaviors.
+            IHtmlHelper<DefaultTemplatesUtilities.ObjectTemplateModel> helper =
+                DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var result = helper.Raw(value);
+
+            // Assert
+            Assert.Equal(expectedString, result.ToString());
+        }
+
+        [Theory]
+        [MemberData(nameof(RawStringTestData))]
+        public void RawString_ReturnsExpectedString(string value, string expectedString)
+        {
+            // Arrange
+            // Important to preserve this particular variable type and the (string) type of the value parameter.
+            // Otherwise may end up testing different runtime (not compiler) behaviors.
+            IHtmlHelper<DefaultTemplatesUtilities.ObjectTemplateModel> helper =
+                DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var result = helper.Raw(value);
+
+            // Assert
+            Assert.Equal(expectedString, result.ToString());
+        }
+
+        [Fact]
+        public void Contextualize_WorksWithCovariantViewDataDictionary()
+        {
+            // Arrange
+            var helperToContextualize = DefaultTemplatesUtilities
+                .GetHtmlHelper<BaseModel>(model: null);
+
+            var viewContext = DefaultTemplatesUtilities
+                .GetHtmlHelper<DerivedModel>(model: null)
+                .ViewContext;
+
+            // Act
+            helperToContextualize.Contextualize(viewContext);
+
+            // Assert
+            Assert.IsType<ViewDataDictionary<BaseModel>>(
+                helperToContextualize.ViewData);
+
+            Assert.Same(helperToContextualize.ViewContext, viewContext);
+        }
+
+        [Fact]
+        public void Contextualize_ThrowsIfViewDataDictionariesAreNotCompatible()
+        {
+            // Arrange
+            var helperToContextualize = DefaultTemplatesUtilities
+                .GetHtmlHelper<BaseModel>(model: null);
+
+            var viewContext = DefaultTemplatesUtilities
+                .GetHtmlHelper<NonDerivedModel>(model: null)
+                .ViewContext;
+
+            var expectedMessage = $"Property '{nameof(ViewContext.ViewData)}' is of type " +
+                $"'{typeof(ViewDataDictionary<NonDerivedModel>).FullName}'," +
+                $" but this method requires a value of type '{typeof(ViewDataDictionary<BaseModel>).FullName}'.";
+
+            // Act & Assert
+            var exception = Assert.Throws<ArgumentException>("viewContext", () => helperToContextualize.Contextualize(viewContext));
+            Assert.Contains(expectedMessage, exception.Message);
+        }
+
+        [Fact]
+        public void Contextualize_ThrowsForNonGenericViewDataDictionaries()
+        {
+            // Arrange
+            var helperToContextualize = DefaultTemplatesUtilities
+                .GetHtmlHelper<BaseModel>(model: null);
+
+            var viewContext = DefaultTemplatesUtilities
+                .GetHtmlHelper<BaseModel>(model: null)
+                .ViewContext;
+            viewContext.ViewData = new ViewDataDictionary(viewContext.ViewData);
+
+            var expectedMessage = $"Property '{nameof(ViewContext.ViewData)}' is of type " +
+                $"'{typeof(ViewDataDictionary).FullName}'," +
+                $" but this method requires a value of type '{typeof(ViewDataDictionary<BaseModel>).FullName}'.";
+
+            // Act & Assert
+            var exception = Assert.Throws<ArgumentException>("viewContext", () => helperToContextualize.Contextualize(viewContext));
+            Assert.Contains(expectedMessage, exception.Message);
+        }
+
+        private class BaseModel
+        {
+            public string Name { get; set; }
+        }
+
+        private class DerivedModel : BaseModel
+        {
+        }
+
+        private class NonDerivedModel
+        {
+        }
+
+        [Theory]
+        [InlineData("SomeName", "SomeName")]
+        [InlineData("Obj1.Prop1", "Obj1_Prop1")]
+        [InlineData("Obj1.Prop1[0]", "Obj1_Prop1_0_")]
+        [InlineData("Obj1.Prop1[0].Prop2", "Obj1_Prop1_0__Prop2")]
+        public void GenerateIdFromName_ReturnsExpectedValues(string fullname, string expected)
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var result = helper.GenerateIdFromName(fullname);
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Theory]
+        [InlineData(FormMethod.Get, "get")]
+        [InlineData(FormMethod.Post, "post")]
+        [InlineData((FormMethod)42, "post")]
+        public void GetFormMethodString_ReturnsExpectedValues(FormMethod method, string expected)
+        {
+            // Act
+            var result = HtmlHelper.GetFormMethodString(method);
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Theory]
+        [InlineData("-{0}-", "-<b>boldFromObject</b>-")]
+        [InlineData("-%{0}%-", "-%<b>boldFromObject</b>%-")]
+        [InlineData("-=={0}=={0}==-", "-==<b>boldFromObject</b>==<b>boldFromObject</b>==-")]
+        public void FormatValue_ReturnsExpectedValues(string format, string expected)
+        {
+            // Arrange
+            var value = new ObjectWithToStringOverride();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var result = helper.FormatValue(value, format);
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        private class ObjectWithToStringOverride
+        {
+            public override string ToString()
+            {
+                return "<b>boldFromObject</b>";
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaExtensionsTest.cs
new file mode 100644
index 0000000000..2f30e0f551
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaExtensionsTest.cs
@@ -0,0 +1,154 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Core
+{
+    /// <summary>
+    /// Test the TextArea extensions in <see cref="HtmlHelperInputExtensions" /> class.
+    /// </summary>
+    public class HtmlHelperTextAreaExtensionsTest
+    {
+        [Fact]
+        public void TextArea_UsesSpecifiedExpression()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property1 = "propValue" };
+
+            // Act
+            var textAreaResult = helper.TextArea("Property1");
+
+            // Assert
+            Assert.Equal(
+                "<textarea id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\">" + Environment.NewLine +
+                "HtmlEncode[[propValue]]</textarea>",
+                HtmlContentUtilities.HtmlContentToString(textAreaResult));
+        }
+
+        [Fact]
+        public void TextAreaFor_UsesSpecifiedExpression()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property1 = "propValue" };
+
+            // Act
+            var textAreaForResult = helper.TextAreaFor(m => m.Property1);
+
+            // Assert
+            Assert.Equal(
+                "<textarea id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\">" + Environment.NewLine +
+                "HtmlEncode[[propValue]]</textarea>",
+                HtmlContentUtilities.HtmlContentToString(textAreaForResult));
+        }
+
+        [Fact]
+        public void TextAreaHelpers_UsesSpecifiedValue()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property1 = "propValue" };
+
+            // Act
+            var textAreaResult = helper.TextArea("Property1", value: "myvalue");
+
+            // Assert
+            Assert.Equal(
+                "<textarea id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\">" + Environment.NewLine +
+                "HtmlEncode[[myvalue]]</textarea>",
+                HtmlContentUtilities.HtmlContentToString(textAreaResult));
+        }
+
+        [Fact]
+        public void TextArea_UsesSpecifiedHtmlAttributes()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property1 = "propValue" };
+
+            // Act
+            var textAreaResult = helper.TextArea("Property1", htmlAttributes: new { attr = "value" });
+
+            // Assert
+            Assert.Equal(
+                "<textarea attr=\"HtmlEncode[[value]]\" id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\">" +
+                Environment.NewLine +
+                "HtmlEncode[[propValue]]</textarea>",
+                HtmlContentUtilities.HtmlContentToString(textAreaResult));
+        }
+
+        [Fact]
+        public void TextAreaFor_UsesSpecifiedHtmlAttributes()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property1 = "propValue" };
+
+            // Act
+            var textAreaForResult = helper.TextAreaFor(m => m.Property1, htmlAttributes: new { attr = "value" });
+
+            // Assert
+            Assert.Equal(
+                "<textarea attr=\"HtmlEncode[[value]]\" id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\">" +
+                Environment.NewLine +
+                "HtmlEncode[[propValue]]</textarea>",
+                HtmlContentUtilities.HtmlContentToString(textAreaForResult));
+        }
+
+        [Fact]
+        public void TextArea_UsesSpecifiedRowsAndColumns()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var textAreaResult = helper.TextArea("Property1", value: "myvalue", rows: 1, columns: 2, htmlAttributes: new { attr = "value" });
+
+            // Assert
+            Assert.Equal(
+                "<textarea attr=\"HtmlEncode[[value]]\" cols=\"HtmlEncode[[2]]\" id=\"HtmlEncode[[Property1]]\" " +
+                "name=\"HtmlEncode[[Property1]]\" rows=\"HtmlEncode[[1]]\">" + Environment.NewLine +
+                "HtmlEncode[[myvalue]]</textarea>",
+                HtmlContentUtilities.HtmlContentToString(textAreaResult));
+        }
+
+        [Fact]
+        public void TextAreaFor_UsesSpecifiedRowsAndColumns()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var textAreaForResult = helper.TextAreaFor(m => m.Property1, rows: 1, columns: 2, htmlAttributes: new { attr = "value" });
+
+            // Assert
+            Assert.Equal(
+                "<textarea attr=\"HtmlEncode[[value]]\" cols=\"HtmlEncode[[2]]\" id=\"HtmlEncode[[Property1]]\" " +
+                "name=\"HtmlEncode[[Property1]]\" rows=\"HtmlEncode[[1]]\">" + Environment.NewLine +
+                "</textarea>",
+                HtmlContentUtilities.HtmlContentToString(textAreaForResult));
+        }
+
+        private class TestModel
+        {
+            public string Property1 { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaTest.cs
new file mode 100644
index 0000000000..1e5d51fc1c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaTest.cs
@@ -0,0 +1,175 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public class HtmlHelperTextAreaTest
+    {
+        [Fact]
+        public void TextAreaFor_GeneratesPlaceholderAttribute_WhenDisplayAttributePromptIsSetAndTypeIsValid()
+        {
+            // Arrange
+            var model = new TextAreaModelWithAPlaceholder();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+
+            // Act
+            var textArea = helper.TextAreaFor(m => m.Property1);
+
+            // Assert
+            var result = HtmlContentUtilities.HtmlContentToString(textArea);
+            Assert.Contains(@"placeholder=""HtmlEncode[[placeholder]]""", result, StringComparison.Ordinal);
+        }
+
+        [Fact]
+        public void TextAreaFor_DoesNotGeneratePlaceholderAttribute_WhenNoPlaceholderPresentInModel()
+        {
+            // Arrange
+            var model = new TextAreaModelWithoutAPlaceholder();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+
+            // Act
+            var textArea = helper.TextAreaFor(m => m.Property1);
+
+            // Assert
+            var result = HtmlContentUtilities.HtmlContentToString(textArea);
+            Assert.DoesNotContain(@"placeholder=""HtmlEncode[[placeholder]]""", result, StringComparison.Ordinal);
+        }
+
+        public static TheoryData TextAreaFor_UsesModelValueForComplexExpressionsData
+        {
+            get
+            {
+                return new TheoryData<Expression<Func<ComplexModel, string>>, string>
+                {
+                    {
+                        model => model.Property3["key"],
+                        "<textarea id=\"HtmlEncode[[pre_Property3_key_]]\" name=\"HtmlEncode[[pre.Property3[key]]]\">" + Environment.NewLine +
+                        "HtmlEncode[[Prop3Val]]</textarea>"
+                    },
+                    {
+                        model => model.Property4.Property5,
+                        "<textarea id=\"HtmlEncode[[pre_Property4_Property5]]\" name=\"HtmlEncode[[pre.Property4.Property5]]\">" + Environment.NewLine +
+                        "HtmlEncode[[Prop5Val]]</textarea>"
+                    },
+                    {
+                        model => model.Property4.Property6[0],
+                        "<textarea id=\"HtmlEncode[[pre_Property4_Property6_0_]]\" name=\"HtmlEncode[[pre.Property4.Property6[0]]]\">" + Environment.NewLine +
+                        "HtmlEncode[[Prop6Val]]</textarea>"
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(TextAreaFor_UsesModelValueForComplexExpressionsData))]
+        public void TextAreaFor_ComplexExpressions_UsesModelValueForComplexExpressions(
+            Expression<Func<ComplexModel, string>> expression,
+            string expected)
+        {
+            // Arrange
+            var model = new ComplexModel();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "pre";
+
+            helper.ViewData.Model.Property3["key"] = "Prop3Val";
+            helper.ViewData.Model.Property4.Property5 = "Prop5Val";
+            helper.ViewData.Model.Property4.Property6.Add("Prop6Val");
+
+            // Act
+            var result = helper.TextAreaFor(expression);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        public static TheoryData TextAreaFor_UsesModelStateValueForComplexExpressionsData
+        {
+            get
+            {
+                return new TheoryData<Expression<Func<ComplexModel, string>>, string>
+                {
+                    {
+                        model => model.Property3["key"],
+                        "<textarea id=\"HtmlEncode[[pre_Property3_key_]]\" name=\"HtmlEncode[[pre.Property3[key]]]\">" + Environment.NewLine +
+                        "HtmlEncode[[MProp3Val]]</textarea>"
+                    },
+                    {
+                        model => model.Property4.Property5,
+                        "<textarea id=\"HtmlEncode[[pre_Property4_Property5]]\" name=\"HtmlEncode[[pre.Property4.Property5]]\">" + Environment.NewLine +
+                        "HtmlEncode[[MProp5Val]]</textarea>"
+                    },
+                    {
+                        model => model.Property4.Property6[0],
+                        "<textarea id=\"HtmlEncode[[pre_Property4_Property6_0_]]\" name=\"HtmlEncode[[pre.Property4.Property6[0]]]\">" + Environment.NewLine +
+                        "HtmlEncode[[MProp6Val]]</textarea>"
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(TextAreaFor_UsesModelStateValueForComplexExpressionsData))]
+        public void TextAreaFor_ComplexExpressions_UsesModelStateValueForComplexExpressions(
+            Expression<Func<ComplexModel, string>> expression,
+            string expected)
+        {
+            // Arrange
+            var model = new ComplexModel();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "pre";
+
+            helper.ViewData.ModelState.SetModelValue("pre.Property3[key]", "MProp3Val", "MProp3Val");
+            helper.ViewData.ModelState.SetModelValue("pre.Property4.Property5", "MProp5Val", "MProp5Val");
+            helper.ViewData.ModelState.SetModelValue("pre.Property4.Property6[0]", "MProp6Val", "MProp6Val");
+
+            helper.ViewData.Model.Property3["key"] = "Prop3Val";
+            helper.ViewData.Model.Property4.Property5 = "Prop5Val";
+            helper.ViewData.Model.Property4.Property6.Add("Prop6Val");
+
+            // Act
+            var result = helper.TextAreaFor(expression);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        public class ComplexModel
+        {
+            public string Property1 { get; set; }
+
+            public byte[] Bytes { get; set; }
+
+            [Required]
+            public string Property2 { get; set; }
+
+            public Dictionary<string, string> Property3 { get; } = new Dictionary<string, string>();
+
+            public NestedClass Property4 { get; } = new NestedClass();
+        }
+
+        public class NestedClass
+        {
+            public string Property5 { get; set; }
+
+            public List<string> Property6 { get; } = new List<string>();
+        }
+
+        private class TextAreaModelWithAPlaceholder
+        {
+            [Display(Prompt = "placeholder")]
+            public string Property1 { get; set; }
+        }
+
+        private class TextAreaModelWithoutAPlaceholder
+        {
+            public string Property1 { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextBoxExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextBoxExtensionsTest.cs
new file mode 100644
index 0000000000..700f9fbf4c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextBoxExtensionsTest.cs
@@ -0,0 +1,215 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Core
+{
+    /// <summary>
+    /// Test the TextBox extensions in <see cref="HtmlHelperInputExtensions" /> class.
+    /// </summary>
+    public class HtmlHelperTextBoxExtensionsTest
+    {
+        [Fact]
+        public void TextBox_UsesSpecifiedExpression()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property1 = "propValue" };
+
+            // Act
+            var textBoxResult = helper.TextBox("Property1");
+
+            // Assert
+            Assert.Equal(
+                "<input id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[text]]\" value=\"HtmlEncode[[propValue]]\" />",
+                HtmlContentUtilities.HtmlContentToString(textBoxResult));
+        }
+
+        [Fact]
+        public void TextBoxFor_UsesSpecifiedExpression()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property1 = "propValue" };
+
+            // Act
+            var textBoxForResult = helper.TextBoxFor(m => m.Property1);
+
+            // Assert
+            Assert.Equal(
+                "<input id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[text]]\" value=\"HtmlEncode[[propValue]]\" />",
+                HtmlContentUtilities.HtmlContentToString(textBoxForResult));
+        }
+
+        [Fact]
+        public void TextBox_UsesSpecifiedValue()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property1 = "propValue" };
+
+            // Act
+            var textBoxResult = helper.TextBox("Property1", value: "myvalue");
+
+            // Assert
+            Assert.Equal(
+                "<input id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[text]]\" value=\"HtmlEncode[[myvalue]]\" />",
+                HtmlContentUtilities.HtmlContentToString(textBoxResult));
+        }
+
+        [Fact]
+        public void TextBox_UsesSpecifiedFormat()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property1 = "propValue" };
+
+            // Act
+            var textBoxResult = helper.TextBox("Property1", value: null, format: "prefix: {0}");
+
+            // Assert
+            Assert.Equal(
+                "<input id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[text]]\" value=\"HtmlEncode[[prefix: propValue]]\" />",
+                HtmlContentUtilities.HtmlContentToString(textBoxResult));
+        }
+
+        [Fact]
+        public void TextBox_UsesSpecifiedFormatOverridesPropertyValue()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(new ViewDataDictionary<TestModel>(metadataProvider));
+            helper.ViewContext.ClientValidationEnabled = false;
+            helper.ViewData.Model = new TestModel { Property1 = "propValue" };
+
+            // Act
+            var textBoxResult = helper.TextBox("Property1", value: "myvalue", format: "prefix: {0}");
+
+            // Assert
+            Assert.Equal(
+                "<input id=\"HtmlEncode[[Property1]]\" name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[text]]\" value=\"HtmlEncode[[prefix: myvalue]]\" />",
+                HtmlContentUtilities.HtmlContentToString(textBoxResult));
+        }
+
+        [Fact]
+        public void TextBox_UsesSpecifiedHtmlAttributes()
+        {
+            // Arrange
+            var htmlAttributes = new
+            {
+                attr = "value",
+                name = "-expression-", // overridden
+            };
+
+            var model = new TestModel
+            {
+                Property1 = "propValue"
+            };
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            helper.ViewContext.ClientValidationEnabled = false;
+
+            // Act
+            var textBoxResult = helper.TextBox("Property1", "myvalue", htmlAttributes);
+
+            // Assert
+            Assert.Equal(
+                "<input attr=\"HtmlEncode[[value]]\" id=\"HtmlEncode[[Property1]]\" " +
+                "name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[text]]\" value=\"HtmlEncode[[myvalue]]\" />",
+                HtmlContentUtilities.HtmlContentToString(textBoxResult));
+        }
+
+        [Fact]
+        public void TextBoxFor_UsesSpecifiedHtmlAttributes()
+        {
+            // Arrange
+            var htmlAttributes = new
+            {
+                attr = "value",
+                name = "-expression-", // overridden
+            };
+
+            var model = new TestModel
+            {
+                Property1 = "propValue"
+            };
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            helper.ViewContext.ClientValidationEnabled = false;
+
+            // Act
+            var textBoxForResult = helper.TextBoxFor(m => m.Property1, htmlAttributes);
+
+            // Assert
+            Assert.Equal(
+                "<input attr=\"HtmlEncode[[value]]\" id=\"HtmlEncode[[Property1]]\" " +
+                "name=\"HtmlEncode[[Property1]]\" type=\"HtmlEncode[[text]]\" value=\"HtmlEncode[[propValue]]\" />",
+                HtmlContentUtilities.HtmlContentToString(textBoxForResult));
+        }
+
+        [Fact]
+        public void TextBoxFor_Throws_IfFullNameEmpty()
+        {
+            // Arrange
+            var expectedMessage = "The name of an HTML field cannot be null or empty. Instead use methods " +
+                "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper.Editor or Microsoft.AspNetCore.Mvc.Rendering." +
+                "IHtmlHelper`1.EditorFor with a non-empty htmlFieldName argument value.";
+
+            var htmlAttributes = new
+            {
+                attr = "value",
+            };
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper("propValue");
+            helper.ViewContext.ClientValidationEnabled = false;
+
+            // Act & Assert
+            ExceptionAssert.ThrowsArgument(
+                () => helper.TextBoxFor(m => m, htmlAttributes),
+                paramName: "expression",
+                exceptionMessage: expectedMessage);
+        }
+
+        [Fact]
+        public void TextBoxFor_DoesNotThrow_IfFullNameEmpty_WithNameAttribute()
+        {
+            // Arrange
+            var htmlAttributes = new
+            {
+                attr = "value",
+                name = "-expression-",
+            };
+
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper("propValue");
+            helper.ViewContext.ClientValidationEnabled = false;
+
+            // Act
+            var textBoxForResult = helper.TextBoxFor(m => m, htmlAttributes);
+
+            // Assert
+            Assert.Equal(
+                "<input attr=\"HtmlEncode[[value]]\" " +
+                "name=\"HtmlEncode[[-expression-]]\" type=\"HtmlEncode[[text]]\" value=\"HtmlEncode[[propValue]]\" />",
+                HtmlContentUtilities.HtmlContentToString(textBoxForResult));
+        }
+
+        private class TestModel
+        {
+            public string Property1 { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextBoxTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextBoxTest.cs
new file mode 100644
index 0000000000..82b5710fde
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextBoxTest.cs
@@ -0,0 +1,188 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public class HtmlHelperTextBoxTest
+    {
+        [Theory]
+        [InlineData("text")]
+        [InlineData("search")]
+        [InlineData("url")]
+        [InlineData("tel")]
+        [InlineData("email")]
+        [InlineData("number")]
+        public void TextBoxFor_GeneratesPlaceholderAttribute_WhenDisplayAttributePromptIsSetAndTypeIsValid(string type)
+        {
+            // Arrange
+            var model = new TextBoxModel();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+
+            // Act
+            var textBox = helper.TextBoxFor(m => m.Property1, new { type });
+
+            // Assert
+            var result = HtmlContentUtilities.HtmlContentToString(textBox);
+            Assert.Contains(@"placeholder=""HtmlEncode[[placeholder]]""", result, StringComparison.Ordinal);
+        }
+
+        [Theory]
+        [InlineData("hidden")]
+        [InlineData("date")]
+        [InlineData("time")]
+        [InlineData("range")]
+        [InlineData("color")]
+        [InlineData("checkbox")]
+        [InlineData("radio")]
+        [InlineData("submit")]
+        [InlineData("reset")]
+        [InlineData("button")]
+        [InlineData("image")]
+        [InlineData("file")]
+        public void TextBoxFor_DoesNotGeneratePlaceholderAttribute_WhenDisplayAttributePromptIsSetAndTypeIsInvalid(string type)
+        {
+            // Arrange
+            var model = new TextBoxModel();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+
+            // Act
+            var textBox = helper.TextBoxFor(m => m.Property1, new { type });
+
+            // Assert
+            var result = HtmlContentUtilities.HtmlContentToString(textBox);
+            Assert.DoesNotContain(@"placeholder=""HtmlEncode[[placeholder]]""", result, StringComparison.Ordinal);
+        }
+
+        public static TheoryData TextBoxFor_UsesModelValueForComplexExpressionsData
+        {
+            get
+            {
+                return new TheoryData<Expression<Func<ComplexModel, string>>, string>
+                {
+                    {
+                        model => model.Property3["key"],
+                        @"<input id=""HtmlEncode[[pre_Property3_key_]]"" name=""HtmlEncode[[pre.Property3[key]]]"" " +
+                        @"type=""HtmlEncode[[text]]"" value=""HtmlEncode[[Prop3Val]]"" />"
+                    },
+                    {
+                        model => model.Property4.Property5,
+                        @"<input id=""HtmlEncode[[pre_Property4_Property5]]"" name=""HtmlEncode[[pre.Property4.Property5]]"" " +
+                        @"type=""HtmlEncode[[text]]"" value=""HtmlEncode[[Prop5Val]]"" />"
+                    },
+                    {
+                        model => model.Property4.Property6[0],
+                        @"<input id=""HtmlEncode[[pre_Property4_Property6_0_]]"" " +
+                        @"name=""HtmlEncode[[pre.Property4.Property6[0]]]"" type=""HtmlEncode[[text]]"" value=""HtmlEncode[[Prop6Val]]"" />"
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(TextBoxFor_UsesModelValueForComplexExpressionsData))]
+        public void TextBoxFor_ComplexExpressions_UsesModelValueForComplexExpressions(
+            Expression<Func<ComplexModel, string>> expression,
+            string expected)
+        {
+            // Arrange
+            var model = new ComplexModel();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "pre";
+
+            helper.ViewData.Model.Property3["key"] = "Prop3Val";
+            helper.ViewData.Model.Property4.Property5 = "Prop5Val";
+            helper.ViewData.Model.Property4.Property6.Add("Prop6Val");
+
+            // Act
+            var result = helper.TextBoxFor(expression);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        public static TheoryData TextBoxFor_UsesModelStateValueForComplexExpressionsData
+        {
+            get
+            {
+                return new TheoryData<Expression<Func<ComplexModel, string>>, string>
+                {
+                    {
+                        model => model.Property3["key"],
+                        @"<input id=""HtmlEncode[[pre_Property3_key_]]"" name=""HtmlEncode[[pre.Property3[key]]]"" " +
+                        @"type=""HtmlEncode[[text]]"" value=""HtmlEncode[[MProp3Val]]"" />"
+                    },
+                    {
+                        model => model.Property4.Property5,
+                        @"<input id=""HtmlEncode[[pre_Property4_Property5]]"" name=""HtmlEncode[[pre.Property4.Property5]]"" " +
+                        @"type=""HtmlEncode[[text]]"" value=""HtmlEncode[[MProp5Val]]"" />"
+                    },
+                    {
+                        model => model.Property4.Property6[0],
+                        @"<input id=""HtmlEncode[[pre_Property4_Property6_0_]]"" " +
+                        @"name=""HtmlEncode[[pre.Property4.Property6[0]]]"" type=""HtmlEncode[[text]]"" value=""HtmlEncode[[MProp6Val]]"" />"
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(TextBoxFor_UsesModelStateValueForComplexExpressionsData))]
+        public void TextBoxFor_ComplexExpressions_UsesModelStateValueForComplexExpressions(
+            Expression<Func<ComplexModel, string>> expression,
+            string expected)
+        {
+            // Arrange
+            var model = new ComplexModel();
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "pre";
+
+            helper.ViewData.ModelState.SetModelValue("pre.Property3[key]", "MProp3Val", "MProp3Val");
+            helper.ViewData.ModelState.SetModelValue("pre.Property4.Property5", "MProp5Val", "MProp5Val");
+            helper.ViewData.ModelState.SetModelValue("pre.Property4.Property6[0]", "MProp6Val", "MProp6Val");
+
+            helper.ViewData.Model.Property3["key"] = "Prop3Val";
+            helper.ViewData.Model.Property4.Property5 = "Prop5Val";
+            helper.ViewData.Model.Property4.Property6.Add("Prop6Val");
+
+            // Act
+            var result = helper.TextBoxFor(expression);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        public class ComplexModel
+        {
+            public string Property1 { get; set; }
+
+            public byte[] Bytes { get; set; }
+
+            [Required]
+            public string Property2 { get; set; }
+
+            public Dictionary<string, string> Property3 { get; } = new Dictionary<string, string>();
+
+            public NestedClass Property4 { get; } = new NestedClass();
+        }
+
+        public class NestedClass
+        {
+            public string Property5 { get; set; }
+
+            public List<string> Property6 { get; } = new List<string>();
+        }
+
+        private class TextBoxModel
+        {
+            [Display(Prompt = "placeholder")]
+            public string Property1 { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationMessageExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationMessageExtensionsTest.cs
new file mode 100644
index 0000000000..b9e1f5fc4f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationMessageExtensionsTest.cs
@@ -0,0 +1,135 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Core
+{
+    /// <summary>
+    /// Test the ValidationMessage extensions in <see cref="HtmlHelperValidationExtensions" /> class.
+    /// </summary>
+    public class HtmlHelperValidationMessageExtensionsTest
+    {
+        [Fact]
+        public void ValidationMessage_UsesSpecifiedExpression()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var validationMessageResult = helper.ValidationMessage("Property1");
+            
+            // Assert
+            Assert.Equal(
+                "<span class=\"HtmlEncode[[field-validation-valid]]\" data-valmsg-for=\"HtmlEncode[[Property1]]\" data-valmsg-replace=\"HtmlEncode[[true]]\"></span>",
+                HtmlContentUtilities.HtmlContentToString(validationMessageResult));
+        }
+
+        [Fact]
+        public void ValidationMessageFor_UsesSpecifiedExpression()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var validationMessageForResult = helper.ValidationMessageFor(m => m.Property1);
+
+            // Assert
+            Assert.Equal(
+                "<span class=\"HtmlEncode[[field-validation-valid]]\" data-valmsg-for=\"HtmlEncode[[Property1]]\" data-valmsg-replace=\"HtmlEncode[[true]]\"></span>",
+                HtmlContentUtilities.HtmlContentToString(validationMessageForResult));
+        }
+
+        [Fact]
+        public void ValidationMessage_UsesSpecifiedMessage()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var validationMessageResult = helper.ValidationMessage("Property1", message: "Custom Message");
+
+            // Assert
+            Assert.Equal(
+                "<span class=\"HtmlEncode[[field-validation-valid]]\" data-valmsg-for=\"HtmlEncode[[Property1]]\" data-valmsg-replace=\"HtmlEncode[[false]]\">HtmlEncode[[Custom Message]]</span>",
+                HtmlContentUtilities.HtmlContentToString(validationMessageResult));
+        }
+
+        [Fact]
+        public void ValidationMessageFor_UsesSpecifiedMessage()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var validationMessageForResult = helper.ValidationMessageFor(m => m.Property1, message: "Custom Message");
+
+            // Assert
+            Assert.Equal(
+                "<span class=\"HtmlEncode[[field-validation-valid]]\" data-valmsg-for=\"HtmlEncode[[Property1]]\" data-valmsg-replace=\"HtmlEncode[[false]]\">HtmlEncode[[Custom Message]]</span>",
+                HtmlContentUtilities.HtmlContentToString(validationMessageForResult));
+        }
+
+        [Fact]
+        public void ValidationMessage_UsesSpecifiedHtmlAttributes()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var validationMessageResult = helper.ValidationMessage("Property1", message: "Custom Message", htmlAttributes: new { attr="value" });
+
+            // Assert
+            Assert.Equal(
+                "<span attr=\"HtmlEncode[[value]]\" class=\"HtmlEncode[[field-validation-valid]]\" data-valmsg-for=\"HtmlEncode[[Property1]]\" data-valmsg-replace=\"HtmlEncode[[false]]\">HtmlEncode[[Custom Message]]</span>",
+                HtmlContentUtilities.HtmlContentToString(validationMessageResult));
+        }
+
+        [Fact]
+        public void ValidationMessageFor_UsesSpecifiedHtmlAttributes()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var validationMessageForResult = helper.ValidationMessageFor(m => m.Property1, message: "Custom Message", htmlAttributes: new { attr = "value" });
+
+            // Assert
+            Assert.Equal(
+                "<span attr=\"HtmlEncode[[value]]\" class=\"HtmlEncode[[field-validation-valid]]\" data-valmsg-for=\"HtmlEncode[[Property1]]\" data-valmsg-replace=\"HtmlEncode[[false]]\">HtmlEncode[[Custom Message]]</span>",
+                HtmlContentUtilities.HtmlContentToString(validationMessageForResult));
+        }
+
+        [Fact]
+        public void ValidationMessage_UsesSpecifiedTag()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var validationMessageResult = helper.ValidationMessage("Property1", message: "Custom Message", tag: "div");
+
+            // Assert
+            Assert.Equal(
+                "<div class=\"HtmlEncode[[field-validation-valid]]\" data-valmsg-for=\"HtmlEncode[[Property1]]\" data-valmsg-replace=\"HtmlEncode[[false]]\">HtmlEncode[[Custom Message]]</div>",
+                HtmlContentUtilities.HtmlContentToString(validationMessageResult));
+        }
+
+        [Fact]
+        public void ValidationMessageFor_UsesSpecifiedTag()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+
+            // Act
+            var validationMessageForResult = helper.ValidationMessageFor(m => m.Property1, message: "Custom Message", tag: "div");
+
+            // Assert
+            Assert.Equal(
+                "<div class=\"HtmlEncode[[field-validation-valid]]\" data-valmsg-for=\"HtmlEncode[[Property1]]\" data-valmsg-replace=\"HtmlEncode[[false]]\">HtmlEncode[[Custom Message]]</div>",
+                HtmlContentUtilities.HtmlContentToString(validationMessageForResult));
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationSummaryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationSummaryTest.cs
new file mode 100644
index 0000000000..5531f4da05
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationSummaryTest.cs
@@ -0,0 +1,764 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public class HtmlHelperValidationSummaryTest
+    {
+        // Message, HTML attributes, tag -> expected result.
+        public static TheoryData<string, object, string, string> ValidValidationSummaryData
+        {
+            get
+            {
+                var attributes = new { @class = "wood smoke", attribute_name = "attribute-value", };
+                var dictionary = new Dictionary<string, object>
+                {
+                    { "class", "wood smoke" },
+                    { "attribute-name", "attribute-value" },
+                };
+
+                var basicDiv = "<div class=\"HtmlEncode[[validation-summary-valid]]\" data-valmsg-summary=\"HtmlEncode[[true]]\">" +
+                    "<ul><li style=\"display:none\"></li>" + Environment.NewLine +
+                    "</ul></div>";
+                var divWithAttributes = "<div attribute-name=\"HtmlEncode[[attribute-value]]\" " +
+                    "class=\"HtmlEncode[[validation-summary-valid wood smoke]]\" data-valmsg-summary=\"HtmlEncode[[true]]\"><ul>" +
+                    "<li style=\"display:none\"></li>" + Environment.NewLine +
+                    "</ul></div>";
+                var divWithMessage = "<div class=\"HtmlEncode[[validation-summary-valid]]\" data-valmsg-summary=\"HtmlEncode[[true]]\">" +
+                    "<span>HtmlEncode[[This is my message]]</span>" + Environment.NewLine +
+                    "<ul><li style=\"display:none\"></li>" + Environment.NewLine +
+                    "</ul></div>";
+                var divWithH3Message = "<div class=\"HtmlEncode[[validation-summary-valid]]\" data-valmsg-summary=\"HtmlEncode[[true]]\">" +
+                    "<h3>HtmlEncode[[This is my message]]</h3>" + Environment.NewLine +
+                    "<ul><li style=\"display:none\"></li>" + Environment.NewLine +
+                    "</ul></div>";
+                var divWithMessageAndAttributes = "<div attribute-name=\"HtmlEncode[[attribute-value]]\" " +
+                    "class=\"HtmlEncode[[validation-summary-valid wood smoke]]\" data-valmsg-summary=\"HtmlEncode[[true]]\">" +
+                    "<span>HtmlEncode[[This is my message]]</span>" + Environment.NewLine +
+                    "<ul><li style=\"display:none\"></li>" + Environment.NewLine +
+                    "</ul></div>";
+                var divWithH3MessageAndAttributes = "<div attribute-name=\"HtmlEncode[[attribute-value]]\" " +
+                    "class=\"HtmlEncode[[validation-summary-valid wood smoke]]\" data-valmsg-summary=\"HtmlEncode[[true]]\">" +
+                    "<h3>HtmlEncode[[This is my message]]</h3>" + Environment.NewLine +
+                    "<ul><li style=\"display:none\"></li>" + Environment.NewLine +
+                    "</ul></div>";
+
+                return new TheoryData<string, object, string, string>
+                {
+                    { null, null, null, basicDiv },
+                    { null, null, "h3", basicDiv },
+                    { null, attributes, null, divWithAttributes },
+                    { null, attributes, "h3", divWithAttributes },
+                    { null, dictionary, null, divWithAttributes },
+                    { null, dictionary, "h3", divWithAttributes },
+                    { "This is my message", null, null, divWithMessage },
+                    { "This is my message", null, "h3", divWithH3Message },
+                    { "This is my message", attributes, null, divWithMessageAndAttributes },
+                    { "This is my message", attributes, "h3", divWithH3MessageAndAttributes },
+                    { "This is my message", dictionary, null, divWithMessageAndAttributes },
+                    { "This is my message", dictionary, "h3", divWithH3MessageAndAttributes },
+                };
+            }
+        }
+
+        // Exclude property errors, client validation enabled -> expected result with model error, with property error.
+        public static TheoryData<bool, bool, string, string> OneErrorValidationSummaryData
+        {
+            get
+            {
+                var divWithError = "<div class=\"HtmlEncode[[validation-summary-errors]]\"><ul>" +
+                    "<li>HtmlEncode[[This is my validation message]]</li>" + Environment.NewLine +
+                    "</ul></div>";
+                var divWithErrorAndSummary = "<div class=\"HtmlEncode[[validation-summary-errors]]\" data-valmsg-summary=\"HtmlEncode[[true]]\"><ul>" +
+                    "<li>HtmlEncode[[This is my validation message]]</li>" + Environment.NewLine +
+                    "</ul></div>";
+
+                return new TheoryData<bool, bool, string, string>
+                {
+                    { false, false, divWithError, divWithError },
+                    { false, true, divWithErrorAndSummary, divWithErrorAndSummary },
+                    { true, false, divWithError, string.Empty },
+                    { true, true, divWithError, string.Empty },
+                };
+            }
+        }
+
+        // Exclude property errors, prefix -> expected result
+        public static TheoryData<bool, string, string> MultipleErrorsValidationSummaryData
+        {
+            get
+            {
+                var divWithRootError = "<div class=\"HtmlEncode[[validation-summary-errors]]\"><ul>" +
+                    "<li>HtmlEncode[[This is an error for the model root.]]</li>" + Environment.NewLine +
+                    "<li>HtmlEncode[[This is another error for the model root.]]</li>" + Environment.NewLine +
+                    "</ul></div>";
+                var divWithProperty3Error = "<div class=\"HtmlEncode[[validation-summary-errors]]\"><ul>" +
+                    "<li>HtmlEncode[[This is an error for Property3.]]</li>" + Environment.NewLine +
+                    "</ul></div>";
+                var divWithAllErrors = "<div class=\"HtmlEncode[[validation-summary-errors]]\" data-valmsg-summary=\"HtmlEncode[[true]]\"><ul>" +
+                    "<li>HtmlEncode[[This is an error for Property2.]]</li>" + Environment.NewLine +
+                    "<li>HtmlEncode[[This is another error for Property2.]]</li>" + Environment.NewLine +
+                    "<li>HtmlEncode[[The value '' is not valid for Property2.]]</li>" + Environment.NewLine +
+                    "<li>HtmlEncode[[This is an error for Property3.OrderedProperty3.]]</li>" + Environment.NewLine +
+                    "<li>HtmlEncode[[This is an error for Property3.OrderedProperty2.]]</li>" + Environment.NewLine +
+                    "<li>HtmlEncode[[This is an error for Property3.Property2.]]</li>" + Environment.NewLine +
+                    "<li>HtmlEncode[[This is an error for Property3.]]</li>" + Environment.NewLine +
+                    "<li>HtmlEncode[[This is an error for the model root.]]</li>" + Environment.NewLine +
+                    "<li>HtmlEncode[[This is another error for the model root.]]</li>" + Environment.NewLine +
+                    "</ul></div>";
+
+                return new TheoryData<bool, string, string>
+                {
+                    { false, string.Empty, divWithAllErrors },
+                    { false, "Property2", divWithAllErrors },
+                    { false, "some.unrelated.prefix", divWithAllErrors },
+                    { true, string.Empty, divWithRootError },
+                    { true, "Property3", divWithProperty3Error },
+                    { true, "some.unrelated.prefix", string.Empty },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidValidationSummaryData))]
+        public void ValidationSummary_AllValid_ReturnsExpectedDiv(
+            string message,
+            object htmlAttributes,
+            string tag,
+            string expected)
+        {
+            // Arrange
+            var model = new ValidationModel();
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model);
+
+            // Act
+            var result = html.ValidationSummary(
+                excludePropertyErrors: false,
+                message: message,
+                htmlAttributes: htmlAttributes,
+                tag: tag);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidValidationSummaryData))]
+        public void ValidationSummary_ExcludePropertyErrorsAllValid_ReturnsEmpty(
+            string message,
+            object htmlAttributes,
+            string tag,
+            string ignored)
+        {
+            // Arrange
+            var model = new ValidationModel();
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model);
+
+            // Act
+            var result = html.ValidationSummary(
+                excludePropertyErrors: true,
+                message: message,
+                htmlAttributes: htmlAttributes,
+                tag: tag);
+
+            // Assert
+            Assert.Equal(HtmlString.Empty, result);
+        }
+
+        [Theory]
+        [MemberData(nameof(ValidValidationSummaryData))]
+        public void ValidationSummary_ClientValidationDisabledAllValid_ReturnsEmpty(
+            string message,
+            object htmlAttributes,
+            string tag,
+            string ignored)
+        {
+            // Arrange
+            var model = new ValidationModel();
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            html.ViewContext.ClientValidationEnabled = false;
+
+            // Act
+            var result = html.ValidationSummary(
+                excludePropertyErrors: false,
+                message: message,
+                htmlAttributes: htmlAttributes,
+                tag: tag);
+
+            // Assert
+            Assert.Equal(HtmlString.Empty, result);
+        }
+
+        [Theory]
+        [MemberData(nameof(OneErrorValidationSummaryData))]
+        public void ValidationSummary_InvalidModel_ReturnsExpectedDiv(
+            bool excludePropertyErrors,
+            bool clientValidationEnabled,
+            string expected,
+            string ignored)
+        {
+            // Arrange
+            var model = new ValidationModel();
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            html.ViewContext.ClientValidationEnabled = clientValidationEnabled;
+            html.ViewData.ModelState.AddModelError(string.Empty, "This is my validation message");
+
+            // Act
+            var result = html.ValidationSummary(
+                excludePropertyErrors: excludePropertyErrors,
+                message: null,
+                htmlAttributes: null,
+                tag: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Theory]
+        [MemberData(nameof(OneErrorValidationSummaryData))]
+        public void ValidationSummary_InvalidModelWithPrefix_ReturnsExpectedDiv(
+            bool excludePropertyErrors,
+            bool clientValidationEnabled,
+            string expected,
+            string ignored)
+        {
+            // Arrange
+            var model = new ValidationModel();
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            html.ViewContext.ClientValidationEnabled = clientValidationEnabled;
+            html.ViewData.TemplateInfo.HtmlFieldPrefix = "this.is.my.prefix";
+            html.ViewData.ModelState.AddModelError("this.is.my.prefix", "This is my validation message");
+
+            // Act
+            var result = html.ValidationSummary(
+                excludePropertyErrors,
+                message: null,
+                htmlAttributes: null,
+                tag: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Theory]
+        [MemberData(nameof(OneErrorValidationSummaryData))]
+        public void ValidationSummary_OneInvalidProperty_ReturnsExpectedDiv(
+            bool excludePropertyErrors,
+            bool clientValidationEnabled,
+            string ignored,
+            string expected)
+        {
+            // Arrange
+            var model = new ValidationModel();
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            html.ViewContext.ClientValidationEnabled = clientValidationEnabled;
+            html.ViewData.ModelState.AddModelError("Property1", "This is my validation message");
+
+            // Act
+            var result = html.ValidationSummary(
+                excludePropertyErrors,
+                message: null,
+                htmlAttributes: null,
+                tag: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Theory]
+        [MemberData(nameof(MultipleErrorsValidationSummaryData))]
+        public void ValidationSummary_MultipleErrors_ReturnsExpectedDiv(
+            bool excludePropertyErrors,
+            string prefix,
+            string expected)
+        {
+            // Arrange
+            var model = new ValidationModel();
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            html.ViewData.TemplateInfo.HtmlFieldPrefix = prefix;
+            AddMultipleErrors(html.ViewData.ModelState);
+
+            // Act
+            var result = html.ValidationSummary(
+                excludePropertyErrors,
+                message: null,
+                htmlAttributes: null,
+                tag: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void ValidationSummary_OrdersCorrectlyWhenElementsAreRemovedFromDictionary()
+        {
+            // Arrange
+            var expected = "<div class=\"HtmlEncode[[validation-summary-errors]]\" data-valmsg-summary=\"HtmlEncode[[true]]\"><ul>" +
+                "<li>HtmlEncode[[New error for Property2.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[This is an error for Property3.OrderedProperty3.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[This is an error for Property3.Property2.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[This is an error for the model root.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[This is another error for the model root.]]</li>" + Environment.NewLine +
+                "</ul></div>";
+            var model = new ValidationModel();
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            AddMultipleErrors(html.ViewData.ModelState);
+            html.ViewData.ModelState.RemoveAll<ValidationModel>(m => m.Property2);
+            html.ViewData.ModelState.Remove<ValidationModel>(m => m.Property3);
+            html.ViewData.ModelState.Remove<ValidationModel>(m => m.Property3.OrderedProperty2);
+            html.ViewData.ModelState.AddModelError("Property2", "New error for Property2.");
+
+            // Act
+            var result = html.ValidationSummary(
+                excludePropertyErrors: false,
+                message: null,
+                htmlAttributes: null,
+                tag: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void ValidationSummary_IncludesErrorsThatAreNotPartOfMetadata()
+        {
+            // Arrange
+            var expected = "<div class=\"HtmlEncode[[validation-summary-errors]]\" data-valmsg-summary=\"HtmlEncode[[true]]\"><ul>" +
+                "<li>HtmlEncode[[This is an error for Property2.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[This is another error for Property2.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[The value '' is not valid for Property2.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[This is an error for Property3.OrderedProperty3.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[This is an error for Property3.OrderedProperty2.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[This is an error for Property3.Property2.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[This is an error for Property3.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[This is an error for the model root.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[This is another error for the model root.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[non-existent-error1]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[non-existent-error2]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[non-existent-error3]]</li>" + Environment.NewLine +
+                "</ul></div>";
+            var model = new ValidationModel();
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            AddMultipleErrors(html.ViewData.ModelState);
+            html.ViewData.ModelState.AddModelError("non-existent-property1", "non-existent-error1");
+            html.ViewData.ModelState.AddModelError("non.existent.property2", "non-existent-error2");
+            html.ViewData.ModelState.AddModelError("non.existent[0].property3", "non-existent-error3");
+
+            // Act
+            var result = html.ValidationSummary(
+                excludePropertyErrors: false,
+                message: null,
+                htmlAttributes: null,
+                tag: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void ValidationSummary_IncludesErrorsForCollectionProperties()
+        {
+            // Arrange
+            var expected = "<div class=\"HtmlEncode[[validation-summary-errors]]\" data-valmsg-summary=\"HtmlEncode[[true]]\"><ul>" +
+               "<li>HtmlEncode[[Property1 error]]</li>" + Environment.NewLine +
+               "<li>HtmlEncode[[Property2[0].OrderedProperty1 error]]</li>" + Environment.NewLine +
+               "<li>HtmlEncode[[Property2[0].Property1 error]]</li>" + Environment.NewLine +
+               "<li>HtmlEncode[[Property2[2].Property3 error]]</li>" + Environment.NewLine +
+               "<li>HtmlEncode[[Property2[10].Property2 error]]</li>" + Environment.NewLine +
+               "</ul></div>";
+            var model = new ModelWithCollection();
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            html.ViewData.ModelState.AddModelError("Property1", "Property1 error");
+            html.ViewData.ModelState.AddModelError("Property2[0].OrderedProperty1", "Property2[0].OrderedProperty1 error");
+            html.ViewData.ModelState.AddModelError("Property2[10].Property2", "Property2[10].Property2 error");
+            html.ViewData.ModelState.AddModelError("Property2[2].Property3", "Property2[2].Property3 error");
+            html.ViewData.ModelState.AddModelError("Property2[0].Property1", "Property2[0].Property1 error");
+
+            // Act
+            var result = html.ValidationSummary(
+                excludePropertyErrors: false,
+                message: null,
+                htmlAttributes: null,
+                tag: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void ValidationSummary_IncludesErrorsForTopLevelCollectionProperties()
+        {
+            // Arrange
+            var expected = "<div class=\"HtmlEncode[[validation-summary-errors]]\" data-valmsg-summary=\"HtmlEncode[[true]]\"><ul>" +
+               "<li>HtmlEncode[[[0].OrderedProperty2 error]]</li>" + Environment.NewLine +
+               "<li>HtmlEncode[[[0].OrderedProperty1 error]]</li>" + Environment.NewLine +
+               "<li>HtmlEncode[[[0].Property1 error]]</li>" + Environment.NewLine +
+               "<li>HtmlEncode[[[2].OrderedProperty3 error]]</li>" + Environment.NewLine +
+               "<li>HtmlEncode[[[2].Property3 error]]</li>" + Environment.NewLine +
+               "</ul></div>";
+            var model = new OrderedModel[5];
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            html.ViewData.ModelState.AddModelError("[0].OrderedProperty2", "[0].OrderedProperty2 error");
+            html.ViewData.ModelState.AddModelError("[0].Property1", "[0].Property1 error");
+            html.ViewData.ModelState.AddModelError("[0].OrderedProperty1", "[0].OrderedProperty1 error");
+            html.ViewData.ModelState.AddModelError("[2].Property3", "[2].Property3 error");
+            html.ViewData.ModelState.AddModelError("[2].OrderedProperty3", "[2].OrderedProperty3 error");
+
+            // Act
+            var result = html.ValidationSummary(
+                excludePropertyErrors: false,
+                message: null,
+                htmlAttributes: null,
+                tag: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void ValidationSummary_IncludesErrorsForPropertiesOnCollectionTypes()
+        {
+            // Arrange
+            var expected = "<div class=\"HtmlEncode[[validation-summary-errors]]\" data-valmsg-summary=\"HtmlEncode[[true]]\"><ul>" +
+               "<li>HtmlEncode[[[0].OrderedProperty2 error]]</li>" + Environment.NewLine +
+               "<li>HtmlEncode[[[0].OrderedProperty1 error]]</li>" + Environment.NewLine +
+               "<li>HtmlEncode[[[0].Property1 error]]</li>" + Environment.NewLine +
+               "<li>HtmlEncode[[[2].OrderedProperty3 error]]</li>" + Environment.NewLine +
+               "<li>HtmlEncode[[[2].Property3 error]]</li>" + Environment.NewLine +
+               "<li>HtmlEncode[[OrderedProperty1 error]]</li>" + Environment.NewLine +
+               "<li>HtmlEncode[[OrderedProperty2 error]]</li>" + Environment.NewLine +
+               "</ul></div>";
+            var model = new OrderedModel[5];
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            html.ViewData.ModelState.AddModelError("[0].OrderedProperty2", "[0].OrderedProperty2 error");
+            html.ViewData.ModelState.AddModelError("[0].Property1", "[0].Property1 error");
+            html.ViewData.ModelState.AddModelError("[0].OrderedProperty1", "[0].OrderedProperty1 error");
+            html.ViewData.ModelState.AddModelError("[2].Property3", "[2].Property3 error");
+            html.ViewData.ModelState.AddModelError("[2].OrderedProperty3", "[2].OrderedProperty3 error");
+            html.ViewData.ModelState.AddModelError("OrderedProperty1", "OrderedProperty1 error");
+            html.ViewData.ModelState.AddModelError("OrderedProperty2", "OrderedProperty2 error");
+
+            // Act
+            var result = html.ValidationSummary(
+                excludePropertyErrors: false,
+                message: null,
+                htmlAttributes: null,
+                tag: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void ValidationSummary_ErrorsInModelUsingOrder_SortsErrorsAsExpected()
+        {
+            // Arrange
+            var expected = "<div class=\"HtmlEncode[[validation-summary-errors]]\" data-valmsg-summary=\"HtmlEncode[[true]]\"><ul>" +
+                "<li>HtmlEncode[[This is an error for OrderedProperty3.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[This is an error for OrderedProperty2.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[This is another error for OrderedProperty2.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[This is yet-another error for OrderedProperty2.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[This is an error for OrderedProperty1.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[This is an error for Property3.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[This is an error for Property1.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[This is another error for Property1.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[This is an error for Property2.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[This is another error for Property2.]]</li>" + Environment.NewLine +
+                "<li>HtmlEncode[[This is an error for LastProperty.]]</li>" + Environment.NewLine +
+                "</ul></div>";
+
+            var model = new OrderedModel();
+            var html = DefaultTemplatesUtilities.GetHtmlHelper(model);
+            AddOrderedErrors(html.ViewData.ModelState);
+
+            // Act
+            var result = html.ValidationSummary(
+                excludePropertyErrors: false,
+                message: null,
+                htmlAttributes: null,
+                tag: null);
+
+            // Assert
+            Assert.Equal(expected, HtmlContentUtilities.HtmlContentToString(result));
+        }
+
+        [Fact]
+        public void ValidationSummary_UsesValuesFromModelState()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            helper.ViewData.ModelState.AddModelError("Property1", "Error for Property1");
+
+            // Act
+            var validationSummaryResult = helper.ValidationSummary();
+
+            // Assert
+            Assert.Equal(
+                "<div class=\"HtmlEncode[[validation-summary-errors]]\" data-valmsg-summary=\"HtmlEncode[[true]]\">" +
+                "<ul><li>HtmlEncode[[Error for Property1]]</li>" + Environment.NewLine +
+                "</ul></div>",
+                HtmlContentUtilities.HtmlContentToString(validationSummaryResult));
+        }
+
+        [Fact]
+        public void ValidationSummary_ExcludesPropertyErrors()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            helper.ViewData.ModelState.AddModelError("Property1", "Error for Property1");
+
+            // Act
+            var validationSummaryResult = helper.ValidationSummary(excludePropertyErrors: true);
+
+            // Assert
+            Assert.Equal(HtmlString.Empty, validationSummaryResult);
+        }
+
+        [Fact]
+        public void ValidationSummary_UsesSpecifiedMessage()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            helper.ViewData.ModelState.AddModelError("Property1", "Error for Property1");
+
+            // Act
+            var validationSummaryResult = helper.ValidationSummary(message: "Custom Message");
+
+            // Assert
+            Assert.Equal(
+                "<div class=\"HtmlEncode[[validation-summary-errors]]\" data-valmsg-summary=\"HtmlEncode[[true]]\">" +
+                "<span>HtmlEncode[[Custom Message]]</span>" + Environment.NewLine +
+                "<ul><li>HtmlEncode[[Error for Property1]]</li>" + Environment.NewLine +
+                "</ul></div>",
+                HtmlContentUtilities.HtmlContentToString(validationSummaryResult));
+        }
+
+        [Fact]
+        public void ValidationSummary_UsesSpecifiedTag()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            helper.ViewData.ModelState.AddModelError("Property1", "Error for Property1");
+
+            // Act
+            var validationSummaryResult = helper.ValidationSummary(message: "Custom Message", tag: "div");
+
+            // Assert
+            Assert.Equal(
+                "<div class=\"HtmlEncode[[validation-summary-errors]]\" data-valmsg-summary=\"HtmlEncode[[true]]\">" +
+                "<div>HtmlEncode[[Custom Message]]</div>" + Environment.NewLine +
+                "<ul><li>HtmlEncode[[Error for Property1]]</li>" + Environment.NewLine +
+                "</ul></div>",
+                HtmlContentUtilities.HtmlContentToString(validationSummaryResult));
+        }
+
+        [Fact]
+        public void ValidationSummary_UsesSpecifiedMessageAndExcludesPropertyErrors()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            helper.ViewData.ModelState.AddModelError(string.Empty, "Error for root");
+            helper.ViewData.ModelState.AddModelError("Property1", "Error for Property1");
+
+            // Act
+            var validationSummaryResult = helper.ValidationSummary(excludePropertyErrors: true, message: "Custom Message");
+
+            // Assert
+            Assert.Equal(
+                "<div class=\"HtmlEncode[[validation-summary-errors]]\"><span>HtmlEncode[[Custom Message]]</span>" +
+                Environment.NewLine +
+                "<ul><li>HtmlEncode[[Error for root]]</li>" + Environment.NewLine +
+                "</ul></div>",
+                HtmlContentUtilities.HtmlContentToString(validationSummaryResult));
+        }
+
+        [Fact]
+        public void ValidationSummary_UsesSpecifiedHtmlAttributes()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            helper.ViewData.ModelState.AddModelError("Property1", "Error for Property1");
+
+            // Act
+            var validationSummaryResult = helper.ValidationSummary(message: "Custom Message", htmlAttributes: new { attr = "value" });
+
+            // Assert
+            Assert.Equal(
+                "<div attr=\"HtmlEncode[[value]]\" class=\"HtmlEncode[[validation-summary-errors]]\" data-valmsg-summary=\"HtmlEncode[[true]]\">" +
+                "<span>HtmlEncode[[Custom Message]]</span>" + Environment.NewLine +
+                "<ul><li>HtmlEncode[[Error for Property1]]</li>" + Environment.NewLine +
+                "</ul></div>",
+                HtmlContentUtilities.HtmlContentToString(validationSummaryResult));
+        }
+
+        [Fact]
+        public void ValidationSummary_UsesSpecifiedHtmlAttributesAndTag()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            helper.ViewData.ModelState.AddModelError("Property1", "Error for Property1");
+
+            // Act
+            var validationSummaryResult = helper.ValidationSummary(message: "Custom Message", htmlAttributes: new { attr = "value" }, tag: "div");
+
+            // Assert
+            Assert.Equal(
+                "<div attr=\"HtmlEncode[[value]]\" class=\"HtmlEncode[[validation-summary-errors]]\" data-valmsg-summary=\"HtmlEncode[[true]]\">" +
+                "<div>HtmlEncode[[Custom Message]]</div>" + Environment.NewLine +
+                "<ul><li>HtmlEncode[[Error for Property1]]</li>" + Environment.NewLine +
+                "</ul></div>",
+                HtmlContentUtilities.HtmlContentToString(validationSummaryResult));
+        }
+
+        [Fact]
+        public void ValidationSummary_UsesSpecifiedUsesSpecifiedTagAndExcludesPropertyErrors()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            helper.ViewData.ModelState.AddModelError(string.Empty, "Error for root");
+            helper.ViewData.ModelState.AddModelError("Property1", "Error for Property1");
+
+            // Act
+            var validationSummaryResult = helper.ValidationSummary(excludePropertyErrors: true, message: "Custom Message", tag: "div");
+
+            // Assert
+            Assert.Equal(
+                "<div class=\"HtmlEncode[[validation-summary-errors]]\"><div>HtmlEncode[[Custom Message]]</div>" +
+                Environment.NewLine +
+                "<ul><li>HtmlEncode[[Error for root]]</li>" + Environment.NewLine +
+                "</ul></div>",
+                HtmlContentUtilities.HtmlContentToString(validationSummaryResult));
+        }
+
+        [Fact]
+        public void ValidationSummary_UsesSpecifiedUsesSpecifiedHtmlAttributesAndExcludesPropertyErrors()
+        {
+            // Arrange
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper();
+            helper.ViewData.ModelState.AddModelError(string.Empty, "Error for root");
+            helper.ViewData.ModelState.AddModelError("Property1", "Error for Property1");
+
+            // Act
+            var validationSummaryResult = helper.ValidationSummary(
+                excludePropertyErrors: true,
+                message: "Custom Message",
+                htmlAttributes: new { attr = "value" });
+
+            // Assert
+            Assert.Equal(
+                "<div attr=\"HtmlEncode[[value]]\" class=\"HtmlEncode[[validation-summary-errors]]\"><span>HtmlEncode[[Custom Message]]</span>" +
+                Environment.NewLine +
+                "<ul><li>HtmlEncode[[Error for root]]</li>" + Environment.NewLine +
+                "</ul></div>",
+                HtmlContentUtilities.HtmlContentToString(validationSummaryResult));
+        }
+
+        // Adds errors for various parts of the model, including the root.
+        private void AddMultipleErrors(ModelStateDictionary modelState)
+        {
+            modelState.AddModelError("Property3.Property2", "This is an error for Property3.Property2.");
+            modelState.AddModelError("Property3.OrderedProperty3", "This is an error for Property3.OrderedProperty3.");
+            modelState.AddModelError("Property3.OrderedProperty2", "This is an error for Property3.OrderedProperty2.");
+            modelState.SetModelValue("Property3.Empty", rawValue: null, attemptedValue: null);
+            modelState.MarkFieldValid("Property3.Empty");
+
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(ValidationModel), nameof(ValidationModel.Property3));
+            modelState.AddModelError("Property3", "This is an error for Property3.");
+            modelState.AddModelError("Property3", new InvalidCastException("Exception will be ignored."), metadata);
+
+            metadata = provider.GetMetadataForProperty(typeof(ValidationModel), nameof(ValidationModel.Property2));
+            modelState.AddModelError("Property2", "This is an error for Property2.");
+            modelState.AddModelError("Property2", "This is another error for Property2.");
+            modelState.AddModelError("Property2", new OverflowException("Produces invalid value message"), metadata);
+
+            metadata = provider.GetMetadataForType(typeof(ValidationModel));
+            modelState.AddModelError(string.Empty, "This is an error for the model root.");
+            modelState.AddModelError(string.Empty, "This is another error for the model root.");
+            modelState.AddModelError(string.Empty, new InvalidOperationException("Another ignored Exception."), metadata);
+        }
+
+        // Adds one or more errors for all properties in OrderedModel. But adds errors out of order.
+        private void AddOrderedErrors(ModelStateDictionary modelState)
+        {
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(OrderedModel), nameof(OrderedModel.Property3));
+            modelState.AddModelError("Property3", "This is an error for Property3.");
+            modelState.AddModelError("Property3", new InvalidCastException("An ignored Exception."), metadata);
+
+            modelState.AddModelError("Property2", "This is an error for Property2.");
+            modelState.AddModelError("Property2", "This is another error for Property2.");
+
+            modelState.AddModelError("OrderedProperty3", "This is an error for OrderedProperty3.");
+
+            modelState.AddModelError("OrderedProperty2", "This is an error for OrderedProperty2.");
+            modelState.AddModelError("OrderedProperty2", "This is another error for OrderedProperty2.");
+
+            modelState.AddModelError("LastProperty", "This is an error for LastProperty.");
+
+            modelState.AddModelError("Property1", "This is an error for Property1.");
+            modelState.AddModelError("Property1", "This is another error for Property1.");
+
+            modelState.AddModelError("OrderedProperty1", "This is an error for OrderedProperty1.");
+            modelState.AddModelError("OrderedProperty2", "This is yet-another error for OrderedProperty2.");
+
+            modelState.SetModelValue("Empty", rawValue: null, attemptedValue: null);
+            modelState.MarkFieldValid("Empty");
+        }
+
+        private class ValidationModel
+        {
+            public string Property1 { get; set; }
+
+            public string Property2 { get; set; }
+
+            public OrderedModel Property3 { get; set; }
+        }
+
+        private class OrderedModel
+        {
+            [Display(Order = 10001)]
+            public string LastProperty { get; set; }
+
+            public string Property3 { get; set; }
+            public string Property1 { get; set; }
+            public string Property2 { get; set; }
+
+            [Display(Order = 23)]
+            public string OrderedProperty3 { get; set; }
+            [Display(Order = 23)]
+            public string OrderedProperty2 { get; set; }
+            [Display(Order = 23)]
+            public string OrderedProperty1 { get; set; }
+
+            // Exists to ensure #4989 does not regress. Issue specific to case where collection has a ModelStateEntry
+            // but no element does.
+            public byte[] Empty { get; set; }
+        }
+
+        private class ModelWithCollection
+        {
+            public string Property1 { get; set; }
+
+            public List<OrderedModel> Property2 { get; set; }
+        }
+
+        private class CollectionType : Collection<OrderedModel>
+        {
+            [Display(Order = 1)]
+            public string OrderedProperty2 { get; set; }
+
+            [Display(Order = 2)]
+            public string OrderedProperty1 { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueExtensionsTest.cs
new file mode 100644
index 0000000000..f1776922a9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueExtensionsTest.cs
@@ -0,0 +1,77 @@
+// 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.
+
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public class HtmlHelperValueExtensionsTest
+    {
+        [Fact]
+        public void Value_ReturnsModelValue()
+        {
+            // Arrange
+            var model = new SomeModel { SomeProperty = "ModelValue" };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+
+            // Act
+            var result = helper.Value("SomeProperty");
+
+            // Assert
+            Assert.Equal("ModelValue", result);
+        }
+
+        [Fact]
+        public void ValueFor_ReturnsModelValue()
+        {
+            // Arrange
+            var model = new SomeModel { SomeProperty = "ModelValue" };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+
+            // Act
+            var result = helper.ValueFor(m => m.SomeProperty);
+
+            // Assert
+            Assert.Equal("ModelValue", result);
+        }
+
+        [Fact]
+        public void ValueForModel_ReturnsModelValue()
+        {
+            // Arrange
+            var model = new SomeModel { SomeProperty = "ModelValue" };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+
+            // Act
+            var result = helper.ValueForModel();
+
+            // Assert
+            Assert.Equal("{ SomeProperty = ModelValue }", result);
+        }
+
+        [Fact]
+        public void ValueForModel_ReturnsModelValueWithSpecificFormat()
+        {
+            // Arrange
+            var model = new SomeModel { SomeProperty = "ModelValue" };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper(model);
+
+            // Act
+            var result = helper.ValueForModel(format: "-{0}-");
+
+            // Assert
+            Assert.Equal("-{ SomeProperty = ModelValue }-", result);
+        }
+
+        private class SomeModel
+        {
+            public string SomeProperty { get; set; }
+
+            public override string ToString()
+            {
+                return string.Format(
+                    "{{ SomeProperty = {0} }}", SomeProperty ?? "(null)");
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueTest.cs
new file mode 100644
index 0000000000..629a380865
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueTest.cs
@@ -0,0 +1,263 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Test the <see cref="IHtmlHelper.Value" /> and <see cref="IHtmlHelper{TModel}.ValueFor"/> methods.
+    /// </summary>
+    public class HtmlHelperValueTest
+    {
+        // Value
+
+        [Fact]
+        public void ValueNotInTemplate_GetsValueFromViewData()
+        {
+            // Arrange
+            var helper = GetHtmlHelper();
+
+            // Act
+            var html = helper.Value("StringProperty", format: null);
+
+            // Assert
+            Assert.Equal("ViewDataValue", html);
+        }
+
+        [Fact]
+        public void ValueInTemplate_GetsValueFromPrefixedViewDataEntry()
+        {
+            // Arrange
+            var helper = GetHtmlHelper();
+            helper.ViewData["Prefix.StringProperty"] = "PrefixedViewDataValue";
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Prefix";
+
+            // Act
+            var html = helper.Value("StringProperty", format: null);
+
+            // Assert
+            Assert.Equal("PrefixedViewDataValue", html);
+        }
+
+        [Fact]
+        public void ValueNotInTemplate_GetsValueFromPropertyOfViewDataEntry()
+        {
+            // Arrange
+            var helper = GetHtmlHelper();
+            helper.ViewData["Prefix"] = new { StringProperty = "ContainedViewDataValue" };
+
+            // Act
+            var html = helper.Value("Prefix.StringProperty", format: null);
+
+            // Assert
+            Assert.Equal("ContainedViewDataValue", html);
+        }
+
+        [Fact]
+        public void ValueInTemplate_GetsValueFromPropertyOfViewDataEntry()
+        {
+            // Arrange
+            var helper = GetHtmlHelper();
+            helper.ViewData["Prefix"] = new { StringProperty = "ContainedViewDataValue" };
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Prefix";
+
+            // Act
+            var html = helper.Value("StringProperty", format: null);
+
+            // Assert
+            Assert.Equal("ContainedViewDataValue", html);
+        }
+
+        [Fact]
+        public void ValueNotInTemplate_GetsValueFromModel_IfNoViewDataEntry()
+        {
+            // Arrange
+            var helper = GetHtmlHelper();
+            helper.ViewData.Clear();
+
+            // Act
+            var html = helper.Value("StringProperty", format: null);
+
+            // Assert
+            Assert.Equal("ModelStringPropertyValue", html);
+        }
+
+        [Fact]
+        public void ValueInTemplate_GetsValueFromModel_IfNoViewDataEntry()
+        {
+            // Arrange
+            var helper = GetHtmlHelper();
+            helper.ViewData.Clear();
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Prefix";
+
+            // Act
+            var html = helper.Value("StringProperty", format: null);
+
+            // Assert
+            Assert.Equal("ModelStringPropertyValue", html);
+        }
+
+        [Fact]
+        public void ValueNotInTemplate_GetsValueFromViewData_EvenIfNull()
+        {
+            // Arrange
+            var helper = GetHtmlHelper();
+            helper.ViewData["StringProperty"] = null;
+
+            // Act
+            var html = helper.Value("StringProperty", format: null);
+
+            // Assert
+            Assert.Empty(html);
+        }
+
+        [Fact]
+        public void ValueInTemplate_GetsValueFromViewData_EvenIfNull()
+        {
+            // Arrange
+            var helper = GetHtmlHelper();
+            helper.ViewData["Prefix.StringProperty"] = null;
+            helper.ViewData.TemplateInfo.HtmlFieldPrefix = "Prefix";
+
+            // Act
+            var html = helper.Value("StringProperty", format: null);
+
+            // Assert
+            Assert.Empty(html);
+        }
+
+        // ValueFor
+
+        [Fact]
+        public void ValueForGetsExpressionValueFromViewDataModel()
+        {
+            // Arrange
+            var helper = GetHtmlHelper();
+
+            // Act
+            var html = helper.ValueFor(m => m.StringProperty, format: null);
+
+            // Assert
+            Assert.Equal("ModelStringPropertyValue", html);
+        }
+
+        // All Value Helpers including ValueForModel
+
+        [Fact]
+        public void ValueHelpersWithErrorsGetValueFromModelState()
+        {
+            // Arrange
+            var model = new TestModel()
+            {
+                StringProperty = "ModelStringPropertyValue",
+                ObjectProperty = "ModelObjectPropertyValue",
+            };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<TestModel>(model);
+            var viewData = helper.ViewData;
+            viewData["StringProperty"] = "ViewDataValue";
+            viewData.TemplateInfo.HtmlFieldPrefix = "FieldPrefix";
+
+            viewData.ModelState.SetModelValue(
+                "FieldPrefix.StringProperty",
+                "StringPropertyRawValue",
+                "StringPropertyAttemptedValue");
+
+            viewData.ModelState.SetModelValue(
+                "FieldPrefix",
+                "ModelRawValue",
+                "ModelAttemptedValue");
+
+            // Act & Assert
+            Assert.Equal("StringPropertyRawValue", helper.Value("StringProperty", format: null));
+            Assert.Equal("StringPropertyRawValue", helper.ValueFor(m => m.StringProperty, format: null));
+            Assert.Equal("ModelRawValue", helper.ValueForModel(format: null));
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void ValueHelpersWithEmptyNameConvertModelValueUsingCurrentCulture()
+        {
+            // Arrange
+            var helper = GetHtmlHelper();
+            var expectedModelValue =
+                "{ StringProperty = ModelStringPropertyValue, ObjectProperty = 01/01/1900 00:00:00 }";
+
+            // Act & Assert
+            Assert.Equal(expectedModelValue, helper.Value(expression: string.Empty, format: null));
+            Assert.Equal(expectedModelValue, helper.Value(expression: null, format: null)); // null is another alias for current model
+            Assert.Equal(expectedModelValue, helper.ValueFor(m => m, format: null));
+            Assert.Equal(expectedModelValue, helper.ValueForModel(format: null));
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void ValueHelpersFormatValue()
+        {
+            // Arrange
+            var helper = GetHtmlHelper();
+            var expectedModelValue =
+                "-{ StringProperty = ModelStringPropertyValue, ObjectProperty = 01/01/1900 00:00:00 }-";
+            var expectedObjectPropertyValue = "-01/01/1900 00:00:00-";
+
+            // Act & Assert
+            Assert.Equal(expectedModelValue, helper.ValueForModel("-{0}-"));
+            Assert.Equal(expectedObjectPropertyValue, helper.Value("ObjectProperty", "-{0}-"));
+            Assert.Equal(expectedObjectPropertyValue, helper.ValueFor(m => m.ObjectProperty, "-{0}-"));
+        }
+
+        [Fact]
+        public void ValueHelpersDoNotEncodeValue()
+        {
+            // Arrange
+            var model = new TestModel { StringProperty = "ModelStringPropertyValue <\"\">" };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<TestModel>(model);
+            var viewData = helper.ViewData;
+            viewData["StringProperty"] = "ViewDataValue <\"\">";
+
+            viewData.ModelState.SetModelValue(
+                "ObjectProperty",
+                "ObjectPropertyRawValue <\"\">",
+                "ObjectPropertyAttemptedValue <\"\">");
+
+            // Act & Assert
+            Assert.Equal(
+                "<{ StringProperty = ModelStringPropertyValue <\"\">, ObjectProperty = (null) }>",
+                helper.ValueForModel("<{0}>"));
+            Assert.Equal("<ViewDataValue <\"\">>", helper.Value("StringProperty", "<{0}>"));
+            Assert.Equal("<ModelStringPropertyValue <\"\">>", helper.ValueFor(m => m.StringProperty, "<{0}>"));
+            Assert.Equal("ObjectPropertyRawValue <\"\">", helper.ValueFor(m => m.ObjectProperty, format: null));
+        }
+
+        private sealed class TestModel
+        {
+            public string StringProperty { get; set; }
+            public object ObjectProperty { get; set; }
+
+            public override string ToString()
+            {
+                return string.Format(
+                    "{{ StringProperty = {0}, ObjectProperty = {1} }}",
+                    StringProperty ?? "(null)",
+                    ObjectProperty ?? "(null)");
+            }
+        }
+
+        private static HtmlHelper<TestModel> GetHtmlHelper()
+        {
+            var model = new TestModel
+            {
+                StringProperty = "ModelStringPropertyValue",
+                ObjectProperty = new DateTime(1900, 1, 1, 0, 0, 0),
+            };
+            var helper = DefaultTemplatesUtilities.GetHtmlHelper<TestModel>(model);
+            helper.ViewData["StringProperty"] = "ViewDataValue";
+
+            return helper;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlStringTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlStringTest.cs
new file mode 100644
index 0000000000..0d471eba0e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlStringTest.cs
@@ -0,0 +1,66 @@
+// 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.
+
+using System.IO;
+using Microsoft.AspNetCore.Html;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public class HtmlStringTest
+    {
+        [Fact]
+        public void WriteTo_WritesToTheSpecifiedWriter()
+        {
+            // Arrange
+            var expectedText = "Some Text";
+            var content = new HtmlString(expectedText);
+            var writer = new StringWriter();
+
+            // Act
+            content.WriteTo(writer, new HtmlTestEncoder());
+
+            // Assert
+            Assert.Equal(expectedText, writer.ToString());
+            writer.Dispose();
+        }
+
+        [Fact]
+        public void FromEncodedText_DoesNotEncodeOnWrite()
+        {
+            // Arrange
+            var expectedText = "Hello";
+
+            // Act
+            var content = new HtmlString(expectedText);
+
+            // Assert
+            Assert.Equal(expectedText, content.ToString());
+        }
+
+        [Fact]
+        public void Empty_ReturnsEmptyString()
+        {
+            // Arrange & Act
+            var content = HtmlString.Empty;
+
+            // Assert
+            Assert.Equal(string.Empty, content.ToString());
+        }
+
+        [Fact]
+        public void ToString_ReturnsText()
+        {
+            // Arrange
+            var expectedText = "Hello";
+            var content = new HtmlString(expectedText);
+
+            // Act
+            var result = content.ToString();
+
+            // Assert
+            Assert.Equal(expectedText, result);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/TagBuilderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/TagBuilderTest.cs
new file mode 100644
index 0000000000..ce76a6c786
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/TagBuilderTest.cs
@@ -0,0 +1,258 @@
+// 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.
+
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Core.Rendering
+{
+    public class TagBuilderTest
+    {
+        public static TheoryData<TagRenderMode, string> RenderingTestingData
+        {
+            get
+            {
+                return new TheoryData<TagRenderMode, string>
+                {
+                    { TagRenderMode.StartTag, "<p>" },
+                    { TagRenderMode.SelfClosing, "<p />" },
+                    { TagRenderMode.Normal, "<p></p>" }
+                };
+            }
+        }
+
+        [Theory]
+        [InlineData(false, "Hello", "World")]
+        [InlineData(true, "hello", "something else")]
+        public void MergeAttribute_IgnoresCase(bool replaceExisting, string expectedKey, string expectedValue)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder("p");
+            tagBuilder.Attributes.Add("Hello", "World");
+
+            // Act
+            tagBuilder.MergeAttribute("hello", "something else", replaceExisting);
+
+            // Assert
+            var attribute = Assert.Single(tagBuilder.Attributes);
+            Assert.Equal(new KeyValuePair<string, string>(expectedKey, expectedValue), attribute);
+        }
+
+        [Fact]
+        public void AddCssClass_IgnoresCase()
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder("p");
+            tagBuilder.Attributes.Add("ClaSs", "btn");
+
+            // Act
+            tagBuilder.AddCssClass("success");
+
+            // Assert
+            var attribute = Assert.Single(tagBuilder.Attributes);
+            Assert.Equal(new KeyValuePair<string, string>("class", "success btn"), attribute);
+        }
+
+        [Fact]
+        public void GenerateId_IgnoresCase()
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder("p");
+            tagBuilder.Attributes.Add("ID", "something");
+
+            // Act
+            tagBuilder.GenerateId("else", invalidCharReplacement: "-");
+
+            // Assert
+            var attribute = Assert.Single(tagBuilder.Attributes);
+            Assert.Equal(new KeyValuePair<string, string>("ID", "something"), attribute);
+        }
+
+        [Theory]
+        [MemberData(nameof(RenderingTestingData))]
+        public void WriteTo_IgnoresIdAttributeCase(TagRenderMode renderingMode, string expectedOutput)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder("p");
+            // An empty value id attribute should not be rendered via ToString.
+            tagBuilder.Attributes.Add("ID", string.Empty);
+            tagBuilder.TagRenderMode = renderingMode;
+
+            // Act
+            using (var writer = new StringWriter())
+            {
+                tagBuilder.WriteTo(writer, new HtmlTestEncoder());
+
+                // Assert
+                Assert.Equal(expectedOutput, writer.ToString());
+            }
+        }
+
+        [Theory]
+        [InlineData(null, "")]
+        [InlineData("", "")]
+        [InlineData("a", "a")]
+        [InlineData("0", "z")]
+        [InlineData("-", "z")]
+        [InlineData(",", "z")]
+        [InlineData("00Hello,World", "z0Hello-World")]
+        [InlineData(",,Hello,,World,,", "z-Hello--World--")]
+        [InlineData("-_:Hello-_:Hello-_:", "z_:Hello-_:Hello-_:")]
+        [InlineData("HelloWorld", "HelloWorld")]
+        [InlineData("�HelloWorld", "zHelloWorld")]
+        [InlineData("Hello�World", "Hello-World")]
+        public void CreateSanitizedIdCreatesId(string input, string output)
+        {
+            // Arrange
+            var result = TagBuilder.CreateSanitizedId(input, "-");
+
+            // Assert
+            Assert.Equal(output, result);
+        }
+
+        [Theory]
+        [InlineData("attribute", "value", "<p attribute=\"HtmlEncode[[value]]\"></p>")]
+        [InlineData("attribute", null, "<p attribute=\"\"></p>")]
+        [InlineData("attribute", "", "<p attribute=\"\"></p>")]
+        public void WriteTo_WriteEmptyAttribute_WhenValueIsNullOrEmpty(
+            string attributeKey,
+            string attributeValue,
+            string expectedOutput)
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder("p");
+
+            // Act
+            tagBuilder.Attributes.Add(attributeKey, attributeValue);
+
+            // Assert
+            using (var writer = new StringWriter())
+            {
+                tagBuilder.WriteTo(writer, new HtmlTestEncoder());
+                Assert.Equal(expectedOutput, writer.ToString());
+            }
+        }
+
+        [Fact]
+        public void WriteTo_IncludesInnerHtml()
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder("p");
+            tagBuilder.InnerHtml.AppendHtml("<span>Hello</span>");
+            tagBuilder.InnerHtml.Append(", World!");
+
+            // Act
+            using (var writer = new StringWriter())
+            {
+                tagBuilder.WriteTo(writer, new HtmlTestEncoder());
+
+                // Assert
+                Assert.Equal("<p><span>Hello</span>HtmlEncode[[, World!]]</p>", writer.ToString());
+            }
+
+            Assert.True(tagBuilder.HasInnerHtml);
+        }
+
+        [Fact]
+        public void ReadingInnerHtml_LeavesHasInnerHtmlFalse()
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder("p");
+
+            // Act
+            var innerHtml = tagBuilder.InnerHtml;
+
+            // Assert
+            Assert.False(tagBuilder.HasInnerHtml);
+            Assert.NotNull(innerHtml);
+        }
+
+        [Fact]
+        public void RenderStartTag_RendersExpectedStartTag()
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder("p");
+
+            // Act
+            var tag = tagBuilder.RenderStartTag();
+
+            // Assert
+            Assert.Equal("<p>", HtmlContentUtilities.HtmlContentToString(tag));
+        }
+
+        [Fact]
+        public void RenderStartTag_RendersExpectedStartTag_TagBuilderRendersAsExpected()
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder("p");
+            tagBuilder.TagRenderMode = TagRenderMode.EndTag;
+
+            // Act
+            var tag = tagBuilder.RenderStartTag();
+
+            // Assert
+            Assert.Equal("<p>", HtmlContentUtilities.HtmlContentToString(tag));
+            Assert.Equal("</p>", HtmlContentUtilities.HtmlContentToString(tagBuilder));
+        }
+
+        [Fact]
+        public void RenderEndTag_RendersExpectedEndTag()
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder("p");
+
+            // Act
+            var tag = tagBuilder.RenderEndTag();
+
+            // Assert
+            Assert.Equal("</p>", HtmlContentUtilities.HtmlContentToString(tag));
+        }
+
+        [Fact]
+        public void RenderEndTag_RendersExpectedEndTag_TagBuilderRendersAsExpected()
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder("p");
+            tagBuilder.TagRenderMode = TagRenderMode.Normal;
+
+            // Act
+            var tag = tagBuilder.RenderEndTag();
+
+            // Assert
+            Assert.Equal("</p>", HtmlContentUtilities.HtmlContentToString(tag));
+            Assert.Equal("<p></p>", HtmlContentUtilities.HtmlContentToString(tagBuilder));
+        }
+
+        [Fact]
+        public void RenderSelfClosingTag_RendersExpectedSelfClosingTag()
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder("p");
+
+            // Act
+            var tag = tagBuilder.RenderSelfClosingTag();
+
+            // Assert
+            Assert.Equal("<p />", HtmlContentUtilities.HtmlContentToString(tag));
+
+        }
+
+        [Fact]
+        public void RenderBody_RendersExpectedBody()
+        {
+            // Arrange
+            var tagBuilder = new TagBuilder("p");
+            tagBuilder.InnerHtml.AppendHtml("<span>Hello</span>");
+
+            // Act
+            var tag = tagBuilder.RenderBody();
+
+            // Assert
+            Assert.Equal("<span>Hello</span>", HtmlContentUtilities.HtmlContentToString(tag));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/TestResources.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/TestResources.cs
new file mode 100644
index 0000000000..5c5b711090
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/TestResources.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Test;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    // Wrap resources to make them available as public properties for [Display]. That attribute does not support
+    // internal properties.
+    public class TestResources
+    {
+        public static string DisplayAttribute_Name { get; } = Resources.DisplayAttribute_Name;
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/ViewContextTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/ViewContextTests.cs
new file mode 100644
index 0000000000..95d2a4d318
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/ViewContextTests.cs
@@ -0,0 +1,83 @@
+// 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.
+
+using System.IO;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Routing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    public class ViewContextTests
+    {
+        [Fact]
+        public void SettingViewData_AlsoUpdatesViewBag()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            var originalViewData = new ViewDataDictionary(metadataProvider: new EmptyModelMetadataProvider());
+            var context = new ViewContext(
+                new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor()),
+                view: Mock.Of<IView>(),
+                viewData: originalViewData,
+                tempData: new TempDataDictionary(httpContext, Mock.Of<ITempDataProvider>()),
+                writer: TextWriter.Null,
+                htmlHelperOptions: new HtmlHelperOptions());
+            var replacementViewData = new ViewDataDictionary(metadataProvider: new EmptyModelMetadataProvider());
+
+            // Act
+            context.ViewBag.Hello = "goodbye";
+            context.ViewData = replacementViewData;
+            context.ViewBag.Another = "property";
+
+            // Assert
+            Assert.NotSame(originalViewData, context.ViewData);
+            Assert.Same(replacementViewData, context.ViewData);
+            Assert.Null(context.ViewBag.Hello);
+            Assert.Equal("property", context.ViewBag.Another);
+            Assert.Equal("property", context.ViewData["Another"]);
+        }
+
+        [Fact]
+        public void CopyConstructor_CopiesExpectedProperties()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            var originalContext = new ViewContext(
+                new ActionContext(httpContext, new RouteData(), new ActionDescriptor()),
+                view: Mock.Of<IView>(),
+                viewData: new ViewDataDictionary(metadataProvider: new EmptyModelMetadataProvider()),
+                tempData: new TempDataDictionary(httpContext, Mock.Of<ITempDataProvider>()),
+                writer: TextWriter.Null,
+                htmlHelperOptions: new HtmlHelperOptions());
+            var view = Mock.Of<IView>();
+            var viewData = new ViewDataDictionary(originalContext.ViewData);
+            var writer = new StringWriter();
+
+            // Act
+            var context = new ViewContext(originalContext, view, viewData, writer);
+
+            // Assert
+            Assert.Same(originalContext.ActionDescriptor, context.ActionDescriptor);
+            Assert.Equal(originalContext.ClientValidationEnabled, context.ClientValidationEnabled);
+            Assert.Same(originalContext.ExecutingFilePath, context.ExecutingFilePath);
+            Assert.Same(originalContext.FormContext, context.FormContext);
+            Assert.Equal(originalContext.Html5DateRenderingMode, context.Html5DateRenderingMode);
+            Assert.Same(originalContext.HttpContext, context.HttpContext);
+            Assert.Same(originalContext.ModelState, context.ModelState);
+            Assert.Same(originalContext.RouteData, context.RouteData);
+            Assert.Same(originalContext.TempData, context.TempData);
+            Assert.Same(originalContext.ValidationMessageElement, context.ValidationMessageElement);
+            Assert.Same(originalContext.ValidationSummaryMessageElement, context.ValidationSummaryMessageElement);
+
+            Assert.Same(view, context.View);
+            Assert.Same(viewData, context.ViewData);
+            Assert.Same(writer, context.Writer);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Resources.resx b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Resources.resx
new file mode 100644
index 0000000000..aee496cb91
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Resources.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CompareAttributeTestResource" xml:space="preserve">
+    <value>Comparing {0} to {1}.</value>
+  </data>
+  <data name="DisplayAttribute_Description" xml:space="preserve">
+    <value>description from resources</value>
+  </data>
+  <data name="DisplayAttribute_Name" xml:space="preserve">
+    <value>name from resources</value>
+  </data>
+  <data name="RemoteAttribute_Error" xml:space="preserve">
+    <value>Error about '{0}' from resources.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/SkipStatusCodePagesAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/SkipStatusCodePagesAttributeTest.cs
new file mode 100644
index 0000000000..ea0cc4952e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/SkipStatusCodePagesAttributeTest.cs
@@ -0,0 +1,62 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Diagnostics;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Routing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Core.Test
+{
+    public class SkipStatusCodePagesAttributeTest
+    {
+        [Fact]
+        public void SkipStatusCodePagesAttribute_TurnsOfStatusCodePages()
+        {
+            // Arrange
+            var skipStatusCodeAttribute = new SkipStatusCodePagesAttribute();
+            var resourceExecutingContext = CreateResourceExecutingContext(new IFilterMetadata[] { skipStatusCodeAttribute });
+            var statusCodePagesFeature = new TestStatusCodeFeature();
+            resourceExecutingContext.HttpContext.Features.Set<IStatusCodePagesFeature>(statusCodePagesFeature);
+
+            // Act
+            skipStatusCodeAttribute.OnResourceExecuting(resourceExecutingContext);
+
+            // Assert
+            Assert.False(statusCodePagesFeature.Enabled);
+        }
+
+        [Fact]
+        public void SkipStatusCodePagesAttribute_Does_Not_Throw_If_Feature_Missing()
+        {
+            // Arrange
+            var skipStatusCodeAttribute = new SkipStatusCodePagesAttribute();
+            var resourceExecutingContext = CreateResourceExecutingContext(new IFilterMetadata[] { skipStatusCodeAttribute });
+
+            // Act
+            skipStatusCodeAttribute.OnResourceExecuting(resourceExecutingContext);
+        }
+
+        private static ResourceExecutingContext CreateResourceExecutingContext(IFilterMetadata[] filters)
+        {
+            return new ResourceExecutingContext(
+                CreateActionContext(),
+                filters,
+                new List<IValueProviderFactory>());
+        }
+
+        private static ActionContext CreateActionContext()
+        {
+            return new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+        }
+
+        private class TestStatusCodeFeature : IStatusCodePagesFeature
+        {
+            public bool Enabled { get; set; } = true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TestApplicationPart.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TestApplicationPart.cs
new file mode 100644
index 0000000000..5f67622424
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TestApplicationPart.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class TestApplicationPart : ApplicationPart, IApplicationPartTypeProvider
+    {
+        public TestApplicationPart()
+        {
+            Types = Enumerable.Empty<TypeInfo>();
+        }
+
+        public TestApplicationPart(params TypeInfo[] types)
+        {
+            Types = types;
+        }
+
+        public TestApplicationPart(IEnumerable<TypeInfo> types)
+        {
+            Types = types;
+        }
+
+        public TestApplicationPart(IEnumerable<Type> types)
+            :this(types.Select(t => t.GetTypeInfo()))
+        {
+        }
+
+        public TestApplicationPart(params Type[] types)
+            : this(types.Select(t => t.GetTypeInfo()))
+        {
+        }
+
+        public override string Name => "Test part";
+
+        public IEnumerable<TypeInfo> Types { get; }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs
new file mode 100644
index 0000000000..1744a3380b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs
@@ -0,0 +1,651 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Microsoft.Net.Http.Headers;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class ViewComponentResultTest
+    {
+        private readonly ITempDataDictionary _tempDataDictionary =
+            new TempDataDictionary(new DefaultHttpContext(), new SessionStateTempDataProvider());
+
+        [Fact]
+        public void Model_ExposesViewDataModel()
+        {
+            // Arrange
+            var customModel = new object();
+            var viewResult = new ViewComponentResult
+            {
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider())
+                {
+                    Model = customModel
+                },
+            };
+
+            // Act & Assert
+            Assert.Same(customModel, viewResult.Model);
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_ViewComponentResult_AllowsNullViewDataAndTempData()
+        {
+            // Arrange
+            var methodInfo = typeof(TextViewComponent).GetMethod(nameof(TextViewComponent.Invoke));
+            var descriptor = new ViewComponentDescriptor()
+            {
+                FullName = "Full.Name.Text",
+                ShortName = "Text",
+                TypeInfo = typeof(TextViewComponent).GetTypeInfo(),
+                MethodInfo = methodInfo,
+                Parameters = methodInfo.GetParameters(),
+            };
+
+            var actionContext = CreateActionContext(descriptor);
+
+            var viewComponentResult = new ViewComponentResult
+            {
+                Arguments = new { name = "World!" },
+                ViewData = null,
+                TempData = null,
+                ViewComponentName = "Text"
+            };
+
+            // Act
+            await viewComponentResult.ExecuteResultAsync(actionContext);
+            // No assert, just confirm it didn't throw
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_Throws_IfNameOrTypeIsNotSet()
+        {
+            // Arrange
+            var expected =
+                "Either the 'ViewComponentName' or 'ViewComponentType' " +
+                "property must be set in order to invoke a view component.";
+
+            var actionContext = CreateActionContext();
+
+            var viewComponentResult = new ViewComponentResult
+            {
+                TempData = _tempDataDictionary,
+            };
+
+            // Act and Assert
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => viewComponentResult.ExecuteResultAsync(actionContext));
+            Assert.Equal(expected, exception.Message);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_Throws_IfViewComponentCouldNotBeFound_ByName()
+        {
+            // Arrange
+            var expected = "A view component named 'Text' could not be found. A view component must be " +
+                "a public non-abstract class, not contain any generic parameters, and either be decorated " +
+                "with 'ViewComponentAttribute' or have a class name ending with the 'ViewComponent' suffix. " +
+                "A view component must not be decorated with 'NonViewComponentAttribute'.";
+
+            var actionContext = CreateActionContext();
+
+            var viewComponentResult = new ViewComponentResult
+            {
+                ViewComponentName = "Text",
+                TempData = _tempDataDictionary,
+            };
+
+            // Act and Assert
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => viewComponentResult.ExecuteResultAsync(actionContext));
+            Assert.Equal(expected, exception.Message);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_Throws_IfViewComponentCouldNotBeFound_ByType()
+        {
+            // Arrange
+            var expected = $"A view component named '{typeof(TextViewComponent).FullName}' could not be found. " +
+                "A view component must be a public non-abstract class, not contain any generic parameters, and either be decorated " +
+                "with 'ViewComponentAttribute' or have a class name ending with the 'ViewComponent' suffix. " +
+                "A view component must not be decorated with 'NonViewComponentAttribute'.";
+
+            var actionContext = CreateActionContext();
+            var services = CreateServices(diagnosticListener: null, context: actionContext.HttpContext);
+            services.AddSingleton<IViewComponentSelector>();
+
+
+            var viewComponentResult = new ViewComponentResult
+            {
+                ViewComponentType = typeof(TextViewComponent),
+                TempData = _tempDataDictionary,
+            };
+
+            // Act and Assert
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => viewComponentResult.ExecuteResultAsync(actionContext));
+            Assert.Equal(expected, exception.Message);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_ExecutesSyncViewComponent()
+        {
+            // Arrange
+            var methodInfo = typeof(TextViewComponent).GetMethod(nameof(TextViewComponent.Invoke));
+            var descriptor = new ViewComponentDescriptor()
+            {
+                FullName = "Full.Name.Text",
+                ShortName = "Text",
+                TypeInfo = typeof(TextViewComponent).GetTypeInfo(),
+                MethodInfo = methodInfo,
+                Parameters = methodInfo.GetParameters(),
+            };
+
+            var actionContext = CreateActionContext(descriptor);
+
+            var viewComponentResult = new ViewComponentResult()
+            {
+                Arguments = new { name = "World!" },
+                ViewComponentName = "Text",
+                TempData = _tempDataDictionary,
+            };
+
+            // Act
+            await viewComponentResult.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var body = ReadBody(actionContext.HttpContext.Response);
+            Assert.Equal("Hello, World!", body);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_UsesDictionaryArguments()
+        {
+            // Arrange
+            var methodInfo = typeof(TextViewComponent).GetMethod(nameof(TextViewComponent.Invoke));
+            var descriptor = new ViewComponentDescriptor()
+            {
+                FullName = "Full.Name.Text",
+                ShortName = "Text",
+                TypeInfo = typeof(TextViewComponent).GetTypeInfo(),
+                MethodInfo = methodInfo,
+                Parameters = methodInfo.GetParameters(),
+            };
+
+            var actionContext = CreateActionContext(descriptor);
+
+            var viewComponentResult = new ViewComponentResult()
+            {
+                Arguments = new Dictionary<string, object> { ["name"] = "World!" },
+                ViewComponentName = "Text",
+                TempData = _tempDataDictionary,
+            };
+
+            // Act
+            await viewComponentResult.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var body = ReadBody(actionContext.HttpContext.Response);
+            Assert.Equal("Hello, World!", body);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_ExecutesAsyncViewComponent()
+        {
+            // Arrange
+            var methodInfo = typeof(AsyncTextViewComponent).GetMethod(nameof(AsyncTextViewComponent.InvokeAsync));
+            var descriptor = new ViewComponentDescriptor()
+            {
+                FullName = "Full.Name.AsyncText",
+                ShortName = "AsyncText",
+                TypeInfo = typeof(AsyncTextViewComponent).GetTypeInfo(),
+                MethodInfo = methodInfo,
+                Parameters = methodInfo.GetParameters(),
+            };
+
+            var actionContext = CreateActionContext(descriptor);
+
+            var viewComponentResult = new ViewComponentResult()
+            {
+                Arguments = new { name = "World!" },
+                ViewComponentName = "AsyncText",
+                TempData = _tempDataDictionary,
+            };
+
+            // Act
+            await viewComponentResult.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var body = ReadBody(actionContext.HttpContext.Response);
+            Assert.Equal("Hello-Async, World!", body);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_ExecutesViewComponent_AndWritesDiagnosticSource()
+        {
+            // Arrange
+            var methodInfo = typeof(TextViewComponent).GetMethod(nameof(TextViewComponent.Invoke));
+            var descriptor = new ViewComponentDescriptor()
+            {
+                FullName = "Full.Name.Text",
+                ShortName = "Text",
+                TypeInfo = typeof(TextViewComponent).GetTypeInfo(),
+                MethodInfo = methodInfo,
+                Parameters = methodInfo.GetParameters(),
+            };
+
+            var adapter = new TestDiagnosticListener();
+
+            var actionContext = CreateActionContext(adapter, descriptor);
+
+            var viewComponentResult = new ViewComponentResult()
+            {
+                Arguments = new { name = "World!" },
+                ViewComponentName = "Text",
+                TempData = _tempDataDictionary,
+            };
+
+            // Act
+            await viewComponentResult.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var body = ReadBody(actionContext.HttpContext.Response);
+            Assert.Equal("Hello, World!", body);
+
+            Assert.NotNull(adapter.BeforeViewComponent?.ActionDescriptor);
+            Assert.NotNull(adapter.BeforeViewComponent?.ViewComponentContext);
+            Assert.NotNull(adapter.BeforeViewComponent?.ViewComponent);
+            Assert.NotNull(adapter.AfterViewComponent?.ActionDescriptor);
+            Assert.NotNull(adapter.AfterViewComponent?.ViewComponentContext);
+            Assert.NotNull(adapter.AfterViewComponent?.ViewComponentResult);
+            Assert.NotNull(adapter.AfterViewComponent?.ViewComponent);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_ExecutesViewComponent_ByShortName()
+        {
+            // Arrange
+            var methodInfo = typeof(TextViewComponent).GetMethod(nameof(TextViewComponent.Invoke));
+            var descriptor = new ViewComponentDescriptor()
+            {
+                FullName = "Full.Name.Text",
+                ShortName = "Text",
+                TypeInfo = typeof(TextViewComponent).GetTypeInfo(),
+                MethodInfo = methodInfo,
+                Parameters = methodInfo.GetParameters(),
+            };
+
+            var actionContext = CreateActionContext(descriptor);
+
+            var viewComponentResult = new ViewComponentResult()
+            {
+                Arguments = new { name = "World!" },
+                ViewComponentName = "Text",
+                TempData = _tempDataDictionary,
+            };
+
+            // Act
+            await viewComponentResult.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var body = ReadBody(actionContext.HttpContext.Response);
+            Assert.Equal("Hello, World!", body);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_ExecutesViewComponent_ByFullName()
+        {
+            // Arrange
+            var methodInfo = typeof(TextViewComponent).GetMethod(nameof(TextViewComponent.Invoke));
+            var descriptor = new ViewComponentDescriptor()
+            {
+                FullName = "Full.Name.Text",
+                ShortName = "Text",
+                TypeInfo = typeof(TextViewComponent).GetTypeInfo(),
+                MethodInfo = methodInfo,
+                Parameters = methodInfo.GetParameters(),
+            };
+
+            var actionContext = CreateActionContext(descriptor);
+
+            var viewComponentResult = new ViewComponentResult()
+            {
+                Arguments = new { name = "World!" },
+                ViewComponentName = "Full.Name.Text",
+                TempData = _tempDataDictionary,
+            };
+
+            // Act
+            await viewComponentResult.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var body = ReadBody(actionContext.HttpContext.Response);
+            Assert.Equal("Hello, World!", body);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_ExecutesViewComponent_ByType()
+        {
+            // Arrange
+            var methodInfo = typeof(TextViewComponent).GetMethod(nameof(TextViewComponent.Invoke));
+            var descriptor = new ViewComponentDescriptor()
+            {
+                FullName = "Full.Name.Text",
+                ShortName = "Text",
+                TypeInfo = typeof(TextViewComponent).GetTypeInfo(),
+                MethodInfo = methodInfo,
+                Parameters = methodInfo.GetParameters(),
+            };
+
+            var actionContext = CreateActionContext(descriptor);
+
+            var viewComponentResult = new ViewComponentResult()
+            {
+                Arguments = new { name = "World!" },
+                ViewComponentType = typeof(TextViewComponent),
+                TempData = _tempDataDictionary,
+            };
+
+            // Act
+            await viewComponentResult.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var body = ReadBody(actionContext.HttpContext.Response);
+            Assert.Equal("Hello, World!", body);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_SetsStatusCode()
+        {
+            // Arrange
+            var methodInfo = typeof(TextViewComponent).GetMethod(nameof(TextViewComponent.Invoke));
+            var descriptor = new ViewComponentDescriptor()
+            {
+                FullName = "Full.Name.Text",
+                ShortName = "Text",
+                TypeInfo = typeof(TextViewComponent).GetTypeInfo(),
+                MethodInfo = methodInfo,
+                Parameters = methodInfo.GetParameters(),
+            };
+
+            var actionContext = CreateActionContext(descriptor);
+
+            var viewComponentResult = new ViewComponentResult()
+            {
+                Arguments = new { name = "World!" },
+                ViewComponentType = typeof(TextViewComponent),
+                StatusCode = 404,
+                TempData = _tempDataDictionary,
+            };
+
+            // Act
+            await viewComponentResult.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Equal(404, actionContext.HttpContext.Response.StatusCode);
+        }
+
+        public static TheoryData<string, string> ViewComponentResultContentTypeData
+        {
+            get
+            {
+                return new TheoryData<string, string>
+                {
+                    {
+                        null,
+                        "text/html; charset=utf-8"
+                    },
+                    {
+                        "text/foo",
+                        "text/foo"
+                    },
+                    {
+                        "text/foo;p1=p1-value",
+                        "text/foo; p1=p1-value"
+                    },
+                    {
+                        new MediaTypeHeaderValue("text/foo") { Encoding = Encoding.ASCII }.ToString(),
+                        "text/foo; charset=us-ascii"
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ViewComponentResultContentTypeData))]
+        public async Task ViewComponentResult_SetsContentTypeHeader(
+            string contentType,
+            string expectedContentType)
+        {
+            // Arrange
+            var methodInfo = typeof(TextViewComponent).GetMethod(nameof(TextViewComponent.Invoke));
+            var descriptor = new ViewComponentDescriptor()
+            {
+                FullName = "Full.Name.Text",
+                ShortName = "Text",
+                TypeInfo = typeof(TextViewComponent).GetTypeInfo(),
+                MethodInfo = methodInfo,
+                Parameters = methodInfo.GetParameters(),
+            };
+
+            var actionContext = CreateActionContext(descriptor);
+
+            var contentTypeBeforeViewResultExecution = contentType?.ToString();
+
+            var viewComponentResult = new ViewComponentResult()
+            {
+                Arguments = new { name = "World!" },
+                ViewComponentName = "Text",
+                ContentType = contentType,
+                TempData = _tempDataDictionary,
+            };
+
+            // Act
+            await viewComponentResult.ExecuteResultAsync(actionContext);
+
+            // Assert
+            var resultContentType = actionContext.HttpContext.Response.ContentType;
+            MediaTypeAssert.Equal(expectedContentType, resultContentType);
+
+            // Check if the original instance provided by the user has not changed.
+            // Since we do not have access to the new instance created within the view executor,
+            // check if at least the content is the same.
+            var contentTypeAfterViewResultExecution = contentType?.ToString();
+            MediaTypeAssert.Equal(contentTypeBeforeViewResultExecution, contentTypeAfterViewResultExecution);
+        }
+
+        [Fact]
+        public async Task ViewComponentResult_SetsContentTypeHeader_OverrideResponseContentType()
+        {
+            // Arrange
+            var methodInfo = typeof(TextViewComponent).GetMethod(nameof(TextViewComponent.Invoke));
+            var descriptor = new ViewComponentDescriptor()
+            {
+                FullName = "Full.Name.Text",
+                ShortName = "Text",
+                TypeInfo = typeof(TextViewComponent).GetTypeInfo(),
+                MethodInfo = methodInfo,
+                Parameters = methodInfo.GetParameters(),
+            };
+
+            var actionContext = CreateActionContext(descriptor);
+
+            var expectedContentType = "text/html; charset=utf-8";
+            actionContext.HttpContext.Response.ContentType = "application/x-will-be-overridden";
+
+            var viewComponentResult = new ViewComponentResult()
+            {
+                Arguments = new { name = "World!" },
+                ViewComponentName = "Text",
+                ContentType = new MediaTypeHeaderValue("text/html") { Encoding = Encoding.UTF8 }.ToString(),
+                TempData = _tempDataDictionary,
+            };
+
+            // Act
+            await viewComponentResult.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Equal(expectedContentType, actionContext.HttpContext.Response.ContentType);
+        }
+
+        [Theory]
+        [InlineData("text/foo", "text/foo; charset=utf-8")]
+        [InlineData("text/foo; p1=p1-value", "text/foo; p1=p1-value; charset=utf-8")]
+        [InlineData("text/foo; p1=p1-value; charset=us-ascii", "text/foo; p1=p1-value; charset=us-ascii")]
+        public async Task ViewComponentResult_NoContentTypeSet_PreservesResponseContentType(
+            string responseContentType,
+            string expectedContentType)
+        {
+            // Arrange
+            var methodInfo = typeof(TextViewComponent).GetMethod(nameof(TextViewComponent.Invoke));
+            var descriptor = new ViewComponentDescriptor()
+            {
+                FullName = "Full.Name.Text",
+                ShortName = "Text",
+                TypeInfo = typeof(TextViewComponent).GetTypeInfo(),
+                MethodInfo = methodInfo,
+                Parameters = methodInfo.GetParameters(),
+            };
+
+            var actionContext = CreateActionContext(descriptor);
+
+            actionContext.HttpContext.Response.ContentType = expectedContentType;
+
+            var viewComponentResult = new ViewComponentResult()
+            {
+                Arguments = new { name = "World!" },
+                ViewComponentName = "Text",
+                TempData = _tempDataDictionary,
+            };
+
+            // Act
+            await viewComponentResult.ExecuteResultAsync(actionContext);
+
+            // Assert
+            Assert.Equal(expectedContentType, actionContext.HttpContext.Response.ContentType);
+        }
+
+        private IServiceCollection CreateServices(
+            object diagnosticListener,
+            HttpContext context,
+            params ViewComponentDescriptor[] descriptors)
+        {
+            var httpContext = new DefaultHttpContext();
+            var diagnosticSource = new DiagnosticListener("Microsoft.AspNetCore");
+            if (diagnosticListener != null)
+            {
+                diagnosticSource.SubscribeWithAdapter(diagnosticListener);
+            }
+
+            var services = new ServiceCollection();
+            services.AddSingleton<DiagnosticSource>(diagnosticSource);
+            services.AddSingleton<ViewComponentInvokerCache>();
+            services.AddSingleton<ExpressionTextCache>();
+            services.AddSingleton(Options.Create(new MvcViewOptions()));
+            services.AddTransient<IViewComponentHelper, DefaultViewComponentHelper>();
+            services.AddSingleton<IViewComponentSelector, DefaultViewComponentSelector>();
+            services.AddSingleton<IViewComponentDescriptorCollectionProvider, DefaultViewComponentDescriptorCollectionProvider>();
+            services.AddSingleton<IViewComponentInvokerFactory, DefaultViewComponentInvokerFactory>();
+            services.AddSingleton<ITypeActivatorCache, TypeActivatorCache>();
+            services.AddSingleton<IViewComponentActivator, DefaultViewComponentActivator>();
+            services.AddSingleton<IViewComponentFactory, DefaultViewComponentFactory>();
+            services.AddSingleton<IViewComponentDescriptorProvider>(new FixedSetViewComponentDescriptorProvider(descriptors));
+            services.AddSingleton<IModelMetadataProvider, EmptyModelMetadataProvider>();
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+            services.AddSingleton<ITempDataDictionaryFactory, TempDataDictionaryFactory>();
+            services.AddSingleton<ITempDataProvider, SessionStateTempDataProvider>();
+            services.AddSingleton<HtmlEncoder, HtmlTestEncoder>();
+            services.AddSingleton<IViewBufferScope, TestViewBufferScope>();
+            services.AddSingleton<IActionResultExecutor<ViewComponentResult>, ViewComponentResultExecutor>();
+
+            return services;
+        }
+
+        private HttpContext CreateHttpContext(object diagnosticListener, params ViewComponentDescriptor[] descriptors)
+        {
+            var httpContext = new DefaultHttpContext();
+            var services = CreateServices(diagnosticListener, httpContext, descriptors);
+
+            httpContext.Response.Body = new MemoryStream();
+            httpContext.RequestServices = services.BuildServiceProvider();
+
+            return httpContext;
+        }
+
+        private ActionContext CreateActionContext(object diagnosticListener, params ViewComponentDescriptor[] descriptors)
+        {
+            return new ActionContext(CreateHttpContext(diagnosticListener, descriptors), new RouteData(), new ActionDescriptor());
+        }
+
+        private ActionContext CreateActionContext(params ViewComponentDescriptor[] descriptors)
+        {
+            return CreateActionContext(null, descriptors);
+        }
+
+
+        private class FixedSetViewComponentDescriptorProvider : IViewComponentDescriptorProvider
+        {
+            private readonly ViewComponentDescriptor[] _descriptors;
+
+            public FixedSetViewComponentDescriptorProvider(params ViewComponentDescriptor[] descriptors)
+            {
+                _descriptors = descriptors ?? new ViewComponentDescriptor[0];
+            }
+
+            public IEnumerable<ViewComponentDescriptor> GetViewComponents()
+            {
+                return _descriptors;
+            }
+        }
+
+        private static string ReadBody(HttpResponse response)
+        {
+            response.Body.Seek(0, SeekOrigin.Begin);
+
+            using (var reader = new StreamReader(response.Body))
+            {
+                return reader.ReadToEnd();
+            }
+        }
+
+        private class TextViewComponent : ViewComponent
+        {
+            public HtmlString Invoke(string name)
+            {
+                return new HtmlString("Hello, " + name);
+            }
+        }
+
+        private class AsyncTextViewComponent : ViewComponent
+        {
+            public Task<HtmlString> InvokeAsync(string name)
+            {
+                return Task.FromResult(new HtmlString("Hello-Async, " + name));
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentTests.cs
new file mode 100644
index 0000000000..772d5be1be
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentTests.cs
@@ -0,0 +1,311 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Encodings.Web;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class ViewComponentTests
+    {
+        [Fact]
+        public void ViewComponent_ViewBag_UsesViewData()
+        {
+            // Arrange
+            var viewComponent = new TestViewComponent();
+
+            // Act
+            viewComponent.ViewBag.A = "Alice";
+            viewComponent.ViewBag.B = "Bob";
+
+            // Assert
+            Assert.Equal(2, viewComponent.ViewData.Count);
+            Assert.Equal("Alice", viewComponent.ViewData["A"]);
+            Assert.Equal("Bob", viewComponent.ViewData["B"]);
+        }
+
+        [Fact]
+        public void ViewComponent_ViewData_StoresDataForViewBag()
+        {
+            // Arrange
+            var viewComponent = new TestViewComponent();
+
+            // Act
+            viewComponent.ViewData["A"] = "Alice";
+            viewComponent.ViewData["B"] = "Bob";
+
+            // Assert
+            Assert.Equal(2, viewComponent.ViewData.Count);
+            Assert.Equal("Alice", viewComponent.ViewBag.A);
+            Assert.Equal("Bob", viewComponent.ViewBag.B);
+        }
+
+        [Fact]
+        public void ViewComponent_Content_SetsResultContentAndEncodedContent()
+        {
+            // Arrange
+            var viewComponent = new TestViewComponent();
+            var expectedContent = "TestContent&";
+            var expectedEncodedContent = new HtmlString(HtmlEncoder.Default.Encode(expectedContent));
+
+            // Act
+            var actualResult = viewComponent.Content(expectedContent);
+
+            // Assert
+            Assert.IsType<ContentViewComponentResult>(actualResult);
+            Assert.Same(expectedContent, actualResult.Content);
+        }
+
+        [Fact]
+        public void ViewComponent_View_WithEmptyParameter_SetsResultViewWithDefaultViewName()
+        {
+            // Arrange
+            var viewComponent = new TestViewComponent();
+
+            // Act
+            var actualResult = viewComponent.View();
+
+            // Assert
+            Assert.IsType<ViewViewComponentResult>(actualResult);
+            Assert.NotSame(viewComponent.ViewData, actualResult.ViewData);
+            Assert.Equal(new ViewDataDictionary<object>(viewComponent.ViewData), actualResult.ViewData);
+            Assert.Null(actualResult.ViewData.Model);
+            Assert.Null(actualResult.ViewName);
+        }
+
+        [Fact]
+        public void ViewComponent_View_WithEmptyParameter_SetsViewDataModelWithDefaultViewName()
+        {
+            // Arrange
+            var viewComponent = new TestViewComponent();
+            var model = new object();
+            viewComponent.ViewData.Model = model;
+
+            // Act
+            var actualResult = viewComponent.View();
+
+            // Assert
+            Assert.IsType<ViewViewComponentResult>(actualResult);
+            Assert.NotSame(viewComponent.ViewData, actualResult.ViewData);
+            Assert.Equal(new ViewDataDictionary<object>(viewComponent.ViewData), actualResult.ViewData);
+            Assert.Same(model, actualResult.ViewData.Model);
+            Assert.Null(actualResult.ViewName);
+        }
+
+        [Fact]
+        public void ViewComponent_View_WithViewNameParameter_SetsResultViewWithCustomViewName()
+        {
+            // Arrange
+            var viewComponent = new TestViewComponent();
+
+            // Act
+            var actualResult = viewComponent.View("CustomViewName");
+
+            // Assert
+            Assert.IsType<ViewViewComponentResult>(actualResult);
+            Assert.IsType<ViewDataDictionary<object>>(actualResult.ViewData);
+            Assert.NotSame(viewComponent.ViewData, actualResult.ViewData);
+            Assert.Equal(new ViewDataDictionary<object>(viewComponent.ViewData), actualResult.ViewData);
+            Assert.Null(actualResult.ViewData.Model);
+            Assert.Equal("CustomViewName", actualResult.ViewName);
+        }
+
+        [Fact]
+        public void ViewComponent_View_WithModelParameter_SetsResultViewWithDefaultViewNameAndModel()
+        {
+            // Arrange
+            var viewComponent = new TestViewComponent();
+
+            var model = new object();
+
+            // Act
+            var actualResult = viewComponent.View(model);
+
+            // Assert
+            Assert.IsType<ViewViewComponentResult>(actualResult);
+            Assert.IsType<ViewDataDictionary<object>>(actualResult.ViewData);
+            Assert.NotSame(viewComponent.ViewData, actualResult.ViewData);
+            Assert.Equal(new ViewDataDictionary<object>(viewComponent.ViewData), actualResult.ViewData);
+            Assert.Same(model, actualResult.ViewData.Model);
+            Assert.Null(actualResult.ViewName);
+        }
+
+        [Fact]
+        public void ViewComponent_View_WithNullModelParameter_SetsResultViewWithDefaultViewNameAndNullModel()
+        {
+            // Arrange
+            var viewComponent = new TestViewComponent();
+            viewComponent.ViewData.Model = new object();
+            object model = null;
+
+            // Act
+            var actualResult = viewComponent.View(model: model);
+
+            // Assert
+            Assert.IsType<ViewViewComponentResult>(actualResult);
+            Assert.IsType<ViewDataDictionary<object>>(actualResult.ViewData);
+            Assert.NotSame(viewComponent.ViewData, actualResult.ViewData);
+            Assert.Equal(new ViewDataDictionary<object>(viewComponent.ViewData), actualResult.ViewData);
+            Assert.Null(actualResult.ViewData.Model);
+            Assert.Null(actualResult.ViewName);
+        }
+
+        [Fact]
+        public void ViewComponent_View_WithViewNameAndNullModelParameter_SetsResultViewWithViewNameAndNullModel()
+        {
+            // Arrange
+            var viewComponent = new TestViewComponent();
+            viewComponent.ViewData.Model = new object();
+
+            // Act
+            var actualResult = viewComponent.View<object>("CustomViewName", model: null);
+
+            // Assert
+            Assert.IsType<ViewViewComponentResult>(actualResult);
+            Assert.IsType<ViewDataDictionary<object>>(actualResult.ViewData);
+            Assert.NotSame(viewComponent.ViewData, actualResult.ViewData);
+            Assert.Equal(new ViewDataDictionary<object>(viewComponent.ViewData), actualResult.ViewData);
+            Assert.Null(actualResult.ViewData.Model);
+            Assert.Equal("CustomViewName", actualResult.ViewName);
+        }
+
+        [Fact]
+        public void ViewComponent_View_WithViewNameAndNonObjectNullModelParameter_SetsResultViewWithViewNameAndNullModel()
+        {
+            // Arrange
+            var viewComponent = new TestViewComponent();
+            viewComponent.ViewData.Model = "Hello World!";
+
+            // Act
+            var actualResult = viewComponent.View<string>("CustomViewName", model: null);
+
+            // Assert
+            Assert.IsType<ViewViewComponentResult>(actualResult);
+            Assert.IsType<ViewDataDictionary<string>>(actualResult.ViewData);
+            Assert.NotSame(viewComponent.ViewData, actualResult.ViewData);
+            Assert.Equal(new ViewDataDictionary<string>(viewComponent.ViewData), actualResult.ViewData);
+            Assert.Null(actualResult.ViewData.Model);
+            Assert.Equal("CustomViewName", actualResult.ViewName);
+        }
+
+        [Fact]
+        public void ViewComponent_View_WithViewNameAndModelParameters_SetsResultViewWithCustomViewNameAndModel()
+        {
+            // Arrange
+            var viewComponent = new TestViewComponent();
+
+            var model = new object();
+
+            // Act
+            var actualResult = viewComponent.View("CustomViewName", model);
+
+            // Assert
+            Assert.IsType<ViewViewComponentResult>(actualResult);
+            Assert.IsType<ViewDataDictionary<object>>(actualResult.ViewData);
+            Assert.NotSame(viewComponent.ViewData, actualResult.ViewData);
+            Assert.Equal(new ViewDataDictionary<object>(viewComponent.ViewData), actualResult.ViewData);
+            Assert.Same(model, actualResult.ViewData.Model);
+            Assert.Equal("CustomViewName", actualResult.ViewName);
+        }
+
+        [Fact]
+        public void ViewComponent_ViewContext_ViewData_ReturnsDefaultInstanceIfNull()
+        {
+            // Arrange && Act
+            var viewComponent = new TestViewComponent();
+
+            // Assert
+            // ViewComponent.ViewContext returns the default instance for the unit test scenarios
+            Assert.NotNull(viewComponent.ViewContext);
+            Assert.NotNull(viewComponent.ViewContext.ViewData);
+            Assert.Null(viewComponent.ViewContext.TempData);
+
+            // ViewComponent.ViewData returns the default instance for the unit test scenarios
+            Assert.Empty(viewComponent.ViewContext.ViewData);
+            Assert.NotNull(viewComponent.ViewData);
+            Assert.Empty(viewComponent.ViewData);
+            Assert.Same(viewComponent.ViewData, viewComponent.ViewContext.ViewData);
+        }
+
+        [Fact]
+        public void ViewComponent_ViewContext_TempData_ReturnsDefaultInstanceIfSessionActive()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.Features.Set<ISessionFeature>(new SessionFeature() { Session = new TestSession() });
+            var viewContext = new ViewContext();
+            viewContext.TempData = new TempDataDictionary(httpContext, new SessionStateTempDataProvider());
+            var viewComponentContext = new ViewComponentContext();
+            viewComponentContext.ViewContext = viewContext;
+
+            // Act
+            var viewComponent = new TestViewComponent();
+            viewComponent.ViewComponentContext = viewComponentContext;
+
+            // Assert
+            Assert.NotNull(viewComponent.ViewContext.TempData);
+            Assert.Empty(viewComponent.ViewContext.TempData);
+            Assert.Same(viewComponent.TempData, viewComponent.ViewContext.TempData);
+        }
+
+        private class TestViewComponent : ViewComponent
+        {
+        }
+
+        private class SessionFeature : ISessionFeature
+        {
+            public ISession Session { get; set; }
+        }
+
+        private class TestSession : ISession
+        {
+            private Dictionary<string, byte[]> _innerDictionary = new Dictionary<string, byte[]>();
+
+            public IEnumerable<string> Keys { get { return _innerDictionary.Keys; } }
+
+            public string Id => "TestId";
+
+            public bool IsAvailable { get; } = true;
+
+            public Task LoadAsync(CancellationToken cancellationToken = default(CancellationToken))
+            {
+                return Task.FromResult(0);
+            }
+
+            public Task CommitAsync(CancellationToken cancellationToken = default(CancellationToken))
+            {
+                return Task.FromResult(0);
+            }
+
+            public void Clear()
+            {
+                _innerDictionary.Clear();
+            }
+
+            public void Remove(string key)
+            {
+                _innerDictionary.Remove(key);
+            }
+
+            public void Set(string key, byte[] value)
+            {
+                _innerDictionary[key] = value.ToArray();
+            }
+
+            public bool TryGetValue(string key, out byte[] value)
+            {
+                return _innerDictionary.TryGetValue(key, out value);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs
new file mode 100644
index 0000000000..ab1dffe047
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs
@@ -0,0 +1,70 @@
+// 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.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class ContentViewComponentResultTest
+    {
+        [Fact]
+        public void Execute_WritesData_Encoded()
+        {
+            // Arrange
+            var buffer = new MemoryStream();
+            var result = new ContentViewComponentResult("<Test />");
+
+            var viewComponentContext = GetViewComponentContext(Mock.Of<IView>(), buffer);
+
+            // Act
+            result.Execute(viewComponentContext);
+            buffer.Position = 0;
+
+            // Assert
+            Assert.Equal("HtmlEncode[[<Test />]]", new StreamReader(buffer).ReadToEnd());
+        }
+
+        private static ViewComponentContext GetViewComponentContext(IView view, Stream stream)
+        {
+            var httpContext = new DefaultHttpContext();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+            var viewContext = new ViewContext(
+                actionContext,
+                view,
+                viewData,
+                new TempDataDictionary(httpContext, new SessionStateTempDataProvider()),
+                TextWriter.Null,
+                new HtmlHelperOptions());
+
+            var writer = new StreamWriter(stream) { AutoFlush = true };
+
+            var viewComponentDescriptor = new ViewComponentDescriptor()
+            {
+                TypeInfo = typeof(object).GetTypeInfo(),
+            };
+
+            var viewComponentContext = new ViewComponentContext(
+                viewComponentDescriptor,
+                new Dictionary<string, object>(),
+                new HtmlTestEncoder(),
+                viewContext,
+                writer);
+
+            return viewComponentContext;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentActivatorTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentActivatorTests.cs
new file mode 100644
index 0000000000..24b940460a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentActivatorTests.cs
@@ -0,0 +1,98 @@
+// 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.
+
+using System;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    public class DefaultViewComponentActivatorTests
+    {
+        [Fact]
+        public void DefaultViewComponentActivator_ActivatesViewComponentContext()
+        {
+            // Arrange
+            var expectedInstance = new TestViewComponent();
+
+            var typeActivator = new Mock<ITypeActivatorCache>();
+            typeActivator
+                .Setup(ta => ta.CreateInstance<object>(It.IsAny<IServiceProvider>(), It.IsAny<Type>()))
+                .Returns(expectedInstance);
+
+            var activator = new DefaultViewComponentActivator(typeActivator.Object);
+
+            var context = CreateContext(typeof(TestViewComponent));
+            expectedInstance.ViewComponentContext = context;
+
+            // Act
+            var instance = activator.Create(context) as ViewComponent;
+
+            // Assert
+            Assert.NotNull(instance);
+            Assert.Same(context, instance.ViewComponentContext);
+        }
+
+        [Fact]
+        public void DefaultViewComponentActivator_ActivatesViewComponentContext_IgnoresNonPublic()
+        {
+            // Arrange
+            var expectedInstance = new VisibilityViewComponent();
+
+            var typeActivator = new Mock<ITypeActivatorCache>();
+            typeActivator
+                .Setup(ta => ta.CreateInstance<object>(It.IsAny<IServiceProvider>(), It.IsAny<Type>()))
+                .Returns(expectedInstance);
+
+            var activator = new DefaultViewComponentActivator(typeActivator.Object);
+
+            var context = CreateContext(typeof(VisibilityViewComponent));
+            expectedInstance.ViewComponentContext = context;
+
+            // Act
+            var instance = activator.Create(context) as VisibilityViewComponent;
+
+            // Assert
+            Assert.NotNull(instance);
+            Assert.Same(context, instance.ViewComponentContext);
+            Assert.Null(instance.C);
+        }
+
+        private static ViewComponentContext CreateContext(Type componentType)
+        {
+            return new ViewComponentContext
+            {
+                ViewComponentDescriptor = new ViewComponentDescriptor
+                {
+                    TypeInfo = componentType.GetTypeInfo()
+                },
+                ViewContext = new ViewContext
+                {
+                    HttpContext = new DefaultHttpContext
+                    {
+                        RequestServices = Mock.Of<IServiceProvider>()
+                    }
+                }
+            };
+        }
+
+        private class TestViewComponent : ViewComponent
+        {
+            public Task ExecuteAsync()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class VisibilityViewComponent : ViewComponent
+        {
+            [ViewComponentContext]
+            protected internal ViewComponentContext C { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs
new file mode 100644
index 0000000000..370d027750
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs
@@ -0,0 +1,193 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    public class DefaultViewComponentDescriptorProviderTest
+    {
+        [Theory]
+        [InlineData(typeof(NoMethodsViewComponent))]
+        [InlineData(typeof(NonPublicInvokeAsyncViewComponent))]
+        [InlineData(typeof(NonPublicInvokeViewComponent))]
+        public void GetViewComponents_ThrowsIfTypeHasNoInvocationMethods(Type type)
+        {
+            // Arrange
+            var expected = $"Could not find an 'Invoke' or 'InvokeAsync' method for the view component '{type}'.";
+            var provider = CreateProvider(type);
+
+            // Act
+            var ex = Assert.Throws<InvalidOperationException>(() => provider.GetViewComponents().ToArray());
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Theory]
+        [InlineData(typeof(MultipleInvokeViewComponent))]
+        [InlineData(typeof(MultipleInvokeAsyncViewComponent))]
+        [InlineData(typeof(InvokeAndInvokeAsyncViewComponent))]
+        public void GetViewComponents_ThrowsIfTypeHasAmbiguousInvocationMethods(Type type)
+        {
+            // Arrange
+            var expected = $"View component '{type}' must have exactly one public method named " +
+                "'InvokeAsync' or 'Invoke'.";
+            var provider = CreateProvider(type);
+
+            // Act
+            var ex = Assert.Throws<InvalidOperationException>(() => provider.GetViewComponents().ToArray());
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Theory]
+        [InlineData(typeof(NonGenericTaskReturningInvokeAsyncViewComponent))]
+        [InlineData(typeof(VoidReturningInvokeAsyncViewComponent))]
+        [InlineData(typeof(NonTaskReturningInvokeAsyncViewComponent))]
+        public void GetViewComponents_ThrowsIfInvokeAsyncDoesNotHaveCorrectReturnType(Type type)
+        {
+            // Arrange
+            var expected = $"Method 'InvokeAsync' of view component '{type}' should be declared to return Task<T>.";
+            var provider = CreateProvider(type);
+
+            // Act and Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => provider.GetViewComponents().ToArray());
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Theory]
+        [InlineData(typeof(TaskReturningInvokeViewComponent))]
+        [InlineData(typeof(GenericTaskReturningInvokeViewComponent))]
+        public void GetViewComponents_ThrowsIfInvokeReturnsATask(Type type)
+        {
+            // Arrange
+            var expected = $"Method 'Invoke' of view component '{type}' cannot return a Task.";
+            var provider = CreateProvider(type);
+
+            // Act and Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => provider.GetViewComponents().ToArray());
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public void GetViewComponents_ThrowsIfInvokeIsVoidReturning()
+        {
+            // Arrange
+            var type = typeof(VoidReturningInvokeViewComponent);
+            var expected = $"Method 'Invoke' of view component '{type}' should be declared to return a value.";
+            var provider = CreateProvider(type);
+
+            // Act and Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => provider.GetViewComponents().ToArray());
+            Assert.Equal(expected, ex.Message);
+        }
+
+        private class MultipleInvokeViewComponent
+        {
+            public IViewComponentResult Invoke() => null;
+
+            public IViewComponentResult Invoke(int a) => null;
+        }
+
+        private class NoMethodsViewComponent
+        {
+        }
+
+        private class NonPublicInvokeViewComponent
+        {
+            private IViewComponentResult Invoke() => null;
+        }
+
+        private class NonPublicInvokeAsyncViewComponent
+        {
+            protected Task<IViewComponentResult> InvokeAsync() => null;
+        }
+
+        private class MultipleInvokeAsyncViewComponent
+        {
+            public Task<IViewComponentResult> InvokeAsync(string a) => null;
+
+            public Task<IViewComponentResult> InvokeAsync(int a) => null;
+
+            public Task<IViewComponentResult> InvokeAsync(int a, int b) => null;
+        }
+
+        private class InvokeAndInvokeAsyncViewComponent
+        {
+            public Task<IViewComponentResult> InvokeAsync(string a) => null;
+
+            public string InvokeAsync(int a) => null;
+        }
+
+        private class NonGenericTaskReturningInvokeAsyncViewComponent
+        {
+            public Task InvokeAsync() => Task.FromResult(0);
+        }
+
+        private class VoidReturningInvokeAsyncViewComponent
+        {
+            public void InvokeAsync()
+            {
+            }
+        }
+
+        public class NonTaskReturningInvokeAsyncViewComponent
+        {
+            public long InvokeAsync() => 0L;
+        }
+
+        public class TaskReturningInvokeViewComponent
+        {
+            public Task Invoke() => Task.FromResult(0);
+        }
+
+        public class GenericTaskReturningInvokeViewComponent
+        {
+            public Task<int> Invoke() => Task.FromResult(0);
+        }
+
+        public class VoidReturningInvokeViewComponent
+        {
+            public void Invoke(int x)
+            {
+            }
+        }
+
+        private DefaultViewComponentDescriptorProvider CreateProvider(Type componentType)
+        {
+            return new FilteredViewComponentDescriptorProvider(componentType);
+        }
+
+        // This will only consider types nested inside this class as ViewComponent classes
+        private class FilteredViewComponentDescriptorProvider : DefaultViewComponentDescriptorProvider
+        {
+            public FilteredViewComponentDescriptorProvider(params Type[] allowedTypes)
+                : base(GetApplicationPartManager(allowedTypes.Select(t => t.GetTypeInfo())))
+            {
+            }
+
+            private static ApplicationPartManager GetApplicationPartManager(IEnumerable<TypeInfo> types)
+            {
+                var manager = new ApplicationPartManager();
+                manager.ApplicationParts.Add(new TestApplicationPart(types));
+                manager.FeatureProviders.Add(new TestFeatureProvider());
+                return manager;
+            }
+
+            private class TestFeatureProvider : IApplicationFeatureProvider<ViewComponentFeature>
+            {
+                public void PopulateFeature(IEnumerable<ApplicationPart> parts, ViewComponentFeature feature)
+                {
+                    foreach (var type in parts.OfType<IApplicationPartTypeProvider>().SelectMany(p => p.Types))
+                    {
+                        feature.ViewComponents.Add(type);
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentFactoryTest.cs
new file mode 100644
index 0000000000..0bd612220d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentFactoryTest.cs
@@ -0,0 +1,78 @@
+// 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.
+
+using System;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    public class DefaultViewComponentFactoryTest
+    {
+        [Fact]
+        public void CreateViewComponent_ActivatesProperties_OnTheInstance()
+        {
+            // Arrange
+            var context = new ViewComponentContext
+            {
+            };
+
+            var component = new ActivablePropertiesViewComponent();
+            var activator = new Mock<IViewComponentActivator>();
+            activator.Setup(a => a.Create(context))
+                .Returns(component);
+
+            var factory = new DefaultViewComponentFactory(activator.Object);
+
+            // Act
+            var result = factory.CreateViewComponent(context);
+
+            // Assert
+            var activablePropertiesComponent = Assert.IsType<ActivablePropertiesViewComponent>(result);
+
+            Assert.Same(component, activablePropertiesComponent);
+            Assert.Same(component.Context, activablePropertiesComponent.Context);
+        }
+
+        [Fact]
+        public void ReleaseViewComponent_CallsDispose_OnTheInstance()
+        {
+            // Arrange
+            var context = new ViewComponentContext
+            {
+            };
+
+            var component = new ActivablePropertiesViewComponent();
+
+            var viewComponentActivator = new Mock<IViewComponentActivator>();
+            viewComponentActivator.Setup(vca => vca.Release(context, component))
+                .Callback<ViewComponentContext, object>((c, o) => (o as IDisposable)?.Dispose());
+
+            var factory = new DefaultViewComponentFactory(viewComponentActivator.Object);
+
+            // Act
+            factory.ReleaseViewComponent(context, component);
+
+            // Assert
+            Assert.True(component.Disposed);
+        }
+    }
+
+    public class ActivablePropertiesViewComponent : IDisposable
+    {
+        [ViewComponentContext]
+        public ViewComponentContext Context { get; set; }
+
+        public bool Disposed { get; private set; }
+
+        public void Dispose()
+        {
+            Disposed = true;
+        }
+
+        public string Invoke()
+        {
+            return "something";
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentHelperTest.cs
new file mode 100644
index 0000000000..1bebf6ebac
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentHelperTest.cs
@@ -0,0 +1,213 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    public class DefaultViewComponentHelperTest
+    {
+        [Fact]
+        public void GetArgumentDictionary_SupportsNullArguments()
+        {
+            // Arrange
+            var helper = CreateHelper();
+            var descriptor = CreateDescriptorForType(typeof(ViewComponentSingleParam));
+
+            // Act
+            var argumentDictionary = helper.GetArgumentDictionary(descriptor, null);
+
+            // Assert
+            Assert.Equal(0, argumentDictionary.Count);
+            Assert.IsType<Dictionary<string,object>>(argumentDictionary);
+        }
+
+        [Fact]
+        public void GetArgumentDictionary_SupportsAnonymouslyTypedArguments()
+        {
+            // Arrange
+            var helper = CreateHelper();
+            var descriptor = CreateDescriptorForType(typeof(ViewComponentSingleParam));
+
+            // Act
+            var argumentDictionary = helper.GetArgumentDictionary(descriptor, new { a = 0 });
+
+            // Assert
+            Assert.Collection(argumentDictionary,
+                item =>
+                {
+                    Assert.Equal("a", item.Key);
+                    Assert.IsType<int>(item.Value);
+                    Assert.Equal(0, item.Value);
+                });
+        }
+
+        [Fact]
+        public void GetArgumentDictionary_SingleParameter_DoesNotNeedAnonymouslyTypedArguments()
+        {
+            // Arrange
+            var helper = CreateHelper();
+            var descriptor = CreateDescriptorForType(typeof(ViewComponentSingleParam));
+
+            // Act
+            var argumentDictionary = helper.GetArgumentDictionary(descriptor, 0);
+
+            // Assert
+            Assert.Collection(argumentDictionary,
+                item =>
+                {
+                    Assert.Equal("a", item.Key);
+                    Assert.IsType<int>(item.Value);
+                    Assert.Equal(0, item.Value);
+                });
+        }
+
+        [Fact]
+        public void GetArgumentDictionary_MultipleParameters_NeedsAnonymouslyTypedArguments()
+        {
+            // Arrange
+            var helper = CreateHelper();
+            var descriptor = CreateDescriptorForType(typeof(ViewComponentMultipleParam));
+
+            // Act
+            var argumentDictionary = helper.GetArgumentDictionary(descriptor, new { a = 0, b = "foo" });
+
+            // Assert
+            Assert.Collection(argumentDictionary,
+                item1 =>
+                {
+                    Assert.Equal("a", item1.Key);
+                    Assert.IsType<int>(item1.Value);
+                    Assert.Equal(0, item1.Value);
+                },
+                item2 =>
+                {
+                    Assert.Equal("b", item2.Key);
+                    Assert.IsType<string>(item2.Value);
+                    Assert.Equal("foo", item2.Value);
+                });
+        }
+
+        [Fact]
+        public void GetArgumentDictionary_SingleObjectParameter_DoesNotNeedAnonymouslyTypedArguments()
+        {
+            // Arrange
+            var helper = CreateHelper();
+            var descriptor = CreateDescriptorForType(typeof(ViewComponentObjectParam));
+            var expectedValue = new object();
+
+            // Act
+            var argumentDictionary = helper.GetArgumentDictionary(descriptor, expectedValue);
+
+            // Assert
+            Assert.Collection(argumentDictionary,
+                item =>
+                {
+                    Assert.Equal("o", item.Key);
+                    Assert.IsType<object>(item.Value);
+                    Assert.Same(expectedValue, item.Value);
+                });
+        }
+
+        [Fact]
+        public void GetArgumentDictionary_SingleParameter_AcceptsDictionaryType()
+        {
+            // Arrange
+            var helper = CreateHelper();
+            var descriptor = CreateDescriptorForType(typeof(ViewComponentSingleParam));
+            var arguments = new Dictionary<string, object>
+            {
+                { "a", 10 }
+            };
+
+            // Act
+            var argumentDictionary = helper.GetArgumentDictionary(descriptor, arguments);
+
+            // Assert
+            Assert.Collection(argumentDictionary,
+                item =>
+                {
+                    Assert.Equal("a", item.Key);
+                    Assert.IsType<int>(item.Value);
+                    Assert.Equal(10, item.Value);
+                });
+        }
+
+        private DefaultViewComponentHelper CreateHelper()
+        {
+            var descriptorCollectionProvider = Mock.Of<IViewComponentDescriptorCollectionProvider>();
+            var selector = Mock.Of<IViewComponentSelector>();
+            var invokerFactory = Mock.Of<IViewComponentInvokerFactory>();
+            var viewBufferScope = Mock.Of<IViewBufferScope>();
+
+            return new DefaultViewComponentHelper(
+                descriptorCollectionProvider,
+                new HtmlTestEncoder(),
+                selector,
+                invokerFactory,
+                viewBufferScope);
+        }
+
+        private ViewComponentDescriptor CreateDescriptorForType(Type componentType)
+        {
+            var provider = CreateProvider(componentType);
+            return provider.GetViewComponents().First();
+        }
+
+        private class ViewComponentSingleParam
+        {
+            public IViewComponentResult Invoke(int a) => null;
+        }
+
+        private class ViewComponentMultipleParam
+        {
+            public IViewComponentResult Invoke(int a, string b) => null;
+        }
+
+        private class ViewComponentObjectParam
+        {
+            public IViewComponentResult Invoke(object o) => null;
+        }
+
+        private DefaultViewComponentDescriptorProvider CreateProvider(Type componentType)
+        {
+            return new FilteredViewComponentDescriptorProvider(componentType);
+        }
+
+        // This will only consider types nested inside this class as ViewComponent classes
+        private class FilteredViewComponentDescriptorProvider : DefaultViewComponentDescriptorProvider
+        {
+            public FilteredViewComponentDescriptorProvider(params Type[] allowedTypes)
+                : base(GetApplicationPartManager(allowedTypes.Select(t => t.GetTypeInfo())))
+            {
+            }
+
+            private static ApplicationPartManager GetApplicationPartManager(IEnumerable<TypeInfo> types)
+            {
+                var manager = new ApplicationPartManager();
+                manager.ApplicationParts.Add(new TestApplicationPart(types));
+                manager.FeatureProviders.Add(new TestFeatureProvider());
+                return manager;
+            }
+
+            private class TestFeatureProvider : IApplicationFeatureProvider<ViewComponentFeature>
+            {
+                public void PopulateFeature(IEnumerable<ApplicationPart> parts, ViewComponentFeature feature)
+                {
+                    foreach (var type in parts.OfType<IApplicationPartTypeProvider>().SelectMany(p => p.Types))
+                    {
+                        feature.ViewComponents.Add(type);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs
new file mode 100644
index 0000000000..3bb4026467
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs
@@ -0,0 +1,274 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    public class DefaultViewComponentSelectorTest
+    {
+        private static readonly string Namespace = typeof(DefaultViewComponentSelectorTest).Namespace;
+
+        [Fact]
+        public void SelectComponent_ByShortNameWithSuffix()
+        {
+            // Arrange
+            var selector = CreateSelector();
+
+            // Act
+            var result = selector.SelectComponent("Suffix");
+
+            // Assert
+            Assert.Same(typeof(ViewComponentContainer.SuffixViewComponent).GetTypeInfo(), result.TypeInfo);
+        }
+
+        [Fact]
+        public void SelectComponent_ByLongNameWithSuffix()
+        {
+            // Arrange
+            var selector = CreateSelector();
+
+            // Act
+            var result = selector.SelectComponent($"{Namespace}.Suffix");
+
+            // Assert
+            Assert.Same(typeof(ViewComponentContainer.SuffixViewComponent).GetTypeInfo(), result.TypeInfo);
+        }
+
+        [Fact]
+        public void SelectComponent_ByShortNameWithoutSuffix()
+        {
+            // Arrange
+            var selector = CreateSelector();
+
+            // Act
+            var result = selector.SelectComponent("WithoutSuffix");
+
+            // Assert
+            Assert.Same(typeof(ViewComponentContainer.WithoutSuffix).GetTypeInfo(), result.TypeInfo);
+        }
+
+        [Fact]
+        public void SelectComponent_ByLongNameWithoutSuffix()
+        {
+            // Arrange
+            var selector = CreateSelector();
+
+            // Act
+            var result = selector.SelectComponent($"{Namespace}.WithoutSuffix");
+
+            // Assert
+            Assert.Same(typeof(ViewComponentContainer.WithoutSuffix).GetTypeInfo(), result.TypeInfo);
+        }
+
+        [Fact]
+        public void SelectComponent_ByAttribute()
+        {
+            // Arrange
+            var selector = CreateSelector();
+
+            // Act
+            var result = selector.SelectComponent("ByAttribute");
+
+            // Assert
+            Assert.Same(typeof(ViewComponentContainer.ByAttribute).GetTypeInfo(), result.TypeInfo);
+        }
+
+        [Fact]
+        public void SelectComponent_ByNamingConvention()
+        {
+            // Arrange
+            var selector = CreateSelector();
+
+            // Act
+            var result = selector.SelectComponent("ByNamingConvention");
+
+            // Assert
+            Assert.Same(typeof(ViewComponentContainer.ByNamingConventionViewComponent).GetTypeInfo(), result.TypeInfo);
+        }
+
+        [Fact]
+        public void SelectComponent_Ambiguity()
+        {
+            // Arrange
+            var selector = CreateSelector();
+            var expected =
+                "The view component name 'Ambiguous' matched multiple types:" + Environment.NewLine +
+                $"Type: '{typeof(ViewComponentContainer.Ambiguous1)}' - " +
+                "Name: 'Namespace1.Ambiguous'" + Environment.NewLine +
+                $"Type: '{typeof(ViewComponentContainer.Ambiguous2)}' - " +
+                "Name: 'Namespace2.Ambiguous'";
+
+            // Act
+            var ex = Assert.Throws<InvalidOperationException>(() => selector.SelectComponent("Ambiguous"));
+
+            // Assert
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Theory]
+        [InlineData("Name")]
+        [InlineData("Ambiguous.Name")]
+        public void SelectComponent_AmbiguityDueToDerivation(string name)
+        {
+            // Arrange
+            var selector = CreateSelector();
+            var expected =
+                $"The view component name '{name}' matched multiple types:" + Environment.NewLine +
+                $"Type: '{typeof(ViewComponentContainer.AmbiguousBase)}' - " +
+                "Name: 'Ambiguous.Name'" + Environment.NewLine +
+                $"Type: '{typeof(ViewComponentContainer.DerivedAmbiguous)}' - " +
+                "Name: 'Ambiguous.Name'";
+
+            // Act
+            var ex = Assert.Throws<InvalidOperationException>(() => selector.SelectComponent(name));
+
+            // Assert
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public void SelectComponent_FullNameToAvoidAmbiguity()
+        {
+            // Arrange
+            var selector = CreateSelector();
+
+            // Act
+            var result = selector.SelectComponent("Namespace1.Ambiguous");
+
+            // Assert
+            Assert.Same(typeof(ViewComponentContainer.Ambiguous1).GetTypeInfo(), result.TypeInfo);
+        }
+
+        [Fact]
+        public void SelectComponent_OverrideNameToAvoidAmbiguity()
+        {
+            // Arrange
+            var selector = CreateSelector();
+
+            // Act
+            var result = selector.SelectComponent("NonAmbiguousName");
+
+            // Assert
+            Assert.Same(typeof(ViewComponentContainer.DerivedAmbiguousWithOverriddenName).GetTypeInfo(), result.TypeInfo);
+        }
+
+        [Theory]
+        [InlineData("FullNameInAttribute")]
+        [InlineData("CoolNameSpace.FullNameInAttribute")]
+        public void SelectComponent_FullNameInAttribute(string name)
+        {
+            // Arrange
+            var selector = CreateSelector();
+
+            // Act
+            var result = selector.SelectComponent(name);
+
+            // Assert
+            Assert.Same(typeof(ViewComponentContainer.FullNameInAttribute).GetTypeInfo(), result.TypeInfo);
+        }
+
+        private IViewComponentSelector CreateSelector()
+        {
+            var provider = new DefaultViewComponentDescriptorCollectionProvider(
+                new FilteredViewComponentDescriptorProvider());
+
+            return new DefaultViewComponentSelector(provider);
+        }
+
+        private class ViewComponentContainer
+        {
+            public class SuffixViewComponent : ViewComponent
+            {
+                public string Invoke() => "Hello";
+            }
+
+            public class WithoutSuffix : ViewComponent
+            {
+                public string Invoke() => "Hello";
+            }
+
+            public class ByNamingConventionViewComponent
+            {
+                public string Invoke() => "Hello";
+            }
+
+            [ViewComponent]
+            public class ByAttribute
+            {
+                public string Invoke() => "Hello";
+            }
+
+            [ViewComponent(Name = "Namespace1.Ambiguous")]
+            public class Ambiguous1
+            {
+                public string Invoke() => "Hello";
+            }
+
+            [ViewComponent(Name = "Namespace2.Ambiguous")]
+            public class Ambiguous2
+            {
+                public string Invoke() => "Hello";
+            }
+
+            [ViewComponent(Name = "CoolNameSpace.FullNameInAttribute")]
+            public class FullNameInAttribute
+            {
+                public string Invoke() => "Hello";
+            }
+
+            [ViewComponent(Name = "Ambiguous.Name")]
+            public class AmbiguousBase
+            {
+                public string Invoke() => "Hello";
+            }
+
+            public class DerivedAmbiguous : AmbiguousBase
+            {
+            }
+
+            [ViewComponent(Name = "NonAmbiguousName")]
+            public class DerivedAmbiguousWithOverriddenName : AmbiguousBase
+            {
+            }
+        }
+        // This will only consider types nested inside this class as ViewComponent classes
+        private class FilteredViewComponentDescriptorProvider : DefaultViewComponentDescriptorProvider
+        {
+            public FilteredViewComponentDescriptorProvider()
+                : this(typeof(ViewComponentContainer).GetNestedTypes(bindingAttr: BindingFlags.Public))
+            {
+            }
+
+            // For error messages in tests above, ensure the TestApplicationPart returns types in a consistent order.
+            public FilteredViewComponentDescriptorProvider(params Type[] allowedTypes)
+                : base(GetApplicationPartManager(allowedTypes.OrderBy(type => type.Name, StringComparer.Ordinal)))
+            {
+            }
+
+            private static ApplicationPartManager GetApplicationPartManager(IEnumerable<Type> types)
+            {
+                var manager = new ApplicationPartManager();
+                manager.ApplicationParts.Add(new TestApplicationPart(types));
+                manager.FeatureProviders.Add(new TestFeatureProvider());
+                return manager;
+            }
+
+            private class TestFeatureProvider : IApplicationFeatureProvider<ViewComponentFeature>
+            {
+                public void PopulateFeature(IEnumerable<ApplicationPart> parts, ViewComponentFeature feature)
+                {
+                    foreach (var type in parts.OfType<IApplicationPartTypeProvider>().SelectMany(p => p.Types))
+                    {
+                        feature.ViewComponents.Add(type);
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/HtmlContentViewComponentResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/HtmlContentViewComponentResultTest.cs
new file mode 100644
index 0000000000..21f8f61c31
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/HtmlContentViewComponentResultTest.cs
@@ -0,0 +1,70 @@
+// 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.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class HtmlContentViewComponentResultTest
+    {
+        [Fact]
+        public void Execute_WritesData_PreEncoded()
+        {
+            // Arrange
+            var buffer = new MemoryStream();
+            var viewComponentContext = GetViewComponentContext(Mock.Of<IView>(), buffer);
+
+            var result = new HtmlContentViewComponentResult(new HtmlString("<Test />"));
+
+            // Act
+            result.Execute(viewComponentContext);
+            buffer.Position = 0;
+
+            // Assert
+            Assert.Equal("<Test />", new StreamReader(buffer).ReadToEnd());
+        }
+
+        private static ViewComponentContext GetViewComponentContext(IView view, Stream stream)
+        {
+            var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+            var viewContext = new ViewContext(
+                actionContext,
+                view,
+                viewData,
+                new TempDataDictionary(actionContext.HttpContext, new SessionStateTempDataProvider()),
+                TextWriter.Null,
+                new HtmlHelperOptions());
+
+            var writer = new StreamWriter(stream) { AutoFlush = true };
+
+            var viewComponentDescriptor = new ViewComponentDescriptor()
+            {
+                TypeInfo = typeof(object).GetTypeInfo(),
+            };
+
+            var viewComponentContext = new ViewComponentContext(
+                viewComponentDescriptor,
+                new Dictionary<string, object>(),
+                new HtmlTestEncoder(),
+                viewContext,
+                writer);
+
+            return viewComponentContext;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentContextTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentContextTest.cs
new file mode 100644
index 0000000000..9d0709e0ce
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentContextTest.cs
@@ -0,0 +1,115 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    public class ViewComponentContextTest
+    {
+        [Fact]
+        public void Constructor_PerformsDefensiveCopies()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+            var tempData = new TempDataDictionary(httpContext, new SessionStateTempDataProvider());
+            var viewContext = new ViewContext(
+                actionContext,
+                NullView.Instance,
+                viewData,
+                tempData,
+                TextWriter.Null,
+                new HtmlHelperOptions());
+
+            var viewComponentDescriptor = new ViewComponentDescriptor();
+
+            // Act
+            var viewComponentContext = new ViewComponentContext(
+                viewComponentDescriptor,
+                new Dictionary<string, object>(),
+                new HtmlTestEncoder(),
+                viewContext,
+                TextWriter.Null);
+
+            // Assert
+            // New ViewContext but initial View and TextWriter copied over.
+            Assert.NotSame(viewContext, viewComponentContext.ViewContext);
+            Assert.Same(tempData, viewComponentContext.TempData);
+            Assert.Same(viewContext.View, viewComponentContext.ViewContext.View);
+            Assert.Same(viewContext.Writer, viewComponentContext.ViewContext.Writer);
+
+            // Double-check the convenience properties.
+            Assert.Same(viewComponentContext.ViewContext.ViewData, viewComponentContext.ViewData);
+            Assert.Same(viewComponentContext.ViewContext.TempData, viewComponentContext.TempData);
+            Assert.Same(viewComponentContext.ViewContext.Writer, viewComponentContext.Writer);
+
+            // New VDD instance but initial ModelMetadata copied over.
+            Assert.NotSame(viewData, viewComponentContext.ViewData);
+            Assert.Same(viewData.ModelMetadata, viewComponentContext.ViewData.ModelMetadata);
+        }
+
+        public static TheoryData<object, Type> IncompatibleModelData
+        {
+            get
+            {
+                // Small "anything but int" grab bag of instances and expected types.
+                return new TheoryData<object, Type>
+                {
+                    { null, typeof(object) },
+                    { true, typeof(bool) },
+                    { 43.78, typeof(double) },
+                    { "test string", typeof(string) },
+                    { new List<int>(), typeof(List<int>) },
+                    { new List<string>(), typeof(List<string>) },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(IncompatibleModelData))]
+        public void ViewDataModelSetter_DoesNotThrow_IfValueIncompatibleWithSourceDeclaredType(
+            object model,
+            Type expectedType)
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var viewData = new ViewDataDictionary<int>(new EmptyModelMetadataProvider());
+            var viewContext = new ViewContext(
+                actionContext,
+                NullView.Instance,
+                viewData,
+                new TempDataDictionary(httpContext, new SessionStateTempDataProvider()),
+                TextWriter.Null,
+                new HtmlHelperOptions());
+
+            var viewComponentDescriptor = new ViewComponentDescriptor();
+            var viewComponentContext = new ViewComponentContext(
+                viewComponentDescriptor,
+                new Dictionary<string, object>(),
+                new HtmlTestEncoder(),
+                viewContext,
+                TextWriter.Null);
+
+            // Act (does not throw)
+            // Non-ints can be assigned despite type restrictions in the source ViewDataDictionary.
+            viewComponentContext.ViewData.Model = model;
+
+            // Assert
+            Assert.Equal(expectedType, viewComponentContext.ViewData.ModelMetadata.ModelType);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentConventionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentConventionsTest.cs
new file mode 100644
index 0000000000..430764f79e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentConventionsTest.cs
@@ -0,0 +1,175 @@
+// 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.
+
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.Core;
+using Microsoft.AspNetCore.Mvc.ViewComponentConventionsTestClasses;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewComponents
+{
+    public class ViewComponentConventionsTest
+    {
+        [Theory]
+
+        // Only public top-level classes can be view components.
+        [InlineData(typeof(PublicClass), true)]
+        [InlineData(typeof(InternalClass), false)]
+        [InlineData(typeof(PublicNestedClass), false)]
+        [InlineData(typeof(PrivateNestedClass), false)]
+
+        // Abstract classes, interfaces, and open generics don't work either.
+        [InlineData(typeof(AbstractClass), false)]
+        [InlineData(typeof(IAmAnInterfaceViewComponent), false)]
+        [InlineData(typeof(GenericViewComponent<>), false)]
+        [InlineData(typeof(GenericViewComponent<string>), true)]
+
+        // You need the attribute, or a naming convention
+        [InlineData(typeof(Nada), false)]
+
+        // Naming convention doesn't apply to derived classes that don't follow it.
+        [InlineData(typeof(NamingConventionViewComponent), true)]
+        [InlineData(typeof(CaseInsensitiveNamingConventionVIEWCOMPONENT), true)]
+        [InlineData(typeof(DerivedNamingConvention), false)]
+
+        // The Attribute does apply to derived classes.
+        [InlineData(typeof(WithAttribute), true)]
+        [InlineData(typeof(DerivedWithAttribute), true)]
+        [InlineData(typeof(WithAttributeAndName), true)]
+        [InlineData(typeof(DerivedWithAttributeAndName), true)]
+        [InlineData(typeof(DerivedWithOverriddenAttributeName), true)]
+
+        // Value types cannot be view components
+        [InlineData(typeof(int), false)]
+
+        // If it has NonViewComponent it's not a view component
+        [InlineData(typeof(NonViewComponentAttributeViewComponent), false)]
+        [InlineData(typeof(ChildOfNonViewComponent), false)]
+        public void IsComponent(Type type, bool expected)
+        {
+            // Arrange & Act
+            var result = ViewComponentConventions.IsComponent(type.GetTypeInfo());
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Theory]
+        [InlineData(typeof(PublicClass), "PublicClass")]
+        [InlineData(typeof(GenericViewComponent<string>), "GenericViewComponent`1")]
+        [InlineData(typeof(NamingConventionViewComponent), "NamingConvention")]
+        [InlineData(typeof(CaseInsensitiveNamingConventionVIEWCOMPONENT), "CaseInsensitiveNamingConvention")]
+        [InlineData(typeof(WithAttribute), "WithAttribute")]
+        [InlineData(typeof(DerivedWithAttribute), "DerivedWithAttribute")]
+        [InlineData(typeof(WithAttributeAndName), "Name")]
+        [InlineData(typeof(DerivedWithAttributeAndName), "Name")]
+        [InlineData(typeof(DerivedWithOverriddenAttributeName), "Name")]
+        public void GetComponentName(Type type, string expected)
+        {
+            // Arrange & Act
+            var result = ViewComponentConventions.GetComponentName(type.GetTypeInfo());
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Theory]
+        [InlineData(typeof(PublicClass), "Microsoft.AspNetCore.Mvc.ViewComponentConventionsTestClasses.PublicClass")]
+        [InlineData(typeof(GenericViewComponent<string>), "Microsoft.AspNetCore.Mvc.ViewComponentConventionsTestClasses.GenericViewComponent`1")]
+        [InlineData(typeof(NamingConventionViewComponent), "Microsoft.AspNetCore.Mvc.ViewComponentConventionsTestClasses.NamingConvention")]
+        [InlineData(typeof(CaseInsensitiveNamingConventionVIEWCOMPONENT), "Microsoft.AspNetCore.Mvc.ViewComponentConventionsTestClasses.CaseInsensitiveNamingConvention")]
+        [InlineData(typeof(WithAttribute), "Microsoft.AspNetCore.Mvc.ViewComponentConventionsTestClasses.WithAttribute")]
+        [InlineData(typeof(DerivedWithAttribute), "Microsoft.AspNetCore.Mvc.ViewComponentConventionsTestClasses.DerivedWithAttribute")]
+        [InlineData(typeof(WithAttributeAndName), "Name")]
+        [InlineData(typeof(DerivedWithAttributeAndName), "Name")]
+        [InlineData(typeof(DerivedWithOverriddenAttributeName), "New.Name")]
+        public void GetComponentFullName(Type type, string expected)
+        {
+            // Arrange & Act
+            var result = ViewComponentConventions.GetComponentFullName(type.GetTypeInfo());
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        public class PublicNestedClass : ViewComponent
+        {
+        }
+
+        private class PrivateNestedClass : ViewComponent
+        {
+        }
+    }
+}
+
+// These types need to be public/non-nested for validity of the test
+namespace Microsoft.AspNetCore.Mvc.ViewComponentConventionsTestClasses
+{
+    public class PublicClass : ViewComponent
+    {
+    }
+
+    internal class InternalClass : ViewComponent
+    {
+    }
+
+    public abstract class AbstractClass : ViewComponent
+    {
+    }
+
+    public class GenericViewComponent<T> : ViewComponent
+    {
+    }
+
+    public interface IAmAnInterfaceViewComponent
+    {
+    }
+
+    public class Nada
+    {
+    }
+
+    [NonViewComponent]
+    public class NonViewComponentAttributeViewComponent
+    { }
+
+    public class ChildOfNonViewComponent : NonViewComponentAttributeViewComponent
+    { }
+
+    public class NamingConventionViewComponent
+    {
+    }
+
+    public class DerivedNamingConvention : NamingConventionViewComponent
+    {
+    }
+
+    public class CaseInsensitiveNamingConventionVIEWCOMPONENT
+    {
+    }
+
+
+    [ViewComponent]
+    public class WithAttribute
+    {
+    }
+
+    public class DerivedWithAttribute : WithAttribute
+    {
+    }
+
+    [ViewComponent(Name = "Name")]
+    public class WithAttributeAndName
+    {
+    }
+
+    public class DerivedWithAttributeAndName : WithAttributeAndName
+    {
+    }
+
+    [ViewComponent(Name = "New.Name")]
+    public class DerivedWithOverriddenAttributeName : WithAttributeAndName
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentFeatureProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentFeatureProviderTest.cs
new file mode 100644
index 0000000000..6a075bf5d9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentFeatureProviderTest.cs
@@ -0,0 +1,79 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.ViewComponents.ViewComponentsFeatureTest;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.ViewComponents
+{
+    public class ViewComponentFeatureProviderTest
+    {
+        [Fact]
+        public void GetDescriptor_DefaultConventions()
+        {
+            // Arrange
+            var manager = new ApplicationPartManager();
+            manager.ApplicationParts.Add(new TestPart(typeof(ConventionsViewComponent)));
+            manager.FeatureProviders.Add(new ViewComponentFeatureProvider());
+
+            var feature = new ViewComponentFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            Assert.Equal(new[] { typeof(ConventionsViewComponent).GetTypeInfo() }, feature.ViewComponents.ToArray());
+        }
+
+        [Fact]
+        public void GetDescriptor_WithAttribute()
+        {
+            // Arrange
+            var manager = new ApplicationPartManager();
+            manager.ApplicationParts.Add(new TestPart(typeof(AttributeViewComponent)));
+            manager.FeatureProviders.Add(new ViewComponentFeatureProvider());
+
+            var feature = new ViewComponentFeature();
+
+            // Act
+            manager.PopulateFeature(feature);
+
+            // Assert
+            Assert.Equal(new[] { typeof(AttributeViewComponent).GetTypeInfo() }, feature.ViewComponents.ToArray());
+        }
+
+        private class TestPart : ApplicationPart, IApplicationPartTypeProvider
+        {
+            public TestPart(params Type[] types)
+            {
+                Types = types.Select(t => t.GetTypeInfo());
+            }
+
+            public override string Name => "Test";
+
+            public IEnumerable<TypeInfo> Types { get; }
+        }
+    }
+}
+
+// These tests need to be public for the test to be valid
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.ViewComponents.ViewComponentsFeatureTest
+{
+    public class ConventionsViewComponent
+    {
+        public string Invoke() => "Hello world";
+    }
+
+    [ViewComponent(Name = "AttributesAreGreat")]
+    public class AttributeViewComponent
+    {
+        public Task<string> InvokeAsync() => Task.FromResult("Hello world");
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs
new file mode 100644
index 0000000000..022c3d72bf
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs
@@ -0,0 +1,553 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    public class ViewViewComponentResultTest
+    {
+        private readonly ITempDataDictionary _tempDataDictionary =
+            new TempDataDictionary(new DefaultHttpContext(), new SessionStateTempDataProvider());
+
+        [Fact]
+        public void Execute_RendersPartialViews()
+        {
+            // Arrange
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Returns(Task.FromResult(result: true))
+                .Verifiable();
+
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, "some-view", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("some-view", Enumerable.Empty<string>()))
+                .Verifiable();
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "Components/Invoke/some-view", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("Components/Invoke/some-view", view.Object))
+                .Verifiable();
+
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+
+            var result = new ViewViewComponentResult
+            {
+                ViewEngine = viewEngine.Object,
+                ViewName = "some-view",
+                ViewData = viewData,
+                TempData = _tempDataDictionary,
+            };
+
+            var viewComponentContext = GetViewComponentContext(view.Object, viewData);
+
+            // Act
+            result.Execute(viewComponentContext);
+
+            // Assert
+            viewEngine.Verify();
+            view.Verify();
+        }
+
+        [Fact]
+        public void Execute_ResolvesView_WithDefaultAsViewName()
+        {
+            // Arrange
+            var view = new Mock<IView>(MockBehavior.Strict);
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Returns(Task.FromResult(result: true))
+                .Verifiable();
+
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "Components/Invoke/Default", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("Components/Invoke/Default", view.Object))
+                .Verifiable();
+
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+
+            var result = new ViewViewComponentResult
+            {
+                ViewEngine = viewEngine.Object,
+                ViewData = viewData,
+                TempData = _tempDataDictionary,
+            };
+
+            var viewComponentContext = GetViewComponentContext(view.Object, viewData);
+
+            // Act
+            result.Execute(viewComponentContext);
+
+            // Assert
+            viewEngine.Verify();
+            view.Verify();
+        }
+
+        [Fact]
+        public void Execute_ResolvesView_AndWritesDiagnosticSource()
+        {
+            // Arrange
+            var view = new Mock<IView>(MockBehavior.Strict);
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Returns(Task.FromResult(result: true))
+                .Verifiable();
+
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "Components/Invoke/Default", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("Components/Invoke/Default", view.Object))
+                .Verifiable();
+
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+
+            var result = new ViewViewComponentResult
+            {
+                ViewEngine = viewEngine.Object,
+                ViewData = viewData,
+                TempData = _tempDataDictionary,
+            };
+
+            var adapter = new TestDiagnosticListener();
+
+            var viewComponentContext = GetViewComponentContext(view.Object, viewData, adapter);
+
+            // Act
+            result.Execute(viewComponentContext);
+
+            // Assert
+            viewEngine.Verify();
+            view.Verify();
+
+            Assert.NotNull(adapter.ViewComponentBeforeViewExecute?.ActionDescriptor);
+            Assert.NotNull(adapter.ViewComponentBeforeViewExecute?.ViewComponentContext);
+            Assert.NotNull(adapter.ViewComponentBeforeViewExecute?.View);
+            Assert.NotNull(adapter.ViewComponentAfterViewExecute?.ActionDescriptor);
+            Assert.NotNull(adapter.ViewComponentAfterViewExecute?.ViewComponentContext);
+            Assert.NotNull(adapter.ViewComponentAfterViewExecute?.View);
+        }
+
+        [Fact]
+        public void Execute_ThrowsIfPartialViewCannotBeFound_MessageUsesGetViewLocations()
+        {
+            // Arrange
+            var expected = string.Join(Environment.NewLine,
+                "The view 'Components/Invoke/some-view' was not found. The following locations were searched:",
+                "location1",
+                "location2");
+
+            var view = Mock.Of<IView>();
+
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, "some-view", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("some-view", new[] { "location1", "location2" }))
+                .Verifiable();
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "Components/Invoke/some-view", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("Components/Invoke/some-view", Enumerable.Empty<string>()))
+                .Verifiable();
+
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+
+            var result = new ViewViewComponentResult
+            {
+                ViewEngine = viewEngine.Object,
+                ViewName = "some-view",
+                ViewData = viewData,
+                TempData = _tempDataDictionary,
+            };
+
+            var viewComponentContext = GetViewComponentContext(view, viewData);
+
+            // Act and Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => result.Execute(viewComponentContext));
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public void Execute_ThrowsIfPartialViewCannotBeFound_MessageUsesFindViewLocations()
+        {
+            // Arrange
+            var expected = string.Join(Environment.NewLine,
+                "The view 'Components/Invoke/some-view' was not found. The following locations were searched:",
+                "location1",
+                "location2");
+
+            var view = Mock.Of<IView>();
+
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, "some-view", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("some-view", Enumerable.Empty<string>()))
+                .Verifiable();
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "Components/Invoke/some-view", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("Components/Invoke/some-view", new[] { "location1", "location2" }))
+                .Verifiable();
+
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+
+            var result = new ViewViewComponentResult
+            {
+                ViewEngine = viewEngine.Object,
+                ViewName = "some-view",
+                ViewData = viewData,
+                TempData = _tempDataDictionary,
+            };
+
+            var viewComponentContext = GetViewComponentContext(view, viewData);
+
+            // Act and Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => result.Execute(viewComponentContext));
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public void Execute_ThrowsIfPartialViewCannotBeFound_MessageUsesAllLocations()
+        {
+            // Arrange
+            var expected = string.Join(Environment.NewLine,
+                "The view 'Components/Invoke/some-view' was not found. The following locations were searched:",
+                "location1",
+                "location2",
+                "location3",
+                "location4");
+
+            var view = Mock.Of<IView>();
+
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, "some-view", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("some-view", new[] { "location1", "location2" }))
+                .Verifiable();
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "Components/Invoke/some-view", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("Components/Invoke/some-view", new[] { "location3", "location4" }))
+                .Verifiable();
+
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+
+            var result = new ViewViewComponentResult
+            {
+                ViewEngine = viewEngine.Object,
+                ViewName = "some-view",
+                ViewData = viewData,
+                TempData = _tempDataDictionary,
+            };
+
+            var viewComponentContext = GetViewComponentContext(view, viewData);
+
+            // Act and Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => result.Execute(viewComponentContext));
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public void Execute_DoesNotWrapThrownExceptionsInAggregateExceptions()
+        {
+            // Arrange
+            var expected = new IndexOutOfRangeException();
+
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Throws(expected)
+                .Verifiable();
+
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, "some-view", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("some-view", Enumerable.Empty<string>()))
+                .Verifiable();
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "Components/Invoke/some-view", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("Components/Invoke/some-view", view.Object))
+                .Verifiable();
+
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+
+            var result = new ViewViewComponentResult
+            {
+                ViewEngine = viewEngine.Object,
+                ViewName = "some-view",
+                ViewData = viewData,
+                TempData = _tempDataDictionary,
+            };
+
+            var viewComponentContext = GetViewComponentContext(view.Object, viewData);
+
+            // Act
+            var actual = Record.Exception(() => result.Execute(viewComponentContext));
+
+            // Assert
+            Assert.Same(expected, actual);
+            view.Verify();
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_RendersPartialViews()
+        {
+            // Arrange
+            var view = Mock.Of<IView>();
+
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, "some-view", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("some-view", Enumerable.Empty<string>()))
+                .Verifiable();
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "Components/Invoke/some-view", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("Components/Invoke/some-view", view))
+                .Verifiable();
+
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+
+            var result = new ViewViewComponentResult
+            {
+                ViewEngine = viewEngine.Object,
+                ViewName = "some-view",
+                ViewData = viewData,
+                TempData = _tempDataDictionary,
+            };
+
+            var viewComponentContext = GetViewComponentContext(view, viewData);
+
+            // Act
+            await result.ExecuteAsync(viewComponentContext);
+
+            // Assert
+            viewEngine.Verify();
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_ResolvesViewEngineFromServiceProvider_IfNoViewEngineIsExplicitlyProvided()
+        {
+            // Arrange
+            var view = Mock.Of<IView>();
+
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, "some-view", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("some-view", Enumerable.Empty<string>()))
+                .Verifiable();
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "Components/Invoke/some-view", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found("Components/Invoke/some-view", view))
+                .Verifiable();
+
+            var serviceProvider = new Mock<IServiceProvider>();
+            serviceProvider.Setup(p => p.GetService(typeof(ICompositeViewEngine)))
+                .Returns(viewEngine.Object);
+            serviceProvider.Setup(p => p.GetService(typeof(DiagnosticSource)))
+                .Returns(new DiagnosticListener("Test"));
+
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+
+            var result = new ViewViewComponentResult
+            {
+                ViewName = "some-view",
+                ViewData = viewData,
+                TempData = _tempDataDictionary,
+            };
+
+            var viewComponentContext = GetViewComponentContext(view, viewData);
+            viewComponentContext.ViewContext.HttpContext.RequestServices = serviceProvider.Object;
+
+            // Act
+            await result.ExecuteAsync(viewComponentContext);
+
+            // Assert
+            viewEngine.Verify();
+            serviceProvider.Verify();
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_ThrowsIfPartialViewCannotBeFound()
+        {
+            // Arrange
+            var expected = string.Join(Environment.NewLine,
+                "The view 'Components/Invoke/some-view' was not found. The following locations were searched:",
+                "view-location1",
+                "view-location2",
+                "view-location3",
+                "view-location4");
+
+            var view = Mock.Of<IView>();
+
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, "some-view", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("some-view", new[] { "view-location1", "view-location2" }))
+                .Verifiable();
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), "Components/Invoke/some-view", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(
+                    "Components/Invoke/some-view",
+                    new[] { "view-location3", "view-location4" }))
+                .Verifiable();
+
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+
+            var result = new ViewViewComponentResult
+            {
+                ViewEngine = viewEngine.Object,
+                ViewName = "some-view",
+                ViewData = viewData,
+                TempData = _tempDataDictionary,
+            };
+
+            var viewComponentContext = GetViewComponentContext(view, viewData);
+
+            // Act and Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(
+                        () => result.ExecuteAsync(viewComponentContext));
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_Throws_IfNoViewEngineCanBeResolved()
+        {
+            // Arrange
+            var expected = $"No service for type '{typeof(ICompositeViewEngine).FullName}'" +
+                " has been registered.";
+
+            var view = Mock.Of<IView>();
+
+            var serviceProvider = new ServiceCollection().BuildServiceProvider();
+
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+
+            var result = new ViewViewComponentResult
+            {
+                ViewName = "some-view",
+                ViewData = viewData,
+                TempData = _tempDataDictionary,
+            };
+
+            var viewComponentContext = GetViewComponentContext(view, viewData);
+            viewComponentContext.ViewContext.HttpContext.RequestServices = serviceProvider;
+
+            // Act and Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(
+                        () => result.ExecuteAsync(viewComponentContext));
+            Assert.Equal(expected, ex.Message);
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void Execute_CallsFindView_WithExpectedPath_WhenViewNameIsNullOrEmpty(string viewName)
+        {
+            // Arrange
+            var shortName = "SomeShortName";
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+            var componentContext = GetViewComponentContext(new Mock<IView>().Object, viewData);
+            componentContext.ViewComponentDescriptor.ShortName = shortName;
+            var expectedViewName = $"Components/{shortName}/Default";
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), expectedViewName, /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found(expectedViewName, new Mock<IView>().Object))
+                .Verifiable();
+
+            var componentResult = new ViewViewComponentResult();
+            componentResult.ViewEngine = viewEngine.Object;
+            componentResult.ViewData = viewData;
+            componentResult.ViewName = viewName;
+            componentResult.TempData = _tempDataDictionary;
+
+            // Act & Assert
+            componentResult.Execute(componentContext);
+            viewEngine.Verify();
+        }
+
+        [Theory]
+        [InlineData("~/Home/Index/MyViewComponent1.cshtml")]
+        [InlineData("~MyViewComponent2.cshtml")]
+        [InlineData("/MyViewComponent3.cshtml")]
+        public void Execute_CallsFindView_WithExpectedPath_WhenViewNameIsSpecified(string viewName)
+        {
+            // Arrange
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, viewName, /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found(viewName, new Mock<IView>().Object))
+                .Verifiable();
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+            var componentContext = GetViewComponentContext(new Mock<IView>().Object, viewData);
+            var componentResult = new ViewViewComponentResult
+            {
+                ViewEngine = viewEngine.Object,
+                ViewData = viewData,
+                ViewName = viewName,
+                TempData = _tempDataDictionary,
+            };
+
+            // Act & Assert
+            componentResult.Execute(componentContext);
+            viewEngine.Verify();
+        }
+
+        private static ViewComponentContext GetViewComponentContext(
+            IView view,
+            ViewDataDictionary viewData,
+            object diagnosticListener = null)
+        {
+            var diagnosticSource = new DiagnosticListener("Microsoft.AspNetCore");
+            if (diagnosticListener == null)
+            {
+                diagnosticListener = new TestDiagnosticListener();
+            }
+
+            diagnosticSource.SubscribeWithAdapter(diagnosticListener);
+
+            var serviceProvider = new Mock<IServiceProvider>();
+            serviceProvider.Setup(s => s.GetService(typeof(DiagnosticSource))).Returns(diagnosticSource);
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = serviceProvider.Object;
+
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var viewContext = new ViewContext(
+                actionContext,
+                view,
+                viewData,
+                new TempDataDictionary(httpContext, new SessionStateTempDataProvider()),
+                TextWriter.Null,
+                new HtmlHelperOptions());
+
+            var viewComponentDescriptor = new ViewComponentDescriptor()
+            {
+                ShortName = "Invoke",
+                TypeInfo = typeof(object).GetTypeInfo(),
+                MethodInfo = typeof(object).GetTypeInfo().DeclaredMethods.First()
+            };
+
+            var viewComponentContext = new ViewComponentContext(
+                viewComponentDescriptor,
+                new Dictionary<string, object>(),
+                new HtmlTestEncoder(),
+                viewContext,
+                TextWriter.Null);
+
+            return viewComponentContext;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewEngines/CompositeViewEngineTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewEngines/CompositeViewEngineTest.cs
new file mode 100644
index 0000000000..2bf78663ec
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewEngines/CompositeViewEngineTest.cs
@@ -0,0 +1,460 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewEngines
+{
+    public class CompositeViewEngineTest
+    {
+        [Fact]
+        public void ViewEngines_UsesListOfViewEnginesFromOptions()
+        {
+            // Arrange
+            var viewEngine1 = Mock.Of<IViewEngine>();
+            var viewEngine2 = Mock.Of<IViewEngine>();
+            var optionsAccessor = Options.Create(new MvcViewOptions());
+            optionsAccessor.Value.ViewEngines.Add(viewEngine1);
+            optionsAccessor.Value.ViewEngines.Add(viewEngine2);
+            var compositeViewEngine = new CompositeViewEngine(optionsAccessor);
+
+            // Act
+            var result = compositeViewEngine.ViewEngines;
+
+            // Assert
+            Assert.Equal(new[] { viewEngine1, viewEngine2 }, result);
+        }
+
+        [Fact]
+        public void FindView_IsMainPage_Throws_WhenNoViewEnginesAreRegistered()
+        {
+            // Arrange
+            var expected = $"'{typeof(MvcViewOptions).FullName}.{nameof(MvcViewOptions.ViewEngines)}' must not be " +
+                $"empty. At least one '{typeof(IViewEngine).FullName}' is required to locate a view for rendering.";
+            var viewName = "test-view";
+            var actionContext = GetActionContext();
+            var optionsAccessor = Options.Create(new MvcViewOptions());
+            var compositeViewEngine = new CompositeViewEngine(optionsAccessor);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(
+                () => compositeViewEngine.FindView(actionContext, viewName, isMainPage: true));
+            Assert.Equal(expected, exception.Message);
+        }
+
+
+        [Fact]
+        public void FindView_IsMainPage_ReturnsNotFoundResult_WhenExactlyOneViewEngineIsRegisteredWhichReturnsNotFoundResult()
+        {
+            // Arrange
+            var viewName = "test-view";
+            var engine = new Mock<IViewEngine>(MockBehavior.Strict);
+            engine
+                .Setup(e => e.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ true))
+                .Returns(ViewEngineResult.NotFound(viewName, new[] { "controller/test-view" }));
+            var optionsAccessor = Options.Create(new MvcViewOptions());
+            optionsAccessor.Value.ViewEngines.Add(engine.Object);
+            var compositeViewEngine = new CompositeViewEngine(optionsAccessor);
+
+            // Act
+            var result = compositeViewEngine.FindView(GetActionContext(), viewName, isMainPage: true);
+
+            // Assert
+            Assert.False(result.Success);
+            Assert.Equal(new[] { "controller/test-view" }, result.SearchedLocations);
+        }
+
+        [Fact]
+        public void FindView_IsMainPage_ReturnsView_WhenExactlyOneViewEngineIsRegisteredWhichReturnsAFoundResult()
+        {
+            // Arrange
+            var viewName = "test-view";
+            var engine = new Mock<IViewEngine>(MockBehavior.Strict);
+            var view = Mock.Of<IView>();
+            engine
+                .Setup(e => e.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ true))
+                .Returns(ViewEngineResult.Found(viewName, view));
+            var optionsAccessor = Options.Create(new MvcViewOptions());
+            optionsAccessor.Value.ViewEngines.Add(engine.Object);
+            var compositeViewEngine = new CompositeViewEngine(optionsAccessor);
+
+            // Act
+            var result = compositeViewEngine.FindView(GetActionContext(), viewName, isMainPage: true);
+
+            // Assert
+            Assert.True(result.Success);
+            Assert.Same(view, result.View);
+        }
+
+        [Fact]
+        public void FindView_IsMainPage_ReturnsViewFromFirstViewEngineWithFoundResult()
+        {
+            // Arrange
+            var viewName = "foo";
+            var engine1 = new Mock<IViewEngine>(MockBehavior.Strict);
+            var engine2 = new Mock<IViewEngine>(MockBehavior.Strict);
+            var engine3 = new Mock<IViewEngine>(MockBehavior.Strict);
+            var view2 = Mock.Of<IView>();
+            var view3 = Mock.Of<IView>();
+            engine1
+                .Setup(e => e.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ true))
+                .Returns(ViewEngineResult.NotFound(viewName, Enumerable.Empty<string>()));
+            engine2
+                .Setup(e => e.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ true))
+                .Returns(ViewEngineResult.Found(viewName, view2));
+            engine3
+                .Setup(e => e.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ true))
+                .Returns(ViewEngineResult.Found(viewName, view3));
+
+            var optionsAccessor = Options.Create(new MvcViewOptions());
+            optionsAccessor.Value.ViewEngines.Add(engine1.Object);
+            optionsAccessor.Value.ViewEngines.Add(engine2.Object);
+            optionsAccessor.Value.ViewEngines.Add(engine3.Object);
+            var compositeViewEngine = new CompositeViewEngine(optionsAccessor);
+
+            // Act
+            var result = compositeViewEngine.FindView(GetActionContext(), viewName, isMainPage: true);
+
+            // Assert
+            Assert.True(result.Success);
+            Assert.Same(view2, result.View);
+            Assert.Equal(viewName, result.ViewName);
+        }
+
+        [Fact]
+        public void FindView_IsMainPage_ReturnsNotFound_IfAllViewEnginesReturnNotFound()
+        {
+            // Arrange
+            var viewName = "foo";
+            var engine1 = new Mock<IViewEngine>(MockBehavior.Strict);
+            var engine2 = new Mock<IViewEngine>(MockBehavior.Strict);
+            var engine3 = new Mock<IViewEngine>(MockBehavior.Strict);
+            engine1
+                .Setup(e => e.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ true))
+                .Returns(ViewEngineResult.NotFound(viewName, new[] { "1", "2" }));
+            engine2
+                .Setup(e => e.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ true))
+                .Returns(ViewEngineResult.NotFound(viewName, new[] { "3" }));
+            engine3
+                .Setup(e => e.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ true))
+                .Returns(ViewEngineResult.NotFound(viewName, new[] { "4", "5" }));
+
+            var optionsAccessor = Options.Create(new MvcViewOptions());
+            optionsAccessor.Value.ViewEngines.Add(engine1.Object);
+            optionsAccessor.Value.ViewEngines.Add(engine2.Object);
+            optionsAccessor.Value.ViewEngines.Add(engine3.Object);
+            var compositeViewEngine = new CompositeViewEngine(optionsAccessor);
+
+            // Act
+            var result = compositeViewEngine.FindView(GetActionContext(), viewName, isMainPage: true);
+
+            // Assert
+            Assert.False(result.Success);
+            Assert.Equal(new[] { "1", "2", "3", "4", "5" }, result.SearchedLocations);
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void GetView_ReturnsNotFoundResult_WhenNoViewEnginesAreRegistered(bool isMainPage)
+        {
+            // Arrange
+            var expected = $"'{typeof(MvcViewOptions).FullName}.{nameof(MvcViewOptions.ViewEngines)}' must not be " +
+                $"empty. At least one '{typeof(IViewEngine).FullName}' is required to locate a view for rendering.";
+            var viewName = "test-view.cshtml";
+            var optionsAccessor = Options.Create(new MvcViewOptions());
+            var compositeViewEngine = new CompositeViewEngine(optionsAccessor);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(
+                () => compositeViewEngine.GetView("~/Index.html", viewName, isMainPage));
+            Assert.Equal(expected, exception.Message);
+        }
+
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void GetView_ReturnsNotFoundResult_WhenExactlyOneViewEngineIsRegisteredWhichReturnsNotFoundResult(
+            bool isMainPage)
+        {
+            // Arrange
+            var viewName = "test-view.cshtml";
+            var expectedViewName = "~/" + viewName;
+            var engine = new Mock<IViewEngine>(MockBehavior.Strict);
+            engine
+                .Setup(e => e.GetView("~/Index.html", viewName, isMainPage))
+                .Returns(ViewEngineResult.NotFound(expectedViewName, new[] { expectedViewName }));
+            var optionsAccessor = Options.Create(new MvcViewOptions());
+            optionsAccessor.Value.ViewEngines.Add(engine.Object);
+            var compositeViewEngine = new CompositeViewEngine(optionsAccessor);
+
+            // Act
+            var result = compositeViewEngine.GetView("~/Index.html", viewName, isMainPage);
+
+            // Assert
+            Assert.False(result.Success);
+            Assert.Equal(new[] { expectedViewName }, result.SearchedLocations);
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void GetView_ReturnsView_WhenExactlyOneViewEngineIsRegisteredWhichReturnsAFoundResult(bool isMainPage)
+        {
+            // Arrange
+            var viewName = "test-view.cshtml";
+            var expectedViewName = "~/" + viewName;
+            var engine = new Mock<IViewEngine>(MockBehavior.Strict);
+            var view = Mock.Of<IView>();
+            engine
+                .Setup(e => e.GetView("~/Index.html", viewName, isMainPage))
+                .Returns(ViewEngineResult.Found(expectedViewName, view));
+            var optionsAccessor = Options.Create(new MvcViewOptions());
+            optionsAccessor.Value.ViewEngines.Add(engine.Object);
+            var compositeViewEngine = new CompositeViewEngine(optionsAccessor);
+
+            // Act
+            var result = compositeViewEngine.GetView("~/Index.html", viewName, isMainPage);
+
+            // Assert
+            Assert.True(result.Success);
+            Assert.Same(view, result.View);
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void GetView_ReturnsViewFromFirstViewEngineWithFoundResult(bool isMainPage)
+        {
+            // Arrange
+            var viewName = "foo.cshtml";
+            var expectedViewName = "~/" + viewName;
+            var engine1 = new Mock<IViewEngine>(MockBehavior.Strict);
+            var engine2 = new Mock<IViewEngine>(MockBehavior.Strict);
+            var engine3 = new Mock<IViewEngine>(MockBehavior.Strict);
+            var view2 = Mock.Of<IView>();
+            var view3 = Mock.Of<IView>();
+            engine1
+                .Setup(e => e.GetView("~/Index.html", viewName, isMainPage))
+                .Returns(ViewEngineResult.NotFound(expectedViewName, Enumerable.Empty<string>()));
+            engine2
+                .Setup(e => e.GetView("~/Index.html", viewName, isMainPage))
+                .Returns(ViewEngineResult.Found(expectedViewName, view2));
+            engine3
+                .Setup(e => e.GetView("~/Index.html", viewName, isMainPage))
+                .Returns(ViewEngineResult.Found(expectedViewName, view3));
+
+            var optionsAccessor = Options.Create(new MvcViewOptions());
+            optionsAccessor.Value.ViewEngines.Add(engine1.Object);
+            optionsAccessor.Value.ViewEngines.Add(engine2.Object);
+            optionsAccessor.Value.ViewEngines.Add(engine3.Object);
+            var compositeViewEngine = new CompositeViewEngine(optionsAccessor);
+
+            // Act
+            var result = compositeViewEngine.GetView("~/Index.html", viewName, isMainPage);
+
+            // Assert
+            Assert.True(result.Success);
+            Assert.Same(view2, result.View);
+            Assert.Equal(expectedViewName, result.ViewName);
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void GetView_ReturnsNotFound_IfAllViewEnginesReturnNotFound(bool isMainPage)
+        {
+            // Arrange
+            var viewName = "foo.cshtml";
+            var expectedViewName = "~/" + viewName;
+            var engine1 = new Mock<IViewEngine>(MockBehavior.Strict);
+            var engine2 = new Mock<IViewEngine>(MockBehavior.Strict);
+            var engine3 = new Mock<IViewEngine>(MockBehavior.Strict);
+            engine1
+                .Setup(e => e.GetView("~/Index.html", viewName, isMainPage))
+                .Returns(ViewEngineResult.NotFound(expectedViewName, new[] { "1", "2" }));
+            engine2
+                .Setup(e => e.GetView("~/Index.html", viewName, isMainPage))
+                .Returns(ViewEngineResult.NotFound(expectedViewName, new[] { "3" }));
+            engine3
+                .Setup(e => e.GetView("~/Index.html", viewName, isMainPage))
+                .Returns(ViewEngineResult.NotFound(expectedViewName, new[] { "4", "5" }));
+
+            var optionsAccessor = Options.Create(new MvcViewOptions());
+            optionsAccessor.Value.ViewEngines.Add(engine1.Object);
+            optionsAccessor.Value.ViewEngines.Add(engine2.Object);
+            optionsAccessor.Value.ViewEngines.Add(engine3.Object);
+            var compositeViewEngine = new CompositeViewEngine(optionsAccessor);
+
+            // Act
+            var result = compositeViewEngine.GetView("~/Index.html", viewName, isMainPage);
+
+            // Assert
+            Assert.False(result.Success);
+            Assert.Equal(new[] { "1", "2", "3", "4", "5" }, result.SearchedLocations);
+        }
+
+        [Fact]
+        public void FindView_ReturnsNotFoundResult_WhenNoViewEnginesAreRegistered()
+        {
+            // Arrange
+            var expected = $"'{typeof(MvcViewOptions).FullName}.{nameof(MvcViewOptions.ViewEngines)}' must not be " +
+                $"empty. At least one '{typeof(IViewEngine).FullName}' is required to locate a view for rendering.";
+            var viewName = "my-partial-view";
+            var optionsAccessor = Options.Create(new MvcViewOptions());
+            var compositeViewEngine = new CompositeViewEngine(optionsAccessor);
+
+            // Act & AssertS
+            var exception = Assert.Throws<InvalidOperationException>(
+                () => compositeViewEngine.FindView(GetActionContext(), viewName, isMainPage: false));
+            Assert.Equal(expected, exception.Message);
+        }
+
+        [Fact]
+        public void FindView_ReturnsNotFoundResult_WhenExactlyOneViewEngineIsRegisteredWhichReturnsNotFoundResult()
+        {
+            // Arrange
+            var viewName = "partial-view";
+            var engine = new Mock<IViewEngine>(MockBehavior.Strict);
+            engine
+                .Setup(e => e.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(viewName, new[] { "Shared/partial-view" }));
+            var optionsAccessor = Options.Create(new MvcViewOptions());
+            optionsAccessor.Value.ViewEngines.Add(engine.Object);
+            var compositeViewEngine = new CompositeViewEngine(optionsAccessor);
+
+            // Act
+            var result = compositeViewEngine.FindView(GetActionContext(), viewName, isMainPage: false);
+
+            // Assert
+            Assert.False(result.Success);
+            Assert.Equal(new[] { "Shared/partial-view" }, result.SearchedLocations);
+        }
+
+        [Fact]
+        public void FindView_ReturnsView_WhenExactlyOneViewEngineIsRegisteredWhichReturnsAFoundResult()
+        {
+            // Arrange
+            var viewName = "test-view";
+            var engine = new Mock<IViewEngine>(MockBehavior.Strict);
+            var view = Mock.Of<IView>();
+            engine
+                .Setup(e => e.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found(viewName, view));
+            var optionsAccessor = Options.Create(new MvcViewOptions());
+            optionsAccessor.Value.ViewEngines.Add(engine.Object);
+            var compositeViewEngine = new CompositeViewEngine(optionsAccessor);
+
+            // Act
+            var result = compositeViewEngine.FindView(GetActionContext(), viewName, isMainPage: false);
+
+            // Assert
+            Assert.True(result.Success);
+            Assert.Same(view, result.View);
+        }
+
+        [Fact]
+        public void FindView_ReturnsViewFromFirstViewEngineWithFoundResult()
+        {
+            // Arrange
+            var viewName = "bar";
+            var engine1 = new Mock<IViewEngine>(MockBehavior.Strict);
+            var engine2 = new Mock<IViewEngine>(MockBehavior.Strict);
+            var engine3 = new Mock<IViewEngine>(MockBehavior.Strict);
+            var view2 = Mock.Of<IView>();
+            var view3 = Mock.Of<IView>();
+            engine1
+                .Setup(e => e.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(viewName, Enumerable.Empty<string>()));
+            engine2
+                .Setup(e => e.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found(viewName, view2));
+            engine3
+                .Setup(e => e.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found(viewName, view3));
+
+            var optionsAccessor = Options.Create(new MvcViewOptions());
+            optionsAccessor.Value.ViewEngines.Add(engine1.Object);
+            optionsAccessor.Value.ViewEngines.Add(engine2.Object);
+            optionsAccessor.Value.ViewEngines.Add(engine3.Object);
+            var compositeViewEngine = new CompositeViewEngine(optionsAccessor);
+
+            // Act
+            var result = compositeViewEngine.FindView(GetActionContext(), viewName, isMainPage: false);
+
+            // Assert
+            Assert.True(result.Success);
+            Assert.Same(view2, result.View);
+            Assert.Equal(viewName, result.ViewName);
+        }
+
+        [Fact]
+        public void FindView_ReturnsNotFound_IfAllViewEnginesReturnNotFound()
+        {
+            // Arrange
+            var viewName = "foo";
+            var engine1 = new Mock<IViewEngine>(MockBehavior.Strict);
+            var engine2 = new Mock<IViewEngine>(MockBehavior.Strict);
+            var engine3 = new Mock<IViewEngine>(MockBehavior.Strict);
+            engine1
+                .Setup(e => e.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(viewName, new[] { "1", "2" }));
+            engine2
+                .Setup(e => e.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(viewName, new[] { "3" }));
+            engine3
+                .Setup(e => e.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(viewName, new[] { "4", "5" }));
+
+            var optionsAccessor = Options.Create(new MvcViewOptions());
+            optionsAccessor.Value.ViewEngines.Add(engine1.Object);
+            optionsAccessor.Value.ViewEngines.Add(engine2.Object);
+            optionsAccessor.Value.ViewEngines.Add(engine3.Object);
+            var compositeViewEngine = new CompositeViewEngine(optionsAccessor);
+
+            // Act
+            var result = compositeViewEngine.FindView(GetActionContext(), viewName, isMainPage: false);
+
+            // Assert
+            Assert.False(result.Success);
+            Assert.Equal(new[] { "1", "2", "3", "4", "5" }, result.SearchedLocations);
+        }
+
+        private static ActionContext GetActionContext()
+        {
+            return new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+        }
+
+        private class TestViewEngine : IViewEngine
+        {
+            public TestViewEngine(ITestService service)
+            {
+                Service = service;
+            }
+
+            public ITestService Service { get; private set; }
+
+            public ViewEngineResult FindView(ActionContext context, string viewName, bool isMainPage)
+            {
+                throw new NotImplementedException();
+            }
+
+            public ViewEngineResult GetView(string executingFilePath, string viewPath, bool isMainPage)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public interface ITestService
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/AntiforgeryExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/AntiforgeryExtensionsTest.cs
new file mode 100644
index 0000000000..d3b57ffb7d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/AntiforgeryExtensionsTest.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using Microsoft.AspNetCore.Antiforgery;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    /// <summary>
+    /// Extension methods for <see cref="IAntiforgery"/>.
+    /// </summary>
+    public class AntiforgeryExtensionsTest
+    {
+        [Fact]
+        public void GetHtml_RendersInputField()
+        {
+            // Arrange
+            var antiforgery = new Mock<IAntiforgery>(MockBehavior.Strict);
+            var tokenSet = new AntiforgeryTokenSet("request-token", "cookie-token", "form-field", "header");
+            antiforgery
+                .Setup(a => a.GetAndStoreTokens(It.IsAny<HttpContext>()))
+                .Returns(tokenSet);
+
+            // Act
+            var inputElement = AntiforgeryExtensions.GetHtml(antiforgery.Object, new DefaultHttpContext());
+
+            // Assert
+            Assert.Equal(
+                @"<input name=""HtmlEncode[[form-field]]"" type=""hidden"" value=""HtmlEncode[[request-token]]"" />",
+                HtmlContentUtilities.HtmlContentToString(inputElement));
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/AttributeDictionaryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/AttributeDictionaryTest.cs
new file mode 100644
index 0000000000..93ae890858
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/AttributeDictionaryTest.cs
@@ -0,0 +1,464 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class AttributeDictionaryTest
+    {
+        [Fact]
+        public void AttributeDictionary_AddItems()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            // Act
+            attributes.Add("zero", "0");
+            attributes.Add("one", "1");
+            attributes.Add("two", "2");
+
+            // Assert
+            Assert.Equal(3, attributes.Count);
+            Assert.Collection(
+                attributes,
+                kvp => Assert.Equal(new KeyValuePair<string, string>("one", "1"), kvp),
+                kvp => Assert.Equal(new KeyValuePair<string, string>("two", "2"), kvp),
+                kvp => Assert.Equal(new KeyValuePair<string, string>("zero", "0"), kvp));
+        }
+
+        [Fact]
+        public void AttributeDictionary_AddItems_AsKeyValuePairs()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            // Act
+            attributes.Add(new KeyValuePair<string, string>("zero", "0"));
+            attributes.Add(new KeyValuePair<string, string>("one", "1"));
+            attributes.Add(new KeyValuePair<string, string>("two", "2"));
+
+            // Assert
+            Assert.Equal(3, attributes.Count);
+            Assert.Collection(
+                attributes,
+                kvp => Assert.Equal(new KeyValuePair<string, string>("one", "1"), kvp),
+                kvp => Assert.Equal(new KeyValuePair<string, string>("two", "2"), kvp),
+                kvp => Assert.Equal(new KeyValuePair<string, string>("zero", "0"), kvp));
+        }
+
+        [Fact]
+        public void AttributeDictionary_Add_DuplicateKey()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            attributes.Add("zero", "0");
+            attributes.Add("one", "1");
+            attributes.Add("two", "2");
+
+            // Act & Assert
+            Assert.Throws<InvalidOperationException>(() => attributes.Add("one", "15"));
+        }
+
+        [Fact]
+        public void AttributeDictionary_Clear()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            attributes.Add(new KeyValuePair<string, string>("zero", "0"));
+            attributes.Add(new KeyValuePair<string, string>("one", "1"));
+            attributes.Add(new KeyValuePair<string, string>("two", "2"));
+
+            // Act
+            attributes.Clear();
+
+            // Assert
+            Assert.Empty(attributes);
+            Assert.Empty(attributes);
+        }
+
+        [Fact]
+        public void AttributeDictionary_Contains_Success()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            attributes.Add(new KeyValuePair<string, string>("zero", "0"));
+            attributes.Add(new KeyValuePair<string, string>("one", "1"));
+            attributes.Add(new KeyValuePair<string, string>("two", "2"));
+
+            // Act
+            var result = attributes.Contains(new KeyValuePair<string, string>("zero", "0"));
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void AttributeDictionary_Contains_Failure()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            attributes.Add(new KeyValuePair<string, string>("zero", "0"));
+            attributes.Add(new KeyValuePair<string, string>("one", "1"));
+            attributes.Add(new KeyValuePair<string, string>("two", "2"));
+
+            // Act
+            var result = attributes.Contains(new KeyValuePair<string, string>("zero", "nada"));
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void AttributeDictionary_ContainsKey_Success()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            attributes.Add(new KeyValuePair<string, string>("zero", "0"));
+            attributes.Add(new KeyValuePair<string, string>("one", "1"));
+            attributes.Add(new KeyValuePair<string, string>("two", "2"));
+
+            // Act
+            var result = attributes.ContainsKey("one");
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Fact]
+        public void AttributeDictionary_ContainsKey_Failure()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            attributes.Add(new KeyValuePair<string, string>("zero", "0"));
+            attributes.Add(new KeyValuePair<string, string>("one", "1"));
+            attributes.Add(new KeyValuePair<string, string>("two", "2"));
+
+            // Act
+            var result = attributes.ContainsKey("one!");
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void AttributeDictionary_CopyTo()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            attributes.Add(new KeyValuePair<string, string>("zero", "0"));
+            attributes.Add(new KeyValuePair<string, string>("one", "1"));
+            attributes.Add(new KeyValuePair<string, string>("two", "2"));
+
+            var array = new KeyValuePair<string, string>[attributes.Count + 1];
+
+            // Act
+            attributes.CopyTo(array, 1);
+
+            // Assert
+            Assert.Collection(
+                array,
+                kvp => Assert.Equal(default(KeyValuePair<string, string>), kvp),
+                kvp => Assert.Equal(new KeyValuePair<string, string>("one", "1"), kvp),
+                kvp => Assert.Equal(new KeyValuePair<string, string>("two", "2"), kvp),
+                kvp => Assert.Equal(new KeyValuePair<string, string>("zero", "0"), kvp));
+        }
+
+        [Fact]
+        public void AttributeDictionary_IsReadOnly()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            // Act
+            var result = attributes.IsReadOnly;
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void AttributeDictionary_Keys()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            attributes.Add(new KeyValuePair<string, string>("zero", "0"));
+            attributes.Add(new KeyValuePair<string, string>("one", "1"));
+            attributes.Add(new KeyValuePair<string, string>("two", "2"));
+
+            // Act
+            var keys = attributes.Keys;
+
+            // Assert
+            Assert.Equal(3, keys.Count);
+            Assert.Collection(
+                keys,
+                key => Assert.Equal("one", key),
+                key => Assert.Equal("two", key),
+                key => Assert.Equal("zero", key));
+        }
+
+        [Fact]
+        public void AttributeDictionary_Remove_Success()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            attributes.Add(new KeyValuePair<string, string>("zero", "0"));
+            attributes.Add(new KeyValuePair<string, string>("one", "1"));
+            attributes.Add(new KeyValuePair<string, string>("two", "2"));
+
+            // Act
+            var result = attributes.Remove("one");
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal(2, attributes.Count);
+            Assert.Collection(
+                attributes,
+                kvp => Assert.Equal(new KeyValuePair<string, string>("two", "2"), kvp),
+                kvp => Assert.Equal(new KeyValuePair<string, string>("zero", "0"), kvp));
+        }
+
+        [Fact]
+        public void AttributeDictionary_Remove_Failure()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            attributes.Add(new KeyValuePair<string, string>("zero", "0"));
+            attributes.Add(new KeyValuePair<string, string>("one", "1"));
+            attributes.Add(new KeyValuePair<string, string>("two", "2"));
+
+            // Act
+            var result = attributes.Remove("nada");
+
+            // Assert
+            Assert.False(result);
+            Assert.Equal(3, attributes.Count);
+            Assert.Collection(
+                attributes,
+                kvp => Assert.Equal(new KeyValuePair<string, string>("one", "1"), kvp),
+                kvp => Assert.Equal(new KeyValuePair<string, string>("two", "2"), kvp),
+                kvp => Assert.Equal(new KeyValuePair<string, string>("zero", "0"), kvp));
+        }
+
+        [Fact]
+        public void AttributeDictionary_Remove_KeyValuePair_Success()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            attributes.Add(new KeyValuePair<string, string>("zero", "0"));
+            attributes.Add(new KeyValuePair<string, string>("one", "1"));
+            attributes.Add(new KeyValuePair<string, string>("two", "2"));
+
+            // Act
+            var result = attributes.Remove(new KeyValuePair<string, string>("one", "1"));
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal(2, attributes.Count);
+            Assert.Collection(
+                attributes,
+                kvp => Assert.Equal(new KeyValuePair<string, string>("two", "2"), kvp),
+                kvp => Assert.Equal(new KeyValuePair<string, string>("zero", "0"), kvp));
+        }
+
+        [Fact]
+        public void AttributeDictionary_Remove_KeyValuePair_Failure()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            attributes.Add(new KeyValuePair<string, string>("zero", "0"));
+            attributes.Add(new KeyValuePair<string, string>("one", "1"));
+            attributes.Add(new KeyValuePair<string, string>("two", "2"));
+
+            // Act
+            var result = attributes.Remove(new KeyValuePair<string, string>("one", "0"));
+
+            // Assert
+            Assert.False(result);
+            Assert.Equal(3, attributes.Count);
+            Assert.Collection(
+                attributes,
+                kvp => Assert.Equal(new KeyValuePair<string, string>("one", "1"), kvp),
+                kvp => Assert.Equal(new KeyValuePair<string, string>("two", "2"), kvp),
+                kvp => Assert.Equal(new KeyValuePair<string, string>("zero", "0"), kvp));
+        }
+
+        [Fact]
+        public void AttributeDictionary_TryGetValue_Success()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            attributes.Add(new KeyValuePair<string, string>("zero", "0"));
+            attributes.Add(new KeyValuePair<string, string>("one", "1"));
+            attributes.Add(new KeyValuePair<string, string>("two", "2"));
+
+            string value;
+
+            // Act
+            var result = attributes.TryGetValue("two", out value);
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal("2", value);
+        }
+
+        [Fact]
+        public void AttributeDictionary_TryGetValue_Failure()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            attributes.Add(new KeyValuePair<string, string>("zero", "0"));
+            attributes.Add(new KeyValuePair<string, string>("one", "1"));
+            attributes.Add(new KeyValuePair<string, string>("two", "2"));
+
+            string value;
+
+            // Act
+            var result = attributes.TryGetValue("nada", out value);
+
+
+            // Assert
+            Assert.False(result);
+            Assert.Null(value);
+        }
+
+        [Fact]
+        public void AttributeDictionary_Values()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            attributes.Add(new KeyValuePair<string, string>("zero", "0"));
+            attributes.Add(new KeyValuePair<string, string>("one", "1"));
+            attributes.Add(new KeyValuePair<string, string>("two", "2"));
+
+            // Act
+            var values = attributes.Values;
+
+            // Assert
+            Assert.Equal(3, values.Count);
+            Assert.Collection(
+                values,
+                key => Assert.Equal("1", key),
+                key => Assert.Equal("2", key),
+                key => Assert.Equal("0", key));
+        }
+
+        [Fact]
+        public void AttributeDictionary_Indexer_Success()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            attributes.Add(new KeyValuePair<string, string>("zero", "0"));
+            attributes.Add(new KeyValuePair<string, string>("one", "1"));
+            attributes.Add(new KeyValuePair<string, string>("two", "2"));
+
+            // Act
+            var value = attributes["two"];
+
+            // Assert
+            Assert.Equal("2", value);
+        }
+
+        [Fact]
+        public void AttributeDictionary_Indexer_Fails()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            attributes.Add(new KeyValuePair<string, string>("zero", "0"));
+            attributes.Add(new KeyValuePair<string, string>("one", "1"));
+            attributes.Add(new KeyValuePair<string, string>("two", "2"));
+
+            // Act & Assert
+            Assert.Throws<KeyNotFoundException>(() => attributes["nada"]);
+        }
+
+        [Fact]
+        public void AttributeDictionary_Indexer_SetValue()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            attributes.Add(new KeyValuePair<string, string>("zero", "0"));
+            attributes.Add(new KeyValuePair<string, string>("one", "1"));
+            attributes.Add(new KeyValuePair<string, string>("two", "2"));
+
+            // Act
+            attributes["one"] = "1!";
+
+            // Assert
+            Assert.Equal(3, attributes.Count);
+            Assert.Collection(
+                attributes,
+                kvp => Assert.Equal(new KeyValuePair<string, string>("one", "1!"), kvp),
+                kvp => Assert.Equal(new KeyValuePair<string, string>("two", "2"), kvp),
+                kvp => Assert.Equal(new KeyValuePair<string, string>("zero", "0"), kvp));
+        }
+
+        [Fact]
+        public void AttributeDictionary_Indexer_Insert()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            attributes.Add(new KeyValuePair<string, string>("zero", "0"));
+            attributes.Add(new KeyValuePair<string, string>("one", "1"));
+            attributes.Add(new KeyValuePair<string, string>("two", "2"));
+
+            // Act
+            attributes["exciting!"] = "1!";
+
+            // Assert
+            Assert.Equal(4, attributes.Count);
+            Assert.Collection(
+                attributes,
+                kvp => Assert.Equal(new KeyValuePair<string, string>("exciting!", "1!"), kvp),
+                kvp => Assert.Equal(new KeyValuePair<string, string>("one", "1"), kvp),
+                kvp => Assert.Equal(new KeyValuePair<string, string>("two", "2"), kvp),
+                kvp => Assert.Equal(new KeyValuePair<string, string>("zero", "0"), kvp));
+        }
+
+        [Fact]
+        public void AttributeDictionary_CaseInsensitive()
+        {
+            // Arrange
+            var attributes = new AttributeDictionary();
+
+            attributes.Add(new KeyValuePair<string, string>("zero", "0"));
+            attributes.Add(new KeyValuePair<string, string>("one", "1"));
+            attributes.Add(new KeyValuePair<string, string>("two", "2"));
+
+            // Act
+            attributes["oNe"] = "1!";
+
+            // Assert
+            Assert.Equal(3, attributes.Count);
+            Assert.Collection(
+                attributes,
+                kvp => Assert.Equal(new KeyValuePair<string, string>("oNe", "1!"), kvp),
+                kvp => Assert.Equal(new KeyValuePair<string, string>("two", "2"), kvp),
+                kvp => Assert.Equal(new KeyValuePair<string, string>("zero", "0"), kvp));
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/CookieTempDataProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/CookieTempDataProviderTest.cs
new file mode 100644
index 0000000000..1fe6b0920b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/CookieTempDataProviderTest.cs
@@ -0,0 +1,741 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Microsoft.Net.Http.Headers;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class CookieTempDataProviderTest
+    {
+        [Fact]
+        public void SaveTempData_UsesCookieName_FromOptions()
+        {
+            // Arrange
+            var expectedCookieName = "TestCookieName";
+            var values = new Dictionary<string, object>();
+            values.Add("int", 10);
+
+            var tempDataProviderStore = new TempDataSerializer();
+            var expectedDataToProtect = tempDataProviderStore.Serialize(values);
+            var expectedDataInCookie = WebEncoders.Base64UrlEncode(expectedDataToProtect);
+            var tempDataProvider = GetProvider(dataProtector: null, options: new CookieTempDataProviderOptions()
+            {
+                Cookie = { Name = expectedCookieName }
+            });
+
+            var responseCookies = new MockResponseCookieCollection();
+            var httpContext = new Mock<HttpContext>();
+            httpContext
+                .SetupGet(hc => hc.Request.PathBase)
+                .Returns("/");
+            httpContext
+                .Setup(hc => hc.Response.Cookies)
+                .Returns(responseCookies);
+
+            // Act
+            tempDataProvider.SaveTempData(httpContext.Object, values);
+
+            // Assert
+            Assert.Contains(responseCookies, (cookie) => cookie.Key == expectedCookieName);
+            var cookieInfo = responseCookies[expectedCookieName];
+            Assert.Equal(expectedDataInCookie, cookieInfo.Value);
+            Assert.Equal("/", cookieInfo.Options.Path);
+        }
+
+        [Fact]
+        public void LoadTempData_ReturnsEmptyDictionary_WhenNoCookieDataIsAvailable()
+        {
+            // Arrange
+            var tempDataProvider = GetProvider();
+
+            // Act
+            var tempDataDictionary = tempDataProvider.LoadTempData(new DefaultHttpContext());
+
+            // Assert
+            Assert.NotNull(tempDataDictionary);
+            Assert.Empty(tempDataDictionary);
+        }
+
+        [Fact]
+        public void LoadTempData_ReturnsEmptyDictionary_AndClearsCookie_WhenDataIsInvalid()
+        {
+            // Arrange
+            var dataProtector = new Mock<IDataProtector>(MockBehavior.Strict);
+            dataProtector
+                .Setup(d => d.Unprotect(It.IsAny<byte[]>()))
+                .Throws(new Exception());
+
+            var tempDataProvider = GetProvider(dataProtector.Object);
+
+            var inputData = new Dictionary<string, object>();
+            inputData.Add("int", 10);
+            var tempDataProviderSerializer = new TempDataSerializer();
+            var expectedDataToUnprotect = tempDataProviderSerializer.Serialize(inputData);
+            var base64AndUrlEncodedDataInCookie = WebEncoders.Base64UrlEncode(expectedDataToUnprotect);
+
+            var context = new DefaultHttpContext();
+            context.Request.Cookies = new RequestCookieCollection(new Dictionary<string, string>()
+            {
+                { CookieTempDataProvider.CookieName, base64AndUrlEncodedDataInCookie }
+            });
+
+            // Act
+            var tempDataDictionary = tempDataProvider.LoadTempData(context);
+
+            // Assert
+            Assert.Empty(tempDataDictionary);
+
+            var setCookieHeader = SetCookieHeaderValue.Parse(context.Response.Headers["Set-Cookie"].ToString());
+            Assert.Equal(CookieTempDataProvider.CookieName, setCookieHeader.Name.ToString());
+            Assert.Equal(string.Empty, setCookieHeader.Value.ToString());
+        }
+
+        [Fact]
+        public void LoadTempData_Base64UrlDecodesAnd_UnprotectsData_FromCookie()
+        {
+            // Arrange
+            var expectedValues = new Dictionary<string, object>();
+            expectedValues.Add("int", 10);
+            var tempDataProviderSerializer = new TempDataSerializer();
+            var expectedDataToUnprotect = tempDataProviderSerializer.Serialize(expectedValues);
+            var base64AndUrlEncodedDataInCookie = WebEncoders.Base64UrlEncode(expectedDataToUnprotect);
+            var dataProtector = new PassThroughDataProtector();
+            var tempDataProvider = GetProvider(dataProtector);
+            var requestCookies = new RequestCookieCollection(new Dictionary<string, string>()
+            {
+                { CookieTempDataProvider.CookieName, base64AndUrlEncodedDataInCookie }
+            });
+            var httpContext = new Mock<HttpContext>();
+            httpContext
+               .Setup(hc => hc.Request.Cookies)
+               .Returns(requestCookies);
+
+            // Act
+            var actualValues = tempDataProvider.LoadTempData(httpContext.Object);
+
+            // Assert
+            Assert.Equal(expectedDataToUnprotect, dataProtector.DataToUnprotect);
+            Assert.Equal(expectedValues, actualValues);
+        }
+
+        [Fact]
+        public void SaveTempData_ProtectsAnd_Base64UrlEncodesDataAnd_SetsCookie()
+        {
+            // Arrange
+            var values = new Dictionary<string, object>();
+            values.Add("int", 10);
+            var tempDataProviderStore = new TempDataSerializer();
+            var expectedDataToProtect = tempDataProviderStore.Serialize(values);
+            var expectedDataInCookie = WebEncoders.Base64UrlEncode(expectedDataToProtect);
+            var dataProtector = new PassThroughDataProtector();
+            var tempDataProvider = GetProvider(dataProtector);
+            var responseCookies = new MockResponseCookieCollection();
+            var httpContext = new Mock<HttpContext>();
+            httpContext
+                .SetupGet(hc => hc.Request.PathBase)
+                .Returns("/");
+            httpContext
+                .Setup(hc => hc.Response.Cookies)
+                .Returns(responseCookies);
+
+            // Act
+            tempDataProvider.SaveTempData(httpContext.Object, values);
+
+            // Assert
+            Assert.Equal(1, responseCookies.Count);
+            var cookieInfo = responseCookies[CookieTempDataProvider.CookieName];
+            Assert.NotNull(cookieInfo);
+            Assert.Equal(expectedDataInCookie, cookieInfo.Value);
+            Assert.Equal(expectedDataToProtect, dataProtector.PlainTextToProtect);
+        }
+
+        [Theory]
+        [InlineData(true, CookieSecurePolicy.None, false)]
+        [InlineData(false, CookieSecurePolicy.None, false)]
+        [InlineData(true, CookieSecurePolicy.Always, true)]
+        [InlineData(false, CookieSecurePolicy.Always, true)]
+        [InlineData(true, CookieSecurePolicy.SameAsRequest, true)]
+        [InlineData(false, CookieSecurePolicy.SameAsRequest, false)]
+        public void SaveTempData_HonorsCookieSecurePolicy_OnOptions(
+            bool isRequestSecure,
+            CookieSecurePolicy cookieSecurePolicy,
+            bool expectedSecureFlag)
+        {
+            // Arrange
+            var values = new Dictionary<string, object>();
+            values.Add("int", 10);
+            var tempDataProviderStore = new TempDataSerializer();
+            var expectedDataToProtect = tempDataProviderStore.Serialize(values);
+            var expectedDataInCookie = WebEncoders.Base64UrlEncode(expectedDataToProtect);
+            var dataProtector = new PassThroughDataProtector();
+            var options = new CookieTempDataProviderOptions();
+            options.Cookie.SecurePolicy = cookieSecurePolicy;
+            var tempDataProvider = GetProvider(dataProtector, options);
+            var responseCookies = new MockResponseCookieCollection();
+            var httpContext = new Mock<HttpContext>();
+            httpContext
+                .SetupGet(hc => hc.Request.PathBase)
+                .Returns("/");
+            httpContext
+                .SetupGet(hc => hc.Request.IsHttps)
+                .Returns(isRequestSecure);
+            httpContext
+                .Setup(hc => hc.Response.Cookies)
+                .Returns(responseCookies);
+
+            // Act
+            tempDataProvider.SaveTempData(httpContext.Object, values);
+
+            // Assert
+            Assert.Equal(1, responseCookies.Count);
+            var cookieInfo = responseCookies[CookieTempDataProvider.CookieName];
+            Assert.NotNull(cookieInfo);
+            Assert.Equal(expectedDataInCookie, cookieInfo.Value);
+            Assert.Equal(expectedDataToProtect, dataProtector.PlainTextToProtect);
+            Assert.Equal("/", cookieInfo.Options.Path);
+            Assert.Equal(expectedSecureFlag, cookieInfo.Options.Secure);
+            Assert.True(cookieInfo.Options.HttpOnly);
+            Assert.Null(cookieInfo.Options.Expires);
+            Assert.Null(cookieInfo.Options.Domain);
+        }
+
+        [Theory]
+        [InlineData(null, "/")]
+        [InlineData("", "/")]
+        [InlineData("/", "/")]
+        [InlineData("/vdir1", "/vdir1")]
+        public void SaveTempData_DefaultProviderOptions_SetsCookie_WithAppropriateCookieOptions(
+            string pathBase,
+            string expectedCookiePath)
+        {
+            // Arrange
+            var values = new Dictionary<string, object>();
+            values.Add("int", 10);
+            var tempDataProviderStore = new TempDataSerializer();
+            var expectedDataToProtect = tempDataProviderStore.Serialize(values);
+            var expectedDataInCookie = WebEncoders.Base64UrlEncode(expectedDataToProtect);
+            var dataProtector = new PassThroughDataProtector();
+            var tempDataProvider = GetProvider(dataProtector);
+            var responseCookies = new MockResponseCookieCollection();
+            var httpContext = new Mock<HttpContext>();
+            httpContext
+                .SetupGet(hc => hc.Request.PathBase)
+                .Returns(pathBase);
+            httpContext
+                .SetupGet(hc => hc.Request.IsHttps)
+                .Returns(false);
+            httpContext
+                .Setup(hc => hc.Response.Cookies)
+                .Returns(responseCookies);
+
+            // Act
+            tempDataProvider.SaveTempData(httpContext.Object, values);
+
+            // Assert
+            Assert.Equal(1, responseCookies.Count);
+            var cookieInfo = responseCookies[CookieTempDataProvider.CookieName];
+            Assert.NotNull(cookieInfo);
+            Assert.Equal(expectedDataInCookie, cookieInfo.Value);
+            Assert.Equal(expectedDataToProtect, dataProtector.PlainTextToProtect);
+            Assert.Equal(expectedCookiePath, cookieInfo.Options.Path);
+            Assert.False(cookieInfo.Options.Secure);
+            Assert.True(cookieInfo.Options.HttpOnly);
+            Assert.Null(cookieInfo.Options.Expires);
+            Assert.Null(cookieInfo.Options.Domain);
+        }
+
+        [Theory]
+        [InlineData(null, null, null, "/", null)]
+        [InlineData("", null, null, "/", null)]
+        [InlineData("/", null, null, "/", null)]
+        [InlineData("/", "/vdir1", null, "/vdir1", null)]
+        [InlineData("/", "/vdir1", ".abc.com", "/vdir1", ".abc.com")]
+        [InlineData("/vdir1", "/", ".abc.com", "/", ".abc.com")]
+        public void SaveTempData_CustomProviderOptions_SetsCookie_WithAppropriateCookieOptions(
+            string requestPathBase,
+            string optionsPath,
+            string optionsDomain,
+            string expectedCookiePath,
+            string expectedDomain)
+        {
+            // Arrange
+            var values = new Dictionary<string, object>();
+            values.Add("int", 10);
+            var tempDataProviderStore = new TempDataSerializer();
+            var expectedDataToProtect = tempDataProviderStore.Serialize(values);
+            var expectedDataInCookie = WebEncoders.Base64UrlEncode(expectedDataToProtect);
+            var dataProtector = new PassThroughDataProtector();
+            var tempDataProvider = GetProvider(
+                dataProtector,
+                new CookieTempDataProviderOptions
+                {
+                    Cookie =
+                    {
+                        Path = optionsPath,
+                        Domain = optionsDomain
+                    }
+                });
+            var responseCookies = new MockResponseCookieCollection();
+            var httpContext = new Mock<HttpContext>();
+            httpContext
+                .SetupGet(hc => hc.Request.IsHttps)
+                .Returns(false);
+            httpContext
+                .SetupGet(hc => hc.Request.PathBase)
+                .Returns(requestPathBase);
+            httpContext
+                .Setup(hc => hc.Response.Cookies)
+                .Returns(responseCookies);
+
+            // Act
+            tempDataProvider.SaveTempData(httpContext.Object, values);
+
+            // Assert
+            Assert.Equal(1, responseCookies.Count);
+            var cookieInfo = responseCookies[CookieTempDataProvider.CookieName];
+            Assert.NotNull(cookieInfo);
+            Assert.Equal(expectedDataInCookie, cookieInfo.Value);
+            Assert.Equal(expectedDataToProtect, dataProtector.PlainTextToProtect);
+            Assert.Equal(expectedCookiePath, cookieInfo.Options.Path);
+            Assert.Equal(expectedDomain, cookieInfo.Options.Domain);
+            Assert.False(cookieInfo.Options.Secure);
+            Assert.True(cookieInfo.Options.HttpOnly);
+            Assert.Null(cookieInfo.Options.Expires);
+        }
+
+        [Fact]
+        public void SaveTempData_RemovesCookie_WhenNoDataToSave()
+        {
+            // Arrange
+            var values = new Dictionary<string, object>();
+            values.Add("int", 10);
+            var tempDataProviderStore = new TempDataSerializer();
+            var serializedData = tempDataProviderStore.Serialize(values);
+            var base64AndUrlEncodedData = WebEncoders.Base64UrlEncode(serializedData);
+            var dataProtector = new PassThroughDataProtector();
+            var tempDataProvider = GetProvider(dataProtector);
+            var requestCookies = new RequestCookieCollection(new Dictionary<string, string>()
+            {
+                { CookieTempDataProvider.CookieName, base64AndUrlEncodedData }
+            });
+            var responseCookies = new MockResponseCookieCollection();
+            var httpContext = new Mock<HttpContext>();
+            httpContext
+                .SetupGet(hc => hc.Request.PathBase)
+                .Returns("/");
+            httpContext
+                .Setup(hc => hc.Request.Cookies)
+                .Returns(requestCookies);
+            httpContext
+                .Setup(hc => hc.Response.Cookies)
+                .Returns(responseCookies);
+            httpContext
+                .Setup(hc => hc.Response.Headers)
+                .Returns(new HeaderDictionary());
+
+            // Act
+            tempDataProvider.SaveTempData(httpContext.Object, new Dictionary<string, object>());
+
+            // Assert
+            Assert.Equal(1, responseCookies.Count);
+            var cookie = responseCookies[CookieTempDataProvider.CookieName];
+            Assert.NotNull(cookie);
+            Assert.Equal(string.Empty, cookie.Value);
+            Assert.NotNull(cookie.Options.Expires);
+            Assert.True(cookie.Options.Expires.Value < DateTimeOffset.Now); // expired cookie
+        }
+
+        [Fact]
+        public void SaveAndLoad_StringCanBeStoredAndLoaded()
+        {
+            // Arrange
+            var testProvider = GetProvider();
+            var input = new Dictionary<string, object>
+            {
+                { "string", "value" }
+            };
+            var context = GetHttpContext();
+
+            // Act
+            testProvider.SaveTempData(context, input);
+            UpdateRequestWithCookies(context);
+            var TempData = testProvider.LoadTempData(context);
+
+            // Assert
+            var stringVal = Assert.IsType<string>(TempData["string"]);
+            Assert.Equal("value", stringVal);
+        }
+
+        [Theory]
+        [InlineData(10)]
+        [InlineData(int.MaxValue)]
+        [InlineData(int.MinValue)]
+        public void SaveAndLoad_IntCanBeStoredAndLoaded(int expected)
+        {
+            // Arrange
+            var testProvider = GetProvider();
+            var input = new Dictionary<string, object>
+            {
+                { "int", expected }
+            };
+            var context = GetHttpContext();
+
+            // Act
+            testProvider.SaveTempData(context, input);
+            UpdateRequestWithCookies(context);
+            var TempData = testProvider.LoadTempData(context);
+
+            // Assert
+            var intVal = Assert.IsType<int>(TempData["int"]);
+            Assert.Equal(expected, intVal);
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void SaveAndLoad_BoolCanBeStoredAndLoaded(bool value)
+        {
+            // Arrange
+            var testProvider = GetProvider();
+            var input = new Dictionary<string, object>
+            {
+                { "bool", value }
+            };
+            var context = GetHttpContext();
+
+            // Act
+            testProvider.SaveTempData(context, input);
+            UpdateRequestWithCookies(context);
+            var TempData = testProvider.LoadTempData(context);
+
+            // Assert
+            var boolVal = Assert.IsType<bool>(TempData["bool"]);
+            Assert.Equal(value, boolVal);
+        }
+
+        [Fact]
+        public void SaveAndLoad_DateTimeCanBeStoredAndLoaded()
+        {
+            // Arrange
+            var testProvider = GetProvider();
+            var inputDatetime = new DateTime(2010, 12, 12, 1, 2, 3, DateTimeKind.Local);
+            var input = new Dictionary<string, object>
+            {
+                { "DateTime", inputDatetime }
+            };
+            var context = GetHttpContext();
+
+            // Act
+            testProvider.SaveTempData(context, input);
+            UpdateRequestWithCookies(context);
+            var TempData = testProvider.LoadTempData(context);
+
+            // Assert
+            var datetime = Assert.IsType<DateTime>(TempData["DateTime"]);
+            Assert.Equal(inputDatetime, datetime);
+        }
+
+        [Fact]
+        public void SaveAndLoad_GuidCanBeStoredAndLoaded()
+        {
+            // Arrange
+            var testProvider = GetProvider();
+            var inputGuid = Guid.NewGuid();
+            var input = new Dictionary<string, object>
+            {
+                { "Guid", inputGuid }
+            };
+            var context = GetHttpContext();
+
+            // Act
+            testProvider.SaveTempData(context, input);
+            UpdateRequestWithCookies(context);
+            var TempData = testProvider.LoadTempData(context);
+
+            // Assert
+            var guidVal = Assert.IsType<Guid>(TempData["Guid"]);
+            Assert.Equal(inputGuid, guidVal);
+        }
+
+        [Fact]
+        public void SaveAndLoad_EnumCanBeSavedAndLoaded()
+        {
+            // Arrange
+            var key = "EnumValue";
+            var testProvider = GetProvider();
+            var expected = DayOfWeek.Friday;
+            var input = new Dictionary<string, object>
+            {
+                { key, expected }
+            };
+            var context = GetHttpContext();
+
+            // Act
+            testProvider.SaveTempData(context, input);
+            UpdateRequestWithCookies(context);
+            var TempData = testProvider.LoadTempData(context);
+            var result = TempData[key];
+
+            // Assert
+            var actual = (DayOfWeek)result;
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(3100000000L)]
+        [InlineData(-3100000000L)]
+        public void SaveAndLoad_LongCanBeSavedAndLoaded(long expected)
+        {
+            // Arrange
+            var key = "LongValue";
+            var testProvider = GetProvider();
+            var input = new Dictionary<string, object>
+            {
+                { key, expected }
+            };
+            var context = GetHttpContext();
+
+            // Act
+            testProvider.SaveTempData(context, input);
+            UpdateRequestWithCookies(context);
+            var TempData = testProvider.LoadTempData(context);
+            var result = TempData[key];
+
+            // Assert
+            var actual = Assert.IsType<long>(result);
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void SaveAndLoad_ListCanBeStoredAndLoaded()
+        {
+            // Arrange
+            var testProvider = GetProvider();
+            var input = new Dictionary<string, object>
+            {
+                { "List`string", new List<string> { "one", "two" } }
+            };
+            var context = GetHttpContext();
+
+            // Act
+            testProvider.SaveTempData(context, input);
+            UpdateRequestWithCookies(context);
+            var TempData = testProvider.LoadTempData(context);
+
+            // Assert
+            var list = (IList<string>)TempData["List`string"];
+            Assert.Equal(2, list.Count);
+            Assert.Equal("one", list[0]);
+            Assert.Equal("two", list[1]);
+        }
+
+        [Fact]
+        public void SaveAndLoad_DictionaryCanBeStoredAndLoaded()
+        {
+            // Arrange
+            var testProvider = GetProvider();
+            var inputDictionary = new Dictionary<string, string>
+            {
+                { "Hello", "World" },
+            };
+            var input = new Dictionary<string, object>
+            {
+                { "Dictionary", inputDictionary }
+            };
+            var context = GetHttpContext();
+
+            // Act
+            testProvider.SaveTempData(context, input);
+            UpdateRequestWithCookies(context);
+            var TempData = testProvider.LoadTempData(context);
+
+            // Assert
+            var dictionary = Assert.IsType<Dictionary<string, string>>(TempData["Dictionary"]);
+            Assert.Equal("World", dictionary["Hello"]);
+        }
+
+        [Fact]
+        public void SaveAndLoad_EmptyDictionary_RoundTripsAsNull()
+        {
+            // Arrange
+            var testProvider = GetProvider();
+            var input = new Dictionary<string, object>
+            {
+                { "EmptyDictionary", new Dictionary<string, int>() }
+            };
+            var context = GetHttpContext();
+
+            // Act
+            testProvider.SaveTempData(context, input);
+            UpdateRequestWithCookies(context);
+            var TempData = testProvider.LoadTempData(context);
+
+            // Assert
+            var emptyDictionary = (IDictionary<string, int>)TempData["EmptyDictionary"];
+            Assert.Null(emptyDictionary);
+        }
+
+        private static HttpContext GetHttpContext()
+        {
+            var context = new Mock<HttpContext>();
+            context
+                .SetupGet(hc => hc.Request.PathBase)
+                .Returns("/");
+            context
+                .SetupGet(hc => hc.Response.Cookies)
+                .Returns(new MockResponseCookieCollection());
+            return context.Object;
+        }
+
+        private void UpdateRequestWithCookies(HttpContext httpContext)
+        {
+            var responseCookies = (MockResponseCookieCollection)httpContext.Response.Cookies;
+
+            var values = new Dictionary<string, string>();
+
+            foreach (var responseCookie in responseCookies)
+            {
+                values.Add(responseCookie.Key, responseCookie.Value);
+            }
+
+            if (values.Count > 0)
+            {
+                httpContext.Request.Cookies = new RequestCookieCollection(values);
+            }
+        }
+
+        private class MockResponseCookieCollection : IResponseCookies, IEnumerable<CookieInfo>
+        {
+            private Dictionary<string, CookieInfo> _cookies = new Dictionary<string, CookieInfo>(StringComparer.OrdinalIgnoreCase);
+
+            public int Count
+            {
+                get
+                {
+                    return _cookies.Count;
+                }
+            }
+
+            public CookieInfo this[string key]
+            {
+                get
+                {
+                    return _cookies[key];
+                }
+            }
+
+            public void Append(string key, string value, CookieOptions options)
+            {
+                _cookies[key] = new CookieInfo()
+                {
+                    Key = key,
+                    Value = value,
+                    Options = options
+                };
+            }
+
+            public void Append(string key, string value)
+            {
+                Append(key, value, new CookieOptions());
+            }
+
+            public void Delete(string key, CookieOptions options)
+            {
+                _cookies.Remove(key);
+            }
+
+            public void Delete(string key)
+            {
+                _cookies.Remove(key);
+            }
+
+            public IEnumerator<CookieInfo> GetEnumerator()
+            {
+                return _cookies.Values.GetEnumerator();
+            }
+
+            IEnumerator IEnumerable.GetEnumerator()
+            {
+                return GetEnumerator();
+            }
+        }
+
+        private CookieTempDataProvider GetProvider(IDataProtector dataProtector = null, CookieTempDataProviderOptions options = null)
+        {
+            if (dataProtector == null)
+            {
+                dataProtector = new PassThroughDataProtector();
+            }
+            if (options == null)
+            {
+                options = new CookieTempDataProviderOptions();
+            }
+
+            var testOptions = new Mock<IOptions<CookieTempDataProviderOptions>>();
+            testOptions.SetupGet(o => o.Value).Returns(options);
+
+            return new CookieTempDataProvider(new PassThroughDataProtectionProvider(dataProtector), NullLoggerFactory.Instance, testOptions.Object);
+        }
+
+        private class PassThroughDataProtectionProvider : IDataProtectionProvider
+        {
+            private readonly IDataProtector _dataProtector;
+
+            public PassThroughDataProtectionProvider(IDataProtector dataProtector)
+            {
+                _dataProtector = dataProtector;
+            }
+
+            public IDataProtector CreateProtector(string purpose)
+            {
+                return _dataProtector;
+            }
+        }
+
+        private class PassThroughDataProtector : IDataProtector
+        {
+            public byte[] DataToUnprotect { get; private set; }
+            public byte[] PlainTextToProtect { get; private set; }
+            public string Purpose { get; private set; }
+
+            public IDataProtector CreateProtector(string purpose)
+            {
+                Purpose = purpose;
+                return this;
+            }
+
+            public byte[] Protect(byte[] plaintext)
+            {
+                PlainTextToProtect = plaintext;
+                return PlainTextToProtect;
+            }
+
+            public byte[] Unprotect(byte[] protectedData)
+            {
+                DataToUnprotect = protectedData;
+                return DataToUnprotect;
+            }
+        }
+
+        private class CookieInfo
+        {
+            public string Key { get; set; }
+
+            public string Value { get; set; }
+
+            public CookieOptions Options { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/DefaultHtmlGeneratorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/DefaultHtmlGeneratorTest.cs
new file mode 100644
index 0000000000..c8c7198ad9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/DefaultHtmlGeneratorTest.cs
@@ -0,0 +1,839 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Antiforgery;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class DefaultHtmlGeneratorTest
+    {
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void GetCurrentValues_WithEmptyViewData_ReturnsNull(bool allowMultiple)
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var viewContext = GetViewContext<Model>(model: null, metadataProvider: metadataProvider);
+
+            // Act
+            var result = htmlGenerator.GetCurrentValues(
+                viewContext,
+                modelExplorer: null,
+                expression: nameof(Model.Name),
+                allowMultiple: allowMultiple);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void GetCurrentValues_WithNullExpressionResult_ReturnsNull(bool allowMultiple)
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var viewContext = GetViewContext<Model>(model: null, metadataProvider: metadataProvider);
+            var modelExplorer = metadataProvider.GetModelExplorerForType(typeof(string), model: null);
+
+            // Act
+            var result = htmlGenerator.GetCurrentValues(
+                viewContext,
+                modelExplorer,
+                expression: nameof(Model.Name),
+                allowMultiple: allowMultiple);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void GetCurrentValues_WithNullExpression_DoesNotThrow()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var viewContext = GetViewContext<Model>(model: null, metadataProvider: metadataProvider);
+            var modelExplorer = metadataProvider.GetModelExplorerForType(typeof(string), model: null);
+
+            // Act and Assert (does not throw).
+            htmlGenerator.GetCurrentValues(viewContext, modelExplorer, expression: null, allowMultiple: true);
+        }
+
+        [Fact]
+        public void GenerateSelect_WithNullExpression_Throws()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var viewContext = GetViewContext<Model>(model: null, metadataProvider: metadataProvider);
+            var modelExplorer = metadataProvider.GetModelExplorerForType(typeof(string), model: null);
+
+            var expected = "The name of an HTML field cannot be null or empty. Instead use methods " +
+                "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper.Editor or Microsoft.AspNetCore.Mvc.Rendering." +
+                "IHtmlHelper`1.EditorFor with a non-empty htmlFieldName argument value.";
+
+            // Act and Assert
+            ExceptionAssert.ThrowsArgument(
+                () => htmlGenerator.GenerateSelect(
+                    viewContext,
+                    modelExplorer,
+                    "label",
+                    expression: null,
+                    selectList: new List<SelectListItem>(),
+                    allowMultiple: true,
+                    htmlAttributes: null),
+                "expression",
+                expected);
+        }
+
+        [Fact]
+        public void GenerateSelect_WithNullExpression_WithNameAttribute_DoesNotThrow()
+        {
+            // Arrange
+            var expected = "-expression-";
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var viewContext = GetViewContext<Model>(model: null, metadataProvider: metadataProvider);
+            var modelExplorer = metadataProvider.GetModelExplorerForType(typeof(string), model: null);
+            var htmlAttributes = new Dictionary<string, object>
+            {
+                { "name", expected },
+            };
+
+            // Act
+            var tagBuilder = htmlGenerator.GenerateSelect(
+                viewContext,
+                modelExplorer,
+                "label",
+                expression: null,
+                selectList: new List<SelectListItem>(),
+                allowMultiple: true,
+                htmlAttributes: htmlAttributes);
+
+            // Assert
+            var attribute = Assert.Single(tagBuilder.Attributes, a => a.Key == "name");
+            Assert.Equal(expected, attribute.Value);
+        }
+
+        [Fact]
+        public void GenerateTextArea_WithNullExpression_Throws()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var viewContext = GetViewContext<Model>(model: null, metadataProvider: metadataProvider);
+            var modelExplorer = metadataProvider.GetModelExplorerForType(typeof(string), model: null);
+
+            var expected = "The name of an HTML field cannot be null or empty. Instead use methods " +
+                "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper.Editor or Microsoft.AspNetCore.Mvc.Rendering." +
+                "IHtmlHelper`1.EditorFor with a non-empty htmlFieldName argument value.";
+
+            // Act and Assert
+            ExceptionAssert.ThrowsArgument(
+                () => htmlGenerator.GenerateTextArea(
+                    viewContext,
+                    modelExplorer,
+                    expression: null,
+                    rows: 1,
+                    columns: 1,
+                    htmlAttributes: null),
+                "expression",
+                expected);
+        }
+
+        [Fact]
+        public void GenerateTextArea_WithNullExpression_WithNameAttribute_DoesNotThrow()
+        {
+            // Arrange
+            var expected = "-expression-";
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var viewContext = GetViewContext<Model>(model: null, metadataProvider: metadataProvider);
+            var modelExplorer = metadataProvider.GetModelExplorerForType(typeof(string), model: null);
+            var htmlAttributes = new Dictionary<string, object>
+            {
+                { "name", expected },
+            };
+
+            // Act
+            var tagBuilder = htmlGenerator.GenerateTextArea(
+                viewContext,
+                modelExplorer,
+                expression: null,
+                rows: 1,
+                columns: 1,
+                htmlAttributes: htmlAttributes);
+
+            // Assert
+            var attribute = Assert.Single(tagBuilder.Attributes, a => a.Key == "name");
+            Assert.Equal(expected, attribute.Value);
+        }
+
+        [Fact]
+        public void GenerateValidationMessage_WithNullExpression_Throws()
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var viewContext = GetViewContext<Model>(model: null, metadataProvider: metadataProvider);
+            var modelExplorer = metadataProvider.GetModelExplorerForType(typeof(string), model: null);
+
+            var expected = "The name of an HTML field cannot be null or empty. Instead use methods " +
+                "Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper.Editor or Microsoft.AspNetCore.Mvc.Rendering." +
+                "IHtmlHelper`1.EditorFor with a non-empty htmlFieldName argument value.";
+
+            // Act and Assert
+            ExceptionAssert.ThrowsArgument(
+                () => htmlGenerator.GenerateValidationMessage(
+                    viewContext,
+                    modelExplorer: null,
+                    expression: null,
+                    message: "Message",
+                    tag: "tag",
+                    htmlAttributes: null),
+                "expression",
+                expected);
+        }
+
+        [Fact]
+        public void GenerateValidationMessage_WithNullExpression_WithValidationForAttribute_DoesNotThrow()
+        {
+            // Arrange
+            var expected = "-expression-";
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var viewContext = GetViewContext<Model>(model: null, metadataProvider: metadataProvider);
+            var modelExplorer = metadataProvider.GetModelExplorerForType(typeof(string), model: null);
+            var htmlAttributes = new Dictionary<string, object>
+            {
+                { "data-valmsg-for", expected },
+            };
+
+            // Act
+            var tagBuilder = htmlGenerator.GenerateValidationMessage(
+                viewContext,
+                modelExplorer: null,
+                expression: null,
+                message: "Message",
+                tag: "tag",
+                htmlAttributes: htmlAttributes);
+
+            // Assert
+            var attribute = Assert.Single(tagBuilder.Attributes, a => a.Key == "data-valmsg-for");
+            Assert.Equal(expected, attribute.Value);
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void GetCurrentValues_WithSelectListInViewData_ReturnsNull(bool allowMultiple)
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var viewContext = GetViewContext<Model>(model: null, metadataProvider: metadataProvider);
+            viewContext.ViewData[nameof(Model.Name)] = Enumerable.Empty<SelectListItem>();
+
+            // Act
+            var result = htmlGenerator.GetCurrentValues(
+                viewContext,
+                modelExplorer: null,
+                expression: nameof(Model.Name),
+                allowMultiple: allowMultiple);
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Theory]
+        [InlineData("some string")] // treated as if it were not IEnumerable
+        [InlineData(23)]
+        [InlineData(RegularEnum.Three)]
+        public void GetCurrentValues_AllowMultipleWithNonEnumerableInViewData_Throws(object value)
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var viewContext = GetViewContext<Model>(model: null, metadataProvider: metadataProvider);
+            viewContext.ViewData[nameof(Model.Name)] = value;
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => htmlGenerator.GetCurrentValues(
+                viewContext,
+                modelExplorer: null,
+                expression: nameof(Model.Name),
+                allowMultiple: true));
+            Assert.Equal(
+                "The parameter 'expression' must evaluate to an IEnumerable when multiple selection is allowed.",
+                exception.Message);
+        }
+
+        // rawValue, allowMultiple -> expected current values
+        public static TheoryData<string[], bool, IReadOnlyCollection<string>> GetCurrentValues_CollectionData
+        {
+            get
+            {
+                return new TheoryData<string[], bool, IReadOnlyCollection<string>>
+                {
+                    // ModelStateDictionary converts arrays to single values if needed.
+                    { new [] { "some string" }, false, new [] { "some string" } },
+                    { new [] { "some string" }, true, new [] { "some string" } },
+                    { new [] { "some string", "some other string" }, false, new [] { "some string" } },
+                    {
+                        new [] { "some string", "some other string" },
+                        true,
+                        new [] { "some string", "some other string" }
+                    },
+                    // { new string[] { null }, false, null } would fall back to other sources.
+                    { new string[] { null }, true, new [] { string.Empty } },
+                    { new [] { string.Empty }, false, new [] { string.Empty } },
+                    { new [] { string.Empty }, true, new [] { string.Empty } },
+                    {
+                        new [] { null, "some string", "some other string" },
+                        true,
+                        new [] { string.Empty, "some string", "some other string" }
+                    },
+                    // ignores duplicates
+                    {
+                        new [] { null, "some string", null, "some other string", null, "some string", null },
+                        true,
+                        new [] { string.Empty, "some string", "some other string" }
+                    },
+                    // ignores case of duplicates
+                    {
+                        new [] { "some string", "SoMe StriNg", "Some String", "soME STRing", "SOME STRING" },
+                        true,
+                        new [] { "some string" }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(GetCurrentValues_CollectionData))]
+        public void GetCurrentValues_WithModelStateEntryAndViewData_ReturnsModelStateEntry(
+            string[] rawValue,
+            bool allowMultiple,
+            IReadOnlyCollection<string> expected)
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var model = new Model { Name = "ignored property value" };
+
+            var viewContext = GetViewContext<Model>(model, metadataProvider);
+            viewContext.ViewData[nameof(Model.Name)] = "ignored ViewData value";
+            viewContext.ModelState.SetModelValue(nameof(Model.Name), rawValue, attemptedValue: null);
+
+            // Act
+            var result = htmlGenerator.GetCurrentValues(
+                viewContext,
+                modelExplorer: null,
+                expression: nameof(Model.Name),
+                allowMultiple: allowMultiple);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Equal<string>(expected, result);
+        }
+
+        [Theory]
+        [MemberData(nameof(GetCurrentValues_CollectionData))]
+        public void GetCurrentValues_WithModelStateEntryModelExplorerAndViewData_ReturnsModelStateEntry(
+            string[] rawValue,
+            bool allowMultiple,
+            IReadOnlyCollection<string> expected)
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var model = new Model { Name = "ignored property value" };
+
+            var viewContext = GetViewContext<Model>(model, metadataProvider);
+            viewContext.ViewData[nameof(Model.Name)] = "ignored ViewData value";
+            viewContext.ModelState.SetModelValue(nameof(Model.Name), rawValue, attemptedValue: null);
+
+            var modelExplorer = metadataProvider.GetModelExplorerForType(typeof(string), "ignored model value");
+
+            // Act
+            var result = htmlGenerator.GetCurrentValues(
+                viewContext,
+                modelExplorer,
+                expression: nameof(Model.Name),
+                allowMultiple: allowMultiple);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Equal<string>(expected, result);
+        }
+
+        // rawValue -> expected current values
+        public static TheoryData<string[], string[]> GetCurrentValues_StringData
+        {
+            get
+            {
+                return new TheoryData<string[], string[]>
+                {
+                    // 1. If given a ModelExplorer, GetCurrentValues does not use ViewData even if expression result is
+                    // null.
+                    // 2. Otherwise if ViewData entry exists, GetCurrentValue does not fall back to ViewData.Model even
+                    // if entry is null.
+                    // 3. Otherwise, GetCurrentValue does not fall back anywhere else even if ViewData.Model is null.
+                    { null, null },
+                    { new string[] { string.Empty }, new [] { string.Empty } },
+                    { new string[] { "some string" }, new [] { "some string" } },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(GetCurrentValues_StringData))]
+        public void GetCurrentValues_WithModelExplorerAndViewData_ReturnsExpressionResult(
+            string[] rawValue,
+            IReadOnlyCollection<string> expected)
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var model = new Model { Name = "ignored property value" };
+
+            var viewContext = GetViewContext<Model>(model, metadataProvider);
+            viewContext.ViewData[nameof(Model.Name)] = "ignored ViewData value";
+            viewContext.ModelState.SetModelValue(nameof(Model.Name), rawValue, attemptedValue: null);
+
+            var modelExplorer = metadataProvider.GetModelExplorerForType(typeof(string), rawValue);
+
+            // Act
+            var result = htmlGenerator.GetCurrentValues(
+                viewContext,
+                modelExplorer,
+                expression: nameof(Model.Name),
+                allowMultiple: false);
+
+            // Assert
+            Assert.Equal<string>(expected, result);
+        }
+
+        [Theory]
+        [MemberData(nameof(GetCurrentValues_StringData))]
+        public void GetCurrentValues_WithViewData_ReturnsViewDataEntry(
+            string[] rawValue,
+            IReadOnlyCollection<string> expected)
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var model = new Model { Name = "ignored property value" };
+
+            var viewContext = GetViewContext<Model>(model, metadataProvider);
+            viewContext.ViewData[nameof(Model.Name)] = rawValue;
+            viewContext.ModelState.SetModelValue(nameof(Model.Name), rawValue, attemptedValue: null);
+
+            // Act
+            var result = htmlGenerator.GetCurrentValues(
+                viewContext,
+                modelExplorer: null,
+                expression: nameof(Model.Name),
+                allowMultiple: false);
+
+            // Assert
+            Assert.Equal<string>(expected, result);
+        }
+
+        [Theory]
+        [MemberData(nameof(GetCurrentValues_StringData))]
+        public void GetCurrentValues_WithModel_ReturnsModel(string[] rawValue, IReadOnlyCollection<string> expected)
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var model = new Model { Name = rawValue?[0] };
+
+            var viewContext = GetViewContext<Model>(model, metadataProvider);
+            viewContext.ModelState.SetModelValue(nameof(Model.Name), rawValue, attemptedValue: null);
+
+            // Act
+            var result = htmlGenerator.GetCurrentValues(
+                viewContext,
+                modelExplorer: null,
+                expression: nameof(Model.Name),
+                allowMultiple: false);
+
+            // Assert
+            Assert.Equal<string>(expected, result);
+        }
+
+        // rawValue -> expected current values
+        public static TheoryData<string[], string[]> GetCurrentValues_StringCollectionData
+        {
+            get
+            {
+                return new TheoryData<string[], string[]>
+                {
+                    { new string[] { null }, new [] { string.Empty } },
+                    { new [] { string.Empty }, new [] { string.Empty } },
+                    { new [] { "some string" }, new [] { "some string" } },
+                    { new [] { "some string", "some other string" }, new [] { "some string", "some other string" } },
+                    {
+                        new [] { null, "some string", "some other string" },
+                        new [] { string.Empty, "some string", "some other string" }
+                    },
+                    // ignores duplicates
+                    {
+                        new [] { null, "some string", null, "some other string", null, "some string", null },
+                        new [] { string.Empty, "some string", "some other string" }
+                    },
+                    // ignores case of duplicates
+                    {
+                        new [] { "some string", "SoMe StriNg", "Some String", "soME STRing", "SOME STRING" },
+                        new [] { "some string" }
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(GetCurrentValues_StringCollectionData))]
+        public void GetCurrentValues_CollectionWithModelExplorerAndViewData_ReturnsExpressionResult(
+            string[] rawValue,
+            IReadOnlyCollection<string> expected)
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var model = new Model { Collection = { "ignored property value" } };
+
+            var viewContext = GetViewContext<Model>(model, metadataProvider);
+            viewContext.ViewData[nameof(Model.Collection)] = new[] { "ignored ViewData value" };
+            viewContext.ModelState.SetModelValue(nameof(Model.Collection), rawValue, attemptedValue: null);
+
+            var modelExplorer =
+                metadataProvider.GetModelExplorerForType(typeof(List<string>), new List<string>(rawValue));
+
+            // Act
+            var result = htmlGenerator.GetCurrentValues(
+                viewContext,
+                modelExplorer,
+                expression: nameof(Model.Collection),
+                allowMultiple: true);
+
+            // Assert
+            Assert.Equal<string>(expected, result);
+        }
+
+        [Theory]
+        [MemberData(nameof(GetCurrentValues_StringCollectionData))]
+        public void GetCurrentValues_CollectionWithViewData_ReturnsViewDataEntry(
+            string[] rawValue,
+            IReadOnlyCollection<string> expected)
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var model = new Model { Collection = { "ignored property value" } };
+
+            var viewContext = GetViewContext<Model>(model, metadataProvider);
+            viewContext.ViewData[nameof(Model.Collection)] = rawValue;
+            viewContext.ModelState.SetModelValue(nameof(Model.Collection), rawValue, attemptedValue: null);
+
+            // Act
+            var result = htmlGenerator.GetCurrentValues(
+                viewContext,
+                modelExplorer: null,
+                expression: nameof(Model.Collection),
+                allowMultiple: true);
+
+            // Assert
+            Assert.Equal<string>(expected, result);
+        }
+
+        [Theory]
+        [MemberData(nameof(GetCurrentValues_StringCollectionData))]
+        public void GetCurrentValues_CollectionWithModel_ReturnsModel(
+            string[] rawValue,
+            IReadOnlyCollection<string> expected)
+        {
+            // Arrange
+            var metadataProvider = new TestModelMetadataProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var model = new Model();
+            model.Collection.AddRange(rawValue);
+
+            var viewContext = GetViewContext<Model>(model, metadataProvider);
+            viewContext.ModelState.SetModelValue(
+                nameof(Model.Collection),
+                rawValue,
+                attemptedValue: null);
+
+            // Act
+            var result = htmlGenerator.GetCurrentValues(
+                viewContext,
+                modelExplorer: null,
+                expression: nameof(Model.Collection),
+                allowMultiple: true);
+
+            // Assert
+            Assert.Equal<string>(expected, result);
+        }
+
+        // property name, rawValue -> expected current values
+        public static TheoryData<string, object, string[]> GetCurrentValues_ValueToConvertData
+        {
+            get
+            {
+                return new TheoryData<string, object, string[]>
+                {
+                    { nameof(Model.FlagsEnum), FlagsEnum.All, new [] { "-1", "All" } },
+                    { nameof(Model.FlagsEnum), FlagsEnum.FortyTwo, new [] { "42", "FortyTwo" } },
+                    { nameof(Model.FlagsEnum), FlagsEnum.None, new [] { "0", "None" } },
+                    { nameof(Model.FlagsEnum), FlagsEnum.Two, new [] { "2", "Two" } },
+                    { nameof(Model.FlagsEnum), string.Empty, new [] { string.Empty } },
+                    { nameof(Model.FlagsEnum), "All", new [] { "-1", "All" } },
+                    { nameof(Model.FlagsEnum), "FortyTwo", new [] { "42", "FortyTwo" } },
+                    { nameof(Model.FlagsEnum), "None", new [] { "0", "None" } },
+                    { nameof(Model.FlagsEnum), "Two", new [] { "2", "Two" } },
+                    { nameof(Model.FlagsEnum), "Two, Four", new [] { "Two, Four", "6" } },
+                    { nameof(Model.FlagsEnum), "garbage", new [] { "garbage" } },
+                    { nameof(Model.FlagsEnum), "0", new [] { "0", "None" } },
+                    { nameof(Model.FlagsEnum), "   43", new [] { "   43", "43" } },
+                    { nameof(Model.FlagsEnum), "-5   ", new [] { "-5   ", "-5" } },
+                    { nameof(Model.FlagsEnum), 0, new [] { "0", "None" } },
+                    { nameof(Model.FlagsEnum), 1, new [] { "1", "One" } },
+                    { nameof(Model.FlagsEnum), 43, new [] { "43" } },
+                    { nameof(Model.FlagsEnum), -5, new [] { "-5" } },
+                    { nameof(Model.FlagsEnum), int.MaxValue, new [] { "2147483647" } },
+                    { nameof(Model.FlagsEnum), (uint)int.MaxValue + 1, new [] { "2147483648" } },
+                    { nameof(Model.FlagsEnum), uint.MaxValue, new [] { "4294967295" } },  // converted to string & used
+
+                    { nameof(Model.Id), string.Empty, new [] { string.Empty } },
+                    { nameof(Model.Id), "garbage", new [] { "garbage" } },                  // no compatibility checks
+                    { nameof(Model.Id), "0", new [] { "0" } },
+                    { nameof(Model.Id), "  43", new [] { "  43" } },
+                    { nameof(Model.Id), "-5  ", new [] { "-5  " } },
+                    { nameof(Model.Id), 0, new [] { "0" } },
+                    { nameof(Model.Id), 1, new [] { "1" } },
+                    { nameof(Model.Id), 43, new [] { "43" } },
+                    { nameof(Model.Id), -5, new [] { "-5" } },
+                    { nameof(Model.Id), int.MaxValue, new [] { "2147483647" } },
+                    { nameof(Model.Id), (uint)int.MaxValue + 1, new [] { "2147483648" } },  // no limit checks
+                    { nameof(Model.Id), uint.MaxValue, new [] { "4294967295" } },           // no limit checks
+
+                    { nameof(Model.NullableEnum), RegularEnum.Zero, new [] { "0", "Zero" } },
+                    { nameof(Model.NullableEnum), RegularEnum.One, new [] { "1", "One" } },
+                    { nameof(Model.NullableEnum), RegularEnum.Two, new [] { "2", "Two" } },
+                    { nameof(Model.NullableEnum), RegularEnum.Three, new [] { "3", "Three" } },
+                    { nameof(Model.NullableEnum), string.Empty, new [] { string.Empty } },
+                    { nameof(Model.NullableEnum), "Zero", new [] { "0", "Zero" } },
+                    { nameof(Model.NullableEnum), "Two", new [] { "2", "Two" } },
+                    { nameof(Model.NullableEnum), "One, Two", new [] { "One, Two", "3", "Three" } },
+                    { nameof(Model.NullableEnum), "garbage", new [] { "garbage" } },
+                    { nameof(Model.NullableEnum), "0", new [] { "0", "Zero" } },
+                    { nameof(Model.NullableEnum), "   43", new [] { "   43", "43" } },
+                    { nameof(Model.NullableEnum), "-5   ", new [] { "-5   ", "-5" } },
+                    { nameof(Model.NullableEnum), 0, new [] { "0", "Zero" } },
+                    { nameof(Model.NullableEnum), 1, new [] { "1", "One" } },
+                    { nameof(Model.NullableEnum), 43, new [] { "43" } },
+                    { nameof(Model.NullableEnum), -5, new [] { "-5" } },
+                    { nameof(Model.NullableEnum), int.MaxValue, new [] { "2147483647" } },
+                    { nameof(Model.NullableEnum), (uint)int.MaxValue + 1, new [] { "2147483648" } },
+                    { nameof(Model.NullableEnum), uint.MaxValue, new [] { "4294967295" } },
+
+                    { nameof(Model.RegularEnum), RegularEnum.Zero, new [] { "0", "Zero" } },
+                    { nameof(Model.RegularEnum), RegularEnum.One, new [] { "1", "One" } },
+                    { nameof(Model.RegularEnum), RegularEnum.Two, new [] { "2", "Two" } },
+                    { nameof(Model.RegularEnum), RegularEnum.Three, new [] { "3", "Three" } },
+                    { nameof(Model.RegularEnum), string.Empty, new [] { string.Empty } },
+                    { nameof(Model.RegularEnum), "Zero", new [] { "0", "Zero" } },
+                    { nameof(Model.RegularEnum), "Two", new [] { "2", "Two" } },
+                    { nameof(Model.RegularEnum), "One, Two", new [] { "One, Two", "3", "Three" } },
+                    { nameof(Model.RegularEnum), "garbage", new [] { "garbage" } },
+                    { nameof(Model.RegularEnum), "0", new [] { "0", "Zero" } },
+                    { nameof(Model.RegularEnum), "   43", new [] { "   43", "43" } },
+                    { nameof(Model.RegularEnum), "-5   ", new [] { "-5   ", "-5" } },
+                    { nameof(Model.RegularEnum), 0, new [] { "0", "Zero" } },
+                    { nameof(Model.RegularEnum), 1, new [] { "1", "One" } },
+                    { nameof(Model.RegularEnum), 43, new [] { "43" } },
+                    { nameof(Model.RegularEnum), -5, new [] { "-5" } },
+                    { nameof(Model.RegularEnum), int.MaxValue, new [] { "2147483647" } },
+                    { nameof(Model.RegularEnum), (uint)int.MaxValue + 1, new [] { "2147483648" } },
+                    { nameof(Model.RegularEnum), uint.MaxValue, new [] { "4294967295" } },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(GetCurrentValues_ValueToConvertData))]
+        public void GetCurrentValues_ValueConvertedAsExpected(
+            string propertyName,
+            object rawValue,
+            IReadOnlyCollection<string> expected)
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var viewContext = GetViewContext<Model>(model: null, metadataProvider: metadataProvider);
+            viewContext.ModelState.SetModelValue(
+                propertyName,
+                new string[] { rawValue.ToString() },
+                attemptedValue: null);
+
+            // Act
+            var result = htmlGenerator.GetCurrentValues(
+                viewContext,
+                modelExplorer: null,
+                expression: propertyName,
+                allowMultiple: false);
+
+            // Assert
+            Assert.Equal<string>(expected, result);
+        }
+
+        [Theory]
+        [InlineData(true, "")]
+        [InlineData(false, "<input name=\"formFieldName\" type=\"hidden\" value=\"requestToken\" />")]
+        public void GenerateAntiforgery_GeneratesAntiforgeryFieldsOnlyIfRequired(
+            bool hasAntiforgeryToken,
+            string expectedAntiforgeryHtmlField)
+        {
+            // Arrange
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var viewContext = GetViewContext<Model>(model: null, metadataProvider: metadataProvider);
+            viewContext.FormContext.CanRenderAtEndOfForm = true;
+            viewContext.FormContext.HasAntiforgeryToken = hasAntiforgeryToken;
+
+            // Act
+            var result = htmlGenerator.GenerateAntiforgery(viewContext);
+
+            // Assert
+            var antiforgeryField = HtmlContentUtilities.HtmlContentToString(result, HtmlEncoder.Default);
+            Assert.Equal(expectedAntiforgeryHtmlField, antiforgeryField);
+        }
+
+        // This test covers use of the helper within literal <form> tags when tag helpers are not enabled e.g.
+        // <form action="/Home/Create">
+        //     @Html.AntiForgeryToken()
+        // </form>
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void GenerateAntiforgery_AlwaysGeneratesAntiforgeryToken_IfCannotRenderAtEnd(bool hasAntiforgeryToken)
+        {
+            // Arrange
+            var expected = "<input name=\"formFieldName\" type=\"hidden\" value=\"requestToken\" />";
+            var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var htmlGenerator = GetGenerator(metadataProvider);
+            var viewContext = GetViewContext<Model>(model: null, metadataProvider: metadataProvider);
+            viewContext.FormContext.HasAntiforgeryToken = hasAntiforgeryToken;
+
+            // Act
+            var result = htmlGenerator.GenerateAntiforgery(viewContext);
+
+            // Assert
+            var antiforgeryField = HtmlContentUtilities.HtmlContentToString(result, HtmlEncoder.Default);
+            Assert.Equal(expected, antiforgeryField);
+        }
+
+        // GetCurrentValues uses only the IModelMetadataProvider passed to the DefaultHtmlGenerator constructor.
+        private static IHtmlGenerator GetGenerator(IModelMetadataProvider metadataProvider)
+        {
+            var mvcViewOptionsAccessor = new Mock<IOptions<MvcViewOptions>>();
+            mvcViewOptionsAccessor.SetupGet(accessor => accessor.Value).Returns(new MvcViewOptions());
+
+            var htmlEncoder = Mock.Of<HtmlEncoder>();
+            var antiforgery = new Mock<IAntiforgery>();
+            antiforgery
+                .Setup(mock => mock.GetAndStoreTokens(It.IsAny<DefaultHttpContext>()))
+                .Returns(() =>
+                {
+                    return new AntiforgeryTokenSet("requestToken", "cookieToken", "formFieldName", "headerName");
+                });
+
+            var attributeProvider = new DefaultValidationHtmlAttributeProvider(
+                mvcViewOptionsAccessor.Object,
+                metadataProvider,
+                new ClientValidatorCache());
+
+            return new DefaultHtmlGenerator(
+                antiforgery.Object,
+                mvcViewOptionsAccessor.Object,
+                metadataProvider,
+                new UrlHelperFactory(),
+                htmlEncoder,
+                attributeProvider);
+        }
+
+        // GetCurrentValues uses only the ModelStateDictionary and ViewDataDictionary from the passed ViewContext.
+        private static ViewContext GetViewContext<TModel>(TModel model, IModelMetadataProvider metadataProvider)
+        {
+            var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+            var viewData = new ViewDataDictionary<TModel>(metadataProvider, actionContext.ModelState)
+            {
+                Model = model,
+            };
+
+            return new ViewContext(
+                actionContext,
+                Mock.Of<IView>(),
+                viewData,
+                Mock.Of<ITempDataDictionary>(),
+                TextWriter.Null,
+                new HtmlHelperOptions());
+        }
+
+        public enum RegularEnum
+        {
+            Zero,
+            One,
+            Two,
+            Three,
+        }
+
+        public enum FlagsEnum
+        {
+            None = 0,
+            One = 1,
+            Two = 2,
+            Four = 4,
+            FortyTwo = 42,
+            All = -1,
+        }
+
+        private class Model
+        {
+            public int Id { get; set; }
+
+            public string Name { get; set; }
+
+            public RegularEnum RegularEnum { get; set; }
+
+            public FlagsEnum FlagsEnum { get; set; }
+
+            public RegularEnum? NullableEnum { get; set; }
+
+            public List<string> Collection { get; } = new List<string>();
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/DefaultValidationHtmlAttributeProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/DefaultValidationHtmlAttributeProviderTest.cs
new file mode 100644
index 0000000000..3a77571657
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/DefaultValidationHtmlAttributeProviderTest.cs
@@ -0,0 +1,294 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class DefaultValidationHtmlAttributeProviderTest
+    {
+        [Fact]
+        [ReplaceCulture]
+        public void AddValidationAttributes_AddsAttributes()
+        {
+            // Arrange
+            var expectedMessage = $"The field {nameof(Model.HasValidatorsProperty)} must be a number.";
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var attributeProvider = GetAttributeProvider(metadataProvider);
+            var viewContext = GetViewContext<Model>(model: null, metadataProvider: metadataProvider);
+            var attributes = new SortedDictionary<string, string>(StringComparer.Ordinal);
+            var modelExplorer = metadataProvider
+                .GetModelExplorerForType(typeof(Model), model: null)
+                .GetExplorerForProperty(nameof(Model.HasValidatorsProperty));
+
+            // Act
+            attributeProvider.AddValidationAttributes(
+                viewContext,
+                modelExplorer,
+                attributes);
+
+            // Assert
+            Assert.Collection(
+                attributes,
+                kvp =>
+                {
+                    Assert.Equal("data-val", kvp.Key);
+                    Assert.Equal("true", kvp.Value);
+                },
+                kvp =>
+                {
+                    Assert.Equal("data-val-number", kvp.Key);
+                    Assert.Equal(expectedMessage, kvp.Value);
+                });
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void AddAndTrackValidationAttributes_AddsAttributes()
+        {
+            // Arrange
+            var expectedMessage = $"The field {nameof(Model.HasValidatorsProperty)} must be a number.";
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var attributeProvider = GetAttributeProvider(metadataProvider);
+            var viewContext = GetViewContext<Model>(model: null, metadataProvider: metadataProvider);
+            var attributes = new SortedDictionary<string, string>(StringComparer.Ordinal);
+            var modelExplorer = metadataProvider
+                .GetModelExplorerForType(typeof(Model), model: null)
+                .GetExplorerForProperty(nameof(Model.HasValidatorsProperty));
+
+            // Act
+            attributeProvider.AddAndTrackValidationAttributes(
+                viewContext,
+                modelExplorer,
+                nameof(Model.HasValidatorsProperty),
+                attributes);
+
+            // Assert
+            Assert.Collection(
+                attributes,
+                kvp =>
+                {
+                    Assert.Equal("data-val", kvp.Key);
+                    Assert.Equal("true", kvp.Value);
+                },
+                kvp =>
+                {
+                    Assert.Equal("data-val-number", kvp.Key);
+                    Assert.Equal(expectedMessage, kvp.Value);
+                });
+        }
+
+        [Fact]
+        public void AddValidationAttributes_AddsNothing_IfClientSideValidationDisabled()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var attributeProvider = GetAttributeProvider(metadataProvider);
+            var viewContext = GetViewContext<Model>(model: null, metadataProvider: metadataProvider);
+            viewContext.ClientValidationEnabled = false;
+
+            var attributes = new SortedDictionary<string, string>(StringComparer.Ordinal);
+            var modelExplorer = metadataProvider
+                .GetModelExplorerForType(typeof(Model), model: null)
+                .GetExplorerForProperty(nameof(Model.HasValidatorsProperty));
+
+            // Act
+            attributeProvider.AddValidationAttributes(
+                viewContext,
+                modelExplorer,
+                attributes);
+
+            // Assert
+            Assert.Empty(attributes);
+        }
+
+        [Fact]
+        public void AddAndTrackValidationAttributes_DoesNotCallAddMethod_IfClientSideValidationDisabled()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var viewContext = GetViewContext<Model>(model: null, metadataProvider: metadataProvider);
+            viewContext.ClientValidationEnabled = false;
+
+            var attributes = new SortedDictionary<string, string>(StringComparer.Ordinal);
+            var modelExplorer = metadataProvider
+                .GetModelExplorerForType(typeof(Model), model: null)
+                .GetExplorerForProperty(nameof(Model.HasValidatorsProperty));
+
+            var attributeProviderMock = new Mock<ValidationHtmlAttributeProvider>() { CallBase = true };
+            attributeProviderMock
+                .Setup(p => p.AddValidationAttributes(
+                    It.IsAny<ViewContext>(),
+                    It.IsAny<ModelExplorer>(),
+                    It.IsAny<IDictionary<string, string>>()))
+                .Verifiable();
+            var attributeProvider = attributeProviderMock.Object;
+
+            // Act
+            attributeProvider.AddAndTrackValidationAttributes(
+                viewContext,
+                modelExplorer,
+                nameof(Model.HasValidatorsProperty),
+                attributes);
+
+            // Assert
+            Assert.Empty(attributes);
+            attributeProviderMock.Verify(
+                p => p.AddValidationAttributes(
+                    It.IsAny<ViewContext>(),
+                    It.IsAny<ModelExplorer>(),
+                    It.IsAny<IDictionary<string, string>>()),
+                Times.Never);
+        }
+
+        [Fact]
+        public void AddValidationAttributes_AddsAttributes_EvenIfPropertyAlreadyRendered()
+        {
+            // Arrange
+            var expectedMessage = $"The field {nameof(Model.HasValidatorsProperty)} must be a number.";
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var attributeProvider = GetAttributeProvider(metadataProvider);
+            var viewContext = GetViewContext<Model>(model: null, metadataProvider: metadataProvider);
+            viewContext.FormContext.RenderedField(nameof(Model.HasValidatorsProperty), value: true);
+
+            var attributes = new SortedDictionary<string, string>(StringComparer.Ordinal);
+            var modelExplorer = metadataProvider
+                .GetModelExplorerForType(typeof(Model), model: null)
+                .GetExplorerForProperty(nameof(Model.HasValidatorsProperty));
+
+            // Act
+            attributeProvider.AddValidationAttributes(
+                viewContext,
+                modelExplorer,
+                attributes);
+
+            // Assert
+            Assert.Collection(
+                attributes,
+                kvp =>
+                {
+                    Assert.Equal("data-val", kvp.Key);
+                    Assert.Equal("true", kvp.Value);
+                },
+                kvp =>
+                {
+                    Assert.Equal("data-val-number", kvp.Key);
+                    Assert.Equal(expectedMessage, kvp.Value);
+                });
+        }
+
+        [Fact]
+        public void AddAndTrackValidationAttributes_DoesNotCallAddMethod_IfPropertyAlreadyRendered()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var viewContext = GetViewContext<Model>(model: null, metadataProvider: metadataProvider);
+            viewContext.FormContext.RenderedField(nameof(Model.HasValidatorsProperty), value: true);
+
+            var attributes = new SortedDictionary<string, string>(StringComparer.Ordinal);
+            var modelExplorer = metadataProvider
+                .GetModelExplorerForType(typeof(Model), model: null)
+                .GetExplorerForProperty(nameof(Model.HasValidatorsProperty));
+
+            var attributeProviderMock = new Mock<ValidationHtmlAttributeProvider>() { CallBase = true };
+            attributeProviderMock
+                .Setup(p => p.AddValidationAttributes(
+                    It.IsAny<ViewContext>(),
+                    It.IsAny<ModelExplorer>(),
+                    It.IsAny<IDictionary<string, string>>()))
+                .Verifiable();
+            var attributeProvider = attributeProviderMock.Object;
+
+            // Act
+            attributeProvider.AddAndTrackValidationAttributes(
+                viewContext,
+                modelExplorer,
+                nameof(Model.HasValidatorsProperty),
+                attributes);
+
+            // Assert
+            Assert.Empty(attributes);
+            attributeProviderMock.Verify(
+                p => p.AddValidationAttributes(
+                    It.IsAny<ViewContext>(),
+                    It.IsAny<ModelExplorer>(),
+                    It.IsAny<IDictionary<string, string>>()),
+                Times.Never);
+        }
+
+        [Fact]
+        public void AddValidationAttributes_AddsNothing_IfPropertyHasNoValidators()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var attributeProvider = GetAttributeProvider(metadataProvider);
+            var viewContext = GetViewContext<Model>(model: null, metadataProvider: metadataProvider);
+            var attributes = new SortedDictionary<string, string>(StringComparer.Ordinal);
+            var modelExplorer = metadataProvider
+                .GetModelExplorerForType(typeof(Model), model: null)
+                .GetExplorerForProperty(nameof(Model.Property));
+
+            // Act
+            attributeProvider.AddValidationAttributes(
+                viewContext,
+                modelExplorer,
+                attributes);
+
+            // Assert
+            Assert.Empty(attributes);
+        }
+
+        private static ViewContext GetViewContext<TModel>(TModel model, IModelMetadataProvider metadataProvider)
+        {
+            var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
+            var viewData = new ViewDataDictionary<TModel>(metadataProvider, actionContext.ModelState)
+            {
+                Model = model,
+            };
+
+            return new ViewContext(
+                actionContext,
+                Mock.Of<IView>(),
+                viewData,
+                Mock.Of<ITempDataDictionary>(),
+                TextWriter.Null,
+                new HtmlHelperOptions());
+        }
+
+        private static ValidationHtmlAttributeProvider GetAttributeProvider(IModelMetadataProvider metadataProvider)
+        {
+            // Add validation properties for float, double and decimal properties. Ignore everything else.
+            var mvcViewOptions = new MvcViewOptions();
+            mvcViewOptions.ClientModelValidatorProviders.Add(new NumericClientModelValidatorProvider());
+
+            var mvcViewOptionsAccessor = new Mock<IOptions<MvcViewOptions>>();
+            mvcViewOptionsAccessor.SetupGet(accessor => accessor.Value).Returns(mvcViewOptions);
+
+            return new DefaultValidationHtmlAttributeProvider(
+                mvcViewOptionsAccessor.Object,
+                metadataProvider,
+                new ClientValidatorCache());
+        }
+
+        private class Model
+        {
+            public double HasValidatorsProperty { get; set; }
+
+            public string Property { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/JsonHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/JsonHelperTest.cs
new file mode 100644
index 0000000000..bcc3e4b538
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/JsonHelperTest.cs
@@ -0,0 +1,68 @@
+// 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.
+
+using System.Buffers;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class JsonHelperTest
+    {
+        [Fact]
+        public void Serialize_EscapesHtmlByDefault()
+        {
+            // Arrange
+            var settings = new JsonSerializerSettings()
+            {
+                StringEscapeHandling = StringEscapeHandling.EscapeNonAscii,
+            };
+            var helper = new JsonHelper(
+                new JsonOutputFormatter(settings, ArrayPool<char>.Shared),
+                ArrayPool<char>.Shared);
+            var obj = new
+            {
+                HTML = "<b>John Doe</b>"
+            };
+            var expectedOutput = "{\"HTML\":\"\\u003cb\\u003eJohn Doe\\u003c/b\\u003e\"}";
+
+            // Act
+            var result = helper.Serialize(obj);
+
+            // Assert
+            var htmlString = Assert.IsType<HtmlString>(result);
+            Assert.Equal(expectedOutput, htmlString.ToString());
+        }
+
+        [Fact]
+        public void Serialize_MaintainsSettingsAndEscapesHtml()
+        {
+            // Arrange
+            var settings = new JsonSerializerSettings()
+            {
+                ContractResolver = new DefaultContractResolver
+                {
+                    NamingStrategy = new CamelCaseNamingStrategy(),
+                },
+            };
+            var helper = new JsonHelper(
+                new JsonOutputFormatter(settings, ArrayPool<char>.Shared),
+                ArrayPool<char>.Shared);
+            var obj = new
+            {
+                FullHtml = "<b>John Doe</b>"
+            };
+            var expectedOutput = "{\"fullHtml\":\"\\u003cb\\u003eJohn Doe\\u003c/b\\u003e\"}";
+
+            // Act
+            var result = helper.Serialize(obj);
+
+            // Assert
+            var htmlString = Assert.IsType<HtmlString>(result);
+            Assert.Equal(expectedOutput, htmlString.ToString());
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ModelExplorerExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ModelExplorerExtensionsTest.cs
new file mode 100644
index 0000000000..981aa72ed7
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ModelExplorerExtensionsTest.cs
@@ -0,0 +1,86 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ModelExplorerExtensionsTest
+    {
+        public static TheoryData<object, Type, string> SimpleDisplayTextData
+        {
+            get
+            {
+                return new TheoryData<object, Type, string>
+                {
+                    {
+                        new ComplexClass()
+                        {
+                            Prop1 = new Class1 { Prop1 = "Hello" }
+                        },
+                        typeof(ComplexClass),
+                        "Class1"
+                    },
+                    {
+                        new Class1(),
+                        typeof(Class1),
+                        "Class1"
+                    },
+                    {
+                        new ClassWithNoProperties(),
+                        typeof(ClassWithNoProperties),
+                        string.Empty
+                    },
+                    {
+                        null,
+                        typeof(object),
+                        null
+                    },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(SimpleDisplayTextData))]
+        public void GetSimpleDisplayText_WithoutSimpleDisplayProperty(
+            object model, 
+            Type modelType, 
+            string expectedResult)
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var modelExplorer = provider.GetModelExplorerForType(modelType, model);
+
+            // Act
+            var result = modelExplorer.GetSimpleDisplayText();
+
+            // Assert
+            Assert.Equal(expectedResult, result);
+        }
+
+        private class ClassWithNoProperties
+        {
+            public override string ToString()
+            {
+                return null;
+            }
+        }
+
+        private class ComplexClass
+        {
+            public Class1 Prop1 { get; set; }
+        }
+
+        private class Class1
+        {
+            public string Prop1 { get; set; }
+
+            public override string ToString()
+            {
+                return "Class1";
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ModelExplorerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ModelExplorerTest.cs
new file mode 100644
index 0000000000..366f8b37b5
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ModelExplorerTest.cs
@@ -0,0 +1,151 @@
+// 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.
+
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ModelExplorerTest
+    {
+        [Fact]
+        public void ModelType_UsesRuntimeType()
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var modelExplorer = provider.GetModelExplorerForType(typeof(BaseClass), new DerivedClass());
+
+            // Act
+            var modelType = modelExplorer.ModelType;
+
+            // Assert
+            Assert.Equal(typeof(DerivedClass), modelType);
+        }
+
+        [Fact]
+        public void ModelType_UsesDeclaredType_WhenModelIsNull()
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var modelExplorer = provider.GetModelExplorerForType(typeof(BaseClass), model: null);
+
+            // Act
+            var modelType = modelExplorer.ModelType;
+
+            // Assert
+            Assert.Equal(typeof(BaseClass), modelType);
+        }
+
+        [Fact]
+        public void Properties_UsesRuntimeType()
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var modelExplorer = provider.GetModelExplorerForType(typeof(BaseClass), new DerivedClass());
+
+            // Act
+            var properties = modelExplorer.Properties.ToArray();
+
+            // Assert
+            Assert.Equal(2, properties.Length);
+
+            var baseProperty = Assert.Single(properties, p => p.Metadata.PropertyName == "Base1");
+            Assert.Equal(typeof(int), baseProperty.Metadata.ModelType);
+            Assert.Equal(typeof(DerivedClass), baseProperty.Metadata.ContainerType);
+            Assert.Same(modelExplorer, baseProperty.Container);
+
+            var derivedProperty = Assert.Single(properties, p => p.Metadata.PropertyName == "Derived1");
+            Assert.Equal(typeof(string), derivedProperty.Metadata.ModelType);
+            Assert.Equal(typeof(DerivedClass), derivedProperty.Metadata.ContainerType);
+            Assert.Same(modelExplorer, derivedProperty.Container);
+        }
+
+        [Fact]
+        public void Properties_UsesDeclaredType_WhenModelIsNull()
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var modelExplorer = provider.GetModelExplorerForType(typeof(BaseClass), model: null);
+
+            // Act
+            var properties = modelExplorer.Properties.ToArray();
+
+            // Assert
+            Assert.Single(properties);
+
+            var baseProperty = Assert.Single(properties, p => p.Metadata.PropertyName == "Base1");
+            Assert.Equal(typeof(int), baseProperty.Metadata.ModelType);
+            Assert.Equal(typeof(BaseClass), baseProperty.Metadata.ContainerType);
+            Assert.Same(modelExplorer, baseProperty.Container);
+        }
+
+        [Fact]
+        public void GetPropertyExplorer_DeferredModelAccess()
+        {
+            // Arrange
+            var model = new DerivedClass()
+            {
+                Base1 = 5,
+            };
+
+            var provider = new EmptyModelMetadataProvider();
+            var modelExplorer = provider.GetModelExplorerForType(typeof(BaseClass), model);
+
+            // Change the model value after creating the explorer
+            var propertyExplorer = modelExplorer.GetExplorerForProperty("Base1");
+            model.Base1 = 17;
+
+            // Act
+            var propertyValue = propertyExplorer.Model;
+
+            // Assert
+            Assert.Equal(17, propertyValue);
+        }
+
+        [Fact]
+        public void GetPropertyExplorer_DeferredModelAccess_ContainerModelIsNull()
+        {
+            // Arrange
+            var provider = new EmptyModelMetadataProvider();
+            var modelExplorer = provider.GetModelExplorerForType(typeof(BaseClass), model: null);
+
+            var propertyExplorer = modelExplorer.GetExplorerForProperty("Base1");
+
+            // Act
+            var propertyValue = propertyExplorer.Model;
+
+            // Assert
+            Assert.Null(propertyValue);
+        }
+
+        [Fact]
+        public void GetPropertyExplorer_ReturnsNull_ForPropertyNotFound()
+        {
+            // Arrange
+            var model = new DerivedClass()
+            {
+                Base1 = 5,
+            };
+
+            var provider = new EmptyModelMetadataProvider();
+            var modelExplorer = provider.GetModelExplorerForType(typeof(BaseClass), model);
+
+            // Act
+            var propertyExplorer = modelExplorer.GetExplorerForProperty("BadName");
+
+            // Assert
+            Assert.Null(propertyExplorer);
+        }
+
+        private class BaseClass
+        {
+            public int Base1 { get; set; }
+        }
+
+        private class DerivedClass : BaseClass
+        {
+            public string Derived1 { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/PartialViewResultExecutorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/PartialViewResultExecutorTest.cs
new file mode 100644
index 0000000000..ff2abdd59e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/PartialViewResultExecutorTest.cs
@@ -0,0 +1,351 @@
+// 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.
+
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Microsoft.Net.Http.Headers;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class PartialViewResultExecutorTest
+    {
+        [Fact]
+        public void FindView_UsesViewEngine_FromPartialViewResult()
+        {
+            // Arrange
+            var context = GetActionContext();
+            var executor = GetViewExecutor();
+
+            var viewName = "my-view";
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(e => e.GetView(/*executingFilePath*/ null, viewName, /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound(viewName, Enumerable.Empty<string>()))
+                .Verifiable();
+            viewEngine
+                .Setup(e => e.FindView(context, viewName, /*isMainPage*/ false))
+                .Returns(ViewEngineResult.Found(viewName, Mock.Of<IView>()))
+                .Verifiable();
+
+            var viewResult = new PartialViewResult
+            {
+                ViewEngine = viewEngine.Object,
+                ViewName = viewName,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act
+            var viewEngineResult = executor.FindView(context, viewResult);
+
+            // Assert
+            Assert.Equal(viewName, viewEngineResult.ViewName);
+            viewEngine.Verify();
+        }
+
+        [Fact]
+        public void FindView_UsesActionDescriptorName_IfViewNameIsNull()
+        {
+            // Arrange
+            var viewName = "some-view-name";
+            var context = GetActionContext(viewName);
+            var executor = GetViewExecutor();
+
+            var viewResult = new PartialViewResult
+            {
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act
+            var viewEngineResult = executor.FindView(context, viewResult);
+
+            // Assert
+            Assert.Equal(viewName, viewEngineResult.ViewName);
+        }
+
+        [Fact]
+        public void FindView_ReturnsExpectedNotFoundResult_WithGetViewLocations()
+        {
+            // Arrange
+            var expectedLocations = new[] { "location1", "location2" };
+            var context = GetActionContext();
+            var executor = GetViewExecutor();
+
+            var viewName = "myview";
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(e => e.GetView(/*executingFilePath*/ null, "myview", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("myview", expectedLocations))
+                .Verifiable();
+            viewEngine
+                .Setup(e => e.FindView(context, "myview", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("myview", Enumerable.Empty<string>()));
+
+            var viewResult = new PartialViewResult
+            {
+                ViewName = viewName,
+                ViewEngine = viewEngine.Object,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act
+            var result = executor.FindView(context, viewResult);
+
+            // Assert
+            Assert.False(result.Success);
+            Assert.Null(result.View);
+            Assert.Equal(expectedLocations, result.SearchedLocations);
+        }
+
+        [Fact]
+        public void FindView_ReturnsExpectedNotFoundResult_WithFindViewLocations()
+        {
+            // Arrange
+            var expectedLocations = new[] { "location1", "location2" };
+            var context = GetActionContext();
+            var executor = GetViewExecutor();
+
+            var viewName = "myview";
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(e => e.GetView(/*executingFilePath*/ null, "myview", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("myview", Enumerable.Empty<string>()))
+                .Verifiable();
+            viewEngine
+                .Setup(e => e.FindView(context, "myview", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("myview", expectedLocations));
+
+            var viewResult = new PartialViewResult
+            {
+                ViewName = viewName,
+                ViewEngine = viewEngine.Object,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act
+            var result = executor.FindView(context, viewResult);
+
+            // Assert
+            Assert.False(result.Success);
+            Assert.Null(result.View);
+            Assert.Equal(expectedLocations, result.SearchedLocations);
+        }
+
+        [Fact]
+        public void FindView_ReturnsExpectedNotFoundResult_WithAllLocations()
+        {
+            // Arrange
+            var expectedLocations = new[] { "location1", "location2", "location3", "location4" };
+            var context = GetActionContext();
+            var executor = GetViewExecutor();
+
+            var viewName = "myview";
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(e => e.GetView(/*executingFilePath*/ null, "myview", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("myview", new[] { "location1", "location2" }))
+                .Verifiable();
+            viewEngine
+                .Setup(e => e.FindView(context, "myview", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("myview", new[] { "location3", "location4" }));
+
+            var viewResult = new PartialViewResult
+            {
+                ViewName = viewName,
+                ViewEngine = viewEngine.Object,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act
+            var result = executor.FindView(context, viewResult);
+
+            // Assert
+            Assert.False(result.Success);
+            Assert.Null(result.View);
+            Assert.Equal(expectedLocations, result.SearchedLocations);
+        }
+
+        [Fact]
+        public void FindView_WritesDiagnostic_ViewFound()
+        {
+            // Arrange
+            var diagnosticSource = new DiagnosticListener("Test");
+            var listener = new TestDiagnosticListener();
+            diagnosticSource.SubscribeWithAdapter(listener);
+
+            var context = GetActionContext();
+            var executor = GetViewExecutor(diagnosticSource);
+
+            var viewName = "myview";
+            var viewResult = new PartialViewResult
+            {
+                ViewName = viewName,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act
+            var viewEngineResult = executor.FindView(context, viewResult);
+
+            // Assert
+            Assert.Equal(viewName, viewEngineResult.ViewName);
+
+            Assert.NotNull(listener.ViewFound);
+            Assert.NotNull(listener.ViewFound.ActionContext);
+            Assert.NotNull(listener.ViewFound.Result);
+            Assert.NotNull(listener.ViewFound.View);
+            Assert.False(listener.ViewFound.IsMainPage);
+            Assert.Equal("myview", listener.ViewFound.ViewName);
+        }
+
+        [Fact]
+        public void FindView_WritesDiagnostic_ViewNotFound()
+        {
+            // Arrange
+            var diagnosticSource = new DiagnosticListener("Test");
+            var listener = new TestDiagnosticListener();
+            diagnosticSource.SubscribeWithAdapter(listener);
+
+            var context = GetActionContext();
+            var executor = GetViewExecutor(diagnosticSource);
+
+            var viewName = "myview";
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(e => e.GetView(/*executingFilePath*/ null, "myview", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("myview", Enumerable.Empty<string>()))
+                .Verifiable();
+            viewEngine
+                .Setup(e => e.FindView(context, "myview", /*isMainPage*/ false))
+                .Returns(ViewEngineResult.NotFound("myview", new string[] { "location/myview" }));
+
+            var viewResult = new PartialViewResult
+            {
+                ViewName = viewName,
+                ViewEngine = viewEngine.Object,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act
+            var viewEngineResult = executor.FindView(context, viewResult);
+
+            // Assert
+            Assert.False(viewEngineResult.Success);
+
+            Assert.NotNull(listener.ViewNotFound);
+            Assert.NotNull(listener.ViewNotFound.ActionContext);
+            Assert.NotNull(listener.ViewNotFound.Result);
+            Assert.Equal(new string[] { "location/myview" }, listener.ViewNotFound.SearchedLocations);
+            Assert.Equal("myview", listener.ViewNotFound.ViewName);
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_UsesContentType_FromPartialViewResult()
+        {
+            // Arrange
+            var context = GetActionContext();
+            var executor = GetViewExecutor();
+
+            var contentType = "application/x-my-content-type";
+
+            var viewResult = new PartialViewResult
+            {
+                ViewName = "my-view",
+                ContentType = contentType,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act
+            await executor.ExecuteAsync(context, Mock.Of<IView>(), viewResult);
+
+            // Assert
+            Assert.Equal("application/x-my-content-type", context.HttpContext.Response.ContentType);
+
+            // Check if the original instance provided by the user has not changed.
+            // Since we do not have access to the new instance created within the view executor,
+            // check if at least the content is the same.
+            Assert.Null(MediaType.GetEncoding(contentType));
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_UsesStatusCode_FromPartialViewResult()
+        {
+            // Arrange
+            var context = GetActionContext();
+            var executor = GetViewExecutor();
+
+            var contentType = MediaTypeHeaderValue.Parse("application/x-my-content-type");
+
+            var viewResult = new PartialViewResult
+            {
+                ViewName = "my-view",
+                StatusCode = 404,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act
+            await executor.ExecuteAsync(context, Mock.Of<IView>(), viewResult);
+
+            // Assert
+            Assert.Equal(404, context.HttpContext.Response.StatusCode);
+        }
+
+        private ActionContext GetActionContext(string actionName = null)
+        {
+            var routeData = new RouteData();
+            routeData.Values["action"] = actionName;
+
+            return new ActionContext(new DefaultHttpContext(), routeData, new ControllerActionDescriptor() { ActionName = actionName });
+        }
+
+        private PartialViewResultExecutor GetViewExecutor(DiagnosticSource diagnosticSource = null)
+        {
+            if (diagnosticSource == null)
+            {
+                diagnosticSource = new DiagnosticListener("Test");
+            }
+
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(e => e.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns<string, string, bool>(
+                    (executing, name, isMainPage) => ViewEngineResult.NotFound(name, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(e => e.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ false))
+                .Returns<ActionContext, string, bool>(
+                    (context, name, isMainPage) => ViewEngineResult.Found(name, Mock.Of<IView>()));
+
+            var options = Options.Create(new MvcViewOptions());
+            options.Value.ViewEngines.Add(viewEngine.Object);
+
+            var viewExecutor = new PartialViewResultExecutor(
+                options,
+                new TestHttpResponseStreamWriterFactory(),
+                new CompositeViewEngine(options),
+                new TempDataDictionaryFactory(new SessionStateTempDataProvider()),
+                diagnosticSource,
+                NullLoggerFactory.Instance,
+                new EmptyModelMetadataProvider());
+
+            return viewExecutor;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/SessionStateTempDataProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/SessionStateTempDataProviderTest.cs
new file mode 100644
index 0000000000..3df754fa95
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/SessionStateTempDataProviderTest.cs
@@ -0,0 +1,340 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class SessionStateTempDataProviderTest
+    {
+        [Fact]
+        public void Load_ThrowsException_WhenSessionIsNotEnabled()
+        {
+            // Arrange
+            var testProvider = new SessionStateTempDataProvider();
+
+            // Act & Assert
+            Assert.Throws<InvalidOperationException>(() =>
+            {
+                testProvider.LoadTempData(GetHttpContext(sessionEnabled: false));
+            });
+        }
+
+        [Fact]
+        public void Save_ThrowsException_WhenSessionIsNotEnabled()
+        {
+            // Arrange
+            var testProvider = new SessionStateTempDataProvider();
+            var values = new Dictionary<string, object>();
+            values.Add("key1", "value1");
+
+            // Act & Assert
+            Assert.Throws<InvalidOperationException>(() =>
+            {
+                testProvider.SaveTempData(GetHttpContext(sessionEnabled: false), values);
+            });
+        }
+
+        [Fact]
+        public void Load_ReturnsEmptyDictionary_WhenNoSessionDataIsAvailable()
+        {
+            // Arrange
+            var testProvider = new SessionStateTempDataProvider();
+
+            // Act
+            var tempDataDictionary = testProvider.LoadTempData(GetHttpContext());
+
+            // Assert
+            Assert.Empty(tempDataDictionary);
+        }
+
+        [Fact]
+        public void SaveAndLoad_StringCanBeStoredAndLoaded()
+        {
+            // Arrange
+            var testProvider = new SessionStateTempDataProvider();
+            var input = new Dictionary<string, object>
+            {
+                { "string", "value" }
+            };
+            var context = GetHttpContext();
+
+            // Act
+            testProvider.SaveTempData(context, input);
+            var TempData = testProvider.LoadTempData(context);
+
+            // Assert
+            var stringVal = Assert.IsType<string>(TempData["string"]);
+            Assert.Equal("value", stringVal);
+        }
+
+        [Theory]
+        [InlineData(10)]
+        [InlineData(int.MaxValue)]
+        [InlineData(int.MinValue)]
+        public void SaveAndLoad_IntCanBeStoredAndLoaded(int expected)
+        {
+            // Arrange
+            var testProvider = new SessionStateTempDataProvider();
+            var input = new Dictionary<string, object>
+            {
+                { "int", expected }
+            };
+            var context = GetHttpContext();
+
+            // Act
+            testProvider.SaveTempData(context, input);
+            var TempData = testProvider.LoadTempData(context);
+
+            // Assert
+            var intVal = Assert.IsType<int>(TempData["int"]);
+            Assert.Equal(expected, intVal);
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void SaveAndLoad_BoolCanBeStoredAndLoaded(bool value)
+        {
+            // Arrange
+            var testProvider = new SessionStateTempDataProvider();
+            var input = new Dictionary<string, object>
+            {
+                { "bool", value }
+            };
+            var context = GetHttpContext();
+
+            // Act
+            testProvider.SaveTempData(context, input);
+            var TempData = testProvider.LoadTempData(context);
+
+            // Assert
+            var boolVal = Assert.IsType<bool>(TempData["bool"]);
+            Assert.Equal(value, boolVal);
+        }
+
+        [Fact]
+        public void SaveAndLoad_DateTimeCanBeStoredAndLoaded()
+        {
+            // Arrange
+            var testProvider = new SessionStateTempDataProvider();
+            var inputDatetime = new DateTime(2010, 12, 12, 1, 2, 3, DateTimeKind.Local);
+            var input = new Dictionary<string, object>
+            {
+                { "DateTime", inputDatetime }
+            };
+            var context = GetHttpContext();
+
+            // Act
+            testProvider.SaveTempData(context, input);
+            var TempData = testProvider.LoadTempData(context);
+
+            // Assert
+            var datetime = Assert.IsType<DateTime>(TempData["DateTime"]);
+            Assert.Equal(inputDatetime, datetime);
+        }
+
+        [Fact]
+        public void SaveAndLoad_GuidCanBeStoredAndLoaded()
+        {
+            // Arrange
+            var testProvider = new SessionStateTempDataProvider();
+            var inputGuid = Guid.NewGuid();
+            var input = new Dictionary<string, object>
+            {
+                { "Guid", inputGuid }
+            };
+            var context = GetHttpContext();
+
+            // Act
+            testProvider.SaveTempData(context, input);
+            var TempData = testProvider.LoadTempData(context);
+
+            // Assert
+            var guidVal = Assert.IsType<Guid>(TempData["Guid"]);
+            Assert.Equal(inputGuid, guidVal);
+        }
+
+        [Fact]
+        public void SaveAndLoad_EnumCanBeSavedAndLoaded()
+        {
+            // Arrange
+            var key = "EnumValue";
+            var testProvider = new SessionStateTempDataProvider();
+            var expected = DayOfWeek.Friday;
+            var input = new Dictionary<string, object>
+            {
+                { key, expected }
+            };
+            var context = GetHttpContext();
+
+            // Act
+            testProvider.SaveTempData(context, input);
+            var TempData = testProvider.LoadTempData(context);
+            var result = TempData[key];
+
+            // Assert
+            var actual = (DayOfWeek)result;
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(3100000000L)]
+        [InlineData(-3100000000L)]
+        public void SaveAndLoad_LongCanBeSavedAndLoaded(long expected)
+        {
+            // Arrange
+            var key = "LongValue";
+            var testProvider = new SessionStateTempDataProvider();
+            var input = new Dictionary<string, object>
+            {
+                { key, expected }
+            };
+            var context = GetHttpContext();
+
+            // Act
+            testProvider.SaveTempData(context, input);
+            var TempData = testProvider.LoadTempData(context);
+            var result = TempData[key];
+
+            // Assert
+            var actual = Assert.IsType<long>(result);
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void SaveAndLoad_ListCanBeStoredAndLoaded()
+        {
+            // Arrange
+            var testProvider = new SessionStateTempDataProvider();
+            var input = new Dictionary<string, object>
+            {
+                { "List`string", new List<string> { "one", "two" } }
+            };
+            var context = GetHttpContext();
+
+            // Act
+            testProvider.SaveTempData(context, input);
+            var TempData = testProvider.LoadTempData(context);
+
+            // Assert
+            var list = (IList<string>)TempData["List`string"];
+            Assert.Equal(2, list.Count);
+            Assert.Equal("one", list[0]);
+            Assert.Equal("two", list[1]);
+        }
+
+        [Fact]
+        public void SaveAndLoad_DictionaryCanBeStoredAndLoaded()
+        {
+            // Arrange
+            var testProvider = new SessionStateTempDataProvider();
+            var inputDictionary = new Dictionary<string, string>
+            {
+                { "Hello", "World" },
+            };
+            var input = new Dictionary<string, object>
+            {
+                { "Dictionary", inputDictionary }
+            };
+            var context = GetHttpContext();
+
+            // Act
+            testProvider.SaveTempData(context, input);
+            var TempData = testProvider.LoadTempData(context);
+
+            // Assert
+            var dictionary = Assert.IsType<Dictionary<string, string>>(TempData["Dictionary"]);
+            Assert.Equal("World", dictionary["Hello"]);
+        }
+
+        [Fact]
+        public void SaveAndLoad_EmptyDictionary_RoundTripsAsNull()
+        {
+            // Arrange
+            var testProvider = new SessionStateTempDataProvider();
+            var input = new Dictionary<string, object>
+            {
+                { "EmptyDictionary", new Dictionary<string, int>() }
+            };
+            var context = GetHttpContext();
+
+            // Act
+            testProvider.SaveTempData(context, input);
+            var TempData = testProvider.LoadTempData(context);
+
+            // Assert
+            var emptyDictionary = (IDictionary<string, int>)TempData["EmptyDictionary"];
+            Assert.Null(emptyDictionary);
+        }
+
+        private class TestItem
+        {
+            public int DummyInt { get; set; }
+        }
+
+        private HttpContext GetHttpContext(bool sessionEnabled = true)
+        {
+            var httpContext = new DefaultHttpContext();
+            if (sessionEnabled)
+            {
+                httpContext.Features.Set<ISessionFeature>(new SessionFeature() { Session = new TestSession() });
+            }
+            return httpContext;
+        }
+
+        private class SessionFeature : ISessionFeature
+        {
+            public ISession Session { get; set; }
+        }
+
+        private class TestSession : ISession
+        {
+            private Dictionary<string, byte[]> _innerDictionary = new Dictionary<string, byte[]>();
+
+            public IEnumerable<string> Keys { get { return _innerDictionary.Keys; } }
+
+            public string Id => "TestId";
+
+            public bool IsAvailable { get; } = true;
+
+            public Task LoadAsync(CancellationToken cancellationToken = default(CancellationToken))
+            {
+                return Task.FromResult(0);
+            }
+
+            public Task CommitAsync(CancellationToken cancellationToken = default(CancellationToken))
+            {
+                return Task.FromResult(0);
+            }
+
+            public void Clear()
+            {
+                _innerDictionary.Clear();
+            }
+
+            public void Remove(string key)
+            {
+                _innerDictionary.Remove(key);
+            }
+
+            public void Set(string key, byte[] value)
+            {
+                _innerDictionary[key] = value.ToArray();
+            }
+
+            public bool TryGetValue(string key, out byte[] value)
+            {
+                return _innerDictionary.TryGetValue(key, out value);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/StringHtmlContentTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/StringHtmlContentTest.cs
new file mode 100644
index 0000000000..a6114e7f4f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/StringHtmlContentTest.cs
@@ -0,0 +1,26 @@
+// 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.
+
+using System.IO;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class StringHtmlContentTest
+    {
+        [Fact]
+        public void WriteTo_WritesContent()
+        {
+            // Arrange & Act
+            var content = new StringHtmlContent("Hello World");
+
+            // Assert
+            using (var writer = new StringWriter())
+            {
+                content.WriteTo(writer, new HtmlTestEncoder());
+                Assert.Equal("HtmlEncode[[Hello World]]", writer.ToString());
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/TempDataDictionaryFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/TempDataDictionaryFactoryTest.cs
new file mode 100644
index 0000000000..1cd417ecf4
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/TempDataDictionaryFactoryTest.cs
@@ -0,0 +1,52 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class TempDataDictionaryFactoryTest
+    {
+        [Fact]
+        public void Factory_CreatesTempData_ForEachHttpContext()
+        {
+            // Arrange
+            var factory = CreateFactory();
+
+            var context1 = new DefaultHttpContext();
+            var context2 = new DefaultHttpContext();
+
+            var tempData1 = factory.GetTempData(context1);
+
+            // Act
+            var tempData2 = factory.GetTempData(context2);
+
+            // Assert
+            Assert.NotSame(tempData1, tempData2);
+        }
+
+        [Fact]
+        public void Factory_StoresTempData_InHttpContext()
+        {
+            // Arrange
+            var factory = CreateFactory();
+
+            var context = new DefaultHttpContext();
+
+            var tempData1 = factory.GetTempData(context);
+
+            // Act
+            var tempData2 = factory.GetTempData(context);
+
+            // Assert
+            Assert.Same(tempData1, tempData2);
+        }
+
+        private TempDataDictionaryFactory CreateFactory()
+        {
+            var provider = new SessionStateTempDataProvider();
+            return new TempDataDictionaryFactory(provider);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/TempDataDictionaryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/TempDataDictionaryTest.cs
new file mode 100644
index 0000000000..23ee996a27
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/TempDataDictionaryTest.cs
@@ -0,0 +1,238 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class TempDataDictionaryTest
+    {
+        [Fact]
+        public void ThrowscdException_OnSettingValue_AndWhenSessionIsNotEnabled()
+        {
+            // Arrange
+            var tempData = new TempDataDictionary(new DefaultHttpContext(), new SessionStateTempDataProvider());
+
+            // Act & Assert
+            Assert.Throws<InvalidOperationException>(() =>
+            {
+                tempData["key1"] = "value1";
+            });
+        }
+
+        [Fact]
+        public void Keep_DoesNotThrowException_WhenDataIsNotLoaded()
+        {
+            // Arrange
+            var tempData = new TempDataDictionary(new DefaultHttpContext(), new SessionStateTempDataProvider());
+
+            // Act & Assert
+            tempData.Keep();
+        }
+
+        [Fact]
+        public void TempData_Load_CreatesEmptyDictionaryIfProviderReturnsNull()
+        {
+            // Arrange
+            var tempData = new TempDataDictionary(new DefaultHttpContext(), new NullTempDataProvider());
+
+            // Act
+            tempData.Load();
+
+            // Assert
+            Assert.Empty(tempData);
+        }
+
+        [Fact]
+        public void TempData_Save_RemovesKeysThatWereRead()
+        {
+            // Arrange
+            var tempData = new TempDataDictionary(new DefaultHttpContext(), new NullTempDataProvider());
+            tempData["Foo"] = "Foo";
+            tempData["Bar"] = "Bar";
+
+            // Act
+            var value = tempData["Foo"];
+            tempData.Save();
+
+            // Assert
+            Assert.False(tempData.ContainsKey("Foo"));
+            Assert.True(tempData.ContainsKey("Bar"));
+        }
+
+        [Fact]
+        public void TempData_EnumeratingDictionary_MarksKeysForDeletion()
+        {
+            // Arrange
+            var tempData = new TempDataDictionary(new DefaultHttpContext(), new NullTempDataProvider());
+            tempData["Foo"] = "Foo";
+            tempData["Bar"] = "Bar";
+
+            // Act
+            var enumerator = tempData.GetEnumerator();
+            while (enumerator.MoveNext())
+            {
+                var value = enumerator.Current;
+            }
+            tempData.Save();
+
+            // Assert
+            Assert.False(tempData.ContainsKey("Foo"));
+            Assert.False(tempData.ContainsKey("Bar"));
+        }
+
+        [Fact]
+        public void TempData_TryGetValue_MarksKeyForDeletion()
+        {
+            var tempData = new TempDataDictionary(new DefaultHttpContext(), new NullTempDataProvider());
+            object value;
+            tempData["Foo"] = "Foo";
+
+            // Act
+            tempData.TryGetValue("Foo", out value);
+            tempData.Save();
+
+            // Assert
+            Assert.False(tempData.ContainsKey("Foo"));
+        }
+
+        [Fact]
+        public void TempData_Keep_RetainsAllKeysWhenSavingDictionary()
+        {
+            // Arrange
+            var tempData = new TempDataDictionary(new DefaultHttpContext(), new NullTempDataProvider());
+            tempData["Foo"] = "Foo";
+            tempData["Bar"] = "Bar";
+
+            // Act
+            tempData.Keep();
+            tempData.Save();
+
+            // Assert
+            Assert.True(tempData.ContainsKey("Foo"));
+            Assert.True(tempData.ContainsKey("Bar"));
+        }
+
+        [Fact]
+        public void TempData_Keep_RetainsSpecificKeysWhenSavingDictionary()
+        {
+            // Arrange
+            var tempData = new TempDataDictionary(new DefaultHttpContext(), new NullTempDataProvider());
+            tempData["Foo"] = "Foo";
+            tempData["Bar"] = "Bar";
+
+            // Act
+            var foo = tempData["Foo"];
+            var bar = tempData["Bar"];
+            tempData.Keep("Foo");
+            tempData.Save();
+
+            // Assert
+            Assert.True(tempData.ContainsKey("Foo"));
+            Assert.False(tempData.ContainsKey("Bar"));
+        }
+
+        [Fact]
+        public void TempData_Peek_DoesNotMarkKeyForDeletion()
+        {
+            // Arrange
+            var tempData = new TempDataDictionary(new DefaultHttpContext(), new NullTempDataProvider());
+            tempData["Bar"] = "barValue";
+
+            // Act
+            var value = tempData.Peek("bar");
+            tempData.Save();
+
+            // Assert
+            Assert.Equal("barValue", value);
+            Assert.True(tempData.ContainsKey("Bar"));
+        }
+
+        [Fact]
+        public void TempData_CompareIsOrdinalIgnoreCase()
+        {
+            // Arrange
+            var tempData = new TempDataDictionary(new DefaultHttpContext(), new NullTempDataProvider());
+            var item = new object();
+
+            // Act
+            tempData["Foo"] = item;
+            var value = tempData["FOO"];
+
+            // Assert
+            Assert.Same(item, value);
+        }
+
+        [Fact]
+        public void TempData_LoadAndSaveAreCaseInsensitive()
+        {
+            // Arrange
+            var data = new Dictionary<string, object>();
+            data["Foo"] = "Foo";
+            data["Bar"] = "Bar";
+            var provider = new TestTempDataProvider(data);
+            var tempData = new TempDataDictionary(new DefaultHttpContext(), provider);
+
+            // Act
+            tempData.Load();
+            var value = tempData["FOO"];
+            tempData.Save();
+
+            // Assert
+            Assert.False(tempData.ContainsKey("foo"));
+            Assert.True(tempData.ContainsKey("bar"));
+        }
+
+        [Fact]
+        public void TempData_RemovalOfKeysAreCaseInsensitive()
+        {
+            var tempData = new TempDataDictionary(new DefaultHttpContext(), new NullTempDataProvider());
+            object fooValue;
+            tempData["Foo"] = "Foo";
+            tempData["Bar"] = "Bar";
+
+            // Act
+            tempData.TryGetValue("foo", out fooValue);
+            var barValue = tempData["bar"];
+            tempData.Save();
+
+            // Assert
+            Assert.False(tempData.ContainsKey("Foo"));
+            Assert.False(tempData.ContainsKey("Boo"));
+        }
+
+        private class NullTempDataProvider : ITempDataProvider
+        {
+            public IDictionary<string, object> LoadTempData(HttpContext context)
+            {
+                return null;
+            }
+
+            public void SaveTempData(HttpContext context, IDictionary<string, object> values)
+            {
+            }
+        }
+
+        private class TestTempDataProvider : ITempDataProvider
+        {
+            private IDictionary<string, object> _data;
+
+            public TestTempDataProvider(IDictionary<string, object> data)
+            {
+                _data = data;
+            }
+
+            public IDictionary<string, object> LoadTempData(HttpContext context)
+            {
+                return _data;
+            }
+
+            public void SaveTempData(HttpContext context, IDictionary<string, object> values)
+            {
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataDictionaryOfTModelTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataDictionaryOfTModelTest.cs
new file mode 100644
index 0000000000..31f0d036d6
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataDictionaryOfTModelTest.cs
@@ -0,0 +1,437 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Internal;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewDataDictionaryOfTModelTest
+    {
+        [Fact]
+        public void Constructor_InitalizesMembers()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var modelState = new ModelStateDictionary();
+
+            // Act
+            var viewData = new ViewDataDictionary<string>(metadataProvider, modelState);
+
+            // Assert
+            Assert.Same(modelState, viewData.ModelState);
+            Assert.NotNull(viewData.TemplateInfo);
+            Assert.Null(viewData.Model);
+            Assert.NotNull(viewData.ModelMetadata);
+            Assert.Empty(viewData);
+        }
+
+        [Fact]
+        public void CopyConstructors_InitalizeModelAndModelMetadataBasedOnSource()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var model = new TestModel();
+            var source = new ViewDataDictionary<object>(metadataProvider)
+            {
+                Model = model
+            };
+            source["foo"] = "bar";
+            source.TemplateInfo.HtmlFieldPrefix = "prefix";
+
+            // Act
+            var viewData1 = new ViewDataDictionary<object>(source);
+            var viewData2 = new ViewDataDictionary(source);
+
+            // Assert
+            Assert.NotNull(viewData1.ModelState);
+            Assert.NotNull(viewData1.TemplateInfo);
+            Assert.Equal("prefix", viewData1.TemplateInfo.HtmlFieldPrefix);
+            Assert.NotSame(source.TemplateInfo, viewData1.TemplateInfo);
+            Assert.Same(model, viewData1.Model);
+            Assert.NotNull(viewData1.ModelMetadata);
+            Assert.Equal(typeof(TestModel), viewData1.ModelMetadata.ModelType);
+            Assert.Same(source.ModelMetadata, viewData1.ModelMetadata);
+            Assert.Equal(source.Count, viewData1.Count);
+            Assert.Equal("bar", viewData1["foo"]);
+            Assert.IsType<CopyOnWriteDictionary<string, object>>(viewData1.Data);
+
+            Assert.NotNull(viewData2.ModelState);
+            Assert.NotNull(viewData2.TemplateInfo);
+            Assert.Equal("prefix", viewData2.TemplateInfo.HtmlFieldPrefix);
+            Assert.NotSame(source.TemplateInfo, viewData2.TemplateInfo);
+            Assert.Same(model, viewData2.Model);
+            Assert.NotNull(viewData2.ModelMetadata);
+            Assert.Equal(typeof(TestModel), viewData2.ModelMetadata.ModelType);
+            Assert.Same(source.ModelMetadata, viewData2.ModelMetadata);
+            Assert.Equal(source.Count, viewData2.Count);
+            Assert.Equal("bar", viewData2["foo"]);
+            Assert.IsType<CopyOnWriteDictionary<string, object>>(viewData2.Data);
+        }
+
+        [Fact]
+        public void CopyConstructors_InitalizeModelAndModelMetadataBasedOnSource_NullModel()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var source = new ViewDataDictionary<TestModel>(metadataProvider);
+            source["foo"] = "bar";
+            source.TemplateInfo.HtmlFieldPrefix = "prefix";
+
+            // Act
+            var viewData1 = new ViewDataDictionary<TestModel>(source);
+            var viewData2 = new ViewDataDictionary(source);
+
+            // Assert
+            Assert.NotNull(viewData1.ModelState);
+            Assert.NotNull(viewData1.TemplateInfo);
+            Assert.Equal("prefix", viewData1.TemplateInfo.HtmlFieldPrefix);
+            Assert.NotSame(source.TemplateInfo, viewData1.TemplateInfo);
+            Assert.Null(viewData1.Model);
+            Assert.NotNull(viewData1.ModelMetadata);
+            Assert.Equal(typeof(TestModel), viewData1.ModelMetadata.ModelType);
+            Assert.Same(source.ModelMetadata, viewData1.ModelMetadata);
+            Assert.Equal(source.Count, viewData1.Count);
+            Assert.Equal("bar", viewData1["foo"]);
+            Assert.IsType<CopyOnWriteDictionary<string, object>>(viewData1.Data);
+
+            Assert.NotNull(viewData2.ModelState);
+            Assert.NotNull(viewData2.TemplateInfo);
+            Assert.Equal("prefix", viewData2.TemplateInfo.HtmlFieldPrefix);
+            Assert.NotSame(source.TemplateInfo, viewData2.TemplateInfo);
+            Assert.Null(viewData2.Model);
+            Assert.NotNull(viewData2.ModelMetadata);
+            Assert.Equal(typeof(TestModel), viewData2.ModelMetadata.ModelType);
+            Assert.Same(source.ModelMetadata, viewData2.ModelMetadata);
+            Assert.Equal(source.Count, viewData2.Count);
+            Assert.Equal("bar", viewData2["foo"]);
+            Assert.IsType<CopyOnWriteDictionary<string, object>>(viewData2.Data);
+        }
+
+        [Fact]
+        public void CopyConstructor_InitalizesModelAndModelMetadataBasedOnSource_ModelOfSubclass()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var model = new SupremeTestModel();
+            var source = new ViewDataDictionary(metadataProvider)
+            {
+                Model = model,
+            };
+
+            // Act
+            var viewData = new ViewDataDictionary(source);
+
+            // Assert
+            Assert.Same(model, viewData.Model);
+            Assert.NotNull(viewData.ModelMetadata);
+            Assert.Equal(typeof(SupremeTestModel), viewData.ModelMetadata.ModelType);
+            Assert.Same(source.ModelMetadata, viewData.ModelMetadata);
+        }
+
+        [Fact]
+        public void CopyConstructor_InitializesModelBasedOnSource_ModelMetadataBasedOnTModel()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var model = new SupremeTestModel();
+            var source = new ViewDataDictionary(metadataProvider)
+            {
+                Model = model,
+            };
+
+            // Act
+            var viewData = new ViewDataDictionary<TestModel>(source);
+
+            // Assert
+            Assert.Same(model, viewData.Model);
+            Assert.NotNull(viewData.ModelMetadata);
+            Assert.Equal(typeof(SupremeTestModel), viewData.ModelMetadata.ModelType);
+            Assert.Same(source.ModelMetadata, viewData.ModelMetadata);
+        }
+
+        [Fact]
+        public void CopyConstructor_DoesNotThrowOnNullModel_WithValueTypeTModel()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var source = new ViewDataDictionary(metadataProvider);
+            source["key1"] = "value1";
+            source.TemplateInfo.HtmlFieldPrefix = "prefix";
+
+            // Act
+            var viewData = new ViewDataDictionary<int>(source, model: null);
+
+            // Assert
+            Assert.NotNull(viewData.ModelState);
+            Assert.NotNull(viewData.TemplateInfo);
+            Assert.Equal("prefix", viewData.TemplateInfo.HtmlFieldPrefix);
+            Assert.NotSame(source.TemplateInfo, viewData.TemplateInfo);
+            Assert.Equal(0, viewData.Model);
+            Assert.NotNull(viewData.ModelMetadata);
+            Assert.Equal(typeof(int), viewData.ModelMetadata.ModelType);
+            Assert.NotSame(source.ModelMetadata, viewData.ModelMetadata);
+            Assert.Equal(source.Count, viewData.Count);
+            Assert.Equal("value1", viewData["key1"]);
+            Assert.IsType<CopyOnWriteDictionary<string, object>>(viewData.Data);
+        }
+
+        [Fact]
+        public void CopyConstructors_OverrideSourceMetadata_IfDeclaredTypeChanged()
+        {
+            // Arrange
+            var expectedType = typeof(string);
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var source = new ViewDataDictionary<int>(metadataProvider);
+
+            // Act
+            var viewData1 = new ViewDataDictionary<string>(source);
+            var viewData2 = new ViewDataDictionary<string>(source, model: null);
+
+            // Assert
+            Assert.NotNull(viewData1.ModelMetadata);
+            Assert.NotNull(viewData1.ModelExplorer);
+            Assert.Equal(expectedType, viewData1.ModelMetadata.ModelType);
+            Assert.Equal(expectedType, viewData1.ModelExplorer.ModelType);
+
+            Assert.NotNull(viewData2.ModelMetadata);
+            Assert.NotNull(viewData2.ModelExplorer);
+            Assert.Equal(expectedType, viewData2.ModelMetadata.ModelType);
+            Assert.Equal(expectedType, viewData2.ModelExplorer.ModelType);
+        }
+
+        [Fact]
+        public void CopyConstructors_ThrowInvalidOperation_IfModelIncompatibleWithDeclaredType()
+        {
+            // Arrange
+            var expectedMessage = "The model item passed into the ViewDataDictionary is of type 'System.Int32', " +
+                "but this ViewDataDictionary instance requires a model item of type 'System.String'.";
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var source = new ViewDataDictionary<int>(metadataProvider)
+            {
+                Model = 23,
+            };
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => new ViewDataDictionary<string>(source));
+            Assert.Equal(expectedMessage, exception.Message);
+
+            exception = Assert.Throws<InvalidOperationException>(() => new ViewDataDictionary<string>(source, model: 24));
+            Assert.Equal(expectedMessage, exception.Message);
+        }
+
+        public static TheoryData<object, Type> IncompatibleModelData
+        {
+            get
+            {
+                // Small "anything but TestModel" grab bag of instances and expected types.
+                return new TheoryData<object, Type>
+                {
+                    { true, typeof(bool) },
+                    { 23, typeof(int) },
+                    { 43.78, typeof(double) },
+                    { "test string", typeof(string) },
+                    { new List<int>(), typeof(List<int>) },
+                    { new List<string>(), typeof(List<string>) },
+                    { new List<TestModel>(), typeof(List<TestModel>) },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(IncompatibleModelData))]
+        public void CopyConstructorToObject_DoesNotThrow_IfModelIncompatibleWithDeclaredType(
+            object model,
+            Type expectedType)
+        {
+            // Arrange
+            var source = new ViewDataDictionary<TestModel>(new EmptyModelMetadataProvider());
+
+            // Act
+            var viewData = new ViewDataDictionary<object>(source, model);
+
+            // Assert
+            Assert.NotNull(viewData.ModelExplorer);
+            Assert.NotSame(source.ModelExplorer, viewData.ModelExplorer);
+            Assert.NotNull(viewData.ModelMetadata);
+            Assert.NotSame(source.ModelMetadata, viewData.ModelMetadata);
+            Assert.Equal(expectedType, viewData.ModelMetadata.ModelType);
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData(23)]
+        public void CopyConstructor_DoesNotChangeMetadata_WhenValueCompatibleWithSourceMetadata(int? model)
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var source = new ViewDataDictionary<int?>(metadataProvider)
+            {
+                Model = -48,
+            };
+
+            // Act
+            var viewData = new ViewDataDictionary<int?>(source, model);
+
+            // Assert
+            Assert.NotNull(viewData.ModelExplorer);
+            Assert.NotSame(source.ModelExplorer, viewData.ModelExplorer);
+            Assert.Same(source.ModelMetadata, viewData.ModelMetadata);
+            Assert.Equal(typeof(int?), viewData.ModelMetadata.ModelType);
+            Assert.Equal(viewData.Model, viewData.ModelExplorer.Model);
+            Assert.Equal(model, viewData.Model);
+        }
+
+        [Fact]
+        public void CopyConstructor_UpdatesMetadata_IfDeclaredTypeChangesIncompatibly()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var source = new ViewDataDictionary<string>(metadataProvider);
+
+            // Act
+            var viewData = new ViewDataDictionary<int?>(source);
+
+            // Assert
+            Assert.NotNull(viewData.ModelExplorer);
+            Assert.NotSame(source.ModelExplorer, viewData.ModelExplorer);
+            Assert.NotSame(source.ModelMetadata, viewData.ModelMetadata);
+            Assert.NotEqual(source.ModelMetadata.ModelType, viewData.ModelMetadata.ModelType);
+            Assert.Equal(typeof(int?), viewData.ModelMetadata.ModelType);
+        }
+
+        [Fact]
+        public void CopyConstructor_PreservesModelExplorer_WhenPassedIdenticalModel()
+        {
+            // Arrange
+            var model = new TestModel();
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var source = new ViewDataDictionary<TestModel>(metadataProvider)
+            {
+                Model = model,
+            };
+
+            // Act
+            var viewData = new ViewDataDictionary<TestModel>(source, model);
+
+            // Assert
+            Assert.NotNull(viewData.ModelExplorer);
+            Assert.Same(source.ModelExplorer, viewData.ModelExplorer);
+            Assert.Same(source.ModelMetadata, viewData.ModelMetadata);
+            Assert.Equal(typeof(TestModel), viewData.ModelMetadata.ModelType);
+            Assert.Equal(viewData.Model, viewData.ModelExplorer.Model);
+            Assert.Equal(model, viewData.Model);
+        }
+
+        [Fact]
+        public void ModelSetters_AcceptCompatibleValue()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var viewData1 = new ViewDataDictionary<int>(metadataProvider);
+            var viewData2 = new ViewDataDictionary<int>(viewData1);
+            var viewData3 = new ViewDataDictionary<int>(viewData2, model: null);
+            var viewData4 = new ViewDataDictionary(viewData3);
+
+            // Act
+            viewData1.Model = 23;
+            viewData2.Model = 24;
+            viewData3.Model = 25;
+            viewData4.Model = 26;
+
+            // Assert
+            Assert.Equal(23, viewData1.Model);
+            Assert.Equal(24, viewData2.Model);
+            Assert.Equal(25, viewData3.Model);
+            Assert.Equal(26, viewData4.Model);
+        }
+
+        [Fact]
+        public void ModelSetters_AcceptNullValue()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var viewData1 = new ViewDataDictionary<string>(metadataProvider);
+            var viewData2 = new ViewDataDictionary<string>(viewData1);
+            var viewData3 = new ViewDataDictionary<string>(viewData2, model: null);
+            var viewData4 = new ViewDataDictionary(viewData3);
+
+            // Act
+            viewData1.Model = null;
+            viewData2.Model = null;
+            viewData3.Model = null;
+            viewData4.Model = null;
+
+            // Assert
+            Assert.Null(viewData1.Model);
+            Assert.Null(viewData2.Model);
+            Assert.Null(viewData3.Model);
+            Assert.Null(viewData4.Model);
+        }
+
+        [Fact]
+        public void ModelSetters_ThrowInvalidOperation_IfModelIncompatibleWithDeclaredType()
+        {
+            // Arrange
+            var expectedMessage = "The model item passed into the ViewDataDictionary is of type 'System.Int32', " +
+                "but this ViewDataDictionary instance requires a model item of type 'System.String'.";
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var viewData1 = (ViewDataDictionary)new ViewDataDictionary<string>(metadataProvider);
+            var viewData2 = (ViewDataDictionary)new ViewDataDictionary<string>(viewData1);
+            var viewData3 = (ViewDataDictionary)new ViewDataDictionary<string>(viewData2, model: null);
+            var viewData4 = new ViewDataDictionary(viewData3);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => viewData1.Model = 23);
+            Assert.Equal(expectedMessage, exception.Message);
+
+            exception = Assert.Throws<InvalidOperationException>(() => viewData2.Model = 24);
+            Assert.Equal(expectedMessage, exception.Message);
+
+            exception = Assert.Throws<InvalidOperationException>(() => viewData3.Model = 25);
+            Assert.Equal(expectedMessage, exception.Message);
+
+            // Non-generic ViewDataDictionary maintains type restrictions of source with 1-parameter constructor.
+            exception = Assert.Throws<InvalidOperationException>(() => viewData4.Model = 26);
+            Assert.Equal(expectedMessage, exception.Message);
+        }
+
+        [Fact]
+        public void ModelSetters_ThrowInvalidOperation_IfModelNullAndTModelNonNullable()
+        {
+            // Arrange
+            var expectedMessage = "The model item passed is null, " +
+                "but this ViewDataDictionary instance requires a non-null model item of type 'System.Int32'.";
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var viewData1 = (ViewDataDictionary)new ViewDataDictionary<int>(metadataProvider);
+            var viewData2 = (ViewDataDictionary)new ViewDataDictionary<int>(viewData1);
+            var viewData3 = (ViewDataDictionary)new ViewDataDictionary<int>(viewData2, model: null);
+            var viewData4 = new ViewDataDictionary(viewData3);
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => viewData1.Model = null);
+            Assert.Equal(expectedMessage, exception.Message);
+
+            exception = Assert.Throws<InvalidOperationException>(() => viewData2.Model = null);
+            Assert.Equal(expectedMessage, exception.Message);
+
+            exception = Assert.Throws<InvalidOperationException>(() => viewData3.Model = null);
+            Assert.Equal(expectedMessage, exception.Message);
+
+            // Non-generic ViewDataDictionary maintains type restrictions of source with 1-parameter constructor.
+            exception = Assert.Throws<InvalidOperationException>(() => viewData4.Model = null);
+            Assert.Equal(expectedMessage, exception.Message);
+        }
+
+        private class TestModel
+        {
+        }
+
+        private class SupremeTestModel : TestModel
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataDictionaryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataDictionaryTest.cs
new file mode 100644
index 0000000000..cfcb4bf426
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataDictionaryTest.cs
@@ -0,0 +1,846 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Internal;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewDataDictionaryTest
+    {
+        [Fact]
+        public void ConstructorWithOneParameterInitalizesMembers()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+
+            // Act
+            var viewData = new ViewDataDictionary(metadataProvider);
+
+            // Assert
+            Assert.NotNull(viewData.ModelState);
+            Assert.NotNull(viewData.TemplateInfo);
+            Assert.Null(viewData.Model);
+            Assert.NotNull(viewData.ModelMetadata);
+            Assert.Empty(viewData);
+        }
+
+        [Fact]
+        public void ConstructorInitalizesMembers()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var modelState = new ModelStateDictionary();
+
+            // Act
+            var viewData = new ViewDataDictionary(metadataProvider, modelState);
+
+            // Assert
+            Assert.Same(modelState, viewData.ModelState);
+            Assert.NotNull(viewData.TemplateInfo);
+            Assert.Null(viewData.Model);
+            Assert.NotNull(viewData.ModelMetadata);
+            Assert.Empty(viewData);
+        }
+
+        [Fact]
+        public void Constructor_GetsNewModelMetadata()
+        {
+            // Arrange
+            var metadataProvider = new Mock<IModelMetadataProvider>(MockBehavior.Strict);
+            metadataProvider
+                .Setup(m => m.GetMetadataForType(typeof(object)))
+                .Returns(new EmptyModelMetadataProvider().GetMetadataForType(typeof(object)))
+                .Verifiable();
+            var modelState = new ModelStateDictionary();
+
+            // Act
+            var viewData = new ViewDataDictionary(metadataProvider.Object, modelState);
+
+            // Assert
+            Assert.NotNull(viewData.ModelMetadata);
+            metadataProvider.Verify(m => m.GetMetadataForType(typeof(object)), Times.Once());
+        }
+
+        [Fact]
+        public void SetModel_DoesNotGetNewModelMetadata_IfTypeCompatible()
+        {
+            // Arrange
+            var metadataProvider = new Mock<IModelMetadataProvider>(MockBehavior.Strict);
+            metadataProvider
+                .Setup(m => m.GetMetadataForType(typeof(TestModel)))
+                .Returns(new EmptyModelMetadataProvider().GetMetadataForType(typeof(TestModel)))
+                .Verifiable();
+            var viewData = new TestViewDataDictionary(metadataProvider.Object, typeof(TestModel));
+            var model = new TestModel();
+
+            // Act
+            viewData.SetModelPublic(model);
+
+            // Assert
+            Assert.NotNull(viewData.ModelMetadata);
+            metadataProvider.Verify(m => m.GetMetadataForType(typeof(TestModel)), Times.Once());
+        }
+
+        [Fact]
+        public void SetModel_GetsNewModelMetadata_IfSourceTypeIsObject()
+        {
+            // Arrange
+            var metadataProvider = new Mock<IModelMetadataProvider>(MockBehavior.Strict);
+            metadataProvider
+                .Setup(m => m.GetMetadataForType(typeof(object)))
+                .Returns(new EmptyModelMetadataProvider().GetMetadataForType(typeof(object)))
+                .Verifiable();
+            metadataProvider
+                .Setup(m => m.GetMetadataForType(typeof(TestModel)))
+                .Returns(new EmptyModelMetadataProvider().GetMetadataForType(typeof(TestModel)))
+                .Verifiable();
+            var viewData = new TestViewDataDictionary(metadataProvider.Object);
+            var model = new TestModel();
+
+            // Act
+            viewData.SetModelPublic(model);
+
+            // Assert
+            Assert.NotNull(viewData.ModelMetadata);
+
+            // For the constructor.
+            metadataProvider.Verify(m => m.GetMetadataForType(typeof(object)), Times.Once());
+
+            // For SetModel().
+            metadataProvider.Verify(m => m.GetMetadataForType(typeof(TestModel)), Times.Once());
+        }
+
+        public static TheoryData<object, Type> IncompatibleModelData
+        {
+            get
+            {
+                // Small "anything but TestModel" grab bag of instances and expected types.
+                return new TheoryData<object, Type>
+                {
+                    { true, typeof(bool) },
+                    { 23, typeof(int) },
+                    { 43.78, typeof(double) },
+                    { "test string", typeof(string) },
+                    { new List<int>(), typeof(List<int>) },
+                    { new List<string>(), typeof(List<string>) },
+                    { new List<TestModel>(), typeof(List<TestModel>) },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(IncompatibleModelData))]
+        public void SetModel_Throws_IfModelIncompatibleWithDeclaredType(object model, Type expectedType)
+        {
+            // Arrange
+            var viewData = new TestViewDataDictionary(new EmptyModelMetadataProvider(), typeof(TestModel));
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => viewData.SetModelPublic(model));
+            Assert.Equal(
+                $"The model item passed into the ViewDataDictionary is of type '{ model.GetType() }', but this " +
+                $"ViewDataDictionary instance requires a model item of type '{ typeof(TestModel) }'.",
+                exception.Message);
+        }
+
+        public static TheoryData<object> EnumerableModelData
+        {
+            get
+            {
+                var model = new List<TestModel>()
+                {
+                    new TestModel(),
+                    new TestModel()
+                };
+
+                return new TheoryData<object>
+                {
+                    { model.Select(t => t) },
+                    { model.Where(t => t != null) },
+                    { model.SelectMany(t => t.ToString()) },
+                    { model.Take(2) },
+                    { model.TakeWhile(t => t != null) },
+                    { model.Union(model) }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(EnumerableModelData))]
+        public void ModelSetter_DoesNotThrowOnEnumerableModel(object model)
+        {
+            // Arrange
+            var vdd = new ViewDataDictionary(new EmptyModelMetadataProvider());
+
+            // Act
+            vdd.Model = model;
+
+            // Assert
+            Assert.Same(model, vdd.Model);
+        }
+
+        [Fact]
+        public void CopyConstructorInitalizesModelAndModelMetadataBasedOnSource()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var model = new TestModel();
+            var source = new ViewDataDictionary(metadataProvider)
+            {
+                ModelExplorer = metadataProvider.GetModelExplorerForType(typeof(TestModel), model),
+            };
+            source["foo"] = "bar";
+            source.TemplateInfo.HtmlFieldPrefix = "prefix";
+
+            // Act
+            var viewData = new ViewDataDictionary(source);
+
+            // Assert
+            Assert.NotNull(viewData.ModelState);
+            Assert.NotNull(viewData.TemplateInfo);
+            Assert.Equal("prefix", viewData.TemplateInfo.HtmlFieldPrefix);
+            Assert.NotSame(source.TemplateInfo, viewData.TemplateInfo);
+            Assert.Same(model, viewData.Model);
+            Assert.NotNull(viewData.ModelMetadata);
+            Assert.Equal(typeof(TestModel), viewData.ModelMetadata.ModelType);
+            Assert.Same(source.ModelMetadata, viewData.ModelMetadata);
+            Assert.Equal(source.Count, viewData.Count);
+            Assert.Equal("bar", viewData["foo"]);
+            Assert.IsType<CopyOnWriteDictionary<string, object>>(viewData.Data);
+        }
+
+        public static TheoryData<Type, object> CopyModelMetadataData
+        {
+            get
+            {
+                // Instances in this data set must have exactly the same type as the corresponding Type or be null.
+                // Otherwise the copy constructor ignores the source ModelMetadata.
+                return new TheoryData<Type, object>
+                {
+                    { typeof(int), 23 },
+                    { typeof(ulong?), 24ul },
+                    { typeof(ushort?), null },
+                    { typeof(string), "hello" },
+                    { typeof(string), null },
+                    { typeof(List<string>), new List<string>() },
+                    { typeof(string[]), new string[0] },
+                    { typeof(Dictionary<string, object>), new Dictionary<string, object>() },
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(CopyModelMetadataData))]
+        public void CopyConstructor_CopiesModelMetadata(Type type, object instance)
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var source = new ViewDataDictionary(metadataProvider)
+            {
+                Model = instance,
+            };
+
+            // Act
+            var viewData = new ViewDataDictionary(source);
+
+            // Assert
+            Assert.Same(source.ModelMetadata, viewData.ModelMetadata);
+        }
+
+        [Fact]
+        public void CopyConstructor_CopiesModelMetadata_ForTypeObject()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var source = new ViewDataDictionary(metadataProvider);
+
+            // Act
+            var viewData = new ViewDataDictionary(source);
+
+            // Assert
+            Assert.Same(source.ModelMetadata, viewData.ModelMetadata);
+            Assert.Equal(typeof(object), viewData.ModelMetadata.ModelType);
+        }
+
+        [Theory]
+        [InlineData(typeof(int), "test string", typeof(string))]
+        [InlineData(typeof(string), 23, typeof(int))]
+        [InlineData(typeof(IEnumerable<string>), new object[] { "1", "2", "3" }, typeof(object[]))]
+        [InlineData(typeof(List<string>), new object[] { 1, 2, 3 }, typeof(object[]))]
+        public void ModelSetter_UpdatesModelMetadata_IfModelIncompatibleWithSourceMetadata(
+            Type sourceType,
+            object model,
+            Type expectedType)
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var source = new ViewDataDictionary(metadataProvider)
+            {
+                ModelExplorer = metadataProvider.GetModelExplorerForType(sourceType, model: null),
+            };
+            var sourceMetadata = source.ModelMetadata;
+            var viewData = new ViewDataDictionary(source);
+
+            // Act
+            viewData.Model = model;
+
+            // Assert
+            Assert.NotSame(source.ModelExplorer, viewData.ModelExplorer);
+            Assert.NotSame(source.ModelMetadata, viewData.ModelMetadata);
+            Assert.Equal(expectedType, viewData.ModelMetadata.ModelType);
+        }
+
+        [Theory]
+        [InlineData(typeof(int), 23)]
+        [InlineData(typeof(string), "test string")]
+        [InlineData(typeof(IEnumerable<string>), new string[] { "1", "2", "3" })]
+        public void ModelSetter_PreservesSourceMetadata_IfModelCompatible(Type sourceType, object model)
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var source = new ViewDataDictionary(metadataProvider)
+            {
+                ModelExplorer = metadataProvider.GetModelExplorerForType(sourceType, model: null),
+            };
+            var viewData = new ViewDataDictionary(source);
+
+            // Act
+            viewData.Model = model;
+
+            // Assert
+            Assert.NotSame(source.ModelExplorer, viewData.ModelExplorer);
+            Assert.Same(source.ModelMetadata, viewData.ModelMetadata);
+        }
+
+        [Fact]
+        public void ModelSetter_SameType_UpdatesModelExplorer()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var viewData = new ViewDataDictionary(metadataProvider)
+            {
+                Model = 3,
+            };
+
+            var originalMetadata = viewData.ModelMetadata;
+            var originalExplorer = viewData.ModelExplorer;
+
+            // Act
+            viewData.Model = 5;
+
+            // Assert
+            Assert.NotNull(viewData.ModelMetadata);
+            Assert.NotNull(viewData.ModelExplorer);
+            Assert.Equal(5, viewData.Model);
+            Assert.Equal(5, viewData.ModelExplorer.Model);
+            Assert.Same(originalMetadata, viewData.ModelMetadata);
+            Assert.NotSame(originalExplorer, viewData.ModelExplorer);
+        }
+
+        [Theory]
+        [InlineData(typeof(object))]
+        [InlineData(typeof(string))]
+        public void ModelSetter_DifferentType_UpdatesModelMetadata(Type originalMetadataType)
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var metadata = metadataProvider.GetMetadataForType(originalMetadataType);
+            var explorer = new ModelExplorer(metadataProvider, metadata, model: null);
+            var viewData = new TestViewDataDictionary(metadataProvider)
+            {
+                ModelExplorer = explorer,
+            };
+
+            // Act
+            viewData.Model = true;
+
+            // Assert
+            Assert.NotNull(viewData.ModelExplorer);
+            Assert.NotNull(viewData.ModelMetadata);
+            Assert.NotSame(explorer, viewData.ModelExplorer);
+            Assert.Equal(typeof(bool), viewData.ModelMetadata.ModelType);
+
+            var model = Assert.IsType<bool>(viewData.Model);
+            Assert.True(model);
+        }
+
+        [Fact]
+        public void ModelSetter_SetNullableNonNull_UpdatesModelExplorer()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var metadata = metadataProvider.GetMetadataForType(typeof(bool?));
+            var explorer = new ModelExplorer(metadataProvider, metadata, model: null);
+            var viewData = new ViewDataDictionary(metadataProvider)
+            {
+                ModelExplorer = explorer,
+            };
+
+            // Act
+            viewData.Model = true;
+
+            // Assert
+            Assert.NotNull(viewData.ModelMetadata);
+            Assert.NotNull(viewData.ModelExplorer);
+            Assert.Same(metadata, viewData.ModelMetadata);
+            Assert.NotSame(explorer, viewData.ModelExplorer);
+            Assert.Equal(viewData.Model, viewData.ModelExplorer.Model);
+
+            var model = Assert.IsType<bool>(viewData.Model);
+            Assert.True(model);
+        }
+
+        [Fact]
+        public void ModelSetter_SetNonNullableToNull_Throws()
+        {
+            // Arrange
+            var viewData = new TestViewDataDictionary(new EmptyModelMetadataProvider(), typeof(int));
+
+            // Act & Assert
+            var exception = Assert.Throws<InvalidOperationException>(() => viewData.SetModelPublic(value: null));
+            Assert.Equal(
+                "The model item passed is null, but this ViewDataDictionary instance requires a non-null model item " +
+                $"of type '{ typeof(int) }'.",
+                exception.Message);
+        }
+
+        [Fact]
+        public void ModelSetter_SameType_BoxedValueTypeUpdatesModelExplorer()
+        {
+            // Arrange
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var viewData = new ViewDataDictionary(metadataProvider)
+            {
+                Model = 3,
+            };
+
+            var originalMetadata = viewData.ModelMetadata;
+            var originalExplorer = viewData.ModelExplorer;
+
+            // Act
+            viewData.Model = 3; // This is the same value, but it's in a different box.
+
+            // Assert
+            Assert.NotNull(viewData.ModelMetadata);
+            Assert.NotNull(viewData.ModelExplorer);
+            Assert.Equal(3, viewData.Model);
+            Assert.Equal(3, viewData.ModelExplorer.Model);
+            Assert.Same(originalMetadata, viewData.ModelMetadata);
+            Assert.NotSame(originalExplorer, viewData.ModelExplorer);
+        }
+
+        [Fact]
+        public void ModelSetter_SameModel_NoChanges()
+        {
+            // Arrange
+            var model = "Hello";
+
+            var metadataProvider = new EmptyModelMetadataProvider();
+            var viewData = new ViewDataDictionary(metadataProvider)
+            {
+                Model = model,
+            };
+
+            var originalMetadata = viewData.ModelMetadata;
+            var originalExplorer = viewData.ModelExplorer;
+
+            // Act
+            viewData.Model = model;
+
+            // Assert
+            Assert.NotNull(viewData.ModelMetadata);
+            Assert.Equal("Hello", viewData.Model);
+            Assert.Same(originalMetadata, viewData.ModelMetadata);
+            Assert.Same(originalExplorer, viewData.ModelExplorer);
+        }
+
+        public static TheoryData<object, string, object> Eval_EvaluatesExpressionsData
+        {
+            get
+            {
+                return new TheoryData<object, string, object>
+                {
+                    {
+                        new { Foo = "Bar" },
+                        "Foo",
+                        "Bar"
+                    },
+                    {
+                        new { Foo = new Dictionary<string, object> { { "Bar", "Baz" } } },
+                        "Foo.Bar",
+                        "Baz"
+                    },
+                    {
+                        new { Foo = new { Bar = "Baz" } },
+                        "Foo.Bar",
+                        "Baz"
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(Eval_EvaluatesExpressionsData))]
+        public void Eval_EvaluatesExpressions(object model, string expression, object expected)
+        {
+            // Arrange
+            var viewData = GetViewDataDictionary(model);
+
+            // Act
+            var result = viewData.Eval(expression);
+
+            // Assert
+            Assert.Equal(expected, result);
+        }
+
+        [Fact]
+        public void EvalReturnsNullIfExpressionDoesNotMatch()
+        {
+            // Arrange
+            var model = new { Foo = new { Biz = "Baz" } };
+            var viewData = GetViewDataDictionary(model);
+
+            // Act
+            var result = viewData.Eval("Foo.Bar");
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void EvalEvaluatesDictionaryThenModel()
+        {
+            // Arrange
+            var model = new { Foo = "NotBar" };
+            var viewData = GetViewDataDictionary(model);
+            viewData.Add("Foo", "Bar");
+
+            // Act
+            var result = viewData.Eval("Foo");
+
+            // Assert
+            Assert.Equal("Bar", result);
+        }
+
+        [Fact]
+        public void EvalReturnsValueJustAdded()
+        {
+            // Arrange
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+            viewData.Add("Foo", "Blah");
+
+            // Act
+            var result = viewData.Eval("Foo");
+
+            // Assert
+            Assert.Equal("Blah", result);
+        }
+
+        [Fact]
+        public void EvalWithCompoundExpressionReturnsIndexedValue()
+        {
+            // Arrange
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+            viewData.Add("Foo.Bar", "Baz");
+
+            // Act
+            var result = viewData.Eval("Foo.Bar");
+
+            // Assert
+            Assert.Equal("Baz", result);
+        }
+
+        [Fact]
+        public void EvalWithCompoundExpressionReturnsPropertyOfAddedObject()
+        {
+            // Arrange
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+            viewData.Add("Foo", new { Bar = "Baz" });
+
+            // Act
+            var result = viewData.Eval("Foo.Bar");
+
+            // Assert
+            Assert.Equal("Baz", result);
+        }
+
+        [Fact]
+        public void EvalWithCompoundIndexExpressionReturnsEval()
+        {
+            // Arrange
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+            viewData.Add("Foo.Bar", new { Baz = "Quux" });
+
+            // Act
+            var result = viewData.Eval("Foo.Bar.Baz");
+
+            // Assert
+            Assert.Equal("Quux", result);
+        }
+
+        [Fact]
+        public void EvalWithCompoundIndexAndCompoundExpressionReturnsValue()
+        {
+            // Arrange
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+            viewData.Add("Foo.Bar", new { Baz = new { Blah = "Quux" } });
+
+            // Act
+            var result = viewData.Eval("Foo.Bar.Baz.Blah");
+
+            // Assert
+            Assert.Equal("Quux", result);
+        }
+
+        // Make sure that dict["foo.bar"] gets chosen before dict["foo"]["bar"]
+        [Fact]
+        public void EvalChoosesValueInDictionaryOverOtherValue()
+        {
+            // Arrange
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider())
+            {
+                {  "Foo", new { Bar = "Not Baz" } },
+                { "Foo.Bar", "Baz" }
+            };
+
+            // Act
+            var result = viewData.Eval("Foo.Bar");
+
+            // Assert
+            Assert.Equal("Baz", result);
+        }
+
+        // Make sure that dict["foo.bar"]["baz"] gets chosen before dict["foo"]["bar"]["baz"]
+        [Fact]
+        public void EvalChoosesCompoundValueInDictionaryOverOtherValues()
+        {
+            // Arrange
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider())
+            {
+                { "Foo", new { Bar = new { Baz = "Not Quux" } } },
+                { "Foo.Bar", new { Baz = "Quux" } }
+            };
+
+            // Act
+            var result = viewData.Eval("Foo.Bar.Baz");
+
+            // Assert
+            Assert.Equal("Quux", result);
+        }
+
+        // Make sure that dict["foo.bar"]["baz"] gets chosen before dict["foo"]["bar.baz"]
+        [Fact]
+        public void EvalChoosesCompoundValueInDictionaryOverOtherValuesWithCompoundProperty()
+        {
+            // Arrange
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider())
+            {
+                { "Foo", new Person() },
+                { "Foo.Bar", new { Baz = "Quux" } }
+            };
+
+            // Act
+            var result = viewData.Eval("Foo.Bar.Baz");
+
+            // Assert
+            Assert.Equal("Quux", result);
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void Eval_ReturnsModel_IfExpressionIsNullOrEmpty(string expression)
+        {
+            // Arrange
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+            var model = new object();
+            viewData.Model = model;
+
+            // Act
+            var result = viewData.Eval(expression);
+
+            // Assert
+            Assert.Same(model, result);
+        }
+
+        [Fact]
+        public void EvalWithCompoundExpressionAndDictionarySubExpressionChoosesDictionaryValue()
+        {
+            // Arrange
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+            viewData.Add("Foo", new Dictionary<string, object> { { "Bar", "Baz" } });
+
+            // Act
+            var result = viewData.Eval("Foo.Bar");
+
+            // Assert
+            Assert.Equal("Baz", result);
+        }
+
+        [Fact]
+        public void EvalWithDictionaryAndNoMatchReturnsNull()
+        {
+            // Arrange
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+            viewData.Add("Foo", new Dictionary<string, object> { { "NotBar", "Baz" } });
+
+            // Act
+            var result = viewData.Eval("Foo.Bar");
+
+            // Assert
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void EvalWithNestedDictionariesEvalCorrectly()
+        {
+            // Arrange
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+            var value = new Dictionary<string, object>
+            {
+                ["Bar"] = new Dictionary<string, string>
+                {
+                    { "Baz", "Quux" }
+                }
+            };
+            viewData.Add("Foo", value);
+
+            // Act
+            var result = viewData.Eval("Foo.Bar.Baz");
+
+            // Assert
+            Assert.Equal("Quux", result);
+        }
+
+        [Fact]
+        public void EvalFormatWithNullValueReturnsEmptyString()
+        {
+            // Arrange
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+
+            // Act
+            var formattedValue = viewData.Eval("foo", "for{0}mat");
+
+            // Assert
+            Assert.Empty(formattedValue);
+        }
+
+        [Fact]
+        public void EvalFormatWithEmptyFormatReturnsViewData()
+        {
+            // Arrange
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+            viewData["foo"] = "value";
+
+            // Act
+            var formattedValue = viewData.Eval("foo", string.Empty);
+
+            // Assert
+            Assert.Equal("value", formattedValue);
+        }
+
+        [Fact]
+        public void EvalFormatWithFormatReturnsFormattedViewData()
+        {
+            // Arrange
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+            viewData["foo"] = "value";
+
+            // Act
+            var formattedValue = viewData.Eval("foo", "for{0}mat");
+
+            // Assert
+            Assert.Equal("forvaluemat", formattedValue);
+        }
+
+        [Fact]
+        public void EvalPropertyNamedModel()
+        {
+            // Arrange
+            var model = new TheQueryStringParam
+            {
+                Name = "The Name",
+                Value = "The Value",
+                Model = "The Model",
+            };
+            var viewData = GetViewDataDictionary(model);
+            viewData["Title"] = "Home Page";
+            viewData["Message"] = "Welcome to ASP.NET MVC!";
+
+            // Act
+            var result = viewData.Eval("Model");
+
+            // Assert
+            Assert.Equal("The Model", result);
+        }
+
+        [Fact]
+        public void EvalSubPropertyNamedValueInModel()
+        {
+            // Arrange
+            var model = new TheQueryStringParam
+            {
+                Name = "The Name",
+                Value = "The Value",
+                Model = "The Model",
+            };
+            var viewData = GetViewDataDictionary(model);
+            viewData["Title"] = "Home Page";
+            viewData["Message"] = "Welcome to ASP.NET MVC!";
+
+            // Act
+            var result = viewData.Eval("Value");
+
+            // Assert
+            Assert.Equal("The Value", result);
+        }
+
+        private static ViewDataDictionary GetViewDataDictionary(object model)
+        {
+            return new ViewDataDictionary(new EmptyModelMetadataProvider())
+            {
+                Model = model
+            };
+        }
+
+        private class TestModel
+        {
+        }
+
+        private class Person
+        {
+            public string Name { get; set; }
+        }
+
+        private class TestViewDataDictionary : ViewDataDictionary
+        {
+            public TestViewDataDictionary(IModelMetadataProvider metadataProvider)
+                : base(metadataProvider)
+            {
+            }
+
+            public TestViewDataDictionary(IModelMetadataProvider metadataProvider, Type declaredModelType)
+                : base(metadataProvider, declaredModelType)
+            {
+            }
+
+            public void SetModelPublic(object value)
+            {
+                SetModel(value);
+            }
+        }
+
+        private class TheQueryStringParam
+        {
+            public string Name { get; set; }
+            public string Value { get; set; }
+            public string Model { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataOfTTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataOfTTest.cs
new file mode 100644
index 0000000000..3e3dbaf198
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataOfTTest.cs
@@ -0,0 +1,93 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewDataOfTTest
+    {
+        [Fact]
+        public void SettingModelThrowsIfTheModelIsNull()
+        {
+            // Arrange
+            var viewDataOfT = new ViewDataDictionary<int>(new EmptyModelMetadataProvider());
+            ViewDataDictionary viewData = viewDataOfT;
+
+            // Act and Assert
+            Exception ex = Assert.Throws<InvalidOperationException>(() => viewData.Model = null);
+            Assert.Equal("The model item passed is null, but this ViewDataDictionary instance requires a non-null model item of type 'System.Int32'.", ex.Message);
+        }
+
+        [Fact]
+        public void SettingModelThrowsIfTheModelIsIncompatible()
+        {
+            // Arrange
+            var viewDataOfT = new ViewDataDictionary<string>(new EmptyModelMetadataProvider());
+            ViewDataDictionary viewData = viewDataOfT;
+
+            // Act and Assert
+            Exception ex = Assert.Throws<InvalidOperationException>(() => viewData.Model = DateTime.UtcNow);
+            Assert.Equal("The model item passed into the ViewDataDictionary is of type 'System.DateTime', but this ViewDataDictionary instance requires a model item of type 'System.String'.", ex.Message);
+        }
+
+        [Fact]
+        public void SettingModelWorksForCompatibleTypes()
+        {
+            // Arrange
+            var value = "some value";
+            var viewDataOfT = new ViewDataDictionary<object>(new EmptyModelMetadataProvider());
+            ViewDataDictionary viewData = viewDataOfT;
+
+            // Act
+            viewData.Model = value;
+
+            // Assert
+            Assert.Same(value, viewDataOfT.Model);
+        }
+
+        [Fact]
+        public void PropertiesInitializedCorrectly()
+        {
+            // Arrange
+            var viewData = new ViewDataDictionary<string>(new EmptyModelMetadataProvider());
+
+            // Act & Assert
+            Assert.Empty(viewData);
+            Assert.Empty(viewData);
+            Assert.False(viewData.IsReadOnly);
+
+            Assert.NotNull(viewData.Keys);
+            Assert.Empty(viewData.Keys);
+
+            Assert.Null(viewData.Model);
+            Assert.NotNull(viewData.ModelMetadata);
+            Assert.NotNull(viewData.ModelState);
+
+            Assert.NotNull(viewData.TemplateInfo);
+            Assert.Equal(0, viewData.TemplateInfo.TemplateDepth);
+            Assert.Equal(string.Empty, viewData.TemplateInfo.FormattedModelValue);
+            Assert.Equal(string.Empty, viewData.TemplateInfo.HtmlFieldPrefix);
+
+            Assert.NotNull(viewData.Values);
+            Assert.Empty(viewData.Values);
+        }
+
+        [Fact]
+        public void TemplateInfoPropertiesAreNeverNull()
+        {
+            // Arrange
+            var viewData = new ViewDataDictionary<string>(new EmptyModelMetadataProvider());
+
+            // Act
+            viewData.TemplateInfo.FormattedModelValue = null;
+            viewData.TemplateInfo.HtmlFieldPrefix = null;
+
+            // Assert
+            Assert.Equal(string.Empty, viewData.TemplateInfo.FormattedModelValue);
+            Assert.Equal(string.Empty, viewData.TemplateInfo.HtmlFieldPrefix);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewExecutorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewExecutorTest.cs
new file mode 100644
index 0000000000..12be821f84
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewExecutorTest.cs
@@ -0,0 +1,372 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.TestCommon;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Microsoft.Net.Http.Headers;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewExecutorTest
+    {
+        public static TheoryData<MediaTypeHeaderValue, string, string> ViewExecutorSetsContentTypeAndEncodingData
+        {
+            get
+            {
+                return new TheoryData<MediaTypeHeaderValue, string, string>
+                {
+                    {
+                        null,
+                        null,
+                        "text/html; charset=utf-8"
+                    },
+                    {
+                        new MediaTypeHeaderValue("text/foo"),
+                        null,
+                        "text/foo"
+                    },
+                    {
+                        MediaTypeHeaderValue.Parse("text/foo; charset=us-ascii"),
+                        null,
+                        "text/foo; charset=us-ascii"
+                    },
+                    {
+                        MediaTypeHeaderValue.Parse("text/foo; p1=p1-value"),
+                        null,
+                        "text/foo; p1=p1-value"
+                    },
+                    {
+                        MediaTypeHeaderValue.Parse("text/foo; p1=p1-value; charset=us-ascii"),
+                        null,
+                        "text/foo; p1=p1-value; charset=us-ascii"
+                    },
+                    {
+                        null,
+                        "text/bar",
+                        "text/bar"
+                    },
+                    {
+                        null,
+                        "text/bar; p1=p1-value",
+                        "text/bar; p1=p1-value"
+                    },
+                                        {
+                        null,
+                        "text/bar; p1=p1-value; charset=us-ascii",
+                        "text/bar; p1=p1-value; charset=us-ascii"
+                    },
+                    {
+                        MediaTypeHeaderValue.Parse("text/foo; charset=us-ascii"),
+                        "text/bar",
+                        "text/foo; charset=us-ascii"
+                    },
+                    {
+                        MediaTypeHeaderValue.Parse("text/foo; charset=us-ascii"),
+                        "text/bar; charset=utf-8",
+                        "text/foo; charset=us-ascii"
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ViewExecutorSetsContentTypeAndEncodingData))]
+        public async Task ExecuteAsync_SetsContentTypeAndEncoding(
+            MediaTypeHeaderValue contentType,
+            string responseContentType,
+            string expectedContentType)
+        {
+            // Arrange
+            var view = CreateView(async (v) =>
+            {
+                await v.Writer.WriteAsync("abcd");
+            });
+
+            var context = new DefaultHttpContext();
+            var memoryStream = new MemoryStream();
+            context.Response.Body = memoryStream;
+            context.Response.ContentType = responseContentType;
+
+            var actionContext = new ActionContext(
+                context,
+                new RouteData(),
+                new ActionDescriptor());
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+
+            var viewExecutor = CreateViewExecutor();
+
+            // Act
+            await viewExecutor.ExecuteAsync(
+                actionContext,
+                view,
+                viewData,
+                Mock.Of<ITempDataDictionary>(),
+                contentType?.ToString(),
+                statusCode: null);
+
+            // Assert
+            MediaTypeAssert.Equal(expectedContentType, context.Response.ContentType);
+            Assert.Equal("abcd", Encoding.UTF8.GetString(memoryStream.ToArray()));
+        }
+
+        private static IServiceProvider GetServiceProvider()
+        {
+            var httpContext = new DefaultHttpContext();
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddSingleton<IModelMetadataProvider>(new EmptyModelMetadataProvider());
+            var tempDataProvider = new SessionStateTempDataProvider();
+            serviceCollection.AddSingleton<ITempDataDictionary>(new TempDataDictionary(httpContext, tempDataProvider));
+
+            return serviceCollection.BuildServiceProvider();
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_ViewResultAllowNull()
+        {
+            // Arrange
+            var tempDataNull = false;
+            var viewDataNull = false;
+            var deligateHit = false;
+
+            var view = CreateView(async (v) =>
+            {
+                deligateHit = true;
+                tempDataNull = v.TempData == null;
+                viewDataNull = v.ViewData == null;
+
+                await v.Writer.WriteAsync("abcd");
+            });
+            var context = new DefaultHttpContext();
+
+            var memoryStream = new MemoryStream();
+            context.Response.Body = memoryStream;
+
+            var actionContext = new ActionContext(
+                context,
+                new RouteData(),
+                new ActionDescriptor());
+
+            context.RequestServices = GetServiceProvider();
+            var viewExecutor = CreateViewExecutor();
+
+            // Act
+            await viewExecutor.ExecuteAsync(
+                actionContext,
+                view,
+                null,
+                null,
+                contentType: null,
+                statusCode: 200);
+
+            // Assert
+            Assert.Equal(200, context.Response.StatusCode);
+            Assert.True(deligateHit);
+            Assert.False(viewDataNull);
+            Assert.False(tempDataNull);
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_SetsStatusCode()
+        {
+            // Arrange
+            var view = CreateView(async (v) =>
+            {
+                await v.Writer.WriteAsync("abcd");
+            });
+
+            var context = new DefaultHttpContext();
+            var memoryStream = new MemoryStream();
+            context.Response.Body = memoryStream;
+
+            var actionContext = new ActionContext(
+                context,
+                new RouteData(),
+                new ActionDescriptor());
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+
+            var viewExecutor = CreateViewExecutor();
+
+            // Act
+            await viewExecutor.ExecuteAsync(
+                actionContext,
+                view,
+                viewData,
+                Mock.Of<ITempDataDictionary>(),
+                contentType: null,
+                statusCode: 500);
+
+            // Assert
+            Assert.Equal(500, context.Response.StatusCode);
+            Assert.Equal("abcd", Encoding.UTF8.GetString(memoryStream.ToArray()));
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_WritesDiagnostic()
+        {
+            // Arrange
+            var view = CreateView(async (v) =>
+            {
+                await v.Writer.WriteAsync("abcd");
+            });
+
+            var context = new DefaultHttpContext();
+            var memoryStream = new MemoryStream();
+            context.Response.Body = memoryStream;
+
+            var actionContext = new ActionContext(
+                context,
+                new RouteData(),
+                new ActionDescriptor());
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+
+            var adapter = new TestDiagnosticListener();
+
+            var diagnosticSource = new DiagnosticListener("Test");
+            diagnosticSource.SubscribeWithAdapter(adapter);
+
+            var viewExecutor = CreateViewExecutor(diagnosticSource);
+
+            // Act
+            await viewExecutor.ExecuteAsync(
+                actionContext,
+                view,
+                viewData,
+                Mock.Of<ITempDataDictionary>(),
+                contentType: null,
+                statusCode: null);
+
+            // Assert
+            Assert.Equal("abcd", Encoding.UTF8.GetString(memoryStream.ToArray()));
+
+            Assert.NotNull(adapter.BeforeView?.View);
+            Assert.NotNull(adapter.BeforeView?.ViewContext);
+            Assert.NotNull(adapter.AfterView?.View);
+            Assert.NotNull(adapter.AfterView?.ViewContext);
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_DoesNotWriteToResponse_OnceExceptionIsThrown()
+        {
+            // Arrange
+            var expectedLength = 0;
+
+            var view = new Mock<IView>();
+            view.Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                 .Callback((ViewContext v) =>
+                 {
+                     throw new Exception();
+                 });
+
+            var context = new DefaultHttpContext();
+            var memoryStream = new MemoryStream();
+            context.Response.Body = memoryStream;
+
+            var actionContext = new ActionContext(
+                context,
+                new RouteData(),
+                new ActionDescriptor());
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+
+            var viewExecutor = CreateViewExecutor();
+
+            // Act
+            await Record.ExceptionAsync(() => viewExecutor.ExecuteAsync(
+                actionContext,
+                view.Object,
+                viewData,
+                Mock.Of<ITempDataDictionary>(),
+                contentType: null,
+                statusCode: null));
+
+            // Assert
+            Assert.Equal(expectedLength, memoryStream.Length);
+        }
+
+        [Theory]
+        [InlineData(TestHttpResponseStreamWriterFactory.DefaultBufferSize - 1)]
+        [InlineData(TestHttpResponseStreamWriterFactory.DefaultBufferSize + 1)]
+        [InlineData(2 * TestHttpResponseStreamWriterFactory.DefaultBufferSize + 4)]
+        public async Task ExecuteAsync_AsynchronouslyFlushesToTheResponseStream_PriorToDispose(int writeLength)
+        {
+            // Arrange
+            var view = CreateView(async (v) =>
+            {
+                var text = new string('a', writeLength);
+                await v.Writer.WriteAsync(text);
+            });
+
+            var expectedWriteCallCount = Math.Ceiling((double)writeLength / TestHttpResponseStreamWriterFactory.DefaultBufferSize);
+
+            var context = new DefaultHttpContext();
+            var stream = new Mock<Stream>();
+            stream.SetupGet(s => s.CanWrite).Returns(true);
+            context.Response.Body = stream.Object;
+
+            var actionContext = new ActionContext(
+                context,
+                new RouteData(),
+                new ActionDescriptor());
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+
+            var viewExecutor = CreateViewExecutor();
+
+            // Act
+            await viewExecutor.ExecuteAsync(
+                actionContext,
+                view,
+                viewData,
+                Mock.Of<ITempDataDictionary>(),
+                contentType: null,
+                statusCode: null);
+
+            // Assert
+            stream.Verify(s => s.FlushAsync(It.IsAny<CancellationToken>()), Times.Never());
+            stream.Verify(
+                s => s.WriteAsync(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<CancellationToken>()),
+                Times.Exactly((int)expectedWriteCallCount));
+            stream.Verify(s => s.Write(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>()), Times.Never());
+        }
+
+        private IView CreateView(Func<ViewContext, Task> action)
+        {
+            var view = new Mock<IView>(MockBehavior.Strict);
+            view
+                .Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Returns(action);
+
+            return view.Object;
+        }
+
+        private ViewExecutor CreateViewExecutor(DiagnosticListener diagnosticSource = null)
+        {
+            if (diagnosticSource == null)
+            {
+                diagnosticSource = new DiagnosticListener("Test");
+            }
+
+            return new ViewExecutor(
+                Options.Create(new MvcViewOptions()),
+                new TestHttpResponseStreamWriterFactory(),
+                new Mock<ICompositeViewEngine>(MockBehavior.Strict).Object,
+                new TempDataDictionaryFactory(new SessionStateTempDataProvider()),
+                diagnosticSource,
+                new EmptyModelMetadataProvider());
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewResultExecutorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewResultExecutorTest.cs
new file mode 100644
index 0000000000..415a45700b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewResultExecutorTest.cs
@@ -0,0 +1,341 @@
+// 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.
+
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Microsoft.Net.Http.Headers;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    public class ViewResultExecutorTest
+    {
+        [Fact]
+        public void FindView_UsesViewEngine_FromViewResult()
+        {
+            // Arrange
+            var context = GetActionContext();
+            var executor = GetViewExecutor();
+
+            var viewName = "my-view";
+            var viewEngine = new Mock<ICompositeViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(e => e.GetView(/*executingFilePath*/ null, viewName, /*isMainPage*/ true))
+                .Returns(ViewEngineResult.NotFound(viewName, Enumerable.Empty<string>()))
+                .Verifiable();
+            viewEngine
+                .Setup(e => e.FindView(context, viewName, /*isMainPage*/ true))
+                .Returns(ViewEngineResult.Found(viewName, Mock.Of<IView>()))
+                .Verifiable();
+
+            var viewResult = new ViewResult
+            {
+                ViewEngine = viewEngine.Object,
+                ViewName = viewName,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act
+            var viewEngineResult = executor.FindView(context, viewResult);
+
+            // Assert
+            Assert.Equal(viewName, viewEngineResult.ViewName);
+            viewEngine.Verify();
+        }
+
+        [Fact]
+        public void FindView_UsesActionDescriptorName_IfViewNameIsNull()
+        {
+            // Arrange
+            var viewName = "some-view-name";
+            var context = GetActionContext(viewName);
+            var executor = GetViewExecutor();
+
+            var viewResult = new ViewResult
+            {
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act
+            var viewEngineResult = executor.FindView(context, viewResult);
+
+            // Assert
+            Assert.Equal(viewName, viewEngineResult.ViewName);
+        }
+
+        [Fact]
+        public void FindView_ReturnsExpectedNotFoundResult_WithGetViewLocations()
+        {
+            // Arrange
+            var expectedLocations = new[] { "location1", "location2" };
+            var context = GetActionContext();
+            var executor = GetViewExecutor();
+
+            var viewName = "myview";
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(e => e.GetView(/*executingFilePath*/ null, "myview", /*isMainPage*/ true))
+                .Returns(ViewEngineResult.NotFound("myview", expectedLocations));
+            viewEngine
+                .Setup(e => e.FindView(context, "myview", /*isMainPage*/ true))
+                .Returns(ViewEngineResult.NotFound("myview", Enumerable.Empty<string>()));
+
+            var viewResult = new ViewResult
+            {
+                ViewName = viewName,
+                ViewEngine = viewEngine.Object,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act
+            var result = executor.FindView(context, viewResult);
+
+            // Assert
+            Assert.False(result.Success);
+            Assert.Null(result.View);
+            Assert.Equal(expectedLocations, result.SearchedLocations);
+        }
+
+        [Fact]
+        public void FindView_ReturnsExpectedNotFoundResult_WithFindViewLocations()
+        {
+            // Arrange
+            var expectedLocations = new[] { "location1", "location2" };
+            var context = GetActionContext();
+            var executor = GetViewExecutor();
+
+            var viewName = "myview";
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(e => e.GetView(/*executingFilePath*/ null, "myview", /*isMainPage*/ true))
+                .Returns(ViewEngineResult.NotFound("myview", Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(e => e.FindView(context, "myview", /*isMainPage*/ true))
+                .Returns(ViewEngineResult.NotFound("myview", expectedLocations));
+
+            var viewResult = new ViewResult
+            {
+                ViewName = viewName,
+                ViewEngine = viewEngine.Object,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act
+            var result = executor.FindView(context, viewResult);
+
+            // Assert
+            Assert.False(result.Success);
+            Assert.Null(result.View);
+            Assert.Equal(expectedLocations, result.SearchedLocations);
+        }
+
+        [Fact]
+        public void FindView_ReturnsExpectedNotFoundResult_WithAllLocations()
+        {
+            // Arrange
+            var expectedLocations = new[] { "location1", "location2", "location3", "location4" };
+            var context = GetActionContext();
+            var executor = GetViewExecutor();
+
+            var viewName = "myview";
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(e => e.GetView(/*executingFilePath*/ null, "myview", /*isMainPage*/ true))
+                .Returns(ViewEngineResult.NotFound("myview", new[] { "location1", "location2" }));
+            viewEngine
+                .Setup(e => e.FindView(context, "myview", /*isMainPage*/ true))
+                .Returns(ViewEngineResult.NotFound("myview", new[] { "location3", "location4" }));
+
+            var viewResult = new ViewResult
+            {
+                ViewName = viewName,
+                ViewEngine = viewEngine.Object,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act
+            var result = executor.FindView(context, viewResult);
+
+            // Assert
+            Assert.False(result.Success);
+            Assert.Null(result.View);
+            Assert.Equal(expectedLocations, result.SearchedLocations);
+        }
+
+        [Fact]
+        public void FindView_WritesDiagnostic_ViewFound()
+        {
+            // Arrange
+            var diagnosticSource = new DiagnosticListener("Test");
+            var listener = new TestDiagnosticListener();
+            diagnosticSource.SubscribeWithAdapter(listener);
+
+            var context = GetActionContext();
+            var executor = GetViewExecutor(diagnosticSource);
+
+            var viewName = "myview";
+            var viewResult = new ViewResult
+            {
+                ViewName = viewName,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act
+            var viewEngineResult = executor.FindView(context, viewResult);
+
+            // Assert
+            Assert.Equal(viewName, viewEngineResult.ViewName);
+
+            Assert.NotNull(listener.ViewFound);
+            Assert.NotNull(listener.ViewFound.ActionContext);
+            Assert.NotNull(listener.ViewFound.Result);
+            Assert.NotNull(listener.ViewFound.View);
+            Assert.True(listener.ViewFound.IsMainPage);
+            Assert.Equal("myview", listener.ViewFound.ViewName);
+        }
+
+        [Fact]
+        public void FindView_WritesDiagnostic_ViewNotFound()
+        {
+            // Arrange
+            var diagnosticSource = new DiagnosticListener("Test");
+            var listener = new TestDiagnosticListener();
+            diagnosticSource.SubscribeWithAdapter(listener);
+
+            var context = GetActionContext();
+            var executor = GetViewExecutor(diagnosticSource);
+
+            var viewName = "myview";
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(e => e.GetView(/*executingFilePath*/ null, "myview", /*isMainPage*/ true))
+                .Returns(ViewEngineResult.NotFound("myview", Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(e => e.FindView(context, "myview", /*isMainPage*/ true))
+                .Returns(ViewEngineResult.NotFound("myview", new string[] { "location/myview" }));
+
+            var viewResult = new ViewResult
+            {
+                ViewName = viewName,
+                ViewEngine = viewEngine.Object,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act
+            var viewEngineResult = executor.FindView(context, viewResult);
+
+            // Assert
+            Assert.False(viewEngineResult.Success);
+
+            Assert.NotNull(listener.ViewNotFound);
+            Assert.NotNull(listener.ViewNotFound.ActionContext);
+            Assert.NotNull(listener.ViewNotFound.Result);
+            Assert.Equal(new string[] { "location/myview" }, listener.ViewNotFound.SearchedLocations);
+            Assert.Equal("myview", listener.ViewNotFound.ViewName);
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_UsesContentType_FromViewResult()
+        {
+            // Arrange
+            var context = GetActionContext();
+            var executor = GetViewExecutor();
+
+            var contentType = "application/x-my-content-type";
+
+            var viewResult = new ViewResult
+            {
+                ViewName = "my-view",
+                ContentType = contentType,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act
+            await executor.ExecuteAsync(context, viewResult);
+
+            // Assert
+            Assert.Equal("application/x-my-content-type", context.HttpContext.Response.ContentType);
+        }
+
+        [Fact]
+        public async Task ExecuteAsync_UsesStatusCode_FromViewResult()
+        {
+            // Arrange
+            var context = GetActionContext();
+            var executor = GetViewExecutor();
+
+            var contentType = MediaTypeHeaderValue.Parse("application/x-my-content-type");
+
+            var viewResult = new ViewResult
+            {
+                ViewName = "my-view",
+                StatusCode = 404,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act
+            await executor.ExecuteAsync(context, viewResult);
+
+            // Assert
+            Assert.Equal(404, context.HttpContext.Response.StatusCode);
+        }
+
+        private ActionContext GetActionContext(string actionName = null)
+        {
+            var routeData = new RouteData();
+            routeData.Values["action"] = actionName;
+
+            return new ActionContext(new DefaultHttpContext(), routeData, new ControllerActionDescriptor() { ActionName = actionName });
+        }
+
+        private ViewResultExecutor GetViewExecutor(DiagnosticListener diagnosticSource = null)
+        {
+            if (diagnosticSource == null)
+            {
+                diagnosticSource = new DiagnosticListener("Test");
+            }
+
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(e => e.GetView(/*executingFilePath*/ null, It.IsAny<string>(), /*isMainPage*/ true))
+                .Returns<string, string, bool>(
+                    (path, name, partial) => ViewEngineResult.NotFound(name, Enumerable.Empty<string>()));
+            viewEngine
+                .Setup(e => e.FindView(It.IsAny<ActionContext>(), It.IsAny<string>(), /*isMainPage*/ true))
+                .Returns<ActionContext, string, bool>(
+                    (context, name, partial) => ViewEngineResult.Found(name, Mock.Of<IView>()));
+
+            var options = Options.Create(new MvcViewOptions());
+            options.Value.ViewEngines.Add(viewEngine.Object);
+
+            var viewExecutor = new ViewResultExecutor(
+                options,
+                new TestHttpResponseStreamWriterFactory(),
+                new CompositeViewEngine(options),
+                new TempDataDictionaryFactory(new SessionStateTempDataProvider()),
+                diagnosticSource,
+                NullLoggerFactory.Instance,
+                new EmptyModelMetadataProvider());
+
+            return viewExecutor;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewResultTest.cs
new file mode 100644
index 0000000000..d31be86a02
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewResultTest.cs
@@ -0,0 +1,250 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewEngines;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc
+{
+    // These tests cover the logic included in ViewResult.ExecuteResultAsync - see ViewResultExecutorTest
+    // and ViewExecutorTest for more comprehensive tests.
+    public class ViewResultTest
+    {
+        [Fact]
+        public void Model_NullWhenViewDataIsNull()
+        {
+            // Arrange
+            var viewResult = new ViewResult();
+
+            // Act & Assert
+            Assert.Null(viewResult.Model);
+        }
+
+        [Fact]
+        public void Model_ExposesViewDataModel()
+        {
+            // Arrange
+            var customModel = new object();
+            var viewResult = new ViewResult
+            {
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider())
+                {
+                    Model = customModel
+                },
+            };
+
+            // Act & Assert
+            Assert.Same(customModel, viewResult.Model);
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_Throws_IfViewCouldNotBeFound_MessageUsesGetViewLocations()
+        {
+            // Arrange
+            var viewName = "MyView";
+            var actionContext = GetActionContext();
+            var expected = string.Join(
+                Environment.NewLine,
+                $"The view '{viewName}' was not found. The following locations were searched:",
+                "Location1",
+                "Location2");
+
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, viewName, /*isMainPage*/ true))
+                .Returns(ViewEngineResult.NotFound(viewName, Enumerable.Empty<string>()))
+                .Verifiable();
+
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ true))
+                .Returns(ViewEngineResult.NotFound(viewName, new[] { "Location1", "Location2" }))
+                .Verifiable();
+
+            var viewResult = new ViewResult
+            {
+                ViewEngine = viewEngine.Object,
+                ViewName = viewName,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act and Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => viewResult.ExecuteResultAsync(actionContext));
+            Assert.Equal(expected, ex.Message);
+            viewEngine.Verify();
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_Throws_IfViewCouldNotBeFound_MessageUsesFindViewLocations()
+        {
+            // Arrange
+            var viewName = "MyView";
+            var actionContext = GetActionContext();
+            var expected = string.Join(
+                Environment.NewLine,
+                $"The view '{viewName}' was not found. The following locations were searched:",
+                "Location1",
+                "Location2",
+                "Location3",
+                "Location4");
+
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, viewName, /*isMainPage*/ true))
+                .Returns(ViewEngineResult.NotFound(viewName, new[] { "Location1", "Location2" }))
+                .Verifiable();
+
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ true))
+                .Returns(ViewEngineResult.NotFound(viewName, new[] { "Location3", "Location4" }))
+                .Verifiable();
+
+            var viewResult = new ViewResult
+            {
+                ViewEngine = viewEngine.Object,
+                ViewName = viewName,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act and Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => viewResult.ExecuteResultAsync(actionContext));
+            Assert.Equal(expected, ex.Message);
+            viewEngine.Verify();
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_Throws_IfViewCouldNotBeFound_MessageUsesAllLocations()
+        {
+            // Arrange
+            var viewName = "MyView";
+            var actionContext = GetActionContext();
+            var expected = string.Join(
+                Environment.NewLine,
+                $"The view '{viewName}' was not found. The following locations were searched:",
+                "Location1",
+                "Location2",
+                "Location3",
+                "Location4");
+
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, viewName, /*isMainPage*/ true))
+                .Returns(ViewEngineResult.NotFound(viewName, new[] { "Location1", "Location2" }))
+                .Verifiable();
+
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ true))
+                .Returns(ViewEngineResult.NotFound(viewName, new[] { "Location3", "Location4" }))
+                .Verifiable();
+
+            var viewResult = new ViewResult
+            {
+                ViewEngine = viewEngine.Object,
+                ViewName = viewName,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act and Assert
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(
+                () => viewResult.ExecuteResultAsync(actionContext));
+            Assert.Equal(expected, ex.Message);
+            viewEngine.Verify();
+        }
+
+        [Fact]
+        public async Task ExecuteResultAsync_FindsAndExecutesView()
+        {
+            // Arrange
+            var viewName = "MyView";
+            var actionContext = GetActionContext();
+
+            var view = new Mock<IView>(MockBehavior.Strict);
+            view
+                .Setup(v => v.RenderAsync(It.IsAny<ViewContext>()))
+                .Returns(Task.FromResult(0))
+                .Verifiable();
+
+            view
+                .As<IDisposable>()
+                .Setup(v => v.Dispose())
+                .Verifiable();
+
+            // Used by logging
+            view
+                .SetupGet(v => v.Path)
+                .Returns($"{viewName}.cshtml");
+
+            var viewEngine = new Mock<IViewEngine>(MockBehavior.Strict);
+            viewEngine
+                .Setup(v => v.GetView(/*executingFilePath*/ null, viewName, /*isMainPage*/ true))
+                .Returns(ViewEngineResult.NotFound(viewName, Enumerable.Empty<string>()))
+                .Verifiable();
+
+            viewEngine
+                .Setup(v => v.FindView(It.IsAny<ActionContext>(), viewName, /*isMainPage*/ true))
+                .Returns(ViewEngineResult.Found(viewName, view.Object))
+                .Verifiable();
+
+            var viewResult = new ViewResult
+            {
+                ViewName = viewName,
+                ViewEngine = viewEngine.Object,
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider()),
+                TempData = Mock.Of<ITempDataDictionary>(),
+            };
+
+            // Act
+            await viewResult.ExecuteResultAsync(actionContext);
+
+            // Assert
+            view.Verify();
+            viewEngine.Verify();
+        }
+
+        private ActionContext GetActionContext()
+        {
+            return new ActionContext(GetHttpContext(), new RouteData(), new ActionDescriptor());
+        }
+
+        private HttpContext GetHttpContext()
+        {
+            var options = Options.Create(new MvcViewOptions());
+
+            var viewExecutor = new ViewResultExecutor(
+                options,
+                new TestHttpResponseStreamWriterFactory(),
+                new CompositeViewEngine(options),
+                new TempDataDictionaryFactory(new SessionStateTempDataProvider()),
+                new DiagnosticListener("Microsoft.AspNetCore"),
+                NullLoggerFactory.Instance,
+                new EmptyModelMetadataProvider());
+
+            var services = new ServiceCollection();
+            services.AddSingleton<IActionResultExecutor<ViewResult>>(viewExecutor);
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = services.BuildServiceProvider();
+            return httpContext;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs
new file mode 100644
index 0000000000..fea8184296
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs
@@ -0,0 +1,533 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.WebApiCompatShim;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace System.Web.Http
+{
+    public class ApiControllerActionDiscoveryTest
+    {
+        [Fact]
+        public void GetActions_ApiControllerWithControllerSuffix_IsController()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var context = new ActionDescriptorProviderContext();
+            Invoke(provider, context);
+
+            var results = context.Results.Cast<ControllerActionDescriptor>();
+
+            // Assert
+            var controllerType = typeof(TestControllers.ProductsController).GetTypeInfo();
+            var actions = results.Where(ad => ad.ControllerTypeInfo == controllerType).ToArray();
+
+            Assert.NotEmpty(actions);
+        }
+
+        [Fact]
+        public void GetActions_ApiControllerWithoutControllerSuffix_IsNotController()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var context = new ActionDescriptorProviderContext();
+            Invoke(provider, context);
+
+            var results = context.Results.Cast<ControllerActionDescriptor>();
+
+            // Assert
+            var controllerType = typeof(TestControllers.Blog).GetTypeInfo();
+            var actions = results.Where(ad => ad.ControllerTypeInfo == controllerType);
+
+            Assert.Equal(2, actions.Count());
+        }
+
+        [Fact]
+        public void GetActions_CreatesNamedAndUnnamedAction()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var context = new ActionDescriptorProviderContext();
+            Invoke(provider, context);
+
+            var results = context.Results.Cast<ControllerActionDescriptor>();
+
+            // Assert
+            var controllerType = typeof(TestControllers.StoreController).GetTypeInfo();
+            var actions = results
+                .Where(ad => ad.ControllerTypeInfo == controllerType)
+                .Where(ad => ad.MethodInfo.Name == "GetAll")
+                .ToArray();
+
+            Assert.Equal(2, actions.Length);
+
+            var action = Assert.Single(
+                actions,
+                a => a.RouteValues.Any(rc => rc.Key == "action" && rc.Value == "GetAll"));
+            Assert.Equal(
+                new string[] { "GET" },
+                Assert.Single(action.ActionConstraints.OfType<HttpMethodActionConstraint>()).HttpMethods);
+
+            action = Assert.Single(
+                actions,
+                a => a.RouteValues.Any(rc => rc.Key == "action" && string.IsNullOrEmpty(rc.Value)));
+            Assert.Equal(
+                new string[] { "GET" },
+                Assert.Single(action.ActionConstraints.OfType<HttpMethodActionConstraint>()).HttpMethods);
+        }
+
+        [Fact]
+        public void GetActions_CreatesNamedAndUnnamedAction_DefaultVerbIsPost()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var context = new ActionDescriptorProviderContext();
+            Invoke(provider, context);
+
+            var results = context.Results.Cast<ControllerActionDescriptor>();
+
+            // Assert
+            var controllerType = typeof(TestControllers.StoreController).GetTypeInfo();
+            var actions = results
+                .Where(ad => ad.ControllerTypeInfo == controllerType)
+                .Where(ad => ad.MethodInfo.Name == "Edit")
+                .ToArray();
+
+            Assert.Equal(2, actions.Length);
+
+            var action = Assert.Single(
+                actions,
+                a => a.RouteValues.Any(rc => rc.Key == "action" && rc.Value == "Edit"));
+            Assert.Equal(
+                new string[] { "POST" },
+                Assert.Single(action.ActionConstraints.OfType<HttpMethodActionConstraint>()).HttpMethods);
+
+            action = Assert.Single(
+                actions,
+                a => a.RouteValues.Any(rc => rc.Key == "action" && string.IsNullOrEmpty(rc.Value)));
+            Assert.Equal(
+                new string[] { "POST" },
+                Assert.Single(action.ActionConstraints.OfType<HttpMethodActionConstraint>()).HttpMethods);
+        }
+
+        [Fact]
+        public void GetActions_CreatesNamedAndUnnamedAction_RespectsVerbAttribute()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var context = new ActionDescriptorProviderContext();
+            Invoke(provider, context);
+
+            var results = context.Results.Cast<ControllerActionDescriptor>();
+
+            // Assert
+            var controllerType = typeof(TestControllers.StoreController).GetTypeInfo();
+            var actions = results
+                .Where(ad => ad.ControllerTypeInfo == controllerType)
+                .Where(ad => ad.MethodInfo.Name == "Delete")
+                .ToArray();
+
+            Assert.Equal(2, actions.Length);
+
+            var action = Assert.Single(
+                actions,
+                a => a.RouteValues.Any(rc => rc.Key == "action" && rc.Value == "Delete"));
+            Assert.Equal(
+                new string[] { "PUT" },
+                Assert.Single(action.ActionConstraints.OfType<HttpMethodActionConstraint>()).HttpMethods);
+
+            action = Assert.Single(
+                actions,
+                a => a.RouteValues.Any(rc => rc.Key == "action" && string.IsNullOrEmpty(rc.Value)));
+            Assert.Equal(
+                new string[] { "PUT" },
+                Assert.Single(action.ActionConstraints.OfType<HttpMethodActionConstraint>()).HttpMethods);
+        }
+
+        // The method name is used to infer a verb, not the action name
+        [Fact]
+        public void GetActions_CreatesNamedAndUnnamedAction_VerbBasedOnMethodName()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var context = new ActionDescriptorProviderContext();
+            Invoke(provider, context);
+
+            var results = context.Results.Cast<ControllerActionDescriptor>();
+
+            // Assert
+            var controllerType = typeof(TestControllers.StoreController).GetTypeInfo();
+            var actions = results
+                .Where(ad => ad.ControllerTypeInfo == controllerType)
+                .Where(ad => ad.MethodInfo.Name == "Options")
+                .ToArray();
+
+            Assert.Equal(2, actions.Length);
+
+            var action = Assert.Single(
+                actions,
+                a => a.RouteValues.Any(rc => rc.Key == "action" && rc.Value == "GetOptions"));
+            Assert.Equal(
+                new string[] { "OPTIONS" },
+                Assert.Single(action.ActionConstraints.OfType<HttpMethodActionConstraint>()).HttpMethods);
+
+            action = Assert.Single(
+                actions,
+                a => a.RouteValues.Any(rc => rc.Key == "action" && string.IsNullOrEmpty(rc.Value)));
+            Assert.Equal(
+                new string[] { "OPTIONS" },
+                Assert.Single(action.ActionConstraints.OfType<HttpMethodActionConstraint>()).HttpMethods);
+        }
+
+        [Fact]
+        public void GetActions_AllWebApiActionsAreOverloaded()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var context = new ActionDescriptorProviderContext();
+            Invoke(provider, context);
+
+            var results = context.Results.Cast<ControllerActionDescriptor>();
+
+            // Assert
+            var controllerType = typeof(TestControllers.StoreController).GetTypeInfo();
+            var actions = results
+                .Where(ad => ad.ControllerTypeInfo == controllerType)
+                .ToArray();
+
+            Assert.NotEmpty(actions);
+            foreach (var action in actions)
+            {
+                Assert.Single(action.ActionConstraints, c => c is OverloadActionConstraint);
+            }
+        }
+
+        [Fact]
+        public void GetActions_AllWebApiActionsAreInWebApiArea()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var context = new ActionDescriptorProviderContext();
+            Invoke(provider, context);
+
+            var results = context.Results.Cast<ControllerActionDescriptor>();
+
+            // Assert
+            var controllerType = typeof(TestControllers.StoreController).GetTypeInfo();
+            var actions = results
+                .Where(ad => ad.ControllerTypeInfo == controllerType)
+                .ToArray();
+
+            Assert.NotEmpty(actions);
+            foreach (var action in actions)
+            {
+                Assert.Single(action.RouteValues, c => c.Key == "area" && c.Value== "api");
+            }
+        }
+
+        [Fact]
+        public void GetActions_Parameters_SimpleTypeFromUriByDefault()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var context = new ActionDescriptorProviderContext();
+            Invoke(provider, context);
+
+            var results = context.Results.Cast<ControllerActionDescriptor>();
+
+            // Assert
+            var controllerType = typeof(TestControllers.EmployeesController).GetTypeInfo();
+            var actions = results
+                .Where(ad => ad.ControllerTypeInfo == controllerType)
+                .Where(ad => ad.ActionName == "Get")
+                .ToArray();
+
+            Assert.NotEmpty(actions);
+            foreach (var action in actions)
+            {
+                var parameter = Assert.Single(action.Parameters);
+                Assert.Equal((new FromUriAttribute()).BindingSource, parameter.BindingInfo.BindingSource);
+                var optionalParameters = (HashSet<string>)action.Properties["OptionalParameters"];
+                Assert.DoesNotContain(parameter.Name, optionalParameters);
+            }
+        }
+
+        [Fact]
+        public void GetActions_Parameters_ComplexTypeFromBodyByDefault()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var context = new ActionDescriptorProviderContext();
+            Invoke(provider, context);
+
+            var results = context.Results.Cast<ControllerActionDescriptor>();
+
+            // Assert
+            var controllerType = typeof(TestControllers.EmployeesController).GetTypeInfo();
+            var actions = results
+                .Where(ad => ad.ControllerTypeInfo == controllerType)
+                .Where(ad => ad.ActionName == "Put")
+                .ToArray();
+
+            Assert.NotEmpty(actions);
+            foreach (var action in actions)
+            {
+                var parameter = Assert.Single(action.Parameters);
+                Assert.Equal(BindingSource.Body, parameter.BindingInfo.BindingSource);
+            }
+        }
+
+        [Fact]
+        public void GetActions_Parameters_WithBindingSource()
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var context = new ActionDescriptorProviderContext();
+            Invoke(provider, context);
+
+            var results = context.Results.Cast<ControllerActionDescriptor>();
+
+            // Assert
+            var controllerType = typeof(TestControllers.EmployeesController).GetTypeInfo();
+            var actions = results
+                .Where(ad => ad.ControllerTypeInfo == controllerType)
+                .Where(ad => ad.ActionName == "Post")
+                .ToArray();
+
+            Assert.NotEmpty(actions);
+            foreach (var action in actions)
+            {
+                var parameter = Assert.Single(action.Parameters);
+                Assert.Null(parameter.BindingInfo.BindingSource);
+            }
+        }
+
+        [Theory]
+        [InlineData(nameof(TestControllers.EventsController.GetWithId))]
+        [InlineData(nameof(TestControllers.EventsController.GetWithEmployee))]
+        public void GetActions_Parameters_ImplicitOptional(string name)
+        {
+            // Arrange
+            var provider = CreateProvider();
+
+            // Act
+            var context = new ActionDescriptorProviderContext();
+            Invoke(provider, context);
+
+            var results = context.Results.Cast<ControllerActionDescriptor>();
+
+            // Assert
+            var controllerType = typeof(TestControllers.EventsController).GetTypeInfo();
+            var actions = results
+                .Where(ad => ad.ControllerTypeInfo == controllerType)
+                .Where(ad => ad.ActionName == name)
+                .ToArray();
+
+            Assert.NotEmpty(actions);
+            foreach (var action in actions)
+            {
+                var parameter = Assert.Single(action.Parameters);
+                Assert.Equal((new FromUriAttribute()).BindingSource, parameter.BindingInfo.BindingSource);
+                var optionalParameters = (HashSet<string>)action.Properties["OptionalParameters"];
+                Assert.Contains(parameter.Name, optionalParameters);
+            }
+        }
+
+        private ControllerActionDescriptorProvider CreateProvider()
+        {
+            var manager = GetApplicationManager(GetType().GetTypeInfo().Assembly.DefinedTypes.ToArray());
+
+            var options = new MvcOptions();
+
+            var setup = new WebApiCompatShimOptionsSetup();
+            setup.Configure(options);
+
+            var authorizationOptionsAccessor = new Mock<IOptions<AuthorizationOptions>>();
+            authorizationOptionsAccessor
+                .SetupGet(o => o.Value)
+                .Returns(new AuthorizationOptions());
+
+            var optionsAccessor = Options.Create(options);
+            var modelProvider = new DefaultApplicationModelProvider(optionsAccessor, TestModelMetadataProvider.CreateDefaultProvider());
+
+            var provider = new ControllerActionDescriptorProvider(
+                manager,
+                new[] { modelProvider },
+                optionsAccessor);
+
+            return provider;
+        }
+
+        private void Invoke(ControllerActionDescriptorProvider provider, ActionDescriptorProviderContext context)
+        {
+            provider.OnProvidersExecuting(context);
+            provider.OnProvidersExecuted(context);
+        }
+
+        private static ApplicationPartManager GetApplicationManager(params TypeInfo[] controllerTypes)
+        {
+            var manager = new ApplicationPartManager();
+            manager.ApplicationParts.Add(new TestPart(controllerTypes));
+            manager.FeatureProviders.Add(new TestProvider());
+            manager.FeatureProviders.Add(new NamespaceFilteredControllersFeatureProvider());
+            return manager;
+        }
+
+        private class TestPart : ApplicationPart, IApplicationPartTypeProvider
+        {
+            public TestPart(IEnumerable<TypeInfo> types)
+            {
+                Types = types;
+            }
+
+            public override string Name => "Test";
+
+            public IEnumerable<TypeInfo> Types { get; }
+        }
+
+        private class TestProvider : IApplicationFeatureProvider<ControllerFeature>
+        {
+            public void PopulateFeature(IEnumerable<ApplicationPart> parts, ControllerFeature feature)
+            {
+                foreach (var type in parts.OfType<IApplicationPartTypeProvider>().SelectMany(t => t.Types))
+                {
+                    feature.Controllers.Add(type);
+                }
+            }
+        }
+
+        private class NamespaceFilteredControllersFeatureProvider : IApplicationFeatureProvider<ControllerFeature>
+        {
+            public void PopulateFeature(IEnumerable<ApplicationPart> parts, ControllerFeature feature)
+            {
+                var controllers = feature.Controllers.ToList();
+                foreach (var controller in controllers)
+                {
+                    if (controller.Namespace != "System.Web.Http.TestControllers")
+                    {
+                        feature.Controllers.Remove(controller);
+                    }
+                }
+            }
+        }
+    }
+}
+
+// These need to be public top-level classes to test discovery end-to-end. Don't reuse
+// these outside of this test.
+namespace System.Web.Http.TestControllers
+{
+    public class ProductsController : ApiController
+    {
+        public IActionResult GetAll()
+        {
+            return null;
+        }
+    }
+
+    // Not a controller, because there's no controller suffix
+    public class Blog : ApiController
+    {
+        public IActionResult GetBlogPosts()
+        {
+            return null;
+        }
+    }
+
+    public class StoreController : ApiController
+    {
+        public IActionResult GetAll()
+        {
+            return null;
+        }
+
+        public IActionResult Edit(int id)
+        {
+            return null;
+        }
+
+        [HttpPut]
+        public IActionResult Delete(int id)
+        {
+            return null;
+        }
+
+        [ActionName("GetOptions")]
+        public IActionResult Options()
+        {
+            return null;
+        }
+    }
+
+    public class EmployeesController : ApiController
+    {
+        public IActionResult Get(int id)
+        {
+            return null;
+        }
+
+        public IActionResult Put(Employee employee)
+        {
+            return null;
+        }
+
+        public IActionResult Post([ModelBinder] Employee employee)
+        {
+            return null;
+        }
+    }
+
+    public class Employee
+    {
+    }
+
+    public class EventsController : ApiController
+    {
+        public IActionResult GetWithId(int id = 0)
+        {
+            return null;
+        }
+
+        public IActionResult GetWithEmployee([FromUri] Employee e = null)
+        {
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ApiControllerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ApiControllerTest.cs
new file mode 100644
index 0000000000..49231bf4c0
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ApiControllerTest.cs
@@ -0,0 +1,416 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Security.Claims;
+using System.Text;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Routing;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace System.Web.Http
+{
+    public class ApiControllerTest
+    {
+        [Fact]
+        public void AccessDependentProperties()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.User = new ClaimsPrincipal();
+
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ControllerActionDescriptor());
+
+            // Act
+            controller.ControllerContext = new ControllerContext(actionContext);
+
+            // Assert
+            Assert.Same(httpContext, controller.Context);
+            Assert.Same(actionContext.ModelState, controller.ModelState);
+            Assert.Same(httpContext.User, controller.User);
+        }
+
+        [Fact]
+        public void AccessDependentProperties_UnsetContext()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+
+            // Act & Assert
+            Assert.Null(controller.Context);
+            Assert.NotNull(controller.ModelState);
+            Assert.Null(controller.User);
+        }
+
+        [Fact]
+        public void ApiController_BadRequest()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+
+            // Act
+            var result = controller.BadRequest();
+
+            // Assert
+            Assert.Equal(StatusCodes.Status400BadRequest, Assert.IsType<BadRequestResult>(result).StatusCode);
+        }
+
+        [Fact]
+        public void ApiController_BadRequest_Message()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+
+            // Act
+            var result = controller.BadRequest("Error");
+
+            // Assert
+            var badRequest = Assert.IsType<BadRequestErrorMessageResult>(result);
+            Assert.Equal("Error", badRequest.Message);
+
+            var httpError = Assert.IsType<HttpError>(badRequest.Value);
+            Assert.Equal("Error", httpError.Message);
+        }
+
+        [Fact]
+        public void ApiController_BadRequest_ModelState()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+
+            var modelState = new ModelStateDictionary();
+            modelState.AddModelError("product.Name", "Name is required");
+
+            // Act
+            var result = controller.BadRequest(modelState);
+
+            // Assert
+            var badRequest = Assert.IsType<InvalidModelStateResult>(result);
+
+            var modelError = Assert.IsType<HttpError>(badRequest.Value).ModelState;
+            Assert.Equal(new string[] { "Name is required" }, modelError["product.Name"]);
+        }
+
+        [Fact]
+        public void ApiController_Created_Uri()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+
+            var uri = new Uri("http://contoso.com/");
+            var product = new Product();
+
+            // Act
+            var result = controller.Created(uri, product);
+
+            // Assert
+            var created = Assert.IsType<CreatedResult>(result);
+            Assert.Same(product, created.Value);
+            Assert.Equal(uri.OriginalString, created.Location);
+        }
+
+        [Theory]
+        [InlineData("http://contoso.com/Api/Products")]
+        [InlineData("/Api/Products")]
+        [InlineData("Products")]
+        public void ApiController_Created_String(string uri)
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+
+            var product = new Product();
+
+            // Act
+            var result = controller.Created(uri, product);
+
+            // Assert
+            var created = Assert.IsType<CreatedResult>(result);
+            Assert.Same(product, created.Value);
+            Assert.Equal(uri, created.Location);
+        }
+
+        [Fact]
+        public void ApiController_CreatedAtRoute()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+
+            var product = new Product();
+
+            // Act
+            var result = controller.CreatedAtRoute("api_route", new { controller = "Products" }, product);
+
+            // Assert
+            var created = Assert.IsType<CreatedAtRouteResult>(result);
+            Assert.Same(product, created.Value);
+            Assert.Equal("api_route", created.RouteName);
+            Assert.Equal("Products", created.RouteValues["controller"]);
+        }
+
+        [Fact]
+        public void ApiController_CreatedAtRoute_Dictionary()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+
+            var product = new Product();
+            var values = new RouteValueDictionary(new { controller = "Products" });
+
+            // Act
+            var result = controller.CreatedAtRoute("api_route", values, product);
+
+            // Assert
+            var created = Assert.IsType<CreatedAtRouteResult>(result);
+            Assert.Same(product, created.Value);
+            Assert.Equal("api_route", created.RouteName);
+            Assert.Equal("Products", created.RouteValues["controller"]);
+            Assert.Equal<KeyValuePair<string, object>>(values, created.RouteValues);
+        }
+
+        [Fact]
+        public void ApiController_Conflict()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+
+            // Act
+            var result = controller.Conflict();
+
+            // Assert
+            Assert.Equal(StatusCodes.Status409Conflict, Assert.IsType<ConflictResult>(result).StatusCode);
+        }
+
+        [Fact]
+        public void ApiController_Content()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+
+            var content = new Product();
+
+            // Act
+            var result = controller.Content(HttpStatusCode.Found, content);
+
+            // Assert
+            var contentResult = Assert.IsType<NegotiatedContentResult<Product>>(result);
+            Assert.Equal(StatusCodes.Status302Found, contentResult.StatusCode);
+            Assert.Equal(content, contentResult.Value);
+        }
+
+        [Fact]
+        public void ApiController_InternalServerError()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+
+            // Act
+            var result = controller.InternalServerError();
+
+            // Assert
+            Assert.Equal(StatusCodes.Status500InternalServerError, Assert.IsType<InternalServerErrorResult>(result).StatusCode);
+        }
+
+        [Fact]
+        public void ApiController_InternalServerError_Exception()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+            var exception = new ArgumentException();
+
+            // Act
+            var result = controller.InternalServerError(exception);
+
+            // Assert
+            var exceptionResult = Assert.IsType<ExceptionResult>(result);
+            Assert.Same(exception, exceptionResult.Exception);
+        }
+
+        [Fact]
+        public void ApiController_Json()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+            var product = new Product();
+
+            // Act
+            var result = controller.Json(product);
+
+            // Assert
+            var jsonResult = Assert.IsType<JsonResult>(result);
+            Assert.Same(product, jsonResult.Value);
+        }
+
+        [Fact]
+        public void ApiController_Json_Encoding()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+            var product = new Product();
+            var settings = new JsonSerializerSettings();
+
+            // Act
+            var result = controller.Json(product, settings, Encoding.UTF8);
+
+            // Assert
+            var jsonResult = Assert.IsType<JsonResult>(result);
+            Assert.Same(product, jsonResult.Value);
+
+            Assert.Same(Encoding.UTF8, MediaType.GetEncoding(jsonResult.ContentType));
+        }
+
+        [Fact]
+        public void ApiController_NotFound()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+
+            // Act
+            var result = controller.NotFound();
+
+            // Assert
+            Assert.Equal(404, Assert.IsType<NotFoundResult>(result).StatusCode);
+        }
+
+        [Fact]
+        public void ApiController_Ok()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+
+            // Act
+            var result = controller.Ok();
+
+            // Assert
+            Assert.Equal(200, Assert.IsType<OkResult>(result).StatusCode);
+        }
+
+
+        [Fact]
+        public void ApiController_Ok_Content()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+            var product = new Product();
+
+            // Act
+            var result = controller.Ok(product);
+
+            // Assert
+            var okResult = Assert.IsType<OkObjectResult>(result);
+            Assert.Same(product, okResult.Value);
+        }
+
+        [Fact]
+        public void ApiController_Redirect()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+
+            var uri = new Uri("http://contoso.com");
+
+            // Act
+            var result = controller.Redirect(uri);
+
+            // Assert
+            var redirect = Assert.IsType<RedirectResult>(result);
+            Assert.Equal(uri.AbsoluteUri, result.Url);
+        }
+
+        [Theory]
+        [InlineData("http://contoso.com/Api/Products")]
+        public void ApiController_Redirect_String(string uri)
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+
+            // Act
+            var result = controller.Redirect(uri);
+
+            // Assert
+            var redirect = Assert.IsType<RedirectResult>(result);
+            Assert.Equal(uri, result.Url);
+        }
+
+        [Fact]
+        public void ApiController_RedirectToRoute()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+
+            // Act
+            var result = controller.RedirectToRoute("api_route", new { controller = "Products" });
+
+            // Assert
+            var created = Assert.IsType<RedirectToRouteResult>(result);
+            Assert.Equal("api_route", created.RouteName);
+            Assert.Equal("Products", created.RouteValues["controller"]);
+        }
+
+        [Fact]
+        public void ApiController_RedirectToRoute_Dictionary()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+
+            var product = new Product();
+            var values = new RouteValueDictionary(new { controller = "Products" });
+
+            // Act
+            var result = controller.RedirectToRoute("api_route", values);
+
+            // Assert
+            var created = Assert.IsType<RedirectToRouteResult>(result);
+            Assert.Equal("api_route", created.RouteName);
+            Assert.Equal("Products", created.RouteValues["controller"]);
+        }
+
+        [Fact]
+        public void ApiController_ResponseMessage()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+
+            var response = new HttpResponseMessage(HttpStatusCode.NoContent);
+
+            // Act
+            var result = controller.ResponseMessage(response);
+
+            // Assert
+            var responseResult = Assert.IsType<ResponseMessageResult>(result);
+            Assert.Same(response, responseResult.Response);
+        }
+
+        [Fact]
+        public void ApiController_StatusCode()
+        {
+            // Arrange
+            var controller = new ConcreteApiController();
+
+            // Act
+            var result = controller.StatusCode(HttpStatusCode.ExpectationFailed);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status417ExpectationFailed, Assert.IsType<StatusCodeResult>(result).StatusCode);
+        }
+
+        private class Product
+        {
+            public string Name { get; set; }
+
+            public int Id { get; set; }
+        }
+
+        private class ConcreteApiController : ApiController
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/BadRequestErrorMessageResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/BadRequestErrorMessageResultTest.cs
new file mode 100644
index 0000000000..eb625745db
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/BadRequestErrorMessageResultTest.cs
@@ -0,0 +1,86 @@
+// 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.
+
+using System.Buffers;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace System.Web.Http
+{
+    public class BadRequestErrorMessageResultTest
+    {
+        [Fact]
+        public async Task BadRequestErrorMessageResult_SetsStatusCode()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = CreateServices();
+
+            var stream = new MemoryStream();
+            httpContext.Response.Body = stream;
+
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var result = new BadRequestErrorMessageResult("Error");
+
+            // Act
+            await result.ExecuteResultAsync(context);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status400BadRequest, context.HttpContext.Response.StatusCode);
+        }
+
+        [Fact]
+        public async Task BadRequestErrorMessageResult_WritesHttpError()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = CreateServices();
+
+            var stream = new MemoryStream();
+            httpContext.Response.Body = stream;
+
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var result = new BadRequestErrorMessageResult("Error");
+
+            // Act
+            await result.ExecuteResultAsync(context);
+
+            // Assert
+            using (var reader = new StreamReader(stream))
+            {
+                stream.Seek(0, SeekOrigin.Begin);
+                var content = reader.ReadToEnd();
+                Assert.Equal("{\"Message\":\"Error\"}", content);
+            }
+        }
+
+        private static IServiceProvider CreateServices()
+        {
+            var options = Options.Create(new MvcOptions());
+            options.Value.OutputFormatters.Add(new StringOutputFormatter());
+            options.Value.OutputFormatters.Add(new JsonOutputFormatter(
+                new JsonSerializerSettings(),
+                ArrayPool<char>.Shared));
+
+            var services = new ServiceCollection();
+            services.AddSingleton<IActionResultExecutor<ObjectResult>>(new ObjectResultExecutor(
+                new DefaultOutputFormatterSelector(options, NullLoggerFactory.Instance),
+                new TestHttpResponseStreamWriterFactory(),
+                NullLoggerFactory.Instance));
+
+            return services.BuildServiceProvider();
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ConflictResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ConflictResultTest.cs
new file mode 100644
index 0000000000..42bfe6fda5
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ConflictResultTest.cs
@@ -0,0 +1,51 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Xunit;
+
+namespace System.Web.Http
+{
+    public class ConflictResultTest
+    {
+        [Fact]
+        public async Task ConflictResult_SetsStatusCode()
+        {
+            // Arrange
+            var context = new ActionContext(GetHttpContext(), new RouteData(), new ActionDescriptor());
+            var result = new ConflictResult();
+
+            // Act
+            await result.ExecuteResultAsync(context);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status409Conflict, context.HttpContext.Response.StatusCode);
+        }
+
+        private static IServiceCollection CreateServices()
+        {
+            var services = new ServiceCollection();
+
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+
+            return services;
+        }
+
+        private static HttpContext GetHttpContext()
+        {
+            var services = CreateServices();
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = services.BuildServiceProvider();
+
+            return httpContext;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/DefaultContentNegotiatorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/DefaultContentNegotiatorTest.cs
new file mode 100644
index 0000000000..d0f879a3c6
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/DefaultContentNegotiatorTest.cs
@@ -0,0 +1,700 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http.Formatting.Mocks;
+using System.Net.Http.Headers;
+using System.Text;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.TestCommon;
+using Newtonsoft.Json.Linq;
+using Xunit;
+
+namespace System.Net.Http.Formatting
+{
+    public class DefaultContentNegotiatorTests
+    {
+        private readonly DefaultContentNegotiator _negotiator = new DefaultContentNegotiator();
+        private readonly HttpRequestMessage _request = new HttpRequestMessage();
+
+        public static TheoryData<string, string[], string> MatchRequestMediaTypeData
+        {
+            get
+            {
+                // string requestMediaType, string[] supportedMediaTypes, string expectedMediaType
+                return new TheoryData<string, string[], string>
+                {
+                    { "text/plain", new string[0], null },
+                    { "text/plain", new string[] { "text/xml", "application/xml" }, null },
+                    { "application/xml", new string[] { "application/xml", "text/xml" }, "application/xml" },
+                    { "APPLICATION/XML", new string[] { "text/xml", "application/xml" }, "application/xml" },
+                    { "application/xml; charset=utf-8", new string[] { "text/xml", "application/xml" }, "application/xml" },
+                    { "application/xml; charset=utf-8; parameter=value", new string[] { "text/xml", "application/xml" }, "application/xml" },
+                };
+            }
+        }
+
+        public static TheoryData<string[], string[], string, double, int> MatchAcceptHeaderData
+        {
+            get
+            {
+                // string[] acceptHeader, string[] supportedMediaTypes, string expectedMediaType, double matchQuality, int range
+                return new TheoryData<string[], string[], string, double, int>
+                {
+                    { new string[] { "text/plain" }, new string[0], null, 0.0, (int)MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderLiteral },
+
+                    { new string[] { "text/plain" }, new string[] { "text/xml", "application/xml" }, null, 0.0, (int)MediaTypeFormatterMatchRanking.None },
+                    { new string[] { "text/plain; q=0.5" }, new string[] { "text/xml", "application/xml" }, null, 0.0, (int)MediaTypeFormatterMatchRanking.None },
+
+                    { new string[] { "application/xml" }, new string[] { "application/xml", "text/xml" }, "application/xml", 1.0, (int)MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderLiteral },
+                    { new string[] { "APPLICATION/XML; q=0.5" }, new string[] { "text/xml", "application/xml" }, "application/xml", 0.5, (int)MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderLiteral },
+                    { new string[] { "text/xml; q=0.5", "APPLICATION/XML; q=0.7" }, new string[] { "text/xml", "application/xml" }, "application/xml", 0.7, (int)MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderLiteral },
+                    { new string[] { "application/xml; q=0.0" }, new string[] { "application/xml", "text/xml" }, null, 0.0, (int)MediaTypeFormatterMatchRanking.None },
+                    { new string[] { "APPLICATION/XML; q=0.0" }, new string[] { "text/xml", "application/xml" }, null, 0.0, (int)MediaTypeFormatterMatchRanking.None },
+                    { new string[] { "text/xml; q=0.0", "APPLICATION/XML; q=0.0" }, new string[] { "text/xml", "application/xml" }, null, 0.0, (int)MediaTypeFormatterMatchRanking.None },
+
+                    { new string[] { "text/*" }, new string[] { "text/xml", "application/xml" }, "text/xml", 1.0, (int)MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderSubtypeMediaRange },
+                    { new string[] { "text/*", "application/xml" }, new string[] { "text/xml", "application/xml" }, "application/xml", 1.0, (int)MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderLiteral },
+                    { new string[] { "text/*", "application/xml; q=0.5" }, new string[] { "text/xml", "application/xml" }, "text/xml", 1.0, (int)MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderSubtypeMediaRange },
+                    { new string[] { "text/*; q=0.5" }, new string[] { "text/xml", "application/xml" }, "text/xml", 0.5, (int)MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderSubtypeMediaRange },
+                    { new string[] { "text/*; q=0.5", "application/xml" }, new string[] { "text/xml", "application/xml" }, "application/xml", 1.0, (int)MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderLiteral },
+                    { new string[] { "text/*; q=0.0", "application/xml; q=0.0" }, new string[] { "text/xml", "application/xml" }, null, 0.0, (int)MediaTypeFormatterMatchRanking.None },
+                    { new string[] { "text/*; q=0.0", "application/xml" }, new string[] { "text/xml", "application/xml" }, "application/xml", 1.0, (int)MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderLiteral },
+
+                    { new string[] { "*/*; q=0.5" }, new string[] { "text/xml", "application/xml" }, "text/xml", 0.5, (int)MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderAllMediaRange },
+                    { new string[] { "*/*; q=0.0" }, new string[] { "text/xml", "application/xml" }, null, 0.0, (int)MediaTypeFormatterMatchRanking.None },
+                    { new string[] { "*/*; q=0.5", "application/xml" }, new string[] { "text/xml", "application/xml" }, "application/xml", 1.0, (int)MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderLiteral },
+                    { new string[] { "*/*; q=1.0", "application/xml; q=0.5" }, new string[] { "text/xml", "application/xml" }, "text/xml", 1.0, (int)MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderAllMediaRange },
+                    { new string[] { "*/*", "application/xml" }, new string[] { "text/xml", "application/xml" }, "application/xml", 1.0, (int)MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderLiteral },
+
+                    { new string[] { "text/*; q=0.5", "*/*; q=0.2", "application/xml; q=1.0" }, new string[] { "text/xml", "application/xml" }, "application/xml", 1.0,  (int)MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderLiteral },
+
+                    { new string[] { "application/xml; q=0.5" }, new string[] { "text/xml", "application/xml" }, "application/xml", 0.5, (int)MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderLiteral },
+                };
+            }
+        }
+
+        public static TheoryData<bool, string[], bool> ShouldMatchOnTypeData
+        {
+            get
+            {
+                // bool excludeMatchOnType, string[] acceptHeaders, bool expectedResult
+                return new TheoryData<bool, string[], bool>
+                {
+                    { false, new string[0], true },
+                    { true, new string[0], true },
+
+                    { false, new string[] { "application/xml" }, true },
+                    { true, new string[] { "application/xml" }, false },
+
+                    { false, new string[] { "application/xml; q=1.0" }, true },
+                    { true, new string[] { "application/xml; q=1.0" }, false },
+
+                    { false, new string[] { "application/xml; q=0.0" }, true },
+                    { true, new string[] { "application/xml; q=0.0" }, false },
+
+                    { false, new string[] { "application/xml; q=0.0", "application/json" }, true },
+                    { true, new string[] { "application/xml; q=0.0", "application/json" }, false },
+
+                    { false, new string[] { "text/nomatch" }, true },
+                    { true, new string[] { "text/nomatch" }, false },
+                };
+            }
+        }
+
+        public static TheoryData<string[], string> MatchTypeData
+        {
+            get
+            {
+                // string[] supportedMediaTypes, string expectedMediaType
+                return new TheoryData<string[], string>
+                {
+                    { new string[0], "application/octet-stream" },
+
+                    { new string[] { "text/xml", "application/xml" }, "text/xml" },
+                    { new string[] { "application/xml", "text/xml" }, "application/xml" },
+                };
+            }
+        }
+
+        public static TheoryData<string[], string, string[], string> SelectResponseCharacterEncodingData
+        {
+            get
+            {
+                // string[] acceptEncodings, string requestEncoding, string[] supportedEncodings, string expectedEncoding
+                return new TheoryData<string[], string, string[], string>
+                {
+                    { new string[] { "utf-8" }, null, new string[0], null },
+                    { new string[0], "utf-8", new string[0], null },
+
+                    { new string[0], null, new string[] { "utf-8", "utf-16"}, "utf-8" },
+                    { new string[0], "utf-16", new string[] { "utf-8", "utf-16"}, "utf-16" },
+
+                    { new string[] { "utf-8" }, null, new string[] { "utf-8", "utf-16"}, "utf-8" },
+                    { new string[] { "utf-16" }, "utf-8", new string[] { "utf-8", "utf-16"}, "utf-16" },
+                    { new string[] { "utf-16; q=0.5" }, "utf-8", new string[] { "utf-8", "utf-16"}, "utf-16" },
+
+                    { new string[] { "utf-8; q=0.0" }, null, new string[] { "utf-8", "utf-16"}, "utf-8" },
+                    { new string[] { "utf-8; q=0.0" }, "utf-16", new string[] { "utf-8", "utf-16"}, "utf-16" },
+                    { new string[] { "utf-8; q=0.0", "utf-16; q=0.0" }, "utf-16", new string[] { "utf-8", "utf-16"}, "utf-16" },
+                    { new string[] { "utf-8; q=0.0", "utf-16; q=0.0" }, null, new string[] { "utf-8", "utf-16"}, "utf-8" },
+                    { new string[] { "*; q=0.0" }, null, new string[] { "utf-8", "utf-16"}, "utf-8" },
+                    { new string[] { "*; q=0.0" }, "utf-16", new string[] { "utf-8", "utf-16"}, "utf-16" },
+                };
+            }
+        }
+
+        public static TheoryData<ICollection<MediaTypeFormatterMatch>, MediaTypeFormatterMatch> SelectResponseMediaTypeData
+        {
+            get
+            {
+                MediaTypeFormatterMatch matchAccept10 = CreateMatch(1.0, MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderLiteral);
+                MediaTypeFormatterMatch matchAccept05 = CreateMatch(0.5, MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderLiteral);
+
+                MediaTypeFormatterMatch matchAcceptSubTypeRange10 = CreateMatch(1.0, MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderSubtypeMediaRange);
+                MediaTypeFormatterMatch matchAcceptSubTypeRange05 = CreateMatch(0.5, MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderSubtypeMediaRange);
+
+                MediaTypeFormatterMatch matchAcceptAllRange10 = CreateMatch(1.0, MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderAllMediaRange);
+                MediaTypeFormatterMatch matchAcceptAllRange05 = CreateMatch(0.5, MediaTypeFormatterMatchRanking.MatchOnRequestAcceptHeaderAllMediaRange);
+
+                MediaTypeFormatterMatch matchRequest10 = CreateMatch(1.0, MediaTypeFormatterMatchRanking.MatchOnRequestMediaType);
+                MediaTypeFormatterMatch matchType10 = CreateMatch(1.0, MediaTypeFormatterMatchRanking.MatchOnCanWriteType);
+
+                // ICollection<MediaTypeFormatterMatch> candidateMatches, MediaTypeFormatterMatch winner
+                return new TheoryData<ICollection<MediaTypeFormatterMatch>, MediaTypeFormatterMatch>
+                {
+                    { new List<MediaTypeFormatterMatch>(), null },
+                    { new List<MediaTypeFormatterMatch>() { matchType10 }, matchType10 },
+                    { new List<MediaTypeFormatterMatch>() { matchType10, matchRequest10 }, matchRequest10 },
+                    { new List<MediaTypeFormatterMatch>() { matchType10, matchRequest10, matchAcceptAllRange10 }, matchAcceptAllRange10 },
+                    { new List<MediaTypeFormatterMatch>() { matchType10, matchRequest10, matchAcceptAllRange10, matchAcceptSubTypeRange10 }, matchAcceptSubTypeRange10 },
+                    { new List<MediaTypeFormatterMatch>() { matchType10, matchRequest10, matchAcceptAllRange10, matchAcceptSubTypeRange10, matchAccept10 }, matchAccept10 },
+                    { new List<MediaTypeFormatterMatch>() { matchAccept05, matchAccept10 }, matchAccept10 },
+                    { new List<MediaTypeFormatterMatch>() { matchAccept10, matchAccept05 }, matchAccept10 },
+
+                    { new List<MediaTypeFormatterMatch>() { matchAcceptSubTypeRange05, matchAcceptSubTypeRange10 }, matchAcceptSubTypeRange10 },
+                    { new List<MediaTypeFormatterMatch>() { matchAcceptSubTypeRange10, matchAcceptSubTypeRange05 }, matchAcceptSubTypeRange10 },
+
+                    { new List<MediaTypeFormatterMatch>() { matchAcceptAllRange05, matchAcceptAllRange10 }, matchAcceptAllRange10 },
+                    { new List<MediaTypeFormatterMatch>() { matchAcceptAllRange10, matchAcceptAllRange05 }, matchAcceptAllRange10 },
+                };
+            }
+        }
+
+        public static TheoryData<MediaTypeFormatterMatch, MediaTypeFormatterMatch, bool> UpdateBestMatchData
+        {
+            get
+            {
+                MediaTypeFormatterMatch matchMapping10 = CreateMatch(1.0, MediaTypeFormatterMatchRanking.None);
+                MediaTypeFormatterMatch matchMapping05 = CreateMatch(0.5, MediaTypeFormatterMatchRanking.None);
+
+                // MediaTypeFormatterMatch current, MediaTypeFormatterMatch potentialReplacement, currentWins
+                return new TheoryData<MediaTypeFormatterMatch, MediaTypeFormatterMatch, bool>
+                {
+                    { null, matchMapping10, false },
+                    { null, matchMapping05, false },
+
+                    { matchMapping10, matchMapping10, true },
+                    { matchMapping10, matchMapping05, true },
+
+                    { matchMapping05, matchMapping10, false },
+                    { matchMapping05, matchMapping05, true },
+                };
+            }
+        }
+
+        private static MediaTypeFormatterMatch CreateMatch(double? quality, MediaTypeFormatterMatchRanking ranking)
+        {
+            MockMediaTypeFormatter formatter = new MockMediaTypeFormatter();
+            MediaTypeHeaderValue mediaType = new MediaTypeHeaderValue("text/test");
+            return new MediaTypeFormatterMatch(formatter, mediaType, quality, ranking);
+        }
+
+        [Fact]
+        public void TypeIsCorrect()
+        {
+            new TypeAssert().HasProperties(typeof(DefaultContentNegotiator), TypeAssert.TypeProperties.IsPublicVisibleClass);
+        }
+
+        [Fact]
+        public void Negotiate_ForEmptyFormatterCollection_ReturnsNull()
+        {
+            var result = _negotiator.Negotiate(typeof(string), _request, Enumerable.Empty<MediaTypeFormatter>());
+
+            Assert.Null(result);
+        }
+
+
+        [Fact]
+        public void Negotiate_ForRequestReturnsFirstMatchingFormatter()
+        {
+            MediaTypeHeaderValue mediaType = new MediaTypeHeaderValue("application/myMediaType");
+
+            MediaTypeFormatter formatter1 = new MockMediaTypeFormatter()
+            {
+                CanWriteTypeCallback = (Type t) => false
+            };
+
+            MediaTypeFormatter formatter2 = new MockMediaTypeFormatter()
+            {
+                CanWriteTypeCallback = (Type t) => true
+            };
+
+            formatter2.SupportedMediaTypes.Add(mediaType);
+
+            MediaTypeFormatterCollection collection = new MediaTypeFormatterCollection(
+                new MediaTypeFormatter[]
+                {
+                    formatter1,
+                    formatter2
+                });
+
+            _request.Content = new StringContent("test", Encoding.UTF8, mediaType.MediaType);
+
+            var result = _negotiator.Negotiate(typeof(string), _request, collection);
+            Assert.Same(formatter2, result.Formatter);
+            new MediaTypeAssert().AreEqual(mediaType, result.MediaType, "Expected the formatter's media type to be returned.");
+        }
+
+        [Fact]
+        public void Negotiate_SelectsJsonAsDefaultFormatter()
+        {
+            // Arrange
+            _request.Content = new StringContent("test");
+
+            // Act
+            var result = _negotiator.Negotiate(typeof(string), _request, new MediaTypeFormatterCollection());
+
+            // Assert
+            Assert.IsType<JsonMediaTypeFormatter>(result.Formatter);
+            Assert.Equal(MediaTypeConstants.ApplicationJsonMediaType.MediaType, result.MediaType.MediaType);
+        }
+
+        [Fact]
+        public void Negotiate_SelectsXmlFormatter_ForXhrRequestThatAcceptsXml()
+        {
+            // Arrange
+            _request.Content = new StringContent("test");
+            _request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml"));
+            _request.Headers.Add("x-requested-with", "XMLHttpRequest");
+
+            // Act
+            var result = _negotiator.Negotiate(typeof(string), _request, new MediaTypeFormatterCollection());
+
+            // Assert
+            Assert.Equal("application/xml", result.MediaType.MediaType);
+            Assert.IsType<XmlMediaTypeFormatter>(result.Formatter);
+        }
+
+        [Fact]
+        public void Negotiate_SelectsJsonFormatter_ForXhrRequestThatDoesNotSpecifyAcceptHeaders()
+        {
+            // Arrange
+            _request.Content = new StringContent("test");
+            _request.Headers.Add("x-requested-with", "XMLHttpRequest");
+
+            // Act
+            var result = _negotiator.Negotiate(typeof(string), _request, new MediaTypeFormatterCollection());
+
+            // Assert
+            Assert.Equal("application/json", result.MediaType.MediaType);
+            Assert.IsType<JsonMediaTypeFormatter>(result.Formatter);
+        }
+
+        [Fact]
+        public void Negotiate_SelectsJsonFormatter_ForXHRAndJsonValueResponse()
+        {
+            // Arrange
+            _request.Content = new StringContent("test");
+            _request.Headers.Add("x-requested-with", "XMLHttpRequest");
+
+            // Act
+            // Mono issue - https://github.com/aspnet/External/issues/27
+            var type = TestPlatformHelper.IsMono ? typeof(string) : typeof(JToken);
+            var result = _negotiator.Negotiate(type, _request, new MediaTypeFormatterCollection());
+
+            Assert.Equal("application/json", result.MediaType.MediaType);
+            Assert.IsType<JsonMediaTypeFormatter>(result.Formatter);
+        }
+
+        [Fact]
+        public void Negotiate_SelectsJsonFormatter_ForXHRAndMatchAllAcceptHeader()
+        {
+            // Accept
+            _request.Content = new StringContent("test");
+            _request.Headers.Add("x-requested-with", "XMLHttpRequest");
+            _request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("*/*"));
+
+            // Act
+            var result = _negotiator.Negotiate(typeof(string), _request, new MediaTypeFormatterCollection());
+
+            // Assert
+            Assert.Equal("application/json", result.MediaType.MediaType);
+            Assert.IsType<JsonMediaTypeFormatter>(result.Formatter);
+        }
+
+        [Fact]
+        public void Negotiate_UsesRequestedFormatterForXHRAndMatchAllPlusOtherAcceptHeader()
+        {
+            // Arrange
+            _request.Content = new StringContent("test");
+            _request.Headers.Add("x-requested-with", "XMLHttpRequest");
+            _request.Headers.Accept.ParseAdd("text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"); // XHR header sent by Firefox 3b5
+
+            // Act
+            var result = _negotiator.Negotiate(typeof(string), _request, new MediaTypeFormatterCollection());
+
+            // Assert
+            Assert.Equal("application/xml", result.MediaType.MediaType);
+            Assert.IsType<XmlMediaTypeFormatter>(result.Formatter);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void Negotiate_ObservesExcludeMatchOnTypeOnly(bool excludeMatchOnTypeOnly)
+        {
+            // Arrange
+            MockContentNegotiator negotiator = new MockContentNegotiator(excludeMatchOnTypeOnly);
+            _request.Content = new StringContent("test");
+            _request.Headers.Accept.ParseAdd("text/html");
+
+            // Act
+            var result = negotiator.Negotiate(typeof(string), _request, new MediaTypeFormatterCollection());
+
+            // Assert
+            if (excludeMatchOnTypeOnly)
+            {
+                Assert.Null(result);
+            }
+            else
+            {
+                Assert.NotNull(result);
+                Assert.Equal("application/json", result.MediaType.MediaType);
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(MatchAcceptHeaderData))]
+        public void MatchAcceptHeader_ReturnsMatch(string[] acceptHeaders, string[] supportedMediaTypes, string expectedMediaType, double expectedQuality, int ranking)
+        {
+            // Arrange
+            MockContentNegotiator negotiator = new MockContentNegotiator();
+
+            List<MediaTypeWithQualityHeaderValue> unsortedAcceptHeaders = acceptHeaders.Select(a => MediaTypeWithQualityHeaderValue.Parse(a)).ToList();
+            IEnumerable<MediaTypeWithQualityHeaderValue> sortedAcceptHeaders = negotiator.SortMediaTypeWithQualityHeaderValuesByQFactor(unsortedAcceptHeaders);
+
+            MockMediaTypeFormatter formatter = new MockMediaTypeFormatter();
+            foreach (string supportedMediaType in supportedMediaTypes)
+            {
+                formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse(supportedMediaType));
+            }
+
+            // Act
+            MediaTypeFormatterMatch match = negotiator.MatchAcceptHeader(sortedAcceptHeaders, formatter);
+
+            // Assert
+            if (expectedMediaType == null)
+            {
+                Assert.Null(match);
+            }
+            else
+            {
+                Assert.Same(formatter, match.Formatter);
+                Assert.Equal(MediaTypeHeaderValue.Parse(expectedMediaType), match.MediaType);
+                Assert.Equal(expectedQuality, match.Quality);
+                Assert.Equal(ranking, (int)match.Ranking);
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(MatchRequestMediaTypeData))]
+        public void MatchRequestMediaType_ReturnsMatch(string requestMediaType, string[] supportedMediaTypes, string expectedMediaType)
+        {
+            // Arrange
+            MockContentNegotiator negotiator = new MockContentNegotiator();
+
+            HttpRequestMessage request = new HttpRequestMessage();
+            request.Content = new StringContent(String.Empty);
+            request.Content.Headers.ContentType = MediaTypeHeaderValue.Parse(requestMediaType);
+
+            MockMediaTypeFormatter formatter = new MockMediaTypeFormatter();
+            foreach (string supportedMediaType in supportedMediaTypes)
+            {
+                formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse(supportedMediaType));
+            }
+
+            // Act
+            MediaTypeFormatterMatch match = negotiator.MatchRequestMediaType(request, formatter);
+
+            // Assert
+            if (expectedMediaType == null)
+            {
+                Assert.Null(match);
+            }
+            else
+            {
+                Assert.Same(formatter, match.Formatter);
+                Assert.Equal(MediaTypeHeaderValue.Parse(expectedMediaType), match.MediaType);
+                Assert.Equal(1.0, match.Quality);
+                Assert.Equal(MediaTypeFormatterMatchRanking.MatchOnRequestMediaType, match.Ranking);
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(ShouldMatchOnTypeData))]
+        public void ShouldMatchOnType_ReturnsExpectedResult(bool excludeMatchOnType, string[] acceptHeaders, bool expectedResult)
+        {
+            // Arrange
+            MockContentNegotiator negotiator = new MockContentNegotiator(excludeMatchOnType);
+            List<MediaTypeWithQualityHeaderValue> unsortedAcceptHeaders = acceptHeaders.Select(a => MediaTypeWithQualityHeaderValue.Parse(a)).ToList();
+            IEnumerable<MediaTypeWithQualityHeaderValue> sortedAcceptHeaders = negotiator.SortMediaTypeWithQualityHeaderValuesByQFactor(unsortedAcceptHeaders);
+
+            // Act
+            bool result = negotiator.ShouldMatchOnType(sortedAcceptHeaders);
+
+            // Assert
+            Assert.Equal(expectedResult, result);
+        }
+
+        [Theory]
+        [MemberData(nameof(MatchTypeData))]
+        public void MatchType_ReturnsMatch(string[] supportedMediaTypes, string expectedMediaType)
+        {
+            // Arrange
+            MockContentNegotiator negotiator = new MockContentNegotiator();
+
+            MockMediaTypeFormatter formatter = new MockMediaTypeFormatter();
+            foreach (string supportedMediaType in supportedMediaTypes)
+            {
+                formatter.SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse(supportedMediaType));
+            }
+
+            // Act
+            MediaTypeFormatterMatch match = negotiator.MatchType(typeof(object), formatter);
+
+            // Assert
+            Assert.Same(formatter, match.Formatter);
+            Assert.Equal(MediaTypeHeaderValue.Parse(expectedMediaType), match.MediaType);
+            Assert.Equal(1.0, match.Quality);
+            Assert.Equal(MediaTypeFormatterMatchRanking.MatchOnCanWriteType, match.Ranking);
+        }
+
+        [Theory]
+        [MemberData(nameof(SelectResponseMediaTypeData))]
+        public void SelectResponseMediaTypeFormatter_SelectsMediaType(ICollection<MediaTypeFormatterMatch> matches, MediaTypeFormatterMatch expectedWinner)
+        {
+            // Arrange
+            MockContentNegotiator negotiator = new MockContentNegotiator();
+
+            // Act
+            MediaTypeFormatterMatch actualWinner = negotiator.SelectResponseMediaTypeFormatter(matches);
+
+            // Assert
+            Assert.Same(expectedWinner, actualWinner);
+        }
+
+        [Theory]
+        [MemberData(nameof(SelectResponseCharacterEncodingData))]
+        public void SelectResponseCharacterEncoding_SelectsEncoding(string[] acceptCharsetHeaders, string requestEncoding, string[] supportedEncodings, string expectedEncoding)
+        {
+            // Arrange
+            MockContentNegotiator negotiator = new MockContentNegotiator();
+
+            HttpRequestMessage request = new HttpRequestMessage();
+            foreach (string acceptCharsetHeader in acceptCharsetHeaders)
+            {
+                request.Headers.AcceptCharset.Add(StringWithQualityHeaderValue.Parse(acceptCharsetHeader));
+            }
+
+            if (requestEncoding != null)
+            {
+                Encoding reqEncoding = Encoding.GetEncoding(requestEncoding);
+                StringContent content = new StringContent("", reqEncoding, "text/plain");
+                request.Content = content;
+            }
+
+            MockMediaTypeFormatter formatter = new MockMediaTypeFormatter() { CallBase = true };
+            foreach (string supportedEncoding in supportedEncodings)
+            {
+                formatter.SupportedEncodings.Add(Encoding.GetEncoding(supportedEncoding));
+            }
+
+            // Act
+            Encoding actualEncoding = negotiator.SelectResponseCharacterEncoding(request, formatter);
+
+            // Assert
+            if (expectedEncoding == null)
+            {
+                Assert.Null(actualEncoding);
+            }
+            else
+            {
+                Assert.Equal(Encoding.GetEncoding(expectedEncoding), actualEncoding);
+            }
+        }
+
+        [Theory]
+        [TestDataSet(typeof(DefaultContentNegotiatorTests), nameof(MediaTypeWithQualityHeaderValueComparerTestsBeforeAfterSortedValues))]
+        public void SortMediaTypeWithQualityHeaderValuesByQFactor_SortsCorrectly(IEnumerable<string> unsorted, IEnumerable<string> expectedSorted)
+        {
+            // Arrange
+            MockContentNegotiator negotiator = new MockContentNegotiator();
+
+            List<MediaTypeWithQualityHeaderValue> unsortedValues =
+                new List<MediaTypeWithQualityHeaderValue>(unsorted.Select(u => MediaTypeWithQualityHeaderValue.Parse(u)));
+
+            List<MediaTypeWithQualityHeaderValue> expectedSortedValues =
+                new List<MediaTypeWithQualityHeaderValue>(expectedSorted.Select(u => MediaTypeWithQualityHeaderValue.Parse(u)));
+
+            // Act
+            IEnumerable<MediaTypeWithQualityHeaderValue> actualSorted = negotiator.SortMediaTypeWithQualityHeaderValuesByQFactor(unsortedValues);
+
+            // Assert
+            Assert.True(expectedSortedValues.SequenceEqual(actualSorted));
+        }
+
+        public static TheoryData<string[], string[]> MediaTypeWithQualityHeaderValueComparerTestsBeforeAfterSortedValues
+        {
+            get
+            {
+                return new TheoryData<string[], string[]>
+                {
+                    {
+                        new string[]
+                        {
+                            "application/*",
+                            "text/plain",
+                            "text/plain;q=1.0",
+                            "text/plain",
+                            "text/plain;q=0",
+                            "*/*;q=0.8",
+                            "*/*;q=1",
+                            "text/*;q=1",
+                            "text/plain;q=0.8",
+                            "text/*;q=0.8",
+                            "text/*;q=0.6",
+                            "text/*;q=1.0",
+                            "*/*;q=0.4",
+                            "text/plain;q=0.6",
+                            "text/xml",
+                        },
+                        new string[]
+                        {
+                            "text/plain",
+                            "text/plain;q=1.0",
+                            "text/plain",
+                            "text/xml",
+                            "application/*",
+                            "text/*;q=1",
+                            "text/*;q=1.0",
+                            "*/*;q=1",
+                            "text/plain;q=0.8",
+                            "text/*;q=0.8",
+                            "*/*;q=0.8",
+                            "text/plain;q=0.6",
+                            "text/*;q=0.6",
+                            "*/*;q=0.4",
+                            "text/plain;q=0",
+                        }
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [TestDataSet(typeof(DefaultContentNegotiatorTests), nameof(StringWithQualityHeaderValueComparerTestsBeforeAfterSortedValues))]
+        public void SortStringWithQualityHeaderValuesByQFactor_SortsCorrectly(IEnumerable<string> unsorted, IEnumerable<string> expectedSorted)
+        {
+            // Arrange
+            MockContentNegotiator negotiator = new MockContentNegotiator();
+
+            List<StringWithQualityHeaderValue> unsortedValues =
+                new List<StringWithQualityHeaderValue>(unsorted.Select(u => StringWithQualityHeaderValue.Parse(u)));
+
+            List<StringWithQualityHeaderValue> expectedSortedValues =
+                new List<StringWithQualityHeaderValue>(expectedSorted.Select(u => StringWithQualityHeaderValue.Parse(u)));
+
+            // Act
+            IEnumerable<StringWithQualityHeaderValue> actualSorted = negotiator.SortStringWithQualityHeaderValuesByQFactor(unsortedValues);
+
+            // Assert
+            Assert.True(expectedSortedValues.SequenceEqual(actualSorted));
+        }
+
+        public static TheoryData<string[], string[]> StringWithQualityHeaderValueComparerTestsBeforeAfterSortedValues
+        {
+            get
+            {
+                return new TheoryData<string[], string[]>
+                {
+                    {
+                        new string[]
+                        {
+                            "text",
+                            "text;q=1.0",
+                            "text",
+                            "text;q=0",
+                            "*;q=0.8",
+                            "*;q=1",
+                            "text;q=0.8",
+                            "*;q=0.6",
+                            "text;q=1.0",
+                            "*;q=0.4",
+                            "text;q=0.6",
+                        },
+                        new string[]
+                        {
+                            "text",
+                            "text;q=1.0",
+                            "text",
+                            "text;q=1.0",
+                            "*;q=1",
+                            "text;q=0.8",
+                            "*;q=0.8",
+                            "text;q=0.6",
+                            "*;q=0.6",
+                            "*;q=0.4",
+                            "text;q=0",
+                        }
+                    }
+                };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(UpdateBestMatchData))]
+        public void UpdateBestMatch_SelectsCorrectly(MediaTypeFormatterMatch current, MediaTypeFormatterMatch replacement, bool currentWins)
+        {
+            // Arrange
+            MockContentNegotiator negotiator = new MockContentNegotiator();
+
+            // Act
+            MediaTypeFormatterMatch actualResult = negotiator.UpdateBestMatch(current, replacement);
+
+            // Assert
+            if (currentWins)
+            {
+                Assert.Same(current, actualResult);
+            }
+            else
+            {
+                Assert.Same(replacement, actualResult);
+            }
+        }
+
+        private class PlainTextFormatter : MediaTypeFormatter
+        {
+            public override bool CanReadType(Type type)
+            {
+                return true;
+            }
+
+            public override bool CanWriteType(Type type)
+            {
+                return true;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ExceptionResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ExceptionResultTest.cs
new file mode 100644
index 0000000000..60d40dd418
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ExceptionResultTest.cs
@@ -0,0 +1,86 @@
+// 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.
+
+using System.Buffers;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace System.Web.Http
+{
+    public class ExceptionResultTest
+    {
+        [Fact]
+        public async Task ExceptionResult_SetsStatusCode()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = CreateServices();
+
+            var stream = new MemoryStream();
+            httpContext.Response.Body = stream;
+
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var result = new ExceptionResult(new Exception("hello, world!"), includeErrorDetail: false);
+
+            // Act
+            await result.ExecuteResultAsync(context);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status500InternalServerError, context.HttpContext.Response.StatusCode);
+        }
+
+        [Fact]
+        public async Task ExceptionResult_WritesHttpError()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = CreateServices();
+
+            var stream = new MemoryStream();
+            httpContext.Response.Body = stream;
+
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var result = new ExceptionResult(new Exception("hello, world!"), includeErrorDetail: false);
+
+            // Act
+            await result.ExecuteResultAsync(context);
+
+            // Assert
+            using (var reader = new StreamReader(stream))
+            {
+                stream.Seek(0, SeekOrigin.Begin);
+                var content = reader.ReadToEnd();
+                Assert.Equal("{\"Message\":\"An error has occurred.\"}", content);
+            }
+        }
+
+        private static IServiceProvider CreateServices()
+        {
+            var options = Options.Create(new MvcOptions());
+            options.Value.OutputFormatters.Add(new StringOutputFormatter());
+            options.Value.OutputFormatters.Add(new JsonOutputFormatter(
+                new JsonSerializerSettings(),
+                ArrayPool<char>.Shared));
+
+            var services = new ServiceCollection();
+            services.AddSingleton<IActionResultExecutor<ObjectResult>>(new ObjectResultExecutor(
+                new DefaultOutputFormatterSelector(options, NullLoggerFactory.Instance),
+                new TestHttpResponseStreamWriterFactory(),
+                NullLoggerFactory.Instance));
+
+            return services.BuildServiceProvider();
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/FormDataCollectionExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/FormDataCollectionExtensionsTest.cs
new file mode 100644
index 0000000000..6a3c874e57
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/FormDataCollectionExtensionsTest.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System.Linq;
+using System.Net.Http.Formatting;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    public class FormDataCollectionExtensionsTest
+    {
+        [Theory]
+        [InlineData("", null)]
+        [InlineData("", "")] // empty
+        [InlineData("x", "x")] // normal key
+        [InlineData("", "[]")] // trim []
+        [InlineData("x", "x[]")] // trim []
+        [InlineData("x[234]", "x[234]")] // array index
+        [InlineData("x.y", "x[y]")] // field lookup
+        [InlineData("x.y.z", "x[y][z]")] // nested field lookup
+        [InlineData("x.y[234].x", "x[y][234][x]")] // compound
+        public void TestNormalize(string expectedMvc, string jqueryString)
+        {
+            Assert.Equal(expectedMvc, FormDataCollectionExtensions.NormalizeJQueryToMvc(jqueryString));
+        }
+
+        [Fact]
+        public void TestGetJQueryNameValuePairs()
+        {
+            // Arrange
+            var formData = new FormDataCollection("x.y=30&x[y]=70&x[z][20]=cool");
+
+            // Act
+            var actual = FormDataCollectionExtensions.GetJQueryNameValuePairs(formData).ToArray();
+
+            // Assert
+            var arraySetter = Assert.Single(actual, kvp => kvp.Key == "x.z[20]");
+            Assert.Equal("cool", arraySetter.Value);
+
+            Assert.Single(actual, kvp => kvp.Key == "x.y" && kvp.Value == "30");
+            Assert.Single(actual, kvp => kvp.Key == "x.y" && kvp.Value == "70");
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpErrorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpErrorTest.cs
new file mode 100644
index 0000000000..d509511d4d
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpErrorTest.cs
@@ -0,0 +1,304 @@
+// 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.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http.Formatting;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Testing.xunit;
+using Newtonsoft.Json.Linq;
+using Xunit;
+
+namespace System.Web.Http.Dispatcher
+{
+    public class HttpErrorTest
+    {
+        public static IEnumerable<object[]> ErrorKeyValue
+        {
+            get
+            {
+                var httpError = new HttpError();
+                yield return new object[] { httpError, (Func<string>)(() => httpError.Message), "Message", "Message_Value" };
+                yield return new object[] { httpError, (Func<string>)(() => httpError.MessageDetail), "MessageDetail", "MessageDetail_Value" };
+                yield return new object[] { httpError, (Func<string>)(() => httpError.ExceptionMessage), "ExceptionMessage", "ExceptionMessage_Value" };
+                yield return new object[] { httpError, (Func<string>)(() => httpError.ExceptionType), "ExceptionType", "ExceptionType_Value" };
+                yield return new object[] { httpError, (Func<string>)(() => httpError.StackTrace), "StackTrace", "StackTrace_Value" };
+            }
+        }
+
+        public static IEnumerable<object[]> HttpErrors
+        {
+            get
+            {
+                yield return new[] { new HttpError() };
+                yield return new[] { new HttpError("error") };
+                yield return new[] { new HttpError(new NotImplementedException(), true) };
+
+                var modelState = new ModelStateDictionary();
+                modelState.AddModelError("key", "error");
+                yield return new[] { new HttpError(modelState, true) };
+            }
+        }
+
+        [Fact]
+        public void StringConstructor_AddsCorrectDictionaryItems()
+        {
+            HttpError error = new HttpError("something bad happened");
+
+            Assert.Contains(new KeyValuePair<string, object>("Message", "something bad happened"), error);
+        }
+
+        [Fact]
+        public void ExceptionConstructorWithDetail_AddsCorrectDictionaryItems()
+        {
+            HttpError error = new HttpError(new ArgumentException("error", new Exception()), true);
+
+            Assert.Contains(new KeyValuePair<string, object>("Message", "An error has occurred."), error);
+            Assert.Contains(new KeyValuePair<string, object>("ExceptionMessage", "error"), error);
+            Assert.Contains(new KeyValuePair<string, object>("ExceptionType", "System.ArgumentException"), error);
+            Assert.True(error.ContainsKey("StackTrace"));
+            Assert.True(error.ContainsKey("InnerException"));
+            Assert.IsType<HttpError>(error["InnerException"]);
+        }
+
+        [Fact]
+        public void ModelStateConstructorWithDetail_AddsCorrectDictionaryItems()
+        {
+            // Arrange
+            ModelStateDictionary modelState = new ModelStateDictionary();
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), nameof(string.Length));
+            modelState.AddModelError("[0].Name", "error1");
+            modelState.AddModelError("[0].Name", "error2");
+            modelState.AddModelError("[0].Address", "error");
+            modelState.AddModelError("[2].Name", new Exception("OH NO"), metadata);
+
+            // Act
+            HttpError error = new HttpError(modelState, true);
+
+            // Assert
+            HttpError modelStateError = error["ModelState"] as HttpError;
+
+            Assert.Contains(new KeyValuePair<string, object>("Message", "The request is invalid."), error);
+            Assert.Contains("error1", modelStateError["[0].Name"] as IEnumerable<string>);
+            Assert.Contains("error2", modelStateError["[0].Name"] as IEnumerable<string>);
+            Assert.Contains("error", modelStateError["[0].Address"] as IEnumerable<string>);
+            Assert.True(modelStateError.ContainsKey("[2].Name"));
+            Assert.Contains("OH NO", modelStateError["[2].Name"] as IEnumerable<string>);
+        }
+
+        [Fact]
+        public void ExceptionConstructorWithoutDetail_AddsCorrectDictionaryItems()
+        {
+            HttpError error = new HttpError(new ArgumentException("error", new Exception()), false);
+
+            Assert.Contains(new KeyValuePair<string, object>("Message", "An error has occurred."), error);
+            Assert.False(error.ContainsKey("ExceptionMessage"));
+            Assert.False(error.ContainsKey("ExceptionType"));
+            Assert.False(error.ContainsKey("StackTrace"));
+            Assert.False(error.ContainsKey("InnerException"));
+        }
+
+        [Fact]
+        public void ModelStateConstructorWithoutDetail_AddsCorrectDictionaryItems()
+        {
+            // Arrange
+            ModelStateDictionary modelState = new ModelStateDictionary();
+            var provider = new EmptyModelMetadataProvider();
+            var metadata = provider.GetMetadataForProperty(typeof(string), nameof(string.Length));
+            modelState.AddModelError("[0].Name", "error1");
+            modelState.AddModelError("[0].Name", "error2");
+            modelState.AddModelError("[0].Address", "error");
+            modelState.AddModelError("[2].Name", new Exception("OH NO"), metadata);
+
+            // Act
+            HttpError error = new HttpError(modelState, false);
+
+            // Assert
+            HttpError modelStateError = error["ModelState"] as HttpError;
+
+            Assert.Contains(new KeyValuePair<string, object>("Message", "The request is invalid."), error);
+            Assert.Contains("error1", modelStateError["[0].Name"] as IEnumerable<string>);
+            Assert.Contains("error2", modelStateError["[0].Name"] as IEnumerable<string>);
+            Assert.Contains("error", modelStateError["[0].Address"] as IEnumerable<string>);
+            Assert.True(modelStateError.ContainsKey("[2].Name"));
+            Assert.DoesNotContain("OH NO", modelStateError["[2].Name"] as IEnumerable<string>);
+        }
+
+        [Fact]
+        public void HttpError_Roundtrips_WithJsonFormatter()
+        {
+            HttpError error = new HttpError("error") { { "ErrorCode", 42 }, { "Data", new[] { "a", "b", "c" } } };
+            MediaTypeFormatter formatter = new JsonMediaTypeFormatter();
+            MemoryStream stream = new MemoryStream();
+
+            formatter.WriteToStreamAsync(typeof(HttpError), error, stream, content: null, transportContext: null).Wait();
+            stream.Position = 0;
+            HttpError roundtrippedError = formatter.ReadFromStreamAsync(typeof(HttpError), stream, content: null, formatterLogger: null).Result as HttpError;
+
+            Assert.NotNull(roundtrippedError);
+            Assert.Equal("error", roundtrippedError.Message);
+            Assert.Equal(42L, roundtrippedError["ErrorCode"]);
+            JArray data = roundtrippedError["Data"] as JArray;
+            Assert.Equal(3, data.Count);
+            Assert.Contains("a", data);
+            Assert.Contains("b", data);
+            Assert.Contains("c", data);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/25
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public void HttpError_Roundtrips_WithXmlFormatter()
+        {
+            HttpError error = new HttpError("error") { { "ErrorCode", 42 }, { "Data", new[] { "a", "b", "c" } } };
+            MediaTypeFormatter formatter = new XmlMediaTypeFormatter();
+            MemoryStream stream = new MemoryStream();
+
+            formatter.WriteToStreamAsync(typeof(HttpError), error, stream, content: null, transportContext: null).Wait();
+            stream.Position = 0;
+            HttpError roundtrippedError = formatter.ReadFromStreamAsync(typeof(HttpError), stream, content: null, formatterLogger: null).Result as HttpError;
+
+            Assert.NotNull(roundtrippedError);
+            Assert.Equal("error", roundtrippedError.Message);
+            Assert.Equal("42", roundtrippedError["ErrorCode"]);
+            Assert.Equal("a b c", roundtrippedError["Data"]);
+        }
+
+        [Fact]
+        public void HttpErrorWithWhitespace_Roundtrips_WithXmlFormatter()
+        {
+            string message = "  foo\n bar  \n ";
+            HttpError error = new HttpError(message);
+            MediaTypeFormatter formatter = new XmlMediaTypeFormatter();
+            MemoryStream stream = new MemoryStream();
+
+            formatter.WriteToStreamAsync(typeof(HttpError), error, stream, content: null, transportContext: null).Wait();
+            stream.Position = 0;
+            HttpError roundtrippedError = formatter.ReadFromStreamAsync(typeof(HttpError), stream, content: null, formatterLogger: null).Result as HttpError;
+
+            Assert.NotNull(roundtrippedError);
+            Assert.Equal(message, roundtrippedError.Message);
+        }
+
+        [Fact]
+        public void HttpError_Roundtrips_WithXmlSerializer()
+        {
+            HttpError error = new HttpError("error") { { "ErrorCode", 42 }, { "Data", new[] { "a", "b", "c" } } };
+            MediaTypeFormatter formatter = new XmlMediaTypeFormatter() { UseXmlSerializer = true };
+            MemoryStream stream = new MemoryStream();
+
+            formatter.WriteToStreamAsync(typeof(HttpError), error, stream, content: null, transportContext: null).Wait();
+            stream.Position = 0;
+            HttpError roundtrippedError = formatter.ReadFromStreamAsync(typeof(HttpError), stream, content: null, formatterLogger: null).Result as HttpError;
+
+            Assert.NotNull(roundtrippedError);
+            Assert.Equal("error", roundtrippedError.Message);
+            Assert.Equal("42", roundtrippedError["ErrorCode"]);
+            Assert.Equal("a b c", roundtrippedError["Data"]);
+        }
+
+        [Fact]
+        public void HttpErrorForInnerException_Serializes_WithXmlSerializer()
+        {
+            HttpError error = new HttpError(new ArgumentException("error", new Exception("innerError")), includeErrorDetail: true);
+            MediaTypeFormatter formatter = new XmlMediaTypeFormatter() { UseXmlSerializer = true };
+            MemoryStream stream = new MemoryStream();
+
+            formatter.WriteToStreamAsync(typeof(HttpError), error, stream, content: null, transportContext: null).Wait();
+            stream.Position = 0;
+            string serializedError = new StreamReader(stream).ReadToEnd();
+
+            Assert.NotNull(serializedError);
+            Assert.Equal(
+                "<Error><Message>An error has occurred.</Message><ExceptionMessage>error</ExceptionMessage><ExceptionType>System.ArgumentException</ExceptionType><StackTrace /><InnerException><Message>An error has occurred.</Message><ExceptionMessage>innerError</ExceptionMessage><ExceptionType>System.Exception</ExceptionType><StackTrace /></InnerException></Error>",
+                serializedError);
+        }
+
+        [Fact]
+        public void GetPropertyValue_GetsValue_IfTypeMatches()
+        {
+            HttpError error = new HttpError();
+            error["key"] = "x";
+
+            Assert.Equal("x", error.GetPropertyValue<string>("key"));
+            Assert.Equal("x", error.GetPropertyValue<object>("key"));
+        }
+
+        [Fact]
+        public void GetPropertyValue_GetsDefault_IfTypeDoesNotMatch()
+        {
+            HttpError error = new HttpError();
+            error["key"] = "x";
+
+            Assert.Null(error.GetPropertyValue<Uri>("key"));
+            Assert.Equal(0, error.GetPropertyValue<int>("key"));
+        }
+
+        [Fact]
+        public void GetPropertyValue_GetsDefault_IfPropertyMissing()
+        {
+            HttpError error = new HttpError();
+
+            Assert.Null(error.GetPropertyValue<string>("key"));
+            Assert.Equal(0, error.GetPropertyValue<int>("key"));
+        }
+
+        [Theory]
+        [MemberData(nameof(ErrorKeyValue))]
+        public void HttpErrorStringProperties_UseCorrectHttpErrorKey(HttpError httpError, Func<string> productUnderTest, string key, string actualValue)
+        {
+            // Arrange
+            httpError[key] = actualValue;
+
+            // Act
+            string expectedValue = productUnderTest.Invoke();
+
+            // Assert
+            Assert.Equal(expectedValue, actualValue);
+        }
+
+        [Fact]
+        public void HttpErrorProperty_InnerException_UsesCorrectHttpErrorKey()
+        {
+            // Arrange
+            HttpError error = new HttpError(new ArgumentException("error", new Exception()), true);
+
+            // Act
+            HttpError innerException = error.InnerException;
+
+            // Assert
+            Assert.Same(error["InnerException"], innerException);
+        }
+
+        [Fact]
+        public void HttpErrorProperty_ModelState_UsesCorrectHttpErrorKey()
+        {
+            // Arrange
+            ModelStateDictionary modelState = new ModelStateDictionary();
+            modelState.AddModelError("[0].Name", "error1");
+            HttpError error = new HttpError(modelState, true);
+
+            // Act
+            HttpError actualModelStateError = error.ModelState;
+
+            // Assert
+            Assert.Same(error["ModelState"], actualModelStateError);
+        }
+
+        [Theory]
+        [MemberData(nameof(HttpErrors))]
+        public void HttpErrors_UseCaseInsensitiveComparer(HttpError httpError)
+        {
+            // Arrange
+            var lowercaseKey = "abcd";
+            var uppercaseKey = "ABCD";
+
+            httpError[lowercaseKey] = "error";
+
+            // Act & Assert
+            Assert.True(httpError.ContainsKey(lowercaseKey));
+            Assert.True(httpError.ContainsKey(uppercaseKey));
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs
new file mode 100644
index 0000000000..47006be50b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs
@@ -0,0 +1,326 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Net.Http.Formatting;
+using System.Net.Http.Headers;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.WebApiCompatShim;
+using Microsoft.AspNetCore.Testing;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace System.Net.Http
+{
+    public class HttpRequestMessageExtensionsTest
+    {
+        [Fact]
+        public void CreateResponse_MatchingMediaType_WhenMediaTypeStringIsInvalidFormat_Throws()
+        {
+            HttpRequestMessage request = CreateRequest(new DefaultHttpContext());
+
+            var ex = Assert.Throws<FormatException>(
+                () => request.CreateResponse(HttpStatusCode.OK, CreateValue(), "foo/bar; param=value"));
+
+            Assert.Contains("foo/bar; param=value", ex.Message);
+        }
+
+        [Fact]
+        public void CreateResponse_MatchingMediaType_WhenRequestDoesNotHaveHttpContextThrows()
+        {
+            HttpRequestMessage request = CreateRequest(null);
+
+            // Arrange
+
+            // Act
+            var ex = Assert.Throws<InvalidOperationException>(
+                () => request.CreateResponse(HttpStatusCode.OK, CreateValue(), mediaType: "foo/bar"));
+
+            Assert.Equal(
+                "The HttpRequestMessage instance is not properly initialized. " +
+                "Use HttpRequestMessageHttpContextExtensions.GetHttpRequestMessage to create an HttpRequestMessage " +
+                "for the current request.",
+                ex.Message);
+        }
+
+        [Fact]
+        public void CreateResponse_DoingConneg_OnlyContent_RetrievesContentNegotiatorFromServices()
+        {
+            // Arrange
+            var context = new DefaultHttpContext();
+
+            var services = new Mock<IServiceProvider>();
+            services
+                .Setup(s => s.GetService(typeof(IContentNegotiator)))
+                .Returns(Mock.Of<IContentNegotiator>())
+                .Verifiable();
+
+            var options = new WebApiCompatShimOptions();
+            options.Formatters.AddRange(new MediaTypeFormatterCollection());
+
+            var optionsAccessor = new Mock<IOptions<WebApiCompatShimOptions>>();
+            optionsAccessor.SetupGet(o => o.Value).Returns(options);
+
+            services
+                .Setup(s => s.GetService(typeof(IOptions<WebApiCompatShimOptions>)))
+                .Returns(optionsAccessor.Object);
+
+            context.RequestServices = services.Object;
+
+            var request = CreateRequest(context);
+
+            // Act
+            request.CreateResponse(CreateValue());
+
+            // Assert
+            services.Verify();
+        }
+
+        [Fact]
+        public void CreateResponse_DoingConneg_RetrievesContentNegotiatorFromServices()
+        {
+            // Arrange
+            var context = new DefaultHttpContext();
+
+            var services = new Mock<IServiceProvider>();
+            services
+                .Setup(s => s.GetService(typeof(IContentNegotiator)))
+                .Returns(Mock.Of<IContentNegotiator>())
+                .Verifiable();
+
+            var options = new WebApiCompatShimOptions();
+            options.Formatters.AddRange(new MediaTypeFormatterCollection());
+
+            var optionsAccessor = new Mock<IOptions<WebApiCompatShimOptions>>();
+            optionsAccessor.SetupGet(o => o.Value).Returns(options);
+
+            services
+                .Setup(s => s.GetService(typeof(IOptions<WebApiCompatShimOptions>)))
+                .Returns(optionsAccessor.Object);
+
+            context.RequestServices = services.Object;
+
+            var request = CreateRequest(context);
+
+            // Act
+            request.CreateResponse(HttpStatusCode.OK, CreateValue());
+
+            // Assert
+            services.Verify();
+        }
+
+        [Fact]
+        public void CreateResponse_DoingConneg_PerformsContentNegotiationAndCreatesContentUsingResults()
+        {
+            // Arrange
+            var context = new DefaultHttpContext();
+
+            var formatter = new XmlMediaTypeFormatter();
+
+            var contentNegotiator = new Mock<IContentNegotiator>();
+            contentNegotiator
+                .Setup(c => c.Negotiate(It.IsAny<Type>(), It.IsAny<HttpRequestMessage>(), It.IsAny<IEnumerable<MediaTypeFormatter>>()))
+                .Returns(new ContentNegotiationResult(formatter, mediaType: null));
+
+            context.RequestServices = CreateServices(contentNegotiator.Object, formatter);
+
+            var request = CreateRequest(context);
+
+            // Act
+            var response = request.CreateResponse<string>(HttpStatusCode.NoContent, "42");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
+            Assert.Same(request, response.RequestMessage);
+
+            var objectContent = Assert.IsType<ObjectContent<string>>(response.Content);
+            Assert.Equal("42", objectContent.Value);
+            Assert.Same(formatter, objectContent.Formatter);
+        }
+
+        [Fact]
+        public void CreateResponse_MatchingMediaType_WhenMediaTypeDoesNotMatch_Throws()
+        {
+            // Arrange
+            var context = new DefaultHttpContext();
+            context.RequestServices = CreateServices(new DefaultContentNegotiator());
+
+            var request = CreateRequest(context);
+
+            // Act
+            var ex = Assert.Throws<InvalidOperationException>(
+                () => request.CreateResponse(HttpStatusCode.OK, CreateValue(), mediaType: "foo/bar"));
+            Assert.Equal(
+                "Could not find a formatter matching the media type 'foo/bar' that can write an instance of 'System.Object'.",
+                ex.Message);
+        }
+
+        [Fact]
+        public void CreateResponse_MatchingMediaType_FindsMatchingFormatterAndCreatesResponse()
+        {
+            // Arrange
+            var context = new DefaultHttpContext();
+
+            var formatter = new Mock<MediaTypeFormatter> { CallBase = true };
+            formatter.Setup(f => f.CanWriteType(typeof(object))).Returns(true).Verifiable();
+            formatter.Object.SupportedMediaTypes.Add(new MediaTypeHeaderValue("foo/bar"));
+
+            context.RequestServices = CreateServices(new DefaultContentNegotiator(), formatter.Object);
+
+            var expectedValue = CreateValue();
+
+            var request = CreateRequest(context);
+
+            // Act
+            var response = request.CreateResponse(HttpStatusCode.Gone, expectedValue, mediaType: "foo/bar");
+
+            // Assert
+            Assert.Equal(HttpStatusCode.Gone, response.StatusCode);
+            var content = Assert.IsType<ObjectContent<object>>(response.Content);
+            Assert.Same(expectedValue, content.Value);
+            Assert.Same(formatter.Object, content.Formatter);
+            Assert.Equal("foo/bar", content.Headers.ContentType.MediaType);
+            formatter.Verify();
+        }
+
+        [Fact]
+        public void CreateResponse_AcceptingFormatter_CreatesResponseWithDefaultMediaType()
+        {
+            // Arrange
+            var context = new DefaultHttpContext();
+
+            var formatter = new Mock<MediaTypeFormatter>() { CallBase = true };
+            formatter
+                .Setup(f => f.CanWriteType(typeof(object)))
+                .Returns(true)
+                .Verifiable();
+            formatter
+                .Setup(f => f.SetDefaultContentHeaders(typeof(object), It.IsAny<HttpContentHeaders>(), It.IsAny<MediaTypeHeaderValue>()))
+                .Callback<Type, HttpContentHeaders, MediaTypeHeaderValue>(SetMediaType)
+                .Verifiable();
+
+            formatter.Object.SupportedMediaTypes.Add(new MediaTypeHeaderValue("foo/bar"));
+
+            var expectedValue = CreateValue();
+
+            var request = CreateRequest(context);
+
+            // Act
+            var response = request.CreateResponse(
+                HttpStatusCode.MultipleChoices,
+                expectedValue,
+                formatter.Object,
+                mediaType: (string)null);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.MultipleChoices, response.StatusCode);
+            var content = Assert.IsType<ObjectContent<object>>(response.Content);
+            Assert.Same(expectedValue, content.Value);
+            Assert.Same(formatter.Object, content.Formatter);
+            Assert.Equal("foo/bar", content.Headers.ContentType.MediaType);
+
+            formatter.Verify();
+        }
+
+        private static void SetMediaType(Type type, HttpContentHeaders headers, MediaTypeHeaderValue value)
+        {
+            headers.ContentType = new MediaTypeHeaderValue("foo/bar");
+        }
+
+        [Fact]
+        public void CreateResponse_AcceptingFormatter_WithOverridenMediaTypeString_CreatesResponse()
+        {
+            // Arrange
+            var context = new DefaultHttpContext();
+
+            var formatter = new Mock<MediaTypeFormatter> { CallBase = true };
+            formatter.Setup(f => f.CanWriteType(typeof(object))).Returns(true).Verifiable();
+            formatter.Object.SupportedMediaTypes.Add(new MediaTypeHeaderValue("foo/bar"));
+
+            var expectedValue = CreateValue();
+
+            var request = CreateRequest(context);
+
+            // Act
+            var response = request.CreateResponse(
+                HttpStatusCode.MultipleChoices,
+                CreateValue(),
+                formatter.Object,
+                mediaType: "bin/baz");
+
+            // Assert
+            Assert.Equal("bin/baz", response.Content.Headers.ContentType.MediaType);
+        }
+
+        [Fact]
+        public void CreateResponse_AcceptingFormatter_WithOverridenMediaTypeHeader_CreatesResponse()
+        {
+            // Arrange
+            var context = new DefaultHttpContext();
+
+            var formatter = new Mock<MediaTypeFormatter> { CallBase = true };
+            formatter.Setup(f => f.CanWriteType(typeof(object))).Returns(true).Verifiable();
+            formatter.Object.SupportedMediaTypes.Add(new MediaTypeHeaderValue("foo/bar"));
+
+            var expectedValue = CreateValue();
+
+            var request = CreateRequest(context);
+
+            // Act
+            var response = request.CreateResponse(
+                HttpStatusCode.MultipleChoices,
+                CreateValue(),
+                formatter.Object,
+                mediaType: new MediaTypeHeaderValue("bin/baz"));
+
+            // Assert
+            Assert.Equal("bin/baz", response.Content.Headers.ContentType.MediaType);
+        }
+
+        private static IServiceProvider CreateServices(
+            IContentNegotiator contentNegotiator = null,
+            MediaTypeFormatter formatter = null)
+        {
+            var options = new WebApiCompatShimOptions();
+
+            if (formatter == null)
+            {
+                options.Formatters.AddRange(new MediaTypeFormatterCollection());
+            }
+            else
+            {
+                options.Formatters.Add(formatter);
+            }
+
+            var optionsAccessor = new Mock<IOptions<WebApiCompatShimOptions>>();
+            optionsAccessor.SetupGet(o => o.Value).Returns(options);
+
+            var services = new Mock<IServiceProvider>(MockBehavior.Strict);
+            services
+                .Setup(s => s.GetService(typeof(IOptions<WebApiCompatShimOptions>)))
+                .Returns(optionsAccessor.Object);
+
+            if (contentNegotiator != null)
+            {
+                services
+                    .Setup(s => s.GetService(typeof(IContentNegotiator)))
+                    .Returns(contentNegotiator);
+            }
+
+            return services.Object;
+        }
+
+        private static object CreateValue()
+        {
+            return new object();
+        }
+
+        private static HttpRequestMessage CreateRequest(HttpContext context)
+        {
+            var request = new HttpRequestMessage();
+            request.Properties.Add(nameof(HttpContext), context);
+            return request;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageFeatureTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageFeatureTest.cs
new file mode 100644
index 0000000000..513f75c27e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageFeatureTest.cs
@@ -0,0 +1,136 @@
+// 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.
+
+using System.IO;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Testing.xunit;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    public class HttpRequestMessageFeatureTest
+    {
+        [Fact]
+        public void HttpRequestMessage_CombinesUri()
+        {
+            // Arrange
+            var context = new DefaultHttpContext();
+            var feature = new HttpRequestMessageFeature(context);
+
+            context.Request.Method = "GET";
+
+            context.Request.Scheme = "http";
+            context.Request.Host = new HostString("contoso.com");
+            context.Request.PathBase = new PathString("/app");
+            context.Request.Path = new PathString("/api/Products");
+            context.Request.QueryString = new QueryString("?orderId=3");
+
+            // Act
+            var request = feature.HttpRequestMessage;
+
+            // Assert
+            Assert.Equal("http://contoso.com/app/api/Products?orderId=3", request.RequestUri.AbsoluteUri);
+        }
+
+        [Fact]
+        public void HttpRequestMessage_CopiesRequestMethod()
+        {
+            // Arrange
+            var context = new DefaultHttpContext();
+            var feature = new HttpRequestMessageFeature(context);
+
+            context.Request.Method = "OPTIONS";
+
+            // Act
+            var request = feature.HttpRequestMessage;
+
+            // Assert
+            Assert.Equal(new HttpMethod("OPTIONS"), request.Method);
+        }
+
+        [ConditionalFact]
+        // Mono issue - https://github.com/aspnet/External/issues/24
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public void HttpRequestMessage_CopiesHeader()
+        {
+            // Arrange
+            var context = new DefaultHttpContext();
+            var feature = new HttpRequestMessageFeature(context);
+
+            context.Request.Method = "OPTIONS";
+
+            context.Request.Headers.Add("Host", new string[] { "contoso.com" });
+
+            // Act
+            var request = feature.HttpRequestMessage;
+
+            // Assert
+            Assert.Equal("contoso.com", request.Headers.Host);
+        }
+
+        [Fact]
+        public void HttpRequestMessage_CopiesContentHeader()
+        {
+            // Arrange
+            var context = new DefaultHttpContext();
+            var feature = new HttpRequestMessageFeature(context);
+
+            context.Request.Method = "OPTIONS";
+
+            context.Request.Headers.Add("Content-Type", new string[] { "text/plain" });
+
+            // Act
+            var request = feature.HttpRequestMessage;
+
+            // Assert
+            Assert.Equal("text/plain", request.Content.Headers.ContentType.ToString());
+        }
+
+        [Fact]
+        public async Task HttpRequestMessage_WrapsBodyContent()
+        {
+            // Arrange
+            var context = new DefaultHttpContext();
+            var feature = new HttpRequestMessageFeature(context);
+
+            context.Request.Method = "OPTIONS";
+
+            var bytes = Encoding.UTF8.GetBytes("Hello, world!");
+            context.Request.Body = new MemoryStream(bytes);
+            context.Request.Body.Seek(0, SeekOrigin.Begin);
+
+            // Act
+            var request = feature.HttpRequestMessage;
+
+            // Assert
+            var streamContent = Assert.IsType<StreamContent>(request.Content);
+            var content = await request.Content.ReadAsStringAsync();
+            Assert.Equal("Hello, world!", content);
+        }
+
+        [Fact]
+        public void HttpRequestMessage_CachesMessage()
+        {
+            // Arrange
+            var context = new DefaultHttpContext();
+            var feature = new HttpRequestMessageFeature(context);
+
+            context.Request.Method = "GET";
+            context.Request.Scheme = "http";
+            context.Request.Host = new HostString("contoso.com");
+
+            // Act
+            var request1 = feature.HttpRequestMessage;
+
+            context.Request.Path = new PathString("/api/Products");
+            var request2 = feature.HttpRequestMessage;
+
+            // Assert
+            Assert.Same(request1, request2);
+            Assert.Equal("/", request2.RequestUri.AbsolutePath);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageModelBinderTest.cs
new file mode 100644
index 0000000000..13dd4cab89
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageModelBinderTest.cs
@@ -0,0 +1,57 @@
+// 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.
+
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    public class HttpRequestMessageModelBinderTest
+    {
+        [Fact]
+        public async Task BindModelAsync_BindsHttpRequestMessage()
+        {
+            // Arrange
+            var binder = new HttpRequestMessageModelBinder();
+            var bindingContext = GetBindingContext(typeof(HttpRequestMessage));
+            var expectedModel = bindingContext.HttpContext.GetHttpRequestMessage();
+
+            // Act
+            await binder.BindModelAsync(bindingContext);
+
+            // Assert
+            var result = bindingContext.Result;
+            Assert.True(result.IsModelSet);
+            Assert.Same(expectedModel, result.Model);
+
+            var entry = bindingContext.ValidationState[result.Model];
+            Assert.True(entry.SuppressValidation);
+            Assert.Null(entry.Key);
+            Assert.Null(entry.Metadata);
+        }
+
+        private static DefaultModelBindingContext GetBindingContext(Type modelType)
+        {
+            var metadataProvider = new EmptyModelMetadataProvider();
+            DefaultModelBindingContext bindingContext = new DefaultModelBindingContext
+            {
+                ActionContext = new ActionContext()
+                {
+                    HttpContext = new DefaultHttpContext(),
+                },
+                ModelMetadata = metadataProvider.GetMetadataForType(modelType),
+                ModelName = "someName",
+                ValidationState = new ValidationStateDictionary(),
+            };
+
+            bindingContext.HttpContext.Request.Method = "GET";
+
+            return bindingContext;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs
new file mode 100644
index 0000000000..b4c79b0cac
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs
@@ -0,0 +1,87 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    public class HttpResponseExceptionActionFilterTest
+    {
+        [Fact]
+        public void OrderIsSetToMaxValue()
+        {
+            // Arrange
+            var filter = new HttpResponseExceptionActionFilter();
+            var expectedFilterOrder = int.MaxValue - 10;
+
+            // Act & Assert
+            Assert.Equal(expectedFilterOrder, filter.Order);
+        }
+
+        [Fact]
+        public void OnActionExecuting_IsNoOp()
+        {
+            // Arrange
+            var filter = new HttpResponseExceptionActionFilter();
+
+            var actionContext = new ActionContext(
+                                new DefaultHttpContext(),
+                                new RouteData(),
+                                Mock.Of<ActionDescriptor>());
+
+            var context = new ActionExecutingContext(
+                actionContext,
+                filters: new List<IFilterMetadata>(),
+                actionArguments: new Dictionary<string, object>(),
+                controller: new object());
+
+            // Act
+            filter.OnActionExecuting(context);
+
+            // Assert
+            Assert.Null(context.Result);
+        }
+
+        [Fact]
+        public void OnActionExecuted_HandlesExceptionAndReturnsObjectResult()
+        {
+            // Arrange
+            var filter = new HttpResponseExceptionActionFilter();
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Method = "GET";
+
+            var actionContext = new ActionContext(
+                                httpContext,
+                                new RouteData(),
+                                Mock.Of<ActionDescriptor>());
+
+            var context = new ActionExecutedContext(
+                actionContext,
+                filters: new List<IFilterMetadata>(),
+                controller: new object());
+
+            context.Exception = new HttpResponseException(HttpStatusCode.BadRequest);
+
+            // Act
+            filter.OnActionExecuted(context);
+
+            // Assert
+            Assert.True(context.ExceptionHandled);
+            var result = Assert.IsType<ObjectResult>(context.Result);
+            Assert.Equal(typeof(HttpResponseMessage), result.DeclaredType);
+            var response = Assert.IsType<HttpResponseMessage>(result.Value);
+            Assert.NotNull(response.RequestMessage);
+            Assert.Equal(context.HttpContext.GetHttpRequestMessage(), response.RequestMessage);
+            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpResponseExceptionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpResponseExceptionTest.cs
new file mode 100644
index 0000000000..2b34cd1f87
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpResponseExceptionTest.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using Microsoft.AspNetCore.Testing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    public class HttpResponseExceptionTest
+    {
+        [Fact]
+        [ReplaceCulture]
+        public void Constructor_SetsResponseProperty()
+        {
+            // Arrange and Act
+            var response = new HttpResponseMessage();
+            var exception = new HttpResponseException(response);
+
+            // Assert
+            Assert.Same(response, exception.Response);
+            Assert.Equal("Processing of the HTTP request resulted in an exception." +
+                         " Please see the HTTP response returned by the 'Response' " +
+                         "property of this exception for details.",
+                         exception.Message);
+        }
+
+        [Fact]
+        [ReplaceCulture]
+        public void Constructor_SetsResponsePropertyWithGivenStatusCode()
+        {
+            // Arrange and Act
+            var exception = new HttpResponseException(HttpStatusCode.BadGateway);
+
+            // Assert
+            Assert.Equal(HttpStatusCode.BadGateway, exception.Response.StatusCode);
+            Assert.Equal("Processing of the HTTP request resulted in an exception." +
+                         " Please see the HTTP response returned by the 'Response' " +
+                         "property of this exception for details.",
+                         exception.Message);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpResponseMessageOutputFormatterTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpResponseMessageOutputFormatterTests.cs
new file mode 100644
index 0000000000..82e3122b10
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpResponseMessageOutputFormatterTests.cs
@@ -0,0 +1,158 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.WebApiCompatShim;
+using Microsoft.AspNetCore.Testing.xunit;
+using Moq;
+using Moq.Protected;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShimTest
+{
+    public class HttpResponseMessageOutputFormatterTests
+    {
+        [Fact]
+        public async Task Disposed_CalledOn_HttpResponseMessage()
+        {
+            // Arrange
+            var formatter = new HttpResponseMessageOutputFormatter();
+            var streamContent = new Mock<StreamContent>(new MemoryStream());
+            streamContent.Protected().Setup("Dispose", true).Verifiable();
+            var httpResponseMessage = new HttpResponseMessage();
+            httpResponseMessage.Content = streamContent.Object;
+            var outputFormatterContext = GetOutputFormatterContext(
+                httpResponseMessage,
+                typeof(HttpResponseMessage),
+                new DefaultHttpContext());
+
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            streamContent.Protected().Verify("Dispose", Times.Once(), true);
+        }
+
+        [ConditionalFact]
+        // Issue - https://github.com/aspnet/External/issues/20
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task ExplicitlySet_ChunkedEncodingFlag_IsIgnored()
+        {
+            // Arrange
+            var httpResponseMessage = new HttpResponseMessage();
+            httpResponseMessage.Content = new StreamContent(new MemoryStream(Encoding.UTF8.GetBytes("Hello, World")));
+            httpResponseMessage.Headers.TransferEncodingChunked = true;
+
+            var httpContext = new DefaultHttpContext();
+            var formatter = new HttpResponseMessageOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(
+                httpResponseMessage,
+                typeof(HttpResponseMessage),
+                httpContext);
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            Assert.False(httpContext.Response.Headers.ContainsKey("Transfer-Encoding"));
+            Assert.NotNull(httpContext.Response.ContentLength);
+        }
+
+        [ConditionalFact]
+        // Issue - https://github.com/aspnet/External/issues/20
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task ExplicitlySet_ChunkedEncodingHeader_IsIgnored()
+        {
+            // Arrange
+            var transferEncodingHeaderKey = "Transfer-Encoding";
+            var httpResponseMessage = new HttpResponseMessage();
+            httpResponseMessage.Content = new StreamContent(new MemoryStream(Encoding.UTF8.GetBytes("Hello, World")));
+            httpResponseMessage.Headers.Add(transferEncodingHeaderKey, "chunked");
+
+            var httpContext = new DefaultHttpContext();
+            var formatter = new HttpResponseMessageOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(
+                httpResponseMessage,
+                typeof(HttpResponseMessage),
+                httpContext);
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            Assert.False(httpContext.Response.Headers.ContainsKey(transferEncodingHeaderKey));
+            Assert.NotNull(httpContext.Response.ContentLength);
+        }
+
+        [ConditionalFact]
+        // Issue - https://github.com/aspnet/External/issues/20
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task ExplicitlySet_MultipleEncodings_ChunkedNotIgnored()
+        {
+            // Arrange
+            var transferEncodingHeaderKey = "Transfer-Encoding";
+            var httpResponseMessage = new HttpResponseMessage();
+            httpResponseMessage.Content = new StreamContent(new MemoryStream(Encoding.UTF8.GetBytes("Hello, World")));
+            httpResponseMessage.Headers.Add(transferEncodingHeaderKey, new[] { "identity", "chunked" });
+
+            var httpContext = new DefaultHttpContext();
+            var formatter = new HttpResponseMessageOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(
+                httpResponseMessage,
+                typeof(HttpResponseMessage),
+                httpContext);
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            Assert.True(httpContext.Response.Headers.ContainsKey(transferEncodingHeaderKey));
+            Assert.Equal(new string[] { "identity", "chunked" },
+                        httpContext.Response.Headers[transferEncodingHeaderKey]);
+            Assert.NotNull(httpContext.Response.ContentLength);
+        }
+
+        [ConditionalFact]
+        // Issue - https://github.com/aspnet/External/issues/20
+        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
+        public async Task ExplicitlySet_MultipleEncodingsUsingChunkedFlag_ChunkedNotIgnored()
+        {
+            // Arrange
+            var transferEncodingHeaderKey = "Transfer-Encoding";
+            var httpResponseMessage = new HttpResponseMessage();
+            httpResponseMessage.Content = new StreamContent(new MemoryStream(Encoding.UTF8.GetBytes("Hello, World")));
+            httpResponseMessage.Headers.Add(transferEncodingHeaderKey, new[] { "identity" });
+            httpResponseMessage.Headers.TransferEncodingChunked = true;
+
+            var httpContext = new DefaultHttpContext();
+            var formatter = new HttpResponseMessageOutputFormatter();
+            var outputFormatterContext = GetOutputFormatterContext(
+                httpResponseMessage,
+                typeof(HttpResponseMessage),
+                httpContext);
+            // Act
+            await formatter.WriteAsync(outputFormatterContext);
+
+            // Assert
+            Assert.True(httpContext.Response.Headers.ContainsKey(transferEncodingHeaderKey));
+            Assert.Equal(new string[] { "identity", "chunked" },
+                        httpContext.Response.Headers[transferEncodingHeaderKey]);
+            Assert.NotNull(httpContext.Response.ContentLength);
+        }
+
+        private OutputFormatterWriteContext GetOutputFormatterContext(
+            object outputValue,
+            Type outputType,
+            HttpContext httpContext)
+        {
+            return new OutputFormatterWriteContext(
+                httpContext,
+                new TestHttpResponseStreamWriterFactory().CreateWriter,
+                outputType,
+                outputValue);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/InternalServerErrorResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/InternalServerErrorResultTest.cs
new file mode 100644
index 0000000000..6545749634
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/InternalServerErrorResultTest.cs
@@ -0,0 +1,51 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Xunit;
+
+namespace System.Web.Http
+{
+    public class InternalServerErrorResultTest
+    {
+        [Fact]
+        public async Task InternalServerErrorResult_SetsStatusCode()
+        {
+            // Arrange
+            var context = new ActionContext(GetHttpContext(), new RouteData(), new ActionDescriptor());
+            var result = new InternalServerErrorResult();
+
+            // Act
+            await result.ExecuteResultAsync(context);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status500InternalServerError, context.HttpContext.Response.StatusCode);
+        }
+
+        private static IServiceCollection CreateServices()
+        {
+            var services = new ServiceCollection();
+
+            services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+
+            return services;
+        }
+
+        private static HttpContext GetHttpContext()
+        {
+            var services = CreateServices();
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = services.BuildServiceProvider();
+
+            return httpContext;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/InvalidModelStateResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/InvalidModelStateResultTest.cs
new file mode 100644
index 0000000000..51fee66615
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/InvalidModelStateResultTest.cs
@@ -0,0 +1,99 @@
+// 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.
+
+using System.Buffers;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace System.Web.Http
+{
+    public class InvalidModelStateResultTest
+    {
+        [Fact]
+        public async Task InvalidModelStateResult_SetsStatusCode()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = CreateServices();
+
+            var stream = new MemoryStream();
+            httpContext.Response.Body = stream;
+
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            var modelState = new ModelStateDictionary();
+            modelState.AddModelError("product.Name", "Name is required.");
+
+            var result = new InvalidModelStateResult(modelState, includeErrorDetail: false);
+
+            // Act
+            await result.ExecuteResultAsync(context);
+
+            // Assert
+            Assert.Equal(StatusCodes.Status400BadRequest, context.HttpContext.Response.StatusCode);
+        }
+
+        [Fact]
+        public async Task InvalidModelStateResult_WritesHttpError()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = CreateServices();
+
+            var stream = new MemoryStream();
+            httpContext.Response.Body = stream;
+
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+            var modelState = new ModelStateDictionary();
+            modelState.AddModelError("product.Name", "Name is required.");
+
+            var expected =
+                "{\"Message\":\"The request is invalid.\"," +
+                "\"ModelState\":{\"product.Name\":[\"Name is required.\"]}}";
+
+            var result = new InvalidModelStateResult(modelState, includeErrorDetail: false);
+
+            // Act
+            await result.ExecuteResultAsync(context);
+
+            // Assert
+            using (var reader = new StreamReader(stream))
+            {
+                stream.Seek(0, SeekOrigin.Begin);
+                var content = reader.ReadToEnd();
+                Assert.Equal(expected, content);
+            }
+        }
+
+        private static IServiceProvider CreateServices()
+        {
+            var options = Options.Create(new MvcOptions());
+            options.Value.OutputFormatters.Add(new StringOutputFormatter());
+            options.Value.OutputFormatters.Add(new JsonOutputFormatter(
+                new JsonSerializerSettings(),
+                ArrayPool<char>.Shared));
+
+            var services = new ServiceCollection();
+            services.AddSingleton<IActionResultExecutor<ObjectResult>>(new ObjectResultExecutor(
+                new DefaultOutputFormatterSelector(options, NullLoggerFactory.Instance),
+                new TestHttpResponseStreamWriterFactory(),
+                NullLoggerFactory.Instance));
+
+            return services.BuildServiceProvider();
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj
new file mode 100644
index 0000000000..b10e11d8e7
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.WebApiCompatShim\Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(MicrosoftAspNetCoreHttpPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockContentNegotiator.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockContentNegotiator.cs
new file mode 100644
index 0000000000..510e47eaf7
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockContentNegotiator.cs
@@ -0,0 +1,72 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Net.Http.Headers;
+using System.Text;
+
+namespace System.Net.Http.Formatting.Mocks
+{
+    public class MockContentNegotiator : DefaultContentNegotiator
+    {
+        public MockContentNegotiator()
+        {
+        }
+
+        public MockContentNegotiator(bool excludeMatchOnTypeOnly)
+            : base(excludeMatchOnTypeOnly)
+        {
+        }
+
+        public new Collection<MediaTypeFormatterMatch> ComputeFormatterMatches(Type type, HttpRequestMessage request, IEnumerable<MediaTypeFormatter> formatters)
+        {
+            return base.ComputeFormatterMatches(type, request, formatters);
+        }
+
+        public new MediaTypeFormatterMatch SelectResponseMediaTypeFormatter(ICollection<MediaTypeFormatterMatch> matches)
+        {
+            return base.SelectResponseMediaTypeFormatter(matches);
+        }
+
+        public new Encoding SelectResponseCharacterEncoding(HttpRequestMessage request, MediaTypeFormatter formatter)
+        {
+            return base.SelectResponseCharacterEncoding(request, formatter);
+        }      
+
+        public new MediaTypeFormatterMatch MatchAcceptHeader(IEnumerable<MediaTypeWithQualityHeaderValue> sortedAcceptValues, MediaTypeFormatter formatter)
+        {
+            return base.MatchAcceptHeader(sortedAcceptValues, formatter);
+        }
+
+        public new MediaTypeFormatterMatch MatchRequestMediaType(HttpRequestMessage request, MediaTypeFormatter formatter)
+        {
+            return base.MatchRequestMediaType(request, formatter);
+        }
+
+        public new bool ShouldMatchOnType(IEnumerable<MediaTypeWithQualityHeaderValue> sortedAcceptValues)
+        {
+            return base.ShouldMatchOnType(sortedAcceptValues);
+        }
+
+        public new MediaTypeFormatterMatch MatchType(Type type, MediaTypeFormatter formatter)
+        {
+            return base.MatchType(type, formatter);
+        }
+
+        public new IEnumerable<MediaTypeWithQualityHeaderValue> SortMediaTypeWithQualityHeaderValuesByQFactor(ICollection<MediaTypeWithQualityHeaderValue> headerValues)
+        {
+            return base.SortMediaTypeWithQualityHeaderValuesByQFactor(headerValues);
+        }
+
+        public new IEnumerable<StringWithQualityHeaderValue> SortStringWithQualityHeaderValuesByQFactor(ICollection<StringWithQualityHeaderValue> headerValues)
+        {
+            return base.SortStringWithQualityHeaderValuesByQFactor(headerValues);
+        }
+
+        public new MediaTypeFormatterMatch UpdateBestMatch(MediaTypeFormatterMatch current, MediaTypeFormatterMatch potentialReplacement)
+        {
+            return base.UpdateBestMatch(current, potentialReplacement);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockMediaTypeFormatter.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockMediaTypeFormatter.cs
new file mode 100644
index 0000000000..5d70763807
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockMediaTypeFormatter.cs
@@ -0,0 +1,47 @@
+// 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.
+
+using System.Net.Http.Headers;
+using System.Text;
+
+namespace System.Net.Http.Formatting.Mocks
+{
+    public class MockMediaTypeFormatter : MediaTypeFormatter
+    {
+        private bool _canWriteAnyTypes = true;
+        public bool CallBase { get; set; }
+        public Func<Type, bool> CanReadTypeCallback { get; set; }
+        public Func<Type, bool> CanWriteTypeCallback { get; set; }
+
+        public bool CanWriteAnyTypesReturn
+        {
+            get { return _canWriteAnyTypes; }
+            set { _canWriteAnyTypes = value; }
+        }
+
+        public override bool CanReadType(Type type)
+        {
+            if (!CallBase && CanReadTypeCallback == null)
+            {
+                throw new InvalidOperationException("CallBase or CanReadTypeCallback must be set first.");
+            }
+
+            return CanReadTypeCallback != null ? CanReadTypeCallback(type) : true;
+        }
+
+        public override bool CanWriteType(Type type)
+        {
+            if (!CallBase && CanWriteTypeCallback == null)
+            {
+                throw new InvalidOperationException("CallBase or CanWriteTypeCallback must be set first.");
+            }
+
+            return CanWriteTypeCallback != null ? CanWriteTypeCallback(type) : true;
+        }
+
+        public new Encoding SelectCharacterEncoding(HttpContentHeaders contentHeaders)
+        {
+            return base.SelectCharacterEncoding(contentHeaders);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/NegotiatedContentResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/NegotiatedContentResultTest.cs
new file mode 100644
index 0000000000..1e8011e116
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/NegotiatedContentResultTest.cs
@@ -0,0 +1,94 @@
+// 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.
+
+using System.Buffers;
+using System.IO;
+using System.Net;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Internal;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace System.Web.Http
+{
+    public class NegotiatedContentResultTest
+    {
+        [Fact]
+        public async Task NegotiatedContentResult_SetsStatusCode()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = CreateServices();
+
+            var stream = new MemoryStream();
+            httpContext.Response.Body = stream;
+
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var result = new NegotiatedContentResult<Product>(HttpStatusCode.Ambiguous, new Product());
+
+            // Act
+            await result.ExecuteResultAsync(context);
+
+            // Assert
+            Assert.Equal(300, context.HttpContext.Response.StatusCode);
+        }
+
+        [Fact]
+        public async Task NegotiatedContentResult_WritesHttpError()
+        {
+            // Arrange
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = CreateServices();
+
+            var stream = new MemoryStream();
+            httpContext.Response.Body = stream;
+
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            var result = new NegotiatedContentResult<Product>(HttpStatusCode.Ambiguous, new Product());
+
+            // Act
+            await result.ExecuteResultAsync(context);
+
+            // Assert
+            using (var reader = new StreamReader(stream))
+            {
+                stream.Seek(0, SeekOrigin.Begin);
+                var content = reader.ReadToEnd();
+                Assert.Equal("{\"Id\":0,\"Name\":null}", content);
+            }
+        }
+
+        private static IServiceProvider CreateServices()
+        {
+            var options = Options.Create(new MvcOptions());
+            options.Value.OutputFormatters.Add(new StringOutputFormatter());
+            options.Value.OutputFormatters.Add(new JsonOutputFormatter(
+                new JsonSerializerSettings(),
+                ArrayPool<char>.Shared));
+
+            var services = new ServiceCollection();
+            services.AddSingleton<IActionResultExecutor<ObjectResult>>(new ObjectResultExecutor(
+                new DefaultOutputFormatterSelector(options, NullLoggerFactory.Instance),
+                new TestHttpResponseStreamWriterFactory(),
+                NullLoggerFactory.Instance));
+
+            return services.BuildServiceProvider();
+        }
+
+        private class Product
+        {
+            public int Id { get; set; }
+
+            public string Name { get; set; }
+        };
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/OverloadActionConstraintTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/OverloadActionConstraintTest.cs
new file mode 100644
index 0000000000..4cbcd8b9cc
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/OverloadActionConstraintTest.cs
@@ -0,0 +1,624 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Web.Http;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Routing;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.WebApiCompatShim
+{
+    public class OverloadActionConstraintTest
+    {
+        [Fact]
+        public void Accept_RejectsActionMatchWithMissingParameter()
+        {
+            // Arrange
+            var action = new ActionDescriptor();
+            action.Parameters = new List<ParameterDescriptor>()
+            {
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "id",
+                    ParameterType = typeof(int),
+                },
+            };
+
+            var constraint = new OverloadActionConstraint();
+
+            var context = new ActionConstraintContext();
+            context.Candidates = new List<ActionSelectorCandidate>()
+            {
+                new ActionSelectorCandidate(action, new [] { constraint }),
+            };
+
+            context.CurrentCandidate = context.Candidates[0];
+            context.RouteContext = CreateRouteContext();
+
+            // Act & Assert
+            Assert.False(constraint.Accept(context));
+        }
+
+        [Fact]
+        public void Accept_AcceptsActionWithSatisfiedParameters()
+        {
+            // Arrange
+            var action = new ActionDescriptor();
+            action.Parameters = new List<ParameterDescriptor>()
+            {
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "id",
+                    ParameterType = typeof(int),
+                },
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "quantity",
+                    ParameterType = typeof(int),
+                },
+            };
+
+            var constraint = new OverloadActionConstraint();
+
+            var context = new ActionConstraintContext();
+            context.Candidates = new List<ActionSelectorCandidate>()
+            {
+                new ActionSelectorCandidate(action, new [] { constraint }),
+            };
+
+            context.CurrentCandidate = context.Candidates[0];
+            context.RouteContext = CreateRouteContext("?quantity=5", new { id = 17 });
+
+            // Act & Assert
+            Assert.True(constraint.Accept(context));
+        }
+
+        [Fact]
+        public void Accept_AcceptsActionWithSatisfiedParameters_QueryStringOnly()
+        {
+            // Arrange
+            var action = new ActionDescriptor();
+            action.Parameters = new List<ParameterDescriptor>()
+            {
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "id",
+                    ParameterType = typeof(int),
+                },
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "quantity",
+                    ParameterType = typeof(int),
+                },
+            };
+
+            var constraint = new OverloadActionConstraint();
+
+            var context = new ActionConstraintContext();
+            context.Candidates = new List<ActionSelectorCandidate>()
+            {
+                new ActionSelectorCandidate(action, new [] { constraint }),
+            };
+
+            context.CurrentCandidate = context.Candidates[0];
+            context.RouteContext = CreateRouteContext("?quantity=5&id=7", new { });
+
+            // Act & Assert
+            Assert.True(constraint.Accept(context));
+        }
+
+        [Fact]
+        public void Accept_AcceptsActionWithSatisfiedParameters_RouteDataOnly()
+        {
+            // Arrange
+            var action = new ActionDescriptor();
+            action.Parameters = new List<ParameterDescriptor>()
+            {
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "id",
+                    ParameterType = typeof(int),
+                },
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "quantity",
+                    ParameterType = typeof(int),
+                },
+            };
+
+            var constraint = new OverloadActionConstraint();
+
+            var context = new ActionConstraintContext();
+            context.Candidates = new List<ActionSelectorCandidate>()
+            {
+                new ActionSelectorCandidate(action, new [] { constraint }),
+            };
+
+            context.CurrentCandidate = context.Candidates[0];
+            context.RouteContext = CreateRouteContext("?", new { quantity = 9, id = 17 });
+
+            // Act & Assert
+            Assert.True(constraint.Accept(context));
+        }
+
+        [Fact]
+        public void Accept_AcceptsActionWithUnsatisfiedOptionalParameter()
+        {
+            // Arrange
+            var action = new ActionDescriptor();
+            action.Parameters = new List<ParameterDescriptor>()
+            {
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "id",
+                    ParameterType = typeof(int),
+                },
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "quantity",
+                    ParameterType = typeof(int),
+                },
+            };
+
+            var optionalParameters = new HashSet<string>();
+            optionalParameters.Add("quantity");
+
+            action.Properties.Add("OptionalParameters", optionalParameters);
+            var constraint = new OverloadActionConstraint();
+
+            var context = new ActionConstraintContext();
+            context.Candidates = new List<ActionSelectorCandidate>()
+            {
+                new ActionSelectorCandidate(action, new [] { constraint }),
+            };
+
+            context.CurrentCandidate = context.Candidates[0];
+            context.RouteContext = CreateRouteContext("?store=5", new { id = 17 });
+
+            // Act & Assert
+            Assert.True(constraint.Accept(context));
+        }
+
+        [Fact]
+        public void Accept_AcceptsOneAndRejectsAnother()
+        {
+            // Arrange
+            var action1 = new ActionDescriptor();
+            action1.Parameters = new List<ParameterDescriptor>()
+            {
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "id",
+                    ParameterType = typeof(int),
+                },
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "quantity",
+                    ParameterType = typeof(int),
+                },
+            };
+
+            var action2 = new ActionDescriptor();
+            action2.Parameters = new List<ParameterDescriptor>()
+            {
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "id",
+                    ParameterType = typeof(int),
+                },
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "quantity_ordered",
+                    ParameterType = typeof(int),
+                },
+            };
+
+            var constraint = new OverloadActionConstraint();
+
+            var context = new ActionConstraintContext();
+            context.Candidates = new List<ActionSelectorCandidate>()
+            {
+                new ActionSelectorCandidate(action1, new [] { constraint }),
+                new ActionSelectorCandidate(action2, new [] { constraint }),
+            };
+
+            context.CurrentCandidate = context.Candidates[0];
+            context.RouteContext = CreateRouteContext("?quantity=5", new { id = 17 });
+
+            // Act & Assert
+            Assert.True(constraint.Accept(context));
+
+            context.CurrentCandidate = context.Candidates[1];
+            Assert.False(constraint.Accept(context));
+        }
+
+        [Fact]
+        public void Accept_RejectsWorseMatch()
+        {
+            // Arrange
+            var action1 = new ActionDescriptor();
+            action1.Parameters = new List<ParameterDescriptor>()
+            {
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "id",
+                    ParameterType = typeof(int),
+                },
+            };
+
+            var action2 = new ActionDescriptor();
+            action2.Parameters = new List<ParameterDescriptor>()
+            {
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "id",
+                    ParameterType = typeof(int),
+                },
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "quantity",
+                    ParameterType = typeof(int),
+                },
+            };
+
+            var constraint = new OverloadActionConstraint();
+
+            var context = new ActionConstraintContext();
+            context.Candidates = new List<ActionSelectorCandidate>()
+            {
+                new ActionSelectorCandidate(action1, new [] { constraint }),
+                new ActionSelectorCandidate(action2, new [] { constraint }),
+            };
+
+            context.CurrentCandidate = context.Candidates[0];
+            context.RouteContext = CreateRouteContext("?quantity=5", new { id = 17 });
+
+            // Act & Assert
+            Assert.False(constraint.Accept(context));
+        }
+
+        [Fact]
+        public void Accept_RejectsWorseMatch_OptionalParameter()
+        {
+            // Arrange
+            var action1 = new ActionDescriptor();
+            action1.Parameters = new List<ParameterDescriptor>()
+            {
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "id",
+                    ParameterType = typeof(int),
+                },
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "quantity",
+                    ParameterType = typeof(int),
+                },
+            };
+
+            var optionalParameters = new HashSet<string>();
+            optionalParameters.Add("quantity");
+            action1.Properties.Add("OptionalParameters", optionalParameters);
+
+            var action2 = new ActionDescriptor();
+            action2.Parameters = new List<ParameterDescriptor>()
+            {
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "id",
+                    ParameterType = typeof(int),
+                },
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "quantity",
+                    ParameterType = typeof(int),
+                },
+            };
+
+            var constraint = new OverloadActionConstraint();
+
+            var context = new ActionConstraintContext();
+            context.Candidates = new List<ActionSelectorCandidate>()
+            {
+                new ActionSelectorCandidate(action1, new [] { constraint }),
+                new ActionSelectorCandidate(action2, new [] { constraint }),
+            };
+
+            context.CurrentCandidate = context.Candidates[0];
+            context.RouteContext = CreateRouteContext("?quantity=5", new { id = 17 });
+
+            // Act & Assert
+            Assert.False(constraint.Accept(context));
+        }
+
+        [Fact]
+        public void Accept_AcceptsActionsOnSameTier()
+        {
+            // Arrange
+            var action1 = new ActionDescriptor();
+            action1.Parameters = new List<ParameterDescriptor>()
+            {
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "id",
+                    ParameterType = typeof(int),
+                },
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "quantity",
+                    ParameterType = typeof(int),
+                },
+            };
+
+            var action2 = new ActionDescriptor();
+            action2.Parameters = new List<ParameterDescriptor>()
+            {
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "id",
+                    ParameterType = typeof(int),
+                },
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "price",
+                    ParameterType = typeof(decimal),
+                },
+            };
+
+            var constraint = new OverloadActionConstraint();
+
+            var context = new ActionConstraintContext();
+            context.Candidates = new List<ActionSelectorCandidate>()
+            {
+                new ActionSelectorCandidate(action1, new [] { constraint }),
+                new ActionSelectorCandidate(action2, new [] { constraint }),
+            };
+
+            context.CurrentCandidate = context.Candidates[0];
+            context.RouteContext = CreateRouteContext("?quantity=5&price=5.99", new { id = 17 });
+
+            // Act & Assert
+            Assert.True(constraint.Accept(context));
+
+            context.CurrentCandidate = context.Candidates[1];
+            Assert.True(constraint.Accept(context));
+        }
+
+        [Fact]
+        public void Accept_AcceptsAction_WithFewerParameters_WhenOtherIsNotOverloaded()
+        {
+            // Arrange
+            var action1 = new ActionDescriptor();
+            action1.Parameters = new List<ParameterDescriptor>()
+            {
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "id",
+                    ParameterType = typeof(int),
+                },
+            };
+
+            var action2 = new ActionDescriptor();
+            action2.Parameters = new List<ParameterDescriptor>()
+            {
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "id",
+                    ParameterType = typeof(int),
+                },
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "quantity",
+                    ParameterType = typeof(int),
+                },
+            };
+
+            var optionalParameters = new HashSet<string>();
+            optionalParameters.Add("quantity");
+            action2.Properties.Add("OptionalParameters", optionalParameters);
+
+            var constraint = new OverloadActionConstraint();
+
+            var context = new ActionConstraintContext();
+            context.Candidates = new List<ActionSelectorCandidate>()
+            {
+                new ActionSelectorCandidate(action1, new [] { constraint }),
+                new ActionSelectorCandidate(action2, new IActionConstraint[] { }),
+            };
+
+            context.CurrentCandidate = context.Candidates[0];
+            context.RouteContext = CreateRouteContext("?quantity=5", new { id = 17 });
+
+            // Act & Assert
+            Assert.True(constraint.Accept(context));
+        }
+
+        [Fact]
+        public void Accept_AcceptsAction_WithFewerParameters_WhenOtherIsNotOverloaded_FromBodyAttribute()
+        {
+            // Arrange
+            var action1 = new ActionDescriptor();
+            action1.Parameters = new List<ParameterDescriptor>()
+            {
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "id",
+                    ParameterType = typeof(int),
+                },
+            };
+
+            var action2 = new ActionDescriptor();
+            action2.Parameters = new List<ParameterDescriptor>()
+            {
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromUriAttribute()).BindingSource,
+                    },
+                    Name = "id",
+                    ParameterType = typeof(int),
+                },
+                new ParameterDescriptor()
+                {
+                    BindingInfo = new BindingInfo()
+                    {
+                      BindingSource = (new FromBodyAttribute()).BindingSource,
+                    },
+                    Name = "quantity",
+                    ParameterType = typeof(int),
+                },
+            };
+
+            var constraint = new OverloadActionConstraint();
+
+            var context = new ActionConstraintContext();
+            context.Candidates = new List<ActionSelectorCandidate>()
+            {
+                new ActionSelectorCandidate(action1, new [] { constraint }),
+                new ActionSelectorCandidate(action2, new IActionConstraint[] { }),
+            };
+
+            context.CurrentCandidate = context.Candidates[0];
+            context.RouteContext = CreateRouteContext("?quantity=5", new { id = 17 });
+
+            // Act & Assert
+            Assert.True(constraint.Accept(context));
+        }
+
+        private static RouteContext CreateRouteContext(string queryString = null, object routeValues = null)
+        {
+            var httpContext = new DefaultHttpContext();
+            if (queryString != null)
+            {
+                httpContext.Request.QueryString = new QueryString(queryString);
+            }
+
+            var routeContext = new RouteContext(httpContext);
+            routeContext.RouteData = new RouteData();
+
+            foreach (var kvp in new RouteValueDictionary(routeValues))
+            {
+                routeContext.RouteData.Values.Add(kvp.Key, kvp.Value);
+            }
+
+            return routeContext;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/FlagsEnum.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/FlagsEnum.cs
new file mode 100644
index 0000000000..cbb1a3d3a9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/FlagsEnum.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using System;
+
+namespace Microsoft.TestCommon.Types
+{
+    [Flags]
+    public enum FlagsEnum
+    {
+        One = 0x1,
+        Two = 0x2,
+        Four = 0x4
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/LongEnum.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/LongEnum.cs
new file mode 100644
index 0000000000..43815be7fb
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/LongEnum.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.TestCommon.Types
+{
+    public enum LongEnum : long
+    {
+        FirstLong,
+        SecondLong,
+        ThirdLong,
+        FourthLong
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/MediaTypeAssert.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/MediaTypeAssert.cs
new file mode 100644
index 0000000000..7fea0e2e5a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/MediaTypeAssert.cs
@@ -0,0 +1,56 @@
+// 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.
+
+using System;
+using System.Net.Http.Headers;
+using Xunit;
+
+namespace Microsoft.TestCommon
+{
+    public class MediaTypeAssert
+    {
+        private static readonly MediaTypeAssert singleton = new MediaTypeAssert();
+
+        public static MediaTypeAssert Singleton { get { return singleton; } }
+
+        public void AreEqual(MediaTypeHeaderValue expected, MediaTypeHeaderValue actual, string errorMessage)
+        {
+            if (expected != null || actual != null)
+            {
+                Assert.NotNull(expected);
+                Assert.Equal(0, new MediaTypeHeaderValueComparer().Compare(expected, actual));
+            }
+        }
+
+        public void AreEqual(MediaTypeHeaderValue expected, string actual, string errorMessage)
+        {
+            if (expected != null || !String.IsNullOrEmpty(actual))
+            {
+                MediaTypeHeaderValue actualMediaType = new MediaTypeHeaderValue(actual);
+                Assert.NotNull(expected);
+                Assert.Equal(0, new MediaTypeHeaderValueComparer().Compare(expected, actualMediaType));
+            }
+        }
+
+        public void AreEqual(string expected, string actual, string errorMessage)
+        {
+            if (!String.IsNullOrEmpty(expected) || !String.IsNullOrEmpty(actual))
+            {
+                Assert.NotNull(expected);
+                MediaTypeHeaderValue expectedMediaType = new MediaTypeHeaderValue(expected);
+                MediaTypeHeaderValue actualMediaType = new MediaTypeHeaderValue(actual);
+                Assert.Equal(0, new MediaTypeHeaderValueComparer().Compare(expectedMediaType, actualMediaType));
+            }
+        }
+
+        public void AreEqual(string expected, MediaTypeHeaderValue actual, string errorMessage)
+        {
+            if (!String.IsNullOrEmpty(expected) || actual != null)
+            {
+                Assert.NotNull(expected);
+                MediaTypeHeaderValue expectedMediaType = new MediaTypeHeaderValue(expected);
+                Assert.Equal(0, new MediaTypeHeaderValueComparer().Compare(expectedMediaType, actual));
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/MediaTypeConstants.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/MediaTypeConstants.cs
new file mode 100644
index 0000000000..bb796c8a07
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/MediaTypeConstants.cs
@@ -0,0 +1,109 @@
+// 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.
+
+using System.Net.Http.Headers;
+
+namespace System.Net.Http.Formatting
+{
+    /// <summary>
+    /// Constants related to media types.
+    /// </summary>
+    internal static class MediaTypeConstants
+    {
+        private static readonly MediaTypeHeaderValue _defaultApplicationXmlMediaType =
+            new MediaTypeHeaderValue("application/xml");
+        private static readonly MediaTypeHeaderValue _defaultTextXmlMediaType =
+            new MediaTypeHeaderValue("text/xml");
+        private static readonly MediaTypeHeaderValue _defaultApplicationJsonMediaType =
+            new MediaTypeHeaderValue("application/json");
+        private static readonly MediaTypeHeaderValue _defaultTextJsonMediaType =
+            new MediaTypeHeaderValue("text/json");
+        private static readonly MediaTypeHeaderValue _defaultApplicationOctetStreamMediaType =
+            new MediaTypeHeaderValue("application/octet-stream");
+        private static readonly MediaTypeHeaderValue _defaultApplicationFormUrlEncodedMediaType =
+            new MediaTypeHeaderValue("application/x-www-form-urlencoded");
+        private static readonly MediaTypeHeaderValue _defaultApplicationBsonMediaType =
+            new MediaTypeHeaderValue("application/bson");
+
+        /// <summary>
+        /// Gets a <see cref="MediaTypeHeaderValue"/> instance representing <c>application/octet-stream</c>.
+        /// </summary>
+        /// <value>
+        /// A new <see cref="MediaTypeHeaderValue"/> instance representing <c>application/octet-stream</c>.
+        /// </value>
+        public static MediaTypeHeaderValue ApplicationOctetStreamMediaType
+        {
+            get { return _defaultApplicationOctetStreamMediaType; }
+        }
+
+        /// <summary>
+        /// Gets a <see cref="MediaTypeHeaderValue"/> instance representing <c>application/xml</c>.
+        /// </summary>
+        /// <value>
+        /// A new <see cref="MediaTypeHeaderValue"/> instance representing <c>application/xml</c>.
+        /// </value>
+        public static MediaTypeHeaderValue ApplicationXmlMediaType
+        {
+            get { return _defaultApplicationXmlMediaType; }
+        }
+
+        /// <summary>
+        /// Gets a <see cref="MediaTypeHeaderValue"/> instance representing <c>application/json</c>.
+        /// </summary>
+        /// <value>
+        /// A new <see cref="MediaTypeHeaderValue"/> instance representing <c>application/json</c>.
+        /// </value>
+        public static MediaTypeHeaderValue ApplicationJsonMediaType
+        {
+            get { return _defaultApplicationJsonMediaType; }
+        }
+
+        /// <summary>
+        /// Gets a <see cref="MediaTypeHeaderValue"/> instance representing <c>text/xml</c>.
+        /// </summary>
+        /// <value>
+        /// A new <see cref="MediaTypeHeaderValue"/> instance representing <c>text/xml</c>.
+        /// </value>
+        public static MediaTypeHeaderValue TextXmlMediaType
+        {
+            get { return _defaultTextXmlMediaType; }
+        }
+
+        /// <summary>
+        /// Gets a <see cref="MediaTypeHeaderValue"/> instance representing <c>text/json</c>.
+        /// </summary>
+        /// <value>
+        /// A new <see cref="MediaTypeHeaderValue"/> instance representing <c>text/json</c>.
+        /// </value>
+        public static MediaTypeHeaderValue TextJsonMediaType
+        {
+            get { return _defaultTextJsonMediaType; }
+        }
+
+        /// <summary>
+        /// Gets a <see cref="MediaTypeHeaderValue"/> instance representing <c>application/x-www-form-urlencoded</c>.
+        /// </summary>
+        /// <value>
+        /// A new <see cref="MediaTypeHeaderValue"/> instance representing <c>application/x-www-form-urlencoded</c>.
+        /// </value>
+        public static MediaTypeHeaderValue ApplicationFormUrlEncodedMediaType
+        {
+            get { return _defaultApplicationFormUrlEncodedMediaType; }
+        }
+
+        /// <summary>
+        /// Gets a <see cref="MediaTypeHeaderValue"/> instance representing <c>application/bson</c>.
+        /// </summary>
+        /// <value>
+        /// A new <see cref="MediaTypeHeaderValue"/> instance representing <c>application/bson</c>.
+        /// </value>
+        /// <remarks>
+        /// Not yet a standard. In particular this media type is not currently listed at
+        /// https://www.iana.org/assignments/media-types/application.
+        /// </remarks>
+        public static MediaTypeHeaderValue ApplicationBsonMediaType
+        {
+            get { return _defaultApplicationBsonMediaType; }
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/MediaTypeHeaderValueComparer.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/MediaTypeHeaderValueComparer.cs
new file mode 100644
index 0000000000..d24bda86d9
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/MediaTypeHeaderValueComparer.cs
@@ -0,0 +1,195 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Net.Http.Headers;
+
+namespace Microsoft.TestCommon
+{
+    public class MediaTypeHeaderValueComparer : IComparer<MediaTypeHeaderValue>
+    {
+        private static readonly MediaTypeHeaderValueComparer mediaTypeComparer = new MediaTypeHeaderValueComparer();
+
+        public MediaTypeHeaderValueComparer()
+        {
+        }
+
+        public static MediaTypeHeaderValueComparer Comparer
+        {
+            get
+            {
+                return mediaTypeComparer;
+            }
+        }
+
+        public int Compare(MediaTypeHeaderValue mediaType1, MediaTypeHeaderValue mediaType2)
+        {
+            ParsedMediaTypeHeaderValue parsedMediaType1 = new ParsedMediaTypeHeaderValue(mediaType1);
+            ParsedMediaTypeHeaderValue parsedMediaType2 = new ParsedMediaTypeHeaderValue(mediaType2);
+
+            int returnValue = CompareBasedOnQualityFactor(parsedMediaType1, parsedMediaType2);
+
+            if (returnValue == 0)
+            {
+                if (!String.Equals(parsedMediaType1.Type, parsedMediaType2.Type, StringComparison.OrdinalIgnoreCase))
+                {
+                    if (parsedMediaType1.IsAllMediaRange)
+                    {
+                        return 1;
+                    }
+                    else if (parsedMediaType2.IsAllMediaRange)
+                    {
+                        return -1;
+                    }
+                }
+                else if (!String.Equals(parsedMediaType1.SubType, parsedMediaType2.SubType, StringComparison.OrdinalIgnoreCase))
+                {
+                    if (parsedMediaType1.IsSubTypeMediaRange)
+                    {
+                        return 1;
+                    }
+                    else if (parsedMediaType2.IsSubTypeMediaRange)
+                    {
+                        return -1;
+                    }
+                }
+                else
+                {
+                    if (!parsedMediaType1.HasNonQualityFactorParameter)
+                    {
+                        if (parsedMediaType2.HasNonQualityFactorParameter)
+                        {
+                            return 1;
+                        }
+                    }
+                    else if (!parsedMediaType2.HasNonQualityFactorParameter)
+                    {
+                        return -1;
+                    }
+                }
+            }
+
+            return returnValue;
+        }
+
+        private static int CompareBasedOnQualityFactor(ParsedMediaTypeHeaderValue parsedMediaType1, ParsedMediaTypeHeaderValue parsedMediaType2)
+        {
+            double qualityDifference = parsedMediaType1.QualityFactor - parsedMediaType2.QualityFactor;
+            if (qualityDifference < 0)
+            {
+                return 1;
+            }
+            else if (qualityDifference > 0)
+            {
+                return -1;
+            }
+
+            return 0;
+        }
+
+        internal class ParsedMediaTypeHeaderValue
+        {
+            private const string MediaRangeAsterisk = "*";
+            private const char MediaTypeSubTypeDelimiter = '/';
+            private const string QualityFactorParameterName = "q";
+            private const double DefaultQualityFactor = 1.0;
+
+            private MediaTypeHeaderValue mediaType;
+            private string type;
+            private string subType;
+            private bool? hasNonQualityFactorParameter;
+            private double? qualityFactor;
+
+            public ParsedMediaTypeHeaderValue(MediaTypeHeaderValue mediaType)
+            {
+                this.mediaType = mediaType;
+                string[] splitMediaType = mediaType.MediaType.Split(MediaTypeSubTypeDelimiter);
+                this.type = splitMediaType[0];
+                this.subType = splitMediaType[1];
+            }
+
+            public string Type
+            {
+                get
+                {
+                    return this.type;
+                }
+            }
+
+            public string SubType
+            {
+                get
+                {
+                    return this.subType;
+                }
+            }
+
+            public bool IsAllMediaRange
+            {
+                get
+                {
+                    return this.IsSubTypeMediaRange && String.Equals(MediaRangeAsterisk, this.Type, StringComparison.Ordinal);
+                }
+            }
+
+            public bool IsSubTypeMediaRange
+            {
+                get
+                {
+                    return String.Equals(MediaRangeAsterisk, this.SubType, StringComparison.Ordinal);
+                }
+            }
+
+            public bool HasNonQualityFactorParameter
+            {
+                get
+                {
+                    if (!this.hasNonQualityFactorParameter.HasValue)
+                    {
+                        this.hasNonQualityFactorParameter = false;
+                        foreach (NameValueHeaderValue param in this.mediaType.Parameters)
+                        {
+                            if (!String.Equals(QualityFactorParameterName, param.Name, StringComparison.Ordinal))
+                            {
+                                this.hasNonQualityFactorParameter = true;
+                            }
+                        }
+                    }
+
+                    return this.hasNonQualityFactorParameter.Value;
+                }
+            }
+
+            public string CharSet
+            {
+                get
+                {
+                    return this.mediaType.CharSet;
+                }
+            }
+
+            public double QualityFactor
+            {
+                get
+                {
+                    if (!this.qualityFactor.HasValue)
+                    {
+                        MediaTypeWithQualityHeaderValue mediaTypeWithQuality = this.mediaType as MediaTypeWithQualityHeaderValue;
+                        if (mediaTypeWithQuality != null)
+                        {
+                            this.qualityFactor = mediaTypeWithQuality.Quality;
+                        }
+
+                        if (!this.qualityFactor.HasValue)
+                        {
+                            this.qualityFactor = DefaultQualityFactor;
+                        }
+                    }
+
+                    return this.qualityFactor.Value;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/RefTypeTestData.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/RefTypeTestData.cs
new file mode 100644
index 0000000000..cc291f941b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/RefTypeTestData.cs
@@ -0,0 +1,76 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.TestCommon
+{
+    public class RefTypeTestData<T> : TestData<T> where T : class
+    {
+        private Func<IEnumerable<T>> testDataProvider;
+        private Func<IEnumerable<T>> derivedTypeTestDataProvider;
+        private Func<IEnumerable<T>> knownTypeTestDataProvider;
+
+        public RefTypeTestData(Func<IEnumerable<T>> testDataProvider)
+        {
+            if (testDataProvider == null)
+            {
+                throw new ArgumentNullException(nameof(testDataProvider));
+            }
+
+            this.testDataProvider = testDataProvider;
+            this.RegisterTestDataVariation(TestDataVariations.WithNull, this.Type, GetNullTestData);
+        }
+
+        public RefTypeTestData(
+            Func<IEnumerable<T>> testDataProvider,
+            Func<IEnumerable<T>> derivedTypeTestDataProvider,
+            Func<IEnumerable<T>> knownTypeTestDataProvider)
+            : this(testDataProvider)
+        {
+            this.derivedTypeTestDataProvider = derivedTypeTestDataProvider;
+            if (this.derivedTypeTestDataProvider != null)
+            {
+                this.RegisterTestDataVariation(TestDataVariations.AsDerivedType, this.Type, this.GetTestDataAsDerivedType);
+            }
+
+            this.knownTypeTestDataProvider = knownTypeTestDataProvider;
+            if (this.knownTypeTestDataProvider != null)
+            {
+                this.RegisterTestDataVariation(TestDataVariations.AsKnownType, this.Type, this.GetTestDataAsDerivedKnownType);
+            }
+        }
+
+        public T GetNullTestData()
+        {
+            return null;
+        }
+
+        public IEnumerable<T> GetTestDataAsDerivedType()
+        {
+            if (this.derivedTypeTestDataProvider != null)
+            {
+                return this.derivedTypeTestDataProvider();
+            }
+
+            return Enumerable.Empty<T>();
+        }
+
+        public IEnumerable<T> GetTestDataAsDerivedKnownType()
+        {
+            if (this.knownTypeTestDataProvider != null)
+            {
+                return this.knownTypeTestDataProvider();
+            }
+
+            return Enumerable.Empty<T>();
+        }
+
+        protected override IEnumerable<T> GetTypedTestData()
+        {
+            return this.testDataProvider();
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/SimpleEnum.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/SimpleEnum.cs
new file mode 100644
index 0000000000..2cd22c144c
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/SimpleEnum.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.TestCommon.Types
+{
+    public enum SimpleEnum
+    {
+        First,
+        Second,
+        Third,
+        Fourth
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TestData.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TestData.cs
new file mode 100644
index 0000000000..3f19268c09
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TestData.cs
@@ -0,0 +1,441 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Microsoft.TestCommon.Types;
+
+namespace Microsoft.TestCommon
+{
+    /// <summary>
+    /// A base class for test data.  A <see cref="TestData"/> instance is associated with a given type, and the <see cref="TestData"/> instance can
+    /// provide instances of the given type to use as data in tests.  The same <see cref="TestData"/> instance can also provide instances
+    /// of types related to the given type, such as a <see cref="List<>"/> of the type.  See the <see cref="TestDataVariations"/> enum for all the
+    /// variations of test data that a <see cref="TestData"/> instance can provide.
+    /// </summary>
+    public abstract class TestData
+    {
+        /// <summary>
+        /// Common <see cref="TestData"/> for a <see cref="char"/>.
+        /// </summary>
+        public static readonly ValueTypeTestData<char> CharTestData = new ValueTypeTestData<char>('a', Char.MinValue, Char.MaxValue);
+
+        /// <summary>
+        /// Common <see cref="TestData"/> for a <see cref="int"/>.
+        /// </summary>
+        public static readonly ValueTypeTestData<int> IntTestData = new ValueTypeTestData<int>(-1, 0, 1, Int32.MinValue, Int32.MaxValue);
+
+        /// <summary>
+        /// Common <see cref="TestData"/> for a <see cref="uint"/>.
+        /// </summary>
+        public static readonly ValueTypeTestData<uint> UintTestData = new ValueTypeTestData<uint>(0, 1, UInt32.MinValue, UInt32.MaxValue);
+
+        /// <summary>
+        /// Common <see cref="TestData"/> for a <see cref="short"/>.
+        /// </summary>
+        public static readonly ValueTypeTestData<short> ShortTestData = new ValueTypeTestData<short>(-1, 0, 1, Int16.MinValue, Int16.MaxValue);
+
+        /// <summary>
+        /// Common <see cref="TestData"/> for a <see cref="ushort"/>.
+        /// </summary>
+        public static readonly ValueTypeTestData<ushort> UshortTestData = new ValueTypeTestData<ushort>(0, 1, UInt16.MinValue, UInt16.MaxValue);
+
+        /// <summary>
+        /// Common <see cref="TestData"/> for a <see cref="long"/>.
+        /// </summary>
+        public static readonly ValueTypeTestData<long> LongTestData = new ValueTypeTestData<long>(-1, 0, 1, Int64.MinValue, Int64.MaxValue);
+
+        /// <summary>
+        /// Common <see cref="TestData"/> for a <see cref="ulong"/>.
+        /// </summary>
+        public static readonly ValueTypeTestData<ulong> UlongTestData = new ValueTypeTestData<ulong>(0, 1, UInt64.MinValue, UInt64.MaxValue);
+
+        /// <summary>
+        /// Common <see cref="TestData"/> for a <see cref="byte"/>.
+        /// </summary>
+        public static readonly ValueTypeTestData<byte> ByteTestData = new ValueTypeTestData<byte>(0, 1, Byte.MinValue, Byte.MaxValue);
+
+        /// <summary>
+        /// Common <see cref="TestData"/> for a <see cref="sbyte"/>.
+        /// </summary>
+        public static readonly ValueTypeTestData<sbyte> SByteTestData = new ValueTypeTestData<sbyte>(-1, 0, 1, SByte.MinValue, SByte.MaxValue);
+
+        /// <summary>
+        /// Common <see cref="TestData"/> for a <see cref="bool"/>.
+        /// </summary>
+        public static readonly ValueTypeTestData<bool> BoolTestData = new ValueTypeTestData<bool>(true, false);
+
+        /// <summary>
+        /// Common <see cref="TestData"/> for a <see cref="double"/>.
+        /// </summary>
+        public static readonly ValueTypeTestData<double> DoubleTestData = new ValueTypeTestData<double>(
+            -1.0,
+            0.0,
+            1.0,
+            double.MinValue,
+            double.MaxValue,
+            double.PositiveInfinity,
+            double.NegativeInfinity);
+
+        /// <summary>
+        /// Common <see cref="TestData"/> for a <see cref="float"/>.
+        /// </summary>
+        public static readonly ValueTypeTestData<float> FloatTestData = new ValueTypeTestData<float>(
+            -1.0f,
+            0.0f,
+            1.0f,
+            float.MinValue,
+            float.MaxValue,
+            float.PositiveInfinity,
+            float.NegativeInfinity);
+
+        /// <summary>
+        /// Common <see cref="TestData"/> for a <see cref="decimal"/>.
+        /// </summary>
+        public static readonly ValueTypeTestData<decimal> DecimalTestData = new ValueTypeTestData<decimal>(
+            -1M,
+            0M,
+            1M,
+            decimal.MinValue,
+            decimal.MaxValue);
+
+        /// <summary>
+        /// Common <see cref="TestData"/> for a <see cref="DateTime"/>.
+        /// </summary>
+        public static readonly ValueTypeTestData<DateTime> DateTimeTestData = new ValueTypeTestData<DateTime>(
+            DateTime.Now,
+            DateTime.UtcNow,
+            DateTime.MaxValue,
+            DateTime.MinValue);
+
+        /// <summary>
+        /// Common <see cref="TestData"/> for a <see cref="TimeSpan"/>.
+        /// </summary>
+        public static readonly ValueTypeTestData<TimeSpan> TimeSpanTestData = new ValueTypeTestData<TimeSpan>(
+            TimeSpan.MinValue,
+            TimeSpan.MaxValue);
+
+        /// <summary>
+        /// Common <see cref="TestData"/> for a <see cref="Guid"/>.
+        /// </summary>
+        public static readonly ValueTypeTestData<Guid> GuidTestData = new ValueTypeTestData<Guid>(
+            Guid.NewGuid(),
+            Guid.Empty);
+
+        /// <summary>
+        /// Common <see cref="TestData"/> for a <see cref="DateTimeOffset"/>.
+        /// </summary>
+        public static readonly ValueTypeTestData<DateTimeOffset> DateTimeOffsetTestData = new ValueTypeTestData<DateTimeOffset>(
+            DateTimeOffset.MaxValue,
+            DateTimeOffset.MinValue,
+            new DateTimeOffset(DateTime.Now));
+
+        /// <summary>
+        /// Common <see cref="TestData"/> for an <c>enum</c>.
+        /// </summary>
+        public static readonly ValueTypeTestData<SimpleEnum> SimpleEnumTestData = new ValueTypeTestData<SimpleEnum>(
+            SimpleEnum.First,
+            SimpleEnum.Second,
+            SimpleEnum.Third);
+
+        /// <summary>
+        /// Common <see cref="TestData"/> for an <c>enum</c> implemented with a <see cref="long"/>.
+        /// </summary>
+        public static readonly ValueTypeTestData<LongEnum> LongEnumTestData = new ValueTypeTestData<LongEnum>(
+            LongEnum.FirstLong,
+            LongEnum.SecondLong,
+            LongEnum.ThirdLong);
+
+        /// <summary>
+        /// Common <see cref="TestData"/> for an <c>enum</c> decorated with a <see cref="FlagsAttribtute"/>.
+        /// </summary>
+        public static readonly ValueTypeTestData<FlagsEnum> FlagsEnumTestData = new ValueTypeTestData<FlagsEnum>(
+            FlagsEnum.One,
+            FlagsEnum.Two,
+            FlagsEnum.Four);
+
+        /// <summary>
+        /// Expected permutations of non supported file paths.
+        /// </summary>
+        public static readonly TestData<string> NotSupportedFilePaths = new RefTypeTestData<string>(() => new List<string>() {
+            "cc:\\a\\b",
+        });
+
+        /// <summary>
+        /// Expected permutations of invalid file paths.
+        /// </summary>
+        public static readonly TestData<string> InvalidNonNullFilePaths = new RefTypeTestData<string>(() => new List<string>() {
+            String.Empty,
+            "",
+            " ",
+            "  ",
+            "\t\t \n ",
+            "c:\\a<b",
+            "c:\\a>b",
+            "c:\\a\"b",
+            "c:\\a\tb",
+            "c:\\a|b",
+            "c:\\a\bb",
+            "c:\\a\0b",
+        });
+
+        /// <summary>
+        /// All expected permutations of an empty string.
+        /// </summary>
+        public static readonly TestData<string> NonNullEmptyStrings = new RefTypeTestData<string>(() => new List<string>() { String.Empty, "", " ", "\t\r\n" });
+
+        /// <summary>
+        /// All expected permutations of an empty string.
+        /// </summary>
+        public static readonly TestData<string> EmptyStrings = new RefTypeTestData<string>(() => new List<string>() { null, String.Empty, "", " ", "\t\r\n" });
+
+        /// <summary>
+        ///  Common <see cref="TestData"/> for a <see cref="string"/>.
+        /// </summary>
+        public static readonly RefTypeTestData<string> StringTestData = new RefTypeTestData<string>(() => new List<string>() {
+            "",
+            " ",            // one space
+            "  ",           // multiple spaces
+            " data ",       // leading and trailing whitespace
+            "\t\t \n ",
+            "Some String!"});
+
+        /// <summary>
+        /// A read-only collection of value type test data.
+        /// </summary>
+        public static readonly ReadOnlyCollection<TestData> ValueTypeTestDataCollection = new ReadOnlyCollection<TestData>(new TestData[] {
+            CharTestData,
+            IntTestData,
+            UintTestData,
+            ShortTestData,
+            UshortTestData,
+            LongTestData,
+            UlongTestData,
+            ByteTestData,
+            SByteTestData,
+            BoolTestData,
+            DoubleTestData,
+            FloatTestData,
+            DecimalTestData,
+            TimeSpanTestData,
+            GuidTestData,
+            DateTimeOffsetTestData,
+            SimpleEnumTestData,
+            LongEnumTestData,
+            FlagsEnumTestData});
+
+        /// <summary>
+        /// A read-only collection of representative values and reference type test data.
+        /// Uses where exhaustive coverage is not required.
+        /// </summary>
+        public static readonly ReadOnlyCollection<TestData> RepresentativeValueAndRefTypeTestDataCollection = new ReadOnlyCollection<TestData>(new TestData[] {
+            IntTestData,
+            BoolTestData,
+            SimpleEnumTestData,
+            StringTestData,
+        });
+
+        private Dictionary<TestDataVariations, TestDataVariationProvider> registeredTestDataVariations;
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TestData"/> class.
+        /// </summary>
+        /// <param name="type">The type associated with the <see cref="TestData"/> instance.</param>
+        protected TestData(Type type)
+        {
+            this.Type = type;
+            this.registeredTestDataVariations = new Dictionary<TestDataVariations, TestDataVariationProvider>();
+        }
+
+        /// <summary>
+        /// Gets the type associated with the <see cref="TestData"/> instance.
+        /// </summary>
+        public Type Type { get; private set; }
+
+
+        /// <summary>
+        /// Gets the supported test data variations.
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<TestDataVariations> GetSupportedTestDataVariations()
+        {
+            return this.registeredTestDataVariations.Keys;
+        }
+
+        /// <summary>
+        /// Gets the related type for the given test data variation or returns null if the <see cref="TestData"/> instance
+        /// doesn't support the given variation.
+        /// </summary>
+        /// <param name="variation">The test data variation with which to create the related <see cref="Type"/>.</param>
+        /// <returns>The related <see cref="Type"/> for the <see cref="TestData.Type"/> as given by the test data variation.</returns>
+        /// <example>
+        /// For example, if the given <see cref="TestData"/> was created for <see cref="string"/> test data and the variation parameter
+        /// was <see cref="TestDataVariations.AsList"/> then the returned type would be <see cref="List<string>"/>.
+        /// </example>
+        public Type GetAsTypeOrNull(TestDataVariations variation)
+        {
+            TestDataVariationProvider testDataVariation = null;
+            if (this.registeredTestDataVariations.TryGetValue(variation, out testDataVariation))
+            {
+                return testDataVariation.Type;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Gets test data for the given test data variation or returns null if the <see cref="TestData"/> instance
+        /// doesn't support the given variation.
+        /// </summary>
+        /// <param name="variation">The test data variation with which to create the related test data.</param>
+        /// <returns>Test data of the type specified by the <see cref="TestData.GetAsTypeOrNull"/> method.</returns>
+        public object GetAsTestDataOrNull(TestDataVariations variation)
+        {
+            TestDataVariationProvider testDataVariation = null;
+            if (this.registeredTestDataVariations.TryGetValue(variation, out testDataVariation))
+            {
+                return testDataVariation.TestDataProvider();
+            }
+
+            return null;
+        }
+
+
+        /// <summary>
+        /// Allows derived classes to register a <paramref name="testDataProvider "/> <see cref="Func<>"/> that will
+        /// provide test data for a given variation.
+        /// </summary>
+        /// <param name="variation">The variation with which to register the <paramref name="testDataProvider "/>r.</param>
+        /// <param name="type">The type of the test data created by the <paramref name="testDataProvider "/></param>
+        /// <param name="testDataProvider">A <see cref="Func<>"/> that will provide test data.</param>
+        protected void RegisterTestDataVariation(TestDataVariations variation, Type type, Func<object> testDataProvider)
+        {
+            this.registeredTestDataVariations.Add(variation, new TestDataVariationProvider(type, testDataProvider));
+        }
+
+        private class TestDataVariationProvider
+        {
+            public TestDataVariationProvider(Type type, Func<object> testDataProvider)
+            {
+                this.Type = type;
+                this.TestDataProvider = testDataProvider;
+            }
+
+
+            public Func<object> TestDataProvider { get; private set; }
+
+            public Type Type { get; private set; }
+        }
+    }
+
+
+    /// <summary>
+    /// A generic base class for test data.
+    /// </summary>
+    /// <typeparam name="T">The type associated with the test data.</typeparam>
+    public abstract class TestData<T> : TestData, IEnumerable<T>
+    {
+        private static readonly Type OpenIEnumerableType = typeof(IEnumerable<>);
+        private static readonly Type OpenListType = typeof(List<>);
+        private static readonly Type OpenIQueryableType = typeof(IQueryable<>);
+        private static readonly Type OpenDictionaryType = typeof(Dictionary<,>);
+        private static readonly Type OpenTestDataHolderType = typeof(TestDataHolder<>);
+        private int dictionaryKey;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TestData&lt;T&gt;"/> class.
+        /// </summary>
+        protected TestData()
+            : base(typeof(T))
+        {
+            Type[] typeParams = new Type[] { this.Type };
+            Type[] dictionaryTypeParams = new Type[] { typeof(string), this.Type };
+
+            Type arrayType = this.Type.MakeArrayType();
+            Type listType = OpenListType.MakeGenericType(typeParams);
+            Type iEnumerableType = OpenIEnumerableType.MakeGenericType(typeParams);
+            Type iQueryableType = OpenIQueryableType.MakeGenericType(typeParams);
+            Type dictionaryType = OpenDictionaryType.MakeGenericType(dictionaryTypeParams);
+            Type testDataHolderType = OpenTestDataHolderType.MakeGenericType(typeParams);
+
+            this.RegisterTestDataVariation(TestDataVariations.AsInstance, this.Type, () => GetTypedTestData());
+            this.RegisterTestDataVariation(TestDataVariations.AsArray, arrayType, GetTestDataAsArray);
+            this.RegisterTestDataVariation(TestDataVariations.AsIEnumerable, iEnumerableType, GetTestDataAsIEnumerable);
+            this.RegisterTestDataVariation(TestDataVariations.AsIQueryable, iQueryableType, GetTestDataAsIQueryable);
+            this.RegisterTestDataVariation(TestDataVariations.AsList, listType, GetTestDataAsList);
+            this.RegisterTestDataVariation(TestDataVariations.AsDictionary, dictionaryType, GetTestDataAsDictionary);
+            this.RegisterTestDataVariation(TestDataVariations.AsClassMember, testDataHolderType, GetTestDataInHolder);
+        }
+
+        public IEnumerator<T> GetEnumerator()
+        {
+            return (IEnumerator<T>)this.GetTypedTestData().ToList().GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return (IEnumerator)this.GetTypedTestData().ToList().GetEnumerator();
+        }
+
+        /// <summary>
+        /// Gets the test data as an array.
+        /// </summary>
+        /// <returns>An array of test data of the given type.</returns>
+        public T[] GetTestDataAsArray()
+        {
+            return this.GetTypedTestData().ToArray();
+        }
+
+        /// <summary>
+        /// Gets the test data as a <see cref="List<>"/>.
+        /// </summary>
+        /// <returns>A <see cref="List<>"/> of test data of the given type.</returns>
+        public List<T> GetTestDataAsList()
+        {
+            return this.GetTypedTestData().ToList();
+        }
+
+        /// <summary>
+        /// Gets the test data as an <see cref="IEnumerable<>"/>.
+        /// </summary>
+        /// <returns>An <see cref="IEnumerable<>"/> of test data of the given type.</returns>
+        public IEnumerable<T> GetTestDataAsIEnumerable()
+        {
+            return this.GetTypedTestData().AsEnumerable();
+        }
+
+        /// <summary>
+        /// Gets the test data as an <see cref="IQueryable<>"/>.
+        /// </summary>
+        /// <returns>An <see cref="IQueryable<>"/> of test data of the given type.</returns>
+        public IQueryable<T> GetTestDataAsIQueryable()
+        {
+            //return this.GetTypedTestData().AsQueryable();
+            return null;
+        }
+
+        public Dictionary<string, T> GetTestDataAsDictionary()
+        {
+            // Some TestData collections contain duplicates e.g. UintTestData contains both 0 and UInt32.MinValue.
+            // Therefore use dictionaryKey, not _unused.ToString().  Reset key to keep dictionaries consistent if used
+            // multiple times.
+            dictionaryKey = 0;
+            return this.GetTypedTestData().ToDictionary(_unused => (dictionaryKey++).ToString());
+        }
+
+        public IEnumerable<TestDataHolder<T>> GetTestDataInHolder()
+        {
+            return this.GetTypedTestData().Select(value => new TestDataHolder<T> { V1 = value, });
+        }
+
+        /// <summary>
+        /// Must be implemented by derived types to return test data of the given type.
+        /// </summary>
+        /// <returns>Test data of the given type.</returns>
+        protected abstract IEnumerable<T> GetTypedTestData();
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TestDataHolder.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TestDataHolder.cs
new file mode 100644
index 0000000000..1150db8f9b
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TestDataHolder.cs
@@ -0,0 +1,51 @@
+// 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.
+
+using System;
+using System.Globalization;
+using System.Reflection;
+
+namespace Microsoft.TestCommon
+{
+    /// <summary>
+    /// Equatable class wrapping a single instance of type <paramref name="T"/>. Equatable to ease test assertions.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Type"/> to wrap.</typeparam>
+    public class TestDataHolder<T> : IEquatable<TestDataHolder<T>>
+    {
+        public T V1 { get; set; }
+
+        bool IEquatable<TestDataHolder<T>>.Equals(TestDataHolder<T> other)
+        {
+            if (other == null)
+            {
+                return false;
+            }
+
+            return Object.Equals(V1, other.V1);
+        }
+
+        public override bool Equals(object obj)
+        {
+            TestDataHolder<T> that = obj as TestDataHolder<T>;
+            return ((IEquatable<TestDataHolder<T>>)this).Equals(that);
+        }
+
+        public override int GetHashCode()
+        {
+            if (typeof(ValueType).GetTypeInfo().IsAssignableFrom(typeof(T).GetTypeInfo()) || V1 != null)
+            {
+                return V1.GetHashCode();
+            }
+            else
+            {
+                return 0;
+            }
+        }
+
+        public override string ToString()
+        {
+            return String.Format(CultureInfo.InvariantCulture, "{{ V1: '{0}' }}", V1);
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TestDataSetAttribute.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TestDataSetAttribute.cs
new file mode 100644
index 0000000000..33a5897181
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TestDataSetAttribute.cs
@@ -0,0 +1,223 @@
+// 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.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Xunit.Sdk;
+
+namespace Microsoft.TestCommon
+{
+    public class TestDataSetAttribute : DataAttribute
+    {
+        public Type DeclaringType { get; set; }
+
+        public string PropertyName { get; set; }
+
+        public TestDataVariations TestDataVariations { get; set; }
+
+        private IEnumerable<Tuple<Type, string>> ExtraDataSets { get; set; }
+
+        public TestDataSetAttribute(Type declaringType, string propertyName, TestDataVariations testDataVariations = TestCommon.TestDataVariations.All)
+        {
+            DeclaringType = declaringType;
+            PropertyName = propertyName;
+            TestDataVariations = testDataVariations;
+            ExtraDataSets = new List<Tuple<Type, string>>();
+        }
+
+        public TestDataSetAttribute(
+            Type declaringType,
+            string propertyName,
+            Type declaringType1,
+            string propertyName1,
+            TestDataVariations testDataVariations = TestCommon.TestDataVariations.All)
+            : this(declaringType, propertyName, testDataVariations)
+        {
+            ExtraDataSets = new List<Tuple<Type, string>> { Tuple.Create(declaringType1, propertyName1) };
+        }
+
+        public TestDataSetAttribute(
+            Type declaringType,
+            string propertyName,
+            Type declaringType1,
+            string propertyName1,
+            Type declaringType2,
+            string propertyName2,
+            TestDataVariations testDataVariations = TestCommon.TestDataVariations.All)
+            : this(declaringType, propertyName, testDataVariations)
+        {
+            ExtraDataSets = new List<Tuple<Type, string>> { Tuple.Create(declaringType1, propertyName1), Tuple.Create(declaringType2, propertyName2) };
+        }
+
+        public TestDataSetAttribute(
+            Type declaringType,
+            string propertyName,
+            Type declaringType1,
+            string propertyName1,
+            Type declaringType2,
+            string propertyName2,
+            Type declaringType3,
+            string propertyName3,
+            TestDataVariations testDataVariations = TestCommon.TestDataVariations.All)
+            : this(declaringType, propertyName, testDataVariations)
+        {
+            ExtraDataSets = new List<Tuple<Type, string>> { Tuple.Create(declaringType1, propertyName1), Tuple.Create(declaringType2, propertyName2), Tuple.Create(declaringType3, propertyName3) };
+        }
+
+        public TestDataSetAttribute(
+            Type declaringType,
+            string propertyName,
+            Type declaringType1,
+            string propertyName1,
+            Type declaringType2,
+            string propertyName2,
+            Type declaringType3,
+            string propertyName3,
+            Type declaringType4,
+            string propertyName4,
+            TestDataVariations testDataVariations = TestCommon.TestDataVariations.All)
+            : this(declaringType, propertyName, testDataVariations)
+        {
+            ExtraDataSets = new List<Tuple<Type, string>>
+            {
+                Tuple.Create(declaringType1, propertyName1), Tuple.Create(declaringType2, propertyName2),
+                Tuple.Create(declaringType3, propertyName3), Tuple.Create(declaringType4, propertyName4)
+            };
+        }
+
+        public override IEnumerable<object[]> GetData(MethodInfo testMethod)
+        {
+            IEnumerable<object[]> baseDataSet = GetBaseDataSet(DeclaringType, PropertyName, TestDataVariations);
+            IEnumerable<IEnumerable<object[]>> extraDataSets = GetExtraDataSets();
+
+            IEnumerable<IEnumerable<object[]>> finalDataSets = (new[] { baseDataSet }).Concat(extraDataSets);
+
+            var datasets = CrossProduct(finalDataSets);
+
+            return datasets;
+        }
+
+        private static IEnumerable<object[]> CrossProduct(IEnumerable<IEnumerable<object[]>> datasets)
+        {
+            if (datasets.Count() == 1)
+            {
+                foreach (var dataset in datasets.First())
+                {
+                    yield return dataset;
+                }
+            }
+            else
+            {
+                IEnumerable<object[]> datasetLeft = datasets.First();
+                IEnumerable<object[]> datasetRight = CrossProduct(datasets.Skip(1));
+
+                foreach (var dataLeft in datasetLeft)
+                {
+                    foreach (var dataRight in datasetRight)
+                    {
+                        yield return dataLeft.Concat(dataRight).ToArray();
+                    }
+                }
+            }
+        }
+
+        // The base data set(first one) can either be a TestDataSet or a TestDataSetCollection
+        private static IEnumerable<object[]> GetBaseDataSet(Type declaringType, string propertyName, TestDataVariations variations)
+        {
+            return TryGetDataSetFromTestDataCollection(declaringType, propertyName, variations) ?? GetDataSet(declaringType, propertyName);
+        }
+
+        private IEnumerable<IEnumerable<object[]>> GetExtraDataSets()
+        {
+            foreach (var tuple in ExtraDataSets)
+            {
+                yield return GetDataSet(tuple.Item1, tuple.Item2);
+            }
+        }
+
+        private static object GetTestDataPropertyValue(Type declaringType, string propertyName)
+        {
+            PropertyInfo property = declaringType.GetProperty(propertyName, BindingFlags.Static | BindingFlags.Public);
+
+            if (property == null)
+            {
+                throw new ArgumentException(String.Format("Could not find public static property {0} on {1}", propertyName, declaringType.FullName));
+            }
+            else
+            {
+                return property.GetValue(null, null);
+            }
+        }
+
+        private static IEnumerable<object[]> GetDataSet(Type declaringType, string propertyName)
+        {
+            object propertyValue = GetTestDataPropertyValue(declaringType, propertyName);
+
+            // box the dataset items if the property is not a RefTypeTestData
+            IEnumerable<object> value = (propertyValue as IEnumerable<object>) ?? (propertyValue as IEnumerable).Cast<object>();
+            if (value == null)
+            {
+                throw new InvalidOperationException(String.Format("{0}.{1} is either null or does not implement IEnumerable", declaringType.FullName, propertyName));
+            }
+
+            IEnumerable<object[]> dataset = value as IEnumerable<object[]>;
+            if (dataset != null)
+            {
+                return dataset;
+            }
+            else
+            {
+                return value.Select((data) => new object[] { data });
+            }
+        }
+
+        private static IEnumerable<object[]> TryGetDataSetFromTestDataCollection(Type declaringType, string propertyName, TestDataVariations variations)
+        {
+            object propertyValue = GetTestDataPropertyValue(declaringType, propertyName);
+
+            IEnumerable<TestData> testDataCollection = propertyValue as IEnumerable<TestData>;
+
+            return testDataCollection == null ? null : GetDataSetFromTestDataCollection(testDataCollection, variations);
+        }
+
+        private static IEnumerable<object[]> GetDataSetFromTestDataCollection(IEnumerable<TestData> testDataCollection, TestDataVariations variations)
+        {
+            foreach (TestData testdataInstance in testDataCollection)
+            {
+                foreach (TestDataVariations variation in testdataInstance.GetSupportedTestDataVariations())
+                {
+                    if ((variation & variations) == variation)
+                    {
+                        Type variationType = testdataInstance.GetAsTypeOrNull(variation);
+                        object testData = testdataInstance.GetAsTestDataOrNull(variation);
+                        if (AsSingleInstances(variation))
+                        {
+                            foreach (object obj in (IEnumerable)testData)
+                            {
+                                yield return new object[] { variationType, obj };
+                            }
+                        }
+                        else
+                        {
+                            yield return new object[] { variationType, testData };
+                        }
+                    }
+                }
+            }
+        }
+
+        private static bool AsSingleInstances(TestDataVariations variation)
+        {
+            return variation == TestDataVariations.AsInstance ||
+                   variation == TestDataVariations.AsNullable ||
+                   variation == TestDataVariations.AsDerivedType ||
+                   variation == TestDataVariations.AsKnownType ||
+                   variation == TestDataVariations.AsDataMember ||
+                   variation == TestDataVariations.AsClassMember ||
+                   variation == TestDataVariations.AsXmlElementProperty;
+        }
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TestDataVariations.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TestDataVariations.cs
new file mode 100644
index 0000000000..6dc8620523
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TestDataVariations.cs
@@ -0,0 +1,116 @@
+// 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.
+
+using System;
+
+namespace Microsoft.TestCommon
+{
+    /// <summary>
+    /// An flags enum that can be used to indicate different variations of a given
+    /// <see cref="TestData"/> instance.
+    /// </summary>
+    [Flags]
+    public enum TestDataVariations
+    {
+        /// <summary>
+        /// An individual instance of a given <see cref="TestData"/> type.
+        /// </summary>
+        AsInstance = 0x1,
+
+        /// <summary>
+        /// An individual instance of a type that derives from a given <see cref="TestData"/> type.
+        /// </summary>
+        AsDerivedType = 0x2,
+
+        /// <summary>
+        /// An individual instance of a given <see cref="TestData"/> type that has a property value
+        /// that is a known type of the declared property type.
+        /// </summary>
+        AsKnownType = 0x4,
+
+        /// <summary>
+        /// A <see cref="Nullable<>"/> instance of a given <see cref="TestData"/> type.  Only applies to
+        /// instances of <see cref="ValueTypeTestData"/>.
+        /// </summary>
+        AsNullable = 0x8,
+
+        /// <summary>
+        /// An instance of a <see cref="System.Collections.Generic.List<>"/> of a given <see cref="TestData"/> type.
+        /// </summary>
+        AsList = 0x10,
+
+        /// <summary>
+        /// An instance of a array of the <see cref="TestData"/> type.
+        /// </summary>
+        AsArray = 0x20,
+
+        /// <summary>
+        /// An instance of an <see cref="System.Collections.Generic.IEnumerable<>"/> of a given <see cref="TestData"/> type.
+        /// </summary>
+        AsIEnumerable = 0x40,
+
+        /// <summary>
+        /// An instance of an <see cref="System.Linq.IQueryable<>"/> of a given <see cref="TestData"/> type.
+        /// </summary>
+        AsIQueryable = 0x80,
+
+        /// <summary>
+        /// An instance of a DataContract type in which a given <see cref="TestData"/> type is a member.
+        /// </summary>
+        AsDataMember = 0x100,
+
+        /// <summary>
+        /// An instance of a type in which a given <see cref="TestData"/> type is decorated with a
+        /// <see cref="System.Xml.Serialization.XmlElementAttribute"/>.
+        /// </summary>
+        AsXmlElementProperty = 0x200,
+
+        /// <summary>
+        /// An instance of a <see cref="System.Collections.Generic.IDictionary{string,TValue}"/> of a given
+        /// <see cref="TestData"/> type.
+        /// </summary>
+        AsDictionary = 0x400,
+
+        /// <summary>
+        /// Add a <c>null</c> instance of the given <see cref="TestData"/> type to the data set.  This variation is
+        /// not included in <see cref="All"/> or other variation masks.
+        /// </summary>
+        WithNull = 0x800,
+
+        /// <summary>
+        /// Individual instances of <see cref="TestDataHolder{T}"/> containing the given <see cref="TestData"/>.  This
+        /// variation is not included in <see cref="All"/> or other variation masks.
+        /// </summary>
+        AsClassMember = 0x1000,
+
+        /// <summary>
+        /// All of the flags for single instance variations of a given <see cref="TestData"/> type.
+        /// </summary>
+        AllSingleInstances = AsInstance | AsDerivedType | AsKnownType | AsNullable,
+
+        /// <summary>
+        /// All of the flags for collection variations of a given <see cref="TestData"/> type.
+        /// </summary>
+        AllCollections = AsList | AsArray | AsIEnumerable | AsIQueryable | AsDictionary,
+
+        /// <summary>
+        /// All of the flags for variations in which a given <see cref="TestData"/> type is a property on another type.
+        /// </summary>
+        AllProperties = AsDataMember | AsXmlElementProperty,
+
+        /// <summary>
+        /// All of the flags for interface collection variations of a given <see cref="TestData"/> type.
+        /// </summary>
+        AllInterfaces = AsIEnumerable | AsIQueryable,
+
+        /// <summary>
+        /// All of the flags except for the interface collection variations of a given <see cref="TestData"/> type.
+        /// </summary>
+        AllNonInterfaces = All & ~AllInterfaces,
+
+        /// <summary>
+        /// All of the flags for all of the variations of a given <see cref="TestData"/> type.
+        /// </summary>
+        All = AllSingleInstances | AllCollections | AllProperties
+    }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TypeAssert.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TypeAssert.cs
new file mode 100644
index 0000000000..5fcfdd437a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/TypeAssert.cs
@@ -0,0 +1,165 @@
+// 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.
+
+using System;
+using System.Reflection;
+using Xunit;
+
+namespace Microsoft.TestCommon
+{
+    /// <summary>
+    /// MSTest utility for testing that a given type has the expected properties such as being public, sealed, etc.
+    /// </summary>
+    public class TypeAssert
+    {
+        /// <summary>
+        /// Specifies a set of type properties to test for using the <see cref="CheckProperty"/> method.
+        /// This enumeration has a <see cref="FlagsAttribute"/> attribute that allows a bitwise combination of its member values.
+        /// </summary>
+        [Flags]
+        public enum TypeProperties
+        {
+            /// <summary>
+            /// Indicates that the type must be abstract.
+            /// </summary>
+            IsAbstract = 0x1,
+
+            /// <summary>
+            /// Indicates that the type must be a class.
+            /// </summary>
+            IsClass = 0x2,
+
+            /// <summary>
+            /// Indicates that the type must be a COM object.
+            /// </summary>
+            IsComObject = 0x4,
+
+            /// <summary>
+            /// Indicates that the type must be disposable.
+            /// </summary>
+            IsDisposable = 0x8,
+
+            /// <summary>
+            /// Indicates that the type must be an enum.
+            /// </summary>
+            IsEnum = 0x10,
+
+            /// <summary>
+            /// Indicates that the type must be a generic type.
+            /// </summary>
+            IsGenericType = 0x20,
+
+            /// <summary>
+            /// Indicates that the type must be a generic type definition.
+            /// </summary>
+            IsGenericTypeDefinition = 0x40,
+
+            /// <summary>
+            /// Indicates that the type must be an interface.
+            /// </summary>
+            IsInterface = 0x80,
+
+            /// <summary>
+            /// Indicates that the type must be nested and declared private.
+            /// </summary>
+            IsNestedPrivate = 0x100,
+
+            /// <summary>
+            /// Indicates that the type must be nested and declared public.
+            /// </summary>
+            IsNestedPublic = 0x200,
+
+            /// <summary>
+            /// Indicates that the type must be public.
+            /// </summary>
+            IsPublic = 0x400,
+
+            /// <summary>
+            /// Indicates that the type must be sealed.
+            /// </summary>
+            IsSealed = 0x800,
+
+            /// <summary>
+            /// Indicates that the type must be visible outside the assembly.
+            /// </summary>
+            IsVisible = 0x1000,
+
+            /// <summary>
+            /// Indicates that the type must be static.
+            /// </summary>
+            IsStatic = TypeAssert.TypeProperties.IsAbstract | TypeAssert.TypeProperties.IsSealed,
+
+            /// <summary>
+            /// Indicates that the type must be a public, visible class.
+            /// </summary>
+            IsPublicVisibleClass = TypeAssert.TypeProperties.IsClass | TypeAssert.TypeProperties.IsPublic | TypeAssert.TypeProperties.IsVisible
+        }
+
+        private static void CheckProperty(Type type, bool expected, bool actual, string property)
+        {
+            Assert.NotNull(type);
+            Assert.True(expected == actual, String.Format("Type '{0}' should{1} be {2}.", type.FullName, expected ? "" : " NOT", property));
+        }
+
+        /// <summary>
+        /// Determines whether the specified type has a given set of properties such as being public, sealed, etc.
+        /// The method asserts if one or more of the properties are not satisfied.
+        /// </summary>
+        /// <typeparam name="T">The type to test for properties.</typeparam>
+        /// <param name="typeProperties">The set of type properties to test for.</param>
+        public void HasProperties<T>(TypeProperties typeProperties)
+        {
+            HasProperties(typeof(T), typeProperties);
+        }
+
+        /// <summary>
+        /// Determines whether the specified type has a given set of properties such as being public, sealed, etc.
+        /// The method asserts if one or more of the properties are not satisfied.
+        /// </summary>
+        /// <typeparam name="T">The type to test for properties.</typeparam>
+        /// <typeparam name="TIsAssignableFrom">Verify that the type to test is assignable from this type.</typeparam>
+        /// <param name="typeProperties">The set of type properties to test for.</param>
+        public void HasProperties<T, TIsAssignableFrom>(TypeProperties typeProperties)
+        {
+            HasProperties(typeof(T), typeProperties, typeof(TIsAssignableFrom));
+        }
+
+        /// <summary>
+        /// Determines whether the specified type has a given set of properties such as being public, sealed, etc.
+        /// The method asserts if one or more of the properties are not satisfied.
+        /// </summary>
+        /// <param name="type">The type to test for properties.</param>
+        /// <param name="typeProperties">The set of type properties to test for.</param>
+        public void HasProperties(Type type, TypeProperties typeProperties)
+        {
+            HasProperties(type, typeProperties, null);
+        }
+
+        /// <summary>
+        /// Determines whether the specified type has a given set of properties such as being public, sealed, etc.
+        /// The method asserts if one or more of the properties are not satisfied.
+        /// </summary>
+        /// <param name="type">The type to test for properties.</param>
+        /// <param name="typeProperties">The set of type properties to test for.</param>
+        /// <param name="isAssignableFrom">Verify that the type to test is assignable from this type.</param>
+        public void HasProperties(Type type, TypeProperties typeProperties, Type isAssignableFrom)
+        {
+            TypeAssert.CheckProperty(type, (typeProperties & TypeProperties.IsAbstract) > 0, type.GetTypeInfo().IsAbstract, "abstract");
+            TypeAssert.CheckProperty(type, (typeProperties & TypeProperties.IsClass) > 0, type.GetTypeInfo().IsClass, "a class");
+            TypeAssert.CheckProperty(type, (typeProperties & TypeProperties.IsDisposable) > 0, typeof(IDisposable).IsAssignableFrom(type), "disposable");
+            TypeAssert.CheckProperty(type, (typeProperties & TypeProperties.IsEnum) > 0, type.GetTypeInfo().IsEnum, "an enum");
+            TypeAssert.CheckProperty(type, (typeProperties & TypeProperties.IsGenericType) > 0, type.GetTypeInfo().IsGenericType, "a generic type");
+            TypeAssert.CheckProperty(type, (typeProperties & TypeProperties.IsGenericTypeDefinition) > 0, type.GetTypeInfo().IsGenericTypeDefinition, "a generic type definition");
+            TypeAssert.CheckProperty(type, (typeProperties & TypeProperties.IsInterface) > 0, type.GetTypeInfo().IsInterface, "an interface");
+            TypeAssert.CheckProperty(type, (typeProperties & TypeProperties.IsNestedPrivate) > 0, type.GetTypeInfo().IsNestedPrivate, "nested private");
+            TypeAssert.CheckProperty(type, (typeProperties & TypeProperties.IsNestedPublic) > 0, type.GetTypeInfo().IsNestedPublic, "nested public");
+            TypeAssert.CheckProperty(type, (typeProperties & TypeProperties.IsPublic) > 0, type.GetTypeInfo().IsPublic, "public");
+            TypeAssert.CheckProperty(type, (typeProperties & TypeProperties.IsSealed) > 0, type.GetTypeInfo().IsSealed, "sealed");
+            TypeAssert.CheckProperty(type, (typeProperties & TypeProperties.IsVisible) > 0, type.GetTypeInfo().IsVisible, "visible");
+            if (isAssignableFrom != null)
+            {
+                TypeAssert.CheckProperty(type, true, isAssignableFrom.GetTypeInfo().IsAssignableFrom(type.GetTypeInfo()), String.Format("assignable from {0}", isAssignableFrom.FullName));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/ValueTypeTestData.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/ValueTypeTestData.cs
new file mode 100644
index 0000000000..47fb2bba27
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/TestUtils/ValueTypeTestData.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.TestCommon
+{
+    public class ValueTypeTestData<T> : TestData<T> where T : struct
+    {
+        private static readonly Type OpenNullableType = typeof(Nullable<>);
+        private T[] testData;
+
+        public ValueTypeTestData(params T[] testData)
+            : base()
+        {
+            this.testData = testData;
+
+            Type[] typeParams = new Type[] { this.Type };
+            this.RegisterTestDataVariation(TestDataVariations.WithNull, OpenNullableType.MakeGenericType(typeParams), GetNullTestData);
+            this.RegisterTestDataVariation(TestDataVariations.AsNullable, OpenNullableType.MakeGenericType(typeParams), GetTestDataAsNullable);
+        }
+
+        public object GetNullTestData()
+        {
+            return null;
+        }
+
+        public IEnumerable<Nullable<T>> GetTestDataAsNullable()
+        {
+            return this.GetTypedTestData().Select(d => new Nullable<T>(d));
+        }
+
+        protected override IEnumerable<T> GetTypedTestData()
+        {
+            return this.testData;
+        }
+    }
+}
diff --git a/src/Mvc/test/MvcTests.ruleset b/src/Mvc/test/MvcTests.ruleset
new file mode 100644
index 0000000000..23f2deac4a
--- /dev/null
+++ b/src/Mvc/test/MvcTests.ruleset
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="Rules for MVC Tests" Description="Code analysis rules for MVC Tests" ToolsVersion="15.0">
+  <Rules AnalyzerId="xunit.analyzers" RuleNamespace="xunit.analyzers">
+    <!-- 
+      This code is produced when theory parameters that are unused. Normally, this is a warning which causes our build to fail.
+    -->
+    <Rule Id="xUnit1026" Action="Info" />
+  </Rules>
+</RuleSet>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/ActionDescriptorChangeProvider.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/ActionDescriptorChangeProvider.cs
new file mode 100644
index 0000000000..abc1b3b8b3
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/ActionDescriptorChangeProvider.cs
@@ -0,0 +1,28 @@
+// 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.
+
+using System.Threading;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.Extensions.Primitives;
+
+namespace ApiExplorerWebSite
+{
+    public class ActionDescriptorChangeProvider : IActionDescriptorChangeProvider
+    {
+        private ActionDescriptorChangeProvider()
+        {
+        }
+
+        public static ActionDescriptorChangeProvider Instance { get; } = new ActionDescriptorChangeProvider();
+
+        public CancellationTokenSource TokenSource { get; private set; }
+
+        public bool HasChanged { get; set; }
+
+        public IChangeToken GetChangeToken()
+        {
+            TokenSource = new CancellationTokenSource();
+            return new CancellationChangeToken(TokenSource.Token);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs
new file mode 100644
index 0000000000..fdf64194eb
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs
@@ -0,0 +1,185 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace ApiExplorerWebSite
+{
+    /// <summary>
+    /// A resource filter that looks up and serializes Api Explorer data for the action.
+    ///
+    /// This replaces the 'actual' output of the action.
+    /// </summary>
+    public class ApiExplorerDataFilter : IResourceFilter
+    {
+        private readonly IApiDescriptionGroupCollectionProvider _descriptionProvider;
+
+        public ApiExplorerDataFilter(IApiDescriptionGroupCollectionProvider descriptionProvider)
+        {
+            _descriptionProvider = descriptionProvider;
+        }
+
+        public void OnResourceExecuting(ResourceExecutingContext context)
+        {
+            var controllerActionDescriptor = context.ActionDescriptor as ControllerActionDescriptor;
+            if (controllerActionDescriptor != null && controllerActionDescriptor.MethodInfo.IsDefined(typeof(PassThruAttribute)))
+            {
+                return;
+            }
+
+            var descriptions = new List<ApiExplorerData>();
+            foreach (var group in _descriptionProvider.ApiDescriptionGroups.Items)
+            {
+                foreach (var description in group.Items)
+                {
+                    if (context.ActionDescriptor == description.ActionDescriptor)
+                    {
+                        descriptions.Add(CreateSerializableData(description));
+                    }
+                }
+            }
+
+            context.Result = new JsonResult(descriptions);
+        }
+
+        public void OnResourceExecuted(ResourceExecutedContext context)
+        {
+        }
+
+        private ApiExplorerData CreateSerializableData(ApiDescription description)
+        {
+            var data = new ApiExplorerData()
+            {
+                GroupName = description.GroupName,
+                HttpMethod = description.HttpMethod,
+                RelativePath = description.RelativePath
+            };
+
+            foreach (var parameter in description.ParameterDescriptions)
+            {
+                var parameterData = new ApiExplorerParameterData()
+                {
+                    Name = parameter.Name,
+                    Source = parameter.Source.Id,
+                    Type = parameter.Type?.FullName,
+                };
+
+                if (parameter.RouteInfo != null)
+                {
+                    parameterData.RouteInfo = new ApiExplorerParameterRouteInfo()
+                    {
+                        ConstraintTypes = parameter.RouteInfo.Constraints?.Select(c => c.GetType().Name).ToArray(),
+                        DefaultValue = parameter.RouteInfo.DefaultValue,
+                        IsOptional = parameter.RouteInfo.IsOptional,
+                    };
+                }
+
+                data.ParameterDescriptions.Add(parameterData);
+            }
+
+            foreach (var request in description.SupportedRequestFormats)
+            {
+                data.SupportedRequestFormats.Add(new ApiExplorerRequestFormat
+                {
+                    FormatterType = request.Formatter?.GetType().FullName,
+                    MediaType = request.MediaType,
+                });
+            }
+
+            foreach (var response in description.SupportedResponseTypes)
+            {
+                var responseType = new ApiExplorerResponseType()
+                {
+                    StatusCode = response.StatusCode,
+                    ResponseType = response.Type?.FullName,
+                    IsDefaultResponse = response.IsDefaultResponse,
+                };
+
+                foreach(var responseFormat in response.ApiResponseFormats)
+                {
+                    responseType.ResponseFormats.Add(new ApiExplorerResponseFormat()
+                    {
+                        FormatterType = responseFormat.Formatter?.GetType().FullName,
+                        MediaType = responseFormat.MediaType
+                    });
+                }
+
+                data.SupportedResponseTypes.Add(responseType);
+            }
+
+            return data;
+        }
+
+        // Used to serialize data between client and server
+        private class ApiExplorerData
+        {
+            public string GroupName { get; set; }
+
+            public string HttpMethod { get; set; }
+
+            public List<ApiExplorerParameterData> ParameterDescriptions { get; } = new List<ApiExplorerParameterData>();
+
+            public string RelativePath { get; set; }
+
+            public List<ApiExplorerResponseType> SupportedResponseTypes { get; } = new List<ApiExplorerResponseType>();
+
+            public List<ApiExplorerRequestFormat> SupportedRequestFormats { get; } = new List<ApiExplorerRequestFormat>();
+        }
+
+        // Used to serialize data between client and server
+        private class ApiExplorerParameterData
+        {
+            public string Name { get; set; }
+
+            public ApiExplorerParameterRouteInfo RouteInfo { get; set; }
+
+            public string Source { get; set; }
+
+            public string Type { get; set; }
+        }
+
+        // Used to serialize data between client and server
+        private class ApiExplorerParameterRouteInfo
+        {
+            public string[] ConstraintTypes { get; set; }
+
+            public object DefaultValue { get; set; }
+
+            public bool IsOptional { get; set; }
+        }
+
+        // Used to serialize data between client and server
+        private class ApiExplorerResponseType
+        {
+            public IList<ApiExplorerResponseFormat> ResponseFormats { get; }
+                = new List<ApiExplorerResponseFormat>();
+
+            public string ResponseType { get; set; }
+
+            public int StatusCode { get; set; }
+
+            public bool IsDefaultResponse { get; set; }
+        }
+
+        private class ApiExplorerResponseFormat
+        {
+            public string MediaType { get; set; }
+
+            public string FormatterType { get; set; }
+        }
+
+        private class ApiExplorerRequestFormat
+        {
+            public string MediaType { get; set; }
+
+            public string FormatterType { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerInboundOutboundConvention.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerInboundOutboundConvention.cs
new file mode 100644
index 0000000000..fa826ebf6d
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerInboundOutboundConvention.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System;
+using System.Reflection;
+using ApiExplorerWebSite.Controllers;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+namespace ApiExplorerWebSite
+{
+    // Disables ApiExplorer for a specific controller type.
+    // This is part of the test that validates that ApiExplorer can be configured via
+    // convention
+    public class ApiExplorerInboundOutboundConvention : IApplicationModelConvention
+    {
+        private readonly TypeInfo _type;
+
+        public ApiExplorerInboundOutboundConvention(Type type)
+        {
+            _type = type.GetTypeInfo();
+        }
+
+        public void Apply(ApplicationModel application)
+        {
+            foreach (var controller in application.Controllers)
+            {
+                if (controller.ControllerType == _type)
+                {
+                    foreach (var action in controller.Actions)
+                    {
+                        if (action.ActionName == nameof(ApiExplorerInboundOutBoundController.SuppressedForPathMatching))
+                        {
+                            action.Selectors[0].AttributeRouteModel.SuppressPathMatching = true;
+                        }
+                        else if (action.ActionName == nameof(ApiExplorerInboundOutBoundController.SuppressedForLinkGeneration))
+                        {
+                            action.Selectors[0].AttributeRouteModel.SuppressLinkGeneration = true;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityDisabledConvention.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityDisabledConvention.cs
new file mode 100644
index 0000000000..9b6be36b43
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityDisabledConvention.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+namespace ApiExplorerWebSite
+{
+    // Disables ApiExplorer for a specific controller type.
+    // This is part of the test that validates that ApiExplorer can be configured via
+    // convention
+    public class ApiExplorerVisibilityDisabledConvention : IApplicationModelConvention
+    {
+        private readonly TypeInfo _type;
+
+        public ApiExplorerVisibilityDisabledConvention(Type type)
+        {
+            _type = type.GetTypeInfo();
+        }
+
+        public void Apply(ApplicationModel application)
+        {
+            foreach (var controller in application.Controllers)
+            {
+                if (controller.ControllerType == _type)
+                {
+                    controller.ApiExplorer.IsVisible = false;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityEnabledConvention.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityEnabledConvention.cs
new file mode 100644
index 0000000000..bd19f1f92a
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityEnabledConvention.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+namespace ApiExplorerWebSite
+{
+    // Enables ApiExplorer for controllers that haven't explicitly configured it.
+    // This is part of the test that validates that ApiExplorer can be configured via
+    // convention
+    public class ApiExplorerVisibilityEnabledConvention : IApplicationModelConvention
+    {
+        public void Apply(ApplicationModel application)
+        {
+            foreach (var controller in application.Controllers)
+            {
+                if (controller.ApiExplorer.IsVisible == null)
+                {
+                    controller.ApiExplorer.IsVisible = true;
+                    controller.ApiExplorer.GroupName = controller.ControllerName;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj
new file mode 100644
index 0000000000..239ce99f78
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc.Formatters.Xml\Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerApiController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerApiController.cs
new file mode 100644
index 0000000000..d45f0bb07a
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerApiController.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
+
+namespace ApiExplorerWebSite
+{
+    [Route("ApiExplorerApiController/[action]")]
+    [ApiController]
+    public class ApiExplorerApiController : Controller
+    {
+        public IActionResult ActionWithoutParameters() => Ok();
+
+        public void ActionWithSomeParameters(object input)
+        {
+        }
+
+        public void ActionWithIdParameter(int id, string name)
+        {
+        }
+
+        public void ActionWithIdSuffixParameter(int personId, string personName)
+        {
+        }
+
+        public void ActionWithFormFileCollectionParameter(IFormFileCollection formFile)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerHttpMethodController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerHttpMethodController.cs
new file mode 100644
index 0000000000..95de9f1497
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerHttpMethodController.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ApiExplorerWebSite
+{
+    [Route("ApiExplorerHttpMethod")]
+    public class ApiExplorerHttpMethodController : Controller
+    {
+        [Route("All")]
+        public void All()
+        {
+        }
+
+        [HttpGet("Get")]
+        public void Get()
+        {
+        }
+
+        [AcceptVerbs("PUT", "POST", Route = "Single")]
+        public void PutOrPost()
+        {
+        }
+
+        [HttpGet("MultipleActions")]
+        [HttpPut("MultipleActions")]
+        public void MultipleActions()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerInboundOutboundController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerInboundOutboundController.cs
new file mode 100644
index 0000000000..55b4787a03
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerInboundOutboundController.cs
@@ -0,0 +1,20 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ApiExplorerWebSite.Controllers
+{
+    public class ApiExplorerInboundOutBoundController : Controller
+    {
+        [HttpGet("ApiExplorerInboundOutbound/SuppressedForLinkGeneration")]
+        public void SuppressedForLinkGeneration()
+        {
+        }
+
+        [HttpGet("ApiExplorerInboundOutbound/SuppressedForPathMatching")]
+        public void SuppressedForPathMatching()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetByConventionController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetByConventionController.cs
new file mode 100644
index 0000000000..e6e39a5cad
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetByConventionController.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ApiExplorerWebSite
+{
+    [Route("ApiExplorerNameSetByConvention")]
+    public class ApiExplorerNameSetByConventionController : Controller
+    {
+        [HttpGet]
+        public void Get()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetExplicitlyController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetExplicitlyController.cs
new file mode 100644
index 0000000000..7aa4467540
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetExplicitlyController.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ApiExplorerWebSite
+{
+    [ApiExplorerSettings(GroupName = "SetOnController")]
+    [Route("ApiExplorerNameSetExplicitly")]
+    public class ApiExplorerNameSetExplicitlyController : Controller
+    {
+        [HttpGet("SetOnController")]
+        public void SetOnController()
+        {
+        }
+
+        [ApiExplorerSettings(GroupName = "SetOnAction")]
+        [HttpGet("SetOnAction")]
+        public void SetOnAction()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerParametersController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerParametersController.cs
new file mode 100644
index 0000000000..a422553574
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerParametersController.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ApiExplorerWebSite.Controllers
+{
+    [Route("ApiExplorerParameters/[action]")]
+    public class ApiExplorerParametersController : Controller
+    {
+        public void SimpleParameters(int i, string s)
+        {
+        }
+
+        public void SimpleParametersWithBinderMetadata([FromQuery] int i, [FromRoute] string s)
+        {
+        }
+
+        public void SimpleModel(Product product)
+        {
+        }
+
+        [Route("{id}")]
+        public void SimpleModelFromBody(int id, [FromBody] Product product)
+        {
+        }
+
+        public void ComplexModel([FromQuery] OrderDTO order)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerReloadableController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerReloadableController.cs
new file mode 100644
index 0000000000..31103ba0f2
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerReloadableController.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+namespace ApiExplorerWebSite
+{
+    [Route("ApiExplorerReload")]
+    public class ApiExplorerReloadableController : Controller
+    {
+        [ApiExplorerRouteChangeConvention]
+        [Route("Index")]
+        public string Index() => "Hello world";
+
+        [Route("Reload")]
+        [PassThru]
+        public IActionResult Reload()
+        {
+            ActionDescriptorChangeProvider.Instance.HasChanged = true;
+            ActionDescriptorChangeProvider.Instance.TokenSource.Cancel();
+            return Ok();
+        }
+
+        public class ApiExplorerRouteChangeConventionAttribute : Attribute, IActionModelConvention
+        {
+            public void Apply(ActionModel action)
+            {
+                if (ActionDescriptorChangeProvider.Instance.HasChanged)
+                {
+                    action.ActionName = "NewIndex";
+                    action.Selectors.Clear();
+                    action.Selectors.Add(new SelectorModel
+                    {
+                        AttributeRouteModel = new AttributeRouteModel
+                        {
+                            Template = "NewIndex"
+                        }
+                    });
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeController.cs
new file mode 100644
index 0000000000..3a5d526954
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeController.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ApiExplorerWebSite
+{
+    [Route("ApiExplorerResponseContentType/[Action]")]
+    public class ApiExplorerResponseContentTypeController : Controller
+    {
+        [HttpGet]
+        public Product Unset()
+        {
+            return null;
+        }
+
+        [HttpGet]
+        [Produces("application/json", "text/json")]
+        public Product Specific()
+        {
+            return null;
+        }
+
+        [HttpGet]
+        [Produces("application/hal+custom", "application/hal+json")]
+        public Product WildcardMatch()
+        {
+            return null;
+        }
+
+        [HttpGet]
+        [Produces("application/custom", "text/hal+bson")]
+        public Product NoMatch()
+        {
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeOverrideOnActionController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeOverrideOnActionController.cs
new file mode 100644
index 0000000000..78ba0af5ed
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeOverrideOnActionController.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ApiExplorerWebSite
+{
+    [Produces("text/xml")]
+    [Route("ApiExplorerResponseContentTypeOverrideOnAction")]
+    public class ApiExplorerResponseContentTypeOverrideOnActionController : Controller
+    {
+        [HttpGet("Controller")]
+        public Product GetController()
+        {
+            return null;
+        }
+
+        [HttpGet("Action")]
+        [Produces("application/json")]
+        public Product GetAction()
+        {
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeOverrideOnActionController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeOverrideOnActionController.cs
new file mode 100644
index 0000000000..10f9a95249
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeOverrideOnActionController.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ApiExplorerWebSite
+{
+    [Produces("application/json", Type = typeof(Product))]
+    [ProducesResponseType(typeof(ErrorInfo), 500)]
+    [Route("ApiExplorerResponseTypeOverrideOnAction")]
+    public class ApiExplorerResponseTypeOverrideOnActionController : Controller
+    {
+        [HttpGet("Controller")]
+        public void GetController()
+        {
+        }
+
+        [HttpGet("Action")]
+        [Produces(typeof(Customer))]
+        [ProducesResponseType(typeof(ErrorInfoOverride), 500)] // overriding the type specified on the server
+        public object GetAction()
+        {
+            return null;
+        }
+    }
+
+    public class ErrorInfo
+    {
+        public string Message { get; set; }
+    }
+
+    public class ErrorInfoOverride { }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithAttributeController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithAttributeController.cs
new file mode 100644
index 0000000000..e902e8ec56
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithAttributeController.cs
@@ -0,0 +1,88 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+
+namespace ApiExplorerWebSite
+{
+    [Route("[controller]/[Action]")]
+    public class ApiExplorerResponseTypeWithAttributeController : Controller
+    {
+        [HttpGet]
+        [ProducesResponseType(typeof(void), 204)]
+        public void GetVoidWithExplicitResponseTypeStatusCode()
+        {
+        }
+
+        [HttpGet]
+        [Produces(typeof(Customer))]
+        public void GetVoid()
+        {
+        }
+
+        [HttpGet]
+        [Produces("application/json", Type = typeof(Product))]
+        public object GetObject()
+        {
+            return null;
+        }
+
+        [HttpGet]
+        [Produces("application/json", Type = typeof(string))]
+        public IActionResult GetIActionResult()
+        {
+            return new EmptyResult();
+        }
+
+        [HttpGet]
+        [ProducesResponseType(typeof(void), 204)]
+        public Task GetTaskWithExplicitResponseTypeStatusCode()
+        {
+            return Task.FromResult(true);
+        }
+
+        [HttpGet]
+        [Produces("application/json", Type = typeof(int))]
+        public Task GetTask()
+        {
+            return null;
+        }
+
+        [HttpGet]
+        [Produces(typeof(Customer))] // It's possible to lie about what type you return
+        public Product GetProduct()
+        {
+            return null;
+        }
+
+        [ProducesResponseType(typeof(Product), 201)]
+        [ProducesResponseType(typeof(SerializableError), 400)]
+        public Product CreateProductWithDefaultResponseContentTypes(Product product)
+        {
+            return null;
+        }
+
+        [Produces("text/xml")] // Has status code as 200 but is not applied as it does not set 'Type'
+        [ProducesResponseType(typeof(Product), 201)]
+        [ProducesResponseType(typeof(SerializableError), 400)]
+        public Product CreateProductWithLimitedResponseContentTypes(Product product)
+        {
+            return null;
+        }
+
+        [ProducesResponseType(typeof(Product), 200)]
+        [ProducesResponseType(typeof(SerializableError), 400)]
+        public Product UpdateProductWithDefaultResponseContentTypes(Product product)
+        {
+            return null;
+        }
+
+        [Produces("text/xml", Type = typeof(Product))] // Has status code as 200
+        [ProducesResponseType(typeof(SerializableError), 400)]
+        public Product UpdateProductWithLimitedResponseContentTypes(Product product)
+        {
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs
new file mode 100644
index 0000000000..0dd2a8f9d9
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs
@@ -0,0 +1,86 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+
+namespace ApiExplorerWebSite
+{
+    [Route("ApiExplorerResponseTypeWithoutAttribute/[Action]")]
+    public class ApiExplorerResponseTypeWithoutAttributeController : Controller
+    {
+        [HttpGet]
+        public void GetVoid()
+        {
+        }
+
+        [HttpGet]
+        public object GetObject()
+        {
+            return null;
+        }
+
+        [HttpGet]
+        public IActionResult GetIActionResult()
+        {
+            return new EmptyResult();
+        }
+
+        [HttpGet]
+        public ObjectResult GetDerivedActionResult()
+        {
+            return new ObjectResult(null);
+        }
+
+        [HttpGet]
+        public Product GetProduct()
+        {
+            return null;
+        }
+
+        [HttpGet]
+        public ActionResult<Product> GetActionResultProduct() => null;
+
+        [HttpGet]
+        public int GetInt()
+        {
+            return 0;
+        }
+
+        [HttpGet]
+        public Task GetTask()
+        {
+            return Task.FromResult(true);
+        }
+
+        [HttpGet]
+        public Task<object> GetTaskOfObject()
+        {
+            return Task.FromResult<object>(null);
+        }
+
+        [HttpGet]
+        public Task<IActionResult> GetTaskOfIActionResult()
+        {
+            return Task.FromResult<IActionResult>(new EmptyResult());
+        }
+
+        [HttpGet]
+        public Task<ObjectResult> GetTaskOfDerivedActionResult()
+        {
+            return Task.FromResult(new ObjectResult(null));
+        }
+
+        [HttpGet]
+        public Task<Product> GetTaskOfProduct()
+        {
+            return Task.FromResult<Product>(null);
+        }
+
+        [HttpGet]
+        public Task<int> GetTaskOfInt()
+        {
+            return Task.FromResult<int>(0);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerRouteAndPathParametersInformationController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerRouteAndPathParametersInformationController.cs
new file mode 100644
index 0000000000..5e6fb50239
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerRouteAndPathParametersInformationController.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ApiExplorerWebSite
+{
+    [Route("ApiExplorerRouteAndPathParametersInformation")]
+    public class ApiExplorerRouteAndPathParametersInformationController
+    {
+        [HttpGet]
+        public void Get() { }
+
+        [HttpGet("{id}")]
+        public void Get(int id) { }
+
+        [HttpGet("Optional/{id?}")]
+        public void GetOptional(int id = 0) { }
+
+        [HttpGet("Constraint/{integer:int}")]
+        public void GetInteger(int integer) { }
+
+        [HttpGet("CatchAll/{*parameter}")]
+        public void GetCatchAll(string parameter) { }
+
+        [HttpGet("MultipleParametersInSegment/{month:range(1,12)}-{day:int}-{year:int}")]
+        public void GetMultipleParametersInSegment(string month, string day, string year) { }
+
+        [HttpGet("MultipleParametersInMultipleSegments/{month:range(1,12)}/{day:int?}/{year:int?}")]
+        public void GetMultipleParametersInMultipleSegments(string month, string day, string year = "") { }
+
+        [HttpGet("MultipleTypesOfParameters/{path}/{pathAndQuery}/{pathAndFromBody}")]
+        public void MultipleTypesOfParameters(string query, string pathAndQuery, [FromBody] string pathAndFromBody) { }
+
+        [HttpGet("CatchAllAndConstraint/{*integer:int}")]
+        public void GetIntegers(string integer) { }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityDisabledByConventionController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityDisabledByConventionController.cs
new file mode 100644
index 0000000000..d29a11bc5f
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityDisabledByConventionController.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ApiExplorerWebSite
+{
+    [Route("ApiExplorerVisbilityDisabledByConvention")]
+    public class ApiExplorerVisbilityDisabledByConventionController : Controller
+    {
+        [HttpGet]
+        public void Get()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityEnabledByConventionController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityEnabledByConventionController.cs
new file mode 100644
index 0000000000..7b674cb022
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityEnabledByConventionController.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ApiExplorerWebSite
+{
+    [Route("ApiExplorerVisbilityEnabledByConvention")]
+    public class ApiExplorerVisbilityEnabledByConventionController : Controller
+    {
+        [HttpGet]
+        public void Get()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilitySetExplicitlyController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilitySetExplicitlyController.cs
new file mode 100644
index 0000000000..ceeaf65748
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilitySetExplicitlyController.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ApiExplorerWebSite
+{
+    [ApiExplorerSettings(IgnoreApi = true)]
+    [Route("ApiExplorerVisibilitySetExplicitly")]
+    public class ApiExplorerVisibilitySetExplicitlyController : Controller
+    {
+        [ApiExplorerSettings(IgnoreApi = false)]
+        [HttpGet("Enabled")]
+        public void Enabled()
+        {
+        }
+
+        [HttpGet("Disabled")]
+        public void Disabled()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Models/Customer.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Models/Customer.cs
new file mode 100644
index 0000000000..7a2e6f2e15
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Models/Customer.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace ApiExplorerWebSite
+{
+    public class Customer
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Models/CustomerCommentsDTO.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Models/CustomerCommentsDTO.cs
new file mode 100644
index 0000000000..beaa134a5f
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Models/CustomerCommentsDTO.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ApiExplorerWebSite
+{
+    public class CustomerCommentsDTO
+    {
+        [FromQuery]
+        public string ShippingInstructions { get; set; }
+
+        public string Feedback { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Models/OrderDTO.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Models/OrderDTO.cs
new file mode 100644
index 0000000000..02065b5f1f
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Models/OrderDTO.cs
@@ -0,0 +1,20 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ApiExplorerWebSite
+{
+    public class OrderDTO
+    {
+        public string CustomerId { get; set; }
+
+        [FromHeader(Name = "Referrer")]
+        public string ReferrerId { get; set; }
+
+        public OrderDetailsDTO Details { get; set; }
+
+        [FromForm]
+        public CustomerCommentsDTO Comments { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Models/OrderDetailsDTO.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Models/OrderDetailsDTO.cs
new file mode 100644
index 0000000000..9b2f5b9829
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Models/OrderDetailsDTO.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ApiExplorerWebSite
+{
+    public class OrderDetailsDTO
+    {
+        [FromForm]
+        public int Quantity { get; set; }
+
+        [FromForm]
+        public Product Product { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Models/Product.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Models/Product.cs
new file mode 100644
index 0000000000..1844de7e13
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Models/Product.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace ApiExplorerWebSite
+{
+    public class Product
+    {
+        public int Id { get; set; }
+
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/PassThruAttribute.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/PassThruAttribute.cs
new file mode 100644
index 0000000000..fa55ef3f83
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/PassThruAttribute.cs
@@ -0,0 +1,12 @@
+// 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.
+
+using System;
+
+namespace ApiExplorerWebSite
+{
+    [AttributeUsage(AttributeTargets.Method)]
+    public class PassThruAttribute : Attribute
+    {
+    }
+}
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Startup.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Startup.cs
new file mode 100644
index 0000000000..e794f807ef
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Startup.cs
@@ -0,0 +1,68 @@
+// 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.
+
+using System.IO;
+using System.Linq;
+using ApiExplorerWebSite.Controllers;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace ApiExplorerWebSite
+{
+    public class Startup
+    {
+        // Set up application services
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddTransient<ILoggerFactory, LoggerFactory>();
+            services.AddMvc(options =>
+            {
+                options.Filters.AddService(typeof(ApiExplorerDataFilter));
+
+                options.Conventions.Add(new ApiExplorerVisibilityEnabledConvention());
+                options.Conventions.Add(new ApiExplorerVisibilityDisabledConvention(
+                    typeof(ApiExplorerVisbilityDisabledByConventionController)));
+                options.Conventions.Add(new ApiExplorerInboundOutboundConvention(
+                    typeof(ApiExplorerInboundOutBoundController)));
+
+                var jsonOutputFormatter = options.OutputFormatters.OfType<JsonOutputFormatter>().First();
+
+                options.OutputFormatters.Clear();
+                options.OutputFormatters.Add(jsonOutputFormatter);
+                options.OutputFormatters.Add(new XmlDataContractSerializerOutputFormatter());
+            });
+
+            services.AddSingleton<ApiExplorerDataFilter>();
+            services.AddSingleton<IActionDescriptorChangeProvider>(ActionDescriptorChangeProvider.Instance);
+            services.AddSingleton(ActionDescriptorChangeProvider.Instance);
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute("default", "{controller}/{action}");
+            });
+        }
+
+        public static void Main(string[] args)
+        {
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
+            host.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            new WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseKestrel()
+                .UseIISIntegration()
+                .UseStartup<Startup>();
+    }
+}
+
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/readme.md b/src/Mvc/test/WebSites/ApiExplorerWebSite/readme.md
new file mode 100644
index 0000000000..64370cf806
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/readme.md
@@ -0,0 +1,5 @@
+ApiExplorerWebSite
+===
+
+This web site illustrates various ways to enable and disable api explorer discovery for actions.
+This also demonstrates how to consume api explorer data. 
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj b/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj
new file mode 100644
index 0000000000..cfda2f9c35
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Areas/Manage/Views/MultipleAreas/Index.cshtml b/src/Mvc/test/WebSites/ApplicationModelWebSite/Areas/Manage/Views/MultipleAreas/Index.cshtml
new file mode 100644
index 0000000000..7614945d2d
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Areas/Manage/Views/MultipleAreas/Index.cshtml
@@ -0,0 +1 @@
+Manage View
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Areas/Products/Views/MultipleAreas/Index.cshtml b/src/Mvc/test/WebSites/ApplicationModelWebSite/Areas/Products/Views/MultipleAreas/Index.cshtml
new file mode 100644
index 0000000000..b66a5db5c5
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Areas/Products/Views/MultipleAreas/Index.cshtml
@@ -0,0 +1 @@
+Products View
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Areas/Services/Views/MultipleAreas/Index.cshtml b/src/Mvc/test/WebSites/ApplicationModelWebSite/Areas/Services/Views/MultipleAreas/Index.cshtml
new file mode 100644
index 0000000000..cab53fe767
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Areas/Services/Views/MultipleAreas/Index.cshtml
@@ -0,0 +1 @@
+Services View
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/ActionModelController.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/ActionModelController.cs
new file mode 100644
index 0000000000..11d885a739
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/ActionModelController.cs
@@ -0,0 +1,41 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+namespace ApplicationModelWebSite
+{
+    // This controller uses an reflected model attribute to change an action name, and thus
+    // the URL.
+    public class ActionModelController : Controller
+    {
+        [ActionName2("ActionName")]
+        public string GetActionName()
+        {
+            return ControllerContext.ActionDescriptor.ActionName;
+        }
+
+        [CloneAction("MoreHelp")]
+        public IActionResult Help()
+        {
+            return View();
+        }
+
+        private class ActionName2Attribute : Attribute, IActionModelConvention
+        {
+            private readonly string _actionName;
+
+            public ActionName2Attribute(string actionName)
+            {
+                _actionName = actionName;
+            }
+
+            public void Apply(ActionModel model)
+            {
+                model.ActionName = _actionName;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/ApplicationModelController.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/ApplicationModelController.cs
new file mode 100644
index 0000000000..d9333559d3
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/ApplicationModelController.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ApplicationModelWebSite
+{
+    // This controller uses an reflected model attribute to add arbitrary data to controller and action model.
+    [ControllerDescription("Common Controller Description")]
+    public class ApplicationModelController : Controller
+    {
+        public string GetControllerDescription()
+        {
+            return ControllerContext.ActionDescriptor.Properties["description"].ToString();
+        }
+
+        [ActionDescription("Specific Action Description")]
+        public string GetActionSpecificDescription()
+        {
+            return ControllerContext.ActionDescriptor.Properties["description"].ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/ControllerModelController.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/ControllerModelController.cs
new file mode 100644
index 0000000000..bb94f37756
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/ControllerModelController.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Controllers;
+
+namespace ApplicationModelWebSite
+{
+    // This controller uses an reflected model attribute to change the controller name, and thus
+    // the URL.
+    [ControllerName("CoolController")]
+    public class ControllerModelController : Controller
+    {
+        public string GetControllerName()
+        {
+            return ControllerContext.ActionDescriptor.ControllerName;
+        }
+
+        private class ControllerNameAttribute : Attribute, IControllerModelConvention
+        {
+            private readonly string _controllerName;
+
+            public ControllerNameAttribute(string controllerName)
+            {
+                _controllerName = controllerName;
+            }
+
+            public void Apply(ControllerModel model)
+            {
+                model.ControllerName = _controllerName;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/HomeController.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/HomeController.cs
new file mode 100644
index 0000000000..e5c526bb56
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/HomeController.cs
@@ -0,0 +1,59 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+namespace ApplicationModelWebSite
+{
+    public class HomeController : Controller
+    {
+        public string GetCommonDescription()
+        {
+            return ControllerContext.ActionDescriptor.Properties["description"].ToString();
+        }
+
+        [HttpGet("Home/GetHelloWorld")]
+        public object GetHelloWorld([FromHeader] string helloWorld)
+        {
+            return ControllerContext.ActionDescriptor.Properties["source"].ToString() + " - " + helloWorld;
+        }
+
+        [HttpGet("Home/CannotBeRouted", Name = nameof(SuppressPathMatching))]
+        [HttpGet("Home/CanBeRouted")]
+        [SuppressPatchMatchingConvention]
+        public object SuppressPathMatching()
+        {
+            return "Hello world";
+        }
+
+        [HttpGet("Home/SuppressLinkGeneration", Name = nameof(SuppressLinkGeneration))]
+        [SuppressLinkGenerationConvention]
+        public object SuppressLinkGeneration() => "Hello world";
+
+        [HttpGet("Home/RouteToSuppressLinkGeneration")]
+        public IActionResult RouteToSuppressLinkGeneration() => RedirectToRoute(nameof(SuppressLinkGeneration));
+
+        [HttpGet("Home/RouteToSuppressPathMatching")]
+        public IActionResult RouteToSuppressPathMatching() => RedirectToRoute(nameof(SuppressPathMatching));
+
+        private class SuppressPatchMatchingConvention : Attribute, IActionModelConvention
+        {
+            public void Apply(ActionModel model)
+            {
+                var selector = model.Selectors.First(f => f.AttributeRouteModel.Template == "Home/CannotBeRouted");
+                selector.AttributeRouteModel.SuppressPathMatching = true;
+            }
+        }
+
+        private class SuppressLinkGenerationConvention : Attribute, IActionModelConvention
+        {
+            public void Apply(ActionModel model)
+            {
+                model.Selectors[0].AttributeRouteModel.SuppressLinkGeneration = true;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/LicenseController.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/LicenseController.cs
new file mode 100644
index 0000000000..ed428934f5
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/LicenseController.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ApplicationModelWebSite.Controllers
+{
+    public class LicenseController : Controller
+    {
+        [HttpGet("License/GetLicense")]
+        public string GetLicense()
+        {
+            return ControllerContext.ActionDescriptor.Properties["license"].ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/MultipleAreasController.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/MultipleAreasController.cs
new file mode 100644
index 0000000000..d80475284b
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/MultipleAreasController.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ApplicationModelWebSite.Controllers
+{
+    [MultipleAreas("Products", "Services", "Manage")]
+    public class MultipleAreasController : Controller
+    {
+        public IActionResult Index()
+        {
+            return View();
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/ParameterModelController.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/ParameterModelController.cs
new file mode 100644
index 0000000000..e276da511d
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/ParameterModelController.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace ApplicationModelWebSite
+{
+    // This controller uses a reflected model attribute to change a parameter's binder metadata.
+    //
+    // This could be accomplished by simply making an attribute that implements IBinderMetadata, but
+    // this is part of a test for IParameterModelConvention.
+    public class ParameterModelController : Controller
+    {
+        public string GetParameterMetadata([Cool] int? id)
+        {
+            return ControllerContext.ActionDescriptor.Parameters[0].BindingInfo.BinderModelName;
+        }
+
+        private class CoolAttribute : Attribute, IParameterModelConvention
+        {
+            public void Apply(ParameterModel model)
+            {
+                model.BindingInfo = model.BindingInfo ?? new BindingInfo();
+                model.BindingInfo.BindingSource = BindingSource.Custom;
+                model.BindingInfo.BinderModelName = "CoolMetadata";
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/ActionDescriptionAttribute.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/ActionDescriptionAttribute.cs
new file mode 100644
index 0000000000..1056bddb1e
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/ActionDescriptionAttribute.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+
+namespace ApplicationModelWebSite
+{
+    public class ActionDescriptionAttribute : Attribute, IActionModelConvention
+    {
+        private object _value;
+
+        public ActionDescriptionAttribute(object value)
+        {
+            _value = value;
+        }
+
+        public void Apply(ActionModel model)
+        {
+            model.Properties["description"] = _value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/ApplicationDescription.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/ApplicationDescription.cs
new file mode 100644
index 0000000000..39f9827063
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/ApplicationDescription.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+
+namespace ApplicationModelWebSite
+{
+    public class ApplicationDescription : IApplicationModelConvention
+    {
+        private string _description;
+
+        public ApplicationDescription(string description)
+        {
+            _description = description;
+        }
+
+        public void Apply(ApplicationModel application)
+        {
+            application.Properties["description"] = _description;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/CloneActionAttribute.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/CloneActionAttribute.cs
new file mode 100644
index 0000000000..b5a80c8e85
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/CloneActionAttribute.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using System;
+
+namespace ApplicationModelWebSite
+{
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public class CloneActionAttribute : Attribute
+    {
+        public CloneActionAttribute(string newActionName)
+        {
+            ActionName = newActionName;
+        }
+
+        public string ActionName { get; private set; }
+    }
+}
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/CloneActionConvention.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/CloneActionConvention.cs
new file mode 100644
index 0000000000..6ce7e65908
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/CloneActionConvention.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+namespace ApplicationModelWebSite
+{
+    public class CloneActionConvention : IControllerModelConvention
+    {
+        public void Apply(ControllerModel controller)
+        {
+            var actionModels = new List<ActionModel>();
+            foreach (var action in controller.Actions)
+            {
+                var actionName = action.Attributes.OfType<CloneActionAttribute>()?.FirstOrDefault()?.ActionName;
+
+                if (!string.IsNullOrEmpty(actionName))
+                {
+                    var actionCopy = new ActionModel(action)
+                    {
+                        ActionName = actionName
+                    };
+
+                    actionModels.Add(actionCopy);
+                }
+            }
+
+            foreach (var model in actionModels)
+            {
+                controller.Actions.Add(model);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/ControllerDescriptionAttribute.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/ControllerDescriptionAttribute.cs
new file mode 100644
index 0000000000..20109b08ad
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/ControllerDescriptionAttribute.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+namespace ApplicationModelWebSite
+{
+    public class ControllerDescriptionAttribute : Attribute, IControllerModelConvention
+    {
+        private object _value;
+
+        public ControllerDescriptionAttribute(object value)
+        {
+            _value = value;
+        }
+
+        public void Apply(ControllerModel model)
+        {
+            model.Properties["description"] = _value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/ControllerLicenseConvention.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/ControllerLicenseConvention.cs
new file mode 100644
index 0000000000..b1a3ed90e3
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/ControllerLicenseConvention.cs
@@ -0,0 +1,17 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+namespace ApplicationModelWebSite
+{
+    public class ControllerLicenseConvention : IControllerModelConvention
+    {
+        public void Apply(ControllerModel controller)
+        {
+            controller.Properties["license"] = "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.";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/FromHeaderConvention.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/FromHeaderConvention.cs
new file mode 100644
index 0000000000..8cdd4489e0
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/FromHeaderConvention.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+namespace ApplicationModelWebSite
+{
+    public class FromHeaderConvention : IActionModelConvention
+    {
+        public void Apply(ActionModel action)
+        {
+            foreach (var param in action.Parameters)
+            {
+                if (param.Attributes.Any(p => p.GetType() == typeof(FromHeaderAttribute)))
+                {
+                    param.Action.Properties["source"] = "From Header";
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/MultipleAreasAttribute.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/MultipleAreasAttribute.cs
new file mode 100644
index 0000000000..181bf5e309
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/MultipleAreasAttribute.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using System;
+using System.Linq;
+
+namespace ApplicationModelWebSite
+{
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+    public class MultipleAreasAttribute : Attribute
+    {
+        public MultipleAreasAttribute(string area1, string area2, params string[] areaNames)
+        {
+            AreaNames = new string[] { area1, area2 }.Concat(areaNames).ToArray();
+        }
+
+        public string[] AreaNames { get; }
+    }
+}
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/MultipleAreasControllerConvention.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/MultipleAreasControllerConvention.cs
new file mode 100644
index 0000000000..9342bb8bc3
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/MultipleAreasControllerConvention.cs
@@ -0,0 +1,34 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+namespace ApplicationModelWebSite
+{
+    public class MultipleAreasControllerConvention : IApplicationModelConvention
+    {
+        public void Apply(ApplicationModel application)
+        {
+            var controllerModels = new List<ControllerModel>();
+            foreach (var controller in application.Controllers)
+            {
+                var areaNames = controller.ControllerType.GetCustomAttributes<MultipleAreasAttribute>()?.FirstOrDefault()?.AreaNames;
+                controller.RouteValues.Add("area", areaNames?[0]);
+                for (var i = 1; i < areaNames?.Length; i++)
+                {
+                    var controllerCopy = new ControllerModel(controller);
+                    controllerCopy.RouteValues["area"] = areaNames[i];
+                    controllerModels.Add(controllerCopy);
+                }
+            }
+
+            foreach (var model in controllerModels)
+            {
+                application.Controllers.Add(model);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Startup.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Startup.cs
new file mode 100644
index 0000000000..37e97287fb
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Startup.cs
@@ -0,0 +1,55 @@
+// 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.
+
+using System.IO;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace ApplicationModelWebSite
+{
+    public class Startup
+    {
+        // Set up application services
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddMvc(options =>
+            {
+                options.Conventions.Add(new ApplicationDescription("Common Application Description"));
+                options.Conventions.Add(new ControllerLicenseConvention());
+                options.Conventions.Add(new FromHeaderConvention());
+                options.Conventions.Add(new MultipleAreasControllerConvention());
+                options.Conventions.Add(new CloneActionConvention());
+            });
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(name: "areaRoute",
+                  template: "{area:exists}/{controller=Home}/{action=Index}");
+
+                routes.MapRoute(
+                    name: "default",
+                    template: "{controller}/{action}/{id?}");
+            });
+        }
+
+        public static void Main(string[] args)
+        {
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
+            host.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            new WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseStartup<Startup>()
+                .UseKestrel()
+                .UseIISIntegration();
+    }
+}
+
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Views/ActionModel/Help.cshtml b/src/Mvc/test/WebSites/ApplicationModelWebSite/Views/ActionModel/Help.cshtml
new file mode 100644
index 0000000000..28718982b2
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Views/ActionModel/Help.cshtml
@@ -0,0 +1 @@
+This is the help page
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Views/ActionModel/MoreHelp.cshtml b/src/Mvc/test/WebSites/ApplicationModelWebSite/Views/ActionModel/MoreHelp.cshtml
new file mode 100644
index 0000000000..1ebee20c3f
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Views/ActionModel/MoreHelp.cshtml
@@ -0,0 +1 @@
+This is the more help page
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/readme.md b/src/Mvc/test/WebSites/ApplicationModelWebSite/readme.md
new file mode 100644
index 0000000000..429e26a412
--- /dev/null
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/readme.md
@@ -0,0 +1,5 @@
+ApplicationModelWebSite
+===
+
+This web site illustrates how to use customize application model by having custom implementations of 
+`IActionModelConvention`, `IControllerModelConvention` and `IParameterModelConvention`.
diff --git a/src/Mvc/test/WebSites/BasicWebSite/ActionDescriptorCreationCounter.cs b/src/Mvc/test/WebSites/BasicWebSite/ActionDescriptorCreationCounter.cs
new file mode 100644
index 0000000000..b865321f47
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/ActionDescriptorCreationCounter.cs
@@ -0,0 +1,46 @@
+// 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.
+
+using System;
+using System.Threading;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+
+namespace BasicWebSite
+{
+    public class ActionDescriptorCreationCounter : IActionDescriptorProvider
+    {
+        private long _callCount;
+
+        public long CallCount
+        {
+            get
+            {
+                var callCount = Interlocked.Read(ref _callCount);
+
+                return callCount;
+            }
+        }
+
+        public int Order
+        {
+            get
+            {
+                return -1000 - 100;
+            }
+        }
+
+        public void OnProvidersExecuting(ActionDescriptorProviderContext context)
+        {
+        }
+
+        public void OnProvidersExecuted(ActionDescriptorProviderContext context)
+        {
+            if (context.Results.Count == 0)
+            {
+                throw new InvalidOperationException("No actions found!");
+            }
+
+            Interlocked.Increment(ref _callCount);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Controllers/RemoteAttribute_HomeController.cs b/src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Controllers/RemoteAttribute_HomeController.cs
new file mode 100644
index 0000000000..fb4629b805
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Controllers/RemoteAttribute_HomeController.cs
@@ -0,0 +1,39 @@
+// 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.
+
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Areas.Area1.Controllers
+{
+    [Area("Area1")]
+    [Route("[area]/[controller]/[action]")]
+    public class RemoteAttribute_HomeController : Controller
+    {
+        private static RemoteAttributeUser _user;
+
+        [HttpGet]
+        public IActionResult Create()
+        {
+            return View();
+        }
+
+        [HttpPost]
+        public IActionResult Create(RemoteAttributeUser user)
+        {
+            ModelState.Remove("id");
+            if (!ModelState.IsValid)
+            {
+                return View(user);
+            }
+
+            _user = user;
+            return RedirectToAction(nameof(Details));
+        }
+
+        public IActionResult Details()
+        {
+            return View(_user);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Controllers/RemoteAttribute_VerifyController.cs b/src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Controllers/RemoteAttribute_VerifyController.cs
new file mode 100644
index 0000000000..04a33e129f
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Controllers/RemoteAttribute_VerifyController.cs
@@ -0,0 +1,20 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Areas.Area1.Controllers
+{
+    [Area("Area1")]
+    [Route("[area]/[controller]/[action]")]
+    public class RemoteAttribute_VerifyController : Controller
+    {
+        // This action is overloaded and may receive requests to validate either UserId1 or UserId3.
+        // Demonstrates use of the default error message.
+        [AcceptVerbs("Get", "Post")]
+        public IActionResult IsIdAvailable(string userId1, string userId3)
+        {
+            return Json(data: false);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Views/RemoteAttribute_Home/Create.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Views/RemoteAttribute_Home/Create.cshtml
new file mode 100644
index 0000000000..8cd88c2ecb
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Views/RemoteAttribute_Home/Create.cshtml
@@ -0,0 +1,81 @@
+@model BasicWebSite.Models.RemoteAttributeUser
+@{
+    Layout = "_Layout.cshtml";
+    object areaName;
+    ViewContext.RouteData.Values.TryGetValue("area", out areaName);
+    areaName = areaName ?? "root";
+    ViewBag.Title = "Create in " + areaName + " area.";
+}
+
+<h2>@ViewBag.Title</h2>
+@using (Html.BeginForm(FormMethod.Post, htmlAttributes: null, antiforgery: false))
+{
+    <div class="form-horizontal">
+        <h4>Person</h4>
+        <hr />
+        @Html.ValidationSummary(true, "", new { @class = "text-danger" })
+
+        <div class="form-group">
+            @Html.LabelFor(model => model.Id, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => model.Id, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => model.Id, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => model.UserId1, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => model.UserId1, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => model.UserId1, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => model.UserId2, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => model.UserId2, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => model.UserId2, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => model.UserId3, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => model.UserId3, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => model.UserId3, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => model.UserId4, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => model.UserId4, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => model.UserId4, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => model.UserId5, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => model.UserId5, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => model.UserId5, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-md-offset-2 col-md-10">
+                <input type="submit" value="Create" class="btn btn-default" />
+            </div>
+        </div>
+    </div>
+}
+
+<div>
+    @Html.ActionLink("Go back to home", "Details")
+</div>
+
+@section Scripts {
+    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.14.0/jquery.validate.min.js"></script>
+    <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Views/RemoteAttribute_Home/Details.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Views/RemoteAttribute_Home/Details.cshtml
new file mode 100644
index 0000000000..18c95164b1
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Views/RemoteAttribute_Home/Details.cshtml
@@ -0,0 +1,78 @@
+@model BasicWebSite.Models.RemoteAttributeUser
+@{
+    Layout = "_Layout.cshtml";
+    object areaName;
+    ViewContext.RouteData.Values.TryGetValue("area", out areaName);
+    areaName = areaName ?? "root";
+    ViewBag.Title = "Details in " + areaName + " area.";
+}
+
+<h2>@ViewBag.Title</h2>
+<div>
+    <h4>Person</h4>
+    <hr />
+
+    <dl class="dl-horizontal">
+        <dt>
+            @Html.DisplayNameFor(model => model.Id)
+        </dt>
+
+        <dd>
+            @Html.DisplayFor(model => model.Id)
+        </dd>
+    </dl>
+
+    <dl class="dl-horizontal">
+        <dt>
+            @Html.DisplayNameFor(model => model.UserId1)
+        </dt>
+
+        <dd>
+            @Html.DisplayFor(model => model.UserId1)
+        </dd>
+    </dl>
+
+    <dl class="dl-horizontal">
+        <dt>
+            @Html.DisplayNameFor(model => model.UserId2)
+        </dt>
+
+        <dd>
+            @Html.DisplayFor(model => model.UserId2)
+        </dd>
+    </dl>
+
+    <dl class="dl-horizontal">
+        <dt>
+            @Html.DisplayNameFor(model => model.UserId3)
+        </dt>
+
+        <dd>
+            @Html.DisplayFor(model => model.UserId3)
+        </dd>
+    </dl>
+
+    <dl class="dl-horizontal">
+        <dt>
+            @Html.DisplayNameFor(model => model.UserId4)
+        </dt>
+
+        <dd>
+            @Html.DisplayFor(model => model.UserId4)
+        </dd>
+    </dl>
+
+    <dl class="dl-horizontal">
+        <dt>
+            @Html.DisplayNameFor(model => model.UserId5)
+        </dt>
+
+        <dd>
+            @Html.DisplayFor(model => model.UserId5)
+        </dd>
+    </dl>
+</div>
+
+<p>
+    @Html.ActionLink("Create a new one", "Create")
+</p>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Views/RemoteAttribute_Home/_Layout.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Views/RemoteAttribute_Home/_Layout.cshtml
new file mode 100644
index 0000000000..3da0702694
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Views/RemoteAttribute_Home/_Layout.cshtml
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>@ViewBag.Title - My ASP.NET Application</title>
+</head>
+<body>
+    <div>
+        <div>
+            <div>
+                @Html.ActionLink("Basic web site", "Details", "RemoteAttribute_Home", routeValues: new { area = (object)null })
+            </div>
+
+            <div>
+                <ul>
+                    <li>@Html.ActionLink("Home", "Details", "RemoteAttribute_Home", routeValues: new { area = string.Empty })</li>
+                    <li>@Html.ActionLink("Area1 Home", "Details", "RemoteAttribute_Home", routeValues: new { area = "Area1" })</li>
+                </ul>
+            </div>
+        </div>
+    </div>
+
+    <div>
+        @RenderBody()
+    </div>
+
+    <script src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-2.1.4.min.js"></script>
+    @RenderSection("scripts", required: false)
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Areas/Area2/Controllers/RemoteAttribute_VerifyController.cs b/src/Mvc/test/WebSites/BasicWebSite/Areas/Area2/Controllers/RemoteAttribute_VerifyController.cs
new file mode 100644
index 0000000000..41401e86ee
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Areas/Area2/Controllers/RemoteAttribute_VerifyController.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+using BasicWebSite.Models;
+
+namespace BasicWebSite.Ares.Area2.Controllers
+{
+    [Area("Area2")]
+    [Route("[area]/[controller]/[action]")]
+    public class RemoteAttribute_VerifyController : Controller
+    {
+        // Demonstrates validation action when AdditionalFields causes client to send multiple values.
+        [HttpGet]
+        public IActionResult IsIdAvailable(RemoteAttributeUser user)
+        {
+            return Json(data: string.Format(
+                "/Area2/RemoteAttribute_Verify/IsIdAvailable rejects '{0}' with '{1}', '{2}', and '{3}'.",
+                user.UserId4,
+                user.UserId1,
+                user.UserId2,
+                user.UserId3));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/BasicAuthenticationHandler.cs b/src/Mvc/test/WebSites/BasicWebSite/BasicAuthenticationHandler.cs
new file mode 100644
index 0000000000..0044e91259
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/BasicAuthenticationHandler.cs
@@ -0,0 +1,39 @@
+// 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.
+
+using System;
+using System.Security.Claims;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace BasicWebSite
+{
+    public class BasicAuthenticationHandler : AuthenticationHandler<AuthenticationSchemeOptions>
+    {
+        public BasicAuthenticationHandler(IOptionsMonitor<AuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock)
+            : base(options, logger, encoder, clock)
+        { }
+
+        protected override Task<AuthenticateResult> HandleAuthenticateAsync()
+        {
+            var principal = new ClaimsPrincipal();
+            principal.AddIdentity(new ClaimsIdentity(
+                new[]
+                {
+                    new Claim("Manager", "yes"),
+                    new Claim(ClaimTypes.Role, "Administrator"),
+                    new Claim(ClaimTypes.NameIdentifier, "John")
+                },
+                Scheme.Name));
+
+            return Task.FromResult(AuthenticateResult.Success(new AuthenticationTicket(
+                principal,
+                new AuthenticationProperties(),
+                Scheme.Name)));
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj b/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj
new file mode 100644
index 0000000000..55879651a0
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc.Formatters.Xml\Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="$(MicrosoftAspNetCoreAuthenticationPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Localization.Routing" Version="$(MicrosoftAspNetCoreLocalizationRoutingPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Session" Version="$(MicrosoftAspNetCoreSessionPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(MicrosoftAspNetCoreDiagnosticsPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.CookiePolicy" Version="$(MicrosoftAspNetCoreCookiePolicyPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Components/PassThroughViewComponent.cs b/src/Mvc/test/WebSites/BasicWebSite/Components/PassThroughViewComponent.cs
new file mode 100644
index 0000000000..e49606578f
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Components/PassThroughViewComponent.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Components
+{
+    public class PassThroughViewComponent : ViewComponent
+    {
+        public IViewComponentResult Invoke(long value)
+        {
+            return View(value);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Components/ViewDataViewComponent.cs b/src/Mvc/test/WebSites/BasicWebSite/Components/ViewDataViewComponent.cs
new file mode 100644
index 0000000000..4e586ee1c9
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Components/ViewDataViewComponent.cs
@@ -0,0 +1,12 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Components
+{
+    public class ViewDataViewComponent : ViewComponent
+    {
+        public IViewComponentResult Invoke() => View();
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/ConfigureAuthPolicies.cs b/src/Mvc/test/WebSites/BasicWebSite/ConfigureAuthPolicies.cs
new file mode 100644
index 0000000000..feb2cca8b5
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/ConfigureAuthPolicies.cs
@@ -0,0 +1,34 @@
+// 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.
+
+using System.Security.Claims;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace BasicWebSite
+{
+    internal static class ConfigureAuthPoliciesExtensions
+    {
+        public static void ConfigureBaseWebSiteAuthPolicies(this IServiceCollection services)
+        {
+            services.AddAuthorization(options =>
+            {
+                // This policy cannot succeed since the claim is never added
+                options.AddPolicy("Impossible", policy =>
+                {
+                    policy.AuthenticationSchemes.Add("Api");
+                    policy.RequireClaim("Never");
+                });
+                options.AddPolicy("Api", policy =>
+                {
+                    policy.AuthenticationSchemes.Add("Api");
+                    policy.RequireClaim(ClaimTypes.NameIdentifier);
+                });
+                options.AddPolicy("Api-Manager", policy =>
+                {
+                    policy.AuthenticationSchemes.Add("Api");
+                    policy.Requirements.Add(Operations.Edit);
+                });
+            });
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/ContactsRepository.cs b/src/Mvc/test/WebSites/BasicWebSite/ContactsRepository.cs
new file mode 100644
index 0000000000..49589b48af
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/ContactsRepository.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using BasicWebSite.Models;
+
+namespace BasicWebSite
+{
+    public class ContactsRepository
+    {
+        private readonly List<Contact> _contacts = new List<Contact>();
+
+        public Contact GetContact(int id)
+        {
+            return _contacts.FirstOrDefault(f => f.ContactId == id);
+        }
+
+        public void Add(Contact contact)
+        {
+            contact.ContactId = _contacts.Count + 1;
+            _contacts.Add(contact);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_MediaTypeSuffix.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_MediaTypeSuffix.cs
new file mode 100644
index 0000000000..a2cb0d6160
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_MediaTypeSuffix.cs
@@ -0,0 +1,30 @@
+// 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.
+
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers.ActionConstraints
+{
+    [Route("ConsumesAttribute_MediaTypeSuffix/[action]")]
+    public class ConsumesAttribute_MediaTypeSuffix : Controller
+    {
+        [Consumes("application/vnd.example+json")]
+        public Product CreateProduct([FromBody] Product_Json jsonInput)
+        {
+            // To show that we selected the correct method (and not just the
+            // correct input formatter), produce method-specific output.
+            jsonInput.SampleString = "Read from JSON: " + jsonInput.SampleString;
+            return jsonInput;
+        }
+
+        [Consumes("application/vnd.example+xml")]
+        public Product CreateProduct([FromBody] Product_Xml xmlInput)
+        {
+            // To show that we selected the correct method (and not just the
+            // correct input formatter), produce method-specific output.
+            xmlInput.SampleString = "Read from XML: " + xmlInput.SampleString;
+            return xmlInput;
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_NoFallBackActionController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_NoFallBackActionController.cs
new file mode 100644
index 0000000000..eb9a0a610c
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_NoFallBackActionController.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers.ActionConstraints
+{
+    [Route("ConsumesAttribute_AmbiguousActions/[action]")]
+    public class ConsumesAttribute_NoFallBackActionController : Controller
+    {
+        [Consumes("application/json", "text/json")]
+        public Product CreateProduct([FromBody] Product_Json jsonInput)
+        {
+            return jsonInput;
+        }
+
+        [Consumes("application/xml")]
+        public Product CreateProduct([FromBody] Product_Xml xmlInput)
+        {
+            return xmlInput;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_OveridesBaseController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_OveridesBaseController.cs
new file mode 100644
index 0000000000..426c02240e
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_OveridesBaseController.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers.ActionConstraints
+{
+    [Consumes("application/json")]
+    public class ConsumesAttribute_OverridesBaseController : Controller
+    {
+        [Consumes("text/json")]
+        public Product CreateProduct([FromBody] Product_Json product)
+        {
+            // should be picked if request content type is text/json and not application/json.
+            product.SampleString = "ConsumesAttribute_OverridesBaseController_text/json";
+            return product;
+        }
+
+        public virtual IActionResult CreateProduct([FromBody] Product product)
+        {
+            // should be picked if request content type is application/json.
+            product.SampleString = "ConsumesAttribute_OverridesBaseController_application/json";
+            return new ObjectResult(product);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_OveridesController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_OveridesController.cs
new file mode 100644
index 0000000000..d2c64f8b21
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_OveridesController.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers.ActionConstraints
+{
+    [Consumes("application/xml")]
+    public class ConsumesAttribute_OverridesController : ConsumesAttribute_OverridesBaseController
+    {
+        public override IActionResult CreateProduct([FromBody] Product product)
+        {
+            // should be picked if request content type is text/json.
+            product.SampleString = "ConsumesAttribute_OverridesController_application/xml";
+            return new JsonResult(product);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_PassThroughController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_PassThroughController.cs
new file mode 100644
index 0000000000..ce405047c8
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_PassThroughController.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers.ActionConstraints
+{
+    [Route("ConsumesAttribute_PassThrough/[action]")]
+    public class ConsumesAttribute_PassThroughController : Controller
+    {
+        [Consumes("application/json")]
+        public IActionResult CreateProduct(Product_Json jsonInput)
+        {
+            return Content("ConsumesAttribute_PassThrough_Product_Json");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_WithFallbackActionController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_WithFallbackActionController.cs
new file mode 100644
index 0000000000..eb92870096
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_WithFallbackActionController.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers.ActionConstraints
+{
+    [Route("ConsumesAttribute_Company/[action]")]
+    public class ConsumesAttribute_WithFallbackActionController : Controller
+    {
+        [Consumes("application/json")]
+        [ActionName("CreateProduct")]
+        public IActionResult CreateProductJson()
+        {
+            return Content("CreateProduct_Product_Json");
+        }
+
+        [Consumes("application/xml")]
+        [ActionName("CreateProduct")]
+        public IActionResult CreateProductXml()
+        {
+            return Content("CreateProduct_Product_Xml");
+        }
+
+        public IActionResult CreateProduct()
+        {
+            return Content("CreateProduct_Product_Text");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionResultOfTController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionResultOfTController.cs
new file mode 100644
index 0000000000..d6fb9607ab
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionResultOfTController.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers
+{
+    public class ActionResultOfTController : Controller
+    {
+        [HttpGet]
+        public ActionResult<Product> GetProduct(int? productId)
+        {
+            if (productId == null)
+            {
+                return BadRequest();
+            }
+
+            return new Product { SampleInt = productId.Value, };
+        }
+
+        [HttpGet]
+        public async Task<ActionResult<IEnumerable<Product>>> GetProductsAsync()
+        {
+            await Task.Delay(0);
+            return new[] { new Product(), new Product() };
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/AntiforgeryController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/AntiforgeryController.cs
new file mode 100644
index 0000000000..7da1b783c2
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/AntiforgeryController.cs
@@ -0,0 +1,68 @@
+// 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.
+
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers
+{
+    // This controller is reachable via traditional routing.
+    public class AntiforgeryController : Controller
+    {
+        public IActionResult Index()
+        {
+            return View();
+        }
+
+        // GET: /Antiforgery/Login
+        [AllowAnonymous]
+        public ActionResult Login(string returnUrl = null)
+        {
+            ViewData["ReturnUrl"] = returnUrl;
+
+            return View();
+        }
+
+        [AllowAnonymous]
+        public string UseFacebookLogin()
+        {
+            return "somestring";
+        }
+
+        // POST: /Antiforgery/Login
+        [HttpPost]
+        [AllowAnonymous]
+        [ValidateAntiForgeryToken]
+        public string Login(LoginViewModel model)
+        {
+            return "OK";
+        }
+
+        // GET: /Antiforgery/FlushAsyncLogin
+        [AllowAnonymous]
+        public ActionResult FlushAsyncLogin(string returnUrl = null)
+        {
+            ViewData["ReturnUrl"] = returnUrl;
+
+            return View();
+        }
+
+        // POST: /Antiforgery/FlushAsyncLogin
+        [HttpPost]
+        [AllowAnonymous]
+        [ValidateAntiForgeryToken]
+        public string FlushAsyncLogin(LoginViewModel model)
+        {
+            return "OK";
+        }
+
+        [HttpGet]
+        [AllowAnonymous]
+        [ResponseCache(Duration = 60)]
+        public ActionResult AntiforgeryTokenAndResponseCaching()
+        {
+            return View();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/AsyncActionsController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/AsyncActionsController.cs
new file mode 100644
index 0000000000..446c387009
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/AsyncActionsController.cs
@@ -0,0 +1,254 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace BasicWebSite.Controllers
+{
+    public class AsyncActionsController : Controller
+    {
+        const int SimulateDelayMilliseconds = 20;
+
+        public override void OnActionExecuted(ActionExecutedContext context)
+        {
+            // So that tests can observe we're following the proper flow after an exception, surface a
+            // message saying what the exception was.
+            if (context.Exception != null)
+            {
+                context.Result = Content($"Action exception message: {context.Exception.Message}");
+                context.ExceptionHandled = true;
+            }
+        }
+
+        public async void AsyncVoidAction()
+        {
+            await Task.Delay(SimulateDelayMilliseconds);
+        }
+
+        public Task TaskAction()
+        {
+            return Task.Delay(SimulateDelayMilliseconds);
+        }
+
+        public async Task TaskExceptionAction()
+        {
+            await Task.Delay(SimulateDelayMilliseconds);
+            throw new CustomException();
+        }
+
+        public async Task<Message> TaskOfObjectAction(string message)
+        {
+            await Task.Delay(SimulateDelayMilliseconds);
+            return new Message { Text = message };
+        }
+
+        public async Task<Message> TaskOfObjectExceptionAction(string message)
+        {
+            await Task.Delay(SimulateDelayMilliseconds);
+            throw new CustomException();
+        }
+
+        public async Task<IActionResult> TaskOfIActionResultAction(string message)
+        {
+            await Task.Delay(SimulateDelayMilliseconds);
+            return Content(message);
+        }
+
+        public async Task<IActionResult> TaskOfIActionResultExceptionAction(string message)
+        {
+            await Task.Delay(SimulateDelayMilliseconds);
+            throw new CustomException();
+        }
+
+        public async Task<ContentResult> TaskOfContentResultAction(string message)
+        {
+            await Task.Delay(SimulateDelayMilliseconds);
+            return Content(message);
+        }
+
+        public async Task<ContentResult> TaskOfContentResultExceptionAction(string message)
+        {
+            await Task.Delay(SimulateDelayMilliseconds);
+            throw new CustomException();
+        }
+
+        public ValueTask<Message> PreCompletedValueTaskOfObjectAction(string message)
+        {
+            return new ValueTask<Message>(new Message { Text = message });
+        }
+
+        public ValueTask<Message> PreCompletedValueTaskOfObjectExceptionAction(string message)
+        {
+            throw new CustomException();
+        }
+
+        public ValueTask<IActionResult> PreCompletedValueTaskOfIActionResultAction(string message)
+        {
+            return new ValueTask<IActionResult>(Content(message));
+        }
+
+        public ValueTask<IActionResult> PreCompletedValueTaskOfIActionResultExceptionAction(string message)
+        {
+            throw new CustomException();
+        }
+
+        public ValueTask<ContentResult> PreCompletedValueTaskOfContentResultAction(string message)
+        {
+            return new ValueTask<ContentResult>(Content(message));
+        }
+
+        public ValueTask<ContentResult> PreCompletedValueTaskOfContentResultExceptionAction(string message)
+        {
+            throw new CustomException();
+        }
+
+        public CustomAwaitable CustomAwaitableVoidAction()
+        {
+            return new CustomAwaitable(SimulateDelayMilliseconds);
+        }
+
+        public CustomAwaitable CustomAwaitableVoidExceptionAction()
+        {
+            throw new CustomException();
+        }
+
+        public CustomAwaitable<Message> CustomAwaitableOfObjectAction(string message)
+        {
+            return new CustomAwaitable<Message>(
+                SimulateDelayMilliseconds,
+                new Message { Text = message });
+        }
+
+        public CustomAwaitable<Message> CustomAwaitableOfObjectExceptionAction(string message)
+        {
+            throw new CustomException();
+        }
+
+        public CustomAwaitable<IActionResult> CustomAwaitableOfIActionResultAction(string message)
+        {
+            return new CustomAwaitable<IActionResult>(SimulateDelayMilliseconds, Content(message));
+        }
+
+        public CustomAwaitable<IActionResult> CustomAwaitableOfIActionResultExceptionAction(string message)
+        {
+            throw new CustomException();
+        }
+
+        public CustomAwaitable<ContentResult> CustomAwaitableOfContentResultAction(string message)
+        {
+            return new CustomAwaitable<ContentResult>(SimulateDelayMilliseconds, Content(message));
+        }
+
+        public CustomAwaitable<ContentResult> CustomAwaitableOfContentResultExceptionAction(string message)
+        {
+            throw new CustomException();
+        }
+
+        public class Message
+        {
+            public string Text { get; set; }
+        }
+
+        public class CustomAwaitable
+        {
+            protected readonly int _simulateDelayMilliseconds;
+
+            public CustomAwaitable(int simulateDelayMilliseconds)
+            {
+                _simulateDelayMilliseconds = simulateDelayMilliseconds;
+            }
+
+            public CustomAwaiter GetAwaiter()
+            {
+                return new CustomAwaiter(_simulateDelayMilliseconds);
+            }
+        }
+
+        public class CustomAwaitable<T> : CustomAwaitable
+        {
+            private readonly T _result;
+
+            public CustomAwaitable(int simulateDelayMilliseconds, T result)
+                : base(simulateDelayMilliseconds)
+            {
+                _result = result;
+            }
+
+            public new CustomAwaiter<T> GetAwaiter()
+            {
+                return new CustomAwaiter<T>(_simulateDelayMilliseconds, _result);
+            }
+        }
+
+        public class CustomAwaiter : INotifyCompletion
+        {
+            private IList<Action> _continuations = new List<Action>();
+
+            public CustomAwaiter(int simulateDelayMilliseconds)
+            {
+                Task.Factory.StartNew(() =>
+                {
+                    Thread.Sleep(simulateDelayMilliseconds);
+                    lock(_continuations)
+                    {
+                        IsCompleted = true;
+
+                        foreach (var continuation in _continuations)
+                        {
+                            continuation();
+                        }
+
+                        _continuations.Clear();
+                    }
+                });
+            }
+
+            public bool IsCompleted { get; private set; }
+
+            public void OnCompleted(Action continuation)
+            {
+                lock (_continuations)
+                {
+                    if (IsCompleted)
+                    {
+                        continuation();
+                    }
+                    else
+                    {
+                        _continuations.Add(continuation);
+                    }
+                }
+            }
+
+            public void GetResult()
+            {
+            }
+        }
+
+        public class CustomAwaiter<T> : CustomAwaiter
+        {
+            private readonly T _result;
+
+            public CustomAwaiter(int simulateDelayMilliseconds, T result)
+                : base(simulateDelayMilliseconds)
+            {
+                _result = result;
+            }
+
+            public new T GetResult() => _result;
+        }
+
+        public class CustomException : Exception
+        {
+            public CustomException() : base("This is a custom exception.")
+            {
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/AuthorizeUserController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/AuthorizeUserController.cs
new file mode 100644
index 0000000000..6de9d484de
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/AuthorizeUserController.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
+
+namespace BasicWebSite
+{
+    [Authorize("Api")]
+    public class AuthorizeUserController : Controller
+    {
+        [Authorize("Api-Manager")]
+        public string ApiManagers()
+        {
+            return "Hello World!";
+        }
+
+        [Authorize(Roles = "Administrator")]
+        public string AdminRole()
+        {
+            return "Hello World!";
+        }
+
+        [Authorize("Impossible")]
+        public string Impossible()
+        {
+            throw new Exception("Shouldn't be invoked.");
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/BindPropertiesController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/BindPropertiesController.cs
new file mode 100644
index 0000000000..0ed0ebf5d4
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/BindPropertiesController.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace BasicWebSite
+{
+    [BindProperties]
+    public class BindPropertiesController : Controller
+    {
+        public string Name { get; set; }
+
+        public int? Id { get; set; }
+
+        [FromRoute]
+        public int? IdFromRoute { get; set; }
+
+        [ModelBinder(typeof(CustomBoundModelBinder))]
+        public string CustomBound { get; set; }
+
+        [BindNever]
+        public string BindNeverProperty { get; set; }
+
+        public object Action() => new { Name, Id, IdFromRoute, CustomBound, BindNeverProperty };
+
+        private class CustomBoundModelBinder : IModelBinder
+        {
+            public Task BindModelAsync(ModelBindingContext bindingContext)
+            {
+                bindingContext.Result = ModelBindingResult.Success("CustomBoundValue");
+                return Task.CompletedTask;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/BindPropertiesSupportsGetController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/BindPropertiesSupportsGetController.cs
new file mode 100644
index 0000000000..b4220801ed
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/BindPropertiesSupportsGetController.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace BasicWebSite
+{
+    [BindProperties(SupportsGet = true)]
+    public class BindPropertiesSupportsGetController : Controller
+    {
+        public string Name { get; set; }
+
+        public IActionResult Action() => Content(Name);
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContactApiController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContactApiController.cs
new file mode 100644
index 0000000000..77a757f1ff
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContactApiController.cs
@@ -0,0 +1,106 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace BasicWebSite
+{
+    [ApiController]
+    [Route("/contact")]
+    public class ContactApiController : Controller
+    {
+        private readonly ContactsRepository _repository;
+
+        public ContactApiController(ContactsRepository repository)
+        {
+            _repository = repository;
+        }
+
+        [HttpGet("{id}")]
+        public ActionResult<Contact> Get(int id)
+        {
+            var contact = _repository.GetContact(id);
+            if (contact == null)
+            {
+                return NotFound();
+            }
+
+            return contact;
+        }
+
+        [HttpPost]
+        public ActionResult<Contact> Post([FromBody] Contact contact)
+        {
+            _repository.Add(contact);
+            return CreatedAtAction(nameof(Get), new { id = contact.ContactId }, contact);
+        }
+
+        [VndError]
+        [HttpPost("PostWithVnd")]
+        public ActionResult<Contact> PostWithVnd([FromBody] Contact contact)
+        {
+            _repository.Add(contact);
+            return CreatedAtAction(nameof(Get), new { id = contact.ContactId }, contact);
+        }
+
+        [HttpPost("ActionWithInferredFromBodyParameter")]
+        public ActionResult<Contact> ActionWithInferredFromBodyParameter(Contact contact) => contact;
+
+        [HttpPost(nameof(ActionWithInferredFromBodyParameterAndCancellationToken))]
+        public ActionResult<Contact> ActionWithInferredFromBodyParameterAndCancellationToken(Contact contact, CancellationToken cts)
+            => contact;
+
+        [HttpPost("ActionWithInferredRouteAndQueryParameters/{name}/{id}")]
+        public ActionResult<Contact> ActionWithInferredRouteAndQueryParameter(int id, string name, string email)
+        {
+            return new Contact
+            {
+                ContactId = id,
+                Name = name,
+                Email = email,
+            };
+        }
+
+        [HttpGet("[action]")]
+        public ActionResult<Contact> ActionWithInferredEmptyPrefix([FromQuery] Contact contact)
+        {
+            return contact;
+        }
+
+        [HttpGet("[action]")]
+        public ActionResult<string> ActionWithInferredModelBinderType(
+            [ModelBinder(typeof(TestModelBinder))] string foo)
+        {
+            return foo;
+        }
+
+        [HttpGet("[action]")]
+        public ActionResult<string> ActionWithInferredModelBinderTypeWithExplicitModelName(
+            [ModelBinder(typeof(TestModelBinder), Name = "bar")] string foo)
+        {
+            return foo;
+        }
+
+        private class TestModelBinder : IModelBinder
+        {
+            public Task BindModelAsync(ModelBindingContext bindingContext)
+            {
+                var val = bindingContext.ValueProvider.GetValue(bindingContext.ModelName);
+                if (val == null)
+                {
+                    return Task.CompletedTask;
+                }
+
+                bindingContext.Result = ModelBindingResult.Success("From TestModelBinder: " + val);
+                return Task.CompletedTask;
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ContentNegotiationController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ContentNegotiationController.cs
new file mode 100644
index 0000000000..7227e77944
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ContentNegotiationController.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers.ContentNegotiation
+{
+    public class ContentNegotiationController : Controller
+    {
+        public IActionResult Index()
+        {
+            return new JsonResult("Index Method");
+        }
+
+        public User UserInfo()
+        {
+            return CreateUser();
+        }
+
+        [Produces(typeof(User))]
+        public IActionResult UserInfo_ProducesWithTypeOnly()
+        {
+            return new ObjectResult(CreateUser());
+        }
+
+        [Produces("application/xml", Type = typeof(User))]
+        public IActionResult UserInfo_ProducesWithTypeAndContentType()
+        {
+            return new ObjectResult(CreateUser());
+        }
+
+        private User CreateUser()
+        {
+            return new User() { Name = "John", Address = "One Microsoft Way" };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/FallbackOnTypeBasedMatchController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/FallbackOnTypeBasedMatchController.cs
new file mode 100644
index 0000000000..a232df7585
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/FallbackOnTypeBasedMatchController.cs
@@ -0,0 +1,86 @@
+// 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.
+
+using System.Linq;
+using BasicWebSite.Formatters;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.Extensions.Options;
+
+namespace BasicWebSite.Controllers.ContentNegotiation
+{
+    public class FallbackOnTypeBasedMatchController : Controller
+    {
+        private readonly IOptions<MvcOptions> _mvcOptions;
+        private readonly JsonOutputFormatter _jsonOutputFormatter;
+
+        public FallbackOnTypeBasedMatchController(IOptions<MvcOptions> mvcOptions)
+        {
+            _mvcOptions = mvcOptions;
+            _jsonOutputFormatter = mvcOptions.Value.OutputFormatters.OfType<JsonOutputFormatter>().First();
+        }
+
+        public int UseTheFallback_WithDefaultFormatters(int input)
+        {
+            return input;
+        }
+
+        public IActionResult UseTheFallback_UsingCustomFormatters(int input)
+        {
+            var objectResult = new ObjectResult(input);
+
+            // Request content type is application/custom.
+            // PlainTextFormatter cannot write because it does not support the type.
+            // JsonOutputFormatter cannot write in the first attempt because it does not support the
+            // request content type.
+            objectResult.Formatters.Add(new PlainTextFormatter());
+            objectResult.Formatters.Add(_jsonOutputFormatter);
+
+            return objectResult;
+        }
+
+        public IActionResult FallbackGivesNoMatch(int input)
+        {
+            var objectResult = new ObjectResult(input);
+
+            // Request content type is application/custom.
+            // PlainTextFormatter cannot write because it does not support the type.
+            objectResult.Formatters.Add(new PlainTextFormatter());
+
+            return objectResult;
+        }
+
+        public IActionResult OverrideTheFallback_UsingCustomFormatters(int input)
+        {
+            var objectResult = new ObjectResult(input);
+            objectResult.Formatters.Add(new PlainTextFormatter());
+            objectResult.Formatters.Add(_jsonOutputFormatter);
+
+            return objectResult;
+        }
+
+        public IActionResult OverrideTheFallback_WithDefaultFormatters(int input)
+        {
+            var objectResult = new ObjectResult(input);
+            foreach (var formatter in _mvcOptions.Value.OutputFormatters)
+            {
+                objectResult.Formatters.Add(formatter);
+            }
+
+            return objectResult;
+        }
+
+        public IActionResult ReturnString(
+            [FromServices] IOptions<MvcOptions> optionsAccessor)
+        {
+            var objectResult = new ObjectResult("Hello World!");
+
+            foreach (var formatter in optionsAccessor.Value.OutputFormatters)
+            {
+                objectResult.Formatters.Add(formatter);
+            }
+
+            return objectResult;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/FormatFilterController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/FormatFilterController.cs
new file mode 100644
index 0000000000..ec617bdf3e
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/FormatFilterController.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using BasicWebSite.Formatters;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace BasicWebSite.Controllers.ContentNegotiation
+{
+    public class FormatFilterController : Controller
+    {
+        [Produces("application/FormatFilterController")]
+        [FormatFilter]
+        [CustomFormatterActionFilter]
+        public string ProducesTakesPrecedenceOverUserSuppliedFormatMethod()
+        {
+            return "MethodWithFormatFilter";
+        }
+
+        [HttpGet]
+        [FormatFilter]
+        public Customer CustomerInfo()
+        {
+            return new Customer() { Name = "John" };
+        }
+
+        private class CustomFormatterActionFilter : ActionFilterAttribute
+        {
+            public override void OnActionExecuted(ActionExecutedContext context)
+            {
+                var result = context.Result as ObjectResult;
+                if (result != null)
+                {
+                    result.Formatters.Add(new CustomFormatter("application/FormatFilterController"));
+                }
+            }
+        }
+
+        public class Customer
+        {
+            public string Name { get; set; }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/InvalidContentTypeController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/InvalidContentTypeController.cs
new file mode 100644
index 0000000000..82b2a7fb99
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/InvalidContentTypeController.cs
@@ -0,0 +1,14 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers.ContentNegotiation
+{
+    public class InvalidContentTypeController : Controller
+    {
+        [HttpGet("InvalidContentType/SetResponseContentTypeJson")]
+        public IActionResult SetResponseContentTypeJson()
+        {
+            HttpContext.Response.ContentType = "json";
+            return Ok(0);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NoContentController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NoContentController.cs
new file mode 100644
index 0000000000..c0882c99d4
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NoContentController.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers.ContentNegotiation
+{
+    public class NoContentController : Controller
+    {
+        public Task<string> ReturnTaskOfString_NullValue()
+        {
+            return Task.FromResult<string>(null);
+        }
+
+        public Task<object> ReturnTaskOfObject_NullValue()
+        {
+            return Task.FromResult<object>(null);
+        }
+
+        public string ReturnString_NullValue()
+        {
+            return null;
+        }
+
+        public object ReturnObject_NullValue()
+        {
+            return null;
+        }
+
+        public Task ReturnTask()
+        {
+            return Task.FromResult<bool>(true);
+        }
+
+        public void ReturnVoid()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NoContentDoNotTreatNullValueAsNoContentController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NoContentDoNotTreatNullValueAsNoContentController.cs
new file mode 100644
index 0000000000..5ce41a0b47
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NoContentDoNotTreatNullValueAsNoContentController.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Formatters;
+
+namespace BasicWebSite.Controllers.ContentNegotiation
+{
+    public class NoContentDoNotTreatNullValueAsNoContentController : Controller
+    {
+        public override void OnActionExecuted(ActionExecutedContext context)
+        {
+            var result = context.Result as ObjectResult;
+            if (result != null)
+            {
+                var noContentFormatter = new HttpNoContentOutputFormatter() { TreatNullValueAsNoContent = false };
+                result.Formatters.Add(noContentFormatter);
+            }
+
+            base.OnActionExecuted(context);
+        }
+
+        public Task<string> ReturnTaskOfString_NullValue()
+        {
+            return Task.FromResult<string>(null);
+        }
+
+        public Task<object> ReturnTaskOfObject_NullValue()
+        {
+            return Task.FromResult<object>(null);
+        }
+
+        public object ReturnObject_NullValue()
+        {
+            return null;
+        }
+
+        public string ReturnString_NullValue()
+        {
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NoProducesContentOnClassController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NoProducesContentOnClassController.cs
new file mode 100644
index 0000000000..31c7bd66af
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NoProducesContentOnClassController.cs
@@ -0,0 +1,30 @@
+// 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.
+
+using BasicWebSite.Formatters;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace BasicWebSite.Controllers.ContentNegotiation
+{
+    public class NoProducesContentOnClassController : ProducesContentBaseController
+    {
+        public override void OnActionExecuted(ActionExecutedContext context)
+        {
+            var result = context.Result as ObjectResult;
+            if (result != null)
+            {
+                result.Formatters.Add(new CustomFormatter("application/custom_NoProducesContentOnClassController_Action"));
+            }
+
+            base.OnActionExecuted(context);
+        }
+
+        [Produces("application/custom_NoProducesContentOnClassController_Action")]
+        public override string ReturnClassName()
+        {
+            // should be written using the formatter provided by this action and not the base action.
+            return "NoProducesContentOnClassController";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NormalController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NormalController.cs
new file mode 100644
index 0000000000..bc3671b0bb
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NormalController.cs
@@ -0,0 +1,83 @@
+// 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.
+
+using System.Buffers;
+using BasicWebSite.Formatters;
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Newtonsoft.Json;
+
+namespace BasicWebSite.Controllers.ContentNegotiation
+{
+    public class NormalController : Controller
+    {
+        private static readonly JsonSerializerSettings _indentedSettings;
+        private readonly JsonOutputFormatter _indentingFormatter;
+
+        static NormalController()
+        {
+            _indentedSettings = JsonSerializerSettingsProvider.CreateSerializerSettings();
+            _indentedSettings.Formatting = Formatting.Indented;
+        }
+
+        public NormalController(ArrayPool<char> charPool)
+        {
+            _indentingFormatter = new JsonOutputFormatter(_indentedSettings, charPool);
+        }
+
+        public override void OnActionExecuted(ActionExecutedContext context)
+        {
+            var result = context.Result as ObjectResult;
+            if (result != null)
+            {
+                result.Formatters.Add(new PlainTextFormatter());
+                result.Formatters.Add(new CustomFormatter("application/custom"));
+                result.Formatters.Add(_indentingFormatter);
+            }
+
+            base.OnActionExecuted(context);
+        }
+
+        public string ReturnClassName()
+        {
+            return "NormalController";
+        }
+
+        public User ReturnUser()
+        {
+            return CreateUser();
+        }
+
+        [Produces("application/NoFormatter")]
+        public User ReturnUser_NoMatchingFormatter()
+        {
+            return CreateUser();
+        }
+
+        [Produces("application/custom", "application/json", "text/json")]
+        public User MultipleAllowedContentTypes()
+        {
+            return CreateUser();
+        }
+
+        [Produces("application/custom")]
+        public string WriteUserUsingCustomFormat()
+        {
+            return "Written using custom format.";
+        }
+
+        [NonAction]
+        public User CreateUser()
+        {
+            User user = new User()
+            {
+                Name = "My name",
+                Address = "My address",
+            };
+
+            return user;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesContentBaseController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesContentBaseController.cs
new file mode 100644
index 0000000000..5ffa16fa9e
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesContentBaseController.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using BasicWebSite.Formatters;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace BasicWebSite.Controllers.ContentNegotiation
+{
+    [Produces("application/custom_ProducesContentBaseController")]
+    public class ProducesContentBaseController : Controller
+    {
+        public override void OnActionExecuted(ActionExecutedContext context)
+        {
+            var result = context.Result as ObjectResult;
+            if (result != null)
+            {
+                result.Formatters.Add(new PlainTextFormatter());
+                result.Formatters.Add(new CustomFormatter("application/custom_ProducesContentBaseController"));
+                result.Formatters.Add(new CustomFormatter("application/custom_ProducesContentBaseController_Action"));
+            }
+
+            base.OnActionExecuted(context);
+        }
+
+        [Produces("application/custom_ProducesContentBaseController_Action")]
+        public virtual string ReturnClassName()
+        {
+            // Should be written using the action's content type. Overriding the one at the class.
+            return "ProducesContentBaseController";
+        }
+
+        public virtual string ReturnClassNameWithNoContentTypeOnAction()
+        {
+            // Should be written using the action's content type. Overriding the one at the class.
+            return "ProducesContentBaseController";
+        }
+
+        public virtual string ReturnClassNameContentTypeOnDerivedAction()
+        {
+            return "ProducesContentBaseController";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesContentOnClassController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesContentOnClassController.cs
new file mode 100644
index 0000000000..3fdc37844c
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesContentOnClassController.cs
@@ -0,0 +1,46 @@
+// 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.
+
+using BasicWebSite.Formatters;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace BasicWebSite.Controllers.ContentNegotiation
+{
+    [Produces("application/custom_ProducesContentOnClassController")]
+    public class ProducesContentOnClassController : ProducesContentBaseController
+    {
+        public override void OnActionExecuted(ActionExecutedContext context)
+        {
+            var result = context.Result as ObjectResult;
+            if (result != null)
+            {
+                result.Formatters.Add(new CustomFormatter("application/custom_ProducesContentOnClassController"));
+                result.Formatters.Add(
+                    new CustomFormatter("application/custom_ProducesContentOnClassController_Action"));
+            }
+
+            base.OnActionExecuted(context);
+        }
+
+        // No Content type defined by the derived class action.
+        public override string ReturnClassName()
+        {
+            // should be written using the content defined at base class's action.
+            return "ProducesContentOnClassController";
+        }
+
+        public override string ReturnClassNameWithNoContentTypeOnAction()
+        {
+            // should be written using the content defined at derived class's class.
+            return "ProducesContentOnClassController";
+        }
+
+        [Produces("application/custom_ProducesContentOnClassController_Action")]
+        public override string ReturnClassNameContentTypeOnDerivedAction()
+        {
+            // should be written using the content defined at derived class's class.
+            return "ProducesContentOnClassController";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesJsonController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesJsonController.cs
new file mode 100644
index 0000000000..1d0fe2b002
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesJsonController.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers.ContentNegotiation
+{
+    public class ProducesJsonController : Controller
+    {
+        [Produces("application/xml")]
+        public IActionResult Produces_WithNonObjectResult()
+        {
+            return new JsonResult(new { MethodName = "Produces_WithNonObjectResult" });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesWithMediaTypeParametersController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesWithMediaTypeParametersController.cs
new file mode 100644
index 0000000000..510c0ce725
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesWithMediaTypeParametersController.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using BasicWebSite.Formatters;
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace BasicWebSite.Controllers.ContentNegotiation
+{
+    public class ProducesWithMediaTypeParametersController : Controller
+    {
+        public override void OnActionExecuted(ActionExecutedContext context)
+        {
+            var result = context.Result as ObjectResult;
+
+            if (result != null)
+            {
+                result.Formatters.Add(new VCardFormatter_V3());
+                result.Formatters.Add(new VCardFormatter_V4());
+            }
+        }
+
+        [Produces("text/vcard;VERSION=V3.0")]
+        public Contact ContactInfoUsingV3Format()
+        {
+            return new Contact()
+            {
+                Name = "John Williams",
+                Gender = GenderType.Male
+            };
+        }
+
+        [Produces("text/vcard;VERSION=V4.0")]
+        public Contact ContactInfoUsingV4Format()
+        {
+            return new Contact()
+            {
+                Name = "John Williams",
+                Gender = GenderType.Male
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesWithMediaTypeSuffixesController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesWithMediaTypeSuffixesController.cs
new file mode 100644
index 0000000000..fcd9b973d9
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesWithMediaTypeSuffixesController.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers.ContentNegotiation
+{
+    [Route("ProducesWithMediaTypeSuffixesController/[action]")]
+    public class ProducesWithMediaTypeSuffixesController : Controller
+    {
+        [Produces("application/vnd.example.contact+json; v=2", "application/vnd.example.contact+xml; v=2")]
+        public Contact ContactInfo()
+        {
+            return new Contact()
+            {
+                Name = "Jason Ecsemelle"
+            };
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/TextPlainController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/TextPlainController.cs
new file mode 100644
index 0000000000..08450ef53b
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/TextPlainController.cs
@@ -0,0 +1,51 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers.ContentNegotiation
+{
+    public class TextPlainController : Controller
+    {
+        public Task<string> ReturnTaskOfString()
+        {
+            return Task.FromResult<string>("ReturnTaskOfString");
+        }
+
+        public Task<object> ReturnTaskOfObject_StringValue()
+        {
+            return Task.FromResult<object>("ReturnTaskOfObject_StringValue");
+        }
+
+        public Task<object> ReturnTaskOfObject_ObjectValue()
+        {
+            return Task.FromResult(new object());
+        }
+
+        public string ReturnString()
+        {
+            return "ReturnString";
+        }
+
+        public object ReturnObject_StringValue()
+        {
+            return "ReturnObject_StringValue";
+        }
+
+        public object ReturnObject_ObjectValue()
+        {
+            return new object();
+        }
+
+        public string ReturnString_NullValue()
+        {
+            return null;
+        }
+
+        public object ReturnObject_NullValue()
+        {
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/DefaultValuesController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/DefaultValuesController.cs
new file mode 100644
index 0000000000..3bf963c3eb
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/DefaultValuesController.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using System;
+using System.ComponentModel;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers
+{
+    public class DefaultValuesController : Controller
+    {
+        [HttpGet]
+        public string EchoValue_DefaultValueAttribute([DefaultValue("hello")] string input)
+        {
+            return input;
+        }
+
+        [HttpGet]
+        public string EchoValue_DefaultParameterValue(string input = "world")
+        {
+            return input;
+        }
+
+        [HttpGet]
+        public string EchoValue_DefaultParameterValue_ForStructs(
+            Guid guid = default(Guid),
+            TimeSpan timeSpan = default(TimeSpan))
+        {
+            return $"{guid}, {timeSpan}";
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/FiltersController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/FiltersController.cs
new file mode 100644
index 0000000000..75addb6f6b
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/FiltersController.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using System;
+using System.Globalization;
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers
+{
+    public class FiltersController : Controller
+    {
+        [HttpPost]
+        [Consumes("application/yaml")]
+        [UnprocessableResultFilter]
+        public IActionResult AlwaysRunResultFiltersCanRunWhenResourceFilterShortCircuit([FromBody] Product product) =>
+            throw new Exception("Shouldn't be executed");
+
+        [ServiceFilter(typeof(ServiceActionFilter))]
+        public IActionResult ServiceFilterTest() => Content("Service filter content");
+
+        [TraceResultOutputFilter]
+        public IActionResult TraceResult() => new EmptyResult();
+
+        [Route("{culture}/[controller]/[action]")]
+        [MiddlewareFilter(typeof(LocalizationPipeline))]
+        public IActionResult MiddlewareFilterTest()
+        {
+            return Content($"CurrentCulture:{CultureInfo.CurrentCulture.Name},CurrentUICulture:{CultureInfo.CurrentUICulture.Name}");
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/HomeController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/HomeController.cs
new file mode 100644
index 0000000000..5d5fb11525
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/HomeController.cs
@@ -0,0 +1,139 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Newtonsoft.Json.Serialization;
+
+namespace BasicWebSite.Controllers
+{
+    public class HomeController : Controller
+    {
+        public IActionResult Index()
+        {
+            return View();
+        }
+
+        public IActionResult CSharp7View()
+        {
+            var people = new List<(string FirstName, string LastName, object FavoriteNumber)>()
+            {
+                ("John", "Doe", 6.022_140_857_747_474e23),
+                ("John", "Smith", 100_000_000_000),
+                ("Someone", "Nice", (decimal)1.618_033_988_749_894_848_204_586_834_365_638_117_720_309_179M),
+            };
+
+            return View(people);
+        }
+
+        // Keep the return type as object to ensure that we don't
+        // wrap IActionResult instances into ObjectResults.
+        public object PlainView()
+        {
+            return View();
+        }
+
+        public IActionResult ActionLinkView()
+        {
+            // This view contains a link generated with Html.ActionLink
+            // that provides a host with non unicode characters.
+            return View();
+        }
+
+        public IActionResult RedirectToActionReturningTaskAction()
+        {
+            return RedirectToAction("ActionReturningTask");
+        }
+
+        public IActionResult RedirectToRouteActionAsMethodAction()
+        {
+            return RedirectToRoute("ActionAsMethod", new { action = "ActionReturningTask", controller = "Home" });
+        }
+
+        public IActionResult RedirectToRouteUsingRouteName()
+        {
+            return RedirectToRoute("OrdersApi", new { id = 10 });
+        }
+
+        public IActionResult NoContentResult()
+        {
+            return new StatusCodeResult(StatusCodes.Status204NoContent);
+        }
+
+        [AcceptVerbs("GET", "POST")]
+        [RequireHttps]
+        public IActionResult HttpsOnlyAction()
+        {
+            return Ok();
+        }
+
+        public Task ActionReturningTask()
+        {
+            Response.Headers.Add("Message", new[] { "Hello, World!" });
+            return Task.FromResult(true);
+        }
+
+        public IActionResult JsonHelperInView()
+        {
+            Person person = new Person
+            {
+                id = 9000,
+                FullName = "John <b>Smith</b>"
+            };
+
+            return View(person);
+        }
+
+        public IActionResult JsonHelperWithSettingsInView(bool snakeCase)
+        {
+            Person person = new Person
+            {
+                id = 9000,
+                FullName = "John <b>Smith</b>"
+            };
+            ViewData["naming"] = snakeCase ? (NamingStrategy)new SnakeCaseNamingStrategy() : new DefaultNamingStrategy();
+
+            return View(person);
+        }
+
+        public IActionResult ViewWithPrefixedAttributeValue()
+        {
+            return View();
+        }
+
+        public string GetApplicationDescription()
+        {
+            return ControllerContext.ActionDescriptor.Properties["description"].ToString();
+        }
+
+        [HttpGet]
+        public IActionResult Product()
+        {
+            return Content("Get Product");
+        }
+
+        [HttpPost]
+        public IActionResult Product(Product product)
+        {
+            return RedirectToAction();
+        }
+
+        [HttpGet]
+        public IActionResult GetAssemblyPartData([FromServices] ApplicationPartManager applicationPartManager)
+        {
+            // Ensures that the entry assembly part is marked correctly.
+            var assemblyPartMetadata = applicationPartManager
+                .ApplicationParts
+                .OfType<AssemblyPart>()
+                .Select(part => part.Name)
+                .ToArray();
+
+            return Ok(assemblyPartMetadata);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/JsonResultController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/JsonResultController.cs
new file mode 100644
index 0000000000..3964b292f3
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/JsonResultController.cs
@@ -0,0 +1,48 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+
+namespace BasicWebSite.Controllers
+{
+    public class JsonResultController : Controller
+    {
+        private static readonly JsonSerializerSettings _customSerializerSettings;
+
+        static JsonResultController()
+        {
+            _customSerializerSettings = JsonSerializerSettingsProvider.CreateSerializerSettings();
+            _customSerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
+        }
+
+        public JsonResult Plain()
+        {
+            return Json(new { Message = "hello" });
+        }
+
+        public JsonResult CustomContentType()
+        {
+            var result = new JsonResult(new { Message = "hello" });
+            result.ContentType = "application/message+json";
+            return result;
+        }
+
+        public JsonResult CustomSerializerSettings()
+        {
+            return Json(new { Message = "hello" }, _customSerializerSettings);
+        }
+
+        public JsonResult Null()
+        {
+            return Json(null);
+        }
+
+        public JsonResult String()
+        {
+            return Json("hello");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/LinkGeneration/LinksController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/LinkGeneration/LinksController.cs
new file mode 100644
index 0000000000..990fdc3ebb
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/LinkGeneration/LinksController.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers.LinkGeneration
+{
+    public class LinksController : Controller
+    {
+        public IActionResult Index(string view)
+        {
+            return View(viewName: view);
+        }
+
+        public string Details()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/LinkGeneration/OrdersController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/LinkGeneration/OrdersController.cs
new file mode 100644
index 0000000000..a25fc4daf8
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/LinkGeneration/OrdersController.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers.LinkGeneration
+{
+    [Route("api/orders/{id?}", Name = "OrdersApi")]
+    public class OrdersController : Controller
+    {
+        [HttpGet]
+        public IActionResult GetAll()
+        {
+            throw new NotImplementedException();
+        }
+
+        [HttpGet]
+        public IActionResult GetById(int id)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/LinkGeneration/ProductsController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/LinkGeneration/ProductsController.cs
new file mode 100644
index 0000000000..4f2571ef4c
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/LinkGeneration/ProductsController.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers.LinkGeneration
+{
+    public class ProductsController : Controller
+    {
+        public IActionResult Index()
+        {
+            throw new NotImplementedException();
+        }
+
+        public IActionResult Details()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/MonitorController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/MonitorController.cs
new file mode 100644
index 0000000000..5732b9ac4d
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/MonitorController.cs
@@ -0,0 +1,26 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+
+namespace BasicWebSite
+{
+    public class MonitorController : Controller
+    {
+        private readonly ActionDescriptorCreationCounter _counterService;
+
+        public MonitorController(IEnumerable<IActionDescriptorProvider> providers)
+        {
+            _counterService = providers.OfType<ActionDescriptorCreationCounter>().Single();
+        }
+
+        public IActionResult CountActionDescriptorInvocations()
+        {
+            return Content(_counterService.CallCount.ToString(CultureInfo.InvariantCulture));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/OrderController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/OrderController.cs
new file mode 100644
index 0000000000..f781568b38
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/OrderController.cs
@@ -0,0 +1,37 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite
+{
+    public class OrderController : Controller
+    {
+        public int GetServiceOrder(string serviceType, string actualType)
+        {
+            var elementType = Type.GetType(serviceType);
+
+            var queryType = typeof(IEnumerable<>).MakeGenericType(elementType);
+
+            var services = (IEnumerable<object>)HttpContext?.RequestServices.GetService(queryType);
+            foreach (var service in services)
+            {
+                if (actualType != null && service.GetType().AssemblyQualifiedName == actualType)
+                {
+                    var orderProperty = elementType.GetTypeInfo().GetDeclaredProperty("Order");
+                    return (int)orderProperty.GetValue(service);
+                }
+                else if (actualType == null)
+                {
+                    var orderProperty = elementType.GetProperty("Order");
+                    return (int)orderProperty.GetValue(service);
+                }
+            }
+
+            throw new InvalidOperationException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/PageRouteController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/PageRouteController.cs
new file mode 100644
index 0000000000..2022d5e221
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/PageRouteController.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers
+{
+    // Verifies that we can use the "page" token in routing in a controller only (no Razor Pages) application
+    // without affecting view lookups.
+    public class PageRouteController : Controller
+    {
+        public IActionResult ConventionalRoute(string page)
+        {
+            ViewData["page"] = page;
+            return View();
+        }
+
+        [HttpGet("/PageRoute/Attribute/{page}")]
+        public IActionResult AttributeRoute(string page)
+        {
+            ViewData["page"] = page;
+            return View();
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/PassThroughController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/PassThroughController.cs
new file mode 100644
index 0000000000..d1101b2f76
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/PassThroughController.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using BasicWebSite.Components;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers
+{
+    public class PassThroughController : Controller
+    {
+        public IActionResult Index(long value)
+        {
+            return ViewComponent(typeof(PassThroughViewComponent), new { value });
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/RemoteAttribute_HomeController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/RemoteAttribute_HomeController.cs
new file mode 100644
index 0000000000..5e75011496
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/RemoteAttribute_HomeController.cs
@@ -0,0 +1,37 @@
+// 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.
+
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers
+{
+    [Route("[controller]/[action]")]
+    public class RemoteAttribute_HomeController : Controller
+    {
+        private static RemoteAttributeUser _user;
+
+        [HttpGet]
+        public IActionResult Create()
+        {
+            return View();
+        }
+
+        [HttpPost]
+        public IActionResult Create(RemoteAttributeUser user)
+        {
+            if (!ModelState.IsValid)
+            {
+                return View(user);
+            }
+
+            _user = user;
+            return RedirectToAction(nameof(Details));
+        }
+
+        public IActionResult Details()
+        {
+            return View(_user);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/RemoteAttribute_VerifyController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/RemoteAttribute_VerifyController.cs
new file mode 100644
index 0000000000..1641d9870a
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/RemoteAttribute_VerifyController.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers
+{
+    public class RemoteAttribute_VerifyController : Controller
+    {
+        // This action is overloaded and may receive requests to validate UserId1, UserId2 or UserId5.
+        [AcceptVerbs("Get", "Post")]
+        [Route("[controller]/[action]", Name = "VerifyRoute")]
+        public IActionResult IsIdAvailable(string userId1, string userId2, string userId5)
+        {
+            string name;
+            string value;
+            if (userId1 != null)
+            {
+                name = nameof(RemoteAttributeUser.UserId1);
+                value = userId1;
+            }
+            else if (userId2 != null)
+            {
+
+                name = nameof(RemoteAttributeUser.UserId2);
+                value = userId2;
+            }
+            else if (userId5 != null)
+            {
+
+                name = nameof(RemoteAttributeUser.UserId5);
+                value = userId5;
+            }
+            else
+            {
+                name = "unknown";
+                value = string.Empty;
+            }
+
+            return Json(data: $"/RemoteAttribute_Verify/IsIdAvailable rejects {name}: '{value}'.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/RequestFormLimitsController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/RequestFormLimitsController.cs
new file mode 100644
index 0000000000..027ae44b0d
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/RequestFormLimitsController.cs
@@ -0,0 +1,59 @@
+// 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.
+
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers
+{
+    [RequestFormLimits(ValueCountLimit = 2)]
+    public class RequestFormLimitsController : Controller
+    {
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public IActionResult RequestFormLimitsBeforeAntiforgeryValidation(Product product)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
+
+            return Json(product);
+        }
+
+        [HttpPost]
+        [RequestFormLimits(ValueCountLimit = 5)]
+        public IActionResult OverrideControllerLevelLimits(Product product)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
+            return Json(product);
+        }
+
+        [HttpPost]
+        [RequestFormLimits]
+        public IActionResult OverrideControllerLevelLimitsUsingDefaultLimits(Product product)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
+            return Json(product);
+        }
+
+        [HttpPost]
+        [RequestFormLimits(ValueCountLimit = 2)]
+        [RequestSizeLimit(100)]
+        [ValidateAntiForgeryToken]
+        public IActionResult RequestSizeLimitBeforeRequestFormLimits(Product product)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
+            return Json(product);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/RequestScopedServiceController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/RequestScopedServiceController.cs
new file mode 100644
index 0000000000..e7a89377b3
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/RequestScopedServiceController.cs
@@ -0,0 +1,49 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite
+{
+    [Route("RequestScopedService/[action]")]
+    public class RequestScopedServiceController : Controller
+    {
+        // This only matches a specific requestId value
+        [HttpGet]
+        [RequestScopedActionConstraint("b40f6ec1-8a6b-41c1-b3fe-928f581ebaf5")]
+        public string FromActionConstraint()
+        {
+            return "b40f6ec1-8a6b-41c1-b3fe-928f581ebaf5";
+        }
+
+        [HttpGet]
+        [TypeFilter(typeof(RequestScopedFilter))]
+        public void FromFilter()
+        {
+        }
+
+        [HttpGet]
+        public IActionResult FromView()
+        {
+            return View("View");
+        }
+
+        [HttpGet]
+        public IActionResult FromTagHelper()
+        {
+            return View("TagHelper");
+        }
+
+        [HttpGet]
+        public IActionResult FromViewComponent()
+        {
+            return View("ViewComponent");
+        }
+
+        [HttpGet]
+        public string FromActionArgument([FromServices] RequestIdService requestIdService)
+        {
+            return requestIdService.RequestId;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/RequestSizeLimitController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/RequestSizeLimitController.cs
new file mode 100644
index 0000000000..f4e8f3c3b7
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/RequestSizeLimitController.cs
@@ -0,0 +1,37 @@
+// 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.
+
+using System;
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace BasicWebSite.Controllers
+{
+    [RequestSizeLimit(500)]
+    public class RequestSizeLimitController : Controller
+    {
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public IActionResult RequestSizeLimitCheckBeforeAntiforgeryValidation(Product product)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
+
+            return Json(product);
+        }
+
+        [HttpPost]
+        [DisableRequestSizeLimit]
+        public IActionResult DisableRequestSizeLimit([FromBody] Product product)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
+            return Json(product);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/RoutingController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/RoutingController.cs
new file mode 100644
index 0000000000..c5576b4685
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/RoutingController.cs
@@ -0,0 +1,49 @@
+// 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.
+
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace BasicWebSite
+{
+    public class RoutingController : Controller
+    {
+        public object Conventional()
+        {
+            return GetData();
+        }
+
+        [Route("Routing/Attribute")]
+        public object Attribute()
+        {
+            return GetData();
+        }
+
+        public object DataTokens()
+        {
+            return GetData();
+        }
+
+        public override void OnActionExecuting(ActionExecutingContext context)
+        {
+            if (!context.RouteData.DataTokens.ContainsKey("actionName"))
+            {
+                context.RouteData.DataTokens.Add("actionName", ((ControllerActionDescriptor)context.ActionDescriptor).ActionName);
+            }
+        }
+
+        private object GetData()
+        {
+            var routers = RouteData.Routers.Select(r => r.GetType().FullName).ToArray();
+            var dataTokens = RouteData.DataTokens;
+
+            return new
+            {
+                DataTokens = dataTokens,
+                Routers = routers
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/SqlDataController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/SqlDataController.cs
new file mode 100644
index 0000000000..b11d6116f6
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/SqlDataController.cs
@@ -0,0 +1,17 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite
+{
+    [NonController]
+    public class SqlDataController
+    {
+        public int TruncateAllDbRecords()
+        {
+            // Return no. of tables truncated
+            return 7;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/TempDataController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/TempDataController.cs
new file mode 100644
index 0000000000..1adeb1922a
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/TempDataController.cs
@@ -0,0 +1,128 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using BasicWebSite.Filters;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers
+{
+    public class TempDataController : Controller
+    {
+        public IActionResult Index()
+        {
+            return View();
+        }
+
+        public IActionResult DisplayTempData(string value)
+        {
+            TempData["key"] = value;
+            return View();
+        }
+
+        public IActionResult SetTempData(string value)
+        {
+            TempData["key"] = value;
+            return Content(value);
+        }
+
+        public IActionResult GetTempDataAndRedirect()
+        {
+            var value = TempData["key"];
+            return RedirectToAction("GetTempData");
+        }
+
+        public string GetTempData()
+        {
+            var value = TempData["key"];
+            return value?.ToString();
+        }
+
+        public IActionResult PeekTempData()
+        {
+            var peekValue = TempData.Peek("key");
+            return Content(peekValue.ToString());
+        }
+
+        public IActionResult SetTempDataMultiple(
+            string value,
+            int intValue,
+            IList<string> listValues,
+            DateTime datetimeValue,
+            Guid guidValue)
+        {
+            TempData["key1"] = value;
+            TempData["key2"] = intValue;
+            TempData["key3"] = listValues;
+            TempData["key4"] = datetimeValue;
+            TempData["key5"] = guidValue;
+            return RedirectToAction("GetTempDataMultiple");
+        }
+
+        public async Task SetTempDataResponseWrite()
+        {
+            TempData["value1"] = "steve";
+
+            await Response.WriteAsync("Steve!");
+        }
+
+        public string GetTempDataMultiple()
+        {
+            var value1 = TempData["key1"].ToString();
+            var value2 = Convert.ToInt32(TempData["key2"]);
+            var value3 = (IList<string>)TempData["key3"];
+            var value4 = (DateTime)TempData["key4"];
+            var value5 = (Guid)TempData["key5"];
+            return $"{value1} {value2.ToString()} {value3.Count.ToString()} {value4.ToString()} {value5.ToString()}";
+        }
+
+        [HttpGet]
+        public IActionResult SetTempDataInActionResult()
+        {
+            return new StoreIntoTempDataActionResult();
+        }
+
+        [HttpGet]
+        public string GetTempDataSetInActionResult()
+        {
+            return TempData["Name"]?.ToString();
+        }
+
+        [HttpGet]
+        public IActionResult SetLargeValueInTempData(int size, char character)
+        {
+            TempData["LargeValue"] = new string(character, size);
+            return Ok();
+        }
+
+        [HttpGet]
+        public string GetLargeValueFromTempData()
+        {
+            return TempData["LargeValue"]?.ToString();
+        }
+
+        [HttpGet]
+        [TestExceptionFilter]
+        public IActionResult UnhandledExceptionAndSettingTempData()
+        {
+            TempData[nameof(UnhandledExceptionAndSettingTempData)] = "James";
+            throw new InvalidOperationException($"Exception from action {nameof(UnhandledExceptionAndSettingTempData)}");
+        }
+
+        [HttpGet]
+        public string UnhandledExceptionAndGetTempData()
+        {
+            return TempData[nameof(UnhandledExceptionAndSettingTempData)]?.ToString();
+        }
+
+        [HttpGet]
+        public void GrantConsent()
+        {
+            HttpContext.Features.Get<ITrackingConsentFeature>().GrantConsent();
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/TempDataPropertyController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/TempDataPropertyController.cs
new file mode 100644
index 0000000000..75994f0b1a
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/TempDataPropertyController.cs
@@ -0,0 +1,65 @@
+// 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.
+
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using System.Net;
+
+namespace BasicWebSite.Controllers
+{
+    public class TempDataPropertyController : Controller
+    {
+        [TempData]
+        public string Message { get; set; }
+
+        [TempData]
+        public int? NullableInt { get; set; }
+
+        [HttpPost]
+        public IActionResult CreateForView(Person person)
+        {
+            Message = "Success (from Temp Data)";
+            NullableInt = 100;
+            return RedirectToAction("DetailsView", person);
+        }
+
+        [HttpPost]
+        public IActionResult Create(Person person)
+        {
+            Message = "Success (from Temp Data)";
+            NullableInt = 100;
+            return RedirectToAction("Details", person);
+        }
+
+        public IActionResult DetailsView(Person person)
+        {
+            ViewData["Message"] = Message;
+            ViewData["NullableInt"] = NullableInt;
+            return View(person);
+        }
+
+        public string Details(Person person)
+        {
+            return $"{Message}{NullableInt} for person {person.FullName} with id {person.id}.";
+        }
+
+        public StatusCodeResult CreateNoRedirect(Person person)
+        {
+            Message = "Success (from Temp Data)";
+            NullableInt = 100;
+            return new OkResult();
+        }
+
+        public string TempDataKept()
+        {
+            TempData.Keep();
+            return Message + NullableInt;
+        }
+
+        public string ReadTempData()
+        {
+            return Message + NullableInt;
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/TestingController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/TestingController.cs
new file mode 100644
index 0000000000..07e76a3d6b
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/TestingController.cs
@@ -0,0 +1,111 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers
+{
+    public class TestingController : Controller
+    {
+        public TestingController(TestService service)
+        {
+            Service = service;
+        }
+
+        public TestService Service { get; }
+
+        [HttpGet("Testing/Builder")]
+        public string Get() => Service.Message;
+
+        [HttpPost("Testing/RedirectHandler/{value}")]
+        public IActionResult RedirectHandler(
+            [FromRoute]int value,
+            [FromBody] Number number,
+            [FromHeader(Name = "X-Pass-Thru")] string passThruValue)
+        {
+            Response.Headers.Add("X-Pass-Thru", passThruValue);
+            if (value < number.Value)
+            {
+                return RedirectToActionPreserveMethod(
+                    nameof(RedirectHandler),
+                    "Testing",
+                    new { value = value + 1 });
+            }
+
+            return Ok(new RedirectHandlerResponse { Url = value, Body = number.Value });
+        }
+
+        [HttpGet("Testing/AntiforgerySimulator/{value}")]
+        public IActionResult AntiforgerySimulator([FromRoute]int value)
+        {
+            Response.Cookies.Append(
+                "AntiforgerySimulator",
+                $"Cookie-{value.ToString(CultureInfo.InvariantCulture)}");
+
+            return Ok();
+        }
+
+
+        [HttpPost("Testing/PostRedirectGet/Post/{value}")]
+        public IActionResult PostRedirectGetPost([FromRoute]int value)
+        {
+            var compareValue = $"Cookie-{value.ToString(CultureInfo.InvariantCulture)}";
+            if (!Request.Cookies.ContainsKey("AntiforgerySimulator"))
+            {
+                return BadRequest("Missing AntiforgerySimulator cookie");
+            }
+
+            if (!string.Equals(compareValue, Request.Cookies["AntiforgerySimulator"]))
+            {
+                return BadRequest("Values don't match");
+            }
+
+            TempData["Value"] = value + 1;
+            Response.Cookies.Append("Message", $"Value-{(value + 1).ToString(CultureInfo.InvariantCulture)}");
+
+            return RedirectToAction(nameof(PostRedirectGetGet));
+        }
+
+        [HttpGet("Testing/PostRedirectGet/Get/{value}")]
+        public IActionResult PostRedirectGetGet([FromRoute]int value)
+        {
+            return Ok(new PostRedirectGetGetResponse
+            {
+                TempDataValue = (int)TempData["Value"],
+                CookieValue = Request.Cookies["Message"]
+            });
+        }
+
+        [HttpPut("Testing/Put/{value}")]
+        public IActionResult PutNoBody([FromRoute]int value)
+        {
+            if (value < 5)
+            {
+                return RedirectToActionPermanentPreserveMethod(nameof(PutNoBody), "Testing", new { value = value + 1 });
+            }
+            else
+            {
+                return Ok(value);
+            }
+        }
+    }
+
+    public class PostRedirectGetGetResponse
+    {
+        public int TempDataValue { get; set; }
+        public string CookieValue { get; set; }
+    }
+
+    public class RedirectHandlerResponse
+    {
+        public int Url { get; set; }
+        public int Body { get; set; }
+    }
+
+    public class Number
+    {
+        public int Value { get; set; }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/UsersController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/UsersController.cs
new file mode 100644
index 0000000000..69f4f9d2bf
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/UsersController.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers
+{
+    public class UsersController : Controller
+    {
+        public IActionResult Index()
+        {
+            return Content("Users.Index");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ViewDataPropertyController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ViewDataPropertyController.cs
new file mode 100644
index 0000000000..4041c8ffdb
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ViewDataPropertyController.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using BasicWebSite.Components;
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace BasicWebSite.Controllers
+{
+    public class ViewDataPropertyController : Controller
+    {
+        [ViewData]
+        public string Title => "View Data Property Sample";
+
+        [ViewData]
+        public string Message { get; private set; }
+
+        [ViewData]
+        public string FilterMessage { get; set; }
+
+        public IActionResult ViewDataPropertyToView()
+        {
+            Message = "Message set in action";
+            return View();
+        }
+
+        public IActionResult ViewDataPropertyToViewComponent()
+        {
+            Message = "Message set in action";
+            return ViewComponent(typeof(ViewDataViewComponent));
+        }
+
+        public override void OnActionExecuting(ActionExecutingContext context)
+        {
+            FilterMessage = "Value set in OnActionExecuting";
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Conventions/ApplicationDescription.cs b/src/Mvc/test/WebSites/BasicWebSite/Conventions/ApplicationDescription.cs
new file mode 100644
index 0000000000..88bf1f27e2
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Conventions/ApplicationDescription.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+namespace BasicWebSite
+{
+    public class ApplicationDescription : IApplicationModelConvention
+    {
+        private string _description;
+
+        public ApplicationDescription(string description)
+        {
+            _description = description;
+        }
+
+        public void Apply(ApplicationModel application)
+        {
+            application.Properties["description"] = _description;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Filters/ServiceActionFilter.cs b/src/Mvc/test/WebSites/BasicWebSite/Filters/ServiceActionFilter.cs
new file mode 100644
index 0000000000..68f002cab2
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Filters/ServiceActionFilter.cs
@@ -0,0 +1,29 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Logging;
+
+namespace BasicWebSite
+{
+    public class ServiceActionFilter : IActionFilter
+    {
+        private readonly ILogger<ServiceActionFilter> _logger;
+
+        public ServiceActionFilter(ILogger<ServiceActionFilter> logger)
+        {
+            _logger = logger;
+        }
+
+        public void OnActionExecuted(ActionExecutedContext context)
+        {
+        }
+
+        public void OnActionExecuting(ActionExecutingContext context)
+        {
+            _logger.LogInformation($"Executing {nameof(ServiceActionFilter)}.");
+            context.HttpContext.Response.Headers["X-ServiceActionFilter"] = "True";
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Filters/TestExceptionFilter.cs b/src/Mvc/test/WebSites/BasicWebSite/Filters/TestExceptionFilter.cs
new file mode 100644
index 0000000000..592d36dcd2
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Filters/TestExceptionFilter.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace BasicWebSite.Filters
+{
+    public class TestExceptionFilter : ExceptionFilterAttribute
+    {
+        public override void OnException(ExceptionContext context)
+        {
+            if (context.HttpContext.Request.Query.TryGetValue("handleException", out var handleException))
+            {
+                if (handleException.Equals("true"))
+                {
+                    context.Result = new ContentResult() { Content = "Exception was handled in TestExceptionFilter", StatusCode = 200 };
+                    context.ExceptionHandled = true;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Filters/TraceOutputResultFilter.cs b/src/Mvc/test/WebSites/BasicWebSite/Filters/TraceOutputResultFilter.cs
new file mode 100644
index 0000000000..91c3b8d4b0
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Filters/TraceOutputResultFilter.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Logging;
+
+namespace BasicWebSite
+{
+    public class TraceResultOutputFilter : ResultFilterAttribute
+    {
+        public override void OnResultExecuting(ResultExecutingContext context)
+        {
+            var trace = context.HttpContext.Items[nameof(TraceResourceFilter)];
+            context.Result = new ObjectResult(trace);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Filters/TraceResourceFilter.cs b/src/Mvc/test/WebSites/BasicWebSite/Filters/TraceResourceFilter.cs
new file mode 100644
index 0000000000..2a2196d47a
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Filters/TraceResourceFilter.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace BasicWebSite
+{
+    public class TraceResourceFilter : IResourceFilter
+    {
+
+        public void OnResourceExecuted(ResourceExecutedContext context)
+        {
+        }
+
+        public void OnResourceExecuting(ResourceExecutingContext context)
+        {
+            context.HttpContext.Items[nameof(TraceResourceFilter)] = $"This value was set by {nameof(TraceResourceFilter)}";
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Filters/UnprocessableResultFilter.cs b/src/Mvc/test/WebSites/BasicWebSite/Filters/UnprocessableResultFilter.cs
new file mode 100644
index 0000000000..ac85a6fc90
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Filters/UnprocessableResultFilter.cs
@@ -0,0 +1,29 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace BasicWebSite
+{
+    public class UnprocessableResultFilter : Attribute, IAlwaysRunResultFilter
+    {
+        public void OnResultExecuted(ResultExecutedContext context)
+        {
+        }
+
+        public void OnResultExecuting(ResultExecutingContext context)
+        {
+            if (context.Result is StatusCodeResult statusCodeResult &&
+                statusCodeResult.StatusCode == 415)
+            {
+                context.Result = new ObjectResult("Can't process this!")
+                {
+                    StatusCode = 422,
+                };
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Formatters/CustomFormatter.cs b/src/Mvc/test/WebSites/BasicWebSite/Formatters/CustomFormatter.cs
new file mode 100644
index 0000000000..61274b8716
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Formatters/CustomFormatter.cs
@@ -0,0 +1,43 @@
+// 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.
+
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.Net.Http.Headers;
+
+namespace BasicWebSite.Formatters
+{
+    public class CustomFormatter : TextOutputFormatter
+    {
+        public string ContentType { get; private set; }
+
+        public CustomFormatter(string contentType)
+        {
+            ContentType = contentType;
+            SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse(contentType));
+            SupportedEncodings.Add(Encoding.GetEncoding("utf-8"));
+        }
+
+        public override bool CanWriteResult(OutputFormatterCanWriteContext context)
+        {
+            if (base.CanWriteResult(context))
+            {
+                var actionReturnString = context.Object as string;
+                if (actionReturnString != null)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public override async Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
+        {
+            var response = context.HttpContext.Response;
+            response.ContentType = ContentType + ";charset=utf-8";
+            await response.WriteAsync(context.Object.ToString());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Formatters/PlainTextFormatter.cs b/src/Mvc/test/WebSites/BasicWebSite/Formatters/PlainTextFormatter.cs
new file mode 100644
index 0000000000..5978642dee
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Formatters/PlainTextFormatter.cs
@@ -0,0 +1,41 @@
+// 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.
+
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.Net.Http.Headers;
+
+namespace BasicWebSite.Formatters
+{
+    public class PlainTextFormatter : TextOutputFormatter
+    {
+        public PlainTextFormatter()
+        {
+            SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("text/plain"));
+            SupportedEncodings.Add(Encoding.GetEncoding("utf-8"));
+        }
+
+        public override bool CanWriteResult(OutputFormatterCanWriteContext context)
+        {
+            if (base.CanWriteResult(context))
+            {
+                var actionReturnString = context.Object as string;
+                if (actionReturnString != null)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public override async Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
+        {
+            var response = context.HttpContext.Response;
+            response.ContentType = "text/plain;charset=utf-8";
+            await response.WriteAsync(context.Object as string);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Formatters/VCardFormatter_V3.cs b/src/Mvc/test/WebSites/BasicWebSite/Formatters/VCardFormatter_V3.cs
new file mode 100644
index 0000000000..731e4dd0b2
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Formatters/VCardFormatter_V3.cs
@@ -0,0 +1,46 @@
+// 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.
+
+using System;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.Net.Http.Headers;
+
+namespace BasicWebSite.Formatters
+{
+    /// <summary>
+    /// Provides contact information of a person through VCard format.
+    /// </summary>
+    public class VCardFormatter_V3 : TextOutputFormatter
+    {
+        public VCardFormatter_V3()
+        {
+            SupportedEncodings.Add(Encoding.UTF8);
+            SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("text/vcard;version=v3.0"));
+        }
+
+        protected override bool CanWriteType(Type type)
+        {
+            return typeof(Contact).GetTypeInfo().IsAssignableFrom(type.GetTypeInfo());
+        }
+
+        public override async Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
+        {
+            var contact = (Contact)context.Object;
+
+            var builder = new StringBuilder();
+            builder.AppendLine("BEGIN:VCARD");
+            builder.AppendFormat("FN:{0}", contact.Name);
+            builder.AppendLine();
+            builder.AppendLine("END:VCARD");
+
+            await context.HttpContext.Response.WriteAsync(
+                builder.ToString(),
+                selectedEncoding);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Formatters/VCardFormatter_V4.cs b/src/Mvc/test/WebSites/BasicWebSite/Formatters/VCardFormatter_V4.cs
new file mode 100644
index 0000000000..be5d28cfac
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Formatters/VCardFormatter_V4.cs
@@ -0,0 +1,49 @@
+// 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.
+
+using System;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using BasicWebSite.Models;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.Net.Http.Headers;
+
+namespace BasicWebSite.Formatters
+{
+    /// <summary>
+    /// Provides contact information of a person through VCard format.
+    /// In version 4.0 of VCard format, Gender is a supported property.
+    /// </summary>
+    public class VCardFormatter_V4 : TextOutputFormatter
+    {
+        public VCardFormatter_V4()
+        {
+            SupportedEncodings.Add(Encoding.UTF8);
+            SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("text/vcard;version=v4.0"));
+        }
+
+        protected override bool CanWriteType(Type type)
+        {
+            return typeof(Contact).GetTypeInfo().IsAssignableFrom(type.GetTypeInfo());
+        }
+
+        public override async Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
+        {
+            var contact = (Contact)context.Object;
+
+            var builder = new StringBuilder();
+            builder.AppendLine("BEGIN:VCARD");
+            builder.AppendFormat("FN:{0}", contact.Name);
+            builder.AppendLine();
+            builder.AppendFormat("GENDER:{0}", (contact.Gender == GenderType.Male) ? "M" : "F");
+            builder.AppendLine();
+            builder.AppendLine("END:VCARD");
+
+            await context.HttpContext.Response.WriteAsync(
+                builder.ToString(),
+                selectedEncoding);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/LocalizationPipeline.cs b/src/Mvc/test/WebSites/BasicWebSite/LocalizationPipeline.cs
new file mode 100644
index 0000000000..9273dbcbaa
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/LocalizationPipeline.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using System.Globalization;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Localization;
+using Microsoft.AspNetCore.Mvc.Localization;
+using Microsoft.AspNetCore.Localization.Routing;
+
+namespace BasicWebSite
+{
+    public class LocalizationPipeline
+    {
+        public void Configure(IApplicationBuilder applicationBuilder)
+        {
+            var supportedCultures = new[]
+            {
+                new CultureInfo("en-US"),
+                new CultureInfo("fr")
+            };
+
+            var options = new RequestLocalizationOptions()
+            {
+                DefaultRequestCulture = new RequestCulture(culture: "en-US", uiCulture: "en-US"),
+                SupportedCultures = supportedCultures,
+                SupportedUICultures = supportedCultures
+            };
+            options.RequestCultureProviders = new[] { new RouteDataRequestCultureProvider() { Options = options } };
+
+            applicationBuilder.UseRequestLocalization(options);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/ManagerHandler.cs b/src/Mvc/test/WebSites/BasicWebSite/ManagerHandler.cs
new file mode 100644
index 0000000000..b681e21757
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/ManagerHandler.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization.Infrastructure;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace BasicWebSite
+{
+    public class ManagerHandler : AuthorizationHandler<OperationAuthorizationRequirement>
+    {
+        protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, OperationAuthorizationRequirement requirement)
+        {
+            if (context.User.HasClaim("Manager", "yes"))
+            {
+                context.Succeed(requirement);
+            }
+            return Task.FromResult(0);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Models/Contact.cs b/src/Mvc/test/WebSites/BasicWebSite/Models/Contact.cs
new file mode 100644
index 0000000000..a6514e7e10
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Models/Contact.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace BasicWebSite.Models
+{
+    public class Contact
+    {
+        public int ContactId { get; set; }
+
+        [StringLength(30, MinimumLength = 5)]
+        public string Name { get; set; }
+
+        public GenderType Gender { get; set; }
+
+        public string Address { get; set; }
+
+        public string City { get; set; }
+
+        public string State { get; set; }
+
+        [RegularExpression(@"\d{5}")]
+        public string Zip { get; set; }
+
+        public string Email { get; set; }
+
+        public string Twitter { get; set; }
+
+        public string Self { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Models/GenderType.cs b/src/Mvc/test/WebSites/BasicWebSite/Models/GenderType.cs
new file mode 100644
index 0000000000..850c5477c7
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Models/GenderType.cs
@@ -0,0 +1,11 @@
+// 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.
+
+namespace BasicWebSite.Models
+{
+    public enum GenderType
+    {
+        Male,
+        Female,
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Models/LoginViewModel.cs b/src/Mvc/test/WebSites/BasicWebSite/Models/LoginViewModel.cs
new file mode 100644
index 0000000000..6e524a3b70
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Models/LoginViewModel.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace BasicWebSite.Models
+{
+    public class LoginViewModel
+    {
+        [Required]
+        [Display(Name = "User name")]
+        public string UserName { get; set; }
+
+        [Required]
+        [DataType(DataType.Password)]
+        [Display(Name = "Password")]
+        public string Password { get; set; }
+
+        [Display(Name = "Remember me?")]
+        public bool RememberMe { get; set; }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Models/Person.cs b/src/Mvc/test/WebSites/BasicWebSite/Models/Person.cs
new file mode 100644
index 0000000000..7fec349f34
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Models/Person.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace BasicWebSite.Models
+{
+    public class Person
+    {
+        public int id { get; set; }
+
+        public string FullName { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Models/Product.cs b/src/Mvc/test/WebSites/BasicWebSite/Models/Product.cs
new file mode 100644
index 0000000000..f3bffd90cd
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Models/Product.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace BasicWebSite.Models
+{
+    public class Product
+    {
+        [Range(10, 100)]
+        public int SampleInt { get; set; }
+
+        [MinLength(15)]
+        public string SampleString { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Models/Product_Json.cs b/src/Mvc/test/WebSites/BasicWebSite/Models/Product_Json.cs
new file mode 100644
index 0000000000..c7c15d5af0
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Models/Product_Json.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace BasicWebSite.Models
+{
+    public class Product_Json : Product
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Models/Product_Xml.cs b/src/Mvc/test/WebSites/BasicWebSite/Models/Product_Xml.cs
new file mode 100644
index 0000000000..09e216e4ad
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Models/Product_Xml.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace BasicWebSite.Models
+{
+    public class Product_Xml : Product
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Models/Product_text.cs b/src/Mvc/test/WebSites/BasicWebSite/Models/Product_text.cs
new file mode 100644
index 0000000000..dc78b3edd2
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Models/Product_text.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace BasicWebSite.Models
+{
+    public class Product_Text : Product
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Models/RemoteAttributeUser.cs b/src/Mvc/test/WebSites/BasicWebSite/Models/RemoteAttributeUser.cs
new file mode 100644
index 0000000000..754e0a5212
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Models/RemoteAttributeUser.cs
@@ -0,0 +1,43 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Models
+{
+    public class RemoteAttributeUser
+    {
+        public int Id { get; set; }
+
+        // Controller in current area.
+        [Required(ErrorMessage = "UserId1 is required")]
+        [Remote(action: "IsIdAvailable", controller: "RemoteAttribute_Verify")]
+        public string UserId1 { get; set; }
+
+        // Controller in root area.
+        [Required(ErrorMessage = "UserId2 is required")]
+        [Remote(action: "IsIdAvailable", controller: "RemoteAttribute_Verify", areaName: null, HttpMethod = "Post")]
+        public string UserId2 { get; set; }
+
+        [Required(ErrorMessage = "UserId3 is required")]
+        [Remote(
+            action: "IsIdAvailable",
+            controller: "RemoteAttribute_Verify",
+            areaName: "Area1",
+            ErrorMessage = "/Area1/RemoteAttribute_Verify/IsIdAvailable rejects you.")]
+        public string UserId3 { get; set; }
+
+        [Required(ErrorMessage = "UserId4 is required")]
+        [Remote(
+            action:"IsIdAvailable",
+            controller: "RemoteAttribute_Verify",
+            areaName: "Area2",
+            AdditionalFields = "UserId1, UserId2, UserId3")]
+        public string UserId4 { get; set; }
+
+        [Required(ErrorMessage = "UserId5 is required")]
+        [Remote(routeName: "VerifyRoute", HttpMethod = "Post")]
+        public string UserId5 { get; set; }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Models/User.cs b/src/Mvc/test/WebSites/BasicWebSite/Models/User.cs
new file mode 100644
index 0000000000..7c2b6655cb
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Models/User.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace BasicWebSite.Models
+{
+    [DisplayColumn("Name")]
+    public class User
+    {
+        [Required]
+        [MinLength(4)]
+        public string Name { get; set; }
+        public string Address { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Operations.cs b/src/Mvc/test/WebSites/BasicWebSite/Operations.cs
new file mode 100644
index 0000000000..2ce19488c0
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Operations.cs
@@ -0,0 +1,12 @@
+// 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.
+
+using Microsoft.AspNetCore.Authorization.Infrastructure;
+
+namespace BasicWebSite
+{
+    public static class Operations
+    {
+        public static OperationAuthorizationRequirement Edit = new OperationAuthorizationRequirement { Name = "Edit" };
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Program.cs b/src/Mvc/test/WebSites/BasicWebSite/Program.cs
new file mode 100644
index 0000000000..2de761fdc5
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Program.cs
@@ -0,0 +1,29 @@
+// 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.
+
+using System.IO;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace BasicWebSite
+{
+    public class Program
+    {
+        public static void Main(string[] args) => CreateWebHostBuilder(args).Build().Run();
+
+        // Do not change. This is the pattern our test infrastructure uses to initialize a IWebHostBuilder from
+        // a users app.
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            new WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseStartup<Startup>()
+                .ConfigureServices(s => s.AddSingleton(new TestService { Message = "true" }))
+                .UseKestrel()
+                .UseIISIntegration();
+    }
+
+    public class TestService
+    {
+        public string Message { get; set; }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/RequestIdMiddleware.cs b/src/Mvc/test/WebSites/BasicWebSite/RequestIdMiddleware.cs
new file mode 100644
index 0000000000..22d606ea91
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/RequestIdMiddleware.cs
@@ -0,0 +1,35 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace BasicWebSite
+{
+    // Initializes a scoped-service with a request Id from a header
+    public class RequestIdMiddleware
+    {
+        private readonly RequestDelegate _next;
+
+        public RequestIdMiddleware(RequestDelegate next)
+        {
+            _next = next;
+        }
+
+        public Task Invoke(HttpContext context)
+        {
+            var requestIdService = context.RequestServices.GetService<RequestIdService>();
+            if (requestIdService.RequestId != null)
+            {
+                throw new InvalidOperationException("RequestId should be null here");
+            }
+
+            var requestId = context.Request.Headers["RequestId"];
+            requestIdService.RequestId = requestId;
+
+            return _next(context);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/RequestIdService.cs b/src/Mvc/test/WebSites/BasicWebSite/RequestIdService.cs
new file mode 100644
index 0000000000..5b294796bd
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/RequestIdService.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Http;
+
+namespace BasicWebSite
+{
+    public class RequestIdService
+    {
+        // This service can only be instantiated by a request-scoped container
+        public RequestIdService(IServiceProvider services, IHttpContextAccessor contextAccessor)
+        {
+            if (contextAccessor.HttpContext.RequestServices != services)
+            {
+                throw new InvalidOperationException();
+            }
+        }
+
+        public string RequestId { get; set; }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/RequestIdViewComponent.cs b/src/Mvc/test/WebSites/BasicWebSite/RequestIdViewComponent.cs
new file mode 100644
index 0000000000..4ba0f7937e
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/RequestIdViewComponent.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite
+{
+    public class RequestIdViewComponent : ViewComponent
+    {
+        public RequestIdViewComponent(RequestIdService requestIdService)
+        {
+            RequestIdService = requestIdService;
+        }
+
+        private RequestIdService RequestIdService { get; }
+
+        public IViewComponentResult Invoke()
+        {
+            return Content(RequestIdService.RequestId);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/RequestScopedActionConstraint.cs b/src/Mvc/test/WebSites/BasicWebSite/RequestScopedActionConstraint.cs
new file mode 100644
index 0000000000..3a5be47cf4
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/RequestScopedActionConstraint.cs
@@ -0,0 +1,52 @@
+// 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.
+
+using System;
+using System.Collections.Concurrent;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace BasicWebSite
+{
+    // Only matches when the requestId is the same as the one passed in the constructor.
+    public class RequestScopedActionConstraintAttribute : Attribute, IActionConstraintFactory
+    {
+        private readonly string _requestId;
+        private readonly Func<Type, object, ObjectFactory> CreateFactory =
+            (t, s) => ActivatorUtilities.CreateFactory(t, new[] { s.GetType() });
+        private readonly ConcurrentDictionary<Type, ObjectFactory> _constraintCache =
+               new ConcurrentDictionary<Type, ObjectFactory>();
+
+        public bool IsReusable => false;
+
+        public RequestScopedActionConstraintAttribute(string requestId)
+        {
+            _requestId = requestId;
+        }
+
+        public IActionConstraint CreateInstance(IServiceProvider services)
+        {
+            var constraintType = typeof(Constraint);
+            return (Constraint)ActivatorUtilities.CreateInstance(services, typeof(Constraint),new[] { _requestId });
+        }
+
+        private class Constraint : IActionConstraint
+        {
+            private readonly RequestIdService _requestIdService;
+            private readonly string _requestId;
+
+            public Constraint(RequestIdService requestIdService, string requestId)
+            {
+                _requestIdService = requestIdService;
+                _requestId = requestId;
+            }
+
+            public int Order { get; private set; }
+
+            public bool Accept(ActionConstraintContext context)
+            {
+                return _requestId == _requestIdService.RequestId;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/RequestScopedFilter.cs b/src/Mvc/test/WebSites/BasicWebSite/RequestScopedFilter.cs
new file mode 100644
index 0000000000..033cddbbc7
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/RequestScopedFilter.cs
@@ -0,0 +1,29 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace BasicWebSite
+{
+    public class RequestScopedFilter : IActionFilter
+    {
+        private readonly RequestIdService _requestIdService;
+
+        public RequestScopedFilter(RequestIdService requestIdService)
+        {
+            _requestIdService = requestIdService;
+        }
+
+        public void OnActionExecuted(ActionExecutedContext context)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void OnActionExecuting(ActionExecutingContext context)
+        {
+            context.Result = new ObjectResult(_requestIdService.RequestId);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/RequestScopedTagHelper.cs b/src/Mvc/test/WebSites/BasicWebSite/RequestScopedTagHelper.cs
new file mode 100644
index 0000000000..f1fcff3623
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/RequestScopedTagHelper.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace BasicWebSite
+{
+    public class RequestScopedTagHelper : TagHelper
+    {
+        public RequestScopedTagHelper(RequestIdService service)
+        {
+            RequestIdService = service;
+        }
+
+        public RequestIdService RequestIdService { get; }
+
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            output.Content.SetContent(RequestIdService.RequestId);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Startup.cs b/src/Mvc/test/WebSites/BasicWebSite/Startup.cs
new file mode 100644
index 0000000000..9e20cb447c
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Startup.cs
@@ -0,0 +1,85 @@
+// 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.
+
+using System.Linq;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace BasicWebSite
+{
+    public class Startup
+    {
+        // Set up application services
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddAuthentication()
+                .AddScheme<AuthenticationSchemeOptions, BasicAuthenticationHandler>("Api", _ => { });
+            services.AddTransient<IAuthorizationHandler, ManagerHandler>();
+
+            services
+                .AddMvc(options =>
+                {
+                    options.Conventions.Add(new ApplicationDescription("This is a basic website."));
+                    // Filter that records a value in HttpContext.Items
+                    options.Filters.Add(new TraceResourceFilter());
+                })
+                .SetCompatibilityVersion(CompatibilityVersion.Latest)
+                .AddXmlDataContractSerializerFormatters();
+
+            services.Configure<ApiBehaviorOptions>(options =>
+            {
+                var previous = options.InvalidModelStateResponseFactory;
+                options.InvalidModelStateResponseFactory = context =>
+                {
+                    var result = (BadRequestObjectResult)previous(context);
+                    if (context.ActionDescriptor.FilterDescriptors.Any(f => f.Filter is VndErrorAttribute))
+                    {
+                        result.ContentTypes.Clear();
+                        result.ContentTypes.Add("application/vnd.error+json");
+                    }
+
+                    return result;
+                };
+            });
+
+            services.ConfigureBaseWebSiteAuthPolicies();
+
+            services.AddTransient<IAuthorizationHandler, ManagerHandler>();
+
+            services.AddLogging();
+            services.AddSingleton<IActionDescriptorProvider, ActionDescriptorCreationCounter>();
+            services.AddHttpContextAccessor();
+            services.AddSingleton<ContactsRepository>();
+            services.AddScoped<RequestIdService>();
+            services.AddTransient<ServiceActionFilter>();
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseDeveloperExceptionPage();
+
+            app.UseStaticFiles();
+
+            // Initializes the RequestId service for each request
+            app.UseMiddleware<RequestIdMiddleware>();
+
+            // Add MVC to the request pipeline
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(
+                    "areaRoute",
+                    "{area:exists}/{controller}/{action}",
+                    new { controller = "Home", action = "Index" });
+
+                routes.MapRoute("ActionAsMethod", "{controller}/{action}",
+                    defaults: new { controller = "Home", action = "Index" });
+
+                routes.MapRoute("PageRoute", "{controller}/{action}/{page}");
+            });
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/StartupRequestLimitSize.cs b/src/Mvc/test/WebSites/BasicWebSite/StartupRequestLimitSize.cs
new file mode 100644
index 0000000000..0338d0b217
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/StartupRequestLimitSize.cs
@@ -0,0 +1,105 @@
+// 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.
+
+using System;
+using System.IO;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace BasicWebSite
+{
+    public class StartupRequestLimitSize
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddMvc();
+            services.ConfigureBaseWebSiteAuthPolicies();
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseDeveloperExceptionPage();
+
+            app.Use((httpContext, next) =>
+            {
+                var testHttpMaxRequestBodySizeFeature = new TestHttpMaxRequestBodySizeFeature();
+                httpContext.Features.Set<IHttpMaxRequestBodySizeFeature>(
+                    testHttpMaxRequestBodySizeFeature);
+
+                httpContext.Request.Body = new RequestBodySizeCheckingStream(
+                    httpContext.Request.Body,
+                    testHttpMaxRequestBodySizeFeature);
+
+                return next();
+            });
+
+            app.UseMvcWithDefaultRoute();
+        }
+
+        private class RequestBodySizeCheckingStream : Stream
+        {
+            private readonly Stream _innerStream;
+            private readonly IHttpMaxRequestBodySizeFeature _maxRequestBodySizeFeature;
+
+            public RequestBodySizeCheckingStream(
+                Stream innerStream,
+                IHttpMaxRequestBodySizeFeature maxRequestBodySizeFeature)
+            {
+                _innerStream = innerStream;
+                _maxRequestBodySizeFeature = maxRequestBodySizeFeature;
+            }
+            public override bool CanRead => _innerStream.CanRead;
+
+            public override bool CanSeek => _innerStream.CanSeek;
+
+            public override bool CanWrite => _innerStream.CanWrite;
+
+            public override long Length => _innerStream.Length;
+
+            public override long Position
+            {
+                get { return _innerStream.Position; }
+                set { _innerStream.Position = value; }
+            }
+
+            public override void Flush()
+            {
+                _innerStream.Flush();
+            }
+
+            public override int Read(byte[] buffer, int offset, int count)
+            {
+                if (_maxRequestBodySizeFeature.MaxRequestBodySize != null
+                    && _innerStream.Length > _maxRequestBodySizeFeature.MaxRequestBodySize)
+                {
+                    throw new InvalidOperationException("Request content size is greater than the limit size");
+                }
+
+                return _innerStream.Read(buffer, offset, count);
+            }
+
+            public override long Seek(long offset, SeekOrigin origin)
+            {
+                return _innerStream.Seek(offset, origin);
+            }
+
+            public override void SetLength(long value)
+            {
+                _innerStream.SetLength(value);
+            }
+
+            public override void Write(byte[] buffer, int offset, int count)
+            {
+                _innerStream.Write(buffer, offset, count);
+            }
+        }
+
+        private class TestHttpMaxRequestBodySizeFeature : IHttpMaxRequestBodySizeFeature
+        {
+            public bool IsReadOnly => false;
+            public long? MaxRequestBodySize { get; set; }
+        }
+    }
+}
+
diff --git a/src/Mvc/test/WebSites/BasicWebSite/StartupWithCookieTempDataProviderAndCookieConsent.cs b/src/Mvc/test/WebSites/BasicWebSite/StartupWithCookieTempDataProviderAndCookieConsent.cs
new file mode 100644
index 0000000000..0fdb7383b6
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/StartupWithCookieTempDataProviderAndCookieConsent.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace BasicWebSite
+{
+    public class StartupWithCookieTempDataProviderAndCookieConsent
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddMvc();
+
+            services.Configure<CookiePolicyOptions>(o =>
+            {
+                o.CheckConsentNeeded = httpContext => true;
+            });
+
+            services.ConfigureBaseWebSiteAuthPolicies();
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseDeveloperExceptionPage();
+
+            app.UseCookiePolicy();
+
+            app.UseMvcWithDefaultRoute();
+        }
+    }
+}
+
diff --git a/src/Mvc/test/WebSites/BasicWebSite/StartupWithSessionTempDataProvider.cs b/src/Mvc/test/WebSites/BasicWebSite/StartupWithSessionTempDataProvider.cs
new file mode 100644
index 0000000000..c05e83cb95
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/StartupWithSessionTempDataProvider.cs
@@ -0,0 +1,30 @@
+// 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.
+
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace BasicWebSite
+{
+    public class StartupWithSessionTempDataProvider
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            // CookieTempDataProvider is the default ITempDataProvider, so we must override it with session.
+            services
+                .AddMvc()
+                .AddSessionStateTempDataProvider();
+            services.AddSession();
+
+            services.ConfigureBaseWebSiteAuthPolicies();
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseDeveloperExceptionPage();
+            app.UseSession();
+            app.UseMvcWithDefaultRoute();
+        }
+    }
+}
+
diff --git a/src/Mvc/test/WebSites/BasicWebSite/StoreIntoTempDataActionResult.cs b/src/Mvc/test/WebSites/BasicWebSite/StoreIntoTempDataActionResult.cs
new file mode 100644
index 0000000000..38c7b3a31d
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/StoreIntoTempDataActionResult.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace BasicWebSite
+{
+    public class StoreIntoTempDataActionResult : IActionResult
+    {
+        public Task ExecuteResultAsync(ActionContext context)
+        {
+            // store information in temp data
+            var httpContext = context.HttpContext;
+            var tempDataDictionaryFactory = httpContext.RequestServices.GetRequiredService<ITempDataDictionaryFactory>();
+            var tempDataDictionary = tempDataDictionaryFactory.GetTempData(httpContext);
+            tempDataDictionary["Name"] = "Michael";
+
+            return httpContext.Response.WriteAsync($"Hello from {nameof(StoreIntoTempDataActionResult)}");
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/AntiforgeryTokenAndResponseCaching.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/AntiforgeryTokenAndResponseCaching.cshtml
new file mode 100644
index 0000000000..06ccac8f5e
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/AntiforgeryTokenAndResponseCaching.cshtml
@@ -0,0 +1,13 @@
+
+@{
+    ViewData["Title"] = "Antiforgery token and response caching";
+}
+
+<h2>@ViewData["Title"]</h2>
+
+@using (Html.BeginForm("Login", "Antiforgery", FormMethod.Post, new { @class = "form-horizontal", role = "form" }))
+{
+    <label>Name</label>
+    <input type="text" name="Name" />
+    <input type="submit" />
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/FlushAsyncLogin.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/FlushAsyncLogin.cshtml
new file mode 100644
index 0000000000..b429578f5d
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/FlushAsyncLogin.cshtml
@@ -0,0 +1,43 @@
+@model BasicWebSite.Models.LoginViewModel
+
+@{
+    Layout = "_FlushAsyncLayout.cshtml";
+    ViewData["Title"] = "Log in";
+}
+
+@section Login
+{
+<h2>@ViewData["Title"].</h2>
+<div class="row">
+    <div class="col-md-8">
+        <section id="loginForm">
+            @using (Html.BeginForm("FlushAsyncLogin", "Antiforgery", FormMethod.Post, new { @class = "form-horizontal", role = "form" }))
+            {
+                @Html.AntiForgeryToken()
+                <h4>Use a local account to log in.</h4>
+                <hr />
+                @Html.ValidationSummary(true)
+                <div class="form-group">
+                    @Html.LabelFor(m => m.UserName, new { @class = "col-md-2", ClAsS = "col-md-2 control-label" })
+                    <div class="col-md-10">
+                        @Html.TextBoxFor(m => m.UserName, new { @class = "...", cLass = "form-control" })
+                        @Html.ValidationMessageFor(m => m.UserName)
+                    </div>
+                </div>
+                <div class="form-group">
+                    @Html.LabelFor(m => m.Password, new { @class = "col-md-2 control-label" })
+                    <div class="col-md-10">
+                        @Html.PasswordFor(m => m.Password, new { @class = "form-control" })
+                        @Html.ValidationMessageFor(m => m.Password)
+                    </div>
+                </div>
+                <div class="form-group">
+                    <div class="col-md-offset-2 col-md-10">
+                        <input type="submit" value="Log in" class="btn btn-default" />
+                    </div>
+                </div>
+            }
+        </section>
+    </div>
+</div>
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/Index.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/Index.cshtml
new file mode 100644
index 0000000000..6602e7693f
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/Index.cshtml
@@ -0,0 +1,4 @@
+@{
+    Layout = "_Layout.cshtml";
+    ViewData["Title"] = "Home Page";
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/Login.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/Login.cshtml
new file mode 100644
index 0000000000..ec214f3e01
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/Login.cshtml
@@ -0,0 +1,66 @@
+@model BasicWebSite.Models.LoginViewModel
+
+@{
+    ViewData["Title"] = "Log in";
+}
+
+<h2>@ViewData["Title"].</h2>
+<div class="row">
+    <div class="col-md-8">
+        <section id="loginForm">
+            @using (Html.BeginForm("Login", "Antiforgery", FormMethod.Post, new { @class = "form-horizontal", role = "form" }))
+            {
+                @* BeginForm already registers antiforgery tokens. This Html helper call should be no-op *@
+                @Html.AntiForgeryToken()
+                <h4>Use a local account to log in.</h4>
+                <hr />
+                @Html.ValidationSummary(true)
+                <div class="form-group">
+                    @Html.LabelFor(m => m.UserName, new { @class = "col-md-2", ClAsS = "col-md-2 control-label" })
+                    <div class="col-md-10">
+                        @Html.TextBoxFor(m => m.UserName, new { @class = "...", cLass = "form-control" })
+                        @Html.ValidationMessageFor(m => m.UserName)
+                    </div>
+                </div>
+                <div class="form-group">
+                    @Html.LabelFor(m => m.Password, new { @class = "col-md-2 control-label" })
+                    <div class="col-md-10">
+                        @Html.PasswordFor(m => m.Password, new { @class = "form-control" })
+                        @Html.ValidationMessageFor(m => m.Password)
+                    </div>
+                </div>
+                <div class="form-group">
+                    <div class="col-md-offset-2 col-md-10">
+                        <input type="submit" value="Log in" class="btn btn-default" />
+                    </div>
+                </div>
+            }
+        </section>
+        </div>
+
+@using (Html.BeginForm("UseFacebookLogin", "Antiforgery", FormMethod.Post, new { @class = "form-horizontal", role = "form" }))
+{
+    @* BeginForm already registers antiforgery tokens. This Html helper call should be no-op *@
+    @Html.AntiForgeryToken()
+    <h4>Use Facebook login.</h4>
+    <hr />
+    @Html.ValidationSummary()
+    <div class="form-group">
+        @Html.LabelFor(m => m.UserName, new { @class = "col-md-2 control-label" })
+        <div class="col-md-10">
+            @Html.TextBoxFor(m => m.UserName, new { @class = "form-control" })
+        </div>
+    </div>
+    <div class="form-group">
+        @Html.LabelFor(m => m.Password, new { @class = "col-md-2 control-label" })
+        <div class="col-md-10">
+            @Html.PasswordFor(m => m.Password, new { @class = "form-control" })
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-offset-2 col-md-10">
+            <input type="submit" class="btn btn-default" value="UseFaceBook" />
+        </div>
+    </div>
+}
+</div>
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/_FlushAsyncLayout.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/_FlushAsyncLayout.cshtml
new file mode 100644
index 0000000000..6cd0528e8b
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/_FlushAsyncLayout.cshtml
@@ -0,0 +1,15 @@
+<html>
+<head>
+    <title>@ViewData["Title"] – Antiforgery Functional Tests</title>
+</head>
+@SetAntiforgeryCookieAndHeader()
+@await FlushAsync()
+
+<body>
+    @Html.ActionLink("Log in", "Login", "Antiforgery", routeValues: null, htmlAttributes: new { id = "loginLink" })
+    <div class="container body-content">
+        @RenderBody()
+        @await RenderSectionAsync("Login", required: false)
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/_Layout.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/_Layout.cshtml
new file mode 100644
index 0000000000..84480566f3
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/_Layout.cshtml
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>@ViewData["Title"] –Antiforgery Functional Tests</title>
+</head>
+<body>
+    <div class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                </button>
+                @Html.ActionLink("ASP.NET Antiforgery tests", "Index", "Home", null, new { @class = "navbar-brand" })
+            </div>
+            <div class="navbar-collapse collapse">
+                @await Html.PartialAsync("_LoginPartial.cshtml")
+            </div>
+        </div>
+    </div>
+    <div class="container body-content">
+        @RenderBody()
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/_LoginPartial.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/_LoginPartial.cshtml
new file mode 100644
index 0000000000..c7933703c7
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/_LoginPartial.cshtml
@@ -0,0 +1,3 @@
+<ul class="nav navbar-nav navbar-right">
+    <li>@Html.ActionLink("Log in", "Login", "Antiforgery", routeValues: null, htmlAttributes: new { id = "loginLink" })</li>
+</ul>
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Home/ActionLinkView.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Home/ActionLinkView.cshtml
new file mode 100644
index 0000000000..d3565ec547
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Home/ActionLinkView.cshtml
@@ -0,0 +1,9 @@
+<!doctype html>
+<html>
+<head>
+    <title>Action Link with non unicode host</title>
+</head>
+<body>
+    @Html.ActionLink("Pingüino", "ActionLinkView", "Home", "http", "pingüino", null, routeValues: null, htmlAttributes: null)
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Home/CSharp7View.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Home/CSharp7View.cshtml
new file mode 100644
index 0000000000..e2518ae708
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Home/CSharp7View.cshtml
@@ -0,0 +1,24 @@
+@model IEnumerable<(string FirstName, string LastName, object FavoriteNumber)>
+
+    @foreach (var person in Model)
+    {
+        <p>
+            <strong>@person.FirstName @person.LastName's</strong> favorite number is
+
+            <em>
+                @switch (person.FavoriteNumber)
+                {
+                    case double doubleVal:
+                        <text>(double) @doubleVal</text>
+                        break;
+                    case long longVal:
+                        <text>(long) @longVal</text>
+                        break;
+                    case decimal longVal:
+                        <text>(decimal) @longVal</text>
+                        break;
+
+                }
+            </em>
+        </p>
+    }
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Home/Index.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Home/Index.cshtml
new file mode 100644
index 0000000000..923887e69a
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Home/Index.cshtml
@@ -0,0 +1,8 @@
+@{
+    Layout = "/Views/Shared/_Layout.cshtml";
+    ViewBag.Title = "Home Page";
+}
+
+<div>
+    <h1>ASP.NET vNext</h1>
+</div>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Home/JsonHelperInView.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Home/JsonHelperInView.cshtml
new file mode 100644
index 0000000000..df3ca5aea1
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Home/JsonHelperInView.cshtml
@@ -0,0 +1,3 @@
+<script type="text/javascript">
+    var json = @Json.Serialize(Model);
+</script>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Home/JsonHelperWithSettingsInView.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Home/JsonHelperWithSettingsInView.cshtml
new file mode 100644
index 0000000000..1f551bc9d3
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Home/JsonHelperWithSettingsInView.cshtml
@@ -0,0 +1,13 @@
+@using Microsoft.AspNetCore.Mvc.Formatters
+@using Newtonsoft.Json
+@using Newtonsoft.Json.Serialization
+@{
+    var settings = JsonSerializerSettingsProvider.CreateSerializerSettings();
+    settings.ContractResolver = new DefaultContractResolver
+    {
+        NamingStrategy = (NamingStrategy)(ViewData["naming"]),
+    };
+}
+<script type="text/javascript">
+    var json = @Json.Serialize(Model, settings);
+</script>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Home/PlainView.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Home/PlainView.cshtml
new file mode 100644
index 0000000000..b282c5d98f
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Home/PlainView.cshtml
@@ -0,0 +1 @@
+Plain View
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Home/ViewWithPrefixedAttributeValue.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Home/ViewWithPrefixedAttributeValue.cshtml
new file mode 100644
index 0000000000..cacc64999e
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Home/ViewWithPrefixedAttributeValue.cshtml
@@ -0,0 +1,7 @@
+@{
+    var attrValue = "Baz";
+}
+
+<span foo="   abc" />
+<span bar="   @attrValue" />
+<span baz="   @attrValue   @attrValue" />
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Links/ActionLink_ActionOnOtherController.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Links/ActionLink_ActionOnOtherController.cshtml
new file mode 100644
index 0000000000..66046197ca
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Links/ActionLink_ActionOnOtherController.cshtml
@@ -0,0 +1,2 @@
+@* Generate link to a different controller and with non-route parameters *@
+@Html.ActionLink("linktext", "Details", new { controller = "Products", print = "true" })
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Links/ActionLink_ActionOnSameController.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Links/ActionLink_ActionOnSameController.cshtml
new file mode 100644
index 0000000000..8e23c4a0a3
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Links/ActionLink_ActionOnSameController.cshtml
@@ -0,0 +1,2 @@
+@* Generate link to action on current controller *@
+@Html.ActionLink("linktext", "Details")
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Links/ActionLink_HostNameFragmentAttributes.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Links/ActionLink_HostNameFragmentAttributes.cshtml
new file mode 100644
index 0000000000..b9dc82aeff
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Links/ActionLink_HostNameFragmentAttributes.cshtml
@@ -0,0 +1,9 @@
+@Html.ActionLink(
+    linkText: "linktext",
+    actionName: "Details",
+    controllerName: "Products",
+    protocol: "https",
+    hostname: "www.contoso.com:9000",
+    fragment: "details",
+    routeValues: new { print = "true" },
+    htmlAttributes: new { p1 = "p1-value" })
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Links/ActionLink_SecurePage_ImplicitHostName.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Links/ActionLink_SecurePage_ImplicitHostName.cshtml
new file mode 100644
index 0000000000..27882e0fda
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Links/ActionLink_SecurePage_ImplicitHostName.cshtml
@@ -0,0 +1,10 @@
+@* Notice that the 'hostname' here is null but the protocol is 'https'. Its a link to a secure page on this application *@
+@Html.ActionLink(
+    linkText: "linktext",
+    actionName: "Details",
+    controllerName: "Products",
+    protocol: "https",
+    hostname: null,
+    fragment:null,
+    routeValues: new { print = "true" },
+    htmlAttributes: null)
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Links/RouteLink_HostNameFragmentAttributes.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Links/RouteLink_HostNameFragmentAttributes.cshtml
new file mode 100644
index 0000000000..f40397e6bc
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Links/RouteLink_HostNameFragmentAttributes.cshtml
@@ -0,0 +1,8 @@
+@Html.RouteLink(
+    linkText: "linktext",
+    routeName:"OrdersApi",
+    protocol: "https",
+    hostName:"www.contoso.com:9000",
+    fragment: "details",
+    routeValues: new { controller = "Orders", id = 10, print = true },
+    htmlAttributes: new { p1 = "p1-value" })
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Links/RouteLink_RestLinkToOtherController.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Links/RouteLink_RestLinkToOtherController.cshtml
new file mode 100644
index 0000000000..36b7f9b64d
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Links/RouteLink_RestLinkToOtherController.cshtml
@@ -0,0 +1 @@
+@Html.RouteLink("linktext", "OrdersApi", new { controller = "Orders", id = 10 })
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Links/RouteLink_SecureApi_ImplicitHostName.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Links/RouteLink_SecureApi_ImplicitHostName.cshtml
new file mode 100644
index 0000000000..bf74c1cab1
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Links/RouteLink_SecureApi_ImplicitHostName.cshtml
@@ -0,0 +1,8 @@
+@Html.RouteLink(
+    linkText: "linktext",
+    routeName: "OrdersApi",
+    protocol: "https",
+    hostName:null,
+    fragment: null,
+    routeValues: new { controller = "Orders", id = 10 },
+    htmlAttributes: null)
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/PageRoute/AttributeRoute.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/PageRoute/AttributeRoute.cshtml
new file mode 100644
index 0000000000..54be40b404
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/PageRoute/AttributeRoute.cshtml
@@ -0,0 +1 @@
+AttributeRoute - Hello from @ViewBag.Page
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/PageRoute/ConventionalRoute.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/PageRoute/ConventionalRoute.cshtml
new file mode 100644
index 0000000000..8a22a765db
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/PageRoute/ConventionalRoute.cshtml
@@ -0,0 +1 @@
+ConventionalRoute - Hello from @ViewBag.Page
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/RemoteAttribute_Home/Create.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/RemoteAttribute_Home/Create.cshtml
new file mode 100644
index 0000000000..8cd88c2ecb
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/RemoteAttribute_Home/Create.cshtml
@@ -0,0 +1,81 @@
+@model BasicWebSite.Models.RemoteAttributeUser
+@{
+    Layout = "_Layout.cshtml";
+    object areaName;
+    ViewContext.RouteData.Values.TryGetValue("area", out areaName);
+    areaName = areaName ?? "root";
+    ViewBag.Title = "Create in " + areaName + " area.";
+}
+
+<h2>@ViewBag.Title</h2>
+@using (Html.BeginForm(FormMethod.Post, htmlAttributes: null, antiforgery: false))
+{
+    <div class="form-horizontal">
+        <h4>Person</h4>
+        <hr />
+        @Html.ValidationSummary(true, "", new { @class = "text-danger" })
+
+        <div class="form-group">
+            @Html.LabelFor(model => model.Id, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => model.Id, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => model.Id, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => model.UserId1, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => model.UserId1, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => model.UserId1, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => model.UserId2, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => model.UserId2, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => model.UserId2, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => model.UserId3, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => model.UserId3, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => model.UserId3, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => model.UserId4, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => model.UserId4, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => model.UserId4, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+        <div class="form-group">
+            @Html.LabelFor(model => model.UserId5, htmlAttributes: new { @class = "control-label col-md-2" })
+            <div class="col-md-10">
+                @Html.EditorFor(model => model.UserId5, new { htmlAttributes = new { @class = "form-control" } })
+                @Html.ValidationMessageFor(model => model.UserId5, "", new { @class = "text-danger" })
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-md-offset-2 col-md-10">
+                <input type="submit" value="Create" class="btn btn-default" />
+            </div>
+        </div>
+    </div>
+}
+
+<div>
+    @Html.ActionLink("Go back to home", "Details")
+</div>
+
+@section Scripts {
+    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.14.0/jquery.validate.min.js"></script>
+    <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/RemoteAttribute_Home/_Layout.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/RemoteAttribute_Home/_Layout.cshtml
new file mode 100644
index 0000000000..3da0702694
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/RemoteAttribute_Home/_Layout.cshtml
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>@ViewBag.Title - My ASP.NET Application</title>
+</head>
+<body>
+    <div>
+        <div>
+            <div>
+                @Html.ActionLink("Basic web site", "Details", "RemoteAttribute_Home", routeValues: new { area = (object)null })
+            </div>
+
+            <div>
+                <ul>
+                    <li>@Html.ActionLink("Home", "Details", "RemoteAttribute_Home", routeValues: new { area = string.Empty })</li>
+                    <li>@Html.ActionLink("Area1 Home", "Details", "RemoteAttribute_Home", routeValues: new { area = "Area1" })</li>
+                </ul>
+            </div>
+        </div>
+    </div>
+
+    <div>
+        @RenderBody()
+    </div>
+
+    <script src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-2.1.4.min.js"></script>
+    @RenderSection("scripts", required: false)
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/RequestScopedService/TagHelper.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/RequestScopedService/TagHelper.cshtml
new file mode 100644
index 0000000000..5e597fcb9e
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/RequestScopedService/TagHelper.cshtml
@@ -0,0 +1,3 @@
+@using BasicWebSite
+@addTagHelper BasicWebSite.RequestScopedTagHelper, BasicWebSite
+<request-scoped></request-scoped>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/RequestScopedService/View.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/RequestScopedService/View.cshtml
new file mode 100644
index 0000000000..5b1982dc93
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/RequestScopedService/View.cshtml
@@ -0,0 +1,3 @@
+@using BasicWebSite
+@inject RequestIdService RequestIdService
+@RequestIdService.RequestId
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/RequestScopedService/ViewComponent.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/RequestScopedService/ViewComponent.cshtml
new file mode 100644
index 0000000000..4ee213cd41
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/RequestScopedService/ViewComponent.cshtml
@@ -0,0 +1 @@
+@await Component.InvokeAsync("RequestId")
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Shared/Components/PassThrough/Default.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Shared/Components/PassThrough/Default.cshtml
new file mode 100644
index 0000000000..e471138939
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Shared/Components/PassThrough/Default.cshtml
@@ -0,0 +1,2 @@
+@model long
+<p>The passed through value was: @Model</p>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Shared/Components/ViewData/Default.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Shared/Components/ViewData/Default.cshtml
new file mode 100644
index 0000000000..5144ba57cd
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Shared/Components/ViewData/Default.cshtml
@@ -0,0 +1,8 @@
+<html>
+    <head>
+        <title>@ViewData["Title"]</title>
+    </head>
+    <body>
+        <span id="message">@ViewData["Message"]</span>
+    </body>
+</html>
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Shared/Error.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Shared/Error.cshtml
new file mode 100644
index 0000000000..5d73bf597b
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Shared/Error.cshtml
@@ -0,0 +1,7 @@
+@{
+    Layout = "/Views/Shared/_Layout.cshtml";
+    ViewBag.Title = "Error";
+}
+
+<h1>Error.</h1>
+<h2>An error occurred while processing your request.</h2>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Shared/_Layout.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Shared/_Layout.cshtml
new file mode 100644
index 0000000000..48f6da692c
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Shared/_Layout.cshtml
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>@ViewBag.Title - My ASP.NET Application</title>
+
+</head>
+<body>
+    <div>
+        <div>
+            <div>
+                @Html.ActionLink("BasicWebApplication", "Index", "Home", new { area = "" })
+            </div>
+            <div>
+                <ul>
+                    <li>@Html.ActionLink("Home", "Index", "Home")</li>
+                </ul>
+            </div>
+        </div>
+    </div>
+    <div>
+        @RenderBody()
+        <hr />
+        <footer>
+            <p>&copy; 2014 - My ASP.NET Application</p>
+        </footer>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/TempData/DisplayTempData.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/TempData/DisplayTempData.cshtml
new file mode 100644
index 0000000000..6b0b25a039
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/TempData/DisplayTempData.cshtml
@@ -0,0 +1 @@
+@TempData["key"]
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/TempData/Index.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/TempData/Index.cshtml
new file mode 100644
index 0000000000..173fcf9417
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/TempData/Index.cshtml
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Hello</title>
+</head>
+<body>
+    Hello
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/TempDataProperty/DetailsView.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/TempDataProperty/DetailsView.cshtml
new file mode 100644
index 0000000000..f108e3a7fe
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/TempDataProperty/DetailsView.cshtml
@@ -0,0 +1,2 @@
+@model BasicWebSite.Models.Person
+@ViewData["Message"]@ViewData["NullableInt"] for person @Model.FullName with id @Model.id.
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataInViewComponent.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataInViewComponent.cshtml
new file mode 100644
index 0000000000..7a56ec1d82
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataInViewComponent.cshtml
@@ -0,0 +1,2 @@
+Sample that shows value of ViewDataAttribute being passed to a ViewComponent
+<span class="view-data">@ViewData["Message"]</span>
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataPropertyToView.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataPropertyToView.cshtml
new file mode 100644
index 0000000000..ac08b926f2
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataPropertyToView.cshtml
@@ -0,0 +1,2 @@
+@{ Layout = "_Layout"; }
+Sample that shows ViewDataAttribute being applied to a controller
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/_Layout.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/_Layout.cshtml
new file mode 100644
index 0000000000..64fd714d0f
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/_Layout.cshtml
@@ -0,0 +1,10 @@
+<html>
+    <head>
+        <title>@ViewData["Title"]</title>
+    </head>
+    <body>
+        <span id="message">@ViewData["Message"]</span>
+        <span id="filter-message">@ViewData["FilterMessage"]</span>
+        @RenderBody()
+    </body>
+</html>
diff --git a/src/Mvc/test/WebSites/BasicWebSite/VndErrorAttribute.cs b/src/Mvc/test/WebSites/BasicWebSite/VndErrorAttribute.cs
new file mode 100644
index 0000000000..c5b3f973e5
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/VndErrorAttribute.cs
@@ -0,0 +1,13 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace BasicWebSite
+{
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
+    public class VndErrorAttribute : Attribute, IFilterMetadata
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/_bower.json b/src/Mvc/test/WebSites/BasicWebSite/_bower.json
new file mode 100644
index 0000000000..7f3bcb8b86
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/_bower.json
@@ -0,0 +1,14 @@
+{
+    "name": "BasicWebSite",
+    "description": "Web site demonstrating various validations.",
+    "private": true,
+    "dependencies": {
+        "jquery-validation-unobtrusive": "3.2.6"
+    },
+    "exportsOverride": {
+        "jquery-validation-unobtrusive": {
+            "": "jquery.validate.unobtrusive.min.js"
+        },
+        "*": { }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/_bower.readme b/src/Mvc/test/WebSites/BasicWebSite/_bower.readme
new file mode 100644
index 0000000000..a4fdaba27e
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/_bower.readme
@@ -0,0 +1,7 @@
+To recreate minified JavaScript file,
+
+1. Update jquery-validation-unobtrusive version in _bower.json if necessary.
+2. Rename or copy _bower.json to bower.json, _gruntfile.js to gruntfile.js, and _package.json to package.json.
+3. Run build from the repo root. (Minimum command is `./build.sh --quiet run-grunt`.)
+4. Remove bower.json, gruntfile.js and package.json.
+5. Check in _bower.json and new jquery.validate.unobtrusive.min.js file.
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/_gruntfile.js b/src/Mvc/test/WebSites/BasicWebSite/_gruntfile.js
new file mode 100644
index 0000000000..22b35580a7
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/_gruntfile.js
@@ -0,0 +1,20 @@
+module.exports = function (grunt) {
+    grunt.initConfig({
+        bower: {
+            install: {
+                options: {
+                    targetDir: "wwwroot/lib",
+                    layout: "byComponent",
+                    cleanTargetDir: false
+                }
+            }
+        }
+    });
+
+    // This command registers the default task which will install bower packages into wwwroot/lib
+    grunt.registerTask("default", ["bower:install"]);
+
+    // The following line loads the grunt plugins.
+    // This line needs to be at the end of this file.
+    grunt.loadNpmTasks("grunt-bower-task");
+};
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/_package.json b/src/Mvc/test/WebSites/BasicWebSite/_package.json
new file mode 100644
index 0000000000..a0d2a37b7a
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/_package.json
@@ -0,0 +1,10 @@
+{
+    "version": "0.0.0",
+    "name": "BasicWebSite",
+    "description": "Web site demonstrating various validations.",
+    "private":  true,
+    "devDependencies": {
+        "grunt": "^0.4.5",
+        "grunt-bower-task": "^0.4.0"
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/readme.md b/src/Mvc/test/WebSites/BasicWebSite/readme.md
new file mode 100644
index 0000000000..3b180a37b6
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/readme.md
@@ -0,0 +1,5 @@
+BasicWebSite
+===
+
+This web site illustrates many commonly used features including but not limited to
+link generation, action results and content negotiation, `RouteData` amongst others.
diff --git a/src/Mvc/test/WebSites/BasicWebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/src/Mvc/test/WebSites/BasicWebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
new file mode 100644
index 0000000000..be9a38a4cf
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
@@ -0,0 +1,5 @@
+/*
+** Unobtrusive validation support library for jQuery and jQuery Validate
+** Copyright (C) Microsoft Corporation. All rights reserved.
+*/
+!function(a){function e(a,e,n){a.rules[e]=n,a.message&&(a.messages[e]=a.message)}function n(a){return a.replace(/^\s+|\s+$/g,"").split(/\s*,\s*/g)}function t(a){return a.replace(/([!"#$%&'()*+,./:;<=>?@\[\\\]^`{|}~])/g,"\\$1")}function r(a){return a.substr(0,a.lastIndexOf(".")+1)}function i(a,e){return 0===a.indexOf("*.")&&(a=a.replace("*.",e)),a}function o(e,n){var r=a(this).find("[data-valmsg-for='"+t(n[0].name)+"']"),i=r.attr("data-valmsg-replace"),o=i?a.parseJSON(i)!==!1:null;r.removeClass("field-validation-valid").addClass("field-validation-error"),e.data("unobtrusiveContainer",r),o?(r.empty(),e.removeClass("input-validation-error").appendTo(r)):e.hide()}function d(e,n){var t=a(this).find("[data-valmsg-summary=true]"),r=t.find("ul");r&&r.length&&n.errorList.length&&(r.empty(),t.addClass("validation-summary-errors").removeClass("validation-summary-valid"),a.each(n.errorList,function(){a("<li />").html(this.message).appendTo(r)}))}function s(e){var n=e.data("unobtrusiveContainer");if(n){var t=n.attr("data-valmsg-replace"),r=t?a.parseJSON(t):null;n.addClass("field-validation-valid").removeClass("field-validation-error"),e.removeData("unobtrusiveContainer"),r&&n.empty()}}function l(e){var n=a(this),t="__jquery_unobtrusive_validation_form_reset";if(!n.data(t)){n.data(t,!0);try{n.data("validator").resetForm()}finally{n.removeData(t)}n.find(".validation-summary-errors").addClass("validation-summary-valid").removeClass("validation-summary-errors"),n.find(".field-validation-error").addClass("field-validation-valid").removeClass("field-validation-error").removeData("unobtrusiveContainer").find(">*").removeData("unobtrusiveContainer")}}function m(e){var n=a(e),t=n.data(v),r=a.proxy(l,e),i=p.unobtrusive.options||{},m=function(n,t){var r=i[n];r&&a.isFunction(r)&&r.apply(e,t)};return t||(t={options:{errorClass:i.errorClass||"input-validation-error",errorElement:i.errorElement||"span",errorPlacement:function(){o.apply(e,arguments),m("errorPlacement",arguments)},invalidHandler:function(){d.apply(e,arguments),m("invalidHandler",arguments)},messages:{},rules:{},success:function(){s.apply(e,arguments),m("success",arguments)}},attachValidation:function(){n.off("reset."+v,r).on("reset."+v,r).validate(this.options)},validate:function(){return n.validate(),n.valid()}},n.data(v,t)),t}var u,p=a.validator,v="unobtrusiveValidation";p.unobtrusive={adapters:[],parseElement:function(e,n){var t,r,i,o=a(e),d=o.parents("form")[0];d&&(t=m(d),t.options.rules[e.name]=r={},t.options.messages[e.name]=i={},a.each(this.adapters,function(){var n="data-val-"+this.name,t=o.attr(n),s={};void 0!==t&&(n+="-",a.each(this.params,function(){s[this]=o.attr(n+this)}),this.adapt({element:e,form:d,message:t,params:s,rules:r,messages:i}))}),a.extend(r,{__dummy__:!0}),n||t.attachValidation())},parse:function(e){var n=a(e),t=n.parents().addBack().filter("form").add(n.find("form")).has("[data-val=true]");n.find("[data-val=true]").each(function(){p.unobtrusive.parseElement(this,!0)}),t.each(function(){var a=m(this);a&&a.attachValidation()})}},u=p.unobtrusive.adapters,u.add=function(a,e,n){return n||(n=e,e=[]),this.push({name:a,params:e,adapt:n}),this},u.addBool=function(a,n){return this.add(a,function(t){e(t,n||a,!0)})},u.addMinMax=function(a,n,t,r,i,o){return this.add(a,[i||"min",o||"max"],function(a){var i=a.params.min,o=a.params.max;i&&o?e(a,r,[i,o]):i?e(a,n,i):o&&e(a,t,o)})},u.addSingleVal=function(a,n,t){return this.add(a,[n||"val"],function(r){e(r,t||a,r.params[n])})},p.addMethod("__dummy__",function(a,e,n){return!0}),p.addMethod("regex",function(a,e,n){var t;return this.optional(e)?!0:(t=new RegExp(n).exec(a),t&&0===t.index&&t[0].length===a.length)}),p.addMethod("nonalphamin",function(a,e,n){var t;return n&&(t=a.match(/\W/g),t=t&&t.length>=n),t}),p.methods.extension?(u.addSingleVal("accept","mimtype"),u.addSingleVal("extension","extension")):u.addSingleVal("extension","extension","accept"),u.addSingleVal("regex","pattern"),u.addBool("creditcard").addBool("date").addBool("digits").addBool("email").addBool("number").addBool("url"),u.addMinMax("length","minlength","maxlength","rangelength").addMinMax("range","min","max","range"),u.addMinMax("minlength","minlength").addMinMax("maxlength","minlength","maxlength"),u.add("equalto",["other"],function(n){var o=r(n.element.name),d=n.params.other,s=i(d,o),l=a(n.form).find(":input").filter("[name='"+t(s)+"']")[0];e(n,"equalTo",l)}),u.add("required",function(a){("INPUT"!==a.element.tagName.toUpperCase()||"CHECKBOX"!==a.element.type.toUpperCase())&&e(a,"required",!0)}),u.add("remote",["url","type","additionalfields"],function(o){var d={url:o.params.url,type:o.params.type||"GET",data:{}},s=r(o.element.name);a.each(n(o.params.additionalfields||o.element.name),function(e,n){var r=i(n,s);d.data[r]=function(){var e=a(o.form).find(":input").filter("[name='"+t(r)+"']");return e.is(":checkbox")?e.filter(":checked").val()||e.filter(":hidden").val()||"":e.is(":radio")?e.filter(":checked").val()||"":e.val()}}),e(o,"remote",d)}),u.add("password",["min","nonalphamin","regex"],function(a){a.params.min&&e(a,"minlength",a.params.min),a.params.nonalphamin&&e(a,"nonalphamin",a.params.nonalphamin),a.params.regex&&e(a,"regex",a.params.regex)}),a(function(){p.unobtrusive.parse(document)})}(jQuery);
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ClientUIStubController.cs b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ClientUIStubController.cs
new file mode 100644
index 0000000000..62564175d5
--- /dev/null
+++ b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ClientUIStubController.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ControllersFromServicesClassLibrary
+{
+    [NonController]
+    public class ClientUIStubController
+    {
+        public object GetClientContent(int id)
+        {
+            return new object();
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ControllerWithConstructorInjection.cs b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ControllerWithConstructorInjection.cs
new file mode 100644
index 0000000000..12beb114fa
--- /dev/null
+++ b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ControllerWithConstructorInjection.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace ControllersFromServicesClassLibrary
+{
+    public class ConstructorInjectionController
+    {
+        public ConstructorInjectionController(IUrlHelperFactory urlHelperFactory, QueryValueService queryService)
+        {
+            UrlHelperFactory = urlHelperFactory;
+            QueryService = queryService;
+        }
+
+        [ActionContext]
+        public ActionContext ActionContext { get; set; }
+
+        private QueryValueService QueryService { get; }
+
+        private IUrlHelperFactory UrlHelperFactory { get; }
+
+        [HttpGet("/constructorinjection")]
+        public IActionResult Index()
+        {
+            var urlHelper = UrlHelperFactory.GetUrlHelper(ActionContext);
+
+            var content = string.Join(
+                " ", 
+                urlHelper.Action(), 
+                QueryService.GetValue(), 
+                ActionContext.HttpContext.Request.Headers["Test-Header"]);
+
+            return new ContentResult { Content = content };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.csproj b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.csproj
new file mode 100644
index 0000000000..8d0ce3d813
--- /dev/null
+++ b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/EmployeeRecords.cs b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/EmployeeRecords.cs
new file mode 100644
index 0000000000..840e891e97
--- /dev/null
+++ b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/EmployeeRecords.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ControllersFromServicesClassLibrary
+{
+    public class EmployeeRecords : Controller
+    {
+        [HttpPut("/employee/update_records")]
+        public IActionResult UpdateRecords(string recordId)
+        {
+            return Content("Updated record " + recordId);
+        }
+
+        [HttpPost]
+        // This action uses conventional routing.
+        public IActionResult Save(string id)
+        {
+            return Content("Saved record employee #" + id);
+        }
+
+    }
+}
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/GenericController.cs b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/GenericController.cs
new file mode 100644
index 0000000000..e0d5cebd88
--- /dev/null
+++ b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/GenericController.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ControllersFromServicesClassLibrary
+{
+    public class GenericController<TController> : Controller
+    {
+        [HttpGet("/not-discovered/generic")]
+        public IActionResult Index()
+        {
+            return new EmptyResult();
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/Inventory.cs b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/Inventory.cs
new file mode 100644
index 0000000000..14cf643075
--- /dev/null
+++ b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/Inventory.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ControllersFromServicesClassLibrary
+{
+    public class Inventory : ResourcesController
+    {
+        [HttpGet]
+        public int Get()
+        {
+            return 4;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/NestedControllerOwner.cs b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/NestedControllerOwner.cs
new file mode 100644
index 0000000000..0ece0dc75c
--- /dev/null
+++ b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/NestedControllerOwner.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ControllersFromServicesClassLibrary
+{
+    public class NestedControllerOwner
+    {
+        public class NestedController : Controller
+        {
+            [HttpGet("/not-discovered/nested")]
+            public IActionResult Index()
+            {
+                return new EmptyResult();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/QueryValueService.cs b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/QueryValueService.cs
new file mode 100644
index 0000000000..6b4a752f6a
--- /dev/null
+++ b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/QueryValueService.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+
+namespace ControllersFromServicesClassLibrary
+{
+    public class QueryValueService
+    {
+        private readonly HttpContext _context;
+
+        public QueryValueService(IHttpContextAccessor httpContextAccessor)
+        {
+            _context = httpContextAccessor.HttpContext;
+        }
+
+        public string GetValue()
+        {
+            return _context.Request.Query["value"];
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ResourcesController.cs b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ResourcesController.cs
new file mode 100644
index 0000000000..779e9f4ffc
--- /dev/null
+++ b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ResourcesController.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ControllersFromServicesClassLibrary
+{
+    [Controller]
+    [Route("/[controller]")]
+    public class ResourcesController
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/TimeScheduleController.cs b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/TimeScheduleController.cs
new file mode 100644
index 0000000000..c44e7548bb
--- /dev/null
+++ b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/TimeScheduleController.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ControllersFromServicesClassLibrary
+{
+    public class TimeScheduleController
+    {
+        [HttpGet("/schedule/{id:int}")]
+        public IActionResult GetSchedule(int id)
+        {
+            return new ContentResult { Content = "No schedules available for " + id };
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/AnotherController.cs b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/AnotherController.cs
new file mode 100644
index 0000000000..2f2432b366
--- /dev/null
+++ b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/AnotherController.cs
@@ -0,0 +1,29 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ControllersFromServicesWebSite
+{
+    [Route("/[controller]")]
+    public class AnotherController : Controller
+    {
+        [HttpGet]
+        public int Get()
+        {
+            return 1;
+        }
+
+        [HttpGet("InServicesViewComponent")]
+        public IActionResult ViewComponentAction()
+        {
+            return ViewComponent("ComponentFromServices");
+        }
+
+        [HttpGet("InServicesTagHelper")]
+        public IActionResult InServicesTagHelper()
+        {
+            return View();
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/AssemblyMetadataReferenceFeatureProvider.cs b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/AssemblyMetadataReferenceFeatureProvider.cs
new file mode 100644
index 0000000000..99c96ceb38
--- /dev/null
+++ b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/AssemblyMetadataReferenceFeatureProvider.cs
@@ -0,0 +1,20 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.CodeAnalysis;
+
+namespace ControllersFromServicesWebSite
+{
+    public class AssemblyMetadataReferenceFeatureProvider : IApplicationFeatureProvider<MetadataReferenceFeature>
+    {
+        public void PopulateFeature(IEnumerable<ApplicationPart> parts, MetadataReferenceFeature feature)
+        {
+            var currentAssembly = GetType().GetTypeInfo().Assembly;
+            feature.MetadataReferences.Add(MetadataReference.CreateFromFile(currentAssembly.Location));
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Components/ComponentFromServicesViewComponent.cs b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Components/ComponentFromServicesViewComponent.cs
new file mode 100644
index 0000000000..54901d4fbb
--- /dev/null
+++ b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Components/ComponentFromServicesViewComponent.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ControllersFromServicesWebSite.Components
+{
+    public class ComponentFromServicesViewComponent : ViewComponent
+    {
+        private readonly ValueService _value;
+
+        public ComponentFromServicesViewComponent(ValueService value)
+        {
+            _value = value;
+        }
+
+        public string Invoke()
+        {
+            return $"Value = {_value.Value}";
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj
new file mode 100644
index 0000000000..24bd4fa3f8
--- /dev/null
+++ b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ControllersFromServicesClassLibrary\ControllersFromServicesClassLibrary.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(MicrosoftAspNetCoreDiagnosticsPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/NotInServicesController.cs b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/NotInServicesController.cs
new file mode 100644
index 0000000000..ff89bb3f1c
--- /dev/null
+++ b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/NotInServicesController.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace ControllersFromServicesWebSite
+{
+    public class NotInServicesController : Controller
+    {
+        [HttpGet("/not-discovered/not-in-services")]
+        public IActionResult Index()
+        {
+            return View();
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Startup.cs b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Startup.cs
new file mode 100644
index 0000000000..05653ebde6
--- /dev/null
+++ b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Startup.cs
@@ -0,0 +1,82 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using ControllersFromServicesClassLibrary;
+using ControllersFromServicesWebSite.Components;
+using ControllersFromServicesWebSite.TagHelpers;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace ControllersFromServicesWebSite
+{
+    public class Startup
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            var builder = services
+                .AddMvc()
+                .ConfigureApplicationPartManager(manager => manager.ApplicationParts.Clear())
+                .AddApplicationPart(typeof(TimeScheduleController).GetTypeInfo().Assembly)
+                .ConfigureApplicationPartManager(manager =>
+                {
+                    manager.ApplicationParts.Add(new TypesPart(
+                      typeof(AnotherController),
+                      typeof(ComponentFromServicesViewComponent),
+                      typeof(InServicesTagHelper)));
+
+                    manager.FeatureProviders.Add(new AssemblyMetadataReferenceFeatureProvider());
+                })
+                .AddControllersAsServices()
+                .AddViewComponentsAsServices()
+                .AddTagHelpersAsServices();
+
+            services.AddTransient<QueryValueService>();
+            services.AddTransient<ValueService>();
+            services.AddHttpContextAccessor();
+        }
+
+        private class TypesPart : ApplicationPart, IApplicationPartTypeProvider
+        {
+            public TypesPart(params Type[] types)
+            {
+                Types = types.Select(t => t.GetTypeInfo());
+            }
+
+            public override string Name => string.Join(", ", Types.Select(t => t.FullName));
+
+            public IEnumerable<TypeInfo> Types { get; }
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute("default", "{controller}/{action}/{id}");
+            });
+        }
+
+        public static void Main(string[] args)
+        {
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
+            host.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            new WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseStartup<Startup>()
+                .UseKestrel()
+                .UseIISIntegration();
+    }
+}
+
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/TagHelpers/InServicesTagHelper.cs b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/TagHelpers/InServicesTagHelper.cs
new file mode 100644
index 0000000000..7fa57a1e7b
--- /dev/null
+++ b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/TagHelpers/InServicesTagHelper.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace ControllersFromServicesWebSite.TagHelpers
+{
+    [HtmlTargetElement("InServices")]
+    public class InServicesTagHelper : TagHelper
+    {
+        private ValueService _value;
+
+        public InServicesTagHelper(ValueService value)
+        {
+            _value = value;
+        }
+
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            output.TagName = null;
+            output.Content.SetContent(_value.Value.ToString());
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ValueService.cs b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ValueService.cs
new file mode 100644
index 0000000000..f08089282b
--- /dev/null
+++ b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ValueService.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace ControllersFromServicesWebSite
+{
+    public class ValueService
+    {
+        public int Value { get; } = 3;
+    }
+}
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ViewData.cshtml b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ViewData.cshtml
new file mode 100644
index 0000000000..c864b370c8
--- /dev/null
+++ b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ViewData.cshtml
@@ -0,0 +1 @@
+<view-data>@ViewBag.Value</view-data>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Views/Another/InServicesTagHelper.cshtml b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Views/Another/InServicesTagHelper.cshtml
new file mode 100644
index 0000000000..562c3573d0
--- /dev/null
+++ b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Views/Another/InServicesTagHelper.cshtml
@@ -0,0 +1,2 @@
+@addTagHelper *, ControllersFromServicesWebSite
+<inservices></inservices>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/readme.md b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/readme.md
new file mode 100644
index 0000000000..fdaeac79b4
--- /dev/null
+++ b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/readme.md
@@ -0,0 +1 @@
+Functional test site for verifying that controllers registered as services can be consumed by DefaultControllerFactory.
diff --git a/src/Mvc/test/WebSites/CorsWebSite/Controllers/BlogController.cs b/src/Mvc/test/WebSites/CorsWebSite/Controllers/BlogController.cs
new file mode 100644
index 0000000000..cfab955ec1
--- /dev/null
+++ b/src/Mvc/test/WebSites/CorsWebSite/Controllers/BlogController.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
+
+namespace CorsWebSite
+{
+    [Route("Cors/[action]")]
+    [EnableCors("AllowAnySimpleRequest")]
+    public class BlogController : Controller
+    {
+        public IEnumerable<string> GetBlogComments(int id)
+        {
+            return new[] { "comment1", "comment2", "comment3" };
+        }
+
+        [EnableCors("AllowSpecificOrigin")]
+        public IEnumerable<string> GetUserComments(int id)
+        {
+            return new[] { "usercomment1", "usercomment2", "usercomment3" };
+        }
+
+        [DisableCors]
+        [AcceptVerbs("HEAD", "GET", "POST")]
+        public string GetExclusiveContent()
+        {
+            return "exclusive";
+        }
+
+        [EnableCors("WithCredentialsAnyOrigin")]
+        public string EditUserComment(int id, string userComment)
+        {
+            return userComment;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/CorsWebSite/Controllers/CustomerController.cs b/src/Mvc/test/WebSites/CorsWebSite/Controllers/CustomerController.cs
new file mode 100644
index 0000000000..af6a3369c5
--- /dev/null
+++ b/src/Mvc/test/WebSites/CorsWebSite/Controllers/CustomerController.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
+
+namespace CorsWebSite
+{
+    [Route("NonCors/[action]")]
+    public class CustomerController : Controller
+    {
+        [HttpOptions]
+        public IEnumerable<string> GetOptions()
+        {
+            return new[] { "Create", "Update", "Delete" };
+        }
+
+        [HttpPost]
+        public IEnumerable<string> Post()
+        {
+            return new[] { "customer1", "customer2", "customer3" };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/CorsWebSite/Controllers/StoreController.cs b/src/Mvc/test/WebSites/CorsWebSite/Controllers/StoreController.cs
new file mode 100644
index 0000000000..ec4dd879d9
--- /dev/null
+++ b/src/Mvc/test/WebSites/CorsWebSite/Controllers/StoreController.cs
@@ -0,0 +1,46 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
+
+namespace CorsWebSite.Controllers
+{
+    [AllRequestsBlockingAuthorizationFilter]
+    [EnableCors("AllowAll")]
+    [Route("api/store/[action]")]
+    public class StoreController : Controller
+    {
+        [HttpGet]
+        public IEnumerable<string> ActionUsingControllerCorsSettings()
+        {
+            return new string[] { "product1", "product2" };
+        }
+
+        [HttpGet]
+        [EnableCors("Allow example.com")]
+        public string ActionWithCorsSettings()
+        {
+            return "product1";
+        }
+
+        // Irrespective of where(controller or action) the Cors filter is applied, Cors filters should be
+        // executed before any other type of authorization filters.
+        [HttpGet]
+        [DisableCors]
+        public string ActionWithCorsDisabled()
+        {
+            return "product1";
+        }
+
+        // Irrespective of where(controller or action) the Cors filter is applied, Cors filters should be
+        // executed before any other type of authorization filters.
+        [HttpGet]
+        [EnableCors("Allow example.com")]
+        public string ActionWithDifferentCorsPolicy()
+        {
+            return "product1";
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/CorsWebSite/CorsWebSite.csproj b/src/Mvc/test/WebSites/CorsWebSite/CorsWebSite.csproj
new file mode 100644
index 0000000000..7cb00b8351
--- /dev/null
+++ b/src/Mvc/test/WebSites/CorsWebSite/CorsWebSite.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc.Formatters.Xml\Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Cors" Version="$(MicrosoftAspNetCoreCorsPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/WebSites/CorsWebSite/Filters/AllRequestsBlockingAuthorizationFilter.cs b/src/Mvc/test/WebSites/CorsWebSite/Filters/AllRequestsBlockingAuthorizationFilter.cs
new file mode 100644
index 0000000000..02c1c27207
--- /dev/null
+++ b/src/Mvc/test/WebSites/CorsWebSite/Filters/AllRequestsBlockingAuthorizationFilter.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace CorsWebSite
+{
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public class AllRequestsBlockingAuthorizationFilter : Attribute, IAuthorizationFilter
+    {
+        public void OnAuthorization(AuthorizationFilterContext context)
+        {
+            context.Result = new ContentResult()
+            {
+                Content = "You are unauthorized!!",
+                StatusCode = 401
+            };
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/CorsWebSite/Startup.cs b/src/Mvc/test/WebSites/CorsWebSite/Startup.cs
new file mode 100644
index 0000000000..6ee44e7f39
--- /dev/null
+++ b/src/Mvc/test/WebSites/CorsWebSite/Startup.cs
@@ -0,0 +1,95 @@
+// 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.
+
+using System.IO;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Cors.Infrastructure;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace CorsWebSite
+{
+    public class Startup
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddMvc();
+            services.Configure<CorsOptions>(options =>
+            {
+                options.AddPolicy(
+                    "AllowAnySimpleRequest",
+                    builder =>
+                    {
+                        builder.AllowAnyOrigin()
+                               .WithMethods("GET", "POST", "HEAD");
+                    });
+
+                options.AddPolicy(
+                    "AllowSpecificOrigin",
+                    builder =>
+                    {
+                        builder.WithOrigins("http://example.com");
+                    });
+
+                options.AddPolicy(
+                    "WithCredentials",
+                    builder =>
+                    {
+                        builder.AllowCredentials()
+                               .WithOrigins("http://example.com");
+                    });
+
+                options.AddPolicy(
+                    "WithCredentialsAnyOrigin",
+                    builder =>
+                    {
+                        builder.AllowCredentials()
+                               .AllowAnyOrigin()
+                               .AllowAnyHeader()
+                               .WithMethods("PUT", "POST")
+                               .WithExposedHeaders("exposed1", "exposed2");
+                    });
+
+                options.AddPolicy(
+                    "AllowAll",
+                    builder =>
+                    {
+                        builder.AllowCredentials()
+                               .AllowAnyMethod()
+                               .AllowAnyHeader()
+                               .AllowAnyOrigin();
+                    });
+
+                options.AddPolicy(
+                    "Allow example.com",
+                    builder =>
+                    {
+                        builder.AllowCredentials()
+                               .AllowAnyMethod()
+                               .AllowAnyHeader()
+                               .WithOrigins("http://example.com");
+                    });
+            });
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseMvc();
+        }
+
+        public static void Main(string[] args)
+        {
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
+            host.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            new WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseStartup<Startup>()
+                .UseKestrel()
+                .UseIISIntegration();
+    }
+}
diff --git a/src/Mvc/test/WebSites/CorsWebSite/readme.md b/src/Mvc/test/WebSites/CorsWebSite/readme.md
new file mode 100644
index 0000000000..02ac8dca3f
--- /dev/null
+++ b/src/Mvc/test/WebSites/CorsWebSite/readme.md
@@ -0,0 +1,4 @@
+CorsWebSite
+===
+
+This web site illustrates how to configure actions to allow/disallow cross origin requests.
diff --git a/src/Mvc/test/WebSites/Directory.Build.props b/src/Mvc/test/WebSites/Directory.Build.props
new file mode 100644
index 0000000000..ed8c546e2a
--- /dev/null
+++ b/src/Mvc/test/WebSites/Directory.Build.props
@@ -0,0 +1,11 @@
+<Project>
+  <!-- Skip the parent folder to prevent getting test package references. -->
+  <Import Project="..\..\Directory.Build.props" />
+
+  <PropertyGroup>
+    <DeveloperBuildTestWebsiteTfms>netcoreapp2.1</DeveloperBuildTestWebsiteTfms>
+    <StandardTestWebsiteTfms>$(DeveloperBuildTestWebsiteTfms)</StandardTestWebsiteTfms>
+    <StandardTestWebsiteTfms Condition=" '$(DeveloperBuild)' != 'true' ">netcoreapp2.1</StandardTestWebsiteTfms>
+    <StandardTestWebsiteTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestWebsiteTfms);net461</StandardTestWebsiteTfms>
+  </PropertyGroup>
+</Project>
diff --git a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/AggregateExceptionController.cs b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/AggregateExceptionController.cs
new file mode 100644
index 0000000000..b648318cb0
--- /dev/null
+++ b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/AggregateExceptionController.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+
+namespace ErrorPageMiddlewareWebSite
+{
+    public class AggregateExceptionController : Controller
+    {
+        [HttpGet("/AggregateException")]
+        public IActionResult Index()
+        {
+            var firstException = ThrowNullReferenceException();
+            var secondException = ThrowIndexOutOfRangeException();
+            Task.WaitAll(firstException, secondException);
+            return View();
+        }
+
+        private static async Task ThrowNullReferenceException()
+        {
+            await Task.Delay(0);
+            throw new NullReferenceException("Foo cannot be null");
+        }
+
+        private static async Task ThrowIndexOutOfRangeException()
+        {
+            await Task.Delay(0);
+            throw new IndexOutOfRangeException("Index is out of range");
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareController.cs b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareController.cs
new file mode 100644
index 0000000000..ba17eca5f8
--- /dev/null
+++ b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareController.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc;
+
+namespace ErrorPageMiddlewareWebSite
+{
+    public class ErrorPageMiddlewareController : Controller
+    {
+        [HttpGet("/CompilationFailure")]
+        public IActionResult CompilationFailure()
+        {
+            return View();
+        }
+
+        [HttpGet("/ParserError")]
+        public IActionResult ParserError()
+        {
+            return View();
+        }
+
+        [HttpGet("/ErrorFromViewImports")]
+        public IActionResult ViewImportsError()
+        {
+            return View("~/Views/ErrorFromViewImports/Index.cshtml");
+        }
+
+        [HttpGet("/RuntimeError")]
+        public IActionResult RuntimeError() => View();
+
+        [HttpGet("/LoaderException")]
+        public IActionResult ReflectionTypeLoadException()
+        {
+            throw new ReflectionTypeLoadException(
+                new[] { typeof(SomeType) },
+                new[] { new TypeLoadException("Custom Loader Exception.") });
+        }
+
+        private class SomeType
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj
new file mode 100644
index 0000000000..52dc3bc28e
--- /dev/null
+++ b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+    <DebugType Condition="'$(TargetFramework)' == 'net461'">full</DebugType>
+    <!-- We want to validate runtime parser \ compilation exceptions -->
+    <RazorCompileOnBuild>false</RazorCompileOnBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(MicrosoftAspNetCoreDiagnosticsPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/README.md b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/README.md
new file mode 100644
index 0000000000..2bfe7886b6
--- /dev/null
+++ b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/README.md
@@ -0,0 +1,4 @@
+ErrorPageMiddlewareWebSite
+===
+
+This web site illustrates how to register error page middleware.
diff --git a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs
new file mode 100644
index 0000000000..864fce79ea
--- /dev/null
+++ b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs
@@ -0,0 +1,41 @@
+// 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.
+
+using System.IO;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace ErrorPageMiddlewareWebSite
+{
+    public class Startup
+    {
+        // Set up application services
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddMvc();
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseDeveloperExceptionPage();
+            app.UseMvc();
+        }
+
+        public static void Main(string[] args)
+        {
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
+            host.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            new WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseStartup<Startup>()
+                .UseKestrel()
+                .UseIISIntegration();
+    }
+}
+
diff --git a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorFromViewImports/Index.cshtml b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorFromViewImports/Index.cshtml
new file mode 100644
index 0000000000..6df88a66a1
--- /dev/null
+++ b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorFromViewImports/Index.cshtml
@@ -0,0 +1 @@
+<h1>Hello world!</h1>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorFromViewImports/_ViewImports.cshtml b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorFromViewImports/_ViewImports.cshtml
new file mode 100644
index 0000000000..c7ee89fafd
--- /dev/null
+++ b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorFromViewImports/_ViewImports.cshtml
@@ -0,0 +1 @@
+@using NamespaceDoesNotExist
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/CompilationFailure.cshtml b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/CompilationFailure.cshtml
new file mode 100644
index 0000000000..8766bf1977
--- /dev/null
+++ b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/CompilationFailure.cshtml
@@ -0,0 +1,3 @@
+@{ 
+    string x = 10;
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/ParserError.cshtml b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/ParserError.cshtml
new file mode 100644
index 0000000000..22c63d42a8
--- /dev/null
+++ b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/ParserError.cshtml
@@ -0,0 +1,4 @@
+@{ 
+    <span>
+}
+</span>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/RuntimeError.cshtml b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/RuntimeError.cshtml
new file mode 100644
index 0000000000..d476445cdb
--- /dev/null
+++ b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/RuntimeError.cshtml
@@ -0,0 +1,3 @@
+@{
+  throw new Exception("Error from view");
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FSharpWebSite/Controllers/HomeController.fs b/src/Mvc/test/WebSites/FSharpWebSite/Controllers/HomeController.fs
new file mode 100644
index 0000000000..c5153b1def
--- /dev/null
+++ b/src/Mvc/test/WebSites/FSharpWebSite/Controllers/HomeController.fs
@@ -0,0 +1,21 @@
+// 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.
+
+namespace FSharpWebSite.Controllers
+
+open System
+open System.Collections.Generic
+open System.Linq
+open System.Threading.Tasks
+open Microsoft.AspNetCore.Mvc
+
+type HomeController () =
+    inherit Controller()
+
+    member this.Index () =
+        this.View()
+
+    member this.AsyncAction () = async {
+        do! Async.Sleep 50
+        return this.Content("Action completed asynchronously")
+    }
diff --git a/src/Mvc/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj b/src/Mvc/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj
new file mode 100644
index 0000000000..357a7fb863
--- /dev/null
+++ b/src/Mvc/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Controllers\*.fs" />
+    <Compile Include="Startup.fs" />
+    <Compile Include="Program.fs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/test/WebSites/FSharpWebSite/Program.fs b/src/Mvc/test/WebSites/FSharpWebSite/Program.fs
new file mode 100644
index 0000000000..9def47bebc
--- /dev/null
+++ b/src/Mvc/test/WebSites/FSharpWebSite/Program.fs
@@ -0,0 +1,24 @@
+// 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.
+
+namespace FSharpWebSite
+
+open System.IO
+open Microsoft.AspNetCore.Hosting
+
+
+module Program =
+
+    [<EntryPoint>]
+    let main args =
+        let host = 
+            WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseStartup<Startup>()
+                .UseKestrel()
+                .UseIISIntegration()
+                .Build()
+
+        host.Run()
+        
+        0
diff --git a/src/Mvc/test/WebSites/FSharpWebSite/Startup.fs b/src/Mvc/test/WebSites/FSharpWebSite/Startup.fs
new file mode 100644
index 0000000000..09b0db7737
--- /dev/null
+++ b/src/Mvc/test/WebSites/FSharpWebSite/Startup.fs
@@ -0,0 +1,19 @@
+// 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.
+
+namespace FSharpWebSite
+
+open Microsoft.AspNetCore.Builder
+open Microsoft.AspNetCore.Hosting
+open Microsoft.Extensions.DependencyInjection
+
+
+type Startup () =
+
+    member this.ConfigureServices(services: IServiceCollection) =
+        services.AddMvc() |> ignore
+
+    member this.Configure(app: IApplicationBuilder) =
+        app.UseDeveloperExceptionPage() |> ignore
+        app.UseStaticFiles() |> ignore
+        app.UseMvcWithDefaultRoute() |> ignore
diff --git a/src/Mvc/test/WebSites/FSharpWebSite/Views/Home/Index.cshtml b/src/Mvc/test/WebSites/FSharpWebSite/Views/Home/Index.cshtml
new file mode 100644
index 0000000000..f2fd366901
--- /dev/null
+++ b/src/Mvc/test/WebSites/FSharpWebSite/Views/Home/Index.cshtml
@@ -0,0 +1,5 @@
+@{
+    ViewData["Title"] = "Home Page";
+}
+
+<h1>Hello from FSharpWebSite</h1>
diff --git a/src/Mvc/test/WebSites/FSharpWebSite/Views/Shared/_Layout.cshtml b/src/Mvc/test/WebSites/FSharpWebSite/Views/Shared/_Layout.cshtml
new file mode 100644
index 0000000000..5523878ce3
--- /dev/null
+++ b/src/Mvc/test/WebSites/FSharpWebSite/Views/Shared/_Layout.cshtml
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>@ViewData["Title"] - FSharpWebSite</title>
+</head>
+<body>
+    @RenderBody()
+</body>
+</html>
diff --git a/src/Mvc/test/WebSites/FSharpWebSite/Views/_ViewImports.cshtml b/src/Mvc/test/WebSites/FSharpWebSite/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..4694316f4b
--- /dev/null
+++ b/src/Mvc/test/WebSites/FSharpWebSite/Views/_ViewImports.cshtml
@@ -0,0 +1 @@
+@using FSharpWebSite
diff --git a/src/Mvc/test/WebSites/FSharpWebSite/Views/_ViewStart.cshtml b/src/Mvc/test/WebSites/FSharpWebSite/Views/_ViewStart.cshtml
new file mode 100644
index 0000000000..a5f10045db
--- /dev/null
+++ b/src/Mvc/test/WebSites/FSharpWebSite/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}
diff --git a/src/Mvc/test/WebSites/FilesWebSite/Controllers/DownloadFilesController.cs b/src/Mvc/test/WebSites/FilesWebSite/Controllers/DownloadFilesController.cs
new file mode 100644
index 0000000000..7b23292272
--- /dev/null
+++ b/src/Mvc/test/WebSites/FilesWebSite/Controllers/DownloadFilesController.cs
@@ -0,0 +1,102 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Text;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Net.Http.Headers;
+
+namespace FilesWebSite
+{
+    public class DownloadFilesController : Controller
+    {
+        private readonly IHostingEnvironment _hostingEnvironment;
+
+        public DownloadFilesController(IHostingEnvironment hostingEnvironment)
+        {
+            _hostingEnvironment = hostingEnvironment;
+        }
+
+        public IActionResult DownloadFromDisk()
+        {
+            var path = Path.Combine(_hostingEnvironment.ContentRootPath, "sample.txt");
+            return PhysicalFile(path, "text/plain", true);
+        }
+
+        public IActionResult DownloadFromDisk_WithLastModifiedAndEtag()
+        {
+            var path = Path.Combine(_hostingEnvironment.ContentRootPath, "sample.txt");
+            var lastModified = new DateTimeOffset(year: 1999, month: 11, day: 04, hour: 3, minute: 0, second: 0, offset: new TimeSpan(0));
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+            return PhysicalFile(path, "text/plain", lastModified, entityTag, true);
+        }
+
+        public IActionResult DownloadFromDiskWithFileName()
+        {
+            var path = Path.Combine(_hostingEnvironment.ContentRootPath, "sample.txt");
+            return PhysicalFile(path, "text/plain", "downloadName.txt");
+        }
+
+        public IActionResult DownloadFromDiskWithFileName_WithLastModifiedAndEtag()
+        {
+            var path = Path.Combine(_hostingEnvironment.ContentRootPath, "sample.txt");
+            var lastModified = new DateTimeOffset(year: 1999, month: 11, day: 04, hour: 3, minute: 0, second: 0, offset: new TimeSpan(0));
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+            return PhysicalFile(path, "text/plain", "downloadName.txt", lastModified, entityTag, true);
+        }
+
+        public IActionResult DownloadFromStream()
+        {
+            var stream = new MemoryStream();
+            var writer = new StreamWriter(stream);
+            writer.Write("This is sample text from a stream");
+            writer.Flush();
+            stream.Seek(0, SeekOrigin.Begin);
+
+            return File(stream, "text/plain", true);
+        }
+
+        public IActionResult DownloadFromStreamWithFileName()
+        {
+            var stream = new MemoryStream();
+            var writer = new StreamWriter(stream);
+            writer.Write("This is sample text from a stream");
+            writer.Flush();
+            stream.Seek(0, SeekOrigin.Begin);
+
+            return File(stream, "text/plain", "downloadName.txt");
+        }
+
+        public IActionResult DownloadFromStreamWithFileName_WithEtag()
+        {
+            var stream = new MemoryStream();
+            var writer = new StreamWriter(stream);
+            writer.Write("This is sample text from a stream");
+            writer.Flush();
+            stream.Seek(0, SeekOrigin.Begin);
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+            return File(stream, "text/plain", "downloadName.txt", lastModified: null, entityTag: entityTag, enableRangeProcessing: true);
+        }
+
+        public IActionResult DownloadFromBinaryData()
+        {
+            var data = Encoding.UTF8.GetBytes("This is a sample text from a binary array");
+            return File(data, "text/plain", true);
+        }
+
+        public IActionResult DownloadFromBinaryDataWithFileName()
+        {
+            var data = Encoding.UTF8.GetBytes("This is a sample text from a binary array");
+            return File(data, "text/plain", "downloadName.txt");
+        }
+
+        public IActionResult DownloadFromBinaryDataWithFileName_WithEtag()
+        {
+            var data = Encoding.UTF8.GetBytes("This is a sample text from a binary array");
+            var entityTag = new EntityTagHeaderValue("\"Etag\"");
+            return File(data, "text/plain", "downloadName.txt", lastModified: null, entityTag: entityTag, enableRangeProcessing: true);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs b/src/Mvc/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs
new file mode 100644
index 0000000000..64e834742d
--- /dev/null
+++ b/src/Mvc/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.FileProviders;
+
+namespace FilesWebSite
+{
+    public class EmbeddedFilesController : Controller
+    {
+        public IActionResult DownloadFileWithFileName()
+        {
+            return new VirtualFileResult("/Greetings.txt", "text/plain")
+            {
+                FileProvider = new EmbeddedFileProvider(GetType().GetTypeInfo().Assembly, "FilesWebSite.EmbeddedResources"),
+                FileDownloadName = "downloadName.txt",
+                EnableRangeProcessing = true,
+            };
+        }
+
+        public IActionResult DownloadFileWithFileName_RangeProcessingNotEnabled()
+        {
+            return new VirtualFileResult("/Greetings.txt", "text/plain")
+            {
+                FileProvider = new EmbeddedFileProvider(GetType().GetTypeInfo().Assembly, "FilesWebSite.EmbeddedResources"),
+                FileDownloadName = "downloadName.txt",
+            };
+        }
+
+        public IActionResult DownloadFileWithFileName_WithEtag()
+        {
+            var file = new VirtualFileResult("/Greetings.txt", "text/plain")
+            {
+                FileProvider = new EmbeddedFileProvider(GetType().GetTypeInfo().Assembly, "FilesWebSite.EmbeddedResources"),
+                FileDownloadName = "downloadName.txt",
+                EnableRangeProcessing = true,
+            };
+
+            file.EntityTag = new Microsoft.Net.Http.Headers.EntityTagHeaderValue("\"Etag\"");
+            return file;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FilesWebSite/Controllers/UploadFilesController.cs b/src/Mvc/test/WebSites/FilesWebSite/Controllers/UploadFilesController.cs
new file mode 100644
index 0000000000..0839978cd0
--- /dev/null
+++ b/src/Mvc/test/WebSites/FilesWebSite/Controllers/UploadFilesController.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System.Linq;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using FilesWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+
+namespace FilesWebSite.Controllers
+{
+    public class UploadFilesController : Controller
+    {
+        [HttpPost("UploadFiles")]
+        public async Task<IActionResult> Post(User user)
+        {
+            var resultUser = new
+            {
+                Name = user.Name,
+                Age = user.Age,
+                Biography = await user.ReadBiography()
+            };
+
+            return Json(resultUser);
+        }
+
+        [HttpPost("UploadProductSpecs")]
+        public IActionResult ProductSpecs(Product product)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
+
+            var files = new Dictionary<string, List<string>>();
+            foreach (var keyValuePair in product.Specs)
+            {
+                files.Add(keyValuePair.Key, keyValuePair.Value?.Select(formFile => formFile?.FileName).ToList());
+            }
+
+            return Json(new { Name = product.Name, Specs = files });
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/FilesWebSite/EmbeddedResources/Greetings.txt b/src/Mvc/test/WebSites/FilesWebSite/EmbeddedResources/Greetings.txt
new file mode 100644
index 0000000000..9531546f3d
--- /dev/null
+++ b/src/Mvc/test/WebSites/FilesWebSite/EmbeddedResources/Greetings.txt
@@ -0,0 +1 @@
+Sample text file as embedded resource.
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj b/src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj
new file mode 100644
index 0000000000..c8f6df1d20
--- /dev/null
+++ b/src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="EmbeddedResources\**" />
+    <Content Include="sample.txt" CopyToPublishDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/WebSites/FilesWebSite/Models/Product.cs b/src/Mvc/test/WebSites/FilesWebSite/Models/Product.cs
new file mode 100644
index 0000000000..8d8921d1b0
--- /dev/null
+++ b/src/Mvc/test/WebSites/FilesWebSite/Models/Product.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+
+namespace FilesWebSite.Models
+{
+    public class Product
+    {
+        public string Name { get; set; }
+
+        public IDictionary<string, IEnumerable<IFormFile>> Specs { get; set; }
+    }
+}
diff --git a/src/Mvc/test/WebSites/FilesWebSite/Models/User.cs b/src/Mvc/test/WebSites/FilesWebSite/Models/User.cs
new file mode 100644
index 0000000000..76b32c6ae8
--- /dev/null
+++ b/src/Mvc/test/WebSites/FilesWebSite/Models/User.cs
@@ -0,0 +1,29 @@
+// 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.
+
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+
+namespace FilesWebSite.Models
+{
+    public class User
+    {
+        public string Name { get; set; }
+        public int Age { get; set; }
+        public IFormFile Biography { get; set; }
+
+        public async Task<string> ReadBiography()
+        {
+            if (Biography != null)
+            {
+                using (var reader = new StreamReader(Biography.OpenReadStream()))
+                {
+                    return await reader.ReadToEndAsync();
+                }
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/FilesWebSite/Startup.cs b/src/Mvc/test/WebSites/FilesWebSite/Startup.cs
new file mode 100644
index 0000000000..aaa363af54
--- /dev/null
+++ b/src/Mvc/test/WebSites/FilesWebSite/Startup.cs
@@ -0,0 +1,42 @@
+// 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.
+
+using System.IO;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace FilesWebSite
+{
+    public class Startup
+    {
+        // Set up application services
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddMvc();
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(name: null, template: "{controller}/{action}", defaults: null);
+            });
+        }
+
+        public static void Main(string[] args)
+        {
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
+            host.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string [] args) =>
+            new WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseStartup<Startup>()
+                .UseKestrel()
+                .UseIISIntegration();
+    }
+}
diff --git a/src/Mvc/test/WebSites/FilesWebSite/readme.md b/src/Mvc/test/WebSites/FilesWebSite/readme.md
new file mode 100644
index 0000000000..63d839fb36
--- /dev/null
+++ b/src/Mvc/test/WebSites/FilesWebSite/readme.md
@@ -0,0 +1,5 @@
+FilesWebSite
+===
+
+This web site illustrates how to use `FileContentResult` via `File` method on the controller. It also demonstrates
+how to write and register a custom `FileSender` middleware. 
diff --git a/src/Mvc/test/WebSites/FilesWebSite/sample.txt b/src/Mvc/test/WebSites/FilesWebSite/sample.txt
new file mode 100644
index 0000000000..0f8c58ac58
--- /dev/null
+++ b/src/Mvc/test/WebSites/FilesWebSite/sample.txt
@@ -0,0 +1 @@
+This is a sample text file
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Controllers/DataContractSerializerController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/DataContractSerializerController.cs
new file mode 100644
index 0000000000..0eaab3d11b
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/DataContractSerializerController.cs
@@ -0,0 +1,52 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Formatters;
+
+namespace FormatterWebSite
+{
+    /// <summary>
+    /// Summary description for DataContractSerializerController
+    /// </summary>
+    public class DataContractSerializerController : Controller
+    {
+        public override void OnActionExecuted(ActionExecutedContext context)
+        {
+            var result = context.Result as ObjectResult;
+            if (result != null)
+            {
+                result.Formatters.Add(new XmlSerializerOutputFormatter());
+                result.Formatters.Add(new XmlDataContractSerializerOutputFormatter());
+            }
+
+            base.OnActionExecuted(context);
+        }
+
+        [HttpPost]
+        public Person GetPerson(string name)
+        {
+            // The XmlSerializer should skip and the
+            // DataContractSerializer should pick up this output.
+            return new Person(name);
+        }
+
+        [HttpPost]
+        public Task<Person> GetTaskOfPerson(string name)
+        {
+            // The XmlSerializer should skip and the
+            // DataContractSerializer should pick up this output.
+            return Task.FromResult(new Person(name));
+        }
+
+        [HttpPost]
+        public Task<object> GetTaskOfPersonAsObject(string name)
+        {
+            // The XmlSerializer should skip and the
+            // DataContractSerializer should pick up this output.
+            return Task.FromResult<object>(new Person(name));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Controllers/DoNotRespectBrowserAcceptHeaderController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/DoNotRespectBrowserAcceptHeaderController.cs
new file mode 100644
index 0000000000..1684348e27
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/DoNotRespectBrowserAcceptHeaderController.cs
@@ -0,0 +1,49 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace FormatterWebSite.Controllers
+{
+    public class DoNotRespectBrowserAcceptHeaderController : Controller
+    {
+        [HttpGet]
+        public Employee EmployeeInfo()
+        {
+            return new Employee()
+            {
+                Id = 10,
+                Name = "John"
+            };
+        }
+
+        [HttpGet]
+        [Produces("application/xml")]
+        public Employee EmployeeInfoWithProduces()
+        {
+            return new Employee()
+            {
+                Id = 20,
+                Name = "Mike"
+            };
+        }
+
+        [HttpPost]
+        public IActionResult CreateEmployee([FromBody]Employee employee)
+        {
+            if(!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
+
+            return new ObjectResult(employee);
+        }
+
+        public class Employee
+        {
+            public int Id { get; set; }
+
+            public string Name { get; set; }
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Controllers/HomeController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/HomeController.cs
new file mode 100644
index 0000000000..8f46f63571
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/HomeController.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace FormatterWebSite.Controllers
+{
+    public class HomeController : Controller
+    {
+        [HttpPost]
+        public IActionResult Index([FromBody]DummyClass dummyObject)
+        {
+            return Content(dummyObject.SampleInt.ToString());
+        }
+
+        [HttpPost]
+        public DummyClass GetDummyClass(int sampleInput)
+        {
+            return new DummyClass { SampleInt = sampleInput };
+        }
+
+        [HttpPost]
+        public bool CheckIfDummyIsNull([FromBody] DummyClass dummy)
+        {
+            return dummy != null;
+        }
+
+        [HttpPost]
+        public DummyClass GetDerivedDummyClass(int sampleInput)
+        {
+            return new DerivedDummyClass
+            {
+                SampleInt = sampleInput,
+                SampleIntInDerived = 50
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Controllers/InputFormatterController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/InputFormatterController.cs
new file mode 100644
index 0000000000..8d81f010ca
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/InputFormatterController.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace FormatterWebSite.Controllers
+{
+    public class InputFormatterController : Controller
+    {
+        public IActionResult ReturnInput([FromBody] string test)
+        {
+            if (!ModelState.IsValid)
+            {
+                return new StatusCodeResult(StatusCodes.Status400BadRequest);
+            }
+
+            return Content(test);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs
new file mode 100644
index 0000000000..e8e3f58d7f
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs
@@ -0,0 +1,67 @@
+// 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.
+
+using System.Buffers;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Newtonsoft.Json;
+
+namespace FormatterWebSite.Controllers
+{
+    public class JsonFormatterController : Controller
+    {
+        private static readonly JsonSerializerSettings _indentedSettings;
+        private readonly JsonOutputFormatter _indentingFormatter;
+
+        static JsonFormatterController()
+        {
+            _indentedSettings = JsonSerializerSettingsProvider.CreateSerializerSettings();
+            _indentedSettings.Formatting = Formatting.Indented;
+        }
+
+        public JsonFormatterController(ArrayPool<char> charPool)
+        {
+            _indentingFormatter = new JsonOutputFormatter(_indentedSettings, charPool);
+        }
+
+        public IActionResult ReturnsIndentedJson()
+        {
+            var user = new User()
+            {
+                Id = 1,
+                Alias = "john",
+                description = "Administrator",
+                Designation = "Administrator",
+                Name = "John Williams"
+            };
+
+            var objectResult = new ObjectResult(user);
+            objectResult.Formatters.Add(_indentingFormatter);
+
+            return objectResult;
+        }
+
+        [HttpPost]
+        public IActionResult ReturnInput([FromBody]DummyClass dummyObject)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
+
+            return Content(dummyObject.SampleInt.ToString());
+        }
+
+        [HttpPost]
+        public IActionResult ValueTypeAsBody([FromBody] int value)
+        {
+            if (!ModelState.IsValid)
+            {
+                Response.StatusCode = StatusCodes.Status400BadRequest;
+            }
+
+            return Content(value.ToString());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Controllers/JsonPatchController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/JsonPatchController.cs
new file mode 100644
index 0000000000..634388bc25
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/JsonPatchController.cs
@@ -0,0 +1,51 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.JsonPatch;
+using Microsoft.AspNetCore.Mvc;
+
+namespace FormatterWebSite.Controllers
+{
+    [Route("jsonpatch/[action]")]
+    public class JsonPatchController : Controller
+    {
+        [HttpPatch]
+        public IActionResult PatchProduct([FromBody] JsonPatchDocument<Product> patchDoc)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
+
+            var product = CreateProduct();
+            patchDoc.ApplyTo(product, ModelState);
+
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
+
+            return Ok(product);
+        }
+
+        private Product CreateProduct()
+        {
+            return new Product
+            {
+                Name = "Book1",
+                Reviews = new List<Review>()
+                {
+                    new Review
+                    {
+                         Rating = 4
+                    },
+                    new Review
+                    {
+                        Rating = 3
+                    }
+                }
+            };
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Controllers/PolymorhpicPropertyBindingController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/PolymorhpicPropertyBindingController.cs
new file mode 100644
index 0000000000..27a2643cfc
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/PolymorhpicPropertyBindingController.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using FormatterWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+
+namespace FormatterWebSite.Controllers
+{
+    public class PolymorhpicPropertyBindingController : ControllerBase
+    {
+        [FromBody]
+        public IModel Person { get; set; }
+
+        [HttpPost]
+        public IActionResult Action()
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
+
+            return Ok(Person);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Controllers/PolymorphicBindingController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/PolymorphicBindingController.cs
new file mode 100644
index 0000000000..9358ec50d6
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/PolymorphicBindingController.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using FormatterWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+
+namespace FormatterWebSite.Controllers
+{
+    public class PolymorphicBindingController : ControllerBase
+    {
+        public IActionResult ModelBound([ModelBinder(typeof(PolymorphicBinder))] BaseModel person)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
+
+            return Ok(person);
+        }
+
+        [HttpPost]
+        public IActionResult InputFormatted([FromBody] IModel person)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
+
+            return Ok(person);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Controllers/RespectBrowserAcceptHeaderController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/RespectBrowserAcceptHeaderController.cs
new file mode 100644
index 0000000000..d5b95b30d4
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/RespectBrowserAcceptHeaderController.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace FormatterWebSite.Controllers
+{
+    public class RespectBrowserAcceptHeaderController : Controller
+    {
+        [HttpGet]
+        public string ReturnString()
+        {
+            return "Hello World!";
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Controllers/SerializableErrorController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/SerializableErrorController.cs
new file mode 100644
index 0000000000..d40115fb86
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/SerializableErrorController.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+
+namespace FormatterWebSite.Controllers
+{
+    public class SerializableErrorController : Controller
+    {
+        [HttpPost]
+        public IActionResult CreateEmployee([FromBody] Employee employee)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
+
+            return Content("Hello World!");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Controllers/StreamController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/StreamController.cs
new file mode 100644
index 0000000000..7856d5adfa
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/StreamController.cs
@@ -0,0 +1,60 @@
+// 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.
+
+using System.IO;
+using Microsoft.AspNetCore.Mvc;
+
+namespace FormatterWebSite
+{
+    public class StreamController : Controller
+    {
+        [HttpGet]
+        public Stream SimpleMemoryStream()
+        {
+            return CreateDefaultStream();
+        }
+
+        [HttpGet]
+        public Stream MemoryStreamWithContentType()
+        {
+            Response.ContentType = "text/html";
+            return CreateDefaultStream();
+        }
+
+        [HttpGet]
+        [Produces("text/plain")]
+        public Stream MemoryStreamWithContentTypeFromProduces()
+        {
+            return CreateDefaultStream();
+        }
+
+        [HttpGet]
+        [Produces("text/html", "text/plain")]
+        public Stream MemoryStreamWithContentTypeFromProducesWithMultipleValues()
+        {
+            return CreateDefaultStream();
+        }
+
+        [HttpGet]
+        [Produces("text/plain")]
+        public Stream MemoryStreamOverridesProducesContentTypeWithResponseContentType()
+        {
+            // Produces will set a ContentType on the implicit ObjectResult and
+            // ContentType on response are overriden by content types from ObjectResult.
+            Response.ContentType = "text/html";
+
+            return CreateDefaultStream();
+        }
+
+        private static Stream CreateDefaultStream()
+        {
+            var stream = new MemoryStream();
+            var writer = new StreamWriter(stream);
+            writer.Write("Sample text from a stream");
+            writer.Flush();
+            stream.Seek(0, SeekOrigin.Begin);
+
+            return stream;
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Controllers/TopLevelValidationController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/TopLevelValidationController.cs
new file mode 100644
index 0000000000..92b27adaf4
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/TopLevelValidationController.cs
@@ -0,0 +1,62 @@
+// 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.
+
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace FormatterWebSite.Controllers
+{
+    public class TopLevelValidationController : Controller
+    {
+        [BindProperty] public int OptionalProp { get; set; }
+        [BindProperty, Required] public int RequiredProp { get; set; }
+        [BindProperty, BindRequired] public int BindRequiredProp { get; set; }
+        [BindProperty, Required, BindRequired] public int RequiredAndBindRequiredProp { get; set; }
+        [BindProperty, StringLength(5)] public string OptionalStringLengthProp { get; set; }
+        [BindProperty, Range(1, 100), DisplayName("Some Display Name For Prop")] public int OptionalRangeDisplayNameProp { get; set; }
+
+        // Despite the Required/BindRequired attributes, these properties won't be validated
+        // because they aren't [BindProperty] properties (hence aren't involved in binding).
+        [Required] public int UnboundRequiredProp { get; set; }
+        [BindRequired] public int UnboundBindRequiredProp { get; set; }
+
+        // The [BindNever] overrides [BindProperty], meaning [Required] will not apply
+        // (nor will any incoming value be used)
+        [BindProperty, BindNever, Required] public string BindNeverRequiredProp { get; set; }
+
+        public IActionResult Index(
+            int optionalParam,
+            [Required] int requiredParam,
+            [BindRequired] int bindRequiredParam,
+            [Required, BindRequired] int requiredAndBindRequiredParam,
+            [StringLength(5)] string optionalStringLengthParam,
+            [Range(1, 100), Display(Name = "Some Display Name For Param")] int optionalRangeDisplayNameParam)
+        {
+            if (ModelState.IsValid)
+            {
+                return Content($@"
+                    [{ nameof(OptionalProp) }:{ OptionalProp }]
+                    [{ nameof(RequiredProp) }:{ RequiredProp }]
+                    [{ nameof(BindRequiredProp) }:{ BindRequiredProp }]
+                    [{ nameof(RequiredAndBindRequiredProp) }:{ RequiredAndBindRequiredProp }]
+                    [{ nameof(OptionalStringLengthProp) }:{ OptionalStringLengthProp }]
+                    [{ nameof(OptionalRangeDisplayNameProp) }:{ OptionalRangeDisplayNameProp }]
+                    [{ nameof(UnboundRequiredProp) }:{ UnboundRequiredProp }]
+                    [{ nameof(UnboundBindRequiredProp) }:{ UnboundBindRequiredProp }]
+                    [{ nameof(BindNeverRequiredProp) }:{ BindNeverRequiredProp }]
+                    [{ nameof(optionalParam) }:{ optionalParam }]
+                    [{ nameof(requiredParam) }:{ requiredParam }]
+                    [{ nameof(bindRequiredParam) }:{ bindRequiredParam }]
+                    [{ nameof(requiredAndBindRequiredParam) }:{ requiredAndBindRequiredParam }]
+                    [{ nameof(optionalStringLengthParam) }:{ optionalStringLengthParam }]
+                    [{ nameof(optionalRangeDisplayNameParam) }:{ optionalRangeDisplayNameParam }]");
+            }
+            else
+            {
+                return BadRequest(ModelState);
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Controllers/ValidationController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/ValidationController.cs
new file mode 100644
index 0000000000..efc2441c22
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/ValidationController.cs
@@ -0,0 +1,71 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+
+namespace FormatterWebSite
+{
+    public class ValidationController : Controller
+    {
+        [HttpPost]
+        public IActionResult Index([FromBody]User user)
+        {
+            if (!ModelState.IsValid)
+            {
+                return Content(ModelState["Id"].Errors[0].ErrorMessage + "," +
+                    ModelState["Name"].Errors[0].ErrorMessage + "," +
+                    ModelState["Alias"].Errors[0].ErrorMessage + "," +
+                    ModelState["Designation"].Errors[0].ErrorMessage);
+            }
+
+            return Content("User has been registered : " + user.Name);
+        }
+
+        [HttpPost]
+        public string GetDeveloperName([FromBody] Developer developer)
+        {
+            // Developer is excluded in startup, hence the value should never be passed.
+            if (ModelState.IsValid)
+            {
+                if (string.IsNullOrEmpty(developer.Name))
+                {
+                    return "No model validation for developer, even though developer.Name is empty.";
+                }
+
+                return developer.Name;
+            }
+            else
+            {
+                throw new InvalidOperationException();
+            }
+        }
+
+        [HttpPost]
+        public string GetDeveloperAlias(Developer developer)
+        {
+            if (ModelState.IsValid)
+            {
+                return developer.Alias;
+            }
+            else
+            {
+                return ModelState["Name"].Errors[0].ErrorMessage;
+            }
+        }
+
+        // 'Developer' type is excluded but the shallow validation on the
+        // property Developers should happen
+        [ModelStateValidationFilter]
+        public IActionResult CreateProject([FromBody] Project project)
+        {
+            return Json(project);
+        }
+
+        [ModelStateValidationFilter]
+        public IActionResult CreateSimpleTypePropertiesModel([FromBody] SimpleTypePropertiesModel simpleTypePropertiesModel)
+        {
+            return Json(simpleTypePropertiesModel);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Controllers/XmlSerializerController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/XmlSerializerController.cs
new file mode 100644
index 0000000000..0fffe773ee
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/XmlSerializerController.cs
@@ -0,0 +1,62 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Formatters;
+
+namespace FormatterWebSite
+{
+    public class XmlSerializerController : Controller
+    {
+        public override void OnActionExecuted(ActionExecutedContext context)
+        {
+            var result = context.Result as ObjectResult;
+            if (result != null)
+            {
+                result.Formatters.Add(new XmlSerializerOutputFormatter());
+            }
+
+            base.OnActionExecuted(context);
+        }
+
+        [HttpPost]
+        public DummyClass GetDummyClass(int sampleInput)
+        {
+            return new DummyClass { SampleInt = sampleInput };
+        }
+
+        [HttpPost]
+        public DummyClass GetDerivedDummyClass(int sampleInput)
+        {
+            return new DerivedDummyClass
+            {
+                SampleInt = sampleInput,
+                SampleIntInDerived = 50
+            };
+        }
+
+        [HttpPost]
+        public Dictionary<string, string> GetDictionary()
+        {
+            return new Dictionary<string, string>
+            {
+                { "Hello", "World" }
+            };
+        }
+
+        [HttpPost]
+        public Task<DummyClass> GetTaskOfDummyClass()
+        {
+            return Task.FromResult(new DummyClass { SampleInt = 10 });
+        }
+
+        [HttpPost]
+        public Task<object> GetTaskOfDummyClassAsObject()
+        {
+            return Task.FromResult<object>(new DummyClass { SampleInt = 10 });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Filters/ModelStateValidationFilterAttribute.cs b/src/Mvc/test/WebSites/FormatterWebSite/Filters/ModelStateValidationFilterAttribute.cs
new file mode 100644
index 0000000000..12f5ec0fcb
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Filters/ModelStateValidationFilterAttribute.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace FormatterWebSite
+{
+    public class ModelStateValidationFilterAttribute : ActionFilterAttribute
+    {
+        public override void OnActionExecuting(ActionExecutingContext context)
+        {
+            if (!context.ModelState.IsValid)
+            {
+                context.Result = new BadRequestObjectResult(context.ModelState);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj b/src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj
new file mode 100644
index 0000000000..239ce99f78
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc.Formatters.Xml\Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/IModelConverter.cs b/src/Mvc/test/WebSites/FormatterWebSite/IModelConverter.cs
new file mode 100644
index 0000000000..1ce4131f17
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/IModelConverter.cs
@@ -0,0 +1,30 @@
+// 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.
+
+using System;
+using FormatterWebSite.Models;
+using Newtonsoft.Json;
+
+namespace FormatterWebSite
+{
+    public class IModelConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            return objectType == typeof(IModel);
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            return new DerivedModel
+            {
+                DerivedProperty = reader.Value.ToString(),
+            };
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Models/BaseModel.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/BaseModel.cs
new file mode 100644
index 0000000000..b7b6567b1e
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Models/BaseModel.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace FormatterWebSite.Models
+{
+    public class BaseModel
+    {
+        public string BaseProperty { get; set; }
+    }
+}
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Models/DerivedDummyClass.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/DerivedDummyClass.cs
new file mode 100644
index 0000000000..278056afdf
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Models/DerivedDummyClass.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace FormatterWebSite
+{
+    public class DerivedDummyClass : DummyClass
+    {
+        public int SampleIntInDerived { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Models/DerivedModel.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/DerivedModel.cs
new file mode 100644
index 0000000000..2b10ac357a
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Models/DerivedModel.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace FormatterWebSite.Models
+{
+    public class DerivedModel : BaseModel, IModel
+    {
+        [Required]
+        [StringLength(10)]
+        public string DerivedProperty { get; set; }
+    }
+}
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Models/Developer.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/Developer.cs
new file mode 100644
index 0000000000..4b7195f8cb
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Models/Developer.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace FormatterWebSite
+{
+    public class Developer
+    {
+        [Required]
+        public string Name { get; set; }
+
+        public string Alias { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Models/DummyClass.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/DummyClass.cs
new file mode 100644
index 0000000000..6d052682e2
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Models/DummyClass.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using System.Runtime.Serialization;
+using System.Xml.Serialization;
+
+namespace FormatterWebSite
+{
+    [KnownType(typeof(DerivedDummyClass))]
+    [XmlInclude(typeof(DerivedDummyClass))]
+    public class DummyClass
+    {
+        public int SampleInt { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Models/Employee.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/Employee.cs
new file mode 100644
index 0000000000..99c1ca8ef1
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Models/Employee.cs
@@ -0,0 +1,17 @@
+// 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.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace FormatterWebSite
+{
+    public class Employee
+    {
+        [Range(10, 100)]
+        public int Id { get; set; }
+
+        [MinLength(15)]
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Models/ErrorInfo.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/ErrorInfo.cs
new file mode 100644
index 0000000000..c14c6d4980
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Models/ErrorInfo.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace FormatterWebSite
+{
+    public class ErrorInfo
+    {
+        public string Source { get; set; }
+
+        public string ActionName { get; set; }
+
+        public string ParameterName { get; set; }
+
+        public List<string> Errors { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Models/IModel.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/IModel.cs
new file mode 100644
index 0000000000..ce6e4b6d9b
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Models/IModel.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace FormatterWebSite.Models
+{
+    public interface IModel
+    {
+    }
+}
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Models/Person.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/Person.cs
new file mode 100644
index 0000000000..d84da1c2c7
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Models/Person.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using System.Runtime.Serialization;
+
+namespace FormatterWebSite
+{
+    [DataContract]
+    public class Person
+    {
+        public Person(string name)
+        {
+            Name = name;
+        }
+
+        [DataMember]
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Models/Product.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/Product.cs
new file mode 100644
index 0000000000..ed14c8f0f8
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Models/Product.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using System.Collections.Generic;
+
+namespace FormatterWebSite
+{
+    public class Product
+    {
+        public string Name { get; set; }
+
+        public List<Review> Reviews { get; set; } = new List<Review>();
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Models/Project.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/Project.cs
new file mode 100644
index 0000000000..d3e53f0d17
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Models/Project.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace FormatterWebSite
+{
+    public class Project
+    {
+        public int Id { get; set; }
+
+        public string Name { get; set; }
+
+        [MinLength(2)]
+        [MaxLength(5)]
+        public Supplier[] Suppliers { get; set; }
+    }
+
+    public class Supplier
+    {
+        public int Id { get; set; }
+
+        [MaxLength(5)]
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Models/Review.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/Review.cs
new file mode 100644
index 0000000000..dc8ad30271
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Models/Review.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace FormatterWebSite
+{
+    public class Review
+    {
+        public double Rating { get; set; }
+
+        public string Description { get; set; }
+    }
+}
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Models/SimpleTypePropertiesModel.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/SimpleTypePropertiesModel.cs
new file mode 100644
index 0000000000..878e465186
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Models/SimpleTypePropertiesModel.cs
@@ -0,0 +1,18 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace FormatterWebSite
+{
+    public class SimpleTypePropertiesModel
+    {
+        [Range(2, 8)]
+        public byte ByteProperty { get; set; }
+
+        [Range(2, 8)]
+        public byte? NullableByteProperty { get; set; }
+
+        [MinLength(2)]
+        public byte[] ByteArrayProperty { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Models/User.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/User.cs
new file mode 100644
index 0000000000..80952139f0
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Models/User.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+using System.Runtime.Serialization;
+
+namespace FormatterWebSite
+{
+    [DataContract]
+    public class User
+    {
+        [DataMember(IsRequired = true)]
+        [Required, Range(1, 2000)]
+        public int Id { get; set; }
+
+        [DataMember(IsRequired = true)]
+        [Required, MinLength(5)]
+        public string Name { get; set; }
+
+        [DataMember]
+        [StringLength(15, MinimumLength = 3)]
+        public string Alias { get; set; }
+
+        [DataMember]
+        [RegularExpression("[0-9a-zA-Z]*")]
+        public string Designation { get; set; }
+
+        [DataMember]
+        public string description { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/PolymorphicBinder.cs b/src/Mvc/test/WebSites/FormatterWebSite/PolymorphicBinder.cs
new file mode 100644
index 0000000000..e7eefb71c2
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/PolymorphicBinder.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using System.Threading.Tasks;
+using FormatterWebSite.Models;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace FormatterWebSite.Controllers
+{
+    public class PolymorphicBinder : IModelBinder
+    {
+        public Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            var model = new DerivedModel
+            {
+                DerivedProperty = bindingContext.ValueProvider.GetValue(nameof(DerivedModel.DerivedProperty)).FirstValue,
+            };
+
+            bindingContext.Result = ModelBindingResult.Success(model);
+
+            return Task.CompletedTask;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Program.cs b/src/Mvc/test/WebSites/FormatterWebSite/Program.cs
new file mode 100644
index 0000000000..16c54a70dc
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Program.cs
@@ -0,0 +1,26 @@
+// 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.
+
+using System.IO;
+using Microsoft.AspNetCore.Hosting;
+
+namespace FormatterWebSite
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
+            host.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            new WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseStartup<Startup>()
+                .UseKestrel()
+                .UseIISIntegration();
+    }
+}
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Startup.cs b/src/Mvc/test/WebSites/FormatterWebSite/Startup.cs
new file mode 100644
index 0000000000..ee2744a028
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Startup.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace FormatterWebSite
+{
+    public class Startup
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddMvc(options =>
+            {
+                options.ModelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider(typeof(Developer)));
+                options.ModelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider(typeof(Supplier)));
+
+                options.InputFormatters.Add(new StringInputFormatter());
+            })
+            .AddXmlDataContractSerializerFormatters();
+
+            services.Configure<MvcJsonOptions>(options => { options.SerializerSettings.Converters.Insert(0, new IModelConverter()); });
+        }
+
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute("ActionAsMethod", "{controller}/{action}",
+                    defaults: new { controller = "Home", action = "Index" });
+            });
+        }
+    }
+}
+
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/StartupWithRespectBrowserAcceptHeader.cs b/src/Mvc/test/WebSites/FormatterWebSite/StartupWithRespectBrowserAcceptHeader.cs
new file mode 100644
index 0000000000..839e60b1c7
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/StartupWithRespectBrowserAcceptHeader.cs
@@ -0,0 +1,29 @@
+// 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.
+
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace FormatterWebSite
+{
+    public class StartupWithRespectBrowserAcceptHeader
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddMvc(options =>
+            {
+                options.RespectBrowserAcceptHeader = true;
+            });
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute("ActionAsMethod", "{controller}/{action}",
+                    defaults: new { controller = "Home", action = "Index" });
+            });
+        }
+    }
+}
+
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/StringInputFormatter.cs b/src/Mvc/test/WebSites/FormatterWebSite/StringInputFormatter.cs
new file mode 100644
index 0000000000..dc80e3dc62
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/StringInputFormatter.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.Net.Http.Headers;
+
+namespace FormatterWebSite
+{
+    public class StringInputFormatter : TextInputFormatter
+    {
+        public StringInputFormatter()
+        {
+            SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("text/plain"));
+
+            SupportedEncodings.Add(Encoding.UTF8);
+            SupportedEncodings.Add(Encoding.Unicode);
+        }
+
+        public override Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterContext context, Encoding effectiveEncoding)
+        {
+            var request = context.HttpContext.Request;
+            using (var reader = new StreamReader(request.Body, effectiveEncoding))
+            {
+                var stringContent = reader.ReadToEnd();
+                return InputFormatterResult.SuccessAsync(stringContent);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/ValidateBodyParameterAttribute.cs b/src/Mvc/test/WebSites/FormatterWebSite/ValidateBodyParameterAttribute.cs
new file mode 100644
index 0000000000..0be7c1fc33
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/ValidateBodyParameterAttribute.cs
@@ -0,0 +1,50 @@
+// 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.
+
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace FormatterWebSite
+{
+    public class ValidateBodyParameterAttribute : ActionFilterAttribute
+    {
+        public override void OnActionExecuting(ActionExecutingContext context)
+        {
+            if (!context.ModelState.IsValid)
+            {
+                var bodyParameter = context.ActionDescriptor
+                                          .Parameters
+                                          .FirstOrDefault(parameter => IsBodyBindingSource(
+                                              parameter.BindingInfo?.BindingSource));
+                if (bodyParameter != null)
+                {
+                    // Body model binder normally reports errors for parameters using the empty name.
+                    var parameterBindingErrors = context.ModelState[bodyParameter.Name]?.Errors ??
+                        context.ModelState[string.Empty]?.Errors;
+                    if (parameterBindingErrors != null && parameterBindingErrors.Count != 0)
+                    {
+                        var errorInfo = new ErrorInfo
+                        {
+                            ActionName = ((ControllerActionDescriptor)context.ActionDescriptor).ActionName,
+                            ParameterName = bodyParameter.Name,
+                            Errors = parameterBindingErrors.Select(x => x.ErrorMessage).ToList(),
+                            Source = "filter"
+                        };
+
+                        context.Result = new ObjectResult(errorInfo);
+                    }
+                }
+            }
+
+            base.OnActionExecuting(context);
+        }
+
+        private bool IsBodyBindingSource(BindingSource bindingSource)
+        {
+            return bindingSource?.CanAcceptDataFrom(BindingSource.Body) ?? false;
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/readme.md b/src/Mvc/test/WebSites/FormatterWebSite/readme.md
new file mode 100644
index 0000000000..308c07ee16
--- /dev/null
+++ b/src/Mvc/test/WebSites/FormatterWebSite/readme.md
@@ -0,0 +1,5 @@
+FormatterWebSite
+===
+
+This web site illustrates how to input formatters operate on the request body. It also demonstrates
+how custom options can be set for model validation.
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Controllers/HtmlGeneration_CustomerController.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Controllers/HtmlGeneration_CustomerController.cs
new file mode 100644
index 0000000000..1d72588f2f
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Controllers/HtmlGeneration_CustomerController.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace HtmlGenerationWebSite.Areas.Customer.Controllers
+{
+    [Area("Customer")]
+    public class HtmlGeneration_CustomerController : Controller
+    {
+        public IActionResult Index(Models.Customer customer)
+        {
+            return View("Customer");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Components/CheckViewData - LackModel.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Components/CheckViewData - LackModel.cs
new file mode 100644
index 0000000000..b7e4668c5b
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Components/CheckViewData - LackModel.cs	
@@ -0,0 +1,42 @@
+// 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.
+
+using HtmlGenerationWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+
+namespace HtmlGenerationWebSite.Components
+{
+    public class CheckViewData___LackModel : ViewComponent
+    {
+        public IViewComponentResult Invoke()
+        {
+            var metadata = ViewData.ModelMetadata;
+            var writer = ViewContext.Writer;
+            writer.WriteLine("<h5>Check View Data - LackModel view component</h5>");
+            writer.WriteLine($"<div class=\"col-md-3\">MetadataKind: '{ metadata.MetadataKind }'</div>");
+            writer.WriteLine($"<div class=\"col-md-3\">ModelType: '{ metadata.ModelType.Name }'</div>");
+            if (metadata.MetadataKind == ModelMetadataKind.Property)
+            {
+                writer.WriteLine($"<div class=\"col-md-3\">PropertyName: '{ metadata.PropertyName }'</div>");
+            }
+
+            // Confirm view component is able to set the model to anything.
+            ViewData.Model = 78.9;
+
+            // Expected metadata is for typeof(object).
+            metadata = ViewData.ModelMetadata;
+            writer.WriteLine("<h5>Check View Data - LackModel view component after setting Model to 78.9</h5>");
+            writer.WriteLine($"<div class=\"col-md-3\">MetadataKind: '{ metadata.MetadataKind }'</div>");
+            writer.WriteLine($"<div class=\"col-md-3\">ModelType: '{ metadata.ModelType.Name }'</div>");
+            if (metadata.MetadataKind == ModelMetadataKind.Property)
+            {
+                writer.WriteLine($"<div class=\"col-md-3\">PropertyName: '{ metadata.PropertyName }'</div>");
+            }
+
+            TemplateModel templateModel = new SuperTemplateModel();
+
+            return View(templateModel);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Components/CheckViewData.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Components/CheckViewData.cs
new file mode 100644
index 0000000000..038d900db5
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Components/CheckViewData.cs
@@ -0,0 +1,26 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+
+namespace HtmlGenerationWebSite.Components
+{
+    public class CheckViewData : ViewComponent
+    {
+        public IViewComponentResult Invoke()
+        {
+            var metadata = ViewData.ModelMetadata;
+            var writer = ViewContext.Writer;
+            writer.WriteLine("<h5>Check View Data view component</h5>");
+            writer.WriteLine($"<div class=\"col-md-3\">MetadataKind: '{ metadata.MetadataKind }'</div>");
+            writer.WriteLine($"<div class=\"col-md-3\">ModelType: '{ metadata.ModelType.Name }'</div>");
+            if (metadata.MetadataKind == ModelMetadataKind.Property)
+            {
+                writer.WriteLine($"<div class=\"col-md-3\">PropertyName: '{ metadata.PropertyName }'</div>");
+            }
+
+            return View();
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Components/SplashViewComponent.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Components/SplashViewComponent.cs
new file mode 100644
index 0000000000..2edc2c7b6f
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Components/SplashViewComponent.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace MvcSample.Web.Components
+{
+    public class SplashViewComponent : ViewComponent
+    {
+        public IViewComponentResult Invoke()
+        {
+            var region = (string)ViewData["Locale"];
+            var model = region == "North" ? "NorthWest Store":
+                                            "Nationwide Store";
+
+            return View(model: model);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/Catalog_CacheTagHelperController.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/Catalog_CacheTagHelperController.cs
new file mode 100644
index 0000000000..d72098f43f
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/Catalog_CacheTagHelperController.cs
@@ -0,0 +1,94 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Security.Claims;
+using HtmlGenerationWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+
+namespace HtmlGenerationWebSite.Controllers
+{
+    public class Catalog_CacheTagHelperController : Controller
+    {
+        [HttpGet("/catalog")]
+        public IActionResult Splash(int categoryId, int correlationId, [FromHeader] string locale)
+        {
+            var category = categoryId == 1 ? "Laptops" : "Phones";
+            ViewData["Category"] = category;
+            ViewData["Locale"] = locale;
+            ViewData["CorrelationId"] = correlationId;
+
+            return View();
+        }
+
+        [HttpGet("/catalog/{id:int}")]
+        public IActionResult Details(int id)
+        {
+            ViewData["ProductId"] = id;
+            return View();
+        }
+
+        [HttpGet("/catalog/cart")]
+        public IActionResult ShoppingCart(int correlationId)
+        {
+            ViewData["CorrelationId"] = correlationId;
+            return View();
+        }
+
+        [HttpGet("/catalog/{region}/confirm-payment")]
+        public IActionResult GuestConfirmPayment(string region, int confirmationId = 0)
+        {
+            ViewData["Message"] = "Welcome Guest. Your confirmation id is " + confirmationId;
+            ViewData["Region"] = region;
+            return View("ConfirmPayment");
+        }
+
+        [HttpGet("/catalog/{region}/{section}/confirm-payment")]
+        public IActionResult ConfirmPayment(string region, string section, int confirmationId)
+        {
+            var message = "Welcome " + section + " member. Your confirmation id is " + confirmationId;
+            ViewData["Message"] = message;
+            ViewData["Region"] = region;
+
+            return View();
+        }
+
+        [HttpGet("/catalog/past-purchases/{id}")]
+        public IActionResult PastPurchases(string id, int correlationId)
+        {
+            var identity = new ClaimsIdentity();
+            identity.AddClaim(new Claim(ClaimsIdentity.DefaultNameClaimType, id));
+
+            HttpContext.User = new ClaimsPrincipal(identity);
+            ViewData["CorrelationId"] = correlationId;
+            return View();
+        }
+
+        [HttpGet("/categories/{category}")]
+        public IActionResult ListCategories(string category, int correlationId)
+        {
+            ViewData["Category"] = category;
+            ViewData["CorrelationId"] = correlationId;
+
+            return View();
+        }
+
+        [HttpPost("/categories/{category}")]
+        public IActionResult UpdateProducts(
+            [FromServices] ProductsService productService,
+            string category,
+            [FromBody] List<Product> products)
+        {
+            productService.UpdateProducts(category, products);
+            return Ok();
+        }
+
+        [HttpGet("/catalog/GetDealPercentage/{dealPercentage}")]
+        public IActionResult Deals(int dealPercentage, bool isEnabled)
+        {
+            ViewBag.ProductDealPercentage = dealPercentage;
+            ViewBag.IsEnabled = isEnabled;
+            return View();
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/CheckViewData.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/CheckViewData.cs
new file mode 100644
index 0000000000..ade765425d
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/CheckViewData.cs
@@ -0,0 +1,26 @@
+// 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.
+
+using HtmlGenerationWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+
+namespace HtmlGenerationWebSite.Controllers
+{
+    public class CheckViewData : Controller
+    {
+        public IActionResult AtViewModel()
+        {
+            return View(new SuperViewModel());
+        }
+
+        public IActionResult NullViewModel()
+        {
+            return View("AtViewModel");
+        }
+
+        public IActionResult ViewModel()
+        {
+            return View(new SuperViewModel());
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_HomeController.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_HomeController.cs
new file mode 100644
index 0000000000..27dd20482f
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_HomeController.cs
@@ -0,0 +1,247 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using HtmlGenerationWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace HtmlGenerationWebSite.Controllers
+{
+    public class HtmlGeneration_HomeController : Controller
+    {
+        private readonly List<Product> _products = new List<Product>
+        {
+            new Product
+            {
+                ProductName = "Product_0",
+                Number = 0,
+                HomePage = new Uri("http://www.contoso.com")
+            },
+            new Product
+            {
+                ProductName = "Product_1",
+                Number = 1,
+            },
+            new Product
+            {
+                ProductName = "Product_2",
+                Number = 2,
+                Description = "Product_2 description"
+            },
+        };
+        private readonly IEnumerable<SelectListItem> _productsList;
+        private readonly IEnumerable<SelectListItem> _productsListWithSelection;
+        private readonly Order _order = new Order
+        {
+            Shipping = "UPSP",
+            Customer = new Customer
+            {
+                Key = "KeyA",
+                Number = 1,
+                Gender = Gender.Female,
+                Name = "NameStringValue",
+            },
+            NeedSpecialHandle = true,
+            PaymentMethod = new List<string> { "Check" },
+            Products = new List<int> { 0, 1 },
+        };
+
+        public HtmlGeneration_HomeController()
+        {
+            _productsList = new SelectList(_products, "Number", "ProductName");
+            _productsListWithSelection = new SelectList(_products, "Number", "ProductName", 2);
+            foreach (var i in _order.Products)
+            {
+                _order.ProductDetails.Add(_products[i]);
+            }
+        }
+
+        public IActionResult Enum()
+        {
+            return View(new AClass { DayOfWeek = Models.DayOfWeek.Friday, Month = Month.FirstOne });
+        }
+
+        public IActionResult Order()
+        {
+            ViewData["Items"] = _productsListWithSelection;
+
+            return View(_order);
+        }
+
+        public IActionResult OrderUsingHtmlHelpers()
+        {
+            ViewData["Items"] = _productsListWithSelection;
+
+            return View(_order);
+        }
+
+        public IActionResult Product()
+        {
+            var product = new Product
+            {
+                HomePage = new System.Uri("http://www.contoso.com"),
+                Description = "Type the product description"
+            };
+
+            return View(product);
+        }
+
+        public IActionResult ProductSubmit(Product product)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IActionResult Customer()
+        {
+            return View();
+        }
+
+        public IActionResult Index()
+        {
+            return View();
+        }
+
+        public IActionResult ProductList()
+        {
+            return View(_products);
+        }
+
+        public IActionResult ProductListUsingTagHelpers() => View(_products);
+
+        public IActionResult ProductListUsingTagHelpersWithNullModel()
+        {
+            var model = new List<Product>
+            {
+                null,
+            };
+
+            return View(nameof(ProductListUsingTagHelpers), model);
+        }
+
+        public IActionResult EmployeeList()
+        {
+            var employees = new List<Employee>
+            {
+                new Employee
+                {
+                    Name = "EmployeeName_0",
+                    Number = 0,
+                    Address = "Employee_0 address"
+                },
+                new Employee
+                {
+                    Name = "EmployeeName_1",
+                    Number = 1,
+                    OfficeNumber = "1002",
+                    Gender = Gender.Female
+                },
+                new Employee
+                {
+                    Name = "EmployeeName_2",
+                    Number = 2,
+                    Remote = true
+                },
+            };
+
+            // Extra data that should be ignored / not used within a template.
+            ViewData[nameof(Employee.Gender)] = "Gender value that will not match.";
+            ViewData[nameof(Employee.Name)] = "Name value that should not be seen.";
+
+            return View(employees);
+        }
+
+        public IActionResult CreateWarehouse()
+        {
+            ViewData["Items"] = _productsList;
+
+            return View();
+        }
+
+        public IActionResult EditWarehouse()
+        {
+            var warehouse = new Warehouse
+            {
+                City = "City_1",
+                Employee = new Employee
+                {
+                    Name = "EmployeeName_1",
+                    Number = 1,
+                    Address = "Address_1",
+                    PhoneNumber = "PhoneNumber_1",
+                    Gender = Gender.Female
+                }
+            };
+
+            return View(warehouse);
+        }
+
+        public IActionResult Warehouse()
+        {
+            var warehouse = new Warehouse
+            {
+                City = "City_1",
+                Employee = new Employee
+                {
+                    Name = "EmployeeName_1",
+                    OfficeNumber = "Number_1",
+                    Address = "Address_1",
+                }
+            };
+
+            return View(warehouse);
+        }
+
+        public IActionResult Environment()
+        {
+            return View();
+        }
+
+        public IActionResult Link()
+        {
+            return View();
+        }
+
+        public IActionResult Image()
+        {
+            return View();
+        }
+
+        public IActionResult Script()
+        {
+            return View();
+        }
+
+        public IActionResult Form()
+        {
+            return View();
+        }
+
+        public IActionResult Input()
+        {
+            return View();
+        }
+
+        public IActionResult ItemUsingSharedEditorTemplate()
+        {
+            return View();
+        }
+
+        public IActionResult ItemUsingModelSpecificEditorTemplate()
+        {
+            return View();
+        }
+
+        public IActionResult AttributesWithBooleanValues()
+        {
+            return View();
+        }
+
+        public IActionResult PartialTagHelperWithoutModel() => View();
+
+        public IActionResult StatusMessage() => View(new StatusMessageModel { Message = "Some status message"});
+
+        public IActionResult NullStatusMessage() => View("StatusMessage", new StatusMessageModel());
+    }
+}
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_OrderController.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_OrderController.cs
new file mode 100644
index 0000000000..0862ee8c81
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_OrderController.cs
@@ -0,0 +1,17 @@
+// 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.
+
+using System;
+using HtmlGenerationWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+
+namespace HtmlGenerationWebSite.Controllers
+{
+    public class HtmlGeneration_OrderController : Controller
+    {
+        public IActionResult Submit(Order order)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_ProductController.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_ProductController.cs
new file mode 100644
index 0000000000..8c5751e4e3
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_ProductController.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using System;
+using HtmlGenerationWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+
+namespace HtmlGenerationWebSite.Controllers
+{
+    public class HtmlGeneration_ProductController : Controller
+    {
+        public IActionResult Index()
+        {
+            throw new NotImplementedException();
+        }
+
+        public IActionResult Submit(Product product)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IActionResult List()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_WeirdExpressions.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_WeirdExpressions.cs
new file mode 100644
index 0000000000..7281b6cce1
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_WeirdExpressions.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using System;
+using HtmlGenerationWebSite.Models;
+using Microsoft.AspNetCore.Mvc;
+
+namespace HtmlGenerationWebSite.Controllers
+{
+    public class HtmlGeneration_WeirdExpressionsController : Controller
+    {
+        public IActionResult GetWeirdWithHtmlHelpers()
+        {
+            return View(new WeirdModel());
+        }
+
+        public IActionResult GetWeirdWithTagHelpers()
+        {
+            return View(new WeirdModel());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj b/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj
new file mode 100644
index 0000000000..cfda2f9c35
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/ISignalTokenProviderService.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/ISignalTokenProviderService.cs
new file mode 100644
index 0000000000..370bc89ca0
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/ISignalTokenProviderService.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using Microsoft.Extensions.Primitives;
+
+namespace HtmlGenerationWebSite
+{
+    public interface ISignalTokenProviderService<TKey>
+    {
+        IChangeToken GetToken(object key);
+
+        void SignalToken(object key);
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/AClass.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/AClass.cs
new file mode 100644
index 0000000000..23d3035488
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/AClass.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace HtmlGenerationWebSite.Models
+{
+    public class AClass
+    {
+        public DayOfWeek DayOfWeek { get; set; }
+        [DisplayFormat(DataFormatString = "Month: {0}")]
+        public Month Month { get; set; }
+    }
+}
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Customer.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Customer.cs
new file mode 100644
index 0000000000..202611dfb8
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Customer.cs
@@ -0,0 +1,14 @@
+// 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.
+
+namespace HtmlGenerationWebSite.Models
+{
+    public class Customer : Person
+    {
+        public string Key
+        {
+            get;
+            set;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/DayOfWeek.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/DayOfWeek.cs
new file mode 100644
index 0000000000..059df041de
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/DayOfWeek.cs
@@ -0,0 +1,16 @@
+// 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.
+
+namespace HtmlGenerationWebSite.Models
+{
+    public enum DayOfWeek
+    {
+        Monday,
+        Tuesday,
+        Wednesday,
+        Thursday,
+        Friday,
+        Saturday,
+        Sunday
+    }
+}
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Employee.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Employee.cs
new file mode 100644
index 0000000000..cb9a0e4078
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Employee.cs
@@ -0,0 +1,26 @@
+// 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.
+
+namespace HtmlGenerationWebSite.Models
+{
+    public class Employee : Person
+    {
+        public string Address
+        {
+            get;
+            set;
+        }
+
+        public string OfficeNumber
+        {
+            get;
+            set;
+        }
+
+        public bool Remote
+        {
+            get;
+            set;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Folder.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Folder.cs
new file mode 100644
index 0000000000..73e14df392
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Folder.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
+
+namespace HtmlGenerationWebSite.Models
+{
+    public class Folder
+    {
+        public IFormFile InterfaceFile { get; set; }
+
+        public IFormFileCollection InterfaceFiles { get; set; }
+
+        public FormFile ConcreteFile { get; set; }
+
+        public FormFileCollection ConcreteFiles { get; set; }
+
+        public IEnumerable<IFormFile> EnumerableFiles { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Gender.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Gender.cs
new file mode 100644
index 0000000000..b6d83253a4
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Gender.cs
@@ -0,0 +1,11 @@
+// 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.
+
+namespace HtmlGenerationWebSite.Models
+{
+    public enum Gender
+    {
+        Male,
+        Female
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Item.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Item.cs
new file mode 100644
index 0000000000..60de1684c2
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Item.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace HtmlGenerationWebSite.Models
+{
+    public class Item
+    {
+        [UIHint("Common")]
+        [Display(Name = "ItemName")]
+        public string Name { get; set; }
+
+        [UIHint("Common")]
+        [Display(Name = "ItemNo")]
+        public int Id { get; set; }
+
+        [Display(Name = "ItemDesc")]
+        public string Description { get; set; }
+    }
+}
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Month.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Month.cs
new file mode 100644
index 0000000000..23b936a533
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Month.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace HtmlGenerationWebSite.Models
+{
+    public enum Month
+    {
+        [Display(Name = "January")]
+        FirstOne,
+        LastOne
+    }
+}
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Order.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Order.cs
new file mode 100644
index 0000000000..7110fde81a
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Order.cs
@@ -0,0 +1,61 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace HtmlGenerationWebSite.Models
+{
+    public class Order
+    {
+        public bool NeedSpecialHandle
+        {
+            get;
+            set;
+        }
+
+        public DateTimeOffset OrderDate
+        {
+            get;
+            set;
+        }
+
+        public ICollection<string> PaymentMethod
+        {
+            get;
+            set;
+        }
+
+        public DateTime ShippingDateTime
+        {
+            get;
+            set;
+        }
+
+        public string Shipping
+        {
+            get;
+            set;
+        }
+
+        public IEnumerable<int> Products
+        {
+            get;
+            set;
+        }
+
+        public IEnumerable<int> SubstituteProducts
+        {
+            get;
+            set;
+        }
+
+        public Customer Customer
+        {
+            get;
+            set;
+        }
+
+        public IList<Product> ProductDetails { get; } = new List<Product>();
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/PartialModel.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/PartialModel.cs
new file mode 100644
index 0000000000..5cb34225cd
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/PartialModel.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace HtmlGenerationWebSite.Models
+{
+    public class PartialModel
+    {
+    }
+}
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Person.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Person.cs
new file mode 100644
index 0000000000..d53521c306
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Person.cs
@@ -0,0 +1,53 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc;
+
+namespace HtmlGenerationWebSite.Models
+{
+    public class Person
+    {
+        [HiddenInput(DisplayValue = false)]
+        [Range(1, 100)]
+        public int Number
+        {
+            get;
+            set;
+        }
+
+        public string Name
+        {
+            get;
+            set;
+        }
+
+        [Required]
+        public string Password
+        {
+            get;
+            set;
+        }
+
+        [EnumDataType(typeof(Gender))]
+        [UIHint("GenderUsingTagHelpers")]
+        public Gender Gender
+        {
+            get;
+            set;
+        }
+
+        public string PhoneNumber
+        {
+            get;
+            set;
+        }
+
+        [DataType(DataType.EmailAddress)]
+        public string Email
+        {
+            get;
+            set;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Product.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Product.cs
new file mode 100644
index 0000000000..9a70476b33
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Product.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace HtmlGenerationWebSite.Models
+{
+    public class Product
+    {
+        [Required]
+        public string ProductName
+        {
+            get;
+            set;
+        }
+
+        public int Number
+        {
+            get;
+            set;
+        }
+
+        public string Description
+        {
+            get;
+            set;
+        }
+
+        public Uri HomePage
+        {
+            get;
+            set;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/ProductRecommendations.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/ProductRecommendations.cs
new file mode 100644
index 0000000000..648a541751
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/ProductRecommendations.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+
+namespace HtmlGenerationWebSite.Models
+{
+    public class ProductRecommendations
+    {
+        public ProductRecommendations(params Product[] products)
+        {
+            if (products == null)
+            {
+                throw new ArgumentNullException(nameof(products));
+            }
+
+            Products = products;
+        }
+
+        public IEnumerable<Product> Products { get; }
+    }
+}
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/StatusMessageModel.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/StatusMessageModel.cs
new file mode 100644
index 0000000000..62161e05cc
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/StatusMessageModel.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace HtmlGenerationWebSite.Models
+{
+    public class StatusMessageModel
+    {
+        public string Message { get; set; }
+    }
+}
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/SuperTemplateModel.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/SuperTemplateModel.cs
new file mode 100644
index 0000000000..e599bddc03
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/SuperTemplateModel.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace HtmlGenerationWebSite.Models
+{
+    public class SuperTemplateModel : TemplateModel
+    {
+    }
+}
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/SuperViewModel.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/SuperViewModel.cs
new file mode 100644
index 0000000000..540cda73d5
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/SuperViewModel.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace HtmlGenerationWebSite.Models
+{
+    public class SuperViewModel : ViewModel
+    {
+    }
+}
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/TemplateModel.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/TemplateModel.cs
new file mode 100644
index 0000000000..f2e5f9f530
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/TemplateModel.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace HtmlGenerationWebSite.Models
+{
+    public class TemplateModel
+    {
+    }
+}
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/ViewModel.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/ViewModel.cs
new file mode 100644
index 0000000000..564502b91d
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/ViewModel.cs
@@ -0,0 +1,14 @@
+// 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.
+
+namespace HtmlGenerationWebSite.Models
+{
+    public class ViewModel
+    {
+        public int Integer { get; set; } = 23;
+
+        public long? NullableLong { get; set; } = 24L;
+
+        public TemplateModel Template { get; set; } = new SuperTemplateModel();
+    }
+}
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Warehouse.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Warehouse.cs
new file mode 100644
index 0000000000..fa8bd6b02d
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Warehouse.cs
@@ -0,0 +1,30 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace HtmlGenerationWebSite.Models
+{
+    public class Warehouse
+    {
+        [MinLength(2)]
+        public string City
+        {
+            get;
+            set;
+        }
+
+        [Range(1, 100)]
+        public int Product
+        {
+            get;
+            set;
+        }
+
+        public Employee Employee
+        {
+            get;
+            set;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/WeirdModel.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/WeirdModel.cs
new file mode 100644
index 0000000000..8dce437889
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/WeirdModel.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace HtmlGenerationWebSite.Models
+{
+    public class WeirdModel
+    {
+        public string Field = "Hello, Field World!";
+
+        public static string StaticProperty { get; set; } = "Hello, Static World!";
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/ProductsService.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/ProductsService.cs
new file mode 100644
index 0000000000..c2ce3d4586
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/ProductsService.cs
@@ -0,0 +1,59 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using HtmlGenerationWebSite.Models;
+using Microsoft.Extensions.Caching.Memory;
+
+namespace HtmlGenerationWebSite
+{
+    public class ProductsService
+    {
+        private readonly IMemoryCache _memoryCache;
+        private readonly ISignalTokenProviderService<Product> _tokenProviderService;
+        private readonly Dictionary<string, Product[]> _products = new Dictionary<string, Product[]>
+        {
+            ["Books"] = new[]
+            {
+                new Product { ProductName = "Book1" },
+                new Product { ProductName = "Book2" }
+            },
+            ["Electronics"] = new[]
+            {
+                new Product { ProductName = "Laptops" }
+            }
+        };
+
+        public ProductsService(
+            IMemoryCache memoryCache,
+            ISignalTokenProviderService<Product> tokenProviderService)
+        {
+            _memoryCache = memoryCache;
+            _tokenProviderService = tokenProviderService;
+        }
+
+        public IEnumerable<string> GetProductNames(string category)
+        {
+            IEnumerable<Product> products;
+            var key = typeof(ProductsService).FullName;
+            if (!_memoryCache.TryGetValue(key, out products))
+            {
+                var changeToken = _tokenProviderService.GetToken(key);
+                products = _memoryCache.Set<IEnumerable<Product>>(
+                    key,
+                    _products[category],
+                    new MemoryCacheEntryOptions().AddExpirationToken(changeToken));
+            }
+
+            return products.Select(p => p.ProductName);
+        }
+
+        public void UpdateProducts(string category, IEnumerable<Product> products)
+        {
+            _products[category] = products.ToArray();
+            var key = typeof(ProductsService).FullName;
+            _tokenProviderService.SignalToken(key);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/SignalTokenProviderService.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/SignalTokenProviderService.cs
new file mode 100644
index 0000000000..d45e291182
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/SignalTokenProviderService.cs
@@ -0,0 +1,49 @@
+// 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.
+
+using System.Collections.Concurrent;
+using System.Threading;
+using Microsoft.Extensions.Primitives;
+
+namespace HtmlGenerationWebSite
+{
+    public class SignalTokenProviderService<TKey> : ISignalTokenProviderService<TKey>
+    {
+        private readonly ConcurrentDictionary<object, ChangeTokenInfo> _changeTokens
+            = new ConcurrentDictionary<object, ChangeTokenInfo>();
+
+        public IChangeToken GetToken(object key)
+        {
+            return _changeTokens.GetOrAdd(
+                key,
+                _ =>
+                {
+                    var cancellationTokenSource = new CancellationTokenSource();
+                    var changeToken = new CancellationChangeToken(cancellationTokenSource.Token);
+                    return new ChangeTokenInfo(changeToken, cancellationTokenSource);
+                }).ChangeToken;
+        }
+
+        public void SignalToken(object key)
+        {
+            ChangeTokenInfo changeTokenInfo;
+            if (_changeTokens.TryRemove(key, out changeTokenInfo))
+            {
+                changeTokenInfo.TokenSource.Cancel();
+            }
+        }
+
+        private class ChangeTokenInfo
+        {
+            public ChangeTokenInfo(IChangeToken changeToken, CancellationTokenSource tokenSource)
+            {
+                ChangeToken = changeToken;
+                TokenSource = tokenSource;
+            }
+
+            public IChangeToken ChangeToken { get; }
+
+            public CancellationTokenSource TokenSource { get; }
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Startup.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Startup.cs
new file mode 100644
index 0000000000..a0c93159d6
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Startup.cs
@@ -0,0 +1,60 @@
+// 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.
+
+using System.IO;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.TagHelpers;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace HtmlGenerationWebSite
+{
+    public class Startup
+    {
+        // Set up application services
+        public void ConfigureServices(IServiceCollection services)
+        {
+            // Add MVC services to the services container. Change default FormTagHelper.AntiForgery to false. Usually
+            // null which is interpreted as true unless element includes an action attribute.
+            services.AddMvc().InitializeTagHelper<FormTagHelper>((helper, _) => helper.Antiforgery = false);
+
+            services.AddSingleton(typeof(ISignalTokenProviderService<>), typeof(SignalTokenProviderService<>));
+            services.AddSingleton<ProductsService>();
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseStaticFiles();
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(
+                    name: "areaRoute",
+                    template: "{area:exists}/{controller}/{action}/{id?}",
+                    defaults: new { action = "Index" });
+                routes.MapRoute(
+                    name: "productRoute",
+                    template: "Product/{action}",
+                    defaults: new { controller = "Product" });
+                routes.MapRoute(
+                    name: "default",
+                    template: "{controller}/{action}/{id?}",
+                    defaults: new { controller = "HtmlGeneration_Home", action = "Index" });
+            });
+        }
+
+        public static void Main(string[] args)
+        {
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
+            host.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            new WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseStartup<Startup>()
+                .UseKestrel()
+                .UseIISIntegration();
+    }
+}
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ConfirmPayment.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ConfirmPayment.cshtml
new file mode 100644
index 0000000000..13ff1097b4
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ConfirmPayment.cshtml
@@ -0,0 +1,3 @@
+<cache vary-by-route="region, section">
+@ViewBag.Message. (Region @ViewBag.Region)
+</cache>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Deals.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Deals.cshtml
new file mode 100644
index 0000000000..3abf0965a8
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Deals.cshtml
@@ -0,0 +1,4 @@
+@using Microsoft.Extensions.Caching.Memory
+<cache enabled="ViewBag.IsEnabled">
+    Deal percentage is @ViewBag.ProductDealPercentage
+</cache>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Details.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Details.cshtml
new file mode 100644
index 0000000000..a224f45d1e
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Details.cshtml
@@ -0,0 +1,4 @@
+@using Microsoft.Extensions.Caching.Memory
+<cache expires-after="TimeSpan.FromSeconds(1)" priority="CacheItemPriority.Low">
+Cached content for @ViewBag.ProductId
+</cache>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ListCategories.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ListCategories.cshtml
new file mode 100644
index 0000000000..8d58ee5641
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ListCategories.cshtml
@@ -0,0 +1,5 @@
+@inject HtmlGenerationWebSite.ProductsService ProductsService
+<cache vary-by-route="category">
+Category: @ViewBag.Category
+<cache>Products: @string.Join(", ", ProductsService.GetProductNames(ViewBag.Category)) (@ViewBag.CorrelationId)</cache>
+</cache>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/PastPurchases.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/PastPurchases.cshtml
new file mode 100644
index 0000000000..f389fb77f0
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/PastPurchases.cshtml
@@ -0,0 +1,3 @@
+<cache vary-by-user="true">
+Past purchases for user @Context.User.Identity.Name (@ViewBag.CorrelationId)
+</cache>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ShoppingCart.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ShoppingCart.cshtml
new file mode 100644
index 0000000000..34e09985cc
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ShoppingCart.cshtml
@@ -0,0 +1,3 @@
+<cache vary-by-cookie="CartId">
+Cart content for @ViewBag.CorrelationId
+</cache>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Splash.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Splash.cshtml
new file mode 100644
index 0000000000..f978286a7c
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Splash.cshtml
@@ -0,0 +1,8 @@
+<h2>Category: @ViewBag.Category</h2>
+<h2>Region: @ViewBag.Locale</h2>
+<cache vary-by-header="Locale" vary-by-query="categoryid">
+    <h2>Cached content</h2>
+    @await Component.InvokeAsync("Splash")
+    @await Html.PartialAsync("_SplashPartial")
+    <div>CorrelationId in Splash: @ViewBag.CorrelationId</div>
+</cache>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_SplashPartial.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_SplashPartial.cshtml
new file mode 100644
index 0000000000..58b292f16f
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_SplashPartial.cshtml
@@ -0,0 +1,5 @@
+<partial-title>Listing items</partial-title>
+<cache vary-by="@ViewBag.Category" data-content="some-content">
+Cached Content for @ViewBag.Category
+<div>CorrelationId in Partial: @ViewBag.CorrelationId</div>
+</cache>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_ViewImports.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_ViewImports.cshtml
new file mode 100644
index 0000000000..a757b413b9
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_ViewImports.cshtml
@@ -0,0 +1 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/AtViewModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/AtViewModel.cshtml
new file mode 100644
index 0000000000..3706c6cdd2
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/AtViewModel.cshtml
@@ -0,0 +1,37 @@
+@using HtmlGenerationWebSite.Components
+@using HtmlGenerationWebSite.Models
+@using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+@model ViewModel
+
+@{
+    var metadata = ViewData.ModelMetadata;
+}
+
+<div class="row">
+    <h4>At Model index</h4>
+    <div class="col-md-3">MetadataKind: '@metadata.MetadataKind'</div>
+    <div class="col-md-3">ModelType: '@metadata.ModelType.Name'</div>
+    @if (metadata.MetadataKind == ModelMetadataKind.Property)
+    {
+        <div class="col-md-3">PropertyName: '@metadata.PropertyName'</div>
+    }
+</div>
+
+<div class="row">
+    @Html.DisplayFor(m => m)
+</div>
+<div class="row">
+    @Html.Partial("PartialForViewModel")
+</div>
+<div class="row">
+    @(await Component.InvokeAsync<CheckViewData>())
+</div>
+<div class="row">
+    @Html.DisplayFor(m => m.Integer)
+</div>
+<div class="row">
+    @Html.DisplayFor(m => m.NullableLong)
+</div>
+<div class="row">
+    @Html.DisplayFor(m => m.Template)
+</div>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/Components/CheckViewData/Default.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/Components/CheckViewData/Default.cshtml
new file mode 100644
index 0000000000..a9aa5a7824
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/Components/CheckViewData/Default.cshtml
@@ -0,0 +1,14 @@
+@using HtmlGenerationWebSite.Models
+@using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+@model ViewModel
+@{
+    var metadata = ViewData.ModelMetadata;
+}
+
+<h5>Check View Data view component's view</h5>
+<div class="col-md-3">MetadataKind: '@metadata.MetadataKind'</div>
+<div class="col-md-3">ModelType: '@metadata.ModelType.Name'</div>
+@if (metadata.MetadataKind == ModelMetadataKind.Property)
+{
+    <div class="col-md-3">PropertyName: '@metadata.PropertyName'</div>
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/Components/CheckViewData___LackModel/Default.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/Components/CheckViewData___LackModel/Default.cshtml
new file mode 100644
index 0000000000..31d992df85
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/Components/CheckViewData___LackModel/Default.cshtml
@@ -0,0 +1,14 @@
+@using HtmlGenerationWebSite.Models
+@using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+
+@{
+    var metadata = ViewData.ModelMetadata;
+}
+
+<h5>Check View Data - LackModel view component's view</h5>
+<div class="col-md-3">MetadataKind: '@metadata.MetadataKind'</div>
+<div class="col-md-3">ModelType: '@metadata.ModelType.Name'</div>
+@if (metadata.MetadataKind == ModelMetadataKind.Property)
+{
+    <div class="col-md-3">PropertyName: '@metadata.PropertyName'</div>
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int32 - LackModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int32 - LackModel.cshtml
new file mode 100644
index 0000000000..ad948f6ca5
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int32 - LackModel.cshtml	
@@ -0,0 +1,27 @@
+@using HtmlGenerationWebSite.Models
+@using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+
+@{
+    var metadata = ViewData.ModelMetadata;
+}
+
+<h5>Template for Int32 - LackModel</h5>
+<div class="col-md-3">MetadataKind: '@metadata.MetadataKind'</div>
+<div class="col-md-3">ModelType: '@metadata.ModelType.Name'</div>
+@if (metadata.MetadataKind == ModelMetadataKind.Property)
+{
+    <div class="col-md-3">PropertyName: '@metadata.PropertyName'</div>
+}
+
+@{
+    ViewData.Model = 78.9;
+    metadata = ViewData.ModelMetadata;
+}
+
+<h5>Template for Int32 - LackModel after setting Model to 78.9</h5>
+<div class="col-md-3">MetadataKind: '@metadata.MetadataKind'</div>
+<div class="col-md-3">ModelType: '@metadata.ModelType.Name'</div>
+@if (metadata.MetadataKind == ModelMetadataKind.Property)
+{
+    <div class="col-md-3">PropertyName: '@metadata.PropertyName'</div>
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int32.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int32.cshtml
new file mode 100644
index 0000000000..f3b7fea4fd
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int32.cshtml
@@ -0,0 +1,14 @@
+@using HtmlGenerationWebSite.Models
+@using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+@model int?
+@{
+    var metadata = ViewData.ModelMetadata;
+}
+
+<h5>Template for Int32</h5>
+<div class="col-md-3">MetadataKind: '@metadata.MetadataKind'</div>
+<div class="col-md-3">ModelType: '@metadata.ModelType.Name'</div>
+@if (metadata.MetadataKind == ModelMetadataKind.Property)
+{
+    <div class="col-md-3">PropertyName: '@metadata.PropertyName'</div>
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int64 - LackModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int64 - LackModel.cshtml
new file mode 100644
index 0000000000..92c0267af8
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int64 - LackModel.cshtml	
@@ -0,0 +1,22 @@
+@using HtmlGenerationWebSite.Components
+@using HtmlGenerationWebSite.Models
+@using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+
+@{
+    var metadata = ViewData.ModelMetadata;
+}
+
+<h5>Template for Int64</h5>
+<div class="col-md-3">MetadataKind: '@metadata.MetadataKind'</div>
+<div class="col-md-3">ModelType: '@metadata.ModelType.Name'</div>
+@if (metadata.MetadataKind == ModelMetadataKind.Property)
+{
+    <div class="col-md-3">PropertyName: '@metadata.PropertyName'</div>
+}
+
+<div class="row">
+    @Html.Partial(partialViewName: "LackModel.cshtml")
+</div>
+<div class="row">
+    @(await Component.InvokeAsync<CheckViewData___LackModel>())
+</div>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int64.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int64.cshtml
new file mode 100644
index 0000000000..63eaa7c01e
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int64.cshtml
@@ -0,0 +1,14 @@
+@using HtmlGenerationWebSite.Models
+@using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+@model long?
+@{
+    var metadata = ViewData.ModelMetadata;
+}
+
+<h5>Template for Int64</h5>
+<div class="col-md-3">MetadataKind: '@metadata.MetadataKind'</div>
+<div class="col-md-3">ModelType: '@metadata.ModelType.Name'</div>
+@if (metadata.MetadataKind == ModelMetadataKind.Property)
+{
+    <div class="col-md-3">PropertyName: '@metadata.PropertyName'</div>
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/LackModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/LackModel.cshtml
new file mode 100644
index 0000000000..4f15d2b22f
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/LackModel.cshtml
@@ -0,0 +1,14 @@
+@using HtmlGenerationWebSite.Models
+@using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+
+@{
+    var metadata = ViewData.ModelMetadata;
+}
+
+<h5>Template / partial for ... - LackModel</h5>
+<div class="col-md-3">MetadataKind: '@metadata.MetadataKind'</div>
+<div class="col-md-3">ModelType: '@metadata.ModelType.Name'</div>
+@if (metadata.MetadataKind == ModelMetadataKind.Property)
+{
+    <div class="col-md-3">PropertyName: '@metadata.PropertyName'</div>
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/TemplateModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/TemplateModel.cshtml
new file mode 100644
index 0000000000..2c932190ac
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/TemplateModel.cshtml
@@ -0,0 +1,14 @@
+@using HtmlGenerationWebSite.Models
+@using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+@model TemplateModel
+@{
+    var metadata = ViewData.ModelMetadata;
+}
+
+<h5>Template for TemplateModel</h5>
+<div class="col-md-3">MetadataKind: '@metadata.MetadataKind'</div>
+<div class="col-md-3">ModelType: '@metadata.ModelType.Name'</div>
+@if (metadata.MetadataKind == ModelMetadataKind.Property)
+{
+    <div class="col-md-3">PropertyName: '@metadata.PropertyName'</div>
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/ViewModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/ViewModel.cshtml
new file mode 100644
index 0000000000..65ef29ba72
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/ViewModel.cshtml
@@ -0,0 +1,14 @@
+@using HtmlGenerationWebSite.Models
+@using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+@model ViewModel
+@{
+    var metadata = ViewData.ModelMetadata;
+}
+
+<h5>Template for ViewModel</h5>
+<div class="col-md-3">MetadataKind: '@metadata.MetadataKind'</div>
+<div class="col-md-3">ModelType: '@metadata.ModelType.Name'</div>
+@if (metadata.MetadataKind == ModelMetadataKind.Property)
+{
+    <div class="col-md-3">PropertyName: '@metadata.PropertyName'</div>
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/PartialForViewModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/PartialForViewModel.cshtml
new file mode 100644
index 0000000000..36f206127a
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/PartialForViewModel.cshtml
@@ -0,0 +1,14 @@
+@using HtmlGenerationWebSite.Models
+@using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+@model ViewModel
+@{
+    var metadata = ViewData.ModelMetadata;
+}
+
+<h5>Partial for ViewModel</h5>
+<div class="col-md-3">MetadataKind: '@metadata.MetadataKind'</div>
+<div class="col-md-3">ModelType: '@metadata.ModelType.Name'</div>
+@if (metadata.MetadataKind == ModelMetadataKind.Property)
+{
+    <div class="col-md-3">PropertyName: '@metadata.PropertyName'</div>
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/ViewModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/ViewModel.cshtml
new file mode 100644
index 0000000000..bf3f5e64d9
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/ViewModel.cshtml
@@ -0,0 +1,40 @@
+@using HtmlGenerationWebSite.Components
+@using HtmlGenerationWebSite.Models
+@using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
+
+@* Need the model directive in top-level view. Otherwise the controller would have to set the ViewData property. *@
+@* Put another way, Controller lacks the View<TModel>([...,] TModel) overloads that ViewComponent has. *@
+@model ViewModel
+
+@{
+    var metadata = ViewData.ModelMetadata;
+}
+
+<div class="row">
+    <h4>View Model index</h4>
+    <div class="col-md-3">MetadataKind: '@metadata.MetadataKind'</div>
+    <div class="col-md-3">ModelType: '@metadata.ModelType.Name'</div>
+    @if (metadata.MetadataKind == ModelMetadataKind.Property)
+    {
+        <div class="col-md-3">PropertyName: '@metadata.PropertyName'</div>
+    }
+</div>
+
+<div class="row">
+    @Html.DisplayFor(m => m, templateName: "LackModel")
+</div>
+<div class="row">
+    @Html.Partial(partialViewName: "DisplayTemplates/LackModel.cshtml")
+</div>
+<div class="row">
+    @(await Component.InvokeAsync<CheckViewData___LackModel>())
+</div>
+<div class="row">
+    @Html.DisplayFor(m => m.Integer, templateName: "Int32 - LackModel")
+</div>
+<div class="row">
+    @Html.DisplayFor(m => m.NullableLong, templateName: "Int64 - LackModel")
+</div>
+<div class="row">
+    @Html.DisplayFor(m => m.Template, templateName: "LackModel")
+</div>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/AttributesWithBooleanValues.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/AttributesWithBooleanValues.cshtml
new file mode 100644
index 0000000000..c34d4286ea
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/AttributesWithBooleanValues.cshtml
@@ -0,0 +1,20 @@
+@{
+    var trueVar = true;
+    var falseVar = false;
+    var stringVar = "value";
+    string nullVar = null;
+}
+<input checked="@true" />
+<input checked="@trueVar" />
+<input checked="@false" />
+<input checked="@falseVar" />
+<input checked="  @true    " />
+<input checked="  @falseVar    " />
+<input checked="    @stringVar: @trueVar   " />
+<input checked="    value: @false   " />
+<input checked="@true @trueVar" />
+<input checked="   @falseVar  @true" />
+<input checked="@null" />
+<input checked="  @nullVar" />
+<input checked="@nullVar   " />
+<input checked="  @null @stringVar @trueVar" />
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/CreateWarehouse.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/CreateWarehouse.cshtml
new file mode 100644
index 0000000000..c2a94d265e
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/CreateWarehouse.cshtml
@@ -0,0 +1,27 @@
+@model HtmlGenerationWebSite.Models.Warehouse
+
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+@{
+    ViewBag.Title = "Warehouse - Product";
+}
+
+<html>
+<body>
+    @using (Html.BeginForm("CreateWarehouse", "HtmlGeneration_Home"))
+    {
+        <div>
+            <label asp-for="City" class="warehouse"></label>
+            <input asp-for="City" type="text" size="50" />
+            <span asp-validation-for="City"></span>
+        </div>
+        <div>
+            <label asp-for="Product" class="warehouse"></label>
+            <select asp-for="Product" asp-items="(IEnumerable<SelectListItem>)ViewBag.Items"></select>
+            <span asp-validation-for="Product"></span>
+        </div>
+        <div asp-validation-summary="All" class="warehouse"></div>
+        <input type="submit" />
+    }
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditWarehouse.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditWarehouse.cshtml
new file mode 100644
index 0000000000..74d67cb003
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditWarehouse.cshtml
@@ -0,0 +1,50 @@
+@model HtmlGenerationWebSite.Models.Warehouse
+
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+@{
+    ViewBag.Title = "Warehouse - Employee";
+}
+
+<html>
+<body>
+    <form asp-controller="HtmlGeneration_Home" asp-action="EditWarehouse" asp-antiforgery="false">
+        <div>
+            @Html.DisplayFor(m => m.City)
+            <input asp-for="City" type="text" />
+        </div>
+        <div>
+            <label>@Html.DisplayNameFor(m => m.Employee.Address)</label>
+            @Html.TextAreaFor(m => m.Employee.Address);
+        </div>
+        <div>
+            @Html.LabelFor(m => m.Employee.Password)
+            @Html.PasswordFor(m => m.Employee.Password)
+        </div>
+        <div>
+            <label>@Html.DisplayNameFor(m => m.Employee.PhoneNumber)</label>
+            @Html.TextBoxFor(m => m.Employee.PhoneNumber)
+        </div>
+        <div>
+            <label for="@Html.IdFor(m => m.Employee.Name)">@Html.NameFor(m => m.Employee.Name)</label>
+            <input asp-for="Employee.Name" type="text" />
+            @Html.ValidationMessageFor(m => m.Employee.Name)
+        </div>
+        <div>
+            @Html.LabelFor(m => m.Employee.Gender)
+            @Html.RadioButtonFor(m => m.Employee.Gender, "Female") Female
+            @Html.RadioButtonFor(m => m.Employee.Gender, "Male") Male
+        </div>
+        <div>
+            @Html.LabelFor(m => m.Employee.OfficeNumber)
+            @{
+                var offices = new SelectList(new string[] { "1001", "1002" });
+            }
+            @Html.DropDownListFor(m => m.Employee.OfficeNumber, offices)
+        </div>
+        @Html.EditorFor(m => m.Employee.Number)
+        @Html.ValidationSummary()
+        <input type="submit" />
+    </form>
+</body>
+</html>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/Employee.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/Employee.cshtml
new file mode 100644
index 0000000000..c052f7a9eb
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/Employee.cshtml
@@ -0,0 +1,35 @@
+@model HtmlGenerationWebSite.Models.Employee
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+<div>
+    @Html.LabelFor(m => m.Number)
+    @Html.TextBox(nameof(Model.Number), value: null, htmlAttributes: new { disabled = "disabled", @readonly = "readonly" })
+    <input asp-for="Number" type="number" class="form-control" />
+</div>
+<div>
+    <label asp-for="Name" class="employee"></label>
+    @Html.TextArea(nameof(Model.Name))
+</div>
+<div>
+    <label asp-for="PhoneNumber" class="employee"></label>
+    <input asp-for="PhoneNumber" type="tel" />
+</div>
+<div>
+    @{
+        var genders = new SelectList(new string[] { "Male", "Female" });
+    }
+    <label asp-for="Gender" class="employee"></label>
+    @Html.RadioButton(nameof(Model.Gender), "Female", htmlAttributes: new { disabled = "disabled", @readonly = "readonly" })
+    <select asp-for="Gender" asp-items="genders"></select>
+</div>
+<div>
+    <label asp-for="Remote" class="employee"></label>
+    @Html.CheckBoxFor(m => m.Remote)
+</div>
+<div>
+    <label asp-for="OfficeNumber" class="employee"></label>
+    @{
+        var offices = new SelectList(new string[] {"1001","1002"});
+    }
+    @Html.DropDownListFor(m => m.OfficeNumber, offices)
+</div>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingHtmlHelpers.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingHtmlHelpers.cshtml
new file mode 100644
index 0000000000..ad7b40a779
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingHtmlHelpers.cshtml
@@ -0,0 +1,4 @@
+@using HtmlGenerationWebSite.Models
+@model Gender
+@Html.RadioButtonFor(m => m, value: "Male") Male
+@Html.RadioButton(expression: string.Empty, value: "Female") Female
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingTagHelpers.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingTagHelpers.cshtml
new file mode 100644
index 0000000000..dd2a199b5f
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingTagHelpers.cshtml
@@ -0,0 +1,5 @@
+@using HtmlGenerationWebSite.Models
+@model Gender
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+<input asp-for="@Model" type="radio" value="Male" /> Male
+<input asp-for="@Model" type="radio" value="Female" /> Female
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EmployeeList.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EmployeeList.cshtml
new file mode 100644
index 0000000000..83bc47fba7
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EmployeeList.cshtml
@@ -0,0 +1,23 @@
+@using HtmlGenerationWebSite.Models
+
+@model List<Employee>
+
+@{
+    ViewBag.Title = "Employee Page";
+}
+
+<html>
+<body>
+    @if (Model != null && Model.Count() != 0)
+    {
+        using (@Html.BeginForm("EmployeeList", "HtmlGeneration_Home", FormMethod.Post))
+        {
+            for (int i = 0; i < Model.Count; ++i)
+            {
+                @Html.EditorFor(m => m[i])
+            }
+            <input type="submit" />
+        }
+    }
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Enum.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Enum.cshtml
new file mode 100644
index 0000000000..8e4ca005d4
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Enum.cshtml
@@ -0,0 +1,4 @@
+@using HtmlGenerationWebSite.Models
+@model AClass
+@Html.DisplayFor(x => x.DayOfWeek)
+@Html.DisplayFor(x => x.Month)
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Environment.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Environment.cshtml
new file mode 100644
index 0000000000..5275dcfc7f
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Environment.cshtml
@@ -0,0 +1,49 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+<!doctype html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Environment</title>
+</head>
+<body>
+
+    <h2>Environment Tag Helper Test</h2>
+
+    <ul>
+        <environment names="Production">
+            <li>This will show</li>
+        </environment>
+        <environment names="production">
+            <li>This will show</li>
+        </environment>
+        <environment names="Development,  Production">
+            <li>This will show</li>
+        </environment>
+        <environment names="Production, Development">
+            <li>This will show</li>
+        </environment>
+        <environment names="Local,Development, Production">
+            <li>This will show</li>
+        </environment>
+        <environment names="Production,">
+            <li>This will show</li>
+        </environment>
+        <environment>
+            <li>This will show</li>
+        </environment>
+        <environment names="">
+            <li>This will show</li>
+        </environment>
+        <environment names=" ">
+            <li>This will show</li>
+        </environment>
+        <environment names="Development">
+            <li>FAIL: This should NOT show</li>
+        </environment>
+        <environment names="Staging,Development">
+            <li>FAIL: This should NOT show</li>
+        </environment>
+    </ul>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Form.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Form.cshtml
new file mode 100644
index 0000000000..93db6801a8
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Form.cshtml
@@ -0,0 +1,19 @@
+@using Microsoft.Extensions.DependencyInjection
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Form</title>
+</head>
+<body>
+
+    <h2>Form Tag Helper Test</h2>
+    
+    <form></form>
+    <form asp-antiforgery="true"></form>
+    <form asp-controller="HtmlGeneration_Home" asp-action="Form"></form>
+    <form asp-controller="HtmlGeneration_Home" asp-action="Form" asp-antiforgery="true"></form>
+    <form asp-controller="HtmlGeneration_Home" asp-action="Form" asp-antiforgery="false"></form>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Image.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Image.cshtml
new file mode 100644
index 0000000000..f0865e1f95
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Image.cshtml
@@ -0,0 +1,37 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+<!doctype html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Image</title>
+
+</head>
+<body>
+
+    <h2>Image Tag Helper Test</h2>
+    <!-- Plain image tag -->
+    <img src="~/images/red.png" alt="Red block" title="&lt;the title>">
+
+    <!-- Plain image tag with file version -->
+    <img src="~/images/red.png" alt="Red versioned" title="Red versioned" asp-append-version="true" />
+
+    <!-- Plain image tag with file version set to false -->
+    <img src="~/images/red.png" alt="Red explicitly not versioned" title="Red versioned" asp-append-version="false">
+
+    <!-- Plain image tag with absolute path and file version -->
+    <img src="http://contoso.com/hello/world" alt="Absolute path versioned" asp-append-version="true">
+
+    <!-- Plain image tag with file version and path to file that does not exist -->
+    <img src="~/images/fake.png" alt="Path to non existing file" asp-append-version="true" />
+
+    <!-- Plain image tag with file version and path containing query string -->
+    <img src="~/images/red.png?abc=def" alt="Path with query string" asp-append-version="true">
+
+    <!-- Plain image tag with file version and path containing fragment -->
+    <img src="~/images/red.png#abc" alt="Path with query string" asp-append-version="true" />
+
+    <!-- Plain image tag with file version and path linking to some action -->
+    <img src="/controller/action" alt="Path linking to some action" asp-append-version="true">
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Index.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Index.cshtml
new file mode 100644
index 0000000000..c505df763e
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Index.cshtml
@@ -0,0 +1,91 @@
+@{
+    ViewBag.Title = "Home Page";
+}
+
+@addTagHelper Microsoft.AspNetCore.Mvc.TagHelpers.AnchorTagHelper, Microsoft.AspNetCore.Mvc.TagHelpers
+
+<html>
+<body>
+    <div>
+        <a asp-controller="HtmlGeneration_Product" title="&lt;the title>">Product Index</a>
+    </div>
+    <div>
+        <a asp-controller="HtmlGeneration_Product" asp-action="List" title='"the" title'>Product List</a>
+    </div>
+    <div>
+        <a id="HtmlGenerationWebSite_Index">HtmlGenerationWebSite Index</a>
+    </div>
+    <div>
+        <a asp-action="Index">Default Controller</a>
+    </div>
+    <div>
+        <a asp-fragment="fragment" asp-controller="Product">Product Index Fragment</a>
+    </div>
+    <div>
+        <a asp-controller="HtmlGeneration_Product" asp-action="Submit" asp-fragment="fragment">Product Submit Fragment</a>
+    </div>
+    <div>
+        <a id="HtmlGenerationWebSite_IndexFragment" asp-fragment="fragment">
+            HtmlGenerationWebSite Index Fragment
+        </a>
+    </div>
+    <div>
+        <a asp-action="Index" asp-fragment="fragment" asp-protocol="ftp">
+            FTP HtmlGenerationWebSite Index Fragment
+        </a>
+    </div>
+    <div>
+        <a asp-controller="HtmlGeneration_Product" asp-protocol="unkonwn" asp-action="List">
+            Unknown Protocol Product List
+        </a>
+    </div>
+    <div>
+        <a id="HtmlGenerationWebSite_IndexProtocol" asp-protocol="">
+            Empty Protocol HtmlGenerationWebSite Index
+        </a>
+    </div>
+    <div>
+        <a asp-route="areaRoute" asp-route-area="Customer"
+           asp-route-controller="Customer"
+           asp-route-action="Index"
+           asp-fragment="fragment">Customer Area Customer Index</a>
+    </div>
+    <div>
+        <a href="/Order/List">Href Order List</a>
+    </div>
+    <div>
+        <a asp-controller="NonExistentController">Non-existent Controller</a>
+    </div>
+    <div>
+        <a asp-controller="NonExistentController" asp-fragment="fragment">
+            Non-existent Controller Fragment
+        </a>
+    </div>
+    <div>
+        <a asp-controller="Order" asp-action="NonExistentAction">Non-existent Action</a>
+    </div>
+    <div>
+        <a id="Id" asp-host="somewhere">Some Where</a>
+    </div>
+    <div>
+        <a asp-protocol="unknown" asp-controller="NoControll" asp-fragment="fragment">
+            Unknown Protocol Non-existent Controller Fragment
+        </a>
+    </div>
+    <div>
+        <a asp-route="productRoute"
+           asp-fragment="fragment"
+           asp-route-action="Submit"
+           asp-route-area="NonExistentArea"
+           asp-route-id="1">Product Route Non-existent Area Parameter</a>
+    </div>
+    <div>
+        <a asp-route="areaRoute"
+           asp-route-area="NonExistentArea"
+           asp-route-controller="Customer"
+           asp-route-action="Index"
+           asp-protocol="http"
+           asp-fragment="fragment">Non-existent Area</a>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Input.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Input.cshtml
new file mode 100644
index 0000000000..daf3f7424b
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Input.cshtml
@@ -0,0 +1,26 @@
+@using HtmlGenerationWebSite.Models
+@model Folder
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>File Input</title>
+</head>
+<body>
+
+    <h2>Input Tag Helper Test</h2>
+
+    <input asp-for="InterfaceFile" name="InterfaceFile" />
+    <input asp-for="InterfaceFiles" name="InterfaceFiles" />
+    <input asp-for="ConcreteFile" name="ConcreteFile">
+    <input asp-for="ConcreteFiles" name="ConcreteFiles" />
+    <input asp-for="EnumerableFiles" name="EnumerableFiles">
+
+    @Html.EditorFor(m => m.InterfaceFile)
+    @Html.EditorFor(m => m.InterfaceFiles)
+    @Html.EditorFor(m => m.ConcreteFile)
+    @Html.EditorFor(m => m.ConcreteFiles)
+    @Html.EditorFor(m => m.EnumerableFiles)
+</body>
+</html>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ItemUsingModelSpecificEditorTemplate.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ItemUsingModelSpecificEditorTemplate.cshtml
new file mode 100644
index 0000000000..878b676754
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ItemUsingModelSpecificEditorTemplate.cshtml
@@ -0,0 +1,3 @@
+@using HtmlGenerationWebSite.Models
+@model Item
+@Html.Editor(nameof(Model.Description))
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ItemUsingSharedEditorTemplate.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ItemUsingSharedEditorTemplate.cshtml
new file mode 100644
index 0000000000..2e49de9d5a
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ItemUsingSharedEditorTemplate.cshtml
@@ -0,0 +1,4 @@
+@using HtmlGenerationWebSite.Models
+@model Item
+@Html.EditorFor(model => model.Name)
+@Html.Editor("Id")
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Link.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Link.cshtml
new file mode 100644
index 0000000000..09f614154a
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Link.cshtml
@@ -0,0 +1,224 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+<!doctype html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Link</title>
+
+    <!-- Plain link tag -->
+    <link href="~/styles/site.css" rel="stylesheet" title="&lt;the title>" />
+
+    <!-- Globbed link tag with existing file -->
+    <link asp-href-include="**/site.css" rel="stylesheet" title="&lt;the title>" />
+
+    <!-- Globbed link tag with comma separated pattern -->
+    <link asp-href-include="~/styles/*.css, ~/styles/sub/*.css" rel="stylesheet" title="&lt;the title" />
+
+    <!-- Globbed link tag with existing file and exclude -->
+    <link asp-href-include=" **/*.css" asp-href-exclude="**/site3*.css" rel="stylesheet" title='"the" title' />
+
+    <!-- Globbed link tag missing include -->
+    <link asp-href-exclude="**/site2.css" rel="stylesheet">
+
+    <!-- Globbed link tag missing include but with static href -->
+    <link href="~/styles/site.css" asp-href-exclude="**/site2.css" rel="stylesheet" />
+
+    <!-- Globbed link tag with missing file -->
+    <link asp-href-include="**/notThere.css" rel="stylesheet" />
+
+    <!-- Globbed link tag with file outside of webroot -->
+    <link asp-href-include="../**/appRoot.css" rel="stylesheet" />
+
+    <!-- Globbed link tag with file outside of webroot -->
+    <link asp-href-include="**/appRoot.css" rel="stylesheet">
+
+    <!-- Globbed link tag with existing file and static href -->
+    <link href="~/styles/site.css" asp-href-include="**/site2.css" rel="stylesheet" />
+
+    <!-- Globbed link tag with existing file and static href should dedupe -->
+    <link href="~/styles/site.css" asp-href-include="**/site.css" rel="stylesheet" />
+
+    <!-- Fallback to static href -->
+    <link href="~/styles/site.min.css?a=b&c=d" rel="stylesheet" data-extra="test" title='"the" title'
+          asp-fallback-href="~/styles/site.css?a=b&c=d"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-property="visibility"
+          asp-fallback-test-value="hidden" />
+
+    <!-- Fallback to static href with dynamic attributes -->
+    <link href="~/styles/site.min.css?a=b&c=d" rel="@("stylesheet")" data-extra="@("test")" title='@(@"""the"" title")'
+          asp-fallback-href="~/styles/site.css?a=b&c=d"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-property="visibility"
+          asp-fallback-test-value="hidden" />
+
+    <!-- Fallback to static href with custom rel -->
+    <link href="~/styles/site.min.css?a=b&c=d" rel="x-stylesheet"
+          asp-fallback-href="~/styles/site.css?a=b&c=d"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-property="visibility"
+          asp-fallback-test-value="hidden" />
+
+    <!-- Fallback from globbed href to static href -->
+    <link asp-href-include="styles/site.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-property="visibility"
+          asp-fallback-test-value="hidden" />
+
+    <!-- Fallback from globbed href with exclude to static href -->
+    <link asp-href-include="**/*.min.css" asp-href-exclude=" **/site3.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-property="visibility"
+          asp-fallback-test-value="hidden">
+
+    <!-- Fallback from globbed and static href to static href -->
+    <link href="styles/site.min.css" asp-href-include="styles/site.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-property="visibility"
+          asp-fallback-test-value="hidden" />
+
+    <!-- Fallback from globbed and static href with exclude to static href -->
+    <link href="styles/site.min.css" asp-href-include="**/*.min.css" asp-href-exclude="**/site3.min.css"
+          rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-property="visibility"
+          asp-fallback-test-value="hidden" />
+
+    <!-- Fallback to static href with no primary href -->
+    <link rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-property="visibility"
+          asp-fallback-test-value="hidden">
+
+    <!-- Fallback to globbed href -->
+    <link href="~/styles/site.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href-include="**/site.css"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-property="visibility"
+          asp-fallback-test-value="hidden" />
+
+    <!-- Fallback to static and globbed href -->
+    <link href="~/styles/site.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
+          asp-fallback-href-include="**/site2.css"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-property="visibility"
+          asp-fallback-test-value="hidden" />
+
+    <!-- Fallback to static and globbed href should dedupe -->
+    <link href="~/styles/site.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
+          asp-fallback-href-include="**/site.css"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-property="visibility"
+          asp-fallback-test-value="hidden" />
+
+    <!-- Fallback to static and globbed href with exclude -->
+    <link href="~/styles/site.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
+          asp-fallback-href-include="**/*.css"
+          asp-fallback-href-exclude="**/site3*.css"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-property="visibility"
+          asp-fallback-test-value="hidden" />
+
+    <!-- Fallback from globbed href to glbobed href -->
+    <link asp-href-include="styles/site.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href-include="**/site.css"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-property="visibility"
+          asp-fallback-test-value="hidden" />
+
+    <!-- Fallback from globbed href with exclude to globbed href -->
+    <link asp-href-include="**/*.min.css" asp-href-exclude="**/site3.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href-include="**/site.css"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-property="visibility"
+          asp-fallback-test-value="hidden" />
+
+    <!-- Fallback from globbed and static href to globbed href -->
+    <link href="styles/site.min.css" asp-href-include="styles/site.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href-include="**/site.css"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-property="visibility"
+          asp-fallback-test-value="hidden" />
+
+    <!-- Fallback from globbed and static href with exclude to globbed href -->
+    <link href="styles/site.min.css" asp-href-include="**/*.min.css" asp-href-exclude="**/site3.min.css"
+          rel="stylesheet" data-extra="test"
+          asp-fallback-href-include="**/site.css"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-property="visibility"
+          asp-fallback-test-value="hidden">
+
+    <!-- Kitchen sink, all the attributes -->
+    <link href="styles/site.min.css" asp-href-include="**/*.min.css" asp-href-exclude="**/site3.min.css"
+          rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
+          asp-fallback-href-include="**/*.css"
+          asp-fallback-href-exclude="**/site3*.css"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-property="visibility"
+          asp-fallback-test-value="hidden" />
+
+    <!-- Fallback to globbed href that doesn't exist -->
+    <link href="~/styles/site.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href-include="**/notThere.css"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-property="visibility"
+          asp-fallback-test-value="hidden" />
+
+    <!-- Fallback to globbed href outside webroot -->
+    <link href="~/styles/site.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href-include="../**/appRoot.css"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-property="visibility"
+          asp-fallback-test-value="hidden" />
+
+    <!-- Fallback with missing attribute -->
+    <link href="~/styles/site.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
+          asp-fallback-test-property="visibility"
+          asp-fallback-test-value="hidden" />
+
+    <!-- Fallback with missing attribute -->
+    <link href="~/styles/site.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-value="hidden" />
+
+    <!-- Fallback with missing attribute -->
+    <link href="~/styles/site.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-property="visibility" />
+
+    <!-- Plain link tag with file version -->
+    <link href="~/styles/site.css" rel="stylesheet" asp-append-version="true" />
+
+    <!-- Globbed link tag with existing file and file version -->
+    <link asp-href-include="**/site.css" rel="stylesheet" asp-append-version="true" />
+
+    <!-- Fallback with file version -->
+    <link href="~/styles/site.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
+          asp-fallback-test-class="hidden"
+          asp-fallback-test-property="visibility"
+          asp-fallback-test-value="hidden"
+          asp-append-version="true">
+
+    <!-- Globbed link tag with existing file, static href and file version -->
+    <link href="~/styles/site.css" asp-href-include="**/*.css" rel="stylesheet" asp-append-version="true" />
+</head>
+<body>
+
+    <h2>Link Tag Helper Test</h2>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Order.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Order.cshtml
new file mode 100644
index 0000000000..e69f3e8ec5
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Order.cshtml
@@ -0,0 +1,120 @@
+@model HtmlGenerationWebSite.Models.Order
+
+@{
+    ViewBag.Title = "Order Page";
+}
+
+@addTagHelper Microsoft.AspNetCore.Mvc.TagHelpers.FormTagHelper, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper Microsoft.AspNetCore.Mvc.TagHelpers.InputTagHelper, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper Microsoft.AspNetCore.Mvc.TagHelpers.LabelTagHelper, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper Microsoft.AspNetCore.Mvc.TagHelpers.OptionTagHelper, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper Microsoft.AspNetCore.Mvc.TagHelpers.SelectTagHelper, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper Microsoft.AspNetCore.Mvc.TagHelpers.ValidationMessageTagHelper, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper Microsoft.AspNetCore.Mvc.TagHelpers.ValidationSummaryTagHelper, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper Microsoft.AspNetCore.Mvc.TagHelpers.RenderAtEndOfFormTagHelper, Microsoft.AspNetCore.Mvc.TagHelpers
+
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+</head>
+<body>
+    <form asp-controller="HtmlGeneration_Order" asp-action="Submit" asp-antiforgery=" true">
+        <div>
+            <label asp-for="Shipping" class="order"></label>
+            <input asp-for="Shipping" type="text" asp-format="Your shipping method is {0}" size="50" />
+        </div>
+        <div>
+            <label asp-for="ShippingDateTime" class="order"></label>
+            <input asp-for="ShippingDateTime" type="datetime-local" />
+        </div>
+        <div>
+            <label asp-for="Products" class="order"></label>
+            @{ var @object = "multiple"; }
+            <select asp-for="@Model.Products" asp-items="@((IEnumerable<SelectListItem>)ViewBag.Items)" multiple="@(@object)"></select>
+        </div>
+        <div>
+            @if (Model.ProductDetails.Count > 0)
+            {
+                <table>
+                    <tr>
+                        <th>
+                            <label asp-for="ProductDetails.FirstOrDefault().Number"></label>
+                        </th>
+                        <th>
+                            <label asp-for="ProductDetails.FirstOrDefault().ProductName"></label>
+                        </th>
+                    </tr>
+                    @for (var i = 0; i < Model.ProductDetails.Count; i++)
+                    {
+                    <tr>
+                        <td>
+                            <input asp-for="ProductDetails[i].Number" />
+                            <span asp-validation-for="ProductDetails[i].Number" class="text-danger" style=""></span>
+                        </td>
+                        <td>
+                            <input asp-for="ProductDetails[i].ProductName" />
+                            <span asp-validation-for="ProductDetails[i].ProductName" class="text-danger" style=""></span>
+                        </td>
+                    </tr>
+                    }
+                </table>
+            }
+        </div>
+        <div>
+            <label asp-for="SubstituteProducts" class="order"></label>
+            @* Use same select list as Products. Selection when Products is non-null is not used here. *@
+            <select asp-for="SubstituteProducts" asp-items="@((IEnumerable<SelectListItem>)ViewBag.Items)"></select>
+        </div>
+        <div>
+            <label asp-for="OrderDate" class="order"></label>
+            <input asp-for="OrderDate" type="datetime" asp-format="{0:yyyy/MM/dd HH:mm:ss}" />
+        </div>
+        <div>
+            <label asp-for="NeedSpecialHandle" class="order"></label>
+            <input asp-for="NeedSpecialHandle" type="checkbox" />
+        </div>
+        <div>
+            <label asp-for="PaymentMethod" class="order"></label>
+            <select asp-for="PaymentMethod">
+                <option value="Credit">Credit</option>
+                <option value="Check">Check</option>
+            </select>
+            <select>
+                <option value="Check">Check</option>
+            </select>
+        </div>
+        <div>
+            <label asp-for="Customer.Number" class="order"></label>
+            <input asp-for="Customer.Number" type="number" class="form-control" />
+            <span asp-validation-for="Customer.Number"></span>
+        </div>
+        <div>
+            <label asp-for="Customer.Name" class="order"></label>
+            <input asp-for="Customer.Name" type="text" />
+        </div>
+        <div>
+            <label asp-for="Customer.Email" class="order"></label>
+            <input asp-for="Customer.Email" type="email" />
+            <span asp-validation-for="Customer.Email"></span>
+        </div>
+        <div>
+            <label asp-for="Customer.PhoneNumber" class="order"></label>
+            <input asp-for="Customer.PhoneNumber" type="tel" />
+        </div>
+        <div>
+            <label asp-for="Customer.Password" class="order"></label>
+            <input asp-for="Customer.Password" type="password" class="form-control" />
+            <span asp-validation-for="Customer.Password"></span>
+        </div>
+        <div>
+            <label asp-for="Customer.Gender" class="order"></label>
+            @Html.EditorFor(model => model.Customer.Gender)
+            <span asp-validation-for="Customer.Gender"></span>
+        </div>
+        <div asp-validation-summary="All" class="order"></div>
+        <input type="hidden" asp-for="Customer.Key" />
+        <input type="submit" />
+    </form>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/OrderUsingHtmlHelpers.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/OrderUsingHtmlHelpers.cshtml
new file mode 100644
index 0000000000..b1f779ae14
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/OrderUsingHtmlHelpers.cshtml
@@ -0,0 +1,112 @@
+@model HtmlGenerationWebSite.Models.Order
+
+@{
+    ViewBag.Title = "Order Page";
+}
+
+
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+</head>
+<body>
+    @* Use <text/> element to force whitespace in generated HTML. *@
+    @using (Html.BeginForm(actionName: "Submit", controllerName: "HtmlGeneration_Order"))
+    {<text>
+        <div>
+            @Html.LabelFor(m => m.Shipping, htmlAttributes: new { @class = "order" })
+            @Html.TextBoxFor(m => m.Shipping, format: "Your shipping method is {0}", htmlAttributes: new { size = "50" })
+        </div>
+        <div>
+            @Html.LabelFor(m => m.ShippingDateTime, htmlAttributes: new { @class = "order" })
+            @Html.TextBoxFor(m => m.ShippingDateTime, htmlAttributes: new { type = "datetime-local" })
+        </div>
+        <div>
+            @Html.LabelFor(m => m.Products, htmlAttributes: new { @class = "order" })
+            @{ var productSelectList = (IEnumerable<SelectListItem>)ViewBag.Items; }
+            @Html.ListBoxFor(m => m.Products, productSelectList)
+        </div>
+        <div>
+            @if (Model.ProductDetails.Count > 0)
+            {
+                <table>
+                    <tr>
+                        <th>
+                            @Html.LabelFor(m => m.ProductDetails.FirstOrDefault().Number)
+                        </th>
+                        <th>
+                            @Html.LabelFor(m => m.ProductDetails.FirstOrDefault().ProductName)
+                        </th>
+                    </tr>
+                    @for (var i = 0; i < Model.ProductDetails.Count; i++)
+                    {
+                        <tr>
+                            <td>
+                                @Html.TextBoxFor(m => m.ProductDetails[i].Number, htmlAttributes: new { type = "number" })
+                                @Html.ValidationMessageFor(m => m.ProductDetails[i].Number, message: null, htmlAttributes: new { @class = "text-danger", style = "" })
+                            </td>
+                            <td>
+                                @Html.TextBoxFor(m => m.ProductDetails[i].ProductName)
+                                @Html.ValidationMessageFor(m => m.ProductDetails[i].ProductName, message: null, htmlAttributes: new { @class = "text-danger", style = "" })
+                            </td>
+                        </tr>
+                    }
+                </table>
+            }
+        </div>
+        <div>
+            @Html.LabelFor(m => m.SubstituteProducts, htmlAttributes: new { @class = "order" })
+            @* Use same select list as Products. Selection when Products is non-null is not used here. *@
+            @Html.ListBoxFor(m => m.SubstituteProducts, productSelectList)
+        </div>
+        <div>
+            @Html.LabelFor(m => m.OrderDate, htmlAttributes: new { @class = "order" })
+            @Html.TextBoxFor(m => m.OrderDate, format: "{0:yyyy/MM/dd HH:mm:ss}", htmlAttributes: new { type = "datetime" })
+        </div>
+        <div>
+            @Html.LabelFor(m => m.NeedSpecialHandle, htmlAttributes: new { @class = "order" })
+            @Html.CheckBoxFor(m => m.NeedSpecialHandle)
+        </div>
+        <div>
+            @Html.LabelFor(m => m.PaymentMethod, htmlAttributes: new { @class = "order" })
+            @Html.ListBoxFor(m => m.PaymentMethod, selectList: new SelectList(new[] { new { value = "Credit" }, new { value = "Check" } }, dataValueField: "value", dataTextField: "value"))
+            <select>
+                <option value="Check">Check</option>
+            </select>
+        </div>
+        <div>
+            @Html.LabelFor(m => m.Customer.Number, htmlAttributes: new { @class = "order" })
+            @Html.TextBoxFor(m => m.Customer.Number, htmlAttributes: new { type = "number", @class = "form-control" })
+            @Html.ValidationMessageFor(m => m.Customer.Number)
+        </div>
+        <div>
+            @Html.LabelFor(m => m.Customer.Name, htmlAttributes: new { @class = "order" })
+            @Html.TextBoxFor(m => m.Customer.Name)
+        </div>
+        <div>
+            @Html.LabelFor(m => m.Customer.Email, htmlAttributes: new { @class = "order" })
+            @Html.TextBoxFor(m => m.Customer.Email, htmlAttributes: new { type = "email" })
+            @Html.ValidationMessageFor(m => m.Customer.Email)
+        </div>
+        <div>
+            @Html.LabelFor(m => m.Customer.PhoneNumber, htmlAttributes: new { @class = "order" })
+            @Html.TextBoxFor(m => m.Customer.PhoneNumber, htmlAttributes: new { type = "tel" })
+        </div>
+        <div>
+            @Html.LabelFor(m => m.Customer.Password, htmlAttributes: new { @class = "order" })
+            @Html.PasswordFor(m => m.Customer.Password, htmlAttributes: new { @class = "form-control" })
+            @Html.ValidationMessageFor(m => m.Customer.Password)
+        </div>
+        <div>
+            @Html.LabelFor(m => m.Customer.Gender, htmlAttributes: new { @class = "order" })
+            @Html.EditorFor(model => model.Customer.Gender, templateName: "GenderUsingHtmlHelpers")
+            @Html.ValidationMessageFor(m => m.Customer.Gender)
+        </div>
+        @Html.ValidationSummary(message: null, htmlAttributes: new { @class = "order" })
+        @Html.HiddenFor(m => m.Customer.Key)
+        <input type="submit"/>
+    </text>}
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/PartialTagHelperWithoutModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/PartialTagHelperWithoutModel.cshtml
new file mode 100644
index 0000000000..5074a5280f
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/PartialTagHelperWithoutModel.cshtml
@@ -0,0 +1,2 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+PartialTagHelperWithoutModel: <partial name="../Shared/_Partial" />
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Product.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Product.cshtml
new file mode 100644
index 0000000000..7d14c561d8
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Product.cshtml
@@ -0,0 +1,27 @@
+@model HtmlGenerationWebSite.Models.Product
+
+@{
+    ViewBag.Title = "Product Page";
+}
+
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+</head>
+<body>
+    <form asp-controller="HtmlGeneration_Home" asp-route-action="ProductSubmit" asp-antiforgery="false" method="get">
+        <div>
+            <label asp-for="HomePage" class="product"></label>
+            <input asp-for="HomePage" type="url" size="50" />
+        </div>
+        <div>
+            <label asp-for="Description" class="product"></label>
+            <textarea asp-for="Description" rows="4" cols="50" class="product"></textarea>
+        </div>
+        <input type="submit" />
+    </form>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ProductList.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ProductList.cshtml
new file mode 100644
index 0000000000..8ba2a25f97
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ProductList.cshtml
@@ -0,0 +1,29 @@
+@using HtmlGenerationWebSite.Models
+@model IEnumerable<Product>
+
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+<html>
+<head>
+    <meta charset="utf-8" />
+</head>
+<body>
+    @using (@Html.BeginForm("Index", "HtmlGeneration_Product", FormMethod.Post))
+    {
+        var index = 0;
+        var fieldPrefix = ViewData.TemplateInfo.HtmlFieldPrefix;
+        foreach (var model in Model)
+        {
+            @* Update HtmlFieldPrefix so generated for, id and name attribute values are correct. *@
+            ViewData.TemplateInfo.HtmlFieldPrefix = fieldPrefix + string.Format("[{0}]", index++);
+            <div>
+                <label asp-for="@(model.HomePage)" class="product"></label>
+                <input asp-for="@(model.HomePage)" type="url" size="50" disabled="disabled" readonly="readonly" />
+            </div>
+            @await Html.PartialAsync("_ProductPartial", model)
+            ViewData.TemplateInfo.HtmlFieldPrefix = fieldPrefix;
+        }
+        <input type="submit" />
+    }
+</body>
+</html>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ProductListUsingTagHelpers.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ProductListUsingTagHelpers.cshtml
new file mode 100644
index 0000000000..c0f2d7b10d
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ProductListUsingTagHelpers.cshtml
@@ -0,0 +1,27 @@
+@using HtmlGenerationWebSite.Models
+@model IList<Product>
+
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+<html>
+<head>
+    <meta charset="utf-8" />
+</head>
+<body>
+    <form asp-action="Index" asp-controller="HtmlGeneration_Product" asp-antiforgery="true">
+        @for (var i = 0; i < Model.Count; i++)
+        {
+            <div>
+                <label asp-for="@Model[i].HomePage" class="product"></label>
+                <input asp-for="@Model[i].HomePage" type="url" size="50" disabled="disabled" readonly="readonly" />
+            </div>
+            <partial name="_ProductPartial" for="@Model[i]" />
+        }
+        @* Print the HtmlFieldPrefix outside of the partial tag helper to ensure it hasn't been modified *@
+        <div>HtmlFieldPrefix = @ViewData.TemplateInfo.HtmlFieldPrefix</div>
+        <input type="submit" />
+    </form>
+
+    <partial name="_ProductRecommendations" model='new ProductRecommendations(new Product() { ProductName = "THE Best Product", HomePage = new Uri("http://www.contoso.com")})' />
+</body>
+</html>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Script.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Script.cshtml
new file mode 100644
index 0000000000..a1dd39a891
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Script.cshtml
@@ -0,0 +1,134 @@
+@*
+    Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+    Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+*@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+<!doctype html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Script</title>
+</head>
+<body>
+    <h2>Script tag helper test</h2>
+    <script src="~/styles/site.js" data-foo="foo-data1" title="&lt;the title>">
+        // Regular script with comment in body, and extra properties.
+    </script>
+
+    <script src="~/blank.js?a=b&c=d" asp-fallback-src="~/styles/site.js?a=b&c=d" asp-fallback-test="false" data-foo="foo-data2" title="&lt;the title>">
+        // TagHelper script with comment in body, and extra properties.
+    </script>
+
+    <script src="~/blank.js" asp-fallback-src-include="**/site.js" asp-fallback-test="false" title='"the" title'>
+        // Fallback to globbed src
+    </script>
+
+    <script src="~/blank.js"
+            asp-fallback-src-include="**/*.js"
+            asp-fallback-src-exclude="**/site3.js"
+            asp-fallback-test="false">
+        // Fallback to globbed src with exclude
+    </script>
+
+    <script src="~/blank.js"
+            asp-fallback-src="~/styles/site.js"
+            asp-fallback-src-include="**/site2.js"
+            asp-fallback-test="false">
+        // Fallback to globbed and static src
+    </script>
+
+    <script src="~/blank.js"
+            asp-fallback-src="~/styles/site.js"
+            asp-fallback-src-include="**/site.js"
+            asp-fallback-test="false">
+        // Fallback to globbed and static src should de-dupe
+    </script>
+
+    <script src="~/blank.js" asp-fallback-src-exclude="**/site3.js" asp-fallback-test="false">
+        // Fallback to globbed src with missing include
+    </script>
+
+    <script src="~/blank.js"
+            asp-fallback-src="~/styles/site.js"
+            asp-fallback-src-exclude="**/site3.js"
+            asp-fallback-test="false">
+        // Fallback to static and globbed src with missing include
+    </script>
+
+    <script src="~/blank.js" asp-fallback-src-include="**/appRoot.js" asp-fallback-test="false">
+        // Fallback to globbed src outside of webroot
+    </script>
+
+    <script src="~/blank.js" asp-fallback-src-include="../**/appRoot.js" asp-fallback-test="false">
+        // Fallback to globbed src outside of webroot
+    </script>
+
+    <script asp-fallback-src="~/styles/site.js" asp-fallback-test="false" data-foo="foo-data3">
+        // Valid TagHelper (although no src is provided) script with comment in body, and extra properties.
+    </script>
+
+    <script src="~/blank.js" asp-fallback-src="~/styles/site.js">
+        // Invalid TagHelper script with comment in body.
+    </script>
+
+    <!-- Globbed script tag with existing file -->
+    <script asp-src-include="**/site.js">
+        // This comment shouldn't be emitted
+    </script>
+
+    <!-- Globbed script tag with existing file and exclude -->
+    <script asp-src-include="**/*.js" asp-src-exclude="**/site3.js">
+        // This comment shouldn't be emitted
+    </script>
+
+    <script asp-src-exclude="**/site2.js">
+        // Globbed script tag missing include
+    </script>
+
+    <script src="~/styles/site.js" asp-src-exclude="**/site2.js">
+        // Globbed script tag missing include but with static src
+    </script>
+
+    <!-- Globbed script tag with comma separated include pattern -->
+    <script asp-src-include="~/styles/*.js, ~/styles/sub/*.js"></script>
+
+    <!-- Globbed script tag with missing file -->
+    <script asp-src-include="**/notThere.js"></script>
+
+    <!-- Globbed script tag with file outside of webroot -->
+    <script asp-src-include="../**/appRoot.js"></script>
+
+    <!-- Globbed script tag with file outside of webroot -->
+    <script asp-src-include="**/appRoot.js"></script>
+
+    <script src="~/styles/site.js" asp-src-include="**/site2.js">
+        // Globbed script tag with existing file and static src
+    </script>
+
+    <script src="~/styles/site.js" asp-src-include="**/site.js">
+        // Globbed script tag with existing file and static src should dedupe
+    </script>
+
+    <script src="~/blank.js" asp-fallback-src="~/styles/site.js" asp-fallback-test="false" asp-append-version="true">
+        // TagHelper script with comment in body, and file version.
+    </script>
+
+    <script src="~/blank.js" asp-fallback-src-include="**/site.js" asp-fallback-test="false" asp-append-version="true">
+        // Fallback to globbed src with file version.
+    </script>
+
+    <script src="~/styles/site.js" asp-append-version="true">
+        // Regular script with comment in body, and file version.
+    </script>
+
+    <!-- Globbed script tag with existing files and version -->
+    <script asp-src-include="**/*.js" asp-append-version="true">
+        // This comment shouldn't be emitted
+    </script>
+
+    <!-- Globbed script tag with existing file, exclude and version -->
+    <script asp-src-include="**/*.js" asp-src-exclude="**/site3.js" asp-append-version="true">
+        // This comment shouldn't be emitted
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/StatusMessage.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/StatusMessage.cshtml
new file mode 100644
index 0000000000..68576bedd7
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/StatusMessage.cshtml
@@ -0,0 +1,5 @@
+@using HtmlGenerationWebSite.Models
+@model StatusMessageModel
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+<partial name="_StatusMessagePartial" model="Model.Message" />
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Warehouse.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Warehouse.cshtml
new file mode 100644
index 0000000000..2a039cd8dd
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Warehouse.cshtml
@@ -0,0 +1,5 @@
+@model HtmlGenerationWebSite.Models.Warehouse
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+<h3>@Html.DisplayFor(m => m.City)</h3>
+<partial name="_EmployeePartial" for="Employee" />
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_EmployeePartial.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_EmployeePartial.cshtml
new file mode 100644
index 0000000000..d15ee345e3
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_EmployeePartial.cshtml
@@ -0,0 +1,15 @@
+@model HtmlGenerationWebSite.Models.Employee
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+<div>
+    <label asp-for="Name"></label>
+    <input asp-for="Name" type="text"/>
+</div>
+<div>
+    <label asp-for="OfficeNumber"></label>
+    <input asp-for="OfficeNumber" type="number"/>
+</div>
+<div>
+    <label asp-for="Address"></label>
+    <textarea asp-for="Address" rows="4" cols="50"></textarea>
+</div>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductPartial.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductPartial.cshtml
new file mode 100644
index 0000000000..a71025b7c1
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductPartial.cshtml
@@ -0,0 +1,15 @@
+@model HtmlGenerationWebSite.Models.Product
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+<div>
+    <label asp-for="Number" class="product"></label>
+    <input asp-for="Number" type="number"/>
+</div>
+<div>
+    <label asp-for="ProductName" class="product"></label>
+    <input asp-for="ProductName" type="text"/>
+</div>
+<div>
+    <label asp-for="Description" class="product"></label>
+    <textarea asp-for="Description" rows="4" cols="50" class="product"></textarea>
+</div>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductRecommendations.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductRecommendations.cshtml
new file mode 100644
index 0000000000..62427670ea
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductRecommendations.cshtml
@@ -0,0 +1,13 @@
+@using HtmlGenerationWebSite.Models
+@model ProductRecommendations
+
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+<hr />
+<h2>You might also like these products!</h2>
+<ul>
+    @foreach (var product in Model.Products)
+    {
+        <li><a href="@product.HomePage">@product.ProductName</a></li>
+    }
+</ul>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_StatusMessagePartial.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_StatusMessagePartial.cshtml
new file mode 100644
index 0000000000..a7ff9eec3f
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_StatusMessagePartial.cshtml
@@ -0,0 +1,2 @@
+@model string
+<div class="banner">@Model</div>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithHtmlHelpers.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithHtmlHelpers.cshtml
new file mode 100644
index 0000000000..f192c5d84f
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithHtmlHelpers.cshtml
@@ -0,0 +1,27 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@using HtmlGenerationWebSite.Models
+@model WeirdModel
+
+@functions{
+    private string PrivateProperty { get; set; } = "Hello, Private World!";
+}
+
+<html>
+<body>
+    <div>
+        <p>Field</p>
+        @Html.LabelFor(m => m.Field)
+        @Html.TextBoxFor(m => m.Field)
+    </div>
+    <div>
+        <p>Static Property</p>
+        @Html.LabelFor(m => WeirdModel.StaticProperty)
+        @Html.TextBoxFor(m => WeirdModel.StaticProperty)
+    </div>
+    <div>
+        <p>Private Property</p>
+        @Html.LabelFor(m => PrivateProperty)
+        @Html.TextBoxFor(m => PrivateProperty)
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithTagHelpers.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithTagHelpers.cshtml
new file mode 100644
index 0000000000..8bf8575cdc
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithTagHelpers.cshtml
@@ -0,0 +1,27 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@using HtmlGenerationWebSite.Models
+@model WeirdModel
+
+@functions{
+    private string PrivateProperty { get; set; } = "Hello, Private World!";
+}
+
+<html>
+<body>
+    <div>
+        <p>Field</p>
+        <label asp-for="Field" />
+        <input asp-for="Field" />
+    </div>
+    <div>
+        <p>Static Property</p>
+        <label asp-for="@WeirdModel.StaticProperty" />
+        <input asp-for="@WeirdModel.StaticProperty" />
+    </div>
+    <div>
+        <p>Private Property</p>
+        <label asp-for="@PrivateProperty" />
+        <input asp-for="@PrivateProperty" />
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/Components/Splash/Default.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/Components/Splash/Default.cshtml
new file mode 100644
index 0000000000..5e77c7a1ca
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/Components/Splash/Default.cshtml
@@ -0,0 +1,7 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@model string
+Locations closest to your locale:
+<cache vary-by-header="Locale">
+@Model
+<div>CorrelationId in View Component: @ViewBag.CorrelationId</div>
+</cache>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/Customer.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/Customer.cshtml
new file mode 100644
index 0000000000..47da58f35a
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/Customer.cshtml
@@ -0,0 +1,46 @@
+@model HtmlGenerationWebSite.Models.Customer
+
+@{
+    ViewBag.Title = "Customer Page";
+}
+
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+<html>
+<body>
+    <form asp-route-area="Customer" asp-controller="HtmlGeneration_Customer" asp-action="Index" asp-antiforgery="true">
+        <div>
+            <label asp-for="Number" class="order"></label>
+            <input asp-for="Number" type="number" class="form-control" />
+            <span asp-validation-for="Number"></span>
+        </div>
+        <div>
+            <label asp-for="Name" class="order"></label>
+            <input asp-for="Name" type="text" />
+        </div>
+        <div>
+            <label asp-for="Email" class="order"></label>
+            <input asp-for="Email" type="email" />
+            <span asp-validation-for="Email"></span>
+        </div>
+        <div>
+            <label asp-for="PhoneNumber" class="order"></label>
+            <input asp-for="PhoneNumber" type="tel" />
+        </div>
+        <div>
+            <label asp-for="Password" class="order"></label>
+            <input asp-for="Password" type="password" class="form-control" />
+            <span asp-validation-for="Password"></span>
+        </div>
+        <div>
+            <label asp-for="Gender" class="order"></label>
+            <input asp-for="Gender" type="radio" value="Male" /> Male
+            <input asp-for="Gender" type="radio" value="Female" /> Female
+            <span asp-validation-for="Gender"></span>
+        </div>
+        <div asp-validation-summary="All" class="order"></div>
+        <div asp-validation-summary="ModelOnly" class="order"></div>
+        <input type="submit"/>
+    </form>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/DisplayTemplates/DayOfWeek.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/DisplayTemplates/DayOfWeek.cshtml
new file mode 100644
index 0000000000..ec91752e11
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/DisplayTemplates/DayOfWeek.cshtml
@@ -0,0 +1,25 @@
+@model HtmlGenerationWebSite.Models.DayOfWeek
+@switch (Model)
+{
+    case HtmlGenerationWebSite.Models.DayOfWeek.Monday:
+        <text>Maandag</text>
+        break;
+    case HtmlGenerationWebSite.Models.DayOfWeek.Tuesday:
+        <text>Dinsdag</text>
+        break;
+    case HtmlGenerationWebSite.Models.DayOfWeek.Wednesday:
+        <text>Woensdag</text>
+        break;
+    case HtmlGenerationWebSite.Models.DayOfWeek.Thursday:
+        <text>Donderdag</text>
+        break;
+    case HtmlGenerationWebSite.Models.DayOfWeek.Friday:
+        <text>Vrijdag</text>
+        break;
+    case HtmlGenerationWebSite.Models.DayOfWeek.Saturday:
+        <text>Zaterdag</text>
+        break;
+    case HtmlGenerationWebSite.Models.DayOfWeek.Sunday:
+        <text>Zondag</text>
+        break;
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/EditorTemplates/Common.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/EditorTemplates/Common.cshtml
new file mode 100644
index 0000000000..4e63272013
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/EditorTemplates/Common.cshtml
@@ -0,0 +1,2 @@
+@Html.LabelFor(m => m, new { @class = "control-label col-md-2" })
+@Html.TextBox("", ViewData.TemplateInfo.FormattedModelValue)
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/EditorTemplates/String.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/EditorTemplates/String.cshtml
new file mode 100644
index 0000000000..8ea3e6f25c
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/EditorTemplates/String.cshtml
@@ -0,0 +1,3 @@
+@model string
+@Html.LabelFor(m => m)
+@Html.TextBox("", ViewData.TemplateInfo.FormattedModelValue)
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/_Partial.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/_Partial.cshtml
new file mode 100644
index 0000000000..fcdc0458e2
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/_Partial.cshtml
@@ -0,0 +1 @@
+Hello from partial
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/appRoot.css b/src/Mvc/test/WebSites/HtmlGenerationWebSite/appRoot.css
new file mode 100644
index 0000000000..7b9214822c
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/appRoot.css
@@ -0,0 +1,8 @@
+body::after {
+    display: block;
+    background-color: #ff0000;
+    color: #fff;
+    font-size: 1.2em;
+    margin-top: 2.4em;
+    content: "ERROR: Stylesheet 'appRoot.css' was loaded from outside webroot!";
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/appRoot.js b/src/Mvc/test/WebSites/HtmlGenerationWebSite/appRoot.js
new file mode 100644
index 0000000000..8845d572ba
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/appRoot.js
@@ -0,0 +1 @@
+alert("ERROR!! This should never be loaded");
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/readme.md b/src/Mvc/test/WebSites/HtmlGenerationWebSite/readme.md
new file mode 100644
index 0000000000..40cb613bba
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/readme.md
@@ -0,0 +1,4 @@
+HtmlGenerationWebSite
+===
+
+This web site illustrates how to use MVC HTML and tag helpers.
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/images/red.png b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/images/red.png
new file mode 100644
index 0000000000..b72127b403
Binary files /dev/null and b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/images/red.png differ
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/.gitattributes b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/.gitattributes
new file mode 100644
index 0000000000..54a3709b28
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/.gitattributes
@@ -0,0 +1,2 @@
+site*.css eol=crlf
+site*.js  eol=crlf
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.css b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.css
new file mode 100644
index 0000000000..5c98e1d66e
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.css
@@ -0,0 +1,6 @@
+body::after {
+    display: block;
+    color: #0fa912;
+    margin-top: 2.4em;
+    content: "Stylesheet 'site.css' loaded successfully!";
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.js b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.js
new file mode 100644
index 0000000000..f2d918ec95
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.js
@@ -0,0 +1,6 @@
+(function () {
+    var p = document.createElement("P");
+    p.appendChild(document.createTextNode("site.js loaded successfully!"));
+    p.style.color = "#0fa912";
+    document.body.appendChild(p);
+})();
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.css b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.css
new file mode 100644
index 0000000000..8bbb6ad4d5
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.css
@@ -0,0 +1,6 @@
+body::after {
+    display: block;
+    color: #0fa912;
+    margin-top: 2.4em;
+    content: "Stylesheet 'site2.css' loaded successfully!";
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.js b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.js
new file mode 100644
index 0000000000..48b6411f60
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.js
@@ -0,0 +1,6 @@
+(function () {
+    var p = document.createElement("P");
+    p.appendChild(document.createTextNode("site2.js loaded successfully!"));
+    p.style.color = "#0fa912";
+    document.body.appendChild(p);
+})();
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.css b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.css
new file mode 100644
index 0000000000..66c41540aa
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.css
@@ -0,0 +1,7 @@
+body::after {
+    display: block;
+    background-color: #ff0000;
+    color: #fff;
+    margin-top: 2.4em;
+    content: "ERROR: Stylesheet 'site3.css' was loaded despite being excluded!";
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.js b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.js
new file mode 100644
index 0000000000..8845d572ba
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.js
@@ -0,0 +1 @@
+alert("ERROR!! This should never be loaded");
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.min.css b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.min.css
new file mode 100644
index 0000000000..93bd141bdd
--- /dev/null
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.min.css
@@ -0,0 +1,7 @@
+body::after {
+    display: block;
+    background-color: #ff0000;
+    color: #fff;
+    margin-top: 2.4em;
+    content: "ERROR: Stylesheet 'site3.min.css' was loaded despite being excluded!";
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/Pages/Precompilation/Page.cs b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/Pages/Precompilation/Page.cs
new file mode 100644
index 0000000000..989480bc6d
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/Pages/Precompilation/Page.cs
@@ -0,0 +1,39 @@
+#pragma checksum "D:\k\Mvc\test\WebSites\RazorBuildWebSite\Pages\Precompilation\Page.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "f3a9fa49018f90b3470f6c0e4f475d1d8c9cd456"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/Pages/Precompilation/Page.cshtml", typeof(RazorBuildWebSite.Pages.Precompilation._Pages_Precompilation_Page), null)]
+namespace RazorBuildWebSite.Pages.Precompilation
+{
+#line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class _Pages_Precompilation_Page : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+#pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(26, 52, true);
+            WriteLiteral("\r\nHello from buildtime-compiled precompilation page!\r\n");
+            EndContext();
+        }
+#pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<Page_Model> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<Page_Model> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<Page_Model>)PageContext?.ViewData;
+        public Page_Model Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/Pages/Precompilation/Page_Model.cs b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/Pages/Precompilation/Page_Model.cs
new file mode 100644
index 0000000000..bc6db7744e
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/Pages/Precompilation/Page_Model.cs
@@ -0,0 +1,9 @@
+
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorBuildWebSite.Pages.Precompilation
+{
+    public class Page_Model : PageModel
+    {
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj
new file mode 100644
index 0000000000..73549c2142
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+    <DefineConstants>$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/Views/Common/CommonView.cs b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/Views/Common/CommonView.cs
new file mode 100644
index 0000000000..429418e2d5
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/Views/Common/CommonView.cs
@@ -0,0 +1,37 @@
+#pragma checksum "D:\k\Mvc\test\WebSites\RazorBuildWebSite\Views\Common\CommonView.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "a09a0106df2e63aecf6fc6ddf30df39b489d9783"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/Views/Common/CommonView.cshtml", typeof(RazorBuildWebSite.Views.Precompilation._Views_Precompilation_CommonView))]
+namespace RazorBuildWebSite.Views.Precompilation
+{
+#line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class _Views_Precompilation_CommonView : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+#pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(0, 48, true);
+            WriteLiteral("Hello from buildtime-compiled precompilation view!");
+            EndContext();
+        }
+#pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/Views/Precompilation/View.cs b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/Views/Precompilation/View.cs
new file mode 100644
index 0000000000..704f7fbeee
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/Views/Precompilation/View.cs
@@ -0,0 +1,37 @@
+#pragma checksum "D:\k\Mvc\test\WebSites\RazorBuildWebSite\Views\Precompilation\View.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "a09a0106df2e63aecf6fc6ddf30df39b489d9783"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/Views/Precompilation/View.cshtml", typeof(RazorBuildWebSite.Views.Precompilation._Views_Precompilation_View))]
+namespace RazorBuildWebSite.Views.Precompilation
+{
+#line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    public class _Views_Precompilation_View : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+#pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(0, 48, true);
+            WriteLiteral("Hello from buildtime-compiled precompilation view!");
+            EndContext();
+        }
+#pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite.Views/AssemblyInfo.cs b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/AssemblyInfo.cs
new file mode 100644
index 0000000000..f5a842f0db
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/AssemblyInfo.cs
@@ -0,0 +1,11 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Generated by the MSBuild WriteCodeFragment class.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Reflection;
+
+[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ProvideApplicationPartFactoryAttribute("Microsoft.AspNetCore.Mvc.ApplicationParts.CompiledRazorAssemblyApplicationPartFac" +
+"tory, Microsoft.AspNetCore.Mvc.Razor")]
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page.cs b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page.cs
new file mode 100644
index 0000000000..57149440b2
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page.cs
@@ -0,0 +1,42 @@
+#pragma checksum "D:\k\Mvc\test\WebSites\RazorBuildWebSite\Pages\Rzc\Page.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "994150b02ce31b2e2bc6f6e84a5b2018c2517527"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(RazorBuildWebSite.Pages.Rzc.Pages_Rzc_Page), @"mvc.1.0.razor-page", @"/Pages/Rzc/Page.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.RazorPageAttribute(@"/Pages/Rzc/Page.cshtml", typeof(RazorBuildWebSite.Pages.Rzc.Pages_Rzc_Page), null)]
+namespace RazorBuildWebSite.Pages.Rzc
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"994150b02ce31b2e2bc6f6e84a5b2018c2517527", @"/Pages/Rzc/Page.cshtml")]
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"6e8da24aa0669afc00c9420240b06856670645a9", @"/Pages/_ViewImports.cshtml")]
+    internal class Pages_Rzc_Page : global::Microsoft.AspNetCore.Mvc.RazorPages.Page
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(26, 43, true);
+            WriteLiteral("\r\nHello from buildtime-compiled rzc page!\r\n");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<Page_Model> Html { get; private set; }
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<Page_Model> ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<Page_Model>)PageContext?.ViewData;
+        public Page_Model Model => ViewData.Model;
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page_Model.cs b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page_Model.cs
new file mode 100644
index 0000000000..9faad97ed3
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page_Model.cs
@@ -0,0 +1,9 @@
+
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorBuildWebSite.Pages.Rzc
+{
+    public class Page_Model : PageModel
+    {
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj
new file mode 100644
index 0000000000..73549c2142
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+    <DefineConstants>$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite.Views/Views/Common/CommonView.cs b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/Views/Common/CommonView.cs
new file mode 100644
index 0000000000..c94a379958
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/Views/Common/CommonView.cs
@@ -0,0 +1,40 @@
+#pragma checksum "D:\k\Mvc\test\WebSites\RazorBuildWebSite\Views\Common\CommonView.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "56260f24a80ae2b8854fd2c9a1005bae485882cc"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(RazorBuildWebSite.Views.Rzc.Views_Rzc_View), @"mvc.1.0.view", @"/Views/Common/CommonView.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/Views/CommonView.cshtml", typeof(RazorBuildWebSite.Views.Rzc.Views_Rzc_View))]
+namespace RazorBuildWebSite.Views.Rzc
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"56260f24a80ae2b8854fd2c9a1005bae485882cc", @"/Views/Common/CommonView.cshtml")]
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"f265f06036e4378eada2a78f5366ad0e13e1d8af", @"/_ViewImports.cshtml")]
+    internal class Views_Rzc_CommonView : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(0, 39, true);
+            WriteLiteral("Hello from buildtime-compiled rzc view!");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite.Views/Views/Rzc/View.cs b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/Views/Rzc/View.cs
new file mode 100644
index 0000000000..4b731211e5
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/Views/Rzc/View.cs
@@ -0,0 +1,40 @@
+#pragma checksum "D:\k\Mvc\test\WebSites\RazorBuildWebSite\Views\Rzc\View.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "56260f24a80ae2b8854fd2c9a1005bae485882cc"
+// <auto-generated/>
+#pragma warning disable 1591
+[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(RazorBuildWebSite.Views.Rzc.Views_Rzc_View), @"mvc.1.0.view", @"/Views/Rzc/View.cshtml")]
+[assembly:global::Microsoft.AspNetCore.Mvc.Razor.Compilation.RazorViewAttribute(@"/Views/Rzc/View.cshtml", typeof(RazorBuildWebSite.Views.Rzc.Views_Rzc_View))]
+namespace RazorBuildWebSite.Views.Rzc
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"56260f24a80ae2b8854fd2c9a1005bae485882cc", @"/Views/Rzc/View.cshtml")]
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"f265f06036e4378eada2a78f5366ad0e13e1d8af", @"/Views/_ViewImports.cshtml")]
+    internal class Views_Rzc_View : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            BeginContext(0, 39, true);
+            WriteLiteral("Hello from buildtime-compiled rzc view!");
+            EndContext();
+        }
+        #pragma warning restore 1998
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider ModelExpressionProvider { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IUrlHelper Url { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.IViewComponentHelper Component { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper Json { get; private set; }
+        [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
+        public global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<dynamic> Html { get; private set; }
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/Controllers/CommonController.cs b/src/Mvc/test/WebSites/RazorBuildWebSite/Controllers/CommonController.cs
new file mode 100644
index 0000000000..4659d40966
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/Controllers/CommonController.cs
@@ -0,0 +1,13 @@
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorBuildWebSite.Controllers
+{
+    public class CommonController : Controller
+    {
+        public new ActionResult View()
+        {
+            return base.View("CommonView");
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/Controllers/PrecompilationController.cs b/src/Mvc/test/WebSites/RazorBuildWebSite/Controllers/PrecompilationController.cs
new file mode 100644
index 0000000000..a14f94a13f
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/Controllers/PrecompilationController.cs
@@ -0,0 +1,13 @@
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorBuildWebSite.Controllers
+{
+    public class PrecompilationController : Controller
+    {
+        public new ActionResult View()
+        {
+            return base.View();
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/Controllers/RzcController.cs b/src/Mvc/test/WebSites/RazorBuildWebSite/Controllers/RzcController.cs
new file mode 100644
index 0000000000..cd032017a2
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/Controllers/RzcController.cs
@@ -0,0 +1,13 @@
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorBuildWebSite.Controllers
+{
+    public class RzcController : Controller
+    {
+        public new ActionResult View()
+        {
+            return base.View();
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/Pages/Precompilation/Page.cshtml b/src/Mvc/test/WebSites/RazorBuildWebSite/Pages/Precompilation/Page.cshtml
new file mode 100644
index 0000000000..7a399ab8a0
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/Pages/Precompilation/Page.cshtml
@@ -0,0 +1,4 @@
+@page
+@model Page_Model
+
+Hello from runtime-compiled precompilation page!
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/Pages/Rzc/Page.cshtml b/src/Mvc/test/WebSites/RazorBuildWebSite/Pages/Rzc/Page.cshtml
new file mode 100644
index 0000000000..44dab72c6b
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/Pages/Rzc/Page.cshtml
@@ -0,0 +1,4 @@
+@page
+@model Page_Model
+
+Hello from runtime-compiled rzc page!
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/Pages/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorBuildWebSite/Pages/_ViewImports.cshtml
new file mode 100644
index 0000000000..7080884287
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/Pages/_ViewImports.cshtml
@@ -0,0 +1 @@
+@namespace RazorBuildWebSite.Pages
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj
new file mode 100644
index 0000000000..ecf6d47b77
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+    <DefineConstants>$(DefineConstants)</DefineConstants>
+    <!-- We have tests that test runtime view compilation. -->
+    <RazorCompileOnBuild>false</RazorCompileOnBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+
+    <!-- Faking like we had Razor-on-Build (Rzc) and MvcPrecompilation -->
+    <ProjectReference Include="..\RazorBuildWebSite.PrecompiledViews\RazorBuildWebSite.PrecompiledViews.csproj" />
+    <ProjectReference Include="..\RazorBuildWebSite.Views\RazorBuildWebSite.Views.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(MicrosoftAspNetCoreDiagnosticsPackageVersion)" />
+
+    <!--
+      Referencing here so you can easily regenerate the C# from Razor.
+      Just do `dotnet build /t:RazorGenerate /p:TargetFramework=netcoreapp2.0` and look in obj/Debug/netcoreapp2.0/Razor
+      -->
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="$(MicrosoftAspNetCoreRazorDesignPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="$(MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/Startup.cs b/src/Mvc/test/WebSites/RazorBuildWebSite/Startup.cs
new file mode 100644
index 0000000000..b66bede92b
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/Startup.cs
@@ -0,0 +1,38 @@
+// 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.
+
+using System.IO;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace RazorBuildWebSite
+{
+    public class Startup
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddMvc();
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseMvcWithDefaultRoute();
+        }
+
+        public static void Main(string[] args)
+        {
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
+            host.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            new WebHostBuilder()
+            .UseContentRoot(Directory.GetCurrentDirectory())
+            .UseStartup<Startup>()
+            .UseKestrel()
+            .UseIISIntegration();
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/Views/Precompilation/View.cshtml b/src/Mvc/test/WebSites/RazorBuildWebSite/Views/Precompilation/View.cshtml
new file mode 100644
index 0000000000..92afcc7180
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/Views/Precompilation/View.cshtml
@@ -0,0 +1 @@
+Hello from runtime-compiled precompilation view!
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/Views/Rzc/View.cshtml b/src/Mvc/test/WebSites/RazorBuildWebSite/Views/Rzc/View.cshtml
new file mode 100644
index 0000000000..9b313496e3
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/Views/Rzc/View.cshtml
@@ -0,0 +1 @@
+Hello from runtime-compiled rzc view!
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/Views/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorBuildWebSite/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..9f1dc56476
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/Views/_ViewImports.cshtml
@@ -0,0 +1 @@
+@namespace RazorBuildWebSite.Views
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/readme.md b/src/Mvc/test/WebSites/RazorBuildWebSite/readme.md
new file mode 100644
index 0000000000..292a669614
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/readme.md
@@ -0,0 +1,4 @@
+RazorBuildWebSite
+===
+
+This web site tests how the Razor view engine interacts with pre-built Razor assemblies.
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/HomeController.cs b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/HomeController.cs
new file mode 100644
index 0000000000..3f23b8f768
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/HomeController.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorPageExecutionInstrumentationWebSite
+{
+    public class HomeController : Controller
+    {
+        public ActionResult ViewWithPartial()
+        {
+            return View();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/RazorPageDiagnosticListener.cs b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/RazorPageDiagnosticListener.cs
new file mode 100644
index 0000000000..30ca586d01
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/RazorPageDiagnosticListener.cs
@@ -0,0 +1,29 @@
+// 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.
+
+using System.IO;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DiagnosticAdapter;
+
+namespace RazorPageExecutionInstrumentationWebSite
+{
+    public class RazorPageDiagnosticListener
+    {
+        public static readonly object WriterKey = new object();
+
+        [DiagnosticName("Microsoft.AspNetCore.Mvc.Razor.BeginInstrumentationContext")]
+        public virtual void OnBeginPageInstrumentationContext(
+            HttpContext httpContext,
+            string path,
+            int position,
+            int length,
+            bool isLiteral)
+        {
+            var literal = isLiteral ? "Literal" : "Non-literal";
+            var text = $"{path}: {literal} at {position} contains {length} characters.";
+
+            var writer = (TextWriter)httpContext.Items[WriterKey];
+            writer.WriteLine(text);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/RazorPageExecutionInstrumentationWebSite.csproj b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/RazorPageExecutionInstrumentationWebSite.csproj
new file mode 100644
index 0000000000..8b6090fc0f
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/RazorPageExecutionInstrumentationWebSite.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="$(MicrosoftExtensionsDiagnosticAdapterPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/Startup.cs b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/Startup.cs
new file mode 100644
index 0000000000..76b1886b01
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/Startup.cs
@@ -0,0 +1,61 @@
+// 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.
+
+using System.Diagnostics;
+using System.IO;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace RazorPageExecutionInstrumentationWebSite
+{
+    public class Startup
+    {
+        // Set up application services
+        public void ConfigureServices(IServiceCollection services)
+        {
+            // Normalize line endings to avoid changes in instrumentation locations between systems.
+            services.AddTransient<RazorProjectFileSystem, TestRazorProjectFileSystem>();
+
+            // Add MVC services to the services container.
+            services.AddMvc();
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            var listener = new RazorPageDiagnosticListener();
+            var diagnosticSource = app.ApplicationServices.GetRequiredService<DiagnosticListener>();
+            diagnosticSource.SubscribeWithAdapter(listener);
+
+            app.Use(async (context, next) =>
+            {
+                using (var writer = new StreamWriter(context.Response.Body))
+                {
+                    context.Items[RazorPageDiagnosticListener.WriterKey] = writer;
+                    context.Response.Body = Stream.Null;
+                    await next();
+                }
+            });
+
+            // Add MVC to the request pipeline
+            app.UseMvcWithDefaultRoute();
+        }
+
+        public static void Main(string[] args)
+        {
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
+            host.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            new WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseStartup<Startup>()
+                .UseKestrel()
+                .UseIISIntegration();
+    }
+}
+
diff --git a/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/TestRazorCompilationService.cs b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/TestRazorCompilationService.cs
new file mode 100644
index 0000000000..d4171804fb
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/TestRazorCompilationService.cs
@@ -0,0 +1,48 @@
+// 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.
+
+using System.IO;
+using System.Text;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace RazorPageExecutionInstrumentationWebSite
+{
+    public class TestRazorProjectFileSystem : FileProviderRazorProjectFileSystem
+    {
+        public TestRazorProjectFileSystem(IRazorViewEngineFileProviderAccessor fileProviderAccessor, IHostingEnvironment hostingEnvironment)
+            : base(fileProviderAccessor, hostingEnvironment)
+        {
+        }
+
+        public override RazorProjectItem GetItem(string path)
+        {
+            var item = (FileProviderRazorProjectItem)base.GetItem(path);
+            return new TestRazorProjectItem(item);
+        }
+
+        private class TestRazorProjectItem : FileProviderRazorProjectItem
+        {
+            public TestRazorProjectItem(FileProviderRazorProjectItem projectItem)
+                : base(projectItem.FileInfo, projectItem.BasePath, projectItem.FilePath, projectItem.RelativePhysicalPath)
+            {
+            }
+
+            public override Stream Read()
+            {
+                // Normalize line endings to '\r\n' (CRLF). This removes core.autocrlf, core.eol, core.safecrlf, and
+                // .gitattributes from the equation and treats "\r\n" and "\n" as equivalent. Does not handle
+                // some line endings like "\r" but otherwise ensures checksums and line mappings are consistent.
+                string text;
+                using (var streamReader = new StreamReader(base.Read()))
+                {
+                    text = streamReader.ReadToEnd().Replace("\r", "").Replace("\n", "\r\n");
+                }
+
+                var bytes = Encoding.UTF8.GetBytes(text);
+                return new MemoryStream(bytes);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/Home/ViewWithPartial.cshtml b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/Home/ViewWithPartial.cshtml
new file mode 100644
index 0000000000..8f42baf024
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/Home/ViewWithPartial.cshtml
@@ -0,0 +1,5 @@
+view-with-partial-content
+@await Html.PartialAsync("_PartialView")
+@{
+await Html.RenderPartialAsync("_PartialView");
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/Home/_PartialView.cshtml b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/Home/_PartialView.cshtml
new file mode 100644
index 0000000000..3b945a4613
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/Home/_PartialView.cshtml
@@ -0,0 +1,4 @@
+@{
+    var cls = "class";
+}
+<p class="@cls">partial-content</p>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/_Layout.cshtml b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/_Layout.cshtml
new file mode 100644
index 0000000000..23e469ccc9
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/_Layout.cshtml
@@ -0,0 +1,4 @@
+<div>
+@int.MaxValue
+@RenderBody()
+</div>
diff --git a/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/_ViewStart.cshtml
new file mode 100644
index 0000000000..3b3abdacaa
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/_ViewStart.cshtml
@@ -0,0 +1,5 @@
+@{
+    Layout = "/Views/_Layout.cshtml";
+    var viewStartMessage = "viewstart-content";
+}
+@viewStartMessage
diff --git a/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/readme.md b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/readme.md
new file mode 100644
index 0000000000..b5de53569b
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPageExecutionInstrumentationWebSite/readme.md
@@ -0,0 +1,4 @@
+RazorPageExecutionInstrumentationWebSite
+===
+
+This web site is used for functional testing of page instrumentation.
diff --git a/src/Mvc/test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Overriden.cshtml b/src/Mvc/test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Overriden.cshtml
new file mode 100644
index 0000000000..297cb03980
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Overriden.cshtml
@@ -0,0 +1,2 @@
+@page
+@{ throw new Exception("This page should be overriden by the application."); }
diff --git a/src/Mvc/test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Served.cshtml b/src/Mvc/test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Served.cshtml
new file mode 100644
index 0000000000..b58fb3c243
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Served.cshtml
@@ -0,0 +1,2 @@
+@page
+This page is served from RazorPagesClassLibrary
diff --git a/src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj b/src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj
new file mode 100644
index 0000000000..8fa786d637
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <!--  Workaround https://github.com/dotnet/core-setup/issues/3726 -->
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+
+    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Controllers/HomeController.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Controllers/HomeController.cs
new file mode 100644
index 0000000000..596befbd2c
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Controllers/HomeController.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorPagesWebSite
+{
+    [Area("Accounts")]
+    public class HomeController : Controller
+    {
+        public IActionResult Index() => View();
+    }
+
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/About.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/About.cshtml
new file mode 100644
index 0000000000..41bcf05b63
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/About.cshtml
@@ -0,0 +1,2 @@
+@page
+Hello from a page in Accounts area
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/RenderPartials.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/RenderPartials.cshtml
new file mode 100644
index 0000000000..f46c0eaac6
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/RenderPartials.cshtml
@@ -0,0 +1,9 @@
+@page
+@{
+    Layout = "_GlobalLayout";
+}
+<partial name="_PartialInManage" />
+<partial name="_PartialInAreaPagesRoot" />
+<partial name="../_PartialInAreaPagesRoot" />
+<partial name="_PartialInAreasSharedViews" />
+<partial name="_FileInShared" />
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/_PartialInManage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/_PartialInManage.cshtml
new file mode 100644
index 0000000000..8c48fa2a89
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/_PartialInManage.cshtml
@@ -0,0 +1 @@
+Partial in /Areas/Accounts/Pages/Manage/
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithLinks.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithLinks.cshtml
new file mode 100644
index 0000000000..724d540236
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithLinks.cshtml
@@ -0,0 +1,6 @@
+@page
+<a asp-page="/Manage/RenderPartials">Link inside area</a>
+<a asp-page="/List" asp-area="Products" asp-route-sort="old" asp-route-top="20">Link to external area</a>
+<a asp-controller="Home" asp-action="Index">Link to area action</a>
+<a asp-page="/Admin/Index" asp-area="">Link to non-area page</a>
+ 
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithRouteTemplate.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithRouteTemplate.cshtml
new file mode 100644
index 0000000000..67da977644
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithRouteTemplate.cshtml
@@ -0,0 +1,7 @@
+@page "{id}"
+@functions
+{
+    [BindProperty(SupportsGet = true)]
+    public string Id { get; set; }
+}
+The id is @Id
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RelativeLinks/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RelativeLinks/Index.cshtml
new file mode 100644
index 0000000000..07c7ea0ec1
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RelativeLinks/Index.cshtml
@@ -0,0 +1,4 @@
+@page
+<a asp-page="../PageWithRouteTemplate" asp-route-id="1">Parent directory</a>
+<a asp-page="../Manage/RenderPartials">Sibling directory</a>
+<a asp-page="../List" asp-area="Products">Go back to root of different area</a>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/AllowAnonymous.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/AllowAnonymous.cshtml
new file mode 100644
index 0000000000..221402ef5c
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/AllowAnonymous.cshtml
@@ -0,0 +1,2 @@
+@page
+Hello from AllowAnonymous
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/Index.cshtml
new file mode 100644
index 0000000000..3749762261
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/Index.cshtml
@@ -0,0 +1,2 @@
+@page
+@{ throw new Exception("This should not be rendered."); }
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/_PartialInAreaPagesRoot.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/_PartialInAreaPagesRoot.cshtml
new file mode 100644
index 0000000000..763bcc1103
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/_PartialInAreaPagesRoot.cshtml
@@ -0,0 +1 @@
+Partial in /Areas/Accounts/Pages/
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Home/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Home/Index.cshtml
new file mode 100644
index 0000000000..c59d1afadc
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Home/Index.cshtml
@@ -0,0 +1,3 @@
+<a asp-page="/PageWithRouteTemplate" asp-route-id="10">Link to page inside current area</a>
+<a asp-area="Products" asp-page="/List" asp-route-sort="best">Link to page in different area</a>
+<a asp-page="/Routes/Sibling">Link to page outside area</a>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Shared/_PartialInAreasSharedViews.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Shared/_PartialInAreasSharedViews.cshtml
new file mode 100644
index 0000000000..544da589c2
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Shared/_PartialInAreasSharedViews.cshtml
@@ -0,0 +1 @@
+Partial in /Areas/Accounts/Views/Shared/
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/_ViewImports.cshtml
new file mode 100644
index 0000000000..aaf882de29
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/_ViewImports.cshtml
@@ -0,0 +1 @@
+@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Products/Pages/List.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Products/Pages/List.cshtml
new file mode 100644
index 0000000000..a860f502be
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Products/Pages/List.cshtml
@@ -0,0 +1 @@
+@page "{sort?}/{top?}"
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Components/ViewDataViewComponent.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Components/ViewDataViewComponent.cs
new file mode 100644
index 0000000000..ad499c9e0f
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Components/ViewDataViewComponent.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorPagesWebSite.Components
+{
+    public class ViewDataViewComponent : ViewComponent
+    {
+        public IViewComponentResult Invoke()
+        {
+            return View();
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Controllers/RedirectController.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Controllers/RedirectController.cs
new file mode 100644
index 0000000000..ea9a070809
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Controllers/RedirectController.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorPagesWebSite
+{
+    public class RedirectController : Controller
+    {
+        [HttpGet("/RedirectToPage")]
+        public IActionResult RedirectToPageAction()
+        {
+            return RedirectToPage("/RedirectToController", new { param = 17 });
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Conventions/CustomModelTypeConvention.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Conventions/CustomModelTypeConvention.cs
new file mode 100644
index 0000000000..c37ce99a8d
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Conventions/CustomModelTypeConvention.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using System.Reflection;
+
+namespace RazorPagesWebSite.Conventions
+{
+    internal class CustomModelTypeConvention : IPageApplicationModelConvention
+    {
+        public void Apply(PageApplicationModel model)
+        {
+            if (model.ModelType == typeof(CustomModelTypeModel))
+            {
+                model.ModelType = typeof(CustomModelTypeModel<User>).GetTypeInfo();
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/CustomActionResult.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/CustomActionResult.cs
new file mode 100644
index 0000000000..65ab917212
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/CustomActionResult.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorPagesWebSite
+{
+    public class CustomActionResult : IActionResult
+    {
+        public Task ExecuteResultAsync(ActionContext context)
+        {
+            context.HttpContext.Response.StatusCode = 200;
+            return context.HttpContext.Response.WriteAsync(nameof(CustomActionResult));
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/DefaultNamespace.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/DefaultNamespace.cshtml
new file mode 100644
index 0000000000..047d31292b
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/DefaultNamespace.cshtml
@@ -0,0 +1,2 @@
+@page
+@(GetType().Namespace)
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/HandlerTestPage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/HandlerTestPage.cshtml
new file mode 100644
index 0000000000..93dcb1d6a1
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/HandlerTestPage.cshtml
@@ -0,0 +1,48 @@
+@page "{handler?}"
+
+@using RazorPagesWebSite
+
+@functions{
+    public string MethodName { get; set; }
+
+    public IActionResult OnGet()
+    {
+        return Page();
+    }
+
+    public async Task<IActionResult> OnPostAsync()
+    {
+        await Task.CompletedTask;
+        MethodName = nameof(OnPostAsync);
+        return Page();
+    }
+
+    public async Task OnGetCustomer()
+    {
+        await Task.CompletedTask;
+        MethodName = nameof(OnGetCustomer);
+    }
+
+    public async Task OnGetViewCustomerAsync()
+    {
+        await Task.CompletedTask;
+        MethodName = nameof(OnGetViewCustomerAsync);
+    }
+
+    public async Task<CustomActionResult> OnPostCustomActionResult()
+    {
+        await Task.CompletedTask;
+        return new CustomActionResult();
+    }
+
+    public CustomActionResult OnGetCustomACtionResultAsync()
+    {
+        return new CustomActionResult();
+    }
+}
+
+Method: @MethodName
+@using (Html.BeginForm())
+{
+    @Html.AntiForgeryToken()
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorld.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorld.cshtml
new file mode 100644
index 0000000000..69204d9455
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorld.cshtml
@@ -0,0 +1,3 @@
+@page
+
+Hello, World!
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithAuth.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithAuth.cshtml
new file mode 100644
index 0000000000..c6a654ccce
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithAuth.cshtml
@@ -0,0 +1,3 @@
+@page
+
+Can't see me
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithHandler.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithHandler.cshtml
new file mode 100644
index 0000000000..dfca1fb421
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithHandler.cshtml
@@ -0,0 +1,12 @@
+@page
+
+@functions {
+    public string Message { get; set; }
+
+    public void OnGet(string message)
+    {
+        Message = message;
+    }
+}
+
+Hello, @Message!
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelAttributeModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelAttributeModel.cs
new file mode 100644
index 0000000000..fb924ba5ec
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelAttributeModel.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+
+namespace RazorPagesWebSite
+{
+    [PageModel]
+    public class HelloWorldWithPageModelAttributeModel
+    {
+        public string Message { get; set; }
+
+        public void OnGet(string message)
+        {
+            Message = message;
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelAttributeModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelAttributeModel.cshtml
new file mode 100644
index 0000000000..23197b2dbf
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelAttributeModel.cshtml
@@ -0,0 +1,3 @@
+@page
+@model RazorPagesWebSite.HelloWorldWithPageModelAttributeModel
+Hello, @Model.Message!
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelHandler.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelHandler.cs
new file mode 100644
index 0000000000..d6622314da
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelHandler.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite
+{
+    public class HelloWorldWithPageModelHandler : PageModel
+    {
+        public string Message { get; set; }
+
+        public void OnGet(string message)
+        {
+            Message = message;
+        }
+
+        public void OnPost()
+        {
+            Message = "You posted!";
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelHandler.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelHandler.cshtml
new file mode 100644
index 0000000000..a8f850aca1
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelHandler.cshtml
@@ -0,0 +1,10 @@
+@page
+
+@model RazorPagesWebSite.HelloWorldWithPageModelHandler
+
+Hello, @Model.Message!
+
+@using (Html.BeginForm())
+{
+    @Html.AntiForgeryToken()
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithRoute.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithRoute.cshtml
new file mode 100644
index 0000000000..9a2c6012cc
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithRoute.cshtml
@@ -0,0 +1,3 @@
+@page "Some/Path/{text}"
+
+Hello, @(ViewContext.RouteData.Values["text"])!
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/InjectedPageProperties.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/InjectedPageProperties.cshtml
new file mode 100644
index 0000000000..ed07662bce
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/InjectedPageProperties.cshtml
@@ -0,0 +1,5 @@
+@page
+
+@Url.GetType()
+@Html.GetType()
+@ViewData.GetType()
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/ModelAsFilter.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelAsFilter.cs
new file mode 100644
index 0000000000..503e9eb21c
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelAsFilter.cs
@@ -0,0 +1,39 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite
+{
+    public class ModelAsFilter : PageModel, IResultFilter
+    {
+        public string Message { get; set; }
+
+        public void OnGet(string message)
+        {
+            Message = message;
+        }
+
+        public IActionResult OnGetTestResultFilter() => NotFound();
+
+        public override void OnPageHandlerExecuting(PageHandlerExecutingContext context)
+        {
+            context.HandlerArguments["message"] = "Hello from OnPageHandlerExecuting";
+        }
+
+        public void OnResultExecuted(ResultExecutedContext context)
+        {
+        }
+
+        public void OnResultExecuting(ResultExecutingContext context)
+        {
+            if (context.Result is NotFoundResult)
+            {
+                context.Result = Redirect("/Different-Location");
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/ModelAsFilter.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelAsFilter.cshtml
new file mode 100644
index 0000000000..61d5fce1a9
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelAsFilter.cshtml
@@ -0,0 +1,3 @@
+@page "{handler?}"
+@model RazorPagesWebSite.ModelAsFilter
+@Model.Message
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/ModelHandlerTestModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelHandlerTestModel.cs
new file mode 100644
index 0000000000..a5d25a001e
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelHandlerTestModel.cs
@@ -0,0 +1,59 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite
+{
+    public class ModelHandlerTestModel : PageModel
+    {
+        public string MethodName { get; set; }
+
+        public IActionResult OnGet()
+        {
+            return Page();
+        }
+
+        public async Task<IActionResult> OnPostAsync()
+        {
+            await Task.CompletedTask;
+            MethodName = nameof(OnPostAsync);
+            return Page();
+        }
+
+        public async Task OnGetCustomer()
+        {
+            await Task.CompletedTask;
+            MethodName = nameof(OnGetCustomer);
+        }
+
+        public async Task OnGetViewCustomerAsync()
+        {
+            await Task.CompletedTask;
+            MethodName = nameof(OnGetViewCustomerAsync);
+        }
+
+        public IActionResult OnGetDefaultValues(
+            bool boolean,
+            int id = 10,
+            Guid guid = default(Guid),
+            DateTime dateTime = default(DateTime))
+        {
+            return Content($"id: {id}, guid: {guid}, boolean: {boolean}, dateTime: {dateTime}");
+        }
+
+        public async Task<CustomActionResult> OnPostCustomActionResult()
+        {
+            await Task.CompletedTask;
+            return new CustomActionResult();
+        }
+
+        public CustomActionResult OnGetCustomActionResultAsync()
+        {
+            return new CustomActionResult();
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/ModelHandlerTestPage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelHandlerTestPage.cshtml
new file mode 100644
index 0000000000..cbb2ef1327
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelHandlerTestPage.cshtml
@@ -0,0 +1,9 @@
+@page "{handler?}"
+@model RazorPagesWebSite.ModelHandlerTestModel
+
+Method: @Model.MethodName
+@using (Html.BeginForm())
+{
+    @Html.AntiForgeryToken()
+}
+<a href="~/HelloWorld.cshtml">~/HelloWorld.cshtml</a>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithAuthFilter.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithAuthFilter.cs
new file mode 100644
index 0000000000..8be7783920
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithAuthFilter.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite
+{
+    [Authorize]
+    public class ModelWithAuthFilter : PageModel
+    {
+        public IActionResult OnGet() => Page();
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithAuthFilter.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithAuthFilter.cshtml
new file mode 100644
index 0000000000..8862a69efa
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithAuthFilter.cshtml
@@ -0,0 +1,4 @@
+@page
+@model RazorPagesWebSite.ModelWithAuthFilter
+
+Can't see me
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithPageFilter.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithPageFilter.cs
new file mode 100644
index 0000000000..03d2f9a8f4
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithPageFilter.cs
@@ -0,0 +1,43 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite
+{
+    [HandlerChangingPageFilter]
+    public class ModelWithPageFilter : PageModel
+    {
+        public string Message { get; private set; }
+
+        public void OnGet()
+        {
+            Message = $"Hello from {nameof(OnGet)}";
+        }
+
+        public void OnGetEdit()
+        {
+            Message = $"Hello from {nameof(OnGetEdit)}";
+        }
+    }
+
+    [AttributeUsage(AttributeTargets.Class)]
+    public class HandlerChangingPageFilterAttribute : Attribute, IPageFilter
+    {
+        public void OnPageHandlerSelected(PageHandlerSelectedContext context)
+        {
+            context.HandlerMethod = context.ActionDescriptor.HandlerMethods.First(m => m.Name == "Edit");
+        }
+
+        public void OnPageHandlerExecuting(PageHandlerExecutingContext context)
+        {            
+        }
+
+        public void OnPageHandlerExecuted(PageHandlerExecutedContext context)
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithPageFilter.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithPageFilter.cshtml
new file mode 100644
index 0000000000..05809eaac4
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithPageFilter.cshtml
@@ -0,0 +1,4 @@
+@page
+@model RazorPagesWebSite.ModelWithPageFilter
+
+@Model.Message
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithResponseCache.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithResponseCache.cs
new file mode 100644
index 0000000000..d60240490d
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithResponseCache.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite
+{
+    [ResponseCache(Duration = 10, Location = ResponseCacheLocation.Client)]
+    public class ModelWithResponseCache : PageModel
+    {
+        public string Message { get; set; }
+
+        public void OnGet()
+        {
+            Message = $"Hello from {nameof(ModelWithResponseCache)}.{nameof(OnGet)}";
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithResponseCache.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithResponseCache.cshtml
new file mode 100644
index 0000000000..5883b6056f
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithResponseCache.cshtml
@@ -0,0 +1,4 @@
+@page
+@model RazorPagesWebSite.ModelWithResponseCache
+
+@Model.Message
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Models/IUserModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Models/IUserModel.cs
new file mode 100644
index 0000000000..19cc1d40a9
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Models/IUserModel.cs
@@ -0,0 +1,9 @@
+// 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.
+
+namespace RazorPagesWebSite
+{
+    public interface IUserModel
+    {
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Models/UserModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Models/UserModel.cs
new file mode 100644
index 0000000000..80c2d8fdc8
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Models/UserModel.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace RazorPagesWebSite
+{
+    public class UserModel : IUserModel
+    {
+        [Required]
+        public string Name { get; set; }
+
+        [Range(0, 99)]
+        public int Age { get; set; }
+
+        public override string ToString()
+        {
+            return $"Name = {Name}, Age = {Age}";
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/NoPage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/NoPage.cshtml
new file mode 100644
index 0000000000..a9bfcd99bc
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/NoPage.cshtml
@@ -0,0 +1 @@
+This isn't a razor page
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/OnGetView.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/OnGetView.cshtml
new file mode 100644
index 0000000000..7ffc9efe71
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/OnGetView.cshtml
@@ -0,0 +1,12 @@
+@page
+
+@functions {
+    public IActionResult OnGet()
+    {
+        Message = "From OnGet";
+
+        return Page();
+    }
+    public string Message { get; set; } = "Default";
+}
+The message: @Message
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/PageWithoutContent.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/PageWithoutContent.cshtml
new file mode 100644
index 0000000000..95c975eff3
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/PageWithoutContent.cshtml
@@ -0,0 +1 @@
+@page "No/Content/Path"
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/Edit.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/Edit.cshtml
new file mode 100644
index 0000000000..a7b9c2c62e
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/Edit.cshtml
@@ -0,0 +1,11 @@
+@page
+@functions
+{
+    public void OnPost()
+    {
+    }
+}
+
+<form method="post">
+
+</form>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/Index.cshtml
new file mode 100644
index 0000000000..10cd33bb09
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/Index.cshtml
@@ -0,0 +1,2 @@
+@page
+Hello from @ViewContext.RouteData.Values["page"]
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/Login.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/Login.cshtml
new file mode 100644
index 0000000000..44c9bb85ab
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/Login.cshtml
@@ -0,0 +1,2 @@
+@page
+Login Page
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/RouteTemplate.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/RouteTemplate.cshtml
new file mode 100644
index 0000000000..d3b837de51
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/RouteTemplate.cshtml
@@ -0,0 +1,2 @@
+@page "{id}/MyRouteSuffix/{value:int?}"
+Hello from @ViewContext.RouteData.Values["page"] @ViewContext.RouteData.Values["id"] @ViewContext.RouteData.Values["value"]
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ClassLibraryPages/Overriden.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ClassLibraryPages/Overriden.cshtml
new file mode 100644
index 0000000000..18267bd84c
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ClassLibraryPages/Overriden.cshtml
@@ -0,0 +1,2 @@
+@page
+This page is overriden by RazorPagesWebSite
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/Auth.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/Auth.cshtml
new file mode 100644
index 0000000000..010bf8732a
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/Auth.cshtml
@@ -0,0 +1 @@
+@page
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/AnonymousModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/AnonymousModel.cs
new file mode 100644
index 0000000000..3ba2e4605b
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/AnonymousModel.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite
+{
+    [AllowAnonymous]
+    public class AnonymousModel : PageModel
+    {
+        public void OnGet()
+        {
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/AnonymousViaModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/AnonymousViaModel.cshtml
new file mode 100644
index 0000000000..a5f469d689
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/AnonymousViaModel.cshtml
@@ -0,0 +1,3 @@
+@page
+@model AnonymousModel
+Hello from Anonymous
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/Index.cshtml
new file mode 100644
index 0000000000..010bf8732a
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/Index.cshtml
@@ -0,0 +1 @@
+@page
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/CustomPageBase.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/CustomPageBase.cs
new file mode 100644
index 0000000000..31d3522032
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/CustomPageBase.cs
@@ -0,0 +1,10 @@
+// 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.
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite
+{
+    public abstract class CustomPageBase : PageBase
+    {
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/Page.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/Page.cshtml
new file mode 100644
index 0000000000..5bdc8374e0
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/Page.cshtml
@@ -0,0 +1,2 @@
+@page
+@GetType().BaseType.FullName
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/PageWithModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/PageWithModel.cs
new file mode 100644
index 0000000000..c10d51930e
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/PageWithModel.cs
@@ -0,0 +1,10 @@
+// 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.
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite
+{
+    public class PageWithModel : PageModel
+    {
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/PageWithModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/PageWithModel.cshtml
new file mode 100644
index 0000000000..9b6bfb0727
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/PageWithModel.cshtml
@@ -0,0 +1,3 @@
+@page
+@model PageWithModel
+@GetType().BaseType.FullName
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewImports.cshtml
new file mode 100644
index 0000000000..8085b8cd3f
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewImports.cshtml
@@ -0,0 +1,2 @@
+@using RazorPagesWebSite
+@inherits CustomPageBase
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewStart.cshtml
new file mode 100644
index 0000000000..dd100cf854
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewStart.cshtml
@@ -0,0 +1 @@
+@{ Layout = "../Shared/_CustomBaseTypeLayout"; }
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomModelTypeModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomModelTypeModel.cshtml
new file mode 100644
index 0000000000..46819452da
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomModelTypeModel.cshtml
@@ -0,0 +1,36 @@
+@page
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@using RazorPagesWebSite
+@model CustomModelTypeModel
+@{
+    ViewData["Title"] = "Register";
+}
+
+<h2>@ViewData["Title"]</h2>
+<h2>@ViewData["UserType"]</h2>
+
+<div class="row">
+    <div class="col-md-4">
+        <form asp-route-returnUrl="@Model.ReturnUrl" method="post">
+            <h4>Create a new account.</h4>
+            <hr />
+            <div asp-validation-summary="All" class="text-danger"></div>
+            <div class="form-group">
+                <label asp-for="Input.Email"></label>
+                <input asp-for="Input.Email" class="form-control" />
+                <span asp-validation-for="Input.Email" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="Input.Password"></label>
+                <input asp-for="Input.Password" class="form-control" />
+                <span asp-validation-for="Input.Password" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="Input.ConfirmPassword"></label>
+                <input asp-for="Input.ConfirmPassword" class="form-control" />
+                <span asp-validation-for="Input.ConfirmPassword" class="text-danger"></span>
+            </div>
+            <button type="submit" class="btn btn-default">Register</button>
+        </form>
+    </div>
+</div>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomModelTypeModel.cshtml.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomModelTypeModel.cshtml.cs
new file mode 100644
index 0000000000..e32a2e83c4
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomModelTypeModel.cshtml.cs
@@ -0,0 +1,78 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.Extensions.Logging;
+
+namespace RazorPagesWebSite
+{
+    public class CustomModelTypeModel : PageModel
+    {
+        [BindProperty]
+        public InputModel Input { get; set; }
+
+        public string ReturnUrl { get; set; }
+
+        public class InputModel
+        {
+            [Required]
+            [EmailAddress]
+            [Display(Name = "Email")]
+            public string Email { get; set; }
+
+            [Required]
+            [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
+            [DataType(DataType.Password)]
+            [Display(Name = "Password")]
+            public string Password { get; set; }
+
+            [DataType(DataType.Password)]
+            [Display(Name = "Confirm password")]
+            [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
+            public string ConfirmPassword { get; set; }
+        }
+
+        public virtual void OnGet(string returnUrl = null)
+        {
+            throw new NotImplementedException();
+        }
+
+        public virtual IActionResult OnPostAsync(string returnUrl = null)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    public class User
+    {
+    }
+
+    internal class CustomModelTypeModel<TUser> : CustomModelTypeModel where TUser : User
+    {
+        private readonly ILogger<CustomModelTypeModel<TUser>> _logger;
+
+        public CustomModelTypeModel(ILogger<CustomModelTypeModel<TUser>> logger)
+        {
+            _logger = logger;
+        }
+
+        public override void OnGet(string returnUrl = null)
+        {
+            // We only care about being able to resolve the service from DI.
+            // The line below is just to make the compiler happy.
+            _logger.LogInformation(typeof(TUser).Name);
+            ViewData["UserType"] = typeof(TUser).Name;
+            ReturnUrl = returnUrl;
+        }
+
+        public override IActionResult OnPostAsync(string returnUrl = null)
+        {
+            if (!ModelState.IsValid)
+            {
+                return Page();
+            }
+
+            return Redirect("~/");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomPrefix/Custom.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomPrefix/Custom.cshtml
new file mode 100644
index 0000000000..ace20dc097
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomPrefix/Custom.cshtml
@@ -0,0 +1,3 @@
+@page "~/like-totally-custom"
+
+<p>Hey, it's Mr. totally custom here!</p>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/FileFromShared b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/FileFromShared
new file mode 100644
index 0000000000..e9c9a4235a
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/FileFromShared
@@ -0,0 +1 @@
+@Html.Partial("_FileInShared)
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/HandlerWithParameter.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/HandlerWithParameter.cshtml
new file mode 100644
index 0000000000..e90d3cf674
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/HandlerWithParameter.cshtml
@@ -0,0 +1,5 @@
+@page
+@model HandlerWithParameterModel
+@{
+}
+Handler with parameter
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/HandlerWithParameter.cshtml.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/HandlerWithParameter.cshtml.cs
new file mode 100644
index 0000000000..d1b8ade28a
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/HandlerWithParameter.cshtml.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite.Pages
+{
+    public class HandlerWithParameterModel : PageModel
+    {
+        public IActionResult OnGet(string testParameter = null)
+        {
+            if (testParameter == null)
+            {
+                return BadRequest("Parameter cannot be null.");
+            }
+
+            return Page();
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Index.cshtml
new file mode 100644
index 0000000000..10cd33bb09
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Index.cshtml
@@ -0,0 +1,2 @@
+@page
+Hello from @ViewContext.RouteData.Values["page"]
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/Page.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/Page.cshtml
new file mode 100644
index 0000000000..91c87f0d1a
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/Page.cshtml
@@ -0,0 +1,3 @@
+@page
+@inject Microsoft.AspNetCore.Mvc.Localization.IViewLocalizer Localizer
+@Localizer["Hello"]
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/Page.fr-FR.resx b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/Page.fr-FR.resx
new file mode 100644
index 0000000000..5fa59b72a7
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/Page.fr-FR.resx
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Hello" xml:space="preserve">
+    <value>Bon Jour from Page</value>
+  </data>
+</root>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.cs
new file mode 100644
index 0000000000..c06f62ae13
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite.Pages.Localized
+{
+    public class PageWithModel : PageModel
+    {
+        public IActionResult OnGet() => Page();
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.cshtml
new file mode 100644
index 0000000000..fe46ea0520
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.cshtml
@@ -0,0 +1,4 @@
+@page
+@model PageWithModel
+@inject Microsoft.AspNetCore.Mvc.Localization.IViewLocalizer Localizer
+@Localizer["Hello"]
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.fr-FR.resx b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.fr-FR.resx
new file mode 100644
index 0000000000..1204c9ae7e
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.fr-FR.resx
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Hello" xml:space="preserve">
+    <value>Bon Jour from PageWithModel</value>
+  </data>
+</root>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Namespace/Nested/Folder/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Namespace/Nested/Folder/Index.cshtml
new file mode 100644
index 0000000000..047d31292b
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Namespace/Nested/Folder/Index.cshtml
@@ -0,0 +1,2 @@
+@page
+@(GetType().Namespace)
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Namespace/Nested/Override/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Namespace/Nested/Override/Index.cshtml
new file mode 100644
index 0000000000..d09ea87809
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Namespace/Nested/Override/Index.cshtml
@@ -0,0 +1,3 @@
+@page
+@namespace Override
+@(GetType().Namespace)
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Namespace/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Namespace/_ViewImports.cshtml
new file mode 100644
index 0000000000..436ecd54cd
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Namespace/_ViewImports.cshtml
@@ -0,0 +1 @@
+@namespace CustomNamespace
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/NotTheRoot.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/NotTheRoot.cshtml
new file mode 100644
index 0000000000..f919c9d628
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/NotTheRoot.cshtml
@@ -0,0 +1,2 @@
+@page
+Hello from NotTheRoot
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesOnModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesOnModel.cs
new file mode 100644
index 0000000000..b06c380178
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesOnModel.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite
+{
+    [BindProperties]
+    public class BindPropertiesOnModel : PageModel
+    {
+        [FromQuery]
+        public string Property1 { get; set; }
+
+        public string Property2 { get; set; }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesOnModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesOnModel.cshtml
new file mode 100644
index 0000000000..14b6136e32
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesOnModel.cshtml
@@ -0,0 +1,8 @@
+@page
+@model BindPropertiesOnModel
+
+Property1 = @Model.Property1, Property2 = @Model.Property2,
+
+<form action="">
+    @Html.AntiForgeryToken()
+</form>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesWithSupportsGetOnModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesWithSupportsGetOnModel.cs
new file mode 100644
index 0000000000..d4b1f83155
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesWithSupportsGetOnModel.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite
+{
+    [BindProperties(SupportsGet = true)]
+    public class BindPropertiesWithSupportsGetOnModel : PageModel
+    {
+        public string Property { get; set; }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesWithSupportsGetOnModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesWithSupportsGetOnModel.cshtml
new file mode 100644
index 0000000000..eb13d32677
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesWithSupportsGetOnModel.cshtml
@@ -0,0 +1,3 @@
+@page
+@model BindPropertiesWithSupportsGetOnModel
+@Model.Property
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertyWithGet.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertyWithGet.cshtml
new file mode 100644
index 0000000000..9f9ef25452
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertyWithGet.cshtml
@@ -0,0 +1,9 @@
+@page
+@using Microsoft.AspNetCore.Mvc.RazorPages
+
+@functions
+{
+    [BindProperty(SupportsGet=true)]
+    public int Value { get; set; }
+}
+<p>@Value</p>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyAndArgumentBinding.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyAndArgumentBinding.cs
new file mode 100644
index 0000000000..0c20c4c36b
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyAndArgumentBinding.cs
@@ -0,0 +1,26 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite
+{
+    public class PageModelWithPropertyAndArgumentBinding : PageModel
+    {
+        [ModelBinder]
+        public UserModel UserModel { get; set; }
+
+        public int Id { get; set; }
+
+        public void OnGet(int id)
+        {
+            Id = id;
+        }
+
+        public void OnPost(int id)
+        {
+            Id = id;
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyBinding.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyBinding.cs
new file mode 100644
index 0000000000..2e7332b3ee
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyBinding.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite
+{
+    public class PageModelWithPropertyBinding : PageModel
+    {
+        [ModelBinder]
+        public UserModel UserModel { get; set; }
+
+        [FromRoute]
+        public int Id { get; set; }
+
+        [BindProperty(SupportsGet = true)]
+        [FromQuery]
+        public string PropertyWithSupportGetsTrue { get; set; }
+
+        public void OnGet() { }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyBinding.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyBinding.cshtml
new file mode 100644
index 0000000000..bc9fef8674
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyBinding.cshtml
@@ -0,0 +1,8 @@
+@page "{id:int}"
+@model PageModelWithPropertyBinding
+Id = @Model.Id, Name = @Model.UserModel?.Name, Age = @Model.UserModel?.Age, PropertyWithSupportGetsTrue = @Model.PropertyWithSupportGetsTrue
+@Html.ValidationSummary()
+
+<form action="">
+    @Html.AntiForgeryToken()
+</form>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PagePropertyBinding.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PagePropertyBinding.cshtml
new file mode 100644
index 0000000000..6546639e2b
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PagePropertyBinding.cshtml
@@ -0,0 +1,14 @@
+@page "{id:int}"
+@functions
+{
+    [ModelBinder]
+    public UserModel UserModel { get; set; }
+
+    [FromRoute]
+    public int Id { get; set; }
+}
+Id = @Id, Name = @UserModel?.Name, Age = @UserModel?.Age
+@Html.ValidationSummary()
+<form action="">
+    @Html.AntiForgeryToken()
+</form>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageWithPropertyAndArgumentBinding.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageWithPropertyAndArgumentBinding.cshtml
new file mode 100644
index 0000000000..bac4cea852
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageWithPropertyAndArgumentBinding.cshtml
@@ -0,0 +1,8 @@
+@page
+@model PageModelWithPropertyAndArgumentBinding
+Id = @Model.Id, Name = @Model.UserModel?.Name, Age = @Model.UserModel?.Age
+@Html.ValidationSummary()
+
+<form action="">
+    @Html.AntiForgeryToken()
+</form>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PolymorphicBinding.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PolymorphicBinding.cs
new file mode 100644
index 0000000000..0986986da0
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PolymorphicBinding.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite
+{
+    public class PolymorphicBinding : PageModel
+    {
+        [ModelBinder(typeof(PolymorphicModelBinder))]
+        public IUserModel UserModel { get; set; }
+
+        public IActionResult OnPost()
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
+
+            return new ContentResult { Content = UserModel.ToString() };
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PolymorphicBinding.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PolymorphicBinding.cshtml
new file mode 100644
index 0000000000..7bde2525de
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PolymorphicBinding.cshtml
@@ -0,0 +1,6 @@
+@page
+@model PolymorphicBinding
+
+<form action="">
+    @Html.AntiForgeryToken()
+</form>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/_ViewImports.cshtml
new file mode 100644
index 0000000000..15d5b35b2f
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/_ViewImports.cshtml
@@ -0,0 +1 @@
+@using RazorPagesWebSite
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/Index.cshtml
new file mode 100644
index 0000000000..d1e39427c6
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/Index.cshtml
@@ -0,0 +1,7 @@
+@page "{handler?}"
+@functions
+{
+    public IActionResult OnGet() => RedirectToPage();
+
+    public IActionResult OnGetRedirectToIndex() => RedirectToPage("/Redirects/Index");
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/Redirect.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/Redirect.cshtml
new file mode 100644
index 0000000000..71ebf6dd23
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/Redirect.cshtml
@@ -0,0 +1 @@
+@page "{id:int}"
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromHandler.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromHandler.cshtml
new file mode 100644
index 0000000000..3ced81afa7
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromHandler.cshtml
@@ -0,0 +1,13 @@
+@page "{handler?}/{id:int?}"
+@functions
+{
+    public IActionResult OnGetRedirectToPage(int id)
+    {
+        return RedirectToPage();
+    }
+
+    public IActionResult OnGetRedirectToAnotherHandler(int id)
+    {
+        return RedirectToPage(new { handler = "RedirectToPage", id = id });
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromModel.cs
new file mode 100644
index 0000000000..a2d593bed4
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromModel.cs
@@ -0,0 +1,10 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite
+{
+    public class RedirectFromModel : PageModel
+    {
+        public IActionResult OnGet() => RedirectToPage("/Pages/Redirects/Redirect", new { id = 12});
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromModel.cshtml
new file mode 100644
index 0000000000..b3631bd5fd
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromModel.cshtml
@@ -0,0 +1,2 @@
+@page
+@model RazorPagesWebSite.RedirectFromModel
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromPage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromPage.cshtml
new file mode 100644
index 0000000000..4c44dc4690
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromPage.cshtml
@@ -0,0 +1,5 @@
+@page
+@functions
+{
+    public IActionResult OnGet() => RedirectToPage("/Pages/Redirects/Redirect", new { id = 10});
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSelf.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSelf.cshtml
new file mode 100644
index 0000000000..bc597309d0
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSelf.cshtml
@@ -0,0 +1,9 @@
+@page
+@functions
+{
+    public IActionResult OnPost(int value) => RedirectToPage(new { user = value });
+}
+
+<form action="">
+    @Html.AntiForgeryToken()
+</form>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSibling.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSibling.cshtml
new file mode 100644
index 0000000000..f0935c53db
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSibling.cshtml
@@ -0,0 +1,13 @@
+@page "{handler?}"
+@functions
+{
+    public IActionResult OnGetRedirectToIndex() => RedirectToPage("Index");
+    
+    public IActionResult OnGetRedirectToRedirect() => RedirectToPage("Redirect", new { id = 10 });
+
+    public IActionResult OnGetRedirectToSubDir() => RedirectToPage("SubDir/SubDirPage");
+
+    public IActionResult OnGetRedirectToParent() => RedirectToPage("../Conventions/AuthFolder/Index");
+
+    public IActionResult OnGetRedirectToDotSlash() => RedirectToPage("./SubDir/SubDirPage");
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/SubDir/SubDirPage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/SubDir/SubDirPage.cshtml
new file mode 100644
index 0000000000..dce99a3fbc
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/SubDir/SubDirPage.cshtml
@@ -0,0 +1 @@
+@page
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/RouteUsingDefaultName.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/RouteUsingDefaultName.cshtml
new file mode 100644
index 0000000000..3e55b34655
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/RouteUsingDefaultName.cshtml
@@ -0,0 +1,2 @@
+@page
+<a asp-page="/Routes/Sibling" asp-route-id="10">Link</a>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/Sibling.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/Sibling.cshtml
new file mode 100644
index 0000000000..290bb82e89
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/Sibling.cshtml
@@ -0,0 +1 @@
+@page "{id?}"
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/_ViewImports.cshtml
new file mode 100644
index 0000000000..be13c8c370
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/_ViewImports.cshtml
@@ -0,0 +1 @@
+@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/SearchInPages.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/SearchInPages.cshtml
new file mode 100644
index 0000000000..9e0c846031
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/SearchInPages.cshtml
@@ -0,0 +1,2 @@
+@page
+@Html.Partial("_FileInShared")
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Section/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Section/Index.cshtml
new file mode 100644
index 0000000000..510e36fc40
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Section/Index.cshtml
@@ -0,0 +1,10 @@
+@page
+@{ 
+    Layout = "_Layout";
+}
+@functions {
+    public int MyValue { get; set; } = 17;
+}
+@section mysection {
+    Value is @Model.MyValue
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Section/_Layout.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Section/_Layout.cshtml
new file mode 100644
index 0000000000..bfdb853014
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Section/_Layout.cshtml
@@ -0,0 +1 @@
+@RenderSection("mysection")
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/Components/ViewData/Default.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/Components/ViewData/Default.cshtml
new file mode 100644
index 0000000000..5144ba57cd
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/Components/ViewData/Default.cshtml
@@ -0,0 +1,8 @@
+<html>
+    <head>
+        <title>@ViewData["Title"]</title>
+    </head>
+    <body>
+        <span id="message">@ViewData["Message"]</span>
+    </body>
+</html>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/_CustomBaseTypeLayout.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/_CustomBaseTypeLayout.cshtml
new file mode 100644
index 0000000000..fd08733813
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/_CustomBaseTypeLayout.cshtml
@@ -0,0 +1 @@
+<custom-base-type-layout>@RenderBody()</custom-base-type-layout>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/_FileInShared.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/_FileInShared.cshtml
new file mode 100644
index 0000000000..72df466583
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/_FileInShared.cshtml
@@ -0,0 +1 @@
+Hello from /Pages/Shared/
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtAuthFilter.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtAuthFilter.cshtml
new file mode 100644
index 0000000000..ca22d58eec
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtAuthFilter.cshtml
@@ -0,0 +1,5 @@
+@page
+@model ShortCircuitAtAuthFilterPageModel
+@{
+}
+From ShortCircuitPageAtAuthFilter.cshtml
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtAuthFilter.cshtml.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtAuthFilter.cshtml.cs
new file mode 100644
index 0000000000..174ad98b1d
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtAuthFilter.cshtml.cs
@@ -0,0 +1,51 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite.Pages
+{
+    [AsyncTestAuthorizationFilter]
+    [SyncTestAuthorizationFilter]
+    public class ShortCircuitAtAuthFilterPageModel : PageModel
+    {
+        public IActionResult OnGet()
+        {
+            return Page();
+        }
+
+        private static bool ShouldShortCircuit(HttpContext httpContext, string currentTargetName)
+        {
+            return httpContext.Request.Query.TryGetValue("target", out var expectedTargetName)
+                && string.Equals(expectedTargetName, currentTargetName, StringComparison.OrdinalIgnoreCase);
+        }
+
+        private class AsyncTestAuthorizationFilterAttribute : Attribute, IAsyncAuthorizationFilter
+        {
+            public Task OnAuthorizationAsync(AuthorizationFilterContext context)
+            {
+                if (ShouldShortCircuit(context.HttpContext, nameof(OnAuthorizationAsync)))
+                {
+                    context.Result = new PageResult();
+                }
+                return Task.CompletedTask;
+            }
+        }
+
+        private class SyncTestAuthorizationFilterAttribute : Attribute, IAuthorizationFilter
+        {
+            public void OnAuthorization(AuthorizationFilterContext context)
+            {
+                if (ShouldShortCircuit(context.HttpContext, nameof(OnAuthorization)))
+                {
+                    context.Result = new PageResult();
+                }
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtPageFilter.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtPageFilter.cshtml
new file mode 100644
index 0000000000..f824be566a
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtPageFilter.cshtml
@@ -0,0 +1,5 @@
+@page
+@model ShortCircuitAtPageFilterPageModel
+@{
+}
+From ShortCircuitPageAtPageFilter.cshtml
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtPageFilter.cshtml.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtPageFilter.cshtml.cs
new file mode 100644
index 0000000000..58d9f62766
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtPageFilter.cshtml.cs
@@ -0,0 +1,67 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite.Pages
+{
+    [AsyncTestPageFilter]
+    [SyncTestPageFilter]
+    public class ShortCircuitAtPageFilterPageModel : PageModel
+    {
+        public IActionResult OnGet()
+        {
+            return Page();
+        }
+
+        private static bool ShouldShortCircuit(HttpContext httpContext, string currentTargetName)
+        {
+            return httpContext.Request.Query.TryGetValue("target", out var expectedTargetName)
+                && string.Equals(expectedTargetName, currentTargetName, StringComparison.OrdinalIgnoreCase);
+        }
+
+        private class AsyncTestPageFilterAttribute : Attribute, IAsyncPageFilter
+        {
+            public Task OnPageHandlerSelectionAsync(PageHandlerSelectedContext context)
+            {
+                return Task.CompletedTask;
+            }
+
+            public Task OnPageHandlerExecutionAsync(
+                PageHandlerExecutingContext context,
+                PageHandlerExecutionDelegate next)
+            {
+                if (ShouldShortCircuit(context.HttpContext, nameof(OnPageHandlerExecutionAsync)))
+                {
+                    context.Result = new PageResult();
+                    return Task.CompletedTask;
+                }
+                return next();
+            }
+        }
+
+        private class SyncTestPageFilterAttribute : Attribute, IPageFilter
+        {
+            public void OnPageHandlerSelected(PageHandlerSelectedContext context)
+            {
+            }
+
+            public void OnPageHandlerExecuting(PageHandlerExecutingContext context)
+            {
+                if (ShouldShortCircuit(context.HttpContext, nameof(OnPageHandlerExecuting)))
+                {
+                    context.Result = new PageResult();
+                }
+            }
+
+            public void OnPageHandlerExecuted(PageHandlerExecutedContext context)
+            {
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/CrossPost.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/CrossPost.cshtml
new file mode 100644
index 0000000000..0a6eefee4c
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/CrossPost.cshtml
@@ -0,0 +1,4 @@
+@page "{id:int?}"
+
+<form method="POST" asp-page="/TagHelper/SelfPost" asp-route-id="10" asp-antiforgery="false"></form>
+<form method="POST" asp-page="PostWithHandler" asp-page-handler="Delete"  asp-route-id="10" asp-antiforgery="false"></form>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/FormAction.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/FormAction.cshtml
new file mode 100644
index 0000000000..4042ece3fe
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/FormAction.cshtml
@@ -0,0 +1,7 @@
+@page
+<button asp-page="/TagHelper/CrossPost" asp-route-id="10" />
+<input type="submit" asp-page="/TagHelper/CrossPost" asp-route-id="10" />
+<input type="image" asp-page="/TagHelper/CrossPost" asp-route-id="10" />
+<button asp-page="PostWithHandler" asp-page-handler="Edit" asp-route-id="11" />
+<input type="submit" asp-page="PostWithHandler" asp-page-handler="Edit" asp-route-id="11" />
+<input type="image" asp-page="PostWithHandler" asp-page-handler="Delete" asp-route-id="11" />
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/PathTraversalLinks.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/PathTraversalLinks.cshtml
new file mode 100644
index 0000000000..456deacfaf
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/PathTraversalLinks.cshtml
@@ -0,0 +1,6 @@
+@page
+
+<form method="post" asp-page="./SubDirectoryLinks" asp-antiforgery="false"></form>
+<form method="post" asp-page="../../HelloWorld" asp-antiforgery="false"></form>
+<a asp-page="../Redirects/Index" asp-route-handler="RedirectToIndex" />
+<input type="image" asp-page="../Admin/Index" asp-fragment="my-fragment" />
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/PostWithHandler.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/PostWithHandler.cshtml
new file mode 100644
index 0000000000..39ef8f5c4a
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/PostWithHandler.cshtml
@@ -0,0 +1,18 @@
+@page "{handler?}/{id?}"
+
+@functions
+{
+    public IActionResult OnPostEdit(int id)
+    {
+        return Page();
+    }
+
+    public IActionResult OnPostDelete(int id)
+    {
+        return Page();
+    }
+}
+
+<form asp-page-handler="Edit"></form>
+<form method="post" asp-page-handler="Edit"></form>
+<form method="post" asp-page-handler="Edit" asp-route-id="10" asp-antiforgery="false"></form>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SelfPost.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SelfPost.cshtml
new file mode 100644
index 0000000000..ae3decd1d4
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SelfPost.cshtml
@@ -0,0 +1,5 @@
+@page "{id:int?}"
+
+<form method="POST" asp-page="" asp-route-id="10">
+<input type="submit" value="Submit" />
+</form>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SiblingLinks.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SiblingLinks.cshtml
new file mode 100644
index 0000000000..ced329ee26
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SiblingLinks.cshtml
@@ -0,0 +1,5 @@
+@page
+
+<form method="post" asp-page="CrossPost" asp-antiforgery="false"></form>
+<a asp-page="SelfPost" asp-route-id="12" />
+<input type="image" asp-page="CrossPost" asp-fragment="my-fragment" />
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDir/SubDirPage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDir/SubDirPage.cshtml
new file mode 100644
index 0000000000..b66d4d4562
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDir/SubDirPage.cshtml
@@ -0,0 +1,2 @@
+@page "{id?}"
+ 
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDirectoryLinks.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDirectoryLinks.cshtml
new file mode 100644
index 0000000000..2ee9fef587
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDirectoryLinks.cshtml
@@ -0,0 +1,5 @@
+@page
+
+<form method="post" asp-page="SubDir/SubDirPage" asp-antiforgery="false"></form>
+<a asp-page="SubDir/SubDirPage" asp-route-id="12" />
+<input type="image" asp-page="SubDir/SubDirPage" asp-fragment="my-fragment" />
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/_ViewImports.cshtml
new file mode 100644
index 0000000000..be13c8c370
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/_ViewImports.cshtml
@@ -0,0 +1 @@
+@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryUpdateModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryUpdateModel.cshtml
new file mode 100644
index 0000000000..35938102fd
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryUpdateModel.cshtml
@@ -0,0 +1,27 @@
+@page "{id:int}"
+@using RazorPagesWebSite
+
+@functions
+{
+    public UserModel UserModel { get; set; }
+
+    [FromRoute]
+    public int Id { get; set; }
+
+    public async Task OnPost()
+    {
+        var user = new UserModel();
+
+        Updated = await TryUpdateModelAsync(user);
+        UserModel = user;
+    }
+
+    public bool Updated { get; set; }
+}
+
+@Html.ValidationSummary()
+<form action="">
+    @Html.AntiForgeryToken()    
+</form>
+Updated: @Updated
+Name = @UserModel?.Name
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryUpdateModelPageModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryUpdateModelPageModel.cs
new file mode 100644
index 0000000000..05f7785c58
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryUpdateModelPageModel.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite.Pages
+{
+    public class TryUpdateModelPageModel : PageModel
+    {
+        public UserModel UserModel { get; set; }
+
+        public bool Updated { get; set; }
+
+        public async Task OnPost()
+        {
+            var user = new UserModel();
+            Updated = await TryUpdateModelAsync(user);
+            UserModel = user;
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryUpdateModelPageModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryUpdateModelPageModel.cshtml
new file mode 100644
index 0000000000..c4183b5a5d
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryUpdateModelPageModel.cshtml
@@ -0,0 +1,10 @@
+@page "{id:int}"
+@using RazorPagesWebSite.Pages
+@model TryUpdateModelPageModel
+
+@Html.ValidationSummary()
+<form action="">
+    @Html.AntiForgeryToken()    
+</form>
+Updated: @Model.Updated
+Name = @Model.UserModel?.Name
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryValidateModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryValidateModel.cshtml
new file mode 100644
index 0000000000..1aaa0b637c
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryValidateModel.cshtml
@@ -0,0 +1,26 @@
+@page "{id:int}"
+@using RazorPagesWebSite
+
+@functions
+{
+    [ModelBinder]
+    public UserModel UserModel { get; set; }
+
+    [FromRoute]
+    public int Id { get; set; }
+
+    public void OnPost(UserModel user)
+    {
+        Valid = TryValidateModel(user);
+
+        UserModel = user;
+    }
+
+    public bool Valid { get; set; }
+}
+
+@Html.ValidationSummary()
+<form action="">
+    @Html.AntiForgeryToken()
+</form>
+Validation: @(Valid ? "success" : "fail!" )
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryValidateModelPageModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryValidateModelPageModel.cs
new file mode 100644
index 0000000000..bde677cb98
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryValidateModelPageModel.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite.Pages
+{
+    public class TryValidateModelPageModel : PageModel
+    {
+        [ModelBinder]
+        public UserModel UserModel { get; set; }
+
+        public bool Validate { get; set; }
+
+        public void OnPost(UserModel user)
+        {
+            Validate = TryValidateModel(user);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryValidateModelPageModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryValidateModelPageModel.cshtml
new file mode 100644
index 0000000000..08d31d73d8
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryValidateModelPageModel.cshtml
@@ -0,0 +1,9 @@
+@page "{id:int}"
+@using RazorPagesWebSite.Pages
+@model TryValidateModelPageModel
+
+@Html.ValidationSummary()
+<form action="">
+    @Html.AntiForgeryToken()
+</form>
+Validation: @(Model.Validate ? "success" : "fail!" )
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageHandlerWithValidation.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageHandlerWithValidation.cshtml
new file mode 100644
index 0000000000..0236c765ac
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageHandlerWithValidation.cshtml
@@ -0,0 +1,10 @@
+@page
+@using System.ComponentModel.DataAnnotations
+@functions
+{
+    public void OnGet([Required(ErrorMessage = "Name is required")] string name)
+    {
+
+    }
+}
+<div asp-validation-summary="All"></div>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithValidation.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithValidation.cs
new file mode 100644
index 0000000000..607f719380
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithValidation.cs
@@ -0,0 +1,17 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite
+{
+    public class PageWithValidation : PageModel
+    {
+        [BindProperty(SupportsGet = true)]
+        [Required(ErrorMessage = "Name is required.")]
+        public string Name { get; set; }
+
+        [BindProperty(SupportsGet = true)]
+        [Range(18, 60, ErrorMessage = "18 ≤ Age ≤ 60")]
+        public int Age { get; set; }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithValidation.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithValidation.cshtml
new file mode 100644
index 0000000000..845495ea59
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithValidation.cshtml
@@ -0,0 +1,3 @@
+@page
+@model PageWithValidation
+<div asp-validation-summary="All"></div>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/_ViewImports.cshtml
new file mode 100644
index 0000000000..aaf882de29
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/_ViewImports.cshtml
@@ -0,0 +1 @@
+@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPage.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPage.cs
new file mode 100644
index 0000000000..fd6eed7a37
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPage.cs
@@ -0,0 +1,32 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite
+{
+    public class ViewDataInPage : PageModel
+    {
+        [ViewData]
+        public string Title => "Title with default value";
+
+        [ViewData]
+        public string Keywords { get; set; }
+
+        [ViewData]
+        public  string Description { get; set;}
+
+        [ViewData(Key = "Author")]
+        public string AuthorName { get; set; }
+
+        public void OnGet()
+        {
+            Description = "Description set in handler";
+            AuthorName = "Property with key";
+        }
+
+        public override void OnPageHandlerExecuting(PageHandlerExecutingContext context)
+        {
+            Keywords = "Value set in filter";
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPage.cshtml
new file mode 100644
index 0000000000..119fbf7b6e
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPage.cshtml
@@ -0,0 +1,6 @@
+@page
+@model ViewDataInPage
+@{
+    Layout = "_Layout";
+}
+Sample that shows ViewData attributes being set in a PageModel.
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPageWithoutModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPageWithoutModel.cshtml
new file mode 100644
index 0000000000..b64538b461
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPageWithoutModel.cshtml
@@ -0,0 +1,18 @@
+@page
+@{
+    Layout = "_Layout";
+}
+@functions
+{
+    [ViewData]
+    public string Title { get; set; } = "Default value";
+
+    [ViewData]
+    public string Description { get; set; }
+
+    public void OnGet()
+    {
+        Description = "Description set in page handler";
+    }
+}
+Sample that shows ViewData being set from a page without handler.
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataToViewComponentPage.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataToViewComponentPage.cs
new file mode 100644
index 0000000000..d38ab3b08e
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataToViewComponentPage.cs
@@ -0,0 +1,25 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using RazorPagesWebSite.Components;
+
+namespace RazorPagesWebSite
+{
+    public class ViewDataToViewComponentPage : PageModel
+    {
+        [ViewData]
+        public string Title => "View Data in Pages";
+
+        [ViewData]
+        public string Message { get; private set; }
+
+        public IActionResult OnGet()
+        {
+            Message = "Message set in handler";
+            return new ViewComponentResult
+            {
+                ViewComponentType = typeof(ViewDataViewComponent),
+            };
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataToViewComponentPage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataToViewComponentPage.cshtml
new file mode 100644
index 0000000000..82b4340edb
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataToViewComponentPage.cshtml
@@ -0,0 +1,2 @@
+@page
+@model ViewDataToViewComponentPage
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/_Layout.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/_Layout.cshtml
new file mode 100644
index 0000000000..a9a9d31edf
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/_Layout.cshtml
@@ -0,0 +1,11 @@
+<html>
+    <head>
+        <meta name="description" content="@ViewData["Description"]" />
+        <meta name="keywords" content="@ViewData["Keywords"]" />
+        <meta name="author" content="@ViewData["Author"]" />
+        <title>@ViewData["Title"]</title>
+    </head>
+    <body>
+        @RenderBody()
+    </body>
+</html>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/_ViewImports.cshtml
new file mode 100644
index 0000000000..aaf882de29
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/_ViewImports.cshtml
@@ -0,0 +1 @@
+@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewDataAvailableAfterHandlerExecuted.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewDataAvailableAfterHandlerExecuted.cshtml
new file mode 100644
index 0000000000..a9c5e2d2e6
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewDataAvailableAfterHandlerExecuted.cshtml
@@ -0,0 +1,5 @@
+@page
+@model ViewDataAvailableAfterHandlerExecutedModel
+@{
+}
+ViewData: @ViewData["Foo"]
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewDataAvailableAfterHandlerExecuted.cshtml.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewDataAvailableAfterHandlerExecuted.cshtml.cs
new file mode 100644
index 0000000000..548623d5f9
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewDataAvailableAfterHandlerExecuted.cshtml.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite.Pages
+{
+    [TestPageFilter]
+    public class ViewDataAvailableAfterHandlerExecutedModel : PageModel
+    {
+        public IActionResult OnGet()
+        {
+            return Page();
+        }
+
+        private class TestPageFilterAttribute : Attribute, IPageFilter
+        {
+            public void OnPageHandlerExecuted(PageHandlerExecutedContext context)
+            {
+                // This usage mimics Identity UI where it sets data into ViewData in a PageFilters's
+                // PageHandlerExecuted method.
+                if (context.Result is PageResult pageResult)
+                {
+                    pageResult.ViewData["Foo"] = "Bar";
+                }
+            }
+
+            public void OnPageHandlerExecuting(PageHandlerExecutingContext context)
+            {
+            }
+
+            public void OnPageHandlerSelected(PageHandlerSelectedContext context)
+            {
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewSearch/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewSearch/Index.cshtml
new file mode 100644
index 0000000000..abb1d2ba90
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewSearch/Index.cshtml
@@ -0,0 +1,5 @@
+@page
+
+@{
+    await Html.RenderPartialAsync(Request.Query["partial"]);
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewSearch/_Sibling.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewSearch/_Sibling.cshtml
new file mode 100644
index 0000000000..8dd0a47b9e
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewSearch/_Sibling.cshtml
@@ -0,0 +1 @@
+Hello from sibling
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewImport/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewImport/Index.cshtml
new file mode 100644
index 0000000000..d5e4338713
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewImport/Index.cshtml
@@ -0,0 +1,2 @@
+@page
+Hello from @CustomService.Value!
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewImport/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewImport/_ViewImports.cshtml
new file mode 100644
index 0000000000..2331a35a67
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewImport/_ViewImports.cshtml
@@ -0,0 +1 @@
+@using CustomNamespace
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/Index.cshtml
new file mode 100644
index 0000000000..5f8139efb5
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/Index.cshtml
@@ -0,0 +1,2 @@
+@page
+Hello from @Path!
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/ViewStartAtRoot.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/ViewStartAtRoot.cshtml
new file mode 100644
index 0000000000..83faae9562
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/ViewStartAtRoot.cshtml
@@ -0,0 +1,2 @@
+@page
+Hello from page
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/_ViewStart.cshtml
new file mode 100644
index 0000000000..c0ad0e1adb
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/_ViewStart.cshtml
@@ -0,0 +1 @@
+Hello from _ViewStart
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/_Parent.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/_Parent.cshtml
new file mode 100644
index 0000000000..23b9387552
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/_Parent.cshtml
@@ -0,0 +1 @@
+Hello from parent
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/_ViewImports.cshtml
new file mode 100644
index 0000000000..bb6dc2d8fc
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/_ViewImports.cshtml
@@ -0,0 +1 @@
+@namespace RazorPagesWebSite.Pages
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/PathSet.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/PathSet.cshtml
new file mode 100644
index 0000000000..2431041ec0
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/PathSet.cshtml
@@ -0,0 +1,3 @@
+@page
+
+Path: @Path
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/PolymorphicModelBinder.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/PolymorphicModelBinder.cs
new file mode 100644
index 0000000000..bce3d79b8a
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/PolymorphicModelBinder.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace RazorPagesWebSite
+{
+    public class PolymorphicModelBinder : IModelBinder
+    {
+        public Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            var ageValue = bindingContext.ValueProvider.GetValue(nameof(UserModel.Age));
+            var age = 0;
+            if (ageValue.Length != 0)
+            {
+                age = int.Parse(ageValue.FirstValue);
+            }
+
+
+            var model = new UserModel
+            {
+                Name = bindingContext.ValueProvider.GetValue(nameof(UserModel.Name)).FirstValue,
+                Age = age,
+            };
+
+            bindingContext.Result = ModelBindingResult.Success(model);
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Program.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Program.cs
new file mode 100644
index 0000000000..b5fdb843f7
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Program.cs
@@ -0,0 +1,26 @@
+// 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.
+
+using System.IO;
+using Microsoft.AspNetCore.Hosting;
+
+namespace RazorPagesWebSite
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
+            host.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            new WebHostBuilder()
+                .UseKestrel()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseIISIntegration()
+                .UseStartup<StartupWithBasePath>();
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj b/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj
new file mode 100644
index 0000000000..3d83f2342f
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+    <ProjectReference Include="..\RazorPagesClassLibrary\RazorPagesClassLibrary.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(MicrosoftAspNetCoreAuthenticationCookiesPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/RedirectToController.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/RedirectToController.cshtml
new file mode 100644
index 0000000000..fbb709631a
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/RedirectToController.cshtml
@@ -0,0 +1,8 @@
+@page
+
+@functions {
+    public IActionResult OnGet()
+    {
+        return new RedirectToRouteResult(new { controller = "Redirect", action = "RedirectToPageAction", param = 92 });
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/RouteData.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/RouteData.cshtml
new file mode 100644
index 0000000000..89f0eed7f3
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/RouteData.cshtml
@@ -0,0 +1,12 @@
+@page "{intRouteDataStringProperty:int}"
+
+@functions{
+    public string IntRouteDataStringProperty { get; set; }
+
+    public void OnGet(string intRouteDataStringProperty = "default")
+    {
+        IntRouteDataStringProperty = intRouteDataStringProperty;
+    }
+}
+
+From RouteData: @IntRouteDataStringProperty
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Services/CustomService.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Services/CustomService.cs
new file mode 100644
index 0000000000..23dbf1c0ba
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Services/CustomService.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace CustomNamespace
+{
+    public static class CustomService
+    {
+        public static string Value => nameof(CustomService);
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Show.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Show.cshtml
new file mode 100644
index 0000000000..010bf8732a
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Show.cshtml
@@ -0,0 +1 @@
+@page
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/SimpleForms.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/SimpleForms.cshtml
new file mode 100644
index 0000000000..535f672120
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/SimpleForms.cshtml
@@ -0,0 +1,10 @@
+@page
+@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
+
+<form></form>
+<form method="get"></form>
+<form method="post"></form>
+<form action="" method="post"></form>
+<form action="/Foo/Bar/Baz.html" method="get"></form>
+<form action="/Foo/Bar/Baz.html" method="post"></form>
+<form asp-controller="Redirect" asp-action="RedirectToPageAction"></form>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Startup.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Startup.cs
new file mode 100644
index 0000000000..fe3cecc4e9
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Startup.cs
@@ -0,0 +1,52 @@
+// 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.
+
+using System.Globalization;
+using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using RazorPagesWebSite.Conventions;
+
+namespace RazorPagesWebSite
+{
+    public class Startup
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme).AddCookie(options => options.LoginPath = "/Login");
+            services.AddMvc()
+                .AddMvcLocalization()
+                .AddRazorPagesOptions(options =>
+                {
+                    options.Conventions.AuthorizePage("/HelloWorldWithAuth");
+                    options.Conventions.AuthorizeFolder("/Pages/Admin");
+                    options.Conventions.AllowAnonymousToPage("/Pages/Admin/Login");
+                    options.Conventions.AddPageRoute("/HelloWorldWithRoute", "Different-Route/{text}");
+                    options.Conventions.AddPageRoute("/Pages/NotTheRoot", string.Empty);
+                    options.Conventions.Add(new CustomModelTypeConvention());
+                })
+                .WithRazorPagesAtContentRoot();
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseAuthentication();
+
+            app.UseStaticFiles();
+
+            var supportedCultures = new[]
+            {
+                new CultureInfo("en-US"),
+                new CultureInfo("fr-FR"),
+            };
+
+            app.UseRequestLocalization(new RequestLocalizationOptions
+            {
+                SupportedCultures = supportedCultures,
+                SupportedUICultures = supportedCultures
+            });
+
+            app.UseMvc();
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/StartupWithBasePath.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/StartupWithBasePath.cs
new file mode 100644
index 0000000000..4ee45cae12
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/StartupWithBasePath.cs
@@ -0,0 +1,42 @@
+// 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.
+
+using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using RazorPagesWebSite.Conventions;
+
+namespace RazorPagesWebSite
+{
+    public class StartupWithBasePath
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
+                .AddCookie(options => options.LoginPath = "/Login");
+            services.AddMvc()
+                .AddCookieTempDataProvider()
+                .AddRazorPagesOptions(options =>
+                {
+                    options.AllowAreas = true;
+                    options.Conventions.AuthorizePage("/Conventions/Auth");
+                    options.Conventions.AuthorizeFolder("/Conventions/AuthFolder");
+                    options.Conventions.AuthorizeAreaFolder("Accounts", "/RequiresAuth");
+                    options.Conventions.AllowAnonymousToAreaPage("Accounts", "/RequiresAuth/AllowAnonymous");
+                    options.Conventions.Add(new CustomModelTypeConvention());
+                });
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseAuthentication();
+
+            app.UseStaticFiles();
+
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute("areaRoute", "{area:exists}/{controller=Home}/{action=Index}");
+            });
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/TagHelpers.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/TagHelpers.cshtml
new file mode 100644
index 0000000000..91fa0dd6b1
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/TagHelpers.cshtml
@@ -0,0 +1,16 @@
+@page
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+@functions {
+        public class Post
+        {
+            public int Id { get; set; }
+            public string Title { get; set; }
+        }
+        public Post post = new Post { Id = 2, Title = "Post title" };
+}
+
+<a asp-route-page="/Show" asp-route-id="@post.Id">@post.Title</a>
+
+<!-- Tests that RazorPage includes InvalidTagHelperIndexerAssignment which is called when the page has an indexer
+     Issue https://github.com/aspnet/Mvc/issues/5920 -->
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/SetMessageAndRedirect.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/SetMessageAndRedirect.cshtml
new file mode 100644
index 0000000000..8ec5426c3b
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/SetMessageAndRedirect.cshtml
@@ -0,0 +1,10 @@
+@page
+
+@functions
+{
+    public IActionResult OnGet()
+    {
+        TempData["Message"] = "Secret Message";
+        return Redirect("~/TempData/TempDataPageModelProperty");
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/SetTempDataOnPageAndRedirect.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/SetTempDataOnPageAndRedirect.cshtml
new file mode 100644
index 0000000000..b604b14d54
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/SetTempDataOnPageAndRedirect.cshtml
@@ -0,0 +1,10 @@
+@page
+
+@functions {
+
+    public IActionResult OnGet(string message)
+    {
+        TempData["Message"] = message;
+        return Redirect("~/TempData/ShowMessage");
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/SetTempDataOnPageModelAndRedirect.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/SetTempDataOnPageModelAndRedirect.cs
new file mode 100644
index 0000000000..3f46ef442d
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/SetTempDataOnPageModelAndRedirect.cs
@@ -0,0 +1,17 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace RazorPagesWebSite
+{
+    public class SetTempDataOnPageModelAndRedirect : PageModel
+    {
+        public IActionResult OnGet(string message)
+        {
+            TempData["Message"] = message;
+            return Redirect("~/TempData/ShowMessage");
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/SetTempDataOnPageModelAndRedirect.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/SetTempDataOnPageModelAndRedirect.cshtml
new file mode 100644
index 0000000000..8f8ed4ae22
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/SetTempDataOnPageModelAndRedirect.cshtml
@@ -0,0 +1,2 @@
+@page
+@model RazorPagesWebSite.SetTempDataOnPageModelAndRedirect
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/ShowMessage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/ShowMessage.cshtml
new file mode 100644
index 0000000000..f674605030
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/ShowMessage.cshtml
@@ -0,0 +1,3 @@
+@page
+
+@(TempData["Message"])
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/TempDataPageModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/TempDataPageModel.cs
new file mode 100644
index 0000000000..e2a3ebe605
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/TempDataPageModel.cs
@@ -0,0 +1,26 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+namespace RazorPagesWebSite.TempData
+{
+    public class TempDataPageModel : PageModel
+    {
+        [TempData]
+        public string Message { get; set; }
+
+        public IActionResult OnGet()
+        {
+            return Page();
+        }
+
+        public IActionResult OnPost()
+        {
+            Message = "Secret post";
+            return Page();
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/TempDataPageModelProperty.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/TempDataPageModelProperty.cshtml
new file mode 100644
index 0000000000..24bbf83b53
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/TempDataPageModelProperty.cshtml
@@ -0,0 +1,9 @@
+@page
+@model RazorPagesWebSite.TempData.TempDataPageModel
+
+Message: @Model.Message
+@using (Html.BeginForm())
+{
+    @Html.AntiForgeryToken()
+}
+TempData: @TempData["Message"]
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_FileInShared.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_FileInShared.cshtml
new file mode 100644
index 0000000000..0c110be233
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_FileInShared.cshtml
@@ -0,0 +1 @@
+@{ throw new Exception("This file should not be processed"); }
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_GlobalLayout.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_GlobalLayout.cshtml
new file mode 100644
index 0000000000..3f9d21e30c
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_GlobalLayout.cshtml
@@ -0,0 +1,2 @@
+Layout in /Views/Shared
+@RenderBody()
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_Shared.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_Shared.cshtml
new file mode 100644
index 0000000000..4bc0a0688a
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_Shared.cshtml
@@ -0,0 +1 @@
+Hello from shared
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/_Root.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/_Root.cshtml
new file mode 100644
index 0000000000..d8bed21d44
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/_Root.cshtml
@@ -0,0 +1 @@
+Hello from root
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/_ViewStart.cshtml
new file mode 100644
index 0000000000..29ff986af7
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/_ViewStart.cshtml
@@ -0,0 +1,6 @@
+@using Microsoft.AspNetCore.Mvc.RazorPages
+@if (ViewContext.ActionDescriptor is PageActionDescriptor actionDescriptor && actionDescriptor.ViewEnginePath == "/WithViewStart/ViewStartAtRoot")
+{
+<text>Hello from _ViewStart at root
+</text>
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/readme.md b/src/Mvc/test/WebSites/RazorPagesWebSite/readme.md
new file mode 100644
index 0000000000..1fa2cd4151
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/readme.md
@@ -0,0 +1,4 @@
+RazorPagesWebSite
+===
+
+This web site is used for functional tests of the Razor Pages feature of MVC.
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Components/ComponentForViewWithPaths.cs b/src/Mvc/test/WebSites/RazorWebSite/Components/ComponentForViewWithPaths.cs
new file mode 100644
index 0000000000..e6e2f88f0f
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Components/ComponentForViewWithPaths.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace MvcSample.Web.Components
+{
+    [ViewComponent(Name = "ComponentForViewWithPaths")]
+    public class ComponentForViewWithPaths : ViewComponent
+    {
+        public IViewComponentResult Invoke()
+        {
+            return View();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Components/ComponentThatSetsTitle.cs b/src/Mvc/test/WebSites/RazorWebSite/Components/ComponentThatSetsTitle.cs
new file mode 100644
index 0000000000..0b55d56504
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Components/ComponentThatSetsTitle.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace MvcSample.Web.Components
+{
+    [ViewComponent(Name = "ComponentThatSetsTitle")]
+    public class ComponentThatSetsTitle : ViewComponent
+    {
+        public IViewComponentResult Invoke()
+        {
+            return View();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Components/ComponentWithLayout.cs b/src/Mvc/test/WebSites/RazorWebSite/Components/ComponentWithLayout.cs
new file mode 100644
index 0000000000..b195e19a36
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Components/ComponentWithLayout.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace MvcSample.Web.Components
+{
+    public class ComponentWithLayout : ViewComponent
+    {
+        public IViewComponentResult Invoke()
+        {
+            ViewData["Title"] = "ViewComponent With Title";
+            return View();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Components/ComponentWithRelativePath.cs b/src/Mvc/test/WebSites/RazorWebSite/Components/ComponentWithRelativePath.cs
new file mode 100644
index 0000000000..981f7a15ee
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Components/ComponentWithRelativePath.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorWebSite.Components
+{
+    public class ComponentWithRelativePath : ViewComponent
+    {
+        public IViewComponentResult Invoke(Person person)
+        {
+            return View("../Shared/Components/ComponentWithRelativePath.cshtml", person);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Components/ComponentWithViewStart.cs b/src/Mvc/test/WebSites/RazorWebSite/Components/ComponentWithViewStart.cs
new file mode 100644
index 0000000000..983e09487e
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Components/ComponentWithViewStart.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace MvcSample.Web.Components
+{
+    public class ComponentWithViewStart : ViewComponent
+    {
+        public IViewComponentResult Invoke()
+        {
+            ViewData["Title"] = "ViewComponent With ViewStart";
+            return View();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Components/InheritingViewComponent.cs b/src/Mvc/test/WebSites/RazorWebSite/Components/InheritingViewComponent.cs
new file mode 100644
index 0000000000..b08abd28b9
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Components/InheritingViewComponent.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorWebSite.Components
+{
+    [ViewComponent(Name = "InheritingViewComponent")]
+    public class InheritingViewComponent : ViewComponent
+    {
+        public IViewComponentResult Invoke(Address address)
+        {
+            return View("/Views/InheritingInherits/_ViewComponent.cshtml", address);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Controllers/AddTagHelperComponentController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/AddTagHelperComponentController.cs
new file mode 100644
index 0000000000..403520dcff
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Controllers/AddTagHelperComponentController.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
+
+namespace RazorWebSite.Controllers
+{
+    public class AddTagHelperComponentController : Controller
+    {
+        private readonly ITagHelperComponentManager _tagHelperComponentManager;
+
+        public AddTagHelperComponentController(ITagHelperComponentManager tagHelperComponentManager)
+        {
+            _tagHelperComponentManager = tagHelperComponentManager;
+        }
+
+        public IActionResult AddComponent()
+        {
+            _tagHelperComponentManager.Components.Add(new TestBodyTagHelperComponent(0, "Processed TagHelperComponent added from controller."));
+            ViewData["TestData"] = "Value";
+            return View("AddComponent");
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Controllers/BackSlashController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/BackSlashController.cs
new file mode 100644
index 0000000000..ca43a6f58d
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Controllers/BackSlashController.cs
@@ -0,0 +1,12 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorWebSite.Controllers
+{
+    public class BackSlashController : Controller
+    {
+        public IActionResult Index() => View(@"Views\BackSlash\BackSlashView.cshtml");
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Controllers/DirectivesController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/DirectivesController.cs
new file mode 100644
index 0000000000..4a7c400527
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Controllers/DirectivesController.cs
@@ -0,0 +1,35 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorWebSite
+{
+    public class DirectivesController : Controller
+    {
+        public IActionResult ViewInheritsInjectAndUsingsFromViewImports()
+        {
+            return View(new Person { Name = "Person1" });
+        }
+
+        public IActionResult ViewInheritsBasePageFromViewImports()
+        {
+            return View("/Views/Directives/Scoped/ViewInheritsBasePageFromViewImports.cshtml",
+                        new Person { Name = "Person2" });
+        }
+
+        public IActionResult ViewReplacesTModelTokenFromInheritedBasePages()
+        {
+            var model = new Person
+            {
+                Name = "Bob",
+                Address = new Address
+                {
+                    ZipCode = "98052"
+                }
+            };
+
+            return View("/Views/InheritingInherits/Index.cshtml", model);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Controllers/EmbeddedViewsController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/EmbeddedViewsController.cs
new file mode 100644
index 0000000000..ca653f83a0
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Controllers/EmbeddedViewsController.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorWebSite.Controllers
+{
+    public class EmbeddedViewsController : Controller
+    {
+        public IActionResult LookupByName() => View("Index");
+
+        public IActionResult LookupByPath() => View("/Views/EmbeddedViews/Index.cshtml");
+
+        public IActionResult RelativeNonPath() => View();
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Controllers/ExpanderViewsController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/ExpanderViewsController.cs
new file mode 100644
index 0000000000..6042c9f38d
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Controllers/ExpanderViewsController.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorWebSite.Controllers
+{
+    public class ExpanderViewsController : Controller
+    {
+        // This result discovers the Index.cshtml from /View but the partial is executed from /Shared-Views
+        public IActionResult Index()
+        {
+            return View();
+        }
+
+        public IActionResult Partial()
+        {
+            return PartialView("_ExpanderPartial");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Controllers/FlushPoint.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/FlushPoint.cs
new file mode 100644
index 0000000000..d55b831bb8
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Controllers/FlushPoint.cs
@@ -0,0 +1,42 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorWebSite
+{
+    public class FlushPoint : Controller
+    {
+        public IActionResult PageWithLayout()
+        {
+            return View();
+        }
+
+        public IActionResult PageWithoutLayout()
+        {
+            return View();
+        }
+
+        // This uses RenderSection to render the section that contains a FlushAsync call
+        public IActionResult PageWithPartialsAndViewComponents()
+        {
+            return View();
+        }
+
+        // This uses RenderSectionAsync to render the section that contains a FlushAsync call
+        public IActionResult PageWithRenderSectionAsync()
+        {
+            return View("PageWithSectionInvokedViaRenderSectionAsync");
+        }
+
+        public IActionResult PageWithNestedLayout()
+        {
+            return View();
+        }
+
+        public IActionResult PageWithFlushBeforeLayout()
+        {
+            return View();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Controllers/HtmlHelperOptionsController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/HtmlHelperOptionsController.cs
new file mode 100644
index 0000000000..91b20ea824
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Controllers/HtmlHelperOptionsController.cs
@@ -0,0 +1,56 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorWebSite.Controllers
+{
+    public class HtmlHelperOptionsController : Controller
+    {
+        public IActionResult HtmlHelperOptionsDefaultsInView()
+        {
+            var model = new DateModel
+            {
+                MyDate = new DateTimeOffset(
+                year: 2000,
+                month: 1,
+                day: 2,
+                hour: 3,
+                minute: 4,
+                second: 5,
+                millisecond: 60,
+                offset: TimeSpan.FromHours(0))
+            };
+
+            ModelState.AddModelError(string.Empty, "A model error occurred.");
+            ModelState.AddModelError("Error", "An error occurred.");
+            return View(model);
+        }
+
+        public IActionResult OverrideAppWideDefaultsInView()
+        {
+            var model = new DateModel
+            {
+                MyDate = new DateTimeOffset(
+                year: 2000,
+                month: 1,
+                day: 2,
+                hour: 3,
+                minute: 4,
+                second: 5,
+                millisecond: 60,
+                offset: TimeSpan.FromHours(0))
+            };
+
+            ModelState.AddModelError(string.Empty, "A model error occurred.");
+            ModelState.AddModelError("Error", "An error occurred.");
+            return View(model);
+        }
+    }
+
+    public class DateModel
+    {
+        public DateTimeOffset MyDate { get; set; }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Controllers/NestedViewStartsController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/NestedViewStartsController.cs
new file mode 100644
index 0000000000..cd688707bb
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Controllers/NestedViewStartsController.cs
@@ -0,0 +1,15 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorWebSite.Controllers
+{
+    public class NestedViewStartsController : Controller
+    {
+        public IActionResult Index()
+        {
+            return View("NestedViewStarts/Index");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Controllers/PartialViewEngineController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/PartialViewEngineController.cs
new file mode 100644
index 0000000000..d7fe08f716
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Controllers/PartialViewEngineController.cs
@@ -0,0 +1,51 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorWebSite.Controllers
+{
+    public class PartialViewEngineController : Controller
+    {
+        public IActionResult ViewWithoutLayout()
+        {
+            return PartialView();
+        }
+
+        public IActionResult ViewWithFullPath()
+        {
+            return PartialView("/Views/ViewEngine/ViewWithFullPath.rzr");
+        }
+
+        public IActionResult PartialViewWithNamePassedIn()
+        {
+            return PartialView("ViewWithLayout");
+        }
+
+        public IActionResult ViewWithNestedLayout()
+        {
+            return PartialView();
+        }
+
+        public IActionResult PartialWithDataFromController()
+        {
+            ViewData["data-from-controller"] = "hello from controller";
+            return PartialView("ViewWithDataFromController");
+        }
+
+        public IActionResult PartialWithModel()
+        {
+            var model = new Person
+            {
+                Name = "my name is judge",
+                Address = new Address { ZipCode = "98052" }
+            };
+            return PartialView(model);
+        }
+
+        public IActionResult ViewPartialMissingSection()
+        {
+            return View();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Controllers/PartialsWithLayoutController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/PartialsWithLayoutController.cs
new file mode 100644
index 0000000000..74e767a042
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Controllers/PartialsWithLayoutController.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorWebSite.Controllers
+{
+    public class PartialsWithLayoutController : Controller
+    {
+        public IActionResult PartialDoesNotExecuteViewStarts()
+        {
+            return PartialView("PartialThatDoesNotSpecifyLayout");
+        }
+
+        // This action demonstrates
+        // (a) _ViewStart does not get executed when executing a partial via RenderPartial
+        // (b) Partials rendered via RenderPartial can execute Layout.
+        public IActionResult PartialsRenderedViaRenderPartial()
+        {
+            return View();
+        }
+
+        // This action demonstrates
+        // (a) _ViewStart does not get executed when executing a partial via PartialAsync
+        // (b) Partials rendered via PartialAsync can execute Layout.
+        public IActionResult PartialsRenderedViaPartialAsync()
+        {
+            return View();
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Controllers/TagHelperComponentController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/TagHelperComponentController.cs
new file mode 100644
index 0000000000..d3be1d2fbd
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Controllers/TagHelperComponentController.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorWebSite
+{
+    public class TagHelperComponentController : Controller
+    {
+        // GET: /<controller>/
+        public IActionResult GetHead()
+        {
+            return View("Head");
+        }
+
+        public IActionResult GetBody()
+        {
+            return View("Body");
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Controllers/TemplateExpander.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/TemplateExpander.cs
new file mode 100644
index 0000000000..152f5e1bb2
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Controllers/TemplateExpander.cs
@@ -0,0 +1,20 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorWebSite.Controllers
+{
+    public class TemplateExpander : Controller
+    {
+        public IActionResult Index()
+        {
+            return View();
+        }
+
+        public IActionResult ViewWithLayout()
+        {
+            return View();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Controllers/UpdateableFileProviderController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/UpdateableFileProviderController.cs
new file mode 100644
index 0000000000..a504b11cb6
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Controllers/UpdateableFileProviderController.cs
@@ -0,0 +1,19 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorWebSite
+{
+    public class UpdateableFileProviderController : Controller
+    {
+        public IActionResult Index() => View("/Views/UpdateableIndex/Index.cshtml");
+
+        [HttpPost]
+        public IActionResult Update([FromServices] UpdateableFileProvider fileProvider)
+        {
+            fileProvider.UpdateContent("/Views/UpdateableShared/_Partial.cshtml", "New content");
+            return Ok();
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Controllers/UrlResolutionController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/UrlResolutionController.cs
new file mode 100644
index 0000000000..0d6902aac2
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Controllers/UrlResolutionController.cs
@@ -0,0 +1,20 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorWebSite.Controllers
+{
+    public class UrlResolutionController : Controller
+    {
+        public IActionResult Index()
+        {
+            var model = new Person
+            {
+                Name = "John Doe"
+            };
+
+            return View(model);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Controllers/ViewEngineController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/ViewEngineController.cs
new file mode 100644
index 0000000000..1a36f37741
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Controllers/ViewEngineController.cs
@@ -0,0 +1,83 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorWebSite.Controllers
+{
+    public class ViewEngineController : Controller
+    {
+        public IActionResult ViewWithoutLayout()
+        {
+            return View();
+        }
+
+        public IActionResult ViewWithFullPath()
+        {
+            return View("/Views/ViewEngine/ViewWithFullPath.rzr");
+        }
+
+        public IActionResult ViewWithRelativePath()
+        {
+            return View("Views/ViewEngine/ViewWithRelativePath.cshtml");
+        }
+
+        public IActionResult ViewWithLayout()
+        {
+            return View();
+        }
+
+        public IActionResult ViewWithNestedLayout()
+        {
+            return View();
+        }
+
+        public IActionResult ViewWithPartial()
+        {
+            ViewData["TestKey"] = "test-value";
+            var model = new Person
+            {
+                Address = new Address { ZipCode = "98052" }
+            };
+
+            return View(model);
+        }
+
+        public IActionResult ViewWithPartialTakingModelFromIEnumerable()
+        {
+            var model = new List<Person>()
+            {
+                new Person() { Name = "Hello" },
+                new Person() { Name = "World" }
+            };
+
+            return View(model);
+        }
+
+        public IActionResult ViewPassesViewDataToLayout()
+        {
+            ViewData["Title"] = "Controller title";
+            return View("ViewWithTitle");
+        }
+
+        public IActionResult ViewWithDataFromController()
+        {
+            ViewData["data-from-controller"] = "hello from controller";
+            return View("ViewWithDataFromController");
+        }
+
+        public IActionResult ViewWithComponentThatHasLayout()
+        {
+            ViewData["Title"] = "View With Component With Layout";
+            return View();
+        }
+
+        public IActionResult ViewWithComponentThatHasViewStart()
+        {
+            return View();
+        }
+
+        public IActionResult SearchInPages() => View();
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Controllers/ViewNameSpecification_HomeController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/ViewNameSpecification_HomeController.cs
new file mode 100644
index 0000000000..8a7a59d3b9
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Controllers/ViewNameSpecification_HomeController.cs
@@ -0,0 +1,80 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorWebSite.Controllers
+{
+    public class ViewNameSpecification_HomeController : Controller
+    {
+        public IActionResult LayoutSpecifiedWithPartialPathInViewStart()
+        {
+            return View();
+        }
+
+        public IActionResult LayoutSpecifiedWithPartialPathInViewStart_ForViewSpecifiedWithPartialName()
+        {
+            return View("LayoutSpecifiedWithPartialPathInViewStart");
+        }
+
+        public IActionResult LayoutSpecifiedWithPartialPathInViewStart_ForViewSpecifiedWithRelativePath()
+        {
+            return View("Views/ViewNameSpecification_Home/LayoutSpecifiedWithPartialPathInViewStart.cshtml");
+        }
+
+        public IActionResult LayoutSpecifiedWithPartialPathInViewStart_ForViewSpecifiedWithAppRelativePath()
+        {
+            return View("~/Views/ViewNameSpecification_Home/LayoutSpecifiedWithPartialPathInViewStart.cshtml");
+        }
+
+        public IActionResult LayoutSpecifiedWithPartialPathInPage()
+        {
+            return View();
+        }
+
+        public IActionResult LayoutSpecifiedWithPartialPathInPageWithPartialPath()
+        {
+            return View("LayoutSpecifiedWithPartialPathInPage");
+        }
+
+        public IActionResult LayoutSpecifiedWithPartialPathInPageWithRelativePath()
+        {
+            return View("Views/ViewNameSpecification_Home/LayoutSpecifiedWithPartialPathInPage.cshtml");
+        }
+
+        public IActionResult LayoutSpecifiedWithPartialPathInPageWithAppRelativePath()
+        {
+            return View("~/Views/ViewNameSpecification_Home/LayoutSpecifiedWithPartialPathInPage.cshtml");
+        }
+
+        public IActionResult LayoutSpecifiedWithRelativePath()
+        {
+            ViewData["Layout"] = "_NonSharedLayout.cshtml";
+            return View("PageWithNonPartialLayoutPath");
+        }
+
+        public IActionResult LayoutSpecifiedWithAppRelativePath()
+        {
+            ViewData["Layout"] = "~/Views/ViewNameSpecification_Home/_NonSharedLayout.cshtml";
+            return View("PageWithNonPartialLayoutPath");
+        }
+
+        public IActionResult ViewWithPartial_SpecifiedWithPartialName()
+        {
+            ViewBag.Partial = "NonSharedPartial";
+            return View("ViewWithPartials");
+        }
+
+        public IActionResult ViewWithPartial_SpecifiedWithRelativePath()
+        {
+            ViewBag.Partial = "NonSharedPartial.cshtml";
+            return View("ViewWithPartials");
+        }
+
+        public IActionResult ViewWithPartial_SpecifiedWithAppRelativePath()
+        {
+            ViewBag.Partial = "~/Views/ViewNameSpecification_Home/NonSharedPartial.cshtml";
+            return View("ViewWithPartials");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Controllers/ViewWithPathsController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/ViewWithPathsController.cs
new file mode 100644
index 0000000000..a98754a0d0
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Controllers/ViewWithPathsController.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorWebSite.Controllers
+{
+    public class ViewWithPathsController : Controller
+    {
+        [HttpGet("/ViewWithPaths")]
+        public IActionResult Index()
+        {
+            return View();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Controllers/ViewsConsumingCompilationOptionsController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/ViewsConsumingCompilationOptionsController.cs
new file mode 100644
index 0000000000..91e4911673
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Controllers/ViewsConsumingCompilationOptionsController.cs
@@ -0,0 +1,17 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorWebSite.Controllers
+{
+    // Views returned by this controller use #ifdefs for defines specified in the project
+    // The intent of this controller is to verify that view compilation uses the app's compilation settings.
+    public class ViewsConsumingCompilationOptionsController : Controller
+    {
+        public IActionResult Index()
+        {
+            return View();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedShared/_Layout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedShared/_Layout.cshtml
new file mode 100644
index 0000000000..e16c087dfd
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedShared/_Layout.cshtml
@@ -0,0 +1 @@
+<embdedded-layout>@RenderBody()</embdedded-layout>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedShared/_Partial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedShared/_Partial.cshtml
new file mode 100644
index 0000000000..b34fab2eec
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedShared/_Partial.cshtml
@@ -0,0 +1 @@
+Hello from EmbeddedShared/_Partial
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/EmbeddedPartial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/EmbeddedPartial.cshtml
new file mode 100644
index 0000000000..cebe57816a
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/EmbeddedPartial.cshtml
@@ -0,0 +1 @@
+Hello from EmbeddedHome\EmbeddedPartial
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/Index.cshtml
new file mode 100644
index 0000000000..4b7d8ae335
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/Index.cshtml
@@ -0,0 +1,3 @@
+@Html.Partial("../EmbeddedShared/_Partial.cshtml")
+@Html.Partial("_EmbeddedPartial")
+<a asp-controller="EmbeddedViews" asp-action="Index">Tag Helper Link</a>
diff --git a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/RelativeNonPath.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/RelativeNonPath.cshtml
new file mode 100644
index 0000000000..1aca712209
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/RelativeNonPath.cshtml
@@ -0,0 +1,2 @@
+@{ Layout = "../EmbeddedShared/_Layout"; }
+@Html.Partial("./EmbeddedPartial")
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/_ViewImports.cshtml
new file mode 100644
index 0000000000..9018c7897f
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/_ViewImports.cshtml
@@ -0,0 +1 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/_ViewStart.cshtml
new file mode 100644
index 0000000000..e4209d9008
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/_ViewStart.cshtml
@@ -0,0 +1 @@
+@{ Layout = "/Views/EmbeddedShared/_Layout.cshtml"; }
diff --git a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/Shared/_EmbeddedPartial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/Shared/_EmbeddedPartial.cshtml
new file mode 100644
index 0000000000..ef09462726
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/Shared/_EmbeddedPartial.cshtml
@@ -0,0 +1 @@
+Hello from Shared/_EmbeddedPartial
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Models/Address.cs b/src/Mvc/test/WebSites/RazorWebSite/Models/Address.cs
new file mode 100644
index 0000000000..c2eafbe8ce
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Models/Address.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace RazorWebSite
+{
+    public class Address
+    {
+        public string ZipCode { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Models/Person.cs b/src/Mvc/test/WebSites/RazorWebSite/Models/Person.cs
new file mode 100644
index 0000000000..2cd62fd19a
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Models/Person.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace RazorWebSite
+{
+    public class Person
+    {
+        public string Name { get; set; }
+
+        public Address Address { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/MyBasePage.cs b/src/Mvc/test/WebSites/RazorWebSite/MyBasePage.cs
new file mode 100644
index 0000000000..1a37870c52
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/MyBasePage.cs
@@ -0,0 +1,34 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Razor;
+
+namespace RazorWebSite
+{
+    public abstract class MyBasePage<TModel> : RazorPage<TModel>
+    {
+        public override void WriteLiteral(object value)
+        {
+            base.WriteLiteral("WriteLiteral says:");
+            base.WriteLiteral(value);
+        }
+
+        public override void WriteLiteral(string value)
+        {
+            base.WriteLiteral("WriteLiteral says:");
+            base.WriteLiteral(value);
+        }
+
+        public override void Write(object value)
+        {
+            base.WriteLiteral("Write says:");
+            base.Write(value);
+        }
+
+        public override void Write(string value)
+        {
+            base.WriteLiteral("Write says:");
+            base.Write(value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/NestedViewImportsController.cs b/src/Mvc/test/WebSites/RazorWebSite/NestedViewImportsController.cs
new file mode 100644
index 0000000000..4e186761fa
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/NestedViewImportsController.cs
@@ -0,0 +1,20 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorWebSite.Controllers
+{
+    public class NestedViewImportsController : Controller
+    {
+        public ViewResult Index()
+        {
+            var model = new Person
+            {
+                Name = "Controller-Person"
+            };
+
+            return View("~/Views/NestedViewImports/Nested/Index.cshtml", model);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Pages/Shared/_Layout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Pages/Shared/_Layout.cshtml
new file mode 100644
index 0000000000..0c110be233
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Pages/Shared/_Layout.cshtml
@@ -0,0 +1 @@
+@{ throw new Exception("This file should not be processed"); }
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Pages/Shared/_SharedFromPages.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Pages/Shared/_SharedFromPages.cshtml
new file mode 100644
index 0000000000..eebf127144
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Pages/Shared/_SharedFromPages.cshtml
@@ -0,0 +1 @@
+Hello from Pages/Shared
diff --git a/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj b/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj
new file mode 100644
index 0000000000..4c8140635e
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+    <DefineConstants>$(DefineConstants);NETCOREAPP2_0_CUSTOM_DEFINE</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="EmbeddedResources\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(MicrosoftAspNetCoreDiagnosticsPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Services/BackSlashExpander.cs b/src/Mvc/test/WebSites/RazorWebSite/Services/BackSlashExpander.cs
new file mode 100644
index 0000000000..722bd096d6
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Services/BackSlashExpander.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace RazorWebSite
+{
+    public class BackSlashExpander : IViewLocationExpander
+    {
+        public void PopulateValues(ViewLocationExpanderContext context)
+        {
+        }
+
+        public virtual IEnumerable<string> ExpandViewLocations(ViewLocationExpanderContext context, IEnumerable<string> viewLocations)
+        {
+            if (context.ActionContext is ViewContext viewContext && (string)viewContext.ViewData["back-slash"] == "true")
+            {
+                return new[] { $@"Views\BackSlash\{context.ViewName}.cshtml" };
+                
+            }
+
+            return viewLocations;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs b/src/Mvc/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs
new file mode 100644
index 0000000000..7e56263a49
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs
@@ -0,0 +1,20 @@
+// 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.
+
+namespace RazorWebSite
+{
+    public class FrameworkSpecificHelper
+    {
+        public string ExecuteOperation()
+        {
+            return "This method is running from NETCOREAPP2_0";
+        }
+
+#if NETCOREAPP2_0_CUSTOM_DEFINE || NETCOREAPP2_1_CUSTOM_DEFINE
+        public string ExecuteNetCoreApp2_0Operation()
+        {
+            return "This method is only defined in NETCOREAPP2_0";
+        }
+#endif
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Services/InjectedHelper.cs b/src/Mvc/test/WebSites/RazorWebSite/Services/InjectedHelper.cs
new file mode 100644
index 0000000000..9e97ff1431
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Services/InjectedHelper.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace RazorWebSite
+{
+    public class InjectedHelper
+    {
+        public string Greet(Person person)
+        {
+            return "Hello " + person.Name;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Services/NonMainPageViewLocationExpander.cs b/src/Mvc/test/WebSites/RazorWebSite/Services/NonMainPageViewLocationExpander.cs
new file mode 100644
index 0000000000..6fd040d924
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Services/NonMainPageViewLocationExpander.cs
@@ -0,0 +1,37 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Razor;
+
+namespace RazorWebSite
+{
+    public class NonMainPageViewLocationExpander : IViewLocationExpander
+    {
+        public void PopulateValues(ViewLocationExpanderContext context)
+        {
+        }
+
+        public virtual IEnumerable<string> ExpandViewLocations(
+            ViewLocationExpanderContext context,
+            IEnumerable<string> viewLocations)
+        {
+            if (context.IsMainPage)
+            {
+                return viewLocations;
+            }
+
+            return ExpandViewLocationsCore(viewLocations);
+        }
+
+        private IEnumerable<string> ExpandViewLocationsCore(IEnumerable<string> viewLocations)
+        {
+            yield return "/Shared-Views/{1}/{0}.cshtml";
+
+            foreach (var location in viewLocations)
+            {
+                yield return location;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Services/TaskReturningService.cs b/src/Mvc/test/WebSites/RazorWebSite/Services/TaskReturningService.cs
new file mode 100644
index 0000000000..a76babdd09
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Services/TaskReturningService.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using System.Threading.Tasks;
+
+namespace RazorWebSite
+{
+    public class TaskReturningService
+    {
+        public async Task<string> GetValueAsync()
+        {
+            await Task.Delay(100);
+            return "Value from TaskReturningString";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Services/TestBodyTagHelperComponent.cs b/src/Mvc/test/WebSites/RazorWebSite/Services/TestBodyTagHelperComponent.cs
new file mode 100644
index 0000000000..750dd61d20
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Services/TestBodyTagHelperComponent.cs
@@ -0,0 +1,49 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace RazorWebSite
+{
+    public class TestBodyTagHelperComponent : ITagHelperComponent
+    {
+        private int _order;
+        private string _html;
+
+        public TestBodyTagHelperComponent() : this(1, "<script>'This was injected!!'</script>")
+        {
+
+        }
+
+        public TestBodyTagHelperComponent(int order, string html)
+        {
+            _order = order;
+            _html = html;
+        }
+
+        [ViewContext]
+        public ViewContext ViewContext { get; set; }
+
+        public int Order => _order;
+
+        public void Init(TagHelperContext context)
+        {
+        }
+
+        public Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            if (string.Equals(context.TagName, "body", StringComparison.Ordinal) &&
+                output.Attributes.ContainsName("inject"))
+            {
+                output.PostContent.AppendHtml(_html);
+                ViewContext.ViewData["TestData"] = "NewValue";
+            }
+
+            return Task.FromResult(0);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Services/TestHeadTagHelperComponent.cs b/src/Mvc/test/WebSites/RazorWebSite/Services/TestHeadTagHelperComponent.cs
new file mode 100644
index 0000000000..6242cf6b71
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Services/TestHeadTagHelperComponent.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace RazorWebSite
+{
+    public class TestHeadTagHelperComponent : TagHelperComponent
+    {
+        public override int Order => 1;
+
+        public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            if (string.Equals(context.TagName, "head", StringComparison.Ordinal) && output.Attributes.ContainsName("inject"))
+            {
+                output.PostContent.AppendHtml("<script>'This was injected!!'</script>");
+            }
+
+            return Task.FromResult(0);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Services/UpdateableFileProvider.cs b/src/Mvc/test/WebSites/RazorWebSite/Services/UpdateableFileProvider.cs
new file mode 100644
index 0000000000..0e3ef8aaac
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Services/UpdateableFileProvider.cs
@@ -0,0 +1,85 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Primitives;
+
+namespace RazorWebSite
+{
+    public class UpdateableFileProvider : IFileProvider
+    {
+        private readonly Dictionary<string, TestFileInfo> _content = new Dictionary<string, TestFileInfo>()
+        {
+            {
+                "/Views/UpdateableIndex/Index.cshtml",
+                new TestFileInfo(@"@Html.Partial(""../UpdateableShared/_Partial.cshtml"")")
+            },
+            {
+                "/Views/UpdateableShared/_Partial.cshtml",
+                new TestFileInfo("Original content")
+            },
+        };
+
+        public IDirectoryContents GetDirectoryContents(string subpath) => new NotFoundDirectoryContents();
+
+        public void UpdateContent(string subpath, string content)
+        {
+            var old = _content[subpath];
+            old.TokenSource.Cancel();
+            _content[subpath] = new TestFileInfo(content);
+        }
+
+        public IFileInfo GetFileInfo(string subpath)
+        {
+            TestFileInfo fileInfo;
+            if (!_content.TryGetValue(subpath, out fileInfo))
+            {
+                fileInfo = new TestFileInfo(null);
+            }
+
+            return fileInfo;
+        }
+
+        public IChangeToken Watch(string filter)
+        {
+            TestFileInfo fileInfo;
+            if (_content.TryGetValue(filter, out fileInfo))
+            {
+                return fileInfo.ChangeToken;
+            }
+
+            return NullChangeToken.Singleton;
+        }
+
+        private class TestFileInfo : IFileInfo
+        {
+            private readonly string _content;
+
+            public TestFileInfo(string content)
+            {
+                _content = content;
+                ChangeToken = new CancellationChangeToken(TokenSource.Token);
+                Exists = _content != null;
+            }
+
+            public bool Exists { get; }
+            public bool IsDirectory => false;
+            public DateTimeOffset LastModified => DateTimeOffset.MinValue;
+            public long Length => -1;
+            public string Name => null;
+            public string PhysicalPath => null;
+            public CancellationTokenSource TokenSource { get; } = new CancellationTokenSource();
+            public CancellationChangeToken ChangeToken { get; }
+
+            public Stream CreateReadStream()
+            {
+                return new MemoryStream(Encoding.UTF8.GetBytes(_content));
+            }
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Shared-Views/ExpanderViews/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Shared-Views/ExpanderViews/Index.cshtml
new file mode 100644
index 0000000000..9818fe9b53
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Shared-Views/ExpanderViews/Index.cshtml
@@ -0,0 +1,3 @@
+@{ 
+    throw new Exception("This view should not be executed");
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Shared-Views/ExpanderViews/_ExpanderPartial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Shared-Views/ExpanderViews/_ExpanderPartial.cshtml
new file mode 100644
index 0000000000..314398b63a
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Shared-Views/ExpanderViews/_ExpanderPartial.cshtml
@@ -0,0 +1 @@
+<shared-views>@ViewContext.View.Path</shared-views>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Startup.cs b/src/Mvc/test/WebSites/RazorWebSite/Startup.cs
new file mode 100644
index 0000000000..17fee9d6d7
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Startup.cs
@@ -0,0 +1,92 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Reflection;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Localization;
+using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.FileProviders;
+
+namespace RazorWebSite
+{
+    public class Startup
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            var updateableFileProvider = new UpdateableFileProvider();
+            services.AddSingleton(updateableFileProvider);
+            services.AddSingleton<ITagHelperComponent, TestHeadTagHelperComponent>();
+            services.AddSingleton<ITagHelperComponent, TestBodyTagHelperComponent>();
+
+            services
+                .AddMvc()
+                .AddRazorOptions(options =>
+                {
+                    options.FileProviders.Add(new EmbeddedFileProvider(
+                        typeof(Startup).GetTypeInfo().Assembly,
+                        $"{nameof(RazorWebSite)}.EmbeddedResources"));
+                    options.FileProviders.Add(updateableFileProvider);
+                    options.ViewLocationExpanders.Add(new NonMainPageViewLocationExpander());
+                    options.ViewLocationExpanders.Add(new BackSlashExpander());
+                })
+                .AddViewOptions(options =>
+                {
+                    options.HtmlHelperOptions.ClientValidationEnabled = false;
+                    options.HtmlHelperOptions.Html5DateRenderingMode = Microsoft.AspNetCore.Mvc.Rendering.Html5DateRenderingMode.Rfc3339;
+                    options.HtmlHelperOptions.IdAttributeDotReplacement = "!";
+                    options.HtmlHelperOptions.ValidationMessageElement = "validationMessageElement";
+                    options.HtmlHelperOptions.ValidationSummaryMessageElement = "validationSummaryElement";
+                })
+                .AddMvcLocalization(LanguageViewLocationExpanderFormat.SubFolder);
+
+            services.AddTransient<InjectedHelper>();
+            services.AddTransient<TaskReturningService>();
+            services.AddTransient<FrameworkSpecificHelper>();
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseDeveloperExceptionPage();
+            app.UseRequestLocalization(new RequestLocalizationOptions
+            {
+                DefaultRequestCulture = new RequestCulture("en-GB", "en-US"),
+                SupportedCultures = new List<CultureInfo>
+                {
+                    new CultureInfo("fr"),
+                    new CultureInfo("en-GB"),
+                    new CultureInfo("en-US"),
+                },
+                SupportedUICultures = new List<CultureInfo>
+                {
+                    new CultureInfo("fr"),
+                    new CultureInfo("en-GB"),
+                    new CultureInfo("en-US"),
+                }
+            });
+
+            app.UseMvcWithDefaultRoute();
+        }
+
+        public static void Main(string[] args)
+        {
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
+            host.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            new WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseStartup<Startup>()
+                .UseKestrel()
+                .UseIISIntegration();
+    }
+}
+
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/AddTagHelperComponent/AddComponent.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/AddTagHelperComponent/AddComponent.cshtml
new file mode 100644
index 0000000000..f7f508904f
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/AddTagHelperComponent/AddComponent.cshtml
@@ -0,0 +1,10 @@
+@inject Microsoft.AspNetCore.Mvc.Razor.TagHelpers.ITagHelperComponentManager manager
+<head inject>
+Hello from Head Tag Helper Component
+</head>
+@{ 
+    manager.Components.Add(new TestBodyTagHelperComponent(2, "Processed TagHelperComponent added from view."));
+}
+<body inject>
+Hello from Body Tag Helper Component
+</body>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/BackSlashView.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/BackSlashView.cshtml
new file mode 100644
index 0000000000..e28dd6e75f
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/BackSlashView.cshtml
@@ -0,0 +1,6 @@
+@{
+  ViewData["back-slash"] = "true";
+  Layout = "_Layout";
+}
+Page
+@Html.Partial("_BackSlashPartial")
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/_BackSlashPartial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/_BackSlashPartial.cshtml
new file mode 100644
index 0000000000..8bfc4e8000
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/_BackSlashPartial.cshtml
@@ -0,0 +1 @@
+Partial
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/_Layout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/_Layout.cshtml
new file mode 100644
index 0000000000..6bba921339
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/_Layout.cshtml
@@ -0,0 +1,2 @@
+Layout
+@RenderBody()
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/Scoped/ViewInheritsBasePageFromViewImports.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/Scoped/ViewInheritsBasePageFromViewImports.cshtml
new file mode 100644
index 0000000000..cdb1b35b31
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/Scoped/ViewInheritsBasePageFromViewImports.cshtml
@@ -0,0 +1 @@
+@MyHelper.Greet(Model)
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/Scoped/_Layout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/Scoped/_Layout.cshtml
new file mode 100644
index 0000000000..7e6b5f6553
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/Scoped/_Layout.cshtml
@@ -0,0 +1 @@
+layout:@RenderBody()
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/Scoped/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/Scoped/_ViewImports.cshtml
new file mode 100644
index 0000000000..18a5d81917
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/Scoped/_ViewImports.cshtml
@@ -0,0 +1,4 @@
+@inherits MyBasePage<TModel>
+@{
+    Layout = "/Views/Directives/Scoped/_Layout.cshtml";
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/Scoped/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/Scoped/_ViewStart.cshtml
new file mode 100644
index 0000000000..6cca527f44
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/Scoped/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "/Views/Directives/Scoped/_Layout.cshtml";
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/ViewInheritsInjectAndUsingsFromViewImports.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/ViewInheritsInjectAndUsingsFromViewImports.cshtml
new file mode 100644
index 0000000000..e1a2a06716
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/ViewInheritsInjectAndUsingsFromViewImports.cshtml
@@ -0,0 +1,2 @@
+@model MyPerson
+@MyHelper.Greet(Model)
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/_ViewImports.cshtml
new file mode 100644
index 0000000000..68a051a32f
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/_ViewImports.cshtml
@@ -0,0 +1,2 @@
+@using MyPerson = RazorWebSite.Person
+@inject InjectedHelper MyHelper
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ExpanderViews/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ExpanderViews/Index.cshtml
new file mode 100644
index 0000000000..0178074b3f
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ExpanderViews/Index.cshtml
@@ -0,0 +1 @@
+<expander-view>@Html.Partial("_ExpanderPartial")</expander-view>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithFlushBeforeLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithFlushBeforeLayout.cshtml
new file mode 100644
index 0000000000..f7575ef3bc
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithFlushBeforeLayout.cshtml
@@ -0,0 +1,6 @@
+Initial content
+@await FlushAsync()
+
+@{
+    Layout = "/Views/Shared/_LayoutWithFlush.cshtml";
+}
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithLayout.cshtml
new file mode 100644
index 0000000000..a50631d8e5
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithLayout.cshtml
@@ -0,0 +1,12 @@
+@{
+    Layout = "/Views/Shared/_LayoutWithFlush.cshtml";
+    ViewBag.Title = "Page With Layout";
+}
+RenderBody content
+@section content
+{
+    @{
+        await FlushAsync();
+    }
+    <span>Content that takes time to produce</span>
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithNestedLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithNestedLayout.cshtml
new file mode 100644
index 0000000000..c4c740af43
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithNestedLayout.cshtml
@@ -0,0 +1,5 @@
+@{
+    Layout = "/Views/Shared/_NestedLayoutWithFlush.cshtml";
+    ViewBag.Title = "Nested Page With Layout";
+}
+<title>@ViewBag.Title</title>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithPartialsAndViewComponents.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithPartialsAndViewComponents.cshtml
new file mode 100644
index 0000000000..7d31bd9218
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithPartialsAndViewComponents.cshtml
@@ -0,0 +1,16 @@
+@inject TaskReturningService TaskReturningService
+@{
+    Layout = "/Views/Shared/_LayoutWithPartialAndFlush.cshtml";
+    ViewBag.Title = "FlushAsync invoked inside RenderSection";
+}
+RenderBody content
+@section content
+{
+@await TaskReturningService.GetValueAsync()
+<p>section-content</p>
+    @{
+        await FlushAsync();
+    }
+    @await Component.InvokeAsync("ComponentThatSetsTitle")
+    <span>Content that takes time to produce</span>
+}
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithSectionInvokedViaRenderSectionAsync.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithSectionInvokedViaRenderSectionAsync.cshtml
new file mode 100644
index 0000000000..f500cbf493
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithSectionInvokedViaRenderSectionAsync.cshtml
@@ -0,0 +1,16 @@
+@inject TaskReturningService TaskReturningService
+@{
+    Layout = "/Views/Shared/_LayoutWithRenderSectionAsync.cshtml";
+    ViewBag.Title = "FlushAsync invoked inside RenderSectionAsync";
+}
+RenderBody content
+@section content
+{
+@await TaskReturningService.GetValueAsync()
+<p>section-content</p>
+    @{
+        await FlushAsync();
+    }
+    @await Component.InvokeAsync("ComponentThatSetsTitle")
+    <span>Content that takes time to produce</span>
+}
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithoutLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithoutLayout.cshtml
new file mode 100644
index 0000000000..da35bbecaa
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithoutLayout.cshtml
@@ -0,0 +1,13 @@
+Initial content
+@await FlushAsync()
+Secondary content
+@await FlushAsync()
+@{
+    await Html.RenderPartialAsync("_PartialWithFlush");
+}
+@using (Html.BeginForm(method: FormMethod.Post, antiforgery: false, htmlAttributes: null))
+{
+    @Html.TextBox("Name1")
+    @await FlushAsync()
+    @Html.TextBox("Name2")
+}
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/HtmlHelperOptionsDefaultsInPartialView.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/HtmlHelperOptionsDefaultsInPartialView.cshtml
new file mode 100644
index 0000000000..4cfc57f63a
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/HtmlHelperOptionsDefaultsInPartialView.cshtml
@@ -0,0 +1,6 @@
+@model RazorWebSite.Controllers.DateModel
+@Html.ValidationSummary(true, "MySummary")
+@Html.ValidationMessage("Error")
+@Html.TextBox("Prefix.Property1")
+@Html.EditorForModel()
+@Html.ViewContext.ClientValidationEnabled
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/HtmlHelperOptionsDefaultsInView.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/HtmlHelperOptionsDefaultsInView.cshtml
new file mode 100644
index 0000000000..88477de19c
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/HtmlHelperOptionsDefaultsInView.cshtml
@@ -0,0 +1,6 @@
+@model RazorWebSite.Controllers.DateModel
+@Html.ValidationSummary(true, "MySummary")
+@Html.ValidationMessage("Error")
+@Html.TextBox("Prefix.Property1")
+@Html.EditorForModel()
+@await Html.PartialAsync("HtmlHelperOptionsDefaultsInPartialView", Model)
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/OverrideAppWideDefaultsInPartialView.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/OverrideAppWideDefaultsInPartialView.cshtml
new file mode 100644
index 0000000000..a2bc55a023
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/OverrideAppWideDefaultsInPartialView.cshtml
@@ -0,0 +1,10 @@
+@model RazorWebSite.Controllers.DateModel
+@{
+    ViewContext.ValidationMessageElement = "ValidationInPartialView";
+    ViewContext.ValidationSummaryMessageElement = "ValidationSummaryInPartialView";
+}
+@Html.ValidationSummary(true, "MySummary")
+@Html.ValidationMessage("Error")
+@Html.TextBox("Prefix.Property1")
+@Html.EditorForModel()
+@Html.ViewContext.ClientValidationEnabled
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/OverrideAppWideDefaultsInView.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/OverrideAppWideDefaultsInView.cshtml
new file mode 100644
index 0000000000..afc3e885e6
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/OverrideAppWideDefaultsInView.cshtml
@@ -0,0 +1,13 @@
+@model RazorWebSite.Controllers.DateModel
+@{
+    ViewContext.ValidationMessageElement = "ValidationInView";
+    ViewContext.ValidationSummaryMessageElement = "ValidationSummaryInView";
+    ViewContext.Html5DateRenderingMode = Html5DateRenderingMode.CurrentCulture;
+    ViewContext.ClientValidationEnabled = true;
+}
+@Html.ValidationSummary(true, "MySummary")
+@Html.ValidationMessage("Error")
+@Html.TextBox("Prefix.Property1")
+@Html.EditorForModel()
+@Html.ViewContext.ClientValidationEnabled
+@await Html.PartialAsync("OverrideAppWideDefaultsInPartialView")
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/InheritingInherits/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/InheritingInherits/Index.cshtml
new file mode 100644
index 0000000000..faa9205eb6
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/InheritingInherits/Index.cshtml
@@ -0,0 +1,3 @@
+@model Person
+<h1>@Model.Name</h1>
+@await Component.InvokeAsync("InheritingViewComponent", Model.Address)
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/InheritingInherits/_ViewComponent.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/InheritingInherits/_ViewComponent.cshtml
new file mode 100644
index 0000000000..4291f267d0
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/InheritingInherits/_ViewComponent.cshtml
@@ -0,0 +1,2 @@
+@model Address
+<strong>@Model.ZipCode</strong>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/InheritingInherits/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/InheritingInherits/_ViewImports.cshtml
new file mode 100644
index 0000000000..da3ea1b89e
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/InheritingInherits/_ViewImports.cshtml
@@ -0,0 +1 @@
+@inherits MyBasePage<TModel>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewImports/Nested/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewImports/Nested/Index.cshtml
new file mode 100644
index 0000000000..6755e5228f
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewImports/Nested/Index.cshtml
@@ -0,0 +1 @@
+<page>@MyInjectedHelper.Greet(Model)</page>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewImports/Nested/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewImports/Nested/_ViewImports.cshtml
new file mode 100644
index 0000000000..f6e5e61d98
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewImports/Nested/_ViewImports.cshtml
@@ -0,0 +1 @@
+@model Person
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewImports/Nested/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewImports/Nested/_ViewStart.cshtml
new file mode 100644
index 0000000000..71018f3218
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewImports/Nested/_ViewStart.cshtml
@@ -0,0 +1 @@
+<view-start>@MyInjectedHelper.Greet(Model)</view-start>
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewImports/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewImports/_ViewImports.cshtml
new file mode 100644
index 0000000000..b04cf557af
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewImports/_ViewImports.cshtml
@@ -0,0 +1 @@
+@inject InjectedHelper MyInjectedHelper
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/NestedViewStarts/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/NestedViewStarts/Index.cshtml
new file mode 100644
index 0000000000..8d329d16e3
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/NestedViewStarts/Index.cshtml
@@ -0,0 +1 @@
+index-content
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/NestedViewStarts/Layout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/NestedViewStarts/Layout.cshtml
new file mode 100644
index 0000000000..0e70e16819
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/NestedViewStarts/Layout.cshtml
@@ -0,0 +1,2 @@
+<title>@ViewData["title"]</title>
+@RenderBody()
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/NestedViewStarts/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/NestedViewStarts/_ViewStart.cshtml
new file mode 100644
index 0000000000..38bed97bd1
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/NestedViewStarts/_ViewStart.cshtml
@@ -0,0 +1,4 @@
+@{
+    ViewData["Title"] = "viewstart-value";
+}
+@Layout
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/_ViewStart.cshtml
new file mode 100644
index 0000000000..4719f448aa
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "~/Views/NestedViewStarts/NestedViewStarts/Layout.cshtml";
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/PartialMissingSection.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/PartialMissingSection.cshtml
new file mode 100644
index 0000000000..70604444b4
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/PartialMissingSection.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_PartialLayout";
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/PartialWithModel.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/PartialWithModel.cshtml
new file mode 100644
index 0000000000..981fbb5c34
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/PartialWithModel.cshtml
@@ -0,0 +1,3 @@
+@model Person
+@Model.Name
+<partial>@Html.Partial("_Partial", Model.Address)</partial>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewPartialMissingSection.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewPartialMissingSection.cshtml
new file mode 100644
index 0000000000..12619d26bf
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewPartialMissingSection.cshtml
@@ -0,0 +1,4 @@
+@{
+    Layout = null;
+}
+<partial>@Html.Partial("PartialMissingSection")</partial>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithDataFromController.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithDataFromController.cshtml
new file mode 100644
index 0000000000..d188489534
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithDataFromController.cshtml
@@ -0,0 +1 @@
+<h1>@ViewData["data-from-controller"]</h1>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithFullPath.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithFullPath.cshtml
new file mode 100644
index 0000000000..04e929c5ac
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithFullPath.cshtml
@@ -0,0 +1,4 @@
+@{
+    Layout = "/Views/Shared/_Layout.cshtml";
+}
+ViewWithFullPath-content
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithLayout.cshtml
new file mode 100644
index 0000000000..51bdadc67b
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithLayout.cshtml
@@ -0,0 +1,4 @@
+@{
+    Layout = "/Views/Shared/_Layout.cshtml";
+}
+ViewWithLayout-Content
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithNestedLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithNestedLayout.cshtml
new file mode 100644
index 0000000000..a9ae05d86d
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithNestedLayout.cshtml
@@ -0,0 +1,4 @@
+@{
+    Layout = "/Views/ViewEngine/_NestedLayout.cshtml";
+}
+ViewWithNestedLayout-Content
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithoutLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithoutLayout.cshtml
new file mode 100644
index 0000000000..1838444da1
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithoutLayout.cshtml
@@ -0,0 +1 @@
+ViewWithoutLayout-Content
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/LayoutForViewStartWithLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/LayoutForViewStartWithLayout.cshtml
new file mode 100644
index 0000000000..f84acc75ef
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/LayoutForViewStartWithLayout.cshtml
@@ -0,0 +1 @@
+<layout-for-viewstart-with-layout>@RenderBody()</layout-for-viewstart-with-layout>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialThatDoesNotSpecifyLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialThatDoesNotSpecifyLayout.cshtml
new file mode 100644
index 0000000000..7160805707
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialThatDoesNotSpecifyLayout.cshtml
@@ -0,0 +1 @@
+Partial that does not specify Layout
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialThatSpecifiesLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialThatSpecifiesLayout.cshtml
new file mode 100644
index 0000000000..393fcc5be4
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialThatSpecifiesLayout.cshtml
@@ -0,0 +1,4 @@
+@{
+    Layout = "LayoutForViewStartWithLayout";
+}
+Partial that specifies Layout
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialsRenderedViaPartialAsync.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialsRenderedViaPartialAsync.cshtml
new file mode 100644
index 0000000000..a31e73014b
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialsRenderedViaPartialAsync.cshtml
@@ -0,0 +1,2 @@
+@await Html.PartialAsync("PartialThatSpecifiesLayout")
+@await Html.PartialAsync("PartialThatDoesNotSpecifyLayout")
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialsRenderedViaRenderPartial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialsRenderedViaRenderPartial.cshtml
new file mode 100644
index 0000000000..a19efc0fce
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialsRenderedViaRenderPartial.cshtml
@@ -0,0 +1,4 @@
+@{
+    await Html.RenderPartialAsync("PartialThatSpecifiesLayout");
+    await Html.RenderPartialAsync("PartialThatDoesNotSpecifyLayout");
+}
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/_ViewStart.cshtml
new file mode 100644
index 0000000000..4203835c70
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{ 
+    Layout = "LayoutForViewStartWithLayout";
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentForViewWithPaths/Default.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentForViewWithPaths/Default.cshtml
new file mode 100644
index 0000000000..b70a1f94ab
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentForViewWithPaths/Default.cshtml
@@ -0,0 +1,4 @@
+<component>
+@ViewContext.ExecutingFilePath
+@ViewContext.View.Path
+</component>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentThatSetsTitle/Default.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentThatSetsTitle/Default.cshtml
new file mode 100644
index 0000000000..6ed7876b72
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentThatSetsTitle/Default.cshtml
@@ -0,0 +1,4 @@
+@{
+    ViewData["Title"] = "Component title";
+}
+component-content
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithLayout/Default.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithLayout/Default.cshtml
new file mode 100644
index 0000000000..77202448c3
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithLayout/Default.cshtml
@@ -0,0 +1,4 @@
+@{ 
+    Layout = "_ComponentLayout";
+}
+Component With Layout
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithRelativePath.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithRelativePath.cshtml
new file mode 100644
index 0000000000..29c6d4ad34
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithRelativePath.cshtml
@@ -0,0 +1,7 @@
+@model Person
+@{
+    Layout = "../_ComponentLayout.cshtml";
+}
+Component with Relative Path
+@Html.DisplayFor(model => model.Name, templateName: "~/Views/Shared/DisplayTemplates/Name.cshtml")
+@Html.DisplayFor(model => model.Address, templateName: "../../InheritingInherits/_ViewComponent.cshtml")
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithViewStart/Default.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithViewStart/Default.cshtml
new file mode 100644
index 0000000000..e6b8bc36d4
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithViewStart/Default.cshtml
@@ -0,0 +1 @@
+@ViewBag.Title
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithViewStart/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithViewStart/_ViewStart.cshtml
new file mode 100644
index 0000000000..6da7c4c9a9
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithViewStart/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{ 
+    throw new Exception("This should not be invoked as part of executing the View Component.");
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/DisplayTemplates/Name.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/DisplayTemplates/Name.cshtml
new file mode 100644
index 0000000000..388bd1f959
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/DisplayTemplates/Name.cshtml
@@ -0,0 +1,2 @@
+@model string
+<label><strong>Name:</strong> @Html.DisplayTextFor(model => model)</label>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_ComponentLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_ComponentLayout.cshtml
new file mode 100644
index 0000000000..1767ceda30
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_ComponentLayout.cshtml
@@ -0,0 +1,2 @@
+<component-title>@ViewBag.Title</component-title>
+<component-body>@RenderBody()</component-body>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_Layout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_Layout.cshtml
new file mode 100644
index 0000000000..20b44df8d1
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_Layout.cshtml
@@ -0,0 +1,3 @@
+<layout>
+@RenderBody()
+</layout>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithFlush.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithFlush.cshtml
new file mode 100644
index 0000000000..fb0b8e70b5
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithFlush.cshtml
@@ -0,0 +1,4 @@
+<title>@ViewBag.Title</title>
+@await FlushAsync()
+@RenderBody()
+@await RenderSectionAsync("content")
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithPartialAndFlush.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithPartialAndFlush.cshtml
new file mode 100644
index 0000000000..bf9067b633
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithPartialAndFlush.cshtml
@@ -0,0 +1,6 @@
+<title>@ViewBag.Title</title>
+@RenderBody()
+@await FlushAsync()
+@await Html.PartialAsync("_PartialThatSetsTitle")
+@RenderSection("content")
+More content from layout
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithRenderSectionAsync.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithRenderSectionAsync.cshtml
new file mode 100644
index 0000000000..f55ae1216c
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithRenderSectionAsync.cshtml
@@ -0,0 +1,6 @@
+<title>@ViewBag.Title</title>
+@RenderBody()
+@await FlushAsync()
+@await Html.PartialAsync("_PartialThatSetsTitle")
+@await RenderSectionAsync("content")
+More content from layout
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithRenderSectionOnly.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithRenderSectionOnly.cshtml
new file mode 100644
index 0000000000..c3caff06ad
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithRenderSectionOnly.cshtml
@@ -0,0 +1,2 @@
+@RenderBody()
+@await RenderSectionAsync("nestedcontent")
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithTitle.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithTitle.cshtml
new file mode 100644
index 0000000000..aac3b8a1ee
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithTitle.cshtml
@@ -0,0 +1,2 @@
+<title>@ViewBag.Title</title>
+@RenderBody()
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_NestedLayoutWithFlush.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_NestedLayoutWithFlush.cshtml
new file mode 100644
index 0000000000..0ff6bc49b1
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_NestedLayoutWithFlush.cshtml
@@ -0,0 +1,14 @@
+@{
+    Layout = "/Views/Shared/_LayoutWithRenderSectionOnly.cshtml";
+    ViewBag.Title = "Page With Layout";
+}
+Inside Nested Layout
+@RenderBody()
+@section nestedcontent
+{
+    @{
+        await FlushAsync();
+    }
+    <span>Nested content that takes time to produce</span>
+}
+
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_Partial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_Partial.cshtml
new file mode 100644
index 0000000000..755e2958b0
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_Partial.cshtml
@@ -0,0 +1,2 @@
+@model Address
+@ViewData.Model.ZipCode
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_PartialLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_PartialLayout.cshtml
new file mode 100644
index 0000000000..89eeeec8cc
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_PartialLayout.cshtml
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+</head>
+<body>
+    <div>
+        @RenderBody()
+    </div>
+    @{
+        try
+        {
+            RenderSection("section");
+        }
+        catch (InvalidOperationException ex)
+        {
+            <p>@ex.Message</p>
+        }
+    }
+</body>
+</html>
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_PartialThatSetsTitle.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_PartialThatSetsTitle.cshtml
new file mode 100644
index 0000000000..37f557a736
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_PartialThatSetsTitle.cshtml
@@ -0,0 +1,4 @@
+@{
+    ViewBag.Title = "Partial title";
+}
+partial-content
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_PartialWithFlush.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_PartialWithFlush.cshtml
new file mode 100644
index 0000000000..4320ef921b
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_PartialWithFlush.cshtml
@@ -0,0 +1,3 @@
+Inside partial
+@await FlushAsync()
+After flush inside partial
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_PartialWithModelFromEnumerable.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_PartialWithModelFromEnumerable.cshtml
new file mode 100644
index 0000000000..8a4d1ce706
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_PartialWithModelFromEnumerable.cshtml
@@ -0,0 +1,2 @@
+@model Person
+@Html.DisplayFor(m => m.Name)
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/TagHelperComponent/Body.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/TagHelperComponent/Body.cshtml
new file mode 100644
index 0000000000..388b94a71d
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/TagHelperComponent/Body.cshtml
@@ -0,0 +1,4 @@
+<body inject="true">
+Hello from Body Tag Helper Component
+<p>@ViewData["TestData"]</p>
+</body>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/TagHelperComponent/Head.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/TagHelperComponent/Head.cshtml
new file mode 100644
index 0000000000..180899778e
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/TagHelperComponent/Head.cshtml
@@ -0,0 +1,3 @@
+<head inject="true">
+Hello from Head Tag Helper Component
+</head>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/Index.cshtml
new file mode 100644
index 0000000000..14d0b76305
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/Index.cshtml
@@ -0,0 +1,2 @@
+expander-index
+@await Html.PartialAsync("_Partial")
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/ViewWithLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/ViewWithLayout.cshtml
new file mode 100644
index 0000000000..3a876212bd
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/ViewWithLayout.cshtml
@@ -0,0 +1,4 @@
+@{
+    Layout = "_LanguageLayout";
+}
+View With Layout
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/_LanguageLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/_LanguageLayout.cshtml
new file mode 100644
index 0000000000..4ef43dfb2d
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/_LanguageLayout.cshtml
@@ -0,0 +1 @@
+<language-layout>@RenderBody()</language-layout>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/_Partial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/_Partial.cshtml
new file mode 100644
index 0000000000..b32b760c40
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/_Partial.cshtml
@@ -0,0 +1 @@
+expander-partial
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/en-GB/_Partial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/en-GB/_Partial.cshtml
new file mode 100644
index 0000000000..caa9c528f3
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/en-GB/_Partial.cshtml
@@ -0,0 +1 @@
+gb-partial
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/fr/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/fr/Index.cshtml
new file mode 100644
index 0000000000..f05e6dc28d
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/fr/Index.cshtml
@@ -0,0 +1,2 @@
+fr-index
+@await Html.PartialAsync("_Partial")
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/fr/_LanguageLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/fr/_LanguageLayout.cshtml
new file mode 100644
index 0000000000..9341e9bdfc
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/fr/_LanguageLayout.cshtml
@@ -0,0 +1 @@
+<fr-language-layout>@RenderBody()</fr-language-layout>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/fr/_Partial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/fr/_Partial.cshtml
new file mode 100644
index 0000000000..ceaf0a8514
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/fr/_Partial.cshtml
@@ -0,0 +1 @@
+fr-partial
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/UrlResolution/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/UrlResolution/Index.cshtml
new file mode 100644
index 0000000000..2e9b6d9773
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/UrlResolution/Index.cshtml
@@ -0,0 +1,46 @@
+@model Person
+
+@{
+    var dynamicUrl = "~/SomeUrl";
+}
+
+@functions {
+    public Task DoSomething()
+    {
+        return Task.FromResult(true);
+    }
+}
+
+<html manifest="~/Person">
+<head>
+    <base href="~/A+Really(Crazy),Url.Is:This/@Model.Name/Detail" target="_blank">
+</head>
+<body>
+    <dl itemscope itemid="~/Url"></dl>
+    <a href="~/Person">Person</a>
+    <area href="~/Person/@Model.Name" alt="Url stuff" >
+    <link href="~/Person/@Model.Name/CSS" rel="stylesheet">
+    <video poster=@dynamicUrl src='@dynamicUrl/@("video")' />
+    <audio src="@(dynamicUrl)">
+        <source src="~/Person" srcset="~/Person">
+        <track src="~/email@(dynamicUrl)">
+    </audio>
+    <embed src="~/email@dyanmicUrl">
+    <iframe src=@(dynamicUrl) />
+    <img src="~/@Model.Name" srcset="~/@Model.Name">
+    <script src="~/Person/@Model.Name/JS"></script>
+    <input src="~//Person" itemscope itemid="~/Person" formaction=@dynamicUrl>
+    <button formaction="~/\Person" />
+    <form action="~/~Person" />
+    <blockquote cite="~/Person" />
+    <del cite="~/Person" />
+    <ins cite="~/Person" />
+    <q cite="~/Person" />
+    <menu>
+        <menuitem icon=~/Person />
+    </menu>
+    <object data="~/Person" archive="~/Person/@Model.Name" data="~/Person" archive="~/Person/@Model.Name" />
+    <object archive="@if(Model.Name != null) { <text>~/Person/@Model.Name</text> } else { await DoSomething(); <text>~/Person</text>  } " />
+    <applet archive="~/A+Really(Crazy),Url.Is:This/@Model.Name/Detail" />
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/SearchInPages.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/SearchInPages.cshtml
new file mode 100644
index 0000000000..3c2c59e986
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/SearchInPages.cshtml
@@ -0,0 +1 @@
+@Html.Partial("_SharedFromPages")
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithComponentThatHasLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithComponentThatHasLayout.cshtml
new file mode 100644
index 0000000000..2008e37128
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithComponentThatHasLayout.cshtml
@@ -0,0 +1,5 @@
+@{ 
+    Layout = "_LayoutWithTitle";
+}
+Page Content
+@await Component.InvokeAsync("ComponentWithLayout")
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithComponentThatHasViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithComponentThatHasViewStart.cshtml
new file mode 100644
index 0000000000..c0e538e707
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithComponentThatHasViewStart.cshtml
@@ -0,0 +1 @@
+<page-content>@await Component.InvokeAsync("ComponentWithViewStart")</page-content>
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithDataFromController.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithDataFromController.cshtml
new file mode 100644
index 0000000000..d188489534
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithDataFromController.cshtml
@@ -0,0 +1 @@
+<h1>@ViewData["data-from-controller"]</h1>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithFullPath.rzr b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithFullPath.rzr
new file mode 100644
index 0000000000..559ffb173f
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithFullPath.rzr
@@ -0,0 +1,4 @@
+@{
+    Layout = "~/Views/Shared/_Layout.cshtml";
+}
+ViewWithFullPath-content
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithLayout.cshtml
new file mode 100644
index 0000000000..51bdadc67b
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithLayout.cshtml
@@ -0,0 +1,4 @@
+@{
+    Layout = "/Views/Shared/_Layout.cshtml";
+}
+ViewWithLayout-Content
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithNestedLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithNestedLayout.cshtml
new file mode 100644
index 0000000000..a9ae05d86d
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithNestedLayout.cshtml
@@ -0,0 +1,4 @@
+@{
+    Layout = "/Views/ViewEngine/_NestedLayout.cshtml";
+}
+ViewWithNestedLayout-Content
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithPartial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithPartial.cshtml
new file mode 100644
index 0000000000..e861b5f74d
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithPartial.cshtml
@@ -0,0 +1,7 @@
+@using RazorWebSite
+@model Person
+<partial>@await Html.PartialAsync("_Partial", Model.Address)
+</partial>
+<partial2>@await Html.PartialAsync("~/Views/Shared/_Partial.cshtml", Model.Address)
+</partial2>
+@ViewBag.TestKey
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithPartialTakingModelFromIEnumerable.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithPartialTakingModelFromIEnumerable.cshtml
new file mode 100644
index 0000000000..952bf0fc0a
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithPartialTakingModelFromIEnumerable.cshtml
@@ -0,0 +1,4 @@
+@using RazorWebSite
+@model IEnumerable<Person>
+@foreach (var item in Model)
+{@await Html.PartialAsync("_PartialWithModelFromEnumerable", item)}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithRelativePath.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithRelativePath.cshtml
new file mode 100644
index 0000000000..f138e7d744
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithRelativePath.cshtml
@@ -0,0 +1,15 @@
+@{
+    Layout = "_NestedLayout.cshtml";
+    ViewData["Title"] = "View with relative path title";
+    var person = new Person
+    {
+        Address = new Address
+        {
+            ZipCode = "98052",
+        },
+        Name = "Fred",
+    };
+}
+ViewWithRelativePath-content
+<partial>@await Html.PartialAsync("../Shared/_PartialThatSetsTitle.cshtml")</partial>
+@await Component.InvokeAsync("ComponentWithRelativePath", person)
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithTitle.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithTitle.cshtml
new file mode 100644
index 0000000000..d90e24a409
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithTitle.cshtml
@@ -0,0 +1,7 @@
+@{
+    ViewData["Title"] = "Page title";
+    // The invoked partial sets a title, but this shouldn't override the current page's ViewData \ ViewBag.
+    await Html.RenderPartialAsync("_PartialThatSetsTitle");
+    @await Component.InvokeAsync("ComponentThatSetsTitle")
+    Layout = "/Views/Shared/_LayoutWithTitle.cshtml";
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithoutLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithoutLayout.cshtml
new file mode 100644
index 0000000000..1838444da1
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithoutLayout.cshtml
@@ -0,0 +1 @@
+ViewWithoutLayout-Content
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/_NestedLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/_NestedLayout.cshtml
new file mode 100644
index 0000000000..2690bf2aad
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/_NestedLayout.cshtml
@@ -0,0 +1,7 @@
+@{
+    Layout = "/Views/Shared/_Layout.cshtml";
+}
+<nested-layout>
+@Url.Action()
+@RenderBody()
+</nested-layout>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/LayoutSpecifiedWithPartialPathInPage.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/LayoutSpecifiedWithPartialPathInPage.cshtml
new file mode 100644
index 0000000000..6b5dc686ea
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/LayoutSpecifiedWithPartialPathInPage.cshtml
@@ -0,0 +1,4 @@
+@{ 
+    Layout = "_NonSharedLayout";
+}
+Layout specified in page
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/LayoutSpecifiedWithPartialPathInViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/LayoutSpecifiedWithPartialPathInViewStart.cshtml
new file mode 100644
index 0000000000..f9fb7e6236
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/LayoutSpecifiedWithPartialPathInViewStart.cshtml
@@ -0,0 +1 @@
+_ViewStart that specifies partial Layout
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/NonSharedPartial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/NonSharedPartial.cshtml
new file mode 100644
index 0000000000..d7db120db3
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/NonSharedPartial.cshtml
@@ -0,0 +1 @@
+Non Shared Partial
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/PageWithNonPartialLayoutPath.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/PageWithNonPartialLayoutPath.cshtml
new file mode 100644
index 0000000000..1de0d2308c
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/PageWithNonPartialLayoutPath.cshtml
@@ -0,0 +1,4 @@
+@{ 
+    Layout = (string)ViewData["Layout"];
+}
+Page With Non Partial Layout
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/ViewWithPartials.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/ViewWithPartials.cshtml
new file mode 100644
index 0000000000..b4396d7849
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/ViewWithPartials.cshtml
@@ -0,0 +1,4 @@
+@{
+    var partial = (string)ViewData["Partial"];
+}
+@Html.Partial(partial)
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/_NonSharedLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/_NonSharedLayout.cshtml
new file mode 100644
index 0000000000..7f2a2ecc74
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/_NonSharedLayout.cshtml
@@ -0,0 +1 @@
+<non-shared>@RenderBody()</non-shared>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/_ViewStart.cshtml
new file mode 100644
index 0000000000..77b65af1c3
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{ 
+    Layout = "_Layout";
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/Index.cshtml
new file mode 100644
index 0000000000..46f7e96b35
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/Index.cshtml
@@ -0,0 +1,6 @@
+<Index>
+    @ViewContext.ExecutingFilePath
+    @ViewContext.View.Path
+    @await Component.InvokeAsync("ComponentForViewWithPaths")
+    @Html.Partial("_Partial")
+</Index>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/_Layout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/_Layout.cshtml
new file mode 100644
index 0000000000..f79f56199a
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/_Layout.cshtml
@@ -0,0 +1,5 @@
+<Layout>
+    @ViewContext.ExecutingFilePath
+    @ViewContext.View.Path
+</Layout>
+@RenderBody()
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/_Partial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/_Partial.cshtml
new file mode 100644
index 0000000000..c182e1f86a
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/_Partial.cshtml
@@ -0,0 +1,4 @@
+<Partial>
+@ViewContext.ExecutingFilePath
+@ViewContext.View.Path
+</Partial>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/_ViewStart.cshtml
new file mode 100644
index 0000000000..a567df84dd
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/_ViewStart.cshtml
@@ -0,0 +1,7 @@
+@{ 
+    Layout = "_Layout";
+}
+<ViewStart>
+    @ViewContext.ExecutingFilePath
+    @ViewContext.View.Path
+</ViewStart>
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/Index.cshtml
new file mode 100644
index 0000000000..71684f7ea6
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/Index.cshtml
@@ -0,0 +1,3 @@
+@inject FrameworkSpecificHelper MyHelper
+@MyHelper.ExecuteOperation()
+@Html.Partial("_Partial")
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml
new file mode 100644
index 0000000000..3be0f94e1d
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml
@@ -0,0 +1,8 @@
+@inject FrameworkSpecificHelper MyHelper
+@{
+    string value =
+#if NETCOREAPP2_0_CUSTOM_DEFINE || NETCOREAPP2_1_CUSTOM_DEFINE
+    MyHelper.ExecuteNetCoreApp2_0Operation();
+#endif
+}
+@value
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..44ab541732
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/_ViewImports.cshtml
@@ -0,0 +1 @@
+@using RazorWebSite
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/readme.md b/src/Mvc/test/WebSites/RazorWebSite/readme.md
new file mode 100644
index 0000000000..b0be4b3aef
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorWebSite/readme.md
@@ -0,0 +1,4 @@
+RazorWebSite
+===
+
+This web site illustrates use cases for razor view engine, partials and view components.
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/Areas/Admin/UserManagementController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Areas/Admin/UserManagementController.cs
new file mode 100644
index 0000000000..fe204e7896
--- /dev/null
+++ b/src/Mvc/test/WebSites/RoutingWebSite/Areas/Admin/UserManagementController.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RoutingWebSite.Admin
+{
+    [Area("Admin")]
+    [Route("[area]/Users")]
+    public class UserManagementController : Controller
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public UserManagementController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        [HttpGet("All")]
+        public IActionResult ListUsers()
+        {
+            return _generator.Generate("Admin/Users/All");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/Areas/Order/OrderController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Areas/Order/OrderController.cs
new file mode 100644
index 0000000000..fe7582db29
--- /dev/null
+++ b/src/Mvc/test/WebSites/RoutingWebSite/Areas/Order/OrderController.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RoutingWebSite.Areas.Order
+{
+    [Area("Order")]
+    [Route("Order/[action]", Name = "[area]_[action]")]
+    public class OrderController : Controller
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public OrderController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        [HttpGet]
+        public IActionResult GetOrder()
+        {
+            return _generator.Generate("/Order/GetOrder");
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/Areas/Travel/FlightController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Areas/Travel/FlightController.cs
new file mode 100644
index 0000000000..5fe4b9d793
--- /dev/null
+++ b/src/Mvc/test/WebSites/RoutingWebSite/Areas/Travel/FlightController.cs
@@ -0,0 +1,30 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RoutingWebSite
+{
+    // This controller is reachable via traditional routing.
+    [Area("Travel")]
+    public class FlightController
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public FlightController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        public IActionResult Index()
+        {
+            return _generator.Generate("/Travel/Flight", "/Travel/Flight/Index");
+        }
+
+        [HttpPost]
+        public IActionResult BuyTickets()
+        {
+            return _generator.Generate("/Travel/Flight/BuyTickets");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/Areas/Travel/HomeController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Areas/Travel/HomeController.cs
new file mode 100644
index 0000000000..eceed74837
--- /dev/null
+++ b/src/Mvc/test/WebSites/RoutingWebSite/Areas/Travel/HomeController.cs
@@ -0,0 +1,29 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RoutingWebSite.Travel
+{
+    [Area("Travel")]
+    public class HomeController : Controller
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public HomeController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        public IActionResult Index()
+        {
+            return _generator.Generate("/Travel", "/Travel/Home", "/Travel/Home/Index");
+        }
+
+        [HttpGet("ContosoCorp/AboutTravel")]
+        public IActionResult About()
+        {
+            return _generator.Generate();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/Areas/Travel/RailController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Areas/Travel/RailController.cs
new file mode 100644
index 0000000000..89cdfc756f
--- /dev/null
+++ b/src/Mvc/test/WebSites/RoutingWebSite/Areas/Travel/RailController.cs
@@ -0,0 +1,30 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RoutingWebSite
+{
+    [Area("Travel")]
+    [Route("ContosoCorp/Trains")]
+    public class RailController
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public RailController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        public IActionResult Index()
+        {
+            return _generator.Generate("/ContosoCorp/Trains");
+        }
+
+        [HttpGet("CheckSchedule")]
+        public IActionResult Schedule()
+        {
+            return _generator.Generate("/ContosoCorp/Trains/Schedule");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/Controllers/BanksController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/BanksController.cs
new file mode 100644
index 0000000000..a396586330
--- /dev/null
+++ b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/BanksController.cs
@@ -0,0 +1,52 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RoutingWebSite
+{
+    public class BanksController : Controller
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public BanksController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        [HttpGet("Banks/[action]/{id}")]
+        [HttpGet("Bank/[action]/{id}")]
+        public ActionResult Get(int id)
+        {
+            return _generator.Generate(
+                Url.Action(),
+                Url.RouteUrl(new { }));
+        }
+
+        [AcceptVerbs("PUT", Route = "Bank")]
+        [HttpPatch("Bank")]
+        [AcceptVerbs("PUT", Route = "Bank/Update")]
+        [HttpPatch("Bank/Update")]
+        public ActionResult UpdateBank()
+        {
+            return _generator.Generate(
+                Url.Action(),
+                Url.RouteUrl(new { }));
+        }
+
+        [AcceptVerbs("PUT", "POST")]
+        [Route("Bank/Deposit")]
+        [Route("Bank/Deposit/{amount}")]
+        public ActionResult Deposit()
+        {
+            return _generator.Generate("/Bank/Deposit", "/Bank/Deposit/5");
+        }
+
+        [HttpPost]
+        [Route("Bank/Withdraw/{id}")]
+        public ActionResult Withdraw(int id)
+        {
+            return _generator.Generate("/Bank/Withdraw/5");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/Controllers/BlogController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/BlogController.cs
new file mode 100644
index 0000000000..82e90c695c
--- /dev/null
+++ b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/BlogController.cs
@@ -0,0 +1,29 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RoutingWebSite
+{
+    // This controller contains actions mapped with a single controller-level route.
+    [Route("Blog/[action]/{postId?}")]
+    public class BlogController
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public BlogController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        public IActionResult ShowPosts()
+        {
+            return _generator.Generate("/Blog/ShowPosts");
+        }
+
+        public IActionResult Edit(int postId)
+        {
+            return _generator.Generate("/Blog/Edit/" + postId);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/Controllers/CompanyController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/CompanyController.cs
new file mode 100644
index 0000000000..bbb27e242f
--- /dev/null
+++ b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/CompanyController.cs
@@ -0,0 +1,63 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RoutingWebSite
+{
+    // A controller can define a route for all of the actions
+    // in it and give it a name for link generation purposes.
+    [Route("api/Company/{id}", Name = "Company")]
+    public class CompanyController : Controller
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public CompanyController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        // An action with the same template will inherit the name
+        // from the controller.
+        [HttpGet]
+        public ActionResult Get(int id)
+        {
+            return _generator.Generate(Url.RouteUrl("Company", new { id = id }));
+        }
+
+        // Multiple actions can have the same named route as long
+        // as for a given Name, all the actions have the same template.
+        // That is, there can't be two link generation entries with same
+        // name and different templates.
+        [HttpPut]
+        public ActionResult Put(int id)
+        {
+            return _generator.Generate(Url.RouteUrl("Company", new { id = id }));
+        }
+
+        // Two actions can have the same template and each of them can have
+        // a different route name. That is, a given template can have multiple
+        // names associated with it.
+        [HttpDelete(Name = "RemoveCompany")]
+        public ActionResult Delete(int id)
+        {
+            return _generator.Generate(Url.RouteUrl("RemoveCompany", new { id = id }));
+        }
+
+        // An action that defines a non empty template doesn't inherit the name
+        // from the route on the controller .
+        [HttpGet("Employees")]
+        public ActionResult GetEmployees(int id)
+        {
+            return _generator.Generate(Url.RouteUrl(new { id = id }));
+        }
+
+        // An action that defines a non empty template doesn't inherit the name
+        // from the controller but can perfectly define its own name.
+        [HttpGet("Departments", Name = "Departments")]
+        public ActionResult GetDepartments(int id)
+        {
+            return _generator.Generate(Url.RouteUrl("Departments", new { id = id }));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/Controllers/EmployeeController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/EmployeeController.cs
new file mode 100644
index 0000000000..bf36643a68
--- /dev/null
+++ b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/EmployeeController.cs
@@ -0,0 +1,73 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RoutingWebSite
+{
+    // This controller combines routes on the controller with routes on actions in a REST + navigation property
+    // style.
+    [Route("api/Employee")]
+    public class EmployeeController : Controller
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public EmployeeController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        public IActionResult List()
+        {
+            return _generator.Generate("/api/Employee");
+        }
+
+        [AcceptVerbs("PUT", "PATCH")]
+        public IActionResult UpdateEmployee()
+        {
+            return _generator.Generate("/api/Employee");
+        }
+
+        [AcceptVerbs("PUT", "PATCH", Route = "Manager")]
+        public IActionResult UpdateManager()
+        {
+            return _generator.Generate("/api/Employee/Manager");
+        }
+
+        [HttpMerge("{id}")]
+        public IActionResult MergeEmployee(int id)
+        {
+            return _generator.Generate("/api/Employee/" + id);
+        }
+
+        [HttpGet("{id}")]
+        public IActionResult Get(int id)
+        {
+            return _generator.Generate("/api/Employee/" + id);
+        }
+
+        [HttpGet("{id}/Administrator")]
+        public IActionResult GetAdministrator(int id)
+        {
+            return _generator.Generate("/api/Employee/" + id + "/Administrator");
+        }
+
+        [HttpGet("~/Manager/{id}")]
+        public IActionResult GetManager(int id)
+        {
+            return _generator.Generate("/Manager/" + id);
+        }
+
+        [HttpDelete("{id}/Administrator")]
+        public IActionResult DeleteAdministrator(int id)
+        {
+            return _generator.Generate("/api/Employee/" + id + "/Administrator");
+        }
+
+        [Route("{id}/Salary")]
+        public IActionResult Salary(int id)
+        {
+            return _generator.Generate("/api/Employee/" + id + "/Salary");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/Controllers/FriendsController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/FriendsController.cs
new file mode 100644
index 0000000000..b6f3779e2d
--- /dev/null
+++ b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/FriendsController.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RoutingWebSite
+{
+    [Route("Friends")]
+    public class FriendsController : Controller
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public FriendsController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        [HttpGet]
+        [HttpGet("{id}")]
+        public IActionResult Get([FromRoute]string id)
+        {
+            return _generator.Generate(id == null ? "/Friends" : $"/Friends/{id}");
+        }
+
+        [HttpDelete]
+        public IActionResult Delete()
+        {
+            return _generator.Generate("/Friends");
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/Controllers/HomeController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/HomeController.cs
new file mode 100644
index 0000000000..1adc73f990
--- /dev/null
+++ b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/HomeController.cs
@@ -0,0 +1,39 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RoutingWebSite
+{
+    // This controller is reachable via traditional routing.
+    public class HomeController : Controller
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public HomeController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        public IActionResult Index()
+        {
+            return _generator.Generate("/", "/Home", "/Home/Index");
+        }
+
+        public IActionResult About()
+        {
+            // There are no urls that reach this action - it's hidden by an attribute route.
+            return _generator.Generate();
+        }
+
+        public IActionResult Contact()
+        {
+            return _generator.Generate("/Home/Contact");
+        }
+
+        public IActionResult OptionalPath(string path = "default")
+        {
+            return _generator.Generate("/Home/OptionalPath/" + path);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/Controllers/MapsController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/MapsController.cs
new file mode 100644
index 0000000000..ce1aa800aa
--- /dev/null
+++ b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/MapsController.cs
@@ -0,0 +1,53 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RoutingWebSite
+{
+    [Route("api/v1/Maps", Name = "v1", Order = 1)]
+    [Route("api/v2/Maps")]
+    public class MapsController : Controller
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public MapsController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        [HttpGet]
+        public ActionResult Get()
+        {
+            // Multiple attribute routes with name and order.
+            // We will always generate v2 routes except when
+            // we explicitly use "v1" to generate a v1 route.
+            return _generator.Generate(
+                Url.Action(),
+                Url.RouteUrl("v1"),
+                Url.RouteUrl(new { }));
+        }
+
+        [HttpPost("/api/v2/Maps")]
+        public ActionResult Post()
+        {
+            return _generator.Generate(
+                Url.Action(),
+                Url.RouteUrl(new { }));
+        }
+
+        [HttpPut("{id}")]
+        [HttpPatch("PartialUpdate/{id}")]
+        public ActionResult Update(int id)
+        {
+            // We will generate "/api/v2/Maps/PartialUpdate/{id}"
+            // in both cases, v1 routes will be discarded due to their
+            // Order and for v2 routes PartialUpdate has higher precedence.
+            // api/v1/Maps/{id} and api/v2/Maps/{id} will only match on PUT.
+            // api/v1/Maps/PartialUpdate/{id} and api/v2/Maps/PartialUpdate/{id} will only match on PATCH.
+            return _generator.Generate(
+                Url.Action(),
+                Url.RouteUrl(new { }));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/Controllers/OrderController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/OrderController.cs
new file mode 100644
index 0000000000..6f3f49ef2c
--- /dev/null
+++ b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/OrderController.cs
@@ -0,0 +1,36 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RoutingWebSite.Controllers
+{
+    [Route("Order/[action]/{orderId?}", Name = "Order_[action]")]
+    public class OrderController : Controller
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public OrderController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        [HttpGet]
+        public IActionResult Add(int orderId)
+        {
+            return _generator.Generate("/Order/Add/1");
+        }
+
+        [HttpPost]
+        public IActionResult Add()
+        {
+            return _generator.Generate("/Order/Add");
+        }
+
+        [HttpPut]
+        public IActionResult Edit(int orderId)
+        {
+            return _generator.Generate("/Order/Edit/1");
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/Controllers/StoreController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/StoreController.cs
new file mode 100644
index 0000000000..d7ad0dc7e1
--- /dev/null
+++ b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/StoreController.cs
@@ -0,0 +1,43 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RoutingWebSite
+{
+    // This controller contains only actions with individual attribute routes.
+    public class StoreController : Controller
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public StoreController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        [HttpGet("Store/Shop/Products")]
+        public IActionResult ListProducts()
+        {
+            return _generator.Generate("/Store/Shop/Products");
+        }
+
+        // Intentionally designed to conflict with HomeController#About.
+        [HttpGet("Home/About")]
+        public IActionResult About()
+        {
+            return _generator.Generate("/Home/About");
+        }
+
+        [Route("Store/Shop/Orders")]
+        public IActionResult Orders()
+        {
+            return _generator.Generate("/Store/Shop/Orders");
+        }
+
+        [HttpGet("Store/Shop/Orders")]
+        public IActionResult GetOrders()
+        {
+            return _generator.Generate("/Store/Shop/Orders");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/Controllers/TeamController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/TeamController.cs
new file mode 100644
index 0000000000..71ab959a19
--- /dev/null
+++ b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/TeamController.cs
@@ -0,0 +1,72 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace RoutingWebSite
+{
+    [Route("/Teams", Order = 1)]
+    public class TeamController : Controller
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public TeamController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        [HttpGet("/Team/{teamId}", Order = 2)]
+        public ActionResult GetTeam(int teamId)
+        {
+            return _generator.Generate("/Team/" + teamId);
+        }
+
+        [HttpGet("/Team/{teamId}")]
+        public ActionResult GetOrganization(int teamId)
+        {
+            return _generator.Generate("/Team/" + teamId);
+        }
+
+        [HttpGet("")]
+        public ActionResult GetTeams()
+        {
+            return _generator.Generate("/Teams");
+        }
+
+        [HttpGet("", Order = 0)]
+        public ActionResult GetOrganizations()
+        {
+            return _generator.Generate("/Teams");
+        }
+
+        [HttpGet("/Club/{clubId?}")]
+        public ActionResult GetClub()
+        {
+            return Content(Url.Action(), "text/plain");
+        }
+
+        [HttpGet("/Organization/{clubId?}", Order = 1)]
+        public ActionResult GetClub(int clubId)
+        {
+            return Content(Url.Action(), "text/plain");
+        }
+
+        [HttpGet("AllTeams")]
+        public ActionResult GetAllTeams()
+        {
+            return Content(Url.Action(), "text/plain");
+        }
+
+        [HttpGet("AllOrganizations", Order = 0)]
+        public ActionResult GetAllTeams(int notRelevant)
+        {
+            return Content(Url.Action(), "text/plain");
+        }
+
+        [HttpGet("/TeamName/{*Name=DefaultName}/")]
+        public ActionResult GetTeam(string name)
+        {
+            return _generator.Generate("/TeamName/" + name);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/HttpMergeAttribute.cs b/src/Mvc/test/WebSites/RoutingWebSite/HttpMergeAttribute.cs
new file mode 100644
index 0000000000..013a90d2bf
--- /dev/null
+++ b/src/Mvc/test/WebSites/RoutingWebSite/HttpMergeAttribute.cs
@@ -0,0 +1,34 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace RoutingWebSite
+{
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public class HttpMergeAttribute : Attribute, IActionHttpMethodProvider, IRouteTemplateProvider
+    {
+        private static readonly IEnumerable<string> _supportedMethods = new[] { "MERGE" };
+
+        public HttpMergeAttribute(string template)
+        {
+            Template = template;
+        }
+
+        public IEnumerable<string> HttpMethods
+        {
+            get { return _supportedMethods; }
+        }
+
+        /// <inheritdoc />
+        public string Template { get; private set; }
+
+        /// <inheritdoc />
+        public int? Order { get; set; }
+
+        /// <inheritdoc />
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj b/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj
new file mode 100644
index 0000000000..cfda2f9c35
--- /dev/null
+++ b/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/Startup.cs b/src/Mvc/test/WebSites/RoutingWebSite/Startup.cs
new file mode 100644
index 0000000000..2a9f4482dd
--- /dev/null
+++ b/src/Mvc/test/WebSites/RoutingWebSite/Startup.cs
@@ -0,0 +1,62 @@
+// 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.
+
+using System.IO;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace RoutingWebSite
+{
+    public class Startup
+    {
+        // Set up application services
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddMvc();
+
+            services.AddScoped<TestResponseGenerator>();
+            services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseMvc(routes =>
+            {
+                routes.MapAreaRoute(
+                   "flightRoute",
+                   "adminRoute",
+                   "{area:exists}/{controller}/{action}",
+                   new { controller = "Home", action = "Index" },
+                   new { area = "Travel" }
+               );
+
+                routes.MapRoute(
+                    "ActionAsMethod",
+                    "{controller}/{action}",
+                    defaults: new { controller = "Home", action = "Index" });
+
+                routes.MapRoute(
+                    "RouteWithOptionalSegment",
+                    "{controller}/{action}/{path?}");
+            });
+        }
+
+        public static void Main(string[] args)
+        {
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
+            host.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            new WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseStartup<Startup>()
+                .UseKestrel()
+                .UseIISIntegration();
+    }
+}
+
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/TestResponseGenerator.cs b/src/Mvc/test/WebSites/RoutingWebSite/TestResponseGenerator.cs
new file mode 100644
index 0000000000..9b85f04456
--- /dev/null
+++ b/src/Mvc/test/WebSites/RoutingWebSite/TestResponseGenerator.cs
@@ -0,0 +1,61 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace RoutingWebSite
+{
+    // Generates a response based on the expected URL and action context
+    public class TestResponseGenerator
+    {
+        private readonly ActionContext _actionContext;
+        private readonly IUrlHelperFactory _urlHelperFactory;
+
+        public TestResponseGenerator(IActionContextAccessor contextAccessor, IUrlHelperFactory urlHelperFactory)
+        {
+            _urlHelperFactory = urlHelperFactory;
+
+            _actionContext = contextAccessor.ActionContext;
+            if (_actionContext == null)
+            {
+                throw new InvalidOperationException("ActionContext should not be null here.");
+            }
+        }
+
+        public JsonResult Generate(params string[] expectedUrls)
+        {
+            var link = (string)null;
+            var query = _actionContext.HttpContext.Request.Query;
+            if (query.ContainsKey("link"))
+            {
+                var values = query
+                    .Where(kvp => kvp.Key != "link" && kvp.Key != "link_action" && kvp.Key != "link_controller")
+                    .ToDictionary(kvp => kvp.Key.Substring("link_".Length), kvp => (object)kvp.Value[0]);
+
+                var urlHelper = _urlHelperFactory.GetUrlHelper(_actionContext);
+                link = urlHelper.Action(query["link_action"], query["link_controller"], values);
+            }
+
+            var attributeRoutingInfo = _actionContext.ActionDescriptor.AttributeRouteInfo;
+
+            return new JsonResult(new
+            {
+                expectedUrls = expectedUrls,
+                actualUrl = _actionContext.HttpContext.Request.Path.Value,
+                routeName = attributeRoutingInfo == null ? null : attributeRoutingInfo.Name,
+                routeValues = new Dictionary<string, object>(_actionContext.RouteData.Values),
+
+                action = ((ControllerActionDescriptor) _actionContext.ActionDescriptor).ActionName,
+                controller = ((ControllerActionDescriptor)_actionContext.ActionDescriptor).ControllerName,
+
+                link,
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/readme.md b/src/Mvc/test/WebSites/RoutingWebSite/readme.md
new file mode 100644
index 0000000000..fb0e013e2a
--- /dev/null
+++ b/src/Mvc/test/WebSites/RoutingWebSite/readme.md
@@ -0,0 +1,4 @@
+RoutingWebSite
+===
+
+This web site illustrates how to use conventional and attribute routes.
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/Controllers/AdministrationController.cs b/src/Mvc/test/WebSites/SecurityWebSite/Controllers/AdministrationController.cs
new file mode 100644
index 0000000000..fdd125284a
--- /dev/null
+++ b/src/Mvc/test/WebSites/SecurityWebSite/Controllers/AdministrationController.cs
@@ -0,0 +1,46 @@
+// 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.
+
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization.Policy;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace SecurityWebSite.Controllers
+{
+    // This controller is secured through the globally added authorize filter which
+    // allows only authenticated users.
+    public class AdministrationController : Controller
+    {
+        public IActionResult Index()
+        {
+            return Content("Administration.Index");
+        }
+
+        // Either cookie should allow access to this action (if AllowCombiningAuthorizeFilters is true)
+        // If AllowCombiningAuthorizeFilters is false, the main cookie is required.
+        [Authorize(AuthenticationSchemes = "Cookie2")]
+        public IActionResult EitherCookie()
+        {
+            var countEvaluator = (CountingPolicyEvaluator)HttpContext.RequestServices.GetRequiredService<IPolicyEvaluator>();
+            return Content("Administration.EitherCookie:AuthorizeCount="+countEvaluator.AuthorizeCount);
+        }
+
+        [AllowAnonymous]
+        public IActionResult AllowAnonymousAction()
+        {
+            return Content("Administration.AllowAnonymousAction");
+        }
+
+        [AllowAnonymous]
+        public async Task<IActionResult> SignInCookie2()
+        {
+            await HttpContext.SignInAsync("Cookie2", new ClaimsPrincipal(new ClaimsIdentity("Cookie2")));
+            return Content("SignInCookie2");
+        }
+
+    }
+}
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/Controllers/AntiforgeryController.cs b/src/Mvc/test/WebSites/SecurityWebSite/Controllers/AntiforgeryController.cs
new file mode 100644
index 0000000000..24deaff657
--- /dev/null
+++ b/src/Mvc/test/WebSites/SecurityWebSite/Controllers/AntiforgeryController.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace SecurityWebSite.Controllers
+{
+    [AutoValidateAntiforgeryToken]
+    public class AntiforgeryController : Controller
+    {
+        [HttpPost]
+        [IgnoreAntiforgeryToken]
+        public IActionResult Index()
+        {
+            return Content("Ok");
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/Controllers/HomeController.cs b/src/Mvc/test/WebSites/SecurityWebSite/Controllers/HomeController.cs
new file mode 100644
index 0000000000..2a639ae399
--- /dev/null
+++ b/src/Mvc/test/WebSites/SecurityWebSite/Controllers/HomeController.cs
@@ -0,0 +1,41 @@
+// 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.
+
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace SecurityWebSite.Controllers
+{
+    public class HomeController : Controller
+    {
+        public IActionResult Index()
+        {
+            return View();
+        }
+
+        [AutoValidateAntiforgeryToken]
+        [Authorize]
+        [HttpPost]
+        public IActionResult AutoAntiforgery()
+        {
+            return Content("Automaticaly doesn't matter");
+        }
+
+        [Authorize]
+        [ValidateAntiForgeryToken]
+        public IActionResult Antiforgery()
+        {
+            return Content("Doesn't matter");
+        }
+
+        public IActionResult Login()
+        {
+            return Content("Login!");
+        }
+
+        public IActionResult Logout()
+        {
+            return Content("Logout!");
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/Controllers/IgnoreAntiforgeryController.cs b/src/Mvc/test/WebSites/SecurityWebSite/Controllers/IgnoreAntiforgeryController.cs
new file mode 100644
index 0000000000..64b8779679
--- /dev/null
+++ b/src/Mvc/test/WebSites/SecurityWebSite/Controllers/IgnoreAntiforgeryController.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace SecurityWebSite.Controllers
+{
+    [IgnoreAntiforgeryToken]
+    public class IgnoreAntiforgeryController : Controller
+    {
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public IActionResult Index()
+        {
+            return Content("Ok");
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/CountingPolicyEvaluator.cs b/src/Mvc/test/WebSites/SecurityWebSite/CountingPolicyEvaluator.cs
new file mode 100644
index 0000000000..0b4aaadea2
--- /dev/null
+++ b/src/Mvc/test/WebSites/SecurityWebSite/CountingPolicyEvaluator.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization.Policy;
+using Microsoft.AspNetCore.Http;
+
+namespace SecurityWebSite
+{
+    public class CountingPolicyEvaluator : PolicyEvaluator
+    {
+        public int AuthorizeCount { get; private set; }
+
+        public CountingPolicyEvaluator(IAuthorizationService authorization) : base(authorization) { }
+
+        public override Task<PolicyAuthorizationResult> AuthorizeAsync(AuthorizationPolicy policy, AuthenticateResult authenticationResult, HttpContext context, object resource) {
+            AuthorizeCount++;
+            return base.AuthorizeAsync(policy, authenticationResult, context, resource);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/Program.cs b/src/Mvc/test/WebSites/SecurityWebSite/Program.cs
new file mode 100644
index 0000000000..464fbffbea
--- /dev/null
+++ b/src/Mvc/test/WebSites/SecurityWebSite/Program.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using System.IO;
+using Microsoft.AspNetCore.Hosting;
+
+namespace SecurityWebSite
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
+            host.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            new WebHostBuilder()
+                .UseKestrel()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseStartup<Startup>();
+    }
+}
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj b/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj
new file mode 100644
index 0000000000..5486e54caf
--- /dev/null
+++ b/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Authorization.Policy" Version="$(MicrosoftAspNetCoreAuthorizationPolicyPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(MicrosoftAspNetCoreAuthenticationCookiesPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/Startup.cs b/src/Mvc/test/WebSites/SecurityWebSite/Startup.cs
new file mode 100644
index 0000000000..7dc96a5c2a
--- /dev/null
+++ b/src/Mvc/test/WebSites/SecurityWebSite/Startup.cs
@@ -0,0 +1,41 @@
+// 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.
+
+using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Authorization.Policy;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace SecurityWebSite
+{
+    public class Startup
+    {
+        // This method gets called by the runtime. Use this method to add services to the container.
+        public void ConfigureServices(IServiceCollection services)
+        {
+            // Add framework services.
+            services.AddMvc();
+            services.AddAntiforgery();
+            services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme).AddCookie(options => 
+            {
+                options.LoginPath = "/Home/Login";
+                options.LogoutPath = "/Home/Logout";
+            }).AddCookie("Cookie2");
+
+            services.AddScoped<IPolicyEvaluator, CountingPolicyEvaluator>();
+        }
+
+        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseAuthentication();
+
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(
+                    name: "default",
+                    template: "{controller=Home}/{action=Index}/{id?}");
+            });
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/StartupWithGlobalDenyAnonymousFilter.cs b/src/Mvc/test/WebSites/SecurityWebSite/StartupWithGlobalDenyAnonymousFilter.cs
new file mode 100644
index 0000000000..4fa7b0e884
--- /dev/null
+++ b/src/Mvc/test/WebSites/SecurityWebSite/StartupWithGlobalDenyAnonymousFilter.cs
@@ -0,0 +1,39 @@
+// 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.
+
+using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Authorization.Policy;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Mvc.Authorization;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace SecurityWebSite
+{
+    public class StartupWithGlobalDenyAnonymousFilter
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services
+                .AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
+                .AddCookie(options =>
+                {
+                    options.LoginPath = "/Home/Login";
+                    options.LogoutPath = "/Home/Logout";
+                }).AddCookie("Cookie2");
+
+            services.AddMvc(o =>
+            {
+                o.Filters.Add(new AuthorizeFilter());
+            });
+
+            services.AddScoped<IPolicyEvaluator, CountingPolicyEvaluator>();
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseAuthentication();
+
+            app.UseMvcWithDefaultRoute();
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/Views/Home/Index.cshtml b/src/Mvc/test/WebSites/SecurityWebSite/Views/Home/Index.cshtml
new file mode 100644
index 0000000000..cb0dbdf126
--- /dev/null
+++ b/src/Mvc/test/WebSites/SecurityWebSite/Views/Home/Index.cshtml
@@ -0,0 +1,21 @@
+@{
+    ViewData["Title"] = "Home Page";
+}
+<h1>Hello!</h1>
+<script src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-2.1.4.min.js"></script>
+<script>
+    $(document).ready(function () {
+        $.ajax({
+            type: "get",
+            dataType: "html",
+            url: '@Url.Action("Antiforgery", "Home")',
+            data: {},
+            success: function (result) {
+                alert("We were redirected to login!");
+            },
+            error: function (err, scnd) {
+                alert(err.statusText);
+            }
+        });
+    });
+</script>
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/Views/Shared/_Layout.cshtml b/src/Mvc/test/WebSites/SecurityWebSite/Views/Shared/_Layout.cshtml
new file mode 100644
index 0000000000..dfa4dbe9f1
--- /dev/null
+++ b/src/Mvc/test/WebSites/SecurityWebSite/Views/Shared/_Layout.cshtml
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - SecurityWebSite</title>
+</head>
+<body>
+    <div class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">SecurityWebSite</a>
+            </div>
+            <div class="navbar-collapse collapse">
+                <ul class="nav navbar-nav">
+                    <li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="About">About</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="Contact">Contact</a></li>
+                </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container body-content">
+        @RenderBody()
+        <hr />
+        <footer>
+            <p>&copy; 2016 - SecurityWebSite</p>
+        </footer>
+    </div>
+</body>
+</html>
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/Views/_ViewImports.cshtml b/src/Mvc/test/WebSites/SecurityWebSite/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..f65eca4041
--- /dev/null
+++ b/src/Mvc/test/WebSites/SecurityWebSite/Views/_ViewImports.cshtml
@@ -0,0 +1,2 @@
+@using SecurityWebSite
+    @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/Views/_ViewStart.cshtml b/src/Mvc/test/WebSites/SecurityWebSite/Views/_ViewStart.cshtml
new file mode 100644
index 0000000000..a5f10045db
--- /dev/null
+++ b/src/Mvc/test/WebSites/SecurityWebSite/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/appsettings.json b/src/Mvc/test/WebSites/SecurityWebSite/appsettings.json
new file mode 100644
index 0000000000..fa8ce71a97
--- /dev/null
+++ b/src/Mvc/test/WebSites/SecurityWebSite/appsettings.json
@@ -0,0 +1,10 @@
+{
+  "Logging": {
+    "IncludeScopes": false,
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information"
+    }
+  }
+}
diff --git a/src/Mvc/test/WebSites/SimpleWebSite/Controllers/HomeController.cs b/src/Mvc/test/WebSites/SimpleWebSite/Controllers/HomeController.cs
new file mode 100644
index 0000000000..9d4cf866a3
--- /dev/null
+++ b/src/Mvc/test/WebSites/SimpleWebSite/Controllers/HomeController.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+
+namespace SimpleWebSite.Controllers
+{
+    public class HomeController
+    {
+        public IDictionary<string, string> Index()
+        {
+            return new Dictionary<string, string> {
+                {"first", "wall" },
+                {"second", "floor" }
+            };
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj b/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj
new file mode 100644
index 0000000000..9989c770c6
--- /dev/null
+++ b/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/WebSites/SimpleWebSite/Startup.cs b/src/Mvc/test/WebSites/SimpleWebSite/Startup.cs
new file mode 100644
index 0000000000..50ad06a397
--- /dev/null
+++ b/src/Mvc/test/WebSites/SimpleWebSite/Startup.cs
@@ -0,0 +1,48 @@
+// 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.
+
+using System.IO;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.WebEncoders.Testing;
+using Microsoft.Net.Http.Headers;
+using Newtonsoft.Json;
+
+namespace SimpleWebSite
+{
+    public class Startup
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            // Example 1
+            services
+                .AddMvcCore()
+                .AddAuthorization()
+                .AddFormatterMappings(m => m.SetMediaTypeMappingForFormat("js", new MediaTypeHeaderValue("application/json")))
+                .AddJsonFormatters(j => j.Formatting = Formatting.Indented);
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseMvcWithDefaultRoute();
+        }
+
+        public static void Main(string[] args)
+        {
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
+            host.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            new WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseStartup<Startup>()
+                .UseKestrel()
+                .UseIISIntegration();
+    }
+}
+
diff --git a/src/Mvc/test/WebSites/SimpleWebSite/readme.md b/src/Mvc/test/WebSites/SimpleWebSite/readme.md
new file mode 100644
index 0000000000..04bc243883
--- /dev/null
+++ b/src/Mvc/test/WebSites/SimpleWebSite/readme.md
@@ -0,0 +1,4 @@
+SimpleWebSite
+===
+This sample web project illustrates a minimal site using `Microsoft.AspNetCore.Mvc.Core`.
+Please build from root (`.\build.cmd` on Windows; `./build.sh` elsewhere) before using this site.
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Components/CopyrightViewComponent.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Components/CopyrightViewComponent.cs
new file mode 100644
index 0000000000..414ec21a3f
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Components/CopyrightViewComponent.cs
@@ -0,0 +1,22 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc;
+
+namespace TagHelpersWebSite
+{
+    public class CopyrightViewComponent : ViewComponent
+    {
+        public IViewComponentResult Invoke(string website, int year)
+        {
+            var dict = new Dictionary<string, object>
+            {
+                ["website"] = website,
+                ["year"] = year
+            };
+
+            return View(dict);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Components/DanViewComponent.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Components/DanViewComponent.cs
new file mode 100644
index 0000000000..30f2d2d5e3
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Components/DanViewComponent.cs
@@ -0,0 +1,154 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+
+namespace TagHelpersWebSite
+{
+    public class DanViewComponent : ViewComponent
+    {
+        public IViewComponentResult Invoke(JacketColor jacketColor)
+        {
+            var colorReplacement = string.Format("<span style='color:{0}'>#</span>", jacketColor);
+
+            var resultString = DanString
+                .Replace("#", colorReplacement)
+                .Replace(Environment.NewLine, "<br>")
+                .Replace("\n", "<br>");
+
+            return View<string>(resultString);
+        }
+
+        private const string DanString = @"
+???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????+
+???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????+
+??????????????????????????????????????????????????????????????????????????????????????????????????I77III$77I7III???????????????????????????????????????????????????????????????????????????????????????+
+?????????????????????????????????????????????????????????????????????????????????????????I??7$OO8ODNNDDDNNNNDDNN8Z8Z$77????????????????????????????????????????????????????????????????????????????????+
+?????????????????????????????????????????????????????????????????????????????????????I7IZO88NDNNDDNNMNNNMMNMNNMNNMMNDDDDOOII???????????????????????????????????????????????????????????????????????????+
+???????????????????????????????????????????????????????????????????????????????I?7I$ZDN8DNNNNNNDNNNNNMNMMMMMMMNNNMNNMNNNDDDD88$$???????????????????????????????????????????????????????????????????????+
+???????????????????????????????????????????????????????????????????????????I??7O88DDDNNNDNNNNNNNDDDNNNNNNMNNNNNMNNMMNMNNNNNDNN8D8Z$$???????????????????????????????????????????????????????????????????+
+???????????????????????????????????????????????????????????????????????????I$O8DDDNDNNDNNDDDNNNDNNNNNDNNNNNNNNNNNNNNDMMMNMMNNNND8D88$7??+??????????????????????????????????????????????????????????????+
+?????????????????????????????????????????????????????????????????????????7Z8NDDDNNNNDNDNNNNDNNNNNNNNDNNDNNNNDNNNNNNNNNNNNNMNNMNNNDDDOD$O$??????????????????????????????????????????????????????????????+
+??????????????????????????????????????????????????????????????????????I$8DNNNNDNNNDNNDDDD8DNDNNNDDDDDDDDDDDNDNNNNNNDDNNNNNMMNNNNNNND8NZDD8O$I??????????????????????????????????????????????????????????+
+???????????????????????????????????????????????????????????????????I7O8DDNDNNNNNNNNNN8D8DNDNDD8DDDD88DDD8D8DDDDNNNNNNNDNDDDNNNDDMMNDNDDND88DOZ?????????????????????????????????????????????????????????+
+?????????????????????????????????????????????????????????????????IIO88NDDDNNDNDNDDD88O88DDDDDN8DD8888O88888DDDDNDDN8D8DDDDDDDDDDDNNNDDNNDNDOOO$I???????????????????????????????????????????????????????+
+????????????????????????????????????????????????????????????????IONDDNDDNMNNND888OZZOOODDO888ODO8OOZOOOOOO88888DDDDDD8DDDD88888DDNNNN8NDNDDO8D8OZ??????????????????????????????????????????????????????+
+??????????????????????????????????????????????????????????????I7OD8NDDD8DNDNN88OZ$$$$ZOOO8888OOOOZOOZZZZOZZ8888888OOOZ8OOOOOO8O88888NNNDN8DDNO888O$I???????????????????????????????????????????????????+
+??????????????????????????????????????????????????????????????7ZDDDDNNDNDND8OZZZ$$$ZZZOZOOO8OZOZZZZ$Z$ZZZOO$ZZOOOOOZOZZZZZZOOOOOOOO88DDNN8NDN8DNN8DZI??????????????????????????????????????????????????+
+????????????????????????????????????????????????????????????IOD8DNDDDDNDD8OOZ$$$$$$$$$Z$8$ZOZ$ZZ$77777$7$$$$$$ZOOZ$$Z$$ZZZZZZZZOOZOOO8DDNNNN8DDD8DNDZ7I????????????????????????????????????????????????+
+???????????????????????????????????????????????????????????7ONNDDDDDDDDDOOZ$$$77777777$$Z$77$$77III77I777Z$7$$$$$77777$$$$$$$ZZZOOOOOO8DDDNNNDNDNONND8Z7I??????????????????????????????????????????????+
+??????????????????????????????????????????????????????????7$8DD8NDDN8D8Z$$777777II77777777$7$$$7IIIIIII7II77I77777777777777$$$$$ZZZZOOO88ODNNNDDDDODNNN8I??????????????????????????????????????????????+
+?????????????????????????????????????????????????????????IZ8888DDDDD88Z$777777IIIIIIIII77$777II?IIIIIIIIIII7III777III777II77$$$Z$$Z$ZZZOOO88DD8NN88DDDDNDZ?????????????????????????????????????????????+
+???????????????????????????????????????????????????????IZDDD88DDD888Z7777IIIIIIII?IIII?III7I???I???II??I?777III?IIIIIIIIIII777$$$$$$$$$ZZOO88DDNDDDDDNNDD8ZI???????????????????????????????????????????+
+??????????????????????????????????????????????????????I$8NN8OD8N8D8Z$7I7IIIIIIII?I??I??I???????III???????I?I?I??III?IIIIII77777$$$$$$$$$ZZO88DDNDDDDNDDOD88O7??????????????????????????????????????????+
+?????????????????????????????????????????????????????IO8DNN8D8DDD8Z$7I7IIIIIIIII????????+????I???++++++++??+???????IIIIIIII77777$7$$7$$$$$ZO88D8DDDND8NNDNNNZI?????????????????????????????????????????+
+?????????????????????????????????????????????????????$8DDD8D88D88Z$7I7IIIIIIIII??I???????+?+?++++++++++++??+??????I?IIIIIII77I777777777$$$ZZO888D8DDO8DDDNND87?????????????????????????????????????????+
+?????????????????????????????????????????????????????ODDNODD8D88O$777IIIIIIIII?II???????+++++++++++++++?+?+????????IIIIIIII7777777777777$7$$ZO8DODD8888NDDNND8$I???????????????????????????????????????+
+????????????????????????????????????????????????????78888OO888DO$777IIIIIIIII?I????????+++++++++++++++++++++++???????IIIIIII777I777777777777$O88888O8888DNDDDDZI???????????????????????????????????????+
+???????????????????????????????????????????????????IO88$8OODN8OZ777IIIIIIIIII??????+??++++++++++++++++++++++?++????????IIIIIII777I7777777777$ZZ88OOO88D8888DD887I??????????????????????????????????????+
+??????????????????????????????????????????????????I7OO888888OOO$777IIIIIIII????????++++++++++++++++++++++++++++?+???????IIIIIIII7I77777777777$ZO88O8ZO88D88N8D8O7??????????????????????????????????????+
+?????????????????????????????????????????????????I?I88D8OD8OOOZ777IIIIIIII???????++++++++++++++++++++++++++++++++????????IIIIII7777II77II77777$ZOOZOO88O8O8DD88OI??????????????????????????????????????+
+??????????????????????????????????????????????????IZOOOZOOO$OO$7777IIIIII???????++++++++++=+++=+++=+++++++++++++++++?????IIIIIIIII7I7IIIIII777$O8ZZZO8ZZ8Z8DND8DO$?????????????????????????????????????+
+??????????????????????????????????????????????????IZOZ8OZOZO8Z7777IIIIII???????++++++++=++=============+==+=++++++++++????I??III7IIIIIIIIIII77$ZOZ$ZZO8ZO$8O8DDDO7?????????????????????????????????????+
+?????????????????????????????????????????????????I7O8OOZ$ZOOZ77777IIIII??????++++++=+++=====================+=++++++++????????IIIIIIIIIIIIIIII7ZOZZ$$ZZOO878DO8DDOI????????????????????????????????????+
+??????????????????????????????????????????????????IZO$ZZZOZ$$$7777IIIII??????++++++==========================+++++++++?+??????I?IIIIIIIIIIIII77$ZO$ZZZ$8Z8OZ88DDO7$????????????????????????????????????+
+??????????????????????????????????????????????????$$$ZO$ZZ$Z$$77IIIIIII?????++++++==============================++++++++++???????IIIIIIIIIIII77$OZZZ$8ZZO8Z$8D8D8O7?????????????????????????????????????
+??????????????????????????????????????????????????$ZZOOO$I$$Z$77IIIII??????+++++++++=========================+==+++++++++++???????IIIIIIIIIIII7$Z$OZ$O$ZOZOOOO888O$????????????????????????????????????+
+?????????????????????????????????????????????????7$OZOZZ$Z7$$77IIIIII??????+++++++================================+++=++++++?+????I??IIIIIIIII7$$ZZO$ZZZO$ZZ8O88D8ZI????????????????????????????????????
+?????????????????????????????????????????????????7OZO$Z$$7$$$77IIIIII?I???+++++++=+===============================+++++++++????????IIIIIIIIIII7$Z$OO$OOOZOOZ8N88DOII????????????????????????????????????
+?????????????????????????????????????????????????7$Z$Z$Z$77ZZ77IIIII??????+++++==================================+=+==++++??+???????IIIIIIIIII7ZZZ$ZOZZ8OOODD8888O$?????????????????????????????????????
+?????????????????????????????????????????????????IOZ8$Z$77$O$77IIIII???????++++=+=+===================================+++++++??????I?I?IIIIIII7$ZOZZ$Z$ZOOO888888ZI?????????????????????????????????????
+?????????????????????????????????????????????????788ZZ$77$Z$$77III????????+++++================~===================+==++++++?????????I?IIIIII77$OZZOZ7ZZ$OOZO88DZZ7?????????????????????????????????????
+????????????????????????????????????????????????I7ZZ$$I7$O7$77III?I????????+++++++============~=======================++++?+??????????IIIIIII77$ZZZZ$$Z$ZZOZ8D8OOZ?I????????????????????????????????????
+????????????????????????????????????????????????I7$$777$Z$$$77IIIIII???????++++++=========~====~===~==================+++++++??????????I?IIII77$ZZ$ZZ$ZZO$ZODOO8OZ?I????????????????????????????????????
+????????????????????????????????????????????????I777I$$7$$Z$IIIIII????????++++++++================~===============+=+++++++++????????????IIII777$Z$$ZZ$ZZZ$O8ZZZ87I?????????????????????????????????????
+?????????????????????????????????????????????????I$$77$7Z$$7IIIIII???????++++++++++===============================+++++++++++?????????????IIIII7$ZZZ$O7Z7OZ$$OZ887??????????????????????????????????????
+?????????????????????????????????????????????????I$$7$77Z7$7IIII?I???????+?++++++++=============================+++++++++++++?????????????????I7$ZZ$Z$$$7$$7O$OO8Z?????????????????????????????????????+
+?????????????????????????????????????????????????I7$777$7$$7IIIII???????+?++++++++==============================+++++++++++?????????????I????II77Z$$$7Z77Z$7Z$888$??????????????????????????????????????
+????????????????????????????????????????????????I7$777777$$IIIII?III?????++?++++++================================++++?+++?+??????????????????III$$Z$7$$I$Z7OOZOOII?????????????????????????????????????
+????????????????????????????????????????????????II$$77$$7$7IIIIIIII????????++++++++==============================+++++????????????????????????III$$$$$7$I7$7$Z$OZI??????????????????????????????????????
+?????????????????????????????????????????????????7$$I77$$$IIIIIIIIIII?????++++++++++=============================++++++++????????III??????????I?I7$$$$$I$7I?ZIZZZ7?????????????????????????????????????+
+?????????????????????????????????????????????????$Z$$77IZ7IIIIII7IIII????????+++++++==+=========================+++++++++????????I?IIIII????????II7$I$77I7$?Z$OOZ7I?????????????????????????????????????
+????????????????????????????????????????????????II777$7$$IIIIIIIIIII????+???+++++++++===========================++++++?++????????IIIIIIIII???????II7777I77I+7$OZZZ??????????????????????????????????????
+?I???????????????????????????????????????????????I$77$7$$IIIIIIIIII????????+??++++++++=+======================+=+++++++?????????I??IIIIIII?????????777I7I7I?I$$OZ7??????????????????????????????????????
+?????????????????????????????????????????????????I$7$$$$$IIIIIII7II???I??????????+++++++++==================+++++++++??+???????II?IIIIIIII?????????7I$II?7?77I$OZ$??????????????????????????????????????
+?????????????????????????????????????????????????I7$7$$$$IIIII7I7III7IIIIIII777777I???+?+++===========++++++++++????III?IIIIIIIIIIIIIIIIIII????????I7$$7II777I$OZ7I?????????????????????????????????????
+????????????????????????????????????????????????II$$$$ZZ$IIIIII7II7I77$77$Z$ZOOOO8OZ77I???++++++===++++++++???III7$$ZZZZ7$777777II7IIIIIIII????????7$$$7I7I$778887??????????????????????????????????????
+?I????????????????????????????????????????????I777$Z$Z$O$7IIIII7I777$7$77$ZZZOZZZ$Z$$7III???++++++++++?+?+???I$$$OOZOOOOOZZ$7$77$777IIII??I????????7$Z7777$7778O$I??????????????????????????????????????
+?I???????????????????????????????????????????IIIII7Z$OZ8$7IIIII777Z$7$7I???++????II77777II????+??+++++??????III777$$$Z$$7I777$$77$$$7IIII??I?I?I???I$$$$$$77IO8ZI???????????????????????????????????????
+?III??????????????????????????????????????????7I??I7ZOZ8$IIIII777Z$III??+?+??II7777$77II7II??????+++?????IIIII7IIIIII???+++++???I$7$$7II??I?II?????7$7ZOO7Z$ZOO$Z$$77I??????????????????????????????????
+?III??????????????????????????????????????????I7I?II$ZZO77IIII7$$77II??II$$Z8DNNDNDDOII77I77I???+++++???III77II7$777$OOOO$7I????I??I77777IIIII?????7ZZ7OZ$$ZZO$$77II????????????????????????????????????
+?IIII?????????????????????????????????????????I???III88O7IIII7II7?IIII$O8D8$I8DD.M.D8I7I?IIII??++===++??IIII7II?IZOI$8NNNNNDOZ$7II???IIIIIIIIII???I7ZOIZZ$7$Z$77I???O7+?????????????????????????????????
+?III????????????????????????????????????????????????7Z8Z77IIIII????I7$Z$$77I+I8O8888?==+7I+?II?++++++??III7?++I7?+=~7O8NND88?$8DOO7????????I?IIIIIIIZO$Z77+777II?=+I77??????????????????????????????????
+?I??????????????????????????????????????????????+?I??ZO$7IIII??????IIII?????I?II?IIIIIII77??II??++++??I7I7I+?7+I=?=~=ZO8888II7$Z8OZZII??I???III?IIIIZ$8O7$+III??==?III+?????????????????????????????????
+?I??????????????????????????????????????????????????IO8$7IIII??????????+?+++++??????+?+++?IIIII???++?I77I7II?????I??II7III?I7I7II7$777I?????+??????I7$8OZ??I??I?+=III?+?????????????????????????????????
+?II??????????????????????????????????????????????????$877IIIII??+??????++++++++++++++????IIIII???+???I77IIII+?+?????????????????IIII7IIII???II??????77OZ$?I?III?+?II????????????????????????????????????
+?III???????????????????????????????????????????????+??Z77IIIII?I?+??++++++?+++++?????????IIII7I?????II777I?I?????????++++++++?????????III???????????I7O$???IIIII??7II???????????????????????????????????
+?III????I??????????????????????????????????????????+++I77IIIII????++++++++++++++++++++??III7II?????III7777I????????????+??+??????????????????I???????77I??7IIIIII?77?+??????????????????????????????????
+?IIIII??I????????????????????????????????????????I?+?+I77III???????++++++++++++++++++???I77III?I????II7777I??????????????????????????+???I????????????I??7$777III?7I?+??????????????????????????????????
+?IIIIIII?????????????????????????????????????????II??II77III???I??++++++++++++++++++++?I7IIIIIIIIIIIII777$7II????????????++++++++++++????????????++??????$777II???7?????????????????????????????????????
+?IIIIIII??????????????????????????????????????????I??II77I????????++++++++++++++++++??IIIIIIIII?I?III7I77777I??????????++++++++++++++????????I???++??????7777II?I?I?+???????????????????????????????????
+?IIIIIIIIIII???????????????????????????????????????????77I????????+++++++++++++++++??IIIIIIIIIII?IIIII7777777????++++++?+?+++++??++?????????????++??????+77777I?+7?+????????????????????????????????????
+?IIIIIIIIIIII??????????????????????????????????????????I7I???????++++++++++++++++++?IIIIIIIII????IIIII7777777II??+++++++++++++++++++?+??????????+???????I77$$I7I?I+?????????????????????????????????III?
+?IIIIIIIIIIII??I??????????????????????????????????????+?7I????????++++++++=++++++++???III7I?I?????IIII777777III???+++++++++++++++++++?????????+++??????I7$Z$$7I?7????????????????????????????III???IIII?
+?IIIIII?IIIIIIIII?????????????????????????????????????+?7II??????+?+++++++===+=+++???I7IIII????????III7777777I???+++++++++++++++++++?????????++++??????Z$777II+7???????????????????????II???IIII??IIIII?
+?IIIIIIIIIIII????I?????????????????????????????????????+77I???????+++++++====++++??I77II7II????+????III7777777I???++++++++++++++++++++??????++++???????$77I???7I??????????????????????IIIIIIIIIIIIIIIII?
+?IIIIIIIIIIII???III?????????????????????????????????????I7II?????++++++++=++++++??I77IIIII?????+???IIII777777$$7???++++++++++++++++?+?????++++++??????IIII??77I?????????????????IIIIIIIIIIIIIIIIIIIIIII?
+?IIIIIIIIIIIIIII??II????????????????????????????????I????77III?????+++++++++++??III7III7III???+???IIIIII7777$7$$I???++++++++++++++??????+++++++?????+?II77?I7I+??????????????III?IIIIIIIIIIIIIIIIIIIIII?
+?IIIIIIIIIIIIIIII??I????????????????????????????????I????77I?II????++++++++???IIIIIIIIIIII?+++++??????IIIIII777$$I????+?+++++++++++????++++++++++???+7II7II?I+???????????????IIIIIIIIIIIIIIIIIIIIIIIIII?
+?IIIIIIIIIIIIIIII???I???????????????????????????????II???77II????????++?+???II77IIIIIIIIII??+++++++??????IIIIII$7II????++++++++++++????++++=++++++??$77?77I?????????????????IIIIIIIIIIIIIIIIIIIIIIIIIII?
+?IIIIIIIIIIIIIIII????????????????????????????????????I??II7II????????????II7$7IIIIII77III7II??++??????IIII??I?7$7II?????????+??+??????++++++++++++?+Z77IIIII??????????I???IIIIIIIIIIIIIIIIIIIIIIIIIIIII?
+?IIIIIIIIIIIIIIIII??I?????????????????????????????????I7$77IIII????????III$7I?IIIIIII77$$77II?????IIIIII7$Z$$$$77II?IIIIIII???????????+++++++++++++?O$7??II+????????I?I?IIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?
+?IIIIIIIIIIIIIIIIIIIII????????????????????????????????????7IIII???????I7$?????IIIIII77I7$$$777777I7$$$$$7$7$77IIIIIIIII??????I77I?I???++++++++++++??7$7I??+?????IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?
+?IIIIIIIIIIIIIIIIIIIIIII????????????????????????????????I?I7III???????7I??++??II?III7777777$77I77777$777777777II7IIIII?II????++?77I????++++++++++????7Z7II??IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?
+?IIIIIIIIIIIIIIIIIIIIIII???????????????????????????????????7III?I?+++?I+??++???IIIIIII7II77III??IIIIIII7II77777IIIIII????????+++?I7???++++++++++++I??I????I??IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?
+?IIIIIIIIIIIIIIIIIIIIII?IIIII??????????????????????????????IIII???++++?++?II???III7IIIIIII????+?++?+???III777I7II7IIIII????I?I?++?7???+++++++++?+?I???I?IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?
+?IIIIIIIIIIIIIIIIIIIIIIIIIIIII?????????????????????????????I7II??I?+==++++?+?I??IIIIIII????++++++++++?+???IIIIIIIIIIIIIII7I????++?II?+++?+++++???I????I?IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?
+?IIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?????????????????????????I?I7I?I??I?+==+=+?++IODZIIIIII?I??+?+++++++++++??I??IIIIII777$8OI??+?+++?II?+?+I++?+??????II?I?IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?
+?IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII??????????????????IIII????I7I??+?I++====+?+??7N8OZ$77III??+++++++++++++????III7$ZOOODI??+++++++?7?+????++??????I?IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII????????????????????I??III7II?++I?+++==+?++??IODI?I=?7I777I??????IIII77777I$$$$IDZ7????+?++==+?7?++?I++?????+???IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII??????????III?I?IIIIII?I7II?++I?+++++++++???IOI?+~+~~?===?77I?++7?==7+~+$?77$I???????+++=++I?+++???????????IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII??????????IIIIIIIIIIIIII7II?++?I?+++++++??????I$??=~:=~~::=~:~:~?~~~?~=+777???????????++=++7+++??????I?????IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII??????????IIIIIIIIIIIIIII7II?++?I?+++++++???I????I?+~?=~~~=~~~~=?=~+?I7I?+?IIII??????+++=+I?++?????II???I??IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?IIIIIIIIIIIIIIIII??7II??++?I?++++++????II????IIII?+=?=++?IIIIII???I??III??????+++=++7++???????II?7+??IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII77I??+?I???+++????IIIII?????????????+???????I??????????????++++I?++?????III??++??IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7II??+?I???+++????I?I?I????+++++++++++???I?I????????????+++++?I++????IIIII??++??IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?77II???I??++?+?????????II??????????????III???????????????++++7++?+??III?I??++???IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7II????I??+??+++????????????IIIIIIIII???????????????????+++?I++???II?I?II?++???IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7II???II?????+???????++???II??????????+???????????????????I?++???II?II??++????IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7I????I??+??+++?+??++++++I????????+?++????????????????+?+?+????IIIII??++????IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII?I77II?II??????++++?+++++++????????++++?+????????????????+?+++?????II??+++????IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7II?III?????++++++++++++????????++++?????????I??????+++??+?????II???++I???IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7IIIIII????+++++++++++?+????????++++++???????????+?++?++?????III??????????I###ZIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII77IIIII?????+++++++++++??+??+???+++++???+???????+++?+?+?????IIII??????+????#####OIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII777IIII?????+++++?++?+???????????++?+??????????++???+++????7III????????????#######ZIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII77777III???+?+??++???++?+???+?????????????????????+?+?+??II?III?I?I+?+?+??I########OIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII77I$777II??+????????????????????????????????????+++?+??II7IIIIIII???+?+??I$O########ZIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII77I7$77II??????+????????????????????????????????+??+?III7777IIII????????I7ZO########OIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII77II7$77II??????????????????+???????????????????????II7$7777III???I?I?II7$ZO#########$IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIO#77I7$$77I????????????++??++????????????????????I?II7$$7777III??II?IIII77$ZO#########OIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII###$7II7$$$7II?????+++?++??+++?++?+??+??????????IIII$$Z$$777III??I?????III77ZO##########$IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7####Z7III7$$$7I?????????+++?+++????++??+???????III77ZZ$$77IIIII????????III777ZO##########OIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIZ######77III7$7$$7II?????++???++++++??+?????III7777$Z$$$77IIII????????????III7$Z#############7IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7#######77III7$77$$$7IIII???????+++++??????III77$$ZZ$$777IIIII???????????????I77##############OO7IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII########$7III777III7$$77I?II?????????IIIII777$$$Z$$$77IIIIIII????+?+????????III$#################OO7IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII##########7IIII777IIIII7$Z777II?IIIIIII777$$ZZ$$$$777IIIII???????++++??+???????IO#####################IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7Z###########77II777II??IIII777$ZZ$7$77$$$$77777777777II?????????+++++++++????????$######################O7IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7Z###############77II777II??????I?III?????+????IIIIIIIII7II????????+?++++++++++++++??7Z#######################ZIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7$###################77III77II??++??????++++++++++?????????I????+++??++++++++++++++++++?I$########################OO$IIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7$Z######################Z77III777II?++??+++++++=+++++++?????????????+++++++++++++++++++++++?$############################O$IIIIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7$O###########################?$7IIII777I?+?+++++++=+=++++++++????????++++++++++++++++++++++++++?7################################$IIIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII7Z################################+Z7IIII777II?++++=+++++=++++++?++??++++++++=+++++++++++++++++++++?7##################################OZIIIIIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII$O###################################Z?Z$7IIII777I?++++===+++++++++++++++++++=====++++++=+++++++++++++I$#######################################7IIIIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIIIIII$#######################################IIZ$7IIIII777I??++==+++++++++++++++?++++=====+=+=+=+++++++=+++++?$#########################################O7IIIIIIIIIIIIIIIIIIII
+IIIIIIIIIIIIIIIIIIIIIIIIIIII$##########################################?IZ$7IIIII77I7I?+++++++?+++???++??++++==========++++++++===+++?IZ############################################ZIIIIIIIIIIIIIIIII7I
+IIIIIIIIIIIIIIIIIIIIIIIII$O############################################?IO77IIIIII7777?+++++????????+++++++++++=========+++=++++===+?IO##############################################O$7II7IIIIIIIIII77I
+IIIIIIIIIIIIIIIIIIIIII7Z###############################################?I#77II???II7777I???????++++++++++++++=========++++++++====+?I#################################################ZOZ7III7IIIII7I77I
+IIIIIIIIIIIIIIIIIII7$O#################################################??#$77I???IIII777I????+++++++++++++++=+=======++++++++==+=+?I###################################################O#OZ7777IIIIII7II
+IIIIIIIIIIIIIIIII7Z####################################################$+#$77II???IIIII77II????+++++++++++++======+===+++++++==++?I########################################################OZ7777777I77I
+IIIIIIIIIIIIIII$O#######################################################=#Z77II????IIIIIIIII????++++++++++==========+=++=+++==++?7###########################################################OZ$I777777I
+IIIIIIIIIIII7Z##########################################################=Z#777I??????IIIIIIII???++++++++++=====+++=======+=+=+??Z##############################################################ZZ$III77I
+IIIIIIIIII7Z############################################################I+#777II?????I?I??????++++++++++=+=========++=+++++++??#################################################################ZZZZ777I";
+    }
+}
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Components/GenericViewComponent.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Components/GenericViewComponent.cs
new file mode 100644
index 0000000000..5bc7a67700
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Components/GenericViewComponent.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc;
+
+namespace TagHelpersWebSite.Components
+{
+    public class GenericViewComponent : ViewComponent
+    {
+        public IViewComponentResult Invoke(Dictionary<string, List<string>> items)
+        {
+            return View(items);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Components/JacketColor.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Components/JacketColor.cs
new file mode 100644
index 0000000000..2c466ba60f
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Components/JacketColor.cs
@@ -0,0 +1,15 @@
+// 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.
+
+namespace TagHelpersWebSite
+{
+    public enum JacketColor
+    {
+        Red,
+        Blue,
+        Green,
+        Navy,
+        Brown,
+        Purple
+    }
+}
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Controllers/EmployeeController.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Controllers/EmployeeController.cs
new file mode 100644
index 0000000000..392e3d0940
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Controllers/EmployeeController.cs
@@ -0,0 +1,41 @@
+// 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.
+
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using TagHelpersWebSite.Models;
+
+namespace TagHelpersWebSite.Controllers
+{
+    public class EmployeeController : Controller
+    {
+        // GET: Employee
+        public string Index()
+        {
+            return "Index Page";
+        }
+
+        // GET: Employee/Create
+        public IActionResult Create()
+        {
+            return View();
+        }
+
+        // POST: Employee/Create
+        [HttpPost]
+        public IActionResult Create(Employee employee)
+        {
+            if (ModelState.IsValid)
+            {
+                return View("Details", employee);
+            }
+            return View(employee);
+        }
+
+        // GET: Employee/DuplicateAntiforgeryTokenRegistration
+        public IActionResult DuplicateAntiforgeryTokenRegistration()
+        {
+            return View();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Controllers/EncodersController.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Controllers/EncodersController.cs
new file mode 100644
index 0000000000..fe7464810a
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Controllers/EncodersController.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace TagHelpersWebSite.Controllers
+{
+    public class EncodersController : Controller
+    {
+        public IActionResult Index()
+        {
+            ViewData["Title"] = "Using the default HTML encoder";
+            return View();
+        }
+
+        public IActionResult CustomEncoder()
+        {
+            ViewData["Title"] = "Using a custom HTML encoder";
+            return View();
+        }
+
+        public IActionResult NullEncoder()
+        {
+            ViewData["Title"] = "Using the null HTML encoder";
+            return View();
+        }
+
+        // We've defined the behavior when multiple tag helpers target the same element. But this is an extreme corner
+        // case since one tag helper even using anything but the default HTML encoder is not going to be common.
+        public IActionResult TwoEncoders()
+        {
+            ViewData["Title"] = "Using two HTML encoders";
+            return View();
+        }
+
+        // We've defined the behavior when multiple tag helpers target the same element. But this is an extreme corner
+        // case since one tag helper even using anything but the default HTML encoder is not going to be common.
+        public IActionResult ThreeEncoders()
+        {
+            ViewData["Title"] = "Using three HTML encoders";
+            return View();
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Controllers/HomeController.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Controllers/HomeController.cs
new file mode 100644
index 0000000000..011efff659
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Controllers/HomeController.cs
@@ -0,0 +1,82 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+using TagHelpersWebSite.Models;
+
+namespace TagHelpersWebSite.Controllers
+{
+    public class HomeController : Controller
+    {
+        public IActionResult Index(bool approved = false)
+        {
+            return View(new WebsiteContext
+            {
+                Approved = approved,
+                CopyrightYear = 2015,
+                Version = new Version(1, 3, 3, 7),
+                TagsToShow = 20
+            });
+        }
+
+        public IActionResult About()
+        {
+            return View();
+        }
+
+        public IActionResult Help()
+        {
+            return View();
+        }
+
+        public IActionResult ViewComponentTagHelpers()
+        {
+            return View();
+        }
+
+        public IActionResult UnboundDynamicAttributes()
+        {
+            return View();
+        }
+
+        public IActionResult NestedViewImportsTagHelper()
+        {
+            return View();
+        }
+
+        public IActionResult ViewWithLayoutAndNestedTagHelper()
+        {
+            return View();
+        }
+
+        public IActionResult ViewWithInheritedRemoveTagHelper()
+        {
+            return View("/Views/RemoveInheritedTagHelpers/ViewWithInheritedRemoveTagHelper.cshtml");
+        }
+
+        public IActionResult ViewWithInheritedTagHelperPrefix()
+        {
+            return View("/Views/InheritedTagHelperPrefix/InheritedTagHelperPrefix.cshtml");
+        }
+
+        public IActionResult ViewWithOverriddenTagHelperPrefix()
+        {
+            return View("/Views/InheritedTagHelperPrefix/OverriddenTagHelperPrefix.cshtml");
+        }
+
+        public IActionResult ViewWithNestedInheritedTagHelperPrefix()
+        {
+            return View(
+                "/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/" +
+                "NestedInheritedTagHelperPrefix.cshtml");
+        }
+
+        public IActionResult ViewWithNestedOverriddenTagHelperPrefix()
+        {
+            return View(
+                "/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/" +
+                "NestedOverriddenTagHelperPrefix.cshtml");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Controllers/RemoveDefaultInheritedTagHelpersController.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Controllers/RemoveDefaultInheritedTagHelpersController.cs
new file mode 100644
index 0000000000..4f164a29da
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Controllers/RemoveDefaultInheritedTagHelpersController.cs
@@ -0,0 +1,12 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace TagHelpersWebSite.Controllers
+{
+    public class RemoveDefaultInheritedTagHelpersController : Controller
+    {
+        public IActionResult Index() => View();
+    }
+}
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Models/Employee.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Models/Employee.cs
new file mode 100644
index 0000000000..556d3ba955
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Models/Employee.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace TagHelpersWebSite.Models
+{
+    public class Employee
+    {
+        public int EmployeeId { get; set; }
+
+        [Display(Name = "Full Name", ShortName = "FN")]
+        public string FullName { get; set; }
+
+        [DisplayFormat(NullDisplayText = "Not specified")]
+        public string Gender { get; set; }
+
+        [Range(10, 100)]
+        public int Age { get; set; }
+
+        [Required]
+        [DataType(DataType.Date)]
+        public DateTimeOffset? JoinDate { get; set; }
+
+        [DataType(DataType.EmailAddress)]
+        public string Email { get; set; }
+
+        [DisplayFormat(NullDisplayText = "Not specified")]
+        public int? Salary { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Models/WebsiteContext.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Models/WebsiteContext.cs
new file mode 100644
index 0000000000..398a8b2c01
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Models/WebsiteContext.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using System;
+
+namespace TagHelpersWebSite.Models
+{
+    public class WebsiteContext
+    {
+        public Version Version { get; set; }
+
+        public int CopyrightYear { get; set; }
+
+        public bool Approved { get; set; }
+
+        public int TagsToShow { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Startup.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Startup.cs
new file mode 100644
index 0000000000..f6c470b7fc
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Startup.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using System.IO;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace TagHelpersWebSite
+{
+    public class Startup
+    {
+        // Set up application services
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddMvc();
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseMvcWithDefaultRoute();
+        }
+
+        public static void Main(string[] args)
+        {
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
+            host.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            new WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseStartup<Startup>()
+                .UseKestrel()
+                .UseIISIntegration();
+    }
+}
+
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/ATagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/ATagHelper.cs
new file mode 100644
index 0000000000..2326ee9ca6
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/ATagHelper.cs
@@ -0,0 +1,49 @@
+// 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.
+
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace TagHelpersWebSite.TagHelpers
+{
+    public class ATagHelper : TagHelper
+    {
+        public ATagHelper(IUrlHelperFactory urlHelperFactory)
+        {
+            UrlHelperFactory = urlHelperFactory;
+        }
+
+        [HtmlAttributeNotBound]
+        public IUrlHelperFactory UrlHelperFactory { get; }
+
+        [ViewContext]
+        [HtmlAttributeNotBound]
+        public ViewContext ViewContext { get; set; }
+
+        public string Controller { get; set; }
+
+        public string Action { get; set; }
+
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            if (Controller != null && Action != null)
+            {
+                var methodParameters = output.Attributes.ToDictionary(attribute => attribute.Name,
+                                                                      attribute => attribute.Value);
+
+                // We remove all attributes from the resulting HTML element because they're supposed to
+                // be parameters to our final href value.
+                output.Attributes.Clear();
+
+                var urlHelper = UrlHelperFactory.GetUrlHelper(ViewContext);
+                output.Attributes.SetAttribute("href", urlHelper.Action(Action, Controller, methodParameters));
+
+                output.PreContent.SetContent("My ");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/AddProcessedAttributeTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/AddProcessedAttributeTagHelper.cs
new file mode 100644
index 0000000000..88e62e0305
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/AddProcessedAttributeTagHelper.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace TagHelpersWebSite.TagHelpers
+{
+    [HtmlTargetElement("input")]
+    public class AddProcessedAttributeTagHelper : TagHelper
+    {
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            output.Attributes.Add(new TagHelperAttribute("processed"));
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/AutoLinkerTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/AutoLinkerTagHelper.cs
new file mode 100644
index 0000000000..c0dfd903df
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/AutoLinkerTagHelper.cs
@@ -0,0 +1,24 @@
+// 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.
+
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace TagHelpersWebSite.TagHelpers
+{
+    [HtmlTargetElement("p")]
+    public class AutoLinkerTagHelper : TagHelper
+    {
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            var childContent = await output.GetChildContentAsync();
+
+            // Find Urls in the content and replace them with their anchor tag equivalent.
+            output.Content.AppendHtml(Regex.Replace(
+                childContent.GetContent(),
+                @"\b(?:https?://|www\.)(\S+)\b",
+                "<strong><a target=\"_blank\" href=\"http://$0\">$0</a></strong>"));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/BoldTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/BoldTagHelper.cs
new file mode 100644
index 0000000000..f13ad6ef45
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/BoldTagHelper.cs
@@ -0,0 +1,26 @@
+// 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.
+
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace TagHelpersWebSite.TagHelpers
+{
+    [HtmlTargetElement(Attributes = "bold")]
+    public class BoldTagHelper : TagHelper
+    {
+        public override int Order
+        {
+            get
+            {
+                return int.MinValue;
+            }
+        }
+
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            output.Attributes.RemoveAll("bold");
+            output.PreContent.AppendHtml("<b>");
+            output.PostContent.AppendHtml("</b>");
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/ConditionTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/ConditionTagHelper.cs
new file mode 100644
index 0000000000..4b3716c7e4
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/ConditionTagHelper.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace TagHelpersWebSite.TagHelpers
+{
+    [HtmlTargetElement("div")]
+    [HtmlTargetElement("style")]
+    [HtmlTargetElement("p")]
+    public class ConditionTagHelper : TagHelper
+    {
+        public bool? Condition { get; set; }
+
+        public override int Order
+        {
+            get
+            {
+                // Run after other tag helpers targeting the same element. Other tag helpers have Order <= 0.
+                return 1000;
+            }
+        }
+
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            // If a condition is set and evaluates to false, don't render the tag.
+            if (Condition.HasValue && !Condition.Value)
+            {
+                output.SuppressOutput();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/CustomEncoderTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/CustomEncoderTagHelper.cs
new file mode 100644
index 0000000000..b274e1670f
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/CustomEncoderTagHelper.cs
@@ -0,0 +1,81 @@
+// 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.
+
+using System.IO;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace TagHelpersWebSite.TagHelpers
+{
+    [HtmlTargetElement("pre")]
+    public class CustomEncoderTagHelper : TagHelper
+    {
+        public override int Order => 1;
+
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            var encoder = new CustomEncoder();
+            var customContent = await output.GetChildContentAsync(encoder);
+
+            // Note this is very unsafe. Should always post-process content that may not be fully HTML encoded before
+            // writing it into a response. Here for example, could pass SetContent() a string and that would be
+            // HTML encoded later.
+            output.PreContent
+                .SetHtmlContent("Custom encoder: ")
+                .AppendHtml(customContent)
+                .AppendHtml("<br />");
+        }
+
+        // Simple encoder that just wraps "string" as "Custom[[string]]". Note: Lacks all parameter checks.
+        private class CustomEncoder : HtmlEncoder
+        {
+            public CustomEncoder()
+            {
+            }
+
+            public override int MaxOutputCharactersPerInputCharacter => 1;
+
+            public override string Encode(string value) => $"Custom[[{ value }]]";
+
+            public override void Encode(TextWriter output, char[] value, int startIndex, int characterCount)
+            {
+                if (characterCount == 0)
+                {
+                    return;
+                }
+
+                output.Write("Custom[[");
+                output.Write(value, startIndex, characterCount);
+                output.Write("]]");
+            }
+
+            public override void Encode(TextWriter output, string value, int startIndex, int characterCount)
+            {
+                if (characterCount == 0)
+                {
+                    return;
+                }
+
+                output.Write("Custom[[");
+                output.Write(value.Substring(startIndex, characterCount));
+                output.Write("]]");
+            }
+
+            public override unsafe int FindFirstCharacterToEncode(char* text, int textLength) => -1;
+
+            public override unsafe bool TryEncodeUnicodeScalar(
+                int unicodeScalar,
+                char* buffer,
+                int bufferLength,
+                out int numberOfCharactersWritten)
+            {
+                numberOfCharactersWritten = 0;
+
+                return false;
+            }
+
+            public override bool WillEncode(int unicodeScalar) => false;
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/DefaultEncoderTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/DefaultEncoderTagHelper.cs
new file mode 100644
index 0000000000..6b85369587
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/DefaultEncoderTagHelper.cs
@@ -0,0 +1,26 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace TagHelpersWebSite.TagHelpers
+{
+    [HtmlTargetElement("pre")]
+    [HtmlTargetElement("inner")]
+    [OutputElementHint("pre")]
+    public class DefaultEncoderTagHelper : TagHelper
+    {
+        public override int Order => 2;
+
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            var defaultContent = await output.GetChildContentAsync();
+
+            output.Content
+                .SetHtmlContent("Default encoder: ")
+                .AppendHtml(defaultContent);
+            output.TagName = "pre";
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/DictionaryPrefixTestTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/DictionaryPrefixTestTagHelper.cs
new file mode 100644
index 0000000000..08b015a4fe
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/DictionaryPrefixTestTagHelper.cs
@@ -0,0 +1,33 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace TagHelpersWebSite.TagHelpers
+{
+    [HtmlTargetElement(Attributes = "prefix-*")]
+    public class DictionaryPrefixTestTagHelper : TagHelper
+    {
+        [HtmlAttributeName(DictionaryAttributePrefix = "prefix-")]
+        public IDictionary<string, ModelExpression> PrefixValues { get; set; } = new Dictionary<string, ModelExpression>();
+
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            var ulTag = new TagBuilder("ul");
+
+            foreach (var item in PrefixValues)
+            {
+                var liTag = new TagBuilder("li");
+                
+                liTag.InnerHtml.Append(item.Value.Name);
+
+                ulTag.InnerHtml.AppendHtml(liTag);
+            }
+
+            output.Content.SetHtmlContent(ulTag);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/NestedViewImportsTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/NestedViewImportsTagHelper.cs
new file mode 100644
index 0000000000..cd698b5f56
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/NestedViewImportsTagHelper.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace TagHelpersWebSite.TagHelpers
+{
+    [HtmlTargetElement("nested")]
+    public class NestedViewImportsTagHelper : TagHelper
+    {
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            output.Content.AppendHtml("nested-content");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/NullEncoderTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/NullEncoderTagHelper.cs
new file mode 100644
index 0000000000..adb62665e0
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/NullEncoderTagHelper.cs
@@ -0,0 +1,26 @@
+// 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.
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace TagHelpersWebSite.TagHelpers
+{
+    [HtmlTargetElement("pre")]
+    public class NullEncoderTagHelper : TagHelper
+    {
+        public override int Order => 3;
+
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            var nullContent = await output.GetChildContentAsync(NullHtmlEncoder.Default);
+
+            // Note this is very unsafe. Should always post-process content that may not be fully HTML encoded before
+            // writing it into a response. Here for example, could pass SetContent() a string and that would be
+            // HTML encoded later.
+            output.PostContent
+                .SetHtmlContent("<br />Null encoder: ")
+                .AppendHtml(nullContent);
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/PrettyTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/PrettyTagHelper.cs
new file mode 100644
index 0000000000..267e410199
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/PrettyTagHelper.cs
@@ -0,0 +1,60 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace TagHelpersWebSite.TagHelpers
+{
+    [HtmlTargetElement("*")]
+    public class PrettyTagHelper : TagHelper
+    {
+        private static readonly Dictionary<string, string> PrettyTagStyles =
+            new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "a", "background-color: gray;color: white;border-radius: 3px;"
+                    + "border: 1px solid black;padding: 3px;font-family: cursive;" },
+                { "strong", "font-size: 1.25em;text-decoration: underline;" },
+                { "h1", "font-family: cursive;" },
+                { "h3", "font-family: cursive;" }
+            };
+
+        public bool? MakePretty { get; set; }
+
+        public string Style { get; set; }
+
+        [ViewContext]
+        [HtmlAttributeNotBound]
+        public ViewContext ViewContext { get; set; }
+
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            if (MakePretty.HasValue && !MakePretty.Value)
+            {
+                return;
+            }
+
+            if (output.TagName == null)
+            {
+                // Another tag helper e.g. TagHelperviewComponentTagHelper has suppressed the start and end tags.
+                return;
+            }
+
+            string prettyStyle;
+
+            if (PrettyTagStyles.TryGetValue(output.TagName, out prettyStyle))
+            {
+                var style = Style ?? string.Empty;
+                if (!string.IsNullOrEmpty(style))
+                {
+                    style += ";";
+                }
+
+                output.Attributes.SetAttribute("style", style + prettyStyle);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/RootViewStartTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/RootViewStartTagHelper.cs
new file mode 100644
index 0000000000..664b66c733
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/RootViewStartTagHelper.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace TagHelpersWebSite.TagHelpers
+{
+    [HtmlTargetElement("root")]
+    public class RootViewStartTagHelper : TagHelper
+    {
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            output.Content.AppendHtml("root-content");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/SurroundTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/SurroundTagHelper.cs
new file mode 100644
index 0000000000..1679512dd6
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/SurroundTagHelper.cs
@@ -0,0 +1,30 @@
+// 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.
+
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace TagHelpersWebSite.TagHelpers
+{
+    [HtmlTargetElement(Attributes = nameof(Surround))]
+    public class SurroundTagHelper : TagHelper
+    {
+        public override int Order
+        {
+            get
+            {
+                // Run first
+                return int.MinValue;
+            }
+        }
+
+        public string Surround { get; set; }
+
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            var surroundingTagName = Surround.ToLowerInvariant();
+
+            output.PreElement.AppendHtml($"<{surroundingTagName}>");
+            output.PostElement.AppendHtml($"</{surroundingTagName}>");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/TagCloudViewComponentTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/TagCloudViewComponentTagHelper.cs
new file mode 100644
index 0000000000..50c86e7e25
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/TagCloudViewComponentTagHelper.cs
@@ -0,0 +1,89 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace MvcSample.Web.Components
+{
+    [HtmlTargetElement("tag-cloud")]
+    [ViewComponent(Name = "Tags")]
+    public class TagCloudViewComponentTagHelper : ITagHelper
+    {
+        private static readonly string[] Tags =
+            ("Lorem ipsum dolor sit amet consectetur adipisicing elit sed do eiusmod tempor incididunt ut labore et dolore magna aliqua" +
+             "Ut enim ad minim veniam quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat Duis aute irure " +
+             "dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur Excepteur sint occaecat cupidatat" +
+             "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum")
+                .Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries)
+                .ToArray();
+        private readonly HtmlEncoder _htmlEncoder;
+
+        public TagCloudViewComponentTagHelper(HtmlEncoder htmlEncoder)
+        {
+            _htmlEncoder = htmlEncoder;
+        }
+
+        public int Count { get; set; }
+
+        [HtmlAttributeNotBound]
+        [ViewContext]
+        public ViewContext ViewContext { get; set; }
+
+        public int Order { get; } = 0;
+
+        public void Init(TagHelperContext context)
+        {
+        }
+
+        public async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            var result = await InvokeAsync(Count);
+            var writer = new StringWriter();
+
+            var viewComponentDescriptor = new ViewComponentDescriptor()
+            {
+                TypeInfo = typeof(TagCloudViewComponentTagHelper).GetTypeInfo(),
+                ShortName = "TagCloudViewComponentTagHelper",
+                FullName = "TagCloudViewComponentTagHelper",
+            };
+
+            await result.ExecuteAsync(new ViewComponentContext(
+                viewComponentDescriptor,
+                new Dictionary<string, object>(),
+                _htmlEncoder,
+                ViewContext,
+                writer));
+
+            output.TagName = null;
+            output.Content.AppendHtml(writer.ToString());
+        }
+
+        public async Task<IViewComponentResult> InvokeAsync(int count)
+        {
+            var tags = await GetTagsAsync(count);
+
+            return new ContentViewComponentResult(string.Join(",", tags));
+        }
+
+        private Task<string[]> GetTagsAsync(int count)
+        {
+            return Task.FromResult(GetTags(count));
+        }
+
+        private string[] GetTags(int count)
+        {
+            return Tags.Take(count).ToArray();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/WebsiteInformationTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/WebsiteInformationTagHelper.cs
new file mode 100644
index 0000000000..b1a7ee7461
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/WebsiteInformationTagHelper.cs
@@ -0,0 +1,29 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using TagHelpersWebSite.Models;
+
+namespace TagHelpersWebSite.TagHelpers
+{
+    public class WebsiteInformationTagHelper : TagHelper
+    {
+        public WebsiteContext Info { get; set; }
+
+        public override void Process(TagHelperContext context, TagHelperOutput output)
+        {
+            output.TagName = "section";
+            output.PostContent.AppendHtml(string.Format(
+                "<p><strong>Version:</strong> {0}</p>" + Environment.NewLine +
+                "<p><strong>Copyright Year:</strong> {1}</p>" + Environment.NewLine +
+                "<p><strong>Approved:</strong> {2}</p>" + Environment.NewLine +
+                "<p><strong>Number of tags to show:</strong> {3}</p>" + Environment.NewLine,
+                Info.Version.ToString(),
+                Info.CopyrightYear.ToString(),
+                Info.Approved.ToString(),
+                Info.TagsToShow.ToString()));
+            output.TagMode = TagMode.StartTagAndEndTag;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj
new file mode 100644
index 0000000000..991903c25b
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/Create.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/Create.cshtml
new file mode 100644
index 0000000000..21aaa01baa
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/Create.cshtml
@@ -0,0 +1,84 @@
+@model TagHelpersWebSite.Models.Employee
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+@{
+    Layout = null;
+    Html.Html5DateRenderingMode = Html5DateRenderingMode.Rfc3339;
+}
+
+<!DOCTYPE html>
+
+
+<html>
+<head>
+    <meta name="viewport" content="width=device-width" />
+    <title>Create</title>
+</head>
+<body>
+
+    <form asp-antiforgery="false" asp-action="Create">
+
+        <div class="form-horizontal">
+            <h4>Employee</h4>
+            <hr />
+            <div asp-validation-summary="All" class="text-danger">
+            </div>
+            <div class="form-group">
+                <label asp-for="Age" class="control-label col-md-2"></label>
+                <div class="col-md-10">
+                    <input asp-for="Age" class="form-control" />
+                    <span asp-validation-for="Age"></span>
+                </div>
+            </div>
+            <div class="form-group">
+                <label asp-for="Email" class="control-label col-md-2"></label>
+                <div class="col-md-10">
+                    <input asp-for="Email" class="form-control" />
+                    <span asp-validation-for="Email"></span>
+                </div>
+            </div>
+            <input type="hidden" asp-for="EmployeeId" value="0" />
+            <div class="form-group">
+                <label asp-for="FullName" class="control-label col-md-2"></label>
+                <div class="col-md-10">
+                    <input asp-for="FullName" class="form-control" />
+                    <span asp-validation-for="FullName"></span>
+                </div>
+            </div>
+            <div class="form-group">
+                <label asp-for="Gender" class="control-label col-md-2"></label>
+                <div class="col-md-10">
+                    <input type="radio" asp-for="Gender" value="M" /> Male
+                    <input type="radio" asp-for="Gender" value="F" /> Female
+                    <span asp-validation-for="Gender"></span>
+                </div>
+            </div>
+            <div class="form-group">
+                <label asp-for="JoinDate" class="control-label col-md-2"></label>
+                <div class="col-md-10">
+                    <input asp-for="JoinDate" class="form-control" />
+                    <span asp-validation-for="JoinDate"></span>
+                </div>
+            </div>
+            <div class="form-group">
+                <label asp-for="Salary" class="control-label col-md-2"></label>
+                <div class="col-md-10">
+                    <input asp-for="Salary" class="form-control" />
+                    <span asp-validation-for="Salary"></span>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <div class="col-md-offset-2 col-md-10">
+                    <input type="submit" value="Create" class="btn btn-default" />
+                </div>
+            </div>
+        </div>
+    </form>
+
+    <div>
+        <a asp-action="Index">Back to List</a>
+    </div>
+</body>
+</html>
+
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/Details.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/Details.cshtml
new file mode 100644
index 0000000000..2393a00652
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/Details.cshtml
@@ -0,0 +1,63 @@
+@model TagHelpersWebSite.Models.Employee
+@{
+    Layout = null;
+}
+
+<!DOCTYPE html>
+
+<html>
+<head>
+    <meta name="viewport" content="width=device-width" />
+    <title>Details</title>
+</head>
+<body>
+
+
+<div>
+    <h4>Employee</h4>
+    <hr />
+    <dl class="dl-horizontal">
+        <dt>
+            @Html.DisplayNameFor(model => model.Age)
+        </dt>
+        <dd>
+            @Html.DisplayFor(model => model.Age)
+        </dd>
+        <dt>
+            @Html.DisplayNameFor(model => model.Email)
+        </dt>
+        <dd>
+            @Html.DisplayFor(model => model.Email)
+        </dd>
+        <dt>
+            @Html.DisplayNameFor(model => model.FullName)
+        </dt>
+        <dd>
+            @Html.DisplayFor(model => model.FullName)
+        </dd>
+        <dt>
+            @Html.DisplayNameFor(model => model.Gender)
+        </dt>
+        <dd>
+            @Html.DisplayFor(model => model.Gender)
+        </dd>
+        <dt>
+            @Html.DisplayNameFor(model => model.JoinDate)
+        </dt>
+        <dd>
+            @Html.DisplayFor(model => model.JoinDate)
+        </dd>
+        <dt>
+            @Html.DisplayNameFor(model => model.Salary)
+        </dt>
+        <dd>
+            @Html.DisplayFor(model => model.Salary)
+        </dd>
+    </dl>
+</div>
+<p>
+        @Html.ActionLink("Back to List", "Index")
+</p>
+</body>
+</html>
+
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/DuplicateAntiforgeryTokenRegistration.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/DuplicateAntiforgeryTokenRegistration.cshtml
new file mode 100644
index 0000000000..a5276bec3b
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/DuplicateAntiforgeryTokenRegistration.cshtml
@@ -0,0 +1,11 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@{
+    Layout = null;
+}
+<html>
+<body>
+    @*Form tag helper already registers antiforgery token. The Html helper call should be no-op*@
+    <form asp-antiforgery="true" asp-action="DuplicateAntiforgeryTokenRegistration">@Html.AntiForgeryToken()</form>
+</body>
+</html>
+
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/CustomEncoder.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/CustomEncoder.cshtml
new file mode 100644
index 0000000000..0f0981d9c2
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/CustomEncoder.cshtml
@@ -0,0 +1,9 @@
+@addTagHelper TagHelpersWebSite.TagHelpers.CustomEncoderTagHelper, TagHelpersWebSite
+
+@{
+    var count = 0;
+    var innerCount = 0;
+}
+
+<pre>@($"Outer knows <b>{ ++count } < 4</b>")
+<inner>@($"Inner knows <b>{ ++innerCount } < 4</b>")</inner></pre>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/Index.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/Index.cshtml
new file mode 100644
index 0000000000..41557a5e0e
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/Index.cshtml
@@ -0,0 +1,9 @@
+@addTagHelper TagHelpersWebSite.TagHelpers.DefaultEncoderTagHelper, TagHelpersWebSite
+
+@{
+    var count = 0;
+    var innerCount = 0;
+}
+
+<pre>@($"Outer knows <b>{ ++count } < 4</b>")
+<inner>@($"Inner knows <b>{ ++innerCount } < 4</b>")</inner></pre>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/NullEncoder.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/NullEncoder.cshtml
new file mode 100644
index 0000000000..f59fb838a1
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/NullEncoder.cshtml
@@ -0,0 +1,9 @@
+@addTagHelper TagHelpersWebSite.TagHelpers.NullEncoderTagHelper, TagHelpersWebSite
+
+@{
+    var count = 0;
+    var innerCount = 0;
+}
+
+<pre>@($"Outer knows <b>{ ++count } < 4</b>")
+<inner>@($"Inner knows <b>{ ++innerCount } < 4</b>")</inner></pre>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/ThreeEncoders.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/ThreeEncoders.cshtml
new file mode 100644
index 0000000000..ed91122d9c
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/ThreeEncoders.cshtml
@@ -0,0 +1,11 @@
+@addTagHelper TagHelpersWebSite.TagHelpers.CustomEncoderTagHelper, TagHelpersWebSite
+@addTagHelper TagHelpersWebSite.TagHelpers.DefaultEncoderTagHelper, TagHelpersWebSite
+@addTagHelper TagHelpersWebSite.TagHelpers.NullEncoderTagHelper, TagHelpersWebSite
+
+@{
+    var count = 0;
+    var innerCount = 0;
+}
+
+<pre>@($"Outer knows <b>{ ++count } < 4</b>")
+<inner>@($"Inner knows <b>{ ++innerCount } < 4</b>")</inner></pre>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/TwoEncoders.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/TwoEncoders.cshtml
new file mode 100644
index 0000000000..e51bcc22df
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/TwoEncoders.cshtml
@@ -0,0 +1,10 @@
+@addTagHelper TagHelpersWebSite.TagHelpers.CustomEncoderTagHelper, TagHelpersWebSite
+@addTagHelper TagHelpersWebSite.TagHelpers.NullEncoderTagHelper, TagHelpersWebSite
+
+@{
+    var count = 0;
+    var innerCount = 0;
+}
+
+<pre>@($"Outer knows <b>{ ++count } < 4</b>")
+<inner>@($"Inner knows <b>{ ++innerCount } < 4</b>")</inner></pre>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/_Layout.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/_Layout.cshtml
new file mode 100644
index 0000000000..eafd91c010
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/_Layout.cshtml
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>@ViewData["Title"] - My MVC 6 Application</title>
+    </head>
+    <body>
+        <h1>MVC 6 - @ViewData["Title"]</h1>
+        <div>
+            @RenderBody()
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/_ViewImports.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/_ViewImports.cshtml
new file mode 100644
index 0000000000..56ab7d9860
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/_ViewImports.cshtml
@@ -0,0 +1 @@
+@removeTagHelper "TagHelpersWebSite.TagHelpers.RootViewStartTagHelper, TagHelpersWebSite"
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/_ViewStart.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/_ViewStart.cshtml
new file mode 100644
index 0000000000..935cd49e4d
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout.cshtml";
+}
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/About.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/About.cshtml
new file mode 100644
index 0000000000..b9f5f93f26
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/About.cshtml
@@ -0,0 +1,19 @@
+@using TagHelpersWebSite.Models
+
+@{
+    ViewBag.Title = "About";
+}
+
+@addTagHelper TagHelpersWebSite.TagHelpers.ATagHelper, TagHelpersWebSite
+@addTagHelper TagHelpersWebSite.TagHelpers.WebsiteInformationTagHelper, TagHelpersWebSite
+
+<div>
+    <p>Hello, you've reached the about page.</p>
+
+    <h3>Information about our website (outdated):</h3>
+    <website-information info="new WebsiteContext {
+                                    Version = new Version(1, 1),
+                                    CopyrightYear = 1990,
+                                    Approved = true,
+                                    TagsToShow = 30 }"/>
+</div>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/Help.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/Help.cshtml
new file mode 100644
index 0000000000..4b4f0e5b1e
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/Help.cshtml
@@ -0,0 +1,9 @@
+@{
+    ViewBag.Title = "Help";
+}
+
+@addTagHelper TagHelpersWebSite.TagHelpers.ATagHelper, TagHelpersWebSite
+
+<div>
+    <p>Hello, you've reached the help page. If you're having troubles try visiting our <a controller="home" action="index" approved="true">Approved Home Page</a></p>
+</div>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml
new file mode 100644
index 0000000000..77699bd939
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml
@@ -0,0 +1,52 @@
+@using TagHelpersWebSite.Models
+@using Microsoft.AspNetCore.Mvc.Razor
+
+@model WebsiteContext
+@{
+    ViewBag.Title = "Home Page";
+}
+
+@addTagHelper *, TagHelpersWebSite
+
+@section css {
+    <style condition="!Model.Approved">
+        h1 {
+            color:red;
+            font-size:2em;
+        }
+    </style>
+}
+
+@functions {
+    public void RenderTemplate(string title, Func<string, HelperResult> template)
+    {
+        Output.WriteLine("<br /><p><em>Rendering Template:</em></p>");
+        var helperResult = template(title);
+        helperResult.WriteTo(Output, HtmlEncoder);
+    }
+}
+
+<div condition="!Model.Approved">
+    <p>This website has <strong surround="em">not</strong> been approved yet. Visit www.contoso.com for <strong make-pretty="false">more</strong> information.</p>
+</div>
+
+<div>
+    <h3>Current Tag Cloud from Tag Helper</h3>
+    <tag-cloud count="Model.TagsToShow" surround="div" />
+    <h3>Current Tag Cloud from ViewComponentHelper:</h3>
+    <section bold>@await Component.InvokeAsync("Tags", new { count = 15 })</section>
+    @{
+        RenderTemplate(
+            "Tag Cloud from Template: ",
+            @<div condition="true"><h3>@item</h3><tag-cloud count="Model.TagsToShow"></tag-cloud></div>);
+    }
+</div>
+
+<div>
+    <h3>Dictionary Valued Model Expression</h3>
+    <div prefix-test1="@Model.TagsToShow" prefix-test2="@Model.Version.Build"></div>
+</div>
+
+@section footerContent {
+    <p condition="Model.Approved" bold surround="section">&copy; @Model.CopyrightYear - My ASP.NET Application</p>
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/NestedViewImportsTagHelper.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/NestedViewImportsTagHelper.cshtml
new file mode 100644
index 0000000000..4cd66079c4
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/NestedViewImportsTagHelper.cshtml
@@ -0,0 +1,7 @@
+@{
+    Layout = null;
+}
+<root></root>
+
+
+<nested>some-content</nested>
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/UnboundDynamicAttributes.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/UnboundDynamicAttributes.cshtml
new file mode 100644
index 0000000000..ef539f06f2
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/UnboundDynamicAttributes.cshtml
@@ -0,0 +1,32 @@
+@addTagHelper TagHelpersWebSite.TagHelpers.AddProcessedAttributeTagHelper, TagHelpersWebSite
+
+@{
+    Layout = null;
+    var trueVar = true;
+    var falseVar = false;
+    var stringVar = "value";
+    string nullVar = null;
+}
+
+@functions {
+    public Task DoSomething()
+    {
+        return Task.FromResult(true);
+    }
+}
+
+<input checked="@true" />
+<input checked="@trueVar" />
+<input checked="@false" />
+<input checked="@falseVar" />
+<input checked="  @true    " />
+<input checked="  @falseVar    " />
+<input checked="    @stringVar: @trueVar   " />
+<input checked="    value: @false   " />
+<input checked="@true @trueVar" />
+<input checked="   @falseVar  @true" />
+<input checked="@null" />
+<input checked="  @nullVar" />
+<input checked="@nullVar   " />
+<input checked="  @null @stringVar @trueVar" />
+<input checked=" @if (trueVar) { <text>True</text> } else { await DoSomething(); <text>False</text> } " />
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/ViewComponentTagHelpers.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/ViewComponentTagHelpers.cshtml
new file mode 100644
index 0000000000..96bf087a91
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/ViewComponentTagHelpers.cshtml
@@ -0,0 +1,14 @@
+@addTagHelper "*, TagHelpersWebSite"
+@{ 
+    var year = 2016;
+    var dict = new Dictionary<string, List<string>>();
+    var items = new List<string>() { "One", "Two", "Three" };
+    dict.Add("Foo", items);
+}
+
+<vc:generic items="dict"></vc:generic>
+<vc:generic items-foo="items"></vc:generic>
+<vc:dan jacket-color="Green" /><br />
+<div>
+    <vc:copyright website="example.com" year="year" bold></vc:copyright>
+</div>
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/_ViewImports.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/_ViewImports.cshtml
new file mode 100644
index 0000000000..5157f4f3dd
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/_ViewImports.cshtml
@@ -0,0 +1 @@
+@addTagHelper TagHelpersWebSite.TagHelpers.NestedViewImportsTagHelper, TagHelpersWebSite
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/InheritedTagHelperPrefix.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/InheritedTagHelperPrefix.cshtml
new file mode 100644
index 0000000000..21ff61e361
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/InheritedTagHelperPrefix.cshtml
@@ -0,0 +1 @@
+page:<inherited:root></inherited:root>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/NestedInheritedTagHelperPrefix.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/NestedInheritedTagHelperPrefix.cshtml
new file mode 100644
index 0000000000..07283a4937
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/NestedInheritedTagHelperPrefix.cshtml
@@ -0,0 +1 @@
+page:<nested-root></nested-root>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/NestedOverriddenTagHelperPrefix.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/NestedOverriddenTagHelperPrefix.cshtml
new file mode 100644
index 0000000000..c6d6ecbdfc
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/NestedOverriddenTagHelperPrefix.cshtml
@@ -0,0 +1,3 @@
+@tagHelperPrefix nested-overridden
+
+page:<nested-overriddenroot></nested-overriddenroot>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/_ViewImports.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/_ViewImports.cshtml
new file mode 100644
index 0000000000..c273ccd02c
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/_ViewImports.cshtml
@@ -0,0 +1 @@
+@tagHelperPrefix nested-
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/OverriddenTagHelperPrefix.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/OverriddenTagHelperPrefix.cshtml
new file mode 100644
index 0000000000..8a821d9508
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/OverriddenTagHelperPrefix.cshtml
@@ -0,0 +1,3 @@
+@tagHelperPrefix overridden
+
+page:<overriddenroot></overriddenroot>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/_ViewImports.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/_ViewImports.cshtml
new file mode 100644
index 0000000000..05649c4c1c
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/_ViewImports.cshtml
@@ -0,0 +1 @@
+@tagHelperPrefix inherited:
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/_ViewStart.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/_ViewStart.cshtml
new file mode 100644
index 0000000000..da1c3b0b5d
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{ 
+    Layout = "~/Views/Shared/_LayoutWithRootTagHelper.cshtml";
+}
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveDefaultInheritedTagHelpers/Index.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveDefaultInheritedTagHelpers/Index.cshtml
new file mode 100644
index 0000000000..efd3d4337a
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveDefaultInheritedTagHelpers/Index.cshtml
@@ -0,0 +1,4 @@
+@{ 
+    Layout = null;
+}
+<a href="~/VirtualPath">Virtual path</a>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveDefaultInheritedTagHelpers/_ViewImports.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveDefaultInheritedTagHelpers/_ViewImports.cshtml
new file mode 100644
index 0000000000..f6cd3d1848
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveDefaultInheritedTagHelpers/_ViewImports.cshtml
@@ -0,0 +1 @@
+@removeTagHelper *, Microsoft.AspNetCore.Mvc.Razor
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveInheritedTagHelpers/ViewWithInheritedRemoveTagHelper.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveInheritedTagHelpers/ViewWithInheritedRemoveTagHelper.cshtml
new file mode 100644
index 0000000000..fd0848f854
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveInheritedTagHelpers/ViewWithInheritedRemoveTagHelper.cshtml
@@ -0,0 +1,2 @@
+page:<root/>
+<nested>some-content</nested>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveInheritedTagHelpers/_ViewImports.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveInheritedTagHelpers/_ViewImports.cshtml
new file mode 100644
index 0000000000..7dfd54d0b2
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveInheritedTagHelpers/_ViewImports.cshtml
@@ -0,0 +1,2 @@
+@removeTagHelper TagHelpersWebSite.TagHelpers.RootViewStartTagHelper, TagHelpersWebSite
+@addTagHelper TagHelpersWebSite.TagHelpers.NestedViewImportsTagHelper, TagHelpersWebSite
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveInheritedTagHelpers/_ViewStart.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveInheritedTagHelpers/_ViewStart.cshtml
new file mode 100644
index 0000000000..da1c3b0b5d
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveInheritedTagHelpers/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{ 
+    Layout = "~/Views/Shared/_LayoutWithRootTagHelper.cshtml";
+}
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/Components/Copyright/Default.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/Components/Copyright/Default.cshtml
new file mode 100644
index 0000000000..45245d5d3c
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/Components/Copyright/Default.cshtml
@@ -0,0 +1,2 @@
+@model Dictionary<string, object>
+<footer>Copyright @Model["year"] @Model["website"]</footer>
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/Components/Dan/Default.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/Components/Dan/Default.cshtml
new file mode 100644
index 0000000000..b9e536824f
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/Components/Dan/Default.cshtml
@@ -0,0 +1,4 @@
+@model string
+<div id="ascii" style="font-family:Courier New, Courier, monospace; font-size: 6px">
+    @Html.Raw(Model)
+</div>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/Components/Generic/Default.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/Components/Generic/Default.cshtml
new file mode 100644
index 0000000000..da3df2e9a5
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/Components/Generic/Default.cshtml
@@ -0,0 +1,12 @@
+@model Dictionary<string, List<string>>
+<div>Items: </div>
+<div>
+    @foreach (var item in Model)
+    {
+        <strong>@item.Key</strong><br/>
+        @foreach (var value in Model[item.Key])
+        {
+            <span>@value</span>
+        }
+    }
+</div>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/ViewWithLayoutAndNestedTagHelper.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/ViewWithLayoutAndNestedTagHelper.cshtml
new file mode 100644
index 0000000000..d05ccee013
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/ViewWithLayoutAndNestedTagHelper.cshtml
@@ -0,0 +1,5 @@
+@{
+    Layout = "~/Views/Shared/_LayoutWithRootTagHelper.cshtml";
+}
+@addTagHelper TagHelpersWebSite.TagHelpers.NestedViewImportsTagHelper, TagHelpersWebSite
+<nested>some-content</nested>
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/_Layout.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/_Layout.cshtml
new file mode 100644
index 0000000000..cd1b0ecfd8
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/_Layout.cshtml
@@ -0,0 +1,28 @@
+@using TagHelpersWebSite.Controllers
+
+@addTagHelper TagHelpersWebSite.TagHelpers.ATagHelper, TagHelpersWebSite
+@addTagHelper TagHelpersWebSite.TagHelpers.PrettyTagHelper, TagHelpersWebSite
+
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewBag.Title - My ASP.NET Application</title>
+
+    @RenderSection("css", required: false)
+</head>
+<body>
+    <h1>ASP.NET vNext - @ViewBag.Title</h1>
+    <p>| <a controller="home" action="index">Home</a>
+       | <a controller="home" action="about">About</a> 
+       | <a controller="home" action="help">Help</a> |</p>
+    <div>
+        @RenderBody()
+        <hr />
+        <footer>
+            @RenderSection("footerContent", required: false)
+        </footer>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/_LayoutWithRootTagHelper.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/_LayoutWithRootTagHelper.cshtml
new file mode 100644
index 0000000000..33557a59fe
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/_LayoutWithRootTagHelper.cshtml
@@ -0,0 +1,2 @@
+layout:<root></root>
+@RenderBody()
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/_ViewImports.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..6a43b21aa3
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/_ViewImports.cshtml
@@ -0,0 +1 @@
+@addTagHelper TagHelpersWebSite.TagHelpers.RootViewStartTagHelper, TagHelpersWebSite
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/_ViewStart.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/_ViewStart.cshtml
new file mode 100644
index 0000000000..c4284f6c20
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "/Views/Shared/_Layout.cshtml";
+}
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/readme.md b/src/Mvc/test/WebSites/TagHelpersWebSite/readme.md
new file mode 100644
index 0000000000..d4050ec9a0
--- /dev/null
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/readme.md
@@ -0,0 +1,4 @@
+TagHelpersWebSite
+===
+
+This web site illustrates how to register and use custom tag helpers.
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/Controllers/AddressController.cs b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/AddressController.cs
new file mode 100644
index 0000000000..245699dfa8
--- /dev/null
+++ b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/AddressController.cs
@@ -0,0 +1,48 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace VersioningWebSite
+{
+    // Scenario
+    // Same template disjoint version sets.
+    // Same template overlapping version sets disambiguated by order.
+    public class AddressController : Controller
+    {
+        private TestResponseGenerator _generator;
+
+        public AddressController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        [VersionRoute("api/Addresses", versionRange: "[1]")]
+        public IActionResult GetV1()
+        {
+            return _generator.Generate("api/addresses");
+        }
+
+        [VersionRoute("api/Addresses", versionRange: "[2]")]
+        public IActionResult GetV2()
+        {
+            return _generator.Generate("api/addresses");
+        }
+
+        [VersionRoute("api/addresses/all", versionRange: "[1]")]
+        public IActionResult GetAllV1(string version)
+        {
+            return _generator.Generate(
+                Url.Action("GetAllV1",
+                new { version = version }), Url.RouteUrl(new { version = version }));
+        }
+
+        [VersionRoute("api/addresses/all", versionRange: "[1-2]", Order = 1)]
+        public IActionResult GetAllV2(string version)
+        {
+            return _generator.Generate(
+                Url.Action("GetAllV2", new { version = version }),
+                Url.RouteUrl(new { version = version }));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/Controllers/BooksController.cs b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/BooksController.cs
new file mode 100644
index 0000000000..098ecbb198
--- /dev/null
+++ b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/BooksController.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace VersioningWebSite
+{
+    // Scenario
+    // Actions define version ranges and some
+    // versions overlap.
+    public class BooksController : Controller
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public BooksController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        [VersionGet("Books", versionRange: "[1-6]", Order = 1)]
+        public IActionResult Get()
+        {
+            return _generator.Generate();
+        }
+
+        [VersionGet("Books", versionRange: "[3-5]", Order = 0)]
+        public IActionResult GetBreakingChange()
+        {
+            return _generator.Generate();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/Controllers/CustomersController.cs b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/CustomersController.cs
new file mode 100644
index 0000000000..37c32ea9c5
--- /dev/null
+++ b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/CustomersController.cs
@@ -0,0 +1,60 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+
+namespace VersioningWebSite
+{
+    // Scenario:
+    // Version constraint provided separately from the attribute route.
+    [Route("Customers")]
+    public class CustomersController
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public CustomersController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        [HttpGet("{id}")]
+        [Version(MaxVersion = 2)]
+        public IActionResult Get(int id)
+        {
+            return _generator.Generate();
+        }
+
+        [HttpGet("{id}")]
+        [Version(MinVersion = 3, MaxVersion = 5)]
+        public IActionResult GetV3ToV5(int id)
+        {
+            return _generator.Generate();
+        }
+
+        [Version(MinVersion = 2)]
+        public IActionResult AnyV2OrHigher()
+        {
+            return _generator.Generate();
+        }
+
+        [HttpPost]
+        public IActionResult Post()
+        {
+            return _generator.Generate();
+        }
+
+        [Version(MinVersion = 2, Order = int.MaxValue)]
+        [Route("{id}")]
+        public IActionResult AnyV2OrHigherWithId()
+        {
+            return _generator.Generate();
+        }
+
+        [HttpDelete("{id}")]
+        public IActionResult Delete()
+        {
+            return _generator.Generate();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/Controllers/ItemsController.cs b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/ItemsController.cs
new file mode 100644
index 0000000000..1e61957273
--- /dev/null
+++ b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/ItemsController.cs
@@ -0,0 +1,51 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace VersioningWebSite
+{
+    // Scenario:
+    // Controller without any kind of specific version handling.
+    // New versions of the API will be exposed in a different controller.
+    [Route("Items/{id}")]
+    public class ItemsController : Controller
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public ItemsController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        [HttpGet("/Items")]
+        public IActionResult Get()
+        {
+            return _generator.Generate();
+        }
+
+        [HttpGet]
+        public IActionResult Get(int id)
+        {
+            return _generator.Generate();
+        }
+
+        [HttpPost("/Items")]
+        public IActionResult Post()
+        {
+            return _generator.Generate();
+        }
+
+        [HttpPut]
+        public IActionResult Put(int id)
+        {
+            return _generator.Generate();
+        }
+
+        [HttpDelete]
+        public IActionResult Delete(int id)
+        {
+            return _generator.Generate();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/Controllers/ItemsV2Controller.cs b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/ItemsV2Controller.cs
new file mode 100644
index 0000000000..d5345a2f47
--- /dev/null
+++ b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/ItemsV2Controller.cs
@@ -0,0 +1,49 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace VersioningWebSite
+{
+    // This is the version 2 for an API. The version 1 is unconstrained
+    [VersionRoute("Items/{id}", versionRange: "2")]
+    public class ItemsV2Controller : Controller
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public ItemsV2Controller(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        [VersionGet("/Items", versionRange: "2")]
+        public IActionResult Get()
+        {
+            return _generator.Generate();
+        }
+
+        [HttpGet]
+        public IActionResult Get(int id)
+        {
+            return _generator.Generate();
+        }
+
+        [VersionPost("/Items", versionRange: "2")]
+        public IActionResult Post()
+        {
+            return _generator.Generate();
+        }
+
+        [HttpPut]
+        public IActionResult Put(int id)
+        {
+            return _generator.Generate();
+        }
+
+        [HttpDelete]
+        public IActionResult Delete(int id)
+        {
+            return _generator.Generate();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/Controllers/MoviesController.cs b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/MoviesController.cs
new file mode 100644
index 0000000000..50cddab665
--- /dev/null
+++ b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/MoviesController.cs
@@ -0,0 +1,53 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace VersioningWebSite
+{
+    // Scenario:
+    // This is a controller for the V1 (unconstrained) version
+    // of the service. The v2 version will be in a controller
+    // that contains only actions for which the api surface
+    // changes. Actions for which V1 and V2 have the same
+    // API surface.
+    public class MoviesController : Controller
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public MoviesController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        [HttpGet("Movies")]
+        public IActionResult Get()
+        {
+            return _generator.Generate();
+        }
+
+        [HttpGet("Movies/{id}")]
+        public IActionResult GetById(int id)
+        {
+            return _generator.Generate();
+        }
+
+        [HttpPost("/Movies")]
+        public IActionResult Post()
+        {
+            return _generator.Generate();
+        }
+
+        [HttpPut("Movies/{id}")]
+        public IActionResult Put(int id)
+        {
+            return _generator.Generate();
+        }
+
+        [HttpDelete("Movies/{id}")]
+        public IActionResult Delete(int id)
+        {
+            return _generator.Generate();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/Controllers/MoviesV2Controller.cs b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/MoviesV2Controller.cs
new file mode 100644
index 0000000000..ab9779d633
--- /dev/null
+++ b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/MoviesV2Controller.cs
@@ -0,0 +1,23 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace VersioningWebSite
+{
+    public class MoviesV2Controller : Controller
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public MoviesV2Controller(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        [VersionPut("Movies/{id}", versionRange: "2")]
+        public IActionResult Put(int id)
+        {
+            return _generator.Generate();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/Controllers/PetsController.cs b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/PetsController.cs
new file mode 100644
index 0000000000..002a3356ae
--- /dev/null
+++ b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/PetsController.cs
@@ -0,0 +1,50 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace VersioningWebSite
+{
+    // Scenario
+    // The version is in the path of the URL
+    public class PetsController : Controller
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public PetsController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        [HttpGet("v1/Pets")]
+        [HttpGet("v2/Pets")]
+        public IActionResult Get()
+        {
+            return _generator.Generate();
+        }
+
+        [HttpGet("v1/Pets/{id}")]
+        public IActionResult GetV1(int id)
+        {
+            return _generator.Generate();
+        }
+
+        [HttpGet("v2/Pets/{id}")]
+        public IActionResult GetV2(int id)
+        {
+            return _generator.Generate();
+        }
+
+        [HttpPost("v1/Pets")]
+        public IActionResult PostV1()
+        {
+            return _generator.Generate();
+        }
+
+        [HttpPost("v{version:Min(2)}/Pets")]
+        public IActionResult PostV2()
+        {
+            return _generator.Generate();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/Controllers/TicketsController.cs b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/TicketsController.cs
new file mode 100644
index 0000000000..843de3f33d
--- /dev/null
+++ b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/TicketsController.cs
@@ -0,0 +1,50 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace VersioningWebSite
+{
+    // Scenario
+    // V1 of the API is read-only and unconstrained
+    // V2 of the API is constrained
+    public class TicketsController : Controller
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public TicketsController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        [HttpGet("/Tickets")]
+        public IActionResult Get()
+        {
+            return _generator.Generate();
+        }
+
+        [HttpGet("/Tickets/{id}")]
+        public IActionResult GetById(int id)
+        {
+            return _generator.Generate();
+        }
+
+        [VersionPost("/Tickets", versionRange: "2")]
+        public IActionResult Post()
+        {
+            return _generator.Generate();
+        }
+
+        [VersionPut("/Tickets/{id}", versionRange: "2")]
+        public IActionResult Put(int id)
+        {
+            return _generator.Generate();
+        }
+
+        [VersionDelete("/Tickets/{id}", versionRange: "2")]
+        public IActionResult Delete(int id)
+        {
+            return _generator.Generate();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/Controllers/VouchersController.cs b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/VouchersController.cs
new file mode 100644
index 0000000000..f2b5fa7ff2
--- /dev/null
+++ b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/VouchersController.cs
@@ -0,0 +1,25 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace VersioningWebSite
+{
+    public class VouchersController : Controller
+    {
+        private readonly TestResponseGenerator _generator;
+
+        public VouchersController(TestResponseGenerator generator)
+        {
+            _generator = generator;
+        }
+
+        // We are verifying that the right constraint gets applied along the route.
+        [VersionGet("1/Vouchers", versionRange: "[1]", Name = "V1")]
+        [VersionGet("2/Vouchers", versionRange: "[2]", Name = "V2")]
+        public IActionResult GetVouchersMultipleVersions(string version)
+        {
+            return _generator.Generate(Url.RouteUrl("V" + version, new { version = version }));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/Startup.cs b/src/Mvc/test/WebSites/VersioningWebSite/Startup.cs
new file mode 100644
index 0000000000..cdf090a0a6
--- /dev/null
+++ b/src/Mvc/test/WebSites/VersioningWebSite/Startup.cs
@@ -0,0 +1,44 @@
+// 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.
+
+using System.IO;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace VersioningWebSite
+{
+    public class Startup
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            // Add MVC services to the services container
+            services.AddMvc();
+
+            services.AddScoped<TestResponseGenerator>();
+            services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseMvcWithDefaultRoute();
+        }
+
+        public static void Main(string[] args)
+        {
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
+            host.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            new WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseStartup<Startup>()
+                .UseKestrel()
+                .UseIISIntegration();
+    }
+}
+
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/TestResponseGenerator.cs b/src/Mvc/test/WebSites/VersioningWebSite/TestResponseGenerator.cs
new file mode 100644
index 0000000000..d9ff985c34
--- /dev/null
+++ b/src/Mvc/test/WebSites/VersioningWebSite/TestResponseGenerator.cs
@@ -0,0 +1,66 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace VersioningWebSite
+{
+    // Generates a response based on the expected URL and action context
+    public class TestResponseGenerator
+    {
+        private readonly ActionContext _actionContext;
+
+        public TestResponseGenerator(IActionContextAccessor contextAccessor)
+        {
+            _actionContext = contextAccessor.ActionContext;
+            if (_actionContext == null)
+            {
+                throw new InvalidOperationException("ActionContext should not be null here.");
+            }
+        }
+
+        public JsonResult Generate(params string[] expectedUrls)
+        {
+            var link = (string)null;
+            var query = _actionContext.HttpContext.Request.Query;
+            if (query.ContainsKey("link"))
+            {
+                var values = query
+                    .Where(kvp => kvp.Key != "link" && kvp.Key != "link_action" && kvp.Key != "link_controller")
+                    .ToDictionary(kvp => kvp.Key.Substring("link_".Length), kvp => (object)kvp.Value[0]);
+
+                var urlHelper = GetUrlHelper(_actionContext);
+                link = urlHelper.Action(query["link_action"], query["link_controller"], values);
+            }
+
+            var attributeRoutingInfo = _actionContext.ActionDescriptor.AttributeRouteInfo;
+
+            return new JsonResult(new
+            {
+                expectedUrls = expectedUrls,
+                actualUrl = _actionContext.HttpContext.Request.Path.Value,
+                routeName = attributeRoutingInfo == null ? null : attributeRoutingInfo.Name,
+                routeValues = new Dictionary<string, object>(_actionContext.RouteData.Values),
+
+                action = ((ControllerActionDescriptor)_actionContext.ActionDescriptor).ActionName,
+                controller = ((ControllerActionDescriptor)_actionContext.ActionDescriptor).ControllerName,
+
+                link,
+            });
+        }
+
+        private IUrlHelper GetUrlHelper(ActionContext context)
+        {
+            var services = context.HttpContext.RequestServices;
+            var urlHelper = services.GetRequiredService<IUrlHelperFactory>().GetUrlHelper(context);
+            return urlHelper;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/VersionAttribute.cs b/src/Mvc/test/WebSites/VersioningWebSite/VersionAttribute.cs
new file mode 100644
index 0000000000..e1658fd8b6
--- /dev/null
+++ b/src/Mvc/test/WebSites/VersioningWebSite/VersionAttribute.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+
+namespace VersioningWebSite
+{
+    public class VersionAttribute : Attribute, IActionConstraintFactory
+    {
+        private int? _maxVersion;
+        private int? _minVersion;
+        private int? _order;
+
+        public int MinVersion
+        {
+            get { return _minVersion ?? -1; }
+            set { _minVersion = value; }
+        }
+
+        public int MaxVersion
+        {
+            get { return _maxVersion ?? -1; }
+            set { _maxVersion = value; }
+        }
+
+        public int Order
+        {
+            get { return _order ?? -1; }
+            set { _order = value; }
+        }
+
+        public bool IsReusable => true;
+
+        public IActionConstraint CreateInstance(IServiceProvider services)
+        {
+            return new VersionRangeValidator(_minVersion, _maxVersion) { Order = _order ?? 0 };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/VersionDeleteAttribute.cs b/src/Mvc/test/WebSites/VersioningWebSite/VersionDeleteAttribute.cs
new file mode 100644
index 0000000000..822e281547
--- /dev/null
+++ b/src/Mvc/test/WebSites/VersioningWebSite/VersionDeleteAttribute.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace VersioningWebSite
+{
+    public class VersionDeleteAttribute : VersionRoute, IActionHttpMethodProvider
+    {
+        public VersionDeleteAttribute(string template)
+            : base(template)
+        {
+        }
+
+        public VersionDeleteAttribute(string template, string versionRange)
+            : base(template, versionRange)
+        {
+        }
+
+        private readonly IEnumerable<string> _httpMethods = new[] { "DELETE" };
+
+        public IEnumerable<string> HttpMethods
+        {
+            get
+            {
+                return _httpMethods;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/VersionGetAttribute.cs b/src/Mvc/test/WebSites/VersioningWebSite/VersionGetAttribute.cs
new file mode 100644
index 0000000000..4e53537130
--- /dev/null
+++ b/src/Mvc/test/WebSites/VersioningWebSite/VersionGetAttribute.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace VersioningWebSite
+{
+    public class VersionGetAttribute : VersionRoute, IActionHttpMethodProvider
+    {
+        public VersionGetAttribute(string template)
+            : base(template)
+        {
+        }
+
+        public VersionGetAttribute(string template, string versionRange)
+            : base(template, versionRange)
+        {
+        }
+
+        private readonly IEnumerable<string> _httpMethods = new[] { "GET" };
+
+        public IEnumerable<string> HttpMethods
+        {
+            get
+            {
+                return _httpMethods;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/VersionPostAttribute.cs b/src/Mvc/test/WebSites/VersioningWebSite/VersionPostAttribute.cs
new file mode 100644
index 0000000000..18db5eb210
--- /dev/null
+++ b/src/Mvc/test/WebSites/VersioningWebSite/VersionPostAttribute.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace VersioningWebSite
+{
+    public class VersionPostAttribute : VersionRoute, IActionHttpMethodProvider
+    {
+        public VersionPostAttribute(string template)
+            : base(template)
+        {
+        }
+
+        public VersionPostAttribute(string template, string versionRange)
+            : base(template, versionRange)
+        {
+        }
+
+        private readonly IEnumerable<string> _httpMethods = new[] { "POST" };
+
+        public IEnumerable<string> HttpMethods
+        {
+            get
+            {
+                return _httpMethods;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/VersionPutAttribute.cs b/src/Mvc/test/WebSites/VersioningWebSite/VersionPutAttribute.cs
new file mode 100644
index 0000000000..49d4dab380
--- /dev/null
+++ b/src/Mvc/test/WebSites/VersioningWebSite/VersionPutAttribute.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace VersioningWebSite
+{
+    public class VersionPutAttribute : VersionRoute, IActionHttpMethodProvider
+    {
+        public VersionPutAttribute(string template)
+            : base(template)
+        {
+        }
+
+        public VersionPutAttribute(string template, string versionRange)
+            : base(template, versionRange)
+        {
+        }
+
+        private readonly IEnumerable<string> _httpMethods = new[] { "PUT" };
+
+        public IEnumerable<string> HttpMethods
+        {
+            get
+            {
+                return _httpMethods;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/VersionRangeValidator.cs b/src/Mvc/test/WebSites/VersioningWebSite/VersionRangeValidator.cs
new file mode 100644
index 0000000000..14c8d37662
--- /dev/null
+++ b/src/Mvc/test/WebSites/VersioningWebSite/VersionRangeValidator.cs
@@ -0,0 +1,41 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+
+namespace VersioningWebSite
+{
+    public class VersionRangeValidator : IActionConstraint
+    {
+        private readonly int? _minVersion;
+        private readonly int? _maxVersion;
+
+        public int Order { get; set; }
+
+        public VersionRangeValidator(int? minVersion, int? maxVersion)
+        {
+            _minVersion = minVersion;
+            _maxVersion = maxVersion;
+        }
+
+        public static string GetVersion(HttpRequest request)
+        {
+            return request.Query["version"];
+        }
+
+        public bool Accept(ActionConstraintContext context)
+        {
+            int version;
+            if (int.TryParse(GetVersion(context.RouteContext.HttpContext.Request), out version))
+            {
+                return (_minVersion == null || _minVersion <= version) &&
+                    (_maxVersion == null || _maxVersion >= version);
+            }
+            else
+            {
+                return false;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/VersionRoute.cs b/src/Mvc/test/WebSites/VersioningWebSite/VersionRoute.cs
new file mode 100644
index 0000000000..3b6f61c429
--- /dev/null
+++ b/src/Mvc/test/WebSites/VersioningWebSite/VersionRoute.cs
@@ -0,0 +1,130 @@
+// 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.
+
+using System;
+using System.Text.RegularExpressions;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
+
+namespace VersioningWebSite
+{
+    public class VersionRoute : RouteAttribute, IActionConstraintFactory
+    {
+        private readonly IActionConstraint _constraint;
+
+        // 5
+        // [5]
+        // (5)
+        // (5]
+        // [5)
+        // (3-5)
+        // (3-5]
+        // [3-5)
+        // [3-5]
+        // [35-56]
+        // Parses the above version formats and captures lb (lower bound), range, and hb (higher bound)
+        // We filter out (5), (5], [5) manually after we do the parsing.
+        private static readonly Regex _versionParser = new Regex(@"^(?<lb>[\(\[])?(?<range>\d+(-\d+)?)(?<hb>[\)\]])?$");
+
+        public bool IsReusable => true;
+
+        public VersionRoute(string template)
+            : base(template)
+        {
+        }
+
+        public VersionRoute(string template, string versionRange)
+            : base(template)
+        {
+            var constraint = CreateVersionConstraint(versionRange);
+
+            if (constraint == null)
+            {
+                var message = string.Format("Invalid version format: {0}", versionRange);
+                throw new ArgumentException(message, "versionRange");
+            }
+
+            _constraint = constraint;
+        }
+
+        private static IActionConstraint CreateVersionConstraint(string versionRange)
+        {
+            var match = _versionParser.Match(versionRange);
+
+            if (!match.Success)
+            {
+                return null;
+            }
+
+            var lowerBound = match.Groups["lb"].Value;
+            var higherBound = match.Groups["hb"].Value;
+            var range = match.Groups["range"].Value;
+
+            var rangeValues = range.Split('-');
+            if (rangeValues.Length == 1)
+            {
+                return GetSingleVersionOrUnboundedHigherVersionConstraint(lowerBound, higherBound, rangeValues);
+            }
+            else
+            {
+                return GetBoundedRangeVersionConstraint(lowerBound, higherBound, rangeValues);
+            }
+        }
+
+        private static IActionConstraint GetBoundedRangeVersionConstraint(
+            string lowerBound,
+            string higherBound,
+            string[] rangeValues)
+        {
+            // [3-5, (3-5, 3-5], 3-5), 3-5 are not valid
+            if (string.IsNullOrEmpty(lowerBound) || string.IsNullOrEmpty(higherBound))
+            {
+                return null;
+            }
+
+            var minVersion = int.Parse(rangeValues[0]);
+            var maxVersion = int.Parse(rangeValues[1]);
+
+            // Adjust min version and max version if the limit is exclusive.
+            minVersion = lowerBound == "(" ? minVersion + 1 : minVersion;
+            maxVersion = higherBound == ")" ? maxVersion - 1 : maxVersion;
+
+            if (minVersion > maxVersion)
+            {
+                return null;
+            }
+
+            return new VersionRangeValidator(minVersion, maxVersion);
+        }
+
+        private static IActionConstraint GetSingleVersionOrUnboundedHigherVersionConstraint(
+            string lowerBound,
+            string higherBound,
+            string[] rangeValues)
+        {
+            // (5], [5), (5), [5, (5, 5], 5) are not valid
+            if (lowerBound == "(" || higherBound == ")" ||
+                (string.IsNullOrEmpty(lowerBound) ^ string.IsNullOrEmpty(higherBound)))
+            {
+                return null;
+            }
+
+            var version = int.Parse(rangeValues[0]);
+            if (!string.IsNullOrEmpty(lowerBound))
+            {
+                // [5]
+                return new VersionRangeValidator(version, version);
+            }
+            else
+            {
+                // 5
+                return new VersionRangeValidator(version, maxVersion: null);
+            }
+        }
+
+        public IActionConstraint CreateInstance(IServiceProvider services)
+        {
+            return _constraint;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj b/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj
new file mode 100644
index 0000000000..cfda2f9c35
--- /dev/null
+++ b/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/readme.md b/src/Mvc/test/WebSites/VersioningWebSite/readme.md
new file mode 100644
index 0000000000..538b63c574
--- /dev/null
+++ b/src/Mvc/test/WebSites/VersioningWebSite/readme.md
@@ -0,0 +1,4 @@
+VersioningWebSite
+===
+
+This web site illustrates how to implement a versioning policy using action constraints.
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs
new file mode 100644
index 0000000000..083d9cb643
--- /dev/null
+++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs
@@ -0,0 +1,31 @@
+// 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.
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Newtonsoft.Json;
+
+namespace WebApiCompatShimWebSite
+{
+    public class ActionSelectionFilterAttribute : ActionFilterAttribute
+    {
+        public override void OnActionExecuted(ActionExecutedContext context)
+        {
+            var action = (ControllerActionDescriptor)context.ActionDescriptor;
+            context.HttpContext.Response.Headers.Add(
+                "ActionSelection",
+                new string[]
+                {
+                    JsonConvert.SerializeObject(new
+                    {
+                        ActionName = action.ActionName,
+                        ControllerName = action.ControllerName
+                    })
+                });
+
+            context.Result = new StatusCodeResult(StatusCodes.Status200OK);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionResults/ActionResultController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionResults/ActionResultController.cs
new file mode 100644
index 0000000000..0b3c694008
--- /dev/null
+++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionResults/ActionResultController.cs
@@ -0,0 +1,161 @@
+// 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.
+
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Newtonsoft.Json;
+
+namespace WebApiCompatShimWebSite
+{
+    public class ActionResultController : ApiController
+    {
+        private static readonly JsonSerializerSettings _indentedSettings;
+
+        static ActionResultController()
+        {
+            _indentedSettings = JsonSerializerSettingsProvider.CreateSerializerSettings();
+            _indentedSettings.Formatting = Formatting.Indented;
+        }
+
+        public IActionResult GetBadRequest()
+        {
+            return BadRequest();
+        }
+
+        public IActionResult GetBadRequestMessage()
+        {
+            return BadRequest("Hello, world!");
+        }
+
+        public IActionResult GetBadRequestModelState()
+        {
+            ModelState.AddModelError("product.Name", "Name is required.");
+            return BadRequest(ModelState);
+        }
+
+        public IActionResult GetConflict()
+        {
+            return Conflict();
+        }
+
+        public IActionResult GetContent()
+        {
+            return Content(HttpStatusCode.Ambiguous, CreateUser());
+        }
+
+        public IActionResult GetCreatedRelative()
+        {
+            return Created("5", CreateUser());
+        }
+
+        public IActionResult GetCreatedAbsolute()
+        {
+            return Created("/api/Blog/ActionResult/GetUser/5", CreateUser());
+        }
+
+        public IActionResult GetCreatedQualified()
+        {
+            return Created("http://localhost/api/Blog/ActionResult/5", CreateUser());
+        }
+
+        public IActionResult GetCreatedUri()
+        {
+            return Created(new Uri("/api/Blog/ActionResult/GetUser/5", UriKind.Relative), CreateUser());
+        }
+
+        public IActionResult GetCreatedAtRoute()
+        {
+            var values = new { controller = "ActionResult", action = "GetUser", id = 5 };
+            return CreatedAtRoute("named-action", values, CreateUser());
+        }
+
+        public IActionResult GetInternalServerError()
+        {
+            return InternalServerError();
+        }
+
+        public IActionResult GetInternalServerErrorException()
+        {
+            return InternalServerError(new Exception("Error not passed to client."));
+        }
+
+        public IActionResult GetJson()
+        {
+            return Json(CreateUser());
+        }
+
+        public IActionResult GetJsonSettings()
+        {
+            return Json(CreateUser(), _indentedSettings);
+        }
+
+        public IActionResult GetJsonSettingsEncoding()
+        {
+            return Json(CreateUser(), _indentedSettings, Encoding.UTF32);
+        }
+
+        public IActionResult GetNotFound()
+        {
+            return NotFound();
+        }
+
+        public IActionResult GetOk()
+        {
+            return Ok();
+        }
+
+        public IActionResult GetOkContent()
+        {
+            return Ok(CreateUser());
+        }
+
+        public IActionResult GetRedirectString()
+        {
+            // strings must be absolute URIs
+            return Redirect("http://localhost/api/Users");
+        }
+
+        public IActionResult GetRedirectUri()
+        {
+            // Uris can be absolute or relative
+            return Redirect(new Uri("api/Blog", UriKind.RelativeOrAbsolute));
+        }
+
+        public IActionResult GetRedirectUrlUsingRouteName()
+        {
+            return RedirectToRoute("named-action", new { controller = "BasicApi", action = "WriteToHttpContext" });
+        }
+
+        public IActionResult GetResponseMessage()
+        {
+            var response = new HttpResponseMessage(HttpStatusCode.OK);
+            response.Headers.Add("X-Test", "Hello");
+
+            return ResponseMessage(response);
+        }
+
+        public IActionResult GetStatusCode()
+        {
+            return StatusCode(HttpStatusCode.PaymentRequired);
+        }
+
+        // Used for generating links
+        public User GetUser(int id)
+        {
+            return CreateUser();
+        }
+
+        private User CreateUser()
+        {
+            return new User()
+            {
+                Name = "Test User",
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/EnumParameterOverloadsController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/EnumParameterOverloadsController.cs
new file mode 100644
index 0000000000..563304e06f
--- /dev/null
+++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/EnumParameterOverloadsController.cs
@@ -0,0 +1,34 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Web.Http;
+
+namespace WebApiCompatShimWebSite
+{
+    // This was ported from the WebAPI 5.2 codebase. Kept the same intentionally for compatibility.
+    [ActionSelectionFilter]
+    public class EnumParameterOverloadsController : ApiController
+    {
+        public IEnumerable<string> Get()
+        {
+            return new string[] { "get" };
+        }
+
+        public string GetWithEnumParameter(UserKind scope)
+        {
+            return scope.ToString();
+        }
+
+        public string GetWithTwoEnumParameters([FromUri]UserKind level, UserKind kind)
+        {
+            return level.ToString() + kind.ToString();
+        }
+
+        public string GetWithNullableEnumParameter(TraceLevel? level)
+        {
+            return level.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/ParameterAttributeController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/ParameterAttributeController.cs
new file mode 100644
index 0000000000..c920ac4274
--- /dev/null
+++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/ParameterAttributeController.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace WebApiCompatShimWebSite
+{
+    // This was ported from the WebAPI 5.2 codebase. Kept the same intentionally for compatibility.
+    [ActionSelectionFilter]
+    public class ParameterAttributeController : ApiController
+    {
+        public User GetUserByMyId(int myId) { return null; }
+        public User GetUser([FromUri(Name = "id")] int myId) { return null; }
+        public List<User> PostUserNameFromUri(int id, [FromUri]string name) { return null; }
+        public List<User> PostUserNameFromBody(int id, [FromBody] string name) { return null; }
+        public void DeleteUserWithNullableIdAndName(int? id, string name) { }
+        public void DeleteUser(string address) { }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/TestController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/TestController.cs
new file mode 100644
index 0000000000..26a43386aa
--- /dev/null
+++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/TestController.cs
@@ -0,0 +1,39 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace WebApiCompatShimWebSite
+{
+    // This was ported from the WebAPI 5.2 codebase. Kept the same intentionally for compatibility.
+    [ActionSelectionFilter]
+    public class TestController : ApiController
+    {
+        public User GetUser(int id) { return null; }
+        public List<User> GetUsers() { return null; }
+
+        public List<User> GetUsersByName(string name) { return null; }
+
+        [AcceptVerbs("PATCH")]
+        public void PutUser(User user) { }
+
+        public User GetUserByNameAndId(string name, int id) { return null; }
+        public User GetUserByNameAndAge(string name, int age) { return null; }
+        public User GetUserByNameAgeAndSsn(string name, int age, int ssn) { return null; }
+        public User GetUserByNameIdAndSsn(string name, int id, int ssn) { return null; }
+        public User GetUserByNameAndSsn(string name, int ssn) { return null; }
+        public User PostUser(User user) { return null; }
+        public User PostUserByNameAndAge(string name, int age) { return null; }
+        public User PostUserByName(string name) { return null; }
+        public User PostUserByNameAndAddress(string name, UserAddress address) { return null; }
+        public User DeleteUserByOptName(string name = null) { return null; }
+        public User DeleteUserByIdAndOptName(int id, string name = "DefaultName") { return null; }
+        public User DeleteUserByIdNameAndAge(int id, string name, int age) { return null; }
+        public User DeleteUserById_Email_OptName_OptPhone(int id, string email, string name = null, int phone = 0) { return null; }
+        public User DeleteUserById_Email_Height_OptName_OptPhone(int id, string email, double height, string name = "DefaultName", int? phone = null) { return null; }
+        public void Head_Id_OptSize_OptIndex(int id, int size = 10, int index = 0) { }
+        public void Head() { }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsActionNameController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsActionNameController.cs
new file mode 100644
index 0000000000..eb1f362164
--- /dev/null
+++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsActionNameController.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace WebApiCompatShimWebSite
+{
+    // The verb is still inferred by the METHOD NAME not the action name.
+    [ActionSelectionFilter]
+    public class WebAPIActionConventionsActionNameController : ApiController
+    {
+        [ActionName("GetItems")]
+        public void PostItems()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsController.cs
new file mode 100644
index 0000000000..9d4747c600
--- /dev/null
+++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsController.cs
@@ -0,0 +1,41 @@
+// 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.
+
+using System.Web.Http;
+
+namespace WebApiCompatShimWebSite
+{
+    // Each of these is mapped to an unnamed action with the corresponding http verb, and also
+    // a named action with the corresponding http verb.
+    [ActionSelectionFilter]
+    public class WebAPIActionConventionsController : ApiController
+    {
+        public void GetItems()
+        {
+        }
+
+        public void PostItems()
+        {
+        }
+
+        public void PutItems()
+        {
+        }
+
+        public void DeleteItems()
+        {
+        }
+
+        public void PatchItems()
+        {
+        }
+
+        public void HeadItems()
+        {
+        }
+
+        public void OptionsItems()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsDefaultPostController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsDefaultPostController.cs
new file mode 100644
index 0000000000..5ab7351f19
--- /dev/null
+++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsDefaultPostController.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using System.Web.Http;
+
+namespace WebApiCompatShimWebSite
+{
+    // This action only accepts POST by default
+    [ActionSelectionFilter]
+    public class WebAPIActionConventionsDefaultPostController : ApiController
+    {
+        public void DefaultVerbIsPost()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsVerbOverrideController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsVerbOverrideController.cs
new file mode 100644
index 0000000000..c293d99056
--- /dev/null
+++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsVerbOverrideController.cs
@@ -0,0 +1,18 @@
+// 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.
+
+using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace WebApiCompatShimWebSite
+{
+    // The verb is overridden by the attribute
+    [ActionSelectionFilter]
+    public class WebAPIActionConventionsVerbOverrideController : ApiController
+    {
+        [HttpGet]
+        public void PostItems()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs
new file mode 100644
index 0000000000..ea8c0ee813
--- /dev/null
+++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs
@@ -0,0 +1,96 @@
+// 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.
+
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Web.Http;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.WebApiCompatShim;
+using Microsoft.Extensions.Options;
+
+namespace WebApiCompatShimWebSite
+{
+    public class BasicApiController : ApiController
+    {
+        // Verifies property activation
+        [HttpGet]
+        public async Task<IActionResult> WriteToHttpContext()
+        {
+            var message = string.Format(
+                "Hello, {0} from {1}",
+                User.Identity?.Name ?? "Anonymous User",
+                ActionContext.ActionDescriptor.DisplayName);
+
+            await Context.Response.WriteAsync(message);
+            return new EmptyResult();
+        }
+
+        // Verifies property activation
+        [HttpGet]
+        public async Task<IActionResult> GenerateUrl()
+        {
+            var message = string.Format("Visited: {0}", Url.Action());
+
+            await Context.Response.WriteAsync(message);
+            return new EmptyResult();
+        }
+
+        // Verifies the default options configure formatters correctly.
+        [HttpGet]
+        public string[] GetFormatters([FromServices] IOptions<WebApiCompatShimOptions> optionsAccessor)
+        {
+            return optionsAccessor.Value.Formatters.Select(f => f.GetType().FullName).ToArray();
+        }
+
+        [HttpGet]
+        public bool ValidateObject_Passes()
+        {
+            var entity = new TestEntity { ID = 42 };
+            Validate(entity);
+            return ModelState.IsValid;
+        }
+
+        [HttpGet]
+        public object ValidateObjectFails()
+        {
+            var entity = new TestEntity { ID = -1 };
+            Validate(entity);
+            return CreateValidationDictionary();
+        }
+
+        [HttpGet]
+        public object ValidateObjectWithPrefixFails(string prefix)
+        {
+            var entity = new TestEntity { ID = -1 };
+            Validate(entity, prefix);
+            return CreateValidationDictionary();
+        }
+
+        private class TestEntity
+        {
+            [Range(0, 100)]
+            public int ID { get; set; }
+        }
+
+        private Dictionary<string, string> CreateValidationDictionary()
+        {
+            var result = new Dictionary<string, string>();
+            foreach (var item in ModelState)
+            {
+                var error = item.Value.Errors.SingleOrDefault();
+                if (error != null)
+                {
+                    var value = error.Exception != null ?
+                        error.Exception.Message :
+                        error.ErrorMessage;
+                    result.Add(item.Key, value);
+                }
+            }
+
+            return result;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpRequestMessage/HttpRequestMessageController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpRequestMessage/HttpRequestMessageController.cs
new file mode 100644
index 0000000000..000779dd63
--- /dev/null
+++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpRequestMessage/HttpRequestMessageController.cs
@@ -0,0 +1,187 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Formatting;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web.Http;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace WebApiCompatShimWebSite
+{
+    public class HttpRequestMessageController : ApiController
+    {
+        public async Task<IActionResult> EchoProperty()
+        {
+            await Echo(Request);
+            return new EmptyResult();
+        }
+
+        public async Task<IActionResult> EchoParameter(HttpRequestMessage request)
+        {
+            if (!object.ReferenceEquals(request, Request))
+            {
+                throw new InvalidOperationException();
+            }
+
+            await Echo(request);
+            return new EmptyResult();
+        }
+
+        public async Task<HttpResponseMessage> EchoWithResponseMessage(HttpRequestMessage request)
+        {
+            var message = string.Format(
+                "{0} {1}",
+                request.Method.ToString(),
+                await request.Content.ReadAsStringAsync());
+
+            var response = request.CreateResponse(HttpStatusCode.OK);
+            response.Content = new StringContent(message);
+            response.Headers.TryAddWithoutValidation("X-Test", "Hello!");
+            return response;
+        }
+
+        public async Task<HttpResponseMessage> EchoWithResponseMessageChunked(HttpRequestMessage request)
+        {
+            var message = string.Format(
+                "{0} {1}",
+                request.Method.ToString(),
+                await request.Content.ReadAsStringAsync());
+
+            var response = request.CreateResponse(HttpStatusCode.OK);
+            response.Content = new StringContent(message);
+            response.Headers.TransferEncodingChunked = true;
+            response.Headers.TryAddWithoutValidation("X-Test", "Hello!");
+            return response;
+        }
+
+        public HttpResponseMessage GetUser(string mediaType = null)
+        {
+            var user = new User()
+            {
+                Name = "Test User",
+            };
+
+            if (mediaType == null)
+            {
+                // This will perform content negotiation
+                return Request.CreateResponse<User>(HttpStatusCode.OK, user);
+            }
+            else
+            {
+                // This will use the provided media type
+                return Request.CreateResponse<User>(HttpStatusCode.OK, user, mediaType);
+            }
+        }
+
+        public HttpResponseMessage GetUserJson()
+        {
+            var user = new User()
+            {
+                Name = "Test User",
+            };
+
+            return Request.CreateResponse<User>(HttpStatusCode.OK, user, new JsonMediaTypeFormatter(), "text/json");
+        }
+
+        [HttpGet]
+        public HttpResponseMessage Fail()
+        {
+            // This will perform content negotiation
+            return Request.CreateErrorResponse(HttpStatusCode.InternalServerError, "It failed.");
+        }
+
+        [HttpGet]
+        public HttpResponseMessage ReturnByteArrayContent()
+        {
+            var response = new HttpResponseMessage();
+            response.Content = new ByteArrayContent(Encoding.UTF8.GetBytes("Hello from ByteArrayContent!!"));
+            response.Content.Headers.ContentType = new MediaTypeHeaderValue("text/plain");
+
+            return response;
+        }
+
+        [HttpGet]
+        public HttpResponseMessage ReturnStreamContent()
+        {
+            var response = new HttpResponseMessage();
+            response.Content = new StreamContent(new MemoryStream(Encoding.UTF8.GetBytes("This content is from a file")));
+            response.Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
+            response.Content.Headers.ContentDisposition = new ContentDispositionHeaderValue("attachment");
+
+            return response;
+        }
+
+        // NOTE: PushStreamContent's contract is to close the stream in order to signal
+        // that the user has done writing to it. However, the stream that is provided here is
+        // a wrapper delegating stream which actually doesn't close the actual response stream.
+
+        [HttpGet]
+        public HttpResponseMessage ReturnPushStreamContentSync()
+        {
+            var response = new HttpResponseMessage();
+            // Here we are using a non-Task returning action delegate
+            response.Content = new PushStreamContent((responseStream, httpContent, transportContext) =>
+            {
+                using (var streamWriter = new StreamWriter(responseStream))
+                {
+                    streamWriter.Write("Hello from PushStreamContent Sync!!");
+                }
+            });
+            response.Content.Headers.ContentType = new MediaTypeHeaderValue("application/pdf");
+
+            return response;
+        }
+
+        [HttpGet]
+        public HttpResponseMessage ReturnPushStreamContent()
+        {
+            var response = new HttpResponseMessage();
+            response.Content = new PushStreamContent(async (responseStream, httpContent, transportContext) =>
+            {
+                using (var streamWriter = new StreamWriter(responseStream))
+                {
+                    await streamWriter.WriteAsync("Hello from PushStreamContent!!");
+                }
+            });
+            response.Content.Headers.ContentType = new MediaTypeHeaderValue("application/pdf");
+
+            return response;
+        }
+
+        [HttpGet]
+        public HttpResponseMessage ReturnPushStreamContentWithCustomHeaders()
+        {
+            var response = new HttpResponseMessage();
+            response.Headers.Add("Multiple", new[] { "value1", "value2" });
+            response.Content = new PushStreamContent(async (responseStream, httpContent, transportContext) =>
+            {
+                using (var streamWriter = new StreamWriter(responseStream))
+                {
+                    await streamWriter.WriteAsync("Hello from PushStreamContent with custom headers!!");
+                }
+            });
+
+            return response;
+        }
+
+        private async Task Echo(HttpRequestMessage request)
+        {
+            var message = string.Format(
+                "{0} {1} {2} {3} {4}",
+                request.Method,
+                request.RequestUri.AbsoluteUri,
+                request.Headers.Host,
+                request.Content.Headers.ContentLength,
+                await request.Content.ReadAsStringAsync());
+
+            await Context.Response.WriteAsync(message);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpResponseExceptionController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpResponseExceptionController.cs
new file mode 100644
index 0000000000..5f1984664e
--- /dev/null
+++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpResponseExceptionController.cs
@@ -0,0 +1,62 @@
+// 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.
+
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace WebApiCompatShimWebSite
+{
+    public class HttpResponseExceptionController : ApiController
+    {
+        [HttpGet]
+        public object ThrowsHttpResponseExceptionWithHttpStatusCode()
+        {
+            throw new HttpResponseException(HttpStatusCode.BadRequest);
+        }
+
+        [HttpGet]
+        public object ThrowsHttpResponseExceptionWithHttpResponseMessage(string message)
+        {
+            var httpResponse = new HttpResponseMessage();
+            httpResponse.Content = new StringContent(message);
+            throw new HttpResponseException(httpResponse);
+        }
+
+        [TestActionFilter]
+        [HttpGet]
+        public object ThrowsHttpResponseExceptionEnsureGlobalFilterRunsLast()
+        {
+            throw new HttpResponseException(HttpStatusCode.BadRequest);
+        }
+
+        // Runs before the HttpResponseExceptionActionFilter's OnActionExecuted.
+        [TestActionFilter(Order = int.MaxValue)]
+        [HttpGet]
+        public object ThrowsHttpResponseExceptionInjectAFilterToHandleHttpResponseException()
+        {
+            throw new HttpResponseException(HttpStatusCode.BadRequest);
+        }
+    }
+
+    public class TestActionFilterAttribute : ActionFilterAttribute
+    {
+        public override void OnActionExecuted(ActionExecutedContext context)
+        {
+            if (!context.ExceptionHandled)
+            {
+                var httpResponseException = context.Exception as HttpResponseException;
+                if (httpResponseException != null)
+                {
+                    context.Result = new NoContentResult();
+                    context.ExceptionHandled = true;
+
+                    // Null it out so that next filter do not handle it.
+                    context.Exception = null;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/MvcController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/MvcController.cs
new file mode 100644
index 0000000000..46f259fd10
--- /dev/null
+++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/MvcController.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc;
+
+namespace WebApiCompatShimWebSite
+{
+    // This is reachable via our MVC routes, but not webapi routes
+    public class MvcController : Controller
+    {
+        public string Index()
+        {
+            return "Hello, World!";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ParameterBinding/EmployeesController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ParameterBinding/EmployeesController.cs
new file mode 100644
index 0000000000..9f02342567
--- /dev/null
+++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ParameterBinding/EmployeesController.cs
@@ -0,0 +1,42 @@
+// 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.
+
+using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace WebApiCompatShimWebSite.Controllers.ParameterBinding
+{
+    public class EmployeesController : ApiController
+    {
+        public IActionResult PostByIdDefault(int id = -1)
+        {
+            return Ok(id);
+        }
+
+        public IActionResult PostByIdModelBinder([ModelBinder] int id = -1)
+        {
+            return Ok(id);
+        }
+
+        public IActionResult PostByIdFromQuery([FromQuery] int id = -1)
+        {
+            return Ok(id);
+        }
+
+        public IActionResult PutEmployeeDefault(Employee employee)
+        {
+            return Ok(employee);
+        }
+
+        public IActionResult PutEmployeeModelBinder([ModelBinder] Employee employee)
+        {
+            return Ok(employee);
+        }
+
+        public IActionResult PutEmployeeBothDefault(string name, Employee employee)
+        {
+            employee.Name = name;
+            return Ok(employee);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/Employee.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/Employee.cs
new file mode 100644
index 0000000000..bb8326bff4
--- /dev/null
+++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/Employee.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace WebApiCompatShimWebSite
+{
+    public class Employee
+    {
+        public int Id { get; set; }
+
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/User.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/User.cs
new file mode 100644
index 0000000000..62b08d1912
--- /dev/null
+++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/User.cs
@@ -0,0 +1,11 @@
+// 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.
+
+
+namespace WebApiCompatShimWebSite
+{
+    public class User
+    {
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/UserAddress.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/UserAddress.cs
new file mode 100644
index 0000000000..dd8a9a34ad
--- /dev/null
+++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/UserAddress.cs
@@ -0,0 +1,10 @@
+// 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.
+
+
+namespace WebApiCompatShimWebSite
+{
+    public class UserAddress
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/UserKind.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/UserKind.cs
new file mode 100644
index 0000000000..b8ceb65939
--- /dev/null
+++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/UserKind.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace WebApiCompatShimWebSite
+{
+    public enum UserKind
+    {
+        Normal,
+        Admin,
+        SuperAdmin,
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Startup.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Startup.cs
new file mode 100644
index 0000000000..3699ab9e60
--- /dev/null
+++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Startup.cs
@@ -0,0 +1,51 @@
+// 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.
+
+using System.IO;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace WebApiCompatShimWebSite
+{
+    public class Startup
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            // Add MVC services to the services container
+            services.AddMvc().AddWebApiConventions();
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseMvc(routes =>
+            {
+                // Tests include different styles of WebAPI conventional routing and action selection - the prefix keeps
+                // them from matching too eagerly.
+                routes.MapWebApiRoute("named-action", "api/Blog/{controller}/{action}/{id?}");
+                routes.MapWebApiRoute("unnamed-action", "api/Admin/{controller}/{id?}");
+                routes.MapWebApiRoute("name-as-parameter", "api/Store/{controller}/{name?}");
+                routes.MapWebApiRoute("extra-parameter", "api/Support/{extra}/{controller}/{id?}");
+
+                // This route can't access any of our webapi controllers
+                routes.MapRoute("default", "{controller}/{action}/{id?}");
+            });
+        }
+
+        public static void Main(string[] args)
+        {
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
+            host.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            new WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseStartup<Startup>()
+                .UseKestrel()
+                .UseIISIntegration();
+    }
+}
+
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj
new file mode 100644
index 0000000000..fd4dd53d70
--- /dev/null
+++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc.WebApiCompatShim\Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/readme.md b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/readme.md
new file mode 100644
index 0000000000..2ab97802df
--- /dev/null
+++ b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/readme.md
@@ -0,0 +1,5 @@
+WebApiCompatShimWebSite
+===
+
+This web site illustrates how to configure and use WebApiCompatShim to get `Web API 2.*` like behavior. Features which
+are used include but are not limited to action results, action selection and parameter binding.
diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/HomeController.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/HomeController.cs
new file mode 100644
index 0000000000..9cf910399d
--- /dev/null
+++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/HomeController.cs
@@ -0,0 +1,48 @@
+// 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.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace XmlFormattersWebSite
+{
+    public class HomeController : Controller
+    {
+        [HttpPost]
+        public IActionResult Index([FromBody]DummyClass dummyObject)
+        {
+            if (!ModelState.IsValid)
+            {
+                return new ObjectResult(GetModelStateErrorMessages(ModelState))
+                {
+                    StatusCode = 400
+                };
+            }
+
+            return Content(dummyObject.SampleInt.ToString());
+        }
+
+        // Cannot use 'SerializableError' here as it sanitizes exceptions in model state with generic error message.
+        // Since the tests need to verify the messages, we are doing the following.
+        private List<string> GetModelStateErrorMessages(ModelStateDictionary modelStateDictionary)
+        {
+            var allErrorMessages = new List<string>();
+            foreach (var keyModelStatePair in modelStateDictionary)
+            {
+                var key = keyModelStatePair.Key;
+                var errors = keyModelStatePair.Value.Errors;
+                if (errors != null && errors.Count > 0)
+                {
+                    allErrorMessages.Add(
+                        string.Join(
+                            ",",
+                            errors.Select(modelError => $"ErrorMessage:{modelError.ErrorMessage};Exception:{modelError.Exception}")));
+                }
+            }
+
+            return allErrorMessages;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/IEnumerableController.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/IEnumerableController.cs
new file mode 100644
index 0000000000..2917c5ca66
--- /dev/null
+++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/IEnumerableController.cs
@@ -0,0 +1,67 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using XmlFormattersWebSite.Models;
+
+namespace XmlFormattersWebSite.Controllers
+{
+    public class IEnumerableController : Controller
+    {
+        public IEnumerable<int> ValueTypes()
+        {
+            return new[] { 10, 20 };
+        }
+
+        public IEnumerable<string> NonWrappedTypes()
+        {
+            return new[] { "value1", "value2" };
+        }
+
+        public IEnumerable<string> NonWrappedTypes_Empty()
+        {
+            return new string[] { };
+        }
+
+        public IEnumerable<Person> WrappedTypes()
+        {
+            return new[] {
+                new Person() { Id = 10, Name = "Mike" },
+                new Person() { Id = 11, Name = "Jimmy" }
+            };
+        }
+
+        public IEnumerable<Person> WrappedTypes_Empty()
+        {
+            return new Person[] { };
+        }
+
+        public IEnumerable<string> NonWrappedTypes_NullInstance()
+        {
+            return null;
+        }
+
+        public IEnumerable<Person> WrappedTypes_NullInstance()
+        {
+            return null;
+        }
+
+        public IEnumerable<SerializableError> SerializableErrors()
+        {
+            List<SerializableError> errors = new List<SerializableError>();
+            var error1 = new SerializableError();
+            error1.Add("key1", "key1-error");
+            error1.Add("key2", "key2-error");
+
+            var error2 = new SerializableError();
+            error2.Add("key3", "key1-error");
+            error2.Add("key4", "key2-error");
+            errors.Add(error1);
+            errors.Add(error2);
+            return errors;
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/IQueryableController.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/IQueryableController.cs
new file mode 100644
index 0000000000..f60955f4d5
--- /dev/null
+++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/IQueryableController.cs
@@ -0,0 +1,52 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using XmlFormattersWebSite.Models;
+
+namespace XmlFormattersWebSite.Controllers
+{
+    public class IQueryableController : Controller
+    {
+        public IQueryable<int> ValueTypes()
+        {
+            return Enumerable.Range(1, 2).Select(i => i * 10).AsQueryable();
+        }
+
+        public IQueryable<string> NonWrappedTypes()
+        {
+            return Enumerable.Range(1, 2).Select(i => "value" + i).AsQueryable();
+        }
+
+        public IQueryable<Person> WrappedTypes()
+        {
+            return new[] {
+                new Person() { Id = 10, Name = "Mike" },
+                new Person() { Id = 11, Name = "Jimmy" }
+            }.AsQueryable();
+        }
+
+        public IQueryable<Person> WrappedTypes_Empty()
+        {
+            return (new Person[] { }).AsQueryable();
+        }
+
+        public IQueryable<string> NonWrappedTypes_Empty()
+        {
+            return (new string[] { }).AsQueryable();
+        }
+
+        public IQueryable<string> NonWrappedTypes_NullInstance()
+        {
+            return null;
+        }
+
+        public IQueryable<Person> WrappedTypes_NullInstance()
+        {
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/SerializableErrorController.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/SerializableErrorController.cs
new file mode 100644
index 0000000000..4b65e47edb
--- /dev/null
+++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/SerializableErrorController.cs
@@ -0,0 +1,49 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc;
+using XmlFormattersWebSite.Models;
+
+namespace XmlFormattersWebSite.Controllers
+{
+    public class SerializableErrorController : Controller
+    {
+        [HttpGet]
+        public IActionResult ModelStateErrors()
+        {
+            InvalidOperationException exception = null;
+
+            try
+            {
+                throw new InvalidOperationException("Error in executing the action");
+            }
+            catch (InvalidOperationException invalidOperationEx)
+            {
+                exception = invalidOperationEx;
+            }
+
+            ModelState.AddModelError("key1", "key1-error");
+            ModelState.AddModelError("key2", exception, ViewData.ModelMetadata);
+
+            return new ObjectResult(new SerializableError(ModelState));
+        }
+
+        [HttpPost]
+        public SerializableError LogErrors([FromBody] SerializableError serializableError)
+        {
+            return serializableError;
+        }
+
+        [HttpPost]
+        public IActionResult CreateEmployee([FromBody] Employee employee)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
+
+            return Content("Hello World!");
+        }
+    }
+}
diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/ValidationController.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/ValidationController.cs
new file mode 100644
index 0000000000..e5d4b6862f
--- /dev/null
+++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/ValidationController.cs
@@ -0,0 +1,68 @@
+// 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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace XmlFormattersWebSite
+{
+    public class ValidationController : Controller
+    {
+        public IActionResult CreateStore([FromBody] Store store)
+        {
+            // We want to verify that 'store' is model bound and also that the
+            // model state has the errors we are expecting.
+            return new ObjectResult(new ModelBindingInfo()
+            {
+                Store = store,
+                ModelStateErrorMessages = GetModelStateErrorMessages(ModelState)
+            });
+        }
+
+        // Cannot use 'SerializableError' here as 'RequiredAttribute' validation errors are added as exceptions
+        // into the model state dictionary and 'SerializableError' sanitizes exceptions with generic error message.
+        // Since the tests need to verify the messages, we are doing the following.
+        private List<string> GetModelStateErrorMessages(ModelStateDictionary modelStateDictionary)
+        {
+            var allErrorMessages = new List<string>();
+            foreach (var keyModelStatePair in modelStateDictionary)
+            {
+                var key = keyModelStatePair.Key;
+                var errors = keyModelStatePair.Value.Errors;
+                if (errors != null && errors.Count > 0)
+                {
+                    string errorMessage = null;
+                    foreach (var modelError in errors)
+                    {
+                        if (string.IsNullOrEmpty(modelError.ErrorMessage))
+                        {
+                            if (modelError.Exception != null)
+                            {
+                                errorMessage = modelError.Exception.Message;
+                            }
+                        }
+                        else
+                        {
+                            errorMessage = modelError.ErrorMessage;
+                        }
+
+                        if (errorMessage != null)
+                        {
+                            allErrorMessages.Add(string.Format("{0}:{1}", key, errorMessage));
+                        }
+                    }
+                }
+            }
+
+            return allErrorMessages;
+        }
+    }
+
+    public class ModelBindingInfo
+    {
+        public Store Store { get; set; }
+
+        public List<string> ModelStateErrorMessages { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/Models/Address.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Models/Address.cs
new file mode 100644
index 0000000000..bd162913b4
--- /dev/null
+++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/Models/Address.cs
@@ -0,0 +1,16 @@
+// 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.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace XmlFormattersWebSite
+{
+    public class Address
+    {
+        [Required]
+        public string State { get; set; }
+
+        [Required]
+        public int Zipcode { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/Models/DummyClass.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Models/DummyClass.cs
new file mode 100644
index 0000000000..683efe201b
--- /dev/null
+++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/Models/DummyClass.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace XmlFormattersWebSite
+{
+    public class DummyClass
+    {
+        public int SampleInt { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/Models/Employee.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Models/Employee.cs
new file mode 100644
index 0000000000..0714618084
--- /dev/null
+++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/Models/Employee.cs
@@ -0,0 +1,17 @@
+// 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.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace XmlFormattersWebSite.Models
+{
+    public class Employee
+    {
+        [Range(10, 100)]
+        public int Id { get; set; }
+
+        [MinLength(15)]
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/Models/Person.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Models/Person.cs
new file mode 100644
index 0000000000..1a78b7dd86
--- /dev/null
+++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/Models/Person.cs
@@ -0,0 +1,14 @@
+// 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.
+
+using System;
+
+namespace XmlFormattersWebSite.Models
+{
+    public class Person
+    {
+        public int Id { get; set; }
+
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/Models/Store.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Models/Store.cs
new file mode 100644
index 0000000000..cce9d39ba5
--- /dev/null
+++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/Models/Store.cs
@@ -0,0 +1,17 @@
+// 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.
+
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace XmlFormattersWebSite
+{
+    public class Store
+    {
+        [Required]
+        public int Id { get; set; }
+
+        [Required]
+        public Address Address { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/PersonWrapper.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/PersonWrapper.cs
new file mode 100644
index 0000000000..81740545a5
--- /dev/null
+++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/PersonWrapper.cs
@@ -0,0 +1,37 @@
+// 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.
+
+using System;
+using XmlFormattersWebSite.Models;
+using Microsoft.AspNetCore.Mvc.Formatters.Xml;
+
+namespace XmlFormattersWebSite
+{
+    public class PersonWrapper : IUnwrappable
+    {
+        public PersonWrapper() { }
+
+        public PersonWrapper(Person person)
+        {
+            Id = person.Id;
+            Name = person.Name;
+            Age = 35;
+        }
+
+        public int Id { get; set; }
+
+        public string Name { get; set; }
+
+        public int Age { get; set; }
+
+        public override string ToString()
+        {
+            return string.Format("{0}, {1}, {2}", Id, Name, Age);
+        }
+
+        public object Unwrap(Type declaredType)
+        {
+            return new Person() { Id = this.Id, Name = this.Name };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/PersonWrapperProvider.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/PersonWrapperProvider.cs
new file mode 100644
index 0000000000..4daefdb454
--- /dev/null
+++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/PersonWrapperProvider.cs
@@ -0,0 +1,32 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Formatters.Xml;
+using XmlFormattersWebSite.Models;
+
+namespace XmlFormattersWebSite
+{
+    public class PersonWrapperProvider : IWrapperProvider
+    {
+        public object Wrap(object obj)
+        {
+            var person = obj as Person;
+
+            if (person == null)
+            {
+                return obj;
+            }
+
+            return new PersonWrapper(person);
+        }
+
+        public Type WrappingType
+        {
+            get
+            {
+                return typeof(PersonWrapper);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/PersonWrapperProviderFactory.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/PersonWrapperProviderFactory.cs
new file mode 100644
index 0000000000..0409ab62a7
--- /dev/null
+++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/PersonWrapperProviderFactory.cs
@@ -0,0 +1,21 @@
+// 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.
+
+using Microsoft.AspNetCore.Mvc.Formatters.Xml;
+using XmlFormattersWebSite.Models;
+
+namespace XmlFormattersWebSite
+{
+    public class PersonWrapperProviderFactory : IWrapperProviderFactory
+    {
+        public IWrapperProvider GetProvider(WrapperProviderContext context)
+        {
+            if (context.DeclaredType == typeof(Person))
+            {
+                return new PersonWrapperProvider();
+            }
+
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/Startup.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Startup.cs
new file mode 100644
index 0000000000..31bce95f56
--- /dev/null
+++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/Startup.cs
@@ -0,0 +1,94 @@
+// 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.
+
+using System.IO;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Net.Http.Headers;
+
+namespace XmlFormattersWebSite
+{
+    public class Startup
+    {
+        // Set up application services
+        public void ConfigureServices(IServiceCollection services)
+        {
+            // Add MVC services to the services container
+            services.AddMvc();
+
+            services.Configure<MvcOptions>(options =>
+            {
+                options.InputFormatters.Clear();
+                options.OutputFormatters.Clear();
+
+                // Since both XmlSerializer and DataContractSerializer based formatters
+                // have supported media types of 'application/xml' and 'text/xml',  it 
+                // would be difficult for a test to choose a particular formatter based on
+                // request information (Ex: Accept header).
+                // So here we instead clear out the default supported media types and create new
+                // ones which are distinguishable between formatters.
+                var xmlSerializerInputFormatter = new XmlSerializerInputFormatter(new MvcOptions());
+                xmlSerializerInputFormatter.SupportedMediaTypes.Clear();
+                xmlSerializerInputFormatter.SupportedMediaTypes.Add(
+                    new MediaTypeHeaderValue("application/xml-xmlser"));
+                xmlSerializerInputFormatter.SupportedMediaTypes.Add(
+                    new MediaTypeHeaderValue("text/xml-xmlser"));
+
+                var xmlSerializerOutputFormatter = new XmlSerializerOutputFormatter();
+                xmlSerializerOutputFormatter.SupportedMediaTypes.Clear();
+                xmlSerializerOutputFormatter.SupportedMediaTypes.Add(
+                    new MediaTypeHeaderValue("application/xml-xmlser"));
+                xmlSerializerOutputFormatter.SupportedMediaTypes.Add(
+                    new MediaTypeHeaderValue("text/xml-xmlser"));
+
+                var dcsInputFormatter = new XmlDataContractSerializerInputFormatter(new MvcOptions());
+                dcsInputFormatter.SupportedMediaTypes.Clear();
+                dcsInputFormatter.SupportedMediaTypes.Add(new MediaTypeHeaderValue("application/xml-dcs"));
+                dcsInputFormatter.SupportedMediaTypes.Add(new MediaTypeHeaderValue("text/xml-dcs"));
+
+                var dcsOutputFormatter = new XmlDataContractSerializerOutputFormatter();
+                dcsOutputFormatter.SupportedMediaTypes.Clear();
+                dcsOutputFormatter.SupportedMediaTypes.Add(new MediaTypeHeaderValue("application/xml-dcs"));
+                dcsOutputFormatter.SupportedMediaTypes.Add(new MediaTypeHeaderValue("text/xml-dcs"));
+
+                options.InputFormatters.Add(dcsInputFormatter);
+                options.InputFormatters.Add(xmlSerializerInputFormatter);
+                options.OutputFormatters.Add(dcsOutputFormatter);
+                options.OutputFormatters.Add(xmlSerializerOutputFormatter);
+
+                xmlSerializerInputFormatter.WrapperProviderFactories.Add(new PersonWrapperProviderFactory());
+                xmlSerializerOutputFormatter.WrapperProviderFactories.Add(new PersonWrapperProviderFactory());
+                dcsInputFormatter.WrapperProviderFactories.Add(new PersonWrapperProviderFactory());
+                dcsOutputFormatter.WrapperProviderFactories.Add(new PersonWrapperProviderFactory());
+            });
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute("ActionAsMethod", "{controller}/{action}",
+                    defaults: new { controller = "Home", action = "Index" });
+            });
+        }
+
+        public static void Main(string[] args)
+        {
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
+            host.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            new WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseStartup<Startup>()
+                .UseKestrel()
+                .UseIISIntegration();
+    }
+}
+
diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj b/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj
new file mode 100644
index 0000000000..e8cef0d108
--- /dev/null
+++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestWebsiteTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc.Formatters.Xml\Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/readme.md b/src/Mvc/test/WebSites/XmlFormattersWebSite/readme.md
new file mode 100644
index 0000000000..e2467bf654
--- /dev/null
+++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/readme.md
@@ -0,0 +1,4 @@
+XmlFormattersWebSite
+===
+
+This web site illustrates how to configure and use `XmlSerializerInputFormatter`.
diff --git a/src/Mvc/version.props b/src/Mvc/version.props
new file mode 100644
index 0000000000..5f1cf38faa
--- /dev/null
+++ b/src/Mvc/version.props
@@ -0,0 +1,21 @@
+<Project>
+  <PropertyGroup>
+    <VersionPrefix>2.1.3</VersionPrefix>
+    <VersionSuffix>rtm</VersionSuffix>
+    <BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
+    <FeatureBranchVersionPrefix Condition="'$(FeatureBranchVersionPrefix)' == ''">a-</FeatureBranchVersionPrefix>
+
+    <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
+    <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
+    <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(FeatureBranchVersionSuffix)' != ''">$(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-'))</VersionSuffix>
+    <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
+
+    <ExperimentalVersionPrefix>0.1.3</ExperimentalVersionPrefix>
+    <ExperimentalVersionSuffix>rtm</ExperimentalVersionSuffix>
+
+    <ExperimentalPackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(ExperimentalVersionSuffix)' == 'rtm' ">$(ExperimentalVersionPrefix)</ExperimentalPackageVersion>
+    <ExperimentalPackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(ExperimentalVersionSuffix)' != 'rtm' ">$(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final</ExperimentalPackageVersion>
+    <ExperimentalVersionSuffix Condition="'$(ExperimentalVersionSuffix)' != '' And '$(FeatureBranchVersionSuffix)' != ''">$(FeatureBranchVersionPrefix)$(ExperimentalVersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-'))</ExperimentalVersionSuffix>
+    <ExperimentalVersionSuffix Condition="'$(ExperimentalVersionSuffix)' != '' And '$(BuildNumber)' != ''">$(ExperimentalVersionSuffix)-$(BuildNumber)</ExperimentalVersionSuffix>
+  </PropertyGroup>
+</Project>